From 83781b94590dc41c1a151b9b19be28d7f4e5e518 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 1 Jan 2021 01:00:47 -0800
Subject: [PATCH 0001/1674] [build]: fix dpkg uninstall bug

fix a bug when there are multiple debian packages to be uninstalled

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/functions | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rules/functions b/rules/functions
index d5aba46fd5d2..104efa3055b7 100644
--- a/rules/functions
+++ b/rules/functions
@@ -145,11 +145,11 @@ expand = $(foreach d,$(1),$(call expand,$($(d)_$(2)),$(2))) $(1)
 ## Uninstall debs
 ###############################################################################
 define UNINSTALL_DEBS
-$(info $(1))
-$(foreach deb,$(1), \
-	{ while true; do \
-		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then \
-			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -P $(firstword $(subst _, ,$(basename $(deb)))) $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; } \
-	    fi; \
-	done; } )
+if [ -n "$(1)" ]; then \
+    while true; do \
+        if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then \
+		    { sudo DEBIAN_FRONTEND=noninteractive dpkg -P $(foreach deb,$(1),$(firstword $(subst _, ,$(basename $(deb))))) $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; } \
+        fi; \
+    done; \
+fi
 endef

From 68086fc2972e46f4144cc252a4e187947634539f Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 1 Jan 2021 01:14:15 -0800
Subject: [PATCH 0002/1674] [build]: check if package with given version is
 installed or not

in case conflicting packages have same name but different version,
the install step needs to wait till package with the conflicting
version is uninstalled

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 slave.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slave.mk b/slave.mk
index c75bf15e75c4..6393008b37e5 100644
--- a/slave.mk
+++ b/slave.mk
@@ -530,7 +530,7 @@ $(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -inst
 	while true; do
 		# wait for conflicted packages to be uninstalled
 		$(foreach deb, $($*_CONFLICT_DEBS), \
-			{ while dpkg -s $(firstword $(subst _, ,$(basename $(deb)))) &> /dev/null; do echo "waiting for $(deb) to be uninstalled" $(LOG); sleep 1; done } )
+			{ while dpkg -s $(firstword $(subst _, ,$(basename $(deb)))) | grep "^Version: $(word 2, $(subst _, ,$(basename $(deb))))" &> /dev/null; do echo "waiting for $(deb) to be uninstalled" $(LOG); sleep 1; done } )
 		# put a lock here because dpkg does not allow installing packages in parallel
 		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
 			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }

From 91bf30422ceb49b80d2b82a855726381c558cc82 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 1 Jan 2021 11:17:15 -0800
Subject: [PATCH 0003/1674] [frr]: remove dependency betwee frr and frr-snmp

no instalation of frr during the build process

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/frr.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index 91e0c9795dae..63d25c147af2 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -14,13 +14,13 @@ $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr
 SONIC_MAKE_DEBS += $(FRR)
 
 FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_all.deb
-$(eval $(call add_derived_package,$(FRR),$(FRR_PYTHONTOOLS)))
+$(eval $(call add_extra_package,$(FRR),$(FRR_PYTHONTOOLS)))
 
 FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(FRR),$(FRR_DBG)))
 
 FRR_SNMP = frr-snmp_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(FRR),$(FRR_SNMP)))
+$(eval $(call add_extra_package,$(FRR),$(FRR_SNMP)))
 
 FRR_SNMP_DBG = frr-snmp-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(FRR),$(FRR_SNMP_DBG)))

From 9b2274a4f1ad17124db267df906c3dce1021103a Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 30 Dec 2020 15:08:12 -0800
Subject: [PATCH 0004/1674] [build]: add artifical dependency between libyang
 and frr

frr build requires libyang 1.0.184 which conflicts with
libyang 1.0.73. Solution here is to compile frr and libyang 1.0.184
first, and then uninstall libyang 1.0.184 after frr build.
Then, compile libyang 1.0.73 and all packages depend on it later.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/frr.mk     |  1 +
 rules/libyang.mk |  6 ++++++
 slave.mk         | 13 ++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index 63d25c147af2..42b600004e8c 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -10,6 +10,7 @@ export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 FRR = frr_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(FRR)_DEPENDS += $(LIBSNMP_DEV) $(LIBYANG1) $(LIBYANG1_DEV)
 $(FRR)_RDEPENDS += $(LIBYANG1)
+$(FRR)_UNINSTALLS = $(LIBYANG1_DEV) $(LIBYANG1)
 $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr
 SONIC_MAKE_DEBS += $(FRR)
 
diff --git a/rules/libyang.mk b/rules/libyang.mk
index 5a5000d7c425..181db2368c6d 100644
--- a/rules/libyang.mk
+++ b/rules/libyang.mk
@@ -10,6 +10,9 @@ export LIBYANG_SUBVERSION
 
 LIBYANG = libyang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
 $(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang
+# introduce artifical dependency between LIBYANG and FRR
+# make sure LIBYANG is compile after FRR
+$(LIBYANG)_AFTER = $(FRR)
 SONIC_MAKE_DEBS += $(LIBYANG)
 
 LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
@@ -30,4 +33,7 @@ LIBYANG_PY2 = python2-yang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
 $(LIBYANG_PY2)_DEPENDS += $(LIBYANG) $(LIBYANG_CPP)
 $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_PY2)))
 
+$(eval $(call add_conflict_package,$(LIBYANG),$(LIBYANG1)))
+$(eval $(call add_conflict_package,$(LIBYANG_DEV),$(LIBYANG1_DEV)))
+
 export LIBYANG LIBYANG_DBG LIBYANG_DEV LIBYANG_CPP LIBYANG_PY3 LIBYANG_PY2
diff --git a/slave.mk b/slave.mk
index 6393008b37e5..18e70542f83e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -369,6 +369,7 @@ SONIC_TARGET_LIST += $(addprefix $(FILES_PATH)/, $(SONIC_ONLINE_FILES))
 #     $(SOME_NEW_FILE)_DEPENDS = $(SOME_OTHER_DEB1) $(SOME_OTHER_DEB2) ...
 #     SONIC_MAKE_FILES += $(SOME_NEW_FILE)
 $(addprefix $(FILES_PATH)/, $(SONIC_MAKE_FILES)) : $(FILES_PATH)/% : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) \
+			$$(addprefix $(DEBS_PATH)/,$$($$*_AFTER)) \
 			$(call dpkg_depend,$(FILES_PATH)/%.dep)
 	$(HEADER)
 
@@ -411,6 +412,7 @@ SONIC_TARGET_LIST += $(addprefix $(FILES_PATH)/, $(SONIC_MAKE_FILES))
 #     $(SOME_NEW_DEB)_DEPENDS = $(SOME_OTHER_DEB1) $(SOME_OTHER_DEB2) ...
 #     SONIC_MAKE_DEBS += $(SOME_NEW_DEB)
 $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS)) : $(DEBS_PATH)/% : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) \
+			$$(addprefix $(DEBS_PATH)/,$$($$*_AFTER)) \
 			$(call dpkg_depend,$(DEBS_PATH)/%.dep)
 	$(HEADER)
 
@@ -448,6 +450,7 @@ SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS))
 #     $(SOME_NEW_DEB)_DEPENDS = $(SOME_OTHER_DEB1) $(SOME_OTHER_DEB2) ...
 #     SONIC_DPKG_DEBS += $(SOME_NEW_DEB)
 $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) \
+			$$(addprefix $(DEBS_PATH)/,$$($$*_AFTER)) \
 			$(call dpkg_depend,$(DEBS_PATH)/%.dep )
 	$(HEADER)
 
@@ -516,7 +519,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_EXTRA_DEBS)) : $(DEBS_PATH)/% : .platform $$(
 SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_EXTRA_DEBS))
 
 # Targets for installing debian packages prior to build one that depends on them
-SONIC_INSTALL_TARGETS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
+SONIC_INSTALL_DEBS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
 			$(SONIC_ONLINE_DEBS) \
 			$(SONIC_COPY_DEBS) \
 			$(SONIC_MAKE_DEBS) \
@@ -524,7 +527,7 @@ SONIC_INSTALL_TARGETS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
 			$(SONIC_PYTHON_STDEB_DEBS) \
 			$(SONIC_DERIVED_DEBS) \
 			$(SONIC_EXTRA_DEBS)))
-$(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$*
+$(SONIC_INSTALL_DEBS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$*
 	$(HEADER)
 	[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
 	while true; do
@@ -538,6 +541,7 @@ $(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -inst
 	done
 	$(FOOTER)
 
+
 ###############################################################################
 ## Python packages
 ###############################################################################
@@ -615,6 +619,9 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
 		$(call SAVE_CACHE,$*,$@)
 	fi
 
+	# Uninstall unneeded build dependency
+	$(call UNINSTALL_DEBS,$($*_UNINSTALLS))
+
 	$(FOOTER)
 
 SONIC_TARGET_LIST += $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS))
@@ -1098,4 +1105,4 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \
 
 .PHONY : $(SONIC_CLEAN_DEBS) $(SONIC_CLEAN_FILES) $(SONIC_CLEAN_TARGETS) $(SONIC_CLEAN_STDEB_DEBS) $(SONIC_CLEAN_WHEELS) $(SONIC_PHONY_TARGETS) clean distclean configure
 
-.INTERMEDIATE : $(SONIC_INSTALL_TARGETS) $(SONIC_INSTALL_WHEELS) $(DOCKER_LOAD_TARGETS) docker-start .platform
+.INTERMEDIATE : $(SONIC_INSTALL_DEBS) $(SONIC_INSTALL_WHEELS) $(DOCKER_LOAD_TARGETS) docker-start .platform

From 0ac81e3c96e5aba8b230cf3ef090a226e8c81a02 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 3 Jan 2021 17:32:20 +0800
Subject: [PATCH 0005/1674] Fix the hostimage version path permission issue
 (#6337)

---
 build_debian.sh                             | 2 +-
 scripts/collect_host_image_version_files.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index c642e5d8cfb2..53ac934bd357 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -578,7 +578,7 @@ sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 
-sudo scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
+scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
 
 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
     # Remove qemu arm bin executable used for cross-building
diff --git a/scripts/collect_host_image_version_files.sh b/scripts/collect_host_image_version_files.sh
index 3e06bcfb2345..2cabc049d9c7 100755
--- a/scripts/collect_host_image_version_files.sh
+++ b/scripts/collect_host_image_version_files.sh
@@ -4,6 +4,7 @@ TARGET=$1
 FILESYSTEM_ROOT=$2
 VERSIONS_PATH=$TARGET/versions/host-image
 
+[ -d $VERSIONS_PATH ] && sudo rm -rf $VERSIONS_PATH
 mkdir -p $VERSIONS_PATH
 
 sudo LANG=C chroot $FILESYSTEM_ROOT post_run_buildinfo

From 25b0f43d9f4b28267c31183e1fd11a1c734325cd Mon Sep 17 00:00:00 2001
From: Mahesh Maddikayala <10645050+smaheshm@users.noreply.github.com>
Date: Sun, 3 Jan 2021 08:10:28 -0800
Subject: [PATCH 0006/1674] [sonic-py-common] Added an API to get file path
 containing SONiC version (#6309)

* [sonic-py-common] add an API to get file path containing SONiC version so that the API can be mocked for unit tests.
---
 src/sonic-py-common/sonic_py_common/device_info.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index 5f1cb6a66d43..f486113196fb 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -297,6 +297,11 @@ def get_sonic_version_info():
 
     return data
 
+def get_sonic_version_file():
+    if not os.path.isfile(SONIC_VERSION_YAML_PATH):
+        return None
+
+    return SONIC_VERSION_YAML_PATH
 
 #
 # Multi-NPU functionality

From 07b9282456b7c136f2e0804e3c48ad582678e29c Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 3 Jan 2021 08:28:05 -0800
Subject: [PATCH 0007/1674] [broadcom]: match the brcm sai filename version to
 control file version (#6339)

the control file version is 4.2.1.5-7

sonic$ sudo dpkg -i target/debs/buster/libsaibcm-dev_4.2.1.5-8_amd64.deb
(Reading database ... 175880 files and directories currently installed.)
Preparing to unpack .../libsaibcm-dev_4.2.1.5-8_amd64.deb ...
Unpacking libsaibcm-dev (4.2.1.5-7) over (4.2.1.5-7) ...
Setting up libsaibcm-dev (4.2.1.5-7) ...
lgh@491d842369cf:/sonic$ sudo dpkg -i target/debs/buster/libsaibcm_4.2.1.5-8_amd64.deb
(Reading database ... 175880 files and directories currently installed.)
Preparing to unpack .../libsaibcm_4.2.1.5-8_amd64.deb ...
Unpacking libsaibcm (4.2.1.5-7) over (4.2.1.5-7) ...
Setting up libsaibcm (4.2.1.5-7) ...
Processing triggers for libc-bin (2.28-10) ...

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/broadcom/sai.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 8690bdddcef5..cdd42ff4ed5a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,6 +1,6 @@
-BRCM_SAI = libsaibcm_4.2.1.5-8_amd64.deb
+BRCM_SAI = libsaibcm_4.2.1.5-7_amd64.deb
 $(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-8_amd64.deb?sv=2019-12-12&st=2020-12-18T18%3A41%3A23Z&se=2030-12-19T18%3A41%3A00Z&sr=b&sp=r&sig=GFNMn0borytUTFQJf%2F5A0J452XsQ%2FqnzBw5GyjFuYHw%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-8_amd64.deb
+BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-7_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
 $(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-8_amd64.deb?sv=2019-12-12&st=2020-12-18T18%3A42%3A03Z&se=2030-12-19T18%3A42%3A00Z&sr=b&sp=r&sig=J%2BbRtZVVcZTLs3uqzZs9zObLKFxRgzvJkFL5iyJ48mA%3D"
 

From 711b7f80790644c6e93de81955f1b74267292d8d Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 3 Jan 2021 17:06:05 -0800
Subject: [PATCH 0008/1674] [frr]: change frr debug package to extra to avoid
 build break for dbg image (#6340)

build frr dbg image force to install frr in the build process
which breaks the current build and is uneccessary.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/frr.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index 42b600004e8c..7572beb3b06c 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -18,13 +18,13 @@ FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_all.deb
 $(eval $(call add_extra_package,$(FRR),$(FRR_PYTHONTOOLS)))
 
 FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(FRR),$(FRR_DBG)))
+$(eval $(call add_extra_package,$(FRR),$(FRR_DBG)))
 
 FRR_SNMP = frr-snmp_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_extra_package,$(FRR),$(FRR_SNMP)))
 
 FRR_SNMP_DBG = frr-snmp-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(FRR),$(FRR_SNMP_DBG)))
+$(eval $(call add_extra_package,$(FRR),$(FRR_SNMP_DBG)))
 
 export FRR FRR_PYTHONTOOLS FRR_DBG FRR_SNMP FRR_SNMP_DBG
 

From 42fa0968834f69a169f21a72cca92b97eaec79c1 Mon Sep 17 00:00:00 2001
From: Denys Petryshyn <74670099+dpetryshintl@users.noreply.github.com>
Date: Mon, 4 Jan 2021 20:38:53 +0200
Subject: [PATCH 0009/1674] [BFN] Upgrade docker-syncd-bfn to buster (#6345)

* Add changes to allow migration of bfn syncd to buster

* Update BFN packages for Debian 10

Signed-off-by: Denys Petryshyn <denysx.petryshyn@intel.com>
---
 platform/barefoot/bfn-platform.mk                   | 2 +-
 platform/barefoot/bfn-sai.mk                        | 2 +-
 platform/barefoot/docker-ptf-bfn.mk                 | 1 -
 platform/barefoot/docker-syncd-bfn-rpc.mk           | 1 -
 platform/barefoot/docker-syncd-bfn.mk               | 3 ---
 platform/barefoot/docker-syncd-bfn/Dockerfile.j2    | 4 ++--
 platform/barefoot/docker-syncd-bfn/supervisord.conf | 4 ++--
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index 1524a5be9b07..1db534775acd 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20201224_deb9.deb
+BFN_PLATFORM = bfnplatform_20201228_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index 0ef4f40258af..4f6322239d05 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20201224_deb9.deb
+BFN_SAI = bfnsdk_20201228_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)
diff --git a/platform/barefoot/docker-ptf-bfn.mk b/platform/barefoot/docker-ptf-bfn.mk
index 752e7345752a..573e9cd9cffa 100644
--- a/platform/barefoot/docker-ptf-bfn.mk
+++ b/platform/barefoot/docker-ptf-bfn.mk
@@ -3,4 +3,3 @@
 DOCKER_PTF_BFN = docker-ptf-bfn.gz
 $(DOCKER_PTF_BFN)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
 $(DOCKER_PTF_BFN)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_BFN)
diff --git a/platform/barefoot/docker-syncd-bfn-rpc.mk b/platform/barefoot/docker-syncd-bfn-rpc.mk
index 11b70a3a774f..aee465151d84 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc.mk
+++ b/platform/barefoot/docker-syncd-bfn-rpc.mk
@@ -12,7 +12,6 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
 endif
 $(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
 endif
diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk
index ae4ca9d9f272..3a5c693e2fa8 100644
--- a/platform/barefoot/docker-syncd-bfn.mk
+++ b/platform/barefoot/docker-syncd-bfn.mk
@@ -10,8 +10,5 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                $(LIBSAIMETADATA_DBG) \
                                $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
-
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
index b4bcafe5926a..b9dbad963665 100755
--- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
+++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-stretch
+FROM docker-config-engine-buster
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -15,7 +15,7 @@ RUN apt-get install -y \
         libxml2 \
         libpcap-dev \
         libusb-1.0-0-dev \
-        libcurl3 \
+        libcurl4 \
         libcurl4-gnutls-dev \
         libunwind8-dev \
         libpython3.4 \
diff --git a/platform/barefoot/docker-syncd-bfn/supervisord.conf b/platform/barefoot/docker-syncd-bfn/supervisord.conf
index cb54aa419484..39ea308277d7 100644
--- a/platform/barefoot/docker-syncd-bfn/supervisord.conf
+++ b/platform/barefoot/docker-syncd-bfn/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:dependent-startup]
-command=python2 -m supervisord_dependent_startup
+command=python3 -m supervisord_dependent_startup
 autostart=true
 autorestart=unexpected
 startretries=0
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
-command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
+command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

From 08ab27506b1acf9a64e0c56f3ce267cf4c7af893 Mon Sep 17 00:00:00 2001
From: Sabareesh-Kumar-Anandan
 <59681634+Sabareesh-Kumar-Anandan@users.noreply.github.com>
Date: Tue, 5 Jan 2021 01:58:32 +0530
Subject: [PATCH 0010/1674] [libyang1] Adding LFS support for arm32 (#6346)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the emulated armhf environment, the function readdir()returns NULL on a ext4 file system directory. When running the libyang1 test cases, it will require to load the plugins from the files (such as metadata.so), because the readdir() is failing, the plugins can’t be loaded in the emulated armhf environment, so it causes libyang1 test error. This error is a combination of the following reasons.
• Emulation of a 32-bit target from a 64-bit host –> qemu from x86_64 to armhf
• Glibc version > 2.27 – Debian buster is using glibc 2.28

- How I did it
Enabled large file support by setting _FILE_OFFSET_BITS=64 for libyang1.

Signed-off-by: Sabareesh Kumar Anandan <sanandan@marvell.com>
---
 src/libyang1/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libyang1/Makefile b/src/libyang1/Makefile
index acdd686b7965..da6359aa9e12 100644
--- a/src/libyang1/Makefile
+++ b/src/libyang1/Makefile
@@ -28,6 +28,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd libyang-$(LIBYANG1_VERSION)
 	sed -i 's/set(LIBYANG_MAJOR_SOVERSION 1)/set(LIBYANG_MAJOR_SOVERSION 2)/' CMakeLists.txt
 	sed -i 's/libyang1/libyang2/' debian/libyang1.install
+	# Enable large file support for 32-bit arch
+	echo 'add_definitions(-D_FILE_OFFSET_BITS=64)' >> CMakeLists.txt
+
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 	popd
 

From f7bb635be87d3d7903e26a85ce7385ff7a5798d5 Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Tue, 5 Jan 2021 01:00:48 +0200
Subject: [PATCH 0011/1674] [BFN] Convert platform modules to python 3 (#6347)

Fix syntax errors during xcvrd start with Python 3 daemons
---
 .../sonic_platform/sfp.py                                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
index dc57dbcd9040..cb8931998e39 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
@@ -46,7 +46,7 @@ def qsfp_ports(self):
 
     @property
     def port_to_eeprom_mapping(self):
-        print "dependency on sysfs has been removed"
+        print("dependency on sysfs has been removed")
         raise Exception()
 
     def __init__(self):
@@ -88,8 +88,8 @@ def qsfp_presence_get(client):
         try:
             presence = thrift_try(qsfp_presence_get)
         except Exception as e:
-            print e.__doc__
-            print e.message
+            print( e.__doc__)
+            print(e.message)
 
         return presence
 
@@ -167,7 +167,7 @@ def get_transceiver_change_event(self, timeout=0):
         elif timeout > 0:
             timeout = timeout / float(1000) # Convert to secs
         else:
-            print "get_transceiver_change_event:Invalid timeout value", timeout
+            print("get_transceiver_change_event:Invalid timeout value", timeout)
             return False, {}
 
         while forever or timeout > 0:

From 1b049421aa3d84637c97b90d4fc537a7071ea8a9 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Tue, 5 Jan 2021 04:33:44 +0000
Subject: [PATCH 0012/1674] [DellEMC] Add platform-modules as prerequisite for
 determine-reboot-cause (#6322)

Add a systemd dependency to make platform-modules service as a prerequisite for determine-reboot-cause service to ensure platform initialization is complete before determine-reboot-cause.service executes.
---
 .../s5232f/systemd/platform-modules-s5232f.service              | 2 +-
 .../s6000/systemd/platform-modules-s6000.service                | 2 +-
 .../s6100/systemd/platform-modules-s6100.service                | 2 +-
 .../z9100/systemd/platform-modules-z9100.service                | 2 +-
 .../z9264f/systemd/platform-modules-z9264f.service              | 2 +-
 .../z9332f/systemd/platform-modules-z9332f.service              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/systemd/platform-modules-s5232f.service b/platform/broadcom/sonic-platform-modules-dell/s5232f/systemd/platform-modules-s5232f.service
index 7fb3801e339e..0ca31b522bd4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/systemd/platform-modules-s5232f.service
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/systemd/platform-modules-s5232f.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell S5232f Platform modules
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 DefaultDependencies=no
 
 [Service]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/systemd/platform-modules-s6000.service b/platform/broadcom/sonic-platform-modules-dell/s6000/systemd/platform-modules-s6000.service
index b55a466890bd..22de50ca929e 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/systemd/platform-modules-s6000.service
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/systemd/platform-modules-s6000.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Dell S6000 Platform modules
 After=local-fs.target
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 
 [Service]
 Type=oneshot
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
index 9b5805d5cbbb..4883ecf268fd 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell S6100 Platform modules
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 DefaultDependencies=no
 
 [Service]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/systemd/platform-modules-z9100.service b/platform/broadcom/sonic-platform-modules-dell/z9100/systemd/platform-modules-z9100.service
index 00fbfa6803ef..390cb6e0f567 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/systemd/platform-modules-z9100.service
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/systemd/platform-modules-z9100.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell Z9100 Platform modules
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 DefaultDependencies=no
 
 [Service]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/systemd/platform-modules-z9264f.service b/platform/broadcom/sonic-platform-modules-dell/z9264f/systemd/platform-modules-z9264f.service
index b89f61ea6226..05d920a8502b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/systemd/platform-modules-z9264f.service
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/systemd/platform-modules-z9264f.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell Z9264f Platform modules
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 DefaultDependencies=no
 
 [Service]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/systemd/platform-modules-z9332f.service b/platform/broadcom/sonic-platform-modules-dell/z9332f/systemd/platform-modules-z9332f.service
index 49064b00d682..348313718a70 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/systemd/platform-modules-z9332f.service
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/systemd/platform-modules-z9332f.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell Z9332f Platform modules
-Before=pmon.service
+Before=pmon.service determine-reboot-cause.service
 DefaultDependencies=no
 
 [Service]

From dc94373a86a1dcc8755c31d93c6e03e2f356f37d Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Mon, 4 Jan 2021 21:57:58 -0800
Subject: [PATCH 0013/1674] [docker-sonic-vs]: reduce the build steps for
 docker-sonic-vs (#6350)

combine multiple same operation into one operation to reduce
the build steps. this is to avoid max depth exceeded issue
in the build.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/vs/docker-sonic-vs/Dockerfile.j2 | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
index a9f05f9b7421..837e8fc3cb66 100644
--- a/platform/vs/docker-sonic-vs/Dockerfile.j2
+++ b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -101,33 +101,23 @@ RUN pip3 install \
 
 {% if docker_sonic_vs_debs.strip() -%}
 # Copy locally-built Debian package dependencies
-{%- for deb in docker_sonic_vs_debs.split(' ') %}
-COPY debs/{{ deb }} /debs/
-{%- endfor %}
+COPY {%- for deb in docker_sonic_vs_debs.split(' ') %} debs/{{ deb }}{%- endfor %} /debs/
 
 # Install locally-built Debian packages and implicitly install their dependencies
-{%- for deb in docker_sonic_vs_debs.split(' ') %}
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
-{%- endfor %}
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; {%- for deb in docker_sonic_vs_debs.split(' ') %} dpkg_apt /debs/{{ deb }};{%- endfor %}
 {%- endif %}
 
 {% if docker_sonic_vs_pydebs.strip() -%}
 # Copy locally-built Debian package dependencies
-{%- for deb in docker_sonic_vs_pydebs.split(' ') %}
-COPY python-debs/{{ deb }} /debs/
-{%- endfor %}
+COPY {%- for deb in docker_sonic_vs_pydebs.split(' ') %} python-debs/{{ deb }}{%- endfor %} /debs/
 
 # Install locally-built Debian packages and implicitly install their dependencies
-{%- for deb in docker_sonic_vs_pydebs.split(' ') %}
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
-{%- endfor %}
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; {%- for deb in docker_sonic_vs_pydebs.split(' ') %} dpkg_apt /debs/{{ deb }};{%- endfor %}
 {%- endif %}
 
 {% if docker_sonic_vs_whls.strip() %}
 # copy all whl PKGs first,
-{% for whl in docker_sonic_vs_whls.split(' ') -%}
-COPY python-wheels/{{ whl }}  python-wheels/
-{% endfor %}
+copy {%- for whl in docker_sonic_vs_whls.split(' ') %} python-wheels/{{ whl }}{%- endfor %} python-wheels/
 
 # install PKGs after copying all PKGs to avoid dependency failure
 # use py3 to find python3 package, which is forced by wheel as of now

From d4f33183374a236623a1a3713c7ba026c5bf147d Mon Sep 17 00:00:00 2001
From: sudhanshukumar22 <51457531+sudhanshukumar22@users.noreply.github.com>
Date: Tue, 5 Jan 2021 12:49:50 +0530
Subject: [PATCH 0014/1674] [lldp] lldp upstream patches (#6118)

The details are as follows:

    1. 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch

    Patch taken from https://github.com/lldpd/lldpd/commit/78243478dcec865486b387cf361783dc137015b5

    lib: remove limit on system description length

    The limit was introduced in 9c49ced while fixing a memory leak.
    The state data is used to ensure we don't interleave operations. We
    need to handle the case where the value is truncated because it is
    larger than the allocated size.

    Fix issue https://github.com/lldpd/lldpd/issues/408

    2. 0011-fix-med-location-len.patch

    Patch taken from https://github.com/lldpd/lldpd/pull/422/commits/5c3479463a919193213213e2d8634c754c09aa51

    lib: fix LLDP-MED location parsing in liblldpctl

    Some bounds were not checked correctly when parsing LLDP-MED civic
    location fields. This triggers out-of-bound reads (no write) in
    lldpcli, ultimately leading to a crash.

    Fix https://github.com/lldpd/lldpd/pull/420

Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
---
 ...-length-exceeded-from-lldp-community.patch | 35 ++++++++++++++
 .../patch/0011-fix-med-location-len.patch     | 47 +++++++++++++++++++
 src/lldpd/patch/series                        |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 src/lldpd/patch/0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
 create mode 100644 src/lldpd/patch/0011-fix-med-location-len.patch

diff --git a/src/lldpd/patch/0010-Ported-fix-for-length-exceeded-from-lldp-community.patch b/src/lldpd/patch/0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
new file mode 100644
index 000000000000..072790641206
--- /dev/null
+++ b/src/lldpd/patch/0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
@@ -0,0 +1,35 @@
+From fdb789c348fdcde6d5ef8b837d7f33718bc0862b Mon Sep 17 00:00:00 2001
+From: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
+Date: Mon, 23 Nov 2020 20:47:28 -0800
+Subject: [PATCH] Ported fix for https://github.com/lldpd/lldpd/issues/408 from
+ community
+
+---
+ src/lib/atom.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/atom.c b/src/lib/atom.c
+index f81d3bb..75c1275 100644
+--- a/src/lib/atom.c
++++ b/src/lib/atom.c
+@@ -327,7 +327,7 @@ _lldpctl_do_something(lldpctl_conn_t *conn,
+ 			conn->state_data[0] = 0;
+ 	}
+ 	if (conn->state == state_send &&
+-	    (state_data == NULL || !strncmp(conn->state_data, state_data, sizeof(conn->state_data)))) {
++	    (state_data == NULL || !strncmp(conn->state_data, state_data, sizeof(conn->state_data) - 1))) {
+ 		/* We need to send the currently built message */
+ 		rc = lldpctl_send(conn);
+ 		if (rc < 0)
+@@ -335,7 +335,7 @@ _lldpctl_do_something(lldpctl_conn_t *conn,
+ 		conn->state = state_recv;
+ 	}
+ 	if (conn->state == state_recv &&
+-	    (state_data == NULL || !strncmp(conn->state_data, state_data, sizeof(conn->state_data)))) {
++	    (state_data == NULL || !strncmp(conn->state_data, state_data, sizeof(conn->state_data) - 1))) {
+ 		/* We need to receive the answer */
+ 		while ((rc = ctl_msg_recv_unserialized(&conn->input_buffer,
+ 			    &conn->input_buffer_len,
+-- 
+2.12.2
+
diff --git a/src/lldpd/patch/0011-fix-med-location-len.patch b/src/lldpd/patch/0011-fix-med-location-len.patch
new file mode 100644
index 000000000000..2290a94442c1
--- /dev/null
+++ b/src/lldpd/patch/0011-fix-med-location-len.patch
@@ -0,0 +1,47 @@
+From e9bf329eee94d6d49a17da35aea189179aeed3c6 Mon Sep 17 00:00:00 2001
+From: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
+Date: Thu, 24 Dec 2020 09:27:49 -0800
+Subject: [PATCH] From 5c3479463a919193213213e2d8634c754c09aa51 Mon Sep 17
+ 00:00:00 2001 From: Vincent Bernat <vincent@bernat.ch> Date: Sun, 6 Dec 2020
+ 14:21:04 +0100 Subject: [PATCH] lib: fix LLDP-MED location parsing in
+ liblldpctl
+
+Some bounds were not checked correctly when parsing LLDP-MED civic
+location fields. This triggers out-of-bound reads (no write) in
+lldpcli, ultimately leading to a crash.
+
+Fix #420
+Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
+---
+ src/lib/atoms/med.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/atoms/med.c b/src/lib/atoms/med.c
+index e1b20fd..595dba4 100644
+--- a/src/lib/atoms/med.c
++++ b/src/lib/atoms/med.c
+@@ -540,6 +540,7 @@ _lldpctl_atom_get_str_med_location(lldpctl_atom_t *atom, lldpctl_key_t key)
+ 		return NULL;
+ 	case lldpctl_k_med_location_country:
+ 		if (m->location->format != LLDP_MED_LOCFORMAT_CIVIC) break;
++		if (m->location->data_len < 4) return NULL;
+ 		value = _lldpctl_alloc_in_atom(atom, 3);
+ 		if (!value) return NULL;
+ 		memcpy(value, m->location->data + 2, 2);
+@@ -732,8 +733,11 @@ _lldpctl_atom_iter_med_caelements_list(lldpctl_atom_t *atom)
+ {
+ 	struct _lldpctl_atom_med_caelements_list_t *plist =
+ 	    (struct _lldpctl_atom_med_caelements_list_t *)atom;
+-	struct ca_iter *iter = _lldpctl_alloc_in_atom(atom, sizeof(struct ca_iter));
+-	if (!iter) return NULL;
++	struct ca_iter *iter;
++	if (plist->parent->location->data_len < 4 ||
++	    *(uint8_t*)plist->parent->location->data < 3 ||
++	    !(iter = _lldpctl_alloc_in_atom(atom, sizeof(struct ca_iter))))
++		return NULL;
+ 	iter->data = (uint8_t*)plist->parent->location->data + 4;
+ 	iter->data_len = *(uint8_t*)plist->parent->location->data - 3;
+ 	return (lldpctl_atom_iter_t*)iter;
+-- 
+2.12.2
+
diff --git a/src/lldpd/patch/series b/src/lldpd/patch/series
index 419fbc96a16f..32fd4c0ca9a7 100644
--- a/src/lldpd/patch/series
+++ b/src/lldpd/patch/series
@@ -3,3 +3,5 @@
 0004-lldpctl-put-a-lock-around-some-commands-to-avoid-rac.patch
 0006-lib-fix-memory-leak.patch
 0007-lib-fix-memory-leak-when-handling-I-O.patch
+0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
+0011-fix-med-location-len.patch

From a79eb88052963c2ba18045fe1776a50c6d3452c4 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 5 Jan 2021 19:05:13 +0800
Subject: [PATCH 0015/1674] Install the latest version of the sonic build hooks
 in slave container (#6348)

---
 scripts/prepare_slave_container_buildinfo.sh | 3 +++
 scripts/versions_manager.py                  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/scripts/prepare_slave_container_buildinfo.sh b/scripts/prepare_slave_container_buildinfo.sh
index d66bbe816104..be6fe078bdfb 100755
--- a/scripts/prepare_slave_container_buildinfo.sh
+++ b/scripts/prepare_slave_container_buildinfo.sh
@@ -4,6 +4,9 @@ SLAVE_DIR=$1
 ARCH=$2
 DISTRO=$3
 
+# Install the latest debian package sonic-build-hooks in the slave container
+sudo dpkg -i --force-overwrite $SLAVE_DIR/buildinfo/sonic-build-hooks_*.deb > /dev/null
+
 # Enable the build hooks
 symlink_build_hooks
 
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index 59621cdfbbc7..336568bfb4e0 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -190,6 +190,8 @@ def _get_config_module(self, default_module, dist, arch):
             if ctype not in ctype_components:
                 ctype_components[ctype] = []
         for components in ctype_components.values():
+            if len(components) == 0:
+                continue
             config_component = self._get_config_for_ctype(components, dist, arch)
             config_components.append(config_component)
         config_module = VersionModule(self.name, config_components)

From 46c2bf0ed4d54ece26764955e043ef3c4ed8fba4 Mon Sep 17 00:00:00 2001
From: Akhilesh Samineni <47657796+AkhileshSamineni@users.noreply.github.com>
Date: Tue, 5 Jan 2021 22:52:16 +0530
Subject: [PATCH 0016/1674] After first bootup, the FEATURE table is not
 present in CONFIG_DB (#5911)

Fix the After first bootup(onie-install), the FEATURE table is not present in CONFIG_DB.
Fix is done by calling config reload.
---
 files/image_config/config-setup/config-setup | 36 ++++----------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index 8db3d5c1b4eb..4ed841cd3cdc 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -112,10 +112,13 @@ reload_minigraph()
 }
 
 # Reload exisitng config db file on disk
+# Usage: reload_configdb <config_file>
 reload_configdb()
 {
+    CONFIG_FILE=${1}
+
     echo "Reloading existing config db..."
-    config reload -y -n
+    config reload ${CONFIG_FILE} -y -n
 }
 # Restore SONiC configuration from a backup copy
 function copy_config_files_and_directories()
@@ -171,33 +174,6 @@ ztp_is_enabled()
     return $rv
 }
 
-# Load requested SONiC configuration into config DB and initialize it
-# Usage: load_config <config_file>
-#
-#
-load_config()
-{
-    CONFIG_FILE=${1}
-    if [ "${CONFIG_FILE}" = "" ]; then
-        return 1
-    fi
-
-    sonic-db-cli CONFIG_DB FLUSHDB
-    sonic-cfggen -j ${CONFIG_FILE} --write-to-db
-    if [ $? -ne 0 ]; then
-        return $?
-    fi
-
-    if [[ -x /usr/local/bin/db_migrator.py ]]; then
-        # Migrate the DB to the latest schema version if needed
-        /usr/local/bin/db_migrator.py -o migrate
-    fi
-
-    sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
-    return 0
-}
-
-
 # Generate requested SONiC configuration and save it as destination file
 # Usage: generate_config < factory | ztp > <destination_file>
 #
@@ -249,14 +225,14 @@ do_config_initialization()
         if ! ztp_is_enabled ; then
             echo "No configuration detected, generating factory default configuration..."
             generate_config factory ${CONFIG_DB_JSON}
-            load_config ${CONFIG_DB_JSON}
+            reload_configdb ${CONFIG_DB_JSON}
         fi
     fi
 
     if  ztp_is_enabled ; then
         echo "No configuration detected, initiating zero touch provisioning..."
         generate_config ztp ${TMP_ZTP_CONFIG_DB_JSON}
-        load_config ${TMP_ZTP_CONFIG_DB_JSON}
+        reload_configdb ${TMP_ZTP_CONFIG_DB_JSON}
         rm -f ${TMP_ZTP_CONFIG_DB_JSON}
     fi
 

From d00dc069459f52f8732ad7f8c1e002ef397934a1 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 6 Jan 2021 01:39:52 +0800
Subject: [PATCH 0017/1674] [xcvrd] Remove dependency on SONIC_PLATFORM_API_PY2
 and SONIC_PLATFORM_API_PY3 (#6344)

Remove the build time dependency on SONIC_PLATFORM_API_PY2 and SONIC_PLATFORM_API_PY3 from xcvrd make rule
---
 rules/sonic-xcvrd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/sonic-xcvrd.mk b/rules/sonic-xcvrd.mk
index 5a0c6a44b89d..018363f367fd 100644
--- a/rules/sonic-xcvrd.mk
+++ b/rules/sonic-xcvrd.mk
@@ -4,7 +4,7 @@
 
 SONIC_XCVRD_PY2 = sonic_xcvrd-1.0-py2-none-any.whl
 $(SONIC_XCVRD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-xcvrd
-$(SONIC_XCVRD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_PLATFORM_API_PY2)
+$(SONIC_XCVRD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2)
 $(SONIC_XCVRD_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(SONIC_XCVRD_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_XCVRD_PY2)
@@ -13,7 +13,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_XCVRD_PY2)
 
 SONIC_XCVRD_PY3 = sonic_xcvrd-1.0-py3-none-any.whl
 $(SONIC_XCVRD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-xcvrd
-$(SONIC_XCVRD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_XCVRD_PY2) $(SONIC_PLATFORM_COMMON_PY3) $(SONIC_PLATFORM_API_PY3)
+$(SONIC_XCVRD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_XCVRD_PY2) $(SONIC_PLATFORM_COMMON_PY3)
 $(SONIC_XCVRD_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 $(SONIC_XCVRD_PY3)_PYTHON_VERSION = 3
 SONIC_PYTHON_WHEELS += $(SONIC_XCVRD_PY3)

From 5becc2ac7ee6f7fe628a82d33841748fea8bcd21 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 5 Jan 2021 10:47:42 -0800
Subject: [PATCH 0018/1674] [determine-reboot-cause] Ignore non-hardware reboot
 cause (#6349)

- Why I did it - Reboot cause prints "Non-Hardware (N/A)" instead of showing the software reboot cause.
The issue is mishandling of hardware reboot cause in determine-reboot-cause script.

- How I did it
Fixed the handling for Non Hardware reboot cause. Ignore if Non-Hardware is present in the hardware_reboot_cause output. Added some code refactoring for simplicity.

- How to verify it - With fix, the hardware reboot cause is ignored (if it is non hw):
---
 .../scripts/determine-reboot-cause            | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/sonic-host-services/scripts/determine-reboot-cause b/src/sonic-host-services/scripts/determine-reboot-cause
index 8439c78a7016..8f1ee0a39b5d 100755
--- a/src/sonic-host-services/scripts/determine-reboot-cause
+++ b/src/sonic-host-services/scripts/determine-reboot-cause
@@ -164,35 +164,22 @@ def main():
     if os.path.exists(PREVIOUS_REBOOT_CAUSE_FILE):
         os.remove(PREVIOUS_REBOOT_CAUSE_FILE)
 
-    hardware_reboot_cause = None
     # This variable is kept for future-use purpose. When proc_cmd_line/vendor/software provides
     # any additional_reboot_info it will be stored as a "comment" in REBOOT_CAUSE_HISTORY_FILE
     additional_reboot_info = "N/A"
 
-    # 1. Check if the previous reboot was warm/fast reboot by testing whether there is "fast|fastfast|warm" in /proc/cmdline
+    # Check if the previous reboot was warm/fast reboot by testing whether there is "fast|fastfast|warm" in /proc/cmdline
     proc_cmdline_reboot_cause = find_proc_cmdline_reboot_cause()
 
-    # 2. Check if the previous reboot was caused by hardware
-    #    If yes, the hardware reboot cause will be treated as the reboot cause
-    hardware_reboot_cause = find_hardware_reboot_cause()
-
-    # 3. If there is a REBOOT_CAUSE_FILE, it will contain any software-related
-    #    reboot info. We will use it as the previous cause.
-    software_reboot_cause = find_software_reboot_cause()
-
-    # The main decision logic of the reboot cause:
-    # If there is a reboot cause indicated by /proc/cmdline, it should be warmreboot/fastreboot
-    #   the software_reboot_cause which is the content of /hosts/reboot-cause/reboot-cause.txt
-    #   will be treated as the reboot cause
-    # Elif there is a reboot cause indicated by platform API,
-    #   the hardware_reboot_cause will be treated as the reboot cause
-    # Else the software_reboot_cause will be treated as the reboot cause
-    if proc_cmdline_reboot_cause is not None:
-        previous_reboot_cause = software_reboot_cause
-    elif hardware_reboot_cause is not REBOOT_CAUSE_NON_HARDWARE:
-        previous_reboot_cause = hardware_reboot_cause
+    # If /proc/cmdline does not indicate reboot cause, check if the previous reboot was caused by hardware
+    if proc_cmdline_reboot_cause is None:
+        previous_reboot_cause = find_hardware_reboot_cause()
+        if previous_reboot_cause.startswith(REBOOT_CAUSE_NON_HARDWARE):
+            # If the reboot cause is non-hardware, get the reboot cause from REBOOT_CAUSE_FILE
+            previous_reboot_cause = find_software_reboot_cause()
     else:
-        previous_reboot_cause = software_reboot_cause
+        # Get the reboot cause from REBOOT_CAUSE_FILE
+        previous_reboot_cause = find_software_reboot_cause()
 
     # Current time
     reboot_cause_gen_time = str(datetime.datetime.now().strftime('%Y_%m_%d_%H_%M_%S'))

From dd25f774b5d4e5ceda55db1926f33113c18cf87c Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 6 Jan 2021 00:00:18 -0800
Subject: [PATCH 0019/1674] [rsyslog]: Explicitly set the notify mode for
 rsyslog imfile module  (#6351)

Enable the notify mode of rsyslogd imfile module used for supervisord
logs in docker container.

Setup the mode="inotify" when loading imfile, made sure we are are getting
supervisord logs in host immediately.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 dockers/docker-base/etc/rsyslog.d/supervisor.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-base/etc/rsyslog.d/supervisor.conf b/dockers/docker-base/etc/rsyslog.d/supervisor.conf
index ce70f10e6e73..fde8d8a6c994 100644
--- a/dockers/docker-base/etc/rsyslog.d/supervisor.conf
+++ b/dockers/docker-base/etc/rsyslog.d/supervisor.conf
@@ -1,4 +1,4 @@
-module(load="imfile") #By default notify mode
+module(load="imfile" mode="inotify") # Ensure "inotify" mode is used
 $WorkDirectory /var/log/supervisor
 # Start Monitoring the file
 input(type="imfile"

From a37aa0850488166c9142ed16735372eaaa542801 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 6 Jan 2021 06:14:25 -0800
Subject: [PATCH 0020/1674] [sairedis] advance sairedis submodule head (#6365)

To incldue following changes:

- [ci]: add build for arm64 and armhf (#757)
- Use template hgetall, because we will tune the return types of library functions (#759)
- [syncd] Fix bulk multi attrs for same key db update (#761)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 754849a476ab..e9401364da28 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 754849a476ab64feb163baa23190078a5b1b0586
+Subproject commit e9401364da28259f065b2106fa8590423490f3ea

From c6f14c99270918854f1f0d2eb7f85bf59e296fa8 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Sat, 9 Jan 2021 08:05:54 -0800
Subject: [PATCH 0021/1674] [202012][Arista] Update driver submodules (#6397)

 - Cleanup and Refactor of library internals, logic mostly unchanged.
 - Enhance debugability with `arista dump` and `arista diag` commands.
 - Fix power supply detection issue.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index adf108419894..937ea8abc1de 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit adf108419894f3b58c0c69722e0be3c72613180e
+Subproject commit 937ea8abc1de457b26b7bb7a5208dab6ce40f4a1
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index adf108419894..937ea8abc1de 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit adf108419894f3b58c0c69722e0be3c72613180e
+Subproject commit 937ea8abc1de457b26b7bb7a5208dab6ce40f4a1

From 7305b55c80c39112724b32e7157b76b68ab69afd Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 7 Jan 2021 00:42:04 +0530
Subject: [PATCH 0022/1674] DellEMC: Z9332f change SFP detection logic (#6261)

- Dynamically change EEPROM driver based on media type.
- Otherwise, EEPROM INFO and DOM INFO might not be fetched properly and will result in erroneous output.
---
 .../z9332f/scripts/z9332f_platform.sh         |   2 +-
 .../z9332f/sonic_platform/sfp.py              | 152 ++++++++++++++++--
 2 files changed, 138 insertions(+), 16 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
index 91c644f1a6f4..f80207df8ea2 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
@@ -58,7 +58,7 @@ switch_board_qsfp() {
         "new_device")
                         for ((i=10;i<=41;i++));
                         do
-                            echo optoe1 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
+                            echo optoe3 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
                         done
                         ;;
  
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index ccd1d642640f..7fc50958c9ee 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #############################################################################
-# DELLEMC S5248F
+# DELLEMC Z9332F
 #
 # Module contains an implementation of SONiC Platform Base API and
 # provides the platform information
@@ -11,6 +11,7 @@
 try:
     import os
     import time
+    import subprocess
     import struct
     import mmap
     from sonic_platform_base.sfp_base import SfpBase
@@ -157,6 +158,24 @@
       'vendor_date': [SFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
   'ModuleThreshold': [SFP_DOM_OFFSET,   0, 56, 'parse_alarm_warning_threshold'],
 }
+MEDIA_TYPE_OFFSET = 0
+MEDIA_TYPE_WIDTH = 1
+
+SFP_TYPE_LIST = [
+    '03' # SFP/SFP+/SFP28 and later
+]
+QSFP_TYPE_LIST = [
+    '0c', # QSFP
+    '0d', # QSFP+ or later
+    '11'  # QSFP28 or later
+]
+QSFP_DD_TYPE_LIST = [
+    '18' #QSFP-DD Type
+]
+OSFP_TYPE_LIST=[
+    '19' # OSFP 8X Type
+]
+
 
 
 class Sfp(SfpBase):
@@ -164,12 +183,51 @@ class Sfp(SfpBase):
     DELLEMC Platform-specific Sfp class
     """
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
+    _port_to_i2c_mapping = {
+            1:  10,
+            2:  11,
+            3:  12,
+            4:  13,
+            5:  14,
+            6:  15,
+            7:  16,
+            8:  17,
+            9:  18,
+            10: 19,
+            11: 20,
+            12: 21,
+            13: 22,
+            14: 23,
+            15: 24,
+            16: 25,
+            17: 26,
+            18: 27,
+            19: 28,
+            20: 29,
+            21: 30,
+            22: 31,
+            23: 32,
+            24: 33,
+            25: 34,
+            26: 35,
+            27: 36,
+            28: 37,
+            29: 38,
+            30: 39,
+            31: 40,
+            32: 41,
+            33: 1,
+            34: 2
+            }
 
     def __init__(self, index, sfp_type, eeprom_path):
         SfpBase.__init__(self)
-        self.sfp_type = sfp_type
         self.index = index
         self.eeprom_path = eeprom_path
+        #sfp_type is the native port type and media_type is the transceiver type
+        #media_type will be detected in get_transceiver_info
+        self.sfp_type = sfp_type
+        self.media_type = self.sfp_type
         self.qsfpInfo = sff8436InterfaceId()
         self.qsfpDomInfo = sff8436Dom()
         self.sfpInfo = sff8472InterfaceId()
@@ -238,7 +296,7 @@ def _get_eeprom_data(self, eeprom_key):
         eeprom_data = None
         page_offset = None
 
-        if(self.sfp_type == 'QSFP'):
+        if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
             page_offset = sff8436_parser[eeprom_key][PAGE_OFFSET]
             eeprom_data_raw = self._read_eeprom_bytes(
                 self.eeprom_path,
@@ -292,6 +350,9 @@ def get_transceiver_info(self):
         transceiver_info_dict = {}
         compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(info_dict_keys, 'N/A')
+        self.media_type = self.set_media_type()
+        self.reinit_sfp_driver()
+
         # BaseInformation
         try:
             iface_data = self._get_eeprom_data('type')
@@ -301,7 +362,7 @@ def get_transceiver_info(self):
             rate_identifier = iface_data['data']['RateIdentifier']['value']
             identifier = iface_data['data']['type']['value']
             type_abbrv_name=iface_data['data']['type_abbrv_name']['value']
-            if(self.sfp_type == 'QSFP'):
+            if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 bit_rate = str(
                     iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
                 for key in qsfp_compliance_code_tup:
@@ -398,7 +459,7 @@ def get_transceiver_threshold_info(self):
         try:
             # Module Threshold
             module_threshold_data = self._get_eeprom_data('ModuleThreshold')
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
                 transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
                 transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
@@ -431,7 +492,7 @@ def get_transceiver_threshold_info(self):
         except (ValueError, TypeError) : pass
 
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 channel_threshold_data = self._get_eeprom_data('ChannelThreshold')
                 transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['data']['RxPowerHighAlarm']['value']
                 transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['data']['RxPowerHighWarning']['value']
@@ -598,7 +659,7 @@ def get_rx_los(self):
         """
         rx_los = False
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 rx_los_data = self._get_eeprom_data('rx_los')
                 # As the function expects a single boolean, if any one channel experience LOS,
                 # is considered LOS for QSFP 
@@ -618,7 +679,7 @@ def get_tx_fault(self):
         """
         tx_fault = False
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 tx_fault_data = self._get_eeprom_data('tx_fault')
                 for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') : 
                     tx_fault |= (tx_fault_data['data'][tx_fault_id]['value'] is 'On')
@@ -636,7 +697,7 @@ def get_tx_disable(self):
         """
         tx_disable = False
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable |= (tx_disable_data['data'][tx_disable_id]['value'] is 'On')
@@ -656,7 +717,7 @@ def get_tx_disable_channel(self):
         """
         tx_disable_channel = 0
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_channel <<= 1
@@ -671,7 +732,7 @@ def get_lpmode(self):
         """
         lpmode_state = False
         try: 
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -692,7 +753,7 @@ def get_power_override(self):
         power_override_state = False
 
         try:
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 power_override_data = self._get_eeprom_data('power_override')
                 power_override = power_override_data['data']['PowerOverRide']['value']
                 power_override_state = (power_override is 'On')
@@ -730,7 +791,7 @@ def get_tx_bias(self):
         tx_bias_list = []
         try:
             tx_bias_data = self._get_eeprom_data('ChannelMonitor')
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias') :
                     tx_bias = tx_bias_data['data'][tx_bias_id]['value']
                     tx_bias_list.append(tx_bias)
@@ -748,7 +809,7 @@ def get_rx_power(self):
         rx_power_list = []
         try:
             rx_power_data = self._get_eeprom_data('ChannelMonitor')
-            if (self.sfp_type == 'QSFP'):
+            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power'):
                     rx_power = rx_power_data['data'][rx_power_id]['value']
                     rx_power_list.append(rx_power)
@@ -765,7 +826,7 @@ def get_tx_power(self):
         """
         tx_power_list = []
         try:
-            if(self.sfp_type == 'QSFP'):
+            if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
                 # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
                 # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
                 # need to add more code for determining the capability and version compliance
@@ -895,6 +956,12 @@ def get_status(self):
         reset = self.get_reset_status()
         return (not reset)
 
+    def get_port_form_factor(self):
+        """
+        Retrieves the native port type
+        """
+        return self.sfp_type
+
     def get_max_port_power(self):
         """
         Retrieves the maximum power allowed on the port in watts
@@ -906,3 +973,58 @@ def get_max_port_power(self):
         """
         return (12.0 if self.sfp_type=='QSFP' else 2.5)
 
+    def set_media_type(self):
+        """
+        Reads optic eeprom byte to determine media type inserted
+        """
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_bytes(self.eeprom_path, MEDIA_TYPE_OFFSET, MEDIA_TYPE_WIDTH)
+        if eeprom_raw is not None:
+            if eeprom_raw[0] in SFP_TYPE_LIST:
+                self.media_type = 'SFP'
+            elif eeprom_raw[0] in QSFP_TYPE_LIST:
+                self.media_type = 'QSFP'
+            elif eeprom_raw[0] in QSFP_DD_TYPE_LIST:
+                self.media_type = 'QSFP-DD'
+            else:
+                #Set native port type if EEPROM type is not recognized/readable
+                self.media_type = self.sfp_type
+        else:
+            self.media_type = self.sfp_type
+
+        return self.media_type
+
+    def reinit_sfp_driver(self):
+        """
+        Changes the driver based on media type detected
+        """
+        del_sfp_path = "/sys/class/i2c-adapter/i2c-{0}/delete_device".format(self._port_to_i2c_mapping[self.index])
+        new_sfp_path = "/sys/class/i2c-adapter/i2c-{0}/new_device".format(self._port_to_i2c_mapping[self.index])
+        driver_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/name".format(self._port_to_i2c_mapping[self.index])
+        delete_device = "echo 0x50 >" + del_sfp_path
+
+        try:
+            with os.fdopen(os.open(driver_path, os.O_RDONLY)) as fd:
+                driver_name = fd.read()
+                driver_name = driver_name.rstrip('\r\n')
+                driver_name = driver_name.lstrip(" ")
+
+            #Avoid re-initialization of the QSFP/SFP optic on QSFP/SFP port.
+            if (self.media_type == 'SFP' and (driver_name == 'optoe1' or driver_name == 'optoe3')):
+                subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                new_device = "echo optoe2 0x50 >" + new_sfp_path
+                subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(2)
+            elif (self.media_type == 'QSFP' and (driver_name == 'optoe2' or driver_name  == 'optoe3')):
+                subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                new_device = "echo optoe1 0x50 >" + new_sfp_path
+                subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(2)
+            elif (self.media_type == 'QSFP-DD' and (driver_name == 'optoe1' or driver_name  == 'optoe2')):
+                subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                new_device = "echo optoe3 0x50 >" + new_sfp_path
+                subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(2)
+
+        except IOError as e:
+            print("Error: Unable to open file: %s" % str(e))

From c111a68e743e5305c7299e01502a9c2cc07492e5 Mon Sep 17 00:00:00 2001
From: sudhanshukumar22 <51457531+sudhanshukumar22@users.noreply.github.com>
Date: Thu, 7 Jan 2021 01:54:57 +0530
Subject: [PATCH 0023/1674] [docker-lldp]: sonic advertise meaningful
 SysDescription instead of debian (#6114)

Sonic devices advertise meaningful system description along with Debian package information.

before the fix:

-------------
admin@sonic:~$ show lldp neighbors
-------------------------------------------------------------------------------
LLDP neighbors:
-------------------------------------------------------------------------------
Interface: Ethernet0, via: LLDP, RID: 3, Time: 0 day, 16:36:30
SysName: sonic
SysDescr: Debian GNU/Linux 9 (stretch) Linux 4.9.0-11-2-amd64 #1 SMP Debian 4.9.189-3+deb9u2 (2019-11-11) x86_64
-------------------------------------------------------------------------------

After the fix:

root@sonic:~# show lldp neighbors Ethernet16
-------------------------------------------------------------------------------
LLDP neighbors:
-------------------------------------------------------------------------------
Interface:    Ethernet16, via: LLDP, RID: 10, Time: 0 day, 00:01:00
    SysName:      sonic
    SysDescr:     SONiC Software Version: SONiC.sonic_upstream_1.0_daily_201130_1501_62-dirty-20201130.203529 - HwSku: Accton-AS7816-64X - Distribution: Debian 10.6 - Kernel: 4.19.0-9-2-amd64
-------------------------------------------------------------------------------

Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
---
 dockers/docker-lldp/Dockerfile.j2         | 1 +
 dockers/docker-lldp/lldpdSysDescr.conf.j2 | 1 +
 dockers/docker-lldp/start.sh              | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 dockers/docker-lldp/lldpdSysDescr.conf.j2

diff --git a/dockers/docker-lldp/Dockerfile.j2 b/dockers/docker-lldp/Dockerfile.j2
index 297f7766519b..a1c7a1c1bee2 100644
--- a/dockers/docker-lldp/Dockerfile.j2
+++ b/dockers/docker-lldp/Dockerfile.j2
@@ -43,6 +43,7 @@ COPY ["start.sh", "/usr/bin/"]
 COPY ["waitfor_lldp_ready.sh", "/usr/bin/"]
 COPY ["supervisord.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd.conf.j2", "/usr/share/sonic/templates/"]
+COPY ["lldpdSysDescr.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd", "/etc/default/"]
 COPY ["lldpmgrd", "/usr/bin/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
diff --git a/dockers/docker-lldp/lldpdSysDescr.conf.j2 b/dockers/docker-lldp/lldpdSysDescr.conf.j2
new file mode 100644
index 000000000000..047b3c68b34f
--- /dev/null
+++ b/dockers/docker-lldp/lldpdSysDescr.conf.j2
@@ -0,0 +1 @@
+configure system description "SONiC Software Version: SONiC.{{ build_version }} - HwSku: {{ DEVICE_METADATA['localhost']['hwsku'] }} - Distribution: Debian {{ debian_version }} - Kernel: {{ kernel_version }}"
diff --git a/dockers/docker-lldp/start.sh b/dockers/docker-lldp/start.sh
index b2c82d6d0437..5a489884aea9 100755
--- a/dockers/docker-lldp/start.sh
+++ b/dockers/docker-lldp/start.sh
@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
+CFGGEN_PARAMS=" \
+    -d \
+    -t /usr/share/sonic/templates/lldpd.conf.j2 \
+    -y /etc/sonic/sonic_version.yml \
+    -t /usr/share/sonic/templates/lldpdSysDescr.conf.j2 \
+"
 
 if [ "${RUNTIME_OWNER}" == "" ]; then
     RUNTIME_OWNER="kube"
@@ -10,7 +16,7 @@ then
     ${CTR_SCRIPT} -f lldp -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION}
 fi
 
-sonic-cfggen -d -t /usr/share/sonic/templates/lldpd.conf.j2 > /etc/lldpd.conf
+sonic-cfggen $CFGGEN_PARAMS > /etc/lldpd.conf
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status

From 0182c5f5ca1b5f24aa50cc8903b32c9954e44b33 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 6 Jan 2021 14:47:30 -0800
Subject: [PATCH 0024/1674] [sonic-platform-common][sonic-platform-daemons]
 Update submodules (#6352)

src/sonic-platform-common 9935fca...8664efc (2):

Make sonic_sfp Python2 and Python3 compatible (#157)
[sffbase.py] Fix to make Python 3-compatible (#156)

src/sonic-platform-daemons e6c786b...81318f7 (1):

[psud] Fix issue where PSU Fan info is not updated in State DB (#137)

Fixes #6341
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 9935fca570a0..8664efc5472a 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 9935fca570a0c99be326049a9d671a2c218ae8e5
+Subproject commit 8664efc5472ae8cab04ad5a3499baa9a9c0d7f89
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index e6c786bd02e6..81318f7afdb6 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit e6c786bd02e6a253fcf67dec895e7c24e940c788
+Subproject commit 81318f7afdb65bd15af387c97152948d22cf9834

From 941c27ce2ae75df54b5d7e38c7a33f00ac900f9f Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:09:13 -0500
Subject: [PATCH 0025/1674] [Nokia]: Enable Telemetry for armhf and provide
 required qos files (#6364)

* [platform][Nokia]: Add buffers and qos files for config qos reload

   - providing required files

* [platform][armhf]: remove hardcoded disable for Telemetry on armhf

Co-authored-by: Carl Keene <keene@nokia.com>
---
 .../armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 | 8 ++++++++
 .../armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2     | 1 +
 platform/marvell-armhf/rules.mk                           | 1 -
 slave.mk                                                  | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
new file mode 100644
index 000000000000..9495a66c0d07
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
@@ -0,0 +1,8 @@
+{# Default values placeholder M0- Marvell SAI TBD buffers configuration #}
+
+{% set default_cable = '40m' %}
+{% set default_ports_num = 54 -%}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
new file mode 100644
index 000000000000..529f1be8a545
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
@@ -0,0 +1 @@
+# this file empty temporarily until qos supported SAI Marvell 
diff --git a/platform/marvell-armhf/rules.mk b/platform/marvell-armhf/rules.mk
index e53f9531b82b..27d3167edd03 100644
--- a/platform/marvell-armhf/rules.mk
+++ b/platform/marvell-armhf/rules.mk
@@ -10,7 +10,6 @@ include $(PLATFORM_PATH)/linux-kernel-armhf.mk
 include $(PLATFORM_PATH)/platform-et6448m.mk
 include $(PLATFORM_PATH)/platform-nokia.mk
 
-INCLUDE_SYSTEM_TELEMETRY = ""
 ENABLE_SYNCD_RPC = ""
 INCLUDE_MGMT_FRAMEWORK = ""
 
diff --git a/slave.mk b/slave.mk
index 18e70542f83e..686ecec5c508 100644
--- a/slave.mk
+++ b/slave.mk
@@ -116,7 +116,7 @@ ifeq ($(SONIC_INCLUDE_SYSTEM_TELEMETRY),y)
 INCLUDE_SYSTEM_TELEMETRY = y
 endif
 
-ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
+ifneq (,$(filter $(CONFIGURED_ARCH), arm64))
     # Workaround: Force disable Telmetry for ARM, will be removed after fixing issue
     # Issue: qemu crashes when it uses "go get url"
     # Qemu Support: https://bugs.launchpad.net/qemu/+bug/1838946

From be82cdbad5e37d65a38e737c4c2a6ccd371a21c0 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:47:36 -0800
Subject: [PATCH 0026/1674] Updated imfile configuration for supervisord logs 
 (#6368)

Updated imfile configuration for supervisord logs for stretch and buster.
---
 .../etc/rsyslog.d/supervisor.conf              | 18 +++++++++---------
 .../etc/rsyslog.d/supervisor.conf              | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf b/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
index 7c7a64d7afe0..fde8d8a6c994 100644
--- a/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
+++ b/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
@@ -1,9 +1,9 @@
-$ModLoad imfile
-
-$InputFileName /var/log/supervisor/supervisord.log
-$InputFileTag supervisord
-$InputFileStateFile state-supervisor
-$InputFileSeverity info
-$InputFileFacility local0
-$InputFilePersistStateInterval 1
-$InputRunFileMonitor
+module(load="imfile" mode="inotify") # Ensure "inotify" mode is used
+$WorkDirectory /var/log/supervisor
+# Start Monitoring the file
+input(type="imfile"
+      File="/var/log/supervisor/supervisord.log"
+      Tag="supervisord"
+      Severity="info"
+      Facility="local0"
+      PersistStateInterval="1")
diff --git a/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf b/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
index 7c7a64d7afe0..fde8d8a6c994 100644
--- a/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
+++ b/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
@@ -1,9 +1,9 @@
-$ModLoad imfile
-
-$InputFileName /var/log/supervisor/supervisord.log
-$InputFileTag supervisord
-$InputFileStateFile state-supervisor
-$InputFileSeverity info
-$InputFileFacility local0
-$InputFilePersistStateInterval 1
-$InputRunFileMonitor
+module(load="imfile" mode="inotify") # Ensure "inotify" mode is used
+$WorkDirectory /var/log/supervisor
+# Start Monitoring the file
+input(type="imfile"
+      File="/var/log/supervisor/supervisord.log"
+      Tag="supervisord"
+      Severity="info"
+      Facility="local0"
+      PersistStateInterval="1")

From 7462850ba44315a4e80145ab0091943ef4f9138e Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 7 Jan 2021 05:46:48 -0800
Subject: [PATCH 0027/1674] [brcm]: BRCM SAI 4.2.1.5-9 Fix
 _brcm_sai_indexed_data_get () with unexpected queue causing
 _brcm_sai_switch_assert () after warm reboot (#6374)

Starting from build (master) 176 the warm reboot on BRCM Platform started to experience syncd crash. Upon further debug by Ying it was determined that the crash was related to the following new change:
[Dynamic buffer calc] Support dynamic buffer calculation (#1338)

Ying also debugged further and found The crash was caused by buffer pool profile setting operation SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH

A case has filed with BRCM while a potential fix was tried by Ying that seems to have addressed this issue and we are making this change available in master branch so that it will allow further feature validation/testing especially in the warm reboot area.
Once an official fix is provided by BRCM, we will then remove this in house fix and apply the official fix.

- How to verify it
Just perform warm reboot with any master code 175 or above you should see this issue or issue the following cmd will also cause the crash: "mmuconfig -p egress_lossy_profile -a 0"
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index cdd42ff4ed5a..24cf07122e6b 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.2.1.5-7_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-8_amd64.deb?sv=2019-12-12&st=2020-12-18T18%3A41%3A23Z&se=2030-12-19T18%3A41%3A00Z&sr=b&sp=r&sig=GFNMn0borytUTFQJf%2F5A0J452XsQ%2FqnzBw5GyjFuYHw%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-7_amd64.deb
+BRCM_SAI = libsaibcm_4.2.1.5-9_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-9_amd64.deb?sv=2015-04-05&sr=b&sig=Rbqq%2FH4B71%2BWGzAzTuM3qxEdwpEnuxqFdGIMDpuN8t0%3D&se=2034-09-16T01%3A36%3A13Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-9_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-8_amd64.deb?sv=2019-12-12&st=2020-12-18T18%3A42%3A03Z&se=2030-12-19T18%3A42%3A00Z&sr=b&sp=r&sig=J%2BbRtZVVcZTLs3uqzZs9zObLKFxRgzvJkFL5iyJ48mA%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-9_amd64.deb?sv=2015-04-05&sr=b&sig=C%2Bo7YTkA2076LRfet1rHHlFu%2F6b9qoQiHljjaZCVa20%3D&se=2034-09-16T01%3A37%3A38Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 984c833e4cd07fd4e99726cffd2b3228c15a99de Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 7 Jan 2021 05:48:13 -0800
Subject: [PATCH 0028/1674] [system-health] Make `run_command()` Python
 3-compliant (#6371)

Pass universal_newlines=True parameter to subprocess.Popen(); no longer use .encode('utf-8') on resulting stdout.
This was missed in #5886

Note: I would prefer to use text=True instead of universal_newlines=True, as the former is an alias only available in Python 3 and is more understandable than the latter. However, Even though the setup.py file for this package only specifies Python 3, the LGTM tool finds other Python 2 code in the repo and validates the code as Python 2 code and alerts that text=True is an invalid parameter. Will stick with universal_newlines=True for now. Once all Python code in the repo has been converted to Python 3, I will change all universal_newlines=True to text=True.
---
 src/system-health/health_checker/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system-health/health_checker/utils.py b/src/system-health/health_checker/utils.py
index fe26054e420d..f310002e1e5f 100644
--- a/src/system-health/health_checker/utils.py
+++ b/src/system-health/health_checker/utils.py
@@ -8,8 +8,8 @@ def run_command(command):
     :return: Output of the shell command.
     """
     try:
-        process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
-        return process.communicate()[0].encode('utf-8')
+        process = subprocess.Popen(command, shell=True, universal_newlines=True, stdout=subprocess.PIPE)
+        return process.communicate()[0]
     except Exception:
         return None
 

From 1bdefd16facd142d1a50a6e0e68a418d1567668d Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Thu, 7 Jan 2021 16:45:38 -0800
Subject: [PATCH 0029/1674] Take a copy of existing TACACS credentials and
 restore it during upgrade (#6285)

In scenario where upgrade gets config from minigraph, it could miss tacacs credentials as they are not in minigraph. Hence restore explicitly upon load-minigraph, if present.

- Why I did it
Upon boot, when config migration is required, the switch could load config from minigraph. The config-load from minigraph would wipe off TACACS key and disable login via TACACS, which would disable all remote user access. This change, would re-configure the TACACS if there is a saved copy available.

- How I did it
When config is loaded from minigraph, look for a TACACS credentials back up (tacacs.json) under /etc/sonic/old_config. If present, load the credentials into running config, before config-save is called.

- How to verify it
Remove /etc/sonic/config_db.json and do an image update. Upon reboot, w/o this change, you would not be able ssh in as remote user. You may login as admin and check out, "show tacacs" & "show aaa" to verify that tacacs-key is missing and login is not enabled for tacacs.
With this change applied, remove /etc/sonic/config_db.json, but save tacacs & aaa credentials as tacacs.json in /etc/sonic/. Upon reboot, you should see remote user access possible.
---
 files/image_config/config-setup/config-setup | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index 4ed841cd3cdc..9bb7b33b6be6 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -41,6 +41,8 @@ CONFIG_SETUP_PRE_MIGRATION_FLAG=${CONFIG_SETUP_VAR_DIR}/pending_pre_migration
 CONFIG_SETUP_POST_MIGRATION_FLAG=${CONFIG_SETUP_VAR_DIR}/pending_post_migration
 CONFIG_SETUP_INITIALIZATION_FLAG=${CONFIG_SETUP_VAR_DIR}/pending_initialization
 
+TACACS_JSON_BACKUP=tacacs.json
+
 # Command usage and help
 usage()
 {
@@ -108,6 +110,11 @@ reload_minigraph()
 {
     echo "Reloading minigraph..."
     config load_minigraph -y -n 
+    if [ -r /etc/sonic/old_config/${TACACS_JSON_BACKUP} ]; then
+        sonic-cfggen -j /etc/sonic/old_config/${TACACS_JSON_BACKUP} --write-to-db
+    else
+        echo "Missing tacacs json to restore tacacs credentials"
+    fi
     config save -y
 }
 

From bfec282a82f94df1b0d368d873ec7e800569c069 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Thu, 7 Jan 2021 19:52:22 -0800
Subject: [PATCH 0030/1674] [Monit] Monitoring the running status of
 containers. (#6251)

**- Why I did it**
This PR aims to monitor the running status of each container. Currently the auto-restart feature was enabled. If a critical process exited unexpected, the container will be restarted. If the container was restarted 3 times during 20 minutes, then it will not run anymore unless we cleared the flag using the command `sudo systemctl reset-failed <container_name>` manually.

**- How I did it**
We will employ Monit to monitor a script. This script will generate the expected running container list and compare it with the current running containers. If there are containers which were expected to run but were not running, then an alerting message will be written into syslog.

**- How to verify it**
I tested this feature on a lab device `str-a7050-acs-3` which has single ASIC and `str2-n3164-acs-3` which has a Multi-ASIC. First I manually stopped a container by running the command `sudo systemctl stop <container_name>`, then I checked whether there was an alerting message in the syslog.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
---
 .../build_templates/sonic_debian_extension.j2 |   3 +
 files/image_config/monit/conf.d/sonic-host    |   2 +
 files/image_config/monit/container_checker    | 116 ++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100755 files/image_config/monit/container_checker

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index a301bee59ebd..b1955919149e 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -300,6 +300,9 @@ sudo cp $IMAGE_CONFIGS/monit/conf.d/* $FILESYSTEM_ROOT/etc/monit/conf.d/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/conf.d/*
 sudo cp $IMAGE_CONFIGS/monit/process_checker $FILESYSTEM_ROOT/usr/bin/
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/process_checker
+sudo cp $IMAGE_CONFIGS/monit/container_checker $FILESYSTEM_ROOT/usr/bin/
+sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
+
 
 # Install custom-built openssh sshd
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/openssh-server_*.deb
diff --git a/files/image_config/monit/conf.d/sonic-host b/files/image_config/monit/conf.d/sonic-host
index 202c49f8d7b2..17d7c64af7e2 100644
--- a/files/image_config/monit/conf.d/sonic-host
+++ b/files/image_config/monit/conf.d/sonic-host
@@ -31,3 +31,5 @@ check program routeCheck with path "/usr/local/bin/route_check.py"
     every 5 cycles
     if status != 0 for 3 cycle then alert repeat every 1 cycles
 
+check program container_checker with path "/usr/bin/container_checker"
+    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/files/image_config/monit/container_checker b/files/image_config/monit/container_checker
new file mode 100755
index 000000000000..abfbb34430bb
--- /dev/null
+++ b/files/image_config/monit/container_checker
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+
+"""
+container_checker
+
+This script is intended to be run by Monit. It will write an alerting message into
+syslog if it found containers which were expected to run but were not running. At
+the same time, if some containers were unexpected to run, it also writes an alerting
+syslog message. Note that if print(...) statement in this script was executed, the
+string in it will be appended to Monit syslog messages.
+
+The following is an example in Monit configuration file to show how Monit will run
+this script:
+
+check program container_checker with path "/usr/bin/container_checker"
+    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
+"""
+
+import subprocess
+import sys
+
+import swsssdk
+from sonic_py_common import multi_asic
+
+
+def get_command_result(command):
+    """
+    @summary: This function will execute the command and return the resulting output.
+    @return: A string which contains the output of command.
+    """
+    command_stdout = ""
+
+    try:
+        proc_instance = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                         shell=True, universal_newlines=True)
+        command_stdout, command_stderr = proc_instance.communicate()
+        if proc_instance.returncode != 0:
+            print("Failed to execute the command '{}'. Return code: '{}'".format(
+                command, proc_instance.returncode))
+            sys.exit(1)
+    except (OSError, ValueError) as err:
+        print("Failed to execute the command '{}'. Error: '{}'".format(command, err))
+        sys.exit(2)
+
+    return command_stdout.rstrip().split("\n")
+
+
+def get_expected_running_containers():
+    """
+    @summary: This function will get the expected running containers by following the rule:
+              The 'state' field of container in 'FEATURE' table should not be 'disabled'. Then
+              if the device has Multi-ASIC, this function will get container list by determining the
+              value of field 'has_global_scope', the number of ASICs and the value of field
+              'has_per_asic_scope'. If the device has single ASIC, the container name was put into
+              the list.
+    @return:  A set which contains the expected running containers.
+    """
+    config_db = swsssdk.ConfigDBConnector()
+    config_db.connect()
+    feature_table = config_db.get_table("FEATURE")
+
+    expected_running_containers = set()
+
+    for container_name in feature_table.keys():
+        if feature_table[container_name]["state"] != "disabled":
+            if multi_asic.is_multi_asic():
+                if feature_table[container_name]["has_global_scope"] == "True":
+                    expected_running_containers.add(container_name)
+                if feature_table[container_name]["has_per_asic_scope"] == "True":
+                    num_asics = multi_asic.get_num_asics()
+                    for asic_id in range(num_asics):
+                        expected_running_containers.add(container_name + str(asic_id))
+            else:
+                expected_running_containers.add(container_name)
+
+    return expected_running_containers
+
+
+def get_current_running_containers():
+    """
+    @summary: This function will get the current running container list by analyzing the
+              output of command `docker ps`.
+    @return:  A set which contains the current running contianers.
+    """
+    running_containers = set()
+
+    command = "docker ps"
+    command_stdout = get_command_result(command)
+    for line in command_stdout[1:]:
+        running_containers.add(line.split()[-1].strip())
+
+    return running_containers
+
+
+def main():
+    """
+    @summary: This function will compare the difference between the current running containers
+              and the containers which were expected to run. If containers which were exepcted
+              to run were not running, then an alerting message will be written into syslog.
+    """
+    expected_running_containers = get_expected_running_containers()
+    current_running_containers = get_current_running_containers()
+
+    not_running_containers = expected_running_containers.difference(current_running_containers)
+    if not_running_containers:
+        print("Expected containers not running: " + ", ".join(not_running_containers))
+        sys.exit(3)
+
+    unexpected_running_containers = current_running_containers.difference(expected_running_containers)
+    if unexpected_running_containers:
+        print("Unexpected running containers: " + ", ".join(unexpected_running_containers))
+        sys.exit(4)
+
+
+if __name__ == "__main__":
+    main()

From 03391f20c51f05a1af2292fd3ca24ce574a229d0 Mon Sep 17 00:00:00 2001
From: pavel-shirshov <pavelsh@microsoft.com>
Date: Fri, 8 Jan 2021 14:03:26 -0800
Subject: [PATCH 0031/1674] [bgpcfgd]: Support default action for "Allow
 prefix" feature (#6370)

* Use 20 and 30 route-map entries instead of 2 and 3 for TSA

* Added support for dynamic "Allow list" default action.

Co-authored-by: Pavel Shirshov <pavel.contrib@gmail.com>
---
 dockers/docker-fpm-frr/TSA                    |   4 +-
 dockers/docker-fpm-frr/TSB                    |   4 +-
 dockers/docker-fpm-frr/TSC                    |   8 +-
 .../bgpd/templates/general/policies.conf.j2   |  25 ++-
 .../frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2     |   4 +-
 .../frr/bgpd/tsa/bgpd.tsa.unisolate.conf.j2   |   4 +-
 .../bgpcfgd/managers_allow_list.py            |  82 +++++++++-
 .../data/general/policies.conf/param_all.json |   4 +-
 .../general/policies.conf/param_deny.json     |   4 +-
 .../general/policies.conf/result_all.conf     |  17 +-
 .../general/policies.conf/result_deny.conf    |  17 +-
 .../tests/data/sonic-cfggen/tsa/isolate.conf  |   4 +-
 .../data/sonic-cfggen/tsa/unisolate.conf      |   4 +-
 src/sonic-bgpcfgd/tests/test_allow_list.py    | 146 +++++++++++++++++-
 14 files changed, 291 insertions(+), 36 deletions(-)

diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
index dc96d32c4582..81816b99db40 100755
--- a/dockers/docker-fpm-frr/TSA
+++ b/dockers/docker-fpm-frr/TSA
@@ -6,9 +6,9 @@ function check_not_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 2"
+    echo "$config" | grep -q "route-map $route_map_name permit 20"
     c=$((c+$?))
-    echo "$config" | grep -q "route-map $route_map_name deny 3"
+    echo "$config" | grep -q "route-map $route_map_name deny 30"
     c=$((c+$?))
   done
   return $c
diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
index 68eee9c2faff..b7eac390cf46 100755
--- a/dockers/docker-fpm-frr/TSB
+++ b/dockers/docker-fpm-frr/TSB
@@ -7,10 +7,10 @@ function check_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 2"
+    echo "$config" | grep -q "route-map $route_map_name permit 20"
     c=$((c+$?))
     e=$((e+1))
-    echo "$config" | grep -q "route-map $route_map_name deny 3"
+    echo "$config" | grep -q "route-map $route_map_name deny 30"
     c=$((c+$?))
     e=$((e+1))
   done
diff --git a/dockers/docker-fpm-frr/TSC b/dockers/docker-fpm-frr/TSC
index 8c17cea7eea7..5e7d579fc4a2 100755
--- a/dockers/docker-fpm-frr/TSC
+++ b/dockers/docker-fpm-frr/TSC
@@ -6,9 +6,9 @@ function check_not_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 2"
+    echo "$config" | grep -q "route-map $route_map_name permit 20"
     c=$((c+$?))
-    echo "$config" | grep -q "route-map $route_map_name deny 3"
+    echo "$config" | grep -q "route-map $route_map_name deny 30"
     c=$((c+$?))
   done
   return $c
@@ -21,10 +21,10 @@ function check_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 2"
+    echo "$config" | grep -q "route-map $route_map_name permit 20"
     c=$((c+$?))
     e=$((e+1))
-    echo "$config" | grep -q "route-map $route_map_name deny 3"
+    echo "$config" | grep -q "route-map $route_map_name deny 30"
     c=$((c+$?))
     e=$((e+1))
   done
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2
index 29498adcd922..7cf5e148f694 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2
@@ -3,14 +3,22 @@
 !
 !
 !
-{% if constants.bgp.allow_list is defined and constants.bgp.allow_list.enabled is defined and constants.bgp.allow_list.enabled %}
-{%   if constants.bgp.allow_list.default_action is defined and constants.bgp.allow_list.default_action.strip() == 'deny' %}
+{% if constants.bgp.allow_list is defined and constants.bgp.allow_list.enabled is defined and constants.bgp.allow_list.enabled and constants.bgp.allow_list.drop_community is defined %}
+!
+!
+! please don't remove. 65535 entries are default rules
+! which works when allow_list is enabled, but new configuration
+! is not applied
+!
+{%   if allow_list_default_action == 'deny' %}
+!
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V4 permit 65535
   set community no-export additive
 !
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V6 permit 65535
   set community no-export additive
 {%   else %}
+!
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V4 permit 65535
   set community {{ constants.bgp.allow_list.drop_community }} additive
 !
@@ -18,14 +26,23 @@ route-map ALLOW_LIST_DEPLOYMENT_ID_0_V6 permit 65535
   set community {{ constants.bgp.allow_list.drop_community }} additive
 {%   endif %}
 !
-route-map FROM_BGP_PEER_V4 permit 2
+bgp community-list standard allow_list_default_community permit no-export
+bgp community-list standard allow_list_default_community permit {{ constants.bgp.allow_list.drop_community }}
+!
+route-map FROM_BGP_PEER_V4 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V4
   on-match next
 !
-route-map FROM_BGP_PEER_V6 permit 2
+route-map FROM_BGP_PEER_V4 permit 11
+  match community allow_list_default_community
+!
+route-map FROM_BGP_PEER_V6 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V6
   on-match next
 !
+route-map FROM_BGP_PEER_V6 permit 11
+  match community allow_list_default_community
+!
 {% endif %}
 !
 !
diff --git a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
index 94287bdcd300..1256d1cd4f96 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
@@ -1,5 +1,5 @@
-route-map {{ route_map_name }} permit 2
+route-map {{ route_map_name }} permit 20
   match {{ ip_protocol }} address prefix-list PL_Loopback{{ ip_version }}
   set community {{ constants.bgp.traffic_shift_community }}
-route-map {{ route_map_name }} deny 3
+route-map {{ route_map_name }} deny 30
 !
diff --git a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.unisolate.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.unisolate.conf.j2
index 22244b3ac883..649f6d8e9db8 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.unisolate.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.unisolate.conf.j2
@@ -1,3 +1,3 @@
-no route-map {{ route_map_name }} permit 2
-no route-map {{ route_map_name }} deny 3
+no route-map {{ route_map_name }} permit 20
+no route-map {{ route_map_name }} deny 30
 !
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
index b58d8bb885c9..1e4eb6e404e2 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
@@ -36,8 +36,6 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-        self.cfg_mgr = common_objs["cfg_mgr"]
-        self.constants = common_objs["constants"]
         self.key_re = re.compile(r"^DEPLOYMENT_ID\|\d+\|\S+$|^DEPLOYMENT_ID\|\d+$")
         self.enabled = self.__get_enabled()
         self.__load_constant_lists()
@@ -63,7 +61,8 @@ def set_handler(self, key, data):
             prefixes_v4 = str(data['prefixes_v4']).split(",")
         if "prefixes_v6" in data:
             prefixes_v6 = str(data['prefixes_v6']).split(",")
-        self.__update_policy(deployment_id, community_value, prefixes_v4, prefixes_v6)
+        default_action_community = self.__get_default_action_community(data)
+        self.__update_policy(deployment_id, community_value, prefixes_v4, prefixes_v6, default_action_community)
         return True
 
     def __set_handler_validate(self, key, data):
@@ -96,6 +95,9 @@ def __set_handler_validate(self, key, data):
         if not prefixes_v4 and not prefixes_v6:
             log_err("BGPAllowListMgr::Received BGP ALLOWED 'SET' message with no prefixes specified: %s" % str(data))
             return False
+        if "default_action" in data and data["default_action"] != "permit" and data["default_action"] != "deny":
+            log_err("BGPAllowListMgr::Received BGP ALLOWED 'SET' message with invalid 'default_action' field: '%s'" % str(data))
+            return False
         return True
 
     def del_handler(self, key):
@@ -124,13 +126,14 @@ def __del_handler_validate(self, key):
             return False
         return True
 
-    def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_v6):
+    def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_v6, default_action):
         """
         Update "allow list" policy with parameters
         :param deployment_id: deployment id which policy will be changed
         :param community_value: community value to match for the updated policy
         :param prefixes_v4: a list of v4 prefixes for the updated policy
         :param prefixes_v6: a list of v6 prefixes for the updated policy
+        :param default_action: the default action for the policy. should be either 'permit' or 'deny'
         """
         # update all related entries with the information
         info = deployment_id, community_value, str(prefixes_v4), str(prefixes_v6)
@@ -146,6 +149,8 @@ def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_
         cmds += self.__update_community(names['community'], community_value)
         cmds += self.__update_allow_route_map_entry(self.V4, names['pl_v4'], names['community'], names['rm_v4'])
         cmds += self.__update_allow_route_map_entry(self.V6, names['pl_v6'], names['community'], names['rm_v6'])
+        cmds += self.__update_default_route_map_entry(names['rm_v4'], default_action)
+        cmds += self.__update_default_route_map_entry(names['rm_v6'], default_action)
         if cmds:
             self.cfg_mgr.push_list(cmds)
             peer_groups = self.__find_peer_group_by_deployment_id(deployment_id)
@@ -365,6 +370,52 @@ def __update_allow_route_map_entry(self, af, allow_address_pl_name, community_na
             cmds.append(" match community %s" % community_name)
         return cmds
 
+    def __update_default_route_map_entry(self, route_map_name, default_action_community):
+        """
+        Add or update default action rule for the route-map.
+        Default action rule is hardcoded into route-map permit 65535
+        :param route_map_name: name of the target route_map
+        :param default_action_community: community value to mark not-matched prefixes
+        """
+        info = route_map_name, default_action_community
+        log_debug("BGPAllowListMgr::__update_default_route_map_entry. rm='%s' set_community='%s'" % info)
+        current_default_action_value = self.__parse_default_action_route_map_entry(route_map_name)
+        if current_default_action_value != default_action_community:
+            return [
+                'route-map %s permit 65535' % route_map_name,
+                ' set community %s additive' % default_action_community
+            ]
+        else:
+            return []
+
+    def __parse_default_action_route_map_entry(self, route_map_name):
+        """
+        Parse default-action route-map entry
+        :param route_map_name: Name of the route-map to parse
+        :return: a community value used for default action
+        """
+        log_debug("BGPAllowListMgr::__parse_default_action_route_map_entries. rm='%s'" % route_map_name)
+        match_string = 'route-map %s permit 65535' % route_map_name
+        match_community = re.compile(r'^set community (\S+) additive$')
+        inside_route_map = False
+        community_value = ""
+        conf = self.cfg_mgr.get_text()
+        for line in conf + [""]:
+            s_line = line.strip()
+            if inside_route_map:
+                matched = match_community.match(s_line)
+                if matched:
+                    community_value = matched.group(1)
+                    break
+                else:
+                    log_err("BGPAllowListMgr::Found incomplete route-map '%s' entry. seq_no=65535" % route_map_name)
+                inside_route_map = False
+            elif s_line == match_string:
+                inside_route_map = True
+        if community_value == "":
+            log_err("BGPAllowListMgr::Default action community value is not found. route-map '%s' entry. seq_no=65535" % route_map_name)
+        return community_value
+
     def __remove_allow_route_map_entry(self, af, allow_address_pl_name, community_name, route_map_name):
         """
         Add or update a "Allow address" route-map entry with the parameters
@@ -624,3 +675,26 @@ def __af_to_family(self, af):
         :return: prefix list ip family
         """
         return 'ip' if af == self.V4 else 'ipv6'
+
+    def __get_default_action_community(self, data):
+        """
+        Determine the default action community based on the request.
+        If request doesn't contain "default_action" field - the default_action value
+        from the constants is being used
+        :param data: SET request data
+        :return: returns community value for "default_action"
+        """
+        drop_community = self.constants["bgp"]["allow_list"]["drop_community"]
+        if "default_action" in data:
+            if data["default_action"] == "deny":
+                return "no-export"
+            else: # "permit"
+                return drop_community
+        else:
+            if "default_action" in self.constants["bgp"]["allow_list"]:
+                if self.constants["bgp"]["allow_list"]["default_action"].strip() == "deny":
+                    return "no-export"
+                else:
+                    return drop_community
+            else:
+                return drop_community
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
index 2ed388731ba0..0e08c6a51d03 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
@@ -4,9 +4,9 @@
         "bgp": {
             "allow_list": {
                 "enabled": true,
-                "default_action": "permit",
                 "drop_community": "12345:12345"
             }
         }
-    }
+    },
+    "allow_list_default_action": "permit"
 }
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
index 47cb93082041..b2799abfaa0f 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
@@ -4,9 +4,9 @@
         "bgp": {
             "allow_list": {
                 "enabled": true,
-                "default_action": "deny",
                 "drop_community": "12345:12345"
             }
         }
-    }
+    },
+    "allow_list_default_action": "deny"
 }
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_all.conf b/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_all.conf
index e4f58f80c92c..8d0c17d592b8 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_all.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_all.conf
@@ -1,20 +1,33 @@
 !
 ! template: bgpd/templates/general/policies.conf.j2
 !
+! please don't remove. 65535 entries are default rules
+! which works when allow_list is enabled, but new configuration
+! is not applied
+!
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V4 permit 65535
   set community 12345:12345 additive
 !
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V6 permit 65535
   set community 12345:12345 additive
 !
-route-map FROM_BGP_PEER_V4 permit 2
+bgp community-list standard allow_list_default_community permit no-export
+bgp community-list standard allow_list_default_community permit 12345:12345
+!
+route-map FROM_BGP_PEER_V4 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V4
   on-match next
 !
-route-map FROM_BGP_PEER_V6 permit 2
+route-map FROM_BGP_PEER_V4 permit 11
+  match community allow_list_default_community
+!
+route-map FROM_BGP_PEER_V6 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V6
   on-match next
 !
+route-map FROM_BGP_PEER_V6 permit 11
+  match community allow_list_default_community
+!
 route-map FROM_BGP_PEER_V4 permit 100
 !
 route-map TO_BGP_PEER_V4 permit 100
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_deny.conf b/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_deny.conf
index 7f9137931e1c..661414bd579c 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_deny.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/result_deny.conf
@@ -1,20 +1,33 @@
 !
 ! template: bgpd/templates/general/policies.conf.j2
 !
+! please don't remove. 65535 entries are default rules
+! which works when allow_list is enabled, but new configuration
+! is not applied
+!
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V4 permit 65535
   set community no-export additive
 !
 route-map ALLOW_LIST_DEPLOYMENT_ID_0_V6 permit 65535
   set community no-export additive
 !
-route-map FROM_BGP_PEER_V4 permit 2
+bgp community-list standard allow_list_default_community permit no-export
+bgp community-list standard allow_list_default_community permit 12345:12345
+!
+route-map FROM_BGP_PEER_V4 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V4
   on-match next
 !
-route-map FROM_BGP_PEER_V6 permit 2
+route-map FROM_BGP_PEER_V4 permit 11
+  match community allow_list_default_community
+!
+route-map FROM_BGP_PEER_V6 permit 10
   call ALLOW_LIST_DEPLOYMENT_ID_0_V6
   on-match next
 !
+route-map FROM_BGP_PEER_V6 permit 11
+  match community allow_list_default_community
+!
 route-map FROM_BGP_PEER_V4 permit 100
 !
 route-map TO_BGP_PEER_V4 permit 100
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.conf
index 7bd155fcdb64..2ea4111dfc26 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.conf
@@ -1,5 +1,5 @@
-route-map test_rm_name permit 2
+route-map test_rm_name permit 20
   match ip address prefix-list PL_LoopbackV4
   set community 12345:555
-route-map test_rm_name deny 3
+route-map test_rm_name deny 30
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/unisolate.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/unisolate.conf
index db53a69e7ec4..2adeac6e0ef7 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/unisolate.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/unisolate.conf
@@ -1,3 +1,3 @@
-no route-map test_rm permit 2
-no route-map test_rm deny 3
+no route-map test_rm permit 20
+no route-map test_rm deny 30
 !
diff --git a/src/sonic-bgpcfgd/tests/test_allow_list.py b/src/sonic-bgpcfgd/tests/test_allow_list.py
index 904ba14f2ecf..6a53e2f49ca7 100644
--- a/src/sonic-bgpcfgd/tests/test_allow_list.py
+++ b/src/sonic-bgpcfgd/tests/test_allow_list.py
@@ -18,7 +18,9 @@
                     "deny 0::/0 le 59",
                     "deny 0::/0 ge 65"
                 ]
-            }
+            },
+            "default_action": "permit",
+            "drop_community": "123:123"
         }
     }
 }
@@ -64,7 +66,12 @@ def test_set_handler_with_community():
                 "prefixes_v4": "10.20.30.0/24,30.50.0.0/16",
                 "prefixes_v6": "fc00:20::/64,fc00:30::/64",
         }),
-        [],
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
         [
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
@@ -90,7 +97,12 @@ def test_set_handler_no_community():
                 "prefixes_v4": "20.20.30.0/24,40.50.0.0/16",
                 "prefixes_v6": "fc01:20::/64,fc01:30::/64",
         }),
-        [],
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ],
         [
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
@@ -184,6 +196,10 @@ def test_set_handler_with_community_data_is_already_presented():
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
             ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
             ""
         ],
         []
@@ -206,6 +222,10 @@ def test_set_handler_no_community_data_is_already_presented():
         ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
         'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
         ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+        'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+        ' set community 123:123 additive',
+        'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+        ' set community 123:123 additive',
         ""
     ]
     common_objs = {
@@ -259,6 +279,10 @@ def test_set_handler_with_community_update_prefixes_add():
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
             ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
             ""
         ],
         [
@@ -295,6 +319,10 @@ def test_set_handler_no_community_update_prefixes_add():
             ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
             ""
         ],
         [
@@ -450,4 +478,114 @@ def test___to_prefix_list():
     res_v6 = mgr._BGPAllowListMgr__to_prefix_list(mgr.V6, ["fc00::1/128", "fc00::/64"])
     assert res_v6 == ["permit fc00::1/128", "permit fc00::/64 le 128"]
 
-# FIXME: more testcases for coverage
+@patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
+def construct_BGPAllowListMgr(constants):
+    from bgpcfgd.managers_allow_list import BGPAllowListMgr
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': constants,
+    }
+    mgr = BGPAllowListMgr(common_objs, "CONFIG_DB", "BGP_ALLOWED_PREFIXES")
+    return mgr
+
+def test___get_enabled_enabled():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": True,
+            }
+        }
+    }
+    mgr = construct_BGPAllowListMgr(constants)
+    assert mgr._BGPAllowListMgr__get_enabled()
+
+def test___get_enabled_disabled_1():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": False,
+            }
+        }
+    }
+    mgr = construct_BGPAllowListMgr(constants)
+    assert not mgr._BGPAllowListMgr__get_enabled()
+
+def test___get_enabled_disabled_2():
+    constants = {
+        "bgp": {
+            "allow_list": {}
+        }
+    }
+    mgr = construct_BGPAllowListMgr(constants)
+    assert not mgr._BGPAllowListMgr__get_enabled()
+
+def test___get_enabled_disabled_3():
+    constants = {
+        "bgp": {}
+    }
+    mgr = construct_BGPAllowListMgr(constants)
+    assert not mgr._BGPAllowListMgr__get_enabled()
+
+def test___get_enabled_disabled_4():
+    constants = {}
+    mgr = construct_BGPAllowListMgr(constants)
+    assert not mgr._BGPAllowListMgr__get_enabled()
+
+def test___get_default_action_deny():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": True,
+                "default_action": "deny",
+                "drop_community": "123:123"
+            }
+        }
+    }
+    data = {}
+    mgr = construct_BGPAllowListMgr(constants)
+    assert mgr._BGPAllowListMgr__get_default_action_community(data) == "no-export"
+
+def test___get_default_action_permit_1():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": True,
+                "default_action": "permit",
+                "drop_community": "123:123"
+            }
+        }
+    }
+    data = {}
+    mgr = construct_BGPAllowListMgr(constants)
+    assert mgr._BGPAllowListMgr__get_default_action_community(data) == "123:123"
+
+def test___get_default_action_permit_2():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": True,
+                "drop_community": "123:123"
+            }
+        }
+    }
+    data = {}
+    mgr = construct_BGPAllowListMgr(constants)
+    assert mgr._BGPAllowListMgr__get_default_action_community(data) == "123:123"
+
+def test___get_default_action_permit_3():
+    constants = {
+        "bgp": {
+            "allow_list": {
+                "enabled": False,
+                "drop_community": "123:123"
+            }
+        }
+    }
+    data = {}
+    mgr = construct_BGPAllowListMgr(constants)
+    assert mgr._BGPAllowListMgr__get_default_action_community(data) == "123:123"
+
+# FIXME: more testcases for coverage
\ No newline at end of file

From 88ace50da8c6a0a6d9a5e3d3085753074d4243e9 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 8 Jan 2021 14:13:25 -0800
Subject: [PATCH 0032/1674] [sonic-swss-common] Update submodule (#6382)

Includes sonic-swss-common commits:
```
71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo]
7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan]
30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo]
021108d 2021-01-02 | MCLAG Enhancements per HLD https://github.com/Azure/SONiC/pull/596 (#405) [Praveen-Brcm]
54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo]
8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo]
6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo]
624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo]
3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan]
f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan]
7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan]
47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan]
```
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index b423b9c8aa24..71dc350d94a9 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit b423b9c8aa245ab19352597ad83e7214f42fe74a
+Subproject commit 71dc350d94a93a6a13bbcec9d9723809e4d3bae2

From 3e8142fba0b8bf049e4f401f7633662c1ef38b14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Jan 2021 15:47:29 -0800
Subject: [PATCH 0033/1674] Bump lxml from 4.6.1 to 4.6.2 in
 /src/sonic-config-engine (#6385)

Bumps [lxml](https://github.com/lxml/lxml) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.1...lxml-4.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/sonic-config-engine/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 src/sonic-config-engine/setup.py

diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
old mode 100755
new mode 100644
index 2483e8ebcf38..c9dfd3609b92
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -7,7 +7,7 @@
 dependencies = [
     'bitarray==1.5.3',
     'ipaddress==1.0.23',
-    'lxml==4.6.1',
+    'lxml==4.6.2',
     'netaddr==0.8.0',
     'pyyaml==5.3.1',
     'sonic-py-common',

From 2ae182623c9eaefa906b40dc6e750fa8539ab9a4 Mon Sep 17 00:00:00 2001
From: guxianghong <gxh2001757@163.com>
Date: Sun, 10 Jan 2021 00:07:30 +0800
Subject: [PATCH 0034/1674] [Centec ARM64]Upgrade Centec syncd docker to buster
 and Enable Telemetry on ARM64 (#6386)

* Enable telemetry for ARM64 by default

* [Centec]Upgrade Centec syncd docker to buster; libjemalloc2 have been installed in docker-base-buster, remove libjemalloc1 from docker-syncd-centec's Dockerfile.j2

Co-authored-by: Gu Xianghong <xgu@centecnetworks.com>
---
 platform/centec-arm64/docker-syncd-centec.mk            | 3 ---
 platform/centec-arm64/docker-syncd-centec/Dockerfile.j2 | 4 ++--
 platform/centec/docker-syncd-centec.mk                  | 3 ---
 platform/centec/docker-syncd-centec/Dockerfile.j2       | 2 +-
 slave.mk                                                | 8 --------
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/platform/centec-arm64/docker-syncd-centec.mk b/platform/centec-arm64/docker-syncd-centec.mk
index 9943420660a4..9c3d1b1aff75 100755
--- a/platform/centec-arm64/docker-syncd-centec.mk
+++ b/platform/centec-arm64/docker-syncd-centec.mk
@@ -10,9 +10,6 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
-
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/centec-arm64/docker-syncd-centec/Dockerfile.j2 b/platform/centec-arm64/docker-syncd-centec/Dockerfile.j2
index 7590d65600b7..b97bfe3d3e18 100755
--- a/platform/centec-arm64/docker-syncd-centec/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-stretch
+FROM docker-config-engine-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -19,7 +19,7 @@ RUN apt-get update \
     net-tools           \
     iputils-ping
 
-RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1 nfs-common
+RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common
 
 RUN dpkg -i \
 {% for deb in docker_syncd_centec_debs.split(' ') -%}
diff --git a/platform/centec/docker-syncd-centec.mk b/platform/centec/docker-syncd-centec.mk
index ada63a218d4a..75cc45c28559 100644
--- a/platform/centec/docker-syncd-centec.mk
+++ b/platform/centec/docker-syncd-centec.mk
@@ -10,9 +10,6 @@ $(DOCKER_SYNCD_CENTEC)_DEPENDS += $(SYNCD_DBG) \
                                   $(LIBSAIMETADATA_DBG) \
                                   $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
-
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
diff --git a/platform/centec/docker-syncd-centec/Dockerfile.j2 b/platform/centec/docker-syncd-centec/Dockerfile.j2
index 8bb5041b15ba..ce3b47bcdd77 100755
--- a/platform/centec/docker-syncd-centec/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-stretch
+FROM docker-config-engine-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/slave.mk b/slave.mk
index 686ecec5c508..4474817c9c3f 100644
--- a/slave.mk
+++ b/slave.mk
@@ -116,14 +116,6 @@ ifeq ($(SONIC_INCLUDE_SYSTEM_TELEMETRY),y)
 INCLUDE_SYSTEM_TELEMETRY = y
 endif
 
-ifneq (,$(filter $(CONFIGURED_ARCH), arm64))
-    # Workaround: Force disable Telmetry for ARM, will be removed after fixing issue
-    # Issue: qemu crashes when it uses "go get url"
-    # Qemu Support: https://bugs.launchpad.net/qemu/+bug/1838946
-    # Golang Support: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!topic/golang-nuts/1txPOGa4aGc
-INCLUDE_SYSTEM_TELEMETRY = n
-endif
-
 ifeq ($(SONIC_INCLUDE_RESTAPI),y)
 INCLUDE_RESTAPI = y
 endif

From 9da8b0faf9dc7fd2ae3238aaf01ab1e7758936cb Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Mon, 11 Jan 2021 08:13:04 -0800
Subject: [PATCH 0035/1674] [utilities] advance utilities submodule head
 (#6402)

- (HEAD, github/master) [storyteller] adding a grep wrapper with predefined scenarios (#1349)
- Adding global-timeout, individual command timeout, log files collection (#1249)
- Add FW dump with new SAI implementation (#1338)
- [unit test][pfcwd] Fix tests that require sudo access (#1340)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 7924bd18d455..0a4365aaa0ad 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 7924bd18d45547d6c865a42315766bc2324f7eec
+Subproject commit 0a4365aaa0adadcb4c3fa448e05f6d2e217bda5f

From 264ecb181c8a616a84e08201c1bbe2321e4a7edb Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 11 Jan 2021 10:18:39 -0800
Subject: [PATCH 0036/1674] [minigraph.py]: Add peer switch hostname to device
 metadata (#6405)

To make the peer switch hostname easily accessible from config DB. Add peer_switch field to DEVICE_METADATA table

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/minigraph.py                 | 4 ++++
 src/sonic-config-engine/tests/test_minigraph_case.py | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 660606b4519d..632cf060b626 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1178,6 +1178,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
 
     if bool(results['PEER_SWITCH']):
         results['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
+        if len(results['PEER_SWITCH'].keys()) > 1:
+            print("Warning: more than one peer switch was found. Only the first will be parsed: {}".format(results['PEER_SWITCH'].keys()[0]))
+
+        results['DEVICE_METADATA']['localhost']['peer_switch'] = list(results['PEER_SWITCH'].keys())[0]
 
     if is_storage_device:
         results['DEVICE_METADATA']['localhost']['storage_device'] = "true"
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index efa8a063b6e5..cf8a7557aeb7 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -57,6 +57,11 @@ def test_minigraph_subtype(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), 'DualToR')
 
+    def test_minigraph_peer_switch_hostname(self):
+        argument = '-m "' + self.sample_graph + '" -v "DEVICE_METADATA[\'localhost\'][\'peer_switch\']"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), 'switch2-t0')
+
     def test_additional_json_data(self):
         argument = '-a \'{"key1":"value1"}\' -v key1'
         output = self.run_script(argument)

From 45b724fe76ddd6b3d2b59e78cd6072edfc0c31e7 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Tue, 12 Jan 2021 06:03:12 -0800
Subject: [PATCH 0037/1674] [build]: fix dpkg admindir corruption issue in
 parallel build (#6408)

Fix #119

when parallel build is enable, multiple dpkg-buildpackage
instances are running at the same time. /var/lib/dpkg is shared
by all instances and the /var/lib/dpkg/updates could be corrupted
and cause the build failure.

the fix is to use overlay fs to mount separate /var/lib/dpkg
for each dpkg-buildpackage instance so that they are not affecting
each other.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .../sonic-platform-modules-brcm-xlr-gts/Makefile     |  2 +-
 rules/functions                                      | 12 ++++++++++++
 slave.mk                                             |  8 ++++++--
 src/bash/Makefile                                    |  2 +-
 src/hiredis/Makefile                                 |  2 +-
 src/ifupdown2/Makefile                               |  2 +-
 src/initramfs-tools/Makefile                         |  2 +-
 src/iproute2/Makefile                                |  2 +-
 src/iptables/Makefile                                |  2 +-
 src/isc-dhcp/Makefile                                |  2 +-
 src/kdump-tools/Makefile                             |  2 +-
 src/libnl3/Makefile                                  |  2 +-
 src/libteam/Makefile                                 |  2 +-
 src/libyang1/Makefile                                |  2 +-
 src/lldpd/Makefile                                   |  2 +-
 src/lm-sensors/Makefile                              |  2 +-
 src/monit/Makefile                                   |  2 +-
 src/mpdecimal/Makefile                               |  2 +-
 src/ntp/Makefile                                     |  2 +-
 src/openssh/Makefile                                 |  2 +-
 src/python3/Makefile                                 |  2 +-
 src/redis/Makefile                                   |  2 +-
 src/sflow/hsflowd/Makefile                           |  2 +-
 src/sflow/psample/Makefile                           |  2 +-
 src/sflow/sflowtool/Makefile                         |  2 +-
 src/smartmontools/Makefile                           |  2 +-
 src/snmpd/Makefile                                   |  2 +-
 src/socat/Makefile                                   |  2 +-
 src/sonic-device-data/Makefile                       |  2 +-
 src/sonic-frr/Makefile                               |  2 +-
 src/sonic-host-service/Makefile                      |  2 +-
 src/swig/Makefile                                    |  2 +-
 src/systemd-sonic-generator/Makefile                 |  2 +-
 src/tacacs/nss/Makefile                              |  4 ++--
 src/tacacs/pam/Makefile                              |  4 ++--
 src/thrift/Makefile                                  |  2 +-
 36 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/Makefile b/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/Makefile
index cd2a5a101ad5..3f93a0bfe52a 100644
--- a/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/Makefile
+++ b/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/Makefile
@@ -7,7 +7,7 @@ MAIN_TARGET = $(BRCM_XLR_GTS_PLATFORM_MODULE)
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	export PYBUILD_INSTALL_ARGS_python2=--install-scripts=/dev/null
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 
 	mv $(addprefix ../, $* $(EXTRA_TARGETS)) $(DEST)/
 
diff --git a/rules/functions b/rules/functions
index 104efa3055b7..5ccb111cec72 100644
--- a/rules/functions
+++ b/rules/functions
@@ -153,3 +153,15 @@ if [ -n "$(1)" ]; then \
     done; \
 fi
 endef
+
+###############################################################################
+## Setup overlay fs for dpkg admin directory /var/lib/dpkg
+###############################################################################
+define SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR
+upperdir=$(shell mktemp -d -p $(DPKG_ADMINDIR_PATH))
+workdir=$(shell mktemp -d -p $(DPKG_ADMINDIR_PATH))
+mergedir=$(shell mktemp -d -p $(DPKG_ADMINDIR_PATH))
+sudo mount -t overlay overlay -olowerdir=/var/lib/dpkg,upperdir=$$upperdir,workdir=$$workdir $$mergedir
+export SONIC_DPKG_ADMINDIR=$$mergedir
+trap "sudo umount $$mergedir && rm -rf $$mergedir $$upperdir $$workdir" EXIT
+endef
diff --git a/slave.mk b/slave.mk
index 4474817c9c3f..728bb8be16cf 100644
--- a/slave.mk
+++ b/slave.mk
@@ -41,6 +41,7 @@ BUSTER_DEBS_PATH = $(TARGET_PATH)/debs/buster
 BUSTER_FILES_PATH = $(TARGET_PATH)/files/buster
 DBG_IMAGE_MARK = dbg
 DBG_SRC_ARCHIVE_FILE = $(TARGET_PATH)/sonic_src.tar.gz
+DPKG_ADMINDIR_PATH = /sonic/dpkg
 
 CONFIGURED_PLATFORM := $(shell [ -f .platform ] && cat .platform || echo generic)
 PLATFORM_PATH = platform/$(CONFIGURED_PLATFORM)
@@ -83,6 +84,7 @@ configure :
 	@mkdir -p $(BUSTER_FILES_PATH)
 	@mkdir -p $(PYTHON_DEBS_PATH)
 	@mkdir -p $(PYTHON_WHEELS_PATH)
+	@mkdir -p $(DPKG_ADMINDIR_PATH)
 	@echo $(PLATFORM) > .platform
 	@echo $(PLATFORM_ARCH) > .arch
 
@@ -419,6 +421,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		# Apply series of patches if exist
 		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
 		# Build project and take package
+		$(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR)
 		DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC}" make DEST=$(shell pwd)/$(DEBS_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(DEBS_PATH)/$* $(LOG)
 		# Clean up
 		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
@@ -459,9 +462,10 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		# Build project
 		pushd $($*_SRC_PATH) $(LOG_SIMPLE)
 		if [ -f ./autogen.sh ]; then ./autogen.sh $(LOG); fi
+		$(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR)
 		$(if $($*_DPKG_TARGET),
-			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) $(LOG),
-			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) $(LOG)
+			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) --admindir $$mergedir $(LOG),
+			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $$mergedir $(LOG)
 		)
 		popd $(LOG_SIMPLE)
 		# Clean up
diff --git a/src/bash/Makefile b/src/bash/Makefile
index 602dc01ece70..6576ff92e74a 100644
--- a/src/bash/Makefile
+++ b/src/bash/Makefile
@@ -10,7 +10,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dget -u https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/$(BASH_VERSION_FULL)/bash_$(BASH_VERSION_FULL).dsc
 
 	pushd bash-$(BASH_VERSION_MAJOR)
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/
diff --git a/src/hiredis/Makefile b/src/hiredis/Makefile
index 746056e51de5..4935a039e0af 100644
--- a/src/hiredis/Makefile
+++ b/src/hiredis/Makefile
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc
 	pushd hiredis-$(HIREDIS_VERSION)
-	fakeroot debian/rules -j$(SONIC_CONFIG_MAKE_JOBS) binary
+	dpkg-buildpackage -rfakeroot -d -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DERIVED_TARGETS) $(DEST)/
diff --git a/src/ifupdown2/Makefile b/src/ifupdown2/Makefile
index 66b4df2ec32f..89228bedafae 100644
--- a/src/ifupdown2/Makefile
+++ b/src/ifupdown2/Makefile
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd ./ifupdown2-$(IFUPDOWN2_VERSION)
 
 	# Build source and Debian packages
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/initramfs-tools/Makefile b/src/initramfs-tools/Makefile
index 9ef8e78f5479..f57b943d2d4f 100644
--- a/src/initramfs-tools/Makefile
+++ b/src/initramfs-tools/Makefile
@@ -19,7 +19,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Build the package
 	rm -f debian/*.debhelper.log
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/iproute2/Makefile b/src/iproute2/Makefile
index 8748550a1d78..5b354ce8b019 100644
--- a/src/iproute2/Makefile
+++ b/src/iproute2/Makefile
@@ -17,7 +17,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dpkg-source -x iproute2_$(IPROUTE2_VERSION_FULL).dsc
 
 	pushd iproute2-$(IPROUTE2_VERSION)
-	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/
diff --git a/src/iptables/Makefile b/src/iptables/Makefile
index 3268ab5afea3..681ef5d2dcc3 100644
--- a/src/iptables/Makefile
+++ b/src/iptables/Makefile
@@ -38,7 +38,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile
index bd957a08a6f5..2adf6bba2aa3 100644
--- a/src/isc-dhcp/Makefile
+++ b/src/isc-dhcp/Makefile
@@ -23,7 +23,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/kdump-tools/Makefile b/src/kdump-tools/Makefile
index 18c2a369b5d7..dadf08503af1 100644
--- a/src/kdump-tools/Makefile
+++ b/src/kdump-tools/Makefile
@@ -25,7 +25,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	fakeroot debian/rules binary-indep
+	dpkg-buildpackage -rfakeroot -b -us -uc -Tbinary-indep -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/libnl3/Makefile b/src/libnl3/Makefile
index a0e9891c9efc..c45ac85b7288 100644
--- a/src/libnl3/Makefile
+++ b/src/libnl3/Makefile
@@ -21,7 +21,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git checkout tags/libnl$(subst .,_,$(LIBNL3_VERSION_BASE))
 
 	ln -s ../debian debian
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/libteam/Makefile b/src/libteam/Makefile
index 9fd5f582ed4d..47f9d1dd21bf 100644
--- a/src/libteam/Makefile
+++ b/src/libteam/Makefile
@@ -31,7 +31,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	mv tmp/debian libteam/
 	rm -rf tmp
 	pushd ./libteam
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/libyang1/Makefile b/src/libyang1/Makefile
index da6359aa9e12..834893eb0bbe 100644
--- a/src/libyang1/Makefile
+++ b/src/libyang1/Makefile
@@ -31,7 +31,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Enable large file support for 32-bit arch
 	echo 'add_definitions(-D_FILE_OFFSET_BITS=64)' >> CMakeLists.txt
 
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/lldpd/Makefile b/src/lldpd/Makefile
index fa997e3486c8..a336f1e989ae 100644
--- a/src/lldpd/Makefile
+++ b/src/lldpd/Makefile
@@ -35,7 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	env "with_netlink_receive_bufsize=1024*1024" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	env "with_netlink_receive_bufsize=1024*1024" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/lm-sensors/Makefile b/src/lm-sensors/Makefile
index af080a8dba55..a5aa3ba7d885 100644
--- a/src/lm-sensors/Makefile
+++ b/src/lm-sensors/Makefile
@@ -25,7 +25,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg init
 	stg import -s ../patch/series
 
-	DEB_BUILD_OPTIONS=nocheck PROG_EXTRA=sensord dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	DEB_BUILD_OPTIONS=nocheck PROG_EXTRA=sensord dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/monit/Makefile b/src/monit/Makefile
index 4ad9edd79143..570f30cf60f8 100644
--- a/src/monit/Makefile
+++ b/src/monit/Makefile
@@ -24,7 +24,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/mpdecimal/Makefile b/src/mpdecimal/Makefile
index c4ef5b78b49c..b7f82ba702e5 100644
--- a/src/mpdecimal/Makefile
+++ b/src/mpdecimal/Makefile
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	dpkg-source -x mpdecimal_$(MPDECIMAL_VERSION_FULL).dsc
 	pushd mpdecimal-$(MPDECIMAL_VERSION)
-	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DERIVED_TARGETS) $(DEST)/
diff --git a/src/ntp/Makefile b/src/ntp/Makefile
index a128ed6e9967..6d96010be156 100644
--- a/src/ntp/Makefile
+++ b/src/ntp/Makefile
@@ -39,7 +39,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	sed -i 's/\/usr\/sbin\/ntpd {/\/usr\/sbin\/ntpd flags=(attach_disconnected complain) {/' debian/apparmor-profile
 
 	# Build source and Debian packages with the symbols
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 
 	popd
 
diff --git a/src/openssh/Makefile b/src/openssh/Makefile
index 888cdb28d168..0fd8642b1285 100644
--- a/src/openssh/Makefile
+++ b/src/openssh/Makefile
@@ -20,7 +20,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Build package
 	sudo http_proxy=$(http_proxy) apt-get -y build-dep openssh
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/python3/Makefile b/src/python3/Makefile
index c5d8c386c1b0..1c37e9d06c45 100644
--- a/src/python3/Makefile
+++ b/src/python3/Makefile
@@ -35,7 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	fi
 	done
 
-	dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	cp $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/redis/Makefile b/src/redis/Makefile
index e2d9e5828f5b..3a4fe3f4844c 100644
--- a/src/redis/Makefile
+++ b/src/redis/Makefile
@@ -22,7 +22,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	pushd redis-$(REDIS_VERSION)
 	export ARCH=""
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/sflow/hsflowd/Makefile b/src/sflow/hsflowd/Makefile
index 3a521bfba158..e29dbcc199bb 100644
--- a/src/sflow/hsflowd/Makefile
+++ b/src/sflow/hsflowd/Makefile
@@ -21,7 +21,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	chmod u+x debian/rules
 	sed -i -e s/_VERSION_/$(HSFLOWD_VERSION)-$(HSFLOWD_SUBVERSION)/g debian/changelog
 
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --buildinfo-option=-u. --changes-option=-u.
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) --buildinfo-option=-u. --changes-option=-u.
 
 	mv $(DERIVED_TARGET) $* $(DEST)/
 	popd
diff --git a/src/sflow/psample/Makefile b/src/sflow/psample/Makefile
index 3f03c249989a..bbdefde2289b 100644
--- a/src/sflow/psample/Makefile
+++ b/src/sflow/psample/Makefile
@@ -13,7 +13,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd ./libpsample
 	git checkout -b libpsample -f e48fad2
 
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/
diff --git a/src/sflow/sflowtool/Makefile b/src/sflow/sflowtool/Makefile
index 10a3f2d24dea..5f2ad995a585 100644
--- a/src/sflow/sflowtool/Makefile
+++ b/src/sflow/sflowtool/Makefile
@@ -12,7 +12,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	pushd ./sflowtool
 	git checkout -b sflowtool -f 6c2963b
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/
diff --git a/src/smartmontools/Makefile b/src/smartmontools/Makefile
index 4ac3d6ac315e..8f0f0695659f 100644
--- a/src/smartmontools/Makefile
+++ b/src/smartmontools/Makefile
@@ -13,7 +13,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dpkg-source -x smartmontools_$(SMARTMONTOOLS_VERSION_FULL).dsc
 
 	pushd smartmontools-$(SMARTMONTOOLS_VERSION_MAJOR)
-	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/
diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile
index 76a62137b1ef..b66af241e5c5 100644
--- a/src/snmpd/Makefile
+++ b/src/snmpd/Makefile
@@ -29,7 +29,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg init
 	stg import -s ../patch-$(SNMPD_VERSION)/series
 
-	fakeroot debian/rules -j$(SONIC_CONFIG_MAKE_JOBS) binary
+	dpkg-buildpackage -rfakeroot -b -d -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/socat/Makefile b/src/socat/Makefile
index 50c2c8d96d2d..cc2cd7238684 100644
--- a/src/socat/Makefile
+++ b/src/socat/Makefile
@@ -18,7 +18,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build source and Debian packages
 	pushd socat-1.7.3.1
 	patch -p0 < ../enable_readline.patch
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	# Move the newly-built .deb packages to the destination directory
diff --git a/src/sonic-device-data/Makefile b/src/sonic-device-data/Makefile
index 3de9c27c041d..3de98ef84b42 100644
--- a/src/sonic-device-data/Makefile
+++ b/src/sonic-device-data/Makefile
@@ -25,7 +25,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	done;
 
 	# Build the package
-	dpkg-buildpackage -rfakeroot -b -us -uc
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 
 	popd
 
diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 296f0226d2fe..4bac1e42769d 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg branch --create $(STG_BRANCH) $(FRR_TAG)
 	stg import -s ../patch/series
 	tools/tarsource.sh -V -e '-sonic'
-	dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	stg undo || true
 	git clean -xfdf
 	git checkout $(FRR_BRANCH)
diff --git a/src/sonic-host-service/Makefile b/src/sonic-host-service/Makefile
index 53eaa4cd510a..c492c1f583ac 100644
--- a/src/sonic-host-service/Makefile
+++ b/src/sonic-host-service/Makefile
@@ -21,7 +21,7 @@ MAIN_TARGET = sonic-host-service_1.0.0_all.deb
 INSTALL := /usr/bin/install
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	dpkg-buildpackage -us -uc -b
+	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	mv ../$(MAIN_TARGET) $(DEST)/
 
 SOURCES := $(wildcard '*.*') $(wildcard 'host_modules/*.py')
diff --git a/src/swig/Makefile b/src/swig/Makefile
index f9deda6a831d..2d3388eba138 100644
--- a/src/swig/Makefile
+++ b/src/swig/Makefile
@@ -13,7 +13,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dpkg-source -x swig_$(SWIG_VERSION).dsc
 
 	pushd ./swig-$(SWIG_VERSION)
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/systemd-sonic-generator/Makefile b/src/systemd-sonic-generator/Makefile
index 973c0d64eaed..0f911ed8a4f9 100644
--- a/src/systemd-sonic-generator/Makefile
+++ b/src/systemd-sonic-generator/Makefile
@@ -5,7 +5,7 @@ BINARY = systemd-sonic-generator
 MAIN_TARGET = $(BINARY)_1.0.0_$(CONFIGURED_ARCH).deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	dpkg-buildpackage -us -uc -b
+	dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	mv ../$(MAIN_TARGET) $(DEST)/
 	rm ../$(BINARY)-* ../$(BINARY)_*
 
diff --git a/src/tacacs/nss/Makefile b/src/tacacs/nss/Makefile
index c133cafe9212..5fafd93b87fd 100644
--- a/src/tacacs/nss/Makefile
+++ b/src/tacacs/nss/Makefile
@@ -6,7 +6,7 @@ MAIN_TARGET = libnss-tacplus_$(NSS_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb
 
 GIT_APPLY = am
 ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
-# Workaround git am issue "Out of memory getdelim failed" 
+# Workaround git am issue "Out of memory getdelim failed"
 GIT_APPLY = apply
 endif
 
@@ -26,7 +26,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git $(GIT_APPLY) ../0006-fix-compiling-warning-about-token-dereference.patch
 	git $(GIT_APPLY) ../0007-Add-support-for-TACACS-source-address.patch
 
-	dpkg-buildpackage -rfakeroot -b -us -uc
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/tacacs/pam/Makefile b/src/tacacs/pam/Makefile
index 1f5213915641..503bdcb864f0 100644
--- a/src/tacacs/pam/Makefile
+++ b/src/tacacs/pam/Makefile
@@ -9,7 +9,7 @@ DERIVED_TARGETS = libtac2_$(PAM_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb \
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Obtain pam_tacplus
 	rm -rf ./pam_tacplus
-	git clone https://github.com/jeroennijhof/pam_tacplus.git 
+	git clone https://github.com/jeroennijhof/pam_tacplus.git
 	pushd ./pam_tacplus
 	git checkout -f v1.4.1
 
@@ -21,7 +21,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git apply ../0005-pam-Modify-parsing-of-IP-address-and-port-number-to-.patch
 	git apply ../0006-Add-support-for-source-ip-address.patch
 
-	dpkg-buildpackage -rfakeroot -b -us -uc
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/
diff --git a/src/thrift/Makefile b/src/thrift/Makefile
index 6039b2e7cfad..2d1d4187135f 100644
--- a/src/thrift/Makefile
+++ b/src/thrift/Makefile
@@ -26,7 +26,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# saithrift implementation relies on the bug in union serialization
 	# (https://jira.apache.org/jira/browse/THRIFT-3650)
 	patch -p1 < ../patch/0001-Revert-THRIFT-3650-incorrect-union-serialization.patch
-	CXXFLAGS="-DFORCE_BOOST_SMART_PTR" DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	CXXFLAGS="-DFORCE_BOOST_SMART_PTR" DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/

From b6de4943fc776494d564b6566a0935501f5cc2fa Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Tue, 12 Jan 2021 06:03:59 -0800
Subject: [PATCH 0038/1674] [sonic-slave]: Upgrade python lxml library version
 to 4.6.2 (#6404)

---
 sonic-slave-buster/Dockerfile.j2  | 4 ++--
 sonic-slave-stretch/Dockerfile.j2 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 412830f387d9..2a93c439d71c 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -412,8 +412,8 @@ RUN pip2 install j2cli==0.3.10
 # For sonic-mgmt-framework
 RUN pip2 install "PyYAML==5.3.1"
 RUN pip3 install "PyYAML==5.3.1"
-RUN pip2 install "lxml==4.6.1"
-RUN pip3 install "lxml==4.6.1"
+RUN pip2 install "lxml==4.6.2"
+RUN pip3 install "lxml==4.6.2"
 
 # For sonic-platform-common testing
 RUN pip3 install redis
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 95c294f4e4c6..53f2791e583a 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -366,8 +366,8 @@ RUN pip3 install mockredispy==2.9.3
 # For sonic-mgmt-framework
 RUN pip2 install "PyYAML==5.3.1"
 RUN pip3 install "PyYAML==5.3.1"
-RUN pip2 install "lxml==4.6.1"
-RUN pip3 install "lxml==4.6.1"
+RUN pip2 install "lxml==4.6.2"
+RUN pip3 install "lxml==4.6.2"
 
 
 # For sonic-platform-common testing

From 063a485982c20858657ac0695d866d7cd6a0fb8f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 12 Jan 2021 06:04:48 -0800
Subject: [PATCH 0039/1674] [minigraph.py]: Force /32 prefix for mux cable
 server IPv4 loopbacks (#6418)

Server IPv4 loopbacks do not always arrive with /32 prefix, which is a requirement for the MUX_CABLE table in config DB

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/minigraph.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 632cf060b626..1fd6b7b56e8d 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1505,7 +1505,12 @@ def get_mux_cable_entries(mux_cable_ports, neighbors, devices):
             entry = {}
             neighbor = neighbors[intf]['name']
             entry['state'] = 'auto'
-            entry['server_ipv4'] = devices[neighbor]['lo_addr']
+
+            # Always force a /32 prefix for server IPv4 loopbacks
+            server_ipv4_lo_addr = devices[neighbor]['lo_addr'].split("/")[0]
+            server_ipv4_lo_prefix = ipaddress.ip_network(UNICODE_TYPE(server_ipv4_lo_addr))
+            entry['server_ipv4'] = str(server_ipv4_lo_prefix)
+
             if 'lo_addr_v6' in devices[neighbor]:
                 entry['server_ipv6'] = devices[neighbor]['lo_addr_v6']
             mux_cable_table[intf] = entry 

From 6d9b05c03291deb08b01123f7dbc38f758c0f461 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:51:15 -0800
Subject: [PATCH 0040/1674] Anchor the libprotobuf-dev version based on a fixed
 version by using debian control dependency (#6420)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 24cf07122e6b..fcb175d3d0c5 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.2.1.5-9_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-9_amd64.deb?sv=2015-04-05&sr=b&sig=Rbqq%2FH4B71%2BWGzAzTuM3qxEdwpEnuxqFdGIMDpuN8t0%3D&se=2034-09-16T01%3A36%3A13Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-9_amd64.deb
+BRCM_SAI = libsaibcm_4.2.1.5-10_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A30%3A31Z&se=2035-01-13T07%3A30%3A00Z&sr=b&sp=r&sig=yCGwk%2FW%2Fg%2FaFxhr0oNSTZ%2BVy5B6kX1WDEsbbyz9J088%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-9_amd64.deb?sv=2015-04-05&sr=b&sig=C%2Bo7YTkA2076LRfet1rHHlFu%2F6b9qoQiHljjaZCVa20%3D&se=2034-09-16T01%3A37%3A38Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A32%3A43Z&se=2035-01-13T07%3A32%3A00Z&sr=b&sp=r&sig=wuCNc6pa12JQCBi%2BM9rLWvVI92ldan9hKNF%2BfVfUWN8%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 4011e0f559d221e01a6b12c98fba91f16b3fb1c1 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Wed, 13 Jan 2021 02:43:57 +0800
Subject: [PATCH 0041/1674] =?UTF-8?q?[Mellanox]=20[platform=20API]=20Fix?=
 =?UTF-8?q?=20=E2=80=9Clocal=20variable=20'label=5Fport'=20referenced=20be?=
 =?UTF-8?q?fore=20assignment=E2=80=9D=20error=20(#6419)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In rare case can see that xcvrd failed due to "UnboundLocalError: local variable 'label_port' referenced before assignment"

Init "label_port" as None at the beginning of the function, to avoid the case that "label_port" not assigned.
---
 .../mellanox/mlnx-platform-api/sonic_platform/sfp_event.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
index 5c57e213a196..ba3ab68a9576 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
@@ -278,6 +278,7 @@ def on_pmpe(self, fd_p):
         port_cnt_p = new_uint32_t_p()
         uint32_t_p_assign(port_cnt_p,64)
         label_port_list = []
+        label_port = None
         module_state = 0
 
         rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p)
@@ -309,9 +310,11 @@ def on_pmpe(self, fd_p):
                 for i in range(port_cnt):
                     port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,i)
                     if port_attributes.log_port == logical_port:
-                        lable_port = port_attributes.port_mapping.module_port
+                        label_port = port_attributes.port_mapping.module_port
                         break
-                label_port_list.append(lable_port)
+
+                if label_port is not None:
+                    label_port_list.append(label_port)
 
         delete_uint32_t_p(pkt_size_p)
         delete_uint8_t_arr(pkt)

From 9f89da15baaa096d65ef2f23155dcd1f20682264 Mon Sep 17 00:00:00 2001
From: guxianghong <gxh2001757@163.com>
Date: Wed, 13 Jan 2021 04:36:10 +0800
Subject: [PATCH 0042/1674] [Centec] upgrade to buster docker for
 DOCKER_SYNCD_CENTEC_RPC, docker-saiserver-centec and platform-modules (#6423)

Centec syncd have beend upgraded to buster, docker-syncd-centec-rpc do not need generate stretch based docker.

Co-authored-by: Xianghong Gu <xgu@centecnetworks.com>
---
 platform/centec-arm64/docker-saiserver-centec.mk | 2 +-
 platform/centec-arm64/docker-syncd-centec-rpc.mk | 1 -
 platform/centec/docker-syncd-centec-rpc.mk       | 1 -
 platform/centec/platform-modules-embedway.mk     | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/platform/centec-arm64/docker-saiserver-centec.mk b/platform/centec-arm64/docker-saiserver-centec.mk
index 770b66b83233..8d1b11bf005e 100755
--- a/platform/centec-arm64/docker-saiserver-centec.mk
+++ b/platform/centec-arm64/docker-saiserver-centec.mk
@@ -4,7 +4,7 @@ DOCKER_SAISERVER_CENTEC = docker-saiserver-centec.gz
 $(DOCKER_SAISERVER_CENTEC)_PATH = $(PLATFORM_PATH)/docker-saiserver-centec
 $(DOCKER_SAISERVER_CENTEC)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_CENTEC)_FILES += $(DSSERVE) $(BCMCMD)
-$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_CENTEC)
 
 $(DOCKER_SAISERVER_CENTEC)_CONTAINER_NAME = saiserver
diff --git a/platform/centec-arm64/docker-syncd-centec-rpc.mk b/platform/centec-arm64/docker-syncd-centec-rpc.mk
index 8d699c91347f..2c441e4fc410 100755
--- a/platform/centec-arm64/docker-syncd-centec-rpc.mk
+++ b/platform/centec-arm64/docker-syncd-centec-rpc.mk
@@ -12,7 +12,6 @@ $(DOCKER_SYNCD_CENTEC_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
 endif
 $(DOCKER_SYNCD_CENTEC_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
 endif
diff --git a/platform/centec/docker-syncd-centec-rpc.mk b/platform/centec/docker-syncd-centec-rpc.mk
index 8915f1c35679..6b912185b7da 100644
--- a/platform/centec/docker-syncd-centec-rpc.mk
+++ b/platform/centec/docker-syncd-centec-rpc.mk
@@ -12,7 +12,6 @@ $(DOCKER_SYNCD_CENTEC_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
 endif
 $(DOCKER_SYNCD_CENTEC_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
 endif
diff --git a/platform/centec/platform-modules-embedway.mk b/platform/centec/platform-modules-embedway.mk
index 366080f04114..c2ddfc327542 100644
--- a/platform/centec/platform-modules-embedway.mk
+++ b/platform/centec/platform-modules-embedway.mk
@@ -9,5 +9,4 @@ EMBEDWAY_ES6220_PLATFORM_MODULE = platform-modules-embedway-es6220_$(EMBEDWAY_ES
 $(EMBEDWAY_ES6220_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-embedway
 $(EMBEDWAY_ES6220_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 $(EMBEDWAY_ES6220_PLATFORM_MODULE)_PLATFORM = x86_64-ew_es6220_x48q2h4-r0
-SONIC_STRETCH_DEBS += $(EMBEDWAY_ES6220_PLATFORM_MODULE)
-SONIC_DPKG_DEBS += $(EMBEDWAY_ES6220_PLATFORM_MODULE)
\ No newline at end of file
+SONIC_DPKG_DEBS += $(EMBEDWAY_ES6220_PLATFORM_MODULE)

From d2f684b05c7e4c3e19d779462aae6b8c3fc87898 Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Tue, 12 Jan 2021 18:05:06 -0500
Subject: [PATCH 0043/1674] [Platform][nokia]: python3-smbus package add with
 python3 and jinja fixes  (#6416)

fix platform driver breakage due to python3 upgrade and fix load minigraph errors with config load_minigraph -y

**- How I did it**
added python3-smbus to the pmon docker template since the previous was python2 specific
fixed additional "ord" python2 specific code
fixed the jinja templates used by qos reload - the template logic required data to be parsed

**- How to verify it**
run "show platform XXX" commands and verify output
run "sudo config load_minigraph -y" and verify configuration
run "show interfaces XXX" and verify output

Co-authored-by: Carl Keene <keene@nokia.com>
---
 .../armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2      | 2 ++
 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 | 3 ++-
 dockers/docker-platform-monitor/Dockerfile.j2                  | 1 +
 .../sonic-platform-nokia/7215/sonic_platform/sfp.py            | 2 +-
 .../sonic-platform-nokia/7215/sonic_platform/watchdog.py       | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
index 9495a66c0d07..a38350a982bc 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/buffers.json.j2
@@ -6,3 +6,5 @@
 {# Port configuration to cable length look-up table #}
 {# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
 {# Roles described in the minigraph #}
+{}
+
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
index 529f1be8a545..c28e2e13e974 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/qos.json.j2
@@ -1 +1,2 @@
-# this file empty temporarily until qos supported SAI Marvell 
+{# this file empty temporarily until qos supported SAI Marvell #}
+{}
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index b768a3c17e60..9662f7248001 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update &&   \
         librrd-dev      \
         rrdtool         \
         python-smbus    \
+        python3-smbus   \
         ethtool         \
         dmidecode       \
         i2c-tools       \
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index 1bf3d4c03db0..274db04ded0b 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -210,7 +210,7 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
             sysfsfile_eeprom.seek(offset)
             raw = sysfsfile_eeprom.read(num_bytes)
             for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
         except Exception as e:
             pass
         finally:
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
index 75ec3ab177ae..5d75a223c523 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
@@ -15,7 +15,7 @@
 """ ioctl constants """
 IO_READ = 0x80000000
 IO_SIZE_INT = 0x00040000
-IO_TYPE_WATCHDOG = ord('W') << 8
+IO_TYPE_WATCHDOG = 'W' << 8
 
 WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
 

From 533b7cc676b1c428a99ea4f2f1199ce779641c37 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Tue, 12 Jan 2021 19:59:42 -0500
Subject: [PATCH 0044/1674] [Nokia ixs7215] Add SW assist for platform entropy
 & fix inband mgmt support (#6417)

- Improve random number generation during early Sonic initialization by providing SW updates to Linux entropy value.
- Improve handling of platform In-Band management port

This commit provides the following updates to the Nokia ixs7215 platform

1. The Marvell Armada-38x SOC requires SW assistance to improve the system
   entropy value available early on in the Sonic boot sequence.
2. The Nokia ixs7215 platform does not have a dedicated Out-Of-Band (OOB) mgmt
   port and thus requires additional logic to optionally support configuring
   front panel port 48 as an In-Band mgmt port. This commit provides additional
   logic to manage and maintain the operation of this In-Band mgmt port.
---
 .../debian/sonic-platform-nokia-7215.install  |  2 ++
 .../sonic-platform-nokia/entropy.py           | 19 +++++++++++++
 .../sonic-platform-nokia/inband_mgmt.sh       | 28 +++++++++++++++++++
 .../nokia-7215_plt_setup.sh                   |  3 ++
 4 files changed, 52 insertions(+)
 create mode 100644 platform/marvell-armhf/sonic-platform-nokia/entropy.py
 create mode 100644 platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh

diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
index 0b867d259f10..dc4df5540d96 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
+++ b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
@@ -3,3 +3,5 @@ nokia-7215_plt_setup.sh usr/sbin
 7215/service/nokia-7215init.service  etc/systemd/system
 7215/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0
 7215/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0
+entropy.py etc/
+inband_mgmt.sh etc/
diff --git a/platform/marvell-armhf/sonic-platform-nokia/entropy.py b/platform/marvell-armhf/sonic-platform-nokia/entropy.py
new file mode 100644
index 000000000000..338e2ad9bcea
--- /dev/null
+++ b/platform/marvell-armhf/sonic-platform-nokia/entropy.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+import fcntl, struct
+import time
+from os import path
+
+RNDADDENTROPY=0x40085203
+
+def avail():
+  with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail:
+      return int(avail.read())
+
+if path.exists("/proc/sys/kernel/random/entropy_avail"):
+    while 1:
+        while avail() < 2048:
+            with open('/dev/urandom', 'rb') as urnd, open("/dev/random", mode='wb') as rnd:
+                d = urnd.read(512)
+                t = struct.pack('ii', 4 * len(d), len(d)) + d
+                fcntl.ioctl(rnd, RNDADDENTROPY, t)
+        time.sleep(30)
diff --git a/platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh b/platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh
new file mode 100644
index 000000000000..25455d16ecbf
--- /dev/null
+++ b/platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#inband_mgmt
+
+inband_mgmt(){
+ # In this platform, one of the network ports is used as mgmt interface.
+ # This script periodically monitors inband management port eth0 and
+ # assigns IP address to eth0 if needed.
+ if [ ! -f /host/machine.conf ]; then
+     exit 0
+ fi
+ #wait for n/w port init to complete
+ sleep 60
+ while :; do
+   ip -br link show eth0 2> /dev/null
+   if [ $? -eq 0 ]; then
+       ip address show eth0 | grep -qw "inet" 2>/dev/null
+       if [ $? -ne 0 ]; then
+           ifconfig eth0 down
+           systemctl restart networking
+       fi
+       sleep 120
+   else
+     sleep 3
+   fi
+ done
+}
+(inband_mgmt > /dev/null)&
diff --git a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
index e4fc716cf5a5..8301999d0d0a 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
+++ b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
@@ -30,6 +30,9 @@ main()
 {
     fw_uboot_env_cfg
     echo "Nokia-IXS7215: /dev/mtd0 FW_ENV_DEFAULT"
+
+    python /etc/entropy.py &
+    /bin/sh /etc/inband_mgmt.sh
 }
 
 main $@

From ef16128ce8b0eab60f96f9f90732a4362651b2d9 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 13 Jan 2021 18:40:39 +0800
Subject: [PATCH 0045/1674] Fix py3 version changed even version control
 enabled issue (#6422)

* Fix py3 version changed even version control enabled issue

* Add some comments and simplify the script

* Add the comment to explain how to get the not hooked command
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh   | 7 ++++++-
 src/sonic-build-hooks/scripts/symlink_build_hooks | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index d19558c544e3..94b767861467 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -22,15 +22,20 @@ log_err()
     echo "$1" 1>&2
 }
 
+# Get the real command not hooked by sonic-build-hook package
 get_command()
 {
-    local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##")
+    # Change the PATH env to get the real command by excluding the command in the hooked folders
+    local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/local/sbin:##")
     local command=$(PATH=$path which $1)
     echo $command
 }
 
 check_version_control()
 {
+    # The env variable SONIC_VERSION_CONTROL_COMPONENTS examples:
+    # all            -- match all components
+    # py2,py3,deb    -- match py2, py3 and deb only
     if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,$1,* ]]; then
         echo "y"
     else
diff --git a/src/sonic-build-hooks/scripts/symlink_build_hooks b/src/sonic-build-hooks/scripts/symlink_build_hooks
index 7218575ee9ab..2ce5ec27720f 100755
--- a/src/sonic-build-hooks/scripts/symlink_build_hooks
+++ b/src/sonic-build-hooks/scripts/symlink_build_hooks
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HOOK_PATH=/usr/local/share/buildinfo/hooks
-TARGET_PATH=/usr/sbin
+TARGET_PATH=/usr/local/sbin
 FILES=$(ls $HOOK_PATH)
 
 usage()

From 7a102cd785a87ec8a143e97895341de568113f5a Mon Sep 17 00:00:00 2001
From: Vadym Hlushko <62022266+vadymhlushko-mlnx@users.noreply.github.com>
Date: Wed, 13 Jan 2021 15:45:05 +0200
Subject: [PATCH 0046/1674] [SN4410] fixed 'port_config.ini' (#6316)

Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
---
 .../ACS-MSN4410/port_config.ini               | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini

diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
deleted file mode 120000
index 606b074c20e8..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
+++ /dev/null
@@ -1 +0,0 @@
-../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
new file mode 100644
index 000000000000..5b76c3a59d40
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
@@ -0,0 +1,33 @@
+# name          lanes                               alias     index
+Ethernet0       0,1,2,3                             etp1      1
+Ethernet8       8,9,10,11                           etp2      2
+Ethernet16      16,17,18,19                         etp3      3
+Ethernet24      24,25,26,27                         etp4      4
+Ethernet32      32,33,34,35                         etp5      5
+Ethernet40      40,41,42,43                         etp6      6
+Ethernet48      48,49,50,51                         etp7      7
+Ethernet56      56,57,58,59                         etp8      8
+Ethernet64      64,65,66,67                         etp9      9
+Ethernet72      72,73,74,75                         etp10     10
+Ethernet80      80,81,82,83                         etp11     11
+Ethernet88      88,89,90,91                         etp12     12
+Ethernet96      96,97,98,99                         etp13     13
+Ethernet104     104,105,106,107                     etp14     14
+Ethernet112     112,113,114,115                     etp15     15
+Ethernet120     120,121,122,123                     etp16     16
+Ethernet128     128,129,130,131                     etp17     17
+Ethernet136     136,137,138,139                     etp18     18
+Ethernet144     144,145,146,147                     etp19     19
+Ethernet152     152,153,154,155                     etp20     20
+Ethernet160     160,161,162,163                     etp21     21
+Ethernet168     168,169,170,171                     etp22     22
+Ethernet176     176,177,178,179                     etp23     23
+Ethernet184     184,185,186,187                     etp24     24
+Ethernet192     192,193,194,195,196,197,198,199     etp25     25
+Ethernet200     200,201,202,203,204,205,206,207     etp26     26
+Ethernet208     208,209,210,211,212,213,214,215     etp27     27
+Ethernet216     216,217,218,219,220,221,222,223     etp28     28
+Ethernet224     224,225,226,227,228,229,230,231     etp29     29
+Ethernet232     232,233,234,235,236,237,238,239     etp30     30
+Ethernet240     240,241,242,243,244,245,246,247     etp31     31
+Ethernet248     248,249,250,251,252,253,254,255     etp32     32
\ No newline at end of file

From e6a78b65c5ba3b6789477c91741a86f4b7913e73 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 13 Jan 2021 08:32:22 -0800
Subject: [PATCH 0047/1674] Update swi-tools in buster Dockerfile (#6414)

Fixed swi-tools code to work with `python3`
Updated the version of swi-tools downloaded by the `sonic-slave-buster/Dockerfile.j2`
Other Dockerfiles still use the `python2` version, though swi-tools is not used within the stretch builder.
---
 sonic-slave-buster/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 2a93c439d71c..b372e3e28636 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -479,7 +479,7 @@ RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 RUN pip2 install m2crypto==0.36.0
 
 # Install swi tools
-RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00
+RUN pip3 install git+https://github.com/aristanetworks/swi-tools.git@bead66bf261770237f7dd21ace3774ba04a017e9
 
 {% if CONFIGURED_ARCH != "amd64" -%}
 # Install node.js for azure pipeline

From 78ca4d1c1a82a70eb2aefc75ce4b297bbfaeb646 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 14 Jan 2021 01:42:04 +0800
Subject: [PATCH 0048/1674] [Mellanox] Fix issue: need import
 initialize_sdk_handle in get_sdk_handle (#6435)

Found test_sfp.py failed due to use a method without importing it.
---
 platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index c1d93b8ffdac..b5ca79286d1f 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -113,7 +113,6 @@ def initialize_fan(self):
 
     def initialize_sfp(self):
         from sonic_platform.sfp import SFP
-        from sonic_platform.sfp import initialize_sdk_handle
 
         self.sfp_module = SFP
 
@@ -137,6 +136,7 @@ def initialize_sfp(self):
 
     def get_sdk_handle(self):
         if not self.sdk_handle:
+            from sonic_platform.sfp import initialize_sdk_handle
             self.sdk_handle = initialize_sdk_handle()
             if self.sdk_handle is None:
                 logger.log_error('Failed to open SDK handle')

From 43c25d6283b8f7af52cbeb17558f855531a30516 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Wed, 13 Jan 2021 10:18:17 -0800
Subject: [PATCH 0049/1674] [sonic-swss-common] Advance swss-common head to
 include General Protection error fix (#6436)

To include Kernel GP fault seen in *syncd processes:
Azure/sonic-swss-common#444
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 71dc350d94a9..2db7bea9963a 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 71dc350d94a93a6a13bbcec9d9723809e4d3bae2
+Subproject commit 2db7bea9963a988a575b8075e1f6c5369d057230

From e6de7d32863879acfadcc3abcec99ca62876dfc5 Mon Sep 17 00:00:00 2001
From: Kalimuthu-Velappan
 <53821802+Kalimuthu-Velappan@users.noreply.github.com>
Date: Thu, 14 Jan 2021 00:02:42 +0530
Subject: [PATCH 0050/1674] [build]: Fix for missing dependencies in the DPKG
 framework (#6393)

1. Fixes the missing DPKG file for gbsyncd-vs package
2. Fixes the softlink issue on the Platform-common and ztp package
3. Fixes the PYTHNON_DEBS list is missing for DBG dockers.
---
 platform/vs/rules.dep           | 1 +
 rules/functions                 | 1 +
 rules/sonic-platform-common.dep | 2 +-
 rules/sonic-ztp.dep             | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/vs/rules.dep b/platform/vs/rules.dep
index 7d36c819509e..7a5346619e70 100644
--- a/platform/vs/rules.dep
+++ b/platform/vs/rules.dep
@@ -2,6 +2,7 @@ include $(PLATFORM_PATH)/syncd-vs.dep
 include $(PLATFORM_PATH)/sonic-version.dep
 include $(PLATFORM_PATH)/docker-sonic-vs.dep
 include $(PLATFORM_PATH)/docker-syncd-vs.dep
+include $(PLATFORM_PATH)/docker-gbsyncd-vs.dep
 include $(PLATFORM_PATH)/one-image.dep
 include $(PLATFORM_PATH)/onie.dep
 include $(PLATFORM_PATH)/kvm-image.dep
diff --git a/rules/functions b/rules/functions
index 5ccb111cec72..35b63aeabaf7 100644
--- a/rules/functions
+++ b/rules/functions
@@ -117,6 +117,7 @@ define add_dbg_docker
 $(2)_PATH = $($(1)_PATH)
 $(2)_DBG_DEPENDS += $($(1)_DBG_DEPENDS)
 $(2)_DBG_IMAGE_PACKAGES += $($(1)_DBG_IMAGE_PACKAGES)
+$(2)_PYTHON_DEBS += $($(1)_PYTHON_DEBS)
 $(2)_PYTHON_WHEELS += $($(1)_PYTHON_WHEELS)
 $(2)_LOAD_DOCKERS += $($(1)_LOAD_DOCKERS)
 $(2)_CACHE_MODE += $($(1)_CACHE_MODE)
diff --git a/rules/sonic-platform-common.dep b/rules/sonic-platform-common.dep
index f93240135988..e921c4df01af 100644
--- a/rules/sonic-platform-common.dep
+++ b/rules/sonic-platform-common.dep
@@ -2,7 +2,7 @@
 SPATH       := $($(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-platform-common.mk rules/sonic-platform-common.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "sonic_sfp|sonic_eeprom"))
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "^sonic_sfp|^sonic_eeprom"))
 
 $(SONIC_PLATFORM_COMMON_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
diff --git a/rules/sonic-ztp.dep b/rules/sonic-ztp.dep
index 32890c5d74b6..bf6622ddb505 100644
--- a/rules/sonic-ztp.dep
+++ b/rules/sonic-ztp.dep
@@ -2,7 +2,7 @@
 SPATH       := $($(SONIC_ZTP)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-ztp.mk rules/sonic-ztp.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "inband-ztp-ip|dhclient-exit-hooks.d/ztp"))
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "dhclient-enter-hooks.d|dhclient-exit-hooks.d"))
 
 
 $(SONIC_ZTP)_CACHE_MODE  := GIT_CONTENT_SHA 

From b94e2fd676113b22c749458ef1348187a0410306 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Thu, 14 Jan 2021 07:18:05 +0800
Subject: [PATCH 0051/1674] [sonic-linux-kernel]: Update sonic-linux-kernel
 submodule (#6433)

Update sonic-linux-kernel pointer to pick up new commits:

- Backport patches to increase critical threshold for ASIC and validate transceiver temperature a7c1af7c44edde90dff49d672071139043bcdb65  https://github.com/Azure/sonic-linux-kernel/commit/548e8e0be49692050ea4071d5e9945816bc5aacc
- [ci]: Set up CI with Azure Pipelines   548e8e0be49692050ea4071d5e9945816bc5aacc https://github.com/Azure/sonic-linux-kernel/commit/a7c1af7c44edde90dff49d672071139043bcdb65

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 6f53047ae257..548e8e0be496 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 6f53047ae2579ca406fe48983d704a2c8a43f68b
+Subproject commit 548e8e0be49692050ea4071d5e9945816bc5aacc

From bd5147bbed769db9d37fea8e97f29d31f966aede Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 14 Jan 2021 00:29:21 -0800
Subject: [PATCH 0052/1674] [swss] Depend on Python 3 version of swsscommon
 rather than Python 2 (#6432)

The only Python code in the SwSS package, restore_neighbors.py, was recently converted to Python 3 and most dependencies were updated as part of #6207. However, the SwSS makefile still listed the Python 2 version of the swsscommon package as a dependency. This caused Python 2-related packages to be installed in containers unnecessarily.
---
 rules/swss.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/swss.mk b/rules/swss.mk
index 210333614555..e4d18cf2eb3d 100644
--- a/rules/swss.mk
+++ b/rules/swss.mk
@@ -8,7 +8,7 @@ $(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
 $(SWSS)_UNINSTALLS = $(LIBSAIVS_DEV)
 
 $(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) \
-    $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
+    $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb

From 80c1926aa22ef7042a4fc96d32ad259330a05cf0 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:34:34 +0200
Subject: [PATCH 0053/1674] [snmpagent] update submodule (#6169)

Includes below sonic-snmpagent commits
```
dfde06e 2021-01-13 | Revert "[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters (#169)" (#191) [Stepan Blyshchak]
45edd7e 2021-01-04 | [snmpagent] Fix hardcoded qsfp lane count by reading sensor status from DB (#184) [Junchao-Mellanox]
3b72a6f 2021-01-02 | Fix: handle empty LOC_CHASSIS_TABLE (#190) [Qi Luo]
4aad821 2020-12-29 | [sysName]: Implement sysName OID (#185) [SuvarnaMeenakshi]
8efb4bb 2020-12-29 | [rfc1213] fix counter value type (#189) [Stepan Blyshchak]
025483a 2020-12-23 | [RouteUpdater]: Fix multi_asic mock function implementation and multi_asic variable name (#186) [SuvarnaMeenakshi]
381ae47 2020-12-10 | [mibs] b'VLAN_TABLE:' -> 'VLAN_TABLE' (#181) [Stepan Blyshchak]
e54036c 2020-12-09 | [rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters (#169) [Stepan Blyshchak]
fd1eae7 2020-11-24 | Set swsscommon logging level (#178) [Qi Luo]
706d504 2020-11-23 | Improve MockRedis _encode(): so it will work on all types of value (#179) [Qi Luo]
64c93a1 2020-11-16 | [RFC4292][Namespace]: Fix implementation of RouteUpdater for multi-asic platform (#176) [SuvarnaMeenakshi]
b8f19ee 2020-11-12 | [sonic-snmpagent] SONiC physical entity mib extension (#168) [Junchao-Mellanox]
6b94ec3 2020-11-05 | Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code (#162) [Qi Luo]
```

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 57e54d956193..dfde06e2f5d7 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 57e54d9561934b853a44185bbb401207f4503292
+Subproject commit dfde06e2f5d70e23882af6c0f1af4ae43ec2fa43

From 238ff9f289b255212393e12e2a75b19377dc0d5d Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:26:15 -0800
Subject: [PATCH 0054/1674] [sonic-platform-common] Enable pytest during build
 for Python 3 package (#6442)

**- Why I did it**

To enable running Pytest unit tests before building the Python 3 sonic-platform-common package

**- How I did it**

- Add Python 3 sonic-config-engine package as a dependency of Python 3 sonic-platform-common package (needed for both runtime and unit tests)
- No longer disable unit tests when building Python 3 sonic-platform-common package
---
 rules/sonic-platform-common.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk
index a734abfd6d72..b3dd0155d59e 100644
--- a/rules/sonic-platform-common.mk
+++ b/rules/sonic-platform-common.mk
@@ -10,8 +10,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl
 $(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common
 $(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3
-$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3)
+$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE_PY3)
 # Synthetic dependency just to avoid race condition
 $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PLATFORM_COMMON_PY2)
-$(SONIC_PLATFORM_COMMON_PY3)_TEST = n
 SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)

From cd8417afd73209de75c83e33679941ce1a66f293 Mon Sep 17 00:00:00 2001
From: pavel-shirshov <pavelsh@microsoft.com>
Date: Thu, 14 Jan 2021 11:09:16 -0800
Subject: [PATCH 0055/1674] [docker-frr]: Use egrep with regexp to match
 correct TSA rules (#6403)

**- Why I did it**
Earlier today we found a bug in the SONiC TSA implementation.
TSC shows incorrect output (see below) in case we have a route-map which contains TSA route-map as a prefix.
```
admin@str-s6100-acs-1:~$ TSC
Traffic Shift Check:
System Mode: Not consistent
```
The reason is that TSC implementation has too loose regexps in TSA utilities, which match wrong route-map entries:
For example, current TSC matches following
```
route-map TO_BGP_PEER_V4 permit 200
route-map TO_BGP_PEER_V6 permit 200
```
But it should match only
```
route-map TO_BGP_PEER_V4 permit 20
route-map TO_BGP_PEER_V4 deny 30
route-map TO_BGP_PEER_V6 permit 20
route-map TO_BGP_PEER_V6 deny 30
```

**- How I did it**
I fixed it by using egrep with `^` and `$` regexp markers which match begin and end of the line.

**- How to verify it**
1. Add follwing entry to FRR config:
```
str-s6100-acs-1#
str-s6100-acs-1# conf t
str-s6100-acs-1(config)# route-map TO_BGP_PEER_V4 permit 200
str-s6100-acs-1(config-route-map)# end
```
2. Use the TSC command and check output. It should show normal.
```
admin@str-s6100-acs-1:~$ TSC
Traffic Shift Check:
System Mode: Normal```
---
 dockers/docker-fpm-frr/TSA | 4 ++--
 dockers/docker-fpm-frr/TSB | 4 ++--
 dockers/docker-fpm-frr/TSC | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
index 81816b99db40..524e4297d1c0 100755
--- a/dockers/docker-fpm-frr/TSA
+++ b/dockers/docker-fpm-frr/TSA
@@ -6,9 +6,9 @@ function check_not_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 20"
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
     c=$((c+$?))
-    echo "$config" | grep -q "route-map $route_map_name deny 30"
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
     c=$((c+$?))
   done
   return $c
diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
index b7eac390cf46..8592ad76cf69 100755
--- a/dockers/docker-fpm-frr/TSB
+++ b/dockers/docker-fpm-frr/TSB
@@ -7,10 +7,10 @@ function check_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 20"
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
     c=$((c+$?))
     e=$((e+1))
-    echo "$config" | grep -q "route-map $route_map_name deny 30"
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
     c=$((c+$?))
     e=$((e+1))
   done
diff --git a/dockers/docker-fpm-frr/TSC b/dockers/docker-fpm-frr/TSC
index 5e7d579fc4a2..c7fd8a2ff157 100755
--- a/dockers/docker-fpm-frr/TSC
+++ b/dockers/docker-fpm-frr/TSC
@@ -6,9 +6,9 @@ function check_not_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 20"
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
     c=$((c+$?))
-    echo "$config" | grep -q "route-map $route_map_name deny 30"
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
     c=$((c+$?))
   done
   return $c
@@ -21,10 +21,10 @@ function check_installed()
   config=$(vtysh -c "show run")
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
   do
-    echo "$config" | grep -q "route-map $route_map_name permit 20"
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
     c=$((c+$?))
     e=$((e+1))
-    echo "$config" | grep -q "route-map $route_map_name deny 30"
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
     c=$((c+$?))
     e=$((e+1))
   done

From a1951ea1983ddf1d7ffd485392a8deddb7e025e2 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 15 Jan 2021 07:48:11 -0800
Subject: [PATCH 0056/1674] [warm boot finalizer] only wait for enabled
 components to reconcile (#6454)

* [warm boot finalizer] only wait for enabled components to reconcile

Define the component with its associated service. Only wait for components that have associated service enabled to reconcile during warm reboot.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../warmboot-finalizer/finalize-warmboot.sh   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/files/image_config/warmboot-finalizer/finalize-warmboot.sh b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
index 094fff2133f7..172fd95ab2e9 100755
--- a/files/image_config/warmboot-finalizer/finalize-warmboot.sh
+++ b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
@@ -2,8 +2,15 @@
 
 VERBOSE=no
 
-# Check components
-COMP_LIST="orchagent neighsyncd bgp natsyncd"
+# Define components that needs to reconcile during warm
+# boot:
+#       The key is the name of the service that the components belong to.
+#       The value is list of component names that will reconcile.
+declare -A RECONCILE_COMPONENTS=( \
+                        ["swss"]="orchagent neighsyncd" \
+                        ["bgp"]="bgp"                   \
+                        ["nat"]="natsyncd"              \
+                       )
 EXP_STATE="reconciled"
 
 ASSISTANT_SCRIPT="/usr/local/bin/neighbor_advertiser"
@@ -18,6 +25,20 @@ function debug()
 }
 
 
+function get_component_list()
+{
+    SVC_LIST=${!RECONCILE_COMPONENTS[@]}
+    COMPONENT_LIST=""
+    for service in ${SVC_LIST}; do
+        components=${RECONCILE_COMPONENTS[${service}]}
+        status=$(sonic-db-cli CONFIG_DB HGET "FEATURE|${service}" state)
+        if [[ x"${status}" == x"enabled" || x"${status}" == x"always_enabled" ]]; then
+            COMPONENT_LIST="${COMPONENT_LIST} ${components}"
+        fi
+    done
+}
+
+
 function check_warm_boot()
 {
     WARM_BOOT=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
@@ -53,9 +74,9 @@ function check_list()
     RET_LIST=''
     for comp in $@; do
         state=`get_component_state ${comp}`
-	if [[ x"${state}" != x"${EXP_STATE}" ]]; then
+        if [[ x"${state}" != x"${EXP_STATE}" ]]; then
             RET_LIST="${RET_LIST} ${comp}"
-	fi
+        fi
     done
 
     echo ${RET_LIST}
@@ -102,13 +123,17 @@ fi
 
 restore_counters_folder
 
-list=${COMP_LIST}
+get_component_list
+
+debug "Waiting for components: '${COMPONENT_LIST}' to reconcile ..."
+
+list=${COMPONENT_LIST}
 
 # Wait up to 5 minutes
 for i in `seq 60`; do
     list=`check_list ${list}`
     if [[ -z "${list}" ]]; then
-	break
+        break
     fi
     sleep 5
 done

From ed0ac08e449d599f472b3b0f4007e872e8b55323 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sat, 16 Jan 2021 00:00:15 +0800
Subject: [PATCH 0057/1674] [Mellanox] PSU and module thermals are no longer
 child of chassis (#6460)

In order to build up device hierachy, PSU and module thermals are no longer child of chassis. PSU thermal belongs to PSU objects and SFP thermals belong to SFP object now. Need align this change in platform.json. Move thermal objects to correct parent device
---
 .../x86_64-mlnx_msn2700-r0/platform.json      | 338 +++++++++++-------
 1 file changed, 203 insertions(+), 135 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
index cdb3e52fd682..38abbc40bb49 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
@@ -75,13 +75,23 @@
                     {
                         "name": "psu_1_fan_1"
                     }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
                 ]
             },
             {
                 "name": "PSU 2",
                 "fans": [
                     {
-                        "name": "psu_2_fan_1"
+                        "name": "PSU-2 Temp"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
                     }
                 ]
             }
@@ -104,206 +114,264 @@
             },
             {
                 "name": "CPU Pack Temp"
-            },
-            {
-                "name": "PSU-1 Temp"
-            },
-            {
-                "name": "PSU-2 Temp"
-            },
-            {
-                "name": "xSFP module 1 Temp"
-            },
-            {
-                "name": "xSFP module 2 Temp"
-            },
-            {
-                "name": "xSFP module 3 Temp"
-            },
-            {
-                "name": "xSFP module 4 Temp"
-            },
-            {
-                "name": "xSFP module 5 Temp"
-            },
-            {
-                "name": "xSFP module 6 Temp"
-            },
-            {
-                "name": "xSFP module 7 Temp"
-            },
-            {
-                "name": "xSFP module 8 Temp"
-            },
-            {
-                "name": "xSFP module 9 Temp"
-            },
-            {
-                "name": "xSFP module 10 Temp"
-            },
-            {
-                "name": "xSFP module 11 Temp"
-            },
-            {
-                "name": "xSFP module 12 Temp"
-            },
-            {
-                "name": "xSFP module 13 Temp"
-            },
-            {
-                "name": "xSFP module 14 Temp"
-            },
-            {
-                "name": "xSFP module 15 Temp"
-            },
-            {
-                "name": "xSFP module 16 Temp"
-            },
-            {
-                "name": "xSFP module 17 Temp"
-            },
-            {
-                "name": "xSFP module 18 Temp"
-            },
-            {
-                "name": "xSFP module 19 Temp"
-            },
-            {
-                "name": "xSFP module 20 Temp"
-            },
-            {
-                "name": "xSFP module 21 Temp"
-            },
-            {
-                "name": "xSFP module 22 Temp"
-            },
-            {
-                "name": "xSFP module 23 Temp"
-            },
-            {
-                "name": "xSFP module 24 Temp"
-            },
-            {
-                "name": "xSFP module 25 Temp"
-            },
-            {
-                "name": "xSFP module 26 Temp"
-            },
-            {
-                "name": "xSFP module 27 Temp"
-            },
-            {
-                "name": "xSFP module 28 Temp"
-            },
-            {
-                "name": "xSFP module 29 Temp"
-            },
-            {
-                "name": "xSFP module 30 Temp"
-            },
-            {
-                "name": "xSFP module 31 Temp"
-            },
-            {
-                "name": "xSFP module 32 Temp"
             }
         ],
         "sfps": [
             {
-                "name": "sfp1"
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp2"
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp3"
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp4"
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp5"
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp6"
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp7"
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp8"
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp9"
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp10"
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp11"
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp12"
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp13"
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp14"
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp15"
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp16"
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp17"
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp18"
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp19"
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp20"
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp21"
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp22"
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp23"
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp24"
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp25"
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp26"
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp27"
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp28"
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp29"
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp30"
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp31"
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
             },
             {
-                "name": "sfp32"
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
             }
         ]
     },

From 21d4df3dcdbc5175ff5cc8c77c8cfbd878249622 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Sat, 16 Jan 2021 00:01:11 +0800
Subject: [PATCH 0058/1674] [mellanox][platform api] fix a missing import time
 module (#6458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“time" module was missed to be imported and will cause an error when the branch hit.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
index b2e588a63557..ef13bbd89e27 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
@@ -8,6 +8,7 @@
 import os
 import sys
 import re
+import time
 
 if sys.version_info.major == 3:
     from io import StringIO

From 4f6e16107975e9dd30379f0ff909ea769af5f1ce Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 15 Jan 2021 08:03:47 -0800
Subject: [PATCH 0059/1674] [minigraph.py]: Check for empty cluster tag before
 parsing (#6440)

Some non-production minigraphs will have an empty ClusterName tag

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/minigraph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 1fd6b7b56e8d..8b9794f2bfb8 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -255,7 +255,7 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                 if name == hname:
                     cluster = device.find(str(QName(ns, "ClusterName")))
 
-                    if cluster != None and "str" in cluster.text.lower():
+                    if cluster != None and cluster.text != None and "str" in cluster.text.lower():
                         is_storage_device = True
 
         if child.tag == str(QName(ns, "DeviceInterfaceLinks")):

From 29562d0a4b866b42b36d9fd2a0ad7a94fccada61 Mon Sep 17 00:00:00 2001
From: Roy Lee <roy_lee@accton.com>
Date: Sat, 16 Jan 2021 00:06:21 +0800
Subject: [PATCH 0060/1674] [device/accton]: As7816-64x, fix memory leakage on
 accton fan monitor. (#6168)

It's been reported that accton fan monitor process keeps consuming memory after few days.
The amount of memory occupied increases in linear and never leased.

Signed-off-by: roy_lee <roy_lee@edge-core.com>
---
 .../as7816-64x/utils/accton_as7816_monitor.py              | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_monitor.py b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_monitor.py
index a8dcba0f77db..217351ad2a3c 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_monitor.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_monitor.py
@@ -54,6 +54,9 @@ class accton_as7816_monitor(object):
 
     def __init__(self, log_file, log_level):
         """Needs a logger and a logger level."""
+
+        self.thermal = ThermalUtil()
+        self.fan = FanUtil()
         # set up logging to file
         logging.basicConfig(
             filename=log_file,
@@ -83,8 +86,8 @@ def manage_fans(self):
            4: [max_duty, 57000, sys.maxsize],
         }
   
-        thermal = ThermalUtil()
-        fan = FanUtil()
+        thermal = self.thermal
+        fan = self.fan
         for x in range(fan.get_idx_fan_start(), fan.get_num_fans()+1):
             fan_status = fan.get_fan_status(x)
             if fan_status is None:

From c40e43aadb214e6ab934ccd5a72a90d44de7c165 Mon Sep 17 00:00:00 2001
From: brandonchuang <brandon_chuang@edge-core.com>
Date: Sun, 3 Jan 2021 00:02:30 +0800
Subject: [PATCH 0061/1674] [device/accton] Fix accton driver not been
 installed (#6327)

Accton util applies lsmod to check if drivers are installed.
But lsmod may return error on startup and skip module installation.

Signed-off-by: Brandon Chuang <brandon_chuang@edge-core.com>
---
 .../as5712-54x/utils/accton_as5712_util.py               | 7 ++++---
 .../as5812-54t/utils/accton_as5812_util.py               | 9 +++++----
 .../as5812-54x/utils/accton_as5812_util.py               | 6 ++++--
 .../as5835-54t/utils/accton_as5835_54t_util.py           | 9 +++++----
 .../as5835-54x/utils/accton_as5835_54x_util.py           | 7 ++++---
 .../as6712-32x/utils/accton_as6712_util.py               | 6 ++++--
 .../as7312-54x/utils/accton_as7312_util.py               | 9 +++++----
 .../as7312-54xs/utils/accton_as7312_util.py              | 9 +++++----
 .../as7315-27xb/utils/accton_as7315_util.py              | 9 +++++----
 .../as7326-56x/utils/accton_as7326_util.py               | 7 ++++---
 .../as7712-32x/utils/accton_as7712_util.py               | 9 +++++----
 .../as7716-32x/utils/accton_as7716_util.py               | 6 ++++--
 .../as7716-32xb/utils/accton_as7716_32xb_util.py         | 6 ++++--
 .../as7726-32x/utils/accton_as7726_32x_util.py           | 6 ++++--
 .../as7816-64x/utils/accton_as7816_util.py               | 9 +++++----
 .../as9716-32d/utils/accton_as9716_32d_util.py           | 6 ++++--
 .../minipack/utils/accton_minipack_util.py               | 6 ++++--
 17 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/utils/accton_as5712_util.py b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/utils/accton_as5712_util.py
index ff5d883f1fe8..ed9667da8c99 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/utils/accton_as5712_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/utils/accton_as5712_util.py
@@ -240,11 +240,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("ls /sys/module/ | grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if not lsmod:
+    if ret :
         return False
-
+    else :
+        return True
 
 kos = [
 'depmod -ae',
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/utils/accton_as5812_util.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/utils/accton_as5812_util.py
index e5ec4fa856d2..3859c3279c45 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/utils/accton_as5812_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/utils/accton_as5812_util.py
@@ -145,11 +145,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 			
 kos = [
 'modprobe i2c_dev',
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/utils/accton_as5812_util.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/utils/accton_as5812_util.py
index be4b5a450c19..464c85745f90 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/utils/accton_as5812_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/utils/accton_as5812_util.py
@@ -240,10 +240,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("ls /sys/module | grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54t/utils/accton_as5835_54t_util.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/utils/accton_as5835_54t_util.py
index 84625fd6dbf9..48e49cbaba13 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54t/utils/accton_as5835_54t_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/utils/accton_as5835_54t_util.py
@@ -145,11 +145,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
index 87ef06f0de16..738a1766fbef 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
@@ -145,11 +145,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_check():
-    ret, lsmod = log_os_system("ls /sys/module/ | grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
-    return True
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/utils/accton_as6712_util.py b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/utils/accton_as6712_util.py
index 20968d57a91f..10cdac787309 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/utils/accton_as6712_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/utils/accton_as6712_util.py
@@ -249,10 +249,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
index db58d769b3aa..b4516c07fae7 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
@@ -150,11 +150,12 @@ def log_os_system(cmd, show):
 
 
 def driver_check():
-    (ret, lsmod) = log_os_system('ls /sys/module/ | grep accton', 0)
-    logging.info('mods:' + lsmod)
-    if not lsmod:
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
+    logging.info('mods:'+lsmod)
+    if ret :
         return False
-    return True
+    else :
+        return True
 
 
 kos = [
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/utils/accton_as7312_util.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/utils/accton_as7312_util.py
index 4b2ebbe1cca2..f6a21bdd3df9 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/utils/accton_as7312_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/utils/accton_as7312_util.py
@@ -145,11 +145,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/utils/accton_as7315_util.py b/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/utils/accton_as7315_util.py
index 869a7784f0d9..e3810e42102e 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/utils/accton_as7315_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/utils/accton_as7315_util.py
@@ -147,11 +147,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_as7326_util.py b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_as7326_util.py
index cc04c1de38a9..c5d047e9d4e0 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_as7326_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_as7326_util.py
@@ -178,11 +178,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
-    return True
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/utils/accton_as7712_util.py b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/utils/accton_as7712_util.py
index 9741c506b2d1..8ebc39e6c9c1 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/utils/accton_as7712_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/utils/accton_as7712_util.py
@@ -145,11 +145,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/utils/accton_as7716_util.py b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/utils/accton_as7716_util.py
index 7be4a00b0478..142ce754a5c7 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/utils/accton_as7716_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/utils/accton_as7716_util.py
@@ -267,10 +267,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 #'modprobe cpr_4011_4mxx',
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/utils/accton_as7716_32xb_util.py b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/utils/accton_as7716_32xb_util.py
index 0f1f0d66fddb..3a31d253f633 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/utils/accton_as7716_32xb_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/utils/accton_as7716_32xb_util.py
@@ -240,10 +240,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 
 kos = [
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
index 590add7e925f..a6aa855174be 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
@@ -248,10 +248,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 def cpld_reset_mac():
     ret, lsmod = log_os_system("i2cset -y 0 0x77 0x1", 0)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_util.py b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_util.py
index 0dad870c9718..3aae150dad5c 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_util.py
@@ -167,11 +167,12 @@ def log_os_system(cmd, show):
     return  status, output
             
 def driver_check():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
-        return False   
-    return True
+    if ret :
+        return False
+    else :
+        return True
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/utils/accton_as9716_32d_util.py b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/utils/accton_as9716_32d_util.py
index 61d19d0ac7fd..898fcaa0f0d3 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/utils/accton_as9716_32d_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/utils/accton_as9716_32d_util.py
@@ -254,10 +254,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 
 kos = [
diff --git a/platform/broadcom/sonic-platform-modules-accton/minipack/utils/accton_minipack_util.py b/platform/broadcom/sonic-platform-modules-accton/minipack/utils/accton_minipack_util.py
index cf8e91faf549..25979963bb30 100755
--- a/platform/broadcom/sonic-platform-modules-accton/minipack/utils/accton_minipack_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/minipack/utils/accton_minipack_util.py
@@ -181,10 +181,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 
 

From 120a8da50d41225ecae0d00ba74b913040b4f729 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Sat, 16 Jan 2021 01:20:47 +0700
Subject: [PATCH 0062/1674] [device/celestica]: Add thermalctld support on
 DX010 platform APIs (#6089)

**- Why I did it**
- The thermalctld daemon on the Pmon docker requires support from the thermal manager API.

**- How I did it**
- Removed the old function for detecting a faulty fan.
- Removed the old function for detecting excess temperature.
- Implement thermal_manager APIs based on ThermalManagerBase
- Implement thermal_conditions APIs based on ThermalPolicyConditionBase
- Implement thermal_actions APIs based on ThermalPolicyActionBase
- Implement thermal_info APIs based on ThermalPolicyInfoBase
- Add thermal_policy.json
---
 .../x86_64-cel_seastone-r0/fancontrol-B2F     |   3 +-
 .../x86_64-cel_seastone-r0/fancontrol-F2B     |   3 +-
 .../sonic_platform/chassis.py                 |  12 +-
 .../sonic_platform/fan.py                     |  18 +-
 .../sonic_platform/thermal.py                 | 144 +++++++++++----
 .../sonic_platform/thermal_actions.py         |  78 +++++++++
 .../sonic_platform/thermal_conditions.py      |  77 ++++++++
 .../sonic_platform/thermal_infos.py           | 165 ++++++++++++++++++
 .../sonic_platform/thermal_manager.py         |  46 +++++
 .../system_health_monitoring_config.json      |  16 ++
 .../thermal_overload_control.sh               |   0
 .../thermal_policy.json                       |  93 ++++++++++
 .../debian/platform-modules-dx010.install     |   1 -
 .../debian/platform-modules-dx010.postinst    |   1 +
 .../dx010/scripts/fancontrol.sh               |  83 +++------
 .../services/fancontrol/fancontrol            |  52 +-----
 16 files changed, 647 insertions(+), 145 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_actions.py
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_conditions.py
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_infos.py
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_manager.py
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
 rename {platform/broadcom/sonic-platform-modules-cel/dx010/scripts => device/celestica/x86_64-cel_seastone-r0}/thermal_overload_control.sh (100%)
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/thermal_policy.json

diff --git a/device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F b/device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F
index 61b1c386f3d8..f3277db14df2 100644
--- a/device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F
+++ b/device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F
@@ -9,5 +9,4 @@ MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/
 MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
 MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
 THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3
-MAXTEMPCRIT=/sys/bus/i2c/devices/7-004a/hwmon/hwmon*/temp1_input=65 /sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input=75
-MAXTEMPTYPE=/sys/bus/i2c/devices/7-004a/hwmon/hwmon*/temp1_input=ASIC /sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input=CPU
+
diff --git a/device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B b/device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B
index b851d0a6d6ca..dc67e2623cc2 100644
--- a/device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B
+++ b/device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B
@@ -9,5 +9,4 @@ MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/
 MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
 MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
 THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3
-MAXTEMPCRIT=/sys/bus/i2c/devices/7-004a/hwmon/hwmon*/temp1_input=75 /sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input=75
-MAXTEMPTYPE=/sys/bus/i2c/devices/7-004a/hwmon/hwmon*/temp1_input=ASIC /sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input=CPU
+
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
index 49c79263815d..1b5c5773e27b 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
@@ -74,8 +74,9 @@ def __initialize_fan(self):
 
     def __initialize_thermals(self):
         from sonic_platform.thermal import Thermal
+        airflow = self.__get_air_flow()
         for index in range(0, NUM_THERMAL):
-            thermal = Thermal(index)
+            thermal = Thermal(index, airflow)
             self._thermal_list.append(thermal)
 
     def __initialize_eeprom(self):
@@ -88,6 +89,11 @@ def __initialize_components(self):
             component = Component(index)
             self._component_list.append(component)
 
+    def __get_air_flow(self):
+        air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(self._api_helper.platform) if self.is_host else '/usr/share/sonic/platform/fan_airflow'
+        air_flow = self._api_helper.read_one_line_file(air_flow_path)
+        return air_flow or 'B2F'
+
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the chassis
@@ -291,3 +297,7 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         return True
+
+    def get_thermal_manager(self):
+        from .thermal_manager import ThermalManager
+        return ThermalManager
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
index 10875ee30753..bf2b27019b63 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
@@ -304,4 +304,20 @@ def get_status(self):
         Returns:
             A boolean value, True if device is operating properly, False if not
         """
-        return self.get_presence() and self.get_speed() > 0
+        status = 1
+        if self.is_psu_fan:
+            fan_fault_sysfs_name = "fan1_fault"
+            fan_fault_sysfs_path = self.__search_file_by_name(
+                self.psu_hwmon_path, fan_fault_sysfs_name)
+            status = self._api_helper.read_one_line_file(fan_fault_sysfs_path)
+
+        elif self.get_presence():
+            chip = self.emc2305_chip_mapping[self.fan_index]
+            device = chip['device']
+            fan_index = chip['index_map']
+            sysfs_path = "%s%s/%s" % (
+                EMC2305_PATH, device, 'fan{}_fault')
+            sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
+            status = self._api_helper.read_one_line_file(sysfs_path)
+
+        return False if int(status) != 0 else True
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
index 9e891b65e405..2b38ef94d6c4 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
@@ -16,46 +16,75 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+THERMAL_INFO = {
+    0: {
+        "F2B_max": 50,
+        "B2F_max": 55,
+        "postion": "asic",
+        "name": "Front-panel temp sensor 1",
+        "i2c_path": "i2c-5/5-0048/hwmon/hwmon1",    # u4 system-inlet
+    },
+    1: {
+        "F2B_max": 50,
+        "B2F_max": 55,
+        "postion": "asic",
+        "name": "Front-panel temp sensor 2",
+        "i2c_path": "i2c-6/6-0049/hwmon/hwmon2",    # u2 system-inlet
+    },
+    2: {
+        "F2B_max": 70,
+        "F2B_max_crit": 75,
+        "B2F_max": 60,
+        "B2F_max_crit": 65,
+        "postion": "asic",
+        "name": "ASIC temp sensor",
+        "i2c_path": "i2c-7/7-004a/hwmon/hwmon3",    # u44 bmc56960-on-board
+    },
+    3: {
+        "F2B_max": 70,
+        "F2B_max_crit": 75,
+        "B2F_max": 70,
+        "B2F_max_crit": 75,
+        "postion": "cpu",
+        "name": "Rear-panel temp sensor 1",
+        "i2c_path": "i2c-14/14-0048/hwmon/hwmon4",  # u9200 cpu-on-board
+    },
+    4: {
+        "F2B_max": 70,
+        "B2F_max": 55,
+        "postion": "cpu",
+        "name": "Rear-panel temp sensor 2",
+        "i2c_path": "i2c-15/15-004e/hwmon/hwmon5"   # u9201 system-outlet
+    }
+}
+NULL_VAL = "N/A"
+I2C_ADAPTER_PATH = "/sys/class/i2c-adapter"
+
 
 class Thermal(ThermalBase):
     """Platform-specific Thermal class"""
 
-    THERMAL_NAME_LIST = []
-    I2C_ADAPTER_PATH = "/sys/class/i2c-adapter"
     SS_CONFIG_PATH = "/usr/share/sonic/device/x86_64-cel_seastone-r0/sensors.conf"
 
-    def __init__(self, thermal_index):
+    def __init__(self, thermal_index, airflow):
         self.index = thermal_index
         self._api_helper = APIHelper()
-
-        # Add thermal name
-        self.THERMAL_NAME_LIST.append("Front-panel temp sensor 1")
-        self.THERMAL_NAME_LIST.append("Front-panel temp sensor 2")
-        self.THERMAL_NAME_LIST.append("ASIC temp sensor")
-        self.THERMAL_NAME_LIST.append("Rear-panel temp sensor 1")
-        self.THERMAL_NAME_LIST.append("Rear-panel temp sensor 2")
-
-        # Set hwmon path
-        i2c_path = {
-            0: "i2c-5/5-0048/hwmon/hwmon1",    # u4 system-inlet
-            1: "i2c-6/6-0049/hwmon/hwmon2",    # u2 system-inlet
-            2: "i2c-7/7-004a/hwmon/hwmon3",    # u44 bmc56960-on-board
-            3: "i2c-14/14-0048/hwmon/hwmon4",  # u9200 cpu-on-board
-            4: "i2c-15/15-004e/hwmon/hwmon5"   # u9201 system-outlet
-        }.get(self.index, None)
-
-        self.hwmon_path = "{}/{}".format(self.I2C_ADAPTER_PATH, i2c_path)
-        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self._airflow = airflow
+        self._thermal_info = THERMAL_INFO[self.index]
+        self._hwmon_path = "{}/{}".format(I2C_ADAPTER_PATH,
+                                         self._thermal_info["i2c_path"])
+        self.name = self.get_name()
+        self.postion = self._thermal_info["postion"]
         self.ss_index = 1
 
     def __get_temp(self, temp_file):
-        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        temp_file_path = os.path.join(self._hwmon_path, temp_file)
         raw_temp = self._api_helper.read_txt_file(temp_file_path)
         temp = float(raw_temp)/1000
         return float("{:.3f}".format(temp))
 
     def __set_threshold(self, file_name, temperature):
-        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        temp_file_path = os.path.join(self._hwmon_path, file_name)
         try:
             with open(temp_file_path, 'w') as fd:
                 fd.write(str(temperature))
@@ -80,8 +109,17 @@ def get_high_threshold(self):
             A float number, the high threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        temp_file = "temp{}_max".format(self.ss_index)
-        return self.__get_temp(temp_file)
+        max_crit_key = '{}_max'.format(self._airflow)
+        return self._thermal_info.get(max_crit_key, None)
+
+    def get_low_threshold(self):
+        """
+        Retrieves the low threshold temperature of thermal
+        Returns:
+            A float number, the low threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return 0.0
 
     def set_high_threshold(self, temperature):
         """
@@ -102,7 +140,7 @@ def set_high_threshold(self, temperature):
                     f.seek(0)
                     ss_found = False
                     for idx, val in enumerate(content):
-                        if self.ss_key in val:
+                        if self.name in val:
                             ss_found = True
                         elif ss_found and temp_file in val:
                             content[idx] = "    set {} {}\n".format(
@@ -115,13 +153,43 @@ def set_high_threshold(self, temperature):
 
         return is_set & file_set
 
+    def set_low_threshold(self, temperature):
+        """
+        Sets the low threshold temperature of thermal
+        Args : 
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        return False
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high critical threshold temperature of thermal
+        Returns:
+            A float number, the high critical threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        max_crit_key = '{}_max_crit'.format(self._airflow)
+        return self._thermal_info.get(max_crit_key, None)
+
+    def get_low_critical_threshold(self):
+        """
+        Retrieves the low critical threshold temperature of thermal
+        Returns:
+            A float number, the low critical threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return 0.0
+
     def get_name(self):
         """
         Retrieves the name of the thermal device
             Returns:
             string: The name of the thermal device
         """
-        return self.THERMAL_NAME_LIST[self.index]
+        return self._thermal_info["name"]
 
     def get_presence(self):
         """
@@ -130,9 +198,25 @@ def get_presence(self):
             bool: True if PSU is present, False if not
         """
         temp_file = "temp{}_input".format(self.ss_index)
-        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        temp_file_path = os.path.join(self._hwmon_path, temp_file)
         return os.path.isfile(temp_file_path)
 
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return NULL_VAL
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return NULL_VAL
+
     def get_status(self):
         """
         Retrieves the operational status of the device
@@ -143,7 +227,7 @@ def get_status(self):
             return False
 
         fault_file = "temp{}_fault".format(self.ss_index)
-        fault_file_path = os.path.join(self.hwmon_path, fault_file)
+        fault_file_path = os.path.join(self._hwmon_path, fault_file)
         if not os.path.isfile(fault_file_path):
             return True
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_actions.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_actions.py
new file mode 100644
index 000000000000..545db861f683
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_actions.py
@@ -0,0 +1,78 @@
+
+from sonic_platform_base.sonic_thermal_control.thermal_action_base import ThermalPolicyActionBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+from .thermal_infos import ChassisInfo
+from .helper import APIHelper
+
+
+@thermal_json_object('thermal_control.control')
+class ControlThermalAlgoAction(ThermalPolicyActionBase):
+    """
+    Action to control the thermal control algorithm
+    """
+    # JSON field definition
+    JSON_FIELD_STATUS = 'status'
+
+    def __init__(self):
+        self.status = True
+
+    def load_from_json(self, json_obj):
+        """
+        Construct ControlThermalAlgoAction via JSON. JSON example:
+            {
+                "type": "thermal_control.control"
+                "status": "true"
+            }
+        :param json_obj: A JSON object representing a ControlThermalAlgoAction action.
+        :return:
+        """
+        if ControlThermalAlgoAction.JSON_FIELD_STATUS in json_obj:
+            status_str = json_obj[ControlThermalAlgoAction.JSON_FIELD_STATUS].lower()
+            if status_str == 'true':
+                self.status = True
+            elif status_str == 'false':
+                self.status = False
+            else:
+                raise ValueError('Invalid {} field value, please specify true of false'.
+                                 format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
+        else:
+            raise ValueError('ControlThermalAlgoAction '
+                             'missing mandatory field {} in JSON policy file'.
+                             format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
+
+    def execute(self, thermal_info_dict):
+        """
+        Disable thermal control algorithm
+        :param thermal_info_dict: A dictionary stores all thermal information.
+        :return:
+        """
+        if ChassisInfo.INFO_NAME in thermal_info_dict:
+            chassis_info_obj = thermal_info_dict[ChassisInfo.INFO_NAME]
+            chassis = chassis_info_obj.get_chassis()
+            thermal_manager = chassis.get_thermal_manager()
+            if self.status:
+                thermal_manager.start_thermal_control_algorithm()
+            else:
+                thermal_manager.stop_thermal_control_algorithm()
+
+
+@thermal_json_object('switch.power_cycling')
+class SwitchPolicyAction(ThermalPolicyActionBase):
+    """
+    Base class for thermal action. Once all thermal conditions in a thermal policy are matched,
+    all predefined thermal action will be executed.
+    """
+
+    def execute(self, thermal_info_dict):
+        """
+        Take action when thermal condition matches. For example, power cycle the switch.
+        :param thermal_info_dict: A dictionary stores all thermal information.
+        :return:
+        """
+        thermal_overload_position_path = '/tmp/thermal_overload_position'
+        thermal_overload_position = APIHelper().read_one_line_file(
+            thermal_overload_position_path)
+
+        cmd = 'bash /usr/share/sonic/platform/thermal_overload_control.sh {}'.format(
+            thermal_overload_position)
+        APIHelper().run_command(cmd)
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_conditions.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_conditions.py
new file mode 100644
index 000000000000..1eee8ea91ab5
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_conditions.py
@@ -0,0 +1,77 @@
+from sonic_platform_base.sonic_thermal_control.thermal_condition_base import ThermalPolicyConditionBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+
+
+class FanCondition(ThermalPolicyConditionBase):
+    def get_fan_info(self, thermal_info_dict):
+        from .thermal_infos import FanInfo
+        if FanInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[FanInfo.INFO_NAME], FanInfo):
+            return thermal_info_dict[FanInfo.INFO_NAME]
+        else:
+            return None
+
+
+@thermal_json_object('fan.any.absence')
+class AnyFanAbsenceCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_absence_fans()) > 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.any.fault')
+class AnyFanFaultCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_fault_fans()) > 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.all.presence')
+class AllFanPresenceCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_absence_fans()) == 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.all.good')
+class AllFanGoodCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_fault_fans()) == 0 if fan_info_obj else False
+
+
+class ThermalCondition(ThermalPolicyConditionBase):
+    def get_thermal_info(self, thermal_info_dict):
+        from .thermal_infos import ThermalInfo
+        if ThermalInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[ThermalInfo.INFO_NAME], ThermalInfo):
+            return thermal_info_dict[ThermalInfo.INFO_NAME]
+        else:
+            return None
+
+
+@thermal_json_object('thermal.over.high_threshold')
+class ThermalOverHighCriticalCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return thermal_info_obj.is_over_high_threshold()
+        else:
+            return False
+
+
+@thermal_json_object('thermal.over.high_critical_threshold')
+class ThermalOverHighCriticalCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return thermal_info_obj.is_over_high_critical_threshold()
+        else:
+            return False
+
+@thermal_json_object('thermal.all.good')
+class ThermalGoodCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return not thermal_info_obj.is_over_threshold()
+        else:
+            return False
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_infos.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_infos.py
new file mode 100644
index 000000000000..a680b31b634f
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_infos.py
@@ -0,0 +1,165 @@
+from sonic_platform_base.sonic_thermal_control.thermal_info_base import ThermalPolicyInfoBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+from .helper import APIHelper
+import time
+
+
+@thermal_json_object('fan_info')
+class FanInfo(ThermalPolicyInfoBase):
+    """
+    Fan information needed by thermal policy
+    """
+
+    # Fan information name
+    INFO_NAME = 'fan_info'
+
+    def __init__(self):
+        self._absence_fans = set()
+        self._presence_fans = set()
+        self._fault_fans = set()
+        self._status_changed = False
+
+    def collect(self, chassis):
+        """
+        Collect absence and presence fans.
+        :param chassis: The chassis object
+        :return:
+        """
+        self._status_changed = False
+        for fan in chassis.get_all_fans():
+            presence = fan.get_presence()
+            status = fan.get_status()
+            if presence and fan not in self._presence_fans:
+                self._presence_fans.add(fan)
+                self._status_changed = True
+                if fan in self._absence_fans:
+                    self._absence_fans.remove(fan)
+            elif not presence and fan not in self._absence_fans:
+                self._absence_fans.add(fan)
+                self._status_changed = True
+                if fan in self._presence_fans:
+                    self._presence_fans.remove(fan)
+
+            if not status and fan not in self._fault_fans:
+                self._fault_fans.add(fan)
+                self._status_changed = True
+
+            elif status and fan in self._fault_fans:
+                self._fault_fans.remove(fan)
+                self._status_changed = True
+
+    def get_absence_fans(self):
+        """
+        Retrieves absence fans
+        :return: A set of absence fans
+        """
+        return self._absence_fans
+
+    def get_presence_fans(self):
+        """
+        Retrieves presence fans
+        :return: A set of presence fans
+        """
+        return self._presence_fans
+
+    def get_fault_fans(self):
+        """
+        Retrieves fault fans
+        :return: A set of fault fans
+        """
+        return self._fault_fans
+
+    def is_status_changed(self):
+        """
+        Retrieves if the status of fan information changed
+        :return: True if status changed else False
+        """
+        return self._status_changed
+
+
+@thermal_json_object('thermal_info')
+class ThermalInfo(ThermalPolicyInfoBase):
+    """
+    Thermal information needed by thermal policy
+    """
+
+    # Fan information name
+    INFO_NAME = 'thermal_info'
+
+    def collect(self, chassis):
+        """
+        Collect thermal sensor temperature change status
+        :param chassis: The chassis object
+        :return:
+        """
+        self._over_high_threshold = False
+        self._over_high_critical_threshold = False
+        self._thermal_overload_position = 'cpu'
+
+        # Calculate average temp within the device
+        temp = 0
+        num_of_thermals = chassis.get_num_thermals()
+        for index in range(num_of_thermals):
+            thermal = chassis.get_thermal(index)
+            temp = thermal.get_temperature()
+            high_threshold = thermal.get_high_threshold()
+            high_critical_threshold = thermal.get_high_critical_threshold()
+
+            if high_threshold and temp > high_threshold:
+                self._over_high_threshold = True
+
+            if high_critical_threshold and temp > high_critical_threshold:
+                self._thermal_overload_position = thermal.postion
+                self._over_high_critical_threshold = True
+
+    def is_over_threshold(self):
+        """
+        Retrieves if the temperature is over any threshold
+        :return: True if the temperature is over any threshold else False
+        """
+        return self._over_high_threshold or self._over_high_critical_threshold
+
+    def is_over_high_critical_threshold(self):
+        """
+        Retrieves if the temperature is over high critical threshold
+        :return: True if the temperature is over high critical threshold else False
+        """
+        thermal_overload_position_path = '/tmp/thermal_overload_position'
+        if self._over_high_critical_threshold:
+            APIHelper().write_txt_file(thermal_overload_position_path,
+                                       self._thermal_overload_position)
+            time.sleep(1)
+        return self._over_high_critical_threshold
+
+    def is_over_high_threshold(self):
+        """
+        Retrieves if the temperature is over high threshold
+        :return: True if the temperature is over high threshold else False
+        """
+        return self._over_high_threshold
+
+
+@thermal_json_object('chassis_info')
+class ChassisInfo(ThermalPolicyInfoBase):
+    """
+    Chassis information needed by thermal policy
+    """
+    INFO_NAME = 'chassis_info'
+
+    def __init__(self):
+        self._chassis = None
+
+    def collect(self, chassis):
+        """
+        Collect platform chassis.
+        :param chassis: The chassis object
+        :return:
+        """
+        self._chassis = chassis
+
+    def get_chassis(self):
+        """
+        Retrieves platform chassis object
+        :return: A platform chassis object.
+        """
+        return self._chassis
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_manager.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_manager.py
new file mode 100644
index 000000000000..9f057cf1f37f
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal_manager.py
@@ -0,0 +1,46 @@
+from sonic_platform_base.sonic_thermal_control.thermal_manager_base import ThermalManagerBase
+from .helper import APIHelper
+from .thermal_actions import *
+from .thermal_conditions import *
+from .thermal_infos import *
+
+class ThermalManager(ThermalManagerBase):
+    FSC_ALGORITHM_CMD = 'service fancontrol {}'
+
+    @classmethod
+    def start_thermal_control_algorithm(cls):
+        """
+        Start vendor specific thermal control algorithm. The default behavior of this function is a no-op.
+        :return:
+        """
+        return cls._enable_fancontrol_service(True)
+
+    @classmethod
+    def stop_thermal_control_algorithm(cls):
+        """
+        Stop thermal control algorithm
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        return cls._enable_fancontrol_service(False)
+
+    @classmethod
+    def deinitialize(cls):
+        """
+        Destroy thermal manager, including any vendor specific cleanup. The default behavior of this function
+        is a no-op.
+        :return:
+        """
+        return cls._enable_fancontrol_service(True)
+
+    @classmethod
+    def _enable_fancontrol_service(cls, enable):
+        """
+        Control thermal by fcs algorithm
+        Args:
+            enable: Bool, indicate enable the algorithm or not
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        cmd = 'start' if enable else 'stop'
+        return APIHelper().run_command(cls.FSC_ALGORITHM_CMD.format(cmd))
diff --git a/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json b/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..4dc38d035ab4
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
@@ -0,0 +1,16 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [
+        "asic",
+        "psu.temperature",
+        "PSU2 Fan",
+        "PSU1 Fan"
+    ],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "orange",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-cel/dx010/scripts/thermal_overload_control.sh b/device/celestica/x86_64-cel_seastone-r0/thermal_overload_control.sh
similarity index 100%
rename from platform/broadcom/sonic-platform-modules-cel/dx010/scripts/thermal_overload_control.sh
rename to device/celestica/x86_64-cel_seastone-r0/thermal_overload_control.sh
diff --git a/device/celestica/x86_64-cel_seastone-r0/thermal_policy.json b/device/celestica/x86_64-cel_seastone-r0/thermal_policy.json
new file mode 100644
index 000000000000..f937b6bd4456
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/thermal_policy.json
@@ -0,0 +1,93 @@
+{
+    "thermal_control_algorithm": {
+        "run_at_boot_up": "true"
+    },
+    "info_types": [
+        {
+            "type": "chassis_info"
+        },
+        {
+            "type": "fan_info"
+        },
+        {
+            "type": "thermal_info"
+        }
+    ],
+    "policies": [
+        {
+            "name": "any fan absence",
+            "conditions": [
+                {
+                    "type": "fan.any.absence"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "any fan broken",
+            "conditions": [
+                {
+                    "type": "fan.any.fault"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "any thermal over threshold",
+            "conditions": [
+                {
+                    "type": "thermal.over.high_threshold"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "temp over high critical threshold",
+            "conditions": [
+                {
+                    "type": "thermal.over.high_critical_threshold"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "switch.power_cycling"
+                }
+            ]
+        },
+        {
+            "name": "all fan presence / thermal no warning",
+            "conditions": [
+                {
+                    "type": "fan.all.presence"
+                },
+                {
+                    "type": "fan.all.good"
+                },
+                {
+                    "type": "thermal.all.good"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "true"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
index d7720cea90f4..a36e2cd1377c 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
@@ -3,7 +3,6 @@ dx010/cfg/dx010-modules.conf etc/modules-load.d
 dx010/systemd/platform-modules-dx010.service lib/systemd/system
 dx010/scripts/fancontrol.sh etc/init.d
 dx010/scripts/fancontrol.service lib/systemd/system
-dx010/scripts/thermal_overload_control.sh usr/local/bin
 services/fancontrol/fancontrol  usr/local/bin
 dx010/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
 services/platform_api/platform_api_mgnt.sh usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.postinst b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.postinst
index 8dbf0ece6676..b198584282db 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.postinst
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.postinst
@@ -6,4 +6,5 @@ systemctl start platform-modules-dx010.service
 systemctl start fancontrol.service
 
 /usr/local/bin/platform_api_mgnt.sh install
+/etc/init.d/fancontrol.sh install
 
diff --git a/platform/broadcom/sonic-platform-modules-cel/dx010/scripts/fancontrol.sh b/platform/broadcom/sonic-platform-modules-cel/dx010/scripts/fancontrol.sh
index 75ad6c65b37f..21274ed6e27d 100644
--- a/platform/broadcom/sonic-platform-modules-cel/dx010/scripts/fancontrol.sh
+++ b/platform/broadcom/sonic-platform-modules-cel/dx010/scripts/fancontrol.sh
@@ -7,75 +7,42 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:
 # Short-Description: fancontrol
-# Description:       fan speed regulator
+# Description:       fancontrol configuration selector
 ### END INIT INFO
 
 . /lib/lsb/init-functions
 
 [ -f /etc/default/rcS ] && . /etc/default/rcS
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-DAEMON=/usr/local/bin/fancontrol
-DESC="fan speed regulator"
-NAME="fancontrol"
-PIDFILE=/var/run/fancontrol.pid
 MAIN_CONF=/usr/share/sonic/device/x86_64-cel_seastone-r0/fancontrol
-DEVPATH=/sys/devices/pci0000:00/0000:00:13.0/i2c-*/i2c-13/13-002e
 GPIO_DIR=/sys/class/gpio
-BASE_GPIO=$(find $GPIO_DIR | grep gpiochip | grep -o '[[:digit:]]*')
-DIRGPIO_START=15
 
-test -x $DAEMON || exit 0
+init() {
+    DIRGPIO_START=15
+    BASE_GPIO=$(find $GPIO_DIR | grep gpiochip | grep -o '[[:digit:]]*')
+    FANDIR_GPIO_NUMBER=$((DIRGPIO_START + BASE_GPIO))
+    FANDIR_VALUE=$(cat ${GPIO_DIR}/gpio${FANDIR_GPIO_NUMBER}/value)
+    DIRGPIO_START=$((DIRGPIO_START + 1))
+    FANDIR=$([ $FANDIR_VALUE = 1 ] && echo "B2F" || echo "F2B")
+    CONF=${MAIN_CONF}-${FANDIR}
+    echo $FANDIR > /usr/share/sonic/device/x86_64-cel_seastone-r0/fan_airflow
+}
 
-for i in 1 2 3 4 5
-do
-	FANFAULT=$(cat ${DEVPATH}/fan${i}_fault)
-        [ $FANFAULT = 1 ] && continue
-	FANDIR_GPIO_NUMBER=$((DIRGPIO_START + BASE_GPIO))
-	FANDIR_VALUE=$(cat ${GPIO_DIR}/gpio${FANDIR_GPIO_NUMBER}/value)
-	DIRGPIO_START=$((DIRGPIO_START+1))
-	FANDIR=$([ $FANDIR_VALUE = 1 ] && echo "B2F" || echo "F2B")
-done
-CONF=${MAIN_CONF}-${FANDIR}
+install() {
+    find /var/lib/docker/overlay*/ -path */sbin/fancontrol -exec cp /usr/local/bin/fancontrol {} \;
+}
 
 case "$1" in
-  start)
-  	if [ -f $CONF ] ; then
-		if $DAEMON --check $CONF 1>/dev/null 2>/dev/null ; then
-			log_daemon_msg "Starting $DESC" "$NAME\n"
-			start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON $CONF
-			log_end_msg $?
-		else
-			log_failure_msg "Not starting fancontrol, broken configuration file; please re-run pwmconfig."
-		fi
-	else
-		if [ "$VERBOSE" != no ]; then
-			log_warning_msg "Not starting fancontrol; run pwmconfig first."
-		fi
-	fi
-	;;
-  stop)
-		log_daemon_msg "Stopping $DESC" "$NAME"
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --startas $DAEMON $CONF
-		rm -f $PIDFILE
-		log_end_msg $?
-	;;
-  restart)
-  	$0 stop
-		sleep 3
-		$0 start
-	;;
-  force-reload)
-	if start-stop-daemon --stop --test --quiet --pidfile $PIDFILE --startas $DAEMON $CONF ; then
-		$0 restart
-	fi
-	;;
-  status)
-		status_of_proc $DAEMON $NAME $CONF && exit 0 || exit $?
-	;;
-  *)
-	log_success_msg "Usage: /etc/init.d/fancontrol {start|stop|restart|force-reload|status}"
-	exit 1
-	;;
+start)
+    init
+    cp $CONF $MAIN_CONF
+    ;;
+install)
+    install
+    ;;
+*)
+    log_success_msg "Usage: /etc/init.d/fancontrol {start} | {install}"
+    exit 1
+    ;;
 esac
 
 exit 0
diff --git a/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol b/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
index cdd5005e3688..da32acedd2f9 100755
--- a/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
+++ b/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
@@ -180,42 +180,6 @@ function LoadConfig
 
 }
 
-function CheckFanFault()
-{
-    let fancount=0
-    while (( $fancount < ${#AFCFANFAULT[@]} )) # go through all fan fault.
-    do
-        fault=`cat ${AFCFANFAULT[$fancount]}`
-        if [[ "$fault" == "1" ]]
-        then
-            return 1 # fan fault detected
-        fi
-        let fancount=$fancount+1
-    done
-    return 0
-}
-
-function CheckTempOver()
-{
-    let tempcount=0
-    while (( $tempcount < ${#CSTEMP[@]} )) # go through all temp.
-    do
-        ctemp=`cat ${CSTEMP[$tempcount]}`
-        let maxcrit="${CSMAXTEMPCRIT[$tempcount]}*1000"
-        if [ $ctemp -ge $maxcrit ]
-        then
-            logger "Thermal overload : ${CSMAXTEMPTYPE[$tempcount]} temperature ${ctemp} > ${maxcrit}"
-            if [ -f "$THERMAL_OVERLOAD_CONTROL_FILE" ]
-            then
-                toc_cmd="${THERMAL_OVERLOAD_CONTROL_FILE} ${CSMAXTEMPTYPE[$tempcount],,}"
-                bash $toc_cmd
-                exit 1
-            fi
-        fi
-        let tempcount=$tempcount+1
-    done
-    return 0
-}
 
 function DevicePath()
 {
@@ -508,18 +472,6 @@ function UpdateFanSpeeds
         maxpwm=${AFCMAXPWM[$fcvcount]}
         let tHyst="${AFCTHYST[$fcvcount]}*1000"
 
-        #if some fan fault detected all pwm=100%
-        CheckFanFault
-        if [ $? -ne 0 ]
-        then
-            echo $MAX > $pwmo
-            let fcvcount=$fcvcount+1
-            continue
-        fi
-
-		#check thermal overload
-        CheckTempOver
-
         read tval < ${tsens}
         if [ $? -ne 0 ]
         then
@@ -619,7 +571,7 @@ function UpdateFanSpeeds
                 echo $minsa > $pwmo
                 # Sleep while still handling signals
                 sleep 1 &
-                wait $!
+                wait
             fi
         fi
         echo $pwmval > $pwmo # write new value to pwm output
@@ -658,5 +610,5 @@ do
     UpdateFanSpeeds
     # Sleep while still handling signals
     sleep $INTERVAL &
-    wait $!
+    wait
 done

From 824d7adc2dff3a4c3c9a2ba4842e01bdfcf4ebda Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Sat, 16 Jan 2021 03:38:31 +0800
Subject: [PATCH 0063/1674] [Mellanox] Make determine-reboot-cause service
 start after hw-management service (#6465)

**- Why I did it**

On the Mellanox platform, reboot cause is fetched from some certain sysfs which is created by the hw-management service. So determine-reboot-cause service shall start after hw-management, otherwise it could fail due to the related sysfs is not available yet.

**- How I did it**

Add a patch to the hw-management service to make sure determine-reboot-cause service should start after it.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 ...mine-reboot-cause-service-start-afte.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 platform/mellanox/hw-management/0001-Make-SONiC-determine-reboot-cause-service-start-afte.patch

diff --git a/platform/mellanox/hw-management/0001-Make-SONiC-determine-reboot-cause-service-start-afte.patch b/platform/mellanox/hw-management/0001-Make-SONiC-determine-reboot-cause-service-start-afte.patch
new file mode 100644
index 000000000000..11539e606369
--- /dev/null
+++ b/platform/mellanox/hw-management/0001-Make-SONiC-determine-reboot-cause-service-start-afte.patch
@@ -0,0 +1,26 @@
+From 1a1011b6da491d35001df5a7204d4eecb2769767 Mon Sep 17 00:00:00 2001
+From: keboliu <kebol@mellanox.com>
+Date: Fri, 15 Jan 2021 14:41:16 +0800
+Subject: [PATCH] Make SONiC determine-reboot-cause service start after hw-mgmt
+ service
+
+Signed-off-by: Kebo Liu <kebol@nvidia.com>
+---
+ debian/hw-management.hw-management.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/debian/hw-management.hw-management.service b/debian/hw-management.hw-management.service
+index 39a2a54..2104b87 100755
+--- a/debian/hw-management.hw-management.service
++++ b/debian/hw-management.hw-management.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Chassis HW management service of Mellanox systems
+ Documentation=man:hw-management.service(8)
++Before=determine-reboot-cause.service
+ 
+ [Service]
+ Type=oneshot
+-- 
+1.9.1
+

From 0d93b233d239d1f64b51bdc572e005182d88aa10 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Sun, 17 Jan 2021 01:04:19 -0500
Subject: [PATCH 0064/1674] [build arm] fix sonic-slave-buster build break
 (#6469)

When building the sonic-slave-buster docker container, the node.js package is
installed to meet the requirements of the Azure DevOPs pipleline
build. Recently this install of node.js has been failing.

This commit fixes that build break by upgrading the
sonic-slave-buster build to install version 14.x of node.js which is the
current LTS version for buster.
---
 sonic-slave-buster/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index b372e3e28636..641a1f3f2433 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -483,7 +483,8 @@ RUN pip3 install git+https://github.com/aristanetworks/swi-tools.git@bead66bf261
 
 {% if CONFIGURED_ARCH != "amd64" -%}
 # Install node.js for azure pipeline
-RUN apt-get install -y node.js
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN apt-get install -y nodejs
 
 # Tell azure pipeline to use node.js in the docker
 LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/bin/node"

From c7058a6d157c4a1423fb767110180d9dc144a3a8 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Sun, 17 Jan 2021 00:23:11 -0800
Subject: [PATCH 0065/1674] [minigraph.py]: Don't create mux table entries for
 servers w/o loopbacks (#6457)

Avoid sonic-cfggen crashing when a server does not have a configured loopback address in the minigraph

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/minigraph.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 8b9794f2bfb8..f30e668251a3 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1506,14 +1506,17 @@ def get_mux_cable_entries(mux_cable_ports, neighbors, devices):
             neighbor = neighbors[intf]['name']
             entry['state'] = 'auto'
 
-            # Always force a /32 prefix for server IPv4 loopbacks
-            server_ipv4_lo_addr = devices[neighbor]['lo_addr'].split("/")[0]
-            server_ipv4_lo_prefix = ipaddress.ip_network(UNICODE_TYPE(server_ipv4_lo_addr))
-            entry['server_ipv4'] = str(server_ipv4_lo_prefix)
-
-            if 'lo_addr_v6' in devices[neighbor]:
-                entry['server_ipv6'] = devices[neighbor]['lo_addr_v6']
-            mux_cable_table[intf] = entry 
+            if devices[neighbor]['lo_addr'] is not None:
+                # Always force a /32 prefix for server IPv4 loopbacks
+                server_ipv4_lo_addr = devices[neighbor]['lo_addr'].split("/")[0]
+                server_ipv4_lo_prefix = ipaddress.ip_network(UNICODE_TYPE(server_ipv4_lo_addr))
+                entry['server_ipv4'] = str(server_ipv4_lo_prefix)
+
+                if 'lo_addr_v6' in devices[neighbor]:
+                    entry['server_ipv6'] = devices[neighbor]['lo_addr_v6']
+                mux_cable_table[intf] = entry 
+            else:
+                print("Warning: no server IPv4 loopback found for {}, skipping mux cable table entry".format(neighbor))
 
     return mux_cable_table
 

From 17148d70fcdc99228fa31c78ab7a23ea3efd13c6 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 17 Jan 2021 11:05:33 -0800
Subject: [PATCH 0066/1674] [kvm]: add debug cmd for build_kvm_image.sh (#6472)

dump netstat info on error

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 scripts/build_kvm_image.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/build_kvm_image.sh b/scripts/build_kvm_image.sh
index e0a7ec2feff4..4531ca25a5f7 100755
--- a/scripts/build_kvm_image.sh
+++ b/scripts/build_kvm_image.sh
@@ -22,6 +22,7 @@ on_exit()
 
 on_error()
 {
+    netstat -antp
     echo "============= kvm_log =============="
     cat $kvm_log
 }
@@ -51,12 +52,12 @@ create_disk
 prepare_installer_disk
 
 echo "Prepare memory for KVM build: $vs_build_prepare_mem"
-sudo mount proc /proc -t proc || true
+mount proc /proc -t proc || true
 free -m
 if [[ "$vs_build_prepare_mem" == "yes" ]]; then
     # Force o.s. to drop cache and compact memory so that KVM can get 2G memory
-    sudo bash -c 'echo 1 > /proc/sys/vm/drop_caches'
-    sudo bash -c 'echo 1 > /proc/sys/vm/compact_memory'
+    bash -c 'echo 1 > /proc/sys/vm/drop_caches'
+    bash -c 'echo 1 > /proc/sys/vm/compact_memory'
     free -m
 fi
 

From 9acbc591e1aa51c0bedbcfe5b46e17b71c5b921e Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Mon, 18 Jan 2021 13:10:27 -0800
Subject: [PATCH 0067/1674] [mellanox]: fix mellanox hw-management build
 (#6471)

use dpkg-buildpackage build with fakeroot

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/mellanox/hw-management/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/hw-management/Makefile b/platform/mellanox/hw-management/Makefile
index 608c94e6b02a..eb087b47bfff 100644
--- a/platform/mellanox/hw-management/Makefile
+++ b/platform/mellanox/hw-management/Makefile
@@ -8,7 +8,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd hw-mgmt
 	git am ../*.patch
 	chmod +x ./debian/rules
-	sudo ./debian/rules binary KVERSION=$(KVERSION)
+	KVERSION=$(KVERSION) dpkg-buildpackage -us -uc -b -rfakeroot -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
 	mv $* $(DEST)/

From 5079de764749eaadbc564c742ef432e045728ef1 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Tue, 19 Jan 2021 00:23:36 -0800
Subject: [PATCH 0068/1674] [bgpd]: Check zebra is ready to connect when
 starting bgpd (#6478)

Fix #5026

There is a race condition between zebra server accepts connections and bgpd tries to connect. Bgpd has a chance to try to connect before zebra is ready. In this scenario, bgpd will try again after 10 seconds and operate as normal within these 10 seconds. As a consequence, whatever bgpd tries to sent to zebra will be missing in the 10 seconds. To avoid such a scenario, bgpd should start after zebra is ready to accept connections.
---
 dockers/docker-fpm-frr/Dockerfile.j2          |  1 +
 dockers/docker-fpm-frr/bgpd.sh                | 33 +++++++++++++++++++
 .../frr/supervisord/supervisord.conf.j2       |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 dockers/docker-fpm-frr/bgpd.sh

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index ab8b585899f9..69e3655d0c39 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -55,6 +55,7 @@ COPY ["TSB", "/usr/bin/TSB"]
 COPY ["TSC", "/usr/bin/TSC"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
+COPY ["bgpd.sh", "/usr/bin/"]
 RUN chmod a+x /usr/bin/TSA && \
     chmod a+x /usr/bin/TSB && \
     chmod a+x /usr/bin/TSC
diff --git a/dockers/docker-fpm-frr/bgpd.sh b/dockers/docker-fpm-frr/bgpd.sh
new file mode 100755
index 000000000000..c61a594a1efc
--- /dev/null
+++ b/dockers/docker-fpm-frr/bgpd.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+addr="127.0.0.1"
+port=2601
+
+function help()
+{
+    echo "This script aims to ensure zebra is ready to accept connections before starting bgpd"
+    echo "Usage: $0 [options] [bgpd options]"
+    echo "Options:"
+    echo " -a   Zebra address"
+    echo " -o   Zebra port"
+    exit 1
+}
+
+while getopts ":a:o:h" opt; do
+    case "${opt}" in
+        h) help
+            ;;
+        a) addr=${OPTARG}
+            ;;
+        o) port=${OPTARG}
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+timeout 5s bash -c -- "until </dev/tcp/${addr}/${port}; do sleep 0.1;done"
+if [ "$?" != "0" ]; then
+    logger -p error "Error: zebra is not ready to accept connections"
+fi
+
+exec /usr/lib/frr/bgpd "$@"
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index 205b57e5f616..e71d6fa71323 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -51,7 +51,7 @@ dependent_startup=true
 dependent_startup_wait_for=zebra:running
 
 [program:bgpd]
-command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
+command=/usr/bin/bgpd.sh -A 127.0.0.1 -M snmp
 priority=5
 stopsignal=KILL
 autostart=false

From 85bf62ad0d25443fc0627f1072c1bb2725555f18 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 19 Jan 2021 15:57:42 -0800
Subject: [PATCH 0069/1674] [submodule] Update sonic-sairedis submodule pointer
 (#6496)

[ci]: download artifacts from master branch (#768)
Do not create fabric port if mapping is not available (#769)
[syncd] Comparison logic log also current attr value on set operation (#763)
Add fabric port test to vslib (#737)
[ci]: use sonicbld pool (#766)
[tests] Remove exit command blocking all tests to run (#765)
[vslib]: adapt macsec sai 1.7.1 (#755)
Add support for SAI_SWITCH_ATTR_AVAILABLE_IPMC_ENTRY needed by CRM (#756)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index e9401364da28..02d0371d2e0f 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit e9401364da28259f065b2106fa8590423490f3ea
+Subproject commit 02d0371d2e0fc6f87d7859346d86c638df82c464

From deea12403a29046cf43c57b56518b47837db55e9 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 20 Jan 2021 19:10:35 +0200
Subject: [PATCH 0070/1674] [submodule]: update sonic-utilities (#6485)

- [route_check.py] - update includes checks on subscriptions (https://github.com/Azure/sonic-utilities/pull/1344)
- Validations checks while adding a member to PortChannel and removing a member from a Portchannel (https://github.com/Azure/sonic-utilities/pull/1328)
- [show] Add subcommand to show midplane status for modular chassis (https://github.com/Azure/sonic-utilities/pull/1267)
- [pytest][qos][config] Added pytests for "config qos reload" commands" (https://github.com/Azure/sonic-utilities/pull/1346)
- Drop explict 3 seconds pause between two object updates/deletes. (https://github.com/Azure/sonic-utilities/pull/1359)
- [show]fix for show muxcable status by replacing "hostname" to "peer_switch" for deriving tor ipv4_address (https://github.com/Azure/sonic-utilities/pull/1360)
- [PFCWD] Fix 'start' pfcwd command (https://github.com/Azure/sonic-utilities/pull/1345)

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 0a4365aaa0ad..2cbeccbc520b 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 0a4365aaa0adadcb4c3fa448e05f6d2e217bda5f
+Subproject commit 2cbeccbc520b2e767ba8dab9a30657ebc3806002

From 15c54235221c334146cd1b2069e366aeaface4d9 Mon Sep 17 00:00:00 2001
From: KISHORE KUNAL <64033340+kishorekunal01@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:00:29 -0800
Subject: [PATCH 0071/1674] [frr]: ADD L3 VNI EVPN Support for SONiC, Send RMAC
 and VLAN along with prefix to fpmsyncd. (#4806)

Currently FRR is send Prefix with VNI information to FPMSYNCD. This PR allows FRR to send RMAC with EVPN Type5 prefix to fpmsyncd. This is a temp fix. This patch will be removed once neighorch is ready to handle the Prefix and ARP (containing RMAC) separately.
---
 .../0008-Add-support-of-bgp-l3vni-evpn.patch  | 162 ++++++++++++++++++
 src/sonic-frr/patch/series                    |   2 +-
 2 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-frr/patch/0008-Add-support-of-bgp-l3vni-evpn.patch

diff --git a/src/sonic-frr/patch/0008-Add-support-of-bgp-l3vni-evpn.patch b/src/sonic-frr/patch/0008-Add-support-of-bgp-l3vni-evpn.patch
new file mode 100644
index 000000000000..8a32e77a825e
--- /dev/null
+++ b/src/sonic-frr/patch/0008-Add-support-of-bgp-l3vni-evpn.patch
@@ -0,0 +1,162 @@
+From 2e9ed539d29f13d874c6a5ab3120bf4bb26ab2bb Mon Sep 17 00:00:00 2001
+From: Kishore Kunal <kishore.kunal@broadcom.com>
+Date: Fri, 15 Jan 2021 15:52:13 -0800
+Subject: [PATCH] This is temp patch till Prefix to ARP indirection is add in neighorch
+
+---
+ lib/nexthop.c             |  1 +
+ lib/nexthop.h             |  7 ++++++-
+ zebra/rt_netlink.c        |  2 +-
+ zebra/zapi_msg.c          |  2 ++
+ zebra/zebra_dplane.c      |  2 +-
+ zebra/zebra_fpm_netlink.c | 19 +++++++++++++++++++
+ 6 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/lib/nexthop.c b/lib/nexthop.c
+index 0ea72d03e..02e826048 100644
+--- a/lib/nexthop.c
++++ b/lib/nexthop.c
+@@ -657,6 +657,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy,
+ 		nexthop_add_labels(copy, nexthop->nh_label_type,
+ 				   nexthop->nh_label->num_labels,
+ 				   &nexthop->nh_label->label[0]);
++	memcpy(&copy->nh_encap.encap_data.rmac, &nexthop->nh_encap.encap_data.rmac, ETH_ALEN);
+ }
+ 
+ void nexthop_copy(struct nexthop *copy, const struct nexthop *nexthop,
+diff --git a/lib/nexthop.h b/lib/nexthop.h
+index cadcea1f4..fd959eb9e 100644
+--- a/lib/nexthop.h
++++ b/lib/nexthop.h
+@@ -71,6 +71,11 @@ enum nh_encap_type {
+ /* Backup index value is limited */
+ #define NEXTHOP_BACKUP_IDX_MAX 255
+ 
++struct vxlan_nh_encap {
++	vni_t vni;
++	struct ethaddr rmac;
++};
++
+ /* Nexthop structure. */
+ struct nexthop {
+ 	struct nexthop *next;
+@@ -140,7 +145,7 @@ struct nexthop {
+ 	/* Encapsulation information. */
+ 	enum nh_encap_type nh_encap_type;
+ 	union {
+-		vni_t vni;
++		struct vxlan_nh_encap encap_data;
+ 	} nh_encap;
+ 
+ 	/* SR-TE color used for matching SR-TE policies */
+diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
+index 50b1a62d8..d8249f8e0 100644
+--- a/zebra/rt_netlink.c
++++ b/zebra/rt_netlink.c
+@@ -1590,7 +1590,7 @@ static int netlink_route_nexthop_encap(struct nlmsghdr *n, size_t nlen,
+ 			return false;
+ 
+ 		if (!nl_attr_put32(n, nlen, 0 /* VXLAN_VNI */,
+-				   nh->nh_encap.vni))
++				   nh->nh_encap.encap_data.vni))
+ 			return false;
+ 		nl_attr_nest_end(n, nest);
+ 		break;
+diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
+index e436e5a28..c10d50797 100644
+--- a/zebra/zapi_msg.c
++++ b/zebra/zapi_msg.c
+@@ -1477,6 +1477,7 @@ static struct nexthop *nexthop_from_zapi(struct route_entry *re,
+ 			zebra_vxlan_evpn_vrf_route_add(
+ 				api_nh->vrf_id, &api_nh->rmac,
+ 				&vtep_ip, &api->prefix);
++			memcpy(&(nexthop->nh_encap.encap_data.rmac), &api_nh->rmac, ETH_ALEN);
+ 		}
+ 		break;
+ 	case NEXTHOP_TYPE_IPV6:
+@@ -1511,6 +1512,7 @@ static struct nexthop *nexthop_from_zapi(struct route_entry *re,
+ 			zebra_vxlan_evpn_vrf_route_add(
+ 				api_nh->vrf_id, &api_nh->rmac,
+ 				&vtep_ip, &api->prefix);
++			memcpy(&(nexthop->nh_encap.encap_data.rmac), &api_nh->rmac, ETH_ALEN);
+ 		}
+ 		break;
+ 	case NEXTHOP_TYPE_BLACKHOLE:
+diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
+index abd0adb64..e66d7aae5 100644
+--- a/zebra/zebra_dplane.c
++++ b/zebra/zebra_dplane.c
+@@ -1891,7 +1891,7 @@ int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op,
+ 		zl3vni = zl3vni_from_vrf(nexthop->vrf_id);
+ 		if (zl3vni && is_l3vni_oper_up(zl3vni)) {
+ 			nexthop->nh_encap_type = NET_VXLAN;
+-			nexthop->nh_encap.vni = zl3vni->vni;
++			nexthop->nh_encap.encap_data.vni = zl3vni->vni;
+ 		}
+ 	}
+ 
+diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
+index 2c0741363..2731f64fb 100644
+--- a/zebra/zebra_fpm_netlink.c
++++ b/zebra/zebra_fpm_netlink.c
+@@ -129,10 +129,12 @@ static const char *fpm_nh_encap_type_to_str(enum fpm_nh_encap_type_t encap_type)
+ 
+ struct vxlan_encap_info_t {
+ 	vni_t vni;
++	struct ethaddr rmac;
+ };
+ 
+ enum vxlan_encap_info_type_t {
+ 	VXLAN_VNI = 0,
++	VXLAN_RMAC = 1,
+ };
+ 
+ struct fpm_nh_encap_info_t {
+@@ -238,6 +240,8 @@ static int netlink_route_info_add_nh(struct netlink_route_info *ri,
+ 
+ 			/* Add VNI to VxLAN encap info */
+ 			nhi.encap_info.vxlan_encap.vni = zl3vni->vni;
++			memcpy(&nhi.encap_info.vxlan_encap.rmac, &(nexthop->nh_encap.encap_data.rmac),
++					ETH_ALEN);
+ 		}
+ 	}
+ 
+@@ -454,9 +458,16 @@ static int netlink_route_info_encode(struct netlink_route_info *ri,
+ 			nl_attr_put16(&req->n, in_buf_len, RTA_ENCAP_TYPE,
+ 				      encap);
+ 			vxlan = &nhi->encap_info.vxlan_encap;
++			char buf[ETHER_ADDR_STRLEN];
++
++			zfpm_debug(
++				"%s: VNI:%d RMAC:%s", __func__, vxlan->vni,
++				prefix_mac2str(&vxlan->rmac, buf, sizeof(buf)));
+ 			nest = nl_attr_nest(&req->n, in_buf_len, RTA_ENCAP);
+ 			nl_attr_put32(&req->n, in_buf_len, VXLAN_VNI,
+ 				      vxlan->vni);
++			nl_attr_put(&req->n, in_buf_len, VXLAN_RMAC,
++				    &vxlan->rmac, sizeof(vxlan->rmac));
+ 			nl_attr_nest_end(&req->n, nest);
+ 			break;
+ 		}
+@@ -490,10 +501,18 @@ static int netlink_route_info_encode(struct netlink_route_info *ri,
+ 			nl_attr_put16(&req->n, in_buf_len, RTA_ENCAP_TYPE,
+ 				      encap);
+ 			vxlan = &nhi->encap_info.vxlan_encap;
++			char rmac_buf[ETHER_ADDR_STRLEN];
++
++			zfpm_debug("%s: Multi VNI:%d RMAC:%s", __func__,
++				   vxlan->vni,
++				   prefix_mac2str(&vxlan->rmac, rmac_buf,
++						  sizeof(rmac_buf)));
+ 			inner_nest =
+ 				nl_attr_nest(&req->n, in_buf_len, RTA_ENCAP);
+ 			nl_attr_put32(&req->n, in_buf_len, VXLAN_VNI,
+ 				      vxlan->vni);
++			nl_attr_put(&req->n, in_buf_len, VXLAN_RMAC,
++				    &vxlan->rmac, sizeof(vxlan->rmac));
+ 			nl_attr_nest_end(&req->n, inner_nest);
+ 			break;
+ 		}
+-- 
+2.18.0
+
diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series
index d7c209e9b478..69dd5991a7cb 100644
--- a/src/sonic-frr/patch/series
+++ b/src/sonic-frr/patch/series
@@ -4,4 +4,4 @@
 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
 0005-nexthops-compare-vrf-only-if-ip-type.patch
 0007-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch
-
+0008-Add-support-of-bgp-l3vni-evpn.patch

From 039f5c253c917a98a40308b379f9bc336bee1cfc Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Thu, 21 Jan 2021 00:25:08 -0800
Subject: [PATCH 0072/1674] [submodule]: Update SONiC Utilities Submodule
 (#6507)

Changes in this update:
37695c8 [show]: Use TCP Connection For Muxcable Commands (#1371)
8119ba2 Validations checks while creating and deleting a Portchannel (#1326)
3df267e [config] Fix Breakout mode option and BREAKOUT_CFG table check method (#1270)
9bd709b [show] Fix show arp in case with FDB entries, linked to default VLAN (#1357)
bc2d27e [generate_dump]: fix syntax error

signed-of-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 2cbeccbc520b..37695c83cf86 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 2cbeccbc520b2e767ba8dab9a30657ebc3806002
+Subproject commit 37695c83cf86b7a163fcf2ffef949b116fe9d2b9

From c5b7370a8fabfcb62d79a37ecd87c192108f0726 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 21 Jan 2021 08:28:32 -0800
Subject: [PATCH 0073/1674] [baseimage]: Cleanup sudoers file (#6518)

---
 files/image_config/sudoers/sudoers | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 9e59c8854305..4c2e684b4b1f 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -23,9 +23,8 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /sbin/brctl show, \
                                  /usr/bin/docker exec snmp cat /etc/snmp/snmpd.conf, \
                                  /usr/bin/docker exec bgp cat /etc/quagga/bgpd.conf, \
-                                 /usr/bin/docker exec * ps aux, \
                                  /usr/bin/docker images *, \
-                                 /usr/bin/docker ps*, \
+                                 /usr/bin/docker ps *, \
                                  /usr/bin/lldpctl, \
                                  /usr/bin/sensors, \
                                  /usr/bin/tail -F /var/log/syslog, \

From 77ec2ee14e2fbc808bf75db8a913609872d614db Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 21 Jan 2021 11:14:15 -0800
Subject: [PATCH 0074/1674] [sonic-swss] Update submodule (#6336)

Including below commits:

36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (#1595) [madhanmellanox]
c21c883 2021-01-12 | [ci]: download artifacts from master branch build (#1597) [lguohan]
a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (#1565) [anish-n]
1b65f3d 2021-01-12 | [ci]: use sonicbld pool (#1594) [lguohan]
48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (#1586) [Volodymyr Samotiy]
850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(#1585) [KISHORE KUNAL]
64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (#1590) [lguohan]
17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (#1592) [Prince Sunny]
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (#1460) [anilkpan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 321291aa7aca..36f7332ddab5 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 321291aa7aca89a3ccef2bed36aff074eac1054f
+Subproject commit 36f7332ddab56c618513c4b57edc99e3b735c27c

From 28b62bee3fd0cd9a56a525c0e38da4ec05014799 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 20 Jan 2021 12:06:08 -0800
Subject: [PATCH 0075/1674] sonic-config-engine uses libswsscommon instead of
 swsssdk (#6406)

**- Why I did it**
swsssdk will be deprecated. Migrate sonic-config-engine to use libswsscommon library instead

**- How to verify it**
Unit test
---
 platform/vs/docker-sonic-vs/start.sh  | 8 +++++---
 rules/sonic-config.mk                 | 6 ++++--
 src/sonic-config-engine/portconfig.py | 2 +-
 src/sonic-config-engine/redis_bcc.py  | 4 ++--
 src/sonic-config-engine/sonic-cfggen  | 2 +-
 src/sonic-swss-common                 | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 7b246a49de1a..7ee70efa0815 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -31,6 +31,11 @@ if [[ -f /usr/share/sonic/virtual_chassis/default_config.json ]]; then
     CHASS_CFG="-j /usr/share/sonic/virtual_chassis/default_config.json"
 fi
 
+# Note: libswsscommon requires a dabase_config file in /var/run/redis/sonic-db/
+# Prepare this file before any dependent application, such as sonic-cfggen
+mkdir -p /var/run/redis/sonic-db
+cp /etc/default/sonic-db/database_config.json /var/run/redis/sonic-db/
+
 SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
 sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'", "buffer_model": "traditional"}}}' $CHASS_CFG --print-data > /etc/sonic/init_cfg.json
 
@@ -68,9 +73,6 @@ else
    echo "10.8.1.200 redis_chassis.server" >> /etc/hosts
 fi
 
-mkdir -p /var/run/redis/sonic-db
-cp /etc/default/sonic-db/database_config.json /var/run/redis/sonic-db/
-
 supervisorctl start redis-server
 
 start_chassis_db=`sonic-cfggen -v DEVICE_METADATA.localhost.start_chassis_db -y $chassisdb_cfg_file`
diff --git a/rules/sonic-config.mk b/rules/sonic-config.mk
index 996e311b5fee..e8e59fc1b92d 100644
--- a/rules/sonic-config.mk
+++ b/rules/sonic-config.mk
@@ -2,7 +2,8 @@
 
 SONIC_CONFIG_ENGINE_PY2 = sonic_config_engine-1.0-py2-none-any.whl
 $(SONIC_CONFIG_ENGINE_PY2)_SRC_PATH = $(SRC_PATH)/sonic-config-engine
-$(SONIC_CONFIG_ENGINE_PY2)_DEPENDS += $(SWSSSDK_PY2) $(SONIC_PY_COMMON_PY2)
+$(SONIC_CONFIG_ENGINE_PY2)_DEPENDS += $(SONIC_PY_COMMON_PY2)
+$(SONIC_CONFIG_ENGINE_PY2)_DEBS_DEPENDS += $(PYTHON_SWSSCOMMON)
 $(SONIC_CONFIG_ENGINE_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)
 
@@ -10,7 +11,8 @@ SONIC_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)
 
 SONIC_CONFIG_ENGINE_PY3 = sonic_config_engine-1.0-py3-none-any.whl
 $(SONIC_CONFIG_ENGINE_PY3)_SRC_PATH = $(SRC_PATH)/sonic-config-engine
-$(SONIC_CONFIG_ENGINE_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_PY_COMMON_PY3)
+$(SONIC_CONFIG_ENGINE_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3)
+$(SONIC_CONFIG_ENGINE_PY3)_DEBS_DEPENDS += $(PYTHON3_SWSSCOMMON)
 # Synthetic dependency to avoid building the Python 2 and 3 packages
 # simultaneously and any potential conflicts which may arise
 $(SONIC_CONFIG_ENGINE_PY3)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY2)
diff --git a/src/sonic-config-engine/portconfig.py b/src/sonic-config-engine/portconfig.py
index d20212eb55aa..8a3177f31b9a 100644
--- a/src/sonic-config-engine/portconfig.py
+++ b/src/sonic-config-engine/portconfig.py
@@ -5,7 +5,7 @@
     import re
     import sys
 
-    from swsssdk import ConfigDBConnector
+    from swsscommon.swsscommon import ConfigDBConnector
     from sonic_py_common import device_info
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
diff --git a/src/sonic-config-engine/redis_bcc.py b/src/sonic-config-engine/redis_bcc.py
index 1045e0c5c8b8..c9d3ebca239f 100644
--- a/src/sonic-config-engine/redis_bcc.py
+++ b/src/sonic-config-engine/redis_bcc.py
@@ -19,11 +19,11 @@ def load_bytecode(self, bucket):
             return
         code = self._client.get(self._client.LOGLEVEL_DB, self.REDIS_HASH, bucket.key)
         if code is not None:
-            bucket.bytecode_from_string(b64decode(code))
+            bucket.bytecode_from_string(b64decode(code.encode()))
 
     def dump_bytecode(self, bucket):
         if self._client is None:
             return
         self._client.set(self._client.LOGLEVEL_DB, self.REDIS_HASH,
-                         bucket.key, b64encode(bucket.bytecode_to_string()))
+                         bucket.key, b64encode(bucket.bytecode_to_string()).decode())
 
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index af638c2c2826..0f9ffafad635 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -43,7 +43,7 @@ from portconfig import get_port_config, get_breakout_mode
 from redis_bcc import RedisBytecodeCache
 from sonic_py_common.multi_asic import get_asic_id_from_name, is_multi_asic
 from sonic_py_common import device_info
-from swsssdk import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
 
 
 PY3x = sys.version_info >= (3, 0)
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 2db7bea9963a..2f79bb49d138 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 2db7bea9963a988a575b8075e1f6c5369d057230
+Subproject commit 2f79bb49d13820f2c108e4e27a2a12181713662f

From 4220f1c2dd964b81fa34a2eff3dba5d0f3cc2fb3 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Thu, 21 Jan 2021 12:11:04 -0800
Subject: [PATCH 0076/1674] [sonic-swss-common]: Update Submodule (#6508)

Update in this change:
640a218 [packaging]: Add Support For Libboost v1.71.0 (#449)

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 2f79bb49d138..640a218759b5 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 2f79bb49d13820f2c108e4e27a2a12181713662f
+Subproject commit 640a218759b5b490d505cadaca652f4821bba878

From 1923920b3353f1dd091df3159e68afb05e7f2d3c Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Thu, 21 Jan 2021 15:05:35 -0800
Subject: [PATCH 0077/1674] [minigraph.py]: Force /128 prefix for server IPv6
 loopbacks (#6524)

Meet the requirement for the MUX_CABLE table that IPv6 loopbacks have a /128 prefix

Note that this change only affects the MUX_CABLE table, all other tables continue to use the loopback address provided in minigraph.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/minigraph.py                       | 6 ++++--
 src/sonic-config-engine/tests/simple-sample-graph-case.xml | 2 +-
 src/sonic-config-engine/tests/test_minigraph_case.py       | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index f30e668251a3..ba81e8faf771 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1512,8 +1512,10 @@ def get_mux_cable_entries(mux_cable_ports, neighbors, devices):
                 server_ipv4_lo_prefix = ipaddress.ip_network(UNICODE_TYPE(server_ipv4_lo_addr))
                 entry['server_ipv4'] = str(server_ipv4_lo_prefix)
 
-                if 'lo_addr_v6' in devices[neighbor]:
-                    entry['server_ipv6'] = devices[neighbor]['lo_addr_v6']
+                if 'lo_addr_v6' in devices[neighbor] and devices[neighbor]['lo_addr_v6'] is not None:
+                    server_ipv6_lo_addr = devices[neighbor]['lo_addr_v6'].split('/')[0]
+                    server_ipv6_lo_prefix = ipaddress.ip_network(UNICODE_TYPE(server_ipv6_lo_addr))
+                    entry['server_ipv6'] = str(server_ipv6_lo_prefix)
                 mux_cable_table[intf] = entry 
             else:
                 print("Warning: no server IPv4 loopback found for {}, skipping mux cable table entry".format(neighbor))
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index d9a21158c4a2..ce0174adc8dd 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -303,7 +303,7 @@
           <d5p1:IPPrefix>10.10.10.1/32</d5p1:IPPrefix>
         </Address>
         <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
-          <d5p1:IPPrefix>fe80::0001/128</d5p1:IPPrefix>
+          <d5p1:IPPrefix>fe80::0001/80</d5p1:IPPrefix>
         </AddressV6>
         <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
           <d5p1:IPPrefix>10.0.0.1/32</d5p1:IPPrefix>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index cf8a7557aeb7..6fa7c5352d05 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -165,7 +165,7 @@ def test_minigraph_neighbor_metadata(self):
             'server1': {
                 'hwsku': 'server-sku',
                 'lo_addr': '10.10.10.1/32',
-                'lo_addr_v6': 'fe80::0001/128',
+                'lo_addr_v6': 'fe80::0001/80',
                 'mgmt_addr': '10.0.0.1/32',
                 'type': 'Server'
             },
@@ -275,12 +275,12 @@ def test_minigraph_mux_cable_table(self):
             'Ethernet4': {
                 'state': 'auto',
                 'server_ipv4': '10.10.10.1/32',
-                'server_ipv6': 'fe80::0001/128'
+                'server_ipv6': 'fe80::1/128'
             },
             'Ethernet8': {
                 'state': 'auto',
                 'server_ipv4': '10.10.10.2/32',
-                'server_ipv6': 'fe80::0002/128'
+                'server_ipv6': 'fe80::2/128'
             }
         }
 

From dbe71dfdeb9495f050f379c9bebbd158404d7f17 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Fri, 22 Jan 2021 08:29:27 -0800
Subject: [PATCH 0078/1674] Updated BBR to use peer group name as prefix.
 (#6515)

To make BBR configured for peer-group if it's name starts with (prefixed) with the string define in constants.yml instead of exact string match.
---
 src/sonic-bgpcfgd/bgpcfgd/managers_bbr.py |  7 ++--
 src/sonic-bgpcfgd/tests/test_bbr.py       | 40 +++++++++++++++++++++--
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_bbr.py b/src/sonic-bgpcfgd/bgpcfgd/managers_bbr.py
index 27f3646ac421..0e82d0a4b6d5 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_bbr.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_bbr.py
@@ -113,9 +113,10 @@ def __set_prepare_config(self, status):
         for af in ["ipv4", "ipv6"]:
             cmds.append(" address-family %s" % af)
             for pg_name in sorted(self.bbr_enabled_pgs.keys()):
-                if pg_name in available_peer_groups and af in self.bbr_enabled_pgs[pg_name]:
-                    cmds.append("  %sneighbor %s allowas-in 1" % (prefix_of_commands, pg_name))
-                    peer_groups_to_restart.add(pg_name)
+                for peer_group_name in available_peer_groups:
+                    if peer_group_name.startswith(pg_name) and af in self.bbr_enabled_pgs[pg_name]:
+                        cmds.append("  %sneighbor %s allowas-in 1" % (prefix_of_commands, peer_group_name))
+                        peer_groups_to_restart.add(peer_group_name)
         return cmds, list(peer_groups_to_restart)
 
     def __get_available_peer_groups(self):
diff --git a/src/sonic-bgpcfgd/tests/test_bbr.py b/src/sonic-bgpcfgd/tests/test_bbr.py
index 45b8aa7c8f07..b11277bae7b8 100644
--- a/src/sonic-bgpcfgd/tests/test_bbr.py
+++ b/src/sonic-bgpcfgd/tests/test_bbr.py
@@ -252,7 +252,7 @@ def test___set_validation_4():
 def test___set_validation_5():
     __set_validation_common("all", {"status": "disabled"}, None, True)
 
-def __set_prepare_config_common(status, bbr_enabled_pgs, available_pgs, expected_cmds):
+def __set_prepare_config_common(status, bbr_enabled_pgs, available_pgs, expected_cmds, bbr_applied_pgs=None):
     cfg_mgr = MagicMock()
     common_objs = {
         'directory': Directory(),
@@ -269,10 +269,10 @@ def __set_prepare_config_common(status, bbr_enabled_pgs, available_pgs, expected
         }
     }
     m.bbr_enabled_pgs = bbr_enabled_pgs
-    m._BBRMgr__get_available_peer_groups = MagicMock(return_value = available_pgs)
+    m._BBRMgr__get_available_peer_groups = MagicMock(return_value = sorted(available_pgs))
     cmds, peer_groups = m._BBRMgr__set_prepare_config(status)
     assert cmds == expected_cmds
-    assert set(peer_groups) == available_pgs
+    assert set(peer_groups) == (available_pgs if not bbr_applied_pgs else bbr_applied_pgs)
 
 def test___set_prepare_config_enabled():
     __set_prepare_config_common("enabled", {
@@ -327,7 +327,41 @@ def test___set_prepare_config_disabled_part():
         '  no neighbor PEER_V4 allowas-in 1',
         '  no neighbor PEER_V6 allowas-in 1',
     ])
+def test___set_prepare_config_enabled_multiple_peers():
+    __set_prepare_config_common("enabled", {
+                "PEER_V4": ["ipv4"],
+                "PEER_V6": ["ipv6"],
+        }, {"PEER_V4", "PEER_V4_DEPLOYMENT_ID_0", "PEER_V4_DEPLOYMENT_ID_1", "PEER_V6", "PEER_V6_DEPLOYMENT_ID_0", "PEER_V6_DEPLOYMENT_ID_1", "PEER_INVALID"},
+        [
+             'router bgp 65500',
+        ' address-family ipv4',
+        '  neighbor PEER_V4 allowas-in 1',
+        '  neighbor PEER_V4_DEPLOYMENT_ID_0 allowas-in 1',
+        '  neighbor PEER_V4_DEPLOYMENT_ID_1 allowas-in 1',
+        ' address-family ipv6',
+        '  neighbor PEER_V6 allowas-in 1',
+        '  neighbor PEER_V6_DEPLOYMENT_ID_0 allowas-in 1',
+        '  neighbor PEER_V6_DEPLOYMENT_ID_1 allowas-in 1',
+        ],
+        {"PEER_V4", "PEER_V4_DEPLOYMENT_ID_0", "PEER_V4_DEPLOYMENT_ID_1", "PEER_V6", "PEER_V6_DEPLOYMENT_ID_0", "PEER_V6_DEPLOYMENT_ID_1"})
 
+def test___set_prepare_config_disabled_multiple_peers():
+    __set_prepare_config_common("disabled", {
+                "PEER_V4": ["ipv4"],
+                "PEER_V6": ["ipv6"],
+        }, {"PEER_V4", "PEER_V4_DEPLOYMENT_ID_0", "PEER_V4_DEPLOYMENT_ID_1", "PEER_V6", "PEER_V6_DEPLOYMENT_ID_0", "PEER_V6_DEPLOYMENT_ID_1", "PEER_INVALID"},
+        [
+             'router bgp 65500',
+        ' address-family ipv4',
+        '  no neighbor PEER_V4 allowas-in 1',
+        '  no neighbor PEER_V4_DEPLOYMENT_ID_0 allowas-in 1',
+        '  no neighbor PEER_V4_DEPLOYMENT_ID_1 allowas-in 1',
+        ' address-family ipv6',
+        '  no neighbor PEER_V6 allowas-in 1',
+        '  no neighbor PEER_V6_DEPLOYMENT_ID_0 allowas-in 1',
+        '  no neighbor PEER_V6_DEPLOYMENT_ID_1 allowas-in 1',
+        ],
+        {"PEER_V4", "PEER_V4_DEPLOYMENT_ID_0", "PEER_V4_DEPLOYMENT_ID_1", "PEER_V6", "PEER_V6_DEPLOYMENT_ID_0", "PEER_V6_DEPLOYMENT_ID_1"})
 
 def test__get_available_peer_groups():
     cfg_mgr = MagicMock()

From 32c20bdbe4a655d074cebba13f5124902a8b06da Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 22 Jan 2021 09:31:53 -0800
Subject: [PATCH 0079/1674] Submodule update swss-common (#6525)

---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 640a218759b5..e49b18f2512a 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 640a218759b5b490d505cadaca652f4821bba878
+Subproject commit e49b18f2512a9331579cea37ab199730051a68e9

From 9dfee1f09a9d6e0d38f9282da4f0df2e5908d37b Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 22 Jan 2021 07:12:01 -0800
Subject: [PATCH 0080/1674] [pmon]: Run ledd using python3 unless excluded
 (#6528)

**- Why I did it**

Ledd is the last daemon that is not enabled to run in python3.
Even though there is a plan to deprecate this daemon and to replace it by something else it's one simple step toward python2 deprecation.

**- How I did it**

Changed the `command=` line for `ledd` in the `supervisord` configuration of `pmon`.
Copied what was done for other daemons.

**- How to verify it**

Booting a product that has a `led_control.py` should now show the ledd running in python3.
I ran `python3 -m pylint` on all `led_control.py` plugin which means that most of them should be python3 compliant.
There is however still a risk that some might not work.
---
 dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 7f816d33394d..3de20178b224 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -68,7 +68,7 @@ dependent_startup_wait_for=rsyslogd:running
 
 {% if not skip_ledd %}
 [program:ledd]
-command=/usr/local/bin/ledd
+command={% if API_VERSION == 3 and 'ledd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/ledd
 priority=5
 autostart=false
 autorestart=false

From 1239310e02485fed1d1fea380684ed8b1b00b7b4 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:25:11 -0800
Subject: [PATCH 0081/1674] [docker-config-engine-stretch]: Add missing
 dependency PYTHON2_SWSSCOMMON (#6538)

Otherwise all the docker image derived from docker-config-engine-stretch will have broken SONIC_CONFIG_ENGINE_PY2
The bug is introduced in #6406
---
 rules/docker-config-engine-stretch.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/docker-config-engine-stretch.mk b/rules/docker-config-engine-stretch.mk
index 485e10fbb713..ad112bb034dc 100644
--- a/rules/docker-config-engine-stretch.mk
+++ b/rules/docker-config-engine-stretch.mk
@@ -2,6 +2,7 @@
 
 DOCKER_CONFIG_ENGINE_STRETCH = docker-config-engine-stretch.gz
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-config-engine-stretch
+$(DOCKER_CONFIG_ENGINE_STRETCH)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON2_SWSSCOMMON)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)

From bedd05bb4384accd627241af4fada8ff872b6860 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Sat, 23 Jan 2021 00:26:46 -0800
Subject: [PATCH 0082/1674] [DellEMC Z9332f] Remove duplicate ipmihelper.py
 script (#6536)

Fixes #6445

Because the ipmihelper.py script in the 9332 folder is slightly different than the common one (due to LGTM fixes), when the common one gets copied during build time it causes the workspace/build to become dirty.

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 .../common/ipmihelper.py                      |   6 +-
 .../z9332f/sonic_platform/ipmihelper.py       | 269 ------------------
 2 files changed, 3 insertions(+), 272 deletions(-)
 delete mode 100644 platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/ipmihelper.py

diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
index f70c505d4914..ceeaebfbf047 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -38,7 +38,7 @@ def get_ipmitool_raw_output(args):
         proc.wait()
         if not proc.returncode:
             result = stdout.rstrip('\n')
-    except:
+    except EnvironmentError:
         pass
 
     for i in result.split():
@@ -180,7 +180,7 @@ def _get_ipmitool_fru_print(self):
             proc.wait()
             if not proc.returncode:
                 result = stdout.decode('utf-8').rstrip('\n')
-        except:
+        except EnvironmentError:
             pass
 
         return result
@@ -253,7 +253,7 @@ def get_fru_data(self, offset, count=1):
             proc.wait()
             if not proc.returncode:
                 result = stdout.decode('utf-8').rstrip('\n')
-        except:
+        except EnvironmentError:
             is_valid = False
 
         if (not result) or (not is_valid):
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/ipmihelper.py
deleted file mode 100644
index ceeaebfbf047..000000000000
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/ipmihelper.py
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/python3
-
-########################################################################
-# DellEMC
-#
-# Module contains implementation of IpmiSensor and IpmiFru classes that
-# provide Sensor's and FRU's information respectively.
-#
-########################################################################
-
-import subprocess
-import re
-
-# IPMI Request Network Function Codes
-NetFn_SensorEvent = 0x04
-NetFn_Storage = 0x0A
-
-# IPMI Sensor Device Commands
-Cmd_GetSensorReadingFactors = 0x23
-Cmd_GetSensorThreshold = 0x27
-Cmd_GetSensorReading = 0x2D
-
-# IPMI FRU Device Commands
-Cmd_ReadFRUData = 0x11
-
-def get_ipmitool_raw_output(args):
-    """
-    Returns a list the elements of which are the individual bytes of
-    ipmitool raw <cmd> command output.
-    """
-    result_bytes = list()
-    result = ""
-    command = "ipmitool raw {}".format(args)
-    try:
-        proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
-        stdout = proc.communicate()[0]
-        proc.wait()
-        if not proc.returncode:
-            result = stdout.rstrip('\n')
-    except EnvironmentError:
-        pass
-
-    for i in result.split():
-        result_bytes.append(int(i, 16))
-
-    return result_bytes
-
-class IpmiSensor(object):
-
-    # Sensor Threshold types and their respective bit masks
-    THRESHOLD_BIT_MASK = {
-        "LowerNonCritical"    : 0,
-        "LowerCritical"       : 1,
-        "LowerNonRecoverable" : 2,
-        "UpperNonCritical"    : 3,
-        "UpperCritical"       : 4,
-        "UpperNonRecoverable" : 5
-    }
-
-    def __init__(self, sensor_id, is_discrete=False):
-        self.id = sensor_id
-        self.is_discrete = is_discrete
-
-    def _get_converted_sensor_reading(self, raw_value):
-        """
-        Returns a 2 element tuple(bool, int) in which first element
-        provides the validity of the reading and the second element is
-        the converted sensor reading
-        """
-        # Get Sensor Reading Factors
-        cmd_args = "{} {} {} {}".format(NetFn_SensorEvent,
-                                        Cmd_GetSensorReadingFactors,
-                                        self.id, raw_value)
-        factors = get_ipmitool_raw_output(cmd_args)
-
-        if len(factors) != 7:
-            return False, 0
-
-        # Compute Twos complement
-        def get_twos_complement(val, bits):
-            if val & (1 << (bits - 1)):
-                val = val - (1 << bits)
-            return val
-
-        # Calculate actual sensor value from the raw sensor value
-        # using the sensor reading factors.
-        M = get_twos_complement(((factors[2] & 0xC0) << 8) | factors[1], 10)
-        B = get_twos_complement(((factors[4] & 0xC0) << 8) | factors[3], 10)
-        R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
-        B_exp = get_twos_complement(factors[6] & 0x0F, 4)
-
-        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
-
-        return True, converted_reading
-
-    def get_reading(self):
-        """
-        For Threshold sensors, returns the sensor reading.
-        For Discrete sensors, returns the state value.
-
-        Returns:
-            A tuple (bool, int) where the first element provides the
-            validity of the reading and the second element provides the
-            sensor reading/state value.
-        """
-        # Get Sensor Reading
-        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorReading,
-                                     self.id)
-        output = get_ipmitool_raw_output(cmd_args)
-        if len(output) != 4:
-            return False, 0
-
-        # Check reading/state unavailable
-        if output[1] & 0x20:
-            return False, 0
-
-        if self.is_discrete:
-            state = ((output[3] & 0x7F) << 8) | output[2]
-            return True, state
-        else:
-            return self._get_converted_sensor_reading(output[0])
-
-    def get_threshold(self, threshold_type):
-        """
-        Returns the sensor's threshold value for a given threshold type.
-
-        Args:
-            threshold_type (str) - one of the below mentioned
-                                   threshold type strings
-
-                "LowerNonCritical"
-                "LowerCritical"
-                "LowerNonRecoverable"
-                "UpperNonCritical"
-                "UpperCritical"
-                "UpperNonRecoverable"
-        Returns:
-            A tuple (bool, int) where the first element provides the
-            validity of that threshold and second element provides the
-            threshold value.
-        """
-        # Thresholds are not valid for discrete sensors
-        if self.is_discrete:
-            raise TypeError("Threshold is not applicable for Discrete Sensor")
-
-        if threshold_type not in list(self.THRESHOLD_BIT_MASK.keys()):
-            raise ValueError("Invalid threshold type {} provided. Valid types "
-                             "are {}".format(threshold_type,
-                                             list(self.THRESHOLD_BIT_MASK.keys())))
-
-        bit_mask = self.THRESHOLD_BIT_MASK[threshold_type]
-
-        # Get Sensor Threshold
-        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorThreshold,
-                                     self.id)
-        thresholds = get_ipmitool_raw_output(cmd_args)
-        if len(thresholds) != 7:
-            return False, 0
-
-        valid_thresholds = thresholds.pop(0)
-        # Check whether particular threshold is readable
-        if valid_thresholds & (1 << bit_mask):
-            return self._get_converted_sensor_reading(thresholds[bit_mask])
-        else:
-            return False, 0
-
-class IpmiFru(object):
-
-    def __init__(self, fru_id):
-        self.id = fru_id
-
-    def _get_ipmitool_fru_print(self):
-        result = ""
-        command = "ipmitool fru print {}".format(self.id)
-        try:
-            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
-        except EnvironmentError:
-            pass
-
-        return result
-
-    def _get_from_fru(self, info):
-        """
-        Returns a string containing the info from FRU
-        """
-        fru_output = self._get_ipmitool_fru_print()
-        if not fru_output:
-            return "NA"
-
-        info_req = re.search(r"%s\s*:(.*)" % info, fru_output)
-        if not info_req:
-            return "NA"
-
-        return info_req.group(1).strip()
-
-    def get_board_serial(self):
-        """
-        Returns a string containing the Serial Number of the device.
-        """
-        return self._get_from_fru('Board Serial')
-
-    def get_board_part_number(self):
-        """
-        Returns a string containing the Part Number of the device.
-        """
-        return self._get_from_fru('Board Part Number')
-
-    def get_board_mfr_id(self):
-        """
-        Returns a string containing the manufacturer id of the FRU.
-        """
-        return self._get_from_fru('Board Mfg')
-
-    def get_board_product(self):
-        """
-        Returns a string containing the manufacturer id of the FRU.
-        """
-        return self._get_from_fru('Board Product')
-
-    def get_fru_data(self, offset, count=1):
-        """
-        Reads and returns the FRU data at the provided offset.
-
-        Args:
-            offset (int) - FRU offset to read
-            count (int) - Number of bytes to read [optional, default = 1]
-        Returns:
-            A tuple (bool, list(int)) where the first element provides
-            the validity of the data read and the second element is a
-            list, the elements of which are the individual bytes of the
-            FRU data read.
-        """
-        result_bytes = list()
-        is_valid = True
-        result = ""
-
-        offset_LSB = offset & 0xFF
-        offset_MSB = offset & 0xFF00
-        command = "ipmitool raw {} {} {} {} {} {}".format(NetFn_Storage,
-                                                          Cmd_ReadFRUData,
-                                                          self.id, offset_LSB,
-                                                          offset_MSB, count)
-        try:
-            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
-        except EnvironmentError:
-            is_valid = False
-
-        if (not result) or (not is_valid):
-            return False, result_bytes
-
-        for i in result.split():
-            result_bytes.append(int(i, 16))
-
-        read_count = result_bytes.pop(0)
-        if read_count != count:
-            return False, result_bytes
-        else:
-            return True, result_bytes

From 50912ad966db66158a8661ca42e4bf43ccaba1a0 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:28:04 -0800
Subject: [PATCH 0083/1674] [sonic-platform-daemons] Update submodule (#6535)

Submodule changes to be committed:

* src/sonic-platform-daemons 81318f7...e72f6cd (3):
  > [ledd] Minor refactor; add unit tests (#143)
  > [thermalctld] Report unit test coverage (#141)
  > [psud] Increase unit test coverage (#140)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 81318f7afdb6..e72f6cd95881 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 81318f7afdb65bd15af387c97152948d22cf9834
+Subproject commit e72f6cd958810e3af9b18a71bc078dbb8c5d6cac

From 6a50042b669c8ee138238d20ed04ea9a3631197e Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:29:13 -0800
Subject: [PATCH 0084/1674] [process-reboot-cause] Make process-reboot-cause
 executable (#6534)

process-reboot-cause script should be executable.
---
 src/sonic-host-services/scripts/process-reboot-cause | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/sonic-host-services/scripts/process-reboot-cause

diff --git a/src/sonic-host-services/scripts/process-reboot-cause b/src/sonic-host-services/scripts/process-reboot-cause
old mode 100644
new mode 100755

From ceecc8f9d41ed5366ba44846df78b1992c15bb23 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:25:40 -0800
Subject: [PATCH 0085/1674] Remove things needed for building Python 3 from
 source (#6441)

**- Why I did it**

Prior to SONiC using Debian Buster, we needed to build Python 3.5 or newer from source for installation in the SNMP container, becuase it wasn't available from the Debian repository for Jessie or Stretch. Now that all containers are based on Buster, we simply install Python 3.7 from the Debian repository in the host as well as all containers. We are no longer building Python 3 from source, so the Makefile is unused and we no longer need to install build dependencies in the slave containers.

**- How I did it**

- Remove Python 3 makefile
- No longer install Python 3 build dependencies in the slave containers.
---
 sonic-slave-buster/Dockerfile.j2  | 22 +++-------------
 sonic-slave-jessie/Dockerfile.j2  | 18 -------------
 sonic-slave-stretch/Dockerfile.j2 | 18 -------------
 src/python3/.gitignore            |  3 ---
 src/python3/Makefile              | 43 -------------------------------
 5 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100644 src/python3/.gitignore
 delete mode 100644 src/python3/Makefile

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 641a1f3f2433..3d55446b6142 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -197,24 +197,6 @@ RUN apt-get update && apt-get install -y \
         lua-cjson-dev \
 # For mft kernel module build
         dkms \
-# For python3.5 build
-        sharutils \
-        libncursesw5-dev \
-        libbz2-dev \
-        liblzma-dev \
-        libgdbm-dev \
-        tk-dev \
-        blt-dev \
-        libmpdec-dev \
-        libbluetooth-dev \
-        locales \
-        libsqlite3-dev \
-        libgpm2 \
-        time \
-        net-tools \
-        xvfb \
-        python-sphinx \
-        python3-sphinx \
 # For Jenkins static analysis, unit testing and code coverage
         cppcheck \
         clang \
@@ -320,7 +302,9 @@ RUN apt-get update && apt-get install -y \
         libxml2-utils \
         xsltproc \
         python-lxml \
-        libexpat1-dev
+        libexpat1-dev \
+# For kdump-tools
+        libbz2-dev
 
 # Build fix for ARMHF buster libsairedis
 {%- if CONFIGURED_ARCH == "armhf" %}
diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index 2914deb7842d..f103dfb789b9 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -176,24 +176,6 @@ RUN apt-get update && apt-get install -y \
         libjemalloc-dev \
 # For mft kernel module build
         dkms \
-# For python3.5 build
-        sharutils \
-        libncursesw5-dev \
-        libbz2-dev \
-        liblzma-dev \
-        libgdbm-dev \
-        tk-dev \
-        blt-dev \
-        libmpdec-dev \
-        libbluetooth-dev \
-        locales \
-        libsqlite3-dev \
-        libgpm2 \
-        time \
-        net-tools \
-        xvfb \
-        python-sphinx \
-        python3-sphinx \
 # For Jenkins static analysis, unit testing and code coverage
         cppcheck \
         clang \
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 53f2791e583a..103a9cd77831 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -196,24 +196,6 @@ RUN apt-get update && apt-get install -y \
         lua-cjson-dev \
 # For mft kernel module build
         dkms \
-# For python3.5 build
-        sharutils \
-        libncursesw5-dev \
-        libbz2-dev \
-        liblzma-dev \
-        libgdbm-dev \
-        tk-dev \
-        blt-dev \
-        libmpdec-dev \
-        libbluetooth-dev \
-        locales \
-        libsqlite3-dev \
-        libgpm2 \
-        time \
-        net-tools \
-        xvfb \
-        python-sphinx \
-        python3-sphinx \
 # For Jenkins static analysis, unit testing and code coverage
         cppcheck \
         clang \
diff --git a/src/python3/.gitignore b/src/python3/.gitignore
deleted file mode 100644
index a0991ff4402b..000000000000
--- a/src/python3/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!Makefile
diff --git a/src/python3/Makefile b/src/python3/Makefile
deleted file mode 100644
index 1c37e9d06c45..000000000000
--- a/src/python3/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-PYTHON_VER=3.6.0
-PYTHON_DEB_VER=1
-PYTHON_PNAME=python3.6
-
-MAIN_TARGET = lib$(PYTHON_PNAME)-minimal_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = lib$(PYTHON_PNAME)-stdlib_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb \
-				  lib$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb \
-				  $(PYTHON_PNAME)-minimal_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb \
-				  $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb \
-				  lib$(PYTHON_PNAME)-dev_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb
-				  #$(PYTHON_PNAME)-dev_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Remove any stale files
-	rm -rf $(PYTHON_PNAME)-$(PYTHON_VER)
-
-	## Obtaining the python3
-	wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz?sv=2015-04-05&sr=b&sig=d42Wh1CA9NZvlskhW4fpWcHVgc7N3IKhdFzyeO2zbRA%3D&se=2027-02-02T01%3A00%3A57Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz
-	wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz?sv=2015-04-05&sr=b&sig=KLX9pMJ3zpQvGBo6ZjzoZXgooMJRUUwMx8ZaTJtywK0%3D&se=2027-02-02T00%3A59%3A34Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz
-	wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).dsc?sv=2015-04-05&sr=b&sig=95s%2FC4vKY6bRKtkUTz%2BmHLqOllBOYbfP3zV5ayAuzSM%3D&se=2027-02-02T01%3A00%3A26Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).dsc
-
-	## Build
-	dpkg-source -x $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).dsc
-	pushd $(PYTHON_PNAME)-$(PYTHON_VER)
-	mk-build-deps
-
-	# put a lock here because dpkg does not allow installing packages in parallel
-	while true; do
-	if mkdir $(DEST)/dpkg_lock &> /dev/null; then
-	{ echo here && (sudo dpkg -i $(PYTHON_PNAME)-build-deps_$(PYTHON_VER)-$(PYTHON_DEB_VER)_$(CONFIGURED_ARCH).deb || sudo apt-get install -f) && rm -d $(DEST)/dpkg_lock && break; } || { rm -d $(DEST)/dpkg_lock && exit 1 ; }
-	fi
-	done
-
-	dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-	popd
-
-	cp $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

From 59fd5fd3b8121b0cf3d4244a182fee6e43805489 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Sat, 23 Jan 2021 00:29:35 -0800
Subject: [PATCH 0086/1674] [build-docker-buster]: Install libboost 1.171 In
 Build Docker (#6532)

Installing newst buster version of libboost (v1.71) in build docker.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 sonic-slave-buster/Dockerfile.j2 | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 3d55446b6142..b8234e19d01b 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -61,7 +61,6 @@ RUN apt-get update && apt-get install -y \
         dh-exec \
         kmod \
         libtinyxml2-6a \
-        libboost-program-options1.67-dev \
         libtinyxml2-dev \
         python \
         python-pip \
@@ -121,7 +120,6 @@ RUN apt-get update && apt-get install -y \
         module-assistant \
 # For thrift build\
         gem2deb \
-        libboost-all-dev \
         libevent-dev \
         libglib2.0-dev \
         libqt4-dev \
@@ -304,7 +302,27 @@ RUN apt-get update && apt-get install -y \
         python-lxml \
         libexpat1-dev \
 # For kdump-tools
-        libbz2-dev
+        libbz2-dev \
+# For linkmgrd
+        libboost1.71-dev \
+        libboost-program-options1.71-dev \
+        libboost-system1.71-dev \
+        libboost-thread1.71-dev \
+        libboost-atomic1.71-dev \
+        libboost-chrono1.71-dev \
+        libboost-container1.71-dev \
+        libboost-context1.71-dev \
+        libboost-contract1.71-dev \
+        libboost-coroutine1.71-dev \
+        libboost-date-time1.71-dev \
+        libboost-fiber1.71-dev \
+        libboost-filesystem1.71-dev \
+        libboost-graph-parallel1.71-dev \
+        libboost-log1.71-dev \
+        libboost-regex1.71-dev \
+        googletest \
+        libgtest-dev \
+        libgcc-8-dev
 
 # Build fix for ARMHF buster libsairedis
 {%- if CONFIGURED_ARCH == "armhf" %}

From c8b3a709f1aa23161ff8d3f46dbd24e43342d427 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:32:06 -0800
Subject: [PATCH 0087/1674] [sonic-host-services] Report unit test coverage
 (#6533)

To view unit test coverage of sonic-host-services package upon build
---
 src/sonic-host-services/pytest.ini | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/sonic-host-services/pytest.ini

diff --git a/src/sonic-host-services/pytest.ini b/src/sonic-host-services/pytest.ini
new file mode 100644
index 000000000000..83b74d373c06
--- /dev/null
+++ b/src/sonic-host-services/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml

From df76e33bb3fc5f79e1085bd2118c097fa8e75753 Mon Sep 17 00:00:00 2001
From: Antonina Melnyk <74662630+antoninamelnyk@users.noreply.github.com>
Date: Mon, 25 Jan 2021 02:32:18 +0200
Subject: [PATCH 0088/1674] [barefoot] Fixes for platform API (#6487)

There was a mismatch with Eeprom class methods names and methods called from Eeprom class.

Signed-off-by: Antonina Melnyk antoninax.melnyk@intel.com
---
 .../sonic_platform/eeprom.py                             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
index e25d224c1e8b..df24172709d3 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
@@ -136,14 +136,17 @@ def eeprom_parse(self):
 
         return True
 
-    def serial_number_str(self):
+    def serial_str(self):
         return self.eeprom.prod_ser_num
 
     def system_eeprom_info(self):
         return self.eeprom.__dict__
 
-    def get_base_mac(self):
-        return self.eeprom.ext_mac_addr
+    def base_mac_addr(self):
+        return self.eeprom.ext_mac_addr.rstrip('\x00')
 
     def part_number_str(self):
         return self.eeprom.prod_part_num
+
+    def modelstr(self):
+        return self.eeprom.prod_name

From 7e2b7553bce642e1bd018d2a2d7d015f7b30e6ad Mon Sep 17 00:00:00 2001
From: Dmytro Shevchuk <68949102+dmytroxshevchuk@users.noreply.github.com>
Date: Mon, 25 Jan 2021 03:46:33 +0200
Subject: [PATCH 0089/1674] [sonic-cfggen] parse optional fec and autoneg
 fields from hwsku.json (#6155)

**- Why I did it**

For now `hwsku.json` and `platform.json` dont support optional fields. For example no way to add `fec` or `autoneg` field using `platform.json` and `hwsku.json`.

**- How I did it**
Added parsing of optional fields from hwsku.json.

**- How to verify it**
Add optional field to `hwsku.json`. After first boot will be generated new `config_db.json` or you can generate it using `sonic-cfggen` command. In this file must be optional field from `hwsku.json` or check using command `redis-cli hgetall PORT_TABLE:Ethernet0`
Example of `hwsku.json`, that must be parsed:
```
{
    "interfaces": {
        "Ethernet0": {
            "default_brkout_mode": "1x100G[40G]",
            "fec": "rs",
            "autoneg": "0"
        },
...
}
```
Example of generated `config_db.json`:
```
    "PORT": {
        "Ethernet0": {
            "alias": "Ethernet0",
            "lanes": "0,1,2,3",
            "speed": "100000",
            "index": "1",
            "admin_status": "up",
            "fec": "rs",
            "autoneg": "0",
            "mtu": "9100"
        },
```
So, we can see this entries in redis db:
```
admin@sonic:~$ redis-cli hgetall PORT_TABLE:Ethernet0

 1) "alias"
 2) "Ethernet0"
 3) "lanes"
 4) "0,1,2,3"
 5) "speed"
 6) "100000"
 7) "index"
 8) "1"
 9) "admin_status"
10) "up"
11) "fec"
12) "rs"
13) "autoneg"
14) "0"
15) "mtu"
16) "9100"
17) "description"
18) ""
19) "oper_status"
20) "up"
```

Also its way to fix `show interface status`, `FEC` field but also need add `FEC` field to `hwsku.json`.
Before:
```
admin@sonic:~$ show interfaces status
  Interface            Lanes    Speed    MTU    FEC        Alias    Vlan    Oper    Admin             Type    Asym PFC
-----------  ---------------  -------  -----  -----  -----------  ------  ------  -------  ---------------  ----------
  Ethernet0          0,1,2,3     100G   9100     N/A    Ethernet0  routed      up       up  QSFP28 or later         N/A
```
After:
```
admin@sonic:~$ show interfaces status
  Interface            Lanes    Speed    MTU    FEC        Alias    Vlan    Oper    Admin             Type    Asym PFC
-----------  ---------------  -------  -----  -----  -----------  ------  ------  -------  ---------------  ----------
  Ethernet0          0,1,2,3     100G   9100     rs    Ethernet0  routed      up       up  QSFP28 or later         N/A
```
---
 src/sonic-config-engine/portconfig.py         |  7 ++
 src/sonic-device-data/src/Makefile            |  3 +
 .../tests/hwsku_json_checker                  | 91 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100755 src/sonic-device-data/tests/hwsku_json_checker

diff --git a/src/sonic-config-engine/portconfig.py b/src/sonic-config-engine/portconfig.py
index 8a3177f31b9a..478198e5af84 100644
--- a/src/sonic-config-engine/portconfig.py
+++ b/src/sonic-config-engine/portconfig.py
@@ -24,6 +24,7 @@
 BRKOUT_MODE = "default_brkout_mode"
 CUR_BRKOUT_MODE = "brkout_mode"
 INTF_KEY = "interfaces"
+OPTIONAL_HWSKU_ATTRIBUTES = ["fec", "autoneg"]
 
 BRKOUT_PATTERN = r'(\d{1,3})x(\d{1,3}G)(\[\d{1,3}G\])?(\((\d{1,3})\))?'
 
@@ -250,6 +251,12 @@ def parse_platform_json_file(hwsku_json_file, platform_json_file):
         brkout_mode = hwsku_dict[INTF_KEY][intf][BRKOUT_MODE]
 
         child_ports = get_child_ports(intf, brkout_mode, platform_json_file)
+
+        # take optional fields from hwsku.json
+        for key, item in hwsku_dict[INTF_KEY][intf].items():
+            if key in OPTIONAL_HWSKU_ATTRIBUTES:
+                child_ports.get(intf)[key] = item
+
         ports.update(child_ports)
 
     if not ports:
diff --git a/src/sonic-device-data/src/Makefile b/src/sonic-device-data/src/Makefile
index 10525fdeb27e..5ecefbf37960 100644
--- a/src/sonic-device-data/src/Makefile
+++ b/src/sonic-device-data/src/Makefile
@@ -14,4 +14,7 @@ test:
 	for f in $$(find ../../../device -name platform.json); do
 	    ./platform_json_checker $$f
 	done
+	for f in $$(find ../../../device -name hwsku.json); do
+	    ./hwsku_json_checker $$f
+	done
 	popd
diff --git a/src/sonic-device-data/tests/hwsku_json_checker b/src/sonic-device-data/tests/hwsku_json_checker
new file mode 100755
index 000000000000..6fd3d82c4cfb
--- /dev/null
+++ b/src/sonic-device-data/tests/hwsku_json_checker
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+
+import glob
+import json
+import re
+import sys
+
+# Global variable
+PORT_ATTRIBUTES = ["default_brkout_mode"]
+OPTIONAL_PORT_ATTRIBUTES = ["fec", "autoneg"]
+PORT_REG = "Ethernet(\d+)"
+HWSKU_JSON = '*hwsku.json'
+INTF_KEY = "interfaces"
+
+def usage():
+    print("Usage: " + sys.argv[0] + " <hwsku_json_file>")
+    sys.exit(1)
+
+def check_port_attr(port_attr):
+    for each_key in port_attr:
+        if each_key not in PORT_ATTRIBUTES and each_key not in OPTIONAL_PORT_ATTRIBUTES:
+            print("Error: " + each_key + " is not the correct Port attribute.")
+            return False
+        if not port_attr[each_key]:
+            print("Error: " + each_key + " has no value.")
+            return False
+        if not isinstance(port_attr[each_key], str):
+            print("Error:value type of  " + each_key + " must be string.")
+            return False
+    return True
+
+def check_file(hwsku_json_file):
+    try:
+        hwsku_cap_file = open(hwsku_json_file,"r")
+        hwsku_data_data = hwsku_cap_file.read()
+        hwsku_dict = json.loads(hwsku_data_data)
+
+        for each_port in hwsku_dict[INTF_KEY]:
+            # Validate port at top level
+            port_id = re.search(PORT_REG, each_port)
+            if port_id is None:
+                print("Error: Unknown Interface " + str(each_port) + " at top level")
+                return False
+
+            port_attr = hwsku_dict[INTF_KEY][each_port]
+
+            # Check mandatory attributes
+            for each_key in PORT_ATTRIBUTES:
+                if each_key not in port_attr:
+                    print("Error: " + each_key + " of " + each_port + " is/are missing")
+                    return False
+
+            #Validate port attributes for each port
+            if not check_port_attr(port_attr):
+                return False
+    except IOError:
+        print("Error: Cannot open file " + hwsku_json_file)
+        return False
+    except ValueError as e:
+        print("Error in parsing json file " + hwsku_json_file + " ")
+        print(str(e))
+        return False
+    return True
+
+def main(argv):
+    if len(argv) > 0 and argv[0] == "-h":
+        usage()
+
+    # Load target file
+    if len(argv) == 0:
+        files = glob.glob(HWSKU_JSON)
+    else:
+        files = argv
+
+    all_good = True
+
+    for f in files:
+        good = check_file(f)
+        if good:
+            print("File " + f + " passed validity check")
+        else:
+            print("File " + f + " failed validity check")
+
+        all_good = all_good and good
+
+    if not all_good:
+        sys.exit(-1)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])

From 154a6ab6c52609bd925cc7441297329a8929a0d0 Mon Sep 17 00:00:00 2001
From: Zhenhong Zhao <Zhenhong_Zhao@dell.com>
Date: Sun, 24 Jan 2021 17:57:03 -0800
Subject: [PATCH 0090/1674] [frrcfgd] introduce frrcfgd to manage frr config
 when frr_mgmt_framework_config is true (#5142)

- Support for non-template based FRR configurations (BGP, route-map, OSPF, static route..etc) using config DB schema.
- Support for save & restore - Jinja template based config-DB data read and apply to FRR during startup

**- How I did it**

- add frrcfgd service
- when frr_mgmg_framework_config is set, frrcfgd starts in bgp container
- when user changed the BGP or other related table entries in config DB, frrcfgd will run corresponding VTYSH commands to program on FRR.
- add jinja template to generate FRR config file to be used by FRR daemons while bgp container restarted

**- How to verify it**
1. Add/delete data on config DB and then run VTYSH "show running-config" command to check if FRR configuration changed.
1. Restart bgp container and check if generated FRR config file is correct and run VTYSH "show running-config" command to check if FRR configuration is consistent with attributes in config DB

Co-authored-by: Zhenhong Zhao <zhenhong.zhao@dell.com>
---
 dockers/docker-fpm-frr/Dockerfile.j2          |    1 -
 dockers/docker-fpm-frr/critical_processes     |    5 -
 dockers/docker-fpm-frr/docker_init.sh         |   22 +-
 .../docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2  |    5 +
 dockers/docker-fpm-frr/frr/frr_vars.j2        |   15 +-
 dockers/docker-fpm-frr/frr/gen_frr.conf.j2    |    5 +
 .../frr/staticd/gen_staticd.conf.j2           |    5 +
 .../frr/supervisord/critical_processes.j2     |   12 +
 .../frr/supervisord/supervisord.conf.j2       |   45 +
 rules/docker-fpm-frr.mk                       |    2 +-
 rules/sonic-frr-mgmt-framework.dep            |    8 +
 rules/sonic-frr-mgmt-framework.mk             |   13 +
 src/sonic-frr-mgmt-framework/.gitignore       |   12 +
 .../frrcfgd/__init__.py                       |    0
 .../frrcfgd/frrcfgd.py                        | 3795 +++++++++++++++++
 src/sonic-frr-mgmt-framework/pytest.ini       |    2 +
 src/sonic-frr-mgmt-framework/setup.cfg        |    5 +
 src/sonic-frr-mgmt-framework/setup.py         |   51 +
 .../templates/bfdd/bfdd.conf.j2               |   91 +
 .../bgpd/bgpd.conf.db.addr_family.evpn.j2     |   78 +
 .../bgpd/bgpd.conf.db.addr_family.j2          |  143 +
 .../templates/bgpd/bgpd.conf.db.comm_list.j2  |   54 +
 .../templates/bgpd/bgpd.conf.db.j2            |  204 +
 .../templates/bgpd/bgpd.conf.db.nbr_af.j2     |  150 +
 .../bgpd/bgpd.conf.db.nbr_or_peer.j2          |  103 +
 .../templates/bgpd/bgpd.conf.db.pref_list.j2  |   30 +
 .../templates/bgpd/bgpd.conf.db.route_map.j2  |  150 +
 .../templates/bgpd/bgpd.conf.j2               |   15 +
 .../templates/frr/frr.conf.j2                 |   30 +
 .../templates/ospfd/ospfd.conf.db.area.j2     |   37 +
 .../ospfd/ospfd.conf.db.comm_list.j2          |  129 +
 .../ospfd/ospfd.conf.db.distributeroute.j2    |   52 +
 .../ospfd/ospfd.conf.db.interface.j2          |   76 +
 .../ospfd/ospfd.conf.db.policyrange.j2        |   16 +
 .../templates/ospfd/ospfd.conf.db.vlink.j2    |   29 +
 .../templates/ospfd/ospfd.conf.j2             |    6 +
 .../templates/staticd/staticd.conf.j2         |   22 +
 .../templates/staticd/staticd.db.conf.j2      |  153 +
 .../staticd/staticd.db.default_route.conf.j2  |    9 +
 .../tests/__init__.py                         |    0
 .../tests/test_config.py                      |  176 +
 .../tests/test_constructor.py                 |  234 +
 42 files changed, 5976 insertions(+), 14 deletions(-)
 delete mode 100644 dockers/docker-fpm-frr/critical_processes
 create mode 100644 dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
 create mode 100644 dockers/docker-fpm-frr/frr/gen_frr.conf.j2
 create mode 100644 dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
 create mode 100644 dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
 create mode 100644 rules/sonic-frr-mgmt-framework.dep
 create mode 100644 rules/sonic-frr-mgmt-framework.mk
 create mode 100644 src/sonic-frr-mgmt-framework/.gitignore
 create mode 100644 src/sonic-frr-mgmt-framework/frrcfgd/__init__.py
 create mode 100755 src/sonic-frr-mgmt-framework/frrcfgd/frrcfgd.py
 create mode 100644 src/sonic-frr-mgmt-framework/pytest.ini
 create mode 100644 src/sonic-frr-mgmt-framework/setup.cfg
 create mode 100755 src/sonic-frr-mgmt-framework/setup.py
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bfdd/bfdd.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.evpn.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.comm_list.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_af.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_or_peer.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.pref_list.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.area.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.comm_list.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.distributeroute.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.interface.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.policyrange.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.vlink.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/staticd/staticd.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.default_route.conf.j2
 create mode 100644 src/sonic-frr-mgmt-framework/tests/__init__.py
 create mode 100644 src/sonic-frr-mgmt-framework/tests/test_config.py
 create mode 100644 src/sonic-frr-mgmt-framework/tests/test_constructor.py

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 69e3655d0c39..302f38c8b579 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -54,7 +54,6 @@ COPY ["TSA", "/usr/bin/TSA"]
 COPY ["TSB", "/usr/bin/TSB"]
 COPY ["TSC", "/usr/bin/TSC"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
-COPY ["critical_processes", "/etc/supervisor"]
 COPY ["bgpd.sh", "/usr/bin/"]
 RUN chmod a+x /usr/bin/TSA && \
     chmod a+x /usr/bin/TSB && \
diff --git a/dockers/docker-fpm-frr/critical_processes b/dockers/docker-fpm-frr/critical_processes
deleted file mode 100644
index 2631fee15e66..000000000000
--- a/dockers/docker-fpm-frr/critical_processes
+++ /dev/null
@@ -1,5 +0,0 @@
-program:zebra
-program:staticd
-program:bgpd
-program:fpmsyncd
-program:bgpcfgd
diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
index 94cd7fbb1322..96149de4c379 100755
--- a/dockers/docker-fpm-frr/docker_init.sh
+++ b/dockers/docker-fpm-frr/docker_init.sh
@@ -6,16 +6,25 @@ 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/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/bgpd/gen_bgpd.conf.j2,/etc/frr/bgpd.conf \
+    -t /usr/share/sonic/templates/supervisord/critical_processes.j2,/etc/supervisor/critical_processes \
     -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/staticd/gen_staticd.conf.j2,/etc/frr/staticd.conf \
+    -t /usr/share/sonic/templates/gen_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/sonic/frrcfgd/bfdd.conf.j2,/etc/frr/bfdd.conf \
+    -t /usr/local/sonic/frrcfgd/ospfd.conf.j2,/etc/frr/ospfd.conf \
 "
-CONFIG_TYPE=$(sonic-cfggen $CFGGEN_PARAMS)
+
+FRR_VARS=$(sonic-cfggen $CFGGEN_PARAMS)
+MGMT_FRAMEWORK_CONFIG=$(echo $FRR_VARS | jq -r '.frr_mgmt_framework_config')
+CONFIG_TYPE=$(echo $FRR_VARS | jq -r '.docker_routing_config_mode')
+if [ -z "$MGMT_FRAMEWORK_CONFIG" ] || [ "$MGMT_FRAMEWORK_CONFIG" == "false" ]; then
+    rm /etc/frr/bfdd.conf /etc/frr/ospfd.conf
+fi
 
 update_default_gw()
 {
@@ -52,7 +61,8 @@ if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
     rm -f /etc/frr/frr.conf
 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/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf \
+          /etc/frr/bfdd.conf /etc/frr/ospfd.conf /etc/frr/pimd.conf
 fi
 
 chown -R frr:frr /etc/frr/
diff --git a/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
new file mode 100644
index 000000000000..bb6d7f6a5a65
--- /dev/null
+++ b/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
@@ -0,0 +1,5 @@
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+    {% include "/usr/local/sonic/frrcfgd/bgpd.conf.j2" %}
+{% else %}
+    {% include "/usr/share/sonic/templates/bgpd/bgpd.conf.j2" %}
+{% endif %}
diff --git a/dockers/docker-fpm-frr/frr/frr_vars.j2 b/dockers/docker-fpm-frr/frr/frr_vars.j2
index 9909604e5f1c..662608a1fd8b 100644
--- a/dockers/docker-fpm-frr/frr/frr_vars.j2
+++ b/dockers/docker-fpm-frr/frr/frr_vars.j2
@@ -1 +1,14 @@
-{{ DEVICE_METADATA["localhost"]["docker_routing_config_mode"] }}
+{
+    "frr_mgmt_framework_config":
+        {% if "frr_mgmt_framework_config" in DEVICE_METADATA["localhost"].keys() %}
+            "{{ DEVICE_METADATA["localhost"]["frr_mgmt_framework_config"] }}"
+        {% else %}
+            ""
+        {% endif %},
+    "docker_routing_config_mode":
+        {% if "docker_routing_config_mode" in DEVICE_METADATA["localhost"].keys() %}
+            "{{ DEVICE_METADATA["localhost"]["docker_routing_config_mode"] }}"
+        {% else %}
+            ""
+        {% endif %}
+}
diff --git a/dockers/docker-fpm-frr/frr/gen_frr.conf.j2 b/dockers/docker-fpm-frr/frr/gen_frr.conf.j2
new file mode 100644
index 000000000000..181437da07a0
--- /dev/null
+++ b/dockers/docker-fpm-frr/frr/gen_frr.conf.j2
@@ -0,0 +1,5 @@
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+    {% include "/usr/local/sonic/frrcfgd/frr.conf.j2" %}
+{% else %}
+    {% include "/usr/share/sonic/templates/frr.conf.j2" %}
+{% endif %}
diff --git a/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
new file mode 100644
index 000000000000..1346c9a4993b
--- /dev/null
+++ b/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
@@ -0,0 +1,5 @@
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+    {% include "/usr/local/sonic/frrcfgd/staticd.conf.j2" %}
+{% else %}
+    {% include "/usr/share/sonic/templates/staticd/staticd.conf.j2" %}
+{% endif %}
diff --git a/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2 b/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
new file mode 100644
index 000000000000..9a90a5c94eb8
--- /dev/null
+++ b/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
@@ -0,0 +1,12 @@
+program:zebra
+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:bfdd
+program:ospfd
+program:pimd
+program:frrcfgd
+{% else %}
+program:bgpcfgd
+{% endif %}
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index e71d6fa71323..dc52bd1b5336 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -50,6 +50,20 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=zebra:running
 
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+[program:bfdd]
+command=/usr/lib/frr/bfdd -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
+{% endif %}
+
 [program:bgpd]
 command=/usr/bin/bgpd.sh -A 127.0.0.1 -M snmp
 priority=5
@@ -62,6 +76,32 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=zebra:running
 
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+[program:ospfd]
+command=/usr/lib/frr/ospfd -A 127.0.0.1 -M snmp
+priority=5
+stopsignal=KILL
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=zebra:running
+
+[program:pimd]
+command=/usr/lib/frr/pimd -A 127.0.0.1
+priority=5
+stopsignal=KILL
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=zebra:running
+{% endif %}
+
 [program:fpmsyncd]
 command=fpmsyncd
 priority=6
@@ -73,8 +113,13 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=bgpd:running
 
+{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
+[program:frrcfgd]
+command=/usr/local/bin/frrcfgd
+{% else %}
 [program:bgpcfgd]
 command=/usr/local/bin/bgpcfgd
+{% endif %}
 priority=6
 autostart=false
 autorestart=false
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index e6473ef5eeef..d4aace307a19 100644
--- a/rules/docker-fpm-frr.mk
+++ b/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) $(LIBYANG1)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
diff --git a/rules/sonic-frr-mgmt-framework.dep b/rules/sonic-frr-mgmt-framework.dep
new file mode 100644
index 000000000000..318c4edd1da8
--- /dev/null
+++ b/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)
diff --git a/rules/sonic-frr-mgmt-framework.mk b/rules/sonic-frr-mgmt-framework.mk
new file mode 100644
index 000000000000..dfe981b440a9
--- /dev/null
+++ b/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)
diff --git a/src/sonic-frr-mgmt-framework/.gitignore b/src/sonic-frr-mgmt-framework/.gitignore
new file mode 100644
index 000000000000..f6411e4ee01e
--- /dev/null
+++ b/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*
diff --git a/src/sonic-frr-mgmt-framework/frrcfgd/__init__.py b/src/sonic-frr-mgmt-framework/frrcfgd/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-frr-mgmt-framework/frrcfgd/frrcfgd.py b/src/sonic-frr-mgmt-framework/frrcfgd/frrcfgd.py
new file mode 100755
index 000000000000..e3b8c3f264c8
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/frrcfgd/frrcfgd.py
@@ -0,0 +1,3795 @@
+#!/usr/bin/env python
+
+import copy
+import subprocess
+import time
+import syslog
+import os
+from swsssdk import ConfigDBConnector
+import socket
+import threading
+import queue
+import signal
+import re
+import logging
+import netaddr
+import io
+import struct
+
+class CachedDataWithOp:
+    OP_NONE = 0
+    OP_ADD = 1
+    OP_DELETE = 2
+    OP_UPDATE = 3
+
+    STAT_SUCC = 0
+    STAT_FAIL = 1
+
+    def __init__(self, data = None, op = OP_NONE):
+        self.data = data
+        self.op = op
+        self.status = self.STAT_FAIL
+
+    def __repr__(self):
+        op_str = ''
+        if self.op == self.OP_NONE:
+            op_str = 'NONE'
+        elif self.op == self.OP_ADD:
+            op_str = 'ADD'
+        elif self.op == self.OP_DELETE:
+            op_str = 'DELETE'
+        elif self.op == self.OP_UPDATE:
+            op_str = 'UPDATE'
+        return '(%s, %s)' % (self.data, op_str)
+
+bgpd_client = None
+
+def g_run_command(table, command, use_bgpd_client, daemons, ignore_fail = False):
+    syslog.syslog(syslog.LOG_DEBUG, "execute command {} for table {}.".format(command, table))
+    if not command.startswith('vtysh '):
+        use_bgpd_client = False
+    if use_bgpd_client:
+        if not bgpd_client.run_vtysh_command(table, command, daemons) and not ignore_fail:
+            syslog.syslog(syslog.LOG_ERR, 'command execution failure. Command: "{}"'.format(command))
+            return False
+    else:
+        p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
+        stdout = p.communicate()[0]
+        p.wait()
+        if p.returncode != 0 and not ignore_fail:
+            syslog.syslog(syslog.LOG_ERR, '[bgp cfgd] command execution returned {}. Command: "{}", stdout: "{}"'.\
+                            format(p.returncode, command, stdout))
+            return False
+    return True
+
+def extract_cmd_daemons(cmd_str):
+    # daemon list could be given within brackets at head of input lines
+    dm_mark = re.match(r'\[(?P<daemons>.+)\]', cmd_str)
+    if dm_mark is not None and 'daemons' in dm_mark.groupdict():
+        cmd_str = cmd_str[dm_mark.end():]
+        daemons = dm_mark.groupdict()['daemons'].split(',')
+    else:
+        daemons = None
+    return (daemons, cmd_str)
+
+class BgpdClientMgr(threading.Thread):
+    VTYSH_MARK = 'vtysh '
+    PROXY_SERVER_ADDR = '/etc/frr/bgpd_client_sock'
+    ALL_DAEMONS = ['bgpd', 'zebra', 'staticd', 'bfdd', 'ospfd', 'pimd']
+    TABLE_DAEMON = {
+            'DEVICE_METADATA': ['bgpd'],
+            'BGP_GLOBALS': ['bgpd'],
+            'BGP_GLOBALS_AF': ['bgpd'],
+            'PREFIX_SET': ['bgpd'],
+            'COMMUNITY_SET': ['bgpd'],
+            'EXTENDED_COMMUNITY_SET': ['bgpd'],
+            'ROUTE_MAP': ['zebra', 'bgpd', 'ospfd'],
+            'PREFIX': ['zebra', 'bgpd', 'ospfd', 'pimd'],
+            'BGP_PEER_GROUP': ['bgpd'],
+            'BGP_NEIGHBOR': ['bgpd'],
+            'BGP_PEER_GROUP_AF': ['bgpd'],
+            'BGP_NEIGHBOR_AF': ['bgpd'],
+            'BGP_GLOBALS_LISTEN_PREFIX': ['bgpd'],
+            'NEIGHBOR_SET': ['bgpd'],
+            'NEXTHOP_SET': ['bgpd'],
+            'TAG_SET': ['bgpd'],
+            'AS_PATH_SET': ['bgpd'],
+            'ROUTE_REDISTRIBUTE': ['bgpd'],
+            'BGP_GLOBALS_AF_AGGREGATE_ADDR': ['bgpd'],
+            'BGP_GLOBALS_AF_NETWORK': ['bgpd'],
+            'VRF': ['zebra'],
+            'BGP_GLOBALS_EVPN_VNI': ['bgpd'],
+            'BGP_GLOBALS_EVPN_RT': ['bgpd'],
+            'BGP_GLOBALS_EVPN_VNI_RT': ['bgpd'],
+            'BFD_PEER': ['bfdd'],
+            'BFD_PEER_SINGLE_HOP': ['bfdd'],
+            'BFD_PEER_MULTI_HOP': ['bfdd'],
+            'IP_SLA': ['iptrackd'],
+            'OSPFV2_ROUTER': ['ospfd'],
+            'OSPFV2_ROUTER_AREA': ['ospfd'],
+            'OSPFV2_ROUTER_AREA_VIRTUAL_LINK': ['ospfd'],
+            'OSPFV2_ROUTER_AREA_NETWORK': ['ospfd'],
+            'OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE': ['ospfd'],
+            'OSPFV2_ROUTER_DISTRIBUTE_ROUTE': ['ospfd'],
+            'OSPFV2_INTERFACE': ['ospfd'],
+            'OSPFV2_ROUTER_PASSIVE_INTERFACE': ['ospfd'],
+            'STATIC_ROUTE': ['staticd'],
+            'PIM_GLOBALS': ['pimd'],
+            'PIM_INTERFACE': ['pimd'],
+            'IGMP_INTERFACE': ['pimd'],
+            'IGMP_INTERFACE_QUERY': ['pimd'],
+    }
+    VTYSH_CMD_DAEMON = [(r'show (ip|ipv6) route($|\s+\S+)', ['zebra']),
+                        (r'show ip mroute($|\s+\S+)', ['pimd']),
+                        (r'show bfd($|\s+\S+)', ['bfdd']),
+                        (r'clear bfd($|\s+\S+)', ['bfdd']),
+                        (r'clear ip mroute($|\s+\S+)', ['pimd']),
+                        (r'clear ip pim($|\s+\S+)', ['pimd']),
+                        (r'show ip ospf($|\s+\S+)', ['ospfd']),
+                        (r'show ip pim($|\s+\S+)', ['pimd']),
+                        (r'show ip igmp($|\s+\S+)', ['pimd']),
+                        (r'clear ip ospf($|\s+\S+)', ['ospfd']),
+                        (r'show ip sla($|\s+\S+)', ['iptrackd']),
+                        (r'clear ip sla($|\s+\S+)', ['iptrackd']),
+                        (r'clear ip igmp($|\s+\S+)', ['pimd']),
+                        (r'.*', ['bgpd'])]
+    @staticmethod
+    def __create_proxy_socket():
+        try:
+            os.unlink(BgpdClientMgr.PROXY_SERVER_ADDR)
+        except OSError:
+            if os.path.exists(BgpdClientMgr.PROXY_SERVER_ADDR):
+                raise
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        sock.bind(BgpdClientMgr.PROXY_SERVER_ADDR)
+        sock.listen(1)
+        return sock
+    @staticmethod
+    def __get_reply(sock):
+        reply_msg = None
+        ret_code = None
+        msg_buf = io.StringIO()
+        while True:
+            try:
+                rd_msg = sock.recv(16384)
+                msg_buf.write(rd_msg.decode())
+            except socket.timeout:
+                syslog.syslog(syslog.LOG_ERR, 'socket reading timeout')
+                break
+            if len(rd_msg) < 4:
+                rd_msg = msg_buf.getvalue()
+                if len(rd_msg) < 4:
+                    continue
+            msg_tail = rd_msg[-4:]
+            if isinstance(msg_tail, str):
+                msg_tail = bytes(msg_tail, 'utf-8')
+            if msg_tail[0] == 0 and msg_tail[1] == 0 and msg_tail[2] == 0:
+                ret_code = msg_tail[3]
+                reply_msg = msg_buf.getvalue()[:-4]
+                break
+        msg_buf.close()
+        return (ret_code, reply_msg)
+    @staticmethod
+    def __send_data(sock, data):
+        if isinstance(data, str):
+            data = bytes(data, 'utf-8')
+        sock.sendall(data)
+    def __create_frr_client(self):
+        self.client_socks = {}
+        for daemon in self.ALL_DAEMONS:
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            serv_addr = '/run/frr/%s.vty' % daemon
+            retry_cnt = 0
+            while True:
+                try:
+                    sock.connect(serv_addr)
+                    break
+                except socket.error as msg:
+                    syslog.syslog(syslog.LOG_ERR, 'failed to connect to frr daemon %s: %s' % (daemon, msg))
+                    retry_cnt += 1
+                    if retry_cnt > 100 or not main_loop:
+                        syslog.syslog(syslog.LOG_ERR, 're-tried too many times, give up')
+                        for _, sock in self.client_socks.items():
+                            sock.close()
+                        return False
+                    time.sleep(2)
+                    continue
+            sock.settimeout(120)
+            self.client_socks[daemon] = sock
+        for daemon, sock in self.client_socks.items():
+            syslog.syslog(syslog.LOG_DEBUG, 'send initial enable command to %s' % daemon)
+            try:
+                self.__send_data(sock, 'enable\0')
+            except socket.error as msg:
+                syslog.syslog(syslog.LOG_ERR, 'failed to send initial enable command to %s' % daemon)
+                return False
+            ret_code, reply = self.__get_reply(sock)
+            if ret_code is None:
+                syslog.syslog(syslog.LOG_ERR, 'failed to get command response for enable command from %s' % daemon)
+                return False
+            if ret_code != 0:
+                syslog.syslog(syslog.LOG_ERR, 'enable command failed: ret_code=%d' % ret_code)
+                syslog.syslog(syslog.LOG_ERR, reply)
+                return False
+        return True
+    def __init__(self):
+        super(BgpdClientMgr, self).__init__(name = 'VTYSH sub-process manager')
+        if not self.__create_frr_client():
+            syslog.syslog(syslog.LOG_ERR, 'failed to create socket to FRR daemon')
+            raise RuntimeError('connect to FRR daemon failed')
+        self.proxy_running = True
+        self.lock = threading.Lock()
+        self.proxy_sock = self.__create_proxy_socket()
+        self.cmd_to_daemon = []
+        for pat, daemons in self.VTYSH_CMD_DAEMON:
+            try:
+                self.cmd_to_daemon.append((re.compile(pat), daemons))
+            except Exception:
+                syslog.syslog(syslog.LOG_ERR, 'invalid regex format: %s' % pat)
+                continue
+    def __get_cmd_daemons(self, cmd_list):
+        cmn_daemons = None
+        for cmd in cmd_list:
+            found = False
+            for re_comp, daemons in self.cmd_to_daemon:
+                if re_comp.match(cmd.strip()) is not None:
+                    found = True
+                    break
+            if not found:
+                syslog.syslog(syslog.LOG_ERR, 'no matched daemons found for command %s' % cmd)
+                return None
+            if cmn_daemons is None:
+                cmn_daemons = set(daemons)
+            else:
+                cmn_daemons = cmn_daemons.intersection(set(daemons))
+                if len(cmn_daemons) == 0:
+                    return []
+        return list(cmn_daemons)
+    def __proc_command(self, command, daemons):
+        syslog.syslog(syslog.LOG_DEBUG, 'VTYSH CMD: %s daemons: %s' % (command, daemons))
+        resp = ''
+        ret_val = False
+        for daemon in daemons:
+            sock = self.client_socks.get(daemon, None)
+            if sock is None:
+                syslog.syslog(syslog.LOG_ERR, 'daemon %s is not connected' % daemon)
+                continue
+            try:
+                self.__send_data(sock, command + '\0')
+            except socket.error as msg:
+                syslog.syslog(syslog.LOG_ERR, 'failed to send command to frr daemon: %s' % msg)
+                return (False, None)
+            ret_code, reply = self.__get_reply(sock)
+            if ret_code is None or ret_code != 0:
+                if ret_code is None:
+                    syslog.syslog(syslog.LOG_ERR, 'failed to get reply from frr daemon')
+                    continue
+                else:
+                    syslog.syslog(syslog.LOG_DEBUG, '[%s] command return code: %d' % (daemon, ret_code))
+                    syslog.syslog(syslog.LOG_DEBUG, reply)
+            else:
+                # command is running successfully by at least one daemon
+                ret_val = True
+            resp += reply
+        return (ret_val, resp)
+    def run_vtysh_command(self, table, command, daemons):
+        if not command.startswith(self.VTYSH_MARK):
+            syslog.syslog(syslog.LOG_ERR, 'command %s is not for vtysh config' % command)
+            return False
+        cmd_line = command[len(self.VTYSH_MARK):]
+        cmd_list = re.findall(r"-c\s+'([^']+)'\s*", cmd_line)
+        cmd_list.append('end')
+        if daemons is None:
+            daemons = self.TABLE_DAEMON.get(table, None)
+        if daemons is None:
+            daemons = self.__get_cmd_daemons(cmd_list)
+        if daemons is None or len(daemons) == 0:
+            syslog.syslog(syslog.LOG_ERR, 'no common daemon list found for given commands')
+            return False
+        ret_val = True
+        with self.lock:
+            for cmd in cmd_list:
+                succ, _ = self.__proc_command(cmd.strip(), daemons)
+                if not succ:
+                    ret_val = False
+        return ret_val
+    @staticmethod
+    def __read_all(sock, data_len):
+        in_buf = io.StringIO()
+        left_len = data_len
+        while left_len > 0:
+            data = sock.recv(left_len)
+            if data is None:
+                break
+            in_buf.write(data)
+            left_len -= len(data)
+        return in_buf.getvalue()
+    def shutdown(self):
+        syslog.syslog(syslog.LOG_DEBUG, 'terminate bgpd client manager')
+        if self.is_alive():
+            self.proxy_running = False
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            try:
+                sock.connect(self.PROXY_SERVER_ADDR)
+            finally:
+                sock.close()
+            self.join()
+        for _, sock in self.client_socks.items():
+            sock.close()
+    def run(self):
+        syslog.syslog(syslog.LOG_DEBUG, 'entering VTYSH proxy thread')
+        while self.proxy_running:
+            syslog.syslog(syslog.LOG_DEBUG, 'waiting for client connection ...')
+            conn_sock, clnt_addr = self.proxy_sock.accept()
+            if not self.proxy_running:
+                conn_sock.close()
+                break
+            try:
+                syslog.syslog(syslog.LOG_DEBUG, 'client connection from %s' % clnt_addr)
+                data = self.__read_all(conn_sock, 4)
+                if len(data) == 4:
+                    data_len = struct.unpack('>I', data)[0]
+                    in_cmd = self.__read_all(conn_sock, data_len)
+                    if len(in_cmd) == data_len:
+                        daemons, in_cmd = extract_cmd_daemons(in_cmd)
+                        in_lines = in_cmd.splitlines()
+                        if daemons is None:
+                            daemons = self.__get_cmd_daemons(in_lines)
+                        if daemons is not None and len(daemons) > 0:
+                            with self.lock:
+                                for line in in_lines:
+                                    _, reply = self.__proc_command(line.strip(), daemons)
+                                    if reply is not None:
+                                        self.__send_data(conn_sock, reply)
+                                    else:
+                                        syslog.syslog(syslog.LOG_ERR, 'failed running VTYSH command')
+                        else:
+                            syslog.syslog(syslog.LOG_ERR, 'could not find common daemons for input commands')
+                    else:
+                        syslog.syslog(syslog.LOG_ERR, 'read data of length %d is not expected length %d' % (data_len, len(in_cmd)))
+                else:
+                    syslog.syslog(syslog.LOG_ERR, 'invalid data length %d' % len(data))
+            except socket.error as msg:
+                syslog.syslog(syslog.LOG_ERR, 'socket writing failed: %s' % msg)
+            finally:
+                syslog.syslog(syslog.LOG_DEBUG, 'closing data socket from client')
+                conn_sock.close()
+        syslog.syslog(syslog.LOG_DEBUG, 'leaving VTYSH proxy thread')
+class BGPPeerGroup:
+    def __init__(self, vrf):
+        self.vrf = vrf
+        self.ref_nbrs = set()
+
+def get_command_cmn(daemon, cmd_str, op, st_idx, vals, bool_values):
+    chk_val = None
+    if op == CachedDataWithOp.OP_DELETE:
+        if bool_values is not None and len(bool_values) >= 3:
+            # set to default if given
+            cmd_enable = bool_values[2]
+        else:
+            cmd_enable = False
+    else:
+        cmd_enable = True
+        if bool_values is not None:
+            if len(vals) <= st_idx:
+                syslog.syslog(syslog.LOG_ERR, 'No bool token of index %d for running cmd: %s' % (st_idx, cmd_str))
+                return None
+            chk_val = vals[st_idx]
+            if type(chk_val) is dict:
+                cmd_enable = False
+                for _, v in chk_val.items():
+                    if not v[1]:
+                        continue
+                    if v[0] == bool_values[0]:
+                        cmd_enable = True
+                        break
+            else:
+                if chk_val == bool_values[0]:
+                    cmd_enable = True
+                elif chk_val == bool_values[1]:
+                    cmd_enable = False
+                else:
+                    syslog.syslog(syslog.LOG_ERR, 'Input token %s is neither %s or %s for cmd: %s' %
+                                              (chk_val, bool_values[0], bool_values[1], cmd_str))
+                    return None
+        else:
+            cmd_enable = True
+    cmd_args = []
+    for idx in range(len(vals)):
+        if bool_values is not None and idx == st_idx:
+            continue
+        cmd_args.append(CommandArgument(daemon, cmd_enable, vals[idx]))
+    return [cmd_str.format(*cmd_args, no = CommandArgument(daemon, cmd_enable))]
+
+def hdl_set_extcomm(daemon, cmd_str, op, st_idx, args, is_inline):
+    if is_inline:
+        if type(args[0]) is list:
+            com_list = args[0]
+        else:
+            com_list = [args[0]]
+    else:
+        com_set = daemon.extcomm_set_list.get(args[0], None)
+        if com_set is None or not com_set.is_configurable():
+            syslog.syslog(syslog.LOG_ERR, 'extended community set %s not found or configured' % args[0])
+            return None
+        com_list = com_set.mbr_list
+    rt_cnt = soo_cnt = 0
+    for comm in com_list:
+        if comm.startswith(CommunityList.RT_TYPE_MARK):
+            rt_cnt += 1
+        elif comm.startswith(CommunityList.SOO_TYPE_MARK):
+            soo_cnt += 1
+    cmd_list = []
+    if op != CachedDataWithOp.OP_DELETE:
+        for comm_type in ['rt', 'soo']:
+            cmd_list.append(('no set extcommunity %s' % comm_type, True))
+    if rt_cnt > 0:
+        new_args = ((args[0], True),) + args[1:]
+        cmd_list += get_command_cmn(daemon, cmd_str, op, st_idx, new_args, None)
+    if soo_cnt > 0:
+        new_args = ((args[0], False),) + args[1:]
+        cmd_list += get_command_cmn(daemon, cmd_str, op, st_idx, new_args, None)
+    return cmd_list
+
+def hdl_set_asn(daemon, cmd_str, op, st_idx, args, data):
+    if 0 not in args[0]:
+        return None
+    if op == CachedDataWithOp.OP_DELETE:
+        if args[0][0][1]:
+            args[0][1] = ('0', True)
+        else:
+            args[0].pop(1, None)
+            op = CachedDataWithOp.OP_UPDATE
+    return get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+
+def hdl_set_asn_list(daemon, cmd_str, op, st_idx, args, data):
+    if op == CachedDataWithOp.OP_DELETE:
+        args = ('',)
+    return get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+
+def hdl_set_pim_hello_parms (daemon, cmd_str, op, st_idx, args, data):
+    if op == CachedDataWithOp.OP_DELETE:
+        args = ('',)
+    return get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+
+def handle_rmap_set_metric(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_rmap_set_metric cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    arg_len = len(args)
+    metric_action = args[0] if arg_len >= 1  else ''
+    metric_value = args[1] if arg_len >= 2  else ''
+    med_value = args[2] if arg_len >= 3  else ''
+    metric_param = ''
+
+    if metric_action != '' :
+        if metric_value != '' :
+            if metric_action == 'METRIC_SET_VALUE' :
+                metric_param = "{}".format(metric_value)
+            elif metric_action == 'METRIC_ADD_VALUE' :
+                metric_param = "+{}".format(metric_value)
+            elif metric_action == 'METRIC_SUBTRACT_VALUE' :
+                metric_param = "-{}".format(metric_value)
+        if metric_action == 'METRIC_SET_RTT' :
+            metric_param = "rtt"
+        elif metric_action == 'METRIC_ADD_RTT' :
+            metric_param = "+rtt"
+        elif metric_action == 'METRIC_SUBTRACT_RTT' :
+            metric_param = "-rtt"
+
+    if metric_param == '' and med_value != '' :
+        metric_param = "{}".format(med_value)
+
+    if op == CachedDataWithOp.OP_DELETE :
+        metric_param = ''
+    else :
+        if metric_param == '' :
+            syslog.syslog(syslog.LOG_ERR, 'handle_rmap_set_metric not set for {}'.format(args))
+            return None
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, metric_param)))
+    return cmd_list
+
+class BGPKeyMapInfo:
+    def __init__(self, cmd_str, hdlr, data):
+        self.daemons, self.run_cmd = extract_cmd_daemons(cmd_str)
+        if hdlr is None:
+            self.hdl_func = get_command_cmn
+        else:
+            self.hdl_func = hdlr
+        self.data = data
+    def same_daemons(self, other):
+        dset = lambda d: set() if d is None else set(d)
+        return dset(self.daemons) == dset(other.daemons)
+    def __eq__(self, other):
+        return self.same_daemons(other) and self.run_cmd == other.run_cmd
+    def __ne__(self, other):
+        return not self.same_daemons(other) or self.run_cmd != other.run_cmd
+    def __hash__(self):
+        return hash(self.run_cmd)
+    def get_command(self, daemon, op, st_idx, *vals):
+        return self.hdl_func(daemon, self.run_cmd, op, st_idx, vals, self.data)
+    def __str__(self):
+        ret_str = '[CMD: %s' % self.run_cmd
+        if self.hdl_func == get_command_cmn and self.data is not None:
+            ret_str += ' BOOL: %s/%s' % (self.data[0], self.data[1])
+            if len(self.data) >= 3:
+                ret_str += ' DFT: %s' % self.data[2]
+        ret_str += ']'
+        return ret_str
+        
+class BGPKeyMapList(list):
+    def __init__(self, key_map_list, table_name, table_key = None):
+        super(BGPKeyMapList, self).__init__()
+        self.table_name = table_name
+        self.table_key = table_key
+        for key_map in key_map_list:
+            if len(key_map) < 2:
+                continue
+            db_field = key_map[0]
+            cmd_str = key_map[1]
+            hdl_data = None
+            hdl_func = None
+            if len(key_map) >= 3:
+                if callable(key_map[2]):
+                    hdl_func = key_map[2]
+                    if len(key_map) >= 4:
+                        hdl_data = key_map[3]
+                else:
+                    if len(key_map[2]) < 2:
+                        continue
+                    hdl_data = key_map[2]
+            fld_name, fld_key = self.get_map_field_key(db_field)
+            if fld_name is not None:
+                if table_key is not None and fld_name in table_key and table_key[fld_name] != fld_key:
+                    continue
+                if type(db_field) is str:
+                    db_field = fld_name
+                elif type(db_field) is list:
+                    db_field = copy.copy(db_field)
+                    try:
+                        idx = db_field.index('|'.join([fld_name, fld_key]))
+                        db_field[idx] = fld_name
+                    except ValueError:
+                        pass
+            super(BGPKeyMapList, self).append((db_field, BGPKeyMapInfo(cmd_str, hdl_func, hdl_data)))
+    def __eq__(self, other):
+        return super(BGPKeyMapList, self).__eq__(other) and self.table_name == other.table_name and self.table_key == other.table_key
+    def __ne__(self, other):
+        return super(BGPKeyMapList, self).__ne__(other) or self.table_name != other.table_name or self.table_key != other.table_key
+    @staticmethod
+    def get_map_field_key(field):
+        if type(field) is str:
+            field = [field]
+        elif type(field) is not list:
+            return (None, None)
+        for idx in range(len(field)):
+            tokens = field[idx].split('|', 1)
+            if len(tokens) == 2:
+                return tokens
+        return (None, None)
+    @staticmethod
+    def get_cmd_data(key_list, req_idx_list, opt_idx_list, data, chg_list, no_chg_list, merge_data, is_del):
+        for idx in req_idx_list:
+            if idx not in chg_list and idx not in no_chg_list:
+                syslog.syslog(syslog.LOG_DEBUG, 'mandatory key %s of idx %d not found in list' % (key_list[idx], idx))
+                return None
+        if merge_data:
+            op = CachedDataWithOp.OP_DELETE if is_del else CachedDataWithOp.OP_UPDATE
+            cmd_data = {}
+            for idx in chg_list:
+                key = key_list[idx]
+                cmd_data[idx] = (data[key].data, True)
+            for idx in no_chg_list:
+                key = key_list[idx]
+                cmd_data[idx] = (data[key].data, False)
+            return ((cmd_data,), op)
+        else:
+            min_id = lambda id_set: None if len(id_set) == 0 else sorted(list(id_set))[0]
+            min_chg_id = min_id(chg_list)
+            if min_chg_id is None:
+                min_id_chged = False
+            else:
+                if min_chg_id in opt_idx_list:
+                    min_id_chged = len(no_chg_list) == 0
+                else:
+                    min_unchg_id = min_id(no_chg_list)
+                    min_id_chged = min_unchg_id is None or min_chg_id < min_unchg_id
+            op = CachedDataWithOp.OP_DELETE if is_del and min_id_chged else CachedDataWithOp.OP_UPDATE
+            cmd_data = []
+            for idx in range(len(key_list)):
+                if (((not is_del or op == CachedDataWithOp.OP_DELETE) and (idx in chg_list or idx in no_chg_list)) or
+                    (is_del and op == CachedDataWithOp.OP_UPDATE and idx in no_chg_list)):
+                    cmd_data.append(data[key_list[idx]].data)
+                else:
+                    if idx in opt_idx_list:
+                        cmd_data.append('')
+                        continue
+                    else:
+                        # stop adding following tokens
+                        break
+            if len(cmd_data) == 0:
+                return None
+            idx = len(cmd_data)
+            while idx < len(key_list):
+                cmd_data.append('')
+                idx += 1
+            return (tuple(cmd_data), op)
+    @staticmethod
+    def is_cmd_covered(src_cmd, dst_cmd):
+        src_tks = src_cmd.split()
+        dst_tks = dst_cmd.split()
+        if len(src_tks) >= len(dst_tks):
+            return False
+        for idx in range(len(src_tks)):
+            if src_tks[idx] != dst_tks[idx]:
+                return False
+        return True
+    @staticmethod
+    def is_cmd_list_covered(src_list, dst_list):
+        if len(src_list) == 0:
+            return True
+        if len(src_list) > len(dst_list):
+            return False
+        for idx in range(len(src_list)):
+            if not BGPKeyMapList.is_cmd_covered(src_list[idx], dst_list[idx]):
+                return False
+        return True
+    def run_command(self, daemon, table, data, prefix_list=None, *upper_vals):
+        start_idx = len(upper_vals)
+        ret_val = False
+        run_cmd_cnt = 0
+        for db_field, key_map in self:
+            merge_vals = False
+            if type(db_field) is not list and type(db_field) is not tuple:
+                db_field = [db_field]
+            elif type(db_field) is tuple:
+                db_field = list(db_field)
+                merge_vals = True
+
+            idx = 0
+            req_idx_list = []
+            key_list_list = []
+            opt_idx_list = set()
+            run_cmd = True
+            for dkey in db_field:
+                optional = False
+                if len(dkey) > 0 and dkey[0] == '+':
+                    if len(dkey) > 1 and dkey[1] == '+':
+                        opt_idx_list.add(idx)
+                        dkey = dkey[2:]
+                    else:
+                        dkey = dkey[1:]
+                    optional = True
+                else:
+                    req_idx_list.append(idx)
+                key_list = []
+                for k in dkey.split('&'):
+                    if k in data and isinstance(data[k], CachedDataWithOp):
+                        key_list.append(k)
+                if not optional and len(key_list) == 0:
+                    run_cmd = False
+                    break
+                if len(key_list) == 0:
+                    if len(key_list_list) == 0:
+                        key_list_list.append([None])
+                    else:
+                        for k_lst in key_list_list:
+                            k_lst.append(None)
+                else:
+                    new_list = []
+                    if len(key_list_list) == 0:
+                        for k in key_list:
+                            key_list_list.append([k])
+                    else:
+                        for k_lst in key_list_list:
+                            if len(key_list) == 1:
+                                k_lst.append(key_list[0])
+                            else:
+                                for k in key_list:
+                                    new_list.append(k_lst + [k])
+                    if len(new_list) > 0:
+                        key_list_list = new_list
+                idx += 1
+            if not run_cmd:
+                continue
+
+            cmd_list_list = []
+            for key_list in key_list_list:
+                upd_id_list = set()
+                del_id_list = set()
+                no_chg_id_list = set()
+                idx = 0
+                for dkey in key_list:
+                    if dkey is not None:
+                        dval = data[dkey]
+                        if dval.op == CachedDataWithOp.OP_NONE:
+                            no_chg_id_list.add(idx)
+                        elif dval.op == CachedDataWithOp.OP_ADD or dval.op == CachedDataWithOp.OP_UPDATE:
+                            upd_id_list.add(idx)
+                        elif dval.op == CachedDataWithOp.OP_DELETE:
+                            del_id_list.add(idx)
+                    idx += 1
+                cmd_list = []
+                if len(del_id_list) > 0:
+                    data_val_op = self.get_cmd_data(key_list, req_idx_list, opt_idx_list, data, del_id_list, no_chg_id_list, merge_vals, True)
+                    if data_val_op is not None:
+                        cmd = key_map.get_command(daemon, data_val_op[1], start_idx, *(upper_vals + data_val_op[0]))
+                        if cmd is not None:
+                            cmd_list += cmd
+                        else:
+                            syslog.syslog(syslog.LOG_ERR, 'failed to get del cmd from value: %s' % data_val_op[0])
+                if len(upd_id_list) > 0:
+                    data_val_op = self.get_cmd_data(key_list, req_idx_list, opt_idx_list, data, upd_id_list, no_chg_id_list, merge_vals, False)
+                    if data_val_op is not None:
+                        cmd = key_map.get_command(daemon, data_val_op[1], start_idx, *(upper_vals + data_val_op[0]))
+                        if cmd is not None:
+                            cmd_list += cmd
+                        else:
+                            syslog.syslog(syslog.LOG_ERR, 'failed to get upd cmd from value: %s' % str(data_val_op[0]))
+                if len(cmd_list) > 0:
+                    cmd_list_list.append(cmd_list)
+            cmd_list = []
+            for chk_list in cmd_list_list:
+               if self.is_cmd_list_covered(cmd_list, chk_list):
+                   cmd_list = chk_list
+            failed = False
+            if len(cmd_list) > 0:
+                run_cmd_cnt += 1
+                cmd_prefix = 'vtysh '
+                for pfx in prefix_list:
+                    cmd_prefix += "-c '%s' " % pfx
+                for cmd in cmd_list:
+                    ignore_fail = False
+                    if type(cmd) is tuple:
+                        cmd, ignore_fail = cmd
+                    if not g_run_command(table, cmd_prefix + "-c '%s'" % cmd, True, key_map.daemons, ignore_fail):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running FRR command: %s' % cmd)
+                        failed = True
+                        break
+                if not failed:
+                    ret_val = True
+            if not failed:
+                for key_list in key_list_list:
+                    for dkey in key_list:
+                        if dkey in data:
+                            data[dkey].status = CachedDataWithOp.STAT_SUCC
+        if run_cmd_cnt == 0:
+            return True
+        return ret_val
+
+class CommandArgument(object):
+    def __init__(self, daemon, enabled, val = None):
+        self.daemon = daemon
+        self.enabled = enabled
+        self.value = val
+        self.tolower = False
+    def to_str(self):
+        if type(self.value) is list or type(self.value) is tuple:
+            ret_val = ' '.join([v for v in self.value])
+        elif type(self.value) is dict:
+            id_list = self.value.keys()
+            id_list.sort()
+            ret_val = ' '.join([self.value[i][0] for i in id_list])
+        else:
+            ret_val = str(self.value)
+        if self.tolower:
+            ret_val = ret_val.lower()
+        return ret_val
+    @staticmethod
+    def parse_ext_community(com_str, is_rt = None):
+        if com_str.startswith(CommunityList.RT_TYPE_MARK):
+            com_str = com_str[len(CommunityList.RT_TYPE_MARK):]
+            if is_rt is None:
+                return 'rt %s' % com_str
+            else:
+                return (com_str if is_rt else None)
+        elif com_str.startswith(CommunityList.SOO_TYPE_MARK):
+            com_str = com_str[len(CommunityList.SOO_TYPE_MARK):]
+            if is_rt is None:
+                return 'soo %s' % com_str
+            else:
+                return (None if is_rt else com_str)
+        return None
+    def __format__(self, format):
+        bool_format = {'allow-as-in': 'origin',
+                       'match-clust-len': 'equal-cluster-length',
+                       'network-backdoor': 'backdoor',
+                       'aggr-as-set': 'as-set',
+                       'aggr-summary-only': 'summary-only',
+                       'uchg-as-path': 'as-path',
+                       'uchg-med': 'med',
+                       'uchg-nh': 'next-hop',
+                       'rm-as-all': 'all',
+                       'rm-as-repl': 'replace-AS',
+                       'mp-as-set': ('as-set', 'no-as-set'),
+                       'no-prepend': 'no-prepend',
+                       'replace-as': 'replace-as',
+                       'blackhole': 'blackhole'
+        }
+        if format == 'no-prefix':
+            return 'no ' if not self.enabled else ''
+        elif format == 'enable-only' and not self.enabled:
+            return ''
+        elif format == 'com-ref':
+            com_set = self.daemon.comm_set_list.get(self.value, None)
+            if com_set is not None and com_set.is_configurable():
+                return ' '.join(com_set.mbr_list)
+        elif format == 'ext-com-list':
+            if type(self.value) is tuple:
+                com_val, is_rt = self.value
+            else:
+                com_val = self.value
+                is_rt = None
+            if type(com_val) is list:
+                com_list = com_val
+            else:
+                com_list = [com_val]
+            frr_com_list = []
+            for comm in com_list:
+                frr_comm = self.parse_ext_community(comm, is_rt)
+                if frr_comm is not None:
+                    frr_com_list.append(frr_comm)
+            if is_rt is None:
+                return ' '.join(frr_com_list)
+            else:
+                return ('rt ' if is_rt else 'soo ') + ' '.join(frr_com_list)
+        elif format == 'ext-com-ref':
+            com_set_name, is_rt = self.value
+            com_set = self.daemon.extcomm_set_list.get(com_set_name, None)
+            if com_set is not None and com_set.is_configurable():
+                frr_com_list = []
+                for comm in com_set.mbr_list:
+                    frr_comm = self.parse_ext_community(comm, is_rt)
+                    if frr_comm is not None:
+                        frr_com_list.append(frr_comm)
+                return ('rt ' if is_rt else 'soo ') + ' '.join(frr_com_list)
+        elif format == 'repeat' and type(self.value) is dict:
+            if 1 in self.value:
+                rep_cnt = int(self.value[1][0])
+            else:
+                rep_cnt = 1
+            if 0 in self.value:
+                return ' '.join([self.value[0][0]] * rep_cnt)
+        elif format == 'neighbor-set':
+            ret_val = BGPConfigDaemon.get_prefix_set_name(self.value, 'NEIGHBOR_SET')
+            return ret_val
+        elif format == 'nexthop-set':
+            ret_val = BGPConfigDaemon.get_prefix_set_name(self.value, 'NEXTHOP_SET')
+            return ret_val
+        elif format == 'peer-ip':
+            if type(self.value) is list and len(self.value) > 0:
+                return self.value[0]
+            else:
+                return self.value
+        elif format == 'tx-add-paths':
+            if self.value == 'tx_all_paths':
+                return 'addpath-tx-all-paths'
+            elif self.value == 'tx_best_path_per_as':
+                return 'addpath-tx-bestpath-per-AS'
+        elif format == 'shutdown-msg':
+            if len(self.value) > 0:
+                self.value = 'message %s' % self.value
+        elif format == 'default-rmap':
+            if len(self.value) > 0:
+                self.value = 'route-map %s' % self.value
+        elif format in bool_format:
+            false_val = ''
+            if type(bool_format[format]) is tuple:
+                if len(bool_format[format]) == 2:
+                    true_val, false_val = bool_format[format]
+                else:
+                    true_val = bool_format[format][0]
+            else:
+                true_val = bool_format[format]
+            if self.value == 'true':
+                self.value = true_val
+            elif self.value == 'false':
+                self.value = false_val
+        elif format == 'restart':
+            if self.value == 'true':
+                self.value = 'warning-only'
+            elif self.value == 'false':
+                self.value = ''
+            elif len(self.value) > 0:
+                self.value = 'restart %s' % self.value
+        elif format == 'redist-route-map':
+            if len(self.value) > 0:
+                self.value = 'route-map %s' % self.to_str()
+        elif format == 'redist-metric':
+            if len(self.value) > 0:
+                self.value = 'metric %s' % self.to_str()
+        elif format == 'track':
+            if len(self.value) > 0:
+                self.value = 'track %s' % self.to_str()
+        elif format == 'network-policy':
+            if len(self.value) > 0:
+                self.value = 'route-map %s' % self.to_str()
+        elif format == 'src-proto':
+            if self.value == 'ospf3':
+                self.value = 'ospf6'
+        elif format == 'aggr-policy':
+            if len(self.value) > 0:
+                self.value = 'route-map %s' % self.to_str()
+        elif format == 'asn_list':
+            self.value = ' '.join(self.value.split(','))
+        elif format == 'nh-tag':
+            if len(self.value) > 0:
+                self.value = 'tag %s' % self.to_str()
+        elif format == 'nh-vrf':
+            if len(self.value) > 0:
+                self.value = 'nexthop-vrf %s' % self.to_str()
+        elif format == 'tolower':
+            self.tolower = True
+        elif format == 'pim_hello_parms':
+            self.value = ' '.join(self.value.split(','))
+        return self.to_str()
+
+def hdl_send_com(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) < 2:
+        return None
+    cmd_list = []
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, 'all'), no = CommandArgument(daemon, False)))
+    if op == CachedDataWithOp.OP_DELETE:
+        com_type = 'all'
+    else:
+        com_type = args[1]
+    if com_type != 'none':
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, com_type), no = CommandArgument(daemon, True)))
+    return cmd_list
+
+def hdl_rm_priv_as(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, ''), CommandArgument(daemon, True, ''),
+                                   no = CommandArgument(daemon, False)))
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, 'true'), CommandArgument(daemon, True, ''),
+                                   no = CommandArgument(daemon, False)))
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, ''), CommandArgument(daemon, True, 'true'),
+                                   no = CommandArgument(daemon, False)))
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, 'true'), CommandArgument(daemon, True, 'true'),
+                                   no = CommandArgument(daemon, False)))
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list += get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+    return cmd_list
+
+def hdl_capa_orf_pfxlist(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) < 2:
+        return None
+    cmd_list = []
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, 'both'), no = CommandArgument(daemon, False)))
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[0]), CommandArgument(daemon, True, args[1]), no = CommandArgument(daemon, True)))
+    return cmd_list
+
+def hdl_com_set(daemon, cmd_str, op, st_idx, args, extended):
+    if len(args) < 2 or 0 not in args[1] or 1 not in args[1] or 2 not in args[1]:
+        return None
+    com_name = args[0]
+    set_type = args[1][0][0].lower()
+    arg_str = '{} {}'.format(set_type, com_name)
+    cmd_list = []
+    com_set_list = daemon.comm_set_list if not extended else daemon.extcomm_set_list
+    if com_name in com_set_list and com_set_list[com_name].is_configurable():
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, arg_str), no = CommandArgument(daemon, False)))
+    if op != CachedDataWithOp.OP_DELETE:
+        match_action = args[1][1][0].lower()
+        member_list = args[1][2][0]
+        if match_action == 'all':
+            if extended and set_type == 'standard':
+                mbr_str = '{} permit {:ext-com-list}'.format(arg_str, CommandArgument(daemon, True, member_list))
+            else:
+                mbr_str = '{} permit {}'.format(arg_str, ' '.join(member_list))
+            cmd_list.append(cmd_str.format(CommandArgument(daemon, True, mbr_str), no = CommandArgument(daemon, True)))
+        elif match_action == 'any':
+            for member in member_list:
+                if extended and set_type == 'standard':
+                    mbr_str = '{} permit {:ext-com-list}'.format(arg_str, CommandArgument(daemon, True, member))
+                else:
+                    mbr_str = '{} permit {}'.format(arg_str, member)
+                cmd_list.append(cmd_str.format(CommandArgument(daemon, True, mbr_str), no = CommandArgument(daemon, True)))
+    return cmd_list
+
+def hdl_aspath_set(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) < 2:
+        return None
+    cmd_list = []
+    as_set_name = args[0]
+    if as_set_name in daemon.as_path_set_list:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, as_set_name), no = CommandArgument(daemon, False)))
+    if op != CachedDataWithOp.OP_DELETE and len(args[1]) > 0:
+        for asn in args[1]:
+            mbr_str = '{} permit {}'.format(as_set_name, asn)
+            cmd_list.append(cmd_str.format(CommandArgument(daemon, True, mbr_str), no = CommandArgument(daemon, True)))
+    return cmd_list
+
+def hdl_ibgp_maxpath(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if op != CachedDataWithOp.OP_DELETE:
+        # blindly run no command first
+        cmd_list = [cmd_str.format(CommandArgument(daemon, True, args[0]),
+                                   CommandArgument(daemon, True, 'false'),
+                                   no = CommandArgument(daemon, False))]
+    upd_cmd_list = get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+    if upd_cmd_list is None:
+        return None
+    return cmd_list + upd_cmd_list
+
+def hdl_ospf_log(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    if (no_op == 'no '):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, "")))
+    elif (args[0] == "DETAIL"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0].lower())))
+    elif (args[0] == "BRIEF"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, "")))
+
+    return cmd_list
+
+def handle_ospf_area_auth(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+  
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+ 
+    if (args[1] == "MD5HMAC"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "message-digest")))
+
+    elif (args[1] == "TEXT"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "")))
+    elif (args[1] == "NONE"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, 'no '),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "")))        
+    return cmd_list
+
+def handle_ospf_area_shortcut(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    if (args[1] == "DEFAULT") and (no_op != 'no '):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "default")))
+
+    elif (args[1] == "ENABLE"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "enable")))
+    elif (args[1] == "DISABLE"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, "disable")))
+    return cmd_list
+
+def handle_ospf_area_vlink_auth(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    if (args[2] == "MD5HMAC"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]), 
+                                       CommandArgument(daemon, True, args[1]), 
+                                       CommandArgument(daemon, True, "message-digest")))
+    elif (args[2] == "NONE"):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]), 
+                                       CommandArgument(daemon, True, args[1]), 
+                                       CommandArgument(daemon, True, "null")))
+
+    return cmd_list
+
+def handle_ospf_area_range_advt(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    if (args[2] == 'true'):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, args[1]),
+                                       CommandArgument(daemon, True, "advertise")))
+    elif (args[2] == 'false'):
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                       CommandArgument(daemon, True, args[0]),
+                                       CommandArgument(daemon, True, args[1]),
+                                       CommandArgument(daemon, True, "not-advertise")))
+    return cmd_list
+
+def handle_ospf_abrtype(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, args[0].lower())))
+
+    return cmd_list
+
+
+def handle_ospf_if_common(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if_addr = "" if args[1] == '0.0.0.0' else args[1]
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+    param_value = args[2]
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ospf_if_common cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, param_value),
+                                   CommandArgument(daemon, True, if_addr)))
+    return cmd_list
+
+
+def handle_ospf_if_authtype(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if_addr = "" if args[1] == '0.0.0.0' else args[1]
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    authtype = ''
+    if args[2] == 'TEXT' :
+        authtype = ''
+    elif args[2] == 'MD5HMAC' :
+        authtype = 'message-digest'
+    elif args[2] == 'NONE' :
+        authtype = 'null'
+    else :
+        syslog.syslog(syslog.LOG_ERR, 'handle_ospf_if_nwtype invalid auth type args {}'.format(args))
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ospf_if_authtype cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, authtype),
+                                   CommandArgument(daemon, True, if_addr)))
+    return cmd_list
+
+
+def handle_ospf_if_md5key(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if_addr = "" if args[1] == '0.0.0.0' else args[1]
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    md5key_id = args[2]
+    md5key = args[3]
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ospf_if_md5key cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, md5key_id),
+                                   CommandArgument(daemon, True, md5key),
+                                   CommandArgument(daemon, True, if_addr)))
+    return cmd_list
+
+
+def handle_ospf_if_mtu_ignore(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if_addr = "" if args[1] == '0.0.0.0' else args[1]
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ospf_if_mtu_ignore cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, if_addr)))
+    return cmd_list
+
+
+def handle_ospf_if_nwtype(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    no_op = 'no ' if op == CachedDataWithOp.OP_DELETE else ''
+
+    nwtype = ''
+    if args[2] == 'POINT_TO_POINT_NETWORK' :
+        nwtype = 'point-to-point'
+    elif args[2] == 'BROADCAST_NETWORK' :
+        nwtype = 'broadcast'
+    else :
+        syslog.syslog(syslog.LOG_ERR, 'handle_ospf_if_nwtype invalid nw type args {}'.format(args))
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ospf_if_nwtype cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, no_op),
+                                   CommandArgument(daemon, True, nwtype)))
+    return cmd_list
+
+def handle_igmp_if_common(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) != 1:
+        return None
+    cmd_list = []
+    param_value = args[0]
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_igmp_if_common cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, param_value)))
+    else:
+        cmd_list.append('no ' + cmd_str.format(CommandArgument(daemon, True, '')))
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_igmp_if_common param {}, cmd_list {}'.format(param_value, cmd_list))
+    return cmd_list
+
+def handle_igmp_if_enable(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) != 1:
+        return None
+    cmd_list = []
+    param_value = args[0]
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_igmp_if_enable cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    if op != CachedDataWithOp.OP_DELETE:
+        if param_value == 'false':
+            cmd_list.append('no ' + cmd_str.format(CommandArgument(daemon, True, '')))
+        else:
+            cmd_list.append(cmd_str.format(CommandArgument(daemon, True, '')))
+    else:
+        cmd_list.append('no ' + cmd_str.format(CommandArgument(daemon, True, '')))
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_igmp_if_enable param {}, cmd_list {}'.format(param_value, cmd_list))
+    return cmd_list
+
+def handle_ip_sla_common(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ip_sla cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[1])))
+    else:
+        cmd_list.append('no ' + cmd_str.format(CommandArgument(daemon, True, '')))
+
+    return cmd_list
+
+def handle_ip_sla_tcp_connect(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ip_sla_tcp_connect cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+    tcp_cmd_token = ("tcp", "connect")
+    tcp_cmd_str = "-".join(tcp_cmd_token)
+    tcp_cmd_deconfig = ' no ' + tcp_cmd_str
+
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list.append(' ')
+    else:
+        cmd_list.append(tcp_cmd_deconfig)
+
+    return cmd_list
+
+def handle_ip_sla_icmp_echo(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ip_sla_icmp_echo cmd_str {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+    icmp_cmd_token = ("icmp", "echo")
+    icmp_cmd_str = "-".join(icmp_cmd_token)
+    icmp_cmd_deconfig = ' no ' + icmp_cmd_str
+
+    if op != CachedDataWithOp.OP_DELETE:
+        cmd_list.append(' ')
+        syslog.syslog(syslog.LOG_INFO, 'handle_ip_sla_icmp_echo cmd_list {}'.format(cmd_list))
+    else:
+        cmd_list.append(icmp_cmd_deconfig)
+
+    syslog.syslog(syslog.LOG_INFO, 'handle_ip_sla_icmp_echo cmd_list {}'.format(cmd_list))
+    return cmd_list
+
+
+
+def hdl_af_aggregate(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) < 5:
+        return None
+    cmd_list = []
+    if op != CachedDataWithOp.OP_DELETE:
+        vrf = args[0]
+        af = args[1]
+        ip_prefix = args[2]
+        if vrf in daemon.af_aggr_list and ip_prefix in daemon.af_aggr_list[vrf]:
+            cmd_list.append(cmd_str.format(CommandArgument(daemon, True, vrf), CommandArgument(daemon, True, af), CommandArgument(daemon, True, ip_prefix),
+                                           CommandArgument(daemon, True, ''), CommandArgument(daemon, True, ''), CommandArgument(daemon, True, ''),
+                                           no = CommandArgument(daemon, False)))
+    upd_cmd_list = get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+    if upd_cmd_list is None:
+        return None
+    return cmd_list + upd_cmd_list
+
+def hdl_route_redist_set(daemon, cmd_str, op, st_idx, args, data):
+    cmd_list = []
+    if op != CachedDataWithOp.OP_DELETE:
+        proto = args[0]
+        # blindly run no command first
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, proto), CommandArgument(daemon, True, ''), CommandArgument(daemon, True, ''),
+                                       no = CommandArgument(daemon, False)))
+    upd_cmd_list = get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+    if upd_cmd_list is None:
+        return None
+    return cmd_list + upd_cmd_list
+
+def hdl_attr_unchanged(daemon, cmd_str, op, st_idx, args, data):
+    # blindly run no command first
+    cmd_list = [cmd_str.format(CommandArgument(daemon, True, args[0]),
+                               CommandArgument(daemon, True, ''),
+                               CommandArgument(daemon, True, ''),
+                               CommandArgument(daemon, True, ''),
+                               no = CommandArgument(daemon, False))]
+    if op != CachedDataWithOp.OP_DELETE:
+        upd_cmd_list = get_command_cmn(daemon, cmd_str, op, st_idx, args, data)
+        if upd_cmd_list is None:
+            return None
+        cmd_list += upd_cmd_list
+    return cmd_list
+
+def hdl_leaf_list_expansion(daemon, cmd_str, op, st_idx, args, data, table_key, item_key):
+    cmd_list = []
+    old_list = []
+    if op != CachedDataWithOp.OP_DELETE:
+        new_list = args[st_idx]
+    else:
+        new_list = []
+
+    syslog.syslog(syslog.LOG_DEBUG, 'handle_leaf_list_expansion {} op {} st_idx {} args {} data {} table_key {} item_key {}'.format(
+                                    cmd_str, op, st_idx, args, data, table_key, item_key))
+
+    if table_key in daemon.table_data_cache.keys():
+        cache_tbl_data = daemon.table_data_cache[table_key]
+        if item_key in cache_tbl_data:
+            old_list = cache_tbl_data[item_key]
+
+    del_list = list(set(old_list) - set(new_list))
+    add_list = list(set(new_list) - set(old_list))
+
+    for value in add_list:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, value), no = CommandArgument(daemon, True)))
+    for value in del_list:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, value), no = CommandArgument(daemon, False)))
+
+    syslog.syslog(syslog.LOG_DEBUG, 'cmd_list {}'.format(cmd_list))
+    return cmd_list
+
+def hdl_import_list(daemon, cmd_str, op, st_idx, args, data):    
+    return hdl_leaf_list_expansion(daemon, cmd_str, op, st_idx, args, data, daemon.tmp_cache_key, 'import-rts')
+
+def hdl_export_list(daemon, cmd_str, op, st_idx, args, data):    
+    return hdl_leaf_list_expansion(daemon, cmd_str, op, st_idx, args, data, daemon.tmp_cache_key, 'export-rts')
+
+def hdl_enum_conversion(daemon, cmd_str, op, st_idx, args, data): 
+    cmd_list = []   
+    syslog.syslog(syslog.LOG_DEBUG, 'handle_enum_conversion {} op {} st_idx {} args {} data {}'.format(
+                                    cmd_str, op, st_idx, args, data))
+    cmd_list.append(cmd_str.format(CommandArgument(daemon, True, args[st_idx].lower().replace('_','-')), 
+        no = CommandArgument(daemon, (op != CachedDataWithOp.OP_DELETE))))
+    syslog.syslog(syslog.LOG_DEBUG, 'cmd_list {}'.format(cmd_list))
+    return cmd_list
+
+def hdl_confed_peers(daemon, cmd_str, op, st_idx, args, data):
+    del_list = []
+    add_list = []
+    if op == CachedDataWithOp.OP_DELETE:
+        del_list = list(daemon.upd_confed_peers)
+        daemon.upd_confed_peers.clear()
+    else:
+        for peer in args[0]:
+            if peer not in daemon.upd_confed_peers:
+                add_list.append(peer)
+            else:
+                daemon.upd_confed_peers.remove(peer)
+        del_list = list(daemon.upd_confed_peers)
+        daemon.upd_confed_peers = set(args[0])
+    cmd_list = []
+    if len(del_list) > 0:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, del_list), no = CommandArgument(daemon, False)))
+    if len(add_list) > 0:
+        cmd_list.append(cmd_str.format(CommandArgument(daemon, True, add_list), no = CommandArgument(daemon, True)))
+    return cmd_list
+
+def hdl_static_route(daemon, cmd_str, op, st_idx, args, data):
+    if len(args) < 6:
+        return None
+    vrf = args[0]
+    ip_prefix = args[1]
+    af = data
+    if op == CachedDataWithOp.OP_DELETE:
+        ip_nh_set = IpNextHopSet(af)
+    else:
+        arg_list = lambda v: v.split(',') if len(v.strip()) != 0 else None
+        bkh_list = arg_list(args[2])
+        nh_list = arg_list(args[3])
+        track_list = arg_list(args[5])
+        intf_list = arg_list(args[4])
+        tag_list = arg_list(args[6])
+        dist_list = arg_list(args[7])
+        nh_vrf_list = arg_list(args[8])
+        ip_nh_set = IpNextHopSet(af, bkh_list, nh_list, track_list, intf_list, tag_list, dist_list, nh_vrf_list)
+    cur_nh_set = daemon.static_route_list.get(vrf, {}).get(ip_prefix, IpNextHopSet(af))
+    diff_set = ip_nh_set.symmetric_difference(cur_nh_set)
+    op_cmd_list = {}
+    for ip_nh in diff_set:
+        if ip_nh in cur_nh_set:
+            op = CachedDataWithOp.OP_DELETE
+        else:
+            op = CachedDataWithOp.OP_ADD
+        try:
+            op_cmds = op_cmd_list.setdefault(op, [])
+            op_cmds += get_command_cmn(daemon, cmd_str, op, st_idx, [ip_prefix] + ip_nh.get_arg_list(), None)
+        except socket.error:
+            syslog.syslog(syslog.LOG_ERR, 'Invalid IP in next-hop %s' % ip_nh)
+            return None
+    cmd_list = op_cmd_list.get(CachedDataWithOp.OP_DELETE, [])
+    cmd_list += op_cmd_list.get(CachedDataWithOp.OP_ADD, [])
+    daemon.upd_nh_set = ip_nh_set
+    return cmd_list
+
+class ExtConfigDBConnector(ConfigDBConnector):
+    def __init__(self, ns_attrs = None):
+        super(ExtConfigDBConnector, self).__init__()
+        self.nosort_attrs = ns_attrs if ns_attrs is not None else {}
+    def raw_to_typed(self, raw_data, table = ''):
+        if len(raw_data) == 0:
+            raw_data = None
+        data = super(ExtConfigDBConnector, self).raw_to_typed(raw_data)
+        if data is None:
+            return None
+        for key, val in data.items():
+            if type(val) is list and key not in self.nosort_attrs.get(table, set()):
+                val.sort()
+        return data
+    def sub_msg_handler(self, msg_item):
+        if msg_item['type'] == 'pmessage':
+            key = msg_item['channel'].split(':', 1)[1]
+            try:
+                (table, row) = key.split(self.TABLE_NAME_SEPARATOR, 1)
+                if table in self.handlers:
+                    client = self.get_redis_client(self.db_name)
+                    data = self.raw_to_typed(client.hgetall(key), table)
+                    super(ExtConfigDBConnector, self)._ConfigDBConnector__fire(table, row, data)
+            except ValueError:
+                pass    #Ignore non table-formated redis entries
+            except Exception as e:
+                syslog.syslog(syslog.LOG_ERR, '[bgp cfgd] Failed handling config DB update with exception:' + str(e))
+                logging.exception(e)
+    def listen(self):
+        """Start listen Redis keyspace events and will trigger corresponding handlers when content of a table changes.
+        """
+        self.pubsub = self.get_redis_client(self.db_name).pubsub()
+        self.pubsub.psubscribe(**{"__keyspace@{}__:*".format(self.get_dbid(self.db_name)): self.sub_msg_handler})
+        self.sub_thread = self.pubsub.run_in_thread(sleep_time = 0.01)
+    @staticmethod
+    def get_table_key(table, key):
+        return table + '&&' + key
+    def get_table_data(self, table_list):
+        ret_data = {}
+        for table in table_list:
+            table_data = self.get_table(table)
+            for key, data in table_data.items():
+                table_key = self.get_table_key(table, self.serialize_key(key))
+                ret_data[table_key] = data
+        return ret_data
+
+class CommunityList:
+    MATCH_ALL = 0
+    MATCH_ANY = 1
+    RT_TYPE_MARK = 'route-target:'
+    SOO_TYPE_MARK = 'route-origin:'
+    def __init__(self, name, extended):
+        self.name = name
+        self.is_ext = extended
+        self.match_action = None
+        self.is_std = None
+        self.mbr_list = []
+    def is_configurable(self):
+        return (self.match_action is not None and self.is_std is not None and
+                len(self.mbr_list) > 0)
+    def db_data_to_attr(self, name, val):
+        if name == 'match_action':
+            if val is None:
+                self.match_action = None
+            else:
+                if val.lower() == 'all':
+                    self.match_action = self.MATCH_ALL
+                else:
+                    self.match_action = self.MATCH_ANY
+        elif name == 'set_type':
+            if val is None:
+                self.is_std = None
+            else:
+                self.is_std = (val.lower() == 'standard')
+        elif name == 'community_member':
+            self.mbr_list = []
+            if val is not None:
+                if type(val) is not list:
+                    self.mbr_list = val.split(',')
+                else:
+                    self.mbr_list = val
+
+class MatchPrefix:
+    IPV4_MAXLEN = 32
+    IPV6_MAXLEN = 128
+    @staticmethod
+    def normalize_ip_prefix(af, ip_prefix):
+        ip_mask = ip_prefix.split('/')
+        ip_addr = ip_mask[0]
+        if len(ip_mask) < 2:
+            mask_len = MatchPrefix.IPV4_MAXLEN if af == socket.AF_INET else MatchPrefix.IPV6_MAXLEN
+            return '%s/%d' % (ip_addr, mask_len)
+        mask_len = int(ip_mask[1])
+        ip_net = netaddr.IPNetwork('%s/%d' % (ip_addr, mask_len))
+        try:
+            normal_ip = socket.inet_ntop(af, ip_net.cidr.ip.packed)
+        except ValueError:
+            return None
+        return '%s/%d' % (normal_ip, mask_len)
+    def __init__(self, af, ip_prefix, len_range = None, action = 'permit'):
+        self.ip_prefix = self.normalize_ip_prefix(af, ip_prefix)
+        if self.ip_prefix is None:
+            raise ValueError
+        if len_range is not None:
+            min_len, max_len = len_range.split('..')
+            self.min_len = int(min_len)
+            self.max_len = int(max_len)
+            _, pfx_len = self.ip_prefix.split('/')
+            if int(pfx_len) >= self.min_len:
+                self.min_len = None
+            elif ((af == socket.AF_INET and self.max_len == self.IPV4_MAXLEN) or
+                  (af == socket.AF_INET6 and self.max_len == self.IPV6_MAXLEN)):
+                self.max_len = None
+        else:
+            self.min_len = self.max_len = None
+        self.action = action
+    def __hash__(self):
+        return hash((self.ip_prefix, self.min_len, self.max_len))
+    def __str__(self):
+        ret_str = '%s %s' % (self.action.lower(), self.ip_prefix)
+        if self.min_len is not None:
+            ret_str += ' ge %d' % self.min_len
+        if self.max_len is not None:
+            ret_str += ' le %d' % self.max_len
+        return ret_str
+    def __eq__(self, other):
+        return (self.ip_prefix == other.ip_prefix and
+                self.min_len == other.min_len and
+                self.max_len == other.max_len)
+    def __ne__(self, other):
+        return (self.ip_prefix != other.ip_prefix or
+                self.min_len != other.min_len or
+                self.max_len != other.max_len)
+
+class MatchPrefixList(list):
+    def __init__(self, af_mode = None):
+        super(MatchPrefixList, self).__init__()
+        if af_mode is None:
+            self.af = None
+        else:
+            self.af = socket.AF_INET if af_mode == 'ipv4' else socket.AF_INET6
+    def __eq__(self, other):
+        return super(MatchPrefixList, self).__eq__(other) and self.af == other.af
+    def __ne__(self, other):
+        return super(MatchPrefixList, self).__ne__(other) or self.af != other.af
+    @staticmethod
+    def __get_ip_af(ip_pfx):
+        ip_pfx = ip_pfx.split('/')
+        ip_addr = ip_pfx[0]
+        af_list = [socket.AF_INET, socket.AF_INET6]
+        for af in af_list:
+            try:
+                socket.inet_pton(af, ip_addr)
+                return af
+            except socket.error:
+                continue
+        return None
+    def add_prefix(self, ip_pfx, len_range = None, action = 'permit'):
+        af = self.__get_ip_af(ip_pfx)
+        if self.af is None:
+            self.af = af
+        else:
+            if self.af != af:
+                syslog.syslog(syslog.LOG_ERR, 'af of prefix %s is not the  same as prefix set' % ip_pfx)
+                raise ValueError
+        self.append(MatchPrefix(self.af, ip_pfx, len_range, action))
+        return self[-1]
+    def get_prefix(self, ip_pfx, len_range = None, action = 'permit'):
+        if self.af is None:
+            return (None, None)
+        prefix = MatchPrefix(self.af, ip_pfx, len_range, action)
+        try:
+            idx = self.index(prefix)
+        except ValueError:
+            return (None, None)
+        return (self[idx], idx)
+
+class AggregateAddr:
+    def __init__(self):
+        self.as_set = False
+        self.summary_only = False
+
+class IpNextHop:
+    def __init__(self, af_id, blackhole, dst_ip, track, if_name, tag, dist, vrf):
+        zero_ip = lambda af: '0.0.0.0' if af == socket.AF_INET else '::'
+        self.af = af_id
+        self.blackhole = 'false' if blackhole is None or blackhole == '' else blackhole
+        self.distance = 0 if dist is None else int(dist)
+        self.track = 0 if track is None else int(track)
+        if self.blackhole == 'true':
+            dst_ip = if_name = vrf = None
+        self.ip = zero_ip(af_id) if dst_ip is None else dst_ip
+        self.interface = '' if if_name is None else if_name
+        self.tag = 0 if tag is None else int(tag)
+        self.nh_vrf = '' if vrf is None else vrf
+        if self.blackhole != 'true' and self.is_zero_ip() and len(self.interface.strip()) == 0:
+            syslog.syslog(syslog.LOG_ERR, 'Mandatory attribute not found for nexthop')
+            raise ValueError
+    def __eq__(self, other):
+        return (self.af == other.af and self.blackhole == other.blackhole and
+                self.ip == other.ip and self.track == other.track and self.interface == other.interface and
+                self.tag == other.tag and self.distance == other.distance and self.nh_vrf == other.nh_vrf)
+    def __ne__(self, other):
+        return (self.af != other.af or self.blackhole != other.blackhole or
+                self.ip != other.ip or self.track != other.track or self.interface != other.interface or
+                self.tag != other.tag or self.distance != other.distance or self.nh_vrf != other.nh_vrf)
+    def __hash__(self):
+        return hash((self.af, self.blackhole, self.ip, self.track, self.interface, self.tag, self.distance, self.nh_vrf))
+    def __str__(self):
+        return 'AF %d BKH %s IP %s TRACK %d INTF %s TAG %d DIST %d VRF %s' % (
+                self.af, self.blackhole, self.ip, self.track, self.interface, self.tag, self.distance, self.nh_vrf)
+    def is_zero_ip(self):
+        return sum([x for x in socket.inet_pton(self.af, self.ip)]) == 0
+    def get_arg_list(self):
+        arg = lambda x: '' if x is None else x
+        num_arg = lambda x: '' if x is None or x == 0 else str(x)
+        ip_arg = lambda : '' if self.ip is None else ('' if self.is_zero_ip() else self.ip)
+        return [self.blackhole, ip_arg(), arg(self.interface), num_arg(self.track), num_arg(self.tag), num_arg(self.distance), arg(self.nh_vrf)]
+
+class IpNextHopSet(set):
+    def __init__(self, af, bkh_list = None, ip_list = None, track_list = None, intf_list = None, tag_list = None, dist_list = None, vrf_list = None):
+        super(IpNextHopSet, self).__init__()
+        if bkh_list is None and ip_list is None and intf_list is None:
+            # empty set, for delete case
+            return
+        nums = {len(x) for x in [bkh_list, ip_list, track_list, intf_list, tag_list, dist_list, vrf_list] if x is not None}
+        if len(nums) != 1:
+            syslog.syslog(syslog.LOG_ERR, 'Lists of next-hop attribute have different sizes: %s' % nums)
+            for x in [bkh_list, ip_list, track_list, intf_list, tag_list, dist_list, vrf_list]:
+                syslog.syslog(syslog.LOG_DEBUG, 'List: %s' % x)
+            return
+        nh_cnt = nums.pop()
+        item = lambda lst, i: lst[i] if lst is not None else None
+        for idx in range(nh_cnt):
+            try:
+                self.add(IpNextHop(af, item(bkh_list, idx), item(ip_list, idx), item(track_list, idx), item(intf_list, idx),
+                                   item(tag_list, idx), item(dist_list, idx), item(vrf_list, idx), ))
+            except ValueError:
+                continue
+    @staticmethod
+    def get_af_norm_prefix(ip_prefix):
+        for af_id in [socket.AF_INET, socket.AF_INET6]:
+            new_prefix = MatchPrefix.normalize_ip_prefix(af_id, ip_prefix)
+            if new_prefix is not None:
+                return (af_id, new_prefix)
+        return (None, None)
+
+class BGPConfigDaemon:
+    DEFAULT_VRF = 'default'
+
+    global_key_map = [('router_id',                                     '{no:no-prefix}bgp router-id {}'),
+                      (['load_balance_mp_relax', '+as_path_mp_as_set'], '{no:no-prefix}bgp bestpath as-path multipath-relax {:mp-as-set}', ['true', 'false']),
+                      ('always_compare_med',                            '{no:no-prefix}bgp always-compare-med', ['true', 'false']),
+                      ('external_compare_router_id',                    '{no:no-prefix}bgp bestpath compare-routerid', ['true', 'false']),
+                      ('ignore_as_path_length',                         '{no:no-prefix}bgp bestpath as-path ignore', ['true', 'false']),
+                      ('graceful_restart_enable',                       '{no:no-prefix}bgp graceful-restart', ['true', 'false']),
+                      ('gr_restart_time',                               '{no:no-prefix}bgp graceful-restart restart-time {}'),
+                      ('gr_stale_routes_time',                          '{no:no-prefix}bgp graceful-restart stalepath-time {}'),
+                      ('gr_preserve_fw_state',                          '{no:no-prefix}bgp graceful-restart preserve-fw-state', ['true', 'false']),
+                      ('log_nbr_state_changes',                         '{no:no-prefix}bgp log-neighbor-changes', ['true', 'false']),
+                      ('rr_cluster_id',                                 '{no:no-prefix}bgp cluster-id {}'),
+                      ('rr_allow_out_policy',                           '{no:no-prefix}bgp route-reflector allow-outbound-policy', ['true', 'false']),
+                      ('disable_ebgp_connected_rt_check',               '{no:no-prefix}bgp disable-ebgp-connected-route-check', ['true', 'false']),
+                      ('fast_external_failover',                        '{no:no-prefix}bgp fast-external-failover', ['true', 'false', True]),
+                      ('network_import_check',                          '{no:no-prefix}bgp network import-check', ['true', 'false']),
+                      ('graceful_shutdown',                             '{no:no-prefix}bgp graceful-shutdown', ['true', 'false']),
+                      ('rr_clnt_to_clnt_reflection',                    '{no:no-prefix}bgp client-to-client reflection', ['true', 'false', True]),
+                      ('max_dynamic_neighbors',                         '{no:no-prefix}bgp listen limit {}'),
+                      ('read_quanta',                                   '{no:no-prefix}read-quanta {}'),
+                      ('write_quanta',                                  '{no:no-prefix}write-quanta {}'),
+                      ('coalesce_time',                                 '{no:no-prefix}coalesce-time {}'),
+                      ('route_map_process_delay',                       '{no:no-prefix}bgp route-map delay-timer {}'),
+                      ('deterministic_med',                             '{no:no-prefix}bgp deterministic-med', ['true', 'false']),
+                      ('med_confed',                                    '{no:no-prefix}bgp bestpath med confed', ['true', 'false']),
+                      ('med_missing_as_worst',                          '{no:no-prefix}bgp bestpath med missing-as-worst', ['true', 'false']),
+                      ('compare_confed_as_path',                        '{no:no-prefix}bgp bestpath as-path confed', ['true', 'false']),
+                      ('default_ipv4_unicast',                          '{no:no-prefix}bgp default ipv4-unicast', ['true', 'false']),
+                      ('default_local_preference',                      '{no:no-prefix}bgp default local-preference {}'),
+                      ('default_show_hostname',                         '{no:no-prefix}bgp default show-hostname', ['true', 'false']),
+                      ('default_shutdown',                              '{no:no-prefix}bgp default shutdown', ['true', 'false']),
+                      ('default_subgroup_pkt_queue_max',                '{no:no-prefix}bgp default subgroup-pkt-queue-max {}'),
+                      (['max_med_time', '+max_med_val'],                '{no:no-prefix}bgp max-med on-startup {} {}'),
+                      (['max_delay', '+establish_wait'],                '{no:no-prefix}update-delay {} {}'),
+                      ('confed_id',                                     '{no:no-prefix}bgp confederation identifier {}'),
+                      ('confed_peers',                                  '{no:no-prefix}bgp confederation peers {}', hdl_confed_peers),
+                      (['keepalive', 'holdtime'],                       '{no:no-prefix}timers bgp {} {}'),
+                      (['max_med_admin', '+max_med_admin_val'],         '{no:no-prefix}bgp max-med administrative {}', ['true', 'false'])
+    ]
+
+    global_af_key_map = [(['ebgp_route_distance',
+                           'ibgp_route_distance',
+                           'local_route_distance'],                     '{no:no-prefix}distance bgp {} {} {}'),
+                         ('max_ebgp_paths',                             '{no:no-prefix}maximum-paths {}'),
+                         (['max_ibgp_paths',
+                           '+ibgp_equal_cluster_length'],               '{no:no-prefix}maximum-paths ibgp {} {:match-clust-len}', hdl_ibgp_maxpath),
+                         ('route_download_filter',                      '{no:no-prefix}table-map {}'),
+                         (['route_flap_dampen',
+                           '+route_flap_dampen_half_life',
+                           '+route_flap_dampen_reuse_threshold',
+                           '+route_flap_dampen_suppress_threshold',
+                           '+route_flap_dampen_max_suppress'],          '{no:no-prefix}bgp dampening {} {} {} {}', ['true', 'false']),
+                         ('advertise-all-vni',                      '{no:no-prefix}advertise-all-vni', ['true','false']),
+                         ('advertise-default-gw',                   '{no:no-prefix}advertise-default-gw', ['true','false']),
+                         ('advertise-ipv4-unicast',                      '{no:no-prefix}advertise ipv4 unicast', ['true','false']),
+                         ('advertise-ipv6-unicast',                      '{no:no-prefix}advertise ipv6 unicast', ['true','false']),
+                         ('default-originate-ipv4',                      '{no:no-prefix}default-originate ipv4', ['true','false']),
+                         ('default-originate-ipv6',                      '{no:no-prefix}default-originate ipv6', ['true','false']),
+                         ('autort',                                      '{no:no-prefix}autort {}', hdl_enum_conversion),
+                         ('flooding',                                    '{no:no-prefix}flooding {}'),
+                         ('dad-enabled',                                 '{no:no-prefix}dup-addr-detection', ['true','false']),
+                         (['dad-max-moves',
+                            'dad-time'],                                 '{no:no-prefix}dup-addr-detection max-moves {} time {}'),
+                         ('dad-freeze',                                   '{no:no-prefix}dup-addr-detection freeze {}'),
+                         ('route-distinguisher',                         '{no:no-prefix}rd {}'),
+                         ('import-rts',                                  '{no:no-prefix}route-target import {}', hdl_import_list),
+                         ('export-rts',                                  '{no:no-prefix}route-target export {}', hdl_export_list),
+                         ('import_vrf',                                 '{no:no-prefix}import vrf {}'),
+                         ('import_vrf_route_map',                       '{no:no-prefix}import vrf route-map {}')
+    ]
+
+    cmn_key_map = [('asn&peer_type',                        '{no:no-prefix}neighbor {} remote-as {}'),
+                   (['local_asn', '+local_as_no_prepend',
+                     '+local_as_replace_as'],               '{no:no-prefix}neighbor {} local-as {} {:no-prepend} {:replace-as}'),
+                   (['admin_status', '+shutdown_message'],  '{no:no-prefix}neighbor {} shutdown {:shutdown-msg}', ['false', 'true']),
+                   ('local_addr',                           '{no:no-prefix}neighbor {} update-source {}'),
+                   ('name',                                 '{no:no-prefix}neighbor {} description {}'),
+                   (['ebgp_multihop', '+ebgp_multihop_ttl'],'{no:no-prefix}neighbor {} ebgp-multihop {}', ['true', 'false']),
+                   ('auth_password',                        '{no:no-prefix}neighbor {} password {} encrypted'),
+                   (['keepalive', 'holdtime'],              '{no:no-prefix}neighbor {} timers {} {}'),
+                   ('conn_retry',                           '{no:no-prefix}neighbor {} timers connect {}'),
+                   ('min_adv_interval',                     '{no:no-prefix}neighbor {} advertisement-interval {}'),
+                   ('passive_mode',                         '{no:no-prefix}neighbor {} passive', ['true', 'false']),
+                   ('capability_ext_nexthop',               '{no:no-prefix}neighbor {} capability extended-nexthop', ['true', 'false']),
+                   ('disable_ebgp_connected_route_check',   '{no:no-prefix}neighbor {} disable-connected-check', ['true', 'false']),
+                   ('enforce_first_as',                     '{no:no-prefix}neighbor {} enforce-first-as', ['true', 'false']),
+                   ('solo_peer',                            '{no:no-prefix}neighbor {} solo', ['true', 'false']),
+                   ('ttl_security_hops',                    '{no:no-prefix}neighbor {} ttl-security hops {}'),
+                   ('bfd',                                  '{no:no-prefix}neighbor {} bfd', ['true', 'false']),
+                   ('bfd_check_ctrl_plane_failure',         '{no:no-prefix}neighbor {} bfd check-control-plane-failure', ['true', 'false']),
+                   ('capability_dynamic',                   '{no:no-prefix}neighbor {} capability dynamic', ['true', 'false']),
+                   ('dont_negotiate_capability',            '{no:no-prefix}neighbor {} dont-capability-negotiate', ['true', 'false']),
+                   ('enforce_multihop',                     '{no:no-prefix}neighbor {} enforce-multihop', ['true', 'false']),
+                   ('override_capability',                  '{no:no-prefix}neighbor {} override-capability', ['true', 'false']),
+                   ('peer_port',                            '{no:no-prefix}neighbor {} port {}'),
+                   ('strict_capability_match',              '{no:no-prefix}neighbor {} strict-capability-match', ['true', 'false'])
+    ]
+
+    nbr_key_map = [('peer_group_name',  '{no:no-prefix}neighbor {} peer-group {}')]
+
+    nbr_af_key_map = [(['allow_as_in', '+allow_as_count&allow_as_origin'],  '{no:no-prefix}neighbor {} allowas-in {:allow-as-in}', ['true', 'false']),
+                      ('admin_status|ipv4',                                 '{no:no-prefix}neighbor {} activate', ['true', 'false', False]),
+                      ('admin_status|ipv6',                                 '{no:no-prefix}neighbor {} activate', ['true', 'false', False]),
+                      ('admin_status|l2vpn',                                '{no:no-prefix}neighbor {} activate', ['true', 'false', False]),
+                      (['send_default_route', '+default_rmap'],             '{no:no-prefix}neighbor {} default-originate {:default-rmap}', ['true', 'false']),
+                      ('default_rmap',                                      '{no:no-prefix}neighbor {} default-originate route-map {}'),
+                      (['max_prefix_limit', '++max_prefix_warning_threshold',
+                        '+max_prefix_restart_interval&max_prefix_warning_only'], '{no:no-prefix}neighbor {} maximum-prefix {} {} {:restart}'),
+                      ('route_map_in',                                      '{no:no-prefix}neighbor {} route-map {} in'),
+                      ('route_map_out',                                     '{no:no-prefix}neighbor {} route-map {} out'),
+                      ('soft_reconfiguration_in',                           '{no:no-prefix}neighbor {} soft-reconfiguration inbound', ['true', 'false']),
+                      ('unsuppress_map_name',                               '{no:no-prefix}neighbor {} unsuppress-map {}'),
+                      ('rrclient',                                          '{no:no-prefix}neighbor {} route-reflector-client', ['true', 'false']),
+                      ('weight',                                            '{no:no-prefix}neighbor {} weight {}'),
+                      ('as_override',                                       '{no:no-prefix}neighbor {} as-override', ['true', 'false']),
+                      ('send_community',                                    '{no:no-prefix}neighbor {} send-community {}', hdl_send_com),
+                      ('tx_add_paths',                                      '{no:no-prefix}neighbor {} {:tx-add-paths}'),
+                      (['++unchanged_as_path',
+                        '++unchanged_med', '++unchanged_nexthop'],          '{no:no-prefix}neighbor {} attribute-unchanged {:uchg-as-path} {:uchg-med} {:uchg-nh}', hdl_attr_unchanged),
+                      ('filter_list_in',                                    '{no:no-prefix}neighbor {} filter-list {} in'),
+                      ('filter_list_out',                                   '{no:no-prefix}neighbor {} filter-list {} out'),
+                      ('nhself',                                            '{no:no-prefix}neighbor {} next-hop-self', ['true', 'false']),
+                      ('nexthop_self_force',                                '{no:no-prefix}neighbor {} next-hop-self force', ['true', 'false']),
+                      ('prefix_list_in',                                    '{no:no-prefix}neighbor {} prefix-list {} in'),
+                      ('prefix_list_out',                                   '{no:no-prefix}neighbor {} prefix-list {} out'),
+                      (['remove_private_as_enabled',
+                        '++remove_private_as_all',
+                        '+replace_private_as'],                             '{no:no-prefix}neighbor {} remove-private-AS {:rm-as-all} {:rm-as-repl}', hdl_rm_priv_as, ['true', 'false']),
+                      ('cap_orf',                                           '{no:no-prefix}neighbor {} capability orf prefix-list {}', hdl_capa_orf_pfxlist),
+                      ('route_server_client',                               '{no:no-prefix}neighbor {} route-server-client', ['true', 'false']),
+    ]
+
+    route_map_key_map = [('match_interface',                '{no:no-prefix}match interface {}'),
+                         ('match_prefix_set|ipv4',          '{no:no-prefix}match ip address prefix-list {}'),
+                         ('match_prefix_set|ipv6',          '{no:no-prefix}match ipv6 address prefix-list {}'),
+                         ('match_neighbor',                 '[bgpd]{no:no-prefix}match peer {:peer-ip}'),
+                         ('match_tag',                      '{no:no-prefix}match tag {}'),
+                         ('match_protocol',                 '[zebra]{no:no-prefix}match source-protocol {:src-proto}'),
+                         ('match_next_hop_set|ipv4',        '{no:no-prefix}match ip next-hop prefix-list {}'),
+                         ('match_next_hop_set|ipv6',        '{no:no-prefix}match ip next-hop prefix-list {}'), #match ipv6 next-hop prefix-list not suppported by frr
+                         ('match_med',                      '{no:no-prefix}match metric {}'),
+                         ('match_origin',                   '[bgpd]{no:no-prefix}match origin {:tolower}'),
+                         ('match_local_pref',               '[bgpd]{no:no-prefix}match local-preference {}'),
+                         ('match_community',                '[bgpd]{no:no-prefix}match community {}'),
+                         ('match_ext_community',            '[bgpd]{no:no-prefix}match extcommunity {}'),
+                         ('match_as_path',                  '[bgpd]{no:no-prefix}match as-path {}'),
+                         ('match_src_vrf',                  '[bgpd]{no:no-prefix}match source-vrf {}'),
+                         ('call_route_map',                 '{no:no-prefix}call {:enable-only}'),
+                         ('set_origin',                     '[bgpd]{no:no-prefix}set origin {:tolower}'),
+                         ('set_local_pref',                 '[bgpd]{no:no-prefix}set local-preference {}'),
+                         ('set_next_hop',                   '{no:no-prefix}set ip next-hop {}'),
+                         ('set_ipv6_next_hop_global',       '[bgpd]{no:no-prefix}set ipv6 next-hop global {}'),
+                         ('set_ipv6_next_hop_prefer_global', '[bgpd]{no:no-prefix}set ipv6 next-hop prefer-global', ['true', 'false']),
+                         (['set_metric_action', '+set_metric', '+set_med'], '{}set metric {} ', handle_rmap_set_metric),
+                         ('set_med',                        '{no:no-prefix}set metric {}'),
+                         (('set_asn', '+set_repeat_asn'),   '[bgpd]{no:no-prefix}set as-path prepend {:repeat}', hdl_set_asn),
+                         ('set_asn_list',                   '[bgpd]{no:no-prefix}set as-path prepend {:asn_list}', hdl_set_asn_list),
+                         ('set_community_inline',           '[bgpd]{no:no-prefix}set community {}'),
+                         ('set_community_ref',              '[bgpd]{no:no-prefix}set community {:com-ref}'),
+                         ('set_ext_community_inline',       '[bgpd]{no:no-prefix}set extcommunity {:ext-com-list}', hdl_set_extcomm, True),
+                         ('set_ext_community_ref',          '[bgpd]{no:no-prefix}set extcommunity {:ext-com-ref}', hdl_set_extcomm, False)
+    ]
+
+    bfd_peer_shop_key_map = [('enabled',                        '{no:no-prefix}shutdown', ['false', 'true']),                
+                         ('desired-minimum-tx-interval',        '{no:no-prefix}transmit-interval {}'),      
+                         ('required-minimum-receive',           '{no:no-prefix}receive-interval {}'),       
+                         ('desired-minimum-echo-receive',       '{no:no-prefix}echo-interval {}'),             
+                         ('detection-multiplier',               '{no:no-prefix}detect-multiplier {}'),          
+                         ('echo-active',                        '{no:no-prefix}echo-mode', ['true', 'false'])
+    ]  
+
+    bfd_peer_mhop_key_map = [('enabled',                        '{no:no-prefix}shutdown', ['false', 'true']),                
+                         ('desired-minimum-tx-interval',        '{no:no-prefix}transmit-interval {}'),      
+                         ('required-minimum-receive',           '{no:no-prefix}receive-interval {}'),       
+                         ('detection-multiplier',               '{no:no-prefix}detect-multiplier {}'),          
+    ]
+
+    listen_prefix_key_map = [('peer_group', '{no:no-prefix}bgp listen range {} peer-group {}')]
+
+    community_set_key_map = [(('set_type', 'match_action', 'community_member'), '{no:no-prefix}bgp community-list {}', hdl_com_set, False)]
+    extcommunity_set_key_map = [(('set_type', 'match_action', 'community_member'), '{no:no-prefix}bgp extcommunity-list {}', hdl_com_set, True)]
+
+    aspath_set_key_map = [('as_path_set_member', '{no:no-prefix}bgp as-path access-list {}', hdl_aspath_set)]
+
+    route_redist_key_map = [(['protocol', '++metric', '+route_map'],
+                             '{no:no-prefix}redistribute {} {:redist-metric} {:redist-route-map}', hdl_route_redist_set)]
+
+    af_aggregate_key_map = [(['ip_prefix', '++as_set', '++summary_only', '+policy'],
+                             '{no:no-prefix}aggregate-address {2} {3:aggr-as-set} {4:aggr-summary-only} {5:aggr-policy}', hdl_af_aggregate)]
+
+    af_network_key_map = [(['ip_prefix', '++policy', '+backdoor'], '{no:no-prefix}network {2} {3:network-policy} {4:network-backdoor}')]
+
+    global_evpn_vni_key_map = [('advertise-default-gw',                   '{no:no-prefix}advertise-default-gw', ['true','false']),
+                               ('route-distinguisher',                         '{no:no-prefix}rd {}'),
+                               ('import-rts',                                  '{no:no-prefix}route-target import {}', hdl_import_list),
+                               ('export-rts',                                  '{no:no-prefix}route-target export {}', hdl_export_list)]
+
+    ospfv2_global_key_map = [('enable',                        '{no:no-prefix}'),
+                             ('auto-cost-reference-bandwidth', '{no:no-prefix}auto-cost reference-bandwidth {}'),
+                             ('ospf-rfc1583-compatible',       '{no:no-prefix}compatible rfc1583', ['true', 'false']),
+                             ('max-metric-administrative',     '{no:no-prefix}max-metric router-lsa administrative', ['true', 'false']),
+                             ('max-metric-on-shutdown',        '{no:no-prefix}max-metric router-lsa on-shutdown {}'),
+                             ('max-metric-on-startup',         '{no:no-prefix}max-metric router-lsa on-startup {}'),
+                             ('router-id',                     '{no:no-prefix}ospf router-id {}'),
+                             ('abr-type',                      '{}ospf abr-type {:abrtype}', handle_ospf_abrtype),
+                             ('write-multiplier',              '{no:no-prefix}write-multiplier {}'),
+                             ('passive-interface-default',     '{no:no-prefix}passive-interface default', ['true', 'false']),
+                             ('lsa-refresh-timer',             '{no:no-prefix}refresh timer {}'),
+                             ('lsa-min-arrival-timer',         '{no:no-prefix}timers lsa min-arrival {}'),
+                             ('lsa-min-interval-timer',        '{no:no-prefix}timers throttle lsa all {}'),
+                             (['spf-initial-delay', 'spf-maximum-delay', 'spf-throttle-delay'], '{no:no-prefix}timers throttle spf {} {} {}'),
+                             ('log-adjacency-changes',         '{}log-adjacency-changes {}', hdl_ospf_log),
+                             ('default-metric',                '{no:no-prefix}default-metric {}'),
+                             ('distance-all',                  '{no:no-prefix}distance {}'),
+                             ('distance-external',             '{no:no-prefix}distance ospf external {}'),
+                             ('distance-inter-area',           '{no:no-prefix}distance ospf inter-area {}'),
+                             ('distance-intra-area',           '{no:no-prefix}distance ospf intra-area {}')]    
+
+    ospfv2_area_key_map = [('stub',                     '{no:no-prefix}area {} stub'),
+                           ('stub-no-summary',          '{no:no-prefix}area {} stub no-summary'),
+                           ('import-list',               '{no:no-prefix}area {} import-list {}'),
+                           ('export-list',               '{no:no-prefix}area {} export-list {}'),
+                           ('filter-list-in',            '{no:no-prefix}area {} filter-list prefix {} in'),
+                           ('filter-list-out',           '{no:no-prefix}area {} filter-list prefix {} out'),
+                           ('authentication',            '{}area {} authentication {}', handle_ospf_area_auth),
+                           ('stub-default-cost',         '{no:no-prefix}area {} default-cost {}'),
+                           ('shortcut',                  '{}area {} shortcut {}', handle_ospf_area_shortcut)]
+
+    ospfv2_area_vlink_key_map = [('enable',                  '{no:no-prefix}area {} virtual-link {}'),
+                                 ('dead-interval',           '{no:no-prefix}area {} virtual-link {} dead-interval {}'),
+                                 ('hello-interval',          '{no:no-prefix}area {} virtual-link {} hello-interval {}'),
+                                 ('retransmission-interval', '{no:no-prefix}area {} virtual-link {} retransmit-interval {}'),
+                                 ('transmit-delay',          '{no:no-prefix}area {} virtual-link {} transmit-delay {}'),
+                                 ('authentication-type',     '{}area {} virtual-link {} authentication {}', handle_ospf_area_vlink_auth),
+                                 ('authentication-key',      '{no:no-prefix}area {} virtual-link {} authentication-key {}'),
+                                 (['authentication-key-id', 'authentication-md5-key'],      '{no:no-prefix}area {} virtual-link {} authentication message-digest message-digest-key {} md5 {}')]
+
+    ospfv2_area_range_key_map =[('advertise',                '{} area {} range {} {}', handle_ospf_area_range_advt),
+                                ('metric',                   '{no:no-prefix} area {} range {} cost {}'),
+                                ('substitue-prefix',         '{no:no-prefix} area {} range {} substitute {}')]
+
+    ospfv2_distribution_key_map = [('route-map|BGP|IMPORT', '{no:no-prefix}distribute-list {} out bgp'),
+                                   ('route-map|STATIC|IMPORT', '{no:no-prefix}distribute-list {} out static')]
+
+    ospfv2_interface_key_map = [
+                             ('area-id', '{}ip ospf area {} {}', handle_ospf_if_common),
+                             ('authentication-type', '{}ip ospf authentication {} {}', handle_ospf_if_authtype),
+                             ('authentication-key', '{}ip ospf authentication-key {} {}', handle_ospf_if_common),
+                             ('bfd-enable', '{no:no-prefix}ip ospf bfd ', ['true', 'false']),
+                             ('metric', '{}ip ospf cost {} {}', handle_ospf_if_common),
+                             ('dead-interval', '{}ip ospf dead-interval {} {}', handle_ospf_if_common),
+                             ('hello-multiplier', '{}ip ospf dead-interval minimal hello-multiplier {} {}', handle_ospf_if_common),
+                             ('hello-interval', '{}ip ospf hello-interval {} {}', handle_ospf_if_common),
+                             (['authentication-key-id', '+authentication-md5-key'], '{}ip ospf message-digest-key {} md5 {} {}', handle_ospf_if_md5key),
+                             ('mtu-ignore', '{}ip ospf mtu-ignore {}', handle_ospf_if_mtu_ignore),
+                             ('network-type', '{}ip ospf network {}', handle_ospf_if_nwtype),
+                             ('priority', '{}ip ospf priority {} {}', handle_ospf_if_common),
+                             ('retransmission-interval', '{}ip ospf retransmit-interval {} {}', handle_ospf_if_common),
+                             ('transmit-delay', '{}ip ospf transmit-delay {} {}', handle_ospf_if_common),
+                           ]
+    static_route_map = [(['ip_prefix|ipv4', '++blackhole', '++nexthop', '++ifname', '++track', '++tag', '++distance', '++nexthop-vrf'],
+                         '{no:no-prefix}ip route {} {:blackhole} {} {} {:track} {:nh-tag} {} {:nh-vrf}', hdl_static_route, socket.AF_INET),
+                        (['ip_prefix|ipv6', '++blackhole', '++nexthop', '++ifname', '++track', '++tag', '++distance', '++nexthop-vrf'],
+                         '{no:no-prefix}ipv6 route {} {:blackhole} {} {} {:track} {:nh-tag} {} {:nh-vrf} ', hdl_static_route, socket.AF_INET6)]
+    pim_interface_key_map = [('mode', '{no:no-prefix}ip pim', ['sm','']),
+                             ('dr-priority', '{no:no-prefix}ip pim drpriority {}'),
+                             ('hello-interval', '{no:no-prefix}ip pim hello {:pim_hello_parms}',
+                              hdl_set_pim_hello_parms),
+                             ('bfd-enabled', '{no:no-prefix}ip pim bfd', ['true', 'false']),
+            ]
+    pim_global_key_map =    [('join-prune-interval', '{no:no-prefix}ip pim join-prune-interval {}'),
+                             ('keep-alive-timer', '{no:no-prefix}ip pim keep-alive-timer {}'),
+                             ('ssm-ranges', '{no:no-prefix}ip pim ssm prefix-list {}'),
+                             ('ecmp-enabled', '{no:no-prefix}ip pim ecmp', ['true', 'false']),
+                             ('ecmp-rebalance-enabled', '{no:no-prefix}ip pim ecmp rebalance',['true', 'false']),
+            ]
+    
+    igmp_mcast_grp_key_map =[('enable', '{no:no-prefix}ip igmp join {} {}'),
+                           ]
+
+    igmp_interface_config_key_map = [
+                             ('enabled', 'ip igmp {}', handle_igmp_if_enable),
+                             ('version', '{no:no-prefix}ip igmp version {}'),
+                             ('query-interval', 'ip igmp query-interval {}', handle_igmp_if_common),
+                             ('query-max-response-time', 'ip igmp query-max-response-time {}', handle_igmp_if_common),
+                             ('last-member-query-count', 'ip igmp last-member-query-count {}', handle_igmp_if_common),
+                             ('last-member-query-interval', 'ip igmp last-member-query-interval {}', handle_igmp_if_common),
+                           ]
+    ip_sla_key_map = [
+                             ('sla_id', '{no:no-prefix}ip sla {}'),
+                             ('frequency', 'frequency {}', handle_ip_sla_common),
+                             ('threshold', 'threshold {}', handle_ip_sla_common),
+                             ('timeout', 'timeout {}', handle_ip_sla_common),
+                             ('tcp_source_port', 'source-port {}', handle_ip_sla_common),
+                             ('tcp_source_ip', 'source-address {}', handle_ip_sla_common),
+                             ('tcp_dst_ip', 'tcp-connect {} port {}', handle_ip_sla_tcp_connect),
+                             ('tcp_vrf', 'source-vrf {}', handle_ip_sla_common),
+                             ('tcp_dst_port', 'tcp-connect {} port {}', handle_ip_sla_tcp_connect),
+                             ('tcp_source_interface', 'source-interface {}', handle_ip_sla_common),
+                             ('tcp_ttl', 'ttl {}', handle_ip_sla_common),
+                             ('tcp_tos', 'tos {}', handle_ip_sla_common),
+                             ('icmp_source_interface', 'source-interface {}', handle_ip_sla_common),
+                             ('icmp_source_ip', 'source-address {}', handle_ip_sla_common),
+                             ('icmp_dst_ip', 'icmp-echo {}', handle_ip_sla_icmp_echo),
+                             ('icmp_vrf', 'source-vrf {}', handle_ip_sla_common),
+                             ('icmp_size', 'request-data-size {}', handle_ip_sla_common),
+                             ('icmo_ttl', 'ttl {}', handle_ip_sla_common),
+                             ('icmp_tos', 'tos {}', handle_ip_sla_common),
+                           ]
+
+
+    tbl_to_key_map = {'BGP_GLOBALS':                    global_key_map,
+                      'BGP_GLOBALS_AF':                 global_af_key_map,
+                      'BGP_GLOBALS_LISTEN_PREFIX':      listen_prefix_key_map,
+                      'BGP_NEIGHBOR':                   cmn_key_map[0:2] + nbr_key_map + cmn_key_map[2:],
+                      'BGP_PEER_GROUP':                 cmn_key_map,
+                      'BGP_NEIGHBOR_AF':                nbr_af_key_map,
+                      'BGP_PEER_GROUP_AF':              nbr_af_key_map,
+                      'ROUTE_MAP':                      route_map_key_map,
+                      'COMMUNITY_SET':                  community_set_key_map,
+                      'EXTENDED_COMMUNITY_SET':         extcommunity_set_key_map,
+                      'AS_PATH_SET':                    aspath_set_key_map,
+                      'ROUTE_REDISTRIBUTE':             route_redist_key_map,
+                      'BGP_GLOBALS_AF_AGGREGATE_ADDR':  af_aggregate_key_map,
+                      'BGP_GLOBALS_AF_NETWORK':         af_network_key_map,
+                      'BGP_GLOBALS_EVPN_VNI':           global_evpn_vni_key_map,
+                      'BFD_PEER_SINGLE_HOP':            bfd_peer_shop_key_map,          
+                      'BFD_PEER_MULTI_HOP':             bfd_peer_mhop_key_map,
+                      'IP_SLA':                         ip_sla_key_map,
+                      'OSPFV2_ROUTER':                  ospfv2_global_key_map,
+                      'OSPFV2_ROUTER_AREA':             ospfv2_area_key_map,
+                      'OSPFV2_ROUTER_AREA_VIRTUAL_LINK':ospfv2_area_vlink_key_map,
+                      'OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE':ospfv2_area_range_key_map,
+                      'OSPFV2_INTERFACE':               ospfv2_interface_key_map,
+                      'STATIC_ROUTE':                   static_route_map,
+                      'PIM_GLOBALS':                    pim_global_key_map,
+                      'PIM_INTERFACE':                  pim_interface_key_map,
+                      'IGMP_INTERFACE':                 igmp_mcast_grp_key_map,
+                      'IGMP_INTERFACE_QUERY':           igmp_interface_config_key_map
+    }
+
+    vrf_tables = {'BGP_GLOBALS', 'BGP_GLOBALS_AF',
+                  'BGP_NEIGHBOR', 'BGP_PEER_GROUP', 'BGP_NEIGHBOR_AF', 'BGP_PEER_GROUP_AF',
+                  'BGP_GLOBALS_LISTEN_PREFIX', 'ROUTE_REDISTRIBUTE',
+                  'BGP_GLOBALS_AF_AGGREGATE_ADDR', 'BGP_GLOBALS_AF_NETWORK',
+                  'BGP_GLOBALS_EVPN_RT', 'BGP_GLOBALS_EVPN_VNI', 'BGP_GLOBALS_EVPN_VNI_RT'}
+
+    @staticmethod
+    def __peer_is_ip(peer):
+        try:
+            socket.inet_pton(socket.AF_INET, peer)
+            return True
+        except socket.error:
+            pass
+        try:
+            socket.inet_pton(socket.AF_INET6, peer)
+            return True
+        except socket.error:
+            pass
+        return False
+
+    def __init__(self):
+        self.config_db = ExtConfigDBConnector({'STATIC_ROUTE': {'nexthop', 'ifname', 'distance', 'nexthop-vrf', 'blackhole', 'track'}})
+        try:
+            self.config_db.connect()
+        except Exception as e:
+            syslog.syslog(syslog.LOG_ERR, '[bgp cfgd] Failed connecting to config DB with exception:' + str(e))
+        db_entry = self.config_db.get_entry('DEVICE_METADATA', 'localhost')
+        if 'bgp_asn' in db_entry:
+            self.metadata_asn = db_entry['bgp_asn']
+        else:
+            self.metadata_asn = None
+        if 'docker_routing_config_mode' in db_entry:
+            self.config_mode = db_entry['docker_routing_config_mode']
+        else:
+            self.config_mode = "separated"
+        # VRF ==> local_as
+        self.bgp_asn = {}
+        # VRF ==> confederation peer list
+        self.bgp_confed_peers = {}
+        glb_table = self.config_db.get_table('BGP_GLOBALS')
+        for vrf, entry in glb_table.items():
+            if 'local_asn' in entry:
+                self.bgp_asn[vrf] = entry['local_asn']
+                syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: VRF %s Local_ASN %s' % (vrf, self.bgp_asn[vrf]))
+            if 'confed_peers' in entry:
+                self.bgp_confed_peers[vrf] = set(entry['confed_peers'])
+        # VRF ==> grp_name ==> peer_group
+        self.bgp_peer_group = {}
+        # VRF ==> set of interface neighbor
+        self.bgp_intf_nbr = {}
+        nbr_table = self.config_db.get_table('BGP_NEIGHBOR')
+        pg_table = self.config_db.get_table('BGP_PEER_GROUP')
+        for key, entry in pg_table.items():
+            vrf, pg = key
+            self.bgp_peer_group.setdefault(vrf, {})[pg] = BGPPeerGroup(vrf)
+            syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: VRF %s Peer_Group %s' % (vrf, pg))
+        for key, entry in nbr_table.items():
+            if len(key) != 2:
+                continue
+            vrf, peer = key
+            if 'peer_group_name' in entry:
+                pg_name = entry['peer_group_name']
+                if vrf in self.bgp_peer_group and pg_name in self.bgp_peer_group[vrf]:
+                    self.bgp_peer_group[vrf][pg_name].ref_nbrs.add(peer)
+                    syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: VRF %s Neighbor %s Peer_Group %s' %
+                            (vrf, peer, pg_name))
+            if not self.__peer_is_ip(peer):
+                self.bgp_intf_nbr.setdefault(vrf, set()).add(peer)
+        # map_name ==> seq_no ==> operation
+        self.route_map = {}
+        rtmap_table = self.config_db.get_table('ROUTE_MAP')
+        for key, entry in rtmap_table.items():
+            rtmap_name, seq_no = key
+            syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: Route_Map %s Seq_NO %s' % (rtmap_name, seq_no))
+            if 'route_operation' in entry:
+                self.route_map.setdefault(rtmap_name, {})[seq_no] = entry['route_operation']
+
+        self.comm_set_list = {}
+        comm_table = self.config_db.get_table('COMMUNITY_SET')
+        for key, entry in comm_table.items():
+            syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: Community %s' % key)
+            self.comm_set_list[key] = CommunityList(key, False)
+            for k, v in entry.items():
+                self.comm_set_list[key].db_data_to_attr(k, v)
+        self.extcomm_set_list = {}
+        extcomm_table = self.config_db.get_table('EXTENDED_COMMUNITY_SET')
+        for key, entry in extcomm_table.items():
+            syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: Extended_Community %s' % key)
+            self.extcomm_set_list[key] = CommunityList(key, True)
+            for k, v in entry.items():
+                self.extcomm_set_list[key].db_data_to_attr(k, v)
+        self.prefix_set_list = {}
+        pfx_set_table = self.config_db.get_table('PREFIX_SET')
+        for key, entry in pfx_set_table.items():
+            if 'mode' in entry:
+                syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: Prefix_Set %s mode %s' % (key, entry['mode']))
+                self.prefix_set_list[key] = MatchPrefixList(entry['mode'].lower())
+        pfx_table = self.config_db.get_table('PREFIX')
+        for key, entry in pfx_table.items():
+            pfx_set_name, ip_pfx, len_range = key
+            syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: Prefix %s range %s of set %s' % (ip_pfx, len_range, pfx_set_name))
+            if len_range == 'exact':
+                len_range = None
+            if pfx_set_name in self.prefix_set_list and 'action' in entry:
+                try:
+                    self.prefix_set_list[pfx_set_name].add_prefix(ip_pfx, len_range, entry['action'])
+                except ValueError:
+                    pass
+        self.as_path_set_list = {}
+        aspath_table = self.config_db.get_table('AS_PATH_SET')
+        for key, entry in aspath_table.items():
+            if 'as_path_set_member' in entry:
+                syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: AS_Path_Set %s member %s' % (key, entry['as_path_set_member']))
+                self.as_path_set_list[key] = entry['as_path_set_member'][:]
+        self.tag_set_list = {}
+
+        self.af_aggr_list = {}
+        af_aggr_table = self.config_db.get_table('BGP_GLOBALS_AF_AGGREGATE_ADDR')
+        for key, entry in af_aggr_table.items():
+            vrf, af_type, ip_pfx = key
+            af, _ = af_type.lower().split('_')
+            norm_ip_pfx = MatchPrefix.normalize_ip_prefix((socket.AF_INET if af == 'ipv4' else socket.AF_INET6), ip_pfx)
+            if norm_ip_pfx is not None:
+                syslog.syslog(syslog.LOG_DEBUG, 'Init Config DB Data: AF Aggregate Prefix %s of vrf %s AF %s' % (norm_ip_pfx, vrf, af))
+                aggr_obj = AggregateAddr()
+                for k, v in entry.items():
+                    if v == 'true':
+                        setattr(aggr_obj, k, True)
+                self.af_aggr_list.setdefault(vrf, {})[norm_ip_pfx] = aggr_obj
+
+        self.vrf_vni_map = {}
+        vrf_table = self.config_db.get_table('VRF')
+        for key, entry in vrf_table.items():
+            if 'vni' in entry:
+                self.vrf_vni_map[key] = entry['vni']
+
+        # VRF ==> ip_prefix ==> nexthop list
+        self.static_route_list = {}
+        sroute_table = self.config_db.get_table('STATIC_ROUTE')
+        get_list = lambda v: v.split(',') if v is not None else None
+        for key, entry in sroute_table.items():
+            if type(key) is tuple and len(key) == 2:
+                vrf, ip_prefix = key
+            else:
+                vrf = self.DEFAULT_VRF
+                ip_prefix = key
+            af, ip_prefix = IpNextHopSet.get_af_norm_prefix(ip_prefix)
+            nh_attr = lambda k: get_list(entry.get(k, None))
+            self.static_route_list.setdefault(vrf, {})[ip_prefix] = IpNextHopSet(af,
+                                        nh_attr('blackhole'), nh_attr('nexthop'),nh_attr('track'),
+                                        nh_attr('ifname'), nh_attr('tag'), nh_attr('distance'),
+                                        nh_attr('nexthop-vrf'))
+
+        self.table_handler_list = [
+            ('VRF', self.vrf_handler),
+            ('DEVICE_METADATA', self.metadata_handler),
+            ('BGP_GLOBALS', self.bgp_global_handler),
+            ('BGP_GLOBALS_AF', self.bgp_af_handler),
+            ('PREFIX_SET', self.bgp_table_handler_common),
+            ('PREFIX', self.bgp_table_handler_common),
+            ('COMMUNITY_SET', self.comm_set_handler),
+            ('EXTENDED_COMMUNITY_SET', self.comm_set_handler),
+            ('ROUTE_MAP', self.bgp_table_handler_common),
+            ('BGP_PEER_GROUP', self.bgp_neighbor_handler),
+            ('BGP_NEIGHBOR', self.bgp_neighbor_handler),
+            ('BGP_PEER_GROUP_AF', self.bgp_table_handler_common),
+            ('BGP_NEIGHBOR_AF', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_LISTEN_PREFIX', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_EVPN_VNI', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_EVPN_RT', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_EVPN_VNI_RT', self.bgp_table_handler_common),
+            ('BFD_PEER', self.bfd_handler),
+            ('NEIGHBOR_SET', self.bgp_table_handler_common),
+            ('NEXTHOP_SET', self.bgp_table_handler_common),
+            ('TAG_SET', self.bgp_table_handler_common),
+            ('AS_PATH_SET', self.bgp_table_handler_common),
+            ('ROUTE_REDISTRIBUTE', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_AF_AGGREGATE_ADDR', self.bgp_table_handler_common),
+            ('BGP_GLOBALS_AF_NETWORK', self.bgp_table_handler_common),
+            ('BFD_PEER_SINGLE_HOP', self.bgp_table_handler_common),               
+            ('BFD_PEER_MULTI_HOP', self.bgp_table_handler_common),
+            ('IP_SLA', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_AREA', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_AREA_VIRTUAL_LINK', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_AREA_NETWORK', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_DISTRIBUTE_ROUTE', self.bgp_table_handler_common),
+            ('OSPFV2_INTERFACE', self.bgp_table_handler_common),
+            ('OSPFV2_ROUTER_PASSIVE_INTERFACE', self.bgp_table_handler_common),
+            ('STATIC_ROUTE', self.bgp_table_handler_common),
+            ('PIM_GLOBALS', self.bgp_table_handler_common),
+            ('PIM_INTERFACE', self.bgp_table_handler_common),
+            ('IGMP_INTERFACE', self.bgp_table_handler_common),
+            ('IGMP_INTERFACE_QUERY', self.bgp_table_handler_common)
+        ]
+        self.bgp_message = queue.Queue(0)
+        self.table_data_cache = self.config_db.get_table_data([tbl for tbl, _ in self.table_handler_list])
+        syslog.syslog(syslog.LOG_DEBUG, 'Init Cached DB data')
+        for key, entry in self.table_data_cache.items():
+            syslog.syslog(syslog.LOG_DEBUG, '  %-20s : %s' % (key, entry))
+        if self.config_mode == "unified":
+            for table, _ in self.table_handler_list:
+                table_list = self.config_db.get_table(table)
+                for key, data in table_list.items():
+                    syslog.syslog(syslog.LOG_DEBUG, 'config replay for table {} key {}'.format(table, key))
+                    upd_data = {}
+                    for upd_key, upd_val in data.items():
+                        upd_data[upd_key] = CachedDataWithOp(upd_val, CachedDataWithOp.OP_ADD)
+                    self.bgp_message.put((self.config_db.serialize_key(key), False, table, upd_data))
+                    upd_data_list = []
+                    self.__update_bgp(upd_data_list)
+                    for table1, key1, data1 in upd_data_list:
+                        table_key = ExtConfigDBConnector.get_table_key(table1, key1)
+                        self.__update_cache_data(table_key, data1)
+
+    def subscribe_all(self):
+        for table, hdlr in self.table_handler_list:
+            self.config_db.subscribe(table, hdlr)
+
+    @staticmethod
+    def __run_command(table, command, daemons = None):
+        return g_run_command(table, command, True, daemons)
+        
+    def metadata_handler(self, table, key, data):
+        if key != 'localhost':
+            syslog.syslog(syslog.LOG_DEBUG, 'not localhost data update')
+            return
+        if data is None or 'bgp_asn' not in data:
+            self.metadata_asn = None
+        else:
+            self.metadata_asn = data['bgp_asn']
+
+    def bfd_handler(self, table, key, data):
+        syslog.syslog(syslog.LOG_INFO, '[bgp cfgd](bfd) value for {} changed to {}'.format(key, data))
+        #get frr bfd session key
+        key_params = key.split('|')
+        cmd = 'peer {}'.format(key_params[0])
+        if len(key_params) == 4 and key_params[3] == 'multihop':
+            cmd = cmd + ' multihop '
+        if key_params[1] != 'null':
+            cmd = cmd + ' local-address ' + key_params[1]
+        if key_params[2] != 'null':
+            cmd = cmd + ' interface ' + key_params[2]
+        if not data:
+            #BFD peer is deleted
+            command = "vtysh -c 'configure terminal' -c 'bfd' -c 'no {}'".format(cmd)
+            self.__run_command(table, command)
+        else:
+            #create/update case
+            command = "vtysh -c 'configure terminal' -c 'bfd' -c '{}'".format(cmd)
+            for param in data:
+                if param == 'transmit_interval':
+                    command = command + " -c 'transmit-interval {}'".format(data[param])
+                elif param == 'receive_interval':
+                    command = command + " -c 'receive-interval {}'".format(data[param])
+                elif param == 'multiplier':
+                    command = command + " -c 'detect-multiplier {}'".format(data[param])
+                elif param == 'echo_mode' and data[param] == 'true':
+                    command = command + " -c 'echo-mode'"
+                elif param == 'echo_interval':
+                    command = command + " -c 'echo-interval {}'".format(data[param])
+                elif param == 'label':
+                    command = command + " -c 'label {}'".format(data[param])
+                elif param == 'admin_status' and data[param] == 'up':
+                    command = command + " -c 'no shutdown'"
+                elif param == 'admin_status' and data[param] == 'down':
+                    command = command + " -c 'shutdown'"
+            self.__run_command(table, command)
+    
+    def vrf_handler(self, table, key, data):
+        syslog.syslog(syslog.LOG_INFO, '[bgp cfgd](vrf) value for {} changed to {}'.format(key, data))
+        #get vrf key
+        key_params = key.split('|')
+        cmd = 'vrf {}'.format(key_params[0])
+        if not data:
+            #VRF is deleted
+            command = "vtysh -c 'configure terminal' -c '{}'".format(cmd)
+            if key_params[0] in self.vrf_vni_map:
+                command = command + " -c 'no vni {}'".format(self.vrf_vni_map[key_params[0]])
+                del self.vrf_vni_map[key_params[0]]
+                self.__run_command(table, command)
+        else:
+            #create/update case
+            command = "vtysh -c 'configure terminal' -c '{}'".format(cmd)
+            positive_execute = False
+            for param in data:
+                if param == 'vni':
+                    if data[param] != '0':
+                        command = command + " -c 'vni {}'".format(data[param])
+                        self.vrf_vni_map[key_params[0]] = data[param]
+                        positive_execute = True
+                    elif key_params[0] in self.vrf_vni_map:
+                        command = command + " -c 'no vni {}'".format(self.vrf_vni_map[key_params[0]])
+                        del self.vrf_vni_map[key_params[0]]
+                        positive_execute = True
+            if positive_execute == True:
+                self.__run_command(table, command)
+
+    def __get_vrf_asn(self, vrf):
+        if vrf in self.bgp_asn:
+            return self.bgp_asn[vrf]
+        if vrf == self.DEFAULT_VRF and self.metadata_asn is not None:
+            return self.metadata_asn
+        return None
+
+    def __delete_vrf_asn(self, vrf, table, data):
+        if vrf != self.DEFAULT_VRF and vrf not in self.bgp_asn:
+            syslog.syslog(syslog.LOG_ERR, 'non-default VRF {} was not configured'.format(vrf))
+            return False
+        local_asn = self.__get_vrf_asn(vrf)
+        if local_asn is None:
+            syslog.syslog(syslog.LOG_ERR, 'failed to get local ASN of VRF {} for delete'.format(vrf))
+            return False
+        command = "vtysh -c 'configure terminal' -c 'no router bgp {}".format(local_asn)
+        if vrf != self.DEFAULT_VRF:
+            command += " vrf {}'".format(vrf)
+        else:
+            command += "'"
+        if not self.__run_command(table, command):
+            syslog.syslog(syslog.LOG_ERR, 'failed to delete local_asn for VRF %s' % vrf)
+            return False
+        if vrf in self.bgp_asn:
+            del(self.bgp_asn[vrf])
+        for dkey, dval in data.items():
+            # force delete all VRF instance attributes in cache
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_DELETE
+        return True
+
+    def __cleanup_nbr_cache(self, vrf, nbr):
+        nbr_key = ExtConfigDBConnector.get_table_key('BGP_NEIGHBOR',
+                                            self.config_db.serialize_key((vrf, nbr)))
+        self.table_data_cache.pop(nbr_key, None)
+        for af in ['ipv4', 'ipv6']:
+            nbr_af_key = ExtConfigDBConnector.get_table_key('BGP_NEIGHBOR_AF',
+                                                self.config_db.serialize_key((vrf, nbr, af + '_unicast')))
+            self.table_data_cache.pop(nbr_af_key, None)
+
+    def __delete_vrf_neighbor(self, vrf, peer, data, is_peer_grp):
+        if is_peer_grp:
+            if vrf in self.bgp_peer_group and peer in self.bgp_peer_group[vrf]:
+                del(self.bgp_peer_group[vrf][peer])
+        else:
+            if vrf in self.bgp_peer_group:
+                for _, peer_grp in self.bgp_peer_group[vrf].items():
+                    if peer in peer_grp.ref_nbrs:
+                        peer_grp.ref_nbrs.remove(peer)
+            if not self.__peer_is_ip(peer) and vrf in self.bgp_intf_nbr and peer in self.bgp_intf_nbr[vrf]:
+                self.bgp_intf_nbr[vrf].remove(peer)
+        self.__cleanup_nbr_cache(vrf, peer)
+        for dkey, dval in data.items():
+            # bypass cache update because cache entry was removed
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_NONE
+
+    def __delete_pg_neighbors(self, vrf, pg_name):
+        syslog.syslog(syslog.LOG_DEBUG,
+                'delete all associated neighbors of peer group %s of vrf %s from cache' % (pg_name, vrf))
+        if vrf in self.bgp_peer_group and pg_name in self.bgp_peer_group[vrf]:
+            peer_grp = self.bgp_peer_group[vrf][pg_name]
+            for nbr in peer_grp.ref_nbrs:
+                if vrf in self.bgp_intf_nbr and nbr in self.bgp_intf_nbr[vrf]:
+                    self.bgp_intf_nbr[vrf].remove(nbr)
+                self.__cleanup_nbr_cache(vrf, nbr)
+            peer_grp.ref_nbrs.clear()
+
+    def __delete_route_map(self, map_name, seq_no, data):
+        if map_name in self.route_map and seq_no in self.route_map[map_name]:
+            del(self.route_map[map_name][seq_no])
+        for dkey, dval in data.items():
+            # force delete all neighbor attributes in cache
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_DELETE
+
+    @staticmethod
+    def __vrf_based_table(table_name):
+        return table_name in BGPConfigDaemon.vrf_tables
+
+    @staticmethod
+    def get_prefix_set_name(orig_name, table_name):
+        new_name = orig_name
+        if table_name == 'NEIGHBOR_SET':
+            new_name += '_neighbor'
+        elif table_name == 'NEXTHOP_SET':
+            new_name += '_nexthop'
+        return new_name
+
+    def __apply_dep_vrf_table(self, vrf, table_name, *table_key, **extra_args):
+        if len(table_key) > 0:
+            new_key = (vrf,) + table_key
+            entry_list = {new_key: self.config_db.get_entry(table_name, new_key)}
+        else:
+            entry_list = self.config_db.get_table(table_name)
+        match_fn = extra_args.get('match', None)
+        for key, data in entry_list.items():
+            if data is None or len(key) == 0 or key[0] != vrf:
+                continue
+            if match_fn is not None and not match_fn(data):
+                continue
+            syslog.syslog(syslog.LOG_DEBUG, 'attr re-apply for vrf {} table {} key {} data {}'.format(vrf, table_name, key, data))
+            upd_data = {}
+            for upd_key, upd_val in data.items():
+                upd_data[upd_key] = CachedDataWithOp(upd_val, CachedDataWithOp.OP_ADD)
+            self.bgp_message.put((self.config_db.serialize_key(key), False, table_name, upd_data))
+
+    @staticmethod
+    def __nbr_impl_action(data, peer, is_pg):
+        if is_pg:
+            chk_attrs = ['asn']
+        elif BGPConfigDaemon.__peer_is_ip(peer):
+            chk_attrs = ['asn', 'peer_group_name']
+        else:
+            chk_attrs = ['peer_group_name']
+        for attr in chk_attrs:
+            val = data.get(attr, None)
+            if val is not None:
+                if val.op == CachedDataWithOp.OP_ADD:
+                    return 'apply'
+                elif val.op == CachedDataWithOp.OP_DELETE:
+                    return 'delete'
+        return None
+
+    def __apply_config_op_success(self, data, cfg_data={}):
+        op_list = [ CachedDataWithOp.OP_NONE, CachedDataWithOp.OP_ADD,
+                    CachedDataWithOp.OP_DELETE, CachedDataWithOp.OP_UPDATE ]
+        if len(cfg_data) == 0:
+            for dkey, dval in data.items():
+                dval.status = CachedDataWithOp.STAT_SUCC
+        else : 
+            for dkey, dval in data.items():
+                if dkey in cfg_data.keys():
+                    if cfg_data[dkey] not in op_list :
+                        syslog.syslog(syslog.LOG_INFO, 'Invalid op {} received'.format(cfg_data[dkey]))
+                        continue
+                    dval.status = CachedDataWithOp.STAT_SUCC
+                    dval.op = cfg_data[dkey]
+        syslog.syslog(syslog.LOG_INFO, 'apply_config_op_success on {}.'.format(data))
+
+    def __apply_config_delete_success(self, data):
+        for dkey, dval in data.items():
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_DELETE
+    
+    def __ospf_delete (self, data):
+        for dkey, dval in data.items():
+            # force delete all peer attributes in cache
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_DELETE
+
+    def __ospf_apply_config(self, data, rmapoper, metricoper, metrictypeoper, alwaysoper, acclistoper):
+        for dkey, dval in data.items():
+ 
+            if 'route-map' == dkey:
+                dval.status = CachedDataWithOp.STAT_SUCC
+                dval.op = rmapoper
+
+            if 'metric' == dkey:
+                dval.status = CachedDataWithOp.STAT_SUCC
+                dval.op = metricoper
+
+            if 'metric-type' == dkey:
+                dval.status = CachedDataWithOp.STAT_SUCC
+                dval.op = metrictypeoper
+
+            if 'always' == dkey:
+                dval.status = CachedDataWithOp.STAT_SUCC
+                dval.op = alwaysoper
+
+            if 'access-list' == dkey:
+                dval.status = CachedDataWithOp.STAT_SUCC
+                dval.op = acclistoper
+
+    def __delete_bfd_peer(self, data):
+        for dkey, dval in data.items():
+            # force delete all peer attributes in cache
+            dval.status = CachedDataWithOp.STAT_SUCC
+            dval.op = CachedDataWithOp.OP_DELETE
+
+    def __bfd_handle_delete (self, data):
+        cmd_suffix = ""
+        if 'desired-minimum-tx-interval' in data:
+            dval = data['desired-minimum-tx-interval']
+            cmd_suffix = "transmit-interval 300"
+        elif 'required-minimum-receive' in data:
+            dval = data['required-minimum-receive']
+            cmd_suffix = "receive-interval 300"
+        elif 'detection-multiplier' in data:
+            dval = data['detection-multiplier']
+            cmd_suffix = "detect-multiplier 3"
+        elif 'desired-minimum-echo-receive' in data:
+            dval = data['desired-minimum-echo-receive']
+            cmd_suffix = "echo-interval 300"
+        if cmd_suffix != "":
+            return cmd_suffix, dval.op
+
+        return cmd_suffix, None
+
+    def __update_bgp(self, data_list):
+        while not self.bgp_message.empty():
+            key, del_table, table, data = self.bgp_message.get()
+            if table == 'STATIC_ROUTE' and len(key.split('|')) == 1:
+                key = self.DEFAULT_VRF + '|' + key
+            key_list = key.split('|', 1)
+            if table == 'BGP_NEIGHBOR' and len(key_list) == 1:
+                # bypass non-compatible neighbor table
+                continue
+            data_list.append((table, key, data))
+            if len(key_list) > 1:
+                key = key_list[1]
+            else:
+                key = None
+            prefix = key_list[0]
+            syslog.syslog(syslog.LOG_INFO, 'value for table {} prefix {} key {} changed to {}'.format(table, prefix, key, data))
+            if self.__vrf_based_table(table):
+                vrf = prefix
+                local_asn = self.__get_vrf_asn(vrf)
+                if local_asn is None and (table != 'BGP_GLOBALS' or 'local_asn' not in data):
+                    syslog.syslog(syslog.LOG_DEBUG, 'ignore table {} update because local_asn for VRF {} was not configured'.\
+                            format(table, vrf))
+                    continue
+            if table in self.tbl_to_key_map:
+                tbl_key = None
+                if table == 'BGP_NEIGHBOR_AF' or table == 'BGP_PEER_GROUP_AF' and key is not None:
+                    _, af_ip_type = key.split('|')
+                    tbl_key, _ = af_ip_type.lower().split('_')
+                    tbl_key = {'admin_status': tbl_key}
+                elif table == 'ROUTE_MAP':
+                    tbl_key = {}
+                    for attr_name, table_name in {'match_prefix_set': 'PREFIX', 'match_next_hop_set': 'PREFIX'}.items():
+                        if attr_name in data:
+                            pfx_set_name = self.get_prefix_set_name(data[attr_name].data, table_name)
+                            if pfx_set_name in self.prefix_set_list:
+                                af_mode = self.prefix_set_list[pfx_set_name].af
+                                tbl_key[attr_name] = 'ipv4' if af_mode == socket.AF_INET else 'ipv6'
+                elif table == 'STATIC_ROUTE':
+                    af_id, new_key = IpNextHopSet.get_af_norm_prefix(key)
+                    if new_key is not None:
+                        key = new_key
+                        tbl_key = {'ip_prefix': ('ipv4' if af_id == socket.AF_INET else 'ipv6')}
+                key_map = BGPKeyMapList(self.tbl_to_key_map[table], table, tbl_key)
+            else:
+                key_map = None
+            if table == 'BGP_GLOBALS':
+                if not del_table:
+                    if 'local_asn' in data:
+                        dval = data['local_asn']
+                        if dval.op == CachedDataWithOp.OP_DELETE:
+                            # delete local_asn will delete whole VRF instance
+                            self.__delete_vrf_asn(vrf, table, data)
+                            continue
+                        prog_asn = True
+                        if dval.op == CachedDataWithOp.OP_UPDATE:
+                            syslog.syslog(syslog.LOG_ERR, 'local_asn could not be modified')
+                            prog_asn = False
+                        if dval.op == CachedDataWithOp.OP_NONE:
+                            prog_asn = False
+                        if prog_asn:
+                            command = "vtysh -c 'configure terminal' -c 'router bgp {} vrf {}' -c 'no bgp default ipv4-unicast'".format(dval.data, vrf)
+                            if self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_DEBUG, 'set local_asn %s to VRF %s, re-apply all VRF related tables' % (dval.data, vrf))
+                                self.bgp_asn[vrf] = dval.data
+                                self.__apply_dep_vrf_table(vrf, 'ROUTE_REDISTRIBUTE')
+                                dval.status = CachedDataWithOp.STAT_SUCC
+                            else:
+                                syslog.syslog(syslog.LOG_ERR, 'failed to set local_asn %s to VRF %s' % (dval.data, vrf))
+                        else:
+                            dval.status = CachedDataWithOp.STAT_SUCC
+                    if 'confed_peers' in data:
+                        self.upd_confed_peers = copy.copy(self.bgp_confed_peers.get(vrf, set()))
+                    local_asn = self.__get_vrf_asn(vrf)
+                    if local_asn is None:
+                        syslog.syslog(syslog.LOG_ERR, 'local ASN for VRF %s was not configured' % vrf)
+                        continue
+                    cmd_prefix = ['configure terminal', 'router bgp {} vrf {}'.format(local_asn, vrf)]
+                    if not key_map.run_command(self, table, data, cmd_prefix):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running BGP global config command')
+                        continue
+                    if 'confed_peers' in data:
+                        self.bgp_confed_peers[vrf] = copy.copy(self.upd_confed_peers)
+                else:
+                    self.__delete_vrf_asn(vrf, table, data)
+            elif table == 'BGP_GLOBALS_AF':
+                af, ip_type = key.lower().split('_')
+                #this is to temporarily make table cache key accessible to key_map handler function
+                self.tmp_cache_key = 'BGP_GLOBALS_AF&&{}|{}'.format(vrf, key.lower())
+                syslog.syslog(syslog.LOG_INFO, 'Set address family global to {} {} cache-key to {}'.format(af, ip_type, self.tmp_cache_key))
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf),
+                              'address-family {} {}'.format(af, ip_type)]
+                if not key_map.run_command(self, table, data, cmd_prefix):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP global AF config command')
+                    continue
+                self.tmp_cache_key = ''
+            elif table == 'BGP_GLOBALS_LISTEN_PREFIX':
+                syslog.syslog(syslog.LOG_INFO, 'Set BGP listen prefix {}'.format(key))
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf)]
+                if not key_map.run_command(self, table, data, cmd_prefix, key):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP global listen prefix config command')
+                    continue
+            elif table == 'BGP_NEIGHBOR' or table == 'BGP_PEER_GROUP':
+                is_peer_group = table == 'BGP_PEER_GROUP'
+                if not del_table:
+                    if is_peer_group:
+                        # if peer group is not created, create it before setting other attributes
+                        if key not in self.bgp_peer_group.setdefault(vrf, {}):
+                            command = "vtysh -c 'configure terminal' -c 'router bgp {} vrf {}' ".format(local_asn, vrf)
+                            command += "-c 'neighbor {} peer-group'".format(key)
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to create peer-group %s for VRF %s' % (key, vrf))
+                                continue
+                            self.bgp_peer_group[vrf][key] = BGPPeerGroup(vrf)
+                    elif not self.__peer_is_ip(key):
+                        if key not in self.bgp_intf_nbr.setdefault(vrf, set()):
+                            command = "vtysh -c 'configure terminal' -c 'router bgp {} vrf {}' ".format(local_asn, vrf)
+                            command += "-c 'neighbor {} interface'".format(key)
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to create neighbor of interface %s for VRF %s' % (key, vrf))
+                                continue
+                            self.bgp_intf_nbr[vrf].add(key)
+                    bfd_val = data.get('bfd', None)
+                    if (bfd_val is not None and (bfd_val.op == CachedDataWithOp.OP_ADD or bfd_val.op == CachedDataWithOp.OP_UPDATE) and
+                        bfd_val.data == 'true'):
+                        cp_chk_val = data.get('bfd_check_ctrl_plane_failure', None)
+                        if cp_chk_val is not None and cp_chk_val.op == CachedDataWithOp.OP_NONE and cp_chk_val.data == 'true':
+                            cp_chk_val.op = CachedDataWithOp.OP_ADD
+                    cmd_prefix = ['configure terminal', 'router bgp {} vrf {}'.format(local_asn, vrf)]
+                    if not key_map.run_command(self, table, data, cmd_prefix, key):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running BGP neighbor config command')
+                        continue
+                    if ('peer_group_name' in data and
+                        (data['peer_group_name'].op == CachedDataWithOp.OP_ADD or
+                         data['peer_group_name'].op == CachedDataWithOp.OP_DELETE)):
+                        dval = data['peer_group_name']
+                        if vrf not in self.bgp_peer_group or dval.data not in self.bgp_peer_group[vrf]:
+                            # should not happen because vtysh command will fail if peer_group not exists
+                            syslog.syslog(syslog.LOG_ERR, 'invalid peer-group %s was referenced' % dval.data)
+                            continue
+                        peer_grp = self.bgp_peer_group[vrf][dval.data]
+                        if dval.op == CachedDataWithOp.OP_ADD:
+                            peer_grp.ref_nbrs.add(key)
+                        else:
+                            peer_grp.ref_nbrs.discard(key)
+                    nbr_action = self.__nbr_impl_action(data, key, is_peer_group)
+                    if nbr_action == 'delete':
+                        if not is_peer_group and self.__peer_is_ip(key):
+                            # delete asn or peer_group will delete all neighbor
+                            self.__delete_vrf_neighbor(vrf, key, data, False)
+                        elif is_peer_group:
+                            # clear associated neighbor list in cache
+                            self.__delete_pg_neighbors(vrf, key)
+                    elif nbr_action == 'apply':
+                        if is_peer_group:
+                            syslog.syslog(syslog.LOG_DEBUG, 'apply attributes to FRR for vrf %s peer_group %s' % (vrf, key))
+                            match_pg = lambda data: data.get('peer_group', None) == key
+                            self.__apply_dep_vrf_table(vrf, 'BGP_GLOBALS_LISTEN_PREFIX', match = match_pg)
+                            match_nbr = lambda data: data.get('peer_group_name', None) == key
+                            self.__apply_dep_vrf_table(vrf, 'BGP_NEIGHBOR', match = match_nbr)
+                        else:
+                            for af in ['ipv4_unicast', 'ipv6_unicast']:
+                                syslog.syslog(syslog.LOG_DEBUG, 'apply attributes to FRR for vrf %s neighbor %s af %s' % (vrf, key, af))
+                                self.__apply_dep_vrf_table(vrf, 'BGP_NEIGHBOR_AF', key, af)
+                else:
+                    # Neighbor is deleted
+                    if is_peer_group:
+                        # clear associated neighbor list in cache
+                        self.__delete_pg_neighbors(vrf, key)
+                    command = "vtysh -c 'configure terminal' -c 'router bgp {} vrf {}' -c 'no neighbor {}'".\
+                        format(local_asn, vrf, key)
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete VRF %s bgp neigbor %s' % (vrf, key))
+                    self.__delete_vrf_neighbor(vrf, key, data, is_peer_group)
+            elif table == 'BGP_NEIGHBOR_AF' or table == 'BGP_PEER_GROUP_AF':
+                nbr, af_type = key.split('|')
+                af, ip_type = af_type.lower().split('_')
+                syslog.syslog(syslog.LOG_INFO, 'Set address family for neighbor {} to {} {}'.format(nbr, af, ip_type))
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf),
+                              'address-family {} {}'.format(af, ip_type)]
+                if not key_map.run_command(self, table, data, cmd_prefix, nbr):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP neighbor AF config command')
+                    continue
+            elif table == 'COMMUNITY_SET' or table == 'EXTENDED_COMMUNITY_SET':
+                comm_set_name = prefix
+                syslog.syslog(syslog.LOG_INFO, 'Set community set {} for table {}'.format(comm_set_name, table))
+                cmd_prefix = ['configure terminal']
+                if not key_map.run_command(self, table, data, cmd_prefix, comm_set_name):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP community config command')
+                    continue
+                extended = (table != 'COMMUNITY_SET')
+                comm_set = (self.comm_set_list if not extended else self.extcomm_set_list).setdefault(comm_set_name,
+                    CommunityList(comm_set_name, extended))
+                if del_table:
+                    del((self.comm_set_list if not extended else self.extcomm_set_list)[comm_set_name])
+                else:
+                    for dkey, dval in data.items():
+                        if dval.op == CachedDataWithOp.OP_DELETE:
+                            upd_val = None
+                        else:
+                            upd_val = dval.data
+                        comm_set.db_data_to_attr(dkey, upd_val)
+            elif table == 'PREFIX_SET':
+                pfx_set_name = prefix
+                if not del_table:
+                    if pfx_set_name in self.prefix_set_list:
+                        syslog.syslog(syslog.LOG_DEBUG, 'prefix-set %s exists with af %d' %
+                                (pfx_set_name, self.prefix_set_list[pfx_set_name].af))
+                        continue
+                    if 'mode' not in data:
+                        syslog.syslog(syslog.LOG_ERR, 'no mode given for prefix-set %s' % pfx_set_name)
+                        continue
+                    set_mode = data['mode'].data.lower()
+                    self.prefix_set_list[pfx_set_name] = MatchPrefixList(set_mode)
+                else:
+                    if pfx_set_name in self.prefix_set_list:
+                        del(self.prefix_set_list[pfx_set_name])
+                for _, dval in data.items():
+                    dval.status = CachedDataWithOp.STAT_SUCC
+            elif table == 'PREFIX' or table == 'NEIGHBOR_SET' or table == 'NEXTHOP_SET':
+                pfx_set_name = self.get_prefix_set_name(prefix, table)
+                if table == 'PREFIX':
+                    if pfx_set_name not in self.prefix_set_list:
+                        syslog.syslog(syslog.LOG_ERR, 'could not find prefix-set %s from cache' % pfx_set_name)
+                        continue
+                    ip_pfx, len_range = key.split('|')
+                    if len_range == 'exact':
+                        len_range = None
+                    pfx_action = data.get('action', None)
+                    if pfx_action is None or pfx_action.op == CachedDataWithOp.OP_NONE:
+                        continue
+                    af = self.prefix_set_list[pfx_set_name].af
+                    if af == socket.AF_INET:
+                        # use table daemons setting
+                        daemons = None
+                    else:
+                        daemons = ['bgpd', 'zebra']
+                    if pfx_action.op == CachedDataWithOp.OP_DELETE or pfx_action.op == CachedDataWithOp.OP_UPDATE:
+                        del_pfx, pfx_idx = self.prefix_set_list[pfx_set_name].get_prefix(ip_pfx, len_range)
+                        if del_pfx is None:
+                            syslog.syslog(syslog.LOG_ERR, 'prefix of {} with range {} not found from prefix-set {}'.\
+                                            format(ip_pfx, len_range, pfx_set_name))
+                            continue
+                        command = "vtysh -c 'configure terminal' -c 'no {} prefix-list {} {}'".\
+                                    format(('ip' if af == socket.AF_INET else 'ipv6'), pfx_set_name, str(del_pfx))
+                        if not self.__run_command(table, command, daemons):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete prefix %s with range %s from set %s' %
+                                          (ip_pfx, len_range, pfx_set_name))
+                            continue
+                        del(self.prefix_set_list[pfx_set_name][pfx_idx])
+                    if pfx_action.op == CachedDataWithOp.OP_ADD or pfx_action.op == CachedDataWithOp.OP_UPDATE:
+                        try:
+                            add_pfx = self.prefix_set_list[pfx_set_name].add_prefix(ip_pfx, len_range, pfx_action.data)
+                        except ValueError:
+                            syslog.syslog(syslog.LOG_ERR, 'failed to update prefix-set %s in cache with prefix %s range %s' %
+                                    (pfx_set_name, ip_pfx, len_range))
+                            continue
+                        command = "vtysh -c 'configure terminal' -c '{} prefix-list {} {}'".\
+                                    format(('ip' if af == socket.AF_INET else 'ipv6'), pfx_set_name, str(add_pfx))
+                        if not self.__run_command(table, command, daemons):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to add prefix %s with range %s to set %s' %
+                                          (ip_pfx, len_range, pfx_set_name))
+                            # revert cached update on failure
+                            del_pfx, pfx_idx = self.prefix_set_list[pfx_set_name].get_prefix(ip_pfx, len_range)
+                            if del_pfx is not None:
+                                del(self.prefix_set_list[pfx_set_name][pfx_idx])
+                            continue
+                else:
+                    if 'address' not in data or data['address'].op == CachedDataWithOp.OP_NONE:
+                        continue
+                    ip_addr_list = data['address'].data
+                    if pfx_set_name in self.prefix_set_list:
+                        af = self.prefix_set_list[pfx_set_name].af
+                        command = "vtysh -c 'configure terminal' -c 'no {} prefix-list {}'".\
+                                   format(('ip' if af == socket.AF_INET else 'ipv6'), pfx_set_name)
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete existing prefix-set {}'.format(pfx_set_name))
+                            continue
+                        del(self.prefix_set_list[pfx_set_name])
+                    if not del_table:
+                        prefix_set = MatchPrefixList()
+                        for ip_addr in ip_addr_list:
+                            try:
+                                prefix_set.add_prefix(ip_addr)
+                            except ValueError:
+                                continue
+                        for prefix in prefix_set:
+                            command = "vtysh -c 'configure terminal' -c '{} prefix-list {} {}'".\
+                                       format(('ip' if prefix_set.af == socket.AF_INET else 'ipv6'), pfx_set_name, str(prefix))
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to delete existing prefix-set {}'.format(pfx_set_name))
+                                continue
+                        self.prefix_set_list[pfx_set_name] = prefix_set
+                for _, dval in data.items():
+                    dval.status = CachedDataWithOp.STAT_SUCC
+            elif table == 'AS_PATH_SET':
+                as_set_name = prefix
+                syslog.syslog(syslog.LOG_INFO, 'Set AS path set {} for table {}'.format(as_set_name, table))
+                cmd_prefix = ['configure terminal']
+                if not key_map.run_command(self, table, data, cmd_prefix, as_set_name):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP AS path set config command')
+                    continue
+                as_set_data = data.get('as_path_set_member', None)
+                if as_set_data is not None and (as_set_data.op == CachedDataWithOp.OP_DELETE or len(as_set_data.data) == 0):
+                    del_table = True
+                if del_table:
+                    self.as_path_set_list.pop(as_set_name, None)
+                elif as_set_data is not None:
+                    self.as_path_set_list[as_set_name] = as_set_data.data[:]
+            elif table == 'TAG_SET':
+                tag_set_name = prefix
+                if not del_table and 'tag_value' not in data:
+                    continue
+                tag_set_data = data.get('tag_value', None)
+                if tag_set_data is not None and (tag_set_data.op == CachedDataWithOp.OP_DELETE or len(tag_set_data.data) == 0):
+                    del_table = True
+                if not del_table:
+                    self.tag_set_list[tag_set_name] = set(tag_set_data.data)
+                else:
+                    self.tag_set_list.pop(tag_set_name, None)
+                for _, dval in data.items():
+                    dval.status = CachedDataWithOp.STAT_SUCC
+            elif table == 'BGP_GLOBALS_EVPN_VNI':
+                af_type, vni = key.split('|')
+                af, ip_type = af_type.lower().split('_')
+                #this is to temporarily make table cache key accessible to key_map handler function
+                self.tmp_cache_key = 'BGP_GLOBALS_EVPN_VNI&&{}|{}|{}'.format(vrf, af_type, vni)
+                syslog.syslog(syslog.LOG_INFO, 'Set address family for VNI {} to {} {} cache-key to {}'.format(vni, af, ip_type, self.tmp_cache_key))
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf),
+                              'address-family {} {}'.format(af, ip_type),
+                              'vni {}'.format(vni)]
+                if not key_map.run_command(self, table, data, cmd_prefix):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP L2VPN_EVPN VNI config command')
+                    continue
+                self.tmp_cache_key = ''
+                if del_table:
+                    cmd = "vtysh -c 'configure terminal'"
+                    cmd += " -c 'router bgp {} vrf {}'".format(local_asn, vrf)
+                    cmd += " -c 'address-family {} {}'".format(af, ip_type)
+                    cmd += " -c 'no vni {}'".format(vni)
+                    if not self.__run_command(table, cmd):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running BGP L2VPN_EVPN VNI unconfig command')
+                        continue
+                else:
+                    if not data:
+                        cmd = "vtysh -c 'configure terminal'"
+                        cmd += " -c 'router bgp {} vrf {}'".format(local_asn, vrf)
+                        cmd += " -c 'address-family {} {}'".format(af, ip_type)
+                        cmd += " -c 'vni {}'".format(vni)
+                        if not self.__run_command(table, cmd):
+                            syslog.syslog(syslog.LOG_ERR, 'failed running BGP L2VPN_EVPN VNI config command')
+                            continue
+            elif table == 'BGP_GLOBALS_EVPN_RT':
+                af_type, rt = key.split('|')
+                af, ip_type = af_type.lower().split('_')
+                nostr = "no " if del_table else ""
+                syslog.syslog(syslog.LOG_INFO, 'Set address family for RT {} to {} {}'.format(rt, af, ip_type))
+                cmd = "vtysh -c 'configure terminal'"
+                cmd += " -c 'router bgp {} vrf {}'".format(local_asn, vrf)
+                cmd += " -c 'address-family {} {}'".format(af, ip_type)
+                cmd += " -c '{}route-target {} {}'".format(nostr,data['route-target-type'].data, rt)
+                cache_tbl_key = 'BGP_GLOBALS_EVPN_RT&&{}|L2VPN_EVPN|{}'.format(vrf, rt)
+                if not del_table and cache_tbl_key in self.table_data_cache.keys():
+                    new_rttype = data['route-target-type'].data
+                    cache_tbl_data = self.table_data_cache[cache_tbl_key]
+                    if 'route-target-type' in cache_tbl_data:
+                        old_rttype = cache_tbl_data['route-target-type']
+                        if new_rttype == "export":
+                            if old_rttype == "import" or old_rttype == "both":
+                                cmd += " -c 'no route-target import {}'".format(rt)
+                        if new_rttype == "import":
+                            if old_rttype == "export" or old_rttype == "both":
+                                cmd += " -c 'no route-target export {}'".format(rt)
+                if not self.__run_command(table, cmd):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP L2VPN_EVPN RT config command')
+                    continue
+                else:
+                    data['route-target-type'].status = CachedDataWithOp.STAT_SUCC
+            elif table == 'BGP_GLOBALS_EVPN_VNI_RT':
+                af_type, vni, rt = key.split('|')
+                af, ip_type = af_type.lower().split('_')
+                nostr = "no " if del_table else ""
+                syslog.syslog(syslog.LOG_INFO, 'Set address family for VNI {} RT {} to {} {}'.format(vni, rt, af, ip_type))
+                cmd = "vtysh -c 'configure terminal'"
+                cmd += " -c 'router bgp {} vrf {}'".format(local_asn, vrf)
+                cmd += " -c 'address-family {} {}'".format(af, ip_type)
+                cmd += " -c 'vni {}'".format(vni)
+                cmd += " -c '{}route-target {} {}'".format(nostr,data['route-target-type'].data, rt)
+                cache_tbl_key = 'BGP_GLOBALS_EVPN_VNI_RT&&{}|L2VPN_EVPN|{}|{}'.format(vrf, vni, rt)
+                if not del_table and cache_tbl_key in self.table_data_cache.keys():
+                    new_rttype = data['route-target-type'].data
+                    cache_tbl_data = self.table_data_cache[cache_tbl_key]
+                    if 'route-target-type' in cache_tbl_data:
+                        old_rttype = cache_tbl_data['route-target-type']
+                        if new_rttype == "export":
+                            if old_rttype == "import" or old_rttype == "both":
+                                cmd += " -c 'no route-target import {}'".format(rt)
+                        if new_rttype == "import":
+                            if old_rttype == "export" or old_rttype == "both":
+                                cmd += " -c 'no route-target export {}'".format(rt)
+                if not self.__run_command(table, cmd):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP L2VPN_EVPN VNI RT config command')
+                    continue
+                else:
+                    data['route-target-type'].status = CachedDataWithOp.STAT_SUCC
+            elif table == 'ROUTE_MAP':
+                map_name = prefix
+                seq_no = key
+                if not del_table:
+                    if 'route_operation' in data:
+                        dval = data['route_operation']
+                        if dval.op != CachedDataWithOp.OP_NONE:
+                            enable = (dval.op != CachedDataWithOp.OP_DELETE)
+                            no_arg = CommandArgument(self, enable)
+                            command = "vtysh -c 'configure terminal' -c '{:no-prefix}route-map {} {} {}'".\
+                                       format(no_arg, map_name, dval.data, seq_no)
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to configure route-map {} seq {}'.format(map_name, seq_no))
+                                continue
+                            if dval.op == CachedDataWithOp.OP_DELETE:
+                                self.__delete_route_map(map_name, seq_no, data)
+                                continue
+                            self.route_map.setdefault(map_name, {})[seq_no] = dval.data
+                            for k, v in data.items():
+                                if v.op == CachedDataWithOp.OP_NONE:
+                                    v.op = CachedDataWithOp.OP_UPDATE
+                        dval.status = CachedDataWithOp.STAT_SUCC
+                    if map_name not in self.route_map or seq_no not in self.route_map[map_name]:
+                        syslog.syslog(syslog.LOG_ERR, 'route-map {} seq {} not found for update'.format(map_name, seq_no))
+                        continue
+                    cmd_prefix = ['configure terminal',
+                                  'route-map {} {} {}'.format(map_name, self.route_map[map_name][seq_no], seq_no)]
+                    if not key_map.run_command(self, table, data, cmd_prefix):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running route-map config command')
+                        continue
+                else:
+                    if map_name not in self.route_map or seq_no not in self.route_map[map_name]:
+                        syslog.syslog(syslog.LOG_ERR, 'route-map {} seq {} not found for delete'.format(map_name, seq_no))
+                        continue
+                    command = "vtysh -c 'configure terminal' -c 'no route-map {} {} {}'".\
+                               format(map_name, self.route_map[map_name][seq_no], seq_no)
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running route-map delete command')
+                        continue
+                    self.__delete_route_map(map_name, seq_no, data)
+            elif table == 'ROUTE_REDISTRIBUTE':
+                src_proto, dst_proto, af = key.split('|')
+                if af == 'ipv6' and src_proto == 'ospf3':
+                    src_proto = 'ospf6'
+                ip_type = 'unicast'
+                syslog.syslog(syslog.LOG_INFO, 'Set route distribute for src_proto {} dst_proto {} {}'.\
+                                format(src_proto, dst_proto, af, ip_type))
+                if dst_proto != 'bgp':
+                    syslog.syslog(syslog.LOG_ERR, 'only bgp could be used as dst protocol, but {} was given'.format(dst_proto))
+                    continue
+                op = CachedDataWithOp.OP_DELETE if del_table else CachedDataWithOp.OP_UPDATE
+                data['protocol'] = CachedDataWithOp(src_proto, op)
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf),
+                              'address-family {} {}'.format(af, ip_type)]
+                ret_val = key_map.run_command(self, table, data, cmd_prefix)
+                del(data['protocol'])
+                if not ret_val:
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP route redistribute config command')
+                    continue
+            elif table == 'BGP_GLOBALS_AF_AGGREGATE_ADDR' or table == 'BGP_GLOBALS_AF_NETWORK':
+                af_type, ip_prefix = key.split('|')
+                af, ip_type = af_type.lower().split('_')
+                norm_ip_prefix = MatchPrefix.normalize_ip_prefix((socket.AF_INET if af == 'ipv4' else socket.AF_INET6), ip_prefix)
+                if norm_ip_prefix is None:
+                    syslog.syslog(syslog.LOG_ERR, 'invalid IP prefix format %s for af %s' % (ip_prefix, af))
+                    continue
+                syslog.syslog(syslog.LOG_INFO, 'Set address family for IP prefix {} to {} {}'.format(norm_ip_prefix, af, ip_type))
+                op = CachedDataWithOp.OP_DELETE if del_table else CachedDataWithOp.OP_UPDATE
+                data['ip_prefix'] = CachedDataWithOp(norm_ip_prefix, op)
+                cmd_prefix = ['configure terminal',
+                              'router bgp {} vrf {}'.format(local_asn, vrf),
+                              'address-family {} {}'.format(af, ip_type)]
+                ret_val = key_map.run_command(self, table, data, cmd_prefix, vrf, af)
+                del(data['ip_prefix'])
+                if not ret_val:
+                    syslog.syslog(syslog.LOG_ERR, 'failed running BGP IP prefix AF config command')
+                    continue
+                if table == 'BGP_GLOBALS_AF_AGGREGATE_ADDR':
+                    if not del_table:
+                        aggr_obj = AggregateAddr()
+                        for attr in ['as_set', 'summary_only']:
+                            if attr in data and data[attr].op != CachedDataWithOp.OP_DELETE and data[attr].data == 'true':
+                                setattr(aggr_obj, attr, True)
+                        self.af_aggr_list.setdefault(vrf, {})[norm_ip_prefix] = aggr_obj
+                    else:
+                        if vrf in self.af_aggr_list:
+                            self.af_aggr_list[vrf].pop(norm_ip_prefix, None)
+
+            elif table == 'BFD_PEER_SINGLE_HOP':
+                key = prefix + '|' + key
+                remoteaddr, interface, vrf, localaddr = key.split('|')
+                if not del_table:
+                    if not 'null' in localaddr:
+                        syslog.syslog(syslog.LOG_INFO, 'Set BFD single hop peer {} {} {} {}'.format(remoteaddr, vrf, interface, localaddr))
+
+                        suffix_cmd, oper = self.__bfd_handle_delete (data)
+                        if suffix_cmd and oper == CachedDataWithOp.OP_DELETE:
+                            command = "vtysh -c 'configure terminal' -c 'bfd' -c 'peer {} local-address {} vrf {} interface {}' -c '{}'".\
+                            format(remoteaddr, localaddr, vrf, interface, suffix_cmd)
+
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to delete single-hop peer {}'.format(key))
+                                continue
+                        else:
+                            cmd_prefix = ['configure terminal',
+                                          'bfd',
+                                          'peer {} local-address {} vrf {} interface {}'.format(remoteaddr, localaddr, vrf, interface)]
+                            if not key_map.run_command(self, table, data, cmd_prefix):
+                                syslog.syslog(syslog.LOG_ERR, 'failed running BFD single-hop config command')
+                                continue
+
+                    else:
+                        syslog.syslog(syslog.LOG_INFO, 'Set BFD single hop peer {} {} {}'.format(remoteaddr, vrf, interface))
+
+                        suffix_cmd, oper = self.__bfd_handle_delete (data)
+
+                        if suffix_cmd and oper == CachedDataWithOp.OP_DELETE:
+                            command = "vtysh -c 'configure terminal' -c 'bfd' -c 'peer {} vrf {} interface {}' -c '{}'".\
+                            format(remoteaddr, vrf, interface, suffix_cmd)
+
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to delete single-hop peer {}'.format(key))
+                                continue
+                        else:
+                            syslog.syslog(syslog.LOG_INFO, 'Set BFD single hop peer {} {} {}'.format(remoteaddr, vrf, interface))
+                            cmd_prefix = ['configure terminal',
+                                          'bfd',
+                                          'peer {} vrf {} interface {}'.format(remoteaddr, vrf, interface)]
+                            if not key_map.run_command(self, table, data, cmd_prefix):
+                                syslog.syslog(syslog.LOG_ERR, 'failed running BFD single-hop config command')
+                                continue
+                else:
+                    if 'local-address' in data:
+                        dval = data['local-address']
+                        localaddr = dval.data
+                        syslog.syslog(syslog.LOG_INFO, 'Delete BFD single hop to {} {} {}'.format(remoteaddr, vrf, interface, localaddr))
+                        command = "vtysh -c 'configure terminal' -c 'bfd' -c 'no peer {} local-address {} vrf {} interface {}'".\
+                            format(remoteaddr, localaddr, vrf, interface)
+                    else:
+                        syslog.syslog(syslog.LOG_INFO, 'Delete BFD single hop to {} {} {}'.format(remoteaddr, vrf, interface))
+                        command = "vtysh -c 'configure terminal' -c 'bfd' -c 'no peer {} vrf {} interface {}'".\
+                            format(remoteaddr, vrf, interface)
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete single-hop peer {}'.format(key))
+                        continue
+                    self.__delete_bfd_peer(data)
+            elif table == 'BFD_PEER_MULTI_HOP':
+                key = prefix + '|' + key
+                remoteaddr, interface, vrf, localaddr = key.split('|')
+                if not del_table:
+                    syslog.syslog(syslog.LOG_INFO, 'Set BFD multi hop to {} {} {} {}'.format(remoteaddr, interface, vrf, localaddr))
+                    suffix_cmd, oper = self.__bfd_handle_delete (data)
+                    if suffix_cmd and oper == CachedDataWithOp.OP_DELETE:
+                        if not 'null' in interface:
+                            command = "vtysh -c 'configure terminal' -c 'bfd' -c 'peer {} local-address {} vrf {} interface {}' -c '{}'".\
+                            format(remoteaddr, localaddr, vrf, interface, suffix_cmd)
+                        else:
+                            command = "vtysh -c 'configure terminal' -c 'bfd' -c 'peer {} local-address {} vrf {}' -c '{}'".\
+                            format(remoteaddr, localaddr, vrf, suffix_cmd)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete single-hop peer {}'.format(key))
+                            continue
+                    else:
+                        if not 'null' in interface:
+                            cmd_prefix = ['configure terminal',
+                                          'bfd',
+                                                'peer {} vrf {} multihop local-address {} interface {}'.format(remoteaddr, vrf, localaddr, interface)]
+                        else:
+                            cmd_prefix = ['configure terminal',
+                                          'bfd',
+                                          'peer {} vrf {} multihop local-address {}'.format(remoteaddr, vrf, localaddr)]
+
+                        if not key_map.run_command(self, table, data, cmd_prefix):
+                            syslog.syslog(syslog.LOG_ERR, 'failed running BFD multi-hop config command')
+                            continue
+                else:
+                    syslog.syslog(syslog.LOG_INFO, 'Delete BFD multi hop to {} {} {} {}'.format(remoteaddr, vrf, localaddr, interface))
+                    if not 'null' in interface:
+                        command = "vtysh -c 'configure terminal' -c 'bfd' -c 'no peer {} vrf {} multihop local-address {} interface {}'".\
+                        format(remoteaddr, vrf, localaddr, interface)
+                    else:
+                        command = "vtysh -c 'configure terminal' -c 'bfd' -c 'no peer {} vrf {} multihop local-address {}'".\
+                        format(remoteaddr, vrf, localaddr)
+
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete multihop peer {}'.format(key))
+                        continue
+                    self.__delete_bfd_peer(data)
+            elif table == 'IP_SLA':
+                sla_id = prefix
+                icmp_config = False
+                tcp_config = False
+                cmd_prefix = ['configure terminal']
+                ipsla_table = self.config_db.get_table('IP_SLA')
+                syslog.syslog(syslog.LOG_INFO, 'Config ip sla data {}'.format(data))
+                found_in_configdb = False
+                for key, entry in ipsla_table.items():
+                    ipsla_id = key
+                    if sla_id == ipsla_id:
+                        found_in_configdb = True
+                        break
+                syslog.syslog(syslog.LOG_INFO, 'Config ip sla found_in_configdb {}'.format(found_in_configdb))
+                if 'icmp_source_interface' in data or 'icmp_source_ip' in data or  'icmp_size' in data or 'icmp_dst_ip' in data or 'icmp_vrf' in data or 'icmp_ttl' in data or 'icmp_tos' in data:
+                    cmd_prefix = ['configure terminal','ip sla {}'.format(sla_id)]
+                    icmp_config = True
+                    for key, entry in ipsla_table.items():
+                        ipsla_id = key
+                        if sla_id == ipsla_id:
+                            if 'icmp_dst_ip' in entry:
+                                icmp_cmd = ("icmp", "echo")
+                                icmp_cmd_str = "-".join(icmp_cmd)
+                                icmp_cmd_mode = icmp_cmd_str + " " + entry['icmp_dst_ip']
+                                syslog.syslog(syslog.LOG_INFO, 'Data: icmp_cmd_str %s icmp_cmd_mode %s' % (icmp_cmd_str, icmp_cmd_mode))
+                                 
+                                cmd_prefix = ['configure terminal','ip sla {}'.format(sla_id), icmp_cmd_mode]
+                                chk_icmp_attrs = ['icmp_source_interface', 'icmp_source_ip', 'icmp_size', 'icmp_vrf', 'icmp_tos', 'icmp_ttl']
+                                chk_icmp_attrs_dict = {'icmp_source_interface':'source-interface ', 'icmp_source_ip':'source-address ', 'icmp_size':'request-data-size ', 'icmp_vrf':'source-vrf ', 'icmp_tos':'tos ', 'icmp_ttl':'ttl '}
+                                for attr in chk_icmp_attrs:
+                                    if attr in data and data[attr].op != CachedDataWithOp.OP_DELETE:
+                                        command = "vtysh -c 'configure terminal' -c 'ip sla {}' -c '{}' -c '{} {}'".\
+                                        format(sla_id, icmp_cmd_mode, chk_icmp_attrs_dict[attr], data[attr].data)
+                                        syslog.syslog(syslog.LOG_INFO, 'Execute Icmp Cmd {}'.format(command))
+                                        if not self.__run_command(table, command):
+                                            syslog.syslog(syslog.LOG_ERR, 'failed to add icmp config for  ip sla {}'.format(sla_id))
+                                            continue
+ 
+                    syslog.syslog(syslog.LOG_INFO, 'Done with Icmp {}'.format(sla_id))
+                    if not key_map.run_command(self, table, data, cmd_prefix, sla_id):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ip sla command')
+                        continue
+                if 'tcp_source_interface' in data or 'tcp_source_port' in data or 'tcp_source_ip' in data or 'tcp_dst_ip' in data or 'tcp_dst_port' in data or 'tcp_vrf' in data or 'tcp_ttl' in data or 'tcp_tos' in data:
+                    cmd_prefix = ['configure terminal','ip sla {}'.format(sla_id)]
+                    tcp_config = True
+                    for key, entry in ipsla_table.items():
+                        ipsla_id = key
+                        if sla_id == ipsla_id:
+                            if 'tcp_dst_ip' in entry and 'tcp_dst_port' in entry:
+                                tcp_cmd = ("tcp", "connect")
+                                tcp_cmd_str = "-".join(tcp_cmd)
+                                tcp_cmd_mode = tcp_cmd_str + " " + entry['tcp_dst_ip'] + " port " + entry['tcp_dst_port']
+                                syslog.syslog(syslog.LOG_INFO, 'Init Config DB Data: tcp_cmd_str %s tcp_cmd_mode %s' % (tcp_cmd_str, tcp_cmd_mode))
+                                cmd_prefix = ['configure terminal','ip sla {}'.format(sla_id), tcp_cmd_mode]
+                                chk_tcp_attrs = ['tcp_source_interface', 'tcp_source_ip', 'tcp_source_port', 'tcp_vrf', 'tcp_tos', 'tcp_ttl']
+                                chk_tcp_attrs_dict = {'tcp_source_interface':'source-interface ', 'tcp_source_ip':'source-address ', 'tcp_source_port':'source-port ', 'tcp_vrf':'source-vrf ', 'tcp_tos':'tos ', 'tcp_ttl':'ttl '}
+                                for attr in chk_tcp_attrs:
+                                    if attr in data and data[attr].op != CachedDataWithOp.OP_DELETE:
+                                        command = "vtysh -c 'configure terminal' -c 'ip sla {}' -c '{}' -c '{} {}'".\
+                                        format(sla_id, tcp_cmd_mode, chk_tcp_attrs_dict[attr], data[attr].data)
+                                        syslog.syslog(syslog.LOG_INFO, 'Execute Tcp Cmd {}'.format(command))
+                                        if not self.__run_command(table, command):
+                                            syslog.syslog(syslog.LOG_ERR, 'failed to add Tcp config for  ip sla {}'.format(sla_id))
+                                            continue
+ 
+                    syslog.syslog(syslog.LOG_INFO, 'Done with Tcp {}'.format(sla_id))
+                    if not key_map.run_command(self, table, data, cmd_prefix, sla_id):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ip sla command')
+                        continue
+                if 'frequency' in data or 'threshold' in data or 'timeout' in data:
+                    syslog.syslog(syslog.LOG_INFO, 'ip sla mode Configure freq/thresh/timeout for sla {}'.format(sla_id))
+                    cmd_prefix = ['configure terminal','ip sla {}'.format(sla_id)]
+                    if not key_map.run_command(self, table, data, cmd_prefix, sla_id):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ip sla command')
+                        continue
+ 
+                elif icmp_config == False or tcp_config == False:
+                    syslog.syslog(syslog.LOG_INFO, 'Basic mode Configure for ip sla {}'.format(sla_id))
+                    cmd_prefix = ['configure terminal']
+
+                # Always delete ip sla if it is not found in configdb
+                if not found_in_configdb:
+                    command = "vtysh -c 'configure terminal' -c 'no ip sla {}'".format(sla_id)
+                    syslog.syslog(syslog.LOG_ERR, 'Entry deleted in ip sla config db')
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete router ip sla {}'.format(sla_id))
+                        continue
+                elif not key_map.run_command(self, table, data, cmd_prefix, sla_id):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running ip sla command')
+                    continue
+
+            elif table == 'OSPFV2_ROUTER':
+                vrf = prefix
+                if not del_table:
+                    syslog.syslog(syslog.LOG_INFO, 'Create router ospf vrf {}'.format(vrf))
+                
+                    cmd_prefix = ['configure terminal',
+                                  'router ospf vrf {}'.format(vrf)]
+
+                    if not key_map.run_command(self, table, data, cmd_prefix):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ospf config command')
+                        continue
+                else:
+                    command = "vtysh -c 'configure terminal' -c 'no router ospf vrf {}'".format(vrf)
+
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete router ospf vrf {}'.format(vrf))
+                        continue
+                    else:
+                        self.__ospf_delete(data)
+
+            elif table == 'OSPFV2_ROUTER_AREA':
+                vrf = prefix
+                syslog.syslog(syslog.LOG_INFO, 'Create router ospf vrf {}'.format(vrf))
+
+                cmd_prefix = ['configure terminal',
+                              'router ospf vrf {}'.format(vrf)]
+
+                if not key_map.run_command(self, table, data, cmd_prefix, key):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running ospf config command')
+                    continue
+            elif table == 'OSPFV2_ROUTER_AREA_VIRTUAL_LINK':
+                vrf = prefix
+          
+                keyvals = key.split('|')
+                area = keyvals[0]
+                vlinkid = keyvals[1]
+
+                syslog.syslog(syslog.LOG_INFO, 'Create router ospf vrf {}, Vlink: {}, tableop {}'.format(vrf, data, del_table))
+
+                if data == {}:
+                    command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no area {} virtual-link {}'".\
+                    format(vrf, area, vlinkid)
+
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete vlink {} {}'.format(area, vlinkid))
+                        continue
+                    else:
+                        self.__ospf_delete(data)
+                else:
+                    cmd_prefix = ['configure terminal',
+                                  'router ospf vrf {}'.format(vrf)]
+
+                    if not key_map.run_command(self, table, data, cmd_prefix, area, vlinkid):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ospf config command')
+                        continue
+
+                    if del_table:
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no area {} virtual-link {}'".\
+                        format(vrf, area, vlinkid)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete vlink {} {}'.format(area, vlinkid))
+                            continue
+                        else:
+                            self.__ospf_delete(data)
+
+            elif table == 'OSPFV2_ROUTER_AREA_NETWORK':
+                vrf = prefix
+                syslog.syslog(syslog.LOG_INFO, 'Create router ospf vrf {}'.format(vrf))
+
+                keyvals = key.split('|')
+                area = keyvals[0]
+                network = keyvals[1]
+                   
+                if not del_table: 
+                    command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'network {} area {}'".\
+                    format(vrf, network, area)
+
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to create network {} {}'.format(area, network))
+                        continue
+                else:
+                    command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no network {} area {}'".\
+                    format(vrf, network, area)
+
+                    if not self.__run_command(table, command):
+                        syslog.syslog(syslog.LOG_ERR, 'failed to delete network {} {}'.format(area, network))
+                        continue
+                    else:
+                        self.__ospf_delete(data)
+
+            elif table == 'OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE':
+                vrf = prefix
+
+                keyvals = key.split('|')
+                area = keyvals[0]
+                range = keyvals[1]
+
+                syslog.syslog(syslog.LOG_INFO, 'Create router ospf vrf {}'.format(vrf))
+
+                if data == {}:
+                   if not del_table:
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'area {} range {}'".\
+                        format(vrf, area, range)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to create range {} {}'.format(area, range))
+                            continue
+                   else:
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no area {} range {}'".\
+                        format(vrf, area, range)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete range {} {}'.format(area, range))
+                            continue
+                        else:
+                            self.__ospf_delete(data)
+                else:
+                    cmd_prefix = ['configure terminal',
+                              'router ospf vrf {}'.format(vrf)]
+
+                    if not key_map.run_command(self, table, data, cmd_prefix, area, range):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running ospf config command')
+                        continue
+
+            elif table == 'OSPFV2_ROUTER_DISTRIBUTE_ROUTE':
+                vrf = prefix
+
+                keyvals = key.split('|')
+                protocol = keyvals[0]
+                direction = keyvals[1]
+
+                if (protocol == "DIRECTLY_CONNECTED"):
+                    protocol = "CONNECTED"
+
+                syslog.syslog(syslog.LOG_INFO, 'Create redistribute-list {} {}'.format(protocol, direction))
+
+                cmd_suffix = ""
+                del_cmd_suffix = ""
+                cmd_oper = ""
+                rmapcmd = ""
+                metriccmd = ""
+                metrictypecmd = ""
+                alwayscmd = ""
+                acclistname = ""
+                rmapoper = ""
+                metricoper = ""
+                metrictypeoper = ""
+                alwaysoper = ""
+                acclistoper = ""
+
+                if 'route-map' in data:
+                    dval = data['route-map']
+                    rmapoper = dval.op
+                    rmapcmd = " route-map {}".format(dval.data)
+
+                if 'access-list' in data:
+                    dval = data['access-list']
+                    acclistoper = dval.op
+                    acclistname = dval.data
+
+                if 'metric' in data:
+                    dval = data['metric']
+                    metricoper = dval.op
+                    metriccmd = " metric {}".format(dval.data)
+
+                if 'metric-type' in data:
+                    dval = data['metric-type']
+                    metrictypeoper = dval.op
+
+                    if dval.data == "TYPE_1":
+                        metrictypecmd = " metric-type 1"
+                    else:
+                        metrictypecmd = " metric-type 2"
+
+                if 'always' in data:
+                    dval = data['always']
+                    alwaysoper = dval.op
+                    alwayscmd = " always"
+
+                if not del_table:
+
+                    if ((rmapoper == CachedDataWithOp.OP_DELETE) or
+                        (metricoper == CachedDataWithOp.OP_DELETE) or
+                        (metrictypeoper == CachedDataWithOp.OP_DELETE) or
+                        (alwaysoper == CachedDataWithOp.OP_DELETE) or
+                        (acclistoper == CachedDataWithOp.OP_DELETE)):
+
+                        cmd_oper = "no"
+                    
+                        if (alwaysoper == CachedDataWithOp.OP_DELETE):
+                            del_cmd_suffix = alwayscmd
+                        if (rmapoper == CachedDataWithOp.OP_DELETE):
+                            del_cmd_suffix = rmapcmd
+                        if (metricoper == CachedDataWithOp.OP_DELETE):
+                            del_cmd_suffix = metriccmd
+                        if (metrictypeoper == CachedDataWithOp.OP_DELETE):
+                            del_cmd_suffix = metrictypecmd
+
+                    if (direction == "EXPORT"):
+                        if (cmd_oper != "no"):
+                            cmd_suffix = "distribute-list {} out {}".format(acclistname, protocol.lower())
+                        else:
+                            cmd_suffix = "no distribute-list {} out {}".format(acclistname, protocol.lower())
+
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c '{}'".\
+                            format(vrf, cmd_suffix)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to create distribute-list {} {}'.format(protocol, direction))
+                            continue
+                        else:
+                            self.__ospf_apply_config(data, rmapoper, metricoper, metrictypeoper, alwaysoper, acclistoper)
+                    elif (direction == "IMPORT"):
+                        if (cmd_oper != "no"):
+                            if (protocol == "DEFAULT_ROUTE"):
+                                cmd_suffix = cmd_suffix + "default-information originate" + alwayscmd + rmapcmd + metriccmd + metrictypecmd
+                            else:
+                                cmd_suffix = cmd_suffix + "redistribute {}".format(protocol.lower()) + rmapcmd + metriccmd + metrictypecmd
+                        else:
+                            if (protocol == "DEFAULT_ROUTE"):
+                                cmd_suffix = "no default-information originate" + del_cmd_suffix
+                            else:
+                                cmd_suffix = "no redistribute {}".format(protocol.lower()) + del_cmd_suffix
+
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c '{}'".\
+                            format(vrf, cmd_suffix)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to create default-info/redistribute {} {}'.format(protocol, direction))
+                            continue
+                        else:
+                            self.__ospf_apply_config(data, rmapoper, metricoper, metrictypeoper, alwaysoper, acclistoper)
+                else:
+                    if (direction == "IMPORT"):
+                        command = ""
+                        if (protocol == "DEFAULT_ROUTE"):
+                            command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no default-information originate'".\
+                            format(vrf)
+                        else:
+                            command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no redistribute {}'".\
+                            format(vrf, protocol.lower())
+
+                        if (command != ""):
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to delete default-info/redistribute {}'.format(protocol.lower()))
+                                continue
+                            else:
+                                self.__ospf_delete(data)
+                    else:
+                        if (acclistname != ""):
+                            command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no distribute-list {} out {}'".\
+                            format(vrf, acclistname, protocol.lower())
+
+                            if not self.__run_command(table, command):
+                                syslog.syslog(syslog.LOG_ERR, 'failed to delete distribute-list {} {}'.format(protocol, direction))
+                                continue
+                            
+                        self.__ospf_delete(data)
+ 
+            elif table == 'OSPFV2_INTERFACE':
+
+                key = prefix + '|' + key
+                if_name, if_addr = key.split('|')
+
+                vrf = ""
+                if 'vrf_name' in data :
+                   vrf = 'vrf {}'.format(data['vrf_name'].data)
+
+                cmd_prefix = ['configure terminal',
+                              'interface {} {}'.format(if_name, vrf) ]
+
+                if del_table and len(data) == 0:
+                    syslog.syslog(syslog.LOG_INFO, 'Delete table {} {} data {}'.format(key, vrf, data))
+
+                    cmd_data = {}
+                    cache_tbl_key = 'OSPFV2_INTERFACE&&{}|{}'.format(if_name, if_addr)
+                    syslog.syslog(syslog.LOG_INFO, 'Row delete key {}'.format(cache_tbl_key))
+
+                    if cache_tbl_key in self.table_data_cache.keys():
+                        cache_tbl_data = self.table_data_cache[cache_tbl_key]
+                        syslog.syslog(syslog.LOG_INFO, 'Row delete cached data {} '.format(cache_tbl_data))
+
+                        for key, data in cache_tbl_data.items() :
+                            cached_op_data = CachedDataWithOp(data, CachedDataWithOp.OP_DELETE)
+                            cmd_data.update({ key : cached_op_data } ) 
+
+                    syslog.syslog(syslog.LOG_INFO, 'Row delete cmd data {} '.format(cmd_data))
+
+                    if len(cmd_data) :
+                        if not key_map.run_command(self, table, cmd_data, cmd_prefix, if_name, if_addr):
+                            syslog.syslog(syslog.LOG_INFO, 'failed running interface no ip ospf config command')
+                            self.__apply_config_delete_success(cmd_data)
+                            continue
+                    else :
+                        self.__apply_config_delete_success(cmd_data)
+
+                else :
+                    syslog.syslog(syslog.LOG_INFO, 'Create/update ospf {} interface {} in {}'.format(key, if_name, vrf))
+
+                    #Work arround for router area config fail, update area every time
+                    if 'area-id' in data.keys():
+                        dval = data['area-id']
+                        if dval.op == CachedDataWithOp.OP_NONE :
+                            dval.op = CachedDataWithOp.OP_ADD 
+
+                    if not key_map.run_command(self, table, data, cmd_prefix, if_name, if_addr):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running interface ip ospf config command')
+                        if 'area-id' in data.keys():
+                            dval = data['area-id']
+                            if dval.op == CachedDataWithOp.OP_DELETE:
+                                #Work arround for router area config delete fail
+                                self.__apply_config_op_success(data, {'area-id': dval.op } )
+                                syslog.syslog(syslog.LOG_INFO, 'area-id delete enforced')
+                        continue
+                    else :
+                        self.__apply_config_op_success(data) 
+
+            elif table == 'OSPFV2_ROUTER_PASSIVE_INTERFACE':
+                syslog.syslog(syslog.LOG_INFO, 'Create passive interface')
+
+                vrf = prefix
+
+                keyvals = key.split('|')
+                if_name = keyvals[0]
+                if_addr = keyvals[1]
+
+                syslog.syslog(syslog.LOG_INFO, 'Create passive interface vrf {}'.format(vrf))
+
+                if (if_addr == "0.0.0.0"):
+                    if_addr = ""
+
+                if data == {}:
+                   if not del_table:
+
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'passive-interface {} {}'".\
+                        format(vrf, if_name, if_addr)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to create passive interface {} {}'.format(if_name, if_addr))
+                            continue
+                   else:
+                        command = "vtysh -c 'configure terminal' -c 'router ospf vrf {}' -c 'no passive-interface {} {}'".\
+                        format(vrf, if_name, if_addr)
+
+                        if not self.__run_command(table, command):
+                            syslog.syslog(syslog.LOG_ERR, 'failed to delete passive interface {} {}'.format(if_name, if_addr))
+                            continue
+
+            elif table == 'STATIC_ROUTE':
+                vrf = prefix
+                syslog.syslog(syslog.LOG_INFO, 'Set static IP route for vrf {} prefix {}'.format(vrf, key))
+                op = CachedDataWithOp.OP_DELETE if del_table else CachedDataWithOp.OP_UPDATE
+                data['ip_prefix'] = CachedDataWithOp(key, op)
+                cmd_prefix = ['configure terminal', 'vrf {}'.format(vrf)]
+                ret_val = key_map.run_command(self, table, data, cmd_prefix, vrf)
+                del(data['ip_prefix'])
+                if not ret_val:
+                    syslog.syslog(syslog.LOG_ERR, 'failed running static route config command')
+                    continue
+                self.static_route_list.setdefault(vrf, {})[key] = self.upd_nh_set
+            elif table == 'PIM_INTERFACE':
+
+                vrf = prefix
+                af, if_name = key.split('|')
+                syslog.syslog(syslog.LOG_INFO,
+                              'PIM interface update for vrf {}, af: {}, interface {}'.format(vrf, af, if_name))
+                cmd_prefix = ['configure terminal',
+                              'interface {}'.format(if_name)]
+                syslog.syslog(syslog.LOG_INFO,
+                              'Create/update PIM interface: key {} interface {} in {}'.format(key, if_name, vrf))
+
+                # If sparse-mode has been disabled, clear other interface
+                # entries in cache so that they will be re-programmed in FRR
+                # on re-enabling of sparse-mode.
+
+                if 'mode' in data:
+                    modeval = data['mode']
+                    modeval_pim_mode = modeval.data
+                    modeval_op = modeval.op
+                    if (modeval_op == CachedDataWithOp.OP_DELETE):
+                        syslog.syslog(syslog.LOG_INFO,
+                                      "Flushing PIM interface cache for deletion "
+                                      "of PIM sparse-mode")
+                        for dkey, dval in data.items():
+                            dval.status = CachedDataWithOp.STAT_SUCC
+                            dval.op = CachedDataWithOp.OP_DELETE
+
+                    # Only send the VTYSH command to FRR if the PIM interface mode
+                    # is present in the update.
+                    if not key_map.run_command(self, table, data, cmd_prefix):
+                        syslog.syslog(syslog.LOG_ERR, 'failed running PIM config command')
+                        continue
+
+            elif table == 'PIM_GLOBALS':
+
+                vrf = prefix
+
+                af = key.split('|')
+                syslog.syslog(syslog.LOG_INFO,
+                              'PIM global update for vrf {}, af: {}'.format(vrf, af))
+
+                cmd_prefix = ['configure terminal',
+                              'vrf {}'.format(vrf)]
+
+                syslog.syslog(syslog.LOG_INFO,
+                              'Create/update PIM global {} af {} in {}'.format(key, af, vrf))
+
+                # if not key_map.run_command(self, table, data, cmd_prefix, vrf, af):
+                if not key_map.run_command(self, table, data, cmd_prefix):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running PIM config command')
+                    continue
+
+            elif table == 'IGMP_INTERFACE':
+                ifname = prefix
+
+                syslog.syslog(syslog.LOG_INFO, 'IGMP Interface MCast Grp ifname {} prefix {}'.format(ifname, key))
+
+                keyvals = key.split('|')
+                mcast_grp = keyvals[0]
+                source_ip = keyvals[1]
+
+                syslog.syslog(syslog.LOG_INFO, 'Configure ip igmp join interface {}, mcast_grp {}, source_ip {}'.format(ifname, mcast_grp, source_ip))
+
+                cmd_prefix = ['configure terminal',
+                          'interface {}'.format(ifname)]
+
+                if not key_map.run_command(self, table, data, cmd_prefix, mcast_grp, source_ip):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running ip igmp join config command')
+                    continue
+
+
+            elif table == 'IGMP_INTERFACE_QUERY':
+                ifname = prefix
+
+                syslog.syslog(syslog.LOG_INFO, 'IGMP Interface {} Config prefix {}'.format(ifname, key))
+
+                cmd_prefix = ['configure terminal',
+                          'interface {}'.format(ifname)]
+
+                if not key_map.run_command(self, table, data, cmd_prefix):
+                    syslog.syslog(syslog.LOG_ERR, 'failed running ip igmp interface config command')
+                    continue
+
+
+    def __add_op_to_data(self, table_key, data, comb_attr_list):
+        cached_data = self.table_data_cache.setdefault(table_key, {})
+        for key in cached_data:
+            if key in data:
+                # both in cache and data, update/none
+                data[key] = (CachedDataWithOp(data[key], CachedDataWithOp.OP_NONE) if data[key] == cached_data[key] else
+                             CachedDataWithOp(data[key], CachedDataWithOp.OP_UPDATE))
+            else:
+                # in cache but not in data, delete
+                data[key] = CachedDataWithOp(cached_data[key], CachedDataWithOp.OP_DELETE)
+        for key in data:
+            if not isinstance(data[key], CachedDataWithOp):
+                # in data but not in cache, add
+                data[key] = CachedDataWithOp(data[key], CachedDataWithOp.OP_ADD)
+        # combo attributes handling
+        op_list = [CachedDataWithOp.OP_DELETE, CachedDataWithOp.OP_ADD, CachedDataWithOp.OP_UPDATE, CachedDataWithOp.OP_NONE]
+        for key_set in comb_attr_list:
+            all_in = True
+            op_idx = len(op_list) - 1
+            for key in key_set:
+                if key not in data:
+                    all_in = False
+                    break
+                idx = op_list.index(data[key].op)
+                if idx >= 0 and idx < op_idx:
+                    op_idx = idx
+            if all_in:
+                for key in key_set:
+                    data[key].op = op_list[op_idx]
+            else:
+                # if one key doesn't exist, clean the whole key set
+                for key in key_set:
+                    data.pop(key, None)
+
+    def __update_cache_data(self, table_key, data):
+        cached_data = self.table_data_cache.setdefault(table_key, {})
+        for key, val in data.items():
+            if not isinstance(val, CachedDataWithOp) or val.op == CachedDataWithOp.OP_NONE or val.status == CachedDataWithOp.STAT_FAIL:
+                syslog.syslog(syslog.LOG_DEBUG, 'ignore cache update for %s because of %s%s%s' %
+                        (key, ('' if isinstance(val, CachedDataWithOp) else 'INV_DATA '),
+                              ('NO_OP ' if isinstance(val, CachedDataWithOp) and val.op == CachedDataWithOp.OP_NONE else ''),
+                              ('STAT_FAIL ' if isinstance(val, CachedDataWithOp) and val.status == CachedDataWithOp.STAT_FAIL else '')))
+                continue
+            if val.op == CachedDataWithOp.OP_ADD or val.op == CachedDataWithOp.OP_UPDATE:
+                cached_data[key] = val.data
+                syslog.syslog(syslog.LOG_INFO, 'Add {} data {} to cache'.format(key, cached_data[key]))
+            elif val.op == CachedDataWithOp.OP_DELETE:
+                syslog.syslog(syslog.LOG_INFO, 'delete {} data {} from cache'.format(key, cached_data.get(key, '')))
+                cached_data.pop(key, None)
+        if len(cached_data) == 0:
+            syslog.syslog(syslog.LOG_INFO, 'delete table row {} from cache'.format(table_key))
+            del(self.table_data_cache[table_key])
+
+
+    def bgp_table_handler_common(self, table, key, data, comb_attr_list = []):
+        syslog.syslog(syslog.LOG_DEBUG, '----------------------------------')
+        syslog.syslog(syslog.LOG_DEBUG, ' BGP table handling')
+        syslog.syslog(syslog.LOG_DEBUG, '----------------------------------')
+        syslog.syslog(syslog.LOG_DEBUG, 'table : %s' % table)
+        syslog.syslog(syslog.LOG_DEBUG, 'key   : %s' % key)
+        op_str = ('DELETE' if data is None else 'SET')
+        del_table = False
+        if data is None:
+            data = {}
+            del_table = True
+        syslog.syslog(syslog.LOG_DEBUG, 'op    : %s' % op_str)
+        syslog.syslog(syslog.LOG_DEBUG, 'data  :')
+        for dkey, dval in data.items():
+            syslog.syslog(syslog.LOG_DEBUG, '        %-10s - %s' % (dkey, dval))
+        syslog.syslog(syslog.LOG_DEBUG, '')
+        table_key = ExtConfigDBConnector.get_table_key(table, key)
+        self.__add_op_to_data(table_key, data, comb_attr_list)
+        self.bgp_message.put((key, del_table, table, data))
+        upd_data_list = []
+        self.__update_bgp(upd_data_list)
+        for table, key, data in upd_data_list:
+            table_key = ExtConfigDBConnector.get_table_key(table, key)
+            self.__update_cache_data(table_key, data)
+
+    def bgp_global_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'keepalive', 'holdtime'}])
+
+    def bgp_af_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'ebgp_route_distance', 'ibgp_route_distance', 'local_route_distance'},
+                                        {'route_flap_dampen_reuse_threshold', 'route_flap_dampen_suppress_threshold', 'route_flap_dampen_max_suppress'}])
+
+    def bgp_neighbor_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'keepalive', 'holdtime'}])
+
+    def comm_set_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'set_type', 'match_action', 'community_member'}])
+
+    def bfd_shop_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'remote-address', 'vrf', 'interface'},
+                                                         {'remote-address', 'vrf', 'interface', 'local-address'}])
+    def bfd_mhop_handler(self, table, key, data):
+        self.bgp_table_handler_common(table, key, data, [{'remote-address', 'vrf', 'local-address'}])
+
+    def start(self):
+        self.subscribe_all()
+        self.config_db.listen()
+    def stop(self):
+        self.config_db.sub_thread.stop()
+        if self.config_db.sub_thread.is_alive():
+            self.config_db.sub_thread.join()
+
+main_loop = True
+
+def sig_handler(signum, frame):
+    global main_loop
+    syslog.syslog(syslog.LOG_DEBUG, 'entering signal handler')
+    main_loop = False
+
+def main():
+    global bgpd_client
+    for sig_num in [signal.SIGTERM, signal.SIGINT]:
+        signal.signal(sig_num, sig_handler)
+    syslog.syslog(syslog.LOG_DEBUG, 'entering BGP configuration daemon')
+    bgpd_client = BgpdClientMgr()
+    bgpd_client.start()
+    daemon = BGPConfigDaemon()
+    daemon.start()
+    while main_loop:
+        signal.pause()
+    syslog.syslog(syslog.LOG_DEBUG, 'leaving BGP configuration daemon')
+    bgpd_client.shutdown()
+    daemon.stop()
+
+if __name__ == "__main__":
+    main()
diff --git a/src/sonic-frr-mgmt-framework/pytest.ini b/src/sonic-frr-mgmt-framework/pytest.ini
new file mode 100644
index 000000000000..c857ef5cd502
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --cov=frrcfgd --cov-report term
diff --git a/src/sonic-frr-mgmt-framework/setup.cfg b/src/sonic-frr-mgmt-framework/setup.cfg
new file mode 100644
index 000000000000..00ed5efbcbad
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/setup.cfg
@@ -0,0 +1,5 @@
+[aliases]
+test=pytest
+[tool:pytest]
+addopts = --verbose
+python_files = tests/*.py
diff --git a/src/sonic-frr-mgmt-framework/setup.py b/src/sonic-frr-mgmt-framework/setup.py
new file mode 100755
index 000000000000..d8681d1bbd88
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/setup.py
@@ -0,0 +1,51 @@
+import setuptools
+
+setuptools.setup(
+    name = 'sonic-frr-mgmt-framework',
+    version = '1.0',
+    description = 'Utility to dynamically configuration FRR based on config DB data update event',
+    url = 'https://github.com/Azure/sonic-buildimage',
+    packages = setuptools.find_packages(),
+    entry_points = {
+        'console_scripts': [
+            'frrcfgd = frrcfgd.frrcfgd:main',
+        ]
+    },
+    install_requires = [
+        'jinja2>=2.10',
+        'netaddr==0.8.0',
+        'pyyaml==5.3.1',
+        'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2
+    ],
+    setup_requires = [
+        'pytest-runner',
+        'wheel'
+    ],
+    tests_require = [
+        'pytest',
+        'pytest-cov',
+        'sonic-config-engine'
+    ],
+    data_files = [('sonic/frrcfgd', ['templates/bgpd/bgpd.conf.j2',
+                                     'templates/bgpd/bgpd.conf.db.j2',
+                                     'templates/bgpd/bgpd.conf.db.route_map.j2',
+                                     'templates/bgpd/bgpd.conf.db.pref_list.j2',
+                                     'templates/bgpd/bgpd.conf.db.nbr_or_peer.j2',
+                                     'templates/bgpd/bgpd.conf.db.nbr_af.j2',
+                                     'templates/bgpd/bgpd.conf.db.comm_list.j2',
+                                     'templates/bgpd/bgpd.conf.db.addr_family.j2',
+                                     'templates/bgpd/bgpd.conf.db.addr_family.evpn.j2',
+                                     'templates/bfdd/bfdd.conf.j2',
+                                     'templates/ospfd/ospfd.conf.j2',
+                                     'templates/ospfd/ospfd.conf.db.area.j2',
+                                     'templates/ospfd/ospfd.conf.db.comm_list.j2',
+                                     'templates/ospfd/ospfd.conf.db.distributeroute.j2',
+                                     'templates/ospfd/ospfd.conf.db.interface.j2',
+                                     'templates/ospfd/ospfd.conf.db.policyrange.j2',
+                                     'templates/ospfd/ospfd.conf.db.vlink.j2',
+                                     'templates/staticd/staticd.conf.j2',
+                                     'templates/staticd/staticd.db.conf.j2',
+                                     'templates/staticd/staticd.db.default_route.conf.j2',
+                                     'templates/frr/frr.conf.j2'])
+    ]
+)
diff --git a/src/sonic-frr-mgmt-framework/templates/bfdd/bfdd.conf.j2 b/src/sonic-frr-mgmt-framework/templates/bfdd/bfdd.conf.j2
new file mode 100644
index 000000000000..a4c07c026375
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bfdd/bfdd.conf.j2
@@ -0,0 +1,91 @@
+!
+{% block banner %}
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/frr/bfd.conf.j2 with config DB data
+! file: bfd.conf
+!
+{% endblock banner %}
+!
+{% block bfd_shop_peers %}
+{% if BFD_PEER_SINGLE_HOP %}
+bfd
+{% for (peer_key, peer_info) in BFD_PEER_SINGLE_HOP.items() %}
+{% set peer_args = '' %}
+{% if peer_key[0] != 'null' %}
+{% set peer_args = peer_args~' '~'peer'~' '~peer_key[0] %}
+{% endif %}
+{% if peer_key[1] != 'null' %}
+{% set peer_args = peer_args~' '~'interface'~' '~peer_key[1] %}
+{% endif %}
+{% if peer_key[2] != 'null' %}
+{% set peer_args = peer_args~' '~'vrf'~' '~peer_key[2] %}
+{% endif %}
+{% if peer_key[3] != 'null' %}
+{% set peer_args = peer_args~' '~'local-address'~' '~peer_key[3] %}
+{% endif %}
+{{ peer_args }} 
+{# set the bfd peer timers #}
+{% if  (peer_info['desired-minimum-tx-interval'] is defined and peer_info['desired-minimum-tx-interval'] | int != 300) %}
+  transmit-interval {{ peer_info['desired-minimum-tx-interval'] }} 
+{% endif %}
+{% if  (peer_info['required-minimum-receive'] is defined and peer_info['required-minimum-receive'] | int != 300) %}
+  receive-interval {{ peer_info['required-minimum-receive'] }}
+{% endif %}
+{% if  (peer_info['detection-multiplier'] is defined and peer_info['detection-multiplier'] | int != 3) %}
+  detect-multiplier {{ peer_info['detection-multiplier'] }}
+{% endif %}
+{% if  (peer_info['echo-active'] is defined and peer_info['echo-active'] != 'false') %}
+  echo-mode
+{% endif %}
+{% if  (peer_info['desired-minimum-echo-receive'] is defined and peer_info['desired-minimum-echo-receive'] | int != 50) %}
+  echo-interval {{ peer_info['desired-minimum-echo-receive'] }}
+{% endif %}
+{% if  (peer_info['enabled'] is defined and peer_info['enabled'] == 'true') %}
+  no shutdown
+{% else %}
+  shutdown
+{% endif %}
+  !
+{% endfor %}
+!
+{% endif %}
+{% endblock bfd_shop_peers%}
+{% block bfd_mhop_peers %}
+{% if BFD_PEER_MULTI_HOP %}
+bfd
+{% for (peer_key, peer_info) in BFD_PEER_MULTI_HOP.items() %}
+{% set peer_args = '' %}
+{% if peer_key[0] != 'null' %}
+{% set peer_args = peer_args~' '~'peer'~' '~peer_key[0] %}
+{% endif %}
+{% if peer_key[1] != 'null' %}
+{% set peer_args = peer_args~' '~'interface'~' '~peer_key[1] %}
+{% endif %}
+{% if peer_key[2] != 'null' %}
+{% set peer_args = peer_args~' '~'vrf'~' '~peer_key[2] %}
+{% endif %}
+{% if peer_key[3] != 'null' %}
+{% set peer_args = peer_args~' '~'local-address'~' '~peer_key[3] %}
+{% endif %}
+{% set peer_args = peer_args~' '~'multihop' %}
+{{ peer_args }}
+{# set the bfd peer timers #}
+{% if  (peer_info['desired-minimum-tx-interval'] is defined and peer_info['desired-minimum-tx-interval'] | int != 300) %}
+  transmit-interval {{ peer_info['desired-minimum-tx-interval'] }}
+{% endif %}
+{% if  (peer_info['required-minimum-receive'] is defined and peer_info['required-minimum-receive'] | int != 300) %}
+  receive-interval {{ peer_info['required-minimum-receive'] }}
+{% endif %}
+{% if  (peer_info['detection-multiplier'] is defined and peer_info['detection-multiplier'] | int != 3) %}
+  detect-multiplier {{ peer_info['detection-multiplier'] }}
+{% endif %}
+{% if  (peer_info['enabled'] is defined and peer_info['enabled'] == 'true') %}
+  no shutdown
+{% else %}
+  shutdown
+{% endif %}
+  !
+{% endfor %}
+!
+{% endif %}
+{% endblock bfd_mhop_peers%}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.evpn.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.evpn.j2
new file mode 100644
index 000000000000..c0db96c24dd7
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.evpn.j2
@@ -0,0 +1,78 @@
+{% if 'advertise-all-vni' in af_val and af_val['advertise-all-vni'] == 'true' %}
+  advertise-all-vni
+{% endif %}
+{% if 'autort' in af_val %}
+  autort {{af_val['autort']}}
+{% endif %}
+{% if 'advertise-default-gw' in af_val and af_val['advertise-default-gw'] == 'true' %}
+  advertise-default-gw
+{% endif %}
+{% if 'dad-enabled' in af_val and 'dad-max-moves' in af_val and 'dad-time' in af_val %}
+  dup-addr-detection max-moves {{af_val['dad-max-moves']}} time {{af_val['dad-time']}}
+{% endif %}
+{% if 'dad-freeze' in af_val %}
+  dup-addr-detection freeze {{af_val['dad-freeze']}}
+{% endif %}
+{% if 'advertise-ipv4-unicast' in af_val and af_val['advertise-ipv4-unicast'] == 'true' %}
+  advertise ipv4 unicast
+{% endif %}
+{% if 'advertise-ipv6-unicast' in af_val and af_val['advertise-ipv6-unicast'] == 'true' %}
+  advertise ipv6 unicast
+{% endif %}
+{% if 'default-originate-ipv4' in af_val and af_val['default-originate-ipv4'] == 'true' %}
+  default-originate ipv4
+{% endif %}
+{% if 'default-originate-ipv6' in af_val and af_val['default-originate-ipv6'] == 'true' %}
+  default-originate ipv6
+{% endif %}
+{% if 'route-distinguisher' in af_val %}
+  rd {{af_val['route-distinguisher']}}
+{% endif %}
+{% if 'import-rts' in af_val %}
+{% for irt in af_val['import-rts'] %}
+  route-target import {{irt}}
+{% endfor %}
+{% endif %}
+{% if 'export-rts' in af_val %}
+{% for irt in af_val['export-rts'] %}
+  route-target export {{irt}}
+{% endfor %}
+{% endif %}
+{% if BGP_GLOBALS_EVPN_RT is defined and BGP_GLOBALS_EVPN_RT|length > 0 %}
+{% for evpn_rt_key, evpn_rt_val in BGP_GLOBALS_EVPN_RT.items() %}
+{% if vrf == evpn_rt_key[0] %}
+  route-target {{evpn_rt_val['route-target-type']}} {{evpn_rt_key[2]}} 
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if BGP_GLOBALS_EVPN_VNI is defined and BGP_GLOBALS_EVPN_VNI|length > 0 %}
+{% for vni_key, vni_val in BGP_GLOBALS_EVPN_VNI.items() %}
+{% if vrf == vni_key[0] %}
+   vni {{vni_key[2]}}
+{% if 'route-distinguisher' in vni_val %}
+    rd {{vni_val['route-distinguisher']}}
+{% endif %}
+{% if 'import-rts' in vni_val %}
+{% for irt in vni_val['import-rts'] %}
+  route-target import {{irt}}
+{% endfor %}
+{% endif %}
+{% if 'export-rts' in vni_val %}
+{% for irt in vni_val['export-rts'] %}
+  route-target export {{irt}}
+{% endfor %}
+{% endif %}
+{% if BGP_GLOBALS_EVPN_VNI_RT is defined and BGP_GLOBALS_EVPN_VNI_RT|length > 0 %}
+{% for vni_rt_key, vni_rt_val in BGP_GLOBALS_EVPN_VNI_RT.items() %}
+{% if vrf == vni_rt_key[0] and vni_key[2] == vni_rt_key[2] %}
+    route-target {{vni_rt_val['route-target-type']}} {{vni_rt_key[3]}} 
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if 'advertise-default-gw' in vni_val and vni_val['advertise-default-gw'] == 'true' %}
+    advertise-default-gw
+{% endif %}
+   exit-vni
+{% endif %}
+{% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.j2
new file mode 100644
index 000000000000..9bf005518cc3
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.j2
@@ -0,0 +1,143 @@
+{# -----------------------------------------------------------------------------------------#}
+{# this is invoked with the "vrf" variable set						    #}
+{# -----------------------------------------------------------------------------------------#}
+{# -------address-family --------------------------- #}
+{% if (BGP_GLOBALS_AF is defined and BGP_GLOBALS_AF|length > 0) or
+      (BGP_GLOBALS_AF_NETWORK is defined and BGP_GLOBALS_AF_NETWORK|length > 0) or
+      (BGP_GLOBALS_AF_AGGREGATE_ADDR is defined and BGP_GLOBALS_AF_AGGREGATE_ADDR|length > 0) or
+      (ROUTE_REDISTRIBUTE is defined and ROUTE_REDISTRIBUTE|length > 0) or
+      (BGP_PEER_GROUP_AF is defined and BGP_PEER_GROUP_AF|length > 0) or
+      (BGP_NEIGHBOR_AF is defined and BGP_NEIGHBOR_AF|length > 0) %}
+{% set af_str_map = { 'ipv4_unicast': 'ipv4', 'ipv6_unicast':'ipv6', 'l2vpn_evpn':'l2vpn'} %}
+{% set safi_str_map = { 'ipv4_unicast': 'unicast', 'ipv6_unicast':'unicast', 'l2vpn_evpn':'evpn'} %}
+{% for af, af_str in af_str_map|dictsort %}
+ !
+ address-family {{af_str}} {{safi_str_map[af]}}
+{% if BGP_GLOBALS_AF is defined and BGP_GLOBALS_AF|length > 0 %}
+{% for af_key, af_val in BGP_GLOBALS_AF.items() %}
+{% if vrf == af_key[0] and af == af_key[1] %}
+{% if 'ebgp_route_distance' in af_val and 'ibgp_route_distance' in af_val and 'local_route_distance' in af_val %}
+  distance bgp {{af_val['ebgp_route_distance']}} {{af_val['ibgp_route_distance']}} {{af_val['local_route_distance']}}
+{% endif %}
+{% if 'import_vrf' in af_val %}
+  import vrf {{af_val['import_vrf']}}  
+{% endif %}
+{% if 'import_vrf_route_map' in af_val %}
+  import vrf route-map {{af_val['import_vrf_route_map']}}  
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- network-prefix    --------------------------- #}
+{% if BGP_GLOBALS_AF_NETWORK is defined and BGP_GLOBALS_AF_NETWORK|length > 0 %}
+{% for af_nw_key, af_nw_val in BGP_GLOBALS_AF_NETWORK.items() %}
+{% if vrf == af_nw_key[0] and af == af_nw_key[1] %}
+{% set af_nw_ns = namespace(nw_end = '') %}
+{% if 'backdoor' in af_nw_val and af_nw_val['backdoor'] == 'true' %}
+{% set af_nw_ns.nw_end = 'backdoor ' %}
+{% endif %}
+{% if 'policy' in af_nw_val %}
+{% set af_nw_ns.nw_end = af_nw_ns.nw_end + 'route-map ' + af_nw_val['policy'] %}
+{% endif %}
+  network {{af_nw_key[2]}} {{af_nw_ns.nw_end}}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- network-prefix end   --------------------------- #}
+{# ------- aggregate-prefix -Start--------------------------- #}
+{% if BGP_GLOBALS_AF_AGGREGATE_ADDR is defined and BGP_GLOBALS_AF_AGGREGATE_ADDR|length > 0 %}
+{% for af_ag_key, af_ag_val in BGP_GLOBALS_AF_AGGREGATE_ADDR.items() %}
+{% set af_ag_ns = namespace(ag_end = '') %}
+{% if vrf == af_ag_key[0] and af == af_ag_key[1] %}
+{% if 'as_set' in af_ag_val and af_ag_val['as_set'] == 'true' %}
+{% set af_ag_ns.ag_end = 'as-set ' %}
+{% endif %}
+{% if 'summary_only' in af_ag_val and af_ag_val['summary_only'] == 'true' %}
+{% set af_ag_ns.ag_end = af_ag_ns.ag_end + 'summary-only' %}
+{% endif %}
+  aggregate-address {{af_ag_key[2]}} {{af_ag_ns.ag_end}}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- aggregate-prefix - End --------------------------- #}
+{# ------- redistribute - Start --------------------------- #}
+{% if ROUTE_REDISTRIBUTE is defined and ROUTE_REDISTRIBUTE|length > 0 %}
+{% for rr_key, rr_val in ROUTE_REDISTRIBUTE.items() %}
+{% if vrf == rr_key[0] and af_str == rr_key[3] %}
+{% if 'route_map' in rr_val %}
+{% for rmap in rr_val['route_map'] %}
+  redistribute {{rr_key[1]}} route-map {{rmap}}
+{% endfor %}
+{% else %}
+  redistribute {{rr_key[1]}}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- redistribute - End ----------------------------- #}
+{# ------- peer-group af--------------------------- #}
+{% if BGP_PEER_GROUP_AF is defined and BGP_PEER_GROUP_AF|length > 0 %}
+{% for n_af_key, n_af_val in BGP_PEER_GROUP_AF.items() %}
+{% if vrf == n_af_key[0] and af == n_af_key[2] %}
+{% set nbr_name = n_af_key[1] %}
+{% include "bgpd.conf.db.nbr_af.j2" %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- peer-group af end --------------------------- #}
+{# ------- neighbor af--------------------------- #}
+{% if BGP_NEIGHBOR_AF is defined and BGP_NEIGHBOR_AF|length > 0 %}
+{% for n_af_key, n_af_val in BGP_NEIGHBOR_AF.items() %}
+{% if vrf == n_af_key[0] and af == n_af_key[2] %}
+{% set nbr_name = n_af_key[1] %}
+{% include "bgpd.conf.db.nbr_af.j2" %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------- neighbor af end --------------------------- #}
+{% if BGP_GLOBALS_AF is defined and BGP_GLOBALS_AF|length > 0 %}
+{% for af_key, af_val in BGP_GLOBALS_AF.items() %}
+{% if vrf == af_key[0] and af == af_key[1] %}
+{# -------bgp dampen - start--------------------------- #}
+{% if 'route_flap_dampen' in af_val and af_val['route_flap_dampen'] == 'true' %}
+{% set ns = namespace(route_dampen = '') %}
+{% if 'route_flap_dampen_half_life' in af_val  %}
+{% set ns.route_dampen = ns.route_dampen + af_val['route_flap_dampen_half_life'] + ' ' %}
+{% if 'route_flap_dampen_reuse_threshold' in af_val  %}
+{% set ns.route_dampen = ns.route_dampen + af_val['route_flap_dampen_reuse_threshold'] + ' ' %}
+{% if 'route_flap_dampen_suppress_threshold' in af_val  %}
+{% set ns.route_dampen = ns.route_dampen + af_val['route_flap_dampen_suppress_threshold'] + ' ' %}
+{% if 'route_flap_dampen_max_suppress' in af_val  %}
+{% set ns.route_dampen = ns.route_dampen + af_val['route_flap_dampen_max_suppress'] + ' ' %}
+{% endif %}
+{% endif %}
+{% endif %}
+{% endif %}
+  bgp dampening {{ns.route_dampen}}
+{% endif %}
+{# -------bgp dampen - end --------------------------- #}
+{% if 'max_ebgp_paths' in af_val %}
+  maximum-paths {{af_val['max_ebgp_paths']}}
+{% endif %}
+{% if 'max_ibgp_paths' in af_val %}
+{% set ns = namespace(max_ibgp = af_val['max_ibgp_paths']) %}
+{% if 'ibgp_equal_cluster_length' in af_val and af_val['ibgp_equal_cluster_length'] == 'true' %}
+{% set ns.max_ibgp = ns.max_ibgp + ' equal-cluster-length' %}
+{% endif %}
+  maximum-paths ibgp {{ns.max_ibgp}}
+{% endif %}
+{% if 'route_download_filter' in af_val %}
+  table-map {{af_val['route_download_filter']}}
+{% endif %}
+{# -------bgp evpn - start --------------------------- #}
+{% if af == 'l2vpn_evpn' %}
+{% include "bgpd.conf.db.addr_family.evpn.j2" %}
+{% endif %}
+{# -------bgp evpn - end --------------------------- #}
+{% endif %}
+{% endfor %}
+{% endif %}
+ exit-address-family
+{% endfor %}
+{% endif %}
+{# -------address-family end --------------------------- #}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.comm_list.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.comm_list.j2
new file mode 100644
index 000000000000..3fcce07ddc9c
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.comm_list.j2
@@ -0,0 +1,54 @@
+{# ------------------------------------------------------------------------------------ #}
+{% if (COMMUNITY_SET is defined and COMMUNITY_SET|length > 0) or 
+      (EXTENDED_COMMUNITY_SET is defined and EXTENDED_COMMUNITY_SET|length >0) %}
+!
+{% endif %}
+{# ------------------------------------------------------------------------------------ #}
+{% if COMMUNITY_SET is defined and COMMUNITY_SET|length > 0 %}
+{% for cm_key, cm_val in COMMUNITY_SET.items() %}
+{% if 'set_type' in cm_val and 'match_action' in cm_val and 'community_member' in cm_val %}
+{% if cm_val['match_action']|lower == 'all' %}
+{% set ns = namespace(cm_list = '') %}
+{% for cm in cm_val['community_member'] %}
+{% set ns.cm_list = ns.cm_list + cm + ' ' %}
+{% endfor %}
+bgp community-list {{cm_val['set_type']|lower}} {{cm_key}} permit {{ns.cm_list}}
+{% elif cm_val['match_action']|lower == 'any' %}
+{% for cm in cm_val['community_member'] %}
+bgp community-list {{cm_val['set_type']|lower}} {{cm_key}} permit {{cm}}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------------------------------------------------------------------------------------ #}
+{% if EXTENDED_COMMUNITY_SET is defined and EXTENDED_COMMUNITY_SET|length > 0 %}
+{% for cm_key, cm_val in EXTENDED_COMMUNITY_SET.items() %}
+{% if 'set_type' in cm_val and 'match_action' in cm_val and 'community_member' in cm_val %}
+{% if cm_val['match_action']|lower == 'all' %}
+{% set ns = namespace(cm_list = '') %}
+{% for cm in cm_val['community_member'] %}
+{% if 'route-target' in cm %}
+{% set ns.cm_list = ns.cm_list + 'rt ' + cm[13:] + ' ' %}
+{% elif 'route-origin' in cm %}
+{% set ns.cm_list = ns.cm_list + 'soo ' + cm[13:] + ' ' %}
+{% else %}
+{% set ns.cm_list = ns.cm_list + cm + ' ' %}
+{% endif %}
+{% endfor %}
+bgp extcommunity-list {{cm_val['set_type']|lower}} {{cm_key}} permit {{ns.cm_list}}
+{% elif cm_val['match_action']|lower == 'any' %}
+{% for cm in cm_val['community_member'] %}
+{% if 'route-target' in cm %}
+bgp extcommunity-list {{cm_val['set_type']|lower}} {{cm_key}} permit rt {{cm[13:]}}
+{% elif 'route-origin' in cm %}
+bgp extcommunity-list {{cm_val['set_type']|lower}} {{cm_key}} permit soo {{cm[13:]}}
+{% else %}
+bgp extcommunity-list {{cm_val['set_type']|lower}} {{cm_key}} permit {{cm}}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------------------------------------------------------------------------------------ #}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.j2
new file mode 100644
index 000000000000..4b49813e4c93
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.j2
@@ -0,0 +1,204 @@
+! template: bgpd/bgpd.conf.db.j2
+!
+! BGP configuration using config DB BGP instance tables
+!
+{# ------------------------------------------------------------------------------------ #}
+{% include "bgpd.conf.db.pref_list.j2" %}
+{# ------------------------------------------------------------------------------------ #}
+{# ------------------------------------------------------------------------------------ #}
+{% include "bgpd.conf.db.route_map.j2" %}
+{# ------------------------------------------------------------------------------------ #}
+{% if AS_PATH_SET is defined and AS_PATH_SET|length > 0 %}
+!
+{% for key, val in AS_PATH_SET.items() %}
+{% if 'as_path_set_member' in val %}
+{% for path in val['as_path_set_member'] %}
+bgp as-path access-list {{key}} permit {{path}}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# ------------------------------------------------------------------------------------ #}
+{% include "bgpd.conf.db.comm_list.j2" %}
+{# ------------------------------------------------------------------------------------ #}
+{% if BGP_GLOBALS is defined and BGP_GLOBALS|length > 0 %}
+{% for vrf, bgp_sess in BGP_GLOBALS.items() %}
+{% if 'local_asn' in bgp_sess %}
+!
+{% if vrf == 'default' %}
+router bgp {{ bgp_sess['local_asn']}}
+{% else %}
+router bgp {{ bgp_sess['local_asn']}} vrf {{ vrf }}
+{% endif %}
+{% if 'fast_external_failover' in bgp_sess and bgp_sess['fast_external_failover'] == 'false' %}
+ no bgp fast-external-failover
+{% endif %}
+{% if 'router_id' in bgp_sess %}
+ bgp router-id {{bgp_sess['router_id']}}
+{% endif %}
+{% if 'log_nbr_state_changes' in bgp_sess and bgp_sess['log_nbr_state_changes'] == 'true' %}
+ bgp log-neighbor-changes
+{% endif %}
+{% if 'always_compare_med' in bgp_sess and bgp_sess['always_compare_med'] == 'true' %}
+ bgp always-compare-med
+{% endif %}
+{# --------------------------bgp default - start -------------------------------------- #}
+{% if 'default_ipv4_unicast' in bgp_sess and bgp_sess['default_ipv4_unicast'] == 'true' %}
+ bgp default ipv4-unicast
+{% else %}
+ no bgp default ipv4-unicast
+{% endif %}
+{% if 'default_local_preference' in bgp_sess %}
+ bgp default local-preference {{bgp_sess['default_local_preference']}}
+{% endif %}
+{% if 'default_show_hostname' in bgp_sess and bgp_sess['default_show_hostname'] == 'true' %}
+ bgp default show-hostname
+{% endif %}
+{% if 'default_shutdown' in bgp_sess and bgp_sess['default_shutdown'] == 'true' %}
+ bgp default shutdown
+{% endif %}
+{% if 'default_subgroup_pkt_queue_max' in bgp_sess %}
+ bgp default subgroup-pkt-queue-max {{bgp_sess['default_subgroup_pkt_queue_max']}}
+{% endif %}
+{# --------------------------bgp default - end ---------------------------------------- #}
+{% if 'rr_clnt_to_clnt_reflection' in bgp_sess and bgp_sess['rr_clnt_to_clnt_reflection'] == 'false' %}
+ no bgp client-to-client reflection
+{% endif %}
+{% if 'rr_cluster_id' in bgp_sess %}
+ bgp cluster-id {{bgp_sess['rr_cluster_id']}}
+{% endif %}
+{% if 'disable_ebgp_connected_rt_check' in bgp_sess and bgp_sess['disable_ebgp_connected_rt_check'] == 'true' %}
+ bgp disable-ebgp-connected-route-check
+{% endif %}
+{% if 'deterministic_med' in bgp_sess and bgp_sess['deterministic_med'] == 'true' %}
+ bgp deterministic-med
+{% endif %}
+{% if 'max_delay' in bgp_sess %}
+{% set ns = namespace(max_delay = '') %}
+{% set ns.max_delay = ns.max_delay + bgp_sess['max_delay'] %}
+{% if 'establish_wait' in bgp_sess %}
+{% set ns.max_delay = ns.max_delay + ' ' + bgp_sess['establish_wait'] %}
+{% endif %}
+ update-delay {{ns.max_delay}}
+{% endif %}
+{% if 'max_med_time' in bgp_sess %}
+{% set ns = namespace(max_med = '') %}
+{% set ns.max_med = ns.max_med + bgp_sess['max_med_time'] %}
+{% if 'max_med_val' in bgp_sess %}
+{% set ns.max_med = ns.max_med + ' ' + bgp_sess['max_med_val'] %}
+{% endif %}
+ bgp max-med on-startup {{ns.max_med}}
+{% endif %}
+{% if 'max_med_admin' in bgp_sess %}
+{% set adm_ns = namespace(admin_val = '') %}
+{% if 'max_med_admin_val' in bgp_sess %}
+{% set adm_ns.admin_val = adm_ns.admin_val + ' ' + bgp_sess['max_med_admin_val'] %}
+{% endif %}
+ bgp max-med administrative {{adm_ns.admin_val}}
+{% endif %}
+{% if 'read_quanta' in bgp_sess %}
+ read-quanta {{bgp_sess['read_quanta']}}
+{% endif %}
+{% if 'write_quanta' in bgp_sess %}
+ write-quanta {{bgp_sess['write_quanta']}}
+{% endif %}
+{% if 'coalesce_time' in bgp_sess %}
+ coalesce-time {{bgp_sess['coalesce_time']}}
+{% endif %}
+{# --------------------------bgp graceful-restart - start ----------------------------- #}
+{% if 'gr_stale_routes_time' in bgp_sess %}
+ bgp graceful-restart stalepath-time {{bgp_sess['gr_stale_routes_time']}}
+{% endif %}
+{% if 'gr_restart_time' in bgp_sess %}
+ bgp graceful-restart restart-time {{bgp_sess['gr_restart_time']}}
+{% endif %}
+{% if 'graceful_restart_enable' in bgp_sess and bgp_sess['graceful_restart_enable'] == 'true' %}
+ bgp graceful-restart
+{% endif %}
+{% if 'graceful_shutdown' in bgp_sess and bgp_sess['graceful_shutdown'] == 'true' %}
+ bgp graceful-shutdown
+{% endif %}
+{% if 'gr_preserve_fw_state' in bgp_sess and bgp_sess['gr_preserve_fw_state'] == 'true' %}
+ bgp graceful-restart preserve-fw-state
+{% endif %}
+{# --------------------------bgp graceful-restart - end   ----------------------------- #}
+{# --------------------------bgp bestpath as-path - start ----------------------------- #}
+{% if 'ignore_as_path_length' in bgp_sess %}
+ bgp bestpath as-path ignore
+{% endif %}
+{% if 'compare_confed_as_path' in bgp_sess and bgp_sess['compare_confed_as_path'] == 'true' %}
+ bgp bestpath as-path confed
+{% endif %}
+{% if 'load_balance_mp_relax' in bgp_sess and bgp_sess['load_balance_mp_relax'] == 'true' %}
+{% set mp_ns = namespace(mp_val = '') %}
+{% if 'as_path_mp_as_set' in bgp_sess and bgp_sess['as_path_mp_as_set'] == 'true' %}
+{% set mp_ns.mp_val = mp_ns.mp_val + 'as-set' %}
+{% elif 'as_path_mp_as_set' in bgp_sess and bgp_sess['as_path_mp_as_set'] == 'false' %}
+{% set mp_ns.mp_val = mp_ns.mp_val + 'no-as-set' %}
+{% endif %}
+ bgp bestpath as-path multipath-relax {{mp_ns.mp_val}}
+{% endif %}
+{# --------------------------bgp bestpath as-path - end   ----------------------------- #}
+{% if 'rr_allow_out_policy' in bgp_sess and bgp_sess['rr_allow_out_policy'] == 'true' %}
+ bgp route-reflector allow-outbound-policy
+{% endif %}
+{% if 'external_compare_router_id' in bgp_sess %}
+ bgp bestpath compare-routerid
+{% endif %}
+{% if 'med_confed' in bgp_sess and bgp_sess['med_confed'] == 'true' %}
+ bgp bestpath med confed
+{% endif %}
+{% if 'med_missing_as_worst' in bgp_sess and bgp_sess['med_missing_as_worst'] == 'true' %}
+ bgp bestpath med confed missing-as-worst
+{% endif %}
+{% if 'network_import_check' in bgp_sess and bgp_sess['network_import_check'] == 'true' %}
+ bgp network import-check
+{% endif %}
+{# -------globals end --------------------------- #}
+{# -------peer-group --------------------------- #}
+{% if BGP_PEER_GROUP is defined and BGP_PEER_GROUP|length > 0 %}
+{% for peer_group, nbr_or_peer in BGP_PEER_GROUP.items() %}
+{% if vrf == peer_group[0] %}
+{% set name_or_ip = peer_group[1] %}
+{% set nbr_or_peer_type = 'peer-group' %}
+{% include "bgpd.conf.db.nbr_or_peer.j2" %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# -------peer-group end --------------------------- #}
+{# -------neighbor --------------------------- #}
+{% if BGP_NEIGHBOR is defined and BGP_NEIGHBOR|length > 0 %}
+{% for nbr_addr, nbr_or_peer in BGP_NEIGHBOR.items() %}
+{% if nbr_addr is not string and nbr_addr|length > 1 %}
+{% if vrf == nbr_addr[0] %}
+{% set name_or_ip = nbr_addr[1] %}
+{% set nbr_or_peer_type = 'neighbor' %}
+{% include "bgpd.conf.db.nbr_or_peer.j2" %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# -------neighbor end --------------------------- #}
+{% if 'max_dynamic_neighbors' in bgp_sess %}
+ bgp listen limit {{bgp_sess['max_dynamic_neighbors']}}
+{% endif %}
+{% if 'route_map_process_delay' in bgp_sess %}
+ bgp route-map delay-timer {{bgp_sess['route_map_process_delay']}}
+{% endif %}
+{# -------listen-prefix --------------------------- #}
+{% if BGP_GLOBALS_LISTEN_PREFIX is defined and BGP_GLOBALS_LISTEN_PREFIX|length > 0 %}
+{% for lpfx, lpfx_val in BGP_GLOBALS_LISTEN_PREFIX.items() %}
+{% if vrf == lpfx[0] %}
+{% if 'peer_group' in lpfx_val %}
+ bgp listen range {{lpfx[1]}} peer-group {{lpfx_val['peer_group']}}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# -------listen-prefix end --------------------------- #}
+{# -------address-family --------------------------- #}
+{% include "bgpd.conf.db.addr_family.j2" %}
+{# -------address-family --------------------------- #}
+{% endif %}
+{% endfor %}
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_af.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_af.j2
new file mode 100644
index 000000000000..8afb64e991cc
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_af.j2
@@ -0,0 +1,150 @@
+{# ------------------------------------------------------------ #}
+{# this is called with the "vrf" and "address-family matched    #}
+{# ------------------------------------------------------------ #}
+{% if 'admin_status' in n_af_val %}
+{% if n_af_val['admin_status'] == 'true' %}
+  neighbor {{nbr_name}} activate
+{% else %}
+  no neighbor {{nbr_name}} activate
+{% endif %}
+{% endif %}
+{% if 'tx_add_paths' in n_af_val %}
+{% if n_af_val['tx_add_paths'] == 'tx_all_paths' %}
+  neighbor {{nbr_name}} addpath-tx-all-paths
+{% elif n_af_val['tx_add_paths'] == 'tx_best_path_per_as' %}
+  neighbor {{nbr_name}} addpath-tx-bestpath-per-AS
+{% endif %}
+{% endif %}
+{% if 'nhself' in n_af_val and n_af_val['nhself'] == 'true' %}
+{% if 'nexthop_self_force' in n_af_val and n_af_val['nexthop_self_force'] == 'true' %}
+  neighbor {{nbr_name}} next-hop-self force
+{% else %}
+  neighbor {{nbr_name}} next-hop-self
+{% endif %}
+{% endif %}
+{% if 'remove_private_as_enabled' in n_af_val and n_af_val['remove_private_as_enabled'] == 'true' %}
+{% set ns = namespace(rpas_str='') %}
+{% if 'remove_private_as_all' in n_af_val and n_af_val['remove_private_as_all'] == 'true' %}
+{% set ns.rpas_str = ns.rpas_str + ' all' %}
+{% endif %}
+{% if 'replace_private_as' in n_af_val and n_af_val['replace_private_as'] == 'true' %}
+{% set ns.rpas_str = ns.rpas_str + ' replace-AS' %}
+{% endif %}
+  neighbor {{nbr_name}} remove-private-AS{{ns.rpas_str}}
+{% endif %}
+{% if 'send_community' in n_af_val %}
+{% if n_af_val['send_community'] == 'standard' %}
+  no neighbor {{nbr_name}} send-community extended
+  no neighbor {{nbr_name}} send-community large
+{% elif n_af_val['send_community'] == 'extended' %}
+  no neighbor {{nbr_name}} send-community
+  no neighbor {{nbr_name}} send-community large
+{% elif n_af_val['send_community'] == 'large' %}
+  no neighbor {{nbr_name}} send-community
+  no neighbor {{nbr_name}} send-community extended
+{% elif n_af_val['send_community'] == 'both' %}
+  no neighbor {{nbr_name}} send-community large
+{% elif n_af_val['send_community'] == 'none' %}
+  no neighbor {{nbr_name}} send-community all
+{% endif %}
+{% endif %}
+{% if 'as_override' in n_af_val and n_af_val['as_override'] == 'true' %}
+  neighbor {{nbr_name}} as-override
+{% endif %}
+{% if 'send_default_route' in n_af_val and n_af_val['send_default_route'] == 'true' %}
+{% if 'default_rmap' in n_af_val %}
+  neighbor {{nbr_name}} default-originate route-map {{n_af_val['default_rmap']}}
+{% else %}
+  neighbor {{nbr_name}} default-originate
+{% endif %}
+{% endif %}
+{% if 'rrclient' in n_af_val and n_af_val['rrclient'] == 'true' %}
+  neighbor {{nbr_name}} route-reflector-client
+{% endif %}
+{% if 'soft_reconfiguration_in' in n_af_val and n_af_val['soft_reconfiguration_in'] == 'true' %}
+  neighbor {{nbr_name}} soft-reconfiguration inbound
+{% endif %}
+{# ------- maximum-prefix --------------------------- #}
+{% if 'max_prefix_limit' in n_af_val %}
+{% set ns = namespace(mpfx_str='maximum-prefix ' + n_af_val['max_prefix_limit']) %}
+{% if 'max_prefix_warning_threshold' in n_af_val %}
+{% set ns.mpfx_str = ns.mpfx_str + ' ' + n_af_val['max_prefix_warning_threshold'] %}
+{% endif %}
+{% if 'max_prefix_restart_interval' in n_af_val %}
+{% set ns.mpfx_str = ns.mpfx_str + ' restart ' + n_af_val['max_prefix_restart_interval'] %}
+{% elif 'max_prefix_warning_only' in n_af_val and n_af_val['max_prefix_warning_only'] == 'true' %}
+{% set ns.mpfx_str = ns.mpfx_str + ' warning-only' %}
+{% endif %}
+  neighbor {{nbr_name}} {{ns.mpfx_str}}
+{% endif %}
+{# ------- maximum-prefix end --------------------------- #}
+{% if 'route_server_client' in n_af_val and n_af_val['route_server_client'] == 'true' %}
+  neighbor {{nbr_name}} route-server-client
+{% endif %}
+{# ------- allow-as --------------------------- #}
+{% if 'allow_as_in' in n_af_val and n_af_val['allow_as_in'] == 'true' %}
+{% if 'allow_as_origin' in n_af_val and n_af_val['allow_as_origin'] == 'true' %}
+  neighbor {{nbr_name}} allowas-in origin
+{% elif 'allow_as_count' in n_af_val %}
+  neighbor {{nbr_name}} allowas-in {{n_af_val['allow_as_count']}}
+{% else %}
+  neighbor {{nbr_name}} allowas-in
+{% endif %}
+{% endif %}
+{# ------- allow-as end --------------------------- #}
+{% if 'add_path_tx_all' in n_af_val and n_af_val['add_path_tx_all'] == 'true' %}
+  neighbor {{nbr_name}} addpath-tx-all-paths
+{% endif %}
+{% if 'add_path_tx_bestpath' in n_af_val and n_af_val['add_path_tx_bestpath'] == 'true' %}
+  neighbor {{nbr_name}} addpath-tx-bestpath-per-AS
+{% endif %}
+{% if 'cap_orf' in n_af_val %}
+  neighbor {{nbr_name}} capability orf prefix-list {{n_af_val['cap_orf']}}
+{% endif %}
+{% if 'weight' in n_af_val %}
+  neighbor {{nbr_name}} weight {{n_af_val['weight']}}
+{% endif %}
+{% if 'prefix_list_in' in n_af_val %}
+  neighbor {{nbr_name}} prefix-list {{n_af_val['prefix_list_in']}} in
+{% endif %}
+{% if 'prefix_list_out' in n_af_val %}
+  neighbor {{nbr_name}} prefix-list {{n_af_val['prefix_list_out']}} out
+{% endif %}
+{# ------- route-map in --------------------------- #}
+{% if 'route_map_in' in n_af_val %}
+{% for map in n_af_val['route_map_in'] %}
+  neighbor {{nbr_name}} route-map {{map}} in
+{% endfor %}
+{% endif %}
+{# ------- route-map in end --------------------------- #}
+{# ------- route-map out --------------------------- #}
+{% if 'route_map_out' in n_af_val %}
+{% for map in n_af_val['route_map_out'] %}
+  neighbor {{nbr_name}} route-map {{map}} out
+{% endfor %}
+{% endif %}
+{# ------- route-map out end --------------------------- #}
+{% if 'unsuppress_map_name' in n_af_val %}
+  neighbor {{nbr_name}} unsuppress-map {{n_af_val['unsuppress_map_name']}}
+{% endif %}
+{% if 'filter_list_in' in n_af_val %}
+  neighbor {{nbr_name}} filter-list {{n_af_val['filter_list_in']}} in
+{% endif %}
+{% if 'filter_list_out' in n_af_val %}
+  neighbor {{nbr_name}} filter-list {{n_af_val['filter_list_out']}} out
+{% endif %}
+{# ------- attribute-unchanged --------------------------- #}
+{% set attr = '' %}
+{% if 'unchanged_as_path' in n_af_val and n_af_val['unchanged_as_path'] == 'true' %}
+{% set attr = 'as-path ' %}
+{% endif %}
+{% if 'unchanged_med' in n_af_val and n_af_val['unchanged_med'] == 'true' %}
+{% set attr = attr + 'med ' %}
+{% endif %}
+{% if 'unchanged_nexthop' in n_af_val and n_af_val['unchanged_nexthop'] == 'true' %}
+{% set attr = attr + 'next-hop' %}
+{% endif %}
+{% if attr != '' %}
+  neighbor {{nbr_name}} attribute-unchanged {{attr}}
+{% endif %}
+{# ------- attribute-unchanged end --------------------------- #}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_or_peer.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_or_peer.j2
new file mode 100644
index 000000000000..8fc5e061ad56
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_or_peer.j2
@@ -0,0 +1,103 @@
+{# ------------------------------------------------------------- #}
+{# this is called with the "vrf" matched                         #}
+{# nbr_or_peer contains the information for the neighbor or peer #}
+{# name_or_ip will be the IP or the name of the neighbor or peer #}
+{# ------------------------------------------------------------- #}
+{% set ns_intf = namespace(intf_arg = '') %}
+{% if nbr_or_peer_type == 'peer-group' %}
+ neighbor {{name_or_ip}} peer-group
+{% else %}
+{% if not (name_or_ip | ipv4 or name_or_ip | ipv6) %}
+{% set ns_intf.intf_arg = 'interface ' %}
+{% endif %}
+{% endif %}
+{% set remote_as = '' %}
+{% if 'asn' in nbr_or_peer %}
+{% set remote_as = nbr_or_peer['asn'] %}
+{% endif %}
+{% if 'peer_type' in nbr_or_peer %}
+{% set remote_as = nbr_or_peer['peer_type'] %}
+{% endif %}
+{% if remote_as != '' %}
+ neighbor {{name_or_ip}} {{ns_intf.intf_arg}}remote-as {{remote_as}}
+{% endif %}
+{% if 'peer_group_name' in nbr_or_peer %}
+ neighbor {{name_or_ip}} {{ns_intf.intf_arg}}peer-group {{nbr_or_peer['peer_group_name']}}
+{% endif %}
+{% if 'local_asn' in nbr_or_peer %}
+ neighbor {{name_or_ip}} local-as {{nbr_or_peer['local_asn']}}
+{% endif %}
+{% if 'name' in nbr_or_peer %}
+ neighbor {{name_or_ip}} description {{nbr_or_peer['name']}}
+{% endif %}
+{% if 'admin_status' in nbr_or_peer and nbr_or_peer['admin_status'] == 'false' %}
+{% if 'shutdown_message' in nbr_or_peer %}
+ neighbor {{name_or_ip}} shutdown message {{nbr_or_peer['shutdown_message']}}
+{% else %}
+ neighbor {{name_or_ip}} shutdown
+{% endif %}
+{% endif %}
+{% if 'bfd' in nbr_or_peer and nbr_or_peer['bfd'] == 'true' %}
+ neighbor {{name_or_ip}} bfd
+{% endif %}
+{% if 'ttl_security_hops' in nbr_or_peer %}
+ neighbor {{name_or_ip}} ttl-security hops {{nbr_or_peer['ttl_security_hops']}}
+{% endif %}
+{% if 'auth_password' in nbr_or_peer %}
+ neighbor {{name_or_ip}} password {{nbr_or_peer['auth_password']}} encrypted
+{% endif %}
+{% if 'solo_peer' in nbr_or_peer and nbr_or_peer['solo_peer'] == 'true' %}
+ neighbor {{name_or_ip}} solo
+{% endif %}
+{% if 'peer_port' in nbr_or_peer %}
+ neighbor {{name_or_ip}} port {{nbr_or_peer['peer_port']}}
+{% endif %}
+{% if 'passive_mode' in nbr_or_peer and nbr_or_peer['passive_mode'] == 'true' %}
+ neighbor {{name_or_ip}} passive
+{% endif %}
+{% set mhop = '' %}
+{% if 'ebgp_multihop' in nbr_or_peer and nbr_or_peer['ebgp_multihop'] == 'true' %}
+{% set mhop = 255 %}
+{% endif %}
+{% if 'ebgp_multihop_ttl' in nbr_or_peer %}
+{% set mhop = nbr_or_peer['ebgp_multihop_ttl']  %}
+{% endif %}
+{% if mhop != '' %}
+ neighbor {{name_or_ip}} ebgp-multihop {{mhop}}
+{% endif %}
+{% if 'disable_ebgp_connected_route_check' in nbr_or_peer and nbr_or_peer['disable_ebgp_connected_route_check'] == 'true' %}
+ neighbor {{name_or_ip}} disable-connected-check
+{% endif %}
+{% if 'enforce_first_as' in nbr_or_peer and nbr_or_peer['enforce_first_as'] == 'true' %}
+ neighbor {{name_or_ip}} enforce-first-as
+{% endif %}
+{% if 'local_addr' in nbr_or_peer %}
+ neighbor {{name_or_ip}} update-source {{nbr_or_peer['local_addr']}}
+{% endif %}
+{% if 'strict_capability_match' in nbr_or_peer and nbr_or_peer['strict_capability_match'] == true %}
+ neighbor {{name_or_ip}} strict-capability-match {{nbr_or_peer['strict_capability_match']}}
+{% endif %}
+{% if 'min_adv_interval' in nbr_or_peer %}
+ neighbor {{name_or_ip}} advertisement-interval {{nbr_or_peer['min_adv_interval']}}
+{% endif %}
+{% if 'keepalive' in nbr_or_peer and 'holdtime' in nbr_or_peer %}
+ neighbor {{name_or_ip}} timers {{nbr_or_peer['keepalive']}} {{nbr_or_peer['holdtime']}}
+{% endif %}
+{% if 'conn_retry' in nbr_or_peer %}
+ neighbor {{name_or_ip}} timers connect {{nbr_or_peer['conn_retry']}}
+{% endif %}
+{% if 'capability_dynamic' in nbr_or_peer and nbr_or_peer['capability_dynamic'] == 'true' %}
+ neighbor {{name_or_ip}} capability dynamic
+{% endif %}
+{% if 'capability_ext_nexthop' in nbr_or_peer and nbr_or_peer['capability_ext_nexthop'] == 'true' %}
+ neighbor {{name_or_ip}} capability extended-nexthop
+{% endif %}
+{% if 'dont_negotiate_capability' in nbr_or_peer and nbr_or_peer['dont_negotiate_capability'] == 'true' %}
+ neighbor {{name_or_ip}} dont-capability-negotiate
+{% endif %}
+{% if 'enforce_multihop' in nbr_or_peer and nbr_or_peer['enforce_multihop'] == 'true' %}
+ neighbor {{name_or_ip}} enforce-multihop
+{% endif %}
+{% if 'override_capability' in nbr_or_peer and nbr_or_peer['override_capability'] == 'true' %}
+ neighbor {{name_or_ip}} override-capability
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.pref_list.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.pref_list.j2
new file mode 100644
index 000000000000..3409c51be06f
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.pref_list.j2
@@ -0,0 +1,30 @@
+{# ------------------------------------------------------------------------------------ #}
+{% if (PREFIX_SET is defined and PREFIX_SET|length > 0) and
+      (PREFIX is defined and PREFIX|length > 0) %}
+{% set modes = ['IPv4', 'IPv6'] %}
+{% set ip_str = {'IPv4':'ip', 'IPv6':'ipv6' } %}
+{% for md in modes %}
+!
+{% for key, val in PREFIX_SET.items() %}
+{% if 'mode' in val %}
+{% for pf_key, pf_val in PREFIX.items() %}
+{% if pf_key[0] == key and md == val['mode'] %}
+{% if pf_key[2] == 'exact' %}
+{{ip_str[md]}} prefix-list {{key}} permit {{pf_key[1]}}
+{% else %}
+{% set len = pf_key[1].split('/')[1] %}
+{% set rb = pf_key[2].split('..')[0] %}
+{% set re = pf_key[2].split('..')[1] %}
+{% if rb > len %}
+{{ip_str[md]}} prefix-list {{key}} permit {{pf_key[1]}} ge {{rb}} le {{re}}
+{% else %}
+{{ip_str[md]}} prefix-list {{key}} permit {{pf_key[1]}} le {{re}}
+{% endif %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+{% endif %}
+{# ------------------------------------------------------------------------------------ #}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
new file mode 100644
index 000000000000..29a4817dc281
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
@@ -0,0 +1,150 @@
+{% if ROUTE_MAP is defined and ROUTE_MAP|length > 0 %}
+{% for rm_key, rm_val in ROUTE_MAP.items() %}
+{% if 'route_operation' in rm_val %}
+!
+route-map {{rm_key[0]}} {{rm_val['route_operation']}} {{rm_key[1]}}
+{% if 'match_as_path' in rm_val %}
+ match as-path {{rm_val['match_as_path']}}
+{% endif %}
+{% if 'call_route_map' in rm_val %}
+ call {{rm_val['call_route_map']}}
+{% endif %}
+{% if 'match_community' in rm_val %}
+ match community {{rm_val['match_community']}}
+{% endif %}
+{% if 'match_ext_community' in rm_val %}
+ match extcommunity {{rm_val['match_ext_community']}}
+{% endif %}
+{% if 'match_interface' in rm_val %}
+ match interface {{rm_val['match_interface']}}
+{% endif %}
+{% if 'match_tag' in rm_val %}
+ match tag {{rm_val['match_tag'][0]}}
+{% endif %}
+{% if 'match_src_vrf' in rm_val %}
+ match source-vrf {{rm_val['match_src_vrf']}}
+{% endif %}
+{# ---------------match ip/ipv6-Start-------------------------- #}
+{% set ip_str = {'ipv4':'ip', 'ipv6':'ipv6' } %}
+{% if PREFIX_SET is defined and PREFIX_SET|length > 0 %}
+{% if 'match_prefix_set' in rm_val %}
+{% for pfx_key, pfx_val in PREFIX_SET.items() %}
+{% if rm_val['match_prefix_set'] == pfx_key %}
+ match {{ip_str[pfx_val['mode']]}} address prefix-list {{rm_val['match_prefix_set']}}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if 'match_next_hop_set' in rm_val %}
+{% for pfx_key, pfx_val in PREFIX_SET.items() %}
+{% if rm_val['match_next_hop_set'] == pfx_key %}
+ match {{ip_str[pfx_val['mode']]}} next-hop prefix-list {{rm_val['match_next_hop_set']}}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endif %}
+{# ---------------match ip/ipv6-  End-------------------------- #}
+{% if 'match_local_pref' in rm_val %}
+ match local-preference {{rm_val['match_local_pref']}}
+{% endif %}
+{% if 'match_med' in rm_val %}
+ match metric {{rm_val['match_med']}}
+{% endif %}
+{% if 'match_origin' in rm_val %}
+ match origin {{rm_val['match_origin']|lower}}
+{% endif %}
+{% if 'match_neighbor' in rm_val %}
+ match peer {{rm_val['match_neighbor'][0]}}
+{% endif %}
+{% if 'match_protocol' in rm_val %}
+ match source-protocol {{rm_val['match_protocol']}}
+{% endif %}
+{# ---------------set as-path prepend - Start ----------------- #}
+{% if 'set_asn' in rm_val and 'set_repeat_asn' in rm_val %}
+{% set ns = namespace(as_str='') %}
+{% if rm_val['set_repeat_asn'] > 0 %}
+{% for i in range(rm_val['set_repeat_asn']|int) %}
+{% set ns.as_str = ns.as_str+' '+rm_val['set_asn'] %}
+{% endfor %}
+{% else %}
+{% set ns.as_str = rm_val['set_asn'] %}
+{% endif %}
+ set as-path prepend{{ns.as_str}}
+{% endif %}
+{# ---------------set as-path prepend - End ------------------- #}
+{# ---------------set community - Start------------------------ #}
+{% if 'set_community_inline' in rm_val %}
+{% set ns = namespace(comms = '') %}
+{% for cm in rm_val['set_community_inline'] %}
+{% set ns.comms = ns.comms + ' ' + cm %}
+{% endfor %}
+ set community{{ns.comms}}
+{% endif %}
+{# ---------------set community - End-------------------------- #}
+{% if 'set_community_ref' in rm_val %}
+ set community {{rm_val['set_community_ref']}}
+{% endif %}
+{# ---------------set extcommunity - Start--------------------- #}
+{% if 'set_ext_community_inline' in rm_val %}
+{% set ec_ns = namespace(rt_str='', soo_str='') %}
+{% for ext_comm in rm_val['set_ext_community_inline'] %}
+{% set comm  = ext_comm.split(':') %}
+{% if comm[0] == 'route-target' %}
+{% set ec_ns.rt_str = ec_ns.rt_str+' '+comm[1]+':'+comm[2] %}
+{% endif %}
+{% if comm[0] == 'route-origin' %}
+{% set ec_ns.soo_str = ec_ns.soo_str+' '+comm[1]+':'+comm[2] %}
+{% endif %}
+{% endfor %}
+{% if ec_ns.rt_str != '' %}
+ set extcommunity rt{{ec_ns.rt_str}}
+{% endif %}
+{% if ec_ns.soo_str != '' %}
+ set extcommunity soo{{ec_ns.rt_str}}
+{% endif %}
+{% endif %}
+{# ---------------set extcommunity - End----------------------- #}
+{% if 'set_ext_community_ref' in rm_val %}
+ set extcommunity {{rm_val['set_ext_community_ref']}}
+{% endif %}
+{% if 'set_next_hop' in rm_val %}
+ set ip next-hop {{rm_val['set_next_hop']}}
+{% endif %}
+{% if 'set_ipv6_next_hop_global' in rm_val %}
+ set ipv6 next-hop global {{rm_val['set_ipv6_next_hop_global']}}
+{% endif %}
+{% if 'set_ipv6_next_hop_prefer_global' in rm_val and rm_val['set_ipv6_next_hop_prefer_global'] == 'true' %}
+ set ipv6 next-hop prefer-global
+{% endif %}
+{% if 'set_local_preference' in rm_val %}
+ set local-preference {{rm_val['set_local_preference']}}
+{% endif %}
+{# ---------------set metric and med - Start--------------------- #}
+{% if 'set_metric_action' in rm_val %}
+{% if 'set_metric' in rm_val %}
+{% if rm_val['set_metric_action'] == 'METRIC_SET_VALUE' %}
+ set metric {{rm_val['set_metric']}}
+{% elif rm_val['set_metric_action'] == 'METRIC_ADD_VALUE' %}
+ set metric +{{rm_val['set_metric']}}
+{% elif rm_val['set_metric_action'] == 'METRIC_SUBTRACT_VALUE' %}
+ set metric -{{rm_val['set_metric']}}
+{% endif %}
+{% endif %}
+{% if rm_val['set_metric_action'] == 'METRIC_SET_RTT' %}
+ set metric rtt
+{% elif rm_val['set_metric_action'] == 'METRIC_ADD_RTT' %}
+ set metric +rtt
+{% elif rm_val['set_metric_action'] == 'METRIC_SUBTRACT_RTT' %}
+ set metric -rtt
+{% endif %}
+{% elif 'set_med' in rm_val %}
+ set metric {{rm_val['set_med']}}
+{% elif 'set_metric' in rm_val %}
+ set metric {{rm_val['set_metric']}}
+{% endif %}
+{# ---------------set metric and med - End--------------------- #}
+{% if 'set_origin' in rm_val %}
+ set origin {{rm_val['set_origin']|lower}}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2
new file mode 100644
index 000000000000..e37ad2a32056
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2
@@ -0,0 +1,15 @@
+{% block banner %}
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+{% endblock banner %}
+!
+{% include "common/daemons.common.conf.j2" %}
+!
+agentx
+!
+{% include "bgpd.conf.db.j2" %}
+!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2 b/src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2
new file mode 100644
index 000000000000..f1f015a6e7a6
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2
@@ -0,0 +1,30 @@
+!
+{% block banner %}
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/frr.conf.j2 with config DB data
+! file: frr.conf
+!
+{% endblock banner %}
+!
+{% include "common/daemons.common.conf.j2" %}
+!
+agentx
+!
+{% include "zebra/zebra.interfaces.conf.j2" %}
+!
+{% if MGMT_VRF_CONFIG %}
+{% if MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == 'false' %}
+{% include "staticd.db.default_route.conf.j2" %}
+{% endif %}
+{% else %}
+{% include "staticd.db.default_route.conf.j2" %}
+{% endif %}
+!
+{% include "staticd.db.conf.j2" %}
+!
+{% include "bgpd.conf.db.j2" %}
+!
+{% include "ospfd.conf.j2" %}
+!
+{% include "bfdd.conf.j2" %}
+!
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.area.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.area.j2
new file mode 100644
index 000000000000..4dfaad02798a
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.area.j2
@@ -0,0 +1,37 @@
+{% set areaid = areakey[1] %}
+{% if 'authentication' in area_instance %}
+{% if area_instance['authentication'] == "MD5HMAC" %}
+  area {{ areaid }} authentication message-digest
+{% else %}
+  area {{ areaid }} authentication
+{% endif %}
+{% endif %}
+{% if 'stub-no-summary' in area_instance %}
+{% if area_instance['stub-no-summary'] == 'true' %}
+  area {{ areaid }} stub no-summary
+{% endif %}
+{% else %}
+{% if 'stub' in area_instance %}
+{% if area_instance['stub'] == 'true' %}
+  area {{ areaid }} stub
+{% endif %}
+{% endif %}
+{% endif %}
+{% if 'stub-default-cost' in area_instance %}
+  area {{ areaid }} default-cost {{ area_instance['stub-default-cost'] }}
+{% endif %}
+{% if 'import-list' in area_instance %}
+  area {{ areaid }} import-list {{ area_instance['import-list'] }}
+{% endif %}
+{% if 'export-list' in area_instance %}
+  area {{ areaid }} export-list {{ area_instance['export-list'] }}
+{% endif %}
+{% if 'filter-list-in' in area_instance %}
+  area {{ areaid }} filter-list prefix {{ area_instance['filter-list-in'] }} in
+{% endif %}
+{% if 'filter-list-out' in area_instance %}
+  area {{ areaid }} filter-list prefix {{ area_instance['filter-list-out'] }} out
+{% endif %}
+{% if 'shortcut' in area_instance %}
+  area {{ areaid }} shortcut {{ (area_instance['shortcut']).lower() }}
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.comm_list.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.comm_list.j2
new file mode 100644
index 000000000000..f6fcfe897fe8
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.comm_list.j2
@@ -0,0 +1,129 @@
+{# ------------------------------------------------------------------------------------ #}
+{# ------------------------------------------------------------------------------------ #}
+{% if OSPFV2_ROUTER is defined and OSPFV2_ROUTER|length > 0 %}
+{% for vrf, ospf_instance in OSPFV2_ROUTER.items() %}
+!
+router ospf vrf {{ vrf }}
+{% if 'router-id' in ospf_instance %}
+  ospf router-id {{ ospf_instance['router-id'] }}
+{% endif %}
+{% if 'abr-type' in ospf_instance %}
+  ospf abr-type {{ (ospf_instance['abr-type']).lower() }}
+{% endif %}
+{% if 'auto-cost-reference-bandwidth' in ospf_instance %}
+  auto-cost reference-bandwidth {{ (ospf_instance['auto-cost-reference-bandwidth']) }}
+{% endif %}
+{% if 'log-adjacency-changes' in ospf_instance %}
+{% if ospf_instance['log-adjacency-changes'] == 'DETAIL' %}
+  log-adjacency-changes detail
+{% else %}
+  log-adjacency-changes
+{% endif %}
+{% endif %}
+{% if 'default-metric' in ospf_instance %}
+  default-metric {{ ospf_instance['default-metric'] }}
+{% endif %}
+{% if 'ospf-rfc1583-compatible' in ospf_instance %}
+{% if ospf_instance['ospf-rfc1583-compatible'] == 'true' %}
+  compatible rfc1583
+{% endif %}
+{% endif %}
+{% if 'passive-interface-default' in ospf_instance %}
+  passive-interface default 
+{% endif %}
+{% if 'write-multiplier' in ospf_instance %}
+  write-multiplier {{ ospf_instance['write-multiplier'] }} 
+{% endif %}
+{% if 'spf-throttle-delay' in ospf_instance and 'spf-initial-delay' in ospf_instance and 'spf-maximum-delay' in ospf_instance %}
+  timers throttle spf {{ ospf_instance['spf-throttle-delay'] }} {{ ospf_instance['spf-initial-delay'] }} {{ ospf_instance['spf-maximum-delay'] }} 
+{% endif %}
+{% if 'lsa-min-interval-timer' in ospf_instance %}
+  timers throttle lsa all {{ ospf_instance['lsa-min-interval-timer'] }}
+{% endif %}
+{% if 'lsa-min-arrival-timer' in ospf_instance %}
+  timers lsa min-arrival {{ ospf_instance['lsa-min-arrival-timer'] }}
+{% endif %}
+{% if 'lsa-refresh-timer' in ospf_instance %}
+  refresh timer {{ ospf_instance['lsa-refresh-timer'] }}
+{% endif %}
+{% if 'max-metric-administrative' in ospf_instance %}
+{% if ospf_instance['max-metric-administrative'] == 'true' %}
+  max-metric router-lsa administrative
+{% endif %}
+{% endif %}
+{% if 'max-metric-on-startup' in ospf_instance %}
+  max-metric router-lsa on-startup {{ ospf_instance['max-metric-on-startup'] }}
+{% endif %}
+{% if 'max-metric-on-shutdown' in ospf_instance %}
+  max-metric router-lsa on-shutdown {{ ospf_instance['max-metric-on-shutdown'] }}
+{% endif %}
+{% if 'distance-all' in ospf_instance %}
+  distance {{ ospf_instance['distance-all'] }}
+{% endif %}
+{% if 'distance-inter-area' in ospf_instance or 'distance-intra-area' in ospf_instance or 'distance-external' in ospf_instance%}
+{% set distance_cmd = '' %}
+{% set distance_cmd = 'distance ospf' %}
+{% if 'distance-intra-area' in ospf_instance %}
+{% set distance_cmd = distance_cmd + ' intra-area ' + ospf_instance['distance-intra-area'] %}
+{% endif %}
+{% if 'distance-inter-area' in ospf_instance %}
+{% set distance_cmd = distance_cmd + ' inter-area ' + ospf_instance['distance-inter-area'] %}
+{% endif %}
+{% if 'distance-external' in ospf_instance %}
+{% set distance_cmd = distance_cmd + ' external ' + ospf_instance['distance-external'] %}
+{% endif %}
+  {{ distance_cmd }}
+{% endif %}
+{# -------OSPFV2_ROUTER end --------------------------- #}
+{# -------OSPFV2_ROUTER_AREA Begin --------------------------- #}
+{% if OSPFV2_ROUTER_AREA is defined and OSPFV2_ROUTER_AREA|length > 0 %}
+{% for areakey, area_instance in OSPFV2_ROUTER_AREA.items() %}
+{% include "ospfd.conf.db.area.j2" %}
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_AREA end --------------------------- #}
+{# -------OSPFV2_ROUTER_AREA_NETWORK Begin --------------------------- #}
+{% if OSPFV2_ROUTER_AREA_NETWORK is defined and OSPFV2_ROUTER_AREA_NETWORK|length > 0 %}
+{% for networkkey, ospf_network_instance in OSPFV2_ROUTER_AREA_NETWORK.items() %}
+{% set networkareaid = networkkey[1] %}
+{% set networkid = networkkey[2] %}
+  network {{ networkid }} area {{ networkareaid }} 
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_AREA_NETWORK end --------------------------- #}
+{# -------OSPFV2_ROUTER_AREA_VIRTUAL_LINK Begin --------------------------- #}
+{% if OSPFV2_ROUTER_AREA_VIRTUAL_LINK is defined and OSPFV2_ROUTER_AREA_VIRTUAL_LINK|length > 0 %}
+{% for vlinkkey, vlink_instance in OSPFV2_ROUTER_AREA_VIRTUAL_LINK.items() %}
+{% include "ospfd.conf.db.vlink.j2" %}
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_AREA_VIRTUAL_LINK end --------------------------- #}
+{# -------OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE Begin --------------------------- #}
+{% if OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE is defined and OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE|length > 0 %}
+{% for rangekey, area_range_instance in OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE.items() %}
+{% include "ospfd.conf.db.policyrange.j2" %}
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_AREA_POLICY_ADDRESS_RANGE end --------------------------- #}
+{# -------OSPFV2_ROUTER_DISTRIBUTE_ROUTE Begin --------------------------- #}
+{% if OSPFV2_ROUTER_DISTRIBUTE_ROUTE is defined and OSPFV2_ROUTER_DISTRIBUTE_ROUTE|length > 0 %}
+{% for routekey, route_instance in OSPFV2_ROUTER_DISTRIBUTE_ROUTE.items() %}
+{% include "ospfd.conf.db.distributeroute.j2" %}
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_DISTRIBUTE_ROUTE end --------------------------- #}
+{# -------OSPFV2_ROUTER_PASSIVE_INTERFACE Begin --------------------------- #}
+{% if OSPFV2_ROUTER_PASSIVE_INTERFACE is defined and OSPFV2_ROUTER_PASSIVE_INTERFACE|length > 0 %}
+{% for passintfkey, passintf_instance in OSPFV2_ROUTER_PASSIVE_INTERFACE.items() %}
+{% set passintfname = passintfkey[1] %}
+{% set passintfaddr = passintfkey[2] %}
+{% if passintfaddr == '0.0.0.0' %}
+  passive-interface {{ passintfname }}
+{% else %}
+  passive-interface {{ passintfname }} {{ passintfaddr }}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# -------OSPFV2_ROUTER_PASSIVE_INTERFACE end --------------------------- #}
+{% endfor %}
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.distributeroute.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.distributeroute.j2
new file mode 100644
index 000000000000..d13ac7ada5b6
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.distributeroute.j2
@@ -0,0 +1,52 @@
+{% set routeproto = routekey[1] %}
+{% set routedirection = routekey[2] %}
+{% set generic_protocols = [ "BGP", "KERNEL", "STATIC", "DIRECTLY_CONNECTED"]  %}
+{% if routeproto == "DEFAULT_ROUTE" and routedirection == "IMPORT"  %}
+{% set defaultinfo_cmd = '' %}
+{% set defaultinfo_cmd = 'default-information originate' %}
+{% if 'always' in route_instance %}
+{% if route_instance['always'] == 'true' %}
+{% set defaultinfo_cmd = defaultinfo_cmd + ' always' %}
+{% endif %}
+{% endif %}
+{% if 'metric' in route_instance %}
+{% set defaultinfo_cmd = defaultinfo_cmd + ' metric ' + route_instance['metric'] %}
+{% endif %}
+{% if 'metric-type' in route_instance %}
+{% if route_instance['metric-type'] == "TYPE_1"%}
+{% set defaultinfo_cmd = defaultinfo_cmd + ' metric-type ' + '1' %}
+{% endif %}
+{% endif %}
+{% if 'route-map' in route_instance %}
+{% set defaultinfo_cmd = defaultinfo_cmd + ' route-map ' + route_instance['route-map'] %}
+{% endif %}
+ {{ defaultinfo_cmd }}
+{% elif routedirection == "IMPORT" and routeproto in generic_protocols %}
+{% set redistribute_cmd = '' %}
+{% if routeproto == "DIRECTLY_CONNECTED" %}
+{% set redistribute_cmd = 'redistribute ' + 'connected' %}
+{% else %}
+{% set redistribute_cmd = 'redistribute ' + routeproto.lower() %}
+{% endif %}
+{% if 'metric' in route_instance %}
+{% set redistribute_cmd = redistribute_cmd + ' metric ' + route_instance['metric'] %}
+{% endif %}
+{% if 'metric-type' in route_instance %}
+{% if route_instance['metric-type'] == "TYPE_1"%}
+{% set redistribute_cmd = redistribute_cmd + ' metric-type ' + '1' %}
+{% endif %}
+{% endif %}
+{% if 'route-map' in route_instance %}
+{% set redistribute_cmd = redistribute_cmd + ' route-map ' + route_instance['route-map'] %}
+{% endif %}
+ {{ redistribute_cmd }}
+{% elif routedirection == "EXPORT" and routeproto in generic_protocols %}
+{% if 'route-map' in route_instance %}
+{% if routeproto == "DIRECTLY_CONNECTED" %}
+ distribute-list {{ route_instance['route-map'] }} out connected
+{% else %}
+ distribute-list {{ route_instance['route-map'] }} out {{ routeproto.lower() }}
+{% endif %}
+{% endif %}
+{% endif %}
+
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.interface.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.interface.j2
new file mode 100644
index 000000000000..7969c81f2dad
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.interface.j2
@@ -0,0 +1,76 @@
+{# ------------------------------------------------------------------------------------ #}
+{# ------------------------------------------------------------------------------------ #}
+{% if OSPFV2_INTERFACE is defined and OSPFV2_INTERFACE|length > 0 %}
+{% for (intfkey, ospf_intf_instance) in OSPFV2_INTERFACE.items() %}
+!
+{% set intfname = intfkey[0] %}
+{% set intfaddr = intfkey[1] %}
+{% if intfaddr == "0.0.0.0" %}
+{% set intfaddr = "" %}
+{% endif %}
+interface {{ intfname }}
+{% if 'area-id' in ospf_intf_instance %}
+  ip ospf area {{ ospf_intf_instance['area-id'] }} {{ intfaddr }}
+{% endif %}
+{% if 'network-type' in ospf_intf_instance %}
+{% if ospf_intf_instance['network-type'] == 'BROADCAST_NETWORK' %}
+  ip ospf network broadcast {{ intfaddr }}
+{% endif %}
+{% if ospf_intf_instance['network-type'] == 'POINT_TO_POINT_NETWORK' %}
+  ip ospf network point-to-point {{ intfaddr }}
+{% endif %}
+{% endif %}
+{% if 'metric' in ospf_intf_instance %}
+  ip ospf cost {{ ospf_intf_instance['metric'] }} {{ intfaddr }}
+{% endif %}
+{% if 'priority' in ospf_intf_instance %}
+  ip ospf priority {{ ospf_intf_instance['priority'] }} {{ intfaddr }}
+{% endif %}
+{% if 'mtu-ignore' in ospf_intf_instance %}
+{% if ospf_intf_instance['mtu-ignore'] == 'true' %}
+  ip ospf mtu-ignore {{ intfaddr }}
+{% endif %}
+{% endif %}
+{% if 'bfd-enable' in ospf_intf_instance %}
+{% if ospf_intf_instance['bfd-enable'] == 'true' %}
+  ip ospf bfd
+{% endif %}
+{% endif %}
+{% if 'authentication-type' in ospf_intf_instance %}
+{% if ospf_intf_instance['authentication-type'] == 'MD5HMAC' %}
+  ip ospf authentication message-digest {{ intfaddr }}
+{% endif %}
+{% if ospf_intf_instance['authentication-type'] == 'NONE' %}
+  ip ospf authentication null {{ intfaddr }}
+{% endif %}
+{% if ospf_intf_instance['authentication-type'] == 'TEXT' %}
+  ip ospf authentication {{ intfaddr }}
+{% endif %}
+{% endif %}
+{% if 'authentication-key' in ospf_intf_instance %}
+  ip ospf authentication-key {{ ospf_intf_instance['authentication-key'] }} {{ intfaddr }}
+{% endif %}
+{% if 'authentication-key-id' in ospf_intf_instance and 'authentication-md5-key' in ospf_intf_instance %}
+  ip ospf message-digest-key {{ ospf_intf_instance['authentication-key-id'] }} md5 {{ ospf_intf_instance['authentication-md5-key'] }} {{ intfaddr }}
+{% endif %}
+{% if 'dead-interval' in ospf_intf_instance %}
+  ip ospf dead-interval {{ ospf_intf_instance['dead-interval'] }} {{ intfaddr }}
+{% endif %}
+{% if 'dead-interval-minimal' in ospf_intf_instance %}
+{% if 'hello-multiplier' in ospf_intf_instance %}
+  ip ospf dead-interval minimal hello-multiplier {{ ospf_intf_instance['hello-multiplier'] }} {{ intfaddr }}
+{% else %}
+  ip ospf dead-interval minimal {{ intfaddr }}
+{% endif %}
+{% endif %}
+{% if 'hello-interval' in ospf_intf_instance %}
+  ip ospf hello-interval {{ ospf_intf_instance['hello-interval'] }} {{ intfaddr }}
+{% endif %}
+{% if 'retransmission-interval' in ospf_intf_instance %}
+  ip ospf retransmit-interval {{ ospf_intf_instance['retransmission-interval'] }} {{ intfaddr }}
+{% endif %}
+{% if 'transmit-delay' in ospf_intf_instance %}
+  ip ospf transmit-delay {{ ospf_intf_instance['transmit-delay'] }} {{ intfaddr }}
+{% endif %}
+{% endfor %}
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.policyrange.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.policyrange.j2
new file mode 100644
index 000000000000..8d82b41c0827
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.policyrange.j2
@@ -0,0 +1,16 @@
+{% set rangeareaid = rangekey[1] %}
+{% set rangeid = rangekey[2] %}
+  area {{ rangeareaid }} range {{ rangeid }}
+{% if 'advertise' in area_range_instance %}
+{% if area_range_instance['advertise'] == 'true' %}
+  area {{ rangeareaid }} range {{ rangeid }} advertise
+{% else %}
+  area {{ rangeareaid }} range {{ rangeid }} not-advertise
+{% endif %}
+{% endif %}
+{% if 'metric' in area_range_instance %}
+  area {{ rangeareaid }} range {{ rangeid }} advertise cost {{ area_range_instance['metric'] }}
+{% endif %}
+{% if 'substitue-prefix' in area_range_instance %}
+  area {{ rangeareaid }} range {{ rangeid }} substitute {{ area_range_instance['substitue-prefix'] }}
+{% endif %}
\ No newline at end of file
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.vlink.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.vlink.j2
new file mode 100644
index 000000000000..653db9f5458b
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.db.vlink.j2
@@ -0,0 +1,29 @@
+{% set vlinkareaid = vlinkkey[1] %}
+{% set vlinkid = vlinkkey[2] %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }}
+{% if 'authentication' in vlink_instance %}
+{% if vlink_instance['authentication'] == 'MD5HMAC' %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} authentication message-digest
+{% else %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} null
+{% endif %}
+{% endif %}
+{% if 'authentication-key' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} authentication-key {{ vlink_instance['authentication-key'] }}
+{% endif %}
+{% if 'authentication-key-id' in vlink_instance and 'authentication-md5-key' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} authentication message-digest message-digest-key {{ vlink_instance['authentication-key-id'] }} md5 {{ vlink_instance['authentication-md5-key'] }}
+{% endif %}
+{% if 'dead-interval' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} dead-interval {{ vlink_instance['dead-interval'] }}
+{% endif %}
+{% if 'hello-interval' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} hello-interval {{ vlink_instance['hello-interval'] }}
+{% endif %}
+{% if 'retransmission-interval' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} retransmit-interval {{ vlink_instance['retransmission-interval'] }}
+{% endif %}
+{% if 'transmit-delay' in vlink_instance %}
+  area {{ vlinkareaid }} virtual-link {{ vlinkid }} transmit-delay {{ vlink_instance['transmit-delay'] }}
+{% endif %}
+
diff --git a/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.j2 b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.j2
new file mode 100644
index 000000000000..d9ace5972dab
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/ospfd/ospfd.conf.j2
@@ -0,0 +1,6 @@
+! template: ospfd/ospfd.conf.j2
+!
+! OSPF configuration using config DB OSPF instance tables
+!
+{% include "ospfd.conf.db.comm_list.j2" %}
+{% include "ospfd.conf.db.interface.j2" %}
diff --git a/src/sonic-frr-mgmt-framework/templates/staticd/staticd.conf.j2 b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.conf.j2
new file mode 100644
index 000000000000..0ab193f4a1f8
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.conf.j2
@@ -0,0 +1,22 @@
+
+{% block banner %}
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/frr/staticd.conf.j2 using config DB data
+! file: staticd.conf
+!
+{% endblock banner %}
+!
+{% with agentx='false' %}
+{% include "common/daemons.common.conf.j2" %}
+{% endwith %}
+!
+{% if MGMT_VRF_CONFIG %}
+{% if MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == 'false' %}
+{% include "staticd.db.default_route.conf.j2" %}
+{% endif %}
+{% else %}
+{% include "staticd.db.default_route.conf.j2" %}
+{% endif %}
+!
+{% include "staticd.db.conf.j2" %}
+!
diff --git a/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.conf.j2 b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.conf.j2
new file mode 100644
index 000000000000..238f0f1acb61
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.conf.j2
@@ -0,0 +1,153 @@
+! template: staticd/staticd.db.conf.j2
+!
+! Static Route configuration using config DB static route table
+!
+{% macro iproute(ip_prefix, nh_blackhole, nh_ip, nh_intf, nh_dist, nh_tag, nh_vrf) %}
+    {%- set ns = namespace(str = None) %}
+    {%- set ip_addr = ip_prefix.split('/')[0] %}
+    {%- if ip_addr|ipv4 %}
+        {%- set ns.str = 'ip route' %}
+    {%- else %}
+        {%- set ns.str = 'ipv6 route' %}
+    {%- endif %}
+    {%- if nh_blackhole %}
+        {#- ------------------------------ blackhole route ------------------------------ #}
+        {%- for item in [ip_prefix, 'blackhole', nh_tag, nh_dist] %}
+            {%- if item != None %}
+                {%- set ns.str = ns.str + ' ' + item %}
+            {%- endif %}
+        {%- endfor %}
+    {%- else %}
+        {#- ------------------------------ non-blackhole route ------------------------------ #}
+        {%- for item in [ip_prefix, nh_ip, nh_intf, nh_tag, nh_dist, nh_vrf] %}
+            {%- if item != None %}
+                {%- set ns.str = ns.str + ' ' + item %}
+            {%- endif %}
+        {%- endfor %}
+    {%- endif %}
+{{ ns.str }}
+{%- endmacro %}
+{% if STATIC_ROUTE is defined and STATIC_ROUTE|length > 0 %}
+    {%- set vrf_rt_list = {} %}
+    {%- for key, val in STATIC_ROUTE.items() %}
+        {#- ------------------------------ for each route - start ------------------------------ #}
+        {%- set rt = namespace(vrf = 'default', ip_prefix = '', nh_num = 0, nh_list = [], valid = True) %}
+        {%- if key is not string and key|length > 1 %}
+            {%- set rt.vrf = key[0] %}
+            {%- set rt.ip_prefix = key[1] %}
+        {%- else %}
+            {%- set rt.ip_prefix = key %}
+        {%- endif %}
+        {%- set nh_attr = {} %}
+        {#- ------------------------------ get nh count - start ------------------------------ #}
+        {%- for fld_key, fld_val in val.items() if rt.valid %}
+            {%- set attr_list = fld_val.split(',') %}
+            {%- if rt.nh_num == 0 %}
+                {%- set rt.nh_num = attr_list|length %}
+            {%- else %}
+                {%- if rt.nh_num != attr_list|length %}
+                    {%- set rt.valid = False %}
+                {%- endif %}
+            {%- endif %}
+            {%- if nh_attr.update({fld_key: attr_list}) %}
+            {%- endif %}
+        {%- endfor %}
+        {#- ------------------------------ get nh count - end ------------------------------ #}
+        {%- if rt.valid %}
+            {%- for nh_idx in range(rt.nh_num) %}
+                {#- ------------------------------ parse nh - start ------------------------------ #}
+                {%- set nh = namespace(blackhole = False, ip = None, intf = None, dist = None, tag = None, vrf = None) %}
+                {#- ------------------------------ nexthop blackhole ------------------------------ #}
+                {%- if 'blackhole' in nh_attr %}
+                    {%- set nh.blackhole = nh_attr['blackhole'][nh_idx] %}
+                    {%- if nh.blackhole == 'true' %}
+                        {%- set nh.blackhole = True %}
+                    {%- else %}
+                        {%- set nh.blackhole = False %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ nexthop IP ------------------------------ #}
+                {%- if 'nexthop' in nh_attr %}
+                    {%- set nh.ip = nh_attr['nexthop'][nh_idx] %}
+                    {%- if nh.ip == '0.0.0.0' or nh.ip == '::' %}
+                        {%- set nh.ip = None %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ nexthop interface ------------------------------ #}
+                {%- if 'ifname' in nh_attr %}
+                    {%- set nh.intf = nh_attr['ifname'][nh_idx] %}
+                    {%- if nh.intf == '' %}
+                        {%- set nh.intf = None %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ nexthop distance ------------------------------ #}
+                {%- if 'distance' in nh_attr %}
+                    {%- set nh.dist = nh_attr['distance'][nh_idx] %}
+                    {%- if nh.dist == '0' %}
+                        {%- set nh.dist = None %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ nexthop tag ------------------------------ #}
+                {%- if 'tag' in nh_attr %}
+                    {%- set nh.tag = nh_attr['tag'][nh_idx] %}
+                    {%- if nh.tag == '0' %}
+                        {%- set nh.tag = None %}
+                    {%- endif %}
+                    {%- if nh.tag != None %}
+                        {%- set nh.tag = 'tag ' + nh.tag %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ nexthop VRF ------------------------------ #}
+                {%- if 'nexthop-vrf' in nh_attr %}
+                    {%- set nh.vrf = nh_attr['nexthop-vrf'][nh_idx] %}
+                    {%- if nh.vrf == '' %}
+                        {%- set nh.vrf = None %}
+                    {%- endif %}
+                    {%- if nh.vrf != None %}
+                        {%- set nh.vrf = 'nexthop-vrf ' + nh.vrf %}
+                    {%- endif %}
+                {%- endif %}
+                {#- ------------------------------ parse nh - end ------------------------------ #}
+                {%- if nh.blackhole or nh.ip != None or nh.intf != None %}
+                    {%- if rt.nh_list.append(nh) %}
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+            {#- ------------------------------ for each route - end ------------------------------ #}
+            {%- if not rt.vrf in vrf_rt_list %}
+                {%- if vrf_rt_list.update({rt.vrf: []}) %}
+                {%- endif %}
+            {%- endif %}
+            {%- if vrf_rt_list[rt.vrf].append(rt) %}
+            {%- endif %}
+        {%- endif %}
+    {%- endfor %}
+
+{# ------------------------------ dump route - start ------------------------------ #}
+{# ------------------------------ default VRF ------------------------------ #}
+{% for vrf, rt_list in vrf_rt_list.items() if vrf == 'default' %}
+{% for rt in rt_list %}
+{% if rt.valid %}
+{% for nh in rt.nh_list %}
+{{ iproute(rt.ip_prefix, nh.blackhole, nh.ip, nh.intf, nh.dist, nh.tag, nh.vrf) }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+{# ------------------------------ non-default VRF ------------------------------ #}
+{% for vrf, rt_list in vrf_rt_list.items() if vrf != 'default' %}
+!
+vrf {{ vrf }}
+{% for rt in rt_list %}
+{% if rt.valid %}
+{% for nh in rt.nh_list %}
+  {{ iproute(rt.ip_prefix, nh.blackhole, nh.ip, nh.intf, nh.dist, nh.tag, nh.vrf) }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+  exit-vrf
+!
+{% endfor %}
+{# ------------------------------ dump route - end ------------------------------ #}
+
+{% endif %}
diff --git a/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.default_route.conf.j2 b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.default_route.conf.j2
new file mode 100644
index 000000000000..63d532203aaa
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/templates/staticd/staticd.db.default_route.conf.j2
@@ -0,0 +1,9 @@
+!
+{% block default_route %}
+! set static default route to mgmt gateway as a backup to learned default
+{% if MGMT_INTERFACE %}
+{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
+{% endfor %}
+{% endif %}
+{% endblock default_route %}
+!
diff --git a/src/sonic-frr-mgmt-framework/tests/__init__.py b/src/sonic-frr-mgmt-framework/tests/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-frr-mgmt-framework/tests/test_config.py b/src/sonic-frr-mgmt-framework/tests/test_config.py
new file mode 100644
index 000000000000..ed31c1e28ec8
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/tests/test_config.py
@@ -0,0 +1,176 @@
+import copy
+import re
+from unittest.mock import MagicMock, NonCallableMagicMock, patch
+
+swsssdk_module_mock = MagicMock(ConfigDBConnector = NonCallableMagicMock)
+
+@patch.dict('sys.modules', swsssdk = swsssdk_module_mock)
+def test_contructor():
+    from frrcfgd.frrcfgd import BGPConfigDaemon
+    daemon = BGPConfigDaemon()
+    daemon.start()
+    for table, hdlr in daemon.table_handler_list:
+        daemon.config_db.subscribe.assert_any_call(table, hdlr)
+    daemon.config_db.pubsub.psubscribe.assert_called_once()
+    daemon.stop()
+    daemon.config_db.sub_thread.stop.assert_called()
+    daemon.config_db.sub_thread.is_alive.assert_called_once()
+    daemon.config_db.sub_thread.join.assert_called_once()
+
+class CmdMapTestInfo:
+    data_buf = {}
+    def __init__(self, table, key, data, exp_cmd, no_del = False, neg_cmd = None,
+                 chk_data = None, daemons = None, ignore_tail = False):
+        self.table_name = table
+        self.key = key
+        self.data = data
+        self.vtysh_cmd = exp_cmd
+        self.no_del = no_del
+        self.vtysh_neg_cmd = neg_cmd
+        self.chk_data = chk_data
+        self.daemons = daemons
+        self.ignore_tail = ignore_tail
+    @classmethod
+    def add_test_data(cls, test):
+        assert(isinstance(test.data, dict))
+        cls.data_buf.setdefault(
+                test.table_name, {}).setdefault(test.key, {}).update(test.data)
+    @classmethod
+    def del_test_data(cls, test):
+        assert(test.table_name in cls.data_buf and
+               test.key in cls.data_buf[test.table_name])
+        cache_data = cls.data_buf[test.table_name][test.key]
+        assert(isinstance(test.data, dict))
+        for k, v in test.data.items():
+            assert(k in cache_data and cache_data[k] == v)
+            del(cache_data[k])
+    @classmethod
+    def get_test_data(cls, test):
+        assert(test.table_name in cls.data_buf and
+               test.key in cls.data_buf[test.table_name])
+        return copy.deepcopy(cls.data_buf[test.table_name][test.key])
+    @staticmethod
+    def compose_vtysh_cmd(cmd_list, negtive = False):
+        cmdline = 'vtysh'
+        for cmd in cmd_list:
+            cmd = cmd.format('no ' if negtive else '')
+            cmdline += " -c '%s'" % cmd
+        return cmdline
+    def check_running_cmd(self, mock, is_del):
+        if is_del:
+            vtysh_cmd = self.vtysh_cmd if self.vtysh_neg_cmd is None else self.vtysh_neg_cmd
+        else:
+            vtysh_cmd = self.vtysh_cmd
+        if callable(vtysh_cmd):
+            cmds = []
+            for call in mock.call_args_list:
+                assert(call[0][0] == self.table_name)
+                cmds.append(call[0][1])
+            vtysh_cmd(is_del, cmds, self.chk_data)
+        else:
+            if self.ignore_tail is None:
+                mock.assert_called_with(self.table_name, self.compose_vtysh_cmd(vtysh_cmd, is_del),
+                                        True, self.daemons)
+            else:
+                mock.assert_called_with(self.table_name, self.compose_vtysh_cmd(vtysh_cmd, is_del),
+                                        True, self.daemons, self.ignore_tail)
+
+def hdl_confed_peers_cmd(is_del, cmd_list, chk_data):
+    assert(len(chk_data) >= len(cmd_list))
+    if is_del:
+        chk_data = list(reversed(chk_data))
+    for idx, cmd in enumerate(cmd_list):
+        last_cmd = re.findall(r"-c\s+'([^']+)'\s*", cmd)[-1]
+        neg_cmd = False
+        if last_cmd.startswith('no '):
+            neg_cmd = True
+            last_cmd = last_cmd[len('no '):]
+        assert(last_cmd.startswith('bgp confederation peers '))
+        peer_set = set(last_cmd[len('bgp confederation peers '):].split())
+        if is_del or (len(chk_data) >= 3 and idx == 0):
+            assert(neg_cmd)
+        else:
+            assert(not neg_cmd)
+        assert(peer_set == chk_data[idx])
+
+conf_cmd = 'configure terminal'
+conf_bgp_cmd = lambda vrf, asn: [conf_cmd, 'router bgp %d vrf %s' % (asn, vrf)]
+conf_no_bgp_cmd = lambda vrf, asn: [conf_cmd, 'no router bgp %d%s' % (asn, '' if vrf == 'default' else ' vrf %s' % vrf)]
+conf_bgp_dft_cmd = lambda vrf, asn: conf_bgp_cmd(vrf, asn) + ['no bgp default ipv4-unicast']
+conf_bgp_af_cmd = lambda vrf, asn, af: conf_bgp_cmd(vrf, asn) + ['address-family %s unicast' % af]
+
+bgp_globals_data = [
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'local_asn': 100},
+                       conf_bgp_dft_cmd('default', 100), False, conf_no_bgp_cmd('default', 100), None, None, None),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'router_id': '1.1.1.1'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp router-id 1.1.1.1']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'load_balance_mp_relax': 'true'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp bestpath as-path multipath-relax ']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'as_path_mp_as_set': 'true'},
+                       conf_bgp_cmd('default', 100) + ['bgp bestpath as-path multipath-relax as-set'], False,
+                       conf_bgp_cmd('default', 100) + ['bgp bestpath as-path multipath-relax ']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'always_compare_med': 'false'},
+                       conf_bgp_cmd('default', 100) + ['no bgp always-compare-med']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'external_compare_router_id': 'true'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp bestpath compare-routerid']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'ignore_as_path_length': 'true'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp bestpath as-path ignore']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'graceful_restart_enable': 'true'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp graceful-restart']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'gr_restart_time': '10'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp graceful-restart restart-time 10']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'gr_stale_routes_time': '20'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp graceful-restart stalepath-time 20']),
+        CmdMapTestInfo('BGP_GLOBALS', 'default', {'gr_preserve_fw_state': 'true'},
+                       conf_bgp_cmd('default', 100) + ['{}bgp graceful-restart preserve-fw-state']),
+        CmdMapTestInfo('BGP_GLOBALS_AF', 'default|ipv4_unicast', {'ebgp_route_distance': '100',
+                                                                  'ibgp_route_distance': '115',
+                                                                  'local_route_distance': '238'},
+                       conf_bgp_af_cmd('default', 100, 'ipv4') + ['{}distance bgp 100 115 238']),
+        CmdMapTestInfo('BGP_GLOBALS_AF', 'default|ipv6_unicast', {'advertise-all-vni': 'true'},
+                       conf_bgp_af_cmd('default', 100, 'ipv6') + ['{}advertise-all-vni']),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'local_asn': 200},
+                       conf_bgp_dft_cmd('Vrf_red', 200), False, conf_no_bgp_cmd('Vrf_red', 200), None, None, None),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'med_confed': 'true'},
+                       conf_bgp_cmd('Vrf_red', 200) + ['{}bgp bestpath med confed']),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'confed_peers': ['2', '10', '5']},
+                       hdl_confed_peers_cmd, True, None, [{'2', '10', '5'}]),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'confed_peers': ['10', '8']},
+                       hdl_confed_peers_cmd, False, None, [{'2', '5'}, {'8'}, {'10', '8'}]),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'keepalive': '300', 'holdtime': '900'},
+                       conf_bgp_cmd('Vrf_red', 200) + ['{}timers bgp 300 900']),
+        CmdMapTestInfo('BGP_GLOBALS', 'Vrf_red', {'max_med_admin': 'true', 'max_med_admin_val': '20'},
+                       conf_bgp_cmd('Vrf_red', 200) + ['{}bgp max-med administrative 20']),
+        CmdMapTestInfo('BGP_GLOBALS_AF', 'Vrf_red|ipv4_unicast', {'import_vrf': 'Vrf_test'},
+                       conf_bgp_af_cmd('Vrf_red', 200, 'ipv4') + ['{}import vrf Vrf_test']),
+        CmdMapTestInfo('BGP_GLOBALS_AF', 'Vrf_red|ipv6_unicast', {'import_vrf_route_map': 'test_map'},
+                       conf_bgp_af_cmd('Vrf_red', 200, 'ipv6') + ['{}import vrf route-map test_map']),
+]
+
+@patch.dict('sys.modules', swsssdk = swsssdk_module_mock)
+@patch('frrcfgd.frrcfgd.g_run_command')
+def data_set_del_test(test_data, run_cmd):
+    from frrcfgd.frrcfgd import BGPConfigDaemon
+    daemon = BGPConfigDaemon()
+    data_buf = {}
+    # add data in list
+    for test in test_data:
+        run_cmd.reset_mock()
+        hdlr = [h for t, h in daemon.table_handler_list if t == test.table_name]
+        assert(len(hdlr) == 1)
+        CmdMapTestInfo.add_test_data(test)
+        hdlr[0](test.table_name, test.key, CmdMapTestInfo.get_test_data(test))
+        test.check_running_cmd(run_cmd, False)
+    # delete data in reverse direction
+    for test in reversed(test_data):
+        if test.no_del:
+            continue
+        run_cmd.reset_mock()
+        hdlr = [h for t, h in daemon.table_handler_list if t == test.table_name]
+        assert(len(hdlr) == 1)
+        CmdMapTestInfo.del_test_data(test)
+        hdlr[0](test.table_name, test.key, CmdMapTestInfo.get_test_data(test))
+        test.check_running_cmd(run_cmd, True)
+
+def test_bgp_globals():
+    data_set_del_test(bgp_globals_data)
diff --git a/src/sonic-frr-mgmt-framework/tests/test_constructor.py b/src/sonic-frr-mgmt-framework/tests/test_constructor.py
new file mode 100644
index 000000000000..14faa36d2e66
--- /dev/null
+++ b/src/sonic-frr-mgmt-framework/tests/test_constructor.py
@@ -0,0 +1,234 @@
+import socket
+import pytest
+from unittest.mock import MagicMock, NonCallableMagicMock, patch
+
+swsssdk_module_mock = MagicMock(ConfigDBConnector = NonCallableMagicMock)
+
+with patch.dict('sys.modules', swsssdk = swsssdk_module_mock):
+    from frrcfgd.frrcfgd import CachedDataWithOp
+    from frrcfgd.frrcfgd import BGPPeerGroup
+    from frrcfgd.frrcfgd import BGPKeyMapInfo
+    from frrcfgd.frrcfgd import BGPKeyMapList
+    from frrcfgd.frrcfgd import get_command_cmn
+    from frrcfgd.frrcfgd import CommunityList
+    from frrcfgd.frrcfgd import MatchPrefix
+    from frrcfgd.frrcfgd import MatchPrefixList
+    from frrcfgd.frrcfgd import AggregateAddr
+    from frrcfgd.frrcfgd import IpNextHop
+    from frrcfgd.frrcfgd import IpNextHopSet
+
+def test_data_with_op():
+    data = CachedDataWithOp()
+    assert(data.data is None)
+    assert(data.op == CachedDataWithOp.OP_NONE)
+    data = CachedDataWithOp(10, CachedDataWithOp.OP_ADD)
+    assert(data.data == 10)
+    assert(data.op == CachedDataWithOp.OP_ADD)
+
+def test_peer_group():
+    pg = BGPPeerGroup('Vrf_red')
+    assert(pg.vrf == 'Vrf_red')
+    assert(len(pg.ref_nbrs) == 0)
+
+def test_command_map():
+    def cmd_hdlr():
+        pass
+    key_map1 = BGPKeyMapInfo('test command', cmd_hdlr, None)
+    assert(key_map1.daemons is None)
+    assert(key_map1.run_cmd == 'test command')
+    assert(key_map1.hdl_func == cmd_hdlr)
+    assert(key_map1.data is None)
+    key_map2 = BGPKeyMapInfo('[bgpd,ospfd]daemon command', None, 100)
+    assert(key_map2.daemons == ['bgpd', 'ospfd'])
+    assert(key_map2.run_cmd == 'daemon command')
+    assert(key_map2.hdl_func == get_command_cmn)
+    assert(key_map2.data == 100)
+
+def get_cmd_map_list(attr_list, map_key = None):
+    map_list = []
+    for attr in attr_list:
+        tokens = attr[0].split('|', 1)
+        if len(tokens) == 2:
+            key = tokens[1]
+        else:
+            key = None
+        if map_key is not None and key is not None and map_key != key:
+            continue
+        cmd_hdlr = cmd_data = None
+        if len(attr) >= 4:
+            cmd_hdlr = attr[2]
+            cmd_data = attr[3]
+        elif len(attr) == 3:
+            cmd_data = attr[2]
+        map_list.append(BGPKeyMapInfo(attr[1], cmd_hdlr, cmd_data))
+    return map_list
+
+def test_command_map_list():
+    def cmd_hdlr(num):
+        pass
+    map_list = [('abc', 'set attribute abc'),
+                ('defg', 'system config', cmd_hdlr, 10),
+                ('test', 'system test', [20, 30]),
+                ('xyz', 'config test'),
+                ('ip_cmd|ipv4', 'test on ipv4'),
+                ('ip_cmd|ipv6', 'test on ipv6')]
+    cmd_map_list = BGPKeyMapList(map_list, 'frrcfg', {'ip_cmd': 'ipv4'})
+    chk_map_list = get_cmd_map_list(map_list, 'ipv4')
+    for idx, cmd_map in enumerate(cmd_map_list):
+        assert(chk_map_list[idx] == cmd_map[1])
+    cmd_map_list = BGPKeyMapList(map_list, 'frrcfg', {'ip_cmd': 'ipv6'})
+    chk_map_list = get_cmd_map_list(map_list, 'ipv6')
+    for idx, cmd_map in enumerate(cmd_map_list):
+        assert(chk_map_list[idx] == cmd_map[1])
+
+def test_community_list():
+    for ext in [False, True]:
+        comm_list = CommunityList('comm', ext)
+        assert(comm_list.name == 'comm')
+        assert(comm_list.is_ext == ext)
+        assert(comm_list.match_action is None)
+        assert(comm_list.is_std is None)
+        assert(len(comm_list.mbr_list) == 0)
+
+def test_match_prefix():
+    pfx = MatchPrefix(socket.AF_INET, '1.2.3.4/16')
+    assert(pfx.ip_prefix == '1.2.0.0/16')
+    assert(pfx.min_len is None)
+    assert(pfx.max_len is None)
+    assert(pfx.action == 'permit')
+    pfx = MatchPrefix(socket.AF_INET, '10.10.10.10/24', '25..29', 'deny')
+    assert(pfx.ip_prefix == '10.10.10.0/24')
+    assert(pfx.min_len == 25)
+    assert(pfx.max_len == 29)
+    assert(pfx.action == 'deny')
+    pfx = MatchPrefix(socket.AF_INET, '100.0.0.0/8', '16..32')
+    assert(pfx.ip_prefix == '100.0.0.0/8')
+    assert(pfx.min_len == 16)
+    assert(pfx.max_len is None)
+    assert(pfx.action == 'permit')
+    pfx = MatchPrefix(socket.AF_INET, '20.20.20.20/28', '25..30', 'deny')
+    assert(pfx.ip_prefix == '20.20.20.16/28')
+    assert(pfx.min_len is None)
+    assert(pfx.max_len == 30)
+    assert(pfx.action == 'deny')
+
+    pfx = MatchPrefix(socket.AF_INET6, '1:2::3:4/64')
+    assert(pfx.ip_prefix == '1:2::/64')
+    assert(pfx.min_len is None)
+    assert(pfx.max_len is None)
+    assert(pfx.action == 'permit')
+    pfx = MatchPrefix(socket.AF_INET6, '10:10::10:10/64', '70..100', 'deny')
+    assert(pfx.ip_prefix == '10:10::/64')
+    assert(pfx.min_len == 70)
+    assert(pfx.max_len == 100)
+    assert(pfx.action == 'deny')
+    pfx = MatchPrefix(socket.AF_INET6, '1001::/16', '16..128')
+    assert(pfx.ip_prefix == '1001::/16')
+    assert(pfx.min_len is None)
+    assert(pfx.max_len == 128)
+    assert(pfx.action == 'permit')
+
+def test_match_prefix_list():
+    ipv4_pfx_attrs = [('10.1.1.1/16', '18..24', 'permit'),
+                      ('20.2.2.2/24', None, 'deny'),
+                      ('30.3.3.3/8', '10..32', 'permit'),
+                      ('40.4.4.4/28', '20..30', 'deny')]
+    ipv6_pfx_attrs = [('1000:1::1/64', '80..120', 'permit'),
+                      ('2000:2::2/96', None, 'deny'),
+                      ('3000:3::3/32', '40..128', 'permit'),
+                      ('4000:4::4/80', '60..100', 'deny')]
+
+    pfx_list = MatchPrefixList()
+    for attr in ipv4_pfx_attrs:
+        pfx_list.add_prefix(*attr)
+    assert(pfx_list.af == socket.AF_INET)
+    assert(len(pfx_list) == len(ipv4_pfx_attrs))
+    chk_pfx_list = []
+    for attr in ipv4_pfx_attrs:
+        chk_pfx_list.append(MatchPrefix(socket.AF_INET, *attr))
+    assert(all([x == y for x, y in zip(chk_pfx_list, pfx_list)]))
+
+    pfx_list = MatchPrefixList()
+    for attr in ipv6_pfx_attrs:
+        pfx_list.add_prefix(*attr)
+    assert(pfx_list.af == socket.AF_INET6)
+    assert(len(pfx_list) == len(ipv6_pfx_attrs))
+    chk_pfx_list = []
+    for attr in ipv6_pfx_attrs:
+        chk_pfx_list.append(MatchPrefix(socket.AF_INET6, *attr))
+    assert(all([x == y for x, y in zip(chk_pfx_list, pfx_list)]))
+
+def test_match_prefix_list_fail():
+    pfx_list = MatchPrefixList()
+    pfx_list.add_prefix('1.2.3.0/24')
+    with pytest.raises(ValueError):
+        pfx_list.add_prefix('1::/64')
+
+def test_aggregate_address():
+    addr = AggregateAddr()
+    assert(addr.as_set == False)
+    assert(addr.summary_only == False)
+
+def test_ip_nexthop():
+    for af in [socket.AF_INET, socket.AF_INET6]:
+        nh = IpNextHop(af, None, None, None, 'Loopback0', None, None, None)
+        assert(nh.af == af)
+        assert(nh.blackhole == 'false')
+        assert(nh.ip == ('0.0.0.0' if af == socket.AF_INET else '::'))
+        assert(nh.track == 0)
+        assert(nh.interface == 'Loopback0')
+        assert(nh.tag == 0)
+        assert(nh.distance == 0)
+        assert(nh.nh_vrf == '')
+        arg_list = nh.get_arg_list()
+        assert(arg_list == ['false', '', 'Loopback0'] + [''] * 4)
+        nh = IpNextHop(af, 'true', '1.1.1.1' if af == socket.AF_INET else '1::1',
+                       1, 'Ethernet0', 100, 2, 'default')
+        assert(nh.blackhole == 'true')
+        assert(nh.ip == ('0.0.0.0' if af == socket.AF_INET else '::'))
+        assert(nh.track == 1)
+        assert(nh.interface == '')
+        assert(nh.tag == 100)
+        assert(nh.distance == 2)
+        assert(nh.nh_vrf == '')
+        arg_list = nh.get_arg_list()
+        assert(arg_list == ['true', '', '', '1', '100', '2', ''])
+    nh = IpNextHop(socket.AF_INET, 'false', '1.2.3.4', 5, 'Ethernet1', 2345, 3, 'Vrf_red')
+    assert(nh.af == socket.AF_INET)
+    assert(nh.blackhole == 'false')
+    assert(nh.ip == '1.2.3.4')
+    assert(nh.track == 5)
+    assert(nh.interface == 'Ethernet1')
+    assert(nh.tag == 2345)
+    assert(nh.distance == 3)
+    assert(nh.nh_vrf == 'Vrf_red')
+    arg_list = nh.get_arg_list()
+    assert(arg_list == ['false', '1.2.3.4', 'Ethernet1', '5', '2345', '3', 'Vrf_red'])
+    nh = IpNextHop(socket.AF_INET6, 'false', '1001:1::2002', 6, 'Ethernet2', 9000, 4, 'Vrf_blue')
+    assert(nh.af == socket.AF_INET6)
+    assert(nh.blackhole == 'false')
+    assert(nh.ip == '1001:1::2002')
+    assert(nh.track == 6)
+    assert(nh.interface == 'Ethernet2')
+    assert(nh.tag == 9000)
+    assert(nh.distance == 4)
+    assert(nh.nh_vrf == 'Vrf_blue')
+    arg_list = nh.get_arg_list()
+    assert(arg_list == ['false', '1001:1::2002', 'Ethernet2', '6', '9000', '4', 'Vrf_blue'])
+
+def test_nexthop_set():
+    for af in [socket.AF_INET, socket.AF_INET6]:
+        nh_set = IpNextHopSet(af)
+        bkh_list = ['false', 'false', 'false', 'true']
+        ip_list = ['1.1.1.1', '2.2.2.2', '3.3.3.3', None]
+        ip6_list = ['1::1', '2::2', '3::3', None]
+        intf_list = [None, 'Vlan0', 'Loopback1', None]
+        tag_list = [1000, 2000, 3000, 4000]
+        vrf_list = ['default', 'Vrf_red', 'Vrf_blue', None]
+        nh_set = IpNextHopSet(af, bkh_list, ip_list if af == socket.AF_INET else ip6_list, None,
+                              intf_list, tag_list, None, vrf_list)
+        test_set = set()
+        for idx in range(len(ip_list)):
+            test_set.add(IpNextHop(af, bkh_list[idx], ip_list[idx] if af == socket.AF_INET else ip6_list[idx],
+                                   None, intf_list[idx], tag_list[idx], None, vrf_list[idx]))
+        assert(nh_set == test_set)

From 3b3161050eaa050d95e14ad819d87b88bdf2bfd7 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 24 Jan 2021 21:01:47 -0800
Subject: [PATCH 0091/1674] [submodule]: update sonic-sairedis (#6544)

* 20b9573 2021-01-24 | [SAI]: update SAI submodule (#775) (HEAD, origin/master, origin/HEAD) [lguohan]
* 667c33d 2021-01-22 | [syncd] Comparison logic add support to LABEL attribute with higher priority (#764) [Kamil Cudnik]
* aaf5b98 2021-01-22 | [vslib]: Fix missing MACsec Create Port action (#770) [Ze Gan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 02d0371d2e0f..20b9573437f3 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 02d0371d2e0fc6f87d7859346d86c638df82c464
+Subproject commit 20b9573437f3194c5281f28922ab5d5d8a913e4e

From e6c98eab3ebf9405dcfd642ac865f634ec6d746e Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sun, 24 Jan 2021 22:50:49 -0800
Subject: [PATCH 0092/1674] [submodule]: update sonic-swss

* 01c3abd 2021-01-23 | Enhance dynamic buffer calculation and bug fixes (#1601) (HEAD, origin/202012) [Stephen Sun]
* e7af660 2021-01-24 | [fpmsyncd] Skip routes to eth0 or docker0 (#1606) [Shi Su]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 36f7332ddab5..01c3abd3cf30 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 36f7332ddab56c618513c4b57edc99e3b735c27c
+Subproject commit 01c3abd3cf30c76824b736fe65093fa065385c67

From 80ba3a4f6f3a51ddb5c73c0bad2587d14b542120 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Mon, 25 Jan 2021 10:48:48 -0800
Subject: [PATCH 0093/1674] [dhcp-relay]: Launch DHCP Relay On L3 Vlan (#6527)

Recent changes brought l2 vlan concept which do not have DHCP
clients behind them and so DHCP relay is not required. Also,
dhcpmon fails to launch on those vlans as their interfaces
lack IP addresses. This PR limit launch of both DHCP relay
and dhcpmon to L3 vlans only.

singed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 .../docker-dhcp-relay.supervisord.conf.j2     | 22 +++++++++----------
 .../tests/t0-sample-graph.xml                 | 17 ++++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 59d6c1f5f2c7..20f631ad47c1 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -39,11 +39,11 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 {# If our configuration has VLANs... #}
-{% if VLAN %}
+{% if VLAN_INTERFACE %}
 {# Count how many VLANs require a DHCP relay agent... #}
 {% set num_relays = { 'count': 0 } %}
-{% for vlan_name in VLAN %}
-{% if VLAN[vlan_name]['dhcp_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
 {% set _dummy = num_relays.update({'count': num_relays.count + 1}) %}
 {% endif %}
 {% endfor %}
@@ -52,8 +52,8 @@ dependent_startup_wait_for=rsyslogd:running
 [group:isc-dhcp-relay]
 programs=
 {%- set add_preceding_comma = { 'flag': False } %}
-{% for vlan_name in VLAN %}
-{% if VLAN[vlan_name]['dhcp_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 isc-dhcp-relay-{{ vlan_name }}
@@ -63,8 +63,8 @@ isc-dhcp-relay-{{ vlan_name }}
 
 {# Create a program entry for each DHCP relay agent instance #}
 {% set relay_for_ipv4 = { 'flag': False } %}
-{% for vlan_name in VLAN %}
-{% if VLAN[vlan_name]['dhcp_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
 {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
 {% if dhcp_server | ipv4 %}
 {% set _dummy = relay_for_ipv4.update({'flag': True}) %}
@@ -106,8 +106,8 @@ dependent_startup_wait_for=start:exited
 [group:dhcpmon]
 programs=
 {%- set add_preceding_comma = { 'flag': False } %}
-{% for vlan_name in VLAN %}
-{% if VLAN[vlan_name]['dhcp_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 dhcpmon-{{ vlan_name }}
@@ -117,8 +117,8 @@ dhcpmon-{{ vlan_name }}
 
 {# Create a program entry for each DHCP MONitor instance #}
 {% set relay_for_ipv4 = { 'flag': False } %}
-{% for vlan_name in VLAN %}
-{% if VLAN[vlan_name]['dhcp_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
 {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
 {% if dhcp_server | ipv4 %}
 {% set _dummy = relay_for_ipv4.update({'flag': True}) %}
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index 237a2ff0f532..63f892fe6d04 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -237,11 +237,28 @@
           <AttachTo>fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96</AttachTo>
           <NoDhcpRelay>False</NoDhcpRelay>
           <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
           <Type i:nil="true"/>
           <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
           <VlanID>1000</VlanID>
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan99</Name>
+          <AttachTo>fortyGigE0/100</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>99</VlanID>
+          <Tag>99</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
         </VlanInterface>
       </VlanInterfaces>
       <IPInterfaces>

From a0fd862620898c6e3276e457f4fbd996fbbcf92f Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Tue, 26 Jan 2021 02:52:22 +0800
Subject: [PATCH 0094/1674] [mellanox]: Update SDK to 4.4.2308, FW to
 *.2008.2308 (#6552)

Bugs fixes:
    All | Kernel | During system reload when CPU is loaded with heavy traffic, a Kernel Panic may occur.
    All | Modules, Port split | FW stuck when device rebooted with locked Optical Transceivers in split mode
    Spectrum-3 | PFC | On Spectrum-3 systems, slow reaction time to Rx pause packets on 40GbE ports may lead to buffer overflow on servers.
    Spectrum-3 | SN4700, Port Split | On rare occasion SN4700, conducting 100G split (4x25G) in NRZ when splitter port 1 or 2 are down, ports 3 and 4 will also go down.

Enahncments:
    All | Kernel | new notification on ISSU start, so other kernel drivers can disable any interface to ASIC

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 5c9a7442b98f..094a038c31b2 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2208
+MLNX_SPC_FW_VERSION = 13.2008.2308
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2208
+MLNX_SPC2_FW_VERSION = 29.2008.2308
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2208
+MLNX_SPC3_FW_VERSION = 30.2008.2308
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index f2d3ccc99c03..68f452e52bbb 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit f2d3ccc99c03a54a874278d33ae77c38586eb70b
+Subproject commit 68f452e52bbbe9a9f68926867dd9ffcee41e15a9
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index e020d1a575cf..7ae3289f249c 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2208
+MLNX_SDK_VERSION = 4.4.2308
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From be281536e1817b3857e8b3eb84c85c7de3959679 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Wed, 27 Jan 2021 15:01:42 +0800
Subject: [PATCH 0095/1674] [bgpmon]: Fix exception in bgpmon caused by
 duplicate bgp neighbor ID (#6546)

* Fix exception in bgpmon caused by duplicate keys
It is possible that BGP neighbors in IPv4 and IPv6 address families
share the same name (such as bgp monitor). However, such case is not
handled in bgpmon, and an Exception will be raised. This commit will
address the issue by Using set instead of list to avoid duplicate keys.
---
 src/sonic-bgpcfgd/bgpmon/bgpmon.py | 37 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpmon/bgpmon.py b/src/sonic-bgpcfgd/bgpmon/bgpmon.py
index c20c2110a6b2..2b50bd6cf58d 100755
--- a/src/sonic-bgpcfgd/bgpmon/bgpmon.py
+++ b/src/sonic-bgpcfgd/bgpmon/bgpmon.py
@@ -4,20 +4,20 @@
 Description: bgpmon.py -- populating bgp related information in stateDB.
     script is started by supervisord in bgp docker when the docker is started.
 
-    Initial creation of this daemon is to assist SNMP agent in obtaining the 
+    Initial creation of this daemon is to assist SNMP agent in obtaining the
     BGP related information for its MIB support. The MIB that this daemon is
     assisting is for the CiscoBgp4MIB (Neighbor state only). If there are other
-    BGP related items that needs to be updated in a periodic manner in the 
+    BGP related items that needs to be updated in a periodic manner in the
     future, then more can be added into this process.
 
     The script check if there are any bgp activities by monitoring the bgp
     frr.log file timestamp.  If activity is detected, then it will request bgp
-    neighbor state via vtysh cli interface. This bgp activity monitoring is 
+    neighbor state via vtysh cli interface. This bgp activity monitoring is
     done periodically (every 15 second). When triggered, it looks specifically
     for the neighbor state in the json output of show ip bgp neighbors json
     and update the state DB for each neighbor accordingly.
     In order to not disturb and hold on to the State DB access too long and
-    removal of the stale neighbors (neighbors that was there previously on 
+    removal of the stale neighbors (neighbors that was there previously on
     previous get request but no longer there in the current get request), a
     "previous" neighbor dictionary will be kept and used to determine if there
     is a need to perform update or the peer is stale to be removed from the
@@ -34,13 +34,13 @@
 
 class BgpStateGet:
     def __init__(self):
-        # list peer_l stores the Neighbor peer Ip address
+        # set peer_l stores the Neighbor peer Ip address
         # dic peer_state stores the Neighbor peer state entries
-        # list new_peer_l stores the new snapshot of Neighbor peer ip address
+        # set new_peer_l stores the new snapshot of Neighbor peer ip address
         # dic new_peer_state stores the new snapshot of Neighbor peer states
-        self.peer_l = []
+        self.peer_l = set()
         self.peer_state = {}
-        self.new_peer_l = []
+        self.new_peer_l = set()
         self.new_peer_state = {}
         self.cached_timestamp = 0
         self.db = swsssdk.SonicV2Connector()
@@ -67,7 +67,7 @@ def bgp_activity_detected(self):
 
     def update_new_peer_states(self, peer_dict):
         peer_l = peer_dict["peers"].keys()
-        self.new_peer_l.extend(peer_l)
+        self.new_peer_l.update(peer_l)
         for peer in peer_l:
             self.new_peer_state[peer] = peer_dict["peers"][peer]["state"]
 
@@ -80,8 +80,8 @@ def get_all_neigh_states(self):
             return
 
         peer_info = json.loads(output)
-        # cmd ran successfully, safe to Clean the "new" lists/dic for new snapshot
-        del self.new_peer_l[:]
+        # cmd ran successfully, safe to Clean the "new" set/dict for new snapshot
+        self.new_peer_l.clear()
         self.new_peer_state.clear()
         for key, value in peer_info.items():
             if key == "ipv4Unicast" or key == "ipv6Unicast":
@@ -115,8 +115,7 @@ def flush_pipe(self, data):
 
     def update_neigh_states(self):
         data = {}
-        for i in range (0, len(self.new_peer_l)):
-            peer = self.new_peer_l[i]
+        for peer in self.new_peer_l:
             key = "NEIGH_STATE_TABLE|%s" % peer
             if peer in self.peer_l:
                 # only update the entry if state changed
@@ -125,7 +124,7 @@ def update_neigh_states(self):
                     state = self.new_peer_state[peer]
                     data[key] = {'state':state}
                     self.peer_state[peer] = state
-                # remove this neighbor from old list since it is accounted for
+                # remove this neighbor from old set since it is accounted for
                 self.peer_l.remove(peer)
             else:
                 # New neighbor found case. Add to dictionary and state DB
@@ -135,19 +134,19 @@ def update_neigh_states(self):
             if len(data) > PIPE_BATCH_MAX_COUNT:
                 self.flush_pipe(data)
         # Check for stale state entries to be cleaned up
-        while len(self.peer_l) > 0:
+        for peer in self.peer_l:
             # remove this from the stateDB and the current neighbor state entry
-            peer = self.peer_l.pop(0)
             del_key = "NEIGH_STATE_TABLE|%s" % peer
             data[del_key] = None
-            del self.peer_state[peer]
+            if peer in self.peer_state:
+                del self.peer_state[peer]
             if len(data) > PIPE_BATCH_MAX_COUNT:
                 self.flush_pipe(data)
         # If anything in the pipeline not yet flushed, flush them now
         if len(data) > 0:
             self.flush_pipe(data)
-        # Save the new List
-        self.peer_l = self.new_peer_l[:]
+        # Save the new set
+        self.peer_l = self.new_peer_l.copy()
 
 def main():
 

From 3706b31b490d32fcae50aea350f967d1e3b0bf37 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Wed, 27 Jan 2021 21:39:54 +0800
Subject: [PATCH 0096/1674] Add hw-mgmt patch to support SDK OFFLINE event for
 handling flow within service firmware upgrade (#6550)

During ISSU, "mlxsw_minimal" driver still trying to access firmware, in some cases FW could return some wrong critical threshold value which will cause switch shutdown.

**- How I did it**
In order to prevent "mlxsw_minimal" driver from accessing ASIC during ISSU, SDK will raise "OFFLINE" 'udev' event
at the early beginning of such flow. When this event is received, hw-management will remove "mlxsw_minimal" driver.
There is no need to implement the opposite "ONLINE" event since this flow is ended up with "kexec".

**- How to verify it**
repeatedly perform warm reboot, make sure there is no switch shutdown occurred.
---
 ...dd-support-for-SDK-OFFLINE-event-for.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch

diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch b/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch
new file mode 100644
index 000000000000..6c58f7299c2c
--- /dev/null
+++ b/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch
@@ -0,0 +1,30 @@
+From 3e511778248403968e0a02857b7003f352669ba3 Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Wed, 13 Jan 2021 13:19:17 +0200
+Subject: [PATCH] hw-mgmt: events: Add support for SDK OFFLINE event for
+ handling flow with in service firmware upgrade
+
+In order to prevent "mlxsw_minimal" driver access to ASIC during in
+service firmware upgrade flow, SDK will raise "OFFLINE" 'udev' event
+at early beginning of such flow. When this event is received,
+hw-managemnet will remove "mlxsw_minimal" driver.
+There is no need to implement opposite "ONLINE" event, since this flow
+is ended up with "kexec".
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+---
+ usr/lib/udev/rules.d/50-hw-management-events.rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usr/lib/udev/rules.d/50-hw-management-events.rules b/usr/lib/udev/rules.d/50-hw-management-events.rules
+index cf4219e..33ea1bc 100644
+--- a/usr/lib/udev/rules.d/50-hw-management-events.rules
++++ b/usr/lib/udev/rules.d/50-hw-management-events.rules
+@@ -269,3 +269,4 @@ SUBSYSTEM=="i2c", DEVPATH=="/devices/platform/mlxplat/i2c_mlxcpld*/i2c-*/i2c-*/*
+ # SDK
+ SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="add", RUN+="/usr/bin/hw-management-thermal-events.sh add sxcore add"
+ SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="remove", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove"
++SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="offline", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove"
+-- 
+1.9.1
+

From 0b2abafcdebcc03ed70c8cec50fdba4857499d18 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 23 Jan 2021 01:27:20 -0800
Subject: [PATCH 0097/1674] [docker-ptf]: build docker ptf

- combine docker-ptf-saithrift into docker-ptf docker
- build docker-ptf under platform vs
- remove docker-ptf for other platforms

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 dockers/docker-ptf-saithrift/Dockerfile.j2    | 17 ---------------
 dockers/docker-ptf/Dockerfile.j2              | 14 ++++++++++++-
 .../brcm_interface_to_front_map.ini           |  0
 .../msn_2700_interface_to_front_map.ini       |  0
 platform/barefoot/docker-ptf-bfn.mk           |  5 -----
 platform/barefoot/rules.mk                    |  1 -
 platform/broadcom/docker-ptf-brcm.dep         | 10 ---------
 platform/broadcom/docker-ptf-brcm.mk          |  8 -------
 platform/broadcom/rules.dep                   |  1 -
 platform/broadcom/rules.mk                    |  1 -
 platform/cavium/docker-ptf-cavm.mk            |  8 -------
 platform/cavium/rules.mk                      |  1 -
 platform/centec-arm64/docker-ptf-centec.mk    |  7 -------
 platform/centec-arm64/rules.mk                |  1 -
 platform/centec/docker-ptf-centec.mk          |  8 -------
 platform/centec/rules.mk                      |  1 -
 platform/innovium/docker-ptf-invm.mk          |  8 -------
 platform/innovium/rules.mk                    |  1 -
 platform/marvell-arm64/docker-ptf-mrvl.mk     |  8 -------
 platform/marvell-arm64/rules.mk               |  1 -
 platform/marvell-armhf/docker-ptf-mrvl.mk     |  8 -------
 platform/marvell-armhf/rules.mk               |  1 -
 platform/mellanox/docker-ptf-mlnx.dep         | 10 ---------
 platform/mellanox/docker-ptf-mlnx.mk          |  8 -------
 platform/mellanox/rules.dep                   |  1 -
 platform/mellanox/rules.mk                    |  1 -
 platform/nephos/docker-ptf-nephos.mk          |  8 -------
 platform/nephos/rules.mk                      |  1 -
 {rules => platform/vs}/docker-ptf.dep         |  4 ++--
 {rules => platform/vs}/docker-ptf.mk          |  4 ++--
 platform/vs/libsaithrift-dev.dep              | 13 ++++++++++++
 platform/vs/libsaithrift-dev.mk               | 21 +++++++++++++++++++
 platform/vs/rules.dep                         |  2 ++
 platform/vs/rules.mk                          |  2 ++
 34 files changed, 55 insertions(+), 130 deletions(-)
 delete mode 100644 dockers/docker-ptf-saithrift/Dockerfile.j2
 rename dockers/{docker-ptf-saithrift => docker-ptf}/brcm_interface_to_front_map.ini (100%)
 rename dockers/{docker-ptf-saithrift => docker-ptf}/msn_2700_interface_to_front_map.ini (100%)
 delete mode 100644 platform/barefoot/docker-ptf-bfn.mk
 delete mode 100644 platform/broadcom/docker-ptf-brcm.dep
 delete mode 100644 platform/broadcom/docker-ptf-brcm.mk
 delete mode 100644 platform/cavium/docker-ptf-cavm.mk
 delete mode 100755 platform/centec-arm64/docker-ptf-centec.mk
 delete mode 100644 platform/centec/docker-ptf-centec.mk
 delete mode 100755 platform/innovium/docker-ptf-invm.mk
 delete mode 100644 platform/marvell-arm64/docker-ptf-mrvl.mk
 delete mode 100644 platform/marvell-armhf/docker-ptf-mrvl.mk
 delete mode 100644 platform/mellanox/docker-ptf-mlnx.dep
 delete mode 100644 platform/mellanox/docker-ptf-mlnx.mk
 delete mode 100644 platform/nephos/docker-ptf-nephos.mk
 rename {rules => platform/vs}/docker-ptf.dep (62%)
 rename {rules => platform/vs}/docker-ptf.mk (57%)
 create mode 100644 platform/vs/libsaithrift-dev.dep
 create mode 100644 platform/vs/libsaithrift-dev.mk

diff --git a/dockers/docker-ptf-saithrift/Dockerfile.j2 b/dockers/docker-ptf-saithrift/Dockerfile.j2
deleted file mode 100644
index 3076de4878b6..000000000000
--- a/dockers/docker-ptf-saithrift/Dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM docker-ptf
-
-## Make apt-get non-interactive
-ENV DEBIAN_FRONTEND=noninteractive
-
-COPY \
-{% for deb in docker_ptf_saithrift_debs.split(' ') -%}
-debs/{{ deb }}{{' '}}
-{%- endfor -%}
-debs/
-
-RUN dpkg -i \
-{% for deb in docker_ptf_saithrift_debs.split(' ') -%}
-debs/{{ deb }}{{' '}}
-{%- endfor %}
-
-COPY ["*.ini", "/etc/ptf/"]
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index faa927d9db89..43eefcd9eeff 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -78,7 +78,7 @@ RUN rm -rf /debs \
     && apt-get -y autoclean \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/* \
-    && wget --https-only https://bootstrap.pypa.io/get-pip.py \
+    && wget --https-only https://bootstrap.pypa.io/2.7/get-pip.py \
     && python get-pip.py \
     && rm -f get-pip.py \
     && pip install setuptools \
@@ -146,6 +146,18 @@ RUN git clone https://github.com/lguohan/gnxi.git \
     && cd gnmi_cli_py \
     && pip install -r requirements.txt
 
+COPY \
+{% for deb in docker_ptf_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
+RUN dpkg -i \
+{% for deb in docker_ptf_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+COPY ["*.ini", "/etc/ptf/"]
 EXPOSE 22 8009
 
 ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini b/dockers/docker-ptf/brcm_interface_to_front_map.ini
similarity index 100%
rename from dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini
rename to dockers/docker-ptf/brcm_interface_to_front_map.ini
diff --git a/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini b/dockers/docker-ptf/msn_2700_interface_to_front_map.ini
similarity index 100%
rename from dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini
rename to dockers/docker-ptf/msn_2700_interface_to_front_map.ini
diff --git a/platform/barefoot/docker-ptf-bfn.mk b/platform/barefoot/docker-ptf-bfn.mk
deleted file mode 100644
index 573e9cd9cffa..000000000000
--- a/platform/barefoot/docker-ptf-bfn.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# docker image for docker-ptf
-
-DOCKER_PTF_BFN = docker-ptf-bfn.gz
-$(DOCKER_PTF_BFN)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_BFN)_LOAD_DOCKERS += $(DOCKER_PTF)
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
index a2948b12892b..98dcef0f7b8a 100644
--- a/platform/barefoot/rules.mk
+++ b/platform/barefoot/rules.mk
@@ -10,7 +10,6 @@ include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk
 include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-bfn.mk
 include $(PLATFORM_PATH)/bfn-platform.mk
 #include $(PLATFORM_PATH)/bfn-platform-wnc.mk
 #include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
diff --git a/platform/broadcom/docker-ptf-brcm.dep b/platform/broadcom/docker-ptf-brcm.dep
deleted file mode 100644
index b899d058d445..000000000000
--- a/platform/broadcom/docker-ptf-brcm.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-
-DPATH       := $($(DOCKER_PTF_BRCM)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/docker-ptf-brcm.mk platform/broadcom/docker-ptf-brcm.dep
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(DPATH))
-
-$(DOCKER_PTF_BRCM)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(DOCKER_PTF_BRCM)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(DOCKER_PTF_BRCM)_DEP_FILES   := $(DEP_FILES)
-
diff --git a/platform/broadcom/docker-ptf-brcm.mk b/platform/broadcom/docker-ptf-brcm.mk
deleted file mode 100644
index 35780aea76ca..000000000000
--- a/platform/broadcom/docker-ptf-brcm.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-brcm
-
-DOCKER_PTF_BRCM = docker-ptf-brcm.gz
-$(DOCKER_PTF_BRCM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_BRCM)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_BRCM)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_BRCM)
diff --git a/platform/broadcom/rules.dep b/platform/broadcom/rules.dep
index d8142ae3fb76..2e2d44ed018a 100644
--- a/platform/broadcom/rules.dep
+++ b/platform/broadcom/rules.dep
@@ -22,4 +22,3 @@ include $(PLATFORM_PATH)/one-pde-image.dep
 include $(PLATFORM_PATH)/raw-image.dep
 include $(PLATFORM_PATH)/one-aboot.dep
 include $(PLATFORM_PATH)/libsaithrift-dev.dep
-include $(PLATFORM_PATH)/docker-ptf-brcm.dep
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
index 34edfa0d37fd..fbe0dd689a2e 100644
--- a/platform/broadcom/rules.mk
+++ b/platform/broadcom/rules.mk
@@ -19,7 +19,6 @@ include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/raw-image.mk
 include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-brcm.mk
 
 BCMCMD = bcmcmd
 $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r"
diff --git a/platform/cavium/docker-ptf-cavm.mk b/platform/cavium/docker-ptf-cavm.mk
deleted file mode 100644
index ea96fd050bfe..000000000000
--- a/platform/cavium/docker-ptf-cavm.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-cavm
-
-DOCKER_PTF_CAVM = docker-ptf-cavm.gz
-$(DOCKER_PTF_CAVM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_CAVM)_DEPENDS += $(PYTHON_SAITHRIFT_CAVM)
-$(DOCKER_PTF_CAVM)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_CAVM)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_CAVM)
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
index bbc2e4d2d2f0..a526774d2951 100644
--- a/platform/cavium/rules.mk
+++ b/platform/cavium/rules.mk
@@ -5,7 +5,6 @@ include $(PLATFORM_PATH)/cavm-platform-modules.mk
 include $(PLATFORM_PATH)/cavm-xpnet.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-cavm.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM) \
diff --git a/platform/centec-arm64/docker-ptf-centec.mk b/platform/centec-arm64/docker-ptf-centec.mk
deleted file mode 100755
index 3d4fe50e5f1f..000000000000
--- a/platform/centec-arm64/docker-ptf-centec.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# docker image for docker-ptf-centec
-
-DOCKER_PTF_CENTEC = docker-ptf-centec.gz
-$(DOCKER_PTF_CENTEC)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_CENTEC)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_CENTEC)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_CENTEC)
diff --git a/platform/centec-arm64/rules.mk b/platform/centec-arm64/rules.mk
index 79e1ab12b880..1982f86b757c 100755
--- a/platform/centec-arm64/rules.mk
+++ b/platform/centec-arm64/rules.mk
@@ -3,7 +3,6 @@ include $(PLATFORM_PATH)/docker-syncd-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-centec.mk
 include $(PLATFORM_PATH)/tsingma-bsp.mk
 include $(PLATFORM_PATH)/platform-modules-centec-e530.mk
 
diff --git a/platform/centec/docker-ptf-centec.mk b/platform/centec/docker-ptf-centec.mk
deleted file mode 100644
index 47284f71756c..000000000000
--- a/platform/centec/docker-ptf-centec.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-centec
-
-DOCKER_PTF_CENTEC = docker-ptf-centec.gz
-$(DOCKER_PTF_CENTEC)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_CENTEC)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_CENTEC)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_CENTEC)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_CENTEC)
diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk
index 52bb0275abff..182248ec1ac6 100644
--- a/platform/centec/rules.mk
+++ b/platform/centec/rules.mk
@@ -5,7 +5,6 @@ include $(PLATFORM_PATH)/docker-syncd-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-centec.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE)
 
diff --git a/platform/innovium/docker-ptf-invm.mk b/platform/innovium/docker-ptf-invm.mk
deleted file mode 100755
index 53ba41e9d386..000000000000
--- a/platform/innovium/docker-ptf-invm.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-invm
-
-DOCKER_PTF_INVM = docker-ptf-invm.gz
-$(DOCKER_PTF_INVM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_INVM)_DEPENDS += $(PYTHON_SAITHRIFT_INVM)
-$(DOCKER_PTF_INVM)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_INVM)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_INVM)
diff --git a/platform/innovium/rules.mk b/platform/innovium/rules.mk
index 0387a4ba30f0..ea23466ad578 100755
--- a/platform/innovium/rules.mk
+++ b/platform/innovium/rules.mk
@@ -6,7 +6,6 @@ include $(PLATFORM_PATH)/docker-syncd-invm-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
-include $(PLATFORM_PATH)/docker-ptf-invm.mk
 
 SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \
              $(DOCKER_FPM) \
diff --git a/platform/marvell-arm64/docker-ptf-mrvl.mk b/platform/marvell-arm64/docker-ptf-mrvl.mk
deleted file mode 100644
index 72c860aec868..000000000000
--- a/platform/marvell-arm64/docker-ptf-mrvl.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-mrvl
-
-DOCKER_PTF_MRVL = docker-ptf-mrvl.gz
-$(DOCKER_PTF_MRVL)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_MRVL)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_MRVL)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MRVL)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_MRVL)
diff --git a/platform/marvell-arm64/rules.mk b/platform/marvell-arm64/rules.mk
index c3d7092ebb82..f8e4c12a49ff 100644
--- a/platform/marvell-arm64/rules.mk
+++ b/platform/marvell-arm64/rules.mk
@@ -4,7 +4,6 @@ include $(PLATFORM_PATH)/docker-syncd-mrvl.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-mrvl.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/linux-kernel-arm64.mk
 INCLUDE_SYSTEM_TELEMETRY = ""
diff --git a/platform/marvell-armhf/docker-ptf-mrvl.mk b/platform/marvell-armhf/docker-ptf-mrvl.mk
deleted file mode 100644
index 72c860aec868..000000000000
--- a/platform/marvell-armhf/docker-ptf-mrvl.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-mrvl
-
-DOCKER_PTF_MRVL = docker-ptf-mrvl.gz
-$(DOCKER_PTF_MRVL)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_MRVL)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_MRVL)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MRVL)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_MRVL)
diff --git a/platform/marvell-armhf/rules.mk b/platform/marvell-armhf/rules.mk
index 27d3167edd03..58b9654956f3 100644
--- a/platform/marvell-armhf/rules.mk
+++ b/platform/marvell-armhf/rules.mk
@@ -4,7 +4,6 @@ include $(PLATFORM_PATH)/docker-syncd-mrvl.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-mrvl.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/linux-kernel-armhf.mk
 include $(PLATFORM_PATH)/platform-et6448m.mk
diff --git a/platform/mellanox/docker-ptf-mlnx.dep b/platform/mellanox/docker-ptf-mlnx.dep
deleted file mode 100644
index 652fe0001c76..000000000000
--- a/platform/mellanox/docker-ptf-mlnx.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-# DPKG FRK
-
-DPATH := $($(DOCKER_PTF_MLNX)_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-ptf-mlnx.mk $(PLATFORM_PATH)/docker-ptf-mlnx.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(DPATH))
-
-$(DOCKER_PTF_MLNX)_CACHE_MODE := GIT_CONTENT_SHA
-$(DOCKER_PTF_MLNX)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
-$(DOCKER_PTF_MLNX)_DEP_FILES := $(DEP_FILES)
diff --git a/platform/mellanox/docker-ptf-mlnx.mk b/platform/mellanox/docker-ptf-mlnx.mk
deleted file mode 100644
index eaaa54897d80..000000000000
--- a/platform/mellanox/docker-ptf-mlnx.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-mlnx
-
-DOCKER_PTF_MLNX = docker-ptf-mlnx.gz
-$(DOCKER_PTF_MLNX)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_MLNX)_DEPENDS += $(PYTHON_SAITHRIFT)
-$(DOCKER_PTF_MLNX)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_MLNX)
diff --git a/platform/mellanox/rules.dep b/platform/mellanox/rules.dep
index 8986eb2e0808..409857592159 100644
--- a/platform/mellanox/rules.dep
+++ b/platform/mellanox/rules.dep
@@ -11,7 +11,6 @@ include $(PLATFORM_PATH)/docker-syncd-mlnx-rpc.dep
 include $(PLATFORM_PATH)/docker-saiserver-mlnx.dep
 include $(PLATFORM_PATH)/one-image.dep
 include $(PLATFORM_PATH)/libsaithrift-dev.dep
-include $(PLATFORM_PATH)/docker-ptf-mlnx.dep
 include $(PLATFORM_PATH)/mlnx-ffb.dep
 include $(PLATFORM_PATH)/issu-version.dep
 include $(PLATFORM_PATH)/mlnx-onie-fw-update.dep
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index 1e2ca78a195b..179e20f3fff5 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -9,7 +9,6 @@ include $(PLATFORM_PATH)/docker-syncd-mlnx-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-mlnx.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
 include $(PLATFORM_PATH)/mlnx-ffb.mk
 include $(PLATFORM_PATH)/issu-version.mk
 include $(PLATFORM_PATH)/mlnx-onie-fw-update.mk
diff --git a/platform/nephos/docker-ptf-nephos.mk b/platform/nephos/docker-ptf-nephos.mk
deleted file mode 100644
index 15855bc89a1f..000000000000
--- a/platform/nephos/docker-ptf-nephos.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker image for docker-ptf-nephos
-
-DOCKER_PTF_NEPHOS = docker-ptf-nephos.gz
-$(DOCKER_PTF_NEPHOS)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_NEPHOS)_DEPENDS += $(PYTHON_SAITHRIFT_NEPHOS)
-$(DOCKER_PTF_NEPHOS)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_NEPHOS)
-SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_NEPHOS)
diff --git a/platform/nephos/rules.mk b/platform/nephos/rules.mk
index 8950c665deef..4ee2443e7585 100644
--- a/platform/nephos/rules.mk
+++ b/platform/nephos/rules.mk
@@ -7,7 +7,6 @@ include $(PLATFORM_PATH)/docker-syncd-nephos.mk
 include $(PLATFORM_PATH)/docker-syncd-nephos-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/docker-ptf-nephos.mk
 
 NPX_DIAG = npx_diag
 $(NPX_DIAG)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag"
diff --git a/rules/docker-ptf.dep b/platform/vs/docker-ptf.dep
similarity index 62%
rename from rules/docker-ptf.dep
rename to platform/vs/docker-ptf.dep
index d62019e9b386..8cd9f7b7a279 100644
--- a/rules/docker-ptf.dep
+++ b/platform/vs/docker-ptf.dep
@@ -1,10 +1,10 @@
 
 DPATH       := $($(DOCKER_PTF)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-ptf.mk rules/docker-ptf.dep   
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/vs/docker-ptf.mk platform/vs/docker-ptf.dep
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(DPATH))
 
-$(DOCKER_PTF)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_PTF)_CACHE_MODE  := GIT_CONTENT_SHA
 $(DOCKER_PTF)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
 $(DOCKER_PTF)_DEP_FILES   := $(DEP_FILES)
 
diff --git a/rules/docker-ptf.mk b/platform/vs/docker-ptf.mk
similarity index 57%
rename from rules/docker-ptf.mk
rename to platform/vs/docker-ptf.mk
index b2d45068334d..4fde844fe24b 100644
--- a/rules/docker-ptf.mk
+++ b/platform/vs/docker-ptf.mk
@@ -1,7 +1,7 @@
-# docker image for ptf
+# docker image for docker-ptf
 
 DOCKER_PTF = docker-ptf.gz
 $(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
-$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF)
+$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
 SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
 SONIC_STRETCH_DOCKERS += $(DOCKER_PTF)
diff --git a/platform/vs/libsaithrift-dev.dep b/platform/vs/libsaithrift-dev.dep
new file mode 100644
index 000000000000..be1d3f74b23f
--- /dev/null
+++ b/platform/vs/libsaithrift-dev.dep
@@ -0,0 +1,13 @@
+#DPKG FRK
+SPATH       := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/libsaithrift-dev.mk platform/broadcom/libsaithrift-dev.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_PATHS := $(SPATH)  $(SPATH)/bm/behavioral-model  $(SPATH)/test/ptf  $(SPATH)/test/saithrift/ctypesgen
+$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) &&  git ls-files | grep -Ev " " )))))
+
+$(LIBSAITHRIFT_DEV)_CACHE_MODE  := GIT_CONTENT_SHA
+$(LIBSAITHRIFT_DEV)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(LIBSAITHRIFT_DEV)_DEP_FILES   := $(DEP_FILES)
+$(LIBSAITHRIFT_DEV)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path)))
+$(LIBSAITHRIFT_DEV)_SMDEP_PATHS := $(SMDEP_PATHS)
+
diff --git a/platform/vs/libsaithrift-dev.mk b/platform/vs/libsaithrift-dev.mk
new file mode 100644
index 000000000000..915210f99f0e
--- /dev/null
+++ b/platform/vs/libsaithrift-dev.mk
@@ -0,0 +1,21 @@
+# libsaithrift-dev package
+
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) \
+	$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(LIBSAIVS) $(LIBSAIMETADATA)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_$(CONFIGURED_ARCH).deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(LIBSAIVS)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_$(CONFIGURED_ARCH).deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/vs/rules.dep b/platform/vs/rules.dep
index 7a5346619e70..0d485e8004d1 100644
--- a/platform/vs/rules.dep
+++ b/platform/vs/rules.dep
@@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/sonic-version.dep
 include $(PLATFORM_PATH)/docker-sonic-vs.dep
 include $(PLATFORM_PATH)/docker-syncd-vs.dep
 include $(PLATFORM_PATH)/docker-gbsyncd-vs.dep
+include $(PLATFORM_PATH)/docker-ptf.dep
+include $(PLATFORM_PATH)/libsaithrift-dev.dep
 include $(PLATFORM_PATH)/one-image.dep
 include $(PLATFORM_PATH)/onie.dep
 include $(PLATFORM_PATH)/kvm-image.dep
diff --git a/platform/vs/rules.mk b/platform/vs/rules.mk
index 66e8bad5fe78..cbb52847edfa 100644
--- a/platform/vs/rules.mk
+++ b/platform/vs/rules.mk
@@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/sonic-version.mk
 include $(PLATFORM_PATH)/docker-sonic-vs.mk
 include $(PLATFORM_PATH)/docker-syncd-vs.mk
 include $(PLATFORM_PATH)/docker-gbsyncd-vs.mk
+include $(PLATFORM_PATH)/docker-ptf.mk
+include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/onie.mk
 include $(PLATFORM_PATH)/kvm-image.mk

From 11a8e89f27870c0ed20c8b56efb542c6f36a0afd Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 23 Jan 2021 23:41:00 -0800
Subject: [PATCH 0098/1674] [build]: add _BUILD_ENV to specify env for
 dpkg-buildpackage

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/vs/libsaithrift-dev.mk | 1 +
 slave.mk                        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/vs/libsaithrift-dev.mk b/platform/vs/libsaithrift-dev.mk
index 915210f99f0e..ba8a63d539ac 100644
--- a/platform/vs/libsaithrift-dev.mk
+++ b/platform/vs/libsaithrift-dev.mk
@@ -7,6 +7,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) \
 	$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(LIBSAIVS) $(LIBSAIMETADATA)
+$(LIBSAITHRIFT_DEV)_BUILD_ENV = platform=vs
 SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
 
 PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb
diff --git a/slave.mk b/slave.mk
index 728bb8be16cf..775e566a1532 100644
--- a/slave.mk
+++ b/slave.mk
@@ -464,8 +464,8 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		if [ -f ./autogen.sh ]; then ./autogen.sh $(LOG); fi
 		$(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR)
 		$(if $($*_DPKG_TARGET),
-			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) --admindir $$mergedir $(LOG),
-			DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $$mergedir $(LOG)
+			${$*_BUILD_ENV} DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) --admindir $$mergedir $(LOG),
+			${$*_BUILD_ENV} DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $$mergedir $(LOG)
 		)
 		popd $(LOG_SIMPLE)
 		# Clean up

From e469460ef368e325a9c8c6a82828efd5acc8b7aa Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Wed, 27 Jan 2021 15:27:41 -0500
Subject: [PATCH 0099/1674] [docker-config-engine-stretch]: Fix dependency typo
 PYTHON2_SWSSCOMMON (#6568)

This commit fixes a typo in the fix delivered in PR #6538

syncd fails on the armhf platform within sonic-config-engine/portconfig.py when importing the following
'from swsscommon.swsscommon import ConfigDBConnector'
---
 rules/docker-config-engine-stretch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/docker-config-engine-stretch.mk b/rules/docker-config-engine-stretch.mk
index ad112bb034dc..7e90c1587a9d 100644
--- a/rules/docker-config-engine-stretch.mk
+++ b/rules/docker-config-engine-stretch.mk
@@ -2,7 +2,7 @@
 
 DOCKER_CONFIG_ENGINE_STRETCH = docker-config-engine-stretch.gz
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-config-engine-stretch
-$(DOCKER_CONFIG_ENGINE_STRETCH)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON2_SWSSCOMMON)
+$(DOCKER_CONFIG_ENGINE_STRETCH)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)

From 7fc8caa36b45000ebc46b5d6631e0959c06774f8 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Thu, 28 Jan 2021 04:29:28 +0800
Subject: [PATCH 0100/1674] [mellanox]: Update SAI to sonic2012 1.18.1.0
 (#6566)

Changes in the new release:

1. Policy based hashing optimization
2. New attribute support for Max port headroom
3. Tunnel ECN map fixes
4. Tunnel EVPN skeleton extensions (peer attrib, maps)
5. Bridge port admin not affecting port admin (optimize port down time)
6. CRM new API for neighbors and tunnel termination entries
7. Improve FDB event for flush by bridge port (before, null bridge was reported to SONiC, now the bridge will be extracted from bridge port)
8. DHCP L2 v4+v6 traps (for ZTP use case)
9. Generic counter implementation

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/mlnx-sai.mk                 | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 0c1795cf41a3..7f16a72cc076 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.18.0.2-master
+MLNX_SAI_VERSION = SAIRel1.18.1.0
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index ad1e9c7279e5..2902c78672eb 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit ad1e9c7279e544b93fef9a40fb41df375338b55e
+Subproject commit 2902c78672eb9602296fd17654f29a21ddaf8290

From fc825f9a58671164a115ce9b3e6830194418a800 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:36:02 -0800
Subject: [PATCH 0101/1674] [FRR] Create a separate script to wait zebra to be
 ready to receive connections (#6519)

The requirement for zebra to be ready to accept connections is a generic problem that is not
specific to bgpd. Making the script to wait for zebra socket a separate script and let bgpd and
staticd to wait for zebra socket.
---
 dockers/docker-fpm-frr/Dockerfile.j2            |  5 +++--
 .../frr/supervisord/supervisord.conf.j2         | 17 ++++++++++++++---
 dockers/docker-fpm-frr/{bgpd.sh => zsocket.sh}  | 11 +++++++----
 3 files changed, 24 insertions(+), 9 deletions(-)
 rename dockers/docker-fpm-frr/{bgpd.sh => zsocket.sh} (70%)

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 302f38c8b579..360d64a12b82 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -54,9 +54,10 @@ COPY ["TSA", "/usr/bin/TSA"]
 COPY ["TSB", "/usr/bin/TSB"]
 COPY ["TSC", "/usr/bin/TSC"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
-COPY ["bgpd.sh", "/usr/bin/"]
+COPY ["zsocket.sh", "/usr/bin/"]
 RUN chmod a+x /usr/bin/TSA && \
     chmod a+x /usr/bin/TSB && \
-    chmod a+x /usr/bin/TSC
+    chmod a+x /usr/bin/TSC && \
+    chmod a+x /usr/bin/zsocket.sh
 
 ENTRYPOINT ["/usr/bin/docker_init.sh"]
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index dc52bd1b5336..a6327936954f 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -39,6 +39,17 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
+[program:zsocket]
+command=/usr/bin/zsocket.sh
+priority=4
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=zebra:running
+
 [program:staticd]
 command=/usr/lib/frr/staticd -A 127.0.0.1
 priority=4
@@ -48,7 +59,7 @@ startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=zebra:running
+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:bfdd]
@@ -65,7 +76,7 @@ dependent_startup_wait_for=zebra:running
 {% endif %}
 
 [program:bgpd]
-command=/usr/bin/bgpd.sh -A 127.0.0.1 -M snmp
+command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
 priority=5
 stopsignal=KILL
 autostart=false
@@ -74,7 +85,7 @@ startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=zebra:running
+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:ospfd]
diff --git a/dockers/docker-fpm-frr/bgpd.sh b/dockers/docker-fpm-frr/zsocket.sh
similarity index 70%
rename from dockers/docker-fpm-frr/bgpd.sh
rename to dockers/docker-fpm-frr/zsocket.sh
index c61a594a1efc..111492f960ed 100755
--- a/dockers/docker-fpm-frr/bgpd.sh
+++ b/dockers/docker-fpm-frr/zsocket.sh
@@ -5,8 +5,8 @@ port=2601
 
 function help()
 {
-    echo "This script aims to ensure zebra is ready to accept connections before starting bgpd"
-    echo "Usage: $0 [options] [bgpd options]"
+    echo "This script aims to ensure zebra is ready to accept connections"
+    echo "Usage: $0 [options]"
     echo "Options:"
     echo " -a   Zebra address"
     echo " -o   Zebra port"
@@ -23,11 +23,14 @@ while getopts ":a:o:h" opt; do
             ;;
     esac
 done
-shift $((OPTIND-1))
 
+start=$(date +%s.%N)
 timeout 5s bash -c -- "until </dev/tcp/${addr}/${port}; do sleep 0.1;done"
 if [ "$?" != "0" ]; then
     logger -p error "Error: zebra is not ready to accept connections"
+else
+    timespan=$(awk "BEGIN {print $(date +%s.%N)-$start; exit}")
+    logger -p info "It took ${timespan} seconds to wait for zebra to be ready to accept connections"
 fi
 
-exec /usr/lib/frr/bgpd "$@"
+exit 0

From cc9c3f567e65d253ca924fb3a766e76905eb2ed6 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Thu, 21 Jan 2021 12:57:49 -0800
Subject: [PATCH 0102/1674] [supervisord] Monitoring the critical processes
 with supervisord. (#6242)

- Why I did it
Initially, we used Monit to monitor critical processes in each container. If one of critical processes was not running
or crashed due to some reasons, then Monit will write an alerting message into syslog periodically. If we add a new process
in a container, the corresponding Monti configuration file will also need to update. It is a little hard for maintenance.

Currently we employed event listener of Supervisod to do this monitoring. Since processes in each container are managed by
Supervisord, we can only focus on the logic of monitoring.

- How I did it
We borrowed the event listener of Supervisord to monitor critical processes in containers. The event listener will take
following steps if it was notified one of critical processes exited unexpectedly:

The event listener will first check whether the auto-restart mechanism was enabled for this container or not. If auto-restart mechanism was enabled, event listener will kill the Supervisord process, which should cause the container to exit and subsequently get restarted.

If auto-restart mechanism was not enabled for this contianer, the event listener will enter a loop which will first sleep 1 minute and then check whether the process is running. If yes, the event listener exits. If no, an alerting message will be written into syslog.

- How to verify it
First, we need checked whether the auto-restart mechanism of a container was enabled or not by running the command show feature status. If enabled, one critical process should be selected and killed manually, then we need check whether the container will be restarted or not.

Second, we can disable the auto-restart mechanism if it was enabled at step 1 by running the commnad sudo config feature autorestart <container_name> disabled. Then one critical process should be selected and killed. After that, we will see the alerting message which will appear in the syslog every 1 minute.

- Which release branch to backport (provide reason below if selected)

 201811
 201911
[x ] 202006
---
 dockers/docker-database/supervisord.conf.j2   |   2 +-
 .../docker-dhcp-relay.supervisord.conf.j2     |   2 +-
 .../frr/supervisord/supervisord.conf.j2       |   2 +-
 dockers/docker-fpm-gobgp/supervisord.conf     |   2 +-
 dockers/docker-fpm-quagga/supervisord.conf    |   2 +-
 dockers/docker-lldp/supervisord.conf.j2       |   2 +-
 dockers/docker-nat/supervisord.conf           |   2 +-
 dockers/docker-orchagent/supervisord.conf     |   2 +-
 .../docker-pmon.supervisord.conf.j2           |   2 +-
 ...cker-router-advertiser.supervisord.conf.j2 |   2 +-
 dockers/docker-sflow/supervisord.conf         |   2 +-
 dockers/docker-snmp/supervisord.conf          |   2 +-
 dockers/docker-sonic-restapi/supervisord.conf |   2 +-
 .../docker-sonic-telemetry/supervisord.conf   |   2 +-
 dockers/docker-teamd/supervisord.conf         |   2 +-
 files/scripts/supervisor-proc-exit-listener   | 146 ++++++++++++------
 .../docker-syncd-bfn/supervisord.conf         |   2 +-
 .../docker-syncd-brcm/supervisord.conf        |   2 +-
 .../cavium/docker-syncd-cavm/supervisord.conf |   2 +-
 .../docker-syncd-centec/supervisord.conf      |   2 +-
 .../docker-syncd-centec/supervisord.conf      |   2 +-
 .../docker-syncd-mrvl/supervisord.conf        |   2 +-
 .../docker-syncd-mrvl/supervisord.conf        |   2 +-
 .../docker-syncd-mrvl/supervisord.conf        |   2 +-
 .../docker-syncd-mlnx/supervisord.conf        |   2 +-
 .../docker-syncd-nephos/supervisord.conf      |   2 +-
 .../vs/docker-gbsyncd-vs/supervisord.conf     |   2 +-
 platform/vs/docker-syncd-vs/supervisord.conf  |   2 +-
 .../py2/docker-dhcp-relay.supervisord.conf    |   2 +-
 .../py3/docker-dhcp-relay.supervisord.conf    |   2 +-
 30 files changed, 130 insertions(+), 74 deletions(-)

diff --git a/dockers/docker-database/supervisord.conf.j2 b/dockers/docker-database/supervisord.conf.j2
index 65a172b3743a..616475fb07ce 100644
--- a/dockers/docker-database/supervisord.conf.j2
+++ b/dockers/docker-database/supervisord.conf.j2
@@ -5,7 +5,7 @@ nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name database
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 20f631ad47c1..19a6cc294f7f 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index a6327936954f..dd43e0cc4ec7 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
index b814dc024fa3..e7e3ee9f301a 100644
--- a/dockers/docker-fpm-gobgp/supervisord.conf
+++ b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -5,7 +5,7 @@ nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
index 7397a7428a08..470dea18a16d 100644
--- a/dockers/docker-fpm-quagga/supervisord.conf
+++ b/dockers/docker-fpm-quagga/supervisord.conf
@@ -5,7 +5,7 @@ nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-lldp/supervisord.conf.j2 b/dockers/docker-lldp/supervisord.conf.j2
index 4692f7bf2a18..3a84caee3040 100644
--- a/dockers/docker-lldp/supervisord.conf.j2
+++ b/dockers/docker-lldp/supervisord.conf.j2
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name lldp
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-nat/supervisord.conf b/dockers/docker-nat/supervisord.conf
index 8555f2a48ae6..f03b0b3772b8 100644
--- a/dockers/docker-nat/supervisord.conf
+++ b/dockers/docker-nat/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name nat
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 37ddade2edcf..538f251c2621 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=100
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name swss
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 3de20178b224..c205d3cc25dc 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -14,7 +14,7 @@ buffer_size=100
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name pmon
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index ae487922859c..5cbfd60322e1 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-script]
 command=/usr/bin/supervisor-proc-exit-listener --container-name radv
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf
index 8d1bdc5059cb..3ff5ff564544 100644
--- a/dockers/docker-sflow/supervisord.conf
+++ b/dockers/docker-sflow/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name sflow
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-snmp/supervisord.conf b/dockers/docker-snmp/supervisord.conf
index d1e6d09a8213..414445fdd6d6 100644
--- a/dockers/docker-snmp/supervisord.conf
+++ b/dockers/docker-snmp/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name snmp
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index 74bbc9241576..44508ce88138 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name restapi
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false
 
diff --git a/dockers/docker-sonic-telemetry/supervisord.conf b/dockers/docker-sonic-telemetry/supervisord.conf
index df1e6fa5a354..fa8c86f597c7 100644
--- a/dockers/docker-sonic-telemetry/supervisord.conf
+++ b/dockers/docker-sonic-telemetry/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name telemetry
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false
 
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
index 78549a7684f2..04432a31239a 100644
--- a/dockers/docker-teamd/supervisord.conf
+++ b/dockers/docker-teamd/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name teamd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/files/scripts/supervisor-proc-exit-listener b/files/scripts/supervisor-proc-exit-listener
index 143e539a1689..06e402bd4f6a 100755
--- a/files/scripts/supervisor-proc-exit-listener
+++ b/files/scripts/supervisor-proc-exit-listener
@@ -2,11 +2,14 @@
 
 import getopt
 import os
+import select
 import signal
 import sys
 import syslog
+import time
 
 import swsssdk
+
 from supervisor import childutils
 
 # Each line of this file should specify either one critical process or one
@@ -20,10 +23,18 @@ CRITICAL_PROCESSES_FILE = '/etc/supervisor/critical_processes'
 # The FEATURE table in config db contains auto-restart field
 FEATURE_TABLE_NAME = 'FEATURE'
 
-# Read the critical processes/group names from CRITICAL_PROCESSES_FILE
+# Value of parameter 'timeout' in select(...) method
+SELECT_TIMEOUT_SECS = 1.0
+
+# Alerting message will be written into syslog in the following interval
+ALERTING_INTERVAL_SECS = 60
 
 
 def get_critical_group_and_process_list():
+    """
+    @summary: Read the critical processes/group names from CRITICAL_PROCESSES_FILE.
+    @return: Two lists which contain critical processes and group names respectively.
+    """
     critical_group_list = []
     critical_process_list = []
 
@@ -49,6 +60,47 @@ def get_critical_group_and_process_list():
     return critical_group_list, critical_process_list
 
 
+def generate_alerting_message(process_name):
+    """
+    @summary: If a critical process was not running, this function will determine it resides in host
+              or in a specific namespace. Then an alerting message will be written into syslog.
+    """
+    namespace_prefix = os.environ.get("NAMESPACE_PREFIX")
+    namespace_id = os.environ.get("NAMESPACE_ID")
+
+    if not namespace_prefix or not namespace_id:
+        namespace = "host"
+    else:
+        namespace = namespace_prefix + namespace_id
+
+    syslog.syslog(syslog.LOG_ERR, "Process '{}' is not running in namespace '{}'.".format(process_name, namespace))
+
+
+def get_autorestart_state(container_name):
+    """
+    @summary: Read the status of auto-restart feature from Config_DB.
+    @return: Return the status of auto-restart feature.
+    """
+    config_db = swsssdk.ConfigDBConnector()
+    config_db.connect()
+    features_table = config_db.get_table(FEATURE_TABLE_NAME)
+    if not features_table:
+        syslog.syslog(syslog.LOG_ERR, "Unable to retrieve features table from Config DB. Exiting...")
+        sys.exit(2)
+
+    if container_name not in features_table:
+        syslog.syslog(syslog.LOG_ERR, "Unable to retrieve feature '{}'. Exiting...".format(container_name))
+        sys.exit(3)
+
+    is_auto_restart = features_table[container_name].get('auto_restart')
+    if not is_auto_restart:
+        syslog.syslog(
+            syslog.LOG_ERR, "Unable to determine auto-restart feature status for '{}'. Exiting...".format(container_name))
+        sys.exit(4)
+
+    return is_auto_restart
+
+
 def main(argv):
     container_name = None
     opts, args = getopt.getopt(argv, "c:", ["container-name="])
@@ -62,51 +114,55 @@ def main(argv):
 
     critical_group_list, critical_process_list = get_critical_group_and_process_list()
 
+    process_under_alerting = {}
+    # Transition from ACKNOWLEDGED to READY
+    childutils.listener.ready()
+
     while True:
-        # Transition from ACKNOWLEDGED to READY
-        childutils.listener.ready()
-
-        line = sys.stdin.readline()
-        headers = childutils.get_headers(line)
-        payload = sys.stdin.read(int(headers['len']))
-
-        # Transition from READY to ACKNOWLEDGED
-        childutils.listener.ok()
-
-        # We only care about PROCESS_STATE_EXITED events
-        if headers['eventname'] == 'PROCESS_STATE_EXITED':
-            payload_headers, payload_data = childutils.eventdata(payload + '\n')
-
-            expected = int(payload_headers['expected'])
-            processname = payload_headers['processname']
-            groupname = payload_headers['groupname']
-
-            # Read the status of auto-restart feature from Config_DB.
-            config_db = swsssdk.ConfigDBConnector()
-            config_db.connect()
-            features_table = config_db.get_table(FEATURE_TABLE_NAME)
-            if not features_table:
-                syslog.syslog(syslog.LOG_ERR, "Unable to retrieve features table from Config DB. Exiting...")
-                sys.exit(2)
-
-            if container_name not in features_table:
-                syslog.syslog(syslog.LOG_ERR, "Unable to retrieve feature '{}'. Exiting...".format(container_name))
-                sys.exit(3)
-
-            restart_feature = features_table[container_name].get('auto_restart')
-            if not restart_feature:
-                syslog.syslog(
-                    syslog.LOG_ERR, "Unable to determine auto-restart feature status for '{}'. Exiting...".format(container_name))
-                sys.exit(4)
-
-            # If auto-restart feature is not disabled and at the same time
-            # a critical process exited unexpectedly, terminate supervisor
-            if (restart_feature != 'disabled' and expected == 0 and
-                    (processname in critical_process_list or groupname in critical_group_list)):
-                MSG_FORMAT_STR = "Process {} exited unxepectedly. Terminating supervisor..."
-                msg = MSG_FORMAT_STR.format(payload_headers['processname'])
-                syslog.syslog(syslog.LOG_INFO, msg)
-                os.kill(os.getppid(), signal.SIGTERM)
+        file_descriptor_list = select.select([sys.stdin], [], [], SELECT_TIMEOUT_SECS)[0]
+        if len(file_descriptor_list) > 0:
+            line = file_descriptor_list[0].readline()
+            headers = childutils.get_headers(line)
+            payload = sys.stdin.read(int(headers['len']))
+
+            # Handle the PROCESS_STATE_EXITED event
+            if headers['eventname'] == 'PROCESS_STATE_EXITED':
+                payload_headers, payload_data = childutils.eventdata(payload + '\n')
+
+                expected = int(payload_headers['expected'])
+                process_name = payload_headers['processname']
+                group_name = payload_headers['groupname']
+
+                if (process_name in critical_process_list or group_name in critical_group_list) and expected == 0:
+                    is_auto_restart = get_autorestart_state(container_name)
+                    if is_auto_restart != "disabled":
+                        MSG_FORMAT_STR = "Process '{}' exited unexpectedly. Terminating supervisor '{}'"
+                        msg = MSG_FORMAT_STR.format(payload_headers['processname'], container_name)
+                        syslog.syslog(syslog.LOG_INFO, msg)
+                        os.kill(os.getppid(), signal.SIGTERM)
+                    else:
+                        process_under_alerting[process_name] = time.time()
+
+            # Handle the PROCESS_STATE_RUNNING event
+            elif headers['eventname'] == 'PROCESS_STATE_RUNNING':
+                payload_headers, payload_data = childutils.eventdata(payload + '\n')
+                process_name = payload_headers['processname']
+
+                if process_name in process_under_alerting:
+                    process_under_alerting.pop(process_name)
+
+            # Transition from BUSY to ACKNOWLEDGED
+            childutils.listener.ok()
+
+            # Transition from ACKNOWLEDGED to READY
+            childutils.listener.ready()
+
+        # Check whether we need write alerting messages into syslog
+        for process in process_under_alerting.keys():
+            epoch_time = time.time()
+            if epoch_time - process_under_alerting[process] >= ALERTING_INTERVAL_SECS:
+                process_under_alerting[process] = epoch_time
+                generate_alerting_message(process)
 
 
 if __name__ == "__main__":
diff --git a/platform/barefoot/docker-syncd-bfn/supervisord.conf b/platform/barefoot/docker-syncd-bfn/supervisord.conf
index 39ea308277d7..c83484e5e93b 100644
--- a/platform/barefoot/docker-syncd-bfn/supervisord.conf
+++ b/platform/barefoot/docker-syncd-bfn/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
index a8e594c47aeb..5e801106972f 100644
--- a/platform/broadcom/docker-syncd-brcm/supervisord.conf
+++ b/platform/broadcom/docker-syncd-brcm/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
index 0c6285d46ae0..91b94a258033 100644
--- a/platform/cavium/docker-syncd-cavm/supervisord.conf
+++ b/platform/cavium/docker-syncd-cavm/supervisord.conf
@@ -5,7 +5,7 @@ nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/centec-arm64/docker-syncd-centec/supervisord.conf b/platform/centec-arm64/docker-syncd-centec/supervisord.conf
index 2cf6814ddaa9..10f406129d9c 100755
--- a/platform/centec-arm64/docker-syncd-centec/supervisord.conf
+++ b/platform/centec-arm64/docker-syncd-centec/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf
index 831b7256a43b..6df1893a0be0 100644
--- a/platform/centec/docker-syncd-centec/supervisord.conf
+++ b/platform/centec/docker-syncd-centec/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf b/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
index 2cf6814ddaa9..10f406129d9c 100644
--- a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
index c099bbccbf0f..e633b4fe115c 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/marvell/docker-syncd-mrvl/supervisord.conf b/platform/marvell/docker-syncd-mrvl/supervisord.conf
index 85442933cf8e..94be9dd268f6 100644
--- a/platform/marvell/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell/docker-syncd-mrvl/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
index 9311a255b0c8..8491d762bf51 100644
--- a/platform/mellanox/docker-syncd-mlnx/supervisord.conf
+++ b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/nephos/docker-syncd-nephos/supervisord.conf b/platform/nephos/docker-syncd-nephos/supervisord.conf
index a05bf7bfec73..955021ad2d51 100644
--- a/platform/nephos/docker-syncd-nephos/supervisord.conf
+++ b/platform/nephos/docker-syncd-nephos/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/vs/docker-gbsyncd-vs/supervisord.conf b/platform/vs/docker-gbsyncd-vs/supervisord.conf
index 3583ef6b5a8f..52267c8fa58f 100644
--- a/platform/vs/docker-gbsyncd-vs/supervisord.conf
+++ b/platform/vs/docker-gbsyncd-vs/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name gbsyncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/platform/vs/docker-syncd-vs/supervisord.conf b/platform/vs/docker-syncd-vs/supervisord.conf
index 7416f23a45e5..6a6d946632e0 100644
--- a/platform/vs/docker-syncd-vs/supervisord.conf
+++ b/platform/vs/docker-syncd-vs/supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index a213a2517866..dad758947f22 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index d5338b18cfa1..e2135d05296b 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -14,7 +14,7 @@ buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
-events=PROCESS_STATE_EXITED
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
 

From f00bb52f7c8589d8209466fee0a5465595cd043f Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 27 Jan 2021 09:34:03 -0800
Subject: [PATCH 0103/1674] [proc-exit-listener]: ignore blank lines

make proc-exit-listener more rebust

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 files/scripts/supervisor-proc-exit-listener | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/files/scripts/supervisor-proc-exit-listener b/files/scripts/supervisor-proc-exit-listener
index 06e402bd4f6a..4ac77298c78a 100755
--- a/files/scripts/supervisor-proc-exit-listener
+++ b/files/scripts/supervisor-proc-exit-listener
@@ -2,6 +2,7 @@
 
 import getopt
 import os
+import re
 import select
 import signal
 import sys
@@ -40,6 +41,9 @@ def get_critical_group_and_process_list():
 
     with open(CRITICAL_PROCESSES_FILE, 'r') as file:
         for line in file:
+            # ignore blank lines
+            if re.match(r"^\s*$", line)
+                continue
             line_info = line.strip(' \n').split(':')
             if len(line_info) != 2:
                 syslog.syslog(syslog.LOG_ERR,

From 89eb0c4a3c39f7cd8b348976727347f7312050cb Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 27 Jan 2021 09:34:46 -0800
Subject: [PATCH 0104/1674] [docker-fmp-frr]: remove blank lines in generated
 critical_process

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2 b/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
index 9a90a5c94eb8..69f4e8e6931e 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
@@ -7,6 +7,6 @@ program:bfdd
 program:ospfd
 program:pimd
 program:frrcfgd
-{% else %}
+{%- else %}
 program:bgpcfgd
-{% endif %}
+{%- endif %}

From afd30ee170e35f2ebb26cd5e96808050af9660f3 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Wed, 27 Jan 2021 21:55:18 -0800
Subject: [PATCH 0105/1674] [sonic-sairedis] advance submodule to include fix
 for syncd crash during shutdown (#6581)

Remove unregisterMessageHandler from NetMsgRegistrar thread (#779)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 20b9573437f3..b1edaef48f01 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 20b9573437f3194c5281f28922ab5d5d8a913e4e
+Subproject commit b1edaef48f01c24f5dc9f66d79ac143dcbcd89e3

From cb79de1b122b886ab61921c1356a38a4f0dd0a66 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 28 Jan 2021 02:21:38 -0800
Subject: [PATCH 0106/1674] [build]: stop prompt during build (#6585)

Some commands used during build will prompt user interactively, but this is not expected during build. Since most output is collected into log file, user could not see the prompt and feel the build process hangs.

- How I did it

Use mv command in non interactive mode
Redirect stdin to null if command output is collected into log file.
---
 rules/functions | 2 +-
 slave.mk        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/functions b/rules/functions
index 35b63aeabaf7..c6caebe82858 100644
--- a/rules/functions
+++ b/rules/functions
@@ -48,7 +48,7 @@ log_green = echo -e "$(GREEN)$(1)$(GRAY)"
 FLUSH_LOG = rm -f $@.log
 
 LOG_SIMPLE = &>> $(PROJECT_ROOT)/$@.log || { [ $$? -eq 0 ] || pushd $(PROJECT_ROOT) > /dev/null ; ./update_screen.sh -e $@ ; popd > /dev/null ; false ; }
-LOG = |& $(PROJECT_ROOT)/scripts/process_log.sh $(PROCESS_LOG_OPTION) &>> $(PROJECT_ROOT)/$@.log ; test $${PIPESTATUS[-2]} -eq 0 || { [ $$? -eq 0 ] || pushd $(PROJECT_ROOT) > /dev/null ; ./update_screen.sh -e $@ ; popd > /dev/null ; false ; }
+LOG = < /dev/null |& $(PROJECT_ROOT)/scripts/process_log.sh $(PROCESS_LOG_OPTION) &>> $(PROJECT_ROOT)/$@.log ; test $${PIPESTATUS[-2]} -eq 0 || { [ $$? -eq 0 ] || pushd $(PROJECT_ROOT) > /dev/null ; ./update_screen.sh -e $@ ; popd > /dev/null ; false ; }
 
 ###############################################################################
 ## Header and footer for each target
diff --git a/slave.mk b/slave.mk
index 775e566a1532..efe26a85f1a2 100644
--- a/slave.mk
+++ b/slave.mk
@@ -471,7 +471,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		# Clean up
 		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
 		# Take built package(s)
-		mv $(addprefix $($*_SRC_PATH)/../, $* $($*_DERIVED_DEBS) $($*_EXTRA_DEBS)) $(DEBS_PATH) $(LOG)
+		mv -f $(addprefix $($*_SRC_PATH)/../, $* $($*_DERIVED_DEBS) $($*_EXTRA_DEBS)) $(DEBS_PATH) $(LOG)
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)
@@ -572,7 +572,7 @@ $(addprefix $(PYTHON_DEBS_PATH)/, $(SONIC_PYTHON_STDEB_DEBS)) : $(PYTHON_DEBS_PA
 		# Clean up
 		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
 		# Take built package(s)
-		mv $(addprefix $($*_SRC_PATH)/deb_dist/, $* $($*_DERIVED_DEBS)) $(PYTHON_DEBS_PATH) $(LOG)
+		mv -f $(addprefix $($*_SRC_PATH)/deb_dist/, $* $($*_DERIVED_DEBS)) $(PYTHON_DEBS_PATH) $(LOG)
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)
@@ -609,7 +609,7 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
 		# clean up
 		if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then quilt pop -a -f; [ -d .pc ] && rm -rf .pc; fi
 		popd $(LOG_SIMPLE)
-		mv $($*_SRC_PATH)/dist/$* $(PYTHON_WHEELS_PATH) $(LOG)
+		mv -f $($*_SRC_PATH)/dist/$* $(PYTHON_WHEELS_PATH) $(LOG)
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)

From 03b26d4329d85d2d3d3468ad4bb90c83cd385d11 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 2 Feb 2021 11:41:14 -0800
Subject: [PATCH 0107/1674] [submodule][202012]: Update sonic-utiliies
 submodule (#6635)

* c2fb282 2021-01-29 | [ecnconfig] Allow ecn unit test to run without sudo (#1390) [Neetha John]
* 6cc635b 2021-01-29 | [sonic-installer] Add information to syslog (#1369) [Dmytro]
* 7a8024a 2021-01-27 | Prevent user from adding more then a single untagged VLAN to an interface (#1382) [Eran Dahan]
* 41e62c6 2021-01-26 | [pcieutil] Add 'pcie-aer' sub-command to display AER stats (#1169) [Arun Saravanan Balachandran]
* 47f412b 2021-01-26 | Improve robustness of consutil plugin loading (#1353) [Samuel Angebault]
* 64aa1b8 2021-01-25 | [show] Fix warnings, related to gearbox, while show commands execution (#1343) [maksymbelei95]
* ff226d0 2021-01-25 | Prevent configuring IP interface on a port which is a member of VLAN (#1374) [Eran Dahan]
* f1522b9 2021-01-21 | [config_mgmt.py]: Set leaf-list to empty list while port breakout. (#1268) [Praveen Chaudhary]
* 99c05d5 2021-01-21 | add vlan_intf_object only if there are ipv4 or ipv6 mappings (#1377) [Sumukha Tumkur Vani]
* b082684 2021-01-21 | [ecn] Add tests for ecnconfig command (#1372) [Neetha John]
* 23e0920 2021-01-21 | [sfpshow] Enhance QSFP-DD DOM information (#1207) [shlomibitton]
* f4edba1 2021-01-20 | [ecnconfig] handle backend port names when extracting port I/F ID from the port name (#1361) [Mahesh Maddikayala]

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 37695c83cf86..c2fb28254c1e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 37695c83cf86b7a163fcf2ffef949b116fe9d2b9
+Subproject commit c2fb28254c1e35a3c7a85a3baaf1c05a4afcd9fe

From d146079362c5e01e2558fe507f378027f6d1835c Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 28 Jan 2021 09:44:43 -0800
Subject: [PATCH 0108/1674] [docker-sonic-vs] Install sonic-platform-common
 package (#6587)

**- Why I did it**

sonic-utilities will become dependent upon sonic-platform-common as of https://github.com/Azure/sonic-utilities/pull/1386.

**- How I did it**

- Add sonic-platform-common as a dependency in docker-sonic-vs.mk
- Additionally, no longer install Python 2 packages of swsssdk and sonic-py-common, as they should no longer be needed.
---
 platform/vs/docker-sonic-vs.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index 7b82fce71ee0..c48c8f12c704 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -18,10 +18,9 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
 
 # swsssdk is a dependency of sonic-py-common
 # TODO: sonic-py-common should depend on swsscommon instead
-$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SWSSSDK_PY2) \
-                                    $(SWSSSDK_PY3) \
-                                    $(SONIC_PY_COMMON_PY2) \
+$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SWSSSDK_PY3) \
                                     $(SONIC_PY_COMMON_PY3) \
+                                    $(SONIC_PLATFORM_COMMON_PY3) \
                                     $(SONIC_YANG_MODELS_PY3) \
                                     $(SONIC_YANG_MGMT_PY3) \
                                     $(SONIC_UTILITIES_PY3) \

From 8f8520eac8ee9a1607775e3237a7077b8b105b8d Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 28 Jan 2021 10:46:56 -0800
Subject: [PATCH 0109/1674] Bump pyyaml from 5.3.1 to 5.4.1 (#6511)

RCE resolved in new version https://github.com/yaml/pyyaml/issues/420
---
 sonic-slave-buster/Dockerfile.j2      | 4 ++--
 src/sonic-bgpcfgd/setup.py            | 2 +-
 src/sonic-config-engine/setup.py      | 2 +-
 src/sonic-frr-mgmt-framework/setup.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index b8234e19d01b..6b0c347d31e7 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -412,8 +412,8 @@ RUN pip3 uninstall -y enum34
 RUN pip2 install j2cli==0.3.10
 
 # For sonic-mgmt-framework
-RUN pip2 install "PyYAML==5.3.1"
-RUN pip3 install "PyYAML==5.3.1"
+RUN pip2 install "PyYAML==5.4.1"
+RUN pip3 install "PyYAML==5.4.1"
 RUN pip2 install "lxml==4.6.2"
 RUN pip3 install "lxml==4.6.2"
 
diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py
index d6290bccb2b3..ab86ca20ec19 100755
--- a/src/sonic-bgpcfgd/setup.py
+++ b/src/sonic-bgpcfgd/setup.py
@@ -17,7 +17,7 @@
     install_requires = [
         'jinja2>=2.10',
         'netaddr==0.8.0',
-        'pyyaml==5.3.1',
+        'pyyaml==5.4.1',
     ],
     setup_requires = [
         'pytest-runner',
diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index c9dfd3609b92..d167e0566438 100644
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -9,7 +9,7 @@
     'ipaddress==1.0.23',
     'lxml==4.6.2',
     'netaddr==0.8.0',
-    'pyyaml==5.3.1',
+    'pyyaml==5.4.1',
     'sonic-py-common',
 ]
 
diff --git a/src/sonic-frr-mgmt-framework/setup.py b/src/sonic-frr-mgmt-framework/setup.py
index d8681d1bbd88..d3c9f1dae173 100755
--- a/src/sonic-frr-mgmt-framework/setup.py
+++ b/src/sonic-frr-mgmt-framework/setup.py
@@ -14,7 +14,7 @@
     install_requires = [
         'jinja2>=2.10',
         'netaddr==0.8.0',
-        'pyyaml==5.3.1',
+        'pyyaml==5.4.1',
         'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2
     ],
     setup_requires = [

From 197f75a246e143cbf89e4cf743079e734f24366a Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Thu, 28 Jan 2021 23:12:01 -0800
Subject: [PATCH 0110/1674] [multi asic] add ip netns identify command to
 sudoer (#6591)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>

- Why I did it
The command sudo ip netns identify <pid> is used in function get_current_namespace
to check in the cli command is running in host context or within a namespace.

This function is used for every CLI command and command sudo ip netns identify <pid> needs to be added in sudoer files to allow users with RO access to run show cli commands

This problem is not there on single asic platforms.

- How I did it
Add ip netns identify [0-9]* to sudoers file.
---
 files/image_config/sudoers/sudoers | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 4c2e684b4b1f..9a7902704194 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -35,7 +35,9 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/local/bin/lldpshow, \
                                  /usr/local/bin/psuutil *, \
                                  /usr/local/bin/sonic-installer list, \
-                                 /usr/local/bin/sfputil show *
+                                 /usr/local/bin/sfputil show *, \
+                                 /bin/ip netns identify [0-9]*
+                                 
 
 Cmnd_Alias      PASSWD_CMDS = /usr/local/bin/config tacacs passkey *, \
                               /usr/sbin/chpasswd *

From bf16cb473f72c9b6d493cedf7d48b179395db8f0 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 29 Jan 2021 02:08:56 -0800
Subject: [PATCH 0111/1674] Revert "[build]: disable unit tests for
 sonic-utilities" (#6598)

This reverts commit 470ed18a6bc2ab752ec1f929296f346f15aa0ae5.
---
 rules/sonic-utilities.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk
index 41d785b06283..7119b4b98eb0 100644
--- a/rules/sonic-utilities.mk
+++ b/rules/sonic-utilities.mk
@@ -13,5 +13,4 @@ $(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \
                                       $(LIBYANG_PY3) \
                                       $(LIBSWSSCOMMON) \
                                       $(PYTHON3_SWSSCOMMON)
-$(SONIC_UTILITIES_PY3)_TEST = n
 SONIC_PYTHON_WHEELS += $(SONIC_UTILITIES_PY3)

From 24d785a64de3962863989af70f9823c0b6556a63 Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Fri, 29 Jan 2021 08:16:32 -0800
Subject: [PATCH 0112/1674] [baseimage]: add docker ps to the sudoer file
 (#6604)

fixes Azure/sonic-utilities#1389

With the recent changes in sudoer files. The  show commands fails for the read-only users.
The problem here is the 'docker ps' is failing in the function [get_routing_stack()](https://github.com/Azure/sonic-utilities/blob/8a1109ed30576f0287fcd98a4349617f7fb55700/show/main.py#L54) therefore all the CLI commands are failing.

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
---
 files/image_config/sudoers/sudoers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 9a7902704194..aa03eda13719 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -25,6 +25,7 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/bin/docker exec bgp cat /etc/quagga/bgpd.conf, \
                                  /usr/bin/docker images *, \
                                  /usr/bin/docker ps *, \
+                                 /usr/bin/docker ps, \
                                  /usr/bin/lldpctl, \
                                  /usr/bin/sensors, \
                                  /usr/bin/tail -F /var/log/syslog, \

From cb536556e65f3354afa17556884c6f65c7cb195c Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Fri, 29 Jan 2021 10:24:24 -0800
Subject: [PATCH 0113/1674] [build_debian.sh] Freeze pip2 < version 21 (#6597)

**- Why I did it**

As per https://pypi.org/project/pip/ pip 21.0 does not not support Python 2 from Jan 2021. Most places in the codebase have already been pinned, but this one was missed.

**- How I did it**

Pin pip2 < version 21 in build_debian.sh
---
 build_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index 53ac934bd357..19ee92b8620d 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -418,7 +418,7 @@ done < files/image_config/sysctl/sysctl-net.conf
 sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
 
 # Upgrade pip via PyPI and uninstall the Debian version
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install --upgrade pip
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install --upgrade 'pip<21'
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install --upgrade pip
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-pip python3-pip
 

From 5fcb86f77083f21052b08c275eb18871d6e61bba Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:32:27 -0500
Subject: [PATCH 0114/1674] [submodule] update sonic-sairedis (#6609)

This update includes the following changes

  > [syncd armhf] Fix syncd crash when running community test suites (#777)
  > Revert "[tests]:Add unittest for MACsec on p2p establishment (#771)"
  > [tests]:Add unittest for MACsec on p2p establishment (#771)
  > [tests] Enable azure pipeline make check to respect unittests (#760)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index b1edaef48f01..817a01e4bfa2 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit b1edaef48f01c24f5dc9f66d79ac143dcbcd89e3
+Subproject commit 817a01e4bfa25d701727d1750989d5cd9f1bbcb3

From 3e70b973427b433586196d77a2e493b0c435a021 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Sat, 30 Jan 2021 03:29:37 +0200
Subject: [PATCH 0115/1674] [barefoot][platform] platform API 2.0 fixes (#6607)

To improve python3 support of berefoot's sonic_platform

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/eeprom.py                          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
index df24172709d3..a98a6bc1d45a 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
@@ -17,7 +17,7 @@
     from sonic_eeprom import eeprom_base
     from sonic_eeprom import eeprom_tlvinfo
 
-    from .platform_thrift_client import thrift_try
+    from platform_thrift_client import thrift_try
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
@@ -64,6 +64,11 @@
 EEPROM_SYMLINK = "/var/run/platform/eeprom/syseeprom"
 EEPROM_STATUS = "/var/run/platform/eeprom/status"
 
+try:
+    _str_type = basestring
+except NameError:
+    _str_type = str
+
 class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self):
 
@@ -101,7 +106,7 @@ def eeprom_parse(self):
         f.close()
 
         eeprom_params = ""
-        for attr, val in self.eeprom.__dict__.iteritems():
+        for attr, val in self.eeprom.__dict__.items():
             if val is None:
                 continue
 
@@ -109,7 +114,7 @@ def eeprom_parse(self):
             if elem is None:
                 continue
 
-            if isinstance(val, basestring):
+            if isinstance(val, _str_type):
                 value = val.replace('\0', '')
             else:
                 value = str(val)

From 56a689cf303e0bcdd40da6e071e64c96a39166ff Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sat, 30 Jan 2021 05:28:33 -0800
Subject: [PATCH 0116/1674] [broadcom]: Fix BRCM Syncd
 Error:syncd#/supervisord: syncd sh: 1: ethtool: not found (#6615)

Starting with BRCM SAI 4.3.1.5 we see the following :ethtool not fount" error in syslog during boot up:
```
Jan 27 07:36:14.712472 str-s6100-acs-1 INFO syncd#/supervisord: syncd sh: 1:
Jan 27 07:36:14.712844 str-s6100-acs-1 INFO syncd#/supervisord: syncd ethtool: not found
Jan 27 07:36:14.713228 str-s6100-acs-1 INFO syncd#/supervisord: syncd #015
Jan 27 07:36:14.713840 str-s6100-acs-1 INFO syncd#syncd: [0] SAI_API_HOSTIF:_brcm_sai_hostif_speed_set:11894 cmd ethtool -s Ethernet39 speed 40000 rc:32512
Jan 27 07:36:14.717204 str-s6100-acs-1 NOTICE swss#orchagent: :- setHostIntfsOperStatus: Set operation status DOWN to host interface Ethernet39
Jan 27 07:36:14.717204 str-s6100-acs-1 NOTICE swss#orchagent: :- initPort: Initialized port Ethernet39
Jan 27 07:36:14.717204 str-s6100-acs-1 NOTICE swss#orchagent: :- initializePort: Initializing port alias:Ethernet36 pid:1000000000040
Jan 27 07:36:14.726793 str-s6100-acs-1 NOTICE swss#portsyncd: :- onMsg: nlmsg type:16 key:Ethernet36 admin:0 oper:0 addr:4c:76:25:f5:48:80 ifindex:75 master:0
Jan 27 07:36:14.727967 str-s6100-acs-1 NOTICE swss#portsyncd: :- onMsg: Publish Ethernet36(ok) to state db
Jan 27 07:36:14.729331 str-s6100-acs-1 NOTICE swss#orchagent: :- addHostIntfs: Create host interface for port Ethernet36
Jan 27 07:36:14.752398 str-s6100-acs-1 INFO syncd#/supervisord: syncd sh: 1: ethtool: not found#015
Jan 27 07:36:14.752689 str-s6100-acs-1 INFO syncd#syncd: [0] SAI_API_HOSTIF:_brcm_sai_hostif_speed_set:11894 cmd ethtool -s Ethernet36 speed 40000 rc:32512
Jan 27 07:36:14.756050 str-s6100-acs-1 NOTICE swss#orchagent: :- setHostIntfsOperStatus: Set operation status DOWN to host interface Ethernet36
Jan 27 07:36:14.757585 str-s6100-acs-1 NOTICE swss#orchagent: :- initPort: Initialized port Ethernet36
```
It seems that starting with BRCM SAI 4.2.1.5 syncd is using ethtool to set the host interface speed and since this ethtool was not part of the syncd Docker, we observe these "ethtool not found" issue.
---
 platform/broadcom/docker-syncd-brcm/Dockerfile.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
index cf597df680de..0ba71bb5d780 100755
--- a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
@@ -21,6 +21,9 @@ debs/
 ## TODO: add kmod into Depends
 RUN apt-get install -yf kmod
 
+## BRCM uses ethtool to set host interface speed
+RUN apt-get install -y ethtool
+
 COPY ["files/dsserve", "files/bcmcmd", "start.sh", "start_led.sh", "bcmsh", "/usr/bin/"]
 RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd
 

From 47002230a2fe31c41b3175c06a36f2b80fa22cca Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 31 Jan 2021 15:06:36 +0800
Subject: [PATCH 0117/1674] Check fan speed before check fan status (#6586)

**- Why I did it**
In thermalctd, when speed of fan exceeds threshold, the fan status will be saved as "bad". So in system health, it is better to check fan speed before fan status. In this case, if fan speed exceeds threshold, we get more detailed information.

**- How I did it**
Move fan speed check logic before fan status check

**- How to verify it**
Manual test
---
 src/system-health/health_checker/hardware_checker.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/system-health/health_checker/hardware_checker.py b/src/system-health/health_checker/hardware_checker.py
index cf5b86bea2be..7bbc4bdaca00 100644
--- a/src/system-health/health_checker/hardware_checker.py
+++ b/src/system-health/health_checker/hardware_checker.py
@@ -89,11 +89,6 @@ def _check_fan_status(self, config):
                 self.set_object_not_ok('Fan', name, '{} is missing'.format(name))
                 continue
 
-            status = data_dict.get('status', 'false')
-            if status.lower() != 'true':
-                self.set_object_not_ok('Fan', name, '{} is broken'.format(name))
-                continue
-
             if not self._ignore_check(config.ignore_devices, 'fan', name, 'speed'):
                 speed = data_dict.get('speed', None)
                 speed_target = data_dict.get('speed_target', None)
@@ -130,6 +125,11 @@ def _check_fan_status(self, config):
                                                    speed_tolerance))
                         continue
 
+            status = data_dict.get('status', 'false')
+            if status.lower() != 'true':
+                self.set_object_not_ok('Fan', name, '{} is broken'.format(name))
+                continue
+
             self.set_object_ok('Fan', name)
 
     def _check_psu_status(self, config):

From bf8a76634c9be7ce519c61402e11cdfc50b6e3c3 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sun, 31 Jan 2021 15:11:33 +0800
Subject: [PATCH 0118/1674] [syncd-rpc docker] Fix issue: ptf_nn_agent isn't
 able to start in syncd-rpc docker on buster (#6448)

- Why I did it
Fix issue: ptf_nn_agent isn't able to start in syncd-rpc docker on buster.

- How I did it
The issue is fixed by installing python-dev, cffi and nnpy for python 2 explicitly.

- How to verify it
Run copp test on RPC image.
---
 platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2      | 8 +++++---
 platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2     | 8 +++++---
 .../centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2    | 8 +++++---
 platform/centec/docker-syncd-centec-rpc/Dockerfile.j2     | 8 +++++---
 platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2     | 8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
index f3c9979dfa63..cf89b26b65e5 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
+++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -38,9 +39,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
index f68fbb661d9c..ada6113ddf43 100644
--- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
index d6719b224abd..057d93efb6bb 100755
--- a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
index d6719b224abd..057d93efb6bb 100644
--- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
index e35c6582d2d0..b9aaa78118e0 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -29,6 +29,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -45,9 +46,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy    \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \

From c4c70d3a28297584a8c0ef7ab23f66877bba7fd8 Mon Sep 17 00:00:00 2001
From: guxianghong <gxh2001757@163.com>
Date: Mon, 1 Feb 2021 09:30:30 +0800
Subject: [PATCH 0119/1674] [arm64] disable snmp's parallel make (#6592)

snmpd's compile is always failed with file truncated on ARM64 arch, the error log is like "/usr/bin/ld: mibgroup/ip-forward-mib/inetCidrRouteTable/.libs/inetCidrRouteTable_interface.o: file not recognized: file truncated"

Co-authored-by: Xianghong Gu <xgu@centecnetworks.com>
---
 src/snmpd/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile
index b66af241e5c5..2e0ac828169c 100644
--- a/src/snmpd/Makefile
+++ b/src/snmpd/Makefile
@@ -29,7 +29,11 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg init
 	stg import -s ../patch-$(SNMPD_VERSION)/series
 
+ifeq ($(CONFIGURED_ARCH), arm64)
+	dpkg-buildpackage -rfakeroot -b -d -us -uc -j1 --admindir $(SONIC_DPKG_ADMINDIR)
+else
 	dpkg-buildpackage -rfakeroot -b -d -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+endif
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/

From 1ff264b31c5e92e6ff7a110f831665552efc9887 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Mon, 1 Feb 2021 12:02:37 -0800
Subject: [PATCH 0120/1674] [frr]: upgrade frr to frr-7.5-s2 tag (#6628)

pick-up upstream fixes. important ones

- bgpd: Removing "neighbor <peer-group> allowas-in"

complete lists

*   6b2b5cce3 2021-01-29 | Merge pull request #7977 from ton31337/fix/allowas_in_reset_value_7.5 (HEAD -> frr/7.5, tag: frr-7.5-s2, upstream/stable/7.5, origin/frr/7.5, stable/7.5) [Donald Sharp]
|\
| * f403534df 2021-01-28 | bgpd: Removing "neighbor <peer-group> allowas-in" [Kishore Kunal]
* |   86e2f106c 2021-01-28 | Merge pull request #7962 from ton31337/fix/bgpd_validate_community_7.5 [Donald Sharp]
|\ \
| |/
|/|
| * e182af45c 2021-01-05 | bgpd: separate lcommunity validation from tokenizer [Wesley Coakley]
| * 2cf37d594 2020-12-30 | bgpd: Validate community list if they are not malformed [Donatas Abraitis]
|/
*   a4af08a19 2021-01-22 | Merge pull request #7912 from idryzhov/7.5-backports-2021-01 [Donald Sharp]
|\
| * 160021013 2021-01-12 | bgpd : multiple memory leak fixes in show commands [Sarita Patra]
| * 46a2b560f 2021-01-19 | tools: fix frr-reload BFD profile support [Rafael Zalamena]
| * 7f6c81fca 2020-12-02 | ospfd: fix area removal at interface level [ckishimo]
| * f7db4dfb1 2021-01-08 | bfdd: update vrf of received packet [Philippe Guibert]
| * 4d470f3ef 2021-01-08 | bfdd: enable bfd session if vrf interface available [Philippe Guibert]
| * c656985fb 2021-01-08 | bfdd: socket should be bound to vrf interface by default [Philippe Guibert]
| * f30c002b8 2021-01-15 | bgpd: Allow peer-groups to have `ttl-security hops` configured [Donald Sharp]
| * 85ff76513 2021-01-15 | configure.ac: Correct library name for sysrepo [Bo Zhang]
| * d00c543f1 2020-12-04 | bgpd: Handle IPv6 prefixes with IPv4 nexthops for zebra [Donatas Abraitis]
| * 87b9b2973 2021-01-06 | zebra: zebra route-map delay-timer is global not per vrf [Donald Sharp]
| * 91e1adec9 2021-01-05 | bgpd: Fix default-originate clearing from peer-groups. [zyxwvu Shi]
| * 0f2f32fa1 2021-01-05 | isisd: When last area address is removed, resign if we were DR [Karen Schoener]
| * 842e99d49 2021-01-02 | vrrpd.yang bug fix: modify augment path to comply with rfc 7950 [Bo Zhang]
| * 9616ef937 2020-12-24 | ospfd: fix no show database output when selecting vrf [Louis Scalbert]
| * 4c4764e36 2020-11-30 | ospf6d: ospfv3 disable on the interface, but interface prefix still shown in the output [Yash Ranjan]
| * 1870dbd86 2020-12-14 | ospf6d: Link LSA is not updated when router priority is modified [Mobashshera Rasool]
| * 4883a06c3 2020-12-10 | bgpd: fix evpn route-map vni filter at origin [Chirag Shah]
|/
*   9c087052a 2021-01-15 | Merge pull request #7877 from vishaldhingra/static_7_5 [Mark Stapp]
|\
| * a687b6b27 2021-01-15 | staticd: Backend cofiguration code to fix table-id problem [vdhingra]
| * 52370b494 2021-01-15 | staticd: autogenerated code modifications due to yang changes [vdhingra]
| * f9d6511f2 2021-01-15 | staticd: make table-id as the key for path-list [vdhingra]
|/

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/frr.mk      | 2 +-
 src/sonic-frr/frr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index 7572beb3b06c..bb6a96a61fa4 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -3,7 +3,7 @@
 FRR_VERSION = 7.5
 FRR_SUBVERSION = 0
 FRR_BRANCH = frr/7.5
-FRR_TAG = frr-7.5-s1
+FRR_TAG = frr-7.5-s2
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
index 4ed6312d10d3..6b2b5cce3557 160000
--- a/src/sonic-frr/frr
+++ b/src/sonic-frr/frr
@@ -1 +1 @@
-Subproject commit 4ed6312d10d369f621f69202ad39cfa6a597c59c
+Subproject commit 6b2b5cce3557a383942fc194257da77e4e5270e4

From 30b526d1945a23caf7ce96ca7c84287d377ef726 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Mon, 1 Feb 2021 21:12:41 -0800
Subject: [PATCH 0121/1674] [Bgpcfgd] Add unit tests (#6634)

Add unit tests for bgpcfgd and fix a minor bug in manager_intf.py found in testing
---
 src/sonic-bgpcfgd/bgpcfgd/managers_intf.py |   2 +-
 src/sonic-bgpcfgd/tests/test_bgp.py        | 111 +++++++++++++++++++++
 src/sonic-bgpcfgd/tests/test_db.py         |  40 ++++++++
 src/sonic-bgpcfgd/tests/test_directory.py  |  57 +++++++++++
 src/sonic-bgpcfgd/tests/test_frr.py        |  68 ++++++++++++-
 src/sonic-bgpcfgd/tests/test_intf.py       |  52 ++++++++++
 src/sonic-bgpcfgd/tests/test_setsrc.py     |  62 ++++++++++++
 7 files changed, 388 insertions(+), 4 deletions(-)
 create mode 100644 src/sonic-bgpcfgd/tests/test_bgp.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_db.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_directory.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_intf.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_setsrc.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_intf.py b/src/sonic-bgpcfgd/bgpcfgd/managers_intf.py
index ef4958ad9207..c633c43046e0 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_intf.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_intf.py
@@ -30,7 +30,7 @@ def set_handler(self, key, data):
             try:
                 network = netaddr.IPNetwork(str(network_str))
             except (netaddr.NotRegisteredError, netaddr.AddrFormatError, netaddr.AddrConversionError):
-                log_warn("Subnet '%s' format is wrong for interface '%s'" % (network_str, data["interface"]))
+                log_warn("Subnet '%s' format is wrong for interface '%s'" % (network_str, interface_name))
                 return True
             data["interface"] = interface_name
             data["prefixlen"] = str(network.prefixlen)
diff --git a/src/sonic-bgpcfgd/tests/test_bgp.py b/src/sonic-bgpcfgd/tests/test_bgp.py
new file mode 100644
index 000000000000..8cbd51c90a4f
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_bgp.py
@@ -0,0 +1,111 @@
+from unittest.mock import MagicMock, patch
+
+import os
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from . import swsscommon_test
+from .util import load_constants
+from swsscommon import swsscommon
+import bgpcfgd.managers_bgp
+
+TEMPLATE_PATH = os.path.abspath('../../dockers/docker-fpm-frr/frr')
+
+def constructor():
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(TEMPLATE_PATH),
+        'constants': load_constants()['constants']
+    }
+
+    return_value_map = {
+        "['vtysh', '-c', 'show bgp vrfs json']": (0, "{\"vrfs\": {\"default\": {}}}", ""),
+        "['vtysh', '-c', 'show bgp vrf default neighbors json']": (0, "{\"10.10.10.1\": {}, \"20.20.20.1\": {}, \"fc00:10::1\": {}}", "")
+    }
+
+    bgpcfgd.managers_bgp.run_command = lambda cmd: return_value_map[str(cmd)]
+    m = bgpcfgd.managers_bgp.BGPPeerMgrBase(common_objs, "CONFIG_DB", swsscommon.CFG_BGP_NEIGHBOR_TABLE_NAME, "general", True)
+    assert m.peer_type == "general"
+    assert m.check_neig_meta == False # Because constants['bgp']['use_neighbors_meta'] is false in constants.yml
+
+    m.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
+    m.directory.put("CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME, "Loopback0|11.11.11.11/32", {})
+    m.directory.put("CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME, "Loopback0|FC00:1::32/128", {})
+    m.directory.put("LOCAL", "local_addresses", "30.30.30.30", {"interface": "Ethernet4|30.30.30.30/24"})
+    m.directory.put("LOCAL", "local_addresses", "fc00:20::20", {"interface": "Ethernet8|fc00:20::20/96"})
+    m.directory.put("LOCAL", "interfaces", "Ethernet4|30.30.30.30/24", {"anything": "anything"})
+    m.directory.put("LOCAL", "interfaces", "Ethernet8|fc00:20::20/96", {"anything": "anything"})
+
+    return m
+
+@patch('bgpcfgd.managers_bgp.log_info')
+def test_update_peer_up(mocked_log_info): 
+    m = constructor()
+    res = m.set_handler("10.10.10.1", {"admin_status": "up"})
+    assert res, "Expect True return value for peer update"
+    mocked_log_info.assert_called_with("Peer 'default|10.10.10.1' admin state is set to 'up'")
+
+@patch('bgpcfgd.managers_bgp.log_info')
+def test_update_peer_up_ipv6(mocked_log_info): 
+    m = constructor()
+    res = m.set_handler("fc00:10::1", {"admin_status": "up"})
+    assert res, "Expect True return value for peer update"
+    mocked_log_info.assert_called_with("Peer 'default|fc00:10::1' admin state is set to 'up'")
+
+@patch('bgpcfgd.managers_bgp.log_info')
+def test_update_peer_down(mocked_log_info): 
+    m = constructor()
+    res = m.set_handler("10.10.10.1", {"admin_status": "down"})
+    assert res, "Expect True return value for peer update"
+    mocked_log_info.assert_called_with("Peer 'default|10.10.10.1' admin state is set to 'down'")
+
+@patch('bgpcfgd.managers_bgp.log_err')
+def test_update_peer_no_admin_status(mocked_log_err):
+    m = constructor()
+    res = m.set_handler("10.10.10.1", {"anything": "anything"})
+    assert res, "Expect True return value for peer update"
+    mocked_log_err.assert_called_with("Peer '(default|10.10.10.1)': Can't update the peer. Only 'admin_status' attribute is supported")
+
+@patch('bgpcfgd.managers_bgp.log_err')
+def test_update_peer_invalid_admin_status(mocked_log_err):
+    m = constructor()
+    res = m.set_handler("10.10.10.1", {"admin_status": "invalid"})
+    assert res, "Expect True return value for peer update"
+    mocked_log_err.assert_called_with("Peer 'default|10.10.10.1': Can't update the peer. It has wrong attribute value attr['admin_status'] = 'invalid'")
+
+def test_add_peer():
+    m = constructor()
+    res = m.set_handler("30.30.30.1", {"local_addr": "30.30.30.30", "admin_status": "up"})
+    assert res, "Expect True return value"
+
+def test_add_peer_ipv6():
+    m = constructor()
+    res = m.set_handler("fc00:20::1", {"local_addr": "fc00:20::20", "admin_status": "up"})
+    assert res, "Expect True return value"
+
+@patch('bgpcfgd.managers_bgp.log_warn')
+def test_add_peer_no_local_addr(mocked_log_warn):
+    m = constructor()
+    res = m.set_handler("30.30.30.1", {"admin_status": "up"})
+    assert res, "Expect True return value"
+    mocked_log_warn.assert_called_with("Peer 30.30.30.1. Missing attribute 'local_addr'")
+
+@patch('bgpcfgd.managers_bgp.log_debug')
+def test_add_peer_invalid_local_addr(mocked_log_debug):
+    m = constructor()
+    res = m.set_handler("30.30.30.1", {"local_addr": "40.40.40.40", "admin_status": "up"})
+    assert not res, "Expect False return value"
+    mocked_log_debug.assert_called_with("Peer '30.30.30.1' with local address '40.40.40.40' wait for the corresponding interface to be set")
+
+@patch('bgpcfgd.managers_bgp.log_info')
+def test_del_handler(mocked_log_info):
+    m = constructor()
+    m.del_handler("10.10.10.1")
+    mocked_log_info.assert_called_with("Peer '(default|10.10.10.1)' has been removed")
+
+@patch('bgpcfgd.managers_bgp.log_warn')
+def test_del_handler_nonexist_peer(mocked_log_warn):
+    m = constructor()
+    m.del_handler("40.40.40.1")
+    mocked_log_warn.assert_called_with("Peer '(default|40.40.40.1)' has not been found")
diff --git a/src/sonic-bgpcfgd/tests/test_db.py b/src/sonic-bgpcfgd/tests/test_db.py
new file mode 100644
index 000000000000..7078bc2735f0
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_db.py
@@ -0,0 +1,40 @@
+from unittest.mock import MagicMock, patch
+
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from . import swsscommon_test
+from swsscommon import swsscommon
+
+with patch.dict("sys.modules", swsscommon=swsscommon_test):
+    from bgpcfgd.managers_db import BGPDataBaseMgr
+
+def test_set_del_handler():
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': {},
+    }
+    m = BGPDataBaseMgr(common_objs, "CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)
+    assert m.constants == {}
+
+    # test set_handler
+    res = m.set_handler("test_key1", {"test_value1"})
+    assert res, "Returns always True"
+    assert "test_key1" in m.directory.get_slot(m.db_name, m.table_name)
+    assert m.directory.get(m.db_name, m.table_name, "test_key1") == {"test_value1"}
+
+    res = m.set_handler("test_key2", {})
+    assert res, "Returns always True"
+    assert "test_key2" in m.directory.get_slot(m.db_name, m.table_name)
+    assert m.directory.get(m.db_name, m.table_name, "test_key2") == {}
+
+    # test del_handler
+    m.del_handler("test_key")
+    assert "test_key" not in m.directory.get_slot(m.db_name, m.table_name)
+    assert "test_key2" in m.directory.get_slot(m.db_name, m.table_name)
+    assert m.directory.get(m.db_name, m.table_name, "test_key2") == {}
+
+    m.del_handler("test_key2")
+    assert "test_key2" not in m.directory.get_slot(m.db_name, m.table_name)
diff --git a/src/sonic-bgpcfgd/tests/test_directory.py b/src/sonic-bgpcfgd/tests/test_directory.py
new file mode 100644
index 000000000000..b20803ed32c5
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_directory.py
@@ -0,0 +1,57 @@
+from unittest.mock import MagicMock, patch
+from bgpcfgd.directory import Directory
+
+@patch('bgpcfgd.directory.log_err')
+def test_directory(mocked_log_err):
+    test_values = {
+        "key1": {
+            "key1_1": {
+                "key1_1_1": "value1_1_1",
+                "key1_1_2": "value1_1_2",
+                "key1_1_3": "value1_1_3"
+            }
+        },
+        "key2": {
+            "value2"
+        }
+    }
+
+    directory = Directory()
+
+    # Put test values
+    directory.put("db_name", "table", "key1", test_values["key1"])
+    directory.put("db_name", "table", "key2", test_values["key2"])
+
+    # Test get_path()
+    assert directory.get_path("db_name", "table", "") == test_values
+    assert directory.get_path("db_name", "table", "key1/key1_1/key1_1_1") == "value1_1_1"
+    assert directory.get_path("db_name", "table", "key1/key_nonexist") == None
+
+    # Test path_exist()
+    assert directory.path_exist("db_name", "table", "key1/key1_1/key1_1_1")
+    assert not directory.path_exist("db_name", "table_nonexist", "")
+    assert not directory.path_exist("db_name", "table", "key1/key_nonexist")
+
+    # Test get_slot()
+    assert directory.get_slot("db_name", "table") == test_values
+
+    # Test get()
+    assert directory.get("db_name", "table", "key2") == test_values["key2"]
+
+    # Test remove()
+    directory.remove("db_name", "table", "key2")
+    assert not directory.path_exist("db_name", "table", "key2")
+
+    # Test remove() with invalid input
+    directory.remove("db_name", "table_nonexist", "key2")
+    mocked_log_err.assert_called_with("Directory: Can't remove key 'key2' from slot 'db_name__table_nonexist'. The slot doesn't exist")
+    directory.remove("db_name", "table", "key_nonexist")
+    mocked_log_err.assert_called_with("Directory: Can't remove key 'key_nonexist' from slot 'db_name__table'. The key doesn't exist")
+
+    # Test remove_slot()
+    directory.remove_slot("db_name", "table")
+    assert not directory.available("db_name", "table")
+
+    # Test remove_slot() with nonexist table
+    directory.remove_slot("db_name", "table_nonexist")
+    mocked_log_err.assert_called_with("Directory: Can't remove slot 'db_name__table_nonexist'. The slot doesn't exist")
diff --git a/src/sonic-bgpcfgd/tests/test_frr.py b/src/sonic-bgpcfgd/tests/test_frr.py
index 47bdcaa82f10..5a20281fa553 100644
--- a/src/sonic-bgpcfgd/tests/test_frr.py
+++ b/src/sonic-bgpcfgd/tests/test_frr.py
@@ -1,6 +1,68 @@
-from bgpcfgd.frr import FRR
-
+from unittest.mock import patch
+import bgpcfgd.frr
+import pytest
 
 def test_constructor():
-    f = FRR(["abc", "cde"])
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
     assert f.daemons == ["abc", "cde"]
+
+def test_wait_for_daemons():
+    bgpcfgd.frr.run_command = lambda cmd, **kwargs: (0, ["abc", "cde"], "")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    f.wait_for_daemons(5)
+
+def test_wait_for_daemons_fail():
+    bgpcfgd.frr.run_command = lambda cmd, **kwargs: (0, ["abc", "non_expected"], "")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    with pytest.raises(Exception):
+        assert f.wait_for_daemons(5)
+
+def test_wait_for_daemons_error():
+    bgpcfgd.frr.run_command = lambda cmd, **kwargs: (1, ["abc", "cde"], "some error")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    with pytest.raises(Exception):
+        assert f.wait_for_daemons(5)
+
+def test_get_config():
+    bgpcfgd.frr.run_command = lambda cmd: (0, "expected config", "")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    out = f.get_config()
+    assert out == "expected config"
+
+@patch('bgpcfgd.frr.log_crit')
+def test_get_config_fail(mocked_log_crit):
+    bgpcfgd.frr.run_command = lambda cmd: (1, "some config", "some error")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    out = f.get_config()
+    assert out == ""
+    mocked_log_crit.assert_called_with("can't update running config: rc=1 out='some config' err='some error'")
+
+def test_write():
+    bgpcfgd.frr.run_command = lambda cmd: (0, "some output", "")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    res = f.write("config context")
+    assert res, "Expect True return value"
+
+def test_write_fail():
+    bgpcfgd.frr.run_command = lambda cmd: (1, "some output", "some error")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    res = f.write("config context")
+    assert not res, "Expect False return value"
+
+def test_restart_peer_groups():
+    bgpcfgd.frr.run_command = lambda cmd: (0, "some output", "")
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    res = f.restart_peer_groups(["pg_1", "pg_2"])
+    assert res, "Expect True return value"
+
+@patch('bgpcfgd.frr.log_crit')
+def test_restart_peer_groups_fail(mocked_log_crit):
+    return_value_map = {
+        "['vtysh', '-c', 'clear bgp peer-group pg_1 soft in']": (0, "", ""),
+        "['vtysh', '-c', 'clear bgp peer-group pg_2 soft in']": (1, "some output", "some error")
+    }
+    bgpcfgd.frr.run_command = lambda cmd: return_value_map[str(cmd)]
+    f = bgpcfgd.frr.FRR(["abc", "cde"])
+    res = f.restart_peer_groups(["pg_1", "pg_2"])
+    assert not res, "Expect False return value"
+    mocked_log_crit.assert_called_with("Can't restart bgp peer-group 'pg_2'. rc='1', out='some output', err='some error'")
diff --git a/src/sonic-bgpcfgd/tests/test_intf.py b/src/sonic-bgpcfgd/tests/test_intf.py
new file mode 100644
index 000000000000..74fa8e471ac6
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_intf.py
@@ -0,0 +1,52 @@
+from unittest.mock import MagicMock, patch
+
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from swsscommon import swsscommon
+from bgpcfgd.managers_intf import InterfaceMgr
+
+def set_handler_test(manager, key, value):
+    res = manager.set_handler(key, value)
+    assert res, "Returns always True"
+    assert manager.directory.get(manager.db_name, manager.table_name, key) == value
+
+def del_handler_test(manager, key):
+    manager.del_handler(key)
+    assert manager.directory.get_path(manager.db_name, manager.table_name, key) == None
+
+@patch('bgpcfgd.managers_intf.log_warn')
+def test_intf(mocked_log_warn):
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': {},
+    }
+    m = InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_VLAN_INTF_TABLE_NAME)
+
+    set_handler_test(m, "Vlan1000", {})
+    set_handler_test(m, "Vlan1000|192.168.0.1/21", {})
+
+    # test set handler with invalid ip network
+    res = m.set_handler("Vlan1000|invalid_netowrk", {})
+    assert res, "Returns always True"
+    mocked_log_warn.assert_called_with("Subnet 'invalid_netowrk' format is wrong for interface 'Vlan1000'")
+
+    del_handler_test(m, "Vlan1000")
+    del_handler_test(m, "Vlan1000|192.168.0.1/21")
+    del_handler_test(m, "Vlan1000|invalid_netowrk")
+    mocked_log_warn.assert_called_with("Subnet 'invalid_netowrk' format is wrong for interface 'Vlan1000'")
+
+def test_intf_ipv6():
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': {},
+    }
+    m = InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_VLAN_INTF_TABLE_NAME)
+
+    set_handler_test(m, "Vlan1000|fc02:1000::1/64", {})
+    del_handler_test(m, "Vlan1000|fc02:1000::1/64")
diff --git a/src/sonic-bgpcfgd/tests/test_setsrc.py b/src/sonic-bgpcfgd/tests/test_setsrc.py
new file mode 100644
index 000000000000..5d1a81908837
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_setsrc.py
@@ -0,0 +1,62 @@
+from unittest.mock import MagicMock, patch
+
+import os
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from copy import deepcopy
+from . import swsscommon_test
+from swsscommon import swsscommon
+
+with patch.dict("sys.modules", swsscommon=swsscommon_test):
+    from bgpcfgd.managers_setsrc import ZebraSetSrc
+
+TEMPLATE_PATH = os.path.abspath('../../dockers/docker-fpm-frr/frr')
+
+def constructor():
+    cfg_mgr = MagicMock()
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(TEMPLATE_PATH),
+        'constants': {},
+    }
+
+    m = ZebraSetSrc(common_objs, "STATE_DB", swsscommon.STATE_INTERFACE_TABLE_NAME)
+    assert m.lo_ipv4 == None
+    assert m.lo_ipv6 == None
+
+    return m
+
+@patch('bgpcfgd.managers_setsrc.log_info')
+def test_set_handler(mocked_log_info):
+    m = constructor()
+    res = m.set_handler("Loopback0|10.1.0.32/32", {"state": "ok"})
+    assert res, "Returns always True"
+    mocked_log_info.assert_called_with("The 'set src' configuration with Loopback0 ip '10.1.0.32' has been scheduled to be added")
+
+@patch('bgpcfgd.managers_setsrc.log_err')
+def test_set_handler_no_slash(mocked_log_err):
+    m = constructor()
+    res = m.set_handler("Loopback0|10.1.0.32", {"state": "ok"})
+    assert res, "Returns always True"
+    mocked_log_err.assert_called_with("Wrong Loopback0 ip prefix: '10.1.0.32'")
+
+@patch('bgpcfgd.managers_setsrc.log_info')
+def test_set_handler_ipv6(mocked_log_info):
+    m = constructor()
+    res = m.set_handler("Loopback0|FC00:1::32/128", {"state": "ok"})
+    assert res, "Returns always True"
+    mocked_log_info.assert_called_with("The 'set src' configuration with Loopback0 ip 'FC00:1::32' has been scheduled to be added")
+
+@patch('bgpcfgd.managers_setsrc.log_err')
+def test_set_handler_invalid_ip(mocked_log_err):
+    m = constructor()
+    res = m.set_handler("Loopback0|invalid/ip", {"state": "ok"})
+    assert res, "Returns always True"
+    mocked_log_err.assert_called_with("Got ambiguous ip address 'invalid'")
+
+@patch('bgpcfgd.managers_setsrc.log_warn')
+def test_del_handler(mocked_log_warn):
+    m = constructor()
+    m.del_handler("Loopback0|10.1.0.32/32")
+    mocked_log_warn.assert_called_with("Delete command is not supported for 'zebra set src' templates")

From bab136fc8ff44308b7e631d2b51d45c0fedbeaad Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Tue, 2 Feb 2021 03:58:20 -0800
Subject: [PATCH 0122/1674] [proc-exit-listener]: fix syntax error

the bug is introduced in commit 34cca20c

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 files/scripts/supervisor-proc-exit-listener | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/supervisor-proc-exit-listener b/files/scripts/supervisor-proc-exit-listener
index 4ac77298c78a..e8565b4d52f2 100755
--- a/files/scripts/supervisor-proc-exit-listener
+++ b/files/scripts/supervisor-proc-exit-listener
@@ -42,7 +42,7 @@ def get_critical_group_and_process_list():
     with open(CRITICAL_PROCESSES_FILE, 'r') as file:
         for line in file:
             # ignore blank lines
-            if re.match(r"^\s*$", line)
+            if re.match(r"^\s*$", line):
                 continue
             line_info = line.strip(' \n').split(':')
             if len(line_info) != 2:

From 8572f3cee5dd29a05bdf3634947fef8211675323 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:16:37 -0800
Subject: [PATCH 0123/1674] Update minigraph.py to parse kubernetes config from
 minigraph.xml (#6633)

Update minigraph parser to retrieve kubernetes server info from minigraph.xml and update "KUBERNETES_MASTER|SERVER" in running config.
Update minigraph parser to include clusterName from minigraph.xml into "DEVICE_METADATA|localhost"
---
 src/sonic-config-engine/minigraph.py          | 41 +++++++++++++++----
 .../tests/simple-sample-graph-case.xml        | 10 +++++
 .../tests/test_minigraph_case.py              | 13 +++++-
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index ba81e8faf771..06b799cdeff7 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -84,6 +84,7 @@ def parse_device(device):
     hwsku = None
     name = None
     deployment_id = None
+    cluster = None
 
     for node in device:
         if node.tag == str(QName(ns, "Address")):
@@ -100,11 +101,13 @@ def parse_device(device):
             deployment_id = node.text
         elif node.tag == str(QName(ns, "ElementType")):
             d_type = node.text
+        elif node.tag == str(QName(ns, "ClusterName")):
+            cluster = node.text
 
     if d_type is None and str(QName(ns3, "type")) in device.attrib:
         d_type = device.attrib[str(QName(ns3, "type"))]
 
-    return (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id)
+    return (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster)
 
 def calculate_lcm_for_ecmp (nhdevices_bank_map, nhip_bank_map):
     banks_enumerated = {}
@@ -244,8 +247,10 @@ def parse_png(png, hname, dpg_ecmp_content = None):
 
         if child.tag == str(QName(ns, "Devices")):
             for device in child.findall(str(QName(ns, "Device"))):
-                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id) = parse_device(device)
+                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
                 device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku }
+                if cluster:
+                    device_data['cluster'] = cluster
                 if deployment_id:
                     device_data['deployment_id'] = deployment_id
                 if lo_prefix_v6:
@@ -253,9 +258,7 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                 devices[name] = device_data
 
                 if name == hname:
-                    cluster = device.find(str(QName(ns, "ClusterName")))
-
-                    if cluster != None and cluster.text != None and "str" in cluster.text.lower():
+                    if cluster and "str" in cluster.lower():
                         is_storage_device = True
 
         if child.tag == str(QName(ns, "DeviceInterfaceLinks")):
@@ -380,8 +383,10 @@ def parse_asic_png(png, asic_name, hostname):
 
         if child.tag == str(QName(ns, "Devices")):
             for device in child.findall(str(QName(ns, "Device"))):
-                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id) = parse_device(device)
+                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
                 device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku }
+                if cluster:
+                    device_data['cluster'] = cluster
                 if deployment_id:
                     device_data['deployment_id'] = deployment_id
                 if lo_prefix_v6:
@@ -780,6 +785,7 @@ def parse_meta(meta, hname):
     region = None
     cloudtype = None
     resource_type = None
+    kube_data = {}
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
         if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower():
@@ -808,7 +814,11 @@ def parse_meta(meta, hname):
                     cloudtype = value
                 elif name == "ResourceType":
                     resource_type = value
-    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type
+                elif name == "KubernetesEnabled":
+                    kube_data["enable"] = value
+                elif name == "KubernetesServerIp":
+                    kube_data["ip"] = value
+    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data
 
 
 def parse_linkmeta(meta, hname):
@@ -1097,6 +1107,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     host_lo_intfs = None
     is_storage_device = False
     local_devices = []
+    kube_data = {}
 
     # hostname is the asic_name, get the asic_id from the asic_name
     if asic_name is not None:
@@ -1133,7 +1144,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
-                (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type) = parse_meta(child, hostname)
+                (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data) = parse_meta(child, hostname)
             elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -1174,6 +1185,18 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         }
     }
 
+    cluster = [devices[key] for key in devices if key.lower() == hostname.lower()][0].get('cluster', "")
+    if cluster:
+        results['DEVICE_METADATA']['localhost']['cluster'] = cluster
+
+    if kube_data:
+        results['KUBERNETES_MASTER'] = {
+            'SERVER': {
+                'disable': str(kube_data.get('enable', '0') == '0'),
+                'ip': kube_data.get('ip', '')
+            }
+        }
+
     results['PEER_SWITCH'] = get_peer_switch_info(linkmetas, devices)
 
     if bool(results['PEER_SWITCH']):
@@ -1524,7 +1547,7 @@ def get_mux_cable_entries(mux_cable_ports, neighbors, devices):
 
 def parse_device_desc_xml(filename):
     root = ET.parse(filename).getroot()
-    (lo_prefix, lo_prefix_v6, mgmt_prefix, hostname, hwsku, d_type, _) = parse_device(root)
+    (lo_prefix, lo_prefix_v6, mgmt_prefix, hostname, hwsku, d_type, _, _) = parse_device(root)
 
     results = {}
     results['DEVICE_METADATA'] = {'localhost': {
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index ce0174adc8dd..95f501200c83 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -390,6 +390,16 @@
      <a:Reference i:nil="true"/>
      <a:Value>10.0.10.7;10.0.10.8</a:Value>
     </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesEnabled</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>0</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesServerIp</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.10.10.10</a:Value>
+    </a:DeviceProperty>
   </a:Properties>
   </a:DeviceMetadata>
  </Devices>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 6fa7c5352d05..64e0bb09d730 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -1,3 +1,4 @@
+import json
 import os
 import subprocess
 
@@ -145,6 +146,11 @@ def test_minigraph_deployment_id(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "1")
 
+    def test_minigraph_cluster(self):
+        argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'cluster\']"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), "AAA00PrdStr00")
+
     def test_minigraph_neighbor_metadata(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_NEIGHBOR_METADATA"'
 
@@ -195,6 +201,12 @@ def test_metadata_tacacs(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "{'10.0.10.7': {'priority': '1', 'tcp_port': '49'}, '10.0.10.8': {'priority': '1', 'tcp_port': '49'}}")
 
+    def test_metadata_kube(self):
+        argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "KUBERNETES_MASTER[\'SERVER\']"'
+        output = self.run_script(argument)
+        self.assertEqual(json.loads(output.strip().replace("'", "\"")),
+                json.loads('{"ip": "10.10.10.10", "disable": "True"}'))
+
     def test_minigraph_mgmt_port(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "MGMT_PORT"'
         output = self.run_script(argument)
@@ -289,4 +301,3 @@ def test_minigraph_mux_cable_table(self):
             utils.to_dict(output.strip()),
             expected_table
         )
-        
\ No newline at end of file

From e35377eddfa085220ae912b7fffd0243e8b1b835 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 2 Feb 2021 11:26:36 -0800
Subject: [PATCH 0124/1674] [arista]: 7050CX3-32S-C32: Remove unused 10G ports
 and update speed (#6638)

port_config.ini for HWSKU Arista-7050CX3-32S-C32 has missing speed column and duplicated lanes.
The incorrect speed causes issues in Orchagent RESTARTCHECK as the below task remains as the remaining item during swss shutdown.
---
 .../Arista-7050CX3-32S-C32/port_config.ini    | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
index d3d339076a59..e24a70e97967 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
@@ -1,35 +1,33 @@
-# name          lanes             alias         index
-Ethernet0       1,2,3,4           Ethernet1/1    1
-Ethernet4       5,6,7,8           Ethernet2/1    2
-Ethernet8       9,10,11,12        Ethernet3/1    3
-Ethernet12      13,14,15,16       Ethernet4/1    4
-Ethernet16      21,22,23,24       Ethernet5/1    5
-Ethernet20      17,18,19,20       Ethernet6/1    6
-Ethernet24      25,26,27,28       Ethernet7/1    7
-Ethernet28      29,30,31,32       Ethernet8/1    8
-Ethernet32      37,38,39,40       Ethernet9/1    9
-Ethernet36      33,34,35,36       Ethernet10/1  10
-Ethernet40      41,42,43,44       Ethernet11/1  11
-Ethernet44      45,46,47,48       Ethernet12/1  12
-Ethernet48      53,54,55,56       Ethernet13/1  13
-Ethernet52      49,50,51,52       Ethernet14/1  14
-Ethernet56      57,58,59,60       Ethernet15/1  15
-Ethernet60      61,62,63,64       Ethernet16/1  16
-Ethernet64      69,70,71,72       Ethernet17/1  17
-Ethernet68      65,66,67,68       Ethernet18/1  18
-Ethernet72      73,74,75,76       Ethernet19/1  19
-Ethernet76      77,78,79,80       Ethernet20/1  20
-Ethernet80      85,86,87,88       Ethernet21/1  21
-Ethernet84      81,82,83,84       Ethernet22/1  22
-Ethernet88      89,90,91,92       Ethernet23/1  23
-Ethernet92      93,94,95,96       Ethernet24/1  24
-Ethernet96      101,102,103,104   Ethernet25/1  25
-Ethernet100     97,98,99,100      Ethernet26/1  26
-Ethernet104     105,106,107,108   Ethernet27/1  27
-Ethernet108     109,110,111,112   Ethernet28/1  28
-Ethernet112     117,118,119,120   Ethernet29/1  29
-Ethernet116     113,114,115,116   Ethernet30/1  30
-Ethernet120     121,122,123,124   Ethernet31/1  31
-Ethernet124     125,126,127,128   Ethernet32/1  32
-Ethernet128     129               Ethernet33    33
-Ethernet132     128               Ethernet34    34
+# name          lanes             alias         index  speed
+Ethernet0       1,2,3,4           Ethernet1/1    1     100000 
+Ethernet4       5,6,7,8           Ethernet2/1    2     100000
+Ethernet8       9,10,11,12        Ethernet3/1    3     100000
+Ethernet12      13,14,15,16       Ethernet4/1    4     100000
+Ethernet16      21,22,23,24       Ethernet5/1    5     100000
+Ethernet20      17,18,19,20       Ethernet6/1    6     100000
+Ethernet24      25,26,27,28       Ethernet7/1    7     100000
+Ethernet28      29,30,31,32       Ethernet8/1    8     100000
+Ethernet32      37,38,39,40       Ethernet9/1    9     100000
+Ethernet36      33,34,35,36       Ethernet10/1  10     100000
+Ethernet40      41,42,43,44       Ethernet11/1  11     100000
+Ethernet44      45,46,47,48       Ethernet12/1  12     100000
+Ethernet48      53,54,55,56       Ethernet13/1  13     100000
+Ethernet52      49,50,51,52       Ethernet14/1  14     100000
+Ethernet56      57,58,59,60       Ethernet15/1  15     100000
+Ethernet60      61,62,63,64       Ethernet16/1  16     100000
+Ethernet64      69,70,71,72       Ethernet17/1  17     100000
+Ethernet68      65,66,67,68       Ethernet18/1  18     100000
+Ethernet72      73,74,75,76       Ethernet19/1  19     100000
+Ethernet76      77,78,79,80       Ethernet20/1  20     100000
+Ethernet80      85,86,87,88       Ethernet21/1  21     100000
+Ethernet84      81,82,83,84       Ethernet22/1  22     100000
+Ethernet88      89,90,91,92       Ethernet23/1  23     100000
+Ethernet92      93,94,95,96       Ethernet24/1  24     100000
+Ethernet96      101,102,103,104   Ethernet25/1  25     100000
+Ethernet100     97,98,99,100      Ethernet26/1  26     100000
+Ethernet104     105,106,107,108   Ethernet27/1  27     100000
+Ethernet108     109,110,111,112   Ethernet28/1  28     100000
+Ethernet112     117,118,119,120   Ethernet29/1  29     100000
+Ethernet116     113,114,115,116   Ethernet30/1  30     100000
+Ethernet120     121,122,123,124   Ethernet31/1  31     100000
+Ethernet124     125,126,127,128   Ethernet32/1  32     100000

From dc474114c54cc1f733a104a5b1af6e31d94cff79 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 3 Feb 2021 05:32:09 -0800
Subject: [PATCH 0125/1674] [sairedis] Submodule Update (#6649)

Change in this updat:
    b39e746 Spell check fixes (#783)
    373be80 [build-vm] Don't Install Lib Boost 1.67 (#784)

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 817a01e4bfa2..b39e74610ad7 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 817a01e4bfa25d701727d1750989d5cd9f1bbcb3
+Subproject commit b39e74610ad7a842618a025fdadbdc52d530483a

From d26a4aff9a41024df2e2547d078fb8d9d69c683c Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Wed, 3 Feb 2021 02:19:43 +0200
Subject: [PATCH 0126/1674] [platform][barefoot] Install sonic_platform to host
 (#6644)

- Why I did it
SONiC design requires sonic_platform package to be installed in SONiC host environment, not only in docker containers.

- How I did it
For now, sonic_platform python wheel package, that is used by pmon, is provided via device-specific platform modules deb packages that unpacks the wheel package file into specific device's directory on lazy-install.
The PR makes deb packages' postinst script also install these unpacked wheel packages to host.

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../debian/postinst                           | 10 ++++++++
 .../debian/postinst                           | 23 ++++++++++++++++++-
 .../debian/postinst                           | 10 ++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn/debian/postinst

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst
new file mode 100755
index 000000000000..a218d59e2652
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+PLATFORM_NAME=x86_64-accton_wedge100bf_32x-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+
+#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
index a89ac4f4f5b2..90d772ef89df 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
@@ -1,6 +1,27 @@
 #!/bin/sh
 set -e
-depmod -a 
+depmod -a
 systemctl enable bfn-newport.service
 systemctl start bfn-newport.service
+
+PLATFORM_NAME=x86_64-accton_as9516bf_32d-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+if [ -e ${SONIC_PLATFORM_WHEEL_PY2} ]; then
+    python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+fi
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+if [ -e ${SONIC_PLATFORM_WHEEL_PY3} ]; then
+    python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+fi
+
+PLATFORM_NAME=x86_64-accton_as9516_32d-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+if [ -e ${SONIC_PLATFORM_WHEEL_PY2} ]; then
+    python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+fi
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+if [ -e ${SONIC_PLATFORM_WHEEL_PY3} ]; then
+    python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+fi
+
 #DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn/debian/postinst
new file mode 100644
index 000000000000..bd24c078778a
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+PLATFORM_NAME=x86_64-accton_wedge100bf_65x-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+
+#DEBHELPER#

From 1b51ee205b268ad2ca109eeec048f04b511402c6 Mon Sep 17 00:00:00 2001
From: Dmytro Shevchuk <68949102+dmytroxshevchuk@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:00:03 +0200
Subject: [PATCH 0127/1674] [barefoot] add platform.json, hwsku.json for
 mavericks (#6629)

platform.json and hwsku.json replacement for deprecated port_config.ini. Also this files need for Dynamic Port Breakout.
---
 .../mavericks/hwsku.json                      | 329 +++++++++++++++
 .../platform.json                             | 394 ++++++++++++++++++
 2 files changed, 723 insertions(+)
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/hwsku.json
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform.json

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/hwsku.json b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/hwsku.json
new file mode 100644
index 000000000000..857b00852c0b
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/hwsku.json
@@ -0,0 +1,329 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet52": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet60": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet68": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet76": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet84": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet92": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet100": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet108": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet116": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet124": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet132": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet140": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet148": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet156": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet164": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet172": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet180": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet188": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet196": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet204": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet212": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet220": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet228": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet236": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet244": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet252": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "none"
+        }
+    }
+}
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform.json b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform.json
new file mode 100644
index 000000000000..866706a28357
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform.json
@@ -0,0 +1,394 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "index": "1,1,1,1",
+            "lanes": "0,1,2,3",
+            "alias_at_lanes": "Ethernet0,Ethernet1,Ethernet2,Ethernet3",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+       "Ethernet4": {
+            "index": "2,2,2,2",
+            "lanes": "4,5,6,7",
+            "alias_at_lanes": "Ethernet4,Ethernet5,Ethernet6,Ethernet7",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet8": {
+            "index": "3,3,3,3",
+            "lanes": "8,9,10,11",
+            "alias_at_lanes": "Ethernet8,Ethernet9,Ethernet10,Ethernet11",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet12": {
+            "index": "4,4,4,4",
+            "lanes": "12,13,14,15",
+            "alias_at_lanes": "Ethernet12,Ethernet13,Ethernet14,Ethernet15",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet16": {
+            "index": "5,5,5,5",
+            "lanes": "16,17,18,19",
+            "alias_at_lanes": "Ethernet16,Ethernet17,Ethernet18,Ethernet19",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet20": {
+            "index": "6,6,6,6",
+            "lanes": "20,21,22,23",
+            "alias_at_lanes": "Ethernet20,Ethernet21,Ethernet22,Ethernet23",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet24": {
+            "index": "7,7,7,7",
+            "lanes": "24,25,26,27",
+            "alias_at_lanes": "Ethernet24,Ethernet25,Ethernet26,Ethernet27",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet28": {
+            "index": "8,8,8,8",
+            "lanes": "28,29,30,31",
+            "alias_at_lanes": "Ethernet28,Ethernet29,Ethernet30,Ethernet31",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet32": {
+            "index": "9,9,9,9",
+            "lanes": "32,33,34,35",
+            "alias_at_lanes": "Ethernet32,Ethernet33,Ethernet34,Ethernet35",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet36": {
+            "index": "10,10,10,10",
+            "lanes": "36,37,38,39",
+            "alias_at_lanes": "Ethernet36,Ethernet37,Ethernet38,Ethernet39",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet40": {
+            "index": "11,11,11,11",
+            "lanes": "40,41,42,43",
+            "alias_at_lanes": "Ethernet40,Ethernet41,Ethernet42,Ethernet43",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet44": {
+            "index": "12,12,12,12",
+            "lanes": "44,45,46,47",
+            "alias_at_lanes": "Ethernet44,Ethernet45,Ethernet46,Ethernet47",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet48": {
+            "index": "13,13,13,13",
+            "lanes": "48,49,50,51",
+            "alias_at_lanes": "Ethernet48,Ethernet49,Ethernet50,Ethernet51",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet52": {
+            "index": "14,14,14,14",
+            "lanes": "52,53,54,55",
+            "alias_at_lanes": "Ethernet52,Ethernet53,Ethernet54,Ethernet55",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet56": {
+            "index": "15,15,15,15",
+            "lanes": "56,57,58,59",
+            "alias_at_lanes": "Ethernet56,Ethernet57,Ethernet58,Ethernet59",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet60": {
+            "index": "16,16,16,16",
+            "lanes": "60,61,62,63",
+            "alias_at_lanes": "Ethernet60,Ethernet61,Ethernet62,Ethernet63",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet64": {
+            "index": "17,17,17,17",
+            "lanes": "64,65,66,67",
+            "alias_at_lanes": "Ethernet64,Ethernet65,Ethernet66,Ethernet67",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet68": {
+            "index": "18,18,18,18",
+            "lanes": "68,69,70,71",
+            "alias_at_lanes": "Ethernet68,Ethernet69,Ethernet70,Ethernet71",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet72": {
+            "index": "19,19,19,19",
+            "lanes": "72,73,74,75",
+            "alias_at_lanes": "Ethernet72,Ethernet73,Ethernet74,Ethernet75",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet76": {
+            "index": "20,20,20,20",
+            "lanes": "76,77,78,79",
+            "alias_at_lanes": "Ethernet76,Ethernet77,Ethernet78,Ethernet79",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet80": {
+            "index": "21,21,21,21",
+            "lanes": "80,81,82,83",
+            "alias_at_lanes": "Ethernet80,Ethernet81,Ethernet82,Ethernet83",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet84": {
+            "index": "22,22,22,22",
+            "lanes": "84,85,86,87",
+            "alias_at_lanes": "Ethernet84,Ethernet85,Ethernet86,Ethernet87",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet88": {
+            "index": "23,23,23,23",
+            "lanes": "88,89,90,91",
+            "alias_at_lanes": "Ethernet88,Ethernet89,Ethernet90,Ethernet91",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet92": {
+            "index": "24,24,24,24",
+            "lanes": "92,93,94,95",
+            "alias_at_lanes": "Ethernet92,Ethernet93,Ethernet94,Ethernet95",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet96": {
+            "index": "25,25,25,25",
+            "lanes": "96,97,98,99",
+            "alias_at_lanes": "Ethernet96,Ethernet97,Ethernet98,Ethernet99",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet100": {
+            "index": "26,26,26,26",
+            "lanes": "100,101,102,103",
+            "alias_at_lanes": "Ethernet100,Ethernet101,Ethernet102,Ethernet103",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet104": {
+            "index": "27,27,27,27",
+            "lanes": "104,105,106,107",
+            "alias_at_lanes": "Ethernet104,Ethernet105,Ethernet106,Ethernet107",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet108": {
+            "index": "28,28,28,28",
+            "lanes": "108,109,110,111",
+            "alias_at_lanes": "Ethernet108,Ethernet109,Ethernet110,Ethernet111",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet112": {
+            "index": "29,29,29,29",
+            "lanes": "112,113,114,115",
+            "alias_at_lanes": "Ethernet112,Ethernet113,Ethernet114,Ethernet115",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet116": {
+            "index": "30,30,30,30",
+            "lanes": "116,117,118,119",
+            "alias_at_lanes": "Ethernet116,Ethernet117,Ethernet118,Ethernet119",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet120": {
+            "index": "31,31,31,31",
+            "lanes": "120,121,122,123",
+            "alias_at_lanes": "Ethernet120,Ethernet121,Ethernet122,Ethernet123",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet124": {
+            "index": "32,32,32,32",
+            "lanes": "124,125,126,127",
+            "alias_at_lanes": "Ethernet124,Ethernet125,Ethernet126,Ethernet127",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet128": {
+            "index": "33,33,33,33",
+            "lanes": "128,129,130,131",
+            "alias_at_lanes": "Ethernet128,Ethernet129,Ethernet130,Ethernet131",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+       "Ethernet132": {
+            "index": "34,34,34,34",
+            "lanes": "132,133,134,135",
+            "alias_at_lanes": "Ethernet132,Ethernet133,Ethernet134,Ethernet135",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet136": {
+            "index": "35,35,35,35",
+            "lanes": "136,137,138,139",
+            "alias_at_lanes": "Ethernet136,Ethernet137,Ethernet138,Ethernet139",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet140": {
+            "index": "36,36,36,36",
+            "lanes": "140,141,142,143",
+            "alias_at_lanes": "Ethernet140,Ethernet141,Ethernet142,Ethernet143",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet144": {
+            "index": "37,37,37,37",
+            "lanes": "144,145,146,147",
+            "alias_at_lanes": "Ethernet144,Ethernet145,Ethernet146,Ethernet147",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet148": {
+            "index": "38,38,38,38",
+            "lanes": "148,149,150,151",
+            "alias_at_lanes": "Ethernet148,Ethernet149,Ethernet150,Ethernet151",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet152": {
+            "index": "39,39,39,39",
+            "lanes": "152,153,154,155",
+            "alias_at_lanes": "Ethernet152,Ethernet153,Ethernet154,Ethernet155",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet156": {
+            "index": "40,40,40,40",
+            "lanes": "156,157,158,159",
+            "alias_at_lanes": "Ethernet156,Ethernet157,Ethernet158,Ethernet159",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet160": {
+            "index": "41,41,41,41",
+            "lanes": "160,161,162,163",
+            "alias_at_lanes": "Ethernet160,Ethernet161,Ethernet162,Ethernet163",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet164": {
+            "index": "42,42,42,42",
+            "lanes": "164,165,166,167",
+            "alias_at_lanes": "Ethernet164,Ethernet165,Ethernet166,Ethernet167",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet168": {
+            "index": "43,43,43,43",
+            "lanes": "168,169,170,171",
+            "alias_at_lanes": "Ethernet168,Ethernet169,Ethernet170,Ethernet171",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet172": {
+            "index": "44,44,44,44",
+            "lanes": "172,173,174,175",
+            "alias_at_lanes": "Ethernet172,Ethernet173,Ethernet174,Ethernet175",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet176": {
+            "index": "45,45,45,45",
+            "lanes": "176,177,178,179",
+            "alias_at_lanes": "Ethernet176,Ethernet177,Ethernet178,Ethernet179",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet180": {
+            "index": "46,46,46,46",
+            "lanes": "180,181,182,183",
+            "alias_at_lanes": "Ethernet180,Ethernet181,Ethernet182,Ethernet183",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet184": {
+            "index": "47,47,47,47",
+            "lanes": "184,185,186,187",
+            "alias_at_lanes": "Ethernet184,Ethernet185,Ethernet186,Ethernet187",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet188": {
+            "index": "48,48,48,48",
+            "lanes": "188,189,190,191",
+            "alias_at_lanes": "Ethernet188,Ethernet189,Ethernet190,Ethernet191",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet192": {
+            "index": "49,49,49,49",
+            "lanes": "192,193,194,195",
+            "alias_at_lanes": "Ethernet192,Ethernet193,Ethernet194,Ethernet195",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet196": {
+            "index": "50,50,50,50",
+            "lanes": "196,197,198,199",
+            "alias_at_lanes": "Ethernet196,Ethernet197,Ethernet198,Ethernet199",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet200": {
+            "index": "51,51,51,51",
+            "lanes": "200,201,202,203",
+            "alias_at_lanes": "Ethernet200,Ethernet201,Ethernet202,Ethernet203",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet204": {
+            "index": "52,52,52,52",
+            "lanes": "204,205,206,207",
+            "alias_at_lanes": "Ethernet204,Ethernet205,Ethernet206,Ethernet207",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet208": {
+            "index": "53,53,53,53",
+            "lanes": "208,209,210,211",
+            "alias_at_lanes": "Ethernet208,Ethernet209,Ethernet210,Ethernet211",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet212": {
+            "index": "54,54,54,54",
+            "lanes": "212,213,214,215",
+            "alias_at_lanes": "Ethernet212,Ethernet213,Ethernet214,Ethernet215",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet216": {
+            "index": "55,55,55,55",
+            "lanes": "216,217,218,219",
+            "alias_at_lanes": "Ethernet216,Ethernet217,Ethernet218,Ethernet219",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet220": {
+            "index": "56,56,56,56",
+            "lanes": "220,221,222,223",
+            "alias_at_lanes": "Ethernet220,Ethernet221,Ethernet222,Ethernet223",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet224": {
+            "index": "57,57,57,57",
+            "lanes": "224,225,226,227",
+            "alias_at_lanes": "Ethernet224,Ethernet225,Ethernet226,Ethernet227",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet228": {
+            "index": "58,58,58,58",
+            "lanes": "228,229,230,231",
+            "alias_at_lanes": "Ethernet228,Ethernet229,Ethernet230,Ethernet231",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet232": {
+            "index": "59,59,59,59",
+            "lanes": "232,233,234,235",
+            "alias_at_lanes": "Ethernet232,Ethernet233,Ethernet234,Ethernet235",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet236": {
+            "index": "60,60,60,60",
+            "lanes": "236,237,238,239",
+            "alias_at_lanes": "Ethernet236,Ethernet237,Ethernet238,Ethernet239",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet240": {
+            "index": "61,61,61,61",
+            "lanes": "240,241,242,243",
+            "alias_at_lanes": "Ethernet240,Ethernet241,Ethernet242,Ethernet243",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet244": {
+            "index": "62,62,62,62",
+            "lanes": "244,245,246,247",
+            "alias_at_lanes": "Ethernet244,Ethernet245,Ethernet246,Ethernet247",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet248": {
+            "index": "63,63,63,63",
+            "lanes": "248,249,250,251",
+            "alias_at_lanes": "Ethernet248,Ethernet249,Ethernet250,Ethernet251",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet252": {
+            "index": "64,64,64,64",
+            "lanes": "252,253,254,255",
+            "alias_at_lanes": "Ethernet252,Ethernet253,Ethernet254,Ethernet255",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet256": {
+            "index": "65,65,65,65",
+            "lanes": "256,257,258,259",
+            "alias_at_lanes": "Ethernet256,Ethernet257,Ethernet258,Ethernet259",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        }
+    }
+}

From 205fe8a8bf2f1a5068cb5a668aeae15e53075f8e Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:33:49 -0800
Subject: [PATCH 0128/1674] [bgpcfgd]: Fix unit test for bgp manager (#6668)

The check for check_neig_meta was not following the value in constants. Fix it to match the value in constants.
---
 src/sonic-bgpcfgd/tests/test_bgp.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/sonic-bgpcfgd/tests/test_bgp.py b/src/sonic-bgpcfgd/tests/test_bgp.py
index 8cbd51c90a4f..a4c5ef997725 100644
--- a/src/sonic-bgpcfgd/tests/test_bgp.py
+++ b/src/sonic-bgpcfgd/tests/test_bgp.py
@@ -12,11 +12,12 @@
 
 def constructor():
     cfg_mgr = MagicMock()
+    constants = load_constants()['constants']
     common_objs = {
         'directory': Directory(),
         'cfg_mgr':   cfg_mgr,
         'tf':        TemplateFabric(TEMPLATE_PATH),
-        'constants': load_constants()['constants']
+        'constants': constants
     }
 
     return_value_map = {
@@ -27,7 +28,7 @@ def constructor():
     bgpcfgd.managers_bgp.run_command = lambda cmd: return_value_map[str(cmd)]
     m = bgpcfgd.managers_bgp.BGPPeerMgrBase(common_objs, "CONFIG_DB", swsscommon.CFG_BGP_NEIGHBOR_TABLE_NAME, "general", True)
     assert m.peer_type == "general"
-    assert m.check_neig_meta == False # Because constants['bgp']['use_neighbors_meta'] is false in constants.yml
+    assert m.check_neig_meta == ('bgp' in constants and 'use_neighbors_meta' in constants['bgp'] and constants['bgp']['use_neighbors_meta'])
 
     m.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
     m.directory.put("CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME, "Loopback0|11.11.11.11/32", {})

From 9f2a85697f20e51dd5af3ffbbdb6c04f6bb1a46d Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:59:56 -0800
Subject: [PATCH 0129/1674] BRCM SAI 4.3.0.10-4 Fix _brcm_sai_indexed_data_get
 () with unexpected queue causing _brcm_sai_switch_assert () after warm reboot
 (#6664)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index fcb175d3d0c5..1b27d7bc1f88 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.2.1.5-10_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A30%3A31Z&se=2035-01-13T07%3A30%3A00Z&sr=b&sp=r&sig=yCGwk%2FW%2Fg%2FaFxhr0oNSTZ%2BVy5B6kX1WDEsbbyz9J088%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.10-4_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=nfseU56PACVqklQ4MC0HvZ7qt7Ou4loQMBA7jx8CSOY%3D&se=2034-10-13T16%3A31%3A22Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-4_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A32%3A43Z&se=2035-01-13T07%3A32%3A00Z&sr=b&sp=r&sig=wuCNc6pa12JQCBi%2BM9rLWvVI92ldan9hKNF%2BfVfUWN8%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=4tF26GxI6jmrcvRyCezQ7RL6qMjzip7SFf61eqy%2Bvf4%3D&se=2034-10-13T16%3A31%3A53Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 94cb1f01bea92dbfd549ab9adc192733db3928bd Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:05:13 -0800
Subject: [PATCH 0130/1674] [sonic-platform-common] submodule update (#6669)

This PR updates the following commits in sonic-platform-common
6ad0004 [component] add auto_update_firmware() to support the auto update. (#106)
49076a9 [sonic_y_cable] Add support for measuring BER and EYE scan and running Loopback, PRBS modes on the Y cable (#158)
6b12b4c [sfp] Add parsing the dom_capability to sff8472 (#102)
7fc76b9 [sonic_pcie] Add get_pcie_aer_stats and its common implementation (#144)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 8664efc5472a..6ad0004c29a1 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 8664efc5472ae8cab04ad5a3499baa9a9c0d7f89
+Subproject commit 6ad0004c29a143a0635ad7f3c81ce652313569cb

From ceb7b2c019ab06a03b1728f0064518b0d00184af Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 3 Feb 2021 20:08:39 -0800
Subject: [PATCH 0131/1674] [submodule]: update sonic-snmpagent (#6663)

* 3885f19 2021-02-02 | let sysDescr_pass use python3 (#195) (HEAD, origin/master, origin/HEAD) [lguohan]
* ad302d4 2021-01-28 | Fix: 'key not found' exception in bgp4.py (#192) [bingwang-ms]
* 59e2a1c 2021-01-27 | Fix fdb_vlanmac() on corner cases (#193) [Qi Luo]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index dfde06e2f5d7..3885f193be05 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit dfde06e2f5d70e23882af6c0f1af4ae43ec2fa43
+Subproject commit 3885f193be05099659808092d22c5f69407cdda4

From a9d3281d56ae8078681eaeb28bbca29f5744dc34 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:17:34 -0800
Subject: [PATCH 0132/1674] [build]: Fix dependency: asyncsnmp should not
 depend on PYTHON_SWSSCOMMON (#6672)

Add dependency: dbsyncd will depend on PYTHON3_SWSSCOMMON
---
 rules/asyncsnmp-py3.mk | 2 +-
 rules/dbsyncd-py3.mk   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/asyncsnmp-py3.mk b/rules/asyncsnmp-py3.mk
index 990cc4512f8c..2592eb004ee8 100644
--- a/rules/asyncsnmp-py3.mk
+++ b/rules/asyncsnmp-py3.mk
@@ -5,5 +5,5 @@ $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent
 $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3
 # Depends on sonic-platform-common so it is possible to import sonic_psu
 $(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_PLATFORM_COMMON_PY3)
-$(ASYNCSNMP_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON)
+$(ASYNCSNMP_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3)
diff --git a/rules/dbsyncd-py3.mk b/rules/dbsyncd-py3.mk
index 0f150c0c59f5..12cf13cafe3b 100644
--- a/rules/dbsyncd-py3.mk
+++ b/rules/dbsyncd-py3.mk
@@ -4,4 +4,5 @@ DBSYNCD_PY3 = sonic_d-2.0.0-py3-none-any.whl
 $(DBSYNCD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd
 $(DBSYNCD_PY3)_PYTHON_VERSION = 3
 $(DBSYNCD_PY3)_DEPENDS += $(SWSSSDK_PY3)
+$(DBSYNCD_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 SONIC_PYTHON_WHEELS += $(DBSYNCD_PY3)

From a7d453872f8b2cc8ceee0ca8232c7a2a1f874093 Mon Sep 17 00:00:00 2001
From: Garrick He <32883830+GarrickHe@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:32:13 -0800
Subject: [PATCH 0133/1674] [sFlow] - Fix memory leak (#6662)

* Bump version number to 2.0.32-1 to include a fix for a memory-leak
  found during testing. A wrong API is used to free the cJSON
  data-structure, which only frees the first pointed-to structure.
  The proper API should recursively free all structures.

Signed-off-by: Garrick He <garrick_he@dell.com>
---
 rules/sflow.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/sflow.mk b/rules/sflow.mk
index f41bde774f02..7f0ac72bed3f 100644
--- a/rules/sflow.mk
+++ b/rules/sflow.mk
@@ -1,7 +1,7 @@
 # host-sflow package
 
-HSFLOWD_VERSION = 2.0.28
-HSFLOWD_SUBVERSION = 2
+HSFLOWD_VERSION = 2.0.32
+HSFLOWD_SUBVERSION = 1
 export HSFLOWD_VERSION HSFLOWD_SUBVERSION
 
 HSFLOWD = hsflowd_$(HSFLOWD_VERSION)-$(HSFLOWD_SUBVERSION)_$(CONFIGURED_ARCH).deb

From d7e9cba966d5f4b48acc804b1823a2acf525b6b1 Mon Sep 17 00:00:00 2001
From: Eran Dahan <erand@nvidia.com>
Date: Thu, 4 Feb 2021 09:12:28 +0200
Subject: [PATCH 0134/1674] [MLNX] update SAI submodule to include fix for
 debug dump (#6667)

**Why I did it**
Disable SDK extended dump due to issue found

**How I did it**
Update SAI submodule

**How to verify it**
Verify the SDK extended dump is not called.

Signed-off-by: Eran Dahan <erand@nvidia.com>
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 2902c78672eb..abdc7c069ea8 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 2902c78672eb9602296fd17654f29a21ddaf8290
+Subproject commit abdc7c069ea8714af53cd4337f05bd493f133668

From ad937fbac1d97276b3ab729384bdb4e004f2dd8a Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 4 Feb 2021 08:15:36 -0800
Subject: [PATCH 0135/1674] Fix Allow prefix Delete case (#6671)

When we add allow-list key with action above route-map gets updated . For eg if we add deny action above template will become to no-export community. Now if we delete the key Issue is we still keep the no-export and do not move back to drop community.

This PR fixes this issue by rolling back default route-map community value back to constants.yml default action.
---
 .../bgpcfgd/managers_allow_list.py            |   7 +-
 src/sonic-bgpcfgd/tests/test_allow_list.py    | 378 +++++++++++++++++-
 2 files changed, 378 insertions(+), 7 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
index 1e4eb6e404e2..435be91d20d2 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
@@ -173,6 +173,7 @@ def __remove_policy(self, deployment_id, community_value):
         msg += " deployment_id '%s'. community: '%s'"
         log_info(msg % info)
 
+        default_action = self.__get_default_action_community()
         names = self.__generate_names(deployment_id, community_value)
         self.cfg_mgr.update()
         cmds = []
@@ -181,6 +182,8 @@ def __remove_policy(self, deployment_id, community_value):
         cmds += self.__remove_prefix_list(self.V4, names['pl_v4'])
         cmds += self.__remove_prefix_list(self.V6, names['pl_v6'])
         cmds += self.__remove_community(names['community'])
+        cmds += self.__update_default_route_map_entry(names['rm_v4'], default_action)
+        cmds += self.__update_default_route_map_entry(names['rm_v6'], default_action)
         if cmds:
             self.cfg_mgr.push_list(cmds)
             peer_groups = self.__find_peer_group_by_deployment_id(deployment_id)
@@ -676,7 +679,7 @@ def __af_to_family(self, af):
         """
         return 'ip' if af == self.V4 else 'ipv6'
 
-    def __get_default_action_community(self, data):
+    def __get_default_action_community(self, data=None):
         """
         Determine the default action community based on the request.
         If request doesn't contain "default_action" field - the default_action value
@@ -685,7 +688,7 @@ def __get_default_action_community(self, data):
         :return: returns community value for "default_action"
         """
         drop_community = self.constants["bgp"]["allow_list"]["drop_community"]
-        if "default_action" in data:
+        if data and "default_action" in data:
             if data["default_action"] == "deny":
                 return "no-export"
             else: # "permit"
diff --git a/src/sonic-bgpcfgd/tests/test_allow_list.py b/src/sonic-bgpcfgd/tests/test_allow_list.py
index 6a53e2f49ca7..cb0896982a39 100644
--- a/src/sonic-bgpcfgd/tests/test_allow_list.py
+++ b/src/sonic-bgpcfgd/tests/test_allow_list.py
@@ -4,6 +4,7 @@
 from bgpcfgd.directory import Directory
 from bgpcfgd.template import TemplateFabric
 import bgpcfgd
+from copy import deepcopy
 
 
 swsscommon_module_mock = MagicMock()
@@ -26,7 +27,7 @@
 }
 
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
-def set_del_test(op, args, currect_config, expected_config):
+def set_del_test(op, args, currect_config, expected_config, update_global_default_action=None):
     from bgpcfgd.managers_allow_list import BGPAllowListMgr
     set_del_test.push_list_called = False
     def push_list(args):
@@ -44,10 +45,12 @@ def push_list(args):
         'directory': Directory(),
         'cfg_mgr':   cfg_mgr,
         'tf':        TemplateFabric(),
-        'constants': global_constants,
+        'constants': deepcopy(global_constants),
     }
 
     mgr = BGPAllowListMgr(common_objs, "CONFIG_DB", "BGP_ALLOWED_PREFIXES")
+    if update_global_default_action:
+        mgr.constants["bgp"]["allow_list"]["default_action"] = update_global_default_action
     if op == "SET":
         mgr.set_handler(*args)
     elif op == "DEL":
@@ -89,6 +92,74 @@ def test_set_handler_with_community():
             ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
         ]
     )
+def test_set_handler_with_community_and_permit_action():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|1010:2020", {
+                "prefixes_v4": "10.20.30.0/24,30.50.0.0/16",
+                "prefixes_v6": "fc00:20::/64,fc00:30::/64",
+                "default_action":"permit"
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+        ]
+    )
+
+def test_set_handler_with_community_and_deny_action():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|1010:2020", {
+                "prefixes_v4": "10.20.30.0/24,30.50.0.0/16",
+                "prefixes_v6": "fc00:20::/64,fc00:30::/64",
+                "default_action":"deny"
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535', 
+            ' set community no-export additive', 
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535', 
+            ' set community no-export additive'
+        ]
+    )
+
 
 def test_set_handler_no_community():
     set_del_test(
@@ -117,6 +188,66 @@ def test_set_handler_no_community():
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
         ]
     )
+def test_set_handler_no_community_with_permit_action():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5", {
+                "prefixes_v4": "20.20.30.0/24,40.50.0.0/16",
+                "prefixes_v6": "fc01:20::/64,fc01:30::/64",
+                "default_action":"permit"
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+        ]
+    )
+def test_set_handler_no_community_with_deny_action():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5", {
+                "prefixes_v4": "20.20.30.0/24,40.50.0.0/16",
+                "prefixes_v6": "fc01:20::/64,fc01:30::/64",
+                "default_action":"deny"
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535', 
+            ' set community no-export additive', 
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535', 
+            ' set community no-export additive'
+        ]
+    )
 
 def test_del_handler_with_community():
     set_del_test(
@@ -137,6 +268,11 @@ def test_del_handler_with_community():
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
             ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+
             ""
         ],
         [
@@ -148,6 +284,155 @@ def test_del_handler_with_community():
         ]
     )
 
+def test_del_handler_with_exiting_community_deny_action():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|1010:2020",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community no-export additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community no-export additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            'no bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ]
+    )
+
+
+def test_del_handler_with_exiting_community_permit_action():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|1010:2020",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            'no bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+        ]
+    )
+
+def test_del_handler_with_exiting_community_deny_action_global_deny():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|1010:2020",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community no-export additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community no-export additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            'no bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+        ],
+        "deny"
+    )
+
+
+def test_del_handler_with_exiting_community_permit_action_global_deny():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|1010:2020",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            'no bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community no-export additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community no-export additive',
+        ],
+        "deny"
+    )
+
+
 def test_del_handler_no_community():
     set_del_test(
         "DEL",
@@ -164,6 +449,10 @@ def test_del_handler_no_community():
             ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
             " "
         ],
         [
@@ -173,6 +462,75 @@ def test_del_handler_no_community():
             'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
         ]
     )
+def test_del_handler_with_no_community_deny_action():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 ge 65',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community no-export additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community no-export additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ]
+    )
+def test_del_handler_with_no_community_permit_action_global_deny():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5",),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 ge 25',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 ge 17',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 ge 65',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            'no route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community no-export additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community no-export additive',
+        ],
+        "deny"
+    )
+
+
 
 def test_set_handler_with_community_data_is_already_presented():
     set_del_test(
@@ -245,7 +603,12 @@ def test_del_handler_with_community_no_data():
     set_del_test(
         "DEL",
         ("DEPLOYMENT_ID|5|1010:2020",),
-        [""],
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
         []
     )
 
@@ -253,7 +616,12 @@ def test_del_handler_no_community_no_data():
     set_del_test(
         "DEL",
         ("DEPLOYMENT_ID|5",),
-        [""],
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
         []
     )
 
@@ -588,4 +956,4 @@ def test___get_default_action_permit_3():
     mgr = construct_BGPAllowListMgr(constants)
     assert mgr._BGPAllowListMgr__get_default_action_community(data) == "123:123"
 
-# FIXME: more testcases for coverage
\ No newline at end of file
+# FIXME: more testcases for coverage

From 3a7441c913cc6f534211892a3b232fa5124dee82 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 5 Feb 2021 01:03:14 +0800
Subject: [PATCH 0136/1674] [build]: Fix syncd dpkg cache dependency issue
 (#6680)

* Fix syncd dpkg cache dependency issue
---
 platform/broadcom/docker-syncd-brcm.dep | 2 +-
 platform/mellanox/docker-syncd-mlnx.dep | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/docker-syncd-brcm.dep b/platform/broadcom/docker-syncd-brcm.dep
index 48fa57f33479..c020a72f2a08 100644
--- a/platform/broadcom/docker-syncd-brcm.dep
+++ b/platform/broadcom/docker-syncd-brcm.dep
@@ -1,6 +1,6 @@
 #DPKG FRK
 DPATH       := $($(DOCKER_SYNCD_BASE)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/docker-syncd-brcm.mk platform/broadcom/docker-syncd-brcm.dep   
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/docker-syncd-brcm.mk platform/broadcom/docker-syncd-brcm.dep platform/broadcom/sai.mk 
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(DPATH))
 
diff --git a/platform/mellanox/docker-syncd-mlnx.dep b/platform/mellanox/docker-syncd-mlnx.dep
index b8bdfdf625b7..659b09cec8f4 100644
--- a/platform/mellanox/docker-syncd-mlnx.dep
+++ b/platform/mellanox/docker-syncd-mlnx.dep
@@ -1,7 +1,7 @@
 # DPKG FRK
 
 DPATH := $($(DOCKER_SYNCD_BASE)_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mlnx.mk $(PLATFORM_PATH)/docker-syncd-mlnx.dep
+DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mlnx.mk $(PLATFORM_PATH)/docker-syncd-mlnx.dep platform/mellanox/mlnx-sai.mk
 DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(DPATH))
 

From 0244069666ba072742fdd58b9e1a87e8e4414802 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Thu, 4 Feb 2021 19:44:16 +0200
Subject: [PATCH 0137/1674] [Mellanox] Update FW upgrade script to use
 'mlxfwmanager -d' option for specifying MST device in FW burn operation
 (#6541)

**- Why I did it**
Reduce the time it takes for the ASIC FW burn as part of the automatic FW upgrade procedure.

**- How I did it**
Add -d option to mlxfwmanager tool to use the faster MST device and not the default one which is not the fastest one.

**- How to verify it**
I manually changed ASIC FW followed by reboot command in order for FW upgrade to take place on deinit.
I manually changed ASIC FW followed by hard reset in order for FW upgrade to take place on init.

Signed-off-by: liora <liora@nvidia.com>
---
 platform/mellanox/mlnx-fw-upgrade.j2 | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-fw-upgrade.j2 b/platform/mellanox/mlnx-fw-upgrade.j2
index 69f3d621cc44..245ce75d5f18 100755
--- a/platform/mellanox/mlnx-fw-upgrade.j2
+++ b/platform/mellanox/mlnx-fw-upgrade.j2
@@ -29,6 +29,7 @@ declare -r SPC1_ASIC="spc1"
 declare -r SPC2_ASIC="spc2"
 declare -r SPC3_ASIC="spc3"
 declare -r UNKN_ASIC="unknown"
+declare -r UNKN_MST="unknown"
 
 declare -rA FW_FILE_MAP=( \
     [$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \
@@ -152,6 +153,18 @@ function GetAsicType() {
     exit "${EXIT_FAILURE}"
 }
 
+function GetMstDevice() {
+    local _MST_DEVICE="$(ls /dev/mst/*_pci_cr0 2>&1)"
+
+    if [[ ! -c "${_MST_DEVICE}" ]]; then
+        echo "${UNKN_MST}"
+    else 
+        echo "${_MST_DEVICE}"
+    fi
+
+    exit "${EXIT_SUCCESS}"
+}
+
 function RunCmd() {
     local ERROR_CODE="${EXIT_SUCCESS}"
 
@@ -207,7 +220,13 @@ function UpgradeFW() {
         ExitSuccess "firmware is up to date"
     else
         LogNotice "firmware upgrade is required. Installing compatible version..."
-        RunCmd "${BURN_CMD} -i ${_FW_FILE}"
+        local -r _MST_DEVICE="$(GetMstDevice)"
+        if [[ "${_MST_DEVICE}" = "${UNKN_MST}" ]]; then
+            LogWarning "could not find fastest mst device, using default device"
+            RunCmd "${BURN_CMD} -i ${_FW_FILE}"
+        else
+            RunCmd "${BURN_CMD} -d ${_MST_DEVICE} -i ${_FW_FILE}"
+        fi
     fi
 }
 

From 6bc07c6c11be6d5a16c31365b0f48c82e31cd074 Mon Sep 17 00:00:00 2001
From: dereksun01 <52683998+dereksun01@users.noreply.github.com>
Date: Fri, 5 Feb 2021 02:51:12 +0800
Subject: [PATCH 0138/1674] [device] Add as4630_54pe SDK configuration
 parameters (#5167)

**- Why I did it**
- Add as4630_54pe SDK configuration parameters.

**- How I did it**
- Add  l3_alpm_enable=2 and ipv6_lpm_128b_enable=1 in hx5-as4630-48x1G+4x25G+2x100G.bcm.

Co-authored-by: derek_sun <derek_sun@edge-core>
Co-authored-by: derek_sun <ecsonic@edge-core.com>
---
 .../hx5-as4630-48x1G+4x25G+2x100G.bcm           |   3 +++
 .../x86_64-accton_as4630_54pe-r0/custom_led.bin | Bin 952 -> 856 bytes
 2 files changed, 3 insertions(+)

diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/hx5-as4630-48x1G+4x25G+2x100G.bcm b/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/hx5-as4630-48x1G+4x25G+2x100G.bcm
index a7f89ba4c62d..331f6d002647 100755
--- a/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/hx5-as4630-48x1G+4x25G+2x100G.bcm
+++ b/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/hx5-as4630-48x1G+4x25G+2x100G.bcm
@@ -19,7 +19,10 @@ l2_mem_entries=32768
 #l3_mem_entries=49152
 #fpem_mem_entries=16384
 l2xmsg_mode=1
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
 port_flex_enable=1
+ifp_inports_support_enable=1
 
 #3x PM4x10Q (3 * 16 = 48 physical ports)
 #Doesn't support oversubscribe in Q mode
diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/custom_led.bin b/device/accton/x86_64-accton_as4630_54pe-r0/custom_led.bin
index b402867a7d204e5575047e5a148a3d4f471d3a71..0f6e37a82492be625674928a121f6394b7e9f964 100644
GIT binary patch
literal 856
zcmYk(JxmjE7zXh7-z!k02+CI}QrjL?OZ@;Ui9po5D}Ax4A%GzQSBO_MITr)CFcQ!R
zCL|)!0L4TT7bG!6!{kRG42I}%opdtYx@f|z4n9;-hTn6`-E;rvZfE@~U*%4Ya%O#M
zjby6Z@b^&E{MKU+&uc%@lksIHKgpu5DzL&8=Zh8bXo3x<xkSd{D~{MRPNc}C!84|4
znWhbWG~v{$Ey*V|n<W-0SeovqZC8wD+!c*pnpOmLu|u<^OYv+$#+&PD$o1@|!P~i>
z5C3{v_Vs*p>6CJphkdlD6j3)<qeqcz(KCUxXEu-`ml4*@Cq4EiN|lCbzM(#D%|%nH
zuBE6mw(Tx7?=vmjVU<fvf%nbQcYPJ#;iWm6kOEGv4Cn9Ty#>y{3oh|pcdR-<vr0D?
zD>pr}s%SPiwr@A3$FsZ3rQC9|Ze{;$uk=p1r?|iU|9-Ltvv%xFW)-f#Og<qmu`RsJ
zj!fL4gj4tn16OQ~j<fl}p!JL;bAe@3v@H?yWBs1_GeQ1duGR9bVfH9v+L+p-y@*In
zaUL?oh1V2iU4K8=%gx$n>jsCEA?-G{_ws5)3fBmC<Wn}UW%C-zl2PQ>45@X}*fcIS
zilnVkO-?4al3T-D*QK?cw{Q3rukcgedDqoS^n8uz9Ig=}(m;iFh(Q#pzy%dh31v_Y
zhu|=jKq(Z%K_~(z6v6>000-njK1g5(0X7K1NeDtcoPh>71*buVI`DxXj>8EEz%e)q
zUZ@2R)W8v_1~*KZx=XaxjO&j4P@yHfg`qr4YU}e%sePIxyOfa*^8U*1-8JAS3l)43
U-UrG<IYlld;#p8BL*9{&-#Eg>D*ylh

literal 952
zcma*lPe_w-7zgm@xA%3M&T9F0bN+d^cW(aw!xTvaU*B!NYEG#YqARFPgBR-HAxf}=
zAs9u6a1hK543h-CNam@6or3bR(Iq-f6zaI6bg}Q&kU9h%KF{+UzQ2d(9n0<B<P&_1
z`*`l{;<iX6laz9V=(hGFBzj`%&&=a-Y9`0hXp*NSg=*y$UOi+|Sd3o0<U)4SzdRCB
zmuZ?O>TFt^Q_@aeZquCF{P+&P;ajJ}u$v6ZJ1)2v{S_I(<x+KNmZXmI%r#oK%+LgX
zU^}!j_l6SWZslR)#t0h-YIjavyGXArsn$PUnu{-IY&Ct%^;+qpagMDS(dqUYvPM)f
zTaL;K^_e#LU%RUR+GQ^6k_x+e3cK?4ljaY;;#0mSv=_D#Qy%5-vRm_Cl%RHVrb@nU
zyFyPbAzHC8Ii>`79qv-(Cfv1vDrQrttWdX%2~v4TTMdc*lrVcJ*3(JpiSJ!wN<X<%
zuKTpfTebXe8RspddzJ(Rcp{wO9)+AcYH3E{l>2-nk|2k9rOMJ?s`p;yQ(D7GHjeC$
zT2@Hz9tm=wn6r3^iQajm;`x0+GNc<Y_UpSpW_+C4_ivFbM@)`rL>OF)>_>)s?NMEC
zB)S$oh#pKI%m~}(-#_PZzQ(tB?!)ClqV;W}<KyGuH0D|&vOqP|KqXYcS*U<BV1`q0
z8ca|QrBDV2FhU9FK>++KiGdE<p#xf>4Z5KRI-v_>aDp8i;D#1x1{XAe1P#y#HmC<H
z)PWaN7y%z#0zWKjQx<m4G$#ywd!uhNe2q~_;LGGHXOfuJNxG~cQI@3H3kyU4&Wgwq
gvN#~ikWC^Rgp0+VpB3;G`yBc`xC{9?-)D>SFCtRjr~m)}


From 57a6fb9f3955306d135c6ea10cc72b54eab8be47 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 4 Feb 2021 12:14:08 -0800
Subject: [PATCH 0139/1674] [pcie-check] Update underlying pcieutil command and
 add to sudoers file (#6682)

- Why I did it

As of Azure/sonic-utilities#1297, subcommands of pcieutil have changed to remove the redundant pcie- prefix. This PR adapts calling applications (pcie-check) to the new syntax.

Resolves #6676

- How I did it

Remove pcie- prefix from pcieutil subcommands in calling applications
Also add pcieutil * to sudoers file, as pcieutil requires elevated permissions
---
 files/image_config/pcie-check/pcie-check.sh | 4 ++--
 files/image_config/sudoers/sudoers          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/image_config/pcie-check/pcie-check.sh b/files/image_config/pcie-check/pcie-check.sh
index 4ef2ce3047f0..4257a2544c4a 100755
--- a/files/image_config/pcie-check/pcie-check.sh
+++ b/files/image_config/pcie-check/pcie-check.sh
@@ -16,11 +16,11 @@ function debug()
 
 function check_and_rescan_pcie_devices()
 {
-    PCIE_CHK_CMD='sudo pcieutil pcie-check |grep "$RESULTS"'
+    PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
     PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
     if [ ! -f /usr/share/sonic/device/$PLATFORM/plugins/pcie.yaml ]; then
-        debug "pcie.yaml does not exist! can't check pcie status!"
+        debug "pcie.yaml does not exist! Can't check PCIe status!"
         exit
     fi
 
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index aa03eda13719..8ec8799c7cca 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -34,6 +34,7 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/local/bin/decode-syseeprom, \
                                  /usr/local/bin/generate_dump, \
                                  /usr/local/bin/lldpshow, \
+                                 /usr/local/bin/pcieutil *, \
                                  /usr/local/bin/psuutil *, \
                                  /usr/local/bin/sonic-installer list, \
                                  /usr/local/bin/sfputil show *, \

From 276fade8c213d16790de0e1d5c4adb641772931f Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Fri, 5 Feb 2021 07:28:03 +0530
Subject: [PATCH 0140/1674] Dell S6000: Fix reboot failure issue (#6656)

Reboot command in Dell S6000 failed to reboot the switch. Added retry mechanism and CPU reset.
---
 .../platform_reboot                           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot b/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
index d973f4f810e1..28f2ec626605 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
@@ -4,10 +4,11 @@ import sys
 import os
 import struct
 
+PORT_RES = '/dev/port'
 NVRAM_RES = '/dev/nvram'
 COLD_RESET = 0xE     # Cold Reset
 WARM_RESET = 0x6     # Warm Reset
-
+RESET_REG = 0xCF9
 
 def io_reg_write(resource, offset, val):
     fd = os.open(resource, os.O_RDWR)
@@ -23,39 +24,40 @@ def io_reg_write(resource, offset, val):
         return
     os.close(fd)
 
-
 def power_reset(val):
     with open('/sys/devices/platform/dell-s6000-cpld.0/power_reset', 'w') as p:
         p.write(str(int(val)) + '\n')
         p.flush()
 
-
 def gpio_direction(pin, direction):
     kernpath = '/sys/class/gpio/gpio'+str(pin)+'/direction'
     with open(('kernpath'), 'w') as p:
         p.write(str(direction) + '\n')
         p.flush()
 
-
 def gpio_set(pin, value):
     kernpath = '/sys/class/gpio/gpio'+str(pin)+'/value'
     with open(('kernpath'), 'w') as p:
         p.write(str(int(value)) + '\n')
         p.flush()
 
-
 def gpio_export(value):
     with open('/sys/class/gpio/export', 'w') as p:
         p.write(str(int(value)) + '\n')
         p.flush()
 
-
 if __name__ == "__main__":
+
+    retry_count = 0
     io_reg_write(NVRAM_RES, 0x49, COLD_RESET)
-    if not os.path.isdir("/sys/class/gpio/gpio10"):
-        gpio_export(10)
-    gpio_direction("10", "out")
-    # Toggle GPIO10 pin (to reset MUX)
-    gpio_set("10", 1)
-    gpio_set("10", 0)
-    power_reset(1)
+
+    while retry_count < 3:
+        if not os.path.isdir("/sys/class/gpio/gpio10"):
+            gpio_export(10)
+        gpio_direction("10", "out")
+        # Toggle GPIO10 pin (to reset MUX)
+        gpio_set("10", 1)
+        gpio_set("10", 0)
+        power_reset(1)
+        retry_count += 1
+    io_reg_write(PORT_RES, RESET_REG, COLD_RESET) 

From 0bae3b44ec33f1b325829e29ded5dd8d28d20482 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 5 Feb 2021 20:30:08 +0000
Subject: [PATCH 0141/1674] DellEMC: S6100, S6000 - Enable thermalctld,
 Platform API implementation and fixes (#6438)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**- Why I did it**

To incorporate the below changes in DellEMC S6100, S6000 platforms.

- S6100, S6000:
    - Enable 'thermalctld'
    - Implement DeviceBase methods (presence, status, model, serial) for Fantray and Component
    - Implement ‘get_position_in_parent’, ‘is_replaceable’ methods for all device types
    - Implement ‘get_status’ method for Fantray
    - Implement ‘get_temperature’, ‘get_temperature_high_threshold’, ‘get_voltage_high_threshold’, ‘get_voltage_low_threshold’ methods for PSU
    - Implement ‘get_status_led’, ‘set_status_led’ methods for Chassis
    - SFP:
        - Make EEPROM read both Python2 and Python3 compatible
        - Fix ‘get_tx_disable_channel’ method’s return type
        - Implement ‘tx_disable’, ‘tx_disable_channel’ and ‘set_power_override’ methods
- S6000:
    - Move PSU thermal sensors from Chassis to respective PSU
    - Make available the data of both Fans present in each Fantray


**- How I did it**

- Remove 'skip_thermalctld:true' in pmon_daemon_control.json
- Implement the platform API methods in the respective device files
- Use `bytearray` for data read from transceiver EEPROM
- Change return type of 'get_tx_disable_channel' to match specification in sonic_platform_common/sfp_base.py
---
 .../pmon_daemon_control.json                  |   3 +-
 .../pmon_daemon_control.json                  |   3 +-
 .../common/dell_pmc.c                         |  46 +++++
 .../s6000/sonic_platform/chassis.py           |  77 ++++++++-
 .../s6000/sonic_platform/component.py         |  53 +++++-
 .../s6000/sonic_platform/eeprom.py            |  14 +-
 .../s6000/sonic_platform/fan.py               | 152 ++++++----------
 .../s6000/sonic_platform/fan_drawer.py        | 162 +++++++++++++++++-
 .../s6000/sonic_platform/psu.py               |  72 +++++++-
 .../s6000/sonic_platform/sfp.py               | 120 +++++++++----
 .../s6000/sonic_platform/thermal.py           |  39 ++++-
 .../s6100/sonic_platform/chassis.py           |  81 +++++++++
 .../s6100/sonic_platform/component.py         |  58 ++++++-
 .../s6100/sonic_platform/fan.py               | 104 +++++------
 .../s6100/sonic_platform/fan_drawer.py        | 137 ++++++++++++++-
 .../s6100/sonic_platform/module.py            |  19 +-
 .../s6100/sonic_platform/psu.py               |  88 +++++++++-
 .../s6100/sonic_platform/sfp.py               | 119 +++++++++----
 .../s6100/sonic_platform/thermal.py           |  17 ++
 19 files changed, 1084 insertions(+), 280 deletions(-)

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json b/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
index 44871c057e82..94592fa8cebc 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
@@ -1,4 +1,3 @@
 {
-    "skip_ledd": true,
-    "skip_thermalctld": true
+    "skip_ledd": true
 }
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json b/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
index 44871c057e82..94592fa8cebc 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
@@ -1,4 +1,3 @@
 {
-    "skip_ledd": true,
-    "skip_thermalctld": true
+    "skip_ledd": true
 }
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/dell_pmc.c b/platform/broadcom/sonic-platform-modules-dell/common/dell_pmc.c
index 3193e8b4642f..5712c0fbb552 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/dell_pmc.c
+++ b/platform/broadcom/sonic-platform-modules-dell/common/dell_pmc.c
@@ -174,6 +174,9 @@
 /* Mailbox PowerOn Reason */
 #define TRACK_POWERON_REASON    0x05FF
 
+/* System Status LED */
+#define SYSTEM_STATUS_LED       0x04DF
+
 /* CPU Set IO Modules */
 #define CPU_IOM1_CTRL_FLAG 0x04D9
 #define CPU_IOM2_CTRL_FLAG 0x04DA
@@ -607,6 +610,44 @@ static ssize_t show_mb_poweron_reason(struct device *dev,
     return sprintf(buf, "0x%x\n", ret);
 }
 
+/* System Status LED */
+static ssize_t set_sys_status_led(struct device *dev,
+              struct device_attribute *devattr, const char *buf, size_t count)
+{
+    int              err = 0;
+    unsigned int     dev_data = 0;
+    struct smf_data *data = dev_get_drvdata(dev);
+
+    if (data->kind == z9100smf)
+	return -1;
+
+    err = kstrtouint(buf, 16, &dev_data);
+    if (err)
+        return err;
+
+    err = smf_write_reg(data, SYSTEM_STATUS_LED, dev_data);
+    if(err < 0)
+	return err;
+
+    return count;
+}
+
+static ssize_t show_sys_status_led(struct device *dev,
+                struct device_attribute *devattr, char *buf)
+{
+    unsigned int     ret = 0;
+    struct smf_data *data = dev_get_drvdata(dev);
+
+    if (data->kind == z9100smf)
+	return 0;
+
+    ret = smf_read_reg(data, SYSTEM_STATUS_LED);
+    if(ret < 0)
+       return ret;
+
+    return sprintf(buf, "0x%x\n", ret);
+}
+
 /* FANIN ATTR */
 static ssize_t
 show_fan_label(struct device *dev, struct device_attribute *attr, char *buf)
@@ -2081,12 +2122,17 @@ static SENSOR_DEVICE_ATTR(smf_poweron_reason, S_IRUGO,
 static SENSOR_DEVICE_ATTR(mb_poweron_reason, S_IRUGO|S_IWUSR,
                             show_mb_poweron_reason, set_mb_poweron_reason, 0);
 
+/* System Status LED */
+static SENSOR_DEVICE_ATTR(sys_status_led, S_IRUGO|S_IWUSR,
+                            show_sys_status_led, set_sys_status_led, 0);
+
 static struct attribute *smf_dell_attrs[] = {
         &sensor_dev_attr_smf_version.dev_attr.attr,
         &sensor_dev_attr_smf_firmware_ver.dev_attr.attr,
         &sensor_dev_attr_smf_reset_reason.dev_attr.attr,
         &sensor_dev_attr_smf_poweron_reason.dev_attr.attr,
         &sensor_dev_attr_mb_poweron_reason.dev_attr.attr,
+        &sensor_dev_attr_sys_status_led.dev_attr.attr,
         &sensor_dev_attr_fan_tray_presence.dev_attr.attr,
         &sensor_dev_attr_fan1_airflow.dev_attr.attr,
         &sensor_dev_attr_fan3_airflow.dev_attr.attr,
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
index 899754709bcc..7f6e9ec573f4 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
@@ -24,7 +24,7 @@
 
 MAX_S6000_FANTRAY = 3
 MAX_S6000_PSU = 2
-MAX_S6000_THERMAL = 10
+MAX_S6000_THERMAL = 6
 MAX_S6000_COMPONENT = 4
 
 
@@ -44,6 +44,8 @@ class Chassis(ChassisBase):
 
     def __init__(self):
         ChassisBase.__init__(self)
+        self.status_led_reg = "system_led"
+        self.supported_led_color = ['green', 'blinking green', 'amber', 'blinking amber']
         # Initialize SFP list
         self.PORT_START = 0
         self.PORT_END = 31
@@ -101,13 +103,30 @@ def _get_cpld_register(self, reg_name):
         try:
             with open(mb_reg_file, 'r') as fd:
                 rv = fd.read()
-        except Exception as error:
+        except IOError:
             rv = 'ERR'
 
         rv = rv.rstrip('\r\n')
         rv = rv.lstrip(" ")
         return rv
 
+    def _set_cpld_register(self, reg_name, value):
+        # On successful write, returns the value will be written on
+        # reg_name and on failure returns 'ERR'
+        rv = 'ERR'
+        cpld_reg_file = self.CPLD_DIR+'/'+reg_name
+
+        if (not os.path.isfile(cpld_reg_file)):
+            return rv
+
+        try:
+            with open(cpld_reg_file, 'w') as fd:
+                rv = fd.write(str(value))
+        except IOError:
+            rv = 'ERR'
+
+        return rv
+
     def _nvram_write(self, offset, val):
         resource = "/dev/nvram"
         fd = os.open(resource, os.O_RDWR)
@@ -179,6 +198,23 @@ def get_status(self):
         """
         return True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether Chassis is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the chassis
@@ -305,4 +341,41 @@ def get_change_event(self, timeout=0):
                     return True, ret_dict
         return False, ret_dict
 
+    def set_status_led(self, color):
+        """
+        Sets the state of the system LED
 
+        Args:
+            color: A string representing the color with which to set the
+                   system LED
+
+        Returns:
+            bool: True if system LED state is set successfully, False if not
+        """
+        if color not in self.supported_led_color:
+            return False
+
+        # Change color string format to the one used by driver
+        color = color.replace('amber', 'yellow')
+        color = color.replace('blinking ', 'blink_')
+        rv = self._set_cpld_register(self.status_led_reg, color)
+        if (rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status_led(self):
+        """
+        Gets the state of the system LED
+
+        Returns:
+            A string, one of the valid LED color strings which could be vendor
+            specified.
+        """
+        status_led = self._get_cpld_register(self.status_led_reg)
+        if (status_led != 'ERR'):
+            status_led = status_led.replace('yellow', 'amber')
+            status_led = status_led.replace('blink_', 'blinking ')
+            return status_led
+        else:
+            return None
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
index 1e21c233f5d8..d9459be47c4f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
@@ -29,8 +29,8 @@ class Component(ComponentBase):
                   "booting")],
         ["System-CPLD", "Used for managing CPU board devices and power"],
         ["Master-CPLD", ("Used for managing Fan, PSU, system LEDs, QSFP "
-                         "modules (1-16)")],
-        ["Slave-CPLD", "Used for managing QSFP modules (17-32)"]
+                         "modules (17-32)")],
+        ["Slave-CPLD", "Used for managing QSFP modules (1-16)"]
     ]
 
     def __init__(self, component_index):
@@ -90,6 +90,55 @@ def get_name(self):
         """
         return self.name
 
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'NA'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'NA'
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the component
+        Returns:
+            bool: True if  present, False if not
+        """
+        return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the component
+        Returns:
+            bool: True if component is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether component is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_description(self):
         """
         Retrieves the description of the component
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/eeprom.py
index ef736089c44b..5afe0112441b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/eeprom.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/eeprom.py
@@ -36,8 +36,8 @@
     ('Fab Rev', 's', 2)
     ]
 
-# Fan eeprom fields in format required by EepromDecoder
-fan_eeprom_format = [
+# FanTray eeprom fields in format required by EepromDecoder
+fantray_eeprom_format = [
     ('PPID', 's', 20), ('DPN Rev', 's', 3), ('Service Tag', 's', 7),
     ('Part Number', 's', 10), ('Part Num Revision', 's', 3),
     ('Mfg Test', 's', 2), ('Redundant copy', 's', 83),
@@ -51,10 +51,10 @@ class Eeprom(TlvInfoDecoder):
 
     I2C_DIR = "/sys/class/i2c-adapter/"
 
-    def __init__(self, is_psu=False, psu_index=0, is_fan=False, fan_index=0):
+    def __init__(self, is_psu=False, psu_index=0, is_fantray=False, fantray_index=0):
         self.is_psu_eeprom = is_psu
-        self.is_fan_eeprom = is_fan
-        self.is_sys_eeprom = not (is_psu | is_fan)
+        self.is_fantray_eeprom = is_fantray
+        self.is_sys_eeprom = not (is_psu | is_fantray)
 
         if self.is_sys_eeprom:
             self.start_offset = 0
@@ -71,10 +71,10 @@ def __init__(self, is_psu=False, psu_index=0, is_fan=False, fan_index=0):
                     + "i2c-1/1-005{}/eeprom".format(2 - self.index)
                 self.format = psu_eeprom_format
             else:
-                self.index = fan_index
+                self.index = fantray_index
                 self.eeprom_path = self.I2C_DIR \
                     + "i2c-11/11-005{}/eeprom".format(4 - self.index)
-                self.format = fan_eeprom_format
+                self.format = fantray_eeprom_format
             EepromDecoder.__init__(self, self.eeprom_path, self.format,
                                    self.start_offset, '', True)
             self._load_device_eeprom()
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
index fbdbf650db73..d5a4f379e90b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
@@ -13,7 +13,6 @@
     import os
     import glob
     from sonic_platform_base.fan_base import FanBase
-    from sonic_platform.eeprom import Eeprom
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -25,33 +24,37 @@
 class Fan(FanBase):
     """DellEMC Platform-specific Fan class"""
 
-    CPLD_DIR = "/sys/devices/platform/dell-s6000-cpld.0/"
     I2C_DIR = "/sys/class/i2c-adapter/"
-
-    def __init__(self, fan_index, psu_fan=False, dependency=None):
+    FAN_DEV_MAPPING = {
+        1: {1: ("i2c-11/11-002a", 1), 2: ("i2c-11/11-002a", 2)},
+        2: {1: ("i2c-11/11-0029", 3), 2: ("i2c-11/11-0029", 4)},
+        3: {1: ("i2c-11/11-0029", 1), 2: ("i2c-11/11-0029", 2)}
+    }
+
+    def __init__(self, fantray_index=1, fan_index=1,
+                 psu_index=1, psu_fan=False, dependency=None):
         self.is_psu_fan = psu_fan
         self.is_driver_initialized = True
 
         if not self.is_psu_fan:
             # Fan is 1-based in DellEMC platforms
-            self.index = fan_index + 1
-            self.fan_presence_reg = "fan_prs"
-            self.fan_led_reg = "fan{}_led".format(fan_index)
-            self.get_fan_speed_reg = self.I2C_DIR + "i2c-11/11-0029/" +\
-                    "fan{}_input".format(self.index)
-            self.set_fan_speed_reg = self.I2C_DIR + "i2c-11/11-0029/" +\
-                    "fan{}_target".format(self.index)
-            self.eeprom = Eeprom(is_fan=True, fan_index=self.index)
+            self.fantray_index = fantray_index
+            self.index = fan_index
+            self.dependency = dependency
+            self.get_fan_speed_reg = self.I2C_DIR +\
+                    "{}/fan{}_input".format(*self.FAN_DEV_MAPPING[fantray_index][fan_index])
+            self.set_fan_speed_reg = self.I2C_DIR +\
+                    "{}/fan{}_target".format(*self.FAN_DEV_MAPPING[fantray_index][fan_index])
             self.max_fan_speed = MAX_S6000_FAN_SPEED
-            self.supported_led_color = ['off', 'green', 'amber']
         else:
-            self.index = fan_index
+            self.psu_index = psu_index
+            self.index = 1
             self.dependency = dependency
             self.set_fan_speed_reg = self.I2C_DIR +\
-                    "i2c-1/1-005{}/fan1_target".format(10 - self.index)
+                    "i2c-1/1-005{}/fan1_target".format(10 - self.psu_index)
 
             hwmon_dir = self.I2C_DIR +\
-                    "i2c-1/1-005{}/hwmon/".format(10 - self.index)
+                    "i2c-1/1-005{}/hwmon/".format(10 - self.psu_index)
             try:
                 hwmon_node = os.listdir(hwmon_dir)[0]
             except OSError:
@@ -61,43 +64,6 @@ def __init__(self, fan_index, psu_fan=False, dependency=None):
             self.get_fan_speed_reg = hwmon_dir + hwmon_node + '/fan1_input'
             self.max_fan_speed = MAX_S6000_PSU_FAN_SPEED
 
-    def _get_cpld_register(self, reg_name):
-        # On successful read, returns the value read from given
-        # reg_name and on failure returns 'ERR'
-        rv = 'ERR'
-        cpld_reg_file = self.CPLD_DIR + reg_name
-
-        if (not os.path.isfile(cpld_reg_file)):
-            return rv
-
-        try:
-           with open(cpld_reg_file, 'r') as fd:
-                rv = fd.read()
-        except:
-            rv = 'ERR'
-
-        rv = rv.rstrip('\r\n')
-        rv = rv.lstrip(" ")
-        return rv
-
-    def _set_cpld_register(self, reg_name, value):
-        # On successful write, returns the value will be written on
-        # reg_name and on failure returns 'ERR'
-        rv = 'ERR'
-        cpld_reg_file = self.CPLD_DIR + reg_name
-
-        if (not os.path.isfile(cpld_reg_file)):
-            print("open error")
-            return rv
-
-        try:
-           with open(cpld_reg_file, 'w') as fd:
-                rv = fd.write(str(value))
-        except:
-            rv = 'ERR'
-
-        return rv
-
     def _get_i2c_register(self, reg_file):
         # On successful read, returns the value read from given
         # reg_name and on failure returns 'ERR'
@@ -155,9 +121,9 @@ def get_name(self):
             string: The name of the Fan
         """
         if not self.is_psu_fan:
-            return "FanTray{}-Fan1".format(self.index)
+            return "FanTray{}-Fan{}".format(self.fantray_index, self.index)
         else:
-            return "PSU{} Fan".format(self.index)
+            return "PSU{} Fan".format(self.psu_index)
 
     def get_presence(self):
         """
@@ -166,42 +132,23 @@ def get_presence(self):
         Returns:
             bool: True if Fan is present, False if not
         """
-        status = False
-        if self.is_psu_fan:
-            return self.dependency.get_presence()
-
-        fan_presence = self._get_cpld_register(self.fan_presence_reg)
-        if (fan_presence != 'ERR'):
-            fan_presence = int(fan_presence,16) & self.index
-            if fan_presence:
-                status = True
-
-        return status
+        return self.dependency.get_presence()
 
     def get_model(self):
         """
         Retrieves the part number of the Fan
-
         Returns:
             string: Part number of Fan
         """
-        if not self.is_psu_fan:
-            return self.eeprom.get_part_number()
-        else:
-            return 'NA'
+        return 'NA'
 
     def get_serial(self):
         """
         Retrieves the serial number of the Fan
-
         Returns:
             string: Serial number of Fan
         """
-        # Sample Serial number format "US-01234D-54321-25A-0123-A00"
-        if not self.is_psu_fan:
-            return self.eeprom.get_serial_number()
-        else:
-            return 'NA'
+        return 'NA'
 
     def get_status(self):
         """
@@ -218,6 +165,23 @@ def get_status(self):
 
         return status
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether Fan is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_direction(self):
         """
         Retrieves the fan airflow direction
@@ -234,11 +198,10 @@ def get_direction(self):
         if self.is_psu_fan:
             direction = {1: self.FAN_DIRECTION_EXHAUST, 2: self.FAN_DIRECTION_INTAKE,
                          3: self.FAN_DIRECTION_EXHAUST, 4: self.FAN_DIRECTION_INTAKE}
-            fan_direction = self.dependency.eeprom.airflow_fan_type()
         else:
             direction = {1: self.FAN_DIRECTION_EXHAUST, 2: self.FAN_DIRECTION_INTAKE}
-            fan_direction = self.eeprom.airflow_fan_type()
 
+        fan_direction = self.dependency.eeprom.airflow_fan_type()
         return direction.get(fan_direction, self.FAN_DIRECTION_NOT_APPLICABLE)
 
     def get_speed(self):
@@ -282,8 +245,8 @@ def set_speed(self, speed):
         Returns:
             bool: True if set success, False if fail.
         """
-        fan_set = (speed * self.max_fan_speed)/ 100
-        rv = self._set_i2c_register(self.set_fan_speed_reg , fan_set)
+        fan_set = (speed * self.max_fan_speed) // 100
+        rv = self._set_i2c_register(self.set_fan_speed_reg, fan_set)
         if (rv != 'ERR'):
             return True
         else:
@@ -298,16 +261,9 @@ def set_status_led(self, color):
         Returns:
             bool: True if set success, False if fail.
         """
-        if self.is_psu_fan or (color not in self.supported_led_color):
-            return False
-        if(color == self.STATUS_LED_COLOR_AMBER):
-            color = 'yellow'
-
-        rv = self._set_cpld_register(self.fan_led_reg ,color)
-        if (rv != 'ERR'):
-            return True
-        else:
-            return False
+        # No LED available for FanTray and PSU Fan
+        # Return True to avoid thermalctld alarm.
+        return True
 
     def get_status_led(self):
         """
@@ -316,18 +272,8 @@ def get_status_led(self):
         Returns:
             A string, one of the predefined STATUS_LED_COLOR_* strings.
         """
-        if self.is_psu_fan:
-            # No LED available for PSU Fan
-            return None
-
-        fan_led = self._get_cpld_register(self.fan_led_reg)
-        if (fan_led != 'ERR'):
-            if (fan_led == 'yellow'):
-                return self.STATUS_LED_COLOR_AMBER
-            else:
-                return fan_led
-        else:
-            return self.STATUS_LED_COLOR_OFF
+        # No LED available for FanTray and PSU Fan
+        return None
 
     def get_target_speed(self):
         """
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan_drawer.py
index c8ea283e5ba4..2e5e3446cd80 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan_drawer.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan_drawer.py
@@ -9,26 +9,176 @@
 ########################################################################
 
 try:
+    import os
+
     from sonic_platform_base.fan_drawer_base import FanDrawerBase
+    from sonic_platform.eeprom import Eeprom
     from sonic_platform.fan import Fan
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+MAX_S6000_FANS_PER_FANTRAY = 2
+
 
 class FanDrawer(FanDrawerBase):
-    """DellEMC Platform-specific Fan class"""
+    """DellEMC Platform-specific Fan Drawer class"""
 
-    def __init__(self, fantray_index):
+    CPLD_DIR = "/sys/devices/platform/dell-s6000-cpld.0/"
 
+    def __init__(self, fantray_index):
         FanDrawerBase.__init__(self)
         # FanTray is 1-based in DellEMC platforms
-        self.fantrayindex = fantray_index + 1
-        self._fan_list.append(Fan(fantray_index))
+        self.index = fantray_index + 1
+        self.eeprom = Eeprom(is_fantray=True, fantray_index=self.index)
+        self.fantray_presence_reg = "fan_prs"
+        self.fantray_led_reg = "fan{}_led".format(self.index - 1)
+        self.supported_led_color = ['off', 'green', 'amber']
+
+        for i in range(1, MAX_S6000_FANS_PER_FANTRAY+1):
+            self._fan_list.append(Fan(fantray_index=self.index, fan_index=i, dependency=self))
+
+    def _get_cpld_register(self, reg_name):
+        # On successful read, returns the value read from given
+        # reg_name and on failure returns 'ERR'
+        rv = 'ERR'
+        cpld_reg_file = self.CPLD_DIR + reg_name
+
+        if (not os.path.isfile(cpld_reg_file)):
+            return rv
+
+        try:
+            with open(cpld_reg_file, 'r') as fd:
+                rv = fd.read()
+        except IOError:
+            rv = 'ERR'
+
+        rv = rv.rstrip('\r\n')
+        rv = rv.lstrip(" ")
+        return rv
+
+    def _set_cpld_register(self, reg_name, value):
+        # On successful write, returns the value will be written on
+        # reg_name and on failure returns 'ERR'
+        rv = 'ERR'
+        cpld_reg_file = self.CPLD_DIR + reg_name
+
+        if (not os.path.isfile(cpld_reg_file)):
+            return rv
+
+        try:
+            with open(cpld_reg_file, 'w') as fd:
+                rv = fd.write(str(value))
+        except IOError:
+            rv = 'ERR'
+
+        return rv
 
     def get_name(self):
         """
-        Retrieves the fan drawer name
+        Retrieves the Fandrawer name
         Returns:
             string: The name of the device
         """
-        return "FanTray{}".format(self.fantrayindex)
+        return "FanTray{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Fandrawer
+
+        Returns:
+            bool: True if Fandrawer is present, False if not
+        """
+        presence = False
+
+        fantray_presence = self._get_cpld_register(self.fantray_presence_reg)
+        if (fantray_presence != 'ERR'):
+            fantray_presence = int(fantray_presence, 16) & (1 << (self.index - 1))
+            if fantray_presence:
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the part number of the Fandrawer
+
+        Returns:
+            string: Part number of Fandrawer
+        """
+        return self.eeprom.get_part_number()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the Fandrawer
+
+        Returns:
+            string: Serial number of Fandrawer
+        """
+        # Sample Serial number format "US-01234D-54321-25A-0123-A00"
+        return self.eeprom.get_serial_number()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the Fandrawer
+
+        Returns:
+            bool: True if Fandrawer is operating properly, False if not
+        """
+        status = True
+        for fan in self.get_all_fans():
+            status &= fan.get_status()
+
+        return status
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this fan drawer is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def set_status_led(self, color):
+        """
+        Set led to expected color
+        Args:
+            color: A string representing the color with which to set the
+                   fandrawer status LED
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        if color not in self.supported_led_color:
+            return False
+        if color == self.STATUS_LED_COLOR_AMBER:
+            color = 'yellow'
+
+        rv = self._set_cpld_register(self.fantray_led_reg, color)
+        if (rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status_led(self):
+        """
+        Gets the state of the fandrawer status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings.
+        """
+        fantray_led = self._get_cpld_register(self.fantray_led_reg)
+        if (fantray_led != 'ERR'):
+            if (fantray_led == 'yellow'):
+                return self.STATUS_LED_COLOR_AMBER
+            else:
+                return fantray_led
+        else:
+            return self.STATUS_LED_COLOR_OFF
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/psu.py
index af52ccedbc44..e217c0a08c40 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/psu.py
@@ -15,9 +15,12 @@
     from sonic_platform_base.psu_base import PsuBase
     from sonic_platform.eeprom import Eeprom
     from sonic_platform.fan import Fan
+    from sonic_platform.thermal import Thermal
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+MAX_S6000_THERMALS_PER_PSU = 2
+
 
 class Psu(PsuBase):
     """DellEMC Platform-specific PSU class"""
@@ -53,7 +56,10 @@ def __init__(self, psu_index):
 
         self.eeprom = Eeprom(is_psu=True, psu_index=self.index)
 
-        self._fan_list.append(Fan(self.index, psu_fan=True, dependency=self))
+        self._fan_list.append(Fan(psu_index=self.index, psu_fan=True, dependency=self))
+        for i in range(1, MAX_S6000_THERMALS_PER_PSU+1):
+            self._thermal_list.append(Thermal(psu_index=self.index, thermal_index=i,
+                                              psu_thermal=True, dependency=self))
 
     def _get_cpld_register(self, reg_name):
         # On successful read, returns the value read from given
@@ -171,6 +177,23 @@ def get_status(self):
 
         return status
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether PSU is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
     def get_voltage(self):
         """
         Retrieves current PSU voltage output
@@ -266,3 +289,50 @@ def set_status_led(self, color):
         # In S6000, the firmware running in the PSU controls the LED
         # and the PSU LED state cannot be changed from CPU.
         return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+
+        Returns:
+            A float number of current temperature in Celsius up to
+            nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        if self.get_presence():
+            return self.get_thermal(0).get_temperature()
+        else:
+            return 0.0
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+
+        Returns:
+            A float number, the high threshold temperature of PSU in
+            Celsius up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        """
+        if self.get_presence():
+            return self.get_thermal(0).get_high_threshold()
+        else:
+            return 0.0
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+
+        Returns:
+            A float number, the high threshold output voltage in volts,
+            e.g. 12.1
+        """
+        return 12.6
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+
+        Returns:
+            A float number, the low threshold output voltage in volts,
+            e.g. 12.1
+        """
+        return 11.4
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
index 175e601dbe76..b66cb31ec96b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
@@ -10,6 +10,7 @@
 
 try:
     import re
+    import struct
     import time
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
@@ -27,6 +28,9 @@
 DOM_OFFSET = 0
 DOM_OFFSET1 = 384
 
+QSFP_CONTROL_OFFSET = 86
+QSFP_POWEROVERRIDE_OFFSET = 93
+
 cable_length_tup = ('Length(km)', 'Length OM3(2m)', 'Length OM2(m)',
                     'Length OM1(m)', 'Length Cable Assembly(m)')
 
@@ -108,7 +112,7 @@ def __init__(self, index, sfp_type, eeprom_path,
             sfp_control, sfp_ctrl_idx):
         SfpBase.__init__(self)
         self.sfp_type = sfp_type
-        self.index = index
+        self.index = index + 1
         self.eeprom_path = eeprom_path
         self.sfp_control = sfp_control
         self.sfp_ctrl_idx = sfp_ctrl_idx
@@ -132,9 +136,10 @@ def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
             eeprom.close()
             return None
 
+        raw = bytearray(raw)
         try:
             for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
         except BaseException:
             eeprom.close()
             return None
@@ -588,40 +593,14 @@ def get_tx_disable_channel(self):
         """
         Retrieves the TX disabled channels in this SFP
         """
-        tx_disable = None
-        tx_disable_list = []
+        tx_disable_channel = 0
 
-        tx_disable_data = self._get_eeprom_data('tx_disable')
-        if (tx_disable_data is not None):
-            tx_disable = tx_disable_data['data']['Tx1Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx2Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx3Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx4Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-
-            bit4 = int(tx_disable_list[3]) * 8
-            bit3 = int(tx_disable_list[2]) * 4
-            bit2 = int(tx_disable_list[1]) * 2
-            bit1 = int(tx_disable_list[0]) * 1
-
-            tx_disable_channel = hex(bit4 + bit3 + bit2 + bit1)
+        tx_disable = self.get_tx_disable()
+        for channel, disable in enumerate(tx_disable):
+            if disable:
+                tx_disable_channel |= 1 << channel
 
-            return tx_disable_channel
+        return tx_disable_channel
 
     def get_lpmode(self):
         """
@@ -722,7 +701,6 @@ def get_rx_power(self):
 
         return rx_power_list
 
-
     def get_tx_power(self):
         """
         Retrieves the TX power of this SFP
@@ -822,19 +800,68 @@ def tx_disable(self, tx_disable):
         """
         Disable SFP TX for all channels
         """
-        return False
+        eeprom = None
+        tx_disable_value = 0xf if tx_disable else 0x0
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_CONTROL_OFFSET)
+            eeprom.write(struct.pack('B', tx_disable_value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def tx_disable_channel(self, channel, disable):
         """
         Sets the tx_disable for specified SFP channels
         """
-        return False
+        eeprom = None
+        current_state = self.get_tx_disable_channel()
+
+        if disable:
+            tx_disable_value = current_state | channel
+        else:
+            tx_disable_value = current_state & (~channel)
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_CONTROL_OFFSET)
+            eeprom.write(struct.pack('B', tx_disable_value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def set_power_override(self, power_override, power_set):
         """
         Sets SFP power level using power_override and power_set
         """
-        return False
+        eeprom = None
+        power_override_bit = 0x1 if power_override else 0
+        power_set_bit = 0x2 if power_set else 0
+        value = power_override_bit | power_set_bit
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+            eeprom.write(struct.pack('B', value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def get_status(self):
         """
@@ -848,3 +875,20 @@ def get_status(self):
             status = True
 
         return status
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device  is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
index 2f130ebabbb3..ad089a8946a9 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
@@ -13,7 +13,6 @@
     import os
     import glob
     from sonic_platform_base.thermal_base import ThermalBase
-    from sonic_platform.psu import Psu
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -34,11 +33,20 @@ class Thermal(ThermalBase):
                     'PSU1-Sensor 1', 'PSU1-Sensor 2', 'PSU2-Sensor 1',
                     'PSU2-Sensor 2', 'CPU Core 0', 'CPU Core 1')
 
-    def __init__(self, thermal_index):
-        self.index = thermal_index + 1
-        self.is_psu_thermal = False
+    def __init__(self, thermal_index,
+                 psu_index=1, psu_thermal=False, dependency=None):
+        self.is_psu_thermal = psu_thermal
+        self.dependency = dependency
         self.is_driver_initialized = True
-        self.dependency = None
+
+        if self.is_psu_thermal:
+            self.index = (2 * psu_index) + thermal_index + 2
+        else:
+            # CPU thermal
+            if thermal_index > 3:
+                self.index = thermal_index + 5
+            else:
+                self.index = thermal_index + 1
 
         if self.index < 9:
             i2c_path = self.I2C_DIR + self.I2C_DEV_MAPPING[self.index - 1][0]
@@ -54,10 +62,6 @@ def __init__(self, thermal_index):
 
             if self.index == 4:
                 hwmon_temp_suffix = "crit"
-
-            if self.index > 4:
-                self.is_psu_thermal = True
-                self.dependency = Psu(self.index / 7)
         else:
             dev_path = "/sys/devices/platform/coretemp.0/hwmon/"
             hwmon_temp_index = self.index - 7
@@ -168,6 +172,23 @@ def get_status(self):
         else:
             return True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether Thermal is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_temperature(self):
         """
         Retrieves current temperature reading from thermal
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
index 47ef87b951db..f8e009cdbefd 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
@@ -54,9 +54,21 @@ class Chassis(ChassisBase):
     power_reason_dict[33] = ChassisBase.REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC
     power_reason_dict[44] = ChassisBase.REBOOT_CAUSE_INSUFFICIENT_FAN_SPEED
 
+    status_led_reg_to_color = {
+        0x00: 'green', 0x01: 'blinking green', 0x02: 'amber',
+        0x04: 'amber', 0x08: 'blinking amber', 0x10: 'blinking amber'
+    }
+
+    color_to_status_led_reg = {
+        'green': 0x00, 'blinking green': 0x01,
+        'amber': 0x02, 'blinking amber': 0x08
+    }
+
     def __init__(self):
 
         ChassisBase.__init__(self)
+        self.status_led_reg = "sys_status_led"
+        self.supported_led_color = ['green', 'blinking green', 'amber', 'blinking amber']
         # Initialize EEPROM
         self._eeprom = Eeprom()
         for i in range(MAX_S6100_MODULE):
@@ -113,6 +125,23 @@ def _get_pmc_register(self, reg_name):
         rv = rv.lstrip(" ")
         return rv
 
+    def _set_pmc_register(self, reg_name, value):
+        # On successful write, returns the length of value written on
+        # reg_name and on failure returns 'ERR'
+        rv = 'ERR'
+        mb_reg_file = self.MAILBOX_DIR + '/' + reg_name
+
+        if (not os.path.isfile(mb_reg_file)):
+            return rv
+
+        try:
+            with open(mb_reg_file, 'w') as fd:
+                rv = fd.write(str(value))
+        except IOError:
+            rv = 'ERR'
+
+        return rv
+
     def _get_register(self, reg_file):
         # On successful read, returns the value read from given
         # reg_name and on failure returns 'ERR'
@@ -172,6 +201,23 @@ def get_status(self):
         """
         return True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether Chassis is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the chassis
@@ -325,3 +371,38 @@ def get_change_event(self, timeout=0):
                     break
 
         return True, ret_dict
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the system LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   system LED
+
+        Returns:
+            bool: True if system LED state is set successfully, False if not
+        """
+        if color not in self.supported_led_color:
+            return False
+
+        value = self.color_to_status_led_reg[color]
+        rv = self._set_pmc_register(self.status_led_reg, value)
+        if (rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status_led(self):
+        """
+        Gets the state of the system LED
+
+        Returns:
+            A string, one of the valid LED color strings which could be
+            vendor specified.
+        """
+        reg_val = self._get_pmc_register(self.status_led_reg)
+        if (reg_val != 'ERR'):
+            return self.status_led_reg_to_color.get(int(reg_val, 16), None)
+        else:
+            return None
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
index 6b1420a98606..bea180d440b5 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
@@ -39,9 +39,10 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index=0,
-                 is_module=False, iom_index=0, i2c_line=0):
+                 is_module=False, iom_index=0, i2c_line=0, dependency=None):
 
         self.is_module_component = is_module
+        self.dependency = dependency
 
         if self.is_module_component:
             self.index = iom_index
@@ -132,6 +133,61 @@ def get_name(self):
         """
         return self.name
 
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'NA'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'NA'
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the component
+        Returns:
+            bool: True if  present, False if not
+        """
+        if self.is_module_component:
+            return self.dependency.get_presence()
+        else:
+            return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the component
+        Returns:
+            bool: True if component is operating properly, False if not
+        """
+        if self.is_module_component:
+            return self.dependency.get_status()
+        else:
+            return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether component is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_description(self):
         """
         Retrieves the description of the component
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
index 8404a8d2bf5f..5b3c8977ac0a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
@@ -26,30 +26,23 @@ class Fan(FanBase):
     HWMON_NODE = os.listdir(HWMON_DIR)[0]
     MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
-    def __init__(self, fantray_index=1, fan_index=1, psu_fan=False):
+    def __init__(self, fantray_index=1, psu_index=1, psu_fan=False, dependency=None):
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
-            # API index is starting from 0, DellEMC platform index is starting
-            # from 1
-            self.fantrayindex = fantray_index + 1
-            self.fanindex = fan_index + 1
-            self.fan_presence_reg = "fan{}_fault".format(
-                        2 * self.fantrayindex - 1)
+            self.fantrayindex = fantray_index
+            self.dependency = dependency
             self.fan_status_reg = "fan{}_alarm".format(
                         2 * self.fantrayindex - 1)
             self.get_fan_speed_reg = "fan{}_input".format(
                         2 * self.fantrayindex - 1)
             self.get_fan_dir_reg = "fan{}_airflow".format(
                         2 * self.fantrayindex - 1)
-            self.fan_serialno_reg = "fan{}_serialno".format(
-                        2 * self.fantrayindex - 1)
             self.max_fan_speed = MAX_S6100_FAN_SPEED
         else:
-            # PSU Fan index starts from 11
-            self.fanindex = fan_index + 10
-            self.fan_presence_reg = "fan{}_fault".format(self.fanindex)
-            self.get_fan_speed_reg = "fan{}_input".format(self.fanindex)
-            self.get_fan_dir_reg = "fan{}_airflow".format(self.fanindex)
+            self.psuindex = psu_index
+            self.fan_presence_reg = "fan{}_fault".format(self.psuindex + 10)
+            self.get_fan_speed_reg = "fan{}_input".format(self.psuindex + 10)
+            self.get_fan_dir_reg = "fan{}_airflow".format(self.psuindex + 10)
             self.max_fan_speed = MAX_S6100_PSU_FAN_SPEED
 
     def _get_pmc_register(self, reg_name):
@@ -77,10 +70,9 @@ def get_name(self):
             string: The name of the device
         """
         if not self.is_psu_fan:
-            return "FanTray{}-Fan{}".format(
-                                self.fantrayindex, self.fanindex - 1)
+            return "FanTray{}-Fan1".format(self.fantrayindex)
         else:
-            return "PSU{} Fan".format(self.fanindex - 10)
+            return "PSU{} Fan".format(self.psuindex)
 
     def get_model(self):
         """
@@ -88,21 +80,7 @@ def get_model(self):
         Returns:
             string: Part number of FAN
         """
-        # For Serial number "US-01234D-54321-25A-0123-A00", the part
-        # number is "01234D"
-        if self.is_psu_fan:
-            return 'NA'
-
-        fan_serialno = self._get_pmc_register(self.fan_serialno_reg)
-        if (fan_serialno != 'ERR') and self.get_presence():
-            if (len(fan_serialno.split('-')) > 1):
-                fan_partno = fan_serialno.split('-')[1]
-            else:
-                fan_partno = 'NA'
-        else:
-            fan_partno = 'NA'
-
-        return fan_partno
+        return 'NA'
 
     def get_serial(self):
         """
@@ -110,15 +88,7 @@ def get_serial(self):
         Returns:
             string: Serial number of FAN
         """
-        # Sample Serial number format "US-01234D-54321-25A-0123-A00"
-        if self.is_psu_fan:
-            return 'NA'
-
-        fan_serialno = self._get_pmc_register(self.fan_serialno_reg)
-        if (fan_serialno == 'ERR') or not self.get_presence():
-            fan_serialno = 'NA'
-
-        return fan_serialno
+        return 'NA'
 
     def get_presence(self):
         """
@@ -126,14 +96,17 @@ def get_presence(self):
         Returns:
             bool: True if fan is present, False if not
         """
-        status = False
-        fantray_presence = self._get_pmc_register(self.fan_presence_reg)
-        if (fantray_presence != 'ERR'):
-            fantray_presence = int(fantray_presence, 10)
-            if (~fantray_presence & 0b1):
-                status = True
+        if not self.is_psu_fan:
+            return self.dependency.get_presence()
 
-        return status
+        presence = False
+        fan_presence = self._get_pmc_register(self.fan_presence_reg)
+        if (fan_presence != 'ERR'):
+            fan_presence = int(fan_presence, 10)
+            if (~fan_presence & 0b1):
+                presence = True
+
+        return presence
 
     def get_status(self):
         """
@@ -157,6 +130,23 @@ def get_status(self):
 
         return status
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return 1
+
+    def is_replaceable(self):
+        """
+        Indicate whether Fan is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_direction(self):
         """
         Retrieves the fan airflow direction
@@ -216,7 +206,6 @@ def set_speed(self, speed):
         Returns:
             bool: True if set success, False if fail.
         """
-
         # Fan speeds are controlled by Smart-fussion FPGA.
         return False
 
@@ -229,7 +218,7 @@ def set_status_led(self, color):
         Returns:
             bool: True if set success, False if fail.
         """
-        # Leds are controlled by Smart-fussion FPGA.
+        # No LED available for FanTray and PSU Fan
         # Return True to avoid thermalctld alarm.
         return True
 
@@ -240,17 +229,8 @@ def get_status_led(self):
         Returns:
             A string, one of the predefined STATUS_LED_COLOR_* strings.
         """
-        if self.is_psu_fan:
-            # No LED available for PSU Fan
-            return None
-        else:
-            if self.get_presence():
-                if self.get_status():
-                    return self.STATUS_LED_COLOR_GREEN
-                else:
-                    return self.STATUS_LED_COLOR_AMBER
-            else:
-                return self.STATUS_LED_COLOR_OFF
+        # No LED available for FanTray and PSU Fan
+        return None
 
     def get_target_speed(self):
         """
@@ -262,5 +242,3 @@ def get_target_speed(self):
         # Fan speeds are controlled by Smart-fussion FPGA.
         # Return current speed to avoid false thermalctld alarm.
         return self.get_speed()
-
-
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan_drawer.py
index ada5e93393c9..41e870a63971 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan_drawer.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan_drawer.py
@@ -9,6 +9,8 @@
 ########################################################################
 
 try:
+    import os
+
     from sonic_platform_base.fan_drawer_base import FanDrawerBase
     from sonic_platform.fan import Fan
 except ImportError as e:
@@ -16,14 +18,38 @@
 
 
 class FanDrawer(FanDrawerBase):
-    """DellEMC Platform-specific Fan class"""
+    """DellEMC Platform-specific Fan Drawer class"""
 
-    def __init__(self, fantray_index):
+    HWMON_DIR = "/sys/devices/platform/SMF.512/hwmon/"
+    HWMON_NODE = os.listdir(HWMON_DIR)[0]
+    MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
+    def __init__(self, fantray_index):
         FanDrawerBase.__init__(self)
         # FanTray is 1-based in DellEMC platforms
-        self.fantrayindex = fantray_index + 1
-        self._fan_list.append(Fan(fantray_index))
+        self.index = fantray_index + 1
+        self.presence_reg = "fan{}_fault".format(2 * self.index - 1)
+        self.serialno_reg = "fan{}_serialno".format(2 * self.index - 1)
+
+        self._fan_list.append(Fan(self.index, dependency=self))
+
+    def _get_pmc_register(self, reg_name):
+        # On successful read, returns the value read from given
+        # reg_name and on failure returns 'ERR'
+        rv = 'ERR'
+        mb_reg_file = self.MAILBOX_DIR+'/'+reg_name
+
+        if (not os.path.isfile(mb_reg_file)):
+            return rv
+        try:
+            with open(mb_reg_file, 'r') as fd:
+                rv = fd.read()
+        except Exception as error:
+            rv = 'ERR'
+
+        rv = rv.rstrip('\r\n')
+        rv = rv.lstrip(" ")
+        return rv
 
     def get_name(self):
         """
@@ -31,4 +57,105 @@ def get_name(self):
         Returns:
             string: The name of the device
         """
-        return "FanTray{}".format(self.fantrayindex)
+        return "FanTray{}".format(self.index)
+
+    def get_model(self):
+        """
+        Retrieves the part number of Fandrawer
+        Returns:
+            string: Part number of Fandrawer
+        """
+        # For Serial number "US-01234D-54321-25A-0123-A00", the part
+        # number is "01234D"
+        fantray_serialno = self._get_pmc_register(self.serialno_reg)
+        if (fantray_serialno != 'ERR') and self.get_presence():
+            if (len(fantray_serialno.split('-')) > 1):
+                fantray_partno = fantray_serialno.split('-')[1]
+            else:
+                fantray_partno = 'NA'
+        else:
+            fantray_partno = 'NA'
+
+        return fantray_partno
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of Fandrawer
+        Returns:
+            string: Serial number of Fandrawer
+        """
+        # Sample Serial number format "US-01234D-54321-25A-0123-A00"
+        fantray_serialno = self._get_pmc_register(self.serialno_reg)
+        if (fantray_serialno == 'ERR') or not self.get_presence():
+            fantray_serialno = 'NA'
+
+        return fantray_serialno
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Fandrawer
+        Returns:
+            bool: True if fan is present, False if not
+        """
+        presence = False
+        fantray_presence = self._get_pmc_register(self.presence_reg)
+        if (fantray_presence != 'ERR'):
+            fantray_presence = int(fantray_presence, 10)
+            if (~fantray_presence & 0b1):
+                presence = True
+
+        return presence
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the Fandrawer
+
+        Returns:
+            bool: True if Fandrawer is operating properly, False if not
+        """
+        return self.get_fan(0).get_status()
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this Fandrawer is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def set_status_led(self, color):
+        """
+        Set led to expected color
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        # Leds are controlled by Smart-fussion FPGA.
+        # Return True to avoid thermalctld alarm.
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the Fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings.
+        """
+        if self.get_presence():
+            if self.get_fan(0).get_status():
+                return self.STATUS_LED_COLOR_GREEN
+            else:
+                return self.STATUS_LED_COLOR_AMBER
+        else:
+            return self.STATUS_LED_COLOR_OFF
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/module.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/module.py
index 6b93bcfd1fa7..923bb5c0550a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/module.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/module.py
@@ -63,7 +63,7 @@ def __init__(self, module_index):
         self.iom_presence_reg = "iom_presence"
 
         component = Component(is_module=True, iom_index=self.index,
-                              i2c_line=self.port_i2c_line)
+                              i2c_line=self.port_i2c_line, dependency=self)
         self._component_list.append(component)
 
         eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/i2c-{1}/{1}-0050/eeprom"
@@ -157,6 +157,23 @@ def get_status(self):
 
         return status
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether Module is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the module
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/psu.py
index 48b266daa278..4e528b679e4a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/psu.py
@@ -34,13 +34,15 @@ def __init__(self, psu_index):
             self.psu_voltage_reg = "in30_input"
             self.psu_current_reg = "curr602_input"
             self.psu_power_reg = "power2_input"
+            self.psu_temperature_reg = "temp14_input"
         elif self.index == 2:
             self.psu_voltage_reg = "in32_input"
             self.psu_current_reg = "curr702_input"
             self.psu_power_reg = "power4_input"
+            self.psu_temperature_reg = "temp15_input"
 
         # Passing True to specify it is a PSU fan
-        psu_fan = Fan(fan_index=self.index, psu_fan=True)
+        psu_fan = Fan(psu_index=self.index, psu_fan=True)
         self._fan_list.append(psu_fan)
 
     def _get_pmc_register(self, reg_name):
@@ -232,3 +234,87 @@ def set_status_led(self, color):
         # In S6100, SmartFusion FPGA controls the PSU LED and the PSU
         # LED state cannot be changed from CPU.
         return False
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this PSU is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+
+        Returns:
+            A float number of current temperature in Celsius up to
+            nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temperature = 0.0
+        if self.get_presence():
+            psu_temperature = self._get_pmc_register(self.psu_temperature_reg)
+            if (psu_temperature != 'ERR'):
+                temperature = float(psu_temperature) / 1000
+
+        return temperature
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+
+        Returns:
+            A float number, the high threshold temperature of PSU in
+            Celsius up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        """
+        return 90.0
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+
+        Returns:
+            A float number, the high threshold output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_high_threshold = 0.0
+        if self.get_presence():
+            psu_type = self._get_pmc_register(self.psu_presence_reg)
+            if (psu_type != 'ERR'):
+                psu_type = int(psu_type, 16)
+                if (psu_type & 0b10):
+                    voltage_high_threshold = 12.6
+                else:
+                    voltage_high_threshold = 12.8
+
+        return voltage_high_threshold
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+
+        Returns:
+            A float number, the low threshold output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_low_threshold = 0.0
+        if self.get_presence():
+            psu_type = self._get_pmc_register(self.psu_presence_reg)
+            if (psu_type != 'ERR'):
+                psu_type = int(psu_type, 16)
+                if (psu_type & 0b10):
+                    voltage_low_threshold = 11.4
+                else:
+                    voltage_low_threshold = 11.6
+
+        return voltage_low_threshold
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
index 6947b6cf2b66..0b242ab74d71 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
@@ -10,6 +10,7 @@
 
 try:
     import re
+    import struct
     import time
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
@@ -27,6 +28,9 @@
 DOM_OFFSET = 0
 DOM_OFFSET1 = 384
 
+QSFP_CONTROL_OFFSET = 86
+QSFP_POWEROVERRIDE_OFFSET = 93
+
 cable_length_tup = ('Length(km)', 'Length OM3(2m)', 'Length OM2(m)',
                     'Length OM1(m)', 'Length Cable Assembly(m)')
 
@@ -107,7 +111,7 @@ def __init__(self, index, sfp_type, eeprom_path,
             sfp_control, sfp_ctrl_idx):
         SfpBase.__init__(self)
         self.sfp_type = sfp_type
-        self.index = index
+        self.index = index + 1
         self.eeprom_path = eeprom_path
         self.sfp_control = sfp_control
         self.sfp_ctrl_idx = sfp_ctrl_idx
@@ -131,9 +135,10 @@ def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
             eeprom.close()
             return None
 
+        raw = bytearray(raw)
         try:
             for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
         except BaseException:
             eeprom.close()
             return None
@@ -594,40 +599,14 @@ def get_tx_disable_channel(self):
         """
         Retrieves the TX disabled channels in this SFP
         """
-        tx_disable = None
-        tx_disable_list = []
+        tx_disable_channel = 0
 
-        tx_disable_data = self._get_eeprom_data('tx_disable')
-        if (tx_disable_data is not None):
-            tx_disable = tx_disable_data['data']['Tx1Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx2Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx3Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-            tx_disable = tx_disable_data['data']['Tx4Disable']['value']
-            if (tx_disable == 'On'):
-                tx_disable_list.append(1)
-            else:
-                tx_disable_list.append(0)
-
-            bit4 = int(tx_disable_list[3]) * 8
-            bit3 = int(tx_disable_list[2]) * 4
-            bit2 = int(tx_disable_list[1]) * 2
-            bit1 = int(tx_disable_list[0]) * 1
-
-            tx_disable_channel = hex(bit4 + bit3 + bit2 + bit1)
+        tx_disable = self.get_tx_disable()
+        for channel, disable in enumerate(tx_disable):
+            if disable:
+                tx_disable_channel |= 1 << channel
 
-            return tx_disable_channel
+        return tx_disable_channel
 
     def get_lpmode(self):
         """
@@ -836,19 +815,68 @@ def tx_disable(self, tx_disable):
         """
         Disable SFP TX for all channels
         """
-        return False
+        eeprom = None
+        tx_disable_value = 0xf if tx_disable else 0x0
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_CONTROL_OFFSET)
+            eeprom.write(struct.pack('B', tx_disable_value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def tx_disable_channel(self, channel, disable):
         """
         Sets the tx_disable for specified SFP channels
         """
-        return False
+        eeprom = None
+        current_state = self.get_tx_disable_channel()
+
+        if disable:
+            tx_disable_value = current_state | channel
+        else:
+            tx_disable_value = current_state & (~channel)
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_CONTROL_OFFSET)
+            eeprom.write(struct.pack('B', tx_disable_value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def set_power_override(self, power_override, power_set):
         """
         Sets SFP power level using power_override and power_set
         """
-        return False
+        eeprom = None
+        power_override_bit = 0x1 if power_override else 0
+        power_set_bit = 0x2 if power_set else 0
+        value = power_override_bit | power_set_bit
+
+        try:
+            eeprom = open(self.eeprom_path, "r+b")
+            eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+            eeprom.write(struct.pack('B', value))
+        except IOError:
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+        return True
 
     def get_status(self):
         """
@@ -862,3 +890,20 @@ def get_status(self):
             status = True
 
         return status
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device  is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
index f7037b000c5b..cac17f4b83aa 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
@@ -131,6 +131,23 @@ def get_status(self):
 
         return status
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this Thermal is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_temperature(self):
         """
         Retrieves current temperature reading from thermal

From 0e7c295fb37a80bc9ff5f7b961f91dbf6ee15d27 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 5 Feb 2021 12:47:04 -0800
Subject: [PATCH 0142/1674] [sonic-swss-common] Update submodule (#6686)

Includes below commits
```
9e91e0d 2021-02-04 | Fix: RedisClient.set() should return bool (#454) [Qi Luo]
244a0bf 2021-02-04 | [swig] Add missing functions for ConfigDBConnector (#453) [Qi Luo]
e659698 2021-01-22 | [dbconnector] Make sure json is declared as non null object (#452) [Kamil Cudnik]
```
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index e49b18f2512a..9e91e0d89139 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit e49b18f2512a9331579cea37ab199730051a68e9
+Subproject commit 9e91e0d891398b468b8087682ae91335791fac51

From 78bf8159e8596dd94c6c67a2a682a2f14c1f7573 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Fri, 5 Feb 2021 14:41:05 -0800
Subject: [PATCH 0143/1674] [platform] Update QSFP method name
 'parse_qsfp_dom_capability' -> 'parse_dom_capability' (#6695)

**- Why I did it**
PR https://github.com/Azure/sonic-platform-common/pull/102 modified the name of the SFF-8436 (QSFP) method to align the method name between all drivers, renaming it from `parse_qsfp_dom_capability` to `parse_dom_capability`. Once the submodule was updated, the callers using the old nomenclature broke. This PR updates all callers to use the new naming convention.

**- How I did it**

Update the name of the function globally for all calls into the SFF-8436 driver.

Note that the QSFP-DD driver still uses the old nomenclature and should be modified similarly. I will open a PR to handle this separately.
---
 .../x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py     | 2 +-
 .../x86_64-cel_seastone-r0/sonic_platform/sfp.py          | 2 +-
 .../x86_64-cel_silverstone-r0/sonic_platform/sfp.py       | 2 +-
 .../x86_64-dellemc_s5232f_c3538-r0/plugins/sfputil.py     | 2 +-
 .../x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py     | 2 +-
 .../x86_64-dellemc_s5296f_c3538-r0/plugins/sfputil.py     | 2 +-
 .../x86_64-dellemc_z9264f_c3538-r0/plugins/sfputil.py     | 2 +-
 .../juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py  | 2 +-
 .../juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py  | 2 +-
 device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py | 2 +-
 device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py | 2 +-
 .../services/platform_api/sonic_platform/sfp.py           | 2 +-
 .../s5232f/sonic_platform/sfp.py                          | 2 +-
 .../z9264f/sonic_platform/sfp.py                          | 2 +-
 .../z9332f/sonic_platform/sfp.py                          | 2 +-
 .../d6332/sonic_platform/qsfp.py                          | 8 ++++----
 .../d6356/sonic_platform/qsfp.py                          | 2 +-
 .../d7054q28b/sonic_platform/sfp.py                       | 2 +-
 platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py | 2 +-
 .../sonic_platform_pddf_base/pddf_sfp.py                  | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py
index 9d85b96be730..2006561ffef0 100644
--- a/device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py
+++ b/device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py
@@ -698,7 +698,7 @@ def get_qsfp_transceiver_bulk_status(self):
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
             (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                 qsfp_dom_capability_raw, 0)
         else:
             return None
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
index 9daa005cd2bf..13ae4b8a47ad 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
@@ -279,7 +279,7 @@ def _dom_capability_detect(self):
                     QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(
                     qsfp_version_compliance_raw[0], 16)
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(
+                dom_capability = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
                 if qsfp_version_compliance >= 0x08:
                     self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
diff --git a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py
index b04b49ca4382..e909416e9081 100644
--- a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py
@@ -328,7 +328,7 @@ def _dom_capability_detect(self):
                     QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(
                     qsfp_version_compliance_raw[0], 16)
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(
+                dom_capability = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
                 if qsfp_version_compliance >= 0x08:
                     self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_s5232f_c3538-r0/plugins/sfputil.py
index f53e8e944d1e..b56fcc5aafd0 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/plugins/sfputil.py
@@ -311,7 +311,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py
index 2b941d028968..dba21ed11bdb 100644
--- a/device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py
@@ -358,7 +358,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_s5296f_c3538-r0/plugins/sfputil.py
index 8b4ab0dcae1a..c270ef47f1e0 100644
--- a/device/dell/x86_64-dellemc_s5296f_c3538-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_s5296f_c3538-r0/plugins/sfputil.py
@@ -305,7 +305,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
 
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_z9264f_c3538-r0/plugins/sfputil.py
index 5b01882762af..48f722a5d964 100644
--- a/device/dell/x86_64-dellemc_z9264f_c3538-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_z9264f_c3538-r0/plugins/sfputil.py
@@ -378,7 +378,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
 
diff --git a/device/juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py b/device/juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py
index 54dbdacc1c21..db85347be3f4 100644
--- a/device/juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py
+++ b/device/juniper/x86_64-juniper_qfx5200-r0/plugins/sfputil.py
@@ -870,7 +870,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return None
 
diff --git a/device/juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py b/device/juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py
index a854f8fa2915..673bb05ed107 100644
--- a/device/juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py
+++ b/device/juniper/x86_64-juniper_qfx5210-r0/plugins/sfputil.py
@@ -583,7 +583,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 sysfsfile_eeprom, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return None
 
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
index 954ed23d8eac..df60c5256f2a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -513,7 +513,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes_via_ethtool(
                 port_num, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
 
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
index 336d729e95a6..c94b65881fe9 100644
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
@@ -488,7 +488,7 @@ def get_transceiver_dom_info_dict(self, port_num):
             # in SFF-8636 dom capability definitions evolving with the versions.
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
             else:
                 return transceiver_dom_info_dict
 
diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
index 17f2756dee1a..5906050fa139 100644
--- a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
@@ -358,7 +358,7 @@ def _dom_capability_detect(self):
                     QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(
                     qsfp_version_compliance_raw[0], 16)
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(
+                dom_capability = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
                 if qsfp_version_compliance >= 0x08:
                     self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
index 56f37afea6e8..b2cceab9b08f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
@@ -118,7 +118,7 @@
      'hardware_rev': [QSFP_INFO_OFFSET, 56,  2, 'parse_vendor_rev'],
            'serial': [QSFP_INFO_OFFSET, 68, 16, 'parse_vendor_sn'],
       'vendor_date': [QSFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
-   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_qsfp_dom_capability'],
+   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_dom_capability'],
           'dom_rev': [QSFP_DOM_OFFSET,   1,  1, 'parse_sfp_dom_rev'],
   'ModuleThreshold': [QSFP_DOM_OFFSET1, 128, 24, 'parse_module_threshold_values'],
  'ChannelThreshold': [QSFP_DOM_OFFSET1, 176, 16, 'parse_channel_threshold_values'],
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
index 8d9bd36c6abb..225aef90e00a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
@@ -122,7 +122,7 @@
      'hardware_rev': [QSFP_INFO_OFFSET, 56,  2, 'parse_vendor_rev'],
            'serial': [QSFP_INFO_OFFSET, 68, 16, 'parse_vendor_sn'],
       'vendor_date': [QSFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
-   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_qsfp_dom_capability'],
+   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_dom_capability'],
           'dom_rev': [QSFP_DOM_OFFSET,   1,  1, 'parse_sfp_dom_rev'],
   'ModuleThreshold': [QSFP_DOM_OFFSET1, 128, 24, 'parse_module_threshold_values'],
  'ChannelThreshold': [QSFP_DOM_OFFSET1, 176, 16, 'parse_channel_threshold_values'],
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 7fc50958c9ee..ef6a2c5d339a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -127,7 +127,7 @@
       'hardware_rev': [QSFP_INFO_OFFSET, 56,  2, 'parse_vendor_rev'],
         'serial': [QSFP_INFO_OFFSET, 68, 16, 'parse_vendor_sn'],
       'vendor_date': [QSFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
-   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_qsfp_dom_capability'],
+   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_dom_capability'],
           'dom_rev': [QSFP_DOM_OFFSET,   1,  1, 'parse_sfp_dom_rev'],
   'ModuleThreshold': [QSFP_DOM_OFFSET1, 128, 24, 'parse_module_threshold_values'],
  'ChannelThreshold': [QSFP_DOM_OFFSET1, 176, 16, 'parse_channel_threshold_values'],
diff --git a/platform/broadcom/sonic-platform-modules-inventec/d6332/sonic_platform/qsfp.py b/platform/broadcom/sonic-platform-modules-inventec/d6332/sonic_platform/qsfp.py
index 178ac0cf9aa5..17763cd1264f 100644
--- a/platform/broadcom/sonic-platform-modules-inventec/d6332/sonic_platform/qsfp.py
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6332/sonic_platform/qsfp.py
@@ -436,7 +436,7 @@ def get_transceiver_bulk_status(self):
         # in SFF-8636 dom capability definitions evolving with the versions.
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes((offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
         else:
             return None
 
@@ -793,7 +793,7 @@ def get_tx_bias(self):
 
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes((offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
         else:
             return None
 
@@ -844,7 +844,7 @@ def get_rx_power(self):
 
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes((offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
         else:
             return None
 
@@ -895,7 +895,7 @@ def get_tx_power(self):
 
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes((offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
         else:
             return None
 
diff --git a/platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/qsfp.py b/platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/qsfp.py
index c002697d96a3..2cc4b6ca593a 100644
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/qsfp.py
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/qsfp.py
@@ -388,7 +388,7 @@ def get_transceiver_bulk_status(self):
         # in SFF-8636 dom capability definitions evolving with the versions.
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes((offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
         else:
             return None
 
diff --git a/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/sfp.py
index 760aa179c256..a18d98d502f5 100644
--- a/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/sfp.py
@@ -636,7 +636,7 @@ def get_transceiver_bulk_status(self):
         qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
             (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
         if qsfp_dom_capability_raw is not None:
-            qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+            qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                 qsfp_dom_capability_raw, 0)
         else:
             return None
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 4b397b3f3ff8..75ae9c8907e1 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -440,7 +440,7 @@ def _dom_capability_detect(self):
             if qsfp_dom_capability_raw is not None:
                 qsfp_version_compliance_raw = self._read_eeprom_specific_bytes(QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                dom_capability = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
                 if qsfp_version_compliance >= 0x08:
                     self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
                     self.dom_volt_supported = dom_capability['data']['Voltage_support']['value'] == 'On'
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
index 856f4c748d10..d53c23061b2d 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
@@ -414,7 +414,7 @@ def get_transceiver_bulk_status(self):
             qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
                 (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
             else:
                 return None

From c7d8faee18c6b57217509c70eec39fd651c1bdd8 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Fri, 5 Feb 2021 16:07:49 -0800
Subject: [PATCH 0144/1674] Revert "BRCM SAI 4.3.0.10-4 Fix
 _brcm_sai_indexed_data_get () with unexpected queue causing
 _brcm_sai_switch_assert () after warm reboot (#6664)"

This reverts commit 9f2a85697f20e51dd5af3ffbbdb6c04f6bb1a46d.
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 1b27d7bc1f88..fcb175d3d0c5 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.10-4_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=nfseU56PACVqklQ4MC0HvZ7qt7Ou4loQMBA7jx8CSOY%3D&se=2034-10-13T16%3A31%3A22Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-4_amd64.deb
+BRCM_SAI = libsaibcm_4.2.1.5-10_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A30%3A31Z&se=2035-01-13T07%3A30%3A00Z&sr=b&sp=r&sig=yCGwk%2FW%2Fg%2FaFxhr0oNSTZ%2BVy5B6kX1WDEsbbyz9J088%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=4tF26GxI6jmrcvRyCezQ7RL6qMjzip7SFf61eqy%2Bvf4%3D&se=2034-10-13T16%3A31%3A53Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A32%3A43Z&se=2035-01-13T07%3A32%3A00Z&sr=b&sp=r&sig=wuCNc6pa12JQCBi%2BM9rLWvVI92ldan9hKNF%2BfVfUWN8%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From bc2a13136a99849ee2b20f43f2ebbe29ea1002ad Mon Sep 17 00:00:00 2001
From: Mahesh Maddikayala <10645050+smaheshm@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:38:47 -0800
Subject: [PATCH 0145/1674] [BCMSAI] Update BCMSAI debian to 4.3.0.10 with
 6.5.21 SDK, and opennsl module to 6.5.21 (#6526)

BCMSAI 4.3.0.10, 6.5.21 SDK release with enhancements and fixes for vxlan, TD3 MMU, TD4-X9 EA support, etc.
---
 platform/broadcom/sai-modules.mk              |    2 +-
 platform/broadcom/sai.mk                      |    8 +-
 .../broadcom/saibcm-modules/debian/changelog  |    7 +
 .../debian/opennsl-modules.init               |    6 +-
 .../debian/opennsl-modules.install            |    1 +
 platform/broadcom/saibcm-modules/debian/rules |   11 +
 .../broadcom/saibcm-modules/include/ibde.h    |   13 +-
 .../broadcom/saibcm-modules/include/kcom.h    |   15 +-
 .../saibcm-modules/include/sal/core/sync.h    |   13 +-
 .../saibcm-modules/include/sal/core/thread.h  |   13 +-
 .../saibcm-modules/include/sal/types.h        |   13 +-
 .../saibcm-modules/include/sdk_config.h       |   13 +-
 .../saibcm-modules/include/soc/devids.h       |  149 +-
 .../broadcom/saibcm-modules/make/Make.config  |   13 +-
 .../broadcom/saibcm-modules/make/Make.depend  |   13 +-
 .../broadcom/saibcm-modules/make/Make.kernlib |   13 +-
 .../broadcom/saibcm-modules/make/Make.lib     |   15 +-
 .../broadcom/saibcm-modules/make/Make.linux   |   15 +-
 .../broadcom/saibcm-modules/make/Make.subdirs |   13 +-
 .../broadcom/saibcm-modules/make/Make.tools   |   13 +-
 .../saibcm-modules/make/Makefile.linux-gts    |   24 +-
 .../saibcm-modules/make/Makefile.linux-iproc  |   13 +-
 .../make/Makefile.linux-iproc-3_14            |   13 +-
 .../make/Makefile.linux-iproc-4_4             |   13 +-
 .../make/Makefile.linux-iproc_64              |   13 +-
 .../saibcm-modules/make/Makefile.linux-kernel |   13 +-
 .../make/Makefile.linux-kernel-2_6            |   13 +-
 .../make/Makefile.linux-kernel-3_6            |   13 +-
 .../make/Makefile.linux-kernel-4_4            |   13 +-
 .../make/Makefile.linux-kmodule               |   20 +-
 .../saibcm-modules/make/Makefile.linux-slk    |   17 +-
 .../make/Makefile.linux-x86-common-2_6        |   13 +-
 .../Makefile.linux-x86-generic-common-2_6     |   14 +-
 .../Makefile.linux-x86-smp_generic_64-2_6     |   15 +-
 .../saibcm-modules/make/Makefile.linux-xlr    |   24 +-
 .../saibcm-modules/sdklt/LICENSES/gpl-2.0.txt |  339 +++
 .../broadcom/saibcm-modules/sdklt/Makefile    |   83 +
 .../bcm56780_a0/bcm56780_a0_pdma_attach.c     |   38 +
 .../bcm56880_a0/bcm56880_a0_pdma_attach.c     |   38 +
 .../bcm56990_a0/bcm56990_a0_pdma_attach.c     |   38 +
 .../bcm56990_b0/bcm56990_b0_pdma_attach.c     |   38 +
 .../bcm56996_a0/bcm56996_a0_pdma_attach.c     |   38 +
 .../bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_hw.c |  530 ++++
 .../hmi/cmicd/bcmcnet_cmicd_pdma_rxtx.c       | 1062 +++++++
 .../bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_hw.c |  604 ++++
 .../hmi/cmicx/bcmcnet_cmicx_pdma_rxtx.c       | 1094 +++++++
 .../bcmcnet/include/bcmcnet/bcmcnet_cmicd.h   |  369 +++
 .../bcmcnet/include/bcmcnet/bcmcnet_cmicx.h   |  379 +++
 .../bcmcnet/include/bcmcnet/bcmcnet_core.h    | 1323 ++++++++
 .../bcmcnet/include/bcmcnet/bcmcnet_dev.h     |  544 ++++
 .../include/bcmcnet/bcmcnet_internal.h        |  305 ++
 .../bcmcnet/include/bcmcnet/bcmcnet_rxtx.h    |  512 ++++
 .../bcmcnet/include/bcmcnet/bcmcnet_types.h   |  263 ++
 .../sdklt/bcmcnet/main/bcmcnet_core.c         |  701 +++++
 .../sdklt/bcmcnet/main/bcmcnet_dev.c          | 1059 +++++++
 .../sdklt/bcmcnet/main/bcmcnet_rxtx.c         |  708 +++++
 .../bcmdrd/include/bcmdrd/bcmdrd_devlist.h    |  337 +++
 .../sdklt/bcmdrd/include/bcmdrd_config.h      |  166 +
 .../bcmdrd/include/bcmdrd_config_chips.h      |  545 ++++
 .../saibcm-modules/sdklt/linux/bde/Kbuild     |   39 +
 .../saibcm-modules/sdklt/linux/bde/Makefile   |   33 +
 .../saibcm-modules/sdklt/linux/bde/ngbde.h    |  836 +++++
 .../sdklt/linux/bde/ngbde_dma.c               |  340 +++
 .../sdklt/linux/bde/ngbde_iio.c               |  143 +
 .../sdklt/linux/bde/ngbde_intr.c              |  550 ++++
 .../sdklt/linux/bde/ngbde_ioctl.c             |  237 ++
 .../sdklt/linux/bde/ngbde_iproc_probe.c       |  164 +
 .../sdklt/linux/bde/ngbde_kapi.c              |  216 ++
 .../sdklt/linux/bde/ngbde_main.c              |  297 ++
 .../sdklt/linux/bde/ngbde_pci_probe.c         |  211 ++
 .../sdklt/linux/bde/ngbde_pgmem.c             |  472 +++
 .../sdklt/linux/bde/ngbde_pio.c               |   97 +
 .../sdklt/linux/bde/ngbde_procfs.c            |  120 +
 .../sdklt/linux/bde/ngbde_swdev.c             |   79 +
 .../sdklt/linux/include/lkm/lkm.h             |  126 +
 .../sdklt/linux/include/lkm/ngbde_ioctl.h     |  345 +++
 .../sdklt/linux/include/lkm/ngbde_kapi.h      |  169 ++
 .../sdklt/linux/include/lkm/ngknet_dev.h      |  408 +++
 .../sdklt/linux/include/lkm/ngknet_ioctl.h    |  112 +
 .../sdklt/linux/include/net/psample.h         |   24 +
 .../sdklt/linux/include/uapi/linux/psample.h  |   35 +
 .../saibcm-modules/sdklt/linux/knet/Kbuild    |   44 +
 .../saibcm-modules/sdklt/linux/knet/Makefile  |  105 +
 .../sdklt/linux/knet/ngknet_buff.c            |  326 ++
 .../sdklt/linux/knet/ngknet_buff.h            |   83 +
 .../sdklt/linux/knet/ngknet_callback.c        |  315 ++
 .../sdklt/linux/knet/ngknet_callback.h        |  364 +++
 .../sdklt/linux/knet/ngknet_dep.h             |   61 +
 .../sdklt/linux/knet/ngknet_extra.c           |  505 ++++
 .../sdklt/linux/knet/ngknet_extra.h           |  218 ++
 .../sdklt/linux/knet/ngknet_linux.c           |  173 ++
 .../sdklt/linux/knet/ngknet_linux.h           |  240 ++
 .../sdklt/linux/knet/ngknet_main.c            | 2689 +++++++++++++++++
 .../sdklt/linux/knet/ngknet_main.h            |  278 ++
 .../sdklt/linux/knet/ngknet_procfs.c          |  655 ++++
 .../sdklt/linux/knet/ngknet_procfs.h          |   47 +
 .../sdklt/linux/knet/ngknet_ptp.c             |  194 ++
 .../sdklt/linux/knet/ngknet_ptp.h             |  111 +
 .../saibcm-modules/sdklt/linux/knetcb/Kbuild  |   36 +
 .../sdklt/linux/knetcb/Makefile               |   33 +
 .../sdklt/linux/knetcb/ngknetcb_main.c        |  444 +++
 .../sdklt/linux/knetcb/psample-cb.c           |  995 ++++++
 .../sdklt/linux/knetcb/psample-cb.h           |   57 +
 .../saibcm-modules/sdklt/linux/psample/Kbuild |   18 +
 .../sdklt/linux/psample/Makefile              |   21 +
 .../sdklt/linux/psample/psample.c             |  302 ++
 .../broadcom/saibcm-modules/sdklt/make/lkm.mk |   76 +
 .../sdklt/shr/include/shr/shr_error.h         |  195 ++
 .../systems/bde/linux/include/linux-bde.h     |   59 +-
 .../systems/bde/linux/include/linux_dma.h     |   15 +-
 .../systems/bde/linux/include/mpool.h         |   13 +-
 .../systems/bde/linux/kernel/Makefile         |   13 +-
 .../bde/linux/kernel/linux-kernel-bde.c       |  210 +-
 .../systems/bde/linux/kernel/linux_dma.c      |  228 +-
 .../systems/bde/linux/kernel/linux_shbde.c    |   13 +-
 .../systems/bde/linux/kernel/linux_shbde.h    |   13 +-
 .../systems/bde/linux/shared/mpool.c          |  122 +-
 .../systems/bde/linux/user/kernel/Makefile    |   13 +-
 .../bde/linux/user/kernel/linux-user-bde.c    |  607 +++-
 .../bde/linux/user/kernel/linux-user-bde.h    |   78 +-
 .../systems/bde/shared/include/shbde.h        |   13 +-
 .../systems/bde/shared/include/shbde_iproc.h  |   13 +-
 .../systems/bde/shared/include/shbde_mdio.h   |   13 +-
 .../systems/bde/shared/include/shbde_pci.h    |   13 +-
 .../systems/bde/shared/shbde_iproc.c          |   24 +-
 .../systems/bde/shared/shbde_mdio.c           |   13 +-
 .../systems/bde/shared/shbde_pci.c            |   13 +-
 .../systems/linux/kernel/modules/Makefile     |   13 +-
 .../linux/kernel/modules/bcm-knet/Makefile    |   13 +-
 .../linux/kernel/modules/bcm-knet/bcm-knet.c  |  199 +-
 .../kernel/modules/bcm-ptp-clock/Makefile     |    6 +-
 .../modules/bcm-ptp-clock/bcm-ptp-clock.c     |  676 +++--
 .../linux/kernel/modules/include/bcm-knet.h   |   14 +-
 .../linux/kernel/modules/include/gmodule.h    |   22 +-
 .../linux/kernel/modules/include/lkm.h        |   16 +-
 .../linux/kernel/modules/knet-cb/Makefile     |   13 +-
 .../linux/kernel/modules/knet-cb/knet-cb.c    |   22 +-
 .../linux/kernel/modules/knet-cb/psample-cb.c |   22 +-
 .../linux/kernel/modules/psample/psample.c    |    2 +-
 .../linux/kernel/modules/shared/Makefile      |   13 +-
 .../linux/kernel/modules/shared/gmodule.c     |   28 +-
 .../linux/kernel/modules/shared/ksal.c        |   13 +-
 .../systems/linux/user/common/Makefile        |   29 +-
 .../systems/linux/user/gts/Makefile           |   13 +-
 .../systems/linux/user/iproc-3_14/Makefile    |   13 +-
 .../systems/linux/user/iproc-4_4/Makefile     |   13 +-
 .../systems/linux/user/iproc/Makefile         |   13 +-
 .../systems/linux/user/iproc_64/Makefile      |   13 +-
 .../systems/linux/user/slk/Makefile           |   13 +-
 .../user/x86-smp_generic_64-2_6/Makefile      |   13 +-
 .../systems/linux/user/xlr/Makefile           |   13 +-
 .../broadcom/saibcm-modules/tools/mktool.pl   |   13 +-
 152 files changed, 27191 insertions(+), 854 deletions(-)
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/LICENSES/gpl-2.0.txt
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56780_a0/bcm56780_a0_pdma_attach.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56880_a0/bcm56880_a0_pdma_attach.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_a0/bcm56990_a0_pdma_attach.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_b0/bcm56990_b0_pdma_attach.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56996_a0/bcm56996_a0_pdma_attach.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_hw.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_rxtx.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_hw.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_rxtx.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicd.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicx.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_dev.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_internal.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_rxtx.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_types.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_core.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_dev.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_rxtx.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_devlist.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iio.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_intr.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_ioctl.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iproc_probe.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_kapi.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_main.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pci_probe.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pgmem.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pio.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_procfs.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_swdev.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_ioctl.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_kapi.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_dev.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_ioctl.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/net/psample.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/include/uapi/linux/psample.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_dep.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/psample/Kbuild
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/psample/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/psample/psample.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/make/lkm.mk
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/shr/include/shr/shr_error.h

diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
index 84d97c09ac88..2d4262518c68 100644
--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-BRCM_OPENNSL_KERNEL_VERSION = 4.2.1.3-1
+BRCM_OPENNSL_KERNEL_VERSION = 4.3.0.10-2
 
 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index fcb175d3d0c5..7a1e6cf99bd1 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.2.1.5-10_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A30%3A31Z&se=2035-01-13T07%3A30%3A00Z&sr=b&sp=r&sig=yCGwk%2FW%2Fg%2FaFxhr0oNSTZ%2BVy5B6kX1WDEsbbyz9J088%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.10-2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-2_amd64.deb?sv=2015-04-05&sr=b&sig=1L2kJwYBuXDc9ObuVBBUS%2F%2FBVIfAA651ig5k6O1ZztE%3D&se=2022-06-10T21%3A25%3A43Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A32%3A43Z&se=2035-01-13T07%3A32%3A00Z&sr=b&sp=r&sig=wuCNc6pa12JQCBi%2BM9rLWvVI92ldan9hKNF%2BfVfUWN8%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-2_amd64.deb?sv=2015-04-05&sr=b&sig=2Vm6o8HtbjI%2BfVoHJUiO5b75USqGra9CLSFXViQm8yM%3D&se=2022-06-10T21%3A26%3A35Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
diff --git a/platform/broadcom/saibcm-modules/debian/changelog b/platform/broadcom/saibcm-modules/debian/changelog
index f2b0db31e662..87d659d21a61 100644
--- a/platform/broadcom/saibcm-modules/debian/changelog
+++ b/platform/broadcom/saibcm-modules/debian/changelog
@@ -1,3 +1,10 @@
+opennsl (4.3.0.10-2) unstable; urgency=medium
+
+  * Update to Broadcom SAI 4.3.0.10
+  * Added SDKLT modules 4.3.0.10-2
+
+ -- Mahesh Maddikayala <samaddik@microsoft.com>  Thu, 21 Jan 2021 18:36:38 +0000
+
 opennsl (4.2.1.3-1) unstable; urgency=medium
 
   * Update to Broadcom SAI 4.2.1.3
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.init b/platform/broadcom/saibcm-modules/debian/opennsl-modules.init
index 7def10cbff86..09112f5331ce 100755
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.init
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.init
@@ -18,7 +18,9 @@ function create_devices()
     rm -f /dev/linux-bcm-knet
     rm -f /dev/linux-bcm-bde
     rm -f /dev/linux-kernel-bde
+    rm -f /dev/linux_ngbde
 
+    mknod /dev/linux_ngbde      c 120 0
     mknod /dev/linux-knet-cb    c 121 0
     mknod /dev/linux-bcm-knet   c 122 0
     mknod /dev/linux-bcm-bde    c 126 0
@@ -57,8 +59,9 @@ function load_kernel_modules()
     # There is a different psample.ko module getting created at net/psample/psample.ko 
     insmod /lib/modules/$(uname -r)/extra/psample.ko
 
-    modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 debug=0x5020
+    modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 debug=0x5020 default_mtu=9100
     modprobe linux-knet-cb
+    modprobe linux_ngbde
 }
 
 function remove_kernel_modules()
@@ -68,6 +71,7 @@ function remove_kernel_modules()
     rmmod linux-bcm-knet
     rmmod linux-user-bde
     rmmod linux-kernel-bde
+    rmmod linux_ngbde
 }
 
 case "$1" in
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
index 0e8051fbbca7..ebb290820f03 100644
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@@ -5,3 +5,4 @@ systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-9-
 systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-9-2-amd64/extra
 systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-9-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
+sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-9-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules
index 64cc9b6c07e0..4fcf2db75a5f 100755
--- a/platform/broadcom/saibcm-modules/debian/rules
+++ b/platform/broadcom/saibcm-modules/debian/rules
@@ -67,6 +67,9 @@ kdist_clean: clean
 	    KERNDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
 	    KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
 	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
+	SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
+	    $(MAKE) -C sdklt/ clean
 #	rm -f driver/*.o driver/*.ko
 #
 ### end  KERNEL SETUP
@@ -100,6 +103,10 @@ build-arch-stamp:
 	    KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
 	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
 
+	SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
+	    $(MAKE) -C sdklt/ kmod
+
 	touch $@
 
 #k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k)
@@ -128,6 +135,10 @@ clean:
 	    KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
 	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 
+	SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
+	    $(MAKE) -C sdklt/ clean
+
 	dh_clean
 
 install: DH_OPTIONS=
diff --git a/platform/broadcom/saibcm-modules/include/ibde.h b/platform/broadcom/saibcm-modules/include/ibde.h
index 5f371b2667c3..fb9d13d1d5fe 100644
--- a/platform/broadcom/saibcm-modules/include/ibde.h
+++ b/platform/broadcom/saibcm-modules/include/ibde.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: ibde.h,v 1.27 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/include/kcom.h b/platform/broadcom/saibcm-modules/include/kcom.h
index eb41e1a5aaf2..5129400ca8cd 100644
--- a/platform/broadcom/saibcm-modules/include/kcom.h
+++ b/platform/broadcom/saibcm-modules/include/kcom.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: kcom.h,v 1.9 Broadcom SDK $
@@ -341,6 +352,8 @@ typedef struct kcom_msg_version_s {
 #define KSYNC_M_HW_DEINIT          1
 #define KSYNC_M_VERSION            2
 #define KSYNC_M_HW_TS_DISABLE      3
+#define KSYNC_M_MTP_TS_UPDATE_ENABLE  4
+#define KSYNC_M_MTP_TS_UPDATE_DISABLE 5
 
 typedef struct kcom_clock_info_s {
     uint8 cmd;
diff --git a/platform/broadcom/saibcm-modules/include/sal/core/sync.h b/platform/broadcom/saibcm-modules/include/sal/core/sync.h
index 75dd6ce68312..03fd2facc907 100644
--- a/platform/broadcom/saibcm-modules/include/sal/core/sync.h
+++ b/platform/broadcom/saibcm-modules/include/sal/core/sync.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: sync.h,v 1.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/include/sal/core/thread.h b/platform/broadcom/saibcm-modules/include/sal/core/thread.h
index b7ecb722489f..86713d1e0742 100644
--- a/platform/broadcom/saibcm-modules/include/sal/core/thread.h
+++ b/platform/broadcom/saibcm-modules/include/sal/core/thread.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: thread.h,v 1.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/include/sal/types.h b/platform/broadcom/saibcm-modules/include/sal/types.h
index 7ed68f43e5e5..43d64dbcc6b9 100644
--- a/platform/broadcom/saibcm-modules/include/sal/types.h
+++ b/platform/broadcom/saibcm-modules/include/sal/types.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: types.h,v 1.3 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/include/sdk_config.h b/platform/broadcom/saibcm-modules/include/sdk_config.h
index 9d781114bdf3..6ce7d77d52d0 100644
--- a/platform/broadcom/saibcm-modules/include/sdk_config.h
+++ b/platform/broadcom/saibcm-modules/include/sdk_config.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: sdk_config.h,v 1.5 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/include/soc/devids.h b/platform/broadcom/saibcm-modules/include/soc/devids.h
index bb91d90be03f..89fabac44537 100644
--- a/platform/broadcom/saibcm-modules/include/soc/devids.h
+++ b/platform/broadcom/saibcm-modules/include/soc/devids.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * Copyright: (c) 2020 Broadcom.
@@ -1274,6 +1285,18 @@
 #define BCM56278_A0_REV_ID      1
 #define BCM56278_A1_REV_ID      2
 
+#define BCM56279_DEVICE_ID      0xb279
+#define BCM56279_A1_REV_ID      2
+
+#define BCM56575_DEVICE_ID      0xb575
+#define BCM56575_A1_REV_ID      2
+
+#define BCM56175_DEVICE_ID      0xb175
+#define BCM56175_A1_REV_ID      2
+
+#define BCM56176_DEVICE_ID      0xb176
+#define BCM56176_A1_REV_ID      2
+
 #define BCM53440_DEVICE_ID      0x8440  
 #define BCM53440_A0_REV_ID      1
 #define BCM53440_B0_REV_ID      0x11
@@ -1404,6 +1427,8 @@
 #define BCM56070_A0_REV_ID      1
 #define BCM56071_DEVICE_ID      0xb071
 #define BCM56071_A0_REV_ID      1
+#define BCM56072_DEVICE_ID      0xb072
+#define BCM56072_A0_REV_ID      1
 
 
 #define BCM56965_DEVICE_ID      0xb965
@@ -1499,6 +1524,8 @@
 #define BCM56471_A0_REV_ID      1
 #define BCM56472_DEVICE_ID      0xb472
 #define BCM56472_A0_REV_ID      1
+#define BCM56475_DEVICE_ID      0xb475
+#define BCM56475_A0_REV_ID      1
 
 
 #define BCM53540_DEVICE_ID      0x8540
@@ -1537,19 +1564,6 @@
 #define BCM88650_A0_REV_ID      ARAD_A0_REV_ID
 #define BCM88650_B0_REV_ID      ARAD_B0_REV_ID
 #define BCM88650_B1_REV_ID      ARAD_B1_REV_ID
-#define BCM88750_DEVICE_ID      0x8750
-#define BCM88750_A0_REV_ID      0x0000
-#define BCM88750_B0_REV_ID      0x0011
-#define BCM88753_DEVICE_ID      0x8753
-#define BCM88753_A0_REV_ID      0x0000
-#define BCM88753_B0_REV_ID      0x0011
-#define BCM88754_DEVICE_ID      0x8754
-#define BCM88754_A0_REV_ID      0x0000
-#define BCM88754_ORIGINAL_VENDOR_ID      0x16FC
-#define BCM88754_ORIGINAL_DEVICE_ID      0x020F
-#define BCM88754_A0_ORIGINAL_REV_ID      0x0001
-#define BCM88755_DEVICE_ID      0x8755
-#define BCM88755_B0_REV_ID      0x0011
 #define BCM88770_DEVICE_ID      0x8770
 #define BCM88770_A1_REV_ID      0x0002
 #define BCM88773_DEVICE_ID      0x8773
@@ -1767,22 +1781,57 @@
 #define BCM88820_DEVICE_ID      J2C_2ND_DEVICE_ID
 #define BCM88800_A0_REV_ID      J2C_A0_REV_ID
 #define BCM88800_A1_REV_ID      J2C_A1_REV_ID
-#define BCM88821_DEVICE_ID      0x8821
-#define BCM88826_DEVICE_ID      0x8826
+#define BCM88801_DEVICE_ID      0x8801
 #define BCM88802_DEVICE_ID      0x8802
 #define BCM88803_DEVICE_ID      0x8803
 #define BCM88804_DEVICE_ID      0x8804
 #define BCM88805_DEVICE_ID      0x8805
 #define BCM88806_DEVICE_ID      0x8806
+#define BCM88807_DEVICE_ID      0x8807
+#define BCM88808_DEVICE_ID      0x8808
+#define BCM88809_DEVICE_ID      0x8809
+#define BCM8880A_DEVICE_ID      0x880A
+#define BCM8880B_DEVICE_ID      0x880B
+#define BCM8880C_DEVICE_ID      0x880C
+#define BCM8880D_DEVICE_ID      0x880D
+#define BCM8880E_DEVICE_ID      0x880E
+#define BCM8880F_DEVICE_ID      0x880F
+#define BCM88821_DEVICE_ID      0x8821
 #define BCM88822_DEVICE_ID      0x8822
 #define BCM88823_DEVICE_ID      0x8823
 #define BCM88824_DEVICE_ID      0x8824
 #define BCM88825_DEVICE_ID      0x8825
+#define BCM88826_DEVICE_ID      0x8826
+#define BCM88827_DEVICE_ID      0x8827
+#define BCM88828_DEVICE_ID      0x8828
+#define BCM88829_DEVICE_ID      0x8829
+#define BCM8882A_DEVICE_ID      0x882A
+#define BCM8882B_DEVICE_ID      0x882B
+#define BCM8882C_DEVICE_ID      0x882C
+#define BCM8882D_DEVICE_ID      0x882D
+#define BCM8882E_DEVICE_ID      0x882E
+#define BCM8882F_DEVICE_ID      0x882F
 
 #define J2P_DEVICE_ID                 0x8850
 #define J2P_A0_REV_ID           DNXC_A0_REV_ID
 #define BCM88850_DEVICE_ID      J2P_DEVICE_ID
 #define BCM88850_A0_REV_ID      J2P_A0_REV_ID
+#define BCM88851_DEVICE_ID      0x8851
+#define BCM88852_DEVICE_ID      0x8852
+#define BCM88853_DEVICE_ID      0x8853
+#define BCM88854_DEVICE_ID      0x8854
+#define BCM88855_DEVICE_ID      0x8855
+#define BCM88856_DEVICE_ID      0x8856
+#define BCM88857_DEVICE_ID      0x8857
+#define BCM88858_DEVICE_ID      0x8858
+#define BCM88859_DEVICE_ID      0x8859
+#define BCM8885A_DEVICE_ID      0x885A
+#define BCM8885B_DEVICE_ID      0x885B
+#define BCM8885C_DEVICE_ID      0x885C
+#define BCM8885D_DEVICE_ID      0x885D
+#define BCM8885E_DEVICE_ID      0x885E
+#define BCM8885F_DEVICE_ID      0x885F
+
 
 #define Q2A_DEVICE_ID           0x8480 
 #define Q2A_A0_REV_ID           DNXC_A0_REV_ID
@@ -1808,6 +1857,24 @@
 #define BCM8848E_DEVICE_ID      0x848E
 #define BCM8848F_DEVICE_ID      0x848F
 
+#define Q2U_DEVICE_ID           0x8280
+#define BCM88280_DEVICE_ID      Q2U_DEVICE_ID
+#define BCM88281_DEVICE_ID      0x8281
+#define BCM88282_DEVICE_ID      0x8282
+#define BCM88283_DEVICE_ID      0x8283
+#define BCM88284_DEVICE_ID      0x8284
+#define BCM88285_DEVICE_ID      0x8285
+#define BCM88286_DEVICE_ID      0x8286
+#define BCM88287_DEVICE_ID      0x8287
+#define BCM88288_DEVICE_ID      0x8288
+#define BCM88289_DEVICE_ID      0x8289
+#define BCM8828A_DEVICE_ID      0x828A
+#define BCM8828B_DEVICE_ID      0x828B
+#define BCM8828C_DEVICE_ID      0x828C
+#define BCM8828D_DEVICE_ID      0x828D
+#define BCM8828E_DEVICE_ID      0x828E
+#define BCM8828F_DEVICE_ID      0x828F
+
 #define QAX_DEVICE_ID           0x8470 
 #define QAX_A0_REV_ID           0x0001
 #define QAX_B0_REV_ID           0x0011
@@ -1833,9 +1900,11 @@
 #define BCM88270_DEVICE_ID      QUX_DEVICE_ID
 #define BCM88270_A0_REV_ID      QUX_A0_REV_ID
 #define BCM88270_A1_REV_ID      QUX_A1_REV_ID
+#define BCM88271_DEVICE_ID      0x8271
 #define BCM88272_DEVICE_ID      0x8272
 #define BCM88273_DEVICE_ID      0x8273
 #define BCM88274_DEVICE_ID      0x8274
+#define BCM88276_DEVICE_ID      0x8276
 #define BCM88278_DEVICE_ID      0x8278
 #define BCM88279_DEVICE_ID      0x8279
 
@@ -1844,16 +1913,6 @@
 #define BCM8206_DEVICE_ID         FLAIR_DEVICE_ID
 #define BCM8206_A0_REV_ID         FLAIR_A0_REV_ID
 
-#define ARDON_DEVICE_ID         0x8202 
-#define ARDON_A0_REV_ID         0x0000 
-#define BCM88202_DEVICE_ID      ARDON_DEVICE_ID 
-#define BCM88202_A0_REV_ID      ARDON_A0_REV_ID 
-#define ARDON_A1_REV_ID         0x0001 
-#define BCM88202_A1_REV_ID      ARDON_A1_REV_ID 
-#define ARDON_A2_REV_ID         0x0002
-#define BCM88202_A2_REV_ID      ARDON_A2_REV_ID 
-#define BCM2801PM_DEVICE_ID     0x2801
-#define BCM2801PM_A0_REV_ID     0x0000
 #define BCM88360_DEVICE_ID      0x8360
 #define BCM88360_A0_REV_ID      ARADPLUS_A0_REV_ID
 #define BCM88361_DEVICE_ID      0x8361
@@ -1901,16 +1960,6 @@
 #define BCM88952_A0_REV_ID		0x0001
 #define BCM88952_A1_REV_ID		0x0002
 
-#define BCM88752_DEVICE_ID      0x8752
-#define BCM88752_A0_REV_ID      0x0000
-#define BCM88752_B0_REV_ID      0x0011
-
-
-#define BCM83207_DEVICE_ID      0x3207
-#define BCM83208_DEVICE_ID      0x3208
-#define BCM83207_A0_REV_ID      0x0001
-#define BCM83208_A0_REV_ID      1
-
 #define PCP_PCI_VENDOR_ID 0x1172
 #define PCP_PCI_DEVICE_ID 0x4
 
@@ -1930,7 +1979,33 @@
 #define BCM56883_DEVICE_ID 0xb883
 #define BCM56883_A0_REV_ID 0x0001
 #define BCM56883_B0_REV_ID 0x0011
-
+#define BCM56889_DEVICE_ID 0xb889
+#define BCM56889_A0_REV_ID 0x0001
+#define BCM56889_B0_REV_ID 0x0011
+
+#define BCM56780_DEVICE_ID 0xb780
+#define BCM56780_A0_REV_ID 0x0001
+#define BCM56782_DEVICE_ID 0xb782
+#define BCM56782_A0_REV_ID 0x0001
+#define BCM56784_DEVICE_ID 0xb784
+#define BCM56784_A0_REV_ID 0x0001
+#define BCM56786_DEVICE_ID 0xb786
+#define BCM56786_A0_REV_ID 0x0001
+#define BCM56788_DEVICE_ID 0xb788
+#define BCM56788_A0_REV_ID 0x0001
+#define BCM56789_DEVICE_ID 0xb789
+#define BCM56789_A0_REV_ID 0x0001
+
+#define BCM56990_DEVICE_ID 0xb990
+#define BCM56990_A0_REV_ID 0x0001
+#define BCM56990_B0_REV_ID 0x0011
+#define BCM56992_DEVICE_ID 0xb992
+#define BCM56992_B0_REV_ID 0x0011
+
+#define BCM56996_DEVICE_ID 0xb996
+#define BCM56996_A0_REV_ID 0x0001
+#define BCM56997_DEVICE_ID 0xb997
+#define BCM56997_A0_REV_ID 0x0001
 #endif 
 #endif  
 
diff --git a/platform/broadcom/saibcm-modules/make/Make.config b/platform/broadcom/saibcm-modules/make/Make.config
index 409a6a49b3f3..b086aa3aa79b 100644
--- a/platform/broadcom/saibcm-modules/make/Make.config
+++ b/platform/broadcom/saibcm-modules/make/Make.config
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.config,v 1.3 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Make.depend b/platform/broadcom/saibcm-modules/make/Make.depend
index de7099387666..802f5f4483c2 100644
--- a/platform/broadcom/saibcm-modules/make/Make.depend
+++ b/platform/broadcom/saibcm-modules/make/Make.depend
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.depend,v 1.14 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Make.kernlib b/platform/broadcom/saibcm-modules/make/Make.kernlib
index 6ec8a1c8df77..94801acd4a69 100644
--- a/platform/broadcom/saibcm-modules/make/Make.kernlib
+++ b/platform/broadcom/saibcm-modules/make/Make.kernlib
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.kernlib,v 1.7 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Make.lib b/platform/broadcom/saibcm-modules/make/Make.lib
index d67325c5dd2f..ac81cc134f6d 100644
--- a/platform/broadcom/saibcm-modules/make/Make.lib
+++ b/platform/broadcom/saibcm-modules/make/Make.lib
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.lib,v 1.14 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
@@ -62,7 +73,7 @@ endif
 ifeq ($(LINUX_MAKE_SHARED_LIB),1)
 	$(CC) -shared -Wl,-soname,${lib}.${LIBSUFFIX}${EXTRA_LIB_LDFLAGS} -o ${targetlib} ${BOBJS} -lc
 else
-	${Q}cd $(dir $(word 1,${BOBJS}));$(AR) ${ARFLAGS} $@ $(sort $(notdir ${BOBJS}))
+	$(AR) ${ARFLAGS} $@ $(sort ${BOBJS})
 endif
 
 endif	# !Borland
diff --git a/platform/broadcom/saibcm-modules/make/Make.linux b/platform/broadcom/saibcm-modules/make/Make.linux
index 81e88daf16bc..ad18872a34eb 100644
--- a/platform/broadcom/saibcm-modules/make/Make.linux
+++ b/platform/broadcom/saibcm-modules/make/Make.linux
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 #
 # $Id: Make.linux,v 1.18 Broadcom SDK $
@@ -85,7 +96,7 @@ endif
 build:
 	$(MAKE) $(CMD)
 
-DELIVER clean C_COMPILER CXX_COMPILER variable mod bcm user issu:
+DELIVER clean C_COMPILER CXX_COMPILER variable mod bcm user issu libopennsa:
 	$(MAKE) $(CMD) $@
 
 clean_d: clean
diff --git a/platform/broadcom/saibcm-modules/make/Make.subdirs b/platform/broadcom/saibcm-modules/make/Make.subdirs
index 1033e296c0a3..374d817d212d 100644
--- a/platform/broadcom/saibcm-modules/make/Make.subdirs
+++ b/platform/broadcom/saibcm-modules/make/Make.subdirs
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.subdirs,v 1.8 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Make.tools b/platform/broadcom/saibcm-modules/make/Make.tools
index 8ed77727fef2..0d55eb2e653a 100644
--- a/platform/broadcom/saibcm-modules/make/Make.tools
+++ b/platform/broadcom/saibcm-modules/make/Make.tools
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Make.tools,v 1.2 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-gts b/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
index ddc94afa13fe..726dfdf505bd 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-xlr-4_19,v 0.1 Broadcom SDK $
 # $Copyright: (c) 2015 Broadcom Corp.
@@ -37,6 +48,8 @@
 # some basic path variables for tools and kernel source, etc #
 export XLR_TOOLS_BASE = /projects/ntsw-tools/linux/xlr-419
 TOOLCHAIN_DIR = $(XLR_TOOLS_BASE)/buildroot/host/usr
+# Target machine for EDK-Host defconfig
+TARGET_MACHINE ?= x86_64
 KERNDIR       = $(XLR_TOOLS_BASE)/kernel/linux
 
 # set up cross compile prefix, tools dir variables. #
@@ -125,12 +138,21 @@ OPENSRC_BUILD ?= fed21-x86_64
 # Hardware interface (see $SDKLT/bcma/sys/probe directory)
 SYSTEM_INTERFACE ?= ngbde
 
+# Support BCMSIM in the same build
+ifeq (1,$(BCM_SIM_PATH_SUPPORT))
+EXTRA_SYSTEM_INTERFACES = plisim
+endif
+
 # Turn on direct register access if running on real hardware.
 ifeq (ngbde,$(SYSTEM_INTERFACE))
+# Except if using multiple probe interfaces
+ifeq (,$(EXTRA_SYSTEM_INTERFACES))
 LTSW_ADD_CPPFLAGS += -DBCMDRD_CONFIG_MEMMAP_DIRECT=1
 endif
+endif
 
 export SYSTEM_INTERFACE
+export EXTRA_SYSTEM_INTERFACES
 endif
 
 ifneq ($(targetplat),user)
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
index 7d8adb98de38..fa4911185aa8 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-iproc Exp $
 # $Copyright: (c) 2007 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-3_14 b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-3_14
index 723fea6c73cf..8d9f66aa50a0 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-3_14
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-3_14
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-iproc-3_6,v 1.1 Broadcom SDK $
 # $Copyright: (c) 2007 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-4_4 b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-4_4
index df31f84e9d8f..bcef1ff69dd4 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-4_4
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc-4_4
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-iproc Exp $
 # $Copyright: (c) 2007 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64 b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
index dbccd7e25734..247da7386370 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-iproc Exp $
 # $Copyright: (c) 2007 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel
index 7cbf8451f91e..ccb0c30d2acc 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-kernel,v 1.27 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-2_6
index 559f2ae5e5e5..08461e4c4b7c 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-2_6
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-kernel-2_6,v 1.40 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-3_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-3_6
index 0d54c4474fc8..528522ec4bd3 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-3_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-3_6
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-kernel-3_6,v 1.2 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_4 b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_4
index 0e8e22e1b32d..c02fc0edd89b 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_4
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_4
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-kernel-2_6,v 1.40 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kmodule b/platform/broadcom/saibcm-modules/make/Makefile.linux-kmodule
index 540c497ea258..46caf00f20b5 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kmodule
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kmodule
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-kmodule-3_6,v 1.2 Broadcom SDK $
 # $Copyright: (c) 2006 Broadcom Corp.
@@ -61,6 +72,13 @@ KERNBLDDIR ?= $(KERNDIR)
 # kernel symbols.
 
 override EXTRA_CFLAGS = -I${SDK}/include -I${SDK}/systems/linux/kernel/modules/include -I${SDK}/systems/bde/linux/include
+#
+# If, for any reason, the definition of LD was erased, then
+# set it, again.
+#
+ifeq ($(LD),)
+LD = $(CROSS_COMPILE)ld
+endif
 
 # The precopiled object needs a dummy command file to avoid warnings
 # from the Kbuild scripts (modpost stage).
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-slk b/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
index 00131c2f2af9..656835019a05 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-slk-3_14,v 1.2 Broadcom SDK $
 # $Copyright: (c) 2013 Broadcom Corp.
@@ -27,11 +38,15 @@ endif
 ifeq (BE,$(ENDIAN_MODE))
 TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/toolchains/slk/linaro-be
 TARGET_ARCHITECTURE:=aarch64_be-linux-gnu
+# Target machine for EDK-Host defconfig
+TARGET_MACHINE ?= slk_be
 KERNDIR ?= /projects/ntsw-tools/linux/iproc_ldks/slk-be/poky/brcm-released-source/git
 else
 TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/toolchains/slk/linaro-le
 # Compiler for target architecture
 TARGET_ARCHITECTURE:= aarch64-linux-gnu
+# Target machine for EDK-Host defconfig
+TARGET_MACHINE ?= slk_le
 # Kernel directory
 KERNDIR ?= /projects/ntsw-tools/linux/iproc_ldks/slk/poky/brcm-released-source/git
 endif
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-common-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-common-2_6
index 25e953136bc0..dbd51ee1f627 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-common-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-common-2_6
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-x86-common-2_6,v 1.13 Broadcom SDK $
 # $Copyright: (c) 2005 Broadcom Corp.
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
index b443a3d4733d..4b02aa53cda8 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-x86-generic-common-2_6,v 1.2 Broadcom SDK $
 # $Copyright: (c) 2008 Broadcom Corp.
@@ -48,5 +59,4 @@ AUTOCONF = $(KERNDIR)/include/linux/autoconf.h
 endif
 
 # gcc system include path
-# SAI_FIXUP  /* SDK-218654 */
 SYSINC = $(shell $(CC) -print-search-dirs | grep install | cut -c 10-)include
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
index 8a97f3954301..9df0bee5a774 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-x86-smp_generic_64-2_6,v 1.5 Broadcom SDK $
 # $Copyright: (c) 2008 Broadcom Corp.
@@ -25,7 +36,7 @@ CFGFLAGS += -DSAL_SPL_LOCK_ON_IRQ
 include ${SDK}/make/Makefile.linux-x86-generic-common-2_6
 
 ifeq (,$(KFLAGS))
-KFLAGS := -nostdinc -isystem $(SYSINC) -I$(KERNDIR)/include -I$(KERNDIR)/arch/x86/include -include $(AUTOCONF) -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-stack-protector -fomit-frame-pointer -g -Wdeclaration-after-statement -Wno-pointer-sign
+KFLAGS := -nostdinc -isystem $(SYSINC) -I$(KERNDIR)/include -I$(KERNDIR)/arch/x86/include -include $(AUTOCONF) -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -fno-pie -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-stack-protector -fomit-frame-pointer -g -Wdeclaration-after-statement -Wno-pointer-sign
 endif
 
 ifeq ($(LINUX_MAKE_SHARED_LIB), 1)
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr b/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
index ddc94afa13fe..726dfdf505bd 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # $Id: Makefile.linux-xlr-4_19,v 0.1 Broadcom SDK $
 # $Copyright: (c) 2015 Broadcom Corp.
@@ -37,6 +48,8 @@
 # some basic path variables for tools and kernel source, etc #
 export XLR_TOOLS_BASE = /projects/ntsw-tools/linux/xlr-419
 TOOLCHAIN_DIR = $(XLR_TOOLS_BASE)/buildroot/host/usr
+# Target machine for EDK-Host defconfig
+TARGET_MACHINE ?= x86_64
 KERNDIR       = $(XLR_TOOLS_BASE)/kernel/linux
 
 # set up cross compile prefix, tools dir variables. #
@@ -125,12 +138,21 @@ OPENSRC_BUILD ?= fed21-x86_64
 # Hardware interface (see $SDKLT/bcma/sys/probe directory)
 SYSTEM_INTERFACE ?= ngbde
 
+# Support BCMSIM in the same build
+ifeq (1,$(BCM_SIM_PATH_SUPPORT))
+EXTRA_SYSTEM_INTERFACES = plisim
+endif
+
 # Turn on direct register access if running on real hardware.
 ifeq (ngbde,$(SYSTEM_INTERFACE))
+# Except if using multiple probe interfaces
+ifeq (,$(EXTRA_SYSTEM_INTERFACES))
 LTSW_ADD_CPPFLAGS += -DBCMDRD_CONFIG_MEMMAP_DIRECT=1
 endif
+endif
 
 export SYSTEM_INTERFACE
+export EXTRA_SYSTEM_INTERFACES
 endif
 
 ifneq ($(targetplat),user)
diff --git a/platform/broadcom/saibcm-modules/sdklt/LICENSES/gpl-2.0.txt b/platform/broadcom/saibcm-modules/sdklt/LICENSES/gpl-2.0.txt
new file mode 100644
index 000000000000..d159169d1050
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/LICENSES/gpl-2.0.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/platform/broadcom/saibcm-modules/sdklt/Makefile b/platform/broadcom/saibcm-modules/sdklt/Makefile
new file mode 100644
index 000000000000..d6f358c55283
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/Makefile
@@ -0,0 +1,83 @@
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+help:
+	@echo ''
+	@echo 'Build Linux GPL kernel modules for SDKLT.'
+	@echo ''
+	@echo 'Available make targets:'
+	@echo 'kmod          - Build kernel modules'
+	@echo 'clean         - Remove object files'
+	@echo ''
+	@echo 'Supported make variables:'
+	@echo 'KDIR          - Linux kernel source directory (mandatory)'
+	@echo 'CROSS_COPILE  - Cross-compiler prefix (optional)'
+	@echo ''
+	@echo 'Examples:'
+	@echo 'make -s KDIR=$$KERNEL/linux kmod'
+	@echo 'make -s clean'
+	@echo ''
+
+ifndef KDIR
+nokdir:
+	@echo 'Error: The $$KDIR environment variable is not set.'
+	@echo '$$KDIR must point to a configured Linux kernel source tree.'
+	exit 1
+endif
+
+export KDIR
+export CROSS_COMPILE
+
+override SDK := $(CURDIR)
+
+ifeq ($(BUILD_PSAMPLE),1)
+PSAMPLE=psample
+PSAMPLE_SYMVERS=$(SDK)/linux/psample/Module.symvers
+endif
+
+kmod: bde knet knetcb $(PSAMPLE)
+
+bde:
+	$(MAKE) -C $(SDK)/linux/bde SDK=$(SDK) \
+		$(TARGET)
+	ln -sf $(SDK)/linux/bde/*.ko
+
+knet: bde
+	$(MAKE) -C $(SDK)/linux/knet SDK=$(SDK) \
+		KBUILD_EXTRA_SYMBOLS=$(SDK)/linux/bde/Module.symvers \
+		$(TARGET)
+	ln -sf $(SDK)/linux/knet/*.ko
+
+knetcb: knet $(PSAMPLE)
+	$(MAKE) -C $(SDK)/linux/knetcb SDK=$(SDK) \
+		KBUILD_EXTRA_SYMBOLS=$(SDK)/linux/knet/Module.symvers \
+		KBUILD_EXTRA_SYMBOLS+=$(PSAMPLE_SYMVERS) \
+		$(TARGET)
+	ln -sf $(SDK)/linux/knetcb/*.ko
+
+ifeq ($(BUILD_PSAMPLE),1)
+$(PSAMPLE):
+	$(MAKE) -C $(SDK)/linux/psample SDK=$(SDK) \
+		$(TARGET)
+	ln -sf $(SDK)/linux/psample/*.ko
+endif
+
+clean:
+	$(MAKE) kmod TARGET=clean
+	rm -f *.ko
+
+.PHONY: help kmod bde knet knetcb $(PSAMPLE) clean
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56780_a0/bcm56780_a0_pdma_attach.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56780_a0/bcm56780_a0_pdma_attach.c
new file mode 100644
index 000000000000..e06dcb68bfc8
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56780_a0/bcm56780_a0_pdma_attach.c
@@ -0,0 +1,38 @@
+/*! \file bcm56780_a0_pdma_attach.c
+ *
+ * Initialize PDMA driver resources.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+int
+bcm56780_a0_cnet_pdma_attach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_attach(dev);
+}
+
+int
+bcm56780_a0_cnet_pdma_detach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_detach(dev);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56880_a0/bcm56880_a0_pdma_attach.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56880_a0/bcm56880_a0_pdma_attach.c
new file mode 100644
index 000000000000..9a2152e99ac0
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56880_a0/bcm56880_a0_pdma_attach.c
@@ -0,0 +1,38 @@
+/*! \file bcm56880_a0_pdma_attach.c
+ *
+ * Initialize PDMA driver resources.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+int
+bcm56880_a0_cnet_pdma_attach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_attach(dev);
+}
+
+int
+bcm56880_a0_cnet_pdma_detach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_detach(dev);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_a0/bcm56990_a0_pdma_attach.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_a0/bcm56990_a0_pdma_attach.c
new file mode 100644
index 000000000000..7827ef25de3d
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_a0/bcm56990_a0_pdma_attach.c
@@ -0,0 +1,38 @@
+/*! \file bcm56990_a0_pdma_attach.c
+ *
+ * Initialize PDMA driver resources.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+int
+bcm56990_a0_cnet_pdma_attach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_attach(dev);
+}
+
+int
+bcm56990_a0_cnet_pdma_detach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_detach(dev);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_b0/bcm56990_b0_pdma_attach.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_b0/bcm56990_b0_pdma_attach.c
new file mode 100644
index 000000000000..e34ae1f0b45c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56990_b0/bcm56990_b0_pdma_attach.c
@@ -0,0 +1,38 @@
+/*! \file bcm56990_b0_pdma_attach.c
+ *
+ * Initialize PDMA driver resources.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+int
+bcm56990_b0_cnet_pdma_attach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_attach(dev);
+}
+
+int
+bcm56990_b0_cnet_pdma_detach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_detach(dev);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56996_a0/bcm56996_a0_pdma_attach.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56996_a0/bcm56996_a0_pdma_attach.c
new file mode 100644
index 000000000000..aab5822f68b7
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/chip/bcm56996_a0/bcm56996_a0_pdma_attach.c
@@ -0,0 +1,38 @@
+/*! \file bcm56996_a0_pdma_attach.c
+ *
+ * Initialize PDMA driver resources.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+int
+bcm56996_a0_cnet_pdma_attach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_attach(dev);
+}
+
+int
+bcm56996_a0_cnet_pdma_detach(struct pdma_dev *dev)
+{
+    return bcmcnet_cmicx_pdma_driver_detach(dev);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_hw.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_hw.c
new file mode 100644
index 000000000000..83ce4d11b97f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_hw.c
@@ -0,0 +1,530 @@
+/*! \file bcmcnet_cmicd_pdma_hw.c
+ *
+ * Utility routines for handling BCMCNET hardware (CMICd).
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_cmicd.h>
+
+/*!
+ * Read 32-bit register
+ */
+static inline void
+cmicd_pdma_reg_read32(struct pdma_hw *hw, uint32_t addr, uint32_t *data)
+{
+    if (hw->dev->dev_read32) {
+        hw->dev->dev_read32(hw->dev, addr, data);
+    } else {
+        DEV_READ32(&hw->dev->ctrl, addr, data);
+    }
+}
+
+/*!
+ * Write 32-bit register
+ */
+static inline void
+cmicd_pdma_reg_write32(struct pdma_hw *hw, uint32_t addr, uint32_t data)
+{
+    if (hw->dev->dev_write32) {
+        hw->dev->dev_write32(hw->dev, addr, data);
+    } else {
+        DEV_WRITE32(&hw->dev->ctrl, addr, data);
+    }
+}
+
+/*!
+ * Enable interrupt for a channel
+ */
+static inline void
+cmicd_pdma_intr_enable(struct pdma_hw *hw, int cmc, int chan, uint32_t mask)
+{
+    uint32_t reg = CMICD_IRQ_STAT(cmc);
+
+    hw->dev->intr_unmask(hw->dev, cmc, chan, reg, mask);
+}
+
+/*!
+ * Disable interrupt for a channel
+ */
+static inline void
+cmicd_pdma_intr_disable(struct pdma_hw *hw, int cmc, int chan, uint32_t mask)
+{
+    uint32_t reg = CMICD_IRQ_STAT(cmc);
+
+    hw->dev->intr_mask(hw->dev, cmc, chan, reg, mask);
+}
+
+/*!
+ * Initialize HW
+ */
+static int
+cmicd_pdma_hw_init(struct pdma_hw *hw)
+{
+    dev_mode_t mode = DEV_MODE_MAX;
+    uint32_t val;
+
+    /* Temporarily upgrade work mode to get HW information in VNET mode. */
+    if (hw->dev->mode == DEV_MODE_VNET) {
+        mode = DEV_MODE_VNET;
+        hw->dev->mode = DEV_MODE_UNET;
+    }
+
+    /* Release credits to EP. Only do this once when HW is initialized. */
+    hw->hdls.reg_rd32(hw, CMICD_EPINTF_RELEASE_CREDITS, &val);
+    if (!val) {
+        hw->hdls.reg_wr32(hw, CMICD_EPINTF_RELEASE_CREDITS, 1);
+    }
+
+    hw->info.name = CMICD_DEV_NAME;
+    hw->hdls.reg_rd32(hw, CMICD_CMICM_REV_ID, &val);
+    hw->info.ver_no = val;
+    hw->hdls.reg_rd32(hw, CMICD_DEV_REV_ID, &val);
+    hw->info.dev_id = val & 0xffff;
+    hw->info.rev_id = val >> 16;
+    hw->info.num_cmcs = CMICD_PDMA_CMC_MAX;
+    hw->info.cmc_chans = CMICD_PDMA_CMC_CHAN;
+    hw->info.num_chans = CMICD_PDMA_CMC_MAX * CMICD_PDMA_CMC_CHAN;
+    hw->info.rx_dcb_size = CMICD_PDMA_DCB_SIZE;
+    hw->info.tx_dcb_size = CMICD_PDMA_DCB_SIZE;
+    hw->info.rx_ph_size = 0;
+    hw->info.tx_ph_size = 0;
+
+    /* Restore work mode to VNET. */
+    if (mode == DEV_MODE_VNET) {
+        hw->dev->mode = DEV_MODE_VNET;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Configure HW
+ */
+static int
+cmicd_pdma_hw_config(struct pdma_hw *hw)
+{
+    struct dev_ctrl *ctrl = &hw->dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    uint32_t val, que_ctrl;
+    int grp, que;
+    uint32_t qi;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[qi];
+        grp = rxq->group_id;
+        que = rxq->chan_id % CMICD_PDMA_CMC_CHAN;
+        que_ctrl = ctrl->grp[grp].que_ctrl[que];
+
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CMPLT(que));
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CNTLD(que));
+        val = 0;
+        if (que_ctrl & PDMA_PKT_BYTE_SWAP) {
+            val |= CMICD_PDMA_PKT_BIG_ENDIAN;
+        }
+        if (que_ctrl & PDMA_OTH_BYTE_SWAP) {
+            val |= CMICD_PDMA_DESC_BIG_ENDIAN;
+        }
+        if (!(hw->dev->flags & PDMA_CHAIN_MODE)) {
+            val |= CMICD_PDMA_CONTINUOUS;
+        }
+        val |= CMICD_PDMA_CNTLD_INTR;
+        val &= ~CMICD_PDMA_DIR;
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(grp, que), val);
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[qi];
+        grp = txq->group_id;
+        que = txq->chan_id % CMICD_PDMA_CMC_CHAN;
+        que_ctrl = ctrl->grp[grp].que_ctrl[que];
+
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CMPLT(que));
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CNTLD(que));
+        val = 0;
+        if (que_ctrl & PDMA_PKT_BYTE_SWAP) {
+            val |= CMICD_PDMA_PKT_BIG_ENDIAN;
+        }
+        if (que_ctrl & PDMA_OTH_BYTE_SWAP) {
+            val |= CMICD_PDMA_DESC_BIG_ENDIAN;
+        }
+        if (!(hw->dev->flags & PDMA_CHAIN_MODE)) {
+            val |= CMICD_PDMA_CONTINUOUS;
+        }
+        val |= CMICD_PDMA_CNTLD_INTR | CMICD_PDMA_DIR;
+        hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(grp, que), val);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Reset HW
+ */
+static int
+cmicd_pdma_hw_reset(struct pdma_hw *hw)
+{
+    int gi, qi;
+
+    for (gi = 0; gi < hw->dev->num_groups; gi++) {
+        if (!hw->dev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < CMICD_PDMA_CMC_CHAN; qi++) {
+            if (1 << qi & hw->dev->ctrl.grp[gi].bm_rxq ||
+                1 << qi & hw->dev->ctrl.grp[gi].bm_txq) {
+                hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(gi, qi), 0);
+            }
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Start a channel
+ */
+static int
+cmicd_pdma_chan_start(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_CTRL(grp, que), &val);
+    val |= CMICD_PDMA_ENABLE;
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(grp, que), val);
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Stop a channel
+ */
+static int
+cmicd_pdma_chan_stop(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+    int retry = CMICD_HW_RETRY_TIMES;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_CTRL(grp, que), &val);
+    val |= CMICD_PDMA_ENABLE | CMICD_PDMA_ABORT;
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(grp, que), val);
+
+    MEMORY_BARRIER;
+
+    do {
+        val = ~CMICD_PDMA_ACTIVE(que);
+        hw->hdls.reg_rd32(hw, CMICD_PDMA_STAT(grp), &val);
+    } while ((val & CMICD_PDMA_ACTIVE(que)) && (--retry > 0));
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_CTRL(grp, que), &val);
+    val &= ~(CMICD_PDMA_ENABLE | CMICD_PDMA_ABORT);
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_CTRL(grp, que), val);
+
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CNTLD(que));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Setup a channel
+ */
+static int
+cmicd_pdma_chan_setup(struct pdma_hw *hw, int chan, uint64_t addr)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_DESC(grp, que), addr);
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Set halt point for a channel
+ */
+static int
+cmicd_pdma_chan_goto(struct pdma_hw *hw, int chan, uint64_t addr)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_DESC_HALT(grp, que), addr);
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Clear a channel
+ */
+static int
+cmicd_pdma_chan_clear(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_STAT_CLR(grp), CMICD_PDMA_DESC_CNTLD(que));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get interrupt number for a channel
+ */
+static int
+cmicd_pdma_chan_intr_num_get(struct pdma_hw *hw, int chan)
+{
+    int grp, que, start_num, mask_shift;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    mask_shift = 0;
+    if (grp > 0) {
+        mask_shift = CMICD_IRQ_MASK_SHIFT + grp * 32;
+    }
+    start_num = CMICD_IRQ_START_NUM + mask_shift;
+
+    return start_num + (que * CMICD_IRQ_NUM_OFFSET);
+}
+
+/*!
+ * Enable interrupt for a channel
+ */
+static int
+cmicd_pdma_chan_intr_enable(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    cmicd_pdma_intr_enable(hw, grp, que, CMICD_IRQ_DESC_CNTLD(que));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Disable interrupt for a channel
+ */
+static int
+cmicd_pdma_chan_intr_disable(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    cmicd_pdma_intr_disable(hw, grp, que, CMICD_IRQ_DESC_CNTLD(que));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Query interrupt status for a channel
+ *
+ * In group mode (interrupt processing per CMC), need to query each channel's
+ * interrupt status.
+ *
+ */
+static int
+cmicd_pdma_chan_intr_query(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICD_IRQ_STAT(grp), &val);
+
+    return val & CMICD_IRQ_DESC_CNTLD(que);
+}
+
+/*!
+ * Check interrupt validity for a channel
+ *
+ * In group mode (interrupt processing per CMC), need to check each channel's
+ * interrupt validity based on its interrupt mask.
+ *
+ */
+static int
+cmicd_pdma_chan_intr_check(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    if (!(hw->dev->ctrl.grp[grp].irq_mask & CMICD_IRQ_DESC_CNTLD(que))) {
+        return 0;
+    }
+
+    return cmicd_pdma_chan_intr_query(hw, chan);
+}
+
+/*!
+ * Coalesce interrupt for a channel
+ */
+static int
+cmicd_pdma_chan_intr_coalesce(struct pdma_hw *hw, int chan, int count, int timer)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    val = CMICD_PDMA_INTR_COAL_ENA |
+          CMICD_PDMA_INTR_THRESH(count) |
+          CMICD_PDMA_INTR_TIMER(timer);
+    hw->hdls.reg_wr32(hw, CMICD_PDMA_INTR_COAL(grp, que), val);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dump registers for a channel
+ */
+static int
+cmicd_pdma_chan_reg_dump(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICD_PDMA_CMC_CHAN;
+    que = chan % CMICD_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_CTRL(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_CH%d_DMA_CTRL: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_DESC(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_DESC%d: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_CURR_DESC(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_CH%d_DMA_CURR_DESC: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_DESC_HALT(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_DESC_HALT_ADDR: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COS_RX0(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_CH%d_COS_CTRL_RX_0: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COS_RX1(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_CH%d_COS_CTRL_RX_1: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COS_MASK0(grp), &val);
+    CNET_PR("CMIC_CMC%d_PROGRAMMABLE_COS_MASK0: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COS_MASK1(grp), &val);
+    CNET_PR("CMIC_CMC%d_PROGRAMMABLE_COS_MASK1: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_INTR_COAL(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_INTR_COAL: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_RBUF_THRE(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_CH%d_RXBUF_THRESHOLD_CONFIG: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_STAT(grp), &val);
+    CNET_PR("CMIC_CMC%d_DMA_STAT: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_STAT_HI(grp), &val);
+    CNET_PR("CMIC_CMC%d_DMA_STAT_HI: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_STAT_CLR(grp), &val);
+    CNET_PR("CMIC_CMC%d_DMA_STAT_CLR: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COUNT_RX(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_PKT_COUNT_CH%d_RXPKT: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_PDMA_COUNT_TX(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_PKT_COUNT_CH%d_TXPKT: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_IRQ_STAT(grp), &val);
+    CNET_PR("CMIC_CMC%d_IRQ_STAT0: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_IRQ_PCI_MASK(grp), &val);
+    CNET_PR("CMIC_CMC%d_PCIE_IRQ_MASK0: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICD_DEV_REV_ID, &val);
+    CNET_PR("CMIC_DEV_REV_ID: 0x%08x\n", val);
+
+    hw->hdls.reg_rd32(hw, CMICD_CMICM_REV_ID, &val);
+    CNET_PR("CMIC_CMICM_REV_ID: 0x%08x\n", val);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize function pointers
+ */
+int
+bcmcnet_cmicd_pdma_hw_hdls_init(struct pdma_hw *hw)
+{
+    if (!hw) {
+        return SHR_E_PARAM;
+    }
+
+    hw->hdls.reg_rd32 = cmicd_pdma_reg_read32;
+    hw->hdls.reg_wr32 = cmicd_pdma_reg_write32;
+    hw->hdls.hw_init = cmicd_pdma_hw_init;
+    hw->hdls.hw_config = cmicd_pdma_hw_config;
+    hw->hdls.hw_reset = cmicd_pdma_hw_reset;
+    hw->hdls.chan_start = cmicd_pdma_chan_start;
+    hw->hdls.chan_stop = cmicd_pdma_chan_stop;
+    hw->hdls.chan_setup = cmicd_pdma_chan_setup;
+    hw->hdls.chan_goto = cmicd_pdma_chan_goto;
+    hw->hdls.chan_clear = cmicd_pdma_chan_clear;
+    hw->hdls.chan_intr_num_get = cmicd_pdma_chan_intr_num_get;
+    hw->hdls.chan_intr_enable = cmicd_pdma_chan_intr_enable;
+    hw->hdls.chan_intr_disable = cmicd_pdma_chan_intr_disable;
+    hw->hdls.chan_intr_query = cmicd_pdma_chan_intr_query;
+    hw->hdls.chan_intr_check = cmicd_pdma_chan_intr_check;
+    hw->hdls.chan_intr_coalesce = cmicd_pdma_chan_intr_coalesce;
+    hw->hdls.chan_reg_dump = cmicd_pdma_chan_reg_dump;
+
+    return SHR_E_NONE;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_rxtx.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_rxtx.c
new file mode 100644
index 000000000000..c4a10e160db9
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicd/bcmcnet_cmicd_pdma_rxtx.c
@@ -0,0 +1,1062 @@
+/*! \file bcmcnet_cmicd_pdma_rxtx.c
+ *
+ * Utility routines for BCMCNET hardware (CMICd) specific Rx/Tx.
+ *
+ * Here are the CMIC specific Rx/Tx routines including DCBs resource allocation
+ * and clean up, DCBs configuration, Rx buffers allocation, Tx buffers release,
+ * Rx/Tx packets processing, etc.
+ * They are shared among all the modes (UNET, KNET, VNET, HNET) and in both of
+ * user space and kernel space.
+ *
+ * The driver uses a ring of DCBs per DMA channel based on Continuous DMA mode.
+ * The beginning is written to register pointing to the physical address of the
+ * start of the ring. The ring size is maintained by the driver. A HALT DCB
+ * physical address is written to DMA register timely to indicate how many DCBs
+ * can be handled by HW.
+ *
+ * When a packet is received, an interrupt is triggered. The handler will go
+ * through the Rx DCB ring to process the current completed DCB and every
+ * subsequent DCBs until no one is left. The received packet is processed and
+ * passed up to the high level SW. After that, a new buffer is allocated and
+ * the DCB is updated for receiving a new packet. A new HALT DCB is selected
+ * and its physical address is written to DMA register.
+ *
+ * When a packet is transmitted, the driver starts where it left off last time
+ * in the Tx DCB ring, updates the DCB and writes its physical address to DMA
+ * register so as to start DMA. Once the transmitting is finished, the handler
+ * is informed to clean up the buffer based on the work mode. In KNET or HNET
+ * mode, an interrupt will be triggered. Polling mode is used in CNET or VNET
+ * mode, the buffers will be cleaned up when the number of dirty DCBs reaches
+ * a pre-defined threshold.
+ *
+ * In VNET and HNET modes, DCB updating between virtual ring and real ring and
+ * a IOCTL based notification mechanism are involved. The hypervisor in kernel
+ * emulates the DMA HW behaviors to update DCBs in virtual network and inform
+ * the handler something happened. Likewise, the hypervisor updates itself real
+ * DCB ring from the virtual ring to start DMA for transmitting a packet once a
+ * notification is received from the virtual network.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_buff.h>
+#include <bcmcnet/bcmcnet_cmicd.h>
+
+/*!
+ * Configure Rx descriptor
+ */
+static inline void
+cmicd_rx_desc_config(struct cmicd_rx_desc *rd, uint32_t addr, uint32_t len)
+{
+    rd->addr = addr;
+    rd->md.status = 0;
+    rd->ctrl = CMICD_DESC_CTRL_CNTLD_INTR | CMICD_DESC_CTRL_CHAIN |
+               CMICD_DESC_CTRL_LEN(len);
+}
+
+/*!
+ * Configure Tx descriptor
+ */
+static inline void
+cmicd_tx_desc_config(struct cmicd_tx_desc *td, uint32_t addr, uint32_t len, uint32_t flags)
+{
+    td->addr = addr;
+    td->md.status = 0;
+    td->ctrl = CMICD_DESC_CTRL_CNTLD_INTR | CMICD_DESC_CTRL_CHAIN |
+               CMICD_DESC_CTRL_FLAGS(flags) | CMICD_DESC_CTRL_LEN(len);
+}
+
+/*!
+ * Configure Rx reload descriptor
+ */
+static inline void
+cmicd_rx_rldesc_config(struct cmicd_rx_desc *rd, uint32_t addr)
+{
+    rd->addr = addr;
+    rd->md.status = 0;
+    rd->ctrl = CMICD_DESC_CTRL_CNTLD_INTR | CMICD_DESC_CTRL_CHAIN |
+               CMICD_DESC_CTRL_RELOAD;
+}
+
+/*!
+ * Configure Tx reload descriptor
+ */
+static inline void
+cmicd_tx_rldesc_config(struct cmicd_tx_desc *td, uint32_t addr)
+{
+    td->addr = addr;
+    td->md.status = 0;
+    td->ctrl = CMICD_DESC_CTRL_CNTLD_INTR | CMICD_DESC_CTRL_CHAIN |
+               CMICD_DESC_CTRL_RELOAD;
+}
+
+/*!
+ * Chain Rx descriptor
+ */
+static inline void
+cmicd_rx_desc_chain(struct cmicd_rx_desc *rd, int chain)
+{
+    if (chain) {
+        rd->ctrl |= CMICD_DESC_CTRL_CHAIN;
+    } else {
+        rd->ctrl &= ~CMICD_DESC_CTRL_CHAIN;
+    }
+}
+
+/*!
+ * Chain Tx descriptor
+ */
+static inline void
+cmicd_tx_desc_chain(struct cmicd_tx_desc *td, int chain)
+{
+    if (chain) {
+        td->ctrl |= CMICD_DESC_CTRL_CHAIN;
+    } else {
+        td->ctrl &= ~CMICD_DESC_CTRL_CHAIN;
+    }
+}
+
+/*!
+ * Get unused descriptors in a Rx ring
+ */
+static inline int
+cmicd_pdma_rx_ring_unused(struct pdma_rx_queue *rxq)
+{
+    /* Leave one descriptor unused so as not to halt */
+    return rxq->curr > rxq->halt ?
+           rxq->curr - rxq->halt - 1 :
+           rxq->nb_desc + rxq->curr - rxq->halt - 1;
+}
+
+/*!
+ * Get unused descriptors in a Tx ring
+ */
+static inline int
+cmicd_pdma_tx_ring_unused(struct pdma_tx_queue *txq)
+{
+    /* Leave one descriptor unused so as not to halt */
+    return txq->dirt > txq->curr ?
+           txq->dirt - txq->curr - 1 :
+           txq->nb_desc + txq->dirt - txq->curr - 1;
+}
+
+/*!
+ * Initialize Rx descriptors
+ */
+static int
+cmicd_pdma_rx_desc_init(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    dma_addr_t addr;
+    uint32_t di;
+    int rv;
+
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (!rxq->pbuf[di].dma) {
+            /* Allocate pktbuf for ring entry */
+            rxq->pbuf[di].adj = CMICD_RX_META_RESV;
+            rv = bm->rx_buf_alloc(dev, rxq, &rxq->pbuf[di]);
+            if (SHR_FAILURE(rv)) {
+                goto cleanup;
+            }
+        }
+        /* Config receive descriptor ring */
+        bm->rx_buf_dma(dev, rxq, &rxq->pbuf[di], &addr);
+        cmicd_rx_desc_config(&ring[di], addr, rxq->buf_size);
+        if (hw->dev->flags & PDMA_CHAIN_MODE && di == rxq->nb_desc - 1) {
+            cmicd_rx_desc_chain(&ring[di], 0);
+        }
+    }
+    /* Config the last descriptor in the ring as reload descriptor */
+    cmicd_rx_rldesc_config(&ring[di], rxq->ring_addr);
+
+    rxq->curr = 0;
+    rxq->halt = rxq->state & PDMA_RX_BATCH_REFILL ? 0 : rxq->nb_desc;
+
+    rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * di;
+    hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    hw->hdls.chan_setup(hw, rxq->chan_id, rxq->ring_addr);
+
+    return SHR_E_NONE;
+
+cleanup:
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (rxq->pbuf[di].dma) {
+            bm->rx_buf_free(dev, rxq, &rxq->pbuf[di]);
+        }
+        cmicd_rx_desc_config(&ring[di], 0, 0);
+    }
+
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * Cleanup Rx descriptors
+ */
+static int
+cmicd_pdma_rx_desc_clean(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    uint32_t di;
+
+    /* Go through all the descriptors and free pktbuf */
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (rxq->pbuf[di].dma) {
+            bm->rx_buf_free(dev, rxq, &rxq->pbuf[di]);
+        }
+        cmicd_rx_desc_config(&ring[di], 0, 0);
+    }
+
+    rxq->curr = 0;
+    rxq->halt = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize Tx descriptors
+ */
+static int
+cmicd_pdma_tx_desc_init(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    uint32_t di;
+
+    for (di = 0; di < txq->nb_desc; di++) {
+        if (txq->pbuf[di].dma) {
+            bm->tx_buf_free(dev, txq, &txq->pbuf[di]);
+        }
+        /* Config transmit descriptor ring */
+        cmicd_tx_desc_config(&ring[di], 0, 0, 0);
+        if (hw->dev->flags & PDMA_CHAIN_MODE) {
+            cmicd_tx_desc_chain(&ring[di], 0);
+        }
+    }
+    /* Config the last descriptor in the ring as reload descriptor */
+    cmicd_tx_rldesc_config(&ring[di], txq->ring_addr);
+
+    txq->curr = 0;
+    txq->dirt = 0;
+    txq->halt = 0;
+
+    txq->halt_addr = txq->ring_addr;
+    hw->hdls.chan_goto(hw, txq->chan_id, txq->halt_addr);
+    hw->hdls.chan_setup(hw, txq->chan_id, txq->ring_addr);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Cleanup Tx descriptors
+ */
+static int
+cmicd_pdma_tx_desc_clean(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    uint32_t di;
+
+    /* Go through all the descriptors and free pktbuf */
+    for (di = 0; di < txq->nb_desc; di++) {
+        if (txq->pbuf[di].dma) {
+            bm->tx_buf_free(dev, txq, &txq->pbuf[di]);
+        }
+        cmicd_tx_desc_config(&ring[di], 0, 0, 0);
+    }
+
+    txq->curr = 0;
+    txq->dirt = 0;
+    txq->halt = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Process Rx vring
+ */
+static int
+cmicd_pdma_rx_vring_process(struct pdma_hw *hw, struct pdma_rx_queue *rxq,
+                            struct pdma_rx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    struct pdma_rx_queue *vrxq = NULL;
+    struct cmicd_rx_desc *vring = NULL;
+    struct pkt_hdr *pkh = &pbuf->pkb->pkh;
+
+    vrxq = (struct pdma_rx_queue *)dev->ctrl.vnet_rxq[rxq->queue_id];
+    vring = (struct cmicd_rx_desc *)vrxq->ring;
+    if (!vring) {
+        rxq->stats.dropped++;
+        return SHR_E_UNAVAIL;
+    }
+
+    if (vring[vrxq->curr].md.status & CMICD_DESC_STAT_RTX_DONE) {
+        dev->xnet_wake(dev);
+        return SHR_E_BUSY;
+    }
+
+    /* Copy descriptor and packet to vring */
+    sal_memcpy(dev->sys_p2v(dev, (uint64_t)vring[vrxq->curr].addr),
+               &pbuf->pkb->data + pkh->meta_len, pkh->data_len);
+    sal_memcpy(&vring[vrxq->curr].md, &ring[rxq->curr].md,
+               sizeof(((struct rx_metadata *)0)->data));
+    vring[vrxq->curr].md.status = ring[rxq->curr].md.status;
+
+    MEMORY_BARRIER;
+
+    /* Notify VNET to process if needed */
+    if (!vring[(vrxq->curr + vrxq->nb_desc - 1) % vrxq->nb_desc].md.status) {
+        dev->xnet_wake(dev);
+    }
+    vrxq->curr = (vrxq->curr + 1) % vrxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Refill Rx ring
+ */
+static int
+cmicd_pdma_rx_ring_refill(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    struct pdma_rx_buf *pbuf = NULL;
+    int unused = cmicd_pdma_rx_ring_unused(rxq);
+    dma_addr_t addr;
+    uint32_t halt;
+    int rv;
+
+    for (halt = rxq->halt; halt < rxq->halt + unused; halt++) {
+        pbuf = &rxq->pbuf[halt % rxq->nb_desc];
+        /* Allocate a new pktbuf */
+        if (!bm->rx_buf_avail(dev, rxq, pbuf)) {
+            rv = bm->rx_buf_alloc(dev, rxq, pbuf);
+            if (SHR_FAILURE(rv)) {
+                rxq->halt = halt % rxq->nb_desc;
+                rxq->stats.nomems++;
+                goto fail;
+            }
+        }
+        /* Setup the new descriptor */
+        bm->rx_buf_dma(dev, rxq, pbuf, &addr);
+        cmicd_rx_desc_config(&ring[halt % rxq->nb_desc], addr, rxq->buf_size);
+        if (dev->flags & PDMA_CHAIN_MODE && halt % rxq->nb_desc == rxq->nb_desc - 1) {
+            cmicd_rx_desc_chain(&ring[halt % rxq->nb_desc], 0);
+        }
+    }
+
+    sal_spinlock_lock(rxq->lock);
+    rxq->halt = halt % rxq->nb_desc;
+    if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+        /* Descriptor cherry pick */
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    }
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+
+fail:
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * \brief Clean Rx ring
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] rxq Rx queue structure point.
+ * \param [in] budget Polling budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicd_pdma_rx_ring_clean(struct pdma_hw *hw, struct pdma_rx_queue *rxq, int budget)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    struct pdma_rx_buf *pbuf = NULL;
+    struct pkt_hdr *pkh = NULL;
+    dma_addr_t addr;
+    uint32_t stat, curr;
+    int len, done = 0;
+    int rv;
+
+    curr = rxq->curr;
+    while (CMICD_DESC_STAT_DONE(ring[curr].md.status)) {
+        if (dev->mode == DEV_MODE_VNET && rxq->state & PDMA_RX_QUEUE_XOFF) {
+            break;
+        }
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL) &&
+            !(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+            /* Descriptor cherry pick */
+            rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * curr;
+            hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+            rxq->halt = curr;
+        }
+        if (done == budget) {
+            break;
+        }
+
+        /* Get the current pktbuf to process */
+        pbuf = &rxq->pbuf[curr];
+        stat = ring[curr].md.status;
+        len = CMICD_DESC_STAT_LEN(stat);
+        pkh = bm->rx_buf_get(dev, rxq, pbuf, len);
+        if (!pkh) {
+            rxq->stats.nomems++;
+            goto fail;
+        }
+
+        /* Setup packet header */
+        pkh->data_len = len;
+        pkh->meta_len = pbuf->adj;
+        pkh->queue_id = rxq->queue_id;
+        pkh->attrs = CMICD_DESC_STAT_FLAGS(stat);
+        sal_memcpy(&pbuf->pkb->data, &ring[curr].md, sizeof(struct rx_metadata));
+
+        /* Send up the packet */
+        rv = dev->pkt_recv(dev, rxq->queue_id, (void *)pbuf->skb);
+        if (SHR_FAILURE(rv)) {
+            if (dev->mode == DEV_MODE_HNET && pkh->attrs & PDMA_RX_TO_VNET) {
+                rv = cmicd_pdma_rx_vring_process(hw, rxq, pbuf);
+                if (SHR_FAILURE(rv) && rv == SHR_E_BUSY) {
+                    rxq->state |= PDMA_RX_QUEUE_BUSY;
+                    return done;
+                }
+            } else {
+                rxq->stats.dropped++;
+            }
+            bm->rx_buf_put(dev, rxq, pbuf, len);
+        }
+
+        /* Count the packets/bytes */
+        rxq->stats.packets++;
+        rxq->stats.bytes += len;
+
+        /* Count the errors if any */
+        if (stat & CMICD_DESC_STAT_ERR_MASK) {
+            rxq->stats.errors++;
+            if (stat & CMICD_DESC_STAT_HEAD_ERR) {
+                rxq->stats.head_errors++;
+            }
+            if (stat & CMICD_DESC_STAT_DATA_ERR) {
+                rxq->stats.data_errors++;
+            }
+            if (stat & CMICD_DESC_STAT_CELL_ERR) {
+                rxq->stats.cell_errors++;
+            }
+        }
+
+        /* Setup the new descriptor */
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL)) {
+            if (!bm->rx_buf_avail(dev, rxq, pbuf)) {
+                rv = bm->rx_buf_alloc(dev, rxq, pbuf);
+                if (SHR_FAILURE(rv)) {
+                    rxq->stats.nomems++;
+                    goto fail;
+                }
+            }
+            bm->rx_buf_dma(dev, rxq, pbuf, &addr);
+            cmicd_rx_desc_config(&ring[curr], addr, rxq->buf_size);
+            if (dev->flags & PDMA_CHAIN_MODE && curr == rxq->nb_desc - 1) {
+                cmicd_rx_desc_chain(&ring[curr], 0);
+            }
+        } else {
+            cmicd_rx_desc_config(&ring[curr], 0, 0);
+        }
+
+        /* Notify HNET to process if needed */
+        if (dev->mode == DEV_MODE_VNET) {
+            MEMORY_BARRIER;
+            if (ring[(curr + rxq->nb_desc - 1) % rxq->nb_desc].md.status) {
+                dev->xnet_wake(dev);
+            }
+        }
+
+        /* Update the indicators */
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL) && rxq->halt != curr) {
+            sal_spinlock_lock(rxq->lock);
+            if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+                /* Descriptor cherry pick */
+                rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * curr;
+                hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+                rxq->halt = curr;
+            }
+            curr = (curr + 1) % rxq->nb_desc;
+            sal_spinlock_unlock(rxq->lock);
+        } else {
+            curr = (curr + 1) % rxq->nb_desc;
+        }
+        rxq->curr = curr;
+        done++;
+
+        /* Restart DMA if in chain mode */
+        if (dev->flags & PDMA_CHAIN_MODE) {
+            if (curr == 0 && !(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+                hw->hdls.chan_stop(hw, rxq->chan_id);
+                hw->hdls.chan_start(hw, rxq->chan_id);
+            }
+        }
+    }
+
+    /* One more poll for chain done in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        if (curr == rxq->nb_desc - 1 && done) {
+            done = budget;
+        }
+    }
+
+    /* In batching mode, replenish all the unused descriptors */
+    if (rxq->state & PDMA_RX_BATCH_REFILL &&
+        cmicd_pdma_rx_ring_unused(rxq) >= (int)rxq->free_thresh) {
+        cmicd_pdma_rx_ring_refill(hw, rxq);
+    }
+
+    /* Notify the other side to process */
+    if (dev->mode == DEV_MODE_VNET || dev->mode == DEV_MODE_HNET) {
+        if (done) {
+            dev->xnet_wake(dev);
+        }
+    }
+
+    return done;
+
+fail:
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return done;
+}
+
+/*!
+ * Process Tx vring
+ */
+static int
+cmicd_pdma_tx_vring_process(struct pdma_hw *hw, struct pdma_tx_queue *txq,
+                            struct pdma_tx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    struct pdma_tx_queue *vtxq = NULL;
+    struct cmicd_tx_desc *vring = NULL;
+
+    vtxq = (struct pdma_tx_queue *)dev->ctrl.vnet_txq[txq->queue_id];
+    vring = (struct cmicd_tx_desc *)vtxq->ring;
+    if (!vring) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Update vring descriptor */
+    vring[vtxq->dirt].md.status = ring[txq->dirt].md.status;
+    pbuf->dma = 0;
+
+    MEMORY_BARRIER;
+
+    /* Notify VNET to process if needed */
+    if (!vring[(vtxq->dirt + vtxq->nb_desc - 1) % vtxq->nb_desc].md.status) {
+        dev->xnet_wake(dev);
+    }
+    vtxq->dirt = (vtxq->dirt + 1) % vtxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Clean Tx ring
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] txq Tx queue structure point.
+ * \param [in] budget Polling budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicd_pdma_tx_ring_clean(struct pdma_hw *hw, struct pdma_tx_queue *txq, int budget)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    uint32_t dirt, curr;
+    int done = 0;
+
+    dirt = txq->dirt;
+    while (txq->pbuf[dirt].dma) {
+        if (!CMICD_DESC_STAT_DONE(ring[dirt].md.status)) {
+            break;
+        }
+        if (done == budget) {
+            break;
+        }
+
+        if (dev->mode == DEV_MODE_HNET && !txq->pbuf[dirt].skb) {
+            cmicd_pdma_tx_vring_process(hw, txq, &txq->pbuf[dirt]);
+        } else {
+            /* Free the done pktbuf */
+            bm->tx_buf_free(dev, txq, &txq->pbuf[dirt]);
+        }
+
+        cmicd_tx_desc_config(&ring[dirt], 0, 0, 0);
+
+        /* Update the indicators */
+        dirt = (dirt + 1) % txq->nb_desc;
+        txq->dirt = dirt;
+        done++;
+
+        /* Restart DMA if in chain mode */
+        if (dev->flags & PDMA_CHAIN_MODE) {
+            sal_spinlock_lock(txq->lock);
+            curr = txq->curr;
+            if (dirt == txq->halt && dirt != curr) {
+                hw->hdls.chan_stop(hw, txq->chan_id);
+                cmicd_tx_desc_chain(&ring[(curr + txq->nb_desc - 1) % txq->nb_desc], 0);
+                hw->hdls.chan_setup(hw, txq->chan_id,
+                                    txq->ring_addr + sizeof(struct cmicd_tx_desc) * txq->halt);
+                hw->hdls.chan_start(hw, txq->chan_id);
+                txq->halt = curr;
+            }
+            sal_spinlock_unlock(txq->lock);
+        }
+    }
+
+    /* One more poll for chain done in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        sal_spinlock_lock(txq->lock);
+        if (dirt != txq->halt) {
+            done = budget;
+        }
+        sal_spinlock_unlock(txq->lock);
+    }
+
+    /* Resume Tx if any */
+    sal_spinlock_lock(txq->lock);
+    if (cmicd_pdma_tx_ring_unused(txq) && txq->state & PDMA_TX_QUEUE_XOFF) {
+        txq->state &= ~PDMA_TX_QUEUE_XOFF;
+        sal_spinlock_unlock(txq->lock);
+        if (dev->tx_resume) {
+            dev->tx_resume(dev, txq->queue_id);
+        } else if (!(txq->state & PDMA_TX_QUEUE_POLL)) {
+            sal_sem_give(txq->sem);
+        }
+        return done;
+    }
+    sal_spinlock_unlock(txq->lock);
+
+    return done;
+}
+
+/*!
+ * Dump Rx ring
+ */
+static int
+cmicd_pdma_rx_ring_dump(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct cmicd_rx_desc *ring = (struct cmicd_rx_desc *)rxq->ring;
+    struct cmicd_rx_desc *rd;
+    uint32_t di;
+
+    CNET_PR("\nRX: queue=%d, chan=%d, curr=%d, halt=%d, halt@%p\n",
+            rxq->queue_id, rxq->chan_id, rxq->curr, rxq->halt, (void *)&ring[rxq->halt]);
+    CNET_PR("----------------------------------------------------------------\n");
+    for (di = 0; di < rxq->nb_desc + 1; di++) {
+        rd = &ring[di];
+        CNET_PR("DESC[%03d]: (%p)->%08x %08x ... %08x\n",
+                di, (void *)(unsigned long)(rxq->ring_addr + di * CMICD_PDMA_DCB_SIZE),
+                rd->addr, rd->ctrl, rd->md.status);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dump Tx ring
+ */
+static int
+cmicd_pdma_tx_ring_dump(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    struct cmicd_tx_desc *td;
+    uint32_t di;
+
+    CNET_PR("\nTX: queue=%d, chan=%d, curr=%d, dirt=%d, halt@%p\n",
+            txq->queue_id, txq->chan_id, txq->curr, txq->dirt, (void *)&ring[txq->curr]);
+    CNET_PR("----------------------------------------------------------------\n");
+    for (di = 0; di < txq->nb_desc + 1; di++) {
+        td = &ring[di];
+        CNET_PR("DESC[%03d]: (%p)->%08x %08x ... %08x\n",
+                di, (void *)(unsigned long)(txq->ring_addr + di * CMICD_PDMA_DCB_SIZE),
+                td->addr, td->ctrl, td->md.status);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Fetch Tx vring
+ */
+static int
+cmicd_pdma_tx_vring_fetch(struct pdma_hw *hw, struct pdma_tx_queue *txq,
+                          struct pdma_tx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    struct pdma_tx_queue *vtxq = NULL;
+    struct cmicd_tx_desc *vring = NULL;
+
+    vtxq = (struct pdma_tx_queue *)dev->ctrl.vnet_txq[txq->queue_id];
+    vring = (struct cmicd_tx_desc *)vtxq->ring;
+    if (!vring || !CMICD_DESC_CTRL_LEN(vring[vtxq->curr].ctrl)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Fetch vring descriptor */
+    sal_memcpy(&ring[txq->curr], &vring[vtxq->curr], sizeof(struct cmicd_tx_desc));
+    vring[vtxq->curr].ctrl &= ~CMICD_DESC_CTRL_LEN(-1);
+
+    MEMORY_BARRIER;
+
+    pbuf->dma = vring[vtxq->curr].addr;
+    pbuf->len = CMICD_DESC_CTRL_LEN(ring[txq->curr].ctrl);
+    vtxq->curr = (vtxq->curr + 1) % vtxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Check Tx ring
+ */
+static inline int
+cmicd_pdma_tx_ring_check(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    if (cmicd_pdma_tx_ring_unused(txq)) {
+        return SHR_E_NONE;
+    }
+
+    sal_spinlock_lock(txq->lock);
+    if (!cmicd_pdma_tx_ring_unused(txq)) {
+        txq->state |= PDMA_TX_QUEUE_XOFF;
+        txq->stats.xoffs++;
+        sal_spinlock_unlock(txq->lock);
+        if (hw->dev->tx_suspend) {
+            hw->dev->tx_suspend(hw->dev, txq->queue_id);
+        }
+        return SHR_E_BUSY;
+    }
+    sal_spinlock_unlock(txq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Start packet transmission
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] txq Tx queue structure point.
+ * \param [in] buf Tx packet buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicd_pdma_pkt_xmit(struct pdma_hw *hw, struct pdma_tx_queue *txq, void *buf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicd_tx_desc *ring = (struct cmicd_tx_desc *)txq->ring;
+    struct pdma_tx_buf *pbuf = NULL;
+    struct pkt_hdr *pkh = NULL;
+    dma_addr_t addr;
+    uint32_t curr, flags = 0;
+    int retry = 5000000;
+    int rv;
+
+    if (!(txq->state & PDMA_TX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (dev->tx_suspend) {
+        sal_spinlock_lock(txq->mutex);
+    } else {
+        sal_sem_take(txq->sem, SAL_SEM_FOREVER);
+    }
+
+    /* Check Tx resource */
+    if (dev->tx_suspend) {
+        /* Suspend Tx if no resource */
+        rv = cmicd_pdma_tx_ring_check(hw, txq);
+        if (SHR_FAILURE(rv)) {
+            sal_spinlock_unlock(txq->mutex);
+            return rv;
+        }
+    } else {
+        /* Abort Tx if a fatal error happened */
+        if (txq->state & PDMA_TX_QUEUE_XOFF) {
+            sal_sem_give(txq->sem);
+            return SHR_E_RESOURCE;
+        }
+    }
+
+    /* Setup the new descriptor */
+    curr = txq->curr;
+    pbuf = &txq->pbuf[curr];
+    if (dev->mode == DEV_MODE_HNET && !buf) {
+        rv = cmicd_pdma_tx_vring_fetch(hw, txq, pbuf);
+        if (SHR_FAILURE(rv)) {
+            sal_spinlock_unlock(txq->mutex);
+            return SHR_E_EMPTY;
+        }
+    } else {
+        pbuf->adj = 0;
+        pkh = bm->tx_buf_get(dev, txq, pbuf, buf);
+        if (!pkh) {
+            txq->stats.dropped++;
+            if (dev->tx_suspend) {
+                sal_spinlock_unlock(txq->mutex);
+            } else {
+                sal_sem_give(txq->sem);
+            }
+            return SHR_E_NONE;
+        }
+        bm->tx_buf_dma(dev, txq, pbuf, &addr);
+        flags |= pkh->attrs & PDMA_TX_HIGIG_PKT ? CMICD_DESC_TX_HIGIG_PKT : 0;
+        flags |= pkh->attrs & PDMA_TX_PAUSE_PKT ? CMICD_DESC_TX_PAUSE_PKT : 0;
+        flags |= pkh->attrs & PDMA_TX_PURGE_PKT ? CMICD_DESC_TX_PURGE_PKT : 0;
+        cmicd_tx_desc_config(&ring[curr], addr, pbuf->len, flags);
+        if (pkh->meta_len) {
+            sal_memcpy(&ring[curr].md, &pbuf->pkb->data, sizeof(ring->md.data));
+        }
+    }
+
+    /* Notify HNET to process if needed */
+    if (dev->mode == DEV_MODE_VNET) {
+        MEMORY_BARRIER;
+        if (!CMICD_DESC_CTRL_LEN(ring[(curr + txq->nb_desc - 1) % txq->nb_desc].ctrl)) {
+            dev->xnet_wake(dev);
+        }
+    }
+
+    /* Update the indicators */
+    curr = (curr + 1) % txq->nb_desc;
+    txq->curr = curr;
+
+    /* Start DMA if in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        if (txq->state & PDMA_TX_QUEUE_POLL) {
+            do {
+                rv = cmicd_pdma_tx_ring_clean(hw, txq, txq->nb_desc - 1);
+                if (rv != (int)txq->nb_desc - 1) {
+                    break;
+                }
+                sal_usleep(1);
+            } while (retry--);
+            if (retry <= 0) {
+                CNET_PR("Last Tx could not be done in given time\n");
+            }
+        }
+        sal_spinlock_lock(txq->lock);
+        if (txq->dirt == txq->halt && txq->dirt != curr) {
+            hw->hdls.chan_stop(hw, txq->chan_id);
+            cmicd_tx_desc_chain(&ring[(curr + txq->nb_desc - 1) % txq->nb_desc], 0);
+            hw->hdls.chan_setup(hw, txq->chan_id,
+                                txq->ring_addr + sizeof(struct cmicd_tx_desc) * txq->halt);
+            hw->hdls.chan_start(hw, txq->chan_id);
+            txq->halt = curr;
+        }
+        sal_spinlock_unlock(txq->lock);
+    }
+
+    /* Kick off DMA */
+    txq->halt_addr = txq->ring_addr + sizeof(struct cmicd_tx_desc) * curr;
+    hw->hdls.chan_goto(hw, txq->chan_id, txq->halt_addr);
+
+    /* Count the packets/bytes */
+    txq->stats.packets++;
+    txq->stats.bytes += pbuf->len;
+
+    /* Clean up ring if in polling mode */
+    if (txq->state & PDMA_TX_QUEUE_POLL &&
+        cmicd_pdma_tx_ring_unused(txq) <= (int)txq->free_thresh) {
+        cmicd_pdma_tx_ring_clean(hw, txq, txq->nb_desc - txq->free_thresh);
+    }
+
+    /* Suspend Tx if no resource */
+    rv = cmicd_pdma_tx_ring_check(hw, txq);
+    if (SHR_FAILURE(rv)) {
+        if (dev->mode == DEV_MODE_VNET) {
+            dev->xnet_wake(dev);
+        }
+
+        if (txq->state & PDMA_TX_QUEUE_POLL) {
+            /* In polling mode, must wait till the ring is available */
+            do {
+                cmicd_pdma_tx_ring_clean(hw, txq, txq->free_thresh);
+                if (!(txq->state & PDMA_TX_QUEUE_XOFF)) {
+                    break;
+                }
+                sal_usleep(1);
+            } while (retry--);
+            if (retry <= 0) {
+                CNET_PR("Fatal error: Tx ring is full, packets have not been transmitted for 5 seconds\n");
+                if (!dev->tx_suspend) {
+                    sal_sem_give(txq->sem);
+                    return SHR_E_RESOURCE;
+                }
+            }
+        } else {
+            /* In interrupt mode, the handle thread will wake up Tx */
+            if (!dev->tx_suspend) {
+                return SHR_E_NONE;
+            }
+        }
+    }
+
+    if (dev->tx_suspend) {
+        sal_spinlock_unlock(txq->mutex);
+    } else {
+        sal_sem_give(txq->sem);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend Rx queue
+ */
+static int
+cmicd_pdma_rx_suspend(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    sal_spinlock_lock(rxq->lock);
+    rxq->state |= PDMA_RX_QUEUE_XOFF;
+    if (hw->dev->flags & PDMA_CHAIN_MODE) {
+        hw->hdls.chan_stop(hw, rxq->chan_id);
+    }
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Resume Rx queue
+ */
+static int
+cmicd_pdma_rx_resume(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    sal_spinlock_lock(rxq->lock);
+    if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+        sal_spinlock_unlock(rxq->lock);
+        return SHR_E_NONE;
+    }
+    if (rxq->state & PDMA_RX_BATCH_REFILL) {
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    } else if (rxq->halt == rxq->curr || (rxq->halt == rxq->nb_desc && rxq->curr == 0)) {
+        rxq->halt = (rxq->curr + 1) % rxq->nb_desc;
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicd_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    }
+    if (hw->dev->flags & PDMA_CHAIN_MODE) {
+        rxq->curr = 0;
+        hw->hdls.chan_start(hw, rxq->chan_id);
+    }
+    rxq->state &= ~PDMA_RX_QUEUE_XOFF;
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize function pointers
+ */
+int
+bcmcnet_cmicd_pdma_desc_ops_init(struct pdma_hw *hw)
+{
+    if (!hw) {
+        return SHR_E_PARAM;
+    }
+
+    hw->dops.rx_desc_init = cmicd_pdma_rx_desc_init;
+    hw->dops.rx_desc_clean = cmicd_pdma_rx_desc_clean;
+    hw->dops.rx_ring_clean = cmicd_pdma_rx_ring_clean;
+    hw->dops.rx_ring_dump = cmicd_pdma_rx_ring_dump;
+    hw->dops.rx_suspend = cmicd_pdma_rx_suspend;
+    hw->dops.rx_resume = cmicd_pdma_rx_resume;
+    hw->dops.tx_desc_init = cmicd_pdma_tx_desc_init;
+    hw->dops.tx_desc_clean = cmicd_pdma_tx_desc_clean;
+    hw->dops.tx_ring_clean = cmicd_pdma_tx_ring_clean;
+    hw->dops.tx_ring_dump = cmicd_pdma_tx_ring_dump;
+    hw->dops.pkt_xmit = cmicd_pdma_pkt_xmit;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Attach device driver
+ */
+int
+bcmcnet_cmicd_pdma_driver_attach(struct pdma_dev *dev)
+{
+    struct pdma_hw *hw = NULL;
+
+    /* Allocate memory for HW data */
+    hw = sal_alloc(sizeof(*hw), "bcmcnetPdmaHw");
+    if (!hw) {
+        return SHR_E_MEMORY;
+    }
+    sal_memset(hw, 0, sizeof(*hw));
+    hw->unit = dev->unit;
+    hw->dev = dev;
+    dev->ctrl.hw = hw;
+
+    bcmcnet_cmicd_pdma_hw_hdls_init(hw);
+    bcmcnet_cmicd_pdma_desc_ops_init(hw);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Detach device driver
+ */
+int
+bcmcnet_cmicd_pdma_driver_detach(struct pdma_dev *dev)
+{
+    if (dev->ctrl.hw) {
+        sal_free(dev->ctrl.hw);
+    }
+    dev->ctrl.hw = NULL;
+
+    return SHR_E_NONE;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_hw.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_hw.c
new file mode 100644
index 000000000000..6dc77c4b7c04
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_hw.c
@@ -0,0 +1,604 @@
+/*! \file bcmcnet_cmicx_pdma_hw.c
+ *
+ * Utility routines for handling BCMCNET hardware (CMICx).
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+/*!
+ * Read 32-bit register
+ */
+static inline void
+cmicx_pdma_reg_read32(struct pdma_hw *hw, uint32_t addr, uint32_t *data)
+{
+    if (hw->dev->dev_read32) {
+        hw->dev->dev_read32(hw->dev, addr, data);
+    } else {
+        DEV_READ32(&hw->dev->ctrl, addr, data);
+    }
+}
+
+/*!
+ * Write 32-bit register
+ */
+static inline void
+cmicx_pdma_reg_write32(struct pdma_hw *hw, uint32_t addr, uint32_t data)
+{
+    if (hw->dev->dev_write32) {
+        hw->dev->dev_write32(hw->dev, addr, data);
+    } else {
+        DEV_WRITE32(&hw->dev->ctrl, addr, data);
+    }
+}
+
+/*!
+ * Enable interrupt for a channel
+ */
+static inline void
+cmicx_pdma_intr_enable(struct pdma_hw *hw, int cmc, int chan, uint32_t mask)
+{
+    uint32_t reg, irq_mask;
+
+    hw->dev->ctrl.grp[cmc].irq_mask |= mask;
+    irq_mask = hw->dev->ctrl.grp[cmc].irq_mask;
+    if (cmc == 0) {
+        reg = CMICX_PDMA_IRQ_RAW_STAT0;
+    } else {
+        if (chan < 4) {
+            reg = CMICX_PDMA_IRQ_RAW_STAT1;
+            hw->dev->ctrl.grp[cmc].irq_mask <<= CMICX_IRQ_MASK_SHIFT;
+        } else {
+            reg = CMICX_PDMA_IRQ_RAW_STAT2;
+            hw->dev->ctrl.grp[cmc].irq_mask >>= 32 - CMICX_IRQ_MASK_SHIFT;
+        }
+    }
+
+    hw->dev->intr_unmask(hw->dev, cmc, chan, reg & 0xfff, 0);
+    hw->dev->ctrl.grp[cmc].irq_mask = irq_mask;
+}
+
+/*!
+ * Disable interrupt for a channel
+ */
+static inline void
+cmicx_pdma_intr_disable(struct pdma_hw *hw, int cmc, int chan, uint32_t mask)
+{
+    uint32_t reg, irq_mask;
+
+    hw->dev->ctrl.grp[cmc].irq_mask &= ~mask;
+    irq_mask = hw->dev->ctrl.grp[cmc].irq_mask;
+    if (cmc == 0) {
+        reg = CMICX_PDMA_IRQ_RAW_STAT0;
+    } else {
+        if (chan < 4) {
+            reg = CMICX_PDMA_IRQ_RAW_STAT1;
+            hw->dev->ctrl.grp[cmc].irq_mask <<= CMICX_IRQ_MASK_SHIFT;
+        } else {
+            reg = CMICX_PDMA_IRQ_RAW_STAT2;
+            hw->dev->ctrl.grp[cmc].irq_mask >>= 32 - CMICX_IRQ_MASK_SHIFT;
+        }
+    }
+
+    hw->dev->intr_mask(hw->dev, cmc, chan, reg & 0xfff, 0);
+    hw->dev->ctrl.grp[cmc].irq_mask = irq_mask;
+}
+
+/*!
+ * Release Packet DMA credits to EP.
+ */
+static int
+cmicx_pdma_credits_release(struct pdma_hw *hw)
+{
+    int credits;
+    uint32_t val;
+
+    /*
+     * Since only 6 bits of iproc_cmic_to_ep_credits[5:0] are being used,
+     * so we have to set the max credits value twice in order to release
+     * 64 credits to EP.
+     * Only do this once when HW is initialized.
+     */
+    hw->hdls.reg_rd32(hw, CMICX_EPINTF_RELEASE_CREDITS, &val);
+    if (!val) {
+        credits = 63;
+        hw->hdls.reg_wr32(hw, CMICX_EPINTF_MAX_CREDITS, (0x1 << 8) | credits);
+        hw->hdls.reg_wr32(hw, CMICX_EPINTF_RELEASE_CREDITS, 1);
+
+        hw->hdls.reg_wr32(hw, CMICX_EPINTF_RELEASE_CREDITS, 0);
+        credits = 1;
+        hw->hdls.reg_wr32(hw, CMICX_EPINTF_MAX_CREDITS, (0x1 << 8) | credits);
+        hw->hdls.reg_wr32(hw, CMICX_EPINTF_RELEASE_CREDITS, 1);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize HW
+ */
+static int
+cmicx_pdma_hw_init(struct pdma_hw *hw)
+{
+    dev_mode_t mode = DEV_MODE_MAX;
+    uint32_t val;
+
+    /* Temporarily upgrade work mode to get HW information in VNET mode. */
+    if (hw->dev->mode == DEV_MODE_VNET) {
+        mode = DEV_MODE_VNET;
+        hw->dev->mode = DEV_MODE_UNET;
+    }
+
+    /* Release Packet DMA credits to EP. */
+    cmicx_pdma_credits_release(hw);
+
+    hw->info.name = CMICX_DEV_NAME;
+    hw->info.dev_id = hw->dev->dev_id;
+    hw->info.num_cmcs = CMICX_PDMA_CMC_MAX;
+    hw->info.cmc_chans = CMICX_PDMA_CMC_CHAN;
+    hw->info.num_chans = CMICX_PDMA_CMC_MAX * CMICX_PDMA_CMC_CHAN;
+    hw->info.rx_dcb_size = CMICX_PDMA_DCB_SIZE;
+    hw->info.tx_dcb_size = CMICX_PDMA_DCB_SIZE;
+    hw->hdls.reg_rd32(hw, CMICX_EP_TO_CPU_HEADER_SIZE, &val);
+    hw->info.rx_ph_size = (val & 0xf) * 8;
+    hw->info.tx_ph_size = CMICX_TX_PKT_HDR_SIZE;
+
+    /* Restore work mode to VNET. */
+    if (mode == DEV_MODE_VNET) {
+        hw->dev->mode = DEV_MODE_VNET;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Configure HW
+ */
+static int
+cmicx_pdma_hw_config(struct pdma_hw *hw)
+{
+    struct dev_ctrl *ctrl = &hw->dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    uint32_t val, que_ctrl;
+    int grp, que;
+    uint32_t qi;
+    int ip_if_hdr_endian = 0;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[qi];
+        grp = rxq->group_id;
+        que = rxq->chan_id % CMICX_PDMA_CMC_CHAN;
+        que_ctrl = ctrl->grp[grp].que_ctrl[que];
+
+        hw->hdls.reg_wr32(hw, CMICX_PDMA_IRQ_STAT_CLR(grp), CMICX_PDMA_IRQ_MASK(que));
+        val = 0;
+        if (que_ctrl & PDMA_PKT_BYTE_SWAP) {
+            val |= CMICX_PDMA_PKT_BIG_ENDIAN;
+        }
+        if (que_ctrl & PDMA_OTH_BYTE_SWAP) {
+            val |= CMICX_PDMA_DESC_BIG_ENDIAN;
+        }
+        if (que_ctrl & PDMA_HDR_BYTE_SWAP) {
+            val |= CMICX_PDMA_HDR_BIG_ENDIAN;
+        }
+        if (!(hw->dev->flags & PDMA_CHAIN_MODE)) {
+            val |= CMICX_PDMA_CONTINUOUS;
+        }
+        if (hw->dev->flags & PDMA_DESC_PREFETCH) {
+            val |= CMICX_PDMA_CONTINUOUS_DESC;
+        }
+        val |= CMICX_PDMA_INTR_ON_DESC;
+        hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(grp, que), val);
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[qi];
+        grp = txq->group_id;
+        que = txq->chan_id % CMICX_PDMA_CMC_CHAN;
+        que_ctrl = ctrl->grp[grp].que_ctrl[que];
+
+        hw->hdls.reg_wr32(hw, CMICX_PDMA_IRQ_STAT_CLR(grp), CMICX_PDMA_IRQ_MASK(que));
+        val = 0;
+        if (que_ctrl & PDMA_PKT_BYTE_SWAP) {
+            val |= CMICX_PDMA_PKT_BIG_ENDIAN;
+            val |= CMICX_PDMA_HDR_BIG_ENDIAN;
+            ip_if_hdr_endian = 1;
+        }
+        if (que_ctrl & PDMA_OTH_BYTE_SWAP) {
+            val |= CMICX_PDMA_DESC_BIG_ENDIAN;
+        }
+        if (que_ctrl & PDMA_HDR_BYTE_SWAP) {
+            ip_if_hdr_endian = 1;
+        }
+        if (!(hw->dev->flags & PDMA_CHAIN_MODE)) {
+            val |= CMICX_PDMA_CONTINUOUS;
+        }
+        if (hw->dev->flags & PDMA_DESC_PREFETCH) {
+            val |= CMICX_PDMA_CONTINUOUS_DESC;
+        }
+        val |= CMICX_PDMA_INTR_ON_DESC | CMICX_PDMA_DIR;
+        hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(grp, que), val);
+    }
+
+    if (ip_if_hdr_endian == 1) {
+        hw->hdls.reg_rd32(hw, CMICX_TOP_CONFIG, &val);
+        val |= 0x80;
+        hw->hdls.reg_wr32(hw, CMICX_TOP_CONFIG, val);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Reset HW
+ */
+static int
+cmicx_pdma_hw_reset(struct pdma_hw *hw)
+{
+    int gi, qi;
+
+    for (gi = 0; gi < hw->dev->num_groups; gi++) {
+        if (!hw->dev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < CMICX_PDMA_CMC_CHAN; qi++) {
+            if (1 << qi & hw->dev->ctrl.grp[gi].bm_rxq ||
+                1 << qi & hw->dev->ctrl.grp[gi].bm_txq) {
+                hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(gi, qi), 0);
+            }
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Start a channel
+ */
+static int
+cmicx_pdma_chan_start(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CTRL(grp, que), &val);
+    val |= CMICX_PDMA_ENABLE;
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(grp, que), val);
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Stop a channel
+ */
+static int
+cmicx_pdma_chan_stop(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+    int retry = CMICX_HW_RETRY_TIMES;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CTRL(grp, que), &val);
+    val |= CMICX_PDMA_ENABLE | CMICX_PDMA_ABORT;
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(grp, que), val);
+
+    MEMORY_BARRIER;
+
+    do {
+        val = ~CMICX_PDMA_IS_ACTIVE;
+        hw->hdls.reg_rd32(hw, CMICX_PDMA_STAT(grp, que), &val);
+    } while ((val & CMICX_PDMA_IS_ACTIVE) && (--retry > 0));
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CTRL(grp, que), &val);
+    val &= ~(CMICX_PDMA_ENABLE | CMICX_PDMA_ABORT);
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_CTRL(grp, que), val);
+
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_IRQ_STAT_CLR(grp), CMICX_PDMA_IRQ_MASK(que));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Setup a channel
+ */
+static int
+cmicx_pdma_chan_setup(struct pdma_hw *hw, int chan, uint64_t addr)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_DESC_LO(grp, que), addr);
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_DESC_HI(grp, que), DMA_TO_BUS_HI(addr >> 32));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Set halt point for a channel
+ */
+static int
+cmicx_pdma_chan_goto(struct pdma_hw *hw, int chan, uint64_t addr)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_DESC_HALT_LO(grp, que), addr);
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_DESC_HALT_HI(grp, que), DMA_TO_BUS_HI(addr >> 32));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Clear a channel
+ */
+static int
+cmicx_pdma_chan_clear(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_IRQ_STAT_CLR(grp), CMICX_PDMA_IRQ_CTRLD_INTR(que));
+
+    MEMORY_BARRIER;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get interrupt number for a channel
+ */
+static int
+cmicx_pdma_chan_intr_num_get(struct pdma_hw *hw, int chan)
+{
+    int grp, que, start_num, mask_shift;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    mask_shift = 0;
+    if (grp > 0) {
+        mask_shift = CMICX_IRQ_MASK_SHIFT + grp * 32;
+    }
+    start_num = CMICX_IRQ_START_NUM + mask_shift;
+
+    return start_num + (que * CMICX_IRQ_NUM_OFFSET);
+}
+
+/*!
+ * Enable interrupt for a channel
+ */
+static int
+cmicx_pdma_chan_intr_enable(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    cmicx_pdma_intr_enable(hw, grp, que, CMICX_PDMA_IRQ_CTRLD_INTR(que));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Disable interrupt for a channel
+ */
+static int
+cmicx_pdma_chan_intr_disable(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    cmicx_pdma_intr_disable(hw, grp, que, CMICX_PDMA_IRQ_CTRLD_INTR(que));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Query interrupt status for a channel
+ *
+ * In group mode (interrupt processing per CMC), need to query each channel's
+ * interrupt status.
+ *
+ */
+static int
+cmicx_pdma_chan_intr_query(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_IRQ_STAT(grp), &val);
+
+    return val & CMICX_PDMA_IRQ_CTRLD_INTR(que);
+}
+
+/*!
+ * Check interrupt validity for a channel
+ *
+ * In group mode (interrupt processing per CMC), need to check each channel's
+ * interrupt validity based on its interrupt mask.
+ *
+ */
+static int
+cmicx_pdma_chan_intr_check(struct pdma_hw *hw, int chan)
+{
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    if (!(hw->dev->ctrl.grp[grp].irq_mask & CMICX_PDMA_IRQ_CTRLD_INTR(que))) {
+        return 0;
+    }
+
+    return cmicx_pdma_chan_intr_query(hw, chan);
+}
+
+/*!
+ * Coalesce interrupt for a channel
+ */
+static int
+cmicx_pdma_chan_intr_coalesce(struct pdma_hw *hw, int chan, int count, int timer)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    val = CMICX_PDMA_INTR_COAL_ENA |
+          CMICX_PDMA_INTR_THRESH(count) |
+          CMICX_PDMA_INTR_TIMER(timer);
+    hw->hdls.reg_wr32(hw, CMICX_PDMA_INTR_COAL(grp, que), val);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dump registers for a channel
+ */
+static int
+cmicx_pdma_chan_reg_dump(struct pdma_hw *hw, int chan)
+{
+    uint32_t val;
+    int grp, que;
+
+    grp = chan / CMICX_PDMA_CMC_CHAN;
+    que = chan % CMICX_PDMA_CMC_CHAN;
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CTRL(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_CTRL: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_DESC_LO(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_DESC_LO: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_DESC_HI(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_DESC_HI: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CURR_DESC_LO(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_CURR_DESC_LO: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_CURR_DESC_HI(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_CURR_DESC_HI: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_DESC_HALT_LO(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_DESC_HALT_ADDR_LO: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_DESC_HALT_HI(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_DESC_HALT_ADDR_HI: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_COS_CTRL_RX0(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_COS_CTRL_RX_0: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_COS_CTRL_RX1(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_COS_CTRL_RX_1: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_INTR_COAL(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_INTR_COAL: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_RBUF_THRE(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_RXBUF_THRESHOLD_CONFIG: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_STAT(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_STAT: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_COUNT_RX(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_PKT_COUNT_RXPKT: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_COUNT_TX(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_PKT_COUNT_TXPKT: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_COUNT_RX_DROP(grp, que), &val);
+    CNET_PR("CMIC_CMC%d_DMA_CH%d_PKT_COUNT_RXPKT_DROP: 0x%08x\n", grp, que, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_IRQ_STAT(grp), &val);
+    CNET_PR("CMIC_CMC%d_IRQ_STAT: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_PDMA_IRQ_STAT_CLR(grp), &val);
+    CNET_PR("CMIC_CMC%d_IRQ_STAT_CLR: 0x%08x\n", grp, val);
+
+    val = hw->dev->ctrl.grp[grp].irq_mask;
+    CNET_PR("CMIC_CMC%d_IRQ_ENAB: 0x%08x\n", grp, val);
+
+    hw->hdls.reg_rd32(hw, CMICX_EP_TO_CPU_HEADER_SIZE, &val);
+    CNET_PR("CMIC_EP_TO_CPU_HEADER_SIZE: 0x%08x\n", val);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize function pointers
+ */
+int
+bcmcnet_cmicx_pdma_hw_hdls_init(struct pdma_hw *hw)
+{
+    if (!hw) {
+        return SHR_E_PARAM;
+    }
+
+    hw->hdls.reg_rd32 = cmicx_pdma_reg_read32;
+    hw->hdls.reg_wr32 = cmicx_pdma_reg_write32;
+    hw->hdls.hw_init = cmicx_pdma_hw_init;
+    hw->hdls.hw_config = cmicx_pdma_hw_config;
+    hw->hdls.hw_reset = cmicx_pdma_hw_reset;
+    hw->hdls.chan_start = cmicx_pdma_chan_start;
+    hw->hdls.chan_stop = cmicx_pdma_chan_stop;
+    hw->hdls.chan_setup = cmicx_pdma_chan_setup;
+    hw->hdls.chan_goto = cmicx_pdma_chan_goto;
+    hw->hdls.chan_clear = cmicx_pdma_chan_clear;
+    hw->hdls.chan_intr_num_get = cmicx_pdma_chan_intr_num_get;
+    hw->hdls.chan_intr_enable = cmicx_pdma_chan_intr_enable;
+    hw->hdls.chan_intr_disable = cmicx_pdma_chan_intr_disable;
+    hw->hdls.chan_intr_query = cmicx_pdma_chan_intr_query;
+    hw->hdls.chan_intr_check = cmicx_pdma_chan_intr_check;
+    hw->hdls.chan_intr_coalesce = cmicx_pdma_chan_intr_coalesce;
+    hw->hdls.chan_reg_dump = cmicx_pdma_chan_reg_dump;
+
+    return SHR_E_NONE;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_rxtx.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_rxtx.c
new file mode 100644
index 000000000000..651728465d56
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicx/bcmcnet_cmicx_pdma_rxtx.c
@@ -0,0 +1,1094 @@
+/*! \file bcmcnet_cmicx_pdma_rxtx.c
+ *
+ * Utility routines for BCMCNET hardware (CMICx) specific Rx/Tx.
+ *
+ * Here are the CMIC specific Rx/Tx routines including DCBs resource allocation
+ * and clean up, DCBs configuration, Rx buffers allocation, Tx buffers release,
+ * Rx/Tx packets processing, etc.
+ * They are shared among all the modes (UNET, KNET, VNET, HNET) and in both of
+ * user space and kernel space.
+ *
+ * The driver uses a ring of DCBs per DMA channel based on Continuous DMA mode.
+ * The beginning is written to register pointing to the physical address of the
+ * start of the ring. The ring size is maintained by the driver. A HALT DCB
+ * physical address is written to DMA register timely to indicate how many DCBs
+ * can be handled by HW.
+ *
+ * When a packet is received, an interrupt is triggered. The handler will go
+ * through the Rx DCB ring to process the current completed DCB and every
+ * subsequent DCBs until no one is left. The received packet is processed and
+ * passed up to the high level SW. After that, a new buffer is allocated and
+ * the DCB is updated for receiving a new packet. A new HALT DCB is selected
+ * and its physical address is written to DMA register.
+ *
+ * When a packet is transmitted, the driver starts where it left off last time
+ * in the Tx DCB ring, updates the DCB and writes its physical address to DMA
+ * register so as to start DMA. Once the transmitting is finished, the handler
+ * is informed to clean up the buffer based on the work mode. In KNET or HNET
+ * mode, an interrupt will be triggered. Polling mode is used in CNET or VNET
+ * mode, the buffers will be cleaned up when the number of dirty DCBs reaches
+ * a pre-defined threshold.
+ *
+ * In VNET and HNET modes, DCB updating between virtual ring and real ring and
+ * a IOCTL based notification mechanism are involved. The hypervisor in kernel
+ * emulates the DMA HW behaviors to update DCBs in virtual network and inform
+ * the handler something happened. Likewise, the hypervisor updates itself real
+ * DCB ring from the virtual ring to start DMA for transmitting a packet once a
+ * notification is received from the virtual network.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_buff.h>
+#include <bcmcnet/bcmcnet_cmicx.h>
+
+/*!
+ * Configure Rx descriptor
+ */
+static inline void
+cmicx_rx_desc_config(struct cmicx_rx_desc *rd, uint64_t addr, uint32_t len)
+{
+    uint32_t ctrl;
+
+    rd->addr_lo = addr;
+    rd->addr_hi = DMA_TO_BUS_HI(addr >> 32);
+    rd->status = 0;
+    ctrl = rd->ctrl;
+    ctrl &= CMICX_DESC_CTRL_REMAIN(0xf);
+    ctrl |= CMICX_DESC_CTRL_CNTLD_INTR | CMICX_DESC_CTRL_CHAIN |
+            CMICX_DESC_CTRL_LEN(len);
+    rd->ctrl = ctrl;
+}
+
+/*!
+ * Configure Tx descriptor
+ */
+static inline void
+cmicx_tx_desc_config(struct cmicx_tx_desc *td, uint64_t addr, uint32_t len, uint32_t flags)
+{
+    uint32_t ctrl;
+
+    td->addr_lo = addr;
+    td->addr_hi = DMA_TO_BUS_HI(addr >> 32);
+    td->status = 0;
+    ctrl = td->ctrl;
+    ctrl &= CMICX_DESC_CTRL_REMAIN(0xf);
+    ctrl |= CMICX_DESC_CTRL_CNTLD_INTR | CMICX_DESC_CTRL_CHAIN |
+            CMICX_DESC_CTRL_FLAGS(flags) | CMICX_DESC_CTRL_LEN(len);
+    td->ctrl = ctrl;
+}
+
+/*!
+ * Configure Rx reload descriptor
+ */
+static inline void
+cmicx_rx_rldesc_config(struct cmicx_rx_desc *rd, uint64_t addr)
+{
+    rd->addr_lo = addr;
+    rd->addr_hi = DMA_TO_BUS_HI(addr >> 32);
+    rd->status = 0;
+    rd->ctrl = CMICX_DESC_CTRL_CNTLD_INTR | CMICX_DESC_CTRL_CHAIN |
+               CMICX_DESC_CTRL_RELOAD;
+}
+
+/*!
+ * Configure Tx reload descriptor
+ */
+static inline void
+cmicx_tx_rldesc_config(struct cmicx_tx_desc *td, uint64_t addr)
+{
+    td->addr_lo = addr;
+    td->addr_hi = DMA_TO_BUS_HI(addr >> 32);
+    td->status = 0;
+    td->ctrl = CMICX_DESC_CTRL_CNTLD_INTR | CMICX_DESC_CTRL_CHAIN |
+               CMICX_DESC_CTRL_RELOAD;
+}
+
+/*!
+ * Chain Rx descriptor
+ */
+static inline void
+cmicx_rx_desc_chain(struct cmicx_rx_desc *rd, int chain)
+{
+    if (chain) {
+        rd->ctrl |= CMICX_DESC_CTRL_CHAIN;
+    } else {
+        rd->ctrl &= ~CMICX_DESC_CTRL_CHAIN;
+    }
+}
+
+/*!
+ * Chain Tx descriptor
+ */
+static inline void
+cmicx_tx_desc_chain(struct cmicx_tx_desc *td, int chain)
+{
+    if (chain) {
+        td->ctrl |= CMICX_DESC_CTRL_CHAIN;
+    } else {
+        td->ctrl &= ~CMICX_DESC_CTRL_CHAIN;
+    }
+}
+
+/*!
+ * Set Rx descriptor remain
+ */
+static inline void
+cmicx_rx_desc_remain(struct cmicx_rx_desc *rd, uint32_t rm)
+{
+    rd->ctrl &= ~CMICX_DESC_CTRL_REMAIN(0xf);
+    rd->ctrl |= CMICX_DESC_CTRL_REMAIN(rm);
+}
+
+/*!
+ * Set Tx descriptor remain
+ */
+static inline void
+cmicx_tx_desc_remain(struct cmicx_tx_desc *td, uint32_t rm)
+{
+    td->ctrl &= ~CMICX_DESC_CTRL_REMAIN(0xf);
+    td->ctrl |= CMICX_DESC_CTRL_REMAIN(rm);
+}
+
+/*!
+ * Get unused descriptors in a Rx ring
+ */
+static inline int
+cmicx_pdma_rx_ring_unused(struct pdma_rx_queue *rxq)
+{
+    /* Leave one descriptor unused so as not to halt */
+    return rxq->curr > rxq->halt ?
+           rxq->curr - rxq->halt - 1 :
+           rxq->nb_desc + rxq->curr - rxq->halt - 1;
+}
+
+/*!
+ * Get unused descriptors in a Tx ring
+ */
+static inline int
+cmicx_pdma_tx_ring_unused(struct pdma_tx_queue *txq)
+{
+    /* Leave one descriptor unused so as not to halt */
+    return txq->dirt > txq->curr ?
+           txq->dirt - txq->curr - 1 :
+           txq->nb_desc + txq->dirt - txq->curr - 1;
+}
+
+/*!
+ * Initialize Rx descriptors
+ */
+static int
+cmicx_pdma_rx_desc_init(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    dma_addr_t addr;
+    uint32_t di, rm;
+    int rv;
+
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (!rxq->pbuf[di].dma) {
+            /* Allocate pktbuf for ring entry */
+            rv = bm->rx_buf_alloc(dev, rxq, &rxq->pbuf[di]);
+            if (SHR_FAILURE(rv)) {
+                goto cleanup;
+            }
+        }
+        /* Config receive descriptor ring */
+        bm->rx_buf_dma(dev, rxq, &rxq->pbuf[di], &addr);
+        cmicx_rx_desc_config(&ring[di], addr, rxq->buf_size);
+        rm = (rxq->nb_desc - di) >= CMICX_DESC_REMAIN_MAX ?
+             CMICX_DESC_REMAIN_MAX : rxq->nb_desc - di;
+        cmicx_rx_desc_remain(&ring[di], rm);
+        if (hw->dev->flags & PDMA_CHAIN_MODE && di == rxq->nb_desc - 1) {
+            cmicx_rx_desc_chain(&ring[di], 0);
+        }
+    }
+    /* Config the last descriptor in the ring as reload descriptor */
+    cmicx_rx_rldesc_config(&ring[di], rxq->ring_addr);
+
+    rxq->curr = 0;
+    rxq->halt = rxq->state & PDMA_RX_BATCH_REFILL ? 0 : rxq->nb_desc;
+
+    rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * di;
+    hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    hw->hdls.chan_setup(hw, rxq->chan_id, rxq->ring_addr);
+
+    return SHR_E_NONE;
+
+cleanup:
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (rxq->pbuf[di].dma) {
+            bm->rx_buf_free(dev, rxq, &rxq->pbuf[di]);
+        }
+        cmicx_rx_desc_config(&ring[di], 0, 0);
+    }
+
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * Cleanup Rx descriptors
+ */
+static int
+cmicx_pdma_rx_desc_clean(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    uint32_t di;
+
+    /* Go through all the descriptors and free pktbuf */
+    for (di = 0; di < rxq->nb_desc; di++) {
+        if (rxq->pbuf[di].dma) {
+            bm->rx_buf_free(dev, rxq, &rxq->pbuf[di]);
+        }
+        cmicx_rx_desc_config(&ring[di], 0, 0);
+    }
+
+    rxq->curr = 0;
+    rxq->halt = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize Tx descriptors
+ */
+static int
+cmicx_pdma_tx_desc_init(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    uint32_t di, rm;
+
+    for (di = 0; di < txq->nb_desc; di++) {
+        if (txq->pbuf[di].dma) {
+            bm->tx_buf_free(dev, txq, &txq->pbuf[di]);
+        }
+        /* Config transmit descriptor ring */
+        cmicx_tx_desc_config(&ring[di], 0, 0, 0);
+        rm = (txq->nb_desc - di) >= CMICX_DESC_REMAIN_MAX ?
+             CMICX_DESC_REMAIN_MAX : txq->nb_desc - di;
+        cmicx_tx_desc_remain(&ring[di], rm);
+        if (hw->dev->flags & PDMA_CHAIN_MODE) {
+            cmicx_tx_desc_chain(&ring[di], 0);
+        }
+    }
+    /* Config the last descriptor in the ring as reload descriptor */
+    cmicx_tx_rldesc_config(&ring[di], txq->ring_addr);
+
+    txq->curr = 0;
+    txq->dirt = 0;
+    txq->halt = 0;
+
+    txq->halt_addr = txq->ring_addr;
+    hw->hdls.chan_goto(hw, txq->chan_id, txq->halt_addr);
+    hw->hdls.chan_setup(hw, txq->chan_id, txq->ring_addr);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Cleanup Tx descriptors
+ */
+static int
+cmicx_pdma_tx_desc_clean(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    uint32_t di;
+
+    /* Go through all the descriptors and free pktbuf */
+    for (di = 0; di < txq->nb_desc; di++) {
+        if (txq->pbuf[di].dma) {
+            bm->tx_buf_free(dev, txq, &txq->pbuf[di]);
+        }
+        cmicx_tx_desc_config(&ring[di], 0, 0, 0);
+    }
+
+    txq->curr = 0;
+    txq->dirt = 0;
+    txq->halt = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Process Rx vring
+ */
+static int
+cmicx_pdma_rx_vring_process(struct pdma_hw *hw, struct pdma_rx_queue *rxq,
+                            struct pdma_rx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    struct pdma_rx_queue *vrxq = NULL;
+    struct cmicx_rx_desc *vring = NULL;
+    struct pkt_hdr *pkh = &pbuf->pkb->pkh;
+    uint64_t buf_addr;
+
+    vrxq = (struct pdma_rx_queue *)dev->ctrl.vnet_rxq[rxq->queue_id];
+    vring = (struct cmicx_rx_desc *)vrxq->ring;
+    if (!vring) {
+        rxq->stats.dropped++;
+        return SHR_E_UNAVAIL;
+    }
+
+    if (vring[vrxq->curr].status & CMICX_DESC_STAT_RTX_DONE) {
+        dev->xnet_wake(dev);
+        return SHR_E_BUSY;
+    }
+
+    /* Copy descriptor and packet to vring */
+    buf_addr = BUS_TO_DMA_HI(vring[vrxq->curr].addr_hi);
+    buf_addr = buf_addr << 32 | vring[vrxq->curr].addr_lo;
+    sal_memcpy(dev->sys_p2v(dev, buf_addr), &pbuf->pkb->data,
+               pkh->meta_len + pkh->data_len);
+    vring[vrxq->curr].status = ring[rxq->curr].status;
+
+    MEMORY_BARRIER;
+
+    /* Notify VNET to process if needed */
+    if (!vring[(vrxq->curr + vrxq->nb_desc - 1) % vrxq->nb_desc].status) {
+        dev->xnet_wake(dev);
+    }
+    vrxq->curr = (vrxq->curr + 1) % vrxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Refill Rx ring
+ */
+static int
+cmicx_pdma_rx_ring_refill(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    struct pdma_rx_buf *pbuf = NULL;
+    int unused = cmicx_pdma_rx_ring_unused(rxq);
+    dma_addr_t addr;
+    uint32_t halt;
+    int rv;
+
+    for (halt = rxq->halt; halt < rxq->halt + unused; halt++) {
+        pbuf = &rxq->pbuf[halt % rxq->nb_desc];
+        /* Allocate a new pktbuf */
+        if (!bm->rx_buf_avail(dev, rxq, pbuf)) {
+            rv = bm->rx_buf_alloc(dev, rxq, pbuf);
+            if (SHR_FAILURE(rv)) {
+                rxq->halt = halt % rxq->nb_desc;
+                rxq->stats.nomems++;
+                goto fail;
+            }
+        }
+        /* Setup the new descriptor */
+        bm->rx_buf_dma(dev, rxq, pbuf, &addr);
+        cmicx_rx_desc_config(&ring[halt % rxq->nb_desc], addr, rxq->buf_size);
+        if (dev->flags & PDMA_CHAIN_MODE && halt % rxq->nb_desc == rxq->nb_desc - 1) {
+            cmicx_rx_desc_chain(&ring[halt % rxq->nb_desc], 0);
+        }
+    }
+
+    sal_spinlock_lock(rxq->lock);
+    rxq->halt = halt % rxq->nb_desc;
+    if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+        /* Descriptor cherry pick */
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    }
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+
+fail:
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * \brief Clean Rx ring
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] rxq Rx queue structure point.
+ * \param [in] budget Polling budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicx_pdma_rx_ring_clean(struct pdma_hw *hw, struct pdma_rx_queue *rxq, int budget)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    struct pdma_rx_buf *pbuf = NULL;
+    struct pkt_hdr *pkh = NULL;
+    dma_addr_t addr;
+    uint32_t stat, curr;
+    int len, done = 0;
+    int rv;
+
+    curr = rxq->curr;
+    while (CMICX_DESC_STAT_DONE(ring[curr].status)) {
+        if (dev->mode == DEV_MODE_VNET && rxq->state & PDMA_RX_QUEUE_XOFF) {
+            break;
+        }
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL) &&
+            !(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+            /* Descriptor cherry pick */
+            rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * curr;
+            hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+            rxq->halt = curr;
+        }
+        if (done == budget) {
+            break;
+        }
+
+        /* Get the current pktbuf to process */
+        pbuf = &rxq->pbuf[curr];
+        stat = ring[curr].status;
+        len = CMICX_DESC_STAT_LEN(stat);
+        pkh = bm->rx_buf_get(dev, rxq, pbuf, len);
+        if (!pkh) {
+            rxq->stats.nomems++;
+            goto fail;
+        }
+
+        /* Setup packet header */
+        pkh->data_len = len - hw->info.rx_ph_size;
+        pkh->meta_len = hw->info.rx_ph_size;
+        pkh->queue_id = rxq->queue_id;
+        pkh->attrs = CMICX_DESC_STAT_FLAGS(stat);
+
+        /* Send up the packet */
+        rv = dev->pkt_recv(dev, rxq->queue_id, (void *)pbuf->skb);
+        if (SHR_FAILURE(rv)) {
+            if (dev->mode == DEV_MODE_HNET && pkh->attrs & PDMA_RX_TO_VNET) {
+                rv = cmicx_pdma_rx_vring_process(hw, rxq, pbuf);
+                if (SHR_FAILURE(rv) && rv == SHR_E_BUSY) {
+                    rxq->state |= PDMA_RX_QUEUE_BUSY;
+                    return done;
+                }
+            } else {
+                rxq->stats.dropped++;
+            }
+            bm->rx_buf_put(dev, rxq, pbuf, len);
+        }
+
+        /* Count the packets/bytes */
+        rxq->stats.packets++;
+        rxq->stats.bytes += len;
+
+        /* Count the errors if any */
+        if (stat & CMICX_DESC_STAT_ERR_MASK) {
+            rxq->stats.errors++;
+            if (stat & CMICX_DESC_STAT_DATA_ERR) {
+                rxq->stats.data_errors++;
+            }
+            if (stat & CMICX_DESC_STAT_CELL_ERR) {
+                rxq->stats.cell_errors++;
+            }
+        }
+
+        /* Setup the new descriptor */
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL)) {
+            if (!bm->rx_buf_avail(dev, rxq, pbuf)) {
+                rv = bm->rx_buf_alloc(dev, rxq, pbuf);
+                if (SHR_FAILURE(rv)) {
+                    rxq->stats.nomems++;
+                    goto fail;
+                }
+            }
+            bm->rx_buf_dma(dev, rxq, pbuf, &addr);
+            cmicx_rx_desc_config(&ring[curr], addr, rxq->buf_size);
+            if (dev->flags & PDMA_CHAIN_MODE && curr == rxq->nb_desc - 1) {
+                cmicx_rx_desc_chain(&ring[curr], 0);
+            }
+        } else {
+            cmicx_rx_desc_config(&ring[curr], 0, 0);
+        }
+
+        /* Notify HNET to process if needed */
+        if (dev->mode == DEV_MODE_VNET) {
+            MEMORY_BARRIER;
+            if (ring[(curr + rxq->nb_desc - 1) % rxq->nb_desc].status) {
+                dev->xnet_wake(dev);
+            }
+        }
+
+        /* Update the indicators */
+        if (!(rxq->state & PDMA_RX_BATCH_REFILL) && rxq->halt != curr) {
+            sal_spinlock_lock(rxq->lock);
+            if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+                /* Descriptor cherry pick */
+                rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * curr;
+                hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+                rxq->halt = curr;
+            }
+            curr = (curr + 1) % rxq->nb_desc;
+            sal_spinlock_unlock(rxq->lock);
+        } else {
+            curr = (curr + 1) % rxq->nb_desc;
+        }
+        rxq->curr = curr;
+        done++;
+
+        /* Restart DMA if in chain mode */
+        if (dev->flags & PDMA_CHAIN_MODE) {
+            if (curr == 0 && !(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+                hw->hdls.chan_stop(hw, rxq->chan_id);
+                hw->hdls.chan_start(hw, rxq->chan_id);
+            }
+        }
+    }
+
+    /* One more poll for chain done in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        if (curr == rxq->nb_desc - 1 && done) {
+            done = budget;
+        }
+    }
+
+    /* In batching mode, replenish all the unused descriptors */
+    if (rxq->state & PDMA_RX_BATCH_REFILL &&
+        cmicx_pdma_rx_ring_unused(rxq) >= (int)rxq->free_thresh) {
+        cmicx_pdma_rx_ring_refill(hw, rxq);
+    }
+
+    /* Notify the other side to process */
+    if (dev->mode == DEV_MODE_VNET || dev->mode == DEV_MODE_HNET) {
+        if (done) {
+            dev->xnet_wake(dev);
+        }
+    }
+
+    return done;
+
+fail:
+    CNET_PR("RX: Failed to allocate mem\n");
+
+    return done;
+}
+
+/*!
+ * Process Tx vring
+ */
+static int
+cmicx_pdma_tx_vring_process(struct pdma_hw *hw, struct pdma_tx_queue *txq,
+                            struct pdma_tx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    struct pdma_tx_queue *vtxq = NULL;
+    struct cmicx_tx_desc *vring = NULL;
+
+    vtxq = (struct pdma_tx_queue *)dev->ctrl.vnet_txq[txq->queue_id];
+    vring = (struct cmicx_tx_desc *)vtxq->ring;
+    if (!vring) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Update vring descriptor */
+    vring[vtxq->dirt].status = ring[txq->dirt].status;
+    pbuf->dma = 0;
+
+    MEMORY_BARRIER;
+
+    /* Notify VNET to process if needed */
+    if (!vring[(vtxq->dirt + vtxq->nb_desc - 1) % vtxq->nb_desc].status) {
+        dev->xnet_wake(dev);
+    }
+    vtxq->dirt = (vtxq->dirt + 1) % vtxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Clean Tx ring
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] txq Tx queue structure point.
+ * \param [in] budget Polling budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicx_pdma_tx_ring_clean(struct pdma_hw *hw, struct pdma_tx_queue *txq, int budget)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    uint32_t dirt, curr;
+    int done = 0;
+
+    dirt = txq->dirt;
+    while (txq->pbuf[dirt].dma) {
+        if (!CMICX_DESC_STAT_DONE(ring[dirt].status)) {
+            break;
+        }
+        if (done == budget) {
+            break;
+        }
+
+        if (dev->mode == DEV_MODE_HNET && !txq->pbuf[dirt].skb) {
+            cmicx_pdma_tx_vring_process(hw, txq, &txq->pbuf[dirt]);
+        } else {
+            /* Free the done pktbuf */
+            bm->tx_buf_free(dev, txq, &txq->pbuf[dirt]);
+        }
+
+        cmicx_tx_desc_config(&ring[dirt], 0, 0, 0);
+
+        /* Update the indicators */
+        dirt = (dirt + 1) % txq->nb_desc;
+        txq->dirt = dirt;
+        done++;
+
+        /* Restart DMA if in chain mode */
+        if (dev->flags & PDMA_CHAIN_MODE) {
+            sal_spinlock_lock(txq->lock);
+            curr = txq->curr;
+            if (dirt == txq->halt && dirt != curr) {
+                hw->hdls.chan_stop(hw, txq->chan_id);
+                cmicx_tx_desc_chain(&ring[(curr + txq->nb_desc - 1) % txq->nb_desc], 0);
+                hw->hdls.chan_setup(hw, txq->chan_id,
+                                    txq->ring_addr + sizeof(struct cmicx_tx_desc) * txq->halt);
+                hw->hdls.chan_start(hw, txq->chan_id);
+                txq->halt = curr;
+            }
+            sal_spinlock_unlock(txq->lock);
+        }
+    }
+
+    /* One more poll for chain done in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        sal_spinlock_lock(txq->lock);
+        if (dirt != txq->halt) {
+            done = budget;
+        }
+        sal_spinlock_unlock(txq->lock);
+    }
+
+    /* Resume Tx if any */
+    sal_spinlock_lock(txq->lock);
+    if (cmicx_pdma_tx_ring_unused(txq) && txq->state & PDMA_TX_QUEUE_XOFF) {
+        txq->state &= ~PDMA_TX_QUEUE_XOFF;
+        sal_spinlock_unlock(txq->lock);
+        if (dev->tx_resume) {
+            dev->tx_resume(dev, txq->queue_id);
+        } else if (!(txq->state & PDMA_TX_QUEUE_POLL)) {
+            sal_sem_give(txq->sem);
+        }
+        return done;
+    }
+    sal_spinlock_unlock(txq->lock);
+
+    return done;
+}
+
+/*!
+ * Dump Rx ring
+ */
+static int
+cmicx_pdma_rx_ring_dump(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    struct cmicx_rx_desc *ring = (struct cmicx_rx_desc *)rxq->ring;
+    struct cmicx_rx_desc *rd;
+    uint32_t di;
+
+    CNET_PR("\nRX: queue=%d, chan=%d, curr=%d, halt=%d, halt@%p\n",
+            rxq->queue_id, rxq->chan_id, rxq->curr, rxq->halt, (void *)&ring[rxq->halt]);
+    CNET_PR("----------------------------------------------------------------\n");
+    for (di = 0; di < rxq->nb_desc + 1; di++) {
+        rd = &ring[di];
+        CNET_PR("DESC[%03d]: (%p)->%08x %08x %08x %08x\n",
+                di, (void *)(unsigned long)(rxq->ring_addr + di * CMICX_PDMA_DCB_SIZE),
+                rd->addr_lo, rd->addr_hi, rd->ctrl, rd->status);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dump Tx ring
+ */
+static int
+cmicx_pdma_tx_ring_dump(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    struct cmicx_tx_desc *td;
+    uint32_t di;
+
+    CNET_PR("\nTX: queue=%d, chan=%d, curr=%d, dirt=%d, halt@%p\n",
+            txq->queue_id, txq->chan_id, txq->curr, txq->dirt, (void *)&ring[txq->curr]);
+    CNET_PR("----------------------------------------------------------------\n");
+    for (di = 0; di < txq->nb_desc + 1; di++) {
+        td = &ring[di];
+        CNET_PR("DESC[%03d]: (%p)->%08x %08x %08x %08x\n",
+                di, (void *)(unsigned long)(txq->ring_addr + di * CMICX_PDMA_DCB_SIZE),
+                td->addr_lo, td->addr_hi, td->ctrl, td->status);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Fetch Tx vring
+ */
+static int
+cmicx_pdma_tx_vring_fetch(struct pdma_hw *hw, struct pdma_tx_queue *txq,
+                          struct pdma_tx_buf *pbuf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    struct pdma_tx_queue *vtxq = NULL;
+    struct cmicx_tx_desc *vring = NULL;
+
+    vtxq = (struct pdma_tx_queue *)dev->ctrl.vnet_txq[txq->queue_id];
+    vring = (struct cmicx_tx_desc *)vtxq->ring;
+    if (!vring || !CMICX_DESC_CTRL_LEN(vring[vtxq->curr].ctrl)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Fetch vring descriptor */
+    sal_memcpy(&ring[txq->curr], &vring[vtxq->curr], sizeof(struct cmicx_tx_desc));
+    vring[vtxq->curr].ctrl &= ~CMICX_DESC_CTRL_LEN(-1);
+
+    MEMORY_BARRIER;
+
+    pbuf->dma = vring[vtxq->curr].addr_lo;
+    pbuf->len = CMICX_DESC_CTRL_LEN(ring[txq->curr].ctrl);
+    vtxq->curr = (vtxq->curr + 1) % vtxq->nb_desc;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Check Tx ring
+ */
+static inline int
+cmicx_pdma_tx_ring_check(struct pdma_hw *hw, struct pdma_tx_queue *txq)
+{
+    if (cmicx_pdma_tx_ring_unused(txq)) {
+        return SHR_E_NONE;
+    }
+
+    sal_spinlock_lock(txq->lock);
+    if (!cmicx_pdma_tx_ring_unused(txq)) {
+        txq->state |= PDMA_TX_QUEUE_XOFF;
+        txq->stats.xoffs++;
+        sal_spinlock_unlock(txq->lock);
+        if (hw->dev->tx_suspend) {
+            hw->dev->tx_suspend(hw->dev, txq->queue_id);
+        }
+        return SHR_E_BUSY;
+    }
+    sal_spinlock_unlock(txq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Start packet transmission
+ *
+ * \param [in] hw HW structure point.
+ * \param [in] txq Tx queue structure point.
+ * \param [in] buf Tx packet buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+cmicx_pdma_pkt_xmit(struct pdma_hw *hw, struct pdma_tx_queue *txq, void *buf)
+{
+    struct pdma_dev *dev = hw->dev;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)dev->ctrl.buf_mngr;
+    struct cmicx_tx_desc *ring = (struct cmicx_tx_desc *)txq->ring;
+    struct pdma_tx_buf *pbuf = NULL;
+    struct pkt_hdr *pkh = NULL;
+    dma_addr_t addr;
+    uint32_t curr, flags = 0;
+    int retry = 5000000;
+    int rv;
+
+    if (!(txq->state & PDMA_TX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (dev->tx_suspend) {
+        sal_spinlock_lock(txq->mutex);
+    } else {
+        sal_sem_take(txq->sem, SAL_SEM_FOREVER);
+    }
+
+    /* Check Tx resource */
+    if (dev->tx_suspend) {
+        /* Suspend Tx if no resource */
+        rv = cmicx_pdma_tx_ring_check(hw, txq);
+        if (SHR_FAILURE(rv)) {
+            sal_spinlock_unlock(txq->mutex);
+            return rv;
+        }
+    } else {
+        /* Abort Tx if a fatal error happened */
+        if (txq->state & PDMA_TX_QUEUE_XOFF) {
+            sal_sem_give(txq->sem);
+            return SHR_E_RESOURCE;
+        }
+    }
+
+    /* Setup the new descriptor */
+    curr = txq->curr;
+    pbuf = &txq->pbuf[curr];
+    if (dev->mode == DEV_MODE_HNET && !buf) {
+        rv = cmicx_pdma_tx_vring_fetch(hw, txq, pbuf);
+        if (SHR_FAILURE(rv)) {
+            sal_spinlock_unlock(txq->mutex);
+            return SHR_E_EMPTY;
+        }
+    } else {
+        pbuf->adj = 1;
+        pkh = bm->tx_buf_get(dev, txq, pbuf, buf);
+        if (!pkh) {
+            txq->stats.dropped++;
+            if (dev->tx_suspend) {
+                sal_spinlock_unlock(txq->mutex);
+            } else {
+                sal_sem_give(txq->sem);
+            }
+            return SHR_E_NONE;
+        }
+        bm->tx_buf_dma(dev, txq, pbuf, &addr);
+        flags |= pkh->attrs & PDMA_TX_HIGIG_PKT ? CMICX_DESC_TX_HIGIG_PKT : 0;
+        flags |= pkh->attrs & PDMA_TX_PURGE_PKT ? CMICX_DESC_TX_PURGE_PKT : 0;
+        cmicx_tx_desc_config(&ring[curr], addr, pbuf->len, flags);
+    }
+
+    /* Notify HNET to process if needed */
+    if (dev->mode == DEV_MODE_VNET) {
+        MEMORY_BARRIER;
+        if (!CMICX_DESC_CTRL_LEN(ring[(curr + txq->nb_desc - 1) % txq->nb_desc].ctrl)) {
+            dev->xnet_wake(dev);
+        }
+    }
+
+    /* Update the indicators */
+    curr = (curr + 1) % txq->nb_desc;
+    txq->curr = curr;
+
+    /* Start DMA if in chain mode */
+    if (dev->flags & PDMA_CHAIN_MODE) {
+        if (txq->state & PDMA_TX_QUEUE_POLL) {
+            do {
+                rv = cmicx_pdma_tx_ring_clean(hw, txq, txq->nb_desc - 1);
+                if (rv != (int)txq->nb_desc - 1) {
+                    break;
+                }
+                sal_usleep(1);
+            } while (retry--);
+            if (retry <= 0) {
+                CNET_PR("Last Tx could not be done in given time\n");
+            }
+        }
+        sal_spinlock_lock(txq->lock);
+        if (txq->dirt == txq->halt && txq->dirt != curr) {
+            hw->hdls.chan_stop(hw, txq->chan_id);
+            cmicx_tx_desc_chain(&ring[(curr + txq->nb_desc - 1) % txq->nb_desc], 0);
+            hw->hdls.chan_setup(hw, txq->chan_id,
+                                txq->ring_addr + sizeof(struct cmicx_tx_desc) * txq->halt);
+            hw->hdls.chan_start(hw, txq->chan_id);
+            txq->halt = curr;
+        }
+        sal_spinlock_unlock(txq->lock);
+    }
+
+    /* Kick off DMA */
+    txq->halt_addr = txq->ring_addr + sizeof(struct cmicx_tx_desc) * curr;
+    hw->hdls.chan_goto(hw, txq->chan_id, txq->halt_addr);
+
+    /* Count the packets/bytes */
+    txq->stats.packets++;
+    txq->stats.bytes += pbuf->len;
+
+    /* Clean up ring if in polling mode */
+    if (txq->state & PDMA_TX_QUEUE_POLL &&
+        cmicx_pdma_tx_ring_unused(txq) <= (int)txq->free_thresh) {
+        cmicx_pdma_tx_ring_clean(hw, txq, txq->nb_desc - txq->free_thresh);
+    }
+
+    /* Suspend Tx if no resource */
+    rv = cmicx_pdma_tx_ring_check(hw, txq);
+    if (SHR_FAILURE(rv)) {
+        if (dev->mode == DEV_MODE_VNET) {
+            dev->xnet_wake(dev);
+        }
+
+        if (txq->state & PDMA_TX_QUEUE_POLL) {
+            /* In polling mode, must wait till the ring is available */
+            do {
+                cmicx_pdma_tx_ring_clean(hw, txq, txq->free_thresh);
+                if (!(txq->state & PDMA_TX_QUEUE_XOFF)) {
+                    break;
+                }
+                sal_usleep(1);
+            } while (retry--);
+            if (retry <= 0) {
+                CNET_PR("Fatal error: Tx ring is full, packets have not been transmitted for 5 seconds\n");
+                if (!dev->tx_suspend) {
+                    sal_sem_give(txq->sem);
+                    return SHR_E_RESOURCE;
+                }
+            }
+        } else {
+            /* In interrupt mode, the handle thread will wake up Tx */
+            if (!dev->tx_suspend) {
+                return SHR_E_NONE;
+            }
+        }
+    }
+
+    if (dev->tx_suspend) {
+        sal_spinlock_unlock(txq->mutex);
+    } else {
+        sal_sem_give(txq->sem);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend Rx queue
+ */
+static int
+cmicx_pdma_rx_suspend(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    sal_spinlock_lock(rxq->lock);
+    rxq->state |= PDMA_RX_QUEUE_XOFF;
+    if (hw->dev->flags & PDMA_CHAIN_MODE) {
+        hw->hdls.chan_stop(hw, rxq->chan_id);
+    }
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Resume Rx queue
+ */
+static int
+cmicx_pdma_rx_resume(struct pdma_hw *hw, struct pdma_rx_queue *rxq)
+{
+    sal_spinlock_lock(rxq->lock);
+    if (!(rxq->state & PDMA_RX_QUEUE_XOFF)) {
+        sal_spinlock_unlock(rxq->lock);
+        return SHR_E_NONE;
+    }
+    if (rxq->state & PDMA_RX_BATCH_REFILL) {
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    } else if (rxq->halt == rxq->curr || (rxq->halt == rxq->nb_desc && rxq->curr == 0)) {
+        rxq->halt = (rxq->curr + 1) % rxq->nb_desc;
+        rxq->halt_addr = rxq->ring_addr + sizeof(struct cmicx_rx_desc) * rxq->halt;
+        hw->hdls.chan_goto(hw, rxq->chan_id, rxq->halt_addr);
+    }
+    if (hw->dev->flags & PDMA_CHAIN_MODE) {
+        rxq->curr = 0;
+        hw->hdls.chan_start(hw, rxq->chan_id);
+    }
+    rxq->state &= ~PDMA_RX_QUEUE_XOFF;
+    sal_spinlock_unlock(rxq->lock);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Initialize function pointers
+ */
+int
+bcmcnet_cmicx_pdma_desc_ops_init(struct pdma_hw *hw)
+{
+    if (!hw) {
+        return SHR_E_PARAM;
+    }
+
+    hw->dops.rx_desc_init = cmicx_pdma_rx_desc_init;
+    hw->dops.rx_desc_clean = cmicx_pdma_rx_desc_clean;
+    hw->dops.rx_ring_clean = cmicx_pdma_rx_ring_clean;
+    hw->dops.rx_ring_dump = cmicx_pdma_rx_ring_dump;
+    hw->dops.rx_suspend = cmicx_pdma_rx_suspend;
+    hw->dops.rx_resume = cmicx_pdma_rx_resume;
+    hw->dops.tx_desc_init = cmicx_pdma_tx_desc_init;
+    hw->dops.tx_desc_clean = cmicx_pdma_tx_desc_clean;
+    hw->dops.tx_ring_clean = cmicx_pdma_tx_ring_clean;
+    hw->dops.tx_ring_dump = cmicx_pdma_tx_ring_dump;
+    hw->dops.pkt_xmit = cmicx_pdma_pkt_xmit;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Attach device driver
+ */
+int
+bcmcnet_cmicx_pdma_driver_attach(struct pdma_dev *dev)
+{
+    struct pdma_hw *hw = NULL;
+
+    /* Allocate memory for HW data */
+    hw = sal_alloc(sizeof(*hw), "bcmcnetPdmaHw");
+    if (!hw) {
+        return SHR_E_MEMORY;
+    }
+    sal_memset(hw, 0, sizeof(*hw));
+    hw->unit = dev->unit;
+    hw->dev = dev;
+    dev->ctrl.hw = hw;
+
+    bcmcnet_cmicx_pdma_hw_hdls_init(hw);
+    bcmcnet_cmicx_pdma_desc_ops_init(hw);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Detach device driver
+ */
+int
+bcmcnet_cmicx_pdma_driver_detach(struct pdma_dev *dev)
+{
+    if (dev->ctrl.hw) {
+        sal_free(dev->ctrl.hw);
+    }
+    dev->ctrl.hw = NULL;
+
+    return SHR_E_NONE;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicd.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicd.h
new file mode 100644
index 000000000000..ef9717923e70
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicd.h
@@ -0,0 +1,369 @@
+/*! \file bcmcnet_cmicd.h
+ *
+ * CMICd registers and descriptors definitions.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_CMICD_H
+#define BCMCNET_CMICD_H
+
+/*!
+ * \name CMICD PDMA HW definitions
+ */
+/*! \{ */
+/*! CMICD CMC number */
+#define CMICD_PDMA_CMC_MAX              3
+/*! CMICD CMC PDMA channels */
+#define CMICD_PDMA_CMC_CHAN             4
+/*! CMICD PDMA DCB size */
+#define CMICD_PDMA_DCB_SIZE             64
+/*! \} */
+
+/*!
+ * \name CMICD PDMA register definitions
+ */
+/*! \{ */
+#define CMICD_PDMA_CTRLr                0x0140
+#define CMICD_PDMA_STATr                0x0150
+#define CMICD_PDMA_STAT_HIr             0x0130
+#define CMICD_PDMA_STAT_CLRr            0x01a4
+#define CMICD_PDMA_DESCr                0x0158
+#define CMICD_PDMA_CURR_DESCr           0x01a8
+#define CMICD_PDMA_DESC_HALTr           0x0120
+#define CMICD_PDMA_COS_RX0r             0x0168
+#define CMICD_PDMA_COS_RX1r             0x016c
+#define CMICD_PDMA_COS_MASK0r           0x019c
+#define CMICD_PDMA_COS_MASK1r           0x01a0
+#define CMICD_PDMA_INTR_COALr           0x0188
+#define CMICD_PDMA_RBUF_THREr           0x0110
+#define CMICD_PDMA_COUNT_RXr            0x0480
+#define CMICD_PDMA_COUNT_TXr            0x0484
+#define CMICD_PDMA_COUNT_ALL_RXr        0x04a0
+#define CMICD_PDMA_COUNT_ALL_TXr        0x04a4
+#define CMICD_IRQ_STATr                 0x0400
+#define CMICD_IRQ_PCI_MASKr             0x0414
+#define CMICD_IRQ_UC0_MASKr             0x0428
+/*! \} */
+
+/*!
+ * \name CMICD PDMA register address
+ */
+/*! \{ */
+/*! Base address */
+#define CMICD_GRP_BASE(g)               (0x00031000 + 0x1000 * g)
+/*! Control register address */
+#define CMICD_PDMA_CTRL(g, q)           (CMICD_GRP_BASE(g) + CMICD_PDMA_CTRLr + q * 4)
+/*! Status register address */
+#define CMICD_PDMA_STAT(g)              (CMICD_GRP_BASE(g) + CMICD_PDMA_STATr)
+/*! Status higher register address */
+#define CMICD_PDMA_STAT_HI(g)           (CMICD_GRP_BASE(g) + CMICD_PDMA_STAT_HIr)
+/*! Status clear register address */
+#define CMICD_PDMA_STAT_CLR(g)          (CMICD_GRP_BASE(g) + CMICD_PDMA_STAT_CLRr)
+/*! Descriptor register address */
+#define CMICD_PDMA_DESC(g, q)           (CMICD_GRP_BASE(g) + CMICD_PDMA_DESCr + q * 4)
+/*! Current descriptor register address */
+#define CMICD_PDMA_CURR_DESC(g, q)      (CMICD_GRP_BASE(g) + CMICD_PDMA_CURR_DESCr + q * 4)
+/*! Descriptor halt register address */
+#define CMICD_PDMA_DESC_HALT(g, q)      (CMICD_GRP_BASE(g) + CMICD_PDMA_DESC_HALTr + q * 4)
+/*! COS Rx0 register address */
+#define CMICD_PDMA_COS_RX0(g, q)        (CMICD_GRP_BASE(g) + CMICD_PDMA_COS_RX0r + q * 8)
+/*! COS Rx1 register address */
+#define CMICD_PDMA_COS_RX1(g, q)        (CMICD_GRP_BASE(g) + CMICD_PDMA_COS_RX1r + q * 8)
+/*! COS Mask0 register address */
+#define CMICD_PDMA_COS_MASK0(g)         (CMICD_GRP_BASE(g) + CMICD_PDMA_COS_MASK0r)
+/*! COS Mask1 register address */
+#define CMICD_PDMA_COS_MASK1(g)         (CMICD_GRP_BASE(g) + CMICD_PDMA_COS_MASK1r)
+/*! Interrupt coalesce register address */
+#define CMICD_PDMA_INTR_COAL(g, q)      (CMICD_GRP_BASE(g) + CMICD_PDMA_INTR_COALr + q * 4)
+/*! Rx buffer threshhold register address */
+#define CMICD_PDMA_RBUF_THRE(g, q)      (CMICD_GRP_BASE(g) + CMICD_PDMA_RBUF_THREr + q * 4)
+/*! Rx counter register address */
+#define CMICD_PDMA_COUNT_RX(g, q)       (CMICD_GRP_BASE(g) + CMICD_PDMA_COUNT_RXr + q * 8)
+/*! Tx counter register address */
+#define CMICD_PDMA_COUNT_TX(g, q)       (CMICD_GRP_BASE(g) + CMICD_PDMA_COUNT_TXr + q * 8)
+/*! Rx global counter register address */
+#define CMICD_PDMA_COUNT_ALL_RX(g)      (CMICD_GRP_BASE(g) + CMICD_PDMA_COUNT_ALL_RXr)
+/*! Tx gloable counter register address */
+#define CMICD_PDMA_COUNT_ALL_TX(g)      (CMICD_GRP_BASE(g) + CMICD_PDMA_COUNT_ALL_TXr)
+/*! Interrupt status register address */
+#define CMICD_IRQ_STAT(g)               (CMICD_GRP_BASE(g) + CMICD_IRQ_STATr)
+/*! Interrupt PCI mask register address */
+#define CMICD_IRQ_PCI_MASK(g)           (CMICD_GRP_BASE(g) + CMICD_IRQ_PCI_MASKr)
+/*! Interrupt UC0 mask register address */
+#define CMICD_IRQ_UC0_MASK(g)           (CMICD_GRP_BASE(g) + CMICD_IRQ_UC0_MASKr)
+/*! Credits release release register address */
+#define CMICD_EPINTF_RELEASE_CREDITS    0x0001a000
+/*! Device revision register address */
+#define CMICD_DEV_REV_ID                0x00010224
+/*! CMIC revison register address */
+#define CMICD_CMICM_REV_ID              0x00010228
+/*! \} */
+
+/*!
+ * \name Control register definitions
+ */
+/*! \{ */
+/*! Continuous DMA mode */
+#define CMICD_PDMA_CONTINUOUS           0x00000200
+/*! Controlled interrupt */
+#define CMICD_PDMA_CNTLD_INTR           0x00000100
+/*! Update status on reload */
+#define CMICD_PDMA_RLD_STAT_DIS         0x00000080
+/*! Dropped on chain end */
+#define CMICD_PDMA_DROP_ON_END          0x00000040
+/*! Descriptor big endianess */
+#define CMICD_PDMA_DESC_BIG_ENDIAN      0x00000020
+/*! Packet DMA big endianess */
+#define CMICD_PDMA_PKT_BIG_ENDIAN       0x00000010
+/*! Interrupt after descriptor */
+#define CMICD_PDMA_INTR_ON_DESC         0x00000008
+/*! Abort DMA */
+#define CMICD_PDMA_ABORT                0x00000004
+/*! Enable DMA */
+#define CMICD_PDMA_ENABLE               0x00000002
+/*! DMA direction */
+#define CMICD_PDMA_DIR                  0x00000001
+/*! \} */
+
+/*!
+ * \name Status register definitions
+ */
+/*! \{ */
+/*! Chain done */
+#define CMICD_PDMA_CHAIN_DONE(q)        (0x00000001 << (q))
+/*! Descriptor done */
+#define CMICD_PDMA_DESC_DONE(q)         (0x00000010 << (q))
+/*! Active */
+#define CMICD_PDMA_ACTIVE(q)            (0x00000100 << (q))
+/*! \} */
+
+/*!
+ * \name Status clear register definitions
+ */
+/*! \{ */
+/*! Clear completed interrupt */
+#define CMICD_PDMA_DESC_CMPLT(q)        (0x00000001 << (q))
+/*! Clear controlled interrupt */
+#define CMICD_PDMA_DESC_CNTLD(q)        (0x00000100 << (q))
+/*! \} */
+
+/*!
+ * \name Interrupt_coalesce register definitions
+ */
+/*! \{ */
+/*! Interrupt coalesce enable */
+#define CMICD_PDMA_INTR_COAL_ENA        (1 << 31)
+/*! Interrupt coalesce threshhold */
+#define CMICD_PDMA_INTR_THRESH(cnt)     (((cnt) & 0x7fff) << 16)
+/*! Interrupt coalesce timeout */
+#define CMICD_PDMA_INTR_TIMER(tmr)      ((tmr) & 0xffff)
+/*! \} */
+
+/*!
+ * \name Interrupt status&mask register definitions
+ */
+/*! \{ */
+/*! Interrupt mask */
+#define CMICD_PDMA_IRQ_MASK             0x78000000
+/*! Descriptor done */
+#define CMICD_IRQ_DESC_DONE(q)          (0x00004000 >> (2 * (q)))
+/*! Chain done */
+#define CMICD_IRQ_CHAIN_DONE(q)         (0x00008000 >> (2 * (q)))
+/*! Controlled interrupt */
+#define CMICD_IRQ_DESC_CNTLD(q)         (0x08000000 << (q))
+/*! Interrupt start number */
+#define CMICD_IRQ_START_NUM             27
+/*! Interrupt number offset */
+#define CMICD_IRQ_NUM_OFFSET            1
+/*! Interrupt mask shift */
+#define CMICD_IRQ_MASK_SHIFT            0
+/*! Interrupt mask zeroing */
+#define CMICD_IRQ_ACT_CHAN(mask)        (((mask) & CMICD_PDMA_IRQ_MASK) >> CMICD_IRQ_START_NUM)
+/*! \} */
+
+/*! 32-bit register read */
+#define DEV_READ32(_c, _a, _p) \
+    do { \
+        if ((_c)->dev->mode != DEV_MODE_VNET) { \
+            *(_p) = ((volatile uint32_t *)(_c)->hw_addr)[(_a) / 4]; \
+        } \
+    } while (0)
+
+/*! 32-bit register write */
+#define DEV_WRITE32(_c, _a, _v) \
+    do { \
+        if ((_c)->dev->mode != DEV_MODE_VNET) { \
+            ((volatile uint32_t *)(_c)->hw_addr)[(_a) / 4] = (_v); \
+        } \
+    } while (0)
+
+/*!
+ * \brief Rx metadata in descriptor.
+ */
+struct rx_metadata {
+    /*! Metadata */
+    volatile uint32_t data[13];
+
+    /*! Status */
+    volatile uint32_t status;
+} __attribute__((packed));
+
+/*!
+ * \brief Rx descriptor.
+ */
+struct cmicd_rx_desc {
+    /*! Packet address */
+    volatile uint32_t addr;
+
+    /*! Packet control */
+    volatile uint32_t ctrl;
+
+    /*! Metadata fields */
+    struct rx_metadata md;
+} __attribute__((packed));
+
+/*! Reserve Rx meta data size in packet buffer */
+#define CMICD_RX_META_RESV              64
+
+/*!
+ * \brief Tx metadata in descriptor.
+ */
+struct tx_metadata {
+    /*! Metadata */
+    volatile uint32_t data[4];
+
+    /*! Reserved */
+    volatile uint32_t rsvd[9];
+
+    /*! Status */
+    volatile uint32_t status;
+} __attribute__((packed));
+
+/*!
+ * \brief Tx descriptor.
+ */
+struct cmicd_tx_desc {
+    /*! Packet address */
+    volatile uint32_t addr;
+
+    /*! Packet control */
+    volatile uint32_t ctrl;
+
+    /*! Metadata fields */
+    struct tx_metadata md;
+} __attribute__((packed));
+
+/*! Reserve Tx meta data size in packet buffer */
+#define CMICD_TX_META_RESV              16
+
+/*!
+ * Flags related to descriptors.
+ */
+/*! Controlled interrupt */
+#define CMICD_DESC_CTRL_CNTLD_INTR      (1 << 24)
+/*! Completed interrupt */
+#define CMICD_DESC_CTRL_CMPLT_INTR      (1 << 23)
+/*! Reload DCB */
+#define CMICD_DESC_CTRL_RELOAD          (1 << 18)
+/*! Scatter DCB */
+#define CMICD_DESC_CTRL_SCATTER         (1 << 17)
+/*! Chained DCB */
+#define CMICD_DESC_CTRL_CHAIN           (1 << 16)
+/*! Control flags */
+#define CMICD_DESC_CTRL_FLAGS(f)        (((f) & 0xffff) << 16)
+/*! Purge packet */
+#define CMICD_DESC_TX_PURGE_PKT         (1 << 6)
+/*! Pause packet */
+#define CMICD_DESC_TX_PAUSE_PKT         (1 << 5)
+/*! Higig packet */
+#define CMICD_DESC_TX_HIGIG_PKT         (1 << 3)
+/*! Packet length */
+#define CMICD_DESC_CTRL_LEN(len)        ((len) & 0xffff)
+/*! Done */
+#define CMICD_DESC_STAT_RTX_DONE        (1 << 31)
+/*! Head error */
+#define CMICD_DESC_STAT_HEAD_ERR        (1 << 20)
+/*! Data error */
+#define CMICD_DESC_STAT_DATA_ERR        (1 << 19)
+/*! Cell error */
+#define CMICD_DESC_STAT_CELL_ERR        (1 << 18)
+/*! Error mask */
+#define CMICD_DESC_STAT_ERR_MASK        (CMICD_DESC_STAT_HEAD_ERR | \
+                                         CMICD_DESC_STAT_DATA_ERR | \
+                                         CMICD_DESC_STAT_CELL_ERR)
+/*! Packet start */
+#define CMICD_DESC_STAT_PKT_START       (1 << 17)
+/*! Packet end */
+#define CMICD_DESC_STAT_PKT_END         (1 << 16)
+/*! Get done state */
+#define CMICD_DESC_STAT_DONE(stat)      ((stat) & CMICD_DESC_STAT_RTX_DONE)
+/*! Get flags */
+#define CMICD_DESC_STAT_FLAGS(stat)     (((stat) >> 16) & ~0x8003)
+/*! Get packet length */
+#define CMICD_DESC_STAT_LEN(stat)       ((stat) & 0xffff)
+
+/*! HW access retry times */
+#define CMICD_HW_RETRY_TIMES            100000
+
+/*!
+ * \brief Initialize HW handles.
+ *
+ * \param [in] hw HW structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicd_pdma_hw_hdls_init(struct pdma_hw *hw);
+
+/*!
+ * \brief Initialize descriptor operations.
+ *
+ * \param [in] hw HW structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicd_pdma_desc_ops_init(struct pdma_hw *hw);
+
+/*!
+ * \brief Attach device driver.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicd_pdma_driver_attach(struct pdma_dev *dev);
+
+/*!
+ * \brief Detach device driver.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicd_pdma_driver_detach(struct pdma_dev *dev);
+
+#endif /* BCMCNET_CMICD_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicx.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicx.h
new file mode 100644
index 000000000000..a8657c8b46a9
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_cmicx.h
@@ -0,0 +1,379 @@
+/*! \file bcmcnet_cmicx.h
+ *
+ * CMICx registers and descriptors definitions.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_CMICX_H
+#define BCMCNET_CMICX_H
+
+/*!
+ * \name CMICX PDMA HW definitions
+ */
+/*! \{ */
+/*! CMICX CMC number */
+#define CMICX_PDMA_CMC_MAX              2
+/*! CMICX CMC PDMA channels */
+#define CMICX_PDMA_CMC_CHAN             8
+/*! CMICX PDMA DCB size */
+#define CMICX_PDMA_DCB_SIZE             16
+/*! \} */
+
+/*!
+ * \name CMICX PCIe device address definitions
+ */
+/*! \{ */
+/*! CMICX PCIE offset */
+#define CMICX_PCIE_SO_OFFSET            0x10000000
+/*! Higher DMA address to bus address */
+#define DMA_TO_BUS_HI(dma)              ((dma) | CMICX_PCIE_SO_OFFSET)
+/*! Higher bus address to DMA address */
+#define BUS_TO_DMA_HI(bus)              ((bus) & ~CMICX_PCIE_SO_OFFSET)
+/*! \} */
+
+/*!
+ * \name CMICX PDMA register definitions
+ */
+/*! \{ */
+#define CMICX_PDMA_CTRLr                0x2100
+#define CMICX_PDMA_STATr                0x2114
+#define CMICX_PDMA_DESC_LOr             0x2104
+#define CMICX_PDMA_DESC_HIr             0x2108
+#define CMICX_PDMA_CURR_DESC_LOr        0x2124
+#define CMICX_PDMA_CURR_DESC_HIr        0x2128
+#define CMICX_PDMA_DESC_HALT_LOr        0x210c
+#define CMICX_PDMA_DESC_HALT_HIr        0x2110
+#define CMICX_PDMA_COS_CTRL_RX0r        0x2118
+#define CMICX_PDMA_COS_CTRL_RX1r        0x211c
+#define CMICX_PDMA_INTR_COALr           0x2120
+#define CMICX_PDMA_RBUF_THREr           0x212c
+#define CMICX_PDMA_DEBUG_CTRLr          0x2130
+#define CMICX_PDMA_DEBUG_SM_STATr       0x2134
+#define CMICX_PDMA_DEBUG_STATr          0x2138
+#define CMICX_PDMA_COUNT_RXr            0x213c
+#define CMICX_PDMA_COUNT_TXr            0x2140
+#define CMICX_PDMA_COUNT_RX_DROPr       0x2144
+#define CMICX_PDMA_DESC_CNT_REQr        0x2148
+#define CMICX_PDMA_DESC_CNT_RXr         0x214c
+#define CMICX_PDMA_DESC_CNT_STATr       0x2150
+#define CMICX_PDMA_IRQ_STATr            0x106c
+#define CMICX_PDMA_IRQ_STAT_CLRr        0x1074
+/*! \} */
+
+/*!
+ * \name CMICX PDMA register address
+ */
+/*! \{ */
+/*! Base address */
+#define CMICX_GRP_BASE(g)               (0x00000000 + 0x3000 * g)
+/*! Control register address */
+#define CMICX_PDMA_CTRL(g, q)           (CMICX_GRP_BASE(g) + CMICX_PDMA_CTRLr + q * 0x80)
+/*! Status register address */
+#define CMICX_PDMA_STAT(g, q)           (CMICX_GRP_BASE(g) + CMICX_PDMA_STATr + q * 0x80)
+/*! Descriptor Address Lower register address */
+#define CMICX_PDMA_DESC_LO(g, q)        (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_LOr + q * 0x80)
+/*! Descriptor Address Higher register address */
+#define CMICX_PDMA_DESC_HI(g, q)        (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_HIr + q * 0x80)
+/*! Current Descriptor Address Lower register address */
+#define CMICX_PDMA_CURR_DESC_LO(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_CURR_DESC_LOr + q * 0x80)
+/*! Current Descriptor Address Higher register address */
+#define CMICX_PDMA_CURR_DESC_HI(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_CURR_DESC_HIr + q * 0x80)
+/*! Descriptor Halt Address Lower register address */
+#define CMICX_PDMA_DESC_HALT_LO(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_HALT_LOr + q * 0x80)
+/*! Descriptor Halt Address Higher register address */
+#define CMICX_PDMA_DESC_HALT_HI(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_HALT_HIr + q * 0x80)
+/*! COS Control Rx0 register address */
+#define CMICX_PDMA_COS_CTRL_RX0(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_COS_CTRL_RX0r + q * 0x80)
+/*! COS Control Rx1 register address */
+#define CMICX_PDMA_COS_CTRL_RX1(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_COS_CTRL_RX1r + q * 0x80)
+/*! Interrupt Coalesce register address */
+#define CMICX_PDMA_INTR_COAL(g, q)      (CMICX_GRP_BASE(g) + CMICX_PDMA_INTR_COALr + q * 0x80)
+/*! Rx Buffer Threshhold register address */
+#define CMICX_PDMA_RBUF_THRE(g, q)      (CMICX_GRP_BASE(g) + CMICX_PDMA_RBUF_THREr + q * 0x80)
+/*! Debug Control register address */
+#define CMICX_PDMA_DEBUG_CTRL(g, q)     (CMICX_GRP_BASE(g) + CMICX_PDMA_DEBUG_CTRLr + q * 0x80)
+/*! Debug Status register address */
+#define CMICX_PDMA_DEBUG_STAT(g, q)     (CMICX_GRP_BASE(g) + CMICX_PDMA_DEBUG_STATr + q * 0x80)
+/*! Debug State Machine Status register address */
+#define CMICX_PDMA_DEBUG_SM_STAT(g, q)  (CMICX_GRP_BASE(g) + CMICX_PDMA_DEBUG_SM_STATr + q * 0x80)
+/*! Rx Packet Count register address */
+#define CMICX_PDMA_COUNT_RX(g, q)       (CMICX_GRP_BASE(g) + CMICX_PDMA_COUNT_RXr + q * 0x80)
+/*! Tx Packet Count register address */
+#define CMICX_PDMA_COUNT_TX(g, q)       (CMICX_GRP_BASE(g) + CMICX_PDMA_COUNT_TXr + q * 0x80)
+/*! Dropped Rx Packet Count register address */
+#define CMICX_PDMA_COUNT_RX_DROP(g, q)  (CMICX_GRP_BASE(g) + CMICX_PDMA_COUNT_RX_DROPr + q * 0x80)
+/*! Requested Descriptor Count register address */
+#define CMICX_PDMA_DESC_CNT_REQ(g, q)   (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_CNT_REQr + q * 0x80)
+/*! Received Descriptor Count register address */
+#define CMICX_PDMA_DESC_CNT_RX(g, q)    (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_CNT_RXr + q * 0x80)
+/*! Updated Descriptor Count register address */
+#define CMICX_PDMA_DESC_CNT_STAT(g, q)  (CMICX_GRP_BASE(g) + CMICX_PDMA_DESC_CNT_STATr + q * 0x80)
+/*! Interrupt Status register address */
+#define CMICX_PDMA_IRQ_STAT(g)          (CMICX_GRP_BASE(g) + CMICX_PDMA_IRQ_STATr)
+/*! Interrupt Status Clear register address */
+#define CMICX_PDMA_IRQ_STAT_CLR(g)      (CMICX_GRP_BASE(g) + CMICX_PDMA_IRQ_STAT_CLRr)
+/*! Interrupt Enable register address0 */
+#define CMICX_PDMA_IRQ_ENAB0            0x18013100
+/*! Interrupt Enable register address1 */
+#define CMICX_PDMA_IRQ_ENAB1            0x18013104
+/*! Interrupt Enable register address2 */
+#define CMICX_PDMA_IRQ_ENAB2            0x18013108
+/*! Interrupt raw status register address0 */
+#define CMICX_PDMA_IRQ_RAW_STAT0        0x18013150
+/*! Interrupt raw status register address1 */
+#define CMICX_PDMA_IRQ_RAW_STAT1        0x18013154
+/*! Interrupt raw status register address2 */
+#define CMICX_PDMA_IRQ_RAW_STAT2        0x18013158
+/*! EP_TO_CPU Header Size register address */
+#define CMICX_EP_TO_CPU_HEADER_SIZE     0x00000004
+/*! Top config register address */
+#define CMICX_TOP_CONFIG                0x00000008
+/*! Credits release register address */
+#define CMICX_EPINTF_RELEASE_CREDITS    0x0000006c
+/*! Max credits register address */
+#define CMICX_EPINTF_MAX_CREDITS        0x00000070
+/*! \} */
+
+/*!
+ * \name Control register definitions
+ */
+/*! \{ */
+/*! Disable abort on error */
+#define CMICX_PDMA_NO_ABORT_ON_ERR      0x00002000
+/*! EP_TO_CPU header big endianess */
+#define CMICX_PDMA_HDR_BIG_ENDIAN       0x00001000
+/*! Continuous descriptor mode */
+#define CMICX_PDMA_CONTINUOUS_DESC      0x00000200
+/*! Continuous DMA mode */
+#define CMICX_PDMA_CONTINUOUS           0x00000100
+/*! Interrupt after descriptor */
+#define CMICX_PDMA_INTR_ON_DESC         0x00000080
+/*! Update status on reload */
+#define CMICX_PDMA_RLD_STAT_DIS         0x00000040
+/*! Dropped on chain end */
+#define CMICX_PDMA_DROP_ON_END          0x00000020
+/*! Descriptor big endianess */
+#define CMICX_PDMA_DESC_BIG_ENDIAN      0x00000010
+/*! Packet DMA big endianess */
+#define CMICX_PDMA_PKT_BIG_ENDIAN       0x00000008
+/*! Abort DMA */
+#define CMICX_PDMA_ABORT                0x00000004
+/*! Enable DMA */
+#define CMICX_PDMA_ENABLE               0x00000002
+/*! DMA direction */
+#define CMICX_PDMA_DIR                  0x00000001
+/*! EP_TO_CPU header alignment bytes */
+#define CMICX_PDMA_HDR_ALMNT(bytes)     (((bytes) & 0x3) << 10)
+/*! \} */
+
+/*!
+ * \name Status register definitions
+ */
+/*! \{ */
+/*! Channel in halt */
+#define CMICX_PDMA_IN_HALT              0x00000040
+/*! Channel active */
+#define CMICX_PDMA_IS_ACTIVE            0x00000002
+/*! Chain done */
+#define CMICX_PDMA_CHAIN_DONE           0x00000001
+/*! \} */
+
+/*!
+ * \name Interrupt_coalesce register definitions
+ */
+/*! \{ */
+/*! Interrupt coalesce enable */
+#define CMICX_PDMA_INTR_COAL_ENA        (1 << 31)
+/*! Interrupt coalesce threshhold */
+#define CMICX_PDMA_INTR_THRESH(cnt)     (((cnt) & 0x7fff) << 16)
+/*! Interrupt coalesce timeout */
+#define CMICX_PDMA_INTR_TIMER(tmr)      ((tmr) & 0xffff)
+/*! \} */
+
+/*!
+ * \name Interrupt status&clear register definitions
+ */
+/*! \{ */
+/*! Descriptor done */
+#define CMICX_PDMA_IRQ_DESC_DONE(q)     (0x00000001 << ((q) * 4))
+/*! Chain done */
+#define CMICX_PDMA_IRQ_CHAIN_DONE(q)    (0x00000002 << ((q) * 4))
+/*! Coalescing interrupt */
+#define CMICX_PDMA_IRQ_COALESCE_INTR(q) (0x00000004 << ((q) * 4))
+/*! Controlled interrupt */
+#define CMICX_PDMA_IRQ_CTRLD_INTR(q)    (0x00000008 << ((q) * 4))
+/*! Interrupt mask */
+#define CMICX_PDMA_IRQ_MASK(q)          (0xf << ((q) * 4))
+/*! Interrupt start number */
+#define CMICX_IRQ_START_NUM             (128 + 3)
+/*! Interrupt number offset */
+#define CMICX_IRQ_NUM_OFFSET            4
+/*! Interrupt mask shift */
+#define CMICX_IRQ_MASK_SHIFT            16
+/*! \} */
+
+/*! 32-bit register read */
+#define DEV_READ32(_c, _a, _p) \
+    do { \
+        if ((_c)->dev->mode != DEV_MODE_VNET) { \
+            *(_p) = ((volatile uint32_t *)(_c)->hw_addr)[(_a) / 4]; \
+        } \
+    } while (0)
+
+/*! 32-bit register write */
+#define DEV_WRITE32(_c, _a, _v) \
+    do { \
+        if ((_c)->dev->mode != DEV_MODE_VNET) { \
+            ((volatile uint32_t *)(_c)->hw_addr)[(_a) / 4] = (_v); \
+        } \
+    } while (0)
+
+/*!
+ * \brief Rx descriptor.
+ */
+struct cmicx_rx_desc {
+    /*! Packet address lower */
+    volatile uint32_t addr_lo;
+
+    /*! Packet address higher */
+    volatile uint32_t addr_hi;
+
+    /*! Packet control */
+    volatile uint32_t ctrl;
+
+    /*! Packet status */
+    volatile uint32_t status;
+} __attribute__((packed));
+
+/*!
+ * \brief Tx descriptor.
+ */
+struct cmicx_tx_desc {
+    /*! Packet address lower */
+    volatile uint32_t addr_lo;
+
+    /*! Packet address higher */
+    volatile uint32_t addr_hi;
+
+    /*! Packet control */
+    volatile uint32_t ctrl;
+
+    /*! Packet status */
+    volatile uint32_t status;
+} __attribute__((packed));
+
+/*!
+ * Flags related to descriptors.
+ */
+/*! Disable descriptor status write */
+#define CMICX_DESC_CTRL_STAT_WR_DIS     (1 << 29)
+/*! Descriptors remaining */
+#define CMICX_DESC_CTRL_REMAIN(cnt)     (((cnt) & 0xf) << 25)
+/*! Max remaining descriptors */
+#define CMICX_DESC_REMAIN_MAX           8
+/*! Controlled interrupt */
+#define CMICX_DESC_CTRL_CNTLD_INTR      (1 << 24)
+/*! Completed interrupt */
+#define CMICX_DESC_CTRL_CMPLT_INTR      (1 << 23)
+/*! Reload DCB */
+#define CMICX_DESC_CTRL_RELOAD          (1 << 18)
+/*! Scatter DCB */
+#define CMICX_DESC_CTRL_SCATTER         (1 << 17)
+/*! Chained DCB */
+#define CMICX_DESC_CTRL_CHAIN           (1 << 16)
+/*! Control flags */
+#define CMICX_DESC_CTRL_FLAGS(f)        (((f) & 0xffff) << 16)
+/*! Purge packet */
+#define CMICX_DESC_TX_PURGE_PKT         (1 << 6)
+/*! Higig packet */
+#define CMICX_DESC_TX_HIGIG_PKT         (1 << 3)
+/*! Packet length */
+#define CMICX_DESC_CTRL_LEN(len)        ((len) & 0xffff)
+/*! Done */
+#define CMICX_DESC_STAT_RTX_DONE        (1 << 31)
+/*! Ecc error */
+#define CMICX_DESC_STAT_DATA_ERR        (1 << 19)
+/*! Cell error */
+#define CMICX_DESC_STAT_CELL_ERR        (1 << 18)
+/*! Error mask */
+#define CMICX_DESC_STAT_ERR_MASK        (CMICX_DESC_STAT_DATA_ERR | \
+                                         CMICX_DESC_STAT_CELL_ERR)
+/*! Packet start */
+#define CMICX_DESC_STAT_PKT_START       (1 << 17)
+/*! Packet end */
+#define CMICX_DESC_STAT_PKT_END         (1 << 16)
+/*! Get done state */
+#define CMICX_DESC_STAT_DONE(stat)      ((stat) & CMICX_DESC_STAT_RTX_DONE)
+/*! Get flags */
+#define CMICX_DESC_STAT_FLAGS(stat)     (((stat) >> 16) & ~0x8003)
+/*! Get packet length */
+#define CMICX_DESC_STAT_LEN(stat)       ((stat) & 0xffff)
+
+/*! Tx packet header size */
+#define CMICX_TX_PKT_HDR_SIZE           16
+
+/*! HW access retry times */
+#define CMICX_HW_RETRY_TIMES            100000
+
+/*!
+ * \brief Initialize HW handles.
+ *
+ * \param [in] hw HW structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicx_pdma_hw_hdls_init(struct pdma_hw *hw);
+
+/*!
+ * \brief Initialize descriptor operations.
+ *
+ * \param [in] hw HW structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicx_pdma_desc_ops_init(struct pdma_hw *hw);
+
+/*!
+ * \brief Attach device driver.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicx_pdma_driver_attach(struct pdma_dev *dev);
+
+/*!
+ * \brief Detach device driver.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_cmicx_pdma_driver_detach(struct pdma_dev *dev);
+
+#endif /* BCMCNET_CMICX_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
new file mode 100644
index 000000000000..13db809dda36
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
@@ -0,0 +1,1323 @@
+/*! \file bcmcnet_core.h
+ *
+ * Generic data structure definitions and APIs for BCMCNET driver.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_CORE_H
+#define BCMCNET_CORE_H
+
+#include <bcmcnet/bcmcnet_types.h>
+#include <bcmcnet/bcmcnet_internal.h>
+
+/*!
+ * \brief Packet header structure.
+ */
+struct pkt_hdr {
+    /*! Meta data or outer header */
+    uint8_t meta_data[16];
+
+    /*! Reserved */
+    uint16_t rsvd0;
+
+    /*! Packet signature */
+    uint16_t pkt_sig;
+
+    /*! Reserved */
+    uint32_t rsvd1;
+
+    /*! Data length */
+    uint16_t data_len;
+
+    /*! Reserved */
+    uint16_t rsvd2;
+
+    /*! Meta length */
+    uint8_t meta_len;
+
+    /*! Queue index */
+    uint8_t queue_id;
+
+    /*! Attributes */
+    uint16_t attrs;
+    /*! Tx higig packet */
+#define PDMA_TX_HIGIG_PKT   (1 << 0)
+    /*! Tx pause packet */
+#define PDMA_TX_PAUSE_PKT   (1 << 1)
+    /*! Tx purge packet */
+#define PDMA_TX_PURGE_PKT   (1 << 2)
+    /*! Tx queue number */
+#define PDMA_TX_BIND_QUE    (1 << 3)
+    /*! Tx cookded header */
+#define PDMA_TX_HDR_COOKED  (1 << 4)
+    /*! Tx to HNET */
+#define PDMA_TX_TO_HNET     (1 << 5)
+    /*! Rx to VNET */
+#define PDMA_RX_TO_VNET     (1 << 10)
+    /*! Rx strip vlan tag */
+#define PDMA_RX_STRIP_TAG   (1 << 11)
+    /*! Rx set protocol type */
+#define PDMA_RX_SET_PROTO   (1 << 12)
+    /*! Rx IP checksum */
+#define PDMA_RX_IP_CSUM     (1 << 13)
+    /*! Rx TCPUDP checksum */
+#define PDMA_RX_TU_CSUM     (1 << 14)
+};
+
+/*! Packet header size */
+#define PKT_HDR_SIZE        sizeof(struct pkt_hdr)
+
+/*!
+ * \brief Packet buffer structure.
+ */
+struct pkt_buf {
+    /*! Packet header */
+    struct pkt_hdr pkh;
+
+    /*! Packet data */
+    uint8_t data;
+};
+
+/*!
+ * \brief Interrupt handle.
+ */
+struct intr_handle {
+    /*! Device number */
+    int unit;
+
+    /*! Group number */
+    int group;
+
+    /*! Channel number */
+    int chan;
+
+    /*! Queue number */
+    int queue;
+
+    /*! Direction */
+    int dir;
+
+    /*! Polling budget */
+    int budget;
+
+    /*! Device point */
+    void *dev;
+
+    /*! Private point */
+    void *priv;
+
+    /*! Interrupt number */
+    int intr_num;
+
+    /*! Interrupt flags */
+    uint32_t intr_flags;
+};
+
+/*!
+ * \brief Queue group structure.
+ */
+struct queue_group {
+    /*! Pointer to the device control structure */
+    struct dev_ctrl *ctrl;
+
+    /*! Interrupt handles */
+    struct intr_handle intr_hdl[NUM_Q_PER_GRP];
+
+    /*! Rx queue pointers */
+    void *rx_queue[NUM_Q_PER_GRP];
+
+    /*! Tx queue pointers */
+    void *tx_queue[NUM_Q_PER_GRP];
+
+    /*! Virtual Rx queue pointers */
+    void *vnet_rxq[NUM_Q_PER_GRP];
+
+    /*! Virtual Tx queue pointers */
+    void *vnet_txq[NUM_Q_PER_GRP];
+
+    /*! Bitmap for Rx queues at work */
+    uint32_t bm_rxq;
+
+    /*! Bitmap for Tx queues at work */
+    uint32_t bm_txq;
+
+    /*! Number of Rx queues at work */
+    uint32_t nb_rxq;
+
+    /*! Number of Tx queues at work */
+    uint32_t nb_txq;
+
+    /*! Number of descriptors */
+    uint32_t nb_desc[NUM_Q_PER_GRP];
+
+    /*! Rx buffer size */
+    uint32_t rx_size[NUM_Q_PER_GRP];
+
+    /*! Queue mode */
+    uint32_t que_ctrl[NUM_Q_PER_GRP];
+    /*! Packet_byte_swap */
+#define PDMA_PKT_BYTE_SWAP  (1 << 0)
+    /*! Non packet_byte_swap */
+#define PDMA_OTH_BYTE_SWAP  (1 << 1)
+    /*! Header_byte_swap */
+#define PDMA_HDR_BYTE_SWAP  (1 << 2)
+
+    /*! Group ID */
+    int id;
+
+    /*! Queues need to poll */
+    uint32_t poll_queues;
+
+    /*! Active IRQs for DMA control */
+    uint32_t irq_mask;
+
+    /*! Indicating the group is attached */
+    int attached;
+};
+
+/*!
+ * \brief Device control structure.
+ */
+struct dev_ctrl {
+    /*! Pointer to the device structure */
+    struct pdma_dev *dev;
+
+    /*! Pointer to hardware-specific data */
+    void *hw;
+
+    /*! HW base address */
+    volatile void *hw_addr;
+
+    /*! Queue groups */
+    struct queue_group grp[NUM_GRP_MAX];
+
+    /*! Pointers to Rx queues */
+    void *rx_queue[NUM_QUE_MAX];
+
+    /*! Pointers to Tx queues */
+    void *tx_queue[NUM_QUE_MAX];
+
+    /*! Pointers to virtual Rx queues */
+    void *vnet_rxq[NUM_QUE_MAX];
+
+    /*! Pointers to virtual Tx queues */
+    void *vnet_txq[NUM_QUE_MAX];
+
+    /*! Pointer to buffer manager */
+    void *buf_mngr;
+
+    /*! VNET sync data */
+    vnet_sync_t vsync;
+
+    /*! Bitmap of groups at work */
+    uint32_t bm_grp;
+
+    /*! Bitmap of Rx queues at work */
+    uint32_t bm_rxq;
+
+    /*! Bitmap of Tx queues at work */
+    uint32_t bm_txq;
+
+    /*! Number of groups at work */
+    uint32_t nb_grp;
+
+    /*! Number of Rx queues at work */
+    uint32_t nb_rxq;
+
+    /*! Number of Tx queues at work */
+    uint32_t nb_txq;
+
+    /*! Number of descriptors for a queue */
+    uint32_t nb_desc;
+
+    /*! Budget for once queue processing */
+    uint32_t budget;
+
+    /*! Common Rx buffer size for all queues */
+    uint32_t rx_buf_size;
+
+    /*! Rx descriptor size */
+    uint32_t rx_desc_size;
+
+    /*! Tx descriptor size */
+    uint32_t tx_desc_size;
+};
+
+/*!
+ * Configure device.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] bm_rxq Rx queue bitmap.
+ * \param [in] bm_txq Tx queue bitmap.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_config_f)(struct pdma_dev *dev, uint32_t bm_rxq, uint32_t bm_txq);
+
+/*!
+ * Start device.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_start_f)(struct pdma_dev *dev);
+
+/*!
+ * Stop device.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_stop_f)(struct pdma_dev *dev);
+
+/*!
+ * Close device.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_close_f)(struct pdma_dev *dev);
+
+/*!
+ * Suspend device.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_suspend_f)(struct pdma_dev *dev);
+
+/*!
+ * Resume device.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_resume_f)(struct pdma_dev *dev);
+
+/*!
+ * Get device information.
+ *
+ * \param [in] dev Pointer to device structure.
+ */
+typedef void (*pdma_dev_info_get_f)(struct pdma_dev *dev);
+
+/*!
+ * Get device statistics.
+ *
+ * \param [in] dev Pointer to device structure.
+ */
+typedef void (*pdma_dev_stats_get_f)(struct pdma_dev *dev);
+
+/*!
+ * Reset device statistics.
+ *
+ * \param [in] dev Pointer to device structure.
+ */
+typedef void (*pdma_dev_stats_reset_f)(struct pdma_dev *dev);
+
+/*!
+ * Convert logic queue to physical queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Logic queue number.
+ * \param [in] dir Transmit direction.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_lq2pq_f)(struct pdma_dev *dev, int queue, int dir, int *chan);
+
+/*!
+ * Convert physical queue to logic queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] chan Channel number.
+ * \param [in] queue Logic queue number.
+ * \param [in] dir Transmit direction.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_dev_pq2lq_f)(struct pdma_dev *dev, int chan, int *queue, int *dir);
+
+/*!
+ * Start queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_queue_start_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Stop queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_queue_stop_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Set up queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_queue_setup_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Release queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_queue_release_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Restore queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_queue_restore_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Enable queue interrupt.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_intr_enable_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Disable queue interrupt.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_intr_disable_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Acknowledge queue interrupt.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_intr_ack_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Query queue interrupt.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_intr_query_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Check queue interrupt.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_intr_check_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Suspend Rx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_rx_queue_suspend_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Resume Rx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_rx_queue_resume_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Wake up Tx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_tx_queue_wakeup_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Poll Rx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ * \param [in] budget Max number of descriptor to poll.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_rx_queue_poll_f)(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * Poll Tx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ * \param [in] budget Max number of descriptor to poll.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_tx_queue_poll_f)(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * Poll queue group.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Queue number.
+ * \param [in] budget Max number of descriptor to poll.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pdma_group_poll_f)(struct pdma_dev *dev, int group, int budget);
+
+/*!
+ * \brief Exported functions structure.
+ */
+struct dev_ops {
+    /*! Configure device */
+    pdma_dev_config_f           dev_config;
+
+    /*! Start device */
+    pdma_dev_start_f            dev_start;
+
+    /*! Stop device */
+    pdma_dev_stop_f             dev_stop;
+
+    /*! Close device */
+    pdma_dev_close_f            dev_close;
+
+    /*! Suspend device */
+    pdma_dev_suspend_f          dev_suspend;
+
+    /*! Resume device */
+    pdma_dev_resume_f           dev_resume;
+
+    /*! Get device information */
+    pdma_dev_info_get_f         dev_info_get;
+
+    /*! Get device statistics */
+    pdma_dev_stats_get_f        dev_stats_get;
+
+    /*! Reset device statistics */
+    pdma_dev_stats_reset_f      dev_stats_reset;
+
+    /*! Logic queue to physical queue */
+    pdma_dev_lq2pq_f            dev_lq_to_pq;
+
+    /*! Physical queue to logic queue */
+    pdma_dev_pq2lq_f            dev_pq_to_lq;
+
+    /*! Start Rx for a queue */
+    pdma_queue_start_f          rx_queue_start;
+
+    /*! Stop Rx for a queue */
+    pdma_queue_stop_f           rx_queue_stop;
+
+    /*! Start Tx for a queue */
+    pdma_queue_start_f          tx_queue_start;
+
+    /*! Stop Tx for a queue */
+    pdma_queue_stop_f           tx_queue_stop;
+
+    /*! Set up Rx queue */
+    pdma_queue_setup_f          rx_queue_setup;
+
+    /*! Release Rx queue */
+    pdma_queue_release_f        rx_queue_release;
+
+    /*! Restore stopped Rx queue */
+    pdma_queue_restore_f        rx_queue_restore;
+
+    /*! Set up virtual Rx queue */
+    pdma_queue_setup_f          rx_vqueue_setup;
+
+    /*! Release virtual Rx queue */
+    pdma_queue_release_f        rx_vqueue_release;
+
+    /*! Set up Tx queue */
+    pdma_queue_setup_f          tx_queue_setup;
+
+    /*! Release Tx queue */
+    pdma_queue_release_f        tx_queue_release;
+
+    /*! Restore stopped Tx queue */
+    pdma_queue_restore_f        tx_queue_restore;
+
+    /*! Set up virtual Tx queue */
+    pdma_queue_setup_f          tx_vqueue_setup;
+
+    /*! Release virtual Tx queue */
+    pdma_queue_release_f        tx_vqueue_release;
+
+    /*! Enable Rx queue interrupt */
+    pdma_intr_enable_f          rx_queue_intr_enable;
+
+    /*! Disable Rx queue interrupt */
+    pdma_intr_disable_f         rx_queue_intr_disable;
+
+    /*! Acknowledge interrupt for Rx queue */
+    pdma_intr_ack_f             rx_queue_intr_ack;
+
+    /*! Query interrupt status for Rx queue */
+    pdma_intr_query_f           rx_queue_intr_query;
+
+    /*! Check interrupt validity for Rx queue */
+    pdma_intr_check_f           rx_queue_intr_check;
+
+    /*! Enable Tx queue interrupt */
+    pdma_intr_enable_f          tx_queue_intr_enable;
+
+    /*! Disable Tx queue interrupt */
+    pdma_intr_disable_f         tx_queue_intr_disable;
+
+    /*! Acknowledge interrupt for Tx queue */
+    pdma_intr_ack_f             tx_queue_intr_ack;
+
+    /*! Query interrupt status for Tx queue */
+    pdma_intr_query_f           tx_queue_intr_query;
+
+    /*! Check interrupt validity for Tx queue */
+    pdma_intr_check_f           tx_queue_intr_check;
+
+    /*! Suspend a Rx queue */
+    pdma_rx_queue_suspend_f     rx_queue_suspend;
+
+    /*! Resume a Rx queue */
+    pdma_rx_queue_resume_f      rx_queue_resume;
+
+    /*! Wake up a Tx queue to transmit */
+    pdma_tx_queue_wakeup_f      tx_queue_wakeup;
+
+    /*! Poll for a Rx queue */
+    pdma_rx_queue_poll_f        rx_queue_poll;
+
+    /*! Poll for a Tx queue */
+    pdma_tx_queue_poll_f        tx_queue_poll;
+
+    /*! Poll for a group */
+    pdma_group_poll_f           group_poll;
+};
+
+/*!
+ * Read 32-bit device register.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] addr Register address.
+ * \param [in] data Pointer to read data.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*reg32_read_f)(struct pdma_dev *dev, uint32_t addr, uint32_t *data);
+
+/*!
+ * Write 32-bit device register.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] addr Register address.
+ * \param [in] data Data to write.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*reg32_write_f)(struct pdma_dev *dev, uint32_t addr, uint32_t data);
+
+/*!
+ * Receive packet.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Rx queue number.
+ * \param [in] buf Pointer to packet buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*pdma_rx_f)(struct pdma_dev *dev, int queue, void *buf);
+
+/*!
+ * Transmit packet.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Tx queue number.
+ * \param [in] buf Pointer to packet buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*pdma_tx_f)(struct pdma_dev *dev, int queue, void *buf);
+
+/*!
+ * Suspend Tx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Tx queue number.
+ */
+typedef void (*sys_tx_suspend_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Resume Tx queue.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] queue Tx queue number.
+ */
+typedef void (*sys_tx_resume_f)(struct pdma_dev *dev, int queue);
+
+/*!
+ * Enable interrupts.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] group Channel group number.
+ * \param [in] chan Channel number.
+ * \param [in] reg Interrupt enable register.
+ * \param [in] mask Interrupt mask.
+ */
+typedef void (*sys_intr_unmask_f)(struct pdma_dev *dev, int group, int chan,
+                                  uint32_t reg, uint32_t mask);
+
+/*!
+ * Disable interrupts.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] group Channel group number.
+ * \param [in] chan Channel number.
+ * \param [in] reg Interrupt enable register.
+ * \param [in] mask Interrupt mask.
+ */
+typedef void (*sys_intr_mask_f)(struct pdma_dev *dev, int group, int chan,
+                                uint32_t reg, uint32_t mask);
+
+/*!
+ * Wait for notification from the other side.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*xnet_wait_f)(struct pdma_dev *dev);
+
+/*!
+ * Wake up the other side.
+ *
+ * \param [in] dev Pointer to device structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*xnet_wake_f)(struct pdma_dev *dev);
+
+/*!
+ * Convert physical address to virtual address.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] paddr Physical address.
+ *
+ * \retval Virtual address.
+ */
+typedef void *(*sys_p2v_f)(struct pdma_dev *dev, uint64_t paddr);
+
+/*!
+ * Convert virtual address to physical address.
+ *
+ * \param [in] dev Pointer to device structure.
+ * \param [in] vaddr Virtual address.
+ *
+ * \retval Physical address.
+ */
+typedef uint64_t (*sys_v2p_f)(struct pdma_dev *dev, void *vaddr);
+
+/*!
+ * \brief Device structure.
+ */
+struct pdma_dev {
+    /*! Device name */
+    char name[DEV_NAME_LEN_MAX];
+
+    /*! Device ID */
+    uint32_t dev_id;
+
+    /*! Device type */
+    uint32_t dev_type;
+
+    /*! Device Number */
+    int unit;
+
+    /*! Device control structure */
+    struct dev_ctrl ctrl;
+
+    /*! Pointer to the exported funtions structure */
+    struct dev_ops *ops;
+
+    /*! Device information */
+    struct bcmcnet_dev_info info;
+
+    /*! Device statistics data */
+    struct bcmcnet_dev_stats stats;
+
+    /*! Private data */
+    void *priv;
+
+    /*! Read 32-bit device register */
+    reg32_read_f dev_read32;
+
+    /*! Write 32-bit device register */
+    reg32_write_f dev_write32;
+
+    /*! Packet reception */
+    pdma_rx_f pkt_recv;
+
+    /*! Packet transmission */
+    pdma_tx_f pkt_xmit;
+
+    /*! Tx suspend */
+    sys_tx_suspend_f tx_suspend;
+
+    /*! Tx resume */
+    sys_tx_resume_f tx_resume;
+
+    /*! Enable a set of interrupts */
+    sys_intr_unmask_f intr_unmask;
+
+    /*! Disable a set of interrupts */
+    sys_intr_mask_f intr_mask;
+
+    /*! Virtual network wait for */
+    xnet_wait_f xnet_wait;
+
+    /*! Virtual network wake up */
+    xnet_wake_f xnet_wake;
+
+    /*! Physical address to virtual address */
+    sys_p2v_f sys_p2v;
+
+    /*! Virtual address to physical address */
+    sys_v2p_f sys_v2p;
+
+    /*! Maximum number of groups */
+    int num_groups;
+
+    /*! Maximum number of group queues */
+    int grp_queues;
+
+    /*! Maximum number of queues */
+    int num_queues;
+
+    /*! Rx packet header size */
+    uint32_t rx_ph_size;
+
+    /*! Tx packet header size */
+    uint32_t tx_ph_size;
+
+    /*! Flags */
+    uint32_t flags;
+    /*! Interrupt processing per group */
+#define PDMA_GROUP_INTR     (1 << 0)
+    /*! Tx polling mode */
+#define PDMA_TX_POLLING     (1 << 1)
+    /*! Rx batch refilling */
+#define PDMA_RX_BATCHING    (1 << 2)
+    /*! DMA chain mode */
+#define PDMA_CHAIN_MODE     (1 << 3)
+    /*! Descriptor prefetch mode */
+#define PDMA_DESC_PREFETCH  (1 << 4)
+    /*! VNET is docked */
+#define PDMA_VNET_DOCKED    (1 << 5)
+
+    /*! Device mode */
+    dev_mode_t mode;
+
+    /*! Device is started */
+    int started;
+
+    /*! Device is initialized and HMI driver is attached */
+    int attached;
+};
+
+/*!
+ * \brief Initialize device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_init(struct pdma_dev *dev);
+
+/*!
+ * \brief Clean up device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_cleanup(struct pdma_dev *dev);
+
+/*!
+ * \brief Start device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_start(struct pdma_dev *dev);
+
+/*!
+ * \brief Stop device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_stop(struct pdma_dev *dev);
+
+/*!
+ * \brief Suspend device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_suspend(struct pdma_dev *dev);
+
+/*!
+ * \brief Resume device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_resume(struct pdma_dev *dev);
+
+/*!
+ * \brief Suspend device Rx.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_rx_suspend(struct pdma_dev *dev);
+
+/*!
+ * \brief Resume device Rx.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_rx_resume(struct pdma_dev *dev);
+
+/*!
+ * \brief Dock device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_dock(struct pdma_dev *dev);
+
+/*!
+ * \brief Undock device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_undock(struct pdma_dev *dev);
+
+/*!
+ * \brief Get device information.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_info_get(struct pdma_dev *dev);
+
+/*!
+ * \brief Get device statistics.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_stats_get(struct pdma_dev *dev);
+
+/*!
+ * \brief Reset device statistics.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_stats_reset(struct pdma_dev *dev);
+
+/*!
+ * \brief Change queue number to channel number.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Queue number.
+ * \param [in] dir Transmit direction.
+ * \param [out] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_queue_to_chan(struct pdma_dev *dev, int queue, int dir, int *chan);
+
+/*!
+ * \brief Change channel number to queue number.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] chan Channel number.
+ * \param [out] queue Queue number.
+ * \param [out] dir Transmit direction.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_dev_chan_to_queue(struct pdma_dev *dev, int chan, int *queue, int *dir);
+
+/*!
+ * \brief Enable Rx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_rx_queue_intr_enable(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Disable Rx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_rx_queue_intr_disable(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Acknowledge Rx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_rx_queue_intr_ack(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Check Rx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_rx_queue_intr_check(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Enable Tx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_tx_queue_intr_enable(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Disable Tx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_tx_queue_intr_disable(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Acknowledge Tx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_tx_queue_intr_ack(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Check Tx queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_tx_queue_intr_check(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Enable queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] hdl Queue interrupt handle.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_queue_intr_enable(struct pdma_dev *dev, struct intr_handle *hdl);
+
+/*!
+ * \brief Disable queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] hdl Queue interrupt handle.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_queue_intr_disable(struct pdma_dev *dev, struct intr_handle *hdl);
+
+/*!
+ * \brief Acknowledge queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] hdl Queue interrupt handle.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_queue_intr_ack(struct pdma_dev *dev, struct intr_handle *hdl);
+
+/*!
+ * \brief Check queue interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] hdl Queue interrupt handle.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_queue_intr_check(struct pdma_dev *dev, struct intr_handle *hdl);
+
+/*!
+ * \brief Enable group interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_group_intr_enable(struct pdma_dev *dev, int group);
+
+/*!
+ * \brief Disable group interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_group_intr_disable(struct pdma_dev *dev, int group);
+
+/*!
+ * \brief Acknowledge group interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_group_intr_ack(struct pdma_dev *dev, int group);
+
+/*!
+ * \brief Check group interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_group_intr_check(struct pdma_dev *dev, int group);
+
+/*!
+ * \brief Poll Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_rx_queue_poll(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * \brief Poll Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_tx_queue_poll(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * \brief Poll queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] hdl Queue interrupt handle.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_queue_poll(struct pdma_dev *dev, struct intr_handle *hdl, int budget);
+
+/*!
+ * \brief Poll group.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_group_poll(struct pdma_dev *dev, int group, int budget);
+
+#endif /* BCMCNET_CORE_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_dev.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_dev.h
new file mode 100644
index 000000000000..bc3367b34fae
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_dev.h
@@ -0,0 +1,544 @@
+/*! \file bcmcnet_dev.h
+ *
+ * Generic data structure and macro definitions for BCMCNET device.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_DEV_H
+#define BCMCNET_DEV_H
+
+#include <bcmcnet/bcmcnet_rxtx.h>
+
+/*!
+ * \brief HW information.
+ */
+struct hw_info {
+    /*! HW name */
+    char *name;
+
+    /*! HW version */
+    int ver_no;
+
+    /*! Device ID */
+    uint32_t dev_id;
+
+    /*! Revision ID */
+    uint32_t rev_id;
+
+    /*! Number of CMCs */
+    uint32_t num_cmcs;
+
+    /*! Number of CMC channels */
+    uint32_t cmc_chans;
+
+    /*! Number of channels */
+    uint32_t num_chans;
+
+    /*! Rx DCB size */
+    uint32_t rx_dcb_size;
+
+    /*! Tx DCB size */
+    uint32_t tx_dcb_size;
+
+    /*! Rx packet header size */
+    uint32_t rx_ph_size;
+
+    /*! Tx packet header size */
+    uint32_t tx_ph_size;
+
+    /*! HW structure point */
+    struct pdma_hw *hw;
+};
+
+/*!
+ * \brief Read 32-bit register.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] addr Register address.
+ * \param [in] data Pointer to read data.
+ */
+typedef void (*reg_rd32_f)(struct pdma_hw *hw, uint32_t addr, uint32_t *data);
+
+/*!
+ * \brief Write 32-bit register.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] addr Register address.
+ * \param [in] data Data to write.
+ */
+typedef void (*reg_wr32_f)(struct pdma_hw *hw, uint32_t addr, uint32_t data);
+
+/*!
+ * \brief Pre-initialize hardware.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*pre_init_f)(struct pdma_hw *hw);
+
+/*!
+ * \brief Initialize hardware.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*hw_init_f)(struct pdma_hw *hw);
+
+/*!
+ * \brief Configure hardware.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*hw_config_f)(struct pdma_hw *hw);
+
+/*!
+ * \brief Reset hardware.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*hw_reset_f)(struct pdma_hw *hw);
+
+/*!
+ * \brief Start channel.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_start_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Stop channel.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_stop_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Set up channel.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ * \param [in] addr Start DMA address of descriptors.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_setup_f)(struct pdma_hw *hw, int chan, uint64_t addr);
+
+/*!
+ * \brief Go to ohter descriptor.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ * \param [in] addr Destination DMA address of descriptors.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_goto_f)(struct pdma_hw *hw, int chan, uint64_t addr);
+
+/*!
+ * \brief Clear channel.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_clear_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Get interrupt number.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval Returned interrupt number, errors if negative value.
+ */
+typedef int (*chan_intr_num_get_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Enable interrupt.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_intr_enable_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Disable interrupt.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_intr_disable_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Query interrupt.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_intr_query_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Check interrupt.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_intr_check_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief Coalesce interrupt.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ * \param [in] count Count value to trigger interrupt.
+ * \param [in] timer Timer value to triggre interrupt.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_intr_coalesce_f)(struct pdma_hw *hw, int chan, int count, int timer);
+
+/*!
+ * \brief Dump registers.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] chan Channel number.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*chan_reg_dump_f)(struct pdma_hw *hw, int chan);
+
+/*!
+ * \brief HW handlers.
+ */
+struct hw_handlers {
+    /*! 32 bits register read */
+    reg_rd32_f reg_rd32;
+
+    /*! 32 bits register write */
+    reg_wr32_f reg_wr32;
+
+    /*! HW pre-initialize */
+    pre_init_f pre_init;
+
+    /*! HW initialize */
+    hw_init_f hw_init;
+
+    /*! HW configure */
+    hw_config_f hw_config;
+
+    /*! HW reset */
+    hw_reset_f hw_reset;
+
+    /*! Channel start */
+    chan_start_f chan_start;
+
+    /*! Channel stop */
+    chan_stop_f chan_stop;
+
+    /*! Channel setup */
+    chan_setup_f chan_setup;
+
+    /*! Channel goto */
+    chan_goto_f chan_goto;
+
+    /*! Channel clear */
+    chan_clear_f chan_clear;
+
+    /*! Channel interrupt number get */
+    chan_intr_num_get_f chan_intr_num_get;
+
+    /*! Channel interrupt enable */
+    chan_intr_enable_f chan_intr_enable;
+
+    /*! Channel interrupt disable */
+    chan_intr_disable_f chan_intr_disable;
+
+    /*! Channel interrupt query */
+    chan_intr_query_f chan_intr_query;
+
+    /*! Channel interrupt check */
+    chan_intr_check_f chan_intr_check;
+
+    /*! Channel interrupt coalesce */
+    chan_intr_coalesce_f chan_intr_coalesce;
+
+    /*! Channel registers dump */
+    chan_reg_dump_f chan_reg_dump;
+};
+
+/*!
+ * \brief Initialize Rx descriptor.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_MEMORY Allocation failed.
+ */
+typedef int (*rx_desc_init_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Clean up Rx descriptor.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*rx_desc_clean_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Clean up Rx ring.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] budget Budget for each operation.
+ *
+ * \retval Number of descriptors finished.
+ */
+typedef int (*rx_ring_clean_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq, int budget);
+
+/*!
+ * \brief Dump Rx ring.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*rx_ring_dump_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Suspend Rx queue.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*rx_suspend_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Resume Rx queue.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*rx_resume_f)(struct pdma_hw *hw, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Initialize Tx descriptor.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] txq Pointer to Tx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_MEMORY Allocation failed.
+ */
+typedef int (*tx_desc_init_f)(struct pdma_hw *hw, struct pdma_tx_queue *txq);
+
+/*!
+ * \brief Clean up Tx descriptor.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] txq Pointer to Tx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*tx_desc_clean_f)(struct pdma_hw *hw, struct pdma_tx_queue *txq);
+
+/*!
+ * \brief Clean up Tx ring.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] txq Pointer to Tx queue struture.
+ * \param [in] budget Budget for each operation.
+ *
+ * \retval Number of descriptors finished.
+ */
+typedef int (*tx_ring_clean_f)(struct pdma_hw *hw, struct pdma_tx_queue *txq, int budget);
+
+/*!
+ * \brief Dump Tx ring.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] txq Pointer to Tx queue struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+typedef int (*tx_ring_dump_f)(struct pdma_hw *hw, struct pdma_tx_queue *txq);
+
+/*!
+ * \brief Transmit packet.
+ *
+ * \param [in] hw Pointer to hardware structure.
+ * \param [in] txq Pointer to Tx queue struture.
+ * \param [in] buf Pointer to packet buffer struture.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+typedef int (*pkt_xmit_f)(struct pdma_hw *hw, struct pdma_tx_queue *txq, void *buf);
+
+/*!
+ * \brief Descriptor operations.
+ */
+struct desc_operations {
+    /*! Rx descriptor initialize */
+    rx_desc_init_f rx_desc_init;
+
+    /*! Rx descriptor cleanup */
+    rx_desc_clean_f rx_desc_clean;
+
+    /*! Rx ring cleanup */
+    rx_ring_clean_f rx_ring_clean;
+
+    /*! Rx ring dump */
+    rx_ring_dump_f rx_ring_dump;
+
+    /*! Rx suspend */
+    rx_suspend_f rx_suspend;
+
+    /*! Rx resume */
+    rx_resume_f rx_resume;
+
+    /*! Tx descriptor initialize */
+    tx_desc_init_f tx_desc_init;
+
+    /*! Tx descriptor cleanup */
+    tx_desc_clean_f tx_desc_clean;
+
+    /*! Tx ring cleanup */
+    tx_ring_clean_f tx_ring_clean;
+
+    /*! Tx ring dump */
+    tx_ring_dump_f tx_ring_dump;
+
+    /*! Tx transmit */
+    pkt_xmit_f pkt_xmit;
+};
+
+/*!
+ * \brief HW structure.
+ */
+struct pdma_hw {
+    /*! Device number */
+    int unit;
+
+    /*! Device structure point */
+    struct pdma_dev *dev;
+
+    /*! HW information */
+    struct hw_info info;
+
+    /*! HW handlers */
+    struct hw_handlers hdls;
+
+    /*! HW operations */
+    struct desc_operations dops;
+};
+
+/*!
+ * \brief Open device.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_open(struct pdma_dev *dev);
+
+/*!
+ * \brief Coalesce Rx interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ * \param [in] count Interrupt threshhold.
+ * \param [in] timer Timer value.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_int_coalesce(struct pdma_dev *dev, int queue, int count, int timer);
+
+/*!
+ * \brief Coalesce Tx interrupt.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ * \param [in] count Interrupt threshhold.
+ * \param [in] timer Timer value.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_int_coalesce(struct pdma_dev *dev, int queue, int count, int timer);
+
+/*!
+ * \brief Dump Rx queue registers.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_reg_dump(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Dump Tx queue registers.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_reg_dump(struct pdma_dev *dev, int queue);
+
+#endif /* BCMCNET_DEV_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_internal.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_internal.h
new file mode 100644
index 000000000000..e4b2051a34bc
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_internal.h
@@ -0,0 +1,305 @@
+/*! \file bcmcnet_internal.h
+ *
+ * BCMCNET internal data structure and macro definitions.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_INTERNAL_H
+#define BCMCNET_INTERNAL_H
+
+#include <bcmcnet/bcmcnet_dev.h>
+
+/*! CMICD name */
+#define CMICD_DEV_NAME      "cmicd"
+
+/*! CMICX name */
+#define CMICX_DEV_NAME      "cmicx"
+
+/*!
+ * \brief Allocate descriptor ring buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] dma DMA address of ring buffer.
+ *
+ * \retval Pointer to DMA buffer or NULL if an error occurred.
+ */
+typedef void *(*ring_buf_alloc_f)(struct pdma_dev *dev, uint32_t, dma_addr_t *dma);
+
+/*!
+ * \brief Free descriptor ring buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] size Size of DMA buffer.
+ * \param [in] mem Pointer to DMA buffer.
+ * \param [in] dma DMA address of ring buffer.
+ */
+typedef void (*ring_buf_free_f)(struct pdma_dev *dev, uint32_t size, void *mem,
+                                dma_addr_t dma);
+
+/*!
+ * \brief Allocate Rx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_MEMORY Allocation failed.
+ */
+typedef int (*rx_buf_alloc_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                              struct pdma_rx_buf *pbuf);
+
+/*!
+ * \brief Get Rx packet buffer DMA address.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ * \param [in] dma DMA address of packet buffer.
+ */
+typedef void (*rx_buf_dma_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                             struct pdma_rx_buf *pbuf, dma_addr_t *dma);
+
+/*!
+ * \brief Check Rx packet buffer validity.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ *
+ * \retval Ture Buffer is available or FALSE.
+ */
+typedef int (*rx_buf_avail_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                              struct pdma_rx_buf *pbuf);
+
+/*!
+ * \brief Get Rx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ * \param [in] len Packet length.
+ *
+ * \retval Pointer to packet header structure or NULL if failed.
+ */
+typedef struct pkt_hdr *(*rx_buf_get_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                                        struct pdma_rx_buf *pbuf, int len);
+
+/*!
+ * \brief Put Rx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ * \param [in] len Packet length.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_MEMORY Allocation failed.
+ */
+typedef int (*rx_buf_put_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                            struct pdma_rx_buf *pbuf, int len);
+
+/*!
+ * \brief Free Rx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ */
+typedef void (*rx_buf_free_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                              struct pdma_rx_buf *pbuf);
+
+/*!
+ * \brief Get Rx packet buffer mode.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] rxq Pointer to Rx queue struture.
+ *
+ * \retval Buffer mode.
+ */
+typedef enum buf_mode (*rx_buf_mode_f)(struct pdma_dev *dev, struct pdma_rx_queue *rxq);
+
+/*!
+ * \brief Get Tx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] txq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ * \param [in] buf Packet buffer.
+ *
+ * \retval Pointer to packet header structure or NULL if failed.
+ */
+typedef struct pkt_hdr *(*tx_buf_get_f)(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                                        struct pdma_tx_buf *pbuf, void *buf);
+
+/*!
+ * \brief Get Tx packet buffer DMA address.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] txq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ * \param [in] dma DMA address of packet buffer.
+ */
+typedef void (*tx_buf_dma_f)(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                             struct pdma_tx_buf *pbuf, dma_addr_t *dma);
+
+/*!
+ * \brief Free Tx packet buffer.
+ *
+ * \param [in] dev Pointer to Packet DMA device.
+ * \param [in] txq Pointer to Rx queue struture.
+ * \param [in] pbuf Pointer to packet buffer structure.
+ */
+typedef void (*tx_buf_free_f)(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                              struct pdma_tx_buf *pbuf);
+
+/*!
+ * \brief Buffer manager.
+ */
+struct pdma_buf_mngr {
+    /*! Allocate descriptor ring buffer */
+    ring_buf_alloc_f ring_buf_alloc;
+
+    /*! Free descriptor ring buffer */
+    ring_buf_free_f ring_buf_free;
+
+    /*! Allocate Rx packet buffer */
+    rx_buf_alloc_f rx_buf_alloc;
+
+    /*! Get Rx packet buffer DMA address */
+    rx_buf_dma_f rx_buf_dma;
+
+    /*! Check Rx packet buffer validity */
+    rx_buf_avail_f rx_buf_avail;
+
+    /*! Get Rx packet buffer */
+    rx_buf_get_f rx_buf_get;
+
+    /*! Put Rx packet buffer */
+    rx_buf_put_f rx_buf_put;
+
+    /*! Free Rx packet buffer */
+    rx_buf_free_f rx_buf_free;
+
+    /*! Get Rx packet buffer mode */
+    rx_buf_mode_f rx_buf_mode;
+
+    /*! Get Tx packet buffer */
+    tx_buf_get_f tx_buf_get;
+
+    /*! Get Tx packet buffer DMA address */
+    tx_buf_dma_f tx_buf_dma;
+
+    /*! Free Tx packet buffer */
+    tx_buf_free_f tx_buf_free;
+};
+
+/*!
+ * \brief Wait for the kernel networking subsystem.
+ *
+ * \param [in] unit Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_FAIL Operation failed.
+ */
+typedef int (*bcmcnet_vnet_wait_f)(int unit);
+
+/*!
+ * \brief Wake up the kernel networking subsystem.
+ *
+ * \param [in] unit Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_FAIL Operation failed.
+ */
+typedef int (*bcmcnet_hnet_wake_f)(int unit);
+
+/*!
+ * \brief Dock to the kernel networking subsystem.
+ *
+ * \param [in] unit Device number.
+ * \param [in] vsync Sync data.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_FAIL Operation failed.
+ */
+typedef int (*bcmcnet_vnet_dock_f)(int unit, vnet_sync_t *vsync);
+
+/*!
+ * \brief Undock from the kernel networking subsystem.
+ *
+ * \param [in] unit Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_FAIL Operation failed.
+ */
+typedef int (*bcmcnet_vnet_undock_f)(int unit);
+
+/*!
+ * \brief VNET operations.
+ */
+typedef struct bcmcnet_vnet_ops_s {
+    /*!
+     * VNET wait for HNET.
+     * VNET calls this to wait for any notification from HNET.
+     */
+    bcmcnet_vnet_wait_f vnet_wait;
+
+    /*!
+     * VNET wake up HNET.
+     * VNET calls this to notify HNET that Tx/Rx is ready.
+     */
+    bcmcnet_hnet_wake_f hnet_wake;
+
+    /*!
+     * VNET dock to HNET.
+     * This is called to notify HNET that VNET is ready to work and synchronize
+     * vrings information to HNET.
+     */
+    bcmcnet_vnet_dock_f vnet_dock;
+
+    /*!
+     * VNET undock from HNET.
+     * This is called to notify HNET that VNET is ready to leave.
+     */
+    bcmcnet_vnet_undock_f vnet_undock;
+} bcmcnet_vnet_ops_t;
+
+/*!
+ * \brief Initialize buffer manager.
+ *
+ * \param [in] dev Device structure pointer.
+ */
+extern void
+bcmcnet_buf_mngr_init(struct pdma_dev *dev);
+
+/*!
+ * \brief Register VNET operations.
+ *
+ * \param [in] unit Device number.
+ * \param [in] vnet_ops VNET operations.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_PARAM Invalid parameters.
+ */
+extern int
+bcmcnet_vnet_ops_register(int unit, bcmcnet_vnet_ops_t *vnet_ops);
+
+#endif /* BCMCNET_INTERNAL_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_rxtx.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_rxtx.h
new file mode 100644
index 000000000000..eb5834d895b0
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_rxtx.h
@@ -0,0 +1,512 @@
+/*! \file bcmcnet_rxtx.h
+ *
+ * Generic data structure and macro definitions for BCMCNET Rx/Tx.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_RXTX_H
+#define BCMCNET_RXTX_H
+
+/*! Default descriptor number in each ring */
+#define NUM_RING_DESC       64
+
+/*! Maximum number of packets to be handled in one poll call */
+#define NUM_RXTX_BUDGET     64
+
+/*!
+ * \brief Rx buffer mode definitions.
+ */
+enum buf_mode {
+    /*! Private DMA buffer in user space */
+    PDMA_BUF_MODE_PRIV,
+
+    /*! SKB in kernel */
+    PDMA_BUF_MODE_SKB,
+
+    /*! Paged buffer in kernel */
+    PDMA_BUF_MODE_PAGE,
+
+    /*! Kernel buffer mapped to user space */
+    PDMA_BUF_MODE_MAPPED,
+
+    /*! MAX mode */
+    PDMA_BUF_MODE_MAX
+};
+
+/*!
+ * \brief Rx queue statistics.
+ */
+struct rx_stats {
+    /*! Number of received packets */
+    uint64_t packets;
+
+    /*! Number of received bytes */
+    uint64_t bytes;
+
+    /*! Number of dropped packets */
+    uint64_t dropped;
+
+    /*! Number of errors */
+    uint64_t errors;
+
+    /*! Number of head errors */
+    uint64_t head_errors;
+
+    /*! Number of data errors */
+    uint64_t data_errors;
+
+    /*! Number of cell errors */
+    uint64_t cell_errors;
+
+    /*! Number of failed allocation */
+    uint64_t nomems;
+};
+
+/*!
+ * Rx queue structure
+ */
+struct pdma_rx_queue {
+    /*! Group index to which this queue belongs */
+    uint32_t group_id;
+
+    /*! Global channel index */
+    uint32_t chan_id;
+
+    /*! Queue index */
+    uint32_t queue_id;
+
+    /*! Pointer to the device control structure */
+    struct dev_ctrl *ctrl;
+
+    /*! Rx packet buffer pointers */
+    struct pdma_rx_buf *pbuf;
+
+    /*! Rx ring address */
+    void *ring;
+
+    /*! Rx ring DMA address */
+    dma_addr_t ring_addr;
+
+    /*! Rx ring DMA halt address */
+    dma_addr_t halt_addr;
+
+    /*! Rx buffer size */
+    uint32_t buf_size;
+
+    /*! Total number of descriptors */
+    uint32_t nb_desc;
+
+    /*! Next free ring entry */
+    uint32_t curr;
+
+    /*! Halt ring entry */
+    uint32_t halt;
+
+    /*! Max free descriptors to hold */
+    uint32_t free_thresh;
+
+    /*! Rx interrupt coalesce value */
+    uint32_t ic_val;
+
+    /*! Rx interrupt coalescing */
+    int intr_coalescing;
+
+    /*! Queue statistics */
+    struct rx_stats stats;
+
+    /*! Rx queue spin lock */
+    sal_spinlock_t lock;
+
+    /*! Queue state */
+    int state;
+    /*! Queue is used */
+#define PDMA_RX_QUEUE_USED      (1 << 0)
+    /*! Queue is setup */
+#define PDMA_RX_QUEUE_SETUP     (1 << 1)
+    /*! Queue is active */
+#define PDMA_RX_QUEUE_ACTIVE    (1 << 2)
+    /*! Queue is busy */
+#define PDMA_RX_QUEUE_BUSY      (1 << 3)
+    /*! Queue is suspended */
+#define PDMA_RX_QUEUE_XOFF      (1 << 4)
+    /*! Queue is batch refilled */
+#define PDMA_RX_BATCH_REFILL    (1 << 5)
+
+    /*! DMA buffer mode */
+    enum buf_mode mode;
+};
+
+/*!
+ * \brief Tx queue statistics.
+ */
+struct tx_stats {
+    /*! Number of sent packets */
+    uint64_t packets;
+
+    /*! Number of sent bytes */
+    uint64_t bytes;
+
+    /*! Number of dropped packets */
+    uint64_t dropped;
+
+    /*! Number of errors */
+    uint64_t errors;
+
+    /*! Number of suspends */
+    uint64_t xoffs;
+};
+
+/*!
+ * \brief Tx queue structure.
+ */
+struct pdma_tx_queue {
+    /*! Group index to which this queue belongs */
+    uint32_t group_id;
+
+    /*! Global channel index */
+    uint32_t chan_id;
+
+    /*! Queue index */
+    uint32_t queue_id;
+
+    /*! pointer to the device control structure */
+    struct dev_ctrl *ctrl;
+
+    /*! Tx packet buffer pointers */
+    struct pdma_tx_buf *pbuf;
+
+    /*! Tx ring address */
+    void *ring;
+
+    /*! Tx ring DMA address */
+    dma_addr_t ring_addr;
+
+    /*! Tx ring DMA halt address */
+    dma_addr_t halt_addr;
+
+    /*! Total number of descriptors */
+    uint32_t nb_desc;
+
+    /*! Next free ring entry */
+    uint32_t curr;
+
+    /*! First entry to be transmitted */
+    uint32_t dirt;
+
+    /*! Halt ring entry */
+    uint32_t halt;
+
+    /*! Max free descriptors to hold in non-intr mode */
+    uint32_t free_thresh;
+
+    /*! Tx interrupt coalesce value */
+    uint32_t ic_val;
+
+    /*! Tx interrupt coalescing */
+    int intr_coalescing;
+
+    /*! Queue statistics */
+    struct tx_stats stats;
+
+    /*! Tx queue spin lock */
+    sal_spinlock_t lock;
+
+    /*! Tx mutex spin lock */
+    sal_spinlock_t mutex;
+
+    /*! Tx mutex and flow control semaphore */
+    sal_sem_t sem;
+
+    /*! Queue state */
+    int state;
+    /*! Queue is used */
+#define PDMA_TX_QUEUE_USED      (1 << 0)
+    /*! Queue is setup */
+#define PDMA_TX_QUEUE_SETUP     (1 << 1)
+    /*! Queue is active */
+#define PDMA_TX_QUEUE_ACTIVE    (1 << 2)
+    /*! Queue is setup */
+#define PDMA_TX_QUEUE_BUSY      (1 << 3)
+    /*! Queue is suspended */
+#define PDMA_TX_QUEUE_XOFF      (1 << 4)
+    /*! Queue is poll mode */
+#define PDMA_TX_QUEUE_POLL      (1 << 5)
+
+    /*! DMA buffer mode */
+    enum buf_mode mode;
+};
+
+/*!
+ * \brief Setup Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_setup(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Release Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_release(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Restore Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_restore(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Setup virtual Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_vqueue_setup(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Release virtual Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_vqueue_release(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Setup Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_setup(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Release Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_release(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Restore Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_restore(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Setup virtual Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_vqueue_setup(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Release virtual Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_vqueue_release(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Suspend Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_suspend(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Resume Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_resume(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Suspend Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_suspend(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Resume Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_resume(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Wakeup Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_wakeup(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Start Tx queue transmission.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ * \param [in] buf Tx packet buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_xmit(struct pdma_dev *dev, int queue, void *buf);
+
+/*!
+ * \brief Poll Rx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_queue_poll(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * \brief Poll Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_queue_poll(struct pdma_dev *dev, int queue, int budget);
+
+/*!
+ * \brief Poll queue group.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] group Group number.
+ * \param [in] budget Poll budget.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_group_poll(struct pdma_dev *dev, int group, int budget);
+
+/*!
+ * \brief Dump Rx ring.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Rx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_rx_ring_dump(struct pdma_dev *dev, int queue);
+
+/*!
+ * \brief Dump Tx ring.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+bcmcnet_pdma_tx_ring_dump(struct pdma_dev *dev, int queue);
+
+#endif /* BCMCNET_RXTX_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_types.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_types.h
new file mode 100644
index 000000000000..42bd9240828b
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_types.h
@@ -0,0 +1,263 @@
+/*! \file bcmcnet_types.h
+ *
+ * BCMCNET public data structure and macro definitions.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef BCMCNET_TYPES_H
+#define BCMCNET_TYPES_H
+
+#include <bcmcnet/bcmcnet_dep.h>
+
+/*! Maximum length of device name */
+#define DEV_NAME_LEN_MAX    16
+
+/*! Maximum number of groups supported each device */
+#define NUM_GRP_MAX         4
+
+/*! Maximum number of queues supported each group */
+#define NUM_Q_PER_GRP       8
+
+/*! Maximum number of queues supported each device */
+#define NUM_QUE_MAX         (NUM_GRP_MAX * NUM_Q_PER_GRP)
+
+/*! Maximum length of jumbo frame */
+#define JUMBO_FRAME_LEN_MAX 0xffff
+
+/*! Maximum Rx buffer size */
+#define RX_BUF_SIZE_MAX     JUMBO_FRAME_LEN_MAX
+
+/*! Minimum Rx buffer size */
+#define RX_BUF_SIZE_MIN     68
+
+/*! Default Rx buffer size */
+#define RX_BUF_SIZE_DFLT    9216
+
+/*!
+ * \brief Transmission direction.
+ */
+enum pdma_dir {
+    PDMA_Q_RX = 0,
+    PDMA_Q_TX
+};
+
+/*!
+ * \brief Device information.
+ */
+typedef struct bcmcnet_dev_info {
+    /*! Device name */
+    char dev_name[DEV_NAME_LEN_MAX];
+
+    /*! Device ID */
+    uint32_t dev_id;
+
+    /*! Device type */
+    uint32_t dev_type;
+
+    /*! Maximum number of groups */
+    uint32_t max_groups;
+
+    /*! Maximum number of queues */
+    uint32_t max_queues;
+
+    /*! Bitmap of groups at work */
+    uint32_t bm_groups;
+
+    /*! Bitmap of Rx queues at work */
+    uint32_t bm_rx_queues;
+
+    /*! Bitmap of Tx queues at work */
+    uint32_t bm_tx_queues;
+
+    /*! Number of groups at work */
+    uint32_t nb_groups;
+
+    /*! Number of Rx queues at work */
+    uint32_t nb_rx_queues;
+
+    /*! Number of Tx queues at work */
+    uint32_t nb_tx_queues;
+
+    /*! Rx descriptor size */
+    uint32_t rx_desc_size;
+
+    /*! Tx descriptor size */
+    uint32_t tx_desc_size;
+
+    /*! Rx packet header size */
+    uint32_t rx_ph_size;
+
+    /*! Tx packet header size */
+    uint32_t tx_ph_size;
+
+    /*! Rx buffer size */
+    uint32_t rx_buf_dflt;
+
+    /*! Number of descriptors for a queue */
+    uint32_t nb_desc_dflt;
+
+    /*! Rx buffer size per queue */
+    uint32_t rx_buf_size[NUM_QUE_MAX];
+
+    /*! Number of Rx descriptors per queue */
+    uint32_t nb_rx_desc[NUM_QUE_MAX];
+
+    /*! Number of Tx descriptors per queue */
+    uint32_t nb_tx_desc[NUM_QUE_MAX];
+} bcmcnet_dev_info_t;
+
+/*!
+ * \brief Device statistics.
+ */
+typedef struct bcmcnet_dev_stats {
+    /*! Number of successfully received packets */
+    uint64_t rx_packets;
+
+    /*! Number of successfully received bytes */
+    uint64_t rx_bytes;
+
+    /*! Number of dropped packets */
+    uint64_t rx_dropped;
+
+    /*! Number of erroneous received packets */
+    uint64_t rx_errors;
+
+    /*! Number of error head packets */
+    uint64_t rx_head_errors;
+
+    /*! Number of error data packets */
+    uint64_t rx_data_errors;
+
+    /*! Number of error cell packets */
+    uint64_t rx_cell_errors;
+
+    /*! Number of RX pktbuf allocation failures */
+    uint64_t rx_nomems;
+
+    /*! Number of successfully transmitted packets */
+    uint64_t tx_packets;
+
+    /*! Number of successfully transmitted bytes */
+    uint64_t tx_bytes;
+
+    /*! Number of dropped packets */
+    uint64_t tx_dropped;
+
+    /*! Number of failed transmitted packets */
+    uint64_t tx_errors;
+
+    /*! Number of suspended transmission */
+    uint64_t tx_xoffs;
+
+    /*! Number of interrupts */
+    uint64_t intrs;
+
+    /*! Number of successfully received packets per queue */
+    uint64_t rxq_packets[NUM_QUE_MAX];
+
+    /*! Number of successfully received bytes per queue */
+    uint64_t rxq_bytes[NUM_QUE_MAX];
+
+    /*! Number of dropped packets per queue */
+    uint64_t rxq_dropped[NUM_QUE_MAX];
+
+    /*! Number of erroneous received packets per queue */
+    uint64_t rxq_errors[NUM_QUE_MAX];
+
+    /*! Number of error head packets per queue */
+    uint64_t rxq_head_errors[NUM_QUE_MAX];
+
+    /*! Number of error data packets per queue */
+    uint64_t rxq_data_errors[NUM_QUE_MAX];
+
+    /*! Number of error cell packets per queue */
+    uint64_t rxq_cell_errors[NUM_QUE_MAX];
+
+    /*! Number of RX pktbuf allocation failures per queue */
+    uint64_t rxq_nomems[NUM_QUE_MAX];
+
+    /*! Number of successfully transmitted bytes per queue */
+    uint64_t txq_packets[NUM_QUE_MAX];
+
+    /*! Number of successfully transmitted bytes per queue */
+    uint64_t txq_bytes[NUM_QUE_MAX];
+
+    /*! Number of dropped packets per queue */
+    uint64_t txq_dropped[NUM_QUE_MAX];
+
+    /*! Number of failed transmitted packets per queue */
+    uint64_t txq_errors[NUM_QUE_MAX];
+
+    /*! Number of suspended transmission per queue */
+    uint64_t txq_xoffs[NUM_QUE_MAX];
+} bcmcnet_dev_stats_t;
+
+/*!
+ * \brief Device modes.
+ */
+typedef enum dev_mode_e {
+    /*!
+     * User network mode.
+     * The standalone CNET works in user space.
+     */
+    DEV_MODE_UNET = 0,
+
+    /*!
+     * Kernel network mode.
+     * Combined with KNET module, CNET works in kernel space.
+     */
+    DEV_MODE_KNET,
+
+    /*!
+     * Virtual network mode.
+     * CNET works in user space as a virtual network.
+     * The hypervisor must be deployed in KNET module.
+     */
+    DEV_MODE_VNET,
+
+    /*!
+     * Hyper network mode.
+     * Combined with KNET module, CNET works in kernel space as a hypervisor.
+     * The virtual network is not neccessary in this mode.
+     */
+    DEV_MODE_HNET,
+
+    /*! Maximum number of mode */
+    DEV_MODE_MAX
+} dev_mode_t;
+
+/*!
+ * \brief VNET sync data.
+ */
+typedef struct vnet_sync_s {
+    /*! Rx ring address */
+    uint64_t rx_ring_addr[NUM_QUE_MAX];
+
+    /*! Rx ring size */
+    uint32_t rx_ring_size[NUM_QUE_MAX];
+
+    /*! Tx ring address */
+    uint64_t tx_ring_addr[NUM_QUE_MAX];
+
+    /*! Tx ring size */
+    uint32_t tx_ring_size[NUM_QUE_MAX];
+} vnet_sync_t;
+
+#endif /* BCMCNET_TYPES_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_core.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_core.c
new file mode 100644
index 000000000000..ef4aca7da49e
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_core.c
@@ -0,0 +1,701 @@
+/*! \file bcmcnet_core.c
+ *
+ * Utility routines for BCMCNET driver.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+
+/*!
+ * Initialize a device
+ */
+int
+bcmcnet_pdma_dev_init(struct pdma_dev *dev)
+{
+    int rv;
+
+    /* Open the device */
+    rv = bcmcnet_pdma_open(dev);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    dev->attached = 1;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Clean up a device
+ */
+int
+bcmcnet_pdma_dev_cleanup(struct pdma_dev *dev)
+{
+    if (!dev->attached) {
+        return SHR_E_NONE;
+    }
+
+    dev->ops->dev_close(dev);
+    dev->ops = NULL;
+
+    dev->attached = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Start a device
+ */
+int
+bcmcnet_pdma_dev_start(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+    int rv;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (dev->started) {
+        return SHR_E_NONE;
+    }
+
+    rv = dev->ops->dev_config(dev, ctrl->bm_rxq, ctrl->bm_txq);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    /* Start all the Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rv = dev->ops->rx_queue_setup(dev, qi);
+        if (SHR_FAILURE(rv)) {
+            return rv;
+        }
+        dev->ops->rx_queue_intr_enable(dev, qi);
+        dev->ops->rx_queue_start(dev, qi);
+    }
+
+    /* Start all the Tx queues */
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        dev->ops->tx_queue_setup(dev, qi);
+        dev->ops->tx_queue_intr_enable(dev, qi);
+        dev->ops->tx_queue_start(dev, qi);
+        dev->ops->tx_queue_wakeup(dev, qi);
+    }
+
+    bcmcnet_pdma_dev_info_get(dev);
+
+    dev->started = 1;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Stop a device
+ */
+int
+bcmcnet_pdma_dev_stop(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (!dev->started) {
+        return SHR_E_NONE;
+    }
+
+    /* Stop all the Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        dev->ops->rx_queue_intr_disable(dev, qi);
+        dev->ops->rx_queue_stop(dev, qi);
+        dev->ops->rx_queue_release(dev, qi);
+    }
+
+    /* Stop all the Tx queues */
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        dev->ops->tx_queue_intr_disable(dev, qi);
+        dev->ops->tx_queue_stop(dev, qi);
+        dev->ops->tx_queue_wakeup(dev, qi);
+        dev->ops->tx_queue_release(dev, qi);
+    }
+
+    dev->started = 0;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend a device
+ */
+int
+bcmcnet_pdma_dev_suspend(struct pdma_dev *dev)
+{
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    return dev->ops->dev_suspend(dev);
+}
+
+/*!
+ * Resume a device
+ */
+int
+bcmcnet_pdma_dev_resume(struct pdma_dev *dev)
+{
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    return dev->ops->dev_resume(dev);
+}
+
+/*!
+ * Suspend Rx
+ */
+int
+bcmcnet_pdma_dev_rx_suspend(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Suspend all the Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        dev->ops->rx_queue_suspend(dev, qi);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Resume Rx
+ */
+int
+bcmcnet_pdma_dev_rx_resume(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Resume all the Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        dev->ops->rx_queue_resume(dev, qi);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dock to HNET
+ */
+int
+bcmcnet_pdma_dev_dock(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+    int rv;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Set up all the virtual Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rv = dev->ops->rx_vqueue_setup(dev, qi);
+        if (SHR_FAILURE(rv)) {
+            return rv;
+        }
+    }
+
+    /* Set up all the virtual Tx queues */
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        rv = dev->ops->tx_vqueue_setup(dev, qi);
+        if (SHR_FAILURE(rv)) {
+            return rv;
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Undock from HNET
+ */
+int
+bcmcnet_pdma_dev_undock(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    if (!dev->attached) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Release all the virtual Rx queues */
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        dev->ops->rx_vqueue_release(dev, qi);
+    }
+
+    /* Release all the virtual Tx queues */
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        dev->ops->tx_vqueue_release(dev, qi);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get device information
+ */
+int
+bcmcnet_pdma_dev_info_get(struct pdma_dev *dev)
+{
+    if (!dev->ops || !dev->ops->dev_info_get) {
+        return SHR_E_INTERNAL;
+    }
+
+    dev->ops->dev_info_get(dev);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get device statistics
+ */
+int
+bcmcnet_pdma_dev_stats_get(struct pdma_dev *dev)
+{
+    if (!dev->ops || !dev->ops->dev_stats_get) {
+        return SHR_E_INTERNAL;
+    }
+
+    dev->ops->dev_stats_get(dev);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Reset device statistics
+ */
+int
+bcmcnet_pdma_dev_stats_reset(struct pdma_dev *dev)
+{
+    if (!dev->ops || !dev->ops->dev_stats_reset) {
+        return SHR_E_INTERNAL;
+    }
+
+    dev->ops->dev_stats_reset(dev);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Convert a queue index to channel index
+ */
+int
+bcmcnet_pdma_dev_queue_to_chan(struct pdma_dev *dev, int queue, int dir, int *chan)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+
+    if (dir == PDMA_Q_RX) {
+        if ((uint32_t)queue >= ctrl->nb_rxq || chan == NULL) {
+            return SHR_E_PARAM;
+        }
+    } else {
+        if ((uint32_t)queue >= ctrl->nb_txq || chan == NULL) {
+            return SHR_E_PARAM;
+        }
+    }
+
+    if (!dev->ops || !dev->ops->dev_lq_to_pq) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->dev_lq_to_pq(dev, queue, dir, chan);
+}
+
+/*!
+ * Convert a channel index to queue index
+ */
+int
+bcmcnet_pdma_dev_chan_to_queue(struct pdma_dev *dev, int chan, int *queue, int *dir)
+{
+    if (chan < 0 || chan >= dev->num_queues || queue == NULL || dir == NULL) {
+        return SHR_E_PARAM;
+    }
+
+    if (!dev->ops || !dev->ops->dev_pq_to_lq) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->dev_pq_to_lq(dev, chan, queue, dir);
+}
+
+/*!
+ * Enable interrupt for a Rx queue
+ */
+int
+bcmcnet_rx_queue_intr_enable(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->rx_queue_intr_enable) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->rx_queue_intr_enable(dev, queue);
+}
+
+/*!
+ * Disable interrupt for a Rx queue
+ */
+int
+bcmcnet_rx_queue_intr_disable(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->rx_queue_intr_disable) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->rx_queue_intr_disable(dev, queue);
+}
+
+/*!
+ * Acknowledge interrupt for a Rx queue
+ */
+int
+bcmcnet_rx_queue_intr_ack(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->rx_queue_intr_ack) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->rx_queue_intr_ack(dev, queue);
+}
+
+/*!
+ * Check interrupt for a Rx queue
+ */
+int
+bcmcnet_rx_queue_intr_check(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->rx_queue_intr_check) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->rx_queue_intr_check(dev, queue);
+}
+
+/*!
+ * Enable interrupt for a Tx queue
+ */
+int
+bcmcnet_tx_queue_intr_enable(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->tx_queue_intr_enable) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->tx_queue_intr_enable(dev, queue);
+}
+
+/*!
+ * Disable interrupt for a Tx queue
+ */
+int
+bcmcnet_tx_queue_intr_disable(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->tx_queue_intr_disable) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->tx_queue_intr_disable(dev, queue);
+}
+
+/*!
+ * Acknowledge interrupt for a Tx queue
+ */
+int
+bcmcnet_tx_queue_intr_ack(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->tx_queue_intr_ack) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->tx_queue_intr_ack(dev, queue);
+}
+
+/*!
+ * Check interrupt for a Tx queue
+ */
+int
+bcmcnet_tx_queue_intr_check(struct pdma_dev *dev, int queue)
+{
+    if (!dev->ops || !dev->ops->tx_queue_intr_check) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->tx_queue_intr_check(dev, queue);
+}
+
+/*!
+ * Enable interrupt for a queue
+ */
+int
+bcmcnet_queue_intr_enable(struct pdma_dev *dev, struct intr_handle *hdl)
+{
+    if (hdl->dir == PDMA_Q_RX) {
+        return bcmcnet_rx_queue_intr_enable(dev, hdl->queue);
+    } else {
+        return bcmcnet_tx_queue_intr_enable(dev, hdl->queue);
+    }
+}
+
+/*!
+ * Disable interrupt for a queue
+ */
+int
+bcmcnet_queue_intr_disable(struct pdma_dev *dev, struct intr_handle *hdl)
+{
+    if (hdl->dir == PDMA_Q_RX) {
+        return bcmcnet_rx_queue_intr_disable(dev, hdl->queue);
+    } else {
+        return bcmcnet_tx_queue_intr_disable(dev, hdl->queue);
+    }
+}
+
+/*!
+ * Acknowledge interrupt for a queue
+ */
+int
+bcmcnet_queue_intr_ack(struct pdma_dev *dev, struct intr_handle *hdl)
+{
+    if (hdl->dir == PDMA_Q_RX) {
+        return bcmcnet_rx_queue_intr_ack(dev, hdl->queue);
+    } else {
+        return bcmcnet_tx_queue_intr_ack(dev, hdl->queue);
+    }
+}
+
+/*!
+ * Check interrupt for a queue
+ */
+int
+bcmcnet_queue_intr_check(struct pdma_dev *dev, struct intr_handle *hdl)
+{
+    if (hdl->dir == PDMA_Q_RX) {
+        return bcmcnet_rx_queue_intr_check(dev, hdl->queue);
+    } else {
+        return bcmcnet_tx_queue_intr_check(dev, hdl->queue);
+    }
+}
+
+/*!
+ * Enable interrupt for a queue group
+ */
+int
+bcmcnet_group_intr_enable(struct pdma_dev *dev, int group)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct queue_group *grp = &ctrl->grp[group];
+    int queue, dir;
+    int i;
+
+    if (!dev->ops) {
+        return SHR_E_INTERNAL;
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_rxq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->rx_queue_intr_enable(dev, queue);
+        }
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_txq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->tx_queue_intr_enable(dev, queue);
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Disable interrupt for a queue group
+ */
+int
+bcmcnet_group_intr_disable(struct pdma_dev *dev, int group)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct queue_group *grp = &ctrl->grp[group];
+    int queue, dir;
+    int i;
+
+    if (!dev->ops) {
+        return SHR_E_INTERNAL;
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_rxq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->rx_queue_intr_disable(dev, queue);
+        }
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_txq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->tx_queue_intr_disable(dev, queue);
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Acknowledge interrupt for a queue group
+ */
+int
+bcmcnet_group_intr_ack(struct pdma_dev *dev, int group)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct queue_group *grp = &ctrl->grp[group];
+    int queue, dir;
+    int i;
+
+    if (!dev->ops) {
+        return SHR_E_INTERNAL;
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_rxq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->rx_queue_intr_ack(dev, queue);
+        }
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_txq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            dev->ops->tx_queue_intr_ack(dev, queue);
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Check interrupt for a queue group
+ */
+int
+bcmcnet_group_intr_check(struct pdma_dev *dev, int group)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct queue_group *grp = &ctrl->grp[group];
+    int queue, dir;
+    int i;
+
+    if (!dev->ops) {
+        return SHR_E_INTERNAL;
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_rxq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            if (dev->ops->rx_queue_intr_check(dev, queue)) {
+                return TRUE;
+            }
+        }
+    }
+
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_txq) {
+            dev->ops->dev_pq_to_lq(dev, i + group * dev->grp_queues, &queue, &dir);
+            if (dev->ops->tx_queue_intr_check(dev, queue)) {
+                return TRUE;
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+/*!
+ * Poll a Rx queue
+ */
+int
+bcmcnet_rx_queue_poll(struct pdma_dev *dev, int queue, int budget)
+{
+    if (!dev->ops || !dev->ops->rx_queue_poll) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->rx_queue_poll(dev, queue, budget);
+}
+
+/*!
+ * Poll a Tx queue
+ */
+int
+bcmcnet_tx_queue_poll(struct pdma_dev *dev, int queue, int budget)
+{
+    if (!dev->ops || !dev->ops->tx_queue_poll) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->tx_queue_poll(dev, queue, budget);
+}
+
+/*!
+ * Poll a queue
+ */
+int
+bcmcnet_queue_poll(struct pdma_dev *dev, struct intr_handle *hdl, int budget)
+{
+    if (hdl->dir == PDMA_Q_RX) {
+        return bcmcnet_rx_queue_poll(dev, hdl->queue, budget);
+    } else {
+        return bcmcnet_tx_queue_poll(dev, hdl->queue, budget);
+    }
+}
+
+/*!
+ * Poll a queue group
+ */
+int
+bcmcnet_group_poll(struct pdma_dev *dev, int group, int budget)
+{
+    if (!dev->ops || !dev->ops->group_poll) {
+        return SHR_E_INTERNAL;
+    }
+
+    return dev->ops->group_poll(dev, group, budget);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_dev.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_dev.c
new file mode 100644
index 000000000000..1f39515a7a62
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_dev.c
@@ -0,0 +1,1059 @@
+/*! \file bcmcnet_dev.c
+ *
+ * Utility routines for BCMCNET device.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_buff.h>
+
+/*!
+ * Free resource for a Rx queue
+ */
+static void
+bcn_rx_queues_free(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    int gi, qi;
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            rxq = (struct pdma_rx_queue *)ctrl->grp[gi].rx_queue[qi];
+            if (!rxq) {
+                continue;
+            }
+            sal_free(rxq);
+            ctrl->grp[gi].rx_queue[qi] = NULL;
+            if (dev->mode == DEV_MODE_HNET && ctrl->grp[gi].vnet_rxq[qi]) {
+                sal_free(ctrl->grp[gi].vnet_rxq[qi]);
+                ctrl->grp[gi].vnet_rxq[qi] = NULL;
+            }
+        }
+    }
+}
+
+/*!
+ * Allocate resource for a Rx queue
+ */
+static int
+bcn_rx_queues_alloc(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL, *vrxq = NULL;
+    int gi, qi;
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            rxq = sal_alloc(sizeof(*rxq), "bcmcnetRxQueue");
+            if (!rxq) {
+                goto error;
+            }
+            sal_memset(rxq, 0, sizeof(*rxq));
+            rxq->group_id = gi;
+            rxq->chan_id = qi + gi * dev->grp_queues;
+            rxq->ctrl = ctrl;
+            ctrl->grp[gi].rx_queue[qi] = rxq;
+            if (dev->mode == DEV_MODE_HNET) {
+                vrxq = sal_alloc(sizeof(*vrxq), "bcmcnetVnetRxQueue");
+                if (!vrxq) {
+                    goto error;
+                }
+                sal_memset(vrxq, 0, sizeof(*vrxq));
+                vrxq->group_id = gi;
+                vrxq->chan_id = qi + gi * dev->grp_queues;
+                vrxq->ctrl = ctrl;
+                ctrl->grp[gi].vnet_rxq[qi] = vrxq;
+            }
+        }
+    }
+
+    return SHR_E_NONE;
+
+error:
+    bcn_rx_queues_free(dev);
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * Free resource for a Tx queue
+ */
+static void
+bcn_tx_queues_free(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL;
+    int gi, qi;
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            txq = (struct pdma_tx_queue *)ctrl->grp[gi].tx_queue[qi];
+            if (!txq) {
+                continue;
+            }
+            sal_free(txq);
+            ctrl->grp[gi].tx_queue[qi] = NULL;
+            if (dev->mode == DEV_MODE_HNET && ctrl->grp[gi].vnet_txq[qi]) {
+                sal_free(ctrl->grp[gi].vnet_txq[qi]);
+                ctrl->grp[gi].vnet_txq[qi] = NULL;
+            }
+        }
+    }
+}
+
+/*!
+ * Allocate resource for a Tx queue
+ */
+static int
+bcn_tx_queues_alloc(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL, *vtxq = NULL;
+    int gi, qi;
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            txq = sal_alloc(sizeof(*txq), "bcmcnetTxQueue");
+            if (!txq) {
+                goto error;
+            }
+            sal_memset(txq, 0, sizeof(*txq));
+            txq->group_id = gi;
+            txq->chan_id = qi + gi * dev->grp_queues;
+            txq->ctrl = ctrl;
+            ctrl->grp[gi].tx_queue[qi] = txq;
+            if (dev->mode == DEV_MODE_HNET) {
+                vtxq = sal_alloc(sizeof(*vtxq), "bcmcnetVnetTxQueue");
+                if (!vtxq) {
+                    goto error;
+                }
+                sal_memset(vtxq, 0, sizeof(*vtxq));
+                vtxq->group_id = gi;
+                vtxq->chan_id = qi + gi * dev->grp_queues;
+                vtxq->ctrl = ctrl;
+                ctrl->grp[gi].vnet_txq[qi] = vtxq;
+            }
+        }
+    }
+
+    return SHR_E_NONE;
+
+error:
+    bcn_tx_queues_free(dev);
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * \brief Parse Rx groups
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] qbm Rx queue bitmap.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+bcn_rx_queue_group_parse(struct pdma_dev *dev, uint32_t qbm)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)ctrl->buf_mngr;
+    struct pdma_rx_queue *rxq = NULL;
+    struct intr_handle *hdl = NULL;
+    uint32_t mask;
+    int gi, qi, qn;
+
+    ctrl->nb_rxq = 0;
+    sal_memset(ctrl->rx_queue, 0, sizeof(ctrl->rx_queue));
+
+    /* Figure out available groups and Rx queues */
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        if (!ctrl->grp[gi].attached) {
+            continue;
+        }
+        qn = 0;
+        mask = 0;
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            rxq = (struct pdma_rx_queue *)ctrl->grp[gi].rx_queue[qi];
+            hdl = &ctrl->grp[gi].intr_hdl[qi];
+            if (1 << (qi + gi * dev->grp_queues) & qbm) {
+                /* Set the number of descriptors */
+                rxq->nb_desc = ctrl->grp[gi].nb_desc[qi];
+                if (!rxq->nb_desc) {
+                    rxq->nb_desc = ctrl->nb_desc;
+                    ctrl->grp[gi].nb_desc[qi] = rxq->nb_desc;
+                }
+                /* Set Rx buffer size */
+                rxq->buf_size = ctrl->grp[gi].rx_size[qi];
+                if (rxq->buf_size < RX_BUF_SIZE_MIN) {
+                    rxq->buf_size = RX_BUF_SIZE_MIN;
+                    ctrl->grp[gi].rx_size[qi] = rxq->buf_size;
+                } else if (rxq->buf_size > RX_BUF_SIZE_MAX) {
+                    rxq->buf_size = ctrl->rx_buf_size;
+                    ctrl->grp[gi].rx_size[qi] = rxq->buf_size;
+                }
+                rxq->buf_size += dev->rx_ph_size;
+                /* Set mode and state for the queue */
+                rxq->mode = bm->rx_buf_mode(dev, rxq);
+                rxq->state = PDMA_RX_QUEUE_USED;
+                if (dev->flags & PDMA_RX_BATCHING) {
+                    rxq->free_thresh = rxq->nb_desc / 4;
+                    rxq->state |= PDMA_RX_BATCH_REFILL;
+                }
+                /* Update queue index */
+                rxq->queue_id = ctrl->nb_rxq;
+                ctrl->rx_queue[rxq->queue_id] = rxq;
+                ctrl->nb_rxq++;
+                qn++;
+                mask |= 1 << qi;
+                /* Set up handler for the queue */
+                hdl->queue = rxq->queue_id;
+                hdl->dir = PDMA_Q_RX;
+                hdl->budget = ctrl->budget < rxq->nb_desc ?
+                              ctrl->budget : rxq->nb_desc;
+                if (dev->mode == DEV_MODE_HNET) {
+                    ctrl->vnet_rxq[rxq->queue_id] = ctrl->grp[gi].vnet_rxq[qi];
+                }
+            } else {
+                rxq->state = 0;
+            }
+        }
+
+        /* Set group metadata */
+        if (qn) {
+            ctrl->grp[gi].bm_rxq = mask;
+            ctrl->grp[gi].nb_rxq = qn;
+        } else {
+            ctrl->grp[gi].bm_rxq = 0;
+            ctrl->grp[gi].nb_rxq = 0;
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Parse Tx groups
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] qbm Tx queue bitmap.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+bcn_tx_queue_group_parse(struct pdma_dev *dev, uint32_t qbm)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL;
+    struct intr_handle *hdl = NULL;
+    uint32_t mask;
+    int gi, qi, qn;
+
+    ctrl->nb_txq = 0;
+    sal_memset(ctrl->tx_queue, 0, sizeof(ctrl->tx_queue));
+
+    /* Figure out available groups and Tx queues */
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        if (!ctrl->grp[gi].attached) {
+            continue;
+        }
+        qn = 0;
+        mask = 0;
+        for (qi = 0; qi < dev->grp_queues; qi++) {
+            txq = (struct pdma_tx_queue *)ctrl->grp[gi].tx_queue[qi];
+            hdl = &ctrl->grp[gi].intr_hdl[qi];
+            if (1 << (qi + gi * dev->grp_queues) & qbm) {
+                /* Set the number of descriptors */
+                txq->nb_desc = ctrl->grp[gi].nb_desc[qi];
+                if (!txq->nb_desc) {
+                    txq->nb_desc = ctrl->nb_desc;
+                    ctrl->grp[gi].nb_desc[qi] = txq->nb_desc;
+                }
+                /* Set mode and state for the queue */
+                txq->state = PDMA_TX_QUEUE_USED;
+                if (dev->flags & PDMA_TX_POLLING) {
+                    txq->free_thresh = txq->nb_desc / 4;
+                    txq->state |= PDMA_TX_QUEUE_POLL;
+                }
+                /* Update queue index */
+                txq->queue_id = ctrl->nb_txq;
+                ctrl->tx_queue[txq->queue_id] = txq;
+                ctrl->nb_txq++;
+                qn++;
+                mask |= 1 << qi;
+                /* Set up handler for the queue */
+                hdl->queue = txq->queue_id;
+                hdl->dir = PDMA_Q_TX;
+                hdl->budget = ctrl->budget < txq->nb_desc ?
+                              ctrl->budget : txq->nb_desc;
+                if (dev->mode == DEV_MODE_HNET) {
+                    ctrl->vnet_txq[txq->queue_id] = ctrl->grp[gi].vnet_txq[qi];
+                }
+            } else {
+                txq->state = 0;
+            }
+        }
+
+        /* Set group metadata */
+        if (qn) {
+            ctrl->grp[gi].bm_txq = mask;
+            ctrl->grp[gi].nb_txq = qn;
+        } else {
+            ctrl->grp[gi].bm_txq = 0;
+            ctrl->grp[gi].nb_txq = 0;
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Configure device
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] bm_rxq Rx queue bitmap.
+ * \param [in] bm_txq Tx queue bitmap.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+bcmcnet_pdma_config(struct pdma_dev *dev, uint32_t bm_rxq, uint32_t bm_txq)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    int gi;
+
+    if (!bm_rxq || !bm_txq || (bm_rxq & bm_txq)) {
+        return SHR_E_PARAM;
+    }
+
+    bcn_rx_queue_group_parse(dev, bm_rxq);
+    bcn_tx_queue_group_parse(dev, bm_txq);
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        if (!ctrl->grp[gi].attached) {
+            continue;
+        }
+        /* Update group metadata */
+        if (!ctrl->grp[gi].bm_rxq && !ctrl->grp[gi].bm_txq) {
+            ctrl->grp[gi].attached = 0;
+            ctrl->bm_grp &= ~(1 << gi);
+            ctrl->nb_grp--;
+            continue;
+        }
+        ctrl->grp[gi].ctrl = ctrl;
+        ctrl->grp[gi].id = gi;
+        ctrl->grp[gi].irq_mask = 0;
+    }
+
+    return hw->hdls.hw_config(hw);
+}
+
+/*!
+ * Close device
+ */
+static int
+bcmcnet_pdma_close(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)dev->ctrl.hw;
+    int gi;
+
+    hw->hdls.hw_reset(hw);
+
+    for (gi = 0; gi < dev->num_groups; gi++) {
+        if (!ctrl->grp[gi].attached) {
+            continue;
+        }
+        /* Reset group metadata */
+        ctrl->bm_grp &= ~(1 << gi);
+        ctrl->nb_grp--;
+        ctrl->grp[gi].irq_mask = 0;
+        ctrl->grp[gi].poll_queues = 0;
+        ctrl->grp[gi].attached = 0;
+    }
+
+    bcn_rx_queues_free(dev);
+    bcn_tx_queues_free(dev);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend device
+ */
+static int
+bcmcnet_pdma_suspend(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        bcmcnet_pdma_rx_queue_suspend(dev, qi);
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        bcmcnet_pdma_tx_queue_suspend(dev, qi);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Resume device
+ */
+static int
+bcmcnet_pdma_resume(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    uint32_t qi;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        bcmcnet_pdma_rx_queue_resume(dev, qi);
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        bcmcnet_pdma_tx_queue_resume(dev, qi);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get device information
+ */
+static void
+bcmcnet_pdma_info_get(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    uint32_t qi;
+
+    sal_strncpy(dev->info.dev_name, dev->name, sizeof(dev->info.dev_name) - 1);
+    dev->info.dev_name[sizeof(dev->info.dev_name) - 1] = 0;
+    dev->info.dev_id = dev->dev_id;
+    dev->info.dev_type = dev->dev_type;
+    dev->info.max_groups = hw->info.num_cmcs;
+    dev->info.max_queues = hw->info.num_chans;
+    dev->info.bm_groups = ctrl->bm_grp;
+    dev->info.bm_rx_queues = ctrl->bm_rxq;
+    dev->info.bm_tx_queues = ctrl->bm_txq;
+    dev->info.nb_groups = ctrl->nb_grp;
+    dev->info.nb_rx_queues = ctrl->nb_rxq;
+    dev->info.nb_tx_queues = ctrl->nb_txq;
+    dev->info.rx_desc_size = hw->info.rx_dcb_size;
+    dev->info.tx_desc_size = hw->info.tx_dcb_size;
+    dev->info.rx_ph_size = hw->info.rx_ph_size;
+    dev->info.tx_ph_size = hw->info.tx_ph_size;
+    dev->info.rx_buf_dflt = ctrl->rx_buf_size;
+    dev->info.nb_desc_dflt = ctrl->nb_desc;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[qi];
+        if (!rxq) {
+            continue;
+        }
+        dev->info.rx_buf_size[qi] = rxq->buf_size;
+        dev->info.nb_rx_desc[qi] = rxq->nb_desc;
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[qi];
+        if (!txq) {
+            continue;
+        }
+        dev->info.nb_tx_desc[qi] = txq->nb_desc;
+    }
+}
+
+/*!
+ * Get device statistics
+ */
+static void
+bcmcnet_pdma_stats_get(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    uint32_t packets = 0, bytes = 0, dropped = 0, errors = 0, nomems = 0, xoffs = 0;
+    uint32_t head_errors = 0, data_errors = 0, cell_errors = 0;
+    uint32_t qi;
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[qi];
+        if (!rxq) {
+            continue;
+        }
+        packets += rxq->stats.packets;
+        bytes += rxq->stats.bytes;
+        dropped += rxq->stats.dropped;
+        errors += rxq->stats.errors;
+        head_errors += rxq->stats.head_errors;
+        data_errors += rxq->stats.data_errors;
+        cell_errors += rxq->stats.cell_errors;
+        nomems += rxq->stats.nomems;
+        dev->stats.rxq_packets[qi] = rxq->stats.packets;
+        dev->stats.rxq_bytes[qi] = rxq->stats.bytes;
+        dev->stats.rxq_dropped[qi] = rxq->stats.dropped;
+        dev->stats.rxq_errors[qi] = rxq->stats.errors;
+        dev->stats.rxq_head_errors[qi] = rxq->stats.head_errors;
+        dev->stats.rxq_data_errors[qi] = rxq->stats.data_errors;
+        dev->stats.rxq_cell_errors[qi] = rxq->stats.cell_errors;
+        dev->stats.rxq_nomems[qi] = rxq->stats.nomems;
+    }
+
+    dev->stats.rx_packets = packets;
+    dev->stats.rx_bytes = bytes;
+    dev->stats.rx_dropped = dropped;
+    dev->stats.rx_errors = errors;
+    dev->stats.rx_head_errors = head_errors;
+    dev->stats.rx_data_errors = data_errors;
+    dev->stats.rx_cell_errors = cell_errors;
+    dev->stats.rx_nomems = nomems;
+
+    packets = bytes = dropped = errors = 0;
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[qi];
+        if (!txq) {
+            continue;
+        }
+        packets += txq->stats.packets;
+        bytes += txq->stats.bytes;
+        dropped += txq->stats.dropped;
+        errors += txq->stats.errors;
+        xoffs += txq->stats.xoffs;
+        dev->stats.txq_packets[qi] = txq->stats.packets;
+        dev->stats.txq_bytes[qi] = txq->stats.bytes;
+        dev->stats.txq_dropped[qi] = txq->stats.dropped;
+        dev->stats.txq_errors[qi] = txq->stats.errors;
+        dev->stats.txq_xoffs[qi] = txq->stats.xoffs;
+    }
+
+    dev->stats.tx_packets = packets;
+    dev->stats.tx_bytes = bytes;
+    dev->stats.tx_dropped = dropped;
+    dev->stats.tx_errors = errors;
+    dev->stats.tx_xoffs = xoffs;
+}
+
+/*!
+ * Reset device statistics
+ */
+static void
+bcmcnet_pdma_stats_reset(struct pdma_dev *dev)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    uint32_t qi;
+
+    sal_memset(&dev->stats, 0, sizeof(struct bcmcnet_dev_stats));
+
+    for (qi = 0; qi < ctrl->nb_rxq; qi++) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[qi];
+        if (!rxq) {
+            continue;
+        }
+        rxq->stats.packets = 0;
+        rxq->stats.bytes = 0;
+        rxq->stats.dropped = 0;
+        rxq->stats.errors = 0;
+        rxq->stats.head_errors = 0;
+        rxq->stats.data_errors = 0;
+        rxq->stats.cell_errors = 0;
+        rxq->stats.nomems = 0;
+    }
+
+    for (qi = 0; qi < ctrl->nb_txq; qi++) {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[qi];
+        if (!txq) {
+            continue;
+        }
+        txq->stats.packets = 0;
+        txq->stats.bytes = 0;
+        txq->stats.dropped = 0;
+        txq->stats.errors = 0;
+        txq->stats.xoffs = 0;
+    }
+}
+
+/*!
+ * Convert logic queue to physical queue
+ */
+static int
+bcmcnet_pdma_lq_to_pq(struct pdma_dev *dev, int queue, int dir, int *chan)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+
+    if (dir == PDMA_Q_RX) {
+        rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+        if (rxq->state & PDMA_RX_QUEUE_USED) {
+            *chan = rxq->chan_id;
+            return SHR_E_NONE;
+        }
+    } else {
+        txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+        if (txq->state & PDMA_TX_QUEUE_USED) {
+            *chan = txq->chan_id;
+            return SHR_E_NONE;
+        }
+    }
+
+    return SHR_E_UNAVAIL;
+}
+
+/*!
+ * Convert physical queue to logic queue
+ */
+static int
+bcmcnet_pdma_pq_to_lq(struct pdma_dev *dev, int chan, int *queue, int *dir)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+
+    rxq = ctrl->grp[chan / dev->grp_queues].rx_queue[chan % dev->grp_queues];
+    if (rxq->state & PDMA_RX_QUEUE_USED) {
+        *queue = rxq->queue_id;
+        *dir = PDMA_Q_RX;
+        return SHR_E_NONE;
+    }
+
+    txq = ctrl->grp[chan / dev->grp_queues].tx_queue[chan % dev->grp_queues];
+    if (txq->state & PDMA_TX_QUEUE_USED) {
+        *queue = txq->queue_id;
+        *dir = PDMA_Q_TX;
+        return SHR_E_NONE;
+    }
+
+    return SHR_E_UNAVAIL;
+}
+
+/*!
+ * Start Rx queue
+ */
+static int
+bcmcnet_pdma_rx_queue_start(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    rxq->state |= PDMA_RX_QUEUE_ACTIVE;
+
+    return hw->hdls.chan_start(hw, rxq->chan_id);
+}
+
+/*!
+ * Stop Rx queue
+ */
+static int
+bcmcnet_pdma_rx_queue_stop(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    rxq->state &= ~PDMA_RX_QUEUE_ACTIVE;
+
+    return hw->hdls.chan_stop(hw, rxq->chan_id);
+}
+
+/*!
+ * Start Tx queue
+ */
+static int
+bcmcnet_pdma_tx_queue_start(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    txq->state |= PDMA_TX_QUEUE_ACTIVE;
+
+    return dev->flags & PDMA_CHAIN_MODE ? SHR_E_NONE :
+           hw->hdls.chan_start(hw, txq->chan_id);
+}
+
+/*!
+ * Stop Tx queue
+ */
+static int
+bcmcnet_pdma_tx_queue_stop(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    txq->state &= ~PDMA_TX_QUEUE_ACTIVE;
+
+    return hw->hdls.chan_stop(hw, txq->chan_id);
+}
+
+/*!
+ * Enable Rx queue interrupt
+ */
+static int
+bcmcnet_pdma_rx_queue_intr_enable(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_intr_enable(hw, rxq->chan_id);
+}
+
+/*!
+ * Disable Rx queue interrupt
+ */
+static int
+bcmcnet_pdma_rx_queue_intr_disable(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_intr_disable(hw, rxq->chan_id);
+}
+
+/*!
+ * Acknowledge Rx queue interrupt
+ */
+static int
+bcmcnet_pdma_rx_queue_intr_ack(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_clear(hw, rxq->chan_id);
+}
+
+/*!
+ * Query Rx queue interrupt
+ */
+static int
+bcmcnet_pdma_rx_queue_intr_query(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_intr_query(hw, rxq->chan_id);
+}
+
+/*!
+ * Check Rx queue interrupt
+ */
+static int
+bcmcnet_pdma_rx_queue_intr_check(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_intr_check(hw, rxq->chan_id);
+}
+
+/*!
+ * Enable Tx queue interrupt
+ */
+static int
+bcmcnet_pdma_tx_queue_intr_enable(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    if (txq->state & PDMA_TX_QUEUE_POLL) {
+        return SHR_E_NONE;
+    } else {
+        return hw->hdls.chan_intr_enable(hw, txq->chan_id);
+    }
+}
+
+/*!
+ * Disable Tx queue interrupt
+ */
+static int
+bcmcnet_pdma_tx_queue_intr_disable(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    return hw->hdls.chan_intr_disable(hw, txq->chan_id);
+}
+
+/*!
+ * Acknowledge Tx queue interrupt
+ */
+static int
+bcmcnet_pdma_tx_queue_intr_ack(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    return hw->hdls.chan_clear(hw, txq->chan_id);
+}
+
+/*!
+ * Query Tx queue interrupt
+ */
+static int
+bcmcnet_pdma_tx_queue_intr_query(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    return hw->hdls.chan_intr_query(hw, txq->chan_id);
+}
+
+/*!
+ * Check Tx queue interrupt
+ */
+static int
+bcmcnet_pdma_tx_queue_intr_check(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    return hw->hdls.chan_intr_check(hw, txq->chan_id);
+}
+
+/*!
+ * \brief Device operation functions.
+ */
+static const struct dev_ops pdma_dev_ops = {
+    .dev_config                 = bcmcnet_pdma_config,
+    .dev_close                  = bcmcnet_pdma_close,
+    .dev_suspend                = bcmcnet_pdma_suspend,
+    .dev_resume                 = bcmcnet_pdma_resume,
+    .dev_info_get               = bcmcnet_pdma_info_get,
+    .dev_stats_get              = bcmcnet_pdma_stats_get,
+    .dev_stats_reset            = bcmcnet_pdma_stats_reset,
+    .dev_lq_to_pq               = bcmcnet_pdma_lq_to_pq,
+    .dev_pq_to_lq               = bcmcnet_pdma_pq_to_lq,
+    .rx_queue_start             = bcmcnet_pdma_rx_queue_start,
+    .rx_queue_stop              = bcmcnet_pdma_rx_queue_stop,
+    .tx_queue_start             = bcmcnet_pdma_tx_queue_start,
+    .tx_queue_stop              = bcmcnet_pdma_tx_queue_stop,
+    .rx_queue_setup             = bcmcnet_pdma_rx_queue_setup,
+    .rx_queue_release           = bcmcnet_pdma_rx_queue_release,
+    .rx_queue_restore           = bcmcnet_pdma_rx_queue_restore,
+    .rx_vqueue_setup            = bcmcnet_pdma_rx_vqueue_setup,
+    .rx_vqueue_release          = bcmcnet_pdma_rx_vqueue_release,
+    .tx_queue_setup             = bcmcnet_pdma_tx_queue_setup,
+    .tx_queue_release           = bcmcnet_pdma_tx_queue_release,
+    .tx_queue_restore           = bcmcnet_pdma_tx_queue_restore,
+    .tx_vqueue_setup            = bcmcnet_pdma_tx_vqueue_setup,
+    .tx_vqueue_release          = bcmcnet_pdma_tx_vqueue_release,
+    .rx_queue_intr_enable       = bcmcnet_pdma_rx_queue_intr_enable,
+    .rx_queue_intr_disable      = bcmcnet_pdma_rx_queue_intr_disable,
+    .rx_queue_intr_ack          = bcmcnet_pdma_rx_queue_intr_ack,
+    .rx_queue_intr_query        = bcmcnet_pdma_rx_queue_intr_query,
+    .rx_queue_intr_check        = bcmcnet_pdma_rx_queue_intr_check,
+    .tx_queue_intr_enable       = bcmcnet_pdma_tx_queue_intr_enable,
+    .tx_queue_intr_disable      = bcmcnet_pdma_tx_queue_intr_disable,
+    .tx_queue_intr_ack          = bcmcnet_pdma_tx_queue_intr_ack,
+    .tx_queue_intr_query        = bcmcnet_pdma_tx_queue_intr_query,
+    .tx_queue_intr_check        = bcmcnet_pdma_tx_queue_intr_check,
+    .rx_queue_suspend           = bcmcnet_pdma_rx_queue_suspend,
+    .rx_queue_resume            = bcmcnet_pdma_rx_queue_resume,
+    .tx_queue_wakeup            = bcmcnet_pdma_tx_queue_wakeup,
+    .rx_queue_poll              = bcmcnet_pdma_rx_queue_poll,
+    .tx_queue_poll              = bcmcnet_pdma_tx_queue_poll,
+    .group_poll                 = bcmcnet_pdma_group_poll,
+};
+
+/*!
+ * Open a device
+ */
+int
+bcmcnet_pdma_open(struct pdma_dev *dev)
+{
+    struct pdma_hw *hw = (struct pdma_hw *)dev->ctrl.hw;
+    struct intr_handle *hdl = NULL;
+    int chan, gi, qi;
+
+    if (!hw) {
+        return SHR_E_INIT;
+    }
+
+    /* Initialize the hardware */
+    hw->hdls.hw_reset(hw);
+    hw->hdls.hw_init(hw);
+
+    if ((uint32_t)dev->num_groups > hw->info.num_cmcs) {
+        return SHR_E_PARAM;
+    }
+    dev->grp_queues = hw->info.cmc_chans;
+    dev->num_queues = hw->info.num_chans;
+    dev->rx_ph_size = hw->info.rx_ph_size;
+    dev->tx_ph_size = hw->info.tx_ph_size;
+    dev->ctrl.nb_desc = NUM_RING_DESC;
+    dev->ctrl.budget = NUM_RXTX_BUDGET;
+    dev->ctrl.rx_desc_size = hw->info.rx_dcb_size;
+    dev->ctrl.tx_desc_size = hw->info.tx_dcb_size;
+
+    /* Initialize interrupt handler */
+    for (chan = 0; chan < dev->num_queues; chan++) {
+        gi = chan / dev->grp_queues;
+        qi = chan % dev->grp_queues;
+        hdl = &dev->ctrl.grp[gi].intr_hdl[qi];
+        hdl->unit = dev->unit;
+        hdl->group = gi;
+        hdl->chan = chan;
+        hdl->dev = dev;
+        hdl->intr_num = hw->hdls.chan_intr_num_get(hw, chan);
+        if (hdl->intr_num < 0) {
+            return SHR_E_INTERNAL;
+        }
+    }
+
+    /* Initialize buffer manager */
+    bcmcnet_buf_mngr_init(dev);
+
+    /* Allocate all the queues */
+    bcn_rx_queues_alloc(dev);
+    bcn_tx_queues_alloc(dev);
+
+    dev->pkt_xmit = bcmcnet_pdma_tx_queue_xmit;
+
+    dev->ops = (struct dev_ops *)&pdma_dev_ops;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Coalesce Rx interrupt
+ */
+int
+bcmcnet_pdma_rx_queue_int_coalesce(struct pdma_dev *dev, int queue, int count, int timer)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_rxq) {
+        return SHR_E_PARAM;
+    }
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    rxq->intr_coalescing = 1;
+    rxq->ic_val = (count & 0x7fff) << 16 | (timer & 0xffff);
+
+    return hw->hdls.chan_intr_coalesce(hw, rxq->chan_id, count, timer);
+}
+
+/*!
+ * Coalesce Tx interrupt
+ */
+int
+bcmcnet_pdma_tx_queue_int_coalesce(struct pdma_dev *dev, int queue, int count, int timer)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_txq) {
+        return SHR_E_PARAM;
+    }
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    txq->intr_coalescing = 1;
+    txq->ic_val = (count & 0x7fff) << 16 | (timer & 0xffff);
+
+    return hw->hdls.chan_intr_coalesce(hw, txq->chan_id, count, timer);
+}
+
+/*!
+ * Dump Rx queue registers
+ */
+int
+bcmcnet_pdma_rx_queue_reg_dump(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_rxq) {
+        return SHR_E_PARAM;
+    }
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+
+    return hw->hdls.chan_reg_dump(hw, rxq->chan_id);
+}
+
+/*!
+ * Dump Tx queue registers
+ */
+int
+bcmcnet_pdma_tx_queue_reg_dump(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_txq) {
+        return SHR_E_PARAM;
+    }
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+
+    return hw->hdls.chan_reg_dump(hw, txq->chan_id);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_rxtx.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_rxtx.c
new file mode 100644
index 000000000000..cfabe9d95d56
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/main/bcmcnet_rxtx.c
@@ -0,0 +1,708 @@
+/*! \file bcmcnet_rxtx.c
+ *
+ * Utility routines for BCMCNET Rx/Tx.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include <bcmcnet/bcmcnet_buff.h>
+
+/*!
+ * Free a Rx ring
+ */
+static void
+bcn_rx_ring_free(struct pdma_rx_queue *rxq)
+{
+    struct dev_ctrl *ctrl = rxq->ctrl;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)ctrl->buf_mngr;
+
+    if (rxq->lock) {
+        sal_spinlock_destroy(rxq->lock);
+        rxq->lock = NULL;
+    }
+
+    if (rxq->ring) {
+        bm->ring_buf_free(ctrl->dev, ctrl->rx_desc_size * (rxq->nb_desc + 1),
+                          rxq->ring, rxq->ring_addr);
+        rxq->ring = NULL;
+    }
+
+    if (rxq->pbuf) {
+        sal_free(rxq->pbuf);
+        rxq->pbuf = NULL;
+    }
+}
+
+/*!
+ * Allocate a Rx ring
+ */
+static int
+bcn_rx_ring_alloc(struct pdma_rx_queue *rxq)
+{
+    struct dev_ctrl *ctrl = rxq->ctrl;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)ctrl->buf_mngr;
+
+    /* Setup pktbuf ring */
+    rxq->pbuf = sal_alloc(sizeof(*rxq->pbuf) * rxq->nb_desc, "bcmcnetRxBufRing");
+    if (!rxq->pbuf) {
+        goto cleanup;
+    }
+    sal_memset(rxq->pbuf, 0, sizeof(*rxq->pbuf) * rxq->nb_desc);
+
+    /* Allocate memory for descriptors */
+    rxq->ring = bm->ring_buf_alloc(ctrl->dev, ctrl->rx_desc_size * (rxq->nb_desc + 1),
+                                   &rxq->ring_addr);
+    if (!rxq->ring) {
+        goto cleanup;
+    }
+    sal_memset(rxq->ring, 0, ctrl->rx_desc_size * (rxq->nb_desc + 1));
+
+    rxq->lock = sal_spinlock_create("bcmcnetRxQueueLock");
+    if (!rxq->lock) {
+        goto cleanup;
+    }
+
+    return SHR_E_NONE;
+
+cleanup:
+    bcn_rx_ring_free(rxq);
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * Free a Tx ring
+ */
+static void
+bcn_tx_ring_free(struct pdma_tx_queue *txq)
+{
+    struct dev_ctrl *ctrl = txq->ctrl;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)ctrl->buf_mngr;
+
+    if (txq->sem) {
+        sal_sem_destroy(txq->sem);
+        txq->sem = NULL;
+    }
+
+    if (txq->mutex) {
+        sal_spinlock_destroy(txq->mutex);
+        txq->mutex = NULL;
+    }
+
+    if (txq->lock) {
+        sal_spinlock_destroy(txq->lock);
+        txq->lock = NULL;
+    }
+
+    if (txq->ring) {
+        bm->ring_buf_free(ctrl->dev, ctrl->tx_desc_size * (txq->nb_desc + 1),
+                          txq->ring, txq->ring_addr);
+        txq->ring = NULL;
+    }
+
+    if (txq->pbuf) {
+        sal_free(txq->pbuf);
+        txq->pbuf = NULL;
+    }
+}
+
+/*!
+ * Allocate a Tx ring
+ */
+static int
+bcn_tx_ring_alloc(struct pdma_tx_queue *txq)
+{
+    struct dev_ctrl *ctrl = txq->ctrl;
+    struct pdma_buf_mngr *bm = (struct pdma_buf_mngr *)ctrl->buf_mngr;
+
+    /* Setup pktbuf ring */
+    txq->pbuf = sal_alloc(sizeof(*txq->pbuf) * txq->nb_desc, "bcmcnetTxBufRing");
+    if (!txq->pbuf) {
+        goto cleanup;
+    }
+    sal_memset(txq->pbuf, 0, sizeof(*txq->pbuf) * txq->nb_desc);
+
+    /* Allocate memory for descriptors */
+    txq->ring = bm->ring_buf_alloc(ctrl->dev, ctrl->tx_desc_size * (txq->nb_desc + 1),
+                                   &txq->ring_addr);
+    if (!txq->ring) {
+        goto cleanup;
+    }
+    sal_memset(txq->ring, 0, ctrl->tx_desc_size * (txq->nb_desc + 1));
+
+    txq->lock = sal_spinlock_create("bcmcnetTxQueueLock");
+    if (!txq->lock) {
+        goto cleanup;
+    }
+
+    txq->mutex = sal_spinlock_create("bcmcnetTxMutexLock");
+    if (!txq->mutex) {
+        goto cleanup;
+    }
+
+    txq->sem = sal_sem_create("bcmcnetTxMutexSem", SAL_SEM_BINARY, 0);
+    if (!txq->sem) {
+        goto cleanup;
+    }
+
+    return SHR_E_NONE;
+
+cleanup:
+    bcn_tx_ring_free(txq);
+
+    return SHR_E_MEMORY;
+}
+
+/*!
+ * Rx polling
+ */
+static int
+bcn_rx_poll(struct pdma_rx_queue *rxq, int budget)
+{
+    struct dev_ctrl *ctrl = rxq->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+
+    return hw->dops.rx_ring_clean(hw, rxq, budget);
+}
+
+/*!
+ * Tx polling
+ */
+static int
+bcn_tx_poll(struct pdma_tx_queue *txq, int budget)
+{
+    struct dev_ctrl *ctrl = txq->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+
+    return hw->dops.tx_ring_clean(hw, txq, budget);
+}
+
+/*!
+ * Setup a Rx queue
+ */
+int
+bcmcnet_pdma_rx_queue_setup(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+    int rv;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (rxq->state & PDMA_RX_QUEUE_SETUP) {
+        return SHR_E_NONE;
+    }
+
+    rv = bcn_rx_ring_alloc(rxq);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    rv = hw->dops.rx_desc_init(hw, rxq);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    if (dev->mode == DEV_MODE_VNET) {
+        ctrl->vsync.rx_ring_addr[queue] = rxq->ring_addr;
+        ctrl->vsync.rx_ring_size[queue] = rxq->nb_desc;
+    }
+
+    rxq->state |= PDMA_RX_QUEUE_SETUP;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Release a Rx queue
+ */
+int
+bcmcnet_pdma_rx_queue_release(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (rxq->state & PDMA_RX_QUEUE_SETUP) {
+        hw->dops.rx_desc_clean(hw, rxq);
+        bcn_rx_ring_free(rxq);
+        rxq->state &= ~PDMA_RX_QUEUE_SETUP;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Restore a Rx queue
+ */
+int
+bcmcnet_pdma_rx_queue_restore(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (rxq->state & PDMA_RX_QUEUE_SETUP) {
+        hw->dops.rx_desc_init(hw, rxq);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Set up a virtual Rx queue
+ */
+int
+bcmcnet_pdma_rx_vqueue_setup(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *vrxq = NULL;
+
+    vrxq = (struct pdma_rx_queue *)ctrl->vnet_rxq[queue];
+    if (vrxq->state & PDMA_RX_QUEUE_SETUP) {
+        return SHR_E_NONE;
+    }
+
+    if (dev->ctrl.vsync.rx_ring_addr[queue]) {
+        vrxq->curr = 0;
+        vrxq->nb_desc = dev->ctrl.vsync.rx_ring_size[queue];
+        vrxq->ring_addr = dev->ctrl.vsync.rx_ring_addr[queue];
+        vrxq->ring = dev->sys_p2v(dev, vrxq->ring_addr);
+        vrxq->state |= PDMA_RX_QUEUE_SETUP;
+    } else {
+        return SHR_E_UNAVAIL;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Release a virtual Rx queue
+ */
+int
+bcmcnet_pdma_rx_vqueue_release(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *vrxq = NULL;
+
+    vrxq = (struct pdma_rx_queue *)ctrl->vnet_rxq[queue];
+    if (vrxq->state & PDMA_RX_QUEUE_SETUP) {
+        vrxq->state &= ~PDMA_RX_QUEUE_SETUP;
+        vrxq->ring = NULL;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Setup a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_setup(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+    int rv;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (txq->state & PDMA_TX_QUEUE_SETUP) {
+        return SHR_E_NONE;
+    }
+
+    rv = bcn_tx_ring_alloc(txq);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    rv = hw->dops.tx_desc_init(hw, txq);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    if (dev->mode == DEV_MODE_VNET) {
+        ctrl->vsync.tx_ring_addr[queue] = txq->ring_addr;
+        ctrl->vsync.tx_ring_size[queue] = txq->nb_desc;
+    }
+
+    txq->state |= PDMA_TX_QUEUE_SETUP;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Release a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_release(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (txq->state & PDMA_TX_QUEUE_SETUP) {
+        hw->dops.tx_desc_clean(hw, txq);
+        bcn_tx_ring_free(txq);
+        txq->state &= ~PDMA_TX_QUEUE_SETUP;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Restore a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_restore(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (txq->state & PDMA_TX_QUEUE_SETUP) {
+        hw->dops.tx_desc_init(hw, txq);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Set up a virtual Tx queue
+ */
+int
+bcmcnet_pdma_tx_vqueue_setup(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *vtxq = NULL;
+
+    vtxq = (struct pdma_tx_queue *)ctrl->vnet_txq[queue];
+    if (vtxq->state & PDMA_TX_QUEUE_SETUP) {
+        return SHR_E_NONE;
+    }
+
+    if (dev->ctrl.vsync.tx_ring_addr[queue]) {
+        vtxq->curr = 0;
+        vtxq->dirt = 0;
+        vtxq->nb_desc = dev->ctrl.vsync.tx_ring_size[queue];
+        vtxq->ring_addr = dev->ctrl.vsync.tx_ring_addr[queue];
+        vtxq->ring = dev->sys_p2v(dev, vtxq->ring_addr);
+        vtxq->state |= PDMA_TX_QUEUE_SETUP;
+    } else {
+        return SHR_E_UNAVAIL;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Release a virtual Tx queue
+ */
+int
+bcmcnet_pdma_tx_vqueue_release(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *vtxq = NULL;
+
+    vtxq = (struct pdma_tx_queue *)ctrl->vnet_txq[queue];
+    if (vtxq->state & PDMA_TX_QUEUE_SETUP) {
+        vtxq->state &= ~PDMA_TX_QUEUE_SETUP;
+        vtxq->ring = NULL;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend a Rx queue
+ */
+int
+bcmcnet_pdma_rx_queue_suspend(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (!rxq || !(rxq->state & PDMA_RX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    return hw->dops.rx_suspend(hw, rxq);
+}
+
+/*!
+ * Resume a Rx queue
+ */
+int
+bcmcnet_pdma_rx_queue_resume(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (!rxq || !(rxq->state & PDMA_RX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    return hw->dops.rx_resume(hw, rxq);
+}
+
+/*!
+ * Suspend a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_suspend(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (!txq || !(txq->state & PDMA_TX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (txq->sem) {
+        sal_sem_take(txq->sem, SAL_SEM_FOREVER);
+    }
+    if (dev->tx_suspend) {
+        dev->tx_suspend(dev, txq->queue_id);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Resume a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_resume(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (!txq || !(txq->state & PDMA_TX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    if (txq->sem) {
+        sal_sem_give(txq->sem);
+    }
+    if (dev->tx_resume) {
+        dev->tx_resume(dev, txq->queue_id);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Wake up a Tx queue
+ */
+int
+bcmcnet_pdma_tx_queue_wakeup(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (txq->sem) {
+        sal_sem_give(txq->sem);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Transmit a outputing packet
+ */
+int
+bcmcnet_pdma_tx_queue_xmit(struct pdma_dev *dev, int queue, void *buf)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (!txq || !(txq->state & PDMA_TX_QUEUE_ACTIVE)) {
+        return SHR_E_UNAVAIL;
+    }
+
+    return hw->dops.pkt_xmit(hw, txq, buf);
+}
+
+/*!
+ * Poll a Rx queues
+ */
+int
+bcmcnet_pdma_rx_queue_poll(struct pdma_dev *dev, int queue, int budget)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_rx_queue *rxq = ctrl->rx_queue[queue];
+
+    return bcn_rx_poll(rxq, budget);
+}
+
+/*!
+ * Poll a Tx queues
+ */
+int
+bcmcnet_pdma_tx_queue_poll(struct pdma_dev *dev, int queue, int budget)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_tx_queue *txq = ctrl->tx_queue[queue];
+
+    return bcn_tx_poll(txq, budget);
+}
+
+/*!
+ * Poll for Rx/Tx queues in a group
+ */
+int
+bcmcnet_pdma_group_poll(struct pdma_dev *dev, int group, int budget)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = (struct pdma_hw *)ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+    struct pdma_tx_queue *txq = NULL;
+    struct queue_group *grp = &ctrl->grp[group];
+    int done = 0, done_que, budget_que;
+    int i;
+
+    /* Acknowledge the interrupts */
+    for (i = 0; i < dev->grp_queues; i++) {
+        rxq = grp->rx_queue[i];
+        if (rxq->state & PDMA_RX_QUEUE_ACTIVE) {
+            if (hw->hdls.chan_intr_query(hw, rxq->chan_id)) {
+                hw->hdls.chan_clear(hw, rxq->chan_id);
+                grp->poll_queues |= 1 << i;
+            } else if (rxq->state & PDMA_RX_QUEUE_BUSY) {
+                rxq->state &= ~PDMA_RX_QUEUE_BUSY;
+                grp->poll_queues |= 1 << i;
+            }
+            continue;
+        }
+        txq = grp->tx_queue[i];
+        if (txq->state & PDMA_TX_QUEUE_ACTIVE) {
+            if (hw->hdls.chan_intr_query(hw, txq->chan_id)) {
+                hw->hdls.chan_clear(hw, txq->chan_id);
+                grp->poll_queues |= 1 << i;
+            }
+        }
+    }
+
+    /* Calculate per queue budget */
+    if (!grp->poll_queues) {
+        grp->poll_queues = grp->bm_rxq | grp->bm_txq;
+        budget_que = budget / grp->nb_rxq;
+    } else {
+        budget_que = 0;
+        for (i = 0; i < dev->grp_queues; i++) {
+            if (1 << i & grp->bm_rxq & grp->poll_queues) {
+                budget_que++;
+            }
+        }
+        if (budget_que) {
+            budget_que = budget / budget_que;
+        }
+    }
+
+    /* Poll Rx queues */
+    for (i = 0; i < dev->grp_queues; i++) {
+        if (1 << i & grp->bm_rxq & grp->poll_queues) {
+            rxq = grp->rx_queue[i];
+            done_que = bcn_rx_poll(rxq, budget_que);
+            if (done_que < budget_que) {
+                grp->poll_queues &= ~(1 << i);
+            }
+            done += done_que;
+        }
+    }
+
+    /* Poll Tx queues */
+    for (i = 0; i < dev->grp_queues; i++) {
+        txq = grp->tx_queue[i];
+        if (1 << i & grp->bm_txq & grp->poll_queues && !txq->free_thresh) {
+            if (bcn_tx_poll(txq, budget) < budget) {
+                grp->poll_queues &= ~(1 << i);
+            }
+        }
+    }
+
+    return grp->poll_queues ? budget : done;
+}
+
+/*!
+ * Dump a Rx ring
+ */
+int
+bcmcnet_pdma_rx_ring_dump(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = ctrl->hw;
+    struct pdma_rx_queue *rxq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_rxq) {
+        return SHR_E_PARAM;
+    }
+
+    rxq = (struct pdma_rx_queue *)ctrl->rx_queue[queue];
+    if (rxq->state & PDMA_RX_QUEUE_ACTIVE) {
+        hw->dops.rx_ring_dump(hw, rxq);
+    }
+    if (dev->mode == DEV_MODE_HNET) {
+        rxq = (struct pdma_rx_queue *)ctrl->vnet_rxq[queue];
+        hw->dops.rx_ring_dump(hw, rxq);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Dump a Tx ring
+ */
+int
+bcmcnet_pdma_tx_ring_dump(struct pdma_dev *dev, int queue)
+{
+    struct dev_ctrl *ctrl = &dev->ctrl;
+    struct pdma_hw *hw = ctrl->hw;
+    struct pdma_tx_queue *txq = NULL;
+
+    if ((uint32_t)queue >= ctrl->nb_txq) {
+        return SHR_E_PARAM;
+    }
+
+    txq = (struct pdma_tx_queue *)ctrl->tx_queue[queue];
+    if (txq->state & PDMA_TX_QUEUE_ACTIVE) {
+        hw->dops.tx_ring_dump(hw, txq);
+    }
+    if (dev->mode == DEV_MODE_HNET) {
+        txq = (struct pdma_tx_queue *)ctrl->vnet_txq[queue];
+        hw->dops.tx_ring_dump(hw, txq);
+    }
+
+    return SHR_E_NONE;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_devlist.h b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_devlist.h
new file mode 100644
index 000000000000..675b9426ea01
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_devlist.h
@@ -0,0 +1,337 @@
+/*
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated.
+ * Edits to this file will be lost when it is regenerated.
+ * Tool: INTERNAL/drd/instpkgs.pl
+ *
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+/*
+ * This file contains the complete list of supported devices.
+ * No other device lists should be used anywhere in the SDK.
+ */
+
+#ifndef BCMDRD_DEVIDS_H
+#define BCMDRD_DEVIDS_H
+
+#include <bcmdrd_config.h>
+
+/*
+ * All Supported Devices and Revisions
+ */
+
+#define BROADCOM_VENDOR_ID                0x14e4
+#define BROADCOM_PHYID_MSB                0x0143
+
+/* BCM56780 */
+#define BCM56780_VENDOR_ID                0x14e4
+#define BCM56780_DEVICE_ID                0xb780
+#define BCM56780_REV_A0                     0x01
+
+/* BCM56782 */
+#define BCM56782_VENDOR_ID                0x14e4
+#define BCM56782_DEVICE_ID                0xb782
+#define BCM56782_REV_A0                     0x01
+
+/* BCM56784 */
+#define BCM56784_VENDOR_ID                0x14e4
+#define BCM56784_DEVICE_ID                0xb784
+#define BCM56784_REV_A0                     0x01
+
+/* BCM56786 */
+#define BCM56786_VENDOR_ID                0x14e4
+#define BCM56786_DEVICE_ID                0xb786
+#define BCM56786_REV_A0                     0x01
+
+/* BCM56788 */
+#define BCM56788_VENDOR_ID                0x14e4
+#define BCM56788_DEVICE_ID                0xb788
+#define BCM56788_REV_A0                     0x01
+
+/* BCM56789 */
+#define BCM56789_VENDOR_ID                0x14e4
+#define BCM56789_DEVICE_ID                0xb789
+#define BCM56789_REV_A0                     0x01
+
+/* BCM56880 */
+#define BCM56880_VENDOR_ID                0x14e4
+#define BCM56880_DEVICE_ID                0xb880
+#define BCM56880_REV_A0                     0x01
+#define BCM56880_REV_B0                     0x11
+
+/* BCM56881 */
+#define BCM56881_VENDOR_ID                0x14e4
+#define BCM56881_DEVICE_ID                0xb881
+#define BCM56881_REV_A0                     0x01
+#define BCM56881_REV_B0                     0x11
+
+/* BCM56883 */
+#define BCM56883_VENDOR_ID                0x14e4
+#define BCM56883_DEVICE_ID                0xb883
+#define BCM56883_REV_A0                     0x01
+#define BCM56883_REV_B0                     0x11
+
+/* BCM56889 */
+#define BCM56889_VENDOR_ID                0x14e4
+#define BCM56889_DEVICE_ID                0xb889
+#define BCM56889_REV_A0                     0x01
+#define BCM56889_REV_B0                     0x11
+
+/* BCM56990 */
+#define BCM56990_VENDOR_ID                0x14e4
+#define BCM56990_DEVICE_ID                0xb990
+#define BCM56990_REV_A0                     0x01
+#define BCM56990_REV_B0                     0x11
+
+/* BCM56992 */
+#define BCM56992_VENDOR_ID                0x14e4
+#define BCM56992_DEVICE_ID                0xb992
+#define BCM56992_REV_B0                     0x11
+
+/* BCM56996 */
+#define BCM56996_VENDOR_ID                0x14e4
+#define BCM56996_DEVICE_ID                0xb996
+#define BCM56996_REV_A0                     0x01
+
+/* BCM56997 */
+#define BCM56997_VENDOR_ID                0x14e4
+#define BCM56997_DEVICE_ID                0xb997
+#define BCM56997_REV_A0                     0x01
+
+/*
+ * End of Supported Devices and Revisions
+ */
+
+#endif /* BCMDRD_DEVIDS_H */
+
+#ifdef BCMDRD_DEVLIST_ENTRY
+/*
+ * BCMDRD_DEVLIST_ENTRY macros.
+ *
+ * Before including this file, define BCMDRD_DEVLIST_ENTRY
+ * as a macro to operate on the following parameters:
+ *
+ *     #define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1)
+ *
+ *     _nm: Chip Name
+ *     _vn: Chip Vendor ID
+ *     _dv: Chip Device ID
+ *     _rv: Chip Revision
+ *     _md: Chip Model
+ *     _pi: Probe Information
+ *     _bd: SW Base Driver
+ *     _bc: SW Base Configuration
+ *     _fn: SW Full Name
+ *     _cn: Code Name
+ *     _pf: Product Family
+ *     _pd: Product Description
+ *     _r0: Reserved
+ *     _r1: Reserved
+ *
+ * Note that this macro will be undefined at the end of this file.
+ */
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+BCMDRD_DEVLIST_ENTRY(BCM56780, BCM56780_VENDOR_ID, BCM56780_DEVICE_ID, BCM56780_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56780_a0, bcm56780_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "8 Tb/s 160x50G-PAM4 Programmable Switch", 0, 0)
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56782_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56782, BCM56782_VENDOR_ID, BCM56782_DEVICE_ID, BCM56782_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56782_a0, bcm56782_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "8 Tb/s 160x50G-PAM4 Programmable Switch w/MACsec", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56784_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56784, BCM56784_VENDOR_ID, BCM56784_DEVICE_ID, BCM56784_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56784_a0, bcm56784_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "5.6 Tb/s 96x50G-PAM4/32x35G-NRZ Programmable Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56786_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56786, BCM56786_VENDOR_ID, BCM56786_DEVICE_ID, BCM56786_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56786_a0, bcm56786_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "5.6 Tb/s 96x50G-PAM4/32x35G-NRZ Programmable Switch w/MACsec", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56788_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56788, BCM56788_VENDOR_ID, BCM56788_DEVICE_ID, BCM56788_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56788_a0, bcm56788_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "8 Tb/s 160x50G-PAM4 Programmable Switch w/MACsec w/MTop", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56789_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56789, BCM56789_VENDOR_ID, BCM56789_DEVICE_ID, BCM56789_REV_A0, \
+                     0, 0, \
+                     bcm56780_a0, bcm56789_a0, bcm56789_a0, \
+                     "Trident4-X9", "BCM56780", \
+                     "8 Tb/s 160x50G-PAM4 Programmable Switch w/MTop", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+BCMDRD_DEVLIST_ENTRY(BCM56880, BCM56880_VENDOR_ID, BCM56880_DEVICE_ID, BCM56880_REV_A0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56880_a0, bcm56880_a0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56880, BCM56880_VENDOR_ID, BCM56880_DEVICE_ID, BCM56880_REV_B0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56880_a0, bcm56880_b0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56881_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56881, BCM56881_VENDOR_ID, BCM56881_DEVICE_ID, BCM56881_REV_A0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56881_a0, bcm56881_a0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56881_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56881, BCM56881_VENDOR_ID, BCM56881_DEVICE_ID, BCM56881_REV_B0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56881_a0, bcm56881_b0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56883_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56883, BCM56883_VENDOR_ID, BCM56883_DEVICE_ID, BCM56883_REV_A0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56883_a0, bcm56883_a0, \
+                     "Trident4", "BCM56880", \
+                     "8.0 Tb/s Switch Fabric 80x100G/40x200G/20x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56883_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56883, BCM56883_VENDOR_ID, BCM56883_DEVICE_ID, BCM56883_REV_B0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56883_a0, bcm56883_b0, \
+                     "Trident4", "BCM56880", \
+                     "8.0 Tb/s Switch Fabric 80x100G/40x200G/20x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56889_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56889, BCM56889_VENDOR_ID, BCM56889_DEVICE_ID, BCM56889_REV_A0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56889_a0, bcm56889_a0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56889_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56889, BCM56889_VENDOR_ID, BCM56889_DEVICE_ID, BCM56889_REV_B0, \
+                     0, 0, \
+                     bcm56880_a0, bcm56889_a0, bcm56889_b0, \
+                     "Trident4", "BCM56880", \
+                     "12.8 Tb/s Switch Fabric 128x100G/64x200G/32x400G Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56990_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+BCMDRD_DEVLIST_ENTRY(BCM56990, BCM56990_VENDOR_ID, BCM56990_DEVICE_ID, BCM56990_REV_A0, \
+                     0, 0, \
+                     bcm56990_a0, bcm56990_a0, bcm56990_a0, \
+                     "Tomahawk4", "BCM56990", \
+                     "25.6 Tbps Multilayer Switch", 0, 0)
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56990_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+BCMDRD_DEVLIST_ENTRY(BCM56990, BCM56990_VENDOR_ID, BCM56990_DEVICE_ID, BCM56990_REV_B0, \
+                     0, 0, \
+                     bcm56990_b0, bcm56990_b0, bcm56990_b0, \
+                     "Tomahawk4", "BCM56990", \
+                     "25.6 Tbps Multilayer Switch", 0, 0)
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56992_B0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56992, BCM56992_VENDOR_ID, BCM56992_DEVICE_ID, BCM56992_REV_B0, \
+                     0, 0, \
+                     bcm56990_b0, bcm56992_b0, bcm56992_b0, \
+                     "Tomahawk4", "BCM56990", \
+                     "25.6 Tbps Multilayer Switch", 0, 0)
+#endif
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56996_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+BCMDRD_DEVLIST_ENTRY(BCM56996, BCM56996_VENDOR_ID, BCM56996_DEVICE_ID, BCM56996_REV_A0, \
+                     0, 0, \
+                     bcm56996_a0, bcm56996_a0, bcm56996_a0, \
+                     "Tomahawk4G", "BCM56996", \
+                     "25.6 Tbps Multilayer Switch", 0, 0)
+#endif
+
+#if BCMDRD_CONFIG_INCLUDE_BCM56997_A0 == 1 || defined(BCMDRD_DEVLIST_OVERRIDE)
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+BCMDRD_DEVLIST_ENTRY(BCM56997, BCM56997_VENDOR_ID, BCM56997_DEVICE_ID, BCM56997_REV_A0, \
+                     0, 0, \
+                     bcm56996_a0, bcm56997_a0, bcm56997_a0, \
+                     "Tomahawk4G", "BCM56996", \
+                     "12.8 Tbps Multilayer Switch", 0, 0)
+#endif
+#endif
+
+/* End BCMDRD_DEVLIST_ENTRY Macros */
+
+#ifdef BCMDRD_DEVLIST_INCLUDE_ALL
+#undef BCMDRD_DEVLIST_INCLUDE_ALL
+#endif
+#ifdef BCMDRD_DEVLIST_OVERRIDE
+#undef BCMDRD_DEVLIST_OVERRIDE
+#endif
+#undef BCMDRD_DEVLIST_ENTRY
+#endif /* BCMDRD_DEVLIST_ENTRY */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config.h b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config.h
new file mode 100644
index 000000000000..68e5a0891098
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config.h
@@ -0,0 +1,166 @@
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file will be auto-generated in the near future.
+ *
+ * This config file defines all compilation-time specifications for
+ * the BCMDRD.
+ *
+ * Reasonable defaults are provided for all configuration options
+ * where appropriate.
+ *
+ * You need not edit this file directly to change your configuration,
+ * nor is modifying this file advised -- so doing will require
+ * manually merging whenever the BCMDRD is upgraded.
+ *
+ * You should provide your own configuration options or overrides
+ * through a combination of:
+ *
+ *      1. The compiler command line, such as -D{OPTION}={VALUE}
+ *
+ *      2. Create your own custom configuration file:
+ *         a) Create a file called 'bcmdrd_custom_config.h'
+ *         b) Define all custom settings, using this file as
+ *            the reference
+ *         c) Add -DBCMDRD_INCLUDE_CUSTOM_CONFIG to your
+ *            compilation
+ *         d) Make sure the compilation include path includes
+ *            'bcmdrd_custom_config.h'
+ *
+ */
+
+#ifndef BCMDRD_CONFIG_H
+#define BCMDRD_CONFIG_H
+
+
+/*
+ * Include system config file if specified:
+ */
+#ifdef BCMDRD_INCLUDE_CUSTOM_CONFIG
+#include <bcmdrd_custom_config.h>
+#endif
+
+
+/*
+ * OPTIONAL configuration and feature values.
+ * Defaults are provided for all non-specified values.
+ */
+
+/* Maximum number of chips supported */
+#ifndef BCMDRD_CONFIG_MAX_UNITS
+#define BCMDRD_CONFIG_MAX_UNITS                    8
+#endif
+
+/* Maximum number of ports per chip supported */
+#ifndef BCMDRD_CONFIG_MAX_PORTS
+#define BCMDRD_CONFIG_MAX_PORTS                    576
+#endif
+
+/* Maximum number of SCHAN polls */
+#ifndef BCMDRD_CONFIG_SCHAN_MAX_POLLS
+#define BCMDRD_CONFIG_SCHAN_MAX_POLLS              100000
+#endif
+
+/* Maximum number of MIIM polls */
+#ifndef BCMDRD_CONFIG_MIIM_MAX_POLLS
+#define BCMDRD_CONFIG_MIIM_MAX_POLLS               100000
+#endif
+
+/* Direct access to memory-mapped registers */
+#ifndef BCMDRD_CONFIG_MEMMAP_DIRECT
+#define BCMDRD_CONFIG_MEMMAP_DIRECT                0
+#endif
+
+/*
+ * Include chip symbol tables for the debug shell.
+ *
+ * No symbolic debugging (register/memory names) will be available
+ * without this defined.
+ *
+ * You should enable at least these symbols if you can afford the
+ * space.
+ *
+ * This define is required to get any symbols at all.
+ *
+ * If you only wish to include symbols for a subset of chips in the
+ * system (probably for code space reasons), you can define the
+ * following for each chip whose symbols you wish to EXCLUDE:
+ *
+ *       BCMDRD_CONFIG_EXCLUDE_CHIP_SYMBOLS_<CHIP>
+ *
+ */
+#ifndef BCMDRD_CONFIG_INCLUDE_CHIP_SYMBOLS
+#define BCMDRD_CONFIG_INCLUDE_CHIP_SYMBOLS         1
+#endif
+
+/*
+ * Include register and memory field information for the debug shell.
+ *
+ * This provides encoding, decoding, and displaying individual field
+ * values for each register and memory.
+ *
+ * Requires more code space than just the chip symbols alone.
+ *
+ * The per-chip exclusion define
+ * (BCMDRD_CONFIG_EXCLUDE_FIELD_INFO_<CHIP>) also applies.
+ */
+#ifndef BCMDRD_CONFIG_INCLUDE_FIELD_INFO
+#define BCMDRD_CONFIG_INCLUDE_FIELD_INFO           1
+#endif
+
+/*
+ * Include alternative symbol names for registers and memories.
+ *
+ * Mainly for internal Broadcom use, so you can safely leave this
+ * option off.
+ */
+#ifndef BCMDRD_CONFIG_INCLUDE_ALIAS_NAMES
+#define BCMDRD_CONFIG_INCLUDE_ALIAS_NAMES          1
+#endif
+
+#endif /* BCMDRD_CONFIG_H */
+
+#ifdef CONFIG_OPTION
+#ifdef BCMDRD_INCLUDE_CUSTOM_CONFIG
+CONFIG_OPTION(BCMDRD_INCLUDE_CUSTOM_CONFIG)
+#endif
+#ifdef BCMDRD_CONFIG_MAX_UNITS
+CONFIG_OPTION(BCMDRD_CONFIG_MAX_UNITS)
+#endif
+#ifdef BCMDRD_CONFIG_MAX_PORTS
+CONFIG_OPTION(BCMDRD_CONFIG_MAX_PORTS)
+#endif
+#ifdef BCMDRD_CONFIG_SCHAN_MAX_POLLS
+CONFIG_OPTION(BCMDRD_CONFIG_SCHAN_MAX_POLLS)
+#endif
+#ifdef BCMDRD_CONFIG_MIIM_MAX_POLLS
+CONFIG_OPTION(BCMDRD_CONFIG_MIIM_MAX_POLLS)
+#endif
+#ifdef BCMDRD_CONFIG_MEMMAP_DIRECT
+CONFIG_OPTION(BCMDRD_CONFIG_MEMMAP_DIRECT)
+#endif
+#ifdef BCMDRD_CONFIG_INCLUDE_CHIP_SYMBOLS
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_CHIP_SYMBOLS)
+#endif
+#ifdef BCMDRD_CONFIG_INCLUDE_FIELD_INFO
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_FIELD_INFO)
+#endif
+#ifdef BCMDRD_CONFIG_INCLUDE_ALIAS_NAMES
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_ALIAS_NAMES)
+#endif
+#endif /* CONFIG_OPTION */
+#include "bcmdrd_config_chips.h"
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
new file mode 100644
index 000000000000..5b45879c90e9
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
@@ -0,0 +1,545 @@
+/*
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated.
+ * Edits to this file will be lost when it is regenerated.
+ * Tool: INTERNAL/drd/instpkgs.pl
+ *
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+/*
+ * Chip inclusion and exclusion support within the BCMDRD can be
+ * specified as a combination of the following defines:
+ *
+ *     (1) #define BCMDRD_CONFIG_INCLUDE_<CHIPNAME> [1|0]
+ *             -- Include or exclude all revisions of the given device
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780    1
+ *
+ *     (2) #define BCMDRD_CONFIG_INCLUDE_<CHIPNAME>_<REV>X [1|0]
+ *             -- Include or exclude all versions of the given revision
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780_Ax 0
+ *                      #define BCMDRD_CONFIG_INCLUde_BCM56780_Bx 1
+ *
+ *     (3) #define BCMDRD_CONFIG_INCLUDE_<EXACT_CHIP> [1|0]
+ *             -- Include or exclude an exact device
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+ *                      #define BCMDRD_CONFIG_INCLUDE_BCM56780_A1 0
+ *
+ *
+ * The value of BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT is used for any
+ * chips which are left unspecified. Set this value to 1 or 0 to
+ * include or exclude all chips by default.
+ *
+ */
+
+#ifndef BCMDRD_CONFIG_CHIPS_H
+#define BCMDRD_CONFIG_CHIPS_H
+
+/* This determines whether a chip is included or excluded by default */
+#ifndef BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#define BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT 1
+#endif
+
+/*
+ * Default configuration and dependencies for all chips
+ */
+
+/*
+ * BCM56780
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780
+#define BCMDRD_CONFIG_INCLUDE_BCM56780 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_Ax BCMDRD_CONFIG_INCLUDE_BCM56780
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_BCM56780_Ax
+#endif
+
+
+/*
+ * BCM56782
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56782
+#define BCMDRD_CONFIG_INCLUDE_BCM56782 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56782_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56782_Ax BCMDRD_CONFIG_INCLUDE_BCM56782
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56782_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56782_A0 BCMDRD_CONFIG_INCLUDE_BCM56782_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56782_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56784
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56784
+#define BCMDRD_CONFIG_INCLUDE_BCM56784 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56784_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56784_Ax BCMDRD_CONFIG_INCLUDE_BCM56784
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56784_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56784_A0 BCMDRD_CONFIG_INCLUDE_BCM56784_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56784_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56786
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56786
+#define BCMDRD_CONFIG_INCLUDE_BCM56786 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56786_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56786_Ax BCMDRD_CONFIG_INCLUDE_BCM56786
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56786_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56786_A0 BCMDRD_CONFIG_INCLUDE_BCM56786_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56786_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56788
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56788
+#define BCMDRD_CONFIG_INCLUDE_BCM56788 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56788_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56788_Ax BCMDRD_CONFIG_INCLUDE_BCM56788
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56788_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56788_A0 BCMDRD_CONFIG_INCLUDE_BCM56788_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56788_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56789
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56789
+#define BCMDRD_CONFIG_INCLUDE_BCM56789 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56789_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56789_Ax BCMDRD_CONFIG_INCLUDE_BCM56789
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56789_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56789_A0 BCMDRD_CONFIG_INCLUDE_BCM56789_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56789_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56780_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56780_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56880
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880
+#define BCMDRD_CONFIG_INCLUDE_BCM56880 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_Ax BCMDRD_CONFIG_INCLUDE_BCM56880
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 BCMDRD_CONFIG_INCLUDE_BCM56880_Ax
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_Bx BCMDRD_CONFIG_INCLUDE_BCM56880
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_B0 BCMDRD_CONFIG_INCLUDE_BCM56880_Bx
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_B0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56881
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56881
+#define BCMDRD_CONFIG_INCLUDE_BCM56881 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56881_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56881_Ax BCMDRD_CONFIG_INCLUDE_BCM56881
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56881_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56881_A0 BCMDRD_CONFIG_INCLUDE_BCM56881_Ax
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56881_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56881_Bx BCMDRD_CONFIG_INCLUDE_BCM56881
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56881_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56881_B0 BCMDRD_CONFIG_INCLUDE_BCM56881_Bx
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56881_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56881_B0 == 1
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56883
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56883
+#define BCMDRD_CONFIG_INCLUDE_BCM56883 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56883_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56883_Ax BCMDRD_CONFIG_INCLUDE_BCM56883
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56883_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56883_A0 BCMDRD_CONFIG_INCLUDE_BCM56883_Ax
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56883_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56883_Bx BCMDRD_CONFIG_INCLUDE_BCM56883
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56883_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56883_B0 BCMDRD_CONFIG_INCLUDE_BCM56883_Bx
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56883_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56883_B0 == 1
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56889
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56889
+#define BCMDRD_CONFIG_INCLUDE_BCM56889 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56889_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56889_Ax BCMDRD_CONFIG_INCLUDE_BCM56889
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56889_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56889_A0 BCMDRD_CONFIG_INCLUDE_BCM56889_Ax
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56889_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56889_Bx BCMDRD_CONFIG_INCLUDE_BCM56889
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56889_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56889_B0 BCMDRD_CONFIG_INCLUDE_BCM56889_Bx
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56889_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56889_B0 == 1
+#if BCMDRD_CONFIG_INCLUDE_BCM56880_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56880_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56990
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990
+#define BCMDRD_CONFIG_INCLUDE_BCM56990 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_Ax BCMDRD_CONFIG_INCLUDE_BCM56990
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_A0 BCMDRD_CONFIG_INCLUDE_BCM56990_Ax
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_Bx BCMDRD_CONFIG_INCLUDE_BCM56990
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_B0 BCMDRD_CONFIG_INCLUDE_BCM56990_Bx
+#endif
+
+
+/*
+ * BCM56992
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56992
+#define BCMDRD_CONFIG_INCLUDE_BCM56992 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56992_Bx
+#define BCMDRD_CONFIG_INCLUDE_BCM56992_Bx BCMDRD_CONFIG_INCLUDE_BCM56992
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56992_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56992_B0 BCMDRD_CONFIG_INCLUDE_BCM56992_Bx
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56992_B0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56990_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_B0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56990_B0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56990_B0
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_B0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56990_B0_IMPLIED 1
+#endif
+#endif
+
+
+/*
+ * BCM56996
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56996
+#define BCMDRD_CONFIG_INCLUDE_BCM56996 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56996_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56996_Ax BCMDRD_CONFIG_INCLUDE_BCM56996
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56996_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56996_A0 BCMDRD_CONFIG_INCLUDE_BCM56996_Ax
+#endif
+
+
+/*
+ * BCM56997
+ */
+
+/* Sets the default include state if it was not given */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56997
+#define BCMDRD_CONFIG_INCLUDE_BCM56997 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+/* Resolve revision dependencies */
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56997_Ax
+#define BCMDRD_CONFIG_INCLUDE_BCM56997_Ax BCMDRD_CONFIG_INCLUDE_BCM56997
+#endif
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56997_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56997_A0 BCMDRD_CONFIG_INCLUDE_BCM56997_Ax
+#endif
+/* Resolve all interchip dependencies */
+#if BCMDRD_CONFIG_INCLUDE_BCM56997_A0 == 1
+#ifndef BCMDRD_CONFIG_INCLUDE_BCM56996_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56996_A0 BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT
+#endif
+#if BCMDRD_CONFIG_INCLUDE_BCM56996_A0 != 1
+#undef BCMDRD_CONFIG_INCLUDE_BCM56996_A0
+#define BCMDRD_CONFIG_INCLUDE_BCM56996_A0 1
+#define BCMDRD_CONFIG_INCLUDE_BCM56996_A0_IMPLIED 1
+#endif
+#endif
+
+
+#endif /* BCMDRD_CONFIG_CHIPS_H */
+
+/*
+ * CONFIG_OPTION Macros. Can be used to determine the build configuration.
+ */
+
+#ifdef CONFIG_OPTION
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56780)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56780_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56780_A0)
+#ifdef BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56780_A0_IMPLIED)
+#endif
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56782)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56782_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56782_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56784)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56784_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56784_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56786)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56786_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56786_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56788)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56788_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56788_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56789)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56789_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56789_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880_B0)
+#ifdef BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56880_A0_IMPLIED)
+#endif
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56881)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56881_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56881_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56881_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56881_B0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56883)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56883_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56883_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56883_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56883_B0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56889)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56889_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56889_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56889_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56889_B0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_A0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_B0)
+#ifdef BCMDRD_CONFIG_INCLUDE_BCM56990_A0_IMPLIED
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_A0_IMPLIED)
+#endif
+#ifdef BCMDRD_CONFIG_INCLUDE_BCM56990_B0_IMPLIED
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56990_B0_IMPLIED)
+#endif
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56992)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56992_Bx)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56992_B0)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56996)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56996_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56996_A0)
+#ifdef BCMDRD_CONFIG_INCLUDE_BCM56996_A0_IMPLIED
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56996_A0_IMPLIED)
+#endif
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56997)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56997_Ax)
+CONFIG_OPTION(BCMDRD_CONFIG_INCLUDE_BCM56997_A0)
+#undef CONFIG_OPTION
+#endif /* #ifdef CONFIG_OPTION */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
new file mode 100644
index 000000000000..76581c02eed2
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
@@ -0,0 +1,39 @@
+# -*- Kbuild -*-
+#
+# Linux kernel BDE module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+obj-m := linux_ngbde.o
+
+ccflags-y := $(LKM_CFLAGS) \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/bde \
+             -I$(SDK)/bcmdrd/include
+
+linux_ngbde-y := ngbde_main.o \
+                 ngbde_kapi.o \
+                 ngbde_ioctl.o \
+                 ngbde_procfs.o \
+                 ngbde_pio.o \
+                 ngbde_iio.o \
+                 ngbde_dma.o \
+                 ngbde_intr.o \
+                 ngbde_pgmem.o \
+                 ngbde_pci_probe.o \
+                 ngbde_iproc_probe.o \
+                 ngbde_swdev.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Makefile
new file mode 100644
index 000000000000..590f4132306f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Makefile
@@ -0,0 +1,33 @@
+# -*- Makefile -*-
+#
+# Linux kernel BDE module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_ngbde
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean:
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde.h b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde.h
new file mode 100644
index 000000000000..56e925f7098d
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde.h
@@ -0,0 +1,836 @@
+/*! \file ngbde.h
+ *
+ * Shared definitions and APIs for NGBDE kernel module.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGBDE_H
+#define NGBDE_H
+
+#include <lkm/lkm.h>
+#include <lkm/ngbde_kapi.h>
+
+/*! Module name. */
+#define MOD_NAME        "linux_ngbde"
+
+/*! Major number for associated charcter device file. */
+#define MOD_MAJOR       120
+
+/*! Read memory-mapped device register without byte-swap. */
+#define NGBDE_IOREAD32(_a) __raw_readl(_a)
+
+/*! Write memory-mapped device register without byte-swap. */
+#define NGBDE_IOWRITE32(_v, _a) __raw_writel(_v, _a)
+
+/*! Maximum number of I/O windows supported per device. */
+#define NGBDE_NUM_IOWIN_MAX     3
+
+/*! Maximum number of DMA memory pools supported per device. */
+#define NGBDE_NUM_DMAPOOL_MAX   2
+
+/*! Maximum number of IRQ status registers per interrupt source. */
+#define NGBDE_NUM_IRQ_REGS_MAX  16
+
+/*! Maximum number of IRQ lines (MSI vectors) per device. */
+#define NGBDE_NUM_IRQS_MAX      1
+
+/*!
+ * Maximum number of interrupt controller registers which may be
+ * written from both a user mode driver and a kernel mode driver.
+ *
+ * This feature is used when the kernel mode driver owns a subset of
+ * bits within a register, which is also used by the user mode driver.
+ *
+ * Both drivers must access such registers through a lock-protected
+ * access function.
+ */
+#define NGBDE_NUM_INTR_SHR_REGS_MAX  1
+
+/*! I/O memory window definition. */
+struct ngbde_memwin_s {
+
+    /*! Physical address of I/O window. */
+    phys_addr_t addr;
+
+    /*! Size of I/O window (in bytes). */
+    phys_addr_t size;
+};
+
+/*!
+ * \brief Shared register value.
+ *
+ * This structure contains the current value of a register where user
+ * mode and kernel mode owns different bits within the same
+ * register. In this case access must be carefully controlled to avoid
+ * that one context overwrites the bits owned by the other context.
+ *
+ * The structure also contains the offset of the shared register in
+ * order to identify the register (in case there is more than one
+ * shared register).
+ */
+typedef struct ngbde_shr_reg_s {
+
+    /*! Offset of the shared register. */
+    uint32_t reg_offs;
+
+    /*! Current value of the shared register. */
+    uint32_t cur_val;
+
+} ngbde_shr_reg_t;
+
+/*!
+ * \brief Shared interrupt mask register control.
+ *
+ * This defines which bits of an interrupt mask register are owned by
+ * user mode context, and which are owned by kernel context.
+ *
+ * The structure contains the corresponding interrupt status register
+ * in order to allow identification of the interrupt mask register
+ * irrespective of the host CPU being used.
+ *
+ * For example, if the host CPU is connected via PCI, then we use one
+ * mask register, but if the host CPU is an embedded ARM CPU, then we
+ * use a different mask register (for the same interrupt status
+ * register). By using the status register to identify the shared mask
+ * register, the kernel mode driver does not need to know which host
+ * CPU it is running off.
+ */
+typedef struct ngbde_irq_reg_s {
+
+    /*! Interrupt status register corresponding to the mask register. */
+    uint32_t status_reg;
+
+    /*! Shared interrupt mask register. */
+    uint32_t mask_reg;
+
+    /*! Mask identifying the register bits owned by the kernel mode driver. */
+    uint32_t kmask;
+
+} ngbde_irq_reg_t;
+
+/*!
+ * \name Interrupt ACK register access flags.
+ * \anchor NGBDE_INTR_ACK_F_xxx
+ */
+
+/*! \{ */
+
+/*! ACK registers resides in PCI bridge I/O window. */
+#define NGBDE_INTR_ACK_F_PAXB        (1 << 0)
+
+/*! \} */
+
+/*!
+ * \brief Interrupt ACK register control.
+ *
+ * The structure contains the corresponding register offset
+ * and value in order to acknowledge interrupt in kernel driver.
+ *
+ * For example, if the host CPU is connected via PCI, then we use one
+ * ACK register, but if the host CPU is an embedded ARM CPU, then we
+ * use a different ACK register.
+ */
+typedef struct ngbde_intr_ack_reg_s {
+
+    /*! Ack register offset. */
+    uint32_t ack_reg;
+
+    /*! Ack value. */
+    uint32_t ack_val;
+
+    /*! Flags to indicate ack_reg resides in PCI bridge window. */
+    uint32_t flags;
+
+} ngbde_intr_ack_reg_t;
+
+/*!
+ * \brief BDE interrupt handler.
+ *
+ * The BDE will use a function of this type to register an interrupt
+ * handler with the Linux kernel.
+ *
+ * \param [in] data Interrupt handler context.
+ *
+ * \retval 0 Interrupt not recognized.
+ * \retval 1 Interrupt recognized and handled.
+ */
+typedef int (*ngbde_isr_f)(void *data);
+
+/*!
+ * \brief Kernel interrupt control.
+ *
+ * This structure controls the sharing of interrupt processing between
+ * a user mode thread and a kernel mode interrupt handler.
+ */
+typedef struct ngbde_intr_ctrl_s {
+
+    /*! Handle for device I/O (for writing interrupt registers). */
+    uint8_t *iomem;
+
+    /*! Kernel device number (similar to user mode unit number). */
+    int kdev;
+
+    /*! Indicates that our interrupt handler is connected to the kernel. */
+    int irq_active;
+
+    /*! Interrupt number (IRQ# or MSI vector). */
+    int irq_vect;
+
+    /*! Number of interrupt status/mask register pairs. */
+    int num_regs;
+
+    /*! Interrupt status/mask register pairs for this device. */
+    ngbde_irq_reg_t regs[NGBDE_NUM_IRQ_REGS_MAX];
+
+    /*! Interrupt ACK register/value for this device. */
+    ngbde_intr_ack_reg_t intr_ack;
+
+    /*! Wait queue for user mode interrupt thread. */
+    wait_queue_head_t user_thread_wq;
+
+    /*! Flag to wake up user mode interrupt thread. */
+    atomic_t run_user_thread;
+
+    /*! Primary interrupt handler. */
+    ngbde_isr_f isr_func;
+
+    /*! Context for primary interrupt handler. */
+    void *isr_data;
+
+} ngbde_intr_ctrl_t;
+
+/*! Convenience macro for 1 kilobyte. */
+#define ONE_KB 1024
+
+/*! Convenience macro for 1 megabyte. */
+#define ONE_MB (1024*1024)
+
+/*!
+ * \name DMA allocation types.
+ * \anchor NGBDE_DMA_T_xxx
+ */
+
+/*! \{ */
+
+/*!
+ * Do not allocate any DMA memory.
+ */
+#define NGBDE_DMA_T_NONE        0
+
+/*!
+ * Try different allocation methods until DMA memory is successfully
+ * allocated.
+ */
+#define NGBDE_DMA_T_AUTO        1
+
+/*! Use kernel DMA API (dma_alloc_coherent). */
+#define NGBDE_DMA_T_KAPI        2
+
+/*! Use page allocator and map to physical address manually. */
+#define NGBDE_DMA_T_PGMEM       3
+
+/*! \} */
+
+/*! DMA memory allocation control structure. */
+typedef struct ngbde_dmactrl_s {
+
+    /*! Requested size of DMA memory block (in bytes). */
+    size_t size;
+
+    /*! Kernel flags for memory allocation. */
+    gfp_t flags;
+
+    /*! Preferred DMA memory type (NGBDE_DMA_T_xxx). */
+    int pref_type;
+
+    /*! Kernel device for DMA memory management. */
+    struct device *dev;
+
+} ngbde_dmactrl_t;
+
+/*! DMA memory descriptor. */
+typedef struct ngbde_dmamem_s {
+
+    /*! Logical address of DMA memory block. */
+    void *vaddr;
+
+    /*! Physical address of DMA memory block. */
+    dma_addr_t paddr;
+
+    /*! Bus address of DMA memory block. */
+    dma_addr_t baddr;
+
+    /*! Actual size of DMA memory block (in bytes). */
+    size_t size;
+
+    /*! Actual DMA memory type (NGBDE_DMA_T_xxx). */
+    int type;
+
+    /*! Kernel device for DMA memory management. */
+    struct device *dev;
+
+} ngbde_dmamem_t;
+
+/*! DMA memory pool. */
+typedef struct ngbde_dmapool_s {
+
+    /*! DMA control parameters. */
+    struct ngbde_dmactrl_s dmactrl;
+
+    /*! DMA memory resources. */
+    struct ngbde_dmamem_s dmamem;
+
+} ngbde_dmapool_t;
+
+/*! Switch device descriptor. */
+struct ngbde_dev_s {
+
+    /*! Vendor ID (typically PCI vendor ID). */
+    uint16_t vendor_id;
+
+    /*! Device ID (typically PCI device ID). */
+    uint16_t device_id;
+
+    /*! Device revision (typically PCI revision). */
+    uint16_t revision;
+
+    /*! Additional device identification when primary ID is not unique. */
+    uint16_t model;
+
+    /*! Bus number (typically PCI bus number). */
+    int bus_no;
+
+    /*! Slot number (typically PCI slot number). */
+    int slot_no;
+
+    /*! Interrupt line associated with this device. */
+    int irq_line;
+
+    /*! Use MSI interrupts with this device. */
+    int use_msi;
+
+    /*! Non-zero if device was removed. */
+    int inactive;
+
+    /*! Physical I/O window for kernel driver device access. */
+    struct ngbde_memwin_s pio_win;
+
+    /*! Memory mapped I/O window for kernel driver device access. */
+    uint8_t *pio_mem;
+
+    /*! Physical I/O window for interrupt controller access. */
+    struct ngbde_memwin_s iio_win;
+
+    /*! Memory mapped I/O window for interrupt controller access. */
+    uint8_t *iio_mem;
+
+    /*! Physical I/O window for device PCI bridge access. */
+    struct ngbde_memwin_s paxb_win;
+
+    /*! Memory mapped I/O window for device PCI bridge access. */
+    uint8_t *paxb_mem;
+
+    /*! Current value of shared register (typically an IRQ mask register). */
+    struct ngbde_shr_reg_s intr_shr_reg[NGBDE_NUM_INTR_SHR_REGS_MAX];
+
+    /*! Lock for shared register synchronization. */
+    spinlock_t lock;
+
+    /*! Interrupt control information. */
+    struct ngbde_intr_ctrl_s intr_ctrl[NGBDE_NUM_IRQS_MAX];
+
+    /*! Linux PCI handle. */
+    struct pci_dev *pci_dev;
+
+    /*! Kernel device for DMA memory management. */
+    struct device *dma_dev;
+
+    /*! Physical device I/O. */
+    struct ngbde_memwin_s iowin[NGBDE_NUM_IOWIN_MAX];
+
+    /*! DMA memory pools. */
+    struct ngbde_dmapool_s dmapool[NGBDE_NUM_DMAPOOL_MAX];
+};
+
+/*!
+ * \brief Linux IOCTL handler.
+ *
+ * This function handles communication between user mode and kernel
+ * mode.
+ *
+ * \param [in] file Device file handle.
+ * \param [in] cmd IOCTL command.
+ * \param [in] arg IOCTL command argument.
+ *
+ * \retval 0 No errors
+ */
+extern long
+ngbde_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+
+/*!
+ * \brief Initialize procfs for BDE driver.
+ *
+ * Create procfs read interface for dumping probe information.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_procfs_init(void);
+
+/*!
+ * \brief Clean up procfs for BDE driver.
+ *
+ * Clean up resources allocated by \ref ngbde_procfs_init.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_procfs_cleanup(void);
+
+/*!
+ * \brief Allocate DMA memory pools for all probed devices.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_dma_init(void);
+
+/*!
+ * \brief Free DMA memory pools for all probed devices.
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_dma_cleanup(void);
+
+/*!
+ * \brief Connect to hardware interrupt handler.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_connect(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Disconnect from hardware interrupt handler.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_disconnect(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Disconnect from all hardware interrupt handlers.
+ */
+void
+ngbde_intr_cleanup(void);
+
+/*!
+ * \brief Wait for hardware interrupt.
+ *
+ * A user mode thread will call this function and sleep until a
+ * hardware interrupt occurs.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_wait(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Wake up sleeping interrupt thread.
+ *
+ * Wake up interrupt thread even if no interrupt has occurred.
+ *
+ * Intended for graceful shut-down procedure.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_stop(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Clear list of interrupt status/mask registers.
+ *
+ * This function is typically called before new interrupt register
+ * information is added.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_regs_clr(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Add interrupt status/mask register to monitor.
+ *
+ * This function adds a new interrupt status/mask register set to the
+ * list of registers monitored by the user-mode interrupt handler.
+ *
+ * The register list is used to determine whether a user-mode
+ * interrupt has occurred.
+ *
+ * See also \ref ngbde_intr_regs_clr.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ * \param [in] ireg Interrupt status/mask register information.
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_reg_add(int kdev, unsigned int irq_num,
+                   struct ngbde_irq_reg_s *ireg);
+
+/*!
+ * \brief Add interrupt ack register to monitor.
+ *
+ * This function adds a interrupt register and mask value
+ * to acknowledge corresponding irq_num.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ * \param [in] ackreg Interrupt ack register information.
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_ack_reg_add(int kdev, unsigned int irq_num,
+                       struct ngbde_intr_ack_reg_s *ackreg);
+
+/*!
+ * \brief Write shared interrupt mask register.
+ *
+ * This function is used by an interrupt handler when a shared
+ * interrupt mask register needs to be updated.
+ *
+ * Since the register is shared between multiple interrupt handlers,
+ * access must be protected by a lock.
+ *
+ * The register information provided via \ref ngbde_intr_reg_add is
+ * used to detemine which bits of the mask register belong to the user
+ * mode driver.
+ *
+ * Note that the mask register to access is referenced by the
+ * corresponding status register. This is because the mask register
+ * may be different depending on the host CPU interface being used
+ * (e.g. PCI vs. AXI). On the other hand, the status register is the
+ * same irrespective of the host CPU interface.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ * \param [in] kapi Must be set to 1 if called from kernel API.
+ * \param [in] status_reg Corresponding interrupt status register offset.
+ * \param [in] mask_val New value to write to mask register.
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_intr_mask_write(int kdev, unsigned int irq_num, int kapi,
+                      uint32_t status_reg, uint32_t mask_val);
+
+/*!
+ * \brief Probe for PCI-attached Broadcom switch devices.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_pci_probe(void);
+
+/*!
+ * \brief Clean up resources for PCI-attached Broadcom switch devices.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_pci_cleanup(void);
+
+/*!
+ * \brief Add new switch device to BDE database.
+ *
+ * Add device information for probed or fixed switch device.
+ *
+ * \param [in] nd Switch device information.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_swdev_add(struct ngbde_dev_s *nd);
+
+/*!
+ * \brief Get device information for a BDE switch device.
+ *
+ * \param [in] kdev Switch device number.
+ *
+ * \return Pointer to switch device structure or NULL on error.
+ */
+struct ngbde_dev_s *
+ngbde_swdev_get(int kdev);
+
+/*!
+ * \brief Get list of all probed switch devices.
+ *
+ * Return a pointer to the array of registered switch devices.
+ *
+ * \param [out] nd Pointer to array of switch devices.
+ * \param [in] num_nd number of valid entries in switch device array.
+ *
+ * \retval 0 No errors
+ */
+extern int
+ngbde_swdev_get_all(struct ngbde_dev_s **nd, unsigned int *num_nd);
+
+/*!
+ * \brief Allocate memory using page allocator
+ *
+ * For any sizes less than MEM_CHUNK_SIZE, we ask the page allocator
+ * for the entire memory block, otherwise we try to assemble a
+ * contiguous cmblock ourselves.
+ *
+ * Upon successful allocation, the memory block will be added to the
+ * global list of allocated memory blocks.
+ *
+ * \param [in] size Number of bytes to allocate.
+ * \param [in] flags Kernel flags (GFP_xxx) for memory allocation.
+ *
+ * \return Pointer to allocated memory or NULL if failure.
+ */
+void *
+ngbde_pgmem_alloc(size_t size, gfp_t flags);
+
+/*!
+ * \brief Free memory block allocated by ngbde_pgmem_alloc.
+ *
+ * \param [in] ptr Pointer returned by ngbde_pgmem_alloc.
+ *
+ * \return 0 if succesfully freed, otherwise -1.
+ */
+extern int
+ngbde_pgmem_free(void *ptr);
+
+/*!
+ * \brief Free all memory blocks allocated by ngbde_pgmem_alloc.
+ *
+ * This function will walk the global list of allocated memory blocks
+ * and free all associated resources.
+ *
+ * Intended for a full clean up before the module is unloaded.
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_pgmem_free_all(void);
+
+/*!
+ * \brief Map I/O memory in kernel driver.
+ *
+ * This function is used to provide device I/O access to a kernel mode
+ * driver.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] addr Physical address to map.
+ * \param [in] size Size of I/O window to map.
+ *
+ * \return Pointer to mapped I/O memory, or NULL on error.
+ */
+extern void *
+ngbde_pio_map(void *devh, phys_addr_t addr, phys_addr_t size);
+
+/*!
+ * \brief Unmap I/O memory in kernel driver.
+ *
+ * Unmap I/O memory previously mapped via \ref ngbde_pio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_pio_unmap(void *devh);
+
+/*!
+ * \brief Unmap all I/O windows.
+ */
+extern void
+ngbde_pio_cleanup(void);
+
+/*!
+ * \brief Write a memory-mapped register from kernel driver.
+ *
+ * Write a 32-bit register using I/O memory previously mapped via \ref
+ * ngbde_pio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] offs Register address offset.
+ * \param [in] val Value to write to register.
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_pio_write32(void *devh, uint32_t offs, uint32_t val);
+
+/*!
+ * \brief Read a memory-mapped register from kernel driver.
+ *
+ * Read a 32-bit register using I/O memory previously mapped via \ref
+ * ngbde_pio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] offs Register address offset.
+ *
+ * \return Value read from register.
+ */
+extern uint32_t
+ngbde_pio_read32(void *devh, uint32_t offs);
+
+/*!
+ * \brief Map interrupt controller I/O memory.
+ *
+ * On some devices the interrupt controller is a device separate from
+ * the main switch device. This function is used to provide interrupt
+ * controller I/O access to a kernel mode driver.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] addr Physical address to map.
+ * \param [in] size Size of I/O window to map.
+ *
+ * \return Pointer to mapped I/O memory, or NULL on error.
+ */
+extern void *
+ngbde_iio_map(void *devh, phys_addr_t addr, phys_addr_t size);
+
+/*!
+ * \brief Unmap interrupt controller I/O memory.
+ *
+ * Unmap I/O memory previously mapped via \ref ngbde_iio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_iio_unmap(void *devh);
+
+/*!
+ * \brief Unmap all interrupt controller I/O windows.
+ */
+extern void
+ngbde_iio_cleanup(void);
+
+/*!
+ * \brief Write a memory-mapped interrupt controller register.
+ *
+ * Write a 32-bit register using I/O memory previously mapped via \ref
+ * ngbde_iio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] offs Register address offset.
+ * \param [in] val Value to write to register.
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_iio_write32(void *devh, uint32_t offs, uint32_t val);
+
+/*!
+ * \brief Read a memory-mapped interrupt controller register.
+ *
+ * Read a 32-bit register using I/O memory previously mapped via \ref
+ * ngbde_iio_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] offs Register address offset.
+ *
+ * \return Value read from register.
+ */
+extern uint32_t
+ngbde_iio_read32(void *devh, uint32_t offs);
+
+/*!
+ * \brief Map PCI bridge I/O memory.
+ *
+ * On some devices the interrupt controller is a device separate from
+ * the main switch device. This function is used to provide interrupt
+ * controller I/O access to a kernel mode driver.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ * \param [in] addr Physical address to map.
+ * \param [in] size Size of I/O window to map.
+ *
+ * \return Pointer to mapped I/O memory, or NULL on error.
+ */
+extern void *
+ngbde_paxb_map(void *devh, phys_addr_t addr, phys_addr_t size);
+
+/*!
+ * \brief Unmap PCI bridge I/O memory.
+ *
+ * Unmap I/O memory previously mapped via \ref ngbde_paxb_map.
+ *
+ * \param [in] devh Device handle (\ref ngbde_dev_s).
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_paxb_unmap(void *devh);
+
+/*!
+ * \brief Unmap all PCI bridge I/O windows.
+ */
+extern void
+ngbde_paxb_cleanup(void);
+
+/*!
+ * \brief Probe for Broadcom switch devices on IPROC internal bus.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_iproc_probe(void);
+
+/*!
+ * \brief Clean up resources for Broadcom switch devices on IPROC internal bus.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngbde_iproc_cleanup(void);
+
+#endif /* NGBDE_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
new file mode 100644
index 000000000000..9cc2b191f48c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
@@ -0,0 +1,340 @@
+/*! \file ngbde_dma.c
+ *
+ * This module handles allocation of DMA memory pools.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+/*! \cond */
+static int dma_debug = 0;
+module_param(dma_debug, int, 0);
+MODULE_PARM_DESC(dma_debug,
+"DMA debug output enable (default 0).");
+/*! \endcond */
+
+/*! Default size of of DMA memory pools (in MB). */
+#define DMAPOOL_SIZE_DEFAULT    16
+
+/*! Default number of DMA memory pools per device. */
+#define NUM_DMAPOOL_DEFAULT     1
+
+/*! \cond */
+static int dma_size = DMAPOOL_SIZE_DEFAULT;
+module_param(dma_size, int, 0);
+MODULE_PARM_DESC(dma_size,
+"Size of of DMA memory pools in MB (default 16 MB).");
+/*! \endcond */
+
+/*! \cond */
+static char *dma_alloc;
+module_param(dma_alloc, charp, 0);
+MODULE_PARM_DESC(dma_alloc,
+"DMA allocation method auto|kapi|pgmem (default auto)");
+/*! \endcond */
+
+/*! \cond */
+static int dma_pools = NUM_DMAPOOL_DEFAULT;
+module_param(dma_pools, int, 0);
+MODULE_PARM_DESC(dma_pools,
+"Number of DMA memory pools to pre-allocate per device (default 1).");
+/*! \endcond */
+
+/*!
+ * \brief Allocate DMA memory via kernel API.
+ *
+ * \param [in] dmactrl DMA allocation control.
+ * \param [out] dmamem DMA allocation result.
+ *
+ * \return Nothing.
+ */
+static void
+ngbde_dmamem_kapi_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
+{
+    void *vaddr;
+    dma_addr_t baddr;
+
+    vaddr = dma_alloc_coherent(dmactrl->dev, dmactrl->size, &baddr,
+                               dmactrl->flags);
+    if (vaddr) {
+        /* Store allocation information in dmamem structure */
+        dmamem->vaddr = vaddr;
+        dmamem->paddr = virt_to_phys(vaddr);
+        dmamem->dev = dmactrl->dev;
+        dmamem->size = dmactrl->size;
+        dmamem->type = NGBDE_DMA_T_KAPI;
+        dmamem->baddr = baddr;
+
+        /* Write small signature for debug purposes */
+        strcpy((char *)vaddr, "DMA_KAPI");
+
+        if (dma_debug) {
+            printk("DMA: Allocated %d KB of KAPI memory at 0x%08lx\n",
+                   (int)(dmamem->size / ONE_KB),
+                   (unsigned long)dmamem->paddr);
+        }
+    } else {
+        if (dma_debug) {
+            printk("DMA: Failed to allocate KAPI memory\n");
+        }
+    }
+}
+
+/*!
+ * \brief Allocate DMA memory via page allocator.
+ *
+ * \param [in] dmactrl DMA allocation control.
+ * \param [out] dmamem DMA allocation result.
+ *
+ * \return Nothing.
+ */
+static void
+ngbde_dmamem_pgmem_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
+{
+    void *vaddr;
+
+    vaddr = ngbde_pgmem_alloc(dmactrl->size, dmactrl->flags);
+    if (vaddr) {
+        /* Store allocation information in dmamem structure */
+        dmamem->vaddr = vaddr;
+        dmamem->paddr = virt_to_phys(vaddr);
+        dmamem->dev = dmactrl->dev;
+        dmamem->size = dmactrl->size;
+        dmamem->type = NGBDE_DMA_T_PGMEM;
+        dmamem->baddr = dma_map_single(dmamem->dev, dmamem->vaddr,
+                                       dmamem->size, DMA_BIDIRECTIONAL);
+        if (dma_mapping_error(dmactrl->dev, dmamem->baddr)) {
+            dmamem->baddr = 0;
+            if (dma_debug) {
+                printk("DMA: Failed to map PGMEM memory\n");
+            }
+        }
+
+        /* Write small signature for debug purposes */
+        strcpy((char *)vaddr, "DMA_PGMEM");
+
+        if (dma_debug) {
+            printk("DMA: Allocated %d KB of PGMEM memory at 0x%08lx\n",
+                   (int)(dmamem->size / ONE_KB),
+                   (unsigned long)dmamem->paddr);
+        }
+    } else {
+        if (dma_debug) {
+            printk("DMA: Failed to allocate PGMEM memory\n");
+        }
+    }
+}
+
+/*!
+ * \brief Allocate DMA memory.
+ *
+ * Depending on the DMA allocation control parameters, we select one
+ * of several DMA memory allocation methods.
+ *
+ * \param [in] dmactrl DMA allocation control.
+ * \param [out] dmamem DMA allocation result.
+ *
+ * \return Nothing.
+ */
+static int
+ngbde_dmamem_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
+{
+    int kapi = 0;
+
+    if (dmamem->vaddr) {
+        /* Already allocated */
+        return 0;
+    }
+
+#ifdef CONFIG_CMA
+    /* Always allow KAPI when CMA is available */
+    kapi = 1;
+#else
+    if (dmactrl->size <= (1 << (MAX_ORDER - 1 + PAGE_SHIFT))) {
+        kapi = 1;
+    }
+#endif
+
+    /* Allocation via kernel DMA API (if allowed) */
+    if (kapi) {
+        switch (dmactrl->pref_type) {
+        case NGBDE_DMA_T_AUTO:
+        case NGBDE_DMA_T_KAPI:
+            ngbde_dmamem_kapi_alloc(dmactrl, dmamem);
+            break;
+        default:
+            break;
+        }
+    }
+
+    /* Allocation via private page allocator */
+    if (dmamem->vaddr == NULL) {
+        switch (dmactrl->pref_type) {
+        case NGBDE_DMA_T_AUTO:
+        case NGBDE_DMA_T_PGMEM:
+            ngbde_dmamem_pgmem_alloc(dmactrl, dmamem);
+            break;
+        default:
+            break;
+        }
+    }
+
+    if (dmamem->vaddr == NULL) {
+        printk(KERN_WARNING "%s: Failed to allocate DMA memory\n",
+               MOD_NAME);
+        return -1;
+    }
+
+    return 0;
+}
+
+/*!
+ * \brief Free DMA memory.
+ *
+ * Free DMA memory allocated via \ref ngbde_dmamem_alloc.
+ *
+ * \param [in] dmamem DMA allocation result from \ref ngbde_dmamem_alloc.
+ *
+ * \return Nothing.
+ */
+static int
+ngbde_dmamem_free(ngbde_dmamem_t *dmamem)
+{
+    switch (dmamem->type) {
+    case NGBDE_DMA_T_KAPI:
+        if (dma_debug) {
+            printk("DMA: Freeing %d KB of KAPI memory\n",
+                   (int)(dmamem->size / ONE_KB));
+        }
+        dma_free_coherent(dmamem->dev, dmamem->size,
+                          dmamem->vaddr, dmamem->paddr);
+        memset(dmamem, 0, sizeof(*dmamem));
+        break;
+    case NGBDE_DMA_T_PGMEM:
+        if (dma_debug) {
+            printk("DMA: Freeing %d KB of PGMEM memory\n",
+                   (int)(dmamem->size / ONE_KB));
+        }
+        if (dmamem->baddr) {
+            if (dma_debug) {
+                printk("DMA: Unmapping PGMEM memory at 0x%08lx\n",
+                       (unsigned long)dmamem->baddr);
+            }
+            dma_unmap_single(dmamem->dev, dmamem->baddr,
+                             dmamem->size, DMA_BIDIRECTIONAL);
+        }
+        ngbde_pgmem_free(dmamem->vaddr);
+        memset(dmamem, 0, sizeof(*dmamem));
+        break;
+    case NGBDE_DMA_T_NONE:
+        /* Nothing to free */
+        break;
+    default:
+        printk(KERN_WARNING "%s: Unable to free unknown DMA memory type\n",
+               MOD_NAME);
+        break;
+    }
+    return 0;
+}
+
+/*!
+ * \brief Free all DMA memory pools for all devices.
+ *
+ * \return Nothing.
+ */
+void
+ngbde_dma_cleanup(void)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    unsigned int pool;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        for (pool = 0; pool < NGBDE_NUM_DMAPOOL_MAX; pool++) {
+            if (swdev[idx].inactive) {
+                ngbde_dmamem_free(&swdev[idx].dmapool[pool].dmamem);
+            }
+        }
+    }
+}
+
+/*!
+ * \brief Allocate DMA memory pools for all devices.
+ *
+ * \return Nothing.
+ */
+int
+ngbde_dma_init(void)
+{
+    int rv;
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    int dma_type = NGBDE_DMA_T_AUTO;
+    struct ngbde_dmapool_s *dmapool;
+    unsigned int pool;
+
+    /* Default DMA memory size per device */
+    if (dma_size < 0) {
+        dma_size = DMAPOOL_SIZE_DEFAULT;
+    }
+
+    /* Check for forced DMA allocation method */
+    if (dma_alloc) {
+        if (strcmp(dma_alloc, "kapi") == 0) {
+            dma_type = NGBDE_DMA_T_KAPI;
+        } else if (strcmp(dma_alloc, "pgmem") == 0) {
+            dma_type = NGBDE_DMA_T_PGMEM;
+        } else {
+            printk(KERN_WARNING "%s: Unknown DMA type: %s\n",
+                   MOD_NAME, dma_alloc);
+        }
+    }
+
+    /* Number of DMA memory pools per device */
+    if ((unsigned int)dma_pools >= NGBDE_NUM_DMAPOOL_MAX) {
+        dma_pools = NUM_DMAPOOL_DEFAULT;
+    }
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+
+        /* Set DMA allocation parameters */
+        for (pool = 0; pool < NGBDE_NUM_DMAPOOL_MAX; pool++) {
+            dmapool = &swdev[idx].dmapool[pool];
+            dmapool->dmactrl.dev = swdev[idx].dma_dev;
+            dmapool->dmactrl.size = dma_size * ONE_MB;
+            dmapool->dmactrl.pref_type = dma_type;
+            dmapool->dmactrl.flags = GFP_KERNEL | GFP_DMA32;
+        }
+
+        /* Allocate DMA pools */
+        for (pool = 0; pool < dma_pools; pool++) {
+            dmapool = &swdev[idx].dmapool[pool];
+            rv = ngbde_dmamem_alloc(&dmapool->dmactrl, &dmapool->dmamem);
+            if (rv < 0) {
+                printk(KERN_WARNING "%s: Unable to allocate DMA pool %d %d\n",
+                       MOD_NAME, idx, pool);
+            }
+        }
+    }
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iio.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iio.c
new file mode 100644
index 000000000000..e97f1fcea730
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iio.c
@@ -0,0 +1,143 @@
+/*! \file ngbde_iio.c
+ *
+ * API for managing and accessing memory-mapped I/O for interrupt
+ * controller registers.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+void *
+ngbde_iio_map(void *devh, phys_addr_t addr, phys_addr_t size)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->iio_mem) {
+        if (addr == sd->iio_win.addr && size == sd->iio_win.size) {
+            /* Already mapped */
+            return sd->iio_mem;
+        }
+        ngbde_iio_unmap(devh);
+    }
+
+    sd->iio_mem = ioremap_nocache(addr, size);
+
+    if (sd->iio_mem) {
+        /* Save mapped resources */
+        sd->iio_win.addr = addr;
+        sd->iio_win.size = size;
+    }
+
+    return sd->iio_mem;
+}
+
+void
+ngbde_iio_unmap(void *devh)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->iio_mem) {
+        iounmap(sd->iio_mem);
+        sd->iio_mem = NULL;
+    }
+}
+
+void
+ngbde_iio_cleanup(void)
+{
+    struct ngbde_dev_s *swdev, *sd;
+    unsigned int num_swdev, idx;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        sd = ngbde_swdev_get(idx);
+        ngbde_iio_unmap(sd);
+    }
+}
+
+void
+ngbde_iio_write32(void *devh, uint32_t offs, uint32_t val)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->iio_mem) {
+        NGBDE_IOWRITE32(val, sd->iio_mem + offs);
+    }
+}
+
+uint32_t
+ngbde_iio_read32(void *devh, uint32_t offs)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->iio_mem) {
+        return NGBDE_IOREAD32(sd->iio_mem + offs);
+    }
+    return 0;
+}
+
+void *
+ngbde_paxb_map(void *devh, phys_addr_t addr, phys_addr_t size)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->paxb_mem) {
+        if (addr == sd->paxb_win.addr && size == sd->paxb_win.size) {
+            /* Already mapped */
+            return sd->paxb_mem;
+        }
+        iounmap(sd->paxb_mem);
+    }
+
+    sd->paxb_mem = ioremap_nocache(addr, size);
+
+    if (sd->paxb_mem) {
+        /* Save mapped resources */
+        sd->paxb_win.addr = addr;
+        sd->paxb_win.size = size;
+    }
+
+    return sd->paxb_mem;
+}
+
+void
+ngbde_paxb_unmap(void *devh)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->paxb_mem) {
+        iounmap(sd->paxb_mem);
+        sd->paxb_mem = NULL;
+    }
+}
+
+void
+ngbde_paxb_cleanup(void)
+{
+    struct ngbde_dev_s *swdev, *sd;
+    unsigned int num_swdev, idx;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        sd = ngbde_swdev_get(idx);
+        ngbde_paxb_unmap(sd);
+    }
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_intr.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_intr.c
new file mode 100644
index 000000000000..acec7da100f7
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_intr.c
@@ -0,0 +1,550 @@
+/*! \file ngbde_intr.c
+ *
+ * API for controlling a thread-based user-mode interrupt handler.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+/*! \cond */
+static int intr_debug = 0;
+module_param(intr_debug, int, 0);
+MODULE_PARM_DESC(intr_debug,
+"Interrupt debug output enable (default 0).");
+/*! \endcond */
+
+static int
+ngbde_intr_shared_write32(struct ngbde_dev_s *sd, struct ngbde_intr_ctrl_s *ic,
+                          uint32_t reg_offs, uint32_t reg_val, uint32_t shr_mask)
+{
+    unsigned long flags;
+    struct ngbde_shr_reg_s *sr;
+    int idx;
+
+    sr = NULL;
+    for (idx = 0; idx < NGBDE_NUM_INTR_SHR_REGS_MAX; idx++) {
+        if (sd->intr_shr_reg[idx].reg_offs == 0) {
+            /* If not found, then we add a new entry */
+            sd->intr_shr_reg[idx].reg_offs = reg_offs;
+        }
+        if (sd->intr_shr_reg[idx].reg_offs == reg_offs) {
+            sr = &sd->intr_shr_reg[idx];
+            break;
+        }
+    }
+
+    if (sr == NULL) {
+        return -1;
+    }
+
+    spin_lock_irqsave(&sd->lock, flags);
+
+    sr->cur_val &= ~shr_mask;
+    sr->cur_val |= (reg_val & shr_mask);
+
+    NGBDE_IOWRITE32(sr->cur_val, ic->iomem + reg_offs);
+
+    spin_unlock_irqrestore(&sd->lock, flags);
+
+    return 0;
+}
+
+/*!
+ * \brief Interrupt handler for user mode thread.
+ *
+ * This function will determine whether a user-mode interrupt has
+ * occurred by reading the configured interrupt status and mask
+ * registers.
+ *
+ * If an interrupt has occurred, any waiting user-mode thread is woken
+ * up.
+ *
+ * \param [in] ic Interrupt control information.
+ *
+ * \retval 1 One or more user mode interrupts occurred.
+ * \retval 0 No user mode interrupts occurred.
+ */
+static int
+ngbde_user_isr(ngbde_intr_ctrl_t *ic)
+{
+    int idx;
+    int active_interrupts = 0;
+    uint32_t stat = 0, mask = 0;
+    uint32_t kmask;
+
+    /* Check if any enabled interrupts are active */
+    for (idx = 0; idx < ic->num_regs; idx++) {
+        ngbde_irq_reg_t *ir = &ic->regs[idx];
+
+        /* Get mask of all kernel interrupt sources for this register address */
+        kmask = ir->kmask;
+
+        stat = NGBDE_IOREAD32(&ic->iomem[ir->status_reg]);
+        mask = NGBDE_IOREAD32(&ic->iomem[ir->mask_reg]);
+
+        if (stat & mask & ~kmask) {
+            active_interrupts = 1;
+            break;
+        }
+    }
+
+    /* No active interrupts to service */
+    if (!active_interrupts) {
+        return 0;
+    }
+
+    /* Disable (mask off) all interrupts */
+    for (idx = 0; idx < ic->num_regs; idx++) {
+        ngbde_irq_reg_t *ir = &ic->regs[idx];
+
+        /* Get mask of all kernel interrupt sources for this register address */
+        kmask = ir->kmask;
+
+        if (kmask == 0xffffffff) {
+            /* Kernel driver owns all interrupts in this register */
+            continue;
+        } else if (kmask) {
+            /* Synchronized write */
+            struct ngbde_dev_s *sd = ngbde_swdev_get(ic->kdev);
+            if (ngbde_intr_shared_write32(sd, ic, ir->mask_reg, 0, ~kmask) < 0) {
+                printk(KERN_WARNING
+                       "%s: Failed to write shared register for device %d\n",
+                       MOD_NAME, ic->kdev);
+                /* Fall back to normal write to ensure interrupts are masked */
+                NGBDE_IOWRITE32(0, &ic->iomem[ir->mask_reg]);
+            }
+        } else {
+            NGBDE_IOWRITE32(0, &ic->iomem[ir->mask_reg]);
+        }
+    }
+
+    atomic_set(&ic->run_user_thread, 1);
+    wake_up_interruptible(&ic->user_thread_wq);
+
+    return 1;
+}
+
+/*!
+ * \brief Interrupt handler for kernel driver.
+ *
+ * Typically used by the KNET driver.
+ *
+ * \param [in] ic Interrupt control information.
+ *
+ * \retval 1 One or more kernel mode interrupts occurred.
+ * \retval 0 No kernel mode interrupts occurred.
+ */
+static int
+ngbde_kernel_isr(ngbde_intr_ctrl_t *ic)
+{
+    if (ic->isr_func) {
+        return ic->isr_func(ic->isr_data);
+    }
+    return 0;
+}
+
+/*!
+ * \brief Acknowledge interrupt
+ *
+ * \param [in] data Interrupt control information
+ *
+ * \retval 0
+ */
+static int
+ngbde_intr_ack(ngbde_intr_ctrl_t *ic)
+{
+    struct ngbde_dev_s *sd = ngbde_swdev_get(ic->kdev);
+    struct ngbde_intr_ack_reg_s *ar = &ic->intr_ack;
+
+    if (sd->use_msi) {
+        if (ar->flags & NGBDE_INTR_ACK_F_PAXB) {
+            NGBDE_IOWRITE32(ar->ack_val, &sd->paxb_mem[ar->ack_reg]);
+        } else {
+            NGBDE_IOWRITE32(ar->ack_val, &sd->pio_mem[ar->ack_reg]);
+        }
+    }
+
+    return 0;
+}
+
+/*!
+ * \brief Linux ISR
+ *
+ * Will call the user-mode interrupts handler and optionally also a
+ * kernel mode interrupt handler (typically KNET).
+ *
+ * \param [in] irq_num Interrupt vector from kernel.
+ * \param [in] data Interrupt control information
+ *
+ * \retval IRQ_NONE Interrupt not recognized.
+ * \retval IRQ_HANDLED Interrupt recognized and handled (masked off).
+ */
+static irqreturn_t
+ngbde_isr(int irq_num, void *data)
+{
+    struct ngbde_intr_ctrl_s *ic = (struct ngbde_intr_ctrl_s *)data;
+    irqreturn_t rv = IRQ_NONE;
+
+    ngbde_intr_ack(ic);
+
+    if (ngbde_user_isr(ic)) {
+        rv = IRQ_HANDLED;
+    }
+    if (ngbde_kernel_isr(ic)) {
+        rv = IRQ_HANDLED;
+    }
+    return rv;
+}
+
+int
+ngbde_intr_connect(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+    unsigned long irq_flags;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (ic->irq_active) {
+        return 0;
+    }
+
+    if (sd->irq_line >= 0) {
+        if (sd->pio_mem == NULL) {
+            printk(KERN_WARNING "%s: No memory-mapped I/O for device %d\n",
+                   MOD_NAME, kdev);
+            return -1;
+        }
+        ic->kdev = kdev;
+        ic->iomem = sd->pio_mem;
+        if (sd->iio_mem) {
+            if (intr_debug) {
+                printk("INTR: Using dedicated interrupt controller\n");
+            }
+            ic->iomem = sd->iio_mem;
+        }
+        init_waitqueue_head(&ic->user_thread_wq);
+        atomic_set(&ic->run_user_thread, 0);
+        irq_flags = IRQF_SHARED;
+        ic->irq_vect = sd->irq_line;
+
+        /*
+         * The pci_enable_msi function must be called after enabling
+         * BAR0_PAXB_OARR_FUNC0_MSI_PAGE, otherwise, MSI interrupts
+         * cannot be triggered!
+         */
+        if (sd->use_msi) {
+            if (pci_enable_msi(sd->pci_dev) == 0) {
+                irq_flags = 0;
+                ic->irq_vect = sd->pci_dev->irq;
+                if (intr_debug) {
+                    printk("INTR: Enabled MSI interrupts\n");
+                }
+            } else {
+                printk(KERN_WARNING "%s: Failed to enable MSI for device %d\n",
+                       MOD_NAME, kdev);
+                sd->use_msi = 0;
+            }
+        }
+        if (intr_debug) {
+            printk("INTR: Request IRQ %d\n", ic->irq_vect);
+        }
+        if (request_irq(ic->irq_vect, ngbde_isr, irq_flags, MOD_NAME, ic) < 0) {
+            printk(KERN_WARNING "%s: Could not get IRQ %d for device %d\n",
+                   MOD_NAME, ic->irq_vect, kdev);
+            return -1;
+        }
+        ic->irq_active = 1;
+    }
+
+    return 0;
+}
+
+int
+ngbde_intr_disconnect(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (!ic->irq_active) {
+        return 0;
+    }
+
+    if (ic->isr_func) {
+        printk(KERN_WARNING "%s: Disconnecting IRQ %d blocked by kernel ISR\n",
+               MOD_NAME, irq_num);
+        return 0;
+    }
+
+    if (ic->irq_vect >= 0) {
+        free_irq(ic->irq_vect, ic);
+        if (sd->use_msi) {
+            pci_disable_msi(sd->pci_dev);
+        }
+        ic->irq_active = 0;
+    }
+
+    return 0;
+}
+
+void
+ngbde_intr_cleanup(void)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx, irq_num;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        for (irq_num = 0; irq_num < NGBDE_NUM_IRQS_MAX; irq_num++) {
+            ngbde_intr_disconnect(idx, irq_num);
+        }
+    }
+}
+
+int
+ngbde_intr_wait(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (!ic->irq_active) {
+        return 0;
+    }
+
+    wait_event_interruptible(ic->user_thread_wq,
+                             atomic_read(&ic->run_user_thread) != 0);
+    atomic_set(&ic->run_user_thread, 0);
+
+    return 0;
+}
+
+int
+ngbde_intr_stop(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (!ic->irq_active) {
+        return 0;
+    }
+
+    /* Wake up user thread */
+    atomic_set(&ic->run_user_thread, 1);
+    wake_up_interruptible(&ic->user_thread_wq);
+
+    return 0;
+}
+
+int
+ngbde_intr_regs_clr(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (ic->irq_active) {
+        /* Do not clear configuration with interrupt connected */
+        return 0;
+    }
+
+    ic->num_regs = 0;
+    memset(ic->regs, 0, sizeof(ic->regs));
+
+    return 0;
+}
+
+int
+ngbde_intr_reg_add(int kdev, unsigned int irq_num,
+                   struct ngbde_irq_reg_s *ireg)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+    struct ngbde_irq_reg_s *ir;
+    unsigned int idx;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (ic->irq_active) {
+        /*
+         * If the interrupt is connected, then we only update the
+         * kernel mask for existing entries.
+         */
+        for (idx = 0; idx < ic->num_regs; idx++) {
+            ir = &ic->regs[idx];
+            if (ir->status_reg == ireg->status_reg &&
+                ir->mask_reg == ireg->mask_reg) {
+                ir->kmask = ireg->kmask;
+                if (intr_debug) {
+                    printk("INTR: Updating interrupt register "
+                           "0x%08x/0x%08x (0x%08x)\n",
+                           ir->status_reg, ir->mask_reg, ir->kmask);
+                }
+                return 0;
+            }
+        }
+        return -1;
+    }
+
+    if (ic->num_regs >= NGBDE_NUM_IRQ_REGS_MAX) {
+        return -1;
+    }
+
+    ir = &ic->regs[ic->num_regs++];
+
+    memcpy(ir, ireg, sizeof (*ir));
+
+    if (intr_debug) {
+        printk("INTR: Adding interrupt register 0x%08x/0x%08x (0x%08x)\n",
+               ir->status_reg, ir->mask_reg, ir->kmask);
+    }
+
+    return ic->num_regs;
+}
+
+int
+ngbde_intr_ack_reg_add(int kdev, unsigned int irq_num,
+                       struct ngbde_intr_ack_reg_s *ackreg)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+    struct ngbde_intr_ack_reg_s *ar;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    if (ic->irq_active) {
+        /* Ignore request if interrupt is connected */
+        return 0;
+    }
+
+    ar = &ic->intr_ack;
+
+    memcpy(ar, ackreg, sizeof (*ar));
+
+    if (intr_debug) {
+        printk("INTR: Adding interrupt ACK register 0x%08x/0x%08x (0x%08x)\n",
+               ar->ack_reg, ar->ack_val, ar->flags);
+    }
+
+    return 0;
+}
+
+int
+ngbde_intr_mask_write(int kdev, unsigned int irq_num, int kapi,
+                      uint32_t status_reg, uint32_t mask_val)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+    struct ngbde_irq_reg_s *ir;
+    unsigned int idx;
+    uint32_t bmask;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+
+    ir = ic->regs;
+    for (idx = 0; idx < ic->num_regs; idx++) {
+        if (ir->status_reg == status_reg) {
+            bmask = kapi ? ir->kmask : ~ir->kmask;
+            ngbde_intr_shared_write32(sd, ic, ir->mask_reg, mask_val, bmask);
+            return 0;
+        }
+        ir++;
+    }
+
+    return -1;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_ioctl.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_ioctl.c
new file mode 100644
index 000000000000..ccd0b7ee01d0
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_ioctl.c
@@ -0,0 +1,237 @@
+/*! \file ngbde_ioctl.c
+ *
+ * NGBDE IOCTL interface.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <lkm/ngbde_ioctl.h>
+
+#include <ngbde.h>
+
+long
+ngbde_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+    struct ngbde_ioc_cmd_s ioc;
+    struct ngbde_dev_s *swdev;
+    struct ngbde_irq_reg_s ireg;
+    struct ngbde_intr_ack_reg_s ackreg;
+    phys_addr_t addr, size;
+    unsigned int num_swdev;
+    unsigned int rsrc_type, rsrc_idx;
+    unsigned int irq_num, intr_cmd;
+    uint32_t mreg, mval;
+
+    if (copy_from_user(&ioc, (void *)arg, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    ioc.rc = NGBDE_IOC_SUCCESS;
+
+    switch (cmd) {
+    case NGBDE_IOC_MOD_INFO:
+        ioc.op.mod_info.version = NGBDE_IOC_VERSION;
+        break;
+    case NGBDE_IOC_PROBE_INFO:
+        ngbde_swdev_get_all(NULL, &num_swdev);
+        ioc.op.probe_info.num_swdev = num_swdev;
+        break;
+    case NGBDE_IOC_DEV_INFO:
+        swdev = ngbde_swdev_get(ioc.devid);
+        if (!swdev) {
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        ioc.op.dev_info.vendor_id = swdev->vendor_id;
+        ioc.op.dev_info.device_id = swdev->device_id;
+        ioc.op.dev_info.revision = swdev->revision;
+        ioc.op.dev_info.model = swdev->model;
+        if (swdev->use_msi) {
+            ioc.op.dev_info.flags |= NGBDE_DEV_F_MSI;
+        }
+        break;
+    case NGBDE_IOC_PHYS_ADDR:
+        swdev = ngbde_swdev_get(ioc.devid);
+        if (!swdev) {
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        rsrc_type = ioc.op.rsrc_id.type;
+        rsrc_idx = ioc.op.rsrc_id.inst;
+        switch (rsrc_type) {
+        case NGBDE_IO_RSRC_DEV_IO:
+            if (rsrc_idx >= NGBDE_NUM_IOWIN_MAX) {
+                printk(KERN_WARNING
+                       "ngbde: invalid resource index (%d)\n",
+                       rsrc_idx);
+                ioc.rc = NGBDE_IOC_FAIL;
+                break;
+            }
+            ioc.op.phys_addr.addr = swdev->iowin[rsrc_idx].addr;
+            ioc.op.phys_addr.size = swdev->iowin[rsrc_idx].size;
+            break;
+        case NGBDE_IO_RSRC_DMA_MEM:
+            if (rsrc_idx >= NGBDE_NUM_DMAPOOL_MAX) {
+                printk(KERN_WARNING
+                       "ngbde: invalid resource index (%d)\n",
+                       rsrc_idx);
+                ioc.rc = NGBDE_IOC_FAIL;
+                break;
+            }
+            ioc.op.phys_addr.addr = swdev->dmapool[rsrc_idx].dmamem.paddr;
+            ioc.op.phys_addr.size = swdev->dmapool[rsrc_idx].dmactrl.size;
+            break;
+        case NGBDE_IO_RSRC_DMA_BUS:
+            if (rsrc_idx >= NGBDE_NUM_DMAPOOL_MAX) {
+                printk(KERN_WARNING
+                       "ngbde: invalid resource index (%d)\n",
+                       rsrc_idx);
+                ioc.rc = NGBDE_IOC_FAIL;
+                break;
+            }
+            ioc.op.phys_addr.addr = swdev->dmapool[rsrc_idx].dmamem.baddr;
+            ioc.op.phys_addr.size = swdev->dmapool[rsrc_idx].dmactrl.size;
+            break;
+        default:
+            printk(KERN_WARNING
+                   "ngbde: unknown resource type (%d)\n",
+                   rsrc_type);
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        break;
+    case NGBDE_IOC_INTR_CTRL:
+        irq_num = ioc.op.intr_ctrl.irq_num;
+        intr_cmd = ioc.op.intr_ctrl.cmd;
+        switch (intr_cmd) {
+        case NGBDE_ICTL_INTR_CONN:
+            if (ngbde_intr_connect(ioc.devid, irq_num) < 0) {
+                ioc.rc = NGBDE_IOC_FAIL;
+            }
+            break;
+        case NGBDE_ICTL_INTR_DISC:
+            if (ngbde_intr_disconnect(ioc.devid, irq_num) < 0) {
+                ioc.rc = NGBDE_IOC_FAIL;
+            }
+            break;
+        case NGBDE_ICTL_INTR_WAIT:
+            if (ngbde_intr_wait(ioc.devid, irq_num) < 0) {
+                ioc.rc = NGBDE_IOC_FAIL;
+            }
+            break;
+        case NGBDE_ICTL_INTR_STOP:
+            if (ngbde_intr_stop(ioc.devid, irq_num) < 0) {
+                ioc.rc = NGBDE_IOC_FAIL;
+            }
+            break;
+        case NGBDE_ICTL_REGS_CLR:
+            if (ngbde_intr_regs_clr(ioc.devid, irq_num) < 0) {
+                ioc.rc = NGBDE_IOC_FAIL;
+            }
+            break;
+        default:
+            printk(KERN_WARNING
+                   "%s: unknown interrupt control command (%d)\n",
+                   MOD_NAME, intr_cmd);
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        break;
+    case NGBDE_IOC_IRQ_REG_ADD:
+        irq_num = ioc.op.irq_reg_add.irq_num;
+        ireg.status_reg = ioc.op.irq_reg_add.status_reg;
+        ireg.mask_reg = ioc.op.irq_reg_add.mask_reg;
+        ireg.kmask = ioc.op.irq_reg_add.kmask;
+        if (ngbde_intr_reg_add(ioc.devid, irq_num, &ireg) < 0) {
+            printk(KERN_WARNING
+                   "%s: Unable to add interrupt register\n",
+                   MOD_NAME);
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    case NGBDE_IOC_INTR_ACK_REG_ADD:
+        irq_num = ioc.op.intr_ack_reg_add.irq_num;
+        ackreg.ack_reg = ioc.op.intr_ack_reg_add.ack_reg;
+        ackreg.ack_val = ioc.op.intr_ack_reg_add.ack_val;
+        ackreg.flags = ioc.op.intr_ack_reg_add.flags;
+        if (ngbde_intr_ack_reg_add(ioc.devid, irq_num, &ackreg) < 0) {
+            printk(KERN_WARNING
+                   "%s: Unable to add interrupt ack register\n",
+                   MOD_NAME);
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    case NGBDE_IOC_IRQ_MASK_WR:
+        irq_num = ioc.op.irq_mask_wr.irq_num;
+        mreg = ioc.op.irq_mask_wr.offs;
+        mval = ioc.op.irq_mask_wr.val;
+        if (ngbde_intr_mask_write(ioc.devid, irq_num, 0, mreg, mval) < 0) {
+            printk(KERN_WARNING
+                   "%s: Unable to write shared register\n",
+                   MOD_NAME);
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    case NGBDE_IOC_PIO_WIN_MAP:
+        swdev = ngbde_swdev_get(ioc.devid);
+        if (!swdev) {
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        addr = ioc.op.pio_win.addr;
+        size = ioc.op.pio_win.size;
+        if (ngbde_pio_map(swdev, addr, size) == NULL) {
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    case NGBDE_IOC_IIO_WIN_MAP:
+        swdev = ngbde_swdev_get(ioc.devid);
+        if (!swdev) {
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        addr = ioc.op.pio_win.addr;
+        size = ioc.op.pio_win.size;
+        if (ngbde_iio_map(swdev, addr, size) == NULL) {
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    case NGBDE_IOC_PAXB_WIN_MAP:
+        swdev = ngbde_swdev_get(ioc.devid);
+        if (!swdev) {
+            ioc.rc = NGBDE_IOC_FAIL;
+            break;
+        }
+        addr = ioc.op.pio_win.addr;
+        size = ioc.op.pio_win.size;
+        if (ngbde_paxb_map(swdev, addr, size) == NULL) {
+            ioc.rc = NGBDE_IOC_FAIL;
+        }
+        break;
+    default:
+        printk(KERN_ERR "ngbde: invalid ioctl (%08x)\n", cmd);
+        ioc.rc = NGBDE_IOC_FAIL;
+        break;
+    }
+
+    if (copy_to_user((void *)arg, &ioc, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iproc_probe.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iproc_probe.c
new file mode 100644
index 000000000000..63b02a4075a3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_iproc_probe.c
@@ -0,0 +1,164 @@
+/*! \file ngbde_iproc_probe.c
+ *
+ * BDE probe for IPROC internal bus devices.
+ *
+ * Validate CMICD existence on the platform. If Linux device tree matched,
+ * probe function of platform driver is called and the switch device read from
+ * CMICD register is added to the device list.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+
+/*! \cond */
+static int iproc_debug = 0;
+module_param(iproc_debug, int, 0);
+MODULE_PARM_DESC(iproc_debug,
+"IPROC debug output enable (default 0).");
+/*! \endcond */
+
+/*!
+ * \brief Probe devices on the IPROC internal bus.
+ *
+ * \param [in] pldev Platform device.
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+static int
+iproc_cmicd_probe(struct platform_device *pldev)
+{
+    int rv;
+    uint32_t size;
+    void *base_address;
+    uint32_t dev_rev_id;
+    struct ngbde_dev_s ngbde_dev, *nd = &ngbde_dev;
+    struct resource *memres, *irqres;
+
+    memres = platform_get_resource(pldev, IORESOURCE_MEM, 0);
+    if (memres == NULL) {
+        printk("Unable to retrieve iProc CMIC memory resource.");
+        return -1;
+    }
+    size = memres->end - memres->start + 1;
+
+    if (iproc_debug) {
+        printk("CMIC info : Memory start=%p, end=%p\n",
+               (void *)memres->start, (void *)memres->end);
+    }
+
+    base_address = ioremap_nocache(memres->start, size);
+    if (!base_address) {
+        printk(KERN_WARNING "Error mapping iProc CMIC registers");
+        return -1;
+    }
+
+    memset(nd, 0, sizeof(*nd));
+    nd->pci_dev = NULL; /* No PCI bus */
+    nd->dma_dev = &pldev->dev;
+
+    /* Read switch device ID from CMIC */
+    dev_rev_id = *((uint32_t*)(base_address + 0x10224));
+    nd->vendor_id = 0x14e4;
+    nd->device_id = dev_rev_id & 0xffff;
+    nd->revision = (dev_rev_id >> 16) & 0xff;
+
+    irqres = platform_get_resource(pldev, IORESOURCE_IRQ, 0);
+    if (irqres == NULL) {
+        printk(KERN_WARNING "Unable to retrieve iProc CMIC IRQ resource.");
+        return -1;
+    }
+    nd->irq_line = irqres->start;
+    if (iproc_debug) {
+        printk("CMIC info : IRQ line=%p\n", (void *)irqres->start);
+    }
+
+    nd->iowin[0].addr = memres->start;
+    nd->iowin[0].size = size;
+
+    if (base_address) {
+        iounmap(base_address);
+    }
+    rv = ngbde_swdev_add(nd);
+
+    return rv;
+}
+
+/*!
+ * \brief Remove the platform device.
+ *
+ * \param [in] pldev Platform device.
+ *
+ * \retval 0 No errors
+ */
+static int
+iproc_cmicd_remove(struct platform_device *pldev)
+{
+    return 0;
+}
+
+/*! Matching compatible property with device tree. */
+static const struct of_device_id iproc_cmicd_of_match[] = {
+    { .compatible = "brcm,iproc-cmicd" },
+    {},
+};
+MODULE_DEVICE_TABLE(of, iproc_cmicd_of_match);
+
+static char iproc_cmicd_string[] = "bcmiproc-cmicd";
+
+/*! Platform driver definition. */
+static struct platform_driver iproc_cmicd_driver =
+{
+    .probe = iproc_cmicd_probe,
+    .remove = iproc_cmicd_remove,
+    .driver =
+    {
+        .name = iproc_cmicd_string,
+        .owner = THIS_MODULE,
+        .of_match_table = iproc_cmicd_of_match,
+    },
+};
+
+/*!
+ * \brief Probe for Broadcom switch devices on IPROC internal bus.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+int
+ngbde_iproc_probe(void)
+{
+    platform_driver_register(&iproc_cmicd_driver);
+
+    return 0;
+}
+
+/*!
+ * \brief Clean up resources for Broadcom switch devices on IPROC internal bus.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+int
+ngbde_iproc_cleanup(void)
+{
+    platform_driver_unregister(&iproc_cmicd_driver);
+
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_kapi.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_kapi.c
new file mode 100644
index 000000000000..340e7b057d44
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_kapi.c
@@ -0,0 +1,216 @@
+/*! \file ngbde_kapi.c
+ *
+ * Public BDE kernel API for use with other kernel modules.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+#include <lkm/ngbde_kapi.h>
+
+struct pci_dev *
+ngbde_kapi_pci_dev_get(int kdev)
+{
+    struct ngbde_dev_s *sd;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return NULL;
+    }
+
+    return sd->pci_dev;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_pci_dev_get);
+/*! \endcond */
+
+struct device *
+ngbde_kapi_dma_dev_get(int kdev)
+{
+    struct ngbde_dev_s *sd;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return NULL;
+    }
+
+    return sd->dma_dev;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_dma_dev_get);
+/*! \endcond */
+
+void *
+ngbde_kapi_dma_bus_to_virt(int kdev, dma_addr_t baddr)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_dmamem_s *dmamem;
+    size_t dma_offset;
+    int idx;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return NULL;
+    }
+
+    for (idx = 0; idx < NGBDE_NUM_DMAPOOL_MAX; idx++) {
+        dmamem = &sd->dmapool[idx].dmamem;
+        dma_offset = baddr - dmamem->baddr;
+        if (dma_offset < dmamem->size) {
+            return (uint8_t *)dmamem->vaddr + dma_offset;
+        }
+    }
+    return NULL;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_dma_bus_to_virt);
+/*! \endcond */
+
+dma_addr_t
+ngbde_kapi_dma_virt_to_bus(int kdev, void *vaddr)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_dmamem_s *dmamem;
+    size_t dma_offset;
+    int idx;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return 0UL;
+    }
+
+    for (idx = 0; idx < NGBDE_NUM_DMAPOOL_MAX; idx++) {
+        dmamem = &sd->dmapool[idx].dmamem;
+        dma_offset = (uintptr_t)vaddr - (uintptr_t)dmamem->vaddr;
+        if (dma_offset < dmamem->size) {
+            return dmamem->baddr + dma_offset;
+        }
+    }
+    return 0UL;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_dma_virt_to_bus);
+/*! \endcond */
+
+void
+ngbde_kapi_pio_write32(int kdev, uint32_t offs, uint32_t val)
+{
+    struct ngbde_dev_s *sd;
+
+    sd = ngbde_swdev_get(kdev);
+    if (sd) {
+        return ngbde_pio_write32(sd, offs, val);
+    }
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_pio_write32);
+/*! \endcond */
+
+uint32_t
+ngbde_kapi_pio_read32(int kdev, uint32_t offs)
+{
+    struct ngbde_dev_s *sd;
+
+    sd = ngbde_swdev_get(kdev);
+    if (sd) {
+        return ngbde_pio_read32(sd, offs);
+    }
+
+    return (uint32_t)-1;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_pio_read32);
+/*! \endcond */
+
+void *
+ngbde_kapi_pio_membase(int kdev)
+{
+    struct ngbde_dev_s *sd;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return NULL;
+    }
+
+    return sd->pio_mem;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_pio_membase);
+/*! \endcond */
+
+int
+ngbde_kapi_intr_connect(int kdev, unsigned int irq_num,
+                        int (*isr_func)(void *), void *isr_data)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+    ic->isr_func = isr_func;
+    ic->isr_data = isr_data;
+
+    return 0;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_intr_connect);
+/*! \endcond */
+
+int
+ngbde_kapi_intr_disconnect(int kdev, unsigned int irq_num)
+{
+    struct ngbde_dev_s *sd;
+    struct ngbde_intr_ctrl_s *ic;
+
+    sd = ngbde_swdev_get(kdev);
+    if (!sd) {
+        return -1;
+    }
+
+    if (irq_num >= NGBDE_NUM_IRQS_MAX) {
+        return -1;
+    }
+
+    ic = &sd->intr_ctrl[irq_num];
+    ic->isr_func = NULL;
+    ic->isr_data = NULL;
+
+    return 0;
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_intr_disconnect);
+/*! \endcond */
+
+int
+ngbde_kapi_intr_mask_write(int kdev, unsigned int irq_num,
+                           uint32_t status_reg, uint32_t mask_val)
+{
+    return ngbde_intr_mask_write(kdev, irq_num, 1, status_reg, mask_val);
+}
+/*! \cond */
+EXPORT_SYMBOL(ngbde_kapi_intr_mask_write);
+/*! \endcond */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_main.c
new file mode 100644
index 000000000000..5ce48ebc5134
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_main.c
@@ -0,0 +1,297 @@
+/*! \file ngbde_main.c
+ *
+ * NGBDE module entry.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+/*! \cond */
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_DESCRIPTION("NG BDE Module");
+MODULE_LICENSE("GPL");
+/*! \endcond */
+
+/*! \cond */
+static int mmap_debug = 0;
+module_param(mmap_debug, int, 0);
+MODULE_PARM_DESC(mmap_debug,
+"MMAP debug output enable (default 0).");
+/*! \endcond */
+
+/*!
+ * \brief Remap user space DMA memory to non-cached area.
+ *
+ * Since we cannot flush and invalidate DMA memory from user space,
+ * the DMA memory pools need to be cache-coherent, even if this means
+ * that we need to remap the DMA memory as non-cached.
+ *
+ * If undefined, we set this value according to kernel configuration.
+ */
+#ifndef REMAP_DMA_NONCACHED
+#  ifdef CONFIG_DMA_NONCOHERENT
+#    define REMAP_DMA_NONCACHED 1
+#  else
+#    define REMAP_DMA_NONCACHED 0
+#  endif
+#endif
+
+static int
+ngbde_open(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static int
+ngbde_release(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+/*!
+ * \brief Check if memory range is within existing DMA memory pools.
+ *
+ * \param [in] paddr Physical start address of memory range.
+ * \param [in] size Size of memory range.
+ *
+ * \retval true Range is valid.
+ * \retval false Range is not valid.
+ */
+static bool
+ngbde_dma_range_valid(unsigned long paddr, unsigned long size)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    struct ngbde_dmamem_s *dmamem;
+    unsigned int pool;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        for (pool = 0; pool < NGBDE_NUM_DMAPOOL_MAX; pool++) {
+            dmamem = &swdev[idx].dmapool[pool].dmamem;
+            if (paddr >= dmamem->paddr &&
+                (paddr + size) <= (dmamem->paddr + dmamem->size)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+/*!
+ * \brief Check if memory range is within device I/O ranges.
+ *
+ * \param [in] paddr Physical start address of I/O memory range.
+ * \param [in] size Size of memory range.
+ *
+ * \retval true Range is valid.
+ * \retval false Range is not valid.
+ */
+static bool
+ngbde_pio_range_valid(unsigned long paddr, unsigned long size)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    struct ngbde_memwin_s *iowin;
+    unsigned long iowin_size;
+    unsigned int wdx;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        for (wdx = 0; wdx < NGBDE_NUM_IOWIN_MAX; wdx++) {
+            iowin = &swdev[idx].iowin[wdx];
+            iowin_size = iowin->size;
+            if (iowin_size < PAGE_SIZE) {
+                iowin_size = PAGE_SIZE;
+            }
+            if (mmap_debug) {
+                printk("MMAP: Check 0x%08lx/0x%08lx against "
+                       "0x%08lx/0x%08lx(0x%08lx)\n",
+                       paddr, size,
+                       (unsigned long)iowin->addr,
+                       (unsigned long)iowin->size, iowin_size);
+            }
+            if (paddr >= iowin->addr &&
+                (paddr + size) <= (iowin->addr + iowin_size)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+/*!
+ * \brief Match incomplete address with device base addresses.
+ *
+ * Use for physical addresses larger than 44 bits.
+ *
+ * \param [in] paddr Physical address from user space.
+ *
+ * \return Matched device base addess or 0 if no match.
+ */
+static unsigned long
+ngbde_pio_base_match(unsigned long paddr)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    struct ngbde_memwin_s *iowin;
+    unsigned int wdx;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        for (wdx = 0; wdx < NGBDE_NUM_IOWIN_MAX; wdx++) {
+            iowin = &swdev[idx].iowin[wdx];
+            if (((paddr ^ iowin->addr) & 0xfffffffffffULL) == 0) {
+                if (mmap_debug) {
+                    printk("MMAP: Matched 0x%08lx to 0x%08lx\n",
+                           (unsigned long)paddr,
+                           (unsigned long)iowin->addr);
+                }
+                return iowin->addr;
+            }
+        }
+    }
+    return 0;
+}
+
+/*
+ * Some kernels are configured to prevent mapping of kernel RAM memory
+ * into user space via the /dev/mem device.
+ *
+ * The function below provides a backdoor to mapping the DMA pool to
+ * user space via the BDE device file.
+ */
+static int
+ngbde_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+    unsigned long paddr = vma->vm_pgoff << PAGE_SHIFT;
+    unsigned long size = vma->vm_end - vma->vm_start;
+    int map_noncached = REMAP_DMA_NONCACHED;
+    int range_valid = 0;
+
+    if (mmap_debug) {
+        printk("MMAP: Mapping %lu Kbytes at 0x%08lx (0x%lx)\n",
+               size / 1024, paddr, vma->vm_pgoff);
+    }
+
+    if (ngbde_dma_range_valid(paddr, size)) {
+        range_valid = 1;
+    } else {
+        map_noncached = 1;
+        if (ngbde_pio_range_valid(paddr, size)) {
+            range_valid = 1;
+        } else {
+            paddr = ngbde_pio_base_match(paddr);
+            if (ngbde_pio_range_valid(paddr, size)) {
+                range_valid = 1;
+            }
+        }
+    }
+
+    if (!range_valid) {
+        printk("BDE: Invalid mmap range 0x%08lx/0x%lx\n", paddr, size);
+        return -EINVAL;
+    }
+
+    if (map_noncached) {
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+    }
+
+    if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                        size, vma->vm_page_prot)) {
+        printk("BDE: Failed to mmap phys range 0x%lx-0x%lx to 0x%lx-0x%lx\n",
+               paddr, paddr + size, vma->vm_start, vma->vm_end);
+        return -EAGAIN;
+    }
+
+    return 0;
+}
+
+static struct file_operations fops = {
+    .open = ngbde_open,
+    .release = ngbde_release,
+    .unlocked_ioctl = ngbde_ioctl,
+    .compat_ioctl = ngbde_ioctl,
+    .mmap = ngbde_mmap,
+};
+
+/*!
+ * \brief Standard module cleanup.
+ *
+ * \return Nothing.
+ */
+void __exit
+cleanup_module(void)
+{
+    ngbde_intr_cleanup();
+    ngbde_iio_cleanup();
+    ngbde_paxb_cleanup();
+    ngbde_pio_cleanup();
+    ngbde_dma_cleanup();
+    ngbde_procfs_cleanup();
+    unregister_chrdev(MOD_MAJOR, MOD_NAME);
+    ngbde_pci_cleanup();
+    ngbde_iproc_cleanup();
+    printk(KERN_INFO "Broadcom NGBDE unloaded successfully\n");
+}
+
+/*!
+ * \brief Standard module initialization.
+ *
+ * \return Nothing.
+ */
+int __init
+init_module(void)
+{
+    int rv;
+
+    rv = register_chrdev(MOD_MAJOR, MOD_NAME, &fops);
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: can't get major %d\n",
+               MOD_NAME, MOD_MAJOR);
+        return rv;
+    }
+
+    rv = ngbde_iproc_probe();
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: Error probing for AXI bus devices.\n",
+               MOD_NAME);
+        return rv;
+    }
+
+    rv = ngbde_pci_probe();
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: Error probing for PCI bus devices.\n",
+               MOD_NAME);
+        return rv;
+    }
+
+    rv = ngbde_procfs_init();
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: Unable to initialize proc files\n",
+               MOD_NAME);
+        return rv;
+    }
+
+    printk(KERN_INFO "Broadcom NGBDE loaded successfully\n");
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pci_probe.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pci_probe.c
new file mode 100644
index 000000000000..37da39cd38a7
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pci_probe.c
@@ -0,0 +1,211 @@
+/*! \file ngbde_pci_probe.c
+ *
+ * NG BDE probe for PCI devices.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+/*! \cond */
+static int use_msi = 1;
+module_param(use_msi, int, 0);
+MODULE_PARM_DESC(use_msi,
+"Use MSI interrupts if supported by the kernel (default 1).");
+/*! \endcond */
+
+/*! \cond */
+static int pci_debug = 0;
+module_param(pci_debug, int, 0);
+MODULE_PARM_DESC(pci_debug,
+"PCI debug output enable (default 0).");
+/*! \endcond */
+
+/*!
+ * Use BCMDRD_DEVLIST_ENTRY macro to generate a device list based on
+ * supported/installed devices.
+ */
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    { _vn, _dv, PCI_ANY_ID, PCI_ANY_ID },
+
+/*! Include all chip variants in the list of supported devices. */
+#define BCMDRD_DEVLIST_INCLUDE_ALL
+
+static struct pci_device_id pci_id_table[] = {
+#include <bcmdrd/bcmdrd_devlist.h>
+    { BROADCOM_VENDOR_ID, 0xb524, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, 0xb684, PCI_ANY_ID, PCI_ANY_ID },
+    { 0, 0, 0, 0 }
+};
+
+static int
+pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *ent)
+{
+    int rv;
+    int bdx;
+    int cmic_bar = 0;
+    uint8_t rev;
+    struct ngbde_dev_s ngbde_dev, *nd = &ngbde_dev;
+    int bus_no = pci_dev->bus ? pci_dev->bus->number : 0;
+    int slot_no = PCI_SLOT(pci_dev->devfn);
+
+    if (PCI_FUNC(pci_dev->devfn) > 0) {
+        return 0;
+    }
+
+    if (pci_debug) {
+        printk("PCI: pci_probe: bus %d slot %d: %04x:%04x\n",
+               bus_no, slot_no,
+               pci_dev->vendor, pci_dev->device);
+    }
+
+    memset(nd, 0, sizeof(*nd));
+    nd->pci_dev = pci_dev;
+    nd->dma_dev = &pci_dev->dev;
+    nd->vendor_id = pci_dev->vendor;
+    nd->device_id = pci_dev->device;
+    nd->bus_no = bus_no;
+    nd->slot_no = slot_no;
+
+    /* PCI revision must extracted "manually */
+    pci_read_config_byte(pci_dev, PCI_REVISION_ID, &rev);
+    nd->revision = rev;
+
+    if (pci_enable_device(pci_dev)) {
+        printk(KERN_WARNING "%s: Cannot enable PCI device: "
+               "vendor_id = %x, device_id = %x\n",
+               MOD_NAME, pci_dev->vendor, pci_dev->device);
+    }
+    pci_set_master(pci_dev);
+
+    /* IRQ number is only valid if PCI device is enabled */
+    nd->irq_line = pci_dev->irq;
+
+    /* Check for iProc */
+    if (pci_resource_len(pci_dev, 2)) {
+        nd->iowin[1].addr = pci_resource_start(pci_dev, 0);
+        nd->iowin[1].size = pci_resource_len(pci_dev, 0);
+        cmic_bar = 2;
+    }
+    nd->iowin[0].addr = pci_resource_start(pci_dev, cmic_bar);
+    nd->iowin[0].size = pci_resource_len(pci_dev, cmic_bar);
+
+    /* Verify basic I/O access by reading first word of each BAR window */
+    for (bdx = 0; bdx < 2; bdx++) {
+        if (nd->iowin[bdx].size == 0) {
+            continue;
+        }
+        if (ngbde_pio_map(nd, nd->iowin[bdx].addr, nd->iowin[bdx].size)) {
+            if (pci_debug) {
+                printk("PCI: BAR %d adddress 0 = 0x%x\n",
+                       bdx, (unsigned int)ngbde_pio_read32(nd, 0));
+            }
+            ngbde_pio_unmap(nd);
+        } else {
+            printk(KERN_WARNING "%s: Cannot map PCI BAR %d: "
+                   "start = %08lx, len = %lx\n",
+                   MOD_NAME, bdx,
+                   (unsigned long)nd->iowin[bdx].addr,
+                   (unsigned long)nd->iowin[bdx].size);
+        }
+    }
+
+    spin_lock_init(&nd->lock);
+
+    /* Determine MSI configuration by enabling MSI on the device */
+    nd->use_msi = use_msi;
+    if (nd->use_msi) {
+        if (pci_enable_msi(nd->pci_dev) == 0) {
+            pci_disable_msi(nd->pci_dev);
+        } else {
+            nd->use_msi = 0;
+        }
+    }
+
+    rv = ngbde_swdev_add(nd);
+
+    if (rv == 0) {
+        /* Update DMA pools for all devices */
+        rv = ngbde_dma_init();
+        if (rv < 0) {
+            printk(KERN_WARNING "%s: Error initializing DMA memory\n",
+                   MOD_NAME);
+            /* Mark device as inactive */
+            nd->inactive = 1;
+        }
+    }
+
+    return rv;
+}
+
+static void
+pci_remove(struct pci_dev* pci_dev)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    int bus_no = pci_dev->bus ? pci_dev->bus->number : 0;
+    int slot_no = PCI_SLOT(pci_dev->devfn);
+
+    if (pci_debug) {
+        printk("PCI: pci_remove: bus %d slot %d: %04x:%04x\n",
+               bus_no, slot_no,
+               pci_dev->vendor, pci_dev->device);
+    }
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+    for (idx = 0; idx < num_swdev; idx++) {
+        if (swdev[idx].bus_no == bus_no &&
+            swdev[idx].slot_no == slot_no) {
+            if (swdev[idx].inactive) {
+                printk(KERN_WARNING "%s: Device already removed\n",
+                       MOD_NAME);
+            }
+            /* Active device in this slot already? */
+            swdev[idx].inactive = 1;
+        }
+    }
+
+    /* Update DMA pools for all devices */
+    ngbde_dma_cleanup();
+}
+
+static struct pci_driver pci_driver = {
+    .name = MOD_NAME,
+    .probe = pci_probe,
+    .remove = pci_remove,
+    .id_table = pci_id_table,
+    /* The rest are dynamic */
+};
+
+int
+ngbde_pci_probe(void)
+{
+    if (pci_register_driver(&pci_driver) < 0) {
+        return -ENODEV;
+    }
+
+    return 0;
+}
+
+int
+ngbde_pci_cleanup(void)
+{
+    pci_unregister_driver(&pci_driver);
+
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pgmem.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pgmem.c
new file mode 100644
index 000000000000..e473f0c545cb
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pgmem.c
@@ -0,0 +1,472 @@
+/*! \file ngbde_pgmem.c
+ *
+ * \brief PGMEM allocator.
+ *
+ * This module is used to allocate large physically contiguous memory
+ * blocks using the Linux kernel page allocator.
+ *
+ * The Linux page allocator can allocate contiguous memory up until a
+ * certain size, which depends on the kernel version and the CPU
+ * architecture.
+ *
+ * If a larger contiguous memory block is requested, then we need to
+ * allocate multiple blocks from the Linux page allocator and then
+ * check if which ones are contiguous.
+ *
+ * The smaller memory blocks from which the larger block is assembled
+ * are referred to as "chunks".
+ *
+ * The PGMEM allocator will continue to allocate chunks from the Linux
+ * page allocator, until a contiguous memory block of the requested
+ * size has been assembled, or until a predefined maximum number of
+ * chunks have been allocated. Obviously the process is also stopped
+ * if the Linux page allocator returns an error.
+ *
+ * A physically contiguous memory block assembled from smaller memory
+ * chunks are referred to as "cmblocks".
+ *
+ * The chance of success depends on the requested memory block size as
+ * well as the fragmentation level of the system memory, i.e. the
+ * sooner after system boot these memory block are requested, the more
+ * likely these requests are to succeed.
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+
+/*******************************************************************************
+ * Local definitions
+ ******************************************************************************/
+
+/*! Maximum size the kernel can allocate in a single allocation. */
+#define MEM_CHUNK_SIZE_MAX      (1 << (MAX_ORDER - 1 + PAGE_SHIFT))
+
+/*! Default block size we wil request from the kernel. */
+#define MEM_CHUNK_SIZE_DEFAULT  (512 * ONE_KB)
+
+/*! \cond */
+static int pgmem_chunk_size = 0;
+module_param(pgmem_chunk_size, int, 0);
+MODULE_PARM_DESC(pgmem_chunk_size,
+"Memory chunk size in KB used by page allocator (default auto).");
+/*! \endcond */
+
+/*! \cond */
+static int pgmem_debug = 0;
+module_param(pgmem_debug, int, 0);
+MODULE_PARM_DESC(pgmem_debug,
+"Enable page memory allocator debug output (default 0).");
+/*! \endcond */
+
+/*! Helper macro for debug trace output. */
+#define PGMEM_TRACE(_s)                         \
+    do {                                        \
+        if (pgmem_debug) {                      \
+            printk(_s);                         \
+        }                                       \
+    } while (0)
+
+/*!
+ * Chunk memory block descriptor.
+ */
+typedef struct cmblock_desc_s {
+
+    /*! Linked-list handle. */
+    struct list_head list;
+
+    /*! Requested cmblock size. */
+    unsigned long req_size;
+
+    /*! Memory chunk size. */
+    unsigned long chunk_size;
+
+    /*! Memory chunk size in alternate format (2^x). */
+    unsigned long chunk_order;
+
+    /*! Current cmblock size. */
+    unsigned long cmblk_size;
+
+    /*! Logical address of cmblock. */
+    unsigned long cmblk_begin;
+
+    /*! Logical end address of cmblock. */
+    unsigned long cmblk_end;
+
+    /*! Array of logical chunk addresses. */
+    unsigned long *chunk_ptr;
+
+    /*! Maximum number of chunks to allocate. */
+    int chunk_cnt_max;
+
+    /*! Current number of chunks allocated. */
+    int chunk_cnt;
+
+} cmblock_desc_t;
+
+static LIST_HEAD(cmblocks_list);
+
+
+/*!
+ * \name Chunk tag mask.
+ * \anchor CT_xxx
+ *
+ * The lower two bits of the chunk address is used to tag the chunk
+ * with its current state.
+ */
+#define CT_MASK         0x3
+
+/*! Chunk is untagged. */
+#define CT_UNTAGGED     0
+
+/*! Chunk was discarded. */
+#define CT_DISCARDED    1
+
+/*! Chunk is part of largest cmblock. */
+#define CT_LARGEST      2
+
+/*! Chunk is part of current cmblock. */
+#define CT_CURRENT      3
+
+/*! Set block as untagged. */
+#define CTAG_SET(_a, _t)                        \
+    do {                                        \
+        (_a) &= ~CT_MASK;                       \
+        (_a) |= _t;                             \
+    } while (0)
+
+/*! Set block as untagged. */
+#define CTAG_GET(_a)                            \
+    ((_a) & CT_MASK)
+
+
+/*******************************************************************************
+ * Private Functions
+ ******************************************************************************/
+
+/*!
+ * \brief Find largest contiguous memory block.
+ *
+ * Find largest contiguous memory block from a pool of memory chunks.
+ *
+ * Assembly stops if a cmblock of the requested cmblock size has been
+ * obtained.
+ *
+ * The lower two address bits of the memory chunks are encoded as a
+ * tag according to \ref CT_xxx.
+ *
+ * \param [in] cmbd cmblock descriptor.
+ *
+ * \return Always 0.
+ */
+static int
+find_largest_cmblock(cmblock_desc_t *cmbd)
+{
+    int i, j, chunks, found;
+    unsigned long b, e, a;
+    unsigned long *cptr;
+
+    /* Convenience variable */
+    chunks = cmbd->chunk_cnt;
+    cptr = cmbd->chunk_ptr;
+
+    /* Clear all chunk tags */
+    for (i = 0; i < chunks; i++) {
+        CTAG_SET(cptr[i], CT_UNTAGGED);
+    }
+    for (i = 0; i < chunks && cmbd->cmblk_size < cmbd->req_size; i++) {
+        /* First chunk must be an untagged chunk */
+        if (CTAG_GET(cptr[i]) == CT_UNTAGGED) {
+            /* Initial cmblock size is the chunk size */
+            b = cptr[i];
+            e = b + cmbd->chunk_size;
+            CTAG_SET(cptr[i], CT_CURRENT);
+            /* Loop looking for adjacent chunks */
+            do {
+                found = 0;
+                for (j = i + 1; j < chunks && (e - b) < cmbd->req_size; j++) {
+                    a = cptr[j];
+                    /* Check untagged chunks only */
+                    if (CTAG_GET(a) == CT_UNTAGGED) {
+                        if (a == (b - cmbd->chunk_size)) {
+                            /* Found adjacent chunk below current cmblock */
+                            CTAG_SET(cptr[j], CT_CURRENT);
+                            b = a;
+                            found = 1;
+                        } else if (a == e) {
+                            /* Found adjacent chunk above current cmblock */
+                            CTAG_SET(cptr[j], CT_CURRENT);
+                            e += cmbd->chunk_size;
+                            found = 1;
+                        }
+                    }
+                }
+            } while (found);
+            /* Now check the size of the assembled memory block */
+            if ((e - b) > cmbd->cmblk_size) {
+                /* The current block is largest so far */
+                cmbd->cmblk_begin = b;
+                cmbd->cmblk_end = e;
+                cmbd->cmblk_size = e - b;
+                /* Re-tag current and previous largest cmblock */
+                for (j = 0; j < chunks; j++) {
+                    if (CTAG_GET(cptr[j]) == CT_CURRENT) {
+                        /* Tag current cmblock as the largest */
+                        CTAG_SET(cptr[j], CT_LARGEST);
+                    } else if (CTAG_GET(cptr[j]) == CT_LARGEST) {
+                        /* Discard previous largest cmblock */
+                        CTAG_SET(cptr[j], CT_DISCARDED);
+                    }
+                }
+            } else {
+                /* Discard all chunks in current cmblock */
+                for (j = 0; j < chunks; j++) {
+                    if (CTAG_GET(cptr[j]) == CT_CURRENT) {
+                        CTAG_SET(cptr[j], CT_DISCARDED);
+                    }
+                }
+            }
+        }
+    }
+    return 0;
+}
+
+/*!
+ * \brief Allocate memory chunks and add them to the pool.
+ *
+ * Memory chunks are allocated using the kernel page allocator.
+ *
+ * \param [in] cmbd - cmblock descriptor.
+ * \param [in] chunks - Number of memory chunks to allocate.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+static int
+alloc_mem_chunks(cmblock_desc_t *cmbd, int chunks)
+{
+    int i, start;
+    unsigned long addr;
+
+    if (cmbd->chunk_cnt + chunks > cmbd->chunk_cnt_max) {
+        printk("PGMEM: No more memory chunks\n");
+        return -1;
+    }
+    start = cmbd->chunk_cnt;
+    cmbd->chunk_cnt += chunks;
+    for (i = start; i < cmbd->chunk_cnt; i++) {
+        /* Get chunk from kernel allocator */
+        addr = __get_free_pages(GFP_KERNEL | GFP_DMA32, cmbd->chunk_order);
+        PGMEM_TRACE(".");
+        if (addr) {
+            cmbd->chunk_ptr[i] = addr;
+        } else {
+            printk("PGMEM: Page memory allocation failed\n");
+            return -1;
+        }
+    }
+    return 0;
+}
+
+/*!
+ * \brief Allocate large physically contiguous memory block.
+ *
+ * If we cannot allocate a sufficiently large block of contiguous
+ * memory from the kernel, then we simply keep allocating smaller
+ * chunks until we can assemble a contiguous block of the desired
+ * size.
+ *
+ * When maximum amount of system memory has been allocated without the
+ * successful assembly of a contiguous memory block, the allocation
+ * function will return the largest contiguous block found so far. It
+ * is then up to the calling function to decide whether this amount is
+ * sufficient to proceed.
+ *
+ * \param [in] size Requested memory block size.
+ * \param [in] chunk_size Assemble cmblock from chunks of this size.
+ *
+ * \return Pointer to cmblock descriptor, or NULL if error.
+ */
+static cmblock_desc_t *
+cmblock_alloc(size_t size, size_t chunk_size)
+{
+    cmblock_desc_t *cmbd;
+    int i, chunk_ptr_size;
+    unsigned long page_addr;
+    struct sysinfo si;
+
+    /* Sanity check */
+    if (size == 0 || chunk_size == 0) {
+        return NULL;
+    }
+
+    /* Allocate an initialize memory cmblock descriptor */
+    if ((cmbd = kmalloc(sizeof(cmblock_desc_t), GFP_KERNEL)) == NULL) {
+        return NULL;
+    }
+    memset(cmbd, 0, sizeof(*cmbd));
+    cmbd->req_size = size;
+    cmbd->chunk_size = PAGE_ALIGN(chunk_size);
+    while ((PAGE_SIZE << cmbd->chunk_order) < cmbd->chunk_size) {
+        cmbd->chunk_order++;
+    }
+
+    /* Determine the maximum possible number of memory chunks */
+    si_meminfo(&si);
+    cmbd->chunk_cnt_max = (si.totalram << PAGE_SHIFT) / cmbd->chunk_size;
+    chunk_ptr_size = cmbd->chunk_cnt_max * sizeof(unsigned long);
+
+    /* Allocate an initialize memory chunk pool */
+    cmbd->chunk_ptr = kmalloc(chunk_ptr_size, GFP_KERNEL);
+    if (cmbd->chunk_ptr == NULL) {
+        kfree(cmbd);
+        return NULL;
+    }
+    memset(cmbd->chunk_ptr, 0, chunk_ptr_size);
+
+    /* Allocate minimum number of memory chunks */
+    (void)alloc_mem_chunks(cmbd, cmbd->req_size / cmbd->chunk_size);
+
+    /* Allocate more chunks until we have a complete cmblock */
+    do {
+        find_largest_cmblock(cmbd);
+        PGMEM_TRACE("o");
+        if (cmbd->cmblk_size >= cmbd->req_size) {
+            break;
+        }
+    } while (alloc_mem_chunks(cmbd, 8) == 0);
+
+    /* Reserve all pages in the cmblock and free unused chunks */
+    for (i = 0; i < cmbd->chunk_cnt; i++) {
+        if (CTAG_GET(cmbd->chunk_ptr[i]) == CT_LARGEST) {
+            CTAG_SET(cmbd->chunk_ptr[i], CT_UNTAGGED);
+            for (page_addr = cmbd->chunk_ptr[i];
+                 page_addr < cmbd->chunk_ptr[i] + cmbd->chunk_size;
+                 page_addr += PAGE_SIZE) {
+                SetPageReserved(virt_to_page((void *)page_addr));
+            }
+        } else if (cmbd->chunk_ptr[i]) {
+            CTAG_SET(cmbd->chunk_ptr[i], CT_UNTAGGED);
+            free_pages(cmbd->chunk_ptr[i], cmbd->chunk_order);
+            PGMEM_TRACE("x");
+            cmbd->chunk_ptr[i] = 0;
+        }
+    }
+    PGMEM_TRACE("O\n");
+    return cmbd;
+}
+
+/*!
+ * \brief Free cmblock and associated resources.
+ *
+ * Free all memory chunks and other associated resources associated
+ * with a contiguous memory block.
+ *
+ * See alse \ref cmblock_alloc.
+ *
+ * \param [in] cmbd Command block descriptor to free.
+ *
+ * \return Nothing.
+ */
+static void
+cmblock_free(cmblock_desc_t *cmbd)
+{
+    int i;
+    unsigned long page_addr;
+
+    if (cmbd->chunk_ptr) {
+        for (i = 0; i < cmbd->chunk_cnt; i++) {
+            if (cmbd->chunk_ptr[i]) {
+                for (page_addr = cmbd->chunk_ptr[i];
+                     page_addr < cmbd->chunk_ptr[i] + cmbd->chunk_size;
+                     page_addr += PAGE_SIZE) {
+                    ClearPageReserved(virt_to_page((void *)page_addr));
+                }
+                free_pages(cmbd->chunk_ptr[i], cmbd->chunk_order);
+                PGMEM_TRACE("X");
+            }
+        }
+        kfree(cmbd->chunk_ptr);
+        kfree(cmbd);
+    }
+}
+
+
+/*******************************************************************************
+ * Public Functions
+ ******************************************************************************/
+
+void *
+ngbde_pgmem_alloc(size_t size, gfp_t flags)
+{
+    cmblock_desc_t *cmbd;
+    size_t chunk_size;
+
+    chunk_size = size;
+
+    if (pgmem_chunk_size > 0) {
+        chunk_size = pgmem_chunk_size * ONE_KB;
+    }
+
+    if (chunk_size > MEM_CHUNK_SIZE_MAX) {
+        chunk_size = MEM_CHUNK_SIZE_DEFAULT;
+    }
+
+    if (pgmem_debug) {
+        printk("PGMEM: Allocate %d MB in %d KB chunks\n",
+               (int)(size / ONE_MB), (int)(chunk_size / ONE_KB));
+    }
+
+    if ((cmbd = cmblock_alloc(size, chunk_size)) == NULL) {
+        return NULL;
+    }
+    if (cmbd->cmblk_size < size) {
+        /* If we didn't get the full size then forget it */
+        cmblock_free(cmbd);
+        return NULL;
+    }
+    list_add(&cmbd->list, &cmblocks_list);
+    return (void *)cmbd->cmblk_begin;
+}
+
+int
+ngbde_pgmem_free(void *ptr)
+{
+    struct list_head *pos;
+
+    list_for_each(pos, &cmblocks_list) {
+        cmblock_desc_t *cmbd = list_entry(pos, cmblock_desc_t, list);
+        if (ptr == (void *)cmbd->cmblk_begin) {
+            list_del(&cmbd->list);
+            cmblock_free(cmbd);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+void
+ngbde_pgmem_free_all(void)
+{
+    struct list_head *pos, *tmp;
+
+    list_for_each_safe(pos, tmp, &cmblocks_list) {
+        cmblock_desc_t *cmbd = list_entry(pos, cmblock_desc_t, list);
+        list_del(&cmbd->list);
+        cmblock_free(cmbd);
+    }
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pio.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pio.c
new file mode 100644
index 000000000000..cab094a2feca
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_pio.c
@@ -0,0 +1,97 @@
+/*! \file ngbde_pio.c
+ *
+ * API for managing and accessing memory-mapped I/O for switch
+ * registers.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+void *
+ngbde_pio_map(void *devh, phys_addr_t addr, phys_addr_t size)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->pio_mem) {
+        if (addr == sd->pio_win.addr && size == sd->pio_win.size) {
+            /* Already mapped */
+            return sd->pio_mem;
+        }
+        ngbde_pio_unmap(devh);
+    }
+
+    sd->pio_mem = ioremap_nocache(addr, size);
+
+    if (sd->pio_mem) {
+        /* Save mapped resources */
+        sd->pio_win.addr = addr;
+        sd->pio_win.size = size;
+    } else {
+        printk(KERN_WARNING "%s: Unable to map address 0x%08lu\n",
+               MOD_NAME, (unsigned long)addr);
+    }
+
+    return sd->pio_mem;
+}
+
+void
+ngbde_pio_unmap(void *devh)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->pio_mem) {
+        iounmap(sd->pio_mem);
+        sd->pio_mem = NULL;
+    }
+}
+
+void
+ngbde_pio_cleanup(void)
+{
+    struct ngbde_dev_s *swdev, *sd;
+    unsigned int num_swdev, idx;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    for (idx = 0; idx < num_swdev; idx++) {
+        sd = ngbde_swdev_get(idx);
+        ngbde_pio_unmap(sd);
+    }
+}
+
+void
+ngbde_pio_write32(void *devh, uint32_t offs, uint32_t val)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->pio_mem) {
+        NGBDE_IOWRITE32(val, sd->pio_mem + offs);
+    }
+}
+
+uint32_t
+ngbde_pio_read32(void *devh, uint32_t offs)
+{
+    struct ngbde_dev_s *sd = (struct ngbde_dev_s *)devh;
+
+    if (sd->pio_mem) {
+        return NGBDE_IOREAD32(sd->pio_mem + offs);
+    }
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_procfs.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_procfs.c
new file mode 100644
index 000000000000..f99339a5b0dc
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_procfs.c
@@ -0,0 +1,120 @@
+/*! \file ngbde_procfs.c
+ *
+ * <description>
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+static int
+proc_show(struct seq_file *m, void *v)
+{
+    struct ngbde_dev_s *swdev;
+    unsigned int num_swdev, idx;
+    struct ngbde_dmamem_s *dmamem;
+    unsigned int pool;
+    unsigned int dma_pools;
+    char *dma_str;
+
+    ngbde_swdev_get_all(&swdev, &num_swdev);
+
+    seq_printf(m, "Broadcom Device Enumerator (%s)\n", MOD_NAME);
+
+    seq_printf(m, "Found %d switch device(s):\n", num_swdev);
+    for (idx = 0; idx < num_swdev; idx++) {
+        if (swdev->inactive) {
+            seq_printf(m, "%d:removed\n", idx);
+            continue;
+        }
+        seq_printf(m, "%d:%04x:%04x:%02x,%s(%d)\n", idx,
+                   swdev->vendor_id, swdev->device_id, swdev->revision,
+                   swdev->use_msi ? "MSI" : "IRQ", swdev->irq_line);
+    }
+
+    seq_printf(m, "DMA pools:\n");
+    for (idx = 0; idx < num_swdev; idx++) {
+        seq_printf(m, "%d", idx);
+        dma_pools = 0;
+        for (pool = 0; pool < NGBDE_NUM_DMAPOOL_MAX; pool++) {
+            dmamem = &swdev[idx].dmapool[pool].dmamem;
+            dma_str = "unknown";
+            if (dmamem->type == NGBDE_DMA_T_NONE) {
+                /* Skip empty DMA pools */
+                continue;
+            } else  if (dmamem->type == NGBDE_DMA_T_KAPI) {
+                dma_str = "kapi";
+            } else  if (dmamem->type == NGBDE_DMA_T_PGMEM) {
+                dma_str = "pgmem";
+            }
+            seq_printf(m, ":%dMB@0x%08lx(%s)",
+                       (int)(dmamem->size / ONE_MB),
+                       (unsigned long)dmamem->baddr, dma_str);
+            dma_pools++;
+        }
+        if (dma_pools == 0) {
+            seq_printf(m, ":none");
+        }
+        seq_printf(m, "\n");
+    }
+
+    return 0;
+}
+
+static int
+proc_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_show, NULL);
+}
+
+static int
+proc_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_release,
+};
+
+int
+ngbde_procfs_init(void)
+{
+    struct proc_dir_entry *entry;
+
+    PROC_CREATE(entry, MOD_NAME, 0666, NULL, &proc_fops);
+
+    if (entry == NULL) {
+        printk(KERN_ERR "ngbde: proc_create failed\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+int
+ngbde_procfs_cleanup(void)
+{
+    remove_proc_entry(MOD_NAME, NULL);
+
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_swdev.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_swdev.c
new file mode 100644
index 000000000000..60d328ad2526
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_swdev.c
@@ -0,0 +1,79 @@
+/*! \file ngbde_swdev.c
+ *
+ * <description>
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <ngbde.h>
+
+/* Switch devices */
+static struct ngbde_dev_s swdevs[NGBDE_NUM_SWDEV_MAX];
+
+/* Number of probed switch devices */
+static unsigned int num_swdev;
+
+int
+ngbde_swdev_add(struct ngbde_dev_s *nd)
+{
+    unsigned int idx;
+
+    /* Look for existing slot */
+    for (idx = 0; idx < num_swdev; idx++) {
+        if (swdevs[idx].bus_no == nd->bus_no &&
+            swdevs[idx].slot_no == nd->slot_no) {
+            if (swdevs[idx].inactive) {
+                memcpy(&swdevs[idx], nd, sizeof(swdevs[0]));
+                return 0;
+            }
+            /* Active device in this slot already? */
+            printk(KERN_WARNING "%s: Device exists\n",
+                   MOD_NAME);
+            return -EBUSY;
+        }
+    }
+
+    /* Add new device */
+    if (num_swdev >= NGBDE_NUM_SWDEV_MAX) {
+        return -ENOMEM;
+    }
+    memcpy(&swdevs[num_swdev], nd, sizeof(swdevs[0]));
+    ++num_swdev;
+    return 0;
+}
+
+struct ngbde_dev_s *
+ngbde_swdev_get(int kdev)
+{
+    if ((unsigned int)kdev < num_swdev) {
+        return &swdevs[kdev];
+    }
+    return NULL;
+}
+
+int
+ngbde_swdev_get_all(struct ngbde_dev_s **nd, unsigned int *num_nd)
+{
+    if (nd) {
+        *nd = swdevs;
+    }
+    if (num_nd) {
+        *num_nd = num_swdev;
+    }
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
new file mode 100644
index 000000000000..c0ba0a319767
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
@@ -0,0 +1,126 @@
+/*! \file lkm.h
+ *
+ * <description>
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef LKM_H
+#define LKM_H
+
+#include <linux/init.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#error Kernel too old
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#include <linux/kconfig.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+#include <linux/slab.h>
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
+#include <linux/smp_lock.h>
+#endif
+#include <linux/module.h>
+
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/fcntl.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/stat.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/uaccess.h>
+
+#include <asm/io.h>
+#include <asm/hardirq.h>
+
+#ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
+#endif
+
+/* Compatibility Macros */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+#define PROC_CREATE(_entry, _name, _acc, _path, _fops)                  \
+    do {                                                                \
+        _entry = proc_create(_name, _acc, _path, _fops);                \
+    } while (0)
+
+#define PROC_CREATE_DATA(_entry, _name, _acc, _path, _fops, _data)      \
+    do {                                                                \
+        _entry = proc_create_data(_name, _acc, _path, _fops, _data);    \
+    } while (0)
+
+#define PROC_PDE_DATA(_node) PDE_DATA(_node)
+#else
+#define PROC_CREATE(_entry, _name, _acc, _path, _fops)                  \
+    do {                                                                \
+        _entry = create_proc_entry(_name, _acc, _path);                 \
+        if (_entry) {                                                   \
+            _entry->proc_fops = _fops;                                  \
+        }                                                               \
+    } while (0)
+
+#define PROC_CREATE_DATA(_entry, _name, _acc, _path, _fops, _data)      \
+    do {                                                                \
+        _entry = create_proc_entry(_name, _acc, _path);                 \
+        if (_entry) {                                                   \
+            _entry->proc_fops = _fops;                                  \
+            _entry->data=_data;                                         \
+        }                                                               \
+    } while (0)
+
+#define PROC_PDE_DATA(_node) PROC_I(_node)->pde->data
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+#define timer_arg(var, context, timer_fieldname) \
+    (typeof(var))(context)
+#define timer_context_t unsigned long
+#else
+#define timer_context_t struct timer_list *
+#define timer_arg(var, context, timer_fieldname) \
+    from_timer(var, context, timer_fieldname)
+#endif
+
+#ifndef setup_timer
+#define setup_timer(timer, fn, data) \
+    timer_setup(timer, fn, 0)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+static inline void page_ref_inc(struct page *page)
+{
+    atomic_inc(&page->_count);
+}
+
+static inline void page_ref_dec(struct page *page)
+{
+    atomic_dec(&page->_count);
+}
+#endif
+
+#endif /* LKM_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_ioctl.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_ioctl.h
new file mode 100644
index 000000000000..b90486ce06f2
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_ioctl.h
@@ -0,0 +1,345 @@
+/*! \file ngbde_ioctl.h
+ *
+ * NGBDE device I/O control definitions.
+ *
+ * This file is intended for use in both kernel mode and user mode.
+ *
+ * IMPORTANT!
+ * All shared structures must be properly 64-bit aligned.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGBDE_IOCTL_H
+#define NGBDE_IOCTL_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+/*! Must be updated if backward compatibility is broken. */
+#define NGBDE_IOC_VERSION       2
+
+/*! LUBDE IOCTL command magic. */
+#define NGBDE_IOC_MAGIC 'L'
+
+/*!
+ * \name IOCTL commands for the NGBDE kernel module.
+ * \anchor NGBDE_IOC_xxx
+ *
+ * Note that we use __u64 for the IOCTL parameter size because
+ * sizeof(void *) is different between 32-bit and 64-bit code, and we
+ * need a 32-bit user mode application to generate the same IOCTL
+ * command codes as a 64-bit kernel when using the _IOW macro.
+ */
+
+/*! \{ */
+
+/*! Get kernel module information. */
+#define NGBDE_IOC_MOD_INFO      _IOW(NGBDE_IOC_MAGIC, 0, __u64)
+
+/*! Get information about registered devices. */
+#define NGBDE_IOC_PROBE_INFO    _IOW(NGBDE_IOC_MAGIC, 1, __u64)
+
+/*! Get detailed switch device information. */
+#define NGBDE_IOC_DEV_INFO      _IOW(NGBDE_IOC_MAGIC, 2, __u64)
+
+/*! Get a physical memory address associated with a switch device. */
+#define NGBDE_IOC_PHYS_ADDR     _IOW(NGBDE_IOC_MAGIC, 3, __u64)
+
+/*! Interrupt control command (see \ref NGBDE_ICTL_xxx). */
+#define NGBDE_IOC_INTR_CTRL     _IOW(NGBDE_IOC_MAGIC, 4, __u64)
+
+/*! Add interrupt status/mask register for kernel to control. */
+#define NGBDE_IOC_IRQ_REG_ADD   _IOW(NGBDE_IOC_MAGIC, 5, __u64)
+
+/*! Write to a shared interrupt mask register. */
+#define NGBDE_IOC_IRQ_MASK_WR   _IOW(NGBDE_IOC_MAGIC, 6, __u64)
+
+/*! Map device registers in kernel space. */
+#define NGBDE_IOC_PIO_WIN_MAP   _IOW(NGBDE_IOC_MAGIC, 7, __u64)
+
+/*! Map interrupt controller registers in kernel space. */
+#define NGBDE_IOC_IIO_WIN_MAP   _IOW(NGBDE_IOC_MAGIC, 8, __u64)
+
+/*! Map PCI bridge registers in kernel space. */
+#define NGBDE_IOC_PAXB_WIN_MAP  _IOW(NGBDE_IOC_MAGIC, 9, __u64)
+
+/*! Add interrupt ACK register for kernel to control. */
+#define NGBDE_IOC_INTR_ACK_REG_ADD   _IOW(NGBDE_IOC_MAGIC, 10, __u64)
+
+/*! \} */
+
+/*! IOCTL command return code for success. */
+#define NGBDE_IOC_SUCCESS       0
+
+/*! IOCTL command return code for failure. */
+#define NGBDE_IOC_FAIL          ((__u32)-1)
+
+/*!
+ * \name Device flags.
+ * \anchor NGBDE_DEV_F_xxx
+ */
+
+/*! \{ */
+
+/*! Message-signaled interrupts, PCI interrupts are operating in MSI mode. */
+#define NGBDE_DEV_F_MSI         (1 << 0)
+
+/*! \} */
+
+/*!
+ * \name Interrupt control commands.
+ * \anchor NGBDE_ICTL_xxx
+ */
+
+/*! \{ */
+
+/*! Connect interrupt handler. */
+#define NGBDE_ICTL_INTR_CONN    0
+
+/*! Disconnect interrupt handler. */
+#define NGBDE_ICTL_INTR_DISC    1
+
+/*! Wait for interrupt. */
+#define NGBDE_ICTL_INTR_WAIT    2
+
+/*! Force waiting thread to return. */
+#define NGBDE_ICTL_INTR_STOP    3
+
+/*! Clear list of interrupt status/mask registers. */
+#define NGBDE_ICTL_REGS_CLR     4
+
+/*! \} */
+
+/*! Kernel module information. */
+struct ngbde_ioc_mod_info_s {
+
+    /*! IOCTL version used by kernel module. */
+    __u16 version;
+};
+
+/*! Probing results. */
+struct ngbde_ioc_probe_info_s {
+
+    /*! Number of switch devices. */
+    __u16 num_swdev;
+};
+
+/*! Device information. */
+struct ngbde_ioc_dev_info_s {
+
+    /*! Device type. */
+    __u16 type;
+
+    /*! Device flags (\ref NGBDE_DEV_F_xxx). */
+    __u16 flags;
+
+    /*! Vendor ID (typically the PCI vendor ID). */
+    __u16 vendor_id;
+
+    /*! Device ID (typically the PCI vendor ID). */
+    __u16 device_id;
+
+    /*! Device revision (typically the PCI device revision). */
+    __u16 revision;
+
+    /*! Device model (device-identification beyond PCI generic ID). */
+    __u16 model;
+};
+
+/*!
+ * \name I/O resource types.
+ * \anchor NGBDE_IO_RSRC_xxx
+ */
+
+/*! \{ */
+
+/*! Memory-mapped I/O. */
+#define NGBDE_IO_RSRC_DEV_IO    0
+
+/*! DMA memory pool. */
+#define NGBDE_IO_RSRC_DMA_MEM   1
+
+/*! DMA memory pool as mapped by IOMMU. */
+#define NGBDE_IO_RSRC_DMA_BUS   2
+
+/*! \} */
+
+/*!
+ * \brief Resource ID (IOCTL input).
+ *
+ * This structure is used to query a physical address resource in the
+ * kernel module. The caller must provide a resource type (device I/O,
+ * DMA memory, etc.) and a resource instance number (e.g. a PCI BAR
+ * address will have multiple instances).
+ *
+ * Also see \ref ngbde_ioc_phys_addr_s.
+ */
+struct ngbde_ioc_rsrc_id_s {
+
+    /*! Resource type (\ref NGBDE_IO_RSRC_xxx). */
+    __u32 type;
+
+    /*! Resource instance number. */
+    __u32 inst;
+};
+
+/*!
+ * \brief Physical device address.
+ *
+ * This structure is returned in response to the \ref
+ * NGBDE_IOC_PHYS_ADDR command. The caller must identify the requested
+ * physical address using the \ref ngbde_ioc_rsrc_id_s structure.
+ */
+struct ngbde_ioc_phys_addr_s {
+
+    /*! Physical address. */
+    __u64 addr;
+
+    /*! Resource size (in bytes). */
+    __u32 size;
+};
+
+/*! Interrupt control operation */
+struct ngbde_ioc_intr_ctrl_s {
+
+    /*! Interrupt instance for this device. */
+    __u32 irq_num;
+
+    /*! Interrupt control command. */
+    __u32 cmd;
+};
+
+/*! Add interrupt register information. */
+struct ngbde_ioc_irq_reg_add_s {
+
+    /*! Interrupt instance for this device. */
+    __u32 irq_num;
+
+    /*! Interrupt status register address offset. */
+    __u32 status_reg;
+
+    /*! Interrupt mask register address offset. */
+    __u32 mask_reg;
+
+    /*! Interrupt mask for interrupts handled by the kernel. */
+    __u32 kmask;
+
+    /*! Reserved for future use. */
+    __u32 flags;
+};
+
+/*!
+ * \name Interrupt ACK register access flags.
+ * \anchor NGBDE_DEV_INTR_ACK_F_xxx
+ */
+
+/*! \{ */
+
+/*! ACK registers resides in PCI bridge I/O window. */
+#define NGBDE_DEV_INTR_ACK_F_PAXB   (1 << 0)
+
+/*! \} */
+
+/*! Add interrupt ACK register information. */
+struct ngbde_ioc_intr_ack_reg_add_s {
+
+    /*! Interrupt instance for this device. */
+    __u32 irq_num;
+
+    /*! Interrupt ACK register address offset. */
+    __u32 ack_reg;
+
+    /*! Interrupt ACK value. */
+    __u32 ack_val;
+
+    /*! Flags to indicate ack_reg resides in PCI bridge window. */
+    __u32 flags;
+};
+
+/*! Memory-mapped I/O window */
+struct ngbde_ioc_pio_win_s {
+
+    /*! Physical address */
+    __u64 addr;
+
+    /*! Resource size */
+    __u32 size;
+};
+
+/*! Interrupt mask register write */
+struct ngbde_ioc_irq_mask_wr_s {
+
+    /*! Interrupt instance for this device. */
+    __u32 irq_num;
+
+    /*! Register offset. */
+    __u32 offs;
+
+    /*! Value to write. */
+    __u32 val;
+};
+
+/*! IOCTL operation data. */
+union ngbde_ioc_op_s {
+
+    /*! Get kernel module information. */
+    struct ngbde_ioc_mod_info_s mod_info;
+
+    /*! Get information about registered devices. */
+    struct ngbde_ioc_probe_info_s probe_info;
+
+    /*! Get detailed switch device information. */
+    struct ngbde_ioc_dev_info_s dev_info;
+
+    /*! Resource ID (input). */
+    struct ngbde_ioc_rsrc_id_s rsrc_id;
+
+    /*! Get a physical memory address associated with a switch device. */
+    struct ngbde_ioc_phys_addr_s phys_addr;
+
+    /*! Interrupt control command (see \ref NGBDE_ICTL_xxx). */
+    struct ngbde_ioc_intr_ctrl_s intr_ctrl;
+
+    /*! Add interrupt status/mask register for kernel to control. */
+    struct ngbde_ioc_irq_reg_add_s irq_reg_add;
+
+    /*! Add interrupt ACK register for kernel to control. */
+    struct ngbde_ioc_intr_ack_reg_add_s intr_ack_reg_add;
+
+    /*! Write to a shared interrupt mask register. */
+    struct ngbde_ioc_irq_mask_wr_s irq_mask_wr;
+
+    /*! Map device registers in kernel space. */
+    struct ngbde_ioc_pio_win_s pio_win;
+};
+
+/*! IOCTL command message. */
+typedef struct ngbde_ioc_cmd_s {
+
+    /*! Device handle. */
+    __u32 devid;
+
+    /*! Return code (0 means success). */
+    __u32 rc;
+
+    /*! IOCTL operation. */
+    union ngbde_ioc_op_s op;
+} ngbde_ioc_cmd_t;
+
+#endif /* NGBDE_IOCTL_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_kapi.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_kapi.h
new file mode 100644
index 000000000000..142aa63b572c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngbde_kapi.h
@@ -0,0 +1,169 @@
+/*! \file ngbde_kapi.h
+ *
+ * NGBDE kernel API.
+ *
+ * This file is intended for use by other kernel modules relying on the BDE.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGBDE_KAPI_H
+#define NGBDE_KAPI_H
+
+#include <linux/types.h>
+
+/*! Maximum number of switch devices supported. */
+#ifndef NGBDE_NUM_SWDEV_MAX
+#define NGBDE_NUM_SWDEV_MAX     16
+#endif
+
+/*!
+ * \brief Get Linux PCI device handle for a switch device.
+ *
+ * \param [in] kdev Device number.
+ *
+ * \return Linux PCI device handle or NULL if unavailable.
+ */
+extern struct pci_dev *
+ngbde_kapi_pci_dev_get(int kdev);
+
+/*!
+ * \brief Get Linux kernel device handle for a switch device.
+ *
+ * \param [in] kdev Device number.
+ *
+ * \return Linux kernel device handle or NULL if unavailable.
+ */
+extern struct device *
+ngbde_kapi_dma_dev_get(int kdev);
+
+/*!
+ * \brief Convert DMA bus address to virtual address.
+ *
+ * This API will convert a physical DMA bus address to a kernel
+ * virtual address for a memory location that belongs to one of the
+ * DMA memory pools allocated by the BDE module.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] baddr Physical DMA bus address for this device.
+ *
+ * \return Virtual kernel address or NULL on error.
+ */
+void *
+ngbde_kapi_dma_bus_to_virt(int kdev, dma_addr_t baddr);
+
+/*!
+ * \brief Convert virtual address to DMA bus address.
+ *
+ * This API will convert a kernel virtual address to a physical DMA
+ * bus address for a memory location that belongs to one of the DMA
+ * memory pools allocated by the BDE module.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] vaddr Virtual kernel address.
+ *
+ * \return Physical DMA bus address for this device or 0 on error.
+ */
+dma_addr_t
+ngbde_kapi_dma_virt_to_bus(int kdev, void *vaddr);
+
+/*!
+ * \brief Write a memory-mapped register from kernel driver.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] offs Register address offset.
+ * \param [in] val Value to write to register.
+ *
+ * \return Nothing.
+ */
+extern void
+ngbde_kapi_pio_write32(int kdev, uint32_t offs, uint32_t val);
+
+/*!
+ * \brief Read a memory-mapped register from kernel driver.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] offs Register address offset.
+ *
+ * \return Value read from register.
+ */
+extern uint32_t
+ngbde_kapi_pio_read32(int kdev, uint32_t offs);
+
+/*!
+ * \brief Get base address fo memory-mapped I/O memory.
+ *
+ * The lgical base address returned can be used with ioread32, etc.
+ *
+ * \param [in] kdev Device number.
+ *
+ * \return Logical base address or NULL if unavailable.
+ */
+extern void *
+ngbde_kapi_pio_membase(int kdev);
+
+/*!
+ * \brief Install kernel mode interrupt handler.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num MSI interrupt number.
+ * \param [in] isr_func Interrupt handler function.
+ * \param [in] isr_data Interrupt handler context.
+ *
+ * \retval 0 No errors
+ */
+extern int
+ngbde_kapi_intr_connect(int kdev, unsigned int irq_num,
+                        int (*isr_func)(void *), void *isr_data);
+
+/*!
+ * \brief Uninstall kernel mode interrupt handler.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num MSI interrupt number.
+ *
+ * \retval 0 No errors
+ */
+extern int
+ngbde_kapi_intr_disconnect(int kdev, unsigned int irq_num);
+
+/*!
+ * \brief Write shared interrupt mask register.
+ *
+ * This function is used by an interrupt handler when a shared
+ * interrupt mask register needs to be updated.
+ *
+ * Note that the mask register to access is referenced by the
+ * corrsponding status register. This is because the mask register may
+ * be different depending on the host CPU interface being used
+ * (e.g. PCI vs. AXI). On the other hand, the status register is the
+ * same irrespective of the host CPU interface.
+ *
+ * \param [in] kdev Device number.
+ * \param [in] irq_num Interrupt number (MSI vector).
+ * \param [in] status_reg Corresponding interrupt status register offset.
+ * \param [in] mask_val New value to write to mask register.
+ *
+ * \retval 0 No errors
+ * \retval -1 Something went wrong.
+ */
+extern int
+ngbde_kapi_intr_mask_write(int kdev, unsigned int irq_num,
+                           uint32_t status_reg, uint32_t mask_val);
+
+#endif /* NGBDE_KAPI_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_dev.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_dev.h
new file mode 100644
index 000000000000..74d3d5b350b0
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_dev.h
@@ -0,0 +1,408 @@
+/*! \file ngknet_dev.h
+ *
+ * NGKNET device definitions.
+ *
+ * This file is intended for use in both kernel mode and user mode.
+ *
+ * IMPORTANT!
+ * All shared structures must be properly 64-bit aligned.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_DEV_H
+#define NGKNET_DEV_H
+
+#include <bcmcnet/bcmcnet_types.h>
+
+/*! Device name length */
+#define NGKNET_DEV_NAME_MAX     16
+
+/*! Maximum number of virtual network devices */
+#ifndef NGKNET_NETIF_MAX
+#define NUM_VDEV_MAX            128
+#else
+#define NUM_VDEV_MAX            NGKNET_NETIF_MAX
+#endif
+
+/*! Maximum number of filters */
+#ifndef NGKNET_FILTER_MAX
+#define NUM_FILTER_MAX          128
+#else
+#define NUM_FILTER_MAX          NGKNET_FILTER_MAX
+#endif
+
+/*!
+ * \brief System network interface
+ *
+ * Network interface types:
+ *
+ *  NGKNET_NETIF_T_VLAN
+ *  Transmits to this interface will go to ingress PIPE of switch
+ *  CPU port using specified VLAN ID. Packet will be switched.
+ *
+ *  NGKNET_NETIF_T_PORT
+ *  Transmits to this interface will go to unmodified to specified
+ *  physical switch port. All switching logic is bypassed. Meta data
+ *  should be provided when this interface is created.
+ *
+ *  NGKNET_NETIF_T_META
+ *  Transmits to this interface will be done using raw meta data
+ *  as DMA descriptors.
+ *
+ * Network interface flags:
+ *
+ *  NGKNET_NETIF_F_RCPU_ENCAP
+ *  Use RCPU encapsulation for packets that enter and exit this
+ *  interface.
+ *
+ *  NGKNET_NETIF_F_ADD_TAG
+ *  Add VLAN tag to packets sent directly to physical port.
+ *
+ *  NGKNET_NETIF_F_BIND_CHAN
+ *  Bind this interface to a Rx channel.
+ */
+/*! Max network interface name length */
+#define NGKNET_NETIF_NAME_MAX       16
+/*! Max network interface meta bytes */
+#define NGKNET_NETIF_META_MAX       16
+/*! Max netif user data in bytes */
+#define NGKNET_NETIF_USER_DATA      64
+
+/*! Send packets to switch */
+#define NGKNET_NETIF_T_VLAN         0
+/*! Send packets to port */
+#define NGKNET_NETIF_T_PORT         1
+/*! Send packets with matadata attached */
+#define NGKNET_NETIF_T_META         2
+
+/*! Send packets with RCPU encapsulation */
+#define NGKNET_NETIF_F_RCPU_ENCAP   (1U << 0)
+/*! Send packets with vlan tag */
+#define NGKNET_NETIF_F_ADD_TAG      (1U << 1)
+/*! Bind network interface to Rx channel */
+#define NGKNET_NETIF_F_BIND_CHAN    (1U << 2)
+
+/*!
+ * \brief Network interface description.
+ */
+typedef struct ngknet_netif_s {
+    /*! This network interface ID */
+    uint16_t id;
+
+    /*! Next network interface ID */
+    uint16_t next;
+
+    /*! Network interface type */
+    uint16_t type;
+
+    /*! Network interface flags */
+    uint16_t flags;
+
+    /*! Network interface VLAN ID */
+    uint16_t vlan;
+
+    /*! Network interface MAC address */
+    uint8_t macaddr[6];
+
+    /*! Network interface MTU */
+    uint32_t mtu;
+
+    /*! Network interface bound to channel */
+    uint32_t chan;
+
+    /*! Network interface name */
+    char name[NGKNET_NETIF_NAME_MAX];
+
+    /*! Metadata offset from Ethernet header */
+    uint16_t meta_off;
+
+    /*! Metadata length */
+    uint16_t meta_len;
+
+    /*! Metadata used to send packets to physical port */
+    uint8_t meta_data[NGKNET_NETIF_META_MAX];
+
+    /*! User data gotten back through callbacks */
+    uint8_t user_data[NGKNET_NETIF_USER_DATA];
+} ngknet_netif_t;
+
+/*!
+ * \brief Packet filters
+ *
+ * Filters work like software TCAMs where a mask is applied to the
+ * source data, and the result is then compared to the filter data.
+ *
+ * Filters are checked in priority order with the lowest priority
+ * values being checked first (i.e. 0 is the highest priority).
+ *
+ * Filter types:
+ *
+ *  NGKNET_FILTER_T_RX_PKT
+ *  Filter data and mask are applied to the Rx DMA control block
+ *  as well as to the Rx packet contents.
+ *
+ * Destination types:
+ *
+ *  NGKNET_FILTER_DEST_T_NULL
+ *  Packet is dropped.
+ *
+ *  NGKNET_FILTER_DEST_T_NETIF
+ *  Packet is sent to network interface with ID <dest_id>.
+ *
+ *  NGKNET_FILTER_DEST_T_VNET
+ *  Packet is sent to VNET in user space.
+ *
+ * Filter flags:
+ *
+ *  NGKNET_FILTER_F_ANY_DATA
+ *  When this flags is set the filter will match any packet on
+ *  the associated unit.
+ *
+ *  NGKNET_FILTER_F_STRIP_TAG
+ *  Strip VLAN tag before packet is sent to destination.
+ */
+/*! Roundup to word */
+#define NGKNET_BYTES2WORDS(bytes)   ((bytes + 3) / 4)
+
+/*! Max filter description length */
+#define NGKNET_FILTER_DESC_MAX      32
+/*! Max filter bytes size */
+#define NGKNET_FILTER_BYTES_MAX     256
+/*! Max filter words size */
+#define NGKNET_FILTER_WORDS_MAX     NGKNET_BYTES2WORDS(NGKNET_FILTER_BYTES_MAX)
+/*! Max filter user data in bytes */
+#define NGKNET_FILTER_USER_DATA     64
+
+/*! Filter to Rx */
+#define NGKNET_FILTER_T_RX_PKT      1
+
+/*! Drop packet */
+#define NGKNET_FILTER_DEST_T_NULL   0
+/*! Send packet to netif */
+#define NGKNET_FILTER_DEST_T_NETIF  1
+/*! Send packet to VNET */
+#define NGKNET_FILTER_DEST_T_VNET   2
+/*! Send packet to kernel callback function (BCMPKT_DEST_T_CALLBACK) */
+#define NGKNET_FILTER_DEST_T_CB     3 
+
+/*! Match any data */
+#define NGKNET_FILTER_F_ANY_DATA    (1U << 0)
+/*! Strip vlan tag */
+#define NGKNET_FILTER_F_STRIP_TAG   (1U << 1)
+/*! Match Rx channel */
+#define NGKNET_FILTER_F_MATCH_CHAN  (1U << 2)
+/*! Filter created with raw metadata */
+#define NGKNET_FILTER_F_RAW_PMD     (1U << 15)
+
+/*!
+ * \brief Filter description.
+ */
+typedef struct ngknet_filter_s {
+    /*! This filter ID */
+    uint16_t id;
+
+    /*! Next filter ID */
+    uint16_t next;
+
+    /*! Filter type. Refer to \ref NGKNET_FILTER_T_XXX. */
+    uint16_t type;
+
+    /*! Filter flags. Refer to \ref NGKNET_FILTER_F_XXX. */
+    uint16_t flags;
+
+    /*! Filter priority */
+    uint32_t priority;
+
+    /*! Filter belong to */
+    uint32_t chan;
+
+    /*! Filter description */
+    char desc[NGKNET_FILTER_DESC_MAX];
+
+    /*! Destination type. Refer to \ref NGKNET_FILTER_DEST_T_XXX. */
+    uint16_t dest_type;
+
+    /*! Destination network interface ID */
+    uint16_t dest_id;
+
+    /*! Destination network interface protocol type */
+    uint16_t dest_proto;
+
+    /*! Mirror type */
+    uint16_t mirror_type;
+
+    /*! Mirror network interface ID */
+    uint16_t mirror_id;
+
+    /*! Mirror network interface protocol type */
+    uint16_t mirror_proto;
+
+    /*! Out band data offset */
+    uint16_t oob_data_offset;
+
+    /*! Out band data size */
+    uint16_t oob_data_size;
+
+    /*! Packet data offset */
+    uint16_t pkt_data_offset;
+
+    /*! Packet data size */
+    uint16_t pkt_data_size;
+
+    /*! Filtering data */
+    union {
+        uint8_t b[NGKNET_FILTER_BYTES_MAX];
+        uint32_t w[NGKNET_FILTER_WORDS_MAX];
+    } data;
+
+    /*! Filtering mask */
+    union {
+        uint8_t b[NGKNET_FILTER_BYTES_MAX];
+        uint32_t w[NGKNET_FILTER_WORDS_MAX];
+    } mask;
+
+    /*! User data gotten back through callbacks */
+    uint8_t user_data[NGKNET_FILTER_USER_DATA];
+} ngknet_filter_t;
+
+/*!
+ * \brief Device configure structure.
+ */
+typedef struct ngknet_dev_cfg_s {
+    /*! Device name */
+    char name[NGKNET_DEV_NAME_MAX];
+
+    /*! Device type string */
+    char type_str[NGKNET_DEV_NAME_MAX];
+
+    /*! Device ID */
+    uint32_t dev_id;
+
+    /*! Device mode */
+    dev_mode_t mode;
+
+    /*! Number of groups */
+    uint32_t nb_grp;
+
+    /*! Bitmap of groups */
+    uint32_t bm_grp;
+
+    /*! Rx packet header size */
+    uint32_t rx_ph_size;
+
+    /*! Tx packet header size */
+    uint32_t tx_ph_size;
+
+    /*! Base network interface */
+    ngknet_netif_t base_netif;
+} ngknet_dev_cfg_t;
+
+/*!
+ * \brief Channel configure structure.
+ */
+typedef struct ngknet_chan_cfg_s {
+    /*! Channel number */
+    int chan;
+
+    /*! Number of descriptors */
+    uint32_t nb_desc;
+
+    /*! Rx buffer size */
+    uint32_t rx_buf_size;
+
+    /*! Channel control */
+    uint32_t chan_ctrl;
+    /*! Packet_byte_swap */
+#define NGKNET_PKT_BYTE_SWAP    (1 << 0)
+    /*! Non packet_byte_swap */
+#define NGKNET_OTH_BYTE_SWAP    (1 << 1)
+    /*! Header_byte_swap */
+#define NGKNET_HDR_BYTE_SWAP    (1 << 2)
+
+    /*! Rx or Tx */
+    int dir;
+    /*! Rx channel */
+#define NGKNET_RX_CHAN          0
+    /*! Tx channel */
+#define NGKNET_TX_CHAN          1
+} ngknet_chan_cfg_t;
+
+/*!
+ * \brief RCPU header structure.
+ */
+struct ngknet_rcpu_hdr {
+    /*! Destination MAC address */
+    uint8_t dst_mac[6];
+
+    /*! Source MAC address */
+    uint8_t src_mac[6];
+
+    /*! VLAN TPID */
+    uint16_t vlan_tpid;
+
+    /*! VLAN TCI */
+    uint16_t vlan_tci;
+
+    /*! Ethernet type */
+    uint16_t eth_type;
+
+    /*! Packet signature */
+    uint16_t pkt_sig;
+
+    /*! Operation code */
+    uint8_t op_code;
+
+    /*! Flags */
+    uint8_t flags;
+
+    /*! Transaction number */
+    uint16_t trans_id;
+
+    /*! Packet data length */
+    uint16_t data_len;
+
+    /*! Reserved must be 0 */
+    uint16_t rsvd0;
+
+    /*! packet meta data length */
+    uint8_t meta_len;
+
+    /*! Transmission queue number */
+    uint8_t queue_id;
+
+    /*! Reserved must be 0 */
+    uint16_t rsvd1;
+};
+
+/*! RCPU Rx operation */
+#define RCPU_OPCODE_RX          0x10
+/*! RCPU Tx operation */
+#define RCPU_OPCODE_TX          0x20
+
+/*! RCPU purge flag */
+#define RCPU_FLAG_PURGE         (1 << 0)
+/*! RCPU pause flag */
+#define RCPU_FLAG_PAUSE         (1 << 1)
+/*! RCPU modhdr flag */
+#define RCPU_FLAG_MODHDR        (1 << 2)
+/*! RCPU bind queue flag */
+#define RCPU_FLAG_BIND_QUE      (1 << 3)
+
+#endif /* NGKNET_DEV_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_ioctl.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_ioctl.h
new file mode 100644
index 000000000000..6da52c778191
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/ngknet_ioctl.h
@@ -0,0 +1,112 @@
+/*! \file ngknet_ioctl.h
+ *
+ * NGKNET I/O control definitions.
+ *
+ * This file is intended for use in both kernel mode and user mode.
+ *
+ * IMPORTANT!
+ * All shared structures must be properly 64-bit aligned.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_IOCTL_H
+#define NGKNET_IOCTL_H
+
+/*! Module information */
+#define NGKNET_MODULE_NAME      "linux_ngknet"
+#define NGKNET_MODULE_MAJOR     121
+
+/*! Must be updated if backward compatibility is broken */
+#define NGKNET_IOC_VERSION      2
+
+/*! Max number of input arguments */
+#define NGKNET_IOC_IARG_MAX     2
+
+#define NGKNET_IOC_MAGIC        'K'
+
+#define NGKNET_VERSION_GET      _IOR(NGKNET_IOC_MAGIC,  0xa0, unsigned int)
+#define NGKNET_RX_RATE_LIMIT    _IOWR(NGKNET_IOC_MAGIC, 0xa1, unsigned int)
+#define NGKNET_DEV_INIT         _IOWR(NGKNET_IOC_MAGIC, 0xb0, unsigned int)
+#define NGKNET_DEV_DEINIT       _IOWR(NGKNET_IOC_MAGIC, 0xb1, unsigned int)
+#define NGKNET_DEV_SUSPEND      _IOWR(NGKNET_IOC_MAGIC, 0xb2, unsigned int)
+#define NGKNET_DEV_RESUME       _IOWR(NGKNET_IOC_MAGIC, 0xb3, unsigned int)
+#define NGKNET_DEV_VNET_WAIT    _IOWR(NGKNET_IOC_MAGIC, 0xb4, unsigned int)
+#define NGKNET_DEV_HNET_WAKE    _IOWR(NGKNET_IOC_MAGIC, 0xb5, unsigned int)
+#define NGKNET_DEV_VNET_DOCK    _IOWR(NGKNET_IOC_MAGIC, 0xb6, unsigned int)
+#define NGKNET_DEV_VNET_UNDOCK  _IOWR(NGKNET_IOC_MAGIC, 0xb7, unsigned int)
+#define NGKNET_QUEUE_CONFIG     _IOWR(NGKNET_IOC_MAGIC, 0xc0, unsigned int)
+#define NGKNET_QUEUE_QUERY      _IOR(NGKNET_IOC_MAGIC,  0xc1, unsigned int)
+#define NGKNET_RCPU_CONFIG      _IOWR(NGKNET_IOC_MAGIC, 0xc2, unsigned int)
+#define NGKNET_RCPU_GET         _IOR(NGKNET_IOC_MAGIC,  0xc3, unsigned int)
+#define NGKNET_NETIF_CREATE     _IOWR(NGKNET_IOC_MAGIC, 0xd0, unsigned int)
+#define NGKNET_NETIF_DESTROY    _IOWR(NGKNET_IOC_MAGIC, 0xd1, unsigned int)
+#define NGKNET_NETIF_GET        _IOR(NGKNET_IOC_MAGIC,  0xd2, unsigned int)
+#define NGKNET_NETIF_NEXT       _IOR(NGKNET_IOC_MAGIC,  0xd3, unsigned int)
+#define NGKNET_NETIF_LINK_SET   _IOW(NGKNET_IOC_MAGIC,  0xd4, unsigned int)
+#define NGKNET_FILT_CREATE      _IOWR(NGKNET_IOC_MAGIC, 0xe0, unsigned int)
+#define NGKNET_FILT_DESTROY     _IOWR(NGKNET_IOC_MAGIC, 0xe1, unsigned int)
+#define NGKNET_FILT_GET         _IOR(NGKNET_IOC_MAGIC,  0xe2, unsigned int)
+#define NGKNET_FILT_NEXT        _IOR(NGKNET_IOC_MAGIC,  0xe3, unsigned int)
+#define NGKNET_INFO_GET         _IOR(NGKNET_IOC_MAGIC,  0xf0, unsigned int)
+#define NGKNET_STATS_GET        _IOR(NGKNET_IOC_MAGIC,  0xf1, unsigned int)
+#define NGKNET_STATS_RESET      _IOWR(NGKNET_IOC_MAGIC, 0xf2, unsigned int)
+#define NGKNET_PTP_DEV_CTRL     _IOWR(NGKNET_IOC_MAGIC, 0x90, unsigned int)
+
+/*! Kernel module information. */
+struct ngknet_ioc_mod_info {
+    /*! IOCTL version used by kernel module */
+    uint32_t version;
+};
+
+/*! Data transmission */
+struct ngknet_ioc_data_xmit {
+    /*! Data buffer address */
+    uint64_t buf;
+
+    /*! Data buffer length */
+    uint32_t len;
+};
+
+/*! IOCTL operations */
+union ngknet_ioc_op {
+    /*! Get module info */
+    struct ngknet_ioc_mod_info info;
+    /*! Transmit data */
+    struct ngknet_ioc_data_xmit data;
+};
+
+/*!
+ * \brief NGKNET IOCTL command message.
+ */
+struct ngknet_ioctl {
+    /*! Device number */
+    uint32_t unit;
+
+    /*! Return code (0 means success) */
+    uint32_t rc;
+
+    /*! Input arguments */
+    int iarg[NGKNET_IOC_IARG_MAX];
+
+    /*! IOCTL operation */
+    union ngknet_ioc_op op;
+};
+
+#endif /* NGKNET_IOCTL_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/net/psample.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/net/psample.h
new file mode 100644
index 000000000000..64188c95daeb
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/net/psample.h
@@ -0,0 +1,24 @@
+#ifndef __NET_PSAMPLE_H
+#define __NET_PSAMPLE_H
+
+#include <lkm/lkm.h>
+#include <uapi/linux/psample.h>
+#include <linux/module.h>
+#include <linux/list.h>
+
+struct psample_group {
+	struct list_head list;
+	struct net *net;
+	u32 group_num;
+	u32 refcount;
+	u32 seq;
+};
+
+extern struct psample_group *psample_group_get(struct net *net, u32 group_num);
+extern void psample_group_put(struct psample_group *group);
+
+extern void psample_sample_packet(struct psample_group *group, struct sk_buff *skb,
+			   u32 trunc_size, int in_ifindex, int out_ifindex,
+			   u32 sample_rate);
+
+#endif /* __NET_PSAMPLE_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/uapi/linux/psample.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/uapi/linux/psample.h
new file mode 100644
index 000000000000..ed48996ec0e8
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/uapi/linux/psample.h
@@ -0,0 +1,35 @@
+#ifndef __UAPI_PSAMPLE_H
+#define __UAPI_PSAMPLE_H
+
+enum {
+	/* sampled packet metadata */
+	PSAMPLE_ATTR_IIFINDEX,
+	PSAMPLE_ATTR_OIFINDEX,
+	PSAMPLE_ATTR_ORIGSIZE,
+	PSAMPLE_ATTR_SAMPLE_GROUP,
+	PSAMPLE_ATTR_GROUP_SEQ,
+	PSAMPLE_ATTR_SAMPLE_RATE,
+	PSAMPLE_ATTR_DATA,
+
+	/* commands attributes */
+	PSAMPLE_ATTR_GROUP_REFCOUNT,
+
+	__PSAMPLE_ATTR_MAX
+};
+
+enum psample_command {
+	PSAMPLE_CMD_SAMPLE,
+	PSAMPLE_CMD_GET_GROUP,
+	PSAMPLE_CMD_NEW_GROUP,
+	PSAMPLE_CMD_DEL_GROUP,
+};
+
+/* Can be overridden at runtime by module option */
+#define PSAMPLE_ATTR_MAX (__PSAMPLE_ATTR_MAX - 1)
+
+#define PSAMPLE_NL_MCGRP_CONFIG_NAME "config"
+#define PSAMPLE_NL_MCGRP_SAMPLE_NAME "packets"
+#define PSAMPLE_GENL_NAME "psample"
+#define PSAMPLE_GENL_VERSION 1
+
+#endif
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
new file mode 100644
index 000000000000..fe5d5c5bfefc
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
@@ -0,0 +1,44 @@
+# -*- Kbuild -*-
+#
+# Linux KNET module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+obj-m := linux_ngknet.o
+
+ccflags-y := $(KNET_CPPFLAGS) $(LKM_CFLAGS) \
+             -I$(SDK)/shr/include \
+             -I$(SDK)/bcmdrd/include \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/knet/include \
+             -I$(SDK)/linux/knet
+
+linux_ngknet-y := $(CHIP_OBJS) \
+                  bcmcnet_cmicd_pdma_hw.o \
+                  bcmcnet_cmicd_pdma_rxtx.o \
+                  bcmcnet_cmicx_pdma_hw.o \
+                  bcmcnet_cmicx_pdma_rxtx.o \
+                  bcmcnet_core.o \
+                  bcmcnet_dev.o \
+                  bcmcnet_rxtx.o \
+                  ngknet_buff.o \
+                  ngknet_callback.o \
+                  ngknet_extra.o \
+                  ngknet_linux.o \
+                  ngknet_main.o \
+                  ngknet_procfs.o \
+                  ngknet_ptp.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Makefile
new file mode 100644
index 000000000000..785b81fadb17
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Makefile
@@ -0,0 +1,105 @@
+# -*- Makefile -*-
+#
+# Linux KNET module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+CNETDIR = $(SDK)/bcmcnet
+KNETDIR = $(SDK)/linux/knet
+SRCIDIR = $(CNETDIR)/include/bcmcnet
+DSTIDIR = $(KNETDIR)/include/bcmcnet
+
+# Change comma-separated list to space-separated list
+comma = ,
+empty =
+space = $(empty) $(empty)
+spc_sep = $(subst $(comma),$(space),$1)
+
+# Convert chip name to uppercase
+chip_uc = $(subst a,A,$(subst b,B,$(subst c,C,$(subst m,M,$1))))
+
+# Convert chip name to lowercase
+chip_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst M,m,$1))))
+
+#
+# If SDK_CHIPS is defined, then exclude any chip directory which is
+# not part of this list.
+#
+KNET_CHIPS := $(subst $(CNETDIR)/chip/,,$(wildcard $(CNETDIR)/chip/bcm*))
+ifdef SDK_CHIPS
+# Create space-separated lowercase version of chip list
+SDK_CHIPS_SPC := $(call spc_sep,$(SDK_CHIPS))
+SDK_CHIPS_LC := $(call chip_lc,$(SDK_CHIPS_SPC))
+# Configure build flags according to chip list
+KNET_CHIPS := $(filter $(SDK_CHIPS_LC),$(KNET_CHIPS))
+KNET_CPPFLAGS := CHIP_DEFAULT=0 $(addsuffix =1,$(call chip_uc,$(KNET_CHIPS)))
+KNET_CPPFLAGS := $(addprefix -DBCMDRD_CONFIG_INCLUDE_,$(KNET_CPPFLAGS))
+export KNET_CPPFLAGS
+endif
+
+.PHONY: mklinks rmlinks
+
+knet: mklinks
+	$(MAKE) all
+
+#
+# Suppress symlink error messages.
+#
+# Note that we do not use "ln -f" as this may cause failures if
+# multiple builds are done in parallel on the same source tree.
+#
+R = 2>/dev/null
+
+mklinks:
+	mkdir -p $(DSTIDIR)
+	-ln -s $(KNETDIR)/ngknet_dep.h $(DSTIDIR)/bcmcnet_dep.h $(R)
+	-ln -s $(KNETDIR)/ngknet_buff.h $(DSTIDIR)/bcmcnet_buff.h $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_types.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_internal.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_core.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_dev.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_rxtx.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_cmicd.h $(DSTIDIR) $(R)
+	-ln -s $(SRCIDIR)/bcmcnet_cmicx.h $(DSTIDIR) $(R)
+	-ln -s $(CNETDIR)/chip/*/*attach.c $(KNETDIR) $(R)
+	-ln -s $(CNETDIR)/hmi/cmicd/*.c $(KNETDIR) $(R)
+	-ln -s $(CNETDIR)/hmi/cmicx/*.c $(KNETDIR) $(R)
+	-ln -s $(CNETDIR)/main/bcmcnet_core.c $(KNETDIR) $(R)
+	-ln -s $(CNETDIR)/main/bcmcnet_dev.c $(KNETDIR) $(R)
+	-ln -s $(CNETDIR)/main/bcmcnet_rxtx.c $(KNETDIR) $(R)
+
+rmlinks:
+	-rm -f bcm*
+	-rm -rf include
+
+CHIP_SRCS := $(addsuffix _pdma_attach.c,$(KNET_CHIPS))
+CHIP_OBJS ?= $(patsubst %.c, %.o, $(CHIP_SRCS))
+export CHIP_OBJS
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_ngknet
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean: rmlinks
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.c
new file mode 100644
index 000000000000..750fff69caf3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.c
@@ -0,0 +1,326 @@
+/*! \file ngknet_buff.c
+ *
+ * Utility routines for NGKNET packet buffer management in Linux kernel mode.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <bcmcnet/bcmcnet_core.h>
+#include <bcmcnet/bcmcnet_dev.h>
+#include <bcmcnet/bcmcnet_rxtx.h>
+#include "ngknet_main.h"
+#include "ngknet_buff.h"
+
+/*!
+ * Allocate coherent memory
+ */
+static void *
+bcmcnet_ring_buf_alloc(struct pdma_dev *dev, uint32_t size, dma_addr_t *dma)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+
+    return dma_alloc_coherent(kdev->dev, size, dma, GFP_KERNEL);
+}
+
+/*!
+ * Free coherent memory
+ */
+static void
+bcmcnet_ring_buf_free(struct pdma_dev *dev, uint32_t size, void *addr, dma_addr_t dma)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+
+    dma_free_coherent(kdev->dev, size, addr, dma);
+}
+
+/*!
+ * Allocate Rx buffer
+ */
+static int
+bcmcnet_rx_buf_alloc(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                     struct pdma_rx_buf *pbuf)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+    dma_addr_t dma;
+    struct page *page;
+    struct sk_buff *skb;
+
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        page = kal_dev_alloc_page();
+        if (unlikely(!page)) {
+            return SHR_E_MEMORY;
+        }
+        dma = dma_map_page(kdev->dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(kdev->dev, dma))) {
+            __free_page(page);
+            return SHR_E_MEMORY;
+        }
+        pbuf->dma = dma;
+        pbuf->page = page;
+        pbuf->page_offset = 0;
+    } else {
+        skb = netdev_alloc_skb(kdev->net_dev, PDMA_RXB_RESV + pbuf->adj + rxq->buf_size);
+        if (unlikely(!skb)) {
+            return SHR_E_MEMORY;
+        }
+        skb_reserve(skb, PDMA_RXB_ALIGN - (((unsigned long)skb->data) & (PDMA_RXB_ALIGN - 1)));
+        pbuf->skb = skb;
+        pbuf->pkb = (struct pkt_buf *)skb->data;
+        dma = dma_map_single(kdev->dev, &pbuf->pkb->data + pbuf->adj, rxq->buf_size, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(kdev->dev, dma))) {
+            dev_kfree_skb_any(skb);
+            return SHR_E_MEMORY;
+        }
+        pbuf->dma = dma;
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Get Rx buffer DMA address
+ */
+static void
+bcmcnet_rx_buf_dma(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                   struct pdma_rx_buf *pbuf, dma_addr_t *addr)
+{
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        *addr = pbuf->dma + pbuf->page_offset + PDMA_RXB_RESV + pbuf->adj;
+    } else {
+        *addr = pbuf->dma;
+    }
+}
+
+/*!
+ * Check Rx buffer
+ */
+static int
+bcmcnet_rx_buf_avail(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                     struct pdma_rx_buf *pbuf)
+{
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        pbuf->skb = NULL;
+    }
+
+    return pbuf->dma != 0;
+}
+
+/*!
+ * Get Rx buffer
+ */
+static struct pkt_hdr *
+bcmcnet_rx_buf_get(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                   struct pdma_rx_buf *pbuf, int len)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+    struct sk_buff *skb;
+
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        if (pbuf->skb) {
+            return &pbuf->pkb->pkh;
+        }
+        skb = kal_build_skb(page_address(pbuf->page) + pbuf->page_offset,
+                            PDMA_SKB_RESV + pbuf->adj + rxq->buf_size);
+        if (unlikely(!skb)) {
+            return NULL;
+        }
+        skb_reserve(skb, PDMA_RXB_ALIGN);
+        dma_sync_single_range_for_cpu(kdev->dev, pbuf->dma, pbuf->page_offset,
+                                      PDMA_PAGE_BUF_MAX, DMA_FROM_DEVICE);
+        pbuf->skb = skb;
+        pbuf->pkb = (struct pkt_buf *)skb->data;
+
+        /* Try to reuse this page */
+        if (unlikely(page_count(pbuf->page) != 1)) {
+            dma_unmap_page(kdev->dev, pbuf->dma, PAGE_SIZE, DMA_FROM_DEVICE);
+            pbuf->dma = 0;
+        } else {
+            pbuf->page_offset ^= PDMA_PAGE_BUF_MAX;
+            page_ref_inc(pbuf->page);
+            dma_sync_single_range_for_device(kdev->dev, pbuf->dma, pbuf->page_offset,
+                                             PDMA_PAGE_BUF_MAX, DMA_FROM_DEVICE);
+        }
+    } else {
+        if (!pbuf->dma) {
+            return &pbuf->pkb->pkh;
+        }
+        skb = pbuf->skb;
+        dma_unmap_single(kdev->dev, pbuf->dma, rxq->buf_size, DMA_FROM_DEVICE);
+        pbuf->dma = 0;
+    }
+
+    skb_put(skb, PKT_HDR_SIZE + pbuf->adj + len);
+
+    return &pbuf->pkb->pkh;
+}
+
+/*!
+ * Put Rx buffer
+ */
+static int
+bcmcnet_rx_buf_put(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                   struct pdma_rx_buf *pbuf, int len)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+    dma_addr_t dma;
+    struct sk_buff *skb;
+
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        dev_kfree_skb_any(pbuf->skb);
+    } else {
+        skb = pbuf->skb;
+        dma = dma_map_single(kdev->dev, &pbuf->pkb->data + pbuf->adj,
+                             rxq->buf_size, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(kdev->dev, dma))) {
+            dev_kfree_skb_any(skb);
+            pbuf->dma = 0;
+            return SHR_E_MEMORY;
+        }
+        pbuf->dma = dma;
+        skb_trim(skb, skb->len - (PKT_HDR_SIZE + pbuf->adj + len));
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Free Rx buffer
+ */
+static void
+bcmcnet_rx_buf_free(struct pdma_dev *dev, struct pdma_rx_queue *rxq,
+                    struct pdma_rx_buf *pbuf)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+
+    if (rxq->mode == PDMA_BUF_MODE_PAGE) {
+        dma_unmap_single(kdev->dev, pbuf->dma, PAGE_SIZE, DMA_FROM_DEVICE);
+        __free_page(pbuf->page);
+    } else {
+        dma_unmap_single(kdev->dev, pbuf->dma, rxq->buf_size, DMA_FROM_DEVICE);
+        dev_kfree_skb_any(pbuf->skb);
+    }
+
+    pbuf->dma = 0;
+    pbuf->page = NULL;
+    pbuf->page_offset = 0;
+    pbuf->skb = NULL;
+    pbuf->pkb = NULL;
+    pbuf->adj = 0;
+}
+
+/*!
+ * Get Rx buffer mode
+ */
+static enum buf_mode
+bcmcnet_rx_buf_mode(struct pdma_dev *dev, struct pdma_rx_queue *rxq)
+{
+    uint32_t len;
+
+    len = dev->rx_ph_size ? rxq->buf_size : rxq->buf_size + PDMA_RXB_META;
+    if (PDMA_RXB_SIZE(len) <= PDMA_PAGE_BUF_MAX && PAGE_SIZE < 8192 &&
+        kal_support_paged_skb()) {
+        return PDMA_BUF_MODE_PAGE;
+    }
+
+    return PDMA_BUF_MODE_SKB;
+}
+
+/*!
+ * Get Tx buffer
+ */
+static struct pkt_hdr *
+bcmcnet_tx_buf_get(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                   struct pdma_tx_buf *pbuf, void *buf)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+    struct sk_buff *skb = (struct sk_buff *)buf;
+    struct pkt_buf *pkb = (struct pkt_buf *)skb->data;
+    dma_addr_t dma;
+
+    pbuf->len = pkb->pkh.data_len + (pbuf->adj ? pkb->pkh.meta_len : 0);
+    dma = dma_map_single(kdev->dev, &pkb->data + (pbuf->adj ? 0 : pkb->pkh.meta_len),
+                         pbuf->len, DMA_TO_DEVICE);
+    if (unlikely(dma_mapping_error(kdev->dev, dma))) {
+        dev_kfree_skb_any(skb);
+        return NULL;
+    }
+    pbuf->dma = dma;
+    pbuf->skb = skb;
+    pbuf->pkb = pkb;
+
+    return &pkb->pkh;
+}
+
+/*!
+ * Get Tx buffer DMA address
+ */
+static void
+bcmcnet_tx_buf_dma(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                   struct pdma_tx_buf *pbuf, dma_addr_t *addr)
+{
+    *addr = pbuf->dma;
+}
+
+/*!
+ * Free Tx buffer
+ */
+static void
+bcmcnet_tx_buf_free(struct pdma_dev *dev, struct pdma_tx_queue *txq,
+                    struct pdma_tx_buf *pbuf)
+{
+    struct ngknet_dev *kdev = (struct ngknet_dev *)dev->priv;
+
+    dma_unmap_single(kdev->dev, pbuf->dma, pbuf->len, DMA_TO_DEVICE);
+    if (skb_shinfo(pbuf->skb)->tx_flags & SKBTX_IN_PROGRESS) {
+        skb_queue_tail(&kdev->ptp_tx_queue, pbuf->skb);
+        schedule_work(&kdev->ptp_tx_work);
+    } else {
+        dev_kfree_skb_any(pbuf->skb);
+    }
+
+    pbuf->dma = 0;
+    pbuf->len = 0;
+    pbuf->skb = NULL;
+    pbuf->pkb = NULL;
+    pbuf->adj = 0;
+}
+
+static const struct pdma_buf_mngr buf_mngr = {
+    .ring_buf_alloc     = bcmcnet_ring_buf_alloc,
+    .ring_buf_free      = bcmcnet_ring_buf_free,
+    .rx_buf_alloc       = bcmcnet_rx_buf_alloc,
+    .rx_buf_dma         = bcmcnet_rx_buf_dma,
+    .rx_buf_avail       = bcmcnet_rx_buf_avail,
+    .rx_buf_get         = bcmcnet_rx_buf_get,
+    .rx_buf_put         = bcmcnet_rx_buf_put,
+    .rx_buf_free        = bcmcnet_rx_buf_free,
+    .rx_buf_mode        = bcmcnet_rx_buf_mode,
+    .tx_buf_get         = bcmcnet_tx_buf_get,
+    .tx_buf_dma         = bcmcnet_tx_buf_dma,
+    .tx_buf_free        = bcmcnet_tx_buf_free,
+};
+
+/*!
+ * Open a device
+ */
+void
+bcmcnet_buf_mngr_init(struct pdma_dev *dev)
+{
+    dev->ctrl.buf_mngr = (struct pdma_buf_mngr *)&buf_mngr;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.h
new file mode 100644
index 000000000000..54768e826917
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_buff.h
@@ -0,0 +1,83 @@
+/*! \file ngknet_buff.h
+ *
+ * Generic data structure definitions for NGKNET packet buffer management.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_BUFF_H
+#define NGKNET_BUFF_H
+
+/*! Rx buffer align size */
+#define PDMA_RXB_ALIGN          32
+/*! Rx buffer reserved size */
+#define PDMA_RXB_RESV           (PDMA_RXB_ALIGN + PKT_HDR_SIZE)
+/*! Rx SKB reserved size */
+#define PDMA_SKB_RESV           (PDMA_RXB_RESV + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
+/*! Rx buffer size */
+#define PDMA_RXB_SIZE(len)      (SKB_DATA_ALIGN(len + NET_SKB_PAD) + PDMA_SKB_RESV)
+/*! Rx reserved meta size */
+#define PDMA_RXB_META           64
+/*! Max page buffer size */
+#define PDMA_PAGE_BUF_MAX       2048
+
+/*!
+ * \brief Rx buffer.
+ */
+struct pdma_rx_buf {
+    /*! DMA address */
+    dma_addr_t dma;
+
+    /*! Buffer page */
+    struct page *page;
+
+    /*! Buffer page offset */
+    unsigned int page_offset;
+
+    /*! Rx SKB */
+    struct sk_buff *skb;
+
+    /*! Packet buffer point */
+    struct pkt_buf *pkb;
+
+    /*! Packet buffer adjustment */
+    uint32_t adj;
+};
+
+/*!
+ * \brief Tx buffer.
+ */
+struct pdma_tx_buf {
+    /*! DMA address */
+    dma_addr_t dma;
+
+    /*! Tx buffer length */
+    uint32_t len;
+
+    /*! Tx SKB */
+    struct sk_buff *skb;
+
+    /*! Packet buffer point */
+    struct pkt_buf *pkb;
+
+    /*! Packet buffer adjustment */
+    uint32_t adj;
+};
+
+#endif /* NGKNET_BUFF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
new file mode 100644
index 000000000000..21512a51fbd2
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
@@ -0,0 +1,315 @@
+/*! \file ngknet_callback.c
+ *
+ * Utility routines for NGKNET callbacks.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include "ngknet_callback.h"
+
+static struct ngknet_callback_ctrl callback_ctrl;
+
+int
+ngknet_callback_control_get(struct ngknet_callback_ctrl **cbc)
+{
+    *cbc = &callback_ctrl;
+
+    return 0;
+}
+
+/*!
+ * Call-back interfaces for other Linux kernel drivers.
+ *
+ * The Rx call-back allows an external module to modify packet contents
+ * before it is handed off to the Linux network stack.
+ *
+ * The Tx call-back allows an external module to modify packet contents
+ * before it is injected into the switch.
+ */
+
+int
+ngknet_rx_cb_register(ngknet_rx_cb_f rx_cb)
+{
+    if (callback_ctrl.rx_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.rx_cb = rx_cb;
+
+    return 0;
+}
+
+int
+ngknet_rx_cb_unregister(ngknet_rx_cb_f rx_cb)
+{
+    if (rx_cb == NULL || callback_ctrl.rx_cb != rx_cb) {
+        return -1;
+    }
+    callback_ctrl.rx_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_tx_cb_register(ngknet_tx_cb_f tx_cb)
+{
+    if (callback_ctrl.tx_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.tx_cb = tx_cb;
+
+    return 0;
+}
+
+int
+ngknet_tx_cb_unregister(ngknet_tx_cb_f tx_cb)
+{
+    if (tx_cb == NULL || callback_ctrl.tx_cb != tx_cb) {
+        return -1;
+    }
+    callback_ctrl.tx_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_rx_config_set_cb_register(ngknet_ptp_config_set_cb_f ptp_rx_config_set_cb)
+{
+    if (callback_ctrl.ptp_rx_config_set_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_rx_config_set_cb = ptp_rx_config_set_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_rx_config_set_cb_unregister(ngknet_ptp_config_set_cb_f ptp_rx_config_set_cb)
+{
+    if (ptp_rx_config_set_cb == NULL ||
+        callback_ctrl.ptp_rx_config_set_cb != ptp_rx_config_set_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_rx_config_set_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_config_set_cb_register(ngknet_ptp_config_set_cb_f ptp_tx_config_set_cb)
+{
+    if (callback_ctrl.ptp_tx_config_set_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_config_set_cb = ptp_tx_config_set_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_config_set_cb_unregister(ngknet_ptp_config_set_cb_f ptp_tx_config_set_cb)
+{
+    if (ptp_tx_config_set_cb == NULL ||
+        callback_ctrl.ptp_tx_config_set_cb != ptp_tx_config_set_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_config_set_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_rx_hwts_get_cb_register(ngknet_ptp_hwts_get_cb_f ptp_rx_hwts_get_cb)
+{
+    if (callback_ctrl.ptp_rx_hwts_get_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_rx_hwts_get_cb = ptp_rx_hwts_get_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_rx_hwts_get_cb_unregister(ngknet_ptp_hwts_get_cb_f ptp_rx_hwts_get_cb)
+{
+    if (ptp_rx_hwts_get_cb == NULL ||
+        callback_ctrl.ptp_rx_hwts_get_cb != ptp_rx_hwts_get_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_rx_hwts_get_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_hwts_get_cb_register(ngknet_ptp_hwts_get_cb_f ptp_tx_hwts_get_cb)
+{
+    if (callback_ctrl.ptp_tx_hwts_get_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_hwts_get_cb = ptp_tx_hwts_get_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_hwts_get_cb_unregister(ngknet_ptp_hwts_get_cb_f ptp_tx_hwts_get_cb)
+{
+    if (ptp_tx_hwts_get_cb == NULL ||
+        callback_ctrl.ptp_tx_hwts_get_cb != ptp_tx_hwts_get_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_hwts_get_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_meta_set_cb_register(ngknet_ptp_meta_set_cb_f ptp_tx_meta_set_cb)
+{
+    if (callback_ctrl.ptp_tx_meta_set_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_meta_set_cb = ptp_tx_meta_set_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_tx_meta_set_cb_unregister(ngknet_ptp_meta_set_cb_f ptp_tx_meta_set_cb)
+{
+    if (ptp_tx_meta_set_cb == NULL ||
+        callback_ctrl.ptp_tx_meta_set_cb != ptp_tx_meta_set_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_tx_meta_set_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_phc_index_get_cb_register(ngknet_ptp_phc_index_get_cb_f ptp_phc_index_get_cb)
+{
+    if (callback_ctrl.ptp_phc_index_get_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_phc_index_get_cb = ptp_phc_index_get_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_phc_index_get_cb_unregister(ngknet_ptp_phc_index_get_cb_f ptp_phc_index_get_cb)
+{
+    if (ptp_phc_index_get_cb == NULL ||
+        callback_ctrl.ptp_phc_index_get_cb != ptp_phc_index_get_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_phc_index_get_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_ptp_dev_ctrl_cb_register(ngknet_ptp_dev_ctrl_cb_f ptp_dev_ctrl_cb)
+{
+    if (callback_ctrl.ptp_dev_ctrl_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.ptp_dev_ctrl_cb = ptp_dev_ctrl_cb;
+
+    return 0;
+}
+
+int
+ngknet_ptp_dev_ctrl_cb_unregister(ngknet_ptp_dev_ctrl_cb_f ptp_dev_ctrl_cb)
+{
+    if (ptp_dev_ctrl_cb == NULL ||
+        callback_ctrl.ptp_dev_ctrl_cb != ptp_dev_ctrl_cb) {
+        return -1;
+    }
+    callback_ctrl.ptp_dev_ctrl_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_netif_create_cb_register(ngknet_netif_cb_f netif_cb)
+{
+    if (callback_ctrl.netif_create_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.netif_create_cb = netif_cb;
+
+    return 0;
+}
+
+int
+ngknet_netif_create_cb_unregister(ngknet_netif_cb_f netif_cb)
+{
+    if (netif_cb == NULL || callback_ctrl.netif_create_cb != netif_cb) {
+        return -1;
+    }
+    callback_ctrl.netif_create_cb = NULL;
+
+    return 0;
+}
+
+int
+ngknet_netif_destroy_cb_register(ngknet_netif_cb_f netif_cb)
+{
+    if (callback_ctrl.netif_destroy_cb != NULL) {
+        return -1;
+    }
+    callback_ctrl.netif_destroy_cb = netif_cb;
+
+    return 0;
+}
+
+int
+ngknet_netif_destroy_cb_unregister(ngknet_netif_cb_f netif_cb)
+{
+    if (netif_cb == NULL || callback_ctrl.netif_destroy_cb != netif_cb) {
+        return -1;
+    }
+    callback_ctrl.netif_destroy_cb = NULL;
+
+    return 0;
+}
+
+EXPORT_SYMBOL(ngknet_rx_cb_register);
+EXPORT_SYMBOL(ngknet_rx_cb_unregister);
+EXPORT_SYMBOL(ngknet_tx_cb_register);
+EXPORT_SYMBOL(ngknet_tx_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_rx_config_set_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_rx_config_set_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_tx_config_set_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_tx_config_set_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_rx_hwts_get_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_rx_hwts_get_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_tx_hwts_get_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_tx_hwts_get_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_tx_meta_set_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_tx_meta_set_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_phc_index_get_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_phc_index_get_cb_unregister);
+EXPORT_SYMBOL(ngknet_ptp_dev_ctrl_cb_register);
+EXPORT_SYMBOL(ngknet_ptp_dev_ctrl_cb_unregister);
+EXPORT_SYMBOL(ngknet_netif_create_cb_register);
+EXPORT_SYMBOL(ngknet_netif_create_cb_unregister);
+EXPORT_SYMBOL(ngknet_netif_destroy_cb_register);
+EXPORT_SYMBOL(ngknet_netif_destroy_cb_unregister); 
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
new file mode 100644
index 000000000000..54583adffa36
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
@@ -0,0 +1,364 @@
+/*! \file ngknet_callback.h
+ *
+ * Data structure definitions for NGKNET callbacks.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_CALLBACK_H
+#define NGKNET_CALLBACK_H
+
+#include <linux/skbuff.h>
+#include "ngknet_main.h"
+
+/*!
+ * \brief NGKNET callback description.
+ */
+struct ngknet_callback_desc {
+    /*! Device number */
+    int dev_no;
+
+    /*! Device ID */
+    uint32_t dev_id;
+
+    /*! Device type string */
+    const char *type_str;
+
+    /*! Network interface private data */
+    struct ngknet_private *priv;
+
+    /*! Matched filter */
+    struct ngknet_filter_s *filt;
+
+    /*! Packet meta data */
+    uint8_t *pmd;
+
+    /*! Packet meta data length */
+    int pmd_len;
+
+    /*! Packet data length */
+    int pkt_len;
+    
+    /*! Matched callback filter */
+    struct ngknet_filter_s *filt_cb;
+};
+
+#define NGKNET_SKB_CB(_skb) ((struct ngknet_callback_desc *)_skb->cb)
+
+/*! Handle Rx packet */
+typedef struct sk_buff *
+(*ngknet_rx_cb_f)(struct sk_buff *skb);
+
+/*! Handle Tx packet */
+typedef struct sk_buff *
+(*ngknet_tx_cb_f)(struct sk_buff *skb);
+
+/*! PTP Rx/Tx config set */
+typedef int
+(*ngknet_ptp_config_set_cb_f)(struct ngknet_private *priv, int *value);
+
+/*! PTP Rx/Tx HW timestamp get */
+typedef int
+(*ngknet_ptp_hwts_get_cb_f)(struct sk_buff *skb, uint64_t *ts);
+
+/*! PTP Tx meta set */
+typedef int
+(*ngknet_ptp_meta_set_cb_f)(struct sk_buff *skb);
+
+/*! PTP PHC index get */
+typedef int
+(*ngknet_ptp_phc_index_get_cb_f)(struct ngknet_private *priv, int *index);
+
+/*! PTP device control */
+typedef int
+(*ngknet_ptp_dev_ctrl_cb_f)(struct ngknet_dev *dev, int cmd, char *data, int len);
+
+/*! Netif callback  */
+typedef int
+(*ngknet_netif_cb_f)(struct net_device *dev);
+
+/*!
+ * \brief NGKNET callback control.
+ */
+struct ngknet_callback_ctrl {
+    /*! Handle Rx packet */
+    ngknet_rx_cb_f rx_cb;
+
+    /*! Handle Tx packet */
+    ngknet_tx_cb_f tx_cb;
+
+    /*! PTP Rx config set */
+    ngknet_ptp_config_set_cb_f ptp_rx_config_set_cb;
+
+    /*! PTP Tx config set */
+    ngknet_ptp_config_set_cb_f ptp_tx_config_set_cb;
+
+    /*! PTP Rx HW timestamp get */
+    ngknet_ptp_hwts_get_cb_f ptp_rx_hwts_get_cb;
+
+    /*! PTP Tx HW timestamp get */
+    ngknet_ptp_hwts_get_cb_f ptp_tx_hwts_get_cb;
+
+    /*! PTP Tx meta set */
+    ngknet_ptp_meta_set_cb_f ptp_tx_meta_set_cb;
+
+    /*! PTP PHC index get */
+    ngknet_ptp_phc_index_get_cb_f ptp_phc_index_get_cb;
+
+    /*! PTP device control */
+    ngknet_ptp_dev_ctrl_cb_f ptp_dev_ctrl_cb;
+
+    /*! Handle Netif create */
+    ngknet_netif_cb_f netif_create_cb;
+
+    /*! Handle Netif destroy */
+    ngknet_netif_cb_f netif_destroy_cb;
+};
+
+/*!
+ * \brief Get callback control.
+ *
+ * \param [in] cbc Pointer to callback control.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_callback_control_get(struct ngknet_callback_ctrl **cbc);
+
+/*!
+ * \brief Register Rx callback.
+ *
+ * \param [in] rx_cb Rx callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_rx_cb_register(ngknet_rx_cb_f rx_cb);
+
+/*!
+ * \brief Unregister Rx callback.
+ *
+ * \param [in] rx_cb Rx callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_rx_cb_unregister(ngknet_rx_cb_f rx_cb);
+
+/*!
+ * \brief Register Tx callback.
+ *
+ * \param [in] tx_cb Tx callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_tx_cb_register(ngknet_tx_cb_f tx_cb);
+
+/*!
+ * \brief Unregister Tx callback.
+ *
+ * \param [in] tx_cb Tx callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_tx_cb_unregister(ngknet_tx_cb_f tx_cb);
+
+/*!
+ * \brief Register PTP Rx config set callback.
+ *
+ * \param [in] ptp_rx_config_set_cb Rx config set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_config_set_cb_register(ngknet_ptp_config_set_cb_f ptp_rx_config_set_cb);
+
+/*!
+ * \brief Unregister PTP Rx config set callback.
+ *
+ * \param [in] ptp_rx_config_set_cb Rx config set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_config_set_cb_unregister(ngknet_ptp_config_set_cb_f ptp_rx_config_set_cb);
+
+/*!
+ * \brief Register PTP Tx config set callback.
+ *
+ * \param [in] ptp_tx_config_set_cb Tx config set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_config_set_cb_register(ngknet_ptp_config_set_cb_f ptp_tx_config_set_cb);
+
+/*!
+ * \brief Unregister PTP Tx config set callback.
+ *
+ * \param [in] ptp_tx_config_set_cb Tx config set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_config_set_cb_unregister(ngknet_ptp_config_set_cb_f ptp_tx_config_set_cb);
+
+/*!
+ * \brief Register PTP Rx HW timestamp get callback.
+ *
+ * \param [in] ptp_rx_hwts_get_cb Rx HW timestamp get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_hwts_get_cb_register(ngknet_ptp_hwts_get_cb_f ptp_rx_hwts_get_cb);
+
+/*!
+ * \brief Unregister PTP Rx HW timestamp get callback.
+ *
+ * \param [in] ptp_rx_hwts_get_cb Rx HW timestamp get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_hwts_get_cb_unregister(ngknet_ptp_hwts_get_cb_f ptp_rx_hwts_get_cb);
+
+/*!
+ * \brief Register PTP Tx HW timestamp get callback.
+ *
+ * \param [in] ptp_tx_hwts_get_cb Tx HW timestamp get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_hwts_get_cb_register(ngknet_ptp_hwts_get_cb_f ptp_tx_hwts_get_cb);
+
+/*!
+ * \brief Unregister PTP Tx HW timestamp get callback.
+ *
+ * \param [in] ptp_tx_hwts_get_cb Tx HW timestamp get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_hwts_get_cb_unregister(ngknet_ptp_hwts_get_cb_f ptp_tx_hwts_get_cb);
+
+/*!
+ * \brief Register PTP Tx meta set callback.
+ *
+ * \param [in] ptp_tx_meta_set_cb Tx meta set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_meta_set_cb_register(ngknet_ptp_meta_set_cb_f ptp_tx_meta_set_cb);
+
+/*!
+ * \brief Unregister PTP Tx meta set callback.
+ *
+ * \param [in] ptp_tx_meta_set_cb Tx meta set callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_meta_set_cb_unregister(ngknet_ptp_meta_set_cb_f ptp_tx_meta_set_cb);
+
+/*!
+ * \brief Register PTP PHC index get callback.
+ *
+ * \param [in] ptp_phc_index_get_cb PHC index get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_phc_index_get_cb_register(ngknet_ptp_phc_index_get_cb_f ptp_phc_index_get_cb);
+
+/*!
+ * \brief Unregister PTP PHC index get callback.
+ *
+ * \param [in] ptp_phc_index_get_cb PHC index get callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_phc_index_get_cb_unregister(ngknet_ptp_phc_index_get_cb_f ptp_phc_index_get_cb);
+
+/*!
+ * \brief Register PTP device control callback.
+ *
+ * \param [in] ptp_dev_ctrl_cb Device control callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_dev_ctrl_cb_register(ngknet_ptp_dev_ctrl_cb_f ptp_dev_ctrl_cb);
+
+/*!
+ * \brief Unregister PTP device control callback.
+ *
+ * \param [in] ptp_dev_ctrl_cb Device control callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_dev_ctrl_cb_unregister(ngknet_ptp_dev_ctrl_cb_f ptp_dev_ctrl_cb);
+
+/*!
+ * \brief Register Netif Create callback.
+ *
+ * \param [netif_cb] netif_cb create callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_netif_create_cb_register(ngknet_netif_cb_f netif_cb);
+
+/*!
+ * \brief Unregister Netif Create callback.
+ *
+ * \param [netif_cb] netif_cb destroy callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_netif_create_cb_unregister(ngknet_netif_cb_f netif_cb);
+
+/*!
+ * \brief Register Netif Destroy callback.
+ *
+ * \param [netif_cb] netif_cb destroy callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_netif_destroy_cb_register(ngknet_netif_cb_f netif_cb);
+
+/*!
+ * \brief Unregister Netif Destroy callback.
+ *
+ * \param [netif_cb] netif_cb destroy callback function.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_netif_destroy_cb_unregister(ngknet_netif_cb_f netif_cb);
+
+#endif /* NGKNET_CALLBACK_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_dep.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_dep.h
new file mode 100644
index 000000000000..919dd6450340
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_dep.h
@@ -0,0 +1,61 @@
+/*! \file ngknet_dep.h
+ *
+ * Macro definitions for NGKNET dependence.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_DEP_H
+#define NGKNET_DEP_H
+
+#include <shr/shr_error.h>
+#include <ngknet_linux.h>
+
+#ifndef TRUE
+#define TRUE                1
+#endif
+#ifndef FALSE
+#define FALSE               0
+#endif
+
+/*! Memorry barrier */
+#define MEMORY_BARRIER      smp_mb()
+
+/*! CNET print uitility */
+#define CNET_PR(fmt, args...)   printk(fmt, ##args)
+
+struct pdma_dev;
+
+/*! Externs for the required functions. */
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+extern int _bd##_cnet_pdma_attach(struct pdma_dev *dev); \
+extern int _bd##_cnet_pdma_detach(struct pdma_dev *dev);
+#include <bcmdrd/bcmdrd_devlist.h>
+
+/*! Create enumeration values from list of supported devices. */
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    NGKNET_DEV_T_##_bd,
+/*! Enumeration for all base device types. */
+typedef enum {
+    NGKNET_DEV_T_NONE = 0,
+#include <bcmdrd/bcmdrd_devlist.h>
+    NGKNET_DEV_T_COUNT
+} ngknet_dev_type_t;
+
+#endif /* NGKNET_DEP_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.c
new file mode 100644
index 000000000000..00fdb3da8849
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.c
@@ -0,0 +1,505 @@
+/*! \file ngknet_extra.c
+ *
+ * Utility routines for NGKNET enhancement.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <linux/kconfig.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <asm/io.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/if.h>
+#include <linux/if_vlan.h>
+#include <linux/net_tstamp.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/bitops.h>
+#include <linux/time.h>
+
+#include <lkm/ngknet_dev.h>
+#include <bcmcnet/bcmcnet_core.h>
+#include "ngknet_main.h"
+#include "ngknet_extra.h"
+#include "ngknet_callback.h"
+
+static struct ngknet_rl_ctrl rl_ctrl;
+
+int
+ngknet_filter_create(struct ngknet_dev *dev, ngknet_filter_t *filter)
+{
+    struct filt_ctrl *fc = NULL;
+    struct list_head *list = NULL;
+    ngknet_filter_t *filt = NULL;
+    unsigned long flags;
+    int num, id, done = 0;
+
+    switch (filter->type) {
+    case NGKNET_FILTER_T_RX_PKT:
+        break;
+    default:
+        return SHR_E_UNAVAIL;
+    }
+
+    switch (filter->dest_type) {
+    case NGKNET_FILTER_DEST_T_NULL:
+    case NGKNET_FILTER_DEST_T_NETIF:
+    case NGKNET_FILTER_DEST_T_VNET:
+    case NGKNET_FILTER_DEST_T_CB:  /* SDKLT-26907: support NGKNET_FILTER_DEST_T_CB */
+        break;
+    default:
+        return SHR_E_UNAVAIL;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    num = (long)dev->fc[0];
+    for (id = 1; id < num + 1; id++) {
+        if (!dev->fc[id]) {
+            break;
+        }
+    }
+    if (id > NUM_FILTER_MAX) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_RESOURCE;
+    }
+
+    fc = kzalloc(sizeof(*fc), GFP_KERNEL);
+    if (!fc) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_MEMORY;
+    }
+
+    dev->fc[id] = fc;
+    num += id == (num + 1) ? 1 : 0;
+    dev->fc[0] = (void *)(long)num;
+
+    memcpy(&fc->filt, filter, sizeof(fc->filt));
+    fc->filt.id = id;
+
+    list_for_each(list, &dev->filt_list) {
+        filt = &((struct filt_ctrl *)list)->filt;
+        if (filt->flags & NGKNET_FILTER_F_MATCH_CHAN) {
+            if (!(fc->filt.flags & NGKNET_FILTER_F_MATCH_CHAN) ||
+                fc->filt.chan > filt->chan) {
+                continue;
+            }
+            if (fc->filt.chan < filt->chan ||
+                fc->filt.priority < filt->priority) {
+                list_add_tail(&fc->list, list);
+                done = 1;
+                break;
+            }
+        } else {
+            if (fc->filt.flags & NGKNET_FILTER_F_MATCH_CHAN ||
+                fc->filt.priority < filt->priority) {
+                list_add_tail(&fc->list, list);
+                done = 1;
+                break;
+            }
+        }
+    }
+    if (!done) {
+        list_add_tail(&fc->list, &dev->filt_list);
+    }
+
+    filter->id = fc->filt.id;
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_filter_destroy(struct ngknet_dev *dev, int id)
+{
+    struct filt_ctrl *fc = NULL;
+    unsigned long flags;
+    int num;
+
+    if (id <= 0 || id > NUM_FILTER_MAX) {
+        return SHR_E_PARAM;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    fc = (struct filt_ctrl *)dev->fc[id];
+    if (!fc) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NOT_FOUND;
+    }
+
+    list_del(&fc->list);
+    kfree(fc);
+
+    dev->fc[id] = NULL;
+    num = (long)dev->fc[0];
+    while (num-- == id--) {
+        if (dev->fc[id]) {
+            dev->fc[0] = (void *)(long)num;
+            break;
+        }
+    }
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_filter_destroy_all(struct ngknet_dev *dev)
+{
+    int id;
+    int rv;
+
+    for (id = 1; id <= NUM_FILTER_MAX; id++) {
+        rv = ngknet_filter_destroy(dev, id);
+        if (SHR_FAILURE(rv)) {
+            return rv;
+        }
+    }
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_filter_get(struct ngknet_dev *dev, int id, ngknet_filter_t *filter)
+{
+    struct filt_ctrl *fc = NULL;
+    unsigned long flags;
+    int num;
+
+    if (id <= 0 || id > NUM_FILTER_MAX) {
+        return SHR_E_PARAM;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    fc = (struct filt_ctrl *)dev->fc[id];
+    if (!fc) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NOT_FOUND;
+    }
+
+    memcpy(filter, &fc->filt, sizeof(*filter));
+
+    num = (long)dev->fc[0];
+    for (id++; id < num + 1; id++) {
+        if (dev->fc[id]) {
+            break;
+        }
+    }
+    filter->next = id == (num + 1) ? 0 : id;
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_filter_get_next(struct ngknet_dev *dev, ngknet_filter_t *filter)
+{
+    int id;
+    int rv;
+
+    if (!filter->next) {
+        for (id = 1; id <= NUM_FILTER_MAX; id++) {
+            rv = ngknet_filter_get(dev, id, filter);
+            if (SHR_SUCCESS(rv)) {
+                return rv;
+            }
+        }
+        if (id > NUM_FILTER_MAX) {
+            return SHR_E_NOT_FOUND;
+        }
+    }
+
+    return ngknet_filter_get(dev, filter->next, filter);
+}
+
+int
+ngknet_rx_pkt_filter(struct ngknet_dev *dev, struct sk_buff *skb, struct net_device **ndev,
+                     struct net_device **mndev, struct sk_buff **mskb)
+{
+    struct pkt_buf *pkb = (struct pkt_buf *)skb->data;
+    struct net_device *dest_ndev = NULL, *mirror_ndev = NULL;
+    struct sk_buff *mirror_skb = NULL;
+    struct ngknet_private *priv = NULL;
+    struct filt_ctrl *fc = NULL;
+    struct list_head *list = NULL;
+    ngknet_filter_t scratch, *filt = NULL, *filt_cb = NULL;
+    uint8_t *oob = &pkb->data, *data = NULL;
+    uint16_t tpid;
+    unsigned long flags;
+    int wsize;
+    int chan_id;
+    int idx, match = 0, match_cb = 0;
+
+    bcmcnet_pdma_dev_queue_to_chan(&dev->pdma_dev, pkb->pkh.queue_id,
+                                   PDMA_Q_RX, &chan_id);
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    dest_ndev = dev->bdev[chan_id];
+    if (dest_ndev) {
+        skb->dev = dest_ndev;
+        priv = netdev_priv(dest_ndev);
+        priv->users++;
+        *ndev = dest_ndev;
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NONE;
+    }
+
+    if (list_empty(&dev->filt_list)) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NONE;
+    }
+
+    list_for_each(list, &dev->filt_list) {
+        fc = (struct filt_ctrl *)list;
+        filt = &fc->filt;
+        if (filt->flags & NGKNET_FILTER_F_ANY_DATA) {
+            match = 1;
+            break;
+        }
+        if (filt->flags & NGKNET_FILTER_F_MATCH_CHAN && filt->chan != chan_id) {
+            continue;
+        }
+        memcpy(&scratch.data.b[0],
+               &oob[filt->oob_data_offset], filt->oob_data_size);
+        memcpy(&scratch.data.b[filt->oob_data_size],
+               &pkb->data + pkb->pkh.meta_len + filt->pkt_data_offset,
+               filt->pkt_data_size);
+        wsize = NGKNET_BYTES2WORDS(filt->oob_data_size + filt->pkt_data_size);
+        for (idx = 0; idx < wsize; idx++) {
+            scratch.data.w[idx] &= filt->mask.w[idx];
+            if (scratch.data.w[idx] != filt->data.w[idx]) {
+                break;
+            }
+        }
+        if (idx == wsize) {
+            if (NGKNET_FILTER_DEST_T_CB == filt->dest_type) {
+                match_cb = 1;
+                filt_cb = filt;
+                continue;
+            }
+            match = 1;
+            break;
+        }
+    }
+
+    if (match) {
+        fc->hits++;
+        switch (filt->dest_type) {
+        case NGKNET_FILTER_DEST_T_NETIF:
+            if (filt->dest_id == 0) {
+                dest_ndev = dev->net_dev;
+            } else {
+                dest_ndev = dev->vdev[filt->dest_id];
+            }
+            if (dest_ndev) {
+                skb->dev = dest_ndev;
+                if (filt->dest_proto) {
+                    pkb->pkh.attrs |= PDMA_RX_SET_PROTO;
+                    skb->protocol = filt->dest_proto;
+                }
+                priv = netdev_priv(dest_ndev);
+                priv->users++;
+            }
+            break;
+        case NGKNET_FILTER_DEST_T_VNET:
+            pkb->pkh.attrs |= PDMA_RX_TO_VNET;
+            spin_unlock_irqrestore(&dev->lock, flags);
+            return SHR_E_NO_HANDLER;
+        case NGKNET_FILTER_DEST_T_NULL:
+        default:
+            spin_unlock_irqrestore(&dev->lock, flags);
+            return SHR_E_UNAVAIL;
+        }
+    }
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    if (!dest_ndev) {
+        return SHR_E_NONE;
+    } else {
+        *ndev = dest_ndev;
+    }
+
+    if (filt->flags & NGKNET_FILTER_F_STRIP_TAG) {
+        pkb->pkh.attrs |= PDMA_RX_STRIP_TAG;
+        data = skb->data + PKT_HDR_SIZE + pkb->pkh.meta_len;
+        tpid = data[12] << 8 | data[13];
+        if (tpid == ETH_P_8021Q || tpid == ETH_P_8021AD) {
+            pkb->pkh.data_len -= VLAN_HLEN;
+            memmove(skb->data + VLAN_HLEN, skb->data,
+                    PKT_HDR_SIZE + pkb->pkh.meta_len + 2 * ETH_ALEN);
+            skb_pull(skb, VLAN_HLEN);
+        }
+    }
+
+    if (dev->cbc->rx_cb) {
+        NGKNET_SKB_CB(skb)->filt = filt;
+        
+        /* Add callback filter if matched */
+        if (match_cb) {
+            NGKNET_SKB_CB(skb)->filt_cb = filt_cb;
+        }
+    }
+
+    if (filt->mirror_type == NGKNET_FILTER_DEST_T_NETIF) {
+        spin_lock_irqsave(&dev->lock, flags);
+        if (filt->mirror_id == 0) {
+            mirror_ndev = dev->net_dev;
+        } else {
+            mirror_ndev = dev->vdev[filt->mirror_id];
+        }
+        if (mirror_ndev) {
+            mirror_skb = pskb_copy(skb, GFP_ATOMIC);
+            if (mirror_skb) {
+                mirror_skb->dev = mirror_ndev;
+                if (filt->mirror_proto) {
+                    pkb->pkh.attrs |= PDMA_RX_SET_PROTO;
+                    mirror_skb->protocol = filt->mirror_proto;
+                }
+                if (dev->cbc->rx_cb) {
+                    NGKNET_SKB_CB(mirror_skb)->filt = filt;
+                }
+                priv = netdev_priv(mirror_ndev);
+                priv->users++;
+                *mndev = mirror_ndev;
+                *mskb = mirror_skb;
+            }
+        }
+        spin_unlock_irqrestore(&dev->lock, flags);
+    }
+
+    return SHR_E_NONE;
+}
+
+static void
+ngknet_rl_process(timer_context_t data)
+{
+    struct ngknet_rl_ctrl *rc = timer_arg(rc, data, timer);
+    struct ngknet_dev *dev;
+    unsigned long flags;
+    int idx;
+
+    spin_lock_irqsave(&rc->lock, flags);
+    rc->rx_pkts = 0;
+    for (idx = 0; idx < NUM_PDMA_DEV_MAX; idx++) {
+        dev = &rc->devs[idx];
+        if (rc->dev_active[idx] && rc->dev_paused[idx]) {
+            bcmcnet_pdma_dev_rx_resume(&dev->pdma_dev);
+            rl_ctrl.dev_paused[dev->dev_no] = 0;
+        }
+    }
+    spin_unlock_irqrestore(&rc->lock, flags);
+
+    rc->timer.expires = jiffies + HZ / rc->rx_ticks;
+    add_timer(&rc->timer);
+}
+
+void
+ngknet_rx_rate_limit_init(struct ngknet_dev *devs)
+{
+    sal_memset(&rl_ctrl, 0, sizeof(rl_ctrl));
+    rl_ctrl.rx_ticks = 10;
+    setup_timer(&rl_ctrl.timer, ngknet_rl_process, (timer_context_t)&rl_ctrl);
+    spin_lock_init(&rl_ctrl.lock);
+    rl_ctrl.devs = devs;
+}
+
+void
+ngknet_rx_rate_limit_cleanup(void)
+{
+    del_timer_sync(&rl_ctrl.timer);
+}
+
+int
+ngknet_rx_rate_limit_started(void)
+{
+    return rl_ctrl.started;
+}
+
+void
+ngknet_rx_rate_limit_start(struct ngknet_dev *dev)
+{
+    unsigned long flags;
+
+    spin_lock_irqsave(&rl_ctrl.lock, flags);
+    rl_ctrl.dev_active[dev->dev_no] = 1;
+    spin_unlock_irqrestore(&rl_ctrl.lock, flags);
+
+    if (!rl_ctrl.started) {
+        rl_ctrl.started = 1;
+        rl_ctrl.timer.expires = jiffies + HZ / rl_ctrl.rx_ticks;
+        add_timer(&rl_ctrl.timer);
+    }
+}
+
+void
+ngknet_rx_rate_limit_stop(struct ngknet_dev *dev)
+{
+    unsigned long flags;
+
+    spin_lock_irqsave(&rl_ctrl.lock, flags);
+    rl_ctrl.dev_active[dev->dev_no] = 0;
+    spin_unlock_irqrestore(&rl_ctrl.lock, flags);
+}
+
+void
+ngknet_rx_rate_limit(struct ngknet_dev *dev, int limit)
+{
+    unsigned long flags;
+
+    spin_lock_irqsave(&rl_ctrl.lock, flags);
+    if ((++rl_ctrl.rx_pkts + rl_ctrl.rx_overruns > limit / rl_ctrl.rx_ticks) &&
+        !rl_ctrl.dev_paused[dev->dev_no] && rl_ctrl.dev_active[dev->dev_no]) {
+        rl_ctrl.dev_paused[dev->dev_no] = 1;
+        rl_ctrl.rx_overruns = 0;
+        bcmcnet_pdma_dev_rx_suspend(&dev->pdma_dev);
+    }
+    if (rl_ctrl.dev_paused[dev->dev_no]) {
+        rl_ctrl.rx_overruns++;
+    }
+    spin_unlock_irqrestore(&rl_ctrl.lock, flags);
+}
+
+void
+ngknet_tx_queue_schedule(struct ngknet_dev *dev, struct sk_buff *skb, int *queue)
+{
+    struct pkt_buf *pkb = (struct pkt_buf *)skb->data;
+
+    if (pkb->pkh.attrs & PDMA_TX_BIND_QUE) {
+        *queue = pkb->pkh.queue_id;
+    }
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.h
new file mode 100644
index 000000000000..27dea9e368e7
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_extra.h
@@ -0,0 +1,218 @@
+/*! \file ngknet_extra.h
+ *
+ * Generic data structure definitions for NGKNET enhancement.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_EXTRA_H
+#define NGKNET_EXTRA_H
+
+/*!
+ * \brief Filter control.
+ */
+struct filt_ctrl {
+    /*! List head */
+    struct list_head list;
+
+    /*! Device number */
+    int dev_no;
+
+    /*! Number of hits */
+    uint64_t hits;
+
+    /*! Filter description */
+    ngknet_filter_t filt;
+};
+
+/*!
+ * \brief Create filter.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] filter Filter structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_filter_create(struct ngknet_dev *dev, ngknet_filter_t *filter);
+
+/*!
+ * \brief Destroy filter.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] id Filter ID.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_filter_destroy(struct ngknet_dev *dev, int id);
+
+/*!
+ * \brief Destroy all the filters.
+ *
+ * \param [in] dev Device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_filter_destroy_all(struct ngknet_dev *dev);
+
+/*!
+ * \brief Get filter.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] id Filter ID.
+ * \param [out] filter Filter structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_filter_get(struct ngknet_dev *dev, int id, ngknet_filter_t *filter);
+
+/*!
+ * \brief Get the next filter.
+ *
+ * \param [in] dev Device structure point.
+ * \param [out] filter Filter structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_filter_get_next(struct ngknet_dev *dev, ngknet_filter_t *filter);
+
+/*!
+ * \brief Filter packet.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] skb Rx packet SKB.
+ * \param [out] mndev Mirror network interface.
+ * \param [out] mskb Mirror Rx packet SKB.
+ *
+ * \retval Matched network interface.
+ * \retval NULL No matched network interface.
+ */
+extern int
+ngknet_rx_pkt_filter(struct ngknet_dev *dev, struct sk_buff *skb, struct net_device **ndev,
+                     struct net_device **mndev, struct sk_buff **mskb);
+
+/*!
+ * \brief Rx rate limit control.
+ *
+ * This contains all the control information for Rx rate limit such as
+ * the number of Rx packets, status related to Rx rate limit, etc.
+ *
+ * The rate limit is kernel-oriented, i.e. all the Rx packets from any
+ * device/channel will be accounted for. Once the received packets reach
+ * the limit value in an 1-Sec interval, the driver API XXXX_rx_suspend()
+ * will be called to suspend Rx. The 1-Sec basis timer will call the driver
+ * API XXXX_rx_resume() to resume Rx and reset rate-related status/counters
+ * at the begin of the next 1-Sec interval.
+ *
+ * The NGKNET module parameter 'rx_rate_limit' is used to decide the maximum
+ * Rx rate. Disable Rx rate limit if set 0. It can be set when inserting
+ * NGKNET module or modified using its SYSFS attributions.
+ */
+struct ngknet_rl_ctrl {
+    /*! Rx packets */
+    int rx_pkts;
+
+    /*! Rx overruns */
+    int rx_overruns;
+
+    /*! Rx ticks */
+    int rx_ticks;
+
+    /*! Active devices under rate control */
+    int dev_active[NUM_PDMA_DEV_MAX];
+
+    /*! Paused devices due to no Rx credit */
+    int dev_paused[NUM_PDMA_DEV_MAX];
+
+    /*! Rate limit timer */
+    struct timer_list timer;
+
+    /*! Rate limit lock */
+    spinlock_t lock;
+
+    /*! Devices */
+    struct ngknet_dev *devs;
+
+    /*! Rate limit status indicator */
+    int started;
+};
+
+/*!
+ * \brief Initialize Rx rate limit.
+ *
+ * \param [in] devs Devices array.
+ */
+extern void
+ngknet_rx_rate_limit_init(struct ngknet_dev *devs);
+
+/*!
+ * \brief Cleanup Rx rate limit.
+ */
+extern void
+ngknet_rx_rate_limit_cleanup(void);
+
+/*!
+ * \brief Get Rx rate limit state.
+ */
+extern int
+ngknet_rx_rate_limit_started(void);
+
+/*!
+ * \brief Start Rx rate limit.
+ *
+ * \param [in] dev Device structure point.
+ */
+extern void
+ngknet_rx_rate_limit_start(struct ngknet_dev *dev);
+
+/*!
+ * \brief Stop Rx rate limit.
+ *
+ * \param [in] dev Device structure point.
+ */
+extern void
+ngknet_rx_rate_limit_stop(struct ngknet_dev *dev);
+
+/*!
+ * \brief Limit Rx rate.
+ *
+ * \param [in] dev Device structure point.
+ */
+extern void
+ngknet_rx_rate_limit(struct ngknet_dev *dev, int limit);
+
+/*!
+ * \brief Schedule Tx queue.
+ *
+ * \param [in] dev Device structure point.
+ * \param [in] queue Tx queue number.
+ */
+extern void
+ngknet_tx_queue_schedule(struct ngknet_dev *dev, struct sk_buff *skb, int *queue);
+
+#endif /* NGKNET_EXTRA_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.c
new file mode 100644
index 000000000000..0162ae5b96c1
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.c
@@ -0,0 +1,173 @@
+/*! \file ngknet_linux.c
+ *
+ * Utility routines for Linux kernel APIs abstraction.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <linux/kconfig.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/sched.h>
+#include <linux/kthread.h>
+#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+
+#include "ngknet_linux.h"
+
+/*!
+ * Time
+ */
+
+unsigned long
+sal_time_usecs(void)
+{
+    struct timeval tv;
+
+    kal_time_val_get(&tv);
+
+    return tv.tv_sec * 1000000 + tv.tv_usec;
+}
+
+void
+sal_usleep(unsigned long usec)
+{
+    unsigned long then, now, hz;
+
+    hz = usec * HZ / 1000000;
+    if (hz) {
+        schedule_timeout(hz);
+    }
+    usec = usec * HZ % 1000000 / HZ;
+    if (usec) {
+        then = sal_time_usecs();
+        do {
+            schedule();
+            now = sal_time_usecs();
+        } while (now > then && (now - then) < usec);
+    }
+}
+
+/*!
+ * Synchronization
+ */
+
+typedef struct {
+    struct semaphore sem;
+    char *desc;
+    int binary;
+} sem_ctrl_t;
+
+sal_sem_t
+sal_sem_create(char *desc, int binary, int count)
+{
+    sem_ctrl_t *sc = kmalloc(sizeof(*sc), GFP_KERNEL);
+
+    if (sc != NULL) {
+        sema_init(&sc->sem, count);
+        sc->desc = desc;
+        sc->binary = binary;
+    }
+
+    return (sal_sem_t)sc;
+}
+
+void
+sal_sem_destroy(sal_sem_t sem)
+{
+    sem_ctrl_t *sc = (sem_ctrl_t *)sem;
+
+    kfree(sc);
+}
+
+int
+sal_sem_take(sal_sem_t sem, int usec)
+{
+    sem_ctrl_t *sc = (sem_ctrl_t *)sem;
+    int rv;
+
+    if (usec == SAL_SEM_FOREVER) {
+        do {
+            rv = down_interruptible(&sc->sem);
+        } while (rv == -EINTR);
+        return rv ? -1 : 0;
+    }
+
+    return -1;
+}
+
+int
+sal_sem_give(sal_sem_t sem)
+{
+    sem_ctrl_t *sc = (sem_ctrl_t *)sem;
+
+    up(&sc->sem);
+
+    return 0;
+}
+
+typedef struct spinlock_ctrl_s {
+    spinlock_t spinlock;
+    unsigned long flags;
+    char *desc;
+} *spinlock_ctrl_t;
+
+sal_spinlock_t
+sal_spinlock_create(char *desc)
+{
+    spinlock_ctrl_t sl = kmalloc(sizeof(*sl), GFP_KERNEL);
+
+    if (sl != NULL) {
+        spin_lock_init(&sl->spinlock);
+        sl->flags = 0;
+        sl->desc = desc;
+    }
+
+    return (sal_spinlock_t)sl;
+}
+
+void
+sal_spinlock_destroy(sal_spinlock_t lock)
+{
+    spinlock_ctrl_t sl = (spinlock_ctrl_t)lock;
+
+    kfree(sl);
+}
+
+int
+sal_spinlock_lock(sal_spinlock_t lock)
+{
+    spinlock_ctrl_t sl = (spinlock_ctrl_t)lock;
+
+    spin_lock_irqsave(&sl->spinlock, sl->flags);
+
+    return 0;
+}
+
+int
+sal_spinlock_unlock(sal_spinlock_t lock)
+{
+    spinlock_ctrl_t sl = (spinlock_ctrl_t)lock;
+
+    spin_unlock_irqrestore(&sl->spinlock, sl->flags);
+
+    return 0;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
new file mode 100644
index 000000000000..686aac8f5571
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
@@ -0,0 +1,240 @@
+/*! \file ngknet_linux.h
+ *
+ * Data structure and macro definitions for Linux kernel APIs abstraction.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_LINUX_H
+#define NGKNET_LINUX_H
+
+#include <linux/version.h>
+#include <linux/skbuff.h>
+#include <linux/kthread.h>
+#include <linux/netdevice.h>
+
+/*!
+ * Kernel abstraction
+ */
+
+#define MODULE_PARAM(n, t, p)   module_param(n, t, p)
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+#define kal_vlan_hwaccel_put_tag(skb, proto, tci) \
+    __vlan_hwaccel_put_tag(skb, tci)
+#define NETIF_F_HW_VLAN_CTAG_RX NETIF_F_HW_VLAN_RX
+#define NETIF_F_HW_VLAN_CTAG_TX NETIF_F_HW_VLAN_TX
+#else
+#define kal_vlan_hwaccel_put_tag(skb, proto, tci) \
+    __vlan_hwaccel_put_tag(skb, htons(proto), tci)
+#endif /* KERNEL_VERSION(3,10,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+static inline int
+kal_support_paged_skb(void)
+{
+    return false;
+}
+#else
+static inline int
+kal_support_paged_skb(void)
+{
+    return true;
+}
+#endif /* KERNEL_VERSION(3,6,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+static inline struct page *
+kal_dev_alloc_page(void)
+{
+    return NULL;
+}
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+static inline struct page *
+kal_dev_alloc_page(void)
+{
+    return alloc_pages(GFP_ATOMIC | __GFP_ZERO | __GFP_COLD |
+                       __GFP_COMP | __GFP_MEMALLOC, 0);
+}
+#else
+static inline struct page *
+kal_dev_alloc_page(void)
+{
+    return dev_alloc_page();
+}
+#endif /* KERNEL_VERSION(3,6,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+static inline struct sk_buff *
+kal_build_skb(void *data, unsigned int frag_size)
+{
+    return NULL;
+}
+#else
+static inline struct sk_buff *
+kal_build_skb(void *data, unsigned int frag_size)
+{
+    return build_skb(data, frag_size);
+}
+#endif /* KERNEL_VERSION(3,6,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+static inline void
+kal_netif_trans_update(struct net_device *dev)
+{
+    dev->trans_start = jiffies;
+}
+#else
+static inline void
+kal_netif_trans_update(struct net_device *dev)
+{
+    netif_trans_update(dev);
+}
+#endif /* KERNEL_VERSION(4,7,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+static inline void
+kal_time_val_get(struct timeval *tv)
+{
+    do_gettimeofday(tv);
+}
+#else
+static inline void
+kal_time_val_get(struct timeval *tv)
+{
+    struct timespec64 ts;
+    ktime_get_real_ts64(&ts);
+    tv->tv_sec = ts.tv_sec;
+    tv->tv_usec = ts.tv_nsec / 1000;
+}
+#endif /* KERNEL_VERSION(3,17,0) */
+
+static inline unsigned long
+kal_copy_from_user(void *to, const void __user *from,
+                   unsigned int dl, unsigned int sl)
+{
+    unsigned int len = dl;
+
+    if (unlikely(len != sl)) {
+        printk(KERN_WARNING "Unmatched linux_ngknet.ko, please use the latest.\n");
+        len = min(dl, sl);
+    }
+
+    return copy_from_user(to, from, len);
+}
+
+static inline unsigned long
+kal_copy_to_user(void __user *to, const void *from,
+                 unsigned int dl, unsigned int sl)
+{
+    unsigned int len = dl;
+
+    if (unlikely(len != sl)) {
+        printk(KERN_WARNING "Unmatched linux_ngknet.ko, please use the latest.\n");
+        len = min(dl, sl);
+    }
+
+    return copy_to_user(to, from, len);
+}
+
+/*!
+ * System abstraction
+ */
+
+static inline void *
+sal_alloc(unsigned int sz, char *s)
+{
+    return kmalloc(sz, GFP_KERNEL);
+}
+
+static inline void
+sal_free(void *addr)
+{
+    kfree(addr);
+}
+
+static inline void *
+sal_memset(void *dest, int c, size_t cnt)
+{
+    return memset(dest, c, cnt);
+}
+
+static inline void *
+sal_memcpy(void *dest, const void *src, size_t cnt)
+{
+    return memcpy(dest, src, cnt);
+}
+
+static inline char *
+sal_strncpy(char *dest, const char *src, size_t cnt)
+{
+    return strncpy(dest, src, cnt);
+}
+
+/*!
+ * Time
+ */
+
+extern unsigned long
+sal_time_usecs(void);
+
+extern void
+sal_usleep(unsigned long usec);
+
+/*!
+ * Synchronization
+ */
+
+typedef struct sal_sem_s {
+    char semaphore_opaque_type;
+} *sal_sem_t;
+
+typedef struct sal_spinlock_s {
+    char spinlock_opaque_type;
+} *sal_spinlock_t;
+
+#define SAL_SEM_FOREVER         -1
+#define SAL_SEM_BINARY          1
+#define SAL_SEM_COUNTING        0
+
+extern sal_sem_t
+sal_sem_create(char *desc, int binary, int count);
+
+extern void
+sal_sem_destroy(sal_sem_t sem);
+
+extern int
+sal_sem_take(sal_sem_t sem, int usec);
+
+extern int
+sal_sem_give(sal_sem_t sem);
+
+extern sal_spinlock_t
+sal_spinlock_create(char *desc);
+
+extern void
+sal_spinlock_destroy(sal_spinlock_t lock);
+
+extern int
+sal_spinlock_lock(sal_spinlock_t lock);
+
+extern int
+sal_spinlock_unlock(sal_spinlock_t lock);
+
+#endif /* NGKNET_LINUX_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
new file mode 100644
index 000000000000..b8af31d85ff2
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
@@ -0,0 +1,2689 @@
+/*! \file ngknet_main.c
+ *
+ * NGKNET module entry.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+/*
+ * This module implements a Linux network driver for Broadcom
+ * XGS switch devices. The driver simultaneously serves a
+ * number of virtual Linux network devices.
+ *
+ * Packets received from the switch device are sent to a virtual
+ * Linux network device based on a set of packet filters.
+ *
+ * Packets from the virtual Linux network devices are multiplexed
+ * with fifo mode if only one Tx queue enabled.
+ *
+ * A command-based IOCTL interface is used for managing the devices,
+ * packet filters and virtual Linux network interfaces.
+ *
+ * A virtual network interface can be configured to work in RCPU
+ * mode, which means that packets from the switch device will
+ * be encapsulated with a RCPU header and a block of meta data
+ * that basically contains the core DCB information. Likewise,
+ * packets received from the Linux network stack are assumed to
+ * be RCPU encapsulated when going out on an interface in RCPU
+ * mode. If a virtual network interface does not work in RCPU
+ * mode and transmits to this interface will unmodified go to
+ * specified physical switch port, DCB information should be
+ * provided when the interface is created.
+ *
+ * The module implements basic Rx DMA rate control. The rate is
+ * specified in packets per second, and different Rx DMA channels
+ * can be configured to use different maximum packet rates.
+ * The packet rate can be configure as a module parameter, and
+ * it can also be changed dynamically through the proc file
+ * system (syntax is described in function header comment).
+ *
+ * For a list of supported module parameters, please see below.
+ */
+
+#include <linux/kconfig.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/if.h>
+#include <linux/if_vlan.h>
+#include <linux/net_tstamp.h>
+#include <linux/mm.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/bitops.h>
+#include <linux/time.h>
+#include <linux/random.h>
+
+#include <lkm/ngbde_kapi.h>
+#include <lkm/ngknet_dev.h>
+#include <lkm/ngknet_ioctl.h>
+#include <bcmcnet/bcmcnet_core.h>
+#include "ngknet_main.h"
+#include "ngknet_extra.h"
+#include "ngknet_procfs.h"
+#include "ngknet_callback.h"
+#include "ngknet_ptp.h"
+
+/*! \cond */
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_DESCRIPTION("Network Device Driver Module");
+MODULE_LICENSE("GPL");
+/*! \endcond */
+
+/*! \cond */
+static int debug = 0;
+MODULE_PARAM(debug, int, 0);
+MODULE_PARM_DESC(debug,
+"Debug level (default 0)");
+/*! \endcond */
+
+/*! \cond */
+static char *base_dev_name = "bcm";
+MODULE_PARAM(base_dev_name, charp, 0);
+MODULE_PARM_DESC(base_dev_name,
+"Base device name (default bcm0, bcm1, etc.)");
+/*! \endcond */
+
+/*! \cond */
+static char *mac_addr = NULL;
+MODULE_PARAM(mac_addr, charp, 0);
+MODULE_PARM_DESC(mac_addr,
+"Ethernet MAC address (default 02:10:18:xx:xx:xx)");
+/*! \endcond */
+
+/*! \cond */
+static int default_mtu = 1500;
+MODULE_PARAM(default_mtu, int, 0);
+MODULE_PARM_DESC(default_mtu,
+"Default MTU for NGKNET network interfaces (default 1500)");
+/*! \endcond */
+
+/*! \cond */
+static int rx_buffer_size = RX_BUF_SIZE_DFLT;
+MODULE_PARAM(rx_buffer_size, int, 0);
+MODULE_PARM_DESC(rx_buffer_size,
+"Default size of RX packet buffers (default 9216)");
+/*! \endcond */
+
+/*! \cond */
+static int rx_rate_limit = -1;
+MODULE_PARAM(rx_rate_limit, int, 0);
+MODULE_PARM_DESC(rx_rate_limit,
+"Rx rate limit (pps, default -1 no limit)");
+/*! \endcond */
+
+/*! \cond */
+static int tx_polling = 0;
+MODULE_PARAM(tx_polling, int, 0);
+MODULE_PARM_DESC(tx_polling,
+"Tx polling mode (default 0 in interrupt mode)");
+/*! \endcond */
+
+/*! \cond */
+static int rx_batching = 0;
+MODULE_PARAM(rx_batching, int, 0);
+MODULE_PARM_DESC(rx_batching,
+"Rx batching mode (default 0 in single fill mode)");
+/*! \endcond */
+
+typedef int (*drv_ops_attach)(struct pdma_dev *dev);
+
+struct bcmcnet_drv_ops {
+    const char         *drv_desc;
+    drv_ops_attach      drv_attach;
+    drv_ops_attach      drv_detach;
+};
+
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    static struct bcmcnet_drv_ops _bd##_cnet_drv_ops = { \
+        #_bd, \
+        _bd##_cnet_pdma_attach, \
+        _bd##_cnet_pdma_detach, \
+    };
+#include <bcmdrd/bcmdrd_devlist.h>
+
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    &_bd##_cnet_drv_ops,
+static struct bcmcnet_drv_ops *drv_ops[] = {
+    NULL,
+#include <bcmdrd/bcmdrd_devlist.h>
+    NULL
+};
+static int drv_num = sizeof(drv_ops) / sizeof(drv_ops[0]);
+
+struct ngknet_dev ngknet_devices[NUM_PDMA_DEV_MAX];
+
+/* Default random MAC address has Broadcom OUI with local admin bit set */
+static uint8_t ngknet_dev_mac[6] = {0x02, 0x10, 0x18, 0x00, 0x00, 0x00};
+
+/* Interrupt handles */
+struct ngknet_intr_handle {
+    struct napi_struct napi;
+    struct intr_handle *hdl;
+    int napi_resched;
+    int napi_pending;
+};
+
+static struct ngknet_intr_handle priv_hdl[NUM_PDMA_DEV_MAX][NUM_QUE_MAX];
+
+/*!
+ * Dump packet content for debug
+ */
+static void
+ngknet_pkt_dump(uint8_t *data, int len)
+{
+    char str[128];
+    int i;
+
+    len = len > 256 ? 256 : len;
+
+    for (i = 0; i < len; i++) {
+        if ((i & 0x1f) == 0) {
+            sprintf(str, "%04x: ", i);
+        }
+        sprintf(&str[strlen(str)], "%02x", data[i]);
+        if ((i & 0x1f) == 0x1f) {
+            sprintf(&str[strlen(str)], "\n");
+            printk(str);
+            continue;
+        }
+        if ((i & 0x3) == 0x3) {
+            sprintf(&str[strlen(str)], " ");
+        }
+    }
+    if ((i & 0x1f) != 0) {
+        sprintf(&str[strlen(str)], "\n");
+        printk(str);
+    }
+    printk("\n");
+}
+
+/*!
+ * Rx packets rate test for debug
+ */
+static void
+ngknet_pkt_stats(struct pdma_dev *pdev, int dir)
+{
+    static struct timeval tv0[2], tv1[2];
+    static uint32_t pkts[2] = {0}, prts[2] = {0};
+    static uint64_t intrs = 0;
+
+    if (pkts[dir] == 0) {
+        kal_time_val_get(&tv0[dir]);
+        intrs = pdev->stats.intrs;
+    }
+    if (++pkts[dir] >= 100000) {
+        uint32_t iv_time;
+        uint32_t pps;
+        kal_time_val_get(&tv1[dir]);
+        iv_time = (tv1[dir].tv_sec - tv0[dir].tv_sec) * 1000000 +
+                  (tv1[dir].tv_usec - tv0[dir].tv_usec);
+        pps = 100000 * 1000 / (iv_time / 1000);
+        prts[dir]++;
+        if (pps <= 100000 || prts[dir] * 100000 >= pps) {
+            printk(KERN_CRIT "%s -- limit: %d pps, 100K pkts time: %d usec, rate: %d pps, intrs: %llu\n",
+                   dir == PDMA_Q_RX ? "Rx" : "Tx",
+                   dir == PDMA_Q_RX ? rx_rate_limit : -1,
+                   iv_time, pps, pdev->stats.intrs - intrs);
+            prts[dir] = 0;
+        }
+        pkts[dir] = 0;
+    }
+}
+
+/*!
+ * Read 32-bit register callback
+ */
+static int
+ngknet_dev_read32(struct pdma_dev *dev, uint32_t addr, uint32_t *data)
+{
+    *data = ngbde_kapi_pio_read32(dev->unit, addr);
+
+    return 0;
+}
+
+/*!
+ * Write 32-bit register callback
+ */
+static int
+ngknet_dev_write32(struct pdma_dev *dev, uint32_t addr, uint32_t data)
+{
+    ngbde_kapi_pio_write32(dev->unit, addr, data);
+
+    return 0;
+}
+
+/*!
+ * Set Rx HW timestamping.
+ */
+static int
+ngknet_ptp_rx_hwts_set(struct net_device *ndev, struct sk_buff *skb)
+{
+    struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
+    uint64_t ts = 0;
+    int rv;
+
+    rv = ngknet_ptp_rx_hwts_get(ndev, skb, &ts);
+    if (SHR_FAILURE(rv) || !ts) {
+        return SHR_E_FAIL;
+    }
+
+    memset(shhwtstamps, 0, sizeof(*shhwtstamps));
+    shhwtstamps->hwtstamp = ns_to_ktime(ts);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Process Rx packet.
+ *
+ * Add RCPU encapsulation or strip matadata if needed
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] oskb Rx packet SKB.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_rx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct sk_buff *skb = *oskb;
+    struct ngknet_rcpu_hdr *rch = (struct ngknet_rcpu_hdr *)skb->data;
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+    uint8_t meta_len = pkh->meta_len;
+
+    /* Do Rx timestamping */
+    if (priv->hwts_rx_filter) {
+        ngknet_ptp_rx_hwts_set(ndev, skb);
+    }
+
+    /* Remove FCS from packet length */
+    skb_trim(skb, skb->len - ETH_FCS_LEN);
+    pkh->data_len -= ETH_FCS_LEN;
+
+    if (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) {
+        /* Set up RCPU header */
+        memcpy(skb->data, skb->data + PKT_HDR_SIZE + meta_len, 2 * ETH_ALEN);
+        if (*(uint32_t *)&dev->rcpu_ctrl.dst_mac[0] != 0 ||
+            *(uint16_t *)&dev->rcpu_ctrl.dst_mac[4] != 0) {
+            memcpy(rch->dst_mac, dev->rcpu_ctrl.dst_mac, ETH_ALEN);
+        }
+        if (*(uint32_t *)&dev->rcpu_ctrl.src_mac[0] != 0 ||
+            *(uint16_t *)&dev->rcpu_ctrl.src_mac[4] != 0) {
+            memcpy(rch->src_mac, dev->rcpu_ctrl.src_mac, ETH_ALEN);
+        }
+        rch->vlan_tpid = htons(dev->rcpu_ctrl.vlan_tpid);
+        rch->vlan_tci = htons(dev->rcpu_ctrl.vlan_tci);
+        rch->eth_type = htons(dev->rcpu_ctrl.eth_type);
+        rch->pkt_sig = htons(dev->rcpu_ctrl.pkt_sig);
+        rch->op_code = RCPU_OPCODE_RX;
+        rch->flags = RCPU_FLAG_MODHDR;
+        rch->trans_id = htons(dev->rcpu_ctrl.trans_id);
+        rch->data_len = htons(pkh->data_len);
+    } else {
+        /* Remove packet header and meta data */
+        skb_pull(skb, PKT_HDR_SIZE + meta_len);
+    }
+
+    /* Optional callback handle */
+    if (dev->cbc->rx_cb) {
+        struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+        cbd->dev_no = dev->dev_no;
+        cbd->dev_id = dev->pdma_dev.dev_id;
+        cbd->type_str = drv_ops[dev->pdma_dev.dev_type]->drv_desc;
+        cbd->priv = priv;
+        if (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) {
+            cbd->pmd = skb->data + PKT_HDR_SIZE;
+            cbd->pkt_len = ntohs(rch->data_len);
+        } else {
+            cbd->pmd = skb->data - meta_len;
+            cbd->pkt_len = pkh->data_len;
+        }
+        cbd->pmd_len = meta_len;
+        skb = dev->cbc->rx_cb(skb);
+        if (!skb) {
+            *oskb = NULL;
+            return SHR_E_UNAVAIL;
+        }
+        if (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) {
+            rch = (struct ngknet_rcpu_hdr *)skb->data;
+            rch->data_len = htons(skb->len - PKT_HDR_SIZE - meta_len);
+        }
+    }
+
+    /* Update SKB pointer */
+    *oskb = skb;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Network interface Rx function.
+ *
+ * After processing the packet, send it up to network stack.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] skb Rx packet SKB.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_netif_recv(struct net_device *ndev, struct sk_buff *skb)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+    struct napi_struct *napi = NULL;
+    uint16_t proto;
+    int chan, gi, qi;
+    int rv;
+
+    /* Handle one incoming packet */
+    rv = ngknet_rx_frame_process(ndev, &skb);
+    if (SHR_FAILURE(rv)) {
+        if (!skb) {
+            return SHR_E_NONE;
+        }
+    }
+
+    DBG_VERB(("Rx packet sent up to ndev%d (%d bytes).\n", priv->id, skb->len));
+    if (debug & DBG_LVL_PDMP) {
+        ngknet_pkt_dump(skb->data, skb->len);
+    }
+
+    if (ndev->features & NETIF_F_RXCSUM) {
+        if ((pkh->attrs & (PDMA_RX_TU_CSUM | PDMA_RX_IP_CSUM)) ==
+            (PDMA_RX_TU_CSUM | PDMA_RX_IP_CSUM)) {
+            skb->ip_summed = CHECKSUM_UNNECESSARY;
+        } else {
+            skb_checksum_none_assert(skb);
+        }
+    }
+
+    if (!(priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) &&
+        ndev->features & NETIF_F_HW_VLAN_CTAG_RX &&
+        pkh->attrs & PDMA_RX_STRIP_TAG) {
+        kal_vlan_hwaccel_put_tag(skb, ETH_P_8021Q, priv->vlan);
+    }
+
+    proto = eth_type_trans(skb, ndev);
+    if (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) {
+        skb->protocol = htons(dev->rcpu_ctrl.eth_type);
+    } else if (!(pkh->attrs & PDMA_RX_SET_PROTO) || !skb->protocol) {
+        skb->protocol = proto;
+    }
+
+    skb_record_rx_queue(skb, pkh->queue_id);
+
+    bcmcnet_pdma_dev_queue_to_chan(pdev, pkh->queue_id, PDMA_Q_RX, &chan);
+    gi = chan / pdev->grp_queues;
+    if (pdev->flags & PDMA_GROUP_INTR) {
+        napi = (struct napi_struct *)pdev->ctrl.grp[gi].intr_hdl[0].priv;
+    } else {
+        qi = pkh->queue_id;
+        napi = (struct napi_struct *)pdev->ctrl.grp[gi].intr_hdl[qi].priv;
+    }
+    napi_gro_receive(napi, skb);
+
+    /* Update accounting */
+    priv->stats.rx_packets++;
+    priv->stats.rx_bytes += skb->len;
+
+    /* Rate limit */
+    if (rx_rate_limit >= 0) {
+        if (!ngknet_rx_rate_limit_started()) {
+            ngknet_rx_rate_limit_start(dev);
+        }
+        ngknet_rx_rate_limit(dev, rx_rate_limit);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Driver Rx callback.
+ *
+ * After processing the packet, send it up to network stack.
+ *
+ * \param [in] pdev Packet DMA device structure point.
+ * \param [in] buf Raw Rx buffer.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_frame_recv(struct pdma_dev *pdev, int queue, void *buf)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    struct sk_buff *skb = (struct sk_buff *)buf, *mskb = NULL;
+    struct net_device *ndev = NULL, *mndev = NULL;
+    struct ngknet_private *priv = NULL;
+    unsigned long flags;
+    int rv;
+
+    DBG_VERB(("Rx packet (%d bytes).\n", skb->len));
+    if (debug & DBG_LVL_PDMP) {
+        ngknet_pkt_dump(skb->data, skb->len);
+    }
+
+    /* Go through the filters */
+    rv = ngknet_rx_pkt_filter(dev, skb, &ndev, &mndev, &mskb);
+    if (SHR_FAILURE(rv) || !ndev) {
+        return SHR_E_FAIL;
+    }
+
+    /* Populate header, checksum status, VLAN, and protocol */
+    priv = netdev_priv(ndev);
+    if (netif_carrier_ok(ndev)) {
+        ngknet_netif_recv(ndev, skb);
+    } else {
+        priv->stats.rx_dropped++;
+        rv = SHR_E_UNAVAIL;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+    priv->users--;
+    if (!priv->users && priv->wait) {
+        wake_up(&dev->wq);
+    }
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    /* Handle mirrored packet */
+    if (mndev && mskb) {
+        priv = netdev_priv(mndev);
+        if (netif_carrier_ok(mndev)) {
+            ngknet_netif_recv(mndev, mskb);
+        } else {
+            priv->stats.rx_dropped++;
+            dev_kfree_skb_any(mskb);
+        }
+        spin_lock_irqsave(&dev->lock, flags);
+        priv->users--;
+        if (!priv->users && priv->wait) {
+            wake_up(&dev->wq);
+        }
+        spin_unlock_irqrestore(&dev->lock, flags);
+    }
+
+    /* Measure speed */
+    if (debug & DBG_LVL_RATE) {
+        ngknet_pkt_stats(pdev, PDMA_Q_RX);
+    }
+
+    return rv;
+}
+
+/*!
+ * Set Tx HW timestamping.
+ */
+static int
+ngknet_ptp_tx_hwts_set(struct net_device *ndev, struct sk_buff *skb)
+{
+    struct skb_shared_hwtstamps shhwtstamps;
+    uint64_t ts = 0;
+    int rv;
+
+    rv = ngknet_ptp_tx_hwts_get(ndev, skb, &ts);
+    if (SHR_FAILURE(rv) || !ts) {
+        return SHR_E_FAIL;
+    }
+
+    memset(&shhwtstamps, 0, sizeof(shhwtstamps));
+    shhwtstamps.hwtstamp = ns_to_ktime(ts);
+    skb_tstamp_tx(skb, &shhwtstamps);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * PTP Tx worker.
+ */
+static void
+ngknet_ptp_tx_work(struct work_struct *work)
+{
+    struct ngknet_dev *dev = container_of(work, struct ngknet_dev, ptp_tx_work);
+    struct sk_buff *skb;
+    int rv;
+
+    while (skb_queue_len(&dev->ptp_tx_queue)) {
+        skb = skb_dequeue(&dev->ptp_tx_queue);
+        rv = ngknet_ptp_tx_hwts_set(dev->net_dev, skb);
+        if (SHR_FAILURE(rv)) {
+            printk("Timestamp value has not been set for current skb.\n");
+        }
+        dev_kfree_skb_any(skb);
+    }
+}
+
+/*!
+ * Config Tx metadata for HW timestamping.
+ */
+static int
+ngknet_ptp_tx_config(struct net_device *ndev, struct sk_buff *skb)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    int rv;
+
+    if (priv->type == NGKNET_NETIF_T_PORT) {
+        rv = ngknet_ptp_tx_meta_set(ndev, skb);
+        if (SHR_FAILURE(rv)) {
+            return rv;
+        }
+    } else if (priv->hwts_tx_type != HWTSTAMP_TX_ONESTEP_SYNC) {
+        return SHR_E_UNAVAIL;
+    }
+
+    skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+
+    if (priv->hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) {
+        skb_queue_tail(&dev->ptp_tx_queue, skb_get(skb));
+        schedule_work(&dev->ptp_tx_work);
+    }
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Process Tx packet.
+ *
+ * Strip RCPU encapsulation, setup CNET packet buffer, add vlan tag
+ * or pad the packet.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] oskb Tx packet SKB.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct sk_buff *skb = *oskb;
+    struct ngknet_rcpu_hdr *rch = (struct ngknet_rcpu_hdr *)skb->data;
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+    struct sk_buff *nskb = NULL;
+    char *data = NULL;
+    uint32_t copy_len, meta_len, data_len, pkt_len, tag_len;
+    uint16_t tpid;
+
+    /* Set up packet header */
+    if (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP) {
+        /* RCPU encapsulation packet */
+        data_len = pkh->attrs & PDMA_TX_HDR_COOKED ?
+                   pkh->data_len - ETH_FCS_LEN : ntohs(rch->data_len);
+        pkt_len = PKT_HDR_SIZE + rch->meta_len + data_len;
+        if (skb->len != pkt_len || skb->len < (PKT_HDR_SIZE + 14)) {
+            DBG_WARN(("Tx drop: Invalid RCPU encapsulation\n"));
+            return SHR_E_FAIL;
+        }
+        if (dev->rcpu_ctrl.pkt_sig && dev->rcpu_ctrl.pkt_sig != ntohs(rch->pkt_sig)) {
+            DBG_WARN(("Tx drop: Invalid RCPU signature\n"));
+            return SHR_E_FAIL;
+        }
+        if (pkh->attrs & PDMA_TX_HDR_COOKED) {
+            /* Resumed packet */
+            return SHR_E_NONE;
+        }
+        pkh->data_len = data_len + ETH_FCS_LEN;
+        pkh->meta_len = rch->meta_len;
+        pkh->attrs = 0;
+        if (rch->flags & RCPU_FLAG_MODHDR) {
+            pkh->attrs |= PDMA_TX_HIGIG_PKT;
+        }
+        if (rch->flags & RCPU_FLAG_PAUSE) {
+            pkh->attrs |= PDMA_TX_PAUSE_PKT;
+        }
+        if (rch->flags & RCPU_FLAG_PURGE) {
+            pkh->attrs |= PDMA_TX_PURGE_PKT;
+        }
+        if (rch->flags & RCPU_FLAG_BIND_QUE) {
+            pkh->attrs |= PDMA_TX_BIND_QUE;
+        }
+    } else {
+        /* Non-RCPU encapsulation packet */
+        data_len = pkh->data_len - ETH_FCS_LEN;
+        pkt_len = PKT_HDR_SIZE + pkh->meta_len + data_len;
+        if (skb->len == pkt_len && pkh->attrs & PDMA_TX_HDR_COOKED &&
+            pkh->pkt_sig == dev->rcpu_ctrl.pkt_sig) {
+            /* Resumed packet */
+            return SHR_E_NONE;
+        }
+        meta_len = 0;
+        if (priv->type == NGKNET_NETIF_T_PORT) {
+            meta_len = priv->meta_len;
+            if (!meta_len) {
+                printk("Tx abort: no metadata\n");
+                return SHR_E_UNAVAIL;
+            }
+        }
+        if (skb_header_cloned(skb) ||
+            skb_headroom(skb) < (PKT_HDR_SIZE + meta_len + VLAN_HLEN) ||
+            skb_tailroom(skb) < ETH_FCS_LEN) {
+            nskb = skb_copy_expand(skb, PKT_HDR_SIZE + meta_len + VLAN_HLEN,
+                                   ETH_FCS_LEN, GFP_ATOMIC);
+            if (!nskb) {
+                return SHR_E_MEMORY;
+            }
+            skb_shinfo(nskb)->tx_flags = skb_shinfo(skb)->tx_flags;
+            skb = nskb;
+        }
+        skb_push(skb, PKT_HDR_SIZE + meta_len);
+        memset(skb->data, 0, PKT_HDR_SIZE + meta_len);
+        pkh = (struct pkt_hdr *)skb->data;
+        pkh->data_len = skb->len - PKT_HDR_SIZE - meta_len + ETH_FCS_LEN;
+        pkh->meta_len = meta_len;
+        pkh->attrs = 0;
+        if (priv->type == NGKNET_NETIF_T_PORT) {
+            /* Send to physical port using netif metadata */
+            if (priv->meta_off) {
+                memmove(skb->data + PKT_HDR_SIZE, skb->data + PKT_HDR_SIZE + meta_len, priv->meta_off);
+            }
+            memcpy(skb->data + PKT_HDR_SIZE + priv->meta_off, priv->meta_data, priv->meta_len);
+            pkh->attrs |= PDMA_TX_HIGIG_PKT;
+        }
+        pkh->pkt_sig = dev->rcpu_ctrl.pkt_sig;
+    }
+
+    /* Packet header done here */
+    pkh->attrs |= PDMA_TX_HDR_COOKED;
+
+    data = skb->data + PKT_HDR_SIZE + pkh->meta_len;
+    tpid = data[12] << 8 | data[13];
+    tag_len = (tpid == ETH_P_8021Q || tpid == ETH_P_8021AD) ? VLAN_HLEN : 0;
+
+    /* Need to add VLAN tag if packet is untagged */
+    if (!tag_len && (!(pkh->attrs & PDMA_TX_HIGIG_PKT) || priv->flags & NGKNET_NETIF_F_ADD_TAG)) {
+        copy_len = PKT_HDR_SIZE + pkh->meta_len + 2 * ETH_ALEN;
+        if (skb_header_cloned(skb) || skb_headroom(skb) < VLAN_HLEN) {
+            nskb = skb_copy_expand(skb, VLAN_HLEN, 0, GFP_ATOMIC);
+            if (!nskb) {
+                return SHR_E_MEMORY;
+            }
+            skb_shinfo(nskb)->tx_flags = skb_shinfo(skb)->tx_flags;
+            skb = nskb;
+        }
+        skb_push(skb, VLAN_HLEN);
+        memmove(skb->data, skb->data + VLAN_HLEN, copy_len);
+        pkh = (struct pkt_hdr *)skb->data;
+        data = skb->data + PKT_HDR_SIZE + pkh->meta_len;
+        data[12] = 0x81;
+        data[13] = 0x00;
+        data[14] = priv->vlan >> 8 & 0xf;
+        data[15] = priv->vlan & 0xff;
+        pkh->data_len += VLAN_HLEN;
+        tag_len = VLAN_HLEN;
+    }
+
+    /* Optional callback handle */
+    if (dev->cbc->tx_cb) {
+        struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+        cbd->dev_no = dev->dev_no;
+        cbd->dev_id = dev->pdma_dev.dev_id;
+        cbd->type_str = drv_ops[dev->pdma_dev.dev_type]->drv_desc;
+        cbd->priv = priv;
+        cbd->pmd = skb->data + PKT_HDR_SIZE;
+        cbd->pmd_len = pkh->meta_len;
+        cbd->pkt_len = skb->len - PKT_HDR_SIZE - pkh->meta_len;
+        skb = dev->cbc->tx_cb(skb);
+        if (!skb) {
+            if (!nskb) {
+                *oskb = NULL;
+            }
+            return SHR_E_UNAVAIL;
+        }
+        pkh = (struct pkt_hdr *)skb->data;
+        pkh->data_len = skb->len - PKT_HDR_SIZE - pkh->meta_len + ETH_FCS_LEN;
+    }
+
+    /* Pad packet if needed */
+    if (pkh->data_len < (64 + tag_len)) {
+        pkh->data_len = 64 + tag_len;
+        if (skb_padto(skb, PKT_HDR_SIZE + pkh->meta_len + pkh->data_len - ETH_FCS_LEN)) {
+            if (!nskb) {
+                *oskb = NULL;
+            }
+            return SHR_E_MEMORY;
+        }
+    }
+
+    /* Update SKB pointer */
+    *oskb = skb;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Suspend Tx queue callback
+ */
+static void
+ngknet_tx_suspend(struct pdma_dev *pdev, int queue)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    unsigned long flags;
+    int vdi;
+
+    netif_stop_subqueue(dev->net_dev, queue);
+
+    spin_lock_irqsave(&dev->lock, flags);
+    for (vdi = 1; vdi <= NUM_VDEV_MAX; vdi++) {
+        if (!dev->vdev[vdi]) {
+            continue;
+        }
+        netif_stop_subqueue(dev->vdev[vdi], queue);
+    }
+    spin_unlock_irqrestore(&dev->lock, flags);
+}
+
+/*!
+ * Resume Tx queue callback
+ */
+static void
+ngknet_tx_resume(struct pdma_dev *pdev, int queue)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    unsigned long flags;
+    int vdi;
+
+    if (__netif_subqueue_stopped(dev->net_dev, queue)) {
+        netif_wake_subqueue(dev->net_dev, queue);
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+    for (vdi = 1; vdi <= NUM_VDEV_MAX; vdi++) {
+        if (!dev->vdev[vdi]) {
+            continue;
+        }
+        if (__netif_subqueue_stopped(dev->vdev[vdi], queue)) {
+            netif_wake_subqueue(dev->vdev[vdi], queue);
+        }
+    }
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    if (pdev->mode == DEV_MODE_HNET) {
+        atomic_set(&dev->hnet_active, 1);
+        wake_up_interruptible(&dev->hnet_wq);
+    }
+}
+
+/*!
+ * Enable interrupt callback
+ */
+static void
+ngknet_intr_enable(struct pdma_dev *pdev, int cmc, int chan,
+                   uint32_t reg, uint32_t mask)
+{
+    pdev->ctrl.grp[cmc].irq_mask |= mask;
+    ngbde_kapi_intr_mask_write(pdev->unit, 0, reg, pdev->ctrl.grp[cmc].irq_mask);
+}
+
+/*!
+ * Disable interrupt callback
+ */
+static void
+ngknet_intr_disable(struct pdma_dev *pdev, int cmc, int chan,
+                    uint32_t reg, uint32_t mask)
+{
+    pdev->ctrl.grp[cmc].irq_mask &= ~mask;
+    ngbde_kapi_intr_mask_write(pdev->unit, 0, reg, pdev->ctrl.grp[cmc].irq_mask);
+}
+
+/*!
+ * NAPI polling function
+ */
+static int
+ngknet_poll(struct napi_struct *napi, int budget)
+{
+    struct ngknet_intr_handle *kih = (struct ngknet_intr_handle *)napi;
+    struct intr_handle *hdl = kih->hdl;
+    struct pdma_dev *pdev = (struct pdma_dev *)hdl->dev;
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    unsigned long flags;
+    int work_done;
+
+    DBG_NAPI(("Scheduled NAPI on queue %d.\n", hdl->queue));
+
+    kih->napi_resched = 0;
+    kih->napi_pending = 0;
+
+    if (pdev->flags & PDMA_GROUP_INTR) {
+        work_done = bcmcnet_group_poll(pdev, hdl->group, budget);
+    } else {
+        work_done = bcmcnet_queue_poll(pdev, hdl, budget);
+    }
+
+    if (work_done < budget) {
+        napi_complete(napi);
+        if (kih->napi_pending && napi_schedule_prep(napi)) {
+            __napi_schedule(napi);
+            return work_done;
+        }
+        spin_lock_irqsave(&dev->lock, flags);
+        if (!kih->napi_resched) {
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                bcmcnet_group_intr_enable(pdev, hdl->group);
+            } else {
+                bcmcnet_queue_intr_enable(pdev, hdl);
+            }
+        }
+        spin_unlock_irqrestore(&dev->lock, flags);
+    }
+
+    return work_done;
+}
+
+/*!
+ * NGKNET ISR
+ */
+static int
+ngknet_isr(void *isr_data)
+{
+    struct ngknet_dev *dev = isr_data;
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct intr_handle *hdl = NULL;
+    struct napi_struct *napi = NULL;
+    unsigned long flags;
+    int gi, qi;
+    int iv = 0;
+
+    for (gi = 0; gi < pdev->num_groups; gi++) {
+        if (!pdev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < pdev->grp_queues; qi++) {
+            hdl = &pdev->ctrl.grp[gi].intr_hdl[qi];
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                if (!bcmcnet_group_intr_check(pdev, gi)) {
+                    break;
+                }
+            } else {
+                if (!bcmcnet_queue_intr_check(pdev, hdl)) {
+                    continue;
+                }
+            }
+            spin_lock_irqsave(&dev->lock, flags);
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                bcmcnet_group_intr_disable(pdev, gi);
+            } else {
+                bcmcnet_queue_intr_disable(pdev, hdl);
+            }
+            spin_unlock_irqrestore(&dev->lock, flags);
+            napi = (struct napi_struct *)hdl->priv;
+            if (likely(napi_schedule_prep(napi))) {
+                __napi_schedule(napi);
+            }
+            iv++;
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                break;
+            }
+        }
+    }
+
+    if (iv) {
+        DBG_IRQ(("Got interrupt on device %d.\n", dev->dev_no));
+        pdev->stats.intrs++;
+        return IRQ_HANDLED;
+    } else {
+        return IRQ_NONE;
+    }
+}
+
+/*!
+ * Hypervisor network work handler
+ */
+static void
+ngknet_dev_hnet_work(struct pdma_dev *pdev)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    struct intr_handle *hdl = NULL;
+    struct napi_struct *napi = NULL;
+    struct ngknet_intr_handle *kih = NULL;
+    unsigned long flags;
+    int gi, qi;
+
+    for (gi = 0; gi < pdev->num_groups; gi++) {
+        if (!pdev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < pdev->grp_queues; qi++) {
+            hdl = &pdev->ctrl.grp[gi].intr_hdl[qi];
+            napi = (struct napi_struct *)hdl->priv;
+            kih = (struct ngknet_intr_handle *)napi;
+            kih->napi_pending = 1;
+            if (napi_schedule_prep(napi)) {
+                spin_lock_irqsave(&dev->lock, flags);
+                kih->napi_resched = 1;
+                spin_unlock_irqrestore(&dev->lock, flags);
+                local_bh_disable();
+                __napi_schedule(napi);
+                local_bh_enable();
+            }
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                break;
+            }
+        }
+    }
+}
+
+/*!
+ * Hypervisor network wait handler
+ */
+static int
+ngknet_dev_hnet_wait(struct pdma_dev *pdev)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+    int qi;
+    int rv;
+
+    while (!kthread_should_stop()) {
+        wait_event_interruptible(dev->hnet_wq,
+                                 atomic_read(&dev->hnet_active) != 0);
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            schedule_timeout(HZ);
+            continue;
+        }
+        atomic_set(&dev->hnet_active, 0);
+        for (qi = 0; qi < pdev->ctrl.nb_txq; qi++) {
+            do {
+                rv = pdev->pkt_xmit(pdev, qi, 0);
+            } while (rv == SHR_E_NONE);
+        }
+        schedule_work(&dev->hnet_work);
+    }
+
+    return 0;
+}
+
+/*!
+ * Hypervisor network wake handler
+ */
+static int
+ngknet_dev_vnet_wake(struct pdma_dev *pdev)
+{
+    struct ngknet_dev *dev = (struct ngknet_dev *)pdev->priv;
+
+    atomic_set(&dev->vnet_active, 1);
+    wake_up_interruptible(&dev->vnet_wq);
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * Hypervisor network process
+ */
+static int
+ngknet_dev_hnet_process(void *data)
+{
+    return ngknet_dev_hnet_wait((struct pdma_dev *)data);
+}
+
+/*!
+ * Hypervisor network schedule
+ */
+static void
+ngknet_dev_hnet_schedule(struct work_struct *work)
+{
+    struct ngknet_dev *dev = container_of(work, struct ngknet_dev, hnet_work);
+
+    ngknet_dev_hnet_work(&dev->pdma_dev);
+}
+
+/*!
+ * Convert physical address to virtual address
+ */
+static void *
+ngknet_sys_p2v(struct pdma_dev *pdev, uint64_t paddr)
+{
+    return ngbde_kapi_dma_bus_to_virt(pdev->unit, (dma_addr_t)paddr);
+}
+
+/*!
+ * Convert virtual address to physical address
+ */
+static uint64_t
+ngknet_sys_v2p(struct pdma_dev *pdev, void *vaddr)
+{
+    return (uint64_t)ngbde_kapi_dma_virt_to_bus(pdev->unit, vaddr);
+}
+
+/*!
+ * Open network device
+ */
+static int
+ngknet_enet_open(struct net_device *ndev)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct napi_struct *napi = NULL;
+    unsigned long bm_queue;
+    int gi, qi;
+    int rv;
+
+    if (!pdev->ctrl.bm_rxq || !pdev->ctrl.bm_txq) {
+        printk("Not config Rx or Tx queue yet!\n");
+        return -EPERM;
+    }
+
+    if (priv->id <= 0) {
+        /* Register interrupt handler */
+        ngbde_kapi_intr_connect(dev->dev_no, 0, ngknet_isr, dev);
+
+        /* Start PDMA device */
+        rv = bcmcnet_pdma_dev_start(pdev);
+        if (SHR_FAILURE(rv)) {
+            ngbde_kapi_intr_disconnect(dev->dev_no, 0);
+            return -EPERM;
+        }
+
+        /* Start rate limit */
+        if (rx_rate_limit >= 0) {
+            ngknet_rx_rate_limit_start(dev);
+        }
+
+        /* Notify the stack of the actual queue counts. */
+        rv = netif_set_real_num_rx_queues(dev->net_dev, pdev->ctrl.nb_rxq);
+        if (rv < 0) {
+            ngbde_kapi_intr_disconnect(dev->dev_no, 0);
+            return rv;
+        }
+        rv = netif_set_real_num_tx_queues(dev->net_dev, pdev->ctrl.nb_txq);
+        if (rv < 0) {
+            ngbde_kapi_intr_disconnect(dev->dev_no, 0);
+            return rv;
+        }
+
+        for (gi = 0; gi < pdev->num_groups; gi++) {
+            if (!pdev->ctrl.grp[gi].attached) {
+                continue;
+            }
+            bm_queue = pdev->ctrl.grp[gi].bm_rxq | pdev->ctrl.grp[gi].bm_txq;
+            for (qi = 0; qi < pdev->grp_queues; qi++) {
+                napi = (struct napi_struct *)pdev->ctrl.grp[gi].intr_hdl[qi].priv;
+                if (pdev->flags & PDMA_GROUP_INTR) {
+                    napi_enable(napi);
+                    break;
+                }
+                if (1 << qi & bm_queue) {
+                    napi_enable(napi);
+                }
+            }
+        }
+    } else {
+        /* Notify the stack of the actual queue counts. */
+        rv = netif_set_real_num_rx_queues(ndev, pdev->ctrl.nb_rxq);
+        if (rv < 0) {
+            return rv;
+        }
+        rv = netif_set_real_num_tx_queues(ndev, pdev->ctrl.nb_txq);
+        if (rv < 0) {
+            return rv;
+        }
+    }
+
+    /* Prevent tx timeout */
+    kal_netif_trans_update(ndev);
+
+    netif_tx_wake_all_queues(ndev);
+
+    return 0;
+}
+
+/*!
+ * Stop network device
+ */
+static int
+ngknet_enet_stop(struct net_device *ndev)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct napi_struct *napi = NULL;
+    unsigned long bm_queue;
+    int gi, qi;
+
+    netif_tx_stop_all_queues(ndev);
+
+    if (priv->id <= 0) {
+        /* Stop rate limit */
+        if (rx_rate_limit >= 0) {
+            ngknet_rx_rate_limit_stop(dev);
+        }
+
+        /* Suspend PDMA device */
+        bcmcnet_pdma_dev_suspend(pdev);
+
+        for (gi = 0; gi < pdev->num_groups; gi++) {
+            if (!pdev->ctrl.grp[gi].attached) {
+                continue;
+            }
+            bm_queue = pdev->ctrl.grp[gi].bm_rxq | pdev->ctrl.grp[gi].bm_txq;
+            for (qi = 0; qi < pdev->grp_queues; qi++) {
+                napi = (struct napi_struct *)pdev->ctrl.grp[gi].intr_hdl[qi].priv;
+                if (pdev->flags & PDMA_GROUP_INTR) {
+                    napi_disable(napi);
+                    break;
+                }
+                if (1 << qi & bm_queue) {
+                    napi_disable(napi);
+                }
+            }
+        }
+
+        /* Stop PDMA device */
+        bcmcnet_pdma_dev_stop(pdev);
+
+        /* Unregister interrupt handler */
+        ngbde_kapi_intr_disconnect(dev->dev_no, 0);
+    }
+
+    return 0;
+}
+
+/*!
+ * Start transmission
+ */
+static int
+ngknet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct sk_buff *bskb = skb;
+    uint32_t len = skb->len;
+    int queue;
+    int rv;
+
+    DBG_VERB(("Tx packet from ndev%d (%d bytes).\n", priv->id, skb->len));
+    if (debug & DBG_LVL_PDMP) {
+        ngknet_pkt_dump(skb->data, skb->len);
+    }
+
+    /* Do not transmit on base device */
+    if (priv->id <= 0) {
+        priv->stats.tx_dropped++;
+        dev_kfree_skb_any(skb);
+        return NETDEV_TX_OK;
+    }
+
+    /* Measure speed */
+    if (debug & DBG_LVL_RATE) {
+        ngknet_pkt_stats(pdev, PDMA_Q_TX);
+    }
+
+    queue = skb->queue_mapping;
+
+    /* Handle one outgoing packet */
+    rv = ngknet_tx_frame_process(ndev, &skb);
+    if (SHR_FAILURE(rv)) {
+        priv->stats.tx_dropped++;
+        if (skb) {
+            dev_kfree_skb_any(skb);
+        }
+        return NETDEV_TX_OK;
+    }
+
+    /* Schedule Tx queue */
+    ngknet_tx_queue_schedule(dev, skb, &queue);
+    skb->queue_mapping = queue;
+
+    DBG_VERB(("Tx packet (%d bytes).\n", skb->len));
+    if (debug & DBG_LVL_PDMP) {
+        ngknet_pkt_dump(skb->data, skb->len);
+    }
+
+    /* Do Tx timestamping */
+    if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) {
+        ngknet_ptp_tx_config(ndev, skb);
+    }
+
+    skb_tx_timestamp(skb);
+
+    rv = pdev->pkt_xmit(pdev, queue, skb);
+
+    if (rv == SHR_E_UNAVAIL) {
+        DBG_WARN(("Tx drop: DMA device not ready\n"));
+        priv->stats.tx_dropped++;
+        if (skb != bskb) {
+            dev_kfree_skb_any(skb);
+        }
+        dev_kfree_skb_any(bskb);
+        return NETDEV_TX_OK;
+    }
+
+    if (rv == SHR_E_BUSY) {
+        DBG_WARN(("Tx suspend: No DMA resources\n"));
+        priv->stats.tx_fifo_errors++;
+        if (skb != bskb) {
+            dev_kfree_skb_any(skb);
+        }
+        return NETDEV_TX_BUSY;
+    } else {
+        if (skb != bskb) {
+            dev_kfree_skb_any(bskb);
+        }
+    }
+
+    /* Update accounting */
+    priv->stats.tx_packets++;
+    priv->stats.tx_bytes += len;
+
+    return NETDEV_TX_OK;
+}
+
+/*!
+ * Get network device stats
+ */
+static struct net_device_stats *
+ngknet_get_stats(struct net_device *ndev)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+
+    return &priv->stats;
+}
+
+/*!
+ * Set network device MC list
+ */
+static void
+ngknet_set_multicast_list(struct net_device *ndev)
+{
+    return;
+}
+
+/*!
+ * Set network device MAC address
+ */
+static int
+ngknet_set_mac_address(struct net_device *ndev, void *addr)
+{
+    if (!is_valid_ether_addr(((struct sockaddr *)addr)->sa_data)) {
+        return -EINVAL;
+    }
+
+    netdev_info(ndev, "Setting new MAC address\n");
+    memcpy(ndev->dev_addr, ((struct sockaddr *)addr)->sa_data, ndev->addr_len);
+
+    return 0;
+}
+
+/*!
+ * Change network device MTU
+ */
+static int
+ngknet_change_mtu(struct net_device *ndev, int new_mtu)
+{
+    int frame_size = new_mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
+
+    if (frame_size < 68 || frame_size > rx_buffer_size) {
+        return -EINVAL;
+    }
+
+    netdev_info(ndev, "Changing MTU from %d to %d\n", ndev->mtu, new_mtu);
+    ndev->mtu = new_mtu;
+
+    return 0;
+}
+
+/*!
+ * Do I/O control
+ */
+static int
+ngknet_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct hwtstamp_config config;
+    int rv;
+
+    if (cmd == SIOCSHWTSTAMP) {
+        if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) {
+            return -EFAULT;
+        }
+
+        if (priv->type != NGKNET_NETIF_T_PORT) {
+            return -ENOSYS;
+        }
+
+        switch (config.tx_type) {
+        case HWTSTAMP_TX_OFF:
+            priv->hwts_tx_type = HWTSTAMP_TX_OFF;
+            rv = ngknet_ptp_tx_config_set(ndev, priv->hwts_tx_type);
+            if (SHR_FAILURE(rv)) {
+                return -ENOSYS;
+            }
+            break;
+        case HWTSTAMP_TX_ON:
+            priv->hwts_tx_type = HWTSTAMP_TX_ON;
+            rv = ngknet_ptp_tx_config_set(ndev, priv->hwts_tx_type);
+            if (SHR_FAILURE(rv)) {
+                return -ENOSYS;
+            }
+            break;
+        case HWTSTAMP_TX_ONESTEP_SYNC:
+            priv->hwts_tx_type = HWTSTAMP_TX_ONESTEP_SYNC;
+            rv = ngknet_ptp_tx_config_set(ndev, priv->hwts_tx_type);
+            if (SHR_FAILURE(rv)) {
+                return -ENOSYS;
+            }
+            break;
+        default:
+            return -ERANGE;
+        }
+
+        switch (config.rx_filter) {
+        case HWTSTAMP_FILTER_NONE:
+            rv = ngknet_ptp_rx_config_set(ndev, &config.rx_filter);
+            if (SHR_FAILURE(rv)) {
+                return -ENOSYS;
+            }
+            priv->hwts_rx_filter = HWTSTAMP_FILTER_NONE;
+            break;
+        default:
+            rv = ngknet_ptp_rx_config_set(ndev, &config.rx_filter);
+            if (SHR_FAILURE(rv)) {
+                return -ENOSYS;
+            }
+            priv->hwts_rx_filter = config.rx_filter;
+            break;
+        }
+
+        return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0;
+    }
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
+    if (cmd == SIOCGHWTSTAMP) {
+        config.flags = 0;
+        config.tx_type = priv->hwts_tx_type;
+        config.rx_filter = priv->hwts_rx_filter;
+
+        return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0;
+    }
+#endif
+
+    return -EINVAL;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*!
+ * Poll network device
+ */
+static void
+ngknet_poll_controller(struct net_device *ndev)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+
+    disable_irq(ndev->irq);
+    ngknet_isr(priv->bkn_dev);
+    enable_irq(ndev->irq);
+}
+#endif
+
+static const struct net_device_ops ngknet_netdev_ops = {
+    .ndo_open            = ngknet_enet_open,
+    .ndo_stop            = ngknet_enet_stop,
+    .ndo_start_xmit      = ngknet_start_xmit,
+    .ndo_get_stats       = ngknet_get_stats,
+    .ndo_validate_addr   = eth_validate_addr,
+    .ndo_set_rx_mode     = ngknet_set_multicast_list,
+    .ndo_set_mac_address = ngknet_set_mac_address,
+    .ndo_change_mtu      = ngknet_change_mtu,
+    .ndo_set_features    = NULL,
+    .ndo_do_ioctl        = ngknet_do_ioctl,
+    .ndo_tx_timeout      = NULL,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+    .ndo_poll_controller = ngknet_poll_controller,
+#endif
+};
+
+static void
+ngknet_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
+{
+    strlcpy(drvinfo->driver, "linux_ngknet", sizeof(drvinfo->driver));
+    snprintf(drvinfo->version, sizeof(drvinfo->version), "%d", NGKNET_IOC_VERSION);
+    strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+    strlcpy(drvinfo->bus_info, "N/A", sizeof(drvinfo->bus_info));
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+static int
+ngknet_get_ts_info(struct net_device *ndev, struct ethtool_ts_info *info)
+{
+    int rv;
+
+    info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+                            SOF_TIMESTAMPING_TX_SOFTWARE |
+                            SOF_TIMESTAMPING_RX_HARDWARE |
+                            SOF_TIMESTAMPING_RX_SOFTWARE |
+                            SOF_TIMESTAMPING_SOFTWARE |
+                            SOF_TIMESTAMPING_RAW_HARDWARE;
+    info->tx_types = 1 << HWTSTAMP_TX_OFF | 1 << HWTSTAMP_TX_ON | 1 << HWTSTAMP_TX_ONESTEP_SYNC;
+    info->rx_filters = 1 << HWTSTAMP_FILTER_NONE | 1 << HWTSTAMP_FILTER_ALL;
+    rv = ngknet_ptp_phc_index_get(ndev, &info->phc_index);
+    if (SHR_FAILURE(rv)) {
+        info->phc_index = -1;
+    }
+
+    return 0;
+}
+#endif
+
+static const struct ethtool_ops ngknet_ethtool_ops = {
+    .get_drvinfo        = ngknet_get_drvinfo,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+    .get_ts_info        = ngknet_get_ts_info,
+#endif
+};
+
+/*!
+ * \brief Initialize network device.
+ *
+ * \param [in] name Network device name.
+ * \param [in] mac Network device MAC address.
+ * \param [out] nd New registered network device.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_ndev_init(ngknet_netif_t *netif, struct net_device **nd)
+{
+    struct net_device *ndev = NULL;
+    uint8_t *ma;
+    int rv;
+
+    if (!netif) {
+        DBG_WARN(("Network interface is NULL.\n"));
+        return SHR_E_PARAM;
+    }
+    if (!nd) {
+        DBG_WARN(("Network device is NULL.\n"));
+        return SHR_E_PARAM;
+    }
+
+    ndev = alloc_etherdev_mq(sizeof(struct ngknet_private), NUM_QUE_MAX);
+    if (!ndev) {
+        DBG_WARN(("Error allocating network device.\n"));
+        return SHR_E_MEMORY;
+    }
+    if (!ndev->dev_addr) {
+        DBG_WARN(("ndev->dev_addr is NULL\n"));
+        free_netdev(ndev);
+        return SHR_E_INTERNAL;
+    }
+
+    /* Device information -- not available right now */
+    ndev->irq = 0;
+    ndev->base_addr = 0;
+
+    /* Fill in the dev structure */
+    ndev->watchdog_timeo = 5 * HZ;
+
+    /* Default MTU should not exceed MTU of switch front-panel ports */
+    ndev->mtu = netif->mtu;
+    if (!ndev->mtu) {
+        ndev->mtu = default_mtu ? default_mtu : rx_buffer_size;
+    }
+
+    ndev->netdev_ops = &ngknet_netdev_ops;
+    ndev->ethtool_ops = &ngknet_ethtool_ops;
+
+    /* Network device name */
+    if (netif->name && *netif->name) {
+        strncpy(ndev->name, netif->name, IFNAMSIZ - 1);
+    }
+
+    /* Set the device MAC address */
+    ma = netif->macaddr;
+    if ((ma[0] | ma[1] | ma[2] | ma[3] | ma[4] | ma[5]) == 0) {
+        ngknet_dev_mac[5]++;
+        ma = ngknet_dev_mac;
+    }
+    memcpy(ndev->dev_addr, ma, ETH_ALEN);
+
+    /* Initialize the device features */
+    ndev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
+                        NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+    ndev->features |= NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_RX;
+
+    /* Register the kernel network device */
+    rv = register_netdev(ndev);
+    if (rv < 0) {
+        DBG_WARN(("Error registering network device %s.\n", ndev->name));
+        free_netdev(ndev);
+        return SHR_E_FAIL;
+    }
+
+    *nd = ndev;
+
+    DBG_VERB(("Created network device %s.\n", ndev->name));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Initialize Packet DMA device.
+ *
+ * \param [in] dev NGKNET device structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_pdev_init(struct ngknet_dev *dev)
+{
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    int rv;
+
+    /* Initialize PDMA control structure */
+    pdev->unit = dev->dev_no;
+    pdev->priv = dev;
+    pdev->ctrl.dev = pdev;
+    pdev->ctrl.hw_addr = dev->base_addr;
+    pdev->ctrl.rx_buf_size = rx_buffer_size;
+
+    /* Hook callbacks */
+    pdev->dev_read32 = ngknet_dev_read32;
+    pdev->dev_write32 = ngknet_dev_write32;
+    pdev->pkt_recv = ngknet_frame_recv;
+    pdev->tx_suspend = ngknet_tx_suspend;
+    pdev->tx_resume = ngknet_tx_resume;
+    pdev->intr_unmask = ngknet_intr_enable;
+    pdev->intr_mask = ngknet_intr_disable;
+    pdev->xnet_wait = ngknet_dev_hnet_wait;
+    pdev->xnet_wake = ngknet_dev_vnet_wake;
+    pdev->sys_p2v = ngknet_sys_p2v;
+    pdev->sys_v2p = ngknet_sys_v2p;
+
+    pdev->flags |= PDMA_GROUP_INTR;
+    if (tx_polling) {
+        pdev->flags |= PDMA_TX_POLLING;
+    }
+    if (rx_batching || pdev->mode == DEV_MODE_HNET) {
+        pdev->flags |= PDMA_RX_BATCHING;
+    }
+
+    /* Attach PDMA driver */
+    rv = drv_ops[pdev->dev_type]->drv_attach(pdev);
+    if (SHR_FAILURE(rv)) {
+        DBG_WARN(("Attach DMA driver failed.\n"));
+        return rv;
+    }
+
+    /* Initialize PDMA device */
+    rv = bcmcnet_pdma_dev_init(pdev);
+    if (SHR_FAILURE(rv)) {
+        DBG_WARN(("Init DMA device.failed.\n"));
+        return rv;
+    }
+
+    DBG_VERB(("Attached DMA device %s.\n", pdev->name));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Get device information from BDE.
+ *
+ * \param [in] dn Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_dev_info_get(int dn)
+{
+    struct ngknet_dev *dev = &ngknet_devices[dn];
+
+    dev->base_addr = ngbde_kapi_pio_membase(dn);
+    dev->dev = ngbde_kapi_dma_dev_get(dn);
+
+    if (!dev->base_addr || !dev->dev) {
+        return SHR_E_ACCESS;
+    }
+
+    dev->dev_no = dn;
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Probe device.
+ *
+ * Get the information from BDE, initialize Packet DMA device,
+ * initialize base network device and allocate other resources.
+ *
+ * \param [in] dn Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_dev_probe(int dn, ngknet_netif_t *netif)
+{
+    struct ngknet_dev *dev = &ngknet_devices[dn];
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct net_device *ndev = NULL;
+    struct ngknet_private *priv = NULL;
+    struct intr_handle *hdl = NULL;
+    struct cpumask mask;
+    int gi, qi;
+    int rv;
+
+    DBG_VERB(("%s: dev %d\n",__FUNCTION__, dn));
+
+    /* Get device information */
+    rv = ngknet_dev_info_get(dn);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    /* Initialize PDMA device */
+    rv = ngknet_pdev_init(dev);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    /* Get base network device name */
+    if (netif->name[0] == '\0') {
+        /* Reserve 6 vacancies for base&vitual device number, i.e. nameAB_XYZ */
+        if (strlen(base_dev_name) < IFNAMSIZ - 6) {
+            snprintf(netif->name, IFNAMSIZ, "%s%d", base_dev_name, dn);
+        } else {
+            DBG_WARN(("Too long network device name: %s.\n", base_dev_name));
+            return SHR_E_PARAM;
+        }
+    }
+
+    rv = ngknet_ndev_init(netif, &ndev);
+    if (SHR_FAILURE(rv)) {
+        bcmcnet_pdma_dev_cleanup(pdev);
+        return rv;
+    }
+    dev->net_dev = ndev;
+
+    /* Initialize private information for base network device */
+    priv = netdev_priv(ndev);
+    priv->net_dev = ndev;
+    priv->bkn_dev = dev;
+    priv->id = 0;
+    priv->type = netif->type;
+    if (priv->type == NGKNET_NETIF_T_PORT) {
+        priv->meta_off = netif->meta_off;
+        priv->meta_len = netif->meta_len;
+        memcpy(priv->meta_data, netif->meta_data, priv->meta_len);
+    }
+    priv->flags = netif->flags;
+    priv->vlan = netif->vlan;
+    priv->chan = netif->chan;
+    memcpy(priv->user_data, netif->user_data, sizeof(priv->user_data));
+
+    netif->id = priv->id;
+    memcpy(netif->macaddr, ndev->dev_addr, ETH_ALEN);
+    netif->mtu = ndev->mtu;
+    memcpy(netif->name, ndev->name, sizeof(netif->name) - 1);
+
+    if (priv->flags & NGKNET_NETIF_F_BIND_CHAN) {
+        dev->bdev[priv->chan] = ndev;
+    }
+
+    /* Register for napi */
+    for (gi = 0; gi < pdev->num_groups; gi++) {
+        if (!pdev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < pdev->grp_queues; qi++) {
+            hdl = &pdev->ctrl.grp[gi].intr_hdl[qi];
+            priv_hdl[hdl->unit][hdl->chan].hdl = hdl;
+            hdl->priv = &priv_hdl[hdl->unit][hdl->chan];
+            netif_napi_add(ndev, (struct napi_struct *)hdl->priv,
+                           ngknet_poll, pdev->ctrl.budget);
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                break;
+            }
+        }
+    }
+
+    /* Get callback control */
+    ngknet_callback_control_get(&dev->cbc);
+
+    INIT_LIST_HEAD(&dev->filt_list);
+    spin_lock_init(&dev->lock);
+    init_waitqueue_head(&dev->wq);
+    if (pdev->mode == DEV_MODE_HNET) {
+        init_waitqueue_head(&dev->vnet_wq);
+        atomic_set(&dev->vnet_active, 0);
+        init_waitqueue_head(&dev->hnet_wq);
+        atomic_set(&dev->hnet_active, 0);
+        dev->hnet_task = kthread_run(ngknet_dev_hnet_process, pdev, pdev->name);
+        if (IS_ERR(dev->hnet_task)) {
+            dev->hnet_task = NULL;
+            return SHR_E_INTERNAL;
+        }
+        cpumask_clear(&mask);
+        cpumask_set_cpu(1, &mask);
+        set_cpus_allowed_ptr(dev->hnet_task, &mask);
+        INIT_WORK(&dev->hnet_work, ngknet_dev_hnet_schedule);
+    }
+
+    skb_queue_head_init(&dev->ptp_tx_queue);
+    INIT_WORK(&dev->ptp_tx_work, ngknet_ptp_tx_work);
+
+    dev->flags |= NGKNET_DEV_ACTIVE;
+
+    DBG_NDEV(("Broadcom NGKNET Attached\n"));
+    DBG_NDEV(("MAC: %pM\n", ndev->dev_addr));
+    DBG_NDEV(("Running with NAPI enabled\n"));
+
+    return SHR_E_NONE;
+}
+
+/*!
+ * \brief Remove device.
+ *
+ * Suspend device firstly, destroy all virtual network devices
+ * and filters, clean up Packet DMA device.
+ *
+ * \param [in] dn Device number.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+static int
+ngknet_dev_remove(int dn)
+{
+    struct ngknet_dev *dev = &ngknet_devices[dn];
+    struct pdma_dev *pdev = &dev->pdma_dev;
+    struct net_device *ndev = NULL;
+    struct intr_handle *hdl = NULL;
+    int di, gi, qi;
+    int rv;
+
+    if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+        return SHR_E_NONE;
+    }
+
+    DBG_VERB(("%s: dev %d\n",__FUNCTION__, dn));
+
+    dev->flags &= ~NGKNET_DEV_ACTIVE;
+
+    skb_queue_purge(&dev->ptp_tx_queue);
+
+    if (pdev->mode == DEV_MODE_HNET && dev->hnet_task) {
+        atomic_set(&dev->hnet_active, 1);
+        wake_up_interruptible(&dev->hnet_wq);
+        kthread_stop(dev->hnet_task);
+        dev->hnet_task = NULL;
+    }
+
+    /* Destroy all the filters */
+    ngknet_filter_destroy_all(dev);
+
+    /* Destroy all the virtual devices */
+    for (di = 1; di <= NUM_VDEV_MAX; di++) {
+        ndev = dev->vdev[di];
+        if (ndev) {
+            netif_carrier_off(ndev);
+            unregister_netdev(ndev);
+            free_netdev(ndev);
+            dev->vdev[di] = NULL;
+        }
+    }
+    dev->vdev[0] = NULL;
+
+    DBG_VERB(("Removing base network device %s.\n", dev->net_dev->name));
+
+    /* Destroy the base network device */
+    ndev = dev->net_dev;
+    unregister_netdev(ndev);
+    free_netdev(ndev);
+
+    for (qi = 0; qi < NUM_QUE_MAX; qi++) {
+        dev->bdev[qi] = NULL;
+    }
+
+    for (gi = 0; gi < pdev->num_groups; gi++) {
+        if (!pdev->ctrl.grp[gi].attached) {
+            continue;
+        }
+        for (qi = 0; qi < pdev->grp_queues; qi++) {
+            hdl = &pdev->ctrl.grp[gi].intr_hdl[qi];
+            netif_napi_del((struct napi_struct *)hdl->priv);
+            priv_hdl[hdl->unit][hdl->chan].hdl = NULL;
+            if (pdev->flags & PDMA_GROUP_INTR) {
+                break;
+            }
+        }
+    }
+
+    /* Clean up PDMA device */
+    bcmcnet_pdma_dev_cleanup(pdev);
+
+    /* Detach PDMA driver */
+    rv = drv_ops[pdev->dev_type]->drv_detach(pdev);
+    if (SHR_FAILURE(rv)) {
+        DBG_WARN(("Detach DMA driver failed.\n"));
+    }
+
+    return rv;
+}
+
+/*!
+ * Network interface functions
+ */
+
+int
+ngknet_netif_create(struct ngknet_dev *dev, ngknet_netif_t *netif)
+{
+    struct net_device *ndev = NULL;
+    struct ngknet_private *priv = NULL;
+    unsigned long flags;
+    int num, id;
+    int rv;
+
+    switch (netif->type) {
+    case NGKNET_NETIF_T_VLAN:
+    case NGKNET_NETIF_T_PORT:
+    case NGKNET_NETIF_T_META:
+        break;
+    default:
+        return SHR_E_UNAVAIL;
+    }
+
+    /* Get vitual network device name */
+    if (netif->name[0] == '\0') {
+        /* Reserve 6 vacancies for base&vitual device number, i.e. nameAB_XYZ */
+        if (strlen(base_dev_name) < IFNAMSIZ - 6) {
+            snprintf(netif->name, IFNAMSIZ, "%s%d%s", base_dev_name, dev->dev_no, "_");
+            strncat(netif->name, "%d", 3);
+        } else {
+            DBG_WARN(("Too long network device name: %s.\n", base_dev_name));
+            return SHR_E_PARAM;
+        }
+    }
+
+    rv = ngknet_ndev_init(netif, &ndev);
+    if (SHR_FAILURE(rv)) {
+        return rv;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    num = (long)dev->vdev[0];
+    for (id = 1; id < num + 1; id++) {
+        if (!dev->vdev[id]) {
+            break;
+        }
+    }
+    if (id > NUM_VDEV_MAX) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        unregister_netdev(ndev);
+        free_netdev(ndev);
+        return SHR_E_RESOURCE;
+    }
+
+    dev->vdev[id] = ndev;
+    num += id == (num + 1) ? 1 : 0;
+    dev->vdev[0] = (struct net_device *)(long)num;
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    priv = netdev_priv(ndev);
+    priv->net_dev = ndev;
+    priv->bkn_dev = dev;
+    priv->id = id;
+    priv->type = netif->type;
+    if (priv->type == NGKNET_NETIF_T_PORT) {
+        priv->meta_off = netif->meta_off;
+        priv->meta_len = netif->meta_len;
+        memcpy(priv->meta_data, netif->meta_data, priv->meta_len);
+    }
+    priv->flags = netif->flags;
+    priv->vlan = netif->vlan;
+    priv->chan = netif->chan;
+    memcpy(priv->user_data, netif->user_data, sizeof(priv->user_data));
+
+    netif->id = priv->id;
+    memcpy(netif->macaddr, ndev->dev_addr, ETH_ALEN);
+    netif->mtu = ndev->mtu;
+    memcpy(netif->name, ndev->name, sizeof(netif->name) - 1);
+
+    if (priv->flags & NGKNET_NETIF_F_BIND_CHAN) {
+        dev->bdev[priv->chan] = ndev;
+    }
+
+    /* Optional netif create callback handle */
+    if (dev->cbc->netif_create_cb) {
+        rv = dev->cbc->netif_create_cb(ndev);
+        if (rv) {
+            DBG_WARN(("Netif create callback failed with rv %d for '%s'\n", rv, ndev->name));
+        }
+    }
+
+    DBG_VERB(("Created virtual network device %s (%d).\n", ndev->name, priv->id));
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_netif_destroy(struct ngknet_dev *dev, int id)
+{
+    struct net_device *ndev = NULL;
+    struct ngknet_private *priv = NULL;
+    unsigned long flags;
+    int num;
+    DECLARE_WAITQUEUE(wait, current);
+
+    if (id <= 0 || id > NUM_VDEV_MAX) {
+        return SHR_E_PARAM;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    ndev = dev->vdev[id];
+    if (!ndev) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NOT_FOUND;
+    }
+    priv = netdev_priv(ndev);
+
+    add_wait_queue(&dev->wq, &wait);
+
+    while (priv->users) {
+        priv->wait = 1;
+        set_current_state(TASK_INTERRUPTIBLE);
+        spin_unlock_irqrestore(&dev->lock, flags);
+        schedule();
+        spin_lock_irqsave(&dev->lock, flags);
+        priv->wait = 0;
+        set_current_state(TASK_RUNNING);
+    }
+
+    if (priv->flags & NGKNET_NETIF_F_BIND_CHAN) {
+        dev->bdev[priv->chan] = NULL;
+    }
+
+    dev->vdev[id] = NULL;
+    num = (long)dev->vdev[0];
+    while (num-- == id--) {
+        if (dev->vdev[id]) {
+            dev->vdev[0] = (struct net_device *)(long)num;
+            break;
+        }
+    }
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    remove_wait_queue(&dev->wq, &wait);
+
+    /* Optional netif destroy callback handle */
+    if (dev->cbc->netif_destroy_cb) {
+        int rv = dev->cbc->netif_destroy_cb(ndev);
+        if (rv) {
+            DBG_WARN(("Netif destroy callback failed with rv %d for '%s'\n", rv, ndev->name));
+        }
+    }
+    DBG_VERB(("Removing virtual network device %s (%d).\n", ndev->name, priv->id));
+
+    netif_carrier_off(ndev);
+    unregister_netdev(ndev);
+    free_netdev(ndev);
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_netif_get(struct ngknet_dev *dev, int id, ngknet_netif_t *netif)
+{
+    struct net_device *ndev = NULL;
+    struct ngknet_private *priv = NULL;
+    unsigned long flags;
+    int num;
+
+    if (id < 0 || id > NUM_VDEV_MAX) {
+        return SHR_E_PARAM;
+    }
+
+    spin_lock_irqsave(&dev->lock, flags);
+
+    ndev = id == 0 ? dev->net_dev : dev->vdev[id];
+    if (!ndev) {
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return SHR_E_NOT_FOUND;
+    }
+
+    priv = netdev_priv(ndev);
+    netif->id = priv->id;
+    netif->type = priv->type;
+    netif->flags = priv->flags;
+    netif->vlan = priv->vlan;
+    memcpy(netif->macaddr, priv->net_dev->dev_addr, ETH_ALEN);
+    netif->mtu = priv->net_dev->mtu;
+    netif->chan = priv->chan;
+    memcpy(netif->name, priv->net_dev->name, sizeof(netif->name) - 1);
+    netif->meta_off = priv->meta_off;
+    netif->meta_len = priv->meta_len;
+    memcpy(netif->meta_data, priv->meta_data, netif->meta_len);
+    memcpy(netif->user_data, priv->user_data, sizeof(netif->user_data));
+
+    num = (long)dev->vdev[0];
+    for (id++; id < num + 1; id++) {
+        if (dev->vdev[id]) {
+            break;
+        }
+    }
+    netif->next = id == (num + 1) ? 0 : id;
+
+    spin_unlock_irqrestore(&dev->lock, flags);
+
+    DBG_VERB(("Got virtual network device %s (%d).\n", ndev->name, priv->id));
+
+    return SHR_E_NONE;
+}
+
+int
+ngknet_netif_get_next(struct ngknet_dev *dev, ngknet_netif_t *netif)
+{
+    return ngknet_netif_get(dev, netif->next, netif);
+}
+
+/*!
+ * System control interfaces
+ */
+
+int
+ngknet_debug_level_get(void)
+{
+    return debug;
+}
+
+void
+ngknet_debug_level_set(int debug_level)
+{
+    debug = debug_level;
+}
+
+int
+ngknet_rx_rate_limit_get(void)
+{
+    return rx_rate_limit;
+}
+
+void
+ngknet_rx_rate_limit_set(int rate_limit)
+{
+    rx_rate_limit = rate_limit;
+}
+
+/*!
+ * Generic module functions
+ */
+
+static int
+ngknet_open(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static int
+ngknet_release(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static long
+ngknet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+    struct ngknet_ioctl ioc;
+    struct ngknet_dev *dev = NULL;
+    struct net_device *ndev = NULL;
+    struct pdma_dev *pdev = NULL;
+    union {
+        ngknet_dev_cfg_t dev_cfg;
+        ngknet_chan_cfg_t chan_cfg;
+        ngknet_netif_t netif;
+        ngknet_filter_t filter;
+    } iod;
+    ngknet_dev_cfg_t *dev_cfg = &iod.dev_cfg;
+    ngknet_chan_cfg_t *chan_cfg = &iod.chan_cfg;
+    ngknet_netif_t *netif = &iod.netif;
+    ngknet_filter_t *filter = &iod.filter;
+    char *data = NULL;
+    int dt, gi, qi;
+
+    if (_IOC_TYPE(cmd) != NGKNET_IOC_MAGIC) {
+        DBG_WARN(("Unsupported command (cmd=%d)\n", cmd));
+        return -EINVAL;
+    }
+
+    if (copy_from_user(&ioc, (void *)arg, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    ioc.rc = SHR_E_NONE;
+
+    dev = &ngknet_devices[ioc.unit];
+    pdev = &dev->pdma_dev;
+
+    if (cmd != NGKNET_VERSION_GET &&
+        cmd != NGKNET_RX_RATE_LIMIT &&
+        cmd != NGKNET_DEV_INIT &&
+        !(dev->flags & NGKNET_DEV_ACTIVE)) {
+        ioc.rc = SHR_E_UNAVAIL;
+        if (copy_to_user((void *)arg, &ioc, sizeof(ioc))) {
+            return -EFAULT;
+        }
+        return 0;
+    }
+
+    switch (cmd) {
+    case NGKNET_VERSION_GET:
+        DBG_CMD(("NGKNET_VERSION_GET\n"));
+        ioc.op.info.version = NGKNET_IOC_VERSION;
+        break;
+    case NGKNET_RX_RATE_LIMIT:
+        DBG_CMD(("NGKNET_RX_RATE_LIMIT\n"));
+        if (ioc.iarg[0]) {
+            ngknet_rx_rate_limit_set(ioc.iarg[1]);
+        } else {
+            ioc.iarg[1] = ngknet_rx_rate_limit_get();
+        }
+        break;
+    case NGKNET_DEV_INIT:
+        DBG_CMD(("NGKNET_DEV_INIT\n"));
+        if (dev->flags & NGKNET_DEV_ACTIVE) {
+            DBG_CMD(("NGKNET_DEV_INIT, retrieve device configurations.\n"));
+            strlcpy(dev_cfg->name, pdev->name, sizeof(dev_cfg->name));
+            dev_cfg->dev_id = pdev->dev_id;
+            dev_cfg->nb_grp = pdev->ctrl.nb_grp;
+            dev_cfg->bm_grp = pdev->ctrl.bm_grp;
+            ioc.rc = ngknet_netif_get(dev, 0, &dev_cfg->base_netif);
+            if (SHR_FAILURE((int)ioc.rc)) {
+                break;
+            }
+            if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, dev_cfg,
+                                 ioc.op.data.len, sizeof(*dev_cfg))) {
+                return -EFAULT;
+            }
+            break;
+        }
+        if (kal_copy_from_user(dev_cfg, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*dev_cfg), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        if (!dev_cfg->name[0] || !dev_cfg->bm_grp ||
+            dev_cfg->bm_grp >= (1 << NUM_GRP_MAX)) {
+            DBG_WARN(("Invalid parameter: name=%s, bm_grp=0x%x\n",
+                      dev_cfg->name, dev_cfg->bm_grp));
+            ioc.rc = SHR_E_PARAM;
+            break;
+        }
+        memset(pdev, 0, sizeof(*pdev));
+        strlcpy(pdev->name, dev_cfg->name, sizeof(pdev->name));
+        pdev->dev_id = dev_cfg->dev_id;
+        for (dt = 0; dt < drv_num; dt++) {
+            if (!drv_ops[dt]) {
+                continue;
+            }
+            if (!strcasecmp(dev_cfg->type_str, drv_ops[dt]->drv_desc)) {
+                pdev->dev_type = dt;
+                break;
+            }
+        }
+        if (pdev->dev_type <= NGKNET_DEV_T_NONE ||
+            pdev->dev_type >= NGKNET_DEV_T_COUNT) {
+            ioc.rc = SHR_E_PARAM;
+            break;
+        }
+        pdev->ctrl.bm_grp = dev_cfg->bm_grp;
+        for (gi = 0; gi < NUM_GRP_MAX; gi++) {
+            if (1 << gi & dev_cfg->bm_grp) {
+                pdev->ctrl.nb_grp++;
+                pdev->ctrl.grp[gi].attached = 1;
+                pdev->num_groups = gi + 1;
+            }
+        }
+        pdev->rx_ph_size = dev_cfg->rx_ph_size;
+        pdev->tx_ph_size = dev_cfg->tx_ph_size;
+        pdev->mode = dev_cfg->mode;
+        if (pdev->mode != DEV_MODE_KNET && pdev->mode != DEV_MODE_HNET) {
+            pdev->mode = DEV_MODE_KNET;
+        }
+        ioc.rc = ngknet_dev_probe(ioc.unit, &dev_cfg->base_netif);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, dev_cfg,
+                             ioc.op.data.len, sizeof(*dev_cfg))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_DEV_DEINIT:
+        DBG_CMD(("NGKNET_DEV_DEINIT\n"));
+        if (dev->flags & NGKNET_DEV_ACTIVE) {
+            ioc.rc = ngknet_dev_remove(ioc.unit);
+        }
+        break;
+    case NGKNET_QUEUE_CONFIG:
+        DBG_CMD(("NGKNET_QUEUE_CONFIG\n"));
+        if (kal_copy_from_user(chan_cfg, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*chan_cfg), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        gi = chan_cfg->chan / pdev->grp_queues;
+        if (!(1 << gi & pdev->ctrl.bm_grp)) {
+            DBG_WARN(("Invalid parameter: chan=%d (bm_grp=0x%x)\n",
+                      chan_cfg->chan, pdev->ctrl.bm_grp));
+            ioc.rc = SHR_E_PARAM;
+            break;
+        }
+        if (chan_cfg->dir == PDMA_Q_RX) {
+            if (1 << chan_cfg->chan & pdev->ctrl.bm_txq) {
+                pdev->ctrl.bm_txq &= ~(1 << chan_cfg->chan);
+                pdev->ctrl.nb_txq--;
+            }
+            if (!(1 << chan_cfg->chan & pdev->ctrl.bm_rxq)) {
+                pdev->ctrl.bm_rxq |= 1 << chan_cfg->chan;
+                pdev->ctrl.nb_rxq++;
+            }
+        } else {
+            if (1 << chan_cfg->chan & pdev->ctrl.bm_rxq) {
+                pdev->ctrl.bm_rxq &= ~(1 << chan_cfg->chan);
+                pdev->ctrl.nb_rxq--;
+            }
+            if (!(1 << chan_cfg->chan & pdev->ctrl.bm_txq)) {
+                pdev->ctrl.bm_txq |= 1 << chan_cfg->chan;
+                pdev->ctrl.nb_txq++;
+            }
+        }
+        qi = chan_cfg->chan % pdev->grp_queues;
+        pdev->ctrl.grp[gi].nb_desc[qi] = chan_cfg->nb_desc;
+        pdev->ctrl.grp[gi].rx_size[qi] = chan_cfg->rx_buf_size;
+        pdev->ctrl.grp[gi].que_ctrl[qi] &= ~(PDMA_PKT_BYTE_SWAP |
+                                             PDMA_OTH_BYTE_SWAP |
+                                             PDMA_HDR_BYTE_SWAP);
+        if (chan_cfg->chan_ctrl & NGKNET_PKT_BYTE_SWAP) {
+            pdev->ctrl.grp[gi].que_ctrl[qi] |= PDMA_PKT_BYTE_SWAP;
+        }
+        if (chan_cfg->chan_ctrl & NGKNET_OTH_BYTE_SWAP) {
+            pdev->ctrl.grp[gi].que_ctrl[qi] |= PDMA_OTH_BYTE_SWAP;
+        }
+        if (chan_cfg->chan_ctrl & NGKNET_HDR_BYTE_SWAP) {
+            pdev->ctrl.grp[gi].que_ctrl[qi] |= PDMA_HDR_BYTE_SWAP;
+        }
+        break;
+    case NGKNET_QUEUE_QUERY:
+        DBG_CMD(("NGKNET_QUEUE_QUERY\n"));
+        if (kal_copy_from_user(chan_cfg, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*chan_cfg), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        if (1 << chan_cfg->chan & pdev->ctrl.bm_rxq) {
+            chan_cfg->dir = PDMA_Q_RX;
+        } else if (1 << chan_cfg->chan & pdev->ctrl.bm_txq) {
+            chan_cfg->dir = PDMA_Q_TX;
+        } else {
+            ioc.rc = SHR_E_UNAVAIL;
+            break;
+        }
+        gi = chan_cfg->chan / pdev->grp_queues;
+        qi = chan_cfg->chan % pdev->grp_queues;
+        chan_cfg->nb_desc = pdev->ctrl.grp[gi].nb_desc[qi];
+        chan_cfg->chan_ctrl = pdev->ctrl.grp[gi].que_ctrl[qi];
+        if (chan_cfg->dir == PDMA_Q_RX) {
+            chan_cfg->rx_buf_size = pdev->ctrl.grp[gi].rx_size[qi];
+        } else {
+            chan_cfg->rx_buf_size = 0;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, chan_cfg,
+                             ioc.op.data.len, sizeof(*chan_cfg))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_DEV_SUSPEND:
+        DBG_CMD(("NGKNET_DEV_SUSPEND\n"));
+        if (rx_rate_limit >= 0) {
+            ngknet_rx_rate_limit_stop(dev);
+        }
+        ioc.rc = bcmcnet_pdma_dev_suspend(pdev);
+        break;
+    case NGKNET_DEV_RESUME:
+        DBG_CMD(("NGKNET_DEV_RESUME\n"));
+        ioc.rc = bcmcnet_pdma_dev_resume(pdev);
+        if (rx_rate_limit >= 0) {
+            ngknet_rx_rate_limit_start(dev);
+        }
+        break;
+    case NGKNET_DEV_VNET_WAIT:
+        DBG_CMD(("NGKNET_DEV_VNET_WAIT\n"));
+        if (pdev->mode != DEV_MODE_HNET) {
+            ioc.rc = SHR_E_UNAVAIL;
+            break;
+        }
+        wait_event_interruptible(dev->vnet_wq,
+                                 atomic_read(&dev->vnet_active) != 0);
+        atomic_set(&dev->vnet_active, 0);
+        break;
+    case NGKNET_DEV_HNET_WAKE:
+        DBG_CMD(("NGKNET_DEV_HNET_WAKE\n"));
+        if (pdev->mode != DEV_MODE_HNET) {
+            ioc.rc = SHR_E_UNAVAIL;
+            break;
+        }
+        atomic_set(&dev->hnet_active, 1);
+        wake_up_interruptible(&dev->hnet_wq);
+        break;
+    case NGKNET_DEV_VNET_DOCK:
+        DBG_CMD(("NGKNET_DEV_VNET_DOCK\n"));
+        if (pdev->mode != DEV_MODE_HNET) {
+            ioc.rc = SHR_E_UNAVAIL;
+            break;
+        }
+        if (kal_copy_from_user(&pdev->ctrl.vsync, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(pdev->ctrl.vsync), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        ioc.rc = bcmcnet_pdma_dev_dock(pdev);
+        break;
+    case NGKNET_DEV_VNET_UNDOCK:
+        DBG_CMD(("NGKNET_DEV_VNET_UNDOCK\n"));
+        if (pdev->mode != DEV_MODE_HNET) {
+            ioc.rc = SHR_E_UNAVAIL;
+            break;
+        }
+        ngknet_dev_vnet_wake(pdev);
+        ioc.rc = bcmcnet_pdma_dev_undock(pdev);
+        break;
+    case NGKNET_RCPU_CONFIG:
+        DBG_CMD(("NGKNET_RCPU_CONFIG\n"));
+        if (kal_copy_from_user(&dev->rcpu_ctrl, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(dev->rcpu_ctrl), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_RCPU_GET:
+        DBG_CMD(("NGKNET_RCPU_GET\n"));
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, &dev->rcpu_ctrl,
+                             ioc.op.data.len, sizeof(dev->rcpu_ctrl))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_INFO_GET:
+        DBG_CMD(("NGKNET_INFO_GET\n"));
+        bcmcnet_pdma_dev_info_get(pdev);
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, &pdev->info,
+                             ioc.op.data.len, sizeof(pdev->info))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_STATS_GET:
+        DBG_CMD(("NGKNET_STATS_GET\n"));
+        bcmcnet_pdma_dev_stats_get(pdev);
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, &pdev->stats,
+                             ioc.op.data.len, sizeof(pdev->stats))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_STATS_RESET:
+        DBG_CMD(("NGKNET_STATS_RESET\n"));
+        bcmcnet_pdma_dev_stats_reset(pdev);
+        break;
+    case NGKNET_NETIF_CREATE:
+        DBG_CMD(("NGKNET_NETIF_CREATE\n"));
+        if (kal_copy_from_user(netif, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*netif), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        ioc.rc = ngknet_netif_create(dev, netif);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, netif,
+                             ioc.op.data.len, sizeof(*netif))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_NETIF_DESTROY:
+        DBG_CMD(("NGKNET_NETIF_DESTROY\n"));
+        ioc.rc = ngknet_netif_destroy(dev, ioc.iarg[0]);
+        break;
+    case NGKNET_NETIF_GET:
+        DBG_CMD(("NGKNET_NETIF_GET\n"));
+        ioc.rc = ngknet_netif_get(dev, ioc.iarg[0], netif);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, netif,
+                             ioc.op.data.len, sizeof(*netif))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_NETIF_NEXT:
+        DBG_CMD(("NGKNET_NETIF_NEXT\n"));
+        if (kal_copy_from_user(netif, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*netif), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        ioc.rc = ngknet_netif_get_next(dev, netif);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, netif,
+                             ioc.op.data.len, sizeof(*netif))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_NETIF_LINK_SET:
+        DBG_CMD(("NGKNET_NETIF_LINK_SET\n"));
+        ioc.rc = ngknet_netif_get(dev, ioc.iarg[0], netif);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        ndev = dev->vdev[netif->id];
+        if (ioc.iarg[1]) {
+            if (!netif_carrier_ok(ndev)) {
+                netif_carrier_on(ndev);
+                netif_tx_wake_all_queues(ndev);
+                DBG_LINK(("%s: link up\n", netif->name));
+            }
+        } else {
+            if (netif_carrier_ok(ndev)) {
+                netif_carrier_off(ndev);
+                netif_tx_stop_all_queues(ndev);
+                DBG_LINK(("%s: link down\n", netif->name));
+            }
+        }
+        break;
+    case NGKNET_FILT_CREATE:
+        DBG_CMD(("NGKNET_FILT_CREATE\n"));
+        if (kal_copy_from_user(filter, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*filter), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        ioc.rc = ngknet_filter_create(dev, filter);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, filter,
+                             ioc.op.data.len, sizeof(*filter))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_FILT_DESTROY:
+        DBG_CMD(("NGKNET_FILT_DESTROY\n"));
+        ioc.rc = ngknet_filter_destroy(dev, ioc.iarg[0]);
+        break;
+    case NGKNET_FILT_GET:
+        DBG_CMD(("NGKNET_FILT_GET\n"));
+        ioc.rc = ngknet_filter_get(dev, ioc.iarg[0], filter);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, filter,
+                             ioc.op.data.len, sizeof(*filter))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_FILT_NEXT:
+        DBG_CMD(("NGKNET_FILT_NEXT\n"));
+        if (kal_copy_from_user(filter, (void *)(unsigned long)ioc.op.data.buf,
+                               sizeof(*filter), ioc.op.data.len)) {
+            return -EFAULT;
+        }
+        ioc.rc = ngknet_filter_get_next(dev, filter);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            break;
+        }
+        if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, filter,
+                             ioc.op.data.len, sizeof(*filter))) {
+            return -EFAULT;
+        }
+        break;
+    case NGKNET_PTP_DEV_CTRL:
+        DBG_CMD(("NGKNET_PTP_DEV_CTRL\n"));
+        if (ioc.op.data.len) {
+            data = kmalloc(ioc.op.data.len, GFP_ATOMIC);
+            if (data == NULL) {
+                printk("Fatal error: no memory for PTP device ioctl\n");
+                return -EFAULT;
+            }
+            if (copy_from_user(data, (void *)(unsigned long)ioc.op.data.buf,
+                               ioc.op.data.len)) {
+                kfree(data);
+                return -EFAULT;
+            }
+        }
+        ioc.rc = ngknet_ptp_dev_ctrl(dev, ioc.iarg[0], data, ioc.op.data.len);
+        if (SHR_FAILURE((int)ioc.rc)) {
+            if (data) {
+                kfree(data);
+            }
+            break;
+        }
+        if (ioc.op.data.len) {
+            if (copy_to_user((void *)(unsigned long)ioc.op.data.buf, data,
+                             ioc.op.data.len)) {
+                kfree(data);
+                return -EFAULT;
+            }
+            kfree(data);
+        }
+        break;
+    default:
+        ioc.rc = SHR_E_UNAVAIL;
+        printk("Invalid IOCTL");
+        break;
+    }
+
+    if (copy_to_user((void *)arg, &ioc, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    return 0;
+}
+
+static int
+ngknet_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+    return 0;
+}
+
+static struct file_operations ngknet_fops = {
+    .open = ngknet_open,
+    .release = ngknet_release,
+    .unlocked_ioctl = ngknet_ioctl,
+    .compat_ioctl = ngknet_ioctl,
+    .mmap = ngknet_mmap,
+};
+
+static int __init
+ngknet_init_module(void)
+{
+    int idx;
+    int rv;
+
+    rv = register_chrdev(NGKNET_MODULE_MAJOR, NGKNET_MODULE_NAME, &ngknet_fops);
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: can't get major %d\n",
+               NGKNET_MODULE_NAME, NGKNET_MODULE_MAJOR);
+        return rv;
+    }
+
+    /* Randomize lower 3 bytes of the MAC address (TESTING ONLY) */
+    get_random_bytes(&ngknet_dev_mac[3], 3);
+
+    /* Check for user-supplied MAC address (recommended) */
+    if (mac_addr != NULL && strlen(mac_addr) == 17) {
+        for (idx = 0; idx < 6; idx++) {
+            ngknet_dev_mac[idx] = simple_strtoul(&mac_addr[idx * 3], NULL, 16);
+        }
+        /* Do not allow multicast address */
+        ngknet_dev_mac[0] &= ~0x01;
+    }
+
+    /* Initialize procfs */
+    ngknet_procfs_init();
+
+    /* Initialize Rx rate limit */
+    ngknet_rx_rate_limit_init(ngknet_devices);
+
+    return 0;
+}
+
+static void __exit
+ngknet_exit_module(void)
+{
+    int idx;
+
+    /* Cleanup Rx rate limit */
+    ngknet_rx_rate_limit_cleanup();
+
+    /* Cleanup procfs */
+    ngknet_procfs_cleanup();
+
+    /* Remove all the devices */
+    for (idx = 0; idx < NUM_PDMA_DEV_MAX; idx++) {
+        ngknet_dev_remove(idx);
+    }
+
+    unregister_chrdev(NGKNET_MODULE_MAJOR, NGKNET_MODULE_NAME);
+}
+
+module_init(ngknet_init_module);
+module_exit(ngknet_exit_module);
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.h
new file mode 100644
index 000000000000..fb38f1b9abc3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.h
@@ -0,0 +1,278 @@
+/*! \file ngknet_main.h
+ *
+ * Data structure and macro definitions for NGKNET kernel module.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_MAIN_H
+#define NGKNET_MAIN_H
+
+#include <linux/netdevice.h>
+#include <lkm/lkm.h>
+#include <lkm/ngknet_dev.h>
+#include <bcmcnet/bcmcnet_core.h>
+
+/*! Maximum number of PDMA devices supported */
+#ifdef NGBDE_NUM_SWDEV_MAX
+#define NUM_PDMA_DEV_MAX    NGBDE_NUM_SWDEV_MAX
+#else
+#define NUM_PDMA_DEV_MAX    16
+#endif
+
+/*!
+ * Debug levels
+ */
+#define DBG_LVL_VERB        0x0001
+#define DBG_LVL_PKT         0x0002
+#define DBG_LVL_CMD         0x0004
+#define DBG_LVL_IRQ         0x0008
+#define DBG_LVL_NAPI        0x0010
+#define DBG_LVL_NDEV        0x0020
+#define DBG_LVL_FILT        0x0040
+#define DBG_LVL_RCPU        0x0080
+#define DBG_LVL_WARN        0x0100
+#define DBG_LVL_PDMP        0x0200
+#define DBG_LVL_RATE        0x0400
+#define DBG_LVL_LINK        0x0800
+
+#define DBG_VERB(_s)        do { if (debug & DBG_LVL_VERB) printk _s; } while (0)
+#define DBG_PKT(_s)         do { if (debug & DBG_LVL_PKT)  printk _s; } while (0)
+#define DBG_CMD(_s)         do { if (debug & DBG_LVL_CMD)  printk _s; } while (0)
+#define DBG_IRQ(_s)         do { if (debug & DBG_LVL_IRQ)  printk _s; } while (0)
+#define DBG_NAPI(_s)        do { if (debug & DBG_LVL_NAPI) printk _s; } while (0)
+#define DBG_NDEV(_s)        do { if (debug & DBG_LVL_NDEV) printk _s; } while (0)
+#define DBG_FILT(_s)        do { if (debug & DBG_LVL_FILT) printk _s; } while (0)
+#define DBG_RCPU(_s)        do { if (debug & DBG_LVL_RCPU) printk _s; } while (0)
+#define DBG_WARN(_s)        do { if (debug & DBG_LVL_WARN) printk _s; } while (0)
+#define DBG_PDMP(_s)        do { if (debug & DBG_LVL_PDMP) printk _s; } while (0)
+#define DBG_RATE(_s)        do { if (debug & DBG_LVL_RATE) printk _s; } while (0)
+#define DBG_LINK(_s)        do { if (debug & DBG_LVL_LINK) printk _s; } while (0)
+
+/*!
+ * Device description
+ */
+struct ngknet_dev {
+    /*! Base address for PCI register access */
+    volatile void *base_addr;
+
+    /*! Required for DMA memory control */
+    struct device *dev;
+
+    /*! Required for PCI memory control */
+    struct pci_dev *pci_dev;
+
+    /*! Base network device */
+    struct net_device *net_dev;
+
+    /*! PDMA device */
+    struct pdma_dev pdma_dev;
+
+    /*! Device number (from BDE) */
+    int dev_no;
+
+    /*! Vitual network devices, 0 is reserved */
+    struct net_device *vdev[NUM_VDEV_MAX + 1];
+
+    /*! Vitual network devices bound to queue */
+    struct net_device *bdev[NUM_QUE_MAX];
+
+    /*! Filter list */
+    struct list_head filt_list;
+
+    /*! Filter control, 0 is reserved */
+    void *fc[NUM_FILTER_MAX + 1];
+
+    /*! Callback control */
+    struct ngknet_callback_ctrl *cbc;
+
+    /*! RCPU control */
+    struct ngknet_rcpu_hdr rcpu_ctrl;
+
+    /*! NGKNET lock */
+    spinlock_t lock;
+
+    /*! NGKNET wait queue */
+    wait_queue_head_t wq;
+
+    /*! VNET wait queue */
+    wait_queue_head_t vnet_wq;
+
+    /*! VNET is active */
+    atomic_t vnet_active;
+
+    /*! HNET wait queue */
+    wait_queue_head_t hnet_wq;
+
+    /*! HNET is active */
+    atomic_t hnet_active;
+
+    /*! HNET deamon */
+    struct task_struct *hnet_task;
+
+    /*! HNET work */
+    struct work_struct hnet_work;
+
+    /*! PTP Tx queue */
+    struct sk_buff_head ptp_tx_queue;
+
+    /*! PTP Tx work */
+    struct work_struct ptp_tx_work;
+
+    /*! Flags */
+    int flags;
+    /*! NGKNET device is active */
+#define NGKNET_DEV_ACTIVE      (1 << 0)
+};
+
+/*!
+ * Network interface specific private data
+ */
+struct ngknet_private {
+    /*! Network device */
+    struct net_device *net_dev;
+
+    /*! Network stats */
+    struct net_device_stats stats;
+
+    /*! NGKNET device */
+    struct ngknet_dev *bkn_dev;
+
+    /*! Network interface ID */
+    int id;
+
+    /*! Network interface type */
+    int type;
+
+    /*! Network interface flags */
+    uint32_t flags;
+
+    /*! Network interface vlan */
+    uint32_t vlan;
+
+    /*! Network interface bound to */
+    uint32_t chan;
+
+    /*! Metadata offset from Ethernet header */
+    uint32_t meta_off;
+
+    /*! Metadata length */
+    uint32_t meta_len;
+
+    /*! Metadata used to send packets to physical port */
+    uint8_t meta_data[NGKNET_NETIF_META_MAX];
+
+    /*! User data gotten back through callbacks */
+    uint8_t user_data[NGKNET_NETIF_USER_DATA];
+
+    /*! Users of this network interface */
+    int users;
+
+    /*! Wait for this network interface free */
+    int wait;
+
+    /*! HW timestamp Rx filter */
+    int hwts_rx_filter;
+
+    /*! HW timestamp Tx type */
+    int hwts_tx_type;
+};
+
+/*!
+ * \brief Create network interface.
+ *
+ * \param [in] dev NGKNET device structure point.
+ * \param [in] netif Network interface structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_netif_create(struct ngknet_dev *dev, ngknet_netif_t *netif);
+
+/*!
+ * \brief Destroy network interface.
+ *
+ * \param [in] dev NGKNET device structure point.
+ * \param [in] id Network interface ID.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_netif_destroy(struct ngknet_dev *dev, int id);
+
+/*!
+ * \brief Get network interface.
+ *
+ * \param [in] dev NGKNET device structure point.
+ * \param [in] id Network interface ID.
+ * \param [out] netif Network interface structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_netif_get(struct ngknet_dev *dev, int id, ngknet_netif_t *netif);
+
+/*!
+ * \brief Get the next network interface.
+ *
+ * \param [in] dev NGKNET device structure point.
+ * \param [out] netif Network interface structure point.
+ *
+ * \retval SHR_E_NONE No errors.
+ * \retval SHR_E_XXXX Operation failed.
+ */
+extern int
+ngknet_netif_get_next(struct ngknet_dev *dev, ngknet_netif_t *netif);
+
+/*!
+ * \brief Get debug level.
+ *
+ * \retval Current debug level.
+ */
+extern int
+ngknet_debug_level_get(void);
+
+/*!
+ * \brief Set debug level.
+ *
+ * \param [in] debug_level Debug level to be set.
+ */
+extern void
+ngknet_debug_level_set(int debug_level);
+
+/*!
+ * \brief Get Rx rate limit.
+ *
+ * \retval Current Rx rate limit.
+ */
+extern int
+ngknet_rx_rate_limit_get(void);
+
+/*!
+ * \brief Set Rx rate limit.
+ *
+ * \param [in] rate_limit Rx rate limit to be set.
+ */
+extern void
+ngknet_rx_rate_limit_set(int rate_limit);
+
+#endif /* NGKNET_MAIN_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.c
new file mode 100644
index 000000000000..85edaa26abb9
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.c
@@ -0,0 +1,655 @@
+/*! \file ngknet_procfs.c
+ *
+ * <description>
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include <lkm/lkm.h>
+#include <lkm/ngknet_ioctl.h>
+#include "ngknet_main.h"
+#include "ngknet_extra.h"
+
+extern struct ngknet_dev ngknet_devices[];
+
+static struct proc_dir_entry *proc_root = NULL;
+
+static void
+proc_data_show(struct seq_file *m, const unsigned char *buf, size_t len)
+{
+    uint32_t i;
+
+    if (!buf || !len) {
+        seq_printf(m, "\n");
+        return;
+    }
+
+    for (i = 0; i < len; i++) {
+        seq_printf(m, "%02x ", buf[i]);
+        if ((i + 1) % 32 == 0 || (i + 1) == len) {
+            seq_printf(m, "\n");
+            if ((i + 1) < len) {
+                seq_printf(m, "                ");
+            }
+        }
+    }
+}
+
+static int
+proc_debug_level_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "Debug level: 0x%x\n", ngknet_debug_level_get());
+
+    return 0;
+}
+
+static int
+proc_debug_level_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_debug_level_show, NULL);
+}
+
+static ssize_t
+proc_debug_level_write(struct file *file, const char *buf,
+                       size_t count, loff_t *loff)
+{
+    char level_str[11] = {0};
+    int debug_level;
+
+    if (copy_from_user(level_str, buf, sizeof(level_str) - 1)) {
+        return -EFAULT;
+    }
+    debug_level = simple_strtol(level_str, NULL, 16);
+
+    ngknet_debug_level_set(debug_level);
+    printk("Debug level set to: 0x%x\n", debug_level);
+
+    return count;
+}
+
+static int
+proc_debug_level_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_debug_level_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_debug_level_open,
+    read:       seq_read,
+    write:      proc_debug_level_write,
+    llseek:     seq_lseek,
+    release:    proc_debug_level_release,
+};
+
+static int
+proc_device_info_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    struct bcmcnet_dev_info *info;
+    int di, qi, ai = 0;
+    int rv;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        ai++;
+
+        rv = bcmcnet_pdma_dev_info_get(&dev->pdma_dev);
+        if (SHR_FAILURE(rv)) {
+            printk("ngknet: get device%d info failed\n", di);
+            break;
+        }
+
+        info = &dev->pdma_dev.info;
+        seq_printf(m, "dev_no:         %d\n",   di);
+        seq_printf(m, "dev_name:       %s\n",   info->dev_name);
+        seq_printf(m, "dev_id:         0x%x\n", info->dev_id);
+        seq_printf(m, "dev_type:       %d\n",   info->dev_type);
+        seq_printf(m, "max_groups:     %d\n",   info->max_groups);
+        seq_printf(m, "max_queues:     %d\n",   info->max_queues);
+        seq_printf(m, "bm_groups:      0x%x\n", info->bm_groups);
+        seq_printf(m, "bm_rx_queues:   0x%x\n", info->bm_rx_queues);
+        seq_printf(m, "bm_tx_queues:   0x%x\n", info->bm_tx_queues);
+        seq_printf(m, "nb_groups:      %d\n",   info->nb_groups);
+        seq_printf(m, "nb_rx_queues:   %d\n",   info->nb_rx_queues);
+        seq_printf(m, "nb_tx_queues:   %d\n",   info->nb_tx_queues);
+        seq_printf(m, "rx_desc_size:   %d\n",   info->rx_desc_size);
+        seq_printf(m, "tx_desc_size:   %d\n",   info->tx_desc_size);
+        seq_printf(m, "rx_ph_size:     %d\n",   info->rx_ph_size);
+        seq_printf(m, "tx_ph_size:     %d\n",   info->tx_ph_size);
+        for (qi = 0; qi < info->nb_rx_queues; qi++) {
+            seq_printf(m, "rx_buf_sz[%d]:   %d\n", qi, info->rx_buf_size[qi]);
+        }
+        for (qi = 0; qi < info->nb_rx_queues; qi++) {
+            seq_printf(m, "nb_rx_desc[%d]:  %d\n", qi, info->nb_rx_desc[qi]);
+        }
+        for (qi = 0; qi < info->nb_tx_queues; qi++) {
+            seq_printf(m, "nb_tx_desc[%d]:  %d\n", qi, info->nb_tx_desc[qi]);
+        }
+    }
+
+    if (!ai) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "------------------------\n");
+        seq_printf(m, "Total %d devices\n", ai);
+    }
+
+    return 0;
+}
+
+static int
+proc_device_info_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_device_info_show, NULL);
+}
+
+static int
+proc_device_info_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_device_info_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_device_info_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_device_info_release,
+};
+
+static int
+proc_filter_info_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    ngknet_filter_t filt = {0};
+    int di, dn = 0, fn = 0;
+    int rv;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        dn++;
+
+        do {
+            rv = ngknet_filter_get_next(dev, &filt);
+            if (SHR_FAILURE(rv)) {
+                printk("ngknet: get device%d filter failed\n", di);
+                break;
+            }
+            fn++;
+
+            seq_printf(m, "\n");
+            seq_printf(m, "dev_no:         %d\n",   di);
+            seq_printf(m, "id:             %d\n",   filt.id);
+            seq_printf(m, "next:           %d\n",   filt.next);
+            seq_printf(m, "type:           %d\n",   filt.type);
+            seq_printf(m, "flags:          0x%x\n", filt.flags);
+            seq_printf(m, "prio:           %d\n",   filt.priority);
+            seq_printf(m, "chan:           %d\n",   filt.chan);
+            seq_printf(m, "desc:           %s\n",   filt.desc);
+            seq_printf(m, "dest_type:      %d\n",   filt.dest_type);
+            seq_printf(m, "dest_id:        %d\n",   filt.dest_id);
+            seq_printf(m, "dest_proto:     0x%x\n", filt.dest_proto);
+            seq_printf(m, "mirror_type:    %d\n",   filt.mirror_type);
+            seq_printf(m, "mirror_id:      %d\n",   filt.mirror_id);
+            seq_printf(m, "mirror_proto:   0x%x\n", filt.mirror_proto);
+            seq_printf(m, "oob_offset:     %d\n",   filt.oob_data_offset);
+            seq_printf(m, "oob_size:       %d\n",   filt.oob_data_size);
+            seq_printf(m, "pkt_offset:     %d\n",   filt.pkt_data_offset);
+            seq_printf(m, "pkt_size:       %d\n",   filt.pkt_data_size);
+            seq_printf(m, "filt_data:      ");
+            proc_data_show(m, filt.data.b, filt.oob_data_size + filt.pkt_data_size);
+            seq_printf(m, "filt_mask:      ");
+            proc_data_show(m, filt.mask.b, filt.oob_data_size + filt.pkt_data_size);
+            seq_printf(m, "user_data:      ");
+            proc_data_show(m, filt.user_data, NGKNET_FILTER_USER_DATA);
+            seq_printf(m, "hits:           %llu\n", ((struct filt_ctrl *)dev->fc[filt.id])->hits);
+        } while (filt.next);
+    }
+
+    if (!dn) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "--------------------------------\n");
+        seq_printf(m, "Total %d devices, %d filters\n", dn, fn);
+    }
+
+    return 0;
+}
+
+static int
+proc_filter_info_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_filter_info_show, NULL);
+}
+
+static int
+proc_filter_info_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_filter_info_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_filter_info_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_filter_info_release,
+};
+
+static int
+proc_netif_info_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    struct net_device *ndev;
+    struct ngknet_private *priv;
+    ngknet_netif_t netif = {0};
+    int di, ma, dn = 0, nn = 0;
+    int rv;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        dn++;
+
+        do {
+            rv = ngknet_netif_get_next(dev, &netif);
+            if (SHR_FAILURE(rv)) {
+                printk("ngknet: get device%d netif failed\n", di);
+                break;
+            }
+            nn++;
+            ndev = netif.id == 0 ? dev->net_dev : dev->vdev[netif.id];
+            priv = netdev_priv(ndev);
+
+            seq_printf(m, "\n");
+            seq_printf(m, "dev_no:         %d\n",   di);
+            seq_printf(m, "id:             %d\n",   netif.id);
+            seq_printf(m, "next:           %d\n",   netif.next);
+            seq_printf(m, "type:           %d\n",   netif.type);
+            seq_printf(m, "flags:          0x%x\n", netif.flags);
+            seq_printf(m, "vlan:           %d\n",   netif.vlan);
+            seq_printf(m, "mac:            ");
+            for (ma = 0; ma < 6; ma++) {
+                if (ma == 5) {
+                    seq_printf(m, "%02x\n", netif.macaddr[ma]);
+                } else {
+                    seq_printf(m, "%02x:", netif.macaddr[ma]);
+                }
+            }
+            seq_printf(m, "mtu:            %d\n",   netif.mtu);
+            seq_printf(m, "chan:           %d\n",   netif.chan);
+            seq_printf(m, "name:           %s\n",   netif.name);
+            seq_printf(m, "meta_off:       %d\n",   netif.meta_off);
+            seq_printf(m, "meta_len:       %d\n",   netif.meta_len);
+            seq_printf(m, "meta_data:      ");
+            proc_data_show(m, netif.meta_data, netif.meta_len);
+            seq_printf(m, "user_data:      ");
+            proc_data_show(m, netif.user_data, NGKNET_NETIF_USER_DATA);
+            seq_printf(m, "rx_packets:     %lu\n",  priv->stats.rx_packets);
+            seq_printf(m, "rx_bytes:       %lu\n",  priv->stats.rx_bytes);
+            seq_printf(m, "rx_dropped:     %lu\n",  priv->stats.rx_dropped);
+            seq_printf(m, "rx_errors:      %lu\n",  priv->stats.rx_errors);
+            seq_printf(m, "tx_packets:     %lu\n",  priv->stats.tx_packets);
+            seq_printf(m, "tx_bytes:       %lu\n",  priv->stats.tx_bytes);
+            seq_printf(m, "tx_dropped:     %lu\n",  priv->stats.tx_dropped);
+            seq_printf(m, "tx_errors:      %lu\n",  priv->stats.tx_errors);
+        } while (netif.next);
+    }
+
+    if (!dn) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "--------------------------------\n");
+        seq_printf(m, "Total %d devices, %d netifs\n", dn, nn);
+    }
+
+    return 0;
+}
+
+static int
+proc_netif_info_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_netif_info_show, NULL);
+}
+
+static int
+proc_netif_info_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_netif_info_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_netif_info_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_netif_info_release,
+};
+
+static int
+proc_pkt_stats_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    struct bcmcnet_dev_stats *stats;
+    int di, qi, ai = 0;
+    int rv;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        ai++;
+
+        rv = bcmcnet_pdma_dev_stats_get(&dev->pdma_dev);
+        if (SHR_FAILURE(rv)) {
+            printk("ngknet: get device%d stats failed\n", di);
+            break;
+        }
+
+        stats = &dev->pdma_dev.stats;
+        seq_printf(m, "rx_packets:     %llu\n", (unsigned long long)stats->rx_packets);
+        seq_printf(m, "rx_bytes:       %llu\n", (unsigned long long)stats->rx_bytes);
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_rxq; qi++) {
+            seq_printf(m, "rx_packets[%d]:  %llu\n", qi, (unsigned long long)stats->rxq_packets[qi]);
+            seq_printf(m, "rx_bytes[%d]:    %llu\n", qi, (unsigned long long)stats->rxq_bytes[qi]);
+        }
+        seq_printf(m, "rx_dropped:     %llu\n", (unsigned long long)stats->rx_dropped);
+        seq_printf(m, "rx_errors:      %llu\n", (unsigned long long)stats->rx_errors);
+        seq_printf(m, "rx_nomems:      %llu\n", (unsigned long long)stats->rx_nomems);
+        seq_printf(m, "tx_packets:     %llu\n", (unsigned long long)stats->tx_packets);
+        seq_printf(m, "tx_bytes:       %llu\n", (unsigned long long)stats->tx_bytes);
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_txq; qi++) {
+            seq_printf(m, "tx_packets[%d]:  %llu\n", qi, (unsigned long long)stats->txq_packets[qi]);
+            seq_printf(m, "tx_bytes[%d]:    %llu\n", qi, (unsigned long long)stats->txq_bytes[qi]);
+        }
+        seq_printf(m, "tx_dropped:     %llu\n", (unsigned long long)stats->tx_dropped);
+        seq_printf(m, "tx_errors:      %llu\n", (unsigned long long)stats->tx_errors);
+        seq_printf(m, "tx_xoffs:       %llu\n", (unsigned long long)stats->tx_xoffs);
+        seq_printf(m, "interrupts:     %llu\n", (unsigned long long)stats->intrs);
+    }
+
+    if (!ai) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "------------------------\n");
+        seq_printf(m, "Total %d devices\n", ai);
+    }
+
+    return 0;
+}
+
+static int
+proc_pkt_stats_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_pkt_stats_show, NULL);
+}
+
+static int
+proc_pkt_stats_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_pkt_stats_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_pkt_stats_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_pkt_stats_release,
+};
+
+static int
+proc_rate_limit_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "Rx rate limit: %d pps\n", ngknet_rx_rate_limit_get());
+
+    return 0;
+}
+
+static int
+proc_rate_limit_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_rate_limit_show, NULL);
+}
+
+static ssize_t
+proc_rate_limit_write(struct file *file, const char *buf,
+                      size_t count, loff_t *loff)
+{
+    char limit_str[9] = {0};
+    int rate_limit;
+
+    if (copy_from_user(limit_str, buf, sizeof(limit_str) - 1)) {
+        return -EFAULT;
+    }
+    rate_limit = simple_strtol(limit_str, NULL, 10);
+
+    ngknet_rx_rate_limit_set(rate_limit);
+    printk("Rx rate limit set to: %d pps\n", rate_limit);
+
+    return count;
+}
+
+static int
+proc_rate_limit_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_rate_limit_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_rate_limit_open,
+    read:       seq_read,
+    write:      proc_rate_limit_write,
+    llseek:     seq_lseek,
+    release:    proc_rate_limit_release,
+};
+
+static int
+proc_reg_status_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    int di, qi, ai = 0;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        ai++;
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_rxq; qi++) {
+            bcmcnet_pdma_rx_queue_reg_dump(&dev->pdma_dev, qi);
+        }
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_txq; qi++) {
+            bcmcnet_pdma_tx_queue_reg_dump(&dev->pdma_dev, qi);
+        }
+    }
+
+    if (!ai) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "------------------------\n");
+        seq_printf(m, "Total %d devices\n", ai);
+    }
+
+    return 0;
+}
+
+static int
+proc_reg_status_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_reg_status_show, NULL);
+}
+
+static int
+proc_reg_status_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_reg_status_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_reg_status_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_reg_status_release,
+};
+
+static int
+proc_ring_status_show(struct seq_file *m, void *v)
+{
+    struct ngknet_dev *dev;
+    int di, qi, ai = 0;
+
+    for (di = 0; di < NUM_PDMA_DEV_MAX; di++) {
+        dev = &ngknet_devices[di];
+        if (!(dev->flags & NGKNET_DEV_ACTIVE)) {
+            continue;
+        }
+        ai++;
+        seq_printf(m, "%s-%d, ", "Unit", di);
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_rxq; qi++) {
+            bcmcnet_pdma_rx_ring_dump(&dev->pdma_dev, qi);
+        }
+        seq_printf(m, "%s%d, ", "Rx queues: ", qi);
+        for (qi = 0; qi < dev->pdma_dev.ctrl.nb_txq; qi++) {
+            bcmcnet_pdma_tx_ring_dump(&dev->pdma_dev, qi);
+        }
+        seq_printf(m, "%s%d. ", "Tx queues: ", qi);
+        seq_printf(m, "\n");
+    }
+
+    if (!ai) {
+        seq_printf(m, "%s\n", "No active device");
+    } else {
+        seq_printf(m, "------------------------\n");
+        seq_printf(m, "Total %d devices\n", ai);
+    }
+
+    return 0;
+}
+
+static int
+proc_ring_status_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_ring_status_show, NULL);
+}
+
+static int
+proc_ring_status_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct file_operations proc_ring_status_fops = {
+    owner:      THIS_MODULE,
+    open:       proc_ring_status_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    release:    proc_ring_status_release,
+};
+
+int
+ngknet_procfs_init(void)
+{
+    struct proc_dir_entry *entry = NULL;
+
+    proc_root = proc_mkdir(NGKNET_MODULE_NAME, NULL);
+    if (proc_root == NULL) {
+        printk(KERN_ERR "ngknet: proc_mkdir failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "debug_level", 0666, proc_root, &proc_debug_level_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "device_info", 0444, proc_root, &proc_device_info_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "filter_info", 0444, proc_root, &proc_filter_info_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "netif_info", 0444, proc_root, &proc_netif_info_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "pkt_stats", 0444, proc_root, &proc_pkt_stats_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "rate_limit", 0666, proc_root, &proc_rate_limit_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "reg_status", 0444, proc_root, &proc_reg_status_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    PROC_CREATE(entry, "ring_status", 0444, proc_root, &proc_ring_status_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "ngknet: proc_create failed\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+int
+ngknet_procfs_cleanup(void)
+{
+    remove_proc_entry("debug_level", proc_root);
+    remove_proc_entry("device_info", proc_root);
+    remove_proc_entry("filter_info", proc_root);
+    remove_proc_entry("netif_info", proc_root);
+    remove_proc_entry("pkt_stats", proc_root);
+    remove_proc_entry("rate_limit", proc_root);
+    remove_proc_entry("reg_status", proc_root);
+    remove_proc_entry("ring_status", proc_root);
+
+    remove_proc_entry(NGKNET_MODULE_NAME, NULL);
+
+    return 0;
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.h
new file mode 100644
index 000000000000..3c1938121ebb
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_procfs.h
@@ -0,0 +1,47 @@
+/*! \file ngknet_procfs.h
+ *
+ * Procfs-related definitions and APIs for NGKNET module.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_PROCFS_H
+#define NGKNET_PROCFS_H
+
+/*!
+ * \brief Initialize procfs for KNET driver.
+ *
+ * Create procfs read/write interfaces.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngknet_procfs_init(void);
+
+/*!
+ * \brief Clean up procfs for KNET driver.
+ *
+ * Clean up resources allocated by \ref ngknet_procfs_init.
+ *
+ * \return 0 if no errors, otherwise -1.
+ */
+extern int
+ngknet_procfs_cleanup(void);
+
+#endif /* NGKNET_PROCFS_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.c
new file mode 100644
index 000000000000..13579208eab0
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.c
@@ -0,0 +1,194 @@
+/*! \file ngknet_ptp.c
+ *
+ * Utility routines for PTP.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#include "ngknet_callback.h"
+#include "ngknet_ptp.h"
+
+int
+ngknet_ptp_rx_config_set(struct net_device *ndev, int *filter)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+
+    if (!dev->cbc->ptp_rx_config_set_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /*
+     * The expected Rx filter value is passed to the callback. The callback
+     * should pass back the actual filter value by the paramter <filter>.
+     * The callback can use priv->user_data to get other private parameters
+     * such as phys_port, dev_type, etc, which should be introduced when the
+     * netif is created.
+     */
+    return dev->cbc->ptp_rx_config_set_cb(priv, filter);
+}
+
+int
+ngknet_ptp_tx_config_set(struct net_device *ndev, int type)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+
+    if (!dev->cbc->ptp_tx_config_set_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /*
+     * The Tx type value is passed to the callback by the parameter <type>.
+     * The callback should do the configuration according to the type.
+     * The callback can use priv->user_data to get other private parameters
+     * such as phys_port, dev_type, etc, which should be introduced when the
+     * netif is created.
+     */
+    return dev->cbc->ptp_tx_config_set_cb(priv, &type);
+}
+
+int
+ngknet_ptp_rx_hwts_get(struct net_device *ndev, struct sk_buff *skb, uint64_t *ts)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+
+    if (!dev->cbc->ptp_rx_hwts_get_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    cbd->dev_no = dev->dev_no;
+    cbd->dev_id = dev->pdma_dev.dev_id;
+    cbd->priv = priv;
+    cbd->pmd = skb->data + PKT_HDR_SIZE;
+    cbd->pmd_len = pkh->meta_len;
+    cbd->pkt_len = pkh->data_len;
+
+    /*
+     * The callback should get timestamp value for a Rx packet and return
+     * by the parameter <ts>.
+     * Some parameters have been consolidated to SKB as above. They can be
+     * achieved by NGKNET_SKB_CB(skb). Specially more private paramters are
+     * in NGKNET_SKB_CB(skb)->priv->user_data[].
+     */
+    return dev->cbc->ptp_rx_hwts_get_cb(skb, ts);
+}
+
+int
+ngknet_ptp_tx_hwts_get(struct net_device *ndev, struct sk_buff *skb, uint64_t *ts)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+
+    if (!dev->cbc->ptp_tx_hwts_get_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    cbd->dev_no = dev->dev_no;
+    cbd->dev_id = dev->pdma_dev.dev_id;
+    cbd->priv = priv;
+    cbd->pmd = skb->data + PKT_HDR_SIZE;
+    cbd->pmd_len = pkh->meta_len;
+    cbd->pkt_len = pkh->data_len;
+
+    /*
+     * The callback should get timestamp value for a Tx packet and return
+     * by the parameter <ts>.
+     * For HWTSTAMP_TX_ONESTEP_SYNC type, the time value can be achieved and
+     * returned immediately. Otherwise, for HWTSTAMP_TX_ON type, the callback
+     * should wait till the time value can be available, i.e. the packet has
+     * been tranmitted out from port.
+     * Some parameters have been consolidated to SKB as above. They can be
+     * achieved by NGKNET_SKB_CB(skb). Specially more private paramters are
+     * in NGKNET_SKB_CB(skb)->priv->user_data[] such as phys_port, dev_type,
+     * and so on.
+     */
+    return dev->cbc->ptp_tx_hwts_get_cb(skb, ts);
+}
+
+int
+ngknet_ptp_tx_meta_set(struct net_device *ndev, struct sk_buff *skb)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
+
+    if (!dev->cbc->ptp_tx_meta_set_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    cbd->dev_no = dev->dev_no;
+    cbd->dev_id = dev->pdma_dev.dev_id;
+    cbd->priv = priv;
+    cbd->pmd = skb->data + PKT_HDR_SIZE;
+    cbd->pmd_len = pkh->meta_len;
+    cbd->pkt_len = pkh->data_len;
+
+    /*
+     * The callback should configure the metadata <NGKNET_SKB_CB(skb)->pmd>
+     * for HW timestamping according to the corresponding switch device.
+     * Some parameters have been consolidated to SKB as above. They can be
+     * achieved by NGKNET_SKB_CB(skb). Specially more private paramters are
+     * in NGKNET_SKB_CB(skb)->priv->user_data[] such as phys_port, dev_type,
+     * and so on.
+     */
+    return dev->cbc->ptp_tx_meta_set_cb(skb);
+}
+
+int
+ngknet_ptp_phc_index_get(struct net_device *ndev, int *index)
+{
+    struct ngknet_private *priv = netdev_priv(ndev);
+    struct ngknet_dev *dev = priv->bkn_dev;
+
+    if (!dev->cbc->ptp_phc_index_get_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /*
+     * The callback should return the HPC index by the parameter <index>.
+     * priv->user_data[] can be used to get other private parameters such as
+     * phys_port, dev_type, etc, which should be introduced when the netif is
+     * created.
+     */
+    return dev->cbc->ptp_phc_index_get_cb(priv, index);
+}
+
+int
+ngknet_ptp_dev_ctrl(struct ngknet_dev *dev, int cmd, char *data, int len)
+{
+    if (!dev->cbc->ptp_dev_ctrl_cb) {
+        return SHR_E_UNAVAIL;
+    }
+
+    /*
+     * The callback is IOCTL dispatcher for PTP driver/module.
+     * The parameter <cmd> is the command defined by the user. The parameter
+     * <data> and <len> are used for interactions between the user application
+     * and the driver for PTP device start/stop, enable/disable, set/get, and
+     * so on.
+     */
+    return dev->cbc->ptp_dev_ctrl_cb(dev, cmd, data, len);
+}
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.h
new file mode 100644
index 000000000000..86dcb6c4904a
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_ptp.h
@@ -0,0 +1,111 @@
+/*! \file ngknet_ptp.h
+ *
+ * Definitions and APIs declaration for PTP.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef NGKNET_PTP_H
+#define NGKNET_PTP_H
+
+#include <linux/skbuff.h>
+#include "ngknet_main.h"
+
+/*!
+ * \brief PTP Rx config set.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] filter Rx filter.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_config_set(struct net_device *ndev, int *filter);
+
+/*!
+ * \brief PTP Tx config set.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] type Tx type.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_config_set(struct net_device *ndev, int type);
+
+/*!
+ * \brief PTP Rx HW timestamping get.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] skb Rx packet SKB.
+ * \param [out] ts Timestamp value.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_rx_hwts_get(struct net_device *ndev, struct sk_buff *skb, uint64_t *ts);
+
+/*!
+ * \brief PTP Tx HW timestamping get.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] skb Tx packet SKB.
+ * \param [out] ts Timestamp value.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_hwts_get(struct net_device *ndev, struct sk_buff *skb, uint64_t *ts);
+
+/*!
+ * \brief PTP Tx meta set.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [in] skb Tx packet SKB.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_tx_meta_set(struct net_device *ndev, struct sk_buff *skb);
+
+/*!
+ * \brief PTP PHC index get.
+ *
+ * \param [in] ndev Network device structure point.
+ * \param [out] index PHC index.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_phc_index_get(struct net_device *ndev, int *index);
+
+/*!
+ * \brief PTP device control.
+ *
+ * \param [in] dev NGKNET device structure point.
+ * \param [in] cmd Command.
+ * \param [in] data Data buffer.
+ * \param [in] len Data length.
+ *
+ * \retval SHR_E_NONE No errors.
+ */
+extern int
+ngknet_ptp_dev_ctrl(struct ngknet_dev *dev, int cmd, char *data, int len);
+
+#endif /* NGKNET_PTP_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
new file mode 100644
index 000000000000..2ce66edb3c63
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
@@ -0,0 +1,36 @@
+# -*- Kbuild -*-
+#
+# Linux KNET Callback module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+ifeq ($(BUILD_PSAMPLE),1)
+PSAMPLE_CFLAGS=-DPSAMPLE_SUPPORT
+PSAMPLE_CB_OBJS=psample-cb.o
+endif
+
+obj-m := linux_ngknetcb.o
+
+ccflags-y := $(LKM_CFLAGS) \
+             -I$(SDK)/shr/include \
+             -I$(SDK)/bcmdrd/include \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/knet/include \
+             -I$(SDK)/linux/knet \
+             $(PSAMPLE_CFLAGS)
+
+linux_ngknetcb-y := ngknetcb_main.o \
+                    $(PSAMPLE_CB_OBJS)
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Makefile
new file mode 100644
index 000000000000..e2acfed49d6c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Makefile
@@ -0,0 +1,33 @@
+# -*- Makefile -*-
+#
+# Linux KNET Callback module.
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_ngknetcb
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean:
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
new file mode 100644
index 000000000000..aa248dafce52
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
@@ -0,0 +1,444 @@
+/*! \file ngknetcb_main.c
+ *
+ * NGKNET Callback module entry.
+ */
+/*
+ * $Copyright: (c) 2019 Broadcom.
+ * Broadcom Proprietary and Confidential. All rights reserved.$
+ */
+
+#include <lkm/lkm.h>
+#include <ngknet_callback.h>
+#include "psample-cb.h"
+
+/*! \cond */
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_DESCRIPTION("NGKNET Callback Module");
+MODULE_LICENSE("GPL");
+/*! \endcond */
+
+/*! \cond */
+int debug = 0;
+MODULE_PARAM(debug, int, 0);
+MODULE_PARM_DESC(debug,
+"Debug level (default 0)");
+/*! \endcond */
+
+/*! Module information */
+#define NGKNETCB_MODULE_NAME    "linux_ngknetcb"
+#define NGKNETCB_MODULE_MAJOR   122
+
+/* set KNET_CB_DEBUG for debug info */
+#define KNET_CB_DEBUG
+
+/* These below need to match incoming enum values */
+#define FILTER_TAG_STRIP 0
+#define FILTER_TAG_KEEP  1
+#define FILTER_TAG_ORIGINAL 2
+
+/* Maintain tag strip statistics */
+struct strip_stats_s {
+    unsigned long stripped;     /* Number of packets that have been stripped */
+    unsigned long checked;
+    unsigned long skipped;
+};
+
+static struct strip_stats_s strip_stats;
+static unsigned int rx_count = 0;
+
+/* Local function prototypes */
+static void strip_vlan_tag(struct sk_buff *skb);
+
+/* Remove VLAN tag for select TPIDs */
+static void
+strip_vlan_tag(struct sk_buff *skb)
+{
+    uint16_t    vlan_proto;
+    uint8_t     *pkt = skb->data;
+
+    vlan_proto = (uint16_t) ((pkt[12] << 8) | pkt[13]);
+    if ((vlan_proto == 0x8100) || (vlan_proto == 0x88a8) || (vlan_proto == 0x9100)) {
+        /* Move first 12 bytes of packet back by 4 */
+        memmove(&skb->data[4], skb->data, 12);
+        skb_pull(skb, 4);       /* Remove 4 bytes from start of buffer */
+    }
+}
+
+/*
+ * The function get_tag_status() returns the tag status.
+ * 0 = Untagged
+ * 1 = Single inner-tag
+ * 2 = Single outer-tag
+ * 3 = Double tagged.
+ * -1 = Unsupported type
+ */
+static int
+get_tag_status(uint32_t dev_type, void *meta)
+{
+    uint32_t  *valptr;
+    uint32_t  fd_index;
+    uint32_t  outer_l2_hdr;
+    int tag_status = -1;
+ 
+    if ((dev_type == 0xb880) || (dev_type == 0xb780))
+    {
+        /* Field BCM_PKTIO_RXPMD_MATCH_ID_LO has tag status in RX PMD */
+        fd_index = 2;
+        valptr = (uint32_t *)meta;
+        outer_l2_hdr = (valptr[fd_index] >> ((dev_type == 0xb780) ? 2 : 1) & 0xFF);
+
+        if (outer_l2_hdr & 0x1) {
+#ifdef KNET_CB_DEBUG
+            if (debug & 0x1) {
+                printk("  L2 Header Present\n");
+            }
+#endif
+            tag_status = 0;
+            if (outer_l2_hdr & 0x4) {
+#ifdef KNET_CB_DEBUG
+                if (debug & 0x1) {
+                    printk("  SNAP/LLC\n");
+                }
+#endif
+                tag_status = 0;
+            }
+            if (outer_l2_hdr & 0x10) {
+#ifdef KNET_CB_DEBUG
+                if (debug & 0x1) {
+                    printk("  Outer Tagged\n");
+                }
+#endif
+                tag_status = 2;    
+                if (outer_l2_hdr & 0x20) {
+#ifdef KNET_CB_DEBUG
+                    if (debug & 0x1) {
+                        printk("  Double Tagged\n");
+                    }
+#endif
+                    tag_status = 3;
+                }
+            }
+            else if (outer_l2_hdr & 0x20) {
+#ifdef KNET_CB_DEBUG
+                if (debug & 0x1) {
+                    printk("  Inner Tagged\n");
+                }
+#endif
+                tag_status = 1;
+            }
+        }
+    }
+    else if ((dev_type == 0xb990)|| (dev_type == 0xb996))
+    {
+        fd_index = 9;
+        valptr = (uint32_t *)meta;
+        /* On TH4, outer_l2_header means INCOMING_TAG_STATUS.
+         * TH4 only supports single tagging, so if TAG_STATUS
+         * says there's a tag, then we don't want to strip.
+         * Otherwise, we do.
+         */
+        outer_l2_hdr = (valptr[fd_index] >> 13) & 3;
+
+        if (outer_l2_hdr)
+        {
+            tag_status = 2;
+#ifdef KNET_CB_DEBUG
+            if (debug & 0x1)
+            {
+                printk("  Incoming frame tagged\n");
+            }
+#endif
+        }
+        else
+        {
+            tag_status = 0;
+#ifdef KNET_CB_DEBUG
+            if (debug & 0x1)
+            {
+                printk("  Incoming frame untagged\n");
+            }
+#endif
+        }
+    }
+#ifdef KNET_CB_DEBUG
+    if (debug & 0x1) {
+        printk("%s; Device Type: %d; tag status: %d\n", __func__, dev_type, tag_status);
+    }
+#endif
+    return tag_status;
+}
+
+#ifdef KNET_CB_DEBUG
+static void
+dump_buffer(uint8_t * data, int size)
+{
+    const char         *const to_hex = "0123456789ABCDEF";
+    int                 i;
+    char                buffer[128];
+    char               *buffer_ptr;
+    int                 addr = 0;
+
+    buffer_ptr = buffer;
+    for (i = 0; i < size; i++) {
+        *buffer_ptr++ = ' ';
+        *buffer_ptr++ = to_hex[(data[i] >> 4) & 0xF];
+        *buffer_ptr++ = to_hex[data[i] & 0xF];
+        if (((i % 16) == 15) || (i == size - 1)) {
+            *buffer_ptr = '\0';
+            buffer_ptr = buffer;
+            printk(KERN_INFO "%04X  %s\n", addr, buffer);
+            addr = i + 1;
+        }
+    }
+}
+
+static void
+show_pmd(uint8_t *pmd, int len)
+{
+    if (debug & 0x1) {
+        printk("PMD (%d bytes):\n", len);
+        dump_buffer(pmd, len);
+    }
+}
+
+static void
+show_mac(uint8_t *pkt)
+{
+    if (debug & 0x1) {
+        printk("DMAC=%02X:%02X:%02X:%02X:%02X:%02X\n",
+               pkt[0], pkt[1], pkt[2], pkt[3], pkt[4], pkt[5]);
+    }
+}
+#endif
+
+static struct sk_buff *
+strip_tag_rx_cb(struct sk_buff *skb)
+{
+    const struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    const struct ngknet_private *priv = cbd->priv;
+    int rcpu_mode = 0;
+    int tag_status;
+
+    rcpu_mode = (priv->flags & NGKNET_NETIF_F_RCPU_ENCAP)? 1 : 0;
+#ifdef KNET_CB_DEBUG
+    if (debug & 0x1)
+    {
+        printk(KERN_INFO
+               "\n%4u --------------------------------------------------------------------------------\n",
+               rx_count);
+        printk(KERN_INFO
+               "RX KNET callback: dev_no=%1d; dev_id=0x%04X; type_str=%4s; RCPU: %3s \n",
+               cbd->dev_no, cbd->dev_id, cbd->type_str, rcpu_mode ? "yes" : "no");
+        printk(KERN_INFO "                  pkt_len=%4d; pmd_len=%2d; SKB len: %4d\n",
+               cbd->pkt_len, cbd->pmd_len, skb->len);
+        if (cbd->filt) {
+            printk(KERN_INFO "Filter user data: 0x%08x\n",
+                   *(uint32_t *) cbd->filt->user_data);
+        }
+        printk(KERN_INFO "Before SKB (%d bytes):\n", skb->len);
+        dump_buffer(skb->data, skb->len);
+        printk("rx_cb for dev %d: id 0x%x, %s\n", cbd->dev_no, cbd->dev_id, cbd->type_str);
+        printk("netif user data: 0x%08x\n", *(uint32_t *)cbd->priv->user_data);
+        show_pmd(cbd->pmd, cbd->pmd_len);
+        if (rcpu_mode) {
+            const int           RCPU_header_len = PKT_HDR_SIZE + cbd->pmd_len;
+            const int           payload_len = skb->len - RCPU_header_len;
+            unsigned char      *payload_start = skb->data + payload_len;
+
+            printk(KERN_INFO "Packet Payload (%d bytes):\n", payload_len);
+            dump_buffer(payload_start, payload_len);
+        } else {
+            printk(KERN_INFO "Packet (%d bytes):\n", cbd->pkt_len);
+            dump_buffer(skb->data, cbd->pkt_len);
+        }
+    }
+#endif
+
+    if ((!rcpu_mode) && (cbd->filt)) {
+        if (FILTER_TAG_ORIGINAL == cbd->filt->user_data[0]) {
+            tag_status = get_tag_status(cbd->dev_id, (void *)cbd->pmd);
+            if (tag_status < 0) {
+                strip_stats.skipped++;
+                goto _strip_tag_rx_cb_exit;
+            }
+            strip_stats.checked++;
+            if (tag_status < 2) {
+                strip_stats.stripped++;
+                strip_vlan_tag(skb);
+            }
+        }
+    }
+_strip_tag_rx_cb_exit:
+#ifdef KNET_CB_DEBUG
+    if (debug & 0x1) {
+        printk(KERN_INFO "After SKB (%d bytes):\n", skb->len);
+        dump_buffer(skb->data, skb->len);
+        printk(KERN_INFO
+               "\n%4u --------------------------------------------------------------------------------\n",
+               rx_count++);
+    }
+#endif
+    return skb;
+}
+
+static struct sk_buff *
+strip_tag_tx_cb(struct sk_buff *skb)
+{
+#ifdef KNET_CB_DEBUG
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+
+    if (debug & 0x1) {
+        printk("tx_cb for dev %d: %s\n", cbd->dev_no, cbd->type_str);
+    }
+    show_pmd(cbd->pmd, cbd->pmd_len);
+    show_mac(cbd->pmd + cbd->pmd_len);
+#endif
+    return skb;
+}
+
+static struct sk_buff *
+ngknet_rx_cb(struct sk_buff *skb)
+{
+    skb = strip_tag_rx_cb(skb);
+#ifdef PSAMPLE_SUPPORT
+    skb = psample_rx_cb(skb); 
+#endif
+    return skb;
+}
+
+static struct sk_buff *
+ngknet_tx_cb(struct sk_buff *skb)
+{
+    skb = strip_tag_tx_cb(skb);
+    return skb;
+}
+
+static int
+ngknet_netif_create_cb(struct net_device *dev)
+{
+    int retv = 0;
+#ifdef PSAMPLE_SUPPORT
+    retv = psample_netif_create_cb(dev); 
+#endif
+    return retv;
+}
+
+static int
+ngknet_netif_destroy_cb(struct net_device *dev)
+{
+    int retv = 0;
+#ifdef PSAMPLE_SUPPORT
+    retv = psample_netif_destroy_cb(dev); 
+#endif
+    return retv;
+}
+
+/*!
+ * Generic module functions
+ */
+static int
+ngknetcb_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "Broadcom Linux NGKNET Callback: Untagged VLAN Stripper\n");
+    seq_printf(m, "    %lu stripped packets\n", strip_stats.stripped);
+    seq_printf(m, "    %lu packets checked\n", strip_stats.checked);
+    seq_printf(m, "    %lu packets skipped\n", strip_stats.skipped);
+    return 0;
+}
+
+static int
+ngknetcb_open(struct inode *inode, struct file *filp)
+{
+    return single_open(filp, ngknetcb_show, NULL);
+}
+
+static int
+ngknetcb_release(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static ssize_t
+ngknetcb_write(struct file *file, const char *buf,
+               size_t count, loff_t *loff)
+{
+    memset(&strip_stats, 0, sizeof(strip_stats));
+    printk("Cleared NGKNET callback stats\n");
+    return count;
+}
+
+static long
+ngknetcb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+    return 0;
+}
+
+static int
+ngknetcb_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+    return 0;
+}
+
+static struct file_operations ngknetcb_fops = {
+    .owner = THIS_MODULE,
+    .open = ngknetcb_open,
+    .read = seq_read,
+    .write = ngknetcb_write,
+    .llseek = seq_lseek,
+    .release = ngknetcb_release,
+    .unlocked_ioctl = ngknetcb_ioctl,
+    .compat_ioctl = ngknetcb_ioctl,
+    .mmap = ngknetcb_mmap,
+};
+
+static int __init
+ngknetcb_init_module(void)
+{
+    int rv;
+    struct proc_dir_entry *entry = NULL; 
+
+    rv = register_chrdev(NGKNETCB_MODULE_MAJOR, NGKNETCB_MODULE_NAME, &ngknetcb_fops);
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: can't get major %d\n",
+               NGKNETCB_MODULE_NAME, NGKNETCB_MODULE_MAJOR);
+        return rv;
+    }
+
+    PROC_CREATE(entry, NGKNETCB_MODULE_NAME, 0666, NULL, &ngknetcb_fops);
+    if (entry == NULL) {
+        printk(KERN_ERR "%s: proc_mkdir failed\n",
+                NGKNETCB_MODULE_NAME);
+    }
+
+    ngknet_rx_cb_register(ngknet_rx_cb);
+    ngknet_tx_cb_register(ngknet_tx_cb);
+
+#ifdef PSAMPLE_SUPPORT
+    psample_init();
+#endif
+
+    ngknet_netif_create_cb_register(ngknet_netif_create_cb);
+    ngknet_netif_destroy_cb_register(ngknet_netif_destroy_cb);
+    return 0;
+}
+
+static void __exit
+ngknetcb_exit_module(void)
+{
+    ngknet_netif_create_cb_unregister(ngknet_netif_create_cb);
+    ngknet_netif_destroy_cb_unregister(ngknet_netif_destroy_cb);
+
+#ifdef PSAMPLE_SUPPORT
+    psample_cleanup();
+#endif
+
+    ngknet_rx_cb_unregister(ngknet_rx_cb);
+    ngknet_tx_cb_unregister(ngknet_tx_cb);
+
+    remove_proc_entry(NGKNETCB_MODULE_NAME, NULL);
+
+    unregister_chrdev(NGKNETCB_MODULE_MAJOR, NGKNETCB_MODULE_NAME);
+}
+
+module_init(ngknetcb_init_module);
+module_exit(ngknetcb_exit_module);
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.c b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.c
new file mode 100644
index 000000000000..be34430218d3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.c
@@ -0,0 +1,995 @@
+/*
+ * Copyright 2017-2019 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation (the "GPL").
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 (GPLv2) for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 (GPLv2) along with this source code.
+ */
+/*
+ * $Id: psample_cb.c $
+ * $Copyright: (c) 2019 Broadcom Corp.
+ * All Rights Reserved.$
+ */
+
+/*
+ * Driver for call-back functions for Linux KNET driver.
+ *
+ * This code is used to integrate packet sampling KNET callback to 
+ * the psample infra for sending sampled pkts to userspace sflow 
+ * applications such as Host Sflow (https://github.com/sflow/host-sflow) 
+ * using genetlink interfaces.  
+ *
+ * The module can be built from the standard Linux user mode target
+ * directories using the following command (assuming bash), e.g.
+ *
+ *   cd $SDK/systems/linux/user/<target>
+ *   make BUILD_KNET_CB=1
+ *
+ */
+
+#include <lkm/lkm.h>
+#include <ngknet_callback.h>
+#include <linux/if_vlan.h>
+#include <linux/skbuff.h>
+#include <linux/sched.h>
+#include <linux/netdevice.h>
+#include <net/net_namespace.h>
+#include <net/psample.h>
+#include "psample-cb.h"
+
+#define PSAMPLE_CB_DBG
+#ifdef PSAMPLE_CB_DBG 
+extern int debug;
+#define PSAMPLE_CB_DBG_LVL_VERB (0x1)
+#define PSAMPLE_CB_DBG_LVL_PMD  (0x2)
+#define PSAMPLE_CB_DBG_PRINT(...) if (debug & PSAMPLE_CB_DBG_LVL_VERB) { printk(__VA_ARGS__); }
+#define PSAMPLE_CB_PMD_PRINT(...) if (debug & PSAMPLE_CB_DBG_LVL_PMD)  { printk(__VA_ARGS__); }
+#else
+#define PSAMPLE_CB_DBG_PRINT(...)
+#define PSAMPLE_CB_PMD_PRINT(...)
+#endif
+
+#define FCS_SZ 4
+#define PSAMPLE_NLA_PADDING 4
+#define PSAMPLE_PKT_HANDLED (1)
+
+#define PSAMPLE_RATE_DFLT 1
+#define PSAMPLE_SIZE_DFLT 128
+static int psample_size = PSAMPLE_SIZE_DFLT;
+MODULE_PARAM(psample_size, int, 0);
+MODULE_PARM_DESC(psample_size,
+"psample pkt size (default 128 bytes)");
+
+#define PSAMPLE_QLEN_DFLT 1024
+static int psample_qlen = PSAMPLE_QLEN_DFLT;
+MODULE_PARAM(psample_qlen, int, 0);
+MODULE_PARM_DESC(psample_qlen,
+"psample queue length (default 1024 buffers)");
+
+/* driver proc entry root */
+static struct proc_dir_entry *psample_proc_root = NULL;
+static struct proc_dir_entry *knet_cb_proc_root = NULL;
+
+/* psample general info */
+typedef struct {
+    struct list_head netif_list;
+    int netif_count;
+    struct net *netns;
+    spinlock_t lock;
+    int dcb_type;
+} psample_info_t;
+static psample_info_t g_psample_info = {0};
+
+/* Maintain sampled pkt statistics */
+typedef struct psample_stats_s {
+    unsigned long pkts_f_psample_cb;
+    unsigned long pkts_f_psample_mod;
+    unsigned long pkts_f_handled;
+    unsigned long pkts_f_pass_through;
+    unsigned long pkts_f_dst_mc;
+    unsigned long pkts_c_qlen_cur;
+    unsigned long pkts_c_qlen_hi;
+    unsigned long pkts_d_qlen_max;
+    unsigned long pkts_d_no_mem;
+    unsigned long pkts_d_no_group;
+    unsigned long pkts_d_sampling_disabled;
+    unsigned long pkts_d_not_ready;
+    unsigned long pkts_d_metadata;
+    unsigned long pkts_d_skb;
+    unsigned long pkts_d_skb_cbd;
+    unsigned long pkts_d_meta_srcport;
+    unsigned long pkts_d_meta_dstport;
+    unsigned long pkts_d_invalid_size;
+} psample_stats_t;
+static psample_stats_t g_psample_stats = {0};
+
+typedef struct psample_meta_s {
+    int trunc_size;
+    int src_ifindex;
+    int dst_ifindex;
+    int sample_rate;
+} psample_meta_t;
+
+typedef struct psample_pkt_s {
+    struct list_head list;
+    struct psample_group *group;
+    psample_meta_t meta;
+    struct sk_buff *skb;
+} psample_pkt_t;
+
+typedef struct psample_work_s {
+    struct list_head pkt_list;
+    struct work_struct wq;
+    spinlock_t lock;
+} psample_work_t;
+static psample_work_t g_psample_work = {0};
+
+static psample_netif_t*
+psample_netif_lookup_by_ifindex(int ifindex)
+{
+    struct list_head *list;
+    psample_netif_t *psample_netif = NULL;
+    unsigned long flags;
+
+    /* look for port from list of available net_devices */
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        if (psample_netif->dev->ifindex == ifindex) {
+            spin_unlock_irqrestore(&g_psample_info.lock, flags);
+            return psample_netif;
+        }
+    }
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+    return (NULL);
+}
+        
+static psample_netif_t*
+psample_netif_lookup_by_port(int port)
+{
+    struct list_head *list;
+    psample_netif_t *psample_netif = NULL;
+    unsigned long flags;
+
+    /* look for port from list of available net_devices */
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        if (psample_netif->port == port) {
+            spin_unlock_irqrestore(&g_psample_info.lock, flags);
+            return psample_netif;
+        }
+    }
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+    return (NULL);
+}
+
+static int
+psample_meta_sample_reason(uint8_t *pkt, void *pkt_meta)
+{
+    uint32_t *metadata = (uint32_t*)pkt_meta;
+    uint32_t reason = 0;
+    uint32_t reason_hi = 0;
+    uint32_t sample_rx_reason_mask = 0;
+
+    if (metadata) {
+        /* Sample Pkt reason code (bcmRxReasonSampleSource) */
+        switch(g_psample_info.dcb_type) {
+            case 36: /* TD3 */
+            case 38: /* TH3 */
+                reason_hi = *(metadata + 4);
+                reason    = *(metadata + 5);
+                sample_rx_reason_mask = (1 << 3);
+                break;
+            case 32: /* TH1/TH2 */
+            case 26: /* TD2 */
+            case 23: /* HX4 */
+                reason_hi = *(metadata + 2);
+                reason    = *(metadata + 3);
+                sample_rx_reason_mask = (1 << 5);
+                break;
+            default:
+                break;
+        }
+    }
+    PSAMPLE_CB_DBG_PRINT("%s: DCB%d sample_rx_reason_mask: 0x%08x, reason: 0x%08x, reason_hi: 0x%08x\n",
+            __func__, g_psample_info.dcb_type, sample_rx_reason_mask, reason, reason_hi);
+
+    /* Check if only sample reason code is set.
+     * If only sample reason code, then consume pkt.
+     * If other reason codes exist, then pkt should be
+     * passed through to Linux network stack.
+     */
+    if ((reason & ~sample_rx_reason_mask) || reason_hi) {
+        return 0; /* multiple reasons set, pass through */
+    }
+
+    /* only sample rx reason set, consume pkt */
+    return (PSAMPLE_PKT_HANDLED);
+}
+
+static int
+psample_meta_get(struct sk_buff *skb, psample_meta_t *sflow_meta)
+{
+    int src_ifindex = 0;
+    int sample_rate = 1;
+    int sample_size = PSAMPLE_SIZE_DFLT;
+    psample_netif_t *psample_netif = NULL;
+    const struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    const struct ngknet_private *netif = cbd->priv;
+    memset(sflow_meta, 0, sizeof(psample_meta_t));    
+
+    /* find src port */
+    if ((psample_netif = psample_netif_lookup_by_ifindex(netif->net_dev->ifindex))) {
+        src_ifindex = psample_netif->dev->ifindex;
+        sample_rate = psample_netif->sample_rate;
+        sample_size = psample_netif->sample_size;
+    } else {
+        g_psample_stats.pkts_d_meta_srcport++;
+        PSAMPLE_CB_DBG_PRINT("%s: could not find psample netif for src dev %s (ifidx %d)\n", 
+                             __func__, netif->net_dev->name, netif->net_dev->ifindex);
+    }
+
+    sflow_meta->src_ifindex = src_ifindex;
+    sflow_meta->trunc_size  = sample_size;
+    sflow_meta->sample_rate = sample_rate;
+    return (0);
+}
+
+static void
+psample_task(struct work_struct *work)
+{
+    psample_work_t *psample_work = container_of(work, psample_work_t, wq);
+    unsigned long flags;
+    struct list_head *list_ptr, *list_next;
+    psample_pkt_t *pkt;
+
+    spin_lock_irqsave(&psample_work->lock, flags);
+    list_for_each_safe(list_ptr, list_next, &psample_work->pkt_list) {
+        /* dequeue pkt from list */
+        pkt = list_entry(list_ptr, psample_pkt_t, list);
+        list_del(list_ptr);
+        g_psample_stats.pkts_c_qlen_cur--;
+        spin_unlock_irqrestore(&psample_work->lock, flags);
+ 
+        /* send to psample */
+        if (pkt) {
+            PSAMPLE_CB_DBG_PRINT("%s: group 0x%x, trunc_size %d, src_ifdx 0x%x, dst_ifdx 0x%x, sample_rate %d\n",
+                    __func__, pkt->group->group_num, 
+                    pkt->meta.trunc_size, pkt->meta.src_ifindex, 
+                    pkt->meta.dst_ifindex, pkt->meta.sample_rate);
+
+            psample_sample_packet(pkt->group, 
+                                  pkt->skb, 
+                                  pkt->meta.trunc_size,
+                                  pkt->meta.src_ifindex,
+                                  pkt->meta.dst_ifindex,
+                                  pkt->meta.sample_rate);
+            g_psample_stats.pkts_f_psample_mod++;
+ 
+            dev_kfree_skb_any(pkt->skb);
+            kfree(pkt);
+        }
+        spin_lock_irqsave(&psample_work->lock, flags);
+    }
+    spin_unlock_irqrestore(&psample_work->lock, flags);
+}
+
+struct sk_buff*
+psample_rx_cb(struct sk_buff *skb)
+{
+    struct psample_group *group;
+    psample_meta_t meta;   
+    int rv = 0, size;
+    const struct ngknet_callback_desc *cbd = NULL;
+    const struct ngknet_private *netif = NULL;
+    const struct ngknet_filter_s *filt = NULL;
+    const struct ngknet_filter_s *filt_src = NULL;
+
+    if (!skb) {
+        printk("%s: skb is NULL\n", __func__);
+        g_psample_stats.pkts_d_skb++;
+        return (NULL);
+    }
+    cbd = NGKNET_SKB_CB(skb);
+    netif = cbd->priv;
+    filt_src = cbd->filt;
+    filt = cbd->filt_cb;
+
+    if (!cbd || !netif || !filt_src) {
+        printk("%s: cbd(0x%p) or priv(0x%p) or filter src(0x%p) is NULL\n", 
+            __func__, cbd, netif, filt_src);
+        g_psample_stats.pkts_d_skb_cbd++;
+        return (skb);
+    }
+
+    /* Enable PMD output in dmesg: "echo "debug=0x2" > /proc/bcm/knet-cb/psample/debug"
+     * Use bshell cmd "pmddecode rxpmd ..." to decode pkt metadata 
+     */
+    if (debug & PSAMPLE_CB_DBG_LVL_PMD) {
+        char str[128];
+        int i, len = cbd->pmd_len > 128? 128 : cbd->pmd_len;
+        PSAMPLE_CB_PMD_PRINT("PMD (%d bytes): %s\n", 
+                cbd->pmd_len, skb->dev->name);
+        for (i=0; i<len; i+=4) {
+            if ((i & 0x1f) == 0) {
+                sprintf(str, "%04x: ", i);
+            }
+            sprintf(&str[strlen(str)], "0x%08x ", *((uint32_t*)(cbd->pmd+i)));
+            if ((i & 0x1c) == 0x1c) {
+                sprintf(&str[strlen(str)], "\n");
+                printk(str);
+                continue;
+            }
+        }
+        if ((i & 0x1f) != 0) {
+            sprintf(&str[strlen(str)], "\n");
+            PSAMPLE_CB_PMD_PRINT(str);
+        }
+    }
+
+    /* check if this packet is sampled packet (from sample filter) */
+    if (!filt || 
+        (NGKNET_FILTER_DEST_T_CB != filt->dest_type) ||
+        (strncmp(filt->desc, PSAMPLE_CB_NAME, NGKNET_FILTER_DESC_MAX) != 0)) {
+        return (skb);
+    }
+
+    PSAMPLE_CB_DBG_PRINT("%s: src dev %s, pkt size %d, filt->dest_id %d\n",
+            __func__, skb->dev->name, cbd->pkt_len, filt->dest_id);
+    g_psample_stats.pkts_f_psample_cb++;
+
+    /* get psample group info. psample genetlink group ID passed in filt->dest_id */
+    group = psample_group_get(g_psample_info.netns, filt->dest_id);
+    if (!group) {
+        printk("%s: Could not find psample genetlink group %d\n", __func__, filt->dest_id);
+        g_psample_stats.pkts_d_no_group++;
+        goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+    }
+
+    /* get psample metadata */
+    rv = psample_meta_get(skb, &meta);
+    if (rv < 0) {
+        printk("%s: Could not parse pkt metadata\n", __func__);
+        g_psample_stats.pkts_d_metadata++;
+        goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+    }
+
+    /* Adjust original pkt size to remove 4B FCS */
+    size = cbd->pkt_len;
+    if (size < FCS_SZ) {
+        g_psample_stats.pkts_d_invalid_size++;
+        goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+    } else {
+       size -= FCS_SZ; 
+    }
+
+    /* Account for padding in libnl used by psample */
+    if (meta.trunc_size >= size) {
+        meta.trunc_size = size - PSAMPLE_NLA_PADDING;
+    }
+
+    PSAMPLE_CB_DBG_PRINT("%s: group 0x%x, trunc_size %d, src_ifdx 0x%x, dst_ifdx 0x%x, sample_rate %d\n",
+            __func__, group->group_num, meta.trunc_size, meta.src_ifindex, meta.dst_ifindex, meta.sample_rate);
+
+    /* drop if configured sample rate is 0 */
+    if (meta.sample_rate > 0) {
+        unsigned long flags;
+        psample_pkt_t *psample_pkt;
+        struct sk_buff *skb_psample;
+
+        if (g_psample_stats.pkts_c_qlen_cur >= psample_qlen) {
+            printk("%s: tail drop due to max qlen %d reached\n", __func__, psample_qlen);
+            g_psample_stats.pkts_d_qlen_max++;
+            goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+        }
+
+        if ((psample_pkt = kmalloc(sizeof(psample_pkt_t), GFP_ATOMIC)) == NULL) {
+            printk("%s: failed to alloc psample mem for pkt\n", __func__);
+            g_psample_stats.pkts_d_no_mem++;
+            goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+        }
+        memcpy(&psample_pkt->meta, &meta, sizeof(psample_meta_t));
+        psample_pkt->group = group;
+
+        if ((skb_psample = dev_alloc_skb(meta.trunc_size)) == NULL) {
+            printk("%s: failed to alloc psample mem for pkt skb\n", __func__);
+            g_psample_stats.pkts_d_no_mem++;
+            goto PSAMPLE_FILTER_CB_PKT_HANDLED;
+        }
+
+        /* setup skb to point to pkt */
+        memcpy(skb_psample->data, skb->data, meta.trunc_size);
+        skb_put(skb_psample, meta.trunc_size);
+        skb_psample->len = meta.trunc_size;
+        psample_pkt->skb = skb_psample;
+
+        spin_lock_irqsave(&g_psample_work.lock, flags);
+        list_add_tail(&psample_pkt->list, &g_psample_work.pkt_list); 
+
+        g_psample_stats.pkts_c_qlen_cur++;
+        if (g_psample_stats.pkts_c_qlen_cur > g_psample_stats.pkts_c_qlen_hi) {
+            g_psample_stats.pkts_c_qlen_hi = g_psample_stats.pkts_c_qlen_cur;
+        }
+
+        schedule_work(&g_psample_work.wq);
+        spin_unlock_irqrestore(&g_psample_work.lock, flags);
+    } else {
+        g_psample_stats.pkts_d_sampling_disabled++;
+    }
+
+PSAMPLE_FILTER_CB_PKT_HANDLED:
+    /* if sample reason only, consume pkt. else pass through */
+    rv = psample_meta_sample_reason(skb->data, cbd->pmd);
+    if (rv) {
+        g_psample_stats.pkts_f_handled++;
+        return NULL;
+    }
+    g_psample_stats.pkts_f_pass_through++;
+    return skb;
+}
+
+int 
+psample_netif_create_cb(struct net_device *dev)
+{
+    int found;
+    struct list_head *list;
+    psample_netif_t *psample_netif, *lpsample_netif;
+    unsigned long flags;
+    struct ngknet_private *netif = NULL;
+
+    if (!dev) {
+        printk("%s: net_device is NULL\n", __func__);
+        return (-1);
+    }
+    netif = netdev_priv(dev);
+
+    if ((psample_netif = kmalloc(sizeof(psample_netif_t), GFP_ATOMIC)) == NULL) {
+        printk("%s: failed to alloc psample mem for netif '%s'\n", 
+                __func__, dev->name);
+        return (-1);
+    }
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+
+    psample_netif->dev = dev;
+    psample_netif->id = netif->id;
+    /* FIXME: port is not saved in ngknet_private, need to get from metadata?? */
+    //psample_netif->port = netif->port;
+    psample_netif->vlan = netif->vlan;
+    psample_netif->sample_rate = PSAMPLE_RATE_DFLT;
+    psample_netif->sample_size = PSAMPLE_SIZE_DFLT;
+
+    /* insert netif sorted by ID similar to bkn_knet_netif_create() */
+    found = 0;
+    list_for_each(list, &g_psample_info.netif_list) {
+        lpsample_netif = (psample_netif_t*)list;
+        if (netif->id < lpsample_netif->id) {
+            found = 1;
+            g_psample_info.netif_count++; 
+            break;
+        }
+    }
+
+    if (found) {
+        /* Replace previously removed interface */
+        list_add_tail(&psample_netif->list, &lpsample_netif->list);
+    } else {
+        /* No holes - add to end of list */
+        list_add_tail(&psample_netif->list, &g_psample_info.netif_list);
+    }
+   
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+
+    PSAMPLE_CB_DBG_PRINT("%s: added psample netif '%s'\n", __func__, dev->name);
+    return (0);
+}
+
+int
+psample_netif_destroy_cb(struct net_device *dev)
+{
+    int found;
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    unsigned long flags; 
+    struct ngknet_private *netif = NULL;
+
+    if (!dev) {
+        printk("%s: net_device is NULL\n", __func__);
+        return (-1);
+    }
+    netif = netdev_priv(dev);
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        if (netif->id == psample_netif->id) {
+            found = 1; 
+            list_del(&psample_netif->list);
+            PSAMPLE_CB_DBG_PRINT("%s: removing psample netif '%s'\n", __func__, dev->name);
+            kfree(psample_netif);
+            g_psample_info.netif_count--; 
+            break;
+        }
+    }
+
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+    
+    if (!found) {    
+        printk("%s: netif ID %d not found!\n", __func__, netif->id);
+        return (-1);
+    }
+    return (0);
+}
+
+/*
+ * psample rate Proc Read Entry
+ */
+static int
+psample_proc_rate_show(struct seq_file *m, void *v)
+{
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    unsigned long flags; 
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        seq_printf(m, "  %-14s %d\n", psample_netif->dev->name, psample_netif->sample_rate);
+    }
+
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+ 
+    return 0;
+}
+
+static int
+psample_proc_rate_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, psample_proc_rate_show, NULL);
+}
+
+/*
+ * psample rate Proc Write Entry
+ *
+ *   Syntax:
+ *   <netif>=<pkt sample rate>
+ *
+ *   Where <netif> is a virtual network interface name.
+ *
+ *   Examples:
+ *   eth4=1000
+ */
+static ssize_t
+psample_proc_rate_write(struct file *file, const char *buf,
+                    size_t count, loff_t *loff)
+{
+    int found;
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    char sample_str[40], *ptr, *newline;
+    unsigned long flags;
+
+
+    if (count > sizeof(sample_str)) {
+        count = sizeof(sample_str) - 1;
+        sample_str[count] = '\0';
+    }
+    if (copy_from_user(sample_str, buf, count)) {
+        return -EFAULT;
+    }
+    sample_str[count] = 0;
+    newline = strchr(sample_str, '\n');
+    if (newline) {
+        /* Chop off the trailing newline */
+        *newline = '\0';
+    }
+
+    if ((ptr = strchr(sample_str, '=')) == NULL &&
+        (ptr = strchr(sample_str, ':')) == NULL) {
+        printk("Error: Pkt sample rate syntax not recognized: '%s'\n", sample_str);
+        return count;
+    }
+    *ptr++ = 0;
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+   
+    found = 0; 
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        if (strcmp(psample_netif->dev->name, sample_str) == 0) {
+            psample_netif->sample_rate = simple_strtol(ptr, NULL, 10);
+            // TODO MLI@BRCM - check valid sample rate
+            found = 1; 
+            break;
+        }
+    }
+    
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+
+    if (!found) {
+        printk("Warning: Failed setting psample rate on unknown network interface: '%s'\n", sample_str);
+    }
+    return count;
+}
+
+struct file_operations psample_proc_rate_file_ops = {
+    owner:      THIS_MODULE,
+    open:       psample_proc_rate_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      psample_proc_rate_write,
+    release:    single_release,
+};
+
+/*
+ * psample size Proc Read Entry
+ */
+static int
+psample_proc_size_show(struct seq_file *m, void *v)
+{
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    unsigned long flags;
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        seq_printf(m, "  %-14s %d\n", psample_netif->dev->name, psample_netif->sample_size);
+    }
+
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+    return 0;
+}
+
+static int
+psample_proc_size_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, psample_proc_size_show, NULL);
+}
+
+/*
+ * psample size Proc Write Entry
+ *
+ *   Syntax:
+ *   <netif>=<pkt sample size in bytes>
+ *
+ *   Where <netif> is a virtual network interface name.
+ *
+ *   Examples:
+ *   eth4=128
+ */
+static ssize_t
+psample_proc_size_write(struct file *file, const char *buf,
+                    size_t count, loff_t *loff)
+{
+    int found;
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    char sample_str[40], *ptr, *newline;
+    unsigned long flags;
+
+    if (count > sizeof(sample_str)) {
+        count = sizeof(sample_str) - 1;
+        sample_str[count] = '\0';
+    }
+    if (copy_from_user(sample_str, buf, count)) {
+        return -EFAULT;
+    }
+    sample_str[count] = 0;
+    newline = strchr(sample_str, '\n');
+    if (newline) {
+        /* Chop off the trailing newline */
+        *newline = '\0';
+    }
+
+    if ((ptr = strchr(sample_str, '=')) == NULL &&
+        (ptr = strchr(sample_str, ':')) == NULL) {
+        printk("Error: Pkt sample size syntax not recognized: '%s'\n", sample_str);
+        return count;
+    }
+    *ptr++ = 0;
+
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+   
+    found = 0; 
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        if (strcmp(psample_netif->dev->name, sample_str) == 0) {
+            psample_netif->sample_size = simple_strtol(ptr, NULL, 10);
+            // TODO MLI@BRCM - check valid sample size
+            found = 1;
+            break; 
+        }
+    }
+    
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+
+    if (!found) {
+        printk("Warning: Failed setting psample size on unknown network interface: '%s'\n", sample_str);
+    }
+    return count;
+}
+
+struct file_operations psample_proc_size_file_ops = {
+    owner:      THIS_MODULE,
+    open:       psample_proc_size_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      psample_proc_size_write,
+    release:    single_release,
+};
+
+/*
+ * psample map Proc Read Entry
+ */
+static int
+psample_proc_map_show(struct seq_file *m, void *v)
+{
+    struct list_head *list;
+    psample_netif_t *psample_netif;
+    unsigned long flags;
+
+    seq_printf(m, "  Interface      logical port   ifindex\n");
+    seq_printf(m, "-------------    ------------   -------\n");
+    spin_lock_irqsave(&g_psample_info.lock, flags);
+    
+    list_for_each(list, &g_psample_info.netif_list) {
+        psample_netif = (psample_netif_t*)list;
+        seq_printf(m, "  %-14s %-14d %d\n",
+                psample_netif->dev->name,
+                psample_netif->port,
+                psample_netif->dev->ifindex);
+    }
+
+    spin_unlock_irqrestore(&g_psample_info.lock, flags);
+    return 0;
+}
+
+static int
+psample_proc_map_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, psample_proc_map_show, NULL);
+}
+
+struct file_operations psample_proc_map_file_ops = {
+    owner:      THIS_MODULE,
+    open:       psample_proc_map_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      NULL,
+    release:    single_release,
+};
+
+/*
+ * psample debug Proc Read Entry
+ */
+static int
+psample_proc_debug_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "BCM KNET %s Callback Config\n", PSAMPLE_CB_NAME);
+    seq_printf(m, "  debug:           0x%x\n", debug);
+    seq_printf(m, "  dcb_type:        %d\n",   g_psample_info.dcb_type);
+    seq_printf(m, "  netif_count:     %d\n",   g_psample_info.netif_count);
+    seq_printf(m, "  queue length:    %d\n",   psample_qlen);
+
+    return 0;
+}
+
+static int
+psample_proc_debug_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, psample_proc_debug_show, NULL);
+}
+
+/*
+ * psample debug Proc Write Entry
+ *
+ *   Syntax:
+ *   debug=<mask>
+ *
+ *   Where <mask> corresponds to the debug module parameter.
+ *
+ *   Examples:
+ *   debug=0x1
+ */
+static ssize_t
+psample_proc_debug_write(struct file *file, const char *buf,
+                    size_t count, loff_t *loff)
+{
+    char debug_str[40];
+    char *ptr;
+
+    if (count > sizeof(debug_str)) {
+        count = sizeof(debug_str) - 1;
+        debug_str[count] = '\0';
+    }
+    if (copy_from_user(debug_str, buf, count)) {
+        return -EFAULT;
+    }
+
+    if ((ptr = strstr(debug_str, "debug=")) != NULL) {
+        ptr += 6;
+        debug = simple_strtol(ptr, NULL, 0);
+    } else {
+        printk("Warning: unknown configuration setting\n");
+    }
+
+    return count;
+}
+
+struct file_operations psample_proc_debug_file_ops = {
+    owner:      THIS_MODULE,
+    open:       psample_proc_debug_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      psample_proc_debug_write,
+    release:    single_release,
+};
+
+static int
+psample_proc_stats_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "BCM KNET %s Callback Stats\n", PSAMPLE_CB_NAME);
+    seq_printf(m, "  DCB type %d\n",                          g_psample_info.dcb_type);
+    seq_printf(m, "  pkts filter psample cb         %10lu\n", g_psample_stats.pkts_f_psample_cb);
+    seq_printf(m, "  pkts sent to psample module    %10lu\n", g_psample_stats.pkts_f_psample_mod);
+    seq_printf(m, "  pkts handled by psample        %10lu\n", g_psample_stats.pkts_f_handled);
+    seq_printf(m, "  pkts pass through              %10lu\n", g_psample_stats.pkts_f_pass_through);
+    seq_printf(m, "  pkts with mc destination       %10lu\n", g_psample_stats.pkts_f_dst_mc);
+    seq_printf(m, "  pkts current queue length      %10lu\n", g_psample_stats.pkts_c_qlen_cur);
+    seq_printf(m, "  pkts high queue length         %10lu\n", g_psample_stats.pkts_c_qlen_hi);
+    seq_printf(m, "  pkts drop max queue length     %10lu\n", g_psample_stats.pkts_d_qlen_max);
+    seq_printf(m, "  pkts drop no memory            %10lu\n", g_psample_stats.pkts_d_no_mem);
+    seq_printf(m, "  pkts drop no psample group     %10lu\n", g_psample_stats.pkts_d_no_group);
+    seq_printf(m, "  pkts drop sampling disabled    %10lu\n", g_psample_stats.pkts_d_sampling_disabled);
+    seq_printf(m, "  pkts drop psample not ready    %10lu\n", g_psample_stats.pkts_d_not_ready);
+    seq_printf(m, "  pkts drop metadata parse error %10lu\n", g_psample_stats.pkts_d_metadata);
+    seq_printf(m, "  pkts drop skb error            %10lu\n", g_psample_stats.pkts_d_skb);
+    seq_printf(m, "  pkts drop skb cbd error        %10lu\n", g_psample_stats.pkts_d_skb_cbd);
+    seq_printf(m, "  pkts with invalid src port     %10lu\n", g_psample_stats.pkts_d_meta_srcport);
+    seq_printf(m, "  pkts with invalid dst port     %10lu\n", g_psample_stats.pkts_d_meta_dstport);
+    seq_printf(m, "  pkts with invalid orig pkt sz  %10lu\n", g_psample_stats.pkts_d_invalid_size);
+    return 0;
+}
+
+static int
+psample_proc_stats_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, psample_proc_stats_show, NULL);
+}
+
+/*
+ * psample stats Proc Write Entry
+ *
+ *   Syntax:
+ *   write any value to clear stats 
+ */
+static ssize_t
+psample_proc_stats_write(struct file *file, const char *buf,
+                    size_t count, loff_t *loff)
+{
+    int qlen_cur = 0;
+    unsigned long flags;
+
+    spin_lock_irqsave(&g_psample_work.lock, flags);
+    qlen_cur = g_psample_stats.pkts_c_qlen_cur;
+    memset(&g_psample_stats, 0, sizeof(psample_stats_t));
+    g_psample_stats.pkts_c_qlen_cur = qlen_cur;
+    spin_unlock_irqrestore(&g_psample_work.lock, flags);
+
+    return count;
+}
+struct file_operations psample_proc_stats_file_ops = {
+    owner:      THIS_MODULE,
+    open:       psample_proc_stats_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      psample_proc_stats_write,
+    release:    single_release,
+};
+
+int psample_cleanup(void)
+{
+    cancel_work_sync(&g_psample_work.wq);
+    remove_proc_entry("stats", psample_proc_root);
+    remove_proc_entry("rate",  psample_proc_root);
+    remove_proc_entry("size",  psample_proc_root);
+    remove_proc_entry("debug", psample_proc_root);
+    remove_proc_entry("map"  , psample_proc_root);
+    remove_proc_entry("psample", knet_cb_proc_root);
+    remove_proc_entry("bcm/knet-cb", NULL);
+    remove_proc_entry("bcm", NULL);
+    return 0;
+}
+
+int psample_init(void)
+{
+    #define PROCFS_MAX_PATH 1024
+    char psample_procfs_path[PROCFS_MAX_PATH];
+    struct proc_dir_entry *entry;
+
+    /* initialize proc files (for ngknet) */
+    proc_mkdir("bcm", NULL);
+
+    /* create procfs for psample */
+    snprintf(psample_procfs_path, PROCFS_MAX_PATH, "bcm/knet-cb");
+    knet_cb_proc_root = proc_mkdir(psample_procfs_path, NULL);
+    snprintf(psample_procfs_path, PROCFS_MAX_PATH, "%s/%s", psample_procfs_path, PSAMPLE_CB_NAME);
+    psample_proc_root = proc_mkdir(psample_procfs_path, NULL);
+
+    /* create procfs for psample stats */
+    PROC_CREATE(entry, "stats", 0666, psample_proc_root, &psample_proc_stats_file_ops);
+    if (entry == NULL) {
+        printk("%s: Unable to create procfs entry '/procfs/%s/stats'\n", __func__, psample_procfs_path);
+        return -1;
+    }
+
+    /* create procfs for setting sample rates */
+    PROC_CREATE(entry, "rate", 0666, psample_proc_root, &psample_proc_rate_file_ops);
+    if (entry == NULL) {
+        printk("%s: Unable to create procfs entry '/procfs/%s/rate'\n", __func__, psample_procfs_path);
+        return -1;
+    }
+
+    /* create procfs for setting sample size */
+    PROC_CREATE(entry, "size", 0666, psample_proc_root, &psample_proc_size_file_ops);
+    if (entry == NULL) {
+        printk("%s: Unable to create procfs entry '/procfs/%s/size'\n", __func__, psample_procfs_path);
+        return -1;
+    }
+    
+    /* create procfs for getting netdev mapping */
+    PROC_CREATE(entry, "map", 0666, psample_proc_root, &psample_proc_map_file_ops);
+    if (entry == NULL) {
+        printk("%s: Unable to create procfs entry '/procfs/%s/map'\n", __func__, psample_procfs_path);
+        return -1;
+    }
+
+    /* create procfs for debug log */
+    PROC_CREATE(entry, "debug", 0666, psample_proc_root, &psample_proc_debug_file_ops);
+    if (entry == NULL) {
+        printk("%s: Unable to create procfs entry '/procfs/%s/debug'\n", __func__, psample_procfs_path);
+        return -1;
+    }
+
+    /* clear data structs */
+    memset(&g_psample_stats, 0, sizeof(psample_stats_t));
+    memset(&g_psample_info, 0, sizeof(psample_info_t));
+    memset(&g_psample_work, 0, sizeof(psample_work_t));
+
+    /* FIXME: How to get DCB type from NGKNET? */
+    //g_psample_info.dcb_type
+
+    /* setup psample_info struct */
+    INIT_LIST_HEAD(&g_psample_info.netif_list); 
+    spin_lock_init(&g_psample_info.lock);
+
+    /* setup psample work queue */
+    spin_lock_init(&g_psample_work.lock); 
+    INIT_LIST_HEAD(&g_psample_work.pkt_list); 
+    INIT_WORK(&g_psample_work.wq, psample_task);
+
+    /* get net namespace */ 
+    g_psample_info.netns = get_net_ns_by_pid(current->pid);
+    if (!g_psample_info.netns) {
+        printk("%s: Could not get network namespace for pid %d\n", __func__, current->pid);
+        return (-1);
+    }
+    PSAMPLE_CB_DBG_PRINT("%s: current->pid %d, netns 0x%p, sample_size %d\n", __func__, 
+            current->pid, g_psample_info.netns, psample_size);
+
+
+    return 0;
+}
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.h b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.h
new file mode 100644
index 000000000000..2e3342ead5c3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017 Broadcom
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation (the "GPL").
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 (GPLv2) for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 2 (GPLv2) along with this source code.
+ */
+/*
+ * $Id: psample_cb.h $
+ * $Copyright: (c) 2019 Broadcom Corp.
+ * All Rights Reserved.$
+ */
+#ifndef __PSAMPLE_CB_H__
+#define __PSAMPLE_CB_H__
+
+#include <lkm/lkm.h>
+#include <linux/netdevice.h>
+
+//#define PSAMPLE_SUPPORT 1  // TODO: MLI@BRCM - Add this as part of conditional in Makefile
+#define PSAMPLE_CB_NAME "psample"
+
+extern int
+psample_init(void);
+
+extern int
+psample_cleanup(void);
+
+extern struct sk_buff*
+psample_rx_cb(struct sk_buff *skb);
+
+/* psample data per interface */
+typedef struct {
+    struct list_head list;
+    struct net_device *dev;
+    uint16_t id;
+    uint8_t  port;
+    uint16_t vlan;
+    uint16_t qnum;
+    uint32_t sample_rate;
+    uint32_t sample_size;
+} psample_netif_t;
+
+extern int
+psample_netif_create_cb(struct net_device *dev);
+
+extern int
+psample_netif_destroy_cb(struct net_device *dev);
+
+#endif /* __PSAMPLE_CB_H__ */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/psample/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/psample/Kbuild
new file mode 100644
index 000000000000..0049e399076b
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/psample/Kbuild
@@ -0,0 +1,18 @@
+# -*- Kbuild -*-
+#
+# Linux psample module.
+#
+# $Copyright: (c) 2020 Broadcom.
+# Broadcom Proprietary and Confidential. All rights reserved.$
+#
+
+obj-m := linux_psample.o
+
+ccflags-y := $(LKM_CFLAGS) \
+             -I$(SDK)/shr/include \
+             -I$(SDK)/bcmdrd/include \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/knet/include \
+             -I$(SDK)/linux/knet
+
+linux_psample-y := psample.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/psample/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/psample/Makefile
new file mode 100644
index 000000000000..b37b8ebb1c29
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/psample/Makefile
@@ -0,0 +1,21 @@
+# -*- Makefile -*-
+#
+# Linux psample module.
+#
+# $Copyright: (c) 2020 Broadcom.
+# Broadcom Proprietary and Confidential. All rights reserved.$
+#
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_psample
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean:
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/psample/psample.c b/platform/broadcom/saibcm-modules/sdklt/linux/psample/psample.c
new file mode 100644
index 000000000000..f0c9beab5784
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/psample/psample.c
@@ -0,0 +1,302 @@
+/*
+ * net/psample/psample.c - Netlink channel for packet sampling
+ * Copyright (c) 2017 Yotam Gigi <yotamg@mellanox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <lkm/lkm.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+#include <linux/module.h>
+#include <net/net_namespace.h>
+#include <net/sock.h>
+#include <net/netlink.h>
+#include <net/genetlink.h>
+#include <net/psample.h>
+#include <linux/spinlock.h>
+
+#define PSAMPLE_MAX_PACKET_SIZE 0xffff
+
+static LIST_HEAD(psample_groups_list);
+static DEFINE_SPINLOCK(psample_groups_lock);
+
+/* multicast groups */
+enum psample_nl_multicast_groups {
+	PSAMPLE_NL_MCGRP_CONFIG,
+	PSAMPLE_NL_MCGRP_SAMPLE,
+};
+
+static const struct genl_multicast_group psample_nl_mcgrps[] = {
+	[PSAMPLE_NL_MCGRP_CONFIG] = { .name = PSAMPLE_NL_MCGRP_CONFIG_NAME },
+	[PSAMPLE_NL_MCGRP_SAMPLE] = { .name = PSAMPLE_NL_MCGRP_SAMPLE_NAME },
+};
+
+static struct genl_family psample_nl_family;
+
+static int psample_group_nl_fill(struct sk_buff *msg,
+				 struct psample_group *group,
+				 enum psample_command cmd, u32 portid, u32 seq,
+				 int flags)
+{
+	void *hdr;
+	int ret;
+
+	hdr = genlmsg_put(msg, portid, seq, &psample_nl_family, flags, cmd);
+	if (!hdr)
+		return -EMSGSIZE;
+
+	ret = nla_put_u32(msg, PSAMPLE_ATTR_SAMPLE_GROUP, group->group_num);
+	if (ret < 0)
+		goto error;
+
+	ret = nla_put_u32(msg, PSAMPLE_ATTR_GROUP_REFCOUNT, group->refcount);
+	if (ret < 0)
+		goto error;
+
+	ret = nla_put_u32(msg, PSAMPLE_ATTR_GROUP_SEQ, group->seq);
+	if (ret < 0)
+		goto error;
+
+	genlmsg_end(msg, hdr);
+	return 0;
+
+error:
+	genlmsg_cancel(msg, hdr);
+	return -EMSGSIZE;
+}
+
+static int psample_nl_cmd_get_group_dumpit(struct sk_buff *msg,
+					   struct netlink_callback *cb)
+{
+	struct psample_group *group;
+	int start = cb->args[0];
+	int idx = 0;
+	int err;
+
+	spin_lock(&psample_groups_lock);
+	list_for_each_entry(group, &psample_groups_list, list) {
+		if (!net_eq(group->net, sock_net(msg->sk)))
+			continue;
+		if (idx < start) {
+			idx++;
+			continue;
+		}
+		err = psample_group_nl_fill(msg, group, PSAMPLE_CMD_NEW_GROUP,
+					    NETLINK_CB(cb->skb).portid,
+					    cb->nlh->nlmsg_seq, NLM_F_MULTI);
+		if (err)
+			break;
+		idx++;
+	}
+
+	spin_unlock(&psample_groups_lock);
+	cb->args[0] = idx;
+	return msg->len;
+}
+
+static const struct genl_ops psample_nl_ops[] = {
+	{
+		.cmd = PSAMPLE_CMD_GET_GROUP,
+		.dumpit = psample_nl_cmd_get_group_dumpit,
+		/* can be retrieved by unprivileged users */
+	}
+};
+
+static struct genl_family psample_nl_family = {
+	.name		= PSAMPLE_GENL_NAME,
+	.version	= PSAMPLE_GENL_VERSION,
+	.maxattr	= PSAMPLE_ATTR_MAX,
+	.netnsok	= true,
+	.module		= THIS_MODULE,
+	.mcgrps		= psample_nl_mcgrps,
+	.ops		= psample_nl_ops,
+	.n_ops		= ARRAY_SIZE(psample_nl_ops),
+	.n_mcgrps	= ARRAY_SIZE(psample_nl_mcgrps),
+};
+
+static void psample_group_notify(struct psample_group *group,
+				 enum psample_command cmd)
+{
+	struct sk_buff *msg;
+	int err;
+
+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
+	if (!msg)
+		return;
+
+	err = psample_group_nl_fill(msg, group, cmd, 0, 0, NLM_F_MULTI);
+	if (!err)
+		genlmsg_multicast_netns(&psample_nl_family, group->net, msg, 0,
+					PSAMPLE_NL_MCGRP_CONFIG, GFP_ATOMIC);
+	else
+		nlmsg_free(msg);
+}
+
+static struct psample_group *psample_group_create(struct net *net,
+						  u32 group_num)
+{
+	struct psample_group *group;
+
+	group = kzalloc(sizeof(*group), GFP_ATOMIC);
+	if (!group)
+		return NULL;
+
+	group->net = net;
+	group->group_num = group_num;
+	list_add_tail(&group->list, &psample_groups_list);
+
+	psample_group_notify(group, PSAMPLE_CMD_NEW_GROUP);
+	return group;
+}
+
+static void psample_group_destroy(struct psample_group *group)
+{
+	psample_group_notify(group, PSAMPLE_CMD_DEL_GROUP);
+	list_del(&group->list);
+	kfree(group);
+}
+
+static struct psample_group *
+psample_group_lookup(struct net *net, u32 group_num)
+{
+	struct psample_group *group;
+
+	list_for_each_entry(group, &psample_groups_list, list)
+		if ((group->group_num == group_num) && (group->net == net))
+			return group;
+	return NULL;
+}
+
+struct psample_group *psample_group_get(struct net *net, u32 group_num)
+{
+	struct psample_group *group;
+
+	spin_lock(&psample_groups_lock);
+
+	group = psample_group_lookup(net, group_num);
+	if (!group) {
+		group = psample_group_create(net, group_num);
+		if (!group)
+			goto out;
+	}
+	group->refcount++;
+
+out:
+	spin_unlock(&psample_groups_lock);
+	return group;
+}
+EXPORT_SYMBOL_GPL(psample_group_get);
+
+void psample_group_put(struct psample_group *group)
+{
+	spin_lock(&psample_groups_lock);
+
+	if (--group->refcount == 0)
+		psample_group_destroy(group);
+
+	spin_unlock(&psample_groups_lock);
+}
+EXPORT_SYMBOL_GPL(psample_group_put);
+
+void psample_sample_packet(struct psample_group *group, struct sk_buff *skb,
+			   u32 trunc_size, int in_ifindex, int out_ifindex,
+			   u32 sample_rate)
+{
+	struct sk_buff *nl_skb;
+	int data_len;
+	int meta_len;
+	void *data;
+	int ret;
+
+	meta_len = (in_ifindex ? nla_total_size(sizeof(u16)) : 0) +
+		   (out_ifindex ? nla_total_size(sizeof(u16)) : 0) +
+		   nla_total_size(sizeof(u32)) +	/* sample_rate */
+		   nla_total_size(sizeof(u32)) +	/* orig_size */
+		   nla_total_size(sizeof(u32)) +	/* group_num */
+		   nla_total_size(sizeof(u32));		/* seq */
+
+	data_len = min(skb->len, trunc_size);
+	if (meta_len + nla_total_size(data_len) > PSAMPLE_MAX_PACKET_SIZE)
+		data_len = PSAMPLE_MAX_PACKET_SIZE - meta_len - NLA_HDRLEN
+			    - NLA_ALIGNTO;
+
+	nl_skb = genlmsg_new(meta_len + nla_total_size(data_len), GFP_ATOMIC);
+	if (unlikely(!nl_skb))
+		return;
+
+	data = genlmsg_put(nl_skb, 0, 0, &psample_nl_family, 0,
+			   PSAMPLE_CMD_SAMPLE);
+	if (unlikely(!data))
+		goto error;
+
+	if (in_ifindex) {
+		ret = nla_put_u16(nl_skb, PSAMPLE_ATTR_IIFINDEX, in_ifindex);
+		if (unlikely(ret < 0))
+			goto error;
+	}
+
+	if (out_ifindex) {
+		ret = nla_put_u16(nl_skb, PSAMPLE_ATTR_OIFINDEX, out_ifindex);
+		if (unlikely(ret < 0))
+			goto error;
+	}
+
+	ret = nla_put_u32(nl_skb, PSAMPLE_ATTR_SAMPLE_RATE, sample_rate);
+	if (unlikely(ret < 0))
+		goto error;
+
+	ret = nla_put_u32(nl_skb, PSAMPLE_ATTR_ORIGSIZE, skb->len);
+	if (unlikely(ret < 0))
+		goto error;
+
+	ret = nla_put_u32(nl_skb, PSAMPLE_ATTR_SAMPLE_GROUP, group->group_num);
+	if (unlikely(ret < 0))
+		goto error;
+
+	ret = nla_put_u32(nl_skb, PSAMPLE_ATTR_GROUP_SEQ, group->seq++);
+	if (unlikely(ret < 0))
+		goto error;
+
+	if (data_len) {
+		int nla_len = nla_total_size(data_len);
+		struct nlattr *nla;
+
+		nla = (struct nlattr *)skb_put(nl_skb, nla_len);
+		nla->nla_type = PSAMPLE_ATTR_DATA;
+		nla->nla_len = nla_attr_size(data_len);
+
+		if (skb_copy_bits(skb, 0, nla_data(nla), data_len))
+			goto error;
+	}
+
+	genlmsg_end(nl_skb, data);
+	genlmsg_multicast_netns(&psample_nl_family, group->net, nl_skb, 0,
+				PSAMPLE_NL_MCGRP_SAMPLE, GFP_ATOMIC);
+
+	return;
+error:
+	pr_err_ratelimited("Could not create psample log message\n");
+	nlmsg_free(nl_skb);
+}
+EXPORT_SYMBOL_GPL(psample_sample_packet);
+
+static int __init psample_module_init(void)
+{
+	return genl_register_family(&psample_nl_family);
+}
+
+static void __exit psample_module_exit(void)
+{
+	genl_unregister_family(&psample_nl_family);
+}
+
+module_init(psample_module_init);
+module_exit(psample_module_exit);
+
+MODULE_AUTHOR("Yotam Gigi <yotamg@mellanox.com>");
+MODULE_DESCRIPTION("netlink channel for packet sampling");
+MODULE_LICENSE("GPL v2");
diff --git a/platform/broadcom/saibcm-modules/sdklt/make/lkm.mk b/platform/broadcom/saibcm-modules/sdklt/make/lkm.mk
new file mode 100644
index 000000000000..c3d2a4d40b50
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/make/lkm.mk
@@ -0,0 +1,76 @@
+#
+# $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+# The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License 
+# version 2 as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# A copy of the GNU General Public License version 2 (GPLv2) can
+# be found in the LICENSES folder.$
+#
+# Shared makefile include for building Linux kernel modules.
+#
+
+# KDIR must point to the Linux kernel sources
+ifndef KDIR
+nokdir:; @echo 'The $$KDIR variable is not set'; exit 1
+endif
+
+# Required for older kernels
+export EXTRA_CFLAGS = $(ccflags-y)
+
+PWD := $(shell pwd)
+
+ifneq ($(LKM_BLDDIR),)
+#
+# If a build directory has been specified, then we symlink all sources
+# to this directory and redirect the module build path.
+#
+# Note that the KBUILD_OUTPUT variable cannot be used to redirect the
+# output as we want it.
+#
+MDIR = $(LKM_BLDDIR)
+MSRCS = $(patsubst %.o,%.c,$($(MOD_NAME)-y))
+MSRCS += Makefile Kbuild
+BSRCS = $(addprefix $(PWD)/,$(MSRCS))
+else
+#
+# Build in current directory by default.
+#
+MDIR = $(PWD)
+endif
+
+all:
+	$(Q)echo Building kernel module $(MOD_NAME)
+ifneq ($(LKM_BLDDIR),)
+ifneq ($(LKM_BLDDIR),$(PWD))
+	$(Q)mkdir -p $(MDIR)
+	(cd $(MDIR); \
+	 rm -rf *.c Makefile Kbuild; \
+	 for f in $(BSRCS); do \
+	     ln -s $$f; \
+	 done)
+endif
+endif
+	$(MAKE) -C $(KDIR) M=$(MDIR)
+
+clean::
+	$(Q)echo Cleaning kernel module $(MOD_NAME)
+	$(MAKE) -C $(KDIR) M=$(MDIR) clean
+ifneq ($(LKM_BLDDIR),)
+ifneq ($(LKM_BLDDIR),$(PWD))
+# Remove all files except for Makefile (needed by 'make clean')
+	rm -f $(LKM_BLDDIR)/*[cdors]
+endif
+endif
+
+.PHONY: all clean
+
+# Standard documentation targets
+-include $(SDK)/make/doc.mk
diff --git a/platform/broadcom/saibcm-modules/sdklt/shr/include/shr/shr_error.h b/platform/broadcom/saibcm-modules/sdklt/shr/include/shr/shr_error.h
new file mode 100644
index 000000000000..1924d600de53
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/shr/include/shr/shr_error.h
@@ -0,0 +1,195 @@
+/*! \file shr_error.h
+ *
+ * Shared error codes.
+ *
+ */
+/*
+ * $Copyright: Copyright 2018-2020 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.$
+ */
+
+#ifndef SHR_ERROR_H
+#define SHR_ERROR_H
+
+/*!
+ * \brief Standard SDK error codes.
+ *
+ * IMPORTANT: These error codes must match the corresponding text
+ * messages in shr_error.c.
+ */
+typedef enum {
+
+    /*!
+     * The operation completed successfully.
+     */
+    SHR_E_NONE                 =  0,
+
+    /*!
+     * This usually indicates that software encountered an internal
+     * data inconsistency or an unanticipated hardware state.
+     */
+    SHR_E_INTERNAL             = -1,
+
+    /*!
+     * An operation failed due to insufficient dynamically allocated
+     * memory.
+     */
+    SHR_E_MEMORY               = -2,
+
+    /*!
+     * The first argument of many API routines is a unit number. This
+     * error occurs if that number refers to a non-existent unit.
+     */
+    SHR_E_UNIT                 = -3,
+
+    /*!
+     * A parameter to an API routine was invalid. A null pointer value
+     * may have been passed to the routine, or an integer parameter
+     * may be outside of its allowed range.
+     */
+    SHR_E_PARAM                = -4,
+
+    /*!
+     * The operation encountered a pooled resource (e.g. a table or a
+     * list) with no valid elements.
+     */
+    SHR_E_EMPTY                = -5,
+
+    /*!
+     * The operation encountered a pooled resource (e.g. a table or a
+     * list) with no room for new elements.
+     */
+    SHR_E_FULL                 = -6,
+
+    /*!
+     * The specified entry in a pooled resource (e.g. a table or a
+     * list) could not be found.
+     */
+    SHR_E_NOT_FOUND            = -7,
+
+    /*!
+     * The specified entry of a pooled resource (e.g. a table or a
+     * list) already exists.
+     */
+    SHR_E_EXISTS               = -8,
+
+    /*!
+     * The operation did not complete within the maximum allowed time frame.
+     */
+    SHR_E_TIMEOUT              = -9,
+
+    /*!
+     * An operation was attempted before the previous operation had
+     * completed.
+     */
+    SHR_E_BUSY                 = -10,
+
+    /*!
+     * An operation could not be completed. This may be due to a
+     * hardware or configuration problem.
+     */
+    SHR_E_FAIL                 = -11,
+
+    /*!
+     * The operation could not be completed because a required feature
+     * was disabled.
+     */
+    SHR_E_DISABLED             = -12,
+
+    /*!
+     * The specified identifier was not valid. Note that this error
+     * code will normally take precedence over \ref SHR_E_PARAM.
+     */
+    SHR_E_BADID                = -13,
+
+    /*!
+     * The operation could not be completed due to lack of hardware
+     * resources.
+     */
+    SHR_E_RESOURCE             = -14,
+
+    /*!
+     * The operation could not be completed due to incomplete or
+     * incorrect configuration.
+     */
+    SHR_E_CONFIG               = -15,
+
+    /*!
+     * The hardware does not support the requested operation.
+     */
+    SHR_E_UNAVAIL              = -16,
+
+    /*!
+     * An operation was attempted before initialization was complete.
+     */
+    SHR_E_INIT                 = -17,
+
+    /*!
+     * The specified port value was not valid. Note that this error
+     * code will normally take precedence over \ref SHR_E_PARAM.
+     */
+    SHR_E_PORT                 = -18,
+
+    /*!
+     * A low-level register or memory access failed.
+     */
+    SHR_E_IO                   = -19,
+
+    /*!
+     * Access method not permitted. Typically returned if attempting
+     * to write to a read-only object.
+     */
+    SHR_E_ACCESS               = -20,
+
+    /*!
+     * No handler exists to perform the hardware access associated
+     * with a an operation on a software object.
+     */
+    SHR_E_NO_HANDLER           = -21,
+
+    /*!
+     * The operation was only partially completed, and this could
+     * potentially leave the system in an unexpected state.
+     */
+    SHR_E_PARTIAL              = -22,
+
+    /*!
+     * The operation failed because of a hash collision.
+     */
+    SHR_E_COLL                 = -23,
+
+    SHR_E_LIMIT                = -24           /* Must come last */
+
+} shr_error_t;
+
+/*! Check for successful return value. */
+#define SHR_SUCCESS(_expr) ((_expr) >= 0)
+
+/*! Check for error return value. */
+#define SHR_FAILURE(_expr) ((_expr) < 0)
+
+/*!
+ * \brief Get standard error message
+ *
+ * Returns a text message corresponding to the error code passed in.
+ *
+ * \param [in] rv Error code
+ *
+ * \return Pointer to error message
+ */
+extern const char *
+shr_errmsg(int rv);
+
+#endif /* SHR_ERROR_H */
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
index bdf7a56dcabb..c4d31579bfdf 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /***********************************************************************
  *
@@ -58,7 +69,6 @@
 #define __LINUX_BDE_H__
 
 #include <sal/types.h>
-
 #include <ibde.h>
 
 
@@ -104,12 +114,17 @@
 
 /* Max devices */
 /* 16 switch chips + 2 out-of-band Ethernet + 2 CPUs */
+#ifndef LINUX_BDE_MAX_SWITCH_DEVICES
 #define LINUX_BDE_MAX_SWITCH_DEVICES    16
+#endif
 #define LINUX_BDE_MAX_ETHER_DEVICES     2
 #define LINUX_BDE_MAX_CPU_DEVICES       2
 #define LINUX_BDE_MAX_DEVICES           (LINUX_BDE_MAX_SWITCH_DEVICES + \
                                          LINUX_BDE_MAX_ETHER_DEVICES + \
-                                         LINUX_BDE_MAX_CPU_DEVICES) 
+                                         LINUX_BDE_MAX_CPU_DEVICES)
+#define LINUX_BDE_NOF_DEVICE_BITMAP_WORDS ((LINUX_BDE_MAX_DEVICES+31)/32)
+#define LINUX_BDE_MAX_IPROC_UC_CORES    12 /* Maximum number of R5 cores per device */
+typedef uint32 linux_bde_device_bitmap_t[LINUX_BDE_NOF_DEVICE_BITMAP_WORDS];
 
 /* 
  * PCI devices will be initialized by the Linux Kernel, 
@@ -148,14 +163,24 @@ typedef struct linux_bde_bus_s {
  */
 #define BDE_DEV_STATE_CHANGED      (2)
 
+/*
+ * BDE_DEV_INST_ID_INVALID : The invalid instance identifier.
+ */
+#define BDE_DEV_INST_ID_INVALID    ((uint32)-1)
+
 extern int linux_bde_create(linux_bde_bus_t* bus, ibde_t** bde);
 extern int linux_bde_destroy(ibde_t* bde);
 #ifdef BCM_INSTANCE_SUPPORT
 extern int linux_bde_instance_attach(unsigned int dev_mask,unsigned int dma_size);
+extern int linux_bde_instance_config(linux_bde_device_bitmap_t dev_mask,unsigned int dma_size);
 #endif
 
 #ifdef __KERNEL__
 
+#ifdef INCLUDE_EDK
+#define BDE_EDK_SUPPORT
+#endif
+
 /*
  *  Backdoors provided by the kernel bde
  *
@@ -171,6 +196,10 @@ extern int linux_bde_instance_attach(unsigned int dev_mask,unsigned int dma_size
 extern int lkbde_get_dma_info(phys_addr_t *cpu_pbase, phys_addr_t *dma_pbase, ssize_t *size);
 extern uint32 lkbde_get_dev_phys(int d);
 extern uint32 lkbde_get_dev_phys_hi(int d);
+#ifdef BDE_EDK_SUPPORT
+extern int lkbde_edk_get_dma_info(int dev_id, phys_addr_t* cpu_pbase,
+                                  phys_addr_t* dma_pbase, ssize_t* size);
+#endif
 
 /*
  * Virtual device address needed by kernel space
@@ -183,8 +212,8 @@ extern void *lkbde_get_dev_virt(int d);
  * the userland code to mmap. The following functions
  * supports multiple resources for a single device.
  */
-extern int lkbde_get_dev_resource(int d, int rsrc, uint32 *flags,
-                                  uint32 *phys_lo, uint32 *phys_hi); 
+extern int lkbde_get_dev_resource(int d, int rsrc, uint32_t *phys_lo,
+                                  uint32_t *phys_hi, uint32_t *size);
 
 /*
  * Backdoor to retrieve OS device structure to be used for
@@ -215,6 +244,19 @@ extern int lkbde_dev_state_set(int d, uint32 state);
 extern int lkbde_dev_instid_get(int d, uint32 *instid);
 extern int lkbde_dev_instid_set(int d, uint32 instid);
 
+
+/*
+ * Return none-zero if the SDK instance with the given instance ID
+ * manages the given device.
+ */
+extern int lkbde_is_dev_managed_by_instance(uint32 dev, uint32 inst_id);
+
+/*
+ * Return a pointer to the bitmap of the SDK instance managed devices.
+ */
+extern linux_bde_device_bitmap_t* lkbde_get_inst_devs(uint32 inst_id);
+
+
 /*
  * Functions that allow an interrupt handler in user mode to
  * coexist with interrupt handler in kernel module.
@@ -256,13 +298,6 @@ extern int lkbde_cpu_pci_register(int d);
 #endif
 #endif
 
-/* Don't use _SIMPLE_MEMORY_ALLOCATION_ method for newer kernel than 3.10.0 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))
-#ifndef _SIMPLE_MEMORY_ALLOCATION_
-#define _SIMPLE_MEMORY_ALLOCATION_ 0
-#endif
-#endif
-
 /* Allocation via dma_alloc_coherent is turned off by default */
 #ifndef _SIMPLE_MEMORY_ALLOCATION_
 #define _SIMPLE_MEMORY_ALLOCATION_ 9 /* compile in the allocation method, but do not use it by default */
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux_dma.h b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux_dma.h
index 3bf7488abce9..23eb3fa33e9e 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux_dma.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux_dma.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /***********************************************************************
  *
@@ -60,7 +71,7 @@
 
 extern void _dma_init(int dev_index);
 extern int _dma_cleanup(void);
-extern void _dma_pprint(void);
+extern void _dma_pprint(struct seq_file *m);
 extern uint32_t *_salloc(int d, int size, const char *name);
 extern void _sfree(int d, void *ptr);
 extern int _sinval(int d, void *ptr, int length);
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/include/mpool.h b/platform/broadcom/saibcm-modules/systems/bde/linux/include/mpool.h
index be4d436f8da9..15d496ff623d 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/include/mpool.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/include/mpool.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: mpool.h,v 1.2 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/Makefile b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/Makefile
index cfd72d3a9216..2aa3bec11d73 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.18 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
index 3a60ac4dd54e..9029b3b51477 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
@@ -339,10 +339,19 @@ typedef struct bde_ctrl_s {
     uint32 dev_state;
 
     /* inst_id */
-    uint32 inst_id;
+    uint32 inst_id; /* The instance ID of the instance controlling the device */
 } bde_ctrl_t;
 
 static bde_ctrl_t _devices[LINUX_BDE_MAX_DEVICES];
+
+/* information stored per SDK instance, curently the devices it manages */
+typedef struct {
+    linux_bde_device_bitmap_t devices; /* The devices controlled by this instance */
+} lkbde_inst_info_t;
+
+/* Information for each SDK instance (array index), the device that it manages */
+static lkbde_inst_info_t _instance_info[LINUX_BDE_MAX_DEVICES] = {{ .devices = {0}}};
+
 static int _ndevices = 0;
 static int _switch_ndevices = 0;
 static int _ether_ndevices = 0;
@@ -810,6 +819,25 @@ iproc_cmicd_probe(struct platform_device *pldev)
 static int
 iproc_cmicd_remove(struct platform_device *pldev)
 {
+    int i;
+    uint32 mask = BDE_SWITCH_DEV_TYPE | BDE_AXI_DEV_TYPE;
+    bde_ctrl_t *ctrl;
+
+    for (i = 0; i < _ndevices; i++) {
+        ctrl = _devices + i;
+        if ((ctrl->dev_type & mask) == mask) {
+            if (ctrl->bde_dev.base_address1) {
+                iounmap((void *)ctrl->bde_dev.base_address1);
+                ctrl->bde_dev.base_address1 = 0;
+            }
+
+            if (ctrl->bde_dev.base_address) {
+                iounmap((void *)ctrl->bde_dev.base_address);
+                ctrl->bde_dev.base_address = 0;
+            }
+        }
+    }
+
     return 0;
 }
 #ifdef CONFIG_OF
@@ -1429,6 +1457,7 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM53575_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56070_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56071_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56072_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9656, PCI_ANY_ID, PCI_ANY_ID },
     { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9056, PCI_ANY_ID, PCI_ANY_ID },
     { BCM53000_VENDOR_ID, BCM53000PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1474,9 +1503,11 @@ static const struct pci_device_id _id_table[] = {
 
 
     { BROADCOM_VENDOR_ID, BCM88270_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88271_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88272_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88273_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88274_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88276_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88278_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88279_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
 
@@ -1496,7 +1527,6 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM88687_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88380_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88381_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88202_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88360_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88361_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88363_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1527,18 +1557,37 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM8869E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM8869F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88800_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88821_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88826_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88801_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88802_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88803_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88804_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88805_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88806_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88807_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88808_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88809_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880A_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880B_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880C_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880D_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8880F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88820_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88821_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88822_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88823_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88824_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88825_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88826_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88827_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88828_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88829_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882A_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882B_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882C_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882D_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8882F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88480_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88481_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88482_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1555,12 +1604,40 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM8848D_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM8848E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM8848F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88280_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88281_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88282_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88283_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88284_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88285_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88286_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88287_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88288_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88289_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828A_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828B_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828C_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828D_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8828F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88850_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88851_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88852_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88853_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88854_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88855_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88856_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88857_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88858_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM88859_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885A_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885B_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885C_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885D_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM8885F_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
 #endif /* BCM_DNX_SUPPORT */
 #ifdef BCM_DFE_SUPPORT
-    { BROADCOM_VENDOR_ID, BCM88750_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88753_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88755_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88770_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88773_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88774_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1574,7 +1651,6 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM88954_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88955_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88956_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM88752_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88772_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM88952_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
 #endif
@@ -1613,6 +1689,10 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM56276_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56277_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56278_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56279_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56575_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56175_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56176_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56370_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56371_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56372_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1638,6 +1718,7 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM56470_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56471_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56472_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM56475_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { 0, 0, 0, 0 }
 };;
 
@@ -2540,9 +2621,6 @@ _pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 
 #if defined(BCM_DFE_SUPPORT)
     switch (dev->device) {
-    case BCM88750_DEVICE_ID:
-    case BCM88753_DEVICE_ID:
-    case BCM88755_DEVICE_ID:
     case BCM88770_DEVICE_ID:
     case BCM88773_DEVICE_ID:
     case BCM88774_DEVICE_ID:
@@ -2554,7 +2632,6 @@ _pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
     case BCM88954_DEVICE_ID:
     case BCM88955_DEVICE_ID:
     case BCM88956_DEVICE_ID:
-    case BCM88752_DEVICE_ID:
     case BCM88772_DEVICE_ID:
     case BCM88952_DEVICE_ID:
 
@@ -2801,9 +2878,10 @@ _pci_remove(struct pci_dev* dev)
 }
 
 static struct pci_driver _device_driver = {
-    probe: _pci_probe,
-    remove: _pci_remove,
-    id_table: _id_table,
+    .name = LINUX_KERNEL_BDE_NAME,
+    .probe = _pci_probe,
+    .remove = _pci_remove,
+    .id_table = _id_table,
     /* The rest are dynamic */
 };
 
@@ -2978,7 +3056,13 @@ probe_plx_local_bus(void)
 static int
 _init(void)
 {
+    unsigned i;
 #ifdef IPROC_CMICD
+    /*
+     * Adjust the PCI driver name to prevent our device file from
+     * getting removed when the module is unloaded.
+     */
+    _device_driver.name = LINUX_KERNEL_BDE_NAME ".iproc";
 #ifdef CONFIG_OF
     if (of_find_compatible_node(NULL, NULL, IPROC_CMICX_COMPATIBLE)) {
         iproc_platform_driver_register(&iproc_cmicd_driver);
@@ -3000,9 +3084,6 @@ _init(void)
 #ifdef BCM_ICS
     _ics_bde_create();
 #else /* PCI */
-    /* Register our goodies */
-    _device_driver.name = LINUX_KERNEL_BDE_NAME;
-
 
     /* Configure MSI interrupt support */
     use_msi = usemsi;
@@ -3078,6 +3159,10 @@ _init(void)
         }
     }
 
+    for (i = 0; i < LINUX_BDE_MAX_DEVICES; ++i) {
+        _devices[i].inst_id = BDE_DEV_INST_ID_INVALID;
+    }
+
     return 0;
 }
 
@@ -3150,45 +3235,45 @@ _cleanup(void)
  *    Always 0
  */
 static int
-_pprint(void)
+_pprint(struct seq_file *m)
 {
     int i = 0;
 
-    pprintf("Broadcom Device Enumerator (%s)\n", LINUX_KERNEL_BDE_NAME);
+    pprintf(m, "Broadcom Device Enumerator (%s)\n", LINUX_KERNEL_BDE_NAME);
 
-    pprintf("Module parameters:\n");
-    pprintf("\tmaxpayload=%d\n", maxpayload);
-    pprintf("\tusemsi=%d\n", usemsi);
+    pprintf(m, "Module parameters:\n");
+    pprintf(m, "\tmaxpayload=%d\n", maxpayload);
+    pprintf(m, "\tusemsi=%d\n", usemsi);
 
-    _dma_pprint();
+    _dma_pprint(m);
 
     if (_ndevices == 0) {
-        pprintf("No devices found\n");
+        pprintf(m, "No devices found\n");
     } else {
-        pprintf("Devices:\n");
+        pprintf(m, "Devices:\n");
     }
     for (i = 0; i < _ndevices; i++) {
         bde_ctrl_t *ctrl = _devices + i;
 
         if (ctrl->dev_type & BDE_SWITCH_DEV_TYPE) {
-            pprintf("\t%d (swi) : ", i);
+            pprintf(m, "\t%d (swi) : ", i);
         } else if (ctrl->dev_type & BDE_ETHER_DEV_TYPE) {
-            pprintf("\t%d (eth) : ", i);
+            pprintf(m, "\t%d (eth) : ", i);
         } else if (ctrl->dev_type & BDE_CPU_DEV_TYPE) {
-            pprintf("\t%d (cpu) : ", i);
+            pprintf(m, "\t%d (cpu) : ", i);
         } else {
-            pprintf("\t%d (?)   : ", i);
+            pprintf(m, "\t%d (?)   : ", i);
         }
 
         if (ctrl->dev_state == BDE_DEV_STATE_REMOVED) {
-            pprintf("PCI device 0x%x:0x%x:%d   REMOVED\n",
+            pprintf(m, "PCI device 0x%x:0x%x:%d   REMOVED\n",
                     ctrl->pci_device->vendor,
                     ctrl->pci_device->device,
                     ctrl->bde_dev.rev);
             continue;
         }
         if (ctrl->dev_type & BDE_PCI_DEV_TYPE) {
-            pprintf("PCI device %02x:%02x.%x 0x%x:0x%x:%d:0x%.8lx:0x%.8lx:%d%s\n",
+            pprintf(m, "PCI device %02x:%02x.%x 0x%x:0x%x:%d:0x%.8lx:0x%.8lx:%d%s\n",
                     (unsigned int)ctrl->pci_device->bus->number,
                     PCI_SLOT(ctrl->pci_device->devfn),
                     PCI_FUNC(ctrl->pci_device->devfn),
@@ -3200,7 +3285,7 @@ _pprint(void)
                     ctrl->pci_device->irq,
                     ctrl->use_msi ? " (MSI)" : "");
         } else if (ctrl->dev_type & BDE_SPI_DEV_TYPE) {
-            pprintf("SPI Device %d:%x:%x:0x%x:0x%x:%d\n",
+            pprintf(m, "SPI Device %d:%x:%x:0x%x:0x%x:%d\n",
                     ctrl->spi_device->cid,
                     ctrl->spi_device->part,
                     ctrl->spi_device->rev,
@@ -3208,26 +3293,35 @@ _pprint(void)
                     ctrl->spi_device->phyid_low,
                     ctrl->bde_dev.rev);
         } else if (ctrl->dev_type & BDE_ICS_DEV_TYPE) {
-            pprintf("ICS Device 0x%x:0x%x\n",
+            pprintf(m, "ICS Device 0x%x:0x%x\n",
                     ctrl->bde_dev.device,
                     ctrl->bde_dev.rev);
         } else if (ctrl->dev_type & BDE_AXI_DEV_TYPE) {
-            pprintf("AXI Device 0x%x:0x%x:0x%.8lx:%d\n",
+            pprintf(m, "AXI Device 0x%x:0x%x:0x%.8lx:%d\n",
                     ctrl->bde_dev.device,
                     ctrl->bde_dev.rev,
                     (unsigned long)ctrl->iowin[0].addr,
                     ctrl->iLine);
         } else if (ctrl->dev_type & BDE_EB_DEV_TYPE) {
-            pprintf("EB Bus Device 0x%x:0x%x\n",
+            pprintf(m, "EB Bus Device 0x%x:0x%x\n",
                     ctrl->bde_dev.device,
                     ctrl->bde_dev.rev);
         }
         if (debug >= 1) {
-            pprintf("\t\timask:imask2:fmask 0x%x:0x%x:0x%x\n",
+            pprintf(m, "\t\timask:imask2:fmask 0x%x:0x%x:0x%x\n",
                     ctrl->imask,
                     ctrl->imask2,
                     ctrl->fmask);
         }
+        if (debug >= 1) {
+            if (ctrl->inst_id == BDE_DEV_INST_ID_INVALID) {
+                pprintf(m, "\t\tinst_id INVALID\n");
+            } else {
+                pprintf(m, "\t\tinst_id %u%s\n",
+                        ctrl->inst_id,
+                        ctrl->inst_id < LINUX_BDE_MAX_DEVICES ? "":"(Illegal)");
+            }
+        }
     }
     return 0;
 }
@@ -3952,9 +4046,6 @@ lkbde_cpu_pci_register(int d)
         pci_write_config_byte(ctrl->pci_device, 0x88, 0x2f);
         pci_write_config_byte(ctrl->pci_device, 0x89, 0x10);
         break;
-    case BCM88750_DEVICE_ID:
-    case BCM88753_DEVICE_ID:
-    case BCM88755_DEVICE_ID:
     case BCM88770_DEVICE_ID:
     case BCM88773_DEVICE_ID:
     case BCM88774_DEVICE_ID:
@@ -3966,7 +4057,6 @@ lkbde_cpu_pci_register(int d)
     case BCM88954_DEVICE_ID:
     case BCM88955_DEVICE_ID:
     case BCM88956_DEVICE_ID:                        
-    case BCM88752_DEVICE_ID:
     case BCM88772_DEVICE_ID:
     case BCM88952_DEVICE_ID:
     case ACP_PCI_DEVICE_ID:
@@ -4013,9 +4103,11 @@ lkbde_cpu_pci_register(int d)
     case BCM88476_DEVICE_ID:
     case BCM88477_DEVICE_ID:
     case BCM88270_DEVICE_ID:
+    case BCM88271_DEVICE_ID:
     case BCM88272_DEVICE_ID:
     case BCM88273_DEVICE_ID:
     case BCM88274_DEVICE_ID:
+    case BCM88276_DEVICE_ID:
     case BCM88278_DEVICE_ID:
     case BCM8206_DEVICE_ID:
     case BCM88350_DEVICE_ID:
@@ -4061,6 +4153,7 @@ lkbde_cpu_pci_register(int d)
       case J2C_DEVICE_ID:
       case J2C_2ND_DEVICE_ID:
       case Q2A_DEVICE_ID:
+      case Q2U_DEVICE_ID:
       case J2P_DEVICE_ID:
 #endif
 #ifdef BCM_DNXF_SUPPORT
@@ -4277,14 +4370,14 @@ lkbde_get_dev_virt(int d)
 }
 
 int
-lkbde_get_dev_resource(int d, int rsrc, uint32_t *flags,
-                       uint32_t *phys_lo, uint32_t *phys_hi)
+lkbde_get_dev_resource(int d, int rsrc, uint32_t *phys_lo,
+                       uint32_t *phys_hi, uint32_t *size)
 {
     if (!VALID_DEVICE(d)) {
         return -1;
     }
 
-    *flags = 0;
+    *size = 0;
     *phys_lo = 0;
     *phys_hi = 0;
 
@@ -4300,12 +4393,14 @@ lkbde_get_dev_resource(int d, int rsrc, uint32_t *flags,
 #ifdef PHYS_ADDR_IS_64BIT
         *phys_hi = (uint32_t)(_devices[d].iowin[0].addr >> 32);
 #endif
+        *size = _devices[d].iowin[0].size;
         break;
     case 1:
         *phys_lo = (uint32_t)(_devices[d].iowin[1].addr);
 #ifdef PHYS_ADDR_IS_64BIT
         *phys_hi = (uint32_t)(_devices[d].iowin[1].addr >> 32);
 #endif
+        *size = _devices[d].iowin[1].size;
         break;
     default:
         break;
@@ -4431,7 +4526,7 @@ lkbde_irq_mask_set(int d, uint32_t addr, uint32_t mask, uint32_t fmask)
     if (iproc_reg) {
         _iproc_write(d, addr, ctrl->imask | ctrl->imask2);
     } else {
-    _write(d, addr, ctrl->imask | ctrl->imask2);
+        _write(d, addr, ctrl->imask | ctrl->imask2);
     }
 
     spin_unlock_irqrestore(&ctrl->lock, flags);
@@ -4481,6 +4576,29 @@ lkbde_get_num_devices(int type)
     return _num_devices(type);
 }
 
+/*
+ * Return none-zero if the SDK instance with the given instance ID
+ * manages the given device.
+ */
+int lkbde_is_dev_managed_by_instance(uint32 dev, uint32 inst_id)
+{
+    if (inst_id >= LINUX_BDE_MAX_DEVICES || dev >= _ndevices) {
+        return 0;
+    }
+    return _instance_info[inst_id].devices[dev / 32] & (1 << (dev % 32)) ? 1 : 0;
+}
+
+/*
+ * Return a pointer to the bitmap of the SDK instance managed devices.
+ */
+linux_bde_device_bitmap_t* lkbde_get_inst_devs(uint32 inst_id)
+{
+    if (inst_id >= LINUX_BDE_MAX_DEVICES) {
+        return NULL;
+    }
+    return &_instance_info[inst_id].devices;
+}
+
 /*
  * Export functions
  */
@@ -4503,3 +4621,5 @@ LKM_EXPORT_SYM(lkbde_cpu_write);
 LKM_EXPORT_SYM(lkbde_cpu_read);
 LKM_EXPORT_SYM(lkbde_cpu_pci_register);
 #endif
+LKM_EXPORT_SYM(lkbde_is_dev_managed_by_instance);
+LKM_EXPORT_SYM(lkbde_get_inst_devs);
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
index 4f9518e9f4a9..52711964a533 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: linux_dma.c,v 1.414 Broadcom SDK $
@@ -78,9 +89,10 @@
 /* allocation types/methods for the DMA memory pool */
 #define ALLOC_TYPE_CHUNK 0 /* use small allocations and join them */
 #define ALLOC_TYPE_API 1 /* use one allocation */
+
 #if _SIMPLE_MEMORY_ALLOCATION_
 #include <linux/dma-mapping.h>
-#if defined(IPROC_CMICD) && defined(CONFIG_CMA) && defined(CONFIG_CMA_SIZE_MBYTES)
+#if defined(CONFIG_CMA) && defined(CONFIG_CMA_SIZE_MBYTES)
 #define DMA_MAX_ALLOC_SIZE (CONFIG_CMA_SIZE_MBYTES * 1024 * 1024)
 #else
 #define DMA_MAX_ALLOC_SIZE (1 << (MAX_ORDER - 1 + PAGE_SHIFT)) /* Maximum size the kernel can allocate in one allocation */
@@ -88,6 +100,7 @@
 #endif /* _SIMPLE_MEMORY_ALLOCATION_ */
 
 #if _SIMPLE_MEMORY_ALLOCATION_ == 1
+/* Use Linux DMA API to allocate contiguous memory */
 #define ALLOC_METHOD_DEFAULT ALLOC_TYPE_API
 #if defined(__arm__)
 #define USE_DMA_MMAP_COHERENT
@@ -196,6 +209,17 @@ MODULE_PARM_DESC(himemaddr,
 #define DMA_MEM_DEFAULT (8 * ONE_MB)
 #endif
 
+#ifdef BDE_EDK_SUPPORT
+typedef struct {
+    phys_addr_t  cpu_pbase; /* CPU physical base address of the DMA pool */
+    phys_addr_t  dma_pbase; /* Bus base address of the DMA pool */
+    void __iomem *dma_vbase;
+    uint32  size; /* Total size of the pool */
+}_edk_dma_pool_t;
+static _edk_dma_pool_t _edk_dma_pool[LINUX_BDE_MAX_DEVICES];
+static int _edk_use_dma_mapping = 0;
+#endif
+
 /* We try to assemble a contiguous segment from chunks of this size */
 #define DMA_BLOCK_SIZE (512 * ONE_KB)
 
@@ -552,18 +576,145 @@ _pgfree(void *ptr)
     return -1;
 }
 
+#ifdef BDE_EDK_SUPPORT
+/*
+ * Function: _edk_mpool_free
+ *
+ * Purpose:
+ *    Free all memory allocated by _adk_mpool_alloc
+ * Parameters:
+ *    None
+ * Returns:
+ *    Nothing.
+ */
+static void
+_edk_mpool_free(void)
+{
+    int i, ndevices;
+
+    ndevices = BDE_NUM_DEVICES(BDE_SWITCH_DEVICES);
+    for (i = 0; i < ndevices && DMA_DEV(i); i ++) {
+        if (_edk_dma_pool[i].dma_vbase) {
+            if (_edk_use_dma_mapping) {
+                dma_unmap_single(DMA_DEV(i), (dma_addr_t)_edk_dma_pool[i].dma_pbase,
+                    _edk_dma_pool[i].size, DMA_BIDIRECTIONAL);
+            }
+            _pgfree(_edk_dma_pool[i].dma_vbase);
+            _edk_dma_pool[i].dma_vbase = NULL;
+        }
+    }
+    _edk_use_dma_mapping = 0;
+}
+
+/*
+ * Function: edk_mpool_alloc
+ *
+ * Purpose:
+ *    Allocate DMA memory pool for EDK
+ * Parameters:
+ *    size - size of DMA memory pool
+ * Returns:
+ *    Nothing.
+ */
+static void
+_edk_mpool_alloc(int dev_id, size_t size)
+{
+    static void __iomem *dma_vbase = NULL;
+    static phys_addr_t cpu_pbase = 0;
+    static phys_addr_t dma_pbase = 0;
+
+    struct device *dev = DMA_DEV(DMA_DEV_INDEX);
+    unsigned long pbase = 0;
+
+    dma_vbase = _pgalloc(size);
+    if (!dma_vbase) {
+        gprintk("Failed to allocate memory pool of size 0x%lx for EDK\n",
+                (unsigned long)size);
+        return;
+    }
+    cpu_pbase = virt_to_bus(dma_vbase);
+
+    /* Use dma_map_single to obtain DMA bus address or IOVA if IOMMU is present. */
+    if (dev) {
+        pbase = dma_map_single(dev, dma_vbase, size, DMA_BIDIRECTIONAL);
+        if (BDE_DMA_MAPPING_ERROR(dev, pbase)) {
+            gprintk("Failed to map memory at %p for EDK\n", dma_vbase);
+            _pgfree(dma_vbase);
+            dma_vbase = NULL;
+            return;
+        }
+        _edk_use_dma_mapping = 1;
+    } else {
+        pbase = cpu_pbase;
+    }
+
+    dma_pbase = pbase;
+
+#ifdef REMAP_DMA_NONCACHED
+    _dma_vbase = IOREMAP(dma_pbase, size);
+#endif
+    _edk_dma_pool[dev_id].cpu_pbase = cpu_pbase;
+    _edk_dma_pool[dev_id].dma_pbase = dma_pbase;
+    _edk_dma_pool[dev_id].dma_vbase = dma_vbase;
+    _edk_dma_pool[dev_id].size = size;
+}
+
+int
+lkbde_edk_get_dma_info(int dev_id, phys_addr_t* cpu_pbase, phys_addr_t* dma_pbase, ssize_t* size)
+{
+    if (_edk_dma_pool[dev_id].dma_vbase == NULL) {
+        _edk_mpool_alloc(dev_id, *size * ONE_MB);
+    }
+
+    if (cpu_pbase) {
+        *cpu_pbase = _edk_dma_pool[dev_id].cpu_pbase;
+    }
+
+    if (dma_pbase) {
+        *dma_pbase = _edk_dma_pool[dev_id].dma_pbase;
+    }
+
+    *size = (_edk_dma_pool[dev_id].dma_vbase) ? _edk_dma_pool[dev_id].size : 0;
+    return 0;
+}
+
 /*
- * Function: _pgcleanup
+ * The below function validates the memory to the EDK allocated DMA pool,
+ * required to user space via the BDE device file.
+ */
+static int
+_edk_vm_is_valid(struct file *filp, struct vm_area_struct *vma)
+{
+    unsigned long phys_addr = vma->vm_pgoff << PAGE_SHIFT;
+    unsigned long size = vma->vm_end - vma->vm_start;
+    int i, ndevices;
+
+    ndevices = BDE_NUM_DEVICES(BDE_SWITCH_DEVICES);
+    for (i = 0; i < ndevices; i++) {
+        if (phys_addr < (unsigned long )_edk_dma_pool[i].cpu_pbase ||
+            (phys_addr + size) > ((unsigned long )_edk_dma_pool[i].cpu_pbase +
+                                   _edk_dma_pool[i].size)) {
+            continue;
+        }
+        return 1;
+    }
+
+    return 0;
+}
+#endif
+
+/*
+ * Function: _mpool_free
  *
  * Purpose:
- *    Free all memory allocated by _pgalloc
+ *    Free all memory allocated by _mpool_alloc
  * Parameters:
  *    None
  * Returns:
  *    Nothing.
  */
 static void
-_pgcleanup(void)
+_mpool_free(void)
 {
     switch (dmaalloc) {
 #if _SIMPLE_MEMORY_ALLOCATION_
@@ -599,7 +750,7 @@ _pgcleanup(void)
 }
 
 /*
- * Function: _alloc_mpool
+ * Function: _mpool_alloc
  *
  * Purpose:
  *    Allocate DMA memory pool
@@ -613,7 +764,7 @@ _pgcleanup(void)
  *    It is assumed there is only one pool.
  */
 static void
-_alloc_mpool(size_t size)
+_mpool_alloc(size_t size)
 {
     unsigned long pbase = 0;
     struct device *dev = DMA_DEV(DMA_DEV_INDEX);
@@ -643,7 +794,22 @@ _alloc_mpool(size_t size)
             gprintk("DMA in high memory at 0x%lx size 0x%lx is beyond the 4GB limit and not supported.\n", pbase, (unsigned long)size);
             return;
         }
-        _cpu_pbase = _dma_pbase = pbase;
+        _cpu_pbase = pbase;
+        if (dev) {
+            /* Use dma_map_single to obtain DMA bus address or I/O virtual address, if
+               IOMMU is present. */
+            pbase = dma_map_single(dev, bus_to_virt(_cpu_pbase), size, DMA_BIDIRECTIONAL);
+            if (BDE_DMA_MAPPING_ERROR(dev, pbase)) {
+                gprintk("Error !! Failed to map memory at phys base 0x%lx\n",
+                        (unsigned long)_cpu_pbase);
+                _cpu_pbase = 0;
+                return;
+            }
+            _use_dma_mapping = 1;
+        } else {
+            pbase = _cpu_pbase;
+        }
+        _dma_pbase = pbase;
         _dma_vbase = IOREMAP(_dma_pbase, size);
     } else {
         /* Get DMA memory from kernel */
@@ -684,14 +850,13 @@ _alloc_mpool(size_t size)
                 return;
             }
             _cpu_pbase = virt_to_bus(_dma_vbase);
-            /* Use dma_map_single to obtain DMA bus address or IOVA if iommu is present. */
+            /* Use dma_map_single to obtain DMA bus address or IOVA if IOMMU is present. */
             if (dev) {
                 pbase = dma_map_single(dev, _dma_vbase, size, DMA_BIDIRECTIONAL);
                 if (BDE_DMA_MAPPING_ERROR(dev, pbase)) {
                     gprintk("Failed to map memory at %p\n", _dma_vbase);
-                    _pgcleanup();
+                    _mpool_free();
                     _dma_vbase = NULL;
-                    _cpu_pbase = 0;
                     return;
                 }
                 _use_dma_mapping = 1;
@@ -709,7 +874,7 @@ _alloc_mpool(size_t size)
 
         if (!dma64_support && ((pbase + (size - 1)) >> 16) > DMA_BIT_MASK(16)) {
             gprintk("DMA memory allocated at 0x%lx size 0x%lx is beyond the 4GB limit and not supported.\n", pbase, (unsigned long)size);
-            _pgcleanup();
+            _mpool_free();
             _dma_vbase = NULL;
             _dma_pbase = 0;
             return;
@@ -739,15 +904,27 @@ _alloc_mpool(size_t size)
 int
 _dma_cleanup(void)
 {
+#ifdef BDE_EDK_SUPPORT
+    _edk_mpool_free();
+#endif
     if (_dma_vbase) {
         mpool_destroy(_dma_pool);
         if (_use_himem) {
+            int i, ndevices;
             iounmap(_dma_vbase);
+            if (_use_dma_mapping) {
+                ndevices = BDE_NUM_DEVICES(BDE_SWITCH_DEVICES);
+                for (i = 0; i < ndevices && DMA_DEV(i); i ++) {
+                    dma_unmap_single(DMA_DEV(i), (dma_addr_t)_dma_pbase, _dma_mem_size,
+                                     DMA_BIDIRECTIONAL);
+                }
+                _use_dma_mapping = 0;
+            }
         } else {
 #ifdef REMAP_DMA_NONCACHED
             iounmap(_dma_vbase);
 #endif
-            _pgcleanup();
+            _mpool_free();
         }
         _dma_vbase = NULL;
         _dma_pbase = 0;
@@ -811,7 +988,7 @@ void _dma_init(int dev_index)
     }
 
     if (_dma_mem_size) {
-        _alloc_mpool(_dma_mem_size);
+        _mpool_alloc(_dma_mem_size);
         if (_dma_vbase == NULL) {
             gprintk("no DMA memory available\n");
         } else {
@@ -835,10 +1012,17 @@ int _dma_mmap(struct file *filp, struct vm_area_struct *vma)
 
     if (phys_addr < (unsigned long )_cpu_pbase ||
         (phys_addr + size) > ((unsigned long )_cpu_pbase + _dma_mem_size)) {
+#ifdef BDE_EDK_SUPPORT
+        if(!_edk_vm_is_valid(filp, vma)) {
+            gprintk("range 0x%lx-0x%lx outside DMA pool\n", phys_addr, phys_addr + size);
+            return -EINVAL;
+        }
+#else
         gprintk("range 0x%lx-0x%lx outside DMA pool 0x%lx-0x%lx\n",
                 phys_addr, phys_addr + size, (unsigned long )_cpu_pbase,
                 (unsigned long )_cpu_pbase + _dma_mem_size);
         return -EINVAL;
+#endif
     }
 
 #ifdef USE_DMA_MMAP_COHERENT
@@ -995,7 +1179,7 @@ lkbde_get_dma_info(phys_addr_t* cpu_pbase, phys_addr_t* dma_pbase, ssize_t* size
         if (_dma_mem_size == 0) {
             _dma_mem_size = DMA_MEM_DEFAULT;
         }
-        _alloc_mpool(_dma_mem_size);
+        _mpool_alloc(_dma_mem_size);
     }
     *cpu_pbase = _cpu_pbase;
     *dma_pbase = _dma_pbase;
@@ -1004,12 +1188,12 @@ lkbde_get_dma_info(phys_addr_t* cpu_pbase, phys_addr_t* dma_pbase, ssize_t* size
 }
 
 void
-_dma_pprint(void)
+_dma_pprint(struct seq_file *m)
 {
-    pprintf("\tdmasize=%s\n", dmasize);
-    pprintf("\thimem=%s\n", himem);
-    pprintf("\thimemaddr=%s\n", himemaddr);
-    pprintf("DMA Memory (%s): %d bytes, %d used, %d free%s\n",
+    pprintf(m, "\tdmasize=%s\n", dmasize);
+    pprintf(m, "\thimem=%s\n", himem);
+    pprintf(m, "\thimemaddr=%s\n", himemaddr);
+    pprintf(m, "DMA Memory (%s): %d bytes, %d used, %d free%s\n",
             (_use_himem) ? "high" : "kernel",
             (_dma_vbase) ? _dma_mem_size : 0,
             (_dma_vbase) ? mpool_usage(_dma_pool) : 0,
@@ -1020,6 +1204,10 @@ _dma_pprint(void)
 /*
  * Export functions
  */
+
+#ifdef BDE_EDK_SUPPORT
+LKM_EXPORT_SYM(lkbde_edk_get_dma_info);
+#endif
 LKM_EXPORT_SYM(kmalloc_giant);
 LKM_EXPORT_SYM(kfree_giant);
 LKM_EXPORT_SYM(lkbde_get_dma_info);
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.c b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.c
index a2d58858a5a5..dd003e1f9297 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.h b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.h
index 5e8a70119e85..ef4b49dc2124 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_shbde.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/shared/mpool.c b/platform/broadcom/saibcm-modules/systems/bde/linux/shared/mpool.c
index 13206596ee26..4c2db5e4de6c 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/shared/mpool.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/shared/mpool.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: mpool.c,v 1.18 Broadcom SDK $
@@ -71,7 +82,7 @@ static sal_sem_t _mpool_lock;
 #endif
 
 #define MPOOL_BUF_SIZE               1024
-#define MPOOL_BUF_ALLOC_COUNT_MAX      16
+#define MPOOL_BUF_ALLOC_COUNT_MAX     128
 
 typedef struct mpool_mem_s {
     unsigned char *address;
@@ -80,20 +91,42 @@ typedef struct mpool_mem_s {
     struct mpool_mem_s *next;
 } mpool_mem_t;
 
+static int _mpool_count;
 static int _buf_alloc_count;
 static mpool_mem_t *mpool_buf[MPOOL_BUF_ALLOC_COUNT_MAX];
 static mpool_mem_t *free_list;
 
-#define ALLOC_INIT_MPOOL_BUF(ptr) \
-        ptr = MALLOC((sizeof(mpool_mem_t) * MPOOL_BUF_SIZE)); \
-        if (ptr) { \
-            int i; \
-            for (i = 0; i < MPOOL_BUF_SIZE - 1; i++) { \
-                ptr[i].next = &ptr[i+1]; \
-            } \
-            ptr[MPOOL_BUF_SIZE - 1].next = NULL; \
-            free_list = &ptr[0]; \
-        }
+static mpool_mem_t *
+_mpool_buf_create(void)
+{
+    int i;
+    mpool_mem_t *ptr;
+
+    if (_buf_alloc_count == MPOOL_BUF_ALLOC_COUNT_MAX) {
+        return NULL;
+    }
+
+    mpool_buf[_buf_alloc_count] = MALLOC((sizeof(mpool_mem_t) * MPOOL_BUF_SIZE));
+    if (!mpool_buf[_buf_alloc_count]) {
+        return NULL;
+    }
+
+    ptr = mpool_buf[_buf_alloc_count];
+    for (i = 0; i < MPOOL_BUF_SIZE - 1; i++) {
+        ptr[i].next = &ptr[i+1];
+    }
+
+    ptr[MPOOL_BUF_SIZE - 1].next = NULL;
+
+    if (free_list) {
+        free_list->next = &ptr[0];
+    } else {
+        free_list = &ptr[0];
+    }
+
+    _buf_alloc_count++;
+    return ptr;
+}
 
 /*
  * Function: mpool_init
@@ -108,7 +141,15 @@ static mpool_mem_t *free_list;
 int 
 mpool_init(void)
 {
+    int i;
+
     MPOOL_LOCK_INIT();
+    _buf_alloc_count = 0;
+    _mpool_count = 0;
+    for (i = 0; i < MPOOL_BUF_ALLOC_COUNT_MAX; i++) {
+        mpool_buf[i] = NULL;
+    }
+    free_list = NULL;
     return 0;
 }
 
@@ -140,7 +181,7 @@ mpool_alloc(mpool_handle_t pool, int size)
     }
 
     mod = size & (BCM_CACHE_LINE_BYTES - 1);
-    if (mod != 0 ) {
+    if (mod != 0) {
         size += (BCM_CACHE_LINE_BYTES - mod);
     }
     while (ptr && ptr->next) {
@@ -155,20 +196,9 @@ mpool_alloc(mpool_handle_t pool, int size)
         return NULL;
     }
 
-    if (!free_list) {
-        if (_buf_alloc_count == MPOOL_BUF_ALLOC_COUNT_MAX) {
-            MPOOL_UNLOCK();
-            return NULL;
-        }
-
-        ALLOC_INIT_MPOOL_BUF(mpool_buf[_buf_alloc_count]);
-
-        if (mpool_buf[_buf_alloc_count] == NULL) {
-            MPOOL_UNLOCK();
-            return NULL;
-        }
-
-        _buf_alloc_count++;
+    if (!free_list && !_mpool_buf_create()) {
+        MPOOL_UNLOCK();
+        return NULL;
     }
 
     newptr = free_list;
@@ -251,25 +281,16 @@ mpool_create(void *base_ptr, int size)
 {
     mpool_mem_t *head, *tail;
     int mod = (int)(((unsigned long)base_ptr) & (BCM_CACHE_LINE_BYTES - 1));
-    int i;
 
     MPOOL_LOCK();
 
-    for (i = 0; i < MPOOL_BUF_ALLOC_COUNT_MAX; i++) {
-        mpool_buf[i] = NULL;
-    }
-
-    _buf_alloc_count = 0;
-
-    ALLOC_INIT_MPOOL_BUF(mpool_buf[_buf_alloc_count]);
-
-    if (mpool_buf[_buf_alloc_count] == NULL) {
-        MPOOL_UNLOCK();
-        return NULL;
+    if (!free_list || !(free_list->next)) {
+        if (!_mpool_buf_create()) {
+            MPOOL_UNLOCK();
+            return NULL;
+        }
     }
 
-    _buf_alloc_count++;
-
     if (mod) {
         base_ptr = (char*)base_ptr + (BCM_CACHE_LINE_BYTES - mod);
         size -= (BCM_CACHE_LINE_BYTES - mod);
@@ -288,6 +309,7 @@ mpool_create(void *base_ptr, int size)
     head->next = tail;
     tail->prev = head;
     tail->next = NULL;
+    _mpool_count++;
 
     MPOOL_UNLOCK();
     return head;
@@ -307,19 +329,27 @@ int
 mpool_destroy(mpool_handle_t pool)
 {
     int i;
+    mpool_mem_t *head = pool;
 
     MPOOL_LOCK();
 
-    if ((mpool_mem_t *)pool != mpool_buf[0]) {
+    if (!(head && head->prev)) {
         MPOOL_UNLOCK();
         return 0;
     }
 
-    for (i = 0; i < MPOOL_BUF_ALLOC_COUNT_MAX; i++) {
-        if (mpool_buf[i]) {
-            FREE(mpool_buf[i]);
-            mpool_buf[i] = NULL;
+    head->prev->next = free_list;
+    free_list = head;
+    _mpool_count--;
+
+    if (_mpool_count == 0) {
+        for (i = 0; i < MPOOL_BUF_ALLOC_COUNT_MAX; i++) {
+            if (mpool_buf[i]) {
+                FREE(mpool_buf[i]);
+                mpool_buf[i] = NULL;
+            }
         }
+        free_list = NULL;
     }
 
     MPOOL_UNLOCK();
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
index 424f2fe24bee..2cc96df02d0a 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
index 46f60c8a3ae9..4e6186e2d80d 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
@@ -24,14 +24,13 @@
 #include <sal/core/thread.h>
 #include <sal/core/sync.h>
 #include <soc/devids.h>
-
+#include <linux/jiffies.h>
 #include "linux-user-bde.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
 #include <linux/uaccess.h>
 #endif
 
-
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("User BDE Helper Module");
 MODULE_LICENSE("GPL");
@@ -71,7 +70,7 @@ MODULE_LICENSE("GPL");
 
 /* CMICX defines */
 #define INTC_INTR_REG_NUM               (8)
-
+#define PAXB_INTRCLR_DELAY_REG_NUM      (16)
 /*
 TODO:HX5
 The INTR base address values are changed for HX5,
@@ -80,15 +79,27 @@ be made.
 */
 #define PAXB_0_PAXB_IC_INTRCLR_0       (0x180123a0)
 #define PAXB_0_PAXB_IC_INTRCLR_1       (0x180123a4)
-
 #define PAXB_0_PAXB_IC_INTRCLR_MODE_0  (0x180123a8)
 #define PAXB_0_PAXB_IC_INTRCLR_MODE_1  (0x180123ac)
+#define PAXB_0_PAXB_INTR_STATUS             (0x18012f38)
+#define PAXB_0_PAXB_IC_INTR_PACING_CTRL     (0x18012398)
+#define PAXB_0_PAXB_INTRCLR_DELAY_UNIT      (0x1801239c)
+#define PAXB_0_PAXB_IC_INTRCLR_DELAY_REG0   (0x180123b0)
+#define PAXB_0_PCIE_ERROR_STATUS            (0x18012024)
 
 #define HX5_PAXB_0_PAXB_IC_INTRCLR_0   (0x102303a0)
 #define HX5_PAXB_0_PAXB_IC_INTRCLR_1   (0x102303a4)
 
 #define HX5_PAXB_0_PAXB_IC_INTRCLR_MODE_0   (0x102303a8)
 #define HX5_PAXB_0_PAXB_IC_INTRCLR_MODE_1   (0x102303ac)
+#define HX5_PAXB_0_PAXB_INTR_STATUS         (0x10230f38)
+#define HX5_PAXB_0_PAXB_IC_INTR_PACING_CTRL (0x10230398)
+#define HX5_PAXB_0_PAXB_INTRCLR_DELAY_UNIT  (0x1023039c)
+#define HX5_PAXB_0_PAXB_IC_INTRCLR_DELAY_REG0 (0x102303b0)
+#define HX5_PAXB_0_PCIE_ERROR_STATUS          (0x10230024)
+
+#define PAXB_0_PAXB_IC_INTRCLR_DELAY_BASE     (PAXB_0_PAXB_IC_INTRCLR_DELAY_REG0)
+#define HX5_PAXB_0_PAXB_IC_INTRCLR_DELAY_BASE (HX5_PAXB_0_PAXB_IC_INTRCLR_DELAY_REG0)
 
 #define INTC_INTR_ENABLE_REG0          (0x180130f0)
 #define INTC_INTR_STATUS_REG0          (0x18013190)
@@ -129,9 +140,9 @@ be made.
 #define INTC_LOW_PRIORITY_INTR_REG_IND     IRQ_MASK_INDEX(HX5_CHIP_INTR_LOW_PRIORITY)
 #define INTC_PDMA_INTR_REG_IND             4
 
-#define READ_INTC_INTR(d, reg, v) \
+#define IPROC_READ(d, reg, v) \
         (v = user_bde->iproc_read(d, reg))
-#define WRITE_INTC_INTR(d, reg, v) \
+#define IPROC_WRITE(d, reg, v) \
         (user_bde->iproc_write(d, reg, v))
 
 #define IHOST_READ_INTR(d, reg, v) \
@@ -155,6 +166,22 @@ be made.
 static uint32 *ihost_intr_status_base = NULL;
 static uint32 *ihost_intr_enable_base = NULL;
 
+/* Module parameter for Interruptible timeout */
+static int intr_timeout = 0;
+LKM_MOD_PARAM(intr_timeout, "i", int, (S_IRUGO | S_IWUSR));
+MODULE_PARM_DESC(intr_timeout,
+"Interruptible wait timeout in milliseconds for Interrupt to be triggered.");
+
+static ulong intr_count = 0;
+LKM_MOD_PARAM(intr_count, "intr_count", ulong, (S_IRUGO | S_IWUSR));
+MODULE_PARM_DESC(intr_count,
+"Interrupt count provides information about the number of times the ISR is called.");
+
+static ulong intr_timeout_count = 0;
+LKM_MOD_PARAM(intr_timeout_count, "intr_timeout_count", ulong, (S_IRUGO | S_IWUSR));
+MODULE_PARM_DESC(intr_timeout_count,
+"Interrupt timeout count provides information about the number of times the interrupt wait is timeed out.");
+
 /* Debug output */
 static int debug;
 LKM_MOD_PARAM(debug, "i", int, (S_IRUGO | S_IWUSR));
@@ -168,10 +195,16 @@ typedef void (*isr_f)(void *);
 typedef struct _intr_regs_s {
     uint32 intc_intr_status_base;
     uint32 intc_intr_enable_base;
+    uint32 intc_intr_raw_status_base;
     uint32 intc_intr_clear_0;
     uint32 intc_intr_clear_1;
     uint32 intc_intr_clear_mode_0;
     uint32 intc_intr_clear_mode_1;
+    uint32 intc_intr_status;
+    uint32 intc_intr_pacing_ctrl;
+    uint32 intc_intr_clear_delay_unit;
+    uint32 intc_intr_clear_delay_base;
+    uint32 intc_intr_pcie_err_status;
 } _intr_regs_t;
 
 typedef struct bde_ctrl_s {
@@ -181,7 +214,8 @@ typedef struct bde_ctrl_s {
     int devid;
     isr_f isr;
     uint32 *ba;
-    int inst;   /* associate to _bde_inst_resource[] */
+    uint32 inst;   /* the resource/instance index in _bde_inst_resource[] */
+    int edk_irq_enabled;
     _intr_regs_t intr_regs;
 } bde_ctrl_t;
 
@@ -199,20 +233,37 @@ static atomic_t _ether_interrupt_has_taken_place = ATOMIC_INIT(0);
  */
 static int _bde_multi_inst = 0;
 
+#define MAX_UC_CORES LINUX_BDE_MAX_IPROC_UC_CORES
+
+/* Structure to hold info about interrupts handled by EDK */
 typedef struct {
-    unsigned int    inst_id;
-    unsigned int    dma_offset;
-    unsigned int    dma_size;
+    uint32_t timer_intrc_offset; /* Timer interrupts INTC offset */
+    uint32_t timer_intrc_mask; /* Timer interrupts mask */
+    uint32_t sw_intr_intrc_offset; /* SW Programmable Interrupt's offset */
+    uint32_t sw_intr_intrc_mask; /* SW interrupt's mask */
+    uint32_t sw_intr_src_bitmap; /* SW interrupt's bitmask to navigate ICFG registers */
+    uint32_t sw_intr_icfg_reg[MAX_UC_CORES]; /* ICFG registers for each core */
+} bde_edk_intr_t;
+
+typedef struct {
+    int             is_active;  /* Is the instance active */
+    unsigned int    dma_offset; /* offset of the instance's DMA memory in the DMA buffer pool */
+    unsigned int    dma_size; /* size of the instance's DMA memory (in the DMA buffer pool) */
     wait_queue_head_t intr_wq;
+    wait_queue_head_t edk_intr_wq;
     atomic_t intr;
+    atomic_t edk_intr;
+    bde_edk_intr_t edk_irqs;
 } bde_inst_resource_t;
 
+/* This array contains information for SDK instance, the index in the array is the instance ID */
 static bde_inst_resource_t _bde_inst_resource[LINUX_BDE_MAX_DEVICES];
 /*
  * Lock used to protect changes to _bde_inst_resource
  */
 static spinlock_t bde_resource_lock;
 
+
 typedef struct {
     phys_addr_t  cpu_pbase; /* CPU physical base address of the DMA pool */
     phys_addr_t  dma_pbase; /* Bus base address of the DMA pool */
@@ -291,23 +342,98 @@ _cmic_interrupt(bde_ctrl_t *ctrl)
 #endif
 }
 
-static void 
-_cmicx_interrupt(bde_ctrl_t *ctrl)
+void
+dump_interrupt_regs(bde_ctrl_t *ctrl , int dev)
+{
+    int ind;
+    uint32_t val;
+
+    if (debug >= 2) {
+        gprintk("Interrupt timeout count = %lu\n", intr_timeout_count);
+        gprintk("Interrupt count = %lu\n", intr_count);
+        for (ind = 0; ind < INTC_INTR_REG_NUM; ind++) {
+            IPROC_READ(dev, ctrl->intr_regs.intc_intr_status_base + 4 * ind, val);
+            gprintk("INTC_INTR_STATUS_REG_%d = 0x%x\n", ind, val);
+            IPROC_READ(dev, ctrl->intr_regs.intc_intr_raw_status_base + 4 * ind, val);
+            gprintk("INTC_INTR_RAW_STATUS_REG_%d = 0x%x\n", ind, val);
+            IPROC_READ(dev, ctrl->intr_regs.intc_intr_enable_base + 4 * ind, val);
+            gprintk("INTC_INTR_ENABLE_REG_%d = 0x%x\n", ind, val);
+        }
+        /* Dump PAXB Register */
+        IPROC_READ(dev, ctrl->intr_regs.intc_intr_status, val);
+        gprintk("PAXB_0_PAXB_INTR_STATUS = 0x%x\n", val);
+        IPROC_READ(dev, ctrl->intr_regs.intc_intr_pacing_ctrl, val);
+        gprintk("PAXB_0_PAXB_IC_INTR_PACING_CTRL = 0x%x\n", val);
+        IPROC_READ(dev, ctrl->intr_regs.intc_intr_clear_delay_unit, val);
+        gprintk("PAXB_0_PAXB_INTRCLR_DELAY_UNIT = 0x%x\n", val);
+        IPROC_READ(dev, ctrl->intr_regs.intc_intr_pcie_err_status, val);
+        gprintk("PAXB_0_PCIE_ERROR_STATUS = 0x%x\n", val);
+
+        for (ind = 0; ind < PAXB_INTRCLR_DELAY_REG_NUM; ind++) {
+            IPROC_READ(dev, ctrl->intr_regs.intc_intr_clear_delay_base + 4 * ind, val);
+            gprintk("PAXB_0_PAXB_IC_INTRCLR_DELAY_REG_%d = 0x%x\n", ind, val);
+        }
+    }
+    /* Clear interrupt enable registers */
+    for (ind = 0; ind < INTC_INTR_REG_NUM; ind++) {
+        IPROC_WRITE(dev, ctrl->intr_regs.intc_intr_enable_base + 4 * ind, 0);
+    }
+}
+
+#ifdef BDE_EDK_SUPPORT
+static int
+_cmicx_edk_interrupt_check(bde_ctrl_t *ctrl, int d)
 {
-    int d, ind;
-    uint32 stat, iena, mask, fmask;
     bde_inst_resource_t *res;
+    uint32 stat, mask = 0, bitmap = 0;
+    int idx;
+
+    res = &_bde_inst_resource[ctrl->inst];
+    bitmap = res->edk_irqs.sw_intr_src_bitmap;
+
+    /* Explicitly reading raw_status so as to not clear the status on read */
+    IPROC_READ(d, ctrl->intr_regs.intc_intr_raw_status_base +
+        (res->edk_irqs.sw_intr_intrc_offset * 4), stat);
+    /* Check whether Software Programmable Interrupt is set */
+    if (stat & res->edk_irqs.sw_intr_intrc_mask) {
+        for (idx = 0; (bitmap && (idx < MAX_UC_CORES)); idx++) {
+            if (bitmap & 1) {
+                IPROC_READ(d, res->edk_irqs.sw_intr_icfg_reg[idx], stat);
+                mask |= (stat & 1) << idx;
+            }
+            bitmap = (bitmap >> 1);
+        }
+        if (mask)
+            return 1;
+    }
+
+    /* EDK uses timer interrupt as watchdog to indicate the the firmware has crashed */
+    IPROC_READ(d, ctrl->intr_regs.intc_intr_raw_status_base +
+        (res->edk_irqs.timer_intrc_offset * 4), stat);
+    if (stat & res->edk_irqs.timer_intrc_mask) {
+        return 1;
+    }
+    return 0;
+}
+#endif
+
+static int
+_cmicx_interrupt_prepare(bde_ctrl_t *ctrl)
+{
+    int d, ind, ret = 0;
+    uint32 stat, iena, mask, fmask;
 
     d = (((uint8 *)ctrl - (uint8 *)_devices) / sizeof (bde_ctrl_t));
 
     if (ctrl->dev_type & BDE_PCI_DEV_TYPE) {
+        IPROC_READ(d, ctrl->intr_regs.intc_intr_clear_mode_0, stat);
         /* Clear MSI interrupts immediately to prevent spurious interrupts */
-        WRITE_INTC_INTR(d, ctrl->intr_regs.intc_intr_clear_0, 0xFFFFFFFF);
-        WRITE_INTC_INTR(d, ctrl->intr_regs.intc_intr_clear_1, 0xFFFFFFFF);
+        if (stat == 0) {
+            IPROC_WRITE(d, ctrl->intr_regs.intc_intr_clear_0, 0xFFFFFFFF);
+            IPROC_WRITE(d, ctrl->intr_regs.intc_intr_clear_1, 0xFFFFFFFF);
+        }
     }
 
-    res = &_bde_inst_resource[ctrl->inst];
-
     lkbde_irq_mask_get(d, &mask, &fmask);
 
     if (fmask) {
@@ -315,15 +441,15 @@ _cmicx_interrupt(bde_ctrl_t *ctrl)
             IHOST_READ_INTR(d, ihost_intr_status_base + INTC_PDMA_INTR_REG_IND, stat);
             IHOST_READ_INTR(d, ihost_intr_enable_base + INTC_PDMA_INTR_REG_IND, iena);
         } else {
-            READ_INTC_INTR(d, ctrl->intr_regs.intc_intr_status_base + 4 * INTC_PDMA_INTR_REG_IND, stat);
-            READ_INTC_INTR(d, ctrl->intr_regs.intc_intr_enable_base + 4 * INTC_PDMA_INTR_REG_IND, iena);
+            IPROC_READ(d, ctrl->intr_regs.intc_intr_status_base + 4 * INTC_PDMA_INTR_REG_IND, stat);
+            IPROC_READ(d, ctrl->intr_regs.intc_intr_enable_base + 4 * INTC_PDMA_INTR_REG_IND, iena);
         }
         if (stat & iena) {
             if (ctrl->dev_type & BDE_AXI_DEV_TYPE) {
                 IHOST_WRITE_INTR(d, ihost_intr_enable_base + INTC_PDMA_INTR_REG_IND +
                     HX5_IHOST_IRQ_MASK_OFFSET, ~0);
             } else {
-                WRITE_INTC_INTR(d, ctrl->intr_regs.intc_intr_enable_base + 4 * INTC_PDMA_INTR_REG_IND, 0);
+                IPROC_WRITE(d, ctrl->intr_regs.intc_intr_enable_base + 4 * INTC_PDMA_INTR_REG_IND, 0);
             }
 
             for (ind = 0; ind < INTC_INTR_REG_NUM; ind++) {
@@ -344,16 +470,16 @@ _cmicx_interrupt(bde_ctrl_t *ctrl)
                         }
                     }
                 } else {
-                    READ_INTC_INTR(d, ctrl->intr_regs.intc_intr_status_base + 4 * ind, stat);
-                    READ_INTC_INTR(d, ctrl->intr_regs.intc_intr_enable_base + 4 * ind, iena);
+                    IPROC_READ(d, ctrl->intr_regs.intc_intr_status_base + 4 * ind, stat);
+                    IPROC_READ(d, ctrl->intr_regs.intc_intr_enable_base + 4 * ind, iena);
                 }
                 if (stat & iena) {
                     break;
                 }
             }
-
+            /* No pending interrupts */
             if (ind >= INTC_INTR_REG_NUM) {
-                return;
+                return -1;
             }
         }
     }
@@ -362,6 +488,11 @@ _cmicx_interrupt(bde_ctrl_t *ctrl)
      * So as to avoid getting new interrupts until the user level driver
      * enumerates the interrupts to be serviced
      */
+#ifdef BDE_EDK_SUPPORT
+    if (ctrl->edk_irq_enabled)
+        ret = _cmicx_edk_interrupt_check(ctrl, d);
+#endif
+
     for (ind = 0; ind < INTC_INTR_REG_NUM; ind++) {
         if (fmask && ind == INTC_PDMA_INTR_REG_IND) {
             continue;
@@ -381,17 +512,42 @@ _cmicx_interrupt(bde_ctrl_t *ctrl)
                     HX5_IHOST_IRQ_MASK_OFFSET, ~0);
             }
         } else {
-            WRITE_INTC_INTR(d, ctrl->intr_regs.intc_intr_enable_base + 4*ind, 0);
+            IPROC_WRITE(d, ctrl->intr_regs.intc_intr_enable_base + (4 * ind), 0);
         }
     }
 
-    /* Notify */
-    atomic_set(&res->intr, 1);
+    return ret;
+}
+
+static void
+_cmicx_interrupt(bde_ctrl_t *ctrl)
+{
+    bde_inst_resource_t *res;
+    int ret;
+
+    intr_count++;
+
+    res = &_bde_inst_resource[ctrl->inst];
+    ret = _cmicx_interrupt_prepare(ctrl);
+    if (ret < 0) {
+        return;
+    } else if (ret > 0) {
+        /* Notify */
+        atomic_set(&res->edk_intr, 1);
 #ifdef BDE_LINUX_NON_INTERRUPTIBLE
-    wake_up(&res->intr_wq);
+        wake_up(&res->edk_intr_wq);
 #else
-    wake_up_interruptible(&res->intr_wq);
+        wake_up_interruptible(&res->edk_intr_wq);
 #endif
+    } else {
+        /* Notify */
+        atomic_set(&res->intr, 1);
+#ifdef BDE_LINUX_NON_INTERRUPTIBLE
+        wake_up(&res->intr_wq);
+#else
+        wake_up_interruptible(&res->intr_wq);
+#endif
+    }
 }
 
 static void
@@ -695,25 +851,6 @@ _cmicd_interrupt(bde_ctrl_t *ctrl)
 #endif
 }
 
-static void 
-_bcm88750_interrupt(bde_ctrl_t *ctrl)
-{
-    int d;
-    bde_inst_resource_t *res;
-
-    d = (((uint8 *)ctrl - (uint8 *)_devices) / sizeof (bde_ctrl_t));
-    res = &_bde_inst_resource[ctrl->inst];
-    lkbde_irq_mask_set(d, CMIC_IRQ_MASK, 0, 0);
-
-    lkbde_irq_mask_set(d, CMIC_IRQ_MASK_1, 0, 0); 
-    lkbde_irq_mask_set(d, CMIC_IRQ_MASK_2, 0, 0);
-    atomic_set(&res->intr, 1);
-#ifdef BDE_LINUX_NON_INTERRUPTIBLE
-    wake_up(&res->intr_wq);
-#else
-    wake_up_interruptible(&res->intr_wq);
-#endif
-}
 
 /* The actual interrupt handler of ethernet devices */
 static void 
@@ -738,7 +875,6 @@ static struct _intr_mode_s {
     { (isr_f)_cmicm_interrupt,      "CMICm" },
     { (isr_f)_cmicd_interrupt,      "CMICd" },
     { (isr_f)_cmicd_cmc0_interrupt, "CMICd CMC0" },
-    { (isr_f)_bcm88750_interrupt,   "BCM88750" },
     { (isr_f)_cmicx_interrupt,      "CMICx" },
     { NULL, NULL }
 };
@@ -764,17 +900,31 @@ _intr_regs_init(bde_ctrl_t *ctrl, int hx5_intr)
     if (hx5_intr) {
         ctrl->intr_regs.intc_intr_status_base = HX5_INTC_INTR_STATUS_BASE;
         ctrl->intr_regs.intc_intr_enable_base = HX5_INTC_INTR_ENABLE_BASE;
+        ctrl->intr_regs.intc_intr_raw_status_base = HX5_INTC_INTR_RAW_STATUS_BASE;
         ctrl->intr_regs.intc_intr_clear_0 = HX5_PAXB_0_PAXB_IC_INTRCLR_0;
         ctrl->intr_regs.intc_intr_clear_1 = HX5_PAXB_0_PAXB_IC_INTRCLR_1;
         ctrl->intr_regs.intc_intr_clear_mode_0 = HX5_PAXB_0_PAXB_IC_INTRCLR_MODE_0;
         ctrl->intr_regs.intc_intr_clear_mode_1 = HX5_PAXB_0_PAXB_IC_INTRCLR_MODE_1;
+        ctrl->intr_regs.intc_intr_status = HX5_PAXB_0_PAXB_INTR_STATUS;
+        ctrl->intr_regs.intc_intr_pacing_ctrl = HX5_PAXB_0_PAXB_IC_INTR_PACING_CTRL;
+        ctrl->intr_regs.intc_intr_clear_delay_unit = HX5_PAXB_0_PAXB_INTRCLR_DELAY_UNIT;
+        ctrl->intr_regs.intc_intr_clear_delay_base = HX5_PAXB_0_PAXB_IC_INTRCLR_DELAY_BASE;
+        ctrl->intr_regs.intc_intr_pcie_err_status = HX5_PAXB_0_PCIE_ERROR_STATUS;
+
     } else {
         ctrl->intr_regs.intc_intr_status_base = INTC_INTR_STATUS_BASE;
+        ctrl->intr_regs.intc_intr_raw_status_base = INTC_INTR_RAW_STATUS_BASE;
         ctrl->intr_regs.intc_intr_enable_base = INTC_INTR_ENABLE_BASE;
         ctrl->intr_regs.intc_intr_clear_0 = PAXB_0_PAXB_IC_INTRCLR_0;
         ctrl->intr_regs.intc_intr_clear_1 = PAXB_0_PAXB_IC_INTRCLR_1;
         ctrl->intr_regs.intc_intr_clear_mode_0 = PAXB_0_PAXB_IC_INTRCLR_MODE_0;
         ctrl->intr_regs.intc_intr_clear_mode_1 = PAXB_0_PAXB_IC_INTRCLR_MODE_1;
+        ctrl->intr_regs.intc_intr_status = PAXB_0_PAXB_INTR_STATUS;
+        ctrl->intr_regs.intc_intr_pacing_ctrl = PAXB_0_PAXB_IC_INTR_PACING_CTRL;
+        ctrl->intr_regs.intc_intr_clear_delay_unit = PAXB_0_PAXB_INTRCLR_DELAY_UNIT;
+        ctrl->intr_regs.intc_intr_clear_delay_base = PAXB_0_PAXB_IC_INTRCLR_DELAY_BASE;
+        ctrl->intr_regs.intc_intr_pcie_err_status = PAXB_0_PCIE_ERROR_STATUS;
+
     }
 }
 
@@ -804,13 +954,6 @@ _devices_init(int d)
     }
     if (ctrl->dev_type & BDE_SWITCH_DEV_TYPE) {
         switch (user_bde->get_dev(d)->device) {
-        case BCM88750_DEVICE_ID:
-        case BCM88753_DEVICE_ID:
-        case BCM88754_DEVICE_ID:
-        case BCM88755_DEVICE_ID:
-        case BCM88752_DEVICE_ID:
-            ctrl->isr = (isr_f)_bcm88750_interrupt;
-            break;
         case BCM53540_DEVICE_ID:
         case BCM53547_DEVICE_ID:
         case BCM53548_DEVICE_ID:
@@ -894,6 +1037,10 @@ _devices_init(int d)
         case BCM56276_DEVICE_ID:
         case BCM56277_DEVICE_ID:
         case BCM56278_DEVICE_ID:
+        case BCM56279_DEVICE_ID:
+        case BCM56575_DEVICE_ID:
+        case BCM56175_DEVICE_ID:
+        case BCM56176_DEVICE_ID:
             ctrl->isr = (isr_f)_cmicx_interrupt;
             if (ctrl->dev_type & BDE_AXI_DEV_TYPE) {
                 if (!ihost_intr_enable_base) {
@@ -944,6 +1091,7 @@ _devices_init(int d)
           case J2C_DEVICE_ID:
           case J2C_2ND_DEVICE_ID:
           case Q2A_DEVICE_ID:
+          case Q2U_DEVICE_ID:
           case J2P_DEVICE_ID:
 #endif
 #ifdef BCM_DNXF_SUPPORT
@@ -974,10 +1122,11 @@ _devices_init(int d)
 static int
 _init(void)
 {
-    int i;
+    int i, nof_devices;
     phys_addr_t cpu_pbase, dma_pbase;
     ssize_t dmasize;
     bde_inst_resource_t *res;
+    uint32 *bitmap_ptr;
 
     /* Connect to the kernel bde */
     if ((linux_bde_create(NULL, &user_bde) < 0) || user_bde == NULL) {
@@ -1002,16 +1151,30 @@ _init(void)
     res->dma_offset = 0;
     res->dma_size = _dma_pool.total_size;
     init_waitqueue_head(&res->intr_wq);
+    init_waitqueue_head(&res->edk_intr_wq);
     atomic_set(&res->intr, 0);
+    atomic_set(&res->edk_intr, 0);
 
     ihost_intr_enable_base = NULL;
     ihost_intr_status_base = NULL;
 
-    for (i = 0; i < user_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        res->inst_id |= (1 << i);
+    nof_devices = user_bde->num_devices(BDE_ALL_DEVICES);
+    /* for no BDE instances, mark the single SDK as controlling all devices */
+    bitmap_ptr = *lkbde_get_inst_devs(0);
+    for (i = nof_devices; i >=32; i -= 32) {
+      *(bitmap_ptr++) = 0xffffffff;
+    }
+    *bitmap_ptr = (((uint32)1) << i) - 1;
+    res->is_active = 1;
+
+    for (i = 0; i < nof_devices; i++) { /* init all devices */
         _devices_init(i);
     }
 
+    if (intr_timeout > 0) {
+        gprintk("Interruptible wait timeout = %d msecs\n", intr_timeout);
+    }
+
     return 0;
 }
 
@@ -1036,7 +1199,7 @@ _cleanup(void)
                 BDE_DEV_MEM_MAPPED(_devices[i].dev_type)) {
                 user_bde->interrupt_disconnect(i);
             }
-            lkbde_dev_instid_set(i, 0);
+            lkbde_dev_instid_set(i, BDE_DEV_INST_ID_INVALID);
         }
         linux_bde_destroy(user_bde);
         user_bde = NULL;
@@ -1065,48 +1228,53 @@ _cleanup(void)
  *    Always 0
  */
 static int
-_pprint(void)
+_pprint(struct seq_file *m)
 {
     int idx;
     const char *name;
     bde_inst_resource_t *res;
     uint32 state, instid;
 
-    pprintf("Broadcom Device Enumerator (%s)\n", LINUX_USER_BDE_NAME);
+    pprintf(m, "Broadcom Device Enumerator (%s)\n", LINUX_USER_BDE_NAME);
     for (idx = 0; idx < user_bde->num_devices(BDE_ALL_DEVICES); idx++) {
         name = _intr_mode_str(_devices[idx].isr);
         if (name == NULL) {
             name = "unknown";
         }
-        pprintf("\t%d: Interrupt mode  %s ",idx, name);
+        pprintf(m, "\t%d: Interrupt mode  %s ",idx, name);
         (void)lkbde_dev_state_get(idx, &state);
         if (state == BDE_DEV_STATE_REMOVED) {
-            pprintf(" Device REMOVED ! \n");
+            pprintf(m, " Device REMOVED ! \n");
         } else {
             (void)lkbde_dev_instid_get(idx, &instid);
-            if (instid) {
-                pprintf("Inst id 0x%x\n",instid);
+            if (instid != BDE_DEV_INST_ID_INVALID) {
+                pprintf(m, "Inst id 0x%x\n",instid);
             } else {
-                pprintf("\n");
+                pprintf(m, "\n");
             }
         }
     }
-    pprintf("Instance resource \n");
+    pprintf(m, "Instance resource \n");
 
     for (idx = 0; idx < user_bde->num_devices(BDE_ALL_DEVICES); idx++) {
         res = &_bde_inst_resource[idx];
-        if (res->inst_id) {
-            pprintf("\tDev mask 0x%x : "
-                    "DMA offset %d size %d MB\n",
-                    res->inst_id,
+        if (res->is_active) {
+            linux_bde_device_bitmap_t* bitmap_p = lkbde_get_inst_devs(idx);
+            pprintf(m, "\t%d: DMA offset %d size %d MB Dev mask 0x",
+                    idx,
                     res->dma_offset,
                     res->dma_size);
+            for (state = 0; state * 32 < user_bde->num_devices(BDE_ALL_DEVICES); ++state) {
+                pprintf(m,"%.8x ", (*bitmap_p)[state]);
+            }
+            pprintf(m,"\n");
         }
     }
 
     return 0;
 }
 
+#ifdef BCM_INSTANCE_SUPPORT
 /* 
  * Allocate the DMA resource from DMA pool
  * Parameter :
@@ -1127,22 +1295,21 @@ _dma_resource_alloc(unsigned int dma_size, unsigned int *dma_offset)
     _dma_pool.offset += dma_size;
     return 0;
 }
+#endif
 
 static int
-_dma_resource_get(int inst_id, phys_addr_t *cpu_pbase, phys_addr_t *dma_pbase, ssize_t* size)
+_dma_resource_get(unsigned inst_id, phys_addr_t *cpu_pbase, phys_addr_t *dma_pbase, ssize_t* size)
 {
-    int i;
     unsigned int dma_size = 0, dma_offset = 0;
     bde_inst_resource_t *res;
 
-    for (i = 0; i < user_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        res = &_bde_inst_resource[i];
-        if (res->inst_id == inst_id) {
-            dma_size = res->dma_size;
-            dma_offset = res->dma_offset;
-            break;
-        }
+    if (inst_id >= user_bde->num_devices(BDE_ALL_DEVICES)) {
+        gprintk("ERROR: requested DMA resources for an instance number out of range: %u\n", inst_id);
+        return -1;
     }
+    res = &_bde_inst_resource[inst_id];
+    dma_size = res->dma_size;
+    dma_offset = res->dma_offset;
 
     *cpu_pbase = _dma_pool.cpu_pbase + dma_offset * ONE_MB;
     *dma_pbase = _dma_pool.dma_pbase + dma_offset * ONE_MB;
@@ -1151,28 +1318,49 @@ _dma_resource_get(int inst_id, phys_addr_t *cpu_pbase, phys_addr_t *dma_pbase, s
     return 0;
 }
 
+#ifdef BCM_INSTANCE_SUPPORT
+/*
+ * Checks if we have the instance in _bde_inst_resource. If not, return LUBDE_SUCCESS==0 (considered a new instance).
+ * If it exists with the same dmasize, return 1 (It is considered already in use)
+ * Otherwise if the device with the same index of the resource, has resource/instance index 0, return LUBDE_SUCCESS==0. (bug)
+ * Otherwise return LUBDE_FAIL==-1 (It is considered to exist with a different dmasize).
+ */
 static int
-_instance_validate(unsigned int inst_id, unsigned int dmasize)
+_instance_validate(unsigned int inst_id, unsigned int dmasize, linux_bde_device_bitmap_t inst_devices)
 {
-    int i;
-    bde_inst_resource_t *res;
+    unsigned i;
+    uint32 bits;
+    bde_inst_resource_t *res = _bde_inst_resource + inst_id;
+    linux_bde_device_bitmap_t* bitmap_p;
 
-    for (i = 0; i < user_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        res = &_bde_inst_resource[i];
-        if (res->inst_id == inst_id) {
-            if (res->dma_size != dmasize) {
-                if(_devices[i].inst == 0){
-                    /* Skip _instance_validate (not init yet) */
-                    return LUBDE_SUCCESS;
-                }
-                gprintk("ERROR: dma_size mismatch\n");
-                return LUBDE_FAIL;
-            }
-            return (1);
+    if (inst_id >= user_bde->num_devices(BDE_ALL_DEVICES)) {
+        gprintk("ERROR: instance number out of range: %u\n", inst_id);
+        return LUBDE_FAIL;
+    }
+
+    if (res->is_active == 0) {
+        /* FIXME SDK-225233 check that the devices are not used by another active instance */
+        return LUBDE_SUCCESS;
+    }
+
+    bitmap_p = lkbde_get_inst_devs(inst_id);
+    for (i = 0; i < LINUX_BDE_NOF_DEVICE_BITMAP_WORDS; ++i) {
+        bits = inst_devices[i] ^ (*bitmap_p)[i];
+        if (bits != 0) {
+            for (i *= 32; (bits & 1) == 0; bits >>= 1, ++i);
+            gprintk("ERROR: existing instance number %u does not control the same devices, see device %u\n", inst_id, i);
+            return LUBDE_FAIL;
         }
     }
-    return LUBDE_SUCCESS;
+
+    if (res->dma_size == dmasize) {
+        return 1; /* For an existing same instance with the same DMA size, do nothing */
+    }
+    /* with a different DMS size */
+    gprintk("ERROR: dma_size mismatch\n");
+    return LUBDE_FAIL;
 }
+#endif
 
 static int
 _device_reprobe(void)
@@ -1187,33 +1375,49 @@ _device_reprobe(void)
     return 0;
 }
 
+#ifdef BCM_INSTANCE_SUPPORT
+/*
+ * Attach an SDK instance:
+ * _device_reprobe();
+ * Check If an instance with the same bitmap exists, if yes with the same dmasize, return, if yes a different dmasize return an error, if no:
+ * Allocate DMA for the instance.
+ * This loop finds the first free resource in _bde_inst_resource[] and configure it for the instance.
+ * Store the resource/instance index in _bde_inst_resource for every device in the instance.
+ */
 static int
-_instance_attach(unsigned int inst_id, unsigned int dma_size)
+_instance_attach(unsigned int inst_id, unsigned int dma_size, linux_bde_device_bitmap_t inst_devices)
 {
     unsigned int dma_offset;
     int i, exist;
     bde_inst_resource_t *res;
-    int inst_idx = -1;
-    uint32 instid;
+    uint32 previous_inst_id;
 
     /* Reprobe the system for hot-plugged device */
     _device_reprobe();
 
     if (debug >= 2) {
-        gprintk("INFO: Request to attach to instance_id %d with dma size %d!\n", inst_id, dma_size);
+        gprintk("INFO: Request to attach to instance_id %u with dma size %d!\n", inst_id, dma_size);
     }
 
     spin_lock(&bde_resource_lock);
 
-    /* Validate the resource with inst_id */
-    exist = _instance_validate(inst_id, dma_size);
-    if (exist < 0) {
+    /* If not in multi instance mode, move to the mode and fix the first instance that represented all devices */
+    if (_bde_multi_inst == 0) {
+        _bde_multi_inst = 1;
+        _bde_inst_resource->is_active = 0;
+        /*_bde_inst_resource->dev will not be used when _bde_inst_resource->is_active == 0 */
+    }
+    
+    /* Validate the resource with inst_devices */
+    exist = _instance_validate(inst_id, dma_size, inst_devices);
+
+    if (exist == LUBDE_FAIL) {
         spin_unlock(&bde_resource_lock);
         return LUBDE_FAIL;
     }
     if (exist > 0) {
         if (debug >= 2) {
-            gprintk("INFO: Already attached to instance_id %d with dma size %d!\n", inst_id, dma_size);
+            gprintk("INFO: Already attached to instance_id %u with dma size %d!\n", inst_id, dma_size);
         }
         spin_unlock(&bde_resource_lock);
         return LUBDE_SUCCESS;
@@ -1222,38 +1426,59 @@ _instance_attach(unsigned int inst_id, unsigned int dma_size)
         spin_unlock(&bde_resource_lock);
         return LUBDE_FAIL;
     }
-    for (i = 0; i < user_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        res = &_bde_inst_resource[i];
-        if ((_bde_multi_inst == 0) || (res->inst_id == 0)) {
-            res->inst_id = inst_id;
-            res->dma_offset = dma_offset;
-            res->dma_size = dma_size;
-            _bde_multi_inst++;
-            inst_idx = i;
-            init_waitqueue_head(&res->intr_wq);
-            atomic_set(&res->intr, 0);
-            break;
-        }
+
+    /* configure the instance ID resources */
+    res = _bde_inst_resource + inst_id;
+    res->is_active = 1;
+    res->dma_offset = dma_offset;
+    res->dma_size = dma_size;
+#ifdef SAI_FIXUP    /* SDK-240875 */
+    /* skip instance 0, WQ for instance 0 has been initialized in user_bde init, see _init() */
+    if (inst_id != 0) {
+        init_waitqueue_head(&res->intr_wq);
+        init_waitqueue_head(&res->edk_intr_wq);
+        atomic_set(&res->intr, 0);
+        atomic_set(&res->edk_intr, 0);
     }
+#endif
+    memcpy(*lkbde_get_inst_devs(inst_id), inst_devices, sizeof(linux_bde_device_bitmap_t)); /* SDK-225233 */
 
+    /* store the resource/instance index in _bde_inst_resource for every device in the instance */
     for (i = 0; i < user_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        if (inst_id & (1 << i)) {
-            _devices[i].inst = inst_idx;
-            /* Pass the instid to the kernel BDE */
-            if (lkbde_dev_instid_get(i, &instid) == 0) {
-                if (!instid) {
+        if (inst_devices[i / 32] & (1 << (i % 32))) {
+            _devices[i].inst = inst_id;
+            /* Pass the inst_id to the kernel BDE */
+            if (lkbde_dev_instid_get(i, &previous_inst_id) == 0) { /* If the linux-kernel-bde inst_id is not set for the device, set it to the instance ID */
+                if (previous_inst_id == BDE_DEV_INST_ID_INVALID) {
                     lkbde_dev_instid_set(i, inst_id);
                 }
-            }
+            } /* TODO handle the case where the device is marked belonging to a different instance */
         }
     }
     spin_unlock(&bde_resource_lock);
     if (debug >= 2) {
-        gprintk("INFO: Attached to instance_id %d with dma size %d! SUCCESS\n", inst_id, dma_size);
+        gprintk("INFO: Attached to instance_id %lu with dma size %d! SUCCESS\n", (unsigned long)inst_devices, dma_size);
     }
 
     return LUBDE_SUCCESS;
 }
+#endif /* BCM_INSTANCE_SUPPORT */
+
+#ifdef BDE_EDK_SUPPORT
+static int
+_edk_instance_attach(unsigned int inst_id, unsigned int dma_size)
+{
+    ssize_t size = (ssize_t)dma_size;
+    if (size) {
+        lkbde_edk_get_dma_info(inst_id, NULL, NULL, &size);
+        if (!size) {
+            gprintk("Error: EDK Attached to instance_id %lu failed\n", (unsigned long)inst_id);
+            return LUBDE_FAIL;
+        }
+    }
+    return LUBDE_SUCCESS;
+}
+#endif
 
 /*
  * Function: _ioctl
@@ -1273,7 +1498,7 @@ _ioctl(unsigned int cmd, unsigned long arg)
     phys_addr_t cpu_pbase, dma_pbase;
     ssize_t size;
     const ibde_dev_t *bde_dev;
-    int inst_id;
+    int inst_id, idx;
     bde_inst_resource_t *res;
     uint32_t *mapaddr;
 
@@ -1341,10 +1566,19 @@ _ioctl(unsigned int cmd, unsigned long arg)
     case LUBDE_GET_DMA_INFO:
         inst_id = io.dev;
         if (_bde_multi_inst){
-            _dma_resource_get(inst_id, &cpu_pbase, &dma_pbase, &size);
+            if (_dma_resource_get(inst_id, &cpu_pbase, &dma_pbase, &size)) {
+                io.rc = LUBDE_FAIL;
+            }
         } else {
             lkbde_get_dma_info(&cpu_pbase, &dma_pbase, &size);
         }
+#ifdef BDE_EDK_SUPPORT
+    case LUBDE_GET_EDK_DMA_INFO:
+        if (cmd == LUBDE_GET_EDK_DMA_INFO) {
+            inst_id = io.dev;
+            lkbde_edk_get_dma_info(inst_id, &cpu_pbase, &dma_pbase, &size);
+        }
+#endif
         io.d0 = dma_pbase;
         io.d1 = size;
         /* Optionally enable DMA mmap via /dev/linux-kernel-bde */
@@ -1365,14 +1599,6 @@ _ioctl(unsigned int cmd, unsigned long arg)
         }
         if (_devices[io.dev].dev_type & BDE_SWITCH_DEV_TYPE) {
             if (_devices[io.dev].isr && !_devices[io.dev].enabled) {
-                bde_ctrl_t *ctrl;
-                ctrl = &_devices[io.dev];
-                if ((ctrl->isr == (isr_f)_cmicx_interrupt)  &&
-                    (ctrl->dev_type & BDE_PCI_DEV_TYPE)) {
-                    /* Set MSI mode to SW clear vs auto clear */
-                    WRITE_INTC_INTR(io.dev, ctrl->intr_regs.intc_intr_clear_mode_0, 0x0);
-                    WRITE_INTC_INTR(io.dev, ctrl->intr_regs.intc_intr_clear_mode_1, 0x0);
-                }
                 user_bde->interrupt_connect(io.dev,
                                             _devices[io.dev].isr,
                                             _devices+io.dev);
@@ -1398,6 +1624,32 @@ _ioctl(unsigned int cmd, unsigned long arg)
             _devices[io.dev].enabled = 0;
         }
         break;
+    case LUBDE_SET_EDK_INTERRUPTS:
+        if (!VALID_DEVICE(io.dev)) {
+            return -EINVAL;
+        }
+        res = &_bde_inst_resource[_devices[io.dev].inst];
+        res->edk_irqs.timer_intrc_offset = io.d0;
+        res->edk_irqs.timer_intrc_mask =  io.d1;
+        res->edk_irqs.sw_intr_intrc_offset = io.d2;
+        res->edk_irqs.sw_intr_intrc_mask = io.d3;
+        res->edk_irqs.sw_intr_src_bitmap = io.dx.dw[0];
+        for (idx = 0; idx < MAX_UC_CORES; idx++) {
+            res->edk_irqs.sw_intr_icfg_reg[idx] = io.dx.dw[idx + 1];
+        }
+        break;
+    case LUBDE_ENABLE_EDK_INTERRUPTS:
+        if (!VALID_DEVICE(io.dev)) {
+            return -EINVAL;
+        }
+        _devices[io.dev].edk_irq_enabled = 1;
+        break;
+    case LUBDE_DISABLE_EDK_INTERRUPTS:
+        if (!VALID_DEVICE(io.dev)) {
+            return -EINVAL;
+        }
+        _devices[io.dev].edk_irq_enabled = 0;
+        break;
     case LUBDE_WAIT_FOR_INTERRUPT:
         if (!VALID_DEVICE(io.dev)) {
             return -EINVAL;
@@ -1409,8 +1661,34 @@ _ioctl(unsigned int cmd, unsigned long arg)
                                atomic_read(&res->intr) != 0, 100);
 
 #else
-            wait_event_interruptible(res->intr_wq,
-                                     atomic_read(&res->intr) != 0);
+            /* CMICX Devices */
+            if ((_devices[io.dev].dev_type & BDE_PCI_DEV_TYPE) &&
+                (_devices[io.dev].isr == (isr_f)_cmicx_interrupt)  &&
+                (intr_timeout > 0)) {
+                unsigned long t_jiffies;
+                int err=0;
+                t_jiffies =  msecs_to_jiffies(intr_timeout);
+                err = wait_event_interruptible_timeout(res->intr_wq,
+                             atomic_read(&res->intr) != 0,
+                             t_jiffies);
+                /* Timeout happend and condition not set */
+                if (err == 0) {
+                    bde_ctrl_t *ctrl;
+                    ctrl = &_devices[io.dev];
+                    intr_timeout_count++;
+                    if (debug >= 1) {
+                        gprintk("Timeout happend and condition not set\n");
+                    }
+                    dump_interrupt_regs(ctrl, io.dev);
+                } else if (err == -ERESTARTSYS) {
+                    if (debug >= 1) {
+                       gprintk("Interrupted by Signal\n");
+                    }
+                }
+            } else {
+                wait_event_interruptible(res->intr_wq,
+                                      atomic_read(&res->intr) != 0);
+            }
 #endif
             /* 
              * Even if we get multiple interrupts, we 
@@ -1424,14 +1702,56 @@ _ioctl(unsigned int cmd, unsigned long arg)
 #else
             wait_event_interruptible(_ether_interrupt_wq,     
                                      atomic_read(&_ether_interrupt_has_taken_place) != 0);
+
 #endif
             /* 
-             * Even if we get multiple interrupts, we 
+             * Even if we get multiple interrupts, we
              * only run the interrupt handler once.
              */
             atomic_set(&_ether_interrupt_has_taken_place, 0);
         }
         break;
+   case LUBDE_WAIT_FOR_EDK_INTERRUPT:
+        if (!VALID_DEVICE(io.dev)) {
+            return -EINVAL;
+        }
+        res = &_bde_inst_resource[_devices[io.dev].inst];
+#ifdef BDE_LINUX_NON_INTERRUPTIBLE
+        wait_event_timeout(res->edk_intr_wq,
+                           atomic_read(&res->edk_intr) != 0, 100);
+
+#else
+        /* CMICX Devices */
+        if ((_devices[io.dev].dev_type & BDE_PCI_DEV_TYPE) &&
+            (_devices[io.dev].isr == (isr_f)_cmicx_interrupt) &&
+            (intr_timeout > 0)) {
+            unsigned long t_jiffies;
+            int err = 0;
+            t_jiffies = msecs_to_jiffies(intr_timeout);
+            err = wait_event_interruptible_timeout(res->edk_intr_wq,
+                         atomic_read(&res->edk_intr) != 0, t_jiffies);
+            /* Timeout happend and condition not set */
+            if (err == 0) {
+                bde_ctrl_t *ctrl;
+                ctrl = &_devices[io.dev];
+                intr_timeout_count++;
+                if (debug >= 1) {
+                    gprintk("EDK Interrrupt: Timeout happened\n");
+                }
+                dump_interrupt_regs(ctrl, io.dev);
+            } else if (err == -ERESTARTSYS) {
+                if (debug >= 1) {
+                    gprintk("EDK Interrrupt: Interrupted by Signal\n");
+                }
+            }
+        } else {
+            wait_event_interruptible(res->edk_intr_wq, atomic_read(&res->edk_intr) != 0);
+        }
+#endif
+        /* Even if we get multiple interrupts, we
+         * only run the interrupt handler once. */
+        atomic_set(&res->edk_intr, 0);
+        break;
     case LUBDE_USLEEP:
     case LUBDE_UDELAY:
     case LUBDE_SEM_OP:
@@ -1487,7 +1807,7 @@ _ioctl(unsigned int cmd, unsigned long arg)
             if (BDE_DEV_MEM_MAPPED(_devices[io.dev].dev_type)) {
                 /* Get physical address to map */
                 io.rc = lkbde_get_dev_resource(io.dev, io.d0,
-                                               &io.d1, &io.d2, &io.d3);
+                                               &io.d2, &io.d3, &io.d1);
             }
         } else {
             io.rc = LUBDE_FAIL;
@@ -1517,9 +1837,16 @@ _ioctl(unsigned int cmd, unsigned long arg)
             io.rc = LUBDE_FAIL;
         }
         break;
+#ifdef BDE_EDK_SUPPORT
+    case LUBDE_ATTACH_EDK_INSTANCE:
+        io.rc = _edk_instance_attach(io.d0, io.d1);
+        break;
+#endif
+#ifdef BCM_INSTANCE_SUPPORT
     case LUBDE_ATTACH_INSTANCE:
-        io.rc = _instance_attach(io.d0, io.d1);
+        io.rc = _instance_attach(io.d0, io.d1, io.dx.dw);
         break;
+#endif
     case LUBDE_GET_DEVICE_STATE:
         io.rc = lkbde_dev_state_get(io.dev, &io.d0);
         break;
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.h b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.h
index 535ccac9fad9..4bd4b746c521 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: linux-user-bde.h,v 1.23 Broadcom SDK $
@@ -45,7 +56,7 @@ typedef struct  {
     unsigned int d3;    
     bde_kernel_addr_t p0;
     union {
-        unsigned int dw[2];
+        uint32_t dw[16];
         unsigned char buf[64];
     } dx;
 } lubde_ioctl_t;
@@ -54,34 +65,41 @@ typedef struct  {
 /* LUBDE ioctls */
 #define LUBDE_MAGIC 'L'
 
-#define LUBDE_VERSION             _IO(LUBDE_MAGIC, 0)
-#define LUBDE_GET_NUM_DEVICES     _IO(LUBDE_MAGIC, 1)
-#define LUBDE_GET_DEVICE          _IO(LUBDE_MAGIC, 2)
-#define LUBDE_PCI_CONFIG_PUT32    _IO(LUBDE_MAGIC, 3)
-#define LUBDE_PCI_CONFIG_GET32    _IO(LUBDE_MAGIC, 4)
-#define LUBDE_GET_DMA_INFO        _IO(LUBDE_MAGIC, 5)
-#define LUBDE_ENABLE_INTERRUPTS   _IO(LUBDE_MAGIC, 6)
-#define LUBDE_DISABLE_INTERRUPTS  _IO(LUBDE_MAGIC, 7)
-#define LUBDE_USLEEP              _IO(LUBDE_MAGIC, 8)
-#define LUBDE_WAIT_FOR_INTERRUPT  _IO(LUBDE_MAGIC, 9)
-#define LUBDE_SEM_OP              _IO(LUBDE_MAGIC, 10)
-#define LUBDE_UDELAY              _IO(LUBDE_MAGIC, 11)
-#define LUBDE_GET_DEVICE_TYPE     _IO(LUBDE_MAGIC, 12)
-#define LUBDE_SPI_READ_REG        _IO(LUBDE_MAGIC, 13)
-#define LUBDE_SPI_WRITE_REG       _IO(LUBDE_MAGIC, 14)
-#define LUBDE_READ_REG_16BIT_BUS  _IO(LUBDE_MAGIC, 19)
-#define LUBDE_WRITE_REG_16BIT_BUS _IO(LUBDE_MAGIC, 20)
-#define LUBDE_GET_BUS_FEATURES    _IO(LUBDE_MAGIC, 21)
-#define LUBDE_WRITE_IRQ_MASK      _IO(LUBDE_MAGIC, 22)
-#define LUBDE_CPU_WRITE_REG       _IO(LUBDE_MAGIC, 23)
-#define LUBDE_CPU_READ_REG        _IO(LUBDE_MAGIC, 24)
-#define LUBDE_CPU_PCI_REGISTER    _IO(LUBDE_MAGIC, 25)
-#define LUBDE_DEV_RESOURCE        _IO(LUBDE_MAGIC, 26)
-#define LUBDE_IPROC_READ_REG      _IO(LUBDE_MAGIC, 27)
-#define LUBDE_IPROC_WRITE_REG     _IO(LUBDE_MAGIC, 28)
-#define LUBDE_ATTACH_INSTANCE     _IO(LUBDE_MAGIC, 29)
-#define LUBDE_GET_DEVICE_STATE    _IO(LUBDE_MAGIC, 30)
-#define LUBDE_REPROBE             _IO(LUBDE_MAGIC, 31)
+#define LUBDE_VERSION                   _IO(LUBDE_MAGIC, 0)
+#define LUBDE_GET_NUM_DEVICES           _IO(LUBDE_MAGIC, 1)
+#define LUBDE_GET_DEVICE                _IO(LUBDE_MAGIC, 2)
+#define LUBDE_PCI_CONFIG_PUT32          _IO(LUBDE_MAGIC, 3)
+#define LUBDE_PCI_CONFIG_GET32          _IO(LUBDE_MAGIC, 4)
+#define LUBDE_GET_DMA_INFO              _IO(LUBDE_MAGIC, 5)
+#define LUBDE_ENABLE_INTERRUPTS         _IO(LUBDE_MAGIC, 6)
+#define LUBDE_DISABLE_INTERRUPTS        _IO(LUBDE_MAGIC, 7)
+#define LUBDE_USLEEP                    _IO(LUBDE_MAGIC, 8)
+#define LUBDE_WAIT_FOR_INTERRUPT        _IO(LUBDE_MAGIC, 9)
+#define LUBDE_SEM_OP                    _IO(LUBDE_MAGIC, 10)
+#define LUBDE_UDELAY                    _IO(LUBDE_MAGIC, 11)
+#define LUBDE_GET_DEVICE_TYPE           _IO(LUBDE_MAGIC, 12)
+#define LUBDE_SPI_READ_REG              _IO(LUBDE_MAGIC, 13)
+#define LUBDE_SPI_WRITE_REG             _IO(LUBDE_MAGIC, 14)
+#define LUBDE_READ_REG_16BIT_BUS        _IO(LUBDE_MAGIC, 19)
+#define LUBDE_WRITE_REG_16BIT_BUS       _IO(LUBDE_MAGIC, 20)
+#define LUBDE_GET_BUS_FEATURES          _IO(LUBDE_MAGIC, 21)
+#define LUBDE_WRITE_IRQ_MASK            _IO(LUBDE_MAGIC, 22)
+#define LUBDE_CPU_WRITE_REG             _IO(LUBDE_MAGIC, 23)
+#define LUBDE_CPU_READ_REG              _IO(LUBDE_MAGIC, 24)
+#define LUBDE_CPU_PCI_REGISTER          _IO(LUBDE_MAGIC, 25)
+#define LUBDE_DEV_RESOURCE              _IO(LUBDE_MAGIC, 26)
+#define LUBDE_IPROC_READ_REG            _IO(LUBDE_MAGIC, 27)
+#define LUBDE_IPROC_WRITE_REG           _IO(LUBDE_MAGIC, 28)
+#define LUBDE_ATTACH_INSTANCE           _IO(LUBDE_MAGIC, 29)
+#define LUBDE_GET_DEVICE_STATE          _IO(LUBDE_MAGIC, 30)
+#define LUBDE_REPROBE                   _IO(LUBDE_MAGIC, 31)
+#define LUBDE_SET_EDK_INTERRUPTS        _IO(LUBDE_MAGIC, 32)
+#define LUBDE_ENABLE_EDK_INTERRUPTS     _IO(LUBDE_MAGIC, 33)
+#define LUBDE_DISABLE_EDK_INTERRUPTS    _IO(LUBDE_MAGIC, 34)
+#define LUBDE_WAIT_FOR_EDK_INTERRUPT    _IO(LUBDE_MAGIC, 35)
+#define LUBDE_ATTACH_EDK_INSTANCE       _IO(LUBDE_MAGIC, 36)
+#define LUBDE_GET_EDK_DMA_INFO          _IO(LUBDE_MAGIC, 37)
+
 
 #define LUBDE_SEM_OP_CREATE       1
 #define LUBDE_SEM_OP_DESTROY      2
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde.h b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde.h
index 53003a40ce53..2d0651191fbb 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_iproc.h b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_iproc.h
index 4b614ba53139..4b71b8f16ee3 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_iproc.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_iproc.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_mdio.h b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_mdio.h
index 5f8fa63533f4..a51dd2ac6f5f 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_mdio.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_mdio.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_pci.h b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_pci.h
index 1f045d7b02c8..a0b88494823f 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_pci.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/include/shbde_pci.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
index 087720a20a8b..ca8024c78a32 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
@@ -292,12 +303,19 @@ shbde_iproc_paxb_init(shbde_hal_t *shbde, void *iproc_regs,
 
     /* Configure MSIX interrupt page, need for iproc ver 0x10 and 0x12 */
     if ((icfg->use_msi == 2) &&
-        ((icfg->iproc_ver == 0x10) || (icfg->iproc_ver == 0x12))){
+        ((icfg->iproc_ver == 0x10)
+         || (icfg->iproc_ver == 0x12)
+         || (icfg->iproc_ver == 0x11))){
         unsigned int mask = (0x1 << PAXB_0_FUNC0_IMAP1_3_ADDR_SHIFT) - 1;
         reg = ROFFS(iproc_regs, PAXB_0_FUNC0_IMAP1_3);
         data = iproc32_read(shbde, reg);
         data &= mask;
-        data |= 0x410 << PAXB_0_FUNC0_IMAP1_3_ADDR_SHIFT;
+        if (icfg->iproc_ver == 0x11) {
+            data |= 0x400 << PAXB_0_FUNC0_IMAP1_3_ADDR_SHIFT;
+        } else {
+            data |= 0x410 << PAXB_0_FUNC0_IMAP1_3_ADDR_SHIFT;
+        }
+
         iproc32_write(shbde, reg, data);
     }
 
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_mdio.c b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_mdio.c
index ef4a72071b33..1e38eb024adc 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_mdio.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_mdio.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_pci.c b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_pci.c
index 5cc46d0d463d..8e64b475a41f 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_pci.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_pci.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/Makefile
index 448b4b9a9310..b599580ae861 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.10 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/Makefile
index a3f430a6a903..9879be69b0b6 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.3 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
index a9eda27ad4d5..a3f92b17584b 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
@@ -60,10 +60,6 @@
 #include <kcom.h>
 #include <bcm-knet.h>
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,16,0)
-#include <linux/nsproxy.h>
-#endif
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -222,6 +218,7 @@ MODULE_PARM_DESC(ft_vid,
 #define DBG_LVL_DCB_RX  0x20000
 #define DBG_LVL_PDMP_TX 0x40000
 #define DBG_LVL_PDMP_RX 0x80000
+#define DBG_LVL_PTP     0x100000
 
 #define DBG_VERB(_s)    do { if (debug & DBG_LVL_VERB) gprintk _s; } while (0)
 #define DBG_PKT(_s)     do { if (debug & DBG_LVL_PKT)  gprintk _s; } while (0)
@@ -245,6 +242,7 @@ MODULE_PARM_DESC(ft_vid,
 #define DBG_DCB(_s)     do { if (debug & (DBG_LVL_DCB|DBG_LVL_DCB_TX| \
                                           DBG_LVL_DCB_RX)) \
                                  gprintk _s; } while (0)
+#define DBG_PTP(_s)    do { if (debug & DBG_LVL_PTP) gprintk _s; } while (0)
 
 
 /* This flag is used to indicate if debugging packet function is open or closed */
@@ -499,6 +497,12 @@ static inline void bkn_skb_tx_timestamp(struct sk_buff *skb)
 #define BKN_DMA_MAPPING_ERROR(d,a)          bkn_pci_dma_mapping_error(d,a)
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+#define BKN_NETDEV_TX_BUSY      NETDEV_TX_BUSY
+#else
+#define BKN_NETDEV_TX_BUSY      1
+#endif
+
 /*
  * Get a 16-bit value from packet offset
  * _data Pointer to packet
@@ -672,6 +676,8 @@ typedef struct bkn_switch_info_s {
     } rx[NUM_RX_CHAN];
 } bkn_switch_info_t;
 
+#define INVALID_INSTANCE_ID         BDE_DEV_INST_ID_INVALID
+
 /* 0x1 - Jericho 2 mode */
 #define BKN_DNX_JR2_MODE            1
 /* PTCH_2 */
@@ -936,13 +942,6 @@ typedef struct bkn_filter_s {
     kcom_filter_t kf;
 } bkn_filter_t;
 
-#ifdef SAI_FIXUP    /* SDK-224448 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-#define BKN_NETDEV_TX_BUSY      NETDEV_TX_BUSY
-#else
-#define BKN_NETDEV_TX_BUSY      1
-#endif
-#endif              /* SDK-224448 */
 
 /*
  * Multiple instance support in KNET
@@ -1071,6 +1070,7 @@ bkn_sleep(int clicks)
 
 #define DEV_IS_CMICX(_sinfo)    ((_sinfo)->cmic_type == 'x')
 #define DEV_IS_CMICM(_sinfo)    ((_sinfo)->cmic_type == 'm')
+#define DEV_IS_CMIC(_sinfo)     ((_sinfo)->cmic_type != 0)
 #define CDMA_CH(_d, _ch)        ((_d)->cdma_channels & (1 << (_ch)))
 
 /*
@@ -2125,12 +2125,13 @@ bkn_api_rx_chain_done(bkn_switch_info_t *sinfo, int chan)
 
 static int
 bkn_api_rx_copy_from_skb(bkn_switch_info_t *sinfo,
-                         int chan, bkn_desc_info_t *desc)
+                         int chan, bkn_desc_info_t *desc, int rx_hwts)
 {
     bkn_dcb_chain_t *dcb_chain;
     uint32_t *dcb;
     uint32_t dcb_stat;
     uint8_t *pkt;
+    uint8_t *skb_pkt;
     uint64_t pkt_dma;
     int pktlen;
     int i;
@@ -2168,8 +2169,18 @@ bkn_api_rx_copy_from_skb(bkn_switch_info_t *sinfo,
         return -1;
     }
 
+    skb_pkt = desc->skb->data;
+
+    /* Strip custom header from KNETSync packets.  */
+    if ((rx_hwts) &&
+        ((skb_pkt[0] == 'B') && (skb_pkt[1] == 'C') &&
+         (skb_pkt[2] == 'M') && (skb_pkt[3] == 'C'))) {
+
+        skb_pkt = skb_pkt + skb_pkt[4];
+    }
+
     /* Copy packet data */
-    memcpy(pkt, desc->skb->data, pktlen);
+    memcpy(pkt, skb_pkt, pktlen);
 
     /* Copy packet metadata and mark as done */
     if (sinfo->cmic_type != 'x') {
@@ -2235,11 +2246,11 @@ bkn_rx_refill(bkn_switch_info_t *sinfo, int chan)
     while (sinfo->rx[chan].free < MAX_RX_DCBS) {
         desc = &sinfo->rx[chan].desc[sinfo->rx[chan].cur];
         if (desc->skb == NULL) {
-            skb = dev_alloc_skb(rx_buffer_size + RCPU_RX_ENCAP_SIZE);
+            skb = dev_alloc_skb(rx_buffer_size + SKB_DATA_ALIGN(resv_size));
             if (skb == NULL) {
                 break;
             }
-            skb_reserve(skb, resv_size);
+            skb_reserve(skb, SKB_DATA_ALIGN(resv_size));
             desc->skb = skb;
         } else {
             DBG_DCB_RX(("Refill Rx%d SKB in DCB %d recycled.\n",
@@ -3832,6 +3843,11 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
 
     while (dcbs_done < budget) {
         char str[32];
+
+        if (!sinfo->rx[chan].running) {
+            /* DCBs might be cleaned up when bkn_knet_hw_reset is triggered. */
+            return 0;
+        }
         sprintf(str, "Rx DCB (%d)", sinfo->rx[chan].dirty);
         desc = &sinfo->rx[chan].desc[sinfo->rx[chan].dirty];
         dcb = desc->dcb_mem;
@@ -3850,6 +3866,12 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
         sinfo->rx[chan].pkts++;
         skb = desc->skb;
 
+        DBG_DCB_RX(("Rx%d SKB DMA done (%d).\n", chan, sinfo->rx[chan].dirty));
+        BKN_DMA_UNMAP_SINGLE(sinfo->dma_dev,
+                             desc->skb_dma, desc->dma_size,
+                             BKN_DMA_FROMDEV);
+        desc->skb_dma = 0;
+
         if (device_is_sand(sinfo)) {
             err_woff = BKN_SAND_SCRATCH_DATA_SIZE - 1;
             sand_scratch_data[err_woff] = dcb[sinfo->dcb_wsize-1];
@@ -3868,11 +3890,6 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
 
         pktlen = dcb[sinfo->dcb_wsize-1] & 0xffff;
         priv = netdev_priv(sinfo->dev);
-        DBG_DCB_RX(("Rx%d SKB DMA done (%d).\n", chan, sinfo->rx[chan].dirty));
-        BKN_DMA_UNMAP_SINGLE(sinfo->dma_dev,
-                         desc->skb_dma, desc->dma_size,
-                         BKN_DMA_FROMDEV);
-        desc->skb_dma = 0;
         bkn_dump_pkt(skb->data, pktlen, XGS_DMA_RX_CHAN);
 
         if (device_is_sand(sinfo)) {
@@ -3945,7 +3962,7 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
             case KCOM_DEST_T_API:
                 DBG_FLTR(("Send to Rx API\n"));
                 sinfo->rx[chan].pkts_f_api++;
-                bkn_api_rx_copy_from_skb(sinfo, chan, desc);
+                bkn_api_rx_copy_from_skb(sinfo, chan, desc, 0);
                 break;
             case KCOM_DEST_T_NETIF:
                 priv = bkn_netif_lookup(sinfo, filter->kf.dest_id);
@@ -3961,7 +3978,7 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
 
                     if ((filter->kf.mirror_type == KCOM_DEST_T_API) || dbg_pkt_enable) {
                         sinfo->rx[chan].pkts_m_api++;
-                        bkn_api_rx_copy_from_skb(sinfo, chan, desc);
+                        bkn_api_rx_copy_from_skb(sinfo, chan, desc, priv->rx_hwts);
                     }
 
                     if (device_is_sand(sinfo)) {
@@ -4095,6 +4112,9 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
                         }
                     }
 
+                    /* Ensure that we reallocate SKB for this DCB */
+                    desc->skb = NULL;
+
                     /* Unlock while calling up network stack */
                     spin_unlock(&sinfo->lock);
                     if (use_napi) {
@@ -4104,8 +4124,6 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
                     }
                     spin_lock(&sinfo->lock);
 
-                    /* Ensure that we reallocate SKB for this DCB */
-                    desc->skb = NULL;
                 } else {
                     DBG_FLTR(("Unknown netif %d\n",
                               filter->kf.dest_id));
@@ -4299,11 +4317,28 @@ bkn_hw_tstamp_tx_work(struct work_struct *work)
 {
     bkn_switch_info_t *sinfo = container_of(work, bkn_switch_info_t, tx_ptp_work);
     struct sk_buff *skb;
+    int ret;
 
     while (skb_queue_len(&sinfo->tx_ptp_queue)) {
         skb = skb_dequeue(&sinfo->tx_ptp_queue);
-        if (bkn_hw_tstamp_tx_set(sinfo, skb) < 0) {
-            gprintk("Timestamp has not been taken for the current skb.\n");
+        ret = bkn_hw_tstamp_tx_set(sinfo, skb);
+        if (ret < 0) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
+            ktime_t now;
+            now = ktime_get();
+            DBG_PTP(("2Step TX Timestamp has not been taken for the current skb (%lld us)\n",
+                                    ktime_us_delta(now, skb->tstamp)));
+        } else {
+            ktime_t now;
+            now = ktime_get();
+            /* Timeout 20 should be same as configured by PTP4L */
+            if (ktime_us_delta(now, skb->tstamp) >= 20000) {
+                DBG_PTP(("2Step TX Timestamp fetch took long time %lld us\n",
+                            ktime_us_delta(now, skb->tstamp)));
+            }
+#else 
+            DBG_PTP(("2Step TX Timestamp has not been taken for the current skb\n"));
+#endif
         }
         dev_kfree_skb_any(skb);
     }
@@ -4346,6 +4381,9 @@ bkn_do_tx(bkn_switch_info_t *sinfo)
             }
 
             if (bkn_skb_tx_flags(desc->skb) & SKBTX_IN_PROGRESS) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
+                desc->skb->tstamp = ktime_get();
+#endif
                 skb_queue_tail(&sinfo->tx_ptp_queue, desc->skb);
                 schedule_work(&sinfo->tx_ptp_work);
             } else {
@@ -5310,6 +5348,7 @@ bkn_hw_tstamp_tx_config(bkn_switch_info_t *sinfo,
     case 26:
     case 32:
     case 33:
+    case 35:
         meta[2] |= md[0];
         meta[3] |= md[1];
         meta[4] |= md[2];
@@ -5342,6 +5381,7 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
     uint32_t *metadata;
     unsigned long flags;
     uint32_t cpu_channel = 0;
+    int headroom, tailroom;
 
     DBG_VERB(("Netif Tx: Len=%d priv->id=%d\n", skb->len, priv->id));
 
@@ -5449,7 +5489,16 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                         if (skb_header_cloned(skb)) {
                             /* Current SKB cannot be modified */
                             DBG_SKB(("Realloc Tx SKB\n"));
-                            new_skb = dev_alloc_skb(pktlen + TAG_SZ + FCS_SZ);
+                            /*
+                             * New SKB needs extra TAG_SZ for VLAN tag
+                             * and extra FCS_SZ for Ethernet FCS.
+                             */
+                            headroom = TAG_SZ;
+                            tailroom = FCS_SZ;
+                            new_skb = skb_copy_expand(skb,
+                                                      headroom + skb_headroom(skb),
+                                                      tailroom + skb_tailroom(skb),
+                                                      GFP_ATOMIC);
                             if (new_skb == NULL) {
                                 DBG_WARN(("Tx drop: No SKB memory\n"));
                                 priv->stats.tx_dropped++;
@@ -5458,9 +5507,12 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                                 spin_unlock_irqrestore(&sinfo->lock, flags);
                                 return 0;
                             }
+                            /* Remove rcpulen from buffer. */
+                            skb_pull(new_skb, rcpulen);
+                            /* Extended by TAG_SZ at the start of buffer. */
+                            skb_push(new_skb, TAG_SZ);
+                            /* Restore the data before the tag. */
                             memcpy(new_skb->data, pktdata, 12);
-                            memcpy(&new_skb->data[16], &pktdata[12], pktlen - 12);
-                            skb_put(new_skb, pktlen + TAG_SZ);
                             bkn_skb_tstamp_copy(new_skb, skb);
                             dev_kfree_skb_any(skb);
                             skb = new_skb;
@@ -5489,7 +5541,16 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                 if (skb_header_cloned(skb) || skb_headroom(skb) < hdrlen + 4) {
                     /* Current SKB cannot be modified */
                     DBG_SKB(("Realloc Tx SKB\n"));
-                    new_skb = dev_alloc_skb(pktlen + hdrlen + 4 + FCS_SZ);
+                    if (device_is_sand(sinfo)) {
+                        headroom = hdrlen;
+                    } else {
+                        headroom = hdrlen + 4;
+                    }
+                    tailroom = FCS_SZ;
+                    new_skb = skb_copy_expand(skb,
+                                              headroom + skb_headroom(skb),
+                                              tailroom + skb_tailroom(skb),
+                                              GFP_ATOMIC);
                     if (new_skb == NULL) {
                         DBG_WARN(("Tx drop: No SKB memory\n"));
                         priv->stats.tx_dropped++;
@@ -5498,12 +5559,7 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                         spin_unlock_irqrestore(&sinfo->lock, flags);
                         return 0;
                     }
-                    if (!device_is_sand(sinfo))
-                    {
-                        skb_reserve(new_skb, 4);
-                    }
-                    memcpy(new_skb->data + hdrlen, skb->data, pktlen);
-                    skb_put(new_skb, pktlen + hdrlen);
+                    skb_push(new_skb, hdrlen);
                     bkn_skb_tstamp_copy(new_skb, skb);
                     dev_kfree_skb_any(skb);
                     skb = new_skb;
@@ -5526,7 +5582,12 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                     if (skb_header_cloned(skb) || skb_headroom(skb) < 4) {
                         /* Current SKB cannot be modified */
                         DBG_SKB(("Realloc Tx SKB\n"));
-                        new_skb = dev_alloc_skb(pktlen + TAG_SZ + FCS_SZ);
+                        headroom = TAG_SZ;
+                        tailroom = FCS_SZ;
+                        new_skb = skb_copy_expand(skb,
+                                                  headroom + skb_headroom(skb),
+                                                  tailroom + skb_tailroom(skb),
+                                                  GFP_ATOMIC);
                         if (new_skb == NULL) {
                             DBG_WARN(("Tx drop: No SKB memory\n"));
                             priv->stats.tx_dropped++;
@@ -5535,10 +5596,8 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
                             spin_unlock_irqrestore(&sinfo->lock, flags);
                             return 0;
                         }
-                        memcpy(new_skb->data, skb->data, hdrlen + 12);
-                        memcpy(&new_skb->data[hdrlen + 16], &skb->data[hdrlen + 12],
-                               pktlen - hdrlen - 12);
-                        skb_put(new_skb, pktlen + TAG_SZ);
+                        skb_push(new_skb, TAG_SZ);
+                        memcpy(new_skb->data, pktdata, hdrlen + 12);
                         bkn_skb_tstamp_copy(new_skb, skb);
                         dev_kfree_skb_any(skb);
                         skb = new_skb;
@@ -5868,24 +5927,11 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
         priv->stats.tx_bytes += pktlen;
         sinfo->tx.pkts++;
     } else {
-#ifdef SAI_FIXUP    /* SDK-224448 */
         DBG_VERB(("Tx busy: No DMA resources\n"));
         sinfo->tx.pkts_d_dma_resrc++;
-#else
-        DBG_WARN(("Tx drop: No DMA resources\n"));
-        priv->stats.tx_dropped++;
-        sinfo->tx.pkts_d_dma_resrc++;
-        dev_kfree_skb_any(skb);
-    }
-
-    /* Check our Tx resources */
-    if (sinfo->tx.free <= 1) {
-#endif              /* SDK-224448 */
         bkn_suspend_tx(sinfo);
-#ifdef SAI_FIXUP    /* SDK-224448 */
         spin_unlock_irqrestore(&sinfo->lock, flags);
         return BKN_NETDEV_TX_BUSY;
-#endif              /* SDK-224448 */
     }
 
     NETDEV_UPDATE_TRANS_START_TIME(dev);
@@ -6105,6 +6151,7 @@ bkn_create_sinfo(int dev_no)
     sinfo->dma_dev = lkbde_get_dma_dev(dev_no);
     sinfo->pdev = lkbde_get_hw_dev(dev_no);
     sinfo->dev_no = dev_no;
+    sinfo->inst_id = INVALID_INSTANCE_ID;
     sinfo->evt_idx = -1;
 
     spin_lock_init(&sinfo->lock);
@@ -6196,6 +6243,7 @@ bkn_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)
     case 26:
     case 32:
     case 33:
+    case 35:
     case 36:
     case 38:
     case 40:
@@ -6292,10 +6340,6 @@ bkn_init_ndev(u8 *mac, char *name)
     if (dev->mtu == 0) {
         dev->mtu = rx_buffer_size;
     }
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-    dev->min_mtu = 68;
-    dev->max_mtu = rx_buffer_size;
-#endif
 
     /* Device vectors */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
@@ -7296,9 +7340,9 @@ bkn_proc_cleanup(void)
  */
 
 static int
-_pprint(void)
+_pprint(struct seq_file *m)
 {
-    pprintf("Broadcom BCM KNET Linux Network Driver\n");
+    pprintf(m, "Broadcom BCM KNET Linux Network Driver\n");
 
     return 0;
 }
@@ -7460,7 +7504,7 @@ bkn_create_inst(uint32 inst_id)
             DBG_INST(("%s evt_idx %d inst_id 0x%x\n",__FUNCTION__, i, inst_id));
             break;
         }
-        if ((_bkn_multi_inst == 0) || (evt->inst_id == 0)) {
+        if ((_bkn_multi_inst == 0) || (evt->inst_id == INVALID_INSTANCE_ID)) {
             _bkn_multi_inst ++;
             evt_idx = i;
             init_waitqueue_head(&evt->evt_wq);
@@ -7475,7 +7519,7 @@ bkn_create_inst(uint32 inst_id)
         return -1;
     }
     for (i = 0; i < kernel_bde->num_devices(BDE_ALL_DEVICES); i++) {
-        if (inst_id & (1 << i)) {
+        if (lkbde_is_dev_managed_by_instance(i, inst_id)) {
             sinfo = bkn_sinfo_from_unit(i);
             spin_lock_irqsave(&sinfo->lock, flags);
             sinfo->evt_idx = evt_idx;
@@ -7519,23 +7563,28 @@ bkn_knet_dev_inst_set(kcom_msg_reprobe_t *kmsg)
 {
     bkn_switch_info_t *sinfo;
     int d = kmsg->hdr.unit;
-    uint32 inst = 0;
+    uint32 inst = INVALID_INSTANCE_ID;
     unsigned long flags;
     struct list_head *list;
 
     sinfo = bkn_sinfo_from_unit(d);
+#ifdef BCM_INSTANCE_SUPPORT
     lkbde_dev_instid_get(d, &inst);
+#else
+    inst = INVALID_INSTANCE_ID;
+#endif
+    DBG_INST(("%s sinfo->inst_id %d d %d inst %d\n",__FUNCTION__,sinfo->inst_id, d, inst));
 
     spin_lock_irqsave(&sinfo->lock, flags);
     if (sinfo->inst_id != inst) {
         /* Instance database changed, reinit the inst_id */
-        sinfo->inst_id = 0;
+        sinfo->inst_id = INVALID_INSTANCE_ID;
         sinfo->evt_idx = -1;
     }
     spin_unlock_irqrestore(&sinfo->lock, flags);
 
-    if (inst) {
-        if (sinfo->inst_id == 0) {
+    if (inst != INVALID_INSTANCE_ID) {
+        if (sinfo->inst_id == INVALID_INSTANCE_ID) {
             if (bkn_create_inst(inst) != 0) {
                 return -1;
             }
@@ -7549,7 +7598,7 @@ bkn_knet_dev_inst_set(kcom_msg_reprobe_t *kmsg)
             sinfo = (bkn_switch_info_t *)list;
             spin_lock_irqsave(&sinfo->lock, flags);
             sinfo->evt_idx = 0;
-            sinfo->inst_id = 0;
+            sinfo->inst_id = INVALID_INSTANCE_ID;
             spin_unlock_irqrestore(&sinfo->lock, flags);
         }
     }
@@ -7880,16 +7929,16 @@ bkn_knet_netif_create(kcom_msg_netif_create_t *kmsg, int len)
         }
     }
 
+
     DBG_VERB(("Assigned ID %d to Ethernet device %s\n",
               priv->id, dev->name));
 
     kmsg->netif.id = priv->id;
     memcpy(kmsg->netif.macaddr, dev->dev_addr, 6);
     memcpy(kmsg->netif.name, dev->name, KCOM_NETIF_NAME_MAX - 1);
-
     if (knet_netif_create_cb != NULL) {
         int retv = knet_netif_create_cb(kmsg->hdr.unit, &(kmsg->netif), dev);
-        if (retv) { 
+        if (retv) {
             gprintk("Warning: knet_netif_create_cb() returned %d for netif '%s'\n", retv, dev->name);
         }
     }
@@ -7947,6 +7996,7 @@ bkn_knet_netif_destroy(kcom_msg_netif_destroy_t *kmsg, int len)
         netif.id = priv->id;
         knet_netif_destroy_cb(kmsg->hdr.unit, &netif, priv->dev);
     }
+
     list_del(&priv->list);
 
     if (priv->id < sinfo->ndev_max) {
@@ -8473,8 +8523,8 @@ bkn_get_next_dma_event(kcom_msg_dma_info_t *kmsg)
             sinfo = bkn_sinfo_from_unit(dev_no);
         }
 
-        if (sinfo && (sinfo->inst_id != 0) &&
-           ((sinfo->inst_id & (1 << dev_evt)) == 0)) {
+        if (sinfo && (sinfo->inst_id != INVALID_INSTANCE_ID) &&
+           (!lkbde_is_dev_managed_by_instance(dev_evt, sinfo->inst_id))) {
             DBG_INST((" %s skip dev(%d)\n",__FUNCTION__,dev_no));
             continue;
         }
@@ -8540,8 +8590,10 @@ _cleanup(void)
         del_timer_sync(&sinfo->rxtick);
 
         spin_lock_irqsave(&sinfo->lock, flags);
-        bkn_dma_abort(sinfo);
-        dev_irq_mask_set(sinfo, 0);
+        if (DEV_IS_CMIC(sinfo)) {
+            bkn_dma_abort(sinfo);
+            dev_irq_mask_set(sinfo, 0);
+        }
         spin_unlock_irqrestore(&sinfo->lock, flags);
 
         DBG_IRQ(("Unregister ISR.\n"));
@@ -8759,6 +8811,7 @@ _init(void)
     /* Initialize event queue */
     for (idx = 0; idx < LINUX_BDE_MAX_DEVICES; idx++) {
         memset(&_bkn_evt[idx], 0, sizeof(bkn_evt_resource_t));
+        _bkn_evt[idx].inst_id = INVALID_INSTANCE_ID;
     }
     evt = &_bkn_evt[0];
     init_waitqueue_head(&evt->evt_wq);
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile
index 1c9a3209e133..9aa3be686851 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile
@@ -14,9 +14,9 @@
 #  version 2 (GPLv2) along with this source code.
 #
 # -*- Makefile -*-
-# $Id: Makefile,v 1.3 Broadcom SDK $
-# $Copyright: (c) 2020 Broadcom.
-# Broadcom Proprietary and Confidential. All rights reserved.$
+# $Id: Makefile,v 1.3 2012/07/17 07:39:51 mlarsen Exp $
+# $Copyright: (c) 2005 Broadcom Corp.
+# All Rights Reserved.$
 #
 LOCALDIR = systems/linux/kernel/modules/bcm-ptp-clock
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
index 5b0a6bde738d..edc4a38c741c 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
@@ -76,9 +76,13 @@ MODULE_PARM_DESC(fw_core,
 /* Debug levels */
 #define DBG_LVL_VERB    0x1
 #define DBG_LVL_WARN    0x2
+#define DBG_LVL_TXTS    0x4
+#define DBG_LVL_CMDS    0x8
 
 #define DBG_VERB(_s)    do { if (debug & DBG_LVL_VERB) gprintk _s; } while (0)
 #define DBG_WARN(_s)    do { if (debug & DBG_LVL_WARN) gprintk _s; } while (0)
+#define DBG_TXTS(_s)    do { if (debug & DBG_LVL_TXTS) gprintk _s; } while (0)
+#define DBG_CMDS(_s)    do { if (debug & DBG_LVL_CMDS) gprintk _s; } while (0)
 #define DBG_ERR(_s)     do { if (1) gprintk _s; } while (0)
 
 
@@ -98,41 +102,37 @@ MODULE_PARM_DESC(fw_core,
 #define BKSYNC_PACKLEN_U24    3
 #define BKSYNC_PACKLEN_U32    4
 
-#define BKSYNC_UNPACK_U8(_buf, _var)         \
+#define BKSYNC_UNPACK_U8(_buf, _var)        \
     _var = *_buf++
 
-#define BKSYNC_UNPACK_U16(_buf, _var)         \
+#define BKSYNC_UNPACK_U16(_buf, _var)       \
     do {                                    \
         (_var) = (((_buf)[0] << 8) |        \
                   (_buf)[1]);               \
-        (_buf) += BKSYNC_PACKLEN_U16;         \
+        (_buf) += BKSYNC_PACKLEN_U16;       \
     } while (0)
 
-#define BKSYNC_UNPACK_U24(_buf, _var)         \
+#define BKSYNC_UNPACK_U24(_buf, _var)       \
     do {                                    \
         (_var) = (((_buf)[0] << 16) |       \
                   ((_buf)[1] << 8)  |       \
                   (_buf)[2]);               \
-        (_buf) += BKSYNC_PACKLEN_U24;         \
+        (_buf) += BKSYNC_PACKLEN_U24;       \
     } while (0)
 
-#define BKSYNC_UNPACK_U32(_buf, _var)         \
+#define BKSYNC_UNPACK_U32(_buf, _var)       \
     do {                                    \
         (_var) = (((_buf)[0] << 24) |       \
                   ((_buf)[1] << 16) |       \
                   ((_buf)[2] << 8)  |       \
                   (_buf)[3]);               \
-        (_buf) += BKSYNC_PACKLEN_U32;         \
+        (_buf) += BKSYNC_PACKLEN_U32;       \
     } while (0)
 
 
 #define CMICX_DEV_TYPE   ((ptp_priv->dcb_type == 38) || \
                           (ptp_priv->dcb_type == 36))
 
-#define HOSTCMD_USE_REGS ((ptp_priv->dcb_type == 38) || \
-                          (ptp_priv->dcb_type == 36) || \
-                          (ptp_priv->dcb_type == 32))
-
 /* CMIC MCS-0 SCHAN Messaging registers */
 /* Core0:CMC1 Core1:CMC2 */
 #define CMIC_CMC_BASE \
@@ -154,30 +154,58 @@ MODULE_PARM_DESC(fw_core,
 
 u32 hostcmd_regs[5] = { 0 };
 
-/* TX Timestamp FIFO Access */
-#define BCM_NUM_PORTS           128
+#define BCMKSYNC_NUM_PORTS           128    /* NUM_PORTS where 2-step is supported. */
+#define BCMKSYNC_MAX_NUM_PORTS       256    /* Max ever NUM_PORTS in the system */
+#define BCMKSYNC_MAX_MTP_IDX        8    /* Max number of mtps in the system */
 
-/* Service request commands to R5 */
+/* Service request commands to Firmware. */
 enum {
-    BCM_KSYNC_DONE = 0x0,
-    BCM_KSYNC_INIT = 0x1,
-    BCM_KSYNC_DEINIT = 0x2,
-    BCM_KSYNC_GETTIME = 0x3,
-    BCM_KSYNC_SETTIME = 0x4,
-    BCM_KSYNC_FREQCOR = 0x5,
-    BCM_KSYNC_PBM_UPDATE = 0x6,
-    BCM_KSYNC_ADJTIME = 0x7,
-    BCM_KSYNC_GET_TSTIME = 0x8,
+    BKSYNC_DONE                     = (0x0),
+    BKSYNC_INIT                     = (0x1),
+    BKSYNC_DEINIT                   = (0x2),
+    BKSYNC_GETTIME                  = (0x3),
+    BKSYNC_SETTIME                  = (0x4),
+    BKSYNC_FREQCOR                  = (0x5),
+    BKSYNC_PBM_UPDATE               = (0x6),
+    BKSYNC_ADJTIME                  = (0x7),
+    BKSYNC_GET_TSTIME               = (0x8),
+    BKSYNC_MTP_TS_UPDATE_ENABLE     = (0x9),
+    BKSYNC_MTP_TS_UPDATE_DISABLE    = (0xa),
+    BKSYNC_ACK_TSTIME               = (0xb),
+};
+
+
+/* 1588 message types. */
+enum
+{
+    IEEE1588_MSGTYPE_SYNC           = (0x0),
+    IEEE1588_MSGTYPE_DELREQ         = (0x1),
+    IEEE1588_MSGTYPE_PDELREQ        = (0x2),
+    IEEE1588_MSGTYPE_PDELRESP       = (0x3),
+    /* reserved                       (0x4) */
+    /* reserved                       (0x5) */
+    /* reserved                       (0x6) */
+    /* reserved                       (0x7) */
+    IEEE1588_MSGTYPE_GENERALMASK    = (0x8),    /* all non-event messages have this bit set */
+    IEEE1588_MSGTYPE_FLWUP          = (0x8),
+    IEEE1588_MSGTYPE_DELRESP        = (0x9),
+    IEEE1588_MSGTYPE_PDELRES_FLWUP  = (0xA),
+    IEEE1588_MSGTYPE_ANNOUNCE       = (0xB),
+    IEEE1588_MSGTYPE_SGNLNG         = (0xC),
+    IEEE1588_MSGTYPE_MNGMNT         = (0xD)
+    /* reserved                       (0xE) */
+    /* reserved                       (0xF) */
 };
 
 /* Usage macros */
 #define ONE_BILLION (1000000000)
 
 #define SKB_U16_GET(_skb, _pkt_offset) \
-        ((_skb->data[_pkt_offset] << 8) | _skb->data[_pkt_offset + 1])
+            ((_skb->data[_pkt_offset] << 8) | _skb->data[_pkt_offset + 1])
 
 #define BKSYNC_PTP_EVENT_MSG(_ptp_msg_type) \
-        ((_ptp_msg_type == DELAY_REQ) || (_ptp_msg_type == SYNC))
+            ((_ptp_msg_type == IEEE1588_MSGTYPE_DELREQ) ||    \
+             (_ptp_msg_type == IEEE1588_MSGTYPE_SYNC))
 
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
@@ -187,10 +215,6 @@ enum {
 #endif
 
 
-/* Values for the messageType field */
-#define SYNC                  0x0
-#define DELAY_REQ             0x1
-
 /*
  *  Hardware specific information.
  *  4 words of information used from this data set.
@@ -225,6 +249,19 @@ uint32_t sobmhudpipv6_dcb32[24] = {0x00000000, 0x00013E00, 0x00000000, 0x0000000
                                    0x00000000, 0x000C3E00, 0x00000000, 0x00000000, 0x00000000, 0x000C4200, 0x00000000, 0x00000000,
                                    0x00000000, 0x000C3E00, 0x00000000, 0x00000000, 0x00000000, 0x000C4200, 0x00000000, 0x00000000};
 
+uint32_t sobmhrawpkts_dcb35[24] = {0x00000000, 0x0020E000, 0x00000000, 0x00000000, 0x00000000, 0x00212000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0100E000, 0x00000000, 0x00000000, 0x00000000, 0x01012000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0140E000, 0x00000000, 0x00000000, 0x00000000, 0x01412000, 0x00000000, 0x00000000};
+
+uint32_t sobmhudpipv4_dcb35[24] = {0x00000000, 0x0022A000, 0x00000000, 0x00000000, 0x00000000, 0x0022E000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0102A000, 0x00000000, 0x00000000, 0x00000000, 0x0102E000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0142A000, 0x00000000, 0x00000000, 0x00000000, 0x0142E000, 0x00000000, 0x00000000};
+
+uint32_t sobmhudpipv6_dcb35[24] = {0x00000000, 0x0023E000, 0x00000000, 0x00000000, 0x00000000, 0x00242000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0103E000, 0x00000000, 0x00000000, 0x00000000, 0x01042000, 0x00000000, 0x00000000,
+                                   0x00000000, 0x0143E000, 0x00000000, 0x00000000, 0x00000000, 0x01442000, 0x00000000, 0x00000000};
+
+
 uint32_t sobmhrawpkts_dcb36[24] = {0x00000000, 0x00010E00, 0x00000000, 0x00000000, 0x00000000, 0x00011200, 0x00000000, 0x00000000,
                                    0x00000000, 0x00080E00, 0x00000000, 0x00000000, 0x00000000, 0x00081200, 0x00000000, 0x00000000,
                                    0x00000000, 0x00080E00, 0x00000000, 0x00000000, 0x00000000, 0x00081200, 0x00000000, 0x00000000};
@@ -267,21 +304,26 @@ typedef struct _bksync_uc_linux_ipc_s
     u32 ksyncinit;
     u32 dev_id;
     s64 freqcorr;
-    u64 portmap[BCM_NUM_PORTS/64];
+    u64 portmap[BCMKSYNC_NUM_PORTS/64];  /* Two-step enabled ports */
     u64 ptptime;
     u64 reftime;
     s64 phase_offset;
-    bksync_tx_ts_data_t port_ts_data[BCM_NUM_PORTS];
+    bksync_tx_ts_data_t port_ts_data[BCMKSYNC_NUM_PORTS];
 } bksync_uc_linux_ipc_t;
 
 typedef struct bksync_port_stats_s {
     u32 pkt_rxctr;             /* All ingress packets */
     u32 pkt_txctr;             /* All egress packets  */
+    u32 pkt_txonestep;         /* 1-step Tx packet counter */
     u32 tsts_match;            /* 2-Step tstamp req match */
     u32 tsts_timeout;          /* 2-Step tstamp req timeouts */
     u32 tsts_discard;          /* 2-Step tstamp req discards */
     u32 osts_event_pkts;       /* 1-step event packet counter */
     u32 osts_tstamp_reqs;      /* 1-step events with tstamp request */
+    u32 fifo_rxctr;            /* 2-Step tstamp req match */
+    u64 tsts_best_fetch_time;      /* 1-step events with tstamp request */
+    u64 tsts_worst_fetch_time;      /* 1-step events with tstamp request */
+    u32 tsts_avg_fetch_time;      /* 1-step events with tstamp request */
 } bksync_port_stats_t;
 
 /* Clock Private Data */
@@ -296,14 +338,10 @@ struct bksync_ptp_priv {
     volatile bksync_uc_linux_ipc_t    *shared_addr; /* address for shared memory access */
     uint64_t                dma_mem;
     int                     dma_mem_size;
-    int                     num_pports;
     struct DMA_DEV          *dma_dev;    /* Required for DMA memory control */
-    u32                     pkt_rxctr[BCM_NUM_PORTS];
-    u32                     pkt_txctr[BCM_NUM_PORTS];
-    u32                     ts_match[BCM_NUM_PORTS];
-    u32                     ts_timeout[BCM_NUM_PORTS];
-    u32                     ts_discard[BCM_NUM_PORTS];
+    int                     num_pports;
     int                     timekeep_status;
+    u32                     mirror_encap_bmp;
     struct delayed_work     time_keep;
     bksync_port_stats_t     *port_stats;
 };
@@ -311,7 +349,7 @@ struct bksync_ptp_priv {
 static struct bksync_ptp_priv *ptp_priv;
 volatile bksync_uc_linux_ipc_t *linuxPTPMemory = (bksync_uc_linux_ipc_t*)(0);
 static volatile int module_initialized;
-static int retry_count = 10;   /* Default retry for 10 jiffies */
+static int num_retries = 10;   /* Retry count */
 
 static void bksync_ptp_time_keep_init(void);
 static void bksync_ptp_time_keep_deinit(void);
@@ -366,64 +404,6 @@ ptp_sleep(int jiffies)
 }
 
 
-static int bksync_cmd_cmicm_go(u32 cmd, void *data0, void *data1)
-{
-    int ret = -1;
-    int retry_cnt = retry_count;
-    u32 cmd_status;
-
-    mutex_lock(&ptp_priv->ptp_lock);
-    ptp_priv->shared_addr->ksyncinit = cmd;
-    switch (cmd) {
-        case BCM_KSYNC_INIT:
-            ptp_priv->shared_addr->phase_offset  = 0;
-            ret = 0;
-            break;
-        case BCM_KSYNC_FREQCOR:
-            ptp_priv->shared_addr->freqcorr  = *((s32 *)data0);
-            break;
-        case BCM_KSYNC_ADJTIME:
-            ptp_priv->shared_addr->phase_offset  = *((s64 *)data0);
-            break;
-        case BCM_KSYNC_GETTIME:
-            break;
-        case BCM_KSYNC_SETTIME:
-            ptp_priv->shared_addr->ptptime   = *((s64 *)data0);
-            ptp_priv->shared_addr->phase_offset = 0;
-            break;
-        default:
-            break;
-    }
-
-    do {
-        cmd_status = ptp_priv->shared_addr->ksyncinit;
-        if (cmd_status == BCM_KSYNC_DONE) {
-            switch (cmd) {
-                case BCM_KSYNC_GETTIME:
-                    *((s64 *)data0) = ptp_priv->shared_addr->ptptime;
-                    *((s64 *)data1) = ptp_priv->shared_addr->reftime; /* ptp counter */
-                    break;
-                default:
-                    break;
-            }
-            ret = 0;
-            break;
-        }
-        ptp_sleep(1);
-        retry_cnt--;
-    } while (retry_cnt);
-    mutex_unlock(&ptp_priv->ptp_lock);
-
-    if (retry_cnt == 0) {
-        DBG_ERR(("Timeout on response from R5\n"));
-    }
-
-
-    return ret;
-}
-
-
-
 static void bksync_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
 {
     u32 w0, w1;
@@ -455,14 +435,28 @@ static void bksync_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
 }
 
 
-static int bksync_cmd_cmicx_go(u32 cmd, void *data0, void *data1)
+static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
 {
     int ret = -1;
-    int retry_cnt = (retry_count * 100);
+    int retry_cnt = (1000); /* 1ms default timeout for hostcmd response */
     u32 cmd_status;
     char cmd_str[20];
+    int port;
+    uint32_t seq_id;
+    ktime_t start, now;
+
+    if (ptp_priv == NULL || ptp_priv->shared_addr == NULL) {
+        return ret;
+    }
 
     mutex_lock(&ptp_priv->ptp_lock);
+
+    if (cmd == BKSYNC_GET_TSTIME || cmd == BKSYNC_ACK_TSTIME) {
+        port = *((uint64_t *)data0) & 0xFFF;
+        seq_id = *((uint64_t*)data0) >> 16;
+    }
+    start = ktime_get();
+
     ptp_priv->shared_addr->ksyncinit = cmd;
 
     /* init data */
@@ -472,36 +466,53 @@ static int bksync_cmd_cmicx_go(u32 cmd, void *data0, void *data1)
     DEV_WRITE32(ptp_priv, hostcmd_regs[4], 0x0);
 
     switch (cmd) {
-        case BCM_KSYNC_INIT:
+        case BKSYNC_INIT:
             sprintf(cmd_str, "KSYNC_INIT");
             ptp_priv->shared_addr->phase_offset  = 0;
             bksync_hostcmd_data_op(1, (u64 *)&(ptp_priv->shared_addr->phase_offset), 0);
             break;
-        case BCM_KSYNC_FREQCOR:
+        case BKSYNC_FREQCOR:
             sprintf(cmd_str, "KSYNC_FREQCORR");
             ptp_priv->shared_addr->freqcorr  = *((s32 *)data0);
             bksync_hostcmd_data_op(1, (u64 *)&(ptp_priv->shared_addr->freqcorr), 0);
             break;
-        case BCM_KSYNC_ADJTIME:
+        case BKSYNC_ADJTIME:
             sprintf(cmd_str, "KSYNC_ADJTIME");
             ptp_priv->shared_addr->phase_offset  = *((s64 *)data0);
             bksync_hostcmd_data_op(1, (u64 *)&(ptp_priv->shared_addr->phase_offset), 0);
             break;
-        case BCM_KSYNC_GETTIME:
+        case BKSYNC_GETTIME:
+            retry_cnt = (retry_cnt * 2);
             sprintf(cmd_str, "KSYNC_GETTIME");
             break;
-        case BCM_KSYNC_GET_TSTIME:
+        case BKSYNC_GET_TSTIME:
             retry_cnt = (retry_cnt * 2);
             sprintf(cmd_str, "KSYNC_GET_TSTIME");
             bksync_hostcmd_data_op(1, data0, data1);
             break;
-        case BCM_KSYNC_SETTIME:
+         case BKSYNC_ACK_TSTIME:
+            retry_cnt = (retry_cnt * 2);
+            sprintf(cmd_str, "KSYNC_ACK_TSTIME");
+            bksync_hostcmd_data_op(1, data0, data1);
+            break;
+        case BKSYNC_SETTIME:
             sprintf(cmd_str, "KSYNC_SETTIME");
             ptp_priv->shared_addr->ptptime   = *((s64 *)data0);
             ptp_priv->shared_addr->phase_offset = 0;
             bksync_hostcmd_data_op(1, (u64 *)&(ptp_priv->shared_addr->ptptime), (u64 *)&(ptp_priv->shared_addr->phase_offset));
             break;
-        case BCM_KSYNC_DEINIT:
+        case BKSYNC_MTP_TS_UPDATE_ENABLE:
+            retry_cnt = (retry_cnt * 6);
+            sprintf(cmd_str, "KSYNC_MTP_TS_UPDATE_ENABLE");
+            bksync_hostcmd_data_op(1, (u64 *)data0, 0);
+            break;
+        case BKSYNC_MTP_TS_UPDATE_DISABLE:
+            retry_cnt = (retry_cnt * 6);
+            sprintf(cmd_str, "KSYNC_MTP_TS_UPDATE_DISABLE");
+            bksync_hostcmd_data_op(1, (u64 *)data0, 0);
+            break;
+        case BKSYNC_DEINIT:
+            retry_cnt = (retry_cnt * 4);
             sprintf(cmd_str, "KSYNC_DEINIT");
             break;
         default:
@@ -514,11 +525,11 @@ static int bksync_cmd_cmicx_go(u32 cmd, void *data0, void *data1)
         DEV_READ32(ptp_priv, hostcmd_regs[0], &cmd_status);
         ptp_priv->shared_addr->ksyncinit = cmd_status;
 
-        if (cmd_status == BCM_KSYNC_DONE) {
+        if (cmd_status == BKSYNC_DONE) {
             ret = 0;
             switch (cmd) {
-                case BCM_KSYNC_GET_TSTIME:
-                case BCM_KSYNC_GETTIME:
+                case BKSYNC_GET_TSTIME:
+                case BKSYNC_GETTIME:
                     bksync_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
                     break;
                 default:
@@ -530,37 +541,20 @@ static int bksync_cmd_cmicx_go(u32 cmd, void *data0, void *data1)
         retry_cnt--;
     } while (retry_cnt);
 
+    now = ktime_get();
     mutex_unlock(&ptp_priv->ptp_lock);
 
     if (retry_cnt == 0) {
-        DBG_ERR(("Timeout on response from R5 to cmd %s\n", cmd_str));
+        DBG_ERR(("Timeout on response from R5 to cmd %s time taken %lld us\n", cmd_str, ktime_us_delta(now, start)));
+        if (cmd == BKSYNC_GET_TSTIME) {
+            DBG_TXTS(("Timeout Port %d SeqId %d\n", port, seq_id));
+        }
     }
-
-
-    return ret;
-}
-
-
-static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
-{
-    int ret = -1;
-
-    if (ptp_priv == NULL || ptp_priv->shared_addr == NULL) {
-        return ret;
+    if (debug & DBG_LVL_CMDS) {
+        if (ktime_us_delta(now, start) > 5000)
+            DBG_CMDS(("R5 Command %s exceeded time expected (%lld us)\n", cmd_str, ktime_us_delta(now, start)));
     }
 
-    switch (ptp_priv->dcb_type) {
-        case 26:
-            ret = bksync_cmd_cmicm_go(cmd, data0, data1);
-            break;
-        case 32:
-        case 36:
-        case 38:
-            ret = bksync_cmd_cmicx_go(cmd, data0, data1);
-            break;
-        default:
-            break;
-    }
 
     return ret;
 }
@@ -577,7 +571,7 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
 static int bksync_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
 {
     int ret = -1;
-    u32 cmd_status = BCM_KSYNC_FREQCOR;
+    u32 cmd_status = BKSYNC_FREQCOR;
 
     ret = bksync_cmd_go(cmd_status, &ppb, NULL);
     DBG_VERB(("applying freq correction: %x\n", ppb));
@@ -595,7 +589,7 @@ static int bksync_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
  */
 static int bksync_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 {
-    u32 cmd_status = BCM_KSYNC_ADJTIME;
+    u32 cmd_status = BKSYNC_ADJTIME;
     int ret = -1;
 
     ret = bksync_cmd_go(cmd_status, (void *)&delta, NULL);
@@ -616,18 +610,20 @@ static int bksync_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 static int bksync_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 {
     int ret = -1;
-    u32 cmd_status = BCM_KSYNC_GETTIME;
+    u32 cmd_status = BKSYNC_GETTIME;
     s64 reftime = 0;
     s64 refctr = 0;
 
     ret = bksync_cmd_go(cmd_status, (void *)&reftime, (void *)&refctr);
-    DBG_VERB(("ptp gettime: 0x%llx refctr:0x%llx\n", reftime, refctr));
-    mutex_lock(&ptp_priv->ptp_pair_lock);
-    ptp_priv->shared_addr->ptptime = reftime;
-    ptp_priv->shared_addr->reftime = refctr;
-    mutex_unlock(&ptp_priv->ptp_pair_lock);
-
-    *ts = ns_to_timespec64(reftime);
+    if (ret == 0) {
+        DBG_VERB(("ptp gettime: 0x%llx refctr:0x%llx\n", reftime, refctr));
+        mutex_lock(&ptp_priv->ptp_pair_lock);
+        ptp_priv->shared_addr->ptptime = reftime;
+        ptp_priv->shared_addr->reftime = refctr;
+        mutex_unlock(&ptp_priv->ptp_pair_lock);
+
+        *ts = ns_to_timespec64(reftime);
+    }
     return ret;
 }
 
@@ -646,7 +642,7 @@ static int bksync_ptp_settime(struct ptp_clock_info *ptp,
 {
     s64 reftime, phaseadj;
     int ret = -1;
-    u32 cmd_status = BCM_KSYNC_SETTIME;
+    u32 cmd_status = BKSYNC_SETTIME;
 
     phaseadj = 0;
     reftime = timespec64_to_ns(ts);
@@ -663,6 +659,38 @@ static int bksync_ptp_enable(struct ptp_clock_info *ptp,
     return 0;
 }
 
+
+static int bksync_ptp_mirror_encap_update(struct ptp_clock_info *ptp,
+                                          int mtp_idx, int start)
+{
+    int ret = -1;
+    u64 mirror_encap_idx;
+    u32 cmd_status;
+
+    if (mtp_idx > BCMKSYNC_MAX_MTP_IDX) {
+        return ret;
+    }
+
+    mirror_encap_idx = mtp_idx;
+    if (start) {
+        cmd_status = BKSYNC_MTP_TS_UPDATE_ENABLE;
+        ptp_priv->mirror_encap_bmp |= (1 << mtp_idx);
+    } else {
+        if (!(ptp_priv->mirror_encap_bmp & mtp_idx)) {
+            /* Not running */
+            return ret;
+        }
+        cmd_status = BKSYNC_MTP_TS_UPDATE_DISABLE;
+        ptp_priv->mirror_encap_bmp &= ~mtp_idx;
+    }
+
+    ret = bksync_cmd_go(cmd_status, &mirror_encap_idx, NULL);
+    DBG_VERB(("ptp mmirror_encap_update: %d, mpt_index: %d, ret:%d \n", start, mtp_idx, ret));
+
+    return ret;
+
+}
+
 /* structure describing a PTP hardware clock */
 static struct ptp_clock_info bksync_ptp_caps = {
     .owner = THIS_MODULE,
@@ -721,7 +749,7 @@ int bksync_ptp_hw_tstamp_enable(int dev_no, int port, int tx_type)
         portmap |= (uint64_t)0x1 << port;
         ptp_priv->shared_addr->portmap[map] = portmap;
         /* Command to R5 for the update */
-        ptp_priv->shared_addr->ksyncinit=BCM_KSYNC_PBM_UPDATE;
+        ptp_priv->shared_addr->ksyncinit=BKSYNC_PBM_UPDATE;
     }
 
 exit:
@@ -769,7 +797,7 @@ int bksync_ptp_hw_tstamp_disable(int dev_no, int port, int tx_type)
         ptp_priv->shared_addr->portmap[map]= portmap;
 
         /* Command to R5 for the update */
-        ptp_priv->shared_addr->ksyncinit = BCM_KSYNC_PBM_UPDATE;
+        ptp_priv->shared_addr->ksyncinit = BKSYNC_PBM_UPDATE;
     }
 exit:
     return ret;
@@ -818,23 +846,26 @@ bksync_txpkt_tsts_tsamp_get(int port, uint32_t pkt_seq_id, uint32_t *ts_valid, u
 {
     int ret = 0;
     uint64_t tmp;
+    u32 fifo_rxctr = 0;
 
     tmp = (port & 0xFFFF) | (pkt_seq_id << 16);
 
-    if (HOSTCMD_USE_REGS) {
-        ret = bksync_cmd_go(BCM_KSYNC_GET_TSTIME, &tmp, timestamp);
-
-        if (ret >= 0) {
-            *seq_id = ((tmp >> 16) & 0xFFFF);
-            *ts_valid = (tmp & 0x1);
+    ret = bksync_cmd_go(BKSYNC_GET_TSTIME, &tmp, timestamp);
+
+    if (ret >= 0) {
+        fifo_rxctr = (tmp >> 32) & 0xFFFF;
+        *seq_id = ((tmp >> 16) & 0xFFFF);
+        *ts_valid = (tmp & 0x1);
+         if (*ts_valid) {
+            tmp = (port & 0xFFFF) | (pkt_seq_id << 16);
+            bksync_cmd_go(BKSYNC_ACK_TSTIME, &tmp, 0);
+            if (fifo_rxctr != 0) {
+                if (fifo_rxctr != ptp_priv->port_stats[port].fifo_rxctr + 1) {
+                    DBG_ERR(("FW Reset or Lost Timestamp RxSeq:(Prev %d : Current %d)\n", ptp_priv->port_stats[port].fifo_rxctr, fifo_rxctr));
+                }
+                ptp_priv->port_stats[port].fifo_rxctr = fifo_rxctr;
+            }
         }
-#if 0
-        if (tmp & 0x1) gprintk("in_port: %d in_seq_id: %d out_port: %lld ts_valid: %lld seq_id: %lld ts: %llx\n", port, pkt_seq_id, ((tmp & 0xFFFF) >> 1), (tmp & 0x1), (tmp >> 16), *timestamp);
-#endif
-    } else {
-        *ts_valid = ptp_priv->shared_addr->port_ts_data[port].ts_valid;
-        *seq_id    = ptp_priv->shared_addr->port_ts_data[port].ts_seq_id;
-        *timestamp = ptp_priv->shared_addr->port_ts_data[port].timestamp;
     }
 
 
@@ -861,9 +892,12 @@ int bksync_ptp_hw_tstamp_tx_time_get(int dev_no, int port, uint8_t *pkt, uint64_
     uint32_t pktseq_id = 0;
     uint64_t timestamp = 0;
     uint16_t tpid = 0;
-    int retry_cnt = retry_count;
+    ktime_t start;
+    u64 delta;
+    int retry_cnt = num_retries;
     int seq_id_offset, tpid_offset;
     int transport = network_transport;
+    start = ktime_get();
 
     if (!ptp_priv || !pkt || !ts || port < 1 || port > 255 || ptp_priv->shared_addr == NULL) {
         return -1;
@@ -918,25 +952,26 @@ int bksync_ptp_hw_tstamp_tx_time_get(int dev_no, int port, uint8_t *pkt, uint64_
 
             if (seq_id == pktseq_id) {
                 *ts = timestamp;
-                if (HOSTCMD_USE_REGS) {
-                    ptp_priv->port_stats[port].tsts_match += 1;
-                } else {
-                    ptp_priv->ts_match[port] += 1;
-                }
+                ptp_priv->port_stats[port].tsts_match += 1;
 
-                DBG_VERB(("Port: %d Skb_SeqID %d FW_SeqId %d and TS:%llx\n",
-                          port, pktseq_id, seq_id, timestamp));
+                delta = ktime_us_delta(ktime_get(), start);
+                DBG_VERB(("Port: %d Skb_SeqID %d FW_SeqId %d and TS:%llx FetchTime %lld\n",
+                          port, pktseq_id, seq_id, timestamp, delta));
 
+                if (delta < ptp_priv->port_stats[port].tsts_best_fetch_time || ptp_priv->port_stats[port].tsts_best_fetch_time == 0) {
+                    ptp_priv->port_stats[port].tsts_best_fetch_time = delta;
+                }
+                if (delta > ptp_priv->port_stats[port].tsts_worst_fetch_time || ptp_priv->port_stats[port].tsts_worst_fetch_time == 0) {
+                    ptp_priv->port_stats[port].tsts_worst_fetch_time = delta;
+                }
+                /* Calculate Moving Average*/
+                ptp_priv->port_stats[port].tsts_avg_fetch_time = ((u32)delta + ((ptp_priv->port_stats[port].tsts_match - 1) * ptp_priv->port_stats[port].tsts_avg_fetch_time)) / ptp_priv->port_stats[port].tsts_match;
                 break;
             } else {
-                DBG_ERR(("discard timestamp on port %d Skb_SeqID %d FW_SeqId %d\n",
-                          port, pktseq_id, seq_id));
+                DBG_TXTS(("Discard timestamp on port %d Skb_SeqID %d FW_SeqId %d RetryCnt %d TimeLapsed (%lld us)\n",
+                          port, pktseq_id, seq_id, (num_retries - retry_cnt), ktime_us_delta(ktime_get(),start)));
 
-                if (HOSTCMD_USE_REGS) {
-                    ptp_priv->port_stats[port].tsts_discard += 1;
-                } else {
-                ptp_priv->ts_discard[port] += 1;
-                }
+                ptp_priv->port_stats[port].tsts_discard += 1;
                 continue;
             }
         }
@@ -945,19 +980,12 @@ int bksync_ptp_hw_tstamp_tx_time_get(int dev_no, int port, uint8_t *pkt, uint64_
     } while(retry_cnt);
 
 
-    if (HOSTCMD_USE_REGS) {
-        ptp_priv->port_stats[port].pkt_txctr += 1;
-    } else {
-        ptp_priv->pkt_txctr[port] += 1;
-    }
+    ptp_priv->port_stats[port].pkt_txctr += 1;
 
     if (retry_cnt == 0) {
-        if (HOSTCMD_USE_REGS) {
-            ptp_priv->port_stats[port].tsts_timeout += 1;
-        } else {
-        ptp_priv->ts_timeout[port] += 1;
-        }
-        DBG_ERR(("FW Response timeout: Tx TS on phy port:%d Skb_SeqID: %d\n", port, seq_id));
+        ptp_priv->port_stats[port].tsts_timeout += 1;
+        DBG_ERR(("FW Response timeout: Tx TS on phy port:%d Skb_SeqID: %d TimeLapsed (%lld us)\n", 
+                        port, pktseq_id, ktime_us_delta(ktime_get(), start)));
     }
 
 
@@ -1113,6 +1141,7 @@ int bksync_ptp_hw_tstamp_rx_time_upscale(int dev_no, int port, struct sk_buff *s
     switch (KNET_SKB_CB(skb)->dcb_type) {
         case 26:
         case 32:
+        case 35:
             if (pci_cos != (meta[4] & 0x3F)) {
                 return -1;
             }
@@ -1142,12 +1171,8 @@ int bksync_ptp_hw_tstamp_rx_time_upscale(int dev_no, int port, struct sk_buff *s
     }
 
     if (port > 0){
-    port -= 1;
-    if (HOSTCMD_USE_REGS) {
+        port -= 1;
         ptp_priv->port_stats[port].pkt_rxctr += 1;
-        } else {
-            ptp_priv->pkt_rxctr[port] += 1;
-        }
     }
 
     return ret;
@@ -1240,6 +1265,8 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
                 if (md) *md = &sobmhrawpkts_dcb32[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 26) {
                 if (md) *md = &sobmhrawpkts_dcb26[md_offset];
+            } else if(KNET_SKB_CB(skb)->dcb_type == 35) {
+                if (md) *md = &sobmhrawpkts_dcb35[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 36) {
                 if (md) *md = &sobmhrawpkts_dcb36[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 38) {
@@ -1252,6 +1279,8 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
                 if (md) *md = &sobmhudpipv4_dcb32[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 26) {
                 if (md) *md = &sobmhudpipv4_dcb26[md_offset];
+            } else if(KNET_SKB_CB(skb)->dcb_type == 35) {
+                if (md) *md = &sobmhudpipv4_dcb35[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 36) {
                 if (md) *md = &sobmhudpipv4_dcb36[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 38) {
@@ -1264,6 +1293,8 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
                 if (md) *md = &sobmhudpipv6_dcb32[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 26) {
                 if (md) *md = &sobmhudpipv6_dcb26[md_offset];
+            } else if(KNET_SKB_CB(skb)->dcb_type == 35) {
+                if (md) *md = &sobmhudpipv6_dcb35[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 36) {
                 if (md) *md = &sobmhudpipv6_dcb36[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 38) {
@@ -1276,6 +1307,8 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
                 if (md) *md = &sobmhudpipv4_dcb32[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 26) {
                 if (md) *md = &sobmhudpipv4_dcb26[md_offset];
+            } else if(KNET_SKB_CB(skb)->dcb_type == 35) {
+                if (md) *md = &sobmhudpipv4_dcb35[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 36) {
                 if (md) *md = &sobmhudpipv4_dcb36[md_offset];
             } else if(KNET_SKB_CB(skb)->dcb_type == 38) {
@@ -1285,7 +1318,7 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
     }
 
 
-    if ((hwts == HWTSTAMP_TX_ONESTEP_SYNC) && 
+    if ((hwts == HWTSTAMP_TX_ONESTEP_SYNC) &&
         BKSYNC_PTP_EVENT_MSG(skb->data[ptp_hdr_offset])) {
         /* One Step Timestamp Field updation */
         int corr_offset = ptp_hdr_offset + 8;
@@ -1295,6 +1328,7 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
         int udp_csum_regen;
         u32 udp_csum20;
         u16 udp_csum;
+        int port;
 
         udp_csum = SKB_U16_GET(skb, (ptp_hdr_offset - 2));
 
@@ -1360,12 +1394,15 @@ int bksync_ptp_hw_tstamp_tx_meta_get(int dev_no,
             skb->data[ptp_hdr_offset - 1] = ((udp_csum      ) & 0xFF);
         }
 
-        if (skb->data[ptp_hdr_offset] == DELAY_REQ) {
+        if (skb->data[ptp_hdr_offset] == IEEE1588_MSGTYPE_DELREQ) {
             *tstamp = ptptime;
 
             DBG_VERB(("ptp delay req packet tstamp : 0x%llx corrField: 0x%llx\n", ptptime, corrField));
         }
 
+        port = KNET_SKB_CB(skb)->port;
+        port -= 1;
+        ptp_priv->port_stats[port].pkt_txonestep += 1;
     }
 
     return 0;
@@ -1425,14 +1462,14 @@ static void bksync_ptp_time_keep_deinit(void)
 
 static int bksync_ptp_init(struct ptp_clock_info *ptp)
 {
-    return bksync_cmd_go(BCM_KSYNC_INIT, NULL, NULL);
+    return bksync_cmd_go(BKSYNC_INIT, NULL, NULL);
 }
 
 static int bksync_ptp_deinit(struct ptp_clock_info *ptp)
 {
     bksync_ptp_time_keep_deinit();
 
-    return bksync_cmd_go(BCM_KSYNC_DEINIT, NULL, NULL);
+    return bksync_cmd_go(BKSYNC_DEINIT, NULL, NULL);
 }
 
 /*
@@ -1450,14 +1487,15 @@ static void *bksync_proc_seq_start(struct seq_file *s, loff_t *pos)
    /* beginning a new sequence ? */
    if ( (int)*pos == 0 && ptp_priv->shared_addr != NULL)
    {
-        seq_printf(s, "Port Bitmap : %08llx%08llx\n",
+        seq_printf(s, "TwoStep Port Bitmap : %08llx%08llx\n",
                       (uint64_t)(ptp_priv->shared_addr->portmap[1]),
                       (uint64_t)(ptp_priv->shared_addr->portmap[0]));
-        seq_printf(s,"%4s| %9s| %9s| %9s| %9s| %9s| %9s|\n",
-                     "Port", "RxCounter", "TxCounter", "TSTimeout", "TSRead", "TSMatch", "TSDiscard");
+        seq_printf(s,"%4s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s\n",
+                     "Port", "RxCounter", "TxCounter", "TxOneStep", "TSTimeout", "TSRead", "TSMatch", "TSDiscard",
+                        "TimeHi" , "TimeLo", "TimeAvg", "FIFORx");
    }
 
-   if (ptp_priv->shared_addr != NULL && (int)*pos < (ptp_priv->num_pports))
+   if ((int)*pos < (ptp_priv->num_pports))
         return (void *)(unsigned long)(*pos + 1);
    /* End of the sequence, return NULL */
    return NULL;
@@ -1490,33 +1528,24 @@ static int bksync_proc_seq_show(struct seq_file *s, void *v)
 {
     unsigned long port = (unsigned long)v;
     port = port - 1;
-    if (HOSTCMD_USE_REGS) {
-        if (ptp_priv->port_stats[port].pkt_rxctr || ptp_priv->port_stats[port].pkt_txctr ||
-            ptp_priv->port_stats[port].tsts_discard || ptp_priv->port_stats[port].tsts_timeout ||
-            ptp_priv->shared_addr->port_ts_data[port].ts_cnt || ptp_priv->port_stats[port].tsts_match) {
-              seq_printf(s, "%4lu | %9d| %9d| %9d| %9d| %9d| %9d| %s\n", (port + 1),
-                    ptp_priv->port_stats[port].pkt_rxctr,
-                    ptp_priv->port_stats[port].pkt_txctr,
-                    ptp_priv->port_stats[port].tsts_timeout,
-                    ptp_priv->shared_addr->port_ts_data[port].ts_cnt,
-                    ptp_priv->port_stats[port].tsts_match,
-                    ptp_priv->port_stats[port].tsts_discard,
-                    ptp_priv->port_stats[port].pkt_txctr != ptp_priv->port_stats[port].tsts_match ? "***":"");
-        }
-     } else {
-    if (ptp_priv->pkt_rxctr[port] || ptp_priv->pkt_txctr[port] ||
-        ptp_priv->ts_discard[port] || ptp_priv->ts_timeout[port] ||
-        ptp_priv->shared_addr->port_ts_data[port].ts_cnt || ptp_priv->ts_match[port]) {
-                seq_printf(s, "%4lu | %9d| %9d| %9d| %9d| %9d| %9d| %s\n", (port + 1),
-                ptp_priv->pkt_rxctr[port],
-                ptp_priv->pkt_txctr[port],
-                ptp_priv->ts_timeout[port],
+    if (ptp_priv->port_stats[port].pkt_rxctr || ptp_priv->port_stats[port].pkt_txctr ||
+        ptp_priv->port_stats[port].pkt_txonestep||
+        ptp_priv->port_stats[port].tsts_discard || ptp_priv->port_stats[port].tsts_timeout ||
+        ptp_priv->shared_addr->port_ts_data[port].ts_cnt || ptp_priv->port_stats[port].tsts_match) {
+          seq_printf(s, "%4lu | %9d| %9d| %9d| %9d| %9d| %9d| %9d| %9lld| %9lld | %9d|%9d | %s\n", (port + 1),
+                ptp_priv->port_stats[port].pkt_rxctr,
+                ptp_priv->port_stats[port].pkt_txctr,
+                ptp_priv->port_stats[port].pkt_txonestep,
+                ptp_priv->port_stats[port].tsts_timeout,
                 ptp_priv->shared_addr->port_ts_data[port].ts_cnt,
-                ptp_priv->ts_match[port],
-                ptp_priv->ts_discard[port],
-                ptp_priv->pkt_txctr[port] != ptp_priv->ts_match[port] ? "***":"");
+                ptp_priv->port_stats[port].tsts_match,
+                ptp_priv->port_stats[port].tsts_discard,
+                ptp_priv->port_stats[port].tsts_worst_fetch_time,
+                ptp_priv->port_stats[port].tsts_best_fetch_time,
+                ptp_priv->port_stats[port].tsts_avg_fetch_time,
+                ptp_priv->port_stats[port].fifo_rxctr,
+                ptp_priv->port_stats[port].pkt_txctr != ptp_priv->port_stats[port].tsts_match ? "***":"");
     }
-     }
     return 0;
 }
 
@@ -1549,19 +1578,12 @@ bksync_proc_txts_write(struct file *file, const char *buf,
 
     if ((ptr = strstr(debug_str, "clear")) != NULL) {
         for (port = 0; port < ptp_priv->num_pports; port++) {
-            if (HOSTCMD_USE_REGS) {
-                ptp_priv->port_stats[port].pkt_rxctr = 0;
-                ptp_priv->port_stats[port].pkt_txctr = 0;
-                ptp_priv->port_stats[port].tsts_discard = 0;
-                ptp_priv->port_stats[port].tsts_timeout = 0;
-                ptp_priv->port_stats[port].tsts_match = 0;
-            } else {
-            ptp_priv->pkt_rxctr[port] = 0;
-            ptp_priv->pkt_txctr[port] = 0;
-            ptp_priv->ts_discard[port] = 0;
-            ptp_priv->ts_timeout[port] = 0;
-            ptp_priv->ts_match[port] = 0;
-            }
+            ptp_priv->port_stats[port].pkt_rxctr = 0;
+            ptp_priv->port_stats[port].pkt_txctr = 0;
+            ptp_priv->port_stats[port].pkt_txonestep = 0;
+            ptp_priv->port_stats[port].tsts_timeout = 0;
+            ptp_priv->port_stats[port].tsts_match = 0;
+            ptp_priv->port_stats[port].tsts_discard = 0;
             if (ptp_priv->shared_addr)
                 ptp_priv->shared_addr->port_ts_data[port].ts_cnt = 0;
         }
@@ -1581,91 +1603,90 @@ struct file_operations bksync_proc_txts_file_ops = {
     release:    seq_release,
 };
 
+/*
+ * Driver Debug Proc Entry
+ */
 static int
-bksync_proc_init(void)
+bksync_proc_debug_show(struct seq_file *m, void *v)
 {
-    struct proc_dir_entry *entry;
-
-    PROC_CREATE(entry, "stats", 0666, bksync_proc_root, &bksync_proc_txts_file_ops);
-    if (entry == NULL) {
-        return -1;
-    }
+    seq_printf(m, "Configuration:\n");
+    seq_printf(m, "  debug:          0x%x\n", debug);
     return 0;
 }
 
-static int
-bksync_proc_cleanup(void)
+static ssize_t
+bksync_proc_debug_write(struct file *file, const char *buf,
+                      size_t count, loff_t *loff)
 {
-    remove_proc_entry("stats", bksync_proc_root);
-    return 0;
-}
+    char debug_str[40];
+    char *ptr;
 
-static void bksync_ptp_cmicm_dma_init(int dcb_type)
-{
-    int endianess;
-    int num_pports = 128;
-    dma_addr_t dma_mem = 0;
+    if (copy_from_user(debug_str, buf, count)) {
+        return -EFAULT;
+    }
 
-    /* Initialize the Base address for CMIC and shared Memory access */
-    ptp_priv->base_addr = lkbde_get_dev_virt(0);
-    ptp_priv->dma_dev = lkbde_get_dma_dev(0);
+    if ((ptr = strstr(debug_str, "debug=")) != NULL) {
+        ptr += 6;
+        debug = simple_strtol(ptr, NULL, 0);
+    } else {
+        gprintk("Warning: unknown configuration\n");
+    }
 
-    ptp_priv->dma_mem_size = 16384;/*sizeof(bksync_uc_linux_ipc_t);*/
+    return count;
+}
 
-    if (ptp_priv->shared_addr == NULL) {
-        DBG_ERR(("Allocate shared memory with R5\n"));
-        ptp_priv->shared_addr = DMA_ALLOC_COHERENT(ptp_priv->dma_dev,
-                                                   ptp_priv->dma_mem_size,
-                                                   &dma_mem);
-        ptp_priv->dma_mem = (uint64_t)dma_mem;
-        ptp_priv->num_pports = num_pports;
-        ptp_priv->port_stats = kzalloc((sizeof(bksync_port_stats_t) * num_pports), GFP_KERNEL);
-    }
+static int bksync_proc_debug_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, bksync_proc_debug_show, NULL);
+}
 
-    if (ptp_priv->shared_addr != NULL) {
-        /* Reset memory */
-        memset((void *)ptp_priv->shared_addr, 0, ptp_priv->dma_mem_size);
 
-        DBG_ERR(("Shared memory allocation (%d bytes) successful at 0x%016lx.\n",
-                ptp_priv->dma_mem_size, (long unsigned int)ptp_priv->dma_mem));
-#ifdef __LITTLE_ENDIAN
-        endianess = 0;
-#else
-        endianess = 1;
-#endif
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_12r(CMIC_CMC_BASE), ((pci_cos << 16) | endianess));
+struct file_operations bksync_proc_debug_file_ops = {
+    owner:      THIS_MODULE,
+    open:       bksync_proc_debug_open,
+    read:       seq_read,
+    llseek:     seq_lseek,
+    write:      bksync_proc_debug_write,
+    release:    single_release,
+};
 
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_10r(CMIC_CMC_BASE),
-                    (ptp_priv->dma_mem & 0xffffffff));
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_11r(CMIC_CMC_BASE),
-                    (ptp_priv->dma_mem >> 32) & 0xffffffff);
 
-        ptp_priv->dcb_type = dcb_type;
-    }
+static int
+bksync_proc_init(void)
+{
+    struct proc_dir_entry *entry;
 
-    if (debug & DBG_LVL_VERB) {
-        printk(KERN_EMERG"%s %p:%p\n",__FUNCTION__,
-               ptp_priv->base_addr,(void *)ptp_priv->shared_addr);
+    PROC_CREATE(entry, "stats", 0666, bksync_proc_root, &bksync_proc_txts_file_ops);
+    if (entry == NULL) {
+        return -1;
+    }
+    PROC_CREATE(entry, "debug", 0666, bksync_proc_root, &bksync_proc_debug_file_ops);
+    if (entry == NULL) {
+        return -1;
     }
+    return 0;
+}
 
-    return;
+static int
+bksync_proc_cleanup(void)
+{
+    remove_proc_entry("stats", bksync_proc_root);
+    remove_proc_entry("debug", bksync_proc_root);
+    return 0;
 }
 
-static void bksync_ptp_cmicx_dma_init(int dcb_type)
+static void bksync_ptp_dma_init(int dcb_type)
 {
     int endianess;
     int num_pports = 256;
 
-    /* Initialize the Base address for CMIC and shared Memory access */
-    ptp_priv->base_addr = lkbde_get_dev_virt(0);
-    ptp_priv->dma_dev = lkbde_get_dma_dev(0);
 
+    ptp_priv->num_pports = num_pports;
     ptp_priv->dcb_type = dcb_type;
     ptp_priv->dma_mem_size = 16384;/*sizeof(bksync_uc_linux_ipc_t);*/
 
     if (ptp_priv->shared_addr == NULL) {
         ptp_priv->shared_addr = kzalloc(16384, GFP_KERNEL);
-        ptp_priv->num_pports = num_pports;
         ptp_priv->port_stats = kzalloc((sizeof(bksync_port_stats_t) * num_pports), GFP_KERNEL);
     }
 
@@ -1678,10 +1699,10 @@ static void bksync_ptp_cmicx_dma_init(int dcb_type)
 #else
         endianess = 1;
 #endif
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_12r(CMIC_CMC_BASE), ((pci_cos << 16) | endianess));
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_14r(CMIC_CMC_BASE), ((pci_cos << 16) | endianess));
 
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_10r(CMIC_CMC_BASE), 1);
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_11r(CMIC_CMC_BASE), 1);
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 1);
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 1);
 
     }
 
@@ -1690,6 +1711,7 @@ static void bksync_ptp_cmicx_dma_init(int dcb_type)
                ptp_priv->base_addr,(void *)ptp_priv->shared_addr);
     }
 
+    ptp_priv->mirror_encap_bmp = 0x0;
 
     hostcmd_regs[0] = CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE);
     hostcmd_regs[1] = CMIC_CMC_SCHAN_MESSAGE_20r(CMIC_CMC_BASE);
@@ -1701,28 +1723,6 @@ static void bksync_ptp_cmicx_dma_init(int dcb_type)
 }
 
 
-static void bksync_ptp_dma_init(int dcb_type)
-{
-    switch (dcb_type) {
-        case 26:
-            bksync_ptp_cmicm_dma_init(dcb_type);
-            ptp_priv->dcb_type = dcb_type;
-            break;
-        case 32:
-        case 36:
-        case 38:
-            bksync_ptp_cmicx_dma_init(dcb_type);
-            ptp_priv->dcb_type = dcb_type;
-            break;
-        default:
-            break;
-    }
-
-    return;
-}
-
-
-
 /**
  * bksync_ioctl_cmd_handler
  * @kmsg: kcom message - ptp clock ioctl command.
@@ -1732,6 +1732,7 @@ static void bksync_ptp_dma_init(int dcb_type)
 static int
 bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
 {
+    u32 fw_status;
     kmsg->hdr.type = KCOM_MSG_TYPE_RSP;
 
     if (!module_initialized && kmsg->clock_info.cmd != KSYNC_M_HW_INIT) {
@@ -1744,6 +1745,20 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
             pci_cos = kmsg->clock_info.data[0];
             if (kmsg->clock_info.data[1] == 0 || kmsg->clock_info.data[1] == 1) {
                 fw_core = kmsg->clock_info.data[1];
+                DEV_READ32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE), &fw_status);
+
+                /* Return success if the app is already initialized. */
+                if (module_initialized) {
+                    kmsg->hdr.status = KCOM_E_NONE;
+                    return sizeof(kcom_msg_hdr_t);
+                }
+
+                /* Return error if the app is not ready yet. */
+                if (fw_status != 0xBADC0DE1) {
+                    kmsg->hdr.status = KCOM_E_RESOURCE;
+                    return sizeof(kcom_msg_hdr_t);
+                }
+
                 bksync_ptp_dma_init(dcb_type);
                 if (bksync_ptp_init(&(ptp_priv->ptp_caps)) >= 0) {
                     module_initialized = 1;
@@ -1757,6 +1772,12 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
         case KSYNC_M_HW_TS_DISABLE:
             bksync_ptp_hw_tstamp_disable(0, kmsg->clock_info.data[0], 0);
             break;
+        case KSYNC_M_MTP_TS_UPDATE_ENABLE:
+            bksync_ptp_mirror_encap_update(0, kmsg->clock_info.data[0], TRUE);
+            break;
+        case KSYNC_M_MTP_TS_UPDATE_DISABLE:
+            bksync_ptp_mirror_encap_update(0, kmsg->clock_info.data[0], FALSE);
+            break;
         case KSYNC_M_VERSION:
             break;
         default:
@@ -1813,6 +1834,10 @@ static int bksync_ptp_register(void)
     /* Register ptp clock driver with bksync_ptp_caps */
     ptp_priv->ptp_clock = ptp_clock_register(&ptp_priv->ptp_caps, NULL);
 
+    /* Initialize the Base address for CMIC and shared Memory access */
+    ptp_priv->base_addr = lkbde_get_dev_virt(0);
+    ptp_priv->dma_dev = lkbde_get_dma_dev(0);
+
     if (IS_ERR(ptp_priv->ptp_clock)) {
         ptp_priv->ptp_clock = NULL;
     } else if (ptp_priv->ptp_clock) {
@@ -1858,8 +1883,8 @@ static int bksync_ptp_remove(void)
     bkn_hw_tstamp_ioctl_cmd_cb_unregister(bksync_ioctl_cmd_handler);
  
     if (module_initialized) {
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_10r(CMIC_CMC_BASE), 0);
-        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_11r(CMIC_CMC_BASE), 0);
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 0);
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 0);
     }
     /* Deinitialize the PTP */
     bksync_ptp_deinit(&(ptp_priv->ptp_caps));
@@ -1870,12 +1895,7 @@ static int bksync_ptp_remove(void)
         ptp_priv->port_stats = NULL;
     }
     if (ptp_priv->shared_addr != NULL) {
-        if (HOSTCMD_USE_REGS) {
-            kfree((void *)ptp_priv->shared_addr);
-        } else {
-            DMA_FREE_COHERENT(ptp_priv->dma_dev, ptp_priv->dma_mem_size,
-                              (void *)ptp_priv->shared_addr, (dma_addr_t)ptp_priv->dma_mem);
-        }
+        kfree((void *)ptp_priv->shared_addr);
         ptp_priv->shared_addr = NULL;
         DBG_ERR(("Free R5 memory\n"));
     }
@@ -1906,13 +1926,13 @@ static int bksync_ptp_remove(void)
  *    Always 0
  */
     static int
-_pprint(void)
+_pprint(struct seq_file *m)
 {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)
     /* put some goodies here */
-    pprintf("Broadcom BCM PTP Hardware Clock Module\n");
+    pprintf(m, "Broadcom BCM PTP Hardware Clock Module\n");
 #else
-    pprintf("Broadcom BCM PTP Hardware Clock Module not supported\n");
+    pprintf(m, "Broadcom BCM PTP Hardware Clock Module not supported\n");
 #endif
     return 0;
 }
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/bcm-knet.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/bcm-knet.h
index df8874fb1f70..8d710869824f 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/bcm-knet.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/bcm-knet.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: bcm-knet.h,v 1.4 Broadcom SDK $
@@ -137,7 +148,6 @@ bkn_hw_tstamp_ioctl_cmd_cb_register(knet_hw_tstamp_ioctl_cmd_cb_f hw_tstamp_ioct
 
 extern int
 bkn_hw_tstamp_ioctl_cmd_cb_unregister(knet_hw_tstamp_ioctl_cmd_cb_f hw_tstamp_ioctl_cmd_cb);
-
 typedef struct {
     uint8 cmic_type;
     uint8 dcb_type;
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/gmodule.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/gmodule.h
index 22cef82a8ddc..a9db097f3062 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/gmodule.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/gmodule.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: gmodule.h,v 1.9 Broadcom SDK $
@@ -23,6 +34,7 @@
 #define __COMMON_LINUX_KRN_GMODULE_H__
 
 #include <lkm.h>
+#include <linux/seq_file.h>
 
 typedef struct gmodule_s {
   
@@ -32,9 +44,7 @@ typedef struct gmodule_s {
 
     int (*init)(void);
     int (*cleanup)(void);
-  
-    int (*pprint)(void);
-  
+    int (*pprint)(struct seq_file *m);
     int (*open)(void);
     int (*ioctl)(unsigned int cmd, unsigned long arg);
     int (*close)(void);
@@ -48,8 +58,8 @@ extern gmodule_t* gmodule_get(void);
 
 
 /* Proc Filesystem information */
-extern int pprintf(const char* fmt, ...)
-    __attribute__ ((format (printf, 1, 2)));
+extern int pprintf(struct seq_file *m, const char* fmt, ...)
+    __attribute__ ((format (printf, 2, 3)));
 extern int gmodule_vpprintf(char** page, const char* fmt, va_list args)
     __attribute__ ((format (printf, 2, 0)));
 extern int gmodule_pprintf(char** page, const char* fmt, ...)
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
index 56d641c9c87c..9ea8fc5896d8 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: lkm.h,v 1.22 Broadcom SDK $
@@ -34,7 +45,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <linux/config.h>
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
+/* The version kconfig.h became available in. */
 #include <linux/kconfig.h>
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/Makefile
index 3de3e07080c4..b8697731dd4e 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.3 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
index 1626d33c1c5d..650a4ced1d7a 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
@@ -107,7 +107,7 @@ static struct sk_buff *strip_tag_rx_cb(struct sk_buff *skb, int dev_no, void *me
 static struct sk_buff *strip_tag_tx_cb(struct sk_buff *skb, int dev_no, void *meta);
 static int  strip_tag_filter_cb(uint8_t * pkt, int size, int dev_no, void *meta,
                                 int chan, kcom_filter_t * kf);
-static int  _pprint(void);
+static int  _pprint(struct seq_file *m);
 static int  _cleanup(void);
 static int  _init(void);
 
@@ -333,11 +333,11 @@ knet_filter_cb(uint8_t * pkt, int size, int dev_no, void *meta,
                      int chan, kcom_filter_t *kf)
 {
     /* check for filter callback handler */
-#ifdef PSAMPLE_SUPPORT
+    #ifdef PSAMPLE_SUPPORT
     if (strncmp(kf->desc, PSAMPLE_CB_NAME, KCOM_FILTER_DESC_MAX) == 0) {
         return psample_filter_cb (pkt, size, dev_no, meta, chan, kf);
     }
-#endif
+    #endif
     return strip_tag_filter_cb (pkt, size, dev_no, meta, chan, kf);
 }
 
@@ -366,12 +366,12 @@ knet_netif_destroy_cb(int unit, kcom_netif_t *netif, struct net_device *dev)
  * % cat /proc/linux-knet-cb
  */
 static int
-_pprint(void)
+_pprint(struct seq_file *m)
 {
-    pprintf("Broadcom Linux KNET Call-Back: Untagged VLAN Stripper\n");
-    pprintf("    %lu stripped packets\n", strip_stats.stripped);
-    pprintf("    %lu packets checked\n", strip_stats.checked);
-    pprintf("    %lu packets skipped\n", strip_stats.skipped);
+    pprintf(m, "Broadcom Linux KNET Call-Back: Untagged VLAN Stripper\n");
+    pprintf(m, "    %lu stripped packets\n", strip_stats.stripped);
+    pprintf(m ,"    %lu packets checked\n", strip_stats.checked);
+    pprintf(m, "    %lu packets skipped\n", strip_stats.skipped);
 
     return 0;
 }
@@ -395,6 +395,7 @@ _cleanup(void)
 #ifdef PSAMPLE_SUPPORT
     psample_cleanup();
 #endif
+
     return 0;
 }
 
@@ -410,9 +411,10 @@ _init(void)
         bkn_tx_skb_cb_register(strip_tag_tx_cb);
     }
 
-#ifdef PSAMPLE_SUPPORT
+    #ifdef PSAMPLE_SUPPORT
     psample_init();
-#endif
+    #endif
+
 
     bkn_filter_cb_register(knet_filter_cb);
     bkn_netif_create_cb_register(knet_netif_create_cb);
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/psample-cb.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/psample-cb.c
index e1a6086a52ae..755955b20fdd 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/psample-cb.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/psample-cb.c
@@ -967,7 +967,7 @@ psample_proc_stats_open(struct inode * inode, struct file * file)
  * psample stats Proc Write Entry
  *
  *   Syntax:
- *   write any value to clear stats 
+ *   write any value to clear stats
  */
 static ssize_t
 psample_proc_stats_write(struct file *file, const char *buf,
@@ -1009,13 +1009,13 @@ int psample_cleanup(void)
 int psample_init(void)
 {
     #define PROCFS_MAX_PATH 1024
+    #define PSAMPLE_PROCFS_PATH "bcm/knet-cb"
     char psample_procfs_path[PROCFS_MAX_PATH];
     struct proc_dir_entry *entry;
 
     /* create procfs for psample */
-    snprintf(psample_procfs_path, PROCFS_MAX_PATH, "bcm/knet-cb");
-    knet_cb_proc_root = proc_mkdir(psample_procfs_path, NULL);
-    snprintf(psample_procfs_path, PROCFS_MAX_PATH, "%s/%s", psample_procfs_path, PSAMPLE_CB_NAME);
+    proc_mkdir(PSAMPLE_PROCFS_PATH, NULL);
+    snprintf(psample_procfs_path, sizeof(psample_procfs_path), "%s/%s", PSAMPLE_PROCFS_PATH, PSAMPLE_CB_NAME);
     psample_proc_root = proc_mkdir(psample_procfs_path, NULL);
 
     /* create procfs for psample stats */
@@ -1031,7 +1031,7 @@ int psample_init(void)
         gprintk("%s: Unable to create procfs entry '/procfs/%s/rate'\n", __func__, psample_procfs_path);
         return -1;
     }
-    
+
     /* create procfs for setting sample size */
     PROC_CREATE(entry, "size", 0666, psample_proc_root, &psample_proc_size_file_ops);
     if (entry == NULL) {
@@ -1059,23 +1059,23 @@ int psample_init(void)
     memset(&g_psample_work, 0, sizeof(psample_work_t));
 
     /* setup psample_info struct */
-    INIT_LIST_HEAD(&g_psample_info.netif_list); 
+    INIT_LIST_HEAD(&g_psample_info.netif_list);
     spin_lock_init(&g_psample_info.lock);
 
     /* setup psample work queue */
-    spin_lock_init(&g_psample_work.lock); 
-    INIT_LIST_HEAD(&g_psample_work.pkt_list); 
+    spin_lock_init(&g_psample_work.lock);
+    INIT_LIST_HEAD(&g_psample_work.pkt_list);
     INIT_WORK(&g_psample_work.wq, psample_task);
 
-    /* get net namespace */ 
+    /* get net namespace */
     g_psample_info.netns = get_net_ns_by_pid(current->pid);
     if (!g_psample_info.netns) {
         gprintk("%s: Could not get network namespace for pid %d\n", __func__, current->pid);
         return (-1);
     }
-    PSAMPLE_CB_DBG_PRINT("%s: current->pid %d, netns 0x%p, sample_size %d\n", __func__, 
+    PSAMPLE_CB_DBG_PRINT("%s: current->pid %d, netns 0x%p, sample_size %d\n", __func__,
             current->pid, g_psample_info.netns, psample_size);
-   
+
 
     return 0;
 }
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/psample/psample.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/psample/psample.c
index 1deccacc5edd..99317cbf30cc 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/psample/psample.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/psample/psample.c
@@ -224,7 +224,7 @@ void psample_sample_packet(struct psample_group *group, struct sk_buff *skb,
 		data_len = PSAMPLE_MAX_PACKET_SIZE - meta_len - NLA_HDRLEN
 			    - NLA_ALIGNTO;
 
-	nl_skb = genlmsg_new(meta_len + data_len, GFP_ATOMIC);
+	nl_skb = genlmsg_new(meta_len + nla_total_size(data_len), GFP_ATOMIC);
 	if (unlikely(!nl_skb))
 		return;
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/Makefile
index 5e97a3a32123..966f639f6983 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.2 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
index cdfaf089674a..3ef000961837 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: gmodule.c,v 1.20 Broadcom SDK $
@@ -26,8 +37,6 @@
 #include <lkm.h>
 #include <gmodule.h>
 #include <linux/init.h>
-#include <linux/seq_file.h>
-
 /* Module Vector Table */
 static gmodule_t* _gmodule = NULL;
 
@@ -94,21 +103,18 @@ gdbg(const char* fmt, ...)
  * Proc FS Utilities
  */
 #if PROC_INTERFACE_KERN_VER_3_10
-static struct seq_file* _proc_buf = NULL;
-
 int 
-pprintf(const char* fmt, ...)
+pprintf(struct seq_file *m, const char* fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-    seq_vprintf(_proc_buf, fmt, args);
+    seq_vprintf(m, fmt, args);
     va_end(args);
     return 0;
 }
 
 static int _gmodule_proc_show(struct seq_file *m, void *v){
-    _proc_buf = m;
-    _gmodule->pprint();
+    _gmodule->pprint(m);
     return 0;
 }
 
@@ -174,7 +180,7 @@ gmodule_pprintf(char** page_ptr, const char* fmt, ...)
 static char* _proc_buf = NULL;
 
 int 
-pprintf(const char* fmt, ...)
+pprintf(struct seq_file *m, const char* fmt, ...)
 {  
     int rv;
 
@@ -193,7 +199,7 @@ static int
 _gmodule_pprint(char* buf)
 {
     PSTART(buf);
-    _gmodule->pprint();
+    _gmodule->pprint(NULL);
     return PEND(buf);
 }
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c
index d1caf871f0e2..7f90c59c3a39 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017 Broadcom
+ * Copyright 2007-2020 Broadcom Inc. All rights reserved.
+ * 
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ * 
+ * License Option 1: GPL
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
+ * 
+ * 
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ * 
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
  */
 /*
  * $Id: ksal.c,v 1.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
index f95593a383ce..8f59a763e314 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.4 Broadcom SDK $
@@ -113,6 +124,7 @@ endif
 ifndef BUILD_KNET
 BUILD_KNET = 1
 endif
+
 # Remove this when LinuxPTP support becomes optional.
 ifndef BUILD_LPTP
 BUILD_LPTP = 1
@@ -141,7 +153,6 @@ ifdef BUILD_PSAMPLE
 all_targets += $(PSAMPLE)
 ADD_TO_CFLAGS += -DPSAMPLE_SUPPORT
 
-
 # KnetSync support
 ifdef BUILD_KNETSYNC
 
@@ -151,17 +162,17 @@ LOCAL_KERNEL_TARGETS += $(patsubst %,$(realpath ..)/$(platform)/%,$(BCM_PTP_CLOC
 endif # BUILD_KNETSYNC
 
 ifeq ($(NO_LOCAL_TARGETS),)
-LOCAL_TARGETS +=$(patsubst %,../$(platform)/%,$(PSAMPLE_LOCAL))
-all_targets +=$(LOCAL_TARGETS)
+    LOCAL_TARGETS +=$(patsubst %,../$(platform)/%,$(PSAMPLE_LOCAL))
+    all_targets +=$(LOCAL_TARGETS)
 endif
 endif
 
 ifdef BUILD_LPTP
-all_targets += $(BCM_LPTP)
+    all_targets += $(BCM_LPTP)
 
 ifeq ($(NO_LOCAL_TARGETS),)
-LOCAL_TARGETS +=$(patsubst %,../$(platform)/%,$(BCM_LPTP_LOCAL))
-all_targets +=$(LOCAL_TARGETS)
+    LOCAL_TARGETS +=$(patsubst %,../$(platform)/%,$(BCM_LPTP_LOCAL))
+    all_targets +=$(LOCAL_TARGETS)
 endif
 endif
 
@@ -191,7 +202,7 @@ CFLAGS:=$(filter-out -fPIC, $(CFLAGS))
 
 # KnetSync Support
 ifdef BUILD_KNETSYNC
-knetsync_subdirs = bcm-ptp-clock
+    knetsync_subdirs = bcm-ptp-clock
 endif # BUILD_KNETSYNC
 
 kernel_modules:
@@ -200,7 +211,7 @@ kernel_modules:
 ifeq ($(BUILD_KNET),1)
 	$(MAKE) -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
 		subdirs="shared bcm-knet" override-target=linux-$(platform) CFLAGS="$(CFLAGS)"
-ifdef BUILD_PSAMPLE 
+ifdef BUILD_PSAMPLE
 	$(MAKE) -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
 		subdirs="psample" override-target=linux-$(platform) CFLAGS="$(CFLAGS)"
 endif
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
index 466faf02a515..5acaeab271cc 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 0.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
index c9f538802f6d..b874340ddec2 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.7 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
index e8405f5c2a0c..2b724be3202f 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.7 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
index 03300ff8a046..f10c5c37a082 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.7 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
index 778c85a03bed..983b3abbced7 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.7 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
index 99d49d285145..6ef360156572 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 0.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
index 29717b3af42a..78c2c0cb1702 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 1.2 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
index 13246d09e78f..e19eeff4aef2 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 # -*- Makefile -*-
 # $Id: Makefile,v 0.1 Broadcom SDK $
diff --git a/platform/broadcom/saibcm-modules/tools/mktool.pl b/platform/broadcom/saibcm-modules/tools/mktool.pl
index 8800c00613d8..518ab25535c3 100644
--- a/platform/broadcom/saibcm-modules/tools/mktool.pl
+++ b/platform/broadcom/saibcm-modules/tools/mktool.pl
@@ -1,5 +1,10 @@
 #
-#  Copyright 2017 Broadcom
+#  Copyright 2007-2020 Broadcom Inc. All rights reserved.
+#  
+#  Permission is granted to use, copy, modify and/or distribute this
+#  software under either one of the licenses below.
+#  
+#  License Option 1: GPL
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License, version 2, as
@@ -12,6 +17,12 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  version 2 (GPLv2) along with this source code.
+#  
+#  
+#  License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+#  
+#  This software is governed by the Broadcom Open Network Switch APIs license:
+#  https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
 #
 #
 # mktool.pl

From 6f17c924e60ab1ed5f764b3dd15d921e747b0344 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Fri, 29 Jan 2021 14:15:48 -0800
Subject: [PATCH 0146/1674] [sonic-device-data]: Update BRCM Tunnel/ECMP
 Parameter For 7050cx3 SKUs (#6415)

Update Tunnel and ECMP parameters for brcm 7050cx3 48x50G+8x100G and 32x100G SKUs.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 .../td3-a7050cx3-32s-32x100G.config.bcm               | 10 ++++++++++
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm         | 10 ++++++++++
 src/sonic-device-data/tests/permitted_list            | 11 +++++++++++
 3 files changed, 31 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index 09354d6fd8e7..10a5b822afce 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,3 +1,13 @@
+host_as_route_disable=1
+use_all_splithorizon_groups=1
+riot_enable=1
+sai_tunnel_support=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=3
+riot_overlay_ecmp_resilient_hash_size=16384
+flow_init_mode=1
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
 bcm_num_cos=10
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 2b7da96358d5..d71f01529b02 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,3 +1,13 @@
+host_as_route_disable=1
+use_all_splithorizon_groups=1
+riot_enable=1
+sai_tunnel_support=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=3
+riot_overlay_ecmp_resilient_hash_size=16384
+flow_init_mode=1
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
 bcm_num_cos=8
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 8feb791875ef..997250cbf6b8 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -1,3 +1,13 @@
+sai_trap_group_priority
+use_all_splithorizon_groups
+riot_enable
+sai_tunnel_support
+riot_overlay_l3_intf_mem_size
+riot_overlay_l3_egress_mem_size
+l3_ecmp_levels
+riot_overlay_ecmp_resilient_hash_size
+flow_init_mode
+sai_load_hw_config
 arl_clean_timeout_usec
 asf_mem_profile
 bcm_linkscan_interval
@@ -219,3 +229,4 @@ serdes_fec_enable
 pbmp_gport_stack
 reglist_enable
 scache_filename
+host_as_route_disable

From 7199cb87d260a4503a02a042cbfecb3bc65bbcf9 Mon Sep 17 00:00:00 2001
From: Mahesh Maddikayala <10645050+smaheshm@users.noreply.github.com>
Date: Sat, 30 Jan 2021 14:41:17 -0800
Subject: [PATCH 0147/1674] [broadcom]: Add BCM config variable that contains
 premier cancun firmware path (#6611)

BRCM SDK 6.5.21 includes firmware updates (premier cancun) for TD3 platforms. The firmware update is required on TD3 platforms, which is packaged with BCMSAI 4.3.0.10.

**- How I did it**

Updated BCM config with a new variable that specifies the firmware package path. SDK uses this path to locate firmware packages and load during cold boot.

**- How to verify it**


bsv
BRCM SAI ver: [4.3.0.10], OCP SAI ver: [1.7.1], SDK ver: [sdk-6.5.21] CANCUN ver: [5.3.3]
drivshell>
admin@str2-7050cx3-acs-02:~$ bcmsh
Press Enter to show prompt.
Press Ctrl+C to exit.
NOTICE: Only one bcmsh or bcmcmd can connect to the shell at same time.


drivshell>cancun stat
cancun stat
UNIT0 CANCUN:
        CIH: LOADED
        Ver: 06.06.01

        CMH: LOADED
        Ver: 06.06.01
        SDK Ver: 06.05.21

        CCH: LOADED
       Ver: 06.06.01
        SDK Ver: 06.05.21

        CEH: LOADED
        Ver: 06.06.01
        SDK Ver: 06.05.21

drivshell>
---
 .../Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm        | 1 +
 .../Accton-AS7726-32X/td3-as7726-32x100G.config.bcm              | 1 +
 .../Seastone_2/td3-seastone_2-32x100G.config.bcm                 | 1 +
 .../DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm             | 1 +
 .../DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm     | 1 +
 .../DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm          | 1 +
 .../DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm     | 1 +
 .../DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm     | 1 +
 .../DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm               | 1 +
 .../DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm               | 1 +
 .../DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm               | 1 +
 .../DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm               | 1 +
 .../Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm       | 1 +
 .../INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm              | 1 +
 .../INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm            | 1 +
 .../Quanta-IX7-32X/td3-ix7-32x100G.config.bcm                    | 1 +
 .../Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm              | 1 +
 .../Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm            | 1 +
 18 files changed, 18 insertions(+)

diff --git a/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm b/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
index 83f614bf093d..fd76d1f93171 100755
--- a/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
+++ b/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
index 8042955fcae7..e64fd49c6ec7 100755
--- a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
+++ b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
index 2c23d0da2f22..c146e4621023 100644
--- a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 help_cli_enable=1
 ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
index 3f50f39db8e5..49eb1dc29289 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
index 4f3121387dea..2fa422fd1f5b 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
index 099d1270443e..28743920ce93 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
index caf255d892e8..1bda551a5b9a 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
index 84bd873acc4b..cced29e6e494 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
index 2369f4590795..c6f7d4bb5044 100644
--- a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 dpp_clock_ratio=2:3
 oversubscribe_mode=1
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
index 4095c2d0a4f4..31d03149e721 100644
--- a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 
 dpp_clock_ratio=2:3
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
index 7351e6908e78..930c80978312 100644
--- a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 portmap_5.0=5:10
 portmap_6.0=6:10
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
index 81a42406e75f..496fc443539e 100644
--- a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 os=unix
 portmap_5.0=5:25
 portmap_6.0=6:25
diff --git a/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm b/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
index 2cef2f4261a3..634a0bb3876a 100755
--- a/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
+++ b/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 pbmp_oversubscribe=0x00003fc000000ff0000003fc000001fe
 pbmp_xport_xe=0xffffffffffffffffffffffffffffffffffff
 core_clock_frequency=1525
diff --git a/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm b/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
index 27670075cf99..40ec86f0be9f 100644
--- a/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
+++ b/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 ### fix for sonic
 ptp_ts_pll_fref=50000000
 ptp_bs_fref_0=50000000
diff --git a/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm b/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
index 57fd5cd57164..bd61d3610633 100644
--- a/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
+++ b/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 ### fix for sonic
 ptp_ts_pll_fref=50000000
 ptp_bs_fref_0=50000000
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
index aaea0380e50b..14cf4a16bfbe 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
index 407105d0ca0a..4b146ad897ec 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
index 407105d0ca0a..4b146ad897ec 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3

From fadf10529ac3a47d8420269e88564f4c6fcb04ef Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Tue, 2 Feb 2021 21:48:26 -0800
Subject: [PATCH 0148/1674] [BCM Config] Update TD3 bcm.config files to use
 ISSU capable premium CANCUN 6.4.1 (#6651)

---
 .../Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm       | 2 +-
 .../Accton-AS7726-32X/td3-as7726-32x100G.config.bcm             | 2 +-
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm  | 2 +-
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                   | 2 +-
 .../Seastone_2/td3-seastone_2-32x100G.config.bcm                | 2 +-
 .../DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm            | 2 +-
 .../DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm    | 2 +-
 .../DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm         | 2 +-
 .../DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm    | 2 +-
 .../DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm    | 2 +-
 .../DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm              | 2 +-
 .../DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm              | 2 +-
 .../DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm              | 2 +-
 .../DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm              | 2 +-
 .../Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm      | 2 +-
 .../INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm             | 2 +-
 .../INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm           | 2 +-
 .../Quanta-IX7-32X/td3-ix7-32x100G.config.bcm                   | 2 +-
 .../Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm             | 2 +-
 .../Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm           | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm b/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
index fd76d1f93171..5da8cd015da1 100755
--- a/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
+++ b/device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
index e64fd49c6ec7..f88656bfd5cf 100755
--- a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
+++ b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index 10a5b822afce..c3b350204875 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
@@ -7,7 +8,6 @@ riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=3
 riot_overlay_ecmp_resilient_hash_size=16384
 flow_init_mode=1
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
 bcm_num_cos=10
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index d71f01529b02..1b5b7e338708 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
@@ -7,7 +8,6 @@ riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=3
 riot_overlay_ecmp_resilient_hash_size=16384
 flow_init_mode=1
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
 bcm_num_cos=8
diff --git a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
index c146e4621023..62bcdbc58840 100644
--- a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 help_cli_enable=1
 ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
index 49eb1dc29289..bf15510bf49b 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
index 2fa422fd1f5b..68fb77a4219f 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/td3-s5232f-8x100G+48x50G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
index 28743920ce93..c44e4805c62a 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
index 1bda551a5b9a..6f62b7209198 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
index cced29e6e494..a4fccde19686 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 core_clock_frequency=1525
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
index c6f7d4bb5044..021f94dc32f7 100644
--- a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-10G/td3-s5248f-10g.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 dpp_clock_ratio=2:3
 oversubscribe_mode=1
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
index 31d03149e721..2630512df0ca 100644
--- a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/td3-s5248f-25g.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 
 dpp_clock_ratio=2:3
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
index 930c80978312..ddc14d9363d3 100644
--- a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-10G/td3-s5296f-10g.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 portmap_5.0=5:10
 portmap_6.0=6:10
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
index 496fc443539e..dd0901f5d01f 100644
--- a/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
+++ b/device/dell/x86_64-dellemc_s5296f_c3538-r0/DellEMC-S5296f-P-25G/td3-s5296f-25g.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 os=unix
 portmap_5.0=5:25
 portmap_6.0=6:25
diff --git a/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm b/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
index 634a0bb3876a..07600e0b8a65 100755
--- a/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
+++ b/device/delta/x86_64-delta_ag9032v2a-r0/Delta-ag9032v2a/td3-ag9032v2a-32x100G+1x10G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 pbmp_oversubscribe=0x00003fc000000ff0000003fc000001fe
 pbmp_xport_xe=0xffffffffffffffffffffffffffffffffffff
 core_clock_frequency=1525
diff --git a/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm b/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
index 40ec86f0be9f..8fe7622f4b8f 100644
--- a/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
+++ b/device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/td3-d6332-32x100G-SR4.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 ### fix for sonic
 ptp_ts_pll_fref=50000000
 ptp_bs_fref_0=50000000
diff --git a/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm b/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
index bd61d3610633..089207abd136 100644
--- a/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
+++ b/device/inventec/x86_64-inventec_d6356-r0/INVENTEC-D6356/td3-d6356-48x25G-8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 ### fix for sonic
 ptp_ts_pll_fref=50000000
 ptp_bs_fref_0=50000000
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
index 14cf4a16bfbe..7361ad2f57f3 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
index 4b146ad897ec..94560fb7e86c 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
index 4b146ad897ec..94560fb7e86c 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0/b870.6.6.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3

From a3bdbb79c1ca73d7cdc3c2a73fc561588f98fd19 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:59:01 -0800
Subject: [PATCH 0149/1674] [broadcom]: broadcom sai update to 4.3.0.10-3
 (#6620)

1. BRCM SAI Debian build need not have any Kernel version dependency - Starting with 4.3 BRCM made changes in SAI so that this dependency has been cleaned up. We can now remove the Kernel Version dependency from Azure Pipeline build script.

2. Bypass PEER_MODE p2mp setting causing SYNCd crash on non-TD3 SKUs - Temporarily patch BRCM SAI code to not cause SYNCd crash when Orchagent program SAI_TUNNEL_ATTR_PEER_MODE: SAI_TUNNEL_PEER_MODE_P2MP on Non-TD3 SKUs. Will remove this when BRCM provide proper fix to address this issue.
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 7a1e6cf99bd1..cfefdb860c83 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.10-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-2_amd64.deb?sv=2015-04-05&sr=b&sig=1L2kJwYBuXDc9ObuVBBUS%2F%2FBVIfAA651ig5k6O1ZztE%3D&se=2022-06-10T21%3A25%3A43Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.10-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-3_amd64.deb?sv=2015-04-05&sr=b&sig=snXITt%2BRq2cKD7I%2Bqr2WCbj1Ly%2FB2NM8EW3R7wc%2B1ME%3D&se=2034-10-10T06%3A30%3A07Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-2_amd64.deb?sv=2015-04-05&sr=b&sig=2Vm6o8HtbjI%2BfVoHJUiO5b75USqGra9CLSFXViQm8yM%3D&se=2022-06-10T21%3A26%3A35Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-3_amd64.deb?sv=2015-04-05&sr=b&sig=%2BfGcnKeMApru1b8aebMHT68zEc%2BCn%2BTcC27izdHNrlA%3D&se=2034-10-10T06%3A30%3A44Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From eccff4bf17e7b273c002ca3ebe3a9d65ab4769af Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:59:56 -0800
Subject: [PATCH 0150/1674] BRCM SAI 4.3.0.10-4 Fix _brcm_sai_indexed_data_get
 () with unexpected queue causing _brcm_sai_switch_assert () after warm reboot
 (#6664)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index cfefdb860c83..1b27d7bc1f88 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.10-3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-3_amd64.deb?sv=2015-04-05&sr=b&sig=snXITt%2BRq2cKD7I%2Bqr2WCbj1Ly%2FB2NM8EW3R7wc%2B1ME%3D&se=2034-10-10T06%3A30%3A07Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.10-4_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=nfseU56PACVqklQ4MC0HvZ7qt7Ou4loQMBA7jx8CSOY%3D&se=2034-10-13T16%3A31%3A22Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-4_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-3_amd64.deb?sv=2015-04-05&sr=b&sig=%2BfGcnKeMApru1b8aebMHT68zEc%2BCn%2BTcC27izdHNrlA%3D&se=2034-10-10T06%3A30%3A44Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=4tF26GxI6jmrcvRyCezQ7RL6qMjzip7SFf61eqy%2Bvf4%3D&se=2034-10-13T16%3A31%3A53Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 0c17839908fefc3414899d4ddbf2e2136e2bb054 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Sat, 23 Jan 2021 20:57:52 -0800
Subject: [PATCH 0151/1674] [teamd]: Increase wait timeout for teamd docker
 stop to clean Port channels. (#6537)

The Portchannels were not getting cleaned up as the cleanup activity was taking more than 10 secs which is default docker timeout after which a SIGKILL will be send.
Fixes #6199
To check if it works out for this issue in 201911 ? #6503

This issue is significantly seen in master branch compared to 201911 because the Portchannel cleanup takes more time in master. Test on a DUT with 8 Port Channels.

master

    admin@str-s6000-acs-8:~$ time sudo systemctl stop teamd
    real    0m15.599s
    user    0m0.061s
    sys     0m0.038s
Sonic 201911.v58

    admin@str-s6000-acs-8:~$ time sudo systemctl stop teamd
    real    0m5.541s
    user    0m0.020s
    sys     0m0.028s
---
 files/build_templates/docker_image_ctl.j2 |  3 ++
 src/sonic-ctrmgrd/ctrmgr/container        | 34 +++++++++++++----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index dd37506f372f..5bc6ca0651d7 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -424,6 +424,9 @@ stop() {
     if [ "$DEV" ]; then
         ip netns delete "$NET_NS"
     fi
+    {%- elif docker_container_name == "teamd" %}
+    # Longer timeout of 60 sec to wait for Portchannels to be cleaned.
+    /usr/local/bin/container stop -t 60 $DOCKERNAME
     {%- else %}
     /usr/local/bin/container stop $DOCKERNAME
     {%- endif %}
diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container
index ca0963946f4a..ff3706a6a7a7 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container
+++ b/src/sonic-ctrmgrd/ctrmgr/container
@@ -100,12 +100,12 @@ def read_state(feature):
             [(CURRENT_OWNER, "none"), (REMOTE_STATE, "none"), (CONTAINER_ID, "")])
 
 
-def docker_action(action, feature):
+def docker_action(action, feature, **kwargs):
     """ Execute docker action """
     try:
         client = docker.from_env()
         container = client.containers.get(feature)
-        getattr(container, action)()
+        getattr(container, action)(**kwargs)
         syslog.syslog(syslog.LOG_INFO, "docker cmd: {} for {}".format(action, feature))
         return 0
 
@@ -161,7 +161,7 @@ def container_id(feature):
         return data.get(CONTAINER_ID, feature)
 
 
-def container_start(feature):
+def container_start(feature, **kwargs):
     """
     Starts a container for given feature.
     
@@ -219,7 +219,7 @@ def container_start(feature):
     update_data(feature, data)
 
     if (start_val & START_LOCAL):
-        ret = docker_action("start", feature)
+        ret = docker_action("start", feature, **kwargs)
 
     if (start_val & START_KUBE):
         set_label(feature, True)
@@ -227,7 +227,7 @@ def container_start(feature):
     return ret
 
 
-def container_stop(feature):
+def container_stop(feature, **kwargs):
     """
     Stops the running container for this feature.
 
@@ -257,7 +257,7 @@ def container_stop(feature):
         set_label(feature, False)
 
     if docker_id:
-        docker_action("stop", docker_id)
+        docker_action("stop", docker_id, **kwargs)
     else:
         syslog.syslog(
                 syslog.LOG_ERR if current_owner != "none" else syslog.LOG_INFO,
@@ -289,7 +289,7 @@ def container_stop(feature):
     debug_msg("END")
 
 
-def container_kill(feature):
+def container_kill(feature, **kwargs):
     """
     Kills the running container for this feature.
 
@@ -314,7 +314,7 @@ def container_kill(feature):
         set_label(feature, False)
 
     if docker_id:
-        docker_action("kill", docker_id)
+        docker_action("kill", docker_id, **kwargs)
 
     else:
         syslog.syslog(
@@ -325,7 +325,7 @@ def container_kill(feature):
     debug_msg("END")
 
 
-def container_wait(feature):
+def container_wait(feature, **kwargs):
     """
     Waits on the running container for this feature.
 
@@ -378,30 +378,34 @@ def container_wait(feature):
                 format(feature))
     else:
         debug_msg("END -- transitioning to docker wait")
-        docker_action("wait", docker_id)
+        docker_action("wait", docker_id, **kwargs)
 
 
 def main():
     parser=argparse.ArgumentParser(description="container commands for start/stop/wait/kill/id")
     parser.add_argument("action", choices=["start", "stop", "wait", "kill", "id"])
+    parser.add_argument('-t', '--timeout', type=int, help='container action timeout value', default=None)
     parser.add_argument("name")
 
     args = parser.parse_args()
+    kwargs = {}
 
     if args.action == "start":
-        container_start(args.name)
+        container_start(args.name, **kwargs)
 
     elif args.action == "stop":
-        container_stop(args.name)
+        if args.timeout is not None:
+            kwargs['timeout'] = args.timeout
+        container_stop(args.name, **kwargs)
 
     elif args.action == "kill":
-        container_kill(args.name)
+        container_kill(args.name, **kwargs)
 
     elif args.action == "wait":
-        container_wait(args.name)
+        container_wait(args.name, **kwargs)
 
     elif args.action == "id":
-        id = container_id(args.name)
+        id = container_id(args.name, **kwargs)
         print(id)
 
 

From 9b73492aedad02a985240af8bff0dbb5d6309bb9 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Sat, 6 Feb 2021 11:23:17 -0800
Subject: [PATCH 0152/1674] [submodule][202012]: Update sonic-swss and
 sonic-utilities submodules (#6701)

sonic-swss:
- [Mux] Route handling based on mux status, kernel tunnel support (#1615)
- Reduce noise during frequent route update (#1624)
- Changed Error log to Notice log during FDB flush notification after VLAN delete (#1618)
- [PortsOrch] Add reference counting to ports for ACL bindings (#1614)
- [crm]: Ignore unsupported/non-implemented switch attributes (#1613)
- [Mux] Fix repeating logs in case of tunnel creation fail (#1610)

sonic-utilities:
- [config reload]: Restart mux container (#1401)
- [storyteller] Enhance the storyteller utility (#1400)
- [show] Fix int status when portchannel is in the system (#1376)
- [config][show] cli support for retrieving ber, eye-info and configuring prbs, loopback on Y-cable  (#1386)
- Skip route check for tun0 interfaces (#1399)
- do not parse stderr to get correct routing stack (#1398)
- [storyteller] allow storyteller to work on downloaded logs (#1388)
- [show] Run fwutil with sudo (#1364)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 01c3abd3cf30..fc06176a164b 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 01c3abd3cf30c76824b736fe65093fa065385c67
+Subproject commit fc06176a164b2325d34a3f137fa1015d757dd64c
diff --git a/src/sonic-utilities b/src/sonic-utilities
index c2fb28254c1e..ea6a38cda963 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit c2fb28254c1e35a3c7a85a3baaf1c05a4afcd9fe
+Subproject commit ea6a38cda963d0ea0b6eaf52026c63e749f3ce35

From f5c2e1cb541ee9ff63df8d338099bc2826040811 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Fri, 5 Feb 2021 19:34:17 -0800
Subject: [PATCH 0153/1674] Add the 10G ports with updated speed (#6699)

Port_config update for hwsku 7050CX3-32S-C3 - add two 10G ports.
This change is added to fix issue of "PortsOrch initialization failure" seen by previous removal of these 10G ports.
Tested on the device with new minigraph, and the PortsOrch initialization failure is not seen.
---
 .../Arista-7050CX3-32S-C32/port_config.ini                      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
index e24a70e97967..4b96b8cf87c9 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/port_config.ini
@@ -31,3 +31,5 @@ Ethernet112     117,118,119,120   Ethernet29/1  29     100000
 Ethernet116     113,114,115,116   Ethernet30/1  30     100000
 Ethernet120     121,122,123,124   Ethernet31/1  31     100000
 Ethernet124     125,126,127,128   Ethernet32/1  32     100000
+Ethernet128     129               Ethernet33    33     10000
+Ethernet132     128               Ethernet34    34     10000

From bb8a1452342b9f787f0b524e0fa70f66f53dbc9e Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Sat, 6 Feb 2021 10:28:05 -0800
Subject: [PATCH 0154/1674] Remove makefile and dependency for python2 of
 dbsyncd. (#6702)

* Remove makefile and
As part of #6046 we have moved to python3 of dbsyncd.
Cleanup the python2 makefile and dependency.
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Revert "Remove makefile and dependency for python2 of dbsyncd."

This reverts commit ceaa4f8dd9c58975953145dcc0c9e045910e73ad.

* Fix

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 rules/dbsyncd-py2.dep | 12 ------------
 rules/dbsyncd-py2.mk  |  7 -------
 2 files changed, 19 deletions(-)
 delete mode 100644 rules/dbsyncd-py2.dep
 delete mode 100644 rules/dbsyncd-py2.mk

diff --git a/rules/dbsyncd-py2.dep b/rules/dbsyncd-py2.dep
deleted file mode 100644
index 6ca1ab8dd786..000000000000
--- a/rules/dbsyncd-py2.dep
+++ /dev/null
@@ -1,12 +0,0 @@
-
-SPATH       := $($(DBSYNCD_PY2)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dbsyncd-py2.mk rules/dbsyncd-py2.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
-
-$(DBSYNCD_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(DBSYNCD_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(DBSYNCD_PY2)_DEP_FILES   := $(DEP_FILES)
-$(DBSYNCD_PY2)_SMDEP_FILES := $(SMDEP_FILES)
-$(DBSYNCD_PY2)_SMDEP_PATHS := $(SPATH)
-
diff --git a/rules/dbsyncd-py2.mk b/rules/dbsyncd-py2.mk
deleted file mode 100644
index 220dc5fe7a1d..000000000000
--- a/rules/dbsyncd-py2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# sonic-dbsyncd python2 wheel
-
-DBSYNCD_PY2 = sonic_d-2.0.0-py2-none-any.whl
-$(DBSYNCD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd
-$(DBSYNCD_PY2)_PYTHON_VERSION = 2
-$(DBSYNCD_PY2)_DEPENDS += $(SWSSSDK_PY2)
-SONIC_PYTHON_WHEELS += $(DBSYNCD_PY2)

From 742bbed255f2a3694db0706c3d99840536079219 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Sat, 6 Feb 2021 21:33:06 +0200
Subject: [PATCH 0155/1674] [barefoot][platform] Fix sonic-platform host
 installation (#6696)

prerm is needed for platform modules package to be properly removed.
Added prerm to remove installed in postinst wheel packages.

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic-platform-modules-bfn-montara/debian/prerm         | 6 ++++++
 .../sonic-platform-modules-bfn-newport/debian/prerm         | 6 ++++++
 platform/barefoot/sonic-platform-modules-bfn/debian/prerm   | 6 ++++++
 3 files changed, 18 insertions(+)
 create mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm
 create mode 100755 platform/barefoot/sonic-platform-modules-bfn/debian/prerm

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm
new file mode 100755
index 000000000000..ee19dbb1db98
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+python2 -m pip uninstall -y sonic-platform
+python3 -m pip uninstall -y sonic-platform
+
+#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm
new file mode 100644
index 000000000000..ee19dbb1db98
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+python2 -m pip uninstall -y sonic-platform
+python3 -m pip uninstall -y sonic-platform
+
+#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn/debian/prerm
new file mode 100755
index 000000000000..ee19dbb1db98
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+python2 -m pip uninstall -y sonic-platform
+python3 -m pip uninstall -y sonic-platform
+
+#DEBHELPER#

From 819d7b50a98a74c8892c5a2282e349a2c07949c5 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 5 Feb 2021 20:52:10 -0800
Subject: [PATCH 0156/1674] [tacacs]: use stg to apply patch

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/tacacs/nss/Makefile                         | 17 +++--------------
 .../0001-Modify-user-map-profile.patch          |  0
 ...Enable-modifying-local-user-permission.patch |  0
 .../0003-management-vrf-support.patch           |  0
 ...-tacacs-servers-for-local-non-tacacs-u.patch |  0
 ...parsing-of-IP-addr-and-port-number-str.patch |  0
 ...piling-warning-about-token-dereference.patch |  0
 ...-Add-support-for-TACACS-source-address.patch |  0
 src/tacacs/nss/patch/series                     |  7 +++++++
 9 files changed, 10 insertions(+), 14 deletions(-)
 rename src/tacacs/nss/{ => patch}/0001-Modify-user-map-profile.patch (100%)
 rename src/tacacs/nss/{ => patch}/0002-Enable-modifying-local-user-permission.patch (100%)
 rename src/tacacs/nss/{ => patch}/0003-management-vrf-support.patch (100%)
 rename src/tacacs/nss/{ => patch}/0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch (100%)
 rename src/tacacs/nss/{ => patch}/0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch (100%)
 rename src/tacacs/nss/{ => patch}/0006-fix-compiling-warning-about-token-dereference.patch (100%)
 rename src/tacacs/nss/{ => patch}/0007-Add-support-for-TACACS-source-address.patch (100%)
 create mode 100644 src/tacacs/nss/patch/series

diff --git a/src/tacacs/nss/Makefile b/src/tacacs/nss/Makefile
index 5fafd93b87fd..0c8f25f44eac 100644
--- a/src/tacacs/nss/Makefile
+++ b/src/tacacs/nss/Makefile
@@ -4,27 +4,16 @@ SHELL = /bin/bash
 
 MAIN_TARGET = libnss-tacplus_$(NSS_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb
 
-GIT_APPLY = am
-ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
-# Workaround git am issue "Out of memory getdelim failed"
-GIT_APPLY = apply
-endif
-
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Obtain libnss-tacplus
 	rm -rf ./libnss-tacplus
 	git clone https://github.com/daveolson53/libnss-tacplus.git
 	pushd ./libnss-tacplus
-	git checkout -f 19008ab
+	git checkout -b test -f 19008ab
 
 	# Apply patch
-	git $(GIT_APPLY) ../0001-Modify-user-map-profile.patch
-	git $(GIT_APPLY) ../0002-Enable-modifying-local-user-permission.patch
-	git $(GIT_APPLY) ../0003-management-vrf-support.patch
-	git $(GIT_APPLY) ../0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch
-	git $(GIT_APPLY) ../0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
-	git $(GIT_APPLY) ../0006-fix-compiling-warning-about-token-dereference.patch
-	git $(GIT_APPLY) ../0007-Add-support-for-TACACS-source-address.patch
+	stg init
+	stg import -s ../patch/series
 
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
diff --git a/src/tacacs/nss/0001-Modify-user-map-profile.patch b/src/tacacs/nss/patch/0001-Modify-user-map-profile.patch
similarity index 100%
rename from src/tacacs/nss/0001-Modify-user-map-profile.patch
rename to src/tacacs/nss/patch/0001-Modify-user-map-profile.patch
diff --git a/src/tacacs/nss/0002-Enable-modifying-local-user-permission.patch b/src/tacacs/nss/patch/0002-Enable-modifying-local-user-permission.patch
similarity index 100%
rename from src/tacacs/nss/0002-Enable-modifying-local-user-permission.patch
rename to src/tacacs/nss/patch/0002-Enable-modifying-local-user-permission.patch
diff --git a/src/tacacs/nss/0003-management-vrf-support.patch b/src/tacacs/nss/patch/0003-management-vrf-support.patch
similarity index 100%
rename from src/tacacs/nss/0003-management-vrf-support.patch
rename to src/tacacs/nss/patch/0003-management-vrf-support.patch
diff --git a/src/tacacs/nss/0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch b/src/tacacs/nss/patch/0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch
similarity index 100%
rename from src/tacacs/nss/0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch
rename to src/tacacs/nss/patch/0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch
diff --git a/src/tacacs/nss/0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch b/src/tacacs/nss/patch/0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
similarity index 100%
rename from src/tacacs/nss/0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
rename to src/tacacs/nss/patch/0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
diff --git a/src/tacacs/nss/0006-fix-compiling-warning-about-token-dereference.patch b/src/tacacs/nss/patch/0006-fix-compiling-warning-about-token-dereference.patch
similarity index 100%
rename from src/tacacs/nss/0006-fix-compiling-warning-about-token-dereference.patch
rename to src/tacacs/nss/patch/0006-fix-compiling-warning-about-token-dereference.patch
diff --git a/src/tacacs/nss/0007-Add-support-for-TACACS-source-address.patch b/src/tacacs/nss/patch/0007-Add-support-for-TACACS-source-address.patch
similarity index 100%
rename from src/tacacs/nss/0007-Add-support-for-TACACS-source-address.patch
rename to src/tacacs/nss/patch/0007-Add-support-for-TACACS-source-address.patch
diff --git a/src/tacacs/nss/patch/series b/src/tacacs/nss/patch/series
new file mode 100644
index 000000000000..51a87171fbcc
--- /dev/null
+++ b/src/tacacs/nss/patch/series
@@ -0,0 +1,7 @@
+0001-Modify-user-map-profile.patch
+0002-Enable-modifying-local-user-permission.patch
+0003-management-vrf-support.patch
+0004-Skip-accessing-tacacs-servers-for-local-non-tacacs-u.patch
+0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
+0006-fix-compiling-warning-about-token-dereference.patch
+0007-Add-support-for-TACACS-source-address.patch

From 99b7910ccfff7c9ce4aebc5d7b0814af3e363eb9 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 6 Feb 2021 01:16:15 -0800
Subject: [PATCH 0157/1674] [tacacs]: do not modify local user if there is no
 priviledge

check the uid before modify local user account.

when run sudo, the process the invoke nss_tacplus library
does not have priviledge to modify the user profile, and
will generate below error messages:

    user_rw@sonic:~$ sudo bash
    usermod: Permission denied.
    usermod: cannot lock /etc/passwd; try again later.
    usermod: Permission denied.
    usermod: cannot lock /etc/passwd; try again later.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 ...-modify-local-user-if-there-is-no-pr.patch | 32 +++++++++++++++++++
 src/tacacs/nss/patch/series                   |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 src/tacacs/nss/patch/0008-do-not-create-or-modify-local-user-if-there-is-no-pr.patch

diff --git a/src/tacacs/nss/patch/0008-do-not-create-or-modify-local-user-if-there-is-no-pr.patch b/src/tacacs/nss/patch/0008-do-not-create-or-modify-local-user-if-there-is-no-pr.patch
new file mode 100644
index 000000000000..1ab4a423663b
--- /dev/null
+++ b/src/tacacs/nss/patch/0008-do-not-create-or-modify-local-user-if-there-is-no-pr.patch
@@ -0,0 +1,32 @@
+From c59b775a7c9226954c5eea4ba05469879b41a60d Mon Sep 17 00:00:00 2001
+From: Guohan Lu <lguohan@gmail.com>
+Date: Sat, 6 Feb 2021 06:49:17 +0000
+Subject: [PATCH] do not create or modify local user if there is no privilege
+
+---
+ nss_tacplus.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/nss_tacplus.c b/nss_tacplus.c
+index fc9316f..cc6f0aa 100644
+--- a/nss_tacplus.c
++++ b/nss_tacplus.c
+@@ -629,8 +629,13 @@ static int lookup_user_pw(struct pwbuf *pb, int level)
+     if(0 != ret)
+         return ret;
+ 
+-    if(0 != create_or_modify_local_user(username, level, found))
+-        return -1;
++    if(0 == getuid()) {
++        if(0 != create_or_modify_local_user(username, level, found))
++            return -1;
++    } else {
++        if(debug)
++            syslog(LOG_DEBUG, "%d does not privilege to create or modify user %s", getuid(), username);
++    }
+ 
+     ret = lookup_pw_local(username, pb, &found);
+     if(0 == ret && !found) {
+-- 
+2.25.1
+
diff --git a/src/tacacs/nss/patch/series b/src/tacacs/nss/patch/series
index 51a87171fbcc..b60214ead9bc 100644
--- a/src/tacacs/nss/patch/series
+++ b/src/tacacs/nss/patch/series
@@ -5,3 +5,4 @@
 0005-libnss-Modify-parsing-of-IP-addr-and-port-number-str.patch
 0006-fix-compiling-warning-about-token-dereference.patch
 0007-Add-support-for-TACACS-source-address.patch
+0008-do-not-create-or-modify-local-user-if-there-is-no-pr.patch

From 5fe835297853770a20ab290d2094879110cefa83 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 11 Feb 2021 09:13:06 +0200
Subject: [PATCH 0158/1674] [Mellanox][SAI] update submodule pointer (#6728)

- Apply device MAC on port host interface when port is removed from LAG.
- [Shared Headroom]: fixed watermark handling for SHP flow
- Decrease verbosity of policer unbind message when no policer is attached

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index abdc7c069ea8..80937117fcd5 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit abdc7c069ea8714af53cd4337f05bd493f133668
+Subproject commit 80937117fcd54e8df0581368f652f3664af6aecb

From 78ad83fe2a98e0cfdc4caff4267e10243135471e Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Sun, 7 Feb 2021 03:23:35 +0530
Subject: [PATCH 0159/1674] [DellEMC Z9332f] Added support for platform system
 health daemon (#6642)

---
 .../system_health_monitoring_config.json      | 11 ++++
 .../common/ipmihelper.py                      | 10 ++--
 .../common/sonic_platform/hwaccess.py         | 29 +++++++++++
 .../z9332f/sonic_platform/chassis.py          | 51 ++++++++++++++++++-
 .../z9332f/sonic_platform/psu.py              | 39 +++++++++++++-
 5 files changed, 132 insertions(+), 8 deletions(-)
 create mode 100644 device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..d52b24cf905d
--- /dev/null
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["asic","fan.speed"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "yellow",
+        "normal": "green",
+        "booting": "flash_green"
+    }
+}
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
index ceeaebfbf047..d95329c40de2 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -33,7 +33,7 @@ def get_ipmitool_raw_output(args):
     command = "ipmitool raw {}".format(args)
     try:
         proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                universal_newlines=True, stderr=subprocess.STDOUT)
         stdout = proc.communicate()[0]
         proc.wait()
         if not proc.returncode:
@@ -175,11 +175,11 @@ def _get_ipmitool_fru_print(self):
         command = "ipmitool fru print {}".format(self.id)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
+                result = stdout.rstrip('\n')
         except EnvironmentError:
             pass
 
@@ -248,11 +248,11 @@ def get_fru_data(self, offset, count=1):
                                                           offset_MSB, count)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
+                result = stdout.rstrip('\n')
         except EnvironmentError:
             is_valid = False
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
index b0020144a4fb..567669d36fc0 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
@@ -1,5 +1,6 @@
 # Helper functions to access hardware
 
+import os
 import struct
 import mmap
 import subprocess
@@ -22,3 +23,31 @@ def pci_get_value(resource, offset):
 
 def i2c_get(bus, i2caddr, ofs):
     return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+
+def io_reg_read(io_resource, offset):
+    fd = os.open(io_resource, os.O_RDONLY)
+    if fd < 0:
+        print('file open failed %s' % io_resource)
+        return -1
+    if os.lseek(fd, offset, os.SEEK_SET) != offset:
+        print('lseek failed on %s' % io_resource)
+        return -1
+    buf = os.read(fd, 1)
+    reg_val1 = ord(buf)
+    os.close(fd)
+    return reg_val1
+
+def io_reg_write(io_resource, offset, val):
+    fd = os.open(io_resource, os.O_RDWR)
+    if fd < 0:
+        print('file open failed %s' % io_resource)
+        return False
+    if os.lseek(fd, offset, os.SEEK_SET) != offset:
+        print('lseek failed on %s' % io_resource)
+        return False
+    ret = os.write(fd, struct.pack('B', val))
+    if ret != 1:
+        print('write failed %d' % ret)
+        return False
+    os.close(fd)
+    return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 3651b0d4bf08..cead0eb326ef 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -19,6 +19,7 @@
     from sonic_platform.thermal import Thermal
     from sonic_platform.fan_drawer import FanDrawer
     from sonic_platform.watchdog import Watchdog
+    import sonic_platform.hwaccess as hwaccess
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -53,9 +54,25 @@ class Chassis(ChassisBase):
     REBOOT_CAUSE_PATH = "/host/reboot-cause/platform/reboot_reason"
     oir_fd = -1
     epoll = -1
+    io_res = "/dev/port"
+    sysled_offset = 0xA162
+    SYSLED_COLOR_TO_REG = {
+       "green": 0xd0,
+       "yellow": 0xe0,
+       "flash_green": 0xd2,
+       "flash_yellow": 0xe2
+       }
+
+    REG_TO_SYSLED_COLOR = {
+        0xd0 : "green",
+        0xe0 : "yellow",
+        0xd2 : "flash_green",
+        0xd1 : "flash_green",
+        0xe2 : "flash_yellow",
+        0xe1 : "flash_yellow"
+        }
 
     _global_port_pres_dict = {}
-
     _port_to_i2c_mapping = {
             1:  10,
             2:  11,
@@ -317,3 +334,35 @@ def get_reboot_cause(self):
 
     def get_qualified_media_list(self):
         return media_part_num_list
+
+    def initizalize_system_led(self):
+        self.sys_ledcolor = "green"
+
+    def get_status_led(self):
+        """
+        Gets the current system LED color
+
+        Returns:
+            A string that represents the supported color
+        """
+        val = hwaccess.io_reg_read(self.io_res, self.sysled_offset)
+        if val != -1:
+            return self.REG_TO_SYSLED_COLOR.get(val)
+        return self.sys_ledcolor
+
+    def set_status_led(self, color):
+        """ 
+        Set system LED status based on the color type passed in the argument.
+        Argument: Color to be set
+        Returns:
+          bool: True is specified color is set, Otherwise return False
+        """
+
+        if color not in list(self.SYSLED_COLOR_TO_REG.keys()):
+            return False
+
+        if(not hwaccess.io_reg_write(self.io_res, self.sysled_offset, self.SYSLED_COLOR_TO_REG[color])):
+            return False
+        self.sys_ledcolor = color
+        return True
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
index 3be32043ade8..0d06c31fcf8f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
@@ -21,9 +21,11 @@ class Psu(PsuBase):
 
     # { PSU-ID: { Sensor-Name: Sensor-ID } }
     SENSOR_MAPPING = { 1: { "State": 0x2f, "Current": 0x37,
-                            "Power": 0x38, "Voltage": 0x36 },
+                            "Power": 0x38, "Voltage": 0x36, 
+                            "Temperature": 0x35 },
                        2: { "State": 0x39, "Current": 0x41,
-                            "Power": 0x42, "Voltage": 0x40 } }
+                            "Power": 0x42, "Voltage": 0x40, 
+                            "Temperature": 0x3F } }
     # ( PSU-ID: FRU-ID }
     FRU_MAPPING = { 1: 3, 2: 4 }
 
@@ -36,6 +38,7 @@ def __init__(self, psu_index):
         self.voltage_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Voltage"])
         self.current_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Current"])
         self.power_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Power"])
+        self.temp_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index ]["Temperature"])
         self.fru = IpmiFru(self.FRU_MAPPING[self.index])
         self.psu_type_raw_cmd = "0x3A 0x0B {}".format(psu_index+1)
 
@@ -112,6 +115,38 @@ def get_voltage(self):
 
         return "{:.1f}".format(voltage)
 
+    def get_voltage_low_threshold(self):
+        """
+        Returns PSU low threshold in Volts
+        """
+        return 11.4
+
+    def get_voltage_high_threshold(self):
+        """
+        Returns PSU high threshold in Volts
+        """
+        return 12.6
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to
+            nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        is_valid, temperature = self.temp_sensor.get_reading()
+        if not is_valid:
+            temperature = 0
+
+        return float(temperature)
+
+    def get_temperature_high_threshold(self):
+        """
+        Returns the high temperature threshold for PSU in Celsius
+        """
+        return 45.0
+
     def get_current(self):
         """
         Retrieves present electric current supplied by PSU

From 191e90e400674685f50dc4261194d805ae768bf7 Mon Sep 17 00:00:00 2001
From: Roy Lee <roy_lee@accton.com>
Date: Sun, 7 Feb 2021 05:56:16 +0800
Subject: [PATCH 0160/1674] [device/accton/as4630-54pe] Fix accton driver not
 been installed (#6321)

Accton util applies lsmod to check if drivers are installed.
But lsmod may return error on startup and skip module installation.

Signed-off-by: roy_lee <roy_lee@edge-core.com>
---
 .../as4630-54pe/utils/accton_as4630_54pe_util.py            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
index ed0df177ee13..4039119288a0 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
@@ -214,10 +214,12 @@ def log_os_system(cmd, show):
     return  status, output
 
 def driver_inserted():
-    ret, lsmod = log_os_system("lsmod| grep accton", 0)
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
     logging.info('mods:'+lsmod)
-    if len(lsmod) ==0:
+    if ret :
         return False
+    else :
+        return True
 
 #'modprobe cpr_4011_4mxx',
 

From c70591650043b77efa6f58b602f4b5ad5d37635d Mon Sep 17 00:00:00 2001
From: Dmytro Shevchuk <68949102+dmytroxshevchuk@users.noreply.github.com>
Date: Sun, 7 Feb 2021 03:38:29 +0200
Subject: [PATCH 0161/1674] [barefoot] Add hwsku.json, platform.json for
 montara (#6554)

* [device] add platform.json hwsku.json for Montara
* [device] add autonge, fec fields to hwsku
---
 .../montara/hwsku.json                        | 164 +++++++++++++++
 .../platform.json                             | 196 ++++++++++++++++++
 2 files changed, 360 insertions(+)
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/hwsku.json
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/hwsku.json b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/hwsku.json
new file mode 100644
index 000000000000..a253fa3bd480
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/hwsku.json
@@ -0,0 +1,164 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet52": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet60": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet68": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet76": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet84": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet92": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet100": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet108": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet116": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        },
+        "Ethernet124": {
+            "default_brkout_mode": "1x100G[40G]",
+            "autoneg": "0",
+            "fec": "rs"
+        }
+    }
+}
diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json
new file mode 100644
index 000000000000..0b68edf1610c
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json
@@ -0,0 +1,196 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "index": "1,1,1,1",
+            "lanes": "0,1,2,3",
+            "alias_at_lanes": "Ethernet0,Ethernet1,Ethernet2,Ethernet3",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+       "Ethernet4": {
+            "index": "2,2,2,2",
+            "lanes": "4,5,6,7",
+            "alias_at_lanes": "Ethernet4,Ethernet5,Ethernet6,Ethernet7",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet8": {
+            "index": "3,3,3,3",
+            "lanes": "8,9,10,11",
+            "alias_at_lanes": "Ethernet8,Ethernet9,Ethernet10,Ethernet11",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet12": {
+            "index": "4,4,4,4",
+            "lanes": "12,13,14,15",
+            "alias_at_lanes": "Ethernet12,Ethernet13,Ethernet14,Ethernet15",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet16": {
+            "index": "5,5,5,5",
+            "lanes": "16,17,18,19",
+            "alias_at_lanes": "Ethernet16,Ethernet17,Ethernet18,Ethernet19",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet20": {
+            "index": "6,6,6,6",
+            "lanes": "20,21,22,23",
+            "alias_at_lanes": "Ethernet20,Ethernet21,Ethernet22,Ethernet23",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet24": {
+            "index": "7,7,7,7",
+            "lanes": "24,25,26,27",
+            "alias_at_lanes": "Ethernet24,Ethernet25,Ethernet26,Ethernet27",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet28": {
+            "index": "8,8,8,8",
+            "lanes": "28,29,30,31",
+            "alias_at_lanes": "Ethernet28,Ethernet29,Ethernet30,Ethernet31",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet32": {
+            "index": "9,9,9,9",
+            "lanes": "32,33,34,35",
+            "alias_at_lanes": "Ethernet32,Ethernet33,Ethernet34,Ethernet35",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet36": {
+            "index": "10,10,10,10",
+            "lanes": "36,37,38,39",
+            "alias_at_lanes": "Ethernet36,Ethernet37,Ethernet38,Ethernet39",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet40": {
+            "index": "11,11,11,11",
+            "lanes": "40,41,42,43",
+            "alias_at_lanes": "Ethernet40,Ethernet41,Ethernet42,Ethernet43",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet44": {
+            "index": "12,12,12,12",
+            "lanes": "44,45,46,47",
+            "alias_at_lanes": "Ethernet44,Ethernet45,Ethernet46,Ethernet47",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet48": {
+            "index": "13,13,13,13",
+            "lanes": "48,49,50,51",
+            "alias_at_lanes": "Ethernet48,Ethernet49,Ethernet50,Ethernet51",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet52": {
+            "index": "14,14,14,14",
+            "lanes": "52,53,54,55",
+            "alias_at_lanes": "Ethernet52,Ethernet53,Ethernet54,Ethernet55",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet56": {
+            "index": "15,15,15,15",
+            "lanes": "56,57,58,59",
+            "alias_at_lanes": "Ethernet56,Ethernet57,Ethernet58,Ethernet59",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet60": {
+            "index": "16,16,16,16",
+            "lanes": "60,61,62,63",
+            "alias_at_lanes": "Ethernet60,Ethernet61,Ethernet62,Ethernet63",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet64": {
+            "index": "17,17,17,17",
+            "lanes": "64,65,66,67",
+            "alias_at_lanes": "Ethernet64,Ethernet65,Ethernet66,Ethernet67",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet68": {
+            "index": "18,18,18,18",
+            "lanes": "68,69,70,71",
+            "alias_at_lanes": "Ethernet68,Ethernet69,Ethernet70,Ethernet71",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet72": {
+            "index": "19,19,19,19",
+            "lanes": "72,73,74,75",
+            "alias_at_lanes": "Ethernet72,Ethernet73,Ethernet74,Ethernet75",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet76": {
+            "index": "20,20,20,20",
+            "lanes": "76,77,78,79",
+            "alias_at_lanes": "Ethernet76,Ethernet77,Ethernet78,Ethernet79",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet80": {
+            "index": "21,21,21,21",
+            "lanes": "80,81,82,83",
+            "alias_at_lanes": "Ethernet80,Ethernet81,Ethernet82,Ethernet83",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet84": {
+            "index": "22,22,22,22",
+            "lanes": "84,85,86,87",
+            "alias_at_lanes": "Ethernet84,Ethernet85,Ethernet86,Ethernet87",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet88": {
+            "index": "23,23,23,23",
+            "lanes": "88,89,90,91",
+            "alias_at_lanes": "Ethernet88,Ethernet89,Ethernet90,Ethernet91",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet92": {
+            "index": "24,24,24,24",
+            "lanes": "92,93,94,95",
+            "alias_at_lanes": "Ethernet92,Ethernet93,Ethernet94,Ethernet95",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet96": {
+            "index": "25,25,25,25",
+            "lanes": "96,97,98,99",
+            "alias_at_lanes": "Ethernet96,Ethernet97,Ethernet98,Ethernet99",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet100": {
+            "index": "26,26,26,26",
+            "lanes": "100,101,102,103",
+            "alias_at_lanes": "Ethernet100,Ethernet101,Ethernet102,Ethernet103",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet104": {
+            "index": "27,27,27,27",
+            "lanes": "104,105,106,107",
+            "alias_at_lanes": "Ethernet104,Ethernet105,Ethernet106,Ethernet107",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet108": {
+            "index": "28,28,28,28",
+            "lanes": "108,109,110,111",
+            "alias_at_lanes": "Ethernet108,Ethernet109,Ethernet110,Ethernet111",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet112": {
+            "index": "29,29,29,29",
+            "lanes": "112,113,114,115",
+            "alias_at_lanes": "Ethernet112,Ethernet113,Ethernet114,Ethernet115",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet116": {
+            "index": "30,30,30,30",
+            "lanes": "116,117,118,119",
+            "alias_at_lanes": "Ethernet116,Ethernet117,Ethernet118,Ethernet119",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet120": {
+            "index": "31,31,31,31",
+            "lanes": "120,121,122,123",
+            "alias_at_lanes": "Ethernet120,Ethernet121,Ethernet122,Ethernet123",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        },
+        "Ethernet124": {
+            "index": "32,32,32,32",
+            "lanes": "124,125,126,127",
+            "alias_at_lanes": "Ethernet124,Ethernet125,Ethernet126,Ethernet127",
+            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
+        }
+    }
+}

From ab03441ce994bb9ff5ca4e1aa9d619bcf8120bb3 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sat, 6 Feb 2021 21:02:06 -0800
Subject: [PATCH 0162/1674] [sonic-linux-kernel]: security update to kernel
 4.19.152 (#6490)

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 build_debian.sh                               |  2 +-
 installer/x86_64/install.sh                   |  4 +--
 platform/barefoot/bfn-modules/debian/control  |  2 +-
 .../debian/control                            |  2 +-
 .../debian/control                            |  4 +--
 .../sonic-platform-modules-bfn/debian/control |  2 +-
 .../debian/control                            |  2 +-
 .../broadcom/saibcm-modules/debian/control    |  2 +-
 .../debian/opennsl-modules.dirs               |  2 +-
 .../debian/opennsl-modules.install            | 12 ++++----
 platform/broadcom/saibcm-modules/debian/rules |  4 +--
 .../debian/control                            |  4 +--
 .../sonic-platform-modules-cel/debian/control |  8 +++---
 .../debian/control                            | 14 +++++-----
 .../debian/control                            | 12 ++++----
 .../debian/control                            | 14 +++++-----
 .../debian/control                            |  2 +-
 .../cavm_platform_modules/DEBIAN/control      |  2 +-
 .../debian/control                            |  4 +--
 .../platform-modules-e530-24x2c.install       |  4 +--
 .../platform-modules-e530-48t4x-p.install     |  4 +--
 platform/centec-arm64/sonic_fit.its           |  4 +--
 .../centec-arm64/tsingma-bsp/debian/control   |  2 +-
 .../tsingma-bsp/debian/tsingma-bsp.install    | 28 +++++++++----------
 .../debian/control                            |  4 +--
 .../debian/control                            |  2 +-
 .../sonic-platform-modules-cel/debian/control |  2 +-
 .../debian/control                            |  2 +-
 platform/marvell-armhf/platform.conf          |  4 +--
 platform/nephos/nephos-modules/debian/control |  2 +-
 .../debian/control                            |  2 +-
 .../sonic-platform-modules-cig/debian/control |  6 ++--
 .../debian/control                            |  2 +-
 rules/linux-kernel.mk                         |  6 ++--
 src/sonic-linux-kernel                        |  2 +-
 35 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 19ee92b8620d..cbb4a559e78b 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -32,7 +32,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 ## docker engine version (with platform)
 DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
-LINUX_KERNEL_VERSION=4.19.0-9-2
+LINUX_KERNEL_VERSION=4.19.0-12-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 349880114d04..5fa0cc087776 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -624,12 +624,12 @@ menuentry '$demo_grub_entry' {
         if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
         insmod part_msdos
         insmod ext2
-        linux   /$image_dir/boot/vmlinuz-4.19.0-9-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-4.19.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
-        initrd  /$image_dir/boot/initrd.img-4.19.0-9-2-amd64
+        initrd  /$image_dir/boot/initrd.img-4.19.0-12-2-amd64
 }
 EOF
 
diff --git a/platform/barefoot/bfn-modules/debian/control b/platform/barefoot/bfn-modules/debian/control
index 2c3d8368bc4b..be1f6cc0443a 100644
--- a/platform/barefoot/bfn-modules/debian/control
+++ b/platform/barefoot/bfn-modules/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: bfn-modules
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for bfn asic for mmap
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
index 7c46f1f96fa7..a3ea06992dc4 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-montara
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
index 89135fda2478..d2c37fe8d2b9 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-newport-as9516
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
 
 Package: sonic-platform-modules-bfn-newport-as9516bf
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/control b/platform/barefoot/sonic-platform-modules-bfn/debian/control
index e5ce77ba7120..89c597303a78 100644
--- a/platform/barefoot/sonic-platform-modules-bfn/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control b/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
index 6f7bd62ffcc2..eab1adcadecd 100644
--- a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
+++ b/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-wnc-osw1800
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/saibcm-modules/debian/control b/platform/broadcom/saibcm-modules/debian/control
index d022eadb0501..60bcbafb1b1a 100644
--- a/platform/broadcom/saibcm-modules/debian/control
+++ b/platform/broadcom/saibcm-modules/debian/control
@@ -10,5 +10,5 @@ Standards-Version: 3.9.3
 Package: opennsl-modules
 Architecture: amd64
 Section: main
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for broadcom SAI
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
index 27fae96d8a1a..140d1186059e 100644
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@@ -1 +1 @@
-lib/modules/4.19.0-9-2-amd64/extra
+lib/modules/4.19.0-12-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
index ebb290820f03..c4d7ace79696 100644
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@@ -1,8 +1,8 @@
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-9-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-9-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-9-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-9-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-9-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-12-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
 sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-9-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules
index 4fcf2db75a5f..572471027c87 100755
--- a/platform/broadcom/saibcm-modules/debian/rules
+++ b/platform/broadcom/saibcm-modules/debian/rules
@@ -34,8 +34,8 @@ sname:=opennsl
 PACKAGE=opennsl-modules
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
-KVERSION ?= 4.19.0-9-2-amd64
-KERNVERSION ?= 4.19.0-9-2
+KVERSION ?= 4.19.0-12-2-amd64
+KERNVERSION ?= 4.19.0-12-2
 
 # load generic variable handling
 -include $(MA_DIR)/include/generic.make
diff --git a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
index 6c7b1c41446f..6535dbb88bb8 100644
--- a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
+++ b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-alphanetworks-snh60a0-320fv2
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-alphanetworks-snh60b0-640f
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control
index 1eedf83d07b0..a41f92ab54e9 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/control
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/control
@@ -7,21 +7,21 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-dx010
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-seastone2
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp
 
 Package: platform-modules-silverstone
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp.
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/control b/platform/broadcom/sonic-platform-modules-dell/debian/control
index 82b0e402a15d..2920602fcd60 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/control
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/control
@@ -7,37 +7,37 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-s6000
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5232f
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5248f
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9332f
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5296f
diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/control b/platform/broadcom/sonic-platform-modules-delta/debian/control
index 6105f280ad33..809c58b0c0b1 100644
--- a/platform/broadcom/sonic-platform-modules-delta/debian/control
+++ b/platform/broadcom/sonic-platform-modules-delta/debian/control
@@ -7,30 +7,30 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-ag9032v1
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9064
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag5648
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-et-6248brb
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9032v2a
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as syseeprom, sfp
 
 Package: platform-modules-agc032
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-inventec/debian/control b/platform/broadcom/sonic-platform-modules-inventec/debian/control
index d5ba6b0869e8..7a435d9b6e60 100644
--- a/platform/broadcom/sonic-platform-modules-inventec/debian/control
+++ b/platform/broadcom/sonic-platform-modules-inventec/debian/control
@@ -7,35 +7,35 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-d7032q28b
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7054q28b
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6254qs
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6556
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6356
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7264q28b
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6332
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
diff --git a/platform/broadcom/sonic-platform-modules-mitac/debian/control b/platform/broadcom/sonic-platform-modules-mitac/debian/control
index f1a62577f6e2..f909c6af9489 100644
--- a/platform/broadcom/sonic-platform-modules-mitac/debian/control
+++ b/platform/broadcom/sonic-platform-modules-mitac/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-mitac-ly1200-32x
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/cavium/cavm_platform_modules/DEBIAN/control b/platform/cavium/cavm_platform_modules/DEBIAN/control
index 938215c8f8ee..6a665e88c718 100755
--- a/platform/cavium/cavm_platform_modules/DEBIAN/control
+++ b/platform/cavium/cavm_platform_modules/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: cavm-platform-modules
 Version: 1.0
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Maintainer: Nadiya.Stetskovych@cavium.com
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/control b/platform/centec-arm64/sonic-platform-modules-e530/debian/control
index 023a365f4d7b..2a1bc972a8b2 100644
--- a/platform/centec-arm64/sonic-platform-modules-e530/debian/control
+++ b/platform/centec-arm64/sonic-platform-modules-e530/debian/control
@@ -7,10 +7,10 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e530-48t4x-p
 Architecture: arm64
-Depends: linux-image-4.19.0-9-2-arm64-unsigned
+Depends: linux-image-4.19.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e530-24x2c
 Architecture: arm64
-Depends: linux-image-4.19.0-9-2-arm64-unsigned
+Depends: linux-image-4.19.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install
index f9fceaf20f23..b74a968fe976 100644
--- a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install
+++ b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install
@@ -1,3 +1,3 @@
-../../centec/centec-dal/dal.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-24x2c/modules/centec_e530_24x2c_platform.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
+../../centec/centec-dal/dal.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+24x2c/modules/centec_e530_24x2c_platform.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
 24x2c/service/24x2c_platform.service /lib/systemd/system
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install
index 57d2eb4470ad..7d1c00eebeae 100644
--- a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install
+++ b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install
@@ -1,3 +1,3 @@
-../../centec/centec-dal/dal.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-48t4x_p/modules/centec_e530_48t4x_p_platform.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
+../../centec/centec-dal/dal.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+48t4x_p/modules/centec_e530_48t4x_p_platform.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
 48t4x_p/service/48t4x_p_platform.service /lib/systemd/system
diff --git a/platform/centec-arm64/sonic_fit.its b/platform/centec-arm64/sonic_fit.its
index 8a358ac325f4..7ee89e6c812f 100644
--- a/platform/centec-arm64/sonic_fit.its
+++ b/platform/centec-arm64/sonic_fit.its
@@ -12,7 +12,7 @@
 	images {
 		kernel_ctc {
 			description = "ARM64 Kernel";			
-			data = /incbin/("./vmlinuz-4.19.0-9-2-arm64");
+			data = /incbin/("./vmlinuz-4.19.0-12-2-arm64");
 			type = "kernel";			
 			arch = "arm64";			
 			os = "linux";			
@@ -25,7 +25,7 @@
 		};
 		initramfs {
 			description = "initramfs";
-			data = /incbin/("./initrd.img-4.19.0-9-2-arm64");
+			data = /incbin/("./initrd.img-4.19.0-12-2-arm64");
 			type = "ramdisk";
 			arch = "arm64";
 			os = "linux";
diff --git a/platform/centec-arm64/tsingma-bsp/debian/control b/platform/centec-arm64/tsingma-bsp/debian/control
index e183844f01e1..fc6d0b8def4f 100644
--- a/platform/centec-arm64/tsingma-bsp/debian/control
+++ b/platform/centec-arm64/tsingma-bsp/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: tsingma-bsp
 Architecture: arm64
-Depends: linux-image-4.19.0-9-2-arm64-unsigned
+Depends: linux-image-4.19.0-12-2-arm64-unsigned
 Description: kernel modules for tsingma bsp
diff --git a/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install b/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
index 81d328b68996..e2fb35af1b6c 100644
--- a/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
+++ b/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
@@ -1,17 +1,17 @@
-src/ctc5236-mc/ctc5236-mc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/pwm-ctc/pwm-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ctc5236_switch/ctc5236_switch.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ctc_wdt/ctc_wdt.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ctcmac/ctcmac.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ctcmac/ctcmac_test.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ctcmac/ctc5236_mdio.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/i2c-ctc/i2c-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/gpio-ctc/gpio-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/ehci-ctc/ehci-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/rtc-sd2405/rtc-sd2405.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
-src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
+src/ctc5236-mc/ctc5236-mc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/pwm-ctc/pwm-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ctc5236_switch/ctc5236_switch.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ctc_wdt/ctc_wdt.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ctcmac/ctcmac.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ctcmac/ctcmac_test.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ctcmac/ctc5236_mdio.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/i2c-ctc/i2c-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/gpio-ctc/gpio-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/ehci-ctc/ehci-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/rtc-sd2405/rtc-sd2405.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
+src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
 src/ctc-dts/e530-ctc5236.dtb /boot/
 src/config/fw_env.config /etc/
 src/config/tsingma-bsp.service /lib/systemd/system
diff --git a/platform/centec/sonic-platform-modules-e582/debian/control b/platform/centec/sonic-platform-modules-e582/debian/control
index 5d6bcc7002e8..97f617d4836a 100644
--- a/platform/centec/sonic-platform-modules-e582/debian/control
+++ b/platform/centec/sonic-platform-modules-e582/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e582-48x2q4z
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e582-48x6q
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/centec/sonic-platform-modules-embedway/debian/control b/platform/centec/sonic-platform-modules-embedway/debian/control
index 781f4df43422..6fb02a824826 100644
--- a/platform/centec/sonic-platform-modules-embedway/debian/control
+++ b/platform/centec/sonic-platform-modules-embedway/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-embedway-es6220
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/innovium/sonic-platform-modules-cel/debian/control b/platform/innovium/sonic-platform-modules-cel/debian/control
index 3b9152232d38..374f1f75d3aa 100755
--- a/platform/innovium/sonic-platform-modules-cel/debian/control
+++ b/platform/innovium/sonic-platform-modules-cel/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-midstone-200i
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices
diff --git a/platform/innovium/sonic-platform-modules-delta/debian/control b/platform/innovium/sonic-platform-modules-delta/debian/control
index ac94e19b4cf8..bcfea2d42f1f 100644
--- a/platform/innovium/sonic-platform-modules-delta/debian/control
+++ b/platform/innovium/sonic-platform-modules-delta/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-et-c032if
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 7fc7af8519bc..78f64b6fbe18 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -10,8 +10,8 @@ fdt_addr=0x1000000
 initrd_addr=0x2000000
 VAR_LOG=512
 
-kernel_fname="/boot/vmlinuz-4.19.0-9-2-armmp"
-initrd_fname="/boot/initrd.img-4.19.0-9-2-armmp"
+kernel_fname="/boot/vmlinuz-4.19.0-12-2-armmp"
+initrd_fname="/boot/initrd.img-4.19.0-12-2-armmp"
 fdt_fname="/boot/armada-385-ET6448M_4G_Nand.dtb"
 
 if [ "$install_env" = "onie" ]; then
diff --git a/platform/nephos/nephos-modules/debian/control b/platform/nephos/nephos-modules/debian/control
index 78eb7af671fe..1b485d808f3e 100644
--- a/platform/nephos/nephos-modules/debian/control
+++ b/platform/nephos/nephos-modules/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: nephos-modules
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for nephos asic
 
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/control b/platform/nephos/sonic-platform-modules-accton/debian/control
index e2b67b03b9e4..3020b86408d6 100755
--- a/platform/nephos/sonic-platform-modules-accton/debian/control
+++ b/platform/nephos/sonic-platform-modules-accton/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-accton-as7116-54x
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/nephos/sonic-platform-modules-cig/debian/control b/platform/nephos/sonic-platform-modules-cig/debian/control
index 870edcf1a234..fc0c6736ffa2 100644
--- a/platform/nephos/sonic-platform-modules-cig/debian/control
+++ b/platform/nephos/sonic-platform-modules-cig/debian/control
@@ -7,15 +7,15 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-cig-cs6436-56p
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-cig-cs6436-54p
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-cig-cs5435-54p
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/nephos/sonic-platform-modules-pegatron/debian/control b/platform/nephos/sonic-platform-modules-pegatron/debian/control
index fc3054a4c876..8fc19980fc12 100755
--- a/platform/nephos/sonic-platform-modules-pegatron/debian/control
+++ b/platform/nephos/sonic-platform-modules-pegatron/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-pegatron-porsche
 Architecture: amd64
-Depends: linux-image-4.19.0-9-2-amd64-unsigned
+Depends: linux-image-4.19.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
index 600600cc96f6..44107c4c7743 100644
--- a/rules/linux-kernel.mk
+++ b/rules/linux-kernel.mk
@@ -1,9 +1,9 @@
 # linux kernel package
 
-KVERSION_SHORT = 4.19.0-9-2
+KVERSION_SHORT = 4.19.0-12-2
 KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
-KERNEL_VERSION = 4.19.118
-KERNEL_SUBVERSION = 2+deb10u1
+KERNEL_VERSION = 4.19.152
+KERNEL_SUBVERSION = 1
 ifeq ($(CONFIGURED_ARCH), armhf)
 # Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
 KVERSION = $(KVERSION_SHORT)-armmp
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 548e8e0be496..11f0da688d5b 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 548e8e0be49692050ea4071d5e9945816bc5aacc
+Subproject commit 11f0da688d5bd7e206c3e50fd408d0717e9626d1

From a04d7efddc87797546f66963978d0022b938afd8 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 7 Feb 2021 17:21:44 +0800
Subject: [PATCH 0163/1674] Fix dynamic minimum fan table issue caused by
 python3 (#6690)

**- Why I did it**
After migrating to python3, the operator '/' always get a float result, but it gets integer result in python2. Need fix this in thermal_conditions.

**- How I did it**
1. cast float value to int
2. change the unit test case to cover this situation

**- How to verify it**
Manually test and regression test
---
 .../mlnx-platform-api/sonic_platform/thermal_conditions.py    | 2 +-
 .../mellanox/mlnx-platform-api/tests/test_thermal_policy.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
index 94e18a2e00b0..a682061d12a8 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
@@ -85,7 +85,7 @@ def is_match(self, thermal_info_dict):
 
         trust_state = Thermal.check_module_temperature_trustable()
         temperature = Thermal.get_min_amb_temperature()
-        temperature = temperature / 1000
+        temperature = int(temperature / 1000)
 
         change_cooling_level = False
         if trust_state != MinCoolingLevelChangeCondition.trust_state:
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
index 87fac359b2fd..4d69a39c58a1 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
@@ -482,7 +482,7 @@ def test_dynamic_minimum_policy(thermal_manager):
     condition = policy.conditions[MinCoolingLevelChangeCondition]
     action = policy.actions[ChangeMinCoolingLevelAction]
     Thermal.check_module_temperature_trustable = MagicMock(return_value='trust')
-    Thermal.get_min_amb_temperature = MagicMock(return_value=35000)
+    Thermal.get_min_amb_temperature = MagicMock(return_value=35001)
     assert condition.is_match(None)
     assert MinCoolingLevelChangeCondition.trust_state == 'trust'
     assert MinCoolingLevelChangeCondition.temperature == 35
@@ -492,7 +492,7 @@ def test_dynamic_minimum_policy(thermal_manager):
     assert condition.is_match(None)
     assert MinCoolingLevelChangeCondition.trust_state == 'untrust'
 
-    Thermal.get_min_amb_temperature = MagicMock(return_value=25000)
+    Thermal.get_min_amb_temperature = MagicMock(return_value=25999)
     assert condition.is_match(None)
     assert MinCoolingLevelChangeCondition.temperature == 25
 

From b92c2f5150e1109cd834861e544e7e44742222c0 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Mon, 8 Feb 2021 08:07:33 -0800
Subject: [PATCH 0164/1674] [broadcom]: BRCM SAI 4.3.0.10-5  : Fix for ACL
 entry set attribute for IN_PORTS for TD3 (#6718)

ACL entry set attribute updates all the entries in the table. The correct behavior is to set the attribute on single entry.

- How I did it
Current SDK code, while setting the new attribute, is going through all the entries and updating it. Added a logic to check for requested entry and only allow for that ACL entry.
A case has filed with BRCM. Once an official fix is provided by BRCM, we will then remove this in house fix and apply the official fix.
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 1b27d7bc1f88..e36319619b0c 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.10-4_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=nfseU56PACVqklQ4MC0HvZ7qt7Ou4loQMBA7jx8CSOY%3D&se=2034-10-13T16%3A31%3A22Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-4_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.10-5_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-5_amd64.deb?sv=2019-12-12&st=2021-02-08T00%3A20%3A49Z&se=2030-02-09T00%3A20%3A00Z&sr=b&sp=r&sig=rEpcTHNsSr10rKhpr6Cx3EFNa2dRE7VLP7ybZijQKpE%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-5_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-4_amd64.deb?sv=2015-04-05&sr=b&sig=4tF26GxI6jmrcvRyCezQ7RL6qMjzip7SFf61eqy%2Bvf4%3D&se=2034-10-13T16%3A31%3A53Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-5_amd64.deb?sv=2019-12-12&st=2021-02-08T00%3A21%3A42Z&se=2030-02-09T00%3A21%3A00Z&sr=b&sp=r&sig=gvDnVYkQe%2FA2Yqw9p404Vtmx%2Fo8NwJMFoCn7K4W1k0M%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From de4a675dd136f5bae4853699f4a514bb2c8a77fa Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Tue, 9 Feb 2021 08:48:23 -0800
Subject: [PATCH 0165/1674] [saibcm-modules]: match linux kernel version
 (#6732)

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/broadcom/saibcm-modules/debian/opennsl-modules.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
index c4d7ace79696..5e8e70bb189f 100644
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@@ -5,4 +5,4 @@ systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-12
 systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-12-2-amd64/extra
 systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-12-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
-sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-9-2-amd64/extra
+sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-12-2-amd64/extra

From fb6e157ab3c0c03ba3520c90d754576b970ce06d Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Wed, 10 Feb 2021 02:02:09 +0800
Subject: [PATCH 0166/1674] [as7312-54x] Support platform API2.0 (#6272)

Add platform 2.0 support for Accton as7312-54x platform
---
 .../sonic_platform/__init__.py                |    2 +
 .../sonic_platform/chassis.py                 |  193 +++
 .../sonic_platform/component.py               |  125 ++
 .../sonic_platform/eeprom.py                  |  102 ++
 .../sonic_platform/fan.py                     |  177 +++
 .../sonic_platform/helper.py                  |  117 ++
 .../sonic_platform/platform.py                |   21 +
 .../sonic_platform/psu.py                     |  220 +++
 .../sonic_platform/sfp.py                     | 1228 +++++++++++++++++
 .../sonic_platform/thermal.py                 |  146 ++
 .../as7312-54x/sonic_platform_setup.py        |   34 +
 .../as7312-54x/utils/accton_as7312_util.py    |   60 +-
 .../debian/rules                              |    7 +
 .../sonic-platform-accton-as7312-54x.install  |    2 +
 14 files changed, 2427 insertions(+), 7 deletions(-)
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/__init__.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/chassis.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/component.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/eeprom.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/fan.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/helper.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/platform.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/psu.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
 create mode 100644 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/thermal.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as7312-54x/sonic_platform_setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7312-54x.install

diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/__init__.py
new file mode 100644
index 000000000000..43435472a423
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+from . import platform
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/chassis.py
new file mode 100644
index 000000000000..ceece0f9db83
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/chassis.py
@@ -0,0 +1,193 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Chassis information which are available in the platform
+#
+#############################################################################
+
+import os
+
+try:
+    from sonic_platform_base.chassis_base import ChassisBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN_TRAY = 6
+NUM_FAN = 2
+NUM_PSU = 2
+NUM_THERMAL = 4
+PORT_END = 54
+NUM_COMPONENT = 4
+HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
+PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
+REBOOT_CAUSE_FILE = "reboot-cause.txt"
+PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+
+class Chassis(ChassisBase):
+    """Platform-specific Chassis class"""
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self._api_helper = APIHelper()
+        self._api_helper = APIHelper()
+        self.is_host = self._api_helper.is_host()
+        
+        self.config_data = {}
+        
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
+        self.__initialize_sfp()
+        self.__initialize_eeprom()
+    
+    def __initialize_sfp(self):
+        from sonic_platform.sfp import Sfp
+        for index in range(0, PORT_END):
+            sfp = Sfp(index)
+            self._sfp_list.append(sfp)
+        self.sfp_module_initialized = True
+        
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fant_index in range(0, NUM_FAN_TRAY):
+            for fan_index in range(0, NUM_FAN):
+                fan = Fan(fant_index, fan_index)
+                self._fan_list.append(fan)
+                
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+    
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
+        for index in range(0, NUM_THERMAL):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+    
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
+        for index in range(0, NUM_COMPONENT):
+            component = Component(index)
+            self._component_list.append(component)
+    
+    def __initialize_watchdog(self):
+        from sonic_platform.watchdog import Watchdog
+        self._watchdog = Watchdog()
+    
+    
+    def __is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+    
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+    
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.get_mac()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.get_eeprom()   
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        
+        reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
+        sw_reboot_cause = self._api_helper.read_txt_file(
+            reboot_cause_path) or "Unknown"
+
+         
+        return ('REBOOT_CAUSE_NON_HARDWARE', sw_reboot_cause)
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/component.py
new file mode 100644
index 000000000000..5300e1e73233
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/component.py
@@ -0,0 +1,125 @@
+#############################################################################
+# Celestica
+#
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
+#
+#############################################################################
+
+import shlex
+import subprocess
+
+try:
+    from sonic_platform_base.component_base import ComponentBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_ADDR_MAPPING = {
+    "CPLD1": "4-0060",
+    "CPLD2": "5-0062",
+    "CPLD3": "6-0064",
+}
+SYSFS_PATH = "/sys/bus/i2c/devices/"
+BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
+COMPONENT_LIST= [
+   ("CPLD1", "CPLD 1"),
+   ("CPLD2", "CPLD 2"),
+   ("CPLD3", "CPLD 3"),
+   ("BIOS", "Basic Input/Output System")
+   
+]
+COMPONENT_DES_LIST = ["CPLD","Basic Input/Output System"]
+
+
+class Component(ComponentBase):
+    """Platform-specific Component class"""
+
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_index=0):
+        self._api_helper=APIHelper()
+        ComponentBase.__init__(self)
+        self.index = component_index
+        self.name = self.get_name()
+
+    def __run_command(self, command):
+        # Run bash command and print output to stdout
+        try:
+            process = subprocess.Popen(
+                shlex.split(command), stdout=subprocess.PIPE)
+            while True:
+                output = process.stdout.readline()
+                if output == '' and process.poll() is not None:
+                    break
+            rc = process.poll()
+            if rc != 0:
+                return False
+        except Exception:
+            return False
+        return True
+
+    def __get_bios_version(self):
+        # Retrieves the BIOS firmware version
+        try:
+            with open(BIOS_VERSION_PATH, 'r') as fd:
+                bios_version = fd.read()
+                return bios_version.strip()
+        except Exception as e:
+            return None
+   
+    def __get_cpld_version(self):
+        # Retrieves the CPLD firmware version
+        cpld_version = dict()
+        for cpld_name in CPLD_ADDR_MAPPING:
+            try:
+                cpld_path = "{}{}{}".format(SYSFS_PATH, CPLD_ADDR_MAPPING[cpld_name], '/version')
+                cpld_version_raw= self._api_helper.read_txt_file(cpld_path)
+                cpld_version[cpld_name] = "{}".format(int(cpld_version_raw,16))
+            except Exception as e:
+                print('Get exception when read cpld')
+                cpld_version[cpld_name] = 'None'
+        
+        return cpld_version
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+         Returns:
+            A string containing the name of the component
+        """
+        return COMPONENT_LIST[self.index][0]
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+            Returns:
+            A string containing the description of the component
+        """
+        return COMPONENT_LIST[self.index][1]
+        #return "testhwsku"
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of module
+        Returns:
+            string: The firmware versions of the module
+        """
+        fw_version = None
+        if self.name == "BIOS":
+            fw_version = self.__get_bios_version()
+        elif "CPLD" in self.name:
+            cpld_version = self.__get_cpld_version()
+            fw_version = cpld_version.get(self.name)
+
+        return fw_version
+
+    def install_firmware(self, image_path):
+        """
+        Install firmware to module
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        raise NotImplementedError
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/eeprom.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..1b2f3f276c3e
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/eeprom.py
@@ -0,0 +1,102 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+    
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+               
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+
+    def get_eeprom(self):
+        return self._eeprom
+
+    def get_serial(self):
+        return self._eeprom.get('0x23', "Undefined.")
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', "Undefined.")
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/fan.py
new file mode 100644
index 000000000000..fc072941a3d3
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/fan.py
@@ -0,0 +1,177 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PSU_FAN_MAX_RPM = 26688
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/2-0066/fan"
+PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "5b"
+    },
+    1: {
+        "num": 10,
+        "addr": "58"
+    },
+}
+
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        self._api_helper=APIHelper()
+        self.fan_index = fan_index
+        self.fan_tray_index = fan_tray_index
+        self.is_psu_fan = is_psu_fan
+        if self.is_psu_fan:
+            self.psu_index = psu_index
+            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+        
+        FanBase.__init__(self)
+    
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        
+
+        if not self.is_psu_fan:
+            dir_str = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index, '_direction')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val==0:#F2B
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        else: #For PSU
+            dir_str = "{}{}".format(self.psu_hwmon_path,'psu_hwmon_path')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val=='F2B':
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST 
+                
+        return direction
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+                         
+        """
+        speed = 0
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
+            fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
+            if fan_speed_rpm is not None:
+                speed = (int(fan_speed_rpm,10))*100/26688
+                if speed > 100:
+                    speed=100
+            else:
+                return 0
+
+        elif self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            speed=self._api_helper.read_txt_file(speed_path)
+            if speed is None:
+                return 0
+                
+        return int(speed)
+            
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+
+        Note:
+            speed_pc = pwm_target/255*100
+
+            0   : when PWM mode is use
+            pwm : when pwm mode is not use
+        """
+        return False #Not supported
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return False #Not supported
+
+    def set_speed(self, speed):
+        """
+        Sets the fan speed
+        Args:
+            speed: An integer, the percentage of full fan speed to set fan to,
+                   in the range 0 (off) to 100 (full speed)
+        Returns:
+            A boolean, True if speed is set successfully, False if not
+
+        """
+        
+        if not self.is_psu_fan and self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            return self._api_helper.write_txt_file(speed_path, int(speed))
+
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return False #Not supported
+   
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        present_path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_present')
+        val=self._api_helper.read_txt_file(present_path)
+        
+        if not self.is_psu_fan:
+            if val is not None:
+                return int(val, 10)==1
+            else:
+                return False
+        else:
+            return True
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..4cd60ac90611
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/helper.py
@@ -0,0 +1,117 @@
+import os
+import struct
+import subprocess
+from mmap import *
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except IOError:
+            return False
+        return True
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/platform.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/platform.py
new file mode 100644
index 000000000000..2f2c2a447fcf
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/platform.py
@@ -0,0 +1,21 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """Platform-specific Platform class"""
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/psu.py
new file mode 100644
index 000000000000..cb715515d50e
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/psu.py
@@ -0,0 +1,220 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+#import sonic_platform
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+I2C_PATH ="/sys/bus/i2c/devices/{0}-00{1}/"
+
+PSU_NAME_LIST = ["PSU-1", "PSU-2"]
+PSU_NUM_FAN = [1, 1]
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "5b"
+    },
+    1: {
+        "num": 10,
+        "addr": "58"
+    },
+}
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "53"
+    },
+    1: {
+        "num": 10,
+        "addr": "50"
+    },
+}
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+
+    def __init__(self, psu_index=0):
+        PsuBase.__init__(self)
+        self.index = psu_index
+        self._api_helper = APIHelper()
+        
+        self.i2c_num = PSU_HWMON_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_HWMON_I2C_MAPPING[self.index]["addr"]
+        self.hwmon_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        
+        self.i2c_num = PSU_CPLD_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_CPLD_I2C_MAPPING[self.index]["addr"]
+        self.cpld_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        self.__initialize_fan()
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            self._fan_list.append(fan)
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_v_out')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        return float(vout_val)/ 1000
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        iout_path = "{}{}".format(self.hwmon_path, 'psu_i_out')        
+        val=self._api_helper.read_txt_file(iout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        pout_path = "{}{}".format(self.hwmon_path, 'psu_p_out')        
+        val=self._api_helper.read_txt_file(pout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        
+        return False  #Controlled by HW
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        
+        if self.get_status():            
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125 
+        """
+        temp_path = "{}{}".format(self.hwmon_path, 'psu_temp1_input')        
+        val=self._api_helper.read_txt_file(temp_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+    
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return False #Not supported
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_max')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_min')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """        
+        presence_path="{}{}".format(self.cpld_path, 'psu_present')
+        val=self._api_helper.read_txt_file(presence_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        power_path="{}{}".format(self.cpld_path, 'psu_power_good')
+        val=self._api_helper.read_txt_file(power_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
new file mode 100644
index 000000000000..31a61ca0ab08
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
@@ -0,0 +1,1228 @@
+#############################################################################
+# Edgecore
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+import sys
+
+from ctypes import create_string_buffer
+
+try:
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    #from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/"
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 1
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 176
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+
+# Offset for values in SFP eeprom
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
+                           
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 54
+    QSFP_PORT_START = 49
+
+    # Path to sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+        
+    PLATFORM = "x86_64-accton_as7312_54x-r0"
+    HWSKU = "Accton-AS7312-54X"
+
+    _cpld_mapping = {
+        0:  "4-0060",
+        1:  "5-0062",
+        2:  "6-0064",
+    }
+    _port_to_i2c_mapping = {
+        1:  18,
+        2:  19,
+        3:  20,
+        4:  21,
+        5:  22,
+        6:  23,
+        7:  24,
+        8:  25,
+        9:  26,
+        10: 27,
+        11: 28,
+        12: 29,
+        13: 30,
+        14: 31,
+        15: 32,
+        16: 33,
+        17: 34,
+        18: 35,
+        19: 36,
+        20: 37,
+        21: 38,
+        22: 39,
+        23: 40,
+        24: 41,
+        25: 42,
+        26: 43,
+        27: 44,
+        28: 45,
+        29: 46,
+        30: 47,
+        31: 48,
+        32: 49,
+        33: 50,
+        34: 51,
+        35: 52,
+        36: 53,
+        37: 54,
+        38: 55,
+        39: 56,
+        40: 57,
+        41: 58,
+        42: 59,
+        43: 60,
+        44: 61,
+        45: 62,
+        46: 63,
+        47: 64,
+        48: 65,
+        49: 66,  # QSFP49
+        50: 67,
+        51: 68,
+        52: 69,
+        53: 70,
+        54: 71,  # QSFP54
+    }
+
+
+    def __init__(self, sfp_index=0):
+        self._api_helper=APIHelper()
+        # Init index        
+        self.index = sfp_index
+        self.port_num = self.index + 1
+
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+        
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
+                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+                              'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+                                    'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+    
+    def __get_cpld_num(self, port_num):
+        cpld_i = 1
+        if (port_num > 24 and port_num < self.QSFP_PORT_START):
+            cpld_i = 2
+
+        if (port_num > 52):
+            cpld_i = 2
+
+        return cpld_i
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+    
+    def __write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w', buffering=0) as fd:
+                fd.write(str(value))
+        except Exception:
+            return False
+        return True
+    
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            if sys.version_info[0] >= 3:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+        except Exception:
+            pass
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        ========================================================================
+        """
+        # check present status        
+        if self.port_num < 49:
+            sfpi_obj = sff8472InterfaceId() #SFP
+        else:    
+            sfpi_obj = sff8436InterfaceId() #QSFP
+        if not self.get_presence() or not sfpi_obj:
+            return {}
+
+        if self.port_num < 49:
+            offset = SFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_SFP)
+        else:
+            offset = QSFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_QSFP)
+                
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+            sfp_interface_bulk_raw, 0)
+
+        sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+            sfp_vendor_name_raw, 0)
+
+        sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+            sfp_vendor_pn_raw, 0)
+
+        if self.port_num < 49:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_SFP)
+        else:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_QSFP)
+        
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+            sfp_vendor_rev_raw, 0)
+
+        sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+            sfp_vendor_sn_raw, 0)
+
+        sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+        if sfp_vendor_oui_raw is not None:
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_vendor_oui_raw, 0)
+
+        sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+            sfp_vendor_date_raw, 0)
+
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        compliance_code_dict = dict()
+
+        if sfp_interface_bulk_data:
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+            transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
+
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
+            'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
+        transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+            'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
+        transceiver_info_dict['cable_type'] = "Unknown"
+        transceiver_info_dict['cable_length'] = "Unknown"
+
+        if self.port_num < 49:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+            
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+        else:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+        
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+       
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49: #SFP case
+            sfpd_obj = sff8472Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']            
+            
+        else: #QSFP case
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not self.get_presence() or not sfpi_obj or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+    
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+    
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+    
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+    
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+    
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+    
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+    
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        #End of else
+        
+        
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49:
+            sfpd_obj = sff8472Dom()    
+            
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+                
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+    
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+    
+                transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data[
+                    'data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_info_dict[key])
+    
+            return transceiver_dom_threshold_info_dict
+            
+            
+        else:
+            sfpd_obj = sff8436Dom()
+    
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_threshold_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_MODULE_THRESHOLD_OFFSET, QSFP_MODULE_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+    
+            if dom_thres_raw:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(
+                    dom_thres_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['VccLowWarning']['value']
+    
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+            channel_threshold_values = sfpd_obj.parse_channel_threshold_values(
+                dom_thres_raw, 0)
+            channel_threshold_data = channel_threshold_values.get('data')
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm'] = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = channel_threshold_data['TxBiasLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_dict[key])
+    
+            return transceiver_dom_threshold_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        if self.port_num <49:
+            return False # SPF port doesn't support this feature
+          
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]        
+        reset_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_reset_', self.port_num)
+        val=self._api_helper.read_txt_file(reset_path)
+        if val is None:
+            return 0
+
+        return int(val, 10)==1
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        rx_los = False
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            rx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_rx_los_', self.port_num)
+            rx_los=self._api_helper.read_txt_file(rx_path)
+            if rx_los is None:
+                return False
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    rx_los = (sffbase().test_bit(data, 1) != 0)
+            
+        else:
+            rx_los_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_RX_LOS_STATUS_OFFSET, QSFP_CHANNL_RX_LOS_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+                rx_los = rx_los_list[0] and rx_los_list[1] and rx_los_list[2] and rx_los_list[3]
+                
+        return rx_los
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        tx_fault = False
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_fault_', self.port_num)
+            tx_fault=self._api_helper.read_txt_file(tx_path)
+            if tx_fault is None:
+                return False
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_fault = (sffbase().test_bit(data, 2) != 0)
+        else:
+            tx_fault_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_TX_FAULT_STATUS_OFFSET, QSFP_CHANNL_TX_FAULT_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                tx_fault = tx_fault_list[0] and tx_fault_list[1] and tx_fault_list[2] and tx_fault_list[3]
+
+        return tx_fault
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if self.port_num < 49: 
+            tx_disable = False
+     
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_disable_', self.port_num)
+            tx_disable=self._api_helper.read_txt_file(tx_path)
+            
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_disable_hard = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_HARD_BIT) != 0)
+            #    tx_disable_soft = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_SOFT_BIT) != 0)
+            #    tx_disable = tx_disable_hard | tx_disable_soft
+            if tx_disable is not None:
+                return tx_disable 
+            else:
+                return False
+
+        else:
+            tx_disable_list = []
+    
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX1Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX2Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX3Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX4Disable']['value'])
+    
+            return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        if self.port_num < 49: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+            return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this SFP
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        if self.port_num < 49: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set=self.get_power_set()
+            power_override = self.get_power_override()
+            return power_set and power_override
+
+    
+    def get_power_set(self):
+        
+        if self.port_num < 49: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set = False
+            
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_POWEROVERRIDE_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_set = (
+                    'On' == dom_control_data['data']['PowerSet']['value'])
+    
+            return power_set
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            power_override = False
+    
+            
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_POWEROVERRIDE_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_override = (
+                    'On' == dom_control_data['data']['PowerOverride']['value'])
+    
+            return power_override
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("temperature", "N/A")
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("voltage", "N/A")
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        
+        tx1_bs = transceiver_dom_info_dict.get("tx1bias", "N/A")
+        if self.port_num < 49:
+            return [tx1_bs, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+             
+        tx2_bs = transceiver_dom_info_dict.get("tx2bias", "N/A")
+        tx3_bs = transceiver_dom_info_dict.get("tx3bias", "N/A")
+        tx4_bs = transceiver_dom_info_dict.get("tx4bias", "N/A")
+        return [tx1_bs, tx2_bs, tx3_bs, tx4_bs] if transceiver_dom_info_dict else []
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        
+        rx1_pw = transceiver_dom_info_dict.get("rx1power", "N/A")
+        if self.port_num < 49:
+            return [rx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        rx2_pw = transceiver_dom_info_dict.get("rx2power", "N/A")
+        rx3_pw = transceiver_dom_info_dict.get("rx3power", "N/A")
+        rx4_pw = transceiver_dom_info_dict.get("rx4power", "N/A")
+        return [rx1_pw, rx2_pw, rx3_pw, rx4_pw] if transceiver_dom_info_dict else []
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        tx1_pw = transceiver_dom_info_dict.get("tx1power", "N/A")
+        if self.port_num < 49:
+             return [tx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        tx2_pw = transceiver_dom_info_dict.get("tx2power", "N/A")
+        tx3_pw = transceiver_dom_info_dict.get("tx3power", "N/A")
+        tx4_pw = transceiver_dom_info_dict.get("tx4power", "N/A")
+        return [tx1_pw, tx2_pw, tx3_pw, tx4_pw]
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default srate.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if self.port_num <49:
+            return False # SFP doesn't support this feature
+         
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]        
+        reset_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_reset_', self.port_num)      
+        ret = self.__write_txt_file(reset_path, 1)
+        if ret is not True:
+            return ret
+
+        time.sleep(0.01)
+        ret = self.__write_txt_file(reset_path, 0)
+        time.sleep(0.2)
+        
+        return ret
+        
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_disable_', self.port_num)      
+            ret = self.__write_txt_file(tx_path,  1 if tx_disable else 0)
+            time.sleep(0.01)
+            return ret
+                      
+        else:
+            if not self.get_presence():
+                return False
+            sysfsfile_eeprom = None
+            try:
+                tx_disable_ctl = 0xf if tx_disable else 0x0
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = tx_disable_ctl
+                else:
+                    buffer[0] = chr(tx_disable_ctl)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ',str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        return True
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+
+            sysfsfile_eeprom = None
+            try:
+                channel_state = self.get_tx_disable_channel()
+
+                for i in range(4):
+                    channel_mask = (1 << i)
+                    if not (channel & channel_mask):
+                        continue
+
+                    if disable:
+                        channel_state |= channel_mask
+                    else:
+                        channel_state &= ~channel_mask
+
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = channel_state
+                else:
+                    buffer[0] = chr(channel_state)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+            return True
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if lpmode is True:
+                self.set_power_override(True, True)
+            else:
+                self.set_power_override(False, False)
+    
+            return True
+       
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+            try:
+                power_override_bit = (1 << 0) if power_override else 0
+                power_set_bit      = (1 << 1) if power_set else (1 << 3)
+    
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = (power_override_bit | power_set_bit)
+                else:
+                    buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                with open(self.port_to_eeprom_mapping[self.port_num], "r+b") as fd:
+                    fd.seek(QSFP_POWEROVERRIDE_OFFSET)
+                    fd.write(buffer[0])
+                    time.sleep(0.01)
+            except Exception:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(
+            self.__get_path_to_port_config_file())
+        name = sfputil_helper.logical[self.index] or "Unknown"
+        return name
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]          
+        present_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_present_', self.port_num)
+        val=self._api_helper.read_txt_file(present_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:
+            return False
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("model", "N/A")
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and self.get_transceiver_bulk_status()
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/thermal.py
new file mode 100644
index 000000000000..aeab2caa23db
--- /dev/null
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/thermal.py
@@ -0,0 +1,146 @@
+#############################################################################
+# Edgecore
+#
+# Thermal contains an implementation of SONiC Platform Base API and
+# provides the thermal device status which are available in the platform
+#
+#############################################################################
+
+import os
+import os.path
+import glob
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    THERMAL_NAME_LIST = []
+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.index = thermal_index
+        # Add thermal name
+        self.THERMAL_NAME_LIST.append("Temp sensor 1")
+        self.THERMAL_NAME_LIST.append("Temp sensor 2")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")
+        self.THERMAL_NAME_LIST.append("Temp sensor 4")
+
+        # Set hwmon path
+        i2c_path = {
+            0: "3-0048/hwmon/hwmon*/", 
+            1: "3-0049/hwmon/hwmon*/", 
+            2: "3-004a/hwmon/hwmon*/",
+            3: "3-004b/hwmon/hwmon*/",
+        }.get(self.index, None)
+          
+        self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
+        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self.ss_index = 1
+
+    def __read_txt_file(self, file_path):
+        for filename in glob.glob(file_path):
+            try:
+                with open(filename, 'r') as fd:
+                    data =fd.readline().rstrip()
+                    return data
+            except IOError as e:
+                pass
+
+        return None
+        
+    def __get_temp(self, temp_file):
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_temp = self.__read_txt_file(temp_file_path)
+        if raw_temp is not None:
+            return float(raw_temp)/1000
+        else:
+            return 0 
+        
+
+    def __set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        for filename in glob.glob(temp_file_path):
+            try:
+                with open(filename, 'w') as fd:
+                    fd.write(str(temperature))
+                return True
+            except IOError as e:
+                print("IOError")
+
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+        Args :
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        temperature = temperature *1000
+        self.__set_threshold(temp_file, temperature)
+        
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal device
+            Returns:
+            string: The name of the thermal device
+        """
+        return self.THERMAL_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Thermal
+        Returns:
+            bool: True if Thermal is present, False if not
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_txt = self.__read_txt_file(temp_file_path)
+        if raw_txt is not None:
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+
+        file_str = "temp{}_input".format(self.ss_index)
+        file_path = os.path.join(self.hwmon_path, file_str)
+        raw_txt = self.__read_txt_file(file_path)
+        if raw_txt is None:
+            return False
+        else:     
+            return int(raw_txt) != 0
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/sonic_platform_setup.py
new file mode 100755
index 000000000000..672fe89cef6c
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/sonic_platform_setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+DEVICE_NAME = 'accton'
+HW_SKU = 'x86_64-accton_as7312_54x-r0'  
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Accton Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='Jostar Yang',
+    maintainer_email='jostar_yang@edge-core.com',
+    packages=[
+        'sonic_platform',
+    ],
+    package_dir={
+        'sonic_platform': '../../../../device/{}/{}/sonic_platform'.format(DEVICE_NAME, HW_SKU)},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
index b4516c07fae7..e2f058b4e37a 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_util.py
@@ -35,7 +35,7 @@
 import logging
 import re
 import time
-
+import os
 
 PROJECT_NAME = 'as7312_54x'
 version = '0.1.0'
@@ -90,6 +90,10 @@ def main():
             do_install()
         elif arg == 'clean':
             do_uninstall()
+        elif arg == 'api':
+           do_sonic_platform_install()
+        elif arg == 'api_clean':   
+           do_sonic_platform_clean()
         elif arg == 'show':
             device_traversal()
         elif arg == 'sff':
@@ -358,6 +362,43 @@ def system_ready():
         return False
     return True
 
+PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
+PLATFORM_API2_WHL_FILE_PY3 ='sonic_platform-1.0-py3-none-any.whl'
+def do_sonic_platform_install():
+    device_path = "{}{}{}{}".format(PLATFORM_ROOT_PATH, '/x86_64-accton_', PROJECT_NAME, '-r0')
+    SONIC_PLATFORM_BSP_WHL_PKG_PY3 = "/".join([device_path, PLATFORM_API2_WHL_FILE_PY3])
+        
+    #Check API2.0 on py whl file
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3): 
+            status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
+            if status:
+                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                return status
+            else:
+                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+        else:
+            print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
+    else:        
+        print('{} has installed'.format(PLATFORM_API2_WHL_FILE_PY3))
+     
+    return 
+     
+def do_sonic_platform_clean():
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)   
+    if status:
+        print('{} does not install, not need to uninstall'.format(PLATFORM_API2_WHL_FILE_PY3))
+        
+    else:        
+        status, output = log_os_system("pip3 uninstall sonic-platform -y", 0)
+        if status:
+            print('Error: Failed to uninstall {}'.format(PLATFORM_API2_WHL_FILE_PY3))
+            return status
+        else:
+            print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
+            
+    return
 
 def do_install():
     print 'Checking system....'
@@ -377,6 +418,8 @@ def do_install():
                 return status
     else:
         print PROJECT_NAME.upper() + ' devices detected....'
+    do_sonic_platform_install()
+     
     return
 
 
@@ -397,6 +440,9 @@ def do_uninstall():
         status = driver_uninstall()
         if status and FORCE == 0:
             return status
+            
+    do_sonic_platform_clean()
+            
     return None
 
 
@@ -460,8 +506,8 @@ def devices_info():
 
 def show_eeprom(index):
     if system_ready() is False:
-        print "System's not ready."
-        print 'Please install first!'
+        print('Systems not ready.')
+        print('Please install first!')
         return
 
     if len(ALL_DEVICE) == 0:
@@ -488,7 +534,7 @@ def show_eeprom(index):
     if ret == 0:
         print log
     else:
-        print '**********device no found**********'
+        print( '**********device no found**********')
     return
 
 
@@ -496,8 +542,8 @@ def set_device(args):
     global DEVICE_NO
     global ALL_DEVICE
     if system_ready() is False:
-        print "System's not ready."
-        print 'Please install first!'
+        print('System is not ready.')
+        print('Please install first!')
         return
 
     if not ALL_DEVICE:
@@ -565,7 +611,7 @@ def get_value(i):
 
 def device_traversal():
     if system_ready() is False:
-        print "System's not ready."
+        print "System is  not ready."
         print 'Please install first!'
         return
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/rules b/platform/broadcom/sonic-platform-modules-accton/debian/rules
index 722d4126ad0e..e894b10f8234 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/rules
@@ -14,6 +14,7 @@ include /usr/share/dpkg/pkg-info.mk
 export INSTALL_MOD_DIR:=extra
 
 PYTHON         ?= python2
+PYTHON3         ?= python3
 
 PACKAGE_PRE_NAME := sonic-platform-accton
 KVERSION   ?= $(shell uname -r)
@@ -40,6 +41,12 @@ build:
 	(for mod in $(MODULE_DIRS); do \
 		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
 		$(PYTHON) $${mod}/setup.py build; \
+		cd $(MOD_SRC_DIR)/$${mod}; \
+		if [ -f sonic_platform_setup.py ]; then \
+			$(PYTHON3) sonic_platform_setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
+			echo "Finished makig whl package for $$mod"; \
+		fi; \
+		cd $(MOD_SRC_DIR); \
 	done)
 
 binary: binary-arch binary-indep
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7312-54x.install b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7312-54x.install
new file mode 100644
index 000000000000..c0e14a1f6b1b
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7312-54x.install
@@ -0,0 +1,2 @@
+as7312-54x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-accton_as7312_54x-r0
+

From becd143a41e0fbb5deb123d656325235f54b2516 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 10 Feb 2021 02:26:31 -0800
Subject: [PATCH 0167/1674] [syncd-rpc] Install Libboost Atomic 1.71, Libqtcore
 And Libqtnetwork (#6689)

When Building syncd-rpc, libthrift has dependency on libboost-atomic1.71.0,
however the debian packager install version 1.67 instead. This PR
preinstalls libboost-atomic v 1.71 to avoid falling back to v 1.67.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 .../docker-syncd-bfn-rpc/Dockerfile.j2        | 19 ++++++++-------
 .../docker-syncd-brcm-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-cavm-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-centec-rpc/Dockerfile.j2     | 18 +++++++++------
 .../docker-syncd-centec-rpc/Dockerfile.j2     | 18 +++++++++------
 .../docker-syncd-invm-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-mrvl-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-mrvl-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-mrvl-rpc/Dockerfile.j2       | 16 ++++++++-----
 .../docker-syncd-mlnx-rpc/Dockerfile.j2       | 23 +++++++++++++------
 .../docker-syncd-nephos-rpc/Dockerfile.j2     | 16 ++++++++-----
 11 files changed, 119 insertions(+), 71 deletions(-)

diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
index cf89b26b65e5..5e5f5f166e5e 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
+++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,8 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
-    libpython3.4        \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -50,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
index ada6113ddf43..b832fd58864f 100644
--- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_brcm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_brcm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2
index 3c49748ae8ae..e9e9facef5ee 100644
--- a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2
+++ b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_cavm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_cavm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
index 057d93efb6bb..bec9c7f4426b 100755
--- a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -49,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
index 057d93efb6bb..bec9c7f4426b 100644
--- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -49,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 b/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
index 3a25afbe6161..eea52e3398b8 100755
--- a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
+++ b/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN dpkg -P syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_invm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -29,7 +24,16 @@ RUN apt-get update \
     libjansson4         \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_invm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2
index 6b9e3d8aaafc..118be5e1c5f2 100644
--- a/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2
+++ b/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2
index 6b9e3d8aaafc..118be5e1c5f2 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2
+++ b/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2
index 6b9e3d8aaafc..118be5e1c5f2 100644
--- a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2
+++ b/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
index b9aaa78118e0..b48d4ac3c793 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -11,17 +11,11 @@ RUN apt-get purge -y syncd
 {% if docker_syncd_mlnx_rpc_debs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_syncd_mlnx_rpc_debs.split(' '), "/debs/") }}
-
-# Install locally-built Debian packages and implicitly install their dependencies
-{{ install_debian_packages(docker_syncd_mlnx_rpc_debs.split(' ')) }}
 {% endif %}
 
 {% if docker_syncd_mlnx_rpc_pydebs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("python-debs/", docker_syncd_mlnx_rpc_pydebs.split(' '), "/debs/") }}
-
-# Install locally-built Debian packages and implicitly install their dependencies
-{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
 {% endif %}
 
 ## Pre-install the fundamental packages
@@ -36,7 +30,22 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+{% if docker_syncd_mlnx_rpc_debs.strip() -%}
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_syncd_mlnx_rpc_debs.split(' ')) }}
+{% endif %}
+
+{% if docker_syncd_mlnx_rpc_pydebs.strip() -%}
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
+{% endif %}
+
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
diff --git a/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2 b/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2
index 95703448c371..6c63efb69bb6 100644
--- a/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2
+++ b/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_nephos_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_nephos_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

From dc2ea28b1c4e745837fc4477561cda69c9cf211f Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 10 Feb 2021 06:12:49 -0800
Subject: [PATCH 0168/1674] [sonic-platform-common] Update submodule (#6742)

Submodule commits included:

* src/sonic-platform-common 6ad0004...bd4dc03 (1):
  > [sonic_sfp/qsfp_dd.py] Update DOM capability method name to align with other drivers (#163)

Also align all calling function names to match.
---
 device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py | 2 +-
 .../services/platform_api/sonic_platform/sfp.py                 | 2 +-
 platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py       | 2 +-
 src/sonic-platform-common                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
index 31a61ca0ab08..b5e38017bc90 100644
--- a/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
+++ b/device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py
@@ -506,7 +506,7 @@ def get_transceiver_bulk_status(self):
             qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
                 (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
             else:
                 return None
diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
index 5906050fa139..07eac37d8d82 100644
--- a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/sfp.py
@@ -407,7 +407,7 @@ def _dom_capability_detect(self):
             if qsfp_dom_capability_raw is not None:
                 self.dom_temp_supported = True
                 self.dom_volt_supported = True
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(
+                dom_capability = sfpi_obj.parse_dom_capability(
                     qsfp_dom_capability_raw, 0)
                 if dom_capability['data']['Flat_MEM']['value'] == 'Off':
                     self.dom_supported = True
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 75ae9c8907e1..39ced89fcd59 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -482,7 +482,7 @@ def _dom_capability_detect(self):
             if qsfp_dom_capability_raw is not None:
                 self.dom_temp_supported = True
                 self.dom_volt_supported = True
-                dom_capability = sfpi_obj.parse_qsfp_dom_capability(qsfp_dom_capability_raw, 0)
+                dom_capability = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
                 if dom_capability['data']['Flat_MEM']['value'] == 'Off':
                     self.dom_supported = True
                     self.second_application_list = True
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 6ad0004c29a1..bd4dc03d3d63 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 6ad0004c29a143a0635ad7f3c81ce652313569cb
+Subproject commit bd4dc03d3d63075331ae4de8f35f35d7054d260f

From 9f577512f8a3d665880588ac689820e6447c0419 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:13:24 +0000
Subject: [PATCH 0169/1674] Dell S6100: Watchdog - Fix Python3 incompatibility
 (#6734)

To make watchdog.arm() method python3 compatible in DellEMC S6100.
---
 .../s6100/sonic_platform/watchdog.py                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
index c6d5e6e2e9df..0e5e102b7b52 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
@@ -151,9 +151,9 @@ def arm(self, seconds):
         if self.is_armed():
             gpio_val = self._read_gpio_file(gpio)
             high_val = gpio_val | (1 << 15)
-            if self._write_gpio_file(gpio, hex(high_val)) != -1:
+            if self._write_gpio_file(gpio, hex(high_val).encode('utf-8')) != -1:
                 low_val = high_val & 0xFFFF7FFF
-                if self._write_gpio_file(gpio, hex(low_val)) != -1:
+                if self._write_gpio_file(gpio, hex(low_val).encode('utf-8')) != -1:
                     self.armed_time = self._get_time()
                     self.timeout = seconds
                     return seconds

From b92dfb15cbb97fa0cdb9393e6cc8d912467f1aea Mon Sep 17 00:00:00 2001
From: Blueve <672454911@qq.com>
Date: Wed, 10 Feb 2021 22:15:13 +0800
Subject: [PATCH 0170/1674] [Celestica][haliburton][cp210x] modprobe cp210x to
 ensure the driver loaded properly (#6715)

This PR is to fix issue: #6603
The CP210x driver not attached properly after first login (cold-plug), lsusb and dmesg shown that the usb devices has been recognized but driver is missing.
---
 .../debian/platform-modules-haliburton.init                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
index 1dc0ea5cfeeb..80964d5338af 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
@@ -18,6 +18,7 @@ start)
         modprobe smc
         modprobe hlx_gpio_ich
         modprobe dps200
+        modprobe cp210x
 
         found=0
         for devnum in 0 1; do

From 5df3154cb73d3f80d7e770c7ce0a1fc70c26763a Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Thu, 11 Feb 2021 01:20:30 +0200
Subject: [PATCH 0171/1674] [submodule] update sonic-sairedis (#6747)

Includes below commits:
13474d1 2021-02-08 [sairedis][syncd] VidManager add updateIndex method (Azure#787)
be8059f 2021-02-08 [sairedis] Add get response timeout knob (Azure#774)
3663e30 2021-02-06 [syncd] Create base class SaiSwitchInterface (Azure#786)
3360b0f 2021-02-05 Reduce log level of redis channel to debug (Azure#790)
08d338a 2021-02-05 syncd: Fix profile iterator bug (Azure#789)
a6377d0 2021-02-03 [ci]: use publish pipeline artifacts to publish syslog (Azure#788)

Signed-off-by: liora <liora@nvidia.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index b39e74610ad7..13474d17435d 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit b39e74610ad7a842618a025fdadbdc52d530483a
+Subproject commit 13474d17435d3876e7bd6b50133d25bb11dd3c54

From b8abcb4a6d31d45d444e97b79edfadd2244bcb2b Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Thu, 11 Feb 2021 04:32:22 +0200
Subject: [PATCH 0172/1674] [barefoot][device][plugins] Fix sfp reset (#6745)

Fix sfp reset in Barefoot's sfputil

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../barefoot/x86_64-accton_wedge100bf_32x-r0/plugins/sfputil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/plugins/sfputil.py b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/plugins/sfputil.py
index 47d875432cc5..41d75501f491 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/plugins/sfputil.py
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/plugins/sfputil.py
@@ -160,7 +160,7 @@ def reset(self, port_num):
         status = pltfm_mgr.pltfm_mgr_qsfp_reset(port_num, True)
         status = pltfm_mgr.pltfm_mgr_qsfp_reset(port_num, False)
         self.thrift_teardown()
-        return status
+        return (status == 0)
 
     def check_transceiver_change(self):
         if not self.ready:

From 5a3832cf4fbb326280cc97d3da61fc46005e40a8 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 10 Feb 2021 23:06:53 -0800
Subject: [PATCH 0173/1674] [sonic-platform-common] Update submodule (#6762)

* src/sonic-platform-common bd4dc03...513920c (1):
  > [sffbase] Make convert_hex_to_string() compatible with both Python 2 and Python 3 (#165)
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index bd4dc03d3d63..513920ceb241 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit bd4dc03d3d63075331ae4de8f35f35d7054d260f
+Subproject commit 513920ceb2419873a1e27969b428af95c2e9e60f

From 44e2734cc4d7616f4c87bc070e48a90519dd4010 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 10 Feb 2021 23:07:22 -0800
Subject: [PATCH 0174/1674] [linux-kernel]: correct kernel package name for
 armhf (#6751)

armhf kernel package name does not have `unsigned` string

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 rules/linux-kernel.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
index 44107c4c7743..2d369361a9e5 100644
--- a/rules/linux-kernel.mk
+++ b/rules/linux-kernel.mk
@@ -18,5 +18,9 @@ SONIC_MAKE_DEBS += $(LINUX_HEADERS_COMMON)
 LINUX_HEADERS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_HEADERS)))
 
-LINUX_KERNEL = linux-image-$(KVERSION)-unsigned_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
+ifeq ($(CONFIGURED_ARCH), armhf)
+	LINUX_KERNEL = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
+else
+	LINUX_KERNEL = linux-image-$(KVERSION)-unsigned_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
+endif
 $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_KERNEL)))

From a2e593fe3f3609d259ee324283c13feea825e1af Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 10 Feb 2021 23:25:05 -0800
Subject: [PATCH 0175/1674] [slave.mk] Remove PYTHON_CLICK target (#6763)

We stopped building our own custom python-click package via #5549. This target should have been removed at that time but was missed.
---
 slave.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/slave.mk b/slave.mk
index efe26a85f1a2..86bf063b31cd 100644
--- a/slave.mk
+++ b/slave.mk
@@ -842,7 +842,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) \
                 $(LINUX_KERNEL) \
                 $(SONIC_DEVICE_DATA) \
-                $(PYTHON_CLICK) \
                 $(IFUPDOWN2) \
                 $(KDUMP_TOOLS) \
                 $(NTP) \

From 8aa5fbbe794476b42eb0aa733fb8a17b7c476cbc Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Thu, 11 Feb 2021 02:31:56 -0800
Subject: [PATCH 0176/1674] [broadcom]: Upgrading bcmsai from 4.3.0.10-5 to
 4.3.0.13 (#6767)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merged bcmsai 4.3.0.13 code to top of master bcmsai 4.3.0.10-5.

- How to verify it
Ran nightly regression on T0 and T1 topology using bcmsai 4.3.0.13. Test results are better than previous runs.
For T0 -
New test passing - CRM, Decap, FDB, platform test, VxLAN
New test failing – PFC unknown MAC
For T1 –
New test passing – Port Channel
New test failing – platform test
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index e36319619b0c..fa27c92236ed 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.10-5_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-5_amd64.deb?sv=2019-12-12&st=2021-02-08T00%3A20%3A49Z&se=2030-02-09T00%3A20%3A00Z&sr=b&sp=r&sig=rEpcTHNsSr10rKhpr6Cx3EFNa2dRE7VLP7ybZijQKpE%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-5_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.13_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13_amd64.deb?sv=2019-12-12&st=2021-02-11T06%3A07%3A09Z&se=2030-02-12T06%3A07%3A00Z&sr=b&sp=r&sig=IlCyw1BGN0Ei56tPPeXJSucFSFj8SSqUGLB2A%2BRZ1w0%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.13_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10-5_amd64.deb?sv=2019-12-12&st=2021-02-08T00%3A21%3A42Z&se=2030-02-09T00%3A21%3A00Z&sr=b&sp=r&sig=gvDnVYkQe%2FA2Yqw9p404Vtmx%2Fo8NwJMFoCn7K4W1k0M%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13_amd64.deb?sv=2019-12-12&st=2021-02-11T06%3A08%3A31Z&se=2030-02-12T06%3A08%3A00Z&sr=b&sp=r&sig=G5mYUa8gCnDNpuadvHEuH%2B4q2MuY0JYspPLt2gaC2NY%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 80b048d4d1a36efa6c698705fa1af8edddc65295 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Thu, 11 Feb 2021 12:53:36 +0200
Subject: [PATCH 0177/1674] [systemd] Increase syncd startup script timeout to
 support FW upgrade on init. (#6709)

**- Why I did it**
To support FW upgrade on init.

**- How I did it**
Change timeout value

**- How to verify it**
I manually changed ASIC and Gearbox FW followed by hard reset in order for FW upgrade to take place on init.

Signed-off-by: liora <liora@nvidia.com>
---
 files/build_templates/per_namespace/syncd.service.j2 | 2 +-
 files/scripts/syncd.sh                               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/build_templates/per_namespace/syncd.service.j2 b/files/build_templates/per_namespace/syncd.service.j2
index 0c9bf073e940..8e0029a29421 100644
--- a/files/build_templates/per_namespace/syncd.service.j2
+++ b/files/build_templates/per_namespace/syncd.service.j2
@@ -26,7 +26,7 @@ ExecStartPre=/usr/local/bin/syncd.sh start{% if multi_instance == 'true' %} %i{%
 ExecStart=/usr/local/bin/syncd.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/local/bin/syncd.sh stop{% if multi_instance == 'true' %} %i{% endif %}
 {% if sonic_asic_platform == 'mellanox' %}
-TimeoutStartSec=150
+TimeoutStartSec=480
 {% endif %}
 
 [Install]
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index 22fa992b8e80..95c3e3841ba8 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -21,9 +21,11 @@ function startplatform() {
             fi
         fi
 
+        debug "Starting Firmware update procedure"
         /usr/bin/mst start --with_i2cdev
         /usr/bin/mlnx-fw-upgrade.sh
         /etc/init.d/sxdkernel start
+        debug "Firmware update procedure ended"
     fi
 
     if [[ x"$WARM_BOOT" != x"true" ]]; then

From 814cf03f988e9fbd4507d9cd72980a2723f6c92e Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:52:37 +0200
Subject: [PATCH 0178/1674] [platform][barefoot] Fix sonic_platform for
 x86_64-accton_wedge100bf_65x-r0 (#6612)

platform modules' deb package rules for x86_64-accton_wedge100bf_65x-r0 was missing the code that installs the sonic_platform wheel package file under device directory on host (which is checked by pmon deamon on start)
---
 platform/barefoot/sonic-platform-modules-bfn/debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/rules b/platform/barefoot/sonic-platform-modules-bfn/debian/rules
index 37e264ad7ed8..0ee3dcfaf0e2 100755
--- a/platform/barefoot/sonic-platform-modules-bfn/debian/rules
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+PLATFORM_NAME := x86_64-accton_wedge100bf_65x-r0
 PACKAGE_NAME := sonic-platform-modules-bfn
 SCRIPT_SRC := $(shell pwd)/scripts
 CONFIGS_SRC := $(shell pwd)/configs
@@ -20,6 +21,8 @@ override_dh_auto_install:
 	cp -r $(SCRIPT_SRC)/* debian/$(PACKAGE_NAME)/usr/local/bin
 	dh_installdirs -p$(PACKAGE_NAME) etc/network/interfaces.d/
 	cp -r $(CONFIGS_SRC)/network/interfaces.d/* debian/$(PACKAGE_NAME)/etc/network/interfaces.d/
+	dh_installdirs -p$(PACKAGE_NAME) usr/share/sonic/device/$(PLATFORM_NAME)/
+	cp -r $(WHEEL_BUILD_DIR)/*  debian/$(PACKAGE_NAME)/usr/share/sonic/device/$(PLATFORM_NAME)/
 
 override_dh_usrlocal:
 

From fce7f8a24f0299379d6cf372e62596e705ba1988 Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:17:00 -0500
Subject: [PATCH 0179/1674] [Platform][ixs7215]: Platform API test required
 files with Updates and Improvements  (#6738)

- Why I did it
Enable platform API tests to run successfully by providing required test infrastructure files along with supporting changes.

- How I did it
Added platform.json along with supporting changes.
- Addition of pcie.yaml supporting pcied
- Addition of Real fan drawer support vs Virtual
- Removal of python2 wheel with support in place for python3
- supporting changes platform api tests
---
 .../armhf-nokia_ixs7215_52x-r0/platform.json  | 226 ++++++++++++++++++
 .../plugins/pcie.yaml                         |  20 ++
 .../7215/scripts/nokia-7215init.sh            |   4 +
 .../7215/sonic_platform/chassis.py            |  45 ++--
 .../7215/sonic_platform/fan.py                |  49 +++-
 .../7215/sonic_platform/fan_drawer.py         |  68 +++++-
 .../7215/sonic_platform/psu.py                |  61 +++--
 .../7215/sonic_platform/sfp.py                | 127 ++++++----
 .../7215/sonic_platform/test/test-chassis.py  |   2 -
 .../7215/sonic_platform/test/test-psu.py      |   4 +-
 .../7215/sonic_platform/test/test-sfp.py      |  10 +-
 .../7215/sonic_platform/test/test-thermal.py  |   3 +-
 .../7215/sonic_platform/thermal.py            |  19 +-
 .../7215/sonic_platform/watchdog.py           |   2 +-
 .../sonic-platform-nokia/debian/rules         |   4 +-
 .../debian/sonic-platform-nokia-7215.install  |   1 -
 16 files changed, 522 insertions(+), 123 deletions(-)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
new file mode 100644
index 000000000000..d6a28d19b026
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
@@ -0,0 +1,226 @@
+{
+    "chassis": {
+        "name": "7215 IXS-T1",
+        "components": [
+            {
+                "name": "System-CPLD"
+            },
+            {
+                "name": "U-Boot"
+            }
+        ],
+        "fans": [
+            {
+                "name": "Fan1"
+            },
+            {
+                "name": "Fan2"
+            }
+        ],   
+	"fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "Fan1"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "Fan2"
+                    }
+                ]
+            }
+        ],
+	"psus": [
+            {
+                "name": "PSU1"
+            },
+            {
+                "name": "PSU2"
+            }
+        ],
+        "thermals": [
+            {
+                "name": "PCB PHY"
+            },
+            {
+                "name": "PCB MAC"
+            },
+            {
+                "name": "ADT7473-CPU"
+            },
+            {
+                "name": "ADT7473-LOC"
+            },
+            {
+                "name": "ADT7473-MAC"
+            },
+            {
+                "name": "CPU Core"
+            }
+        ],
+	"sfps": [
+            {
+                "name": "Ethernet0"
+            },
+	    {
+                "name": "Ethernet1"
+            },
+	    {
+                "name": "Ethernet2"
+            },
+	    {
+                "name": "Ethernet3"
+            },
+	    {
+                "name": "Ethernet4"
+            },
+	    {
+                "name": "Ethernet5"
+            },
+	    {
+                "name": "Ethernet6"
+            },
+	    {
+                "name": "Ethernet7"
+            },
+	    {
+                "name": "Ethernet8"
+            },
+	    {
+                "name": "Ethernet9"
+            },
+	    {
+                "name": "Ethernet10"
+            },
+	    {
+                "name": "Ethernet11"
+            },
+	    {
+                "name": "Ethernet12"
+            },
+	    {
+                "name": "Ethernet13"
+            },
+	    {
+                "name": "Ethernet14"
+            },
+	    {
+                "name": "Ethernet15"
+            },
+	    {
+                "name": "Ethernet16"
+            },
+	    {
+                "name": "Ethernet17"
+            },
+	    {
+                "name": "Ethernet18"
+            },
+	    {
+                "name": "Ethernet19"
+            },
+	    {
+                "name": "Ethernet20"
+            },
+	    {
+                "name": "Ethernet21"
+            },
+	    {
+                "name": "Ethernet22"
+            },
+	    {
+                "name": "Ethernet23"
+            },
+	    {
+                "name": "Ethernet24"
+            },
+	    {
+                "name": "Ethernet25"
+            },
+	    {
+                "name": "Ethernet26"
+            },
+	    {
+                "name": "Ethernet27"
+            },
+	    {
+                "name": "Ethernet28"
+            },
+	    {
+                "name": "Ethernet29"
+            },
+	    {
+                "name": "Ethernet30"
+            },
+	    {
+                "name": "Ethernet31"
+            },
+	    {
+                "name": "Ethernet32"
+            },
+	    {
+                "name": "Ethernet33"
+            },
+	    {
+                "name": "Ethernet34"
+            },
+	    {
+                "name": "Ethernet35"
+            },
+	    {
+                "name": "Ethernet36"
+            },
+	    {
+                "name": "Ethernet37"
+            },
+	    {
+                "name": "Ethernet38"
+            },
+	    {
+                "name": "Ethernet39"
+            },
+	    {
+                "name": "Ethernet40"
+            },
+	    {
+                "name": "Ethernet41"
+            },
+	    {
+                "name": "Ethernet42"
+            },
+	    {
+                "name": "Ethernet43"
+            },
+	    {
+                "name": "Ethernet44"
+            },
+	    {
+                "name": "Ethernet45"
+            },
+	    {
+                "name": "Ethernet46"
+            },
+	    {
+                "name": "Ethernet47"
+            },
+	    {
+                "name": "Ethernet48"
+            },
+	    {
+                "name": "Ethernet49"
+            },
+	    {
+                "name": "Ethernet50"
+            },
+	    {
+                "name": "Ethernet51"
+            }
+       	]	    	
+    },
+    "interfaces": {}
+}
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml b/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml
new file mode 100644
index 000000000000..f24086a2228b
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml
@@ -0,0 +1,20 @@
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: '6820'
+  name: 'PCI bridge: Marvell Technology Group Ltd. Device 6820 (rev 0a)'
+- bus: '00'
+  dev: '02'
+  fn: '0'
+  id: '6820'
+  name: 'PCI bridge: Marvell Technology Group Ltd. Device 6820 (rev 0a)'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: c804
+  name: 'Ethernet controller: Marvell Technology Group Ltd. Device c804'
+- bus: '02'
+  dev: '00'
+  fn: '0'
+  id: c804
+  name: 'Ethernet controller: Marvell Technology Group Ltd. Device c804'
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
index 43cd86d59bd0..4cad43348e06 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
@@ -51,6 +51,10 @@ chmod 644 /sys/class/i2c-adapter/i2c-0/0-0053/eeprom
 echo eeprom 0x55 > /sys/class/i2c-adapter/i2c-0/new_device
 echo eeprom 0x56 > /sys/class/i2c-adapter/i2c-0/new_device
 
+# Enumerate psu eeprom devices
+echo eeprom 0x51 > /sys/class/i2c-adapter/i2c-1/new_device
+echo eeprom 0x52 > /sys/class/i2c-adapter/i2c-1/new_device
+
 # Enable optical SFP Tx
 i2cset -y -m 0x0f 0 0x41 0x5 0x00
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
index 7597492cc003..b3ada4c71f9c 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
@@ -13,7 +13,7 @@
     from sonic_platform.sfp import Sfp
     from sonic_platform.eeprom import Eeprom
     from sonic_platform.fan import Fan
-    from .fan_drawer import VirtualDrawer
+    from .fan_drawer import RealDrawer
     from sonic_platform.psu import Psu
     from sonic_platform.thermal import Thermal
     from sonic_platform.component import Component
@@ -35,8 +35,8 @@
 PORT_END = 52
 
 # Device counts
-MAX_7215_FAN_DRAWER = 1
-MAX_7215_FAN = 2
+MAX_7215_FAN_DRAWERS = 2
+MAX_7215_FANS_PER_DRAWER = 1
 MAX_7215_PSU = 2
 MAX_7215_THERMAL = 6
 
@@ -89,9 +89,9 @@ def __init__(self):
         self._eeprom = Eeprom()
 
         # Construct lists fans, power supplies, thermals & components
-        drawer_num = MAX_7215_FAN_DRAWER
-        fan_num_per_drawer = MAX_7215_FAN
-        drawer_ctor = VirtualDrawer
+        drawer_num = MAX_7215_FAN_DRAWERS
+        fan_num_per_drawer = MAX_7215_FANS_PER_DRAWER
+        drawer_ctor = RealDrawer
         fan_index = 0
         for drawer_index in range(drawer_num):
             drawer = drawer_ctor(drawer_index)
@@ -159,14 +159,6 @@ def get_model(self):
         """
         return self._eeprom.part_number_str()
 
-    def get_serial(self):
-        """
-        Retrieves the serial number of the chassis (Service tag)
-        Returns:
-            string: Serial number of chassis
-        """
-        return self._eeprom.serial_str()
-
     def get_status(self):
         """
         Retrieves the operational status of the chassis
@@ -186,7 +178,7 @@ def get_base_mac(self):
         """
         return self._eeprom.base_mac_addr()
 
-    def get_serial_number(self):
+    def get_serial(self):
         """
         Retrieves the hardware serial number for the chassis
 
@@ -307,7 +299,7 @@ def set_status_led(self, color):
 
         # Write sys led
         if smbus_present == 0:
-            sonic_logger.log_info("PMON LED SET ERROR-> smbus present = 0")
+            sonic_logger.log_warning("PMON LED SET -> smbus present = 0")
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
@@ -328,7 +320,7 @@ def get_status_led(self):
         """
         # Read sys led
         if smbus_present == 0:
-            sonic_logger.log_info("PMON LED GET ERROR-> smbus present = 0")
+            sonic_logger.log_warning("PMON LED GET -> smbus present = 0")
             return False
         else:
             bus = smbus.SMBus(0)
@@ -372,6 +364,23 @@ def get_watchdog(self):
                 watchdog_device_path = "/dev/watchdog0"
                 self._watchdog = WatchdogImplBase(watchdog_device_path)
         except Exception as e:
-            sonic_logger.log_info("Fail to load watchdog {}".format(repr(e)))
+            sonic_logger.log_warning(" Fail to load watchdog {}".format(repr(e)))
 
         return self._watchdog
+    
+    def get_position_in_parent(self):
+        """
+		Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+		Returns:
+		    integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+		"""
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
index 0b08f3f6b4f2..67610a125fad 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
@@ -163,7 +163,24 @@ def get_direction(self):
             FAN_DIRECTION_EXHAUST depending on fan direction
         """
 
-        return 'FAN_DIRECTION_INTAKE'
+        return 'intake'
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
 
     def get_speed(self):
         """
@@ -176,9 +193,13 @@ def get_speed(self):
 
         fan_speed = self._get_i2c_register(self.get_fan_speed_reg)
         if (fan_speed != 'ERR'):
-            speed = int(fan_speed)
+            speed_in_rpm = int(fan_speed)
         else:
-            speed = 0
+            speed_in_rpm = 0
+
+        speed = 100*speed_in_rpm//MAX_IXS7215_FAN_SPEED
+        if speed > 100:
+            speed = 100
 
         return speed
 
@@ -320,11 +341,21 @@ def get_target_speed(self):
             (off) to 100 (full speed)
         """
         speed = 0
+     
+        fan_duty = self._get_i2c_register(self.set_fan_speed_reg)
+        if (fan_duty != 'ERR'):
+            dutyspeed = int(fan_duty)
+            if dutyspeed == 0:
+                speed = 0
+            elif dutyspeed == 64:
+                speed = 25
+            elif dutyspeed == 128:
+                speed = 50
+            elif dutyspeed == 255:
+                speed = 100
+ 
+        return speed
+         
 
-        fan_speed = self._get_i2c_register(self.get_fan_speed_reg)
-        if (fan_speed != 'ERR'):
-            speed = int(fan_speed)
-        else:
-            speed = 0
 
-        return speed
+    
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
index ea0bc71bea5c..cabb15d455d6 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
@@ -8,9 +8,11 @@
 
 try:
     from sonic_platform_base.fan_drawer_base import FanDrawerBase
+    from sonic_py_common import logger
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+sonic_logger = logger.Logger('fan_drawer')
 
 class NokiaFanDrawer(FanDrawerBase):
     def __init__(self, index):
@@ -21,10 +23,59 @@ def __init__(self, index):
     def get_index(self):
         return self._index
 
-    def get_led(self):
-        return self._led
+    def get_presence(self):
+        return self._fan_list[0].get_presence()
 
+    def get_model(self):
+        """
+        Retrieves the model number of the Fan Drawer
+        Returns:
+            string: Part number of Fan Drawer 
+        """
+        return self._fan_list[0].get_model()
 
+    def get_serial(self):
+        """
+        Retrieves the serial number of the Fan Drawer
+        Returns:
+            string: Serial number of Fan
+        """
+        return self._fan_list[0].get_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the Fan Drawer
+        Returns:
+            bool: True if Fan is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
+   
+    def get_direction(self):
+        return 'intake'
+
+    def set_status_led(self, color):
+        return True
+
+    def get_status_led(self, color):
+        return self._fan_list[0].get_status_led()
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self._index
+    
+       
 # For Nokia platforms with fan drawer(s)
 class RealDrawer(NokiaFanDrawer):
     def __init__(self, index):
@@ -33,15 +84,8 @@ def __init__(self, index):
 
     def get_name(self):
         return self._name
+    
+   
 
+ 
 
-# For Nokia platforms with no physical fan drawer(s)
-class VirtualDrawer(NokiaFanDrawer):
-    def __init__(self, index):
-        super(VirtualDrawer, self).__init__(index)
-
-    def get_name(self):
-        return 'N/A'
-
-    def set_status_led(self, color):
-        return 'N/A'
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
index 4b8029daaa12..ab53abebf934 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
@@ -9,6 +9,7 @@
 try:
     import sys
     from sonic_platform_base.psu_base import PsuBase
+    from sonic_py_common import logger
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -23,6 +24,7 @@
 except ImportError as e:
     smbus_present = 0
 
+sonic_logger = logger.Logger('psu')
 
 class Psu(PsuBase):
     """Nokia platform-specific PSU class for 7215 """
@@ -76,7 +78,9 @@ def get_model(self):
         Returns:
             string: Part number of PSU
         """
-        return self.eeprom.modelstr()
+        return "N/A"
+#        return self.eeprom.serial_number_str()
+
 
     def get_serial(self):
         """
@@ -85,7 +89,9 @@ def get_serial(self):
         Returns:
             string: Serial number of PSU
         """
-        return self.eeprom.serial_number_str()
+        return "N/A"
+#        return self.eeprom.serial_number_str()
+
 
     def get_status(self):
         """
@@ -98,6 +104,7 @@ def get_status(self):
         if smbus_present == 0:
             cmdstatus, psustatus = cmd.getstatusoutput('i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
+            sonic_logger.log_warning("PMON psu-smbus - presence = 0 ")
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
@@ -146,29 +153,45 @@ def get_voltage(self):
         psu_voltage = 0.0
         return psu_voltage
 
-    def get_current(self):
-        """
-        Retrieves present electric current supplied by PSU
+#    def get_current(self):
+#        """
+#        Retrieves present electric current supplied by PSU
+#
+#        Returns:
+#            A float number, electric current in amperes,
+#            e.g. 15.4
+#        """
+#        psu_current = 0.0
+#
+#        return psu_current
+#
+#    def get_power(self):
+#        """
+#        Retrieves current energy supplied by PSU
+#
+#        Returns:
+#            A float number, the power in watts,
+#            e.g. 302.6
+#        """
+#        psu_power = 0.0
+#
+#        return psu_power
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
         Returns:
-            A float number, electric current in amperes,
-            e.g. 15.4
+            integer: The 1-based relative physical position in parent device
         """
-        psu_current = 0.0
+        return self.index
 
-        return psu_current
-
-    def get_power(self):
+    def is_replaceable(self):
         """
-        Retrieves current energy supplied by PSU
-
+        Indicate whether this device is replaceable.
         Returns:
-            A float number, the power in watts,
-            e.g. 302.6
+            bool: True if it is replaceable.
         """
-        psu_power = 0.0
-
-        return psu_power
+        return True 
 
     def get_powergood_status(self):
         """
@@ -220,6 +243,6 @@ def set_status_led(self, color):
             bool: True if status LED state is set successfully, False if
                   not
         """
-        # In IXR7220_D1, the firmware running in the PSU controls the LED
+        # In ISX7215 , the firmware running in the PSU controls the LED
         # and the PSU LED state cannot be changed from CPU.
         return False
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index 274db04ded0b..cb9c1b910561 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -276,6 +276,7 @@ def get_transceiver_info(self):
         specification_compliance   |1*255VCHAR     |specification compliance
         vendor_date                |1*255VCHAR     |vendor date
         vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
         ========================================================================
          """
 
@@ -364,7 +365,8 @@ def get_transceiver_info(self):
 
             transceiver_info_dict['nominal_bit_rate'] = str(
                 sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
-
+            transceiver_info_dict['application_advertisement'] = 'N/A'
+            
         return transceiver_info_dict
 
     def get_transceiver_bulk_status(self):
@@ -557,26 +559,20 @@ def get_rx_los(self):
             A Boolean, True if SFP has RX LOS, False if not.
         """
         if self.sfp_type == COPPER_TYPE:
-            return False
+            return None
+        if not self.dom_supported:
+            return None
+        rx_los_list = []
 
-        if smbus_present == 0:
-            sonic_logger.log_info("  PMON - smbus ERROR -    ")
-            cmdstatus, rxlosstatus = cmd.getstatusoutput('i2cget -y 0 0x41 0x4')
-            rxlosstatus = int(rxlosstatus, 16)
+        offset = 256
+        dom_channel_monitor_raw = self.__read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+        if dom_channel_monitor_raw is not None:
+            rx_los_data = int(dom_channel_monitor_raw[0], 16)
+            rx_los_list.append(rx_los_data & 0x02 != 0)
         else:
-            bus = smbus.SMBus(0)
-            DEVICE_ADDRESS = 0x41
-            DEVICE_REG = 0x4
-            rxlosstatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
-
-        pos = [1, 2, 4, 8]
-        bit_pos = pos[self.index-SFP_PORT_START]
-        rxlosstatus = rxlosstatus & (bit_pos)
-
-        if rxlosstatus == 0:
-            return True
-
-        return False
+            return None
+        
+        return rx_los_list
 
     def get_tx_fault(self):
         """
@@ -585,8 +581,21 @@ def get_tx_fault(self):
             A Boolean, True if SFP has TX fault, False if not
             Note : TX fault status is lached until a call to get_tx_fault or a reset.
         """
+        if self.sfp_type == COPPER_TYPE:
+            return None
+        if not self.dom_supported:
+            return None
+        tx_fault_list = []
+
+        offset = 256
+        dom_channel_monitor_raw = self.__read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+        if dom_channel_monitor_raw is not None:
+            tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+            tx_fault_list.append(tx_fault_data & 0x04 != 0)
+        else:
+            return None
+        return tx_fault_list
 
-        return False
 
     def get_tx_disable(self):
         """
@@ -596,26 +605,20 @@ def get_tx_disable(self):
         """
 
         if self.sfp_type == COPPER_TYPE:
-            return False
+            return None
+        if not self.dom_supported:
+            return None
 
-        # Enable optical SFP Tx
-        if smbus_present == 0:
-            cmdstatus, disstatus = cmd.getstatusoutput('i2cget -y 0 0x41 0x5')
-            sonic_logger.log_info(" PMON - smbus ERROR  tx- DEBUG    ")
+        tx_disable_list = []
+        offset = 256
+        dom_channel_monitor_raw = self.__read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+        if dom_channel_monitor_raw is not None:
+            tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+            tx_disable_list.append(tx_disable_data & 0xC0 != 0)
         else:
-            bus = smbus.SMBus(0)
-            DEVICE_ADDRESS = 0x41
-            DEVICE_REG = 0x5
-            disstatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
-
-        pos = [1, 2, 4, 8]
-        bit_pos = pos[self.index-SFP_PORT_START]
-        disstatus = disstatus & (bit_pos)
-
-        if disstatus == 0:
-            return True
-
-        return False
+            return None
+        
+        return tx_disable_list
 
     def get_tx_disable_channel(self):
         """
@@ -663,6 +666,9 @@ def get_temperature(self):
         Returns:
             An integer number of current temperature in Celsius
         """
+        if self.sfp_type == COPPER_TYPE:
+            return None
+        
         transceiver_bulk_status = self.get_transceiver_bulk_status()
         return transceiver_bulk_status.get("temperature", "N/A")
 
@@ -672,6 +678,9 @@ def get_voltage(self):
         Returns:
             An integer number of supply voltage in mV
         """
+        if self.sfp_type == COPPER_TYPE:
+            return None
+        
         transceiver_bulk_status = self.get_transceiver_bulk_status()
         return transceiver_bulk_status.get("voltage", "N/A")
 
@@ -679,18 +688,18 @@ def get_tx_bias(self):
         """
         Retrieves the TX bias current of this SFP
         Returns:
-            A list of four integer numbers, representing TX bias in mA
-            for channel 0 to channel 4.
-            Ex. ['110.09', '111.12', '108.21', '112.09']
+           
         """
+        if self.sfp_type == COPPER_TYPE:
+            return None
+       
+        tx_bias_list = []
         transceiver_bulk_status = self.get_transceiver_bulk_status()
-        tx1_bs = transceiver_bulk_status.get("tx1bias", "N/A")
-        tx2_bs = transceiver_bulk_status.get("tx2bias", "N/A")
-        tx3_bs = transceiver_bulk_status.get("tx3bias", "N/A")
-        tx4_bs = transceiver_bulk_status.get("tx4bias", "N/A")
-        tx_bias_list = [tx1_bs, tx2_bs, tx3_bs, tx4_bs]
+        tx_bias_list.append(transceiver_bulk_status.get("tx1bias", "N/A"))
+
         return tx_bias_list
 
+
     def get_rx_power(self):
         """
         Retrieves the received optical power for this SFP
@@ -803,7 +812,7 @@ def tx_disable(self, tx_disable):
             A boolean, True if tx_disable is set successfully, False if not
         """
 
-        return False
+        return NotImplementedError
 
     def tx_disable_channel(self, channel, disable):
         """
@@ -817,7 +826,7 @@ def tx_disable_channel(self, channel, disable):
             A boolean, True if successful, False if not
         """
 
-        return False
+        return NotImplementedError
 
     def set_lpmode(self, lpmode):
         """
@@ -851,7 +860,7 @@ def set_power_override(self, power_override, power_set):
             False if not
         """
 
-        return False
+        return NotImplementedError
 
     def get_name(self):
         """
@@ -917,3 +926,23 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         return self.get_presence()
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+
+        if self.sfp_type == "SFP":
+            return True
+        else:
+            return False
+        
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self.index
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
index ee7c21c4638d..775596159269 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
@@ -23,8 +23,6 @@ def main():
 
     print("  Chassis status: {}".format(chassis.get_status()))
 
-    print("  Chassis serial_number: {}".format(chassis.get_serial_number()))
-
     print("  Chassis base_mac: {}".format(chassis.get_base_mac()))
 
     print("  Chassis reboot cause: {}\n".format(chassis.get_reboot_cause()))
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
index 1a333aeac441..692430ff2991 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
@@ -17,9 +17,7 @@ def main():
                                                                  psu.get_status_led()))
         print("        Model: {}, Serial: {}".format(psu.get_model(),
                                                      psu.get_serial()))
-        print("        Voltage: {}, Current: {}, Power: {}\n".format(psu.get_voltage(),
-                                                                     psu.get_current(),
-                                                                     psu.get_power()))
+        print("        Voltage: {}, Current: NO, Power: NO \n".format(psu.get_voltage()))
     return
 
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
index 01f75562ad3b..f5437b18f82e 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
@@ -1,21 +1,25 @@
 #!/usr/bin/env python
 
 try:
-    import sonic_platform
+    from sonic_platform.chassis import Chassis
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 
 def main():
 
-    PORT_START = 49
+    PORT_START = 1
     PORT_END = 52
 
-    chassis = sonic_platform.platform.Platform().get_chassis()
+    chassis = Chassis()
 
     for physical_port in range(PORT_START, PORT_END+1):
+
+        
         print(" ")
         print(" SFP transceiver tests  PORT = ", physical_port)
+        name = chassis.get_sfp(physical_port).get_name()
+        print(" SFP transceiver tests  NAME = ", name)
 
         presence = chassis.get_sfp(physical_port).get_presence()
         print("TEST 1 - sfp presence       [ True ] ", physical_port, presence)
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
index e0259347c04e..9e99b0da3f41 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
@@ -16,8 +16,7 @@ def main():
                                                         thermal.get_status()))
         print("        Model: {}, Serial: {}".format(thermal.get_model(),
                                                      thermal.get_serial()))
-        print("        Temperature: {}C, Low Threshold: {}C, High Threshold: {}C\n".format(thermal.get_temperature(),
-                                                                                           thermal.get_low_threshold(),
+        print("        Temperature: {}C, High Threshold: {}C\n".format(thermal.get_temperature(),
                                                                                            thermal.get_high_threshold()))
     return
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
index 2743520de245..528a6e49d924 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
@@ -10,9 +10,11 @@
 try:
     import os
     from sonic_platform_base.thermal_base import ThermalBase
+    from sonic_py_common import logger
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+sonic_logger = logger.Logger('thermal')
 
 class Thermal(ThermalBase):
     """Nokia platform-specific Thermal class"""
@@ -175,7 +177,6 @@ def get_high_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-
         # Not implemented for this sensor
         if not self.thermal_high_threshold_file:
             raise  NotImplementedError
@@ -224,3 +225,19 @@ def get_high_critical_threshold(self):
             thermal_high_crit_threshold = 0.0
 
         return float("{:.3f}".format(thermal_high_crit_threshold))
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
index 5d75a223c523..75ec3ab177ae 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
@@ -15,7 +15,7 @@
 """ ioctl constants """
 IO_READ = 0x80000000
 IO_SIZE_INT = 0x00040000
-IO_TYPE_WATCHDOG = 'W' << 8
+IO_TYPE_WATCHDOG = ord('W') << 8
 
 WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/rules b/platform/marvell-armhf/sonic-platform-nokia/debian/rules
index c1e6c1fbfb2b..b7592c2b51e9 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/debian/rules
+++ b/platform/marvell-armhf/sonic-platform-nokia/debian/rules
@@ -14,7 +14,7 @@ SERVICE_DIR := service
 PLATFORM_DIR := sonic_platform
 
 %:
-	dh $@ --with systemd,python2,python3 --buildsystem=pybuild
+	dh $@ --with systemd,python3 --buildsystem=pybuild
 
 clean:
 	dh_testdir
@@ -23,7 +23,6 @@ clean:
 
 build:
 	(for mod in $(MODULE_DIRS); do \
-		python2 $${mod}/setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
 		python3 $${mod}/setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
 	done)
 
@@ -42,7 +41,6 @@ binary-indep:
 		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} /usr/local/bin; \
 		cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
 		cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \
-		python2 $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
 		python3 $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
 	done)
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
index dc4df5540d96..ea347d79be3a 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
+++ b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
@@ -1,7 +1,6 @@
 nokia-7215_plt_setup.sh usr/sbin
 7215/scripts/nokia-7215init.sh  usr/local/bin
 7215/service/nokia-7215init.service  etc/systemd/system
-7215/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0
 7215/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0
 entropy.py etc/
 inband_mgmt.sh etc/

From 02b5fd841d0104aff6c61b145284c17c47433da3 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Fri, 12 Feb 2021 02:49:11 +0530
Subject: [PATCH 0180/1674] DellEMC: Z9332f enable mem cache flag (#6771)

SER test script is failing as mem_cache flag is disabled.
---
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm            | 2 +-
 .../DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm       | 2 +-
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index 00e6887b4b49..67a24de577d4 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -8,7 +8,7 @@ load_firmware=0x2
 
 ccm_dma_enable=0
 ccmdma_intr_enable=0
-mem_cache_enable=0
+mem_cache_enable=1
 phy_enable=0
 phy_null=1
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm
index 38296d61c1b7..fc6613601f52 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm
@@ -8,7 +8,7 @@ load_firmware=0x2
 
 ccm_dma_enable=0
 ccmdma_intr_enable=0
-mem_cache_enable=0
+mem_cache_enable=1
 phy_enable=0
 phy_null=1
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index 38296d61c1b7..fc6613601f52 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -8,7 +8,7 @@ load_firmware=0x2
 
 ccm_dma_enable=0
 ccmdma_intr_enable=0
-mem_cache_enable=0
+mem_cache_enable=1
 phy_enable=0
 phy_null=1
 

From 5aadc7ff55d577460fcc21b57f7184feba027b9f Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Feb 2021 01:00:35 +0200
Subject: [PATCH 0181/1674] [barefoot][sonic-platform] Fix
 get_system_eeprom_info and refactor eeprom.py (#6739)

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/chassis.py                 |   3 +-
 .../sonic_platform/eeprom.py                  | 112 +++++++++---------
 2 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
index 7a8ed2ca9449..fad16cbdb8a2 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 try:
+    import sys
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.sfp import Sfp
     from sonic_platform.psu import Psu
@@ -55,7 +56,7 @@ def get_serial(self):
         Returns:
             string: Serial number of chassis
         """
-        return self._eeprom.serial_str()
+        return self._eeprom.serial_number_str()
 
     def get_sfp(self, index):
         """
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
index a98a6bc1d45a..587f57826fb5 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
@@ -6,6 +6,7 @@
     import logging
     import logging.config
     import yaml
+    import re
 
     sys.path.append(os.path.dirname(__file__))
 
@@ -14,15 +15,15 @@
     else:
         from cStringIO import StringIO
 
-    from sonic_eeprom import eeprom_base
-    from sonic_eeprom import eeprom_tlvinfo
+    from sonic_platform_base.sonic_eeprom import eeprom_base
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
 
     from platform_thrift_client import thrift_try
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
 
-eeprom_default_dict = {
+_platform_eeprom_map = {
 	"prod_name"         : ("Product Name",                "0x21", 12),
 	"odm_pcba_part_num" : ("Part Number",                 "0x22", 13),
 	"prod_ser_num"      : ("Serial Number",               "0x23", 12),
@@ -33,36 +34,13 @@
 	"sys_mfger"         : ("Manufacturer",                "0x2B",  8)
 }
 
-eeprom_dict = { "version"           : ("Version",                     None,    0),
-		"pcb_mfger"         : ("PCB Manufacturer",            "0x01",  8),
-		"prod_ser_num"      : ("Serial Number",               "0x23", 12),
-		"bfn_pcba_part_num" : ("Switch PCBA Part Number",     "0x02", 12),
-		"odm_pcba_part_num" : ("Part Number",                 "0x22", 13),
-		"bfn_pcbb_part_num" : ("Switch PCBB Part Number",     "0x04", 12),
-		"sys_asm_part_num"  : ("System Assembly Part Number", "0x05", 12),
-		"prod_state"        : ("Product Production State",    "0x06",  1),
-		"location"          : ("EEPROM Location of Fabric",   "0x07",  8),
-		"ext_mac_addr_size" : ("Extende MAC Address Size",    "0x08",  2),
-		"sys_mfg_date"      : ("System Manufacturing Date",   "0x25",  4),
-		"prod_name"         : ("Product Name",                "0x21", 12),
-		"prod_ver"          : ("Product Version",             "0x26",  1),
-		"prod_part_num"     : ("Product Part Number",         "0x09",  8),
-		"sys_mfger"         : ("Manufacturer",                "0x2B",  8),
-		"assembled_at"      : ("Assembled at",                "0x08",  8),
-		"prod_ast_tag"      : ("Product Asset Tag",           "0x09", 12),
-		"loc_mac_addr"      : ("Local MAC address",           "0x0A", 12),
-		"odm_pcba_ser_num"  : ("ODM PBCA Serial Number",      "0x0B", 12),
-		"ext_mac_addr"      : ("Extended MAC Address Base",   "0x0C", 12),
-		"prod_sub_ver"      : ("Product Sub Version",         "0x0D",  1)
-              }
-
-product_dict = { "Montara"   : "Wedge100BF-32X-O-AC-F-BF",
+_product_dict = { "Montara"   : "Wedge100BF-32X-O-AC-F-BF",
                  "Lower MAV" : "Wedge100BF-65X-O-AC-F-BF",
                  "Upper MAV" : "Wedge100BF-65X-O-AC-F-BF"
                }
 
-EEPROM_SYMLINK = "/var/run/platform/eeprom/syseeprom"
-EEPROM_STATUS = "/var/run/platform/eeprom/status"
+_EEPROM_SYMLINK = "/var/run/platform/eeprom/syseeprom"
+_EEPROM_STATUS = "/var/run/platform/eeprom/status"
 
 try:
     _str_type = basestring
@@ -71,46 +49,43 @@
 
 class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self):
-
         with open(os.path.dirname(__file__) + "/logging.conf", 'r') as f:
             config_dict = yaml.load(f, yaml.SafeLoader)
             logging.config.dictConfig(config_dict)
 
-        if not os.path.exists(os.path.dirname(EEPROM_SYMLINK)):
+        if not os.path.exists(os.path.dirname(_EEPROM_SYMLINK)):
             try:
-                os.makedirs(os.path.dirname(EEPROM_SYMLINK))
+                os.makedirs(os.path.dirname(_EEPROM_SYMLINK))
             except OSError as e:
                 if e.errno != errno.EEXIST:
                     raise
 
-        open(EEPROM_SYMLINK, 'a').close()
-        f = open(EEPROM_STATUS, 'w')
-        f.write("initializing..")
-        f.close()
+        open(_EEPROM_SYMLINK, 'a').close()
+        with open(_EEPROM_STATUS, 'w') as f:
+            f.write("initializing..")
 
-        self.eeprom_path = EEPROM_SYMLINK
-        super(Eeprom, self).__init__(self.eeprom_path, 0, EEPROM_STATUS, True)
+        self.eeprom_path = _EEPROM_SYMLINK
+        super(Eeprom, self).__init__(self.eeprom_path, 0, _EEPROM_STATUS, True)
 
         def sys_eeprom_get(client):
             return client.pltfm_mgr.pltfm_mgr_sys_eeprom_get()
         try:
-            self.eeprom = thrift_try(sys_eeprom_get)
+            platform_eeprom = thrift_try(sys_eeprom_get)
         except Exception:
             raise RuntimeError("eeprom.py: Initialization failed")
 
-        self.eeprom_parse()
+        self.__eeprom_init(platform_eeprom)
 
-    def eeprom_parse(self):
-        f = open(EEPROM_STATUS, 'w')
-        f.write("ok")
-        f.close()
+    def __eeprom_init(self, platform_eeprom):
+        with open(_EEPROM_STATUS, 'w') as f:
+            f.write("ok")
 
         eeprom_params = ""
-        for attr, val in self.eeprom.__dict__.items():
+        for attr, val in platform_eeprom.__dict__.items():
             if val is None:
                 continue
 
-            elem = eeprom_default_dict.get(attr)
+            elem = _platform_eeprom_map.get(attr)
             if elem is None:
                 continue
 
@@ -122,7 +97,7 @@ def eeprom_parse(self):
             if attr == "sys_mfg_date":
                 value = datetime.datetime.strptime(value, '%m-%d-%y').strftime('%m/%d/%Y 00:00:00')
 
-            product = product_dict.get(value)
+            product = _product_dict.get(value)
             if product is not None:
                 value = product
             if len(eeprom_params) > 0:
@@ -130,28 +105,51 @@ def eeprom_parse(self):
             eeprom_params += "{0:s}={1:s}".format(elem[1], value)
 
         orig_stdout = sys.stdout
-
         sys.stdout = StringIO()
         try:
-            new_e = eeprom_tlvinfo.TlvInfoDecoder.set_eeprom(self, "", [eeprom_params])
+            eeprom_data = eeprom_tlvinfo.TlvInfoDecoder.set_eeprom(self, "", [eeprom_params])
         finally:
+            decode_output = sys.stdout.getvalue()
             sys.stdout = orig_stdout
 
-        eeprom_base.EepromDecoder.write_eeprom(self, new_e)
+        eeprom_base.EepromDecoder.write_eeprom(self, eeprom_data)
+        self.__eeprom_tlv_dict = self.__parse_output(decode_output)
 
-        return True
+    def __parse_output(self, decode_output):
+        EEPROM_DECODE_HEADLINES = 6
+        lines = decode_output.replace('\0', '').split('\n')
+        lines = lines[EEPROM_DECODE_HEADLINES:]
+        res = dict()
 
-    def serial_str(self):
-        return self.eeprom.prod_ser_num
+        for line in lines:
+            try:
+                # match whitespace-separated tag hex, length and value (value is mathced with its whitespaces)
+                match = re.search('(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+[\s]*[\S]*)', line)
+                if match is not None:
+                    code = match.group(1)
+                    value = match.group(3).rstrip('\0')
+                    res[code] = value
+            except Exception:
+                pass
+        return res
+
+    def __tlv_get(self, code):
+        return self.__eeprom_tlv_dict.get("0x{:X}".format(code), 'N/A')
 
     def system_eeprom_info(self):
-        return self.eeprom.__dict__
+        return self.__eeprom_tlv_dict
+
+    def serial_number_str(self):
+        return self.__tlv_get(self._TLV_CODE_SERIAL_NUMBER)
+
+    def serial_str(self):
+        return self.serial_number_str()
 
     def base_mac_addr(self):
-        return self.eeprom.ext_mac_addr.rstrip('\x00')
+        return self.__tlv_get(self._TLV_CODE_MAC_BASE)
 
     def part_number_str(self):
-        return self.eeprom.prod_part_num
+        return self.__tlv_get(self._TLV_CODE_PART_NUMBER)
 
     def modelstr(self):
-        return self.eeprom.prod_name
+        return self.__tlv_get(self._TLV_CODE_PRODUCT_NAME)

From bcc4a52f56e9daf2bbd44bb1b230acc3c4ec0399 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Feb 2021 03:53:15 +0200
Subject: [PATCH 0182/1674] [barefoot][sonic-platform] Refactor sfp.py (#6770)

Use separate file for each sfp eeprom operation

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/sfp.py                     | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
index cb8931998e39..63c36d9a533a 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
@@ -4,7 +4,10 @@
     import os
     import sys
     import time
-    import errno
+
+    import tempfile
+    from contextlib import contextmanager
+    from copy import copy
 
     sys.path.append(os.path.dirname(__file__))
 
@@ -16,8 +19,6 @@
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
-SFP_EEPROM_CACHE = "/var/run/platform/sfp/cache"
-
 class SfpUtil(SfpUtilBase):
     """Platform-specific SfpUtil class"""
 
@@ -55,15 +56,6 @@ def __init__(self):
         self.phy_port_cur_state = {}
         self.qsfp_interval = self.QSFP_CHECK_INTERVAL
 
-        if not os.path.exists(os.path.dirname(SFP_EEPROM_CACHE)):
-            try:
-                os.makedirs(os.path.dirname(SFP_EEPROM_CACHE))
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-
-        open(SFP_EEPROM_CACHE, 'ab').close()
-
         SfpUtilBase.__init__(self)
 
     def update_port_info(self):
@@ -200,21 +192,28 @@ def get_transceiver_change_event(self, timeout=0):
 
         return self.ready, self.phy_port_dict
 
-    def _get_port_eeprom_path(self, port_num, devid):
-        eeprom_path = None
+    @contextmanager
+    def eeprom_action(self):
+        u = copy(self)
+        with tempfile.NamedTemporaryFile() as f:
+            u.eeprom_path = f.name
+            yield u
 
+    def _sfp_eeprom_present(self, client_eeprompath, offset):
+        return client_eeprompath and super(SfpUtil, self)._sfp_eeprom_present(client_eeprompath, offset)
+
+    def _get_port_eeprom_path(self, port_num, devid):
         def qsfp_info_get(client):
             return client.pltfm_mgr.pltfm_mgr_qsfp_info_get(port_num)
 
         if self.get_presence(port_num):
             eeprom_hex = thrift_try(qsfp_info_get)
-            eeprom_cache = open(SFP_EEPROM_CACHE, 'wb')
             eeprom_raw = bytearray.fromhex(eeprom_hex)
-            eeprom_cache.write(eeprom_raw)
-            eeprom_cache.close()
-            eeprom_path = SFP_EEPROM_CACHE
+            with open(self.eeprom_path, 'wb') as eeprom_cache:
+                eeprom_cache.write(eeprom_raw)
+            return self.eeprom_path
 
-        return eeprom_path
+        return None
 
 class Sfp(SfpBase):
     """Platform-specific Sfp class"""
@@ -242,25 +241,31 @@ def __init__(self, port_num):
         SfpBase.__init__(self)
 
     def get_presence(self):
-        return Sfp.sfputil.get_presence(self.port_num)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.get_presence(self.port_num)
 
     def get_lpmode(self):
-        return Sfp.sfputil.get_low_power_mode(self.port_num)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.get_low_power_mode(self.port_num)
 
     def set_lpmode(self, lpmode):
-        return Sfp.sfputil.set_low_power_mode(self.port_num, lpmode)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.set_low_power_mode(self.port_num, lpmode)
 
     def reset(self):
         return Sfp.sfputil.reset(self.port_num)
 
     def get_transceiver_info(self):
-        return Sfp.sfputil.get_transceiver_info_dict(self.port_num)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.get_transceiver_info_dict(self.port_num)
 
     def get_transceiver_bulk_status(self):
-        return Sfp.sfputil.get_transceiver_dom_info_dict(self.port_num)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.get_transceiver_dom_info_dict(self.port_num)
 
     def get_transceiver_threshold_info(self):
-        return Sfp.sfputil.get_transceiver_dom_threshold_info_dict(self.port_num)
+        with Sfp.sfputil.eeprom_action() as u:
+            return u.get_transceiver_dom_threshold_info_dict(self.port_num)
 
     def get_change_event(self, timeout=0):
         return Sfp.get_transceiver_change_event(timeout)

From 8b3813b63710a057910bcf2a78ace5a1653480f0 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Feb 2021 04:13:53 +0200
Subject: [PATCH 0183/1674] [barefoot][sonic-platform] Fix sfp reset (#6746)

Fix wrong sfp reset return value

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic-platform-modules-bfn-montara/sonic_platform/sfp.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
index 63c36d9a533a..739a48a8f1eb 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
@@ -118,9 +118,9 @@ def qsfp_reset(client):
             client.pltfm_mgr.pltfm_mgr_qsfp_reset(port_num, True)
             return client.pltfm_mgr.pltfm_mgr_qsfp_reset(port_num, False)
 
-        status = thrift_try(qsfp_reset)
+        err = thrift_try(qsfp_reset)
 
-        return status
+        return not err
 
     def check_transceiver_change(self):
         if not self.ready:

From 5961e3206ef579f3a7f6a8489827ea23a0d067ed Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 12 Feb 2021 02:14:47 +0000
Subject: [PATCH 0184/1674] DellEMC: Add platform.json for S6000, S6100 (#6735)

Add platform.json used for sonic-mgmt testing in DellEMC S6000, S6100 platforms.
---
 .../x86_64-dell_s6000_s1220-r0/platform.json  | 228 ++++++++++++
 .../x86_64-dell_s6100_c2538-r0/platform.json  | 343 ++++++++++++++++++
 2 files changed, 571 insertions(+)
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/platform.json
 create mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/platform.json

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/platform.json b/device/dell/x86_64-dell_s6000_s1220-r0/platform.json
new file mode 100644
index 000000000000..62a53fe328fc
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/platform.json
@@ -0,0 +1,228 @@
+{
+    "chassis": {
+        "name": "S6000",
+        "components": [
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "System-CPLD"
+            },
+            {
+                "name": "Master-CPLD"
+            },
+            {
+                "name": "Slave-CPLD"
+            }
+        ],
+        "fans": [
+            {
+                "name": "FanTray1-Fan1"
+            },
+            {
+                "name": "FanTray1-Fan2"
+            },
+            {
+                "name": "FanTray2-Fan1"
+            },
+            {
+                "name": "FanTray2-Fan2"
+            },
+            {
+                "name": "FanTray3-Fan1"
+            },
+            {
+                "name": "FanTray3-Fan2"
+            }
+        ],
+        "fan_drawers":[
+            {
+                "name": "FanTray1",
+                "fans": [
+                    {
+                        "name": "FanTray1-Fan1"
+                    },
+                    {
+                        "name": "FanTray1-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray2",
+                "fans": [
+                    {
+                        "name": "FanTray2-Fan1"
+                    },
+                    {
+                        "name": "FanTray2-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray3",
+                "fans": [
+                    {
+                        "name": "FanTray3-Fan1"
+                    },
+                    {
+                        "name": "FanTray3-Fan2"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU1",
+                "fans": [
+                    {
+                        "name": "PSU1 Fan"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU1-Sensor 1"
+                    },
+                    {
+                        "name": "PSU1-Sensor 2"
+                    }
+                ]
+            },
+            {
+                "name": "PSU2",
+                "fans": [
+                    {
+                        "name": "PSU2 Fan"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU2-Sensor 1"
+                    },
+                    {
+                        "name": "PSU2-Sensor 2"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC On-board"
+            },
+            {
+                "name": "NIC"
+            },
+            {
+                "name": "System Front"
+            },
+            {
+                "name": "DIMM"
+            },
+            {
+                "name": "CPU Core 0"
+            },
+            {
+                "name": "CPU Core 1"
+            }
+        ],
+        "modules": [],
+        "sfps": [
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/platform.json b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
new file mode 100644
index 000000000000..24e32b16bb15
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
@@ -0,0 +1,343 @@
+{
+    "chassis": {
+        "name": "S6100-ON",
+        "components": [
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD"
+            },
+            {
+                "name": "FPGA"
+            }
+        ],
+        "fans": [
+            {
+                "name": "FanTray1-Fan1"
+            },
+            {
+                "name": "FanTray2-Fan1"
+            },
+            {
+                "name": "FanTray3-Fan1"
+            },
+            {
+                "name": "FanTray4-Fan1"
+            }
+        ],
+        "fan_drawers":[
+            {
+                "name": "FanTray1",
+                "fans": [
+                    {
+                        "name": "FanTray1-Fan1"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray2",
+                "fans": [
+                    {
+                        "name": "FanTray2-Fan1"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray3",
+                "fans": [
+                    {
+                        "name": "FanTray3-Fan1"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray4",
+                "fans": [
+                    {
+                        "name": "FanTray4-Fan1"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU1",
+                "fans": [
+                    {
+                        "name": "PSU1 Fan"
+                    }
+                ]
+            },
+            {
+                "name": "PSU2",
+                "fans": [
+                    {
+                        "name": "PSU2 Fan"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "CPU On-board"
+            },
+            {
+                "name": "ASIC On-board Front"
+            },
+            {
+                "name": "System Front"
+            },
+            {
+                "name": "ASIC On-board Rear"
+            },
+            {
+                "name": "Front GE board"
+            },
+            {
+                "name": "Front SFP+ board"
+            },
+            {
+                "name": "CPU Core 0"
+            },
+            {
+                "name": "CPU Core 1"
+            },
+            {
+                "name": "CPU Core 2"
+            },
+            {
+                "name": "CPU Core 3"
+            }
+        ],
+        "modules": [
+            {
+                "name": "IOM1: 16x40G QSFP+ Module",
+                "components": [
+                    {
+                        "name": "IOM1-CPLD"
+                    }
+                ]
+            },
+            {
+                "name": "IOM2: 16x40G QSFP+ Module",
+                "components": [
+                    {
+                        "name": "IOM2-CPLD"
+                    }
+                ]
+            },
+            {
+                "name": "IOM3: 16x40G QSFP+ Module",
+                "components": [
+                    {
+                        "name": "IOM3-CPLD"
+                    }
+                ]
+            },
+            {
+                "name": "IOM4: 16x40G QSFP+ Module",
+                "components": [
+                    {
+                        "name": "IOM4-CPLD"
+                    }
+                ]
+            }
+        ],
+        "sfps": [
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            },
+            {
+                "name": "QSFP+ or later"
+            }
+        ]
+    },
+    "interfaces": {}
+}

From 5640958322d53028bbef53532826814db383085f Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Fri, 12 Feb 2021 03:00:16 -0800
Subject: [PATCH 0185/1674] [broadcom]: BRCM SAI 4.3.0.13-1 Pick up BRCM Patch
 to fix bogus interface counters (#6775)

This PR is needed to fix the show interface counters output issue where the counters are not correct due to an issue introduced in BRCM SAI 4.3.

- How to verify it
Without the fix if one injects packets, the expected counters for the interfaces involved do not show correct count values. The RX count looks to be TX count while TX count looks to be RX count but even that the values could not be trusted.
After the fix the counters started to look correct. Here is one sample output taken after the fix is applied where I manually injected 10,000 packets into Ethernet92 to be routed out of the port channel member port Ethernet40. Also injected 10,000 invalid packets into the same Ethernet92 and all 10,000 packets were shown RX_DRP correctly.
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index fa27c92236ed..046aca2af658 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.13_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13_amd64.deb?sv=2019-12-12&st=2021-02-11T06%3A07%3A09Z&se=2030-02-12T06%3A07%3A00Z&sr=b&sp=r&sig=IlCyw1BGN0Ei56tPPeXJSucFSFj8SSqUGLB2A%2BRZ1w0%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.13_amd64.deb
+BRCM_SAI = libsaibcm_4.3.0.13-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=e%2BBucofzEwCC%2BclqK1OeCi5YFpQAD4ID4FfODzszsuM%3D&se=2034-10-22T06%3A00%3A14Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.0.13-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13_amd64.deb?sv=2019-12-12&st=2021-02-11T06%3A08%3A31Z&se=2030-02-12T06%3A08%3A00Z&sr=b&sp=r&sig=G5mYUa8gCnDNpuadvHEuH%2B4q2MuY0JYspPLt2gaC2NY%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=twfshldM6GQEphfU%2BQ4xmJlGJkv2Sy7KU1F72RYYM0A%3D&se=2034-10-22T06%3A00%3A45Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From cdef77f4c5b4adbbc1f71a1fa819f5957febcc3c Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Fri, 12 Feb 2021 10:59:29 -0800
Subject: [PATCH 0186/1674] [SwSS] Disabled the autorestart of process
 `coppmgrd`. (#6774)

coppmgrd process do not need to be auto-restarted if it exited unexpectedly.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
---
 dockers/docker-orchagent/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 538f251c2621..af68c8c38ab7 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -87,7 +87,7 @@ dependent_startup_wait_for=swssconfig:exited
 command=/usr/bin/coppmgrd
 priority=6
 autostart=false
-autorestart=unexpected
+autorestart=false
 startretries=0
 startsecs=0
 stdout_logfile=syslog

From 27ca6040f111cac8066a484496d0fef5fd6d63e5 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sun, 14 Feb 2021 10:40:24 -0800
Subject: [PATCH 0187/1674] [platform] Update path to udevprefix.conf file
 (#6779)

Azure/sonic-utilities#1431 changes the path to the udevprefix.conf file. The file previously inappropriately resided in the <platform>/plugins/ directory. That directory is reserved for now-deprecated Python platform plugins, and will be removed in the near future.
---
 .../haliburton/script/udev_prefix.sh             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/script/udev_prefix.sh b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/udev_prefix.sh
index 20fa0a278808..c5842fab0a7e 100644
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/script/udev_prefix.sh
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/udev_prefix.sh
@@ -3,21 +3,21 @@
 PREV_REBOOT_CAUSE="/host/reboot-cause/"
 DEVICE="/usr/share/sonic/device"
 PLATFORM=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
-FILES=$DEVICE/$PLATFORM/plugins
+PLATFORM_PATH=$DEVICE/$PLATFORM
 FILENAME="udevprefix.conf"
 
 if [ "$1" = "clear" ]
 then
-	if [ -e $FILES/$FILENAME ]; then
-		rm $FILES/$FILENAME
+	if [ -e $PLATFORM_PATH/$FILENAME ]; then
+		rm $PLATFORM_PATH/$FILENAME
 	fi
 else
-	if [ -e $FILES/$FILENAME ]; then
-		: > $FILES/$FILENAME 
-		echo -n "$1" > $FILES/$FILENAME
+	if [ -e $PLATFORM_PATH/$FILENAME ]; then
+		: > $PLATFORM_PATH/$FILENAME
+		echo -n "$1" > $PLATFORM_PATH/$FILENAME
 	else
-		touch $FILES/$FILENMAE
-		echo -n "$1" > $FILES/$FILENAME 
+		touch $PLATFORM_PATH/$FILENMAE
+		echo -n "$1" > $PLATFORM_PATH/$FILENAME
 	fi
 fi
 

From e0efbc1e141191e4f532464a1783c90309a0b51c Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Sun, 14 Feb 2021 12:43:49 -0800
Subject: [PATCH 0188/1674] [swss]: Clear MUX-related state DB tables on start
 (#6759)

* Add *MUX_CABLE_TABLE* to set of tables to clear on SWSS start, which
will clear HW_MUX_CABLE_TABLE and MUX_CABLE_TABLE
* Order swss to start before pmon to ensure that DBs are cleared before
xcvrd (running inside pmon) starts and re-populates the tables

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/per_namespace/swss.service.j2 | 2 +-
 files/scripts/swss.sh                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2
index 352d1593a60b..8ac19037ffe7 100644
--- a/files/build_templates/per_namespace/swss.service.j2
+++ b/files/build_templates/per_namespace/swss.service.j2
@@ -12,7 +12,7 @@ Requires=opennsl-modules.service
 Requires=updategraph.service
 After=updategraph.service
 After=interfaces-config.service
-Before=ntp-config.service
+Before=ntp-config.service pmon.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 1c54aefb0c0b..bde64fb53cb6 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -147,7 +147,7 @@ start() {
         $SONIC_DB_CLI ASIC_DB FLUSHDB
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', '*MUX_CABLE_TABLE*'"
     fi
 
     # start service docker

From 6361d36fb2477299c8e268b4bdb64e57d661d8bd Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:05:34 +0200
Subject: [PATCH 0189/1674] Stop teamd service before syncd (#6755)

- What I did
All SWSS dependent services should stop before SWSS service to avoid future possible issues.
For example 'teamd' service will stop before to allow the driver unload netdev gracefully.
This is to stop all LAG's before restarting syncd service when running 'config reload' command.

- How I did it
Change the order of dependent services of SWSS.

- How to verify it
Run 'config reload' command.
Previously the operation failed when a large number of PortChannel configured on the system.

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 files/scripts/swss.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index bde64fb53cb6..97e50cb975e7 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -110,14 +110,6 @@ start_peer_and_dependent_services() {
 stop_peer_and_dependent_services() {
     # if warm/fast start enabled or peer lock exists, don't stop peer service docker
     if [[ x"$WARM_BOOT" != x"true" ]] && [[ x"$FAST_BOOT" != x"true" ]]; then
-        if [[ ! -z $DEV ]]; then
-            /bin/systemctl stop ${PEER}@$DEV
-        else
-            /bin/systemctl stop ${PEER}
-        fi
-        for dep in ${DEPENDENT}; do
-            /bin/systemctl stop ${dep}
-        done
         for dep in ${MULTI_INST_DEPENDENT}; do
             if [[ ! -z $DEV ]]; then
                 /bin/systemctl stop ${dep}@$DEV
@@ -125,7 +117,14 @@ stop_peer_and_dependent_services() {
                 /bin/systemctl stop ${dep}
             fi
         done
-
+        for dep in ${DEPENDENT}; do
+            /bin/systemctl stop ${dep}
+        done
+        if [[ ! -z $DEV ]]; then
+            /bin/systemctl stop ${PEER}@$DEV
+        else
+            /bin/systemctl stop ${PEER}
+        fi
     fi
 }
 

From a5085607b4c60243d7786bfbe783228ef586c58b Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 7 Feb 2021 19:51:22 -0800
Subject: [PATCH 0190/1674] [syncd-vs]: remove hardcode version for iproute2
 and libcap2-bin (#6713)

Fix #6711

the requirement was introduced in commit 75104bb35d86e3ec5565abe1cb49809e7790a155
to support sflow in stretch build. in buster build, the requirement
is met, no need to pin down the version.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 platform/vs/docker-gbsyncd-vs/Dockerfile.j2 | 2 +-
 platform/vs/docker-syncd-vs/Dockerfile.j2   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/vs/docker-gbsyncd-vs/Dockerfile.j2 b/platform/vs/docker-gbsyncd-vs/Dockerfile.j2
index d740dca663cb..ae7e1c99b7c0 100644
--- a/platform/vs/docker-gbsyncd-vs/Dockerfile.j2
+++ b/platform/vs/docker-gbsyncd-vs/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
 
-RUN apt-get install -f -y iproute2=4.20.0-2 libcap2-bin=1:2.25-2
+RUN apt-get install -f -y iproute2 libcap2-bin
 
 COPY \
 {% for deb in docker_gbsyncd_vs_debs.split(' ') -%}
diff --git a/platform/vs/docker-syncd-vs/Dockerfile.j2 b/platform/vs/docker-syncd-vs/Dockerfile.j2
index 1ef1245e14fb..b3d7dcef490b 100644
--- a/platform/vs/docker-syncd-vs/Dockerfile.j2
+++ b/platform/vs/docker-syncd-vs/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
 
-RUN apt-get install -f -y iproute2=4.20.0-2 libcap2-bin=1:2.25-2
+RUN apt-get install -f -y iproute2 libcap2-bin
 
 COPY \
 {% for deb in docker_syncd_vs_debs.split(' ') -%}

From 8003e11b5364d1ba406e4ca250f22c454f75b5b6 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Wed, 17 Feb 2021 18:00:50 -0800
Subject: [PATCH 0191/1674] [202012][submodule] Update sonic-swss and
 sonic-utilities submodules (#6798)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index fc06176a164b..676f23dd2d04 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit fc06176a164b2325d34a3f137fa1015d757dd64c
+Subproject commit 676f23dd2d04f60b2b289b3a318853ac29b2c388
diff --git a/src/sonic-utilities b/src/sonic-utilities
index ea6a38cda963..148259bbbb48 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ea6a38cda963d0ea0b6eaf52026c63e749f3ce35
+Subproject commit 148259bbbb480c9750052aa3f5c8925b2f2ff1dd

From fbc6190c0cf87f76b127061de8521b68e7ae4db6 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 12 Jan 2021 02:33:08 +0800
Subject: [PATCH 0192/1674] [arista]: Fix web package md5 hash not correct
 issue (#6411)

Need to add the follow redirection option -L when downloading the package with redirection.
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 94b767861467..ae85c2dcf129 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -46,7 +46,7 @@ check_version_control()
 get_url_version()
 {
     local package_url=$1
-    /usr/bin/curl -ks $package_url | md5sum | cut -d' ' -f1
+    /usr/bin/curl -Lks $package_url | md5sum | cut -d' ' -f1
 }
 
 check_if_url_exist()

From fa7d63622602248343222e53cfcc0e6019bb2137 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 18 Feb 2021 14:59:52 +0800
Subject: [PATCH 0193/1674] Add mirrors for reproducible build (#6813)

---
 files/apt/sources.list.amd64 | 5 +++++
 files/apt/sources.list.arm64 | 5 +++++
 files/apt/sources.list.armhf | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/files/apt/sources.list.amd64 b/files/apt/sources.list.amd64
index 4a94e3161ab1..45902be1078c 100644
--- a/files/apt/sources.list.amd64
+++ b/files/apt/sources.list.amd64
@@ -6,3 +6,8 @@ deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster mai
 deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
 deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
 deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
+deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
+deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
+deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
diff --git a/files/apt/sources.list.arm64 b/files/apt/sources.list.arm64
index dd82c744de1d..58b84978d023 100644
--- a/files/apt/sources.list.arm64
+++ b/files/apt/sources.list.arm64
@@ -6,3 +6,8 @@ deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
 deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
 deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
 deb [arch=arm64] http://ftp.debian.org/debian buster-backports main
+deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
+deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
+deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-backports main
diff --git a/files/apt/sources.list.armhf b/files/apt/sources.list.armhf
index 760906188a94..eb6fe3be6889 100644
--- a/files/apt/sources.list.armhf
+++ b/files/apt/sources.list.armhf
@@ -6,3 +6,8 @@ deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
 deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
 deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
 deb [arch=armhf] http://ftp.debian.org/debian buster-backports main
+deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
+deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
+deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
+deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-backports main

From 7c001068178511e0f8dba4d8969c78e42e787919 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 23 Feb 2021 10:36:32 +0800
Subject: [PATCH 0194/1674] Add the version files for the branch 202012 (#6836)

---
 .../versions-deb-buster                       |  115 ++
 .../build-sonic-slave-buster/versions-py2     |   12 +
 .../build-sonic-slave-buster/versions-py3     |    6 +
 .../versions-deb-stretch                      |   23 +
 .../build-sonic-slave-stretch/versions-py2    |    3 +
 .../versions/default/versions-deb-buster      |  226 +++
 files/build/versions/default/versions-py2     |   28 +
 files/build/versions/default/versions-py3     |   47 +
 files/build/versions/default/versions-web     |   61 +
 .../docker-base-stretch/versions-deb-stretch  |   71 +
 .../dockers/docker-base-stretch/versions-py2  |    4 +
 .../docker-config-engine-buster/versions-py3  |    1 +
 .../versions-deb-stretch                      |   11 +
 .../docker-config-engine-stretch/versions-py2 |    4 +
 .../docker-database/versions-deb-buster       |   12 +
 .../docker-dhcp-relay/versions-deb-buster     |   13 +
 .../docker-fpm-frr/versions-deb-buster        |   19 +
 .../dockers/docker-fpm-frr/versions-py3       |    1 +
 .../docker-gbsyncd-vs/versions-deb-buster     |    5 +
 .../dockers/docker-lldp/versions-deb-buster   |   16 +
 .../dockers/docker-nat/versions-deb-buster    |   14 +
 .../docker-orchagent/versions-deb-buster      |   15 +
 .../versions-deb-buster                       |   25 +
 .../versions-deb-buster                       |   12 +
 .../dockers/docker-sflow/versions-deb-buster  |   12 +
 .../dockers/docker-snmp/versions-deb-buster   |   17 +
 .../versions-deb-buster                       |   13 +
 .../docker-sonic-mgmt-framework/versions-py3  |    2 +
 .../versions-deb-buster                       |   12 +
 .../docker-syncd-bfn/versions-deb-buster      |   12 +
 .../versions-deb-buster                       |   58 +
 .../docker-syncd-centec-rpc/versions-py2      |    5 +
 .../docker-syncd-centec/versions-deb-buster   |   13 +
 .../docker-syncd-invm/versions-deb-stretch    |    5 +
 .../docker-syncd-mlnx-rpc/versions-deb-buster |   58 +
 .../docker-syncd-mlnx-rpc/versions-py2        |    5 +
 .../docker-syncd-mlnx/versions-deb-buster     |   21 +
 .../docker-syncd-nephos/versions-deb-stretch  |   29 +
 .../docker-syncd-vs/versions-deb-buster       |    5 +
 .../dockers/docker-teamd/versions-deb-buster  |   16 +
 .../sonic-slave-buster/versions-deb-buster    | 1665 +++++++++++++++++
 .../dockers/sonic-slave-buster/versions-py2   |   92 +
 .../dockers/sonic-slave-buster/versions-py3   |   70 +
 .../sonic-slave-stretch/versions-deb-stretch  | 1484 +++++++++++++++
 .../dockers/sonic-slave-stretch/versions-py2  |   79 +
 .../dockers/sonic-slave-stretch/versions-py3  |   36 +
 .../host-base-image/versions-deb-buster       |   84 +
 .../versions/host-image/versions-deb-buster   |  283 +++
 files/build/versions/host-image/versions-py2  |   33 +
 files/build/versions/host-image/versions-py3  |   42 +
 50 files changed, 4895 insertions(+)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3
 create mode 100644 files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/build/build-sonic-slave-stretch/versions-py2
 create mode 100644 files/build/versions/default/versions-deb-buster
 create mode 100644 files/build/versions/default/versions-py2
 create mode 100644 files/build/versions/default/versions-py3
 create mode 100644 files/build/versions/default/versions-web
 create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-py2
 create mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-py3
 create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-py2
 create mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-fpm-frr/versions-py3
 create mode 100644 files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-lldp/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-snmp/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
 create mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py2
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py2
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3
 create mode 100644 files/build/versions/host-base-image/versions-deb-buster
 create mode 100644 files/build/versions/host-image/versions-deb-buster
 create mode 100644 files/build/versions/host-image/versions-py2
 create mode 100644 files/build/versions/host-image/versions-py3

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
new file mode 100644
index 000000000000..3681bae194bf
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -0,0 +1,115 @@
+applibs==1.mlnx.4.4.2308
+applibs-dev==1.mlnx.4.4.2308
+bfnplatform==1.0.0
+gir1.2-atk-1.0==2.30.0-2
+gir1.2-atspi-2.0==2.30.0-7
+gir1.2-freedesktop==1.58.3-2
+gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
+gir1.2-gtk-3.0==3.24.5-1
+gir1.2-harfbuzz-0.0==2.3.1-1
+gir1.2-pango-1.0==1.42.4-8~deb10u1
+iproute2==1.mlnx.4.4.2308
+iproute2-dev==1.mlnx.4.4.2308
+isc-dhcp-relay==4.4.1-2
+kernel-mft-dkms==4.15.3-3
+libatk-bridge2.0-dev==2.30.0-5
+libatk1.0-dev==2.30.0-2
+libatspi2.0-dev==2.30.0-7
+libcairo-script-interpreter2==1.16.0-4+deb10u1
+libcairo2-dev==1.16.0-4+deb10u1
+libegl1-mesa-dev==18.3.6-2+deb10u1
+libepoxy-dev==1.5.3-0.1
+libfontconfig1-dev==2.13.1-2
+libfreetype6-dev==2.9.1-3+deb10u2
+libfribidi-dev==1.0.5-3.1+deb10u1
+libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
+libgraphite2-dev==1.3.13-7
+libgtk-3-dev==3.24.5-1
+libharfbuzz-dev==2.3.1-1
+libharfbuzz-gobject0==2.3.1-1
+libhiredis-dev==0.14.0-3~bpo9+1
+libhiredis0.14==0.14.0-3~bpo9+1
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-cli-3-dev==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+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-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
+libpango1.0-dev==1.42.4-8~deb10u1
+libpangoxft-1.0-0==1.42.4-8~deb10u1
+libpixman-1-dev==0.36.0-1
+libsaibcm==4.3.0.13-1
+libsaimetadata==1.0.0
+libsaimetadata-dev==1.0.0
+libsairedis==1.0.0
+libsairedis-dev==1.0.0
+libsaithrift-dev==0.9.4
+libsaivs==1.0.0
+libsnmp-base==5.7.3+dfsg-5
+libsnmp-dev==5.7.3+dfsg-5
+libsnmp30==5.7.3+dfsg-5
+libswsscommon==1.0.0
+libswsscommon-dev==1.0.0
+libtac-dev==1.4.1-1
+libtac2==1.4.1-1
+libteam-dev==1.30-1
+libteam-utils==1.30-1
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libthrift-0.11.0==0.11.0-4
+libthrift-dev==0.11.0-4
+libwayland-bin==1.16.0-1
+libwayland-dev==1.16.0-1
+libxcb-shm0-dev==1.13.1-2
+libxcomposite-dev==1:0.4.4-2
+libxcursor-dev==1:1.1.15-2
+libxft-dev==2.3.2-2
+libxi-dev==2:1.7.9-1
+libxinerama-dev==2:1.1.4-2
+libxkbcommon-dev==0.8.2-1
+libxrandr-dev==2:1.5.1-1
+libxrender-dev==1:0.9.10-1
+libxtst-dev==2:1.2.3-1
+libyang==1.0.73
+libyang-cpp==1.0.73
+libyang-dev==1.0.73
+linux-headers-4.19.0-12-2-amd64==4.19.152-1
+linux-headers-4.19.0-12-2-common==4.19.152-1
+lldpd==1.0.4-1
+lm-sensors==1:3.5.0-3
+mft==4.15.3-3
+pango1.0-tools==1.42.4-8~deb10u1
+python-swsscommon==1.0.0
+python-thrift==0.11.0-4
+python2-yang==1.0.73
+python3-swsscommon==1.0.0
+python3-yang==1.0.73
+sonic-mgmt-common==1.0.0
+sonic-mgmt-common-codegen==1.0.0
+sonic-mgmt-framework==1.0-01
+sx-acl-helper==1.mlnx.4.4.2308
+sx-acl-helper-dev==1.mlnx.4.4.2308
+sx-complib==1.mlnx.4.4.2308
+sx-complib-dev==1.mlnx.4.4.2308
+sx-examples==1.mlnx.4.4.2308
+sx-examples-dev==1.mlnx.4.4.2308
+sx-gen-utils==1.mlnx.4.4.2308
+sx-gen-utils-dev==1.mlnx.4.4.2308
+sx-scew==1.mlnx.4.4.2308
+sx-scew-dev==1.mlnx.4.4.2308
+sxd-libs==1.mlnx.4.4.2308
+sxd-libs-dev==1.mlnx.4.4.2308
+syncd==1.0.0
+thrift-compiler==0.11.0-4
+wayland-protocols==1.17-1
+wjh-libs==1.mlnx.4.4.2308
+wjh-libs-dev==1.mlnx.4.4.2308
+x11proto-composite-dev==1:2018.4-4
+x11proto-input-dev==2018.4-4
+x11proto-randr-dev==2018.4-4
+x11proto-record-dev==2018.4-4
+x11proto-xinerama-dev==2018.4-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
new file mode 100644
index 000000000000..1f5c68c822d7
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -0,0 +1,12 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+future==0.18.2
+importlib-resources==3.3.1
+ipaddress==1.0.23
+natsort==6.2.1
+netaddr==0.8.0
+pyangbind==0.6.0
+redis==3.5.3
+SaiRedis==1.0
+thrift==0.11.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
new file mode 100644
index 000000000000..036738d13aec
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -0,0 +1,6 @@
+bitarray==1.5.3
+ijson==2.6.1
+ipaddress==1.0.23
+natsort==6.2.1
+netaddr==0.8.0
+xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..df28b25a1ff2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -0,0 +1,23 @@
+innovium-sai==0.11.1
+innovium-sai-headers==0.11.1
+libhiredis-dev==0.14.0-3~bpo9+1
+libhiredis0.14==0.14.0-3~bpo9+1
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-cli-3-dev==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+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-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
+libsainps==1.5.0
+libsairedis==1.0.0
+libsaithrift-dev==0.9.4
+libswsscommon==1.0.0
+libswsscommon-dev==1.0.0
+libthrift-0.11.0==0.11.0-4
+libthrift-dev==0.11.0-4
+python-swsscommon==1.0.0
+thrift-compiler==0.11.0-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
new file mode 100644
index 000000000000..e4755ea87a52
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -0,0 +1,3 @@
+natsort==6.2.1
+redis==3.5.3
+SaiRedis==1.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
new file mode 100644
index 000000000000..0ac1d545ff28
--- /dev/null
+++ b/files/build/versions/default/versions-deb-buster
@@ -0,0 +1,226 @@
+apt-utils==1.8.2.2
+arping==2.19-6
+bridge-utils==1.6-2
+bzip2==1.0.6-9.2~deb10u1
+ca-certificates==20200601~deb10u2
+conntrack==1:1.4.5-2
+cron==3.0pl1-134+deb10u1
+curl==7.64.0-4+deb10u1
+dmidecode==3.2-1
+dpkg-dev==1.19.7
+ethtool==1:4.19-1
+fancontrol==1:3.5.0-3
+fontconfig==2.13.1-2
+fontconfig-config==2.13.1-2
+fonts-dejavu-core==2.37-1
+freeipmi-common==1.6.3-1.1
+frr==7.5-sonic-0
+frr-snmp==7.5-sonic-0
+hsflowd==2.0.32-1
+i2c-tools==4.1-1
+ifupdown==0.8.35
+ipmitool==1.8.18-6
+iptables==1.8.2-4
+isc-dhcp-relay==4.4.1-2
+jq==1.5+dfsg-2+b1
+kmod==26-1
+less==487-0.1+b1
+libapt-inst2.0==1.8.2.2
+libatomic1==8.3.0-6
+libbsd0==0.9.1-2
+libc-ares2==1.14.0-1
+libc-dev-bin==2.28-10
+libc-l10n==2.28-10
+libc6-dev==2.28-10
+libcairo2==1.16.0-4+deb10u1
+libcurl4==7.64.0-4+deb10u1
+libdaemon0==0.14-7
+libdatrie1==0.2.12-2
+libdbi1==0.9.0-5
+libdbus-1-3==1.12.20-0+deb10u1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libestr0==0.1.10-2.1
+libevent-2.1-6==2.1.8-stable-4
+libexpat1==2.2.6-2+deb10u1
+libexplain51==1.4.D001-8
+libfastjson4==0.99.8-2
+libfontconfig1==2.13.1-2
+libfreeipmi17==1.6.3-1.1
+libfreetype6==2.9.1-3+deb10u2
+libfribidi0==1.0.5-3.1+deb10u1
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libglib2.0-0==2.58.3-2+deb10u2
+libgraphite2-3==1.3.13-7
+libgssapi-krb5-2==1.17-3+deb10u1
+libharfbuzz0b==2.3.1-1
+libhiredis0.14==0.14.0-3~bpo9+1
+libi2c0==4.1-1
+libicu63==63.1-6+deb10u1
+libip4tc0==1.8.2-4
+libip6tc0==1.8.2-4
+libiptc0==1.8.2-4
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libjansson4==2.12-1
+libjemalloc2==5.1.0-3
+libjq1==1.5+dfsg-2+b1
+libjson-c3==0.12.1+ds-2+deb10u1
+libk5crypto3==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libkmod2==26-1
+libkrb5-3==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+liblognorm5==2.0.5-1
+liblua5.1-0==5.1.5-8.1+b2
+libmariadb3==1:10.3.27-0+deb10u1
+libmpdec2==2.4.2-2
+libncurses6==6.1+20181013-2+deb10u2
+libnet1==1.1.6+dfsg-3.1
+libnetfilter-conntrack3==1.0.7-1
+libnfnetlink0==1.0.1-3+b1
+libnftnl11==1.1.2-2
+libnghttp2-14==1.36.0-2+deb10u1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnorm1==1.5.8+dfsg2-1
+libonig5==6.9.1-1
+libpango-1.0-0==1.42.4-8~deb10u1
+libpangocairo-1.0-0==1.42.4-8~deb10u1
+libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpcap0.8==1.8.1-6
+libpci3==1:3.5.2-1
+libperl5.28==5.28.1-6+deb10u1
+libpgm-5.2-0==5.2.122~dfsg-3
+libpixman-1-0==0.36.0-1
+libpng16-16==1.6.36-6
+libpopt0==1.16-12
+libprocps7==2:3.3.15-2
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libpsl5==0.20.2-2
+libpython-stdlib==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-stdlib==3.7.3-1
+libpython3.7==3.7.3-2+deb10u2
+libpython3.7-minimal==3.7.3-2+deb10u2
+libpython3.7-stdlib==3.7.3-2+deb10u2
+libreadline7==7.0-5
+librrd-dev==1.7.1-2
+librrd8==1.7.1-2
+librtmp1==2.4+20151223.gitfa8646d.1-2
+libsaibcm==4.3.0.13-1
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsensors-config==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libsodium23==1.0.17-1
+libsqlite3-0==3.27.2-3+deb10u1
+libssh2-1==1.8.0-2.1
+libssl1.1==1.1.1d-0+deb10u5
+libswsscommon==1.0.0
+libteam-utils==1.30-1
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libthai-data==0.1.28-2
+libthai0==0.1.28-2
+libunwind8==1.2.1-10~deb10u1
+libwrap0==7.6.q-28
+libx11-6==2:1.6.7-1+deb10u1
+libx11-data==2:1.6.7-1+deb10u1
+libxau6==1:1.0.8-1+b2
+libxcb-render0==1.13.1-2
+libxcb-shm0==1.13.1-2
+libxcb1==1.13.1-2
+libxdmcp6==1:1.1.2-3
+libxext6==2:1.3.3-1+b2
+libxml2==2.9.4+dfsg1-7+deb10u1
+libxrender1==1:0.9.10-1
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+libyang==1.0.73
+libyang1==1.0.184-2
+libzmq5==4.3.1-4+deb10u2
+linux-libc-dev==4.19.171-2
+lldpd==1.0.4-1
+lm-sensors==1:3.5.0-3
+locales==2.28-10
+logrotate==3.14.0-4
+lsb-base==10.2019051400
+lsof==4.91+dfsg-1
+lua-bitop==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+mariadb-common==1:10.3.27-0+deb10u1
+mime-support==3.62
+mysql-common==5.8+1.0.5
+ndisc6==1.0.4-1
+ndppd==0.2.5-4+deb10u1
+net-tools==1.60+git20180626.aebd88e-1
+openssl==1.1.1d-0+deb10u5
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+procps==2:3.3.15-2
+psample==1.1-1
+python==2.7.16-1
+python-funcsigs==1.0.2-4
+python-functools32==3.2.3.2-3
+python-jsonschema==2.6.0-4
+python-minimal==2.7.16-1
+python-mock==2.0.0-4
+python-pbr==4.2.0-5
+python-pkg-resources==40.8.0-1
+python-setuptools==40.8.0-1
+python-six==1.12.0-1
+python-smbus==4.1-1
+python-swsscommon==1.0.0
+python2==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3==3.7.3-1
+python3-distutils==3.7.3-1
+python3-lib2to3==3.7.3-1
+python3-minimal==3.7.3-1
+python3-smbus==4.1-1
+python3-swsscommon==1.0.0
+python3.7==3.7.3-2+deb10u2
+python3.7-minimal==3.7.3-2+deb10u2
+radvd==1:2.17-2
+readline-common==7.0-5
+redis-server==5:6.0.6-1~bpo10+1
+redis-tools==5:6.0.6-1~bpo10+1
+rrdtool==1.7.1-2
+rsyslog==8.1901.0-1
+sensible-utils==0.0.12
+sensord==1:3.5.0-3
+sflowtool==5.04
+smartmontools==6.6-1
+snmp==5.7.3+dfsg-5
+snmpd==5.7.3+dfsg-5
+socat==1.7.3.1-2+deb9u1
+sonic-dhcpmon==1.0.0-0
+sonic-mgmt-common==1.0.0
+sonic-mgmt-framework==1.0-01
+sonic-telemetry==0.1
+swss==1.0.0
+syncd==1.0.0
+tcpdump==4.9.3-1~deb10u2
+ucf==3.0038+nmu1
+udev==241-7~deb10u6
+vim-common==2:8.1.0875-5
+vim-tiny==2:8.1.0875-5
+xxd==2:8.1.0875-5
+xz-utils==5.2.4-1
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
new file mode 100644
index 000000000000..722c73af5c7d
--- /dev/null
+++ b/files/build/versions/default/versions-py2
@@ -0,0 +1,28 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+enum34==1.1.10
+funcsigs==1.0.2
+functools32==3.2.3.post2
+future==0.18.2
+importlib-resources==3.3.1
+ipaddress==1.0.23
+Jinja2==2.11.3
+jsonschema==2.6.0
+lxml==4.6.2
+MarkupSafe==1.1.1
+mock==2.0.0
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.5
+pbr==4.2.0
+pyang==2.4.0
+pyangbind==0.6.0
+PyYAML==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+scandir==1.10.0
+singledispatch==3.6.0
+six==1.12.0
+thrift==0.13.0
+typing==3.7.4.3
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
new file mode 100644
index 000000000000..0c5748ac896a
--- /dev/null
+++ b/files/build/versions/default/versions-py3
@@ -0,0 +1,47 @@
+attrs==20.3.0
+bitarray==1.5.3
+certifi==2017.4.17
+chardet==4.0.0
+click==7.1.2
+clickclick==20.10.2
+connexion==2.7.0
+Flask==1.1.2
+grpcio==1.35.0
+grpcio-tools==1.20.0
+hiredis==1.1.0
+idna==2.10
+importlib-metadata==3.4.0
+inflection==0.5.1
+ipaddress==1.0.23
+itsdangerous==1.1.0
+j2cli==0.3.10
+Jinja2==2.11.3
+jsonschema==3.2.0
+lxml==4.6.2
+MarkupSafe==1.1.1
+natsort==6.2.1
+netaddr==0.8.0
+netifaces==0.10.9
+openapi-spec-validator==0.2.9
+protobuf==3.15.1
+psutil==5.8.0
+pyang==2.4.0
+pyangbind==0.8.1
+pyroute2==0.5.14
+pyrsistent==0.17.3
+python-arptable==0.0.2
+python-dateutil==2.6.0
+PyYAML==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+regex==2020.11.13
+requests==2.25.1
+scapy==2.4.4
+smbus==1.1.post2
+supervisor==4.2.1
+supervisord-dependent-startup==1.4.0
+thrift==0.13.0
+toposort==1.6
+typing-extensions==3.7.4.3
+urllib3==1.21.1
+Werkzeug==1.0.1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
new file mode 100644
index 000000000000..b0a9be7c03a7
--- /dev/null
+++ b/files/build/versions/default/versions-web
@@ -0,0 +1,61 @@
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.debian.tar.xz==c27e499611c48ba307792518d29cdcc7
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.dsc==d9572a9f48c88293341681601a7b18c5
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2.orig.tar.bz2==944558e88ddcc3b9b0d9550070fa3599
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.debian.tar.xz==c2a4cd6b79350378ca9a337b45b732c5
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.dsc==86e28662fa00bec000f22257d212873d
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0.orig.tar.gz==37981f5d3a0f649381529cb41c0f1ff3
+http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debian.tar.xz==a677f850ad1e4f2600cc9c3f3c872927
+http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53
+http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901
+http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
+http://www.mellanox.com/downloads/MFT/mft-4.15.3-3-x86_64-deb.tgz==21caa3657b4100da3d08cf47961edc6f
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:61ac72e84956112656e2500701dd252c5d92f6e6==314a78da036bd5b54637cd17c54ccfd9
+https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
+https://github.com/aristanetworks/sonic-firmware/raw/78a3df2/phy/phy-credo_1.0_amd64.deb==f0d5b5efa18cf775cdc3fccaba7ac181
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20201228_deb10.deb==d4045769acf8abd2ff176ff7e659cc69
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20201228_deb10.deb==b59589104e5189b1f598b8c46d3d6c8a
+https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
+https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
+https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
+https://github.com/Innovium/SONiC/raw/master/debian/master/isai.deb==2ed19469078ff5b04208ed2042d30e05
+https://github.com/Innovium/SONiC/raw/master/debian/master/saihdr.deb==f1e60b01f5c1ae9832931166ba786202
+https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
+https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
+https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
+https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag==a444c876aaf2a8b4c99238f15fbc13a0
+https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
+https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.dsc==e76d5deda89795939828c3b39b31d38f
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==e3afaa4ac1387449dec703da494dd991
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.debian.tar.xz==0a529cf8d1717b5c3dbe0c61b3512aa1
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.dsc==b88b922d96688c948e90987fcaa3a2de
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4.orig.tar.gz==33e8d58623f99184e4e709cbbfe45db3
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.debian.tar.xz==f159fbedc0b69d00b2bdb08db283c0bb
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.dsc==98c68654fadc116346007be9282ae357
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184.orig.tar.gz==0ddfdf2dba5e73486c133c1fba1b3e8e
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
+https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
+https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=twfshldM6GQEphfU%2BQ4xmJlGJkv2Sy7KU1F72RYYM0A%3D&se=2034-10-22T06%3A00%3A45Z&sp=r==84fd57e010281c66d2343b68bd10f7a2
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=e%2BBucofzEwCC%2BclqK1OeCi5YFpQAD4ID4FfODzszsuM%3D&se=2034-10-22T06%3A00%3A14Z&sp=r==d4f4fb23b955792d102351e23678eba8
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.debian.tar.xz?sv=2015-04-05&sr=b&sig=yv77Fr5RtZgRTPmJK3j0lZ0BzsCiGaSs2i7NqQKEy2Y%3D&se=2155-07-05T11%3A39%3A59Z&sp=r==84dc9e966e116384ac13aeca16b9437a
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.dsc?sv=2015-04-05&sr=b&sig=Ph7aMqb%2F%2FE%2F8qwxMXoXb5oK1YPkfVt6PV8mBBv5Wi%2F4%3D&se=2155-07-05T11%3A42%3A29Z&sp=r==b14d356861eaa916f7f19098ab7b1d4e
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
+https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..f760bca27701
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -0,0 +1,71 @@
+ca-certificates==20200601~deb9u1
+curl==7.52.1-5+deb9u13
+jq==1.5+dfsg-1.3
+less==481-2.1
+libcurl3==7.52.1-5+deb9u13
+libdaemon0==0.14-6
+libdbus-1-3==1.10.32-0+deb9u1
+libestr0==0.1.10-2
+libexpat1==2.2.0-2+deb9u3
+libfastjson4==0.99.8-1~bpo9+1
+libffi6==3.2.1-6
+libgdbm3==1.8.3-14
+libgmp10==2:6.1.2+dfsg-1
+libgnutls30==3.5.8-5+deb9u5
+libgssapi-krb5-2==1.15-1+deb9u2
+libhogweed4==3.3-1+b2
+libidn2-0==0.16-1+deb9u1
+libjansson4==2.9-1
+libjq1==1.5+dfsg-1.3
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+liblognorm5==2.0.3-1~bpo9+1
+libncurses5==6.0+20161126-1+deb9u2
+libnghttp2-14==1.18.1-1+deb9u1
+libonig4==6.1.3-2+deb9u2
+libp11-kit0==0.23.3-2+deb9u1
+libperl5.24==5.24.1-3+deb9u7
+libpgm-5.2-0==5.2.122~dfsg-2
+libprocps6==2:3.3.12-3+deb9u1
+libpsl5==0.17.0-3
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u4
+libpython2.7-minimal==2.7.13-2+deb9u4
+libpython2.7-stdlib==2.7.13-2+deb9u4
+libreadline7==7.0-3
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsodium18==1.0.11-2
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libtasn1-6==4.10-1.1+deb9u1
+libunistring0==0.9.6+really0.9.3-0.1
+libwrap0==7.6.q-26
+libzmq5==4.2.1-4+deb9u3
+lua-cjson==2.1.0+dfsg-2
+mime-support==3.60
+net-tools==1.60+git20161116.90da8a0-1
+openssl==1.1.0l-1~deb9u3
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+procps==2:3.3.12-3+deb9u1
+python==2.7.13-2
+python-minimal==2.7.13-2
+python-pip==9.0.1-2+deb9u2
+python-pip-whl==9.0.1-2+deb9u2
+python2.7==2.7.13-2+deb9u4
+python2.7-minimal==2.7.13-2+deb9u4
+readline-common==7.0-3
+redis-tools==5:6.0.6-1~bpo10+1
+rsyslog==8.1901.0-1~bpo9+1
+socat==1.7.3.1-2+deb9u1
+vim-common==2:8.0.0197-4+deb9u3
+vim-tiny==2:8.0.0197-4+deb9u3
+xxd==2:8.0.0197-4+deb9u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
new file mode 100644
index 000000000000..54e22f62fbab
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -0,0 +1,4 @@
+j2cli==0.3.10
+supervisor==4.2.1
+supervisord-dependent-startup==1.4.0
+toposort==1.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
new file mode 100644
index 000000000000..80be8cff9a6c
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -0,0 +1 @@
+six==1.15.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..bcd99b6899bd
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -0,0 +1,11 @@
+bzip2==1.0.6-8.1
+dpkg-dev==1.18.25
+libhiredis0.14==0.14.0-3~bpo9+1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libswsscommon==1.0.0
+python-swsscommon==1.0.0
+xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
new file mode 100644
index 000000000000..c2bea3fa5a42
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -0,0 +1,4 @@
+six==1.15.0
+sonic-config-engine==1.0
+sonic-py-common==1.0
+swsssdk==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
new file mode 100644
index 000000000000..090a9af05b59
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+isc-dhcp-relay-dbgsym==4.4.1-2
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
new file mode 100644
index 000000000000..f7c4d4703113
--- /dev/null
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -0,0 +1,19 @@
+frr-dbgsym==7.5-sonic-0
+frr-snmp-dbgsym==7.5-sonic-0
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsnmp-base==5.7.3+dfsg-5+deb10u2
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libswsscommon-dbg==1.0.0
+libyang1-dbgsym==1.0.184-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-py3 b/files/build/versions/dockers/docker-fpm-frr/versions-py3
new file mode 100644
index 000000000000..ff7826d683d4
--- /dev/null
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-py3
@@ -0,0 +1 @@
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
new file mode 100644
index 000000000000..abd21dae6b32
--- /dev/null
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -0,0 +1,5 @@
+iproute2==4.20.0-2
+libsaivs==1.0.0
+libsaivs-dbg==1.0.0
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
new file mode 100644
index 000000000000..dced6f540d81
--- /dev/null
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -0,0 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsnmp-base==5.7.3+dfsg-5
+libsnmp30==5.7.3+dfsg-5
+libswsscommon-dbg==1.0.0
+lldpd-dbgsym==1.0.4-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 000000000000..159c8c90df8b
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,14 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
new file mode 100644
index 000000000000..0969e5edd95e
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,15 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
new file mode 100644
index 000000000000..2789343f7e62
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -0,0 +1,25 @@
+applibs==1.mlnx.4.4.2308
+applibs-dev==1.mlnx.4.4.2308
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsensors5-dbgsym==1:3.5.0-3
+libswsscommon-dbg==1.0.0
+lm-sensors-dbgsym==1:3.5.0-3
+openssh-client==1:7.9p1-10+deb10u2
+python-sdk-api==1.mlnx.4.4.2308
+sensord-dbgsym==1:3.5.0-3
+sshpass==1.06-1
+strace==4.26-0.2
+sx-complib==1.mlnx.4.4.2308
+sx-complib-dev==1.mlnx.4.4.2308
+sx-gen-utils==1.mlnx.4.4.2308
+sx-gen-utils-dev==1.mlnx.4.4.2308
+sxd-libs==1.mlnx.4.4.2308
+sxd-libs-dev==1.mlnx.4.4.2308
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
new file mode 100644
index 000000000000..8baa3d5cd96b
--- /dev/null
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -0,0 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsnmp-base==5.7.3+dfsg-5
+libsnmp30==5.7.3+dfsg-5
+libsnmp30-dbg==5.7.3+dfsg-5
+openssh-client==1:7.9p1-10+deb10u2
+snmp-dbgsym==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..a29d8370e78a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sonic-mgmt-framework-dbg==1.0-01
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
new file mode 100644
index 000000000000..494327b626b8
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -0,0 +1,2 @@
+six==1.11.0
+zipp==3.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
new file mode 100644
index 000000000000..79bde915fac7
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -0,0 +1,12 @@
+bfnplatform==1.0.0
+bfnsdk==1.0.0
+libcurl3-gnutls==7.64.0-4+deb10u1
+libcurl4-gnutls-dev==7.64.0-4+deb10u1
+libgoogle-perftools4==2.7-1
+liblzma-dev==5.2.4-1
+libpcap-dev==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libtcmalloc-minimal4==2.7-1
+libunwind-dev==1.2.1-10~deb10u1
+libusb-1.0-0==2:1.0.22-2
+libusb-1.0-0-dev==2:1.0.22-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
new file mode 100644
index 000000000000..e29438991e1b
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -0,0 +1,58 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.67.0==1.67.0-13+deb10u1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u1
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libgomp1==8.3.0-6
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpython-dev==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2.7-dev==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u5
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python-dev==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python2-dev==2.7.16-1
+python2.7-dev==2.7.16-2+deb10u1
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
new file mode 100644
index 000000000000..74abbdb5bd6f
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsai==1.6.3-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
new file mode 100644
index 000000000000..c9d822e1191a
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
@@ -0,0 +1,5 @@
+innovium-sai==0.11.1
+innovium-sai-headers==0.11.1
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
new file mode 100644
index 000000000000..e29438991e1b
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -0,0 +1,58 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.67.0==1.67.0-13+deb10u1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u1
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libgomp1==8.3.0-6
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpython-dev==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2.7-dev==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u5
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python-dev==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python2-dev==2.7.16-1
+python2.7-dev==2.7.16-2+deb10u1
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
new file mode 100644
index 000000000000..9a3346645c8d
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -0,0 +1,21 @@
+applibs==1.mlnx.4.4.2308
+applibs-dev==1.mlnx.4.4.2308
+iproute2==1.mlnx.4.4.2308
+iproute2-dev==1.mlnx.4.4.2308
+libelf1==0.176-1.1
+mlnx-sai==1.mlnx.SAIRel1.18.1.0
+python-sdk-api==1.mlnx.4.4.2308
+sx-acl-helper==1.mlnx.4.4.2308
+sx-acl-helper-dev==1.mlnx.4.4.2308
+sx-complib==1.mlnx.4.4.2308
+sx-complib-dev==1.mlnx.4.4.2308
+sx-examples==1.mlnx.4.4.2308
+sx-examples-dev==1.mlnx.4.4.2308
+sx-gen-utils==1.mlnx.4.4.2308
+sx-gen-utils-dev==1.mlnx.4.4.2308
+sx-scew==1.mlnx.4.4.2308
+sx-scew-dev==1.mlnx.4.4.2308
+sxd-libs==1.mlnx.4.4.2308
+sxd-libs-dev==1.mlnx.4.4.2308
+wjh-libs==1.mlnx.4.4.2308
+wjh-libs-dev==1.mlnx.4.4.2308
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
new file mode 100644
index 000000000000..6494a41ddc7f
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -0,0 +1,29 @@
+gdb==7.12-6
+gdbserver==7.12-6
+libbabeltrace-ctf1==1.5.1-1
+libbabeltrace1==1.5.1-1
+libbsd0==0.8.3-1
+libdw1==0.168-1
+libedit2==3.1-20160903-3
+libglib2.0-0==2.50.3-2+deb9u2
+libgpm2==1.20.4-6.2+b1
+libicu57==57.1-6+deb9u4
+libmpdec2==2.4.2-1
+libpopt0==1.16-10+b2
+libpython3.5==3.5.3-1+deb9u3
+libpython3.5-minimal==3.5.3-1+deb9u3
+libpython3.5-stdlib==3.5.3-1+deb9u3
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsainps==1.5.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libxml2==2.9.4+dfsg1-2.2+deb9u3
+openssh-client==1:7.4p1-10+deb9u7
+sshpass==1.06-1
+strace==4.15-2
+syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
new file mode 100644
index 000000000000..abd21dae6b32
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -0,0 +1,5 @@
+iproute2==4.20.0-2
+libsaivs==1.0.0
+libsaivs-dbg==1.0.0
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 000000000000..eeb36c01b260
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+libteam-utils-dbgsym==1.30-1
+libteamdctl0-dbgsym==1.30-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
new file mode 100644
index 000000000000..5ae65c86315a
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -0,0 +1,1665 @@
+adwaita-icon-theme==3.30.1-1
+ant==1.10.5-2
+ant-optional==1.10.5-2
+apt-file==3.2.2
+apt-transport-https==1.8.2.2
+apt-utils==1.8.2.2
+arch-test==0.15-2+deb10u1
+asciidoctor==1.5.8-1
+aspell==0.60.7~20110707-6
+aspell-en==2018.04.16-0-1
+at==3.1.23-1
+at-spi2-core==2.30.0-7
+aufs-dkms==4.19+20190211-1
+aufs-tools==1:4.14+20190211-1
+augeas-lenses==1.11.0-3
+augeas-tools==1.11.0-3
+autoconf==2.69-11
+autoconf-archive==20180313-1
+autogen==1:5.18.12-4
+autogen-doc==1:5.18.12-4
+automake==1:1.16.1-4
+automake1.11==1:1.11.6-5
+autopoint==0.19.8.1-9
+autotools-dev==20180224.1
+bash-completion==1:2.8-6
+bc==1.07.1-2+b1
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u3
+binfmt-support==2.2.0-2
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+bison==2:3.3.2.dfsg-1
+blt==2.5.3+dfsg-4
+bsd-mailx==8.1.2-0.20180807cvs-1
+bsdmainutils==11.1.2+b1
+build-essential==12.6
+byacc==20140715-1+b1
+bzip2==1.0.6-9.2~deb10u1
+bzip2-doc==1.0.6-9.2~deb10u1
+ca-certificates==20200601~deb10u2
+ca-certificates-java==20190405
+cdbs==0.4.159
+cgroupfs-mount==1.4
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:7.0-47
+clang-7==1:7.0.1-8+deb10u2
+cm-super-minimal==0.3.4-14
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cmocka-doc==1.1.3-1
+comerr-dev==2.1-1.44.5-1+deb10u3
+containerd.io==1.4.3-1
+cowbuilder==0.88
+cowdancer==0.88
+cpio==2.12+dfsg-9
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+cppcheck==1.86-1
+cron==3.0pl1-134+deb10u1
+curl==7.64.0-4+deb10u1
+dbus==1.12.20-0+deb10u1
+dbus-user-session==1.12.20-0+deb10u1
+dconf-gsettings-backend==0.30.1-2
+dconf-service==0.30.1-2
+dctrl-tools==2.24-3
+debhelper==12.1.1
+debian-keyring==2019.02.25
+debootstrap==1.0.114
+default-jdk-headless==2:1.11-71
+default-jre==2:1.11-71
+default-jre-headless==2:1.11-71
+default-libmysqlclient-dev==1.0.5
+device-tree-compiler==1.4.7-4
+devscripts==2.19.5+deb10u1
+dh-apparmor==2.13.2-10
+dh-autoreconf==19
+dh-exec==0.23.1
+dh-make==2.201802
+dh-python==3.20190308
+dh-strip-nondeterminism==1.1.2-1
+dh-systemd==12.1.1
+dictionaries-common==1.28.1
+diffstat==1.62-1
+dirmngr==2.2.12-1+deb10u1
+distro-info-data==0.41+deb10u3
+dkms==2.6.1-4
+dmeventd==2:1.02.155-3
+dmsetup==2:1.02.155-3
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u3
+docker-ce==5:18.09.5~3-0~debian-buster
+docker-ce-cli==5:18.09.5~3-0~debian-buster
+docutils-common==0.14+dfsg-4
+docutils-doc==0.14+dfsg-4
+dosfstools==4.1-2
+doxygen==1.8.13-10
+dpatch==2.0.38+nmu1
+dpkg-dev==1.19.7
+dput==1.0.3
+dvipng==1.15-1.1
+dwz==0.12-3
+eatmydata==105-7
+emacsen-common==3.0.4
+equivs==2.2.0
+exim4-base==4.92-8+deb10u4
+exim4-config==4.92-8+deb10u4
+exim4-daemon-light==4.92-8+deb10u4
+expat==2.2.6-2+deb10u1
+exuberant-ctags==1:5.9~svn20110310-12
+fakeroot==1.23-1
+file==1:5.35-4+deb10u2
+flex==2.6.4-6.2
+fontconfig==2.13.1-2
+fontconfig-config==2.13.1-2
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==5.0.10+really4.7.0~dfsg-1
+fonts-glyphicons-halflings==1.009~3.4.1+dfsg-1
+fonts-lato==2.0-2
+fonts-liberation==1:1.07.4-9
+fonts-lmodern==2.004.5-6
+fonts-noto-mono==20181227-1
+fonts-roboto-slab==1.100263+20170512-1
+fonts-texgyre==20180621-3
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gawk==1:4.2.1+dfsg-1
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+gcc-8-multilib==8.3.0-6
+gcc-multilib==4:8.3.0-1
+gcovr==4.1-2
+gdb==8.2.1-2+b3
+gem2deb==0.43
+gem2deb-test-runner==0.43
+geoip-database==20181108-1
+gettext==0.19.8.1-9
+gettext-base==0.19.8.1-9
+gfortran==4:8.3.0-1
+gfortran-8==8.3.0-6
+ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-glib-2.0==1.58.3-2
+gir1.2-packagekitglib-1.0==1.1.12-5
+git==1:2.20.1-2+deb10u3
+git-buildpackage==0.9.14
+git-man==1:2.20.1-2+deb10u3
+glib-networking==2.58.0-2+deb10u2
+glib-networking-common==2.58.0-2+deb10u2
+glib-networking-services==2.58.0-2+deb10u2
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gnupg2==2.2.12-1+deb10u1
+googletest==1.8.1-3
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+graphviz==2.40.1-6
+groff==1.22.4-3
+groff-base==1.22.4-3
+gsettings-desktop-schemas==3.28.1-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
+gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2
+gstreamer1.0-plugins-base==1.14.4-2
+gstreamer1.0-plugins-good==1.14.4-1
+gstreamer1.0-plugins-ugly==1.14.4-1
+gstreamer1.0-x==1.14.4-2
+gtk-update-icon-cache==3.24.5-1
+guile-2.0-libs==2.0.13+1-5.1
+hicolor-icon-theme==0.17-2
+i965-va-driver==2.3.0+dfsg1-1
+ibverbs-providers==22.1-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==63.1-6+deb10u1
+imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
+install-info==6.5.0.dfsg.1-4+b1
+intel-media-va-driver==18.4.1+dfsg1-1
+intltool-debian==0.35.0+20060710.5
+iptables==1.8.2-4
+iptables-dev==1.8.2-4
+ipxe-qemu==1.0.0+git-20190125.36a4c85-1
+iso-codes==4.2-1
+java-common==0.71
+java-wrappers==0.3
+javahelper==0.72.9
+javascript-common==11
+kernel-wedge==2.99
+kmod==26-1
+krb5-locales==1.17-3+deb10u1
+krb5-multidev==1.17-3+deb10u1
+lcov==1.13-4
+less==487-0.1+b1
+lib32asan5==8.3.0-6
+lib32atomic1==8.3.0-6
+lib32gcc-8-dev==8.3.0-6
+lib32gcc1==1:8.3.0-6
+lib32gomp1==8.3.0-6
+lib32itm1==8.3.0-6
+lib32mpx2==8.3.0-6
+lib32quadmath0==8.3.0-6
+lib32stdc++6==8.3.0-6
+lib32ubsan1==8.3.0-6
+liba52-0.7.4==0.7.4-19
+libaa1==1.4p5-46
+libaacs0==0.9.0-2
+libaio1==0.3.112-3
+libalgorithm-diff-perl==1.19.03-2
+libalgorithm-diff-xs-perl==0.04-5+b1
+libalgorithm-merge-perl==0.08-3
+libaom0==1.0.0-3
+libaopalliance-java==20070526-6
+libapache-pom-java==18-1
+libapparmor1==2.13.2-10
+libappstream4==0.12.5-1
+libapt-inst2.0==1.8.2.2
+libapt-pkg-perl==0.1.34+b1
+libarchive-cpio-perl==0.10-1
+libarchive-zip-perl==1.64-1
+libarchive13==3.3.3-4+deb10u1
+libargon2-1==0~20171227-0.2
+libasan5==8.3.0-6
+libasm-java==7.0-1
+libasound2==1.1.8-1
+libasound2-data==1.1.8-1
+libaspell15==0.60.7~20110707-6
+libass9==1:0.14.0-2
+libassuan0==2.5.2-1
+libasync-mergepoint-perl==0.04-2
+libasyncns0==0.8-6
+libatinject-jsr330-api-java==1.0+ds1-5
+libatk-bridge2.0-0==2.30.0-5
+libatk-wrapper-java==0.33.3-22
+libatk-wrapper-java-jni==0.33.3-22
+libatk1.0-0==2.30.0-2
+libatk1.0-data==2.30.0-2
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==8.3.0-6
+libatspi2.0-0==2.30.0-7
+libaudio2==1.9.4-6
+libaudit-dev==1:2.8.4-3
+libaugeas0==1.11.0-3
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.7-4+b1
+libavahi-common-data==0.7-4+b1
+libavahi-common3==0.7-4+b1
+libavalon-framework-java==4.2.0-10
+libavc1394-0==0.5.4-5
+libavcodec58==7:4.1.6-1~deb10u1
+libavfilter7==7:4.1.6-1~deb10u1
+libavformat58==7:4.1.6-1~deb10u1
+libavutil56==7:4.1.6-1~deb10u1
+libb-hooks-endofscope-perl==0.24-1
+libb-hooks-op-check-perl==0.22-1+b1
+libbabeltrace-dev==1.5.6-2+deb10u1
+libbabeltrace1==1.5.6-2+deb10u1
+libbatik-java==1.10-2+deb10u1
+libbdplus0==0.1.2-3
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u3
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libbinutils==2.31.1-16
+libbison-dev==2:3.3.2.dfsg-1
+libbit-vector-perl==7.4-1+b5
+libblkid-dev==2.33.1-0.1
+libbluetooth3==5.50-1.2~deb10u1
+libbluray2==1:1.1.0-1
+libboost-atomic1.71-dev==1.71.0-6~bpo10+1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libboost-chrono1.71-dev==1.71.0-6~bpo10+1
+libboost-chrono1.71.0==1.71.0-6~bpo10+1
+libboost-container1.71-dev==1.71.0-6~bpo10+1
+libboost-container1.71.0==1.71.0-6~bpo10+1
+libboost-context1.71-dev==1.71.0-6~bpo10+1
+libboost-context1.71.0==1.71.0-6~bpo10+1
+libboost-contract1.71-dev==1.71.0-6~bpo10+1
+libboost-contract1.71.0==1.71.0-6~bpo10+1
+libboost-coroutine1.71-dev==1.71.0-6~bpo10+1
+libboost-coroutine1.71.0==1.71.0-6~bpo10+1
+libboost-date-time1.71-dev==1.71.0-6~bpo10+1
+libboost-date-time1.71.0==1.71.0-6~bpo10+1
+libboost-fiber1.71-dev==1.71.0-6~bpo10+1
+libboost-fiber1.71.0==1.71.0-6~bpo10+1
+libboost-filesystem1.71-dev==1.71.0-6~bpo10+1
+libboost-filesystem1.71.0==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71-dev==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71.0==1.71.0-6~bpo10+1
+libboost-log1.71-dev==1.71.0-6~bpo10+1
+libboost-log1.71.0==1.71.0-6~bpo10+1
+libboost-mpi1.71.0==1.71.0-6~bpo10+1
+libboost-program-options1.71-dev==1.71.0-6~bpo10+1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-regex1.71-dev==1.71.0-6~bpo10+1
+libboost-regex1.71.0==1.71.0-6~bpo10+1
+libboost-serialization1.71-dev==1.71.0-6~bpo10+1
+libboost-serialization1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71-dev==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-test1.71-dev==1.71.0-6~bpo10+1
+libboost-test1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71-dev==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libboost1.71-dev==1.71.0-6~bpo10+1
+libbrlapi0.6==5.6-10+deb10u1
+libbrotli1==1.0.7-2+deb10u1
+libbs2b0==3.1.0+dfsg-2.2
+libbsd-dev==0.9.1-2
+libbsd0==0.9.1-2
+libbsh-java==2.0b4-19
+libbz2-dev==1.0.6-9.2~deb10u1
+libc-ares-dev==1.14.0-1
+libc-ares2==1.14.0-1
+libc-dev-bin==2.28-10
+libc6-dbg==2.28-10
+libc6-dev==2.28-10
+libc6-dev-i386==2.28-10
+libc6-dev-x32==2.28-10
+libc6-i386==2.28-10
+libc6-x32==2.28-10
+libcaca0==0.99.beta19-2.1
+libcacard0==1:2.6.1-1
+libcaf-openmpi-3==2.4.0-2
+libcairo-gobject2==1.16.0-4+deb10u1
+libcairo2==1.16.0-4+deb10u1
+libcap-dev==1:2.25-2
+libcap-ng-dev==0.7.9-2
+libcapstone3==4.0.1+really+3.0.5-1
+libcapture-tiny-perl==0.48-1
+libcarp-clan-perl==6.07-1
+libcc1-0==8.3.0-6
+libcdi-api-java==1.2-2
+libcdio18==2.0.0-2
+libcdparanoia0==3.10.2+debian-13
+libcdt5==2.40.1-6
+libcgi-fast-perl==1:2.13-1
+libcgi-pm-perl==4.40-1
+libcglib-java==3.2.10-1
+libcgraph6==2.40.1-6
+libchromaprint1==1.4.3-3
+libclang-common-7-dev==1:7.0.1-8+deb10u2
+libclang1-6.0==1:6.0.1-10
+libclang1-7==1:7.0.1-8+deb10u2
+libclass-accessor-perl==0.51-1
+libclass-inspector-perl==1.32-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-3+b2
+libclone-perl==0.41-1+b1
+libcmocka-dev==1.1.3-1
+libcmocka0==1.1.3-1
+libcoarrays-dev==2.4.0-2
+libcoarrays-openmpi-dev==2.4.0-2
+libcodec2-0.8.1==0.8.1-2
+libcolord2==1.4.3-4
+libcommon-sense-perl==3.74-2+b7
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.4-1
+libcommons-codec-java==1.11-1
+libcommons-collections3-java==3.2.2-2
+libcommons-compress-java==1.18-2+deb10u1
+libcommons-configuration-java==1.10-5
+libcommons-digester-java==1.8.1-5
+libcommons-io-java==2.6-2
+libcommons-lang-java==2.6-8
+libcommons-lang3-java==3.8-2
+libcommons-logging-java==1.2-2
+libcommons-parent-java==43-1
+libcommons-validator-java==1:1.6-2
+libconst-fast-perl==0.014-1
+libcontextual-return-perl==0.004014-2
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.12-3
+libcryptsetup12==2:2.1.0-5+deb10u2
+libcrystalhd3==1:0.0~git20110715.fdd2f19-13
+libcups2==2.2.10-6+deb10u4
+libcupsfilters1==1.21.6-5
+libcupsimage2==2.2.10-6+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u1
+libcurl3-nss==7.64.0-4+deb10u1
+libcurl4==7.64.0-4+deb10u1
+libcurl4-nss-dev==7.64.0-4+deb10u1
+libdaemon-dev==0.14-7
+libdaemon0==0.14-7
+libdata-dump-perl==1.23-1
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.12-2
+libdb-dev==5.3.1+nmu1
+libdb5.3-dev==5.3.28+dfsg1-0.5
+libdbi1==0.9.0-5
+libdbus-1-3==1.12.20-0+deb10u1
+libdbus-1-dev==1.12.20-0+deb10u1
+libdconf1==0.30.1-2
+libde265-0==1.0.3-1+b1
+libdevel-callchecker-perl==0.008-1
+libdevel-globaldestruction-perl==0.14-1
+libdevmapper-event1.02.1==2:1.02.155-3
+libdevmapper1.02.1==2:1.02.155-3
+libdigest-bubblebabble-perl==0.02-2
+libdigest-hmac-perl==1.03+dfsg-2
+libdistro-info-perl==0.21
+libdjvulibre-text==3.5.27.1-10
+libdjvulibre21==3.5.27.1-10
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdom4j-java==2.1.1-2
+libdouble-conversion1==3.1.0-3
+libdoxia-core-java==1.7-2
+libdoxia-java==1.7-2
+libdoxia-sitetools-java==1.7.5-1
+libdpkg-perl==1.19.7
+libdrm-amdgpu1==2.4.97-1
+libdrm-common==2.4.97-1
+libdrm-dev==2.4.97-1
+libdrm-intel1==2.4.97-1
+libdrm-nouveau2==2.4.97-1
+libdrm-radeon1==2.4.97-1
+libdrm2==2.4.97-1
+libdv4==1.0.0-12
+libdvdnav4==6.0.0-1
+libdvdread4==6.0.1-1
+libdw-dev==0.176-1.1
+libdw1==0.176-1.1
+libdynaloader-functions-perl==0.003-1
+libeatmydata1==105-7
+libedit-dev==3.1-20181209-1
+libedit2==3.1-20181209-1
+libegl-mesa0==18.3.6-2+deb10u1
+libegl1==1.1.0-1
+libel-api-java==3.0.0-2+deb10u1
+libelf-dev==0.176-1.1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.5.3-0.1
+liberror-perl==0.17027-2
+libestr0==0.1.10-2.1
+libevdev2==1.6.0+dfsg-1
+libevent-2.1-6==2.1.8-stable-4
+libevent-core-2.1-6==2.1.8-stable-4
+libevent-dev==2.1.8-stable-4
+libevent-extra-2.1-6==2.1.8-stable-4
+libevent-openssl-2.1-6==2.1.8-stable-4
+libevent-pthreads-2.1-6==2.1.8-stable-4
+libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
+libexplain-dev==1.4.D001-8
+libexplain51==1.4.D001-8
+libexporter-tiny-perl==1.002001-1
+libfabric1==1.6.2-3
+libfakeroot==1.23-1
+libfastjson4==0.99.8-2
+libfcgi-perl==0.78-2+b3
+libfdt1==1.4.7-4
+libffi-dev==3.2.1-9
+libfftw3-double3==3.3.8-2
+libfile-basedir-perl==0.08-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b5
+libfile-homedir-perl==1.004-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.29-1
+libfile-stripnondeterminism-perl==1.1.2-1
+libfile-which-perl==1.23-1
+libfl-dev==2.6.4-6.2
+libfl2==2.6.4-6.2
+libflac8==1.3.2-3
+libflite1==2.1-release-3
+libfont-afm-perl==1.20-2
+libfontbox2-java==2.0.13-2
+libfontconfig1==2.13.1-2
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.3-2
+libfreetype6==2.9.1-3+deb10u2
+libfribidi0==1.0.5-3.1+deb10u1
+libfstrm0==0.4.0-1
+libfuture-perl==0.39-1
+libgail-common==2.24.32-3
+libgail18==2.24.32-3
+libgbm1==18.3.6-2+deb10u1
+libgc1c2==1:7.6.4-0.4
+libgcc-8-dev==8.3.0-6
+libgd-perl==2.71-2
+libgd3==2.2.5-5.2
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libgdk-pixbuf2.0-0==2.38.1+dfsg-1
+libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
+libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgeoip1==1.6.12-1
+libgeronimo-annotation-1.3-spec-java==1.0-1
+libgeronimo-interceptor-3.0-spec-java==1.0.1-4
+libgetopt-long-descriptive-perl==0.103-2
+libgfortran-8-dev==8.3.0-6
+libgfortran5==8.3.0-6
+libgif7==5.1.4-3
+libgirepository-1.0-1==1.58.3-2
+libgit-wrapper-perl==0.048-1
+libgitlab-api-v4-perl==0.16-1
+libgl1==1.1.0-1
+libgl1-mesa-dev==18.3.6-2+deb10u1
+libgl1-mesa-dri==18.3.6-2+deb10u1
+libglapi-mesa==18.3.6-2+deb10u1
+libgles1==1.1.0-1
+libgles2==1.1.0-1
+libglib2.0-0==2.58.3-2+deb10u2
+libglib2.0-bin==2.58.3-2+deb10u2
+libglib2.0-data==2.58.3-2+deb10u2
+libglib2.0-dev==2.58.3-2+deb10u2
+libglib2.0-dev-bin==2.58.3-2+deb10u2
+libglu1-mesa==9.0.0-2.1+b3
+libglu1-mesa-dev==9.0.0-2.1+b3
+libglvnd-core-dev==1.1.0-1
+libglvnd-dev==1.1.0-1
+libglvnd0==1.1.0-1
+libglx-mesa0==18.3.6-2+deb10u1
+libglx0==1.1.0-1
+libgme0==0.6.2-1
+libgmp-dev==2:6.1.2+dfsg-4
+libgmpxx4ldbl==2:6.1.2+dfsg-4
+libgnutls-dane0==3.6.7-4+deb10u6
+libgnutls-openssl27==3.6.7-4+deb10u6
+libgnutls28-dev==3.6.7-4+deb10u6
+libgnutlsxx28==3.6.7-4+deb10u6
+libgomp1==8.3.0-6
+libgoogle-perftools4==2.7-1
+libgpgme11==1.12.0-6
+libgpm2==1.20.7-5
+libgraphite2-3==1.3.13-7
+libgs9==9.27~dfsg-2+deb10u4
+libgs9-common==9.27~dfsg-2+deb10u4
+libgsm1==1.0.18-2
+libgssapi-krb5-2==1.17-3+deb10u1
+libgssrpc4==1.17-3+deb10u1
+libgstreamer-plugins-base1.0-0==1.14.4-2
+libgstreamer1.0-0==1.14.4-1
+libgtest-dev==1.8.1-3
+libgtk-3-0==3.24.5-1
+libgtk-3-bin==3.24.5-1
+libgtk-3-common==3.24.5-1
+libgtk2.0-0==2.24.32-3
+libgtk2.0-bin==2.24.32-3
+libgtk2.0-common==2.24.32-3
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==232-2
+libguice-java==4.2.1-1
+libgvc6==2.40.1-6
+libgvpr2==2.40.1-6
+libharfbuzz-icu0==2.3.1-1
+libharfbuzz0b==2.3.1-1
+libhawtjni-runtime-java==1.16-1
+libheif1==1.3.2-2~deb10u1
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3+b3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.07-2
+libhttp-cookies-perl==6.04-1
+libhttp-daemon-perl==6.01-3
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.18-1
+libhttp-negotiate-perl==6.01-1
+libhttp-tiny-multipart-perl==0.08-1
+libhttpclient-java==4.5.7-1+deb10u1
+libhttpcore-java==4.4.11-1
+libhwloc-dev==1.11.12-3
+libhwloc-plugins==1.11.12-3
+libhwloc5==1.11.12-3
+libiberty-dev==20190122-1
+libibverbs-dev==22.1-1
+libibverbs1==22.1-1
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libidn11==1.33-2.2
+libidn2-dev==2.0.5-1+deb10u1
+libiec61883-0==1.2.0-3
+libigdgmm5==18.4.1+ds1-1
+libijs-0.35==0.35-14
+libilmbase23==2.2.1-2
+libimagequant0==2.12.2-1.1
+libimport-into-perl==1.002005-1
+libinput-bin==1.12.6-2+deb10u1
+libinput10==1.12.6-2+deb10u1
+libio-async-perl==0.72-1
+libio-html-perl==1.001-1
+libio-prompter-perl==0.004015-1
+libio-pty-perl==1:1.08-1.1+b5
+libio-sessiondata-perl==1.03-1
+libio-socket-ssl-perl==2.060-3
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-3
+libip4tc-dev==1.8.2-4
+libip4tc0==1.8.2-4
+libip6tc-dev==1.8.2-4
+libip6tc0==1.8.2-4
+libipc-run-perl==20180523.0-1
+libipc-system-simple-perl==1.25-4
+libipt2==2.0-2
+libiptc-dev==1.8.2-4
+libiptc0==1.8.2-4
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisl19==0.20-2
+libitext1-java==1.4-7
+libitm1==8.3.0-6
+libjack-jackd2-0==1.9.12~dfsg-2
+libjansi-java==1.17.1-1
+libjansi-native-java==1.8-1
+libjansson-dev==2.12-1
+libjansson4==2.12-1
+libjaxen-java==1.1.6-4
+libjaxp1.3-java==1.3.05-5
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.16-1
+libjemalloc-dev==5.1.0-3
+libjemalloc2==5.1.0-3
+libjetty9-java==9.4.15-1
+libjpeg62-turbo==1:1.5.2-2+deb10u1
+libjs-bootstrap==3.4.1+dfsg-1
+libjs-jquery==3.3.1~dfsg-3
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==12-1.1
+libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-3
+libjs-sphinxdoc==1.8.4-1
+libjs-underscore==1.9.1~dfsg-1
+libjson-c-dev==0.12.1+ds-2+deb10u1
+libjson-c3==0.12.1+ds-2+deb10u1
+libjson-glib-1.0-0==1.4.4-2
+libjson-glib-1.0-common==1.4.4-2
+libjson-perl==4.02000-1
+libjson-xs-perl==3.040-1+b1
+libjsoncpp1==1.7.4-3
+libjsp-api-java==2.3.4-2+deb10u1
+libjsr305-java==0.1~+svn49-11
+libjtidy-java==7+svn20110807-5
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libk5crypto3==1.17-3+deb10u1
+libkadm5clnt-mit11==1.17-3+deb10u1
+libkadm5srv-mit11==1.17-3+deb10u1
+libkdb5-9==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libkmod2==26-1
+libkpathsea6==2018.20181218.49446-1
+libkrb5-3==1.17-3+deb10u1
+libkrb5-dev==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libksba8==1.3.5-2
+liblab-gamut1==2.40.1-6
+liblcms2-2==2.9-3
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+libldap2-dev==2.4.47+dfsg-3+deb10u6
+liblilv-0-0==0.24.2~dfsg0-2
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b4
+libllvm6.0==1:6.0.1-10
+libllvm7==1:7.0.1-8+deb10u2
+liblmdb0==0.9.22-1
+liblocale-gettext-perl==1.07-3+b4
+liblockfile-bin==1.14-1.1
+liblockfile1==1.14-1.1
+liblog-any-adapter-screen-perl==0.140-1
+liblog-any-perl==1.707-1
+liblog4j1.2-java==1.2.17-8+deb10u1
+liblognorm5==2.0.5-1
+liblqr-1-0==0.4.2-2.1
+liblsan0==8.3.0-6
+libltdl-dev==2.4.6-9
+libltdl7==2.4.6-9
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblvm2cmd2.03==2.03.02-3
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.07-2
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u3
+liblzma-dev==5.2.4-1
+liblzo2-2==2.10-0.1
+liblzo2-dev==2.10-0.1
+libmagic-mgc==1:5.35-4+deb10u2
+libmagic1==1:5.35-4+deb10u2
+libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmail-sendmail-perl==0.80-1
+libmailtools-perl==2.18-1
+libmariadb-dev==1:10.3.27-0+deb10u1
+libmariadb-dev-compat==1:10.3.27-0+deb10u1
+libmariadb3==1:10.3.27-0+deb10u1
+libmaven-archiver-java==3.2.0-2
+libmaven-clean-plugin-java==3.1.0-1
+libmaven-common-artifact-filters-java==3.0.1-3
+libmaven-compiler-plugin-java==3.8.0-2
+libmaven-filtering-java==3.1.1-1
+libmaven-jar-plugin-java==3.1.1-1
+libmaven-parent-java==31-2
+libmaven-plugin-tools-java==3.6.0-1
+libmaven-reporting-api-java==3.0-1
+libmaven-reporting-exec-java==1.4-2
+libmaven-reporting-impl-java==3.0.0-2
+libmaven-resolver-java==1.3.1-1
+libmaven-resources-plugin-java==3.1.0-1
+libmaven-shared-incremental-java==1.1-3
+libmaven-shared-utils-java==3.3.0-1
+libmaven-site-plugin-java==3.6-3
+libmaven3-core-java==3.6.0-1
+libmime-tools-perl==5.509-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.016-1
+libmoo-perl==2.003004-2
+libmount-dev==2.33.1-0.1
+libmp3lame0==3.100-2+b1
+libmpc3==1.1.0-1
+libmpdec2==2.4.2-2
+libmpeg2-4==0.5.1-8
+libmpfr6==4.0.2-1
+libmpg123-0==1.25.10-2
+libmpx2==8.3.0-6
+libmtdev1==1.1.5-1+b1
+libmysofa0==0.6~dfsg0-3+deb10u1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==1.1.5+dfsg-1
+libnanomsg5==1.1.5+dfsg-1
+libncurses-dev==6.1+20181013-2+deb10u2
+libncurses5-dev==6.1+20181013-2+deb10u2
+libncurses6==6.1+20181013-2+deb10u2
+libnet-dbus-perl==1.1.0-5+b1
+libnet-dns-perl==1.19-1
+libnet-dns-sec-perl==1.11-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.18-1
+libnet-ip-perl==1.26-2
+libnet-libidn-perl==0.12.ds-3+b1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.85-2+b1
+libnetfilter-conntrack-dev==1.0.7-1
+libnetfilter-conntrack3==1.0.7-1
+libnetpbm10==2:10.0-15.3+b2
+libnewt-dev==0.52.20-8
+libnewt0.52==0.52.20-8
+libnfnetlink-dev==1.0.1-3+b1
+libnfnetlink0==1.0.1-3+b1
+libnftables0==0.9.0-2
+libnftnl-dev==1.1.2-2
+libnftnl11==1.1.2-2
+libnghttp2-14==1.36.0-2+deb10u1
+libnl-3-200==3.4.0-1
+libnl-3-dev==3.4.0-1
+libnl-route-3-200==3.4.0-1
+libnl-route-3-dev==3.4.0-1
+libnorm-dev==1.5.8+dfsg2-1
+libnorm1==1.5.8+dfsg2-1
+libnpth0==1.6-1
+libnspr4==2:4.20-1
+libnss-systemd==241-7~deb10u6
+libnss3==2:3.42.1-1+deb10u3
+libnuma-dev==2.0.12-1
+libnuma1==2.0.12-1
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-8-dev==8.3.0-6
+libobjc4==8.3.0-6
+libogg0==1.3.2-1+b1
+libomp-7-dev==1:7.0.1-8+deb10u2
+libomp5-7==1:7.0.1-8+deb10u2
+libopencore-amrnb0==0.1.3-2.1+b2
+libopencore-amrwb0==0.1.3-2.1+b2
+libopencsd-dev==0.10.1-1
+libopencsd0==0.10.1-1
+libopenexr23==2.2.1-4.1+deb10u1
+libopengl0==1.1.0-1
+libopenjp2-7==2.3.0-2+deb10u1
+libopenmpi-dev==3.1.3-11
+libopenmpi3==3.1.3-11
+libopenmpt0==0.4.3-1+deb10u1
+libopts25==1:5.18.12-4
+libopts25-dev==1:5.18.12-4
+libopus0==1.3-1
+liborc-0.4-0==1:0.4.28-3.1
+liboro-java==2.0.8a-13
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b7
+libossp-uuid16==1.6.2-1.5+b7
+libp11-kit-dev==0.23.15-2+deb10u1
+libpackage-stash-perl==0.38-1
+libpackage-stash-xs-perl==0.29-1
+libpackagekit-glib2-18==1.1.12-5
+libpam-systemd==241-7~deb10u6
+libpam0g-dev==1.3.1-5
+libpango-1.0-0==1.42.4-8~deb10u1
+libpangocairo-1.0-0==1.42.4-8~deb10u1
+libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpaper-utils==1.1.28
+libpaper1==1.1.28
+libparams-classify-perl==0.015-1+b1
+libparams-util-perl==1.07-3+b4
+libparams-validate-perl==1.29-1+b1
+libparboiled-java==1.1.7-2
+libparse-debianchangelog-perl==1.2.0-13
+libpath-iterator-rule-perl==1.014-1
+libpath-tiny-perl==0.108-1
+libpathplan4==2.40.1-6
+libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.14-1
+libpcre16-3==2:8.39-12
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpcre3-dev==2:8.39-12
+libpcre32-3==2:8.39-12
+libpcrecpp0v5==2:8.39-12
+libpcsclite1==1.8.24-1
+libpegdown-java==1.6.0-1
+libperl-dev==5.28.1-6+deb10u1
+libperl5.28==5.28.1-6+deb10u1
+libperlio-gzip-perl==0.19-1+b5
+libpgm-5.2-0==5.2.122~dfsg-3
+libpgm-dev==5.2.122~dfsg-3
+libpipeline1==1.5.1-2
+libpixman-1-0==0.36.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-4
+libplexus-archiver-java==3.6.0-2
+libplexus-bsh-factory-java==1.0~alpha7-4
+libplexus-build-api-java==0.0.7-3
+libplexus-cipher-java==1.7-3
+libplexus-classworlds-java==2.6.0-1
+libplexus-compiler-java==2.8.5-1
+libplexus-component-annotations-java==1.7.1-7
+libplexus-container-default-java==1.7.1-7
+libplexus-container-default1.5-java==1.7.1-7
+libplexus-i18n-java==1.0-beta-10-5
+libplexus-interpolation-java==1.25-1
+libplexus-io-java==3.1.1-1
+libplexus-languages-java==0.9.10-1
+libplexus-sec-dispatcher-java==1.4-4
+libplexus-utils2-java==3.1.1-1
+libplexus-velocity-java==1.2-3
+libpmix2==3.1.2-3
+libpng-dev==1.6.36-6
+libpng16-16==1.6.36-6
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-25
+libpolkit-backend-1-0==0.105-25
+libpolkit-gobject-1-0==0.105-25
+libpopt0==1.16-12
+libpostproc55==7:4.1.6-1~deb10u1
+libpotrace0==1.15-1
+libprocps7==2:3.3.15-2
+libprotobuf-c1==1.3.1-1+b1
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libprotoc17==3.6.1.3-2
+libproxy1v5==0.4.15-5+deb10u1
+libpsl5==0.20.2-2
+libpsm-infinipath1==3.3+20.604758e7-6
+libpsm2-2==11.2.78-1
+libptexenc1==2018.20181218.49446-1
+libpthread-stubs0-dev==0.4-1
+libpulse0==12.2-4+deb10u1
+libpython-all-dev==2.7.16-1
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-all-dbg==3.7.3-1
+libpython3-all-dev==3.7.3-1
+libpython3-dbg==3.7.3-1
+libpython3-dev==3.7.3-1
+libpython3-stdlib==3.7.3-1
+libpython3.7==3.7.3-2+deb10u2
+libpython3.7-dbg==3.7.3-2+deb10u2
+libpython3.7-dev==3.7.3-2+deb10u2
+libpython3.7-minimal==3.7.3-2+deb10u2
+libpython3.7-stdlib==3.7.3-2+deb10u2
+libqdox-java==1.12.1-3
+libqdox2-java==2.0~M10-1
+libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
+libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
+libqt4-designer==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
+libqt4-help==4:4.8.7+dfsg-18+deb10u1
+libqt4-network==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
+libqt4-script==4:4.8.7+dfsg-18+deb10u1
+libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
+libqt4-svg==4:4.8.7+dfsg-18+deb10u1
+libqt4-test==4:4.8.7+dfsg-18+deb10u1
+libqt4-xml==4:4.8.7+dfsg-18+deb10u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
+libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5gui5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
+libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
+libqt5svg5==5.11.3-2
+libqt5test5==5.11.3+dfsg1-1+deb10u4
+libqt5widgets5==5.11.3+dfsg1-1+deb10u4
+libqt5xml5==5.11.3+dfsg1-1+deb10u4
+libqtcore4==4:4.8.7+dfsg-18+deb10u1
+libqtdbus4==4:4.8.7+dfsg-18+deb10u1
+libqtgui4==4:4.8.7+dfsg-18+deb10u1
+libquadmath0==8.3.0-6
+libraw1394-11==2.1.2-1+b1
+librdmacm1==22.1-1
+libreadline-dev==7.0-5
+libreadline5==5.2+dfsg-3+b13
+libreadline7==7.0-5
+libreadonly-perl==2.050-1
+libref-util-perl==0.204-1
+libref-util-xs-perl==0.117-1+b1
+libregexp-assemble-perl==0.36-1
+libregexp-pattern-license-perl==3.0.31-4
+librest-0.7-0==0.8.1-1
+librhash0==1.3.8-1
+librole-tiny-perl==2.000006-1
+librrd-dev==1.7.1-2
+librrd8==1.7.1-2
+librsvg2-2==2.44.10-2.1
+librsvg2-common==2.44.10-2.1
+librtmp1==2.4+20151223.gitfa8646d.1-2
+librubberband2==1.8.1-7
+libruby2.5==2.5.5-3+deb10u3
+libsamplerate0==0.1.9-2
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsaxon-java==1:6.5.5-12
+libselinux1-dev==2.8-1+b1
+libsensors-config==1:3.5.0-3
+libsensors4-dev==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libsepol1-dev==2.8-1
+libserd-0-0==0.28.0~dfsg0-1
+libsereal-decoder-perl==4.005+ds-1+b1
+libsereal-encoder-perl==4.005+ds-1+b1
+libsereal-perl==4.005-1
+libservlet-api-java==4.0.1-2
+libservlet3.1-java==1:4.0.1-2
+libshine3==3.1.1-2
+libshout3==2.4.1-2
+libsidplay1v5==1.36.59-11
+libsigsegv2==2.12-2
+libsisu-guice-java==4.2.0-1
+libsisu-inject-java==0.3.3-1
+libsisu-ioc-java==2.3.0-11
+libsisu-plexus-java==0.3.3-3
+libslang2==2.3.2-2
+libslang2-dev==2.3.2-2
+libslf4j-java==1.7.25-3
+libsm-dev==2:1.2.3-1
+libsm6==2:1.2.3-1
+libsnappy-java==1.1.7.2-1
+libsnappy-jni==1.1.7.2-1
+libsnappy1v5==1.1.7-1
+libsndfile1==1.0.28-6
+libsnmp-base==5.7.3+dfsg-5+deb10u2
+libsnmp-dev==5.7.3+dfsg-5+deb10u2
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libsoap-lite-perl==1.27-1
+libsodium-dev==1.0.17-1
+libsodium23==1.0.17-1
+libsord-0-0==0.16.0~dfsg0-1+b1
+libsort-key-perl==1.33-2+b1
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.64.2-2
+libsoup2.4-1==2.64.2-2
+libsoxr0==0.1.2-3
+libspeex1==1.2~rc1.2-1+b2
+libspice-server1==0.14.0-1.3+deb10u1
+libsqlite3-0==3.27.2-3+deb10u1
+libsratom-0-0==0.6.0~dfsg0-1
+libssh-gcrypt-4==0.8.7-1+deb10u1
+libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u5
+libssl1.1==1.1.1d-0+deb10u5
+libstdc++-8-dev==8.3.0-6
+libstemmer0d==0+svn585-1+b2
+libstrictures-perl==2.000005-1
+libstring-copyright-perl==0.003006-1
+libstring-escape-perl==2010.002-2
+libstring-shellquote-perl==1.04-1
+libstruct-dumb-perl==0.09-1
+libsub-exporter-perl==0.987-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.14-1+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1+b3
+libsub-quote-perl==2.005001-1
+libsubunit-dev==1.3.0-1
+libsubunit0==1.3.0-1
+libsurefire-java==2.22.1-1
+libswitch-perl==2.17-2
+libswresample3==7:4.1.6-1~deb10u1
+libswscale5==7:4.1.6-1~deb10u1
+libsynctex2==2018.20181218.49446-1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==241-7~deb10u6
+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
+libtasn1-6-dev==4.13-3
+libtasn1-doc==4.13-3
+libtcl8.6==8.6.9+dfsg-2
+libtcmalloc-minimal4==2.7-1
+libteckit0==2.5.8+ds2-5
+libterm-readkey-perl==2.38-1
+libtest-fatal-perl==0.014-1
+libtest-refcount-perl==0.08-3
+libtexlua52==2018.20181218.49446-1
+libtexlua53==2018.20181218.49446-1
+libtexluajit2==2018.20181218.49446-1
+libtext-charwidth-perl==0.04-7.1+b1
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b7
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.28-2
+libthai0==0.1.28-2
+libtheora0==1.1.1+dfsg.1-15
+libtie-ixhash-perl==1.23-2
+libtiff5==4.1.0+git191117-2~deb10u1
+libtimedate-perl==2.3000-2+deb10u1
+libtinyxml2-6a==7.0.0+dfsg-1
+libtinyxml2-dev==7.0.0+dfsg-1
+libtk8.6==8.6.9-2
+libtool==2.4.6-9
+libtool-bin==2.4.6-9
+libtry-tiny-perl==0.30-1
+libtsan0==8.3.0-6
+libtwolame0==0.3.13-4
+libtype-tiny-perl==1.004004-1
+libtype-tiny-xs-perl==0.014-1+b1
+libtypes-serialiser-perl==1.0-1
+libubsan1==8.3.0-6
+libuchardet0==0.0.6-3
+libudev-dev==241-7~deb10u6
+libunbound8==1.9.0-2+deb10u2
+libunicode-utf8-perl==0.62-1
+libunwind-dev==1.2.1-10~deb10u1
+libunwind8==1.2.1-10~deb10u1
+liburi-perl==1.76-1
+libusb-0.1-4==2:0.1.12-32
+libusb-1.0-0==2:1.0.22-2
+libusb-1.0-0-dev==2:1.0.22-2
+libusb-1.0-doc==2:1.0.22-2
+libusb-dev==2:0.1.12-32
+libusbredirparser1==0.8.0-1
+libutempter0==1.1.6-3
+libuv1==1.24.1-1
+libv4l-0==1.16.3-3
+libv4lconvert0==1.16.3-3
+libva-drm2==2.4.0-1
+libva-x11-2==2.4.0-1
+libva2==2.4.0-1
+libvariable-magic-perl==0.62-1+b1
+libvdeplug2==2.3.2+r586-2.2
+libvdpau-va-gl1==0.4.2-1+b1
+libvdpau1==1.1.1-10
+libvelocity-tools-java==2.0-7
+libvidstab1.1==1.1.0-2
+libvirglrenderer0==0.7.0-2
+libvirt-clients==5.0.0-4+deb10u1
+libvirt0==5.0.0-4+deb10u1
+libvisual-0.4-0==0.4.0-15
+libvorbis0a==1.3.6-2
+libvorbisenc2==1.3.6-2
+libvorbisfile3==1.3.6-2
+libvpx5==1.7.0-3+deb10u1
+libvte-2.91-0==0.54.2-2
+libvte-2.91-common==0.54.2-2
+libvulkan-dev==1.1.97-2
+libvulkan1==1.1.97-2
+libwacom-bin==0.32-1
+libwacom-common==0.32-1
+libwacom2==0.32-1
+libwagon-file-java==3.3.1-2
+libwagon-http-shaded-java==3.3.1-2
+libwagon-provider-api-java==3.3.1-2
+libwant-perl==0.29-1+b4
+libwavpack1==5.1.0-6
+libwayland-client0==1.16.0-1
+libwayland-cursor0==1.16.0-1
+libwayland-egl1==1.16.0-1
+libwayland-server0==1.16.0-1
+libwebp6==0.6.1-2
+libwebpdemux2==0.6.1-2
+libwebpmux3==0.6.1-2
+libwebsocket-api-java==1.1-1+deb10u1
+libwmf0.2-7==0.2.8.4-14
+libwoff1==1.0.2-1
+libwrap0==7.6.q-28
+libwrap0-dev==7.6.q-28
+libwww-perl==6.36-2
+libwww-robotrules-perl==6.02-1
+libx11-6==2:1.6.7-1+deb10u1
+libx11-data==2:1.6.7-1+deb10u1
+libx11-dev==2:1.6.7-1+deb10u1
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.7-1+deb10u1
+libx11-xcb1==2:1.6.7-1+deb10u1
+libx264-155==2:0.155.2917+git0a84d98-2
+libx265-165==2.9-4
+libx32asan5==8.3.0-6
+libx32atomic1==8.3.0-6
+libx32gcc-8-dev==8.3.0-6
+libx32gcc1==1:8.3.0-6
+libx32gomp1==8.3.0-6
+libx32itm1==8.3.0-6
+libx32quadmath0==8.3.0-6
+libx32stdc++6==8.3.0-6
+libx32ubsan1==8.3.0-6
+libxalan2-java==2.7.2-2
+libxapian30==1.4.11-1
+libxau-dev==1:1.0.8-1+b2
+libxau6==1:1.0.8-1+b2
+libxaw7==2:1.0.13-1+b2
+libxbean-reflect-java==4.5-8
+libxcb-dri2-0==1.13.1-2
+libxcb-dri2-0-dev==1.13.1-2
+libxcb-dri3-0==1.13.1-2
+libxcb-dri3-dev==1.13.1-2
+libxcb-glx0==1.13.1-2
+libxcb-glx0-dev==1.13.1-2
+libxcb-icccm4==0.4.1-1.1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.13.1-2
+libxcb-present0==1.13.1-2
+libxcb-randr0==1.13.1-2
+libxcb-randr0-dev==1.13.1-2
+libxcb-render-util0==0.3.9-1+b1
+libxcb-render0==1.13.1-2
+libxcb-render0-dev==1.13.1-2
+libxcb-shape0==1.13.1-2
+libxcb-shape0-dev==1.13.1-2
+libxcb-shm0==1.13.1-2
+libxcb-sync-dev==1.13.1-2
+libxcb-sync1==1.13.1-2
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.13.1-2
+libxcb-xfixes0-dev==1.13.1-2
+libxcb-xinerama0==1.13.1-2
+libxcb-xkb1==1.13.1-2
+libxcb1==1.13.1-2
+libxcb1-dev==1.13.1-2
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.15-2
+libxdamage-dev==1:1.1.4-3+b3
+libxdamage1==1:1.1.4-3+b3
+libxdelta2==1.1.3-9.2
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.40.1-6
+libxencall1==4.11.4+57-g41a822c392-2
+libxendevicemodel1==4.11.4+57-g41a822c392-2
+libxenevtchn1==4.11.4+57-g41a822c392-2
+libxenforeignmemory1==4.11.4+57-g41a822c392-2
+libxengnttab1==4.11.4+57-g41a822c392-2
+libxenmisc4.11==4.11.4+57-g41a822c392-2
+libxenstore3.0==4.11.4+57-g41a822c392-2
+libxentoolcore1==4.11.4+57-g41a822c392-2
+libxentoollog1==4.11.4+57-g41a822c392-2
+libxerces2-java==2.12.0-1
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.4-2
+libxkbcommon-x11-0==0.8.2-1
+libxkbcommon0==0.8.2-1
+libxml-commons-external-java==1.4.01-3
+libxml-commons-resolver1.1-java==1.2-9
+libxml-libxml-perl==2.0134+dfsg-1
+libxml-namespacesupport-perl==1.12-1
+libxml-parser-perl==2.44-4
+libxml-sax-base-perl==1.09-1
+libxml-sax-expat-perl==0.51-1
+libxml-sax-perl==1.00+dfsg-1
+libxml-simple-perl==2.25-1
+libxml-twig-perl==1:3.50-1.1
+libxml-xpathengine-perl==0.14-1
+libxml2==2.9.4+dfsg1-7+deb10u1
+libxml2-dev==2.9.4+dfsg1-7+deb10u1
+libxml2-utils==2.9.4+dfsg1-7+deb10u1
+libxmlgraphics-commons-java==2.3-1
+libxmlrpc-lite-perl==0.717-2
+libxmu6==2:1.1.2-2+b3
+libxmuu1==2:1.1.2-2+b3
+libxpm4==1:3.5.12-1
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.3-1
+libxshmfence1==1.3-1
+libxslt1.1==1.1.32-2.2~deb10u1
+libxss1==1:1.2.3-1
+libxt-dev==1:1.1.5-1+b3
+libxt6==1:1.1.5-1+b3
+libxtables-dev==1.8.2-4
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxvidcore4==2:1.3.5-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libxxhash0==0.6.5-2
+libxz-java==1.8-2
+libyajl2==2.1.0-3
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+libyaml-libyaml-perl==0.76+repack-1
+libzmq3-dev==4.3.1-4+deb10u2
+libzmq5==4.3.1-4+deb10u2
+libzvbi-common==0.2.35-16
+libzvbi0==0.2.35-16
+libzzip-0-13==0.13.62-3.2
+licensecheck==3.0.31-3
+lintian==2.15.0
+linux-compiler-gcc-8-x86==4.19.171-2
+linux-headers-4.19.0-14-amd64==4.19.171-2
+linux-headers-4.19.0-14-common==4.19.171-2
+linux-headers-amd64==4.19+105+deb10u9
+linux-kbuild-4.19==4.19.171-2
+linux-libc-dev==4.19.171-2
+linuxdoc-tools==0.9.73-2
+llvm-7==1:7.0.1-8+deb10u2
+llvm-7-dev==1:7.0.1-8+deb10u2
+llvm-7-runtime==1:7.0.1-8+deb10u2
+lmodern==2.004.5-6
+logrotate==3.14.0-4
+lsb-base==10.2019051400
+lsb-release==10.2019051400
+lsof==4.91+dfsg-1
+lua-bitop==1.0.2-5
+lua-bitop-dev==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+lua-cjson-dev==2.1.0+dfsg-2.1
+lvm2==2.03.02-3
+lynx==2.8.9rel.1-3
+lynx-common==2.8.9rel.1-3
+m4==1.4.18-2
+make==4.2.1-1.2
+man-db==2.8.5-2
+manpages==4.16-2
+manpages-dev==4.16-2
+mariadb-common==1:10.3.27-0+deb10u1
+maven==3.6.0-1
+maven-debian-helper==2.3.2
+maven-repo-helper==1.9.3
+mesa-common-dev==18.3.6-2+deb10u1
+mesa-va-drivers==18.3.6-2+deb10u1
+mesa-vdpau-drivers==18.3.6-2+deb10u1
+mime-support==3.62
+module-assistant==0.11.10
+mysql-common==5.8+1.0.5
+ncurses-term==6.1+20181013-2+deb10u2
+netbase==5.6
+netpbm==2:10.0-15.3+b2
+nettle-dev==3.4.1-1
+nftables==0.9.0-2
+ocl-icd-libopencl1==2.2.12-2
+openjdk-11-jdk==11.0.9.1+1-1~deb10u2
+openjdk-11-jdk-headless==11.0.9.1+1-1~deb10u2
+openjdk-11-jre==11.0.9.1+1-1~deb10u2
+openjdk-11-jre-headless==11.0.9.1+1-1~deb10u2
+openmpi-bin==3.1.3-11
+openmpi-common==3.1.3-11
+opensp==1.5.2-13+b1
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+openssl==1.1.1d-0+deb10u5
+ovmf==0~20181115.85588389-3+deb10u3
+packagekit==1.1.12-5
+packagekit-tools==1.1.12-5
+patch==2.7.6-3+deb10u1
+patchutils==0.3.4-2
+pbuilder==0.230.4
+pbzip2==1.1.9-1+b1
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+perl-openssl-defaults==3
+php-cli==2:7.3+69
+php-codecoverage==6.1.4+dfsg-1
+php-common==2:69
+php-deepcopy==1.8.1-1
+php-doctrine-instantiator==1.1.0-2
+php-file-iterator==2.0.2-1
+php-mbstring==2:7.3+69
+php-pear==1:1.10.6+submodules+notgz-1.1+deb10u1
+php-phar-io-manifest==1.0.3-1
+php-phar-io-version==2.0.1-1
+php-phpdocumentor-reflection-common==1.0.1-1
+php-phpdocumentor-reflection-docblock==4.3.0-1
+php-phpdocumentor-type-resolver==0.4.0-2
+php-phpspec-prophecy==1.8.0-1
+php-text-template==1.2.1-2
+php-timer==2.1.1-1
+php-token-stream==3.0.1-1
+php-tokenizer==1.1.0-1
+php-webmozart-assert==1.4.0-3
+php-xml==2:7.3+69
+php7.3-cli==7.3.27-1~deb10u1
+php7.3-common==7.3.27-1~deb10u1
+php7.3-json==7.3.27-1~deb10u1
+php7.3-mbstring==7.3.27-1~deb10u1
+php7.3-opcache==7.3.27-1~deb10u1
+php7.3-readline==7.3.27-1~deb10u1
+php7.3-xml==7.3.27-1~deb10u1
+phpunit==7.5.6-1
+phpunit-code-unit-reverse-lookup==1.0.1-1
+phpunit-comparator==3.0.2-1
+phpunit-diff==3.0.2-1
+phpunit-environment==4.1.0-1
+phpunit-exporter==3.1.0-2
+phpunit-global-state==2.0.0really2.0.0-2
+phpunit-object-enumerator==3.0.3-3
+phpunit-object-reflector==1.1.1-2
+phpunit-recursion-context==3.0.0-2
+phpunit-resource-operations==2.0.1-1
+phpunit-version==2.0.1-1
+pigz==2.4-1
+pinentry-curses==1.1.0-2
+pkg-config==0.29-6
+pkg-php-tools==1.37
+po-debconf==1.0.21
+policykit-1==0.105-25
+poppler-data==0.4.9-2
+pps-tools==1.0.2-1
+preview-latex-style==11.91-2
+pristine-tar==1.46
+procmail==3.22-26
+procps==2:3.3.15-2
+protobuf-compiler==3.6.1.3-2
+psmisc==23.2-1
+psutils==1.17.dfsg-4
+publicsuffix==20190415.1030-1
+pylint==1.9.4-1
+python==2.7.16-1
+python-alabaster==0.7.8-1
+python-all==2.7.16-1
+python-all-dev==2.7.16-1
+python-apt-common==1.8.4.3
+python-asn1crypto==0.24.0-1
+python-astroid==1.6.5-3
+python-atomicwrites==1.1.5-2
+python-attr==18.2.0-1
+python-automat==0.6.0-1
+python-babel==2.6.0+dfsg.1-1
+python-babel-localedata==2.6.0+dfsg.1-1
+python-backports.functools-lru-cache==1.5-3
+python-bs4==4.7.1-1
+python-certifi==2018.8.24-1
+python-cffi-backend==1.12.2-1
+python-chardet==3.0.4-3
+python-click==7.0-1
+python-colorama==0.3.7-1
+python-concurrent.futures==3.2.0-2
+python-configparser==3.5.0b2-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-2
+python-coverage==4.5.2+dfsg.1-1
+python-crypto==2.6.1-9+b1
+python-cryptography==2.6.1-3+deb10u2
+python-dbus==1.2.8-3
+python-dev==2.7.16-1
+python-docutils==0.14+dfsg-4
+python-egenix-mxdatetime==3.2.9-1
+python-egenix-mxtools==3.2.9-1
+python-entrypoints==0.3-1
+python-enum34==1.1.6-2
+python-funcsigs==1.0.2-4
+python-gi==3.30.4-1
+python-html5lib==1.0.1-1
+python-hyperlink==17.3.1-2
+python-idna==2.6-1
+python-imagesize==1.0.0-1
+python-incremental==16.10.1-3
+python-ipaddr==2.2.0-2
+python-ipaddress==1.0.17-1
+python-isort==4.3.4+ds1-1.1
+python-jinja2==2.10-2
+python-keyring==17.1.1-1
+python-keyrings.alt==3.1.1-1
+python-lazy-object-proxy==1.3.1-1+b1
+python-logilab-common==1.4.2-1
+python-lxml==4.3.2-1+deb10u2
+python-markupsafe==1.1.0-1
+python-mccabe==0.6.1-2
+python-minimal==2.7.16-1
+python-mock==2.0.0-4
+python-more-itertools==4.2.0-1
+python-nose2==0.8.0-1
+python-olefile==0.46-1
+python-openssl==19.0.0-1
+python-packaging==19.0-1
+python-parse==1.6.6-0.1
+python-pathlib2==2.3.3-1
+python-pbr==4.2.0-5
+python-pil==5.4.1-2+deb10u2
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-pluggy==0.8.0-1
+python-py==1.7.0-2
+python-pyasn1==0.4.2-3
+python-pyasn1-modules==0.2.1-0.2
+python-pygments==2.3.1+dfsg-1
+python-pyparsing==2.2.0+dfsg1-2
+python-pytest==3.10.1-2
+python-pytest-cov==2.6.0-1
+python-requests==2.21.0-1
+python-roman==2.0.0-3
+python-scandir==1.9.0-2
+python-secretstorage==2.3.1-2
+python-service-identity==16.0.0-2
+python-setuptools==40.8.0-1
+python-singledispatch==3.4.0.3-2
+python-six==1.12.0-1
+python-soupsieve==1.8+dfsg-1
+python-sphinx==1.8.4-1
+python-stdeb==0.8.5-1
+python-tk==2.7.16-2
+python-twisted==18.9.0-3
+python-twisted-bin==18.9.0-3
+python-twisted-core==18.9.0-3
+python-typing==3.6.6-1
+python-tz==2019.1-1
+python-urllib3==1.24.1-1
+python-webencodings==0.5.1-1
+python-wheel==0.32.3-2
+python-wrapt==1.10.11-1
+python-xdg==0.25-5
+python-zope.interface==4.3.2-1+b2
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3==3.7.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.7.3-1
+python3-all-dbg==3.7.3-1
+python3-all-dev==3.7.3-1
+python3-apt==1.8.4.3
+python3-asn1crypto==0.24.0-1
+python3-atomicwrites==1.1.5-2
+python3-attr==18.2.0-1
+python3-babel==2.6.0+dfsg.1-1
+python3-certifi==2018.8.24-1
+python3-cffi-backend==1.12.2-1
+python3-chardet==3.0.4-3
+python3-cov-core==1.15.0-2
+python3-coverage==4.5.2+dfsg.1-1
+python3-crypto==2.6.1-9+b1
+python3-cryptography==2.6.1-3+deb10u2
+python3-dateutil==2.7.3-3
+python3-dbg==3.7.3-1
+python3-dbus==1.2.8-3
+python3-debian==0.1.35
+python3-dev==3.7.3-1
+python3-distro-info==0.21
+python3-distutils==3.7.3-1
+python3-docutils==0.14+dfsg-4
+python3-entrypoints==0.3-1
+python3-gi==3.30.4-1
+python3-gpg==1.12.0-6
+python3-idna==2.6-1
+python3-imagesize==1.0.0-1
+python3-jinja2==2.10-2
+python3-keyring==17.1.1-1
+python3-keyrings.alt==3.1.1-1
+python3-lib2to3==3.7.3-1
+python3-magic==2:0.4.15-2
+python3-markupsafe==1.1.0-1
+python3-minimal==3.7.3-1
+python3-mock==2.0.0-4
+python3-more-itertools==4.2.0-1
+python3-nose2==0.8.0-1
+python3-olefile==0.46-1
+python3-packaging==19.0-1
+python3-pbr==4.2.0-5
+python3-pil==5.4.1-2+deb10u2
+python3-pkg-resources==40.8.0-1
+python3-pluggy==0.8.0-1
+python3-py==1.7.0-2
+python3-pycurl==7.43.0.2-0.1
+python3-pygments==2.3.1+dfsg-1
+python3-pyparsing==2.2.0+dfsg1-2
+python3-pytest==3.10.1-2
+python3-pytest-cov==2.6.0-1
+python3-requests==2.21.0-1
+python3-roman==2.0.0-3
+python3-secretstorage==2.3.1-2
+python3-setuptools==40.8.0-1
+python3-six==1.12.0-1
+python3-software-properties==0.96.20.2-2
+python3-sphinx==1.8.4-1
+python3-sphinx-rtd-theme==0.4.3+dfsg-1
+python3-tz==2019.1-1
+python3-unidiff==0.5.4-1
+python3-urllib3==1.24.1-1
+python3-wheel==0.32.3-2
+python3-xdg==0.25-5
+python3.7==3.7.3-2+deb10u2
+python3.7-dbg==3.7.3-2+deb10u2
+python3.7-dev==3.7.3-2+deb10u2
+python3.7-minimal==3.7.3-2+deb10u2
+qdbus==4:4.8.7+dfsg-18+deb10u1
+qemu-kvm==1:3.1+dfsg-8+deb10u8
+qemu-system-common==1:3.1+dfsg-8+deb10u8
+qemu-system-data==1:3.1+dfsg-8+deb10u8
+qemu-system-gui==1:3.1+dfsg-8+deb10u8
+qemu-system-x86==1:3.1+dfsg-8+deb10u8
+qemu-utils==1:3.1+dfsg-8+deb10u8
+qt-at-spi==0.4.0-9
+qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
+qt4-qmake==4:4.8.7+dfsg-18+deb10u1
+qt5-default==5.11.3+dfsg1-1+deb10u4
+qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
+qt5-qmake==5.11.3+dfsg1-1+deb10u4
+qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
+qtchooser==66-2
+qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
+qttranslations5-l10n==5.11.3-2
+quilt==0.65-3
+rake==12.3.1-3+deb10u1
+readline-common==7.0-5
+rrdtool==1.7.1-2
+rsync==3.1.3-6
+rsyslog==8.1901.0-1
+ruby==1:2.5.1
+ruby-all-dev==1:2.5.1
+ruby-asciidoctor==1.5.8-1
+ruby-did-you-mean==1.2.1-1
+ruby-minitest==5.11.3-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==1.1.1-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.2.8-1
+ruby-xmlrpc==0.3.0-2
+ruby2.5==2.5.5-3+deb10u3
+ruby2.5-dev==2.5.5-3+deb10u3
+ruby2.5-doc==2.5.5-3+deb10u3
+rubygems-integration==1.11+deb10u1
+seabios==1.12.0-1
+sensible-utils==0.0.12
+sgml-base==1.29
+sgml-data==2.0.11
+shared-mime-info==1.10-1
+shellcheck==0.5.0-3
+software-properties-common==0.96.20.2-2
+sphinx-common==1.8.4-1
+sphinx-rtd-theme-common==0.4.3+dfsg-1
+squashfs-tools==1:4.3-12
+stgit==0.18-1
+strace==4.26-0.2
+sudo==1.8.27-1+deb10u3
+swig==3.0.12-2
+swig3.0==3.0.12-2
+systemd==241-7~deb10u6
+systemd-sysv==241-7~deb10u6
+t1utils==1.41-3
+tcl==8.6.9+1
+tcl8.6==8.6.9+dfsg-2
+telnet==0.17-41.2
+tex-common==6.11
+tex-gyre==20180621-3
+texi2html==1.82+dfsg1-5
+texinfo==6.5.0.dfsg.1-4+b1
+texlive-base==2018.20190227-2
+texlive-binaries==2018.20181218.49446-1
+texlive-fonts-recommended==2018.20190227-2
+texlive-generic-recommended==2018.20190227-2
+texlive-latex-base==2018.20190227-2
+texlive-latex-extra==2018.20190227-2
+texlive-latex-recommended==2018.20190227-2
+texlive-pictures==2018.20190227-2
+texlive-plain-generic==2018.20190227-2
+thin-provisioning-tools==0.7.6-2.1
+tipa==2:1.3-20
+tk==8.6.9+1
+tk8.6==8.6.9-2
+tk8.6-blt2.5==2.5.3+dfsg-4
+ucf==3.0038+nmu1
+unattended-upgrades==1.11.2
+unzip==6.0-23+deb10u2
+uuid-dev==2.33.1-0.1
+va-driver-all==2.4.0-1
+vdpau-driver-all==1.1.1-10
+velocity==1.7-5
+vim==2:8.1.0875-5
+vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+wdiff==1.2.2-2+b1
+wget==1.20.1-1.1
+x11-common==1:7.7+19
+x11-utils==7.7+4
+x11-xserver-utils==7.7+8
+x11proto-core-dev==2018.4-4
+x11proto-damage-dev==1:2018.4-4
+x11proto-dev==2018.4-4
+x11proto-fixes-dev==1:2018.4-4
+x11proto-xext-dev==2018.4-4
+x11proto-xf86vidmode-dev==2018.4-4
+xauth==1:1.0.10-1
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.2
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.17-2
+xdg-utils==1.1.3-1+deb10u1
+xfonts-encodings==1:1.0.4-2
+xfonts-utils==1:7.7+6
+xkb-data==2.26-2
+xml-core==0.18+nmu1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.32-2.2~deb10u1
+xterm==344-1
+xtrans-dev==1.3.5-1
+xxd==2:8.1.0875-5
+xz-utils==5.2.4-1
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
new file mode 100644
index 000000000000..bc9a8d62e678
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -0,0 +1,92 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+astroid==1.6.5
+atomicwrites==1.1.5
+attrs==18.2.0
+Automat==0.6.0
+Babel==2.6.0
+backports.functools-lru-cache==1.5
+beautifulsoup4==4.7.1
+certifi==2018.8.24
+chardet==3.0.4
+Click==7.0
+colorama==0.3.7
+configparser==3.5.0b2
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.5.2
+crc16==0.1.1
+cryptography==2.6.1
+ctypesgen==1.0.2
+docutils==0.14
+entrypoints==0.3
+enum34==1.1.6
+fastentrypoints==0.12
+funcsigs==1.0.2
+futures==3.2.0
+html5lib==1.0.1
+hyperlink==17.3.1
+idna==2.6
+imagesize==1.0.0
+incremental==16.10.1
+ipaddr==2.2.0
+ipaddress==1.0.17
+isort==4.3.4
+j2cli==0.3.10
+Jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lazy-object-proxy==1.3.1
+logilab-common==1.4.2
+lxml==4.6.2
+M2Crypto==0.36.0
+MarkupSafe==1.1.0
+mccabe==0.6.1
+mmh3==2.5.1
+mock==3.0.5
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+parse==1.6.6
+pathlib2==2.3.3
+pbr==4.2.0
+pexpect==4.6.0
+Pillow==5.4.1
+pluggy==0.8.0
+ptyprocess==0.7.0
+py==1.7.0
+pyang==2.1.1
+pyasn1==0.4.2
+pyasn1-modules==0.2.1
+pycrypto==2.6.1
+Pygments==2.3.1
+PyGObject==3.30.4
+pylint==1.9.4
+Pympler==0.8
+pyOpenSSL==19.0.0
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==4.4
+pytz==2019.1
+pyxdg==0.25
+PyYAML==5.4.1
+requests==2.21.0
+roman==2.0.0
+scandir==1.9.0
+SecretStorage==2.3.1
+service-identity==16.0.0
+singledispatch==3.4.0.3
+six==1.12.0
+soupsieve==1.8
+Sphinx==1.8.4
+stdeb==0.8.5
+stgit==0.18
+Twisted==18.9.0
+typing==3.6.6
+urllib3==1.24.1
+webencodings==0.5.1
+wrapt==1.10.11
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
new file mode 100644
index 000000000000..891ccaee5773
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -0,0 +1,70 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+atomicwrites==1.1.5
+attrs==18.2.0
+Babel==2.6.0
+bitarray==1.6.3
+certifi==2018.8.24
+chardet==3.0.4
+cov-core==1.15.0
+coverage==4.5.2
+cryptography==2.6.1
+devscripts==2.19.5+deb10u1
+distro-info==0.21
+docutils==0.14
+entrypoints==0.3
+fastentrypoints==0.12
+gbp==0.9.14
+gcovr==4.1
+gpg==1.12.0
+idna==2.6
+imagesize==1.0.0
+Jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lxml==4.6.2
+M2Crypto==0.37.1
+MarkupSafe==1.1.0
+mmh3==2.5.1
+mock==2.0.0
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+parameterized==0.8.1
+pbr==4.2.0
+pexpect==4.8.0
+Pillow==5.4.1
+pluggy==0.8.0
+ptyprocess==0.7.0
+py==1.7.0
+pyang==2.1.1
+pyangbind==0.8.1
+pycrypto==2.6.1
+pycurl==7.43.0.2
+Pygments==2.3.1
+PyGObject==3.30.4
+Pympler==0.8
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==5.2
+python-apt==1.8.4.3
+python-dateutil==2.7.3
+python-debian==0.1.35
+python-magic==0.4.16
+pytz==2019.1
+pyxdg==0.25
+PyYAML==5.4.1
+redis==3.5.3
+regex==2020.11.13
+requests==2.21.0
+roman==2.0.0
+SecretStorage==2.3.1
+six==1.12.0
+Sphinx==1.8.4
+sphinx-rtd-theme==0.4.3
+unattended-upgrades==0.1
+unidiff==0.5.4
+urllib3==1.24.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..2863f0c1cc03
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -0,0 +1,1484 @@
+adwaita-icon-theme==3.22.0-1+deb9u1
+ant==1.9.9-1+deb9u1
+ant-optional==1.9.9-1+deb9u1
+apt-file==3.1.4
+apt-transport-https==1.4.11
+apt-utils==1.4.11
+asciidoc-base==8.6.9-5
+asciidoc-common==8.6.9-5
+aspell==0.60.7~20110707-3+b2
+aspell-en==2016.11.20-0-0.1
+at==3.1.20-3
+at-spi2-core==2.22.0-6+deb9u1
+aufs-dkms==4.9+20161219-1
+aufs-tools==1:4.1+20161219-1
+augeas-lenses==1.8.0-1+deb9u1
+augeas-tools==1.8.0-1+deb9u1
+autoconf==2.69-10
+autoconf-archive==20160916-1
+automake==1:1.15-6
+automake1.11==1:1.11.6-4
+autopoint==0.19.8.1-2+deb9u1
+autotools-dev==20161112.1
+bash-completion==1:2.1-4.3
+bc==1.06.95-9+b3
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u8
+binfmt-support==2.1.6-2
+binutils==2.28-5
+bison==2:3.0.4.dfsg-1+b1
+blt==2.5.3+dfsg-3
+bsdmainutils==9.0.12+nmu1
+build-essential==12.3
+byacc==20140715-1+b1
+bzip2==1.0.6-8.1
+ca-certificates==20200601~deb9u1
+ca-certificates-java==20170929~deb9u3
+cdbs==0.4.150
+cgmanager==0.41-2
+cgroupfs-mount==1.3
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:3.8-36
+clang-3.8==1:3.8.1-24
+cm-super-minimal==0.3.4-9
+cmake==3.13.2-1~bpo9+1
+cmake-data==3.13.2-1~bpo9+1
+cmocka-doc==1.0.1-3
+containerd.io==1.4.3-1
+cowbuilder==0.85
+cowdancer==0.85
+cpio==2.11+dfsg-6
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+cppcheck==1.76.1-1
+cron==3.0pl1-128+deb9u1
+curl==7.52.1-5+deb9u13
+dbus==1.10.32-0+deb9u1
+dconf-gsettings-backend==0.26.0-2+b1
+dconf-service==0.26.0-2+b1
+dctrl-tools==2.24-2+b1
+debhelper==12.1.1~bpo9+1
+debian-keyring==2017.05.28
+debootstrap==1.0.89
+default-jdk-headless==2:1.8-58+deb9u1
+default-jre==2:1.8-58+deb9u1
+default-jre-headless==2:1.8-58+deb9u1
+default-libmysqlclient-dev==1.0.2
+devscripts==2.17.6+deb9u2
+dh-autoreconf==17~bpo9+1
+dh-exec==0.23+b1
+dh-make==2.201608
+dh-python==2.20170125
+dh-strip-nondeterminism==0.034-1
+dh-systemd==10.2.5
+dictionaries-common==1.27.2
+diffstat==1.61-1+b1
+dirmngr==2.1.18-8~deb9u4
+distro-info-data==0.36
+dkms==2.3-2
+dmeventd==2:1.02.137-2
+dmsetup==2:1.02.137-2
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u8
+docbook-xml==4.5-8
+docbook-xsl==1.79.1+dfsg-2
+docker-ce==5:18.09.5~3-0~debian-stretch
+docker-ce-cli==5:18.09.5~3-0~debian-stretch
+docutils-common==0.13.1+dfsg-2
+docutils-doc==0.13.1+dfsg-2
+dosfstools==4.1-1
+doxygen==1.8.13-4+b1
+dpatch==2.0.38+nmu1~bpo9+1
+dpkg-dev==1.18.25
+dput==0.12.1
+dwz==0.12-1+b1
+eatmydata==105-5
+emacsen-common==2.0.8
+equivs==2.0.9+nmu1
+exim4==4.89-2+deb9u7
+exim4-base==4.89-2+deb9u7
+exim4-config==4.89-2+deb9u7
+exim4-daemon-light==4.89-2+deb9u7
+expat==2.2.0-2+deb9u3
+exuberant-ctags==1:5.9~svn20110310-11
+fakeroot==1.21-3.1
+file==1:5.30-1+deb9u3
+flex==2.6.1-1.3
+fontconfig==2.11.0-6.7+b1
+fontconfig-config==2.11.0-6.7
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==4.7.0~dfsg-1
+fonts-lato==2.0-1
+fonts-liberation==1:1.07.4-2
+fonts-lmodern==2.004.5-3
+fonts-noto-mono==20161116-1
+fonts-texgyre==20160520-1
+fop==1:2.1-6
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gawk==1:4.1.4+dfsg-1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+gcc-6-multilib==6.3.0-18+deb9u1
+gcc-multilib==4:6.3.0-4
+gcovr==3.3-1
+gdb==7.12-6
+gem2deb==0.33.1
+gem2deb-test-runner==0.33.1
+geoip-database==20170512-1
+gettext==0.19.8.1-2+deb9u1
+gettext-base==0.19.8.1-2+deb9u1
+ghostscript==9.26a~dfsg-0+deb9u7
+gir1.2-glib-2.0==1.50.0-1+b1
+gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
+git==1:2.11.0-3+deb9u7
+git-buildpackage==0.8.12.2
+git-man==1:2.11.0-3+deb9u7
+glib-networking==2.50.0-1+deb9u1
+glib-networking-common==2.50.0-1+deb9u1
+glib-networking-services==2.50.0-1+deb9u1
+gnome-icon-theme==3.12.0-2
+gnupg==2.1.18-8~deb9u4
+gnupg-agent==2.1.18-8~deb9u4
+gnupg-l10n==2.1.18-8~deb9u4
+gnupg2==2.1.18-8~deb9u4
+googletest==1.8.0-6
+graphviz==2.38.0-17
+groff==1.22.3-9
+groff-base==1.22.3-9
+gsettings-desktop-schemas==3.22.0-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.3
+gtk-update-icon-cache==3.22.11-1
+guile-2.0-libs==2.0.13+1-4
+hicolor-icon-theme==0.15-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==57.1-6+deb9u4
+imagemagick==8:6.9.7.4+dfsg-11+deb9u11
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u11
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u11
+install-info==6.3.0.dfsg.1-1+b2
+intltool-debian==0.35.0+20060710.4
+iptables==1.6.0+snapshot20161117-6
+iptables-dev==1.6.0+snapshot20161117-6
+ipxe-qemu==1.0.0+git-20161027.b991c67-1
+iso-codes==3.75-1
+java-common==0.58+deb9u1
+java-wrappers==0.1.28
+javahelper==0.59
+javascript-common==11
+junit==3.8.2-8
+junit4==4.12-4+deb9u1
+kernel-wedge==2.96
+kmod==23-2
+krb5-locales==1.15-1+deb9u2
+less==481-2.1
+lib32asan3==6.3.0-18+deb9u1
+lib32atomic1==6.3.0-18+deb9u1
+lib32cilkrts5==6.3.0-18+deb9u1
+lib32gcc-6-dev==6.3.0-18+deb9u1
+lib32gcc1==1:6.3.0-18+deb9u1
+lib32gomp1==6.3.0-18+deb9u1
+lib32itm1==6.3.0-18+deb9u1
+lib32mpx2==6.3.0-18+deb9u1
+lib32quadmath0==6.3.0-18+deb9u1
+lib32stdc++6==6.3.0-18+deb9u1
+lib32ubsan0==6.3.0-18+deb9u1
+libaio1==0.3.110-3
+libalgorithm-diff-perl==1.19.03-1
+libalgorithm-diff-xs-perl==0.04-4+b2
+libalgorithm-merge-perl==0.08-3
+libann0==1.1.2+doc-6
+libaopalliance-java==20070526-5
+libapache-pom-java==10-2
+libapparmor1==2.11.0-3+deb9u2
+libapt-inst2.0==1.4.11
+libapt-pkg-perl==0.1.32
+libarchive-zip-perl==1.59-1+deb9u1
+libarchive13==3.2.2-2+deb9u2
+libasan3==6.3.0-18+deb9u1
+libasm-java==5.2-2
+libasound2==1.1.3-5
+libasound2-data==1.1.3-5
+libaspell15==0.60.7~20110707-3+b2
+libassuan0==2.4.3-2
+libasyncns0==0.8-6
+libatinject-jsr330-api-java==1.0+ds1-2
+libatk-bridge2.0-0==2.22.0-2
+libatk-wrapper-java==0.33.3-13+deb9u1
+libatk-wrapper-java-jni==0.33.3-13+deb9u1
+libatk1.0-0==2.22.0-1
+libatk1.0-data==2.22.0-1
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==6.3.0-18+deb9u1
+libatspi2.0-0==2.22.0-6+deb9u1
+libaudio2==1.9.4-5+b1
+libaudit-dev==1:2.6.7-2
+libaugeas0==1.8.0-1+deb9u1
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.6.32-2
+libavahi-common-data==0.6.32-2
+libavahi-common3==0.6.32-2
+libavalon-framework-java==4.2.0-9
+libb-hooks-endofscope-perl==0.21-1
+libbabeltrace-ctf-dev==1.5.1-1
+libbabeltrace-ctf1==1.5.1-1
+libbabeltrace-dev==1.5.1-1
+libbabeltrace1==1.5.1-1
+libbatik-java==1.8-4+deb9u2
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u8
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libbison-dev==2:3.0.4.dfsg-1+b1
+libbit-vector-perl==7.4-1+b2
+libbluetooth3==5.43-2+deb9u3
+libboost-all-dev==1.62.0.1
+libboost-atomic-dev==1.62.0.1
+libboost-atomic1.62-dev==1.62.0+dfsg-4
+libboost-atomic1.62.0==1.62.0+dfsg-4
+libboost-chrono-dev==1.62.0.1
+libboost-chrono1.62-dev==1.62.0+dfsg-4
+libboost-chrono1.62.0==1.62.0+dfsg-4
+libboost-context-dev==1.62.0.1
+libboost-context1.62-dev==1.62.0+dfsg-4
+libboost-context1.62.0==1.62.0+dfsg-4
+libboost-coroutine-dev==1.62.0.1
+libboost-coroutine1.62-dev==1.62.0+dfsg-4
+libboost-coroutine1.62.0==1.62.0+dfsg-4
+libboost-date-time-dev==1.62.0.1
+libboost-date-time1.62-dev==1.62.0+dfsg-4
+libboost-date-time1.62.0==1.62.0+dfsg-4
+libboost-dev==1.62.0.1
+libboost-exception-dev==1.62.0.1
+libboost-exception1.62-dev==1.62.0+dfsg-4
+libboost-fiber-dev==1.62.0.1
+libboost-fiber1.62-dev==1.62.0+dfsg-4
+libboost-fiber1.62.0==1.62.0+dfsg-4
+libboost-filesystem-dev==1.62.0.1
+libboost-filesystem1.62-dev==1.62.0+dfsg-4
+libboost-filesystem1.62.0==1.62.0+dfsg-4
+libboost-graph-dev==1.62.0.1
+libboost-graph-parallel-dev==1.62.0.1
+libboost-graph-parallel1.62-dev==1.62.0+dfsg-4
+libboost-graph-parallel1.62.0==1.62.0+dfsg-4
+libboost-graph1.62-dev==1.62.0+dfsg-4
+libboost-graph1.62.0==1.62.0+dfsg-4
+libboost-iostreams-dev==1.62.0.1
+libboost-iostreams1.62-dev==1.62.0+dfsg-4
+libboost-iostreams1.62.0==1.62.0+dfsg-4
+libboost-locale-dev==1.62.0.1
+libboost-locale1.62-dev==1.62.0+dfsg-4
+libboost-locale1.62.0==1.62.0+dfsg-4
+libboost-log-dev==1.62.0.1
+libboost-log1.62-dev==1.62.0+dfsg-4
+libboost-log1.62.0==1.62.0+dfsg-4
+libboost-math-dev==1.62.0.1
+libboost-math1.62-dev==1.62.0+dfsg-4
+libboost-math1.62.0==1.62.0+dfsg-4
+libboost-mpi-dev==1.62.0.1
+libboost-mpi-python-dev==1.62.0.1
+libboost-mpi-python1.62-dev==1.62.0+dfsg-4
+libboost-mpi-python1.62.0==1.62.0+dfsg-4
+libboost-mpi1.62-dev==1.62.0+dfsg-4
+libboost-mpi1.62.0==1.62.0+dfsg-4
+libboost-program-options-dev==1.62.0.1
+libboost-program-options1.62-dev==1.62.0+dfsg-4
+libboost-program-options1.62.0==1.62.0+dfsg-4
+libboost-python-dev==1.62.0.1
+libboost-python1.62-dev==1.62.0+dfsg-4
+libboost-python1.62.0==1.62.0+dfsg-4
+libboost-random-dev==1.62.0.1
+libboost-random1.62-dev==1.62.0+dfsg-4
+libboost-random1.62.0==1.62.0+dfsg-4
+libboost-regex-dev==1.62.0.1
+libboost-regex1.62-dev==1.62.0+dfsg-4
+libboost-regex1.62.0==1.62.0+dfsg-4
+libboost-serialization-dev==1.62.0.1
+libboost-serialization1.62-dev==1.62.0+dfsg-4
+libboost-serialization1.62.0==1.62.0+dfsg-4
+libboost-signals-dev==1.62.0.1
+libboost-signals1.62-dev==1.62.0+dfsg-4
+libboost-signals1.62.0==1.62.0+dfsg-4
+libboost-system-dev==1.62.0.1
+libboost-system1.62-dev==1.62.0+dfsg-4
+libboost-system1.62.0==1.62.0+dfsg-4
+libboost-test-dev==1.62.0.1
+libboost-test1.62-dev==1.62.0+dfsg-4
+libboost-test1.62.0==1.62.0+dfsg-4
+libboost-thread-dev==1.62.0.1
+libboost-thread1.62-dev==1.62.0+dfsg-4
+libboost-thread1.62.0==1.62.0+dfsg-4
+libboost-timer-dev==1.62.0.1
+libboost-timer1.62-dev==1.62.0+dfsg-4
+libboost-timer1.62.0==1.62.0+dfsg-4
+libboost-tools-dev==1.62.0.1
+libboost-type-erasure-dev==1.62.0.1
+libboost-type-erasure1.62-dev==1.62.0+dfsg-4
+libboost-type-erasure1.62.0==1.62.0+dfsg-4
+libboost-wave-dev==1.62.0.1
+libboost-wave1.62-dev==1.62.0+dfsg-4
+libboost-wave1.62.0==1.62.0+dfsg-4
+libboost1.62-dev==1.62.0+dfsg-4
+libboost1.62-tools-dev==1.62.0+dfsg-4
+libbrlapi0.6==5.4-7+deb9u1
+libbsd-dev==0.8.3-1+deb9u1
+libbsd0==0.8.3-1+deb9u1
+libbsf-java==1:2.4.0-5
+libbsh-java==2.0b4-18
+libc-ares-dev==1.12.0-1+deb9u1
+libc-ares2==1.12.0-1+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dbg==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libc6-dev-i386==2.24-11+deb9u4
+libc6-dev-x32==2.24-11+deb9u4
+libc6-i386==2.24-11+deb9u4
+libc6-x32==2.24-11+deb9u4
+libcaca0==0.99.beta19-2.1~deb9u1
+libcacard0==1:2.5.0-3
+libcairo-gobject2==1.14.8-1+deb9u1
+libcairo2==1.14.8-1+deb9u1
+libcap-dev==1:2.25-1
+libcap-ng-dev==0.7.7-3+b1
+libcap2-bin==1:2.25-1
+libcarp-clan-perl==6.06-1
+libcc1-0==6.3.0-18+deb9u1
+libcdi-api-java==1.0-2
+libcdt5==2.38.0-17
+libcgi-fast-perl==1:2.12-1
+libcgi-pm-perl==4.35-1
+libcglib-java==3.2.4-1
+libcgmanager0==0.41-2
+libcgraph6==2.38.0-17
+libcilkrts5==6.3.0-18+deb9u1
+libclang-common-3.8-dev==1:3.8.1-24
+libclang1-3.8==1:3.8.1-24
+libclang1-3.9==1:3.9.1-9
+libclass-accessor-perl==0.34-1
+libclass-inspector-perl==1.31-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-2+b7
+libclassworlds-java==1.1-final-5
+libclone-perl==0.38-2+b1
+libcmocka-dev==1.0.1-3
+libcmocka0==1.0.1-3
+libcolord2==1.3.3-2
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.3.1-3
+libcommons-codec-java==1.10-1
+libcommons-collections3-java==3.2.2-1
+libcommons-configuration-java==1.10-4
+libcommons-digester-java==1.8.1-4
+libcommons-httpclient-java==3.1-12
+libcommons-io-java==2.5-1
+libcommons-lang-java==2.6-6
+libcommons-lang3-java==3.5-1
+libcommons-logging-java==1.2-1
+libcommons-net-java==3.5-1
+libcommons-parent-java==39-3
+libcommons-validator-java==1:1.5.1-1
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.11-3
+libcryptsetup4==2:1.7.3-4
+libcups2==2.2.1-8+deb9u6
+libcupsfilters1==1.11.6-3+deb9u1
+libcupsimage2==2.2.1-8+deb9u6
+libcurl3==7.52.1-5+deb9u13
+libcurl3-gnutls==7.52.1-5+deb9u13
+libcurl3-nss==7.52.1-5+deb9u13
+libcurl4-nss-dev==7.52.1-5+deb9u13
+libdaemon-dev==0.14-6
+libdaemon0==0.14-6
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.10-4+b1
+libdb-dev==5.3.1
+libdb5.3-dev==5.3.28-12+deb9u1
+libdbi1==0.9.0-4+deb9u2
+libdbus-1-3==1.10.32-0+deb9u1
+libdbus-1-dev==1.10.32-0+deb9u1
+libdbus-glib-1-2==0.108-2
+libdconf1==0.26.0-2+b1
+libdevel-globaldestruction-perl==0.14-1
+libdevmapper-event1.02.1==2:1.02.137-2
+libdevmapper1.02.1==2:1.02.137-2
+libdigest-hmac-perl==1.03+dfsg-1
+libdistro-info-perl==0.14
+libdjvulibre-text==3.5.27.1-7
+libdjvulibre21==3.5.27.1-7
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u8
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u8
+libdom4j-java==1.6.1+dfsg.3-2+deb9u1
+libdouble-conversion1==2.0.1-4
+libdoxia-core-java==1.1.4-6
+libdoxia-java==1.1.4-6
+libdoxia-sitetools-java==1.1.4-1.1
+libdpkg-perl==1.18.25
+libdrm-amdgpu1==2.4.74-1
+libdrm-dev==2.4.74-1
+libdrm-intel1==2.4.74-1
+libdrm-nouveau2==2.4.74-1
+libdrm-radeon1==2.4.74-1
+libdrm2==2.4.74-1
+libdw-dev==0.168-1
+libdw1==0.168-1
+libeasymock-java==3.4+ds-1
+libeatmydata1==105-5
+libeclipse-aether-java==1.0.2-1
+libedit-dev==3.1-20160903-3
+libedit2==3.1-20160903-3
+libegl1-mesa==13.0.6-1+b2
+libelf-dev==0.168-1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.3.1-2
+liberror-perl==0.17024-1
+libestr0==0.1.10-2
+libevdev2==1.5.6+dfsg-1
+libevent-2.0-5==2.0.21-stable-3
+libevent-core-2.0-5==2.0.21-stable-3
+libevent-dev==2.0.21-stable-3
+libevent-extra-2.0-5==2.0.21-stable-3
+libevent-openssl-2.0-5==2.0.21-stable-3
+libevent-pthreads-2.0-5==2.0.21-stable-3
+libexpat1==2.2.0-2+deb9u3
+libexpat1-dev==2.2.0-2+deb9u3
+libexplain-dev==1.4.D001-6
+libexplain51==1.4.D001-6
+libexporter-tiny-perl==0.042-1
+libfabric1==1.4.0-1
+libfakeroot==1.21-3.1
+libfastjson4==0.99.4-1
+libfcgi-perl==0.78-2
+libfdt1==1.4.2-1
+libffi-dev==3.2.1-6
+libffi6==3.2.1-6
+libfftw3-double3==3.3.5-3
+libfile-basedir-perl==0.07-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b2
+libfile-homedir-perl==1.00-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.27-1
+libfile-stripnondeterminism-perl==0.034-1
+libfile-which-perl==1.21-1
+libfl-dev==2.6.1-1.3
+libflac8==1.3.2-2+deb9u1
+libfont-afm-perl==1.20-2
+libfontbox-java==1:1.8.12-1
+libfontconfig1==2.11.0-6.7+b1
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.1-6
+libfreetype6==2.6.3-3.2+deb9u2
+libfribidi0==0.19.7-1+deb9u1
+libgail-common==2.24.31-2
+libgail18==2.24.31-2
+libgbm1==13.0.6-1+b2
+libgc1c2==1:7.4.2-8
+libgcc-6-dev==6.3.0-18+deb9u1
+libgd3==2.2.4-2+deb9u5
+libgdbm3==1.8.3-14
+libgdk-pixbuf2.0-0==2.36.5-2+deb9u2
+libgdk-pixbuf2.0-common==2.36.5-2+deb9u2
+libgeoip1==1.6.9-4
+libgeronimo-interceptor-3.0-spec-java==1.0.1-3
+libgetopt-long-descriptive-perl==0.100-1
+libgfortran3==6.3.0-18+deb9u1
+libgif7==5.1.4-0.4
+libgirepository-1.0-1==1.50.0-1+b1
+libgit-wrapper-perl==0.047-1
+libgl1-mesa-dev==13.0.6-1+b2
+libgl1-mesa-dri==13.0.6-1+b2
+libgl1-mesa-glx==13.0.6-1+b2
+libglapi-mesa==13.0.6-1+b2
+libglew2.0==2.0.0-3+b1
+libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-bin==2.50.3-2+deb9u2
+libglib2.0-data==2.50.3-2+deb9u2
+libglib2.0-dev==2.50.3-2+deb9u2
+libglu1-mesa==9.0.0-2.1
+libglu1-mesa-dev==9.0.0-2.1
+libgmp-dev==2:6.1.2+dfsg-1
+libgmp10==2:6.1.2+dfsg-1
+libgmpxx4ldbl==2:6.1.2+dfsg-1
+libgnutls30==3.5.8-5+deb9u5
+libgomp1==6.3.0-18+deb9u1
+libgoogle-perftools4==2.5-2.2
+libgpgme11==1.8.0-3+b2
+libgpm2==1.20.4-6.2+b1
+libgraphite2-3==1.3.10-1
+libgs9==9.26a~dfsg-0+deb9u7
+libgs9-common==9.26a~dfsg-0+deb9u7
+libgsasl7==1.8.0-8+b2
+libgssapi-krb5-2==1.15-1+deb9u2
+libgstreamer1.0-0==1.10.4-1
+libgtest-dev==1.8.0-6
+libgtk-3-0==3.22.11-1
+libgtk-3-bin==3.22.11-1
+libgtk-3-common==3.22.11-1
+libgtk2.0-0==2.24.31-2
+libgtk2.0-bin==2.24.31-2
+libgtk2.0-common==2.24.31-2
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==230-3
+libguice-java==4.0-3
+libgvc6==2.38.0-17
+libgvpr2==2.38.0-17
+libhamcrest-java==1.3-6
+libharfbuzz-icu0==1.4.2-1
+libharfbuzz0b==1.4.2-1
+libhogweed4==3.3-1+b2
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.03-2
+libhttp-cookies-perl==6.01-1
+libhttp-daemon-perl==6.01-1
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.11-1
+libhttp-negotiate-perl==6.00-2
+libhttpclient-java==4.5.2-2+deb9u1
+libhttpcore-java==4.4.6-1
+libhwloc-dev==1.11.5-1
+libhwloc-plugins==1.11.5-1
+libhwloc5==1.11.5-1
+libiberty-dev==20161220-1
+libibverbs-dev==1.2.1-2
+libibverbs1==1.2.1-2
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==57.1-6+deb9u4
+libicu57==57.1-6+deb9u4
+libidn2-0==0.16-1+deb9u1
+libijs-0.35==0.35-12
+libilmbase12==2.2.0-12
+libimport-into-perl==1.002005-1
+libinput-bin==1.6.3-1
+libinput10==1.6.3-1
+libio-html-perl==1.001-1
+libio-pty-perl==1:1.08-1.1+b2
+libio-sessiondata-perl==1.03-1
+libio-socket-inet6-perl==2.72-2
+libio-socket-ssl-perl==2.044-1
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-2
+libip4tc-dev==1.6.0+snapshot20161117-6
+libip4tc0==1.6.0+snapshot20161117-6
+libip6tc-dev==1.6.0+snapshot20161117-6
+libip6tc0==1.6.0+snapshot20161117-6
+libipc-run-perl==0.94-1+deb9u1
+libipc-system-simple-perl==1.25-3
+libiptc-dev==1.6.0+snapshot20161117-6
+libiptc0==1.6.0+snapshot20161117-6
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libisl15==0.18-1
+libisorelax-java==20041111-9
+libitext1-java==1.4-6
+libitm1==6.3.0-18+deb9u1
+libjansson-dev==2.9-1
+libjansson4==2.9-1
+libjaxen-java==1.1.6-1+deb9u1
+libjaxp1.3-java==1.3.05-2
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.13-4.1
+libjdom1-java==1.1.3-1
+libjemalloc-dev==3.6.0-9.1
+libjemalloc1==3.6.0-9.1
+libjetty9-java==9.2.21-1+deb9u1
+libjline-java==1.0-2
+libjpeg62-turbo==1:1.5.1-2+deb9u1
+libjs-bootstrap==3.3.7+dfsg-2+deb9u2
+libjs-jquery==3.1.1-2+deb9u1
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==11-3
+libjs-jquery-tablesorter==11-3
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-1
+libjs-sphinxdoc==1.4.9-2
+libjs-twitter-bootstrap==2.0.2+dfsg-10
+libjs-underscore==1.8.3~dfsg-1
+libjsch-java==0.1.54-1
+libjson-c-dev==0.12.1-1.1+deb9u1
+libjson-c3==0.12.1-1.1+deb9u1
+libjson-glib-1.0-0==1.2.6-1
+libjson-glib-1.0-common==1.2.6-1
+libjsoncpp1==1.7.4-3
+libjsoup-java==1.10.2-1
+libjsr305-java==0.1~+svn49-10
+libjtidy-java==7+svn20110807-4
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libjzlib-java==1.1.3-1
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkmod2==23-2
+libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
+liblcms2-2==2.8-4+deb9u1
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+libldap2-dev==2.4.44+dfsg-5+deb9u8
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b1
+libllvm3.8==1:3.8.1-24
+libllvm3.9==1:3.9.1-9
+liblocale-gettext-perl==1.07-3+b1
+liblog4j1.2-java==1.2.17-7+deb9u1
+liblogging-stdlog0==1.0.5-2+b2
+liblognorm5==2.0.1-1.1+b1
+liblqr-1-0==0.4.2-2+b2
+liblsan0==6.3.0-18+deb9u1
+libltdl-dev==2.4.6-2
+libltdl7==2.4.6-2
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblvm2app2.2==2.02.168-2
+liblvm2cmd2.02==2.02.168-2
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.06-2
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u8
+liblzo2-2==2.08-1.2+b2
+liblzo2-dev==2.08-1.2+b2
+libmagic-mgc==1:5.30-1+deb9u3
+libmagic1==1:5.30-1+deb9u3
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u11
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u11
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u11
+libmail-sendmail-perl==0.79.16-2
+libmailtools-perl==2.18-1
+libmailutils5==1:3.1.1-1
+libmariadbclient-dev==10.1.48-0+deb9u1
+libmariadbclient-dev-compat==10.1.48-0+deb9u1
+libmariadbclient18==10.1.48-0+deb9u1
+libmaven-ant-tasks-java==2.1.3-4
+libmaven-archiver-java==2.6-3
+libmaven-clean-plugin-java==2.5-1
+libmaven-common-artifact-filters-java==1.4-1
+libmaven-compiler-plugin-java==3.2-5
+libmaven-doxia-tools-java==1.2.1-2
+libmaven-filtering-java==1.1-1
+libmaven-jar-plugin-java==2.4-1
+libmaven-parent-java==21-2
+libmaven-plugin-tools-java==3.3-5
+libmaven-reporting-impl-java==2.3-1
+libmaven-resources-plugin-java==2.6-1
+libmaven-shared-incremental-java==1.1-1
+libmaven-shared-utils-java==3.0.0-1
+libmaven-site-plugin-java==2.1-4
+libmaven2-core-java==2.2.1-26
+libmaven3-core-java==3.3.9-4
+libmime-tools-perl==5.508-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.014-2
+libmoo-perl==2.002005-1
+libmpc3==1.0.3-1+b2
+libmpdec2==2.4.2-1
+libmpfr4==3.1.5-1
+libmpx2==6.3.0-18+deb9u1
+libmsv-java==2009.1+dfsg1-5
+libmtdev1==1.1.5-1+b1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==0.8~beta+dfsg-1+b1
+libnanomsg4==0.8~beta+dfsg-1+b1
+libncurses5==6.0+20161126-1+deb9u2
+libncurses5-dev==6.0+20161126-1+deb9u2
+libnet-dbus-perl==1.1.0-4+b1
+libnet-dns-perl==1.07-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.12-1
+libnet-ip-perl==1.26-1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.80-1
+libnetfilter-conntrack-dev==1.0.6-2
+libnetfilter-conntrack3==1.0.6-2
+libnetpbm10==2:10.0-15.3+b2
+libnewt-dev==0.52.19-1+b1
+libnewt0.52==0.52.19-1+b1
+libnfnetlink-dev==1.0.1-3
+libnfnetlink0==1.0.1-3
+libnftnl-dev==1.0.7-1
+libnftnl4==1.0.7-1
+libnghttp2-14==1.18.1-1+deb9u1
+libnih-dbus1==1.0.3-8
+libnih1==1.0.3-8
+libnl-3-200==3.2.27-2
+libnl-route-3-200==3.2.27-2
+libnpth0==1.3-1
+libnspr4==2:4.12-6
+libnss3==2:3.26.2-1.1+deb9u2
+libntlm0==1.4-8
+libnuma-dev==2.0.11-2.1
+libnuma1==2.0.11-2.1
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-6-dev==6.3.0-18+deb9u1
+libobjc4==6.3.0-18+deb9u1
+libobjenesis-java==2.5.1-1
+libogg0==1.3.2-1
+libopenexr22==2.2.0-11+deb9u2
+libopenjp2-7==2.1.2-1.1+deb9u6
+libopenmpi-dev==2.0.2-2
+libopenmpi2==2.0.2-2
+libopus0==1.2~alpha2-1
+liboro-java==2.0.8a-12
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b4
+libossp-uuid16==1.6.2-1.5+b4
+libp11-kit0==0.23.3-2+deb9u1
+libpackage-stash-perl==0.37-1
+libpackage-stash-xs-perl==0.28-3+b1
+libpackagekit-glib2-18==1.1.5-2+deb9u2
+libpam-cap==1:2.25-1
+libpam-systemd==232-25+deb9u12
+libpam0g-dev==1.1.8-3.6
+libpango-1.0-0==1.40.5-1
+libpangocairo-1.0-0==1.40.5-1
+libpangoft2-1.0-0==1.40.5-1
+libpaper-utils==1.1.24+nmu5
+libpaper1==1.1.24+nmu5
+libparams-classify-perl==0.013-6+b1
+libparams-util-perl==1.07-3+b1
+libparams-validate-perl==1.26-1
+libparse-debianchangelog-perl==1.2.0-12
+libpath-iterator-rule-perl==1.009-1
+libpath-tiny-perl==0.100-1
+libpathplan4==2.38.0-17
+libpcap-dev==1.8.1-3
+libpcap0.8==1.8.1-3
+libpcap0.8-dev==1.8.1-3
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.13.4-1+b2
+libpcre16-3==2:8.39-3
+libpcre3-dev==2:8.39-3
+libpcre32-3==2:8.39-3
+libpcrecpp0v5==2:8.39-3
+libpcsclite1==1.8.20-1
+libperl-dev==5.24.1-3+deb9u7
+libperl5.24==5.24.1-3+deb9u7
+libperlio-gzip-perl==0.19-1+b2
+libpgm-5.2-0==5.2.122~dfsg-2
+libpipeline1==1.4.1-2
+libpixman-1-0==0.34.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-3
+libplexus-archiver-java==2.2-1+deb9u1
+libplexus-bsh-factory-java==1.0~alpha7-3.1
+libplexus-build-api-java==0.0.7-1
+libplexus-cipher-java==1.7-1
+libplexus-classworlds-java==1.5.0-5
+libplexus-classworlds2-java==2.5.2-1
+libplexus-cli-java==1.2-5
+libplexus-compiler-java==2.4-3
+libplexus-component-annotations-java==1.6-3
+libplexus-component-metadata-java==1.6-3
+libplexus-container-default-java==1.0-alpha-9-stable-1-7
+libplexus-container-default1.5-java==1.6-3
+libplexus-containers-java==1.0~beta3.0.7-8
+libplexus-containers1.5-java==1.6-3
+libplexus-i18n-java==1.0-beta-10-3
+libplexus-interactivity-api-java==1.0-alpha-6-7
+libplexus-interpolation-java==1.21-1
+libplexus-io-java==1.0~alpha5-2
+libplexus-sec-dispatcher-java==1.3.1-6
+libplexus-utils-java==1:1.5.15-4+deb9u1
+libplexus-utils2-java==3.0.22-1
+libplexus-velocity-java==1.2-1
+libpng-dev==1.6.28-1+deb9u1
+libpng16-16==1.6.28-1+deb9u1
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-18+deb9u1
+libpolkit-backend-1-0==0.105-18+deb9u1
+libpolkit-gobject-1-0==0.105-18+deb9u1
+libpoppler64==0.48.0-2+deb9u4
+libpopt0==1.16-10+b2
+libpotrace0==1.13-3
+libprocps6==2:3.3.12-3+deb9u1
+libprotobuf-dev==3.0.0-9
+libprotobuf-lite10==3.0.0-9
+libprotobuf10==3.0.0-9
+libprotoc10==3.0.0-9
+libproxy1v5==0.4.14-2+deb9u2
+libpsl5==0.17.0-3
+libpsm-infinipath1==3.3+19.g67c0807.open-3
+libptexenc1==2016.20160513.41080.dfsg-2+deb9u1
+libpthread-stubs0-dev==0.3-4
+libpulse0==10.0-1+deb9u1
+libpython-all-dev==2.7.13-2
+libpython-dev==2.7.13-2
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u4
+libpython2.7-dev==2.7.13-2+deb9u4
+libpython2.7-minimal==2.7.13-2+deb9u4
+libpython2.7-stdlib==2.7.13-2+deb9u4
+libpython3-all-dbg==3.5.3-1
+libpython3-all-dev==3.5.3-1
+libpython3-dbg==3.5.3-1
+libpython3-dev==3.5.3-1
+libpython3-stdlib==3.5.3-1
+libpython3.5==3.5.3-1+deb9u3
+libpython3.5-dbg==3.5.3-1+deb9u3
+libpython3.5-dev==3.5.3-1+deb9u3
+libpython3.5-minimal==3.5.3-1+deb9u3
+libpython3.5-stdlib==3.5.3-1+deb9u3
+libqdox-java==1.12.1-2
+libqdox2-java==2.0~M3-3
+libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
+libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
+libqt4-designer==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
+libqt4-help==4:4.8.7+dfsg-11+deb9u1
+libqt4-network==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
+libqt4-script==4:4.8.7+dfsg-11+deb9u1
+libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
+libqt4-svg==4:4.8.7+dfsg-11+deb9u1
+libqt4-test==4:4.8.7+dfsg-11+deb9u1
+libqt4-xml==4:4.8.7+dfsg-11+deb9u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
+libqt5concurrent5==5.7.1+dfsg-3+deb9u3
+libqt5core5a==5.7.1+dfsg-3+deb9u3
+libqt5dbus5==5.7.1+dfsg-3+deb9u3
+libqt5gui5==5.7.1+dfsg-3+deb9u3
+libqt5network5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
+libqt5printsupport5==5.7.1+dfsg-3+deb9u3
+libqt5sql5==5.7.1+dfsg-3+deb9u3
+libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
+libqt5svg5==5.7.1~20161021-2.1
+libqt5test5==5.7.1+dfsg-3+deb9u3
+libqt5widgets5==5.7.1+dfsg-3+deb9u3
+libqt5xml5==5.7.1+dfsg-3+deb9u3
+libqtcore4==4:4.8.7+dfsg-11+deb9u1
+libqtdbus4==4:4.8.7+dfsg-11+deb9u1
+libqtgui4==4:4.8.7+dfsg-11+deb9u1
+libquadmath0==6.3.0-18+deb9u1
+librdmacm1==1.1.0-2
+libreadline-dev==7.0-3
+libreadline5==5.2+dfsg-3+b1
+libreadline7==7.0-3
+libregexp-assemble-perl==0.36-1
+librelaxng-datatype-java==1.0+ds1-3
+librest-0.7-0==0.8.0-2
+librhash0==1.3.3-1+b2
+librhino-java==1.7.7.1-1
+librole-tiny-perl==2.000005-1
+librrd-dev==1.6.0-1+b2
+librrd8==1.6.0-1+b2
+librsvg2-2==2.40.21-0+deb9u1
+librsvg2-common==2.40.21-0+deb9u1
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libruby2.3==2.3.3-1+deb9u9
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsaxon-java==1:6.5.5-10
+libscalar-list-utils-perl==1:1.47-1
+libsdl1.2debian==1.2.15+dfsg1-4
+libseccomp2==2.3.1-2.1+deb9u1
+libselinux1-dev==2.6-3+b3
+libsensors4==1:3.4.0-4
+libsensors4-dev==1:3.4.0-4
+libsepol1-dev==2.6-2
+libservlet3.1-java==8.5.54-0+deb9u5
+libsigsegv2==2.10-5
+libsisu-inject-java==0.3.2-2
+libsisu-plexus-java==0.3.2-1
+libslang2==2.3.1-5
+libslang2-dev==2.3.1-5
+libslf4j-java==1.7.22-1
+libsm-dev==2:1.2.2-1+b3
+libsm6==2:1.2.2-1+b3
+libsndfile1==1.0.27-3+deb9u1
+libsnmp-base==5.7.3+dfsg-1.7+deb9u3
+libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
+libsnmp30==5.7.3+dfsg-1.7+deb9u3
+libsoap-lite-perl==1.20-1
+libsocket6-perl==0.27-1+b1
+libsodium18==1.0.11-2
+libsort-key-perl==1.33-1+b3
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.56.0-2+deb9u2
+libsoup2.4-1==2.56.0-2+deb9u2
+libspice-server1==0.12.8-2.1+deb9u4
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl-dev==1.1.0l-1~deb9u3
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libstax-java==1.2.0-3
+libstdc++-6-dev==6.3.0-18+deb9u1
+libstrictures-perl==2.000003-1
+libstring-copyright-perl==0.003005-1
+libstring-escape-perl==2010.002-1
+libsub-exporter-perl==0.986-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.12-2+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1
+libsubunit-dev==1.1.0-3
+libsubunit0==1.1.0-3
+libsurefire-java==2.17-3
+libswitch-perl==2.17-2
+libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==232-25+deb9u12
+libtask-weaken-perl==1.04-1
+libtasn1-6==4.10-1.1+deb9u1
+libtcl8.6==8.6.6+dfsg-1+b1
+libtcmalloc-minimal4==2.5-2.2
+libtexlua52==2016.20160513.41080.dfsg-2+deb9u1
+libtexluajit2==2016.20160513.41080.dfsg-2+deb9u1
+libtext-charwidth-perl==0.04-7+b5
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b4
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.26-1
+libthai0==0.1.26-1
+libtie-ixhash-perl==1.23-2
+libtiff5==4.0.8-2+deb9u5
+libtimedate-perl==2.3000-2+deb9u1
+libtinfo-dev==6.0+20161126-1+deb9u2
+libtinyxml2-4==4.0.1-1
+libtinyxml2-dev==4.0.1-1
+libtk8.6==8.6.6-1+b1
+libtool==2.4.6-2
+libtool-bin==2.4.6-2
+libtry-tiny-perl==0.28-1
+libtsan0==6.3.0-18+deb9u1
+libtxc-dxtn-s2tc==1.0+git20151227-2
+libubsan0==6.3.0-18+deb9u1
+libudev-dev==232-25+deb9u12
+libunicode-utf8-perl==0.60-1+b3
+libunistring0==0.9.6+really0.9.3-0.1
+libunwind-dev==1.1-4.1
+libunwind8==1.1-4.1
+libunwind8-dev==1.1-4.1
+liburi-perl==1.71-1
+libusb-0.1-4==2:0.1.12-30
+libusb-1.0-0==2:1.0.21-1
+libusb-1.0-0-dev==2:1.0.21-1
+libusb-1.0-doc==2:1.0.21-1
+libusb-dev==2:0.1.12-30
+libusbredirparser1==0.7.1-1
+libutempter0==1.1.6-3
+libuv1==1.34.2-1~bpo9+1
+libvariable-magic-perl==0.61-1
+libvdeplug2==2.3.2+r586-2.1
+libvirt-clients==3.0.0-4+deb9u5
+libvirt0==3.0.0-4+deb9u5
+libvorbis0a==1.3.5-4+deb9u2
+libvorbisenc2==1.3.5-4+deb9u2
+libwacom-bin==0.22-1+b1
+libwacom-common==0.22-1
+libwacom2==0.22-1+b1
+libwagon-java==1.0.0-9
+libwagon2-java==2.10-6
+libwayland-client0==1.12.0-1+deb9u1
+libwayland-cursor0==1.12.0-1+deb9u1
+libwayland-egl1-mesa==13.0.6-1+b2
+libwayland-server0==1.12.0-1+deb9u1
+libwebp6==0.5.2-1
+libwebpdemux2==0.5.2-1
+libwebpmux2==0.5.2-1
+libwmf0.2-7==0.2.8.4-10.6
+libwrap0==7.6.q-26
+libwrap0-dev==7.6.q-26
+libwww-perl==6.15-1
+libwww-robotrules-perl==6.01-1
+libx11-6==2:1.6.4-3+deb9u3
+libx11-data==2:1.6.4-3+deb9u3
+libx11-dev==2:1.6.4-3+deb9u3
+libx11-doc==2:1.6.4-3+deb9u3
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.4-3+deb9u3
+libx11-xcb1==2:1.6.4-3+deb9u3
+libx32asan3==6.3.0-18+deb9u1
+libx32atomic1==6.3.0-18+deb9u1
+libx32cilkrts5==6.3.0-18+deb9u1
+libx32gcc-6-dev==6.3.0-18+deb9u1
+libx32gcc1==1:6.3.0-18+deb9u1
+libx32gomp1==6.3.0-18+deb9u1
+libx32itm1==6.3.0-18+deb9u1
+libx32quadmath0==6.3.0-18+deb9u1
+libx32stdc++6==6.3.0-18+deb9u1
+libx32ubsan0==6.3.0-18+deb9u1
+libxalan2-java==2.7.1-9
+libxapian30==1.4.3-2+deb9u3
+libxau-dev==1:1.0.8-1
+libxau6==1:1.0.8-1
+libxaw7==2:1.0.13-1+b2
+libxbean-java==4.5-4
+libxcb-dri2-0==1.12-1
+libxcb-dri2-0-dev==1.12-1
+libxcb-dri3-0==1.12-1
+libxcb-dri3-dev==1.12-1
+libxcb-glx0==1.12-1
+libxcb-glx0-dev==1.12-1
+libxcb-icccm4==0.4.1-1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.12-1
+libxcb-present0==1.12-1
+libxcb-randr0==1.12-1
+libxcb-randr0-dev==1.12-1
+libxcb-render-util0==0.3.9-1
+libxcb-render0==1.12-1
+libxcb-render0-dev==1.12-1
+libxcb-shape0==1.12-1
+libxcb-shape0-dev==1.12-1
+libxcb-shm0==1.12-1
+libxcb-sync-dev==1.12-1
+libxcb-sync1==1.12-1
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.12-1
+libxcb-xfixes0-dev==1.12-1
+libxcb-xinerama0==1.12-1
+libxcb-xkb1==1.12-1
+libxcb1==1.12-1
+libxcb1-dev==1.12-1
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.14-1+deb9u2
+libxdamage-dev==1:1.1.4-2+b3
+libxdamage1==1:1.1.4-2+b3
+libxdelta2==1.1.3-9.1+b1
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.38.0-17
+libxen-4.8==4.8.5.final+shim4.10.4-1+deb9u12
+libxenstore3.0==4.8.5.final+shim4.10.4-1+deb9u12
+libxerces2-java==2.11.0-7
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-1+b2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.3-1+b3
+libxkbcommon-x11-0==0.7.1-2~deb9u1
+libxkbcommon0==0.7.1-2~deb9u1
+libxml-commons-external-java==1.4.01-2
+libxml-commons-resolver1.1-java==1.2-7
+libxml-libxml-perl==2.0128+dfsg-1+deb9u1
+libxml-namespacesupport-perl==1.11-1
+libxml-parser-perl==2.44-2+b1
+libxml-sax-base-perl==1.07-1
+libxml-sax-expat-perl==0.40-2
+libxml-sax-perl==0.99+dfsg-2
+libxml-simple-perl==2.22-1
+libxml-twig-perl==1:3.50-1
+libxml-xpathengine-perl==0.13-1
+libxml2==2.9.4+dfsg1-2.2+deb9u3
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u3
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u3
+libxmlgraphics-commons-java==2.1-2
+libxmlrpc-lite-perl==0.717-1
+libxmu6==2:1.1.2-2
+libxmuu1==2:1.1.2-2
+libxom-java==1.2.10-1
+libxpm4==1:3.5.12-1
+libxpp2-java==2.1.10-7
+libxpp3-java==1.1.4c-2
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.2-1+b2
+libxshmfence1==1.2-1+b2
+libxslt1.1==1.1.29-2.1+deb9u2
+libxss1==1:1.2.2-1
+libxt-dev==1:1.1.5-1
+libxt6==1:1.1.5-1
+libxtables-dev==1.6.0+snapshot20161117-6
+libxtables12==1.6.0+snapshot20161117-6
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libyajl2==2.1.0-2+b3
+libyaml-0-2==0.1.7-2
+libyaml-dev==0.1.7-2
+libyaml-libyaml-perl==0.63-2
+libyaml-tiny-perl==1.70-1
+libzmq3-dev==4.2.1-4+deb9u3
+libzmq5==4.2.1-4+deb9u3
+libzzip-0-13==0.13.62-3.2~deb9u1
+licensecheck==3.0.29-1
+lintian==2.5.50.4
+linux-compiler-gcc-6-x86==4.9.246-2
+linux-headers-4.9.0-14-amd64==4.9.246-2
+linux-headers-4.9.0-14-common==4.9.246-2
+linux-headers-amd64==4.9+80+deb9u12
+linux-kbuild-4.9==4.9.246-2
+linux-libc-dev==4.9.246-2
+linuxdoc-tools==0.9.72-4
+llvm-3.8==1:3.8.1-24
+llvm-3.8-dev==1:3.8.1-24
+llvm-3.8-runtime==1:3.8.1-24
+lmodern==2.004.5-3
+logrotate==3.11.0-0.1
+lsb-release==9.20161125
+lsof==4.89+dfsg-0.1
+lua-bitop==1.0.2-4
+lua-bitop-dev==1.0.2-4
+lua-cjson==2.1.0+dfsg-2
+lua-cjson-dev==2.1.0+dfsg-2
+lvm2==2.02.168-2
+lynx==2.8.9dev11-1
+lynx-common==2.8.9dev11-1
+m4==1.4.18-1
+mailutils==1:3.1.1-1
+mailutils-common==1:3.1.1-1
+make==4.1-9.1
+man-db==2.7.6.1-2
+manpages==4.10-2
+manpages-dev==4.10-2
+maven==3.3.9-4
+maven-debian-helper==2.1.3
+maven-repo-helper==1.9.2
+mesa-common-dev==13.0.6-1+b2
+mesa-utils==8.3.0-3
+mime-support==3.60
+module-assistant==0.11.9
+mpi-default-bin==1.8
+mpi-default-dev==1.8
+mysql-common==5.8+1.0.2
+ncurses-term==6.0+20161126-1+deb9u2
+netbase==5.4
+netpbm==2:10.0-15.3+b2
+ocl-icd-libopencl1==2.2.11-1
+openjdk-8-jdk==8u275-b01-1~deb9u1
+openjdk-8-jdk-headless==8u275-b01-1~deb9u1
+openjdk-8-jre==8u275-b01-1~deb9u1
+openjdk-8-jre-headless==8u275-b01-1~deb9u1
+openmpi-bin==2.0.2-2
+openmpi-common==2.0.2-2
+opensp==1.5.2-13+b1
+openssh-client==1:7.4p1-10+deb9u7
+openssh-server==1:7.4p1-10+deb9u7
+openssh-sftp-server==1:7.4p1-10+deb9u7
+openssl==1.1.0l-1~deb9u3
+packagekit==1.1.5-2+deb9u2
+packagekit-tools==1.1.5-2+deb9u2
+patch==2.7.5-1+deb9u2
+patchutils==0.3.4-2
+pbuilder==0.228.7
+pbzip2==1.1.9-1+b1
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+perl-openssl-defaults==3
+php-cli==1:7.0+49
+php-codecoverage==4.0.0+dfsg-1
+php-common==1:49
+php-deepcopy==1.5.5-1
+php-doctrine-instantiator==1.0.5-2
+php-file-iterator==1.4.1-2
+php-pear==1:1.10.1+submodules+notgz-9+deb9u2
+php-phpdocumentor-reflection-docblock==2.0.4-2
+php-phpspec-prophecy==1.6.2-1
+php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
+php-text-template==1.2.1-2
+php-timer==1.0.8-1
+php-token-stream==1.4.8-2
+php-xml==1:7.0+49
+php7.0-cli==7.0.33-0+deb9u10
+php7.0-common==7.0.33-0+deb9u10
+php7.0-json==7.0.33-0+deb9u10
+php7.0-opcache==7.0.33-0+deb9u10
+php7.0-readline==7.0.33-0+deb9u10
+php7.0-xml==7.0.33-0+deb9u10
+phpunit==5.4.6-2~deb9u1
+phpunit-code-unit-reverse-lookup==1.0.0-2
+phpunit-comparator==1.2.0-2
+phpunit-diff==1.4.1-2
+phpunit-environment==1.3.7-1
+phpunit-exporter==1.2.2-1
+phpunit-global-state==1.1.1-2
+phpunit-mock-object==3.2.3-1
+phpunit-object-enumerator==1.0.0-2
+phpunit-recursion-context==1.0.2-2
+phpunit-resource-operations==1.0.0-2
+phpunit-version==2.0.0-2
+pigz==2.3.4-1
+pinentry-curses==1.0.0-2
+pkg-config==0.29-4+b1
+pkg-php-tools==1.35
+po-debconf==1.0.20
+policykit-1==0.105-18+deb9u1
+poppler-data==0.4.7-8
+preview-latex-style==11.90-1
+pristine-tar==1.38
+procmail==3.22-25+deb9u1
+procps==2:3.3.12-3+deb9u1
+prosper==1.00.4+cvs.2007.05.01-4.1
+protobuf-compiler==3.0.0-9
+ps2eps==1.68+binaryfree-2
+psmisc==22.21-2.1+b2
+psutils==1.17.dfsg-4
+publicsuffix==20190415.1030-0+deb9u1
+pylint==1.6.5-1
+python==2.7.13-2
+python-alabaster==0.7.8-1
+python-all==2.7.13-2
+python-all-dev==2.7.13-2
+python-apt==1.4.3
+python-apt-common==1.4.3
+python-astroid==1.4.9-1
+python-attr==16.3.0-1
+python-babel==2.3.4+dfsg.1-2
+python-babel-localedata==2.3.4+dfsg.1-2
+python-backports.functools-lru-cache==1.3-1
+python-bs4==4.5.3-1
+python-cffi-backend==1.9.1-2
+python-chardet==2.3.0-2
+python-click==6.6-1
+python-colorama==0.3.7-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-1
+python-coverage==4.2+dfsg.1-2
+python-crypto==2.6.1-7
+python-cryptography==1.7.1-3+deb9u2
+python-dateutil==2.5.3-2
+python-dbus==1.2.4-1+b1
+python-debian==0.1.30
+python-dev==2.7.13-2
+python-docutils==0.13.1+dfsg-2
+python-enum34==1.1.6-1
+python-gi==3.22.0-2
+python-gpg==1.8.0-3+b2
+python-html5lib==0.999999999-1
+python-idna==2.2-1
+python-imagesize==0.7.1-1
+python-incremental==16.10.1-3
+python-ipaddr==2.1.11-2
+python-ipaddress==1.0.17-1
+python-isort==4.2.5+ds1-2+deb9u1
+python-jinja2==2.8-1
+python-keyring==10.1-1
+python-keyrings.alt==1.3-1
+python-lazy-object-proxy==1.2.2-1
+python-lxml==3.7.1-1+deb9u3
+python-markupsafe==0.23-3
+python-minimal==2.7.13-2
+python-nose2==0.6.5-2
+python-openssl==16.2.0-1
+python-pam==0.4.2-13.2
+python-parse==1.6.6-0.1
+python-pil==4.0.0-4+deb9u2
+python-pip-whl==9.0.1-2+deb9u2
+python-pkg-resources==33.1.1-1
+python-py==1.4.32-3
+python-pyasn1==0.1.9-2
+python-pyasn1-modules==0.0.7-0.1
+python-pygments==2.2.0+dfsg-1
+python-pytest==3.0.6-1
+python-pytest-cov==2.4.0-2
+python-requests==2.12.4-1
+python-roman==2.0.0-2
+python-secretstorage==2.3.1-2
+python-serial==3.2.1-1
+python-service-identity==16.0.0-2
+python-setuptools==33.1.1-1
+python-six==1.10.0-3
+python-sphinx==1.4.9-2
+python-sphinx-rtd-theme==0.1.9-1
+python-stdeb==0.8.5-1
+python-tk==2.7.13-1
+python-twisted==16.6.0-2
+python-twisted-bin==16.6.0-2
+python-twisted-core==16.6.0-2
+python-tz==2016.7-0.3
+python-urllib3==1.19.1-1
+python-webencodings==0.5-2
+python-wheel==0.29.0-2
+python-wrapt==1.9.0-2
+python-xdg==0.25-4
+python-zope.interface==4.3.2-1
+python2.7==2.7.13-2+deb9u4
+python2.7-dev==2.7.13-2+deb9u4
+python2.7-minimal==2.7.13-2+deb9u4
+python3==3.5.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.5.3-1
+python3-all-dbg==3.5.3-1
+python3-all-dev==3.5.3-1
+python3-apt==1.4.3
+python3-babel==2.3.4+dfsg.1-2
+python3-cffi-backend==1.9.1-2
+python3-chardet==2.3.0-2
+python3-crypto==2.6.1-7
+python3-cryptography==1.7.1-3+deb9u2
+python3-dbg==3.5.3-1
+python3-dbus==1.2.4-1+b1
+python3-debian==0.1.30
+python3-dev==3.5.3-1
+python3-docutils==0.13.1+dfsg-2
+python3-gi==3.22.0-2
+python3-idna==2.2-1
+python3-imagesize==0.7.1-1
+python3-jinja2==2.8-1
+python3-keyring==10.1-1
+python3-keyrings.alt==1.3-1
+python3-magic==1:5.30-1+deb9u3
+python3-markupsafe==0.23-3
+python3-minimal==3.5.3-1
+python3-pil==4.0.0-4+deb9u2
+python3-pkg-resources==33.1.1-1
+python3-pyasn1==0.1.9-2
+python3-pycurl==7.43.0-2
+python3-pygments==2.2.0+dfsg-1
+python3-roman==2.0.0-2
+python3-secretstorage==2.3.1-2
+python3-setuptools==33.1.1-1
+python3-six==1.10.0-3
+python3-software-properties==0.96.20.2-1+deb9u1
+python3-sphinx==1.4.9-2
+python3-tz==2016.7-0.3
+python3-wheel==0.29.0-2
+python3-xdg==0.25-4
+python3.5==3.5.3-1+deb9u3
+python3.5-dbg==3.5.3-1+deb9u3
+python3.5-dev==3.5.3-1+deb9u3
+python3.5-minimal==3.5.3-1+deb9u3
+qdbus==4:4.8.7+dfsg-11+deb9u1
+qemu-kvm==1:2.8+dfsg-6+deb9u13
+qemu-system-common==1:2.8+dfsg-6+deb9u13
+qemu-system-x86==1:2.8+dfsg-6+deb9u13
+qemu-utils==1:2.8+dfsg-6+deb9u13
+qt-at-spi==0.4.0-5
+qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
+qt4-qmake==4:4.8.7+dfsg-11+deb9u1
+qt5-default==5.7.1+dfsg-3+deb9u3
+qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
+qt5-qmake==5.7.1+dfsg-3+deb9u3
+qtbase5-dev==5.7.1+dfsg-3+deb9u3
+qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
+qtchooser==63-g13a3d08-1
+qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
+qttranslations5-l10n==5.7.1~20161021-1
+quilt==0.65-2~bpo9+1
+rake==10.5.0-2+deb9u1
+readline-common==7.0-3
+rename==0.20-4
+rhino==1.7.7.1-1
+rrdtool==1.6.0-1+b2
+rsync==3.1.2-1+deb9u2
+rsyslog==8.24.0-1
+ruby==1:2.3.3
+ruby-all-dev==1:2.3.3
+ruby-did-you-mean==1.0.0-2
+ruby-minitest==5.9.0-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==0.3.0-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.1.7-2
+ruby2.3==2.3.3-1+deb9u9
+ruby2.3-dev==2.3.3-1+deb9u9
+rubygems-integration==1.11
+seabios==1.10.2-1
+sgml-base==1.29
+sgml-data==2.0.10
+shared-mime-info==1.8-1+deb9u1
+software-properties-common==0.96.20.2-1+deb9u1
+sphinx-common==1.4.9-2
+sphinx-rtd-theme-common==0.1.9-1
+squashfs-tools==1:4.3-3+deb9u1
+stgit==0.17.1-1
+strace==4.15-2
+sudo==1.8.19p1-2.1+deb9u3
+swig==3.0.10-1.1
+swig3.0==3.0.10-1.1
+systemd==232-25+deb9u12
+systemd-shim==10-3
+t1utils==1.39-2
+tcl==8.6.0+9
+tcl8.6==8.6.6+dfsg-1+b1
+tcpd==7.6.q-26
+telnet==0.17-41
+tex-common==6.06
+tex-gyre==20160520-1
+texi2html==1.82+dfsg1-5
+texinfo==6.3.0.dfsg.1-1+b2
+texlive-base==2016.20170123-5
+texlive-binaries==2016.20160513.41080.dfsg-2+deb9u1
+texlive-extra-utils==2016.20170123-5
+texlive-font-utils==2016.20170123-5
+texlive-fonts-recommended==2016.20170123-5
+texlive-fonts-recommended-doc==2016.20170123-5
+texlive-generic-extra==2016.20170123-5
+texlive-generic-recommended==2016.20170123-5
+texlive-latex-base==2016.20170123-5
+texlive-latex-base-doc==2016.20170123-5
+texlive-latex-extra==2016.20170123-5
+texlive-latex-extra-doc==2016.20170123-5
+texlive-latex-recommended==2016.20170123-5
+texlive-latex-recommended-doc==2016.20170123-5
+texlive-pictures==2016.20170123-5
+texlive-pictures-doc==2016.20170123-5
+texlive-pstricks==2016.20170123-5
+texlive-pstricks-doc==2016.20170123-5
+tipa==2:1.3-20
+tk==8.6.0+9
+tk8.6==8.6.6-1+b1
+tk8.6-blt2.5==2.5.3+dfsg-3
+ucf==3.0036
+unattended-upgrades==0.93.1+nmu1
+unzip==6.0-21+deb9u2
+velocity==1.7-5
+vim==2:8.0.0197-4+deb9u3
+vim-common==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
+wdiff==1.2.2-2
+wget==1.18-5+deb9u3
+x11-common==1:7.7+19
+x11-utils==7.7+3+b1
+x11-xserver-utils==7.7+7+b1
+x11proto-core-dev==7.0.31-1
+x11proto-damage-dev==1:1.2.1-2
+x11proto-dri2-dev==2.8-2
+x11proto-fixes-dev==1:5.0-2
+x11proto-gl-dev==1.4.17-1
+x11proto-input-dev==2.3.2-1
+x11proto-kb-dev==1.0.7-1
+x11proto-xext-dev==7.3.0-1
+x11proto-xf86vidmode-dev==2.3.1-2
+xauth==1:1.0.9-1+b2
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.1+b1
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.15-2+b1
+xdg-utils==1.1.1-1+deb9u2
+xkb-data==2.19-1+deb9u1
+xml-core==0.17
+xmlto==0.0.28-1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.29-2.1+deb9u2
+xterm==327-2+deb9u1
+xtrans-dev==1.3.5-1
+xxd==2:8.0.0197-4+deb9u3
+xz-utils==5.2.2-1.2+b1
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
new file mode 100644
index 000000000000..2e3b1f405aa4
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -0,0 +1,79 @@
+alabaster==0.7.8
+astroid==1.4.9
+attrs==16.3.0
+Babel==2.3.4
+backports.functools-lru-cache==1.3
+beautifulsoup4==4.5.3
+chardet==2.3.0
+click==6.6
+colorama==0.3.7
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.2
+crc16==0.1.1
+cryptography==1.7.1
+ctypesgen==0.post125
+docutils==0.13.1
+enum34==1.1.6
+gbp==0.8.12.2
+gcovr==3.3
+gpg==1.8.0
+html5lib==0.999999999
+idna==2.2
+imagesize==0.7.1
+incremental==16.10.1
+ipaddr==2.1.11
+ipaddress==1.0.17
+isort==4.2.5
+j2cli==0.3.10
+Jinja2==2.11.3
+keyring==10.1
+keyrings.alt==1.3
+lazy-object-proxy==1.2.2
+lxml==4.6.2
+M2Crypto==0.36.0
+MarkupSafe==1.1.1
+mmh3==2.5.1
+mockredispy==2.9.3
+nose2==0.6.5
+PAM==0.4.2
+parse==1.6.6
+pexpect==4.6.0
+Pillow==4.0.0
+ptyprocess==0.7.0
+py==1.4.32
+pyang==2.1.1
+pyasn1==0.1.9
+pyasn1-modules==0.0.7
+pycrypto==2.6.1
+Pygments==2.2.0
+pygobject==3.22.0
+pylint==1.6.5
+Pympler==0.8
+pyOpenSSL==16.2.0
+pyserial==3.2.1
+Pyste==0.9.10
+pytest==3.0.6
+pytest-cov==2.4.0
+pytest-runner==4.4
+python-apt==1.4.3
+python-dateutil==2.5.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+PyYAML==5.3.1
+requests==2.12.4
+roman==2.0.0
+SecretStorage==2.3.1
+service-identity==16.0.0
+six==1.10.0
+Sphinx==1.4.9
+sphinx-rtd-theme==0.1.9
+stdeb==0.8.5
+stgit===0.17.1-dirty
+Twisted==16.6.0
+typing==3.7.4.3
+urllib3==1.19.1
+webencodings==0.5
+wrapt==1.9.0
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
new file mode 100644
index 000000000000..7b9cc6ebd6ad
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -0,0 +1,36 @@
+alabaster==0.7.8
+Babel==2.3.4
+bitarray==1.6.3
+chardet==2.3.0
+cryptography==1.7.1
+devscripts==2.17.6+deb9u2
+docutils==0.13.1
+file-magic==0.3.0
+idna==2.2
+imagesize==0.7.1
+Jinja2==2.8
+keyring==10.1
+keyrings.alt==1.3
+lxml==4.6.2
+MarkupSafe==0.23
+mockredispy==2.9.3
+Pillow==4.0.0
+pyang==2.4.0
+pyangbind==0.8.1
+pyasn1==0.1.9
+pycrypto==2.6.1
+pycurl==7.43.0
+Pygments==2.2.0
+pygobject==3.22.0
+python-apt==1.4.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+PyYAML==5.3.1
+redis==3.5.3
+regex==2020.11.13
+roman==2.0.0
+SecretStorage==2.3.1
+six==1.10.0
+Sphinx==1.4.9
+unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
new file mode 100644
index 000000000000..0325858b9320
--- /dev/null
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -0,0 +1,84 @@
+adduser==3.118
+apt==1.8.2.2
+base-files==10.3+deb10u8
+base-passwd==3.5.46
+bash==5.0-4
+bsdutils==1:2.33.1-0.1
+coreutils==8.30-3
+dash==0.5.10.2-5
+debconf==1.5.71
+debian-archive-keyring==2019.1
+debianutils==4.8.6.1
+diffutils==1:3.7-3
+dpkg==1.19.7
+e2fsprogs==1.44.5-1+deb10u3
+fdisk==2.33.1-0.1
+findutils==4.6.0+git+20190209-2
+gcc-8-base==8.3.0-6
+gpgv==2.2.12-1+deb10u1
+grep==3.3-1
+gzip==1.9-3
+hostname==3.21
+init-system-helpers==1.56+nmu1
+libacl1==2.2.53-4
+libapt-pkg5.0==1.8.2.2
+libattr1==1:2.4.48-4
+libaudit-common==1:2.8.4-3
+libaudit1==1:2.8.4-3
+libblkid1==2.33.1-0.1
+libbz2-1.0==1.0.6-9.2~deb10u1
+libc-bin==2.28-10
+libc6==2.28-10
+libcap-ng0==0.7.9-2
+libcom-err2==1.44.5-1+deb10u3
+libdb5.3==5.3.28+dfsg1-0.5
+libdebconfclient0==0.249
+libext2fs2==1.44.5-1+deb10u3
+libfdisk1==2.33.1-0.1
+libffi6==3.2.1-9
+libgcc1==1:8.3.0-6
+libgcrypt20==1.8.4-5
+libgmp10==2:6.1.2+dfsg-4
+libgnutls30==3.6.7-4+deb10u6
+libgpg-error0==1.35-1
+libhogweed4==3.4.1-1
+libidn2-0==2.0.5-1+deb10u1
+liblz4-1==1.8.3-1
+liblzma5==5.2.4-1
+libmount1==2.33.1-0.1
+libncursesw6==6.1+20181013-2+deb10u2
+libnettle6==3.4.1-1
+libp11-kit0==0.23.15-2+deb10u1
+libpam-modules==1.3.1-5
+libpam-modules-bin==1.3.1-5
+libpam-runtime==1.3.1-5
+libpam0g==1.3.1-5
+libpcre3==2:8.39-12
+libseccomp2==2.3.3-4
+libselinux1==2.8-1+b1
+libsemanage-common==2.8-2
+libsemanage1==2.8-2
+libsepol1==2.8-1
+libsmartcols1==2.33.1-0.1
+libss2==1.44.5-1+deb10u3
+libstdc++6==8.3.0-6
+libsystemd0==241-7~deb10u6
+libtasn1-6==4.13-3
+libtinfo6==6.1+20181013-2+deb10u2
+libudev1==241-7~deb10u6
+libunistring2==0.9.10-1
+libuuid1==2.33.1-0.1
+libzstd1==1.3.8+dfsg-3
+login==1:4.5-1.1
+mawk==1.3.3-17+b3
+mount==2.33.1-0.1
+ncurses-base==6.1+20181013-2+deb10u2
+ncurses-bin==6.1+20181013-2+deb10u2
+passwd==1:4.5-1.1
+perl-base==5.28.1-6+deb10u1
+sed==4.7-1
+sysvinit-utils==2.93-8
+tar==1.30+dfsg-6
+tzdata==2021a-0+deb10u1
+util-linux==2.33.1-0.1
+zlib1g==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
new file mode 100644
index 000000000000..e99804d35b45
--- /dev/null
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -0,0 +1,283 @@
+acl==2.2.53-4
+apparmor==2.13.2-10
+apt-transport-https==1.8.2.2
+bash-completion==1:2.8-6
+bfn-modules==1.0
+bridge-utils==1.6-2
+bsdmainutils==11.1.2+b1
+busybox==1:1.30.1-4
+ca-certificates==20200601~deb10u2
+cgroup-tools==0.41-8.1
+conntrack==1:1.4.5-2
+containerd.io==1.4.3-1
+cpio==2.12+dfsg-9
+cron==3.0pl1-134+deb10u1
+curl==7.64.0-4+deb10u1
+dbus==1.12.20-0+deb10u1
+device-tree-compiler==1.4.7-4
+dirmngr==2.2.12-1+deb10u1
+dmidecode==3.2-1
+dmsetup==2:1.02.155-3
+docker-ce==5:18.09.8~3-0~debian-buster
+docker-ce-cli==5:18.09.8~3-0~debian-buster
+dpkg-dev==1.19.7
+drivers-sonic-platform-arista==1.0
+ebtables==2.0.10.4+snapshot20181205-3
+efibootmgr==15-1
+ethtool==1:4.19-1
+file==1:5.35-4+deb10u2
+firmware-amd-graphics==20190114-2
+firmware-linux-nonfree==20190114-2
+firmware-misc-nonfree==20190114-2
+flashrom==1.0-1
+freeipmi-common==1.6.3-1.1
+gdisk==1.0.3-1.1
+gettext-base==0.19.8.1-9
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+grub-common==2.02+dfsg1-20+deb10u3
+grub2-common==2.02+dfsg1-20+deb10u3
+haveged==1.9.1-7
+hdparm==9.58+ds-1
+hping3==3.a2.ds2-7
+hw-management==1.mlnx.7.0010.1300
+i2c-tools==4.1-1
+ifmetric==0.3-5
+ifupdown2==1.2.8-1
+initramfs-tools==0.133
+initramfs-tools-core==0.133
+innovium-platform-driver==0.11.1
+ipmitool==1.8.18-6
+iproute2==4.20.0-2+deb10u1
+iptables==1.8.2-4
+iptables-persistent==1.0.11+deb10u1
+iputils-ping==3:20180629-2+deb10u1
+isc-dhcp-client==4.4.1-2
+jq==1.5+dfsg-2+b1
+kdump-tools==1:1.6.1-1
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.15.3
+kexec-tools==1:2.0.18-1
+klibc-utils==2.0.6-1
+kmod==26-1
+less==487-0.1+b1
+libapparmor1==2.13.2-10
+libapt-inst2.0==1.8.2.2
+libargon2-1==0~20171227-0.2
+libassuan0==2.5.2-1
+libbsd0==0.9.1-2
+libc-l10n==2.28-10
+libcap2==1:2.25-2
+libcap2-bin==1:2.25-2
+libcgroup1==0.41-8.1
+libcryptsetup12==2:2.1.0-5+deb10u2
+libcurl4==7.64.0-4+deb10u1
+libdbd-sqlite3-perl==1.62-3
+libdbi-perl==1.642-1+deb10u2
+libdbus-1-3==1.12.20-0+deb10u1
+libdevmapper1.02.1==2:1.02.155-3
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libefiboot1==37-2+deb10u1
+libefivar1==37-2+deb10u1
+libelf1==0.176-1.1
+libestr0==0.1.10-2.1
+libexpat1==2.2.6-2+deb10u1
+libfastjson4==0.99.8-2
+libffi-dev==3.2.1-9
+libfreeipmi17==1.6.3-1.1
+libfreetype6==2.9.1-3+deb10u2
+libftdi1-2==1.4-1+b2
+libfuse2==2.9.9-1+deb10u1
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libglib2.0-0==2.58.3-2+deb10u2
+libgpm2==1.20.7-5
+libgssapi-krb5-2==1.17-3+deb10u1
+libhavege1==1.9.1-7
+libhiredis0.14==0.14.0-3~bpo9+1
+libi2c0==4.1-1
+libidn11==1.33-2.2
+libip4tc0==1.8.2-4
+libip6tc0==1.8.2-4
+libiptc0==1.8.2-4
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
+libjq1==1.5+dfsg-2+b1
+libjson-c3==0.12.1+ds-2+deb10u1
+libk5crypto3==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libklibc==2.0.6-1
+libkmod2==26-1
+libkrb5-3==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libksba8==1.3.5-2
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+liblognorm5==2.0.5-1
+liblzo2-2==2.10-0.1
+libmagic-mgc==1:5.35-4+deb10u2
+libmagic1==1:5.35-4+deb10u2
+libmnl0==1.0.4-2
+libmpdec2==2.4.2-2
+libncurses6==6.1+20181013-2+deb10u2
+libnet1==1.1.6+dfsg-3.1
+libnetfilter-conntrack3==1.0.7-1
+libnfnetlink0==1.0.1-3+b1
+libnftnl11==1.1.2-2
+libnghttp2-14==1.36.0-2+deb10u1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnpth0==1.6-1
+libnss-tacplus==1.0.4-1
+libonig5==6.9.1-1
+libopts25==1:5.18.12-4
+libpam-tacplus==1.4.1-1
+libpcap0.8==1.8.1-6
+libpci3==1:3.5.2-1
+libperl5.28==5.28.1-6+deb10u1
+libpng16-16==1.6.36-6
+libpopt0==1.16-12
+libprocps7==2:3.3.15-2
+libpsl5==0.20.2-2
+libpython-stdlib==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-stdlib==3.7.3-1
+libpython3.7==3.7.3-2+deb10u2
+libpython3.7-minimal==3.7.3-2+deb10u2
+libpython3.7-stdlib==3.7.3-2+deb10u2
+libreadline7==7.0-5
+librtmp1==2.4+20151223.gitfa8646d.1-2
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsqlite3-0==3.27.2-3+deb10u1
+libssh2-1==1.8.0-2.1
+libssl1.1==1.1.1d-0+deb10u5
+libswsscommon==1.0.0
+libsysfs2==2.1.0+repack-5
+libtac2==1.4.1-1
+libtcl8.6==8.6.9+dfsg-2
+libusb-0.1-4==2:0.1.12-32
+libusb-1.0-0==2:1.0.22-2
+libutempter0==1.1.6-3
+libwrap0==7.6.q-28
+libxtables12==1.8.2-4
+libyaml-0-2==0.2.1-1
+libyang==1.0.73
+libyang-cpp==1.0.73
+libzstd1==1.3.8+dfsg-3+deb10u2
+linux-base==4.6
+linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
+locales==2.28-10
+logrotate==3.14.0-4
+lsb-base==10.2019051400
+lsb-release==10.2019051400
+makedev==2.3.1-94
+makedumpfile==1:1.6.5-1
+mft==4.15.3-3
+mft-oem==4.15.3-3
+mime-support==3.62
+monit==1:5.20.0-6
+mtd-utils==1:2.0.1-1
+mtr-tiny==0.92-2
+ndisc6==1.0.4-1
+nephos-modules==1.0.1
+net-tools==1.60+git20180626.aebd88e-1
+netbase==5.6
+netfilter-persistent==1.0.11+deb10u1
+ntp==1:4.2.8p12+dfsg-4+deb10u2
+ntpstat==0.0.0.1-2
+opennsl-modules==4.3.0.10-2
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+openssl==1.1.1d-0+deb10u5
+pciutils==1:3.5.2-1
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+phy-credo==1.0
+picocom==3.1-2
+pinentry-curses==1.1.0-2
+procps==2:3.3.15-2
+psmisc==23.2-1
+python==2.7.16-1
+python-apt==1.8.4.3
+python-apt-common==1.8.4.3
+python-argcomplete==1.8.1-1
+python-bottle==0.12.15-2+deb10u1
+python-enum34==1.1.6-2
+python-funcsigs==1.0.2-4
+python-functools32==3.2.3.2-3
+python-ipaddr==2.2.0-2
+python-jsonschema==2.6.0-4
+python-minimal==2.7.16-1
+python-mock==2.0.0-4
+python-pbr==4.2.0-5
+python-pkg-resources==40.8.0-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
+python-six==1.12.0-1
+python-smbus==4.1-1
+python-sonic-platform-arista==1.0
+python-swsscommon==1.0.0
+python-yaml==3.13-2
+python2==2.7.16-1
+python2-minimal==2.7.16-1
+python2-yang==1.0.73
+python2.7==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3==3.7.3-1
+python3-bottle==0.12.15-2+deb10u1
+python3-distutils==3.7.3-1
+python3-lib2to3==3.7.3-1
+python3-minimal==3.7.3-1
+python3-smbus==4.1-1
+python3-sonic-platform-arista==1.0
+python3-swsscommon==1.0.0
+python3-yaml==3.13-2
+python3-yang==1.0.73
+python3.7==3.7.3-2+deb10u2
+python3.7-minimal==3.7.3-2+deb10u2
+rasdaemon==0.6.0-1.2
+readline-common==7.0-5
+rsyslog==8.1901.0-1
+screen==4.6.2-3+deb10u1
+sensible-utils==0.0.12
+software-properties-common==0.96.20.2-2
+sonic-device-data==1.0-1
+sonic-host-services-data==1.0-1
+sonic-platform-arista==1.0
+sonic-utilities-data==1.0-1
+sqlite3==3.27.2-3+deb10u1
+squashfs-tools==1:4.3-12
+sudo==1.8.27-1+deb10u3
+sx-kernel==1.mlnx.4.4.2308
+sysfsutils==2.1.0+repack-5
+systemd==241-7~deb10u6
+systemd-sonic-generator==1.0.0
+systemd-sysv==241-7~deb10u6
+tcpdump==4.9.3-1~deb10u2
+tcptraceroute==1.5beta7+debian-4+b2
+traceroute==1:2.1.0-2
+u-boot-tools==2019.01+dfsg-7
+ucf==3.0038+nmu1
+udev==241-7~deb10u6
+unzip==6.0-23+deb10u2
+usb.ids==2019.07.27-0+deb10u1
+usbutils==1:010-3
+vim==2:8.1.0875-5
+vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+xxd==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
new file mode 100644
index 000000000000..ad64a2a881b0
--- /dev/null
+++ b/files/build/versions/host-image/versions-py2
@@ -0,0 +1,33 @@
+argcomplete==1.8.1
+bitarray==1.5.3
+bottle==0.12.15
+contextlib2==0.6.0.post1
+enum34==1.1.6
+funcsigs==1.0.2
+functools32==3.2.3.post2
+future==0.18.2
+importlib-resources==3.3.1
+ipaddr==2.2.0
+ipaddress==1.0.23
+Jinja2==2.11.3
+jsonschema==2.6.0
+lxml==4.6.2
+MarkupSafe==1.1.1
+mock==2.0.0
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.5
+pbr==4.2.0
+platform-arista==1.0
+pyang==2.4.0
+pyangbind==0.6.0
+python-apt==1.8.4.3
+PyYAML==5.4.1
+redis==3.5.3
+scandir==1.10.0
+scapy==2.4.0
+singledispatch==3.6.0
+six==1.12.0
+thrift==0.13.0
+typing==3.7.4.3
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
new file mode 100644
index 000000000000..502409926941
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3
@@ -0,0 +1,42 @@
+azure-common==1.1.26
+azure-nspkg==3.0.2
+azure-storage==0.36.0
+bitarray==1.5.3
+bottle==0.12.15
+certifi==2020.12.5
+cffi==1.14.5
+chardet==3.0.4
+Click==7.0
+cryptography==3.4.6
+docker==4.3.1
+idna==2.10
+ijson==2.6.1
+ipaddress==1.0.23
+Jinja2==2.11.3
+jsondiff==1.2.0
+lxml==4.6.2
+M2Crypto==0.31.0
+MarkupSafe==1.1.1
+natsort==6.2.1
+netaddr==0.8.0
+netifaces==0.10.7
+pathtools==0.1.2
+pexpect==4.8.0
+platform-arista==1.0
+psutil==5.8.0
+ptyprocess==0.7.0
+pyang==2.4.0
+pyangbind==0.8.1
+pycparser==2.20
+python-dateutil==2.8.1
+PyYAML==5.4.1
+redis==3.5.3
+regex==2020.11.13
+requests==2.25.0
+six==1.15.0
+tabulate==0.8.2
+thrift==0.13.0
+urllib3==1.26.3
+watchdog==0.10.3
+websocket-client==0.57.0
+xmltodict==0.12.0
\ No newline at end of file

From c2409296076ecd79457004b0956f5ccbdf78e641 Mon Sep 17 00:00:00 2001
From: pra-moh <49077256+pra-moh@users.noreply.github.com>
Date: Wed, 17 Feb 2021 17:23:00 -0800
Subject: [PATCH 0195/1674] [StreamingTelemetry] add noTLS support for debug
 purpose (#6704)

adding noTLS mode for debugging purpose
Removing config-set for port 8080. It fails to start telemetry if docker restarts in case on noTLS mode because it expects log_level config to be present as well.
---
 dockers/docker-sonic-telemetry/telemetry.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh
index 0fd80fcbfcc8..1f92657e3b8f 100755
--- a/dockers/docker-sonic-telemetry/telemetry.sh
+++ b/dockers/docker-sonic-telemetry/telemetry.sh
@@ -46,13 +46,12 @@ elif [ -n "$X509" ]; then
         TELEMETRY_ARGS+=" --ca_crt $CA_CRT"
     fi
 else
-    TELEMETRY_ARGS+=" --insecure"
+    TELEMETRY_ARGS+=" --noTLS"
 fi
 
 # If no configuration entry exists for TELEMETRY, create one default port
 if [ -z "$GNMI" ]; then
     PORT=8080
-    sonic-db-cli CONFIG_DB hset "TELEMETRY|gnmi" port $PORT
 else
     PORT=$(echo $GNMI | jq -r '.port')
 fi

From d7517a704c1e44dbf7e6a9ea9afd07109fd23721 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 7 Jan 2021 10:03:29 -0800
Subject: [PATCH 0196/1674] [PDDF] Build and install Python 3 package (#6286)

- Make PDDF code compliant with both Python 2 and Python 3
- Align code with PEP8 standards using autopep8
- Build and install both Python 2 and Python 3 PDDF packages
---
 build_debian.sh                               |    1 -
 dockers/docker-platform-monitor/Dockerfile.j2 |    4 +-
 .../build_templates/sonic_debian_extension.j2 |   18 +-
 platform/pddf/platform-api-pddf-base.dep      |    4 +
 platform/pddf/platform-api-pddf-base.mk       |   13 +
 platform/pddf/platform-api-pddf-base/setup.py |    4 +
 .../sonic_platform_pddf_base/pddf_chassis.py  |   34 +-
 .../sonic_platform_pddf_base/pddf_eeprom.py   |   18 +-
 .../sonic_platform_pddf_base/pddf_fan.py      |   47 +-
 .../sonic_platform_pddf_base/pddf_platform.py |    5 +-
 .../sonic_platform_pddf_base/pddf_psu.py      |   41 +-
 .../sonic_platform_pddf_base/pddf_sfp.py      |  149 +-
 .../sonic_platform_pddf_base/pddf_thermal.py  |   59 +-
 .../sonic_platform_pddf_base/pddfparse.py     | 1307 ++++++++---------
 slave.mk                                      |    1 +
 15 files changed, 837 insertions(+), 868 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index cbb4a559e78b..f94f1665f570 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -275,7 +275,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     ntpstat                 \
     openssh-server          \
     python                  \
-    python-jsonschema       \
     python-apt              \
     traceroute              \
     iputils-ping            \
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 9662f7248001..fc46dc6a52b9 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -24,13 +24,13 @@ RUN apt-get update &&   \
         python3-smbus   \
         ethtool         \
         dmidecode       \
-        i2c-tools       \
-        python-jsonschema
+        i2c-tools
 
 # TODO: Remove these lines once we no longer need Python 2
 RUN apt-get install -f -y python-dev python-pip
 RUN pip2 install --upgrade 'pip<21'
 RUN apt-get purge -y python-pip
+RUN pip2 install 'setuptools==40.8.0'
 
 # On Arista devices, the sonic_platform wheel is not installed in the container.
 # Instead, the installation directory is mounted from the host OS. However, this method
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index b1955919149e..fd5a9735bfaf 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -193,19 +193,25 @@ sudo cp {{platform_common_py2_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install $PLATFORM_COMMON_PY2_WHEEL_NAME
 sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
 
+# Install sonic-platform-common Python 3 package
+PLATFORM_COMMON_PY3_WHEEL_NAME=$(basename {{platform_common_py3_wheel_path}})
+sudo cp {{platform_common_py3_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $PLATFORM_COMMON_PY3_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY3_WHEEL_NAME
+
 {% if pddf_support == "y" %}
 # Install pddf-platform-api-base Python 2 package
 PLATFORM_PDDF_COMMON_PY2_WHEEL_NAME=$(basename {{pddf_platform_api_base_py2_wheel_path}})
 sudo cp {{pddf_platform_api_base_py2_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_PDDF_COMMON_PY2_WHEEL_NAME
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install $PLATFORM_PDDF_COMMON_PY2_WHEEL_NAME
 sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_PDDF_COMMON_PY2_WHEEL_NAME
-{% endif %}
 
-# Install sonic-platform-common Python 3 package
-PLATFORM_COMMON_PY3_WHEEL_NAME=$(basename {{platform_common_py3_wheel_path}})
-sudo cp {{platform_common_py3_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY3_WHEEL_NAME
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $PLATFORM_COMMON_PY3_WHEEL_NAME
-sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY3_WHEEL_NAME
+# Install pddf-platform-api-base Python 3 package
+PLATFORM_PDDF_COMMON_PY3_WHEEL_NAME=$(basename {{pddf_platform_api_base_py3_wheel_path}})
+sudo cp {{pddf_platform_api_base_py3_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_PDDF_COMMON_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $PLATFORM_PDDF_COMMON_PY3_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_PDDF_COMMON_PY3_WHEEL_NAME
+{% endif %}
 
 {# Barefoot platform vendors' sonic_platform packages import the Python 'thrift' library #}
 {% if sonic_asic_platform == "barefoot" %}
diff --git a/platform/pddf/platform-api-pddf-base.dep b/platform/pddf/platform-api-pddf-base.dep
index 9184925b1e6f..aaaedb068384 100644
--- a/platform/pddf/platform-api-pddf-base.dep
+++ b/platform/pddf/platform-api-pddf-base.dep
@@ -7,3 +7,7 @@ DEP_FILES   += $(shell git ls-files $(MPATH))
 $(PDDF_PLATFORM_API_BASE_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(PDDF_PLATFORM_API_BASE_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
 $(PDDF_PLATFORM_API_BASE_PY2)_DEP_FILES   := $(DEP_FILES)
+
+$(PDDF_PLATFORM_API_BASE_PY3)_CACHE_MODE := GIT_CONTENT_SHA
+$(PDDF_PLATFORM_API_BASE_PY3)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(PDDF_PLATFORM_API_BASE_PY3)_DEP_FILES := $(DEP_FILES)
diff --git a/platform/pddf/platform-api-pddf-base.mk b/platform/pddf/platform-api-pddf-base.mk
index 80478d4f3db1..ce818707ba7e 100644
--- a/platform/pddf/platform-api-pddf-base.mk
+++ b/platform/pddf/platform-api-pddf-base.mk
@@ -13,3 +13,16 @@ SONIC_PYTHON_WHEELS += $(PDDF_PLATFORM_API_BASE_PY2)
 
 export pddf_platform_api_base_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(PDDF_PLATFORM_API_BASE_PY2))"
 export PDDF_PLATFORM_API_BASE_PY2
+
+PDDF_PLATFORM_API_BASE_PY3 = sonic_platform_pddf_common-$(PDDF_PLATFORM_API_BASE_VERSION)-py3-none-any.whl
+$(PDDF_PLATFORM_API_BASE_PY3)_SRC_PATH = $(PLATFORM_PDDF_PATH)/platform-api-pddf-base
+$(PDDF_PLATFORM_API_BASE_PY3)_PYTHON_VERSION = 3
+$(PDDF_PLATFORM_API_BASE_PY3)_DEPENDS = $(SONIC_CONFIG_ENGINE)
+# Synthetic dependency to avoid building the Python 2 and 3 packages
+# simultaneously and any potential conflicts which may arise
+$(PDDF_PLATFORM_API_BASE_PY3)_DEPENDS += $(PDDF_PLATFORM_API_BASE_PY2)
+$(PDDF_PLATFORM_API_BASE_PY3)_TEST = n
+SONIC_PYTHON_WHEELS += $(PDDF_PLATFORM_API_BASE_PY3)
+
+export pddf_platform_api_base_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(PDDF_PLATFORM_API_BASE_PY3))"
+export PDDF_PLATFORM_API_BASE_PY3
diff --git a/platform/pddf/platform-api-pddf-base/setup.py b/platform/pddf/platform-api-pddf-base/setup.py
index 5f5ac9194cd9..0d8b4a6b2df2 100755
--- a/platform/pddf/platform-api-pddf-base/setup.py
+++ b/platform/pddf/platform-api-pddf-base/setup.py
@@ -14,6 +14,9 @@
     packages=[
         'sonic_platform_pddf_base',
     ],
+    install_requires=[
+        'jsonschema==2.6.0'
+    ],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Plugins',
@@ -24,6 +27,7 @@
         'Natural Language :: English',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Utilities',
     ],
     keywords='sonic SONiC platform PLATFORM',
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_chassis.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_chassis.py
index 942be25ed1c7..0e77a90dbab1 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_chassis.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_chassis.py
@@ -18,6 +18,7 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+
 class PddfChassis(ChassisBase):
     """
     PDDF Generic Chassis class
@@ -33,7 +34,7 @@ def __init__(self, pddf_data=None, pddf_plugin_data=None):
         self.plugin_data = pddf_plugin_data if pddf_plugin_data else None
         if not self.pddf_obj or not self.plugin_data:
             try:
-                import pddfparse
+                from . import pddfparse
                 import json
                 self.pddf_obj = pddfparse.PddfParse()
                 with open('/usr/share/sonic/platform/pddf/pd-plugin.json') as pd:
@@ -67,8 +68,8 @@ def __init__(self, pddf_data=None, pddf_plugin_data=None):
             thermal = Thermal(i, self.pddf_obj, self.plugin_data)
             self._thermal_list.append(thermal)
 
-	# SYSTEM LED Test Cases 
-	"""
+        # SYSTEM LED Test Cases
+        """
 	#comment out test cases
 	sys_led_list= { "LOC":0,
 			"DIAG":0, 
@@ -90,8 +91,6 @@ def __init__(self, pddf_data=None, pddf_plugin_data=None):
 	print "Set off: " + color
 	"""
 
-
-
     def get_name(self):
         """
         Retrieves the name of the chassis
@@ -438,34 +437,32 @@ def get_sfp(self, index):
     # System LED  methods
     ##############################################
     def set_system_led(self, led_device_name, color):
-        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color);
+        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color)
         if result == False:
-                print msg
-                return (False)
+            print(msg)
+            return (False)
 
-        index=self.pddf_obj.data[led_device_name]['dev_attr']['index']
-        device_name=self.pddf_obj.data[led_device_name]['dev_info']['device_name']
+        index = self.pddf_obj.data[led_device_name]['dev_attr']['index']
+        device_name = self.pddf_obj.data[led_device_name]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('color', color, self.pddf_obj.get_led_cur_state_path())
         self.pddf_obj.create_attr('dev_ops', 'set_status',  self.pddf_obj.get_led_path())
         return (True)
 
-
     def get_system_led(self, led_device_name):
-        if (not led_device_name in self.pddf_obj.data.keys()):
-                status= "[FAILED] " + led_device_name + " is not configured"
-                return (status)
+        if led_device_name not in self.pddf_obj.data.keys():
+            status = "[FAILED] " + led_device_name + " is not configured"
+            return (status)
 
-        index=self.pddf_obj.data[led_device_name]['dev_attr']['index']
-        device_name=self.pddf_obj.data[led_device_name]['dev_info']['device_name']
+        index = self.pddf_obj.data[led_device_name]['dev_attr']['index']
+        device_name = self.pddf_obj.data[led_device_name]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('dev_ops', 'get_status',  self.pddf_obj.get_led_path())
-        color=self.pddf_obj.get_led_color()
+        color = self.pddf_obj.get_led_color()
         return (color)
 
-
     ##############################################
     # Other methods
     ##############################################
@@ -513,4 +510,3 @@ def get_change_event(self, timeout=0):
                       has been inserted and sfp 11 has been removed.
         """
         raise NotImplementedError
-
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_eeprom.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_eeprom.py
index 222cdcf4edd3..592485d617e4 100644
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_eeprom.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_eeprom.py
@@ -67,47 +67,41 @@ def __init__(self, pddf_data=None, pddf_plugin_data=None):
                 tlv_index += ord(eeprom[tlv_index+1]) + 2
 
     def serial_number_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                         self.eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        (is_valid, results) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
         if not is_valid:
             return "N/A"
         return results[2]
 
     def base_mac_addr(self):
-        (is_valid, t) = self.get_tlv_field(
-                          self.eeprom_data, self._TLV_CODE_MAC_BASE)
+        (is_valid, t) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_MAC_BASE)
         if not is_valid or t[1] != 6:
             return super(TlvInfoDecoder, self).switchaddrstr(e)
 
         return ":".join([binascii.b2a_hex(T) for T in t[2]])
 
     def modelstr(self):
-        (is_valid, results) = self.get_tlv_field(
-                        self.eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        (is_valid, results) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_PRODUCT_NAME)
         if not is_valid:
             return "N/A"
 
         return results[2]
 
     def part_number_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_PART_NUMBER)
+        (is_valid, results) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_PART_NUMBER)
         if not is_valid:
             return "N/A"
 
         return results[2]
 
     def serial_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        (is_valid, results) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_SERVICE_TAG)
         if not is_valid:
             return "N/A"
 
         return results[2]
 
     def revision_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        (is_valid, results) = self.get_tlv_field(self.eeprom_data, self._TLV_CODE_DEVICE_VERSION)
         if not is_valid:
             return "N/A"
 
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_fan.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_fan.py
index f189ca2a4e2e..5930345070b4 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_fan.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_fan.py
@@ -22,7 +22,7 @@ class PddfFan(FanBase):
     plugin_data = {}
 
     def __init__(self, tray_idx, fan_idx=0, pddf_data=None, pddf_plugin_data=None, is_psu_fan=False, psu_index=0):
-        # idx is 0-based 
+        # idx is 0-based
         if not pddf_data or not pddf_plugin_data:
             raise ValueError('PDDF JSON data error')
 
@@ -30,12 +30,12 @@ def __init__(self, tray_idx, fan_idx=0, pddf_data=None, pddf_plugin_data=None, i
         self.plugin_data = pddf_plugin_data
         self.platform = self.pddf_obj.get_platform()
 
-        if tray_idx<0 or tray_idx>=self.platform['num_fantrays']:
-            print "Invalid fantray index %d\n"%tray_idx
+        if tray_idx < 0 or tray_idx >= self.platform['num_fantrays']:
+            print("Invalid fantray index %d\n" % tray_idx)
             return
-        
-        if fan_idx<0 or fan_idx>=self.platform['num_fans_pertray']:
-            print "Invalid fan index (within a tray) %d\n"%fan_idx
+
+        if fan_idx < 0 or fan_idx >= self.platform['num_fans_pertray']:
+            print("Invalid fan index (within a tray) %d\n" % fan_idx)
             return
 
         self.fantray_index = tray_idx+1
@@ -160,7 +160,7 @@ def get_speed(self):
 
             if not output:
                 return 0
-            
+
             output['status'] = output['status'].rstrip()
             if output['status'].isalpha():
                 return 0
@@ -185,7 +185,7 @@ def get_speed_rpm(self):
             output = self.pddf_obj.get_attr_name_output(device, attr)
             if not output:
                 return 0
-            
+
             output['status'] = output['status'].rstrip()
             if output['status'].isalpha():
                 return 0
@@ -229,7 +229,7 @@ def get_target_speed(self):
 
             if not output:
                 return 0
-            
+
             output['status'] = output['status'].rstrip()
             if output['status'].isalpha():
                 return 0
@@ -250,7 +250,7 @@ def get_speed_tolerance(self):
             An integer, the percentage of variance from target speed which is
                  considered tolerable
         """
-        # Fix the speed vairance to 10 percent. If it changes based on platforms, overwrite 
+        # Fix the speed vairance to 10 percent. If it changes based on platforms, overwrite
         # this value in derived pddf fan class
         return 10
 
@@ -266,28 +266,27 @@ def set_speed(self, speed):
             A boolean, True if speed is set successfully, False if not
         """
         if self.is_psu_fan:
-            print "Setting PSU fan speed is not allowed"
+            print("Setting PSU fan speed is not allowed")
             return False
         else:
-            if speed<0 or speed>100:
-                print "Error: Invalid speed %d. Please provide a valid speed percentage"%speed
+            if speed < 0 or speed > 100:
+                print("Error: Invalid speed %d. Please provide a valid speed percentage" % speed)
                 return False
 
             if 'duty_cycle_to_pwm' not in self.plugin_data['FAN']:
-                print "Setting fan speed is not allowed !"
+                print("Setting fan speed is not allowed !")
                 return False
             else:
                 duty_cycle_to_pwm = eval(self.plugin_data['FAN']['duty_cycle_to_pwm'])
                 pwm = int(round(duty_cycle_to_pwm(speed)))
 
-
                 status = False
                 idx = (self.fantray_index-1)*self.platform['num_fans_pertray'] + self.fan_index
                 attr = "fan" + str(idx) + "_pwm"
                 output = self.pddf_obj.set_attr_name_output("FAN-CTRL", attr, pwm)
                 if not output:
                     return False
-                
+
                 status = output['status']
 
                 return status
@@ -296,36 +295,34 @@ def set_status_led(self, color):
         index = str(self.fantray_index-1)
         led_device_name = "FANTRAY{}".format(self.fantray_index) + "_LED"
 
-        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color);
+        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color)
         if result == False:
-                print msg
-                return (False)
+            print(msg)
+            return (False)
 
-
-        device_name=self.pddf_obj.data[led_device_name]['dev_info']['device_name']
+        device_name = self.pddf_obj.data[led_device_name]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('color', color, self.pddf_obj.get_led_cur_state_path())
         self.pddf_obj.create_attr('dev_ops', 'set_status',  self.pddf_obj.get_led_path())
         return (True)
 
-
     def get_status_led(self):
         index = str(self.fantray_index-1)
         fan_led_device = "FANTRAY{}".format(self.fantray_index) + "_LED"
 
-        if (not fan_led_device in self.pddf_obj.data.keys()):
+        if fan_led_device not in self.pddf_obj.data.keys():
             # Implement a generic status_led color scheme
             if self.get_status():
                 return self.STATUS_LED_COLOR_GREEN
             else:
                 return self.STATUS_LED_COLOR_OFF
 
-        device_name=self.pddf_obj.data[fan_led_device]['dev_info']['device_name']
+        device_name = self.pddf_obj.data[fan_led_device]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('dev_ops', 'get_status',  self.pddf_obj.get_led_path())
-        color=self.pddf_obj.get_led_color()
+        color = self.pddf_obj.get_led_color()
         return (color)
 
     def dump_sysfs(self):
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_platform.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_platform.py
index 20b87db99910..00eefc9a815e 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_platform.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_platform.py
@@ -10,7 +10,7 @@
 
 try:
     import json
-    import pddfparse
+    from . import pddfparse
     from sonic_platform_base.platform_base import PlatformBase
     from sonic_platform.chassis import Chassis
 except ImportError as e:
@@ -23,6 +23,7 @@ class PddfPlatform(PlatformBase):
     """
     pddf_data = {}
     pddf_plugin_data = {}
+
     def __init__(self):
         # Initialize the JSON data
         self.pddf_data = pddfparse.PddfParse()
@@ -30,7 +31,7 @@ def __init__(self):
             self.pddf_plugin_data = json.load(pd)
 
         if not self.pddf_data or not self.pddf_plugin_data:
-            print "Error: PDDF JSON data is not loaded properly ... Exiting"
+            print("Error: PDDF JSON data is not loaded properly ... Exiting")
             raise ValueError
 
         PlatformBase.__init__(self)
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_psu.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_psu.py
index b378be7dad39..58b69ce0aa73 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_psu.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_psu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# All the supported PSU SysFS aattributes are 
+# All the supported PSU SysFS aattributes are
 #- psu_present
 #- psu_model_name
 #- psu_power_good
@@ -18,7 +18,7 @@
     from sonic_platform_base.psu_base import PsuBase
     from sonic_platform.fan import Fan
 except ImportError as e:
-    raise ImportError (str(e) + "- required module not found")
+    raise ImportError(str(e) + "- required module not found")
 
 
 class PddfPsu(PsuBase):
@@ -27,7 +27,6 @@ class PddfPsu(PsuBase):
     pddf_obj = {}
     plugin_data = {}
 
-
     def __init__(self, index, pddf_data=None, pddf_plugin_data=None):
         PsuBase.__init__(self)
         if not pddf_data or not pddf_plugin_data:
@@ -37,7 +36,7 @@ def __init__(self, index, pddf_data=None, pddf_plugin_data=None):
         self.plugin_data = pddf_plugin_data
         self.platform = self.pddf_obj.get_platform()
         self.psu_index = index + 1
-        
+
         self._fan_list = []     # _fan_list under PsuBase class is a global variable, hence we need to use _fan_list per class instatiation
         self.num_psu_fans = int(self.pddf_obj.get_num_psu_fans('PSU{}'.format(index+1)))
         for psu_fan_idx in range(self.num_psu_fans):
@@ -75,11 +74,11 @@ def get_presence(self):
         status = 0
         device = "PSU{}".format(self.psu_index)
         output = self.pddf_obj.get_attr_name_output(device, "psu_present")
-	if not output:
-	    return False
+        if not output:
+            return False
 
         mode = output['mode']
-	status = output['status']
+        status = output['status']
 
         vmap = self.plugin_data['PSU']['psu_present'][mode]['valmap']
 
@@ -98,7 +97,7 @@ def get_model(self):
         device = "PSU{}".format(self.psu_index)
         output = self.pddf_obj.get_attr_name_output(device, "psu_model_name")
         if not output:
-            return None 
+            return None
 
         model = output['status']
 
@@ -118,7 +117,7 @@ def get_serial(self):
         device = "PSU{}".format(self.psu_index)
         output = self.pddf_obj.get_attr_name_output(device, "psu_serial_num")
         if not output:
-            return None 
+            return None
 
         serial = output['status']
 
@@ -138,7 +137,7 @@ def get_status(self):
             return False
 
         mode = output['mode']
-        status = output ['status']
+        status = output['status']
 
         vmap = self.plugin_data['PSU']['psu_power_good'][mode]['valmap']
 
@@ -157,9 +156,9 @@ def get_mfr_id(self):
         device = "PSU{}".format(self.psu_index)
         output = self.pddf_obj.get_attr_name_output(device, "psu_mfr_id")
         if not output:
-            return None 
+            return None
 
-	mfr = output['status']
+        mfr = output['status']
 
         return mfr.rstrip('\n')
 
@@ -171,11 +170,11 @@ def get_voltage(self):
             A float number, the output voltage in volts,
             e.g. 12.1
         """
-        device = "PSU{}".format(self.psu_index)        
+        device = "PSU{}".format(self.psu_index)
         output = self.pddf_obj.get_attr_name_output(device, "psu_v_out")
         if not output:
             return 0.0
-		
+
         v_out = output['status']
 
         return float(v_out)/1000
@@ -230,12 +229,12 @@ def set_status_led(self, color):
         index = str(self.psu_index-1)
         led_device_name = "PSU{}".format(self.psu_index) + "_LED"
 
-        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color);
+        result, msg = self.pddf_obj.is_supported_sysled_state(led_device_name, color)
         if result == False:
-                print msg
-                return (False)
+            print(msg)
+            return (False)
 
-        device_name=self.pddf_obj.data[led_device_name]['dev_info']['device_name']
+        device_name = self.pddf_obj.data[led_device_name]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('color', color, self.pddf_obj.get_led_cur_state_path())
@@ -245,18 +244,18 @@ def set_status_led(self, color):
     def get_status_led(self):
         index = str(self.psu_index-1)
         psu_led_device = "PSU{}_LED".format(self.psu_index)
-        if (not psu_led_device in self.pddf_obj.data.keys()):
+        if psu_led_device not in self.pddf_obj.data.keys():
             # Implement a generic status_led color scheme
             if self.get_powergood_status():
                 return self.STATUS_LED_COLOR_GREEN
             else:
                 return self.STATUS_LED_COLOR_OFF
 
-        device_name=self.pddf_obj.data[psu_led_device]['dev_info']['device_name']
+        device_name = self.pddf_obj.data[psu_led_device]['dev_info']['device_name']
         self.pddf_obj.create_attr('device_name', device_name,  self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('index', index, self.pddf_obj.get_led_path())
         self.pddf_obj.create_attr('dev_ops', 'get_status',  self.pddf_obj.get_led_path())
-        color=self.pddf_obj.get_led_color()
+        color = self.pddf_obj.get_led_color()
         return (color)
 
     def get_input_voltage(self):
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
index d53c23061b2d..dc37bba6e888 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
@@ -10,8 +10,8 @@
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sff8472 import sffbase
     from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
-except ImportError, e:
-    raise ImportError (str(e) + "- required module not found")
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
 
 # definitions of the offset and width for values in XCVR info eeprom
 XCVR_INTFACE_BULK_OFFSET = 0
@@ -58,7 +58,7 @@
 OSFP_HW_REV_OFFSET = 164
 OSFP_VENDOR_SN_OFFSET = 166
 
-#definitions of the offset and width for values in DOM info eeprom
+# definitions of the offset and width for values in DOM info eeprom
 QSFP_DOM_REV_OFFSET = 1
 QSFP_DOM_REV_WIDTH = 1
 QSFP_TEMPE_OFFSET = 22
@@ -107,10 +107,10 @@
                         'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
 
 sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
-                            'ESCONComplianceCodes', 'SONETComplianceCodes',
-                            'EthernetComplianceCodes','FibreChannelLinkLength',
-                            'FibreChannelTechnology', 'SFP+CableTechnology',
-                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
 
 qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
                             'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
@@ -126,6 +126,7 @@
 DOM_OFFSET = 0
 DOM_OFFSET1 = 384
 
+
 class PddfSfp(SfpBase):
     """
     PDDF generic Sfp class
@@ -154,7 +155,7 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
             for n in range(0, num_bytes):
                 eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
         except Exception as e:
-            print "Error: Unable to open eeprom_path: %s"%(str(e))
+            print("Error: Unable to open eeprom_path: %s" % (str(e)))
         finally:
             if sysfsfile_eeprom:
                 sysfsfile_eeprom.close()
@@ -174,29 +175,29 @@ def __init__(self, index, pddf_data=None, pddf_plugin_data=None):
         self._port_start = 0
         self._port_end = int(self.platform['num_ports'])
         if index < self._port_start or index >= self._port_end:
-            print "Invalid port index %d"%index
-            return 
+            print("Invalid port index %d" % index)
+            return
 
         self.port_index = index+1
         self.device = 'PORT{}'.format(self.port_index)
         self.sfp_type = self.pddf_obj.get_device_type(self.device)
-	self.is_qsfp_port = True if (self.sfp_type=='QSFP' or self.sfp_type=='QSFP28') else False
-	self.is_osfp_port = True if (self.sfp_type=='OSFP' or self.sfp_type=='QSFP-DD') else False
+        self.is_qsfp_port = True if (self.sfp_type == 'QSFP' or self.sfp_type == 'QSFP28') else False
+        self.is_osfp_port = True if (self.sfp_type == 'OSFP' or self.sfp_type == 'QSFP-DD') else False
         self.eeprom_path = self.pddf_obj.get_path(self.device, 'eeprom')
 
-        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 
-                'ext_identifier', 'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 
-                'specification_compliance', 'vendor_date', 'vendor_oui', 'application_advertisement']
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding',
+                               'ext_identifier', 'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate',
+                               'specification_compliance', 'vendor_date', 'vendor_oui', 'application_advertisement']
 
         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel',
-                'temperature', 'voltage', 'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 
-                'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+                              'temperature', 'voltage', 'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+                              'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
 
-        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 
-                'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 
-                'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning',
-                'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 
-                'txbiaslowwarning']
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning',
+                                    'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm',
+                                    'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning',
+                                    'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm',
+                                    'txbiaslowwarning']
 
         SfpBase.__init__(self)
 
@@ -226,9 +227,8 @@ def get_transceiver_info(self):
         ========================================================================
         """
         # check present status
-	if not self.get_presence():
-	    return None
-
+        if not self.get_presence():
+            return None
 
         if self.is_osfp_port:
             sfpi_obj = inf8628InterfaceId()
@@ -267,7 +267,6 @@ def get_transceiver_info(self):
 
         if sfpi_obj is None:
             return None
-        
 
         if self.is_osfp_port:
             sfp_type_raw = self.__read_eeprom_specific_bytes((offset + type_offset), XCVR_TYPE_WIDTH)
@@ -275,19 +274,21 @@ def get_transceiver_info(self):
                 sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
                 sfp_type_abbrv_name = sfpi_obj.parse_sfp_type_abbrv_name(sfp_typ_raw, 0)
         else:
-            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes((offset + XCVR_INTFACE_BULK_OFFSET), interface_info_bulk_width)
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), interface_info_bulk_width)
             if sfp_interface_bulk_raw is not None:
                 sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw, 0)
 
-            sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes((offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+            sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
             if sfp_vendor_oui_raw is not None:
                 sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_vendor_oui_raw, 0)
 
-            sfp_vendor_date_raw = self.__read_eeprom_specific_bytes((offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
+            sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
             if sfp_vendor_date_raw is not None:
                 sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_vendor_date_raw, 0)
 
-
         sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
             (offset + vendor_name_offset), XCVR_VENDOR_NAME_WIDTH)
         sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
@@ -327,7 +328,8 @@ def get_transceiver_info(self):
         xcvr_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
         xcvr_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
         xcvr_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
-        xcvr_info_dict['vendor_date'] = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
+        xcvr_info_dict['vendor_date'] = sfp_vendor_date_data['data'][
+            'VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
         xcvr_info_dict['cable_type'] = "Unknown"
         xcvr_info_dict['cable_length'] = "Unknown"
 
@@ -342,9 +344,10 @@ def get_transceiver_info(self):
                     compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
             xcvr_info_dict['specification_compliance'] = str(compliance_code_dict)
 
-            nkey='Nominal Bit Rate(100Mbs)'
+            nkey = 'Nominal Bit Rate(100Mbs)'
             if nkey in sfp_interface_bulk_data['data']:
-                xcvr_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+                xcvr_info_dict['nominal_bit_rate'] = str(
+                    sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
             else:
                 xcvr_info_dict['nominal_bit_rate'] = 'N/A'
         elif sfp_type == 'OSFP':
@@ -360,7 +363,8 @@ def get_transceiver_info(self):
                     compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
             xcvr_info_dict['specification_compliance'] = str(compliance_code_dict)
 
-            xcvr_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+            xcvr_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
 
         return xcvr_info_dict
 
@@ -419,19 +423,19 @@ def get_transceiver_bulk_status(self):
             else:
                 return None
 
-            dom_temperature_raw = self.__read_eeprom_specific_bytes( (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            dom_temperature_raw = self.__read_eeprom_specific_bytes((offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
             if dom_temperature_raw is not None:
                 dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
             else:
                 return None
 
-            dom_voltage_raw = self.__read_eeprom_specific_bytes( (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            dom_voltage_raw = self.__read_eeprom_specific_bytes((offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
             if dom_voltage_raw is not None:
                 dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
             else:
                 return None
 
-            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes( (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes((offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
             if qsfp_dom_rev_raw is not None:
                 qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
             else:
@@ -446,7 +450,8 @@ def get_transceiver_bulk_status(self):
             qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
             qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
             if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
-                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
                 if dom_channel_monitor_raw is not None:
                     dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
                 else:
@@ -457,13 +462,14 @@ def get_transceiver_bulk_status(self):
                 xcvr_dom_info_dict['tx3power'] = 'N/A'
                 xcvr_dom_info_dict['tx4power'] = 'N/A'
             else:
-                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
                 if dom_channel_monitor_raw is not None:
-                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
                 else:
                     return None
 
-
                 xcvr_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
                 xcvr_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
                 xcvr_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
@@ -489,19 +495,20 @@ def get_transceiver_bulk_status(self):
             if sfpd_obj is None:
                 return None
 
-            dom_temperature_raw = self.__read_eeprom_specific_bytes( (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            dom_temperature_raw = self.__read_eeprom_specific_bytes((offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
             if dom_temperature_raw is not None:
                 dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
             else:
                 return None
 
-            dom_voltage_raw = self.__read_eeprom_specific_bytes( (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            dom_voltage_raw = self.__read_eeprom_specific_bytes((offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
             if dom_voltage_raw is not None:
                 dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
             else:
                 return None
 
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes( (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
             if dom_channel_monitor_raw is not None:
                 dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
             else:
@@ -527,7 +534,6 @@ def get_transceiver_bulk_status(self):
         xcvr_dom_info_dict['reset_status'] = self.get_reset_status()
         xcvr_dom_info_dict['lp_mode'] = self.get_lpmode()
 
-
         return xcvr_dom_info_dict
 
     def get_transceiver_threshold_info(self):
@@ -591,7 +597,8 @@ def get_transceiver_threshold_info(self):
                     xcvr_dom_threshold_info_dict['vcchighwarning'] = module_threshold_data['VccHighWarning']['value']
                     xcvr_dom_threshold_info_dict['vcclowwarning'] = module_threshold_data['VccLowWarning']['value']
 
-            dom_thres_raw = self.__read_eeprom_specific_bytes(QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH)
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH)
             if dom_thres_raw:
                 channel_threshold_values = sfpd_obj.parse_channel_threshold_values(
                     dom_thres_raw, 0)
@@ -647,8 +654,6 @@ def get_transceiver_threshold_info(self):
                 xcvr_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
                 xcvr_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
 
-
-
         return xcvr_dom_threshold_info_dict
 
     def get_reset_status(self):
@@ -668,7 +673,7 @@ def get_reset_status(self):
 
         status = int(output['status'].rstrip())
 
-        if status==1:
+        if status == 1:
             reset_status = True
         else:
             reset_status = False
@@ -715,13 +720,13 @@ def get_rx_los(self):
         else:
             status = int(output['status'].rstrip())
 
-            if status==1:
+            if status == 1:
                 rx_los = True
             else:
                 rx_los = False
 
         return rx_los
-        
+
     def get_tx_fault(self):
         """
         Retrieves the TX fault status of SFP
@@ -761,7 +766,7 @@ def get_tx_fault(self):
         else:
             status = int(output['status'].rstrip())
 
-            if status==1:
+            if status == 1:
                 tx_fault = True
             else:
                 tx_fault = False
@@ -821,7 +826,7 @@ def get_tx_disable(self):
         else:
             status = int(output['status'].rstrip())
 
-            if status==1:
+            if status == 1:
                 tx_disable = True
             else:
                 tx_disable = False
@@ -852,7 +857,7 @@ def get_tx_disable_channel(self):
                     tx_disabled |= 1 << i
             return tx_disabled
         else:
-            # SFP doesnt support this 
+            # SFP doesnt support this
             return 0
 
     def get_lpmode(self):
@@ -884,13 +889,15 @@ def get_lpmode(self):
                     status = ord(eeprom.read(1))
 
                     if ((status & 0x3) == 0x3):
-                        lpmode = True # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1
+                        # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1
+                        lpmode = True
                     else:
-                        lpmode = False # High Power Mode if one of the following conditions is matched:
-                                     # 1. "Power override" bit is 0
-                                     # 2. "Power override" bit is 1 and "Power set" bit is 0
+                        # High Power Mode if one of the following conditions is matched:
+                        # 1. "Power override" bit is 0
+                        # 2. "Power override" bit is 1 and "Power set" bit is 0
+                        lpmode = False
                 except IOError as e:
-                    print "Error: unable to open file: %s" % str(e)
+                    print("Error: unable to open file: %s" % str(e))
                     return False
                 finally:
                     if eeprom is not None:
@@ -919,7 +926,6 @@ def get_power_override(self):
         if not self.get_presence():
             return power_override
 
-
         if self.is_osfp_port:
             pass
         elif self.is_qsfp_port:
@@ -1032,7 +1038,7 @@ def reset(self):
         # TODO: Implement a wrapper set function to write the sequence
         path = self.pddf_obj.get_path(device, 'xcvr_reset')
 
-        # TODO: put the optic based reset logic using EEPROM 
+        # TODO: put the optic based reset logic using EEPROM
         if path is None:
             pass
         else:
@@ -1040,7 +1046,7 @@ def reset(self):
                 f = open(path, 'r+')
             except IOError as e:
                 return False
-            
+
             try:
                 f.seek(0)
                 f.write('1')
@@ -1054,7 +1060,7 @@ def reset(self):
                 status = False
 
         return status
-   
+
     def tx_disable(self, tx_disable):
         """
         Disable SFP TX for all channels
@@ -1087,13 +1093,13 @@ def tx_disable(self, tx_disable):
                     eeprom_f.seek(QSFP_CONTROL_OFFSET)
                     eeprom_f.write(buf[0])
                 except IOError as e:
-                    print "Error: unable to open file: %s" % str(e)
+                    print("Error: unable to open file: %s" % str(e))
                     return False
                 finally:
                     if eeprom_f is not None:
                         eeprom_f.close()
                         time.sleep(0.01)
-                
+
                     status = True
             else:
                 status_control_raw = self.__read_eeprom_specific_bytes(
@@ -1113,7 +1119,7 @@ def tx_disable(self, tx_disable):
                         eeprom_f.seek(SFP_STATUS_CONTROL_OFFSET)
                         eeprom_f.write(buf[0])
                     except Exception as e:
-                        print("Error: unable to open file: %s" % str(e))
+                        print(("Error: unable to open file: %s" % str(e)))
                         return False
                     finally:
                         if eeprom_f:
@@ -1168,7 +1174,7 @@ def tx_disable_channel(self, channel, disable):
                 eeprom_f.seek(QSFP_CONTROL_OFFSET)
                 eeprom_f.write(buf[0])
             except IOError as e:
-                print "Error: unable to open file: %s" % str(e)
+                print("Error: unable to open file: %s" % str(e))
                 return False
             finally:
                 if eeprom_f is not None:
@@ -1208,7 +1214,7 @@ def set_lpmode(self, lpmode):
                         return False
 
                     # Fill in write buffer
-                    regval = 0x3 if lpmode else 0x1 # 0x3:Low Power Mode, 0x1:High Power Mode
+                    regval = 0x3 if lpmode else 0x1  # 0x3:Low Power Mode, 0x1:High Power Mode
                     buffer = create_string_buffer(1)
                     buffer[0] = chr(regval)
 
@@ -1218,7 +1224,7 @@ def set_lpmode(self, lpmode):
                     eeprom_f.write(buffer[0])
                     return True
                 except IOError as e:
-                    print "Error: unable to open file: %s" % str(e)
+                    print("Error: unable to open file: %s" % str(e))
                     return False
                 finally:
                     if eeprom_f is not None:
@@ -1286,7 +1292,7 @@ def set_power_override(self, power_override, power_set):
                 eeprom_f.seek(QSFP_POWEROVERRIDE_OFFSET)
                 eeprom_f.write(buffer[0])
             except IOError as e:
-                print "Error: unable to open file: %s" % str(e)
+                print("Error: unable to open file: %s" % str(e))
                 return False
             finally:
                 if eeprom_f is not None:
@@ -1298,14 +1304,13 @@ def set_power_override(self, power_override, power_set):
 
         return status
 
-
     def get_name(self):
         """
         Retrieves the name of the device
             Returns:
             string: The name of the device
         """
-        # Name of the port/sfp ? 
+        # Name of the port/sfp ?
         return 'PORT{}'.format(self.port_index)
 
     def get_presence(self):
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py
index 01cd4080db10..cd09041e152f 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# All the supported Temperature Sensor SysFS aattributes are 
+# All the supported Temperature Sensor SysFS aattributes are
 #- temp1_high_crit_threshold
 #- temp1_high_threshold
 #- temp1_input
@@ -13,7 +13,6 @@
     raise ImportError(str(e) + "- required module not found")
 
 
-
 class PddfThermal(ThermalBase):
     """PDDF generic Thermal class"""
     pddf_obj = {}
@@ -37,24 +36,23 @@ def get_name(self):
             if 'display_name' in self.thermal_obj['dev_attr']:
                 return str(self.thermal_obj['dev_attr']['display_name'])
         # In case of errors
-	return (self.thermal_obj_name)
+        return (self.thermal_obj_name)
 
     def get_temperature(self):
         output = self.pddf_obj.get_attr_name_output(self.thermal_obj_name, "temp1_input")
         if not output:
-            return None 
+            return None
 
         if output['status'].isalpha():
             attr_value = None
         else:
             attr_value = float(output['status'])
-        
-        if output['mode']=='bmc':
-	    return attr_value
+
+        if output['mode'] == 'bmc':
+            return attr_value
         else:
             return (attr_value/float(1000))
 
-
     def get_high_threshold(self):
         output = self.pddf_obj.get_attr_name_output(self.thermal_obj_name, "temp1_high_threshold")
         if not output:
@@ -65,12 +63,11 @@ def get_high_threshold(self):
         else:
             attr_value = float(output['status'])
 
-        if output['mode']=='bmc':
-	    return attr_value
+        if output['mode'] == 'bmc':
+            return attr_value
         else:
             return (attr_value/float(1000))
 
-
     def get_low_threshold(self):
         output = self.pddf_obj.get_attr_name_output(self.thermal_obj_name, "temp1_low_threshold")
         if not output:
@@ -80,31 +77,29 @@ def get_low_threshold(self):
             attr_value = None
         else:
             attr_value = float(output['status'])
-        
-        if output['mode']=='bmc':
-	    return attr_value
+
+        if output['mode'] == 'bmc':
+            return attr_value
         else:
             return (attr_value/float(1000))
 
-
     def set_high_threshold(self, temperature):
         node = self.pddf_obj.get_path(self.thermal_obj_name, "temp1_high_threshold")
         if node is None:
-            print "ERROR %s does not exist"%node
+            print("ERROR %s does not exist" % node)
             return None
-	
-	cmd = "echo '%d' > %s"%(temperature * 1000, node)
-	os.system(cmd) 
 
-        return (True)
+        cmd = "echo '%d' > %s" % (temperature * 1000, node)
+        os.system(cmd)
 
+        return (True)
 
     def set_low_threshold(self, temperature):
         node = self.pddf_obj.get_path(self.thermal_obj_name, "temp1_low_threshold")
         if node is None:
-            print "ERROR %s does not exist"%node
+            print("ERROR %s does not exist" % node)
             return None
-	cmd = "echo '%d' > %s"%(temperature * 1000, node)
+        cmd = "echo '%d' > %s" % (temperature * 1000, node)
         os.system(cmd)
 
         return (True)
@@ -126,12 +121,11 @@ def get_high_critical_threshold(self):
         else:
             attr_value = float(output['status'])
 
-        if output['mode']=='bmc':
+        if output['mode'] == 'bmc':
             return attr_value
         else:
             return (attr_value/float(1000))
 
-
     def get_low_critical_threshold(self):
         """
         Retrieves the low critical threshold temperature of thermal
@@ -149,26 +143,25 @@ def get_low_critical_threshold(self):
         else:
             attr_value = float(output['status'])
 
-        if output['mode']=='bmc':
+        if output['mode'] == 'bmc':
             return attr_value
         else:
             return (attr_value/float(1000))
 
-
     # Helper Functions
+
     def get_temp_label(self):
-	if 'bmc' in self.pddf_obj.data[self.thermal_obj_name].keys():
-	    return None 
+        if 'bmc' in self.pddf_obj.data[self.thermal_obj_name].keys():
+            return None
         else:
             if self.thermal_obj_name in self.pddf_obj.data.keys():
-                dev= self.pddf_obj.data[self.thermal_obj_name]
+                dev = self.pddf_obj.data[self.thermal_obj_name]
                 topo_info = dev['i2c']['topo_info']
-                label="%s-i2c-%d-%x" % (topo_info['dev_type'], int(topo_info['parent_bus'], 0), 
-                        int(topo_info['dev_addr'], 0))
-	        return (label)
+                label = "%s-i2c-%d-%x" % (topo_info['dev_type'], int(topo_info['parent_bus'], 0),
+                                          int(topo_info['dev_addr'], 0))
+                return (label)
             else:
                 return None
 
-
     def dump_sysfs(self):
         return self.pddf_obj.cli_dump_dsysfs('temp-sensors')
diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfparse.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfparse.py
index aa47beaa0fc7..6ca59206fd56 100755
--- a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfparse.py
+++ b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfparse.py
@@ -8,24 +8,24 @@
 import time
 import unicodedata
 
-bmc_cache={}
-cache={}
+bmc_cache = {}
+cache = {}
 SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
 HWSKU_KEY = 'DEVICE_METADATA.localhost.hwsku'
 PLATFORM_KEY = 'DEVICE_METADATA.localhost.platform'
 
-dirname=os.path.dirname(os.path.realpath(__file__))
+dirname = os.path.dirname(os.path.realpath(__file__))
 
 color_map = {
-         "STATUS_LED_COLOR_GREEN" : "green",
-         "STATUS_LED_COLOR_RED" : "red",
-         "STATUS_LED_COLOR_AMBER" : "amber",
-         "STATUS_LED_COLOR_BLUE" : "blue",
-         "STATUS_LED_COLOR_GREEN_BLINK" : "blinking green",
-         "STATUS_LED_COLOR_RED_BLINK" : "blinking red",
-         "STATUS_LED_COLOR_AMBER_BLINK" : "blinking amber",
-         "STATUS_LED_COLOR_BLUE_BLINK" : "blinking blue",
-         "STATUS_LED_COLOR_OFF" : "off"
+    "STATUS_LED_COLOR_GREEN": "green",
+    "STATUS_LED_COLOR_RED": "red",
+    "STATUS_LED_COLOR_AMBER": "amber",
+    "STATUS_LED_COLOR_BLUE": "blue",
+    "STATUS_LED_COLOR_GREEN_BLINK": "blinking green",
+    "STATUS_LED_COLOR_RED_BLINK": "blinking red",
+    "STATUS_LED_COLOR_AMBER_BLINK": "blinking amber",
+    "STATUS_LED_COLOR_BLUE_BLINK": "blinking blue",
+    "STATUS_LED_COLOR_OFF": "off"
 }
 
 
@@ -37,17 +37,16 @@ def __init__(self):
 
         try:
             with open('/usr/share/sonic/platform/pddf/pddf-device.json') as f:
-                  self.data = json.load(f)
+                self.data = json.load(f)
         except IOError:
             if os.path.exists('/usr/share/sonic/platform'):
                 os.unlink("/usr/share/sonic/platform")
 
-
-        self.data_sysfs_obj={}
-        self.sysfs_obj={}
-
+        self.data_sysfs_obj = {}
+        self.sysfs_obj = {}
 
     # Returns platform and HW SKU
+
     def get_platform_and_hwsku(self):
         try:
             proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-H', '-v', PLATFORM_KEY],
@@ -65,7 +64,7 @@ def get_platform_and_hwsku(self):
             stdout = proc.communicate()[0]
             proc.wait()
             hwsku = stdout.rstrip('\n')
-        except OSError, e:
+        except OSError as e:
             raise OSError("Cannot detect platform")
 
         return (platform, hwsku)
@@ -75,16 +74,15 @@ def get_platform_and_hwsku(self):
     #################################################################################################################
     def runcmd(self, cmd):
         rc = os.system(cmd)
-        if rc!=0:
-            print "%s -- command failed"%cmd
-        return rc 
+        if rc != 0:
+            print("%s -- command failed" % cmd)
+        return rc
 
     def get_dev_idx(self, dev, ops):
-            parent=dev['dev_info']['virt_parent']
-            pdev=self.data[parent]
-            
-            return pdev['dev_attr']['dev_idx']
+        parent = dev['dev_info']['virt_parent']
+        pdev = self.data[parent]
 
+        return pdev['dev_attr']['dev_idx']
 
     def get_path(self, target, attr):
         aa = target + attr
@@ -95,88 +93,85 @@ def get_path(self, target, attr):
         string = None
         p = re.search(r'\d+$', target)
         if p is None:
-            for bb in filter(re.compile(target).search,self.data.keys()):
-                path = self.dev_parse(self.data[bb], { "cmd": "show_attr", "target":bb, "attr":attr })
+            for bb in filter(re.compile(target).search, self.data.keys()):
+                path = self.dev_parse(self.data[bb], {"cmd": "show_attr", "target": bb, "attr": attr})
                 if path != "":
                     string = path
         else:
             if target in self.data.keys():
-                path = self.dev_parse(self.data[target], { "cmd": "show_attr", "target":target, "attr":attr })
+                path = self.dev_parse(self.data[target], {"cmd": "show_attr", "target": target, "attr": attr})
                 if path != "":
                     string = path
 
-
         if string is not None:
             string = string.rstrip()
 
-        cache[aa]=string
+        cache[aa] = string
         return string
 
-
     def get_device_type(self, key):
-        if not key in self.data.keys():
-		return None
+        if key not in self.data.keys():
+            return None
         return self.data[key]['dev_info']['device_type']
 
     def get_platform(self):
         return self.data['PLATFORM']
 
     def get_num_psu_fans(self, dev):
-        if not dev in self.data.keys():
+        if dev not in self.data.keys():
             return 0
 
-        if not 'num_psu_fans' in self.data[dev]['dev_attr']:
+        if 'num_psu_fans' not in self.data[dev]['dev_attr']:
             return 0
-        
+
         return self.data[dev]['dev_attr']['num_psu_fans']
 
-    def get_led_path(self): 
-	return ("pddf/devices/led")
+    def get_led_path(self):
+        return ("pddf/devices/led")
 
-    def get_led_cur_state_path(self): 
-	return ("pddf/devices/led/cur_state")
+    def get_led_cur_state_path(self):
+        return ("pddf/devices/led/cur_state")
 
-    def get_led_color(self): 
-	color_f="/sys/kernel/pddf/devices/led/cur_state/color"
+    def get_led_color(self):
+        color_f = "/sys/kernel/pddf/devices/led/cur_state/color"
         try:
-               with open(color_f, 'r') as f:
-                    color = f.read().strip("\r\n")
+            with open(color_f, 'r') as f:
+                color = f.read().strip("\r\n")
         except IOError:
-                    return ("Error")
+            return ("Error")
 
-	return (color_map[color])
+        return (color_map[color])
 
-        
     def get_led_color_devtype(self, key):
-        attr_list=self.data[key]['i2c']['attr_list']
+        attr_list = self.data[key]['i2c']['attr_list']
         for attr in attr_list:
             if 'attr_devtype' in attr:
-               return attr['attr_devtype'].strip()
+                return attr['attr_devtype'].strip()
             else:
-               return 'cpld'
+                return 'cpld'
 
     def get_led_color_from_gpio(self, led_device_name):
-        attr_list=self.data[led_device_name]['i2c']['attr_list']
-        attr=attr_list[0]
+        attr_list = self.data[led_device_name]['i2c']['attr_list']
+        attr = attr_list[0]
         if ':' in attr['bits']:
-            bits_list=attr['bits'].split(':')
+            bits_list = attr['bits'].split(':')
             bits_list.sort(reverse=True)
-            max_bit=int(bits_list[0])
+            max_bit = int(bits_list[0])
         else:
-            max_bit=0
-        base_offset=int(attr['swpld_addr_offset'], 16)
+            max_bit = 0
+        base_offset = int(attr['swpld_addr_offset'], 16)
         value = 0
         bit = 0
         while bit <= max_bit:
-            offset=base_offset + bit
+            offset = base_offset + bit
             if 'attr_devname' in attr:
                 attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], hex(offset))
             else:
-                status= "[FAILED] attr_devname is not configured"
-	        return (status)
+                status = "[FAILED] attr_devname is not configured"
+                return (status)
             if not os.path.exists(attr_path):
-                status= "[FAILED] {} does not exist".format(attr_path)
-	        return (status)
+                status = "[FAILED] {} does not exist".format(attr_path)
+                return (status)
             cmd = 'cat ' + attr_path
             gpio_value = subprocess.check_output(cmd, shell=True)
             value |= int(gpio_value) << bit
@@ -184,110 +179,107 @@ def get_led_color_from_gpio(self, led_device_name):
 
         for attr in attr_list:
             if int(attr['value'].strip(), 16) == value:
-               return(color_map[attr['attr_name']])
-	return (color_map['STATUS_LED_COLOR_OFF'])
-
+                return(color_map[attr['attr_name']])
+        return (color_map['STATUS_LED_COLOR_OFF'])
 
     def get_led_color_from_cpld(self, led_device_name):
-        index=self.data[led_device_name]['dev_attr']['index']
-        device_name=self.data[led_device_name]['dev_info']['device_name']
+        index = self.data[led_device_name]['dev_attr']['index']
+        device_name = self.data[led_device_name]['dev_info']['device_name']
         self.create_attr('device_name', device_name,  self.get_led_path())
         self.create_attr('index', index, self.get_led_path())
         self.create_attr('dev_ops', 'get_status',  self.get_led_path())
         return self.get_led_color()
 
     def set_led_color_from_gpio(self, led_device_name, color):
-        attr_list=self.data[led_device_name]['i2c']['attr_list']
+        attr_list = self.data[led_device_name]['i2c']['attr_list']
         for attr in attr_list:
             if attr['attr_name'].strip() == color.strip():
-               base_offset=int(attr['swpld_addr_offset'], 16)
-               if ':' in attr['bits']:
-                   bits_list=attr['bits'].split(':')
-                   bits_list.sort(reverse=True)
-                   max_bit = int(bits_list[0])
-               else:
-                   max_bit=0
-               value=int(attr['value'], 16)
-               i = 0
-               while i <= max_bit:
-                  _value =(value>>i) & 1
-                  base_offset += i
-                  attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], hex(base_offset))
-                  i += 1
-                  try:
-                      cmd = "echo {} > {}".format(_value, attr_path)  
-                      self.runcmd(cmd)
-                  except Exception as e:
-                      print "Invalid gpio path : " + attr_path
-                      return (False)
+                base_offset = int(attr['swpld_addr_offset'], 16)
+                if ':' in attr['bits']:
+                    bits_list = attr['bits'].split(':')
+                    bits_list.sort(reverse=True)
+                    max_bit = int(bits_list[0])
+                else:
+                    max_bit = 0
+                value = int(attr['value'], 16)
+                i = 0
+                while i <= max_bit:
+                    _value = (value >> i) & 1
+                    base_offset += i
+                    attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], hex(base_offset))
+                    i += 1
+                    try:
+                        cmd = "echo {} > {}".format(_value, attr_path)
+                        self.runcmd(cmd)
+                    except Exception as e:
+                        print("Invalid gpio path : " + attr_path)
+                        return (False)
         return (True)
 
     def set_led_color_from_cpld(self, led_device_name, color):
-        index=self.data[led_device_name]['dev_attr']['index']
-        device_name=self.data[led_device_name]['dev_info']['device_name']
+        index = self.data[led_device_name]['dev_attr']['index']
+        device_name = self.data[led_device_name]['dev_info']['device_name']
         self.create_attr('device_name', device_name,  self.get_led_path())
         self.create_attr('index', index, self.get_led_path())
         self.create_attr('color', color, self.get_led_cur_state_path())
         self.create_attr('dev_ops', 'set_status',  self.get_led_path())
-        return (True) 
-
+        return (True)
 
     def get_system_led_color(self, led_device_name):
-        if (not led_device_name in self.data.keys()):
-            status= "[FAILED] " + led_device_name + " is not configured"
+        if led_device_name not in self.data.keys():
+            status = "[FAILED] " + led_device_name + " is not configured"
             return (status)
 
         type = self.get_led_color_devtype(led_device_name)
 
         if type == 'gpio':
-           color = self.get_led_color_from_gpio(led_device_name)
-        elif type == 'cpld':  
-           color = self.get_led_color_from_cpld(led_device_name)
+            color = self.get_led_color_from_gpio(led_device_name)
+        elif type == 'cpld':
+            color = self.get_led_color_from_cpld(led_device_name)
         return color
 
     def set_system_led_color(self, led_device_name, color):
-        result, msg = self.is_supported_sysled_state(led_device_name, color);
+        result, msg = self.is_supported_sysled_state(led_device_name, color)
         if result == False:
-           print msg
-           return (result)
+            print(msg)
+            return (result)
 
         type = self.get_led_color_devtype(led_device_name)
 
         if type == 'gpio':
-           return (self.set_led_color_from_gpio(led_device_name, color))
-        else:  
-           return (self.set_led_color_from_cpld(led_device_name, color))
+            return (self.set_led_color_from_gpio(led_device_name, color))
+        else:
+            return (self.set_led_color_from_cpld(led_device_name, color))
 
     ###################################################################################################################
     #   SHOW ATTRIBIUTES DEFS
     ###################################################################################################################
     def is_led_device_configured(self, device_name, attr_name):
         if device_name in self.data.keys():
-            attr_list=self.data[device_name]['i2c']['attr_list']
+            attr_list = self.data[device_name]['i2c']['attr_list']
             for attr in attr_list:
                 if attr['attr_name'].strip() == attr_name.strip():
                     return (True)
         return (False)
 
-
     def show_device_sysfs(self, dev, ops):
-        parent=dev['dev_info']['device_parent']
-        pdev=self.data[parent]
+        parent = dev['dev_info']['device_parent']
+        pdev = self.data[parent]
         if pdev['dev_info']['device_parent'] == 'SYSTEM':
-            return "/sys/bus/i2c/devices/"+"i2c-%d"%int(pdev['i2c']['topo_info']['dev_addr'], 0)
+            return "/sys/bus/i2c/devices/"+"i2c-%d" % int(pdev['i2c']['topo_info']['dev_addr'], 0)
         return self.show_device_sysfs(pdev, ops) + "/" + "i2c-%d" % int(dev['i2c']['topo_info']['parent_bus'], 0)
 
+    # This is alid for 'at24' type of EEPROM devices. Only one attribtue 'eeprom'
 
-    # This is alid for 'at24' type of EEPROM devices. Only one attribtue 'eeprom' 
     def show_attr_eeprom_device(self, dev, ops):
         str = ""
-        attr_name=ops['attr']
-        attr_list=dev['i2c']['attr_list']
-        KEY="eeprom"
-        dsysfs_path=""
+        attr_name = ops['attr']
+        attr_list = dev['i2c']['attr_list']
+        KEY = "eeprom"
+        dsysfs_path = ""
 
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         for attr in attr_list:
             if attr_name == attr['attr_name'] or attr_name == 'all':
@@ -297,28 +289,27 @@ def show_attr_eeprom_device(self, dev, ops):
                     real_name = attr['attr_name']
 
                 dsysfs_path = self.show_device_sysfs(dev, ops) + \
-                        "/%d-00%x"%(int(dev['i2c']['topo_info']['parent_bus'], 0), 
-                                int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
-                                        "/%s"%real_name
-                if not dsysfs_path in self.data_sysfs_obj[KEY]:
+                    "/%d-00%x" % (int(dev['i2c']['topo_info']['parent_bus'], 0),
+                                  int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
+                    "/%s" % real_name
+                if dsysfs_path not in self.data_sysfs_obj[KEY]:
                     self.data_sysfs_obj[KEY].append(dsysfs_path)
                 str += dsysfs_path+"\n"
         return str
 
     def show_attr_gpio_device(self, dev, ops):
         ret = ""
-        KEY="gpio"
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        KEY = "gpio"
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         return ret
 
-
     def show_attr_mux_device(self, dev, ops):
         ret = ""
-        KEY="mux"
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        KEY = "mux"
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         return ret
 
@@ -330,24 +321,24 @@ def get_gpio_attr_path(self, dev, offset):
         return path
 
     def show_attr_psu_i2c_device(self, dev, ops):
-        target=ops['target']
-        attr_name=ops['attr']
+        target = ops['target']
+        attr_name = ops['attr']
         ret = ""
-        KEY="psu"
-        dsysfs_path=""
+        KEY = "psu"
+        dsysfs_path = ""
 
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
-        if target == 'all' or target == dev['dev_info']['virt_parent'] :
-            attr_list=dev['i2c']['attr_list']
+        if target == 'all' or target == dev['dev_info']['virt_parent']:
+            attr_list = dev['i2c']['attr_list']
             for attr in attr_list:
-                if attr_name == attr['attr_name'] or attr_name == 'all' :
+                if attr_name == attr['attr_name'] or attr_name == 'all':
                     if 'attr_devtype' in attr.keys() and attr['attr_devtype'] == "gpio":
                         # Check and enable the gpio from class
                         attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], attr['attr_offset'])
                         if (os.path.exists(attr_path)):
-                            if not attr_path in self.data_sysfs_obj[KEY]:
+                            if attr_path not in self.data_sysfs_obj[KEY]:
                                 self.data_sysfs_obj[KEY].append(attr_path)
                             ret += attr_path + '\n'
                     else:
@@ -357,29 +348,26 @@ def show_attr_psu_i2c_device(self, dev, ops):
                             real_name = attr['attr_name']
 
                         dsysfs_path = self.show_device_sysfs(dev, ops) + \
-                                "/%d-00%x" %(int(dev['i2c']['topo_info']['parent_bus'], 0), 
-                                        int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
-                                                "/%s"%real_name
-                        if not dsysfs_path in self.data_sysfs_obj[KEY]:
+                            "/%d-00%x" % (int(dev['i2c']['topo_info']['parent_bus'], 0),
+                                          int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
+                            "/%s" % real_name
+                        if dsysfs_path not in self.data_sysfs_obj[KEY]:
                             self.data_sysfs_obj[KEY].append(dsysfs_path)
                             ret += dsysfs_path+"\n"
         return ret
 
-
     def show_attr_psu_device(self, dev, ops):
-        return self.show_attr_psu_i2c_device(dev, ops )
-
+        return self.show_attr_psu_i2c_device(dev, ops)
 
     def show_attr_fan_device(self, dev, ops):
         ret = ""
-        attr_name=ops['attr']
-        attr_list=dev['i2c']['attr_list']
-        KEY="fan"
-        dsysfs_path=""
-
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        attr_name = ops['attr']
+        attr_list = dev['i2c']['attr_list']
+        KEY = "fan"
+        dsysfs_path = ""
 
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         for attr in attr_list:
             if attr_name == attr['attr_name'] or attr_name == 'all':
@@ -387,7 +375,7 @@ def show_attr_fan_device(self, dev, ops):
                     # Check and enable the gpio from class
                     attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], attr['attr_offset'])
                     if (os.path.exists(attr_path)):
-                        if not attr_path in self.data_sysfs_obj[KEY]:
+                        if attr_path not in self.data_sysfs_obj[KEY]:
                             self.data_sysfs_obj[KEY].append(attr_path)
                         ret += attr_path + '\n'
                 else:
@@ -396,11 +384,11 @@ def show_attr_fan_device(self, dev, ops):
                     else:
                         real_name = attr['attr_name']
 
-                    dsysfs_path= self.show_device_sysfs(dev, ops) + \
-                            "/%d-00%x" %(int(dev['i2c']['topo_info']['parent_bus'], 0), 
-                                    int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
-                                            "/%s"%real_name
-                    if not dsysfs_path in self.data_sysfs_obj[KEY]:
+                    dsysfs_path = self.show_device_sysfs(dev, ops) + \
+                        "/%d-00%x" % (int(dev['i2c']['topo_info']['parent_bus'], 0),
+                                      int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
+                        "/%s" % real_name
+                    if dsysfs_path not in self.data_sysfs_obj[KEY]:
                         self.data_sysfs_obj[KEY].append(dsysfs_path)
                     ret += dsysfs_path+"\n"
         return ret
@@ -408,19 +396,18 @@ def show_attr_fan_device(self, dev, ops):
     # This is only valid for LM75
     def show_attr_temp_sensor_device(self, dev, ops):
         str = ""
-        attr_name=ops['attr']
-        attr_list=dev['i2c']['attr_list']
-        KEY="temp-sensors"
-        dsysfs_path=""
-
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        attr_name = ops['attr']
+        attr_list = dev['i2c']['attr_list']
+        KEY = "temp-sensors"
+        dsysfs_path = ""
 
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         for attr in attr_list:
             if attr_name == attr['attr_name'] or attr_name == 'all':
-                path = self.show_device_sysfs(dev, ops)+"/%d-00%x/" %(int(dev['i2c']['topo_info']['parent_bus'], 0), 
-                        int(dev['i2c']['topo_info']['dev_addr'], 0))
+                path = self.show_device_sysfs(dev, ops)+"/%d-00%x/" % (int(dev['i2c']['topo_info']['parent_bus'], 0),
+                                                                       int(dev['i2c']['topo_info']['dev_addr'], 0))
                 if 'drv_attr_name' in attr.keys():
                     real_name = attr['drv_attr_name']
                 else:
@@ -428,50 +415,48 @@ def show_attr_temp_sensor_device(self, dev, ops):
 
                 if (os.path.exists(path)):
                     full_path = glob.glob(path + 'hwmon/hwmon*/' + real_name)[0]
-                    dsysfs_path=full_path
-                    if not dsysfs_path in self.data_sysfs_obj[KEY]:
+                    dsysfs_path = full_path
+                    if dsysfs_path not in self.data_sysfs_obj[KEY]:
                         self.data_sysfs_obj[KEY].append(dsysfs_path)
                     str += full_path + "\n"
         return str
 
     def show_attr_sysstatus_device(self, dev, ops):
         ret = ""
-        attr_name=ops['attr']
-        attr_list=dev['attr_list']
-        KEY="sys-status"
-        dsysfs_path=""
-
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        attr_name = ops['attr']
+        attr_list = dev['attr_list']
+        KEY = "sys-status"
+        dsysfs_path = ""
 
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         for attr in attr_list:
-           if attr_name == attr['attr_name'] or attr_name == 'all':
-              dsysfs_path = "/sys/kernel/pddf/devices/sysstatus/sysstatus_data/" + attr['attr_name']
-              if not dsysfs_path in self.data_sysfs_obj[KEY]:
-                  self.data_sysfs_obj[KEY].append(dsysfs_path)
-              ret += dsysfs_path+"\n"
+            if attr_name == attr['attr_name'] or attr_name == 'all':
+                dsysfs_path = "/sys/kernel/pddf/devices/sysstatus/sysstatus_data/" + attr['attr_name']
+                if dsysfs_path not in self.data_sysfs_obj[KEY]:
+                    self.data_sysfs_obj[KEY].append(dsysfs_path)
+                ret += dsysfs_path+"\n"
         return ret
 
-
     def show_attr_xcvr_i2c_device(self, dev, ops):
-        target=ops['target']
-        attr_name=ops['attr']
+        target = ops['target']
+        attr_name = ops['attr']
         ret = ""
         dsysfs_path = ""
-        KEY="xcvr"
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        KEY = "xcvr"
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
-        if target == 'all' or target == dev['dev_info']['virt_parent'] :
-            attr_list=dev['i2c']['attr_list']
+        if target == 'all' or target == dev['dev_info']['virt_parent']:
+            attr_list = dev['i2c']['attr_list']
             for attr in attr_list:
-                if attr_name == attr['attr_name'] or attr_name == 'all' :
+                if attr_name == attr['attr_name'] or attr_name == 'all':
                     if 'attr_devtype' in attr.keys() and attr['attr_devtype'] == "gpio":
                         # Check and enable the gpio from class
                         attr_path = self.get_gpio_attr_path(self.data[attr['attr_devname']], attr['attr_offset'])
                         if (os.path.exists(attr_path)):
-                            if not attr_path in self.data_sysfs_obj[KEY]:
+                            if attr_path not in self.data_sysfs_obj[KEY]:
                                 self.data_sysfs_obj[KEY].append(attr_path)
                             ret += attr_path + '\n'
                     else:
@@ -481,238 +466,228 @@ def show_attr_xcvr_i2c_device(self, dev, ops):
                             real_name = attr['attr_name']
 
                         dsysfs_path = self.show_device_sysfs(dev, ops) + \
-                                "/%d-00%x" %(int(dev['i2c']['topo_info']['parent_bus'], 0), 
-                                        int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
-                                                "/%s"%real_name
-                        if not dsysfs_path in self.data_sysfs_obj[KEY]:
+                            "/%d-00%x" % (int(dev['i2c']['topo_info']['parent_bus'], 0),
+                                          int(dev['i2c']['topo_info']['dev_addr'], 0)) + \
+                            "/%s" % real_name
+                        if dsysfs_path not in self.data_sysfs_obj[KEY]:
                             self.data_sysfs_obj[KEY].append(dsysfs_path)
                             ret += dsysfs_path+"\n"
         return ret
 
-
     def show_attr_xcvr_device(self, dev, ops):
-        return self.show_attr_xcvr_i2c_device(dev, ops )
+        return self.show_attr_xcvr_i2c_device(dev, ops)
 
     def show_attr_cpld_device(self, dev, ops):
         ret = ""
-        KEY="cpld"
-        if not KEY in self.data_sysfs_obj:
-            self.data_sysfs_obj[KEY]=[]
+        KEY = "cpld"
+        if KEY not in self.data_sysfs_obj:
+            self.data_sysfs_obj[KEY] = []
 
         return ret
 
-
     ###################################################################################################################
     #   SHOW DEFS
     ###################################################################################################################
+
     def check_led_cmds(self, key, ops):
-            name = ops['target']+'_LED'
-            if (ops['target']=='config' or ops['attr']=='all') or \
-                    (name==self.data[key]['dev_info']['device_name'] and 
-                            ops['attr']==self.data[key]['dev_attr']['index']):
-                return (True)
-            else:
-                return (False)
+        name = ops['target']+'_LED'
+        if (ops['target'] == 'config' or ops['attr'] == 'all') or \
+                (name == self.data[key]['dev_info']['device_name'] and
+                 ops['attr'] == self.data[key]['dev_attr']['index']):
+            return (True)
+        else:
+            return (False)
 
     def dump_sysfs_obj(self, obj, key_type):
-            if (key_type == 'keys'):
-                for key in obj.keys():	
-                    print key
-                return
+        if (key_type == 'keys'):
+            for key in obj.keys():
+                print(key)
+            return
 
-            for key in obj:
-                if (key == key_type or key_type == 'all'):
-                    print key+":"
-                    for entry in obj[key]:
-                        print "\t"+entry
+        for key in obj:
+            if (key == key_type or key_type == 'all'):
+                print(key+":")
+                for entry in obj[key]:
+                    print("\t"+entry)
 
     def add_list_sysfs_obj(self, obj, KEY, list):
         for sysfs in list:
-            if not sysfs in obj[KEY]:
+            if sysfs not in obj[KEY]:
                 obj[KEY].append(sysfs)
 
     def sysfs_attr(self, key, value, path, obj, obj_key):
-            sysfs_path="/sys/kernel/%s/%s"%(path, key)
-            if not sysfs_path in obj[obj_key]:
-                    obj[obj_key].append(sysfs_path)
-
+        sysfs_path = "/sys/kernel/%s/%s" % (path, key)
+        if sysfs_path not in obj[obj_key]:
+            obj[obj_key].append(sysfs_path)
 
     def sysfs_device(self, attr, path, obj, obj_key):
-            for key in attr.keys():
-                    sysfs_path="/sys/kernel/%s/%s"%(path, key)
-                    if not sysfs_path in obj[obj_key]:
-                            obj[obj_key].append(sysfs_path)
+        for key in attr.keys():
+            sysfs_path = "/sys/kernel/%s/%s" % (path, key)
+            if sysfs_path not in obj[obj_key]:
+                obj[obj_key].append(sysfs_path)
 
     def show_eeprom_device(self, dev, ops):
-            return
-
+        return
 
     def show_mux_device(self, dev, ops):
-            KEY ='mux'
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-                    self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/mux", self.sysfs_obj, KEY)
-                    self.sysfs_device(dev['i2c']['dev_attr'], "pddf/devices/mux", self.sysfs_obj, KEY)
-                    sysfs_path= "/sys/kernel/pddf/devices/mux/dev_ops"
-                    if not sysfs_path in self.sysfs_obj[KEY]:
-                            self.sysfs_obj[KEY].append(sysfs_path)
-                    list=['/sys/kernel/pddf/devices/mux/i2c_type',
-                          '/sys/kernel/pddf/devices/mux/i2c_name',
-                          '/sys/kernel/pddf/devices/mux/error']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
+        KEY = 'mux'
+        if KEY not in self.sysfs_obj:
+            self.sysfs_obj[KEY] = []
+            self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/mux", self.sysfs_obj, KEY)
+            self.sysfs_device(dev['i2c']['dev_attr'], "pddf/devices/mux", self.sysfs_obj, KEY)
+            sysfs_path = "/sys/kernel/pddf/devices/mux/dev_ops"
+            if sysfs_path not in self.sysfs_obj[KEY]:
+                self.sysfs_obj[KEY].append(sysfs_path)
+            list = ['/sys/kernel/pddf/devices/mux/i2c_type',
+                    '/sys/kernel/pddf/devices/mux/i2c_name',
+                    '/sys/kernel/pddf/devices/mux/error']
+            self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_gpio_device(self, dev, ops):
-            KEY ='gpio'
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-                    self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/gpio", self.sysfs_obj, KEY)
-                    self.sysfs_device(dev['i2c']['dev_attr'], "pddf/devices/gpio", self.sysfs_obj, KEY)
-                    sysfs_path= "/sys/kernel/pddf/devices/gpio/dev_ops"
-                    if not sysfs_path in self.sysfs_obj[KEY]:
-                            self.sysfs_obj[KEY].append(sysfs_path)
-                    list=['/sys/kernel/pddf/devices/gpio/i2c_type',
-                          '/sys/kernel/pddf/devices/gpio/i2c_name',
-                          '/sys/kernel/pddf/devices/gpio/error']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
-
+        KEY = 'gpio'
+        if KEY not in self.sysfs_obj:
+            self.sysfs_obj[KEY] = []
+            self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/gpio", self.sysfs_obj, KEY)
+            self.sysfs_device(dev['i2c']['dev_attr'], "pddf/devices/gpio", self.sysfs_obj, KEY)
+            sysfs_path = "/sys/kernel/pddf/devices/gpio/dev_ops"
+            if sysfs_path not in self.sysfs_obj[KEY]:
+                self.sysfs_obj[KEY].append(sysfs_path)
+            list = ['/sys/kernel/pddf/devices/gpio/i2c_type',
+                    '/sys/kernel/pddf/devices/gpio/i2c_name',
+                    '/sys/kernel/pddf/devices/gpio/error']
+            self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_psu_i2c_device(self, dev, ops):
-        KEY ='psu'
-        path='pddf/devices/psu/i2c'
+        KEY = 'psu'
+        path = 'pddf/devices/psu/i2c'
         if dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['PSU']:
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-                    self.sysfs_device(dev['i2c']['topo_info'], path, self.sysfs_obj, KEY)
-                    sysfs_path = "/sys/kernel/pddf/devices/psu/i2c/psu_idx"
-                    self.sysfs_obj[KEY].append(sysfs_path)
-
-                    for attr in dev['i2c']['attr_list']:
-                            self.sysfs_device(attr, "pddf/devices/psu/i2c", self.sysfs_obj, KEY)
-                            sysfs_path = "/sys/kernel/pddf/devices/psu/i2c/dev_ops"
-                            if not sysfs_path in self.sysfs_obj[KEY]:
-                                    self.sysfs_obj[KEY].append(sysfs_path)
-                    list=['/sys/kernel/pddf/devices/psu/i2c/i2c_type',
-                          '/sys/kernel/pddf/devices/fan/i2c/i2c_name',
-                          '/sys/kernel/pddf/devices/psu/i2c/error',
-                          '/sys/kernel/pddf/devices/psu/i2c/attr_ops']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
+            if KEY not in self.sysfs_obj:
+                self.sysfs_obj[KEY] = []
+                self.sysfs_device(dev['i2c']['topo_info'], path, self.sysfs_obj, KEY)
+                sysfs_path = "/sys/kernel/pddf/devices/psu/i2c/psu_idx"
+                self.sysfs_obj[KEY].append(sysfs_path)
 
+                for attr in dev['i2c']['attr_list']:
+                    self.sysfs_device(attr, "pddf/devices/psu/i2c", self.sysfs_obj, KEY)
+                    sysfs_path = "/sys/kernel/pddf/devices/psu/i2c/dev_ops"
+                    if sysfs_path not in self.sysfs_obj[KEY]:
+                        self.sysfs_obj[KEY].append(sysfs_path)
+                list = ['/sys/kernel/pddf/devices/psu/i2c/i2c_type',
+                        '/sys/kernel/pddf/devices/fan/i2c/i2c_name',
+                        '/sys/kernel/pddf/devices/psu/i2c/error',
+                        '/sys/kernel/pddf/devices/psu/i2c/attr_ops']
+                self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_psu_device(self, dev, ops):
-            self.show_psu_i2c_device(dev, ops )
-            return
+        self.show_psu_i2c_device(dev, ops)
+        return
 
     def show_client_device(self):
-        KEY ='client'
-        if not KEY in self.sysfs_obj:
-               self.sysfs_obj[KEY] = []
-               list=['/sys/kernel/pddf/devices/showall']
-               self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
-
+        KEY = 'client'
+        if KEY not in self.sysfs_obj:
+            self.sysfs_obj[KEY] = []
+            list = ['/sys/kernel/pddf/devices/showall']
+            self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_fan_device(self, dev, ops):
-        KEY ='fan'
-        path='pddf/devices/fan/i2c'
+        KEY = 'fan'
+        path = 'pddf/devices/fan/i2c'
         if dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['FAN']:
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-
-                    self.sysfs_device(dev['i2c']['topo_info'], path, self.sysfs_obj, KEY)
-                    self.sysfs_device(dev['i2c']['dev_attr'], path, self.sysfs_obj, KEY)
-                    for attr in dev['i2c']['attr_list']:
-                            self.sysfs_device(attr, path, self.sysfs_obj, KEY)
-                    list=['/sys/kernel/pddf/devices/fan/i2c/i2c_type',
-                          '/sys/kernel/pddf/devices/fan/i2c/i2c_name',
-                          '/sys/kernel/pddf/devices/fan/i2c/error',
-                          '/sys/kernel/pddf/devices/fan/i2c/attr_ops',
-                          '/sys/kernel/pddf/devices/fan/i2c/dev_ops']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
+            if KEY not in self.sysfs_obj:
+                self.sysfs_obj[KEY] = []
 
+                self.sysfs_device(dev['i2c']['topo_info'], path, self.sysfs_obj, KEY)
+                self.sysfs_device(dev['i2c']['dev_attr'], path, self.sysfs_obj, KEY)
+                for attr in dev['i2c']['attr_list']:
+                    self.sysfs_device(attr, path, self.sysfs_obj, KEY)
+                list = ['/sys/kernel/pddf/devices/fan/i2c/i2c_type',
+                        '/sys/kernel/pddf/devices/fan/i2c/i2c_name',
+                        '/sys/kernel/pddf/devices/fan/i2c/error',
+                        '/sys/kernel/pddf/devices/fan/i2c/attr_ops',
+                        '/sys/kernel/pddf/devices/fan/i2c/dev_ops']
+                self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_temp_sensor_device(self, dev, ops):
-            return
+        return
 
     def show_sysstatus_device(self, dev, ops):
-        KEY ='sysstatus'
-        if not KEY in self.sysfs_obj:
+        KEY = 'sysstatus'
+        if KEY not in self.sysfs_obj:
             self.sysfs_obj[KEY] = []
             for attr in dev['attr_list']:
-                    self.sysfs_device(attr, "pddf/devices/sysstatus", self.sysfs_obj, KEY)
-                    sysfs_path= "/sys/kernel/pddf/devices/sysstatus/attr_ops"
-                    if not sysfs_path in self.sysfs_obj[KEY]:
-                            self.sysfs_obj[KEY].append(sysfs_path)
-
+                self.sysfs_device(attr, "pddf/devices/sysstatus", self.sysfs_obj, KEY)
+                sysfs_path = "/sys/kernel/pddf/devices/sysstatus/attr_ops"
+                if sysfs_path not in self.sysfs_obj[KEY]:
+                    self.sysfs_obj[KEY].append(sysfs_path)
 
     def show_xcvr_i2c_device(self, dev, ops):
-        KEY ='xcvr'
+        KEY = 'xcvr'
         if dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['PORT_MODULE']:
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-                    self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/xcvr/i2c", self.sysfs_obj, KEY)
-
-                    for attr in dev['i2c']['attr_list']:
-                            self.sysfs_device(attr, "pddf/devices/xcvr/i2c", self.sysfs_obj, KEY)
-                            sysfs_path = "/sys/kernel/pddf/devices/xcvr/i2c/dev_ops"
-                            if not sysfs_path in self.sysfs_obj[KEY]:
-                                    self.sysfs_obj[KEY].append(sysfs_path)
-                    list=['/sys/kernel/pddf/devices/xcvr/i2c/i2c_type',
-                          '/sys/kernel/pddf/devices/xcvr/i2c/i2c_name',
-                          '/sys/kernel/pddf/devices/xcvr/i2c/error',
-                          '/sys/kernel/pddf/devices/xcvr/i2c/attr_ops']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
+            if KEY not in self.sysfs_obj:
+                self.sysfs_obj[KEY] = []
+                self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/xcvr/i2c", self.sysfs_obj, KEY)
 
+                for attr in dev['i2c']['attr_list']:
+                    self.sysfs_device(attr, "pddf/devices/xcvr/i2c", self.sysfs_obj, KEY)
+                    sysfs_path = "/sys/kernel/pddf/devices/xcvr/i2c/dev_ops"
+                    if sysfs_path not in self.sysfs_obj[KEY]:
+                        self.sysfs_obj[KEY].append(sysfs_path)
+                list = ['/sys/kernel/pddf/devices/xcvr/i2c/i2c_type',
+                        '/sys/kernel/pddf/devices/xcvr/i2c/i2c_name',
+                        '/sys/kernel/pddf/devices/xcvr/i2c/error',
+                        '/sys/kernel/pddf/devices/xcvr/i2c/attr_ops']
+                self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_xcvr_device(self, dev, ops):
-            self.show_xcvr_i2c_device(dev, ops )
-            return
+        self.show_xcvr_i2c_device(dev, ops)
+        return
 
     def show_cpld_device(self, dev, ops):
-        KEY ='cpld'
+        KEY = 'cpld'
         if dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['CPLD']:
-            if not KEY in self.sysfs_obj:
-                    self.sysfs_obj[KEY] = []
-                    self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/cpld", self.sysfs_obj, KEY)
-                    sysfs_path= "/sys/kernel/pddf/devices/cpld/dev_ops"
-                    if not sysfs_path in self.sysfs_obj[KEY]:
-                            self.sysfs_obj[KEY].append(sysfs_path)
-                    list=['/sys/kernel/pddf/devices/cpld/i2c_type',
-                          '/sys/kernel/pddf/devices/cpld/i2c_name',
-                          '/sys/kernel/pddf/devices/cpld/error']
-                    self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
+            if KEY not in self.sysfs_obj:
+                self.sysfs_obj[KEY] = []
+                self.sysfs_device(dev['i2c']['topo_info'], "pddf/devices/cpld", self.sysfs_obj, KEY)
+                sysfs_path = "/sys/kernel/pddf/devices/cpld/dev_ops"
+                if sysfs_path not in self.sysfs_obj[KEY]:
+                    self.sysfs_obj[KEY].append(sysfs_path)
+                list = ['/sys/kernel/pddf/devices/cpld/i2c_type',
+                        '/sys/kernel/pddf/devices/cpld/i2c_name',
+                        '/sys/kernel/pddf/devices/cpld/error']
+                self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
     def show_led_platform_device(self, key, ops):
-        if ops['attr']=='all' or ops['attr']=='PLATFORM':
-            KEY='platform'
-            if not KEY in self.sysfs_obj:
+        if ops['attr'] == 'all' or ops['attr'] == 'PLATFORM':
+            KEY = 'platform'
+            if KEY not in self.sysfs_obj:
                 self.sysfs_obj[KEY] = []
-                path='pddf/devices/platform'
+                path = 'pddf/devices/platform'
                 self.sysfs_attr('num_psus', self.data['PLATFORM']['num_psus'], path, self.sysfs_obj, KEY)
                 self.sysfs_attr('num_fantrays', self.data['PLATFORM']['num_fantrays'], path, self.sysfs_obj, KEY)
 
     def show_led_device(self, key, ops):
         if self.check_led_cmds(key, ops):
-            KEY='led'
-            if not KEY in self.sysfs_obj:
+            KEY = 'led'
+            if KEY not in self.sysfs_obj:
                 self.sysfs_obj[KEY] = []
-                path="pddf/devices/led"
+                path = "pddf/devices/led"
                 for attr in self.data[key]['i2c']['attr_list']:
-                    self.sysfs_attr('device_name', self.data[key]['dev_info']['device_name'],path,self.sysfs_obj,KEY)
-                    self.sysfs_attr('swpld_addr', self.data[key]['dev_info']['device_name'],path,self.sysfs_obj,KEY)
-                    self.sysfs_attr('swpld_addr_offset', self.data[key]['dev_info']['device_name'],path,
-                            self.sysfs_obj, KEY)
+                    self.sysfs_attr('device_name', self.data[key]['dev_info']['device_name'], path, self.sysfs_obj, KEY)
+                    self.sysfs_attr('swpld_addr', self.data[key]['dev_info']['device_name'], path, self.sysfs_obj, KEY)
+                    self.sysfs_attr('swpld_addr_offset', self.data[key]['dev_info']['device_name'], path,
+                                    self.sysfs_obj, KEY)
                     self.sysfs_device(self.data[key]['dev_attr'], path, self.sysfs_obj, KEY)
                     for attr_key in attr.keys():
-                        attr_path="pddf/devices/led/" + attr['attr_name']
+                        attr_path = "pddf/devices/led/" + attr['attr_name']
                         if (attr_key != 'attr_name' and attr_key != 'swpld_addr' and attr_key != 'swpld_addr_offset'):
                             self.sysfs_attr(attr_key, attr[attr_key], attr_path, self.sysfs_obj, KEY)
-                sysfs_path="/sys/kernel/pddf/devices/led/dev_ops"
-                if not sysfs_path in self.sysfs_obj[KEY]:
+                sysfs_path = "/sys/kernel/pddf/devices/led/dev_ops"
+                if sysfs_path not in self.sysfs_obj[KEY]:
                     self.sysfs_obj[KEY].append(sysfs_path)
-                list=['/sys/kernel/pddf/devices/led/cur_state/color',
+                list = ['/sys/kernel/pddf/devices/led/cur_state/color',
                         '/sys/kernel/pddf/devices/led/cur_state/color_state']
                 self.add_list_sysfs_obj(self.sysfs_obj, KEY, list)
 
-
     def validate_xcvr_device(self, dev, ops):
         devtype_list = ['optoe1', 'optoe2']
         dev_attribs = ['xcvr_present', 'xcvr_reset', 'xcvr_intr_status', 'xcvr_lpmode']
@@ -723,7 +698,7 @@ def validate_xcvr_device(self, dev, ops):
                 if 'attr_name' in attr.keys() and 'eeprom' in attr.values():
                     ret_val = "xcvr validation success"
                 else:
-                    print "xcvr validation Failed"
+                    print("xcvr validation Failed")
                     return
 
         elif dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['PORT_MODULE']:
@@ -731,9 +706,9 @@ def validate_xcvr_device(self, dev, ops):
                 if attr.get("attr_name") in dev_attribs:
                     ret_val = "Success"
                 else:
-                    print "xcvr validation Failed"
+                    print("xcvr validation Failed")
                     return
-        print ret_val
+        print(ret_val)
 
     def validate_eeprom_device(self, dev, ops):
         devtype_list = ['24c02']
@@ -746,7 +721,7 @@ def validate_eeprom_device(self, dev, ops):
                 for attr in dev['i2c']['attr_list']:
                     if attr.get("attr_name") in dev_attribs:
                         ret_val = "eeprom success"
-        print ret_val
+        print(ret_val)
 
     def validate_mux_device(self, dev, ops):
         devtype_list = ['pca9548', 'pca954x']
@@ -757,7 +732,7 @@ def validate_mux_device(self, dev, ops):
             for attr in dev['i2c']['channel']:
                 if attr.get("chn") in dev_channels:
                     ret_val = "Mux success"
-        print ret_val
+        print(ret_val)
 
     def validate_cpld_device(self, dev, ops):
         devtype_list = ['i2c_cpld']
@@ -765,20 +740,19 @@ def validate_cpld_device(self, dev, ops):
 
         if dev['i2c']['topo_info']['dev_type'] in devtype_list:
             ret_val = "cpld success"
-        print ret_val
-
+        print(ret_val)
 
     def validate_sysstatus_device(self, dev, ops):
         dev_attribs = ['board_info', 'cpld1_version', 'power_module_status', 'system_reset5',
-                        'system_reset6', 'system_reset7', 'misc1', 'cpld2_version', 'cpld3_version'
-                    ]
+                       'system_reset6', 'system_reset7', 'misc1', 'cpld2_version', 'cpld3_version'
+                       ]
         ret_val = "sysstatus failed"
 
         if dev['dev_info']['device_type'] == "SYSSTAT":
-                for attr in dev['attr_list']:
-                    if attr.get("attr_name") in dev_attribs:
-                        ret_val = "sysstatus success"
-        print ret_val
+            for attr in dev['attr_list']:
+                if attr.get("attr_name") in dev_attribs:
+                    ret_val = "sysstatus success"
+        print(ret_val)
 
     def validate_temp_sensor_device(self, dev, ops):
         devtype_list = ['lm75']
@@ -790,7 +764,7 @@ def validate_temp_sensor_device(self, dev, ops):
                 for attr in dev['i2c']['attr_list']:
                     if attr.get("attr_name") in dev_attribs:
                         ret_val = "tempsensor success"
-        print ret_val
+        print(ret_val)
 
     def validate_fan_device(self, dev, ops):
         ret_val = "fan failed"
@@ -799,12 +773,12 @@ def validate_fan_device(self, dev, ops):
             if dev['i2c']['dev_attr']['num_fan'] is not None:
                 ret_val = "fan success"
 
-        print ret_val
+        print(ret_val)
 
     def validate_psu_device(self, dev, ops):
         dev_attribs = ['psu_present', 'psu_model_name', 'psu_power_good', 'psu_mfr_id', 'psu_serial_num',
-                        'psu_fan_dir', 'psu_v_out', 'psu_i_out', 'psu_p_out', 'psu_fan1_speed_rpm'
-                      ]
+                       'psu_fan_dir', 'psu_v_out', 'psu_i_out', 'psu_p_out', 'psu_fan1_speed_rpm'
+                       ]
         ret_val = "psu failed"
 
         if dev['i2c']['topo_info']['dev_type'] in self.data['PLATFORM']['pddf_dev_types']['PSU']:
@@ -814,272 +788,263 @@ def validate_psu_device(self, dev, ops):
                         if attr.get("attr_offset") is not None:
                             if attr.get("attr_mask") is not None:
                                 if attr.get("attr_len") is not None:
-                                        ret_val = "psu success"
+                                    ret_val = "psu success"
                 else:
                     ret_val = "psu failed"
 
-        print ret_val
+        print(ret_val)
 
     ###################################################################################################################
-    #  SPYTEST 
+    #  SPYTEST
     ###################################################################################################################
     def verify_attr(self, key, attr, path):
-            node="/sys/kernel/%s/%s"%(path, key)
-            try:
-                    with open(node, 'r') as f:
-                            status = f.read()
-            except IOError:
-                    print "PDDF_VERIFY_ERR: IOError: node:%s key:%s"%(node, key)
-                    return
+        node = "/sys/kernel/%s/%s" % (path, key)
+        try:
+            with open(node, 'r') as f:
+                status = f.read()
+        except IOError:
+            print("PDDF_VERIFY_ERR: IOError: node:%s key:%s" % (node, key))
+            return
 
-            status=status.rstrip("\n\r")
-            if attr[key]!=status:
-                    print "PDDF_VERIFY_ERR: node: %s switch:%s"%(node, status)
+        status = status.rstrip("\n\r")
+        if attr[key] != status:
+            print("PDDF_VERIFY_ERR: node: %s switch:%s" % (node, status))
 
     def verify_device(self, attr, path, ops):
-            for key in attr.keys():
-                    self.verify_attr(key, attr, path)
-
+        for key in attr.keys():
+            self.verify_attr(key, attr, path)
 
     def get_led_device(self, device_name):
         self.create_attr('device_name', self.data[device_name]['dev_info']['device_name'], "pddf/devices/led")
         self.create_attr('index', self.data[device_name]['dev_attr']['index'], "pddf/devices/led")
-        cmd="echo 'verify'  > /sys/kernel/pddf/devices/led/dev_ops"
+        cmd = "echo 'verify'  > /sys/kernel/pddf/devices/led/dev_ops"
         self.runcmd(cmd)
 
     def validate_sysfs_creation(self, obj, validate_type):
-            dir = '/sys/kernel/pddf/devices/'+validate_type
-            if (os.path.exists(dir) or validate_type=='client'):
-                for sysfs in obj[validate_type]:
-                    if(not os.path.exists(sysfs)):
-                        print "[SYSFS FILE] " + sysfs + ": does not exist"
-            else:
-                print "[SYSFS DIR] " + dir + ": does not exist"
+        dir = '/sys/kernel/pddf/devices/'+validate_type
+        if (os.path.exists(dir) or validate_type == 'client'):
+            for sysfs in obj[validate_type]:
+                if not os.path.exists(sysfs):
+                    print("[SYSFS FILE] " + sysfs + ": does not exist")
+        else:
+            print("[SYSFS DIR] " + dir + ": does not exist")
 
     def validate_dsysfs_creation(self, obj, validate_type):
         if validate_type in obj.keys():
             # There is a possibility that some components dont have any device-self.data attr
             if not obj[validate_type]:
-               print "[SYSFS ATTR] for " + validate_type  + ": empty"
+                print("[SYSFS ATTR] for " + validate_type + ": empty")
             else:
-               for sysfs in obj[validate_type]:
-                  if(not os.path.exists(sysfs)):
-                       print "[SYSFS FILE] " + sysfs + ": does not exist"
+                for sysfs in obj[validate_type]:
+                    if not os.path.exists(sysfs):
+                        print("[SYSFS FILE] " + sysfs + ": does not exist")
         else:
-            print "[SYSFS DIR] " + dir + ": not configured"
-
-
+            print("[SYSFS DIR] " + dir + ": not configured")
 
     def verify_sysfs_data(self, verify_type):
-        if (verify_type=='LED'):
+        if (verify_type == 'LED'):
             for key in self.data.keys():
                 if key != 'PLATFORM':
-                    attr=self.data[key]['dev_info']
+                    attr = self.data[key]['dev_info']
                     if attr['device_type'] == 'LED':
                         self.get_led_device(key)
                         self.verify_attr('device_name', self.data[key]['dev_info'], "pddf/devices/led")
                         self.verify_attr('index', self.data[key]['dev_attr'], "pddf/devices/led")
                         for attr in self.data[key]['i2c']['attr_list']:
-                            path="pddf/devices/led/" + attr['attr_name']
+                            path = "pddf/devices/led/" + attr['attr_name']
                             for entry in attr.keys():
                                 if (entry != 'attr_name' and entry != 'swpld_addr' and entry != 'swpld_addr_offset'):
-                                        self.verify_attr(entry, attr, path)
-                                if ( entry == 'swpld_addr' or entry == 'swpld_addr_offset'):
-                                        self.verify_attr(entry, attr, 'pddf/devices/led')
-
-
+                                    self.verify_attr(entry, attr, path)
+                                if (entry == 'swpld_addr' or entry == 'swpld_addr_offset'):
+                                    self.verify_attr(entry, attr, 'pddf/devices/led')
 
     def schema_validation(self, validate_type):
-	    process_validate_type = 0
-            for key in self.data.keys():
-                    if (key != 'PLATFORM'):
-                            temp_obj={}
-                            schema_list=[]
+        process_validate_type = 0
+        for key in self.data.keys():
+            if (key != 'PLATFORM'):
+                temp_obj = {}
+                schema_list = []
+                try:
+                    device_type = self.data[key]["dev_info"]["device_type"]
+                except Exception as e:
+                    print("dev_info or device_type ERROR: " + key)
+                    print(e)
+
+                if validate_type == 'mismatch':
+                    process_validate_type = 1
+                    device_type = "PSU"
+                    schema_file = "/usr/local/bin/schema/FAN.schema"
+                    schema_list.append(schema_file)
+                elif validate_type == 'missing':
+                    process_validate_type = 1
+                    schema_file = "/usr/local/bin/schema/PLATFORM.schema"
+                    schema_list.append(schema_file)
+
+                elif validate_type == 'empty':
+                    process_validate_type = 1
+                    if not device_type:
+                        print("Empty device_type for " + key)
+                        continue
+                elif (validate_type == 'all' or validate_type == device_type):
+                    process_validate_type = 1
+                    if "bmc" in self.data[key].keys():
+                        schema_file = "/usr/local/bin/schema/"+device_type + "_BMC.schema"
+                        schema_list.append(schema_file)
+
+                    if "i2c" in self.data[key].keys():
+                        schema_file = "/usr/local/bin/schema/"+device_type + ".schema"
+                        schema_list.append(schema_file)
+                if device_type:
+                    temp_obj[device_type] = self.data[key]
+                    for schema_file in schema_list:
+                        if (os.path.exists(schema_file)):
+                            print("Validate " + schema_file + ";" + key)
+                            json_data = json.dumps(temp_obj)
+                            with open(schema_file, 'r') as f:
+                                schema = json.load(f)
                             try:
-                            	device_type=self.data[key]["dev_info"]["device_type"]
+                                validate(temp_obj, schema)
                             except Exception as e:
-                            	print "dev_info or device_type ERROR: " + key
-                            	print e 
-
-			    if validate_type == 'mismatch':
-	    			 process_validate_type = 1
-	                         device_type="PSU"
-                                 schema_file="/usr/local/bin/schema/FAN.schema"
-                                 schema_list.append(schema_file)
-		            elif validate_type == 'missing':
-	    			 process_validate_type = 1
-                                 schema_file="/usr/local/bin/schema/PLATFORM.schema"
-                                 schema_list.append(schema_file)
-
-		            elif validate_type == 'empty':
-	    			 process_validate_type = 1
-				 if not device_type:
-			            print "Empty device_type for " + key		
-                                    continue
-                            elif (validate_type=='all' or validate_type==device_type):
-	    			 process_validate_type = 1
-                                 if "bmc" in self.data[key].keys():
-                                    schema_file="/usr/local/bin/schema/"+device_type + "_BMC.schema"
-                                    schema_list.append(schema_file)
-
-                                 if "i2c" in self.data[key].keys():
-                                    schema_file="/usr/local/bin/schema/"+device_type + ".schema"
-                                    schema_list.append(schema_file)
-			    if device_type:
-                                 temp_obj[device_type]=self.data[key]
-                                 for schema_file in schema_list:
-                                      if (os.path.exists(schema_file)):
-				          print "Validate " + schema_file + ";" + key
-                                          json_data=json.dumps(temp_obj)
-                                          with open(schema_file, 'r') as f:
-                                              schema=json.load(f)
-	      			          try:
-                                              validate(temp_obj, schema)
-			                  except Exception as e:
-              	  			      print "Validation ERROR: " + schema_file + ";" + key
-					      if validate_type == 'mismatch':
-					  	 return	
-				              else:		
-					  	 print e
-                                      else:
-                                         print "ERROR Missing File: " + schema_file
-            if not process_validate_type:
-	         print "device_type: " + validate_type + " not configured" 
+                                print("Validation ERROR: " + schema_file + ";" + key)
+                                if validate_type == 'mismatch':
+                                    return
+                                else:
+                                    print(e)
+                        else:
+                            print("ERROR Missing File: " + schema_file)
+        if not process_validate_type:
+            print("device_type: " + validate_type + " not configured")
 
     def modules_validation(self, validate_type):
         kos = []
         supported_type = False
-        module_validation_status=[]
+        module_validation_status = []
 
-        if validate_type  == "bmc":
-           kos=['ipmi_devintf', 'ipmi_si', 'ipmi_msghandler']
-           validate_type = 'ipmi'
+        if validate_type == "bmc":
+            kos = ['ipmi_devintf', 'ipmi_si', 'ipmi_msghandler']
+            validate_type = 'ipmi'
         else:
-           # generate the KOS list from pddf device JSON file
-           kos.extend(self.data['PLATFORM']['pddf_kos'])
+            # generate the KOS list from pddf device JSON file
+            kos.extend(self.data['PLATFORM']['pddf_kos'])
 
-           if 'custom_kos' in self.data['PLATFORM']:
-               kos.extend(self.data['PLATFORM']['custom_kos'])
+            if 'custom_kos' in self.data['PLATFORM']:
+                kos.extend(self.data['PLATFORM']['custom_kos'])
 
         for mod in kos:
             if validate_type in mod or validate_type == "pddf":
-               supported_type=True
-               cmd = "lsmod | grep " + mod
-               try:
-                  subprocess.check_output(cmd, shell=True)
-               except Exception as e:
-                  module_validation_status.append(mod)
+                supported_type = True
+                cmd = "lsmod | grep " + mod
+                try:
+                    subprocess.check_output(cmd, shell=True)
+                except Exception as e:
+                    module_validation_status.append(mod)
         if supported_type:
             if module_validation_status:
-               module_validation_status.append(":ERROR not loaded")
-               print str(module_validation_status)[1:-1]
+                module_validation_status.append(":ERROR not loaded")
+                print(str(module_validation_status)[1:-1])
             else:
-               print "Loaded"
+                print("Loaded")
         else:
-            print validate_type + " not configured"
-
-
+            print(validate_type + " not configured")
 
     ###################################################################################################################
     #   PARSE DEFS
     ###################################################################################################################
+
     def psu_parse(self, dev, ops):
-        parse_str=""
-        ret=""
+        parse_str = ""
+        ret = ""
         for ifce in dev['i2c']['interface']:
-            ret=getattr(self, ops['cmd']+"_psu_device")(self.data[ifce['dev']], ops )
-            if not ret is None:
+            ret = getattr(self, ops['cmd']+"_psu_device")(self.data[ifce['dev']], ops)
+            if ret is not None:
                 if str(ret).isdigit():
-                    if ret!=0:
+                    if ret != 0:
                         # in case if 'create' functions
-                        print "{}_psu_device failed".format(ops['cmd'])
+                        print("{}_psu_device failed".format(ops['cmd']))
                         return ret
                     else:
                         pass
                 else:
                     # in case of 'show_attr' functions
-                    parse_str+=ret
+                    parse_str += ret
         return parse_str
 
     def fan_parse(self, dev, ops):
-        parse_str=""
-        ret=getattr(self, ops['cmd']+"_fan_device")(dev, ops )
-        if not ret is None:
+        parse_str = ""
+        ret = getattr(self, ops['cmd']+"_fan_device")(dev, ops)
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_fan_device failed".format(ops['cmd'])
+                    print("{}_fan_device failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
             else:
                 # in case of 'show_attr' functions
-                parse_str+=ret
+                parse_str += ret
 
         return parse_str
 
     def temp_sensor_parse(self, dev, ops):
-        parse_str=""
-        ret=getattr(self, ops['cmd']+"_temp_sensor_device")(dev, ops )
-        if not ret is None:
-            if str(ret).isdigit() :
-                if ret!=0:
+        parse_str = ""
+        ret = getattr(self, ops['cmd']+"_temp_sensor_device")(dev, ops)
+        if ret is not None:
+            if str(ret).isdigit():
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_temp_sensor_device failed".format(ops['cmd'])
+                    print("{}_temp_sensor_device failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
             else:
                 # in case of 'show_attr' functions
-                parse_str+=ret
+                parse_str += ret
 
         return parse_str
 
     def cpld_parse(self, dev, ops):
         parse_str = ""
         ret = getattr(self, ops['cmd']+"_cpld_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_cpld_device failed".format(ops['cmd'])
+                    print("{}_cpld_device failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
             else:
                 # in case of 'show_attr' functions
-                parse_str+=ret
+                parse_str += ret
 
         return parse_str
 
-
-
-
-    def sysstatus_parse(self, dev,ops):
+    def sysstatus_parse(self, dev, ops):
         parse_str = ""
         ret = getattr(self, ops['cmd']+"_sysstatus_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_sysstatus_device failed".format(ops['cmd'])
+                    print("{}_sysstatus_device failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
             else:
                 # in case of 'show_attr' functions
-                parse_str+=ret
+                parse_str += ret
 
-        return parse_str 
+        return parse_str
 
     def gpio_parse(self, dev, ops):
         parse_str = ""
         ret = getattr(self, ops['cmd']+"_gpio_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_temp_sensor_device failed".format(ops['cmd'])
+                    print("{}_temp_sensor_device failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
@@ -1089,15 +1054,14 @@ def gpio_parse(self, dev, ops):
 
         return parse_str
 
-
     def mux_parse(self, dev, ops):
         parse_str = ""
         ret = getattr(self, ops['cmd']+"_mux_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_mux_device() cmd failed".format(ops['cmd'])
+                    print("{}_mux_device() cmd failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
@@ -1105,10 +1069,10 @@ def mux_parse(self, dev, ops):
                 parse_str += ret
 
         for ch in dev['i2c']['channel']:
-            ret = self.dev_parse(self.data[ch['dev']], ops)	
-            if not ret is None:
+            ret = self.dev_parse(self.data[ch['dev']], ops)
+            if ret is not None:
                 if str(ret).isdigit():
-                    if ret!=0:
+                    if ret != 0:
                         # in case if 'create' functions
                         return ret
                     else:
@@ -1120,10 +1084,10 @@ def mux_parse(self, dev, ops):
     def mux_parse_reverse(self, dev, ops):
         parse_str = ""
         for ch in reversed(dev['i2c']['channel']):
-            ret = self.dev_parse(self.data[ch['dev']], ops)	
-            if not ret is None:
+            ret = self.dev_parse(self.data[ch['dev']], ops)
+            if ret is not None:
                 if str(ret).isdigit():
-                    if ret!=0:
+                    if ret != 0:
                         # in case if 'create' functions
                         return ret
                     else:
@@ -1132,11 +1096,11 @@ def mux_parse_reverse(self, dev, ops):
                     parse_str += ret
 
         ret = getattr(self, ops['cmd']+"_mux_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_mux_device() cmd failed".format(ops['cmd'])
+                    print("{}_mux_device() cmd failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
@@ -1145,15 +1109,14 @@ def mux_parse_reverse(self, dev, ops):
 
         return parse_str
 
-
     def eeprom_parse(self, dev, ops):
         parse_str = ""
         ret = getattr(self, ops['cmd']+"_eeprom_device")(dev, ops)
-        if not ret is None:
+        if ret is not None:
             if str(ret).isdigit():
-                if ret!=0:
+                if ret != 0:
                     # in case if 'create' functions
-                    print "{}_eeprom_device() cmd failed".format(ops['cmd'])
+                    print("{}_eeprom_device() cmd failed".format(ops['cmd']))
                     return ret
                 else:
                     pass
@@ -1163,20 +1126,20 @@ def eeprom_parse(self, dev, ops):
         return parse_str
 
     def optic_parse(self, dev, ops):
-        parse_str=""
-        ret=""
+        parse_str = ""
+        ret = ""
         for ifce in dev['i2c']['interface']:
-            ret=getattr(self, ops['cmd']+"_xcvr_device")(self.data[ifce['dev']], ops )
-            if not ret is None:
+            ret = getattr(self, ops['cmd']+"_xcvr_device")(self.data[ifce['dev']], ops)
+            if ret is not None:
                 if str(ret).isdigit():
-                    if ret!=0:
+                    if ret != 0:
                         # in case if 'create' functions
-                        print "{}_eeprom_device() cmd failed".format(ops['cmd'])
+                        print("{}_eeprom_device() cmd failed".format(ops['cmd']))
                         return ret
                     else:
                         pass
                 else:
-                    parse_str+=ret
+                    parse_str += ret
         return parse_str
 
     def cpu_parse(self, bus, ops):
@@ -1184,10 +1147,10 @@ def cpu_parse(self, bus, ops):
         for dev in bus['i2c']['CONTROLLERS']:
             dev1 = self.data[dev['dev']]
             for d in dev1['i2c']['DEVICES']:
-                ret=self.dev_parse(self.data[d['dev']], ops)
-                if not ret is None:
+                ret = self.dev_parse(self.data[d['dev']], ops)
+                if ret is not None:
                     if str(ret).isdigit():
-                        if ret!=0:
+                        if ret != 0:
                             # in case if 'create' functions
                             return ret
                         else:
@@ -1201,10 +1164,10 @@ def cpu_parse_reverse(self, bus, ops):
         for dev in reversed(bus['i2c']['CONTROLLERS']):
             dev1 = self.data[dev['dev']]
             for d in dev1['i2c']['DEVICES']:
-                ret=self.dev_parse(self.data[d['dev']], ops)
-                if not ret is None:
+                ret = self.dev_parse(self.data[d['dev']], ops)
+                if ret is not None:
                     if str(ret).isdigit():
-                        if ret!=0:
+                        if ret != 0:
                             # in case if 'create' functions
                             return ret
                         else:
@@ -1213,68 +1176,67 @@ def cpu_parse_reverse(self, bus, ops):
                         parse_str += ret
         return parse_str
 
-
     def dev_parse(self, dev, ops):
-            attr=dev['dev_info']
-            if attr['device_type'] == 'CPU':
-                if ops['cmd']=='delete':
-                    return self.cpu_parse_reverse(dev, ops)
-                else:
-                    return self.cpu_parse(dev, ops)
-        
-            if attr['device_type'] == 'EEPROM':
-                return self.eeprom_parse(dev, ops)
-
-            if attr['device_type'] == 'MUX':
-                if ops['cmd']=='delete':
-                    return self.mux_parse_reverse(dev, ops)
-                else:
-                    return self.mux_parse(dev, ops)
+        attr = dev['dev_info']
+        if attr['device_type'] == 'CPU':
+            if ops['cmd'] == 'delete':
+                return self.cpu_parse_reverse(dev, ops)
+            else:
+                return self.cpu_parse(dev, ops)
 
-            if attr['device_type'] == 'GPIO':
-                return self.gpio_parse(dev, ops)
+        if attr['device_type'] == 'EEPROM':
+            return self.eeprom_parse(dev, ops)
 
-            if attr['device_type'] == 'PSU':
-                    return self.psu_parse(dev, ops)
+        if attr['device_type'] == 'MUX':
+            if ops['cmd'] == 'delete':
+                return self.mux_parse_reverse(dev, ops)
+            else:
+                return self.mux_parse(dev, ops)
+
+        if attr['device_type'] == 'GPIO':
+            return self.gpio_parse(dev, ops)
 
-            if attr['device_type'] == 'FAN':
-                    return self.fan_parse(dev, ops)
+        if attr['device_type'] == 'PSU':
+            return self.psu_parse(dev, ops)
 
-            if attr['device_type'] == 'TEMP_SENSOR':
-                    return self.temp_sensor_parse(dev, ops)
+        if attr['device_type'] == 'FAN':
+            return self.fan_parse(dev, ops)
 
-            if attr['device_type'] == 'SFP' or attr['device_type'] == 'QSFP' or \
-                    attr['device_type'] == 'SFP28' or attr['device_type'] == 'QSFP28' or \
-                    attr['device_type'] == 'QSFP-DD':
-                    return self.optic_parse(dev, ops)
+        if attr['device_type'] == 'TEMP_SENSOR':
+            return self.temp_sensor_parse(dev, ops)
 
-            if attr['device_type'] == 'CPLD':
-                    return self.cpld_parse(dev, ops)
+        if attr['device_type'] == 'SFP' or attr['device_type'] == 'QSFP' or \
+                attr['device_type'] == 'SFP28' or attr['device_type'] == 'QSFP28' or \
+                attr['device_type'] == 'QSFP-DD':
+            return self.optic_parse(dev, ops)
 
-            if attr['device_type'] == 'SYSSTAT':
-                    return self.sysstatus_parse(dev,ops)
+        if attr['device_type'] == 'CPLD':
+            return self.cpld_parse(dev, ops)
+
+        if attr['device_type'] == 'SYSSTAT':
+            return self.sysstatus_parse(dev, ops)
 
     def is_supported_sysled_state(self, sysled_name, sysled_state):
-            if not sysled_name in self.data.keys():
-                return False, "[FAILED] " + sysled_name + " is not configured"
-            for attr in self.data[sysled_name]['i2c']['attr_list']:
-                if attr['attr_name'] == sysled_state:
-                    return True, "supported"
-            return False,  "[FAILED]: Invalid color"
+        if sysled_name not in self.data.keys():
+            return False, "[FAILED] " + sysled_name + " is not configured"
+        for attr in self.data[sysled_name]['i2c']['attr_list']:
+            if attr['attr_name'] == sysled_state:
+                return True, "supported"
+        return False,  "[FAILED]: Invalid color"
 
     def create_attr(self, key, value, path):
-            cmd = "echo '%s' > /sys/kernel/%s/%s"%(value,  path, key)
-            self.runcmd(cmd)
+        cmd = "echo '%s' > /sys/kernel/%s/%s" % (value,  path, key)
+        self.runcmd(cmd)
 
     def create_led_platform_device(self, key, ops):
-        if ops['attr']=='all' or ops['attr']=='PLATFORM':
-            path='pddf/devices/platform'
+        if ops['attr'] == 'all' or ops['attr'] == 'PLATFORM':
+            path = 'pddf/devices/platform'
             self.create_attr('num_psus', self.data['PLATFORM']['num_psus'], path)
             self.create_attr('num_fantrays', self.data['PLATFORM']['num_fantrays'], path)
 
     def create_led_device(self, key, ops):
-        if ops['attr']=='all' or ops['attr']==self.data[key]['dev_info']['device_name']:
-            path="pddf/devices/led"
+        if ops['attr'] == 'all' or ops['attr'] == self.data[key]['dev_info']['device_name']:
+            path = "pddf/devices/led"
             for attr in self.data[key]['i2c']['attr_list']:
                 self.create_attr('device_name', self.data[key]['dev_info']['device_name'], path)
                 self.create_device(self.data[key]['dev_attr'], path, ops)
@@ -1283,111 +1245,107 @@ def create_led_device(self, key, ops):
                         self.create_attr(attr_key, attr[attr_key], path)
                     elif (attr_key != 'attr_name' and attr_key != 'descr' and attr_key != 'attr_devtype' and
                             attr_key != 'attr_devname'):
-                        state_path=path+'/state_attr'
-                        self.create_attr(attr_key, attr[attr_key],state_path)
-                cmd="echo '" +  attr['attr_name']+"' > /sys/kernel/pddf/devices/led/dev_ops"
+                        state_path = path+'/state_attr'
+                        self.create_attr(attr_key, attr[attr_key], state_path)
+                cmd = "echo '" + attr['attr_name']+"' > /sys/kernel/pddf/devices/led/dev_ops"
                 self.runcmd(cmd)
 
-
     def led_parse(self, ops):
-            getattr(self, ops['cmd']+"_led_platform_device")("PLATFORM", ops)
-            for key in self.data.keys():
-                    if key != 'PLATFORM' and 'dev_info' in self.data[key]:
-                            attr=self.data[key]['dev_info']
-                            if attr['device_type'] == 'LED':
-                                    getattr(self, ops['cmd']+"_led_device")(key, ops)
-
+        getattr(self, ops['cmd']+"_led_platform_device")("PLATFORM", ops)
+        for key in self.data.keys():
+            if key != 'PLATFORM' and 'dev_info' in self.data[key]:
+                attr = self.data[key]['dev_info']
+                if attr['device_type'] == 'LED':
+                    getattr(self, ops['cmd']+"_led_device")(key, ops)
 
     def get_device_list(self, list, type):
-            for key in self.data.keys():
-                    if key != 'PLATFORM' and 'dev_info' in self.data[key]:
-                            attr=self.data[key]['dev_info']
-                            if attr['device_type'] == type:
-                                    list.append(self.data[key])
-
+        for key in self.data.keys():
+            if key != 'PLATFORM' and 'dev_info' in self.data[key]:
+                attr = self.data[key]['dev_info']
+                if attr['device_type'] == type:
+                    list.append(self.data[key])
 
     def create_pddf_devices(self):
-        self.led_parse({ "cmd": "create", "target":"all", "attr":"all" })
+        self.led_parse({"cmd": "create", "target": "all", "attr": "all"})
         create_ret = 0
-        create_ret = self.dev_parse(self.data['SYSTEM'], { "cmd": "create", "target":"all", "attr":"all" } )
-        if create_ret!=0:
+        create_ret = self.dev_parse(self.data['SYSTEM'], {"cmd": "create", "target": "all", "attr": "all"})
+        if create_ret != 0:
             return create_ret
         if 'SYSSTATUS' in self.data:
-            create_ret = self.dev_parse(self.data['SYSSTATUS'], { "cmd": "create", "target":"all", "attr":"all" } )
-            if create_ret!=0:
+            create_ret = self.dev_parse(self.data['SYSSTATUS'], {"cmd": "create", "target": "all", "attr": "all"})
+            if create_ret != 0:
                 return create_ret
-        
+
     def delete_pddf_devices(self):
-        self.dev_parse(self.data['SYSTEM'], { "cmd": "delete", "target":"all", "attr":"all" } )
+        self.dev_parse(self.data['SYSTEM'], {"cmd": "delete", "target": "all", "attr": "all"})
         if 'SYSSTATUS' in self.data:
-            self.dev_parse(self.data['SYSSTATUS'], { "cmd": "delete", "target":"all", "attr":"all" } )
+            self.dev_parse(self.data['SYSSTATUS'], {"cmd": "delete", "target": "all", "attr": "all"})
 
     def populate_pddf_sysfsobj(self):
-        self.dev_parse(self.data['SYSTEM'], { "cmd": "show", "target":"all", "attr":"all" } )
+        self.dev_parse(self.data['SYSTEM'], {"cmd": "show", "target": "all", "attr": "all"})
         if 'SYSSTATUS' in self.data:
-            self.dev_parse(self.data['SYSSTATUS'], { "cmd": "show", "target":"all", "attr":"all" } )
-        self.led_parse({ "cmd": "show", "target":"all", "attr":"all" })
+            self.dev_parse(self.data['SYSSTATUS'], {"cmd": "show", "target": "all", "attr": "all"})
+        self.led_parse({"cmd": "show", "target": "all", "attr": "all"})
         self.show_client_device()
 
     def cli_dump_dsysfs(self, component):
-        self.dev_parse(self.data['SYSTEM'], { "cmd": "show_attr", "target":"all", "attr":"all" } )
+        self.dev_parse(self.data['SYSTEM'], {"cmd": "show_attr", "target": "all", "attr": "all"})
         if 'SYSSTATUS' in self.data:
-            self.dev_parse(self.data['SYSSTATUS'], { "cmd": "show_attr", "target":"all", "attr":"all" } )
+            self.dev_parse(self.data['SYSSTATUS'], {"cmd": "show_attr", "target": "all", "attr": "all"})
         if component in self.data_sysfs_obj:
             return self.data_sysfs_obj[component]
         else:
-            return None 
-
+            return None
 
     def validate_pddf_devices(self, *args):
-        self.populate_pddf_sysfsobj() 
-        v_ops = { 'cmd': 'validate', 'target':'all', 'attr':'all' }
-        self.dev_parse(self.data['SYSTEM'], v_ops )
+        self.populate_pddf_sysfsobj()
+        v_ops = {'cmd': 'validate', 'target': 'all', 'attr': 'all'}
+        self.dev_parse(self.data['SYSTEM'], v_ops)
 
     ###################################################################################################################
-    #   BMC APIs 
+    #   BMC APIs
     ###################################################################################################################
     def populate_bmc_cache_db(self, bmc_attr):
         bmc_cmd = str(bmc_attr['bmc_cmd']).strip()
 
         o_list = subprocess.check_output(bmc_cmd, shell=True).strip().split('\n')
-        bmc_cache[bmc_cmd]={}
-        bmc_cache[bmc_cmd]['time']=time.time()
+        bmc_cache[bmc_cmd] = {}
+        bmc_cache[bmc_cmd]['time'] = time.time()
         for entry in o_list:
             name = entry.split()[0]
-            bmc_cache[bmc_cmd][name]=entry
+            bmc_cache[bmc_cmd][name] = entry
 
     def non_raw_ipmi_get_request(self, bmc_attr):
-        bmc_db_update_time=1
+        bmc_db_update_time = 1
         value = 'N/A'
         bmc_cmd = str(bmc_attr['bmc_cmd']).strip()
         field_name = str(bmc_attr['field_name']).strip()
-        field_pos= int(bmc_attr['field_pos'])-1
+        field_pos = int(bmc_attr['field_pos'])-1
 
-        if not bmc_cmd in bmc_cache:
-           self.populate_bmc_cache_db(bmc_attr)
+        if bmc_cmd not in bmc_cache:
+            self.populate_bmc_cache_db(bmc_attr)
         else:
-           now = time.time()
-           if (int(now - bmc_cache[bmc_cmd]['time']) > bmc_db_update_time):
-               self.populate_bmc_cache_db(bmc_attr)
+            now = time.time()
+            if (int(now - bmc_cache[bmc_cmd]['time']) > bmc_db_update_time):
+                self.populate_bmc_cache_db(bmc_attr)
 
         try:
-           data=bmc_cache[bmc_cmd][field_name]
-           value = data.split()[field_pos]
+            data = bmc_cache[bmc_cmd][field_name]
+            value = data.split()[field_pos]
         except Exception as e:
-           pass
+            pass
 
         if 'mult' in bmc_attr.keys() and not value.isalpha():
             if value.isalpha():
                 value = 0.0
             value = float(value) * float(bmc_attr['mult'])
-    
+
         return str(value)
 
     def raw_ipmi_get_request(self, bmc_attr):
         value = 'N/A'
-	cmd = bmc_attr['bmc_cmd'] + " 2>/dev/null"
-	if bmc_attr['type'] == 'raw':
+        cmd = bmc_attr['bmc_cmd'] + " 2>/dev/null"
+        if bmc_attr['type'] == 'raw':
             try:
                 value = subprocess.check_output(cmd, shell=True).strip()
             except Exception as e:
@@ -1397,7 +1355,7 @@ def raw_ipmi_get_request(self, bmc_attr):
                 value = str(int(value, 16))
             return value
 
-	if bmc_attr['type'] == 'mask':
+        if bmc_attr['type'] == 'mask':
             mask = int(bmc_attr['mask'].encode('utf-8'), 16)
             try:
                 value = subprocess.check_output(cmd, shell=True).strip()
@@ -1406,10 +1364,10 @@ def raw_ipmi_get_request(self, bmc_attr):
 
             if value != 'N/A':
                 value = str(int(value, 16) & mask)
-           
+
             return value
 
-	if bmc_attr['type'] == 'ascii':
+        if bmc_attr['type'] == 'ascii':
             try:
                 value = subprocess.check_output(cmd, shell=True)
             except Exception as e:
@@ -1417,19 +1375,19 @@ def raw_ipmi_get_request(self, bmc_attr):
 
             if value != 'N/A':
                 tmp = ''.join(chr(int(i, 16)) for i in value.split())
-                tmp = "".join(i for i in unicode(tmp) if unicodedata.category(i)[0]!="C")
+                tmp = "".join(i for i in str(tmp) if unicodedata.category(i)[0] != "C")
                 value = str(tmp)
 
             return (value)
 
-	return value
+        return value
 
-    def bmc_get_cmd(self, bmc_attr): 
-        if int(bmc_attr['raw']) == 1: 
+    def bmc_get_cmd(self, bmc_attr):
+        if int(bmc_attr['raw']) == 1:
             value = self.raw_ipmi_get_request(bmc_attr)
-	else:		
+        else:
             value = self.non_raw_ipmi_get_request(bmc_attr)
-	return (value)
+        return (value)
 
     def non_raw_ipmi_set_request(self, bmc_attr, val):
         value = 'N/A'
@@ -1439,14 +1397,14 @@ def non_raw_ipmi_set_request(self, bmc_attr, val):
     def raw_ipmi_set_request(self, bmc_attr, val):
         value = 'N/A'
         # TODO: Implement this
-	return value
+        return value
 
-    def bmc_set_cmd(self, bmc_attr, val): 
-        if int(bmc_attr['raw']) == 1: 
+    def bmc_set_cmd(self, bmc_attr, val):
+        if int(bmc_attr['raw']) == 1:
             value = self.raw_ipmi_set_request(bmc_attr, val)
-	else:		
+        else:
             value = self.non_raw_ipmi_set_request(bmc_attr, val)
-	return (value)
+        return (value)
 
     # bmc-based attr: return attr obj
     # non-bmc-based attr: return empty obj
@@ -1459,43 +1417,43 @@ def check_bmc_based_attr(self, device_name, attr_name):
                         return attr
                 # Required attr_name is not supported in BMC object
                 return {}
-	return None
+        return None
 
     def get_attr_name_output(self, device_name, attr_name):
-	bmc_attr = self.check_bmc_based_attr(device_name, attr_name)
-        output={"mode":"", "status":""}	
-	   
+        bmc_attr = self.check_bmc_based_attr(device_name, attr_name)
+        output = {"mode": "", "status": ""}
+
         if bmc_attr is not None:
-           if bmc_attr=={}:
-               return {}
-           output['mode']="bmc"
-           output['status']=self.bmc_get_cmd(bmc_attr)
+            if bmc_attr == {}:
+                return {}
+            output['mode'] = "bmc"
+            output['status'] = self.bmc_get_cmd(bmc_attr)
         else:
-           output['mode']="i2c"
-           node = self.get_path(device_name, attr_name)
-           if node is None:
-              return {} 
-           try:
-              with open(node, 'r') as f:
-                 output['status'] = f.read()
-           except IOError:
-              return {} 
+            output['mode'] = "i2c"
+            node = self.get_path(device_name, attr_name)
+            if node is None:
+                return {}
+            try:
+                with open(node, 'r') as f:
+                    output['status'] = f.read()
+            except IOError:
+                return {}
         return output
 
     def set_attr_name_output(self, device_name, attr_name, val):
-	bmc_attr = self.check_bmc_based_attr(device_name, attr_name)
-        output={"mode":"", "status":""}	
-	   
+        bmc_attr = self.check_bmc_based_attr(device_name, attr_name)
+        output = {"mode": "", "status": ""}
+
         if bmc_attr is not None:
-            if bmc_attr=={}:
-               return {}
-            output['mode']="bmc"
-            output['status']=False  # No set operation allowed for BMC attributes as they are handled by BMC itself
+            if bmc_attr == {}:
+                return {}
+            output['mode'] = "bmc"
+            output['status'] = False  # No set operation allowed for BMC attributes as they are handled by BMC itself
         else:
-            output['mode']="i2c"
+            output['mode'] = "i2c"
             node = self.get_path(device_name, attr_name)
             if node is None:
-                return {} 
+                return {}
             try:
                 with open(node, 'w') as f:
                     f.write(str(val))
@@ -1505,4 +1463,3 @@ def set_attr_name_output(self, device_name, attr_name, val):
             output['status'] = True
 
         return output
-
diff --git a/slave.mk b/slave.mk
index 86bf063b31cd..54470e27dc34 100644
--- a/slave.mk
+++ b/slave.mk
@@ -867,6 +867,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2)) \
         $(if $(findstring y,$(PDDF_SUPPORT)),$(addprefix $(PYTHON_WHEELS_PATH)/,$(PDDF_PLATFORM_API_BASE_PY2))) \
+        $(if $(findstring y,$(PDDF_SUPPORT)),$(addprefix $(PYTHON_WHEELS_PATH)/,$(PDDF_PLATFORM_API_BASE_PY3))) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CTRMGRD)) \
         $(addprefix $(FILES_PATH)/,$($(SONIC_CTRMGRD)_FILES)) \

From d7be5a021acbf1fb822a865ea720a92583c9a2e7 Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Fri, 22 Jan 2021 09:42:19 -0800
Subject: [PATCH 0197/1674] [Multi Asic] support of swss.rec and sairedis.rec
 for multi asic (#6310)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan arlakshm@microsoft.com

- Why I did it
This PR has the changes to support having different swss.rec and sairedis.rec for each asic.
The logrotate script is updated as well

- How I did it

Update the orchagent.sh script to use the logfile name options in these PRs(Azure/sonic-swss#1546 and Azure/sonic-sairedis#747)
In multi asic platforms the record files will be different for each asic, with the format swss.asic{x}.rec and sairedis.asic{x}.rec

Update the logrotate script for multiasic platform .
---
 dockers/docker-orchagent/orchagent.sh         |  5 +++++
 .../logrotate/logrotate.d/rsyslog             | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
index 45715dc61f9c..aaa047a42036 100755
--- a/dockers/docker-orchagent/orchagent.sh
+++ b/dockers/docker-orchagent/orchagent.sh
@@ -41,6 +41,11 @@ then
     ORCHAGENT_ARGS+="-i $asic_id "
 fi
 
+# for multi asic platforms add the asic name to the record file names
+if [[ "$NAMESPACE_ID" ]]; then
+    ORCHAGENT_ARGS+="-f swss.asic$NAMESPACE_ID.rec -j sairedis.asic$NAMESPACE_ID.rec "
+fi
+
 # Add platform specific arguments if necessary
 if [ "$platform" == "broadcom" ]; then
     ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
diff --git a/files/image_config/logrotate/logrotate.d/rsyslog b/files/image_config/logrotate/logrotate.d/rsyslog
index 792e3e9a2d57..cbf6e722eb90 100644
--- a/files/image_config/logrotate/logrotate.d/rsyslog
+++ b/files/image_config/logrotate/logrotate.d/rsyslog
@@ -30,8 +30,8 @@
 /var/log/telemetry.log
 /var/log/frr/bgpd.log
 /var/log/frr/zebra.log
-/var/log/swss/sairedis.rec
-/var/log/swss/swss.rec
+/var/log/swss/sairedis*.rec
+/var/log/swss/swss*.rec
 {
     size 1M
     rotate 5000
@@ -85,7 +85,22 @@
     endscript
     postrotate
         if [ $(echo $1 | grep -c "/var/log/swss/") -gt 0 ]; then
-            pgrep -x orchagent | xargs /bin/kill -HUP 2>/dev/null || true
+            # for multi asic platforms, there are multiple orchagents
+            # send the SIGHUP only to the orchagent the which needs log file rotation
+            PLATFORM=`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`
+            ASIC_CONF=/usr/share/sonic/device/$PLATFORM/asic.conf
+            if [ -f "$ASIC_CONF" ]; then
+                . $ASIC_CONF
+            fi
+            if [ $NUM_ASIC -gt 1 ]; then
+                log_file=$1
+                log_file_name=${log_file#/var/log/swss/}
+                logger -p syslog.info -t "logrotate" "Sending SIGHUP to OA log_file_name: $log_file_name"
+                pgrep -xa orchagent | grep $log_file_name | awk '{ print $1; }' | xargs /bin/kill -HUP 2>/dev/null || true
+            else
+                logger -p syslog.info -t "logrotate" "Sending SIGHUP to OA log_file_name: $1"
+                pgrep -x orchagent | xargs /bin/kill -HUP 2>/dev/null || true
+            fi
         else
             /bin/kill -HUP $(cat /var/run/rsyslogd.pid)
         fi

From 97e6b4d15ca5a659ac9fd814795e941697325e86 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 17 Feb 2021 00:53:40 +0800
Subject: [PATCH 0198/1674] Support shared headroom pool for Microsoft SKUs
 (#6366)

- Why I did it
Support shared headroom pool

Signed-off-by: Stephen Sun stephens@nvidia.com

- How I did it
Port configurations for SKUs based on 2700/3800 platform from 201911
For SN3800 platform:
C64: 32 100G down links and 32 100G up links.
D112C8: 112 50G down links and 8 100G up links.
D24C52: 24 50G down links, 20 100G down links, and 32 100G up links.
D28C50: 28 50G down links, 18 100G down links, and 32 100G up links.
For SN2700 platform:
D48C8: 48 50G down links and 8 100G up links
C32: 16 100G downlinks and 16 100G uplinks
Add configuration for Mellanox-SN4600C-D112C8
112 50G down links and 8 100G up links.

- How to verify it
Run regression test.
---
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../pg_profile_lookup.ini                     | 30 +++++++++----------
 .../Mellanox-SN2700/buffers_defaults_t0.j2    |  6 ++--
 .../Mellanox-SN2700/buffers_defaults_t1.j2    |  6 ++--
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../pg_profile_lookup.ini                     | 30 +++++++++----------
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../buffers_defaults_t0.j2                    | 10 ++++---
 .../buffers_defaults_t1.j2                    | 10 ++++---
 .../pg_profile_lookup.ini                     | 30 +++++++++----------
 17 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
index 0ad78e08c6b5..6fc5efcf9b88 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '6687744' %}
+{% set ingress_lossless_pool_size =  '7719936' %}
+{% set ingress_lossless_pool_xoff =  '1032192' %}
 {% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '6687744' %}
+{% set egress_lossy_pool_size =  '7719936' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
index 82f6a15b33c8..95d35539253e 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '8506368' %}
+{% set ingress_lossless_pool_size =  '9686016' %}
+{% set ingress_lossless_pool_xoff =  '1179648' %}
 {% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '8506368' %}
+{% set egress_lossy_pool_size =  '9686016' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
index 15c12c1637e6..cdd674e4e715 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 #  PG lossless profiles.
 # speed cable  size   xon    xoff  threshold
-  10000    5m 41984  19456  22528          0
-  25000    5m 41984  19456  22528          0
-  40000    5m 41984  19456  22528          0
-  50000    5m 41984  19456  22528          0
- 100000    5m 43008  19456  23552          0
-  10000   40m 41984  19456  22528          0
-  25000   40m 44032  19456  24576          0
-  40000   40m 45056  19456  25600          0
-  50000   40m 45056  19456  25600          0
- 100000   40m 49152  19456  29696          0
-  10000  300m 47104  19456  27648          0
-  25000  300m 56320  19456  36864          0
-  40000  300m 64512  19456  45056          0
-  50000  300m 69632  19456  50176          0
- 100000  300m 98304  19456  78848          0
+  10000    5m 19456  19456  22528          0
+  25000    5m 19456  19456  22528          0
+  40000    5m 19456  19456  22528          0
+  50000    5m 19456  19456  22528          0
+ 100000    5m 19456  19456  23552          0
+  10000   40m 19456  19456  22528          0
+  25000   40m 19456  19456  24576          0
+  40000   40m 19456  19456  25600          0
+  50000   40m 19456  19456  25600          0
+ 100000   40m 19456  19456  29696          0
+  10000  300m 19456  19456  27648          0
+  25000  300m 19456  19456  36864          0
+  40000  300m 19456  19456  45056          0
+  50000  300m 19456  19456  50176          0
+ 100000  300m 19456  19456  78848          0
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
index 41afd1f22444..d2bf72b15f7c 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '9489408' %}
+{% set ingress_lossless_pool_size =  '10177536' %}
+{% set ingress_lossless_pool_xoff =  '688128' %}
 {% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '9489408' %}
+{% set egress_lossy_pool_size =  '10177536' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
index 08e21ba05f75..c4422556d87a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '7719936' %}
+{% set ingress_lossless_pool_size =  '9292800' %}
+{% set ingress_lossless_pool_xoff =  '1572864' %}
 {% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '7719936' %}
+{% set egress_lossy_pool_size =  '9292800' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
index 2bc09d9ccc83..a59beaeeb698 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '23343104' %}
+{% set ingress_lossless_pool_size =  '25866240' %}
+{% set ingress_lossless_pool_xoff =  '2523136' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '23343104' %}
+{% set egress_lossy_pool_size =  '25866240' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
index 531f1587ba7a..d610abeb4f26 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '19410944' %}
+{% set ingress_lossless_pool_size =  '23900160' %}
+{% set ingress_lossless_pool_xoff =  '4489216' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '19410944' %}
+{% set egress_lossy_pool_size =  '23900160' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
index 26e89cf269ff..63e5d5f3a85a 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '16576512' %}
+{% set ingress_lossless_pool_size =  '20017152' %}
+{% set ingress_lossless_pool_xoff =  '3440640' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '16576512' %}
+{% set egress_lossy_pool_size =  '20017152' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
index 31fd4c7692dd..d1ccce62bb14 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '14790656' %}
+{% set ingress_lossless_pool_size =  '19124224' %}
+{% set ingress_lossless_pool_xoff =  '4333568' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '14790656' %}
+{% set egress_lossy_pool_size =  '19124224' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
index ea772d0823a1..810d7e77e61f 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 #  PG lossless profiles.
 # speed cable  size   xon    xoff   threshold
-  10000    5m 45056  19456  25600          0
-  25000    5m 48128  19456  28672          0
-  40000    5m 50176  19456  30720          0
-  50000    5m 52224  19456  32768          0
- 100000    5m 60416  19456  40960          0
-  10000   40m 46080  19456  26624          0
-  25000   40m 50176  19456  30720          0
-  40000   40m 53248  19456  33792          0
-  50000   40m 56320  19456  36864          0
- 100000   40m 67584  19456  48128          0
-  10000  300m 51200  19456  31744          0
-  25000  300m 63488  19456  44032          0
-  40000  300m 74752  19456  55296          0
-  50000  300m 82944  19456  63488          0
- 100000  300m 121856 19456  102400         0
+  10000    5m 19456  19456  25600          0
+  25000    5m 19456  19456  28672          0
+  40000    5m 19456  19456  30720          0
+  50000    5m 19456  19456  32768          0
+ 100000    5m 19456  19456  40960          0
+  10000   40m 19456  19456  26624          0
+  25000   40m 19456  19456  30720          0
+  40000   40m 19456  19456  33792          0
+  50000   40m 19456  19456  36864          0
+ 100000   40m 19456  19456  48128          0
+  10000  300m 19456  19456  31744          0
+  25000  300m 19456  19456  44032          0
+  40000  300m 19456  19456  55296          0
+  50000  300m 19456  19456  63488          0
+ 100000  300m 19456  19456  102400         0
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
index edccf5e652bc..0ff424a30a57 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '21819392' %}
+{% set ingress_lossless_pool_size =  '24576000' %}
+{% set ingress_lossless_pool_xoff =  '2756608' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '21819392' %}
+{% set egress_lossy_pool_size =  '24576000' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
index 90f626db6a52..49adf1331c1c 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '17862656' %}
+{% set ingress_lossless_pool_size =  '22597632' %}
+{% set ingress_lossless_pool_xoff =  '4734976' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '17862656' %}
+{% set egress_lossy_pool_size =  '22597632' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
index e732ff1a3d65..c64f1c548631 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '21565440' %}
+{% set ingress_lossless_pool_size =  '24360960' %}
+{% set ingress_lossless_pool_xoff =  '2795520' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '21565440' %}
+{% set egress_lossy_pool_size =  '24360960' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
index a6556db59587..bbb51cc778b2 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '17604608' %}
+{% set ingress_lossless_pool_size =  '22380544' %}
+{% set ingress_lossless_pool_xoff =  '4775936' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '17604608' %}
+{% set egress_lossy_pool_size =  '22380544' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
index 33df493e117e..aa74c4645678 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '56369152' %}
+{% set ingress_lossless_pool_size =  '47587328' %}
+{% set ingress_lossless_xoff_size = '2400256' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '56369152' %}
+{% set egress_lossy_pool_size =  '47587328' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -39,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -50,7 +52,7 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
+            "size":"9216",
             "dynamic_th":"7"
         },
         "q_lossy_profile": {
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
index 7b6e6fdf3883..1cc727f8c85e 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
@@ -1,7 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '55115776' %}
+{% set ingress_lossless_pool_size =  '46702592' %}
+{% set ingress_lossless_xoff_size =  '3284992' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '55115776' %}
+{% set egress_lossy_pool_size =  '46702592' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -15,6 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -39,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -50,7 +52,7 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
+            "size":"9216",
             "dynamic_th":"7"
         },
         "q_lossy_profile": {
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
index ab397d98de54..4931d4e1d7ae 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 #  PG lossless profiles.
 # speed cable  size   xon    xoff   threshold
-  10000    5m 44032  19456  24576          0
-  25000    5m 44032  19456  24576          0
-  40000    5m 44032  19456  24576          0
-  50000    5m 44032  19456  24576          0
- 100000    5m 45056  19456  25600          0
-  10000   40m 44032  19456  24576          0
-  25000   40m 46080  19456  26624          0
-  40000   40m 47104  19456  27648          0
-  50000   40m 48128  19456  28672          0
- 100000   40m 52224  19456  32768          0
-  10000  300m 50176  19456  30720          0
-  25000  300m 59392  19456  39936          0
-  40000  300m 68608  19456  49152          0
-  50000  300m 74752  19456  55296          0
- 100000  300m 105472 19456  86016          0
+  10000    5m 19456  19456  24576          0
+  25000    5m 19456  19456  24576          0
+  40000    5m 19456  19456  24576          0
+  50000    5m 19456  19456  24576          0
+ 100000    5m 19456  19456  25600          0
+  10000   40m 19456  19456  24576          0
+  25000   40m 19456  19456  26624          0
+  40000   40m 19456  19456  27648          0
+  50000   40m 19456  19456  28672          0
+ 100000   40m 19456  19456  32768          0
+  10000  300m 19456  19456  30720          0
+  25000  300m 19456  19456  39936          0
+  40000  300m 19456  19456  49152          0
+  50000  300m 19456  19456  55296          0
+ 100000  300m 19456  19456  86016          0

From 569686ed843407cc3201ab100eedd110f42e4bac Mon Sep 17 00:00:00 2001
From: Andriy Yurkiv <70649192+ayurkiv-nvda@users.noreply.github.com>
Date: Wed, 17 Feb 2021 20:04:48 +0200
Subject: [PATCH 0199/1674] Enable
 SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter by default (#6444)

Signed-off-by: Andriy Yurkiv <ayurkiv@nvidia.com>
---
 dockers/docker-orchagent/enable_counters.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
index 6c938230d210..5455f5923571 100755
--- a/dockers/docker-orchagent/enable_counters.py
+++ b/dockers/docker-orchagent/enable_counters.py
@@ -34,6 +34,7 @@ def enable_counters():
     enable_counter_group(db, 'QUEUE')
     enable_counter_group(db, 'PFCWD')
     enable_counter_group(db, 'PG_WATERMARK')
+    enable_counter_group(db, 'PG_DROP')
     enable_counter_group(db, 'QUEUE_WATERMARK')
     enable_counter_group(db, 'BUFFER_POOL_WATERMARK')
     enable_counter_group(db, 'PORT_BUFFER_DROP')

From b6aaeb979e1adb05d7ec59e1ee364e5406a7f704 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Thu, 4 Feb 2021 14:10:56 -0800
Subject: [PATCH 0200/1674] [multi_asic][vs]: Add dependency in teamd service
 to start after topology service(#6594)

[multi_asic][vs]: Add dependency in teamd service to start after topology service.
- Why I did it
In multi-asic VS, topology service is run after database service to set up the internal asic topology.
swss and syncd have a dependency to start after topology service is run so that the interfaces are moved to right namespace and created in the right namespace. In case of multi-asic vs, during the initial boot up, when there is no configuration added, teamd service starts and swss/syncd do not start as topology service does not start. Upon loading configuration using config_db or minigraph, swss and sycnd start up , but teamd is not restarted as swss is not stopped and started. This causes teamd to be in a bad state and requires a reload of config.

- How I did it
Add dependency in teamd service to start after topology service is completed.

- How to verify it
No change in single asic vs or platform.
No change in multi-asic regular image.
Change only in multi-asic VS. Bring up a multi-asic VS image without any configration, teamd service will fail to start due to dependency failure. Load minigraph, start topology service, load configuration, ensure all services come up.
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
---
 files/build_templates/per_namespace/teamd.service.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/files/build_templates/per_namespace/teamd.service.j2 b/files/build_templates/per_namespace/teamd.service.j2
index 322ffdc407ed..f5936baa6a79 100644
--- a/files/build_templates/per_namespace/teamd.service.j2
+++ b/files/build_templates/per_namespace/teamd.service.j2
@@ -1,6 +1,10 @@
 [Unit]
 Description=TEAMD container
 After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service
+{% if multi_instance == 'true' and sonic_asic_platform == 'vs' %}
+Requires=topology.service
+After=topology.service
+{% endif %}
 Requires=updategraph.service
 After=updategraph.service
 Before=ntp-config.service

From faf2fd3be13dd3936530577f1c5e882987b040da Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Mon, 22 Feb 2021 20:23:46 +0200
Subject: [PATCH 0201/1674] [BFN] Fix MTU for internal interface (#6783)

Set correct MTU size of internal interface for Newport platform
---
 .../configs/network/interfaces.d/eth2                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/configs/network/interfaces.d/eth2 b/platform/barefoot/sonic-platform-modules-bfn-newport/configs/network/interfaces.d/eth2
index 725bc89e0ebb..aded25af63b7 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/configs/network/interfaces.d/eth2
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/configs/network/interfaces.d/eth2
@@ -1,4 +1,4 @@
 # eth cpu port
 auto eth2
 iface eth2 inet
-up ifconfig eth2 promisc mtu 9000
+up ifconfig eth2 promisc mtu 9216

From 5661d20e2189456ae6164d1c7f1d359ddba6e2e7 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:25:14 -0500
Subject: [PATCH 0202/1674] [Nokia ixs7215] Platform API 2.0 improvements
 (#6787)

- Improve sonic-mgmt platform test suite pass rate
- Improve coverage of platform unit tests
- Provide platform specific reboot logic as per platform porting guide
- Fix bug due to pcie.yaml file being located in the wrong directory
---
 .../{plugins => }/pcie.yaml                   |   0
 .../platform_reboot                           |  11 ++
 .../7215/scripts/nokia-7215init.sh            |   2 +-
 .../7215/sonic_platform/__init__.py           |   2 +
 .../7215/sonic_platform/chassis.py            |  10 +-
 .../7215/sonic_platform/component.py          |  20 +-
 .../7215/sonic_platform/eeprom.py             | 183 +++++++++++-------
 .../7215/sonic_platform/fan.py                |  37 +++-
 .../7215/sonic_platform/fan_drawer.py         |  13 +-
 .../7215/sonic_platform/psu.py                |  57 +++---
 .../7215/sonic_platform/sfp.py                |  18 +-
 .../7215/sonic_platform/sfp_event.py          |   2 +-
 .../7215/sonic_platform/test/test-chassis.py  |   4 +
 .../sonic_platform/test/test-component.py     |   5 +
 .../7215/sonic_platform/test/test-eeprom.py   |  10 +-
 .../7215/sonic_platform/test/test-fan.py      |  23 ++-
 .../7215/sonic_platform/test/test-psu.py      |  29 ++-
 .../7215/sonic_platform/test/test-sfp.py      |   9 +-
 .../7215/sonic_platform/test/test-thermal.py  |  41 +++-
 19 files changed, 308 insertions(+), 168 deletions(-)
 rename device/nokia/armhf-nokia_ixs7215_52x-r0/{plugins => }/pcie.yaml (100%)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/platform_reboot

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml b/device/nokia/armhf-nokia_ixs7215_52x-r0/pcie.yaml
similarity index 100%
rename from device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/pcie.yaml
rename to device/nokia/armhf-nokia_ixs7215_52x-r0/pcie.yaml
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_reboot b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_reboot
new file mode 100644
index 000000000000..83fc5d8028f2
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_reboot
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+function SafePwrCycle() {
+    sync ; sync
+    umount -fa > /dev/null 2&>1
+
+    # Write CPLD register to initiate cold reboot
+    sudo i2cset -f -y 0 0x41 0x10 0x00
+}
+
+SafePwrCycle
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
index 4cad43348e06..3f23afe1fce2 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
@@ -51,7 +51,7 @@ chmod 644 /sys/class/i2c-adapter/i2c-0/0-0053/eeprom
 echo eeprom 0x55 > /sys/class/i2c-adapter/i2c-0/new_device
 echo eeprom 0x56 > /sys/class/i2c-adapter/i2c-0/new_device
 
-# Enumerate psu eeprom devices
+# Enumerate PSU eeprom devices
 echo eeprom 0x51 > /sys/class/i2c-adapter/i2c-1/new_device
 echo eeprom 0x52 > /sys/class/i2c-adapter/i2c-1/new_device
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py
index 139597f9cb07..39c712316dc6 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py
@@ -1,2 +1,4 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
 
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
index b3ada4c71f9c..a01aca24b684 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
@@ -159,6 +159,14 @@ def get_model(self):
         """
         return self._eeprom.part_number_str()
 
+    def get_service_tag(self):
+        """
+        Retrieves the Service Tag of the chassis
+        Returns:
+            string: Service Tag of chassis
+        """
+        return self._eeprom.service_tag_str()
+
     def get_status(self):
         """
         Retrieves the operational status of the chassis
@@ -367,7 +375,7 @@ def get_watchdog(self):
             sonic_logger.log_warning(" Fail to load watchdog {}".format(repr(e)))
 
         return self._watchdog
-    
+
     def get_position_in_parent(self):
         """
 		Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
index 6a5410458df7..1c219d7920a5 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
@@ -16,6 +16,7 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+smbus_present = 1
 try:
     import smbus
 except ImportError as e:
@@ -34,6 +35,7 @@ class Component(ComponentBase):
         ["System-CPLD", "Used for managing SFPs, LEDs, PSUs and FANs "],
         ["U-Boot", "Performs initialization during booting"],
     ]
+    CPLD_UPDATE_COMMAND = 'cp /usr/sbin/vme /tmp; cp {} /tmp; cd /tmp; ./vme {};'
 
     def __init__(self, component_index):
         self.index = component_index
@@ -55,12 +57,12 @@ def _get_command_result(self, cmdline):
     def _get_cpld_version(self, cpld_number):
 
         if smbus_present == 0:
-            cmdstatus, cpld_version = cmd.getstatusoutput('i2cget -y 0 0x41 0x2')
+            cmdstatus, cpld_version = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x2')
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
             DEVICE_REG = 0x2
-            cpld_version = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
+            cpld_version = str(bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG))
 
         return str(int(cpld_version, 16))
 
@@ -93,7 +95,7 @@ def get_firmware_version(self):
             return self._get_cpld_version(self.index)
 
         if self.index == 1:
-            cmdstatus, uboot_version = cmd.getstatusoutput('grep --null-data U-Boot /dev/mtd0ro|head -1 | cut -c 1-30')
+            cmdstatus, uboot_version = cmd.getstatusoutput('grep --null-data U-Boot /dev/mtd0ro|head -1 | cut -d" " -f2-4')
             return uboot_version
 
     def install_firmware(self, image_path):
@@ -114,6 +116,18 @@ def install_firmware(self, image_path):
             print("ERROR: the cpld image {} doesn't exist ".format(image_path))
             return False
 
+        cmdline = self.CPLD_UPDATE_COMMAND.format(image_path, image_name)
+
         success_flag = False
 
+        try:
+            subprocess.check_call(cmdline, stderr=subprocess.STDOUT, shell=True)
+            success_flag = True
+        except subprocess.CalledProcessError as e:
+            print("ERROR: Failed to upgrade CPLD: rc={}".format(e.returncode))
+
+        if success_flag:
+            print("INFO: Refresh or power cycle is required to finish CPLD installation")
+
         return success_flag
+
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
index cefcedaedf12..d0e3e00fffc2 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
@@ -1,5 +1,5 @@
 ########################################################################
-# Nokia IXR7220_D1
+# Nokia IXS7215
 #
 # Module contains platform specific implementation of SONiC Platform
 # Base API and provides the EEPROMs' information.
@@ -7,10 +7,9 @@
 # The different EEPROMs available are as follows:
 # - System EEPROM : Contains Serial number, Service tag, Base MA
 #                   address, etc. in ONIE TlvInfo EEPROM format.
-# - PSU EEPROM : Contains Serial number, Part number, Service Tag,
-#                PSU type, Revision.
-# - Fan EEPROM : Contains Serial number, Part number, Service Tag,
-#                Fan type, Number of Fans in Fantray, Revision.
+# - PSU EEPROM : Contains Model name and Part number.
+# - Fan EEPROM : Contains Part number, Serial number, Manufacture Date,
+#                and Service Tag.
 ########################################################################
 
 
@@ -23,15 +22,9 @@
 
 # PSU eeprom fields in format required by EepromDecoder
 psu_eeprom_format = [
-    ('PPID', 's', 20), ('DPN Rev', 's', 3), ('Service Tag', 's', 7),
-    ('Part Number', 's', 10), ('Part Num Revision', 's', 3),
-    ('Mfg Test', 's', 2), ('Redundant copy', 's', 83), ('PSU Type', 's', 1),
-    ('Fab Rev', 's', 2)
-    ]
-
-# Fan eeprom fields in format required by EepromDecoder
-fan_eeprom_format = [
-    ('Model', 's', 12), ('Serial Number', 's', 13)
+    ('Model', 's', 15), ('burn', 'x', 1),
+    ('Part Number', 's', 14), ('burn', 'x', 40),
+    ('Serial Number', 's', 11)
     ]
 
 
@@ -48,6 +41,7 @@ def __init__(self, is_psu=False, psu_index=0, is_fan=False, fan_index=0):
         if self.is_sys_eeprom:
             self.start_offset = 0
             self.eeprom_path = self.I2C_DIR + "i2c-0/0-0053/eeprom"
+
             # System EEPROM is in ONIE TlvInfo EEPROM format
             super(Eeprom, self).__init__(self.eeprom_path,
                                          self.start_offset, '', True)
@@ -55,18 +49,24 @@ def __init__(self, is_psu=False, psu_index=0, is_fan=False, fan_index=0):
         else:
             if self.is_psu_eeprom:
                 self.index = psu_index
-                self.start_offset = 6
+                self.start_offset = 18
                 self.eeprom_path = self.I2C_DIR \
-                    + "i2c-1/1-005{}/eeprom".format(2 - self.index)
+                    + "i2c-1/1-005{}/eeprom".format(self.index)
                 self.format = psu_eeprom_format
+
+                # Decode device eeprom as per specified format
+                EepromDecoder.__init__(self, self.eeprom_path, self.format,
+                                       self.start_offset, '', True)
             else:
                 self.index = fan_index
-                self.start_offset = 13
+                self.start_offset = 0
                 self.eeprom_path = self.I2C_DIR \
-                    + "i2c-4{0}/4{0}-0050/eeprom".format(self.index - 1)
-                self.format = fan_eeprom_format
-            EepromDecoder.__init__(self, self.eeprom_path, self.format,
-                                   self.start_offset, '', True)
+                    + "i2c-0/0-005{}/eeprom".format(self.index + 4)
+
+                # Fan EEPROM is in ONIE TlvInfo EEPROM format
+                super(Eeprom, self).__init__(self.eeprom_path,
+                                             self.start_offset, '', True)
+
             self._load_device_eeprom()
 
     def _load_system_eeprom(self):
@@ -83,24 +83,24 @@ def _load_system_eeprom(self):
             self.serial_number = 'NA'
             self.part_number = 'NA'
             self.model_str = 'NA'
-            self.serial = 'NA'
+            self.service_tag = 'NA'
             self.eeprom_tlv_dict = dict()
         else:
             eeprom = self.eeprom_data
-            self.eeprom_tlv_dict = dict()
-
             if not self.is_valid_tlvinfo_header(eeprom):
                 self.base_mac = 'NA'
                 self.serial_number = 'NA'
                 self.part_number = 'NA'
                 self.model_str = 'NA'
-                self.serial = 'NA'
+                self.service_tag = 'NA'
                 return
 
             total_length = (eeprom[9] << 8) | eeprom[10]
             tlv_index = self._TLV_INFO_HDR_LEN
             tlv_end = self._TLV_INFO_HDR_LEN + total_length
 
+            # Construct dictionary of eeprom TLV entries
+            self.eeprom_tlv_dict = dict()
             while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
                 if not self.is_valid_tlv(eeprom[tlv_index:]):
                     break
@@ -108,7 +108,7 @@ def _load_system_eeprom(self):
                 tlv = eeprom[tlv_index:tlv_index + 2
                              + eeprom[tlv_index + 1]]
                 code = "0x%02X" % (tlv[0])
-                    
+
                 name, value = self.decoder(None, tlv)
 
                 self.eeprom_tlv_dict[code] = value
@@ -118,56 +118,98 @@ def _load_system_eeprom(self):
                 tlv_index += eeprom[tlv_index+1] + 2
 
             self.base_mac = self.eeprom_tlv_dict.get(
-                                "0x%X" % (self._TLV_CODE_MAC_BASE), 'NA')
+                "0x%X" % (self._TLV_CODE_MAC_BASE), 'NA')
             self.serial_number = self.eeprom_tlv_dict.get(
-                                "0x%X" % (self._TLV_CODE_SERIAL_NUMBER), 'NA')
+                "0x%X" % (self._TLV_CODE_SERIAL_NUMBER), 'NA')
             self.part_number = self.eeprom_tlv_dict.get(
-                                "0x%X" % (self._TLV_CODE_PART_NUMBER), 'NA')
+                "0x%X" % (self._TLV_CODE_PART_NUMBER), 'NA')
             self.model_str = self.eeprom_tlv_dict.get(
-                                "0x%X" % (self._TLV_CODE_PRODUCT_NAME), 'NA')
-            self.serial = self.eeprom_tlv_dict.get(
-                                "0x%X" % (self._TLV_CODE_SERVICE_TAG), 'NA')
+                "0x%X" % (self._TLV_CODE_PRODUCT_NAME), 'NA')
+            self.service_tag = self.eeprom_tlv_dict.get(
+                "0x%X" % (self._TLV_CODE_SERVICE_TAG), 'NA')
 
     def _load_device_eeprom(self):
         """
-        Reads the Fan/PSU EEPROM and retrieves the serial number and
-        model number of the device.
+        Reads the Fan/PSU EEPROM and interprets as per the specified format
         """
-        try:
-            # Read Fan/PSU EEPROM as per the specified format.
-            self.eeprom_data = EepromDecoder.read_eeprom(self)
-        except Exception as e:
-            self.serial_number = 'NA'
-            self.part_number = 'NA'
-            self.model_str = 'NA'
-            self.serial = 'NA'
-        else:
+        self.serial_number = 'NA'
+        self.part_number = 'NA'
+        self.model_str = 'NA'
+        self.service_tag = 'NA'
+        self.mfg_date = 'NA'
+
+        # PSU device eeproms use proprietary format
+        if self.is_psu_eeprom:
+            try:
+                # Read Fan/PSU EEPROM as per the specified format.
+                self.eeprom_data = EepromDecoder.read_eeprom(self)
+            except Exception as e:
+                return
+
+            # Bail out if PSU eeprom unavailable
+            if self.eeprom_data[0] == 255:
+                return
+
             (valid, data) = self._get_eeprom_field("Model")
             if valid:
-                self.model_str = data
-            else:
-                self.model_str = 'NA'
+                self.model_str = data.decode()
 
-            (valid, data) = self._get_eeprom_field("Serial Number")
+            (valid, data) = self._get_eeprom_field("Part Number")
             if valid:
-                self.serial_number = data
-            else:
-                self.serial_number = 'NA'
+                self.part_number = data.decode()
 
-            if self.is_psu_eeprom:
-                (valid, data) = self._get_eeprom_field("PSU Type")
+            # Early PSU device eeproms were not programmed with serial #
+            try:
+                (valid, data) = self._get_eeprom_field("Serial Number")
                 if valid:
-                    self.psu_type = data
-                else:
-                    self.psu_type = 'NA'
-            else:
-                (valid, data) = self._get_eeprom_field("Fan Type")
-                if valid:
-                    self.fan_type = data
-                else:
-                    self.fan_type = 'NA'
+                    self.serial_number = data.decode()
+            except Exception as e:
+                return
+
+        # Fan device eeproms use ONIE TLV format
+        else:
+            try:
+                # Read Fan EEPROM as per ONIE TlvInfo EEPROM format.
+                self.eeprom_data = self.read_eeprom()
+            except Exception as e:
+                return
+
+            eeprom = self.eeprom_data
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            # Construct dictionary of eeprom TLV entries
+            self.eeprom_tlv_dict = dict()
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % (tlv[0])
+
+                name, value = self.decoder(None, tlv)
+
+                self.eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+            self.serial_number = self.eeprom_tlv_dict.get(
+                "0x%X" % (self._TLV_CODE_SERIAL_NUMBER), 'NA')
+            self.part_number = self.eeprom_tlv_dict.get(
+                "0x%X" % (self._TLV_CODE_PART_NUMBER), 'NA')
+            self.model_str = self.eeprom_tlv_dict.get(
+                "0x%X" % (self._TLV_CODE_PRODUCT_NAME), 'NA')
+            self.service_tag = self.eeprom_tlv_dict.get(
+                "0x%X" % (self._TLV_CODE_SERVICE_TAG), 'NA')
 
-    def _get_eeprom_field(self, field_name):
+    def _get_eeprom_field(self, field_name, decode=False):
         """
         For a field name specified in the EEPROM format, returns the
         presence of the field and the value for the same.
@@ -205,24 +247,23 @@ def airflow_fan_type(self):
         else:
             return int(self.fan_type.encode('hex'), 16)
 
-    # System EEPROM specific methods
-    def base_mac_addr(self):
-        """
-        Returns the base MAC address found in the system EEPROM.
-        """
-        return self.base_mac
-
     def modelstr(self):
         """
         Returns the Model name.
         """
         return self.model_str
 
-    def serial_str(self):
+    def base_mac_addr(self):
+        """
+        Returns the base MAC address found in the system EEPROM.
+        """
+        return self.base_mac
+
+    def service_tag_str(self):
         """
         Returns the servicetag number.
         """
-        return self.serial
+        return self.service_tag
 
     def system_eeprom_info(self):
         """
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
index 67610a125fad..14c00c763dde 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
@@ -1,5 +1,5 @@
 ########################################################################
-# Nokia 7215
+# Nokia IXS7215
 #
 # Module contains an implementation of SONiC Platform Base API and
 # provides the Fans' information which are available in the platform
@@ -9,7 +9,9 @@
 
 try:
     import os
+    import time
     from sonic_platform_base.fan_base import FanBase
+    from sonic_platform.eeprom import Eeprom
     from sonic_py_common import logger
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
@@ -41,6 +43,9 @@ def __init__(self, fan_index, fan_drawer, psu_fan=False, dependency=None):
             self.get_fan_speed_reg = ADT7473_DIR+"fan{}_input".format(self.index)
             self.max_fan_speed = MAX_IXS7215_FAN_SPEED
             self.supported_led_color = ['off', 'green', 'red']
+
+            # Fan eeprom
+            self.eeprom = Eeprom(is_fan=True, fan_index=self.index)
         else:
             # this is a PSU Fan
             self.index = fan_index
@@ -78,6 +83,12 @@ def _set_i2c_register(self, reg_file, value):
         except Exception as e:
             rv = 'ERR'
 
+        # Ensure that the write operation has succeeded
+        if (int(self._get_i2c_register(reg_file)) != value ):
+            time.sleep(3)
+            if (int(self._get_i2c_register(reg_file)) != value ):
+                rv = 'ERR'
+
         return rv
 
     def get_name(self):
@@ -123,10 +134,9 @@ def get_model(self):
         Retrieves the model number of the Fan
 
         Returns:
-            string: Part number of Fan
+            string: Model number of Fan. Use part number for this.
         """
-
-        return 'NA'
+        return self.eeprom.part_number_str()
 
     def get_serial(self):
         """
@@ -135,8 +145,25 @@ def get_serial(self):
         Returns:
             string: Serial number of Fan
         """
+        return self.eeprom.serial_number_str()
+
+    def get_part_number(self):
+        """
+        Retrieves the part number of the Fan
+
+        Returns:
+            string: Part number of Fan
+        """
+        return self.eeprom.part_number_str()
 
-        return 'NA'
+    def get_service_tag(self):
+        """
+        Retrieves the service tag of the Fan
+
+        Returns:
+            string: Service Tag of Fan
+        """
+        return self.eeprom.service_tag_str()
 
     def get_status(self):
         """
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
index cabb15d455d6..35b663cbb786 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
@@ -30,7 +30,7 @@ def get_model(self):
         """
         Retrieves the model number of the Fan Drawer
         Returns:
-            string: Part number of Fan Drawer 
+            string: Part number of Fan Drawer
         """
         return self._fan_list[0].get_model()
 
@@ -49,7 +49,7 @@ def get_status(self):
             bool: True if Fan is operating properly, False if not
         """
         return self._fan_list[0].get_status()
-   
+
     def get_direction(self):
         return 'intake'
 
@@ -74,8 +74,8 @@ def get_position_in_parent(self):
             integer: The 1-based relative physical position in parent device
         """
         return self._index
-    
-       
+
+
 # For Nokia platforms with fan drawer(s)
 class RealDrawer(NokiaFanDrawer):
     def __init__(self, index):
@@ -84,8 +84,3 @@ def __init__(self, index):
 
     def get_name(self):
         return self._name
-    
-   
-
- 
-
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
index ab53abebf934..9de9ebec3699 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
@@ -1,5 +1,5 @@
 ########################################################################
-# Nokia 7215
+# Nokia IXS7215
 #
 # Module contains an implementation of SONiC Platform Base API and
 # provides the PSUs' information which are available in the platform
@@ -10,6 +10,7 @@
     import sys
     from sonic_platform_base.psu_base import PsuBase
     from sonic_py_common import logger
+    from sonic_platform.eeprom import Eeprom
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -34,6 +35,9 @@ def __init__(self, psu_index):
         self.index = psu_index + 1
         self._fan_list = []
 
+        # PSU eeprom
+        self.eeprom = Eeprom(is_psu=True, psu_index=self.index)
+
     def get_name(self):
         """
         Retrieves the name of the device
@@ -52,7 +56,7 @@ def get_presence(self):
         """
 
         if smbus_present == 0:  # if called from psuutil outside of pmon
-            cmdstatus, psustatus = cmd.getstatusoutput('i2cget -y 0 0x41 0xa')
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -78,8 +82,7 @@ def get_model(self):
         Returns:
             string: Part number of PSU
         """
-        return "N/A"
-#        return self.eeprom.serial_number_str()
+        return self.eeprom.modelstr()
 
 
     def get_serial(self):
@@ -89,9 +92,17 @@ def get_serial(self):
         Returns:
             string: Serial number of PSU
         """
-        return "N/A"
-#        return self.eeprom.serial_number_str()
+        return self.eeprom.serial_number_str()
+
+
+    def get_part_number(self):
+        """
+        Retrieves the part number of the PSU
 
+        Returns:
+            string: Part number of PSU
+        """
+        return self.eeprom.part_number_str()
 
     def get_status(self):
         """
@@ -102,7 +113,7 @@ def get_status(self):
         """
 
         if smbus_present == 0:
-            cmdstatus, psustatus = cmd.getstatusoutput('i2cget -y 0 0x41 0xa')
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
             sonic_logger.log_warning("PMON psu-smbus - presence = 0 ")
         else:
@@ -131,7 +142,7 @@ def get_voltage(self):
             e.g. 12.1
         """
         if smbus_present == 0:
-            cmdstatus, psustatus = cmd.getstatusoutput('i2cget -y 0 0x41 0xa')
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -153,30 +164,6 @@ def get_voltage(self):
         psu_voltage = 0.0
         return psu_voltage
 
-#    def get_current(self):
-#        """
-#        Retrieves present electric current supplied by PSU
-#
-#        Returns:
-#            A float number, electric current in amperes,
-#            e.g. 15.4
-#        """
-#        psu_current = 0.0
-#
-#        return psu_current
-#
-#    def get_power(self):
-#        """
-#        Retrieves current energy supplied by PSU
-#
-#        Returns:
-#            A float number, the power in watts,
-#            e.g. 302.6
-#        """
-#        psu_power = 0.0
-#
-#        return psu_power
-
     def get_position_in_parent(self):
         """
         Retrieves 1-based relative physical position in parent device
@@ -191,7 +178,7 @@ def is_replaceable(self):
         Returns:
             bool: True if it is replaceable.
         """
-        return True 
+        return True
 
     def get_powergood_status(self):
         """
@@ -202,7 +189,7 @@ def get_powergood_status(self):
         """
 
         if smbus_present == 0:
-            cmdstatus, psustatus = cmd.getstatusoutput('i2cget -y 0 0x41 0xa')
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -243,6 +230,6 @@ def set_status_led(self, color):
             bool: True if status LED state is set successfully, False if
                   not
         """
-        # In ISX7215 , the firmware running in the PSU controls the LED
+        # The firmware running in the PSU controls the LED
         # and the PSU LED state cannot be changed from CPU.
         return False
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index cb9c1b910561..57fcde16149d 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -366,7 +366,7 @@ def get_transceiver_info(self):
             transceiver_info_dict['nominal_bit_rate'] = str(
                 sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
             transceiver_info_dict['application_advertisement'] = 'N/A'
-            
+
         return transceiver_info_dict
 
     def get_transceiver_bulk_status(self):
@@ -571,7 +571,7 @@ def get_rx_los(self):
             rx_los_list.append(rx_los_data & 0x02 != 0)
         else:
             return None
-        
+
         return rx_los_list
 
     def get_tx_fault(self):
@@ -617,7 +617,7 @@ def get_tx_disable(self):
             tx_disable_list.append(tx_disable_data & 0xC0 != 0)
         else:
             return None
-        
+
         return tx_disable_list
 
     def get_tx_disable_channel(self):
@@ -668,7 +668,7 @@ def get_temperature(self):
         """
         if self.sfp_type == COPPER_TYPE:
             return None
-        
+
         transceiver_bulk_status = self.get_transceiver_bulk_status()
         return transceiver_bulk_status.get("temperature", "N/A")
 
@@ -680,7 +680,7 @@ def get_voltage(self):
         """
         if self.sfp_type == COPPER_TYPE:
             return None
-        
+
         transceiver_bulk_status = self.get_transceiver_bulk_status()
         return transceiver_bulk_status.get("voltage", "N/A")
 
@@ -688,11 +688,11 @@ def get_tx_bias(self):
         """
         Retrieves the TX bias current of this SFP
         Returns:
-           
+
         """
         if self.sfp_type == COPPER_TYPE:
             return None
-       
+
         tx_bias_list = []
         transceiver_bulk_status = self.get_transceiver_bulk_status()
         tx_bias_list.append(transceiver_bulk_status.get("tx1bias", "N/A"))
@@ -884,7 +884,7 @@ def get_presence(self):
             return False
 
         if smbus_present == 0:  # if called from sfputil outside of pmon
-            cmdstatus, sfpstatus = cmd.getstatusoutput('i2cget -y 0 0x41 0x3')
+            cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3')
             sfpstatus = int(sfpstatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -938,7 +938,7 @@ def is_replaceable(self):
             return True
         else:
             return False
-        
+
     def get_position_in_parent(self):
         """
         Retrieves 1-based relative physical position in parent device
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py
index ed2143886760..fd494ca674f5 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py
@@ -51,7 +51,7 @@ def deinitialize(self):
     def _get_transceiver_status(self):
         if smbus_present == 0:
             sonic_logger.log_info("  PMON - smbus ERROR - DEBUG sfp_event   ")
-            cmdstatus, sfpstatus = cmd.getstatusoutput('i2cget -y 0 0x41 0x3')
+            cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3')
             sfpstatus = int(sfpstatus, 16)
         else:
             bus = smbus.SMBus(0)
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
index 775596159269..53c047ca2329 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py
@@ -41,6 +41,10 @@ def main():
 
     print("  Chassis all_fans: {}\n".format(chassis.get_all_fans()))
 
+    print("  Chassis num_psus: {}".format(chassis.get_num_psus()))
+
+    print("  Chassis all_psus: {}\n".format(chassis.get_all_psus()))
+
     print("  Chassis num_thermals: {}".format(chassis.get_num_thermals()))
 
     print("  Chassis all_thermals: {}\n".format(chassis.get_all_thermals()))
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py
index edc9e03b3f66..1116cc7b5857 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py
@@ -10,6 +10,11 @@ def main():
 
     chassis = Chassis()
 
+    for component in chassis.get_all_components():
+        print("    Name: {}".format(component.get_name()))
+        print("        Description: {}".format(component.get_description()))
+        print("        FW version: {}\n".format(component.get_firmware_version()))
+
     return
 
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py
index 76f3d8995e4a..40836611692b 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py
@@ -12,11 +12,11 @@ def main():
 
     eeprom = chassis.get_eeprom()
 
-    print "    Model: {}, Serial: {}".format(eeprom.modelstr(),
-                                             eeprom.serial_str())
-    print "    Part#: {}, Serial#: {}".format(eeprom.part_number_str(),
-                                              eeprom.serial_number_str())
-    print "    Base MAC: {}".format(eeprom.base_mac_addr())
+    print("    Model: {}, Service Tag: {}".format(eeprom.modelstr(),
+                                             eeprom.service_tag_str()))
+    print("    Part#: {}, Serial#: {}".format(eeprom.part_number_str(),
+                                              eeprom.serial_number_str()))
+    print("    Base MAC: {}".format(eeprom.base_mac_addr()))
 
     return
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py
index 6f1ebd42adbe..9bbf4d864acb 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py
@@ -11,15 +11,20 @@ def main():
     chassis = Chassis()
 
     for fan in chassis.get_all_fans():
-        print("    Name:", fan.get_name())
-        print("        Presence: {}, Status: {}, LED: {}".format(fan.get_presence(),
-                                                                 fan.get_status(),
-                                                                 fan.get_status_led()))
-        print("        Model: {}, Serial: {}".format(fan.get_model(),
-                                                     fan.get_serial()))
-        print("        Direction: {}, Speed: {}RPM, Target Speed: {}%\n".format(fan.get_direction(),
-                                                                                str(fan.get_speed()),
-                                                                                str(fan.get_target_speed())))
+        if not fan.get_presence():
+            print("    Name: {} not present".format(fan.get_name()))
+        else:
+            print("    Name:", fan.get_name())
+            print("        Presence: {}, Status: {}, LED: {}".format(fan.get_presence(),
+                                                                     fan.get_status(),
+                                                                     fan.get_status_led()))
+            print("        Model: {}, Serial#: {}".format(fan.get_model(),
+                                                          fan.get_serial()))
+            print("        Part#: {}, Service Tag: {}".format(fan.get_part_number(),
+                                                              fan.get_service_tag()))
+            print("        Direction: {}, Speed: {}RPM, Target Speed: {}%\n".format(fan.get_direction(),
+                                                                                    str(fan.get_speed()),
+                                                                                    str(fan.get_target_speed())))
     return
 
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
index 692430ff2991..e3979b8c4175 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py
@@ -11,13 +11,28 @@ def main():
     chassis = Chassis()
 
     for psu in chassis.get_all_psus():
-        print("    Name:", psu.get_name())
-        print("        Presence: {}, Status: {}, LED: {}".format(psu.get_presence(),
-                                                                 psu.get_status(),
-                                                                 psu.get_status_led()))
-        print("        Model: {}, Serial: {}".format(psu.get_model(),
-                                                     psu.get_serial()))
-        print("        Voltage: {}, Current: NO, Power: NO \n".format(psu.get_voltage()))
+        if not psu.get_presence():
+            print("    Name: {} not present".format(psu.get_name()))
+        else:
+            print("    Name:", psu.get_name())
+            print("        Presence: {}, Status: {}, LED: {}".format(psu.get_presence(),
+                                                                     psu.get_status(),
+                                                                     psu.get_status_led()))
+            print("        Model: {}, Serial#: {}, Part#: {}".format(psu.get_model(),
+                                                                     psu.get_serial(),
+                                                                     psu.get_part_number()))
+            try:
+                current = psu.get_current()
+            except NotImplementedError:
+                current = "NA"
+            try:
+                power = psu.get_power()
+            except NotImplementedError:
+                power = "NA"
+
+            print("        Voltage: {}, Current: {}, Power: {}\n".format(psu.get_voltage(),
+                                                                         current,
+                                                                         power))
     return
 
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
index f5437b18f82e..4d283fa2eb03 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py
@@ -7,15 +7,16 @@
 
 
 def main():
+    print("---------------------")
+    print("Chassis SFP Unit Test")
+    print("---------------------")
+
+    chassis = Chassis()
 
     PORT_START = 1
     PORT_END = 52
 
-    chassis = Chassis()
-
     for physical_port in range(PORT_START, PORT_END+1):
-
-        
         print(" ")
         print(" SFP transceiver tests  PORT = ", physical_port)
         name = chassis.get_sfp(physical_port).get_name()
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
index 9e99b0da3f41..91ef75d8f9a7 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
@@ -2,7 +2,6 @@
 
 from sonic_platform.chassis import Chassis
 
-
 def main():
     print("-------------------------")
     print("Chassis Thermal Unit Test")
@@ -11,13 +10,39 @@ def main():
     chassis = Chassis()
 
     for thermal in chassis.get_all_thermals():
-        print("    Name:", thermal.get_name())
-        print("        Presence: {}, Status: {}".format(thermal.get_presence(),
-                                                        thermal.get_status()))
-        print("        Model: {}, Serial: {}".format(thermal.get_model(),
-                                                     thermal.get_serial()))
-        print("        Temperature: {}C, High Threshold: {}C\n".format(thermal.get_temperature(),
-                                                                                           thermal.get_high_threshold()))
+        if not thermal.get_presence():
+            print("    Name: {} not present".format(thermal.get_name()))
+        else:
+            print("    Name:", thermal.get_name())
+            print("        Presence: {}, Status: {}".format(thermal.get_presence(),
+                                                            thermal.get_status()))
+            print("        Model: {}, Serial#: {}".format(thermal.get_model(),
+                                                          thermal.get_serial()))
+            print("        Temperature(C): {}".format(thermal.get_temperature()))
+
+            try:
+                low_thresh = thermal.get_low_threshold()
+            except NotImplementedError:
+                low_thresh = "NA"
+            try:
+                high_thresh = thermal.get_high_threshold()
+            except NotImplementedError:
+                high_thresh = "NA"
+
+            print("        Low Threshold(C): {}, High Threshold(C): {}".format(low_thresh,
+                                                                                 high_thresh))
+
+            try:
+                crit_low_thresh = thermal.get_low_critical_threshold()
+            except NotImplementedError:
+                crit_low_thresh = "NA"
+            try:
+                crit_high_thresh = thermal.get_high_critical_threshold()
+            except NotImplementedError:
+                crit_high_thresh = "NA"
+
+            print("        Crit Low Threshold(C): {}, Crit High Threshold(C): {}\n".format(crit_low_thresh,
+                                                                                           crit_high_thresh))
     return
 
 

From b2d0cd03a830af29debe5c702c38e90622178bfa Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 17 Feb 2021 10:39:17 -0800
Subject: [PATCH 0203/1674] [sonic-platform-common] sub_module update (#6797)

This PR updates the following commits
c6b642b [ci]: download from sonic-buildimage.vs artifact (#168)
e76ecc6 [sonic_y_cable] add support for retrieving firmware info for Y cable, internal and nic temperature and voltage (#162)
f9cf8c9 [GitHub] Add pull request template (#167)
c31636e [ci] Call pip2/3 using sudo (#166)
5521f67 [ci] Test and build packages using Azure Pipelines (#164)
faca35c [ci]: Set up CI with Azure Pipelines

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 513920ceb241..c6b642b03a64 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 513920ceb2419873a1e27969b428af95c2e9e60f
+Subproject commit c6b642b03a64fbd530b229a0a79d5bff9a938845

From 246c00d5067adb65280ac2e9eea99068e6016962 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 17 Feb 2021 10:37:47 -0800
Subject: [PATCH 0204/1674] [build] Install Python 3 scapy version 2.4.4 in
 host OS (#6799)

As we are currently in the process of removing Python 2 from SONiC, to ensure a seamless transition to Python 3.
---
 build_debian.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_debian.sh b/build_debian.sh
index f94f1665f570..61252adabe2d 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -430,6 +430,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel
 # docker Python API package is needed by Ansible docker module as well as some SONiC applications
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
 
+# Install scapy
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
+
 ## Note: keep pip installed for maintainance purpose
 
 # Install GCC, needed for building/installing some Python packages

From 2b64e72fa87bf1590d0b18fe543d4c3077c326ef Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Thu, 18 Feb 2021 11:53:19 +0200
Subject: [PATCH 0205/1674] [Mellanox][SAI] update submodule pointer (#6806)

Open ACL Outer VLAN ID for egress for ports part of VLAN RIF

- Why I did it
Open ACL Outer VLAN ID for egress for ports part of VLAN RIF

- How I did it
Updated SAI submodule pointer

- How to verify it
Build an image, deploy and check all is up and running.
Verify ACL sonic-mgmt test is passing

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 80937117fcd5..aa467f9462d0 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 80937117fcd54e8df0581368f652f3664af6aecb
+Subproject commit aa467f9462d063c79875b3a6ea699e9d0b1d8b57

From 7a003d56781334deb37db903910da229ae2b8ee3 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 17 Feb 2021 23:03:19 -0800
Subject: [PATCH 0206/1674] [frr]: upgrade frr to frr-7.5-s3 tag (#6807)

Update FRR 7.5 head. The following is a list of new commits.

```
e2f17ae47ad047e66923c2ff1e84c9ba10d4ad38 Merge pull request #8096 from idryzhov/7.5-backports-2021-02-16
380341362ced8e317c18b7395acb012de1f23acd ospf6d: Don't send hellos on loopback interface
7fa78b659f8e720466e0df62689327ea4b9ff867 bgpd: send correct BMP down message when nht fails
385faf6c079a41def1e6eb882cbfd50047559644 [filter]: change return code for errors
d9a0e9a2934f2f75c64496fe4c724a18aa581fcb bfdd: fix session lookup
08afa0a75311a4e8cb2a18116384b603f7f2d751 ospf6d : fix issue in ecmp inter area  route
2299afa1a9128d87d5169742b993c0ada575eb83 ospfd:  Prevent duplicate packet read in certain vrf situations
ff42a28af659ee61c0efb877b10738a5812f4bc2 vrf: use wrappers to change VRF_CONFIGURED flag
2bdc59ca21da2d67b77ec70a2fadffbca60690cd vrf: mark vrf as configured when entering vrf node
b9611f65a71adc0b8fa14a5a4d1a8f44e04dcd85 ospf6d: Fix LSA formatting out-of-bounds access
610ebf56913fa56167b0a2a127b07afe020a1efe bfdd: Prevent use after free ( again )
35b0cd5d753dda9aa70ea1c06db61a8d4b8671e3 *: Fix usage of bfd_adj_event
95b8915d0f4de3eae5438632ecd0827061ef48e8 ospf6d: Fix LSA formatting inconsistent retvals
49d73d8be84dbd23d767697474019165e511786c pimd: SGRpt prune received during prune didn't override holdtime
1d0d19afa9bb7cd4bc476d00c887876bc04eee95 eigrpd: Correctly set the mtu for eigrp packets sent
bbb08db69f8eb554d23b4920c1c1e3982d8d2a91 zebra: Prevent sending of unininted data
0813d650a8120458ab7d9317061f3864dbc6f2f7 ospf6d: prevent use after free
2f2e981d967b36b240fca82fea8a961d927ef43c lib: Prevent unininted usage of data
6171becdb391ea5b88916a3a28b04b555e1fc518 bfdd: Prevent storage of ifp pointer that has been deleted
9ebb41cf4bb51e0872796530bf8c7a4d819053db bfdd: Prevent unininited data transmittal
72e16db6fea3629111537f9eb10c86f2d275adcb eigrpd: Prevent uninitialized value from being used
72b61a5bb09d59c3cc0d1d401d51de96949dff52 zebra: disallow resolution to duplicate nexthops
1083bae40b00c0ed2c9f3521ae1ab9675a87202e bgpd: Initialize bgp_notify.raw_data before passing to bgp_notify_receive()
31df7314310416f10c133dcfe9c4586edadf3fbb doc: ebgp-requires-policy requires manuall session clearing
ecc8ec678d2d8a1c3d1d50a22732f9fc4bad689c watchfrr: fix SA warning
9d9365d161979a031de817c1fbcab6508dfee013 watchfrr: fix crash on missing optional argument
907e600d63c1c5b6bda40b0a08344a72533b1787 pimd: Prevent use after free
b47374f0e95d99c93bfe2d14afe55219a9fda455 doc: Update bgp doc for more rfc-8212 talk
4fbeef60cc8dc5362ff84fc91d1a4e343e4e32c7 docker: centos 7, 8 yang bump and repo fixes
808e6d731f330df4a91fdfd6df6a3c8dce1651a6 docker: prefer alpine:latest for building
91b3c471f1c48818370a0f218add917f0d46aa47 Merge pull request #8092 from donaldsharp/7.5_track
60be43c0bf63c16ca42008fa802d0a2050f3fce2 Merge pull request #8090 from ton31337/fix/static_network_vrf_7.5
1f6785aa60cc57a5c8d5de98c9c09a344a0c9262 ospf6d: Track wait_timer and disable when needed
c89e326be91312bed066eb2447ea8944e25a225e bgpd: Check for peer->su_remote if not NULL when handling IPv6 nexthop
15e070f6448870c98c030b6b5013ad8750d8918b Merge pull request #8047 from pguibert6WIND/nhrp_shortcut_routes_75
912994efec94082ae7d8c5e014c410964bea19f4 Merge pull request #8034 from qlyoung/fix-gnu-readline-bracketed-paste-7.5.1
9f50536993f1eb900fbfbe98d21b8c072bbd9c15 nhrpd: replace nhrp route nexthop with onlink route when prefix=nh
8c185008246db31c34574d7b79358001ac411f84 nhrpd: shortcut routes installed with nexthop.
c46c87d19758040bc3f3902ab8e4a0f1bb908721 vtysh: disable bracketed paste in readline
20b35e4c3386de798f3b0cb9f2a7e6b04d995485 Merge pull request #8018 from ton31337/fix/drop_aggregate_as_attribute_if_malformed_7.5
fa25d7327fd64613cc7530aba2edfcde038da074 bgpd: Unset only aggregator flag when AGGREGATOR_AS is 0
3ee9a3726fe1a526d946c1978487a4509fe98f29 bgpd: Drop aggregator_as attribute if malformed in case of BGP_AS_ZERO
be88595c6a2011f0e882bfa663baa61c86ede14e Merge pull request #8005 from opensourcerouting/snap-libyang1-fix-75
fd840ad37f2e836b210c6e60fc6325a4c3e495ce snapcraft: Update rtrlib to 0.7.0
3d00552fa9aedb96acd7ea773bc14fd2b77e7e0f snapcraft: Fix passthrough path for Libyang 1.x
```
---
 rules/frr.mk      | 2 +-
 src/sonic-frr/frr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index bb6a96a61fa4..c8175339f444 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -3,7 +3,7 @@
 FRR_VERSION = 7.5
 FRR_SUBVERSION = 0
 FRR_BRANCH = frr/7.5
-FRR_TAG = frr-7.5-s2
+FRR_TAG = frr-7.5-s3
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
index 6b2b5cce3557..e2f17ae47ad0 160000
--- a/src/sonic-frr/frr
+++ b/src/sonic-frr/frr
@@ -1 +1 @@
-Subproject commit 6b2b5cce3557a383942fc194257da77e4e5270e4
+Subproject commit e2f17ae47ad047e66923c2ff1e84c9ba10d4ad38

From 5c4114bd899f4607976057c2a1cbc61a59392f0a Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 19 Feb 2021 13:33:31 -0800
Subject: [PATCH 0207/1674] Submodule update for restapi (#6808)

---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index b0024559f6a8..71847d3fbe16 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit b0024559f6a888444dc5159c80ac9212cce77a07
+Subproject commit 71847d3fbe16f191efa7ffac6901d5599d044c5f

From 4a79583b4c0fe7a5cfa1a2d83d1d33118956b4c9 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 18 Feb 2021 00:56:30 -0800
Subject: [PATCH 0208/1674] [sonic-platform-daemons] sub_module update (#6814)

This PR includes the following commit in sonic-platform-daemons

068bccc [xcvrd] Store mux_cable telemetry data in State DB (#148)
93cac0a [ci]: download from sonic-buildimage.vs artifact (#152)
d651e9b [GitHub] Add pull request template (#151)
bd7830b [pcied] Remove unnecessary message and move the configuration path (#144)
9080fda [ci] Call pip2/3 using sudo (#150)
de60784 [ci] Test and build packages using Azure Pipelines (#149)
8bf0fd1 [ledd] Refactor to allow for more thorough unit testing; Increase unit test coverage (#147)
26bdc9e Set up CI with Azure Pipelines
1fcaa57 [pcied] Add PCIe AER stats collection (#100)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index e72f6cd95881..068bcccf1f30 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit e72f6cd958810e3af9b18a71bc078dbb8c5d6cac
+Subproject commit 068bcccf1f3057607b8f37709033d7f44a6ff844

From 024b173521688a294103b6587b3e588708c9d851 Mon Sep 17 00:00:00 2001
From: roman_savchuk <romanx.savchuk@intel.com>
Date: Tue, 23 Feb 2021 09:31:33 +0200
Subject: [PATCH 0209/1674] [build]: fixed BFN target build (#6826)

#### Why I did it
Fix runtime issues caused by SONiC update

#### How I did it
- new attribute SAI_ACL_ENTRY_ATTR_FIELD_ACL_IP_TYPE  supported
- new attribute SAI_SWITCH_ATTR_AVAILABLE_IPMC_ENTRY supported

Signed-off-by: Roman Savchuk <romanx.savchuk@intel.com>
---
 platform/barefoot/bfn-platform.mk | 2 +-
 platform/barefoot/bfn-sai.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index 1db534775acd..5abcd3fe4655 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20201228_deb10.deb
+BFN_PLATFORM = bfnplatform_20210219_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index 4f6322239d05..54285aa32cd9 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20201228_deb10.deb
+BFN_SAI = bfnsdk_20210219_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

From ceeb7ba57c113c4840e66c6591762b6eed7c53e2 Mon Sep 17 00:00:00 2001
From: donNewtonAlpha <don@opennetworking.org>
Date: Tue, 23 Feb 2021 16:26:00 -0500
Subject: [PATCH 0210/1674] [build]: .gitmodules: Fix make init (#6828)

* remove trailing / from url for submodule "platform/mellanox/hw-management/hw-mgmt"

Signed-off-by: Don Newton don@opennetworking.org
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 38b22c4fd687..4e1ae4863d09 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,7 +59,7 @@
 	url = https://github.com/aristanetworks/sonic
 [submodule "platform/mellanox/hw-management/hw-mgmt"]
 	path = platform/mellanox/hw-management/hw-mgmt
-	url = https://github.com/Mellanox/hw-mgmt/
+	url = https://github.com/Mellanox/hw-mgmt
 [submodule "src/redis-dump-load"]
 	path = src/redis-dump-load
 	url = https://github.com/p/redis-dump-load.git

From 414a9424624b312e2f2c0b8d6a73b1643d43aebd Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Sat, 20 Feb 2021 11:01:12 -0800
Subject: [PATCH 0211/1674] [radv] Disable radv for specific deployment_id
 (#6830)

---
 ...cker-router-advertiser.supervisord.conf.j2 | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index 5cbfd60322e1..9312a1a20c14 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -40,15 +40,18 @@ dependent_startup_wait_for=rsyslogd:running
 
 {# Router advertiser should only run on ToR (T0) devices which have #}
 {# at least one VLAN interface which has an IPv6 address asigned #}
+{# But not for specific deployment_id #}
 {%- set vlan_v6 = namespace(count=0) -%}
-{%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%}
-  {%- if VLAN_INTERFACE -%}
-    {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
-      {# If this VLAN has an IPv6 address... #}
-      {%- if prefix | ipv6 -%}
-        {%- set vlan_v6.count = vlan_v6.count + 1 -%}
-      {%- endif -%}
-    {%- endfor -%}
+{%- if DEVICE_METADATA.localhost.deployment_id != "8" -%}
+  {%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%}
+    {%- if VLAN_INTERFACE -%}
+      {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
+        {# If this VLAN has an IPv6 address... #}
+        {%- if prefix | ipv6 -%}
+          {%- set vlan_v6.count = vlan_v6.count + 1 -%}
+        {%- endif -%}
+      {%- endfor -%}
+    {%- endif -%}
   {%- endif -%}
 {%- endif -%}
 

From 038c6aa7cb9ff5636c6aee4402f0101b3c24fd06 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:56:59 -0800
Subject: [PATCH 0212/1674] [202012][utilities][swss] update submodule head
 (#6869)

- swss:
* 459d09b 2021-02-22 | [acl] Enable VLAN ID qualifier for ACL rules (#1648) (HEAD -> 202012) [Danny Allen]
* 60859b1 2021-02-08 | [buffermgr] Support maximum port headroom checking (#1607) [Stephen Sun]
* 3161cbb 2021-02-17 | Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (#1600) [Andriy Yurkiv]
* 256ed9c 2021-02-08 | Support shared headroom pool on top of dynamic buffer calculation (#1581) [Stephen Sun]

- utilities:
* 30d7069 2021-02-16 | [decode-syseeprom] Refactor to utilize sonic-platform package (#1435) (HEAD -> 202012, tag: foo) [Joe LeVeque]
* 891fef4 2021-02-16 | [psuutil] Refactor to utilize sonic-platform package (#1434) [Joe LeVeque]
* 8c5e505 2021-02-17 | [sfputil] Refactor to utilize sonic-platform package (#1421) [Joe LeVeque]
* ca5dd2c 2021-02-17 | [sfpshow] Cleanup (#1405) [Joe LeVeque]
* bf489ea 2021-02-17 | Add new cli for SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter in counterpoll utility (#1355) [Andriy Yurkiv]
* 25feed3 2021-02-08 | Support shared headroom pool on top of dynamic buffer calculation (#1348) [Stephen Sun]
* aaa323a 2021-02-02 | [vrf]: Fix freezing during interface binding (#1325) [maksymbelei95]
* cc0bb6e 2021-01-27 | [show] fix "show interfaces breakout" command (#1198) [Dmytro Shevchuk]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 676f23dd2d04..459d09b791db 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 676f23dd2d04f60b2b289b3a318853ac29b2c388
+Subproject commit 459d09b791db1bced2e7dc221d47e66f7d706dd0
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 148259bbbb48..30d70691b379 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 148259bbbb480c9750052aa3f5c8925b2f2ff1dd
+Subproject commit 30d70691b379f5e68e572fbc69f2d0db32e8c19c

From a654518968d603a76aa555546cb8edb304f922f7 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 24 Feb 2021 10:09:52 -0800
Subject: [PATCH 0213/1674] [Arista] Driver and platform update (#6468) (#6872)

- Add support for `DCS-7050SX3-48YC8` and `DCS-7050SX3-48C8` platform
 - Add support for more variants of `DCS-7280CR3-32[PD]4`
 - Add Supervisor to Linecard consutil support
 - Complete Watchdog platform API support
 - Fix some PSU behavior on `DCS-7050QX-32` and `DCS-7060CX-32S`
 - Fix SEU management on `DCS-7060CX-32S`
 - Allow kernel modules to build up to linux 5.10
 - Rename led color `orange` to `amber`
 - Miscellaneous fixes
---
 device/arista/x86_64-arista_7050sx3_48c8      |   1 +
 .../Arista-7050SX3-48YC8/buffers.json.j2      |   2 +
 .../buffers_defaults_t0.j2                    |  50 +++
 .../pg_profile_lookup.ini                     |  17 +
 .../Arista-7050SX3-48YC8/port_config.ini      |  57 +++
 .../Arista-7050SX3-48YC8/qos.json.j2          |  21 +
 .../Arista-7050SX3-48YC8/sai.profile          |   2 +
 ...d3-a7050sx3_48yc8-48x25G+8x100G.config.bcm | 422 ++++++++++++++++++
 .../x86_64-arista_7050sx3_48yc8/default_sku   |   1 +
 .../platform_reboot                           |   1 +
 .../plugins/eeprom.py                         |   1 +
 .../plugins/led_control.py                    |   1 +
 .../plugins/psuutil.py                        |   1 +
 .../plugins/sfputil.py                        |   1 +
 .../pmon_daemon_control.json                  |   1 +
 .../x86_64-arista_7050sx3_48yc8/sensors.conf  |  50 +++
 .../system_health_monitoring_config.json      |   1 +
 .../thermal_policy.json                       |   1 +
 .../jr2-a7280cr3-32d4-40x100G.config.bcm      |  12 +-
 ...jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm |  12 +-
 .../jr2-a7280cr3-32p4-40x100G.config.bcm      |  18 +-
 device/arista/x86_64-arista_7280cr3mk_32d4    |   1 +
 device/arista/x86_64-arista_7280cr3mk_32p4    |   1 +
 device/arista/x86_64-arista_7800_sup/plugins  |   1 -
 .../x86_64-arista_7800_sup/plugins/eeprom.py  |   1 +
 .../plugins/led_control.py                    |   1 +
 .../x86_64-arista_7800_sup/plugins/psuutil.py |   1 +
 .../x86_64-arista_7800_sup/plugins/sfputil.py |   1 +
 .../plugins/udevprefix.conf                   |   1 +
 .../system_health_monitoring_config.json      |   4 +-
 files/Aboot/boot0.j2                          |  22 +-
 .../barefoot/sonic-platform-modules-arista    |   2 +-
 .../broadcom/sonic-platform-modules-arista    |   2 +-
 33 files changed, 681 insertions(+), 30 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7050sx3_48c8
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers.json.j2
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/port_config.ini
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/qos.json.j2
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/sai.profile
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/default_sku
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/platform_reboot
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/plugins/eeprom.py
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/plugins/led_control.py
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/plugins/psuutil.py
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/plugins/sfputil.py
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/pmon_daemon_control.json
 create mode 100644 device/arista/x86_64-arista_7050sx3_48yc8/sensors.conf
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/system_health_monitoring_config.json
 create mode 120000 device/arista/x86_64-arista_7050sx3_48yc8/thermal_policy.json
 create mode 120000 device/arista/x86_64-arista_7280cr3mk_32d4
 create mode 120000 device/arista/x86_64-arista_7280cr3mk_32p4
 delete mode 120000 device/arista/x86_64-arista_7800_sup/plugins
 create mode 120000 device/arista/x86_64-arista_7800_sup/plugins/eeprom.py
 create mode 120000 device/arista/x86_64-arista_7800_sup/plugins/led_control.py
 create mode 120000 device/arista/x86_64-arista_7800_sup/plugins/psuutil.py
 create mode 120000 device/arista/x86_64-arista_7800_sup/plugins/sfputil.py
 create mode 100644 device/arista/x86_64-arista_7800_sup/plugins/udevprefix.conf

diff --git a/device/arista/x86_64-arista_7050sx3_48c8 b/device/arista/x86_64-arista_7050sx3_48c8
new file mode 120000
index 000000000000..0334c5411d31
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48c8
@@ -0,0 +1 @@
+x86_64-arista_7050sx3_48yc8
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers.json.j2 b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers.json.j2
new file mode 100644
index 000000000000..1083a6210fc9
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..b6e6a948928d
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/buffers_defaults_t0.j2
@@ -0,0 +1,50 @@
+{%- set default_cable = '5m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,28) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(28,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/pg_profile_lookup.ini
new file mode 100644
index 000000000000..0b5d680edda7
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 79872   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 56160   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 85696   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/port_config.ini b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/port_config.ini
new file mode 100644
index 000000000000..bccaa602f203
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/port_config.ini
@@ -0,0 +1,57 @@
+# name          lanes             alias         index  speed
+Ethernet0       1,2               Ethernet1/1   1      25000
+Ethernet2       3,4               Ethernet1/3   1      25000
+Ethernet4       5,6               Ethernet2/1   2      25000
+Ethernet6       7,8               Ethernet2/3   2      25000
+Ethernet8       9,10              Ethernet3/1   3      25000
+Ethernet10      11,12             Ethernet3/3   3      25000
+Ethernet12      13,14             Ethernet4/1   4      25000
+Ethernet14      15,16             Ethernet4/3   4      25000
+Ethernet16      21,22             Ethernet5/1   5      25000
+Ethernet18      23,24             Ethernet5/3   5      25000
+Ethernet20      17,18             Ethernet6/1   6      25000
+Ethernet22      19,20             Ethernet6/3   6      25000
+Ethernet24      25,26             Ethernet7/1   7      25000
+Ethernet26      27,28             Ethernet7/3   7      25000
+Ethernet28      29,30             Ethernet8/1   8      25000
+Ethernet30      31,32             Ethernet8/3   8      25000
+Ethernet32      37,38             Ethernet9/1   9      25000
+Ethernet34      39,40             Ethernet9/3   9      25000
+Ethernet36      33,34             Ethernet10/1  10     25000
+Ethernet38      35,46             Ethernet10/3  10     25000
+Ethernet40      41,42             Ethernet11/1  11     25000
+Ethernet42      43,44             Ethernet11/3  11     25000
+Ethernet44      45,46             Ethernet12/1  12     25000
+Ethernet46      47,48             Ethernet12/3  12     25000
+Ethernet48      53,54             Ethernet13/1  13     25000
+Ethernet50      55,56             Ethernet13/3  13     25000
+Ethernet52      49,50             Ethernet14/1  14     25000
+Ethernet54      51,52             Ethernet14/3  14     25000
+Ethernet56      57,58             Ethernet15/1  15     25000
+Ethernet58      59,60             Ethernet15/3  15     25000
+Ethernet60      61,62             Ethernet16/1  16     25000
+Ethernet62      63,64             Ethernet16/3  16     25000
+Ethernet64      69,70             Ethernet17/1  17     25000
+Ethernet66      71,72             Ethernet17/3  17     25000
+Ethernet68      65,66             Ethernet18/1  18     25000
+Ethernet70      67,68             Ethernet18/3  18     25000
+Ethernet72      73,74             Ethernet19/1  19     25000
+Ethernet74      75,76             Ethernet19/3  19     25000
+Ethernet76      77,78             Ethernet20/1  20     25000
+Ethernet78      79,80             Ethernet20/3  20     25000
+Ethernet80      85,86             Ethernet21/1  21     25000
+Ethernet82      87,88             Ethernet21/3  21     25000
+Ethernet84      81,82             Ethernet22/1  22     25000
+Ethernet86      83,84             Ethernet22/3  22     25000
+Ethernet88      89,90             Ethernet23/1  23     25000
+Ethernet88      91,92             Ethernet23/3  23     25000
+Ethernet92      93,94             Ethernet24/1  24     25000
+Ethernet92      95,96             Ethernet24/3  24     25000
+Ethernet96      101,102,103,104   Ethernet25/1  25     100000
+Ethernet100     97,98,99,100      Ethernet26/1  26     100000
+Ethernet104     105,106,107,108   Ethernet27/1  27     100000
+Ethernet108     109,110,111,112   Ethernet28/1  28     100000
+Ethernet112     117,118,119,120   Ethernet29/1  29     100000
+Ethernet116     113,114,115,116   Ethernet30/1  30     100000
+Ethernet120     121,122,123,124   Ethernet31/1  31     100000
+Ethernet124     125,126,127,128   Ethernet32/1  32     100000
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/qos.json.j2 b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/qos.json.j2
new file mode 100644
index 000000000000..34002048afdb
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/qos.json.j2
@@ -0,0 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/sai.profile b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/sai.profile
new file mode 100644
index 000000000000..7342226cd38c
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
new file mode 100644
index 000000000000..aa9b32d4a350
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
@@ -0,0 +1,422 @@
+PHY_AN_ALLOW_PLL_CHANGE=1
+arl_clean_timeout_usec=15000000
+asf_mem_profile=2
+bcm_num_cos=8
+bcm_stat_flags=1
+bcm_stat_jumbo=9236
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+fpem_mem_entries=0
+higig2_hdr_mode=1
+ifp_inports_support_enable=1
+ipv6_lpm_128b_enable=0
+l2xmsg_mode=1
+l2_mem_entries=163840
+l3_mem_entries=147456
+max_vp_lags=0
+miim_intr_enable=0
+module_64ports=1
+multicast_l2_range=16383
+multicast_l3_range=0
+num_ipv6_lpm_128b_entries=0
+os=unix
+oversubscribe_mode=1
+pbmp_xport_xe=0x1ffffffe1ffffffe
+phy_an_c73_1=1
+phy_an_c73_2=1
+phy_an_c73_3=1
+phy_an_c73_4=1
+phy_an_c73_5=1
+phy_an_c73_6=1
+phy_an_c73_7=1
+phy_an_c73_8=1
+phy_an_c73_9=1
+phy_an_c73_10=1
+phy_an_c73_11=1
+phy_an_c73_12=1
+phy_an_c73_13=1
+phy_an_c73_14=1
+phy_an_c73_15=1
+phy_an_c73_16=1
+phy_an_c73_17=1
+phy_an_c73_18=1
+phy_an_c73_19=1
+phy_an_c73_20=1
+phy_an_c73_21=1
+phy_an_c73_22=1
+phy_an_c73_23=1
+phy_an_c73_24=1
+phy_an_c73_25=0
+phy_an_c73_26=0
+phy_an_c73_27=0
+phy_an_c73_28=0
+phy_an_c73_33=1
+phy_an_c73_34=1
+phy_an_c73_35=1
+phy_an_c73_36=1
+phy_an_c73_37=1
+phy_an_c73_38=1
+phy_an_c73_39=1
+phy_an_c73_40=1
+phy_an_c73_41=1
+phy_an_c73_42=1
+phy_an_c73_43=1
+phy_an_c73_44=1
+phy_an_c73_45=1
+phy_an_c73_46=1
+phy_an_c73_47=1
+phy_an_c73_48=1
+phy_an_c73_49=1
+phy_an_c73_50=1
+phy_an_c73_51=1
+phy_an_c73_52=1
+phy_an_c73_53=1
+phy_an_c73_54=1
+phy_an_c73_55=1
+phy_an_c73_56=1
+phy_an_c73_57=0
+phy_an_c73_58=0
+phy_an_c73_59=0
+phy_an_c73_60=0
+phy_chain_rx_lane_map_physical{1.0}=0x0123
+phy_chain_rx_lane_map_physical{5.0}=0x0123
+phy_chain_rx_lane_map_physical{9.0}=0x0123
+phy_chain_rx_lane_map_physical{13.0}=0x0123
+phy_chain_rx_lane_map_physical{17.0}=0x0123
+phy_chain_rx_lane_map_physical{21.0}=0x0123
+phy_chain_rx_lane_map_physical{25.0}=0x0213
+phy_chain_rx_lane_map_physical{29.0}=0x2031
+phy_chain_rx_lane_map_physical{33.0}=0x1302
+phy_chain_rx_lane_map_physical{37.0}=0x3120
+phy_chain_rx_lane_map_physical{41.0}=0x2031
+phy_chain_rx_lane_map_physical{45.0}=0x0213
+phy_chain_rx_lane_map_physical{49.0}=0x2031
+phy_chain_rx_lane_map_physical{53.0}=0x0213
+phy_chain_rx_lane_map_physical{57.0}=0x3210
+phy_chain_rx_lane_map_physical{61.0}=0x3210
+phy_chain_rx_lane_map_physical{65.0}=0x3210
+phy_chain_rx_lane_map_physical{69.0}=0x3210
+phy_chain_rx_lane_map_physical{73.0}=0x3210
+phy_chain_rx_lane_map_physical{77.0}=0x3210
+phy_chain_rx_polarity_flip_physical{1.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x1
+phy_chain_rx_polarity_flip_physical{3.0}=0x0
+phy_chain_rx_polarity_flip_physical{4.0}=0x1
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x0
+phy_chain_rx_polarity_flip_physical{7.0}=0x1
+phy_chain_rx_polarity_flip_physical{8.0}=0x0
+phy_chain_rx_polarity_flip_physical{9.0}=0x1
+phy_chain_rx_polarity_flip_physical{10.0}=0x0
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x0
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x0
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x0
+phy_chain_rx_polarity_flip_physical{17.0}=0x0
+phy_chain_rx_polarity_flip_physical{18.0}=0x1
+phy_chain_rx_polarity_flip_physical{19.0}=0x0
+phy_chain_rx_polarity_flip_physical{20.0}=0x1
+phy_chain_rx_polarity_flip_physical{21.0}=0x1
+phy_chain_rx_polarity_flip_physical{22.0}=0x0
+phy_chain_rx_polarity_flip_physical{23.0}=0x1
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+phy_chain_rx_polarity_flip_physical{25.0}=0x0
+phy_chain_rx_polarity_flip_physical{26.0}=0x0
+phy_chain_rx_polarity_flip_physical{27.0}=0x0
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x1
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_polarity_flip_physical{33.0}=0x1
+phy_chain_rx_polarity_flip_physical{34.0}=0x1
+phy_chain_rx_polarity_flip_physical{35.0}=0x0
+phy_chain_rx_polarity_flip_physical{36.0}=0x0
+phy_chain_rx_polarity_flip_physical{37.0}=0x1
+phy_chain_rx_polarity_flip_physical{38.0}=0x0
+phy_chain_rx_polarity_flip_physical{39.0}=0x0
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+phy_chain_rx_polarity_flip_physical{41.0}=0x1
+phy_chain_rx_polarity_flip_physical{42.0}=0x0
+phy_chain_rx_polarity_flip_physical{43.0}=0x0
+phy_chain_rx_polarity_flip_physical{44.0}=0x1
+phy_chain_rx_polarity_flip_physical{45.0}=0x1
+phy_chain_rx_polarity_flip_physical{46.0}=0x0
+phy_chain_rx_polarity_flip_physical{47.0}=0x0
+phy_chain_rx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_polarity_flip_physical{49.0}=0x0
+phy_chain_rx_polarity_flip_physical{50.0}=0x0
+phy_chain_rx_polarity_flip_physical{51.0}=0x0
+phy_chain_rx_polarity_flip_physical{52.0}=0x1
+phy_chain_rx_polarity_flip_physical{53.0}=0x1
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x0
+phy_chain_rx_polarity_flip_physical{56.0}=0x1
+phy_chain_rx_polarity_flip_physical{57.0}=0x0
+phy_chain_rx_polarity_flip_physical{58.0}=0x1
+phy_chain_rx_polarity_flip_physical{59.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x1
+phy_chain_rx_polarity_flip_physical{61.0}=0x1
+phy_chain_rx_polarity_flip_physical{62.0}=0x0
+phy_chain_rx_polarity_flip_physical{63.0}=0x1
+phy_chain_rx_polarity_flip_physical{64.0}=0x0
+phy_chain_rx_polarity_flip_physical{65.0}=0x0
+phy_chain_rx_polarity_flip_physical{66.0}=0x1
+phy_chain_rx_polarity_flip_physical{67.0}=0x0
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_polarity_flip_physical{69.0}=0x0
+phy_chain_rx_polarity_flip_physical{70.0}=0x1
+phy_chain_rx_polarity_flip_physical{71.0}=0x0
+phy_chain_rx_polarity_flip_physical{72.0}=0x1
+phy_chain_rx_polarity_flip_physical{73.0}=0x0
+phy_chain_rx_polarity_flip_physical{74.0}=0x1
+phy_chain_rx_polarity_flip_physical{75.0}=0x0
+phy_chain_rx_polarity_flip_physical{76.0}=0x1
+phy_chain_rx_polarity_flip_physical{77.0}=0x1
+phy_chain_rx_polarity_flip_physical{78.0}=0x0
+phy_chain_rx_polarity_flip_physical{79.0}=0x1
+phy_chain_rx_polarity_flip_physical{80.0}=0x0
+phy_chain_tx_lane_map_physical{1.0}=0x0123
+phy_chain_tx_lane_map_physical{5.0}=0x0123
+phy_chain_tx_lane_map_physical{9.0}=0x0123
+phy_chain_tx_lane_map_physical{13.0}=0x0123
+phy_chain_tx_lane_map_physical{17.0}=0x0123
+phy_chain_tx_lane_map_physical{21.0}=0x0123
+phy_chain_tx_lane_map_physical{25.0}=0x0123
+phy_chain_tx_lane_map_physical{29.0}=0x3210
+phy_chain_tx_lane_map_physical{33.0}=0x0123
+phy_chain_tx_lane_map_physical{37.0}=0x3201
+phy_chain_tx_lane_map_physical{41.0}=0x3201
+phy_chain_tx_lane_map_physical{45.0}=0x0123
+phy_chain_tx_lane_map_physical{49.0}=0x3201
+phy_chain_tx_lane_map_physical{53.0}=0x0132
+phy_chain_tx_lane_map_physical{57.0}=0x3210
+phy_chain_tx_lane_map_physical{61.0}=0x3210
+phy_chain_tx_lane_map_physical{65.0}=0x3210
+phy_chain_tx_lane_map_physical{69.0}=0x3210
+phy_chain_tx_lane_map_physical{73.0}=0x3210
+phy_chain_tx_lane_map_physical{77.0}=0x3210
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{2.0}=0x0
+phy_chain_tx_polarity_flip_physical{3.0}=0x0
+phy_chain_tx_polarity_flip_physical{4.0}=0x0
+phy_chain_tx_polarity_flip_physical{5.0}=0x0
+phy_chain_tx_polarity_flip_physical{6.0}=0x0
+phy_chain_tx_polarity_flip_physical{7.0}=0x0
+phy_chain_tx_polarity_flip_physical{8.0}=0x0
+phy_chain_tx_polarity_flip_physical{9.0}=0x0
+phy_chain_tx_polarity_flip_physical{10.0}=0x0
+phy_chain_tx_polarity_flip_physical{11.0}=0x0
+phy_chain_tx_polarity_flip_physical{12.0}=0x0
+phy_chain_tx_polarity_flip_physical{13.0}=0x0
+phy_chain_tx_polarity_flip_physical{14.0}=0x0
+phy_chain_tx_polarity_flip_physical{15.0}=0x0
+phy_chain_tx_polarity_flip_physical{16.0}=0x0
+phy_chain_tx_polarity_flip_physical{17.0}=0x0
+phy_chain_tx_polarity_flip_physical{18.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x0
+phy_chain_tx_polarity_flip_physical{20.0}=0x0
+phy_chain_tx_polarity_flip_physical{21.0}=0x0
+phy_chain_tx_polarity_flip_physical{22.0}=0x0
+phy_chain_tx_polarity_flip_physical{23.0}=0x0
+phy_chain_tx_polarity_flip_physical{24.0}=0x0
+phy_chain_tx_polarity_flip_physical{25.0}=0x0
+phy_chain_tx_polarity_flip_physical{26.0}=0x0
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x0
+phy_chain_tx_polarity_flip_physical{29.0}=0x0
+phy_chain_tx_polarity_flip_physical{30.0}=0x0
+phy_chain_tx_polarity_flip_physical{31.0}=0x0
+phy_chain_tx_polarity_flip_physical{32.0}=0x0
+phy_chain_tx_polarity_flip_physical{33.0}=0x0
+phy_chain_tx_polarity_flip_physical{34.0}=0x0
+phy_chain_tx_polarity_flip_physical{35.0}=0x0
+phy_chain_tx_polarity_flip_physical{36.0}=0x0
+phy_chain_tx_polarity_flip_physical{37.0}=0x0
+phy_chain_tx_polarity_flip_physical{38.0}=0x0
+phy_chain_tx_polarity_flip_physical{39.0}=0x0
+phy_chain_tx_polarity_flip_physical{40.0}=0x1
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x0
+phy_chain_tx_polarity_flip_physical{43.0}=0x0
+phy_chain_tx_polarity_flip_physical{44.0}=0x0
+phy_chain_tx_polarity_flip_physical{45.0}=0x0
+phy_chain_tx_polarity_flip_physical{46.0}=0x0
+phy_chain_tx_polarity_flip_physical{47.0}=0x0
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_tx_polarity_flip_physical{49.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x0
+phy_chain_tx_polarity_flip_physical{53.0}=0x0
+phy_chain_tx_polarity_flip_physical{54.0}=0x0
+phy_chain_tx_polarity_flip_physical{55.0}=0x0
+phy_chain_tx_polarity_flip_physical{56.0}=0x0
+phy_chain_tx_polarity_flip_physical{57.0}=0x1
+phy_chain_tx_polarity_flip_physical{58.0}=0x1
+phy_chain_tx_polarity_flip_physical{59.0}=0x1
+phy_chain_tx_polarity_flip_physical{60.0}=0x1
+phy_chain_tx_polarity_flip_physical{61.0}=0x1
+phy_chain_tx_polarity_flip_physical{62.0}=0x1
+phy_chain_tx_polarity_flip_physical{63.0}=0x1
+phy_chain_tx_polarity_flip_physical{64.0}=0x0
+phy_chain_tx_polarity_flip_physical{65.0}=0x0
+phy_chain_tx_polarity_flip_physical{66.0}=0x0
+phy_chain_tx_polarity_flip_physical{67.0}=0x0
+phy_chain_tx_polarity_flip_physical{68.0}=0x0
+phy_chain_tx_polarity_flip_physical{69.0}=0x0
+phy_chain_tx_polarity_flip_physical{70.0}=0x0
+phy_chain_tx_polarity_flip_physical{71.0}=0x0
+phy_chain_tx_polarity_flip_physical{72.0}=0x0
+phy_chain_tx_polarity_flip_physical{73.0}=0x0
+phy_chain_tx_polarity_flip_physical{74.0}=0x0
+phy_chain_tx_polarity_flip_physical{75.0}=0x0
+phy_chain_tx_polarity_flip_physical{76.0}=0x0
+phy_chain_tx_polarity_flip_physical{77.0}=0x0
+phy_chain_tx_polarity_flip_physical{78.0}=0x0
+phy_chain_tx_polarity_flip_physical{79.0}=0x0
+phy_chain_tx_polarity_flip_physical{80.0}=0x0
+portmap_1=1:25
+portmap_2=2:25
+portmap_3=3:25
+portmap_4=4:25
+portmap_5=5:25
+portmap_6=6:25
+portmap_7=7:25
+portmap_8=8:25
+portmap_9=9:25
+portmap_10=10:25
+portmap_11=11:25
+portmap_12=12:25
+portmap_13=13:25
+portmap_14=14:25
+portmap_15=15:25
+portmap_16=16:25
+portmap_17=17:25
+portmap_18=18:25
+portmap_19=19:25
+portmap_20=20:25
+portmap_21=21:25
+portmap_22=22:25
+portmap_23=23:25
+portmap_24=24:25
+portmap_25=25:100:4
+portmap_26=29:100:4
+portmap_27=33:100:4
+portmap_28=37:100:4
+portmap_33=57:25
+portmap_34=58:25
+portmap_35=59:25
+portmap_36=60:25
+portmap_37=61:25
+portmap_38=62:25
+portmap_39=63:25
+portmap_40=64:25
+portmap_41=65:25
+portmap_42=66:25
+portmap_43=67:25
+portmap_44=68:25
+portmap_45=69:25
+portmap_46=70:25
+portmap_47=71:25
+portmap_48=72:25
+portmap_49=73:25
+portmap_50=74:25
+portmap_51=75:25
+portmap_52=76:25
+portmap_53=77:25
+portmap_54=78:25
+portmap_55=79:25
+portmap_56=80:25
+portmap_57=41:100:4
+portmap_58=45:100:4
+portmap_59=49:100:4
+portmap_60=53:100:4
+port_flex_enable=1
+port_init_autoneg_1=0
+port_init_autoneg_5=0
+port_init_autoneg_9=0
+port_init_autoneg_13=0
+port_init_autoneg_17=0
+port_init_autoneg_21=0
+port_init_autoneg_25=0
+port_init_autoneg_26=0
+port_init_autoneg_27=0
+port_init_autoneg_28=0
+port_init_autoneg_33=0
+port_init_autoneg_37=0
+port_init_autoneg_41=0
+port_init_autoneg_45=0
+port_init_autoneg_49=0
+port_init_autoneg_53=0
+port_init_autoneg_57=0
+port_init_autoneg_58=0
+port_init_autoneg_59=0
+port_init_autoneg_60=0
+port_phy_addr_1=0xff
+port_phy_addr_5=0xff
+port_phy_addr_9=0xff
+port_phy_addr_13=0xff
+port_phy_addr_17=0xff
+port_phy_addr_21=0xff
+port_phy_addr_25=0xff
+port_phy_addr_26=0xff
+port_phy_addr_27=0xff
+port_phy_addr_28=0xff
+port_phy_addr_33=0xff
+port_phy_addr_37=0xff
+port_phy_addr_41=0xff
+port_phy_addr_45=0xff
+port_phy_addr_49=0xff
+port_phy_addr_53=0xff
+port_phy_addr_57=0xff
+port_phy_addr_58=0xff
+port_phy_addr_59=0xff
+port_phy_addr_60=0xff
+robust_hash_disable_egress_vlan=1
+robust_hash_disable_mpls=1
+robust_hash_disable_vlan=1
+serdes_core_rx_polarity_flip_physical{1}=0xa
+serdes_core_rx_polarity_flip_physical{5}=0x5
+serdes_core_rx_polarity_flip_physical{9}=0x5
+serdes_core_rx_polarity_flip_physical{13}=0x5
+serdes_core_rx_polarity_flip_physical{17}=0xa
+serdes_core_rx_polarity_flip_physical{21}=0x5
+serdes_core_rx_polarity_flip_physical{25}=0x0
+serdes_core_rx_polarity_flip_physical{29}=0xc
+serdes_core_rx_polarity_flip_physical{33}=0x3
+serdes_core_rx_polarity_flip_physical{37}=0x1
+serdes_core_rx_polarity_flip_physical{41}=0x9
+serdes_core_rx_polarity_flip_physical{45}=0x9
+serdes_core_rx_polarity_flip_physical{49}=0x8
+serdes_core_rx_polarity_flip_physical{53}=0x9
+serdes_core_rx_polarity_flip_physical{57}=0xa
+serdes_core_rx_polarity_flip_physical{61}=0x5
+serdes_core_rx_polarity_flip_physical{65}=0xa
+serdes_core_rx_polarity_flip_physical{69}=0xa
+serdes_core_rx_polarity_flip_physical{73}=0xa
+serdes_core_rx_polarity_flip_physical{77}=0x5
+serdes_core_tx_polarity_flip_physical{1}=0x0
+serdes_core_tx_polarity_flip_physical{5}=0x0
+serdes_core_tx_polarity_flip_physical{9}=0x0
+serdes_core_tx_polarity_flip_physical{13}=0x0
+serdes_core_tx_polarity_flip_physical{17}=0x0
+serdes_core_tx_polarity_flip_physical{21}=0x0
+serdes_core_tx_polarity_flip_physical{25}=0x0
+serdes_core_tx_polarity_flip_physical{29}=0x0
+serdes_core_tx_polarity_flip_physical{33}=0x0
+serdes_core_tx_polarity_flip_physical{37}=0x8
+serdes_core_tx_polarity_flip_physical{41}=0x0
+serdes_core_tx_polarity_flip_physical{45}=0x8
+serdes_core_tx_polarity_flip_physical{49}=0x1
+serdes_core_tx_polarity_flip_physical{53}=0x0
+serdes_core_tx_polarity_flip_physical{57}=0xf
+serdes_core_tx_polarity_flip_physical{61}=0x7
+serdes_core_tx_polarity_flip_physical{65}=0x0
+serdes_core_tx_polarity_flip_physical{69}=0x0
+serdes_core_tx_polarity_flip_physical{73}=0x0
+serdes_core_tx_polarity_flip_physical{77}=0x0
+tdma_timeout_usec=15000000
+tslam_timeout_usec=15000000
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/default_sku b/device/arista/x86_64-arista_7050sx3_48yc8/default_sku
new file mode 100644
index 000000000000..4332a11e9f75
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/default_sku
@@ -0,0 +1 @@
+Arista-7050SX3-48YC8 t1
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/platform_reboot b/device/arista/x86_64-arista_7050sx3_48yc8/platform_reboot
new file mode 120000
index 000000000000..7f94a49e38b0
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/platform_reboot
@@ -0,0 +1 @@
+../x86_64-arista_common/platform_reboot
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/plugins/eeprom.py b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/eeprom.py
new file mode 120000
index 000000000000..35cfaff3de4e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/eeprom.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/eeprom.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/plugins/led_control.py b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/led_control.py
new file mode 120000
index 000000000000..8d733780117e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/led_control.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/led_control.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/plugins/psuutil.py b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/psuutil.py
new file mode 120000
index 000000000000..2b0024ade969
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/psuutil.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/psuutil.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/plugins/sfputil.py b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/sfputil.py
new file mode 120000
index 000000000000..c333e23763d7
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/plugins/sfputil.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/sfputil.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/pmon_daemon_control.json b/device/arista/x86_64-arista_7050sx3_48yc8/pmon_daemon_control.json
new file mode 120000
index 000000000000..51d5ab7b0059
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/sensors.conf b/device/arista/x86_64-arista_7050sx3_48yc8/sensors.conf
new file mode 100644
index 000000000000..c6c60f294675
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/sensors.conf
@@ -0,0 +1,50 @@
+# libsensors configuration file for DCS-7050SX3-48YC8
+# ---------------------------------------------------
+#
+
+bus "i2c-8" "SCD 0000:02:00.0 SMBus master 0 bus 0"
+bus "i2c-9" "SCD 0000:02:00.0 SMBus master 0 bus 1"
+bus "i2c-10" "SCD 0000:02:00.0 SMBus master 0 bus 2"
+bus "i2c-72" "SCD 0000:00:09.0 SMBus master 0 bus 2"
+
+chip "k10temp-pci-00c3"
+    label temp1 "Cpu temp sensor"
+
+chip "pmbus-i2c-8-58"
+    label temp1 "Power supply 1 hotspot sensor"
+    label temp2 "Power supply 1 inlet temp sensor"
+    label temp3 "Power supply 1 sensor"
+
+chip "pmbus-i2c-9-58"
+    label temp1 "Power supply 2 hotspot sensor"
+    label temp2 "Power supply 2 inlet temp sensor"
+    label temp3 "Power supply 2 sensor"
+
+chip "max6658-i2c-72-4c"
+    label temp1 "Board temp sensor"
+    set temp1_max 75
+    set temp1_crit 85
+
+    label temp2 "Front panel temp sensor"
+    set temp2_max 75
+    set temp2_crit 85
+
+chip "tmp464-i2c-10-48"
+    label temp1 "Switch Card temp sensor"
+    set temp1_max 100
+    set temp1_crit 110
+
+    label temp2 "Front-panel temp sensor"
+    set temp2_max 65
+    set temp2_crit 75
+
+    label temp3 "Front PCB temp sensor"
+    set temp3_max 75
+    set temp3_crit 80
+
+    ignore temp4
+    ignore temp5
+    ignore temp6
+    ignore temp7
+    ignore temp8
+    ignore temp9
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/system_health_monitoring_config.json b/device/arista/x86_64-arista_7050sx3_48yc8/system_health_monitoring_config.json
new file mode 120000
index 000000000000..1185f771fa8e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/system_health_monitoring_config.json
@@ -0,0 +1 @@
+../x86_64-arista_common/system_health_monitoring_config.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/thermal_policy.json b/device/arista/x86_64-arista_7050sx3_48yc8/thermal_policy.json
new file mode 120000
index 000000000000..0991dc7f3638
--- /dev/null
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm b/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm
index 4467d5d033ce..4e9d02fdc821 100644
--- a/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm
+++ b/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -135,13 +135,13 @@ tm_port_header_type_in_203.BCM8869X=INJECTED_2_PP
 tm_port_header_type_out_203.BCM8869X=ETH
 
 sat_enable.BCM8869X=1
-tm_port_header_type_out_218.BCM8869X=CPU
-tm_port_header_type_in_218.BCM8869X=INJECTED_2
+tm_port_header_type_out_210.BCM8869X=CPU
+tm_port_header_type_in_210.BCM8869X=INJECTED_2
 
-tm_port_header_type_in_232.BCM8869X=INJECTED_2
-tm_port_header_type_out_232.BCM8869X=CPU
-tm_port_header_type_in_233.BCM8869X=INJECTED_2
-tm_port_header_type_out_233.BCM8869X=CPU
+tm_port_header_type_in_211.BCM8869X=INJECTED_2
+tm_port_header_type_out_211.BCM8869X=CPU
+tm_port_header_type_in_212.BCM8869X=INJECTED_2
+tm_port_header_type_out_212.BCM8869X=CPU
 
 tm_port_header_type_in_240.BCM8869X=INJECTED_2
 tm_port_header_type_out_240.BCM8869X=RAW
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm
index 3d89e2b41b4a..541e26302dc0 100644
--- a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm
+++ b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm
@@ -131,13 +131,13 @@ tm_port_header_type_in_203.BCM8869X=INJECTED_2_PP
 tm_port_header_type_out_203.BCM8869X=ETH
 
 sat_enable.BCM8869X=1
-tm_port_header_type_out_218.BCM8869X=CPU
-tm_port_header_type_in_218.BCM8869X=INJECTED_2
+tm_port_header_type_out_210.BCM8869X=CPU
+tm_port_header_type_in_210.BCM8869X=INJECTED_2
 
-tm_port_header_type_in_232.BCM8869X=INJECTED_2
-tm_port_header_type_out_232.BCM8869X=CPU
-tm_port_header_type_in_233.BCM8869X=INJECTED_2
-tm_port_header_type_out_233.BCM8869X=CPU
+tm_port_header_type_in_211.BCM8869X=INJECTED_2
+tm_port_header_type_out_211.BCM8869X=CPU
+tm_port_header_type_in_212.BCM8869X=INJECTED_2
+tm_port_header_type_out_212.BCM8869X=CPU
 
 tm_port_header_type_in_240.BCM8869X=INJECTED_2
 tm_port_header_type_out_240.BCM8869X=RAW
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm
index 654a4d8f158f..ca3c266eadfc 100644
--- a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm
+++ b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm
@@ -108,7 +108,7 @@ ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139
 
 port_priorities.BCM8869X=8
 
-ucode_port_240.BCM8869X=OLP:core_0.240
+ucode_port_213.BCM8869X=OLP:core_0.213
 
 sw_state_max_size.BCM8869X=750000000
 
@@ -135,16 +135,16 @@ tm_port_header_type_in_203.BCM8869X=INJECTED_2_PP
 tm_port_header_type_out_203.BCM8869X=ETH
 
 sat_enable.BCM8869X=1
-tm_port_header_type_out_218.BCM8869X=CPU
-tm_port_header_type_in_218.BCM8869X=INJECTED_2
+tm_port_header_type_out_210.BCM8869X=CPU
+tm_port_header_type_in_210.BCM8869X=INJECTED_2
 
-tm_port_header_type_in_232.BCM8869X=INJECTED_2
-tm_port_header_type_out_232.BCM8869X=CPU
-tm_port_header_type_in_233.BCM8869X=INJECTED_2
-tm_port_header_type_out_233.BCM8869X=CPU
+tm_port_header_type_in_211.BCM8869X=INJECTED_2
+tm_port_header_type_out_211.BCM8869X=CPU
+tm_port_header_type_in_212.BCM8869X=INJECTED_2
+tm_port_header_type_out_212.BCM8869X=CPU
 
-tm_port_header_type_in_240.BCM8869X=INJECTED_2
-tm_port_header_type_out_240.BCM8869X=RAW
+tm_port_header_type_in_213.BCM8869X=INJECTED_2
+tm_port_header_type_out_213.BCM8869X=RAW
 
 dtm_flow_mapping_mode_region_64.BCM8869X=3
 dtm_flow_mapping_mode_region_65.BCM8869X=3
diff --git a/device/arista/x86_64-arista_7280cr3mk_32d4 b/device/arista/x86_64-arista_7280cr3mk_32d4
new file mode 120000
index 000000000000..50478132d933
--- /dev/null
+++ b/device/arista/x86_64-arista_7280cr3mk_32d4
@@ -0,0 +1 @@
+x86_64-arista_7280cr3_32d4
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3mk_32p4 b/device/arista/x86_64-arista_7280cr3mk_32p4
new file mode 120000
index 000000000000..d6e2ddbb64bd
--- /dev/null
+++ b/device/arista/x86_64-arista_7280cr3mk_32p4
@@ -0,0 +1 @@
+x86_64-arista_7280cr3_32p4
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins b/device/arista/x86_64-arista_7800_sup/plugins
deleted file mode 120000
index 789a45fcace9..000000000000
--- a/device/arista/x86_64-arista_7800_sup/plugins
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_common/plugins
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins/eeprom.py b/device/arista/x86_64-arista_7800_sup/plugins/eeprom.py
new file mode 120000
index 000000000000..35cfaff3de4e
--- /dev/null
+++ b/device/arista/x86_64-arista_7800_sup/plugins/eeprom.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/eeprom.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins/led_control.py b/device/arista/x86_64-arista_7800_sup/plugins/led_control.py
new file mode 120000
index 000000000000..8d733780117e
--- /dev/null
+++ b/device/arista/x86_64-arista_7800_sup/plugins/led_control.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/led_control.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins/psuutil.py b/device/arista/x86_64-arista_7800_sup/plugins/psuutil.py
new file mode 120000
index 000000000000..2b0024ade969
--- /dev/null
+++ b/device/arista/x86_64-arista_7800_sup/plugins/psuutil.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/psuutil.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins/sfputil.py b/device/arista/x86_64-arista_7800_sup/plugins/sfputil.py
new file mode 120000
index 000000000000..c333e23763d7
--- /dev/null
+++ b/device/arista/x86_64-arista_7800_sup/plugins/sfputil.py
@@ -0,0 +1 @@
+../../x86_64-arista_common/plugins/sfputil.py
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7800_sup/plugins/udevprefix.conf b/device/arista/x86_64-arista_7800_sup/plugins/udevprefix.conf
new file mode 100644
index 000000000000..e2f2966c864d
--- /dev/null
+++ b/device/arista/x86_64-arista_7800_sup/plugins/udevprefix.conf
@@ -0,0 +1 @@
+ttySCD
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_common/system_health_monitoring_config.json b/device/arista/x86_64-arista_common/system_health_monitoring_config.json
index 1733fcffdba3..5ceec23fd26f 100644
--- a/device/arista/x86_64-arista_common/system_health_monitoring_config.json
+++ b/device/arista/x86_64-arista_common/system_health_monitoring_config.json
@@ -9,8 +9,8 @@
     "user_defined_checkers": [],
     "polling_interval": 60,
     "led_color": {
-        "fault": "orange",
+        "fault": "amber",
         "normal": "green",
-        "booting": "orange_blink"
+        "booting": "amber_blink"
     }
 }
diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 2384357c7a97..7e1f41ac04c4 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -510,6 +510,14 @@ write_platform_specific_cmdline() {
         aboot_machine=arista_7050cx3_32s
         flash_size=3700
     fi
+    if [ "$sid" = "Marysville" ]; then
+        aboot_machine=arista_7050sx3_48yc8
+        flash_size=7382
+    fi
+    if [ "$sid" = "Marysville10" ]; then
+        aboot_machine=arista_7050sx3_48c8
+        flash_size=7382
+    fi
     if [ "$sid" = "BlackhawkO" ]; then
         aboot_machine=arista_7060px4_32
         flash_size=28000
@@ -520,19 +528,21 @@ write_platform_specific_cmdline() {
     fi
     if [ "$sid" = "Smartsville" ]; then
         aboot_machine=arista_7280cr3_32p4
-        flash_size=7382
     fi
     if [ "$sid" = "SmartsvilleBK" ]; then
         aboot_machine=arista_7280cr3k_32p4
-        flash_size=7382
+    fi
+    if [ "$sid" = "SmartsvilleBkMs" ] || [ "$sid" = "SmartsvilleBkMsTpm" ]; then
+        aboot_machine=arista_7280cr3mk_32p4
     fi
     if [ "$sid" = "SmartsvilleDD" ]; then
         aboot_machine=arista_7280cr3_32d4
-        flash_size=7382
     fi
     if [ "$sid" = "SmartsvilleDDBK" ]; then
         aboot_machine=arista_7280cr3k_32d4
-        flash_size=7382
+    fi
+    if [ "$sid" = "SmartsvilleDDBkMs" ] || [ "$sid" = "SmartsvilleDDBkMsTpm" ]; then
+        aboot_machine=arista_7280cr3mk_32d4
     fi
     if [ "$sid" = "Clearwater2" ]; then
         aboot_machine=arista_7800r3_48cq2_lc
@@ -547,6 +557,10 @@ write_platform_specific_cmdline() {
         flash_size=30000
         sonic_mode=$supervisor_mode
     fi
+    if [ "$sid" = "SmartsvilleBkMs" ]; then
+        aboot_machine=arista_7280cr3mk_32p4
+        flash_size=7382
+    fi
     if in_array "$platform" "rook" "magpie" "woodpecker" "sprucefish"; then
         cmdline_add tsc=reliable
         cmdline_add pcie_ports=native
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 937ea8abc1de..86f7b81834a1 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 937ea8abc1de457b26b7bb7a5208dab6ce40f4a1
+Subproject commit 86f7b81834a1093d1df644b09232ddacb40784ef
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 937ea8abc1de..86f7b81834a1 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 937ea8abc1de457b26b7bb7a5208dab6ce40f4a1
+Subproject commit 86f7b81834a1093d1df644b09232ddacb40784ef

From 08bf372b3436244210accf33aec186a14e81c1fd Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Thu, 18 Feb 2021 11:25:03 -0800
Subject: [PATCH 0214/1674] [sonic-swss-common] Submodule Update (#6812)

Change in this update:
    b75aab7 [swss-common] Add LINKMGR CFG and MUX LINKMGR state table names (#421)
    4a77d1c [ci]: add vstest (#459)
    07258a6 [ci]: use build template (#457)
    ddcae3e runRedisScript api to process integer returned by script run in the redis (#447)
    33d89c7 [systemlag] Schema defs for system lag (#448)
    af01f37 spell check fixes (#456)
    7afd43d Update to make getNamespaces() API at par with the get_ns_list() swssdk-py API. (#455)

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 9e91e0d89139..b75aab763602 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 9e91e0d891398b468b8087682ae91335791fac51
+Subproject commit b75aab7636021199d3f6498eb2295f8e9dc34d73

From f700dcad5cd83d1385ef5c02618979f91a5a7199 Mon Sep 17 00:00:00 2001
From: Vadym Hlushko <62022266+vadymhlushko-mlnx@users.noreply.github.com>
Date: Sun, 28 Feb 2021 18:28:00 +0200
Subject: [PATCH 0215/1674] [Mellanox] Removed files related to the Dynamic
 Port Breakout feature (#6880)

- Why I did it
While DPB files are provided, SONiC community deploy via minigraph is not supported.
As of that platfrom.json and hwsku.json files related to Mellanox platforms are removed for now.

- How I did it
Remove platfrom.json and hwsku.json files for Mellanox platforms/SKU
---
 .../ACS-MSN3700C/hwsku.json                   | 100 ---------
 .../x86_64-mlnx_msn3700c-r0/platform.json     | 196 ------------------
 .../ACS-MSN4700/hwsku.json                    | 100 ---------
 .../x86_64-mlnx_msn4700-r0/platform.json      | 196 ------------------
 4 files changed, 592 deletions(-)
 delete mode 100644 device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/hwsku.json
 delete mode 100644 device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
 delete mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/hwsku.json
 delete mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/platform.json

diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/hwsku.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/hwsku.json
deleted file mode 100644
index 7c5a8c1d95d2..000000000000
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/hwsku.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet4": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet8": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet12": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet16": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet20": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet24": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet28": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet32": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet36": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet40": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet44": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet48": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet52": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet56": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet60": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet64": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet68": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet72": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet76": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet80": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet84": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet88": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet92": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet96": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet100": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet104": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet108": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet112": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet116": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet120": {
-            "default_brkout_mode": "1x100G[40G]"
-        },
-        "Ethernet124": {
-            "default_brkout_mode": "1x100G[40G]"
-        }
-    }
-}
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
deleted file mode 100644
index 26eb952ab525..000000000000
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "index": "1,1,1,1",
-            "lanes": "0,1,2,3",
-            "alias_at_lanes": "etp1a, etp1b, etp1c, etp1d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet4": {
-            "index": "2,2,2,2",
-            "lanes": "4,5,6,7",
-            "alias_at_lanes": "etp2a, etp2b, etp2c, etp2d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet8": {
-            "index": "3,3,3,3",
-            "lanes": "8,9,10,11",
-            "alias_at_lanes": "etp3a, etp3b, etp3c, etp3d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet12": {
-            "index": "4,4,4,4",
-            "lanes": "12,13,14,15",
-            "alias_at_lanes": "etp4a, etp4b, etp4c, etp4d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet16": {
-            "index": "5,5,5,5",
-            "lanes": "16,17,18,19",
-            "alias_at_lanes": "etp5a, etp5b, etp5c, etp5d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet20": {
-            "index": "6,6,6,6",
-            "lanes": "20,21,22,23",
-            "alias_at_lanes": "etp6a, etp6b, etp6c, etp6d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet24": {
-            "index": "7,7,7,7",
-            "lanes": "24,25,26,27",
-            "alias_at_lanes": "etp7a, etp7b, etp7c, etp7d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet28": {
-            "index": "8,8,8,8",
-            "lanes": "28,29,30,31",
-            "alias_at_lanes": "etp8a, etp8b, etp8c, etp8d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet32": {
-            "index": "9,9,9,9",
-            "lanes": "32,33,34,35",
-            "alias_at_lanes": "etp9a, etp9b, etp9c, etp9d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet36": {
-            "index": "10,10,10,10",
-            "lanes": "36,37,38,39",
-            "alias_at_lanes": "etp10a, etp10b, etp10c, etp10d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet40": {
-            "index": "11,11,11,11",
-            "lanes": "40,41,42,43",
-            "alias_at_lanes": "etp11a, etp11b, etp11c, etp11d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet44": {
-            "index": "12,12,12,12",
-            "lanes": "44,45,46,47",
-            "alias_at_lanes": "etp12a, etp12b, etp12c, etp12d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet48": {
-            "index": "13,13,13,13",
-            "lanes": "48,49,50,51",
-            "alias_at_lanes": "etp13a, etp13b, etp13c, etp13d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet52": {
-            "index": "14,14,14,14",
-            "lanes": "52,53,54,55",
-            "alias_at_lanes": "etp14a, etp14b, etp14c, etp14d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet56": {
-            "index": "15,15,15,15",
-            "lanes": "56,57,58,59",
-            "alias_at_lanes": "etp15a, etp15b, etp15c, etp15d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet60": {
-            "index": "16,16,16,16",
-            "lanes": "60,61,62,63",
-            "alias_at_lanes": "etp16a, etp16b, etp16c, etp16d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet64": {
-            "index": "17,17,17,17",
-            "lanes": "64,65,66,67",
-            "alias_at_lanes": "etp17a, etp17b, etp17c, etp17d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet68": {
-            "index": "18,18,18,18",
-            "lanes": "68,69,70,71",
-            "alias_at_lanes": "etp18a, etp18b, etp18c, etp18d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet72": {
-            "index": "19,19,19,19",
-            "lanes": "72,73,74,75",
-            "alias_at_lanes": "etp19a, etp19b, etp19c, etp19d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet76": {
-            "index": "20,20,20,20",
-            "lanes": "76,77,78,79",
-            "alias_at_lanes": "etp20a, etp20b, etp20c, etp20d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet80": {
-            "index": "21,21,21,21",
-            "lanes": "80,81,82,83",
-            "alias_at_lanes": "etp21a, etp21b, etp21c, etp21d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet84": {
-            "index": "22,22,22,22",
-            "lanes": "84,85,86,87",
-            "alias_at_lanes": "etp22a, etp22b, etp22c, etp22d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet88": {
-            "index": "23,23,23,23",
-            "lanes": "88,89,90,91",
-            "alias_at_lanes": "etp23a, etp23b, etp23c, etp23d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet92": {
-            "index": "24,24,24,24",
-            "lanes": "92,93,94,95",
-            "alias_at_lanes": "etp24a, etp24b, etp24c, etp24d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet96": {
-            "index": "25,25,25,25",
-            "lanes": "96,97,98,99",
-            "alias_at_lanes": "etp25a, etp25b, etp25c, etp25d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet100": {
-            "index": "26,26,26,26",
-            "lanes": "100,101,102,103",
-            "alias_at_lanes": "etp26a, etp26b, etp26c, etp26d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet104": {
-            "index": "27,27,27,27",
-            "lanes": "104,105,106,107",
-            "alias_at_lanes": "etp27a, etp27b, etp27c, etp27d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet108": {
-            "index": "28,28,28,28",
-            "lanes": "108,109,110,111",
-            "alias_at_lanes": "etp28a, etp28b, etp28c, etp28d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet112": {
-            "index": "29,29,29,29",
-            "lanes": "112,113,114,115",
-            "alias_at_lanes": "etp29a, etp29b, etp29c, etp29d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet116": {
-            "index": "30,30,30,30",
-            "lanes": "116,117,118,119",
-            "alias_at_lanes": "etp30a, etp30b, etp30c, etp30d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet120": {
-            "index": "31,31,31,31",
-            "lanes": "120,121,122,123",
-            "alias_at_lanes": "etp31a, etp31b, etp31c, etp31d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        },
-        "Ethernet124": {
-            "index": "32,32,32,32",
-            "lanes": "124,125,126,127",
-            "alias_at_lanes": "etp32a, etp32b, etp32c, etp32d",
-            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
-        }
-    }
-}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/hwsku.json b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/hwsku.json
deleted file mode 100644
index 4c3dee3d17a7..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/hwsku.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet8": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet16": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet24": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet32": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet40": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet48": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet56": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet64": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet72": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet80": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet88": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet96": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet104": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet112": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet120": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet128": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet136": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet144": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet152": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet160": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet168": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet176": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet184": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet192": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet200": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet208": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet216": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet224": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet232": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet240": {
-            "default_brkout_mode": "1x400G[200G]"
-        }, 
-        "Ethernet248": {
-            "default_brkout_mode": "1x400G[200G]"
-        }
-    }
-}
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json
deleted file mode 100644
index 7a3d3d1048b9..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "index": "1,1,1,1,1,1,1,1", 
-            "lanes": "0,1,2,3,4,5,6,7", 
-            "alias_at_lanes": "etp1a, etp1b, etp1c, etp1d, etp1e, etp1f, etp1g, etp1h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet8": {
-            "index": "2,2,2,2,2,2,2,2", 
-            "lanes": "8,9,10,11,12,13,14,15", 
-            "alias_at_lanes": "etp2a, etp2b, etp2c, etp2d, etp2e, etp2f, etp2g, etp2h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet16": {
-            "index": "3,3,3,3,3,3,3,3", 
-            "lanes": "16,17,18,19,20,21,22,23", 
-            "alias_at_lanes": "etp3a, etp3b, etp3c, etp3d, etp3e, etp3f, etp3g, etp3h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet24": {
-            "index": "4,4,4,4,4,4,4,4", 
-            "lanes": "24,25,26,27,28,29,30,31", 
-            "alias_at_lanes": "etp4a, etp4b, etp4c, etp4d, etp4e, etp4f, etp4g, etp4h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet32": {
-            "index": "5,5,5,5,5,5,5,5", 
-            "lanes": "32,33,34,35,36,37,38,39", 
-            "alias_at_lanes": "etp5a, etp5b, etp5c, etp5d, etp5e, etp5f, etp5g, etp5h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet40": {
-            "index": "6,6,6,6,6,6,6,6", 
-            "lanes": "40,41,42,43,44,45,46,47", 
-            "alias_at_lanes": "etp6a, etp6b, etp6c, etp6d, etp6e, etp6f, etp6g, etp6h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet48": {
-            "index": "7,7,7,7,7,7,7,7", 
-            "lanes": "48,49,50,51,52,53,54,55", 
-            "alias_at_lanes": "etp7a, etp7b, etp7c, etp7d, etp7e, etp7f, etp7g, etp7h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet56": {
-            "index": "8,8,8,8,8,8,8,8", 
-            "lanes": "56,57,58,59,60,61,62,63", 
-            "alias_at_lanes": "etp8a, etp8b, etp8c, etp8d, etp8e, etp8f, etp8g, etp8h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet64": {
-            "index": "9,9,9,9,9,9,9,9", 
-            "lanes": "64,65,66,67,68,69,70,71", 
-            "alias_at_lanes": "etp9a, etp9b, etp9c, etp9d, etp9e, etp9f, etp9g, etp9h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet72": {
-            "index": "10,10,10,10,10,10,10,10", 
-            "lanes": "72,73,74,75,76,77,78,79", 
-            "alias_at_lanes": "etp10a, etp10b, etp10c, etp10d, etp10e, etp10f, etp10g, etp10h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet80": {
-            "index": "11,11,11,11,11,11,11,11", 
-            "lanes": "80,81,82,83,84,85,86,87", 
-            "alias_at_lanes": "etp11a, etp11b, etp11c, etp11d, etp11e, etp11f, etp11g, etp11h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet88": {
-            "index": "12,12,12,12,12,12,12,12", 
-            "lanes": "88,89,90,91,92,93,94,95", 
-            "alias_at_lanes": "etp12a, etp12b, etp12c, etp12d, etp12e, etp12f, etp12g, etp12h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet96": {
-            "index": "13,13,13,13,13,13,13,13", 
-            "lanes": "96,97,98,99,100,101,102,103", 
-            "alias_at_lanes": "etp13a, etp13b, etp13c, etp13d, etp13e, etp13f, etp13g, etp13h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet104": {
-            "index": "14,14,14,14,14,14,14,14", 
-            "lanes": "104,105,106,107,108,109,110,111", 
-            "alias_at_lanes": "etp14a, etp14b, etp14c, etp14d, etp14e, etp14f, etp14g, etp14h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet112": {
-            "index": "15,15,15,15,15,15,15,15", 
-            "lanes": "112,113,114,115,116,117,118,119", 
-            "alias_at_lanes": "etp15a, etp15b, etp15c, etp15d, etp15e, etp15f, etp15g, etp15h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet120": {
-            "index": "16,16,16,16,16,16,16,16", 
-            "lanes": "120,121,122,123,124,125,126,127", 
-            "alias_at_lanes": "etp16a, etp16b, etp16c, etp16d, etp16e, etp16f, etp16g, etp16h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet128": {
-            "index": "17,17,17,17,17,17,17,17", 
-            "lanes": "128,129,130,131,132,133,134,135", 
-            "alias_at_lanes": "etp17a, etp17b, etp17c, etp17d, etp17e, etp17f, etp17g, etp17h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet136": {
-            "index": "18,18,18,18,18,18,18,18", 
-            "lanes": "136,137,138,139,140,141,142,143", 
-            "alias_at_lanes": "etp18a, etp18b, etp18c, etp18d, etp18e, etp18f, etp18g, etp18h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet144": {
-            "index": "19,19,19,19,19,19,19,19", 
-            "lanes": "144,145,146,147,148,149,150,151", 
-            "alias_at_lanes": "etp19a, etp19b, etp19c, etp19d, etp19e, etp19f, etp19g, etp19h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet152": {
-            "index": "20,20,20,20,20,20,20,20", 
-            "lanes": "152,153,154,155,156,157,158,159", 
-            "alias_at_lanes": "etp20a, etp20b, etp20c, etp20d, etp20e, etp20f, etp20g, etp20h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet160": {
-            "index": "21,21,21,21,21,21,21,21", 
-            "lanes": "160,161,162,163,164,165,166,167", 
-            "alias_at_lanes": "etp21a, etp21b, etp21c, etp21d, etp21e, etp21f, etp21g, etp21h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet168": {
-            "index": "22,22,22,22,22,22,22,22", 
-            "lanes": "168,169,170,171,172,173,174,175", 
-            "alias_at_lanes": "etp22a, etp22b, etp22c, etp22d, etp22e, etp22f, etp22g, etp22h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet176": {
-            "index": "23,23,23,23,23,23,23,23", 
-            "lanes": "176,177,178,179,180,181,182,183", 
-            "alias_at_lanes": "etp23a, etp23b, etp23c, etp23d, etp23e, etp23f, etp23g, etp23h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet184": {
-            "index": "24,24,24,24,24,24,24,24", 
-            "lanes": "184,185,186,187,188,189,190,191", 
-            "alias_at_lanes": "etp24a, etp24b, etp24c, etp24d, etp24e, etp24f, etp24g, etp24h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet192": {
-            "index": "25,25,25,25,25,25,25,25", 
-            "lanes": "192,193,194,195,196,197,198,199", 
-            "alias_at_lanes": "etp25a, etp25b, etp25c, etp25d, etp25e, etp25f, etp25g, etp25h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet200": {
-            "index": "26,26,26,26,26,26,26,26", 
-            "lanes": "200,201,202,203,204,205,206,207", 
-            "alias_at_lanes": "etp26a, etp26b, etp26c, etp26d, etp26e, etp26f, etp26g, etp26h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet208": {
-            "index": "27,27,27,27,27,27,27,27", 
-            "lanes": "208,209,210,211,212,213,214,215", 
-            "alias_at_lanes": "etp27a, etp27b, etp27c, etp27d, etp27e, etp27f, etp27g, etp27h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet216": {
-            "index": "28,28,28,28,28,28,28,28", 
-            "lanes": "216,217,218,219,220,221,222,223", 
-            "alias_at_lanes": "etp28a, etp28b, etp28c, etp28d, etp28e, etp28f, etp28g, etp28h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet224": {
-            "index": "29,29,29,29,29,29,29,29", 
-            "lanes": "224,225,226,227,228,229,230,231", 
-            "alias_at_lanes": "etp29a, etp29b, etp29c, etp29d, etp29e, etp29f, etp29g, etp29h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet232": {
-            "index": "30,30,30,30,30,30,30,30", 
-            "lanes": "232,233,234,235,236,237,238,239", 
-            "alias_at_lanes": "etp30a, etp30b, etp30c, etp30d, etp30e, etp30f, etp30g, etp30h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet240": {
-            "index": "31,31,31,31,31,31,31,31", 
-            "lanes": "240,241,242,243,244,245,246,247", 
-            "alias_at_lanes": "etp31a, etp31b, etp31c, etp31d, etp31e, etp31f, etp31g, etp31h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }, 
-        "Ethernet248": {
-            "index": "32,32,32,32,32,32,32,32", 
-            "lanes": "248,249,250,251,252,253,254,255", 
-            "alias_at_lanes": "etp32a, etp32b, etp32c, etp32d, etp32e, etp32f, etp32g, etp32h", 
-            "breakout_modes": "1x400G[200G],2x200G[100G,40G],4x100G"
-        }
-    }
-}
\ No newline at end of file

From f355ce18ec9487d494bc8ec2956be01f2aef351d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 25 Feb 2021 13:44:58 +0800
Subject: [PATCH 0216/1674] Add azure pipelines for reproducible build (#6870)

* Add azure pipelines for reproducible build

* Add always build flag for upgrade build

* Fix the build version ubuntu-20.04
---
 .azure-pipelines/azure-pipelines-Official.yml |  31 +++++
 .../azure-pipelines-UpgrateVersion.yml        | 109 ++++++++++++++++++
 .azure-pipelines/azure-pipelines-build.yml    |  72 ++++++++++++
 .../azure-pipelines-job-groups.yml            |  53 +++++++++
 4 files changed, 265 insertions(+)
 create mode 100644 .azure-pipelines/azure-pipelines-Official.yml
 create mode 100644 .azure-pipelines/azure-pipelines-UpgrateVersion.yml
 create mode 100644 .azure-pipelines/azure-pipelines-build.yml
 create mode 100644 .azure-pipelines/azure-pipelines-job-groups.yml

diff --git a/.azure-pipelines/azure-pipelines-Official.yml b/.azure-pipelines/azure-pipelines-Official.yml
new file mode 100644
index 000000000000..a5a08167ca1d
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-Official.yml
@@ -0,0 +1,31 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger: none
+pr: none
+
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily Build
+  branches:
+    include:
+    - 202012
+  always: true
+
+pool: sonicbld
+
+stages:
+- stage: Build
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+      postSteps:
+      - script: |
+          make freeze
+          git status files/build/versions
+          git add files/build/versions
+          git diff HEAD files/build/versions
+        displayName: "Show git diff"
diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
new file mode 100644
index 000000000000..172cccab0783
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -0,0 +1,109 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger: none
+pr: none
+
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily Build
+  branches:
+    include:
+    - 202012
+  always: true
+
+pool: sonicbld
+
+stages:
+- stage: Build
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildSlave: y
+- stage: UpgradeVersions
+  jobs:
+  - job: UpgradeVersions
+    pool:
+      vmImage: 'ubuntu-20.04'
+    steps:
+    - script: |
+        if [ -z "$(which gh)" ]; then
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0
+          sudo apt-add-repository https://cli.github.com/packages
+          sudo apt update
+          sudo apt install gh
+        fi
+      displayName: 'Install gh'
+    - checkout: self
+      displayName: 'Checkout code'
+    - download: current
+      patterns: '**/versions-*'
+    - script: |
+        mkdir -p target
+        default_platform=broadcom
+        artifacts=$(find $(Pipeline.Workspace) -maxdepth 1 -type d -name 'sonic-buildimage.*' | grep -v "sonic-buildimage.${default_platform}")
+        echo "artifacts$artifacts"
+        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/versions target/
+        make freeze FREEZE_VERSION_OPTIONS=-r
+        find files/build/versions 
+        for artifact in $artifacts
+        do
+          rm -rf target/versions
+          cp -r $artifact/versions target/
+          make freeze FREEZE_VERSION_OPTIONS="-a -d"
+        done
+        git diff files/build/versions
+      displayName: 'Freeze Versions'
+    - script: |
+        if [ -z "$GIT_USER" ]; then
+          echo "Skipped to send the pull request, GIT_USER not set."
+          exit 0
+        fi
+        GIT_STATUS=$(git status  --porcelain files/build/versions)
+        if [ -z "$GIT_STATUS" ]; then
+          echo "Skipped to send the pull request, no version change in files/build/versions"
+          exit 0
+        fi
+        if [ ! -d "$HOME" ]; then
+          sudo mkdir -p $HOME
+          sudo chown -R $(id -un):$(id -gn) $HOME
+        fi
+        SOURCE_BRANCH=$(Build.SourceBranch)
+        REPO_NAME=$(Build.Repository.Name)
+        [ -z "$GIT_REPO" ] && GIT_REPO=${REPO_NAME#*/}
+        BRANCH_NAME=repd/versions/${SOURCE_BRANCH#refs/heads/}
+        echo '#!/bin/bash' > git_env_password.sh
+        echo 'echo $GIT_PASSWORD' >> git_env_password.sh
+        chmod a+x git_env_password.sh
+        export GIT_ASKPASS=./git_env_password.sh
+
+        git config user.name $GIT_USER
+        git config credential.https://github.com.username $GIT_USER
+        git add files/build/versions
+        git commit -m "Update SONiC version files"
+        git checkout -b $BRANCH_NAME
+        git remote add remote https://github.com/$GIT_USER/$GIT_REPO
+        git push remote HEAD:refs/heads/$BRANCH_NAME -f
+        git branch -u remote/$BRANCH_NAME
+
+        echo $GIT_PASSWORD | gh auth login --with-token
+        TITLE="Upgrade SONiC Versions"
+        BODY="Upgrade SONiC Versions"
+        RET=0
+        if ! gh pr create -t "$TITLE" -b "$BODY" -B $(Build.SourceBranch) -R $(Build.Repository.Name) > pr.log 2>&1; then
+          if ! grep -q "already exists" pr.log; then
+            RET=1
+          fi
+        fi
+        cat pr.log
+        exit $RET
+      env:
+        GIT_USER: $(GIT_USER)
+        GIT_PASSWORD: $(GIT_PASSWORD)
+      displayName: 'Send Pull Request'
+    - publish: $(System.DefaultWorkingDirectory)/files/build/versions
+      artifact: 'sonic-buildimage.versions'
+      displayName: 'Archive SONiC versions'
+    
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
new file mode 100644
index 000000000000..550e2ccd9799
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -0,0 +1,72 @@
+parameters:
+- name: 'jobFilters'
+  type: object
+  default: ''
+- name: 'buildOptions'
+  type: string
+  default: 'SONIC_CONFIG_BUILD_JOBS=1'
+- name: 'buildSlave'
+  type: string
+  default: 'n'
+- name: 'postSteps'
+  type: stepList
+  default: []
+
+jobs:
+- template: azure-pipelines-job-groups.yml
+  parameters:
+    jobFilters: ${{ parameters.jobFilters }}
+    preSteps:
+      - script: |
+          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
+          if [ ! -z "$containers" ]; then
+            docker container kill $containers || true
+            sleep 5
+          fi
+          if [ "${{ parameters.buildSlave }}" == "y" ]; then
+            images=$(docker images 'sonic-slave-*' -a -q)
+            [ ! -z "$images" ] && docker rmi -f $images
+          fi
+          sudo rm -rf $(ls -A1)
+        displayName: 'Init'
+      - checkout: self
+        submodules: recursive
+        displayName: 'Checkout code'
+      - script: |
+          make ${{ parameters.buildOptions }} PLATFORM=$GROUP_NAME configure
+        displayName: 'Make configure'
+    postSteps:
+      - ${{ parameters.postSteps }}
+      - publish: $(System.DefaultWorkingDirectory)/target
+        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+        displayName: "Archive sonic image"
+    jobGroups:
+      - name: vs
+        script: |
+          sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
+          make ${{ parameters.buildOptions }} target/sonic-vs.img.gz
+      - name: broadcom
+        script: |
+          make ${{ parameters.buildOptions }} target/sonic-broadcom.bin target/sonic-aboot-broadcom.swi
+      - name: barefoot
+        script: |
+          make ${{ parameters.buildOptions }} target/sonic-barefoot.bin target/sonic-aboot-barefoot.swi
+      - name: centec
+        script: |
+          make ${{ parameters.buildOptions }} INSTALL_DEBUG_TOOLS=y target/sonic-centec.bin
+          mv target/sonic-centec.bin target/sonic-centec-dbg.bin
+          make ${{ parameters.buildOptions }} target/sonic-centec.bin
+          make ${{ parameters.buildOptions }} ENABLE_SYNCD_RPC=y target/docker-syncd-centec-rpc.gz
+      - name: innovium
+        script: |
+          make ${{ parameters.buildOptions }} SONIC_CONFIG_BUILD_JOBS=1 target/sonic-innovium.bin
+      - name: mellanox
+        script: |
+          make ${{ parameters.buildOptions }} target/sonic-mellanox.bin
+      - name: mellanox
+        extName: _rpc
+        script: |
+          make ${{ parameters.buildOptions }} ENABLE_SYNCD_RPC=y all
+      - name: nephos
+        script: |
+          make ${{ parameters.buildOptions }} target/sonic-nephos.bin
diff --git a/.azure-pipelines/azure-pipelines-job-groups.yml b/.azure-pipelines/azure-pipelines-job-groups.yml
new file mode 100644
index 000000000000..1ca5c932b0a6
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-job-groups.yml
@@ -0,0 +1,53 @@
+parameters:
+- name: 'preSteps'
+  type: stepList
+  default: []
+- name: "postSteps"
+  type: stepList
+  default: []
+- name: 'jobGroups'
+  type: object
+  default: []
+- name: 'jobVariables'
+  type: object
+  default: {}
+- name: 'scriptEnv'
+  type: object
+  default: ''
+- name: 'timeoutInMinutes'
+  type: 'number'
+  default: 1440
+- name: 'jobFilters'
+  type: object
+  default: ''
+
+jobs:
+- ${{ each jobGroup in parameters.jobGroups }}:
+  - ${{ if or(eq(parameters.jobFilters, ''), containsValue(parameters.jobFilters, jobGroup.name)) }}:
+    - job: ${{ replace(format('{0}{1}', jobGroup.name, jobGroup.extName), '-', '_') }}
+      ${{ each pair in jobGroup }}:
+        ${{ if not(in(pair.key, 'job', 'name', 'extName', 'variables', 'steps', 'script', 'scriptEnv')) }}:
+          ${{ pair.key }}: ${{ pair.value }}
+      ${{ if eq(jobGroup.timeoutInMinutes, '') }}:
+        timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      variables:
+        GROUP_NAME: ${{ jobGroup.name }}
+        GROUP_EXTNAME: '${{ jobGroup.extName }}'
+        GROUP_NAMES: ${{ join(',', parameters.jobGroups.*.name ) }}
+        ${{ if ne(jobGroup.variables, '') }}:
+          ${{ jobGroup.variables }}
+        ${{ each para in parameters.jobvariables }}:
+          ${{ if eq(jobGroup.variables[para.key], '') }}:
+            ${{ para.key }}: ${{ para.value }}
+      steps:
+      - ${{ parameters.preSteps }}
+      - ${{ if ne(jobGroup.script, '') }}:
+        - script: |
+            ${{ jobGroup.script }}
+          env:
+            ${{ if ne(parameters.scriptEnv, '') }}:
+              ${{ parameters.scriptEnv }}
+          displayName: 'JobScript'
+      - ${{ if ne(jobGroup.steps, '') }}:
+        - ${{ jobGroup.steps }}
+      - ${{ parameters.postSteps }}

From e3ab6b0494f5f8f81416ae733c2174f5e617c035 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Sun, 14 Feb 2021 13:36:04 -0500
Subject: [PATCH 0217/1674] [armhf build] Fix azure-storage dependency on
 cryptography package (#6780)

Fix marvell-armhf build break

The azure-storage package depends on the cryptography package. Newer
versions of cryptography require the rust compiler, the correct version
for which is not readily available in buster. Hence we pre-install an
older version here to satisfy the azure-storage dependency.
Note: This is not a problem for other architectures as pre-built versions
of cryptography are available for those. This sequence can be removed
after upgrading to debian bullseye.
---
 files/build_templates/sonic_debian_extension.j2 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index fd5a9735bfaf..e0199db84b99 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -388,12 +388,23 @@ sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_
 sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev
+
+if [[ $CONFIGURED_ARCH == armhf ]]; then
+    # The azure-storage package depends on the cryptography package. Newer
+    # versions of cryptography require the rust compiler, the correct version
+    # for which is not readily available in buster. Hence we pre-install an
+    # older version here to satisfy the azure-storage dependency.
+    # Note: This is not a problem for other architectures as pre-built versions
+    # of cryptography are available for those. This sequence can be removed
+    # after upgrading to debian bullseye.
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install cryptography==3.3.1
+fi
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-storage==0.36.0
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
 
 {% if include_kubernetes == "y" %}
 # Install remote Container mgmt package
-# Required even if include_kubernetes != y, as it contains the 
+# Required even if include_kubernetes != y, as it contains the
 # the container wrapper for docker start/stop/wait commands.
 #
 SONIC_CTRMGMT_WHEEL_NAME=$(basename {{sonic_ctrmgmt_py3_wheel_path}})
@@ -417,7 +428,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ctrmgrd.service
 # kubelet service is controlled by ctrmgrd daemon.
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable kubelet.service
 {% else %}
-# container script for docker commands, which is required as 
+# container script for docker commands, which is required as
 # all docker commands are replaced with container commands.
 # So just copy that file only.
 #

From 193fc248a054bfeccb870b230dff6897fb893127 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 3 Mar 2021 19:05:52 +0800
Subject: [PATCH 0218/1674] Update SONiC version files (#6927)

Co-authored-by: mssonicbld <vsts@fv-az95-714.mvvw4rc1ki0utgz3kiduxkzutd.ex.internal.cloudapp.net>
---
 .../build/build-sonic-slave-buster/versions-deb-buster |  1 +
 .../build/build-sonic-slave-buster/versions-py2        |  2 ++
 files/build/versions/default/versions-deb-buster       |  8 --------
 files/build/versions/default/versions-py2              |  7 ++-----
 files/build/versions/default/versions-py3              | 10 ++++++----
 files/build/versions/default/versions-web              |  6 +++---
 .../versions/dockers/docker-base-stretch/versions-py2  |  2 +-
 .../docker-syncd-centec-rpc/versions-deb-buster        |  2 ++
 .../dockers/docker-syncd-mlnx-rpc/versions-deb-buster  |  2 ++
 .../versions/dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../versions/dockers/sonic-slave-stretch/versions-py2  |  2 +-
 .../versions/dockers/sonic-slave-stretch/versions-py3  |  2 +-
 files/build/versions/host-image/versions-deb-buster    |  8 --------
 files/build/versions/host-image/versions-py2           |  7 ++-----
 files/build/versions/host-image/versions-py3           |  2 ++
 15 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 3681bae194bf..44be902df6cc 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -91,6 +91,7 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
+swss==1.0.0
 sx-acl-helper==1.mlnx.4.4.2308
 sx-acl-helper-dev==1.mlnx.4.4.2308
 sx-complib==1.mlnx.4.4.2308
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index 1f5c68c822d7..b740e4ebeb83 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -1,8 +1,10 @@
 bitarray==1.5.3
 contextlib2==0.6.0.post1
+functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
 ipaddress==1.0.23
+jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 pyangbind==0.6.0
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 0ac1d545ff28..6a82e67ada8c 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -174,15 +174,7 @@ perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
 psample==1.1-1
 python==2.7.16-1
-python-funcsigs==1.0.2-4
-python-functools32==3.2.3.2-3
-python-jsonschema==2.6.0-4
 python-minimal==2.7.16-1
-python-mock==2.0.0-4
-python-pbr==4.2.0-5
-python-pkg-resources==40.8.0-1
-python-setuptools==40.8.0-1
-python-six==1.12.0-1
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index 722c73af5c7d..6f9cf7f55055 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -1,7 +1,6 @@
 bitarray==1.5.3
 contextlib2==0.6.0.post1
 enum34==1.1.10
-funcsigs==1.0.2
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
@@ -10,19 +9,17 @@ Jinja2==2.11.3
 jsonschema==2.6.0
 lxml==4.6.2
 MarkupSafe==1.1.1
-mock==2.0.0
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
-pbr==4.2.0
 pyang==2.4.0
 pyangbind==0.6.0
 PyYAML==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
-singledispatch==3.6.0
-six==1.12.0
+singledispatch==3.6.1
+six==1.15.0
 thrift==0.13.0
 typing==3.7.4.3
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 0c5748ac896a..b00f6be0ec4c 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -6,13 +6,14 @@ click==7.1.2
 clickclick==20.10.2
 connexion==2.7.0
 Flask==1.1.2
-grpcio==1.35.0
+grpcio==1.36.0
 grpcio-tools==1.20.0
 hiredis==1.1.0
 idna==2.10
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
 inflection==0.5.1
 ipaddress==1.0.23
+isodate==0.6.0
 itsdangerous==1.1.0
 j2cli==0.3.10
 Jinja2==2.11.3
@@ -22,8 +23,9 @@ MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
-openapi-spec-validator==0.2.9
-protobuf==3.15.1
+openapi-schema-validator==0.1.4
+openapi-spec-validator==0.3.0
+protobuf==3.15.3
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index b0a9be7c03a7..38cd555295ad 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -12,11 +12,11 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.15.3-3-x86_64-deb.tgz==21caa3657b4100da3d08cf47961edc6f
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:61ac72e84956112656e2500701dd252c5d92f6e6==314a78da036bd5b54637cd17c54ccfd9
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/78a3df2/phy/phy-credo_1.0_amd64.deb==f0d5b5efa18cf775cdc3fccaba7ac181
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20201228_deb10.deb==d4045769acf8abd2ff176ff7e659cc69
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20201228_deb10.deb==b59589104e5189b1f598b8c46d3d6c8a
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210219_deb10.deb==4bd3f9c10d159d6d32e984c1de5a569c
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210219_deb10.deb==57e0b2f6a8412de63e307105571b7ed2
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
index 54e22f62fbab..e95c173112e9 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -1,4 +1,4 @@
 j2cli==0.3.10
-supervisor==4.2.1
+supervisor==4.2.2
 supervisord-dependent-startup==1.4.0
 toposort==1.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index e29438991e1b..1f61b36d3891 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -50,8 +50,10 @@ patch==2.7.6-3+deb10u1
 python-dev==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
 python-ptf==0.9-1
 python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
 python2-dev==2.7.16-1
 python2.7-dev==2.7.16-2+deb10u1
 syncd-rpc==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index e29438991e1b..1f61b36d3891 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -50,8 +50,10 @@ patch==2.7.6-3+deb10u1
 python-dev==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
 python-ptf==0.9-1
 python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
 python2-dev==2.7.16-1
 python2.7-dev==2.7.16-2+deb10u1
 syncd-rpc==1.0.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 891ccaee5773..4288fd5abc41 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 Babel==2.6.0
-bitarray==1.6.3
+bitarray==1.7.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index 2e3b1f405aa4..6588cc6c920d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -33,7 +33,7 @@ lazy-object-proxy==1.2.2
 lxml==4.6.2
 M2Crypto==0.36.0
 MarkupSafe==1.1.1
-mmh3==2.5.1
+mmh3==3.0.0
 mockredispy==2.9.3
 nose2==0.6.5
 PAM==0.4.2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 7b9cc6ebd6ad..b23a75b0d3f8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 Babel==2.3.4
-bitarray==1.6.3
+bitarray==1.7.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index e99804d35b45..01cb7447bb94 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -218,17 +218,9 @@ python-apt-common==1.8.4.3
 python-argcomplete==1.8.1-1
 python-bottle==0.12.15-2+deb10u1
 python-enum34==1.1.6-2
-python-funcsigs==1.0.2-4
-python-functools32==3.2.3.2-3
 python-ipaddr==2.2.0-2
-python-jsonschema==2.6.0-4
 python-minimal==2.7.16-1
-python-mock==2.0.0-4
-python-pbr==4.2.0-5
-python-pkg-resources==40.8.0-1
 python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python-six==1.12.0-1
 python-smbus==4.1-1
 python-sonic-platform-arista==1.0
 python-swsscommon==1.0.0
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index ad64a2a881b0..1359a2472dc6 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -3,7 +3,6 @@ bitarray==1.5.3
 bottle==0.12.15
 contextlib2==0.6.0.post1
 enum34==1.1.6
-funcsigs==1.0.2
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
@@ -13,11 +12,9 @@ Jinja2==2.11.3
 jsonschema==2.6.0
 lxml==4.6.2
 MarkupSafe==1.1.1
-mock==2.0.0
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
-pbr==4.2.0
 platform-arista==1.0
 pyang==2.4.0
 pyangbind==0.6.0
@@ -26,8 +23,8 @@ PyYAML==5.4.1
 redis==3.5.3
 scandir==1.10.0
 scapy==2.4.0
-singledispatch==3.6.0
-six==1.12.0
+singledispatch==3.6.1
+six==1.15.0
 thrift==0.13.0
 typing==3.7.4.3
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 502409926941..661e6c171995 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -14,6 +14,7 @@ ijson==2.6.1
 ipaddress==1.0.23
 Jinja2==2.11.3
 jsondiff==1.2.0
+jsonschema==2.6.0
 lxml==4.6.2
 M2Crypto==0.31.0
 MarkupSafe==1.1.1
@@ -33,6 +34,7 @@ PyYAML==5.4.1
 redis==3.5.3
 regex==2020.11.13
 requests==2.25.0
+scapy==2.4.4
 six==1.15.0
 tabulate==0.8.2
 thrift==0.13.0

From 5afaf2fe80a92bf8c27d28af26e8b1515472abb3 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 3 Mar 2021 07:44:43 -0800
Subject: [PATCH 0219/1674] [202012][swss][utils] advance submodule head
 (#6950)

swss:
* 9376ec6 2021-02-22 | [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (#1637) (HEAD -> 202012) [Lior Avramov]
* 6c285f6 2021-02-22 | Updated PFCWD to use single ACL table for PFCWD and MUX (#1620) [vmittal-msft]

utilities:
* d2f0e8f 2021-02-24 | [route_check]: Dropped redundant code. (#1463) (HEAD -> 202012, github/202012) [Renuka Manavalan]
* 9aaef9b 2021-02-25 | [Mellanox] Add support for SN4600 system (#1462) [DavidZagury]
* 60843dd 2021-03-01 | [reboot] Add platform-specific reboot cause update hook (#1454) [rkdevi27]
* d9c308c 2021-02-24 | [vlan] Vlan deletion is not allowed when there are members assigned to this VLAN. (#1420) [Eran Dahan]
* a72165a 2021-02-25 | [psushow] Add more output columns; Add option to output in JSON format (#1416) [Joe LeVeque]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 459d09b791db..9376ec694925 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 459d09b791db1bced2e7dc221d47e66f7d706dd0
+Subproject commit 9376ec694925c5cd715870e48a5aec7c8060c8a8
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 30d70691b379..d2f0e8fdd74b 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 30d70691b379f5e68e572fbc69f2d0db32e8c19c
+Subproject commit d2f0e8fdd74b21700d535843ca30c12d448bd04d

From 38a013939aad82f803d3d0ffbd65d29fd8be5f08 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 4 Mar 2021 06:25:02 +0800
Subject: [PATCH 0220/1674] [submodule][202012]: Update submodule pointer for
 snmpagent (#6954)

183162f Fix issue: expect redis pubsub data to be str type instead of bytes type (#196)

#### Why I did it

Update submoduel for snmpagent for 202012 branch since there is not 202012 branch for snmpagent

#### How I did it

Update submodule pointer

#### How to verify it

Run build
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 3885f193be05..183162fcc468 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 3885f193be05099659808092d22c5f69407cdda4
+Subproject commit 183162fcc468b3af774be2353b84bdf0b8365b46

From 9b570cb04d48d4cef665c9547cd3fb4a115cf234 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 3 Mar 2021 09:07:53 -0800
Subject: [PATCH 0221/1674] Updated BCM SAI to latest 4.3.3.1 drop (#6947)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 046aca2af658..41e028ee2e1d 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.0.13-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=e%2BBucofzEwCC%2BclqK1OeCi5YFpQAD4ID4FfODzszsuM%3D&se=2034-10-22T06%3A00%3A14Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.0.13-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A35%3A37Z&se=2030-03-04T00%3A35%3A00Z&sr=b&sp=r&sig=1miXMYs0%2BZ6v9Dpby1vSYsDezWDnr%2Be4gZ7Gi3kAQXE%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=twfshldM6GQEphfU%2BQ4xmJlGJkv2Sy7KU1F72RYYM0A%3D&se=2034-10-22T06%3A00%3A45Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A37%3A16Z&se=2030-03-04T00%3A37%3A00Z&sr=b&sp=r&sig=xxnhJC%2FKsOvApuAlB1Yds8Uzzkdyy6fmWX%2BuJ4v0UYA%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 097430e66fb93cd52f590d2a006c2640094bd68b Mon Sep 17 00:00:00 2001
From: Srideep <srideep_devireddy@dell.com>
Date: Mon, 1 Mar 2021 09:53:35 -0800
Subject: [PATCH 0222/1674] [DellEMC:Z9332f] Modify SKU-DellEMC-Z9332f-M-O16C64
 to support different port-config (#6906)

---
 .../DellEMC-Z9332f-M-O16C64/port_config.ini   | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
index 542992d761a6..101780149b57 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
@@ -15,10 +15,22 @@ Ethernet24      57,58                               hundredGigE1/4/1     4     1
 Ethernet26      59,60                               hundredGigE1/4/2     4     100000
 Ethernet28      61,62                               hundredGigE1/4/3     4     100000
 Ethernet30      63,64                               hundredGigE1/4/4     4     100000
-Ethernet32      65,66,67,68,69,70,71,72             fourhundredGigE1/5   5     400000
-Ethernet40      73,74,75,76,77,78,79,80             fourhundredGigE1/6   6     400000
-Ethernet48      81,82,83,84,85,86,87,88             fourhundredGigE1/7   7     400000
-Ethernet56      89,90,91,92,93,94,95,96             fourhundredGigE1/8   8     400000
+Ethernet32      65,66                               hundredGigE1/5/1     5     100000
+Ethernet34      67,68                               hundredGigE1/5/2     5     100000
+Ethernet36      69,70                               hundredGigE1/5/3     5     100000
+Ethernet38      71,72                               hundredGigE1/5/4     5     100000
+Ethernet40      73,74                               hundredGigE1/6/1     6     100000
+Ethernet42      75,76                               hundredGigE1/6/2     6     100000
+Ethernet44      77,78                               hundredGigE1/6/3     6     100000
+Ethernet46      79,80                               hundredGigE1/6/4     6     100000
+Ethernet48      81,82                               hundredGigE1/7/1     7     100000
+Ethernet50      83,84                               hundredGigE1/7/2     7     100000
+Ethernet52      85,86                               hundredGigE1/7/3     7     100000
+Ethernet54      87,88                               hundredGigE1/7/4     7     100000
+Ethernet56      89,90                               hundredGigE1/8/1     8     100000
+Ethernet58      91,92                               hundredGigE1/8/2     8     100000
+Ethernet60      93,94                               hundredGigE1/8/3     8     100000
+Ethernet62      95,96                               hundredGigE1/8/4     8     100000
 Ethernet64      1,2                                 hundredGigE1/9/1     9     100000
 Ethernet66      3,4                                 hundredGigE1/9/2     9     100000
 Ethernet68      5,6                                 hundredGigE1/9/3     9     100000
@@ -39,45 +51,33 @@ Ethernet96      97,98,99,100,101,102,103,104        fourhundredGigE1/13  13    4
 Ethernet104     105,106,107,108,109,110,111,112     fourhundredGigE1/14  14    400000
 Ethernet112     113,114,115,116,117,118,119,120     fourhundredGigE1/15  15    400000
 Ethernet120     121,122,123,124,125,126,127,128     fourhundredGigE1/16  16    400000
-Ethernet128     129,130,131,132,133,134,135,136     fourhundredGigE1/17  17    400000
-Ethernet136     137,138,139,140,141,142,143,144     fourhundredGigE1/18  18    400000
-Ethernet144     145,146,147,148,149,150,151,152     fourhundredGigE1/19  19    400000
-Ethernet152     153,154,155,156,157,158,159,160     fourhundredGigE1/20  20    400000
-Ethernet160     225,226                             hundredGigE1/21/1    21    100000
-Ethernet162     227,228                             hundredGigE1/21/2    21    100000
-Ethernet164     229,230                             hundredGigE1/21/3    21    100000
-Ethernet166     231,232                             hundredGigE1/21/4    21    100000
-Ethernet168     233,234                             hundredGigE1/22/1    22    100000
-Ethernet170     235,236                             hundredGigE1/22/2    22    100000
-Ethernet172     237,238                             hundredGigE1/22/3    22    100000
-Ethernet174     239,240                             hundredGigE1/22/4    22    100000
-Ethernet176     241,242                             hundredGigE1/23/1    23    100000
-Ethernet178     243,244                             hundredGigE1/23/2    23    100000
-Ethernet180     245,246                             hundredGigE1/23/3    23    100000
-Ethernet182     247,248                             hundredGigE1/23/4    23    100000
-Ethernet184     249,250                             hundredGigE1/24/1    24    100000
-Ethernet186     251,252                             hundredGigE1/24/2    24    100000
-Ethernet188     253,254                             hundredGigE1/24/3    24    100000
-Ethernet190     255,256                             hundredGigE1/24/4    24    100000
+Ethernet128     129,130                             hundredGigE1/17/1    17    100000
+Ethernet130     131,132                             hundredGigE1/17/2    17    100000
+Ethernet132     133,134                             hundredGigE1/17/3    17    100000
+Ethernet134     135,136                             hundredGigE1/17/4    17    100000
+Ethernet136     137,138                             hundredGigE1/18/1    18    100000
+Ethernet138     139,140                             hundredGigE1/18/2    18    100000
+Ethernet140     141,142                             hundredGigE1/18/3    18    100000
+Ethernet142     143,144                             hundredGigE1/18/4    18    100000
+Ethernet144     145,146                             hundredGigE1/19/1    19    100000
+Ethernet146     147,148                             hundredGigE1/19/2    19    100000
+Ethernet148     149,150                             hundredGigE1/19/3    19    100000
+Ethernet150     151,152                             hundredGigE1/19/4    19    100000
+Ethernet152     153,154                             hundredGigE1/20/1    20    100000
+Ethernet154     155,156                             hundredGigE1/20/2    20    100000
+Ethernet156     157,158                             hundredGigE1/20/3    20    100000
+Ethernet158     159,160                             hundredGigE1/20/4    20    100000
+Ethernet160     225,226,227,228,229,230,231,232     fourhundredGigE1/21  21    400000
+Ethernet168     233,234,235,236,237,238,239,240     fourhundredGigE1/22  22    400000
+Ethernet176     241,242,243,244,245,246,247,248     fourhundredGigE1/23  23    400000
+Ethernet184     249,250,251,252,253,254,255,256     fourhundredGigE1/24  24    400000
 Ethernet192     161,162,163,164,165,166,167,168     fourhundredGigE1/25  25    400000
 Ethernet200     169,170,171,172,173,174,175,176     fourhundredGigE1/26  26    400000
 Ethernet208     177,178,179,180,181,182,183,184     fourhundredGigE1/27  27    400000
 Ethernet216     185,186,187,188,189,190,191,192     fourhundredGigE1/28  28    400000
-Ethernet224     193,194                             hundredGigE1/29/1    29    100000
-Ethernet226     195,196                             hundredGigE1/29/2    29    100000
-Ethernet228     197,198                             hundredGigE1/29/3    29    100000
-Ethernet230     199,200                             hundredGigE1/29/4    29    100000
-Ethernet232     201,202                             hundredGigE1/30/1    30    100000
-Ethernet234     203,204                             hundredGigE1/30/2    30    100000
-Ethernet236     205,206                             hundredGigE1/30/3    30    100000
-Ethernet238     207,208                             hundredGigE1/30/4    30    100000
-Ethernet240     209,210                             hundredGigE1/31/1    31    100000
-Ethernet242     211,212                             hundredGigE1/31/2    31    100000
-Ethernet244     213,214                             hundredGigE1/31/3    31    100000
-Ethernet246     215,216                             hundredGigE1/31/4    31    100000
-Ethernet248     217,218                             hundredGigE1/32/1    32    100000
-Ethernet250     219,220                             hundredGigE1/32/2    32    100000
-Ethernet252     221,222                             hundredGigE1/32/3    32    100000
-Ethernet254     223,224                             hundredGigE1/32/4    32    100000
+Ethernet224     193,194,195,196,197,198,199,200     fourhundredGigE1/29  29    400000
+Ethernet232     201,202,203,204,205,206,207,208     fourhundredGigE1/30  30    400000
+Ethernet240     209,210,211,212,213,214,215,216     fourhundredGigE1/31  31    400000
+Ethernet248     217,218,219,220,221,222,223,224     fourhundredGigE1/32  32    400000
 Ethernet256     257                                 tenGigE1/33          33    10000 
 Ethernet257     258                                 tenGigE1/34          34    10000 

From e7356da98631d27d86635d885065d0af75497af1 Mon Sep 17 00:00:00 2001
From: pra-moh <49077256+pra-moh@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:22:54 -0800
Subject: [PATCH 0223/1674] [submodule]: update telemetry submodule (#6810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Adding instructions to build telemetry server/go client inside docker (#68)
- Add RBAC, gNOI, API Versioning and Bulk Set operations. (#61) …
- Support NonTLS option for testing purpose only. (#67) …
- Oc gnmi examples (#62) …
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 9ceb58ca1f93..7cd86c5a6bc3 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 9ceb58ca1f93c266b0ef2723d99696d14f4b0b20
+Subproject commit 7cd86c5a6bc38b94f0d7e87c9c278b9d20779a2b

From 7fb5a72d2334cbce2735410f8bd52247bf2f17fb Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:26:24 +0200
Subject: [PATCH 0224/1674] [services] introduce sonic.target (#5705)

- Why I did it
Group all SONiC services together and able to manage them together. Will be used in config reload command as much simpler and generic way to restart services.

- How I did it
Add services to sonic.target

- How to verify it
Together with Azure/sonic-utilities#1199
config reload -y

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
---
 files/build_templates/dhcp_relay.service.j2                 | 4 +++-
 files/build_templates/gbsyncd.service.j2                    | 4 +++-
 files/build_templates/iccpd.service.j2                      | 4 +++-
 files/build_templates/mgmt-framework.service.j2             | 3 ++-
 files/build_templates/mgmt-framework.timer                  | 4 +++-
 files/build_templates/nat.service.j2                        | 4 +++-
 files/build_templates/per_namespace/bgp.service.j2          | 4 +++-
 files/build_templates/per_namespace/lldp.service.j2         | 6 +++++-
 files/build_templates/per_namespace/swss.service.j2         | 4 +++-
 files/build_templates/per_namespace/syncd.service.j2        | 4 +++-
 files/build_templates/per_namespace/teamd.service.j2        | 4 +++-
 files/build_templates/pmon.service.j2                       | 4 +++-
 files/build_templates/radv.service.j2                       | 4 +++-
 files/build_templates/restapi.service.j2                    | 4 +++-
 files/build_templates/sflow.service.j2                      | 4 +++-
 files/build_templates/snmp.service.j2                       | 4 ++--
 files/build_templates/snmp.timer                            | 2 +-
 files/build_templates/sonic.target                          | 5 +++++
 files/build_templates/sonic_debian_extension.j2             | 3 +++
 files/build_templates/telemetry.service.j2                  | 3 ++-
 files/build_templates/telemetry.timer                       | 4 +++-
 files/image_config/hostname/hostname-config.service         | 5 ++++-
 files/image_config/interfaces/interfaces-config.service     | 5 ++++-
 files/image_config/ntp/ntp-config.service                   | 5 ++++-
 files/image_config/ntp/ntp.service                          | 2 ++
 files/image_config/rsyslog/rsyslog-config.service           | 5 ++++-
 .../debian/sonic-host-services-data.caclmgrd.service        | 4 +++-
 .../debian/sonic-host-services-data.hostcfgd.service        | 5 ++++-
 .../sonic-host-services-data.procdockerstatsd.service       | 5 +++--
 29 files changed, 90 insertions(+), 28 deletions(-)
 create mode 100644 files/build_templates/sonic.target

diff --git a/files/build_templates/dhcp_relay.service.j2 b/files/build_templates/dhcp_relay.service.j2
index d501a663feba..b7b590a1036a 100644
--- a/files/build_templates/dhcp_relay.service.j2
+++ b/files/build_templates/dhcp_relay.service.j2
@@ -2,6 +2,8 @@
 Description=DHCP relay container
 Requires=updategraph.service
 After=updategraph.service swss.service syncd.service teamd.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -15,4 +17,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/gbsyncd.service.j2 b/files/build_templates/gbsyncd.service.j2
index e1080ae7d526..b33dfea6b00d 100644
--- a/files/build_templates/gbsyncd.service.j2
+++ b/files/build_templates/gbsyncd.service.j2
@@ -5,6 +5,8 @@ ConditionPathExists=!/usr/share/sonic/hwsku/gearbox_config.json
 After=database.service updategraph.service
 After=interfaces-config.service
 After=swss.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 
 [Service]
@@ -15,4 +17,4 @@ ExecStart=/usr/local/bin/gbsyncd.sh wait
 ExecStop=/usr/local/bin/gbsyncd.sh stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/iccpd.service.j2 b/files/build_templates/iccpd.service.j2
index 979c45de72c5..d78407a87be3 100644
--- a/files/build_templates/iccpd.service.j2
+++ b/files/build_templates/iccpd.service.j2
@@ -2,6 +2,8 @@
 Description=ICCPD container
 Requires=updategraph.service swss.service
 After=updategraph.service swss.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 User={{ sonicadmin_user }}
@@ -10,4 +12,4 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 
 [Install]
-WantedBy=multi-user.target swss.service
+WantedBy=sonic.target swss.service
diff --git a/files/build_templates/mgmt-framework.service.j2 b/files/build_templates/mgmt-framework.service.j2
index 883711aa82eb..1eb983a897fb 100644
--- a/files/build_templates/mgmt-framework.service.j2
+++ b/files/build_templates/mgmt-framework.service.j2
@@ -2,6 +2,8 @@
 Description=Management Framework container
 Requires=database.service
 After=database.service swss.service syncd.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 
 [Service]
@@ -9,4 +11,3 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-
diff --git a/files/build_templates/mgmt-framework.timer b/files/build_templates/mgmt-framework.timer
index 62ab8ef1bd58..37389fbc6db5 100644
--- a/files/build_templates/mgmt-framework.timer
+++ b/files/build_templates/mgmt-framework.timer
@@ -1,9 +1,11 @@
 [Unit]
 Description=Delays management framework container until SONiC has started
+PartOf=mgmt-framework.service
 
 [Timer]
+OnUnitActiveSec=0 sec
 OnBootSec=3min 30 sec
 Unit=mgmt-framework.service
 
 [Install]
-WantedBy=timers.target
+WantedBy=timers.target sonic.target
diff --git a/files/build_templates/nat.service.j2 b/files/build_templates/nat.service.j2
index 1d267cfe9302..10dc7cadf18c 100644
--- a/files/build_templates/nat.service.j2
+++ b/files/build_templates/nat.service.j2
@@ -2,6 +2,8 @@
 Description=NAT container
 Requires=updategraph.service
 After=updategraph.service swss.service syncd.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -15,5 +17,5 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
 
diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
index 9f3c72e20db5..5ba49ffc441a 100644
--- a/files/build_templates/per_namespace/bgp.service.j2
+++ b/files/build_templates/per_namespace/bgp.service.j2
@@ -4,6 +4,8 @@ Requires=database{% if multi_instance == 'true' %}@%i{% endif %}.service
 After=database{% if multi_instance == 'true' %}@%i{% endif %}.service
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -18,4 +20,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/lldp.service.j2 b/files/build_templates/per_namespace/lldp.service.j2
index b48675b03202..fca84462934b 100644
--- a/files/build_templates/per_namespace/lldp.service.j2
+++ b/files/build_templates/per_namespace/lldp.service.j2
@@ -6,6 +6,10 @@ After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service
 After=syncd{% if multi_instance == 'true' %}@%i{% endif %}.service
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -19,4 +23,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2
index 8ac19037ffe7..5fb86929d3ba 100644
--- a/files/build_templates/per_namespace/swss.service.j2
+++ b/files/build_templates/per_namespace/swss.service.j2
@@ -12,6 +12,8 @@ Requires=opennsl-modules.service
 Requires=updategraph.service
 After=updategraph.service
 After=interfaces-config.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service pmon.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -26,4 +28,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/syncd.service.j2 b/files/build_templates/per_namespace/syncd.service.j2
index 8e0029a29421..9acf97c29fd4 100644
--- a/files/build_templates/per_namespace/syncd.service.j2
+++ b/files/build_templates/per_namespace/syncd.service.j2
@@ -17,6 +17,8 @@ After=nps-modules.service
 Requires=updategraph.service
 After=updategraph.service
 After=interfaces-config.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 
 [Service]
@@ -30,4 +32,4 @@ TimeoutStartSec=480
 {% endif %}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/teamd.service.j2 b/files/build_templates/per_namespace/teamd.service.j2
index f5936baa6a79..7dff23fb83e9 100644
--- a/files/build_templates/per_namespace/teamd.service.j2
+++ b/files/build_templates/per_namespace/teamd.service.j2
@@ -7,6 +7,8 @@ After=topology.service
 {% endif %}
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -20,4 +22,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2
index 9195b4d38ad6..59d9e6c3319a 100644
--- a/files/build_templates/pmon.service.j2
+++ b/files/build_templates/pmon.service.j2
@@ -5,6 +5,8 @@ After=database.service updategraph.service
 {% if sonic_asic_platform == 'mellanox' %}
 After=syncd.service
 {% endif %}
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -18,4 +20,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/radv.service.j2 b/files/build_templates/radv.service.j2
index 5cf25a21046d..0427b7e60505 100644
--- a/files/build_templates/radv.service.j2
+++ b/files/build_templates/radv.service.j2
@@ -3,6 +3,8 @@ Description=Router advertiser container
 Requires=updategraph.service
 After=updategraph.service swss.service syncd.service
 Before=ntp-config.service
+BindsTo=sonic.target
+After=sonic.target
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
@@ -15,4 +17,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/restapi.service.j2 b/files/build_templates/restapi.service.j2
index df1a50eb56c7..edc18167e93a 100644
--- a/files/build_templates/restapi.service.j2
+++ b/files/build_templates/restapi.service.j2
@@ -2,6 +2,8 @@
 Description=RestAPI container
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 
 [Service]
@@ -13,4 +15,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=sonic.target
diff --git a/files/build_templates/sflow.service.j2 b/files/build_templates/sflow.service.j2
index e9d5a871432d..3d6a3c7f569d 100644
--- a/files/build_templates/sflow.service.j2
+++ b/files/build_templates/sflow.service.j2
@@ -2,6 +2,8 @@
 Description=sFlow container
 Requisite=swss.service
 After=swss.service syncd.service hostcfgd.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
@@ -15,4 +17,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
index 4997ab737e37..a510aac5571d 100644
--- a/files/build_templates/snmp.service.j2
+++ b/files/build_templates/snmp.service.j2
@@ -3,8 +3,9 @@ Description=SNMP container
 Requires=updategraph.service
 Requisite=swss.service
 After=updategraph.service swss.service syncd.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp-config.service
-Conflicts=snmp.timer
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
@@ -14,4 +15,3 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
-
diff --git a/files/build_templates/snmp.timer b/files/build_templates/snmp.timer
index 1b3ccf633ce4..abbcb67f6dee 100644
--- a/files/build_templates/snmp.timer
+++ b/files/build_templates/snmp.timer
@@ -1,6 +1,6 @@
 [Unit]
 Description=Delays snmp container until SONiC has started
-Conflicts=snmp.service
+PartOf=snmp.service
 After=swss.service
 
 [Timer]
diff --git a/files/build_templates/sonic.target b/files/build_templates/sonic.target
new file mode 100644
index 000000000000..4070e21a080e
--- /dev/null
+++ b/files/build_templates/sonic.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=SONiC services target.
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index e0199db84b99..2a110a2fd81c 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -685,6 +685,9 @@ sudo cp $BUILD_TEMPLATES/mgmt-framework.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_S
 echo "mgmt-framework.timer" | sudo tee -a $GENERATED_SERVICE_FILE
 {% endif %}
 
+sudo cp $BUILD_TEMPLATES/sonic.target $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable sonic.target
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev python3-dev
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y build-essential libssl-dev swig
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2
index 43fa039156d7..aa02e75ac07b 100644
--- a/files/build_templates/telemetry.service.j2
+++ b/files/build_templates/telemetry.service.j2
@@ -3,6 +3,8 @@ Description=Telemetry container
 Requires=database.service
 After=database.service swss.service syncd.service
 Before=ntp-config.service
+BindsTo=sonic.target
+After=sonic.target
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
@@ -13,4 +15,3 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
-
diff --git a/files/build_templates/telemetry.timer b/files/build_templates/telemetry.timer
index e08f1c09eac6..4a605b8c50cb 100644
--- a/files/build_templates/telemetry.timer
+++ b/files/build_templates/telemetry.timer
@@ -1,9 +1,11 @@
 [Unit]
 Description=Delays telemetry container until SONiC has started
+PartOf=telemetry.service
 
 [Timer]
+OnUnitActiveSec=0 sec
 OnBootSec=3min 30 sec
 Unit=telemetry.service
 
 [Install]
-WantedBy=timers.target
+WantedBy=timers.target sonic.target
diff --git a/files/image_config/hostname/hostname-config.service b/files/image_config/hostname/hostname-config.service
index c23ae10227a4..c82c2d0bf54e 100644
--- a/files/image_config/hostname/hostname-config.service
+++ b/files/image_config/hostname/hostname-config.service
@@ -2,10 +2,13 @@
 Description=Update hostname based on configdb
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/usr/bin/hostname-config.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/image_config/interfaces/interfaces-config.service b/files/image_config/interfaces/interfaces-config.service
index 71178affdee8..a3f715764616 100644
--- a/files/image_config/interfaces/interfaces-config.service
+++ b/files/image_config/interfaces/interfaces-config.service
@@ -2,10 +2,13 @@
 Description=Update interfaces configuration
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/usr/bin/interfaces-config.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/image_config/ntp/ntp-config.service b/files/image_config/ntp/ntp-config.service
index a22a0331045d..5639b04520e0 100644
--- a/files/image_config/ntp/ntp-config.service
+++ b/files/image_config/ntp/ntp-config.service
@@ -2,12 +2,15 @@
 Description=Update NTP configuration
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 Before=ntp.service
 StartLimitIntervalSec=0
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/usr/bin/ntp-config.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/files/image_config/ntp/ntp.service b/files/image_config/ntp/ntp.service
index acfd7e17266a..32a55dea892e 100644
--- a/files/image_config/ntp/ntp.service
+++ b/files/image_config/ntp/ntp.service
@@ -3,6 +3,8 @@ Description=Network Time Service
 Documentation=man:ntpd(8)
 After=network.target
 Conflicts=systemd-timesyncd.service
+BindsTo=sonic.target
+After=sonic.target
 StartLimitIntervalSec=0
 
 [Service]
diff --git a/files/image_config/rsyslog/rsyslog-config.service b/files/image_config/rsyslog/rsyslog-config.service
index ee62a36ccf2d..34c56fb0e00b 100644
--- a/files/image_config/rsyslog/rsyslog-config.service
+++ b/files/image_config/rsyslog/rsyslog-config.service
@@ -2,10 +2,13 @@
 Description=Update rsyslog configuration
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/usr/bin/rsyslog-config.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.caclmgrd.service b/src/sonic-host-services-data/debian/sonic-host-services-data.caclmgrd.service
index 4df4d948ef1d..e24ed10bb33d 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.caclmgrd.service
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.caclmgrd.service
@@ -2,6 +2,8 @@
 Description=Control Plane ACL configuration daemon
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=simple
@@ -10,4 +12,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
index ea0c3ba60fb7..4adf2aba77ad 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
@@ -2,10 +2,13 @@
 Description=Host config enforcer daemon
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/hostcfgd
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
+
diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.procdockerstatsd.service b/src/sonic-host-services-data/debian/sonic-host-services-data.procdockerstatsd.service
index 388197d9741b..68b9e61b62c2 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.procdockerstatsd.service
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.procdockerstatsd.service
@@ -2,6 +2,8 @@
 Description=Process and docker CPU/memory utilization data export daemon
 Requires=database.service updategraph.service
 After=database.service updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=simple
@@ -9,5 +11,4 @@ ExecStart=/usr/local/bin/procdockerstatsd
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
-
+WantedBy=sonic.target

From 15aed52ef2c1ec6a0799dbadc0a77f85e3a400d7 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Sun, 21 Feb 2021 08:27:37 -0800
Subject: [PATCH 0225/1674] [pcie.yaml] Move pcie configuration file path to
 platform directory (#6475)

- Why I did it
The pcie configuration file location is under plugin directory not under platform directory.
#6437

- How I did it

Move all pcie.yaml configuration file from plugin to platform directory.
Remove unnecessary timer to start pcie-check.service
Move pcie-check.service to sonic-host-services
- How to verify it
Verify on the device
---
 .gitignore                                               | 7 +++++++
 .../x86_64-arista_7050_qx32s/{plugins => }/pcie.yaml     | 0
 .../x86_64-arista_7050cx3_32s/{plugins => }/pcie.yaml    | 0
 .../x86_64-arista_7060_cx32s/{plugins => }/pcie.yaml     | 0
 .../x86_64-arista_7260cx3_64/{plugins => }/pcie.yaml     | 0
 .../x86_64-cel_e1031-r0/{plugins => }/pcie.yaml          | 0
 .../x86_64-cel_seastone-r0/{plugins => }/pcie.yaml       | 0
 .../x86_64-dell_s6000_s1220-r0/{plugins => }/pcie.yaml   | 0
 .../x86_64-dell_s6100_c2538-r0/{plugins => }/pcie.yaml   | 0
 files/build_templates/pcie-check.timer                   | 9 ---------
 files/build_templates/sonic_debian_extension.j2          | 4 ----
 files/image_config/pcie-check/pcie-check.service         | 3 +++
 files/image_config/pcie-check/pcie-check.sh              | 2 +-
 .../{plugins => }/pcie.yaml                              | 0
 .../{plugins => }/pcie.yaml                              | 0
 15 files changed, 11 insertions(+), 14 deletions(-)
 rename device/arista/x86_64-arista_7050_qx32s/{plugins => }/pcie.yaml (100%)
 rename device/arista/x86_64-arista_7050cx3_32s/{plugins => }/pcie.yaml (100%)
 rename device/arista/x86_64-arista_7060_cx32s/{plugins => }/pcie.yaml (100%)
 rename device/arista/x86_64-arista_7260cx3_64/{plugins => }/pcie.yaml (100%)
 rename device/celestica/x86_64-cel_e1031-r0/{plugins => }/pcie.yaml (100%)
 rename device/celestica/x86_64-cel_seastone-r0/{plugins => }/pcie.yaml (100%)
 rename device/dell/x86_64-dell_s6000_s1220-r0/{plugins => }/pcie.yaml (100%)
 rename device/dell/x86_64-dell_s6100_c2538-r0/{plugins => }/pcie.yaml (100%)
 delete mode 100644 files/build_templates/pcie-check.timer
 rename platform/barefoot/sonic-platform-modules-bfn-montara/{plugins => }/pcie.yaml (100%)
 rename platform/barefoot/sonic-platform-modules-bfn-newport/{plugins => }/pcie.yaml (100%)

diff --git a/.gitignore b/.gitignore
index 7e2f73f718e9..5e76a6cf92da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,13 @@ platform/**/*-none-any.whl
 platform/**/.pybuild
 platform/**/debian/*
 platform/**/build
+platform/**/*.ko
+platform/**/*.mod.c
+platform/**/*.mod.o
+platform/**/*.o
+platform/**/*.d
+platform/**/*.cmd
+platform/**/*.order
 platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
 platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
diff --git a/device/arista/x86_64-arista_7050_qx32s/plugins/pcie.yaml b/device/arista/x86_64-arista_7050_qx32s/pcie.yaml
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/plugins/pcie.yaml
rename to device/arista/x86_64-arista_7050_qx32s/pcie.yaml
diff --git a/device/arista/x86_64-arista_7050cx3_32s/plugins/pcie.yaml b/device/arista/x86_64-arista_7050cx3_32s/pcie.yaml
similarity index 100%
rename from device/arista/x86_64-arista_7050cx3_32s/plugins/pcie.yaml
rename to device/arista/x86_64-arista_7050cx3_32s/pcie.yaml
diff --git a/device/arista/x86_64-arista_7060_cx32s/plugins/pcie.yaml b/device/arista/x86_64-arista_7060_cx32s/pcie.yaml
similarity index 100%
rename from device/arista/x86_64-arista_7060_cx32s/plugins/pcie.yaml
rename to device/arista/x86_64-arista_7060_cx32s/pcie.yaml
diff --git a/device/arista/x86_64-arista_7260cx3_64/plugins/pcie.yaml b/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
similarity index 100%
rename from device/arista/x86_64-arista_7260cx3_64/plugins/pcie.yaml
rename to device/arista/x86_64-arista_7260cx3_64/pcie.yaml
diff --git a/device/celestica/x86_64-cel_e1031-r0/plugins/pcie.yaml b/device/celestica/x86_64-cel_e1031-r0/pcie.yaml
similarity index 100%
rename from device/celestica/x86_64-cel_e1031-r0/plugins/pcie.yaml
rename to device/celestica/x86_64-cel_e1031-r0/pcie.yaml
diff --git a/device/celestica/x86_64-cel_seastone-r0/plugins/pcie.yaml b/device/celestica/x86_64-cel_seastone-r0/pcie.yaml
similarity index 100%
rename from device/celestica/x86_64-cel_seastone-r0/plugins/pcie.yaml
rename to device/celestica/x86_64-cel_seastone-r0/pcie.yaml
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/pcie.yaml b/device/dell/x86_64-dell_s6000_s1220-r0/pcie.yaml
similarity index 100%
rename from device/dell/x86_64-dell_s6000_s1220-r0/plugins/pcie.yaml
rename to device/dell/x86_64-dell_s6000_s1220-r0/pcie.yaml
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/pcie.yaml b/device/dell/x86_64-dell_s6100_c2538-r0/pcie.yaml
similarity index 100%
rename from device/dell/x86_64-dell_s6100_c2538-r0/plugins/pcie.yaml
rename to device/dell/x86_64-dell_s6100_c2538-r0/pcie.yaml
diff --git a/files/build_templates/pcie-check.timer b/files/build_templates/pcie-check.timer
deleted file mode 100644
index 4ad5c6481861..000000000000
--- a/files/build_templates/pcie-check.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Start the pcie-check.service 10 seconds after boot
-
-[Timer]
-OnBootSec=10sec
-Unit=pcie-check.service
-
-[Install]
-WantedBy=timers.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 2a110a2fd81c..8edd9af847a6 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -506,10 +506,6 @@ sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
 sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
 sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/
 
-# Copy systemd timer configuration
-sudo cp $BUILD_TEMPLATES/pcie-check.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
-sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable pcie-check.timer
-
 # Copy pcie-check service files
 sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 echo "pcie-check.service" | sudo tee -a $GENERATED_SERVICE_FILE
diff --git a/files/image_config/pcie-check/pcie-check.service b/files/image_config/pcie-check/pcie-check.service
index fbf3cfd3f19d..9df04ea840bc 100644
--- a/files/image_config/pcie-check/pcie-check.service
+++ b/files/image_config/pcie-check/pcie-check.service
@@ -5,3 +5,6 @@ After=rc.local.service database.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/pcie-check.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/image_config/pcie-check/pcie-check.sh b/files/image_config/pcie-check/pcie-check.sh
index 4257a2544c4a..01a952d01374 100755
--- a/files/image_config/pcie-check/pcie-check.sh
+++ b/files/image_config/pcie-check/pcie-check.sh
@@ -19,7 +19,7 @@ function check_and_rescan_pcie_devices()
     PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
     PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    if [ ! -f /usr/share/sonic/device/$PLATFORM/plugins/pcie.yaml ]; then
+    if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
         debug "pcie.yaml does not exist! Can't check PCIe status!"
         exit
     fi
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/plugins/pcie.yaml b/platform/barefoot/sonic-platform-modules-bfn-montara/pcie.yaml
similarity index 100%
rename from platform/barefoot/sonic-platform-modules-bfn-montara/plugins/pcie.yaml
rename to platform/barefoot/sonic-platform-modules-bfn-montara/pcie.yaml
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/plugins/pcie.yaml b/platform/barefoot/sonic-platform-modules-bfn-newport/pcie.yaml
similarity index 100%
rename from platform/barefoot/sonic-platform-modules-bfn-newport/plugins/pcie.yaml
rename to platform/barefoot/sonic-platform-modules-bfn-newport/pcie.yaml

From e13672b94a042a115c3a4e69bfd97c5b94f7e7f5 Mon Sep 17 00:00:00 2001
From: ec-michael-shih <71379738+ec-michael-shih@users.noreply.github.com>
Date: Fri, 26 Feb 2021 02:47:38 +0800
Subject: [PATCH 0226/1674] [Platform] Accton add to support as4630-54te
 platform. (#6683)

Add support for Accton as4630-54te platform
---
 .../Accton-AS4630-54TE/port_config.ini        |   55 +
 .../x86_64-accton_as4630_54te-r0/default_sku  |    1 +
 .../installer.conf                            |    3 +
 .../plugins/eeprom.py                         |   13 +
 .../plugins/psuutil.py                        |   61 +
 .../plugins/sfputil.py                        |  196 +++
 .../pmon_daemon_control.json                  |    5 +
 .../sonic_platform/__init__.py                |    2 +
 .../sonic_platform/chassis.py                 |  194 +++
 .../sonic_platform/component.py               |  121 ++
 .../sonic_platform/eeprom.py                  |  102 ++
 .../sonic_platform/fan.py                     |  171 +++
 .../sonic_platform/helper.py                  |  117 ++
 .../sonic_platform/platform.py                |   21 +
 .../sonic_platform/psu.py                     |  228 ++++
 .../sonic_platform/sfp.py                     | 1169 +++++++++++++++++
 .../sonic_platform/thermal.py                 |  145 ++
 platform/broadcom/one-image.mk                |    1 +
 platform/broadcom/platform-modules-accton.mk  |    6 +
 .../as4630-54te/classes/__init__.py           |    0
 .../as4630-54te/classes/fanutil.py            |  213 +++
 .../as4630-54te/classes/thermalutil.py        |   93 ++
 .../as4630-54te/modules/Makefile              |   19 +
 .../modules/x86-64-accton-as4630-54te-cpld.c  | 1106 ++++++++++++++++
 .../modules/x86-64-accton-as4630-54te-leds.c  |  579 ++++++++
 .../modules/x86-64-accton-as4630-54te-psu.c   |  320 +++++
 .../as4630-54te/modules/ym2651y.c             |    1 +
 ...4te-platform-handle-mgmt-interface.service |   11 +
 .../as4630-54te-platform-monitor-fan.service  |   16 +
 .../as4630-54te-platform-monitor-psu.service  |   16 +
 .../as4630-54te-platform-monitor.service      |   17 +
 .../as4630-54te/setup.py                      |   14 +
 .../as4630-54te/sonic_platform_setup.py       |   34 +
 .../as4630-54te/utils/README                  |   67 +
 .../utils/accton_as4630_54te_monitor.py       |  261 ++++
 .../utils/accton_as4630_54te_monitor_fan.py   |  186 +++
 .../utils/accton_as4630_54te_monitor_psu.py   |  168 +++
 .../utils/accton_as4630_54te_util.py          |  681 ++++++++++
 .../utils/handle_mgmt_interface.sh            |    8 +
 .../debian/control                            |    4 +
 .../debian/rules                              |    2 +-
 .../sonic-platform-accton-as4630-54te.install |    2 +
 42 files changed, 6428 insertions(+), 1 deletion(-)
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/Accton-AS4630-54TE/port_config.ini
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/default_sku
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/installer.conf
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/plugins/eeprom.py
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/plugins/psuutil.py
 create mode 100755 device/accton/x86_64-accton_as4630_54te-r0/plugins/sfputil.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/pmon_daemon_control.json
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/__init__.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/chassis.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/component.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/eeprom.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/fan.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/helper.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/platform.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/psu.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/sfp.py
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/thermal.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/__init__.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/fanutil.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/thermalutil.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/Makefile
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-leds.c
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c
 create mode 120000 platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/ym2651y.c
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-handle-mgmt-interface.service
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-fan.service
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-psu.service
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor.service
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54te/sonic_platform_setup.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/README
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_fan.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_psu.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_util.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/handle_mgmt_interface.sh
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as4630-54te.install

diff --git a/device/accton/x86_64-accton_as4630_54te-r0/Accton-AS4630-54TE/port_config.ini b/device/accton/x86_64-accton_as4630_54te-r0/Accton-AS4630-54TE/port_config.ini
new file mode 100755
index 000000000000..f8965dfe41d0
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/Accton-AS4630-54TE/port_config.ini
@@ -0,0 +1,55 @@
+# name          lanes                 alias             index   speed           autoneg
+Ethernet0       26                    thousandE1        1         1000           1
+Ethernet1       25                    thousandE2        2         1000           1
+Ethernet2       28                    thousandE3        3         1000           1
+Ethernet3       27                    thousandE4        4         1000           1
+Ethernet4       30                    thousandE5        5         1000           1
+Ethernet5       29                    thousandE6        6         1000           1
+Ethernet6       32                    thousandE7        7         1000           1
+Ethernet7       31                    thousandE8        8         1000           1
+Ethernet8       38                    thousandE9        9         1000           1
+Ethernet9       37                    thousandE10       10        1000           1
+Ethernet10      40                    thousandE11       11        1000           1
+Ethernet11      39                    thousandE12       12        1000           1
+Ethernet12      34                    thousandE13       13        1000           1
+Ethernet13      33                    thousandE14       14        1000           1
+Ethernet14      36                    thousandE15       15        1000           1
+Ethernet15      35                    thousandE16       16        1000           1
+Ethernet16      46                    thousandE17       17        1000           1
+Ethernet17      45                    thousandE18       18        1000           1
+Ethernet18      48                    thousandE19       19        1000           1
+Ethernet19      47                    thousandE20       20        1000           1
+Ethernet20      42                    thousandE21       21        1000           1
+Ethernet21      41                    thousandE22       22        1000           1
+Ethernet22      44                    thousandE23       23        1000           1
+Ethernet23      43                    thousandE24       24        1000           1
+Ethernet24      2                     thousandE25       25        1000           1
+Ethernet25      1                     thousandE26       26        1000           1
+Ethernet26      4                     thousandE27       27        1000           1
+Ethernet27      3                     thousandE28       28        1000           1
+Ethernet28      6                     thousandE29       29        1000           1
+Ethernet29      5                     thousandE30       30        1000           1
+Ethernet30      8                     thousandE31       31        1000           1
+Ethernet31      7                     thousandE32       32        1000           1
+Ethernet32      10                    thousandE33       33        1000           1
+Ethernet33      9                     thousandE34       34        1000           1
+Ethernet34      12                    thousandE35       35        1000           1
+Ethernet35      11                    thousandE36       36        1000           1
+Ethernet36      14                    thousandE37       37        1000           1
+Ethernet37      13                    thousandE38       38        1000           1
+Ethernet38      16                    thousandE39       39        1000           1
+Ethernet39      15                    thousandE40       40        1000           1
+Ethernet40      18                    thousandE41       41        1000           1
+Ethernet41      17                    thousandE42       42        1000           1
+Ethernet42      20                    thousandE43       43        1000           1
+Ethernet43      19                    thousandE44       44        1000           1
+Ethernet44      22                    thousandE45       45        1000           1
+Ethernet45      21                    thousandE46       46        1000           1
+Ethernet46      24                    thousandE47       47        1000           1
+Ethernet47      23                    thousandE48       48        1000           1
+Ethernet48      67                    twentyfiveGigE49  49       25000           0
+Ethernet49      66                    twentyfiveGigE50  50       25000           0
+Ethernet50      65                    twentyfiveGigE51  51       25000           0
+Ethernet51      68                    twentyfiveGigE52  52       25000           0
+Ethernet52      73,74,75,76           hundredGigE53     53      100000           0
+Ethernet56      69,70,71,72           hundredGigE54     54      100000           0
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/default_sku b/device/accton/x86_64-accton_as4630_54te-r0/default_sku
new file mode 100755
index 000000000000..8fb346d4ad3d
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/default_sku
@@ -0,0 +1 @@
+Accton-AS4630-54TE t1
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/installer.conf b/device/accton/x86_64-accton_as4630_54te-r0/installer.conf
new file mode 100755
index 000000000000..925a32fc0c3a
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/installer.conf
@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as4630_54te-r0/plugins/eeprom.py
new file mode 100755
index 000000000000..7409239d01f3
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/plugins/eeprom.py
@@ -0,0 +1,13 @@
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+    _TLV_INFO_MAX_LEN = 256
+
+    def __init__(self, name, path, cpld_root, ro):
+        self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+        super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/plugins/psuutil.py b/device/accton/x86_64-accton_as4630_54te-r0/plugins/psuutil.py
new file mode 100755
index 000000000000..92ae68eb87bf
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/plugins/psuutil.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC PSU Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    def __init__(self):
+        PsuBase.__init__(self)
+
+        self.psu_path = "/sys/bus/i2c/devices/"
+        self.psu_presence = "/psu_present"
+        self.psu_oper_status = "/psu_power_good"
+        self.psu_mapping = {
+            1: "10-0050",
+            2: "11-0051",
+        }
+
+    def get_num_psus(self):
+        return len(self.psu_mapping)
+
+    def get_psu_status(self, index):
+        if index is None:
+            return False
+
+        status = 0
+        node = self.psu_path + self.psu_mapping[index] + self.psu_oper_status
+        try:
+            with open(node, 'r') as power_status:
+                status = int(power_status.read())
+        except IOError:
+            return False
+
+        return status == 1
+
+    def get_psu_presence(self, index):
+        if index is None:
+            return False
+
+        status = 0
+        node = self.psu_path + self.psu_mapping[index] + self.psu_presence
+        try:
+            with open(node, 'r') as presence_status:
+                status = int(presence_status.read())
+        except IOError:
+            return False
+
+        return status == 1
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/plugins/sfputil.py b/device/accton/x86_64-accton_as4630_54te-r0/plugins/sfputil.py
new file mode 100755
index 000000000000..63e6bd53645c
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/plugins/sfputil.py
@@ -0,0 +1,196 @@
+# sfputil.py
+#
+# Platform-specific SFP transceiver interface for SONiC
+#
+
+try:
+    import sys
+    import time
+    from ctypes import create_string_buffer
+    from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
+
+SFP_STATUS_INSERTED = '1'
+SFP_STATUS_REMOVED = '0'
+
+
+class SfpUtil(SfpUtilBase):
+    """Platform-specific SfpUtil class"""
+
+    PORT_START = 49
+    PORT_END = 54
+    PORTS_IN_BLOCK = 54
+    QSFP_START = 53
+
+    BASE_OOM_PATH = "/sys/bus/i2c/devices/{0}-0050/"
+    BASE_CPLD_PATH = "/sys/bus/i2c/devices/3-0060/"
+
+    _port_to_is_present = {}
+    _port_to_lp_mode = {}
+
+    _port_to_eeprom_mapping = {}
+    _port_to_i2c_mapping = {
+        49: [18],
+        50: [19],
+        51: [20],
+        52: [21],
+        53: [22],
+        54: [23],
+    }
+
+    @property
+    def port_start(self):
+        return self.PORT_START
+
+    @property
+    def port_end(self):
+        return self.PORT_END
+
+    @property
+    def qsfp_ports(self):
+        return range(self.PORT_START, self.PORTS_IN_BLOCK + 1)
+
+    @property
+    def port_to_eeprom_mapping(self):
+        return self._port_to_eeprom_mapping
+
+    def __init__(self):
+        eeprom_path = self.BASE_OOM_PATH + "eeprom"
+        for x in range(self.port_start, self.port_end + 1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(
+                self._port_to_i2c_mapping[x][0])
+        SfpUtilBase.__init__(self)
+
+    def get_presence(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        present_path = self.BASE_CPLD_PATH + "module_present_" + str(port_num)
+        self.__port_to_is_present = present_path
+
+        try:
+            val_file = open(self.__port_to_is_present)
+            content = val_file.readline().rstrip()
+            val_file.close()
+        except IOError as e:
+            print ('Error: unable to access file: %s') % str(e)
+            return False
+
+        if content == "1":
+            return True
+
+        return False
+
+    def get_low_power_mode(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.QSFP_START or port_num > self.port_end:
+            return False
+
+        try:
+            eeprom = None
+            if not self.get_presence(port_num):
+                return False
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "rb")
+            eeprom.seek(93)
+            lpmode = ord(eeprom.read(1))
+
+            # if "Power override" bit is 1 and "Power set" bit is 1
+            if ((lpmode & 0x3) == 0x3):
+                return True
+
+            # High Power Mode if one of the following conditions is matched:
+            # 1. "Power override" bit is 0
+            # 2. "Power override" bit is 1 and "Power set" bit is 0
+            else:
+                return False
+
+        except IOError as e:
+            print ('Error: unable to open file: %s') % str(e)
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+    def set_low_power_mode(self, port_num, lpmode):
+        # Check for invalid port_num
+        if port_num < self.QSFP_START or port_num > self.port_end:
+            return False
+
+        try:
+            eeprom = None
+            if not self.get_presence(port_num):
+                return False  # Port is not present, unable to set the eeprom
+
+            # Fill in write buffer
+            # 0x3:Low Power Mode, 0x1:High Power Mode
+            regval = 0x3 if lpmode else 0x1
+
+            buffer = create_string_buffer(1)
+            if sys.version_info[0] >= 3:
+                buffer[0] = regval
+            else:
+                buffer[0] = chr(regval)
+
+            # Write to eeprom
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "r+b")
+            eeprom.seek(93)
+            eeprom.write(buffer[0])
+            return True
+        except IOError as e:
+            print ('Error: unable to open file: %s') % str(e)
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+    def reset(self, port_num):
+        raise NotImplementedError
+
+    @property
+    def _get_presence_bitmap(self):
+
+        bits = []
+        for x in range(self.port_start, self.port_end + 1):
+            bits.append(str(int(self.get_presence(x))))
+
+        rev = "".join(bits[::-1])
+        return int(rev, 2)
+
+    data = {'present': 0}
+
+    def get_transceiver_change_event(self, timeout=0):
+        port_dict = {}
+
+        if timeout == 0:
+            cd_ms = sys.maxsize
+        else:
+            cd_ms = timeout
+
+        # poll per second
+        while cd_ms > 0:
+            reg_value = self._get_presence_bitmap
+            changed_ports = self.data['present'] ^ reg_value
+            if changed_ports != 0:
+                break
+            time.sleep(1)
+            cd_ms = cd_ms - 1000
+
+        if changed_ports != 0:
+            for port in range(self.port_start, self.port_end + 1):
+                # Mask off the bit corresponding to our port
+                mask = (1 << (port - self.port_start))
+                if changed_ports & mask:
+                    if (reg_value & mask) == 0:
+                        port_dict[port] = SFP_STATUS_REMOVED
+                    else:
+                        port_dict[port] = SFP_STATUS_INSERTED
+
+            # Update cache
+            self.data['present'] = reg_value
+            return True, port_dict
+        else:
+            return True, {}
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/pmon_daemon_control.json b/device/accton/x86_64-accton_as4630_54te-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..584a14b9d942
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/pmon_daemon_control.json
@@ -0,0 +1,5 @@
+{
+    "skip_ledd": true,
+    "skip_thermalctld": true
+}
+
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/__init__.py
new file mode 100644
index 000000000000..a18a2a2d2a3b
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+from . import platform 
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/chassis.py
new file mode 100644
index 000000000000..d666e0c5bf86
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/chassis.py
@@ -0,0 +1,194 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Chassis information which are available in the platform
+#
+#############################################################################
+
+import os
+
+try:
+    from sonic_platform_base.chassis_base import ChassisBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN_TRAY = 3
+NUM_FAN = 2
+NUM_PSU = 2
+NUM_THERMAL = 3
+NUM_QSFP = 6
+PORT_START = 49
+PORT_END = 54
+NUM_COMPONENT = 2
+HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
+PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
+REBOOT_CAUSE_FILE = "reboot-cause.txt"
+PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+
+class Chassis(ChassisBase):
+    """Platform-specific Chassis class"""
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self._api_helper = APIHelper()
+        self._api_helper = APIHelper()
+        self.is_host = self._api_helper.is_host()
+
+        self.config_data = {}
+
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
+        self.__initialize_sfp()
+        self.__initialize_eeprom()
+
+    def __initialize_sfp(self):
+        from sonic_platform.sfp import Sfp
+        for index in range(0, PORT_END):
+            sfp = Sfp(index)
+            self._sfp_list.append(sfp)
+        self.sfp_module_initialized = True
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fant_index in range(0, NUM_FAN_TRAY):
+            for fan_index in range(0, NUM_FAN):
+                fan = Fan(fant_index, fan_index)
+                self._fan_list.append(fan)
+
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
+        for index in range(0, NUM_THERMAL):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
+        for index in range(0, NUM_COMPONENT):
+            component = Component(index)
+            self._component_list.append(component)
+
+    def __initialize_watchdog(self):
+        from sonic_platform.watchdog import Watchdog
+        self._watchdog = Watchdog()
+
+
+    def __is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.get_mac()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.get_eeprom()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+
+        reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
+        sw_reboot_cause = self._api_helper.read_txt_file(
+            reboot_cause_path) or "Unknown"
+
+
+        return ('REBOOT_CAUSE_NON_HARDWARE', sw_reboot_cause)
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/component.py
new file mode 100644
index 000000000000..c34da704432a
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/component.py
@@ -0,0 +1,121 @@
+#############################################################################
+# Accton
+#
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
+#
+#############################################################################
+
+import shlex
+import subprocess
+
+
+try:
+    from sonic_platform_base.component_base import ComponentBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_ADDR_MAPPING = {
+    "CPLD1": "3-0060"
+}
+SYSFS_PATH = "/sys/bus/i2c/devices/"
+BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
+COMPONENT_LIST= [
+   ("CPLD1", "CPLD 1"),
+   ("BIOS", "Basic Input/Output System")
+
+]
+
+class Component(ComponentBase):
+    """Platform-specific Component class"""
+
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_index=0):
+        self._api_helper=APIHelper()
+        ComponentBase.__init__(self)
+        self.index = component_index
+        self.name = self.get_name()        
+
+    def __run_command(self, command):
+        # Run bash command and print output to stdout
+        try:
+            process = subprocess.Popen(
+                shlex.split(command), stdout=subprocess.PIPE)
+            while True:
+                output = process.stdout.readline()
+                if output == '' and process.poll() is not None:
+                    break
+            rc = process.poll()
+            if rc != 0:
+                return False
+        except Exception:
+            return False
+        return True
+
+    def __get_bios_version(self):
+        # Retrieves the BIOS firmware version
+        try:
+            with open(BIOS_VERSION_PATH, 'r') as fd:
+                bios_version = fd.read()
+                return bios_version.strip()
+        except Exception as e:
+            return None
+
+    def __get_cpld_version(self):
+        # Retrieves the CPLD firmware version
+        cpld_version = dict()
+        for cpld_name in CPLD_ADDR_MAPPING:
+            try:
+                cpld_path = "{}{}{}".format(SYSFS_PATH, CPLD_ADDR_MAPPING[cpld_name], '/version')
+                cpld_version_raw= self._api_helper.read_txt_file(cpld_path)               
+                cpld_version[cpld_name] = "{}".format(int(cpld_version_raw,16))
+            except Exception as e:
+                print('Get exception when read cpld')
+                cpld_version[cpld_name] = 'None'
+
+        return cpld_version
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+         Returns:
+            A string containing the name of the component
+        """
+        return COMPONENT_LIST[self.index][0]
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+            Returns:
+            A string containing the description of the component
+        """
+        return COMPONENT_LIST[self.index][1]
+
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of module
+        Returns:
+            string: The firmware versions of the module
+        """
+        fw_version = None
+
+        if self.name == "BIOS":
+            fw_version = self.__get_bios_version()
+        elif "CPLD" in self.name:
+            cpld_version = self.__get_cpld_version()           
+            fw_version = cpld_version.get(self.name)
+
+        return fw_version
+
+    def install_firmware(self, image_path):
+        """
+        Install firmware to module
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        raise NotImplementedError
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/eeprom.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..7bf2bb58d19f
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/eeprom.py
@@ -0,0 +1,102 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+
+    def get_eeprom(self):
+        return self._eeprom
+
+    def get_serial(self):
+        return self._eeprom.get('0x23', "Undefined.")
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', "Undefined.")
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/fan.py
new file mode 100644
index 000000000000..663c343a75f6
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/fan.py
@@ -0,0 +1,171 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PSU_FAN_MAX_RPM = 26688
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/3-0060/fan_"
+PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_I2C_MAPPING = {
+    0: {
+        "num": 10,
+        "addr": "58"
+    },
+    1: {
+        "num": 11,
+        "addr": "59"
+    },
+}
+
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        self._api_helper=APIHelper()
+        self.fan_index = fan_index
+        self.fan_tray_index = fan_tray_index
+        self.is_psu_fan = is_psu_fan
+
+        if self.is_psu_fan:
+            self.psu_index = psu_index
+            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+
+        FanBase.__init__(self)  
+
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+
+
+        if not self.is_psu_fan:
+            dir_str = "{}{}{}".format(CPLD_I2C_PATH, 'direction_', self.fan_tray_index)
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val==0:#F2B
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        else: #For PSU
+            dir_str = "{}{}".format(self.psu_hwmon_path,'psu_fan_dir')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val=='F2B':
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        return direction
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+                         
+        """
+        speed = 0
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
+            fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
+            if fan_speed_rpm is not None:
+                speed = (int(fan_speed_rpm,10))*100/26688
+                if speed > 100:
+                    speed=100
+            else:
+                return 0
+        elif self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, 'duty_cycle_percentage')
+            speed=self._api_helper.read_txt_file(speed_path)
+            if speed is None:
+                return 0
+        return int(speed)
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        Note:
+            speed_pc = pwm_target/255*100
+            0   : when PWM mode is use
+            pwm : when pwm mode is not use
+        """
+        return False #Not supported
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return False #Not supported
+
+    def set_speed(self, speed):
+        """
+        Sets the fan speed
+        Args:
+            speed: An integer, the percentage of full fan speed to set fan to,
+                   in the range 0 (off) to 100 (full speed)
+        Returns:
+            A boolean, True if speed is set successfully, False if not
+        """
+
+        if not self.is_psu_fan and self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, 'duty_cycle_percentage')
+            return self._api_helper.write_txt_file(speed_path, int(speed))
+
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return False #Not supported
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        present_path = "{}{}{}".format(CPLD_I2C_PATH, 'present_', self.fan_index+1)
+        val=self._api_helper.read_txt_file(present_path)
+        if not self.is_psu_fan:
+            if val is not None:
+                return int(val, 10)==1
+            else:
+                return False
+        else:
+            return True
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..4cd60ac90611
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/helper.py
@@ -0,0 +1,117 @@
+import os
+import struct
+import subprocess
+from mmap import *
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except IOError:
+            return False
+        return True
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/platform.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/platform.py
new file mode 100644
index 000000000000..2f2c2a447fcf
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/platform.py
@@ -0,0 +1,21 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """Platform-specific Platform class"""
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/psu.py
new file mode 100644
index 000000000000..3413ab5779cc
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/psu.py
@@ -0,0 +1,228 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+#import sonic_platform
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    #from sonic_platform.fan import Fan
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+I2C_PATH ="/sys/bus/i2c/devices/{0}-00{1}/"
+
+PSU_NAME_LIST = ["PSU-1", "PSU-2"]
+PSU_NUM_FAN = [1, 1]
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 10,
+        "addr": "58"
+    },
+    1: {
+        "num": 11,
+        "addr": "59"
+    },
+}
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 10,
+        "addr": "50"
+    },
+    1: {
+        "num": 11,
+        "addr": "51"
+    },
+}
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+
+    def __init__(self, psu_index=0):
+        PsuBase.__init__(self)
+        self.index = psu_index
+        self._api_helper = APIHelper()
+
+        self.i2c_num = PSU_HWMON_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_HWMON_I2C_MAPPING[self.index]["addr"]
+        self.hwmon_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+
+        self.i2c_num = PSU_CPLD_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_CPLD_I2C_MAPPING[self.index]["addr"]
+        self.cpld_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        self.__initialize_fan()
+        '''
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            #def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+            #fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            fan = Fan(fan_index, 0, True, self.index)
+            self._fan_list.append(fan)
+        '''
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            self._fan_list.append(fan)
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_v_out')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        iout_path = "{}{}".format(self.hwmon_path, 'psu_i_out')        
+        val=self._api_helper.read_txt_file(iout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        pout_path = "{}{}".format(self.hwmon_path, 'psu_p_out')        
+        val=self._api_helper.read_txt_file(pout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+
+        return False  #Controlled by HW
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+
+        return False  #Controlled by HW
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125 
+        """
+        temp_path = "{}{}".format(self.hwmon_path, 'psu_temp1_input')        
+        val=self._api_helper.read_txt_file(temp_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return False #Not supported
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_max')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_min')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """        
+        presence_path="{}{}".format(self.cpld_path, 'psu_present')
+        val=self._api_helper.read_txt_file(presence_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        power_path="{}{}".format(self.cpld_path, 'psu_power_good')
+        val=self._api_helper.read_txt_file(power_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/sfp.py
new file mode 100644
index 000000000000..25e5bce8fe40
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/sfp.py
@@ -0,0 +1,1169 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Edgecore
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+import sys
+
+from ctypes import create_string_buffer
+
+try:
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    #from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/3-0060/"
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 1
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 176
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+
+# Offset for values in SFP eeprom
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 49
+    PORT_END = 54
+
+    # Path to sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-accton_as4630_54te-r0"
+    HWSKU = "Accton-AS4630-54TE"
+
+    _port_to_i2c_mapping = {
+           49: 18,
+           50: 19,
+           51: 20,
+           52: 21,
+           53: 22,
+           54: 23,
+    }
+
+    def __init__(self, sfp_index=0):
+        self._api_helper=APIHelper()
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index + 1
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
+                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+                              'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+                                    'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w', buffering=0) as fd:
+                fd.write(str(value))
+        except Exception:
+            return False
+        return True
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            if sys.version_info[0] >= 3:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+        except Exception:
+            pass
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev                |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49:
+            return {}
+        elif self.port_num < 53:
+            sfpi_obj = sff8472InterfaceId() #SFP
+        else:    
+            sfpi_obj = sff8436InterfaceId() #QSFP
+        if not self.get_presence() or not sfpi_obj:
+            return {}
+
+        if self.port_num < 53:
+            offset = SFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_SFP)
+        else:
+            offset = QSFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_QSFP)
+
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+            sfp_interface_bulk_raw, 0)
+
+        sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+            sfp_vendor_name_raw, 0)
+
+        sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+            sfp_vendor_pn_raw, 0)
+
+        if self.port_num < 53:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_SFP)
+        else:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_QSFP)
+
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+            sfp_vendor_rev_raw, 0)
+
+        sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+            sfp_vendor_sn_raw, 0)
+
+        sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+        if sfp_vendor_oui_raw is not None:
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_vendor_oui_raw, 0)
+
+        sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+            sfp_vendor_date_raw, 0)
+
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        compliance_code_dict = dict()
+
+        if sfp_interface_bulk_data:
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+            transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
+
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
+            'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
+        transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+            'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
+        transceiver_info_dict['cable_type'] = "Unknown"
+        transceiver_info_dict['cable_length'] = "Unknown"
+
+        if self.port_num < 53:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+        else:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 53: #SFP case
+            sfpd_obj = sff8472Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']            
+
+        else: #QSFP case
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not self.get_presence() or not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qspf_dom_capability_data = sfpi_obj.parse_qsfp_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        #End of else
+
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 53:
+            sfpd_obj = sff8472Dom()    
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data[
+                    'data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+
+        else:
+            sfpd_obj = sff8436Dom()
+
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+
+            transceiver_dom_threshold_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_MODULE_THRESHOLD_OFFSET, QSFP_MODULE_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+
+            if dom_thres_raw:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(
+                    dom_thres_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['VccLowWarning']['value']
+
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+            channel_threshold_values = sfpd_obj.parse_channel_threshold_values(
+                dom_thres_raw, 0)
+            channel_threshold_data = channel_threshold_values.get('data')
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm'] = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        return False # CPLD port doesn't support this feature
+
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        rx_los = False
+
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        if self.port_num < 53:
+            rx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_rx_los_', self.port_num)           
+            rx_los=self._api_helper.read_txt_file(rx_path)
+            if rx_los is None:
+                return False
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    rx_los = (sffbase().test_bit(data, 1) != 0)
+
+        else:
+            rx_los_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_RX_LOS_STATUS_OFFSET, QSFP_CHANNL_RX_LOS_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+                rx_los = rx_los_list[0] and rx_los_list[1] and rx_los_list[2] and rx_los_list[3]
+        return rx_los
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        tx_fault = False
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        if self.port_num < 53:
+            tx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_tx_fault_', self.port_num)           
+            tx_fault=self._api_helper.read_txt_file(tx_path)
+            if tx_fault is None:
+                return False
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_fault = (sffbase().test_bit(data, 2) != 0)
+        else:
+            tx_fault_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_TX_FAULT_STATUS_OFFSET, QSFP_CHANNL_TX_FAULT_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                tx_fault = tx_fault_list[0] and tx_fault_list[1] and tx_fault_list[2] and tx_fault_list[3]
+
+        return tx_fault
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        if self.port_num < 53: 
+            tx_disable = False            
+
+            tx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_tx_disable_', self.port_num)
+            tx_disable=self._api_helper.read_txt_file(tx_path)
+
+
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_disable_hard = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_HARD_BIT) != 0)
+            #    tx_disable_soft = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_SOFT_BIT) != 0)
+            #    tx_disable = tx_disable_hard | tx_disable_soft
+            if tx_disable is not None:
+                return tx_disable 
+            else:
+                return False
+
+        else:
+            tx_disable_list = []
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX1Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX2Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX3Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX4Disable']['value'])
+
+            return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        if self.port_num < 53: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+            return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this SFP
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        if self.port_num < 53: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set=self.get_power_set()
+            power_override = self.get_power_override()
+            return power_set and power_override
+
+
+    def get_power_set(self):        
+
+        if self.port_num < 53: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set = False    
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_POWEROVERRIDE_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_set = (
+                    'On' == dom_control_data['data']['PowerSet']['value'])
+
+            return power_set
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+        if self.port_num < 53:
+            return False # SFP doesn't support this feature
+        else:
+            power_override = False
+
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_POWEROVERRIDE_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_override = (
+                    'On' == dom_control_data['data']['PowerOverride']['value'])
+
+            return power_override
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("temperature", "N/A")
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("voltage", "N/A")
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+
+        tx1_bs = transceiver_dom_info_dict.get("tx1bias", "N/A")
+        if self.port_num < 53:            
+            return [tx1_bs, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+
+        tx2_bs = transceiver_dom_info_dict.get("tx2bias", "N/A")
+        tx3_bs = transceiver_dom_info_dict.get("tx3bias", "N/A")
+        tx4_bs = transceiver_dom_info_dict.get("tx4bias", "N/A")
+        return [tx1_bs, tx2_bs, tx3_bs, tx4_bs] if transceiver_dom_info_dict else []
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+
+        rx1_pw = transceiver_dom_info_dict.get("rx1power", "N/A")
+        if self.port_num < 53:
+            return [rx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        rx2_pw = transceiver_dom_info_dict.get("rx2power", "N/A")
+        rx3_pw = transceiver_dom_info_dict.get("rx3power", "N/A")
+        rx4_pw = transceiver_dom_info_dict.get("rx4power", "N/A")
+        return [rx1_pw, rx2_pw, rx3_pw, rx4_pw] if transceiver_dom_info_dict else []
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        tx1_pw = transceiver_dom_info_dict.get("tx1power", "N/A")
+        if self.port_num < 53:
+             return [tx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        tx2_pw = transceiver_dom_info_dict.get("tx2power", "N/A")
+        tx3_pw = transceiver_dom_info_dict.get("tx3power", "N/A")
+        tx4_pw = transceiver_dom_info_dict.get("tx4power", "N/A")
+        return [tx1_pw, tx2_pw, tx3_pw, tx4_pw]
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default srate.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        '''  
+        reset_path = "{}{}{}".format(CPLD_I2C_PATH, 'module_reset_', self.port_num)
+        ret = self.__write_txt_file(reset_path, 1)
+        if ret is not True:
+            return ret
+        
+        time.sleep(0.01)
+        ret = self.__write_txt_file(reset_path, 0)
+        time.sleep(0.2)
+        
+        return ret
+        '''
+
+        return False #CPLD doens't support this feature
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        if self.port_num < 53:
+            tx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_tx_disable_', self.port_num)      
+            ret = self.__write_txt_file(tx_path,  1 if tx_disable else 0)           
+            if ret is not None:
+                time.sleep(0.01)
+                return ret
+            else:
+                return False
+
+        else:
+            if not self.get_presence():
+                return False
+            sysfsfile_eeprom = None
+            try:
+                tx_disable_ctl = 0xf if tx_disable else 0x0
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = tx_disable_ctl
+                else:
+                    buffer[0] = chr(tx_disable_ctl)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)               
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ',str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        return True
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+
+        if self.port_num < 53:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+
+            sysfsfile_eeprom = None
+            try:
+                channel_state = self.get_tx_disable_channel()
+
+                for i in range(4):
+                    channel_mask = (1 << i)
+                    if not (channel & channel_mask):
+                        continue
+
+                    if disable:
+                        channel_state |= channel_mask
+                    else:
+                        channel_state &= ~channel_mask
+
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = channel_state
+                else:
+                    buffer[0] = chr(channel_state)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+            return True
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if self.port_num < 53:
+            return False # SFP doesn't support this feature
+        else:
+            if lpmode is True:
+                self.set_power_override(True, True)
+            else:
+                self.set_power_override(False, False)
+
+            return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        if self.port_num < 53:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+            try:
+                power_override_bit = (1 << 0) if power_override else 0
+                power_set_bit      = (1 << 1) if power_set else (1 << 3)
+
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = (power_override_bit | power_set_bit)
+                else:
+                    buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                with open(self.port_to_eeprom_mapping[self.port_num], "r+b") as fd:
+                    fd.seek(QSFP_POWEROVERRIDE_OFFSET)
+                    fd.write(buffer[0])
+                    time.sleep(0.01)
+            except Exception:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(
+            self.__get_path_to_port_config_file())
+        name = sfputil_helper.logical[self.index] or "Unknown"
+        return name
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        if self.port_num < 49: #Copper port, no sysfs
+            return False
+
+        present_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_present_', self.port_num)        
+        val=self._api_helper.read_txt_file(present_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:           
+            return False
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("model", "N/A")
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and self.get_transceiver_bulk_status()
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/thermal.py
new file mode 100644
index 000000000000..7a453c594fde
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/thermal.py
@@ -0,0 +1,145 @@
+#############################################################################
+# Edgecore
+#
+# Thermal contains an implementation of SONiC Platform Base API and
+# provides the thermal device status which are available in the platform
+#
+#############################################################################
+
+import os
+import os.path
+import glob
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    THERMAL_NAME_LIST = []
+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.THERMAL_NAME_LIST = []
+        self.SYSFS_PATH = "/sys/bus/i2c/devices"
+        self.index = thermal_index
+        # Add thermal name
+        self.THERMAL_NAME_LIST.append("Temp sensor 1")
+        self.THERMAL_NAME_LIST.append("Temp sensor 2")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")        
+
+        # Set hwmon path
+        i2c_path = {
+            0: "14-0048/hwmon/hwmon*/", 
+            1: "24-004b/hwmon/hwmon*/", 
+            2: "25-004a/hwmon/hwmon*/"
+        }.get(self.index, None)
+
+        self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
+        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self.ss_index = 1
+
+    def __read_txt_file(self, file_path):
+        for filename in glob.glob(file_path):
+            try:
+                with open(filename, 'r') as fd:                    
+                    data =fd.readline().rstrip()
+                    return data
+            except IOError as e:
+                pass
+
+        return None
+
+    def __get_temp(self, temp_file):
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_temp = self.__read_txt_file(temp_file_path)
+        if raw_temp is not None:
+            return float(raw_temp)/1000
+        else:
+            return 0        
+
+    def __set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        for filename in glob.glob(temp_file_path):
+            try:
+                with open(filename, 'w') as fd:
+                    fd.write(str(temperature))
+                return True
+            except IOError as e:
+                print("IOError")
+
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+        Args :
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        temperature = temperature *1000
+        self.__set_threshold(temp_file, temperature)
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal device
+            Returns:
+            string: The name of the thermal device
+        """
+        return self.THERMAL_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Thermal
+        Returns:
+            bool: True if Thermal is present, False if not
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_txt = self.__read_txt_file(temp_file_path)
+        if raw_txt is not None:
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+
+        file_str = "temp{}_input".format(self.ss_index)
+        file_path = os.path.join(self.hwmon_path, file_str)
+        raw_txt = self.__read_txt_file(file_path)
+        if raw_txt is None:
+            return False
+        else:     
+            return int(raw_txt) != 0
diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk
index f557f17c7cea..fb67521acf6c 100644
--- a/platform/broadcom/one-image.mk
+++ b/platform/broadcom/one-image.mk
@@ -29,6 +29,7 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
                                $(ACCTON_AS6712_32X_PLATFORM_MODULE) \
                                $(ACCTON_AS7726_32X_PLATFORM_MODULE) \
                                $(ACCTON_AS4630_54PE_PLATFORM_MODULE) \
+                               $(ACCTON_AS4630_54TE_PLATFORM_MODULE) \
                                $(ACCTON_MINIPACK_PLATFORM_MODULE) \
                                $(ACCTON_AS5812_54X_PLATFORM_MODULE) \
                                $(ACCTON_AS5812_54T_PLATFORM_MODULE) \
diff --git a/platform/broadcom/platform-modules-accton.mk b/platform/broadcom/platform-modules-accton.mk
index 395040d7561d..3ccf2d675cbd 100755
--- a/platform/broadcom/platform-modules-accton.mk
+++ b/platform/broadcom/platform-modules-accton.mk
@@ -10,6 +10,7 @@ ACCTON_AS7716_32XB_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS6712_32X_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS7726_32X_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS4630_54PE_PLATFORM_MODULE_VERSION = 1.1
+ACCTON_AS4630_54TE_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_MINIPACK_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS5812_54X_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS5812_54T_PLATFORM_MODULE_VERSION = 1.1
@@ -29,6 +30,7 @@ export ACCTON_AS7716_32XB_PLATFORM_MODULE_VERSION
 export ACCTON_AS6712_32X_PLATFORM_MODULE_VERSION
 export ACCTON_AS7726_32X_PLATFORM_MODULE_VERSION
 export ACCTON_AS4630_54PE_PLATFORM_MODULE_VERSION
+export ACCTON_AS4630_54TE_PLATFORM_MODULE_VERSION
 export ACCTON_MINIPACK_PLATFORM_MODULE_VERSION
 export ACCTON_AS5812_54X_PLATFORM_MODULE_VERSION
 export ACCTON_AS5812_54T_PLATFORM_MODULE_VERSION
@@ -84,6 +86,10 @@ ACCTON_AS4630_54PE_PLATFORM_MODULE = sonic-platform-accton-as4630-54pe_$(ACCTON_
 $(ACCTON_AS4630_54PE_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as4630_54pe-r0
 $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS4630_54PE_PLATFORM_MODULE)))
 
+ACCTON_AS4630_54TE_PLATFORM_MODULE = sonic-platform-accton-as4630-54te_$(ACCTON_AS4630_54TE_PLATFORM_MODULE_VERSION)_amd64.deb
+$(ACCTON_AS4630_54TE_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as4630_54te-r0
+$(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS4630_54TE_PLATFORM_MODULE)))
+
 ACCTON_MINIPACK_PLATFORM_MODULE = sonic-platform-accton-minipack_$(ACCTON_MINIPACK_PLATFORM_MODULE_VERSION)_amd64.deb
 $(ACCTON_MINIPACK_PLATFORM_MODULE)_PLATFORM = x86_64-accton_minipack-r0
 $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_MINIPACK_PLATFORM_MODULE)))
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/__init__.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/__init__.py
new file mode 100755
index 000000000000..e69de29bb2d1
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/fanutil.py
new file mode 100755
index 000000000000..121b8409a585
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/fanutil.py
@@ -0,0 +1,213 @@
+#!/usr/bin/env python
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+#
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    10/24/2019:Jostar craete for as4630_54te
+# ------------------------------------------------------------------
+
+try:
+    import logging
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+
+class FanUtil(object):
+    """Platform-specific FanUtil class"""
+
+    FAN_NUM_ON_MAIN_BROAD = 3
+    FAN_NUM_1_IDX = 1
+    FAN_NUM_2_IDX = 2
+    FAN_NUM_3_IDX = 3
+
+    FAN_NODE_NUM_OF_MAP = 4
+    FAN_NODE_FAULT_IDX_OF_MAP = 1
+    FAN_NODE_DIR_IDX_OF_MAP = 2
+    FAN_NODE_PRESENT_IDX_OF_MAP = 3
+    FAN_NODE_SPEED_IDX_OF_MAP = 4
+
+    BASE_VAL_PATH = '/sys/bus/i2c/devices/3-0060/{0}'
+    FAN_DUTY_PATH = '/sys/bus/i2c/devices/3-0060/fan_duty_cycle_percentage'
+
+    """ Dictionary where
+        key1 = fan id index (integer) starting from 1
+        key2 = fan node index (interger) starting from 1
+        value = path to fan device file (string) """
+    _fan_device_path_mapping = {}
+
+    _fan_device_node_mapping = {
+        (FAN_NUM_1_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan_fault_1',
+        (FAN_NUM_1_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan_direction_1',
+        (FAN_NUM_1_IDX, FAN_NODE_PRESENT_IDX_OF_MAP): 'fan_present_1',
+        (FAN_NUM_1_IDX, FAN_NODE_SPEED_IDX_OF_MAP): 'fan1_input',
+
+
+        (FAN_NUM_2_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan_fault_2',
+        (FAN_NUM_2_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan_direction_2',
+        (FAN_NUM_2_IDX, FAN_NODE_PRESENT_IDX_OF_MAP): 'fan_present_2',
+        (FAN_NUM_2_IDX, FAN_NODE_SPEED_IDX_OF_MAP): 'fan2_input',
+
+        (FAN_NUM_3_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan_fault_3',
+        (FAN_NUM_3_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan_direction_3',
+        (FAN_NUM_3_IDX, FAN_NODE_PRESENT_IDX_OF_MAP): 'fan_present_3',
+        (FAN_NUM_3_IDX, FAN_NODE_SPEED_IDX_OF_MAP): 'fan3_input',
+    }
+
+    def _get_fan_device_node(self, fan_num, node_num):
+        return self._fan_device_node_mapping[(fan_num, node_num)]
+
+    def _get_fan_node_val(self, fan_num, node_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
+
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
+            return None
+
+        device_path = self.get_fan_device_path(fan_num, node_num)
+
+        try:
+            val_file = open(device_path, 'r')
+        except IOError as e:
+            logging.error('GET. unable to open file: %s', str(e))
+            return None
+
+        content = val_file.readline().rstrip()
+        if content == '':
+            logging.debug('GET. content is NULL. device_path:%s', device_path)
+            return None
+
+        try:
+            val_file.close()
+        except Exception:
+            logging.debug(
+                'GET. unable to close file. device_path:%s',
+                device_path)
+            return None
+
+        return int(content)
+
+    def _set_fan_node_val(self, fan_num, node_num, val):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
+
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
+            return None
+
+        content = str(val)
+        if content == '':
+            logging.debug('GET. content is NULL. device_path:%s', device_path)
+            return None
+
+        device_path = self.get_fan_device_path(fan_num, node_num)
+        try:
+            val_file = open(device_path, 'w')
+        except IOError as e:
+            logging.error('GET. unable to open file: %s', str(e))
+            return None
+
+        val_file.write(content)
+
+        try:
+            val_file.close()
+        except BaseException:
+            logging.debug(
+                'GET. unable to close file. device_path:%s',
+                device_path)
+            return None
+
+        return True
+
+    def __init__(self):
+        fan_path = self.BASE_VAL_PATH
+        for fan_num in range(
+                self.FAN_NUM_1_IDX,
+                self.FAN_NUM_ON_MAIN_BROAD + 1):
+            for node_num in range(
+                    self.FAN_NODE_FAULT_IDX_OF_MAP,
+                    self.FAN_NODE_NUM_OF_MAP + 1):
+                self._fan_device_path_mapping[(fan_num, node_num)] = fan_path.format(
+                    self._fan_device_node_mapping[(fan_num, node_num)])
+
+    def get_size_node_map(self):
+        return len(self._fan_device_node_mapping)
+
+    def get_fan_device_path(self, fan_num, node_num):
+        return self._fan_device_path_mapping[(fan_num, node_num)]
+
+    def get_fan_fault(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_FAULT_IDX_OF_MAP)
+
+    def get_fan_present(self, fan_num):
+        return self._get_fan_node_val(
+            fan_num, self.FAN_NODE_PRESENT_IDX_OF_MAP)
+
+    def get_fan_dir(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_DIR_IDX_OF_MAP)
+
+    def get_fan_duty_cycle(self):
+        try:
+            val_file = open(self.FAN_DUTY_PATH)
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        content = val_file.readline().rstrip()
+        val_file.close()
+
+        return int(content)
+
+    def set_fan_duty_cycle(self, val):
+        try:
+            fan_file = open(self.FAN_DUTY_PATH, 'r+')
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        fan_file.write(str(val))
+        fan_file.close()
+        return True
+
+    def get_fan_speed(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_SPEED_IDX_OF_MAP)
+
+    def get_fan_status(self, fan_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num, %d', fan_num)
+            return None
+        if self.get_fan_fault(
+                fan_num) == 0 and self.get_fan_present(fan_num) > 0:
+            return 1
+        else:
+            logging.debug('GET. FAN fault. fan_num, %d', fan_num)
+            return 0
+
+
+def main():
+    fan = FanUtil()
+    logging.debug('fan_duty_cycle=%d', fan.get_fan_duty_cycle())
+    for i in range(1, 4):
+        logging.debug('fan-%d speed=%d', i, fan.get_fan_speed(i))
+        logging.debug('fan-%d present=%d', i, fan.get_fan_present(i))
+        logging.debug('fan-%d fault=%d', i, fan.get_fan_fault(i))
+        logging.debug('fan-%d status=%d', i, fan.get_fan_status(i))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/thermalutil.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/thermalutil.py
new file mode 100755
index 000000000000..15947da12ee3
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/classes/thermalutil.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+#
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    10/24/2019:Jostar craete for as4630_54te
+# ------------------------------------------------------------------
+
+try:
+    import logging
+    import glob
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+
+class ThermalUtil(object):
+    """Platform-specific ThermalUtil class"""
+    THERMAL_NUM_MAX = 4
+    THERMAL_NUM_1_IDX = 1
+    THERMAL_NUM_2_IDX = 2
+    THERMAL_NUM_3_IDX = 3
+    THERMAL_NUM_4_IDX = 4
+
+    """ Dictionary where
+        key1 = thermal id index (integer) starting from 1
+        value = path to fan device file (string) """
+
+    thermal_sysfspath = {
+        THERMAL_NUM_1_IDX: ["/sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input"],
+        THERMAL_NUM_2_IDX: ["/sys/bus/i2c/devices/24-004b/hwmon/hwmon*/temp1_input"],
+        THERMAL_NUM_3_IDX: ["/sys/bus/i2c/devices/25-004a/hwmon/hwmon*/temp1_input"],
+        THERMAL_NUM_4_IDX: ["/sys/class/hwmon/hwmon1/temp1_input"],
+    }
+
+    def _get_thermal_val(self, thermal_num):
+        if thermal_num < self.THERMAL_NUM_1_IDX or thermal_num > self.THERMAL_NUM_MAX:
+            logging.debug('GET. Parameter error. thermal_num, %d', thermal_num)
+            return None
+
+        device_path = self.get_thermal_path(thermal_num)
+        for filename in glob.glob(device_path):
+            try:
+                val_file = open(filename, 'r')
+            except IOError as e:
+                logging.error('GET. unable to open file: %s', str(e))
+                return None
+            content = val_file.readline().rstrip()
+            if content == '':
+                logging.debug(
+                    'GET. content is NULL. device_path:%s',
+                    device_path)
+                return None
+            try:
+                val_file.close()
+            except BaseException:
+                logging.debug(
+                    'GET. unable to close file. device_path:%s',
+                    device_path)
+                return None
+
+            return int(content)
+
+        return 0
+
+    def get_num_thermals(self):
+        return self.THERMAL_NUM_MAX
+
+    def get_size_path_map(self):
+        return len(self.thermal_sysfspath)
+
+    def get_thermal_path(self, thermal_num):
+        return self.thermal_sysfspath[thermal_num][0]
+
+
+def main():
+    ThermalUtil()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/Makefile b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/Makefile
new file mode 100755
index 000000000000..1b5914d9e5aa
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/Makefile
@@ -0,0 +1,19 @@
+ifneq ($(KERNELRELEASE),)
+obj-m:= x86-64-accton-as4630-54te-cpld.o x86-64-accton-as4630-54te-psu.o  \
+	    x86-64-accton-as4630-54te-leds.o ym2651y.o
+	    
+else
+ifeq (,$(KERNEL_SRC))
+#$(error KERNEL_SRC is not defined)
+KVERSION=3.16.0-8-amd64
+KERNEL_DIR   = /usr/src/linux-headers-$(KVERSION)/
+KERNELDIR:=$(KERNEL_DIR)
+else
+KERNELDIR:=$(KERNEL_SRC)
+endif
+PWD:=$(shell pwd)
+default:
+	$(MAKE) -C $(KERNELDIR)  M=$(PWD) modules
+clean:
+	rm -rf *.o *.mod.o *.mod.o *.mod.c *.ko .*cmd .tmp_versions Module.markers Module.symvers modules.order
+endif
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c
new file mode 100755
index 000000000000..98b855329c64
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c
@@ -0,0 +1,1106 @@
+/*
+ * Copyright (C)  Jostar yang <jostar_yang@accton.com.tw>
+ *
+ * This module supports the accton cpld that hold the channel select
+ * mechanism for other i2c slave devices, such as SFP.
+ * This includes the:
+ *	 Accton as4630_54te CPLD
+ *
+ * Based on:
+ *	pca954x.c from Kumar Gala <galak@kernel.crashing.org>
+ * Copyright (C) 2006
+ *
+ * Based on:
+ *	pca954x.c from Ken Harrenstien
+ * Copyright (C) 2004 Google, Inc. (Ken Harrenstien)
+ *
+ * Based on:
+ *	i2c-virtual_cb.c from Brian Kuschak <bkuschak@yahoo.com>
+ * and
+ *	pca9540.c from Jean Delvare <khali@linux-fr.org>.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/stat.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <asm/uaccess.h>
+
+
+#define I2C_RW_RETRY_COUNT				10
+#define I2C_RW_RETRY_INTERVAL			60 /* ms */
+#define FAN_DUTY_CYCLE_REG_MASK         0x1F
+#define FAN_MAX_DUTY_CYCLE              100
+#define FAN_REG_VAL_TO_SPEED_RPM_STEP   114 // R.P.M value = read value x3.79*60/2
+
+#define NUM_THERMAL_SENSORS     (3)     /* Get sum of this number of sensors.*/
+#define THERMAL_SENSORS_DRIVER  "lm75"
+#define THERMAL_SENSORS_ADDRS   {0x48, 0x4a, 0x4b}
+
+static LIST_HEAD(cpld_client_list);
+static struct mutex     list_lock;
+
+struct cpld_client_node {
+    struct i2c_client *client;
+    struct list_head   list;
+};
+
+enum cpld_type {
+    as4630_54te_cpld,
+};
+enum fan_id {
+    FAN1_ID,
+    FAN2_ID,
+    FAN3_ID,   
+};
+
+static const u8 fan_reg[] = {   
+    0x87,      /* fan status, fan direction */    
+    0x1A,      /* fan PWM(for fan1 ,fan2) */
+    0x1B,      /* fan PWM(for fan1 ,fan2) */
+    0x88,      /* front fan1 speed(rpm) */
+    0x89,      /* front fan2 speed(rpm) */
+    0x8A,      /* front fan3 speed(rpm) */
+    0x20,      /*fan fault*/
+};
+
+struct as4630_54te_cpld_data {
+    enum cpld_type   type;
+    struct device   *hwmon_dev;
+    struct mutex     update_lock;
+    char             valid;           /* != 0 if registers are valid */
+    unsigned long    last_updated;    /* In jiffies */
+    u8               reg_fan_val[ARRAY_SIZE(fan_reg)]; /* Register value */
+    int              system_temp;    /*In unit of mini-Celsius*/
+    int              sensors_found;
+};
+
+
+
+static const struct i2c_device_id as4630_54te_cpld_id[] = {
+    { "as4630_54te_cpld", as4630_54te_cpld},
+    { }
+};
+MODULE_DEVICE_TABLE(i2c, as4630_54te_cpld_id);
+
+#define TRANSCEIVER_PRESENT_ATTR_ID(index)   	MODULE_PRESENT_##index
+#define TRANSCEIVER_TXDISABLE_ATTR_ID(index)   	MODULE_TXDISABLE_##index
+#define TRANSCEIVER_RXLOS_ATTR_ID(index)   		MODULE_RXLOS_##index
+#define TRANSCEIVER_TXFAULT_ATTR_ID(index)   	MODULE_TXFAULT_##index
+#define FAN_SPEED_RPM_ATTR_ID(index)   	        FAN_SPEED_RPM_##index
+#define FAN_DIRECTION_ID(index)   	            FAN_DIRECTION_##index
+#define FAN_PRESENT_ATTR_ID(index)   	        FAN_PRESENT_##index
+#define FAN_FAULT_ATTR_ID(index)   	            FAN_FAULT_##index
+
+enum as4630_54te_cpld_sysfs_attributes {
+	CPLD_VERSION,
+	ACCESS,
+	/* transceiver attributes */	
+	TRANSCEIVER_RXLOS_ATTR_ID(49),
+	TRANSCEIVER_RXLOS_ATTR_ID(50),
+	TRANSCEIVER_RXLOS_ATTR_ID(51),
+	TRANSCEIVER_RXLOS_ATTR_ID(52),
+	TRANSCEIVER_TXFAULT_ATTR_ID(49),
+	TRANSCEIVER_TXFAULT_ATTR_ID(50),
+	TRANSCEIVER_TXFAULT_ATTR_ID(51),
+	TRANSCEIVER_TXFAULT_ATTR_ID(52),
+	TRANSCEIVER_PRESENT_ATTR_ID(49),
+	TRANSCEIVER_PRESENT_ATTR_ID(50),
+	TRANSCEIVER_PRESENT_ATTR_ID(51),
+	TRANSCEIVER_PRESENT_ATTR_ID(52),
+	TRANSCEIVER_PRESENT_ATTR_ID(53),
+	TRANSCEIVER_PRESENT_ATTR_ID(54),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(49),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(50),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(51),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(52),
+	FAN_PRESENT_ATTR_ID(1),
+	FAN_PRESENT_ATTR_ID(2),
+	FAN_PRESENT_ATTR_ID(3),	
+	FAN_SPEED_RPM_ATTR_ID(1),
+	FAN_SPEED_RPM_ATTR_ID(2),
+	FAN_SPEED_RPM_ATTR_ID(3),
+	FAN_DIRECTION_ID(1),
+	FAN_DIRECTION_ID(2),
+	FAN_DIRECTION_ID(3),
+	FAN_FAULT_ATTR_ID(1),
+	FAN_FAULT_ATTR_ID(2),
+	FAN_FAULT_ATTR_ID(3),
+	FAN_DUTY_CYCLE_PERCENTAGE,
+};
+
+/* sysfs attributes for hwmon 
+ */
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+             char *buf);
+static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count);
+static ssize_t access(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count);
+static ssize_t show_version(struct device *dev, struct device_attribute *da,
+             char *buf);
+static int as4630_54te_cpld_read_internal(struct i2c_client *client, u8 reg);
+static int as4630_54te_cpld_write_internal(struct i2c_client *client, u8 reg, u8 value);
+
+/*fan sysfs*/
+static struct as4630_54te_cpld_data *as4630_54te_fan_update_device(struct device *dev);
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+                              const char *buf, size_t count);
+static ssize_t get_sys_temp(struct device *dev, struct device_attribute *da, char *buf);
+//static ssize_t show_power(struct device *dev, struct device_attribute *da,
+ //            char *buf);
+
+
+
+/* transceiver attributes */
+#define DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(module_present_##index, S_IRUGO, show_status, NULL, MODULE_PRESENT_##index); \
+	static SENSOR_DEVICE_ATTR(module_tx_disable_##index, S_IRUGO | S_IWUSR, show_status, set_tx_disable, MODULE_TXDISABLE_##index); \
+	static SENSOR_DEVICE_ATTR(module_rx_los_##index, S_IRUGO, show_status, NULL, MODULE_RXLOS_##index);  \
+	static SENSOR_DEVICE_ATTR(module_tx_fault_##index, S_IRUGO, show_status, NULL, MODULE_TXFAULT_##index); 
+	
+#define DECLARE_SFP_TRANSCEIVER_ATTR(index)  \
+    &sensor_dev_attr_module_present_##index.dev_attr.attr, \
+	&sensor_dev_attr_module_tx_disable_##index.dev_attr.attr, \
+	&sensor_dev_attr_module_rx_los_##index.dev_attr.attr,     \
+	&sensor_dev_attr_module_tx_fault_##index.dev_attr.attr
+	
+#define DECLARE_QSFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(module_present_##index, S_IRUGO, show_status, NULL, MODULE_PRESENT_##index);
+
+#define DECLARE_QSFP_TRANSCEIVER_ATTR(index)  \
+    &sensor_dev_attr_module_present_##index.dev_attr.attr
+
+
+#define DECLARE_FAN_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan_present_##index, S_IRUGO, fan_show_value, NULL, FAN_PRESENT_##index); \
+    static SENSOR_DEVICE_ATTR(fan_fault_##index,   S_IRUGO, fan_show_value, NULL, FAN_FAULT_##index); \
+    static SENSOR_DEVICE_ATTR(fan_speed_rpm_##index, S_IRUGO, fan_show_value, NULL, FAN_SPEED_RPM_##index); \
+    static SENSOR_DEVICE_ATTR(fan##index##_input, S_IRUGO, fan_show_value, NULL, FAN_SPEED_RPM_##index);\
+    static SENSOR_DEVICE_ATTR(fan_direction_##index, S_IRUGO, fan_show_value, NULL, FAN_DIRECTION_##index);
+    
+#define DECLARE_FAN_ATTR(index)  \
+    &sensor_dev_attr_fan_present_##index.dev_attr.attr, \
+    &sensor_dev_attr_fan_fault_##index.dev_attr.attr, \
+    &sensor_dev_attr_fan_speed_rpm_##index.dev_attr.attr, \
+    &sensor_dev_attr_fan##index##_input.dev_attr.attr, \
+    &sensor_dev_attr_fan_direction_##index.dev_attr.attr
+    
+#define DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan_duty_cycle_percentage, S_IWUSR | S_IRUGO, fan_show_value, set_duty_cycle, FAN_DUTY_CYCLE_PERCENTAGE);
+#define DECLARE_FAN_DUTY_CYCLE_ATTR(index) &sensor_dev_attr_fan_duty_cycle_percentage.dev_attr.attr
+
+#define DECLARE_FAN_SYSTEM_TEMP_SENSOR_DEV_ATTR() \
+    static SENSOR_DEVICE_ATTR(sys_temp, S_IRUGO, get_sys_temp, NULL, FAN_DUTY_CYCLE_PERCENTAGE)
+
+#define DECLARE_FAN_SYSTEM_TEMP_ATTR()  &sensor_dev_attr_sys_temp.dev_attr.attr
+
+static SENSOR_DEVICE_ATTR(version, S_IRUGO, show_version, NULL, CPLD_VERSION);
+static SENSOR_DEVICE_ATTR(access, S_IWUSR, NULL, access, ACCESS);
+
+
+
+/* transceiver attributes */
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(49);
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(50);
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(51);
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(52);
+DECLARE_QSFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(53);
+DECLARE_QSFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(54);
+/* fan attributes */
+DECLARE_FAN_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR(1);
+
+static struct attribute *as4630_54te_cpld_attributes[] = {
+    &sensor_dev_attr_version.dev_attr.attr,
+    &sensor_dev_attr_access.dev_attr.attr,
+	DECLARE_SFP_TRANSCEIVER_ATTR(49),
+	DECLARE_SFP_TRANSCEIVER_ATTR(50),
+	DECLARE_SFP_TRANSCEIVER_ATTR(51),
+	DECLARE_SFP_TRANSCEIVER_ATTR(52),
+	DECLARE_QSFP_TRANSCEIVER_ATTR(53),
+	DECLARE_QSFP_TRANSCEIVER_ATTR(54),
+	DECLARE_FAN_ATTR(1),
+    DECLARE_FAN_ATTR(2),
+    DECLARE_FAN_ATTR(3),
+	DECLARE_FAN_DUTY_CYCLE_ATTR(1),
+	NULL
+};
+
+static const struct attribute_group as4630_54te_cpld_group = {
+	.attrs = as4630_54te_cpld_attributes,
+};
+
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+    int status = 0;
+    u8 reg = 0, mask = 0, revert = 0;
+    
+    switch (attr->index)
+    {
+        case MODULE_RXLOS_49 ... MODULE_RXLOS_50:
+            reg=0x5;
+            mask = 0x1<< (attr->index==MODULE_RXLOS_49?4:0);
+            break; 
+        case MODULE_TXFAULT_49 ... MODULE_TXFAULT_50:
+            reg=0x5;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_49?5:1);
+            break;           
+        case MODULE_PRESENT_49 ... MODULE_PRESENT_50:            
+            reg=0x5;
+            mask=0x1 << (attr->index==MODULE_PRESENT_49?6:2);
+            break;       
+        case MODULE_TXDISABLE_49 ... MODULE_TXDISABLE_50:
+            reg=0x5;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_49?7:3);
+            break;
+            
+        case MODULE_RXLOS_51 ... MODULE_RXLOS_52:
+            reg=0x6;
+            mask = 0x1<< (attr->index==MODULE_RXLOS_51?4:0);
+            break; 
+        case MODULE_TXFAULT_51 ... MODULE_TXFAULT_52:
+            reg=0x6;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_51?5:1);
+            break;           
+        case MODULE_PRESENT_51 ... MODULE_PRESENT_52:            
+            reg=0x6;
+            mask=0x1 << (attr->index==MODULE_PRESENT_51?6:2);
+            break;       
+        case MODULE_TXDISABLE_51 ... MODULE_TXDISABLE_52:
+            reg=0x6;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_51?7:3);
+            break;
+        case MODULE_PRESENT_53 ... MODULE_PRESENT_54:
+            reg=0x21;
+            mask=0x1 << (attr->index==MODULE_PRESENT_53?0:4);
+            break;
+	    default:
+		    return 0;
+    }
+
+    if( attr->index >= MODULE_PRESENT_49 && attr->index <= MODULE_PRESENT_54 )        
+    {
+        revert = 1;
+    }
+
+    mutex_lock(&data->update_lock);
+	status = as4630_54te_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+    
+	return sprintf(buf, "%d\n", revert ? !(status & mask) : !!(status & mask));
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+	long disable;
+	int status;
+    u8 reg = 0, mask = 0;
+     
+	status = kstrtol(buf, 10, &disable);
+	if (status) {
+		return status;
+	}
+    reg  = 0x9;
+    switch (attr->index)
+    {
+         case MODULE_TXDISABLE_49 ... MODULE_TXDISABLE_50:
+            reg=0x5;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_49?7:3);
+            break;
+        case MODULE_TXDISABLE_51 ... MODULE_TXDISABLE_52:
+            reg=0x6;
+            mask=0x1 << (attr->index==MODULE_TXFAULT_51?7:3);
+            break;
+     
+	    default:
+		    return 0;
+    }
+
+    /* Read current status */
+    mutex_lock(&data->update_lock);
+	status = as4630_54te_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	/* Update tx_disable status */
+	if (disable) {
+		status &= ~mask;
+	}
+	else {
+	    status |= mask;
+	}
+    status = as4630_54te_cpld_write_internal(client, reg, status);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+    
+    mutex_unlock(&data->update_lock);
+    return count;
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static ssize_t access(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+	int status;
+	u32 addr, val;
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+    
+	if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
+		return -EINVAL;
+	}
+
+	if (addr > 0xFF || val > 0xFF) {
+		return -EINVAL;
+	}
+
+	mutex_lock(&data->update_lock);
+	status = as4630_54te_cpld_write_internal(client, addr, val);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+	return count;
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static void as4630_54te_cpld_add_client(struct i2c_client *client)
+{
+    struct cpld_client_node *node = kzalloc(sizeof(struct cpld_client_node), GFP_KERNEL);
+
+    if (!node) {
+        dev_dbg(&client->dev, "Can't allocate cpld_client_node (0x%x)\n", client->addr);
+        return;
+    }
+
+    node->client = client;
+
+	mutex_lock(&list_lock);
+    list_add(&node->list, &cpld_client_list);
+	mutex_unlock(&list_lock);
+}
+
+static void as4630_54te_cpld_remove_client(struct i2c_client *client)
+{
+    struct list_head    *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int found = 0;
+
+	mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client == client) {
+            found = 1;
+            break;
+        }
+    }
+
+    if (found) {
+        list_del(list_node);
+        kfree(cpld_node);
+    }
+
+	mutex_unlock(&list_lock);
+}
+
+static ssize_t show_version(struct device *dev, struct device_attribute *attr, char *buf)
+{
+    int val = 0;
+    struct i2c_client *client = to_i2c_client(dev);
+	
+	val = i2c_smbus_read_byte_data(client, 0x1);
+
+    if (val < 0) {
+        dev_dbg(&client->dev, "cpld(0x%x) reg(0x1) err %d\n", client->addr, val);
+    }
+	
+    return sprintf(buf, "%d\n", val);
+}
+
+/* fan utility functions
+ */
+static u32 reg_val_to_duty_cycle(u8 reg_val)
+{
+    reg_val &= FAN_DUTY_CYCLE_REG_MASK;
+    return ((u32)(reg_val) * 625)/ 100;
+}
+
+static u8 duty_cycle_to_reg_val(u8 duty_cycle)
+{
+    return ((u32)duty_cycle * 100 / 625);
+}
+
+static u32 reg_val_to_speed_rpm(u8 reg_val)
+{
+   return (u32)reg_val * FAN_REG_VAL_TO_SPEED_RPM_STEP;
+}
+
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+                              const char *buf, size_t count)
+{
+    int error, value;
+    struct i2c_client *client = to_i2c_client(dev);
+
+    error = kstrtoint(buf, 10, &value);
+    if (error)
+        return error;
+
+    if (value < 0 || value > FAN_MAX_DUTY_CYCLE)
+        return -EINVAL;
+    
+    as4630_54te_cpld_write_internal(client, fan_reg[1], duty_cycle_to_reg_val(value));
+    as4630_54te_cpld_write_internal(client, fan_reg[2], duty_cycle_to_reg_val(value));
+    return count;
+}
+
+static u8 reg_val_to_direction(u8 reg_val, enum fan_id id)
+{
+    u8 mask = (1 << id);
+
+    reg_val &= mask;
+
+    return reg_val ? 1 : 0;
+}
+
+static u8 reg_val_to_is_present(u8 reg_val, enum fan_id id)
+{
+    u8 mask = (1 << id);
+
+    reg_val &= mask;
+
+    return reg_val ? 0 : 1;
+}
+
+static u8 is_fan_fault(struct as4630_54te_cpld_data *data, enum fan_id id)
+{
+    u8 ret = 1;
+    
+    if(id > FAN3_ID)
+        return 1;
+    /* Check if the speed of front or rear fan is ZERO,
+     */
+    if (reg_val_to_speed_rpm(data->reg_fan_val[id+3]))
+    {
+           
+        ret = 0;
+    }
+
+    return ret;
+}
+
+/* Due to this struct is declared at lm75.c, it cannot be include
+ * under Sonic environment. I duplicate it from lm75.c.
+ */
+struct lm75_data {
+    struct i2c_client       *client;
+    struct device           *hwmon_dev;
+    struct thermal_zone_device      *tz;
+    struct mutex            update_lock;
+    u8                      orig_conf;
+    u8                      resolution;     /* In bits, between 9 and 12 */
+    u8                      resolution_limits;
+    char                    valid;          /* !=0 if registers are valid */
+    unsigned long           last_updated;   /* In jiffies */
+    unsigned long           sample_time;    /* In jiffies */
+    s16                     temp[3];        /* Register values,
+                                                   0 = input
+                                                   1 = max
+                                                   2 = hyst */
+};
+
+/*Copied from lm75.c*/
+static inline long lm75_reg_to_mc(s16 temp, u8 resolution)
+{
+    return ((temp >> (16 - resolution)) * 1000) >> (resolution - 8);
+}
+
+/*Get hwmon_dev from i2c_client, set hwmon_dev = NULL is failed.*/
+static struct device * get_hwmon_dev(
+    struct i2c_client *client)
+{
+    struct lm75_data *data = NULL;
+
+    data = i2c_get_clientdata(client);
+    if(data)
+    {
+        if( data->valid == 1  && data->hwmon_dev)
+        {
+            return data->hwmon_dev;
+        }
+
+    }
+    return NULL;
+}
+
+/* To find hwmon index by opening hwmon under that i2c address.
+ */
+static int find_hwmon_index_by_FileOpen(
+    int bus_nr,
+    unsigned short addr,
+    int *index)
+{
+#define MAX_HWMON_DEVICE        (10)    /* Find hwmon device in 0~10*/
+    struct file *sfd;
+    char client_name[96];
+    int  i=0;
+
+    do {
+        snprintf(client_name, sizeof(client_name),
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/hwmon%d/temp1_input",
+                 bus_nr, addr, i);
+
+        sfd = filp_open(client_name, O_RDONLY, 0);
+        i++;
+    } while( IS_ERR(sfd) && i < MAX_HWMON_DEVICE);
+
+    if (IS_ERR(sfd)) {
+        pr_err("Failed to open file(%s)#%d\r\n", client_name, __LINE__);
+        return -ENOENT;
+    }
+    filp_close(sfd, 0);
+    *index = i - 1;
+    return 0;
+
+#undef MAX_HWMON_DEVICE
+}
+
+static int get_temp_file_path(
+    int bus_nr, unsigned short addr,
+    struct device *hwmon_dev
+    ,char *path, int max_len)
+{
+
+    if(hwmon_dev && strlen(dev_name(hwmon_dev)))
+    {
+        snprintf(path, max_len,
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/%s/temp1_input",
+                 bus_nr, addr, dev_name(hwmon_dev));
+    }
+    else
+    {
+        int  i=0;
+        if(find_hwmon_index_by_FileOpen( bus_nr, addr, &i))
+        {
+            return  -EIO;
+        }
+        snprintf(path, max_len,
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/hwmon%d/temp1_input",
+                 bus_nr, addr, i);
+    }
+    
+    return 0;
+}
+
+/*File read the dev file at user space.*/
+static int read_devfile_temp1_input(
+    struct device *dev,
+    int bus_nr,
+    unsigned short addr,
+    struct device *hwmon_dev,
+    int *miniCelsius)
+{
+    struct file *sfd;
+    char buffer[96];
+    char devfile[96];
+    int     rc, status;
+    int     rdlen, value;
+    mm_segment_t old_fs;
+
+    rc = 0;
+    get_temp_file_path(bus_nr, addr, hwmon_dev, devfile, sizeof(devfile));
+    sfd = filp_open(devfile, O_RDONLY, 0);
+    if (IS_ERR(sfd)) {
+        pr_err("Failed to open file(%s)#%d\r\n", devfile, __LINE__);
+        return -ENOENT;
+    }
+    dev_dbg(dev, "Found device:%s\n",devfile);
+
+    if(!(sfd->f_op) || !(sfd->f_op->read) ) {
+        pr_err("file %s cann't readable ?\n",devfile);
+        return -ENOENT;
+    }
+
+    old_fs = get_fs();
+    set_fs(KERNEL_DS);
+    rdlen = sfd->f_op->read(sfd, buffer, sizeof(buffer), &sfd->f_pos);
+    if (rdlen == 0) {
+        pr_err( "File(%s) empty!\n", devfile);
+        rc = -EIO;
+        goto exit;
+    }
+    status = sscanf(buffer, "%d", &value);
+    if (status != 1) {
+        rc = -EIO;
+        goto exit;
+    }
+    *miniCelsius = value;
+    dev_dbg(dev,"found sensors: %d @i2c %d-%04x\n", value, bus_nr, addr);
+
+exit:
+    set_fs(old_fs);
+    filp_close(sfd, 0);
+    return rc;
+}
+
+static u8 is_lm75_data_due(struct i2c_client *client)
+{
+    struct lm75_data *data = NULL;
+
+    data = i2c_get_clientdata(client);
+    if (time_after(jiffies, data->last_updated + data->sample_time))
+    {
+        return 1;
+    }
+    return 0;
+}
+static int get_lm75_temp(struct i2c_client *client, int *miniCelsius)
+{
+    struct lm75_data *data = NULL;
+
+    data = i2c_get_clientdata(client);
+    *miniCelsius = lm75_reg_to_mc(data->temp[0], data->resolution);
+
+    return 0;
+}
+
+static bool lm75_addr_mached(unsigned short addr)
+{
+    int i;
+    unsigned short addrs[] = THERMAL_SENSORS_ADDRS;
+    
+    for (i = 0; i < ARRAY_SIZE(addrs); i++)
+    {
+        if( addr == addrs[i])
+            return 1;
+    }
+    return 0;
+}
+
+static int _find_lm75_device(struct device *dev, void *data)
+{
+    struct device_driver *driver;
+    struct as4630_54te_cpld_data *prv = data;
+    char *driver_name = THERMAL_SENSORS_DRIVER;
+
+    driver = dev->driver;
+    if (driver && driver->name &&
+            strcmp(driver->name, driver_name) == 0)
+    {
+        struct i2c_client *client;
+        client = to_i2c_client(dev);
+        if (client)
+        {
+            /*cannot use "struct i2c_adapter *adap = to_i2c_adapter(dev);"*/
+            struct i2c_adapter *adap = client->adapter;
+            int miniCelsius = 0;
+
+            if (! lm75_addr_mached(client->addr))
+            {
+                return 0;
+            }
+
+            if (!adap) {
+                return -ENXIO;
+            }
+
+            /* If the data is not updated, read them from devfile
+               to drive them updateing data from chip.*/
+            if (is_lm75_data_due(client))
+            {
+                struct device *hwmon_dev;
+
+                hwmon_dev = get_hwmon_dev(client);
+                if(0 == read_devfile_temp1_input(dev, adap->nr,
+                                                 client->addr, hwmon_dev, &miniCelsius))
+                {
+                    prv->system_temp += miniCelsius;
+                    prv->sensors_found++;
+                }
+
+            }
+            else
+            {
+                get_lm75_temp(client, &miniCelsius);
+                prv->system_temp += miniCelsius;
+                prv->sensors_found++;
+
+            }
+        }
+    }
+    return 0;
+}
+
+/*Find all lm75 devices and return sum of temperatures.*/
+static ssize_t get_sys_temp(struct device *dev, struct device_attribute *da,
+                            char *buf)
+{
+    ssize_t ret = 0;
+    struct as4630_54te_cpld_data *data = as4630_54te_fan_update_device(dev);
+
+    data->system_temp=0;
+    data->sensors_found=0;
+    i2c_for_each_dev(data, _find_lm75_device);
+    if (NUM_THERMAL_SENSORS != data->sensors_found)
+    {
+        dev_dbg(dev,"only %d of %d temps are found\n",
+                data->sensors_found, NUM_THERMAL_SENSORS);
+        data->system_temp = INT_MAX;
+    }
+    ret = sprintf(buf, "%d\n",data->system_temp);
+    return ret;
+}
+
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da,
+                              char *buf)
+{
+    u32 duty_cycle;
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as4630_54te_cpld_data *data = as4630_54te_fan_update_device(dev);
+    ssize_t ret = 0;
+    
+    if (data->valid) {
+        switch (attr->index)
+        {
+            case FAN_PRESENT_1:
+            case FAN_PRESENT_2:
+            case FAN_PRESENT_3:
+                ret = sprintf(buf, "%d\n",
+                          reg_val_to_is_present(data->reg_fan_val[0],
+                                                attr->index - FAN_PRESENT_1));
+                break;
+            case FAN_DUTY_CYCLE_PERCENTAGE:        
+                duty_cycle = reg_val_to_duty_cycle(data->reg_fan_val[1]);
+                ret = sprintf(buf, "%u\n", duty_cycle);
+                break;
+            case FAN_SPEED_RPM_1:
+            case FAN_SPEED_RPM_2:
+            case FAN_SPEED_RPM_3:
+                ret = sprintf(buf, "%u\n", reg_val_to_speed_rpm(data->reg_fan_val[attr->index-FAN_SPEED_RPM_1+3]));
+                break;   
+            case FAN_FAULT_1:
+            case FAN_FAULT_2:
+            case FAN_FAULT_3:        
+                ret = sprintf(buf, "%d\n", is_fan_fault(data, attr->index - FAN_FAULT_1));
+                break;     
+            case FAN_DIRECTION_1:
+            case FAN_DIRECTION_2:
+            case FAN_DIRECTION_3:
+                ret = sprintf(buf, "%d\n",
+                              reg_val_to_direction(data->reg_fan_val[0],
+                              attr->index - FAN_DIRECTION_1));
+                break;     
+            default:
+                break;
+        }
+    }
+
+    return ret;
+}
+
+static struct as4630_54te_cpld_data *as4630_54te_fan_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->update_lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2) ||
+            !data->valid) {
+        int i;
+
+        dev_dbg(&client->dev, "Starting as4630_54te_fan update\n");
+        data->valid = 0;
+
+        /* Update fan data
+         */
+        for (i = 0; i < ARRAY_SIZE(data->reg_fan_val); i++) {
+            int status = as4630_54te_cpld_read_internal(client, fan_reg[i]);
+            if (status < 0) {
+                data->valid = 0;
+                mutex_unlock(&data->update_lock);
+                dev_dbg(&client->dev, "reg 0x%x, err %d\n", fan_reg[i], status);
+                return data;
+            }
+            else {
+                data->reg_fan_val[i] = status & 0xff;
+            }
+        }
+
+        data->last_updated = jiffies;
+        data->valid = 1;
+    }
+
+    mutex_unlock(&data->update_lock);
+
+    return data;
+}
+
+/*
+static ssize_t show_power(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+    int status = 0;
+    u8 reg = 0, mask = 0;
+  
+    reg=0xc;
+    mask=0x2;
+    mutex_lock(&data->update_lock);
+	status = as4630_54te_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+
+	return sprintf(buf, "%d\n", !(status & mask));
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+*/
+/*
+ * I2C init/probing/exit functions
+ */
+static int as4630_54te_cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+	struct as4630_54te_cpld_data *data;
+	int ret = -ENODEV;
+//	int status;	
+	const struct attribute_group *group = NULL;
+
+	if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
+		goto exit;
+
+	data = kzalloc(sizeof(struct as4630_54te_cpld_data), GFP_KERNEL);
+	if (!data) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+    mutex_init(&data->update_lock);
+	data->type = id->driver_data;
+	   
+    /* Register sysfs hooks */
+    switch (data->type)
+    {    
+        case as4630_54te_cpld:
+            group = &as4630_54te_cpld_group;
+            break;    
+        default:
+            break;
+    }
+
+    if (group)
+    {
+        ret = sysfs_create_group(&client->dev.kobj, group);
+        if (ret) {
+            goto exit_free;
+        }
+    }
+
+    as4630_54te_cpld_add_client(client);
+    
+    
+    data->hwmon_dev = hwmon_device_register(&client->dev);
+    if (IS_ERR(data->hwmon_dev)) {
+        ret = PTR_ERR(data->hwmon_dev);
+        goto exit_free;
+    }
+
+    
+    return 0;
+
+exit_free:
+    kfree(data);
+exit:
+	return ret;
+}
+
+static int as4630_54te_cpld_remove(struct i2c_client *client)
+{
+    struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
+    const struct attribute_group *group = NULL;
+
+    as4630_54te_cpld_remove_client(client);
+
+    /* Remove sysfs hooks */
+    switch (data->type)
+    {
+        case as4630_54te_cpld:
+            group = &as4630_54te_cpld_group;
+            break;
+        default:
+            break;
+    }
+
+    if (group) {
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, group);
+    }
+    
+
+    kfree(data);
+
+    return 0;
+}
+
+static int as4630_54te_cpld_read_internal(struct i2c_client *client, u8 reg)
+{
+	int status = 0, retry = I2C_RW_RETRY_COUNT;
+
+	while (retry) {
+		status = i2c_smbus_read_byte_data(client, reg);
+		if (unlikely(status < 0)) {
+			msleep(I2C_RW_RETRY_INTERVAL);
+			retry--;
+			continue;
+		}
+
+		break;
+	}
+
+    return status;
+}
+
+static int as4630_54te_cpld_write_internal(struct i2c_client *client, u8 reg, u8 value)
+{
+	int status = 0, retry = I2C_RW_RETRY_COUNT;
+    
+	while (retry) {
+		status = i2c_smbus_write_byte_data(client, reg, value);
+		if (unlikely(status < 0)) {
+			msleep(I2C_RW_RETRY_INTERVAL);
+			retry--;
+			continue;
+		}
+
+		break;
+	}
+
+    return status;
+}
+
+int as4630_54te_cpld_read(unsigned short cpld_addr, u8 reg)
+{
+    struct list_head   *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int ret = -EPERM;
+
+    mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client->addr == cpld_addr) {
+            ret = as4630_54te_cpld_read_internal(cpld_node->client, reg);
+    		break;
+        }
+    }
+
+	mutex_unlock(&list_lock);
+
+    return ret;
+}
+EXPORT_SYMBOL(as4630_54te_cpld_read);
+
+int as4630_54te_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
+{
+    struct list_head   *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int ret = -EIO;
+    
+	mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client->addr == cpld_addr) {
+            ret = as4630_54te_cpld_write_internal(cpld_node->client, reg, value);
+            break;
+        }
+    }
+
+	mutex_unlock(&list_lock);
+
+    return ret;
+}
+EXPORT_SYMBOL(as4630_54te_cpld_write);
+
+static struct i2c_driver as4630_54te_cpld_driver = {
+	.driver		= {
+		.name	= "as4630_54te_cpld",
+		.owner	= THIS_MODULE,
+	},
+	.probe		= as4630_54te_cpld_probe,
+	.remove		= as4630_54te_cpld_remove,
+	.id_table	= as4630_54te_cpld_id,
+};
+
+static int __init as4630_54te_cpld_init(void)
+{
+    mutex_init(&list_lock);
+    return i2c_add_driver(&as4630_54te_cpld_driver);
+}
+
+static void __exit as4630_54te_cpld_exit(void)
+{
+    i2c_del_driver(&as4630_54te_cpld_driver);
+}
+
+MODULE_AUTHOR("Jostar Yang <jostar_yang@accton.com.tw>");
+MODULE_DESCRIPTION("Accton I2C CPLD driver");
+MODULE_LICENSE("GPL");
+
+module_init(as4630_54te_cpld_init);
+module_exit(as4630_54te_cpld_exit);
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-leds.c b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-leds.c
new file mode 100755
index 000000000000..f4e2668348ff
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-leds.c
@@ -0,0 +1,579 @@
+/*
+ * A LED driver for the accton_as4630_54te_led
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*#define DEBUG*/
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/leds.h>
+#include <linux/slab.h>
+#include <linux/dmi.h>
+
+extern int as4630_54te_cpld_read (unsigned short cpld_addr, u8 reg);
+extern int as4630_54te_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
+
+#define DRVNAME "accton_as4630_54te_led"
+
+struct accton_as4630_54te_led_data {
+    struct platform_device *pdev;
+    struct mutex	 update_lock;
+    char			 valid;		   /* != 0 if registers are valid */
+    unsigned long	last_updated;	/* In jiffies */
+    u8			   reg_val[2];	  /* only 1 register*/
+};
+
+static struct accton_as4630_54te_led_data  *ledctl = NULL;
+
+/* LED related data
+ */
+
+#define LED_CNTRLER_I2C_ADDRESS	(0x60)
+
+#define LED_TYPE_DIAG_REG_MASK	        (0x20|0x40|0x80)
+#define LED_MODE_DIAG_GREEN_VALUE       (0x20)
+#define LED_MODE_DIAG_GREEN_BLINK_VALUE	(0x60)
+#define LED_MODE_DIAG_AMBER_VALUE       (0x80)  /*It's yellow actually. Green+Red=Yellow*/
+#define LED_MODE_DIAG_OFF_VALUE	        (0x0)
+
+#define LED_TYPE_PRI_REG_MASK	        (0x8|0x4)
+#define LED_MODE_PRI_GREEN_VALUE        0x4
+#define LED_MODE_PRI_AMBER_VALUE        0x8
+#define LED_MODE_PRI_OFF_VALUE	        0x0
+
+#define LED_TYPE_POE_REG_MASK	        (0x2|0x1)
+#define LED_MODE_POE_GREEN_VALUE        0x1
+#define LED_MODE_POE_AMBER_VALUE        0x2
+#define LED_MODE_POE_OFF_VALUE	        0x0
+
+#define LED_TYPE_STK1_REG_MASK	        0x20
+#define LED_MODE_STK1_GREEN_VALUE       0x0
+#define LED_MODE_STK1_OFF_VALUE	        0x20
+
+#define LED_TYPE_STK2_REG_MASK	        0x10
+#define LED_MODE_STK2_GREEN_VALUE       0x0
+#define LED_MODE_STK2_OFF_VALUE	        0x10
+
+#define LED_TYPE_FAN_REG_MASK           (0x20|0x10)
+#define LED_MODE_FAN_AMBER_VALUE        0x20
+#define LED_MODE_FAN_GREEN_VALUE        0x10
+#define LED_MODE_FAN_OFF_VALUE	        (0x0)
+
+#define LED_TYPE_PSU2_REG_MASK          (0x8|0x4)
+#define LED_MODE_PSU2_AMBER_VALUE        0x8
+#define LED_MODE_PSU2_GREEN_VALUE        0x4
+#define LED_MODE_PSU2_OFF_VALUE	        (0x0)
+
+#define LED_TYPE_PSU1_REG_MASK          (0x2|0x1)
+#define LED_MODE_PSU1_AMBER_VALUE        0x2
+#define LED_MODE_PSU1_GREEN_VALUE        0x1
+#define LED_MODE_PSU1_OFF_VALUE	        (0x0)
+
+enum led_type {
+    LED_TYPE_DIAG,
+    LED_TYPE_PRI,
+    LED_TYPE_POE,
+    LED_TYPE_STK1,
+    LED_TYPE_STK2,
+    LED_TYPE_FAN,
+    LED_TYPE_PSU1,
+    LED_TYPE_PSU2
+};
+
+struct led_reg {
+    u32  types;
+    u8   reg_addr;
+};
+
+static const struct led_reg led_reg_map[] = {    
+    {(1<<LED_TYPE_DIAG)| (1<<LED_TYPE_PRI) | (1<<LED_TYPE_PSU2) , 0x30},
+    {(1<<LED_TYPE_PSU1) | (1<<LED_TYPE_FAN) | (1<<LED_TYPE_POE) |(1<<LED_TYPE_STK1) | (1<<LED_TYPE_STK2) , 0x31},
+};
+
+
+enum led_light_mode {
+    LED_MODE_OFF = 0,
+    LED_MODE_GREEN,
+    LED_MODE_AMBER,
+    LED_MODE_RED,
+    LED_MODE_BLUE,
+    LED_MODE_GREEN_BLINK,
+    LED_MODE_AMBER_BLINK,
+    LED_MODE_RED_BLINK,
+    LED_MODE_BLUE_BLINK,
+    LED_MODE_AUTO,
+    LED_MODE_UNKNOWN
+};
+
+struct led_type_mode {
+    enum led_type type;
+    enum led_light_mode mode;
+    int  reg_bit_mask;
+    int  mode_value;
+};
+
+static struct led_type_mode led_type_mode_data[] = {
+  {LED_TYPE_PRI, LED_MODE_OFF,   LED_TYPE_PRI_REG_MASK,  LED_MODE_PRI_OFF_VALUE},
+  {LED_TYPE_PRI, LED_MODE_GREEN, LED_TYPE_PRI_REG_MASK,  LED_MODE_PRI_GREEN_VALUE},
+  {LED_TYPE_PRI, LED_MODE_AMBER, LED_TYPE_PRI_REG_MASK,  LED_MODE_PRI_AMBER_VALUE},
+    
+  {LED_TYPE_DIAG,LED_MODE_OFF,   LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_OFF_VALUE},
+  {LED_TYPE_DIAG,LED_MODE_GREEN, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_GREEN_VALUE},
+  {LED_TYPE_DIAG,LED_MODE_GREEN_BLINK, LED_TYPE_DIAG_REG_MASK,  LED_MODE_DIAG_GREEN_BLINK_VALUE},
+  {LED_TYPE_DIAG,LED_MODE_AMBER, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_AMBER_VALUE}, 
+  
+  {LED_TYPE_POE,LED_MODE_OFF,    LED_TYPE_POE_REG_MASK,  LED_MODE_POE_OFF_VALUE},
+  {LED_TYPE_POE,LED_MODE_GREEN,  LED_TYPE_POE_REG_MASK,  LED_MODE_POE_GREEN_VALUE},
+  {LED_TYPE_POE,LED_MODE_AMBER,  LED_TYPE_POE_REG_MASK,  LED_MODE_POE_AMBER_VALUE},
+  
+  {LED_TYPE_STK1,LED_MODE_OFF,   LED_TYPE_STK1_REG_MASK, LED_MODE_STK1_OFF_VALUE},
+  {LED_TYPE_STK1,LED_MODE_GREEN, LED_TYPE_STK1_REG_MASK, LED_MODE_STK1_GREEN_VALUE},
+  
+  {LED_TYPE_STK2,LED_MODE_OFF,   LED_TYPE_STK2_REG_MASK, LED_MODE_STK2_OFF_VALUE},
+  {LED_TYPE_STK2,LED_MODE_GREEN, LED_TYPE_STK2_REG_MASK, LED_MODE_STK2_GREEN_VALUE},
+  
+  {LED_TYPE_FAN,LED_MODE_OFF,    LED_TYPE_FAN_REG_MASK,  LED_MODE_FAN_OFF_VALUE},
+  {LED_TYPE_FAN,LED_MODE_GREEN,  LED_TYPE_FAN_REG_MASK,  LED_MODE_FAN_GREEN_VALUE},  
+  {LED_TYPE_FAN,LED_MODE_AMBER,  LED_TYPE_FAN_REG_MASK,  LED_MODE_FAN_AMBER_VALUE},
+  
+  {LED_TYPE_PSU1,LED_MODE_OFF,   LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_OFF_VALUE},
+  {LED_TYPE_PSU1,LED_MODE_GREEN, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_GREEN_VALUE},  
+  {LED_TYPE_PSU1,LED_MODE_AMBER, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_AMBER_VALUE},
+  
+  {LED_TYPE_PSU2,LED_MODE_OFF,   LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_OFF_VALUE},
+  {LED_TYPE_PSU2,LED_MODE_GREEN, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_GREEN_VALUE},  
+  {LED_TYPE_PSU2,LED_MODE_AMBER, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_AMBER_VALUE},
+  
+};
+
+
+
+static void accton_as4630_54te_led_set(struct led_classdev *led_cdev,
+                                      enum led_brightness led_light_mode, enum led_type type);
+
+
+
+
+
+static int accton_getLedReg(enum led_type type, u8 *reg)
+{
+    int i;
+    
+    for (i = 0; i < ARRAY_SIZE(led_reg_map); i++) {        
+        if(led_reg_map[i].types & (1<<type)) {            
+            *reg = led_reg_map[i].reg_addr;
+            return 0;
+        }
+    }
+    
+    return 1;
+}
+
+
+static int led_reg_val_to_light_mode(enum led_type type, u8 reg_val) {
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(led_type_mode_data); i++) {
+
+        if (type != led_type_mode_data[i].type)
+            continue;
+
+        if ((led_type_mode_data[i].reg_bit_mask & reg_val) ==
+                led_type_mode_data[i].mode_value)
+        {
+            return led_type_mode_data[i].mode;
+        }
+    }
+
+    return 0;
+}
+
+static u8 led_light_mode_to_reg_val(enum led_type type,
+                                    enum led_light_mode mode, u8 reg_val) {
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(led_type_mode_data); i++) {
+        if (type != led_type_mode_data[i].type)
+            continue;
+
+        if (mode != led_type_mode_data[i].mode)
+            continue;
+        reg_val = led_type_mode_data[i].mode_value |
+                  (reg_val & (~led_type_mode_data[i].reg_bit_mask));
+        break;
+    }
+
+    return reg_val;
+}
+
+static int accton_as4630_54te_led_read_value(u8 reg)
+{
+    return as4630_54te_cpld_read(LED_CNTRLER_I2C_ADDRESS, reg);
+}
+
+static int accton_as4630_54te_led_write_value(u8 reg, u8 value)
+{
+    return as4630_54te_cpld_write(LED_CNTRLER_I2C_ADDRESS, reg, value);
+}
+
+static void accton_as4630_54te_led_update(void)
+{
+    mutex_lock(&ledctl->update_lock);
+
+    if (time_after(jiffies, ledctl->last_updated + HZ + HZ / 2)
+            || !ledctl->valid) {
+        int i;
+
+        dev_dbg(&ledctl->pdev->dev, "Starting accton_as4630_54te_led update\n");
+
+        /* Update LED data
+         */
+        for (i = 0; i < ARRAY_SIZE(ledctl->reg_val); i++) {
+            int status = accton_as4630_54te_led_read_value(led_reg_map[i].reg_addr);
+
+            if (status < 0) {
+                ledctl->valid = 0;
+                dev_dbg(&ledctl->pdev->dev, "reg %d, err %d\n", led_reg_map[i].reg_addr, status);
+                goto exit;
+            }
+            else
+            {
+                ledctl->reg_val[i] = status;
+            }
+        }
+
+        ledctl->last_updated = jiffies;
+        ledctl->valid = 1;
+    }
+
+exit:
+    mutex_unlock(&ledctl->update_lock);
+}
+
+static void accton_as4630_54te_led_set(struct led_classdev *led_cdev,
+                                      enum led_brightness led_light_mode,
+                                      enum led_type type)
+{
+    int reg_val;
+    u8 reg	;
+    mutex_lock(&ledctl->update_lock);
+
+    if( !accton_getLedReg(type, &reg))
+    {
+        dev_dbg(&ledctl->pdev->dev, "Not match item for %d.\n", type);
+    }
+    
+    
+    reg_val = accton_as4630_54te_led_read_value(reg);
+    if (reg_val < 0) {
+        dev_dbg(&ledctl->pdev->dev, "reg %d, err %d\n", reg, reg_val);
+        goto exit;
+    }
+    reg_val = led_light_mode_to_reg_val(type, led_light_mode, reg_val);
+    
+    accton_as4630_54te_led_write_value(reg, reg_val);
+
+    /* to prevent the slow-update issue */
+    ledctl->valid = 0;
+
+exit:
+    mutex_unlock(&ledctl->update_lock);
+}
+
+
+static void accton_as4630_54te_led_diag_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode,  LED_TYPE_DIAG);
+}
+
+static enum led_brightness accton_as4630_54te_led_diag_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_DIAG, ledctl->reg_val[0]);
+}
+
+static void accton_as4630_54te_led_pri_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_PRI);
+}
+
+static enum led_brightness accton_as4630_54te_led_pri_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_PRI, ledctl->reg_val[0]);
+}
+
+static void accton_as4630_54te_led_poe_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_POE);
+}
+
+static enum led_brightness accton_as4630_54te_led_poe_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_POE, ledctl->reg_val[1]);
+}
+
+
+static void accton_as4630_54te_led_stk1_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_STK1);
+}
+
+static enum led_brightness accton_as4630_54te_led_stk1_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_STK1, ledctl->reg_val[1]);
+}
+
+static void accton_as4630_54te_led_stk2_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_STK2);
+}
+
+static enum led_brightness accton_as4630_54te_led_stk2_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_STK2, ledctl->reg_val[1]);
+}
+
+static void accton_as4630_54te_led_fan_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_FAN);
+}
+
+static enum led_brightness accton_as4630_54te_led_fan_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_FAN, ledctl->reg_val[0]);
+}
+
+static void accton_as4630_54te_led_psu1_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_PSU1);
+}
+
+static enum led_brightness accton_as4630_54te_led_psu1_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_PSU1, ledctl->reg_val[0]);
+}
+
+static void accton_as4630_54te_led_psu2_set(struct led_classdev *led_cdev,
+        enum led_brightness led_light_mode)
+{
+    accton_as4630_54te_led_set(led_cdev, led_light_mode, LED_TYPE_PSU2);
+}
+
+static enum led_brightness accton_as4630_54te_led_psu2_get(struct led_classdev *cdev)
+{
+    accton_as4630_54te_led_update();
+    return led_reg_val_to_light_mode(LED_TYPE_PSU2, ledctl->reg_val[0]);
+}
+
+static struct led_classdev accton_as4630_54te_leds[] = {
+    [LED_TYPE_DIAG] = {
+        .name			 = "diag",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_diag_set,
+        .brightness_get	 = accton_as4630_54te_led_diag_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness	 = LED_MODE_GREEN,
+    },
+    [LED_TYPE_PRI] = {
+        .name			 = "pri",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_pri_set,
+        .brightness_get	 = accton_as4630_54te_led_pri_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness	 = LED_MODE_AMBER,
+    },
+    [LED_TYPE_POE] = {
+        .name			 = "poe",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_poe_set,
+        .brightness_get	 = accton_as4630_54te_led_poe_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness	 = LED_MODE_AMBER,
+    },
+    [LED_TYPE_STK1] = {
+        .name			 = "stk1",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_stk1_set,
+        .brightness_get	 = accton_as4630_54te_led_stk1_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness	 = LED_MODE_GREEN,
+    },
+    [LED_TYPE_STK2] = {
+        .name			 = "stk2",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_stk2_set,
+        .brightness_get	 = accton_as4630_54te_led_stk2_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness	 = LED_MODE_GREEN,
+    },
+    [LED_TYPE_FAN] = {
+        .name			 = "fan",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_fan_set,
+        .brightness_get  = accton_as4630_54te_led_fan_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness  = LED_MODE_AUTO,
+    },
+    [LED_TYPE_PSU1] = {
+        .name			 = "psu1",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_psu1_set,
+        .brightness_get  = accton_as4630_54te_led_psu1_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness  = LED_MODE_AUTO,
+    },
+    [LED_TYPE_PSU2] = {
+        .name			 = "psu2",
+        .default_trigger = "unused",
+        .brightness_set	 = accton_as4630_54te_led_psu2_set,
+        .brightness_get  = accton_as4630_54te_led_psu2_get,
+        .flags			 = LED_CORE_SUSPENDRESUME,
+        .max_brightness  = LED_MODE_AUTO,
+    },
+};
+
+static int accton_as4630_54te_led_suspend(struct platform_device *dev,
+        pm_message_t state)
+{
+    int i = 0;
+
+    for (i = 0; i < ARRAY_SIZE(accton_as4630_54te_leds); i++) {
+        led_classdev_suspend(&accton_as4630_54te_leds[i]);
+    }
+
+    return 0;
+}
+
+static int accton_as4630_54te_led_resume(struct platform_device *dev)
+{
+    int i = 0;
+
+    for (i = 0; i < ARRAY_SIZE(accton_as4630_54te_leds); i++) {
+        led_classdev_resume(&accton_as4630_54te_leds[i]);
+    }
+
+    return 0;
+}
+
+static int accton_as4630_54te_led_probe(struct platform_device *pdev)
+{
+    int ret, i;
+
+    for (i = 0; i < ARRAY_SIZE(accton_as4630_54te_leds); i++) {
+        ret = led_classdev_register(&pdev->dev, &accton_as4630_54te_leds[i]);
+
+        if (ret < 0)
+            break;
+    }
+
+    /* Check if all LEDs were successfully registered */
+    if (i != ARRAY_SIZE(accton_as4630_54te_leds)) {
+        int j;
+
+        /* only unregister the LEDs that were successfully registered */
+        for (j = 0; j < i; j++) {
+            led_classdev_unregister(&accton_as4630_54te_leds[i]);
+        }
+    }
+
+    return ret;
+}
+
+static int accton_as4630_54te_led_remove(struct platform_device *pdev)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(accton_as4630_54te_leds); i++) {
+        led_classdev_unregister(&accton_as4630_54te_leds[i]);
+    }
+
+    return 0;
+}
+
+static struct platform_driver accton_as4630_54te_led_driver = {
+    .probe	  = accton_as4630_54te_led_probe,
+    .remove	 = accton_as4630_54te_led_remove,
+    .suspend	= accton_as4630_54te_led_suspend,
+    .resume	 = accton_as4630_54te_led_resume,
+    .driver	 = {
+        .name   = DRVNAME,
+        .owner  = THIS_MODULE,
+    },
+};
+
+static int __init accton_as4630_54te_led_init(void)
+{
+    int ret;
+
+    ret = platform_driver_register(&accton_as4630_54te_led_driver);
+    if (ret < 0) {
+        goto exit;
+    }
+
+    ledctl = kzalloc(sizeof(struct accton_as4630_54te_led_data), GFP_KERNEL);
+    if (!ledctl) {
+        ret = -ENOMEM;
+        platform_driver_unregister(&accton_as4630_54te_led_driver);
+        goto exit;
+    }
+
+    mutex_init(&ledctl->update_lock);
+
+    ledctl->pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+    if (IS_ERR(ledctl->pdev)) {
+        ret = PTR_ERR(ledctl->pdev);
+        platform_driver_unregister(&accton_as4630_54te_led_driver);
+        kfree(ledctl);
+        goto exit;
+    }
+
+exit:
+    return ret;
+}
+
+static void __exit accton_as4630_54te_led_exit(void)
+{
+    platform_device_unregister(ledctl->pdev);
+    platform_driver_unregister(&accton_as4630_54te_led_driver);
+    kfree(ledctl);
+}
+
+module_init(accton_as4630_54te_led_init);
+module_exit(accton_as4630_54te_led_exit);
+
+MODULE_AUTHOR("Brandon Chuang <brandon_chuang@accton.com.tw>");
+MODULE_DESCRIPTION("accton_as4630_54te_led driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c
new file mode 100755
index 000000000000..3a99f19a9cd2
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c
@@ -0,0 +1,320 @@
+/*
+ * An hwmon driver for accton as4630_54te Power Module
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese <sr at denx.de>, DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/dmi.h>
+
+#define MAX_MODEL_NAME          20
+#define MAX_SERIAL_NUMBER       18
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_string(struct device *dev, struct device_attribute *da, char *buf);
+static int as4630_54te_psu_read_block(struct i2c_client *client, u8 command, u8 *data,int data_len);
+extern int as4630_54te_cpld_read(unsigned short cpld_addr, u8 reg);
+
+/* Addresses scanned
+ */
+static const unsigned short normal_i2c[] = { 0x50, 0x51, I2C_CLIENT_END };
+
+/* Each client has this additional data
+ */
+struct as4630_54te_psu_data {
+    struct device      *hwmon_dev;
+    struct mutex        update_lock;
+    char                valid;           /* !=0 if registers are valid */
+    unsigned long       last_updated;    /* In jiffies */
+    u8  index;           /* PSU index */
+    u8  status;          /* Status(present/power_good) register read from CPLD */
+    char model_name[MAX_MODEL_NAME]; /* Model name, read from eeprom */
+    char serial_number[MAX_SERIAL_NUMBER];
+};
+
+static struct as4630_54te_psu_data *as4630_54te_psu_update_device(struct device *dev);
+
+enum as4630_54te_psu_sysfs_attributes {
+    PSU_PRESENT,
+    PSU_MODEL_NAME,
+    PSU_POWER_GOOD,
+    PSU_SERIAL_NUMBER
+};
+
+/* sysfs attributes for hwmon
+ */
+static SENSOR_DEVICE_ATTR(psu_present,    S_IRUGO, show_status,    NULL, PSU_PRESENT);
+static SENSOR_DEVICE_ATTR(psu_model_name, S_IRUGO, show_string,    NULL, PSU_MODEL_NAME);
+static SENSOR_DEVICE_ATTR(psu_power_good, S_IRUGO, show_status,    NULL, PSU_POWER_GOOD);
+static SENSOR_DEVICE_ATTR(psu_serial_number, S_IRUGO, show_string, NULL, PSU_SERIAL_NUMBER);
+
+
+static struct attribute *as4630_54te_psu_attributes[] = {
+    &sensor_dev_attr_psu_present.dev_attr.attr,
+    &sensor_dev_attr_psu_model_name.dev_attr.attr,
+    &sensor_dev_attr_psu_power_good.dev_attr.attr,
+    &sensor_dev_attr_psu_serial_number.dev_attr.attr,
+    NULL
+};
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+                           char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as4630_54te_psu_data *data = as4630_54te_psu_update_device(dev);
+    u8 status = 0;
+
+    //printk("data->status=0x%x, attr->index=%d,data->index=%d \n", data->status, attr->index, data->index);
+    if (attr->index == PSU_PRESENT) {
+        if(data->index==0)
+            status = !( (data->status >> 5) & 0x1);
+        else
+            status = !( (data->status >> 1) & 0x1);
+    }
+    else { /* PSU_POWER_GOOD */
+        if(data->index==0)
+           status = ( (data->status >> 6) & 0x1);
+        else
+           status = ( (data->status >> 2) & 0x1); 
+    }
+
+    return sprintf(buf, "%d\n", status);
+}
+
+static ssize_t show_string(struct device *dev, struct device_attribute *da,
+                               char *buf)
+{
+   struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as4630_54te_psu_data *data = as4630_54te_psu_update_device(dev);
+    char *ptr = NULL;
+
+    if (!data->valid) {
+        return -EIO;
+    }
+
+	switch (attr->index) {
+	case PSU_MODEL_NAME:
+		ptr = data->model_name;
+		break;
+	case PSU_SERIAL_NUMBER:
+		ptr = data->serial_number;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+    return sprintf(buf, "%s\n", ptr);
+}
+
+static const struct attribute_group as4630_54te_psu_group = {
+    .attrs = as4630_54te_psu_attributes,
+};
+
+static int as4630_54te_psu_probe(struct i2c_client *client,
+                                const struct i2c_device_id *dev_id)
+{
+    struct as4630_54te_psu_data *data;
+    int status;
+
+    if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+        status = -EIO;
+        goto exit;
+    }
+
+    data = kzalloc(sizeof(struct as4630_54te_psu_data), GFP_KERNEL);
+    if (!data) {
+        status = -ENOMEM;
+        goto exit;
+    }
+
+    i2c_set_clientdata(client, data);
+    data->valid = 0;
+    data->index = dev_id->driver_data;
+    mutex_init(&data->update_lock);
+
+    dev_info(&client->dev, "chip found\n");
+
+    /* Register sysfs hooks */
+    status = sysfs_create_group(&client->dev.kobj, &as4630_54te_psu_group);
+    if (status) {
+        goto exit_free;
+    }
+
+    data->hwmon_dev = hwmon_device_register(&client->dev);
+    if (IS_ERR(data->hwmon_dev)) {
+        status = PTR_ERR(data->hwmon_dev);
+        goto exit_remove;
+    }
+
+    dev_info(&client->dev, "%s: psu '%s'\n",
+             dev_name(data->hwmon_dev), client->name);
+
+    return 0;
+
+exit_remove:
+    sysfs_remove_group(&client->dev.kobj, &as4630_54te_psu_group);
+exit_free:
+    kfree(data);
+exit:
+
+    return status;
+}
+
+static int as4630_54te_psu_remove(struct i2c_client *client)
+{
+    struct as4630_54te_psu_data *data = i2c_get_clientdata(client);
+
+    hwmon_device_unregister(data->hwmon_dev);
+    sysfs_remove_group(&client->dev.kobj, &as4630_54te_psu_group);
+    kfree(data);
+
+    return 0;
+}
+
+enum psu_index
+{
+    as4630_54te_psu1,
+    as4630_54te_psu2
+};
+
+static const struct i2c_device_id as4630_54te_psu_id[] = {
+    { "as4630_54te_psu1", as4630_54te_psu1 },
+    { "as4630_54te_psu2", as4630_54te_psu2 },
+    {}
+};
+MODULE_DEVICE_TABLE(i2c, as4630_54te_psu_id);
+
+static struct i2c_driver as4630_54te_psu_driver = {
+    .class        = I2C_CLASS_HWMON,
+    .driver = {
+        .name     = "as4630_54te_psu",
+    },
+    .probe        = as4630_54te_psu_probe,
+    .remove       = as4630_54te_psu_remove,
+    .id_table     = as4630_54te_psu_id,
+    .address_list = normal_i2c,
+};
+
+static int as4630_54te_psu_read_block(struct i2c_client *client, u8 command, u8 *data,
+                                     int data_len)
+{
+    int result = 0;
+    int retry_count = 5;
+
+    while (retry_count) {
+        retry_count--;
+
+        result = i2c_smbus_read_i2c_block_data(client, command, data_len, data);
+
+        if (unlikely(result < 0)) {
+            msleep(10);
+            continue;
+        }
+
+        if (unlikely(result != data_len)) {
+            result = -EIO;
+            msleep(10);
+            continue;
+        }
+
+        result = 0;
+        break;
+    }
+
+    return result;
+}
+
+static struct as4630_54te_psu_data *as4630_54te_psu_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as4630_54te_psu_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->update_lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+            || !data->valid) {
+        int status;
+        int power_good = 0;
+
+        dev_dbg(&client->dev, "Starting as4630_54te update\n");
+
+        /* Read psu status */
+        status = as4630_54te_cpld_read(0x60, 0x22);
+        //printk("status=0x%x in %s\n", status, __FUNCTION__);
+        if (status < 0) {
+            dev_dbg(&client->dev, "cpld reg 0x60 err %d\n", status);
+        }
+        else {
+            data->status = status;
+        }
+
+        /* Read model name */
+        memset(data->model_name, 0, sizeof(data->model_name));
+        memset(data->serial_number, 0, sizeof(data->serial_number));
+        power_good = (data->status >> (3-data->index) & 0x1);
+       
+        if (power_good) {
+            status = as4630_54te_psu_read_block(client, 0x20, data->model_name,
+                                               ARRAY_SIZE(data->model_name)-1);                                               
+            if (status < 0) {
+                data->model_name[0] = '\0';
+                dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
+                printk("unable to read model name from (0x%x)\n", client->addr);
+            }
+            else {
+                data->model_name[ARRAY_SIZE(data->model_name)-1] = '\0';
+                
+            }
+             /* Read from offset 0x2e ~ 0x3d (16 bytes) */
+            status = as4630_54te_psu_read_block(client, 0x35,data->serial_number, MAX_SERIAL_NUMBER);
+            if (status < 0)
+            {
+                data->serial_number[0] = '\0';
+                dev_dbg(&client->dev, "unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
+                printk("unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
+            }
+            data->serial_number[MAX_SERIAL_NUMBER-1]='\0';
+        }
+
+        data->last_updated = jiffies;
+        data->valid = 1;
+    }
+
+    mutex_unlock(&data->update_lock);
+
+    return data;
+}
+
+module_i2c_driver(as4630_54te_psu_driver);
+
+MODULE_AUTHOR("Brandon Chuang <brandon_chuang@accton.com.tw>");
+MODULE_DESCRIPTION("as4630_54te_psu driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/ym2651y.c b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/ym2651y.c
new file mode 120000
index 000000000000..f4d67640ccc3
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/modules/ym2651y.c
@@ -0,0 +1 @@
+../../common/modules/ym2651y.c
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-handle-mgmt-interface.service b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-handle-mgmt-interface.service
new file mode 100644
index 000000000000..fa4e1cca61c3
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-handle-mgmt-interface.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Accton AS4630-54TE Platform handle management interface service
+After=sysinit.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/local/bin/handle_mgmt_interface.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-fan.service b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-fan.service
new file mode 100644
index 000000000000..d7b8b8cb2d34
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-fan.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Accton AS4630-54TE Platform Monitoring FAN service
+Before=pmon.service
+After=as4630-54te-platform-monitor.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/local/bin/accton_as4630_54te_monitor_fan.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-psu.service b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-psu.service
new file mode 100644
index 000000000000..a85a0918e290
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor-psu.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Accton AS4630-54TE Platform Monitoring PSU service
+Before=pmon.service
+After=as4630-54te-platform-monitor.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/local/bin/accton_as4630_54te_monitor_psu.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor.service b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor.service
new file mode 100644
index 000000000000..587e6a1cafa1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/service/as4630-54te-platform-monitor.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Accton AS4630-54TE Platform Monitoring service
+Before=pmon.service
+After=sysinit.target
+DefaultDependencies=no
+
+[Service]
+ExecStartPre=/usr/local/bin/accton_as4630_54te_util.py install
+ExecStart=/usr/local/bin/accton_as4630_54te_monitor.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
new file mode 100755
index 000000000000..78b45368c791
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='as4630_54te',
+    version='1.0',
+    description='Module to initialize Accton AS4630-54TE platforms',
+
+    packages=['as4630_54te'],
+    package_dir={'as4630_54te': 'as4630-54te/classes'},
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/sonic_platform_setup.py
new file mode 100644
index 000000000000..d256f7b3c1cd
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/sonic_platform_setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+DEVICE_NAME = 'accton'
+HW_SKU = 'x86_64-accton_as4630_54te-r0'  
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Accton Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='Michael Shih',
+    maintainer_email='michael_shih@edge-core.com',
+    packages=[
+        'sonic_platform',
+    ],
+    package_dir={
+        'sonic_platform': '../../../../device/{}/{}/sonic_platform'.format(DEVICE_NAME, HW_SKU)},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/README b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/README
new file mode 100755
index 000000000000..65bad2200816
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/README
@@ -0,0 +1,67 @@
+Copyright (C) 2019 Accton Networks, Inc.
+
+This program is free software: you can redistribute it and/or modify
+It under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+All Linux kernel code is licensed under the GPLv1. All other code is
+licensed under the GPLv3. Please see the LICENSE file for copies of
+both licenses.
+
+The code for integacting with Accton AS4630-54te has 2 parts, 
+kernel drivers and operational script. 
+The kernel drivers of peripherals are under module/ directory.
+1.  These drivers are at module dir.
+2.  A operational script, accton_as4630_util.py, for device initializatian and 
+    peripheral accessing should be installed at /usr/bin. 
+    Run "accton_as4630_util.py install" to install drivers.
+
+To initialize the system, run "accton_as4630_util.py install".
+To clean up the drivers & devices, run "accton_as4630_util.py clean".
+To dump information of sensors, run "accton_as4630_util.py show".
+To dump SFP EEPROM, run "accton_as4630_util.py sff".
+To set fan speed, run "accton_as4630_util.py set fan".
+To enable/disable SFP emission, run "accton_as4630_util.py set sfp".
+To set system LEDs' color, run "accton_as4630_util.py set led"
+For more information, run "accton_as4630_util.py --help".
+
+====================================================================
+Besides applying accton_as4630_util.py to access peripherals, you can 
+access peripherals by sysfs nodes directly after the installation is run.
+
+System LED:
+    There are 5 system LEDs at the lower-left corner of front panel.
+    They are  loc, diag, fan, ps1, and ps2. 
+    The sysfs interface color mappings are as follows:
+    Brightness:
+        0 => off
+        1 => green
+        2 => amber
+        3 => red
+        4 => blue
+    But not all colors are available for each LED.
+
+Fan Control:
+    There are 10 fans inside 5 fan modules.
+    All fans share 1 duty setting, ranged from 0~100.
+
+Thermal sensers:
+    3 temperature sensors are controlled by the lm75 kernel modules. 
+
+PSUs:
+    There 2 power supplies slot at the left/right side of the back.
+    Once if a PSU is not plugged, the status of it is shown failed.
+
+There are 48 SFP+ and 6 QSFP modules are equipped. 
+Before operating on PSU and QSFP+, please make sure it is well plugged. 
+Otherwise, operation is going to fail.
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor.py
new file mode 100755
index 000000000000..8c704ac60e86
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor.py
@@ -0,0 +1,261 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+#
+# HISTORY:
+#    mm/dd/yyyy (A.D.)#
+#    10/24/2019:Jostar create for as4630_54te thermal plan
+# ------------------------------------------------------------------
+
+try:
+    import os
+    import sys
+    import getopt
+    import logging
+    import logging.config
+    import logging.handlers
+    import time
+    from as4630_54te.fanutil import FanUtil
+    from as4630_54te.thermalutil import ThermalUtil
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as4630_54te_monitor'
+
+# Temperature Policy
+# If any fan fail , please set fan speed register to 16
+# The max value of fan speed register is 14
+#  LM77(48)+LM75(4B)+LM75(4A)  >  140, Set 10
+#  LM77(48)+LM75(4B)+LM75(4A)  >  150, Set 12
+#  LM77(48)+LM75(4B)+LM75(4A)  >  160, Set 14
+#  LM77(48)+LM75(4B)+LM75(4A)  <  140, Set 8
+#  LM77(48)+LM75(4B)+LM75(4A)  <  150, Set 10
+#  LM77(48)+LM75(4B)+LM75(4A)  <  160, Set 12
+#  Reset DUT:LM77(48)>=70C
+#
+class switch(object):
+    def __init__(self, value):
+        self.value = value
+        self.fall = False
+
+    def __iter__(self):
+        """Return the match method once, then stop"""
+        yield self.match
+        raise StopIteration
+
+    def match(self, *args):
+        """Indicate whether or not to enter a case suite"""
+        if self.fall or not args:
+            return True
+        elif self.value in args:  # changed for v1.5, see below
+            self.fall = True
+            return True
+        else:
+            return False
+
+
+fan_policy_state = 0
+fan_fail = 0
+alarm_state = 0  # 0->default or clear, 1-->alarm detect
+test_temp = 0
+test_temp_list = [0, 0, 0]
+temp_test_data = 0
+test_temp_revert = 0
+# Make a class we can use to capture stdout and sterr in the log
+
+
+class device_monitor(object):
+    # static temp var
+    temp = 0
+    new_pwm = 0
+    pwm = 0
+    ori_pwm = 0
+    default_pwm = 0x4
+
+    def __init__(self, log_file, log_level):
+        """Needs a logger and a logger level."""
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format='[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S')
+        # set up logging to console
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(log_level)
+            formatter = logging.Formatter(
+                '%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(
+            address='/dev/log')
+        sys_handler.setLevel(logging.WARNING)
+        logging.getLogger('').addHandler(sys_handler)
+
+    def get_state_from_fan_policy(self, temp, policy):
+        state = 0
+        for i in range(0, len(policy)):
+            if (temp > policy[i][2]):  # temp_down
+                if temp <= policy[i][3]:  # temp_up
+                    state = i
+
+        return state
+
+    def manage_fans(self):
+        global fan_policy_state
+        global fan_fail
+        global test_temp
+        global test_temp_list
+        global alarm_state
+        global temp_test_data
+        global test_temp_revert
+        LEVEL_FAN_MIN = 0
+        LEVEL_FAN_NORMAL = 1
+        LEVEL_FAN_MID = 2
+        LEVEL_FAN_HIGH = 3
+        LEVEL_TEMP_CRITICAL = 4
+        fan_policy = {
+            LEVEL_FAN_MIN: [50, 8, 0, 140000],
+            LEVEL_FAN_NORMAL: [62, 10, 140000, 150000],
+            LEVEL_FAN_MID: [75, 12, 150000, 160000],
+            LEVEL_FAN_HIGH: [88, 14, 160000, 240000],
+            LEVEL_TEMP_CRITICAL: [100, 16, 240000, 300000],
+        }
+        temp = [0, 0, 0]
+        thermal = ThermalUtil()
+        fan = FanUtil()
+        ori_duty_cycle = fan.get_fan_duty_cycle()
+        new_duty_cycle = 0
+
+        if test_temp == 0:
+            for i in range(0, 3):
+                temp[i] = thermal._get_thermal_val(i + 1)
+                if temp[i] == 0 or temp[i] is None:
+                    logging.warning("Get temp-%d fail", i)
+                    return False
+        else:
+            if test_temp_revert == 0:
+                temp_test_data = temp_test_data + 2000
+            else:
+                temp_test_data = temp_test_data - 2000
+
+            for i in range(0, 3):
+                temp[i] = test_temp_list[i] + temp_test_data
+            fan_fail = 0
+
+        temp_val = 0
+        for i in range(0, 3):
+            if temp[i] is None:
+                break
+            temp_val += temp[i]
+
+        # Check Fan status
+        for i in range(fan.FAN_NUM_1_IDX, fan.FAN_NUM_ON_MAIN_BROAD + 1):
+            if fan.get_fan_status(i) == 0:
+                new_pwm = 100
+                logging.warning('Fan_%d fail, set pwm to 100', i)
+                if test_temp == 0:
+                    fan_fail = 1
+                    fan.set_fan_duty_cycle(new_pwm)
+                    break
+            else:
+                fan_fail = 0
+
+        ori_state = fan_policy_state
+        fan_policy_state = self.get_state_from_fan_policy(temp_val, fan_policy)
+
+        if fan_policy_state > LEVEL_TEMP_CRITICAL or fan_policy_state < LEVEL_FAN_MIN:
+            logging.error("Get error fan current_state\n")
+            return 0
+
+        # Decision : Decide new fan pwm percent.
+        if fan_fail == 0 and ori_duty_cycle != fan_policy[fan_policy_state][0]:
+            new_duty_cycle = fan_policy[fan_policy_state][0]
+            fan.set_fan_duty_cycle(new_duty_cycle)
+
+        if temp[0] >= 70000:  # LM75-48
+            # critical case*/
+            logging.critical(
+                'Alarm-Critical for temperature critical is detected, reset DUT')
+            cmd_str = "i2cset -y -f 3 0x60 0x4 0xE4"
+            time.sleep(2)
+            return_value = os.system(cmd_str)
+            logging.warning('Fan set: i2cset -y -f 3 0x60 0x4 0xE4, status is %d', return_value)
+
+        #logging.debug('ori_state=%d, current_state=%d, temp_val=%d\n\n',ori_state, fan_policy_state, temp_val)
+
+        if ori_state < LEVEL_FAN_HIGH:
+            if fan_policy_state >= LEVEL_FAN_HIGH:
+                if alarm_state == 0:
+                    logging.warning('Alarm for temperature high is detected')
+                    alarm_state = 1
+
+        if fan_policy_state < LEVEL_FAN_MID:
+            if alarm_state == 1:
+                logging.info('Alarm for temperature high is cleared')
+                alarm_state = 0
+
+        return True
+
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    global test_temp
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv, 'hdlt:', ['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg
+
+        if sys.argv[1] == '-t':
+            if len(sys.argv) != 5:
+                print "temp test, need input three temp"
+                return 0
+
+            i = 0
+            for x in range(2, 5):
+                test_temp_list[i] = int(sys.argv[x]) * 1000
+                i = i + 1
+            test_temp = 1
+            log_level = logging.DEBUG
+            print test_temp_list
+
+    fan = FanUtil()
+    fan.set_fan_duty_cycle(50)
+    print "set default fan speed to 50%"
+    monitor = device_monitor(log_file, log_level)
+    # Loop forever, doing something useful hopefully:
+    while True:
+        monitor.manage_fans()
+        time.sleep(10)  # 10sec
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_fan.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_fan.py
new file mode 100755
index 000000000000..6d8ab0ea3c95
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_fan.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Accton Technology Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    5/15/2019:  Jostar create for as4630-54te
+# ------------------------------------------------------------------
+
+try:
+    import sys
+    import getopt
+    import logging
+    import logging.config
+    import logging.handlers
+    import time  # this is only being used as part of the example
+
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as4630_54te_monitor_fan'
+
+
+class switch(object):
+    def __init__(self, value):
+        self.value = value
+        self.fall = False
+
+    def __iter__(self):
+        """Return the match method once, then stop"""
+        yield self.match
+        raise StopIteration
+
+    def match(self, *args):
+        """Indicate whether or not to enter a case suite"""
+        if self.fall or not args:
+            return True
+        elif self.value in args:  # changed for v1.5, see below
+            self.fall = True
+            return True
+        else:
+            return False
+
+
+fan_state = [2, 2, 2, 2]  # init state=2, insert=1, remove=0
+fan_status_state = [2, 2, 2, 2]  # init state=2, fault=1, normal=0
+# Make a class we can use to capture stdout and sterr in the log
+
+
+class device_monitor(object):
+
+    def __init__(self, log_file, log_level):
+
+        self.fan_num = 3
+        self.fan_path = "/sys/bus/i2c/devices/3-0060/"
+        self.present = {
+            0: "fan_present_1",
+            1: "fan_present_2",
+            2: "fan_present_3",
+        }
+
+        self.fault = {
+            0: "fan_fault_1",
+            1: "fan_fault_2",
+            2: "fan_fault_3",
+        }
+
+        """Needs a logger and a logger level."""
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format='[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S')
+
+        # set up logging to console
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(logging.DEBUG)
+            formatter = logging.Formatter(
+                '%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(address='/dev/log')
+        # sys_handler.setLevel(logging.WARNING)
+        sys_handler.setLevel(logging.INFO)
+        logging.getLogger('').addHandler(sys_handler)
+
+        #logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
+
+    def manage_fan(self):
+
+        FAN_STATE_REMOVE = 0
+        FAN_STATE_INSERT = 1
+
+        FAN_STATUS_FAULT = 1
+        FAN_STATUS_NORMAL = 0
+
+        global fan_state
+        global fan_status_state
+
+        for idx in range(0, self.fan_num):
+            node = self.fan_path + self.present[idx]
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if fan_state[idx] != 1:
+                    fan_state[idx] = FAN_STATE_INSERT
+                    logging.info("FAN-%d present is detected", idx + 1)
+            else:
+                if fan_state[idx] != 0:
+                    fan_state[idx] = FAN_STATE_REMOVE
+                    logging.warning(
+                        "Alarm for FAN-%d absent is detected", idx + 1)
+
+        for idx in range(0, self.fan_num):
+            node = self.fan_path + self.fault[idx]
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if fan_status_state[idx] != FAN_STATUS_FAULT:
+                    if fan_state[idx] == FAN_STATE_INSERT:
+                        logging.warning(
+                            "Alarm for FAN-%d failed is detected", idx + 1)
+                        fan_status_state[idx] = FAN_STATUS_FAULT
+            else:
+                fan_status_state[idx] = FAN_STATUS_NORMAL
+
+        return True
+
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv, 'hdl:', ['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg
+    monitor = device_monitor(log_file, log_level)
+    while True:
+        monitor.manage_fan()
+        time.sleep(3)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_psu.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_psu.py
new file mode 100755
index 000000000000..9bff640434bf
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_monitor_psu.py
@@ -0,0 +1,168 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Accton Technology Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    5/15/2019:  Jostar create for as4630-54te
+# ------------------------------------------------------------------
+
+try:
+    import sys
+    import getopt
+    import logging
+    import logging.config
+    import logging.handlers
+    import time  # this is only being used as part of the example
+
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as4630_54te_monitor_psu'
+
+
+psu_state = [2, 2]
+psu_status_state = [2, 2]
+# Make a class we can use to capture stdout and sterr in the log
+
+
+class device_monitor(object):
+
+    def __init__(self, log_file, log_level):
+
+        self.psu_num = 2
+        self.psu_path = "/sys/bus/i2c/devices/"
+        self.presence = "/psu_present"
+        self.oper_status = "/psu_power_good"
+        self.mapping = {
+            0: "10-0050",
+            1: "11-0051",
+        }
+
+        """Needs a logger and a logger level."""
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format='[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S')
+        # set up logging to console
+
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(log_level)
+            formatter = logging.Formatter(
+                '%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(address='/dev/log')
+        # sys_handler.setLevel(logging.WARNING)
+        sys_handler.setLevel(logging.INFO)
+        logging.getLogger('').addHandler(sys_handler)
+
+        #logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
+
+    def manage_psu(self):
+
+        PSU_STATE_REMOVE = 0
+        PSU_STATE_INSERT = 1
+
+        PSU_STATUS_NO_POWER = 0
+        PSU_STATUS_POWER_GOOD = 1
+        PSU_STATUS_IDLE = 2
+
+        global psu_state
+
+        for idx in range(0, self.psu_num):
+            node = self.psu_path + self.mapping[idx] + self.presence
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if psu_state[idx] != 1:
+                    psu_state[idx] = PSU_STATE_INSERT
+                    logging.info("PSU-%d present is detected", idx + 1)
+                    # psu_status_state[idx]=PSU_STATUS_POWER_GOOD #when insert,
+                    # assume power is good. If no_power, next code will find
+                    # it.
+            else:
+                if psu_state[idx] != 0:
+                    psu_state[idx] = PSU_STATE_REMOVE
+                    logging.warning(
+                        "Alarm for PSU-%d absent is detected", idx + 1)
+                    psu_status_state[idx] = PSU_STATUS_IDLE
+
+        for idx in range(0, self.psu_num):
+            node = self.psu_path + self.mapping[idx] + self.oper_status
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "0":
+                if psu_status_state[idx] != PSU_STATUS_NO_POWER:
+                    if psu_state[idx] == PSU_STATE_INSERT:
+                        logging.warning(
+                            "Alarm for PSU-%d failed is detected", idx + 1)
+                        psu_status_state[idx] = PSU_STATUS_NO_POWER
+            else:
+                if psu_state[idx] == PSU_STATE_INSERT:
+                    if psu_status_state[idx] != PSU_STATUS_POWER_GOOD:
+                        logging.info("PSU-%d power_good is detected", idx + 1)
+                        psu_status_state[idx] = PSU_STATUS_POWER_GOOD
+
+        return True
+
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv, 'hdl:', ['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg
+    monitor = device_monitor(log_file, log_level)
+    # Loop forever, doing something useful hopefully:
+    while True:
+        monitor.manage_psu()
+        time.sleep(3)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_util.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_util.py
new file mode 100755
index 000000000000..172a9842a8bf
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/accton_as4630_54te_util.py
@@ -0,0 +1,681 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2016 Accton Networks, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Usage: %(scriptName)s [options] command object
+options:
+    -h | --help     : this help message
+    -d | --debug    : run with debug mode
+    -f | --force    : ignore error during installation or clean
+command:
+    install     : install drivers and generate related sysfs nodes
+    clean       : uninstall drivers and remove related sysfs nodes
+    show        : show all systen status
+    sff         : dump SFP eeprom
+    set         : change board setting with fan|led|sfp
+"""
+
+import commands
+import getopt
+import sys
+import logging
+import re
+import time
+import os
+
+PROJECT_NAME = 'as4630_54te'
+version = '0.0.1'
+verbose = False
+DEBUG = False
+args = []
+ALL_DEVICE = {}
+DEVICE_NO = {
+    'led': 5,
+    'fan1': 1,
+    'fan2': 1,
+    'fan3': 1,
+    'fan4': 1,
+    'fan5': 1,
+    'thermal': 3,
+    'psu': 2,
+    'sfp': 54}
+
+
+led_prefix = '/sys/devices/platform/as4630_54te_led/leds/accton_' + \
+    PROJECT_NAME + '_led::'
+fan_prefix = '/sys/devices/platform/as4630_54te_'
+hwmon_types = {'led': ['diag', 'fan', 'loc', 'psu1', 'psu2'],
+               'fan1': ['fan'],
+               'fan2': ['fan'],
+               'fan3': ['fan'],
+               'fan4': ['fan'],
+               'fan5': ['fan'],
+               }
+hwmon_nodes = {
+    'led': ['brightness'],
+    'fan1': [
+        'fan_duty_cycle_percentage',
+        'fan1_fault',
+        'fan1_speed_rpm',
+        'fan1_direction',
+        'fanr1_fault',
+        'fanr1_speed_rpm'],
+    'fan2': [
+        'fan_duty_cycle_percentage',
+        'fan2_fault',
+        'fan2_speed_rpm',
+        'fan2_direction',
+        'fanr2_fault',
+        'fanr2_speed_rpm'],
+    'fan3': [
+        'fan_duty_cycle_percentage',
+        'fan3_fault',
+        'fan3_speed_rpm',
+        'fan3_direction',
+        'fanr3_fault',
+        'fanr3_speed_rpm'],
+    'fan4': [
+        'fan4_duty_cycle_percentage',
+        'fan4_fault',
+        'fan4_speed_rpm',
+        'fan4_direction',
+        'fanr4_fault',
+        'fanr4_speed_rpm'],
+    'fan5': [
+        'fan_duty_cycle_percentage',
+        'fan5_fault',
+        'fan5_speed_rpm',
+        'fan5_direction',
+        'fanr5_fault',
+        'fanr5_speed_rpm'],
+}
+hwmon_prefix = {'led': led_prefix,
+                'fan1': fan_prefix,
+                'fan2': fan_prefix,
+                'fan3': fan_prefix,
+                'fan4': fan_prefix,
+                'fan5': fan_prefix,
+                }
+
+i2c_prefix = '/sys/bus/i2c/devices/'
+i2c_bus = {'fan': ['54-0066'],
+           'thermal': ['54-004c', '55-0048', '55-0049', '55-004a', '55-004b'],
+           'psu': ['49-0050', '50-0053'],
+           'sfp': ['-0050']}
+i2c_nodes = {'fan': ['present', 'front_speed_rpm', 'rear_speed_rpm'],
+             'thermal': ['hwmon/hwmon*/temp1_input'],
+             'psu': ['psu_present ', 'psu_power_good'],
+             'sfp': ['module_present_ ', 'module_tx_disable_']}
+
+sfp_map = [18, 19, 20, 21, 22, 23]
+
+mknod = [
+    'echo pca9548 0x77 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x71 > /sys/bus/i2c/devices/i2c-2/new_device',
+    'echo pca9548 0x70 > /sys/bus/i2c/devices/i2c-3/new_device',
+
+    'echo as4630_54te_cpld 0x60 > /sys/bus/i2c/devices/i2c-3/new_device',
+
+    'echo lm77 0x48 > /sys/bus/i2c/devices/i2c-14/new_device',
+    'echo lm75 0x4a > /sys/bus/i2c/devices/i2c-25/new_device',
+    'echo lm75 0x4b > /sys/bus/i2c/devices/i2c-24/new_device',
+
+
+    # PSU-1
+    'echo as4630_54te_psu1 0x50 > /sys/bus/i2c/devices/i2c-10/new_device',
+    'echo ype1200am 0x58 > /sys/bus/i2c/devices/i2c-10/new_device',
+
+    # PSU-2
+    'echo as4630_54te_psu2 0x51> /sys/bus/i2c/devices/i2c-11/new_device',
+    'echo ype1200am 0x59 > /sys/bus/i2c/devices/i2c-11/new_device',
+
+    # EERPOM
+    'echo 24c02 0x57 > /sys/bus/i2c/devices/i2c-1/new_device',
+]
+
+# Disable CPLD debug mode
+cpld_set = [
+    'i2cset -y -f 3 0x60 0x2a 0xff',
+    'i2cset -y -f 3 0x60 0x2b 0xff',
+    'i2cset -y -f 3 0x60 0x86 0x89'
+]
+
+FORCE = 0
+#logging.basicConfig(filename= PROJECT_NAME+'.log', filemode='w',level=logging.DEBUG)
+# logging.basicConfig(level=logging.INFO)
+
+
+def main():
+    global DEBUG
+    global args
+    global FORCE
+
+    if DEBUG:
+        print(sys.argv[0])
+        print('ARGV      : %s' % sys.argv[1:])
+
+    if len(sys.argv) < 2:
+        show_help()
+
+    options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
+                                                        'debug',
+                                                        'force',
+                                                        ])
+    if DEBUG:
+        print options
+        print args
+        print len(sys.argv)
+
+    for opt, arg in options:
+        if opt in ('-h', '--help'):
+            show_help()
+        elif opt in ('-d', '--debug'):
+            DEBUG = True
+            logging.basicConfig(level=logging.INFO)
+        elif opt in ('-f', '--force'):
+            FORCE = 1
+        else:
+            print "TEST"
+            logging.info('no option')
+    for arg in args:
+        if arg == 'install':
+            do_install()
+        elif arg == 'clean':
+            do_uninstall()
+        elif arg == 'api':
+            do_sonic_platform_install()
+        elif arg == 'api_clean':
+           do_sonic_platform_clean()
+        elif arg == 'show':
+            device_traversal()
+        elif arg == 'sff':
+            if len(args) != 2:
+                show_eeprom_help()
+            elif int(args[1]) == 0 or int(args[1]) > DEVICE_NO['sfp']:
+                show_eeprom_help()
+            else:
+                show_eeprom(args[1])
+            return
+        elif arg == 'set':
+            if len(args) < 3:
+                show_set_help()
+            else:
+                set_device(args[1:])
+            return
+        else:
+            show_help()
+
+    return 0
+
+
+def show_help():
+    print __doc__ % {'scriptName': sys.argv[0].split("/")[-1]}
+    sys.exit(0)
+
+
+def show_set_help():
+    cmd = sys.argv[0].split("/")[-1] + " " + args[0]
+    print cmd + " [led|sfp|fan]"
+    print "    use \"" + cmd + " led 0-4 \"  to set led color"
+    print "    use \"" + cmd + " fan 0-100\" to set fan duty percetage"
+    print "    use \"" + cmd + " sfp 1-32 {0|1}\" to set sfp# tx_disable"
+    sys.exit(0)
+
+
+def show_eeprom_help():
+    cmd = sys.argv[0].split("/")[-1] + " " + args[0]
+    print "    use \"" + cmd + " 1-32 \" to dump sfp# eeprom"
+    sys.exit(0)
+
+
+def my_log(txt):
+    if DEBUG:
+        print "[ACCTON DBG]: " + txt
+    return
+
+
+def log_os_system(cmd, show):
+    logging.info('Run :' + cmd)
+    output = ""
+    status, output = commands.getstatusoutput(cmd)
+    my_log(cmd + "with result:" + str(status))
+    my_log("cmd:" + cmd)
+    my_log("      output:" + output)
+    if status:
+        logging.info('Failed :' + cmd)
+        if show:
+            print('Failed :' + cmd)
+    return status, output
+
+
+def driver_inserted():
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
+    logging.info('mods:' + lsmod)
+    if ret:
+        return False
+
+#'modprobe cpr_4011_4mxx',
+
+
+kos = [
+    'depmod -ae',
+    'modprobe i2c_dev',
+    'modprobe i2c_mux_pca954x force_deselect_on_exit=1',
+    'modprobe ym2651y',
+    'modprobe x86_64_accton_as4630_54te_cpld',
+    'modprobe x86_64_accton_as4630_54te_leds',
+    'modprobe x86_64_accton_as4630_54te_psu',
+    'modprobe optoe']
+
+
+def driver_install():
+    global FORCE
+
+    my_log("rmmond i2cismt")
+    log_os_system("rmmod i2c_ismt", 1)
+    log_os_system("rmmod i2c_i801", 1)
+    log_os_system("modprobe i2c-i801", 1)
+    time.sleep(1)
+    log_os_system("modprobe i2c-ismt", 1)
+
+    for i in range(0, len(kos)):
+        status, output = log_os_system(kos[i], 1)
+        if status:
+            if FORCE == 0:
+                return status
+
+    return 0
+
+
+def driver_uninstall():
+    global FORCE
+    for i in range(0, len(kos)):
+        rm = kos[-(i + 1)].replace("modprobe", "modprobe -rq")
+        lst = rm.split(" ")
+        print "lst=%s" % lst
+        if len(lst) > 3:
+            del(lst[3])
+        rm = " ".join(lst)
+        status, output = log_os_system(rm, 1)
+        if status:
+            if FORCE == 0:
+                return status
+    return 0
+
+
+def device_install():
+    global FORCE
+
+    for i in range(0, len(mknod)):
+        # for pca954x need times to built new i2c buses
+        if mknod[i].find('pca954') != -1:
+            time.sleep(2)
+
+        status, output = log_os_system(mknod[i], 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+    print("Check SFP")
+    for i in range(0, len(sfp_map)):
+        if(i < 4):
+            opt = 'optoe2'
+        else:
+            opt = 'optoe1'
+        status, output = log_os_system("echo " +
+                                       str(opt) +
+                                       " 0x50 > /sys/bus/i2c/devices/i2c-" +
+                                       str(sfp_map[i]) +
+                                       "/new_device", 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+        status, output = log_os_system("echo port" +
+                                       str(i +
+                                           49) +
+                                       " > /sys/bus/i2c/devices/" +
+                                       str(sfp_map[i]) +
+                                       "-0050/port_name", 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    return
+
+
+def device_uninstall():
+    global FORCE
+
+    for i in range(0, len(sfp_map)):
+        target = "/sys/bus/i2c/devices/i2c-" + \
+            str(sfp_map[i]) + "/delete_device"
+        status, output = log_os_system("echo 0x50 > " + target, 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    nodelist = mknod
+
+    for i in range(len(nodelist)):
+        target = nodelist[-(i + 1)]
+        temp = target.split()
+        del temp[1]
+        temp[-1] = temp[-1].replace('new_device', 'delete_device')
+        status, output = log_os_system(" ".join(temp), 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    return
+
+
+def system_ready():
+    if driver_inserted() == False:
+        return False
+    if not device_exist():
+        print "not device_exist()"
+        return False
+    return True
+
+PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
+PLATFORM_API2_WHL_FILE_PY3 ='sonic_platform-1.0-py3-none-any.whl'
+def do_sonic_platform_install():
+    device_path = "{}{}{}{}".format(PLATFORM_ROOT_PATH, '/x86_64-accton_', PROJECT_NAME, '-r0')
+    SONIC_PLATFORM_BSP_WHL_PKG_PY3 = "/".join([device_path, PLATFORM_API2_WHL_FILE_PY3])
+
+    #Check API2.0 on py whl file
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3):
+            status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
+            if status:
+                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                return status
+            else:
+                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+        else:
+            print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
+    else:
+        print('{} has installed'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    return
+
+def do_sonic_platform_clean():
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        print('{} does not install, not need to uninstall'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    else:
+        status, output = log_os_system("pip3 uninstall sonic-platform -y", 0)
+        if status:
+            print('Error: Failed to uninstall {}'.format(PLATFORM_API2_WHL_FILE_PY3))
+            return status
+        else:
+            print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    return
+
+
+def do_install():
+    if driver_inserted() == False:
+        status = driver_install()
+        if status:
+            if FORCE == 0:
+                return status
+    else:
+        print PROJECT_NAME.upper() + " drivers detected...."
+    if not device_exist():
+        status = device_install()
+        if status:
+            if FORCE == 0:
+                return status
+    else:
+        print PROJECT_NAME.upper() + " devices detected...."
+
+    for i in range(len(cpld_set)):
+        status, output = log_os_system(cpld_set[i], 1)
+        if status:
+            if FORCE == 0:
+                return status
+
+    do_sonic_platform_install()
+
+    return
+
+
+def do_uninstall():
+    if not device_exist():
+        print PROJECT_NAME.upper() + " has no device installed...."
+    else:
+        print "Removing device...."
+        status = device_uninstall()
+        if status:
+            if FORCE == 0:
+                return status
+
+    if driver_inserted() == False:
+        print PROJECT_NAME.upper() + " has no driver installed...."
+    else:
+        print "Removing installed driver...."
+        status = driver_uninstall()
+        if status:
+            if FORCE == 0:
+                return status
+
+    do_sonic_platform_clean()
+
+    return
+
+
+def devices_info():
+    global DEVICE_NO
+    global ALL_DEVICE
+    global i2c_bus, hwmon_types
+    for key in DEVICE_NO:
+        ALL_DEVICE[key] = {}
+        for i in range(0, DEVICE_NO[key]):
+            ALL_DEVICE[key][key + str(i + 1)] = []
+
+    for key in i2c_bus:
+        buses = i2c_bus[key]
+        nodes = i2c_nodes[key]
+        for i in range(0, len(buses)):
+            for j in range(0, len(nodes)):
+                if 'fan' == key:
+                    for k in range(0, DEVICE_NO[key]):
+                        node = key + str(k + 1)
+                        path = i2c_prefix + \
+                            buses[i] + "/fan" + str(k + 1) + "_" + nodes[j]
+                        my_log(node + ": " + path)
+                        ALL_DEVICE[key][node].append(path)
+                elif 'sfp' == key:
+                    for k in range(0, DEVICE_NO[key]):
+                        node = key + str(k + 1)
+                        path = i2c_prefix + \
+                            str(sfp_map[k]) + buses[i] + "/" + nodes[j]
+                        my_log(node + ": " + path)
+                        ALL_DEVICE[key][node].append(path)
+                else:
+                    node = key + str(i + 1)
+                    path = i2c_prefix + buses[i] + "/" + nodes[j]
+                    my_log(node + ": " + path)
+                    ALL_DEVICE[key][node].append(path)
+
+    for key in hwmon_types:
+        itypes = hwmon_types[key]
+        nodes = hwmon_nodes[key]
+        for i in range(0, len(itypes)):
+            for j in range(0, len(nodes)):
+                node = key + "_" + itypes[i]
+                path = hwmon_prefix[key] + itypes[i] + "/" + nodes[j]
+                my_log(node + ": " + path)
+                ALL_DEVICE[key][key + str(i + 1)].append(path)
+
+    # show dict all in the order
+    if DEBUG:
+        for i in sorted(ALL_DEVICE.keys()):
+            print(i + ": ")
+            for j in sorted(ALL_DEVICE[i].keys()):
+                print("   " + j)
+                for k in (ALL_DEVICE[i][j]):
+                    print("   " + "   " + k)
+    return
+
+
+def show_eeprom(index):
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+    node = ALL_DEVICE['sfp']['sfp' + str(index)][0]
+    node = node.replace(node.split("/")[-1], 'eeprom')
+    # check if got hexdump command in current environment
+    ret, log = log_os_system("which hexdump", 0)
+    ret, log2 = log_os_system("which busybox hexdump", 0)
+    if len(log):
+        hex_cmd = 'hexdump'
+    elif len(log2):
+        hex_cmd = ' busybox hexdump'
+    else:
+        log = 'Failed : no hexdump cmd!!'
+        logging.info(log)
+        print log
+        return 1
+    print "node=%s" % node
+    print node + ":"
+    ret, log = log_os_system("cat " + node + "| " + hex_cmd + " -C", 1)
+    if ret == 0:
+        print log
+    else:
+        print "**********device no found**********"
+    return
+
+
+def set_device(args):
+    global DEVICE_NO
+    global ALL_DEVICE
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+
+    if args[0] == 'led':
+        if int(args[1]) > 4:
+            show_set_help()
+            return
+        #print  ALL_DEVICE['led']
+        for i in range(0, len(ALL_DEVICE['led'])):
+            for k in (ALL_DEVICE['led']['led' + str(i + 1)]):
+                ret, log = log_os_system("echo " + args[1] + " >" + k, 1)
+                if ret:
+                    return ret
+    elif args[0] == 'fan':
+        if int(args[1]) > 100:
+            show_set_help()
+            return
+        #print  ALL_DEVICE['fan']
+        # fan1~6 is all fine, all fan share same setting
+        node = ALL_DEVICE['fan1']['fan11'][0]
+        node = node.replace(node.split("/")[-1], 'fan1_duty_cycle_percentage')
+        ret, log = log_os_system("cat " + node, 1)
+        if ret == 0:
+            print ("Previous fan duty: " + log.strip() + "%")
+        ret, log = log_os_system("echo " + args[1] + " >" + node, 1)
+        if ret == 0:
+            print ("Current fan duty: " + args[1] + "%")
+        return ret
+    elif args[0] == 'sfp':
+        if int(args[1]) > DEVICE_NO[args[0]] or int(args[1]) == 0:
+            show_set_help()
+            return
+        if len(args) < 2:
+            show_set_help()
+            return
+
+        if int(args[2]) > 1:
+            show_set_help()
+            return
+
+        #print  ALL_DEVICE[args[0]]
+        for i in range(0, len(ALL_DEVICE[args[0]])):
+            for j in ALL_DEVICE[args[0]][args[0] + str(args[1])]:
+                if j.find('tx_disable') != -1:
+                    ret, log = log_os_system("echo " + args[2] + " >" + j, 1)
+                    if ret:
+                        return ret
+
+    return
+
+# get digits inside a string.
+# Ex: 31 for "sfp31"
+
+
+def get_value(input):
+    digit = re.findall(r'\d+', input)
+    return int(digit[0])
+
+
+def device_traversal():
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+    for i in sorted(ALL_DEVICE.keys()):
+        print("============================================")
+        print(i.upper() + ": ")
+        print("============================================")
+
+        for j in sorted(ALL_DEVICE[i].keys(), key=get_value):
+            print "   " + j + ":",
+            for k in (ALL_DEVICE[i][j]):
+                ret, log = log_os_system("cat " + k, 0)
+                func = k.split("/")[-1].strip()
+                func = re.sub(j + '_', '', func, 1)
+                func = re.sub(i.lower() + '_', '', func, 1)
+                if ret == 0:
+                    print func + "=" + log + " ",
+                else:
+                    print func + "=" + "X" + " ",
+            print
+            print("----------------------------------------------------------------")
+
+        print
+    return
+
+
+def device_exist():
+    ret1, log = log_os_system("ls " + i2c_prefix + "*0077", 0)
+    ret2, log = log_os_system("ls " + i2c_prefix + "i2c-2", 0)
+    return not(ret1 or ret2)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/handle_mgmt_interface.sh b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/handle_mgmt_interface.sh
new file mode 100755
index 000000000000..82f4d5e02116
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/utils/handle_mgmt_interface.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#Due to the hardware design, as4630-54te use "eth2" instead of "eth0" as management interface.
+#Rename netdev "eth0" and "eth2" to swap original "eth2" to "eth0".
+ifconfig eth0 down
+ip link set eth0 name eth3
+ip link set eth2 name eth0
+ifconfig eth0 up
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/control b/platform/broadcom/sonic-platform-modules-accton/debian/control
index 2b3c1af3d80f..431e177cea48 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/control
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/control
@@ -45,6 +45,10 @@ Package: sonic-platform-accton-as4630-54pe
 Architecture: amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
+Package: sonic-platform-accton-as4630-54te
+Architecture: amd64
+Description: kernel modules for platform devices such as fan, led, sfp
+
 Package: sonic-platform-accton-minipack
 Architecture: amd64
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/rules b/platform/broadcom/sonic-platform-modules-accton/debian/rules
index e894b10f8234..a672ec655d41 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/rules
@@ -21,7 +21,7 @@ KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
 MODULE_DIRS := as7712-32x as5712-54x as7816-64x as7716-32x as7716-32xb as7312-54x
-MODULE_DIRS += as7326-56x as6712-32x as7726-32x as4630-54pe minipack as5812-54x 
+MODULE_DIRS += as7326-56x as6712-32x as7726-32x as4630-54pe as4630-54te minipack as5812-54x
 MODULE_DIRS += as5835-54x as9716-32d as5835-54t as7312-54xs as7315-27xb as5812-54t
 MODULE_DIR := modules
 UTILS_DIR := utils
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as4630-54te.install b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as4630-54te.install
new file mode 100644
index 000000000000..fe4f35f1e2c1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as4630-54te.install
@@ -0,0 +1,2 @@
+as4630-54te/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-accton_as4630_54te-r0
+

From 5e44bc5e6819d11c3972f98054b5fa851d227835 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Mon, 1 Mar 2021 16:01:50 +0800
Subject: [PATCH 0227/1674] [Mellanox] Update hw-management package to version
 7.0010.2000 (#6692)

- Why I did it
   Bug fixes
   - In rare cases when thermal algorithm is reactivated after FAN/PSU insertion, FAN remains at high rpm
   - When stop hw-management code received error in the log instead of exit code '0'.
   - In SPC1 i2c sometimes collide with chip reset coming from SDK
   - Remove raw eeprom data link, when working with PSU which don't have eeprom for "msn274x", "msn24xx" and "msn27xx" systems
   - Fix memory leak on mlxsw_core_bus_device module removal

- How I did it
Update the hw-mgmt version number in the make file
Update the hw-mgmt repo pointer

- How to verify it
run platform related test cases on all Mellanox platform

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/hw-management.mk      | 2 +-
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 521daa1c7c3b..c273f779cbb2 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.1300
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2000
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index dec7935777b5..4ae17192db86 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit dec7935777b52d31a2220bad8b0cec4b71ec0961
+Subproject commit 4ae17192db868de19ea0725860b320c0d319d23a

From 4893666b1d829d6858bbac22cbb2f414140a35ce Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 25 Feb 2021 23:47:05 +0530
Subject: [PATCH 0228/1674] DellEMC:Fix EEPROM read error (#6736)

#### Why I did it
EEPROM read failure was seen in Dell platforms

#### How I did it
Make python 2/3 compliant API's to fix the issue
---
 .../s5232f/sonic_platform/sfp.py              |  9 +++-
 .../z9264f/sonic_platform/sfp.py              |  9 +++-
 .../z9332f/sonic_platform/sfp.py              | 42 ++++++++++++-------
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
index b2cceab9b08f..eed6dc7b03da 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py
@@ -214,8 +214,13 @@ def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
             return None
 
         try:
-            for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            if isinstance(raw , str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+                
         except BaseException:
             eeprom.close()
             return None
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
index 225aef90e00a..4ede81f3d169 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
@@ -219,8 +219,13 @@ def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
             return None
 
         try:
-            for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            if isinstance(raw , str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
         except BaseException:
             eeprom.close()
             return None
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index ef6a2c5d339a..efda0d13c63f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -283,8 +283,13 @@ def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
             return None
 
         try:
-            for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            if isinstance(raw , str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
         except BaseException:
             eeprom.close()
             return None
@@ -296,7 +301,7 @@ def _get_eeprom_data(self, eeprom_key):
         eeprom_data = None
         page_offset = None
 
-        if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+        if self.media_type.startswith('QSFP'):
             page_offset = sff8436_parser[eeprom_key][PAGE_OFFSET]
             eeprom_data_raw = self._read_eeprom_bytes(
                 self.eeprom_path,
@@ -351,7 +356,8 @@ def get_transceiver_info(self):
         compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(info_dict_keys, 'N/A')
         self.media_type = self.set_media_type()
-        self.reinit_sfp_driver()
+        if self.reinit_sfp_driver() == False:
+           return transceiver_info_dict
 
         # BaseInformation
         try:
@@ -362,7 +368,7 @@ def get_transceiver_info(self):
             rate_identifier = iface_data['data']['RateIdentifier']['value']
             identifier = iface_data['data']['type']['value']
             type_abbrv_name=iface_data['data']['type_abbrv_name']['value']
-            if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if self.media_type.startswith('QSFP'):
                 bit_rate = str(
                     iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
                 for key in qsfp_compliance_code_tup:
@@ -459,7 +465,7 @@ def get_transceiver_threshold_info(self):
         try:
             # Module Threshold
             module_threshold_data = self._get_eeprom_data('ModuleThreshold')
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
                 transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
                 transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
@@ -492,7 +498,7 @@ def get_transceiver_threshold_info(self):
         except (ValueError, TypeError) : pass
 
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 channel_threshold_data = self._get_eeprom_data('ChannelThreshold')
                 transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['data']['RxPowerHighAlarm']['value']
                 transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['data']['RxPowerHighWarning']['value']
@@ -659,7 +665,7 @@ def get_rx_los(self):
         """
         rx_los = False
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 rx_los_data = self._get_eeprom_data('rx_los')
                 # As the function expects a single boolean, if any one channel experience LOS,
                 # is considered LOS for QSFP 
@@ -679,7 +685,7 @@ def get_tx_fault(self):
         """
         tx_fault = False
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 tx_fault_data = self._get_eeprom_data('tx_fault')
                 for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') : 
                     tx_fault |= (tx_fault_data['data'][tx_fault_id]['value'] is 'On')
@@ -697,7 +703,7 @@ def get_tx_disable(self):
         """
         tx_disable = False
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable |= (tx_disable_data['data'][tx_disable_id]['value'] is 'On')
@@ -717,7 +723,7 @@ def get_tx_disable_channel(self):
         """
         tx_disable_channel = 0
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_channel <<= 1
@@ -732,7 +738,7 @@ def get_lpmode(self):
         """
         lpmode_state = False
         try: 
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -753,7 +759,7 @@ def get_power_override(self):
         power_override_state = False
 
         try:
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 power_override_data = self._get_eeprom_data('power_override')
                 power_override = power_override_data['data']['PowerOverRide']['value']
                 power_override_state = (power_override is 'On')
@@ -791,7 +797,7 @@ def get_tx_bias(self):
         tx_bias_list = []
         try:
             tx_bias_data = self._get_eeprom_data('ChannelMonitor')
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias') :
                     tx_bias = tx_bias_data['data'][tx_bias_id]['value']
                     tx_bias_list.append(tx_bias)
@@ -809,7 +815,7 @@ def get_rx_power(self):
         rx_power_list = []
         try:
             rx_power_data = self._get_eeprom_data('ChannelMonitor')
-            if (self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if  self.media_type.startswith('QSFP'):
                 for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power'):
                     rx_power = rx_power_data['data'][rx_power_id]['value']
                     rx_power_list.append(rx_power)
@@ -826,7 +832,7 @@ def get_tx_power(self):
         """
         tx_power_list = []
         try:
-            if(self.media_type == 'QSFP' or self.media_type == 'QSFP-DD'):
+            if self.media_type.startswith('QSFP'):
                 # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
                 # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
                 # need to add more code for determining the capability and version compliance
@@ -1003,6 +1009,10 @@ def reinit_sfp_driver(self):
         driver_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/name".format(self._port_to_i2c_mapping[self.index])
         delete_device = "echo 0x50 >" + del_sfp_path
 
+        if not os.path.isfile(driver_path):
+            print(driver_path, "does not exist")
+            return False
+ 
         try:
             with os.fdopen(os.open(driver_path, os.O_RDONLY)) as fd:
                 driver_name = fd.read()

From a21babef114b06ce9eeb2ff6fd83e907e381a051 Mon Sep 17 00:00:00 2001
From: Eran Dahan <erand@nvidia.com>
Date: Wed, 24 Feb 2021 19:49:58 +0200
Subject: [PATCH 0229/1674] [Docker] Added support for python2 (#6753)

- Why I did it
Mellanox SDK APIs support python 2 at the moment.

- How I did it
Mellanox SDK APIs support python 2 at the moment.

- How to verify it
Add python 2 to Mellanox syncd only.

- Which release branch to backport (provide reason below if selected)
docker exec -t syncd /bin/bash -c "sx_api_dbg_generate_dump.py /home/sx_api_dbg_dump"
You can see that it will work and generate /home/sx_api_dbg_dump

Signed-off-by: allas <allas@nvidia.com>
---
 platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index 5c9ac6c1c145..c862106c2b63 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -11,7 +11,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install -y \
-        libxml2
+        libxml2     \
+        python-pip  \
+        python-dev \
+        python-setuptools
+
+RUN pip2 install --upgrade pip
+RUN apt-get purge -y python-pip
 
 {% if docker_syncd_mlnx_debs.strip() -%}
 # Copy locally-built Debian package dependencies

From bc3a1de4c0809d89c224eedcff7f3cf749bbc6ff Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Thu, 25 Feb 2021 12:41:29 +0200
Subject: [PATCH 0230/1674] [Mellanox] Add hw-mgmt patch for SimX platform
 adaptation (#6782)

- Why I did it
System is stuck on 'starting' state on SimX platform because of infinite loop on 'hw-management-ready.sh' script .
The loop is polling to check if the hw-mgmt sysfs created before proceeding with the flow, for SimX platform the sysfs will never create so the system is not starting properly.

- How I did it
Add a condition to poll on hw-mgmt sysfs only if the switch is real HW and not SimX platform.

- How to verify it
Check "systemctl status hw-management.service" output on a SimX switch with this patch, the state will be "active".

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 .../0003-Make-hw-mgmt-SimX-compatiable.patch  | 48 +++++++++++++++++++
 platform/mellanox/mlnx-fw-upgrade.j2          |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch

diff --git a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
new file mode 100644
index 000000000000..0eb3daa7977e
--- /dev/null
+++ b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
@@ -0,0 +1,48 @@
+diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
+index 3c9f7b6..05d143f 100755
+--- a/usr/usr/bin/hw-management-ready.sh
++++ b/usr/usr/bin/hw-management-ready.sh
+@@ -49,9 +49,12 @@ if [ -d /var/run/hw-management ]; then
+ 	rm -fr /var/run/hw-management
+ fi
+ 
+-while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
+-do
+-	sleep 1
+-done
++if [ -z "$(lspci -vvv | grep SimX)" ]; then
++        while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
++        do
++                sleep 1
++        done
++fi
++
+ echo "Start Chassis HW management service."
+ logger -t hw-management -p daemon.notice "Start Chassis HW management service."
+diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
+index 70f1297..e427a3d 100755
+--- a/usr/usr/bin/hw-management.sh
++++ b/usr/usr/bin/hw-management.sh
+@@ -1110,6 +1110,13 @@ do_chip_down()
+ 	/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
+ }
+ 
++check_simx()
++{
++        if [ -n "$(lspci -vvv | grep SimX)" ]; then
++                exit 0
++        fi
++}
++
+ __usage="
+ Usage: $(basename $0) [Options]
+ 
+@@ -1135,6 +1142,8 @@ Options:
+ 	force-reload	Performs hw-management 'stop' and the 'start.
+ "
+ 
++check_simx
++
+ case $ACTION in
+ 	start)
+ 		if [ -d /var/run/hw-management ]; then
diff --git a/platform/mellanox/mlnx-fw-upgrade.j2 b/platform/mellanox/mlnx-fw-upgrade.j2
index 245ce75d5f18..e17ec176503c 100755
--- a/platform/mellanox/mlnx-fw-upgrade.j2
+++ b/platform/mellanox/mlnx-fw-upgrade.j2
@@ -251,7 +251,7 @@ function UpgradeFWFromImage() {
 }
 
 function ExitIfQEMU() {
-    if [[ $(cat /sys/devices/virtual/dmi/id/chassis_vendor) = "QEMU" ]]; then
+    if [ -n "$(lspci -vvv | grep SimX)" ]; then
         ExitSuccess "No FW upgrade for SimX platform"
     fi
 }

From 40e445794b258620b525a52cb3ee61ec810a46b0 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 24 Feb 2021 16:41:03 -0800
Subject: [PATCH 0231/1674] Use 'importlib' module in lieu of deprecated 'imp'
 module (#6832)

Migrate from using the `imp` module to using the `importlib` module. As of Python 3, the `imp` module has been deprecated in favor of the `importlib` module.
---
 .../scripts/procdockerstatsd                  |  2 +-
 .../tests/determine-reboot-cause_test.py      | 62 +++++++++----------
 .../tests/procdockerstatsd_test.py            | 13 ++--
 .../sonic_py_common/daemon_base.py            | 15 ++++-
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/sonic-host-services/scripts/procdockerstatsd b/src/sonic-host-services/scripts/procdockerstatsd
index 90b7bd10c95f..d0b4c8fbf2ac 100755
--- a/src/sonic-host-services/scripts/procdockerstatsd
+++ b/src/sonic-host-services/scripts/procdockerstatsd
@@ -72,7 +72,7 @@ class ProcDockerStats(daemon_base.DaemonBase):
         UNITS_MiB = 'MiB'
         UNITS_GiB = 'GiB'
 
-        res = re.match('(\d+\.?\d*)([a-zA-Z]+)', value)
+        res = re.match(r'(\d+\.?\d*)([a-zA-Z]+)', value)
         value = float(res.groups()[0])
         units = res.groups()[1]
         if units.lower() == UNITS_KB.lower():
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index afd74957b6f4..924befdf48ee 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -1,4 +1,4 @@
-import imp
+import importlib
 import sys
 import os
 import pytest
@@ -28,6 +28,15 @@
 scripts_path = os.path.join(modules_path, "scripts")
 sys.path.insert(0, modules_path)
 
+# Load the file under test
+determine_reboot_cause_path = os.path.join(scripts_path, 'determine-reboot-cause')
+loader = importlib.machinery.SourceFileLoader('determine_reboot_cause', determine_reboot_cause_path)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+determine_reboot_cause = importlib.util.module_from_spec(spec)
+loader.exec_module(determine_reboot_cause)
+sys.modules['determine_reboot_cause'] = determine_reboot_cause
+
+
 PROC_CMDLINE_CONTENTS = """\
 BOOT_IMAGE=/image-20191130.52/boot/vmlinuz-4.9.0-11-2-amd64 root=/dev/sda4 rw console=tty0 console=ttyS1,9600n8 quiet net.ifnames=0 biosdevname=0 loop=image-20191130.52/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor varlog_size=4096 usbcore.autosuspend=-1 module_blacklist=gpio_ich SONIC_BOOT_TYPE=warm"""
 
@@ -37,9 +46,9 @@
 BOOT_IMAGE=/image-20191130.52/boot/vmlinuz-4.9.0-11-2-amd64 root=/dev/sda4 rw console=tty0 console=ttyS1,9600n8 quiet net.ifnames=0 biosdevname=0 loop=image-20191130.52/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor varlog_size=4096 usbcore.autosuspend=-1 module_blacklist=gpio_ich SONIC_BOOT_TYPE=warm"""
 
 REBOOT_CAUSE_CONTENTS = """\
-User issued 'warm-reboot' command [User: admin, Time: Mon Nov  2 22:37:45 UTC 2020]""" 
+User issued 'warm-reboot' command [User: admin, Time: Mon Nov  2 22:37:45 UTC 2020]"""
 
-GET_SONIC_VERSION_INFO = {'commit_id': 'e59ec8291', 'build_date': 'Mon Nov  2 06:00:14 UTC 2020', 'build_number': 75, 'kernel_version': '4.9.0-11-2-amd64', 'debian_version': '9.13', 'built_by': 'sonicbld@jenkins-slave-phx-2', 'asic_type': 'mellanox', 'build_version': '20191130.52'} 
+GET_SONIC_VERSION_INFO = {'commit_id': 'e59ec8291', 'build_date': 'Mon Nov  2 06:00:14 UTC 2020', 'build_number': 75, 'kernel_version': '4.9.0-11-2-amd64', 'debian_version': '9.13', 'built_by': 'sonicbld@jenkins-slave-phx-2', 'asic_type': 'mellanox', 'build_version': '20191130.52'}
 
 REBOOT_CAUSE_WATCHDOG = "Watchdog"
 GEN_TIME_WATCHDOG = "2020_10_22_03_15_08"
@@ -55,63 +64,52 @@
 EXPECTED_WATCHDOG_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_15_08', 'cause': 'Watchdog', 'user': 'N/A', 'time': 'N/A'}
 EXPECTED_USER_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_14_07', 'cause': 'reboot', 'user': 'admin', 'time': 'Thu Oct 22 03:11:08 UTC 2020'}
 
-imp.load_source('determine_reboot_cause', scripts_path + '/determine-reboot-cause')
-from determine_reboot_cause import *
 
 class TestDetermineRebootCause(object):
-    @classmethod
-    def setup_class(cls):
-        print("SETUP")
-
     def test_parse_warmfast_reboot_from_proc_cmdline(self):
         with mock.patch("os.path.isfile") as mock_isfile:
             mock_isfile.return_value = True
-            open_mocked = mock.mock_open(read_data=PROC_CMDLINE_CONTENTS) 
-            with mock.patch("{}.open".format(BUILTINS), open_mocked): 
-                result = parse_warmfast_reboot_from_proc_cmdline() 
+            open_mocked = mock.mock_open(read_data=PROC_CMDLINE_CONTENTS)
+            with mock.patch("{}.open".format(BUILTINS), open_mocked):
+                result = determine_reboot_cause.parse_warmfast_reboot_from_proc_cmdline()
                 assert result == EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE
-                open_mocked.assert_called_once_with("/proc/cmdline") 
+                open_mocked.assert_called_once_with("/proc/cmdline")
 
     def test_find_software_reboot_cause_user(self):
-        with mock.patch("os.path.isfile") as mock_isfile: 
-            mock_isfile.return_value = True 
-            open_mocked = mock.mock_open(read_data=REBOOT_CAUSE_CONTENTS) 
-            with mock.patch("{}.open".format(BUILTINS), open_mocked): 
-                 result = find_software_reboot_cause_from_reboot_cause_file() 
+        with mock.patch("os.path.isfile") as mock_isfile:
+            mock_isfile.return_value = True
+            open_mocked = mock.mock_open(read_data=REBOOT_CAUSE_CONTENTS)
+            with mock.patch("{}.open".format(BUILTINS), open_mocked):
+                 result = determine_reboot_cause.find_software_reboot_cause_from_reboot_cause_file()
                  assert result == EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER
-                 open_mocked.assert_called_once_with("/host/reboot-cause/reboot-cause.txt") 
+                 open_mocked.assert_called_once_with("/host/reboot-cause/reboot-cause.txt")
 
     def test_find_software_reboot_cause_first_boot(self):
         with mock.patch("sonic_py_common.device_info.get_sonic_version_info", return_value=GET_SONIC_VERSION_INFO):
-            result = find_first_boot_version() 
+            result = determine_reboot_cause.find_first_boot_version()
             assert result == EXPECTED_FIND_FIRSTBOOT_VERSION
 
     def test_find_software_reboot_cause(self):
         with mock.patch("determine_reboot_cause.find_software_reboot_cause_from_reboot_cause_file", return_value="Unknown"):
-            with mock.patch("os.path.isfile") as mock_isfile: 
-                mock_isfile.return_value = False 
-                result = find_software_reboot_cause() 
+            with mock.patch("os.path.isfile") as mock_isfile:
+                mock_isfile.return_value = False
+                result = determine_reboot_cause.find_software_reboot_cause()
                 assert result == "Unknown"
 
     def test_find_proc_cmdline_reboot_cause(self):
         with mock.patch("determine_reboot_cause.parse_warmfast_reboot_from_proc_cmdline", return_value="fast-reboot"):
-            result = find_proc_cmdline_reboot_cause() 
+            result = determine_reboot_cause.find_proc_cmdline_reboot_cause()
             assert result == "fast-reboot"
 
     def test_find_hardware_reboot_cause(self):
         with mock.patch("determine_reboot_cause.get_reboot_cause_from_platform", return_value=("Powerloss", None)):
-            result = find_hardware_reboot_cause()
+            result = determine_reboot_cause.find_hardware_reboot_cause()
             assert result == "Powerloss (None)"
 
     def test_get_reboot_cause_dict_watchdog(self):
-        reboot_cause_dict = get_reboot_cause_dict(REBOOT_CAUSE_WATCHDOG, "", GEN_TIME_WATCHDOG) 
+        reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_WATCHDOG, "", GEN_TIME_WATCHDOG)
         assert reboot_cause_dict == EXPECTED_WATCHDOG_REBOOT_CAUSE_DICT
 
     def test_get_reboot_cause_dict_user(self):
-        reboot_cause_dict = get_reboot_cause_dict(REBOOT_CAUSE_USER, "", GEN_TIME_USER) 
+        reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_USER, "", GEN_TIME_USER)
         assert reboot_cause_dict == EXPECTED_USER_REBOOT_CAUSE_DICT
-
-    @classmethod
-    def teardown_class(cls):
-        print("TEARDOWN")
-
diff --git a/src/sonic-host-services/tests/procdockerstatsd_test.py b/src/sonic-host-services/tests/procdockerstatsd_test.py
index 5c47e91458f3..db7c6a1f0e3d 100644
--- a/src/sonic-host-services/tests/procdockerstatsd_test.py
+++ b/src/sonic-host-services/tests/procdockerstatsd_test.py
@@ -1,4 +1,4 @@
-import imp
+import importlib
 import sys
 import os
 import pytest
@@ -14,8 +14,13 @@
 scripts_path = os.path.join(modules_path, "scripts")
 sys.path.insert(0, modules_path)
 
-imp.load_source('procdockerstatsd', scripts_path + '/procdockerstatsd')
-from procdockerstatsd import *
+# Load the file under test
+procdockerstatsd_path = os.path.join(scripts_path, 'procdockerstatsd')
+loader = importlib.machinery.SourceFileLoader('procdockerstatsd', procdockerstatsd_path)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+procdockerstatsd = importlib.util.module_from_spec(spec)
+loader.exec_module(procdockerstatsd)
+sys.modules['procdockerstatsd'] = procdockerstatsd
 
 class TestProcDockerStatsDaemon(object):
     def test_convert_to_bytes(self):
@@ -35,7 +40,7 @@ def test_convert_to_bytes(self):
             ('7.751GiB', 8322572878)
         ]
 
-        pdstatsd = ProcDockerStats(SYSLOG_IDENTIFIER)
+        pdstatsd = procdockerstatsd.ProcDockerStats(procdockerstatsd.SYSLOG_IDENTIFIER)
 
         for test_input, expected_output in test_data:
             res = pdstatsd.convert_to_bytes(test_input)
diff --git a/src/sonic-py-common/sonic_py_common/daemon_base.py b/src/sonic-py-common/sonic_py_common/daemon_base.py
index c3ecc12cf856..3797c19b6b7d 100644
--- a/src/sonic-py-common/sonic_py_common/daemon_base.py
+++ b/src/sonic-py-common/sonic_py_common/daemon_base.py
@@ -1,4 +1,4 @@
-import imp
+import importlib
 import signal
 import sys
 
@@ -25,10 +25,21 @@ def db_connect(db_name, namespace=EMPTY_NAMESPACE):
     from swsscommon import swsscommon
     return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, True, namespace)
 
+
+def _load_module_from_file(module_name, file_path):
+    loader = importlib.machinery.SourceFileLoader(module_name, file_path)
+    spec = importlib.util.spec_from_loader(loader.name, loader)
+    module = importlib.util.module_from_spec(spec)
+    loader.exec_module(module)
+    sys.modules[module_name] = module
+    return module
+
+
 #
 # DaemonBase ===================================================================
 #
 
+
 class DaemonBase(Logger):
     def __init__(self, log_identifier):
         super(DaemonBase, self).__init__(
@@ -68,7 +79,7 @@ def load_platform_util(self, module_name, class_name):
 
         try:
             module_file = "/".join([platform_path, "plugins", module_name + ".py"])
-            module = imp.load_source(module_name, module_file)
+            module = _load_module_from_file(module_name, module_file)
         except IOError as e:
             raise IOError("Failed to load platform module '%s': %s" % (module_name, str(e)))
 

From 926572ee8291158c7da925d8a7a8a9cbea7a484c Mon Sep 17 00:00:00 2001
From: rkdevi27 <54701695+rkdevi27@users.noreply.github.com>
Date: Thu, 25 Feb 2021 01:30:24 +0530
Subject: [PATCH 0232/1674] [dell/s6000]: Enable graceful reboot in S6000
 (#6835)

The S6000 devices, the cold reboot is abrupt and it is likely to cause issues which will cause the device to land into EFI shell. Hence the platform reboot will happen after graceful unmount of all the filesystems as in S6100.

Moved the platform_reboot to platform_reboot_override and hooked it to the systemd shutdown services as in S6100
---
 .../platform_reboot                           | 63 -------------------
 .../debian/platform-modules-s6000.install     |  3 +
 .../s6000/scripts/override.conf               |  3 +
 .../s6000/scripts/platform_reboot_override    | 27 ++++++++
 .../scripts/platform_update_reboot_cause      | 25 ++++++++
 5 files changed, 58 insertions(+), 63 deletions(-)
 delete mode 100755 device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6000/scripts/override.conf
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_reboot_override
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_update_reboot_cause

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot b/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
deleted file mode 100755
index 28f2ec626605..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/platform_reboot
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/python3
-
-import sys
-import os
-import struct
-
-PORT_RES = '/dev/port'
-NVRAM_RES = '/dev/nvram'
-COLD_RESET = 0xE     # Cold Reset
-WARM_RESET = 0x6     # Warm Reset
-RESET_REG = 0xCF9
-
-def io_reg_write(resource, offset, val):
-    fd = os.open(resource, os.O_RDWR)
-    if(fd < 0):
-        print('file open failed %s" % resource')
-        return
-    if(os.lseek(fd, offset, os.SEEK_SET) != offset):
-        print('lseek failed on %s' % resource)
-        return
-    ret = os.write(fd, struct.pack('B', val))
-    if(ret != 1):
-        print('write failed %d' % ret)
-        return
-    os.close(fd)
-
-def power_reset(val):
-    with open('/sys/devices/platform/dell-s6000-cpld.0/power_reset', 'w') as p:
-        p.write(str(int(val)) + '\n')
-        p.flush()
-
-def gpio_direction(pin, direction):
-    kernpath = '/sys/class/gpio/gpio'+str(pin)+'/direction'
-    with open(('kernpath'), 'w') as p:
-        p.write(str(direction) + '\n')
-        p.flush()
-
-def gpio_set(pin, value):
-    kernpath = '/sys/class/gpio/gpio'+str(pin)+'/value'
-    with open(('kernpath'), 'w') as p:
-        p.write(str(int(value)) + '\n')
-        p.flush()
-
-def gpio_export(value):
-    with open('/sys/class/gpio/export', 'w') as p:
-        p.write(str(int(value)) + '\n')
-        p.flush()
-
-if __name__ == "__main__":
-
-    retry_count = 0
-    io_reg_write(NVRAM_RES, 0x49, COLD_RESET)
-
-    while retry_count < 3:
-        if not os.path.isdir("/sys/class/gpio/gpio10"):
-            gpio_export(10)
-        gpio_direction("10", "out")
-        # Toggle GPIO10 pin (to reset MUX)
-        gpio_set("10", 1)
-        gpio_set("10", 0)
-        power_reset(1)
-        retry_count += 1
-    io_reg_write(PORT_RES, RESET_REG, COLD_RESET) 
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install
index d87efb31c488..e67a59485136 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install
@@ -5,5 +5,8 @@ s6000/scripts/fancontrol.sh usr/local/bin
 s6000/systemd/platform-modules-s6000.service etc/systemd/system
 s6000/systemd/fancontrol.service etc/systemd/system
 common/io_rd_wr.py usr/local/bin
+s6000/scripts/platform_reboot_override usr/share/sonic/device/x86_64-dell_s6000_s1220-r0
+s6000/scripts/platform_update_reboot_cause usr/share/sonic/device/x86_64-dell_s6000_s1220-r0
+s6000/scripts/override.conf /etc/systemd/system/systemd-reboot.service.d
 s6000/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-dell_s6000_s1220-r0
 s6000/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-dell_s6000_s1220-r0
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/override.conf b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/override.conf
new file mode 100644
index 000000000000..4291afe0d249
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/override.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/share/sonic/device/x86_64-dell_s6000_s1220-r0/platform_reboot_override
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_reboot_override b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_reboot_override
new file mode 100755
index 000000000000..cae804f2cfb1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_reboot_override
@@ -0,0 +1,27 @@
+#!/usr/bin/python3
+
+import os
+import struct
+
+PORT_RES = '/dev/port'
+COLD_RESET = 0xE     # Cold Reset
+WARM_RESET = 0x6     # Warm Reset
+RESET_REG = 0xCF9
+
+def io_reg_write(resource, offset, val):
+    fd = os.open(resource, os.O_RDWR)
+    if(fd < 0):
+        print('file open failed %s" % resource')
+        return
+    if(os.lseek(fd, offset, os.SEEK_SET) != offset):
+        print('lseek failed on %s' % resource)
+        return
+    ret = os.write(fd, struct.pack('B', val))
+    if(ret != 1):
+        print('write failed %d' % ret)
+        return
+    os.close(fd)
+
+
+if __name__ == "__main__":
+    io_reg_write(PORT_RES, RESET_REG, COLD_RESET) 
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_update_reboot_cause b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_update_reboot_cause
new file mode 100755
index 000000000000..ba6e3bbab539
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/platform_update_reboot_cause
@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+
+import os
+import struct
+
+NVRAM_RES = '/dev/nvram'
+COLD_RESET = 0xE     # Cold Reset
+WARM_RESET = 0x6     # Warm Reset
+
+def io_reg_write(resource, offset, val):
+    fd = os.open(resource, os.O_RDWR)
+    if(fd < 0):
+        print('file open failed %s" % resource')
+        return
+    if(os.lseek(fd, offset, os.SEEK_SET) != offset):
+        print('lseek failed on %s' % resource)
+        return
+    ret = os.write(fd, struct.pack('B', val))
+    if(ret != 1):
+        print('write failed %d' % ret)
+        return
+    os.close(fd)
+
+if __name__ == "__main__":
+    io_reg_write(NVRAM_RES, 0x49, COLD_RESET)

From 3d52e3f69ab6695343998e8ebedd2a134cb6a380 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Wed, 24 Feb 2021 20:42:01 +0000
Subject: [PATCH 0233/1674] DellEMC: S5232, Z9264, Z9332 - Platform API fixes
 (#6842)

#### Why I did it

To incorporate the below changes in DellEMC S5232, Z9264, Z9332 platforms.

- Update thermal high threshold values
- Make watchdog API Python2 and Python3 compatible
- Fix LGTM alerts
- Z9264: Fix get_change_event timer value

#### How I did it

- Use 'universal_newlines=True' in subprocess.Popen call.
- Change the timeout in 'get_change_event' to milliseconds to match specification in sonic_platform_common/chassis_base.py
---
 .../s5232f/sonic_platform/chassis.py             |  6 ++----
 .../s5232f/sonic_platform/thermal.py             |  9 ++++-----
 .../s5232f/sonic_platform/watchdog.py            |  3 +--
 .../z9264f/sonic_platform/chassis.py             |  9 +++++----
 .../z9264f/sonic_platform/component.py           | 15 ++++++---------
 .../z9264f/sonic_platform/sfp.py                 | 16 +++-------------
 .../z9264f/sonic_platform/thermal.py             | 10 +++++-----
 .../z9264f/sonic_platform/watchdog.py            |  7 +------
 .../z9332f/sonic_platform/chassis.py             |  2 +-
 .../z9332f/sonic_platform/thermal.py             |  8 ++++----
 10 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
index 1022d0bb481b..356e69526d89 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
@@ -87,7 +87,6 @@ def __del__(self):
 # check for this event change for sfp / do we need to handle timeout/sleep
 
     def get_change_event(self, timeout=0):
-        from time import sleep
         """
         Returns a nested dictionary containing all devices which have
         experienced a change at chassis level
@@ -116,7 +115,6 @@ def get_change_event(self, timeout=0):
                 if (now_ms - start_ms >= timeout):
                     return True, change_dict
 
-
     def get_sfp(self, index):
         """
         Retrieves sfp represented by (0-based) index <index>
@@ -136,7 +134,7 @@ def get_sfp(self, index):
             # The index will start from 0
             sfp = self._sfp_list[index-1]
         except IndexError:
-            sys.stderr.write("SFP index {} out of range (0-{})\n".format(
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
                              index, len(self._sfp_list)))
         return sfp
 
@@ -223,6 +221,7 @@ def get_num_sfps(self):
             An integer represences the number of SFPs on the chassis.
         """
         return self._num_sfps
+
     def get_reboot_cause(self):
         """
         Retrieves the cause of the previous reboot
@@ -259,4 +258,3 @@ def get_reboot_cause(self):
             return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Reset Button Cold Reboot")
         else:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
-
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py
index d8c4ef14d5b2..2a6ff8927e0a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py
@@ -105,9 +105,9 @@ def get_high_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-        is_valid, high_threshold = self.sensor.get_threshold("UpperCritical")
+        is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
         if not is_valid:
-            high_threshold = 0
+            return super(Thermal, self).get_high_threshold()
 
         return float(high_threshold)
 
@@ -134,12 +134,11 @@ def get_high_critical_threshold(self):
             thermal in Celsius up to nearest thousandth of one degree
             Celsius, e.g. 30.125
         """
-        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperNonRecoverable")
+        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
         if not is_valid:
-            high_crit_threshold = 0
+            return super(Thermal, self).get_high_critical_threshold()
 
         return float(high_crit_threshold)
-	
 
     def set_high_threshold(self, temperature):
         """
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
index 878d5f4f952d..14485decc896 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
@@ -43,7 +43,7 @@ def __init__(self):
     def _get_command_result(self, cmdline):
         try:
             proc = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT)
+                                    stderr=subprocess.STDOUT, universal_newlines=True)
             stdout = proc.communicate()[0]
             proc.wait()
             result = stdout.rstrip('\n')
@@ -207,4 +207,3 @@ def get_remaining_time(self):
                 return self.timeout - diff_time
 
         return 0
-
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/chassis.py
index 3f99cf503b3b..78e8dea999c8 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/chassis.py
@@ -104,7 +104,7 @@ def _get_register(self, reg_file):
         try:
             with os.fdopen(os.open(reg_file, os.O_RDONLY)) as fd:
                 retval = fd.read()
-        except:
+        except Exception:
             pass
         retval = retval.rstrip('\r\n')
         retval = retval.lstrip(" ")
@@ -134,6 +134,8 @@ def get_change_event(self, timeout=0):
         port_dict = {}
         change_dict = {}
         change_dict['sfp'] = port_dict
+        if timeout != 0:
+            timeout = timeout / 1000
         try:
             # We get notified when there is a MSI interrupt (vector 4/5)CVR
             # Open the sysfs file and register the epoll object
@@ -174,7 +176,7 @@ def get_change_event(self, timeout=0):
                 if (retval != 0):
                     return False, change_dict
             return True, change_dict
-        except:
+        except Exception:
             return False, change_dict
         finally:
             if self.oir_fd != -1:
@@ -183,7 +185,6 @@ def get_change_event(self, timeout=0):
                 self.oir_fd.close()
                 self.oir_fd = -1
                 self.epoll = -1
-        return False, change_dict
 
     def get_sfp(self, index):
         """
@@ -281,7 +282,7 @@ def get_reboot_cause(self):
         try:
             with open(self.REBOOT_CAUSE_PATH) as fd:
                 reboot_cause = int(fd.read(), 16)
-        except:
+        except Exception:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
 
         if reboot_cause & 0x1:
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
index 6ead7ef524f2..c4e2c06b135c 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
@@ -10,7 +10,6 @@
 ########################################################################
 
 try:
-    import os
     import re
     from sonic_platform_base.component_base import ComponentBase
 
@@ -24,17 +23,18 @@ class Component(ComponentBase):
 
     CHASSIS_COMPONENTS = [
         ["BIOS", ("Performs initialization of hardware components during "
-                                                                 "booting")],
+                  "booting")],
         ["FPGA", ("Used for managing the system LEDs")],
         ["BMC", ("Platform management controller for on-board temperature "
-                         "monitoring, in-chassis power, Fan and LED control")],
+                 "monitoring, in-chassis power, Fan and LED control")],
         ["System CPLD", ("Used for managing the CPU power sequence and CPU states")],
         ["Slave CPLD 1", ("Used for managing QSFP/QSFP28 port transceivers (1-16)")],
         ["Slave CPLD 2", ("Used for managing QSFP/QSFP28 port transceivers (17-32)")],
         ["Slave CPLD 3", ("Used for managing QSFP/QSFP28 port transceivers (33-48)")],
         ["Slave CPLD 4", ("Used for managing QSFP/QSFP28 port transceivers (49-64) and SFP/SFP28 "
-                                                              "port transceivers (65 and 66)")],
-                                                                                        ]
+                          "port transceivers (65 and 66)")],
+    ]
+
     def __init__(self, component_index=0):
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
@@ -48,7 +48,6 @@ def get_name(self):
         """
         return self.name
 
-    
     def get_description(self):
         """
         Retrieves the description of the component
@@ -77,7 +76,7 @@ def get_firmware_version(self):
             if version:
                 rv = version.group(1).strip()
         return rv
-                                                                                                                                                            
+
     def install_firmware(self, image_path):
         """
         Installs firmware to the component
@@ -87,5 +86,3 @@ def install_firmware(self, image_path):
         A boolean, True if install was successful, False if not
         """
         return False
-
-
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
index 4ede81f3d169..d6d3e59b5891 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/sfp.py
@@ -12,11 +12,7 @@
     import os
     import time
     import struct
-    import sys
-    import getopt
-    import select
     import mmap
-    from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
@@ -976,7 +972,7 @@ def reset(self):
             reg_value = reg_value & ~mask
 
             # Convert our register value back to a hex string and write back
-            status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
 
             # Sleep 1 second to allow it to settle
             time.sleep(1)
@@ -984,7 +980,7 @@ def reset(self):
             reg_value = reg_value | mask
 
             # Convert our register value back to a hex string and write back
-            status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
 
             return True
 
@@ -1016,7 +1012,7 @@ def set_lpmode(self, lpmode):
                 reg_value = reg_value & ~mask
 
             # Convert our register value back to a hex string and write back
-            status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
 
             return True
 
@@ -1035,12 +1031,6 @@ def tx_disable_channel(self, channel, disable):
         """
         return False
 
-    def tx_disable_channel(self, channel, disable):
-        """
-        Sets the tx_disable for specified SFP channels
-        """
-        return False
-
     def set_power_override(self, power_override, power_set):
         """
         Sets SFP power level using power_override and power_set
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/thermal.py
index 1f3caaa02dd3..d6432f66bcab 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/thermal.py
@@ -11,7 +11,7 @@
 
 try:
     from sonic_platform_base.thermal_base import ThermalBase
-    from sonic_platform.ipmihelper import IpmiSensor, IpmiFru
+    from sonic_platform.ipmihelper import IpmiSensor
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -105,9 +105,9 @@ def get_high_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-        is_valid, high_threshold = self.sensor.get_threshold("UpperCritical")
+        is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
         if not is_valid:
-            high_threshold = 0
+            return super(Thermal, self).get_high_threshold()
 
         return float(high_threshold)
 
@@ -135,9 +135,9 @@ def get_high_critical_threshold(self):
             thermal in Celsius up to nearest thousandth of one degree
             Celsius, e.g. 30.125
         """
-        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperNonRecoverable")
+        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
         if not is_valid:
-            high_crit_threshold = 0
+            return super(Thermal, self).get_high_critical_threshold()
 
         return float(high_crit_threshold)
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
index d3363067db63..0ecb42685c6d 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
@@ -10,8 +10,6 @@
 ########################################################################
 
 try:
-    import sys
-    import struct
     import ctypes
     import subprocess
     from sonic_platform_base.watchdog_base import WatchdogBase
@@ -45,7 +43,7 @@ def __init__(self):
     def _get_command_result(self, cmdline):
         try:
             proc = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT)
+                                    stderr=subprocess.STDOUT, universal_newlines=True)
             stdout = proc.communicate()[0]
             proc.wait()
             result = stdout.rstrip('\n')
@@ -139,8 +137,6 @@ def arm(self, seconds):
             self.timeout = seconds
             return seconds
 
-        return -1
-
     def disarm(self):
         """
         Disarm the hardware watchdog
@@ -211,4 +207,3 @@ def get_remaining_time(self):
                 return self.timeout - diff_time
 
         return 0
-
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index cead0eb326ef..8ac97943cc09 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -200,7 +200,7 @@ def get_sfp(self, index):
             # The index will start from 0
             sfp = self._sfp_list[index-1]
         except IndexError:
-            sys.stderr.write("SFP index {} out of range (0-{})\n".format(
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
                              index, len(self._sfp_list)))
         return sfp
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
index 86d5f9492d50..1c7fe59857a3 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
@@ -111,9 +111,9 @@ def get_high_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-        is_valid, high_threshold = self.sensor.get_threshold("UpperCritical")
+        is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
         if not is_valid:
-            high_threshold = 0
+            return super(Thermal, self).get_high_threshold()
 
         return float(high_threshold)
 
@@ -140,9 +140,9 @@ def get_high_critical_threshold(self):
             thermal in Celsius up to nearest thousandth of one degree
             Celsius, e.g. 30.125
         """
-        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperNonRecoverable")
+        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
         if not is_valid:
-            high_crit_threshold = 0
+            return super(Thermal, self).get_high_critical_threshold()
 
         return float(high_crit_threshold)
 	

From 7748597fa2416aa5e723f2c936b821318c972845 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:35:29 -0800
Subject: [PATCH 0234/1674] [Supervisord] Deduplicate the alerting messages of
 critical processes from Supervisord. (#6849)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
In the configuration of rsyslog, duplicate messages will be suppressed and reported in the format of message repeated n times.
Due to this behavior, if a critical process in a container exited unexpectedly, the alerting message will be written into syslog once
and not be written into syslog anymore until the second critical process exited. This PR aims to differentiate these alerting messages such that they will not be suppressed by rsyslogd and can appear in the syslog periodically.

How I did it
This PR adds a counter into the alerting message and shows how many minutes a critical process was not running.

How to verify it
I verified and test this implementation on a physical DUT.
---
 files/scripts/supervisor-proc-exit-listener | 22 +++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/files/scripts/supervisor-proc-exit-listener b/files/scripts/supervisor-proc-exit-listener
index e8565b4d52f2..7bf3059b5e9a 100755
--- a/files/scripts/supervisor-proc-exit-listener
+++ b/files/scripts/supervisor-proc-exit-listener
@@ -8,6 +8,7 @@ import signal
 import sys
 import syslog
 import time
+from collections import defaultdict
 
 import swsssdk
 
@@ -64,7 +65,7 @@ def get_critical_group_and_process_list():
     return critical_group_list, critical_process_list
 
 
-def generate_alerting_message(process_name):
+def generate_alerting_message(process_name, dead_minutes):
     """
     @summary: If a critical process was not running, this function will determine it resides in host
               or in a specific namespace. Then an alerting message will be written into syslog.
@@ -77,7 +78,8 @@ def generate_alerting_message(process_name):
     else:
         namespace = namespace_prefix + namespace_id
 
-    syslog.syslog(syslog.LOG_ERR, "Process '{}' is not running in namespace '{}'.".format(process_name, namespace))
+    syslog.syslog(syslog.LOG_ERR, "Process '{}' is not running in namespace '{}' ({} minutes)."
+                  .format(process_name, namespace, dead_minutes))
 
 
 def get_autorestart_state(container_name):
@@ -118,7 +120,7 @@ def main(argv):
 
     critical_group_list, critical_process_list = get_critical_group_and_process_list()
 
-    process_under_alerting = {}
+    process_under_alerting = defaultdict(dict)
     # Transition from ACKNOWLEDGED to READY
     childutils.listener.ready()
 
@@ -145,7 +147,8 @@ def main(argv):
                         syslog.syslog(syslog.LOG_INFO, msg)
                         os.kill(os.getppid(), signal.SIGTERM)
                     else:
-                        process_under_alerting[process_name] = time.time()
+                        process_under_alerting[process_name]["last_alerted"] = time.time()
+                        process_under_alerting[process_name]["dead_minutes"] = 0
 
             # Handle the PROCESS_STATE_RUNNING event
             elif headers['eventname'] == 'PROCESS_STATE_RUNNING':
@@ -162,11 +165,14 @@ def main(argv):
             childutils.listener.ready()
 
         # Check whether we need write alerting messages into syslog
-        for process in process_under_alerting.keys():
+        for process_name in process_under_alerting.keys():
             epoch_time = time.time()
-            if epoch_time - process_under_alerting[process] >= ALERTING_INTERVAL_SECS:
-                process_under_alerting[process] = epoch_time
-                generate_alerting_message(process)
+            elapsed_secs = epoch_time - process_under_alerting[process_name]["last_alerted"]
+            if elapsed_secs >= ALERTING_INTERVAL_SECS:
+                elapsed_mins = elapsed_secs // 60
+                process_under_alerting[process_name]["last_alerted"] = epoch_time
+                process_under_alerting[process_name]["dead_minutes"] += elapsed_mins
+                generate_alerting_message(process_name, process_under_alerting[process_name]["dead_minutes"])
 
 
 if __name__ == "__main__":

From bd14dd377ca8e6de3a99c6e0fda3cd172ca604a9 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:20:53 -0800
Subject: [PATCH 0235/1674] [Celestica] Ensure concrete platform API classes
 call base class initializer (#6852)

In preparation for the merging of Azure/sonic-platform-common#173, which properly defines class and instance members in the Platform API base classes.

It is proper object-oriented methodology to call the base class initializer, even if it is only the default initializer. This also future-proofs the potential addition of custom initializers in the base classes down the road.
---
 device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py  | 2 ++
 device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py | 1 +
 .../celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py  | 1 +
 .../celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py | 2 ++
 .../x86_64-cel_seastone_2-r0/sonic_platform_config/watchdog.py  | 2 ++
 .../celestica/x86_64-cel_silverstone-r0/sonic_platform/fan.py   | 1 +
 6 files changed, 9 insertions(+)

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
index 157f49a7c3e2..6c73845287cd 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
@@ -25,6 +25,8 @@ class Thermal(ThermalBase):
     SS_CONFIG_PATH = "/usr/share/sonic/device/x86_64-cel_e1031-r0/sensors.conf"
 
     def __init__(self, thermal_index):
+        ThermalBase.__init__(self)
+
         self.index = thermal_index
 
         # Add thermal name
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
index 882285251784..6db0508cb845 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
@@ -53,6 +53,7 @@
 class Watchdog(WatchdogBase):
 
     def __init__(self):
+        WatchdogBase.__init__(self)
 
         self.watchdog, self.wdt_main_dev_name = self._get_wdt()
         self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
index 2b38ef94d6c4..3848f9340541 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
@@ -67,6 +67,7 @@ class Thermal(ThermalBase):
     SS_CONFIG_PATH = "/usr/share/sonic/device/x86_64-cel_seastone-r0/sensors.conf"
 
     def __init__(self, thermal_index, airflow):
+        ThermalBase.__init__(self)
         self.index = thermal_index
         self._api_helper = APIHelper()
         self._airflow = airflow
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
index 31bb911d2401..5ab79309f0fe 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
@@ -31,6 +31,8 @@
 class Watchdog(WatchdogBase):
 
     def __init__(self):
+        WatchdogBase.__init__(self)
+
         # Init helper
         self._api_helper = APIHelper()
 
diff --git a/device/celestica/x86_64-cel_seastone_2-r0/sonic_platform_config/watchdog.py b/device/celestica/x86_64-cel_seastone_2-r0/sonic_platform_config/watchdog.py
index cc87c3d6b32a..fac5c40e134f 100644
--- a/device/celestica/x86_64-cel_seastone_2-r0/sonic_platform_config/watchdog.py
+++ b/device/celestica/x86_64-cel_seastone_2-r0/sonic_platform_config/watchdog.py
@@ -29,6 +29,8 @@
 class Watchdog(WatchdogBase):
 
     def __init__(self):
+        WatchdogBase.__init__(self)
+
         self._api_common = Common()
 
         # Init cpld reg path
diff --git a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/fan.py
index 1055aee68fc7..1a18eed9c8d5 100644
--- a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/fan.py
@@ -54,6 +54,7 @@ class Fan(FanBase):
     """Platform-specific Fan class"""
 
     def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        FanBase.__init__(self)
         self.fan_index = fan_index
         self.fan_tray_index = fan_tray_index
         self.is_psu_fan = is_psu_fan

From 88f4c6523d99dfdc4609ac9f9a92237105058790 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:20:34 -0800
Subject: [PATCH 0236/1674] [DellEMC] Ensure concrete platform API classes call
 base class initializer (#6853)

In preparation for the merging of Azure/sonic-platform-common#173, which properly defines class and instance members in the Platform API base classes.

It is proper object-oriented methodology to call the base class initializer, even if it is only the default initializer. This also future-proofs the potential addition of custom initializers in the base classes down the road.
---
 .../s5232f/sonic_platform/component.py                           | 1 +
 .../sonic-platform-modules-dell/s5232f/sonic_platform/fan.py     | 1 +
 .../s5232f/sonic_platform/watchdog.py                            | 1 +
 .../s6000/sonic_platform/component.py                            | 1 +
 .../sonic-platform-modules-dell/s6000/sonic_platform/fan.py      | 1 +
 .../sonic-platform-modules-dell/s6000/sonic_platform/thermal.py  | 1 +
 .../s6100/sonic_platform/component.py                            | 1 +
 .../sonic-platform-modules-dell/s6100/sonic_platform/fan.py      | 1 +
 .../sonic-platform-modules-dell/s6100/sonic_platform/thermal.py  | 1 +
 .../sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py | 1 +
 .../z9100/sonic_platform/component.py                            | 1 +
 .../sonic-platform-modules-dell/z9100/sonic_platform/fan.py      | 1 +
 .../sonic-platform-modules-dell/z9100/sonic_platform/psu.py      | 1 +
 .../sonic-platform-modules-dell/z9100/sonic_platform/thermal.py  | 1 +
 .../z9264f/sonic_platform/component.py                           | 1 +
 .../sonic-platform-modules-dell/z9264f/sonic_platform/fan.py     | 1 +
 .../z9264f/sonic_platform/watchdog.py                            | 1 +
 .../z9332f/sonic_platform/component.py                           | 1 +
 .../sonic-platform-modules-dell/z9332f/sonic_platform/fan.py     | 1 +
 .../z9332f/sonic_platform/watchdog.py                            | 1 +
 20 files changed, 20 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py
index f7fcc94662c1..52f2bacd70aa 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py
@@ -82,6 +82,7 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index = 0):
+        ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py
index 1b624cb76eda..c634dc7d0d17 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py
@@ -41,6 +41,7 @@ class Fan(FanBase):
 
     def __init__(self, fantray_index=1, fan_index=1, psu_fan=False,
             dependency=None):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
             # API index is starting from 0, DellEMC platform index is
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
index 14485decc896..961bd8b3dbb4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py
@@ -36,6 +36,7 @@ class Watchdog(WatchdogBase):
     CLOCK_MONOTONIC = 1
 
     def __init__(self):
+        WatchdogBase.__init__(self)
         self._librt = ctypes.CDLL('librt.so.1', use_errno=True)
         self._clock_gettime = self._librt.clock_gettime
         self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
index d9459be47c4f..92ae95fae4f6 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py
@@ -34,6 +34,7 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index):
+        ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
index d5a4f379e90b..940c70cebede 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py
@@ -33,6 +33,7 @@ class Fan(FanBase):
 
     def __init__(self, fantray_index=1, fan_index=1,
                  psu_index=1, psu_fan=False, dependency=None):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         self.is_driver_initialized = True
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
index ad089a8946a9..bfb1385a9f05 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
@@ -35,6 +35,7 @@ class Thermal(ThermalBase):
 
     def __init__(self, thermal_index,
                  psu_index=1, psu_thermal=False, dependency=None):
+        ThermalBase.__init__(self)
         self.is_psu_thermal = psu_thermal
         self.dependency = dependency
         self.is_driver_initialized = True
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
index bea180d440b5..2e916488123d 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py
@@ -41,6 +41,7 @@ class Component(ComponentBase):
     def __init__(self, component_index=0,
                  is_module=False, iom_index=0, i2c_line=0, dependency=None):
 
+        ComponentBase.__init__(self)
         self.is_module_component = is_module
         self.dependency = dependency
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
index 5b3c8977ac0a..e95fceaff91d 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py
@@ -27,6 +27,7 @@ class Fan(FanBase):
     MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
     def __init__(self, fantray_index=1, psu_index=1, psu_fan=False, dependency=None):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
             self.fantrayindex = fantray_index
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
index cac17f4b83aa..6b8ce0954c96 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
@@ -26,6 +26,7 @@ class Thermal(ThermalBase):
         )
 
     def __init__(self, thermal_index):
+        ThermalBase.__init__(self)
         self.is_cpu_thermal = False
         self.index = thermal_index + 1
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
index 0e5e102b7b52..177315ef1805 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py
@@ -41,6 +41,7 @@ class Watchdog(WatchdogBase):
     CLOCK_MONOTONIC = 1
 
     def __init__(self):
+        WatchdogBase.__init__(self)
         self._librt = ctypes.CDLL('librt.so.1', use_errno=True)
         self._clock_gettime = self._librt.clock_gettime
         self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py
index 52dee31a524e..d3822307e24b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py
@@ -39,6 +39,7 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index=0):
+        ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py
index 31bda2f4cefb..e85f614a82e4 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py
@@ -27,6 +27,7 @@ class Fan(FanBase):
     MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
     def __init__(self, fantray_index=1, fan_index=1, psu_fan=False):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
             # API index is starting from 0, DellEMC platform index is starting
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py
index f76d0ac1bec6..d32cb8f7f3aa 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py
@@ -25,6 +25,7 @@ class Psu(PsuBase):
     MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
     def __init__(self, psu_index):
+        PsuBase.__init__(self)
         # PSU is 1-based in DellEMC platforms
         self.index = psu_index + 1
         self.psu_presence_reg = "psu{}_presence".format(self.index)
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py
index 942934ed7638..72e6fff1e16b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py
@@ -26,6 +26,7 @@ class Thermal(ThermalBase):
         )
 
     def __init__(self, thermal_index):
+        ThermalBase.__init__(self)
         self.is_cpu_thermal = False
         self.index = thermal_index + 1
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
index c4e2c06b135c..aa09d730b5ce 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py
@@ -36,6 +36,7 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index=0):
+        ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py
index 39307d453486..b7d990877daa 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py
@@ -43,6 +43,7 @@ class Fan(FanBase):
 
     def __init__(self, fantray_index=1, fan_index=1, psu_fan=False,
             dependency=None):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
             # API index is starting from 0, DellEMC platform index is
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
index 0ecb42685c6d..3ba9f671a9fc 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py
@@ -36,6 +36,7 @@ class Watchdog(WatchdogBase):
     CLOCK_MONOTONIC = 1
 
     def __init__(self):
+        WatchdogBase.__init__(self)
         self._librt = ctypes.CDLL('librt.so.1', use_errno=True)
         self._clock_gettime = self._librt.clock_gettime
         self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index 58c944cd6eb3..b564c1664533 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -81,6 +81,7 @@ class Component(ComponentBase):
     ]
 
     def __init__(self, component_index = 0):
+        ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
index ff7a08bdd1ad..d7bc0fdd3924 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
@@ -38,6 +38,7 @@ class Fan(FanBase):
     PSU_FRU_MAPPING = { 1: 3, 2: 4 }
 
     def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None):
+        FanBase.__init__(self)
         self.is_psu_fan = psu_fan
         if not self.is_psu_fan:
             # API index is starting from 0, DellEMC platform index is
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
index 265fab66d922..76a7584e91aa 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
@@ -36,6 +36,7 @@ class Watchdog(WatchdogBase):
     CLOCK_MONOTONIC = 1
 
     def __init__(self):
+        WatchdogBase.__init__(self)
         self._librt = ctypes.CDLL('librt.so.1', use_errno=True)
         self._clock_gettime = self._librt.clock_gettime
         self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]

From b4555b9dbd767eaf1af06c385c64ce5f6f619ee9 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:06:22 -0800
Subject: [PATCH 0237/1674] [Mellanox] Ensure concrete platform API classes
 call base class initializer (#6854)

In preparation for the merging of Azure/sonic-platform-common#173, which properly defines class and instance members in the Platform API base classes.

It is proper object-oriented methodology to call the base class initializer, even if it is only the default initializer. This also future-proofs the potential addition of custom initializers in the base classes down the road.
---
 platform/mellanox/mlnx-platform-api/sonic_platform/component.py | 1 +
 platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py   | 1 +
 platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
index e70007e96562..f2a66c6d42ee 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
@@ -323,6 +323,7 @@ def is_non_onie_firmware_update_supported(self):
 
 class Component(ComponentBase):
     def __init__(self):
+        super(Component, self).__init__()
         self.name = None
         self.description = None
         self.image_ext_name = None
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index c942b0d89d35..b4347d556854 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -373,6 +373,7 @@ def __init__(self, category, index, has_index, position, dependency = None):
         """
         index should be a string for category ambient and int for other categories
         """
+        super(Thermal, self).__init__()
         if category == THERMAL_DEV_CATEGORY_AMBIENT:
             self.name = thermal_ambient_name[index]
             self.index = index
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
index e9694f1b2a59..909ec6a8884a 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
@@ -63,6 +63,7 @@ def __init__(self, wd_device_path):
         Open a watchdog handle
         @param wd_device_path Path to watchdog device
         """
+        super(WatchdogImplBase, self).__init__()
 
         self.watchdog_path = wd_device_path
         self.watchdog = os.open(self.watchdog_path, os.O_WRONLY)

From 0d15e07d14d97ef95bf7a000c39f38afd4795e9d Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Tue, 23 Feb 2021 23:16:42 +0200
Subject: [PATCH 0238/1674] [barefoot][device][platform] Moved pcie.yaml
 (#6862)

To fix #6860

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../barefoot/x86_64-accton_as9516_32d-r0}/pcie.yaml            | 0
 .../barefoot/x86_64-accton_wedge100bf_32x-r0}/pcie.yaml        | 0
 .../barefoot/sonic-platform-modules-bfn-montara/debian/rules   | 3 ---
 .../barefoot/sonic-platform-modules-bfn-newport/debian/rules   | 3 ---
 4 files changed, 6 deletions(-)
 rename {platform/barefoot/sonic-platform-modules-bfn-newport => device/barefoot/x86_64-accton_as9516_32d-r0}/pcie.yaml (100%)
 rename {platform/barefoot/sonic-platform-modules-bfn-montara => device/barefoot/x86_64-accton_wedge100bf_32x-r0}/pcie.yaml (100%)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/pcie.yaml b/device/barefoot/x86_64-accton_as9516_32d-r0/pcie.yaml
similarity index 100%
rename from platform/barefoot/sonic-platform-modules-bfn-newport/pcie.yaml
rename to device/barefoot/x86_64-accton_as9516_32d-r0/pcie.yaml
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/pcie.yaml b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/pcie.yaml
similarity index 100%
rename from platform/barefoot/sonic-platform-modules-bfn-montara/pcie.yaml
rename to device/barefoot/x86_64-accton_wedge100bf_32x-r0/pcie.yaml
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules
index b04234a0df1b..4070b66dfdac 100755
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules
@@ -6,7 +6,6 @@ SCRIPT_SRC := $(shell pwd)/scripts
 CONFIGS_SRC := $(shell pwd)/configs
 BUILD_DIR := $(shell pwd)/build
 WHEEL_BUILD_DIR := $(BUILD_DIR)/wheel
-PLUGINS_DIR := $(shell pwd)/plugins
 
 %:
 	dh $@
@@ -24,8 +23,6 @@ override_dh_auto_install:
 	cp -r $(CONFIGS_SRC)/network/interfaces.d/* debian/$(PACKAGE_NAME)/etc/network/interfaces.d/
 	dh_installdirs -p$(PACKAGE_NAME) usr/share/sonic/device/$(PLATFORM_NAME)/
 	cp -r $(WHEEL_BUILD_DIR)/*  debian/$(PACKAGE_NAME)/usr/share/sonic/device/$(PLATFORM_NAME)/
-	dh_installdirs -p$(PACKAGE_NAME) usr/share/sonic/device/$(PLATFORM_NAME)/plugins
-	cp -r $(PLUGINS_DIR)/*  debian/$(PACKAGE_NAME)/usr/share/sonic/device/$(PLATFORM_NAME)/plugins/
 
 override_dh_usrlocal:
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules
index 962a1de8204e..da70905cb239 100755
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules
@@ -10,7 +10,6 @@ SCRIPT_SRC := $(shell pwd)/scripts
 CONFIGS_SRC := $(shell pwd)/configs
 BUILD_DIR := $(shell pwd)/build
 WHEEL_BUILD_DIR := $(BUILD_DIR)/wheel
-PLUGINS_DIR := $(shell pwd)/plugins
 MODULE_NAMES := as9516 as9516bf
 
 %:
@@ -33,8 +32,6 @@ override_dh_auto_install:
 		cp -r $(CONFIGS_SRC)/network/interfaces.d/* debian/$(PACKAGE_PRE_NAME)-$${mod}/etc/network/interfaces.d/; \
 		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} usr/share/sonic/device/x86_64-accton_$${mod}_32d-r0/; \
 		cp -r $(WHEEL_BUILD_DIR)/*  debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/share/sonic/device/x86_64-accton_$${mod}_32d-r0/; \
-		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} usr/share/sonic/device/x86_64-accton_$${mod}_32d-r0/plugins; \
-		cp -r $(PLUGINS_DIR)/*  debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/share/sonic/device/x86_64-accton_$${mod}_32d-r0/plugins/; \
 	done)
 
 override_dh_usrlocal:

From 760b3361ae2e943fc7b7ac4b9ffd1c8199076a1d Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:42:18 +0200
Subject: [PATCH 0239/1674] [barefoot][platform] Refactor legacy scripts
 (#6871)

Removed or adapted obsolete code

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../scripts/bf-fancontrol                     |  3 +
 .../scripts/bf-sfputil                        | 10 ----
 .../scripts/eeprom                            | 10 ----
 .../scripts/fancontrol                        | 11 ----
 .../scripts/ps_info                           | 10 ----
 .../scripts/sensors                           |  5 +-
 .../scripts/test                              |  1 -
 .../setup.py                                  |  3 +-
 .../sonic_platform/bfn_extensions/__init__.py |  4 ++
 .../bfn_extensions/platform_fancontrol.py     | 59 +++++++++++++++++++
 .../bfn_extensions/platform_sensors.py        | 26 ++++++++
 .../scripts                                   |  1 +
 .../scripts/bf-sfputil                        | 10 ----
 .../scripts/eeprom                            | 10 ----
 .../scripts/fancontrol                        | 11 ----
 .../scripts/ps_info                           | 10 ----
 .../scripts/sensors                           | 12 ----
 .../scripts/test                              |  1 -
 .../sonic-platform-modules-bfn/scripts        |  1 +
 .../scripts/bf-sfputil                        | 10 ----
 .../sonic-platform-modules-bfn/scripts/eeprom | 10 ----
 .../scripts/fancontrol                        | 11 ----
 .../scripts/ps_info                           | 10 ----
 .../scripts/sensors                           | 12 ----
 .../sonic-platform-modules-bfn/scripts/test   |  1 -
 25 files changed, 98 insertions(+), 154 deletions(-)
 create mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-fancontrol
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-sfputil
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/eeprom
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/fancontrol
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/ps_info
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-montara/scripts/test
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/__init__.py
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_fancontrol.py
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
 create mode 120000 platform/barefoot/sonic-platform-modules-bfn-newport/scripts
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/bf-sfputil
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/eeprom
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/fancontrol
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/ps_info
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/sensors
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn-newport/scripts/test
 create mode 120000 platform/barefoot/sonic-platform-modules-bfn/scripts
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/bf-sfputil
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/eeprom
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/fancontrol
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/ps_info
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/sensors
 delete mode 100755 platform/barefoot/sonic-platform-modules-bfn/scripts/test

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-fancontrol b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-fancontrol
new file mode 100755
index 000000000000..7407c2d7241d
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-fancontrol
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m sonic_platform.bfn_extensions.platform_fancontrol "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-sfputil b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-sfputil
deleted file mode 100755
index 3df67614e499..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/bf-sfputil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd sfputil "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/eeprom b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/eeprom
deleted file mode 100755
index 07d98556cbbf..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/eeprom
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd eeprom "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/fancontrol b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/fancontrol
deleted file mode 100755
index 515fcbdd69da..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/fancontrol
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd fancontrol "$@"
-
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/ps_info b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/ps_info
deleted file mode 100755
index 38c9d3330414..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/ps_info
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd ps_info "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/sensors b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/sensors
index 07af6955321e..5f06a9c99b05 100755
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/sensors
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/sensors
@@ -7,6 +7,5 @@ if [ -t 1 ] ; then
     DOCKER_EXEC_FLAGS+="t"
 fi
 
-docker exec -$DOCKER_EXEC_FLAGS syncd sensors "$@"
-
-
+python3 -m sonic_platform.bfn_extensions.platform_sensors "$@"
+docker exec -$DOCKER_EXEC_FLAGS pmon sensors "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/test b/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/test
deleted file mode 100755
index 38327722c91f..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/scripts/test
+++ /dev/null
@@ -1 +0,0 @@
-echo "test"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/setup.py b/platform/barefoot/sonic-platform-modules-bfn-montara/setup.py
index fc14c94ac4a0..14e1bb6b6c02 100755
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/setup.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/setup.py
@@ -12,7 +12,8 @@
     maintainer_email='',
     packages=[
         'sonic_platform',
-        'sonic_platform/pltfm_mgr_rpc'
+        'sonic_platform/pltfm_mgr_rpc',
+        'sonic_platform/bfn_extensions',
     ],
     package_data = {'sonic_platform':['logging.conf']},
     classifiers=[
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/__init__.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/__init__.py
new file mode 100644
index 000000000000..67517a64e886
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/__init__.py
@@ -0,0 +1,4 @@
+__all__ = [
+    'platform_sensors',
+    'platform_fancontrol',
+]
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_fancontrol.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_fancontrol.py
new file mode 100644
index 000000000000..43a700c21dcb
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_fancontrol.py
@@ -0,0 +1,59 @@
+import sys
+
+from sonic_platform.platform_thrift_client import thrift_try
+
+_MAX_FAN = 10
+
+def fan_speed_set(fan, percent):
+    def set_fan_speed(client):
+        return client.pltfm_mgr.pltfm_mgr_fan_speed_set(fan, percent)
+    return thrift_try(set_fan_speed)
+
+def fan_speed_info_get():
+    for fan_num in range(1, _MAX_FAN + 1):
+        def get_data(client, fan_num=fan_num):
+            return client.pltfm_mgr.pltfm_mgr_fan_info_get(fan_num)
+        fan_info = thrift_try(get_data)
+        if fan_info.fan_num == fan_num:
+            yield fan_info
+
+if __name__ == '__main__':
+    def print_usage():
+        print("Usage: platform_fancontrol.py <function> <param list>  ", file=sys.stderr)
+        print("           function: fan_speed_set <fan #> <percent>   ", file=sys.stderr)
+        print("                     fan_speed_info_get                ", file=sys.stderr)
+
+    argc = len(sys.argv)
+    if argc == 1:
+      print_usage()
+      exit(0)
+
+    if sys.argv[1] == "fan_speed_set":
+      if argc != 4:
+        print_usage()
+        exit(0)
+
+      fan = int(sys.argv[2])
+      percent = int(sys.argv[3])
+
+      if (fan > _MAX_FAN) | (fan < 0):
+        print("Invalid value for fan #.\n", file=sys.stderr)
+        print_usage()
+        exit(0)
+
+      if (percent > 100) | (percent < 0):
+        print("Invalid value for precent\n", file=sys.stderr)
+        print_usage()
+        exit(0)
+
+      fan_speed_set(fan, percent)
+      exit(0)
+
+    if sys.argv[1] == "fan_speed_info_get":
+      for fan_info in fan_speed_info_get():
+        print("fan number: %d front rpm: %d rear rpm: %d percent: %d%% " %
+            (fan_info.fan_num, fan_info.front_rpm, fan_info.rear_rpm, fan_info.percent))
+
+      exit(0)
+
+    print_usage()
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
new file mode 100644
index 000000000000..330884ca733b
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
@@ -0,0 +1,26 @@
+import sys
+import codecs
+import urllib
+
+from sonic_platform.platform_thrift_client import thrift_try
+
+def platform_sensors_get(args):
+    options = ""
+    if len(args)!=0:
+        options = urllib.quote(" ".join(args))
+    def get_data(client):
+        return client.pltfm_mgr.pltfm_mgr_sensor_info_get(options)
+    raw_out = thrift_try(get_data)
+    raw_list = raw_out.split('\"')
+    if len(raw_list) >= 2:
+        sensors_out = raw_list[1]
+        sensors_out = codecs.decode(sensors_out, "unicode_escape")
+        return sensors_out
+    return None
+
+if __name__ == '__main__':
+    data = platform_sensors_get(sys.argv[1:])
+    if data:
+        print(data)
+    else:
+        print("No sensors info available", file=sys.stderr)
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts
new file mode 120000
index 000000000000..14008f061862
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts
@@ -0,0 +1 @@
+../sonic-platform-modules-bfn-montara/scripts
\ No newline at end of file
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/bf-sfputil b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/bf-sfputil
deleted file mode 100755
index 3df67614e499..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/bf-sfputil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd sfputil "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/eeprom b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/eeprom
deleted file mode 100755
index 07d98556cbbf..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/eeprom
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd eeprom "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/fancontrol b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/fancontrol
deleted file mode 100755
index 515fcbdd69da..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/fancontrol
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd fancontrol "$@"
-
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/ps_info b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/ps_info
deleted file mode 100755
index 38c9d3330414..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/ps_info
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd ps_info "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/sensors b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/sensors
deleted file mode 100755
index 07af6955321e..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/sensors
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd sensors "$@"
-
-
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/test b/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/test
deleted file mode 100755
index 38327722c91f..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/scripts/test
+++ /dev/null
@@ -1 +0,0 @@
-echo "test"
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts b/platform/barefoot/sonic-platform-modules-bfn/scripts
new file mode 120000
index 000000000000..14008f061862
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn/scripts
@@ -0,0 +1 @@
+../sonic-platform-modules-bfn-montara/scripts
\ No newline at end of file
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/bf-sfputil b/platform/barefoot/sonic-platform-modules-bfn/scripts/bf-sfputil
deleted file mode 100755
index 3df67614e499..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/bf-sfputil
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd sfputil "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/eeprom b/platform/barefoot/sonic-platform-modules-bfn/scripts/eeprom
deleted file mode 100755
index 07d98556cbbf..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/eeprom
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd eeprom "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/fancontrol b/platform/barefoot/sonic-platform-modules-bfn/scripts/fancontrol
deleted file mode 100755
index 515fcbdd69da..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/fancontrol
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd fancontrol "$@"
-
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/ps_info b/platform/barefoot/sonic-platform-modules-bfn/scripts/ps_info
deleted file mode 100755
index 38c9d3330414..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/ps_info
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd ps_info "$@"
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/sensors b/platform/barefoot/sonic-platform-modules-bfn/scripts/sensors
deleted file mode 100755
index 07af6955321e..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/sensors
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS syncd sensors "$@"
-
-
diff --git a/platform/barefoot/sonic-platform-modules-bfn/scripts/test b/platform/barefoot/sonic-platform-modules-bfn/scripts/test
deleted file mode 100755
index 38327722c91f..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn/scripts/test
+++ /dev/null
@@ -1 +0,0 @@
-echo "test"

From e4b62880f606e2a3b4d636d8ac8ee6ad3bcac758 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 24 Feb 2021 20:34:12 +0200
Subject: [PATCH 0240/1674] Add new SKU of Mellanox-SN2700-D40C8S8 (#6876)

#### Why I did it

Add new SKU for SN2700 Mellanox system that supports the following port configuration:
8 X 100G
40 X 50G
8 X 10G

#### How I did it

Add new Folder - "Mellanox-SN2700-D40C8S8" under /sonic-buildimage/device/mellanox/x86_64-mlnx_msn2700-r0/
that contains the relevant files supporting this SKU

the buffers are based on SKU: D48C8 . Later on it will be configured specific for this SKU

#### How to verify it

Bring up the image, run "show interface status" and make sure that all ports are up and reflect the following requirement:
Port 1/3 will be used as 4x10G
Port 2/4 - Not exist (blocked since 1 and 3 split to 4)
Port 7/8/9/10/23/24/25/26 will used as 100G
All other ports will be used as 2x50G

#### Which release branch to backport (provide reason below if selected)

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [X] 202012

#### Description for the changelog

Support new SKU under the name of SN2700-D40C8S8
---
 .../Mellanox-SN2700-D40C8S8/buffers.json.j2   |   1 +
 .../buffers_defaults_t0.j2                    | 102 +++++++
 .../buffers_defaults_t1.j2                    | 102 +++++++
 .../pg_profile_lookup.ini                     |  17 ++
 .../Mellanox-SN2700-D40C8S8/port_config.ini   |  57 ++++
 .../Mellanox-SN2700-D40C8S8/qos.json.j2       |   1 +
 .../Mellanox-SN2700-D40C8S8/sai.profile       |   1 +
 .../sai_2700_8x100g_40x50g_8x10g.xml          | 269 ++++++++++++++++++
 8 files changed, 550 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/port_config.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers.json.j2
new file mode 120000
index 000000000000..30c4e1d5bfdd
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers.json.j2
@@ -0,0 +1 @@
+../ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..c2bdb607d5a7
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
@@ -0,0 +1,102 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '7719936' %}
+{% set ingress_lossless_pool_xoff =  '1032192' %}
+{% set egress_lossless_pool_size =  '13945824' %}
+{% set egress_lossy_pool_size =  '7719936' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..6f444b61df43
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
@@ -0,0 +1,102 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '9686016' %}
+{% set ingress_lossless_pool_xoff =  '1179648' %}
+{% set egress_lossless_pool_size =  '13945824' %}
+{% set egress_lossy_pool_size =  '9686016' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/pg_profile_lookup.ini
new file mode 100644
index 000000000000..cdd674e4e715
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+#  PG lossless profiles.
+# speed cable  size   xon    xoff  threshold
+  10000    5m 19456  19456  22528          0
+  25000    5m 19456  19456  22528          0
+  40000    5m 19456  19456  22528          0
+  50000    5m 19456  19456  22528          0
+ 100000    5m 19456  19456  23552          0
+  10000   40m 19456  19456  22528          0
+  25000   40m 19456  19456  24576          0
+  40000   40m 19456  19456  25600          0
+  50000   40m 19456  19456  25600          0
+ 100000   40m 19456  19456  29696          0
+  10000  300m 19456  19456  27648          0
+  25000  300m 19456  19456  36864          0
+  40000  300m 19456  19456  45056          0
+  50000  300m 19456  19456  50176          0
+ 100000  300m 19456  19456  78848          0
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/port_config.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/port_config.ini
new file mode 100644
index 000000000000..b4072ceb32a1
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/port_config.ini
@@ -0,0 +1,57 @@
+# name          lanes                alias       index     speed
+Ethernet0       0                    etp1a       1         10000
+Ethernet1       1                    etp1b       1         10000
+Ethernet2       2                    etp1c       1         10000
+Ethernet3       3                    etp1d       1         10000
+Ethernet8       8                    etp3a       3         10000
+Ethernet9       9                    etp3b       3         10000
+Ethernet10      10                   etp3c       3         10000
+Ethernet11      11                   etp3d       3         10000
+Ethernet16      16,17                etp5a       5         50000
+Ethernet18      18,19                etp5b       5         50000
+Ethernet20      20,21                etp6a       6         50000
+Ethernet22      22,23                etp6b       6         50000
+Ethernet24      24,25,26,27          etp7        7         100000
+Ethernet28      28,29,30,31          etp8        8         100000
+Ethernet32      32,33,34,35          etp9        9         100000
+Ethernet36      36,37,38,39          etp10       10        100000
+Ethernet40      40,41                etp11a      11        50000
+Ethernet42      42,43                etp11b      11        50000
+Ethernet44      44,45                etp12a      12        50000
+Ethernet46      46,47                etp12b      12        50000
+Ethernet48      48,49                etp13a      13        50000
+Ethernet50      50,51                etp13b      13        50000
+Ethernet52      52,53                etp14a      14        50000
+Ethernet54      54,55                etp14b      14        50000
+Ethernet56      56,57                etp15a      15        50000
+Ethernet58      58,59                etp15b      15        50000
+Ethernet60      60,61                etp16a      16        50000
+Ethernet62      62,63                etp16b      16        50000
+Ethernet64      64,65                etp17a      17        50000
+Ethernet66      66,67                etp17b      17        50000
+Ethernet68      68,69                etp18a      18        50000
+Ethernet70      70,71                etp18b      18        50000
+Ethernet72      72,73                etp19a      19        50000
+Ethernet74      74,75                etp19b      19        50000
+Ethernet76      76,77                etp20a      20        50000
+Ethernet78      78,79                etp20b      20        50000
+Ethernet80      80,81                etp21a      21        50000
+Ethernet82      82,83                etp21b      21        50000
+Ethernet84      84,85                etp22a      22        50000
+Ethernet86      86,87                etp22b      22        50000
+Ethernet88      88,89,90,91          etp23       23        100000
+Ethernet92      92,93,94,95          etp24       24        100000
+Ethernet96      96,97,98,99          etp25       25        100000
+Ethernet100     100,101,102,103      etp26       26        100000
+Ethernet104     104,105              etp27a      27        50000
+Ethernet106     106,107              etp27b      27        50000
+Ethernet108     108,109              etp28a      28        50000
+Ethernet110     110,111              etp28b      28        50000
+Ethernet112     112,113              etp29a      29        50000
+Ethernet114     114,115              etp29b      29        50000
+Ethernet116     116,117              etp30a      30        50000
+Ethernet118     118,119              etp30b      30        50000
+Ethernet120     120,121              etp31a      31        50000
+Ethernet122     122,123              etp31b      31        50000
+Ethernet124     124,125              etp32a      32        50000
+Ethernet126     126,127              etp32b      32        50000
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
new file mode 100644
index 000000000000..a98e620cfa10
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml
new file mode 100644
index 000000000000..0376eb548d26
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0"?>
+<root>
+    <platform_info type="2700">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>32</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>16</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>3221225472</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <split>4</split>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <split>4</split>
+                <width>4</width>
+                <module>0</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From fac295a02364aa24734be60425603df1aac8b74b Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Thu, 25 Feb 2021 09:30:43 +0200
Subject: [PATCH 0241/1674] [Mellanox] Add support for SN4600 system (#6879)

- Why I did it
Add support for new 64x200G SN4600 systems

- How I did it
Add all relevant files (w/o platform.json and hwsku.json as they will come later) with default SKU.

- How to verify it
Install image on switch, verify all ports are up and configured properly, run full platform SONiC tests.
---
 .../x86_64-mlnx_msn2700-r0/plugins/sfputil.py |   6 +-
 .../ACS-MSN4600/buffers.json.j2               |   1 +
 .../ACS-MSN4600/buffers_defaults_t0.j2        |   1 +
 .../ACS-MSN4600/buffers_defaults_t1.j2        |   1 +
 .../ACS-MSN4600/buffers_dynamic.json.j2       |   1 +
 .../ACS-MSN4600/pg_profile_lookup.ini         |   1 +
 .../ACS-MSN4600/port_config.ini               |  65 +++
 .../ACS-MSN4600/qos.json.j2                   |   1 +
 .../ACS-MSN4600/sai.profile                   |   1 +
 .../ACS-MSN4600/sai_4600.xml                  | 471 ++++++++++++++++++
 .../x86_64-mlnx_msn4600-r0/default_sku        |   1 +
 .../mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml | 419 ++++++++++++++++
 .../platform_components.json                  |  14 +
 .../x86_64-mlnx_msn4600-r0/platform_reboot    |   1 +
 .../x86_64-mlnx_msn4600-r0/platform_wait      |   1 +
 .../x86_64-mlnx_msn4600-r0/plugins/eeprom.py  |   1 +
 .../x86_64-mlnx_msn4600-r0/plugins/psuutil.py |   1 +
 .../plugins/sfplpmget.py                      |   1 +
 .../plugins/sfplpmset.py                      |   1 +
 .../plugins/sfpreset.py                       |   1 +
 .../x86_64-mlnx_msn4600-r0/plugins/sfputil.py |   1 +
 .../pmon_daemon_control.json                  |   1 +
 .../x86_64-mlnx_msn4600-r0/sensors.conf       | 189 +++++++
 .../system_health_monitoring_config.json      |   1 +
 .../thermal_policy.json                       |   1 +
 platform/mellanox/asic_table.j2               |   1 +
 .../sonic_platform/chassis.py                 |   6 +-
 .../sonic_platform/device_data.py             |  23 +-
 .../mlnx-platform-api/sonic_platform/psu.py   |   4 +-
 .../sonic_platform/thermal.py                 |  46 +-
 30 files changed, 1245 insertions(+), 18 deletions(-)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t0.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai_4600.xml
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/default_sku
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/platform_components.json
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/platform_wait
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/eeprom.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/psuutil.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmget.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmset.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfpreset.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfputil.py
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/system_health_monitoring_config.json
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/thermal_policy.json

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
index df60c5256f2a..64618a0e5a21 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -41,8 +41,10 @@
 
 # magic code defnition for port number, qsfp port position of each platform
 # port_position_tuple = (PORT_START, QSFP_PORT_START, PORT_END, PORT_IN_BLOCK, EEPROM_OFFSET)
-platform_dict = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 3,
-                 'x86_64-mlnx_msn3420-r0': 5, 'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4, 'x86_64-mlnx_msn4600c': 4, 'x86_64-mlnx_msn4700-r0': 0}
+platform_dict = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn2100-r0': 1,
+                 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn3420-r0': 5,
+                 'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4,
+                 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c': 4, 'x86_64-mlnx_msn4700-r0': 0}
 port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1),
                             (0, 18, 21, 22, 1), (0, 0, 63, 64, 1), (0, 48, 59, 60, 1)]
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers.json.j2
new file mode 120000
index 000000000000..f46e9600153b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..ddb883a1daa4
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..f8bbb6e631e7
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/pg_profile_lookup.ini
new file mode 120000
index 000000000000..88e51ceae044
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
new file mode 100644
index 000000000000..a1ecf9aa3266
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
@@ -0,0 +1,65 @@
+# name          lanes               alias     index
+Ethernet0       0,1,2,3             etp1      1
+Ethernet8       8,9,10,11           etp2      2
+Ethernet16      16,17,18,19         etp3      3
+Ethernet24      24,25,26,27         etp4      4
+Ethernet32      32,33,34,35         etp5      5
+Ethernet40      40,41,42,43         etp6      6
+Ethernet48      48,49,50,51         etp7      7
+Ethernet56      56,57,58,59         etp8      8
+Ethernet64      64,65,66,67         etp9      9
+Ethernet72      72,73,74,75         etp10     10
+Ethernet80      80,81,82,83         etp11     11
+Ethernet88      88,89,90,91         etp12     12
+Ethernet96      96,97,98,99         etp13     13
+Ethernet104     104,105,106,107     etp14     14
+Ethernet112     112,113,114,115     etp15     15
+Ethernet120     120,121,122,123     etp16     16
+Ethernet128     128,129,130,131     etp17     17
+Ethernet136     136,137,138,139     etp18     18
+Ethernet144     144,145,146,147     etp19     19
+Ethernet152     152,153,154,155     etp20     20
+Ethernet160     160,161,162,163     etp21     21
+Ethernet168     168,169,170,171     etp22     22
+Ethernet176     176,177,178,179     etp23     23
+Ethernet184     184,185,186,187     etp24     24
+Ethernet192     192,193,194,195     etp25     25
+Ethernet200     200,201,202,203     etp26     26
+Ethernet208     208,209,210,211     etp27     27
+Ethernet216     216,217,218,219     etp28     28
+Ethernet224     224,225,226,227     etp29     29
+Ethernet232     232,233,234,235     etp30     30
+Ethernet240     240,241,242,243     etp31     31
+Ethernet248     248,249,250,251     etp32     32
+Ethernet256     256,257,258,259     etp33     33
+Ethernet264     264,265,266,267     etp34     34
+Ethernet272     272,273,274,275     etp35     35
+Ethernet280     280,281,282,283     etp36     36
+Ethernet288     288,289,290,291     etp37     37
+Ethernet296     296,297,298,299     etp38     38
+Ethernet304     304,305,306,307     etp39     39
+Ethernet312     312,313,314,315     etp40     40
+Ethernet320     320,321,322,323     etp41     41
+Ethernet328     328,329,330,331     etp42     42
+Ethernet336     336,337,338,339     etp43     43
+Ethernet344     344,345,346,347     etp44     44
+Ethernet352     352,353,354,355     etp45     45
+Ethernet360     360,361,362,363     etp46     46
+Ethernet368     368,369,370,371     etp47     47
+Ethernet376     376,377,378,379     etp48     48
+Ethernet384     384,385,386,387     etp49     49
+Ethernet392     392,393,394,395     etp50     50
+Ethernet400     400,401,402,403     etp51     51
+Ethernet408     408,409,410,411     etp52     52
+Ethernet416     416,417,418,419     etp53     53
+Ethernet424     424,425,426,427     etp54     54
+Ethernet432     432,433,434,435     etp55     55
+Ethernet440     440,441,442,443     etp56     56
+Ethernet448     448,449,450,451     etp57     57
+Ethernet456     456,457,458,459     etp58     58
+Ethernet464     464,465,466,467     etp59     59
+Ethernet472     472,473,474,475     etp60     60
+Ethernet480     480,481,482,483     etp61     61
+Ethernet488     488,489,490,491     etp62     62
+Ethernet496     496,497,498,499     etp63     63
+Ethernet504     504,505,506,507     etp64     64
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/qos.json.j2
new file mode 120000
index 000000000000..8633303ece77
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4700-r0/ACS-MSN4700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
new file mode 100644
index 000000000000..8d18361c1620
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600.xml
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai_4600.xml b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai_4600.xml
new file mode 100644
index 000000000000..96e09ce694f5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai_4600.xml
@@ -0,0 +1,471 @@
+<?xml version="1.0"?>
+<root>
+    <platform_info type="4600">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:80</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+	
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>64</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>105</local-port>
+                <width>4</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>107</local-port>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>111</local-port>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>99</local-port>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>103</local-port>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>123</local-port>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>127</local-port>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>115</local-port>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>119</local-port>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>91</local-port>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>95</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>83</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>87</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>75</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>79</local-port>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>67</local-port>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>71</local-port>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>32</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <width>4</width>
+                <module>33</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>1</local-port>
+                <width>4</width>
+                <module>34</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <width>4</width>
+                <module>35</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>36</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>37</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>38</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <width>4</width>
+                <module>39</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>4</width>
+                <module>40</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <width>4</width>
+                <module>41</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>42</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <width>4</width>
+                <module>43</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>4</width>
+                <module>44</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <width>4</width>
+                <module>45</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>46</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <width>4</width>
+                <module>47</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>4</width>
+                <module>48</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <width>4</width>
+                <module>49</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>4</width>
+                <module>50</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <width>4</width>
+                <module>51</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>4</width>
+                <module>52</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <width>4</width>
+                <module>53</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>4</width>
+                <module>54</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <width>4</width>
+                <module>55</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>4</width>
+                <module>56</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <width>4</width>
+                <module>57</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>4</width>
+                <module>58</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <width>4</width>
+                <module>59</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>4</width>
+                <module>60</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <width>4</width>
+                <module>61</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>4</width>
+                <module>62</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <width>4</width>
+                <module>63</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>4096</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>
+
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/default_sku b/device/mellanox/x86_64-mlnx_msn4600-r0/default_sku
new file mode 100644
index 000000000000..08921eaa2578
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/default_sku
@@ -0,0 +1 @@
+ACS-MSN4600 t1
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
new file mode 100644
index 000000000000..dcfdf1c9a59c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
@@ -0,0 +1,419 @@
+- bus: '00'
+  dev: '00'
+  fn: '0'
+  id: 6f00
+  name: 'Host bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+    (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 6f02
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '1'
+  id: 6f03
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '0'
+  id: 6f04
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '2'
+  id: 6f06
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: '03'
+  fn: '2'
+  id: 6f0a
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '0'
+  id: 6f28
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Map/VTd_Misc/System Management (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '1'
+  id: 6f29
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO Hot Plug (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '2'
+  id: 6f2a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO RAS/Control Status/Global Errors (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '4'
+  id: 6f2c
+  name: 'PIC: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC (rev
+    03)'
+- bus: '00'
+  dev: '14'
+  fn: '0'
+  id: 8c31
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    xHCI (rev 05)'
+- bus: '00'
+  dev: 1c
+  fn: '0'
+  id: 8c10
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #1 (rev d5)'
+- bus: '00'
+  dev: 1c
+  fn: '7'
+  id: 8c1e
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #8 (rev d5)'
+- bus: '00'
+  dev: 1d
+  fn: '0'
+  id: 8c26
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #1 (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '0'
+  id: 8c54
+  name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
+    SKU LPC Controller (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '3'
+  id: 8c22
+  name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
+    (rev 05)'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: 6f50
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 0'
+- bus: '03'
+  dev: '00'
+  fn: '1'
+  id: 6f51
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 1'
+- bus: '03'
+  dev: '00'
+  fn: '2'
+  id: 6f52
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 2'
+- bus: '03'
+  dev: '00'
+  fn: '3'
+  id: 6f53
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 3'
+- bus: '06'
+  dev: '00'
+  fn: '0'
+  id: cf70
+  name: 'Ethernet controller: Mellanox Technologies Device cf70'
+- bus: 08
+  dev: '00'
+  fn: '0'
+  id: '1533'
+  name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev
+    03)'
+- bus: ff
+  dev: 0b
+  fn: '0'
+  id: 6f81
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '1'
+  id: 6f36
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '2'
+  id: 6f37
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: 6f76
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link Debug (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '0'
+  id: 6fe0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '1'
+  id: 6fe1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '2'
+  id: 6fe2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '3'
+  id: 6fe3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '0'
+  id: 6ff8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '4'
+  id: 6ffc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '5'
+  id: 6ffd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '6'
+  id: 6ffe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '0'
+  id: 6f1d
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '1'
+  id: 6f34
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '5'
+  id: 6f1e
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '6'
+  id: 6f7d
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '7'
+  id: 6f1f
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '0'
+  id: 6fa0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '1'
+  id: 6f30
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '0'
+  id: 6fa8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '1'
+  id: 6f71
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '2'
+  id: 6faa
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '3'
+  id: 6fab
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '4'
+  id: 6fac
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '5'
+  id: 6fad
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '6'
+  id: 6fae
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Broadcast (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '7'
+  id: 6faf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Global Broadcast (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '0'
+  id: 6fb0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '1'
+  id: 6fb1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '2'
+  id: 6fb2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '3'
+  id: 6fb3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '4'
+  id: 6fbc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '5'
+  id: 6fbd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '6'
+  id: 6fbe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '7'
+  id: 6fbf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '0'
+  id: 6fb4
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '1'
+  id: 6fb5
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '2'
+  id: 6fb6
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Error (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '3'
+  id: 6fb7
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Error (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '0'
+  id: 6f98
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '1'
+  id: 6f99
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '2'
+  id: 6f9a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '3'
+  id: 6fc0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '4'
+  id: 6f9c
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '0'
+  id: 6f88
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '2'
+  id: 6f8a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_components.json
new file mode 100644
index 000000000000..35ebe3943dac
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_components.json
@@ -0,0 +1,14 @@
+{
+    "chassis": {
+        "MSN4600": {
+            "component": {
+                "ONIE": { },
+                "SSD": { },
+                "BIOS": { },
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
+            }
+        }
+    }
+}
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot
new file mode 120000
index 000000000000..43c8ea567493
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot
@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_reboot
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform_wait b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_wait
new file mode 120000
index 000000000000..4b30bd429854
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_wait
@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_wait
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/eeprom.py
new file mode 120000
index 000000000000..b4e2a6a61671
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/eeprom.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/eeprom.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/psuutil.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/psuutil.py
new file mode 120000
index 000000000000..9f724238a8d5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/psuutil.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/psuutil.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmget.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmget.py
new file mode 120000
index 000000000000..2e84f435abd9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmget.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/sfplpmget.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmset.py
new file mode 120000
index 000000000000..6a88bac30467
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfplpmset.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfpreset.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfpreset.py
new file mode 120000
index 000000000000..fef2063e3496
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfpreset.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/sfpreset.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfputil.py
new file mode 120000
index 000000000000..45909b880fc9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/plugins/sfputil.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/sfputil.py
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json
new file mode 120000
index 000000000000..435a2ce7c0ba
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf
new file mode 100644
index 000000000000..da05cd94bf9f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf
@@ -0,0 +1,189 @@
+################################################################################
+# Copyright (c) 2021 Mellanox Technologies
+#
+# Platform specific sensors config for SN4600
+################################################################################
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "xdpe12284-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        ignore in2
+        label in3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail (out)"
+        ignore in4
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Pwr (in)"
+        ignore power2
+        label power3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Pwr (out)"
+        ignore power4
+        label curr1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Curr (in)"
+        ignore curr2
+        label curr3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (out)"
+        ignore curr4
+    chip "xdpe12284-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-2 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-2 ASIC 1.8V Rail_1 (out)"
+        label in4 "PMIC-2 ASIC 1.2V Rail_2 (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-2 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-2 ASIC 1.8V Rail_1 Pwr (out)"
+        label power4 "PMIC-2 ASIC 1.2V Rail_2 Pwr (out)"
+        label curr1 "PMIC-2 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-2 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-2 ASIC 1.8V Rail_1 Curr (out)"
+        label curr4 "PMIC-2 ASIC 1.2V Rail_2 Curr (out)"
+    chip "xdpe12284-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-3 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 (out)"
+        label in4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label temp2 "PMIC-3 Temp 2"
+        label power1 "PMIC-3 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-3 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Pwr (out)"
+        label power4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Pwr (out)"
+        label curr1 "PMIC-3 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-3 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Curr (out)"
+        label curr4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Curr (out)"
+    chip "xdpe12284-i2c-*-68"
+        label in1 "PMIC-4 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-4 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 (out)"
+        label in4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-4 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Pwr (out)"
+        label power4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Pwr (out)"
+        label curr1 "PMIC-4 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-4 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Curr (out)"
+        label curr4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Curr (out)"
+    chip "xdpe12284-i2c-*-6a"
+        label in1 "PMIC-5 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-5 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 (out)"
+        label in4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 (out)"
+        label temp1 "PMIC-5 Temp 1"
+        label temp2 "PMIC-5 Temp 2"
+        label power1 "PMIC-5 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-5 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Pwr (out)"
+        label power4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Pwr (out)"
+        label curr1 "PMIC-5 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-5 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Curr (out)"
+        label curr4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Curr (out)"
+    chip "xdpe12284-i2c-*-6c"
+        label in1 "PMIC-6 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-6 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 (out)"
+        label in4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 (out)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-6 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Pwr (out)"
+        label power4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Pwr (out)"
+        label curr1 "PMIC-6 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-6 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Curr (out)"
+        label curr4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Curr (out)"
+    chip "xdpe12284-i2c-*-6e"
+        label in1 "PMIC-7 PSU 12V Rail_1 (in)"
+        label in2 "PMIC-7 PSU 12V Rail_2 (in)"
+        label in3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 (out)"
+        label in4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 (out)"
+        label temp1 "PMIC-7 Temp 1"
+        label temp2 "PMIC-7 Temp 2"
+        label power1 "PMIC-7 ASIC 12V Rail_1 Pwr (in)"
+        label power2 "PMIC-7 ASIC 12V Rail_2 Pwr (in)"
+        label power3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Pwr (out)"
+        label power4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Pwr (out)"
+        label curr1 "PMIC-7 ASIC 12V Rail_1 Curr (in)"
+        label curr2 "PMIC-7 ASIC 12V Rail_2 Curr (in)"
+        label curr3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Curr (out)"
+        label curr4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-8 PSU 12V Rail (in1)"
+        label in2 "PMIC-8 PSU 12V Rail (in2)"
+        label in3 "PMIC-8 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-8 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-8 Temp 1"
+        label temp2 "PMIC-8 Temp 2"
+        label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-9 PSU 12V Rail (in1)"
+        label in2 "PMIC-9 PSU 12V Rail (in2)"
+        label in3 "PMIC-9 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-9 Temp 1"
+        label temp2 "PMIC-9 Temp 2"
+        label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/system_health_monitoring_config.json b/device/mellanox/x86_64-mlnx_msn4600-r0/system_health_monitoring_config.json
new file mode 120000
index 000000000000..98df66c27ca5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/system_health_monitoring_config.json
@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/system_health_monitoring_config.json
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/thermal_policy.json b/device/mellanox/x86_64-mlnx_msn4600-r0/thermal_policy.json
new file mode 120000
index 000000000000..5a25cd87f70c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json
\ No newline at end of file
diff --git a/platform/mellanox/asic_table.j2 b/platform/mellanox/asic_table.j2
index 4afc780b0b06..4e41a416b6e0 100644
--- a/platform/mellanox/asic_table.j2
+++ b/platform/mellanox/asic_table.j2
@@ -21,6 +21,7 @@
         'x86_64-mlnx_msn4700_simx-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4700-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4600c-r0':'MELLANOX-SPECTRUM-3',
+        'x86_64-mlnx_msn4600-r0':'MELLANOX-SPECTRUM-3',
         'vs-platform':'vs'
     }
 %}
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index b5ca79286d1f..585a664efce1 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -45,7 +45,11 @@
 
 # magic code defnition for port number, qsfp port position of each Platform
 # port_position_tuple = (PORT_START, QSFP_PORT_START, PORT_END, PORT_IN_BLOCK, EEPROM_OFFSET)
-platform_dict_port = {'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_lssn2700':0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn3420-r0':5, 'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4, 'x86_64-mlnx_msn4600c-r0':4, 'x86_64-mlnx_msn4700-r0': 0, 'x86_64-mlnx_msn4410-r0': 0}
+platform_dict_port = {'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2,
+                      'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_lssn2700': 0, 'x86_64-mlnx_msn2740-r0': 0,
+                      'x86_64-mlnx_msn3420-r0': 5, 'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0,
+                      'x86_64-mlnx_msn3800-r0': 4, 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c-r0': 4,
+                      'x86_64-mlnx_msn4700-r0': 0, 'x86_64-mlnx_msn4410-r0': 0}
 port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1), (0, 18, 21, 22, 1), (0, 0, 63, 64, 1), (0, 48, 59, 60, 1)]
 
 class Chassis(ChassisBase):
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
index 3853cac3f713..a52886a9de51 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
@@ -250,5 +250,26 @@
             'hot_swappable': True,
             'led_num': 1
         }
+    },
+    'x86_64-mlnx_msn4600-r0': {
+        'thermal': {
+            'minimum_table': {
+                "unk_trust": {"-127:40": 12, "41:120": 13},
+                "unk_untrust": {"-127:5": 12, "6:20": 13, "21:30": 14, "31:35": 15, "36:40": 16, "41:120": 17},
+            }
+        },
+        'fans': {
+            'drawer_num': 3,
+            'drawer_type': 'real',
+            'fan_num_per_drawer': 1,
+            'support_fan_direction': True,
+            'hot_swappable': True
+        },
+        'psus': {
+            'psu_num': 2,
+            'fan_num_per_psu': 1,
+            'hot_swappable': True,
+            'led_num': 1
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
index 7b73b7196ce2..cb05278d5b66 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
@@ -31,7 +31,9 @@
 # in most platforms the file psuX_curr, psuX_volt and psuX_power contain current, voltage and power data respectively. 
 # but there are exceptions which will be handled by the following dictionary
 
-platform_dict_psu = {'x86_64-mlnx_msn3420-r0':1, 'x86_64-mlnx_msn3700-r0': 1, 'x86_64-mlnx_msn3700c-r0': 1, 'x86_64-mlnx_msn3800-r0': 1, 'x86_64-mlnx_msn4600c-r0':1, 'x86_64-mlnx_msn4700-r0': 1, 'x86_64-mlnx_msn4410-r0': 1}
+platform_dict_psu = {'x86_64-mlnx_msn3420-r0': 1, 'x86_64-mlnx_msn3700-r0': 1, 'x86_64-mlnx_msn3700c-r0': 1,
+                     'x86_64-mlnx_msn3800-r0': 1, 'x86_64-mlnx_msn4600-r0': 1, 'x86_64-mlnx_msn4600c-r0': 1,
+                     'x86_64-mlnx_msn4700-r0': 1, 'x86_64-mlnx_msn4410-r0': 1}
 
 psu_profile_list = [
     # default filename convention
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index b4347d556854..b0ddf13f7bb5 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -128,9 +128,13 @@
     THERMAL_API_GET_HIGH_THRESHOLD
 ]
 
-platform_dict_thermal = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_lssn2700-r0':0, 'x86_64-mlnx_msn2740-r0': 3, 'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 4, 'x86_64-mlnx_msn3420-r0':9, 'x86_64-mlnx_msn3700-r0': 5, 'x86_64-mlnx_msn3700c-r0': 6, 'x86_64-mlnx_msn3800-r0': 7, 'x86_64-mlnx_msn4600c-r0':9, 'x86_64-mlnx_msn4700-r0': 8, 'x86_64-mlnx_msn4410-r0': 8}
+platform_dict_thermal = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_lssn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 3,
+                         'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 4,
+                         'x86_64-mlnx_msn3420-r0': 9, 'x86_64-mlnx_msn3700-r0': 5, 'x86_64-mlnx_msn3700c-r0': 6,
+                         'x86_64-mlnx_msn3800-r0': 7, 'x86_64-mlnx_msn4600-r0': 12, 'x86_64-mlnx_msn4600c-r0': 9,
+                         'x86_64-mlnx_msn4700-r0': 8, 'x86_64-mlnx_msn4410-r0': 8}
 thermal_profile_list = [
-    # 2700
+    # 0 2700
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 2),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -145,7 +149,7 @@
             ]
         )
     },
-    # 2100
+    # 1 2100
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 16),
@@ -160,7 +164,7 @@
             ]
         )
     },
-    # 2410
+    # 2 2410
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 2),
         THERMAL_DEV_CATEGORY_MODULE:(1, 56),
@@ -175,7 +179,7 @@
             ]
         )
     },
-    # 2740
+    # 3 2740
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -190,7 +194,7 @@
             ]
         )
     },
-    # 2010
+    # 4 2010
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 22),
@@ -205,7 +209,7 @@
             ]
         )
     },
-    # 3700
+    # 5 3700
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -221,7 +225,7 @@
             ]
         )
     },
-    # 3700c
+    # 6 3700c
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 2),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -237,7 +241,7 @@
             ]
         )
     },
-    # 3800
+    # 7 3800
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 64),
@@ -253,7 +257,7 @@
             ]
         )
     },
-    # 4700
+    # 8 4700
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -269,7 +273,7 @@
             ]
         )
     },
-    # 3420
+    # 9 3420
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 2),
         THERMAL_DEV_CATEGORY_MODULE:(1, 60),
@@ -285,7 +289,7 @@
             ]
         )
     },
-    # 4600C
+    # 10 4600C
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 64),
@@ -301,7 +305,7 @@
             ]
         )
     },
-    # 4410
+    # 11 4410
     {
         THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
         THERMAL_DEV_CATEGORY_MODULE:(1, 32),
@@ -316,6 +320,22 @@
                 THERMAL_DEV_FAN_AMBIENT
             ]
         )
+    },
+    # 12 4600
+    {
+        THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4),
+        THERMAL_DEV_CATEGORY_MODULE:(1, 64),
+        THERMAL_DEV_CATEGORY_PSU:(1, 2),
+        THERMAL_DEV_CATEGORY_CPU_PACK:(0,1),
+        THERMAL_DEV_CATEGORY_GEARBOX:(0,0),
+        THERMAL_DEV_CATEGORY_AMBIENT:(0,
+            [
+                THERMAL_DEV_ASIC_AMBIENT,
+                THERMAL_DEV_COMEX_AMBIENT,
+                THERMAL_DEV_PORT_AMBIENT,
+                THERMAL_DEV_FAN_AMBIENT
+            ]
+        )
     }
 ]
 

From bb2014a0af0f99fecec0e9a27d66f3397a41ec56 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Fri, 26 Feb 2021 10:28:32 +0200
Subject: [PATCH 0242/1674] [Mellanox]: Fix PCIEd config for SN4600c (#6892)

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 .../x86_64-mlnx_msn4600c-r0/pcie.yaml         | 148 +++++++++---------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn4600c-r0/pcie.yaml
index dcfdf1c9a59c..d110ef7c79cb 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/pcie.yaml
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/pcie.yaml
@@ -71,37 +71,37 @@
   name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
     xHCI (rev 05)'
 - bus: '00'
-  dev: 1c
+  dev: '1c'
   fn: '0'
   id: 8c10
   name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
     Root Port #1 (rev d5)'
 - bus: '00'
-  dev: 1c
+  dev: '1c'
   fn: '7'
   id: 8c1e
   name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
     Root Port #8 (rev d5)'
 - bus: '00'
-  dev: 1d
+  dev: '1d'
   fn: '0'
   id: 8c26
   name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
     EHCI #1 (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '0'
   id: 8c54
   name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
     SKU LPC Controller (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '2'
   id: 8c02
   name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
     SATA Controller 1 [AHCI mode] (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '3'
   id: 8c22
   name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
@@ -130,289 +130,289 @@
   id: 6f53
   name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
     Register DMA Channel 3'
-- bus: '06'
+- bus: '07'
   dev: '00'
   fn: '0'
   id: cf70
   name: 'Ethernet controller: Mellanox Technologies Device cf70'
-- bus: 08
+- bus: '09'
   dev: '00'
   fn: '0'
-  id: '1533'
+  id: 1533
   name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev
     03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '0'
   id: 6f81
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '1'
   id: 6f36
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '2'
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '3'
   id: 6f76
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link Debug (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '0'
   id: 6fe0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '1'
   id: 6fe1
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '2'
   id: 6fe2
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '3'
   id: 6fe3
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '0'
   id: 6ff8
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '4'
   id: 6ffc
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '5'
   id: 6ffd
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '6'
   id: 6ffe
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '0'
   id: 6f1d
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R2PCIe Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '1'
   id: 6f34
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R2PCIe Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '5'
   id: 6f1e
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '6'
   id: 6f7d
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '7'
   id: 6f1f
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '12'
   fn: '0'
   id: 6fa0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Home Agent 0 (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '12'
   fn: '1'
   id: 6f30
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Home Agent 0 (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '0'
   id: 6fa8
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '1'
   id: 6f71
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '2'
   id: 6faa
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '3'
   id: 6fab
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '4'
   id: 6fac
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '5'
   id: 6fad
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '6'
   id: 6fae
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Broadcast (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '7'
   id: 6faf
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Global Broadcast (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '0'
   id: 6fb0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '1'
   id: 6fb1
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '2'
   id: 6fb2
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 0 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '3'
   id: 6fb3
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 1 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '4'
   id: 6fbc
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '5'
   id: 6fbd
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '6'
   id: 6fbe
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '7'
   id: 6fbf
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '0'
   id: 6fb4
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '1'
   id: 6fb5
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '2'
   id: 6fb6
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 2 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '3'
   id: 6fb7
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 3 Error (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '0'
   id: 6f98
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '1'
   id: 6f99
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '2'
   id: 6f9a
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '3'
   id: 6fc0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '4'
   id: 6f9c
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1f
+- bus: 'ff'
+  dev: '1f'
   fn: '0'
   id: 6f88
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1f
+- bus: 'ff'
+  dev: '1f'
   fn: '2'
   id: 6f8a
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon

From 0e5df6f4155e4558189aab98d347b4a7405c032c Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Fri, 26 Feb 2021 10:28:17 +0200
Subject: [PATCH 0243/1674] [Mellanox]: Fix PCIEd config for SN4600 (#6894)

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 .../mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml | 148 +++++++++---------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
index dcfdf1c9a59c..d110ef7c79cb 100644
--- a/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/pcie.yaml
@@ -71,37 +71,37 @@
   name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
     xHCI (rev 05)'
 - bus: '00'
-  dev: 1c
+  dev: '1c'
   fn: '0'
   id: 8c10
   name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
     Root Port #1 (rev d5)'
 - bus: '00'
-  dev: 1c
+  dev: '1c'
   fn: '7'
   id: 8c1e
   name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
     Root Port #8 (rev d5)'
 - bus: '00'
-  dev: 1d
+  dev: '1d'
   fn: '0'
   id: 8c26
   name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
     EHCI #1 (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '0'
   id: 8c54
   name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
     SKU LPC Controller (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '2'
   id: 8c02
   name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
     SATA Controller 1 [AHCI mode] (rev 05)'
 - bus: '00'
-  dev: 1f
+  dev: '1f'
   fn: '3'
   id: 8c22
   name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
@@ -130,289 +130,289 @@
   id: 6f53
   name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
     Register DMA Channel 3'
-- bus: '06'
+- bus: '07'
   dev: '00'
   fn: '0'
   id: cf70
   name: 'Ethernet controller: Mellanox Technologies Device cf70'
-- bus: 08
+- bus: '09'
   dev: '00'
   fn: '0'
-  id: '1533'
+  id: 1533
   name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev
     03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '0'
   id: 6f81
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '1'
   id: 6f36
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '2'
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
+- bus: 'ff'
+  dev: '0b'
   fn: '3'
   id: 6f76
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link Debug (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '0'
   id: 6fe0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '1'
   id: 6fe1
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '2'
   id: 6fe2
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0c
+- bus: 'ff'
+  dev: '0c'
   fn: '3'
   id: 6fe3
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '0'
   id: 6ff8
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '4'
   id: 6ffc
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '5'
   id: 6ffd
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
-  dev: 0f
+- bus: 'ff'
+  dev: '0f'
   fn: '6'
   id: 6ffe
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Caching Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '0'
   id: 6f1d
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R2PCIe Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '1'
   id: 6f34
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R2PCIe Agent (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '5'
   id: 6f1e
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '6'
   id: 6f7d
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '10'
   fn: '7'
   id: 6f1f
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Ubox (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '12'
   fn: '0'
   id: 6fa0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Home Agent 0 (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '12'
   fn: '1'
   id: 6f30
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Home Agent 0 (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '0'
   id: 6fa8
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '1'
   id: 6f71
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '2'
   id: 6faa
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '3'
   id: 6fab
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '4'
   id: 6fac
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '5'
   id: 6fad
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '6'
   id: 6fae
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Broadcast (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '13'
   fn: '7'
   id: 6faf
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Global Broadcast (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '0'
   id: 6fb0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '1'
   id: 6fb1
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '2'
   id: 6fb2
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 0 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '3'
   id: 6fb3
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 1 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '4'
   id: 6fbc
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '5'
   id: 6fbd
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '6'
   id: 6fbe
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '14'
   fn: '7'
   id: 6fbf
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D DDRIO Channel 0/1 Interface (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '0'
   id: 6fb4
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '1'
   id: 6fb5
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '2'
   id: 6fb6
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 2 Error (rev 03)'
-- bus: ff
+- bus: 'ff'
   dev: '15'
   fn: '3'
   id: 6fb7
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Memory Controller 0 - Channel 3 Error (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '0'
   id: 6f98
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '1'
   id: 6f99
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '2'
   id: 6f9a
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '3'
   id: 6fc0
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1e
+- bus: 'ff'
+  dev: '1e'
   fn: '4'
   id: 6f9c
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1f
+- bus: 'ff'
+  dev: '1f'
   fn: '0'
   id: 6f88
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D Power Control Unit (rev 03)'
-- bus: ff
-  dev: 1f
+- bus: 'ff'
+  dev: '1f'
   fn: '2'
   id: 6f8a
   name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon

From ea12bb397b6a1755281d7ac38910d999fba7eb05 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Sun, 28 Feb 2021 15:02:31 -0800
Subject: [PATCH 0244/1674] [openconfig_acl] Add SONiC ACL extension to open
 config ACL model (#6896)

- Add support for VLAN ID match
- Add support for ICMP type/code match

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-config-engine/openconfig_acl.py     | 1815 +++++++++++------
 .../sonic-acl-extension.yang                  |   76 +
 2 files changed, 1236 insertions(+), 655 deletions(-)
 create mode 100644 src/sonic-config-engine/sonic-acl-extension.yang

diff --git a/src/sonic-config-engine/openconfig_acl.py b/src/sonic-config-engine/openconfig_acl.py
index c49f79c70175..5399f21a7d7f 100644
--- a/src/sonic-config-engine/openconfig_acl.py
+++ b/src/sonic-config-engine/openconfig_acl.py
@@ -5,21 +5,45 @@
 # 1. Sync openconfig ACL yang models from https://github.com/openconfig/public/tree/master/release/models/acl
 # 2. Sync inet yang models which contain type dependencies for openconfig ACL yang models from https://github.com/YangModels/yang/tree/master/standard/ietf/RFC , and put them in the same folder with models from step 1.
 # 3. Install PyangBind: 
-#    pip install pyangbind
+#    pip3 install pyangbind
 # 4. Get PyangBind install path: 
-#    export PYBINDPLUGIN=`/usr/bin/env python -c \
+#    export PYBINDPLUGIN=`/usr/bin/env python3 -c \
 #      'import pyangbind; import os; print "%s/plugin" % os.path.dirname(pyangbind.__file__)'`
-# 5. Generate this file with pyang: 
-#    pyang --plugindir $PYBINDPLUGIN -f pybind -o openconfig_acl.py openconfig-acl.yang
+# 5. Generate this file with pyang:
+#    pyang --plugindir $PYBINDPLUGIN -f pybind -o openconfig_acl.py openconfig-acl.yang sonic-acl-extension.yang
 
+# -*- coding: utf-8 -*-
 from operator import attrgetter
-from pyangbind.lib.yangtypes import RestrictedPrecisionDecimalType, RestrictedClassType, TypedListType
-from pyangbind.lib.yangtypes import YANGBool, YANGListType, YANGDynClass, ReferenceType
+from pyangbind.lib.yangtypes import RestrictedPrecisionDecimalType
+from pyangbind.lib.yangtypes import RestrictedClassType
+from pyangbind.lib.yangtypes import TypedListType
+from pyangbind.lib.yangtypes import YANGBool
+from pyangbind.lib.yangtypes import YANGListType
+from pyangbind.lib.yangtypes import YANGDynClass
+from pyangbind.lib.yangtypes import ReferenceType
 from pyangbind.lib.base import PybindBase
+from collections import OrderedDict
 from decimal import Decimal
 from bitarray import bitarray
+import six
 
-import builtins
+# PY3 support of some PY2 keywords (needs improved)
+if six.PY3:
+  import builtins as __builtin__
+  long = int
+elif six.PY2:
+  import __builtin__
+
+class sonic_acl_extension(PybindBase):
+  """
+  This class was auto-generated by the PythonClass plugin for PYANG
+  from YANG module sonic-acl-extension - based on the path /sonic-acl-extension. Each member element of
+  the container is represented as a class variable - with a specific
+  YANG type.
+  """
+  _pyangbind_elements = {}
+
+  
 
 class yc_state_openconfig_acl__acl_state(PybindBase):
   """
@@ -30,14 +54,18 @@ class yc_state_openconfig_acl__acl_state(PybindBase):
 
   YANG Description: Global operational state data for ACLs
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__counter_capability',)
+  __slots__ = ('_path_helper', '_extmethods', '__counter_capability',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__counter_capability = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-acl:AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__counter_capability = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-acl:AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -64,7 +92,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'state']
+      return [u'acl', u'state']
 
   def _get_counter_capability(self):
     """
@@ -89,12 +117,12 @@ def _set_counter_capability(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-acl:AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-acl:AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """counter_capability must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'oc-acl:AGGREGATE_ONLY': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_AGGREGATE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'AGGREGATE_ONLY': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'INTERFACE_AGGREGATE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'INTERFACE_ONLY': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_ONLY': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-acl:AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
         })
 
     self.__counter_capability = t
@@ -102,12 +130,12 @@ def _set_counter_capability(self, v, load=False):
       self._set()
 
   def _unset_counter_capability(self):
-    self.__counter_capability = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-acl:AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'AGGREGATE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_AGGREGATE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:INTERFACE_ONLY': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__counter_capability = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-acl:AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'AGGREGATE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_AGGREGATE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:INTERFACE_ONLY': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="counter-capability", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
-  counter_capability = builtins.property(_get_counter_capability)
+  counter_capability = __builtin__.property(_get_counter_capability)
 
 
-  _pyangbind_elements = {'counter_capability': counter_capability, }
+  _pyangbind_elements = OrderedDict([('counter_capability', counter_capability), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_config(PybindBase):
@@ -119,15 +147,19 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_config(PybindBase):
 
   YANG Description: Access list config
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__name','__description',)
+  __slots__ = ('_path_helper', '_extmethods', '__name','__description',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -154,7 +186,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'config']
 
   def _get_name(self):
     """
@@ -177,12 +209,12 @@ def _set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """name must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
         })
 
     self.__name = t
@@ -190,7 +222,7 @@ def _set_name(self, v, load=False):
       self._set()
 
   def _unset_name(self):
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
 
 
   def _get_description(self):
@@ -214,12 +246,12 @@ def _set_description(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """description must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
         })
 
     self.__description = t
@@ -227,13 +259,13 @@ def _set_description(self, v, load=False):
       self._set()
 
   def _unset_description(self):
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
 
-  name = builtins.property(_get_name, _set_name)
-  description = builtins.property(_get_description, _set_description)
+  name = __builtin__.property(_get_name, _set_name)
+  description = __builtin__.property(_get_description, _set_description)
 
 
-  _pyangbind_elements = {'name': name, 'description': description, }
+  _pyangbind_elements = OrderedDict([('name', name), ('description', description), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_state(PybindBase):
@@ -245,15 +277,19 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_state(PybindBase):
 
   YANG Description: Access list state information
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__name','__description',)
+  __slots__ = ('_path_helper', '_extmethods', '__name','__description',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -280,7 +316,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'state']
 
   def _get_name(self):
     """
@@ -303,12 +339,12 @@ def _set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """name must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
         })
 
     self.__name = t
@@ -316,7 +352,7 @@ def _set_name(self, v, load=False):
       self._set()
 
   def _unset_name(self):
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
 
 
   def _get_description(self):
@@ -340,12 +376,12 @@ def _set_description(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """description must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
         })
 
     self.__description = t
@@ -353,13 +389,13 @@ def _set_description(self, v, load=False):
       self._set()
 
   def _unset_description(self):
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
 
-  name = builtins.property(_get_name)
-  description = builtins.property(_get_description)
+  name = __builtin__.property(_get_name)
+  description = __builtin__.property(_get_description)
 
 
-  _pyangbind_elements = {'name': name, 'description': description, }
+  _pyangbind_elements = OrderedDict([('name', name), ('description', description), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_config(PybindBase):
@@ -371,15 +407,19 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_confi
 
   YANG Description: Access list entries config
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__description',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__description',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -406,7 +446,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'config']
 
   def _get_sequence_id(self):
     """
@@ -437,7 +477,7 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with uint32""",
@@ -450,7 +490,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
+    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=True)
 
 
   def _get_description(self):
@@ -476,12 +516,12 @@ def _set_description(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """description must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)""",
         })
 
     self.__description = t
@@ -489,13 +529,13 @@ def _set_description(self, v, load=False):
       self._set()
 
   def _unset_description(self):
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=True)
 
-  sequence_id = builtins.property(_get_sequence_id, _set_sequence_id)
-  description = builtins.property(_get_description, _set_description)
+  sequence_id = __builtin__.property(_get_sequence_id, _set_sequence_id)
+  description = __builtin__.property(_get_description, _set_description)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'description': description, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('description', description), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_state(PybindBase):
@@ -507,17 +547,21 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_state(
 
   YANG Description: State information for ACL entries
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__description','__matched_packets','__matched_octets',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__description','__matched_packets','__matched_octets',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
-    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -544,7 +588,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'state']
 
   def _get_sequence_id(self):
     """
@@ -575,7 +619,7 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with uint32""",
@@ -588,7 +632,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
+    self.__sequence_id = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint32', is_config=False)
 
 
   def _get_description(self):
@@ -614,12 +658,12 @@ def _set_description(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """description must be of a type compatible with string""",
           'defined-type': "string",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)""",
         })
 
     self.__description = t
@@ -627,7 +671,7 @@ def _set_description(self, v, load=False):
       self._set()
 
   def _unset_description(self):
-    self.__description = YANGDynClass(base=str, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
+    self.__description = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="description", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='string', is_config=False)
 
 
   def _get_matched_packets(self):
@@ -677,7 +721,7 @@ def _set_matched_packets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_packets must be of a type compatible with yang:counter64""",
@@ -690,7 +734,7 @@ def _set_matched_packets(self, v, load=False):
       self._set()
 
   def _unset_matched_packets(self):
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
 
   def _get_matched_octets(self):
@@ -740,7 +784,7 @@ def _set_matched_octets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_octets must be of a type compatible with yang:counter64""",
@@ -753,15 +797,15 @@ def _set_matched_octets(self, v, load=False):
       self._set()
 
   def _unset_matched_octets(self):
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
-  sequence_id = builtins.property(_get_sequence_id)
-  description = builtins.property(_get_description)
-  matched_packets = builtins.property(_get_matched_packets)
-  matched_octets = builtins.property(_get_matched_octets)
+  sequence_id = __builtin__.property(_get_sequence_id)
+  description = __builtin__.property(_get_description)
+  matched_packets = __builtin__.property(_get_matched_packets)
+  matched_octets = __builtin__.property(_get_matched_octets)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'description': description, 'matched_packets': matched_packets, 'matched_octets': matched_octets, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('description', description), ('matched_packets', matched_packets), ('matched_octets', matched_octets), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_config(PybindBase):
@@ -773,18 +817,23 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_co
 
   YANG Description: Configuration data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__source_mac','__source_mac_mask','__destination_mac','__destination_mac_mask','__ethertype',)
+  __slots__ = ('_path_helper', '_extmethods', '__source_mac','__source_mac_mask','__destination_mac','__destination_mac_mask','__ethertype','__vlan_id',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
-    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
-    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
-    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
-    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
+    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__vlan_id = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
+    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -811,7 +860,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'l2', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'l2', u'config']
 
   def _get_source_mac(self):
     """
@@ -834,12 +883,12 @@ def _set_source_mac(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_mac must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
         })
 
     self.__source_mac = t
@@ -847,7 +896,7 @@ def _set_source_mac(self, v, load=False):
       self._set()
 
   def _unset_source_mac(self):
-    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
 
   def _get_source_mac_mask(self):
@@ -871,12 +920,12 @@ def _set_source_mac_mask(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_mac_mask must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
         })
 
     self.__source_mac_mask = t
@@ -884,7 +933,7 @@ def _set_source_mac_mask(self, v, load=False):
       self._set()
 
   def _unset_source_mac_mask(self):
-    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
 
   def _get_destination_mac(self):
@@ -908,12 +957,12 @@ def _set_destination_mac(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_mac must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
         })
 
     self.__destination_mac = t
@@ -921,7 +970,7 @@ def _set_destination_mac(self, v, load=False):
       self._set()
 
   def _unset_destination_mac(self):
-    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
 
   def _get_destination_mac_mask(self):
@@ -945,12 +994,12 @@ def _set_destination_mac_mask(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_mac_mask must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)""",
         })
 
     self.__destination_mac_mask = t
@@ -958,7 +1007,7 @@ def _set_destination_mac_mask(self, v, load=False):
       self._set()
 
   def _unset_destination_mac_mask(self):
-    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
+    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
 
   def _get_ethertype(self):
@@ -982,12 +1031,12 @@ def _set_ethertype(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """ethertype must be of a type compatible with oc-pkt-match-types:ethertype-type""",
           'defined-type': "oc-pkt-match-types:ethertype-type",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'1..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)""",
         })
 
     self.__ethertype = t
@@ -995,16 +1044,54 @@ def _set_ethertype(self, v, load=False):
       self._set()
 
   def _unset_ethertype(self):
-    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
+    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=True)
+
+
+  def _get_vlan_id(self):
+    """
+    Getter method for vlan_id, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/l2/config/vlan_id (vlan-id-type)
+
+    YANG Description: VLAN ID field to match in DOT1Q packets
+    """
+    return self.__vlan_id
+      
+  def _set_vlan_id(self, v, load=False):
+    """
+    Setter method for vlan_id, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/l2/config/vlan_id (vlan-id-type)
+    If this variable is read-only (config: false) in the
+    source YANG file, then _set_vlan_id is considered as a private
+    method. Backends looking to populate this variable should
+    do so via calling thisObj._set_vlan_id() directly.
+
+    YANG Description: VLAN ID field to match in DOT1Q packets
+    """
+    if hasattr(v, "_utype"):
+      v = v._utype(v)
+    try:
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
+    except (TypeError, ValueError):
+      raise ValueError({
+          'error-string': """vlan_id must be of a type compatible with vlan-id-type""",
+          'defined-type': "sonic-acl-extension:vlan-id-type",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)""",
+        })
+
+    self.__vlan_id = t
+    if hasattr(self, '_set'):
+      self._set()
+
+  def _unset_vlan_id(self):
+    self.__vlan_id = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
 
-  source_mac = builtins.property(_get_source_mac, _set_source_mac)
-  source_mac_mask = builtins.property(_get_source_mac_mask, _set_source_mac_mask)
-  destination_mac = builtins.property(_get_destination_mac, _set_destination_mac)
-  destination_mac_mask = builtins.property(_get_destination_mac_mask, _set_destination_mac_mask)
-  ethertype = builtins.property(_get_ethertype, _set_ethertype)
+  source_mac = __builtin__.property(_get_source_mac, _set_source_mac)
+  source_mac_mask = __builtin__.property(_get_source_mac_mask, _set_source_mac_mask)
+  destination_mac = __builtin__.property(_get_destination_mac, _set_destination_mac)
+  destination_mac_mask = __builtin__.property(_get_destination_mac_mask, _set_destination_mac_mask)
+  ethertype = __builtin__.property(_get_ethertype, _set_ethertype)
+  vlan_id = __builtin__.property(_get_vlan_id, _set_vlan_id)
 
 
-  _pyangbind_elements = {'source_mac': source_mac, 'source_mac_mask': source_mac_mask, 'destination_mac': destination_mac, 'destination_mac_mask': destination_mac_mask, 'ethertype': ethertype, }
+  _pyangbind_elements = OrderedDict([('source_mac', source_mac), ('source_mac_mask', source_mac_mask), ('destination_mac', destination_mac), ('destination_mac_mask', destination_mac_mask), ('ethertype', ethertype), ('vlan_id', vlan_id), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_state(PybindBase):
@@ -1016,18 +1103,22 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_sta
 
   YANG Description: State Information.
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__source_mac','__source_mac_mask','__destination_mac','__destination_mac_mask','__ethertype',)
+  __slots__ = ('_path_helper', '_extmethods', '__source_mac','__source_mac_mask','__destination_mac','__destination_mac_mask','__ethertype',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
-    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
-    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
-    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
-    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
+    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -1054,7 +1145,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'l2', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'l2', u'state']
 
   def _get_source_mac(self):
     """
@@ -1077,12 +1168,12 @@ def _set_source_mac(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_mac must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
         })
 
     self.__source_mac = t
@@ -1090,7 +1181,7 @@ def _set_source_mac(self, v, load=False):
       self._set()
 
   def _unset_source_mac(self):
-    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
 
 
   def _get_source_mac_mask(self):
@@ -1114,12 +1205,12 @@ def _set_source_mac_mask(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_mac_mask must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
         })
 
     self.__source_mac_mask = t
@@ -1127,7 +1218,7 @@ def _set_source_mac_mask(self, v, load=False):
       self._set()
 
   def _unset_source_mac_mask(self):
-    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
 
 
   def _get_destination_mac(self):
@@ -1151,12 +1242,12 @@ def _set_destination_mac(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_mac must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
         })
 
     self.__destination_mac = t
@@ -1164,7 +1255,7 @@ def _set_destination_mac(self, v, load=False):
       self._set()
 
   def _unset_destination_mac(self):
-    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
 
 
   def _get_destination_mac_mask(self):
@@ -1188,12 +1279,12 @@ def _set_destination_mac_mask(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_mac_mask must be of a type compatible with yang:mac-address""",
           'defined-type': "yang:mac-address",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)""",
         })
 
     self.__destination_mac_mask = t
@@ -1201,7 +1292,7 @@ def _set_destination_mac_mask(self, v, load=False):
       self._set()
 
   def _unset_destination_mac_mask(self):
-    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_dict={'pattern': '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
+    self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=False)
 
 
   def _get_ethertype(self):
@@ -1225,12 +1316,12 @@ def _set_ethertype(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """ethertype must be of a type compatible with oc-pkt-match-types:ethertype-type""",
           'defined-type': "oc-pkt-match-types:ethertype-type",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'1..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)""",
         })
 
     self.__ethertype = t
@@ -1238,16 +1329,16 @@ def _set_ethertype(self, v, load=False):
       self._set()
 
   def _unset_ethertype(self):
-    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['1..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_ARP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_VLAN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_ROCE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV6': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_MPLS': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:ETHERTYPE_IPV4': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'ETHERTYPE_LLDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
+    self.__ethertype = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..65535']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_ARP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_VLAN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_ROCE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV6': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_MPLS': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:ETHERTYPE_IPV4': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'ETHERTYPE_LLDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="ethertype", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ethertype-type', is_config=False)
 
-  source_mac = builtins.property(_get_source_mac)
-  source_mac_mask = builtins.property(_get_source_mac_mask)
-  destination_mac = builtins.property(_get_destination_mac)
-  destination_mac_mask = builtins.property(_get_destination_mac_mask)
-  ethertype = builtins.property(_get_ethertype)
+  source_mac = __builtin__.property(_get_source_mac)
+  source_mac_mask = __builtin__.property(_get_source_mac_mask)
+  destination_mac = __builtin__.property(_get_destination_mac)
+  destination_mac_mask = __builtin__.property(_get_destination_mac_mask)
+  ethertype = __builtin__.property(_get_ethertype)
 
 
-  _pyangbind_elements = {'source_mac': source_mac, 'source_mac_mask': source_mac_mask, 'destination_mac': destination_mac, 'destination_mac_mask': destination_mac_mask, 'ethertype': ethertype, }
+  _pyangbind_elements = OrderedDict([('source_mac', source_mac), ('source_mac_mask', source_mac_mask), ('destination_mac', destination_mac), ('destination_mac_mask', destination_mac_mask), ('ethertype', ethertype), ])
 
 
 class yc_l2_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2(PybindBase):
@@ -1259,12 +1350,16 @@ class yc_l2_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2(Pybind
 
   YANG Description: Ethernet header fields
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'l2'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'l2'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -1294,7 +1389,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'l2']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'l2']
 
   def _get_config(self):
     """
@@ -1369,11 +1464,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_config(PybindBase):
@@ -1385,21 +1480,25 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_co
 
   YANG Description: Configuration data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__ip_version','__source_ip_address','__source_ip_flow_label','__destination_ip_address','__destination_ip_flow_label','__dscp','__protocol','__hop_limit',)
+  __slots__ = ('_path_helper', '_extmethods', '__ip_version','__source_ip_address','__source_ip_flow_label','__destination_ip_address','__destination_ip_flow_label','__dscp','__protocol','__hop_limit',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
-    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
-    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
-    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
-    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
-    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
-    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
-    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
+    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
+    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
+    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
+    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -1426,7 +1525,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'ip', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'ip', u'config']
 
   def _get_ip_version(self):
     """
@@ -1449,12 +1548,12 @@ def _set_ip_version(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """ip_version must be of a type compatible with inet:ip-version""",
           'defined-type': "inet:ip-version",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'unknown': {'value': 0}, u'ipv4': {'value': 1}, u'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)""",
         })
 
     self.__ip_version = t
@@ -1462,7 +1561,7 @@ def _set_ip_version(self, v, load=False):
       self._set()
 
   def _unset_ip_version(self):
-    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
+    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=True)
 
 
   def _get_source_ip_address(self):
@@ -1486,12 +1585,12 @@ def _set_source_ip_address(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_ip_address must be of a type compatible with inet:ip-prefix""",
           'defined-type': "inet:ip-prefix",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)""",
         })
 
     self.__source_ip_address = t
@@ -1499,7 +1598,7 @@ def _set_source_ip_address(self, v, load=False):
       self._set()
 
   def _unset_source_ip_address(self):
-    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
 
 
   def _get_source_ip_flow_label(self):
@@ -1523,12 +1622,12 @@ def _set_source_ip_flow_label(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_ip_flow_label must be of a type compatible with inet:ipv6-flow-label""",
           'defined-type': "inet:ipv6-flow-label",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)""",
         })
 
     self.__source_ip_flow_label = t
@@ -1536,7 +1635,7 @@ def _set_source_ip_flow_label(self, v, load=False):
       self._set()
 
   def _unset_source_ip_flow_label(self):
-    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
 
 
   def _get_destination_ip_address(self):
@@ -1560,12 +1659,12 @@ def _set_destination_ip_address(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_ip_address must be of a type compatible with inet:ip-prefix""",
           'defined-type': "inet:ip-prefix",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)""",
         })
 
     self.__destination_ip_address = t
@@ -1573,7 +1672,7 @@ def _set_destination_ip_address(self, v, load=False):
       self._set()
 
   def _unset_destination_ip_address(self):
-    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
+    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=True)
 
 
   def _get_destination_ip_flow_label(self):
@@ -1597,12 +1696,12 @@ def _set_destination_ip_flow_label(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_ip_flow_label must be of a type compatible with inet:ipv6-flow-label""",
           'defined-type': "inet:ipv6-flow-label",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)""",
         })
 
     self.__destination_ip_flow_label = t
@@ -1610,7 +1709,7 @@ def _set_destination_ip_flow_label(self, v, load=False):
       self._set()
 
   def _unset_destination_ip_flow_label(self):
-    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
+    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=True)
 
 
   def _get_dscp(self):
@@ -1634,12 +1733,12 @@ def _set_dscp(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """dscp must be of a type compatible with inet:dscp""",
           'defined-type': "inet:dscp",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)""",
         })
 
     self.__dscp = t
@@ -1647,7 +1746,7 @@ def _set_dscp(self, v, load=False):
       self._set()
 
   def _unset_dscp(self):
-    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
+    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=True)
 
 
   def _get_protocol(self):
@@ -1671,12 +1770,12 @@ def _set_protocol(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """protocol must be of a type compatible with oc-pkt-match-types:ip-protocol-type""",
           'defined-type': "oc-pkt-match-types:ip-protocol-type",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..254']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_GRE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_TCP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_UDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_PIM': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)""",
         })
 
     self.__protocol = t
@@ -1684,7 +1783,7 @@ def _set_protocol(self, v, load=False):
       self._set()
 
   def _unset_protocol(self):
-    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
+    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=True)
 
 
   def _get_hop_limit(self):
@@ -1710,12 +1809,12 @@ def _set_hop_limit(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """hop_limit must be of a type compatible with uint8""",
           'defined-type': "uint8",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)""",
         })
 
     self.__hop_limit = t
@@ -1723,19 +1822,19 @@ def _set_hop_limit(self, v, load=False):
       self._set()
 
   def _unset_hop_limit(self):
-    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
+    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=True)
 
-  ip_version = builtins.property(_get_ip_version, _set_ip_version)
-  source_ip_address = builtins.property(_get_source_ip_address, _set_source_ip_address)
-  source_ip_flow_label = builtins.property(_get_source_ip_flow_label, _set_source_ip_flow_label)
-  destination_ip_address = builtins.property(_get_destination_ip_address, _set_destination_ip_address)
-  destination_ip_flow_label = builtins.property(_get_destination_ip_flow_label, _set_destination_ip_flow_label)
-  dscp = builtins.property(_get_dscp, _set_dscp)
-  protocol = builtins.property(_get_protocol, _set_protocol)
-  hop_limit = builtins.property(_get_hop_limit, _set_hop_limit)
+  ip_version = __builtin__.property(_get_ip_version, _set_ip_version)
+  source_ip_address = __builtin__.property(_get_source_ip_address, _set_source_ip_address)
+  source_ip_flow_label = __builtin__.property(_get_source_ip_flow_label, _set_source_ip_flow_label)
+  destination_ip_address = __builtin__.property(_get_destination_ip_address, _set_destination_ip_address)
+  destination_ip_flow_label = __builtin__.property(_get_destination_ip_flow_label, _set_destination_ip_flow_label)
+  dscp = __builtin__.property(_get_dscp, _set_dscp)
+  protocol = __builtin__.property(_get_protocol, _set_protocol)
+  hop_limit = __builtin__.property(_get_hop_limit, _set_hop_limit)
 
 
-  _pyangbind_elements = {'ip_version': ip_version, 'source_ip_address': source_ip_address, 'source_ip_flow_label': source_ip_flow_label, 'destination_ip_address': destination_ip_address, 'destination_ip_flow_label': destination_ip_flow_label, 'dscp': dscp, 'protocol': protocol, 'hop_limit': hop_limit, }
+  _pyangbind_elements = OrderedDict([('ip_version', ip_version), ('source_ip_address', source_ip_address), ('source_ip_flow_label', source_ip_flow_label), ('destination_ip_address', destination_ip_address), ('destination_ip_flow_label', destination_ip_flow_label), ('dscp', dscp), ('protocol', protocol), ('hop_limit', hop_limit), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_state(PybindBase):
@@ -1747,21 +1846,25 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_sta
 
   YANG Description: State information
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__ip_version','__source_ip_address','__source_ip_flow_label','__destination_ip_address','__destination_ip_flow_label','__dscp','__protocol','__hop_limit',)
+  __slots__ = ('_path_helper', '_extmethods', '__ip_version','__source_ip_address','__source_ip_flow_label','__destination_ip_address','__destination_ip_flow_label','__dscp','__protocol','__hop_limit',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
-    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
-    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
-    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
-    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
-    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
-    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
-    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
+    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
+    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
+    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
+    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -1788,7 +1891,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'ip', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'ip', u'state']
 
   def _get_ip_version(self):
     """
@@ -1811,12 +1914,12 @@ def _set_ip_version(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """ip_version must be of a type compatible with inet:ip-version""",
           'defined-type': "inet:ip-version",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'unknown': {'value': 0}, u'ipv4': {'value': 1}, u'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)""",
         })
 
     self.__ip_version = t
@@ -1824,7 +1927,7 @@ def _set_ip_version(self, v, load=False):
       self._set()
 
   def _unset_ip_version(self):
-    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'unknown': {'value': 0}, 'ipv4': {'value': 1}, 'ipv6': {'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
+    self.__ip_version = YANGDynClass(base=RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'unknown': {u'value': 0}, u'ipv4': {u'value': 1}, u'ipv6': {u'value': 2}},), is_leaf=True, yang_name="ip-version", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-version', is_config=False)
 
 
   def _get_source_ip_address(self):
@@ -1848,12 +1951,12 @@ def _set_source_ip_address(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_ip_address must be of a type compatible with inet:ip-prefix""",
           'defined-type': "inet:ip-prefix",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)""",
         })
 
     self.__source_ip_address = t
@@ -1861,7 +1964,7 @@ def _set_source_ip_address(self, v, load=False):
       self._set()
 
   def _unset_source_ip_address(self):
-    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+    self.__source_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="source-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
 
 
   def _get_source_ip_flow_label(self):
@@ -1885,12 +1988,12 @@ def _set_source_ip_flow_label(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_ip_flow_label must be of a type compatible with inet:ipv6-flow-label""",
           'defined-type': "inet:ipv6-flow-label",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)""",
         })
 
     self.__source_ip_flow_label = t
@@ -1898,7 +2001,7 @@ def _set_source_ip_flow_label(self, v, load=False):
       self._set()
 
   def _unset_source_ip_flow_label(self):
-    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+    self.__source_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="source-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
 
 
   def _get_destination_ip_address(self):
@@ -1922,12 +2025,12 @@ def _set_destination_ip_address(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_ip_address must be of a type compatible with inet:ip-prefix""",
           'defined-type': "inet:ip-prefix",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)""",
         })
 
     self.__destination_ip_address = t
@@ -1935,7 +2038,7 @@ def _set_destination_ip_address(self, v, load=False):
       self._set()
 
   def _unset_destination_ip_address(self):
-    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=str, restriction_dict={'pattern': '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
+    self.__destination_ip_address = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))'}),RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'}),], is_leaf=True, yang_name="destination-ip-address", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ip-prefix', is_config=False)
 
 
   def _get_destination_ip_flow_label(self):
@@ -1959,12 +2062,12 @@ def _set_destination_ip_flow_label(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_ip_flow_label must be of a type compatible with inet:ipv6-flow-label""",
           'defined-type': "inet:ipv6-flow-label",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)""",
         })
 
     self.__destination_ip_flow_label = t
@@ -1972,7 +2075,7 @@ def _set_destination_ip_flow_label(self, v, load=False):
       self._set()
 
   def _unset_destination_ip_flow_label(self):
-    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={'range': ['0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
+    self.__destination_ip_flow_label = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=long, restriction_dict={'range': ['0..4294967295']}, int_size=32), restriction_dict={u'range': [u'0..1048575']}), is_leaf=True, yang_name="destination-ip-flow-label", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:ipv6-flow-label', is_config=False)
 
 
   def _get_dscp(self):
@@ -1996,12 +2099,12 @@ def _set_dscp(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """dscp must be of a type compatible with inet:dscp""",
           'defined-type': "inet:dscp",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)""",
         })
 
     self.__dscp = t
@@ -2009,7 +2112,7 @@ def _set_dscp(self, v, load=False):
       self._set()
 
   def _unset_dscp(self):
-    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
+    self.__dscp = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..63']}), is_leaf=True, yang_name="dscp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='inet:dscp', is_config=False)
 
 
   def _get_protocol(self):
@@ -2033,12 +2136,12 @@ def _set_protocol(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """protocol must be of a type compatible with oc-pkt-match-types:ip-protocol-type""",
           'defined-type': "oc-pkt-match-types:ip-protocol-type",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..254']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_GRE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_TCP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_UDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_PIM': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)""",
         })
 
     self.__protocol = t
@@ -2046,7 +2149,7 @@ def _set_protocol(self, v, load=False):
       self._set()
 
   def _unset_protocol(self):
-    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..254']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'oc-pkt-match-types:IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_L2TP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_TCP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_AUTH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_GRE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_RSVP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_PIM': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_UDP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:IP_IGMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'IP_ICMP': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
+    self.__protocol = YANGDynClass(base=[RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..254']}),RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'oc-pkt-match-types:IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_L2TP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_TCP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_AUTH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_GRE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_RSVP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_PIM': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_UDP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:IP_IGMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'IP_ICMP': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},),], is_leaf=True, yang_name="protocol", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:ip-protocol-type', is_config=False)
 
 
   def _get_hop_limit(self):
@@ -2072,12 +2175,12 @@ def _set_hop_limit(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """hop_limit must be of a type compatible with uint8""",
           'defined-type': "uint8",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)""",
         })
 
     self.__hop_limit = t
@@ -2085,19 +2188,19 @@ def _set_hop_limit(self, v, load=False):
       self._set()
 
   def _unset_hop_limit(self):
-    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={'range': ['0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
+    self.__hop_limit = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="hop-limit", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='uint8', is_config=False)
 
-  ip_version = builtins.property(_get_ip_version)
-  source_ip_address = builtins.property(_get_source_ip_address)
-  source_ip_flow_label = builtins.property(_get_source_ip_flow_label)
-  destination_ip_address = builtins.property(_get_destination_ip_address)
-  destination_ip_flow_label = builtins.property(_get_destination_ip_flow_label)
-  dscp = builtins.property(_get_dscp)
-  protocol = builtins.property(_get_protocol)
-  hop_limit = builtins.property(_get_hop_limit)
+  ip_version = __builtin__.property(_get_ip_version)
+  source_ip_address = __builtin__.property(_get_source_ip_address)
+  source_ip_flow_label = __builtin__.property(_get_source_ip_flow_label)
+  destination_ip_address = __builtin__.property(_get_destination_ip_address)
+  destination_ip_flow_label = __builtin__.property(_get_destination_ip_flow_label)
+  dscp = __builtin__.property(_get_dscp)
+  protocol = __builtin__.property(_get_protocol)
+  hop_limit = __builtin__.property(_get_hop_limit)
 
 
-  _pyangbind_elements = {'ip_version': ip_version, 'source_ip_address': source_ip_address, 'source_ip_flow_label': source_ip_flow_label, 'destination_ip_address': destination_ip_address, 'destination_ip_flow_label': destination_ip_flow_label, 'dscp': dscp, 'protocol': protocol, 'hop_limit': hop_limit, }
+  _pyangbind_elements = OrderedDict([('ip_version', ip_version), ('source_ip_address', source_ip_address), ('source_ip_flow_label', source_ip_flow_label), ('destination_ip_address', destination_ip_address), ('destination_ip_flow_label', destination_ip_flow_label), ('dscp', dscp), ('protocol', protocol), ('hop_limit', hop_limit), ])
 
 
 class yc_ip_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip(PybindBase):
@@ -2109,12 +2212,16 @@ class yc_ip_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip(Pybind
 
   YANG Description: Top level container
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'ip'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'ip'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -2144,7 +2251,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'ip']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'ip']
 
   def _get_config(self):
     """
@@ -2219,11 +2326,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport_config(PybindBase):
@@ -2235,16 +2342,20 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_trans
 
   YANG Description: Configuration data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__source_port','__destination_port','__tcp_flags',)
+  __slots__ = ('_path_helper', '_extmethods', '__source_port','__destination_port','__tcp_flags',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
-    self.__tcp_flags = YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
-    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+    self.__tcp_flags = YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -2271,7 +2382,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'transport', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'transport', u'config']
 
   def _get_source_port(self):
     """
@@ -2294,12 +2405,12 @@ def _set_source_port(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_port must be of a type compatible with oc-pkt-match-types:port-num-range""",
           'defined-type': "oc-pkt-match-types:port-num-range",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'0..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)""",
         })
 
     self.__source_port = t
@@ -2307,7 +2418,7 @@ def _set_source_port(self, v, load=False):
       self._set()
 
   def _unset_source_port(self):
-    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
 
 
   def _get_destination_port(self):
@@ -2331,12 +2442,12 @@ def _set_destination_port(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_port must be of a type compatible with oc-pkt-match-types:port-num-range""",
           'defined-type': "oc-pkt-match-types:port-num-range",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'0..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)""",
         })
 
     self.__destination_port = t
@@ -2344,7 +2455,7 @@ def _set_destination_port(self, v, load=False):
       self._set()
 
   def _unset_destination_port(self):
-    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
+    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=True)
 
 
   def _get_tcp_flags(self):
@@ -2368,12 +2479,12 @@ def _set_tcp_flags(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+      t = YANGDynClass(v,unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """tcp_flags must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_URG': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_RST': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
+          'generated-type': """YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
         })
 
     self.__tcp_flags = t
@@ -2381,14 +2492,14 @@ def _set_tcp_flags(self, v, load=False):
       self._set()
 
   def _unset_tcp_flags(self):
-    self.__tcp_flags = YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__tcp_flags = YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
 
-  source_port = builtins.property(_get_source_port, _set_source_port)
-  destination_port = builtins.property(_get_destination_port, _set_destination_port)
-  tcp_flags = builtins.property(_get_tcp_flags, _set_tcp_flags)
+  source_port = __builtin__.property(_get_source_port, _set_source_port)
+  destination_port = __builtin__.property(_get_destination_port, _set_destination_port)
+  tcp_flags = __builtin__.property(_get_tcp_flags, _set_tcp_flags)
 
 
-  _pyangbind_elements = {'source_port': source_port, 'destination_port': destination_port, 'tcp_flags': tcp_flags, }
+  _pyangbind_elements = OrderedDict([('source_port', source_port), ('destination_port', destination_port), ('tcp_flags', tcp_flags), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport_state(PybindBase):
@@ -2400,16 +2511,20 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transp
 
   YANG Description: State data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__source_port','__destination_port','__tcp_flags',)
+  __slots__ = ('_path_helper', '_extmethods', '__source_port','__destination_port','__tcp_flags',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
-    self.__tcp_flags = YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
-    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+    self.__tcp_flags = YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -2436,7 +2551,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'transport', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'transport', u'state']
 
   def _get_source_port(self):
     """
@@ -2459,12 +2574,12 @@ def _set_source_port(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """source_port must be of a type compatible with oc-pkt-match-types:port-num-range""",
           'defined-type': "oc-pkt-match-types:port-num-range",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'0..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)""",
         })
 
     self.__source_port = t
@@ -2472,7 +2587,7 @@ def _set_source_port(self, v, load=False):
       self._set()
 
   def _unset_source_port(self):
-    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+    self.__source_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="source-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
 
 
   def _get_destination_port(self):
@@ -2496,12 +2611,12 @@ def _set_destination_port(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """destination_port must be of a type compatible with oc-pkt-match-types:port-num-range""",
           'defined-type': "oc-pkt-match-types:port-num-range",
-          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=unicode, restriction_dict={'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': [u'0..65535']}),RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)""",
         })
 
     self.__destination_port = t
@@ -2509,7 +2624,7 @@ def _set_destination_port(self, v, load=False):
       self._set()
 
   def _unset_destination_port(self):
-    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=str, restriction_dict={'pattern': '^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={'range': ['0..65535']}),RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
+    self.__destination_port = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'^(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)\\.\\.(6[0-5][0-5][0-3][0-5]|[0-5]?[0-9]?[0-9]?[0-9]?[0-9]?)$'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..65535']}),RestrictedClassType(base_type=six.text_type,                                     restriction_type="dict_key",                                     restriction_arg={u'ANY': {}},),], is_leaf=True, yang_name="destination-port", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-pkt-match-types:port-num-range', is_config=False)
 
 
   def _get_tcp_flags(self):
@@ -2533,12 +2648,12 @@ def _set_tcp_flags(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+      t = YANGDynClass(v,unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """tcp_flags must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_URG': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_RST': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {'@namespace': u'http://openconfig.net/yang/packet-match-types', '@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
+          'generated-type': """YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
         })
 
     self.__tcp_flags = t
@@ -2546,14 +2661,14 @@ def _set_tcp_flags(self, v, load=False):
       self._set()
 
   def _unset_tcp_flags(self):
-    self.__tcp_flags = YANGDynClass(base=TypedListType(allowed_type=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ACK': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_SYN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_CWR': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_URG': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_RST': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_FIN': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_ECE': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}, 'oc-pkt-match-types:TCP_PSH': {'@namespace': 'http://openconfig.net/yang/packet-match-types', '@module': 'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__tcp_flags = YANGDynClass(unique=True, base=TypedListType(allowed_type=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ACK': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_SYN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_CWR': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_URG': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_RST': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_FIN': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_ECE': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}, u'oc-pkt-match-types:TCP_PSH': {u'@namespace': u'http://openconfig.net/yang/packet-match-types', u'@module': u'openconfig-packet-match-types'}},)), is_leaf=False, yang_name="tcp-flags", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
-  source_port = builtins.property(_get_source_port)
-  destination_port = builtins.property(_get_destination_port)
-  tcp_flags = builtins.property(_get_tcp_flags)
+  source_port = __builtin__.property(_get_source_port)
+  destination_port = __builtin__.property(_get_destination_port)
+  tcp_flags = __builtin__.property(_get_tcp_flags)
 
 
-  _pyangbind_elements = {'source_port': source_port, 'destination_port': destination_port, 'tcp_flags': tcp_flags, }
+  _pyangbind_elements = OrderedDict([('source_port', source_port), ('destination_port', destination_port), ('tcp_flags', tcp_flags), ])
 
 
 class yc_transport_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport(PybindBase):
@@ -2565,12 +2680,16 @@ class yc_transport_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_tr
 
   YANG Description: Transport fields container
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'transport'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'transport'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -2600,7 +2719,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'transport']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'transport']
 
   def _get_config(self):
     """
@@ -2675,11 +2794,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref_config(PybindBase):
@@ -2691,15 +2810,19 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input
 
   YANG Description: Configured reference to interface / subinterface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface','__subinterface',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface','__subinterface',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -2726,7 +2849,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'input-interface', 'interface-ref', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'input-interface', u'interface-ref', u'config']
 
   def _get_interface(self):
     """
@@ -2753,12 +2876,12 @@ def _set_interface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """interface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__interface = t
@@ -2766,7 +2889,7 @@ def _set_interface(self, v, load=False):
       self._set()
 
   def _unset_interface(self):
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_subinterface(self):
@@ -2796,12 +2919,12 @@ def _set_subinterface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """subinterface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__subinterface = t
@@ -2809,13 +2932,13 @@ def _set_subinterface(self, v, load=False):
       self._set()
 
   def _unset_subinterface(self):
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
-  interface = builtins.property(_get_interface, _set_interface)
-  subinterface = builtins.property(_get_subinterface, _set_subinterface)
+  interface = __builtin__.property(_get_interface, _set_interface)
+  subinterface = __builtin__.property(_get_subinterface, _set_subinterface)
 
 
-  _pyangbind_elements = {'interface': interface, 'subinterface': subinterface, }
+  _pyangbind_elements = OrderedDict([('interface', interface), ('subinterface', subinterface), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref_state(PybindBase):
@@ -2827,15 +2950,19 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_
 
   YANG Description: Operational state for interface-ref
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface','__subinterface',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface','__subinterface',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -2862,7 +2989,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'input-interface', 'interface-ref', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'input-interface', u'interface-ref', u'state']
 
   def _get_interface(self):
     """
@@ -2889,12 +3016,12 @@ def _set_interface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """interface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__interface = t
@@ -2902,7 +3029,7 @@ def _set_interface(self, v, load=False):
       self._set()
 
   def _unset_interface(self):
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_subinterface(self):
@@ -2932,12 +3059,12 @@ def _set_subinterface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """subinterface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__subinterface = t
@@ -2945,13 +3072,13 @@ def _set_subinterface(self, v, load=False):
       self._set()
 
   def _unset_subinterface(self):
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
-  interface = builtins.property(_get_interface)
-  subinterface = builtins.property(_get_subinterface)
+  interface = __builtin__.property(_get_interface)
+  subinterface = __builtin__.property(_get_subinterface)
 
 
-  _pyangbind_elements = {'interface': interface, 'subinterface': subinterface, }
+  _pyangbind_elements = OrderedDict([('interface', interface), ('subinterface', subinterface), ])
 
 
 class yc_interface_ref_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref(PybindBase):
@@ -2963,12 +3090,16 @@ class yc_interface_ref_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entr
 
   YANG Description: Reference to an interface or subinterface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'interface-ref'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'interface-ref'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -2998,7 +3129,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'input-interface', 'interface-ref']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'input-interface', u'interface-ref']
 
   def _get_config(self):
     """
@@ -3073,11 +3204,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
 
 
 class yc_input_interface_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface(PybindBase):
@@ -3089,12 +3220,16 @@ class yc_input_interface_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_en
 
   YANG Description: Input interface container
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface_ref',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface_ref',)
+
+  _yang_name = 'input-interface'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'input-interface'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__interface_ref = YANGDynClass(base=yc_interface_ref_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref, is_container='container', yang_name="interface-ref", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
@@ -3123,7 +3258,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'input-interface']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'input-interface']
 
   def _get_interface_ref(self):
     """
@@ -3161,10 +3296,10 @@ def _set_interface_ref(self, v, load=False):
   def _unset_interface_ref(self):
     self.__interface_ref = YANGDynClass(base=yc_interface_ref_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface_interface_ref, is_container='container', yang_name="interface-ref", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  interface_ref = builtins.property(_get_interface_ref, _set_interface_ref)
+  interface_ref = __builtin__.property(_get_interface_ref, _set_interface_ref)
 
 
-  _pyangbind_elements = {'interface_ref': interface_ref, }
+  _pyangbind_elements = OrderedDict([('interface_ref', interface_ref), ])
 
 
 class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions_config(PybindBase):
@@ -3176,15 +3311,19 @@ class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actio
 
   YANG Description: Config data for ACL actions
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__forwarding_action','__log_action',)
+  __slots__ = ('_path_helper', '_extmethods', '__forwarding_action','__log_action',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
-    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -3211,7 +3350,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'actions', 'config']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'actions', u'config']
 
   def _get_forwarding_action(self):
     """
@@ -3236,12 +3375,12 @@ def _set_forwarding_action(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """forwarding_action must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'DROP': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:REJECT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'ACCEPT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'REJECT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:DROP': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
         })
 
     self.__forwarding_action = t
@@ -3249,7 +3388,7 @@ def _set_forwarding_action(self, v, load=False):
       self._set()
 
   def _unset_forwarding_action(self):
-    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
 
 
   def _get_log_action(self):
@@ -3277,12 +3416,12 @@ def _set_log_action(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """log_action must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'LOG_NONE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}},), default=unicode("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)""",
         })
 
     self.__log_action = t
@@ -3290,13 +3429,13 @@ def _set_log_action(self, v, load=False):
       self._set()
 
   def _unset_log_action(self):
-    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
+    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=True)
 
-  forwarding_action = builtins.property(_get_forwarding_action, _set_forwarding_action)
-  log_action = builtins.property(_get_log_action, _set_log_action)
+  forwarding_action = __builtin__.property(_get_forwarding_action, _set_forwarding_action)
+  log_action = __builtin__.property(_get_log_action, _set_log_action)
 
 
-  _pyangbind_elements = {'forwarding_action': forwarding_action, 'log_action': log_action, }
+  _pyangbind_elements = OrderedDict([('forwarding_action', forwarding_action), ('log_action', log_action), ])
 
 
 class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions_state(PybindBase):
@@ -3308,15 +3447,19 @@ class yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_action
 
   YANG Description: State information for ACL actions
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__forwarding_action','__log_action',)
+  __slots__ = ('_path_helper', '_extmethods', '__forwarding_action','__log_action',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
-    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -3343,7 +3486,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'actions', 'state']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'actions', u'state']
 
   def _get_forwarding_action(self):
     """
@@ -3368,12 +3511,12 @@ def _set_forwarding_action(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """forwarding_action must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'DROP': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:REJECT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'ACCEPT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'REJECT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:DROP': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
         })
 
     self.__forwarding_action = t
@@ -3381,7 +3524,7 @@ def _set_forwarding_action(self, v, load=False):
       self._set()
 
   def _unset_forwarding_action(self):
-    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'REJECT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:ACCEPT': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:DROP': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__forwarding_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'REJECT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:ACCEPT': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:DROP': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), is_leaf=True, yang_name="forwarding-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
 
   def _get_log_action(self):
@@ -3409,12 +3552,12 @@ def _set_log_action(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """log_action must be of a type compatible with identityref""",
           'defined-type': "openconfig-acl:identityref",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=unicode, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'LOG_NONE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {'@namespace': u'http://openconfig.net/yang/acl', '@module': u'openconfig-acl'}},), default=unicode("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)""",
         })
 
     self.__log_action = t
@@ -3422,13 +3565,13 @@ def _set_log_action(self, v, load=False):
       self._set()
 
   def _unset_log_action(self):
-    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=str, restriction_type="dict_key", restriction_arg={'LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_SYSLOG': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}, 'oc-acl:LOG_NONE': {'@namespace': 'http://openconfig.net/yang/acl', '@module': 'openconfig-acl'}},), default=str("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
+    self.__log_action = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_type="dict_key", restriction_arg={u'LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_SYSLOG': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}, u'oc-acl:LOG_NONE': {u'@namespace': u'http://openconfig.net/yang/acl', u'@module': u'openconfig-acl'}},), default=six.text_type("LOG_NONE"), is_leaf=True, yang_name="log-action", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='identityref', is_config=False)
 
-  forwarding_action = builtins.property(_get_forwarding_action)
-  log_action = builtins.property(_get_log_action)
+  forwarding_action = __builtin__.property(_get_forwarding_action)
+  log_action = __builtin__.property(_get_log_action)
 
 
-  _pyangbind_elements = {'forwarding_action': forwarding_action, 'log_action': log_action, }
+  _pyangbind_elements = OrderedDict([('forwarding_action', forwarding_action), ('log_action', log_action), ])
 
 
 class yc_actions_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions(PybindBase):
@@ -3441,12 +3584,16 @@ class yc_actions_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_acti
   YANG Description: Enclosing container for list of ACL actions associated
 with an entry
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'actions'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'actions'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -3476,7 +3623,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry', 'actions']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'actions']
 
   def _get_config(self):
     """
@@ -3551,11 +3698,224 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+
+
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
+
+
+class yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp_config(PybindBase):
+  """
+  This class was auto-generated by the PythonClass plugin for PYANG
+  from YANG module openconfig-acl - based on the path /acl/acl-sets/acl-set/acl-entries/acl-entry/icmp/config. Each member element of
+  the container is represented as a class variable - with a specific
+  YANG type.
+  """
+  __slots__ = ('_path_helper', '_extmethods', '__type','__code',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
+
+  def __init__(self, *args, **kwargs):
+
+    self._path_helper = False
+
+    self._extmethods = False
+    self.__code = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+    self.__type = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+
+    load = kwargs.pop("load", None)
+    if args:
+      if len(args) > 1:
+        raise TypeError("cannot create a YANG container with >1 argument")
+      all_attr = True
+      for e in self._pyangbind_elements:
+        if not hasattr(args[0], e):
+          all_attr = False
+          break
+      if not all_attr:
+        raise ValueError("Supplied object did not have the correct attributes")
+      for e in self._pyangbind_elements:
+        nobj = getattr(args[0], e)
+        if nobj._changed() is False:
+          continue
+        setmethod = getattr(self, "_set_%s" % e)
+        if load is None:
+          setmethod(getattr(args[0], e))
+        else:
+          setmethod(getattr(args[0], e), load=load)
+
+  def _path(self):
+    if hasattr(self, "_parent"):
+      return self._parent._path()+[self._yang_name]
+    else:
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'icmp', u'config']
+
+  def _get_type(self):
+    """
+    Getter method for type, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config/type (icmp-type-type)
+
+    YANG Description: ICMP(V6) type.
+    """
+    return self.__type
+      
+  def _set_type(self, v, load=False):
+    """
+    Setter method for type, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config/type (icmp-type-type)
+    If this variable is read-only (config: false) in the
+    source YANG file, then _set_type is considered as a private
+    method. Backends looking to populate this variable should
+    do so via calling thisObj._set_type() directly.
+
+    YANG Description: ICMP(V6) type.
+    """
+    if hasattr(v, "_utype"):
+      v = v._utype(v)
+    try:
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+    except (TypeError, ValueError):
+      raise ValueError({
+          'error-string': """type must be of a type compatible with icmp-type-type""",
+          'defined-type': "sonic-acl-extension:icmp-type-type",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)""",
+        })
+
+    self.__type = t
+    if hasattr(self, '_set'):
+      self._set()
+
+  def _unset_type(self):
+    self.__type = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+
+
+  def _get_code(self):
+    """
+    Getter method for code, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config/code (icmp-code-type)
+
+    YANG Description: ICMP(V6) code.
+    """
+    return self.__code
+      
+  def _set_code(self, v, load=False):
+    """
+    Setter method for code, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config/code (icmp-code-type)
+    If this variable is read-only (config: false) in the
+    source YANG file, then _set_code is considered as a private
+    method. Backends looking to populate this variable should
+    do so via calling thisObj._set_code() directly.
+
+    YANG Description: ICMP(V6) code.
+    """
+    if hasattr(v, "_utype"):
+      v = v._utype(v)
+    try:
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+    except (TypeError, ValueError):
+      raise ValueError({
+          'error-string': """code must be of a type compatible with icmp-code-type""",
+          'defined-type': "sonic-acl-extension:icmp-code-type",
+          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)""",
+        })
+
+    self.__code = t
+    if hasattr(self, '_set'):
+      self._set()
+
+  def _unset_code(self):
+    self.__code = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+
+  type = __builtin__.property(_get_type, _set_type)
+  code = __builtin__.property(_get_code, _set_code)
+
+
+  _pyangbind_elements = OrderedDict([('type', type), ('code', code), ])
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+class yc_icmp_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp(PybindBase):
+  """
+  This class was auto-generated by the PythonClass plugin for PYANG
+  from YANG module openconfig-acl - based on the path /acl/acl-sets/acl-set/acl-entries/acl-entry/icmp. Each member element of
+  the container is represented as a class variable - with a specific
+  YANG type.
+  """
+  __slots__ = ('_path_helper', '_extmethods', '__config',)
+
+  _yang_name = 'icmp'
+
+  _pybind_generated_by = 'container'
+
+  def __init__(self, *args, **kwargs):
+
+    self._path_helper = False
+
+    self._extmethods = False
+    self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
+
+    load = kwargs.pop("load", None)
+    if args:
+      if len(args) > 1:
+        raise TypeError("cannot create a YANG container with >1 argument")
+      all_attr = True
+      for e in self._pyangbind_elements:
+        if not hasattr(args[0], e):
+          all_attr = False
+          break
+      if not all_attr:
+        raise ValueError("Supplied object did not have the correct attributes")
+      for e in self._pyangbind_elements:
+        nobj = getattr(args[0], e)
+        if nobj._changed() is False:
+          continue
+        setmethod = getattr(self, "_set_%s" % e)
+        if load is None:
+          setmethod(getattr(args[0], e))
+        else:
+          setmethod(getattr(args[0], e), load=load)
+
+  def _path(self):
+    if hasattr(self, "_parent"):
+      return self._parent._path()+[self._yang_name]
+    else:
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry', u'icmp']
+
+  def _get_config(self):
+    """
+    Getter method for config, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config (container)
+    """
+    return self.__config
+      
+  def _set_config(self, v, load=False):
+    """
+    Setter method for config, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp/config (container)
+    If this variable is read-only (config: false) in the
+    source YANG file, then _set_config is considered as a private
+    method. Backends looking to populate this variable should
+    do so via calling thisObj._set_config() directly.
+    """
+    if hasattr(v, "_utype"):
+      v = v._utype(v)
+    try:
+      t = YANGDynClass(v,base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
+    except (TypeError, ValueError):
+      raise ValueError({
+          'error-string': """config must be of a type compatible with container""",
+          'defined-type': "container",
+          'generated-type': """YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)""",
+        })
+
+    self.__config = t
+    if hasattr(self, '_set'):
+      self._set()
+
+  def _unset_config(self):
+    self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
+
+  config = __builtin__.property(_get_config, _set_config)
+
+
+  _pyangbind_elements = OrderedDict([('config', config), ])
 
 
 class yc_acl_entry_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry(PybindBase):
@@ -3567,19 +3927,24 @@ class yc_acl_entry_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry(Py
 
   YANG Description: List of ACL entries comprising an ACL set
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__config','__state','__l2','__ip','__transport','__input_interface','__actions',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__config','__state','__l2','__ip','__transport','__input_interface','__actions','__icmp',)
+
+  _yang_name = 'acl-entry'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entry'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__ip = YANGDynClass(base=yc_ip_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_ip, is_container='container', yang_name="ip", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__input_interface = YANGDynClass(base=yc_input_interface_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_input_interface, is_container='container', yang_name="input-interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__actions = YANGDynClass(base=yc_actions_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions, is_container='container', yang_name="actions", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     self.__l2 = YANGDynClass(base=yc_l2_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_l2, is_container='container', yang_name="l2", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
+    self.__icmp = YANGDynClass(base=yc_icmp_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp, is_container='container', yang_name="icmp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__transport = YANGDynClass(base=yc_transport_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_transport, is_container='container', yang_name="transport", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
@@ -3608,7 +3973,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries', 'acl-entry']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries', u'acl-entry']
 
   def _get_sequence_id(self):
     """
@@ -3636,12 +4001,12 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__sequence_id = t
@@ -3649,7 +4014,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_config(self):
@@ -3912,17 +4277,51 @@ def _set_actions(self, v, load=False):
   def _unset_actions(self):
     self.__actions = YANGDynClass(base=yc_actions_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_actions, is_container='container', yang_name="actions", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  sequence_id = builtins.property(_get_sequence_id, _set_sequence_id)
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
-  l2 = builtins.property(_get_l2, _set_l2)
-  ip = builtins.property(_get_ip, _set_ip)
-  transport = builtins.property(_get_transport, _set_transport)
-  input_interface = builtins.property(_get_input_interface, _set_input_interface)
-  actions = builtins.property(_get_actions, _set_actions)
+
+  def _get_icmp(self):
+    """
+    Getter method for icmp, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp (container)
+    """
+    return self.__icmp
+      
+  def _set_icmp(self, v, load=False):
+    """
+    Setter method for icmp, mapped from YANG variable /acl/acl_sets/acl_set/acl_entries/acl_entry/icmp (container)
+    If this variable is read-only (config: false) in the
+    source YANG file, then _set_icmp is considered as a private
+    method. Backends looking to populate this variable should
+    do so via calling thisObj._set_icmp() directly.
+    """
+    if hasattr(v, "_utype"):
+      v = v._utype(v)
+    try:
+      t = YANGDynClass(v,base=yc_icmp_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp, is_container='container', yang_name="icmp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
+    except (TypeError, ValueError):
+      raise ValueError({
+          'error-string': """icmp must be of a type compatible with container""",
+          'defined-type': "container",
+          'generated-type': """YANGDynClass(base=yc_icmp_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp, is_container='container', yang_name="icmp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)""",
+        })
+
+    self.__icmp = t
+    if hasattr(self, '_set'):
+      self._set()
+
+  def _unset_icmp(self):
+    self.__icmp = YANGDynClass(base=yc_icmp_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry_icmp, is_container='container', yang_name="icmp", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='container', is_config=True)
+
+  sequence_id = __builtin__.property(_get_sequence_id, _set_sequence_id)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+  l2 = __builtin__.property(_get_l2, _set_l2)
+  ip = __builtin__.property(_get_ip, _set_ip)
+  transport = __builtin__.property(_get_transport, _set_transport)
+  input_interface = __builtin__.property(_get_input_interface, _set_input_interface)
+  actions = __builtin__.property(_get_actions, _set_actions)
+  icmp = __builtin__.property(_get_icmp, _set_icmp)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'config': config, 'state': state, 'l2': l2, 'ip': ip, 'transport': transport, 'input_interface': input_interface, 'actions': actions, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('config', config), ('state', state), ('l2', l2), ('ip', ip), ('transport', transport), ('input_interface', input_interface), ('actions', actions), ('icmp', icmp), ])
 
 
 class yc_acl_entries_openconfig_acl__acl_acl_sets_acl_set_acl_entries(PybindBase):
@@ -3934,12 +4333,16 @@ class yc_acl_entries_openconfig_acl__acl_acl_sets_acl_set_acl_entries(PybindBase
 
   YANG Description: Access list entries container
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__acl_entry',)
+  __slots__ = ('_path_helper', '_extmethods', '__acl_entry',)
+
+  _yang_name = 'acl-entries'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entries'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
@@ -3968,7 +4371,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set', 'acl-entries']
+      return [u'acl', u'acl-sets', u'acl-set', u'acl-entries']
 
   def _get_acl_entry(self):
     """
@@ -4006,10 +4409,10 @@ def _set_acl_entry(self, v, load=False):
   def _unset_acl_entry(self):
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_acl_sets_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
-  acl_entry = builtins.property(_get_acl_entry, _set_acl_entry)
+  acl_entry = __builtin__.property(_get_acl_entry, _set_acl_entry)
 
 
-  _pyangbind_elements = {'acl_entry': acl_entry, }
+  _pyangbind_elements = OrderedDict([('acl_entry', acl_entry), ])
 
 
 class yc_acl_set_openconfig_acl__acl_acl_sets_acl_set(PybindBase):
@@ -4022,16 +4425,20 @@ class yc_acl_set_openconfig_acl__acl_acl_sets_acl_set(PybindBase):
   YANG Description: List of ACL sets, each comprising of a list of ACL
 entries
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__name','__config','__state','__acl_entries',)
+  __slots__ = ('_path_helper', '_extmethods', '__name','__config','__state','__acl_entries',)
+
+  _yang_name = 'acl-set'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-set'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_acl_sets_acl_set_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_acl_sets_acl_set_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_acl_sets_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
     load = kwargs.pop("load", None)
@@ -4059,7 +4466,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets', 'acl-set']
+      return [u'acl', u'acl-sets', u'acl-set']
 
   def _get_name(self):
     """
@@ -4087,12 +4494,12 @@ def _set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__name = t
@@ -4100,7 +4507,7 @@ def _set_name(self, v, load=False):
       self._set()
 
   def _unset_name(self):
-    self.__name = YANGDynClass(base=str, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_config(self):
@@ -4213,13 +4620,13 @@ def _set_acl_entries(self, v, load=False):
   def _unset_acl_entries(self):
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_acl_sets_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  name = builtins.property(_get_name, _set_name)
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
-  acl_entries = builtins.property(_get_acl_entries, _set_acl_entries)
+  name = __builtin__.property(_get_name, _set_name)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+  acl_entries = __builtin__.property(_get_acl_entries, _set_acl_entries)
 
 
-  _pyangbind_elements = {'name': name, 'config': config, 'state': state, 'acl_entries': acl_entries, }
+  _pyangbind_elements = OrderedDict([('name', name), ('config', config), ('state', state), ('acl_entries', acl_entries), ])
 
 
 class yc_acl_sets_openconfig_acl__acl_acl_sets(PybindBase):
@@ -4231,12 +4638,16 @@ class yc_acl_sets_openconfig_acl__acl_acl_sets(PybindBase):
 
   YANG Description: Access list entries variables enclosing container
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__acl_set',)
+  __slots__ = ('_path_helper', '_extmethods', '__acl_set',)
+
+  _yang_name = 'acl-sets'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-sets'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__acl_set = YANGDynClass(base=YANGListType("name",yc_acl_set_openconfig_acl__acl_acl_sets_acl_set, yang_name="acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='name', extensions=None), is_container='list', yang_name="acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
@@ -4265,7 +4676,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'acl-sets']
+      return [u'acl', u'acl-sets']
 
   def _get_acl_set(self):
     """
@@ -4305,10 +4716,10 @@ def _set_acl_set(self, v, load=False):
   def _unset_acl_set(self):
     self.__acl_set = YANGDynClass(base=YANGListType("name",yc_acl_set_openconfig_acl__acl_acl_sets_acl_set, yang_name="acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='name', extensions=None), is_container='list', yang_name="acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
-  acl_set = builtins.property(_get_acl_set, _set_acl_set)
+  acl_set = __builtin__.property(_get_acl_set, _set_acl_set)
 
 
-  _pyangbind_elements = {'acl_set': acl_set, }
+  _pyangbind_elements = OrderedDict([('acl_set', acl_set), ])
 
 
 class yc_config_openconfig_acl__acl_interfaces_interface_config(PybindBase):
@@ -4320,14 +4731,18 @@ class yc_config_openconfig_acl__acl_interfaces_interface_config(PybindBase):
 
   YANG Description: Configuration for ACL per-interface data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__id',)
+  __slots__ = ('_path_helper', '_extmethods', '__id',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -4354,7 +4769,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'config']
+      return [u'acl', u'interfaces', u'interface', u'config']
 
   def _get_id(self):
     """
@@ -4379,12 +4794,12 @@ def _set_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """id must be of a type compatible with oc-if:interface-id""",
           'defined-type': "oc-if:interface-id",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)""",
         })
 
     self.__id = t
@@ -4392,12 +4807,12 @@ def _set_id(self, v, load=False):
       self._set()
 
   def _unset_id(self):
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=True)
 
-  id = builtins.property(_get_id, _set_id)
+  id = __builtin__.property(_get_id, _set_id)
 
 
-  _pyangbind_elements = {'id': id, }
+  _pyangbind_elements = OrderedDict([('id', id), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_state(PybindBase):
@@ -4409,14 +4824,18 @@ class yc_state_openconfig_acl__acl_interfaces_interface_state(PybindBase):
 
   YANG Description: Operational state for ACL per-interface data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__id',)
+  __slots__ = ('_path_helper', '_extmethods', '__id',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -4443,7 +4862,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'state']
+      return [u'acl', u'interfaces', u'interface', u'state']
 
   def _get_id(self):
     """
@@ -4468,12 +4887,12 @@ def _set_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """id must be of a type compatible with oc-if:interface-id""",
           'defined-type': "oc-if:interface-id",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)""",
         })
 
     self.__id = t
@@ -4481,12 +4900,12 @@ def _set_id(self, v, load=False):
       self._set()
 
   def _unset_id(self):
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='oc-if:interface-id', is_config=False)
 
-  id = builtins.property(_get_id)
+  id = __builtin__.property(_get_id)
 
 
-  _pyangbind_elements = {'id': id, }
+  _pyangbind_elements = OrderedDict([('id', id), ])
 
 
 class yc_config_openconfig_acl__acl_interfaces_interface_interface_ref_config(PybindBase):
@@ -4498,15 +4917,19 @@ class yc_config_openconfig_acl__acl_interfaces_interface_interface_ref_config(Py
 
   YANG Description: Configured reference to interface / subinterface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface','__subinterface',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface','__subinterface',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -4533,7 +4956,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'interface-ref', 'config']
+      return [u'acl', u'interfaces', u'interface', u'interface-ref', u'config']
 
   def _get_interface(self):
     """
@@ -4560,12 +4983,12 @@ def _set_interface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """interface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__interface = t
@@ -4573,7 +4996,7 @@ def _set_interface(self, v, load=False):
       self._set()
 
   def _unset_interface(self):
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_subinterface(self):
@@ -4603,12 +5026,12 @@ def _set_subinterface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """subinterface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__subinterface = t
@@ -4616,13 +5039,13 @@ def _set_subinterface(self, v, load=False):
       self._set()
 
   def _unset_subinterface(self):
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
-  interface = builtins.property(_get_interface, _set_interface)
-  subinterface = builtins.property(_get_subinterface, _set_subinterface)
+  interface = __builtin__.property(_get_interface, _set_interface)
+  subinterface = __builtin__.property(_get_subinterface, _set_subinterface)
 
 
-  _pyangbind_elements = {'interface': interface, 'subinterface': subinterface, }
+  _pyangbind_elements = OrderedDict([('interface', interface), ('subinterface', subinterface), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_interface_ref_state(PybindBase):
@@ -4634,15 +5057,19 @@ class yc_state_openconfig_acl__acl_interfaces_interface_interface_ref_state(Pybi
 
   YANG Description: Operational state for interface-ref
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface','__subinterface',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface','__subinterface',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -4669,7 +5096,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'interface-ref', 'state']
+      return [u'acl', u'interfaces', u'interface', u'interface-ref', u'state']
 
   def _get_interface(self):
     """
@@ -4696,12 +5123,12 @@ def _set_interface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """interface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__interface = t
@@ -4709,7 +5136,7 @@ def _set_interface(self, v, load=False):
       self._set()
 
   def _unset_interface(self):
-    self.__interface = YANGDynClass(base=str, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__interface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_subinterface(self):
@@ -4739,12 +5166,12 @@ def _set_subinterface(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """subinterface must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__subinterface = t
@@ -4752,13 +5179,13 @@ def _set_subinterface(self, v, load=False):
       self._set()
 
   def _unset_subinterface(self):
-    self.__subinterface = YANGDynClass(base=str, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__subinterface = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="subinterface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
-  interface = builtins.property(_get_interface)
-  subinterface = builtins.property(_get_subinterface)
+  interface = __builtin__.property(_get_interface)
+  subinterface = __builtin__.property(_get_subinterface)
 
 
-  _pyangbind_elements = {'interface': interface, 'subinterface': subinterface, }
+  _pyangbind_elements = OrderedDict([('interface', interface), ('subinterface', subinterface), ])
 
 
 class yc_interface_ref_openconfig_acl__acl_interfaces_interface_interface_ref(PybindBase):
@@ -4770,12 +5197,16 @@ class yc_interface_ref_openconfig_acl__acl_interfaces_interface_interface_ref(Py
 
   YANG Description: Reference to an interface or subinterface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__config','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__config','__state',)
+
+  _yang_name = 'interface-ref'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'interface-ref'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_interface_ref_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_interfaces_interface_interface_ref_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -4805,7 +5236,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'interface-ref']
+      return [u'acl', u'interfaces', u'interface', u'interface-ref']
 
   def _get_config(self):
     """
@@ -4880,11 +5311,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_interface_ref_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
 
 
-  _pyangbind_elements = {'config': config, 'state': state, }
+  _pyangbind_elements = OrderedDict([('config', config), ('state', state), ])
 
 
 class yc_config_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_config(PybindBase):
@@ -4896,14 +5327,18 @@ class yc_config_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingres
 
   YANG Description: Configuration data 
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -4930,7 +5365,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set', 'config']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set', u'config']
 
   def _get_set_name(self):
     """
@@ -4953,12 +5388,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__set_name = t
@@ -4966,12 +5401,12 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
-  set_name = builtins.property(_get_set_name, _set_set_name)
+  set_name = __builtin__.property(_get_set_name, _set_set_name)
 
 
-  _pyangbind_elements = {'set_name': set_name, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_state(PybindBase):
@@ -4983,14 +5418,18 @@ class yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress
 
   YANG Description: Operational state data for interface ingress ACLs
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -5017,7 +5456,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set', 'state']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set', u'state']
 
   def _get_set_name(self):
     """
@@ -5040,12 +5479,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__set_name = t
@@ -5053,12 +5492,12 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
-  set_name = builtins.property(_get_set_name)
+  set_name = __builtin__.property(_get_set_name)
 
 
-  _pyangbind_elements = {'set_name': set_name, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry_state(PybindBase):
@@ -5070,16 +5509,20 @@ class yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress
 
   YANG Description: Operational state data for per-interface ACL entries
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__matched_packets','__matched_octets',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__matched_packets','__matched_octets',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -5106,7 +5549,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set', 'acl-entries', 'acl-entry', 'state']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set', u'acl-entries', u'acl-entry', u'state']
 
   def _get_sequence_id(self):
     """
@@ -5131,12 +5574,12 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__sequence_id = t
@@ -5144,7 +5587,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_matched_packets(self):
@@ -5194,7 +5637,7 @@ def _set_matched_packets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_packets must be of a type compatible with yang:counter64""",
@@ -5207,7 +5650,7 @@ def _set_matched_packets(self, v, load=False):
       self._set()
 
   def _unset_matched_packets(self):
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
 
   def _get_matched_octets(self):
@@ -5257,7 +5700,7 @@ def _set_matched_octets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_octets must be of a type compatible with yang:counter64""",
@@ -5270,14 +5713,14 @@ def _set_matched_octets(self, v, load=False):
       self._set()
 
   def _unset_matched_octets(self):
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
-  sequence_id = builtins.property(_get_sequence_id)
-  matched_packets = builtins.property(_get_matched_packets)
-  matched_octets = builtins.property(_get_matched_octets)
+  sequence_id = __builtin__.property(_get_sequence_id)
+  matched_packets = __builtin__.property(_get_matched_packets)
+  matched_octets = __builtin__.property(_get_matched_octets)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'matched_packets': matched_packets, 'matched_octets': matched_octets, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('matched_packets', matched_packets), ('matched_octets', matched_octets), ])
 
 
 class yc_acl_entry_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry(PybindBase):
@@ -5289,14 +5732,18 @@ class yc_acl_entry_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ing
 
   YANG Description: List of ACL entries assigned to an interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__state',)
+
+  _yang_name = 'acl-entry'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entry'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=False)
 
     load = kwargs.pop("load", None)
@@ -5324,7 +5771,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set', 'acl-entries', 'acl-entry']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set', u'acl-entries', u'acl-entry']
 
   def _get_sequence_id(self):
     """
@@ -5352,12 +5799,12 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__sequence_id = t
@@ -5365,7 +5812,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_state(self):
@@ -5404,11 +5851,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=False)
 
-  sequence_id = builtins.property(_get_sequence_id)
-  state = builtins.property(_get_state)
+  sequence_id = __builtin__.property(_get_sequence_id)
+  state = __builtin__.property(_get_state)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'state': state, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('state', state), ])
 
 
 class yc_acl_entries_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries(PybindBase):
@@ -5420,12 +5867,16 @@ class yc_acl_entries_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_i
 
   YANG Description: Enclosing container for list of references to ACLs
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__acl_entry',)
+  __slots__ = ('_path_helper', '_extmethods', '__acl_entry',)
+
+  _yang_name = 'acl-entries'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entries'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=False)
 
@@ -5454,7 +5905,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set', 'acl-entries']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set', u'acl-entries']
 
   def _get_acl_entry(self):
     """
@@ -5492,10 +5943,10 @@ def _set_acl_entry(self, v, load=False):
   def _unset_acl_entry(self):
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=False)
 
-  acl_entry = builtins.property(_get_acl_entry)
+  acl_entry = __builtin__.property(_get_acl_entry)
 
 
-  _pyangbind_elements = {'acl_entry': acl_entry, }
+  _pyangbind_elements = OrderedDict([('acl_entry', acl_entry), ])
 
 
 class yc_ingress_acl_set_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set(PybindBase):
@@ -5507,14 +5958,18 @@ class yc_ingress_acl_set_openconfig_acl__acl_interfaces_interface_ingress_acl_se
 
   YANG Description: List of ingress ACLs on the interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name','__config','__state','__acl_entries',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name','__config','__state','__acl_entries',)
+
+  _yang_name = 'ingress-acl-set'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'ingress-acl-set'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -5544,7 +5999,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets', 'ingress-acl-set']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets', u'ingress-acl-set']
 
   def _get_set_name(self):
     """
@@ -5572,12 +6027,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__set_name = t
@@ -5585,7 +6040,7 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_config(self):
@@ -5698,13 +6153,13 @@ def _set_acl_entries(self, v, load=False):
   def _unset_acl_entries(self):
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  set_name = builtins.property(_get_set_name, _set_set_name)
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
-  acl_entries = builtins.property(_get_acl_entries, _set_acl_entries)
+  set_name = __builtin__.property(_get_set_name, _set_set_name)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+  acl_entries = __builtin__.property(_get_acl_entries, _set_acl_entries)
 
 
-  _pyangbind_elements = {'set_name': set_name, 'config': config, 'state': state, 'acl_entries': acl_entries, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ('config', config), ('state', state), ('acl_entries', acl_entries), ])
 
 
 class yc_ingress_acl_sets_openconfig_acl__acl_interfaces_interface_ingress_acl_sets(PybindBase):
@@ -5717,12 +6172,16 @@ class yc_ingress_acl_sets_openconfig_acl__acl_interfaces_interface_ingress_acl_s
   YANG Description: Enclosing container the list of ingress ACLs on the
 interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__ingress_acl_set',)
+  __slots__ = ('_path_helper', '_extmethods', '__ingress_acl_set',)
+
+  _yang_name = 'ingress-acl-sets'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'ingress-acl-sets'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__ingress_acl_set = YANGDynClass(base=YANGListType("set_name",yc_ingress_acl_set_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set, yang_name="ingress-acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='set-name', extensions=None), is_container='list', yang_name="ingress-acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
@@ -5751,7 +6210,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'ingress-acl-sets']
+      return [u'acl', u'interfaces', u'interface', u'ingress-acl-sets']
 
   def _get_ingress_acl_set(self):
     """
@@ -5789,10 +6248,10 @@ def _set_ingress_acl_set(self, v, load=False):
   def _unset_ingress_acl_set(self):
     self.__ingress_acl_set = YANGDynClass(base=YANGListType("set_name",yc_ingress_acl_set_openconfig_acl__acl_interfaces_interface_ingress_acl_sets_ingress_acl_set, yang_name="ingress-acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='set-name', extensions=None), is_container='list', yang_name="ingress-acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
-  ingress_acl_set = builtins.property(_get_ingress_acl_set, _set_ingress_acl_set)
+  ingress_acl_set = __builtin__.property(_get_ingress_acl_set, _set_ingress_acl_set)
 
 
-  _pyangbind_elements = {'ingress_acl_set': ingress_acl_set, }
+  _pyangbind_elements = OrderedDict([('ingress_acl_set', ingress_acl_set), ])
 
 
 class yc_config_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_config(PybindBase):
@@ -5804,14 +6263,18 @@ class yc_config_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_
 
   YANG Description: Configuration data 
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name',)
+
+  _yang_name = 'config'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'config'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -5838,7 +6301,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set', 'config']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set', u'config']
 
   def _get_set_name(self):
     """
@@ -5861,12 +6324,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__set_name = t
@@ -5874,12 +6337,12 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
-  set_name = builtins.property(_get_set_name, _set_set_name)
+  set_name = __builtin__.property(_get_set_name, _set_set_name)
 
 
-  _pyangbind_elements = {'set_name': set_name, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_state(PybindBase):
@@ -5891,14 +6354,18 @@ class yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_a
 
   YANG Description: Operational state data for interface egress ACLs
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -5925,7 +6392,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set', 'state']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set', u'state']
 
   def _get_set_name(self):
     """
@@ -5948,12 +6415,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__set_name = t
@@ -5961,12 +6428,12 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
-  set_name = builtins.property(_get_set_name)
+  set_name = __builtin__.property(_get_set_name)
 
 
-  _pyangbind_elements = {'set_name': set_name, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ])
 
 
 class yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry_state(PybindBase):
@@ -5978,16 +6445,20 @@ class yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_a
 
   YANG Description: Operational state data for per-interface ACL entries
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__matched_packets','__matched_octets',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__matched_packets','__matched_octets',)
+
+  _yang_name = 'state'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'state'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
     load = kwargs.pop("load", None)
     if args:
@@ -6014,7 +6485,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set', 'acl-entries', 'acl-entry', 'state']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set', u'acl-entries', u'acl-entry', u'state']
 
   def _get_sequence_id(self):
     """
@@ -6039,12 +6510,12 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__sequence_id = t
@@ -6052,7 +6523,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_matched_packets(self):
@@ -6102,7 +6573,7 @@ def _set_matched_packets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_packets must be of a type compatible with yang:counter64""",
@@ -6115,7 +6586,7 @@ def _set_matched_packets(self, v, load=False):
       self._set()
 
   def _unset_matched_packets(self):
-    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_packets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-packets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
 
   def _get_matched_octets(self):
@@ -6165,7 +6636,7 @@ def _set_matched_octets(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+      t = YANGDynClass(v,base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """matched_octets must be of a type compatible with yang:counter64""",
@@ -6178,14 +6649,14 @@ def _set_matched_octets(self, v, load=False):
       self._set()
 
   def _unset_matched_octets(self):
-    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=int, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
+    self.__matched_octets = YANGDynClass(base=RestrictedClassType(base_type=long, restriction_dict={'range':  ['0..18446744073709551615']}, int_size=64), is_leaf=True, yang_name="matched-octets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:counter64', is_config=False)
 
-  sequence_id = builtins.property(_get_sequence_id)
-  matched_packets = builtins.property(_get_matched_packets)
-  matched_octets = builtins.property(_get_matched_octets)
+  sequence_id = __builtin__.property(_get_sequence_id)
+  matched_packets = __builtin__.property(_get_matched_packets)
+  matched_octets = __builtin__.property(_get_matched_octets)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'matched_packets': matched_packets, 'matched_octets': matched_octets, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('matched_packets', matched_packets), ('matched_octets', matched_octets), ])
 
 
 class yc_acl_entry_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry(PybindBase):
@@ -6197,14 +6668,18 @@ class yc_acl_entry_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egre
 
   YANG Description: List of ACL entries assigned to an interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__sequence_id','__state',)
+  __slots__ = ('_path_helper', '_extmethods', '__sequence_id','__state',)
+
+  _yang_name = 'acl-entry'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entry'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=False)
 
     load = kwargs.pop("load", None)
@@ -6232,7 +6707,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set', 'acl-entries', 'acl-entry']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set', u'acl-entries', u'acl-entry']
 
   def _get_sequence_id(self):
     """
@@ -6260,12 +6735,12 @@ def _set_sequence_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """sequence_id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)""",
         })
 
     self.__sequence_id = t
@@ -6273,7 +6748,7 @@ def _set_sequence_id(self, v, load=False):
       self._set()
 
   def _unset_sequence_id(self):
-    self.__sequence_id = YANGDynClass(base=str, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
+    self.__sequence_id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="sequence-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=False)
 
 
   def _get_state(self):
@@ -6312,11 +6787,11 @@ def _set_state(self, v, load=False):
   def _unset_state(self):
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=False)
 
-  sequence_id = builtins.property(_get_sequence_id)
-  state = builtins.property(_get_state)
+  sequence_id = __builtin__.property(_get_sequence_id)
+  state = __builtin__.property(_get_state)
 
 
-  _pyangbind_elements = {'sequence_id': sequence_id, 'state': state, }
+  _pyangbind_elements = OrderedDict([('sequence_id', sequence_id), ('state', state), ])
 
 
 class yc_acl_entries_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries(PybindBase):
@@ -6328,12 +6803,16 @@ class yc_acl_entries_openconfig_acl__acl_interfaces_interface_egress_acl_sets_eg
 
   YANG Description: Enclosing container for list of references to ACLs
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__acl_entry',)
+  __slots__ = ('_path_helper', '_extmethods', '__acl_entry',)
+
+  _yang_name = 'acl-entries'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl-entries'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=False)
 
@@ -6362,7 +6841,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set', 'acl-entries']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set', u'acl-entries']
 
   def _get_acl_entry(self):
     """
@@ -6400,10 +6879,10 @@ def _set_acl_entry(self, v, load=False):
   def _unset_acl_entry(self):
     self.__acl_entry = YANGDynClass(base=YANGListType("sequence_id",yc_acl_entry_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries_acl_entry, yang_name="acl-entry", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='sequence-id', extensions=None), is_container='list', yang_name="acl-entry", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=False)
 
-  acl_entry = builtins.property(_get_acl_entry)
+  acl_entry = __builtin__.property(_get_acl_entry)
 
 
-  _pyangbind_elements = {'acl_entry': acl_entry, }
+  _pyangbind_elements = OrderedDict([('acl_entry', acl_entry), ])
 
 
 class yc_egress_acl_set_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set(PybindBase):
@@ -6415,14 +6894,18 @@ class yc_egress_acl_set_openconfig_acl__acl_interfaces_interface_egress_acl_sets
 
   YANG Description: List of egress ACLs on the interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__set_name','__config','__state','__acl_entries',)
+  __slots__ = ('_path_helper', '_extmethods', '__set_name','__config','__state','__acl_entries',)
+
+  _yang_name = 'egress-acl-set'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'egress-acl-set'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -6452,7 +6935,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets', 'egress-acl-set']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets', u'egress-acl-set']
 
   def _get_set_name(self):
     """
@@ -6480,12 +6963,12 @@ def _set_set_name(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """set_name must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__set_name = t
@@ -6493,7 +6976,7 @@ def _set_set_name(self, v, load=False):
       self._set()
 
   def _unset_set_name(self):
-    self.__set_name = YANGDynClass(base=str, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__set_name = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="set-name", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_config(self):
@@ -6606,13 +7089,13 @@ def _set_acl_entries(self, v, load=False):
   def _unset_acl_entries(self):
     self.__acl_entries = YANGDynClass(base=yc_acl_entries_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set_acl_entries, is_container='container', yang_name="acl-entries", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  set_name = builtins.property(_get_set_name, _set_set_name)
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
-  acl_entries = builtins.property(_get_acl_entries, _set_acl_entries)
+  set_name = __builtin__.property(_get_set_name, _set_set_name)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+  acl_entries = __builtin__.property(_get_acl_entries, _set_acl_entries)
 
 
-  _pyangbind_elements = {'set_name': set_name, 'config': config, 'state': state, 'acl_entries': acl_entries, }
+  _pyangbind_elements = OrderedDict([('set_name', set_name), ('config', config), ('state', state), ('acl_entries', acl_entries), ])
 
 
 class yc_egress_acl_sets_openconfig_acl__acl_interfaces_interface_egress_acl_sets(PybindBase):
@@ -6625,12 +7108,16 @@ class yc_egress_acl_sets_openconfig_acl__acl_interfaces_interface_egress_acl_set
   YANG Description: Enclosing container the list of egress ACLs on the
 interface
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__egress_acl_set',)
+  __slots__ = ('_path_helper', '_extmethods', '__egress_acl_set',)
+
+  _yang_name = 'egress-acl-sets'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'egress-acl-sets'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__egress_acl_set = YANGDynClass(base=YANGListType("set_name",yc_egress_acl_set_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set, yang_name="egress-acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='set-name', extensions=None), is_container='list', yang_name="egress-acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
@@ -6659,7 +7146,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface', 'egress-acl-sets']
+      return [u'acl', u'interfaces', u'interface', u'egress-acl-sets']
 
   def _get_egress_acl_set(self):
     """
@@ -6697,10 +7184,10 @@ def _set_egress_acl_set(self, v, load=False):
   def _unset_egress_acl_set(self):
     self.__egress_acl_set = YANGDynClass(base=YANGListType("set_name",yc_egress_acl_set_openconfig_acl__acl_interfaces_interface_egress_acl_sets_egress_acl_set, yang_name="egress-acl-set", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='set-name', extensions=None), is_container='list', yang_name="egress-acl-set", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
-  egress_acl_set = builtins.property(_get_egress_acl_set, _set_egress_acl_set)
+  egress_acl_set = __builtin__.property(_get_egress_acl_set, _set_egress_acl_set)
 
 
-  _pyangbind_elements = {'egress_acl_set': egress_acl_set, }
+  _pyangbind_elements = OrderedDict([('egress_acl_set', egress_acl_set), ])
 
 
 class yc_interface_openconfig_acl__acl_interfaces_interface(PybindBase):
@@ -6712,18 +7199,22 @@ class yc_interface_openconfig_acl__acl_interfaces_interface(PybindBase):
 
   YANG Description: List of interfaces on which ACLs are set
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__id','__config','__state','__interface_ref','__ingress_acl_sets','__egress_acl_sets',)
+  __slots__ = ('_path_helper', '_extmethods', '__id','__config','__state','__interface_ref','__ingress_acl_sets','__egress_acl_sets',)
+
+  _yang_name = 'interface'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'interface'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__ingress_acl_sets = YANGDynClass(base=yc_ingress_acl_sets_openconfig_acl__acl_interfaces_interface_ingress_acl_sets, is_container='container', yang_name="ingress-acl-sets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__egress_acl_sets = YANGDynClass(base=yc_egress_acl_sets_openconfig_acl__acl_interfaces_interface_egress_acl_sets, is_container='container', yang_name="egress-acl-sets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_interfaces_interface_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__config = YANGDynClass(base=yc_config_openconfig_acl__acl_interfaces_interface_config, is_container='container', yang_name="config", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     self.__interface_ref = YANGDynClass(base=yc_interface_ref_openconfig_acl__acl_interfaces_interface_interface_ref, is_container='container', yang_name="interface-ref", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
     load = kwargs.pop("load", None)
@@ -6751,7 +7242,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces', 'interface']
+      return [u'acl', u'interfaces', u'interface']
 
   def _get_id(self):
     """
@@ -6779,12 +7270,12 @@ def _set_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+      t = YANGDynClass(v,base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """id must be of a type compatible with leafref""",
           'defined-type': "leafref",
-          'generated-type': """YANGDynClass(base=unicode, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
+          'generated-type': """YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)""",
         })
 
     self.__id = t
@@ -6792,7 +7283,7 @@ def _set_id(self, v, load=False):
       self._set()
 
   def _unset_id(self):
-    self.__id = YANGDynClass(base=str, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
+    self.__id = YANGDynClass(base=six.text_type, is_leaf=True, yang_name="id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, is_keyval=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='leafref', is_config=True)
 
 
   def _get_config(self):
@@ -6983,15 +7474,15 @@ def _set_egress_acl_sets(self, v, load=False):
   def _unset_egress_acl_sets(self):
     self.__egress_acl_sets = YANGDynClass(base=yc_egress_acl_sets_openconfig_acl__acl_interfaces_interface_egress_acl_sets, is_container='container', yang_name="egress-acl-sets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  id = builtins.property(_get_id, _set_id)
-  config = builtins.property(_get_config, _set_config)
-  state = builtins.property(_get_state, _set_state)
-  interface_ref = builtins.property(_get_interface_ref, _set_interface_ref)
-  ingress_acl_sets = builtins.property(_get_ingress_acl_sets, _set_ingress_acl_sets)
-  egress_acl_sets = builtins.property(_get_egress_acl_sets, _set_egress_acl_sets)
+  id = __builtin__.property(_get_id, _set_id)
+  config = __builtin__.property(_get_config, _set_config)
+  state = __builtin__.property(_get_state, _set_state)
+  interface_ref = __builtin__.property(_get_interface_ref, _set_interface_ref)
+  ingress_acl_sets = __builtin__.property(_get_ingress_acl_sets, _set_ingress_acl_sets)
+  egress_acl_sets = __builtin__.property(_get_egress_acl_sets, _set_egress_acl_sets)
 
 
-  _pyangbind_elements = {'id': id, 'config': config, 'state': state, 'interface_ref': interface_ref, 'ingress_acl_sets': ingress_acl_sets, 'egress_acl_sets': egress_acl_sets, }
+  _pyangbind_elements = OrderedDict([('id', id), ('config', config), ('state', state), ('interface_ref', interface_ref), ('ingress_acl_sets', ingress_acl_sets), ('egress_acl_sets', egress_acl_sets), ])
 
 
 class yc_interfaces_openconfig_acl__acl_interfaces(PybindBase):
@@ -7004,12 +7495,16 @@ class yc_interfaces_openconfig_acl__acl_interfaces(PybindBase):
   YANG Description: Enclosing container for the list of interfaces on which
 ACLs are set
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__interface',)
+  __slots__ = ('_path_helper', '_extmethods', '__interface',)
+
+  _yang_name = 'interfaces'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'interfaces'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__interface = YANGDynClass(base=YANGListType("id",yc_interface_openconfig_acl__acl_interfaces_interface, yang_name="interface", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='id', extensions=None), is_container='list', yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
@@ -7038,7 +7533,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl', 'interfaces']
+      return [u'acl', u'interfaces']
 
   def _get_interface(self):
     """
@@ -7076,10 +7571,10 @@ def _set_interface(self, v, load=False):
   def _unset_interface(self):
     self.__interface = YANGDynClass(base=YANGListType("id",yc_interface_openconfig_acl__acl_interfaces_interface, yang_name="interface", parent=self, is_container='list', user_ordered=False, path_helper=self._path_helper, yang_keys='id', extensions=None), is_container='list', yang_name="interface", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='list', is_config=True)
 
-  interface = builtins.property(_get_interface, _set_interface)
+  interface = __builtin__.property(_get_interface, _set_interface)
 
 
-  _pyangbind_elements = {'interface': interface, }
+  _pyangbind_elements = OrderedDict([('interface', interface), ])
 
 
 class yc_acl_openconfig_acl__acl(PybindBase):
@@ -7092,12 +7587,16 @@ class yc_acl_openconfig_acl__acl(PybindBase):
   YANG Description: Top level enclosing container for ACL model config
 and operational state data
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__state','__acl_sets','__interfaces',)
+  __slots__ = ('_path_helper', '_extmethods', '__state','__acl_sets','__interfaces',)
+
+  _yang_name = 'acl'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'acl'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__state = YANGDynClass(base=yc_state_openconfig_acl__acl_state, is_container='container', yang_name="state", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
     self.__acl_sets = YANGDynClass(base=yc_acl_sets_openconfig_acl__acl_acl_sets, is_container='container', yang_name="acl-sets", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
@@ -7128,7 +7627,7 @@ def _path(self):
     if hasattr(self, "_parent"):
       return self._parent._path()+[self._yang_name]
     else:
-      return ['acl']
+      return [u'acl']
 
   def _get_state(self):
     """
@@ -7242,12 +7741,12 @@ def _set_interfaces(self, v, load=False):
   def _unset_interfaces(self):
     self.__interfaces = YANGDynClass(base=yc_interfaces_openconfig_acl__acl_interfaces, is_container='container', yang_name="interfaces", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  state = builtins.property(_get_state, _set_state)
-  acl_sets = builtins.property(_get_acl_sets, _set_acl_sets)
-  interfaces = builtins.property(_get_interfaces, _set_interfaces)
+  state = __builtin__.property(_get_state, _set_state)
+  acl_sets = __builtin__.property(_get_acl_sets, _set_acl_sets)
+  interfaces = __builtin__.property(_get_interfaces, _set_interfaces)
 
 
-  _pyangbind_elements = {'state': state, 'acl_sets': acl_sets, 'interfaces': interfaces, }
+  _pyangbind_elements = OrderedDict([('state', state), ('acl_sets', acl_sets), ('interfaces', interfaces), ])
 
 
 class openconfig_acl(PybindBase):
@@ -7272,12 +7771,16 @@ class openconfig_acl(PybindBase):
 criteria that cross protocol layers, e.g., MAC layer and IP
 layer matches.
   """
-  __slots__ = ('_pybind_generated_by', '_path_helper', '_yang_name', '_extmethods', '__acl',)
+  __slots__ = ('_path_helper', '_extmethods', '__acl',)
+
+  _yang_name = 'openconfig-acl'
+
+  _pybind_generated_by = 'container'
 
   def __init__(self, *args, **kwargs):
-    self._yang_name = 'openconfig-acl'
-    self._pybind_generated_by = 'container'
+
     self._path_helper = False
+
     self._extmethods = False
     self.__acl = YANGDynClass(base=yc_acl_openconfig_acl__acl, is_container='container', yang_name="acl", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
@@ -7346,7 +7849,9 @@ def _set_acl(self, v, load=False):
   def _unset_acl(self):
     self.__acl = YANGDynClass(base=yc_acl_openconfig_acl__acl, is_container='container', yang_name="acl", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, extensions=None, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='container', is_config=True)
 
-  acl = builtins.property(_get_acl, _set_acl)
+  acl = __builtin__.property(_get_acl, _set_acl)
+
+
+  _pyangbind_elements = OrderedDict([('acl', acl), ])
 
 
-  _pyangbind_elements = {'acl': acl, }
diff --git a/src/sonic-config-engine/sonic-acl-extension.yang b/src/sonic-config-engine/sonic-acl-extension.yang
new file mode 100644
index 000000000000..eac83b985f30
--- /dev/null
+++ b/src/sonic-config-engine/sonic-acl-extension.yang
@@ -0,0 +1,76 @@
+module sonic-acl-extension {
+  yang-version "1";
+  namespace "https://github.com/Azure/sonic-buildimage";
+
+  prefix "sonic-acl-extension";
+
+  import openconfig-acl { prefix oc-acl; }
+
+  typedef vlan-id-type {
+    type uint16 {
+      range 0..4095;
+    }
+    description
+      "The VLAN ID value may be expressed as a 12-bit number in decimal notation";
+  }
+
+  typedef icmp-type-type {
+    type uint8 {
+      range 0..255;
+    }
+    description
+      "The ICMP type value may be expressed as an 8-bit number in decimal notation";
+  }
+
+  typedef icmp-code-type {
+    type uint8 {
+      range 0..255;
+    }
+    description
+      "The ICMP code value may be expressed as an 8-bit number in decimal notation";
+  }
+
+  grouping extended-l2-match {
+    leaf vlan-id {
+      type vlan-id-type;
+      description
+        "VLAN ID field to match in DOT1Q packets";
+    }
+  }
+
+  grouping icmp-protocol-fields-config {
+    description
+      "Configuration data of ICMP protocol fields.";
+
+    leaf type {
+      type icmp-type-type;
+      description
+        "ICMP(V6) type.";
+    }
+
+    leaf code {
+      type icmp-code-type;
+      description
+        "ICMP(V6) code.";
+    }
+  }
+
+  grouping icmp-protocol-fields-top {
+    description
+      "ICMP header fields for IPv4 and IPv6";
+
+    container icmp {
+      container config {
+        uses icmp-protocol-fields-config;
+      }
+    }
+  }
+
+  augment "/oc-acl:acl/oc-acl:acl-sets/oc-acl:acl-set/oc-acl:acl-entries/oc-acl:acl-entry/oc-acl:l2/oc-acl:config" {
+    uses extended-l2-match;
+  }
+
+  augment "/oc-acl:acl/oc-acl:acl-sets/oc-acl:acl-set/oc-acl:acl-entries/oc-acl:acl-entry" {
+    uses icmp-protocol-fields-top;
+  }
+}

From 870eb46fce8f47a0d84f042816593022225f9668 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Mon, 1 Mar 2021 12:36:18 +0200
Subject: [PATCH 0245/1674] [Mellanox]: Fix PCIEd configuration files for
 SN3700 and SN3800 systems (#6913)

- Why I did it
To fix PCIEd errors in log.

- How I did it
Update pcie.yaml with the right PCI addresses.

- How to verify it
Check logs, operation occurs each minute.

Signed-off-by: liora <liora@nvidia.com>
---
 device/mellanox/x86_64-mlnx_msn3700c-r0/pcie.yaml | 4 ++--
 device/mellanox/x86_64-mlnx_msn3800-r0/pcie.yaml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn3700c-r0/pcie.yaml
index 21c48fe64008..6daf5eefa130 100644
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/pcie.yaml
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/pcie.yaml
@@ -130,13 +130,13 @@
   id: 6f53
   name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
     Register DMA Channel 3'
-- bus: '06'
+- bus: '07'
   dev: '00'
   fn: '0'
   id: cf6c
   name: 'Ethernet controller: Mellanox Technologies MT53100 [Spectrum-2, 64 x 100GbE
     switch]'
-- bus: 08
+- bus: 09
   dev: '00'
   fn: '0'
   id: '1533'
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn3800-r0/pcie.yaml
index d4a25d40bd54..3dc31739f7d9 120000
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/pcie.yaml
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/pcie.yaml
@@ -1 +1 @@
-../x86_64-mlnx_msn3700-r0/pcie.yaml
\ No newline at end of file
+../x86_64-mlnx_msn3700c-r0/pcie.yaml
\ No newline at end of file

From f240859c6168df4a6ec9d244f9630612ffff7d83 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:59:48 -0800
Subject: [PATCH 0246/1674] [build] No longer install scpay Debian package in
 host (#6919)

As of the merging of PR #6799, we are now installing a newer version of scapy via pip, therefore there is no longer a need to install the older Debian package.
---
 build_debian.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index 61252adabe2d..3559560b1ed4 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -300,7 +300,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     ethtool                 \
     screen                  \
     hping3                  \
-    python-scapy            \
     tcptraceroute           \
     mtr-tiny                \
     locales                 \

From 12cc180e29a14a58a62770b88cb187f3608c3f59 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 2 Mar 2021 14:32:00 -0800
Subject: [PATCH 0247/1674] [openconfig_acl] Allow setting ICMP type/code to 0
 (#6932)

There is a bug in how pyangbind translates yang models into python bindings. The model always sets integer values to 0 by default, so there is no way to check if a user has provided a value that is equal to 0. This is problematic for ICMP and VLAN (among others) because 0 is a valid input value.

This change converts ICMP and VLAN fields to union types so that acl-loader will treat them as null values unless a user explicitly adds an integer value.

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-config-engine/openconfig_acl.py     | 24 ++++++++---------
 .../sonic-acl-extension.yang                  | 27 ++++++++++++++-----
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/sonic-config-engine/openconfig_acl.py b/src/sonic-config-engine/openconfig_acl.py
index 5399f21a7d7f..5939bce44d6a 100644
--- a/src/sonic-config-engine/openconfig_acl.py
+++ b/src/sonic-config-engine/openconfig_acl.py
@@ -832,7 +832,7 @@ def __init__(self, *args, **kwargs):
     self.__destination_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     self.__source_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
     self.__source_mac_mask = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="source-mac-mask", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
-    self.__vlan_id = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
+    self.__vlan_id = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..4095']}),], is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
     self.__destination_mac = YANGDynClass(base=RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}'}), is_leaf=True, yang_name="destination-mac", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='http://openconfig.net/yang/acl', defining_module='openconfig-acl', yang_type='yang:mac-address', is_config=True)
 
     load = kwargs.pop("load", None)
@@ -1068,12 +1068,12 @@ def _set_vlan_id(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..4095']}),], is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """vlan_id must be of a type compatible with vlan-id-type""",
           'defined-type': "sonic-acl-extension:vlan-id-type",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..4095']}),], is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)""",
         })
 
     self.__vlan_id = t
@@ -1081,7 +1081,7 @@ def _set_vlan_id(self, v, load=False):
       self._set()
 
   def _unset_vlan_id(self):
-    self.__vlan_id = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'0..4095']}), is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
+    self.__vlan_id = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..65535']},int_size=16), restriction_dict={u'range': [u'1..4095']}),], is_leaf=True, yang_name="vlan-id", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='vlan-id-type', is_config=True)
 
   source_mac = __builtin__.property(_get_source_mac, _set_source_mac)
   source_mac_mask = __builtin__.property(_get_source_mac_mask, _set_source_mac_mask)
@@ -3723,8 +3723,8 @@ def __init__(self, *args, **kwargs):
     self._path_helper = False
 
     self._extmethods = False
-    self.__code = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
-    self.__type = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+    self.__code = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+    self.__type = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
 
     load = kwargs.pop("load", None)
     if args:
@@ -3774,12 +3774,12 @@ def _set_type(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """type must be of a type compatible with icmp-type-type""",
           'defined-type': "sonic-acl-extension:icmp-type-type",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)""",
         })
 
     self.__type = t
@@ -3787,7 +3787,7 @@ def _set_type(self, v, load=False):
       self._set()
 
   def _unset_type(self):
-    self.__type = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
+    self.__type = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="type", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-type-type', is_config=True)
 
 
   def _get_code(self):
@@ -3811,12 +3811,12 @@ def _set_code(self, v, load=False):
     if hasattr(v, "_utype"):
       v = v._utype(v)
     try:
-      t = YANGDynClass(v,base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+      t = YANGDynClass(v,base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
     except (TypeError, ValueError):
       raise ValueError({
           'error-string': """code must be of a type compatible with icmp-code-type""",
           'defined-type': "sonic-acl-extension:icmp-code-type",
-          'generated-type': """YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)""",
+          'generated-type': """YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)""",
         })
 
     self.__code = t
@@ -3824,7 +3824,7 @@ def _set_code(self, v, load=False):
       self._set()
 
   def _unset_code(self):
-    self.__code = YANGDynClass(base=RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}), is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
+    self.__code = YANGDynClass(base=[RestrictedClassType(base_type=six.text_type, restriction_dict={u'pattern': u'null'}),RestrictedClassType(base_type=RestrictedClassType(base_type=int, restriction_dict={'range': ['0..255']}, int_size=8), restriction_dict={u'range': [u'0..255']}),], is_leaf=True, yang_name="code", parent=self, path_helper=self._path_helper, extmethods=self._extmethods, register_paths=True, namespace='https://github.com/Azure/sonic-buildimage', defining_module='sonic-acl-extension', yang_type='icmp-code-type', is_config=True)
 
   type = __builtin__.property(_get_type, _set_type)
   code = __builtin__.property(_get_code, _set_code)
diff --git a/src/sonic-config-engine/sonic-acl-extension.yang b/src/sonic-config-engine/sonic-acl-extension.yang
index eac83b985f30..2ff9919b78d5 100644
--- a/src/sonic-config-engine/sonic-acl-extension.yang
+++ b/src/sonic-config-engine/sonic-acl-extension.yang
@@ -7,24 +7,39 @@ module sonic-acl-extension {
   import openconfig-acl { prefix oc-acl; }
 
   typedef vlan-id-type {
-    type uint16 {
-      range 0..4095;
+    type union {
+      type string {
+        pattern "null";
+      }
+      type uint16 {
+        range 1..4095;
+      }
     }
     description
       "The VLAN ID value may be expressed as a 12-bit number in decimal notation";
   }
 
   typedef icmp-type-type {
-    type uint8 {
-      range 0..255;
+    type union {
+      type string {
+        pattern "null";
+      }
+      type uint8 {
+        range 0..255;
+      }
     }
     description
       "The ICMP type value may be expressed as an 8-bit number in decimal notation";
   }
 
   typedef icmp-code-type {
-    type uint8 {
-      range 0..255;
+    type union {
+      type string {
+        pattern "null";
+      }
+      type uint8 {
+        range 0..255;
+      }
     }
     description
       "The ICMP code value may be expressed as an 8-bit number in decimal notation";

From 2e1e7e095966834f5547e3f6252578bfcc26efe0 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:31:19 -0800
Subject: [PATCH 0248/1674] Fix Python 3 'importlib' bug; Add support for
 Python 2 back in sonic-py-common (#6933)

Fix a strange bug introduced by https://github.com/Azure/sonic-buildimage/pull/6832 which would only occur in environments with both Python 2 and Python 3 installed (e.g., the PMon container). Error messages such as the following would be seen:

```
ERR pmon#ledd[29]: Failed to load ledutil: module 'importlib' has no attribute 'machinery'
```

This is very odd, and it seems like the Python 2 version of importlib, which is basically just a stub, is taking precedence over the Python 3 version. I found that this occurs when calling `import importlib`. However, calling `import importlib.machinery` and `import importlib.util` causes the proper package to be referenced, and the `machinery` and `util` modules are loaded successfully. This is how it is specified in examples in the official documentation, however there is nothing mentioned regarding that it *should* be done this way or that `import importlib` is unreliable.

Also, since sonic-py-common is still used in environments with Python 2 installed we should maintain support for both Python 2 and 3 until we completely deprecate Python 2, so I have added this back in.
---
 src/sonic-ctrmgrd/tests/common_test.py        |  3 ++-
 .../tests/determine-reboot-cause_test.py      |  3 ++-
 .../tests/procdockerstatsd_test.py            |  3 ++-
 .../sonic_py_common/daemon_base.py            | 23 +++++++++++++++----
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py
index 35447be7ad9a..5b3eae151cb0 100755
--- a/src/sonic-ctrmgrd/tests/common_test.py
+++ b/src/sonic-ctrmgrd/tests/common_test.py
@@ -1,5 +1,6 @@
 import copy
-import importlib
+import importlib.machinery
+import importlib.util
 import json
 import os
 import subprocess
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index 924befdf48ee..381313ba97f5 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -1,4 +1,5 @@
-import importlib
+import importlib.machinery
+import importlib.util
 import sys
 import os
 import pytest
diff --git a/src/sonic-host-services/tests/procdockerstatsd_test.py b/src/sonic-host-services/tests/procdockerstatsd_test.py
index db7c6a1f0e3d..bb218e52ce2d 100644
--- a/src/sonic-host-services/tests/procdockerstatsd_test.py
+++ b/src/sonic-host-services/tests/procdockerstatsd_test.py
@@ -1,4 +1,5 @@
-import importlib
+import importlib.machinery
+import importlib.util
 import sys
 import os
 import pytest
diff --git a/src/sonic-py-common/sonic_py_common/daemon_base.py b/src/sonic-py-common/sonic_py_common/daemon_base.py
index 3797c19b6b7d..745b3c55ba96 100644
--- a/src/sonic-py-common/sonic_py_common/daemon_base.py
+++ b/src/sonic-py-common/sonic_py_common/daemon_base.py
@@ -1,4 +1,3 @@
-import importlib
 import signal
 import sys
 
@@ -26,12 +25,26 @@ def db_connect(db_name, namespace=EMPTY_NAMESPACE):
     return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, True, namespace)
 
 
+# TODO: Consider moving this logic out of daemon_base and into antoher file
+# so that it can be used by non-daemons. We can simply call that function here
+# to retain backward compatibility.
 def _load_module_from_file(module_name, file_path):
-    loader = importlib.machinery.SourceFileLoader(module_name, file_path)
-    spec = importlib.util.spec_from_loader(loader.name, loader)
-    module = importlib.util.module_from_spec(spec)
-    loader.exec_module(module)
+    module = None
+
+    # TODO: Remove this check once we no longer support Python 2
+    if sys.version_info.major == 3:
+        import importlib.machinery
+        import importlib.util
+        loader = importlib.machinery.SourceFileLoader(module_name, file_path)
+        spec = importlib.util.spec_from_loader(loader.name, loader)
+        module = importlib.util.module_from_spec(spec)
+        loader.exec_module(module)
+    else:
+        import imp
+        module = imp.load_source(module_name, file_path)
+
     sys.modules[module_name] = module
+
     return module
 
 

From 9d8a3bbdd8fec0233731ddc4f21e04a9e9ceb25a Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 22 Feb 2021 10:14:55 -0800
Subject: [PATCH 0249/1674] [minigraph] Support tagged VlanInterface if
 attached to multiple vlans (#6833)

It is possible that one interface attaches multiple vlans. The VlanInterface should be in tagged mode.

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
---
 src/sonic-config-engine/minigraph.py             |  9 +++++++++
 .../tests/simple-sample-graph.xml                | 16 ++++++++++++++++
 src/sonic-config-engine/tests/test_cfggen.py     | 14 +++++++++++---
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 06b799cdeff7..0635f9171ebd 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -526,6 +526,13 @@ def parse_dpg(dpg, hname):
         vlans = {}
         vlan_members = {}
         vlantype_name = ""
+        intf_vlan_mbr = defaultdict(list)
+        for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
+            vlanid = vintf.find(str(QName(ns, "VlanID"))).text
+            vintfmbr = vintf.find(str(QName(ns, "AttachTo"))).text
+            vmbr_list = vintfmbr.split(';')
+            for i, member in enumerate(vmbr_list):
+                intf_vlan_mbr[member].append(vlanid)
         for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
             vintfname = vintf.find(str(QName(ns, "Name"))).text
             vlanid = vintf.find(str(QName(ns, "VlanID"))).text
@@ -539,6 +546,8 @@ def parse_dpg(dpg, hname):
                 sonic_vlan_member_name = "Vlan%s" % (vlanid)
                 if vlantype_name == "Tagged":
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'tagged'}
+                elif len(intf_vlan_mbr[member]) > 1:
+                    vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'tagged'}
                 else:
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'untagged'}
 
diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
index 7215209da545..703a005ea5bc 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -173,6 +173,22 @@
           <Type>Tagged</Type>
           <Subnets>192.168.0.0/28</Subnets>
         </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab3</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2001</VlanID>
+          <Tag>2001</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
       </VlanInterfaces>
       <IPInterfaces>
         <IPInterface>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 3a85346de2fd..9fbf351c3a47 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -121,6 +121,8 @@ def test_var_json_data(self):
             utils.to_dict(output.strip()),
             utils.to_dict(
                 '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "untagged"\n    },'
+                ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
                 ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
             )
         )
@@ -206,6 +208,8 @@ def test_minigraph_vlans(self):
             utils.to_dict(output.strip()),
             utils.to_dict(
                 "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000'}, "
+                "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001'},"
+                "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000'},"
                 "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020'}}"
             )
         )
@@ -214,9 +218,13 @@ def test_minigraph_vlan_members(self):
         argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
         output = self.run_script(argument)
         self.assertEqual(
-            output.strip(),
-            "{('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}, "
-            "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+            utils.to_dict(output.strip()),
+            utils.to_dict(
+                "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}, "
+                "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+            )
         )
 
     def test_minigraph_vlan_interfaces(self):

From 3f999598281bb570e48b1a5734c44eacd5748ba9 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Wed, 3 Mar 2021 19:23:40 +0200
Subject: [PATCH 0250/1674] [platform][barefoot] Fix as9516bf installation
 (#6938)

To fix sonic_platform installation on as9516bf platform

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../debian/postinst                           | 27 -------------------
 ...atform-modules-bfn-newport-as9516.postinst | 13 +++++++++
 ...platform-modules-bfn-newport-as9516.prerm} |  0
 ...form-modules-bfn-newport-as9516bf.postinst | 13 +++++++++
 ...latform-modules-bfn-newport-as9516bf.prerm |  6 +++++
 5 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst
 rename platform/barefoot/sonic-platform-modules-bfn-newport/debian/{prerm => sonic-platform-modules-bfn-newport-as9516.prerm} (100%)
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm

diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
deleted file mode 100644
index 90d772ef89df..000000000000
--- a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-depmod -a
-systemctl enable bfn-newport.service
-systemctl start bfn-newport.service
-
-PLATFORM_NAME=x86_64-accton_as9516bf_32d-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-if [ -e ${SONIC_PLATFORM_WHEEL_PY2} ]; then
-    python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
-fi
-SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
-if [ -e ${SONIC_PLATFORM_WHEEL_PY3} ]; then
-    python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
-fi
-
-PLATFORM_NAME=x86_64-accton_as9516_32d-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-if [ -e ${SONIC_PLATFORM_WHEEL_PY2} ]; then
-    python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
-fi
-SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
-if [ -e ${SONIC_PLATFORM_WHEEL_PY3} ]; then
-    python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
-fi
-
-#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst
new file mode 100644
index 000000000000..94dbd584f1b2
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+depmod -a
+systemctl enable bfn-newport.service
+systemctl start bfn-newport.service
+
+PLATFORM_NAME=x86_64-accton_as9516_32d-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+
+#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.prerm
similarity index 100%
rename from platform/barefoot/sonic-platform-modules-bfn-newport/debian/prerm
rename to platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.prerm
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst
new file mode 100644
index 000000000000..87ca2f5de64b
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+depmod -a
+systemctl enable bfn-newport.service
+systemctl start bfn-newport.service
+
+PLATFORM_NAME=x86_64-accton_as9516bf_32d-r0
+SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
+python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
+SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
+python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
+
+#DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm
new file mode 100644
index 000000000000..ee19dbb1db98
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+python2 -m pip uninstall -y sonic-platform
+python3 -m pip uninstall -y sonic-platform
+
+#DEBHELPER#

From 84a091d99c8df4120f1f9429dc1398bc9cb88c58 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 4 Mar 2021 09:42:30 -0800
Subject: [PATCH 0251/1674] [sonic-platform-daemons] submodule update (#6957)

30d09be fix the muxcable state change notification received from other modules, omit the check inside hw_state table (#159)
32ec23c [xcvrd] Fix crash on platforms which support media settings with Python 3 (#158)
47bcf90 [xcvrd] Save the dom_capability of transceiver into db (#72)
b9381a5 [xcvrd] Fix xcvrd crash on other port prefixes (#123)
c3c1a59 [xcvrd] Make functions used for media setting python3 compatible (#153)
e179ffc [psud] Refactor unit tests; increase unit test coverage (#146)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 068bcccf1f30..30d09be2be7a 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 068bcccf1f3057607b8f37709033d7f44a6ff844
+Subproject commit 30d09be2be7acdb1c3349e2c0e4650bb2d25fade

From 57085e4a6ac0914abfea202cf13f3014515d503f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 5 Mar 2021 13:45:16 +0800
Subject: [PATCH 0252/1674] Update SONiC version files (#6963)

Co-authored-by: mssonicbld <vsts@fv-az124-394.1jx3ho342nguppyzzg0wtvoj2f.bx.internal.cloudapp.net>
---
 .../build/build-sonic-slave-buster/versions-deb-buster        | 1 -
 files/build/versions/default/versions-py3                     | 4 ++--
 files/build/versions/host-image/versions-deb-buster           | 4 ++--
 files/build/versions/host-image/versions-py3                  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 44be902df6cc..3681bae194bf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -91,7 +91,6 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
-swss==1.0.0
 sx-acl-helper==1.mlnx.4.4.2308
 sx-acl-helper-dev==1.mlnx.4.4.2308
 sx-complib==1.mlnx.4.4.2308
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index b00f6be0ec4c..791915bc3931 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -6,7 +6,7 @@ click==7.1.2
 clickclick==20.10.2
 connexion==2.7.0
 Flask==1.1.2
-grpcio==1.36.0
+grpcio==1.36.1
 grpcio-tools==1.20.0
 hiredis==1.1.0
 idna==2.10
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.4
 openapi-spec-validator==0.3.0
-protobuf==3.15.3
+protobuf==3.15.4
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 01cb7447bb94..54d76cf5f81d 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -42,8 +42,8 @@ gpg-wks-client==2.2.12-1+deb10u1
 gpg-wks-server==2.2.12-1+deb10u1
 gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
-grub-common==2.02+dfsg1-20+deb10u3
-grub2-common==2.02+dfsg1-20+deb10u3
+grub-common==2.02+dfsg1-20+deb10u4
+grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 661e6c171995..e83b16af1be5 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -40,5 +40,5 @@ tabulate==0.8.2
 thrift==0.13.0
 urllib3==1.26.3
 watchdog==0.10.3
-websocket-client==0.57.0
+websocket-client==0.58.0
 xmltodict==0.12.0
\ No newline at end of file

From 1650777723555a74c7bf9e6a3632b039038f7581 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 26 Feb 2021 10:41:49 -0800
Subject: [PATCH 0253/1674] [minigraph] For egress ACL attaching to vlan, break
 them into vlan members (#6895)

#### Why I did it
Some platforms have difficult to attach egress ACL to vlan.

#### How I did it
For egress ACL attaching to vlan, break them into vlan members.

#### How to verify it
Unit test
Tested in DUT
---
 src/sonic-config-engine/minigraph.py          | 19 ++++++++++++++-----
 .../tests/t0-sample-graph.xml                 | 16 +++++++++++++++-
 src/sonic-config-engine/tests/test_cfggen.py  | 10 +++++-----
 .../tests/test_minigraph_case.py              |  2 +-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 0635f9171ebd..70f7f839f91b 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -522,7 +522,6 @@ def parse_dpg(dpg, hname):
                 dpg_ecmp_content['ipv4'] = ipv4_content
                 dpg_ecmp_content['ipv6'] = ipv6_content
         vlanintfs = child.find(str(QName(ns, "VlanInterfaces")))
-        vlan_intfs = []
         vlans = {}
         vlan_members = {}
         vlantype_name = ""
@@ -551,7 +550,7 @@ def parse_dpg(dpg, hname):
                 else:
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'untagged'}
 
-            vlan_attributes = {'vlanid': vlanid}
+            vlan_attributes = {'vlanid': vlanid, 'members': vmbr_list }
 
             # If this VLAN requires a DHCP relay agent, it will contain a <DhcpRelays> element
             # containing a list of DHCP server IPs
@@ -579,7 +578,7 @@ def parse_dpg(dpg, hname):
                 aclname = aclintf.find(str(QName(ns, "OutAcl"))).text.upper().replace(" ", "_").replace("-", "_")
                 stage = "egress"
             else:
-                system.exit("Error: 'AclInterface' must contain either an 'InAcl' or 'OutAcl' subelement.")
+                sys.exit("Error: 'AclInterface' must contain either an 'InAcl' or 'OutAcl' subelement.")
             aclattach = aclintf.find(str(QName(ns, "AttachTo"))).text.split(';')
             acl_intfs = []
             is_mirror = False
@@ -596,7 +595,11 @@ def parse_dpg(dpg, hname):
                     # to LAG will be applied to all the LAG members internally by SAI/SDK
                     acl_intfs.append(member)
                 elif member in vlans:
-                    acl_intfs.append(member)
+                    # For egress ACL attaching to vlan, we break them into vlan members
+                    if stage == "egress":
+                        acl_intfs.extend(vlans[member]['members'])
+                    else:
+                        acl_intfs.append(member)
                 elif member in port_alias_map:
                     acl_intfs.append(port_alias_map[member])
                     # Give a warning if trying to attach ACL to a LAG member interface, correct way is to attach ACL to the LAG interface
@@ -620,9 +623,15 @@ def parse_dpg(dpg, hname):
                             acl_intfs.append(panel_port)
                     break
             if acl_intfs:
+                # Remove duplications
+                dedup_intfs = []
+                for intf in acl_intfs:
+                    if intf not in dedup_intfs:
+                        dedup_intfs.append(intf)
+
                 acls[aclname] = {'policy_desc': aclname,
                                  'stage': stage,
-                                 'ports': acl_intfs}
+                                 'ports': dedup_intfs}
                 if is_mirror:
                     acls[aclname]['type'] = 'MIRROR'
                 elif is_mirror_v6:
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index 63f892fe6d04..d3d0a7f93d53 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -260,6 +260,20 @@
           <MacAddress i:nil="true"/>
           <SecondarySubnets/>
         </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan98</Name>
+          <AttachTo>fortyGigE0/100;PortChannel01;PortChannel03</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>98</VlanID>
+          <Tag>98</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
       </VlanInterfaces>
       <IPInterfaces>
         <IPInterface>
@@ -331,7 +345,7 @@
           <Type>DataPlane</Type>
         </AclInterface>
         <AclInterface>
-          <AttachTo>PortChannel01;PortChannel02</AttachTo>
+          <AttachTo>PortChannel01;PortChannel02;Vlan98</AttachTo>
           <OutAcl>DataAclEgress</OutAcl>
           <Type>DataPlane</Type>
         </AclInterface>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 9fbf351c3a47..89984a6fedd1 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -177,7 +177,7 @@ def test_minigraph_acl(self):
                 "'DATAACLINGRESS': {'stage': 'ingress', 'type': 'L3', 'ports': ['PortChannel01', 'PortChannel02', 'PortChannel03', 'PortChannel04'], 'policy_desc': 'DATAACLINGRESS'}, "
                 "'SNMP_ACL': {'services': ['SNMP'], 'type': 'CTRLPLANE', 'policy_desc': 'SNMP_ACL', 'stage': 'ingress'}, "
                 "'SSH_ACL': {'services': ['SSH'], 'type': 'CTRLPLANE', 'policy_desc': 'SSH_ACL', 'stage': 'ingress'}, "
-                "'DATAACLEGRESS': {'stage': 'egress', 'type': 'L3', 'ports': ['PortChannel01', 'PortChannel02'], 'policy_desc': 'DATAACLEGRESS'}, "
+                "'DATAACLEGRESS': {'stage': 'egress', 'type': 'L3', 'ports': ['PortChannel01', 'PortChannel02', 'Ethernet100', 'PortChannel03'], 'policy_desc': 'DATAACLEGRESS'}, "
                 "'EVERFLOWV6': {'stage': 'ingress', 'type': 'MIRRORV6', 'ports': ['PortChannel01', 'PortChannel02', 'PortChannel03', 'PortChannel04', 'Ethernet4', 'Ethernet100'], 'policy_desc': 'EVERFLOWV6'}}"
             )
         )
@@ -207,10 +207,10 @@ def test_minigraph_vlans(self):
         self.assertEqual(
             utils.to_dict(output.strip()),
             utils.to_dict(
-                "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000'}, "
-                "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001'},"
-                "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000'},"
-                "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020'}}"
+                "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'members': ['Ethernet8']}, "
+                "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001', 'members': ['Ethernet12']},"
+                "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000', 'members': ['Ethernet12']},"
+                "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020', 'members': ['Ethernet12']}}"
             )
         )
 
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 64e0bb09d730..806916639b76 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -94,7 +94,7 @@ def test_minigraph_vlans(self):
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
-            utils.to_dict("{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'mac': '00:aa:bb:cc:dd:ee' }}")
+            utils.to_dict("{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'mac': '00:aa:bb:cc:dd:ee', 'members': ['Ethernet8'] }}")
         )
 
     def test_minigraph_vlan_members(self):

From 30e9f02f84998b530cec3f181dd56e8fab93d679 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 5 Mar 2021 14:04:33 -0800
Subject: [PATCH 0254/1674] [202012][swss][utilities] advance submodule head
 (#6969)

swss:
* c712c24 2021-03-04 | Update StateDB with error if state change failed, Update APP_DB in all state chg req (#1662) (HEAD -> 202012) [Prince Sunny]

utilities:
* 9a9bff4 2021-03-03 | [acl] Expand VLAN into VLAN members when creating an ACL table (#1475) (HEAD -> 202012) [Danny Allen]
* d1e7d4e 2021-03-04 | [Mellanox] Change mellanox buffer migrator for new SKU Mellanox-SN2700-D40C8S8 (#1470) [Junchao-Mellanox]
* a1df1b4 2021-03-03 | [acl-loader] Add support for matching on ICMP and VLAN info (#1469) [Danny Allen]
* bab4a23 2021-03-03 | [config reload]: On dual ToR systems, cache ARP and FDB tables (#1465) [Lawrence Lee]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 9376ec694925..c712c244a61a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 9376ec694925c5cd715870e48a5aec7c8060c8a8
+Subproject commit c712c244a61a61fa593866a7c4bbc354ce318c2d
diff --git a/src/sonic-utilities b/src/sonic-utilities
index d2f0e8fdd74b..9a9bff42d193 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d2f0e8fdd74b21700d535843ca30c12d448bd04d
+Subproject commit 9a9bff42d1931ba0cd006569410e99fd989c6d32

From 7452720d01256d9ddb234eb25de0476fa78b9dc3 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Sat, 6 Mar 2021 19:06:10 -0800
Subject: [PATCH 0255/1674] Revert "[sonic-platform-daemons] submodule update
 (#6957)" (#6979)

This reverts commit 7034edc9af23ecedfb2251d757f36e3c58fcd2c8.
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 30d09be2be7a..068bcccf1f30 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 30d09be2be7acdb1c3349e2c0e4650bb2d25fade
+Subproject commit 068bcccf1f3057607b8f37709033d7f44a6ff844

From e1f8c07d9edd245594d005ee81458910939d5571 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Mon, 8 Mar 2021 09:37:16 -0800
Subject: [PATCH 0256/1674] [Arista] Update platform drivers (#6946)

 - Provide `hw-management-generate-dump.sh` for `show techsupport`
 - Load `optoe3` for OSFP and QSFP-DD transceivers
 - Enhance reboot-cause caching robustness

Signed-off-by: Samuel Angebault <staphylo@arista.com>
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 86f7b81834a1..6ec714040c57 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 86f7b81834a1093d1df644b09232ddacb40784ef
+Subproject commit 6ec714040c5733d4c0b2e3feb347a1e980280bf9
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 86f7b81834a1..6ec714040c57 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 86f7b81834a1093d1df644b09232ddacb40784ef
+Subproject commit 6ec714040c5733d4c0b2e3feb347a1e980280bf9

From 08307385032087ac1a682e7de79aff95763315dc Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 9 Mar 2021 06:55:35 +0800
Subject: [PATCH 0257/1674] Update SONiC version files (#6972)

Co-authored-by: mssonicbld <vsts@fv-az131-135.jj2e24u0tnvezfdztknplege1f.xx.internal.cloudapp.net>
---
 .../build/build-sonic-slave-buster/versions-deb-buster   | 2 +-
 files/build/versions/default/versions-deb-buster         | 2 +-
 files/build/versions/default/versions-py3                | 2 +-
 files/build/versions/default/versions-web                | 4 ++--
 .../dockers/docker-sonic-mgmt-framework/versions-py3     | 2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster        | 9 +++++++++
 .../dockers/sonic-slave-stretch/versions-deb-stretch     | 2 +-
 files/build/versions/host-image/versions-deb-buster      | 3 +--
 files/build/versions/host-image/versions-py2             | 1 -
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 3681bae194bf..d8d78fd6470b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.0.13-1
+libsaibcm==4.3.3.1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 6a82e67ada8c..42b3e1f4a2d3 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -119,7 +119,7 @@ libreadline7==7.0-5
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.0.13-1
+libsaibcm==4.3.3.1
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 791915bc3931..c7c2096220d2 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.4
 openapi-spec-validator==0.3.0
-protobuf==3.15.4
+protobuf==3.15.5
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 38cd555295ad..9fa8fa8caee1 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -42,8 +42,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=twfshldM6GQEphfU%2BQ4xmJlGJkv2Sy7KU1F72RYYM0A%3D&se=2034-10-22T06%3A00%3A45Z&sp=r==84fd57e010281c66d2343b68bd10f7a2
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.13-1_amd64.deb?sv=2015-04-05&sr=b&sig=e%2BBucofzEwCC%2BclqK1OeCi5YFpQAD4ID4FfODzszsuM%3D&se=2034-10-22T06%3A00%3A14Z&sp=r==d4f4fb23b955792d102351e23678eba8
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A37%3A16Z&se=2030-03-04T00%3A37%3A00Z&sr=b&sp=r&sig=xxnhJC%2FKsOvApuAlB1Yds8Uzzkdyy6fmWX%2BuJ4v0UYA%3D==5ddbdab8865d3c232f4d664edb7ff334
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A35%3A37Z&se=2030-03-04T00%3A35%3A00Z&sr=b&sp=r&sig=1miXMYs0%2BZ6v9Dpby1vSYsDezWDnr%2Be4gZ7Gi3kAQXE%3D==2f250ddee8fdab04956ad7dc3f0a5a70
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 494327b626b8..9ecf272e6792 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,2 +1,2 @@
 six==1.11.0
-zipp==3.4.0
\ No newline at end of file
+zipp==3.4.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 9a3346645c8d..147fc780a2bf 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -3,8 +3,17 @@ applibs-dev==1.mlnx.4.4.2308
 iproute2==1.mlnx.4.4.2308
 iproute2-dev==1.mlnx.4.4.2308
 libelf1==0.176-1.1
+libexpat1-dev==2.2.6-2+deb10u1
+libpython-dev==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2.7-dev==2.7.16-2+deb10u1
 mlnx-sai==1.mlnx.SAIRel1.18.1.0
+python-dev==2.7.16-1
+python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.2308
+python-setuptools==40.8.0-1
+python2-dev==2.7.16-1
+python2.7-dev==2.7.16-2+deb10u1
 sx-acl-helper==1.mlnx.4.4.2308
 sx-acl-helper-dev==1.mlnx.4.4.2308
 sx-complib==1.mlnx.4.4.2308
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 2863f0c1cc03..edc0de9766cf 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -334,7 +334,7 @@ libc6-dev-i386==2.24-11+deb9u4
 libc6-dev-x32==2.24-11+deb9u4
 libc6-i386==2.24-11+deb9u4
 libc6-x32==2.24-11+deb9u4
-libcaca0==0.99.beta19-2.1~deb9u1
+libcaca0==0.99.beta19-2.1~deb9u2
 libcacard0==1:2.5.0-3
 libcairo-gobject2==1.14.8-1+deb9u1
 libcairo2==1.14.8-1+deb9u1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 54d76cf5f81d..4a30be01057c 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -47,7 +47,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.1300
+hw-management==1.mlnx.7.0010.2000
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
@@ -220,7 +220,6 @@ python-bottle==0.12.15-2+deb10u1
 python-enum34==1.1.6-2
 python-ipaddr==2.2.0-2
 python-minimal==2.7.16-1
-python-scapy==2.4.0-2
 python-smbus==4.1-1
 python-sonic-platform-arista==1.0
 python-swsscommon==1.0.0
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 1359a2472dc6..7b7f1c9f1946 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -22,7 +22,6 @@ python-apt==1.8.4.3
 PyYAML==5.4.1
 redis==3.5.3
 scandir==1.10.0
-scapy==2.4.0
 singledispatch==3.6.1
 six==1.15.0
 thrift==0.13.0

From 6f84018342168986b8f349b59f06af92cd05fcbc Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Fri, 5 Mar 2021 06:12:59 +0800
Subject: [PATCH 0258/1674] Change buffer config for new SKU
 Mellanox-SN2700-D40C8S8 (#6926)

#### Why I did it

Change buffer config for new SKU Mellanox-SN2700-D40C8S8

#### How I did it

Reuse the buffer config of SKU Mellanox-SN2700-D48C8

#### How to verify it

Run sonic-mgmt qos test and all passed
---
 .../buffers_defaults_t0.j2                    | 103 +-----------------
 .../buffers_defaults_t1.j2                    | 103 +-----------------
 2 files changed, 2 insertions(+), 204 deletions(-)
 mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
deleted file mode 100644
index c2bdb607d5a7..000000000000
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,102 +0,0 @@
-{% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '7719936' %}
-{% set ingress_lossless_pool_xoff =  '1032192' %}
-{% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '7719936' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
-
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
-{%- endmacro %}
-
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
-{%- endmacro %}
-
-
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..a1d24c418b3e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
deleted file mode 100644
index 6f444b61df43..000000000000
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,102 +0,0 @@
-{% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '9686016' %}
-{% set ingress_lossless_pool_xoff =  '1179648' %}
-{% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '9686016' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
-
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
-{%- endmacro %}
-
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
-{%- endmacro %}
-
-
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..bef0c9d9531c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
\ No newline at end of file

From 7ec9fbb678fdb10be7971a4af53c09086a5a3886 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Thu, 4 Mar 2021 20:43:08 -0800
Subject: [PATCH 0259/1674] Start DHCP Relay When Helpers IPs Are Available
 (#6961)

#### Why I did it

It is possible to have DHCP relay configuration with no servers/
helpers which result in DHCP container to crash. This PR fixes this
issue by not starting DHCP relay for vlans with no DHCP helpers.

resolves: #6931
closes: #6931
#### How I did it
Do not add program group for dhcp relay with not dhcp helpers

#### How to verify it
Unit test
---
 .../docker-dhcp-relay.supervisord.conf.j2     | 10 +++++-----
 .../tests/sample_output/py2/bgpd_frr.conf     |  5 ++++-
 .../tests/sample_output/py2/bgpd_quagga.conf  |  1 +
 .../py2/docker-dhcp-relay.supervisord.conf    |  4 ++--
 .../tests/sample_output/py2/frr.conf          |  5 ++++-
 .../tests/sample_output/py2/ipinip.json       |  2 +-
 .../tests/sample_output/py2/wait_for_intf.sh  |  1 +
 .../tests/sample_output/py3/bgpd_frr.conf     |  3 +++
 .../tests/sample_output/py3/bgpd_quagga.conf  |  1 +
 .../py3/docker-dhcp-relay.supervisord.conf    |  4 ++--
 .../tests/sample_output/py3/frr.conf          |  3 +++
 .../tests/sample_output/py3/ipinip.json       |  2 +-
 .../tests/sample_output/py3/wait_for_intf.sh  |  1 +
 .../tests/t0-sample-graph.xml                 | 19 +++++++++++++++++++
 14 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 19a6cc294f7f..debbc81af0d3 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -43,7 +43,7 @@ dependent_startup_wait_for=rsyslogd:running
 {# Count how many VLANs require a DHCP relay agent... #}
 {% set num_relays = { 'count': 0 } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% set _dummy = num_relays.update({'count': num_relays.count + 1}) %}
 {% endif %}
 {% endfor %}
@@ -53,7 +53,7 @@ dependent_startup_wait_for=rsyslogd:running
 programs=
 {%- set add_preceding_comma = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 isc-dhcp-relay-{{ vlan_name }}
@@ -64,7 +64,7 @@ isc-dhcp-relay-{{ vlan_name }}
 {# Create a program entry for each DHCP relay agent instance #}
 {% set relay_for_ipv4 = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
 {% if dhcp_server | ipv4 %}
 {% set _dummy = relay_for_ipv4.update({'flag': True}) %}
@@ -107,7 +107,7 @@ dependent_startup_wait_for=start:exited
 programs=
 {%- set add_preceding_comma = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 dhcpmon-{{ vlan_name }}
@@ -118,7 +118,7 @@ dhcpmon-{{ vlan_name }}
 {# Create a program entry for each DHCP MONitor instance #}
 {% set relay_for_ipv4 = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
 {% if dhcp_server | ipv4 %}
 {% set _dummy = relay_for_ipv4.update({'flag': True}) %}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
index a312e7532620..4245076ad96f 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -33,7 +33,9 @@ ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
 !
 ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
-ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.0.0/27
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.200.0/27
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 !
 !
 !
@@ -57,6 +59,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
 !
+  network 192.168.200.1/27
   network 192.168.0.1/27
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
index f75d9de9a30e..f5a4b22f0ee0 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
@@ -27,6 +27,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   network 10.1.0.32/32
+  network 192.168.200.1/27
   network 192.168.0.1/27
   neighbor 10.0.0.59 remote-as 64600
   neighbor 10.0.0.59 description ARISTA02T1
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index dad758947f22..1d5b61390438 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -42,7 +42,7 @@ dependent_startup_wait_for=rsyslogd:running
 programs=isc-dhcp-relay-Vlan1000
 
 [program:isc-dhcp-relay-Vlan1000]
-command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
 priority=3
 autostart=false
 autorestart=false
@@ -56,7 +56,7 @@ dependent_startup_wait_for=start:exited
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
 priority=4
 autostart=false
 autorestart=false
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
index 43df66c3f4e7..0b0c22db6809 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -56,7 +56,9 @@ ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
 !
 ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
-ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.0.0/27
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.200.0/27
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 !
 !
 !
@@ -80,6 +82,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
 !
+  network 192.168.200.1/27
   network 192.168.0.1/27
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/ipinip.json b/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
index db70ea403121..62346451af04 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
@@ -2,7 +2,7 @@
     {
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
-            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1",
+            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1,192.168.200.1",
             "dscp_mode":"pipe",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
diff --git a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
index 2af5cee2f005..4852f6167bad 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
@@ -23,6 +23,7 @@ function wait_until_iface_ready
 
 
 # Wait for all interfaces with IPv4 addresses to be up and ready
+wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready Vlan1000 192.168.0.1/27
 wait_until_iface_ready PortChannel02 10.0.0.58/31
 wait_until_iface_ready PortChannel03 10.0.0.60/31
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
index a312e7532620..b8a7f2568232 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -35,6 +35,8 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.0.0/27
 !
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
+!
 !
 !
 router bgp 65100
@@ -58,6 +60,7 @@ router bgp 65100
   exit-address-family
 !
   network 192.168.0.1/27
+  network 192.168.200.1/27
 !
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf
index 16eb6095463b..72988e555261 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf
@@ -28,6 +28,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   network 192.168.0.1/27
+  network 192.168.200.1/27
   neighbor 10.0.0.57 remote-as 64600
   neighbor 10.0.0.57 description ARISTA01T1
   address-family ipv4
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index e2135d05296b..8b836dec38af 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -42,7 +42,7 @@ dependent_startup_wait_for=rsyslogd:running
 programs=isc-dhcp-relay-Vlan1000
 
 [program:isc-dhcp-relay-Vlan1000]
-command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
 priority=3
 autostart=false
 autorestart=false
@@ -56,7 +56,7 @@ dependent_startup_wait_for=start:exited
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
 priority=4
 autostart=false
 autorestart=false
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
index bb3c4e214e20..032eb26c5337 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -58,6 +58,8 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.0.0/27
 !
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
+!
 !
 !
 router bgp 65100
@@ -81,6 +83,7 @@ router bgp 65100
   exit-address-family
 !
   network 192.168.0.1/27
+  network 192.168.200.1/27
 !
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
index db70ea403121..62346451af04 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
@@ -2,7 +2,7 @@
     {
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
-            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1",
+            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1,192.168.200.1",
             "dscp_mode":"pipe",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
diff --git a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
index 6d90afa60ad7..68a3a830f068 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
@@ -24,6 +24,7 @@ function wait_until_iface_ready
 
 # Wait for all interfaces with IPv4 addresses to be up and ready
 wait_until_iface_ready Vlan1000 192.168.0.1/27
+wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready PortChannel01 10.0.0.56/31
 wait_until_iface_ready PortChannel02 10.0.0.58/31
 wait_until_iface_ready PortChannel03 10.0.0.60/31
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index d3d0a7f93d53..9f416d008d33 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -246,6 +246,20 @@
           <MacAddress i:nil="true"/>
           <SecondarySubnets/>
         </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan2000</Name>
+          <AttachTo>fortyGigE0/112;fortyGigE0/116;fortyGigE0/120</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type i:nil="true"/>
+          <DhcpRelays></DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.200.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
         <VlanInterface>
           <Name>Vlan99</Name>
           <AttachTo>fortyGigE0/100</AttachTo>
@@ -321,6 +335,11 @@
           <AttachTo>Vlan1000</AttachTo>
           <Prefix>192.168.0.1/27</Prefix>
         </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan2000</AttachTo>
+          <Prefix>192.168.200.1/27</Prefix>
+        </IPInterface>
       </IPInterfaces>
       <DataAcls/>
       <AclInterfaces>

From e60603cd964a74c367e8857f6b27a4d86f829335 Mon Sep 17 00:00:00 2001
From: anish-n <44376847+anish-n@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:17:56 -0800
Subject: [PATCH 0260/1674] [minigraph] Adjust minigraph parsing per Fine
 Grained ECMP matchmode changes (#6885)

To adjust config db generated via minigraph per matchmode changes in fine grained ecmp. The changes are done so that nexthop IP based filtering can occur to determine routes as requiring Fine Grained ECMP, in the past the only mode was to use the IP prefix of the route for filtering, with this matchmode change we will use nexthop IP based filtering
Azure/SONiC#727

How I did it
Change will modify config db entry created for FG_NHG to include 'match_mode': 'nexthop-based' so that nexthop IP based filtering can occur to determine routes as requiring Fine Grained ECMP. Changes also remove FG_NHG_PREFIX entry since its not needed under matchmode nexthop-based.
---
 src/sonic-config-engine/minigraph.py         | 31 +++++---------------
 src/sonic-config-engine/tests/test_cfggen.py | 15 +++++-----
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 70f7f839f91b..47db73c34f29 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -146,7 +146,6 @@ def formulate_fine_grained_ecmp(version, dpg_ecmp_content, port_device_map, port
         tag = "fgnhg_v6"
 
     port_nhip_map = dpg_ecmp_content['port_nhip_map']
-    nhgaddr = dpg_ecmp_content['nhgaddr']
     nhg_int = dpg_ecmp_content['nhg_int']
 
     nhip_device_map = {port_nhip_map[x]: port_device_map[x] for x in port_device_map
@@ -159,20 +158,17 @@ def formulate_fine_grained_ecmp(version, dpg_ecmp_content, port_device_map, port
     FG_NHG_MEMBER = {ip: {"FG_NHG": tag, "bank": bank} for ip, bank in nhip_bank_map.items()}
     nhip_port_map = dict(zip(port_nhip_map.values(), port_nhip_map.keys()))
 
-    
-
     for nhip, memberinfo in FG_NHG_MEMBER.items():
         if nhip in nhip_port_map:
             memberinfo["link"] = port_alias_map[nhip_port_map[nhip]]
             FG_NHG_MEMBER[nhip] = memberinfo
 
-    FG_NHG_PREFIX = {nhgaddr: {"FG_NHG": tag}}
-    FG_NHG = {tag: {"bucket_size": LCM}}
+    FG_NHG = {tag: {"bucket_size": LCM, "match_mode": "nexthop-based"}}
     for ip in nhip_bank_map:
         neigh_key.append(str(nhg_int + "|" + ip))
     NEIGH = {neigh_key: {"family": family} for neigh_key in neigh_key}
 
-    fine_grained_content = {"FG_NHG_MEMBER": FG_NHG_MEMBER, "FG_NHG": FG_NHG, "FG_NHG_PREFIX": FG_NHG_PREFIX, "NEIGH": NEIGH}
+    fine_grained_content = {"FG_NHG_MEMBER": FG_NHG_MEMBER, "FG_NHG": FG_NHG, "NEIGH": NEIGH}
     return fine_grained_content
 
 def parse_png(png, hname, dpg_ecmp_content = None):
@@ -189,7 +185,6 @@ def parse_png(png, hname, dpg_ecmp_content = None):
     port_device_map = {}
     png_ecmp_content = {}
     FG_NHG_MEMBER = {}
-    FG_NHG_PREFIX = {}
     FG_NHG = {}
     NEIGH = {}
 
@@ -292,12 +287,10 @@ def parse_png(png, hname, dpg_ecmp_content = None):
             for version, content in dpg_ecmp_content.items():  # version is ipv4 or ipv6
                 fine_grained_content = formulate_fine_grained_ecmp(version, content, port_device_map, port_alias_map)  # port_alias_map
                 FG_NHG_MEMBER.update(fine_grained_content['FG_NHG_MEMBER'])
-                FG_NHG_PREFIX.update(fine_grained_content['FG_NHG_PREFIX'])
                 FG_NHG.update(fine_grained_content['FG_NHG'])
                 NEIGH.update(fine_grained_content['NEIGH'])
 
-            png_ecmp_content = {"FG_NHG_PREFIX": FG_NHG_PREFIX, "FG_NHG_MEMBER": FG_NHG_MEMBER, "FG_NHG": FG_NHG,
-                            "NEIGH": NEIGH}
+            png_ecmp_content = {"FG_NHG_MEMBER": FG_NHG_MEMBER, "FG_NHG": FG_NHG, "NEIGH": NEIGH}
 
     return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds, console_ports, mux_cable_ports, is_storage_device, png_ecmp_content)
 
@@ -483,7 +476,6 @@ def parse_dpg(dpg, hname):
                 pcs[pcintfname] = {'members': pcmbr_list, 'min_links': str(int(math.ceil(len(pcmbr_list) * 0.75)))}
         port_nhipv4_map = {}
         port_nhipv6_map = {}
-        nhgaddr = ["", ""]
         nhg_int = ""
         nhportlist = []
         dpg_ecmp_content = {}
@@ -507,20 +499,12 @@ def parse_dpg(dpg, hname):
                         n = list(ipaddress.ip_network(UNICODE_TYPE(subnet_range), False).hosts())
                         if a in n:
                             nhg_int = ip_intfs_map[subnet_range]
-                dwnstrms = child.find(str(QName(ns, "DownstreamSummarySet")))
-                for dwnstrm in dwnstrms.findall(str(QName(ns, "DownstreamSummary"))):
-                    dwnstrmentry = str(ET.tostring(dwnstrm))
-                    if ("FineGrainedECMPGroupDestination" in dwnstrmentry):
-                        subnet_ip = dwnstrm.find(str(QName(ns1, "Subnet"))).text
-                        truncsubnet_ip = subnet_ip.split("/")[0]
-                        if "." in (truncsubnet_ip):
-                            nhgaddr[0] = subnet_ip
-                        elif ":" in (truncsubnet_ip):
-                            nhgaddr[1] = subnet_ip
-                ipv4_content = {"port_nhip_map": port_nhipv4_map, "nhgaddr": nhgaddr[0], "nhg_int": nhg_int}
-                ipv6_content = {"port_nhip_map": port_nhipv6_map, "nhgaddr": nhgaddr[1], "nhg_int": nhg_int}
+
+                ipv4_content = {"port_nhip_map": port_nhipv4_map, "nhg_int": nhg_int}
+                ipv6_content = {"port_nhip_map": port_nhipv6_map, "nhg_int": nhg_int}
                 dpg_ecmp_content['ipv4'] = ipv4_content
                 dpg_ecmp_content['ipv6'] = ipv6_content
+
         vlanintfs = child.find(str(QName(ns, "VlanInterfaces")))
         vlans = {}
         vlan_members = {}
@@ -1490,7 +1474,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
 
     if len(png_ecmp_content):
         results['FG_NHG_MEMBER'] = png_ecmp_content['FG_NHG_MEMBER']
-        results['FG_NHG_PREFIX'] = png_ecmp_content['FG_NHG_PREFIX']
         results['FG_NHG'] = png_ecmp_content['FG_NHG']
         results['NEIGH'] = png_ecmp_content['NEIGH']
 
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 89984a6fedd1..f6edb58d15a9 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -233,9 +233,14 @@ def test_minigraph_vlan_interfaces(self):
         self.assertEqual(output.strip(), "[('Vlan1000', '192.168.0.1/27'), 'Vlan1000']")
 
     def test_minigraph_ecmp_fg_nhg(self):
-        argument = '-m "' + self.ecmp_graph + '" -p "' + self.mlnx_port_config + '" -v \"FG_NHG.values()|list\"'
+        argument = '-m "' + self.ecmp_graph + '" -p "' + self.mlnx_port_config + '" -v FG_NHG'
         output = self.run_script(argument)
-        self.assertEqual(output.strip(), "[{'bucket_size': 120}, {'bucket_size': 120}]")
+        print(output.strip())
+        self.assertEqual(utils.to_dict(output.strip()), 
+                         utils.to_dict(
+                            "{'fgnhg_v4': {'match_mode': 'nexthop-based', 'bucket_size': 120}, "
+                            "'fgnhg_v6': {'match_mode': 'nexthop-based', 'bucket_size': 120}}"
+                        ))
 
     def test_minigraph_ecmp_members(self):
         argument = '-m "' + self.ecmp_graph + '" -p "' + self.mlnx_port_config + '" -v "FG_NHG_MEMBER.keys()|list|sort"'
@@ -254,12 +259,6 @@ def test_minigraph_ecmp_neighbors(self):
                                          " 'Vlan31|200:200:200:200::2', 'Vlan31|200:200:200:200::3', 'Vlan31|200:200:200:200::4', 'Vlan31|200:200:200:200::5', "
                                          "'Vlan31|200:200:200:200::6', 'Vlan31|200:200:200:200::7', 'Vlan31|200:200:200:200::8', 'Vlan31|200:200:200:200::9']")
 
-    def test_minigraph_ecmp_prefixes(self):
-        argument = '-m "' + self.ecmp_graph + '" -p "' + self.mlnx_port_config + '" -v "FG_NHG_PREFIX.keys()|list|sort"'
-        output = self.run_script(argument)
-        self.assertEqual(output.strip(), "['100.50.25.12/32', 'fc:5::/128']")
-
-        
     def test_minigraph_portchannels(self):
         argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v PORTCHANNEL'
         output = self.run_script(argument)

From 8b8c9665016a782fc723607f653685da61acc5ad Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 5 Mar 2021 11:23:47 -0800
Subject: [PATCH 0261/1674] [Arista] Refresh device folder for DCS-7060DX4-32
 (#6942)

As booting on DCS-7060DX4-32 would use the default sku of DCS-7060PX4-32 which is not compatible,
thus move some files around to properly separate the configurations that are device specific.

Signed-off-by: Samuel Angebault <staphylo@arista.com>
---
 device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32       | 1 -
 .../Arista-7060DX4-C32/port_config.ini                          | 0
 .../Arista-7060DX4-C32/sai.profile                              | 0
 .../Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm      | 0
 device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-C64       | 1 -
 device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-O32       | 1 -
 device/arista/x86_64-arista_7060dx4_32/default_sku              | 2 +-
 7 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 120000 device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32
 rename device/arista/{x86_64-arista_7060px4_32 => x86_64-arista_7060dx4_32}/Arista-7060DX4-C32/port_config.ini (100%)
 rename device/arista/{x86_64-arista_7060px4_32 => x86_64-arista_7060dx4_32}/Arista-7060DX4-C32/sai.profile (100%)
 rename device/arista/{x86_64-arista_7060px4_32 => x86_64-arista_7060dx4_32}/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm (100%)
 delete mode 120000 device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-C64
 delete mode 120000 device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-O32
 mode change 120000 => 100644 device/arista/x86_64-arista_7060dx4_32/default_sku

diff --git a/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32 b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32
deleted file mode 120000
index 19cc64c75f13..000000000000
--- a/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_7060px4_32/Arista-7060DX4-C32
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/port_config.ini b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/port_config.ini
similarity index 100%
rename from device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/port_config.ini
rename to device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/port_config.ini
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/sai.profile b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/sai.profile
similarity index 100%
rename from device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/sai.profile
rename to device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/sai.profile
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
similarity index 100%
rename from device/arista/x86_64-arista_7060px4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
rename to device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
diff --git a/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-C64 b/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-C64
deleted file mode 120000
index f0d5c7697f08..000000000000
--- a/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-C64
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_7060px4_32/Arista-7060PX4-C64
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-O32 b/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-O32
deleted file mode 120000
index 1e0685f3fb42..000000000000
--- a/device/arista/x86_64-arista_7060dx4_32/Arista-7060PX4-O32
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_7060px4_32/Arista-7060PX4-O32
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060dx4_32/default_sku b/device/arista/x86_64-arista_7060dx4_32/default_sku
deleted file mode 120000
index ebca56647346..000000000000
--- a/device/arista/x86_64-arista_7060dx4_32/default_sku
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_7060px4_32/default_sku
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060dx4_32/default_sku b/device/arista/x86_64-arista_7060dx4_32/default_sku
new file mode 100644
index 000000000000..ed73fdf88eeb
--- /dev/null
+++ b/device/arista/x86_64-arista_7060dx4_32/default_sku
@@ -0,0 +1 @@
+Arista-7060DX4-C32 t1

From 5f088e20afa55fd6ea7d5a3255351c0f508eb415 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sun, 7 Mar 2021 12:40:15 -0800
Subject: [PATCH 0262/1674] BRCM SAI 4.3.3.1-1 pick up Temp Patch to fix Dual
 TOR ACL issue CS00011559393 (#6980)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 41e028ee2e1d..bc553755d6ee 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A35%3A37Z&se=2030-03-04T00%3A35%3A00Z&sr=b&sp=r&sig=1miXMYs0%2BZ6v9Dpby1vSYsDezWDnr%2Be4gZ7Gi3kAQXE%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.1-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=n7KoEZ5wXY%2FobPAy62d9C%2BKyAkKo4PIdIAWwqnDBm3E%3D&se=2034-11-14T03%3A30%3A33Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.1-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A37%3A16Z&se=2030-03-04T00%3A37%3A00Z&sr=b&sp=r&sig=xxnhJC%2FKsOvApuAlB1Yds8Uzzkdyy6fmWX%2BuJ4v0UYA%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=EavLNMXA6OS3s9oD34bKbdtfYHppR4egkh7V7jc4gWM%3D&se=2034-11-14T03%3A31%3A04Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From df89f6dcb63568bc59cabb00c04bcef04d6adee3 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Tue, 9 Mar 2021 01:10:11 +0700
Subject: [PATCH 0263/1674] [device/celestica]: Add xcvrd event support for
 Haliburton (#6517)

#### Why I did it
- The xcvrd service requires an event detection function, unplug or plug in the transceiver.

#### How I did it
- Add sysfs interrupt to notify userspace app of external interrupt
- Implement get_change_event() in chassis api.
- Also begin installing Python 3 sonic-platform package for Celestica platforms
---
 .../sonic_platform/chassis.py                 | 205 +++++++++++++++---
 .../sonic_platform/event.py                   |  62 ++++++
 .../x86_64-cel_e1031-r0/sonic_platform/fan.py |   8 +
 .../sonic_platform/helper.py                  | 133 ++++++++++++
 .../x86_64-cel_e1031-r0/sonic_platform/sfp.py |  18 +-
 .../platform-modules-haliburton.install       |   1 +
 .../sonic-platform-modules-cel/debian/rules   |  13 +-
 .../platform_api/platform_api_mgnt.sh         |   1 +
 8 files changed, 393 insertions(+), 48 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
index 40c4bb4ef73b..b6e2dea0f67c 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -13,13 +13,11 @@
 import json
 
 try:
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
     from sonic_platform_base.chassis_base import ChassisBase
-    from sonic_platform.fan import Fan
-    from sonic_platform.psu import Psu
-    from sonic_platform.component import Component
-    from sonic_platform.thermal import Thermal
-    from sonic_platform.sfp import Sfp
-    from sonic_platform.eeprom import Tlv
+    from sonic_py_common import device_info
+    from .event import SfpEvent
+    from .helper import APIHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -40,29 +38,62 @@ class Chassis(ChassisBase):
 
     def __init__(self):
         ChassisBase.__init__(self)
-        self.config_data = {}
+        self._api_helper = APIHelper()
+        self.sfp_module_initialized = False
+        self.__initialize_eeprom()
+        self.is_host = self._api_helper.is_host()
+
+
+        if not self.is_host:
+            self.__initialize_fan()
+            self.__initialize_psu()
+            self.__initialize_thermals()
+        else:
+            self.__initialize_components()
+
+        self._reboot_cause_path = HOST_REBOOT_CAUSE_PATH if self.__is_host(
+        ) else PMON_REBOOT_CAUSE_PATH
+
+    def __initialize_sfp(self):
+        sfputil_helper = SfpUtilHelper()
+        port_config_file_path = device_info.get_path_to_port_config_file()
+        sfputil_helper.read_porttab_mappings(port_config_file_path, 0)
+
+        from sonic_platform.sfp import Sfp
+        for index in range(0, NUM_SFP):
+            name_idx = 0 if index+1 == NUM_SFP else index+1
+            sfp = Sfp(index, sfputil_helper.logical[name_idx])
+            self._sfp_list.append(sfp)
+        self.sfp_module_initialized = True
+
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
         for fant_index in range(0, NUM_FAN_TRAY):
             for fan_index in range(0, NUM_FAN):
                 fan = Fan(fant_index, fan_index)
                 self._fan_list.append(fan)
-        for index in range(0, NUM_PSU):
-            psu = Psu(index)
-            self._psu_list.append(psu)
+
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
         for index in range(0, NUM_THERMAL):
             thermal = Thermal(index)
             self._thermal_list.append(thermal)
-        # sfp index start from 1
-        self._sfp_list.append(None)
-        for index in range(1, NUM_SFP+1):
-            sfp = Sfp(index)
-            self._sfp_list.append(sfp)
+
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
         for index in range(0, NUM_COMPONENT):
             component = Component(index)
             self._component_list.append(component)
-        self._reboot_cause_path = HOST_REBOOT_CAUSE_PATH if self.__is_host(
-        ) else PMON_REBOOT_CAUSE_PATH
-
-        self._eeprom = Tlv()
 
     def __is_host(self):
         return os.system(HOST_CHK_CMD) == 0
@@ -85,14 +116,6 @@ def get_base_mac(self):
         """
         return self._eeprom.get_mac()
 
-    def get_serial(self):
-        """
-        Retrieves the hardware serial number for the chassis
-        Returns:
-            A string containing the hardware serial number for this chassis.
-        """
-        return self._eeprom.get_serial()
-
     def get_system_eeprom_info(self):
         """
         Retrieves the full content of system EEPROM information for the chassis
@@ -116,7 +139,8 @@ def get_reboot_cause(self):
         """
         description = 'None'
         reboot_cause = self.REBOOT_CAUSE_HARDWARE_OTHER
-        hw_reboot_cause = self._component_list[0].get_register_value(RESET_REGISTER)
+        hw_reboot_cause = self._component_list[0].get_register_value(
+            RESET_REGISTER)
         sw_reboot_cause = self.__read_txt_file(
             self._reboot_cause_path) or "Unknown"
 
@@ -145,3 +169,128 @@ def get_watchdog(self):
             self._watchdog = Watchdog()
 
         return self._watchdog
+
+    def get_change_event(self, timeout=0):
+        """
+        Returns a nested dictionary containing all devices which have
+        experienced a change at chassis level
+        Args:
+            timeout: Timeout in milliseconds (optional). If timeout == 0,
+                this method will block until a change is detected.
+        Returns:
+            (bool, dict):
+                - True if call successful, False if not;
+                - A nested dictionary where key is a device type,
+                  value is a dictionary with key:value pairs in the format of
+                  {'device_id':'device_event'},
+                  where device_id is the device ID for this device and
+                        device_event,
+                             status='1' represents device inserted,
+                             status='0' represents device removed.
+                  Ex. {'fan':{'0':'0', '2':'1'}, 'sfp':{'11':'0'}}
+                      indicates that fan 0 has been removed, fan 2
+                      has been inserted and sfp 11 has been removed.
+        """
+        # SFP event
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        sfp_event = SfpEvent(self._sfp_list).get_sfp_event(timeout)
+        if sfp_event:
+            return True, {'sfp': sfp_event}
+
+        return False, {'sfp': {}}
+
+    ##############################################################
+    ######################## SFP methods #########################
+    ##############################################################
+
+    def get_num_sfps(self):
+        """
+        Retrieves the number of sfps available on this chassis
+        Returns:
+            An integer, the number of sfps available on this chassis
+        """
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        return len(self._sfp_list)
+
+    def get_all_sfps(self):
+        """
+        Retrieves all sfps available on this chassis
+        Returns:
+            A list of objects derived from SfpBase representing all sfps
+            available on this chassis
+        """
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        return self._sfp_list
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._eeprom.get_pn()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return self._eeprom.get_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
new file mode 100644
index 000000000000..c8a487f383ea
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
@@ -0,0 +1,62 @@
+try:
+    import time
+    import select
+    from .helper import APIHelper
+    from sonic_py_common.logger import Logger
+except ImportError as e:
+    raise ImportError(repr(e) + " - required module not found")
+
+
+class SfpEvent:
+    ''' Listen to insert/remove sfp events '''
+
+    SFP_NUM_START = 49
+    DELAY = 0.05
+    INT_PATH = '/sys/devices/platform/e1031.smc/SFP/modabs_int'
+    GPIO_SUS7 = '/sys/devices/platform/hlx-ich.0/sci_int_gpio_sus7'
+
+    def __init__(self, sfp_list):
+        self._api_helper = APIHelper()
+        self._sfp_list = sfp_list
+        self._logger = Logger()
+        
+        # clear interrupt
+        self._api_helper.read_one_line_file(self.INT_PATH)
+
+    def get_sfp_event(self, timeout):
+        epoll = select.epoll()
+        port_dict = {}
+        timeout_sec = timeout/1000
+
+        try:
+            # We get notified when there is an SCI interrupt from GPIO SUS7
+            fd = open(self.GPIO_SUS7, "r")
+            fd.read()
+
+            epoll.register(fd.fileno(), select.EPOLLIN & select.EPOLLET)
+            events = epoll.poll(timeout=timeout_sec if timeout != 0 else -1)
+            if events:
+                # Read the QSFP ABS interrupt & status registers
+                port_changes = self._api_helper.read_one_line_file(
+                    self.INT_PATH)
+                changes = int(port_changes, 16)
+                for sfp in self._sfp_list:
+                    if sfp.port_num < self.SFP_NUM_START:
+                        continue
+
+                    change = (changes >> sfp.port_num-self.SFP_NUM_START) & 1
+                    if change == 1:
+                        time.sleep(self.DELAY)
+                        port_status = sfp.get_presence()
+                        port_dict[str(sfp.port_num)] = '1' if port_status else '0'
+
+                return port_dict
+        except Exception as e:
+            self._logger.log_error("Failed to detect SfpEvent - " + repr(e))
+            return False
+
+        finally:
+            fd.close()
+            epoll.close()
+
+        return False
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
index 18cf513800aa..cebed613db92 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
@@ -247,3 +247,11 @@ def get_presence(self):
         present_str = self.__read_txt_file(fan_direction_file) or '1'
 
         return int(present_str) == 0 if not self.is_psu_fan else True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and self.get_speed() > 0
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..75449ab55185
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py
@@ -0,0 +1,133 @@
+import os
+import struct
+import subprocess
+from mmap import *
+
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def read_one_line_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.readline()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except Exception:
+            return False
+        return True
+
+    def get_cpld_reg_value(self, getreg_path, register):
+        cmd = "echo {1} > {0}; cat {0}".format(getreg_path, register)
+        status, result = self.run_command(cmd)
+        return result if status else None
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(
+                str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
index 608111d7e2fd..36ee9cbc01a0 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
@@ -16,7 +16,6 @@
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
     from sonic_platform_base.sonic_sfp.sff8472 import sffbase
-    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -88,10 +87,10 @@ class Sfp(SfpBase):
     PLATFORM = "x86_64-cel_e1031-r0"
     HWSKU = "Celestica-E1031-T48S4"
 
-    def __init__(self, sfp_index):
+    def __init__(self, sfp_index, sfp_name):
         # Init index
         self.index = sfp_index
-        self.port_num = self.index
+        self.port_num = self.index + 1
 
         # Init eeprom path
         eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
@@ -111,6 +110,7 @@ def __init__(self, sfp_index):
         self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
                                     'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
 
+        self.name = sfp_name
         SfpBase.__init__(self)
 
     def _convert_string_to_num(self, value_str):
@@ -145,12 +145,6 @@ def __read_txt_file(self, file_path):
     def __is_host(self):
         return os.system(self.HOST_CHK_CMD) == 0
 
-    def __get_path_to_port_config_file(self):
-        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
-        hwsku_path = "/".join([platform_path, self.HWSKU]
-                              ) if self.__is_host() else self.PMON_HWSKU_PATH
-        return "/".join([hwsku_path, "port_config.ini"])
-
     def __read_eeprom_specific_bytes(self, offset, num_bytes):
         sysfsfile_eeprom = None
         eeprom_raw = []
@@ -670,11 +664,7 @@ def get_name(self):
             Returns:
             string: The name of the device
         """
-        sfputil_helper = SfpUtilHelper()
-        sfputil_helper.read_porttab_mappings(
-            self.__get_path_to_port_config_file())
-        name = sfputil_helper.logical[self.index] or "Unknown"
-        return name
+        return self.name
 
     def get_presence(self):
         """
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
index 167de45532db..ec56777b9ffb 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
@@ -4,6 +4,7 @@ haliburton/script/fancontrol.sh etc/init.d
 haliburton/script/fancontrol.service lib/systemd/system
 services/fancontrol/fancontrol  usr/local/bin
 haliburton/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-cel_e1031-r0
+haliburton/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-cel_e1031-r0
 services/platform_api/platform_api_mgnt.sh usr/local/bin
 haliburton/script/popmsg.sh usr/local/bin
 haliburton/script/udev_prefix.sh usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/rules b/platform/broadcom/sonic-platform-modules-cel/debian/rules
index a7293e0b6700..efb5aa47b437 100755
--- a/platform/broadcom/sonic-platform-modules-cel/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/rules
@@ -13,13 +13,15 @@ MODULE_DIRS:= dx010 haliburton silverstone seastone2
 override_dh_auto_build:
 	(for mod in $(MODULE_DIRS); do \
 		make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
-		cd $(MOD_SRC_DIR)/$${mod}; \
-		python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
-		cd $(MOD_SRC_DIR); \
 		if [ $$mod = "seastone2" ]; then \
 			cd services/platform_api; \
-			python2 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
-		fi \
+			python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
+			python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
+			continue; \
+		fi; \
+		cd $(MOD_SRC_DIR)/$${mod}; \
+		python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
+		python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
 	done)
 
 override_dh_auto_install:
@@ -37,4 +39,3 @@ override_dh_clean:
 	(for mod in $(MODULE_DIRS); do \
 		make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules clean; \
 	done)
-
diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
index e1d330357894..493119bd37f6 100755
--- a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
+++ b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
@@ -9,6 +9,7 @@ install() {
     # Install sonic-platform package
     if [ -e $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl ]; then
         pip install $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl
+        pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl
     fi
 }
 

From d9e917507daa5d03c4d2a32f6c365b8682f7e56a Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Mon, 8 Mar 2021 10:16:25 -0800
Subject: [PATCH 0264/1674] [sonic-platform-common] submodule update (#6983)

Includes the following commits:

1673d25 [y_cable] refactor upgrade firmware API's; Fix vendor and part number API's read size for read_eeprom (#174)
ed93a15 [sonic_platform_base] Proper use of class and instance attributes (#173)
691de92 [sonic_y_cable] add stub function for upgrade firmware of Y cable and split the get_part_number and get_vendor API's (#171)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index c6b642b03a64..1673d2594842 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit c6b642b03a64fbd530b229a0a79d5bff9a938845
+Subproject commit 1673d25948428c10305674553095199b25cf89e5

From fdbb7fedd918948f8303eae933bac3553f7cb792 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Tue, 9 Mar 2021 18:12:44 -0800
Subject: [PATCH 0265/1674] dhcp for dual tor: include all vlan intf into
 downstream intf (#6990)

* include all vlan intf into downstream intf

* add a comment
---
 src/isc-dhcp/patch/0009-Support-for-dual-tor-scenario.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/isc-dhcp/patch/0009-Support-for-dual-tor-scenario.patch b/src/isc-dhcp/patch/0009-Support-for-dual-tor-scenario.patch
index e918cc619106..0f7495f49e7c 100644
--- a/src/isc-dhcp/patch/0009-Support-for-dual-tor-scenario.patch
+++ b/src/isc-dhcp/patch/0009-Support-for-dual-tor-scenario.patch
@@ -238,7 +238,7 @@ index e158efe..055d97f 100644
  		  (flags & INTERFACE_UPSTREAM ? 'Y' : 'N'),
  		  (flags & INTERFACE_DOWNSTREAM ? 'Y' : 'N'));
  
-+	if (flags & INTERFACE_DOWNSTREAM) {
++	if (flags & INTERFACE_DOWNSTREAM || flags & INTERFACE_UPSTREAM) { /* include all vlan intf in downstream_intf_list */
 +		ci = ((struct downstream_intf_list *)dmalloc(sizeof *ci, MDL));
 +		if (!ci)
 +			log_fatal("no memory for downstream interface pointer.\n");

From 97426aff5afea36950d90765bfab7631c3414550 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Tue, 9 Mar 2021 18:15:16 -0800
Subject: [PATCH 0266/1674] [build]: Fix get-pip 2.7 url according to upstream
 announcement (#6999)

ref: https://bootstrap.pypa.io/2.7/get-pip.py

The URL you are using to fetch this script has changed, and this one will no
longer work. Please use get-pip.py from the following URL instead:

    https://bootstrap.pypa.io/pip/2.7/get-pip.py
---
 dockers/docker-ptf/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 43eefcd9eeff..eba818da9fcc 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -78,7 +78,7 @@ RUN rm -rf /debs \
     && apt-get -y autoclean \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/* \
-    && wget --https-only https://bootstrap.pypa.io/2.7/get-pip.py \
+    && wget --https-only https://bootstrap.pypa.io/pip/2.7/get-pip.py \
     && python get-pip.py \
     && rm -f get-pip.py \
     && pip install setuptools \

From a4d81f3c19cc4156a3d2b7d11cdb8a2e91f30107 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Tue, 9 Mar 2021 19:49:54 -0800
Subject: [PATCH 0267/1674] Copy dummy flannel.conf to get around absence of
 CNI Network (#6985)

Why I did it
We skip install of CNI plugin, as we don't need. But this leaves node in "not ready" state, upon joining master.
To fix, we copy this dummy .conf file in /etc/cni/net.d

How I did it
Keep this file in /usr/share/sonic/templates and copy to /etc/cni/net.d upon joining k8s master.

How to verify it
Upon configuring master-IP and enable join, watch node join and move to ready state.
You may verify using kubectl get nodes command
---
 .../build_templates/sonic_debian_extension.j2 |  4 +++
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  6 ++--
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     | 19 ++++++++-----
 src/sonic-ctrmgrd/tests/kube_commands_test.py | 28 ++++++++++++++-----
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 8edd9af847a6..9d2556edb572 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -403,6 +403,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
 
 {% if include_kubernetes == "y" %}
+# Copy Flannel conf file into sonic-templates
+#
+sudo cp $BUILD_TEMPLATES/kube_cni.10-flannel.conflist $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
 # Install remote Container mgmt package
 # Required even if include_kubernetes != y, as it contains the
 # the container wrapper for docker start/stop/wait commands.
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index ba4f0057bd05..49c11d278170 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -201,7 +201,7 @@ def mod_db_entry(self, db_name, table_name, key, data):
         """ Modify entry for given table|key with given dict type data """
         conn = self.db_connectors[db_name]
         tbl = swsscommon.Table(conn, table_name)
-        print("mod_db_entry: db={} tbl={} key={} data={}".format(db_name, table_name, key, str(data)))
+        log_debug("mod_db_entry: db={} tbl={} key={} data={}".format(db_name, table_name, key, str(data)))
         tbl.set(key, list(data.items()))
 
 
@@ -242,7 +242,7 @@ def run(self):
                 if not UNIT_TESTING:
                     raise Exception("Received error from select")
                 else:
-                    print("Skipped Exception; Received error from select")
+                    log_debug("Skipped Exception; Received error from select")
                     return
 
             for subscriber in self.subscribers:
@@ -588,7 +588,7 @@ def main():
     FeatureTransitionHandler(server)
     LabelsPendingHandler(server)
     server.run()
-    print("ctrmgrd.py main called")
+    log_debug("ctrmgrd.py main called")
     return 0
 
 
diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index 1ebfa606f07f..db8cb348fcb2 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -22,6 +22,8 @@
 KUBELET_YAML = "/var/lib/kubelet/config.yaml"
 SERVER_ADMIN_URL = "https://{}/admin.conf"
 LOCK_FILE = "/var/lock/kube_join.lock"
+FLANNEL_CONF_FILE = "/usr/share/sonic/templates/kube_cni.10-flannel.conflist"
+CNI_DIR = "/etc/cni/net.d"
 
 # kubectl --kubeconfig <KUBE_ADMIN_CONF> label nodes
 #       <device_info.get_hostname()> <label to be added>
@@ -150,7 +152,7 @@ def func_get_labels(args):
         log_debug("Labels read failed.")
         return ret
 
-    print(json.dumps(node_labels, indent=4))
+    log_debug(json.dumps(node_labels, indent=4))
     return 0
     
 
@@ -174,7 +176,7 @@ def is_connected(server=""):
 def func_is_connected(args):
     """ Get connected state """
     connected = is_connected()
-    print("Currently {} to Kube master".format(
+    log_debug("Currently {} to Kube master".format(
         "connected" if connected else "not connected"))
     return 0 if connected else 1
 
@@ -212,11 +214,11 @@ def _download_file(server, port, insecure):
             str(port), server, str(port), fname, update_file)
     (ret, _, err) = _run_command(cmd)
 
-    print("sed command: ret={}".format(ret))
+    log_debug("sed command: ret={}".format(ret))
     if ret != 0:
         log_error("sed update of downloaded file failed with ret={}".
                 format(ret))
-        print("sed command failed: ret={}".format(ret))
+        log_debug("sed command failed: ret={}".format(ret))
         return ret
 
     shutil.copyfile(update_file, KUBE_ADMIN_CONF)
@@ -272,7 +274,7 @@ def _do_reset(pending_join = False):
                 format(KUBE_ADMIN_CONF, device_info.get_hostname()))
 
     _run_command("kubeadm reset -f", 10)
-    _run_command("rm -rf /etc/cni/net.d")
+    _run_command("rm -rf {}".format(CNI_DIR))
     if not pending_join:
         _run_command("rm -f {}".format(KUBE_ADMIN_CONF))
     _run_command("systemctl stop kubelet")
@@ -284,16 +286,19 @@ def _do_join(server, port, insecure):
     out = ""
     try:
         ret = _download_file(server, port, insecure)
-        print("_download ret={}".format(ret))
+        log_debug("_download ret={}".format(ret))
         if ret == 0:
             _do_reset(True)
             _run_command("modprobe br_netfilter")
+            # Copy flannel.conf
+            _run_command("mkdir -p {}".format(CNI_DIR))
+            _run_command("cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR))
             (ret, _, _) = _run_command("systemctl start kubelet")
 
         if ret == 0:
             (ret, out, err) = _run_command(KUBEADM_JOIN_CMD.format(
                 KUBE_ADMIN_CONF, device_info.get_hostname()), timeout=60)
-            print("ret = {}".format(ret))
+            log_debug("ret = {}".format(ret))
 
     except IOError as e:
         err = "Download failed: {}".format(str(e))
diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py
index 84260d348837..b76c23e100fe 100755
--- a/src/sonic-ctrmgrd/tests/kube_commands_test.py
+++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py
@@ -13,6 +13,8 @@
 
 
 KUBE_ADMIN_CONF = "/tmp/kube_admin.conf"
+FLANNEL_CONF_FILE = "/tmp/flannel.conf"
+CNI_DIR = "/tmp/cni/net.d"
 
 # kube_commands test cases
 # NOTE: Ensure state-db entry is complete in PRE as we need to
@@ -108,9 +110,11 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
             "modprobe br_netfilter",
+            "mkdir -p {}".format(CNI_DIR),
+            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
             "kubeadm join --discovery-file {} --node-name None".format(
                 KUBE_ADMIN_CONF)
@@ -129,9 +133,11 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
             "modprobe br_netfilter",
+            "mkdir -p {}".format(CNI_DIR),
+            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
             "kubeadm join --discovery-file {} --node-name None".format(
                 KUBE_ADMIN_CONF)
@@ -159,9 +165,11 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
             "modprobe br_netfilter",
+            "mkdir -p {}".format(CNI_DIR),
+            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
             "kubeadm join --discovery-file {} --node-name None".format(
                 KUBE_ADMIN_CONF)
@@ -181,9 +189,11 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
             "modprobe br_netfilter",
+            "mkdir -p {}".format(CNI_DIR),
+            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
             "kubeadm join --discovery-file {} --node-name None".format(
                 KUBE_ADMIN_CONF)
@@ -213,7 +223,7 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "rm -f {}".format(KUBE_ADMIN_CONF),
             "systemctl stop kubelet"
         ]
@@ -228,7 +238,7 @@
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
 None".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "rm -f {}".format(KUBE_ADMIN_CONF),
             "systemctl stop kubelet"
         ]
@@ -239,7 +249,7 @@
         common_test.ARGS: [True],
         common_test.PROC_CMD: [
             "kubeadm reset -f",
-            "rm -rf /etc/cni/net.d",
+            "rm -rf {}".format(CNI_DIR),
             "rm -f {}".format(KUBE_ADMIN_CONF),
             "systemctl stop kubelet"
         ]
@@ -269,7 +279,11 @@ def init(self):
         kubelet_yaml = "/tmp/kubelet_config.yaml"
         with open(kubelet_yaml, "w") as s:
             s.close()
+        with open(FLANNEL_CONF_FILE, "w") as s:
+            s.close()
         kube_commands.KUBELET_YAML = kubelet_yaml
+        kube_commands.CNI_DIR = CNI_DIR
+        kube_commands.FLANNEL_CONF_FILE = FLANNEL_CONF_FILE
         kube_commands.SERVER_ADMIN_URL = "file://{}".format(self.admin_conf_file)
         kube_commands.KUBE_ADMIN_CONF = KUBE_ADMIN_CONF
 

From d5782faebc4469bc27fae059d520a9c8bb9440a9 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Tue, 9 Mar 2021 20:38:59 -0800
Subject: [PATCH 0268/1674] [Arista] Update phy-credo gearbox code (#6973)

This package was outdated and did not properly install on buster due to dependency changes.
This version should work on all DCS-7280CR3*-32[PD]4 platforms.

Signed-off-by: Samuel Angebault <staphylo@arista.com>
---
 rules/phy-credo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/phy-credo.mk b/rules/phy-credo.mk
index f132498ec211..574afd7a39fe 100644
--- a/rules/phy-credo.mk
+++ b/rules/phy-credo.mk
@@ -1,3 +1,3 @@
 PHY_CREDO = phy-credo_1.0_amd64.deb
-$(PHY_CREDO)_URL = "https://github.com/aristanetworks/sonic-firmware/raw/78a3df2/phy/phy-credo_1.0_amd64.deb"
+$(PHY_CREDO)_URL = "https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb"
 SONIC_ONLINE_DEBS += $(PHY_CREDO)

From a245f73b1c3894d0665a420d4fea4775a508e110 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Wed, 10 Mar 2021 09:07:47 -0800
Subject: [PATCH 0269/1674] [sonic-cfggen]: Use unix socket when reading from
 DB only if we are using sudo. (#7002)

Closes issue #6982.
The issue was root caused as we were using the unix_socket for reading from DB as a default mechanism (#5250). The redis unix socket is created as follows.

admin@str--acs-1:~$ ls -lrt /var/run/redis/redis.sock
srwxrw---- 1 root redis 0 Mar  6 01:57 /var/run/redis/redis.sock
So it used to work fine for the user "root" or if user is part of redis group ( admin was made part of redis group by default )

Check if the user is with sudo permissions then use the redis unix socket, else fallback to tcp socket.
---
 src/sonic-config-engine/sonic-cfggen | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index 0f9ffafad635..e6a1726052f4 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -352,10 +352,11 @@ def main():
         deep_update(data, json.loads(args.additional_data))
 
     if args.from_db:
+        use_unix_sock = True if os.getuid() == 0 else False
         if args.namespace is None:
-            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, **db_kwargs)
         else:
-            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, namespace=args.namespace, **db_kwargs)
 
         configdb.connect()
         deep_update(data, FormatConverter.db_to_output(configdb.get_config()))

From d5b3519a843b735dfb08ef8fab0087c56e62ef7e Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Thu, 4 Mar 2021 09:18:21 -0800
Subject: [PATCH 0270/1674] [sonic-swss-common] Update submodule (#6958)

Update the sonic-swss-common submodule. The following are the commits in the submodule.

f01fede [debian/control] libswsscommon-dev depends on libbost-dev (#458)
607a8ce Convert return value of get_all function in SonicV2Connector to dict (#462)
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index b75aab763602..f01fede8500a 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit b75aab7636021199d3f6498eb2295f8e9dc34d73
+Subproject commit f01fede8500a499ce94f3573f0bb6c3c5991efe7

From 66831f368ba0aab293cae595dec7a215ed337132 Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Wed, 10 Mar 2021 22:03:43 +0200
Subject: [PATCH 0271/1674] [Mellanox] Update MFT to 4.16.0-105 (#7007)

- Why I did it
Update MFT tool version to 4.16.0

Bugs fixes:
mlxlink: Fixed an issue that caused the margin scan to fail with the following message: Eye scan not completed.
mlxcable: Cable firmware burning capability is not supported.

New features:
mlxlink: Enabled margin scan on Network links.
mlxlink: Added PRBS TX/RX polarity inversion using the following flags: --invert_tx_polarity / --invert_rx_polarity

- How I did it
Update MFT make file with new version number.

- How to verify it
Build image and test related functions on Mellanox platform
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 4529343931e3..919e6fae9d9a 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.15.3
-MFT_REVISION = 3
+MFT_VERSION = 4.16.0
+MFT_REVISION = 105
 
 export MFT_VERSION MFT_REVISION
 

From 98f15e6eca637dc78eed2535870d3f8cb7008c37 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 10 Mar 2021 12:50:54 -0800
Subject: [PATCH 0272/1674] [frr]: upgrade frr to frr-7.5.1 (#7003)

Update FRR to 7.5.1. The following is a list of new commits.
```
df7ab485b FRRouting Release 7.5.1
f4ed841b8 Merge pull request #8187 from opensourcerouting/rpmfixes-75
86d5a20e3 Merge pull request #8193 from mjstapp/fix_signals_7_5
b339cc149 lib: avoid signal-handling race with event loop poll call
0f7b432c3 lib: add debug output for signal mask
c0290c86d lib: add sigevent_check api
7a5348665 doc: Fix CentOS 7 Documentation
2a8e69f48 Merge pull request #8064 from donaldsharp/foo
cf4d1a744 redhat: Fix changelog incorrect date format
b78dcb209 Merge pull request #8181 from idryzhov/7.5-zebra-blackhole
2032e7e72 zebra: don't use kernel nexthops for blackhole routes
e52003567 bgpd: When deleting a neighbor from a peer-group the PGNAME is optional
aa86a6a6f Merge pull request #8161 from mjstapp/fix_sa_7_5_backports
13a8efb4b Merge pull request #8156 from idryzhov/7.5-backports-2021-02-26
58911c6ed lib: Free memory leak in error path in clippy
556dfd211 lib: use right type for wconv() return val
bd9caa8f1 lib: fix some misc SA warnings
683b3fe3f lib: register dependency between control plane protocol and vrf nb nodes
b45248fb6 lib: add definitions for vrf xpaths
7b9f10d04 lib: add ability to register dependencies between northbound nodes
9c240815c bgpd: Bgp peer group issue
d1b43634b bgpd: upon bgp deletion, do not systematically ask to remove main bgp
f5d1dc55e bgpd: Fix crash when we don't have a nexthop
c2e463478 frr-reload: rpki context exiting uses exit and not end
f11db1698 bgpd: Blackhole nexthops are not reachable
c628e94ff staticd: fix vrf enabling
49b079ef1 staticd: fix nexthop creation and installation
0077038e9 staticd: fix nexthop validation
be3dfbbc7 zebra: use AF_INET for protocol family
```
---
 rules/frr.mk      | 4 ++--
 src/sonic-frr/frr | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index c8175339f444..82db96557007 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -1,9 +1,9 @@
 # FRRouting (frr) package
 
-FRR_VERSION = 7.5
+FRR_VERSION = 7.5.1
 FRR_SUBVERSION = 0
 FRR_BRANCH = frr/7.5
-FRR_TAG = frr-7.5-s3
+FRR_TAG = frr-7.5.1
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
index e2f17ae47ad0..df7ab485bde1 160000
--- a/src/sonic-frr/frr
+++ b/src/sonic-frr/frr
@@ -1 +1 @@
-Subproject commit e2f17ae47ad047e66923c2ff1e84c9ba10d4ad38
+Subproject commit df7ab485bde1a511f131f7ad6b70cb43c48c8e6d

From 2e0bdd7921d95e0048951e9c98be67a92e7eb231 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 10 Mar 2021 14:44:48 -0800
Subject: [PATCH 0273/1674] [sonic-platform-daemons] Update submodule (#6998)

* src/sonic-platform-daemons 068bccc...e5165b7 (7):
  > [xcvrd] Fix crash: If 'dom_capability' not in port_info_dict, insert 'N/A' (#162)
  > fix the muxcable state change notification received from other modules, omit the check inside hw_state table (#159)
  > [xcvrd] Fix crash on platforms which support media settings with Python 3 (#158)
  > [xcvrd] Save the dom_capability of transceiver into db (#72)
  > [xcvrd] Fix xcvrd crash on other port prefixes (#123)
  > [xcvrd] Make functions used for media setting python3 compatible (#153)
  > [psud] Refactor unit tests; increase unit test coverage (#146)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 068bcccf1f30..e5165b79dfe7 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 068bcccf1f3057607b8f37709033d7f44a6ff844
+Subproject commit e5165b79dfe722052ea86694e5fe98429c735e36

From 52634787a487fbc24440ce8ba3da9a7de2e91123 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Thu, 11 Mar 2021 02:29:04 -0800
Subject: [PATCH 0274/1674] [202012][submodule] Update sonic-linux-kernel
 submodule (#7013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Unset CONFIG_THERMAL_STATISTICS to prevent kernel crash (#199)
- [dni_dps460] Add attributes to retrieve PMBus status command codes (#197)
- [mellanox]: Backport new kernel patches (#195)
- [ci]: build amd64/armhf/arm64 for CI build (#196)
- Fix read and write failure to ‘fan1_target’ attribute of ‘dni_dps460’ driver. (#183)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 11f0da688d5b..3e191df578a3 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 11f0da688d5bd7e206c3e50fd408d0717e9626d1
+Subproject commit 3e191df578a32cae5c75e089efb19b12b09aabf1

From e88579bbab1b35185115f6870773c44c8e0a6181 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Thu, 11 Mar 2021 06:47:28 -0800
Subject: [PATCH 0275/1674] [202012][submodule] Update sonic-utilities
 submodule (#7012)

* [202012][submodule] Update sonic-utilities submodule
- [acl-loader] Improve input validation for acl_loader (#1479)
- [show] cli support for show muxcable cableinfo (#1448)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 9a9bff42d193..c073d60ec35a 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 9a9bff42d1931ba0cd006569410e99fd989c6d32
+Subproject commit c073d60ec35a55a0af3de27f30595224c137051b

From 510202736cecafaeb6bc1acf139f1ac613ccd116 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Thu, 11 Mar 2021 06:47:49 -0800
Subject: [PATCH 0276/1674] [202012][submodule] Update swss for 202012 (#7011)

- Keep attribute order in bulk mode (#1659)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c712c244a61a..3ec22bcc54bf 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c712c244a61a61fa593866a7c4bbc354ce318c2d
+Subproject commit 3ec22bcc54bf90da1a6dabc8d5737b9af80f0338

From 77477857b47b114fde18afc33985e1a76c464c09 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 12 Mar 2021 10:01:12 +0800
Subject: [PATCH 0277/1674] Update SONiC version files (#6996)

Co-authored-by: mssonicbld <vsts@fv-az113-375.lunlmptkugju1kgiw3yhqmpbea.bx.internal.cloudapp.net>
---
 files/build/versions/default/versions-py3        |  2 +-
 .../docker-base-stretch/versions-deb-stretch     |  2 +-
 .../sonic-slave-buster/versions-deb-buster       |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch     | 16 ++++++++--------
 .../versions/host-image/versions-deb-buster      |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index c7c2096220d2..957c6a1869fb 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -10,7 +10,7 @@ grpcio==1.36.1
 grpcio-tools==1.20.0
 hiredis==1.1.0
 idna==2.10
-importlib-metadata==3.7.0
+importlib-metadata==3.7.2
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index f760bca27701..a1eeff0e7dba 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -48,7 +48,7 @@ libssl1.1==1.1.0l-1~deb9u3
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
 libwrap0==7.6.q-26
-libzmq5==4.2.1-4+deb9u3
+libzmq5==4.2.1-4+deb9u4
 lua-cjson==2.1.0+dfsg-2
 mime-support==3.60
 net-tools==1.60+git20161116.90da8a0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 5ae65c86315a..8110d1106272 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.3-1
+containerd.io==1.4.4-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index edc0de9766cf..29f79064abc5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1123,17 +1123,17 @@ libyaml-0-2==0.1.7-2
 libyaml-dev==0.1.7-2
 libyaml-libyaml-perl==0.63-2
 libyaml-tiny-perl==1.70-1
-libzmq3-dev==4.2.1-4+deb9u3
-libzmq5==4.2.1-4+deb9u3
+libzmq3-dev==4.2.1-4+deb9u4
+libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u1
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.246-2
-linux-headers-4.9.0-14-amd64==4.9.246-2
-linux-headers-4.9.0-14-common==4.9.246-2
-linux-headers-amd64==4.9+80+deb9u12
-linux-kbuild-4.9==4.9.246-2
-linux-libc-dev==4.9.246-2
+linux-compiler-gcc-6-x86==4.9.258-1
+linux-headers-4.9.0-15-amd64==4.9.258-1
+linux-headers-4.9.0-15-common==4.9.258-1
+linux-headers-amd64==4.9+80+deb9u13
+linux-kbuild-4.9==4.9.258-1
+linux-libc-dev==4.9.258-1
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 4a30be01057c..0ffc32917cbc 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.3-1
+containerd.io==1.4.4-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u1

From 78737775d9e84d306799edf2b56c4768b26a25af Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 12 Mar 2021 00:44:09 -0800
Subject: [PATCH 0278/1674] [ci]: add official-build for 202012

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/build-template.yml    | 116 +++++++++++++++++++++++++
 .azure-pipelines/cleanup.yml           |  17 ++++
 .azure-pipelines/official-build.yml    |  62 +++++++++++++
 .azure-pipelines/run-test-template.yml |  82 +++++++++++++++++
 4 files changed, 277 insertions(+)
 create mode 100644 .azure-pipelines/build-template.yml
 create mode 100644 .azure-pipelines/cleanup.yml
 create mode 100644 .azure-pipelines/official-build.yml
 create mode 100644 .azure-pipelines/run-test-template.yml

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
new file mode 100644
index 000000000000..c1cc04836a94
--- /dev/null
+++ b/.azure-pipelines/build-template.yml
@@ -0,0 +1,116 @@
+parameters:
+- name: platform
+  type: string
+  values:
+  - broadcom
+  - centec-arm64
+  - marvell-armhf
+  - mellanox
+  - vs
+
+- name: platform_arch
+  type: string
+  values:
+  - amd64
+  - armhf
+  - arm64
+  default: amd64
+
+- name: platform_short
+  type: string
+  values:
+  - brcm
+  - centec-arm64
+  - marvell-armhf
+  - mlnx
+  - vs
+
+- name: cache_mode
+  type: string
+  values:
+  - wcache
+  - rcache
+  - cache
+
+- name: pool
+  type: string
+  values:
+  - sonicbld
+  - sonicbld_8c
+  default: sonicbld
+
+- name: dbg_image
+  type: boolean
+  default: false
+
+- name: swi_image
+  type: boolean
+  default: false
+
+- name: raw_image
+  type: boolean
+  default: false
+
+- name: sync_rpc_image
+  type: boolean
+  default: false
+
+- name: timeout
+  type: number
+  default: 600
+
+jobs:
+- job:
+  pool: ${{ parameters.pool }}
+  displayName: ${{ parameters.platform }}
+  timeoutInMinutes: ${{ parameters.timeout }}
+  steps:
+  - template: cleanup.yml
+  - checkout: self
+    clean: true
+    submodules: recursive
+    displayName: 'Checkout code'
+  - script: |
+      git submodule foreach --recursive 'git clean -xfdf || true'
+      git submodule foreach --recursive 'git reset --hard || true'
+      git submodule foreach --recursive 'git remote update || true'
+      git submodule update --init --recursive
+    displayName: 'Reset submodules'
+  - script: |
+      set -e
+      sudo modprobe overlay
+      sudo apt-get install -y acl
+      export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
+      CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=${{ parameters.cache_mode }} SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/${{ parameters.platform }}"
+      ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=${{ parameters.platform }} PLATFORM_ARCH=${{ parameters.platform_arch }}
+      trap "sudo rm -rf fsroot" EXIT
+
+      if [ ${{ parameters.platform }} == vs ]; then
+        if [ ${{ parameters.dbg_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && \
+            mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
+        fi
+
+        make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
+      else
+        if [ ${{ parameters.dbg_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) INSTALL_DEBUG_TOOLS=y target/sonic-${{ parameters.platform }}.bin && \
+            mv target/sonic-${{ parameters.platform }}.bin target/sonic-${{ parameters.platform }}-dbg.bin
+        fi
+        if [ ${{ parameters.swi_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-${{ parameters.platform }}.swi
+        fi
+        if [ ${{ parameters.raw_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.raw
+        fi
+        if [ ${{ parameters.sync_rpc_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz
+        fi
+
+        make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin
+      fi
+    displayName: 'Build sonic image'
+  - template: cleanup.yml
+  - publish: $(System.DefaultWorkingDirectory)/
+    artifact: sonic-buildimage.${{ parameters.platform }}
+    displayName: "Archive sonic image"
diff --git a/.azure-pipelines/cleanup.yml b/.azure-pipelines/cleanup.yml
new file mode 100644
index 000000000000..ffbcf298b6c9
--- /dev/null
+++ b/.azure-pipelines/cleanup.yml
@@ -0,0 +1,17 @@
+steps:
+- script: |
+    if sudo [ -f /var/run/march/docker.pid ] ; then
+        pid=`sudo cat /var/run/march/docker.pid` ; sudo kill $pid
+    fi
+    sudo rm -f /var/run/march/docker.pid
+    sudo rm -rf /data/march/docker
+
+    # clean native docker build
+    if sudo [ -f dockerfs/var/run/docker.pid ] ; then
+        pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
+    fi
+    sudo rm -rf dockerfs
+    sudo rm -rf fsroot
+    username=$(id -un)
+    sudo chown -R ${username}.${username} .
+  displayName: "Clean Workspace"
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
new file mode 100644
index 000000000000..8524027d7b11
--- /dev/null
+++ b/.azure-pipelines/official-build.yml
@@ -0,0 +1,62 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight build
+  branches:
+    include:
+    - master
+  always: true
+
+trigger: none
+pr: none
+
+stages:
+- stage: Build
+
+  jobs:
+  - template: build-template.yml
+    parameters:
+      platform: broadcom
+      platform_short: brcm
+      cache_mode: wcache
+      dbg_image: true
+      swi_image: true
+      raw_image: true
+      sync_rpc_image: true
+
+  - template: build-template.yml
+    parameters:
+      platform: mellanox
+      platform_short: mlnx
+      cache_mode: wcache
+      dbg_image: true
+      sync_rpc_image: true
+
+  - template: build-template.yml
+    parameters:
+      platform: vs
+      platform_short: vs
+      dbg_image: true
+      cache_mode: wcache
+
+  - template: build-template.yml
+    parameters:
+      timeout: 3600
+      platform: marvell-armhf
+      platform_arch: armhf
+      platform_short: marvell-armhf
+      cache_mode: wcache
+      pool: sonicbld_8c
+
+  - template: build-template.yml
+    parameters:
+      timeout: 3600
+      platform: centec-arm64
+      platform_arch: arm64
+      platform_short: centec-arm64
+      cache_mode: wcache
+      pool: sonicbld_8c
diff --git a/.azure-pipelines/run-test-template.yml b/.azure-pipelines/run-test-template.yml
new file mode 100644
index 000000000000..afe5eadec338
--- /dev/null
+++ b/.azure-pipelines/run-test-template.yml
@@ -0,0 +1,82 @@
+parameters:
+- name: dut
+  type: string
+- name: tbname
+  type: string
+- name: tbtype
+  type: string
+- name: ptf_name
+  type: string
+
+steps:
+- checkout: self
+  clean: true
+  displayName: 'checkout sonic-mgmt repo'
+
+- task: DownloadPipelineArtifact@2
+  inputs:
+    artifact: sonic-buildimage.vs
+  displayName: "Download sonic-buildimage.vs artifact"
+
+- script: |
+    set -x
+    sudo mkdir -p /data/sonic-vm/images
+    sudo cp -v ../target/sonic-vs.img.gz /data/sonic-vm/images/sonic-vs.img.gz
+    sudo gzip -fd /data/sonic-vm/images/sonic-vs.img.gz
+    username=$(id -un)
+    sudo chown -R $username.$username /data/sonic-vm
+
+    pushd /data/sonic-mgmt
+    git remote update
+    git reset --hard origin/master
+    sed -i s/use_own_value/${username}/ ansible/veos_vtb
+    echo aaa > ansible/password.txt
+    docker exec sonic-mgmt bash -c "pushd /data/sonic-mgmt/ansible;./testbed-cli.sh -d /data/sonic-vm -m $(inventory) -t $(testbed_file) -k ceos refresh-dut ${{ parameters.tbname }} password.txt" && sleep 180
+  displayName: "Setup testbed"
+
+- script: |
+    rm -rf $(Build.ArtifactStagingDirectory)/*
+    docker exec sonic-mgmt bash -c "/data/sonic-mgmt/tests/kvmtest.sh -en -T ${{ parameters.tbtype }} ${{ parameters.tbname }} ${{ parameters.dut }}"
+  displayName: "Run tests"
+
+- script: |
+    # save dut state if test fails
+    virsh_version=$(virsh --version)
+    if [ $virsh_version == "6.0.0" ]; then
+        mkdir -p $(Build.ArtifactStagingDirectory)/kvmdump
+        virsh -c qemu:///system list
+        virsh -c qemu:///system save ${{ parameters.dut }} $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.memdmp
+        virsh -c qemu:///system dumpxml ${{ parameters.dut }} > $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.xml
+        img=$(virsh -c qemu:///system domblklist ${{ parameters.dut }} | grep vda | awk '{print $2}')
+        cp $img $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.img
+        virsh -c qemu:///system undefine ${{ parameters.dut }}
+    fi
+
+    docker commit ${{ parameters.ptf_name }} docker-ptf:$(Build.BuildNumber)
+    docker save docker-ptf:$(Build.BuildNumber) | gzip -c > $(Build.ArtifactStagingDirectory)/kvmdump/docker-ptf-dump.gz
+    docker rmi docker-ptf:$(Build.BuildNumber)
+  displayName: "Collect kvmdump"
+  condition: failed()
+
+- script: |
+    cp -r /data/sonic-mgmt/tests/logs $(Build.ArtifactStagingDirectory)/
+    username=$(id -un)
+    sudo chown -R $username.$username $(Build.ArtifactStagingDirectory)
+  displayName: "Collect test logs"
+  condition: succeededOrFailed()
+
+- publish: $(Build.ArtifactStagingDirectory)/kvmdump
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype}}.memdump@$(System.JobAttempt)
+  displayName: "Archive sonic kvm memdump"
+  condition: failed()
+
+- publish: $(Build.ArtifactStagingDirectory)/logs
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype }}.log@$(System.JobAttempt)
+  displayName: "Archive sonic kvm logs"
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: '$(Build.ArtifactStagingDirectory)/logs/**/*.xml'
+    testRunTitle: kvmtest.${{ parameters.tbtype }}
+  condition: succeededOrFailed()

From a73ef876fe108dc4aee85d65d7c98fd2e8f9cd43 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 12 Mar 2021 00:45:21 -0800
Subject: [PATCH 0279/1674] [ci]: add scheduled official build for 202012

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/official-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index 8524027d7b11..b09a3bca7f6d 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -9,6 +9,7 @@ schedules:
   branches:
     include:
     - master
+    - 202012
   always: true
 
 trigger: none

From 7499434a1042b52d7040f13c82289839fd351456 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sat, 6 Feb 2021 13:35:19 -0800
Subject: [PATCH 0280/1674] [sonic-utilities] Depend on sonic-platform-common
 (#6703)

sonic-utilities will become dependent upon sonic-platform-common as of Azure/sonic-utilities#1386.
---
 rules/sonic-utilities.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk
index 7119b4b98eb0..4e5b5adbc5dc 100644
--- a/rules/sonic-utilities.mk
+++ b/rules/sonic-utilities.mk
@@ -6,6 +6,7 @@ $(SONIC_UTILITIES_PY3)_PYTHON_VERSION = 3
 $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
                                   $(SWSSSDK_PY3) \
                                   $(SONIC_CONFIG_ENGINE_PY3) \
+                                  $(SONIC_PLATFORM_COMMON_PY3) \
                                   $(SONIC_YANG_MGMT_PY3) \
                                   $(SONIC_YANG_MODELS_PY3)
 $(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \

From 65ac29627dfdfdb1b7802cec733efbc47c7ba43e Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sat, 13 Mar 2021 23:27:26 -0800
Subject: [PATCH 0281/1674] [ci]: add ci/pr build for 202012 (#7039)

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .artifactignore     |  12 ++++
 azure-pipelines.yml | 138 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 140 insertions(+), 10 deletions(-)
 create mode 100644 .artifactignore

diff --git a/.artifactignore b/.artifactignore
new file mode 100644
index 000000000000..5af70cce6426
--- /dev/null
+++ b/.artifactignore
@@ -0,0 +1,12 @@
+**/*
+!target/*.bin
+!target/*.log
+!target/*.img.gz
+!target/docker-sonic-vs.gz
+!target/docker-ptf.gz
+!target/debs/**/*.deb
+!target/debs/**/*.deb.log
+!target/debs/**/*.deb-install.log
+!target/python-wheels/*.whl
+!target/python-wheels/*.whl.log
+!target/python-wheels/*.whl-install.log
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ac078ef24b70..fdc13b70f485 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,16 +4,134 @@
 # https://aka.ms/yaml
 
 trigger:
-- main
+  branches:
+    include:
+      - master
+      - 202012
+  paths:
+    exclude:
+      - .github
 
-pool:
-  vmImage: 'ubuntu-latest'
+pr:
+  branches:
+    include:
+      - master
+      - 202012
+  paths:
+    exclude:
+      - .github
 
-steps:
-- script: echo Hello, world!
-  displayName: 'Run a one-line script'
+name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 
-- script: |
-    echo Add other tasks to build, test, and deploy your project.
-    echo See https://aka.ms/yaml
-  displayName: 'Run a multi-line script'
+resources:
+  repositories:
+  - repository: sonic-mgmt
+    type: github
+    name: Azure/sonic-mgmt
+    endpoint: build
+
+stages:
+- stage: Build
+  pool: sonicbld
+
+  jobs:
+  - template: .azure-pipelines/build-template.yml
+    parameters:
+      platform: broadcom
+      platform_short: brcm
+      cache_mode: rcache
+      sync_rpc_image: true
+
+  - template: .azure-pipelines/build-template.yml
+    parameters:
+      platform: mellanox
+      platform_short: mlnx
+      cache_mode: rcache
+      sync_rpc_image: true
+
+  - template: .azure-pipelines/build-template.yml
+    parameters:
+      platform: vs
+      platform_short: vs
+      cache_mode: rcache
+
+- stage: Test
+  variables:
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.csv
+
+  jobs:
+  - job:
+    pool: sonictest
+    displayName: "vstest"
+    timeoutInMinutes: 60
+    steps:
+    - checkout: self
+      clean: true
+      submodules: recursive
+      displayName: 'Checkout code'
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: build
+        pipeline: 9
+        artifacts: sonic-swss-common.amd64.ubuntu20_04
+        runVersion: 'latestFromBranch'
+        runBranch: 'refs/heads/master'
+      displayName: "Download sonic swss common deb packages"
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: sonic-buildimage.vs
+      displayName: "Download sonic-buildimage.vs artifact"
+
+    - script: |
+        set -x
+        sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
+        sudo docker load -i ../target/docker-sonic-vs.gz
+        docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
+        username=$(id -un)
+
+        trap "docker ps; docker images; ip netns list; \
+              docker rmi docker-sonic-vs:$(Build.BuildNumber); \
+              ip netns list | grep -E [-]srv[0-9]+ | awk '{print $1}' | xargs -I {} sudo ip netns delete {}; \
+              sudo chown -R ${username}.${username} .; \
+              sudo chown -R ${username}.${username} $(System.DefaultWorkingDirectory)" EXIT
+        pushd platform/vs/tests
+        sudo py.test -v --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.BuildNumber)
+      displayName: "Run vs tests"
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: '**/tr.xml'
+        testRunTitle: vstest
+
+  - job:
+    pool: sonictest
+    displayName: "kvmtest-t0"
+    timeoutInMinutes: 240
+
+    steps:
+    - template: .azure-pipelines/run-test-template.yml
+      parameters:
+        dut: vlab-01
+        tbname: vms-kvm-t0
+        ptf_name: ptf_vms6-1
+        tbtype: t0
+
+  - job:
+    pool: sonictest-t1-lag
+    displayName: "kvmtest-t1-lag"
+    timeoutInMinutes: 240
+
+    steps:
+    - template: .azure-pipelines/run-test-template.yml
+      parameters:
+        dut: vlab-03
+        tbname: vms-kvm-t1-lag
+        ptf_name: ptf_vms6-2
+        tbtype: t1-lag

From cc6e521b4058a03605a832f04c1c1e1a3f67cffc Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Mon, 22 Feb 2021 23:34:28 -0800
Subject: [PATCH 0282/1674] [baseimage] add ipintutil in sudoer file (#6845)

show ip interfaces is enhanced recently to support multi ASIC platforms in this PR- https://github.com/Azure/sonic-utilities/pull/1396 .
The ipintutil script as to run as sudo user, to get the ip interface from each namespace.
Add this script to the sudoer file so that show ip interface command is available for user with read-only permissions

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
---
 files/image_config/sudoers/sudoers | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 8ec8799c7cca..fbe4cf1f7f91 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -20,6 +20,7 @@ Defaults        lecture_file = /etc/sudoers.lecture
 # Cmnd alias specification
 # Note: bcmcmd is dangerous for users in read only netgroups because it may operate ASIC
 Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
+                                 /bin/ip netns identify [0-9]*, \
                                  /sbin/brctl show, \
                                  /usr/bin/docker exec snmp cat /etc/snmp/snmpd.conf, \
                                  /usr/bin/docker exec bgp cat /etc/quagga/bgpd.conf, \
@@ -33,13 +34,13 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/bin/vtysh -n [0-9] -c show *, \
                                  /usr/local/bin/decode-syseeprom, \
                                  /usr/local/bin/generate_dump, \
+                                 /usr/local/bin/ipintutil, \
                                  /usr/local/bin/lldpshow, \
                                  /usr/local/bin/pcieutil *, \
                                  /usr/local/bin/psuutil *, \
                                  /usr/local/bin/sonic-installer list, \
-                                 /usr/local/bin/sfputil show *, \
-                                 /bin/ip netns identify [0-9]*
-                                 
+                                 /usr/local/bin/sfputil show *
+
 
 Cmnd_Alias      PASSWD_CMDS = /usr/local/bin/config tacacs passkey *, \
                               /usr/sbin/chpasswd *

From 5e422fde85e8bb88a8ef13db4d44dda84e21c2d9 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 00:50:29 +0800
Subject: [PATCH 0283/1674] Fix the upgrade SONiC package version PR title
 (#7000)

[ci] Make the title of the PR to upgrade SONiC package versions better
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 172cccab0783..3cec0871ed05 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -82,7 +82,7 @@ stages:
         git config user.name $GIT_USER
         git config credential.https://github.com.username $GIT_USER
         git add files/build/versions
-        git commit -m "Update SONiC version files"
+        git commit -m "[ci/build]: Upgrade SONiC package versions"
         git checkout -b $BRANCH_NAME
         git remote add remote https://github.com/$GIT_USER/$GIT_REPO
         git push remote HEAD:refs/heads/$BRANCH_NAME -f

From 6fb1600234295a65ebd95b429663cf511ea177a9 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Sat, 13 Mar 2021 05:56:27 -0800
Subject: [PATCH 0284/1674] [hostcfgd]: Add Ability To Configure Feature During
 Run-time (#6700)

Features may be enabled/disabled for the same topology based on run-time
configuration. This PR adds the ability to enable/disable feature based
on config db data.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 files/build_scripts/mask_disabled_services.py |   2 +-
 src/sonic-host-services/.gitignore            |   1 +
 src/sonic-host-services/__init__.py           |   0
 src/sonic-host-services/pytest.ini            |   2 +-
 src/sonic-host-services/scripts/hostcfgd      | 152 ++++++----
 .../tests/hostcfgd/__init__.py                |   0
 .../tests/hostcfgd/hostcfgd_test.py           |  78 +++++
 .../tests/hostcfgd/mock_configdb.py           |  32 ++
 .../tests/hostcfgd/test_vectors.py            | 287 ++++++++++++++++++
 9 files changed, 494 insertions(+), 60 deletions(-)
 create mode 100644 src/sonic-host-services/__init__.py
 create mode 100644 src/sonic-host-services/tests/hostcfgd/__init__.py
 create mode 100644 src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
 create mode 100644 src/sonic-host-services/tests/hostcfgd/mock_configdb.py
 create mode 100644 src/sonic-host-services/tests/hostcfgd/test_vectors.py

diff --git a/files/build_scripts/mask_disabled_services.py b/files/build_scripts/mask_disabled_services.py
index f3a1d76bf102..5c1a3695802f 100755
--- a/files/build_scripts/mask_disabled_services.py
+++ b/files/build_scripts/mask_disabled_services.py
@@ -9,5 +9,5 @@
     init_cfg = json.load(init_cfg_file)
     if 'FEATURE' in init_cfg:
         for feature_name, feature_props in init_cfg['FEATURE'].items():
-            if 'state' in feature_props and feature_props['state'] == 'disabled':
+            if 'state' in feature_props and feature_props['state'] != 'enabled' and feature_props['state'] != 'always_enabled':
                 subprocess.run(['systemctl', 'mask', '{}.service'.format(feature_name)])
diff --git a/src/sonic-host-services/.gitignore b/src/sonic-host-services/.gitignore
index 70be1ce98629..25bc70304637 100644
--- a/src/sonic-host-services/.gitignore
+++ b/src/sonic-host-services/.gitignore
@@ -12,5 +12,6 @@ dist/
 
 # Unit test coverage
 .coverage
+.pytest_cache/
 coverage.xml
 htmlcov/
diff --git a/src/sonic-host-services/__init__.py b/src/sonic-host-services/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-host-services/pytest.ini b/src/sonic-host-services/pytest.ini
index 83b74d373c06..5a1e1dc94381 100644
--- a/src/sonic-host-services/pytest.ini
+++ b/src/sonic-host-services/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml
+addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml --ignore=tests/hostcfgd/test_vectors.py
diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index fd815f28ec34..3b207b7fd54f 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -394,6 +394,10 @@ class HostConfigDaemon:
         self.config_db.connect(wait_for_init=True, retry_on=True)
         syslog.syslog(syslog.LOG_INFO, 'ConfigDB connect success')
 
+        # Load DEVICE metadata configurations
+        self.device_config = {}
+        self.device_config['DEVICE_METADATA'] = self.config_db.get_table('DEVICE_METADATA')
+
         self.aaacfg = AaaCfg()
         self.iptables = Iptables()
         self.ntpcfg = NtpCfg(self.config_db)
@@ -421,75 +425,106 @@ class HostConfigDaemon:
         ntp_global = self.config_db.get_table('NTP')
         self.ntpcfg.load(ntp_global, ntp_server)
 
-    def update_feature_state(self, feature_name, state, feature_table):
-        if self.cached_feature_states[feature_name] == "always_enabled":
-            if state != "always_enabled":
-                syslog.syslog(syslog.LOG_INFO, "Feature '{}' service is always enabled"
-                              .format(feature_name))
-                entry = self.config_db.get_entry('FEATURE', feature_name)
-                entry['state'] = 'always_enabled'
-                self.config_db.set_entry('FEATURE', feature_name, entry)
-            return
+    def get_target_state(self, feature_name, state):
+        template = jinja2.Template(state)
+        target_state = template.render(self.device_config)
+        entry = self.config_db.get_entry('FEATURE', feature_name)
+        entry["state"] = target_state
+        self.config_db.set_entry("FEATURE", feature_name, entry)
 
-        self.cached_feature_states[feature_name] = state
+        return target_state
 
+    def get_feature_attribute(self, feature_name, feature_table):
         has_timer = ast.literal_eval(feature_table[feature_name].get('has_timer', 'False'))
         has_global_scope = ast.literal_eval(feature_table[feature_name].get('has_global_scope', 'True'))
         has_per_asic_scope = ast.literal_eval(feature_table[feature_name].get('has_per_asic_scope', 'False'))
 
         # Create feature name suffix depending feature is running in host or namespace or in both 
-        feature_name_suffix_list = (([feature_name] if has_global_scope or not self.is_multi_npu else []) +
-                                   ([(feature_name + '@' + str(asic_inst)) for asic_inst in range(device_info.get_num_npus()) 
-                                    if has_per_asic_scope and self.is_multi_npu]))
+        feature_names = (
+            ([feature_name] if has_global_scope or not self.is_multi_npu else []) +
+            ([(feature_name + '@' + str(asic_inst)) for asic_inst in range(device_info.get_num_npus()) 
+                if has_per_asic_scope and self.is_multi_npu])
+        )
 
-        if not feature_name_suffix_list:
+        if not feature_names:
             syslog.syslog(syslog.LOG_ERR, "Feature '{}' service not available"
                           .format(feature_name))
 
         feature_suffixes = ["service"] + (["timer"] if has_timer else [])
 
-        if state == "enabled":
-            start_cmds = []
-            for feature_name_suffix in feature_name_suffix_list:
-                for suffix in feature_suffixes:
-                    start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name_suffix, suffix))
-                # If feature has timer associated with it, start/enable corresponding systemd .timer unit
-                # otherwise, start/enable corresponding systemd .service unit
-                start_cmds.append("sudo systemctl enable {}.{}".format(feature_name_suffix, feature_suffixes[-1]))
-                start_cmds.append("sudo systemctl start {}.{}".format(feature_name_suffix, feature_suffixes[-1]))
-                for cmd in start_cmds:
-                    syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
-                    try:
-                        subprocess.check_call(cmd, shell=True)
-                    except subprocess.CalledProcessError as err:
-                        syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
-                                      .format(err.cmd, err.returncode, err.output))
-                        syslog.syslog(syslog.LOG_ERR, "Feature '{}.{}' failed to be  enabled and started"
-                                      .format(feature_name, feature_suffixes[-1]))
-                        return
-            syslog.syslog(syslog.LOG_INFO, "Feature '{}.{}' is enabled and started"
-                          .format(feature_name, feature_suffixes[-1]))
-        elif state == "disabled":
-            stop_cmds = []
-            for feature_name_suffix in feature_name_suffix_list:
-                for suffix in reversed(feature_suffixes):
-                    stop_cmds.append("sudo systemctl stop {}.{}".format(feature_name_suffix, suffix))
-                    stop_cmds.append("sudo systemctl disable {}.{}".format(feature_name_suffix, suffix))
-                    stop_cmds.append("sudo systemctl mask {}.{}".format(feature_name_suffix, suffix))
-                for cmd in stop_cmds:
-                    syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
-                    try:
-                        subprocess.check_call(cmd, shell=True)
-                    except subprocess.CalledProcessError as err:
-                        syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
-                                      .format(err.cmd, err.returncode, err.output))
-                        syslog.syslog(syslog.LOG_ERR, "Feature '{}' failed to be stopped and disabled".format(feature_name))
-                        return
-            syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
-        else:
-            syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature '{}'"
-                          .format(state, feature_name))
+        return feature_names, feature_suffixes
+
+    def enable_feature(self, feature_names, feature_suffixes):
+        start_cmds = []
+        for feature_name in feature_names:
+            for suffix in feature_suffixes:
+                start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, suffix))
+            # If feature has timer associated with it, start/enable corresponding systemd .timer unit
+            # otherwise, start/enable corresponding systemd .service unit
+            start_cmds.append("sudo systemctl enable {}.{}".format(feature_name, feature_suffixes[-1]))
+            start_cmds.append("sudo systemctl start {}.{}".format(feature_name, feature_suffixes[-1]))
+            for cmd in start_cmds:
+                syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
+                try:
+                    subprocess.check_call(cmd, shell=True)
+                except subprocess.CalledProcessError as err:
+                    syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
+                                  .format(err.cmd, err.returncode, err.output))
+                    syslog.syslog(syslog.LOG_ERR, "Feature '{}.{}' failed to be  enabled and started"
+                                  .format(feature_name, feature_suffixes[-1]))
+                    return
+
+    def disable_feature(self, feature_names, feature_suffixes):
+        stop_cmds = []
+        for feature_name in feature_names:
+            for suffix in reversed(feature_suffixes):
+                stop_cmds.append("sudo systemctl stop {}.{}".format(feature_name, suffix))
+                stop_cmds.append("sudo systemctl disable {}.{}".format(feature_name, suffix))
+                stop_cmds.append("sudo systemctl mask {}.{}".format(feature_name, suffix))
+            for cmd in stop_cmds:
+                syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
+                try:
+                    subprocess.check_call(cmd, shell=True)
+                except subprocess.CalledProcessError as err:
+                    syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
+                                  .format(err.cmd, err.returncode, err.output))
+                    syslog.syslog(syslog.LOG_ERR, "Feature '{}' failed to be stopped and disabled".format(feature_name))
+                    return
+
+    def is_invariant_feature(self, feature_name, state, feature_table):
+        invariant_feature = self.cached_feature_states[feature_name] == "always_enabled" or \
+                            self.cached_feature_states[feature_name] == "always_disabled"
+        if invariant_feature:
+            invariant_state = self.cached_feature_states[feature_name]
+            if state != invariant_state:
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}' service is '{}'"
+                              .format(feature_name, invariant_state))
+                entry = self.config_db.get_entry('FEATURE', feature_name)
+                entry['state'] = invariant_state
+                self.config_db.set_entry('FEATURE', feature_name, entry)
 
+            if state == "always_disabled":
+                feature_names, feature_suffixes = self.get_feature_attribute(feature_name, feature_table)
+                self.disable_feature(feature_names, feature_suffixes)
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
+
+        return invariant_feature
+
+    def update_feature_state(self, feature_name, state, feature_table):
+        if not self.is_invariant_feature(feature_name, state, feature_table):
+            self.cached_feature_states[feature_name] = state
+
+            feature_names, feature_suffixes = self.get_feature_attribute(feature_name, feature_table)
+            if state == "enabled":
+                self.enable_feature(feature_names, feature_suffixes)
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}.{}' is enabled and started"
+                              .format(feature_name, feature_suffixes[-1]))
+            elif state == "disabled":
+                self.disable_feature(feature_names, feature_suffixes)
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
+            else:
+                syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature '{}'"
+                              .format(state, feature_name))
 
     def update_all_feature_states(self):
         feature_table = self.config_db.get_table('FEATURE')
@@ -500,13 +535,14 @@ class HostConfigDaemon:
 
             state = feature_table[feature_name]['state']
             if not state:
-                syslog.syslog(syslog.LOG_WARNING, "Eanble state of feature '{}' is None".format(feature_name))
+                syslog.syslog(syslog.LOG_WARNING, "Enable state of feature '{}' is None".format(feature_name))
                 continue
 
+            target_state = self.get_target_state(feature_name, state)
             # Store the initial value of 'state' field in 'FEATURE' table of a specific container
-            self.cached_feature_states[feature_name] = state
+            self.cached_feature_states[feature_name] = target_state
 
-            self.update_feature_state(feature_name, state, feature_table)
+            self.update_feature_state(feature_name, target_state, feature_table)
 
     def aaa_handler(self, key, data):
         self.aaacfg.aaa_update(key, data)
diff --git a/src/sonic-host-services/tests/hostcfgd/__init__.py b/src/sonic-host-services/tests/hostcfgd/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
new file mode 100644
index 000000000000..57e7215715d7
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -0,0 +1,78 @@
+import importlib.machinery
+import importlib.util
+import os
+import sys
+import swsssdk
+
+from parameterized import parameterized
+from unittest import TestCase, mock
+from tests.hostcfgd.test_vectors import HOSTCFGD_TEST_VECTOR
+from tests.hostcfgd.mock_configdb import MockConfigDb
+
+
+swsssdk.ConfigDBConnector = MockConfigDb
+test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+modules_path = os.path.dirname(test_path)
+scripts_path = os.path.join(modules_path, "scripts")
+sys.path.insert(0, modules_path)
+
+# Load the file under test
+hostcfgd_path = os.path.join(scripts_path, 'hostcfgd')
+loader = importlib.machinery.SourceFileLoader('hostcfgd', hostcfgd_path)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+hostcfgd = importlib.util.module_from_spec(spec)
+loader.exec_module(hostcfgd)
+sys.modules['hostcfgd'] = hostcfgd
+
+
+class TestHostcfgd(TestCase):
+    """
+        Test hostcfd daemon - feature
+    """
+    def __verify_table(self, table, expected_table):
+        """
+            verify config db tables
+
+            Compares Config DB table (FEATURE) with expected output table
+
+            Args:
+                table(dict): Current Config Db table
+                expected_table(dict): Expected Config Db table
+
+            Returns:
+                None
+        """
+        is_equal = len(table) == len(expected_table)
+        if is_equal:
+            for key, fields in expected_table.items():
+                is_equal = is_equal and key in table and len(fields) == len(table[key])
+                if is_equal:
+                    for field, value in fields.items():
+                        is_equal = is_equal and value == table[key][field]
+                        if not is_equal:
+                            break;
+                else:
+                    break
+        return is_equal
+
+    @parameterized.expand(HOSTCFGD_TEST_VECTOR)
+    def test_hostcfgd(self, test_name, test_data):
+        """
+            Test hostcfd daemon initialization
+
+            Args:
+                test_name(str): test name
+                test_data(dict): test data which contains initial Config Db tables, and expected results
+
+            Returns:
+                None
+        """
+        MockConfigDb.set_config_db(test_data["config_db"])
+        with mock.patch("hostcfgd.subprocess") as mocked_subprocess:
+            host_config_daemon = hostcfgd.HostConfigDaemon()
+            host_config_daemon.update_all_feature_states()
+            assert self.__verify_table(
+                MockConfigDb.get_config_db()["FEATURE"],
+                test_data["expected_config_db"]["FEATURE"]
+            ), "Test failed for test data: {0}".format(test_data)
+            mocked_subprocess.check_call.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
diff --git a/src/sonic-host-services/tests/hostcfgd/mock_configdb.py b/src/sonic-host-services/tests/hostcfgd/mock_configdb.py
new file mode 100644
index 000000000000..1a5889bb5c63
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/mock_configdb.py
@@ -0,0 +1,32 @@
+class MockConfigDb(object):
+    """
+        Mock Config DB which responds to data tables requests and store updates to the data table
+    """
+    STATE_DB = None
+    CONFIG_DB = None
+
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def set_config_db(test_config_db):
+        MockConfigDb.CONFIG_DB = test_config_db
+
+    @staticmethod
+    def get_config_db():
+        return MockConfigDb.CONFIG_DB
+
+    def connect(self, wait_for_init=True, retry_on=True):
+        pass
+
+    def get(self, db_id, key, field):
+        return MockConfigDb.CONFIG_DB[key][field]
+
+    def get_entry(self, key, field):
+        return MockConfigDb.CONFIG_DB[key][field]
+
+    def set_entry(self, key, field, data):
+        MockConfigDb.CONFIG_DB[key][field] = data
+
+    def get_table(self, table_name):
+        return MockConfigDb.CONFIG_DB[table_name]
diff --git a/src/sonic-host-services/tests/hostcfgd/test_vectors.py b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
new file mode 100644
index 000000000000..a8ac0219d138
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
@@ -0,0 +1,287 @@
+from unittest.mock import call
+
+"""
+    hostcfgd test vector
+"""
+HOSTCFGD_TEST_VECTOR = [
+    [
+        "DualTorCase",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_config_db": {
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "enabled"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_subprocess_calls": [
+                call("sudo systemctl unmask dhcp_relay.service", shell=True),
+                call("sudo systemctl enable dhcp_relay.service", shell=True),
+                call("sudo systemctl start dhcp_relay.service", shell=True),
+                call("sudo systemctl unmask mux.service", shell=True),
+                call("sudo systemctl enable mux.service", shell=True),
+                call("sudo systemctl start mux.service", shell=True),
+                call("sudo systemctl unmask telemetry.service", shell=True),
+                call("sudo systemctl unmask telemetry.timer", shell=True),
+                call("sudo systemctl enable telemetry.timer", shell=True),
+                call("sudo systemctl start telemetry.timer", shell=True),
+            ],
+        },
+    ],
+    [
+        "SingleToRCase",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "type": "ToR",
+                    }
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_config_db": {
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "always_disabled"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_subprocess_calls": [
+                call("sudo systemctl unmask dhcp_relay.service", shell=True),
+                call("sudo systemctl enable dhcp_relay.service", shell=True),
+                call("sudo systemctl start dhcp_relay.service", shell=True),
+                call("sudo systemctl stop mux.service", shell=True),
+                call("sudo systemctl disable mux.service", shell=True),
+                call("sudo systemctl mask mux.service", shell=True),
+                call("sudo systemctl unmask telemetry.service", shell=True),
+                call("sudo systemctl unmask telemetry.timer", shell=True),
+                call("sudo systemctl enable telemetry.timer", shell=True),
+                call("sudo systemctl start telemetry.timer", shell=True),
+            ],
+        },
+    ],
+    [
+        "T1Case",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "type": "T1",
+                    }
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_config_db": {
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "always_disabled"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_subprocess_calls": [
+                call("sudo systemctl unmask dhcp_relay.service", shell=True),
+                call("sudo systemctl enable dhcp_relay.service", shell=True),
+                call("sudo systemctl start dhcp_relay.service", shell=True),
+                call("sudo systemctl stop mux.service", shell=True),
+                call("sudo systemctl disable mux.service", shell=True),
+                call("sudo systemctl mask mux.service", shell=True),
+                call("sudo systemctl unmask telemetry.service", shell=True),
+                call("sudo systemctl unmask telemetry.timer", shell=True),
+                call("sudo systemctl enable telemetry.timer", shell=True),
+                call("sudo systemctl start telemetry.timer", shell=True),
+            ],
+        },
+    ],
+]

From 4cd55a582f5863b71b5297da4dbf761d3e5914ef Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Mar 2021 21:51:45 +0200
Subject: [PATCH 0285/1674] [barefoot][device] Enable thermalctld (#7005)

Enable thermalctld on Barefoot platforms

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../x86_64-accton_as9516_32d-r0/pmon_daemon_control.json        | 2 +-
 .../x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json    | 2 +-
 .../x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json b/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
index c4573af5e93d..a0431d47812a 100644
--- a/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
+++ b/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
@@ -1,7 +1,7 @@
 {
     "skip_pcied": false,
     "skip_fancontrol": true,
-    "skip_thermalctld": true,
+    "skip_thermalctld": false,
     "skip_ledd": true,
     "skip_xcvrd": false,
     "skip_psud": false,
diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json
index 70bce43bbf67..b58e59ba000c 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json
@@ -1,7 +1,7 @@
 {
     "skip_pcied": false,
     "skip_fancontrol": true,
-    "skip_thermalctld": true,
+    "skip_thermalctld": false,
     "skip_ledd": true,
     "skip_xcvrd": false,
     "skip_psud": false,
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
index f94fa8370273..d23e302dab34 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
@@ -1,7 +1,7 @@
 {
     "skip_pcied": true,
     "skip_fancontrol": true,
-    "skip_thermalctld": true,
+    "skip_thermalctld": false,
     "skip_ledd": true,
     "skip_xcvrd": false,
     "skip_psud": false,

From 2e2c85222ee28967dd435f752d897fb3076f5fc1 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Mar 2021 21:50:36 +0200
Subject: [PATCH 0286/1674] [barefoot][platform] Extend sonic_platform psu.py
 (#7006)

Improve sonic_platform PSU support

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/psu.py                     | 69 +++++++++++++++----
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
index 7e7e4403ad5c..d46cbcca545d 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
@@ -17,7 +17,21 @@ class Psu(PsuBase):
 
     def __init__(self, index):
         PsuBase.__init__(self)
-        self.index = index
+        self.__index = index
+
+    '''
+    Units of returned info object values:
+        vin - V
+        iout - mA
+        vout - V
+        pwr_out - mW
+        fspeed - RPM
+    '''
+    def __info_get(self):
+        def psu_info_get(client):
+            return client.pltfm_mgr.pltfm_mgr_pwr_supply_info_get(self.__index)
+
+        return thrift_try(psu_info_get)
 
     @staticmethod
     def get_num_psus():
@@ -34,15 +48,36 @@ def get_powergood_status(self):
         :param self.index: An integer, 1-based self.index of the PSU of which to query status
         :return: Boolean, True if PSU is operating properly, False if PSU is faulty
         """
-        def psu_info_get(client):
-            return client.pltfm_mgr.pltfm_mgr_pwr_supply_info_get(self.index)
+        info = self.__info_get()
+        return info.ffault == False and info.vout != 0
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        return float(self.__info_get().vout)
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
 
-        try:
-            psu_info = thrift_try(psu_info_get)
-        except Exception:
-            return False
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        return self.__info_get().iout / 1000.
 
-        return (psu_info.ffault == False)
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        return self.__info_get().pwr_out / 1000.
 
     def get_presence(self):
         """
@@ -52,11 +87,17 @@ def get_presence(self):
         :return: Boolean, True if PSU is plugged, False if not
         """
         def psu_present_get(client):
-            return client.pltfm_mgr.pltfm_mgr_pwr_supply_present_get(self.index)
-
-        try:
-            status = thrift_try(psu_present_get)
-        except Exception:
-            return False
+            return client.pltfm_mgr.pltfm_mgr_pwr_supply_present_get(self.__index)
 
+        status = thrift_try(psu_present_get)
         return status
+
+    # DeviceBase iface:
+    def get_serial(self):
+        return self.__info_get().serial
+
+    def get_model(self):
+        return self.__info_get().model
+
+    def is_replaceable(self):
+        return True

From 893267828576442b164ac8ca15d1574819723b81 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Mar 2021 21:52:47 +0200
Subject: [PATCH 0287/1674] [platform][barefoot] Use urllib.parse.quote (#7010)

Fix Python 2 -> Python 3 migration issue

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/bfn_extensions/platform_sensors.py         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
index 330884ca733b..b2ffe2e76d6e 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/bfn_extensions/platform_sensors.py
@@ -1,13 +1,13 @@
 import sys
 import codecs
-import urllib
+from urllib.parse import quote
 
 from sonic_platform.platform_thrift_client import thrift_try
 
 def platform_sensors_get(args):
     options = ""
     if len(args)!=0:
-        options = urllib.quote(" ".join(args))
+        options = quote(" ".join(args))
     def get_data(client):
         return client.pltfm_mgr.pltfm_mgr_sensor_info_get(options)
     raw_out = thrift_try(get_data)

From 0a7cd215ce244c79c37c05e089a9cbaf36b93b6f Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Wed, 17 Feb 2021 04:07:11 +0200
Subject: [PATCH 0288/1674] [Mellanox] Update SDK to 4.4.2318, FW to
 *.2008.2314 (#6794)

To have the following fixes:
* All | Port status remains down after warm boot and flapping the port on peer side
* All | LAG HASH  | IPv6 SRC_IP is not accounted in LAG hashing [
* All | ASIC driver | Kernel crash observed when driver reload is initiated before it fully loaded
* Spectrum-3 | Buffer | In lossless configuration, headroom is been evicted only when the shared buffers is free
* All | prevent FW access during ISSU

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 094a038c31b2..5b21692173c0 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2308
+MLNX_SPC_FW_VERSION = 13.2008.2314
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2308
+MLNX_SPC2_FW_VERSION = 29.2008.2314
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2308
+MLNX_SPC3_FW_VERSION = 30.2008.2314
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 68f452e52bbb..78d452b90836 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 68f452e52bbbe9a9f68926867dd9ffcee41e15a9
+Subproject commit 78d452b90836005784cd6345bacf0a5df109f742
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 7ae3289f249c..d35eb67a1f11 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2308
+MLNX_SDK_VERSION = 4.4.2318
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 0282f4fd47e753b63ff0cd15d38c38223e9f900c Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@mellanox.com>
Date: Sun, 14 Mar 2021 03:19:40 +0800
Subject: [PATCH 0289/1674] [Mellanox] Update SDK to 4.4.2418, FW to 2008.2416,
 SAI to new commit (#7041)

- Why I did it
To pick up new features and fix from SDK/FW and SAI

SDK/FW new Feature:

All | Added support for multiple modules and cable types. For full list contact Nvidia networking support
Spectrum-3 | SN46000C | Added support for up to 5W on ports 49 to 64 .
SDK/FW bugs' fix:

All | fast reboot | fast boot failure from latest 201811 to 201911 and above
Spectrum | 10GbE/1GbE Transceiver (FTLX8574D3BCV) stopped working after firmware upgrade
Spectrum-2 | When device is rebooted with locked Optical Transceivers in split mode, the firmware may get stuck
Spectrum-2 | SN3700 | When connecting at 200GbE to Ixia K400, Ixia receives CRC errors
Spectrum-2 | SN3800 | On rare occasions packets loss may be experienced due to signal integrity issues
Spectrum-2 | When the port is a member of a LAG, after a warmboot and port toggle on the peer-side, the port remains down
Spectrum-3 | SN4700 | While using Optic cable in Split 4x1 mode in PAM4, when two first ports are toggled, the other 2 ports go down
Spectrum-3 | SN4700 | When working in 400GbE, deleting the headroom configuration (changing buffer size to zero) on the fly may cause continual packet drops
SAI

All | sFlow | Use hardcoded value 1 as netlink group number ax expected by hsflowd
- How I did it
Update the related version number in the make files and update the submodule pointer accordingly.

- How to verify it
Run regression test and everything works good.
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/mlnx-sai/SAI-Implementation          | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 5b21692173c0..2b3c5479b3d4 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2314
+MLNX_SPC_FW_VERSION = 13.2008.2416
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2314
+MLNX_SPC2_FW_VERSION = 29.2008.2416
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2314
+MLNX_SPC3_FW_VERSION = 30.2008.2416
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index aa467f9462d0..8dc2afd21ff6 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit aa467f9462d063c79875b3a6ea699e9d0b1d8b57
+Subproject commit 8dc2afd21ff6578cd0736b70aaa6ce5f1135265d
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 78d452b90836..9183774cfa64 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 78d452b90836005784cd6345bacf0a5df109f742
+Subproject commit 9183774cfa6475e3f7019a99a5d5e0b593ff26a5
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index d35eb67a1f11..d8072f6c600d 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2318
+MLNX_SDK_VERSION = 4.4.2418
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 1dec175743f2185d0406a056ebdb914d63785445 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 15 Mar 2021 09:21:03 -0700
Subject: [PATCH 0290/1674] [docker-dhcp-relay]: add -si support in dhcp docker
 template (#7053)

---
 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index debbc81af0d3..127b1beab989 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -77,6 +77,8 @@ isc-dhcp-relay-{{ vlan_name }}
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id {{ vlan_name }}
 {#- Dual ToR Option #}
 {% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -U Loopback0 -dt{% endif -%}
+{#- si option to use intf addr in relay #}
+{% if DEVICE_METADATA['localhost']['deployment_id'] == '8' %} -si{% endif -%}
 {#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
 {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
 {% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}

From 5cb07fad035c268cc8ab95adfdcc3256045e1239 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Tue, 16 Mar 2021 06:06:12 +0200
Subject: [PATCH 0291/1674] [Mellanox]: Fix PCIEd configuration files for
 SN3700 system (#7058)

Update with correct PCI addresses

Signed-off-by: liora <liora@nvidia.com>
---
 device/mellanox/x86_64-mlnx_msn3700-r0/pcie.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/pcie.yaml b/device/mellanox/x86_64-mlnx_msn3700-r0/pcie.yaml
index 947e9f43f8b3..f9c4a2573153 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/pcie.yaml
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/pcie.yaml
@@ -130,13 +130,13 @@
   id: 6f53
   name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
     Register DMA Channel 3'
-- bus: '06'
+- bus: '07'
   dev: '00'
   fn: '0'
   id: cf6c
   name: 'Ethernet controller: Mellanox Technologies MT53100 [Spectrum-2, 64 x 100GbE
     switch]'
-- bus: 08
+- bus: 09
   dev: '00'
   fn: '0'
   id: '1533'

From 4550094ec41fdab3d6b6b07721bf2195ec1c89ce Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Thu, 18 Mar 2021 09:10:39 -0700
Subject: [PATCH 0292/1674] [202012][submodule] Update sonic-swss,
 sonic-utilities, and sonic-linux-kernel submodules (#7064)

sonic-swss
* Add table descriptions for dynamic buffer calculation to the documents (#1664)
* Remove vxlanmgrd dependency on orchagent (#1647)

sonic-utilities
* [show] Fix 'show mac' output, when FDB entry with Vlan 1 is present (#1368)
* [warm-reboot]: Check empty key before issuing redis hget (#1496)
* [generate-dump] Remove Arista specific logic (#1482)
* [warm-reboot]: added automated recover for ISSU file (#1466)
* [warm-reboot] Check if warm restart flag is set when issuing a warm-reboot (#1460)
* [show][config] fix for show/config muxcable hwmode model value; fix show/config muxcable return codes; (#1494)

sonic-linux-kernel
* [net] Disable prio and cls cgroups to make working cgroup2 sock matching (#198)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 src/sonic-swss         | 2 +-
 src/sonic-utilities    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 3e191df578a3..d8f934c3da5f 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 3e191df578a32cae5c75e089efb19b12b09aabf1
+Subproject commit d8f934c3da5ff605f2359f9bd648da300771dce6
diff --git a/src/sonic-swss b/src/sonic-swss
index 3ec22bcc54bf..2abeb9baad3a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 3ec22bcc54bf90da1a6dabc8d5737b9af80f0338
+Subproject commit 2abeb9baad3aa0a536620829cbbf3b11e97e9736
diff --git a/src/sonic-utilities b/src/sonic-utilities
index c073d60ec35a..110d88c09000 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit c073d60ec35a55a0af3de27f30595224c137051b
+Subproject commit 110d88c090003025d48ea3bdb6de36f3ba5ce48b

From 50e4cc1579e4b40f48e251fdaa1b67c9619156e2 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:56:53 +0200
Subject: [PATCH 0293/1674] Backport ethtool to support QSFP-DD (#5725)

Backport ethtool debian package version 5.9 to support QSFP-DD cable parsing.

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 build_debian.sh                               |  1 -
 dockers/docker-platform-monitor/Dockerfile.j2 |  1 -
 rules/docker-platform-monitor.mk              |  3 ++-
 rules/ethtool.dep                             |  8 ++++++++
 rules/ethtool.mk                              | 13 +++++++++++++
 src/ethtool/Makefile                          | 19 +++++++++++++++++++
 6 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 rules/ethtool.dep
 create mode 100644 rules/ethtool.mk
 create mode 100644 src/ethtool/Makefile

diff --git a/build_debian.sh b/build_debian.sh
index 3559560b1ed4..662efde9f94b 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -297,7 +297,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     squashfs-tools          \
     grub2-common            \
     rsyslog                 \
-    ethtool                 \
     screen                  \
     hping3                  \
     tcptraceroute           \
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index fc46dc6a52b9..e86f4ad0019b 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -22,7 +22,6 @@ RUN apt-get update &&   \
         rrdtool         \
         python-smbus    \
         python3-smbus   \
-        ethtool         \
         dmidecode       \
         i2c-tools
 
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index 547fbf60813f..b650f74a174d 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -6,7 +6,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK).
 
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/$(DOCKER_PLATFORM_MONITOR_STEM)
 
-$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS)
+$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(ETHTOOL)
 
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
@@ -66,4 +66,5 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool
 $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/ethtool.dep b/rules/ethtool.dep
new file mode 100644
index 000000000000..15a96084046e
--- /dev/null
+++ b/rules/ethtool.dep
@@ -0,0 +1,8 @@
+SPATH       := $($(ETHTOOL)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/ethtool.mk rules/ethtool.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(ETHTOOL)_CACHE_MODE  := GIT_CONTENT_SHA
+$(ETHTOOL)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(ETHTOOL)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/ethtool.mk b/rules/ethtool.mk
new file mode 100644
index 000000000000..b79eaad7afa9
--- /dev/null
+++ b/rules/ethtool.mk
@@ -0,0 +1,13 @@
+# ethtool
+
+ETHTOOL_VERSION_BASE = 5.9
+export ETHTOOL_VERSION_BASE
+
+ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+$(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool
+SONIC_MAKE_DEBS += $(ETHTOOL)
+
+ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+$(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG)))
+
+export ETHTOOL ETHTOOL_DBG
diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile
new file mode 100644
index 000000000000..2f5a3acc94de
--- /dev/null
+++ b/src/ethtool/Makefile
@@ -0,0 +1,19 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = $(ETHTOOL)
+DERIVED_TARGET = $(ETHTOOL_DBG)
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Obtaining the ethtool debian package
+	rm -rf ethtool*
+	git clone https://salsa.debian.org/kernel-team/ethtool/
+	pushd ethtool
+	git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
+	# Build package
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	popd
+	mv $(DERIVED_TARGET) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

From 1201ca693cf32064b7a1d61a3f36b3be05c8ac40 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Wed, 24 Mar 2021 15:27:59 -0700
Subject: [PATCH 0294/1674] [202012][submodule] Update sonic-swss and
 sonic-utilites submodules for 202012 (#7105)

sonic-swss
* [nbrmgrd] added function to parse IP address from APP_DB (#1672)
* [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (#1670)
* [mux] VS test for neigh, route and fdb (#1656)
* [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (#1652)
* spell check fixes (#1630)

sonic-utilities
* [reboot]: Stop mux before reboot on dual ToR (#1500)
* [config] Disable/enable container monitoring when stopping/starting services (#1499)
* Add 'show' and 'clear' command for PG drop (#1461)
* [CLI][techsupport] Add NOOP option for commands that did not have that option (#1445)
* [202012][reload] Improve reload by using sonic.target (#1509)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 2abeb9baad3a..652ec0e2ee8e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 2abeb9baad3aa0a536620829cbbf3b11e97e9736
+Subproject commit 652ec0e2ee8e6094fd541f6a5f96aea84ba72112
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 110d88c09000..827024412799 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 110d88c090003025d48ea3bdb6de36f3ba5ce48b
+Subproject commit 82702441279974cc2f409509eeeb0965080c733c

From aee4892ca4782b1f36222f69faec4078a8b23fb8 Mon Sep 17 00:00:00 2001
From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com>
Date: Thu, 25 Mar 2021 08:50:59 +0200
Subject: [PATCH 0295/1674] [Mellanox] Align Mellanox-SN4600C-D112C8 SKU with
 SKU definition (#7057)

- Why I did it
Mellanox-SN4600C-D112C8 SKU is not configured properly.
It should have 112 50G interfaces and 8 100G interfaces as described on this PR.

- How I did it
Changed port_config.ini & sai profile.

- How to verify it
Apply this HwSKU to a MSN4600C Mellanox platform.
---
 .../Mellanox-SN4600C-D112C8/port_config.ini   | 48 ++++++++++++------
 .../sai_4600c_112x50g_8x100g.xml              | 50 ++++++++++++-------
 2 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
index eb4cdc35637b..27d933d886fa 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
@@ -5,101 +5,117 @@ Ethernet8      8,9                etp2a     2        50000     none
 Ethernet10     10,11              etp2b     2        50000     none
 Ethernet16     16,17              etp3a     3        50000     none
 Ethernet18     18,19              etp3b     3        50000     none
-Ethernet24     24,25,26,27        etp4      4        100000    rs
+Ethernet24     24,25              etp4a     4        50000     none
+Ethernet26     26,27              etp4b     4        50000     none
 Ethernet32     32,33              etp5a     5        50000     none
 Ethernet34     34,35              etp5b     5        50000     none
 Ethernet40     40,41              etp6a     6        50000     none
 Ethernet42     42,43              etp6b     6        50000     none
 Ethernet48     48,49              etp7a     7        50000     none
 Ethernet50     50,51              etp7b     7        50000     none
-Ethernet56     56,57,58,59        etp8      8        100000    rs
+Ethernet56     56,57              etp8a     8        50000     none
+Ethernet58     58,59              etp8b     8        50000     none
 Ethernet64     64,65              etp9a     9        50000     none
 Ethernet66     66,67              etp9b     9        50000     none
 Ethernet72     72,73              etp10a    10       50000     none
 Ethernet74     74,75              etp10b    10       50000     none
 Ethernet80     80,81              etp11a    11       50000     none
 Ethernet82     82,83              etp11b    11       50000     none
-Ethernet88     88,89,90,91        etp12     12       100000    rs
+Ethernet88     88,89              etp12a    12       50000     none
+Ethernet90     90,91              etp12b    12       50000     none
 Ethernet96     96,97              etp13a    13       50000     none
 Ethernet98     98,99              etp13b    13       50000     none
 Ethernet104    104,105            etp14a    14       50000     none
 Ethernet106    106,107            etp14b    14       50000     none
 Ethernet112    112,113            etp15a    15       50000     none
 Ethernet114    114,115            etp15b    15       50000     none
-Ethernet120    120,121,122,123    etp16     16       100000    rs
+Ethernet120    120,121            etp16a    16       50000     none
+Ethernet122    122,123            etp16b    16       50000     none
 Ethernet128    128,129            etp17a    17       50000     none
 Ethernet130    130,131            etp17b    17       50000     none
 Ethernet136    136,137            etp18a    18       50000     none
 Ethernet138    138,139            etp18b    18       50000     none
 Ethernet144    144,145            etp19a    19       50000     none
 Ethernet146    146,147            etp19b    19       50000     none
-Ethernet152    152,153,154,155    etp20     20       100000    rs
+Ethernet152    152,153            etp20a    20       50000     none
+Ethernet154    154,155            etp20b    20       50000     none
 Ethernet160    160,161            etp21a    21       50000     none
 Ethernet162    162,163            etp21b    21       50000     none
 Ethernet168    168,169            etp22a    22       50000     none
 Ethernet170    170,171            etp22b    22       50000     none
 Ethernet176    176,177            etp23a    23       50000     none
 Ethernet178    178,179            etp23b    23       50000     none
-Ethernet184    184,185,186,187    etp24     24       100000    rs
+Ethernet184    184,185            etp24a    24       50000     none
+Ethernet186    186,187            etp24b    24       50000     none
 Ethernet192    192,193,194,195    etp25     25       100000    rs
 Ethernet200    200,201,202,203    etp26     26       100000    rs
 Ethernet208    208,209            etp27a    27       50000     none
 Ethernet210    210,211            etp27b    27       50000     none
-Ethernet216    216,217,218,219    etp28     28       100000    rs
+Ethernet216    216,217            etp28a    28       50000     none
+Ethernet218    218,219            etp28b    28       50000     none
 Ethernet224    224,225,226,227    etp29     29       100000    rs
 Ethernet232    232,233,234,235    etp30     30       100000    rs
 Ethernet240    240,241            etp31a    31       50000     none
 Ethernet242    242,243            etp31b    31       50000     none
-Ethernet248    248,249,250,251    etp32     32       100000    rs
+Ethernet248    248,249            etp32a    32       50000     none
+Ethernet250    250,251            etp32b    32       50000     none
 Ethernet256    256,257,258,259    etp33     33       100000    rs
 Ethernet264    264,265,266,267    etp34     34       100000    rs
 Ethernet272    272,273            etp35a    35       50000     none
 Ethernet274    274,275            etp35b    35       50000     none
-Ethernet280    280,281,282,283    etp36     36       100000    rs
+Ethernet280    280,281            etp36a    36       50000     none
+Ethernet282    282,283            etp36b    36       50000     none
 Ethernet288    288,289,290,291    etp37     37       100000    rs
 Ethernet296    296,297,298,299    etp38     38       100000    rs
 Ethernet304    304,305            etp39a    39       50000     none
 Ethernet306    306,307            etp39b    39       50000     none
-Ethernet312    312,313,314,315    etp40     40       100000    rs
+Ethernet312    312,313            etp40a    40       50000     none
+Ethernet314    314,315            etp40b    40       50000     none
 Ethernet320    320,321            etp41a    41       50000     none
 Ethernet322    322,323            etp41b    41       50000     none
 Ethernet328    328,329            etp42a    42       50000     none
 Ethernet330    330,331            etp42b    42       50000     none
 Ethernet336    336,337            etp43a    43       50000     none
 Ethernet338    338,339            etp43b    43       50000     none
-Ethernet344    344,345,346,347    etp44     44       100000    rs
+Ethernet344    344,345            etp44a    44       50000     none
+Ethernet346    346,347            etp44b    44       50000     none
 Ethernet352    352,353            etp45a    45       50000     none
 Ethernet354    354,355            etp45b    45       50000     none
 Ethernet360    360,361            etp46a    46       50000     none
 Ethernet362    362,363            etp46b    46       50000     none
 Ethernet368    368,369            etp47a    47       50000     none
 Ethernet370    370,371            etp47b    47       50000     none
-Ethernet376    376,377,378,379    etp48     48       100000    rs
+Ethernet376    376,377            etp48a    48       50000     none
+Ethernet378    378,379            etp48b    48       50000     none
 Ethernet384    384,385            etp49a    49       50000     none
 Ethernet386    386,387            etp49b    49       50000     none
 Ethernet392    392,393            etp50a    50       50000     none
 Ethernet394    394,395            etp50b    50       50000     none
 Ethernet400    400,401            etp51a    51       50000     none
 Ethernet402    402,403            etp51b    51       50000     none
-Ethernet408    408,409,410,411    etp52     52       100000    rs
+Ethernet408    408,409            etp52a    52       50000     none
+Ethernet410    410,411            etp52b    52       50000     none
 Ethernet416    416,417            etp53a    53       50000     none
 Ethernet418    418,419            etp53b    53       50000     none
 Ethernet424    424,425            etp54a    54       50000     none
 Ethernet426    426,427            etp54b    54       50000     none
 Ethernet432    432,433            etp55a    55       50000     none
 Ethernet434    434,435            etp55b    55       50000     none
-Ethernet440    440,441,442,443    etp56     56       100000    rs
+Ethernet440    440,441            etp56a    56       50000     none
+Ethernet442    442,443            etp56b    56       50000     none
 Ethernet448    448,449            etp57a    57       50000     none
 Ethernet450    450,451            etp57b    57       50000     none
 Ethernet456    456,457            etp58a    58       50000     none
 Ethernet458    458,459            etp58b    58       50000     none
 Ethernet464    464,465            etp59a    59       50000     none
 Ethernet466    466,467            etp59b    59       50000     none
-Ethernet472    472,473,474,475    etp60     60       100000    rs
+Ethernet472    472,473            etp60a    60       50000     none
+Ethernet474    474,475            etp60b    60       50000     none
 Ethernet480    480,481            etp61a    61       50000     none
 Ethernet482    482,483            etp61b    61       50000     none
 Ethernet488    488,489            etp62a    62       50000     none
 Ethernet490    490,491            etp62b    62       50000     none
 Ethernet496    496,497            etp63a    63       50000     none
 Ethernet498    498,499            etp63b    63       50000     none
-Ethernet504    504,505,506,507    etp64     64       100000    rs
+Ethernet504    504,505            etp64a    64       50000     none
+Ethernet506    506,507            etp64b    64       50000     none
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml
index 199c251fbee2..34e85b726957 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml
@@ -7,7 +7,7 @@
 
         <!-- ISSU enabled -->
         <issu-enabled>1</issu-enabled>
-        
+
         <!-- Number of ports in the following port list -->
         <number-of-physical-ports>64</number-of-physical-ports>
 
@@ -43,10 +43,11 @@
             </port-info>
             <port-info>
                 <local-port>111</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>3</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>97</local-port>
@@ -74,10 +75,11 @@
             </port-info>
             <port-info>
                 <local-port>103</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>7</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>121</local-port>
@@ -105,10 +107,11 @@
             </port-info>
             <port-info>
                 <local-port>127</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>11</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>113</local-port>
@@ -136,10 +139,11 @@
             </port-info>
             <port-info>
                 <local-port>119</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>15</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>89</local-port>
@@ -167,10 +171,11 @@
             </port-info>
             <port-info>
                 <local-port>95</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>19</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>81</local-port>
@@ -198,10 +203,11 @@
             </port-info>
             <port-info>
                 <local-port>87</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>23</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>73</local-port>
@@ -227,10 +233,11 @@
             </port-info>
             <port-info>
                 <local-port>79</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>27</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>65</local-port>
@@ -256,10 +263,11 @@
             </port-info>
             <port-info>
                 <local-port>71</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>31</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>5</local-port>
@@ -285,10 +293,11 @@
             </port-info>
             <port-info>
                 <local-port>3</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>35</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>13</local-port>
@@ -314,10 +323,11 @@
             </port-info>
             <port-info>
                 <local-port>11</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>39</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>21</local-port>
@@ -345,10 +355,11 @@
             </port-info>
             <port-info>
                 <local-port>19</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>43</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>29</local-port>
@@ -376,10 +387,11 @@
             </port-info>
             <port-info>
                 <local-port>27</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>47</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>53</local-port>
@@ -407,10 +419,11 @@
             </port-info>
             <port-info>
                 <local-port>51</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>51</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>61</local-port>
@@ -438,10 +451,11 @@
             </port-info>
             <port-info>
                 <local-port>59</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>55</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>37</local-port>
@@ -469,10 +483,11 @@
             </port-info>
             <port-info>
                 <local-port>35</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>59</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
             <port-info>
                 <local-port>45</local-port>
@@ -500,10 +515,11 @@
             </port-info>
             <port-info>
                 <local-port>43</local-port>
+                <split>2</split>
                 <width>4</width>
                 <module>63</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>1536</port-speed>
+                <port-speed>384</port-speed>
             </port-info>
         </ports-list>
     </platform_info>

From a6dc65421a9514fadcaca6020143471bd7a53f0c Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Fri, 19 Mar 2021 13:27:14 -0700
Subject: [PATCH 0296/1674] DHCP Relay: add option -si to support using src
 intf ip in relay (#7052)

* add option si to support using src intf ip in relay
---
 ...o-support-using-src-intf-ip-in-relay.patch | 192 ++++++++++++++++++
 src/isc-dhcp/patch/series                     |   1 +
 2 files changed, 193 insertions(+)
 create mode 100644 src/isc-dhcp/patch/0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch

diff --git a/src/isc-dhcp/patch/0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch b/src/isc-dhcp/patch/0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch
new file mode 100644
index 000000000000..7fd9fc313406
--- /dev/null
+++ b/src/isc-dhcp/patch/0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch
@@ -0,0 +1,192 @@
+From 16163f0693e30588216f0f280d5eba8bb53f7001 Mon Sep 17 00:00:00 2001
+From: Tianrong Zhang <trzhang@microsoft.com>
+Date: Fri, 12 Mar 2021 23:30:56 -0800
+Subject: [PATCH] add option -si to support using src intf ip in relay
+
+---
+ common/socket.c  | 119 ++++++++++++++++++++++++++++++++++++-----------
+ includes/dhcpd.h |   1 +
+ relay/dhcrelay.c |   8 ++++
+ 3 files changed, 100 insertions(+), 28 deletions(-)
+
+diff --git a/common/socket.c b/common/socket.c
+index 483eb9c..da9f501 100644
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -83,6 +83,29 @@ static unsigned int global_v4_socket_references = 0;
+ static int global_v4_socket = -1;
+ #endif
+ 
++/*
++ * If set, uses "from" interface IP for packet Tx.
++ * If not set, kernel chooses appropriate src ip for tx pkts
++ */
++int use_src_intf_ip_for_tx;
++
++/*
++ * For both send_packet6() and receive_packet6() we need to allocate
++ * space for the cmsg header information.  We do this once and reuse
++ * the buffer.  We also need the control buf for send_packet() and
++ * receive_packet() when we use a single socket and IP_PKTINFO to
++ * send the packet out the correct interface.
++ */
++static void   *v4_control_buf = NULL;
++static size_t  v4_control_buf_len = 0;
++
++static void
++v4_allocate_cmsg_cbuf(void) {
++	v4_control_buf_len = CMSG_SPACE(sizeof(struct in_pktinfo));
++	v4_control_buf = dmalloc(v4_control_buf_len, MDL);
++	return;
++}
++
+ /*
+  * If we can't bind() to a specific interface, then we can only have
+  * a single socket. This variable insures that we don't try to listen
+@@ -712,37 +735,77 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+ 	struct hardware *hto;
+ {
+ 	int result;
+-#ifdef IGNORE_HOSTUNREACH
+-	int retry = 0;
+-	do {
+-#endif
+-#if defined(IP_PKTINFO) && defined(IP_RECVPKTINFO) && defined(USE_V4_PKTINFO)
+-		struct in_pktinfo pktinfo;
+-
+-		if (interface->ifp != NULL) {
+-			memset(&pktinfo, 0, sizeof (pktinfo));
+-			pktinfo.ipi_ifindex = interface->ifp->ifr_index;
+-			if (setsockopt(interface->wfdesc, IPPROTO_IP,
+-				       IP_PKTINFO, (char *)&pktinfo,
+-				       sizeof(pktinfo)) < 0) 
+-				log_fatal("setsockopt: IP_PKTINFO: %m");
++	struct msghdr m;
++	struct iovec v;
++	struct sockaddr_in dst;
++	struct in_pktinfo *pktinfo;
++	struct cmsghdr *cmsg;
++	unsigned int ifindex;
++
++	/*
++	 * If necessary allocate space for the control message header.
++	 * The space is common between send and receive.
++	 */
++
++	if (v4_control_buf == NULL) {
++		v4_allocate_cmsg_cbuf();
++		if (v4_control_buf == NULL) {
++			log_error("send_packet: unable to allocate cmsg header");
++			return(ENOMEM);
+ 		}
+-#endif
+-		result = sendto (interface -> wfdesc, (char *)raw, len, 0,
+-				 (struct sockaddr *)to, sizeof *to);
+-#ifdef IGNORE_HOSTUNREACH
+-	} while (to -> sin_addr.s_addr == htonl (INADDR_BROADCAST) &&
+-		 result < 0 &&
+-		 (errno == EHOSTUNREACH ||
+-		  errno == ECONNREFUSED) &&
+-		 retry++ < 10);
+-#endif
++	}
++	memset(v4_control_buf, 0, v4_control_buf_len);
++
++	/*
++	 * Initialize our message header structure.
++	 */
++	memset(&m, 0, sizeof(m));
++
++	/*
++	 * Set the target address we're sending to.
++	 */
++	memcpy(&dst, to, sizeof(dst));
++	m.msg_name = &dst;
++	m.msg_namelen = sizeof(dst);
++	ifindex = if_nametoindex(interface->name);
++
++	/*
++	 * Set the data buffer we're sending. (Using this wacky
++	 * "scatter-gather" stuff... we only have a single chunk
++	 * of data to send, so we declare a single vector entry.)
++	 */
++	v.iov_base = (char *)raw;
++	v.iov_len = len;
++	m.msg_iov = &v;
++	m.msg_iovlen = 1;
++
++	/*
++	 * Setting the interface is a bit more involved.
++	 *
++	 * We have to create a "control message", and set that to
++	 * define the IP packet information. We let he kernel decide
++	 * the source IP address unless 'use_src_intf_ip_for_tx' is
++	 * set, in which case we use the IP address of the ingress
++	 * interface we received the request on as the source IP.
++	 */
++	m.msg_control = v4_control_buf;
++	m.msg_controllen = v4_control_buf_len;
++	cmsg = CMSG_FIRSTHDR(&m);
++	INSIST(cmsg != NULL);
++	cmsg->cmsg_level = IPPROTO_IP;
++	cmsg->cmsg_type = IP_PKTINFO;
++	cmsg->cmsg_len = CMSG_LEN(sizeof(*pktinfo));
++	pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg);
++	memset(pktinfo, 0, sizeof(*pktinfo));
++	pktinfo->ipi_ifindex = ifindex;
++	if (use_src_intf_ip_for_tx)
++		pktinfo->ipi_spec_dst = from;
++
++	result = sendmsg(interface->wfdesc, &m, 0);
+ 	if (result < 0) {
+-		log_error ("send_packet: %m");
+-		if (errno == ENETUNREACH)
+-			log_error ("send_packet: please consult README file%s",
+-				   " regarding broadcast address.");
++		log_error("send_packet: %m");
+ 	}
++
+ 	return result;
+ }
+ 
+diff --git a/includes/dhcpd.h b/includes/dhcpd.h
+index 36cd518..0c25582 100644
+--- a/includes/dhcpd.h
++++ b/includes/dhcpd.h
+@@ -2660,6 +2660,7 @@ ssize_t send_fallback6(struct interface_info *, struct packet *,
+ #endif
+ 
+ #ifdef USE_SOCKET_SEND
++extern int use_src_intf_ip_for_tx;
+ void if_reinitialize_send (struct interface_info *);
+ void if_register_send (struct interface_info *);
+ void if_deregister_send (struct interface_info *);
+diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
+index 221106a..c44a79d 100644
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -97,6 +97,12 @@ struct downstream_intf_list {
+ isc_boolean_t use_if_id = ISC_FALSE;
+ #endif
+ 
++/*
++ * If not set, kernel chooses what the src ip is.
++ * If set, uses "from" interface IP for packet Tx.
++ */
++extern int use_src_intf_ip_for_tx = 0;
++
+ 	/* Maximum size of a packet with agent options added. */
+ int dhcp_max_agent_option_packet_length = DHCP_MTU_MIN;
+ 
+@@ -431,6 +437,8 @@ main(int argc, char **argv) {
+ #endif
+ 		} else if (!strcmp(argv[i], "-d")) {
+ 			/* no_daemon = 1; */
++		} else if (!strcmp(argv[i], "-si")) {
++			use_src_intf_ip_for_tx = 1;
+ 		} else if (!strcmp(argv[i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
+-- 
+2.17.1
+
diff --git a/src/isc-dhcp/patch/series b/src/isc-dhcp/patch/series
index a34b5bf4b0df..5397aa0c6e06 100644
--- a/src/isc-dhcp/patch/series
+++ b/src/isc-dhcp/patch/series
@@ -10,3 +10,4 @@
 0009-Support-for-dual-tor-scenario.patch
 0010-Bugfix-correctly-set-interface-netmask.patch
 0011-dhcp-relay-Prevent-Buffer-Overrun.patch
+0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch

From 42e0ffb32fb8759f58fc03ef324e12c2c938c7bc Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Fri, 19 Mar 2021 10:52:28 -0700
Subject: [PATCH 0297/1674] [docker-gbsyncd-vs] Run gbsyncd_startup.py directly
 (#7084)

Eliminate the need for `gbsyncd_start.sh`, which simply calls `exec "/usr/bin/gbsyncd_startup.py"`. The shell script is unnecessary.

Once this PR merges, we can remove `gbsyncd_start.sh` from the sonic-sairedis repo.
---
 platform/vs/docker-gbsyncd-vs/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vs/docker-gbsyncd-vs/supervisord.conf b/platform/vs/docker-gbsyncd-vs/supervisord.conf
index 52267c8fa58f..68f2c46ab182 100644
--- a/platform/vs/docker-gbsyncd-vs/supervisord.conf
+++ b/platform/vs/docker-gbsyncd-vs/supervisord.conf
@@ -38,7 +38,7 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [program:syncd]
-command=/usr/bin/gbsyncd_start.sh
+command=/usr/bin/gbsyncd_startup.py
 priority=3
 autostart=false
 autorestart=false

From 902ad1357a848ca3dcd37ba3219c779b25cfbd29 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Wed, 17 Mar 2021 23:14:38 -0700
Subject: [PATCH 0298/1674] To decrease the Connect Retry Timer from default
 value which is 120sec to 10 sec. (#7087)

Why I did it
It was observed that on a multi-asic DUT bootup, the BGP internal sessions between ASIC's was taking more time to get ESTABLISHED than external BGP sessions. The internal sessions was coming up almost exactly 120 secs later.

In multi-asic platform the bgp dockers ( which is per ASIC ) on switch start are bring brought up around the same time and they try to make the bgp sessions with neighbors (in peer ASIC's) which may be not be completely up. This results in BGP connect fail and the retry happens after 120sec which is the default Connect Retry Timer

How I did it
Add the command to set the bgp neighboring session retry timer to 10sec for internal bgp neighbors.
---
 .../docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2  | 1 +
 .../tests/data/internal/instance.conf/result_back_v4.conf        | 1 +
 .../tests/data/internal/instance.conf/result_back_v6.conf        | 1 +
 .../tests/data/internal/instance.conf/result_front_v4.conf       | 1 +
 .../tests/data/internal/instance.conf/result_front_v6.conf       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
index e0e23b7f60c8..59781d024ab0 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
@@ -4,6 +4,7 @@
   neighbor {{ neighbor_addr }} remote-as {{ bgp_session['asn'] }}
   neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
   neighbor {{ neighbor_addr }} timers 3 10
+  neighbor {{ neighbor_addr }} timers connect 10
 !
 {% if neighbor_addr | ipv4 %}
   address-family ipv4
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
index fc7b82a64acc..df8db8311f35 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
     neighbor 10.10.10.10 route-map FROM_BGP_INTERNAL_PEER_V4 in
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
index 74cececad969..a300edb0e512 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
@@ -4,6 +4,7 @@
   neighbor fc::10 remote-as 555
   neighbor fc::10 description remote_peer
   neighbor fc::10 timers 3 10
+  neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 route-map FROM_BGP_INTERNAL_PEER_V6 in
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
index 95eb985b1546..f848ebd457d4 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
     neighbor 10.10.10.10 next-hop-self force
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
index a4a4648e4855..09c021b9195b 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
@@ -4,6 +4,7 @@
   neighbor fc::10 remote-as 555
   neighbor fc::10 description remote_peer
   neighbor fc::10 timers 3 10
+  neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 next-hop-self force

From 01057a0b82d25f932111348ef803febec4ecfdc2 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 24 Mar 2021 18:46:18 -0700
Subject: [PATCH 0299/1674] [Submodule update] sonic-snmpagent (#7107)

c20bf60 Qi Luo  Mon Mar 15 14:28:31 2021 -0700  Implement rfc4363 FdbUpdater for lag inside vlan (#203)
292024a abdosi  Mon Mar 15 12:15:21 2021 -0700  Updated lldpRemManAddrTable to use all the management ip address associated with interface. (#201)
9b83459 liushilongbuaa  Fri Mar 12 14:35:23 2021 +0800  [CI] Setup dummy azure pipeline (#198)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 183162fcc468..c20bf604361c 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 183162fcc468b3af774be2353b84bdf0b8365b46
+Subproject commit c20bf604361c7a1ea47f0815897df6dbb2239a01

From e6a08d8638f82f3f5d2be1d60c34bdd73abf6018 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 25 Mar 2021 20:28:33 +0800
Subject: [PATCH 0300/1674] Fix issue: should not initialize led color in
 __init__ file as platform API will be called by multiple daemons (#7114)

- Why I did it
The existing Fan led and Psu led object initialize itself to green color in init method. However, there are multiple daemons calls sonic platform API and there could be a case that:

A PSU is removed from system
Reboot switch
psud detects that 1 PSU is missing and set PSU led to red
Other daemon just start up and call sonic platform API, the API set PSU led to green by call PsuLed.init
This PR is a partial fix for the issue. As we also need guarantee that the led is initialized with a correct value. I checked existing psud and thermalctld code. psud always initialize the PSU led color on boot up, thermalcltd need some changes to initialize led color on the first run

- How I did it
Remove the led color initialization code from FanLed.init and PsuLed.init

- How to verify it
Manual test
---
 platform/mellanox/mlnx-platform-api/sonic_platform/led.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/led.py b/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
index 2e6002b77e6f..d67cbb1d9557 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
@@ -207,8 +207,6 @@ def __init__(self, index):
             self._orange_led_path = os.path.join(Led.LED_PATH, "led_fan_orange")
             self._led_cap_path = os.path.join(Led.LED_PATH, "led_fan_capability")
 
-        self.set_status(Led.STATUS_LED_COLOR_GREEN)
-
     def get_green_led_path(self):
         return self._green_led_path
 
@@ -234,8 +232,6 @@ def __init__(self, index):
             self._red_led_path = os.path.join(Led.LED_PATH, "led_psu_red")
             self._orange_led_path = os.path.join(Led.LED_PATH, "led_psu_orange")
             self._led_cap_path = os.path.join(Led.LED_PATH, "led_psu_capability")
-            
-        self.set_status(Led.STATUS_LED_COLOR_GREEN)
 
     def get_green_led_path(self):
         return self._green_led_path

From dce4ed5466856598bc891f96e5fddce9cc582837 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Tue, 23 Mar 2021 03:27:36 +0200
Subject: [PATCH 0301/1674] [Mellanox] Update FW to xx.2008.2424 (#7118)

Fixed issues:
* Mellanox SN-2700 breakout port not linking up with QSA

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 2b3c5479b3d4..28820016f757 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2416
+MLNX_SPC_FW_VERSION = 13.2008.2424
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2416
+MLNX_SPC2_FW_VERSION = 29.2008.2424
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2416
+MLNX_SPC3_FW_VERSION = 30.2008.2424
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 9183774cfa64..3e3de6acf473 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 9183774cfa6475e3f7019a99a5d5e0b593ff26a5
+Subproject commit 3e3de6acf4736a61acb5adc42ceb1a5d09523a21

From 7dc0ae599a38e37c67686452a6950d98112c8ebc Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Sat, 27 Mar 2021 11:37:40 -0700
Subject: [PATCH 0302/1674] [202012][swss][utilities] advance submodule heads
 (#7165)

utilities:
* 83f068b 2021-03-22 | Handling error scenario of adding port to Vlan which is part of LAG (#1516) (HEAD -> 202012) [Sudharsan Dhamal Gopalarathnam]
* 470e8ce 2021-03-24 | Enable PFCWD only on ports where PFC is enabled (#1508) [Andriy Yurkiv]
* 09ef2e0 2021-03-22 | [show][config] add support for setting and displaying switching modes on Y cable (#1501) [vdahiya12]
* 0d17d37 2021-03-24 | Warmboot script improvements - timeout exec, disable swss autorestart, remove trap (#1495) [Vaibhav Hemant Dixit]
* 2718cd8 2021-03-24 | [show] Fix int status of LAGs, configured as Vlan members (#1478) [maksymbelei95]
* cc168fb 2021-03-22 | Fix bug: show vlan config for vlan with no members (#1503) [allas-nvidia]

swss:
* 5d8d1fb 2021-03-26 | Revert "Revert "[buffermgr] Support maximum port headroom checking (#1607)" (#1675)" (#1682) (HEAD -> 202012) [Prince Sunny]
* f8df1f8 2021-03-26 | [Dynamic Buffer Calc] Enhance the field checking in table handling (#1680) [Stephen Sun]
* 6328c9f 2021-03-22 | [MuxOrch] FDB ageout safety check (#1674) [Prince Sunny]
* e1d733e 2021-03-21 | reduce severity of log to info in case of flush on non-existing member (#1669) [allas-nvidia]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 652ec0e2ee8e..5d8d1fbdff1c 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 652ec0e2ee8e6094fd541f6a5f96aea84ba72112
+Subproject commit 5d8d1fbdff1cd2ce4a190dea95f08679bedf757c
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 827024412799..83f068b6a218 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 82702441279974cc2f409509eeeb0965080c733c
+Subproject commit 83f068b6a21890eeedd32b64ffc14087d21ae435

From 505db8e91a9448df1100d0e35b9a8fced60bdca3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 29 Mar 2021 23:07:44 +0800
Subject: [PATCH 0303/1674] [ci/build]: Upgrade SONiC package versions (#7042)

Co-authored-by: mssonicbld <vsts@fv-az80-884.nqsemdo0cabejmrqkclmmohwag.dx.internal.cloudapp.net>
---
 .../versions-deb-buster                       | 42 +++++++++----------
 .../versions/default/versions-deb-buster      | 11 +++--
 files/build/versions/default/versions-py3     |  8 ++--
 files/build/versions/default/versions-web     |  8 ++--
 .../docker-base-stretch/versions-deb-stretch  |  2 +-
 .../docker-fpm-frr/versions-deb-buster        |  4 +-
 .../versions-deb-buster                       | 19 +++++----
 .../docker-syncd-brcm/versions-deb-buster     |  1 +
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 38 ++++++++---------
 .../sonic-slave-buster/versions-deb-buster    | 12 +++---
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 34 +++++++--------
 .../dockers/sonic-slave-stretch/versions-py3  |  4 +-
 .../versions/host-image/versions-deb-buster   | 21 ++++++----
 files/build/versions/host-image/versions-py3  |  8 ++--
 17 files changed, 114 insertions(+), 106 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index d8d78fd6470b..28601ef6467a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.2308
-applibs-dev==1.mlnx.4.4.2308
+applibs==1.mlnx.4.4.2418
+applibs-dev==1.mlnx.4.4.2418
 bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
@@ -8,10 +8,10 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2==1.mlnx.4.4.2308
-iproute2-dev==1.mlnx.4.4.2308
+iproute2==1.mlnx.4.4.2418
+iproute2-dev==1.mlnx.4.4.2418
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.15.3-3
+kernel-mft-dkms==4.16.0-105
 libatk-bridge2.0-dev==2.30.0-5
 libatk1.0-dev==2.30.0-2
 libatspi2.0-dev==2.30.0-7
@@ -42,7 +42,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.1
+libsaibcm==4.3.3.1-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -81,7 +81,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.15.3-3
+mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
@@ -91,23 +91,23 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
-sx-acl-helper==1.mlnx.4.4.2308
-sx-acl-helper-dev==1.mlnx.4.4.2308
-sx-complib==1.mlnx.4.4.2308
-sx-complib-dev==1.mlnx.4.4.2308
-sx-examples==1.mlnx.4.4.2308
-sx-examples-dev==1.mlnx.4.4.2308
-sx-gen-utils==1.mlnx.4.4.2308
-sx-gen-utils-dev==1.mlnx.4.4.2308
-sx-scew==1.mlnx.4.4.2308
-sx-scew-dev==1.mlnx.4.4.2308
-sxd-libs==1.mlnx.4.4.2308
-sxd-libs-dev==1.mlnx.4.4.2308
+sx-acl-helper==1.mlnx.4.4.2418
+sx-acl-helper-dev==1.mlnx.4.4.2418
+sx-complib==1.mlnx.4.4.2418
+sx-complib-dev==1.mlnx.4.4.2418
+sx-examples==1.mlnx.4.4.2418
+sx-examples-dev==1.mlnx.4.4.2418
+sx-gen-utils==1.mlnx.4.4.2418
+sx-gen-utils-dev==1.mlnx.4.4.2418
+sx-scew==1.mlnx.4.4.2418
+sx-scew-dev==1.mlnx.4.4.2418
+sxd-libs==1.mlnx.4.4.2418
+sxd-libs-dev==1.mlnx.4.4.2418
 syncd==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
-wjh-libs==1.mlnx.4.4.2308
-wjh-libs-dev==1.mlnx.4.4.2308
+wjh-libs==1.mlnx.4.4.2418
+wjh-libs-dev==1.mlnx.4.4.2418
 x11proto-composite-dev==1:2018.4-4
 x11proto-input-dev==2018.4-4
 x11proto-randr-dev==2018.4-4
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 42b3e1f4a2d3..a49f7f5eab81 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -8,14 +8,13 @@ cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u1
 dmidecode==3.2-1
 dpkg-dev==1.19.7
-ethtool==1:4.19-1
 fancontrol==1:3.5.0-3
 fontconfig==2.13.1-2
 fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
-frr==7.5-sonic-0
-frr-snmp==7.5-sonic-0
+frr==7.5.1-sonic-0
+frr-snmp==7.5.1-sonic-0
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
@@ -119,7 +118,7 @@ libreadline7==7.0-5
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.1
+libsaibcm==4.3.3.1-1
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
@@ -129,7 +128,7 @@ libsensors5==1:3.5.0-3
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u5
+libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libteam-utils==1.30-1
 libteam5==1.30-1
@@ -168,7 +167,7 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1d-0+deb10u5
+openssl==1.1.1d-0+deb10u6
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 957c6a1869fb..bb5f23812ddc 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -10,7 +10,7 @@ grpcio==1.36.1
 grpcio-tools==1.20.0
 hiredis==1.1.0
 idna==2.10
-importlib-metadata==3.7.2
+importlib-metadata==3.8.0
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
@@ -23,9 +23,9 @@ MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
-openapi-schema-validator==0.1.4
+openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.0
-protobuf==3.15.5
+protobuf==3.15.6
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
@@ -36,7 +36,7 @@ python-dateutil==2.6.0
 PyYAML==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2020.11.13
+regex==2021.3.17
 requests==2.25.1
 scapy==2.4.4
 smbus==1.1.post2
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 9fa8fa8caee1..6620fb903af3 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -11,10 +11,10 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.15.3-3-x86_64-deb.tgz==21caa3657b4100da3d08cf47961edc6f
+http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://github.com/aristanetworks/sonic-firmware/raw/78a3df2/phy/phy-credo_1.0_amd64.deb==f0d5b5efa18cf775cdc3fccaba7ac181
+https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210219_deb10.deb==4bd3f9c10d159d6d32e984c1de5a569c
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210219_deb10.deb==57e0b2f6a8412de63e307105571b7ed2
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
@@ -42,8 +42,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A37%3A16Z&se=2030-03-04T00%3A37%3A00Z&sr=b&sp=r&sig=xxnhJC%2FKsOvApuAlB1Yds8Uzzkdyy6fmWX%2BuJ4v0UYA%3D==5ddbdab8865d3c232f4d664edb7ff334
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1_amd64.deb?sv=2019-12-12&st=2021-03-03T00%3A35%3A37Z&se=2030-03-04T00%3A35%3A00Z&sr=b&sp=r&sig=1miXMYs0%2BZ6v9Dpby1vSYsDezWDnr%2Be4gZ7Gi3kAQXE%3D==2f250ddee8fdab04956ad7dc3f0a5a70
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=EavLNMXA6OS3s9oD34bKbdtfYHppR4egkh7V7jc4gWM%3D&se=2034-11-14T03%3A31%3A04Z&sp=r==81da461319cada4059a94f43d4d8509c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=n7KoEZ5wXY%2FobPAy62d9C%2BKyAkKo4PIdIAWwqnDBm3E%3D&se=2034-11-14T03%3A30%3A33Z&sp=r==12b8cdd22a07c0ce6b33114cf75b2fe3
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index a1eeff0e7dba..bc7c0920e5d2 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -1,4 +1,4 @@
-ca-certificates==20200601~deb9u1
+ca-certificates==20200601~deb9u2
 curl==7.52.1-5+deb9u13
 jq==1.5+dfsg-1.3
 less==481-2.1
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index f7c4d4703113..861bf8125805 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,5 +1,5 @@
-frr-dbgsym==7.5-sonic-0
-frr-snmp-dbgsym==7.5-sonic-0
+frr-dbgsym==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 libbabeltrace1==1.5.6-2+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 2789343f7e62..e1795bb10102 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,6 @@
-applibs==1.mlnx.4.4.2308
-applibs-dev==1.mlnx.4.4.2308
+applibs==1.mlnx.4.4.2418
+applibs-dev==1.mlnx.4.4.2418
+ethtool==1:5.9-1
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 libbabeltrace1==1.5.6-2+deb10u1
@@ -11,15 +12,15 @@ libsensors5-dbgsym==1:3.5.0-3
 libswsscommon-dbg==1.0.0
 lm-sensors-dbgsym==1:3.5.0-3
 openssh-client==1:7.9p1-10+deb10u2
-python-sdk-api==1.mlnx.4.4.2308
+python-sdk-api==1.mlnx.4.4.2418
 sensord-dbgsym==1:3.5.0-3
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.2308
-sx-complib-dev==1.mlnx.4.4.2308
-sx-gen-utils==1.mlnx.4.4.2308
-sx-gen-utils-dev==1.mlnx.4.4.2308
-sxd-libs==1.mlnx.4.4.2308
-sxd-libs-dev==1.mlnx.4.4.2308
+sx-complib==1.mlnx.4.4.2418
+sx-complib-dev==1.mlnx.4.4.2418
+sx-gen-utils==1.mlnx.4.4.2418
+sx-gen-utils-dev==1.mlnx.4.4.2418
+sxd-libs==1.mlnx.4.4.2418
+sxd-libs-dev==1.mlnx.4.4.2418
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
new file mode 100644
index 000000000000..28b48a115b6d
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -0,0 +1 @@
+ethtool==1:4.19-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 1f61b36d3891..6d93dfe784fc 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -39,7 +39,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u5
+libssl-dev==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 1f61b36d3891..6d93dfe784fc 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -39,7 +39,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u5
+libssl-dev==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 147fc780a2bf..ac21a6977c36 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,7 +1,7 @@
-applibs==1.mlnx.4.4.2308
-applibs-dev==1.mlnx.4.4.2308
-iproute2==1.mlnx.4.4.2308
-iproute2-dev==1.mlnx.4.4.2308
+applibs==1.mlnx.4.4.2418
+applibs-dev==1.mlnx.4.4.2418
+iproute2==1.mlnx.4.4.2418
+iproute2-dev==1.mlnx.4.4.2418
 libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
 libpython-dev==2.7.16-1
@@ -10,21 +10,21 @@ libpython2.7-dev==2.7.16-2+deb10u1
 mlnx-sai==1.mlnx.SAIRel1.18.1.0
 python-dev==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.2308
+python-sdk-api==1.mlnx.4.4.2418
 python-setuptools==40.8.0-1
 python2-dev==2.7.16-1
 python2.7-dev==2.7.16-2+deb10u1
-sx-acl-helper==1.mlnx.4.4.2308
-sx-acl-helper-dev==1.mlnx.4.4.2308
-sx-complib==1.mlnx.4.4.2308
-sx-complib-dev==1.mlnx.4.4.2308
-sx-examples==1.mlnx.4.4.2308
-sx-examples-dev==1.mlnx.4.4.2308
-sx-gen-utils==1.mlnx.4.4.2308
-sx-gen-utils-dev==1.mlnx.4.4.2308
-sx-scew==1.mlnx.4.4.2308
-sx-scew-dev==1.mlnx.4.4.2308
-sxd-libs==1.mlnx.4.4.2308
-sxd-libs-dev==1.mlnx.4.4.2308
-wjh-libs==1.mlnx.4.4.2308
-wjh-libs-dev==1.mlnx.4.4.2308
\ No newline at end of file
+sx-acl-helper==1.mlnx.4.4.2418
+sx-acl-helper-dev==1.mlnx.4.4.2418
+sx-complib==1.mlnx.4.4.2418
+sx-complib-dev==1.mlnx.4.4.2418
+sx-examples==1.mlnx.4.4.2418
+sx-examples-dev==1.mlnx.4.4.2418
+sx-gen-utils==1.mlnx.4.4.2418
+sx-gen-utils-dev==1.mlnx.4.4.2418
+sx-scew==1.mlnx.4.4.2418
+sx-scew-dev==1.mlnx.4.4.2418
+sxd-libs==1.mlnx.4.4.2418
+sxd-libs-dev==1.mlnx.4.4.2418
+wjh-libs==1.mlnx.4.4.2418
+wjh-libs-dev==1.mlnx.4.4.2418
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 8110d1106272..8822045f3a06 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1009,8 +1009,8 @@ libsqlite3-0==3.27.2-3+deb10u1
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u5
-libssl1.1==1.1.1d-0+deb10u5
+libssl-dev==1.1.1d-0+deb10u6
+libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1057,7 +1057,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u1
+libtiff5==4.1.0+git191117-2~deb10u2
 libtimedate-perl==2.3000-2+deb10u1
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
@@ -1309,7 +1309,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u5
+openssl==1.1.1d-0+deb10u6
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
@@ -1444,7 +1444,7 @@ python-pluggy==0.8.0-1
 python-py==1.7.0-2
 python-pyasn1==0.4.2-3
 python-pyasn1-modules==0.2.1-0.2
-python-pygments==2.3.1+dfsg-1
+python-pygments==2.3.1+dfsg-1+deb10u1
 python-pyparsing==2.2.0+dfsg1-2
 python-pytest==3.10.1-2
 python-pytest-cov==2.6.0-1
@@ -1525,7 +1525,7 @@ python3-pkg-resources==40.8.0-1
 python3-pluggy==0.8.0-1
 python3-py==1.7.0-2
 python3-pycurl==7.43.0.2-0.1
-python3-pygments==2.3.1+dfsg-1
+python3-pygments==2.3.1+dfsg-1+deb10u1
 python3-pyparsing==2.2.0+dfsg1-2
 python3-pytest==3.10.1-2
 python3-pytest-cov==2.6.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 4288fd5abc41..96b8241df7a4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 Babel==2.6.0
-bitarray==1.7.0
+bitarray==1.8.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 PyYAML==5.4.1
 redis==3.5.3
-regex==2020.11.13
+regex==2021.3.17
 requests==2.21.0
 roman==2.0.0
 SecretStorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 29f79064abc5..146d26c60f02 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -31,7 +31,7 @@ bsdmainutils==9.0.12+nmu1
 build-essential==12.3
 byacc==20140715-1+b1
 bzip2==1.0.6-8.1
-ca-certificates==20200601~deb9u1
+ca-certificates==20200601~deb9u2
 ca-certificates-java==20170929~deb9u3
 cdbs==0.4.150
 cgmanager==0.41-2
@@ -154,9 +154,9 @@ guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
 icu-devtools==57.1-6+deb9u4
-imagemagick==8:6.9.7.4+dfsg-11+deb9u11
-imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u11
-imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u11
+imagemagick==8:6.9.7.4+dfsg-11+deb9u12
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u12
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u12
 install-info==6.3.0.dfsg.1-1+b2
 intltool-debian==0.35.0+20060710.4
 iptables==1.6.0+snapshot20161117-6
@@ -597,7 +597,7 @@ libjetty9-java==9.2.21-1+deb9u1
 libjline-java==1.0-2
 libjpeg62-turbo==1:1.5.1-2+deb9u1
 libjs-bootstrap==3.3.7+dfsg-2+deb9u2
-libjs-jquery==3.1.1-2+deb9u1
+libjs-jquery==3.1.1-2+deb9u2
 libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
 libjs-jquery-isonscreen==1.2.0-1
 libjs-jquery-metadata==11-3
@@ -656,15 +656,15 @@ liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
 libmagic1==1:5.30-1+deb9u3
-libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u11
-libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u11
-libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u11
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u12
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u12
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u12
 libmail-sendmail-perl==0.79.16-2
 libmailtools-perl==2.18-1
 libmailutils5==1:3.1.1-1
-libmariadbclient-dev==10.1.48-0+deb9u1
-libmariadbclient-dev-compat==10.1.48-0+deb9u1
-libmariadbclient18==10.1.48-0+deb9u1
+libmariadbclient-dev==10.1.48-0+deb9u2
+libmariadbclient-dev-compat==10.1.48-0+deb9u2
+libmariadbclient18==10.1.48-0+deb9u2
 libmaven-ant-tasks-java==2.1.3-4
 libmaven-archiver-java==2.6-3
 libmaven-clean-plugin-java==2.5-1
@@ -902,7 +902,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u5
+libservlet3.1-java==8.5.54-0+deb9u6
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -1280,7 +1280,7 @@ python-jinja2==2.8-1
 python-keyring==10.1-1
 python-keyrings.alt==1.3-1
 python-lazy-object-proxy==1.2.2-1
-python-lxml==3.7.1-1+deb9u3
+python-lxml==3.7.1-1+deb9u4
 python-markupsafe==0.23-3
 python-minimal==2.7.13-2
 python-nose2==0.6.5-2
@@ -1293,7 +1293,7 @@ python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
 python-pyasn1==0.1.9-2
 python-pyasn1-modules==0.0.7-0.1
-python-pygments==2.2.0+dfsg-1
+python-pygments==2.2.0+dfsg-1+deb9u2
 python-pytest==3.0.6-1
 python-pytest-cov==2.4.0-2
 python-requests==2.12.4-1
@@ -1349,7 +1349,7 @@ python3-pil==4.0.0-4+deb9u2
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
-python3-pygments==2.2.0+dfsg-1
+python3-pygments==2.2.0+dfsg-1+deb9u2
 python3-roman==2.0.0-2
 python3-secretstorage==2.3.1-2
 python3-setuptools==33.1.1-1
@@ -1447,7 +1447,7 @@ tk8.6-blt2.5==2.5.3+dfsg-3
 ucf==3.0036
 unattended-upgrades==0.93.1+nmu1
 unzip==6.0-21+deb9u2
-velocity==1.7-5
+velocity==1.7-5+deb9u1
 vim==2:8.0.0197-4+deb9u3
 vim-common==2:8.0.0197-4+deb9u3
 vim-runtime==2:8.0.0197-4+deb9u3
@@ -1476,7 +1476,7 @@ xml-core==0.17
 xmlto==0.0.28-1
 xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
-xterm==327-2+deb9u1
+xterm==327-2+deb9u2
 xtrans-dev==1.3.5-1
 xxd==2:8.0.0197-4+deb9u3
 xz-utils==5.2.2-1.2+b1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index b23a75b0d3f8..14615c3137b7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 Babel==2.3.4
-bitarray==1.7.0
+bitarray==1.8.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -28,7 +28,7 @@ pytz==2016.7
 pyxdg==0.25
 PyYAML==5.3.1
 redis==3.5.3
-regex==2020.11.13
+regex==2021.3.17
 roman==2.0.0
 SecretStorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 0ffc32917cbc..768bb6151d90 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -24,7 +24,6 @@ dpkg-dev==1.19.7
 drivers-sonic-platform-arista==1.0
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
-ethtool==1:4.19-1
 file==1:5.35-4+deb10u2
 firmware-amd-graphics==20190114-2
 firmware-linux-nonfree==20190114-2
@@ -62,7 +61,7 @@ iputils-ping==3:20180629-2+deb10u1
 isc-dhcp-client==4.4.1-2
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.15.3
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.16.0
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1
 kmod==26-1
@@ -71,6 +70,9 @@ libapparmor1==2.13.2-10
 libapt-inst2.0==1.8.2.2
 libargon2-1==0~20171227-0.2
 libassuan0==2.5.2-1
+libboost-filesystem1.67.0==1.67.0-13+deb10u1
+libboost-program-options1.67.0==1.67.0-13+deb10u1
+libboost-system1.67.0==1.67.0-13+deb10u1
 libbsd0==0.9.1-2
 libc-l10n==2.28-10
 libcap2==1:2.25-2
@@ -83,12 +85,14 @@ libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdouble-conversion1==3.1.0-3
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
+libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
@@ -98,7 +102,9 @@ libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
+libgflags2.2==2.2.2-1
 libglib2.0-0==2.58.3-2+deb10u2
+libgoogle-glog0v5==0.3.5-1
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u1
 libhavege1==1.9.1-7
@@ -164,11 +170,12 @@ libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u5
+libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
+libunwind8==1.2.1-10~deb10u1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
@@ -186,8 +193,8 @@ lsb-base==10.2019051400
 lsb-release==10.2019051400
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.15.3-3
-mft-oem==4.15.3-3
+mft==4.16.0-105
+mft-oem==4.16.0-105
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
@@ -203,7 +210,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u5
+openssl==1.1.1d-0+deb10u6
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
@@ -254,7 +261,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.2308
+sx-kernel==1.mlnx.4.4.2418
 sysfsutils==2.1.0+repack-5
 systemd==241-7~deb10u6
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index e83b16af1be5..5ca158e7ec5c 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -1,4 +1,4 @@
-azure-common==1.1.26
+azure-common==1.1.27
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
@@ -7,7 +7,7 @@ certifi==2020.12.5
 cffi==1.14.5
 chardet==3.0.4
 Click==7.0
-cryptography==3.4.6
+cryptography==3.4.7
 docker==4.3.1
 idna==2.10
 ijson==2.6.1
@@ -32,13 +32,13 @@ pycparser==2.20
 python-dateutil==2.8.1
 PyYAML==5.4.1
 redis==3.5.3
-regex==2020.11.13
+regex==2021.3.17
 requests==2.25.0
 scapy==2.4.4
 six==1.15.0
 tabulate==0.8.2
 thrift==0.13.0
-urllib3==1.26.3
+urllib3==1.26.4
 watchdog==0.10.3
 websocket-client==0.58.0
 xmltodict==0.12.0
\ No newline at end of file

From 88b0eabadd33a2c808ff59303d83fdf27d4263cc Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Sat, 27 Mar 2021 21:13:28 -0700
Subject: [PATCH 0304/1674] [broadcom]: Updated bcmsai to 4.3.3.3 (#7090)

To add latest SAI drop REL_4.3.3.3 to SONIC which addresses the following CSP cases:

CS00012058054: [4.3][IPinIP][TTL-PIPE] IPinIP TTL Pipe Mode is NOT working it is behaving UNIFORM mode even programed as PIPE mode
CS00011227466: [4.3] Warmboot support with tunnel encap
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index bc553755d6ee..838fd7fa225a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.1-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=n7KoEZ5wXY%2FobPAy62d9C%2BKyAkKo4PIdIAWwqnDBm3E%3D&se=2034-11-14T03%3A30%3A33Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.1-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.3_amd64.deb?sv=2019-12-12&st=2021-03-18T03%3A28%3A15Z&se=2030-03-19T03%3A28%3A00Z&sr=b&sp=r&sig=YDCGJeY4Om4%2B5tkdZN%2BvWjLGh8JhsDyfMPs%2FfHgW8nA%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=EavLNMXA6OS3s9oD34bKbdtfYHppR4egkh7V7jc4gWM%3D&se=2034-11-14T03%3A31%3A04Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.3_amd64.deb?sv=2019-12-12&st=2021-03-18T03%3A29%3A30Z&se=2030-03-19T03%3A29%3A00Z&sr=b&sp=r&sig=e5hvdlKvupLmWfNK%2B37LYUXfxNBm6Y%2F0%2Bnv2Aq8q51w%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 0269fc19c2ea4acff87c9b42c1c8105aa743a53b Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Sat, 27 Mar 2021 20:51:49 +0200
Subject: [PATCH 0305/1674] [Mellanox] Update SDK to 4.4.2508 and FW to
 xx.2008.2508 (#7141)

Fix the following issues:

Spectrum-2, Spectrum-3 | Port | Fix link issue when using 25 GbE rate between two ports while one is on Spectrum-2-based system and the other is on Spectrum-3-based system
All | warmboot | fail to upgrade from earlier SONiC versions with official SDK/FW 4.4.2306 (was on SONiC 201911)
All | What-Just-Happened | When enabling or disabling WJH under high traffic load to the host CPU, in very specific and low probability conditions, an error could occur, that may result in loss of data, channel failure or in extreme cases SW failure

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 28820016f757..0500c449a481 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2424
+MLNX_SPC_FW_VERSION = 13.2008.2508
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2424
+MLNX_SPC2_FW_VERSION = 29.2008.2508
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2424
+MLNX_SPC3_FW_VERSION = 30.2008.2508
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 3e3de6acf473..3b996a495fdf 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 3e3de6acf4736a61acb5adc42ceb1a5d09523a21
+Subproject commit 3b996a495fdf521076c3e46c6bae8a57ee2001c0
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index d8072f6c600d..0e4745522a52 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2418
+MLNX_SDK_VERSION = 4.4.2508
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 26ee7cc5f48abed35c81a17df7a7eeddc475beb9 Mon Sep 17 00:00:00 2001
From: "arheneus@marvell.com"
 <51254330+antony-rheneus@users.noreply.github.com>
Date: Tue, 30 Mar 2021 03:57:01 +0530
Subject: [PATCH 0306/1674] [marvell]: Marvell prestera kernel driver (#7066)

Build Marvell kernel driver for prestera sai sdk
Builds interrupt and dma kernel driver
Removed the older method pre-compiled kernel module debian package and its makefile
---
 platform/marvell-armhf/linux-kernel-armhf.mk  |  6 ---
 platform/marvell-armhf/linux/Makefile         | 10 ----
 platform/marvell-armhf/one-image.mk           |  2 +-
 platform/marvell-armhf/prestera.mk            | 11 ++++
 .../marvell-armhf/prestera/debian/changelog   |  5 ++
 platform/marvell-armhf/prestera/debian/compat |  1 +
 .../marvell-armhf/prestera/debian/control     | 15 ++++++
 .../debian/mrvlprestera.install.template      |  3 ++
 platform/marvell-armhf/prestera/debian/rules  | 53 +++++++++++++++++++
 platform/marvell-armhf/rules.mk               |  2 +-
 10 files changed, 90 insertions(+), 18 deletions(-)
 delete mode 100644 platform/marvell-armhf/linux-kernel-armhf.mk
 delete mode 100644 platform/marvell-armhf/linux/Makefile
 create mode 100644 platform/marvell-armhf/prestera.mk
 create mode 100644 platform/marvell-armhf/prestera/debian/changelog
 create mode 100644 platform/marvell-armhf/prestera/debian/compat
 create mode 100755 platform/marvell-armhf/prestera/debian/control
 create mode 100644 platform/marvell-armhf/prestera/debian/mrvlprestera.install.template
 create mode 100755 platform/marvell-armhf/prestera/debian/rules

diff --git a/platform/marvell-armhf/linux-kernel-armhf.mk b/platform/marvell-armhf/linux-kernel-armhf.mk
deleted file mode 100644
index ac7aa3faf19a..000000000000
--- a/platform/marvell-armhf/linux-kernel-armhf.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# linux kernel package for marvell armhf
-
-# Add platform specific DTB
-LINUX_KERNEL_DTB = linux-image-4.9.189-armhf.deb
-$(LINUX_KERNEL_DTB)_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/kernel/$(LINUX_KERNEL_DTB)
-SONIC_ONLINE_DEBS += $(LINUX_KERNEL_DTB)
diff --git a/platform/marvell-armhf/linux/Makefile b/platform/marvell-armhf/linux/Makefile
deleted file mode 100644
index dba660649abf..000000000000
--- a/platform/marvell-armhf/linux/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-LINUX_KERNEL_MRVL_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/kernel/$(LINUX_KERNEL_DTB)
-
-$(addprefix $(DEST)/, $(LINUX_KERNEL_DTB)): $(DEST)/% :
-	# get deb package
-	wget -O $(DEST)/$(LINUX_KERNEL_DTB) $(LINUX_KERNEL_MRVL_URL)
-
diff --git a/platform/marvell-armhf/one-image.mk b/platform/marvell-armhf/one-image.mk
index 44bcd9595281..b72b553487f2 100644
--- a/platform/marvell-armhf/one-image.mk
+++ b/platform/marvell-armhf/one-image.mk
@@ -4,7 +4,7 @@ SONIC_ONE_IMAGE = sonic-marvell-armhf.bin
 $(SONIC_ONE_IMAGE)_MACHINE = marvell-armhf
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
-$(SONIC_ONE_IMAGE)_INSTALLS += $(LINUX_KERNEL_DTB)
+$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_PRESTERA_DEB)
 $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(ET6448M_PLATFORM) \
 				$(NOKIA_7215_PLATFORM)
 ifeq ($(INSTALL_DEBUG_TOOLS),y)
diff --git a/platform/marvell-armhf/prestera.mk b/platform/marvell-armhf/prestera.mk
new file mode 100644
index 000000000000..2365319b9d00
--- /dev/null
+++ b/platform/marvell-armhf/prestera.mk
@@ -0,0 +1,11 @@
+# Marvell Prestera
+
+export MRVL_PRESTERA_VER = 1.0
+export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH)
+export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb
+export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git
+export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.0
+
+$(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera
+$(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
+SONIC_DPKG_DEBS += $(MRVL_PRESTERA_DEB)
diff --git a/platform/marvell-armhf/prestera/debian/changelog b/platform/marvell-armhf/prestera/debian/changelog
new file mode 100644
index 000000000000..ab8de1dfa386
--- /dev/null
+++ b/platform/marvell-armhf/prestera/debian/changelog
@@ -0,0 +1,5 @@
+mrvlprestera (1.0) unstable; urgency=low
+
+  * Prestera switch driver
+
+ -- Marvell <arheneus@marvell.com>  Fri, 19 Feb 2021 10:39:18 +0800
diff --git a/platform/marvell-armhf/prestera/debian/compat b/platform/marvell-armhf/prestera/debian/compat
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/platform/marvell-armhf/prestera/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/platform/marvell-armhf/prestera/debian/control b/platform/marvell-armhf/prestera/debian/control
new file mode 100755
index 000000000000..51cb0579a263
--- /dev/null
+++ b/platform/marvell-armhf/prestera/debian/control
@@ -0,0 +1,15 @@
+Source: mrvlprestera
+Section: unknown
+Priority: optional
+Maintainer: Marvell <arheneus@marvell.com>
+Build-Depends: debhelper (>=9)
+Standards-Version: 3.9.6
+Homepage: <insert the upstream URL, if relevant>
+#Vcs-Git: git://anonscm.debian.org/collab-maint/mrvlprestera.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mrvlprestera.git
+
+Package: mrvlprestera
+Architecture: armhf
+Homepage: <insert the upstream URL, if relevant>
+Description: 
+	kernel modules for prestera switch driver 
diff --git a/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template b/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template
new file mode 100644
index 000000000000..d0e96ab1e7d6
--- /dev/null
+++ b/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template
@@ -0,0 +1,3 @@
+mrvl-prestera/cpssEnabler/linuxNoKernelModule/drivers/mvDmaDrv.ko /lib/modules/KVERSION/kernel/extra
+mrvl-prestera/cpssEnabler/linuxNoKernelModule/drivers/mvIntDrv.ko /lib/modules/KVERSION/kernel/extra
+mrvl-prestera/platform/armhf/*	/
diff --git a/platform/marvell-armhf/prestera/debian/rules b/platform/marvell-armhf/prestera/debian/rules
new file mode 100755
index 000000000000..67692a42725c
--- /dev/null
+++ b/platform/marvell-armhf/prestera/debian/rules
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+PACKAGE_PRE_NAME := mrvlprestera
+KVERSION   ?= $(shell uname -r)
+KERNEL_SRC :=  /lib/modules/$(KVERSION)
+MOD_SRC_DIR:= $(shell pwd)
+MODULE_DIR := mrvl-prestera/cpssEnabler/linuxNoKernelModule/drivers
+
+%:
+	dh $@ --with systemd,python2,python3 --buildsystem=pybuild
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+build:
+	# get sources
+	rm -rf mrvl-prestera || true
+	git clone -b ${MRVL_PRESTERA_SRC_TAG} ${MRVL_PRESTERA_SRC_URL}
+	sed "s/KVERSION/${KVERSION}/g" /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template > /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install
+
+	make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$(MODULE_DIR)/
+
+binary: binary-arch binary-indep
+	# Nothing to do
+
+binary-arch: 
+	# Nothing to do
+
+binary-indep:
+	dh_testdir
+	dh_installdirs
+
+	# Resuming debhelper scripts
+	dh_testroot
+	dh_install
+	dh_installchangelogs
+	dh_installdocs
+	dh_systemd_enable
+	dh_installinit
+	dh_systemd_start
+	dh_link
+	dh_fixperms
+	dh_compress
+	dh_strip
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+.PHONY: build binary binary-arch binary-indep clean
diff --git a/platform/marvell-armhf/rules.mk b/platform/marvell-armhf/rules.mk
index 58b9654956f3..fd320e8caa41 100644
--- a/platform/marvell-armhf/rules.mk
+++ b/platform/marvell-armhf/rules.mk
@@ -5,9 +5,9 @@ include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/one-image.mk
-include $(PLATFORM_PATH)/linux-kernel-armhf.mk
 include $(PLATFORM_PATH)/platform-et6448m.mk
 include $(PLATFORM_PATH)/platform-nokia.mk
+include $(PLATFORM_PATH)/prestera.mk
 
 ENABLE_SYNCD_RPC = ""
 INCLUDE_MGMT_FRAMEWORK = ""

From 53ff05f9800b6565b12caef614f04d373693912c Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 26 Mar 2021 11:10:19 -0700
Subject: [PATCH 0307/1674] [Arista] add MMU configuration for Arista 7260 C64
 (#7027)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Arista-7260CX3-C64/buffers.json.j2        |    3 +
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2 |   46 +
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2 |   46 +
 .../Arista-7260CX3-C64/pg_profile_lookup.ini  |    8 +
 .../Arista-7260CX3-C64/qos.json.j2            |    1 +
 .../Arista-7260CX3-C64/sai.profile            |    2 -
 .../Arista-7260CX3-C64/sai.profile.j2         |   14 +
 ... => th2-a7260cx3-64-64x100G-t0.config.bcm} |    2 +
 .../th2-a7260cx3-64-64x100G-t1.config.bcm     | 1015 +++++++++++++++++
 9 files changed, 1135 insertions(+), 2 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
 rename device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/{th2-a7260cx3-64-64x100G.config.bcm => th2-a7260cx3-64-64x100G-t0.config.bcm} (99%)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2
new file mode 100644
index 000000000000..b67cf577ab75
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..3442612f70b2
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '5m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..2fff9cbc771b
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
new file mode 100644
index 000000000000..ed0005610b71
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff     threshold xon_offset
+  50000  5m   1248    1248 56160    -3        2496
+ 100000  5m   1248    1248 96928    -3        2496
+  50000  40m  1248    1248 96096    -3        2496
+ 100000  40m  1248    1248 177632   -3        2496
+  50000  300m 1248    1248 141856   -3        2496
+ 100000  300m 1248    1248 268736   -3        2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
deleted file mode 100644
index 2607bef50850..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G.config.bcm
-SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
new file mode 100644
index 000000000000..403c797a47f5
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
@@ -0,0 +1,14 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t0.config.bcm' -%}
+{%-     else %}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%      set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}
+SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm
similarity index 99%
rename from device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm
rename to device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm
index 13fdd280e857..faeeb4bb1ea5 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm
@@ -1011,3 +1011,5 @@ serdes_preemphasis_114=0x174507
 serdes_preemphasis_115=0x184606
 serdes_preemphasis_116=0x103706
 serdes_preemphasis_117=0x133c06
+
+mmu_init_config="MSFT-TH2-Tier0"
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm
new file mode 100644
index 000000000000..96fa6f32d633
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm
@@ -0,0 +1,1015 @@
+PHY_AN_ALLOW_PLL_CHANGE=1
+arl_clean_timeout_usec=15000000
+asf_mem_profile=2
+bcm_num_cos=10
+bcm_stat_flags=1
+bcm_stat_jumbo=9236
+cdma_timeout_usec=15000000
+core_clock_frequency=1700
+dma_desc_timeout_usec=15000000
+dpp_clock_ratio=2:3
+higig2_hdr_mode=1
+ipv6_lpm_128b_enable=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+l2xmsg_mode=1
+max_vp_lags=0
+mem_scan_enable=1
+miim_intr_enable=0
+module_64ports=1
+os=unix
+oversubscribe_mode=1
+pbmp_xport_xe=0x40003ffff0000ffffc0003fffe0001fffe
+phy_an_allow_pll_change_hg=0
+phy_an_c73_100=1
+phy_an_c73_102=1
+phy_an_c73_103=1
+phy_an_c73_104=1
+phy_an_c73_105=1
+phy_an_c73_106=1
+phy_an_c73_107=1
+phy_an_c73_108=1
+phy_an_c73_109=1
+phy_an_c73_10=1
+phy_an_c73_110=1
+phy_an_c73_111=1
+phy_an_c73_112=1
+phy_an_c73_113=1
+phy_an_c73_114=1
+phy_an_c73_115=1
+phy_an_c73_116=1
+phy_an_c73_117=1
+phy_an_c73_11=1
+phy_an_c73_12=1
+phy_an_c73_13=1
+phy_an_c73_14=1
+phy_an_c73_15=1
+phy_an_c73_16=1
+phy_an_c73_1=1
+phy_an_c73_2=1
+phy_an_c73_34=1
+phy_an_c73_35=1
+phy_an_c73_36=1
+phy_an_c73_37=1
+phy_an_c73_38=1
+phy_an_c73_39=1
+phy_an_c73_3=1
+phy_an_c73_40=1
+phy_an_c73_41=1
+phy_an_c73_42=1
+phy_an_c73_43=1
+phy_an_c73_44=1
+phy_an_c73_45=1
+phy_an_c73_46=1
+phy_an_c73_47=1
+phy_an_c73_48=1
+phy_an_c73_49=1
+phy_an_c73_4=1
+phy_an_c73_5=1
+phy_an_c73_66=1
+phy_an_c73_68=1
+phy_an_c73_69=1
+phy_an_c73_6=1
+phy_an_c73_70=1
+phy_an_c73_71=1
+phy_an_c73_72=1
+phy_an_c73_73=1
+phy_an_c73_74=1
+phy_an_c73_75=1
+phy_an_c73_76=1
+phy_an_c73_77=1
+phy_an_c73_78=1
+phy_an_c73_79=1
+phy_an_c73_7=1
+phy_an_c73_80=1
+phy_an_c73_81=1
+phy_an_c73_82=1
+phy_an_c73_83=1
+phy_an_c73_8=1
+phy_an_c73_9=1
+phy_chain_rx_lane_map_physical{1.0}=0x3210
+phy_chain_rx_lane_map_physical{101.0}=0x0123
+phy_chain_rx_lane_map_physical{105.0}=0x0123
+phy_chain_rx_lane_map_physical{109.0}=0x0123
+phy_chain_rx_lane_map_physical{113.0}=0x2301
+phy_chain_rx_lane_map_physical{117.0}=0x3210
+phy_chain_rx_lane_map_physical{121.0}=0x3210
+phy_chain_rx_lane_map_physical{125.0}=0x1203
+phy_chain_rx_lane_map_physical{129.0}=0x3210
+phy_chain_rx_lane_map_physical{13.0}=0x0321
+phy_chain_rx_lane_map_physical{133.0}=0x1032
+phy_chain_rx_lane_map_physical{137.0}=0x3210
+phy_chain_rx_lane_map_physical{141.0}=0x0123
+phy_chain_rx_lane_map_physical{145.0}=0x3210
+phy_chain_rx_lane_map_physical{149.0}=0x2310
+phy_chain_rx_lane_map_physical{153.0}=0x0132
+phy_chain_rx_lane_map_physical{157.0}=0x1302
+phy_chain_rx_lane_map_physical{161.0}=0x3021
+phy_chain_rx_lane_map_physical{165.0}=0x2031
+phy_chain_rx_lane_map_physical{169.0}=0x2031
+phy_chain_rx_lane_map_physical{17.0}=0x3210
+phy_chain_rx_lane_map_physical{173.0}=0x1302
+phy_chain_rx_lane_map_physical{177.0}=0x2031
+phy_chain_rx_lane_map_physical{181.0}=0x0213
+phy_chain_rx_lane_map_physical{185.0}=0x0213
+phy_chain_rx_lane_map_physical{189.0}=0x1302
+phy_chain_rx_lane_map_physical{193.0}=0x3120
+phy_chain_rx_lane_map_physical{197.0}=0x0231
+phy_chain_rx_lane_map_physical{201.0}=0x2031
+phy_chain_rx_lane_map_physical{205.0}=0x0213
+phy_chain_rx_lane_map_physical{209.0}=0x2013
+phy_chain_rx_lane_map_physical{21.0}=0x3021
+phy_chain_rx_lane_map_physical{213.0}=0x3021
+phy_chain_rx_lane_map_physical{217.0}=0x0231
+phy_chain_rx_lane_map_physical{221.0}=0x2031
+phy_chain_rx_lane_map_physical{225.0}=0x1203
+phy_chain_rx_lane_map_physical{229.0}=0x1230
+phy_chain_rx_lane_map_physical{233.0}=0x3021
+phy_chain_rx_lane_map_physical{237.0}=0x1032
+phy_chain_rx_lane_map_physical{241.0}=0x2301
+phy_chain_rx_lane_map_physical{245.0}=0x0321
+phy_chain_rx_lane_map_physical{249.0}=0x2301
+phy_chain_rx_lane_map_physical{25.0}=0x2301
+phy_chain_rx_lane_map_physical{253.0}=0x2301
+phy_chain_rx_lane_map_physical{257.0}=0x3210
+phy_chain_rx_lane_map_physical{29.0}=0x3021
+phy_chain_rx_lane_map_physical{33.0}=0x1302
+phy_chain_rx_lane_map_physical{37.0}=0x2031
+phy_chain_rx_lane_map_physical{41.0}=0x3021
+phy_chain_rx_lane_map_physical{45.0}=0x1023
+phy_chain_rx_lane_map_physical{49.0}=0x0213
+phy_chain_rx_lane_map_physical{5.0}=0x3201
+phy_chain_rx_lane_map_physical{53.0}=0x3201
+phy_chain_rx_lane_map_physical{57.0}=0x2013
+phy_chain_rx_lane_map_physical{61.0}=0x0213
+phy_chain_rx_lane_map_physical{65.0}=0x1203
+phy_chain_rx_lane_map_physical{69.0}=0x0213
+phy_chain_rx_lane_map_physical{73.0}=0x0213
+phy_chain_rx_lane_map_physical{77.0}=0x3120
+phy_chain_rx_lane_map_physical{81.0}=0x0213
+phy_chain_rx_lane_map_physical{85.0}=0x2031
+phy_chain_rx_lane_map_physical{89.0}=0x2031
+phy_chain_rx_lane_map_physical{9.0}=0x0321
+phy_chain_rx_lane_map_physical{93.0}=0x3120
+phy_chain_rx_lane_map_physical{97.0}=0x1203
+phy_chain_rx_polarity_flip_physical{1.0}=0x1
+phy_chain_rx_polarity_flip_physical{10.0}=0x0
+phy_chain_rx_polarity_flip_physical{100.0}=0x1
+phy_chain_rx_polarity_flip_physical{101.0}=0x1
+phy_chain_rx_polarity_flip_physical{102.0}=0x0
+phy_chain_rx_polarity_flip_physical{103.0}=0x1
+phy_chain_rx_polarity_flip_physical{104.0}=0x0
+phy_chain_rx_polarity_flip_physical{105.0}=0x1
+phy_chain_rx_polarity_flip_physical{106.0}=0x0
+phy_chain_rx_polarity_flip_physical{107.0}=0x1
+phy_chain_rx_polarity_flip_physical{108.0}=0x0
+phy_chain_rx_polarity_flip_physical{109.0}=0x0
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{110.0}=0x1
+phy_chain_rx_polarity_flip_physical{111.0}=0x0
+phy_chain_rx_polarity_flip_physical{112.0}=0x1
+phy_chain_rx_polarity_flip_physical{113.0}=0x1
+phy_chain_rx_polarity_flip_physical{114.0}=0x0
+phy_chain_rx_polarity_flip_physical{115.0}=0x1
+phy_chain_rx_polarity_flip_physical{116.0}=0x0
+phy_chain_rx_polarity_flip_physical{117.0}=0x0
+phy_chain_rx_polarity_flip_physical{118.0}=0x0
+phy_chain_rx_polarity_flip_physical{119.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x1
+phy_chain_rx_polarity_flip_physical{120.0}=0x0
+phy_chain_rx_polarity_flip_physical{121.0}=0x1
+phy_chain_rx_polarity_flip_physical{122.0}=0x0
+phy_chain_rx_polarity_flip_physical{123.0}=0x1
+phy_chain_rx_polarity_flip_physical{124.0}=0x0
+phy_chain_rx_polarity_flip_physical{125.0}=0x0
+phy_chain_rx_polarity_flip_physical{126.0}=0x1
+phy_chain_rx_polarity_flip_physical{127.0}=0x1
+phy_chain_rx_polarity_flip_physical{128.0}=0x1
+phy_chain_rx_polarity_flip_physical{129.0}=0x0
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{130.0}=0x1
+phy_chain_rx_polarity_flip_physical{131.0}=0x1
+phy_chain_rx_polarity_flip_physical{132.0}=0x0
+phy_chain_rx_polarity_flip_physical{133.0}=0x1
+phy_chain_rx_polarity_flip_physical{134.0}=0x1
+phy_chain_rx_polarity_flip_physical{135.0}=0x1
+phy_chain_rx_polarity_flip_physical{136.0}=0x0
+phy_chain_rx_polarity_flip_physical{137.0}=0x0
+phy_chain_rx_polarity_flip_physical{138.0}=0x0
+phy_chain_rx_polarity_flip_physical{139.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x0
+phy_chain_rx_polarity_flip_physical{140.0}=0x0
+phy_chain_rx_polarity_flip_physical{141.0}=0x1
+phy_chain_rx_polarity_flip_physical{142.0}=0x0
+phy_chain_rx_polarity_flip_physical{143.0}=0x1
+phy_chain_rx_polarity_flip_physical{144.0}=0x0
+phy_chain_rx_polarity_flip_physical{145.0}=0x1
+phy_chain_rx_polarity_flip_physical{146.0}=0x0
+phy_chain_rx_polarity_flip_physical{147.0}=0x1
+phy_chain_rx_polarity_flip_physical{148.0}=0x0
+phy_chain_rx_polarity_flip_physical{149.0}=0x0
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{150.0}=0x1
+phy_chain_rx_polarity_flip_physical{151.0}=0x1
+phy_chain_rx_polarity_flip_physical{152.0}=0x0
+phy_chain_rx_polarity_flip_physical{153.0}=0x0
+phy_chain_rx_polarity_flip_physical{154.0}=0x1
+phy_chain_rx_polarity_flip_physical{155.0}=0x1
+phy_chain_rx_polarity_flip_physical{156.0}=0x0
+phy_chain_rx_polarity_flip_physical{157.0}=0x0
+phy_chain_rx_polarity_flip_physical{158.0}=0x0
+phy_chain_rx_polarity_flip_physical{159.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x0
+phy_chain_rx_polarity_flip_physical{160.0}=0x0
+phy_chain_rx_polarity_flip_physical{161.0}=0x1
+phy_chain_rx_polarity_flip_physical{162.0}=0x1
+phy_chain_rx_polarity_flip_physical{163.0}=0x0
+phy_chain_rx_polarity_flip_physical{164.0}=0x1
+phy_chain_rx_polarity_flip_physical{165.0}=0x0
+phy_chain_rx_polarity_flip_physical{166.0}=0x0
+phy_chain_rx_polarity_flip_physical{167.0}=0x1
+phy_chain_rx_polarity_flip_physical{168.0}=0x1
+phy_chain_rx_polarity_flip_physical{169.0}=0x1
+phy_chain_rx_polarity_flip_physical{17.0}=0x1
+phy_chain_rx_polarity_flip_physical{170.0}=0x1
+phy_chain_rx_polarity_flip_physical{171.0}=0x0
+phy_chain_rx_polarity_flip_physical{172.0}=0x0
+phy_chain_rx_polarity_flip_physical{173.0}=0x0
+phy_chain_rx_polarity_flip_physical{174.0}=0x0
+phy_chain_rx_polarity_flip_physical{175.0}=0x1
+phy_chain_rx_polarity_flip_physical{176.0}=0x1
+phy_chain_rx_polarity_flip_physical{177.0}=0x1
+phy_chain_rx_polarity_flip_physical{178.0}=0x1
+phy_chain_rx_polarity_flip_physical{179.0}=0x0
+phy_chain_rx_polarity_flip_physical{18.0}=0x0
+phy_chain_rx_polarity_flip_physical{180.0}=0x0
+phy_chain_rx_polarity_flip_physical{181.0}=0x1
+phy_chain_rx_polarity_flip_physical{182.0}=0x1
+phy_chain_rx_polarity_flip_physical{183.0}=0x0
+phy_chain_rx_polarity_flip_physical{184.0}=0x0
+phy_chain_rx_polarity_flip_physical{185.0}=0x0
+phy_chain_rx_polarity_flip_physical{186.0}=0x0
+phy_chain_rx_polarity_flip_physical{187.0}=0x1
+phy_chain_rx_polarity_flip_physical{188.0}=0x1
+phy_chain_rx_polarity_flip_physical{189.0}=0x0
+phy_chain_rx_polarity_flip_physical{19.0}=0x1
+phy_chain_rx_polarity_flip_physical{190.0}=0x0
+phy_chain_rx_polarity_flip_physical{191.0}=0x1
+phy_chain_rx_polarity_flip_physical{192.0}=0x0
+phy_chain_rx_polarity_flip_physical{193.0}=0x0
+phy_chain_rx_polarity_flip_physical{194.0}=0x0
+phy_chain_rx_polarity_flip_physical{195.0}=0x1
+phy_chain_rx_polarity_flip_physical{196.0}=0x1
+phy_chain_rx_polarity_flip_physical{197.0}=0x1
+phy_chain_rx_polarity_flip_physical{198.0}=0x1
+phy_chain_rx_polarity_flip_physical{199.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x0
+phy_chain_rx_polarity_flip_physical{20.0}=0x0
+phy_chain_rx_polarity_flip_physical{200.0}=0x0
+phy_chain_rx_polarity_flip_physical{201.0}=0x0
+phy_chain_rx_polarity_flip_physical{202.0}=0x0
+phy_chain_rx_polarity_flip_physical{203.0}=0x1
+phy_chain_rx_polarity_flip_physical{204.0}=0x0
+phy_chain_rx_polarity_flip_physical{205.0}=0x1
+phy_chain_rx_polarity_flip_physical{206.0}=0x1
+phy_chain_rx_polarity_flip_physical{207.0}=0x0
+phy_chain_rx_polarity_flip_physical{208.0}=0x0
+phy_chain_rx_polarity_flip_physical{209.0}=0x1
+phy_chain_rx_polarity_flip_physical{21.0}=0x0
+phy_chain_rx_polarity_flip_physical{210.0}=0x1
+phy_chain_rx_polarity_flip_physical{211.0}=0x0
+phy_chain_rx_polarity_flip_physical{212.0}=0x0
+phy_chain_rx_polarity_flip_physical{213.0}=0x0
+phy_chain_rx_polarity_flip_physical{214.0}=0x0
+phy_chain_rx_polarity_flip_physical{215.0}=0x1
+phy_chain_rx_polarity_flip_physical{216.0}=0x0
+phy_chain_rx_polarity_flip_physical{217.0}=0x0
+phy_chain_rx_polarity_flip_physical{218.0}=0x0
+phy_chain_rx_polarity_flip_physical{219.0}=0x1
+phy_chain_rx_polarity_flip_physical{22.0}=0x0
+phy_chain_rx_polarity_flip_physical{220.0}=0x1
+phy_chain_rx_polarity_flip_physical{221.0}=0x0
+phy_chain_rx_polarity_flip_physical{222.0}=0x0
+phy_chain_rx_polarity_flip_physical{223.0}=0x1
+phy_chain_rx_polarity_flip_physical{224.0}=0x1
+phy_chain_rx_polarity_flip_physical{225.0}=0x1
+phy_chain_rx_polarity_flip_physical{226.0}=0x0
+phy_chain_rx_polarity_flip_physical{227.0}=0x0
+phy_chain_rx_polarity_flip_physical{228.0}=0x1
+phy_chain_rx_polarity_flip_physical{229.0}=0x0
+phy_chain_rx_polarity_flip_physical{23.0}=0x1
+phy_chain_rx_polarity_flip_physical{230.0}=0x0
+phy_chain_rx_polarity_flip_physical{231.0}=0x1
+phy_chain_rx_polarity_flip_physical{232.0}=0x1
+phy_chain_rx_polarity_flip_physical{233.0}=0x1
+phy_chain_rx_polarity_flip_physical{234.0}=0x0
+phy_chain_rx_polarity_flip_physical{235.0}=0x0
+phy_chain_rx_polarity_flip_physical{236.0}=0x0
+phy_chain_rx_polarity_flip_physical{237.0}=0x1
+phy_chain_rx_polarity_flip_physical{238.0}=0x0
+phy_chain_rx_polarity_flip_physical{239.0}=0x1
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+phy_chain_rx_polarity_flip_physical{240.0}=0x0
+phy_chain_rx_polarity_flip_physical{241.0}=0x1
+phy_chain_rx_polarity_flip_physical{242.0}=0x0
+phy_chain_rx_polarity_flip_physical{243.0}=0x1
+phy_chain_rx_polarity_flip_physical{244.0}=0x0
+phy_chain_rx_polarity_flip_physical{245.0}=0x1
+phy_chain_rx_polarity_flip_physical{246.0}=0x1
+phy_chain_rx_polarity_flip_physical{247.0}=0x1
+phy_chain_rx_polarity_flip_physical{248.0}=0x0
+phy_chain_rx_polarity_flip_physical{249.0}=0x0
+phy_chain_rx_polarity_flip_physical{25.0}=0x1
+phy_chain_rx_polarity_flip_physical{250.0}=0x1
+phy_chain_rx_polarity_flip_physical{251.0}=0x0
+phy_chain_rx_polarity_flip_physical{252.0}=0x1
+phy_chain_rx_polarity_flip_physical{253.0}=0x1
+phy_chain_rx_polarity_flip_physical{254.0}=0x0
+phy_chain_rx_polarity_flip_physical{255.0}=0x1
+phy_chain_rx_polarity_flip_physical{256.0}=0x0
+phy_chain_rx_polarity_flip_physical{257.0}=0x0
+phy_chain_rx_polarity_flip_physical{259.0}=0x0
+phy_chain_rx_polarity_flip_physical{26.0}=0x0
+phy_chain_rx_polarity_flip_physical{27.0}=0x1
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{3.0}=0x1
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x0
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_polarity_flip_physical{33.0}=0x0
+phy_chain_rx_polarity_flip_physical{34.0}=0x0
+phy_chain_rx_polarity_flip_physical{35.0}=0x1
+phy_chain_rx_polarity_flip_physical{36.0}=0x1
+phy_chain_rx_polarity_flip_physical{37.0}=0x1
+phy_chain_rx_polarity_flip_physical{38.0}=0x1
+phy_chain_rx_polarity_flip_physical{39.0}=0x0
+phy_chain_rx_polarity_flip_physical{4.0}=0x0
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+phy_chain_rx_polarity_flip_physical{41.0}=0x0
+phy_chain_rx_polarity_flip_physical{42.0}=0x1
+phy_chain_rx_polarity_flip_physical{43.0}=0x1
+phy_chain_rx_polarity_flip_physical{44.0}=0x1
+phy_chain_rx_polarity_flip_physical{45.0}=0x1
+phy_chain_rx_polarity_flip_physical{46.0}=0x0
+phy_chain_rx_polarity_flip_physical{47.0}=0x0
+phy_chain_rx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_polarity_flip_physical{49.0}=0x1
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{50.0}=0x1
+phy_chain_rx_polarity_flip_physical{51.0}=0x0
+phy_chain_rx_polarity_flip_physical{52.0}=0x0
+phy_chain_rx_polarity_flip_physical{53.0}=0x0
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x1
+phy_chain_rx_polarity_flip_physical{56.0}=0x0
+phy_chain_rx_polarity_flip_physical{57.0}=0x0
+phy_chain_rx_polarity_flip_physical{58.0}=0x0
+phy_chain_rx_polarity_flip_physical{59.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x1
+phy_chain_rx_polarity_flip_physical{61.0}=0x0
+phy_chain_rx_polarity_flip_physical{62.0}=0x0
+phy_chain_rx_polarity_flip_physical{63.0}=0x1
+phy_chain_rx_polarity_flip_physical{64.0}=0x1
+phy_chain_rx_polarity_flip_physical{65.0}=0x1
+phy_chain_rx_polarity_flip_physical{66.0}=0x1
+phy_chain_rx_polarity_flip_physical{67.0}=0x0
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_polarity_flip_physical{69.0}=0x0
+phy_chain_rx_polarity_flip_physical{7.0}=0x0
+phy_chain_rx_polarity_flip_physical{70.0}=0x0
+phy_chain_rx_polarity_flip_physical{71.0}=0x1
+phy_chain_rx_polarity_flip_physical{72.0}=0x1
+phy_chain_rx_polarity_flip_physical{73.0}=0x1
+phy_chain_rx_polarity_flip_physical{74.0}=0x1
+phy_chain_rx_polarity_flip_physical{75.0}=0x0
+phy_chain_rx_polarity_flip_physical{76.0}=0x0
+phy_chain_rx_polarity_flip_physical{77.0}=0x0
+phy_chain_rx_polarity_flip_physical{78.0}=0x0
+phy_chain_rx_polarity_flip_physical{79.0}=0x1
+phy_chain_rx_polarity_flip_physical{8.0}=0x1
+phy_chain_rx_polarity_flip_physical{80.0}=0x1
+phy_chain_rx_polarity_flip_physical{81.0}=0x1
+phy_chain_rx_polarity_flip_physical{82.0}=0x1
+phy_chain_rx_polarity_flip_physical{83.0}=0x0
+phy_chain_rx_polarity_flip_physical{84.0}=0x0
+phy_chain_rx_polarity_flip_physical{85.0}=0x1
+phy_chain_rx_polarity_flip_physical{86.0}=0x1
+phy_chain_rx_polarity_flip_physical{87.0}=0x0
+phy_chain_rx_polarity_flip_physical{88.0}=0x0
+phy_chain_rx_polarity_flip_physical{89.0}=0x0
+phy_chain_rx_polarity_flip_physical{9.0}=0x1
+phy_chain_rx_polarity_flip_physical{90.0}=0x0
+phy_chain_rx_polarity_flip_physical{91.0}=0x1
+phy_chain_rx_polarity_flip_physical{92.0}=0x1
+phy_chain_rx_polarity_flip_physical{93.0}=0x0
+phy_chain_rx_polarity_flip_physical{94.0}=0x0
+phy_chain_rx_polarity_flip_physical{95.0}=0x1
+phy_chain_rx_polarity_flip_physical{96.0}=0x0
+phy_chain_rx_polarity_flip_physical{97.0}=0x1
+phy_chain_rx_polarity_flip_physical{98.0}=0x1
+phy_chain_rx_polarity_flip_physical{99.0}=0x0
+phy_chain_tx_lane_map_physical{1.0}=0x2031
+phy_chain_tx_lane_map_physical{101.0}=0x1023
+phy_chain_tx_lane_map_physical{105.0}=0x1302
+phy_chain_tx_lane_map_physical{109.0}=0x0321
+phy_chain_tx_lane_map_physical{113.0}=0x2301
+phy_chain_tx_lane_map_physical{117.0}=0x3120
+phy_chain_tx_lane_map_physical{121.0}=0x3102
+phy_chain_tx_lane_map_physical{125.0}=0x3210
+phy_chain_tx_lane_map_physical{129.0}=0x1023
+phy_chain_tx_lane_map_physical{13.0}=0x3021
+phy_chain_tx_lane_map_physical{133.0}=0x3210
+phy_chain_tx_lane_map_physical{137.0}=0x2031
+phy_chain_tx_lane_map_physical{141.0}=0x1302
+phy_chain_tx_lane_map_physical{145.0}=0x3210
+phy_chain_tx_lane_map_physical{149.0}=0x0213
+phy_chain_tx_lane_map_physical{153.0}=0x3210
+phy_chain_tx_lane_map_physical{157.0}=0x1320
+phy_chain_tx_lane_map_physical{161.0}=0x3210
+phy_chain_tx_lane_map_physical{165.0}=0x0231
+phy_chain_tx_lane_map_physical{169.0}=0x3120
+phy_chain_tx_lane_map_physical{17.0}=0x1032
+phy_chain_tx_lane_map_physical{173.0}=0x0312
+phy_chain_tx_lane_map_physical{177.0}=0x0231
+phy_chain_tx_lane_map_physical{181.0}=0x3210
+phy_chain_tx_lane_map_physical{185.0}=0x3210
+phy_chain_tx_lane_map_physical{189.0}=0x1320
+phy_chain_tx_lane_map_physical{193.0}=0x0321
+phy_chain_tx_lane_map_physical{197.0}=0x3120
+phy_chain_tx_lane_map_physical{201.0}=0x3120
+phy_chain_tx_lane_map_physical{205.0}=0x0123
+phy_chain_tx_lane_map_physical{209.0}=0x3120
+phy_chain_tx_lane_map_physical{21.0}=0x0213
+phy_chain_tx_lane_map_physical{213.0}=0x3021
+phy_chain_tx_lane_map_physical{217.0}=0x0312
+phy_chain_tx_lane_map_physical{221.0}=0x2301
+phy_chain_tx_lane_map_physical{225.0}=0x0123
+phy_chain_tx_lane_map_physical{229.0}=0x2031
+phy_chain_tx_lane_map_physical{233.0}=0x0231
+phy_chain_tx_lane_map_physical{237.0}=0x0213
+phy_chain_tx_lane_map_physical{241.0}=0x1320
+phy_chain_tx_lane_map_physical{245.0}=0x2031
+phy_chain_tx_lane_map_physical{249.0}=0x3120
+phy_chain_tx_lane_map_physical{25.0}=0x0231
+phy_chain_tx_lane_map_physical{253.0}=0x0321
+phy_chain_tx_lane_map_physical{257.0}=0x3210
+phy_chain_tx_lane_map_physical{29.0}=0x1230
+phy_chain_tx_lane_map_physical{33.0}=0x1032
+phy_chain_tx_lane_map_physical{37.0}=0x0123
+phy_chain_tx_lane_map_physical{41.0}=0x0213
+phy_chain_tx_lane_map_physical{45.0}=0x0132
+phy_chain_tx_lane_map_physical{49.0}=0x2031
+phy_chain_tx_lane_map_physical{5.0}=0x2301
+phy_chain_tx_lane_map_physical{53.0}=0x2301
+phy_chain_tx_lane_map_physical{57.0}=0x2031
+phy_chain_tx_lane_map_physical{61.0}=0x2031
+phy_chain_tx_lane_map_physical{65.0}=0x1230
+phy_chain_tx_lane_map_physical{69.0}=0x2013
+phy_chain_tx_lane_map_physical{73.0}=0x0213
+phy_chain_tx_lane_map_physical{77.0}=0x2310
+phy_chain_tx_lane_map_physical{81.0}=0x0321
+phy_chain_tx_lane_map_physical{85.0}=0x2013
+phy_chain_tx_lane_map_physical{89.0}=0x0213
+phy_chain_tx_lane_map_physical{9.0}=0x3012
+phy_chain_tx_lane_map_physical{93.0}=0x3102
+phy_chain_tx_lane_map_physical{97.0}=0x3210
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{10.0}=0x1
+phy_chain_tx_polarity_flip_physical{100.0}=0x0
+phy_chain_tx_polarity_flip_physical{101.0}=0x0
+phy_chain_tx_polarity_flip_physical{102.0}=0x1
+phy_chain_tx_polarity_flip_physical{103.0}=0x0
+phy_chain_tx_polarity_flip_physical{104.0}=0x0
+phy_chain_tx_polarity_flip_physical{105.0}=0x0
+phy_chain_tx_polarity_flip_physical{106.0}=0x1
+phy_chain_tx_polarity_flip_physical{107.0}=0x1
+phy_chain_tx_polarity_flip_physical{108.0}=0x1
+phy_chain_tx_polarity_flip_physical{109.0}=0x0
+phy_chain_tx_polarity_flip_physical{11.0}=0x1
+phy_chain_tx_polarity_flip_physical{110.0}=0x0
+phy_chain_tx_polarity_flip_physical{111.0}=0x0
+phy_chain_tx_polarity_flip_physical{112.0}=0x1
+phy_chain_tx_polarity_flip_physical{113.0}=0x1
+phy_chain_tx_polarity_flip_physical{114.0}=0x1
+phy_chain_tx_polarity_flip_physical{115.0}=0x1
+phy_chain_tx_polarity_flip_physical{116.0}=0x0
+phy_chain_tx_polarity_flip_physical{117.0}=0x1
+phy_chain_tx_polarity_flip_physical{118.0}=0x0
+phy_chain_tx_polarity_flip_physical{119.0}=0x0
+phy_chain_tx_polarity_flip_physical{12.0}=0x0
+phy_chain_tx_polarity_flip_physical{120.0}=0x0
+phy_chain_tx_polarity_flip_physical{121.0}=0x0
+phy_chain_tx_polarity_flip_physical{122.0}=0x0
+phy_chain_tx_polarity_flip_physical{123.0}=0x0
+phy_chain_tx_polarity_flip_physical{124.0}=0x1
+phy_chain_tx_polarity_flip_physical{125.0}=0x0
+phy_chain_tx_polarity_flip_physical{126.0}=0x1
+phy_chain_tx_polarity_flip_physical{127.0}=0x1
+phy_chain_tx_polarity_flip_physical{128.0}=0x1
+phy_chain_tx_polarity_flip_physical{129.0}=0x1
+phy_chain_tx_polarity_flip_physical{13.0}=0x0
+phy_chain_tx_polarity_flip_physical{130.0}=0x0
+phy_chain_tx_polarity_flip_physical{131.0}=0x1
+phy_chain_tx_polarity_flip_physical{132.0}=0x0
+phy_chain_tx_polarity_flip_physical{133.0}=0x1
+phy_chain_tx_polarity_flip_physical{134.0}=0x1
+phy_chain_tx_polarity_flip_physical{135.0}=0x1
+phy_chain_tx_polarity_flip_physical{136.0}=0x1
+phy_chain_tx_polarity_flip_physical{137.0}=0x1
+phy_chain_tx_polarity_flip_physical{138.0}=0x1
+phy_chain_tx_polarity_flip_physical{139.0}=0x1
+phy_chain_tx_polarity_flip_physical{14.0}=0x1
+phy_chain_tx_polarity_flip_physical{140.0}=0x1
+phy_chain_tx_polarity_flip_physical{141.0}=0x0
+phy_chain_tx_polarity_flip_physical{142.0}=0x1
+phy_chain_tx_polarity_flip_physical{143.0}=0x1
+phy_chain_tx_polarity_flip_physical{144.0}=0x1
+phy_chain_tx_polarity_flip_physical{145.0}=0x1
+phy_chain_tx_polarity_flip_physical{146.0}=0x1
+phy_chain_tx_polarity_flip_physical{147.0}=0x1
+phy_chain_tx_polarity_flip_physical{148.0}=0x0
+phy_chain_tx_polarity_flip_physical{149.0}=0x1
+phy_chain_tx_polarity_flip_physical{15.0}=0x0
+phy_chain_tx_polarity_flip_physical{150.0}=0x0
+phy_chain_tx_polarity_flip_physical{151.0}=0x0
+phy_chain_tx_polarity_flip_physical{152.0}=0x0
+phy_chain_tx_polarity_flip_physical{153.0}=0x1
+phy_chain_tx_polarity_flip_physical{154.0}=0x0
+phy_chain_tx_polarity_flip_physical{155.0}=0x0
+phy_chain_tx_polarity_flip_physical{156.0}=0x0
+phy_chain_tx_polarity_flip_physical{157.0}=0x0
+phy_chain_tx_polarity_flip_physical{158.0}=0x0
+phy_chain_tx_polarity_flip_physical{159.0}=0x0
+phy_chain_tx_polarity_flip_physical{16.0}=0x0
+phy_chain_tx_polarity_flip_physical{160.0}=0x0
+phy_chain_tx_polarity_flip_physical{161.0}=0x0
+phy_chain_tx_polarity_flip_physical{162.0}=0x1
+phy_chain_tx_polarity_flip_physical{163.0}=0x1
+phy_chain_tx_polarity_flip_physical{164.0}=0x0
+phy_chain_tx_polarity_flip_physical{165.0}=0x1
+phy_chain_tx_polarity_flip_physical{166.0}=0x1
+phy_chain_tx_polarity_flip_physical{167.0}=0x1
+phy_chain_tx_polarity_flip_physical{168.0}=0x0
+phy_chain_tx_polarity_flip_physical{169.0}=0x0
+phy_chain_tx_polarity_flip_physical{17.0}=0x0
+phy_chain_tx_polarity_flip_physical{170.0}=0x1
+phy_chain_tx_polarity_flip_physical{171.0}=0x1
+phy_chain_tx_polarity_flip_physical{172.0}=0x1
+phy_chain_tx_polarity_flip_physical{173.0}=0x0
+phy_chain_tx_polarity_flip_physical{174.0}=0x0
+phy_chain_tx_polarity_flip_physical{175.0}=0x1
+phy_chain_tx_polarity_flip_physical{176.0}=0x0
+phy_chain_tx_polarity_flip_physical{177.0}=0x1
+phy_chain_tx_polarity_flip_physical{178.0}=0x0
+phy_chain_tx_polarity_flip_physical{179.0}=0x0
+phy_chain_tx_polarity_flip_physical{18.0}=0x1
+phy_chain_tx_polarity_flip_physical{180.0}=0x0
+phy_chain_tx_polarity_flip_physical{181.0}=0x0
+phy_chain_tx_polarity_flip_physical{182.0}=0x0
+phy_chain_tx_polarity_flip_physical{183.0}=0x0
+phy_chain_tx_polarity_flip_physical{184.0}=0x1
+phy_chain_tx_polarity_flip_physical{185.0}=0x0
+phy_chain_tx_polarity_flip_physical{186.0}=0x1
+phy_chain_tx_polarity_flip_physical{187.0}=0x1
+phy_chain_tx_polarity_flip_physical{188.0}=0x1
+phy_chain_tx_polarity_flip_physical{189.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x1
+phy_chain_tx_polarity_flip_physical{190.0}=0x0
+phy_chain_tx_polarity_flip_physical{191.0}=0x0
+phy_chain_tx_polarity_flip_physical{192.0}=0x0
+phy_chain_tx_polarity_flip_physical{193.0}=0x1
+phy_chain_tx_polarity_flip_physical{194.0}=0x1
+phy_chain_tx_polarity_flip_physical{195.0}=0x1
+phy_chain_tx_polarity_flip_physical{196.0}=0x0
+phy_chain_tx_polarity_flip_physical{197.0}=0x0
+phy_chain_tx_polarity_flip_physical{198.0}=0x1
+phy_chain_tx_polarity_flip_physical{199.0}=0x1
+phy_chain_tx_polarity_flip_physical{2.0}=0x1
+phy_chain_tx_polarity_flip_physical{20.0}=0x1
+phy_chain_tx_polarity_flip_physical{200.0}=0x1
+phy_chain_tx_polarity_flip_physical{201.0}=0x1
+phy_chain_tx_polarity_flip_physical{202.0}=0x1
+phy_chain_tx_polarity_flip_physical{203.0}=0x1
+phy_chain_tx_polarity_flip_physical{204.0}=0x1
+phy_chain_tx_polarity_flip_physical{205.0}=0x0
+phy_chain_tx_polarity_flip_physical{206.0}=0x1
+phy_chain_tx_polarity_flip_physical{207.0}=0x1
+phy_chain_tx_polarity_flip_physical{208.0}=0x1
+phy_chain_tx_polarity_flip_physical{209.0}=0x1
+phy_chain_tx_polarity_flip_physical{21.0}=0x0
+phy_chain_tx_polarity_flip_physical{210.0}=0x1
+phy_chain_tx_polarity_flip_physical{211.0}=0x1
+phy_chain_tx_polarity_flip_physical{212.0}=0x0
+phy_chain_tx_polarity_flip_physical{213.0}=0x0
+phy_chain_tx_polarity_flip_physical{214.0}=0x1
+phy_chain_tx_polarity_flip_physical{215.0}=0x0
+phy_chain_tx_polarity_flip_physical{216.0}=0x1
+phy_chain_tx_polarity_flip_physical{217.0}=0x1
+phy_chain_tx_polarity_flip_physical{218.0}=0x1
+phy_chain_tx_polarity_flip_physical{219.0}=0x0
+phy_chain_tx_polarity_flip_physical{22.0}=0x0
+phy_chain_tx_polarity_flip_physical{220.0}=0x1
+phy_chain_tx_polarity_flip_physical{221.0}=0x0
+phy_chain_tx_polarity_flip_physical{222.0}=0x0
+phy_chain_tx_polarity_flip_physical{223.0}=0x0
+phy_chain_tx_polarity_flip_physical{224.0}=0x1
+phy_chain_tx_polarity_flip_physical{225.0}=0x1
+phy_chain_tx_polarity_flip_physical{226.0}=0x1
+phy_chain_tx_polarity_flip_physical{227.0}=0x1
+phy_chain_tx_polarity_flip_physical{228.0}=0x0
+phy_chain_tx_polarity_flip_physical{229.0}=0x0
+phy_chain_tx_polarity_flip_physical{23.0}=0x0
+phy_chain_tx_polarity_flip_physical{230.0}=0x1
+phy_chain_tx_polarity_flip_physical{231.0}=0x1
+phy_chain_tx_polarity_flip_physical{232.0}=0x1
+phy_chain_tx_polarity_flip_physical{233.0}=0x0
+phy_chain_tx_polarity_flip_physical{234.0}=0x0
+phy_chain_tx_polarity_flip_physical{235.0}=0x0
+phy_chain_tx_polarity_flip_physical{236.0}=0x0
+phy_chain_tx_polarity_flip_physical{237.0}=0x1
+phy_chain_tx_polarity_flip_physical{238.0}=0x1
+phy_chain_tx_polarity_flip_physical{239.0}=0x1
+phy_chain_tx_polarity_flip_physical{24.0}=0x0
+phy_chain_tx_polarity_flip_physical{240.0}=0x0
+phy_chain_tx_polarity_flip_physical{241.0}=0x1
+phy_chain_tx_polarity_flip_physical{242.0}=0x1
+phy_chain_tx_polarity_flip_physical{243.0}=0x1
+phy_chain_tx_polarity_flip_physical{244.0}=0x0
+phy_chain_tx_polarity_flip_physical{245.0}=0x1
+phy_chain_tx_polarity_flip_physical{246.0}=0x1
+phy_chain_tx_polarity_flip_physical{247.0}=0x1
+phy_chain_tx_polarity_flip_physical{248.0}=0x1
+phy_chain_tx_polarity_flip_physical{249.0}=0x1
+phy_chain_tx_polarity_flip_physical{25.0}=0x1
+phy_chain_tx_polarity_flip_physical{250.0}=0x0
+phy_chain_tx_polarity_flip_physical{251.0}=0x0
+phy_chain_tx_polarity_flip_physical{252.0}=0x0
+phy_chain_tx_polarity_flip_physical{253.0}=0x1
+phy_chain_tx_polarity_flip_physical{254.0}=0x1
+phy_chain_tx_polarity_flip_physical{255.0}=0x1
+phy_chain_tx_polarity_flip_physical{256.0}=0x0
+phy_chain_tx_polarity_flip_physical{257.0}=0x0
+phy_chain_tx_polarity_flip_physical{259.0}=0x0
+phy_chain_tx_polarity_flip_physical{26.0}=0x0
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x0
+phy_chain_tx_polarity_flip_physical{29.0}=0x1
+phy_chain_tx_polarity_flip_physical{3.0}=0x1
+phy_chain_tx_polarity_flip_physical{30.0}=0x1
+phy_chain_tx_polarity_flip_physical{31.0}=0x1
+phy_chain_tx_polarity_flip_physical{32.0}=0x0
+phy_chain_tx_polarity_flip_physical{33.0}=0x0
+phy_chain_tx_polarity_flip_physical{34.0}=0x0
+phy_chain_tx_polarity_flip_physical{35.0}=0x0
+phy_chain_tx_polarity_flip_physical{36.0}=0x1
+phy_chain_tx_polarity_flip_physical{37.0}=0x1
+phy_chain_tx_polarity_flip_physical{38.0}=0x1
+phy_chain_tx_polarity_flip_physical{39.0}=0x1
+phy_chain_tx_polarity_flip_physical{4.0}=0x1
+phy_chain_tx_polarity_flip_physical{40.0}=0x0
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x0
+phy_chain_tx_polarity_flip_physical{43.0}=0x0
+phy_chain_tx_polarity_flip_physical{44.0}=0x0
+phy_chain_tx_polarity_flip_physical{45.0}=0x1
+phy_chain_tx_polarity_flip_physical{46.0}=0x0
+phy_chain_tx_polarity_flip_physical{47.0}=0x1
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_tx_polarity_flip_physical{49.0}=0x0
+phy_chain_tx_polarity_flip_physical{5.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x1
+phy_chain_tx_polarity_flip_physical{53.0}=0x0
+phy_chain_tx_polarity_flip_physical{54.0}=0x1
+phy_chain_tx_polarity_flip_physical{55.0}=0x1
+phy_chain_tx_polarity_flip_physical{56.0}=0x0
+phy_chain_tx_polarity_flip_physical{57.0}=0x0
+phy_chain_tx_polarity_flip_physical{58.0}=0x1
+phy_chain_tx_polarity_flip_physical{59.0}=0x1
+phy_chain_tx_polarity_flip_physical{6.0}=0x1
+phy_chain_tx_polarity_flip_physical{60.0}=0x1
+phy_chain_tx_polarity_flip_physical{61.0}=0x0
+phy_chain_tx_polarity_flip_physical{62.0}=0x1
+phy_chain_tx_polarity_flip_physical{63.0}=0x1
+phy_chain_tx_polarity_flip_physical{64.0}=0x1
+phy_chain_tx_polarity_flip_physical{65.0}=0x0
+phy_chain_tx_polarity_flip_physical{66.0}=0x1
+phy_chain_tx_polarity_flip_physical{67.0}=0x1
+phy_chain_tx_polarity_flip_physical{68.0}=0x0
+phy_chain_tx_polarity_flip_physical{69.0}=0x1
+phy_chain_tx_polarity_flip_physical{7.0}=0x1
+phy_chain_tx_polarity_flip_physical{70.0}=0x1
+phy_chain_tx_polarity_flip_physical{71.0}=0x1
+phy_chain_tx_polarity_flip_physical{72.0}=0x0
+phy_chain_tx_polarity_flip_physical{73.0}=0x1
+phy_chain_tx_polarity_flip_physical{74.0}=0x0
+phy_chain_tx_polarity_flip_physical{75.0}=0x0
+phy_chain_tx_polarity_flip_physical{76.0}=0x0
+phy_chain_tx_polarity_flip_physical{77.0}=0x0
+phy_chain_tx_polarity_flip_physical{78.0}=0x0
+phy_chain_tx_polarity_flip_physical{79.0}=0x1
+phy_chain_tx_polarity_flip_physical{8.0}=0x0
+phy_chain_tx_polarity_flip_physical{80.0}=0x0
+phy_chain_tx_polarity_flip_physical{81.0}=0x1
+phy_chain_tx_polarity_flip_physical{82.0}=0x1
+phy_chain_tx_polarity_flip_physical{83.0}=0x1
+phy_chain_tx_polarity_flip_physical{84.0}=0x0
+phy_chain_tx_polarity_flip_physical{85.0}=0x1
+phy_chain_tx_polarity_flip_physical{86.0}=0x0
+phy_chain_tx_polarity_flip_physical{87.0}=0x0
+phy_chain_tx_polarity_flip_physical{88.0}=0x0
+phy_chain_tx_polarity_flip_physical{89.0}=0x1
+phy_chain_tx_polarity_flip_physical{9.0}=0x0
+phy_chain_tx_polarity_flip_physical{90.0}=0x1
+phy_chain_tx_polarity_flip_physical{91.0}=0x1
+phy_chain_tx_polarity_flip_physical{92.0}=0x0
+phy_chain_tx_polarity_flip_physical{93.0}=0x0
+phy_chain_tx_polarity_flip_physical{94.0}=0x0
+phy_chain_tx_polarity_flip_physical{95.0}=0x0
+phy_chain_tx_polarity_flip_physical{96.0}=0x0
+phy_chain_tx_polarity_flip_physical{97.0}=0x0
+phy_chain_tx_polarity_flip_physical{98.0}=0x1
+phy_chain_tx_polarity_flip_physical{99.0}=0x1
+port_init_autoneg_100=0
+port_init_autoneg_102=0
+port_init_autoneg_103=0
+port_init_autoneg_104=0
+port_init_autoneg_105=0
+port_init_autoneg_106=0
+port_init_autoneg_107=0
+port_init_autoneg_108=0
+port_init_autoneg_109=0
+port_init_autoneg_10=0
+port_init_autoneg_110=0
+port_init_autoneg_111=0
+port_init_autoneg_112=0
+port_init_autoneg_113=0
+port_init_autoneg_114=0
+port_init_autoneg_115=0
+port_init_autoneg_116=0
+port_init_autoneg_117=0
+port_init_autoneg_11=0
+port_init_autoneg_12=0
+port_init_autoneg_13=0
+port_init_autoneg_14=0
+port_init_autoneg_15=0
+port_init_autoneg_16=0
+port_init_autoneg_1=0
+port_init_autoneg_2=0
+port_init_autoneg_34=0
+port_init_autoneg_35=0
+port_init_autoneg_36=0
+port_init_autoneg_37=0
+port_init_autoneg_38=0
+port_init_autoneg_39=0
+port_init_autoneg_3=0
+port_init_autoneg_40=0
+port_init_autoneg_41=0
+port_init_autoneg_42=0
+port_init_autoneg_43=0
+port_init_autoneg_44=0
+port_init_autoneg_45=0
+port_init_autoneg_46=0
+port_init_autoneg_47=0
+port_init_autoneg_48=0
+port_init_autoneg_49=0
+port_init_autoneg_4=0
+port_init_autoneg_5=0
+port_init_autoneg_66=0
+port_init_autoneg_68=0
+port_init_autoneg_69=0
+port_init_autoneg_6=0
+port_init_autoneg_70=0
+port_init_autoneg_71=0
+port_init_autoneg_72=0
+port_init_autoneg_73=0
+port_init_autoneg_74=0
+port_init_autoneg_75=0
+port_init_autoneg_76=0
+port_init_autoneg_77=0
+port_init_autoneg_78=0
+port_init_autoneg_79=0
+port_init_autoneg_7=0
+port_init_autoneg_80=0
+port_init_autoneg_81=0
+port_init_autoneg_82=0
+port_init_autoneg_83=0
+port_init_autoneg_8=0
+port_init_autoneg_9=0
+port_init_cl72_hg=1
+port_phy_addr_100=0xff
+port_phy_addr_102=0xff
+port_phy_addr_103=0xff
+port_phy_addr_104=0xff
+port_phy_addr_105=0xff
+port_phy_addr_106=0xff
+port_phy_addr_107=0xff
+port_phy_addr_108=0xff
+port_phy_addr_109=0xff
+port_phy_addr_10=0xff
+port_phy_addr_110=0xff
+port_phy_addr_111=0xff
+port_phy_addr_112=0xff
+port_phy_addr_113=0xff
+port_phy_addr_114=0xff
+port_phy_addr_115=0xff
+port_phy_addr_116=0xff
+port_phy_addr_117=0xff
+port_phy_addr_11=0xff
+port_phy_addr_12=0xff
+port_phy_addr_13=0xff
+port_phy_addr_14=0xff
+port_phy_addr_15=0xff
+port_phy_addr_16=0xff
+port_phy_addr_1=0xff
+port_phy_addr_2=0xff
+port_phy_addr_34=0xff
+port_phy_addr_35=0xff
+port_phy_addr_36=0xff
+port_phy_addr_37=0xff
+port_phy_addr_38=0xff
+port_phy_addr_39=0xff
+port_phy_addr_3=0xff
+port_phy_addr_40=0xff
+port_phy_addr_41=0xff
+port_phy_addr_42=0xff
+port_phy_addr_43=0xff
+port_phy_addr_44=0xff
+port_phy_addr_45=0xff
+port_phy_addr_46=0xff
+port_phy_addr_47=0xff
+port_phy_addr_48=0xff
+port_phy_addr_49=0xff
+port_phy_addr_4=0xff
+port_phy_addr_5=0xff
+port_phy_addr_66=0xff
+port_phy_addr_68=0xff
+port_phy_addr_69=0xff
+port_phy_addr_6=0xff
+port_phy_addr_70=0xff
+port_phy_addr_71=0xff
+port_phy_addr_72=0xff
+port_phy_addr_73=0xff
+port_phy_addr_74=0xff
+port_phy_addr_75=0xff
+port_phy_addr_76=0xff
+port_phy_addr_77=0xff
+port_phy_addr_78=0xff
+port_phy_addr_79=0xff
+port_phy_addr_7=0xff
+port_phy_addr_80=0xff
+port_phy_addr_81=0xff
+port_phy_addr_82=0xff
+port_phy_addr_83=0xff
+port_phy_addr_8=0xff
+port_phy_addr_9=0xff
+portmap_100=259:10
+portmap_101=262:10
+portmap_102=217:100
+portmap_103=213:100
+portmap_104=229:100
+portmap_105=237:100
+portmap_106=249:100
+portmap_107=245:100
+portmap_108=209:100
+portmap_109=221:100
+portmap_10=29:100
+portmap_110=233:100
+portmap_111=225:100
+portmap_112=241:100
+portmap_113=253:100
+portmap_114=197:100
+portmap_115=205:100
+portmap_116=201:100
+portmap_117=193:100
+portmap_11=41:100
+portmap_12=33:100
+portmap_134=263:10
+portmap_13=57:100
+portmap_14=53:100
+portmap_15=49:100
+portmap_16=61:100
+portmap_1=5:100
+portmap_2=13:100
+portmap_33=260:10
+portmap_34=77:100
+portmap_35=65:100
+portmap_36=85:100
+portmap_37=89:100
+portmap_38=109:100
+portmap_39=97:100
+portmap_3=25:100
+portmap_40=69:100
+portmap_41=73:100
+portmap_42=93:100
+portmap_43=81:100
+portmap_44=101:100
+portmap_45=105:100
+portmap_46=117:100
+portmap_47=121:100
+portmap_48=125:100
+portmap_49=113:100
+portmap_4=21:100
+portmap_5=37:100
+portmap_66=257:10
+portmap_67=261:10
+portmap_68=149:100
+portmap_69=153:100
+portmap_6=45:100
+portmap_70=173:100
+portmap_71=161:100
+portmap_72=181:100
+portmap_73=185:100
+portmap_74=157:100
+portmap_75=145:100
+portmap_76=165:100
+portmap_77=169:100
+portmap_78=189:100
+portmap_79=177:100
+portmap_7=9:100
+portmap_80=141:100
+portmap_81=133:100
+portmap_82=129:100
+portmap_83=137:100
+portmap_8=1:100
+portmap_9=17:100
+robust_hash_disable_egress_vlan=1
+robust_hash_disable_mpls=1
+robust_hash_disable_vlan=1
+stable_size=0x5500000
+stable_size=0x5500000
+tdma_timeout_usec=15000000
+tslam_timeout_usec=15000000
+
+# tuning parameters
+serdes_preemphasis_1=0x184606
+serdes_preemphasis_2=0x164108
+serdes_preemphasis_3=0x164308
+serdes_preemphasis_4=0x144108
+serdes_preemphasis_5=0x144108
+serdes_preemphasis_6=0x164106
+serdes_preemphasis_7=0x184507
+serdes_preemphasis_8=0x184606
+serdes_preemphasis_9=0x184507
+serdes_preemphasis_10=0x194407
+serdes_preemphasis_11=0x194407
+serdes_preemphasis_12=0x184507
+serdes_preemphasis_13=0x144108
+serdes_preemphasis_14=0x144108
+serdes_preemphasis_15=0x194407
+serdes_preemphasis_16=0x194407
+serdes_preemphasis_34=0x184408
+serdes_preemphasis_35=0x184606
+serdes_preemphasis_36=0x164308
+serdes_preemphasis_37=0x184606
+serdes_preemphasis_38=0x164108
+serdes_preemphasis_39=0x184606
+serdes_preemphasis_40=0xe3206
+serdes_preemphasis_41=0xe3205
+serdes_preemphasis_42=0x103a06
+serdes_preemphasis_43=0xe3205
+serdes_preemphasis_44=0x184606
+serdes_preemphasis_45=0x184507
+serdes_preemphasis_46=0x144108
+serdes_preemphasis_47=0x103a07
+serdes_preemphasis_48=0x194407
+serdes_preemphasis_49=0x194407
+serdes_preemphasis_66=0x43004
+serdes_preemphasis_68=0x164308
+serdes_preemphasis_69=0x164408
+serdes_preemphasis_70=0xe3206
+serdes_preemphasis_71=0xe3205
+serdes_preemphasis_72=0xe3205
+serdes_preemphasis_73=0xe3206
+serdes_preemphasis_74=0x164108
+serdes_preemphasis_75=0x184606
+serdes_preemphasis_76=0x164608
+serdes_preemphasis_77=0x184507
+serdes_preemphasis_78=0x184507
+serdes_preemphasis_79=0x184606
+serdes_preemphasis_80=0x184606
+serdes_preemphasis_81=0x184407
+serdes_preemphasis_82=0x103706
+serdes_preemphasis_83=0x103706
+serdes_preemphasis_100=0x43004
+serdes_preemphasis_102=0x184408
+serdes_preemphasis_103=0x184606
+serdes_preemphasis_104=0x184606
+serdes_preemphasis_105=0x16410a
+serdes_preemphasis_106=0x184408
+serdes_preemphasis_107=0x194308
+serdes_preemphasis_108=0x144108
+serdes_preemphasis_109=0x144108
+serdes_preemphasis_110=0x144108
+serdes_preemphasis_111=0x144108
+serdes_preemphasis_112=0x164608
+serdes_preemphasis_113=0x164608
+serdes_preemphasis_114=0x174507
+serdes_preemphasis_115=0x184606
+serdes_preemphasis_116=0x103706
+serdes_preemphasis_117=0x133c06
+
+mmu_init_config="MSFT-TH2-Tier1"

From 5e5b69c64da97b2190a4679d341c06490c00483b Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 28 Mar 2021 02:56:48 +0800
Subject: [PATCH 0308/1674] [Mellanox] Use softlink for sfputils on MSN4410
 platform (#7092)

The file device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py is not a software link for device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py. And it is still using python2 syntex which causes some SFP CLI error. The PR is to change it to a softlink and add 4410 support in device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py.
---
 .../x86_64-mlnx_msn2700-r0/plugins/sfputil.py |   9 +-
 .../x86_64-mlnx_msn4410-r0/plugins/sfputil.py | 656 +-----------------
 2 files changed, 4 insertions(+), 661 deletions(-)
 mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
index 64618a0e5a21..2cac9e5e45d7 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -4,7 +4,6 @@
 #
 
 try:
-    import time
     import subprocess
     from sonic_sfp.sfputilbase import *
     import syslog
@@ -44,7 +43,8 @@
 platform_dict = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn2100-r0': 1,
                  'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn3420-r0': 5,
                  'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4,
-                 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c': 4, 'x86_64-mlnx_msn4700-r0': 0}
+                 'x86_64-mlnx_msn4410-r0': 0, 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c': 4, 
+                 'x86_64-mlnx_msn4700-r0': 0}
 port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1),
                             (0, 18, 21, 22, 1), (0, 0, 63, 64, 1), (0, 48, 59, 60, 1)]
 
@@ -187,8 +187,7 @@ def reset(self, port_num):
             print("Error! Unable to set LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output))
             return False
 
-        return False
-
+ 
     def get_transceiver_change_event(self, timeout=0):
         phy_port_dict = {}
         status = True
@@ -352,7 +351,6 @@ def get_transceiver_info_dict(self, port_num):
             if port_num in self.qsfp_ports:
                 offset = 128
                 vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
-                cable_length_width = XCVR_CABLE_LENGTH_WIDTH_QSFP
                 interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
                 sfp_type = 'QSFP'
 
@@ -364,7 +362,6 @@ def get_transceiver_info_dict(self, port_num):
             else:
                 offset = 0
                 vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
-                cable_length_width = XCVR_CABLE_LENGTH_WIDTH_SFP
                 interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
                 sfp_type = 'SFP'
 
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
deleted file mode 100644
index c94b65881fe9..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
+++ /dev/null
@@ -1,655 +0,0 @@
-# sfputil.py
-#
-# Platform-specific SFP transceiver interface for SONiC
-#
-
-try:
-    import subprocess
-    from sonic_sfp.sfputilbase import *
-    import syslog
-except ImportError as e:
-    raise ImportError("%s - required module not found" % str(e))
-
-# sfp supports dom
-XCVR_DOM_CAPABILITY_DOM_SUPPORT_BIT = 0x40
-
-# sfp module threshold offset and width
-SFP_MODULE_THRESHOLD_OFFSET = 0
-SFP_MODULE_THRESHOLD_WIDTH = 56
-
-# I2C page size for sfp
-SFP_I2C_PAGE_SIZE = 256
-
-# parameters for DB connection 
-REDIS_TIMEOUT_USECS = 0
-
-# parameters for SFP presence
-SFP_STATUS_INSERTED = '1'
-
-# system level event/error
-EVENT_ON_ALL_SFP = '-1'
-SYSTEM_NOT_READY = 'system_not_ready'
-SYSTEM_READY = 'system_become_ready'
-SYSTEM_FAIL = 'system_fail'
-
-GET_PLATFORM_CMD = "sonic-cfggen -d -v DEVICE_METADATA.localhost.platform"
-
-# Ethernet<n> <=> sfp<n+SFP_PORT_NAME_OFFSET>
-SFP_PORT_NAME_OFFSET = 0
-SFP_PORT_NAME_CONVENTION = "sfp{}"
-
-# magic code defnition for port number, qsfp port position of each platform
-# port_position_tuple = (PORT_START, QSFP_PORT_START, PORT_END, PORT_IN_BLOCK, EEPROM_OFFSET)
-platform_dict = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn3420-r0':5, 'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4, 'x86_64-mlnx_msn4410-r0': 0, 'x86_64-mlnx_msn4600c':4, 'x86_64-mlnx_msn4700-r0': 0}
-port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1), (0, 18, 21, 22, 1), (0, 0, 63, 64, 1), (0, 48, 59, 60, 1)]
-
-def log_info(msg, also_print_to_console=False):
-    syslog.openlog("sfputil")
-    syslog.syslog(syslog.LOG_INFO, msg)
-    syslog.closelog()
-
-def log_err(msg, also_print_to_console=False):
-    syslog.openlog("sfputil")
-    syslog.syslog(syslog.LOG_ERR, msg)
-    syslog.closelog()
-
-class SfpUtil(SfpUtilBase):
-    """Platform-specific SfpUtil class"""
-    PORT_START = 0
-    QSFP_PORT_START = 0
-    PORT_END = 0
-    PORTS_IN_BLOCK = 0
-    EEPROM_OFFSET = 0
-
-    db_sel = None
-    db_sel_timeout = None
-    db_sel_object = None
-    db_sel_tbl = None
-    state_db = None
-    sfpd_status_tbl = None
-
-    @property
-    def port_start(self):
-        return self.PORT_START
-
-    @property
-    def port_end(self):
-        return self.PORT_END
-
-    @property
-    def qsfp_ports(self):
-        return range(self.QSFP_PORT_START, self.PORTS_IN_BLOCK + 1)
-
-    @property
-    def port_to_eeprom_mapping(self):
-        print "dependency on sysfs has been removed"
-        raise Exception() 
-
-    def get_port_position_tuple_by_platform_name(self):
-        p = subprocess.Popen(GET_PLATFORM_CMD, shell=True, stdout=subprocess.PIPE)
-        out, err = p.communicate()
-        position_tuple = port_position_tuple_list[platform_dict[out.rstrip('\n')]]
-        return position_tuple
-
-    def __init__(self):
-        port_position_tuple = self.get_port_position_tuple_by_platform_name()
-        self.PORT_START = port_position_tuple[0] + 1
-        self.QSFP_PORT_START = port_position_tuple[1] + 1
-        self.PORT_END = port_position_tuple[2] + 1
-        self.PORTS_IN_BLOCK = port_position_tuple[3]
-        self.EEPROM_OFFSET = port_position_tuple[4]
-        self.mlnx_sfpd_started = False
-
-        SfpUtilBase.__init__(self)
-
-    def get_presence(self, port_num):
-        presence = False
-
-        # Check for invalid port_num
-        if port_num < self.port_start or port_num > self.port_end:
-            return presence
-
-        port_num += SFP_PORT_NAME_OFFSET
-        sfpname = SFP_PORT_NAME_CONVENTION.format(port_num)
-
-        ethtool_cmd = "ethtool -m {} 2>/dev/null".format(sfpname)
-        try:
-            proc = subprocess.Popen(ethtool_cmd, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            result = stdout.rstrip('\n')
-            if result != '':
-                presence = True
-
-        except OSError, e:
-            return presence
-
-        return presence
-
-    def get_low_power_mode(self, port_num):
-        # Check for invalid port_num
-        if port_num < self.port_start or port_num > self.port_end:
-            return False
-
-        lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfplpmget.py {}".format(port_num)
-
-        try:
-            output = subprocess.check_output(lpm_cmd, shell=True)
-            if 'LPM ON' in output:
-                return True
-        except subprocess.CalledProcessError as e:
-            print "Error! Unable to get LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
-            return False
-
-        return False
-
-    def set_low_power_mode(self, port_num, lpmode):
-        # Check for invalid port_num
-        if port_num < self.port_start or port_num > self.port_end:
-            return False
-
-        curr_lpmode = self.get_low_power_mode(port_num)
-        if curr_lpmode == lpmode:
-            return True
-
-        # Compose LPM command
-        lpm = 'on' if lpmode else 'off'
-        lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfplpmset.py {} {}".format(port_num, lpm)
-
-        # Set LPM
-        try:
-            subprocess.check_output(lpm_cmd, shell=True)
-        except subprocess.CalledProcessError as e:
-            print "Error! Unable to set LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
-            return False
-
-        return True
-
-    def reset(self, port_num):
-        # Check for invalid port_num
-        if port_num < self.port_start or port_num > self.port_end:
-            return False
-
-        lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfpreset.py {}".format(port_num)
-
-        try:
-            subprocess.check_output(lpm_cmd, shell=True)
-            return True
-        except subprocess.CalledProcessError as e:
-            print "Error! Unable to set LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
-            return False
-
-    def get_transceiver_change_event(self, timeout=0):
-        phy_port_dict = {}
-        status = True
-
-        if self.db_sel is None:
-            from swsscommon import swsscommon
-            self.state_db = swsscommon.DBConnector("STATE_DB",
-                                                   REDIS_TIMEOUT_USECS,
-                                                   True)
-
-            # Subscribe to state table for SFP change notifications
-            self.db_sel = swsscommon.Select()
-            self.db_sel_tbl = swsscommon.NotificationConsumer(self.state_db, 'TRANSCEIVER_NOTIFY')
-            self.db_sel.addSelectable(self.db_sel_tbl)
-            self.db_sel_timeout = swsscommon.Select.TIMEOUT
-            self.db_sel_object = swsscommon.Select.OBJECT
-            self.sfpd_status_tbl = swsscommon.Table(self.state_db, 'MLNX_SFPD_TASK')
-
-        # Check the liveness of mlnx-sfpd, if it failed, return system_fail event
-        # If mlnx-sfpd not started, return system_not_ready event
-        keys = self.sfpd_status_tbl.getKeys()
-        if 'LIVENESS' not in keys:
-            if self.mlnx_sfpd_started:
-                log_err("mlnx-sfpd exited, return false to notify xcvrd.")
-                phy_port_dict[EVENT_ON_ALL_SFP] = SYSTEM_FAIL
-                return False, phy_port_dict
-            else:
-                log_info("mlnx-sfpd not ready, return false to notify xcvrd.")
-                phy_port_dict[EVENT_ON_ALL_SFP] = SYSTEM_NOT_READY
-                return False, phy_port_dict
-        else:
-            if not self.mlnx_sfpd_started:
-                self.mlnx_sfpd_started = True
-                log_info("mlnx-sfpd is running")
-                phy_port_dict[EVENT_ON_ALL_SFP] = SYSTEM_READY
-                return False, phy_port_dict
-
-        if timeout:
-            (state, c) = self.db_sel.select(timeout)
-        else:
-            (state, c) = self.db_sel.select()
-
-        if state == self.db_sel_timeout:
-            status = True
-        elif state != self.db_sel_object:
-            status = False
-        else:
-            (key, op, fvp) = self.db_sel_tbl.pop()
-            phy_port_dict[key] = op
-
-        return status, phy_port_dict
-
-    def _read_eeprom_specific_bytes(self, sysfsfile_eeprom, offset, num_bytes):
-        print("_read_eeprom_specific_bytes should not be called since the sysfs it dependents on will no longer exist.")
-        print("_read_eeprom_specific_bytes_via_ethtool should be called instead")
-        raise Exception()
-
-    # Read out any bytes from any offset
-    def _read_eeprom_specific_bytes_via_ethtool(self, port_num, offset, num_bytes):
-        port_num += SFP_PORT_NAME_OFFSET
-        sfpname = SFP_PORT_NAME_CONVENTION.format(port_num)
-
-        eeprom_raw = []
-        ethtool_cmd = "ethtool -m {} hex on offset {} length {}".format(sfpname, offset, num_bytes)
-        try:
-            output = subprocess.check_output(ethtool_cmd, shell=True)
-            output_lines = output.splitlines()
-            first_line_raw = output_lines[0]
-            if "Offset" in first_line_raw:
-                for line in output_lines[2:]:
-                    line_split = line.split()
-                    eeprom_raw = eeprom_raw + line_split[1:]
-        except subprocess.CalledProcessError as e:
-            return None
-
-        return eeprom_raw
-
-    # Read eeprom
-    def _read_eeprom_devid(self, port_num, devid, offset, num_bytes = 512):
-        if port_num in self.osfp_ports:
-            pass
-        elif port_num in self.qsfp_ports:
-            pass
-        elif (self.DOM_EEPROM_ADDR == devid):
-                offset += 256
-
-        eeprom_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, offset, num_bytes)
-
-        return eeprom_raw
-
-    # Read out SFP type, vendor name, PN, REV, SN from eeprom.
-    def get_transceiver_info_dict(self, port_num):
-        transceiver_info_dict = {}
-        compliance_code_dict = {}
-
-        # ToDo: OSFP tranceiver info parsing not fully supported.
-        # in inf8628.py lack of some memory map definition
-        # will be implemented when the inf8628 memory map ready
-        if port_num in self.osfp_ports:
-            offset = 0
-            vendor_rev_width = XCVR_HW_REV_WIDTH_OSFP
-
-            sfpi_obj = inf8628InterfaceId()
-            if sfpi_obj is None:
-                print("Error: sfp_object open failed")
-                return None
-
-            sfp_type_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
-            if sfp_type_raw is not None:
-                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_name_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
-            if sfp_vendor_name_raw is not None:
-                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_vendor_name_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
-            if sfp_vendor_pn_raw is not None:
-                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_vendor_pn_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
-            if sfp_vendor_rev_raw is not None:
-                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_vendor_rev_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
-            if sfp_vendor_sn_raw is not None:
-                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_vendor_sn_raw, 0)
-            else:
-                return None
-
-            transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
-            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
-            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
-            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
-            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
-            # Below part is added to avoid fail the xcvrd, shall be implemented later
-            transceiver_info_dict['vendor_oui'] = 'N/A'
-            transceiver_info_dict['vendor_date'] = 'N/A'
-            transceiver_info_dict['connector'] = 'N/A'
-            transceiver_info_dict['encoding'] = 'N/A'
-            transceiver_info_dict['ext_identifier'] = 'N/A'
-            transceiver_info_dict['ext_rateselect_compliance'] = 'N/A'
-            transceiver_info_dict['cable_type'] = 'N/A'
-            transceiver_info_dict['cable_length'] = 'N/A'
-            transceiver_info_dict['specification_compliance'] = 'N/A'
-            transceiver_info_dict['nominal_bit_rate'] = 'N/A'
-
-        else:
-            if port_num in self.qsfp_ports:
-                offset = 128
-                vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
-                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
-                sfp_type = 'QSFP'
-
-                sfpi_obj = sff8436InterfaceId()
-                if sfpi_obj is None:
-                    print("Error: sfp_object open failed")
-                    return None
-
-            else:
-                offset = 0
-                vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
-                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
-                sfp_type = 'SFP'
-
-                sfpi_obj = sff8472InterfaceId()
-                if sfpi_obj is None:
-                    print("Error: sfp_object open failed")
-                    return None
-
-            sfp_interface_bulk_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_INTFACE_BULK_OFFSET), interface_info_bulk_width)
-            if sfp_interface_bulk_raw is not None:
-                sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_name_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
-            if sfp_vendor_name_raw is not None:
-                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_vendor_name_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
-            if sfp_vendor_pn_raw is not None:
-                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_vendor_pn_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_HW_REV_OFFSET), vendor_rev_width)
-            if sfp_vendor_rev_raw is not None:
-                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_vendor_rev_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
-            if sfp_vendor_sn_raw is not None:
-                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_vendor_sn_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_oui_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
-            if sfp_vendor_oui_raw is not None:
-                sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_vendor_oui_raw, 0)
-            else:
-                return None
-
-            sfp_vendor_date_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
-            if sfp_vendor_date_raw is not None:
-                sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_vendor_date_raw, 0)
-            else:
-                return None
-
-            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
-            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
-            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
-            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
-            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
-            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
-            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
-            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
-            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
-            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
-            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
-            if sfp_type == 'QSFP':
-                for key in qsfp_cable_length_tup:
-                    if key in sfp_interface_bulk_data['data']:
-                        transceiver_info_dict['cable_type'] = key
-                        transceiver_info_dict['cable_length'] = str(sfp_interface_bulk_data['data'][key]['value'])
-
-                for key in qsfp_compliance_code_tup:
-                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
-                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
-                transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
-                
-                transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
-            else:
-                for key in sfp_cable_length_tup:
-                    if key in sfp_interface_bulk_data['data']:
-                        transceiver_info_dict['cable_type'] = key
-                        transceiver_info_dict['cable_length'] = str(sfp_interface_bulk_data['data'][key]['value'])
-
-                for key in sfp_compliance_code_tup:
-                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
-                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
-                transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
-
-                transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
-
-        return transceiver_info_dict
-
-    def get_transceiver_dom_info_dict(self, port_num):
-        transceiver_dom_info_dict = {}
-
-        # Below part is added to avoid failing xcvrd
-        # Currently, the way in which dom data is read has been changed from
-        # using sysfs to using ethtool.
-        # The ethtool returns None for ports without dom support, resulting in 
-        # None being returned. However, this fails xcvrd to add the 
-        # TRANSCEIVER_DOM_SENSOR table entry of associated port to CONFIG_DB
-        # and then causes SNMP fail.
-        # To address this issue a default dict is initialized with all data set to
-        # 'N/A' and is returned is the above case.
-        # BTW, in the original implementation which sysfs is used to read dom data,
-        # even though non-None data is returned for ports without dom support, 
-        # it does not contain valid data. This can result in wrong data in 
-        # TRANSCEIVER_DOM_SENSOR table.
-        transceiver_dom_info_dict['temperature'] = 'N/A'
-        transceiver_dom_info_dict['voltage'] = 'N/A'
-        transceiver_dom_info_dict['rx1power'] = 'N/A'
-        transceiver_dom_info_dict['rx2power'] = 'N/A'
-        transceiver_dom_info_dict['rx3power'] = 'N/A'
-        transceiver_dom_info_dict['rx4power'] = 'N/A'
-        transceiver_dom_info_dict['tx1bias'] = 'N/A'
-        transceiver_dom_info_dict['tx2bias'] = 'N/A'
-        transceiver_dom_info_dict['tx3bias'] = 'N/A'
-        transceiver_dom_info_dict['tx4bias'] = 'N/A'
-        transceiver_dom_info_dict['tx1power'] = 'N/A'
-        transceiver_dom_info_dict['tx2power'] = 'N/A'
-        transceiver_dom_info_dict['tx3power'] = 'N/A'
-        transceiver_dom_info_dict['tx4power'] = 'N/A'
-
-        if port_num in self.osfp_ports:
-            pass
-        elif port_num in self.qsfp_ports:
-            offset = 0
-            offset_xcvr = 128
-
-            sfpd_obj = sff8436Dom()
-            if sfpd_obj is None:
-                return None
-
-            sfpi_obj = sff8436InterfaceId()
-            if sfpi_obj is None:
-                return None
-
-
-            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
-            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
-            # need to add more code for determining the capability and version compliance
-            # in SFF-8636 dom capability definitions evolving with the versions.
-            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
-            if qsfp_dom_capability_raw is not None:
-                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
-            else:
-                return transceiver_dom_info_dict
-
-            dom_temperature_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
-            if dom_temperature_raw is not None:
-                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
-            else:
-                return transceiver_dom_info_dict
-
-            dom_voltage_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
-            if dom_voltage_raw is not None:
-                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
-            else:
-                return transceiver_dom_info_dict
-
-            qsfp_dom_rev_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
-            if qsfp_dom_rev_raw is not None:
-                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
-            else:
-                return transceiver_dom_info_dict
-
-            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
-            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
-
-            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
-            # and claimed that it support tx_power with one indicator bit.
-            dom_channel_monitor_data = {}
-            qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
-            qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
-            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
-                dom_channel_monitor_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
-                if dom_channel_monitor_raw is not None:
-                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
-                else:
-                    return transceiver_dom_info_dict
-            else:
-                dom_channel_monitor_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num, (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
-                if dom_channel_monitor_raw is not None:
-                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
-                else:
-                    return transceiver_dom_info_dict
-
-                transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
-                transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
-                transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
-                transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
-
-            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
-            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
-            transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
-            transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
-            transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
-            transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
-            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
-            transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
-            transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
-            transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
-
-        else:
-            offset = SFP_I2C_PAGE_SIZE
-
-            eeprom_raw = ['0'] * SFP_I2C_PAGE_SIZE
-            eeprom_raw[XCVR_DOM_CAPABILITY_OFFSET : XCVR_DOM_CAPABILITY_OFFSET + XCVR_DOM_CAPABILITY_WIDTH] = \
-                self._read_eeprom_specific_bytes_via_ethtool(port_num, XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
-            sfp_obj = sff8472InterfaceId()
-            calibration_type = sfp_obj._get_calibration_type(eeprom_raw)
-
-            dom_supported = (int(eeprom_raw[XCVR_DOM_CAPABILITY_OFFSET], 16) & XCVR_DOM_CAPABILITY_DOM_SUPPORT_BIT != 0)
-            if not dom_supported:
-                return transceiver_dom_info_dict
-
-            eeprom_domraw = self._read_eeprom_specific_bytes_via_ethtool(port_num, offset, SFP_I2C_PAGE_SIZE)
-            if eeprom_domraw is None:
-                return transceiver_dom_info_dict
-
-            sfpd_obj = sff8472Dom(None, calibration_type)
-            if sfpd_obj is None:
-                print "no sff8472Dom"
-                return None
-
-            dom_temperature_raw = eeprom_domraw[SFP_TEMPE_OFFSET:SFP_TEMPE_OFFSET+SFP_TEMPE_WIDTH]
-            dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
-
-            dom_voltage_raw = eeprom_domraw[SFP_VOLT_OFFSET:SFP_VOLT_OFFSET+SFP_VOLT_WIDTH]
-            dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
-
-            dom_channel_monitor_raw = eeprom_domraw[SFP_CHANNL_MON_OFFSET:SFP_CHANNL_MON_OFFSET+SFP_CHANNL_MON_WIDTH]
-            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
-
-            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
-            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
-            transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RXPower']['value']
-            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TXBias']['value']
-            transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TXPower']['value']
-
-        return transceiver_dom_info_dict
-
-    def get_transceiver_dom_threshold_info_dict(self, port_num):
-        transceiver_dom_threshold_info_dict = {}
-
-        dom_info_dict_keys = ['temphighalarm',    'temphighwarning',
-                              'templowalarm',     'templowwarning',
-                              'vcchighalarm',     'vcchighwarning',
-                              'vcclowalarm',      'vcclowwarning',
-                              'rxpowerhighalarm', 'rxpowerhighwarning',
-                              'rxpowerlowalarm',  'rxpowerlowwarning',
-                              'txpowerhighalarm', 'txpowerhighwarning',
-                              'txpowerlowalarm',  'txpowerlowwarning',
-                              'txbiashighalarm',  'txbiashighwarning',
-                              'txbiaslowalarm',   'txbiaslowwarning'
-                             ]
-        transceiver_dom_threshold_info_dict = dict.fromkeys(dom_info_dict_keys, 'N/A')
-
-        if port_num in self.qsfp_ports:
-            # current we don't support qsfp since threshold data is on page 3 and the way to read this page is under discussion.
-            return transceiver_dom_threshold_info_dict
-        else:
-            offset = SFP_I2C_PAGE_SIZE
-
-            eeprom_raw = ['0'] * SFP_I2C_PAGE_SIZE
-            eeprom_raw[XCVR_DOM_CAPABILITY_OFFSET : XCVR_DOM_CAPABILITY_OFFSET + XCVR_DOM_CAPABILITY_WIDTH] = \
-                self._read_eeprom_specific_bytes_via_ethtool(port_num, XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
-            sfp_obj = sff8472InterfaceId()
-            calibration_type = sfp_obj._get_calibration_type(eeprom_raw)
-
-            dom_supported = (int(eeprom_raw[XCVR_DOM_CAPABILITY_OFFSET], 16) & XCVR_DOM_CAPABILITY_DOM_SUPPORT_BIT != 0)
-            if not dom_supported:
-                return transceiver_dom_threshold_info_dict
-
-            sfpd_obj = sff8472Dom(None, calibration_type)
-            if sfpd_obj is None:
-                return transceiver_dom_threshold_info_dict
-
-            dom_module_threshold_raw = self._read_eeprom_specific_bytes_via_ethtool(port_num,
-                                         (offset + SFP_MODULE_THRESHOLD_OFFSET),
-                                         SFP_MODULE_THRESHOLD_WIDTH)
-            if dom_module_threshold_raw is not None:
-                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
-            else:
-                return transceiver_dom_threshold_info_dict
-
-            # Threshold Data
-            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
-            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
-            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
-            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
-            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
-            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
-            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VoltageHighWarning']['value']
-            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
-            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
-            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
-            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
-            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
-            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
-            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
-            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
-            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
-            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
-            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
-            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
-            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
-
-        return transceiver_dom_threshold_info_dict
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
new file mode 120000
index 000000000000..45909b880fc9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/plugins/sfputil.py
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/plugins/sfputil.py
\ No newline at end of file

From 41f476e4cb623b0172652e740fb9956491dd7ca9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Mar 2021 11:54:38 -0700
Subject: [PATCH 0309/1674] Bump lxml from 4.6.2 to 4.6.3 in
 /src/sonic-config-engine (#7122)

Bumps [lxml](https://github.com/lxml/lxml) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.2...lxml-4.6.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/sonic-config-engine/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index d167e0566438..3df049a3657f 100644
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -7,7 +7,7 @@
 dependencies = [
     'bitarray==1.5.3',
     'ipaddress==1.0.23',
-    'lxml==4.6.2',
+    'lxml==4.6.3',
     'netaddr==0.8.0',
     'pyyaml==5.4.1',
     'sonic-py-common',

From 0ec92765ba4125011cc4ff67a5ed77d54f944580 Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Tue, 30 Mar 2021 01:28:49 +0300
Subject: [PATCH 0310/1674] [barefoot]: Updated SDK packages to 20210324
 (#7142)

Update unsupported SAI attr ('SAI_ACL_TABLE_ATTR_FIELD_OUTER_VLAN_ID') to fix issues on acl table create
---
 platform/barefoot/bfn-platform.mk | 2 +-
 platform/barefoot/bfn-sai.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index 5abcd3fe4655..b7db62f64adc 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20210219_deb10.deb
+BFN_PLATFORM = bfnplatform_20210324_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index 54285aa32cd9..bf533012dfc3 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20210219_deb10.deb
+BFN_SAI = bfnsdk_20210324_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

From 1903650c0f8a94ee6ea7e3b8d53ec38f2facce63 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 30 Mar 2021 12:26:18 -0700
Subject: [PATCH 0311/1674] [sonic-platform-daemons] submodule update (#7143)

this PR updates the following commits in sonic-platform-daemons
260cf2d [xcvrd] change firmware information fields name inside MUX_CABLE_INFO table for Y cable (#165)
cfa600f [thermalctld] Initialize fan led in thermalctld for the first run (#167)
8509f43 [thermalctld] Refactor to allow for greater unit test coverage; Add more unit tests (#157)
70f4e7b [syseepromd] Update warning message to be more informative (#160)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index e5165b79dfe7..260cf2dedb74 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit e5165b79dfe722052ea86694e5fe98429c735e36
+Subproject commit 260cf2dedb74880a44713b2b37cae6595caeb445

From f080220801609e68257b76095f783a2120d2c989 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:30:15 +0800
Subject: [PATCH 0312/1674] [mellanox]: Integrate hw-mgmt package V.7.0010.2002
 (#7148)

Integrate hw-management package V.7.0010.2002

Bug fixes:
Removing critical thermal zones to prevent unexpected software system shutdown:
*Kernel 4.9 -0071-mlxsw-core-Remove-critical-trip-point-from-thermal-z.patch
*Kernel 4.19 -076-mlxsw-core-Remove-critical-trip-point-from-thermal-z.patch
Removing redundant link for cpld3 for fixed systems (SN2100, SN2010).
Fix an issue with missed attribute for cpld3 (port CPLD) for SN2700, SN2410.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 platform/mellanox/hw-management.mk      | 2 +-
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index c273f779cbb2..4929a5500df1 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2000
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2002
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 4ae17192db86..298ffebcb802 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 4ae17192db868de19ea0725860b320c0d319d23a
+Subproject commit 298ffebcb8026caafba36727ce2fba1f26b100aa

From 567eae611658dca349a8892679b673a920b7d2fe Mon Sep 17 00:00:00 2001
From: Mykola Gerasymenko
 <79265711+mykolaxgerasymenko@users.noreply.github.com>
Date: Fri, 26 Mar 2021 20:08:28 +0200
Subject: [PATCH 0313/1674] [barefoot]: Add `psample` module to load at boot
 time on BFN platform (#7164)

The psample module was not loaded on barefoot platform. The loading of this module is a prerequisite for testing SFlow.

* add `.gitignore` to the `barefoot` subdirectory to overwrite ignore "platform/**/debian/*" in the root directory
---
 platform/barefoot/.gitignore                           | 2 ++
 platform/barefoot/bfn-modules/configs/bfn-modules.conf | 6 ++++++
 platform/barefoot/bfn-modules/debian/install           | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 platform/barefoot/.gitignore
 create mode 100644 platform/barefoot/bfn-modules/configs/bfn-modules.conf
 create mode 100644 platform/barefoot/bfn-modules/debian/install

diff --git a/platform/barefoot/.gitignore b/platform/barefoot/.gitignore
new file mode 100644
index 000000000000..f56830430d73
--- /dev/null
+++ b/platform/barefoot/.gitignore
@@ -0,0 +1,2 @@
+# Overwrite ignore 'platform/**/debian/*' in root directory.
+!**/debian/*
diff --git a/platform/barefoot/bfn-modules/configs/bfn-modules.conf b/platform/barefoot/bfn-modules/configs/bfn-modules.conf
new file mode 100644
index 000000000000..c315cf5106b8
--- /dev/null
+++ b/platform/barefoot/bfn-modules/configs/bfn-modules.conf
@@ -0,0 +1,6 @@
+# /etc/modules: kernel modules to load at boot time.
+#
+# This file contains the names of kernel modules that should be loaded
+# at boot time, one per line. Lines beginning with "#" are ignored.
+
+psample
\ No newline at end of file
diff --git a/platform/barefoot/bfn-modules/debian/install b/platform/barefoot/bfn-modules/debian/install
new file mode 100644
index 000000000000..648ee226cc7a
--- /dev/null
+++ b/platform/barefoot/bfn-modules/debian/install
@@ -0,0 +1 @@
+configs/bfn-modules.conf etc/modules-load.d
\ No newline at end of file

From 576864b76976599f56eccc6cf554a853ffa12f34 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Sat, 27 Mar 2021 11:36:56 -0700
Subject: [PATCH 0314/1674] [bgp]: Reduce bgp connect retry timer to 10 seconds
 (#7169)

The default bgp connect retry timer is 120 seconds. A reconnection will happen 120 seconds if the initial connection fails. This PR aims to allow a more frequent retry.
---
 .../docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2   | 1 +
 .../tests/data/general/instance.conf/result_all_v4.conf          | 1 +
 .../tests/data/general/instance.conf/result_all_v6.conf          | 1 +
 .../tests/data/general/instance.conf/result_base_v4.conf         | 1 +
 .../tests/data/general/instance.conf/result_base_v6.conf         | 1 +
 .../tests/data/general/instance.conf/result_l2vpn.conf           | 1 +
 .../tests/data/general/instance.conf/result_shutdown_1.conf      | 1 +
 .../tests/data/general/instance.conf/result_shutdown_2.conf      | 1 +
 .../tests/data/general/instance.conf/result_timers_1.conf        | 1 +
 .../tests/data/general/instance.conf/result_timers_2.conf        | 1 +
 10 files changed, 10 insertions(+)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2
index c8c9906bc98d..836561e4263b 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2
@@ -8,6 +8,7 @@
       or  (bgp_session['holdtime'] is defined  and bgp_session['holdtime']  | int != 180) %}
   neighbor {{ neighbor_addr }} timers {{ bgp_session['keepalive'] | default("60") }} {{ bgp_session['holdtime'] | default("180") }}
 {% endif %}
+  neighbor {{ neighbor_addr }} timers connect 10
 !
 {% if 'admin_status' in bgp_session and bgp_session['admin_status'] == 'down' or 'admin_status' not in bgp_session and 'default_bgp_status' in CONFIG_DB__DEVICE_METADATA['localhost'] and CONFIG_DB__DEVICE_METADATA['localhost']['default_bgp_status'] == 'down' %}
   neighbor {{ neighbor_addr }} shutdown
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v4.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v4.conf
index a6102cdb87a2..73ea68eafc97 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v4.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 5 30
+  neighbor 10.10.10.10 timers connect 10
   neighbor 10.10.10.10 shutdown
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v6.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v6.conf
index aa06657d91a8..d2efba293767 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_all_v6.conf
@@ -4,6 +4,7 @@
   neighbor fc::10 remote-as 555
   neighbor fc::10 description remote_peer
   neighbor fc::10 timers 5 30
+  neighbor fc::10 timers connect 10
   neighbor fc::10 shutdown
   address-family ipv6
     neighbor fc::10 peer-group PEER_V6
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v4.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v4.conf
index 2990d5aef7c7..077704d36468 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v4.conf
@@ -3,6 +3,7 @@
 !
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
     neighbor 10.10.10.10 activate
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v6.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v6.conf
index 38ec714894ae..678eef780daf 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_base_v6.conf
@@ -3,6 +3,7 @@
 !
   neighbor fc00::2 remote-as 555
   neighbor fc00::2 description remote_peer
+  neighbor fc00::2 timers connect 10
   address-family ipv6
     neighbor fc00::2 peer-group PEER_V6
     neighbor fc00::2 activate
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_l2vpn.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_l2vpn.conf
index b30eaaa62a35..7efc4950d06d 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_l2vpn.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_l2vpn.conf
@@ -3,6 +3,7 @@
 !
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
     neighbor 10.10.10.10 activate
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_1.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_1.conf
index 9303e3b9ab7f..617df7369b9c 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_1.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_1.conf
@@ -3,6 +3,7 @@
 !
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
+  neighbor 10.10.10.10 timers connect 10
   neighbor 10.10.10.10 shutdown
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_2.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_2.conf
index 2990d5aef7c7..077704d36468 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_2.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_shutdown_2.conf
@@ -3,6 +3,7 @@
 !
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
     neighbor 10.10.10.10 activate
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_1.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_1.conf
index ffca0e6b69e6..53663f1d5173 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_1.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_1.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 5 180
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
     neighbor 10.10.10.10 activate
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_2.conf b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_2.conf
index 3a8ac3d90e3f..280e7396598f 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_2.conf
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/result_timers_2.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 60 240
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group PEER_V4
     neighbor 10.10.10.10 activate

From 7155d02df251090daa9419cdbd77c1a4741ff0c1 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 31 Mar 2021 14:25:12 -0700
Subject: [PATCH 0315/1674] [202012][sonic-config-engine] Parse AutoNegotiation
 element from LinkMetadata section of minigraph file (#7166)

Backport of https://github.com/Azure/sonic-buildimage/pull/7031 to the 202012 branch

#### Why I did it

To enable parsing the `AutoNegotiation` element from the LinkMetadata section of minigraph file

#### How I did it

Parse the value `AutoNegotiation` element from the `LinkMetadata` section of minigraph file. If the element is present, an `autoneg` key will be added to the port in the `PORT` table of Config DB with a value of either `0` or `1`

If an `autoneg` value is present in port_config.ini, the value from the minigraph will take precedence, overriding that value.

Also remove `AutoNegotiation` and `EnableAutoNegotiation` elements from the `DeviceInfo` section, as we will use this data in the `LinkMetadata` section to determine whether to enable auto-negotiation for a port.
---
 src/sonic-config-engine/minigraph.py          |  10 +
 .../tests/fg-ecmp-sample-minigraph.xml        | 335 ++++++++---
 .../tests/multi_npu_data/sample-minigraph.xml |  57 +-
 .../tests/sample-arista-7050-t0-minigraph.xml | 345 +++++++++--
 .../tests/sample-dell-6100-t0-minigraph.xml   | 534 ++++++++++++++++--
 .../tests/simple-sample-graph-case.xml        |  94 ++-
 .../tests/simple-sample-graph-metadata.xml    |   6 -
 .../tests/simple-sample-graph.xml             |  11 -
 .../tests/t0-sample-autoneg-port-config.ini   |  33 ++
 .../tests/t0-sample-graph-mvrf.xml            |  16 +-
 .../tests/t0-sample-graph.xml                 |  11 +-
 .../tests/t1-sample-graph-mlnx.xml            | 389 +++++++++++--
 .../tests/t2-chassis-fe-graph-pc.xml          |  77 ++-
 .../tests/t2-chassis-fe-graph-vni.xml         |  41 +-
 .../tests/t2-chassis-fe-graph.xml             |  41 +-
 src/sonic-config-engine/tests/test_cfggen.py  | 192 +++++--
 .../tests/test_multinpu_cfggen.py             |  18 +-
 17 files changed, 1897 insertions(+), 313 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 47db73c34f29..eb6a11237e92 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -845,6 +845,7 @@ def parse_linkmeta(meta, hname):
         has_peer_switch = False
         upper_tor_hostname = ''
         lower_tor_hostname = ''
+        auto_negotiation = None
 
         properties = linkmeta.find(str(QName(ns1, "Properties")))
         for device_property in properties.findall(str(QName(ns1, "DeviceProperty"))):
@@ -858,6 +859,8 @@ def parse_linkmeta(meta, hname):
                 upper_tor_hostname = value
             elif name == "LowerTOR":
                 lower_tor_hostname = value
+            elif name == "AutoNegotiation":
+                auto_negotiation = value
 
         linkmetas[port] = {}
         if fec_disabled:
@@ -867,6 +870,8 @@ def parse_linkmeta(meta, hname):
                 linkmetas[port]["PeerSwitch"] = lower_tor_hostname
             else:
                 linkmetas[port]["PeerSwitch"] = upper_tor_hostname
+        if auto_negotiation:
+            linkmetas[port]["AutoNegotiation"] = auto_negotiation
     return linkmetas
 
 
@@ -1318,6 +1323,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         if port.get('speed') == '100000' and linkmetas.get(alias, {}).get('FECDisabled', '').lower() != 'true':
             port['fec'] = 'rs'
 
+        # If AutoNegotiation is available in the minigraph, we override any value we may have received from port_config.ini
+        autoneg = linkmetas.get(alias, {}).get('AutoNegotiation')
+        if autoneg:
+            port['autoneg'] = '1' if autoneg.lower() == 'true' else '0'
+
     # If connected to a smart cable, get the connection position
     for port_name, port in ports.items():
         if port_name in mux_cable_ports:
diff --git a/src/sonic-config-engine/tests/fg-ecmp-sample-minigraph.xml b/src/sonic-config-engine/tests/fg-ecmp-sample-minigraph.xml
index f8fcf1e0fce7..9cca45e25241 100644
--- a/src/sonic-config-engine/tests/fg-ecmp-sample-minigraph.xml
+++ b/src/sonic-config-engine/tests/fg-ecmp-sample-minigraph.xml
@@ -685,12 +685,10 @@
    </PngDec>
    <DeviceInfos>
       <DeviceInfo>
-         <AutoNegotiation>true</AutoNegotiation>
          <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp1</InterfaceName>
@@ -703,7 +701,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp2</InterfaceName>
@@ -716,7 +713,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp3</InterfaceName>
@@ -729,7 +725,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp4</InterfaceName>
@@ -742,7 +737,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp5</InterfaceName>
@@ -755,7 +749,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp6</InterfaceName>
@@ -768,7 +761,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp7</InterfaceName>
@@ -781,7 +773,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp8</InterfaceName>
@@ -794,7 +785,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp9</InterfaceName>
@@ -807,7 +797,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp10</InterfaceName>
@@ -820,7 +809,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp11</InterfaceName>
@@ -833,7 +821,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp12</InterfaceName>
@@ -846,7 +833,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp13</InterfaceName>
@@ -859,7 +845,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp14</InterfaceName>
@@ -872,7 +857,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp15</InterfaceName>
@@ -885,7 +869,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp16</InterfaceName>
@@ -898,7 +881,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp17</InterfaceName>
@@ -911,7 +893,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp18</InterfaceName>
@@ -924,7 +905,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp19</InterfaceName>
@@ -937,7 +917,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp20</InterfaceName>
@@ -950,7 +929,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp21</InterfaceName>
@@ -963,7 +941,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp22</InterfaceName>
@@ -976,7 +953,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp23</InterfaceName>
@@ -989,7 +965,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp24</InterfaceName>
@@ -1002,7 +977,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp25</InterfaceName>
@@ -1015,7 +989,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp26</InterfaceName>
@@ -1028,7 +1001,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp27</InterfaceName>
@@ -1041,7 +1013,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp28</InterfaceName>
@@ -1054,7 +1025,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp29</InterfaceName>
@@ -1067,7 +1037,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp30</InterfaceName>
@@ -1080,7 +1049,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp31</InterfaceName>
@@ -1093,7 +1061,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp32</InterfaceName>
@@ -1106,7 +1073,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp33</InterfaceName>
@@ -1119,7 +1085,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp34</InterfaceName>
@@ -1132,7 +1097,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp35</InterfaceName>
@@ -1145,7 +1109,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp36</InterfaceName>
@@ -1158,7 +1121,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp37</InterfaceName>
@@ -1171,7 +1133,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp38</InterfaceName>
@@ -1184,7 +1145,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp39</InterfaceName>
@@ -1197,7 +1157,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp40</InterfaceName>
@@ -1210,7 +1169,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp41</InterfaceName>
@@ -1223,7 +1181,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp42</InterfaceName>
@@ -1236,7 +1193,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp43</InterfaceName>
@@ -1249,7 +1205,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp44</InterfaceName>
@@ -1262,7 +1217,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp45</InterfaceName>
@@ -1275,7 +1229,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp46</InterfaceName>
@@ -1288,7 +1241,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp47</InterfaceName>
@@ -1301,7 +1253,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp48</InterfaceName>
@@ -1314,7 +1265,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp49</InterfaceName>
@@ -1327,7 +1277,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp50</InterfaceName>
@@ -1340,7 +1289,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp51</InterfaceName>
@@ -1353,7 +1301,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp52</InterfaceName>
@@ -1366,7 +1313,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp53</InterfaceName>
@@ -1379,7 +1325,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp54</InterfaceName>
@@ -1392,7 +1337,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp55</InterfaceName>
@@ -1405,7 +1349,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp56</InterfaceName>
@@ -1418,7 +1361,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp57</InterfaceName>
@@ -1431,7 +1373,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp58</InterfaceName>
@@ -1444,7 +1385,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp59</InterfaceName>
@@ -1457,7 +1397,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp60</InterfaceName>
@@ -1470,7 +1409,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp61</InterfaceName>
@@ -1483,7 +1421,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp62</InterfaceName>
@@ -1496,7 +1433,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp63</InterfaceName>
@@ -1509,7 +1445,6 @@
             <a:EthernetInterface>
                <ElementType>DeviceInterface</ElementType>
                <AlternateSpeeds i:nil="true" />
-               <EnableAutoNegotiation>true</EnableAutoNegotiation>
                <EnableFlowControl>true</EnableFlowControl>
                <Index>1</Index>
                <InterfaceName>etp64</InterfaceName>
@@ -1586,6 +1521,274 @@
       </Devices>
       <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution" />
    </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>str2-sn3800-azd:etp29;ARISTA01T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>str2-sn3800-azd:etp30;ARISTA02T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>str2-sn3800-azd:etp31;ARISTA03T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>str2-sn3800-azd:etp32;ARISTA04T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers0:eth0;str2-sn3800-azd:etp2</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers3:eth0;str2-sn3800-azd:etp5</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers4:eth0;str2-sn3800-azd:etp6</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers7:eth0;str2-sn3800-azd:etp9</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp10</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp11</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp12</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp13</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp14</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp15</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp16</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp17</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp18</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp19</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers10:eth0;str2-sn3800-azd:etp20</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers11:eth0;str2-sn3800-azd:etp21</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers20:eth0;str2-sn3800-azd:etp22</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers21:eth0;str2-sn3800-azd:etp23</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers22:eth0;str2-sn3800-azd:etp24</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>Servers23:eth0;str2-sn3800-azd:etp25</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
    <Hostname>str2-sn3800-azd</Hostname>
    <HwSku>ACS-MSN3800</HwSku>
-</DeviceMiniGraph>
\ No newline at end of file
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph.xml b/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph.xml
index 412262315b4e..5dac8e95bf1a 100644
--- a/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph.xml
+++ b/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph.xml
@@ -1008,12 +1008,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/1</InterfaceName>
@@ -1026,7 +1024,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/2</InterfaceName>
@@ -1039,7 +1036,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/3</InterfaceName>
@@ -1052,7 +1048,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/4</InterfaceName>
@@ -1065,7 +1060,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/5</InterfaceName>
@@ -1078,7 +1072,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/6</InterfaceName>
@@ -1091,7 +1084,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/7</InterfaceName>
@@ -1104,7 +1096,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1/8</InterfaceName>
@@ -1241,6 +1232,54 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/1;01T2:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/2;01T2:Ethernet2</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/5;05T2:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/6;05T2:Ethernet2</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>multi_npu_platform_01</Hostname>
   <HwSku>multi-npu-01</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
index 4fd1ba9ba128..4d216b30f203 100644
--- a/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
@@ -462,12 +462,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet5/1</InterfaceName>
@@ -480,7 +478,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet6/1</InterfaceName>
@@ -493,7 +490,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet7/1</InterfaceName>
@@ -506,7 +502,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet8/1</InterfaceName>
@@ -519,7 +514,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet9/1</InterfaceName>
@@ -532,7 +526,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet10/1</InterfaceName>
@@ -545,7 +538,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet11/1</InterfaceName>
@@ -558,7 +550,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet12/1</InterfaceName>
@@ -571,7 +562,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet13/1</InterfaceName>
@@ -584,7 +574,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet14/1</InterfaceName>
@@ -597,7 +586,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet15/1</InterfaceName>
@@ -610,7 +598,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet16/1</InterfaceName>
@@ -623,7 +610,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet17/1</InterfaceName>
@@ -636,7 +622,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet18/1</InterfaceName>
@@ -649,7 +634,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet19/1</InterfaceName>
@@ -662,7 +646,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet20/1</InterfaceName>
@@ -675,7 +658,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet21/1</InterfaceName>
@@ -688,7 +670,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet22/1</InterfaceName>
@@ -701,7 +682,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet23/1</InterfaceName>
@@ -714,7 +694,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet24/1</InterfaceName>
@@ -727,7 +706,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet25/1</InterfaceName>
@@ -740,7 +718,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet26/1</InterfaceName>
@@ -753,7 +730,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet27/1</InterfaceName>
@@ -766,7 +742,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet28/1</InterfaceName>
@@ -779,7 +754,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet29</InterfaceName>
@@ -792,7 +766,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet30</InterfaceName>
@@ -805,7 +778,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet31</InterfaceName>
@@ -818,7 +790,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet32</InterfaceName>
@@ -831,7 +802,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet33</InterfaceName>
@@ -844,7 +814,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet34</InterfaceName>
@@ -857,7 +826,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet35</InterfaceName>
@@ -870,7 +838,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet36</InterfaceName>
@@ -902,6 +869,318 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s7050-dev-1:Ethernet33;ARISTA01T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s7050-dev-1:Ethernet34;ARISTA02T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s7050-dev-1:Ethernet35;ARISTA03T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s7050-dev-1:Ethernet36;ARISTA04T1:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers0:eth0;s7050-dev-1:Ethernet6/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers1:eth0;s7050-dev-1:Ethernet7/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers2:eth0;s7050-dev-1:Ethernet8/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers3:eth0;s7050-dev-1:Ethernet9/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers4:eth0;s7050-dev-1:Ethernet10/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers5:eth0;s7050-dev-1:Ethernet11/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers6:eth0;s7050-dev-1:Ethernet12/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers7:eth0;s7050-dev-1:Ethernet13/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers8:eth0;s7050-dev-1:Ethernet14/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers9:eth0;s7050-dev-1:Ethernet15/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers10:eth0;s7050-dev-1:Ethernet16/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers11:eth0;s7050-dev-1:Ethernet17/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers12:eth0;s7050-dev-1:Ethernet18/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers13:eth0;s7050-dev-1:Ethernet19/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers14:eth0;s7050-dev-1:Ethernet20/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers15:eth0;s7050-dev-1:Ethernet21/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers16:eth0;s7050-dev-1:Ethernet22/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers17:eth0;s7050-dev-1:Ethernet23/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers18:eth0;s7050-dev-1:Ethernet24/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers19:eth0;s7050-dev-1:Ethernet25/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers20:eth0;s7050-dev-1:Ethernet26/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers21:eth0;s7050-dev-1:Ethernet27/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers22:eth0;s7050-dev-1:Ethernet28/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>Servers23:eth0;s7050-dev-1:Ethernet29/1</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>s7050-dev-1</Hostname>
   <HwSku>Arista-7050-QX-32S</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
index 536a2c8a73c7..7cea7decfcc0 100644
--- a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
@@ -301,7 +301,6 @@
     <DeviceInterfaceLinks>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA01T1</EndDevice>
                 <EndPort>Ethernet1</EndPort>
@@ -311,7 +310,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA01T1</EndDevice>
                 <EndPort>Ethernet2</EndPort>
@@ -321,7 +319,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA02T1</EndDevice>
                 <EndPort>Ethernet1</EndPort>
@@ -331,7 +328,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA02T1</EndDevice>
                 <EndPort>Ethernet2</EndPort>
@@ -341,7 +337,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA03T1</EndDevice>
                 <EndPort>Ethernet1</EndPort>
@@ -351,7 +346,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA03T1</EndDevice>
                 <EndPort>Ethernet2</EndPort>
@@ -361,7 +355,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA04T1</EndDevice>
                 <EndPort>Ethernet1</EndPort>
@@ -371,7 +364,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>ARISTA04T1</EndDevice>
                 <EndPort>Ethernet2</EndPort>
@@ -381,7 +373,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/7</EndPort>
@@ -391,7 +382,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/8</EndPort>
@@ -401,7 +391,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/9</EndPort>
@@ -411,7 +400,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/10</EndPort>
@@ -421,7 +409,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/11</EndPort>
@@ -431,7 +418,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/12</EndPort>
@@ -441,7 +427,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/13</EndPort>
@@ -451,7 +436,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/14</EndPort>
@@ -461,7 +445,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/15</EndPort>
@@ -471,7 +454,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/1/16</EndPort>
@@ -481,7 +463,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/1</EndPort>
@@ -491,7 +472,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/5</EndPort>
@@ -501,7 +481,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/6</EndPort>
@@ -511,7 +490,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/7</EndPort>
@@ -521,7 +499,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/8</EndPort>
@@ -531,7 +508,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/9</EndPort>
@@ -541,7 +517,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/10</EndPort>
@@ -551,7 +526,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/3/11</EndPort>
@@ -561,7 +535,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/7</EndPort>
@@ -571,7 +544,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/8</EndPort>
@@ -581,7 +553,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/9</EndPort>
@@ -591,7 +562,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/10</EndPort>
@@ -601,7 +571,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/11</EndPort>
@@ -611,7 +580,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/12</EndPort>
@@ -621,7 +589,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/13</EndPort>
@@ -631,7 +598,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/14</EndPort>
@@ -641,7 +607,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/15</EndPort>
@@ -651,7 +616,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/2/16</EndPort>
@@ -661,7 +625,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/1</EndPort>
@@ -671,7 +634,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/5</EndPort>
@@ -681,7 +643,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/6</EndPort>
@@ -691,7 +652,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/7</EndPort>
@@ -701,7 +661,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/8</EndPort>
@@ -711,7 +670,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/9</EndPort>
@@ -721,7 +679,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/10</EndPort>
@@ -731,7 +688,6 @@
             </DeviceLinkBase>
             <DeviceLinkBase i:type="DeviceInterfaceLink">
                 <ElementType>DeviceInterfaceLink</ElementType>
-                <AutoNegotiation>true</AutoNegotiation>
                 <Bandwidth>40000</Bandwidth>
                 <EndDevice>s6100-dev-1</EndDevice>
                 <EndPort>fortyGigE1/4/11</EndPort>
@@ -765,6 +721,494 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>  
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA01T1:Ethernet1;s6100-dev-1:fortyGigE1/1/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA01T1:Ethernet2;s6100-dev-1:fortyGigE1/1/2</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA02T1:Ethernet1;s6100-dev-1:fortyGigE1/1/5</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA02T1:Ethernet2;s6100-dev-1:fortyGigE1/1/6</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA03T1:Ethernet1;s6100-dev-1:fortyGigE1/2/1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA03T1:Ethernet2;s6100-dev-1:fortyGigE1/2/2</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA04T1:Ethernet1;s6100-dev-1:fortyGigE1/2/5</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA04T1:Ethernet2;s6100-dev-1:fortyGigE1/2/6</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-01:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/8;server-02:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-03:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-04:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-05:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-06:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-07:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-08:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-09:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/1/7;server-10:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/1;server-11:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/5;server-12:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/6;server-13:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/7;server-14:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/8;server-15:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/9;server-16:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/10;server-17:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/3/11;server-18:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/7;server-19:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/8;server-20:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/9;server-21:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/10;server-22:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/11;server-23:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/12;server-24:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/13;server-25:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/14;server-26:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/15;server-27:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>s6100-dev-1:fortyGigE1/2/16;server-28:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/1;server-29:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/5;server-30:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/6;server-31:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/7;server-32:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/8;server-33:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/9;server-34:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/10;server-35:0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+	<a:Key>s6100-dev-1:fortyGigE1/4/11;server-36:0</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>s6100-dev-1</Hostname>
   <HwSku>Force10-S6100</HwSku>
-</DeviceMiniGraph>
\ No newline at end of file
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index 95f501200c83..9292170034b3 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -197,7 +197,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>10000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/0</EndPort>
@@ -206,7 +205,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>10000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/12</EndPort>
@@ -215,7 +213,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>25000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/4</EndPort>
@@ -224,7 +221,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>40000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/8</EndPort>
@@ -330,26 +326,70 @@
 <LinkMetadataDeclaration>
   <Link xmlns:d3p1="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
     <d3p1:LinkMetadata>
-        <d3p1:Name i:nil="true" />
-        <d3p1:Properties>
-          <d3p1:DeviceProperty>
-            <d3p1:Name>GeminiPeeringLink</d3p1:Name>
-            <d3p1:Reference i:nil="true" />
-            <d3p1:Value>True</d3p1:Value>
-          </d3p1:DeviceProperty>
-          <d3p1:DeviceProperty>
-            <d3p1:Name>UpperTOR</d3p1:Name>
-            <d3p1:Reference i:nil="true" />
-            <d3p1:Value>switch-t0</d3p1:Value>
-          </d3p1:DeviceProperty>
-          <d3p1:DeviceProperty>
-            <d3p1:Name>LowerTOR</d3p1:Name>
-            <d3p1:Reference i:nil="true" />
-            <d3p1:Value>switch2-t0</d3p1:Value>
-          </d3p1:DeviceProperty>
-        </d3p1:Properties>
-        <d3p1:Key>switch2-t0:MuxTunnel0;switch-t0:MuxTunnel0</d3p1:Key>
-      </d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true" />
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>GeminiPeeringLink</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>UpperTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>LowerTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch2-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch2-t0:MuxTunnel0;switch-t0:MuxTunnel0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-01t1:port1;switch-t0:fortyGigE0/0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-02t1:port1;switch-t0:fortyGigE0/12</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server1:port1;switch-t0:fortyGigE0/4</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server2:port1;switch-t0:fortyGigE0/8</d3p1:Key>
+    </d3p1:LinkMetadata>
   </Link>
 </LinkMetadataDeclaration>
 <MetadataDeclaration>
@@ -407,12 +447,10 @@
 </MetadataDeclaration>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/0</InterfaceName>
@@ -425,7 +463,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/4</InterfaceName>
@@ -438,7 +475,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/8</InterfaceName>
@@ -452,7 +488,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/12</InterfaceName>
@@ -471,7 +506,6 @@
 	<a:ManagementInterface>
 	  <ElementType>DeviceInterface</ElementType>
 	  <AlternateSpeeds i:nil="true"/>
-	  <EnableAutoNegotiation>true</EnableAutoNegotiation>
 	  <EnableFlowControl>true</EnableFlowControl>
 	  <Index>1</Index>
 	  <InterfaceName>eth0</InterfaceName>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
index 2b3368b7a9c7..ee26ee2111ec 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
@@ -265,12 +265,10 @@
 </MetadataDeclaration>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/0</InterfaceName>
@@ -283,7 +281,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/4</InterfaceName>
@@ -296,7 +293,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/8</InterfaceName>
@@ -310,7 +306,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/12</InterfaceName>
@@ -329,7 +324,6 @@
 	<a:ManagementInterface>
 	  <ElementType>DeviceInterface</ElementType>
 	  <AlternateSpeeds i:nil="true"/>
-	  <EnableAutoNegotiation>true</EnableAutoNegotiation>
 	  <EnableFlowControl>true</EnableFlowControl>
 	  <Index>1</Index>
 	  <InterfaceName>Management1</InterfaceName>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
index 703a005ea5bc..0ac08a3fff04 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -248,7 +248,6 @@
     <DeviceInterfaceLinks>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>1000</Bandwidth>
         <EndDevice>ARISTA01T1</EndDevice>
         <EndPort>et1</EndPort>
@@ -259,7 +258,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>10000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/1</EndPort>
@@ -270,7 +268,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceInterfaceLink">
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>10000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/2</EndPort>
@@ -306,12 +303,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/0</InterfaceName>
@@ -324,7 +319,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet1</InterfaceName>
@@ -337,7 +331,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet2</InterfaceName>
@@ -350,7 +343,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/4</InterfaceName>
@@ -363,7 +355,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/8</InterfaceName>
@@ -377,7 +368,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>fortyGigE0/12</InterfaceName>
@@ -396,7 +386,6 @@
 	<a:ManagementInterface>
 	  <ElementType>DeviceInterface</ElementType>
 	  <AlternateSpeeds i:nil="true"/>
-	  <EnableAutoNegotiation>true</EnableAutoNegotiation>
 	  <Index>1</Index>
 	  <InterfaceName>Management1</InterfaceName>
 	  <MultiPortsInterface>false</MultiPortsInterface>
diff --git a/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini b/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini
new file mode 100644
index 000000000000..91555c6e111e
--- /dev/null
+++ b/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini
@@ -0,0 +1,33 @@
+# name          lanes             alias             autoneg
+Ethernet0       29,30,31,32       fortyGigE0/0      0
+Ethernet4       25,26,27,28       fortyGigE0/4      0
+Ethernet8       37,38,39,40       fortyGigE0/8      0
+Ethernet12      33,34,35,36       fortyGigE0/12     0
+Ethernet16      41,42,43,44       fortyGigE0/16     0
+Ethernet20      45,46,47,48       fortyGigE0/20     0
+Ethernet24      5,6,7,8           fortyGigE0/24     0
+Ethernet28      1,2,3,4           fortyGigE0/28     0
+Ethernet32      9,10,11,12        fortyGigE0/32     0
+Ethernet36      13,14,15,16       fortyGigE0/36     0
+Ethernet40      21,22,23,24       fortyGigE0/40     0
+Ethernet44      17,18,19,20       fortyGigE0/44     0
+Ethernet48      49,50,51,52       fortyGigE0/48     0
+Ethernet52      53,54,55,56       fortyGigE0/52     0
+Ethernet56      61,62,63,64       fortyGigE0/56     0
+Ethernet60      57,58,59,60       fortyGigE0/60     0
+Ethernet64      65,66,67,68       fortyGigE0/64     0
+Ethernet68      69,70,71,72       fortyGigE0/68     0
+Ethernet72      77,78,79,80       fortyGigE0/72     0
+Ethernet76      73,74,75,76       fortyGigE0/76     0
+Ethernet80      105,106,107,108   fortyGigE0/80     0
+Ethernet84      109,110,111,112   fortyGigE0/84     0
+Ethernet88      117,118,119,120   fortyGigE0/88     0
+Ethernet92      113,114,115,116   fortyGigE0/92     0
+Ethernet96      121,122,123,124   fortyGigE0/96     0
+Ethernet100     125,126,127,128   fortyGigE0/100    0
+Ethernet104     85,86,87,88       fortyGigE0/104    0
+Ethernet108     81,82,83,84       fortyGigE0/108    0
+Ethernet112     89,90,91,92       fortyGigE0/112    1
+Ethernet116     93,94,95,96       fortyGigE0/116    1
+Ethernet120     97,98,99,100      fortyGigE0/120    1
+Ethernet124     101,102,103,104   fortyGigE0/124    1
diff --git a/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml b/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml
index ee633c18bd1e..e7e2b5789816 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml
@@ -355,7 +355,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase>
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>10000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/2</EndPort>
@@ -408,6 +407,21 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA05T1:Ethernet1/33;switch-t0:fortyGigE0/2</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>switch-t0</Hostname>
   <HwSku>Force10-S6000</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index 9f416d008d33..f847af1f90cf 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -435,7 +435,6 @@
       </DeviceLinkBase>
       <DeviceLinkBase>
         <ElementType>DeviceInterfaceLink</ElementType>
-        <AutoNegotiation>true</AutoNegotiation>
         <Bandwidth>100000</Bandwidth>
         <EndDevice>switch-t0</EndDevice>
         <EndPort>fortyGigE0/4</EndPort>
@@ -502,6 +501,11 @@
       <a:LinkMetadata>
         <a:Name i:nil="true"/>
         <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
           <a:DeviceProperty>
             <a:Name>FECDisabled</a:Name>
             <a:Reference i:nil="true"/>
@@ -513,6 +517,11 @@
       <a:LinkMetadata>
         <a:Name i:nil="true"/>
         <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>False</a:Value>
+          </a:DeviceProperty>
           <a:DeviceProperty>
             <a:Name>FECDisabled</a:Name>
             <a:Reference i:nil="true"/>
diff --git a/src/sonic-config-engine/tests/t1-sample-graph-mlnx.xml b/src/sonic-config-engine/tests/t1-sample-graph-mlnx.xml
index 04fc88c34370..cc6f5e95940b 100644
--- a/src/sonic-config-engine/tests/t1-sample-graph-mlnx.xml
+++ b/src/sonic-config-engine/tests/t1-sample-graph-mlnx.xml
@@ -1745,12 +1745,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet0</InterfaceName>
@@ -1763,7 +1761,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet4</InterfaceName>
@@ -1776,7 +1773,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet8</InterfaceName>
@@ -1789,7 +1785,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet12</InterfaceName>
@@ -1802,7 +1797,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet16</InterfaceName>
@@ -1815,7 +1809,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet20</InterfaceName>
@@ -1828,7 +1821,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet24</InterfaceName>
@@ -1841,7 +1833,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet28</InterfaceName>
@@ -1854,7 +1845,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet32</InterfaceName>
@@ -1867,7 +1857,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet36</InterfaceName>
@@ -1880,7 +1869,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet40</InterfaceName>
@@ -1893,7 +1881,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet44</InterfaceName>
@@ -1906,7 +1893,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet48</InterfaceName>
@@ -1919,7 +1905,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet52</InterfaceName>
@@ -1932,7 +1917,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet56</InterfaceName>
@@ -1945,7 +1929,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet60</InterfaceName>
@@ -1958,7 +1941,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet64</InterfaceName>
@@ -1971,7 +1953,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet68</InterfaceName>
@@ -1984,7 +1965,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet72</InterfaceName>
@@ -1997,7 +1977,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet76</InterfaceName>
@@ -2010,7 +1989,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet80</InterfaceName>
@@ -2023,7 +2001,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet84</InterfaceName>
@@ -2036,7 +2013,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet88</InterfaceName>
@@ -2049,7 +2025,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet92</InterfaceName>
@@ -2062,7 +2037,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet96</InterfaceName>
@@ -2075,7 +2049,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet100</InterfaceName>
@@ -2088,7 +2061,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet104</InterfaceName>
@@ -2101,7 +2073,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet108</InterfaceName>
@@ -2114,7 +2085,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet112</InterfaceName>
@@ -2127,7 +2097,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet116</InterfaceName>
@@ -2140,7 +2109,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet120</InterfaceName>
@@ -2153,7 +2121,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>true</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet124</InterfaceName>
@@ -2235,6 +2202,362 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA01T2:Ethernet1;arc-switch1026:Ethernet0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA02T2:Ethernet1;arc-switch1026:Ethernet4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA03T2:Ethernet1;arc-switch1026:Ethernet8</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA04T2:Ethernet1;arc-switch1026:Ethernet12</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA05T2:Ethernet1;arc-switch1026:Ethernet16</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA06T2:Ethernet1;arc-switch1026:Ethernet20</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA07T2:Ethernet1;arc-switch1026:Ethernet24</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA08T2:Ethernet1;arc-switch1026:Ethernet28</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA09T2:Ethernet1;arc-switch1026:Ethernet32</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA10T2:Ethernet1;arc-switch1026:Ethernet36</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA11T2:Ethernet1;arc-switch1026:Ethernet40</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA12T2:Ethernet1;arc-switch1026:Ethernet44</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA13T2:Ethernet1;arc-switch1026:Ethernet48</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA14T2:Ethernet1;arc-switch1026:Ethernet52</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA15T2:Ethernet1;arc-switch1026:Ethernet56</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA16T2:Ethernet1;arc-switch1026:Ethernet60</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA01T0:Ethernet1;arc-switch1026:Ethernet64</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA02T0:Ethernet1;arc-switch1026:Ethernet68</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA03T0:Ethernet1;arc-switch1026:Ethernet72</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA04T0:Ethernet1;arc-switch1026:Ethernet76</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA05T0:Ethernet1;arc-switch1026:Ethernet80</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA06T0:Ethernet1;arc-switch1026:Ethernet84</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA07T0:Ethernet1;arc-switch1026:Ethernet88</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA08T0:Ethernet1;arc-switch1026:Ethernet92</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA09T0:Ethernet1;arc-switch1026:Ethernet96</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA10T0:Ethernet1;arc-switch1026:Ethernet100</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA11T0:Ethernet1;arc-switch1026:Ethernet104</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA12T0:Ethernet1;arc-switch1026:Ethernet108</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA13T0:Ethernet1;arc-switch1026:Ethernet112</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA14T0:Ethernet1;arc-switch1026:Ethernet116</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA15T0:Ethernet1;arc-switch1026:Ethernet120</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA16T0:Ethernet1;arc-switch1026:Ethernet124</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>arc-switch1026</Hostname>
   <HwSku>ACS-MSN2700</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/t2-chassis-fe-graph-pc.xml b/src/sonic-config-engine/tests/t2-chassis-fe-graph-pc.xml
index 3fb744ce91fd..bc1a5142fc86 100644
--- a/src/sonic-config-engine/tests/t2-chassis-fe-graph-pc.xml
+++ b/src/sonic-config-engine/tests/t2-chassis-fe-graph-pc.xml
@@ -223,12 +223,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet0</InterfaceName>
@@ -241,7 +239,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet4</InterfaceName>
@@ -254,7 +251,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet8</InterfaceName>
@@ -267,7 +263,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet12</InterfaceName>
@@ -280,7 +275,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet16</InterfaceName>
@@ -293,7 +287,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet20</InterfaceName>
@@ -319,6 +312,76 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet0;Leaf01:Ethernet0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet4;Leaf01:Ethernet4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet8;SpineBack01:Ethernet8</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet12;SpineBack01:Ethernet12</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet16;SpineBack02:Ethernet16</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet20;SpineBack02:Ethernet20</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>SpineFront01</Hostname>
   <HwSku>Force10-S6000</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/t2-chassis-fe-graph-vni.xml b/src/sonic-config-engine/tests/t2-chassis-fe-graph-vni.xml
index f820b180f701..0dc534b3de88 100644
--- a/src/sonic-config-engine/tests/t2-chassis-fe-graph-vni.xml
+++ b/src/sonic-config-engine/tests/t2-chassis-fe-graph-vni.xml
@@ -187,12 +187,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet0</InterfaceName>
@@ -205,7 +203,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet4</InterfaceName>
@@ -218,7 +215,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet8</InterfaceName>
@@ -244,6 +240,43 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet0;Leaf01:Ethernet4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet4;SpineBack01:Ethernet0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet8;SpineBack02:Ethernet4</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>SpineFront01</Hostname>
   <HwSku>Force10-S6000</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/t2-chassis-fe-graph.xml b/src/sonic-config-engine/tests/t2-chassis-fe-graph.xml
index 76320b766be5..3b0c56a57a70 100644
--- a/src/sonic-config-engine/tests/t2-chassis-fe-graph.xml
+++ b/src/sonic-config-engine/tests/t2-chassis-fe-graph.xml
@@ -186,12 +186,10 @@
   </PngDec>
   <DeviceInfos>
     <DeviceInfo>
-      <AutoNegotiation>true</AutoNegotiation>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet0</InterfaceName>
@@ -204,7 +202,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet4</InterfaceName>
@@ -217,7 +214,6 @@
         <a:EthernetInterface>
           <ElementType>DeviceInterface</ElementType>
           <AlternateSpeeds i:nil="true"/>
-          <EnableAutoNegotiation>true</EnableAutoNegotiation>
           <EnableFlowControl>false</EnableFlowControl>
           <Index>1</Index>
           <InterfaceName>Ethernet8</InterfaceName>
@@ -243,6 +239,43 @@
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet0;Leaf01:Ethernet4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet4;SpineBack01:Ethernet0</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>SpineFront01:Ethernet8;SpineBack02:Ethernet4</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
   <Hostname>SpineFront01</Hostname>
   <HwSku>Force10-S6000</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index f6edb58d15a9..c81d56a4fabf 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -23,6 +23,7 @@ def setUp(self):
         self.sample_graph_bgp_speaker = os.path.join(self.test_dir, 't0-sample-bgp-speaker.xml')
         self.sample_device_desc = os.path.join(self.test_dir, 'device.xml')
         self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
+        self.port_config_autoneg = os.path.join(self.test_dir, 't0-sample-autoneg-port-config.ini')
         self.mlnx_port_config = os.path.join(self.test_dir, 'mellanox-sample-port-config.ini')
         self.output_file = os.path.join(self.test_dir, 'output')
         self.output2_file = os.path.join(self.test_dir, 'output2')
@@ -330,7 +331,90 @@ def test_minigraph_port_fec_disabled(self):
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
-            utils.to_dict("{'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '100000'}")
+            utils.to_dict("{'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '100000', 'autoneg': '1'}")
+        )
+
+    def test_minigraph_port_autonegotiation(self):
+        # Test with a port_config.ini file which doesn't have an 'autoneg' column
+        argument = '-m "' + self.sample_graph_t0 + '" -p "' + self.port_config + '" -v "PORT"'
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            utils.to_dict(
+                "{'Ethernet0': {'alias': 'fortyGigE0/0', 'pfc_asym': 'off', 'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'mtu': '9100'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'fortyGigE0/12', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up'}, "
+                "'Ethernet16': {'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/16', 'admin_status': 'up'}, "
+                "'Ethernet20': {'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/20', 'admin_status': 'up'}, "
+                "'Ethernet24': {'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/24', 'admin_status': 'up'}, "
+                "'Ethernet28': {'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/28', 'admin_status': 'up'}, "
+                "'Ethernet32': {'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/32', 'admin_status': 'up'}, "
+                "'Ethernet36': {'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/36', 'admin_status': 'up'}, "
+                "'Ethernet40': {'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/40', 'admin_status': 'up'}, "
+                "'Ethernet44': {'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/44', 'admin_status': 'up'}, "
+                "'Ethernet48': {'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/48', 'admin_status': 'up'}, "
+                "'Ethernet52': {'lanes': '53,54,55,56', 'description': 'fortyGigE0/52', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/52', 'admin_status': 'up'}, "
+                "'Ethernet56': {'lanes': '61,62,63,64', 'description': 'fortyGigE0/56', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/56', 'admin_status': 'up'}, "
+                "'Ethernet60': {'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/60', 'admin_status': 'up'}, "
+                "'Ethernet64': {'lanes': '65,66,67,68', 'description': 'fortyGigE0/64', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/64', 'admin_status': 'up'}, "
+                "'Ethernet68': {'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/68', 'admin_status': 'up'}, "
+                "'Ethernet72': {'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/72', 'admin_status': 'up'}, "
+                "'Ethernet76': {'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/76', 'admin_status': 'up'}, "
+                "'Ethernet80': {'lanes': '105,106,107,108', 'description': 'fortyGigE0/80', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/80', 'admin_status': 'up'}, "
+                "'Ethernet84': {'lanes': '109,110,111,112', 'description': 'fortyGigE0/84', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/84', 'admin_status': 'up'}, "
+                "'Ethernet88': {'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/88', 'admin_status': 'up'}, "
+                "'Ethernet92': {'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/92', 'admin_status': 'up'}, "
+                "'Ethernet96': {'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/96', 'admin_status': 'up'}, "
+                "'Ethernet100': {'lanes': '125,126,127,128', 'description': 'Servers100:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/100', 'admin_status': 'up'}, "
+                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100'}, "
+                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100'}, "
+                "'Ethernet112': {'lanes': '89,90,91,92', 'description': 'ARISTA01T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/112', 'admin_status': 'up'}, "
+                "'Ethernet116': {'lanes': '93,94,95,96', 'description': 'ARISTA02T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/116', 'admin_status': 'up'}, "
+                "'Ethernet120': {'lanes': '97,98,99,100', 'description': 'ARISTA03T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/120', 'admin_status': 'up'}, "
+                "'Ethernet124': {'lanes': '101,102,103,104', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/124', 'admin_status': 'up', 'speed': '100000', 'description': 'ARISTA04T1:Ethernet1/1'}}"
+            )
+        )
+
+        # Test with a port_config.ini file which has an 'autoneg' column
+        argument = '-m "' + self.sample_graph_t0 + '" -p "' + self.port_config_autoneg + '" -v "PORT"'
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            utils.to_dict(
+                "{'Ethernet0': {'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'pfc_asym': 'off', 'autoneg': '0'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'fortyGigE0/12', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet16': {'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/16', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet20': {'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/20', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet24': {'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/24', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet28': {'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/28', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet32': {'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/32', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet36': {'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/36', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet40': {'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/40', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet44': {'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/44', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet48': {'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/48', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet52': {'lanes': '53,54,55,56', 'description': 'fortyGigE0/52', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/52', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet56': {'lanes': '61,62,63,64', 'description': 'fortyGigE0/56', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/56', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet60': {'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/60', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet64': {'lanes': '65,66,67,68', 'description': 'fortyGigE0/64', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/64', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet68': {'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/68', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet72': {'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/72', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet76': {'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/76', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet80': {'lanes': '105,106,107,108', 'description': 'fortyGigE0/80', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/80', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet84': {'lanes': '109,110,111,112', 'description': 'fortyGigE0/84', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/84', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet88': {'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/88', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet92': {'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/92', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet96': {'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/96', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet100': {'lanes': '125,126,127,128', 'description': 'Servers100:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/100', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet104': {'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100', 'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'autoneg': '0'}, "
+                "'Ethernet108': {'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100', 'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'autoneg': '0'}, "
+                "'Ethernet112': {'lanes': '89,90,91,92', 'description': 'ARISTA01T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/112', 'admin_status': 'up', 'autoneg': '1'}, "
+                "'Ethernet116': {'lanes': '93,94,95,96', 'description': 'ARISTA02T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/116', 'admin_status': 'up', 'autoneg': '1'}, "
+                "'Ethernet120': {'lanes': '97,98,99,100', 'description': 'ARISTA03T1:Ethernet1/1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/120', 'admin_status': 'up', 'autoneg': '1'}, "
+                "'Ethernet124': {'lanes': '101,102,103,104', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/124', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000', 'description': 'ARISTA04T1:Ethernet1/1'}}"
+            )
         )
 
     def test_minigraph_port_rs(self):
@@ -383,38 +467,38 @@ def test_minigraph_neighbor_interfaces(self):
         self.assertEqual(
             utils.to_dict(output.strip()),
             utils.to_dict(
-                "{'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '40000', 'mux_cable': 'true'}, "
-                "'Ethernet0': {'lanes': '29,30,31,32', 'description': 'switch-01t1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'admin_status': 'up', 'speed': '10000'}, "
-                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'server1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '25000', 'mux_cable': 'true'}, "
-                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100'}, "
-                "'Ethernet100': {'alias': 'fortyGigE0/100', 'pfc_asym': 'off', 'lanes': '125,126,127,128', 'description': 'fortyGigE0/100', 'mtu': '9100'}, "
-                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100'}, "
-                "'Ethernet68': {'alias': 'fortyGigE0/68', 'pfc_asym': 'off', 'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'mtu': '9100'}, "
-                "'Ethernet96': {'alias': 'fortyGigE0/96', 'pfc_asym': 'off', 'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'mtu': '9100'}, "
-                "'Ethernet124': {'alias': 'fortyGigE0/124', 'pfc_asym': 'off', 'lanes': '101,102,103,104', 'description': 'fortyGigE0/124', 'mtu': '9100'}, "
-                "'Ethernet92': {'alias': 'fortyGigE0/92', 'pfc_asym': 'off', 'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'mtu': '9100'}, "
-                "'Ethernet120': {'alias': 'fortyGigE0/120', 'pfc_asym': 'off', 'lanes': '97,98,99,100', 'description': 'fortyGigE0/120', 'mtu': '9100'}, "
+                "{'Ethernet0': {'lanes': '29,30,31,32', 'description': 'switch-01t1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'admin_status': 'up', 'speed': '10000', 'autoneg': '1'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'server1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '25000', 'autoneg': '1', 'mux_cable': 'true'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '40000', 'autoneg': '1', 'mux_cable': 'true'}, "
+                "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '10000', 'autoneg': '1'}, "
+                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'mtu': '9100'}, "
+                "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'mtu': '9100'}, "
+                "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'mtu': '9100'}, "
+                "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'mtu': '9100'}, "
+                "'Ethernet32': {'alias': 'fortyGigE0/32', 'pfc_asym': 'off', 'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'mtu': '9100'}, "
+                "'Ethernet36': {'alias': 'fortyGigE0/36', 'pfc_asym': 'off', 'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'mtu': '9100'}, "
+                "'Ethernet40': {'alias': 'fortyGigE0/40', 'pfc_asym': 'off', 'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'mtu': '9100'}, "
+                "'Ethernet44': {'alias': 'fortyGigE0/44', 'pfc_asym': 'off', 'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'mtu': '9100'}, "
+                "'Ethernet48': {'alias': 'fortyGigE0/48', 'pfc_asym': 'off', 'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'mtu': '9100'}, "
                 "'Ethernet52': {'alias': 'fortyGigE0/52', 'pfc_asym': 'off', 'lanes': '53,54,55,56', 'description': 'fortyGigE0/52', 'mtu': '9100'}, "
                 "'Ethernet56': {'alias': 'fortyGigE0/56', 'pfc_asym': 'off', 'lanes': '61,62,63,64', 'description': 'fortyGigE0/56', 'mtu': '9100'}, "
-                "'Ethernet76': {'alias': 'fortyGigE0/76', 'pfc_asym': 'off', 'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'mtu': '9100'}, "
-                "'Ethernet72': {'alias': 'fortyGigE0/72', 'pfc_asym': 'off', 'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'mtu': '9100'}, "
+                "'Ethernet60': {'alias': 'fortyGigE0/60', 'pfc_asym': 'off', 'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'mtu': '9100'}, "
                 "'Ethernet64': {'alias': 'fortyGigE0/64', 'pfc_asym': 'off', 'lanes': '65,66,67,68', 'description': 'fortyGigE0/64', 'mtu': '9100'}, "
-                "'Ethernet32': {'alias': 'fortyGigE0/32', 'pfc_asym': 'off', 'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'mtu': '9100'}, "
-                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'mtu': '9100'}, "
-                "'Ethernet36': {'alias': 'fortyGigE0/36', 'pfc_asym': 'off', 'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'mtu': '9100'}, "
-                "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '10000'}, "
-                "'Ethernet88': {'alias': 'fortyGigE0/88', 'pfc_asym': 'off', 'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'mtu': '9100'}, "
-                "'Ethernet116': {'alias': 'fortyGigE0/116', 'pfc_asym': 'off', 'lanes': '93,94,95,96', 'description': 'fortyGigE0/116', 'mtu': '9100'}, "
+                "'Ethernet68': {'alias': 'fortyGigE0/68', 'pfc_asym': 'off', 'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'mtu': '9100'}, "
+                "'Ethernet72': {'alias': 'fortyGigE0/72', 'pfc_asym': 'off', 'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'mtu': '9100'}, "
+                "'Ethernet76': {'alias': 'fortyGigE0/76', 'pfc_asym': 'off', 'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'mtu': '9100'}, "
                 "'Ethernet80': {'alias': 'fortyGigE0/80', 'pfc_asym': 'off', 'lanes': '105,106,107,108', 'description': 'fortyGigE0/80', 'mtu': '9100'}, "
-                "'Ethernet112': {'alias': 'fortyGigE0/112', 'pfc_asym': 'off', 'lanes': '89,90,91,92', 'description': 'fortyGigE0/112', 'mtu': '9100'}, "
                 "'Ethernet84': {'alias': 'fortyGigE0/84', 'pfc_asym': 'off', 'lanes': '109,110,111,112', 'description': 'fortyGigE0/84', 'mtu': '9100'}, "
-                "'Ethernet48': {'alias': 'fortyGigE0/48', 'pfc_asym': 'off', 'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'mtu': '9100'}, "
-                "'Ethernet44': {'alias': 'fortyGigE0/44', 'pfc_asym': 'off', 'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'mtu': '9100'}, "
-                "'Ethernet40': {'alias': 'fortyGigE0/40', 'pfc_asym': 'off', 'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'mtu': '9100'}, "
-                "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'mtu': '9100'}, "
-                "'Ethernet60': {'alias': 'fortyGigE0/60', 'pfc_asym': 'off', 'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'mtu': '9100'}, "
-                "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'mtu': '9100'}, "
-                "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'mtu': '9100'}}"
+                "'Ethernet88': {'alias': 'fortyGigE0/88', 'pfc_asym': 'off', 'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'mtu': '9100'}, "
+                "'Ethernet92': {'alias': 'fortyGigE0/92', 'pfc_asym': 'off', 'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'mtu': '9100'}, "
+                "'Ethernet96': {'alias': 'fortyGigE0/96', 'pfc_asym': 'off', 'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'mtu': '9100'}, "
+                "'Ethernet100': {'alias': 'fortyGigE0/100', 'pfc_asym': 'off', 'lanes': '125,126,127,128', 'description': 'fortyGigE0/100', 'mtu': '9100'}, "
+                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100'}, "
+                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100'}, "
+                "'Ethernet112': {'alias': 'fortyGigE0/112', 'pfc_asym': 'off', 'lanes': '89,90,91,92', 'description': 'fortyGigE0/112', 'mtu': '9100'}, "
+                "'Ethernet116': {'alias': 'fortyGigE0/116', 'pfc_asym': 'off', 'lanes': '93,94,95,96', 'description': 'fortyGigE0/116', 'mtu': '9100'}, "
+                "'Ethernet120': {'alias': 'fortyGigE0/120', 'pfc_asym': 'off', 'lanes': '97,98,99,100', 'description': 'fortyGigE0/120', 'mtu': '9100'}, "
+                "'Ethernet124': {'alias': 'fortyGigE0/124', 'pfc_asym': 'off', 'lanes': '101,102,103,104', 'description': 'fortyGigE0/124', 'mtu': '9100'}}"
             )
         )
 
@@ -425,38 +509,38 @@ def test_minigraph_extra_ethernet_interfaces(self):
         self.assertEqual(
             utils.to_dict(output.strip()),
             utils.to_dict(
-                "{'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '1000'}, "
-                "'Ethernet0': {'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'admin_status': 'up', 'speed': '10000'}, "
+                "{'Ethernet0': {'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'admin_status': 'up', 'speed': '10000'}, "
                 "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'fortyGigE0/4', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '25000'}, "
-                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100'}, "
-                "'Ethernet100': {'alias': 'fortyGigE0/100', 'pfc_asym': 'off', 'lanes': '125,126,127,128', 'description': 'fortyGigE0/100', 'mtu': '9100'}, "
-                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100'}, "
-                "'Ethernet68': {'alias': 'fortyGigE0/68', 'pfc_asym': 'off', 'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'mtu': '9100'}, "
-                "'Ethernet96': {'alias': 'fortyGigE0/96', 'pfc_asym': 'off', 'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'mtu': '9100'}, "
-                "'Ethernet124': {'alias': 'fortyGigE0/124', 'pfc_asym': 'off', 'lanes': '101,102,103,104', 'description': 'fortyGigE0/124', 'mtu': '9100'}, "
-                "'Ethernet92': {'alias': 'fortyGigE0/92', 'pfc_asym': 'off', 'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'mtu': '9100'}, "
-                "'Ethernet120': {'alias': 'fortyGigE0/120', 'pfc_asym': 'off', 'lanes': '97,98,99,100', 'description': 'fortyGigE0/120', 'mtu': '9100'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '1000'}, "
+                "'Ethernet12': {'lanes': '33,34,35,36', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '100000', 'description': 'Interface description'}, "
+                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'mtu': '9100'}, "
+                "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'mtu': '9100'}, "
+                "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'mtu': '9100'}, "
+                "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'mtu': '9100'}, "
+                "'Ethernet32': {'alias': 'fortyGigE0/32', 'pfc_asym': 'off', 'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'mtu': '9100'}, "
+                "'Ethernet36': {'alias': 'fortyGigE0/36', 'pfc_asym': 'off', 'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'mtu': '9100'}, "
+                "'Ethernet40': {'alias': 'fortyGigE0/40', 'pfc_asym': 'off', 'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'mtu': '9100'}, "
+                "'Ethernet44': {'alias': 'fortyGigE0/44', 'pfc_asym': 'off', 'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'mtu': '9100'}, "
+                "'Ethernet48': {'alias': 'fortyGigE0/48', 'pfc_asym': 'off', 'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'mtu': '9100'}, "
                 "'Ethernet52': {'alias': 'fortyGigE0/52', 'pfc_asym': 'off', 'lanes': '53,54,55,56', 'description': 'fortyGigE0/52', 'mtu': '9100'}, "
                 "'Ethernet56': {'alias': 'fortyGigE0/56', 'pfc_asym': 'off', 'lanes': '61,62,63,64', 'description': 'fortyGigE0/56', 'mtu': '9100'}, "
-                "'Ethernet76': {'alias': 'fortyGigE0/76', 'pfc_asym': 'off', 'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'mtu': '9100'}, "
-                "'Ethernet72': {'alias': 'fortyGigE0/72', 'pfc_asym': 'off', 'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'mtu': '9100'}, "
+                "'Ethernet60': {'alias': 'fortyGigE0/60', 'pfc_asym': 'off', 'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'mtu': '9100'}, "
                 "'Ethernet64': {'alias': 'fortyGigE0/64', 'pfc_asym': 'off', 'lanes': '65,66,67,68', 'description': 'fortyGigE0/64', 'mtu': '9100'}, "
-                "'Ethernet32': {'alias': 'fortyGigE0/32', 'pfc_asym': 'off', 'lanes': '9,10,11,12', 'description': 'fortyGigE0/32', 'mtu': '9100'}, "
-                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'mtu': '9100'}, "
-                "'Ethernet36': {'alias': 'fortyGigE0/36', 'pfc_asym': 'off', 'lanes': '13,14,15,16', 'description': 'fortyGigE0/36', 'mtu': '9100'}, "
-                "'Ethernet12': {'lanes': '33,34,35,36', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '100000', 'description': 'Interface description'}, "
-                "'Ethernet88': {'alias': 'fortyGigE0/88', 'pfc_asym': 'off', 'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'mtu': '9100'}, "
-                "'Ethernet116': {'alias': 'fortyGigE0/116', 'pfc_asym': 'off', 'lanes': '93,94,95,96', 'description': 'fortyGigE0/116', 'mtu': '9100'}, "
+                "'Ethernet68': {'alias': 'fortyGigE0/68', 'pfc_asym': 'off', 'lanes': '69,70,71,72', 'description': 'fortyGigE0/68', 'mtu': '9100'}, "
+                "'Ethernet72': {'alias': 'fortyGigE0/72', 'pfc_asym': 'off', 'lanes': '77,78,79,80', 'description': 'fortyGigE0/72', 'mtu': '9100'}, "
+                "'Ethernet76': {'alias': 'fortyGigE0/76', 'pfc_asym': 'off', 'lanes': '73,74,75,76', 'description': 'fortyGigE0/76', 'mtu': '9100'}, "
                 "'Ethernet80': {'alias': 'fortyGigE0/80', 'pfc_asym': 'off', 'lanes': '105,106,107,108', 'description': 'fortyGigE0/80', 'mtu': '9100'}, "
-                "'Ethernet112': {'alias': 'fortyGigE0/112', 'pfc_asym': 'off', 'lanes': '89,90,91,92', 'description': 'fortyGigE0/112', 'mtu': '9100'}, "
                 "'Ethernet84': {'alias': 'fortyGigE0/84', 'pfc_asym': 'off', 'lanes': '109,110,111,112', 'description': 'fortyGigE0/84', 'mtu': '9100'}, "
-                "'Ethernet48': {'alias': 'fortyGigE0/48', 'pfc_asym': 'off', 'lanes': '49,50,51,52', 'description': 'fortyGigE0/48', 'mtu': '9100'}, "
-                "'Ethernet44': {'alias': 'fortyGigE0/44', 'pfc_asym': 'off', 'lanes': '17,18,19,20', 'description': 'fortyGigE0/44', 'mtu': '9100'}, "
-                "'Ethernet40': {'alias': 'fortyGigE0/40', 'pfc_asym': 'off', 'lanes': '21,22,23,24', 'description': 'fortyGigE0/40', 'mtu': '9100'}, "
-                "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'mtu': '9100'}, "
-                "'Ethernet60': {'alias': 'fortyGigE0/60', 'pfc_asym': 'off', 'lanes': '57,58,59,60', 'description': 'fortyGigE0/60', 'mtu': '9100'}, "
-                "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'mtu': '9100'}, "
-                "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'mtu': '9100'}}"
+                "'Ethernet88': {'alias': 'fortyGigE0/88', 'pfc_asym': 'off', 'lanes': '117,118,119,120', 'description': 'fortyGigE0/88', 'mtu': '9100'}, "
+                "'Ethernet92': {'alias': 'fortyGigE0/92', 'pfc_asym': 'off', 'lanes': '113,114,115,116', 'description': 'fortyGigE0/92', 'mtu': '9100'}, "
+                "'Ethernet96': {'alias': 'fortyGigE0/96', 'pfc_asym': 'off', 'lanes': '121,122,123,124', 'description': 'fortyGigE0/96', 'mtu': '9100'}, "
+                "'Ethernet100': {'alias': 'fortyGigE0/100', 'pfc_asym': 'off', 'lanes': '125,126,127,128', 'description': 'fortyGigE0/100', 'mtu': '9100'}, "
+                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'fortyGigE0/104', 'mtu': '9100'}, "
+                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'fortyGigE0/108', 'mtu': '9100'}, "
+                "'Ethernet112': {'alias': 'fortyGigE0/112', 'pfc_asym': 'off', 'lanes': '89,90,91,92', 'description': 'fortyGigE0/112', 'mtu': '9100'}, "
+                "'Ethernet116': {'alias': 'fortyGigE0/116', 'pfc_asym': 'off', 'lanes': '93,94,95,96', 'description': 'fortyGigE0/116', 'mtu': '9100'}, "
+                "'Ethernet120': {'alias': 'fortyGigE0/120', 'pfc_asym': 'off', 'lanes': '97,98,99,100', 'description': 'fortyGigE0/120', 'mtu': '9100'}, "
+                "'Ethernet124': {'alias': 'fortyGigE0/124', 'pfc_asym': 'off', 'lanes': '101,102,103,104', 'description': 'fortyGigE0/124', 'mtu': '9100'}}"
             )
         )
 
diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
index 83955925c9e5..542b480da72d 100644
--- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py
+++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
@@ -176,15 +176,15 @@ def test_backend_asic_portchannel_intf(self):
     def test_frontend_asic_ports(self):
         argument = "-m {} -p {} -n asic0 --var-json \"PORT\"".format(self.sample_graph, self.port_config[0])
         output = json.loads(self.run_script(argument))
-        self.assertDictEqual(output, \
-           {"Ethernet0": { "admin_status": "up",  "alias": "Ethernet1/1",  "asic_port_name": "Eth0-ASIC0",  "description": "01T2:Ethernet1",  "index": "0",  "lanes": "33,34,35,36",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" }, 
-            "Ethernet4": { "admin_status": "up",  "alias": "Ethernet1/2",  "asic_port_name": "Eth1-ASIC0",  "description": "01T2:Ethernet2",  "index": "1",  "lanes": "29,30,31,32",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" }, 
-            "Ethernet8": { "alias": "Ethernet1/3",  "asic_port_name": "Eth2-ASIC0",  "description": "Ethernet1/3",  "index": "2",  "lanes": "41,42,43,44",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" }, 
-            "Ethernet12": { "alias": "Ethernet1/4",  "asic_port_name": "Eth3-ASIC0",  "description": "Ethernet1/4",  "index": "3",  "lanes": "37,38,39,40",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" }, 
-            "Ethernet-BP0": { "admin_status": "up",  "alias": "Eth4-ASIC0",  "asic_port_name": "Eth4-ASIC0",  "description": "ASIC2:Eth0-ASIC2",  "index": "0",  "lanes": "13,14,15,16",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
-            "Ethernet-BP4": { "admin_status": "up",  "alias": "Eth5-ASIC0",  "asic_port_name": "Eth5-ASIC0",  "description": "ASIC2:Eth1-ASIC2",  "index": "1",  "lanes": "17,18,19,20",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
-            "Ethernet-BP8": { "admin_status": "up",  "alias": "Eth6-ASIC0",  "asic_port_name": "Eth6-ASIC0",  "description": "ASIC3:Eth0-ASIC3",  "index": "2",  "lanes": "21,22,23,24",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
-            "Ethernet-BP12": { "admin_status": "up",  "alias": "Eth7-ASIC0",  "asic_port_name": "Eth7-ASIC0",  "description": "ASIC3:Eth1-ASIC3",  "index": "3",  "lanes": "25,26,27,28",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" }})
+        self.assertDictEqual(output,
+            {"Ethernet0": { "admin_status": "up",  "alias": "Ethernet1/1",  "asic_port_name": "Eth0-ASIC0",  "description": "01T2:Ethernet1",  "index": "0",  "lanes": "33,34,35,36",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000", "autoneg": "1" },
+             "Ethernet4": { "admin_status": "up",  "alias": "Ethernet1/2",  "asic_port_name": "Eth1-ASIC0",  "description": "01T2:Ethernet2",  "index": "1",  "lanes": "29,30,31,32",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000", "autoneg": "1" },
+             "Ethernet8": { "alias": "Ethernet1/3",  "asic_port_name": "Eth2-ASIC0",  "description": "Ethernet1/3",  "index": "2",  "lanes": "41,42,43,44",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" },
+             "Ethernet12": { "alias": "Ethernet1/4",  "asic_port_name": "Eth3-ASIC0",  "description": "Ethernet1/4",  "index": "3",  "lanes": "37,38,39,40",  "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" },
+             "Ethernet-BP0": { "admin_status": "up",  "alias": "Eth4-ASIC0",  "asic_port_name": "Eth4-ASIC0",  "description": "ASIC2:Eth0-ASIC2",  "index": "0",  "lanes": "13,14,15,16",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+             "Ethernet-BP4": { "admin_status": "up",  "alias": "Eth5-ASIC0",  "asic_port_name": "Eth5-ASIC0",  "description": "ASIC2:Eth1-ASIC2",  "index": "1",  "lanes": "17,18,19,20",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+             "Ethernet-BP8": { "admin_status": "up",  "alias": "Eth6-ASIC0",  "asic_port_name": "Eth6-ASIC0",  "description": "ASIC3:Eth0-ASIC3",  "index": "2",  "lanes": "21,22,23,24",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+             "Ethernet-BP12": { "admin_status": "up",  "alias": "Eth7-ASIC0",  "asic_port_name": "Eth7-ASIC0",  "description": "ASIC3:Eth1-ASIC3",  "index": "3",  "lanes": "25,26,27,28",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" }})
 
     def test_frontend_asic_device_neigh(self):
         argument = "-m {} -p {} -n asic0 --var-json \"DEVICE_NEIGHBOR\"".format(self.sample_graph, self.port_config[0])

From 304703068bf1fca99b9f415104a55c7e5d65ca20 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Mon, 29 Mar 2021 23:39:47 -0700
Subject: [PATCH 0316/1674] [sonic-thermalctld] Depend on sonic-platform-common
 (#7181)

Unit tests for thermalctld depend on sonic-platform-common as of https://github.com/Azure/sonic-platform-daemons/pull/157
---
 rules/sonic-thermalctld.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/sonic-thermalctld.mk b/rules/sonic-thermalctld.mk
index 6eb16c5eb3f7..a73196e674c0 100644
--- a/rules/sonic-thermalctld.mk
+++ b/rules/sonic-thermalctld.mk
@@ -4,7 +4,7 @@
 
 SONIC_THERMALCTLD_PY2 = sonic_thermalctld-1.0-py2-none-any.whl
 $(SONIC_THERMALCTLD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-thermalctld
-$(SONIC_THERMALCTLD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2)
+$(SONIC_THERMALCTLD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2)
 $(SONIC_THERMALCTLD_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(SONIC_THERMALCTLD_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY2)
@@ -13,7 +13,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY2)
 
 SONIC_THERMALCTLD_PY3 = sonic_thermalctld-1.0-py3-none-any.whl
 $(SONIC_THERMALCTLD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-thermalctld
-$(SONIC_THERMALCTLD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_THERMALCTLD_PY2)
+$(SONIC_THERMALCTLD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(SONIC_THERMALCTLD_PY2)
 $(SONIC_THERMALCTLD_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 $(SONIC_THERMALCTLD_PY3)_PYTHON_VERSION = 3
 SONIC_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY3)

From 35f29249e9059fec0b18911023932c418fbddb66 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Tue, 30 Mar 2021 08:32:07 -0700
Subject: [PATCH 0317/1674] [sonic-psud] Depend on sonic-platform-common
 (#7182)

Unit tests for psud depend on sonic-platform-common as of Azure/sonic-platform-daemons#154
---
 rules/sonic-psud.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/sonic-psud.mk b/rules/sonic-psud.mk
index b07aa31b2002..a576be3ea03a 100644
--- a/rules/sonic-psud.mk
+++ b/rules/sonic-psud.mk
@@ -4,7 +4,7 @@
 
 SONIC_PSUD_PY2 = sonic_psud-1.0-py2-none-any.whl
 $(SONIC_PSUD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
-$(SONIC_PSUD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2)
+$(SONIC_PSUD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2)
 $(SONIC_PSUD_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(SONIC_PSUD_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_PSUD_PY2)
@@ -13,7 +13,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_PSUD_PY2)
 
 SONIC_PSUD_PY3 = sonic_psud-1.0-py3-none-any.whl
 $(SONIC_PSUD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
-$(SONIC_PSUD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PSUD_PY2)
+$(SONIC_PSUD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(SONIC_PSUD_PY2)
 $(SONIC_PSUD_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 $(SONIC_PSUD_PY3)_PYTHON_VERSION = 3
 SONIC_PYTHON_WHEELS += $(SONIC_PSUD_PY3)

From a0c00250cc1927be68fd7af367e664462a6067e5 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Wed, 31 Mar 2021 22:55:40 +0300
Subject: [PATCH 0318/1674] [device][barefoot] Skip psud for Newport (#7200)

Temporary skip psud for Newport, for Barefoot needs.

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../x86_64-accton_as9516_32d-r0/pmon_daemon_control.json        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json b/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
index a0431d47812a..1059cddb4fa2 100644
--- a/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
+++ b/device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json
@@ -4,6 +4,6 @@
     "skip_thermalctld": false,
     "skip_ledd": true,
     "skip_xcvrd": false,
-    "skip_psud": false,
+    "skip_psud": true,
     "skip_syseepromd": false 
 }

From 72a38526f8f9be3119dbd863d7fff7f13fda0704 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:14:16 -0700
Subject: [PATCH 0319/1674] [determine-reboot-cause] Support 'Kernel Panic'
 reboot cause (#7153)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
If device reboot was caused by kernel panic, then we need retrieve and store the key information into the symbol file previous-reboot-cause.json. The CLI show reboot-cause will read this file to get the reason of previous reboot.

This PR is related to PR in sonic-utilities repo: Azure/sonic-utilities#1486

How I did it
The string variable previous_reboot_cause will be parsed to check whether it contains the keyword Kernel Panic. If it did, then store the keyword and time information into a dictionary.

How to verify it
I verified this change on a virtual testbed.

admin@vlab-01:/host/reboot-cause$ more previous-reboot-cause.json
{"gen_time": "2021_03_24_23_22_35", "cause": "Kernel Panic", "user": "N/A", "time": "Wed 24 Mar 2021 11:22:03 PM UTC", "comment": "N/A"}

admin@vlab-01:/host/reboot-cause$ show reboot-cause
Kernel Panic [Time: Wed 24 Mar 2021 11:22:03 PM UTC]
---
 .../scripts/determine-reboot-cause              | 17 +++++++++++++++--
 .../tests/determine-reboot-cause_test.py        |  8 ++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/sonic-host-services/scripts/determine-reboot-cause b/src/sonic-host-services/scripts/determine-reboot-cause
index 8f1ee0a39b5d..ac304a06a027 100755
--- a/src/sonic-host-services/scripts/determine-reboot-cause
+++ b/src/sonic-host-services/scripts/determine-reboot-cause
@@ -127,7 +127,15 @@ def find_hardware_reboot_cause():
 
 
 def get_reboot_cause_dict(previous_reboot_cause, comment, gen_time):
-    # resultant dictionary
+    """Store the key infomation of device reboot into a dictionary by parsing the string in
+    previous_reboot_cause.
+
+    If user issused a command to reboot device, then user, command and time will be
+    stored into a dictionary.
+
+    If device was rebooted due to the kernel panic, then the string `Kernel Panic` 
+    and time will be stored into a dictionary.
+    """
     reboot_cause_dict = {}
     reboot_cause_dict['gen_time'] = gen_time
     reboot_cause_dict['cause'] = previous_reboot_cause
@@ -142,7 +150,12 @@ def get_reboot_cause_dict(previous_reboot_cause, comment, gen_time):
             reboot_cause_dict['cause'] = match.group(1)
             reboot_cause_dict['user'] = match.group(2)
             reboot_cause_dict['time'] = match.group(3)
-
+    elif re.search(r'Kernel Panic', previous_reboot_cause):
+        match = re.search(r'Kernel Panic \[Time: (.*)\]', previous_reboot_cause)
+        if match is not None:
+            reboot_cause_dict['cause'] = "Kernel Panic"
+            reboot_cause_dict['time'] = match.group(1)
+ 
     return reboot_cause_dict
 
 
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index 381313ba97f5..4eb95ee219ee 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -55,6 +55,9 @@
 GEN_TIME_WATCHDOG = "2020_10_22_03_15_08"
 REBOOT_CAUSE_USER = "User issued 'reboot' command [User: admin, Time: Thu Oct 22 03:11:08 UTC 2020]"
 GEN_TIME_USER = "2020_10_22_03_14_07"
+REBOOT_CAUSE_KERNEL_PANIC = "Kernel Panic [Time: Sun Mar 28 13:45:12 UTC 2021]"
+GEN_TIME_KERNEL_PANIC = "2021_3_28_13_48_49"
+
 
 EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE = "warm-reboot"
 EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER = "User issued 'warm-reboot' command [User: admin, Time: Mon Nov  2 22:37:45 UTC 2020]"
@@ -64,6 +67,7 @@
 
 EXPECTED_WATCHDOG_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_15_08', 'cause': 'Watchdog', 'user': 'N/A', 'time': 'N/A'}
 EXPECTED_USER_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_14_07', 'cause': 'reboot', 'user': 'admin', 'time': 'Thu Oct 22 03:11:08 UTC 2020'}
+EXPECTED_KERNEL_PANIC_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2021_3_28_13_48_49', 'cause': 'Kernel Panic', 'user': 'N/A', 'time': 'Sun Mar 28 13:45:12 UTC 2021'}
 
 
 class TestDetermineRebootCause(object):
@@ -114,3 +118,7 @@ def test_get_reboot_cause_dict_watchdog(self):
     def test_get_reboot_cause_dict_user(self):
         reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_USER, "", GEN_TIME_USER)
         assert reboot_cause_dict == EXPECTED_USER_REBOOT_CAUSE_DICT
+
+    def test_get_reboot_cause_dict_kernel_panic(self):
+        reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_KERNEL_PANIC, "", GEN_TIME_KERNEL_PANIC)
+        assert reboot_cause_dict == EXPECTED_KERNEL_PANIC_REBOOT_CAUSE_DICT

From 1b248c12023ad365d8ca2fa02235d186182d3a9e Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Thu, 1 Apr 2021 06:07:37 +0800
Subject: [PATCH 0320/1674] [submodule]: update sonic-platform-daemons (#7196)

c5be3ca4 [psud] Increase unit test coverage; Refactor mock platform (#154)
450b7d78 Bug fix: the fields that are not supported by vendor should be "N/A" in STATE_DB (#168)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 260cf2dedb74..450b7d783e27 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 260cf2dedb74880a44713b2b37cae6595caeb445
+Subproject commit 450b7d783e2705677127dca711c73105170635ba

From 23c7940787166dc406a21bc145ead7b1118f1d6d Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Sat, 27 Mar 2021 11:42:23 -0700
Subject: [PATCH 0321/1674] [docker-gbsyncd-vs] Run new gbsyncdmgrd in lieu of
 deprecated gbsyncd_startup.py (#7154)

To improve management of docker-gbsyncd-vs. gbsyncd_startup.py simply spawned syncd processes and then exited. In that case, supervisord would no longer manage any processes in the container, and thus there was no way to know if a critical process had exited.

I recently created gbsyncdmgrd to be a more complete, robust replacement for gbsyncd_startup.py.

NOTE: This PR is dependent on the inclusion of gbsyncdmgrd in the sonic-sairedis repo. A submodule update is pending at
#7089
---
 platform/vs/docker-gbsyncd-vs/critical_processes | 2 +-
 platform/vs/docker-gbsyncd-vs/supervisord.conf   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/vs/docker-gbsyncd-vs/critical_processes b/platform/vs/docker-gbsyncd-vs/critical_processes
index bdd6903c5690..4775a3e8af3b 100644
--- a/platform/vs/docker-gbsyncd-vs/critical_processes
+++ b/platform/vs/docker-gbsyncd-vs/critical_processes
@@ -1 +1 @@
-program:syncd
+program:gbsyncdmgrd
diff --git a/platform/vs/docker-gbsyncd-vs/supervisord.conf b/platform/vs/docker-gbsyncd-vs/supervisord.conf
index 68f2c46ab182..9b664ef1b844 100644
--- a/platform/vs/docker-gbsyncd-vs/supervisord.conf
+++ b/platform/vs/docker-gbsyncd-vs/supervisord.conf
@@ -37,8 +37,8 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
-[program:syncd]
-command=/usr/bin/gbsyncd_startup.py
+[program:gbsyncdmgrd]
+command=/usr/bin/gbsyncdmgrd
 priority=3
 autostart=false
 autorestart=false

From dd9be59cd1dc23d56a5c8a7a985057b6ab2a3233 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 1 Apr 2021 12:52:19 -0700
Subject: [PATCH 0322/1674] [202012][dockers][supervisor] Increase event buffer
 size for process exit listener; Set all event buffer sizes to 1024 (#7203)

#### Why I did it

Backport of https://github.com/Azure/sonic-buildimage/pull/7083 to the 202012 branch.

To prevent error [messages](https://dev.azure.com/mssonic/build/_build/results?buildId=2254&view=logs&j=9a13fbcd-e92d-583c-2f89-d81f90cac1fd&t=739db6ba-1b35-5485-5697-de102068d650&l=802) like the following from being logged:

```
Mar 17 02:33:48.523153 vlab-01 INFO swss#supervisord 2021-03-17 02:33:48,518 ERRO pool supervisor-proc-exit-listener event buffer overflowed, discarding event 46
```

This is basically an addendum to https://github.com/Azure/sonic-buildimage/pull/5247, which increased the event buffer size for dependent-startup. While supervisor-proc-exit-listener doesn't subscribe to as many events as dependent-startup, there is still a chance some containers (like swss, as in the example above) have enough processes running to cause an overflow of the default buffer size of 10.

This is especially important for preventing erroneous log_analyzer failures in the sonic-mgmt repo regression tests, which have started occasionally causing PR check builds to fail. Example [here](https://dev.azure.com/mssonic/build/_build/results?buildId=2254&view=logs&j=9a13fbcd-e92d-583c-2f89-d81f90cac1fd&t=739db6ba-1b35-5485-5697-de102068d650&l=802).

I set all supervisor-proc-exit-listener event buffer sizes to 1024, and also updated all dependent-startup event buffer sizes to 1024, as well, to keep things simple, unified, and allow headroom so that we will not need to adjust these values frequently, if at all.
---
 dockers/docker-database/supervisord.conf.j2                    | 1 +
 .../docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2    | 3 ++-
 dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2     | 3 ++-
 dockers/docker-fpm-gobgp/supervisord.conf                      | 1 +
 dockers/docker-fpm-quagga/supervisord.conf                     | 1 +
 dockers/docker-iccpd/supervisord.conf                          | 1 +
 dockers/docker-lldp/supervisord.conf.j2                        | 3 ++-
 dockers/docker-nat/supervisord.conf                            | 3 ++-
 dockers/docker-orchagent/supervisord.conf                      | 3 ++-
 .../docker-platform-monitor/docker-pmon.supervisord.conf.j2    | 3 ++-
 .../docker-router-advertiser.supervisord.conf.j2               | 3 ++-
 dockers/docker-sflow/supervisord.conf                          | 3 ++-
 dockers/docker-snmp/supervisord.conf                           | 3 ++-
 dockers/docker-sonic-mgmt-framework/supervisord.conf           | 2 +-
 dockers/docker-sonic-restapi/supervisord.conf                  | 3 ++-
 dockers/docker-sonic-telemetry/supervisord.conf                | 3 ++-
 dockers/docker-teamd/supervisord.conf                          | 3 ++-
 platform/barefoot/docker-syncd-bfn/supervisord.conf            | 3 ++-
 platform/broadcom/docker-syncd-brcm/supervisord.conf           | 3 ++-
 platform/cavium/docker-syncd-cavm/supervisord.conf             | 1 +
 platform/centec-arm64/docker-syncd-centec/supervisord.conf     | 3 ++-
 platform/centec/docker-syncd-centec/supervisord.conf           | 2 ++
 platform/innovium/docker-syncd-invm/supervisord.conf           | 2 +-
 platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf      | 3 ++-
 platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf      | 3 ++-
 platform/marvell/docker-syncd-mrvl/supervisord.conf            | 3 ++-
 platform/mellanox/docker-syncd-mlnx/supervisord.conf           | 3 ++-
 platform/nephos/docker-syncd-nephos/supervisord.conf           | 3 ++-
 platform/vs/docker-gbsyncd-vs/supervisord.conf                 | 2 ++
 platform/vs/docker-syncd-vs/supervisord.conf                   | 3 ++-
 .../tests/sample_output/py2/docker-dhcp-relay.supervisord.conf | 3 ++-
 .../tests/sample_output/py3/docker-dhcp-relay.supervisord.conf | 3 ++-
 32 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/dockers/docker-database/supervisord.conf.j2 b/dockers/docker-database/supervisord.conf.j2
index 616475fb07ce..b063016eb68a 100644
--- a/dockers/docker-database/supervisord.conf.j2
+++ b/dockers/docker-database/supervisord.conf.j2
@@ -8,6 +8,7 @@ command=/usr/bin/supervisor-proc-exit-listener --container-name database
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 127b1beab989..e6558312f6fe 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index dd43e0cc4ec7..fec72db761cc 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
index e7e3ee9f301a..625f867950df 100644
--- a/dockers/docker-fpm-gobgp/supervisord.conf
+++ b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -8,6 +8,7 @@ command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:start.sh]
 command=/usr/bin/start.sh
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
index 470dea18a16d..69258ada037f 100644
--- a/dockers/docker-fpm-quagga/supervisord.conf
+++ b/dockers/docker-fpm-quagga/supervisord.conf
@@ -8,6 +8,7 @@ command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:start.sh]
 command=/usr/bin/start.sh
diff --git a/dockers/docker-iccpd/supervisord.conf b/dockers/docker-iccpd/supervisord.conf
index 716ca96b40c8..323389aca3e2 100644
--- a/dockers/docker-iccpd/supervisord.conf
+++ b/dockers/docker-iccpd/supervisord.conf
@@ -10,6 +10,7 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-lldp/supervisord.conf.j2 b/dockers/docker-lldp/supervisord.conf.j2
index 3a84caee3040..48f0a6c91f64 100644
--- a/dockers/docker-lldp/supervisord.conf.j2
+++ b/dockers/docker-lldp/supervisord.conf.j2
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name lldp
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-nat/supervisord.conf b/dockers/docker-nat/supervisord.conf
index f03b0b3772b8..8d7e184efc49 100644
--- a/dockers/docker-nat/supervisord.conf
+++ b/dockers/docker-nat/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name nat
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index af68c8c38ab7..984f0a2ab7df 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=100
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name swss
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index c205d3cc25dc..8347ee10f968 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=100
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name pmon
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index 9312a1a20c14..6df8e4527af4 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-script]
 command=/usr/bin/supervisor-proc-exit-listener --container-name radv
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf
index 3ff5ff564544..2c8b006df917 100644
--- a/dockers/docker-sflow/supervisord.conf
+++ b/dockers/docker-sflow/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name sflow
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-snmp/supervisord.conf b/dockers/docker-snmp/supervisord.conf
index 414445fdd6d6..06e11eb5fbed 100644
--- a/dockers/docker-snmp/supervisord.conf
+++ b/dockers/docker-snmp/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name snmp
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-sonic-mgmt-framework/supervisord.conf b/dockers/docker-sonic-mgmt-framework/supervisord.conf
index f3060fb95d57..1fcf2a580999 100644
--- a/dockers/docker-sonic-mgmt-framework/supervisord.conf
+++ b/dockers/docker-sonic-mgmt-framework/supervisord.conf
@@ -10,7 +10,7 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index 44508ce88138..5cfb3f0a4549 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name restapi
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-sonic-telemetry/supervisord.conf b/dockers/docker-sonic-telemetry/supervisord.conf
index fa8c86f597c7..5ab0e3ca59da 100644
--- a/dockers/docker-sonic-telemetry/supervisord.conf
+++ b/dockers/docker-sonic-telemetry/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name telemetry
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
index 04432a31239a..1c0d498c10b8 100644
--- a/dockers/docker-teamd/supervisord.conf
+++ b/dockers/docker-teamd/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name teamd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/barefoot/docker-syncd-bfn/supervisord.conf b/platform/barefoot/docker-syncd-bfn/supervisord.conf
index c83484e5e93b..62230f8be9d0 100644
--- a/platform/barefoot/docker-syncd-bfn/supervisord.conf
+++ b/platform/barefoot/docker-syncd-bfn/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
index 5e801106972f..7f1943600a31 100644
--- a/platform/broadcom/docker-syncd-brcm/supervisord.conf
+++ b/platform/broadcom/docker-syncd-brcm/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
index 91b94a258033..0f1ae5593486 100644
--- a/platform/cavium/docker-syncd-cavm/supervisord.conf
+++ b/platform/cavium/docker-syncd-cavm/supervisord.conf
@@ -8,6 +8,7 @@ command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:start.sh]
 command=/usr/bin/start.sh
diff --git a/platform/centec-arm64/docker-syncd-centec/supervisord.conf b/platform/centec-arm64/docker-syncd-centec/supervisord.conf
index 10f406129d9c..c4cadf37c602 100755
--- a/platform/centec-arm64/docker-syncd-centec/supervisord.conf
+++ b/platform/centec-arm64/docker-syncd-centec/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf
index 6df1893a0be0..944c3be9171e 100644
--- a/platform/centec/docker-syncd-centec/supervisord.conf
+++ b/platform/centec/docker-syncd-centec/supervisord.conf
@@ -10,12 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/innovium/docker-syncd-invm/supervisord.conf b/platform/innovium/docker-syncd-invm/supervisord.conf
index ffdb5fd85c47..c12c31987f1b 100755
--- a/platform/innovium/docker-syncd-invm/supervisord.conf
+++ b/platform/innovium/docker-syncd-invm/supervisord.conf
@@ -10,7 +10,7 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf b/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
index 10f406129d9c..c4cadf37c602 100644
--- a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
index e633b4fe115c..021ac2cfa082 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/marvell/docker-syncd-mrvl/supervisord.conf b/platform/marvell/docker-syncd-mrvl/supervisord.conf
index 94be9dd268f6..ef78e2cbc969 100644
--- a/platform/marvell/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell/docker-syncd-mrvl/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
index 8491d762bf51..6fd59606062d 100644
--- a/platform/mellanox/docker-syncd-mlnx/supervisord.conf
+++ b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/nephos/docker-syncd-nephos/supervisord.conf b/platform/nephos/docker-syncd-nephos/supervisord.conf
index 955021ad2d51..944c3be9171e 100644
--- a/platform/nephos/docker-syncd-nephos/supervisord.conf
+++ b/platform/nephos/docker-syncd-nephos/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/vs/docker-gbsyncd-vs/supervisord.conf b/platform/vs/docker-gbsyncd-vs/supervisord.conf
index 9b664ef1b844..b539349bcf47 100644
--- a/platform/vs/docker-gbsyncd-vs/supervisord.conf
+++ b/platform/vs/docker-gbsyncd-vs/supervisord.conf
@@ -10,12 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name gbsyncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/platform/vs/docker-syncd-vs/supervisord.conf b/platform/vs/docker-syncd-vs/supervisord.conf
index 6a6d946632e0..7e18237b7dee 100644
--- a/platform/vs/docker-syncd-vs/supervisord.conf
+++ b/platform/vs/docker-syncd-vs/supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=25
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index 1d5b61390438..3a1269c43533 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index 8b836dec38af..e5e5462bde77 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -10,13 +10,14 @@ autorestart=unexpected
 startretries=0
 exitcodes=0,3
 events=PROCESS_STATE
-buffer_size=50
+buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected
+buffer_size=1024
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n -iNONE

From a86cdd87cffd1ea7535812d56719081b3550791d Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 1 Apr 2021 13:11:15 -0700
Subject: [PATCH 0323/1674] Revert "Backport ethtool to support QSFP-DD
 (#5725)"

This reverts commit 50e4cc1579e4b40f48e251fdaa1b67c9619156e2.
---
 build_debian.sh                               |  1 +
 dockers/docker-platform-monitor/Dockerfile.j2 |  1 +
 rules/docker-platform-monitor.mk              |  3 +--
 rules/ethtool.dep                             |  8 --------
 rules/ethtool.mk                              | 13 -------------
 src/ethtool/Makefile                          | 19 -------------------
 6 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 rules/ethtool.dep
 delete mode 100644 rules/ethtool.mk
 delete mode 100644 src/ethtool/Makefile

diff --git a/build_debian.sh b/build_debian.sh
index 662efde9f94b..3559560b1ed4 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -297,6 +297,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     squashfs-tools          \
     grub2-common            \
     rsyslog                 \
+    ethtool                 \
     screen                  \
     hping3                  \
     tcptraceroute           \
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index e86f4ad0019b..fc46dc6a52b9 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -22,6 +22,7 @@ RUN apt-get update &&   \
         rrdtool         \
         python-smbus    \
         python3-smbus   \
+        ethtool         \
         dmidecode       \
         i2c-tools
 
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index b650f74a174d..547fbf60813f 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -6,7 +6,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK).
 
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/$(DOCKER_PLATFORM_MONITOR_STEM)
 
-$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(ETHTOOL)
+$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS)
 
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
@@ -66,5 +66,4 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
-$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool
 $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/ethtool.dep b/rules/ethtool.dep
deleted file mode 100644
index 15a96084046e..000000000000
--- a/rules/ethtool.dep
+++ /dev/null
@@ -1,8 +0,0 @@
-SPATH       := $($(ETHTOOL)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/ethtool.mk rules/ethtool.dep
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(ETHTOOL)_CACHE_MODE  := GIT_CONTENT_SHA
-$(ETHTOOL)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(ETHTOOL)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/ethtool.mk b/rules/ethtool.mk
deleted file mode 100644
index b79eaad7afa9..000000000000
--- a/rules/ethtool.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# ethtool
-
-ETHTOOL_VERSION_BASE = 5.9
-export ETHTOOL_VERSION_BASE
-
-ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
-$(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool
-SONIC_MAKE_DEBS += $(ETHTOOL)
-
-ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
-$(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG)))
-
-export ETHTOOL ETHTOOL_DBG
diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile
deleted file mode 100644
index 2f5a3acc94de..000000000000
--- a/src/ethtool/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-MAIN_TARGET = $(ETHTOOL)
-DERIVED_TARGET = $(ETHTOOL_DBG)
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Obtaining the ethtool debian package
-	rm -rf ethtool*
-	git clone https://salsa.debian.org/kernel-team/ethtool/
-	pushd ethtool
-	git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
-	# Build package
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-	popd
-	mv $(DERIVED_TARGET) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

From 324198e799b0a210f97ee72d568eecd69a7e93cd Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Thu, 1 Apr 2021 19:46:37 -0700
Subject: [PATCH 0324/1674] [202012][submodule] Update sonic-swss,
 sonic-swss-common, and sonic-utilites submodules (#7209)

sonic-swss
-[SFlowMgr] Sflow Crash on 200G ports handled (#1683)
-Stablize the test case (#1679)
-Remove PGs from an administratively down port. (#1677)

sonic-swss-common
- fix getting hash from redis db (#465)
- [dbconnector] Initialize redisContext (#464)

sonic-utilities
- route_check: Fix hanging & logging level (#1520)
- Add self timeout and crash if exceeded. (#1502)
- [reboot] User-friendly reboot cause message for kernel panic (#1486)
- [acl-loader]: do not add default deny rule for egress acl (#1531)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss        | 2 +-
 src/sonic-swss-common | 2 +-
 src/sonic-utilities   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 5d8d1fbdff1c..dad68b54f10c 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 5d8d1fbdff1cd2ce4a190dea95f08679bedf757c
+Subproject commit dad68b54f10c39d3a135de5b5c80dc83d1b578bf
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index f01fede8500a..f59b5720d88f 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit f01fede8500a499ce94f3573f0bb6c3c5991efe7
+Subproject commit f59b5720d88f58dd575a56040bb75bb1bcd4f913
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 83f068b6a218..5a14b413b185 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 83f068b6a21890eeedd32b64ffc14087d21ae435
+Subproject commit 5a14b413b1854f1325404a1f022ed26166093932

From dfda1304ffa5d12cbe383c6ba0f82505ddbd2633 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sat, 3 Apr 2021 00:39:47 +0800
Subject: [PATCH 0325/1674] [submodule] : update sonic-linux-kernel (#7212)

b67c2782 [Mellanox] Backport patch to remove critical trip point from thermal zones (#201)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index d8f934c3da5f..b67c27820ada 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit d8f934c3da5ff605f2359f9bd648da300771dce6
+Subproject commit b67c27820adaa182d97f402c5f90af62a55e7b5b

From 63625fc816fc0faac5df3c133ac82c3d517ebfdb Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 1 Apr 2021 13:45:06 +0800
Subject: [PATCH 0326/1674] Fix CVE-2017-1000487 security alert (#7173)

#### Why I did it
Plexus-utils before 3.0.16 is vulnerable to command injection because it does not correctly process the contents of double quoted strings.

#### How I did it
Upgrade to 3.0.16
---
 src/thrift/Makefile                          |  1 +
 src/thrift/patch/0002-cve-2017-1000487.patch | 25 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 src/thrift/patch/0002-cve-2017-1000487.patch

diff --git a/src/thrift/Makefile b/src/thrift/Makefile
index 2d1d4187135f..2580002fd457 100644
--- a/src/thrift/Makefile
+++ b/src/thrift/Makefile
@@ -26,6 +26,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# saithrift implementation relies on the bug in union serialization
 	# (https://jira.apache.org/jira/browse/THRIFT-3650)
 	patch -p1 < ../patch/0001-Revert-THRIFT-3650-incorrect-union-serialization.patch
+	patch -p1 < ../patch/0002-cve-2017-1000487.patch
 	CXXFLAGS="-DFORCE_BOOST_SMART_PTR" DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
diff --git a/src/thrift/patch/0002-cve-2017-1000487.patch b/src/thrift/patch/0002-cve-2017-1000487.patch
new file mode 100644
index 000000000000..ee9a18d150ae
--- /dev/null
+++ b/src/thrift/patch/0002-cve-2017-1000487.patch
@@ -0,0 +1,25 @@
+From 99d698c5247284319248e287bbce2762490fb70b Mon Sep 17 00:00:00 2001
+From: xumia <xumia@microsoft.com>
+Date: Mon, 29 Mar 2021 09:57:38 +0000
+Subject: [PATCH] Fix CVE-2017-1000487 security alert
+
+---
+ contrib/thrift-maven-plugin/pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml
+index 76d0d4f3a..7313b69bf 100644
+--- a/contrib/thrift-maven-plugin/pom.xml
++++ b/contrib/thrift-maven-plugin/pom.xml
+@@ -75,7 +75,7 @@
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+-      <version>3.0.14</version>
++      <version>3.0.16</version>
+     </dependency>
+     <dependency>
+       <groupId>org.mockito</groupId>
+-- 
+2.17.1
+

From 3e8022c0f6e0854bf4437d3832afb4660eadce77 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Thu, 1 Apr 2021 22:41:49 -0700
Subject: [PATCH 0327/1674] [sonic-sairedis] Update submodule (#7202)

1906fdf [pyext] Update Makefile to disable warning Wconversion for older swig (#817)
1dbcaeb Remove gbsyncd_startup.py (#813)
0372615 [vslib] Refresh queue pause status (#814)
00d883c [sairedis] Add sai_dbg_generate_dump api to redis interface (#811)
8585803 [sairedis] Unlock api mutex for communication mode (#812)
c69549a [pyext] Add SWIG sairedis python submodule (#806)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 13474d17435d..1906fdf30e2e 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 13474d17435d3876e7bd6b50133d25bb11dd3c54
+Subproject commit 1906fdf30e2e890a2819bd30ec141476422ffc53

From c63b59698cb7aab648e40977ca4ee4e090c3aaaf Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Fri, 2 Apr 2021 08:05:46 -0700
Subject: [PATCH 0328/1674] [container_checker] Exclude the 'always_disabled'
 container from expected running container list (#7217)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
Since we introduced a new value always_disabled for the state field in FEATURE table, the expected running container list
should exclude the always_diabled containers. This bug was found by nightly test and posted at here: issue. This PR fixes #7210.

How I did it
I added a logic condition to decide whether the value of state field of a container was always_disabled or not.

How to verify it
I verified this on the device str-dx010-acs-1.

Which release branch to backport (provide reason below if selected)
 201811
 201911
 202006
[ x] 202012
---
 files/image_config/monit/container_checker | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/image_config/monit/container_checker b/files/image_config/monit/container_checker
index abfbb34430bb..88c288fccd65 100755
--- a/files/image_config/monit/container_checker
+++ b/files/image_config/monit/container_checker
@@ -48,11 +48,11 @@ def get_command_result(command):
 def get_expected_running_containers():
     """
     @summary: This function will get the expected running containers by following the rule:
-              The 'state' field of container in 'FEATURE' table should not be 'disabled'. Then
-              if the device has Multi-ASIC, this function will get container list by determining the
+              The 'state' field of container in 'FEATURE' table should not be 'disabled' or 'always_disabled'.
+              If the device has Multi-ASIC, this function will get container list by determining the
               value of field 'has_global_scope', the number of ASICs and the value of field
-              'has_per_asic_scope'. If the device has single ASIC, the container name was put into
-              the list.
+              'has_per_asic_scope'.
+              If the device has single ASIC, the container name was put into the list.
     @return:  A set which contains the expected running containers.
     """
     config_db = swsssdk.ConfigDBConnector()
@@ -62,7 +62,7 @@ def get_expected_running_containers():
     expected_running_containers = set()
 
     for container_name in feature_table.keys():
-        if feature_table[container_name]["state"] != "disabled":
+        if feature_table[container_name]["state"] not in ["disabled", "always_disabled"]:
             if multi_asic.is_multi_asic():
                 if feature_table[container_name]["has_global_scope"] == "True":
                     expected_running_containers.add(container_name)

From 2c83bb1512caf64e21bb7ada280382843ad252a2 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Sun, 4 Apr 2021 10:40:53 +0300
Subject: [PATCH 0329/1674] [install.sh] Fix CPU cstates configuration. (#7222)

The motivation of these changes is to fix (#6051):

- Why I did it
To fix CPU cstates configuration

- How I did it
Updated code to be POSIX compatible

- How to verify it
root@sonic:/home/admin# sonic_installer install sonic-mellanox.bin

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 installer/x86_64/install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 5fa0cc087776..50b156f33455 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -542,9 +542,10 @@ trap_push "rm $grub_cfg || true"
 [ -r ./platform.conf ] && . ./platform.conf
 
 # Check if the CPU vendor is 'Intel' and disable c-states if True
-CPUVENDOR=$(cat /proc/cpuinfo | grep -m 1 vendor_id | awk '{print $3}')
+CPUVENDOR="$(cat /proc/cpuinfo | grep -m 1 vendor_id | awk '{print $3}')"
 echo "Switch CPU vendor is: $CPUVENDOR"
-if [[ $(echo $CPUVENDOR | grep -i "Intel") ]] ; then
+if echo "$CPUVENDOR" | grep -i 'Intel' >/dev/null 2>&1; then
+    echo "Switch CPU cstates are: disabled"
     CSTATES="intel_idle.max_cstate=0"
 else
     CSTATES=""

From 27fe336d81304787af53a23843f167884d3a00e0 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Sat, 3 Apr 2021 00:08:31 +0700
Subject: [PATCH 0330/1674] [device/celestica]: Fix failed test cases of DX010
 platform APIs (#6564)

1. Add device/celestica/x86_64-cel_seastone-r0/platform.json
2. Update functions to support python3.7
3. Add more functions follow latest sonic_platform_base
4. Fix the bug

Co-authored-by: 119064273 <2276096708@qq.com>
Co-authored-by: Eric Zhu <erzhu@celestica.com>
Co-authored-by: doni@celestica.com <doni@celestica.com>
---
 .../x86_64-cel_seastone-r0/platform.json      |  242 +++
 .../sonic_platform/chassis.py                 |   89 +-
 .../sonic_platform/component.py               |   58 +
 .../sonic_platform/eeprom.py                  |   49 +-
 .../sonic_platform/fan.py                     |  104 +-
 .../sonic_platform/fan_drawer.py              |  108 ++
 .../sonic_platform/psu.py                     |  182 +-
 .../sonic_platform/sfp.py                     | 1497 +++++++++++++----
 .../sonic_platform/thermal.py                 |   82 +-
 .../sonic_platform/watchdog.py                |    3 +
 .../debian/platform-modules-dx010.init        |   29 +-
 .../debian/platform-modules-dx010.install     |    1 +
 .../platform_api/platform_api_mgnt.sh         |   15 +-
 13 files changed, 2031 insertions(+), 428 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform.json b/device/celestica/x86_64-cel_seastone-r0/platform.json
index 66ed83ef2060..4b60c664ab4b 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform.json
@@ -1,4 +1,246 @@
 {
+    "chassis": {
+        "name": "Celestica-DX010-C32",
+        "components": [
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            },
+            {
+                "name": "CPLD4"
+            },
+            {
+                "name": "BIOS"
+            }
+        ],
+        "fans": [
+            {
+                "name": "FAN-1F"
+            },
+            {
+                "name": "FAN-1R"
+            },
+            {
+                "name": "FAN-2F"
+            },
+            {
+                "name": "FAN-2R"
+            },
+            {
+                "name": "FAN-3F"
+            },
+            {
+                "name": "FAN-3R"
+            },
+            {
+                "name": "FAN-4F"
+            },
+            {
+                "name": "FAN-4R"
+            },
+            {
+                "name": "FAN-5F"
+            },
+            {
+                "name": "FAN-5R"
+            }
+        ],
+        "fan_drawers": [
+            {
+                "name": "Drawer1",
+                "fans": [
+                    {
+                        "name": "FAN-1F"
+                    },
+                    {
+                        "name": "FAN-1R"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer2",
+                "fans": [
+                    {
+                        "name": "FAN-2F"
+                    },
+                    {
+                        "name": "FAN-2R"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer3",
+                "fans": [
+                    {
+                        "name": "FAN-3F"
+                    },
+                    {
+                        "name": "FAN-3R"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer4",
+                "fans": [
+                    {
+                        "name": "FAN-4F"
+                    },
+                    {
+                        "name": "FAN-4R"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer5",
+                "fans": [
+                    {
+                        "name": "FAN-5F"
+                    },
+                    {
+                        "name": "FAN-5R"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU-1",
+                "fans": [
+                    {
+                        "name": "PSU-1 FAN-1"
+                    }
+                ]
+            },
+            {
+                "name": "PSU-2",
+                "fans": [
+                    {
+                        "name": "PSU-2 FAN-1"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "Front-panel temp sensor 1"
+            },
+            {
+                "name": "Front-panel temp sensor 2"
+            },
+            {
+                "name": "ASIC temp sensor"
+            },
+            {
+                "name": "Rear-panel temp sensor 1"
+            },
+            {
+                "name": "Rear-panel temp sensor 2"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "Ethernet124"
+            },
+            {
+                "name": "Ethernet0"
+            },
+            {
+                "name": "Ethernet4"
+            },
+            {
+                "name": "Ethernet8"
+            },
+            {
+                "name": "Ethernet12"
+            },
+            {
+                "name": "Ethernet16"
+            },
+            {
+                "name": "Ethernet20"
+            },
+            {
+                "name": "Ethernet24"
+            },
+            {
+                "name": "Ethernet28"
+            },
+            {
+                "name": "Ethernet32"
+            },
+            {
+                "name": "Ethernet36"
+            },
+            {
+                "name": "Ethernet40"
+            },
+            {
+                "name": "Ethernet44"
+            },
+            {
+                "name": "Ethernet48"
+            },
+            {
+                "name": "Ethernet52"
+            },
+            {
+                "name": "Ethernet56"
+            },
+            {
+                "name": "Ethernet60"
+            },
+            {
+                "name": "Ethernet64"
+            },
+            {
+                "name": "Ethernet68"
+            },
+            {
+                "name": "Ethernet72"
+            },
+            {
+                "name": "Ethernet76"
+            },
+            {
+                "name": "Ethernet80"
+            },
+            {
+                "name": "Ethernet84"
+            },
+            {
+                "name": "Ethernet88"
+            },
+            {
+                "name": "Ethernet92"
+            },
+            {
+                "name": "Ethernet96"
+            },
+            {
+                "name": "Ethernet100"
+            },
+            {
+                "name": "Ethernet104"
+            },
+            {
+                "name": "Ethernet108"
+            },
+            {
+                "name": "Ethernet112"
+            },
+            {
+                "name": "Ethernet116"
+            },
+            {
+                "name": "Ethernet120"
+            }
+        ]
+    },
     "interfaces": {
         "Ethernet0": {
             "index": "1,1,1,1",
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
index 1b5c5773e27b..8a9ed17139df 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
@@ -17,7 +17,6 @@
     raise ImportError(str(e) + "- required module not found")
 
 NUM_FAN_TRAY = 5
-NUM_FAN = 2
 NUM_PSU = 2
 NUM_THERMAL = 5
 NUM_SFP = 32
@@ -28,6 +27,7 @@
 PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
 GETREG_PATH = "/sys/devices/platform/dx010_cpld/getreg"
 HOST_CHK_CMD = "docker > /dev/null 2>&1"
+STATUS_LED_PATH = "/sys/devices/platform/leds_dx010/leds/dx010:green:stat/brightness"
 
 
 class Chassis(ChassisBase):
@@ -40,12 +40,10 @@ def __init__(self):
         self.__initialize_eeprom()
         self.is_host = self._api_helper.is_host()
 
-        if not self.is_host:
-            self.__initialize_fan()
-            self.__initialize_psu()
-            self.__initialize_thermals()
-        else:
-            self.__initialize_components()
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
 
     def __initialize_sfp(self):
         sfputil_helper = SfpUtilHelper()
@@ -54,8 +52,7 @@ def __initialize_sfp(self):
 
         from sonic_platform.sfp import Sfp
         for index in range(0, NUM_SFP):
-            name_idx = 0 if index+1 == NUM_SFP else index+1
-            sfp = Sfp(index, sfputil_helper.logical[name_idx])
+            sfp = Sfp(index, sfputil_helper.logical[index])
             self._sfp_list.append(sfp)
         self.sfp_module_initialized = True
 
@@ -66,11 +63,11 @@ def __initialize_psu(self):
             self._psu_list.append(psu)
 
     def __initialize_fan(self):
-        from sonic_platform.fan import Fan
-        for fant_index in range(0, NUM_FAN_TRAY):
-            for fan_index in range(0, NUM_FAN):
-                fan = Fan(fant_index, fan_index)
-                self._fan_list.append(fan)
+        from sonic_platform.fan_drawer import FanDrawer
+        for i in range(NUM_FAN_TRAY):
+            fandrawer = FanDrawer(i)
+            self._fan_drawer_list.append(fandrawer)
+            self._fan_list.extend(fandrawer._fan_list)
 
     def __initialize_thermals(self):
         from sonic_platform.thermal import Thermal
@@ -90,7 +87,9 @@ def __initialize_components(self):
             self._component_list.append(component)
 
     def __get_air_flow(self):
-        air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(self._api_helper.platform) if self.is_host else '/usr/share/sonic/platform/fan_airflow'
+        air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(
+            self._api_helper.platform) \
+            if self.is_host else '/usr/share/sonic/platform/fan_airflow'
         air_flow = self._api_helper.read_one_line_file(air_flow_path)
         return air_flow or 'B2F'
 
@@ -155,7 +154,6 @@ def get_reboot_cause(self):
 
         return prev_reboot_cause
 
-
     def get_change_event(self, timeout=0):
         """
         Returns a nested dictionary containing all devices which have
@@ -231,7 +229,7 @@ def get_sfp(self, index):
 
         try:
             # The index will start from 1
-            sfp = self._sfp_list[index-1]
+            sfp = self._sfp_list[index - 1]
         except IndexError:
             sys.stderr.write("SFP index {} out of range (1-{})\n".format(
                              index, len(self._sfp_list)))
@@ -254,6 +252,10 @@ def get_watchdog(self):
 
         return self._watchdog
 
+    def get_thermal_manager(self):
+        from .thermal_manager import ThermalManager
+        return ThermalManager
+
     ##############################################################
     ###################### Device methods ########################
     ##############################################################
@@ -298,6 +300,53 @@ def get_status(self):
         """
         return True
 
-    def get_thermal_manager(self):
-        from .thermal_manager import ThermalManager
-        return ThermalManager
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+
+        set_status_str = {
+            self.STATUS_LED_COLOR_GREEN: '1',
+            self.STATUS_LED_COLOR_OFF: '0'
+        }.get(color, None)
+
+        if not set_status_str:
+            return False
+
+        return self._api_helper.write_txt_file(STATUS_LED_PATH, set_status_str)
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status = self._api_helper.read_txt_file(STATUS_LED_PATH)
+        status_str = {
+            '255': self.STATUS_LED_COLOR_GREEN,
+            '0': self.STATUS_LED_COLOR_OFF
+        }.get(status, None)
+
+        return status_str
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
index 2833bf4d1cc5..2db8418e18a9 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
@@ -128,3 +128,61 @@ def install_firmware(self, image_path):
         #     install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
 
         return self.__run_command(install_command)
+
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return 'N/A'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return 'N/A'
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
index b2b4a8122590..b0d37d57beac 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
@@ -8,24 +8,22 @@
 #############################################################################
 
 try:
-    import glob
     import os
     import sys
     import re
-    from array import array
 
     if sys.version_info.major == 3:
         from io import StringIO
     else:
         from cStringIO import StringIO
 
-    from sonic_platform_base.sonic_eeprom import eeprom_dts
     from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
 CACHE_FILE = 'syseeprom_cache'
+NULL = 'N/A'
 
 
 class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
@@ -52,7 +50,7 @@ def __parse_output(self, decode_output):
                     value = match.group(3).rstrip('\0')
 
                 _eeprom_info_dict[idx] = value
-            except:
+            except BaseException:
                 pass
         return _eeprom_info_dict
 
@@ -61,7 +59,7 @@ def _load_eeprom(self):
         sys.stdout = StringIO()
         try:
             self.read_eeprom_db()
-        except:
+        except BaseException:
             decode_output = sys.stdout.getvalue()
             sys.stdout = original_stdout
             return self.__parse_output(decode_output)
@@ -73,7 +71,7 @@ def _load_eeprom(self):
         if not os.path.exists(CACHE_ROOT):
             try:
                 os.makedirs(CACHE_ROOT)
-            except:
+            except BaseException:
                 pass
 
         #
@@ -82,7 +80,7 @@ def _load_eeprom(self):
         #
         try:
             self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
-        except:
+        except BaseException:
             pass
 
         e = self.read_eeprom()
@@ -91,7 +89,7 @@ def _load_eeprom(self):
 
         try:
             self.update_cache(e)
-        except:
+        except BaseException:
             pass
 
         self.decode_eeprom(e)
@@ -104,11 +102,40 @@ def _load_eeprom(self):
 
         return self.__parse_output(decode_output)
 
+    def _valid_tlv(self, eeprom_data):
+        tlvinfo_type_codes_list = [
+            self._TLV_CODE_PRODUCT_NAME,
+            self._TLV_CODE_PART_NUMBER,
+            self._TLV_CODE_SERIAL_NUMBER,
+            self._TLV_CODE_MAC_BASE,
+            self._TLV_CODE_MANUF_DATE,
+            self._TLV_CODE_DEVICE_VERSION,
+            self._TLV_CODE_LABEL_REVISION,
+            self._TLV_CODE_PLATFORM_NAME,
+            self._TLV_CODE_ONIE_VERSION,
+            self._TLV_CODE_MAC_SIZE,
+            self._TLV_CODE_MANUF_NAME,
+            self._TLV_CODE_MANUF_COUNTRY,
+            self._TLV_CODE_VENDOR_NAME,
+            self._TLV_CODE_DIAG_VERSION,
+            self._TLV_CODE_SERVICE_TAG,
+            self._TLV_CODE_VENDOR_EXT,
+            self._TLV_CODE_CRC_32
+        ]
+
+        for code in tlvinfo_type_codes_list:
+            code_str = "0x{:X}".format(code)
+            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
+        return eeprom_data
+
     def get_eeprom(self):
-        return self._eeprom
+        return self._valid_tlv(self._eeprom)
+
+    def get_pn(self):
+        return self._eeprom.get('0x22', NULL)
 
     def get_serial(self):
-        return self._eeprom.get('0x23', "Undefined.")
+        return self._eeprom.get('0x23', NULL)
 
     def get_mac(self):
-        return self._eeprom.get('0x24', "Undefined.")
+        return self._eeprom.get('0x24', NULL)
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
index bf2b27019b63..586efbfbb1f5 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan.py
@@ -6,7 +6,7 @@
 #
 #############################################################################
 
-import json
+from __future__ import division
 import math
 import os.path
 
@@ -25,6 +25,7 @@
 EMC2305_FAN_INPUT = "pwm{}"
 FAN_NAME_LIST = ["FAN-1F", "FAN-1R", "FAN-2F", "FAN-2R",
                  "FAN-3F", "FAN-3R", "FAN-4F", "FAN-4R", "FAN-5F", "FAN-5R"]
+FAN_SPEED_TOLERANCE = 10
 PSU_FAN_MAX_RPM = 11000
 PSU_HWMON_PATH = "/sys/bus/i2c/devices/i2c-{0}/{0}-00{1}/hwmon"
 PSU_I2C_MAPPING = {
@@ -82,7 +83,7 @@ def __write_txt_file(self, file_path, value):
         try:
             with open(file_path, 'w') as fd:
                 fd.write(str(value))
-        except:
+        except Exception:
             return False
         return True
 
@@ -97,7 +98,8 @@ def __search_file_by_name(self, directory, file_name):
     def __get_gpio_base(self):
         for r in os.listdir(GPIO_DIR):
             label_path = os.path.join(GPIO_DIR, r, "label")
-            if "gpiochip" in r and GPIO_LABEL in self._api_helper.read_txt_file(label_path):
+            if "gpiochip" in r and GPIO_LABEL in \
+                    self._api_helper.read_txt_file(label_path):
                 return int(r[8:], 10)
         return 216  # Reserve
 
@@ -148,7 +150,6 @@ def get_speed(self):
                 self.psu_hwmon_path, fan_speed_sysfs_name)
             fan_speed_rpm = self._api_helper.read_txt_file(
                 fan_speed_sysfs_path) or 0
-            fan_speed_raw = float(fan_speed_rpm)/PSU_FAN_MAX_RPM * 100
             speed = math.ceil(float(fan_speed_rpm) * 100 / PSU_FAN_MAX_RPM)
         elif self.get_presence():
             chip = self.emc2305_chip_mapping[self.fan_index]
@@ -176,7 +177,19 @@ def get_target_speed(self):
             0   : when PWM mode is use
             pwm : when pwm mode is not use
         """
-        return 'N/A'
+        target = NULL_VAL
+
+        if not self.is_psu_fan:
+            chip = self.emc2305_chip_mapping[self.fan_index]
+            device = chip['device']
+            fan_index = chip['index_map']
+            sysfs_path = "%s%s/%s" % (
+                EMC2305_PATH, device, EMC2305_FAN_PWM)
+            sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
+            pwm = self._api_helper.read_txt_file(sysfs_path)
+            target = round(int(pwm) / 255 * 100.0)
+
+        return target
 
     def get_speed_tolerance(self):
         """
@@ -185,7 +198,7 @@ def get_speed_tolerance(self):
             An integer, the percentage of variance from target speed which is
                  considered tolerable
         """
-        return 10
+        return FAN_SPEED_TOLERANCE
 
     def set_speed(self, speed):
         """
@@ -225,41 +238,67 @@ def set_status_led(self, color):
             bool: True if status LED state is set successfully, False if not
         """
         set_status_led = False
+
+        s1_gpio = self.dx010_fan_gpio[self.fan_tray_index+1]['color']['red']
+        s2_gpio = self.dx010_fan_gpio[self.fan_tray_index+1]['color']['green']
+
         if not self.is_psu_fan:
-            s1, s2 = False, False
             try:
                 if color == self.STATUS_LED_COLOR_GREEN:
-                    s1 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['red'], 1)
-                    s2 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['green'], 0)
+                    s1 = self.__set_gpio_value(s1_gpio, 1)
+                    s2 = self.__set_gpio_value(s2_gpio, 0)
 
                 elif color == self.STATUS_LED_COLOR_RED:
-                    s1 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['red'], 0)
-                    s2 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['green'], 1)
+                    s1 = self.__set_gpio_value(s1_gpio, 0)
+                    s2 = self.__set_gpio_value(s2_gpio, 1)
 
                 elif color == self.STATUS_LED_COLOR_OFF:
-                    s1 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['red'], 1)
-                    s2 = self.__set_gpio_value(
-                        self.dx010_fan_gpio[self.fan_tray_index+1]['color']['green'], 1)
+                    s1 = self.__set_gpio_value(s1_gpio, 1)
+                    s2 = self.__set_gpio_value(s2_gpio, 1)
+
+                elif color == self.STATUS_LED_COLOR_AMBER:
+                    s1 = self.__set_gpio_value(s1_gpio, 0)
+                    s2 = self.__set_gpio_value(s2_gpio, 0)
+                else:
+                    s1, s2 = True, True
+
                 set_status_led = s1 and s2
-                return set_status_led
+
             except IOError:
                 return False
 
         return set_status_led
 
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        s1 = self.__get_gpio_value(
+            self.dx010_fan_gpio[self.fan_tray_index+1]['color']['red'])
+        s2 = self.__get_gpio_value(
+            self.dx010_fan_gpio[self.fan_tray_index+1]['color']['green'])
+
+        return {
+            '10': self.STATUS_LED_COLOR_GREEN,
+            '01': self.STATUS_LED_COLOR_RED,
+            '00': self.STATUS_LED_COLOR_AMBER
+        }.get(s1+s2, self.STATUS_LED_COLOR_OFF)
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
     def get_name(self):
         """
         Retrieves the name of the device
             Returns:
             string: The name of the device
         """
-        fan_name = FAN_NAME_LIST[self.fan_tray_index*2 + self.fan_index] if not self.is_psu_fan else "PSU-{} FAN-{}".format(
-            self.psu_index+1, self.fan_index+1)
+        fan_name = FAN_NAME_LIST[self.fan_tray_index*2 + self.fan_index] \
+            if not self.is_psu_fan \
+            else "PSU-{} FAN-{}".format(self.psu_index+1, self.fan_index+1)
 
         return fan_name
 
@@ -321,3 +360,24 @@ def get_status(self):
             status = self._api_helper.read_one_line_file(sysfs_path)
 
         return False if int(status) != 0 else True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return (self.fan_tray_index*2 + self.fan_index + 1) \
+            if not self.is_psu_fan else (self.fan_index+1)
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True if not self.is_psu_fan else False
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..e35ecf65195a
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Celestica
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the the Fan-Drawers' information available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN = 2
+
+
+class FanDrawer(FanDrawerBase):
+    def __init__(self, fantray_index):
+        FanDrawerBase.__init__(self)
+        self._index = fantray_index + 1
+        self._init_fan(fantray_index)
+
+    def _init_fan(self, fantray_index):
+        from sonic_platform.fan import Fan
+        for index in range(NUM_FAN):
+            fan = Fan(fantray_index, index)
+            self._fan_list.append(fan)
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan drawer status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan drawer status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return self._fan_list[0].set_status_led(color)
+
+    def get_status_led(self, color=None):
+        """
+        Gets the state of the fan drawer LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return self._fan_list[0].get_status_led()
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+        Returns:
+            string: The name of the device
+        """
+        return "Drawer{}".format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._fan_list[0].get_model()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return self._fan_list[0].get_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self._index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
index f9a342953aeb..8bc95fa4f081 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
@@ -7,7 +7,6 @@
 #############################################################################
 
 import os
-import sonic_platform
 
 try:
     from sonic_platform_base.psu_base import PsuBase
@@ -16,6 +15,9 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+TLV_ATTR_TYPE_MODEL = 2
+TLV_ATTR_TYPE_SERIAL = 5
+PSU_EEPROM_PATH = "/sys/bus/i2c/devices/{}-00{}/eeprom"
 GREEN_LED_PATH = "/sys/devices/platform/leds_dx010/leds/dx010:green:p-{}/brightness"
 HWMON_PATH = "/sys/bus/i2c/devices/i2c-{0}/{0}-00{1}/hwmon"
 GPIO_DIR = "/sys/class/gpio"
@@ -25,11 +27,13 @@
 PSU_I2C_MAPPING = {
     0: {
         "num": 10,
-        "addr": "5a"
+        "addr": "5a",
+        "eeprom_addr": "52"
     },
     1: {
         "num": 11,
-        "addr": "5b"
+        "addr": "5b",
+        "eeprom_addr": "53"
     },
 }
 
@@ -41,7 +45,7 @@ def __init__(self, psu_index):
         PsuBase.__init__(self)
         self.index = psu_index
         self._api_helper = APIHelper()
-        self.green_led_path = GREEN_LED_PATH.format(self.index+1)
+        self.green_led_path = GREEN_LED_PATH.format(self.index + 1)
         self.dx010_psu_gpio = [
             {'base': self.__get_gpio_base()},
             {'prs': 27, 'status': 22},
@@ -50,6 +54,7 @@ def __init__(self, psu_index):
         self.i2c_num = PSU_I2C_MAPPING[self.index]["num"]
         self.i2c_addr = PSU_I2C_MAPPING[self.index]["addr"]
         self.hwmon_path = HWMON_PATH.format(self.i2c_num, self.i2c_addr)
+        self.eeprom_addr = PSU_EEPROM_PATH.format(self.i2c_num, PSU_I2C_MAPPING[self.index]["eeprom_addr"])
         for fan_index in range(0, PSU_NUM_FAN[self.index]):
             fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
             self._fan_list.append(fan)
@@ -71,11 +76,37 @@ def __get_gpio_base(self):
 
     def __get_gpio_value(self, pinnum):
         gpio_base = self.dx010_psu_gpio[0]['base']
-        gpio_dir = GPIO_DIR + '/gpio' + str(gpio_base+pinnum)
+        gpio_dir = GPIO_DIR + '/gpio' + str(gpio_base + pinnum)
         gpio_file = gpio_dir + "/value"
         retval = self._api_helper.read_txt_file(gpio_file)
         return retval.rstrip('\r\n')
 
+    def read_fru(self, path, attr_type):
+        content = []
+        attr_idx = 0
+        attr_length = 0
+
+        if(os.path.exists(path)):
+            with open(path, 'r', encoding='unicode_escape') as f:
+                content = f.read()
+            target_offset = ord(content[4])
+            target_offset *= 8  # spec defined: offset are in multiples of 8 bytes
+
+            attr_idx = target_offset + 3
+            for i in range(1, attr_type):
+                if attr_idx > len(content):
+                    raise SyntaxError
+                attr_length = (ord(content[attr_idx])) & (0x3f)
+                attr_idx += (attr_length + 1)
+
+            attr_length = (ord(content[attr_idx])) & (0x3f)
+            attr_idx += 1
+        else:
+            print("[PSU] Can't find path to eeprom : %s" % path)
+            return SyntaxError
+
+        return content[attr_idx:attr_idx + attr_length]
+
     def get_voltage(self):
         """
         Retrieves current PSU voltage output
@@ -209,7 +240,7 @@ def get_presence(self):
         Returns:
             bool: True if PSU is present, False if not
         """
-        raw = self.__get_gpio_value(self.dx010_psu_gpio[self.index+1]['prs'])
+        raw = self.__get_gpio_value(self.dx010_psu_gpio[self.index + 1]['prs'])
         return int(raw, 10) == 0
 
     def get_status(self):
@@ -219,5 +250,142 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         raw = self.__get_gpio_value(
-            self.dx010_psu_gpio[self.index+1]['status'])
+            self.dx010_psu_gpio[self.index + 1]['status'])
         return int(raw, 10) == 1
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        model = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_MODEL)
+        if not model:
+            return "N/A"
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        serial = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_SERIAL)
+        if not serial:
+            return "N/A"
+        return serial
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+            there are three temp sensors , we choose one of them
+        """
+        psu_temperature = None
+        temperature_name = "temp{}_input"
+        temperature_label = "vout1"
+
+        vout_label_path = self.__search_file_by_contain(
+            self.hwmon_path, temperature_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            temp_path = os.path.join(
+                dir_name, temperature_name.format(in_num))
+            vout_val = self._api_helper.read_txt_file(temp_path)
+            psu_temperature = float(vout_val) / 1000
+
+        return psu_temperature
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+            there are three temp sensors , we choose one of them
+        """
+        psu_temperature = None
+        temperature_name = "temp{}_max"
+        temperature_label = "vout1"
+
+        vout_label_path = self.__search_file_by_contain(
+            self.hwmon_path, temperature_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            temp_path = os.path.join(
+                dir_name, temperature_name.format(in_num))
+            vout_val = self._api_helper.read_txt_file(temp_path)
+            psu_temperature = float(vout_val) / 1000
+
+        return psu_temperature
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts,
+            e.g. 12.1
+        """
+        psu_voltage = 0.0
+        voltage_name = "in{}_crit"
+        voltage_label = "vout1"
+
+        vout_label_path = self.__search_file_by_contain(
+            self.hwmon_path, voltage_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            vout_path = os.path.join(
+                dir_name, voltage_name.format(in_num))
+            vout_val = self._api_helper.read_txt_file(vout_path)
+            psu_voltage = float(vout_val) / 1000
+
+        return psu_voltage
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts,
+            e.g. 12.1
+        """
+        psu_voltage = 0.0
+        voltage_name = "in{}_lcrit"
+        voltage_label = "vout1"
+
+        vout_label_path = self.__search_file_by_contain(
+            self.hwmon_path, voltage_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            vout_path = os.path.join(
+                dir_name, voltage_name.format(in_num))
+            vout_val = self._api_helper.read_txt_file(vout_path)
+            psu_voltage = float(vout_val) / 1000
+
+        return psu_voltage
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
index 13ae4b8a47ad..c1423ed8dc7d 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
@@ -1,14 +1,15 @@
+#!/usr/bin/env python
+
 #############################################################################
 # Celestica
 #
 # Sfp contains an implementation of SONiC Platform Base API and
-# provides the sfp device status which are available in the platform
+# provides the sfp status which are available in the platform
 #
 #############################################################################
 
 import time
-import subprocess
-from ctypes import create_string_buffer
+import struct
 
 try:
     from sonic_platform_base.sfp_base import SfpBase
@@ -17,13 +18,13 @@
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
     from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_InterfaceId
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_Dom
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
     from .helper import APIHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-INFO_OFFSET = 128
-DOM_OFFSET = 0
-
 # definitions of the offset and width for values in XCVR info eeprom
 XCVR_INTFACE_BULK_OFFSET = 0
 XCVR_INTFACE_BULK_WIDTH_QSFP = 20
@@ -55,6 +56,8 @@
 XCVR_HW_REV_WIDTH_OSFP = 2
 XCVR_HW_REV_WIDTH_QSFP = 2
 XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET = 64
+XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH = 1
 XCVR_VENDOR_SN_OFFSET = 68
 XCVR_VENDOR_SN_WIDTH = 16
 XCVR_VENDOR_DATE_OFFSET = 84
@@ -69,6 +72,8 @@
 QSFP_DOM_BULK_DATA_SIZE = 36
 SFP_DOM_BULK_DATA_START = 96
 SFP_DOM_BULK_DATA_SIZE = 10
+QSFP_DD_DOM_BULK_DATA_START = 14
+QSFP_DD_DOM_BULK_DATA_SIZE = 4
 
 # definitions of the offset for values in OSFP info eeprom
 OSFP_TYPE_OFFSET = 0
@@ -77,6 +82,33 @@
 OSFP_HW_REV_OFFSET = 164
 OSFP_VENDOR_SN_OFFSET = 166
 
+# definitions of the offset for values in QSFP_DD info eeprom
+QSFP_DD_TYPE_OFFSET = 0
+QSFP_DD_VENDOR_NAME_OFFSET = 1
+QSFP_DD_VENDOR_PN_OFFSET = 20
+QSFP_DD_VENDOR_SN_OFFSET = 38
+QSFP_DD_VENDOR_OUI_OFFSET = 17
+
+# definitions of the offset and width for values in XCVR_QSFP_DD info eeprom
+XCVR_EXT_TYPE_OFFSET_QSFP_DD = 72
+XCVR_EXT_TYPE_WIDTH_QSFP_DD = 2
+XCVR_CONNECTOR_OFFSET_QSFP_DD = 75
+XCVR_CONNECTOR_WIDTH_QSFP_DD = 1
+XCVR_CABLE_LENGTH_OFFSET_QSFP_DD = 74
+XCVR_CABLE_LENGTH_WIDTH_QSFP_DD = 1
+XCVR_HW_REV_OFFSET_QSFP_DD = 36
+XCVR_HW_REV_WIDTH_QSFP_DD = 2
+XCVR_VENDOR_DATE_OFFSET_QSFP_DD = 54
+XCVR_VENDOR_DATE_WIDTH_QSFP_DD = 8
+XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD = 2
+XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD = 1
+XCVR_MEDIA_TYPE_OFFSET_QSFP_DD = 85
+XCVR_MEDIA_TYPE_WIDTH_QSFP_DD = 1
+XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD = 86
+XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD = 32
+XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD = 351
+XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD = 28
+
 # Offset for values in QSFP eeprom
 QSFP_DOM_REV_OFFSET = 1
 QSFP_DOM_REV_WIDTH = 1
@@ -126,29 +158,102 @@
 SFP_CHANNL_STATUS_OFFSET = 110
 SFP_CHANNL_STATUS_WIDTH = 1
 
+QSFP_DD_TEMPE_OFFSET = 14
+QSFP_DD_TEMPE_WIDTH = 2
+QSFP_DD_VOLT_OFFSET = 16
+QSFP_DD_VOLT_WIDTH = 2
+QSFP_DD_TX_BIAS_OFFSET = 42
+QSFP_DD_TX_BIAS_WIDTH = 16
+QSFP_DD_RX_POWER_OFFSET = 58
+QSFP_DD_RX_POWER_WIDTH = 16
+QSFP_DD_TX_POWER_OFFSET = 26
+QSFP_DD_TX_POWER_WIDTH = 16
+QSFP_DD_CHANNL_MON_OFFSET = 154
+QSFP_DD_CHANNL_MON_WIDTH = 48
+QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET = 19
+QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET = 7
+QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_DD_MODULE_THRESHOLD_OFFSET = 0
+QSFP_DD_MODULE_THRESHOLD_WIDTH = 72
+QSFP_DD_CHANNL_STATUS_OFFSET = 26
+QSFP_DD_CHANNL_STATUS_WIDTH = 1
+
+
+sfp_cable_length_tup = (
+    'LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+    'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+    'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)'
+)
+
+sfp_compliance_code_tup = (
+    '10GEthernetComplianceCode', 'InfinibandComplianceCode',
+    'ESCONComplianceCodes', 'SONETComplianceCodes',
+    'EthernetComplianceCodes', 'FibreChannelLinkLength',
+    'FibreChannelTechnology', 'SFP+CableTechnology',
+    'FibreChannelTransmissionMedia', 'FibreChannelSpeed'
+)
+
+qsfp_compliance_code_tup = (
+    '10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+    'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+    'Fibre Channel link length/Transmitter Technology',
+    'Fibre Channel transmission media', 'Fibre Channel Speed'
+)
+
+info_dict_keys = [
+    'type', 'hardware_rev', 'serial', 'manufacturer',
+    'model', 'connector', 'encoding', 'ext_identifier',
+    'ext_rateselect_compliance', 'cable_type', 'cable_length',
+    'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+    'vendor_oui', 'application_advertisement', 'type_abbrv_name'
+]
 
 qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
                          'Length OM2(m)', 'Length OM1(m)',
                          'Length Cable Assembly(m)')
 
-sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
-                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
-                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
-
-sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
-                           'ESCONComplianceCodes', 'SONETComplianceCodes',
-                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
-                           'FibreChannelTechnology', 'SFP+CableTechnology',
-                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
-
-qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
-                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
-                            'Fibre Channel link length/Transmitter Technology',
-                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+dom_info_dict_keys = [
+    'rx_los', 'tx_fault', 'reset_status', 'lp_mode',
+    'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+    'rx1power', 'rx2power', 'rx3power', 'rx4power',
+    'rx5power', 'rx6power', 'rx7power', 'rx8power',
+    'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias',
+    'tx5bias', 'tx6bias', 'tx7bias', 'tx8bias',
+    'tx1power', 'tx2power', 'tx3power', 'tx4power',
+    'tx5power', 'tx6power', 'tx7power', 'tx8power']
+
+threshold_dict_keys = [
+    'temphighalarm', 'temphighwarning',
+    'templowalarm', 'templowwarning',
+    'vcchighalarm', 'vcchighwarning',
+    'vcclowalarm', 'vcclowwarning',
+    'rxpowerhighalarm', 'rxpowerhighwarning',
+    'rxpowerlowalarm', 'rxpowerlowwarning',
+    'txpowerhighalarm', 'txpowerhighwarning',
+    'txpowerlowalarm', 'txpowerlowwarning',
+    'txbiashighalarm', 'txbiashighwarning',
+    'txbiaslowalarm', 'txbiaslowwarning']
+
+SFP_TYPE_CODE_LIST = [
+    '03'  # SFP/SFP+/SFP28
+]
+QSFP_TYPE_CODE_LIST = [
+    '0d',  # QSFP+ or later
+    '11'  # QSFP28 or later
+]
+QSFP_DD_TYPE_CODE_LIST = [
+    '18'  # QSFP-DD Double Density 8X Pluggable Transceiver
+]
 
 SFP_TYPE = "SFP"
 QSFP_TYPE = "QSFP"
 OSFP_TYPE = "OSFP"
+QSFP_DD_TYPE = "QSFP_DD"
+
+NULL_VAL = 'N/A'
 
 PORT_START = 1
 PORT_END = 56
@@ -156,60 +261,45 @@
 QSFP_PORT_END = 32
 
 SFP_I2C_START = 26
+I2C_EEPROM_PATH = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
 
 
 class Sfp(SfpBase):
     """Platform-specific Sfp class"""
 
-    # Path to QSFP sysfs
     RESET_PATH = "/sys/devices/platform/dx010_cpld/qsfp_reset"
     LP_PATH = "/sys/devices/platform/dx010_cpld/qsfp_lpmode"
     PRS_PATH = "/sys/devices/platform/dx010_cpld/qsfp_modprs"
 
-    def __init__(self, sfp_index, sfp_name):
+    def __init__(self, sfp_index=0, sfp_name=None):
         SfpBase.__init__(self)
-        # Init index
-        self.index = sfp_index
-        self.port_num = self.index + 1
-        self.dom_supported = False
-        self.sfp_type, self.port_name = self.__get_sfp_info()
-        self._api_helper = APIHelper()
-        self.name = sfp_name
-
-        # Init eeprom path
-        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
-        self.port_to_eeprom_mapping = {}
-        self.port_to_i2c_mapping = {}
-
-        for x in range(PORT_START, PORT_END + 1):
-            self.port_to_i2c_mapping[x] = (SFP_I2C_START + x) - 1
-            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
-            self.port_to_eeprom_mapping[x] = port_eeprom_path
 
-        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
-                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
+        self._index = sfp_index
+        self._port_num = self._index + 1
+        self._api_helper = APIHelper()
+        self._name = sfp_name
 
-        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
-                              'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+        self._read_porttab_mappings()
+        self._dom_capability_detect()
+        self._eeprom_path = self._get_eeprom_path()
 
-        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
-                                    'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+    def _read_porttab_mappings(self):
+        self._sfputil_helper = SfpUtilHelper()
+        self._sfputil_helper.read_porttab_mappings(
+            self._get_path_to_port_config_file())
 
-        self._dom_capability_detect()
+    def _get_path_to_port_config_file(self):
+        host_platform_root_path = '/usr/share/sonic/device'
+        docker_hwsku_path = '/usr/share/sonic/hwsku'
 
-    def __get_sfp_info(self):
-        port_name = "Unknown"
-        sfp_type = "Unknown"
+        host_platform_path = "/".join([host_platform_root_path,
+                                       self._api_helper.platform])
+        hwsku_path = "/".join([host_platform_path, self._api_helper.hwsku]) \
+            if self._api_helper.is_host() else docker_hwsku_path
 
-        if self.port_num >= QSFP_PORT_START and self.port_num <= QSFP_TYPE:
-            sfp_type = QSFP_TYPE
-            port_name = "QSFP" + str(self.port_num - QSFP_PORT_START + 1)
-        elif self.port_num >= SFP_PORT_START and self.port_num <= SFP_PORT_END:
-            sfp_type = SFP_TYPE
-            port_name = "SFP" + str(self.port_num - SFP_PORT_START + 1)
-        return sfp_type, port_name
+        return "/".join([hwsku_path, "port_config.ini"])
 
-    def __convert_string_to_num(self, value_str):
+    def _convert_string_to_num(self, value_str):
         if "-inf" in value_str:
             return 'N/A'
         elif "Unknown" in value_str:
@@ -229,28 +319,63 @@ def __convert_string_to_num(self, value_str):
         else:
             return 'N/A'
 
-    def __read_eeprom_specific_bytes(self, offset, num_bytes):
-        sysfsfile_eeprom = None
+    def _read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfs_sfp_i2c_client_eeprom_path = self._get_eeprom_path()
         eeprom_raw = []
+        try:
+            eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path,
+                mode="rb", buffering=0)
+        except IOError:
+            return None
+
         for i in range(0, num_bytes):
             eeprom_raw.append("0x00")
 
-        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
         try:
-            sysfsfile_eeprom = open(
-                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
-            sysfsfile_eeprom.seek(offset)
-            raw = sysfsfile_eeprom.read(num_bytes)
-            for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
-        except:
-            pass
-        finally:
-            if sysfsfile_eeprom:
-                sysfsfile_eeprom.close()
+            eeprom.seek(offset)
+            raw = eeprom.read(num_bytes)
+        except IOError:
+            eeprom.close()
+            return None
 
+        try:
+            if isinstance(raw, str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
+        except BaseException:
+            eeprom.close()
+            return None
+
+        eeprom.close()
         return eeprom_raw
 
+    def _detect_sfp_type(self):
+        sfp_type = QSFP_TYPE
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_specific_bytes(
+            XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH)
+        if eeprom_raw:
+            if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
+                self.sfp_type = SFP_TYPE
+            elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_TYPE
+            elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_DD_TYPE
+            else:
+                self.sfp_type = sfp_type
+        else:
+            self.sfp_type = sfp_type
+
+    def _get_eeprom_path(self):
+        port_to_i2c_mapping = SFP_I2C_START + self._index
+        port_eeprom_path = I2C_EEPROM_PATH.format(port_to_i2c_mapping)
+        return port_eeprom_path
+
     def _dom_capability_detect(self):
         if not self.get_presence():
             self.dom_supported = False
@@ -261,22 +386,28 @@ def _dom_capability_detect(self):
             self.calibration = 0
             return
 
-        if self.sfp_type == "QSFP":
+        self._detect_sfp_type()
+
+        if self.sfp_type == QSFP_TYPE:
             self.calibration = 1
             sfpi_obj = sff8436InterfaceId()
             if sfpi_obj is None:
                 self.dom_supported = False
             offset = 128
 
-            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # QSFP capability byte parse,
+            # through this byte can know whether it support tx_power or not.
             # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
             # need to add more code for determining the capability and version compliance
             # in SFF-8636 dom capability definitions evolving with the versions.
-            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
-                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET),
+                XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
-                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
+                qsfp_version_compliance_raw = self._read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET,
+                    QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(
                     qsfp_version_compliance_raw[0], 16)
                 dom_capability = sfpi_obj.parse_dom_capability(
@@ -297,7 +428,7 @@ def _dom_capability_detect(self):
                 sfpd_obj = sff8436Dom()
                 if sfpd_obj is None:
                     return None
-                qsfp_option_value_raw = self.__read_eeprom_specific_bytes(
+                qsfp_option_value_raw = self._read_eeprom_specific_bytes(
                     QSFP_OPTION_VALUE_OFFSET, QSFP_OPTION_VALUE_WIDTH)
                 if qsfp_option_value_raw is not None:
                     optional_capability = sfpd_obj.parse_option_params(
@@ -316,11 +447,52 @@ def _dom_capability_detect(self):
                 self.calibration = 0
                 self.qsfp_page3_available = False
 
-        elif self.sfp_type == "SFP":
+        elif self.sfp_type == QSFP_DD_TYPE:
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+
+            offset = 0
+            # two types of QSFP-DD cable types supported: Copper and Optical.
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD), XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD)
+            if qsfp_dom_capability_raw is not None:
+                self.dom_temp_supported = True
+                self.dom_volt_supported = True
+                dom_capability = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+                if dom_capability['data']['Flat_MEM']['value'] == 'Off':
+                    self.dom_supported = True
+                    self.second_application_list = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    self.dom_tx_bias_power_supported = True
+                    self.dom_thresholds_supported = True
+                    # currently set to False becasue Page 11h is not supported by FW
+                    self.dom_rx_tx_power_bias_supported = False
+                else:
+                    self.dom_supported = False
+                    self.second_application_list = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.dom_tx_bias_power_supported = False
+                    self.dom_thresholds_supported = False
+                    self.dom_rx_tx_power_bias_supported = False
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.dom_tx_bias_power_supported = False
+                self.dom_thresholds_supported = False
+                self.dom_rx_tx_power_bias_supported = False
+
+        elif self.sfp_type == SFP_TYPE:
             sfpi_obj = sff8472InterfaceId()
             if sfpi_obj is None:
                 return None
-            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+            sfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
             if sfp_dom_capability_raw is not None:
                 sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
@@ -356,7 +528,7 @@ def get_transceiver_info(self):
         Retrieves transceiver info of this SFP
         Returns:
             A dict which contains following keys/values :
-        ========================================================================
+        ================================================================================
         keys                       |Value Format   |Information
         ---------------------------|---------------|----------------------------
         type                       |1*255VCHAR     |type of SFP
@@ -373,12 +545,15 @@ def get_transceiver_info(self):
         specification_compliance   |1*255VCHAR     |specification compliance
         vendor_date                |1*255VCHAR     |vendor date
         vendor_oui                 |1*255VCHAR     |vendor OUI
-        ========================================================================
-         """
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ================================================================================
+        """
+
+        transceiver_info_dict = {}
         compliance_code_dict = {}
-        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
-        if not self.get_presence():
-            return transceiver_info_dict
+        transceiver_info_dict = dict.fromkeys(
+            info_dict_keys, NULL_VAL)
+        transceiver_info_dict["specification_compliance"] = '{}'
 
         # ToDo: OSFP tranceiver info parsing not fully supported.
         # in inf8628.py lack of some memory map definition
@@ -389,89 +564,229 @@ def get_transceiver_info(self):
 
             sfpi_obj = inf8628InterfaceId()
             if sfpi_obj is None:
-                return None
+                return transceiver_info_dict
 
-            sfp_type_raw = self.__read_eeprom_specific_bytes(
+            sfp_type_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
             if sfp_type_raw is not None:
                 sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
             else:
-                return None
+                return transceiver_info_dict
 
-            sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
             if sfp_vendor_name_raw is not None:
                 sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
                     sfp_vendor_name_raw, 0)
             else:
-                return None
+                return transceiver_info_dict
 
-            sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
             if sfp_vendor_pn_raw is not None:
                 sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
                     sfp_vendor_pn_raw, 0)
             else:
-                return None
+                return transceiver_info_dict
 
-            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
             if sfp_vendor_rev_raw is not None:
                 sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
                     sfp_vendor_rev_raw, 0)
             else:
-                return None
+                return transceiver_info_dict
 
-            sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
             if sfp_vendor_sn_raw is not None:
                 sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
                     sfp_vendor_sn_raw, 0)
             else:
-                return None
+                return transceiver_info_dict
 
             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
-            transceiver_info_dict['vendor_oui'] = 'N/A'
-            transceiver_info_dict['vendor_date'] = 'N/A'
-            transceiver_info_dict['connector'] = 'N/A'
-            transceiver_info_dict['encoding'] = 'N/A'
-            transceiver_info_dict['ext_identifier'] = 'N/A'
-            transceiver_info_dict['ext_rateselect_compliance'] = 'N/A'
-            transceiver_info_dict['cable_type'] = 'N/A'
-            transceiver_info_dict['cable_length'] = 'N/A'
-            transceiver_info_dict['specification_compliance'] = '{}'
-            transceiver_info_dict['nominal_bit_rate'] = 'N/A'
 
-        else:
-            if self.sfp_type == QSFP_TYPE:
-                offset = 128
-                vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
-                # cable_length_width = XCVR_CABLE_LENGTH_WIDTH_QSFP
-                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 128
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
 
-                sfpi_obj = sff8436InterfaceId()
-                if sfpi_obj is None:
-                    print("Error: sfp_object open failed")
-                    return None
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
 
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+            sfp_type_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
             else:
-                offset = 0
-                vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
-                # cable_length_width = XCVR_CABLE_LENGTH_WIDTH_SFP
-                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
-
-                sfpi_obj = sff8472InterfaceId()
-                if sfpi_obj is None:
-                    print("Error: sfp_object open failed")
-                    return None
-            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                return transceiver_info_dict
+
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                    sfp_vendor_name_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                    sfp_vendor_pn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET_QSFP_DD), XCVR_HW_REV_WIDTH_QSFP_DD)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                    sfp_vendor_rev_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                    sfp_vendor_sn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_oui_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+            if sfp_vendor_oui_raw is not None:
+                sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                    sfp_vendor_oui_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_date_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_VENDOR_DATE_OFFSET_QSFP_DD), XCVR_VENDOR_DATE_WIDTH_QSFP_DD)
+            if sfp_vendor_date_raw is not None:
+                sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+                    sfp_vendor_date_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_connector_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_CONNECTOR_OFFSET_QSFP_DD), XCVR_CONNECTOR_WIDTH_QSFP_DD)
+            if sfp_connector_raw is not None:
+                sfp_connector_data = sfpi_obj.parse_connector(
+                    sfp_connector_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_ext_identifier_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_EXT_TYPE_OFFSET_QSFP_DD), XCVR_EXT_TYPE_WIDTH_QSFP_DD)
+            if sfp_ext_identifier_raw is not None:
+                sfp_ext_identifier_data = sfpi_obj.parse_ext_iden(
+                    sfp_ext_identifier_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_cable_len_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_CABLE_LENGTH_OFFSET_QSFP_DD), XCVR_CABLE_LENGTH_WIDTH_QSFP_DD)
+            if sfp_cable_len_raw is not None:
+                sfp_cable_len_data = sfpi_obj.parse_cable_len(
+                    sfp_cable_len_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_media_type_raw = self._read_eeprom_specific_bytes(
+                XCVR_MEDIA_TYPE_OFFSET_QSFP_DD, XCVR_MEDIA_TYPE_WIDTH_QSFP_DD)
+            if sfp_media_type_raw is not None:
+                sfp_media_type_dict = sfpi_obj.parse_media_type(
+                    sfp_media_type_raw, 0)
+                if sfp_media_type_dict is None:
+                    return transceiver_info_dict
+
+                host_media_list = ""
+                sfp_application_type_first_list = self._read_eeprom_specific_bytes(
+                    (XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD)
+                if self.second_application_list:
+                    possible_application_count = 15
+                    sfp_application_type_second_list = self._read_eeprom_specific_bytes(
+                        (XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD)
+                    if sfp_application_type_first_list is not None and sfp_application_type_second_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list + \
+                            sfp_application_type_second_list
+                    else:
+                        return transceiver_info_dict
+                else:
+                    possible_application_count = 8
+                    if sfp_application_type_first_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list
+                    else:
+                        return transceiver_info_dict
+
+                for i in range(0, possible_application_count):
+                    if sfp_application_type_list[i * 4] == 'ff':
+                        break
+                    host_electrical, media_interface = sfpi_obj.parse_application(
+                        sfp_media_type_dict, sfp_application_type_list[i * 4], sfp_application_type_list[i * 4 + 1])
+                    host_media_list = host_media_list + host_electrical + \
+                        ' - ' + media_interface + '\n\t\t\t\t   '
+            else:
+                return transceiver_info_dict
+
+            transceiver_info_dict['type'] = str(
+                sfp_type_data['data']['type']['value'])
+            transceiver_info_dict['manufacturer'] = str(
+                sfp_vendor_name_data['data']['Vendor Name']['value'])
+            transceiver_info_dict['model'] = str(
+                sfp_vendor_pn_data['data']['Vendor PN']['value'])
+            transceiver_info_dict['hardware_rev'] = str(
+                sfp_vendor_rev_data['data']['Vendor Rev']['value'])
+            transceiver_info_dict['serial'] = str(
+                sfp_vendor_sn_data['data']['Vendor SN']['value'])
+            transceiver_info_dict['vendor_oui'] = str(
+                sfp_vendor_oui_data['data']['Vendor OUI']['value'])
+            transceiver_info_dict['vendor_date'] = str(
+                sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'])
+            transceiver_info_dict['connector'] = str(
+                sfp_connector_data['data']['Connector']['value'])
+            transceiver_info_dict['encoding'] = "Not supported for CMIS cables"
+            transceiver_info_dict['ext_identifier'] = str(
+                sfp_ext_identifier_data['data']['Extended Identifier']['value'])
+            transceiver_info_dict['ext_rateselect_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['specification_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['cable_type'] = "Length Cable Assembly(m)"
+            transceiver_info_dict['cable_length'] = str(
+                sfp_cable_len_data['data']['Length Cable Assembly(m)']['value'])
+            transceiver_info_dict['nominal_bit_rate'] = "Not supported for CMIS cables"
+            transceiver_info_dict['application_advertisement'] = host_media_list
+
+        else:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        if self.sfp_type != QSFP_DD_TYPE:
+            sfp_interface_bulk_raw = self._read_eeprom_specific_bytes(
                 offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
             if sfp_interface_bulk_raw is None:
-                return None
+                return transceiver_info_dict
 
             start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
             end = start + interface_info_bulk_width
@@ -507,6 +822,7 @@ def get_transceiver_info(self):
             end = start + XCVR_VENDOR_DATE_WIDTH
             sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
                 sfp_interface_bulk_raw[start: end], 0)
+
             transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
@@ -530,9 +846,16 @@ def get_transceiver_info(self):
                 for key in qsfp_compliance_code_tup:
                     if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
                         compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                sfp_ext_specification_compliance_raw = self._read_eeprom_specific_bytes(
+                    offset + XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET, XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH)
+                if sfp_ext_specification_compliance_raw is not None:
+                    sfp_ext_specification_compliance_data = sfpi_obj.parse_ext_specification_compliance(
+                        sfp_ext_specification_compliance_raw[0: 1], 0)
+                    if sfp_ext_specification_compliance_data['data']['Extended Specification compliance']['value'] != "Unspecified":
+                        compliance_code_dict['Extended Specification compliance'] = sfp_ext_specification_compliance_data[
+                            'data']['Extended Specification compliance']['value']
                 transceiver_info_dict['specification_compliance'] = str(
                     compliance_code_dict)
-
                 transceiver_info_dict['nominal_bit_rate'] = str(
                     sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
             else:
@@ -578,7 +901,8 @@ def get_transceiver_bulk_status(self):
                                    |               |for example, tx2power stands for tx power of channel 2.
         ========================================================================
         """
-        transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+        transceiver_dom_info_dict = dict.fromkeys(
+            dom_info_dict_keys, NULL_VAL)
 
         if self.sfp_type == OSFP_TYPE:
             pass
@@ -592,7 +916,7 @@ def get_transceiver_bulk_status(self):
             if sfpd_obj is None:
                 return transceiver_dom_info_dict
 
-            dom_data_raw = self.__read_eeprom_specific_bytes(
+            dom_data_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_DOM_BULK_DATA_START), QSFP_DOM_BULK_DATA_SIZE)
             if dom_data_raw is None:
                 return transceiver_dom_info_dict
@@ -602,8 +926,7 @@ def get_transceiver_bulk_status(self):
                 end = start + QSFP_TEMPE_WIDTH
                 dom_temperature_data = sfpd_obj.parse_temperature(
                     dom_data_raw[start: end], 0)
-                temp = self.__convert_string_to_num(
-                    dom_temperature_data['data']['Temperature']['value'])
+                temp = dom_temperature_data['data']['Temperature']['value']
                 if temp is not None:
                     transceiver_dom_info_dict['temperature'] = temp
 
@@ -612,8 +935,7 @@ def get_transceiver_bulk_status(self):
                 end = start + QSFP_VOLT_WIDTH
                 dom_voltage_data = sfpd_obj.parse_voltage(
                     dom_data_raw[start: end], 0)
-                volt = self.__convert_string_to_num(
-                    dom_voltage_data['data']['Vcc']['value'])
+                volt = dom_voltage_data['data']['Vcc']['value']
                 if volt is not None:
                     transceiver_dom_info_dict['voltage'] = volt
 
@@ -623,33 +945,116 @@ def get_transceiver_bulk_status(self):
                 dom_data_raw[start: end], 0)
 
             if self.dom_tx_power_supported:
-                transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['TX1Power']['value'])
-                transceiver_dom_info_dict['tx2power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['TX2Power']['value'])
-                transceiver_dom_info_dict['tx3power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['TX3Power']['value'])
-                transceiver_dom_info_dict['tx4power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['TX4Power']['value'])
+                transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
 
             if self.dom_rx_power_supported:
-                transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['RX1Power']['value'])
-                transceiver_dom_info_dict['rx2power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['RX2Power']['value'])
-                transceiver_dom_info_dict['rx3power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['RX3Power']['value'])
-                transceiver_dom_info_dict['rx4power'] = self.__convert_string_to_num(
-                    dom_channel_monitor_data['data']['RX4Power']['value'])
-
-            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TX1Bias']['value'])
-            transceiver_dom_info_dict['tx2bias'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TX2Bias']['value'])
-            transceiver_dom_info_dict['tx3bias'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TX3Bias']['value'])
-            transceiver_dom_info_dict['tx4bias'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TX4Bias']['value'])
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+
+            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+            transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+            transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+            transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+
+            offset = 0
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_DOM_BULK_DATA_START), QSFP_DD_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_DD_TEMPE_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_data_raw[start: end], 0)
+                temp = dom_temperature_data['data']['Temperature']['value']
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_DD_VOLT_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(
+                    dom_data_raw[start: end], 0)
+                volt = dom_voltage_data['data']['Vcc']['value']
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            if self.dom_rx_tx_power_bias_supported:
+                # page 11h
+                dom_data_raw = self._read_eeprom_specific_bytes(
+                    (QSFP_DD_CHANNL_MON_OFFSET), QSFP_DD_CHANNL_MON_WIDTH)
+                if dom_data_raw is None:
+                    return transceiver_dom_info_dict
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_data_raw, 0)
+
+                if self.dom_tx_power_supported:
+                    transceiver_dom_info_dict['tx1power'] = str(
+                        dom_channel_monitor_data['data']['TX1Power']['value'])
+                    transceiver_dom_info_dict['tx2power'] = str(
+                        dom_channel_monitor_data['data']['TX2Power']['value'])
+                    transceiver_dom_info_dict['tx3power'] = str(
+                        dom_channel_monitor_data['data']['TX3Power']['value'])
+                    transceiver_dom_info_dict['tx4power'] = str(
+                        dom_channel_monitor_data['data']['TX4Power']['value'])
+                    transceiver_dom_info_dict['tx5power'] = str(
+                        dom_channel_monitor_data['data']['TX5Power']['value'])
+                    transceiver_dom_info_dict['tx6power'] = str(
+                        dom_channel_monitor_data['data']['TX6Power']['value'])
+                    transceiver_dom_info_dict['tx7power'] = str(
+                        dom_channel_monitor_data['data']['TX7Power']['value'])
+                    transceiver_dom_info_dict['tx8power'] = str(
+                        dom_channel_monitor_data['data']['TX8Power']['value'])
+
+                if self.dom_rx_power_supported:
+                    transceiver_dom_info_dict['rx1power'] = str(
+                        dom_channel_monitor_data['data']['RX1Power']['value'])
+                    transceiver_dom_info_dict['rx2power'] = str(
+                        dom_channel_monitor_data['data']['RX2Power']['value'])
+                    transceiver_dom_info_dict['rx3power'] = str(
+                        dom_channel_monitor_data['data']['RX3Power']['value'])
+                    transceiver_dom_info_dict['rx4power'] = str(
+                        dom_channel_monitor_data['data']['RX4Power']['value'])
+                    transceiver_dom_info_dict['rx5power'] = str(
+                        dom_channel_monitor_data['data']['RX5Power']['value'])
+                    transceiver_dom_info_dict['rx6power'] = str(
+                        dom_channel_monitor_data['data']['RX6Power']['value'])
+                    transceiver_dom_info_dict['rx7power'] = str(
+                        dom_channel_monitor_data['data']['RX7Power']['value'])
+                    transceiver_dom_info_dict['rx8power'] = str(
+                        dom_channel_monitor_data['data']['RX8Power']['value'])
+
+                if self.dom_tx_bias_power_supported:
+                    transceiver_dom_info_dict['tx1bias'] = str(
+                        dom_channel_monitor_data['data']['TX1Bias']['value'])
+                    transceiver_dom_info_dict['tx2bias'] = str(
+                        dom_channel_monitor_data['data']['TX2Bias']['value'])
+                    transceiver_dom_info_dict['tx3bias'] = str(
+                        dom_channel_monitor_data['data']['TX3Bias']['value'])
+                    transceiver_dom_info_dict['tx4bias'] = str(
+                        dom_channel_monitor_data['data']['TX4Bias']['value'])
+                    transceiver_dom_info_dict['tx5bias'] = str(
+                        dom_channel_monitor_data['data']['TX5Bias']['value'])
+                    transceiver_dom_info_dict['tx6bias'] = str(
+                        dom_channel_monitor_data['data']['TX6Bias']['value'])
+                    transceiver_dom_info_dict['tx7bias'] = str(
+                        dom_channel_monitor_data['data']['TX7Bias']['value'])
+                    transceiver_dom_info_dict['tx8bias'] = str(
+                        dom_channel_monitor_data['data']['TX8Bias']['value'])
+
+            return transceiver_dom_info_dict
 
         else:
             if not self.dom_supported:
@@ -661,7 +1066,7 @@ def get_transceiver_bulk_status(self):
                 return transceiver_dom_info_dict
             sfpd_obj._calibration_type = self.calibration
 
-            dom_data_raw = self.__read_eeprom_specific_bytes(
+            dom_data_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_DOM_BULK_DATA_START), SFP_DOM_BULK_DATA_SIZE)
 
             start = SFP_TEMPE_OFFSET - SFP_DOM_BULK_DATA_START
@@ -679,27 +1084,29 @@ def get_transceiver_bulk_status(self):
             dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
                 dom_data_raw[start: end], 0)
 
-            transceiver_dom_info_dict['temperature'] = self.__convert_string_to_num(
-                dom_temperature_data['data']['Temperature']['value'])
-            transceiver_dom_info_dict['voltage'] = self.__convert_string_to_num(
-                dom_voltage_data['data']['Vcc']['value'])
-            transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['RXPower']['value'])
-            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TXBias']['value'])
-            transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
-                dom_channel_monitor_data['data']['TXPower']['value'])
-
-        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
-        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
-        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+            transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RXPower']['value']
+            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TXBias']['value']
+            transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TXPower']['value']
+
         transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disabled_channel'] = self.get_tx_disable_channel(
+        )
+
+        for key in transceiver_dom_info_dict:
+            val = transceiver_dom_info_dict[key]
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                val) if type(val) is str else val
 
         return transceiver_dom_info_dict
 
     def get_transceiver_threshold_info(self):
         """
         Retrieves transceiver threshold info of this SFP
+
         Returns:
             A dict which contains following keys/values :
         ========================================================================
@@ -728,7 +1135,7 @@ def get_transceiver_threshold_info(self):
         ========================================================================
         """
         transceiver_dom_threshold_info_dict = dict.fromkeys(
-            self.threshold_dict_keys, 'N/A')
+            threshold_dict_keys, NULL_VAL)
 
         if self.sfp_type == OSFP_TYPE:
             pass
@@ -744,7 +1151,7 @@ def get_transceiver_threshold_info(self):
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
 
-            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
             if dom_module_threshold_raw is None:
                 return transceiver_dom_threshold_info_dict
@@ -752,8 +1159,8 @@ def get_transceiver_threshold_info(self):
             dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
                 dom_module_threshold_raw, 0)
 
-            dom_channel_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
-                                                                          QSFP_CHANNL_THRESHOLD_WIDTH)
+            dom_channel_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
+                                                                         QSFP_CHANNL_THRESHOLD_WIDTH)
             if dom_channel_threshold_raw is None:
                 return transceiver_dom_threshold_info_dict
             dom_channel_threshold_data = sfpd_obj.parse_channel_threshold_values(
@@ -781,6 +1188,49 @@ def get_transceiver_threshold_info(self):
             transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_channel_threshold_data['data']['TxPowerLowAlarm']['value']
             transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_channel_threshold_data['data']['TxPowerLowWarning']['value']
 
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            if not self.dom_thresholds_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            # page 02
+            offset = 384
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_MODULE_THRESHOLD_OFFSET), QSFP_DD_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
+                dom_module_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TxPowerLowWarning']['value']
+
         else:
             offset = SFP_MODULE_ADDRA2_OFFSET
 
@@ -791,8 +1241,8 @@ def get_transceiver_threshold_info(self):
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
 
-            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
-                                                                         SFP_MODULE_THRESHOLD_WIDTH)
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
+                                                                        SFP_MODULE_THRESHOLD_WIDTH)
             if dom_module_threshold_raw is not None:
                 dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
                     dom_module_threshold_raw, 0)
@@ -823,7 +1273,7 @@ def get_transceiver_threshold_info(self):
             transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
 
         for key in transceiver_dom_threshold_info_dict:
-            transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(
+            transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
                 transceiver_dom_threshold_info_dict[key])
 
         return transceiver_dom_threshold_info_dict
@@ -834,13 +1284,14 @@ def get_reset_status(self):
         Returns:
             A Boolean, True if reset enabled, False if disabled
         """
-        reset_status_raw = self._api_helper.read_txt_file(self.RESET_PATH).rstrip()
+        reset_status_raw = self._api_helper.read_txt_file(
+            self.RESET_PATH).rstrip()
         if not reset_status_raw:
             return False
 
         reg_value = int(reset_status_raw, 16)
         bin_format = bin(reg_value)[2:].zfill(32)
-        return bin_format[::-1][self.index] == '0'
+        return bin_format[::-1][self._index] == '0'
 
     def get_rx_los(self):
         """
@@ -849,30 +1300,53 @@ def get_rx_los(self):
             A Boolean, True if SFP has RX LOS, False if not.
             Note : RX LOS status is latched until a call to get_rx_los or a reset.
         """
-        rx_los = False
-        if self.sfp_type == OSFP_TYPE:
-            return False
+        rx_los_list = []
 
+        if self.sfp_type == OSFP_TYPE:
+            return None
         elif self.sfp_type == QSFP_TYPE:
             offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET),
+                QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx1_los = (rx_los_data & 0x01 != 0)
-                rx2_los = (rx_los_data & 0x02 != 0)
-                rx3_los = (rx_los_data & 0x04 != 0)
-                rx4_los = (rx_los_data & 0x08 != 0)
-                rx_los = (rx1_los and rx2_los and rx3_los and rx4_los)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+            else:
+                return [False] * 4
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    rx_los_data = int(dom_channel_monitor_raw[0], 8)
+                    rx_los_list.append(rx_los_data & 0x01 != 0)
+                    rx_los_list.append(rx_los_data & 0x02 != 0)
+                    rx_los_list.append(rx_los_data & 0x04 != 0)
+                    rx_los_list.append(rx_los_data & 0x08 != 0)
+                    rx_los_list.append(rx_los_data & 0x10 != 0)
+                    rx_los_list.append(rx_los_data & 0x20 != 0)
+                    rx_los_list.append(rx_los_data & 0x40 != 0)
+                    rx_los_list.append(rx_los_data & 0x80 != 0)
+                else:
+                    return [False] * 8
         else:
             offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx_los = (rx_los_data & 0x02 != 0)
-
-        return rx_los
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return [False]
+        return rx_los_list
 
     def get_tx_fault(self):
         """
@@ -881,66 +1355,107 @@ def get_tx_fault(self):
             A Boolean, True if SFP has TX fault, False if not
             Note : TX fault status is lached until a call to get_tx_fault or a reset.
         """
-        tx4_fault = False
-
-        if self.sfp_type == OSFP_TYPE or not self.dom_supported:
-            return False
+        tx_fault_list = []
 
+        if self.sfp_type == OSFP_TYPE:
+            return None
         elif self.sfp_type == QSFP_TYPE:
             offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET),
+                QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx1_fault = (tx_fault_data & 0x01 != 0)
-                tx2_fault = (tx_fault_data & 0x02 != 0)
-                tx3_fault = (tx_fault_data & 0x04 != 0)
-                tx4_fault = (tx_fault_data & 0x08 != 0)
-                tx4_fault = (
-                    tx1_fault and tx2_fault and tx3_fault and tx4_fault)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+            else:
+                return [False] * 4
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    tx_fault_data = int(dom_channel_monitor_raw[0], 8)
+                    tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x10 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x20 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x40 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x80 != 0)
+                else:
+                    return [False] * 8
         else:
             offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx4_fault = (tx_fault_data & 0x04 != 0)
-
-        return tx4_fault
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        return tx_fault_list
 
     def get_tx_disable(self):
         """
         Retrieves the tx_disable status of this SFP
         Returns:
-            A Boolean, True if tx_disable is enabled, False if disabled
+            A list of boolean values, representing the TX disable status
+            of each available channel, value is True if SFP channel
+            is TX disabled, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
         """
-
-        tx_disable = False
-
-        if self.sfp_type == OSFP_TYPE and not self.dom_supported:
-            return False
-
+        tx_disable_list = []
+        if self.sfp_type == OSFP_TYPE:
+            return None
         elif self.sfp_type == QSFP_TYPE:
             offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET),
+                QSFP_CHANNL_DISABLE_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_disable_data = int(dom_channel_monitor_raw[0], 16)
-                tx1_disable = (tx_disable_data & 0x01 != 0)
-                tx2_disable = (tx_disable_data & 0x02 != 0)
-                tx3_disable = (tx_disable_data & 0x04 != 0)
-                tx4_disable = (tx_disable_data & 0x08 != 0)
-                tx_disable = (
-                    tx1_disable and tx2_disable and tx3_disable and tx4_disable)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+            else:
+                return [False] * 4
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                    tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x08 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x10 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x20 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x40 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x80 != 0)
+                else:
+                    return [False] * 8
         else:
             offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_disable_data = int(dom_channel_monitor_raw[0], 16)
-                tx_disable = (tx_disable_data & 0xC0 != 0)
-
-        return tx_disable
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return [False]
+        return tx_disable_list
 
     def get_tx_disable_channel(self):
         """
@@ -948,32 +1463,12 @@ def get_tx_disable_channel(self):
         Returns:
             A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
             TX channels which have been disabled in this SFP.
-            As an example, a returned value of 0x5 indicates that channel 0
+            As an example, a returned value of 0x5 indicates that channel 0 
             and channel 2 have been disabled.
         """
-        tx_disable_list = [False, False, False, False]
-
-        if self.sfp_type == OSFP_TYPE:
-            pass
-
-        elif self.sfp_type == QSFP_TYPE:
-            offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
-                tx_disable_list[0] = (tx_disable_data & 0x01 != 0)
-                tx_disable_list[1] = (tx_disable_data & 0x02 != 0)
-                tx_disable_list[2] = (tx_disable_data & 0x04 != 0)
-                tx_disable_list[3] = (tx_disable_data & 0x08 != 0)
-        else:
-            offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
-                tx_disable_list[0] = (tx_disable_data & 0xC0 != 0)
-
+        tx_disable_list = self.get_tx_disable()
+        if tx_disable_list is None:
+            return 0
         tx_disabled = 0
         for i in range(len(tx_disable_list)):
             if tx_disable_list[i]:
@@ -997,7 +1492,7 @@ def get_lpmode(self):
         reg_value = int(content, 16)
 
         # Determind if port_num start from 1 or 0
-        bit_index = self.index
+        bit_index = self._index
 
         # Mask off the bit corresponding to our port
         mask = (1 << bit_index)
@@ -1020,16 +1515,16 @@ def get_power_override(self):
             if sfpd_obj is None:
                 return False
 
-            dom_control_raw = self.__read_eeprom_specific_bytes(
-                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            dom_control_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CONTROL_OFFSET), QSFP_CONTROL_WIDTH)
             if dom_control_raw is not None:
                 dom_control_data = sfpd_obj.parse_control_bytes(
                     dom_control_raw, 0)
-                power_override = (
-                    'On' == dom_control_data['data']['PowerOverride']['value'])
-                return power_override
+                return ('On' == dom_control_data['data']['PowerOverride'])
+            else:
+                return False
         else:
-            return False
+            return NotImplementedError
 
     def get_temperature(self):
         """
@@ -1037,8 +1532,61 @@ def get_temperature(self):
         Returns:
             An integer number of current temperature in Celsius
         """
-        transceiver_bulk_status = self.get_transceiver_bulk_status()
-        return transceiver_bulk_status.get("temperature", "N/A")
+        default = 0.0
+        if not self.dom_supported:
+            return default
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(
+                        dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 0
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_TEMPE_OFFSET), QSFP_DD_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(
+                        dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+
+        else:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+
+        return default
 
     def get_voltage(self):
         """
@@ -1046,8 +1594,62 @@ def get_voltage(self):
         Returns:
             An integer number of supply voltage in mV
         """
-        transceiver_bulk_status = self.get_transceiver_bulk_status()
-        return transceiver_bulk_status.get("voltage", "N/A")
+        default = 0.0
+
+        if not self.dom_supported:
+            return default
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(
+                        dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+
+        if self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_VOLT_OFFSET), QSFP_DD_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(
+                        dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+
+        else:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+
+        return default
 
     def get_tx_bias(self):
         """
@@ -1057,12 +1659,87 @@ def get_tx_bias(self):
             for channel 0 to channel 4.
             Ex. ['110.09', '111.12', '108.21', '112.09']
         """
-        transceiver_bulk_status = self.get_transceiver_bulk_status()
-        tx1_bs = transceiver_bulk_status.get("tx1bias", "N/A")
-        tx2_bs = transceiver_bulk_status.get("tx2bias", "N/A")
-        tx3_bs = transceiver_bulk_status.get("tx3bias", "N/A")
-        tx4_bs = transceiver_bulk_status.get("tx4bias", "N/A")
-        tx_bias_list = [tx1_bs, tx2_bs, tx3_bs, tx4_bs]
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                    dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if dom_tx_bias_power_supported:
+                    dom_tx_bias_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_TX_BIAS_OFFSET), QSFP_DD_TX_BIAS_WIDTH)
+                    if dom_tx_bias_raw is not None:
+                        dom_tx_bias_data = sfpd_obj.parse_dom_tx_bias(
+                            dom_tx_bias_raw, 0)
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX1Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX2Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX3Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX4Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX5Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX6Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX7Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX8Bias']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return default
+            else:
+                return default
+
         return tx_bias_list
 
     def get_rx_power(self):
@@ -1074,12 +1751,93 @@ def get_rx_power(self):
             Ex. ['1.77', '1.71', '1.68', '1.70']
         """
         rx_power_list = []
-        transceiver_bulk_status = self.get_transceiver_bulk_status()
-        rx1_p = transceiver_bulk_status.get("rx1power", "N/A")
-        rx2_p = transceiver_bulk_status.get("rx2power", "N/A")
-        rx3_p = transceiver_bulk_status.get("rx3power", "N/A")
-        rx4_p = transceiver_bulk_status.get("rx4power", "N/A")
-        rx_power_list = [rx1_p, rx2_p, rx3_p, rx4_p]
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return None
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return default
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+            # page 11
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if self.dom_rx_power_supported:
+                    dom_rx_power_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_RX_POWER_OFFSET), QSFP_DD_RX_POWER_WIDTH)
+                    if dom_rx_power_raw is not None:
+                        dom_rx_power_data = sfpd_obj.parse_dom_rx_power(
+                            dom_rx_power_raw, 0)
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX1Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX2Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX3Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX4Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX5Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX6Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX7Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX8Power']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return default
+            else:
+                return default
         return rx_power_list
 
     def get_tx_power(self):
@@ -1091,12 +1849,97 @@ def get_tx_power(self):
             Ex. ['1.86', '1.86', '1.86', '1.86']
         """
         tx_power_list = []
-        transceiver_bulk_status = self.get_transceiver_bulk_status()
-        tx1_p = transceiver_bulk_status.get("tx1power", "N/A")
-        tx2_p = transceiver_bulk_status.get("tx2power", "N/A")
-        tx3_p = transceiver_bulk_status.get("tx3power", "N/A")
-        tx4_p = transceiver_bulk_status.get("tx4power", "N/A")
-        tx_power_list = [tx1_p, tx2_p, tx3_p, tx4_p]
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return tx_power_list
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return tx_power_list
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET),
+                    QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return default
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+
+            # page 11
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if self.dom_tx_power_supported:
+                    dom_tx_power_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_TX_POWER_OFFSET),
+                        QSFP_DD_TX_POWER_WIDTH)
+                    if dom_tx_power_raw is not None:
+                        dom_tx_power_data = sfpd_obj.parse_dom_tx_power(
+                            dom_tx_power_raw, 0)
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX1Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX2Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX3Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX4Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX5Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX6Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX7Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX8Power']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return default
+            else:
+                return default
         return tx_power_list
 
     def reset(self):
@@ -1120,7 +1963,7 @@ def reset(self):
         reg_value = int(content, 16)
 
         # Determind if port_num start from 1 or 0
-        bit_index = self.index
+        bit_index = self._index
 
         # Mask off the bit corresponding to our port
         mask = (1 << bit_index)
@@ -1162,16 +2005,12 @@ def tx_disable(self, tx_disable):
         if self.sfp_type == QSFP_TYPE:
             sysfsfile_eeprom = None
             try:
-                tx_disable_ctl = 0xf if tx_disable else 0x0
-                buffer = create_string_buffer(1)
-                buffer[0] = chr(tx_disable_ctl)
+                tx_disable_value = 0xf if tx_disable else 0x0
                 # Write to eeprom
-                sysfsfile_eeprom = open(
-                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom = open(self._eeprom_path, "r+b")
                 sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
-                sysfsfile_eeprom.write(buffer[0])
-            except IOError as e:
-                #print("Error: unable to open file: %s" % str(e))
+                sysfsfile_eeprom.write(struct.pack('B', tx_disable_value))
+            except IOError:
                 return False
             finally:
                 if sysfsfile_eeprom is not None:
@@ -1194,20 +2033,15 @@ def tx_disable_channel(self, channel, disable):
         if self.sfp_type == QSFP_TYPE:
             sysfsfile_eeprom = None
             try:
-                channel_state = self.get_tx_disable_channel()
-                tx_enable_mask = [0xe, 0xd, 0xb, 0x7]
-                tx_disable_mask = [0x1, 0x3, 0x7, 0xf]
-                tx_disable_ctl = channel_state | tx_disable_mask[
-                    channel] if disable else channel_state & tx_enable_mask[channel]
-                buffer = create_string_buffer(1)
-                buffer[0] = chr(tx_disable_ctl)
+                current_state = self.get_tx_disable_channel()
+                tx_disable_value = (current_state | channel) if \
+                    disable else (current_state & (~channel))
+
                 # Write to eeprom
-                sysfsfile_eeprom = open(
-                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom = open(self._eeprom_path, "r+b")
                 sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
-                sysfsfile_eeprom.write(buffer[0])
-            except IOError as e:
-                #print("Error: unable to open file: %s" % str(e))
+                sysfsfile_eeprom.write(struct.pack('B', tx_disable_value))
+            except IOError:
                 return False
             finally:
                 if sysfsfile_eeprom is not None:
@@ -1237,7 +2071,7 @@ def set_lpmode(self, lpmode):
         reg_value = int(content, 16)
 
         # Determind if port_num start from 1 or 0
-        bit_index = self.index
+        bit_index = self._index
 
         # Mask off the bit corresponding to our port
         mask = (1 << bit_index)
@@ -1270,31 +2104,24 @@ def set_power_override(self, power_override, power_set):
             A boolean, True if power-override and power_set are set successfully,
             False if not
         """
-        if self.sfp_type == QSFP_TYPE:
+        sysfsfile_eeprom = None
+        if self.sfp_type == QSFP_TYPE and self.get_presence():
             try:
-                power_override_bit = 0
-                if power_override:
-                    power_override_bit |= 1 << 0
+                power_override_bit = 0x1 if power_override else 0
+                power_set_bit = 0x2 if power_set else 0
+                value = power_override_bit | power_set_bit
 
-                power_set_bit = 0
-                if power_set:
-                    power_set_bit |= 1 << 1
-
-                buffer = create_string_buffer(1)
-                buffer[0] = chr(power_override_bit | power_set_bit)
                 # Write to eeprom
-                sysfsfile_eeprom = open(
-                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom = open(self._eeprom_path, "r+b")
                 sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
-                sysfsfile_eeprom.write(buffer[0])
+                sysfsfile_eeprom.write(struct.pack('B', value))
             except IOError as e:
-                #print("Error: unable to open file: %s" % str(e))
-                return False
+                print("Error: unable to open file: %s" % str(e))
             finally:
                 if sysfsfile_eeprom is not None:
                     sysfsfile_eeprom.close()
                     time.sleep(0.01)
-            return True
+                    return True
         return False
 
     ##############################################################
@@ -1307,7 +2134,7 @@ def get_name(self):
             Returns:
             string: The name of the device
         """
-        return self.name
+        return self._name
 
     def get_presence(self):
         """
@@ -1315,7 +2142,8 @@ def get_presence(self):
         Returns:
             bool: True if PSU is present, False if not
         """
-        presence_status_raw = self._api_helper.read_txt_file(self.PRS_PATH).rstrip()
+        presence_status_raw = self._api_helper.read_txt_file(
+            self.PRS_PATH).rstrip()
         if not presence_status_raw:
             return False
 
@@ -1323,7 +2151,7 @@ def get_presence(self):
         reg_value = int(content, 16)
 
         # Determind if port_num start from 1 or 0
-        bit_index = self.index
+        bit_index = self._index
 
         # Mask off the bit corresponding to our port
         mask = (1 << bit_index)
@@ -1359,3 +2187,18 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         return self.get_presence() and not self.get_reset_status()
+
+    def get_position_in_parent(self):
+        """
+        Returns:
+            Temp return 0
+        """
+        return 0
+
+    def is_replaceable(self):
+        """
+        Retrieves if replaceable
+        Returns:
+            A boolean value, True if replaceable
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
index 3848f9340541..ce2a45f0c5bb 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
@@ -7,7 +7,6 @@
 #############################################################################
 
 import os
-import re
 import os.path
 
 try:
@@ -19,14 +18,18 @@
 THERMAL_INFO = {
     0: {
         "F2B_max": 50,
+        "F2B_max_crit": 75,
         "B2F_max": 55,
+        "B2F_max_crit": 75,
         "postion": "asic",
         "name": "Front-panel temp sensor 1",
         "i2c_path": "i2c-5/5-0048/hwmon/hwmon1",    # u4 system-inlet
     },
     1: {
         "F2B_max": 50,
+        "F2B_max_crit": 75,
         "B2F_max": 55,
+        "B2F_max_crit": 75,
         "postion": "asic",
         "name": "Front-panel temp sensor 2",
         "i2c_path": "i2c-6/6-0049/hwmon/hwmon2",    # u2 system-inlet
@@ -51,7 +54,9 @@
     },
     4: {
         "F2B_max": 70,
+        "F2B_max_crit": 75,
         "B2F_max": 55,
+        "B2F_max_crit": 75,
         "postion": "cpu",
         "name": "Rear-panel temp sensor 2",
         "i2c_path": "i2c-15/15-004e/hwmon/hwmon5"   # u9201 system-outlet
@@ -72,8 +77,7 @@ def __init__(self, thermal_index, airflow):
         self._api_helper = APIHelper()
         self._airflow = airflow
         self._thermal_info = THERMAL_INFO[self.index]
-        self._hwmon_path = "{}/{}".format(I2C_ADAPTER_PATH,
-                                         self._thermal_info["i2c_path"])
+        self._hwmon_path = "{}/{}".format(I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
         self.name = self.get_name()
         self.postion = self._thermal_info["postion"]
         self.ss_index = 1
@@ -110,8 +114,9 @@ def get_high_threshold(self):
             A float number, the high threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        max_crit_key = '{}_max'.format(self._airflow)
-        return self._thermal_info.get(max_crit_key, None)
+        temp_file = "temp{}_max".format(self.ss_index)
+        temp = float(self.__get_temp(temp_file))
+        return temp
 
     def get_low_threshold(self):
         """
@@ -120,7 +125,7 @@ def get_low_threshold(self):
             A float number, the low threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        return 0.0
+        return 0.001
 
     def set_high_threshold(self, temperature):
         """
@@ -133,31 +138,33 @@ def set_high_threshold(self, temperature):
         """
         temp_file = "temp{}_max".format(self.ss_index)
         is_set = self.__set_threshold(temp_file, int(temperature*1000))
-        file_set = False
-        if is_set:
-            try:
-                with open(self.SS_CONFIG_PATH, 'r+') as f:
-                    content = f.readlines()
-                    f.seek(0)
-                    ss_found = False
-                    for idx, val in enumerate(content):
-                        if self.name in val:
-                            ss_found = True
-                        elif ss_found and temp_file in val:
-                            content[idx] = "    set {} {}\n".format(
-                                temp_file, temperature)
-                            f.writelines(content)
-                            file_set = True
-                            break
-            except IOError:
-                file_set = False
+        file_set = True
+        if self._api_helper.is_host():
+            file_set = False
+            if is_set:
+                try:
+                    with open(self.SS_CONFIG_PATH, 'r+') as f:
+                        content = f.readlines()
+                        f.seek(0)
+                        ss_found = False
+                        for idx, val in enumerate(content):
+                            if self.name in val:
+                                ss_found = True
+                            elif ss_found and temp_file in val:
+                                content[idx] = "    set {} {}\n".format(
+                                    temp_file, temperature)
+                                f.writelines(content)
+                                file_set = True
+                                break
+                except IOError as err:
+                    file_set = False
 
         return is_set & file_set
 
     def set_low_threshold(self, temperature):
         """
         Sets the low threshold temperature of thermal
-        Args : 
+        Args :
             temperature: A float number up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         Returns:
@@ -173,7 +180,10 @@ def get_high_critical_threshold(self):
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
         max_crit_key = '{}_max_crit'.format(self._airflow)
-        return self._thermal_info.get(max_crit_key, None)
+        max_crit_threshold = self._thermal_info.get(max_crit_key, None)
+        if max_crit_threshold is not None:
+            max_crit_threshold = float(max_crit_threshold)
+        return max_crit_threshold
 
     def get_low_critical_threshold(self):
         """
@@ -182,7 +192,7 @@ def get_low_critical_threshold(self):
             A float number, the low critical threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        return 0.0
+        return 0.001
 
     def get_name(self):
         """
@@ -234,3 +244,21 @@ def get_status(self):
 
         raw_txt = self.__read_txt_file(fault_file_path)
         return int(raw_txt) == 0
+
+    def is_replaceable(self):
+        """
+        Retrieves whether thermal module is replaceable
+        Returns:
+            A boolean value, True if replaceable, False if not
+        """
+        return False
+
+    def get_position_in_parent(self):
+        """
+        Retrieves the thermal position information
+        Returns:
+            A int value, 0 represent ASIC thermal, 1 represent CPU thermal info
+        """
+        if self.postion == "cpu":
+            return 1
+        return 0
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
index 5ab79309f0fe..122b5d90ddb6 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
@@ -135,6 +135,9 @@ def arm(self, seconds):
         ret = WDT_COMMON_ERROR
         if seconds < 0:
             return ret
+        if seconds > 16779:
+            return ret
+
 
         try:
             if self.timeout != seconds:
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
index e27d4df46782..8ee3d4465588 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
@@ -89,10 +89,19 @@ start)
         echo emc2305 0x2e > /sys/bus/i2c/devices/i2c-13/new_device
         echo emc2305 0x4d > /sys/bus/i2c/devices/i2c-13/new_device
 
+        echo 24c02 0x50 > /sys/bus/i2c/devices/i2c-18/new_device
+        echo 24c02 0x50 > /sys/bus/i2c/devices/i2c-19/new_device
+        echo 24c02 0x50 > /sys/bus/i2c/devices/i2c-20/new_device
+        echo 24c02 0x50 > /sys/bus/i2c/devices/i2c-21/new_device
+        echo 24c02 0x50 > /sys/bus/i2c/devices/i2c-22/new_device
+
         # Attach PSUs
         echo dps460 0x5a > /sys/bus/i2c/devices/i2c-10/new_device
         echo dps460 0x5b > /sys/bus/i2c/devices/i2c-11/new_device
 
+        echo 24c02 0x52 > /sys/bus/i2c/devices/i2c-10/new_device
+        echo 24c02 0x53 > /sys/bus/i2c/devices/i2c-11/new_device
+
         # Attach PCA9506 GPIO expander for 40 pins
         echo pca9505 0x20 > /sys/bus/i2c/devices/i2c-17/new_device
 
@@ -117,16 +126,16 @@ start)
         export_gpio 27 "in" # PSU L ABS
         export_gpio 28 "in" # PSU R ABS
 
-        export_gpio 29 "out" # Fan 1 LED: Red
-        export_gpio 30 "out" # Fan 1 LED: Yellow
-        export_gpio 31 "out" # Fan 2 LED: Red
-        export_gpio 32 "out" # Fan 2 LED: Yellow
-        export_gpio 33 "out" # Fan 3 LED: Red
-        export_gpio 34 "out" # Fan 3 LED: Yellow
-        export_gpio 35 "out" # Fan 4 LED: Red
-        export_gpio 36 "out" # Fan 4 LED: Yellow
-        export_gpio 37 "out" # Fan 5 LED: Red
-        export_gpio 38 "out" # Fan 5 LED: Yellow
+        export_gpio 29 "out" # Fan 2 LED: Red
+        export_gpio 30 "out" # Fan 2 LED: Green
+        export_gpio 31 "out" # Fan 1 LED: Red
+        export_gpio 32 "out" # Fan 1 LED: Green
+        export_gpio 33 "out" # Fan 5 LED: Red
+        export_gpio 34 "out" # Fan 5 LED: Green
+        export_gpio 35 "out" # Fan 3 LED: Red
+        export_gpio 36 "out" # Fan 3 LED: Green
+        export_gpio 37 "out" # Fan 4 LED: Red
+        export_gpio 38 "out" # Fan 4 LED: Green
 
         # Turn off/down lpmod by defult (0 - Normal, 1 - Low Pow)
         echo 0x00000000 > /sys/devices/platform/dx010_cpld/qsfp_lpmode
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
index a36e2cd1377c..98c17e55a980 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
@@ -5,4 +5,5 @@ dx010/scripts/fancontrol.sh etc/init.d
 dx010/scripts/fancontrol.service lib/systemd/system
 services/fancontrol/fancontrol  usr/local/bin
 dx010/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
+dx010/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
 services/platform_api/platform_api_mgnt.sh usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
index 493119bd37f6..208c8696c4b3 100755
--- a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
+++ b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/platform_api_mgnt.sh
@@ -4,13 +4,20 @@ PREV_REBOOT_CAUSE="/host/reboot-cause/"
 DEVICE="/usr/share/sonic/device"
 PLATFORM=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 FILES=$DEVICE/$PLATFORM/api_files
+PY2_PACK=$DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl
+PY3_PACK=$DEVICE/$PLATFORM/sonic_platform-1.0-py3-none-any.whl
 
 install() {
-    # Install sonic-platform package
-    if [ -e $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl ]; then
-        pip install $DEVICE/$PLATFORM/sonic_platform-1.0-py2-none-any.whl
-        pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl
+    # Install python2.7 sonic-platform package
+    if [ -e $PY2_PACK ]; then
+        pip install $PY2_PACK
     fi
+
+    # Install python3 sonic-platform package
+    if [ -e $PY3_PACK ]; then
+        pip3 install $PY3_PACK
+    fi
+
 }
 
 init() {

From 574c75b7c8e2775571ab0219b6b4a0bcfa5144de Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Fri, 2 Apr 2021 22:37:09 +0530
Subject: [PATCH 0331/1674] Update Media settings test case (#7220)

---
 src/sonic-device-data/tests/media_checker | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sonic-device-data/tests/media_checker b/src/sonic-device-data/tests/media_checker
index 7d59d88254c5..dc9567985dcb 100755
--- a/src/sonic-device-data/tests/media_checker
+++ b/src/sonic-device-data/tests/media_checker
@@ -6,7 +6,10 @@ import re
 import sys
 
 level1_keys = ["GLOBAL_MEDIA_SETTINGS","PORT_MEDIA_SETTINGS"]
-setting_keys = ["preemphasis","idriver","ipredriver"]
+
+setting_keys = ["preemphasis","idriver","ipredriver",\
+                "main","pre1","pre2","pre3",\
+                "post1","post2","post3","attn"]
 lane_prefix = "lane"
 comma_separator = ","
 range_separator = "-"

From 4c0ab2aa2f252ae9dd4c158fa321b85b771416f1 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Mon, 5 Apr 2021 22:14:37 +0530
Subject: [PATCH 0332/1674] Add DellEMC Z9332f pre-emphasis settings (#6984)

---
 .../media_settings.json                       | 26118 ++++++++++++++++
 1 file changed, 26118 insertions(+)
 create mode 100644 device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json
new file mode 100644
index 000000000000..efd181116976
--- /dev/null
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json
@@ -0,0 +1,26118 @@
+{
+    "PORT_MEDIA_SETTINGS":{
+        "1":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "2":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "3":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "4":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "5":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "6":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "7":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "8":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "9":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "10":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "11":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "12":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "13":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "14":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "15":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "16":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "17":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "18":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "19":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "20":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "21":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "22":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "23":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "24":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "25":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "26":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "27":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "28":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "29":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "30":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "31":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        },
+        "32":{
+            "Amphenol-NDVYYF-0001":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0003":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0004":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "Amphenol-NDVYYF-0002":{               
+                "main":{
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
+                "pre2":{
+                    "lane0": "0x00000004",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000000"
+                }
+            },
+            "Molex-2170601001":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe4"
+                },
+                "pre2":{
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
+                    "lane7": "0x00000004"
+                }
+            },
+            "ONET-1AT-5QAM10XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM15XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "ONET-1AT-5QAM20XX-10A":{               
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x00000088",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
+                    "lane7": "0x00000088"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                }
+            },
+            "QSFP28-40GBASE-CR4-1M":{               
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-3M":{             
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-5M":{              
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post3":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre2":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1M":{          
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-2M":{         
+                "main":{
+                    "lane0": "0x0000001e",
+                    "lane1": "0x0000001e",
+                    "lane2": "0x0000001e",
+                    "lane3": "0x0000001e",
+                    "lane4": "0x0000001e",
+                    "lane5": "0x0000001e",
+                    "lane6": "0x0000001e",
+                    "lane7": "0x0000001e"
+                },
+                "post1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-3M":{        
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
+            },
+            "QSFP+-40GBASE-CR4-5M":{                
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            },
+            "QSFP+-40GBASE-CR4-7M":{               
+                "main":{
+                    "lane0": "0x00000057",
+                    "lane1": "0x00000057",
+                    "lane2": "0x00000057",
+                    "lane3": "0x00000057",
+                    "lane4": "0x00000057",
+                    "lane5": "0x00000057",
+                    "lane6": "0x00000057",
+                    "lane7": "0x00000057"
+                },
+                "post1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffa",
+                    "lane1": "0xfffffffa",
+                    "lane2": "0xfffffffa",
+                    "lane3": "0xfffffffa",
+                    "lane4": "0xfffffffa",
+                    "lane5": "0xfffffffa",
+                    "lane6": "0xfffffffa",
+                    "lane7": "0xfffffffa"
+                }
+            }
+        }
+    }
+}
+
+

From 740dd03138525854b9932752c48b98c164969a55 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 5 Apr 2021 13:06:27 -0700
Subject: [PATCH 0333/1674] [sonic-config-engine]: Update L2 preset for dualtor
 (#7215)

- When generating L2 preset, check for dual ToR setting from CLI option `-a '{"is_dualtor": true}'`
- When dual ToR is specified, add subtype field to DEVICE_METADATA table
- When dual ToR is specified, add MUX_CABLE, TUNNEL, LOOPBACK_INTERFACE, and PEER_SWITCH tables
---
 src/sonic-config-engine/config_samples.py     |  48 +-
 .../sample_output/py2/l2switch_dualtor.json   | 454 ++++++++++++++++++
 .../sample_output/py3/l2switch_dualtor.json   | 454 ++++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py |  11 +
 4 files changed, 966 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json

diff --git a/src/sonic-config-engine/config_samples.py b/src/sonic-config-engine/config_samples.py
index 9072e0209c3e..7f8b968fa5a4 100644
--- a/src/sonic-config-engine/config_samples.py
+++ b/src/sonic-config-engine/config_samples.py
@@ -1,5 +1,14 @@
+import sys
+
+from ipaddress import ip_interface
 from natsort import natsorted
 
+#TODO: Remove once Python 2 support is removed
+if sys.version_info.major == 3:
+    UNICODE_TYPE = str
+else:
+    UNICODE_TYPE = unicode
+
 def generate_t1_sample_config(data):
     data['DEVICE_METADATA']['localhost']['hostname'] = 'sonic'
     data['DEVICE_METADATA']['localhost']['type'] = 'LeafRouter'
@@ -39,11 +48,48 @@ def generate_empty_config(data):
     return new_data
 
 def generate_l2_config(data):
+    if 'is_dualtor' in data and data['is_dualtor']:
+        is_dualtor = True
+        data.pop('is_dualtor')
+    else:
+        is_dualtor = False
     data['VLAN'] = {'Vlan1000': {'vlanid': '1000'}}
     data['VLAN_MEMBER'] = {}
-    for port in natsorted(data['PORT']):
+    if is_dualtor:
+        data['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
+        data['LOOPBACK_INTERFACE'] = {
+                                        'Loopback2': {},
+                                        'Loopback2|3.3.3.3': {}
+                                     }
+        data['MUX_CABLE'] = {}
+        data['PEER_SWITCH'] = {
+                                "peer_switch_hostname": {
+                                    "address_ipv4": "1.1.1.1"
+                                }
+                              }
+        data['TUNNEL'] = {
+                            "MuxTunnel0": {
+                                "dscp_mode": "uniform",
+                                "dst_ip": "2.2.2.2",
+                                "ecn_mode": "copy_from_outer",
+                                "encap_ecn_mode": "standard",
+                                "ttl_mode": "pipe",
+                                "tunnel_type": "IPINIP"
+                            }
+                         }
+
+        server_ipv4_base = ip_interface(UNICODE_TYPE('192.168.0.1/32'))
+        server_ipv6_base = ip_interface(UNICODE_TYPE('fc02:1000::1/128'))
+    for i, port in enumerate(natsorted(data['PORT'])):
         data['PORT'][port].setdefault('admin_status', 'up')
         data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
+        if is_dualtor:
+            mux_cable_entry = {
+                'server_ipv4': str(server_ipv4_base + i),
+                'server_ipv6': str(server_ipv6_base + i),
+                'state': 'auto'
+            }
+            data['MUX_CABLE'][port] = mux_cable_entry
     return data
 
 _sample_generators = {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
new file mode 100644
index 000000000000..ab8f2d0b05f0
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
@@ -0,0 +1,454 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "hwsku": "Mellanox-SN2700",
+            "subtype": "DualToR"
+        }
+    },
+    "PORT": {
+        "Ethernet0": {
+            "alias": "fortyGigE0/0",
+            "lanes": "29,30,31,32",
+            "admin_status": "up"
+        },
+        "Ethernet4": {
+            "alias": "fortyGigE0/4",
+            "lanes": "25,26,27,28",
+            "admin_status": "up"
+        },
+        "Ethernet8": {
+            "alias": "fortyGigE0/8",
+            "lanes": "37,38,39,40",
+            "admin_status": "up"
+        },
+        "Ethernet12": {
+            "alias": "fortyGigE0/12",
+            "lanes": "33,34,35,36",
+            "admin_status": "up"
+        },
+        "Ethernet16": {
+            "alias": "fortyGigE0/16",
+            "lanes": "41,42,43,44",
+            "admin_status": "up"
+        },
+        "Ethernet20": {
+            "alias": "fortyGigE0/20",
+            "lanes": "45,46,47,48",
+            "admin_status": "up"
+        },
+        "Ethernet24": {
+            "alias": "fortyGigE0/24",
+            "lanes": "5,6,7,8",
+            "admin_status": "up"
+        },
+        "Ethernet28": {
+            "alias": "fortyGigE0/28",
+            "lanes": "1,2,3,4",
+            "admin_status": "up"
+        },
+        "Ethernet32": {
+            "alias": "fortyGigE0/32",
+            "lanes": "9,10,11,12",
+            "admin_status": "up"
+        },
+        "Ethernet36": {
+            "alias": "fortyGigE0/36",
+            "lanes": "13,14,15,16",
+            "admin_status": "up"
+        },
+        "Ethernet40": {
+            "alias": "fortyGigE0/40",
+            "lanes": "21,22,23,24",
+            "admin_status": "up"
+        },
+        "Ethernet44": {
+            "alias": "fortyGigE0/44",
+            "lanes": "17,18,19,20",
+            "admin_status": "up"
+        },
+        "Ethernet48": {
+            "alias": "fortyGigE0/48",
+            "lanes": "49,50,51,52",
+            "admin_status": "up"
+        },
+        "Ethernet52": {
+            "alias": "fortyGigE0/52",
+            "lanes": "53,54,55,56",
+            "admin_status": "up"
+        },
+        "Ethernet56": {
+            "alias": "fortyGigE0/56",
+            "lanes": "61,62,63,64",
+            "admin_status": "up"
+        },
+        "Ethernet60": {
+            "alias": "fortyGigE0/60",
+            "lanes": "57,58,59,60",
+            "admin_status": "up"
+        },
+        "Ethernet64": {
+            "alias": "fortyGigE0/64",
+            "lanes": "65,66,67,68",
+            "admin_status": "up"
+        },
+        "Ethernet68": {
+            "alias": "fortyGigE0/68",
+            "lanes": "69,70,71,72",
+            "admin_status": "up"
+        },
+        "Ethernet72": {
+            "alias": "fortyGigE0/72",
+            "lanes": "77,78,79,80",
+            "admin_status": "up"
+        },
+        "Ethernet76": {
+            "alias": "fortyGigE0/76",
+            "lanes": "73,74,75,76",
+            "admin_status": "up"
+        },
+        "Ethernet80": {
+            "alias": "fortyGigE0/80",
+            "lanes": "105,106,107,108",
+            "admin_status": "up"
+        },
+        "Ethernet84": {
+            "alias": "fortyGigE0/84",
+            "lanes": "109,110,111,112",
+            "admin_status": "up"
+        },
+        "Ethernet88": {
+            "alias": "fortyGigE0/88",
+            "lanes": "117,118,119,120",
+            "admin_status": "up"
+        },
+        "Ethernet92": {
+            "alias": "fortyGigE0/92",
+            "lanes": "113,114,115,116",
+            "admin_status": "up"
+        },
+        "Ethernet96": {
+            "alias": "fortyGigE0/96",
+            "lanes": "121,122,123,124",
+            "admin_status": "up"
+        },
+        "Ethernet100": {
+            "alias": "fortyGigE0/100",
+            "lanes": "125,126,127,128",
+            "admin_status": "up"
+        },
+        "Ethernet104": {
+            "alias": "fortyGigE0/104",
+            "lanes": "85,86,87,88",
+            "admin_status": "up"
+        },
+        "Ethernet108": {
+            "alias": "fortyGigE0/108",
+            "lanes": "81,82,83,84",
+            "admin_status": "up"
+        },
+        "Ethernet112": {
+            "alias": "fortyGigE0/112",
+            "lanes": "89,90,91,92",
+            "admin_status": "up"
+        },
+        "Ethernet116": {
+            "alias": "fortyGigE0/116",
+            "lanes": "93,94,95,96",
+            "admin_status": "up"
+        },
+        "Ethernet120": {
+            "alias": "fortyGigE0/120",
+            "lanes": "97,98,99,100",
+            "admin_status": "up"
+        },
+        "Ethernet124": {
+            "alias": "fortyGigE0/124",
+            "lanes": "101,102,103,104",
+            "admin_status": "up"
+        }
+    },
+    "VLAN": {
+        "Vlan1000": {
+            "vlanid": "1000"
+        }
+    },
+    "VLAN_MEMBER": {
+        "Vlan1000|Ethernet0": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet4": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet8": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet12": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet16": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet20": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet24": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet28": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet32": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet36": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet40": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet44": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet48": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet52": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet56": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet60": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet64": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet68": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet72": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet76": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet80": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet84": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet88": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet92": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet96": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet100": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet104": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet108": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet112": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet116": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet120": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet124": {
+            "tagging_mode": "untagged"
+        }
+    },
+    "TUNNEL": {
+        "MuxTunnel0": {
+            "dscp_mode": "uniform",
+            "dst_ip": "2.2.2.2",
+            "ecn_mode": "copy_from_outer",
+            "encap_ecn_mode": "standard",
+            "ttl_mode": "pipe",
+            "tunnel_type": "IPINIP"
+        }
+    },
+    "PEER_SWITCH": {
+        "peer_switch_hostname": {
+            "address_ipv4": "1.1.1.1"
+        }
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback2": {},
+        "Loopback2|3.3.3.3": {}
+    },
+    "MUX_CABLE":{
+        "Ethernet0": {
+            "server_ipv4": "192.168.0.1/32",
+            "server_ipv6": "fc02:1000::1/128",
+            "state": "auto"
+        },
+        "Ethernet4": {
+            "server_ipv4": "192.168.0.2/32",
+            "server_ipv6": "fc02:1000::2/128",
+            "state": "auto"
+        },
+        "Ethernet8": {
+            "server_ipv4": "192.168.0.3/32",
+            "server_ipv6": "fc02:1000::3/128",
+            "state": "auto"
+        },
+        "Ethernet12": {
+            "server_ipv4": "192.168.0.4/32",
+            "server_ipv6": "fc02:1000::4/128",
+            "state": "auto"
+        },
+        "Ethernet16": {
+            "server_ipv4": "192.168.0.5/32",
+            "server_ipv6": "fc02:1000::5/128",
+            "state": "auto"
+        },
+        "Ethernet20": {
+            "server_ipv4": "192.168.0.6/32",
+            "server_ipv6": "fc02:1000::6/128",
+            "state": "auto"
+        },
+        "Ethernet24": {
+            "server_ipv4": "192.168.0.7/32",
+            "server_ipv6": "fc02:1000::7/128",
+            "state": "auto"
+        },
+        "Ethernet28": {
+            "server_ipv4": "192.168.0.8/32",
+            "server_ipv6": "fc02:1000::8/128",
+            "state": "auto"
+        },
+        "Ethernet32": {
+            "server_ipv4": "192.168.0.9/32",
+            "server_ipv6": "fc02:1000::9/128",
+            "state": "auto"
+        },
+        "Ethernet36": {
+            "server_ipv4": "192.168.0.10/32",
+            "server_ipv6": "fc02:1000::a/128",
+            "state": "auto"
+        },
+        "Ethernet40": {
+            "server_ipv4": "192.168.0.11/32",
+            "server_ipv6": "fc02:1000::b/128",
+            "state": "auto"
+        },
+        "Ethernet44": {
+            "server_ipv4": "192.168.0.12/32",
+            "server_ipv6": "fc02:1000::c/128",
+            "state": "auto"
+        },
+        "Ethernet48": {
+            "server_ipv4": "192.168.0.13/32",
+            "server_ipv6": "fc02:1000::d/128",
+            "state": "auto"
+        },
+        "Ethernet52": {
+            "server_ipv4": "192.168.0.14/32",
+            "server_ipv6": "fc02:1000::e/128",
+            "state": "auto"
+        },
+        "Ethernet56": {
+            "server_ipv4": "192.168.0.15/32",
+            "server_ipv6": "fc02:1000::f/128",
+            "state": "auto"
+        },
+        "Ethernet60": {
+            "server_ipv4": "192.168.0.16/32",
+            "server_ipv6": "fc02:1000::10/128",
+            "state": "auto"
+        },
+        "Ethernet64": {
+            "server_ipv4": "192.168.0.17/32",
+            "server_ipv6": "fc02:1000::11/128",
+            "state": "auto"
+        },
+        "Ethernet68": {
+            "server_ipv4": "192.168.0.18/32",
+            "server_ipv6": "fc02:1000::12/128",
+            "state": "auto"
+        },
+        "Ethernet72": {
+            "server_ipv4": "192.168.0.19/32",
+            "server_ipv6": "fc02:1000::13/128",
+            "state": "auto"
+        },
+        "Ethernet76": {
+            "server_ipv4": "192.168.0.20/32",
+            "server_ipv6": "fc02:1000::14/128",
+            "state": "auto"
+        },
+        "Ethernet80": {
+            "server_ipv4": "192.168.0.21/32",
+            "server_ipv6": "fc02:1000::15/128",
+            "state": "auto"
+        },
+        "Ethernet84": {
+            "server_ipv4": "192.168.0.22/32",
+            "server_ipv6": "fc02:1000::16/128",
+            "state": "auto"
+        },
+        "Ethernet88": {
+            "server_ipv4": "192.168.0.23/32",
+            "server_ipv6": "fc02:1000::17/128",
+            "state": "auto"
+        },
+        "Ethernet92": {
+            "server_ipv4": "192.168.0.24/32",
+            "server_ipv6": "fc02:1000::18/128",
+            "state": "auto"
+        },
+        "Ethernet96": {
+            "server_ipv4": "192.168.0.25/32",
+            "server_ipv6": "fc02:1000::19/128",
+            "state": "auto"
+        },
+        "Ethernet100": {
+            "server_ipv4": "192.168.0.26/32",
+            "server_ipv6": "fc02:1000::1a/128",
+            "state": "auto"
+        },
+        "Ethernet104": {
+            "server_ipv4": "192.168.0.27/32",
+            "server_ipv6": "fc02:1000::1b/128",
+            "state": "auto"
+        },
+        "Ethernet108": {
+            "server_ipv4": "192.168.0.28/32",
+            "server_ipv6": "fc02:1000::1c/128",
+            "state": "auto"
+        },
+        "Ethernet112": {
+            "server_ipv4": "192.168.0.29/32",
+            "server_ipv6": "fc02:1000::1d/128",
+            "state": "auto"
+        },
+        "Ethernet116": {
+            "server_ipv4": "192.168.0.30/32",
+            "server_ipv6": "fc02:1000::1e/128",
+            "state": "auto"
+        },
+        "Ethernet120": {
+            "server_ipv4": "192.168.0.31/32",
+            "server_ipv6": "fc02:1000::1f/128",
+            "state": "auto"
+        },
+        "Ethernet124": {
+            "server_ipv4": "192.168.0.32/32",
+            "server_ipv6": "fc02:1000::20/128",
+            "state": "auto"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json
new file mode 100644
index 000000000000..ab8f2d0b05f0
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json
@@ -0,0 +1,454 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "hwsku": "Mellanox-SN2700",
+            "subtype": "DualToR"
+        }
+    },
+    "PORT": {
+        "Ethernet0": {
+            "alias": "fortyGigE0/0",
+            "lanes": "29,30,31,32",
+            "admin_status": "up"
+        },
+        "Ethernet4": {
+            "alias": "fortyGigE0/4",
+            "lanes": "25,26,27,28",
+            "admin_status": "up"
+        },
+        "Ethernet8": {
+            "alias": "fortyGigE0/8",
+            "lanes": "37,38,39,40",
+            "admin_status": "up"
+        },
+        "Ethernet12": {
+            "alias": "fortyGigE0/12",
+            "lanes": "33,34,35,36",
+            "admin_status": "up"
+        },
+        "Ethernet16": {
+            "alias": "fortyGigE0/16",
+            "lanes": "41,42,43,44",
+            "admin_status": "up"
+        },
+        "Ethernet20": {
+            "alias": "fortyGigE0/20",
+            "lanes": "45,46,47,48",
+            "admin_status": "up"
+        },
+        "Ethernet24": {
+            "alias": "fortyGigE0/24",
+            "lanes": "5,6,7,8",
+            "admin_status": "up"
+        },
+        "Ethernet28": {
+            "alias": "fortyGigE0/28",
+            "lanes": "1,2,3,4",
+            "admin_status": "up"
+        },
+        "Ethernet32": {
+            "alias": "fortyGigE0/32",
+            "lanes": "9,10,11,12",
+            "admin_status": "up"
+        },
+        "Ethernet36": {
+            "alias": "fortyGigE0/36",
+            "lanes": "13,14,15,16",
+            "admin_status": "up"
+        },
+        "Ethernet40": {
+            "alias": "fortyGigE0/40",
+            "lanes": "21,22,23,24",
+            "admin_status": "up"
+        },
+        "Ethernet44": {
+            "alias": "fortyGigE0/44",
+            "lanes": "17,18,19,20",
+            "admin_status": "up"
+        },
+        "Ethernet48": {
+            "alias": "fortyGigE0/48",
+            "lanes": "49,50,51,52",
+            "admin_status": "up"
+        },
+        "Ethernet52": {
+            "alias": "fortyGigE0/52",
+            "lanes": "53,54,55,56",
+            "admin_status": "up"
+        },
+        "Ethernet56": {
+            "alias": "fortyGigE0/56",
+            "lanes": "61,62,63,64",
+            "admin_status": "up"
+        },
+        "Ethernet60": {
+            "alias": "fortyGigE0/60",
+            "lanes": "57,58,59,60",
+            "admin_status": "up"
+        },
+        "Ethernet64": {
+            "alias": "fortyGigE0/64",
+            "lanes": "65,66,67,68",
+            "admin_status": "up"
+        },
+        "Ethernet68": {
+            "alias": "fortyGigE0/68",
+            "lanes": "69,70,71,72",
+            "admin_status": "up"
+        },
+        "Ethernet72": {
+            "alias": "fortyGigE0/72",
+            "lanes": "77,78,79,80",
+            "admin_status": "up"
+        },
+        "Ethernet76": {
+            "alias": "fortyGigE0/76",
+            "lanes": "73,74,75,76",
+            "admin_status": "up"
+        },
+        "Ethernet80": {
+            "alias": "fortyGigE0/80",
+            "lanes": "105,106,107,108",
+            "admin_status": "up"
+        },
+        "Ethernet84": {
+            "alias": "fortyGigE0/84",
+            "lanes": "109,110,111,112",
+            "admin_status": "up"
+        },
+        "Ethernet88": {
+            "alias": "fortyGigE0/88",
+            "lanes": "117,118,119,120",
+            "admin_status": "up"
+        },
+        "Ethernet92": {
+            "alias": "fortyGigE0/92",
+            "lanes": "113,114,115,116",
+            "admin_status": "up"
+        },
+        "Ethernet96": {
+            "alias": "fortyGigE0/96",
+            "lanes": "121,122,123,124",
+            "admin_status": "up"
+        },
+        "Ethernet100": {
+            "alias": "fortyGigE0/100",
+            "lanes": "125,126,127,128",
+            "admin_status": "up"
+        },
+        "Ethernet104": {
+            "alias": "fortyGigE0/104",
+            "lanes": "85,86,87,88",
+            "admin_status": "up"
+        },
+        "Ethernet108": {
+            "alias": "fortyGigE0/108",
+            "lanes": "81,82,83,84",
+            "admin_status": "up"
+        },
+        "Ethernet112": {
+            "alias": "fortyGigE0/112",
+            "lanes": "89,90,91,92",
+            "admin_status": "up"
+        },
+        "Ethernet116": {
+            "alias": "fortyGigE0/116",
+            "lanes": "93,94,95,96",
+            "admin_status": "up"
+        },
+        "Ethernet120": {
+            "alias": "fortyGigE0/120",
+            "lanes": "97,98,99,100",
+            "admin_status": "up"
+        },
+        "Ethernet124": {
+            "alias": "fortyGigE0/124",
+            "lanes": "101,102,103,104",
+            "admin_status": "up"
+        }
+    },
+    "VLAN": {
+        "Vlan1000": {
+            "vlanid": "1000"
+        }
+    },
+    "VLAN_MEMBER": {
+        "Vlan1000|Ethernet0": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet4": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet8": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet12": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet16": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet20": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet24": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet28": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet32": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet36": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet40": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet44": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet48": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet52": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet56": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet60": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet64": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet68": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet72": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet76": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet80": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet84": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet88": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet92": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet96": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet100": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet104": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet108": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet112": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet116": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet120": {
+            "tagging_mode": "untagged"
+        },
+        "Vlan1000|Ethernet124": {
+            "tagging_mode": "untagged"
+        }
+    },
+    "TUNNEL": {
+        "MuxTunnel0": {
+            "dscp_mode": "uniform",
+            "dst_ip": "2.2.2.2",
+            "ecn_mode": "copy_from_outer",
+            "encap_ecn_mode": "standard",
+            "ttl_mode": "pipe",
+            "tunnel_type": "IPINIP"
+        }
+    },
+    "PEER_SWITCH": {
+        "peer_switch_hostname": {
+            "address_ipv4": "1.1.1.1"
+        }
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback2": {},
+        "Loopback2|3.3.3.3": {}
+    },
+    "MUX_CABLE":{
+        "Ethernet0": {
+            "server_ipv4": "192.168.0.1/32",
+            "server_ipv6": "fc02:1000::1/128",
+            "state": "auto"
+        },
+        "Ethernet4": {
+            "server_ipv4": "192.168.0.2/32",
+            "server_ipv6": "fc02:1000::2/128",
+            "state": "auto"
+        },
+        "Ethernet8": {
+            "server_ipv4": "192.168.0.3/32",
+            "server_ipv6": "fc02:1000::3/128",
+            "state": "auto"
+        },
+        "Ethernet12": {
+            "server_ipv4": "192.168.0.4/32",
+            "server_ipv6": "fc02:1000::4/128",
+            "state": "auto"
+        },
+        "Ethernet16": {
+            "server_ipv4": "192.168.0.5/32",
+            "server_ipv6": "fc02:1000::5/128",
+            "state": "auto"
+        },
+        "Ethernet20": {
+            "server_ipv4": "192.168.0.6/32",
+            "server_ipv6": "fc02:1000::6/128",
+            "state": "auto"
+        },
+        "Ethernet24": {
+            "server_ipv4": "192.168.0.7/32",
+            "server_ipv6": "fc02:1000::7/128",
+            "state": "auto"
+        },
+        "Ethernet28": {
+            "server_ipv4": "192.168.0.8/32",
+            "server_ipv6": "fc02:1000::8/128",
+            "state": "auto"
+        },
+        "Ethernet32": {
+            "server_ipv4": "192.168.0.9/32",
+            "server_ipv6": "fc02:1000::9/128",
+            "state": "auto"
+        },
+        "Ethernet36": {
+            "server_ipv4": "192.168.0.10/32",
+            "server_ipv6": "fc02:1000::a/128",
+            "state": "auto"
+        },
+        "Ethernet40": {
+            "server_ipv4": "192.168.0.11/32",
+            "server_ipv6": "fc02:1000::b/128",
+            "state": "auto"
+        },
+        "Ethernet44": {
+            "server_ipv4": "192.168.0.12/32",
+            "server_ipv6": "fc02:1000::c/128",
+            "state": "auto"
+        },
+        "Ethernet48": {
+            "server_ipv4": "192.168.0.13/32",
+            "server_ipv6": "fc02:1000::d/128",
+            "state": "auto"
+        },
+        "Ethernet52": {
+            "server_ipv4": "192.168.0.14/32",
+            "server_ipv6": "fc02:1000::e/128",
+            "state": "auto"
+        },
+        "Ethernet56": {
+            "server_ipv4": "192.168.0.15/32",
+            "server_ipv6": "fc02:1000::f/128",
+            "state": "auto"
+        },
+        "Ethernet60": {
+            "server_ipv4": "192.168.0.16/32",
+            "server_ipv6": "fc02:1000::10/128",
+            "state": "auto"
+        },
+        "Ethernet64": {
+            "server_ipv4": "192.168.0.17/32",
+            "server_ipv6": "fc02:1000::11/128",
+            "state": "auto"
+        },
+        "Ethernet68": {
+            "server_ipv4": "192.168.0.18/32",
+            "server_ipv6": "fc02:1000::12/128",
+            "state": "auto"
+        },
+        "Ethernet72": {
+            "server_ipv4": "192.168.0.19/32",
+            "server_ipv6": "fc02:1000::13/128",
+            "state": "auto"
+        },
+        "Ethernet76": {
+            "server_ipv4": "192.168.0.20/32",
+            "server_ipv6": "fc02:1000::14/128",
+            "state": "auto"
+        },
+        "Ethernet80": {
+            "server_ipv4": "192.168.0.21/32",
+            "server_ipv6": "fc02:1000::15/128",
+            "state": "auto"
+        },
+        "Ethernet84": {
+            "server_ipv4": "192.168.0.22/32",
+            "server_ipv6": "fc02:1000::16/128",
+            "state": "auto"
+        },
+        "Ethernet88": {
+            "server_ipv4": "192.168.0.23/32",
+            "server_ipv6": "fc02:1000::17/128",
+            "state": "auto"
+        },
+        "Ethernet92": {
+            "server_ipv4": "192.168.0.24/32",
+            "server_ipv6": "fc02:1000::18/128",
+            "state": "auto"
+        },
+        "Ethernet96": {
+            "server_ipv4": "192.168.0.25/32",
+            "server_ipv6": "fc02:1000::19/128",
+            "state": "auto"
+        },
+        "Ethernet100": {
+            "server_ipv4": "192.168.0.26/32",
+            "server_ipv6": "fc02:1000::1a/128",
+            "state": "auto"
+        },
+        "Ethernet104": {
+            "server_ipv4": "192.168.0.27/32",
+            "server_ipv6": "fc02:1000::1b/128",
+            "state": "auto"
+        },
+        "Ethernet108": {
+            "server_ipv4": "192.168.0.28/32",
+            "server_ipv6": "fc02:1000::1c/128",
+            "state": "auto"
+        },
+        "Ethernet112": {
+            "server_ipv4": "192.168.0.29/32",
+            "server_ipv6": "fc02:1000::1d/128",
+            "state": "auto"
+        },
+        "Ethernet116": {
+            "server_ipv4": "192.168.0.30/32",
+            "server_ipv6": "fc02:1000::1e/128",
+            "state": "auto"
+        },
+        "Ethernet120": {
+            "server_ipv4": "192.168.0.31/32",
+            "server_ipv6": "fc02:1000::1f/128",
+            "state": "auto"
+        },
+        "Ethernet124": {
+            "server_ipv4": "192.168.0.32/32",
+            "server_ipv6": "fc02:1000::20/128",
+            "state": "auto"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index a66cd99820be..3c4e1b629e7d 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -132,6 +132,17 @@ def test_l2switch_template(self):
 
         self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
 
+    def test_l2switch_template_dualtor(self):
+        argument = '-a \'{"is_dualtor": true}\' -k Mellanox-SN2700 --preset l2 -p ' + self.t0_port_config
+        output = self.run_script(argument)
+        output_json = json.loads(output)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'l2switch_dualtor.json')
+        with open(sample_output_file) as sample_output_fd:
+            sample_output_json = json.load(sample_output_fd)
+        self.maxDiff = None
+        self.assertEqual(sample_output_json, output_json)
+
     def test_qos_arista7050_render_template(self):
         arista_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'arista', 'x86_64-arista_7050_qx32s', 'Arista-7050-QX-32S')
         qos_file = os.path.join(arista_dir_path, 'qos.json.j2')

From d79a456a620f3746fef2a7bfc835dcb66ebc9bea Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 8 Apr 2021 01:36:02 +0800
Subject: [PATCH 0334/1674] [Mellanox] Initialize PSU API on both host and
 docker side (#7075)

- Why I did it
There was a change to replace platform utils with sonic platform API in psuutil. However, psu API is not initialized on host side. The PR is to fix it.
Backport of #7016 to the 202012 branch.

- How I did it
Initialize PSU API on both host and non-host side

- How to verify it
Manual test
---
 .../mlnx-platform-api/sonic_platform/platform.py   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
index f2a8af954790..480db41dadb8 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
@@ -16,16 +16,14 @@
 class Platform(PlatformBase):
     def __init__(self):
         PlatformBase.__init__(self)
-        if self._is_host():
-            self._chassis = Chassis()
+        self._chassis = Chassis()
+        self._chassis.initialize_psu()
+        self._chassis.initialize_eeprom()
+        if self._is_host():  
             self._chassis.initialize_components()
-            self._chassis.initizalize_system_led()
-            self._chassis.initialize_eeprom()
-        else:
-            self._chassis = Chassis()
-            self._chassis.initialize_psu()
+            self._chassis.initizalize_system_led()  
+        else:    
             self._chassis.initialize_fan()
-            self._chassis.initialize_eeprom()
             self._chassis.initialize_thermals()
 
     def _is_host(self):

From 1312feef1ead32748571cd0c69381fe6d6aaf317 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Thu, 8 Apr 2021 01:33:15 +0800
Subject: [PATCH 0335/1674] Bug fix: Support dynamic buffer calculation on
 ACS-MSN3420 and ACS-MSN4410 (#7113)

- Why I did it
Add missed files for dynamic buffer calculation for ACS-MSN3420 and ACS-MSN4410

- How I did it
asic_table.j2: Add mapping from platform to ASIC
Add buffer_dynamic.json.j2 for ACS-MSN4410.

- How to verify it
Check whether the dynamic buffer calculation daemon starts successfully.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_dynamic.json.j2  | 1 +
 platform/mellanox/asic_table.j2                                 | 2 ++
 2 files changed, 3 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_dynamic.json.j2

diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/platform/mellanox/asic_table.j2 b/platform/mellanox/asic_table.j2
index 4e41a416b6e0..77f62e3b3689 100644
--- a/platform/mellanox/asic_table.j2
+++ b/platform/mellanox/asic_table.j2
@@ -14,10 +14,12 @@
         'x86_64-mlnx_msn2700-r0':'MELLANOX-SPECTRUM',
         'x86_64-mlnx_msn2700_simx-r0':'MELLANOX-SPECTRUM',
         'x86_64-mlnx_msn2740-r0':'MELLANOX-SPECTRUM',
+        'x86_64-mlnx_msn3420-r0':'MELLANOX-SPECTRUM-2',
         'x86_64-mlnx_msn3700c-r0':'MELLANOX-SPECTRUM-2',
         'x86_64-mlnx_msn3700-r0':'MELLANOX-SPECTRUM-2',
         'x86_64-mlnx_msn3700_simx-r0':'MELLANOX-SPECTRUM-2',
         'x86_64-mlnx_msn3800-r0':'MELLANOX-SPECTRUM-2',
+        'x86_64-mlnx_msn4410-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4700_simx-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4700-r0':'MELLANOX-SPECTRUM-3',
         'x86_64-mlnx_msn4600c-r0':'MELLANOX-SPECTRUM-3',

From b4e1b553f5057f922bcdda78cdb32f37d334400f Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 8 Apr 2021 08:29:28 -0700
Subject: [PATCH 0336/1674] [sonic-py-common] Add 'general' module with
 load_module_from_source() function (#7167)

#### Why I did it

To eliminate the need to write duplicate code in order to import a Python module from a source file.

#### How I did it

Add `general` module to sonic-py-common, which contains a `load_module_from_source()` function which supports both Python 2 and 3.

Call this new function in:
- sonic-ctrmgrd/tests/container_test.py
- sonic-ctrmgrd/tests/ctrmgr_tools_test.py
- sonic-host-services/tests/determine-reboot-cause_test.py
- sonic-host-services/tests/hostcfgd/hostcfgd_test.py
- sonic-host-services/tests/procdockerstatsd_test.py
- sonic-py-common/sonic_py_common/daemon_base.py
---
 src/sonic-ctrmgrd/setup.py                    |  1 +
 src/sonic-ctrmgrd/tests/common_test.py        | 12 ---------
 src/sonic-ctrmgrd/tests/container_test.py     |  6 +++--
 src/sonic-ctrmgrd/tests/ctrmgr_tools_test.py  |  3 ++-
 src/sonic-host-services/setup.py              |  1 +
 .../tests/determine-reboot-cause_test.py      |  9 ++-----
 .../tests/hostcfgd/hostcfgd_test.py           | 14 ++++------
 .../tests/procdockerstatsd_test.py            |  9 ++-----
 .../sonic_py_common/daemon_base.py            | 26 ++-----------------
 .../sonic_py_common/general.py                | 25 ++++++++++++++++++
 10 files changed, 44 insertions(+), 62 deletions(-)
 create mode 100644 src/sonic-py-common/sonic_py_common/general.py

diff --git a/src/sonic-ctrmgrd/setup.py b/src/sonic-ctrmgrd/setup.py
index b53efc7615d1..85e02cae12ec 100644
--- a/src/sonic-ctrmgrd/setup.py
+++ b/src/sonic-ctrmgrd/setup.py
@@ -24,6 +24,7 @@
     tests_require=[
         'pytest',
         'pytest-cov',
+        'sonic-py-common',
     ],
     install_requires=['netaddr', 'pyyaml'],
     license="GNU General Public License v3",
diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py
index 5b3eae151cb0..54c877f11365 100755
--- a/src/sonic-ctrmgrd/tests/common_test.py
+++ b/src/sonic-ctrmgrd/tests/common_test.py
@@ -1,6 +1,4 @@
 import copy
-import importlib.machinery
-import importlib.util
 import json
 import os
 import subprocess
@@ -655,13 +653,3 @@ def create_remote_ctr_config_json():
         s.write(str_conf)
 
     return fname
-
-
-def load_mod_from_file(modname, fpath):
-    spec = importlib.util.spec_from_loader(modname,
-            importlib.machinery.SourceFileLoader(modname, fpath))
-    mod = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(mod)
-    sys.modules[modname] = mod
-    return mod
-
diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py
index 4d28a7761d29..146d41386de1 100755
--- a/src/sonic-ctrmgrd/tests/container_test.py
+++ b/src/sonic-ctrmgrd/tests/container_test.py
@@ -2,12 +2,14 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from sonic_py_common.general import load_module_from_source
 
 from . import common_test
 
-common_test.load_mod_from_file("docker",
+
+load_module_from_source("docker",
         os.path.join(os.path.dirname(os.path.realpath(__file__)), "mock_docker.py"))
-container = common_test.load_mod_from_file("container",
+container = load_module_from_source("container",
         os.path.join(os.path.dirname(os.path.realpath(__file__)), "../ctrmgr/container"))
 
 
diff --git a/src/sonic-ctrmgrd/tests/ctrmgr_tools_test.py b/src/sonic-ctrmgrd/tests/ctrmgr_tools_test.py
index d6ffa15ed68b..8ea5a5195fdf 100755
--- a/src/sonic-ctrmgrd/tests/ctrmgr_tools_test.py
+++ b/src/sonic-ctrmgrd/tests/ctrmgr_tools_test.py
@@ -3,10 +3,11 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from sonic_py_common.general import load_module_from_source
 
 from . import common_test
 
-common_test.load_mod_from_file("docker",
+load_module_from_source("docker",
         os.path.join(os.path.dirname(os.path.realpath(__file__)), "mock_docker.py"))
 
 sys.path.append("ctrmgr")
diff --git a/src/sonic-host-services/setup.py b/src/sonic-host-services/setup.py
index 2da0561b9c5e..8f06dfa60193 100644
--- a/src/sonic-host-services/setup.py
+++ b/src/sonic-host-services/setup.py
@@ -28,6 +28,7 @@
     ],
     tests_require = [
         'pytest',
+        'sonic-py-common'
     ],
     classifiers = [
         'Development Status :: 3 - Alpha',
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index 4eb95ee219ee..d9e999a5ce27 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -1,10 +1,9 @@
-import importlib.machinery
-import importlib.util
 import sys
 import os
 import pytest
 
 import swsssdk
+from sonic_py_common.general import load_module_from_source
 
 # TODO: Remove this if/else block once we no longer support Python 2
 if sys.version_info.major == 3:
@@ -31,11 +30,7 @@
 
 # Load the file under test
 determine_reboot_cause_path = os.path.join(scripts_path, 'determine-reboot-cause')
-loader = importlib.machinery.SourceFileLoader('determine_reboot_cause', determine_reboot_cause_path)
-spec = importlib.util.spec_from_loader(loader.name, loader)
-determine_reboot_cause = importlib.util.module_from_spec(spec)
-loader.exec_module(determine_reboot_cause)
-sys.modules['determine_reboot_cause'] = determine_reboot_cause
+determine_reboot_cause = load_module_from_source('determine_reboot_cause', determine_reboot_cause_path)
 
 
 PROC_CMDLINE_CONTENTS = """\
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index 57e7215715d7..2abbb7f7cad6 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -1,13 +1,13 @@
-import importlib.machinery
-import importlib.util
 import os
 import sys
 import swsssdk
 
 from parameterized import parameterized
+from sonic_py_common.general import load_module_from_source
 from unittest import TestCase, mock
-from tests.hostcfgd.test_vectors import HOSTCFGD_TEST_VECTOR
-from tests.hostcfgd.mock_configdb import MockConfigDb
+
+from .test_vectors import HOSTCFGD_TEST_VECTOR
+from .mock_configdb import MockConfigDb
 
 
 swsssdk.ConfigDBConnector = MockConfigDb
@@ -18,11 +18,7 @@
 
 # Load the file under test
 hostcfgd_path = os.path.join(scripts_path, 'hostcfgd')
-loader = importlib.machinery.SourceFileLoader('hostcfgd', hostcfgd_path)
-spec = importlib.util.spec_from_loader(loader.name, loader)
-hostcfgd = importlib.util.module_from_spec(spec)
-loader.exec_module(hostcfgd)
-sys.modules['hostcfgd'] = hostcfgd
+hostcfgd = load_module_from_source('hostcfgd', hostcfgd_path)
 
 
 class TestHostcfgd(TestCase):
diff --git a/src/sonic-host-services/tests/procdockerstatsd_test.py b/src/sonic-host-services/tests/procdockerstatsd_test.py
index bb218e52ce2d..65c5a738ca67 100644
--- a/src/sonic-host-services/tests/procdockerstatsd_test.py
+++ b/src/sonic-host-services/tests/procdockerstatsd_test.py
@@ -1,10 +1,9 @@
-import importlib.machinery
-import importlib.util
 import sys
 import os
 import pytest
 
 import swsssdk
+from sonic_py_common.general import load_module_from_source
 
 from .mock_connector import MockConnector
 
@@ -17,11 +16,7 @@
 
 # Load the file under test
 procdockerstatsd_path = os.path.join(scripts_path, 'procdockerstatsd')
-loader = importlib.machinery.SourceFileLoader('procdockerstatsd', procdockerstatsd_path)
-spec = importlib.util.spec_from_loader(loader.name, loader)
-procdockerstatsd = importlib.util.module_from_spec(spec)
-loader.exec_module(procdockerstatsd)
-sys.modules['procdockerstatsd'] = procdockerstatsd
+procdockerstatsd = load_module_from_source('procdockerstatsd', procdockerstatsd_path)
 
 class TestProcDockerStatsDaemon(object):
     def test_convert_to_bytes(self):
diff --git a/src/sonic-py-common/sonic_py_common/daemon_base.py b/src/sonic-py-common/sonic_py_common/daemon_base.py
index 745b3c55ba96..86870ba1fdc0 100644
--- a/src/sonic-py-common/sonic_py_common/daemon_base.py
+++ b/src/sonic-py-common/sonic_py_common/daemon_base.py
@@ -2,6 +2,7 @@
 import sys
 
 from . import device_info
+from .general import load_module_from_source
 from .logger import Logger
 
 #
@@ -25,29 +26,6 @@ def db_connect(db_name, namespace=EMPTY_NAMESPACE):
     return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, True, namespace)
 
 
-# TODO: Consider moving this logic out of daemon_base and into antoher file
-# so that it can be used by non-daemons. We can simply call that function here
-# to retain backward compatibility.
-def _load_module_from_file(module_name, file_path):
-    module = None
-
-    # TODO: Remove this check once we no longer support Python 2
-    if sys.version_info.major == 3:
-        import importlib.machinery
-        import importlib.util
-        loader = importlib.machinery.SourceFileLoader(module_name, file_path)
-        spec = importlib.util.spec_from_loader(loader.name, loader)
-        module = importlib.util.module_from_spec(spec)
-        loader.exec_module(module)
-    else:
-        import imp
-        module = imp.load_source(module_name, file_path)
-
-    sys.modules[module_name] = module
-
-    return module
-
-
 #
 # DaemonBase ===================================================================
 #
@@ -92,7 +70,7 @@ def load_platform_util(self, module_name, class_name):
 
         try:
             module_file = "/".join([platform_path, "plugins", module_name + ".py"])
-            module = _load_module_from_file(module_name, module_file)
+            module = load_module_from_source(module_name, module_file)
         except IOError as e:
             raise IOError("Failed to load platform module '%s': %s" % (module_name, str(e)))
 
diff --git a/src/sonic-py-common/sonic_py_common/general.py b/src/sonic-py-common/sonic_py_common/general.py
new file mode 100644
index 000000000000..9e04f3e214ee
--- /dev/null
+++ b/src/sonic-py-common/sonic_py_common/general.py
@@ -0,0 +1,25 @@
+import sys
+
+
+def load_module_from_source(module_name, file_path):
+    """
+    This function will load the Python source file specified by <file_path>
+    as a module named <module_name> and return an instance of the module
+    """
+    module = None
+
+    # TODO: Remove this check once we no longer support Python 2
+    if sys.version_info.major == 3:
+        import importlib.machinery
+        import importlib.util
+        loader = importlib.machinery.SourceFileLoader(module_name, file_path)
+        spec = importlib.util.spec_from_loader(loader.name, loader)
+        module = importlib.util.module_from_spec(spec)
+        loader.exec_module(module)
+    else:
+        import imp
+        module = imp.load_source(module_name, file_path)
+
+    sys.modules[module_name] = module
+
+    return module

From 642a8e720fc14be41eca72c8cf1bc2c99d394b20 Mon Sep 17 00:00:00 2001
From: Yilan <baxia.lan@gmail.com>
Date: Thu, 1 Apr 2021 22:43:34 -0700
Subject: [PATCH 0337/1674] [build]: Fix pip3 hook ENABLE_VERSION_CONTROL_PY
 param (#7147)

---
 src/sonic-build-hooks/hooks/pip3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/hooks/pip3 b/src/sonic-build-hooks/hooks/pip3
index 36a8fd93a13d..728e642eacc0 100755
--- a/src/sonic-build-hooks/hooks/pip3
+++ b/src/sonic-build-hooks/hooks/pip3
@@ -9,4 +9,4 @@ if [ ! -x "$REAL_COMMAND" ]; then
     exit 1
 fi
 
-PIP_VERSION_FILE=$VERSION_FILE ENABLE_VERSION_CONTROL_PY=$ENABLE_VERSION_CONTROL_PY2 REAL_COMMAND=$REAL_COMMAND run_pip_command "$@"
+PIP_VERSION_FILE=$VERSION_FILE ENABLE_VERSION_CONTROL_PY=$ENABLE_VERSION_CONTROL_PY3 REAL_COMMAND=$REAL_COMMAND run_pip_command "$@"

From 915cb445cf0bc8e0d2a178e4e1edd79b1f667d64 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Thu, 1 Apr 2021 22:40:55 -0700
Subject: [PATCH 0338/1674] [submodule]: Update restapi (#7213)

Feb 17 Fix tests failing due to duplicate vxlan tunnel creation (#75)
Mar 11 Update route api to specify limitation (#77)
Apr 01 Add host_ifname field while adding entry in VLAN table (#80)
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 71847d3fbe16..8d09602a9e3c 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 71847d3fbe16f191efa7ffac6901d5599d044c5f
+Subproject commit 8d09602a9e3c762f86992d8eaf642e7115c5318b

From 63885ca96d3132e483bf4aa0dde069c23b280670 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 8 Apr 2021 08:00:27 +0300
Subject: [PATCH 0339/1674] [debian] install systemd version 247 from
 buster-backports (#7228)

Fix #7180

Update systemd to v247 in order to pick the fix for "core: coldplug possible nop_job" systemd/systemd#13124

Install systemd, systemd-sysv from buster-backports. Pass "systemd.unified_cgroup_hierarchy=0" as kernel argument to force systemd to not use unified cgroup hierarchy, otherwise dockerd won't start moby/moby#16238.
Also, chown $FILSYSTEM_ROOT for root, otherwise apt systemd installation complains, see similar https://unix.stackexchange.com/questions/593529/can-not-configure-systemd-inside-a-chrooted-environment

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 build_debian.sh             | 7 +++++--
 installer/x86_64/install.sh | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 3559560b1ed4..2d6c9eac68a7 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -79,6 +79,8 @@ TARGET_PATH=$TARGET_PATH scripts/build_debian_base_system.sh $CONFIGURED_ARCH $I
 # Prepare buildinfo
 sudo scripts/prepare_debian_image_buildinfo.sh $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT $http_proxy
 
+sudo chown root:root $FILESYSTEM_ROOT
+
 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '$HOSTNAME' > /etc/hostname"
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '127.0.0.1       $HOSTNAME' >> /etc/hosts"
@@ -109,7 +111,7 @@ sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-language
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y upgrade
 echo '[INFO] Install packages for building image'
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc systemd-sysv
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc
 
 ## Create device files
 echo '[INFO] MAKEDEV'
@@ -346,7 +348,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # Install certain fundamental packages from $IMAGE_DISTRO-backports in order to get
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
-    picocom
+    picocom \
+    systemd-sysv
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 50b156f33455..0bd78365aece 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -628,6 +628,7 @@ menuentry '$demo_grub_entry' {
         linux   /$image_dir/boot/vmlinuz-4.19.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
+                systemd.unified_cgroup_hierarchy=0 \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
         initrd  /$image_dir/boot/initrd.img-4.19.0-12-2-amd64

From e08dc12acf7e92025cfe741048f6f6ca810cbf09 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 7 Apr 2021 09:58:12 -0700
Subject: [PATCH 0340/1674] [IPinIP] Add Loopback2 interface, change dscp mode
 to uniform (#7234)

Co-authored-by: Ubuntu <prsunny>
---
 dockers/docker-orchagent/ipinip.json.j2          |  8 +++-----
 .../tests/multi_npu_data/py2/ipinip.json         |  4 ++--
 .../tests/multi_npu_data/py3/ipinip.json         |  4 ++--
 .../tests/sample_output/py2/bgpd_quagga.conf     |  2 +-
 .../tests/sample_output/py2/ipinip.json          |  6 +++---
 .../tests/sample_output/py3/ipinip.json          |  6 +++---
 .../tests/t0-sample-graph.xml                    | 16 ++++++++++++++++
 7 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/dockers/docker-orchagent/ipinip.json.j2 b/dockers/docker-orchagent/ipinip.json.j2
index cbfeb784b057..9cdf6857bddd 100644
--- a/dockers/docker-orchagent/ipinip.json.j2
+++ b/dockers/docker-orchagent/ipinip.json.j2
@@ -5,7 +5,7 @@
 {% if DEVICE_METADATA['localhost']['sub_role'] == 'FrontEnd' or  DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd'%}
 {% set loopback_intf_names = ['Loopback0', 'Loopback4096'] %}
 {% else %}
-{% set loopback_intf_names = ['Loopback0'] %}
+{% set loopback_intf_names = ['Loopback0', 'Loopback2', 'Loopback3'] %}
 {% endif %}
 {% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
     {%- if prefix | ipv4 and name in loopback_intf_names %}
@@ -47,11 +47,10 @@
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"{% for prefix in ipv4_addresses|sort %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}",
-{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
             "dscp_mode":"uniform",
+{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
             "ecn_mode":"standard",
 {% else %}
-            "dscp_mode":"pipe",
             "ecn_mode":"copy_from_outer",
 {% endif %}
             "ttl_mode":"pipe"
@@ -66,11 +65,10 @@
         "TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"{% for prefix in ipv6_addresses|sort %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}",
-{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
             "dscp_mode":"uniform",
+{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
             "ecn_mode":"standard",
 {% else %}
-            "dscp_mode":"pipe",
             "ecn_mode":"copy_from_outer",
 {% endif %}
             "ttl_mode":"pipe"
diff --git a/src/sonic-config-engine/tests/multi_npu_data/py2/ipinip.json b/src/sonic-config-engine/tests/multi_npu_data/py2/ipinip.json
index 3e8d4429d77d..82d583de6078 100644
--- a/src/sonic-config-engine/tests/multi_npu_data/py2/ipinip.json
+++ b/src/sonic-config-engine/tests/multi_npu_data/py2/ipinip.json
@@ -3,7 +3,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"10.0.0.0,10.1.0.1,10.1.0.3,10.1.0.32,8.0.0.0",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
@@ -14,7 +14,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"fc00:1::32,fc00::1,fd00:1::32",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
diff --git a/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json b/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json
index 3e8d4429d77d..82d583de6078 100644
--- a/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json
+++ b/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json
@@ -3,7 +3,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"10.0.0.0,10.1.0.1,10.1.0.3,10.1.0.32,8.0.0.0",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
@@ -14,7 +14,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"fc00:1::32,fc00::1,fd00:1::32",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
index f5a4b22f0ee0..43e8ade6a302 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
@@ -23,10 +23,10 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp router-id 10.1.0.32
+  network 10.1.0.32/32
   address-family ipv6
     network fc00:1::32/64
   exit-address-family
-  network 10.1.0.32/32
   network 192.168.200.1/27
   network 192.168.0.1/27
   neighbor 10.0.0.59 remote-as 64600
diff --git a/src/sonic-config-engine/tests/sample_output/py2/ipinip.json b/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
index 62346451af04..0a01058463bd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/ipinip.json
@@ -2,8 +2,8 @@
     {
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
-            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1,192.168.200.1",
-            "dscp_mode":"pipe",
+            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,10.21.0.64,10.21.64.2,192.168.0.1,192.168.200.1",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
@@ -14,7 +14,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"fc00:1::32,fc00::71,fc00::75,fc00::79,fc00::7d",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
index 62346451af04..0a01058463bd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json
@@ -2,8 +2,8 @@
     {
         "TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
             "tunnel_type":"IPINIP",
-            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,192.168.0.1,192.168.200.1",
-            "dscp_mode":"pipe",
+            "dst_ip":"10.0.0.56,10.0.0.58,10.0.0.60,10.0.0.62,10.1.0.32,10.21.0.64,10.21.64.2,192.168.0.1,192.168.200.1",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
@@ -14,7 +14,7 @@
         "TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
             "tunnel_type":"IPINIP",
             "dst_ip":"fc00:1::32,fc00::71,fc00::75,fc00::79,fc00::7d",
-            "dscp_mode":"pipe",
+            "dscp_mode":"uniform",
             "ecn_mode":"copy_from_outer",
             "ttl_mode":"pipe"
         },
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index f847af1f90cf..266554dd331b 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -185,6 +185,22 @@
           </a:Prefix>
           <a:PrefixStr>10.10.0.99/32</a:PrefixStr>
         </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP2</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.0.64/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.0.64/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP3</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.64.2/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.64.2/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
        </LoopbackIPInterfaces>
       <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
         <a:ManagementIPInterface>

From 3cee45c29802619c6fe0655a6807a6a1a3519631 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 7 Apr 2021 01:12:23 +0800
Subject: [PATCH 0341/1674] [monit] Avoid monit error log by removing "-l" from
 monit_swss|buffermgrd (#7236)

Avoid the following error messages while dynamic buffer calculation is enabled
```
ERR monit[491]: 'swss|buffermgrd' status failed (1) -- '/usr/bin/buffermgrd -l' is not running in host
```

Change /usr/bin/buffermgrd -l to /usr/bin/buffermgrd. The buffermgrd is started by -l for traditional model or -a for dynamic model. So we need to use the common section of both.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 dockers/docker-orchagent/base_image_files/monit_swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss
index 1dcf4bf9b6d9..d4ea5454ef6b 100644
--- a/dockers/docker-orchagent/base_image_files/monit_swss
+++ b/dockers/docker-orchagent/base_image_files/monit_swss
@@ -40,7 +40,7 @@ check program swss|intfmgrd with path "/usr/bin/process_checker swss /usr/bin/in
 check program swss|portmgrd with path "/usr/bin/process_checker swss /usr/bin/portmgrd"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
 
-check program swss|buffermgrd with path "/usr/bin/process_checker swss /usr/bin/buffermgrd -l"
+check program swss|buffermgrd with path "/usr/bin/process_checker swss /usr/bin/buffermgrd"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
 
 check program swss|nbrmgrd with path "/usr/bin/process_checker swss /usr/bin/nbrmgrd"

From d7979df5f4c2b62bf5a398b7c02c178ad63c104b Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:48:37 -0700
Subject: [PATCH 0342/1674] [baseimage]: specify gid for redis group. (#7249)

Problem:
Default groupadd for redis, takes 1000 by default. This forces, subsequently created admin group to get 1001.
As all TACACS users are created with 1000 as their gid, they end up in redis group.

Fix:
Create redis group *after* admin group is created
Add a check that admin group id is 1000
---
 build_debian.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 2d6c9eac68a7..ceb1aa5ed266 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -244,15 +244,16 @@ sudo cp files/docker/docker.service.conf $_
 ## Fix systemd race between docker and containerd
 sudo sed -i '/After=/s/$/ containerd.service/' $FILESYSTEM_ROOT/lib/systemd/system/docker.service
 
-## Create redis group
-sudo LANG=C chroot $FILESYSTEM_ROOT groupadd -f redis
-
 ## Create default user
 ## Note: user should be in the group with the same name, and also in sudo/docker/redis groups
-sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker,redis $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
+sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
 ## Create password for the default user
 echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
 
+## Create redis group
+sudo LANG=C chroot $FILESYSTEM_ROOT groupadd -f redis
+sudo LANG=C chroot $FILESYSTEM_ROOT usermod -aG redis $USERNAME
+
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     ## Pre-install hardware drivers
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
@@ -590,6 +591,12 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
     DOCKERFS_PATH=../dockerfs/
 fi
 
+# Ensure admin gid is 1000
+gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"
+if [ "${gid_user}" != "1000" ]; then
+    die "expect gid 1000. current:${gid_user}"
+fi
+
 ## Compress docker files
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 

From cecb5276998bb84684d7dc171ad3a31fc0c176ae Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 8 Apr 2021 00:19:51 -0700
Subject: [PATCH 0343/1674] [sonic-platform-daemons] Update submodule (#7251)

src/sonic-platform-daemons 450b7d7...0bd9f69 (2):
- [thermalctld] Fix 'NameError("name 'chassis' is not defined")' error in log (#170)
- [xcvrd] Gracefully handle improper 'specification_compliance' field; also fix other potential bugs (#169)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 450b7d783e27..0bd9f698f755 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 450b7d783e2705677127dca711c73105170635ba
+Subproject commit 0bd9f698f7550f498af54a52199cb5ad5a45e306

From ca4deb85d5b2f1099cf00b5d5eac795c895b1acf Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 7 Apr 2021 22:01:04 -0700
Subject: [PATCH 0344/1674] [sonic-platform-common] submodule update (#7253)

872f0a3 [Y-Cable] refactor get_firmware_version to comply with all vendors (#182)
cc162d6 [sonic_y_cable]: Decorate all method for mux simulator (#181)
fa02416 Change import order in Ycable helper and EEPROM read bytearray change in SFP plugin (#177)
0b60982 [thermal_base] Add setter functions for critical thresholds (#180)
10dc16f [y_cable] add support for enable/disable autoswitch feature on Y cable (#176)
c6c81a8 [fan_drawer_base.py] Fix FanDrawer get_status_led interface (#175)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 1673d2594842..872f0a306bb8 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 1673d25948428c10305674553095199b25cf89e5
+Subproject commit 872f0a306bb8508b1974cebdf62482a25ce7cf1a

From cf8e4eda23ca4c75fb06e731c9fe34ce03afcd65 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Fri, 9 Apr 2021 01:15:31 +0800
Subject: [PATCH 0345/1674] [Mellanox] Fix incomplete platform name for
 MSN4600C in sfputil plugin (#7259)

The platform name for MSN4600C in sfputil pliugin is not complete: "x86_64-mlnx_msn4600c" -> "x86_64-mlnx_msn4600c-r0"

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
index 2cac9e5e45d7..952620dc22f8 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -43,7 +43,7 @@
 platform_dict = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 0, 'x86_64-mlnx_msn2100-r0': 1,
                  'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 3, 'x86_64-mlnx_msn3420-r0': 5,
                  'x86_64-mlnx_msn3700-r0': 0, 'x86_64-mlnx_msn3700c-r0': 0, 'x86_64-mlnx_msn3800-r0': 4,
-                 'x86_64-mlnx_msn4410-r0': 0, 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c': 4, 
+                 'x86_64-mlnx_msn4410-r0': 0, 'x86_64-mlnx_msn4600-r0': 4, 'x86_64-mlnx_msn4600c-r0': 4, 
                  'x86_64-mlnx_msn4700-r0': 0}
 port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1),
                             (0, 18, 21, 22, 1), (0, 0, 63, 64, 1), (0, 48, 59, 60, 1)]

From 332c151d2ff33d27af8854a479b8cff3da5c69f1 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 8 Apr 2021 15:28:10 -0700
Subject: [PATCH 0346/1674] [e1031] add GbE and higig port to E1031
 port_config.ini (#7208) (#7224)

Why I did it
These ports are being enumerated by the latest SAI. But they are not defined in port_config.ini.

SONiC end up trying to delete these 3 ports and hit SAI error and crash.

How I did it
Add the GbE and the 2 HiGig ports in the port_config.ini.

How to verify it
Put the port_config.ini on a device crashing with port deleting. load minigraph and the crash stopped.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 .../Celestica-E1031-T48S4/port_config.ini     | 109 +++++++++---------
 1 file changed, 56 insertions(+), 53 deletions(-)
 mode change 100644 => 100755 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/port_config.ini

diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/port_config.ini b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/port_config.ini
old mode 100644
new mode 100755
index a2b64ea155df..6ca1d2c4e80f
--- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/port_config.ini
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/port_config.ini
@@ -1,53 +1,56 @@
-# name          lanes   index	speed	alias   autoneg
-Ethernet0       2       1	1000    etp1    1
-Ethernet1       1       2	1000    etp2    1
-Ethernet2       4       3	1000    etp3    1
-Ethernet3       3       4	1000    etp4    1
-Ethernet4       6       5	1000    etp5    1
-Ethernet5       5       6	1000    etp6    1
-Ethernet6       8       7	1000    etp7    1
-Ethernet7       7       8	1000    etp8    1
-Ethernet8       10      9	1000    etp9    1
-Ethernet9       9       10	1000    etp10   1
-Ethernet10      12      11	1000    etp11   1
-Ethernet11      11      12	1000    etp12   1
-Ethernet12      14      13	1000    etp13   1
-Ethernet13      13      14	1000    etp14   1
-Ethernet14      16      15	1000    etp15   1
-Ethernet15      15      16	1000    etp16   1
-Ethernet16      18      17	1000    etp17   1
-Ethernet17      17      18	1000    etp18   1
-Ethernet18      20      19	1000    etp19   1
-Ethernet19      19      20	1000    etp20   1
-Ethernet20      22      21	1000    etp21   1
-Ethernet21      21      22	1000    etp22   1
-Ethernet22      24      23	1000    etp23   1
-Ethernet23      23      24	1000    etp24   1
-Ethernet24      26      25	1000    etp25   1
-Ethernet25      25      26	1000    etp26   1
-Ethernet26      28      27	1000    etp27   1
-Ethernet27      27      28	1000    etp28   1
-Ethernet28      30      29	1000    etp29   1
-Ethernet29      29      30	1000    etp30   1
-Ethernet30      32      31	1000    etp31   1
-Ethernet31      31      32	1000    etp32   1
-Ethernet32      34      33	1000    etp33   1
-Ethernet33      33      34	1000    etp34   1
-Ethernet34      36      35	1000    etp35   1
-Ethernet35      35      36	1000    etp36   1
-Ethernet36      38      37	1000    etp37   1
-Ethernet37      37      38	1000    etp38   1
-Ethernet38      40      39	1000    etp39   1
-Ethernet39      39      40	1000    etp40   1
-Ethernet40      42      41	1000    etp41   1
-Ethernet41      41      42	1000    etp42   1
-Ethernet42      44      43	1000    etp43   1
-Ethernet43      43      44	1000    etp44   1
-Ethernet44      46      45	1000    etp45   1
-Ethernet45      45      46	1000    etp46   1
-Ethernet46      48      47	1000    etp47   1
-Ethernet47      47      48	1000    etp48   1
-Ethernet48      54     	49	10000	etp49   0
-Ethernet49      53     	50	10000	etp50   0
-Ethernet50      56     	51	10000	etp51   0
-Ethernet51      55     	52	10000	etp52   0
+# name          lanes         index  speed   alias   autoneg
+Ethernet0       2             1      1000    etp1    1
+Ethernet1       1             2      1000    etp2    1
+Ethernet2       4             3      1000    etp3    1
+Ethernet3       3             4      1000    etp4    1
+Ethernet4       6             5      1000    etp5    1
+Ethernet5       5             6      1000    etp6    1
+Ethernet6       8             7      1000    etp7    1
+Ethernet7       7             8      1000    etp8    1
+Ethernet8       10            9      1000    etp9    1
+Ethernet9       9             10     1000    etp10   1
+Ethernet10      12            11     1000    etp11   1
+Ethernet11      11            12     1000    etp12   1
+Ethernet12      14            13     1000    etp13   1
+Ethernet13      13            14     1000    etp14   1
+Ethernet14      16            15     1000    etp15   1
+Ethernet15      15            16     1000    etp16   1
+Ethernet16      18            17     1000    etp17   1
+Ethernet17      17            18     1000    etp18   1
+Ethernet18      20            19     1000    etp19   1
+Ethernet19      19            20     1000    etp20   1
+Ethernet20      22            21     1000    etp21   1
+Ethernet21      21            22     1000    etp22   1
+Ethernet22      24            23     1000    etp23   1
+Ethernet23      23            24     1000    etp24   1
+Ethernet24      26            25     1000    etp25   1
+Ethernet25      25            26     1000    etp26   1
+Ethernet26      28            27     1000    etp27   1
+Ethernet27      27            28     1000    etp28   1
+Ethernet28      30            29     1000    etp29   1
+Ethernet29      29            30     1000    etp30   1
+Ethernet30      32            31     1000    etp31   1
+Ethernet31      31            32     1000    etp32   1
+Ethernet32      34            33     1000    etp33   1
+Ethernet33      33            34     1000    etp34   1
+Ethernet34      36            35     1000    etp35   1
+Ethernet35      35            36     1000    etp36   1
+Ethernet36      38            37     1000    etp37   1
+Ethernet37      37            38     1000    etp38   1
+Ethernet38      40            39     1000    etp39   1
+Ethernet39      39            40     1000    etp40   1
+Ethernet40      42            41     1000    etp41   1
+Ethernet41      41            42     1000    etp42   1
+Ethernet42      44            43     1000    etp43   1
+Ethernet43      43            44     1000    etp44   1
+Ethernet44      46            45     1000    etp45   1
+Ethernet45      45            46     1000    etp46   1
+Ethernet46      48            47     1000    etp47   1
+Ethernet47      47            48     1000    etp48   1
+Ethernet48      54            49     10000   etp49   0
+Ethernet49      53            50     10000   etp50   0
+Ethernet50      56            51     10000   etp51   0
+Ethernet51      55            52     10000   etp52   0
+Ethernet52      49            53     1000    etp53   0
+Ethernet53      57,58,59,60   54     21000   etp54   0
+Ethernet54      61,62,63,64   55     21000   etp55   0

From 4a541487996734f87019dea4e462ef5e0e71b350 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 8 Apr 2021 20:29:15 -0700
Subject: [PATCH 0347/1674] [202012][swss][utilities] advance submodule heads
 (#7267)

SWSS:
* d97c7c7 2021-04-07 | [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (#1693) (HEAD -> 202012) [Stephen Sun]
* f70b3da 2021-04-03 | [Makefile] Reorder libsaimetadata and libswsscommon (#1689) [Kamil Cudnik]
* 72ae85d 2021-04-08 | [vlan] Add support of VLAN host interface (#1645) [Volodymyr Samotiy]
* a555b9c 2021-04-02 | Correct the sflow default sample rate (#1623) [fredyu190011]

Utilities:
* 1a789d2 2021-04-07 | Fixed the possibility of using uninitialized variable in route_check.py (#1551) (HEAD -> 202012) [Renuka Manavalan]
* 2412e3c 2021-04-06 | Fix fast-reboot-dump.py SonicV2Connector after late merge (#1546) [shlomibitton]
* f99c5f1 2021-04-02 | [fast-reboot] Fix dump script to support PortChannels in a VLAN group (#1393) [shlomibitton]
* 716e2af 2021-04-04 | Reduce time taken by show commands on multi-asic platforms (#1544) [abdosi]
* a160519 2021-04-03 | [setup.py]: move the module to test requirement (#1542) [lguohan]
* eaa67fe 2021-04-04 | [config] Eliminate race condition between reloading Monit config and (#1543) [yozhao101]
* 2497a9e 2021-04-03 | [reboot] No need enable the Linux magic system request key (#1538) [yozhao101]
* 9fda6fe 2021-04-06 | [fwutil]: Fix next image mount (#1533) [Nazarii Hnydyn]
* 9af50fe 2021-02-09 | Import 'mock' module from 'unittest' library (#1415) (HEAD -> 202012) [Joe LeVeque]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index dad68b54f10c..d97c7c737a1f 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit dad68b54f10c39d3a135de5b5c80dc83d1b578bf
+Subproject commit d97c7c737a1fb5164ab450a75b11fe08d9644c4a
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 5a14b413b185..9af50fe7f553 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 5a14b413b1854f1325404a1f022ed26166093932
+Subproject commit 9af50fe7f553f4299c5499bf570c73c2ba9cbc4f

From 29eb442d438e2853d47e30c352f6ceb2cbafe9ac Mon Sep 17 00:00:00 2001
From: MuLin <mulin_huang@edge-core.com>
Date: Fri, 9 Apr 2021 21:51:50 +0800
Subject: [PATCH 0348/1674] [submodule]: update sonic-telemetry submodule
 (#7275)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1c3f75e (HEAD -> master, origin/master, origin/HEAD) pindown the version of github.com/openconfig/gnoi (#76)
33acd5b [ci]: setup proper azp (#75)
5d82051 [CI] Set up CI with Azure Pipelines (#72)
0688cdb Remove go get commands from Makefile to prevent go.mod file from chan… (#66)
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 7cd86c5a6bc3..1c3f75e0d2b6 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 7cd86c5a6bc38b94f0d7e87c9c278b9d20779a2b
+Subproject commit 1c3f75e0d2b635dcff7d1bdff5cc9a03ed4bf7c5

From b400f43f5989fc124e1c3ed38f75e209f1087301 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Fri, 9 Apr 2021 16:58:00 -0700
Subject: [PATCH 0349/1674] [sonic-slave]: install nose package explicity
 (#7258)

nose package is required by mockredispy

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 sonic-slave-buster/Dockerfile.j2  | 2 ++
 sonic-slave-stretch/Dockerfile.j2 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 6b0c347d31e7..2ab975502cf7 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -388,6 +388,8 @@ RUN pip3 install fastentrypoints
 # For running Python unit tests
 RUN pip2 install pytest-runner==4.4
 RUN pip3 install pytest-runner==5.2
+RUN pip2 install nose==1.3.7
+RUN pip3 install nose==1.3.7
 RUN pip2 install mockredispy==2.9.3
 RUN pip3 install mockredispy==2.9.3
 
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 103a9cd77831..afb69af16b26 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -343,6 +343,7 @@ RUN pip3 uninstall -y enum34
 RUN pip2 install j2cli==0.3.10
 
 # For sonic snmpagent mock testing
+RUN pip3 install nose==1.3.7
 RUN pip3 install mockredispy==2.9.3
 
 # For sonic-mgmt-framework
@@ -359,6 +360,7 @@ RUN pip3 install redis
 RUN pip2 install pexpect==4.6.0
 
 # For sonic-utilities build
+RUN pip2 install nose==1.3.7
 RUN pip2 install mockredispy==2.9.3
 RUN pip2 install pytest-runner==4.4
 RUN pip2 install setuptools==40.8.0

From a06e6d3f2be88ea8c09956c531f47699f782951c Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Fri, 9 Apr 2021 16:58:53 -0700
Subject: [PATCH 0350/1674] [sonic-syseepromd] Depend on sonic-platform-common
 (#7279)

Unit tests for syseepromd depend on sonic-platform-common as of Azure/sonic-platform-daemons#156
---
 rules/sonic-syseepromd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/sonic-syseepromd.mk b/rules/sonic-syseepromd.mk
index 0732e3b531c5..03cc20a38f7a 100644
--- a/rules/sonic-syseepromd.mk
+++ b/rules/sonic-syseepromd.mk
@@ -4,7 +4,7 @@
 
 SONIC_SYSEEPROMD_PY2 = sonic_syseepromd-1.0-py2-none-any.whl
 $(SONIC_SYSEEPROMD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-syseepromd
-$(SONIC_SYSEEPROMD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2)
+$(SONIC_SYSEEPROMD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2)
 $(SONIC_SYSEEPROMD_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(SONIC_SYSEEPROMD_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY2)
@@ -13,7 +13,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY2)
 
 SONIC_SYSEEPROMD_PY3 = sonic_syseepromd-1.0-py3-none-any.whl
 $(SONIC_SYSEEPROMD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-syseepromd
-$(SONIC_SYSEEPROMD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_SYSEEPROMD_PY2)
+$(SONIC_SYSEEPROMD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(SONIC_SYSEEPROMD_PY2)
 $(SONIC_SYSEEPROMD_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 $(SONIC_SYSEEPROMD_PY3)_PYTHON_VERSION = 3
 SONIC_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY3)

From abad39ee4161354392221a929e6671c99eb3c0b6 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 13 Apr 2021 19:35:52 +0300
Subject: [PATCH 0351/1674] [sonic-swss] update sonic-swss submodule (#7306)

Changes:
ac4596a [intfmgrd] reach reconciled state at start when there are no interfaces configuration to process (#1703)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index d97c7c737a1f..ac4596ad6d56 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit d97c7c737a1fb5164ab450a75b11fe08d9644c4a
+Subproject commit ac4596ad6d56a4b34582229d430ef0a8aa818fa8

From 744e174276ea5558b15b8f4bc414052c9e524abc Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Tue, 13 Apr 2021 19:44:30 +0300
Subject: [PATCH 0352/1674] [submodule]: update sonic-utilities submodule
 (#7305)

Revert "Fix fast-reboot-dump.py SonicV2Connector after late merge" (Azure/sonic-utilities#1561)

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 9af50fe7f553..721608586830 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 9af50fe7f553f4299c5499bf570c73c2ba9cbc4f
+Subproject commit 721608586830d0c4a627bee2fbda55fe7f6e5186

From 74332ab3bc2c705b7653321c6e39593d147b334c Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 8 Apr 2021 22:17:20 +0530
Subject: [PATCH 0353/1674] DellEMC Z9332f change port alias (#7260)

---
 .../DellEMC-Z9332f-C32/port_config.ini        |  70 ++++----
 .../DellEMC-Z9332f-M-O16C64/port_config.ini   | 166 +++++++++---------
 .../DellEMC-Z9332f-O32/port_config.ini        |  70 ++++----
 3 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/port_config.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/port_config.ini
index d7d83ae21e76..62482e72564e 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/port_config.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/port_config.ini
@@ -1,35 +1,35 @@
-# name          lanes               alias           index  speed
-Ethernet0       33,34,35,36         hundredGigE1/1   1     100000
-Ethernet8       41,42,43,44         hundredGigE1/2   2     100000
-Ethernet16      49,50,51,52         hundredGigE1/3   3     100000
-Ethernet24      57,58,59,60         hundredGigE1/4   4     100000
-Ethernet32      65,66,67,68         hundredGigE1/5   5     100000
-Ethernet40      73,74,75,76         hundredGigE1/6   6     100000
-Ethernet48      81,82,83,84         hundredGigE1/7   7     100000
-Ethernet56      89,90,91,92         hundredGigE1/8   8     100000
-Ethernet64      1,2,3,4             hundredGigE1/9   9     100000
-Ethernet72      9,10,11,12          hundredGigE1/10  10    100000
-Ethernet80      17,18,19,20         hundredGigE1/11  11    100000
-Ethernet88      25,26,27,28         hundredGigE1/12  12    100000
-Ethernet96      97,98,99,100   	    hundredGigE1/13  13    100000
-Ethernet104     105,106,107,108     hundredGigE1/14  14    100000
-Ethernet112     113,114,115,116     hundredGigE1/15  15    100000
-Ethernet120     121,122,123,124     hundredGigE1/16  16    100000
-Ethernet128     129,130,131,132     hundredGigE1/17  17    100000
-Ethernet136     137,138,139,140     hundredGigE1/18  18    100000
-Ethernet144     145,146,147,148     hundredGigE1/19  19    100000
-Ethernet152     153,154,155,156     hundredGigE1/20  20    100000
-Ethernet160     225,226,227,228     hundredGigE1/21  21    100000
-Ethernet168     233,234,235,236     hundredGigE1/22  22    100000
-Ethernet176     241,242,243,244     hundredGigE1/23  23    100000
-Ethernet184     249,250,251,252     hundredGigE1/24  24    100000
-Ethernet192     161,162,163,164     hundredGigE1/25  25    100000
-Ethernet200     169,170,171,172     hundredGigE1/26  26    100000
-Ethernet208     177,178,179,180     hundredGigE1/27  27    100000
-Ethernet216     185,186,187,188     hundredGigE1/28  28    100000
-Ethernet224     193,194,195,196     hundredGigE1/29  29    100000
-Ethernet232     201,202,203,204     hundredGigE1/30  30    100000
-Ethernet240     209,210,211,212     hundredGigE1/31  31    100000
-Ethernet248     217,218,219,220     hundredGigE1/32  32    100000
-Ethernet256     257                 tenGigE1/33      33    10000
-Ethernet257     258                 tenGigE1/34      34    10000
+# name          lanes               alias  index  speed
+Ethernet0       33,34,35,36         etp1    1     100000
+Ethernet8       41,42,43,44         etp2    2     100000
+Ethernet16      49,50,51,52         etp3    3     100000
+Ethernet24      57,58,59,60         etp4    4     100000
+Ethernet32      65,66,67,68         etp5    5     100000
+Ethernet40      73,74,75,76         etp6    6     100000
+Ethernet48      81,82,83,84         etp7    7     100000
+Ethernet56      89,90,91,92         etp8    8     100000
+Ethernet64      1,2,3,4             etp9    9     100000
+Ethernet72      9,10,11,12          etp10   10    100000
+Ethernet80      17,18,19,20         etp11   11    100000
+Ethernet88      25,26,27,28         etp12   12    100000
+Ethernet96      97,98,99,100        etp13   13    100000
+Ethernet104     105,106,107,108     etp14   14    100000
+Ethernet112     113,114,115,116     etp15   15    100000
+Ethernet120     121,122,123,124     etp16   16    100000
+Ethernet128     129,130,131,132     etp17   17    100000
+Ethernet136     137,138,139,140     etp18   18    100000
+Ethernet144     145,146,147,148     etp19   19    100000
+Ethernet152     153,154,155,156     etp20   20    100000
+Ethernet160     225,226,227,228     etp21   21    100000
+Ethernet168     233,234,235,236     etp22   22    100000
+Ethernet176     241,242,243,244     etp23   23    100000
+Ethernet184     249,250,251,252     etp24   24    100000
+Ethernet192     161,162,163,164     etp25   25    100000
+Ethernet200     169,170,171,172     etp26   26    100000
+Ethernet208     177,178,179,180     etp27   27    100000
+Ethernet216     185,186,187,188     etp28   28    100000
+Ethernet224     193,194,195,196     etp29   29    100000
+Ethernet232     201,202,203,204     etp30   30    100000
+Ethernet240     209,210,211,212     etp31   31    100000
+Ethernet248     217,218,219,220     etp32   32    100000
+Ethernet256     257                 etp33   33    10000
+Ethernet257     258                 etp34   34    10000
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
index 101780149b57..b191e0a41a1d 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/port_config.ini
@@ -1,83 +1,83 @@
-# name          lanes                               alias                index speed
-Ethernet0       33,34                               hundredGigE1/1/1     1     100000
-Ethernet2       35,36                               hundredGigE1/1/2     1     100000
-Ethernet4       37,38                               hundredGigE1/1/3     1     100000
-Ethernet6       39,40                               hundredGigE1/1/4     1     100000
-Ethernet8       41,42                               hundredGigE1/2/1     2     100000
-Ethernet10      43,44                               hundredGigE1/2/2     2     100000
-Ethernet12      45,46                               hundredGigE1/2/3     2     100000
-Ethernet14      47,48                               hundredGigE1/2/4     2     100000
-Ethernet16      49,50                               hundredGigE1/3/1     3     100000
-Ethernet18      51,52                               hundredGigE1/3/2     3     100000
-Ethernet20      53,54                               hundredGigE1/3/3     3     100000
-Ethernet22      55,56                               hundredGigE1/3/4     3     100000
-Ethernet24      57,58                               hundredGigE1/4/1     4     100000
-Ethernet26      59,60                               hundredGigE1/4/2     4     100000
-Ethernet28      61,62                               hundredGigE1/4/3     4     100000
-Ethernet30      63,64                               hundredGigE1/4/4     4     100000
-Ethernet32      65,66                               hundredGigE1/5/1     5     100000
-Ethernet34      67,68                               hundredGigE1/5/2     5     100000
-Ethernet36      69,70                               hundredGigE1/5/3     5     100000
-Ethernet38      71,72                               hundredGigE1/5/4     5     100000
-Ethernet40      73,74                               hundredGigE1/6/1     6     100000
-Ethernet42      75,76                               hundredGigE1/6/2     6     100000
-Ethernet44      77,78                               hundredGigE1/6/3     6     100000
-Ethernet46      79,80                               hundredGigE1/6/4     6     100000
-Ethernet48      81,82                               hundredGigE1/7/1     7     100000
-Ethernet50      83,84                               hundredGigE1/7/2     7     100000
-Ethernet52      85,86                               hundredGigE1/7/3     7     100000
-Ethernet54      87,88                               hundredGigE1/7/4     7     100000
-Ethernet56      89,90                               hundredGigE1/8/1     8     100000
-Ethernet58      91,92                               hundredGigE1/8/2     8     100000
-Ethernet60      93,94                               hundredGigE1/8/3     8     100000
-Ethernet62      95,96                               hundredGigE1/8/4     8     100000
-Ethernet64      1,2                                 hundredGigE1/9/1     9     100000
-Ethernet66      3,4                                 hundredGigE1/9/2     9     100000
-Ethernet68      5,6                                 hundredGigE1/9/3     9     100000
-Ethernet70      7,8                                 hundredGigE1/9/4     9     100000
-Ethernet72      9,10                                hundredGigE1/10/1    10    100000
-Ethernet74      11,12                               hundredGigE1/10/2    10    100000
-Ethernet76      13,14                               hundredGigE1/10/3    10    100000
-Ethernet78      15,16                               hundredGigE1/10/4    10    100000
-Ethernet80      17,18                               hundredGigE1/11/1    11    100000
-Ethernet82      19,20                               hundredGigE1/11/2    11    100000
-Ethernet84      21,22                               hundredGigE1/11/3    11    100000
-Ethernet86      23,24                               hundredGigE1/11/4    11    100000
-Ethernet88      25,26                               hundredGigE1/12/1    12    100000
-Ethernet90      27,28                               hundredGigE1/12/2    12    100000
-Ethernet92      29,30                               hundredGigE1/12/3    12    100000
-Ethernet94      31,32                               hundredGigE1/12/4    12    100000
-Ethernet96      97,98,99,100,101,102,103,104        fourhundredGigE1/13  13    400000
-Ethernet104     105,106,107,108,109,110,111,112     fourhundredGigE1/14  14    400000
-Ethernet112     113,114,115,116,117,118,119,120     fourhundredGigE1/15  15    400000
-Ethernet120     121,122,123,124,125,126,127,128     fourhundredGigE1/16  16    400000
-Ethernet128     129,130                             hundredGigE1/17/1    17    100000
-Ethernet130     131,132                             hundredGigE1/17/2    17    100000
-Ethernet132     133,134                             hundredGigE1/17/3    17    100000
-Ethernet134     135,136                             hundredGigE1/17/4    17    100000
-Ethernet136     137,138                             hundredGigE1/18/1    18    100000
-Ethernet138     139,140                             hundredGigE1/18/2    18    100000
-Ethernet140     141,142                             hundredGigE1/18/3    18    100000
-Ethernet142     143,144                             hundredGigE1/18/4    18    100000
-Ethernet144     145,146                             hundredGigE1/19/1    19    100000
-Ethernet146     147,148                             hundredGigE1/19/2    19    100000
-Ethernet148     149,150                             hundredGigE1/19/3    19    100000
-Ethernet150     151,152                             hundredGigE1/19/4    19    100000
-Ethernet152     153,154                             hundredGigE1/20/1    20    100000
-Ethernet154     155,156                             hundredGigE1/20/2    20    100000
-Ethernet156     157,158                             hundredGigE1/20/3    20    100000
-Ethernet158     159,160                             hundredGigE1/20/4    20    100000
-Ethernet160     225,226,227,228,229,230,231,232     fourhundredGigE1/21  21    400000
-Ethernet168     233,234,235,236,237,238,239,240     fourhundredGigE1/22  22    400000
-Ethernet176     241,242,243,244,245,246,247,248     fourhundredGigE1/23  23    400000
-Ethernet184     249,250,251,252,253,254,255,256     fourhundredGigE1/24  24    400000
-Ethernet192     161,162,163,164,165,166,167,168     fourhundredGigE1/25  25    400000
-Ethernet200     169,170,171,172,173,174,175,176     fourhundredGigE1/26  26    400000
-Ethernet208     177,178,179,180,181,182,183,184     fourhundredGigE1/27  27    400000
-Ethernet216     185,186,187,188,189,190,191,192     fourhundredGigE1/28  28    400000
-Ethernet224     193,194,195,196,197,198,199,200     fourhundredGigE1/29  29    400000
-Ethernet232     201,202,203,204,205,206,207,208     fourhundredGigE1/30  30    400000
-Ethernet240     209,210,211,212,213,214,215,216     fourhundredGigE1/31  31    400000
-Ethernet248     217,218,219,220,221,222,223,224     fourhundredGigE1/32  32    400000
-Ethernet256     257                                 tenGigE1/33          33    10000 
-Ethernet257     258                                 tenGigE1/34          34    10000 
+# name          lanes                               alias     index  speed
+Ethernet0       33,34                               etp1a      1     100000
+Ethernet2       35,36                               etp1b      1     100000
+Ethernet4       37,38                               etp1c      1     100000
+Ethernet6       39,40                               etp1d      1     100000
+Ethernet8       41,42                               etp2a      2     100000
+Ethernet10      43,44                               etp2b      2     100000
+Ethernet12      45,46                               etp2c      2     100000
+Ethernet14      47,48                               etp2d      2     100000
+Ethernet16      49,50                               etp3a      3     100000
+Ethernet18      51,52                               etp3b      3     100000
+Ethernet20      53,54                               etp3c      3     100000
+Ethernet22      55,56                               etp3d      3     100000
+Ethernet24      57,58                               etp4a      4     100000
+Ethernet26      59,60                               etp4b      4     100000
+Ethernet28      61,62                               etp4c      4     100000
+Ethernet30      63,64                               etp4d      4     100000
+Ethernet32      65,66                               etp5a      5     100000
+Ethernet34      67,68                               etp5b      5     100000
+Ethernet36      69,70                               etp5c      5     100000
+Ethernet38      71,72                               etp5d      5     100000
+Ethernet40      73,74                               etp6a      6     100000
+Ethernet42      75,76                               etp6b      6     100000
+Ethernet44      77,78                               etp6c      6     100000
+Ethernet46      79,80                               etp6d      6     100000
+Ethernet48      81,82                               etp7a      7     100000
+Ethernet50      83,84                               etp7b      7     100000
+Ethernet52      85,86                               etp7c      7     100000
+Ethernet54      87,88                               etp7d      7     100000
+Ethernet56      89,90                               etp8a      8     100000
+Ethernet58      91,92                               etp8b      8     100000
+Ethernet60      93,94                               etp8c      8     100000
+Ethernet62      95,96                               etp8d      8     100000
+Ethernet64      1,2                                 etp9a      9     100000
+Ethernet66      3,4                                 etp9b      9     100000
+Ethernet68      5,6                                 etp9c      9     100000
+Ethernet70      7,8                                 etp9d      9     100000
+Ethernet72      9,10                                etp10a    10     100000
+Ethernet74      11,12                               etp10b    10     100000
+Ethernet76      13,14                               etp10c    10     100000
+Ethernet78      15,16                               etp10d    10     100000
+Ethernet80      17,18                               etp11a    11     100000
+Ethernet82      19,20                               etp11b    11     100000
+Ethernet84      21,22                               etp11c    11     100000
+Ethernet86      23,24                               etp11d    11     100000
+Ethernet88      25,26                               etp12a    12     100000
+Ethernet90      27,28                               etp12b    12     100000
+Ethernet92      29,30                               etp12c    12     100000
+Ethernet94      31,32                               etp12d    12     100000
+Ethernet96      97,98,99,100,101,102,103,104        etp13     13     400000
+Ethernet104     105,106,107,108,109,110,111,112     etp14     14     400000
+Ethernet112     113,114,115,116,117,118,119,120     etp15     15     400000
+Ethernet120     121,122,123,124,125,126,127,128     etp16     16     400000
+Ethernet128     129,130                             etp17a    17     100000
+Ethernet130     131,132                             etp17b    17     100000
+Ethernet132     133,134                             etp17c    17     100000
+Ethernet134     135,136                             etp17d    17     100000
+Ethernet136     137,138                             etp18a    18     100000
+Ethernet138     139,140                             etp18b    18     100000
+Ethernet140     141,142                             etp18c    18     100000
+Ethernet142     143,144                             etp18d    18     100000
+Ethernet144     145,146                             etp19a    19     100000
+Ethernet146     147,148                             etp19b    19     100000
+Ethernet148     149,150                             etp19c    19     100000
+Ethernet150     151,152                             etp19d    19     100000
+Ethernet152     153,154                             etp20a    20     100000
+Ethernet154     155,156                             etp20b    20     100000
+Ethernet156     157,158                             etp20c    20     100000
+Ethernet158     159,160                             etp20d    20     100000
+Ethernet160     225,226,227,228,229,230,231,232     etp21     21     400000
+Ethernet168     233,234,235,236,237,238,239,240     etp22     22     400000
+Ethernet176     241,242,243,244,245,246,247,248     etp23     23     400000
+Ethernet184     249,250,251,252,253,254,255,256     etp24     24     400000
+Ethernet192     161,162,163,164,165,166,167,168     etp25     25     400000
+Ethernet200     169,170,171,172,173,174,175,176     etp26     26     400000
+Ethernet208     177,178,179,180,181,182,183,184     etp27     27     400000
+Ethernet216     185,186,187,188,189,190,191,192     etp28     28     400000
+Ethernet224     193,194,195,196,197,198,199,200     etp29     29     400000
+Ethernet232     201,202,203,204,205,206,207,208     etp30     30     400000
+Ethernet240     209,210,211,212,213,214,215,216     etp31     31     400000
+Ethernet248     217,218,219,220,221,222,223,224     etp32     32     400000
+Ethernet256     257                                 etp33     33     10000
+Ethernet257     258                                 etp34     34     10000
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/port_config.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/port_config.ini
index 790fb490cfe6..ea214699e06a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/port_config.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/port_config.ini
@@ -1,35 +1,35 @@
-# name          lanes                           alias               index  speed
-Ethernet0       33,34,35,36,37,38,39,40         fourhundredGigE1/1  1      400000
-Ethernet8       41,42,43,44,45,46,47,48         fourhundredGigE1/2  2      400000
-Ethernet16      49,50,51,52,53,54,55,56         fourhundredGigE1/3  3      400000
-Ethernet24      57,58,59,60,61,62,63,64         fourhundredGigE1/4  4      400000
-Ethernet32      65,66,67,68,69,70,71,72         fourhundredGigE1/5  5      400000
-Ethernet40      73,74,75,76,77,78,79,80         fourhundredGigE1/6  6      400000
-Ethernet48      81,82,83,84,85,86,87,88         fourhundredGigE1/7  7      400000
-Ethernet56      89,90,91,92,93,94,95,96         fourhundredGigE1/8  8      400000
-Ethernet64      1,2,3,4,5,6,7,8                 fourhundredGigE1/9  9      400000
-Ethernet72      9,10,11,12,13,14,15,16          fourhundredGigE1/10 10     400000
-Ethernet80      17,18,19,20,21,22,23,24         fourhundredGigE1/11 11     400000
-Ethernet88      25,26,27,28,29,30,31,32         fourhundredGigE1/12 12     400000
-Ethernet96      97,98,99,100,101,102,103,104    fourhundredGigE1/13 13     400000
-Ethernet104     105,106,107,108,109,110,111,112 fourhundredGigE1/14 14     400000
-Ethernet112     113,114,115,116,117,118,119,120 fourhundredGigE1/15 15     400000
-Ethernet120     121,122,123,124,125,126,127,128 fourhundredGigE1/16 16     400000
-Ethernet128     129,130,131,132,133,134,135,136 fourhundredGigE1/17 17     400000
-Ethernet136     137,138,139,140,141,142,143,144 fourhundredGigE1/18 18     400000
-Ethernet144     145,146,147,148,149,150,151,152 fourhundredGigE1/19 19     400000
-Ethernet152     153,154,155,156,157,158,159,160 fourhundredGigE1/20 20     400000
-Ethernet160     225,226,227,228,229,230,231,232 fourhundredGigE1/21 21     400000
-Ethernet168     233,234,235,236,237,238,239,240 fourhundredGigE1/22 22     400000
-Ethernet176     241,242,243,244,245,246,247,248 fourhundredGigE1/23 23     400000
-Ethernet184     249,250,251,252,253,254,255,256 fourhundredGigE1/24 24     400000
-Ethernet192     161,162,163,164,165,166,167,168 fourhundredGigE1/25 25     400000
-Ethernet200     169,170,171,172,173,174,175,176 fourhundredGigE1/26 26     400000
-Ethernet208     177,178,179,180,181,182,183,184 fourhundredGigE1/27 27     400000
-Ethernet216     185,186,187,188,189,190,191,192 fourhundredGigE1/28 28     400000
-Ethernet224     193,194,195,196,197,198,199,200 fourhundredGigE1/29 29     400000
-Ethernet232     201,202,203,204,205,206,207,208 fourhundredGigE1/30 30     400000
-Ethernet240     209,210,211,212,213,214,215,216 fourhundredGigE1/31 31     400000
-Ethernet248     217,218,219,220,221,222,223,224 fourhundredGigE1/32 32     400000
-Ethernet256     257                             tenGigE1/33         33     10000
-Ethernet257     258                             tenGigE1/34         34     10000
+# name          lanes                             alias  index   speed
+Ethernet0       33,34,35,36,37,38,39,40           etp1    1      400000
+Ethernet8       41,42,43,44,45,46,47,48           etp2    2      400000
+Ethernet16      49,50,51,52,53,54,55,56           etp3    3      400000
+Ethernet24      57,58,59,60,61,62,63,64           etp4    4      400000
+Ethernet32      65,66,67,68,69,70,71,72           etp5    5      400000
+Ethernet40      73,74,75,76,77,78,79,80           etp6    6      400000
+Ethernet48      81,82,83,84,85,86,87,88           etp7    7      400000
+Ethernet56      89,90,91,92,93,94,95,96           etp8    8      400000
+Ethernet64      1,2,3,4,5,6,7,8                   etp9    9      400000
+Ethernet72      9,10,11,12,13,14,15,16            etp10   10     400000
+Ethernet80      17,18,19,20,21,22,23,24           etp11   11     400000
+Ethernet88      25,26,27,28,29,30,31,32           etp12   12     400000
+Ethernet96      97,98,99,100,101,102,103,104      etp13   13     400000
+Ethernet104     105,106,107,108,109,110,111,112   etp14   14     400000
+Ethernet112     113,114,115,116,117,118,119,120   etp15   15     400000
+Ethernet120     121,122,123,124,125,126,127,128   etp16   16     400000
+Ethernet128     129,130,131,132,133,134,135,136   etp17   17     400000
+Ethernet136     137,138,139,140,141,142,143,144   etp18   18     400000
+Ethernet144     145,146,147,148,149,150,151,152   etp19   19     400000
+Ethernet152     153,154,155,156,157,158,159,160   etp20   20     400000
+Ethernet160     225,226,227,228,229,230,231,232   etp21   21     400000
+Ethernet168     233,234,235,236,237,238,239,240   etp22   22     400000
+Ethernet176     241,242,243,244,245,246,247,248   etp23   23     400000
+Ethernet184     249,250,251,252,253,254,255,256   etp24   24     400000
+Ethernet192     161,162,163,164,165,166,167,168   etp25   25     400000
+Ethernet200     169,170,171,172,173,174,175,176   etp26   26     400000
+Ethernet208     177,178,179,180,181,182,183,184   etp27   27     400000
+Ethernet216     185,186,187,188,189,190,191,192   etp28   28     400000
+Ethernet224     193,194,195,196,197,198,199,200   etp29   29     400000
+Ethernet232     201,202,203,204,205,206,207,208   etp30   30     400000
+Ethernet240     209,210,211,212,213,214,215,216   etp31   31     400000
+Ethernet248     217,218,219,220,221,222,223,224   etp32   32     400000
+Ethernet256     257                               etp33   33     10000
+Ethernet257     258                               etp34   34     10000

From defeb96286ee914186c202963c0d9f2e7d41f72c Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Mon, 12 Apr 2021 20:48:44 +0300
Subject: [PATCH 0354/1674] [installer]: Prevent filesystem corruption (#7264)

This improvement reads current SONiC version directly from `/proc/cmdline`.
it supports `grub/aboot/uboot` bootloaders.

**Code snippet**:
```bash
cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p'
```

**Description**:
```
-n         don't print lines
s          substitute
^.*        matches anything before the <image_version>
loop=      matches <loop> kernel parameter
\/*image-  matches <image_version> prefix
\(\S\+\)   matches <image_version> group and assigns it to \1
\/.*$      matches anything after the <image_version>
\1         replace everything with <image_version>
p          print it
```
closes #6267

#### Why I did it
* To fix #6267

#### How I did it
* Fixed installer scripts

#### How to verify it
1. Write invalid SONiC version to sonic_version.yml
2. Run SONiC-To-SONiC update
---
 installer/arm64/install.sh  | 8 +++++++-
 installer/armhf/install.sh  | 8 +++++++-
 installer/x86_64/install.sh | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/installer/arm64/install.sh b/installer/arm64/install.sh
index 280d9f200af9..c1e20b62bf42 100755
--- a/installer/arm64/install.sh
+++ b/installer/arm64/install.sh
@@ -98,7 +98,13 @@ if [ "$install_env" = "onie" ]; then
     mount_partition
 elif [ "$install_env" = "sonic" ]; then
     demo_mnt="/host"
-    eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    # Get current SONiC image (grub/aboot/uboot)
+    eval running_sonic_revision="$(cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p')"
+    # Verify SONiC image exists
+    if [ ! -d "$demo_mnt/image-$running_sonic_revision" ]; then
+        echo "ERROR: SONiC installation is corrupted: path $demo_mnt/image-$running_sonic_revision doesn't exist"
+        exit 1
+    fi
     # Prevent installing existing SONiC if it is running
     if [ "$image_dir" = "image-$running_sonic_revision" ]; then
         echo "Not installing SONiC version $running_sonic_revision, as current running SONiC has the same version"
diff --git a/installer/armhf/install.sh b/installer/armhf/install.sh
index 53f2fdf99661..c85170ff256e 100755
--- a/installer/armhf/install.sh
+++ b/installer/armhf/install.sh
@@ -98,7 +98,13 @@ if [ "$install_env" = "onie" ]; then
     mount_partition
 elif [ "$install_env" = "sonic" ]; then
     demo_mnt="/host"
-    eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    # Get current SONiC image (grub/aboot/uboot)
+    eval running_sonic_revision="$(cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p')"
+    # Verify SONiC image exists
+    if [ ! -d "$demo_mnt/image-$running_sonic_revision" ]; then
+        echo "ERROR: SONiC installation is corrupted: path $demo_mnt/image-$running_sonic_revision doesn't exist"
+        exit 1
+    fi
     # Prevent installing existing SONiC if it is running
     if [ "$image_dir" = "image-$running_sonic_revision" ]; then
         echo "Not installing SONiC version $running_sonic_revision, as current running SONiC has the same version"
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 0bd78365aece..e7eb9e1a8065 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -447,7 +447,13 @@ if [ "$install_env" = "onie" ]; then
 
 elif [ "$install_env" = "sonic" ]; then
     demo_mnt="/host"
-    eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    # Get current SONiC image (grub/aboot/uboot)
+    eval running_sonic_revision="$(cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p')"
+    # Verify SONiC image exists
+    if [ ! -d "$demo_mnt/image-$running_sonic_revision" ]; then
+        echo "ERROR: SONiC installation is corrupted: path $demo_mnt/image-$running_sonic_revision doesn't exist"
+        exit 1
+    fi
     # Prevent installing existing SONiC if it is running
     if [ "$image_dir" = "image-$running_sonic_revision" ]; then
         echo "Not installing SONiC version $running_sonic_revision, as current running SONiC has the same version"

From f3f96df5cc03cd47f5c7a7555503a33c4626932c Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:57:53 +0800
Subject: [PATCH 0355/1674] [sonic-platform-daemons] Update submodule (#7277)

eff5c1c [thermalctld] No need exit thermalcltd when loading invalid policy file (#172)
5b6d9c0 [syseepromd] Add unit tests; Refactor to allow for greater unit test coverage (#156)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 0bd9f698f755..eff5c1c83035 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 0bd9f698f7550f498af54a52199cb5ad5a45e306
+Subproject commit eff5c1c83035a6f2bf07ba1a22c91db67e325a14

From 230e78bb5996e511d25db28296a1c49435857002 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:02:15 -0700
Subject: [PATCH 0356/1674] [sonic-platform-daemons] submodule update (#7298)

c4d4790 [xcvrd] refactor Y-Cable firmware information to conform with all vendors (#171)
be7f4e1 [voqinband]Support for inband port as regular port (#145)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index eff5c1c83035..c4d47900571f 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit eff5c1c83035a6f2bf07ba1a22c91db67e325a14
+Subproject commit c4d47900571f68b1d854030c8d13e291850e4043

From 4d9f6e6b7228f2a482f1c719b740d49955b99872 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 12 Apr 2021 12:17:28 +0800
Subject: [PATCH 0357/1674] [ci] Support to merge SONiC package versions change
 pr automatically (#7065)

Support to merge the SONiC package versions upgrade pull request automatically.

#### How I did it
Add the automerge tag in the pull request.
1. Sent by the author mssonicbld
2. Only contains changes in files/build/**/*
3. Only for the specified branch 202012

Merge the pull request.
1. Sent by the author mssonicbld
2. The Azure Pipelines checker complete and successful
3. The pull request contains label automerge
---
 .github/labeler.yml             |  2 ++
 .github/workflows/automerge.yml | 22 ++++++++++++++++++++++
 .github/workflows/label.yml     | 25 +++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/automerge.yml
 create mode 100644 .github/workflows/label.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000000..d92f952628b4
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,2 @@
+automerge:
+- all: ['files/build/versions/**']
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 000000000000..502f5d8987d9
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,22 @@
+# This workflow will merge pull requests automatically
+#
+
+name: automerge
+on:
+  check_suite:
+    types:
+      - completed
+
+jobs:
+  automerge:
+    if: github.event.check_suite.app.name == 'Azure Pipelines' &&  github.event.check_suite.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+    - name: automerge
+      uses: 'pascalgn/automerge-action@v0.13.1'
+      env:
+        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        MERGE_LABELS: 'automerge'
+        MERGE_METHOD: 'squash'
+        MERGE_FILTER_AUTHOR: 'mssonicbld'
+        MERGE_DELETE_BRANCH: true
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
new file mode 100644
index 000000000000..f70194e04737
--- /dev/null
+++ b/.github/workflows/label.yml
@@ -0,0 +1,25 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: Labeler
+on:
+  pull_request:
+    types:
+    - opened
+    - reopened
+    branches:
+    - '202012'
+    paths:
+    - 'files/build/versions/**'
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@main
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From d273f3fbcb7d3197edae121824ab82820c7ec6bb Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Fri, 2 Apr 2021 13:44:19 -0700
Subject: [PATCH 0358/1674] BRCM SAI 4.3.3.4 Pick up 8 major bug fixes (#7218)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 838fd7fa225a..165579529c60 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.3_amd64.deb?sv=2019-12-12&st=2021-03-18T03%3A28%3A15Z&se=2030-03-19T03%3A28%3A00Z&sr=b&sp=r&sig=YDCGJeY4Om4%2B5tkdZN%2BvWjLGh8JhsDyfMPs%2FfHgW8nA%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.4_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.4_amd64.deb?sv=2015-04-05&sr=b&sig=RaM7VKtUVZgKVvCbcBp3WP7cqrLT%2BrjwHv3kLdj8zzk%3D&se=2034-12-10T05%3A39%3A44Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.4_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.3_amd64.deb?sv=2019-12-12&st=2021-03-18T03%3A29%3A30Z&se=2030-03-19T03%3A29%3A00Z&sr=b&sp=r&sig=e5hvdlKvupLmWfNK%2B37LYUXfxNBm6Y%2F0%2Bnv2Aq8q51w%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.4_amd64.deb?sv=2015-04-05&sr=b&sig=im7%2Fqp2dnoQTaPhY3Jv%2BHV0eZ4mPu27BT%2FbcF%2BQxGyQ%3D&se=2034-12-10T05%3A40%3A26Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 606249323f35a9953843926b3f20a7729b29fda9 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 13 Apr 2021 23:13:52 -0700
Subject: [PATCH 0359/1674] [202012][submodule] Branch out
 sonic-platform-daemons submodule for 202012 (#7314)

- [xcvrd] refactor Y-Cable firmware information to conform with all vendors (#171)
- [thermalctld] No need exit thermalcltd when loading invalid policy file (#172) <--- branch point

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index c4d47900571f..cf1c531c7fee 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit c4d47900571f68b1d854030c8d13e291850e4043
+Subproject commit cf1c531c7feeefbb404468561f871b5f463c2e02

From 4e1f689574b4585f3a278dffed77c7d6f6a7262c Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Wed, 14 Apr 2021 07:42:31 -0700
Subject: [PATCH 0360/1674] [202012][submodule] Branch out sonic-sairedis
 submodule for 202012 (#7316)

- [pyext] Fix pyext/py2 library (#820)
- Added --purge of base docker image packages before installing new ones. (#819) <--- branch point

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 1906fdf30e2e..ea871a8de03e 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 1906fdf30e2e890a2819bd30ec141476422ffc53
+Subproject commit ea871a8de03e93faae2aeea327c571a1a02b56f2

From c7c9141a6ff398f42a4b1cd53a099a34b3309996 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Wed, 14 Apr 2021 12:53:51 -0700
Subject: [PATCH 0361/1674] [202012][submodule] Update sonic-swss and
 sonic-utilities submodules (#7313)

sonic-swss
* Don't update pools when ingress_lossless_pool is created but the initialization hasn't finished yet (#1685)
* Fix dynamic buffer bug occuring in rare condition (#1678)

sonic-utilities
* [load_minigraph]: Avoid starting PFCWD for EPMS devicetype (#1552)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index ac4596ad6d56..aec77ef490d5 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit ac4596ad6d56a4b34582229d430ef0a8aa818fa8
+Subproject commit aec77ef490d5f610d1e57725dc618b20996473a6
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 721608586830..a5b52851f1a5 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 721608586830d0c4a627bee2fbda55fe7f6e5186
+Subproject commit a5b52851f1a59b92606e3929fe96e0025b55061f

From d7b4c62f6a0c43087784b1a1eebd4838f128a2a9 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 14 Apr 2021 17:38:14 -0700
Subject: [PATCH 0362/1674] [l2-preset]: Add all dual ToR required fields
 (#7318)

- Add peer_switch field to DEVICE_METADATA table
- In PORT table:
   - Set used ports to admin status up
   - Set mux_cable to true for downlinks in use
- In MUX_CABLE table:
   - Only add entry if the downlink is in use

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-config-engine/config_samples.py     |  91 ++--
 .../sample_output/py2/l2switch_dualtor.json   | 501 ++++++++++++------
 .../sample_output/py3/l2switch_dualtor.json   | 501 ++++++++++++------
 .../tests/t0_7050cx3_d48c8_port_config.ini    |  57 ++
 src/sonic-config-engine/tests/test_j2files.py |  20 +-
 5 files changed, 831 insertions(+), 339 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/t0_7050cx3_d48c8_port_config.ini

diff --git a/src/sonic-config-engine/config_samples.py b/src/sonic-config-engine/config_samples.py
index 7f8b968fa5a4..5a58ca560221 100644
--- a/src/sonic-config-engine/config_samples.py
+++ b/src/sonic-config-engine/config_samples.py
@@ -1,5 +1,6 @@
 import sys
 
+from collections import defaultdict
 from ipaddress import ip_interface
 from natsort import natsorted
 
@@ -37,7 +38,7 @@ def generate_t1_sample_config(data):
                 'keepalive': '60'
                 }
         port_count += 1
-    return data;
+    return data
 
 def generate_empty_config(data):
     new_data = {'DEVICE_METADATA': data['DEVICE_METADATA']}
@@ -47,49 +48,79 @@ def generate_empty_config(data):
         new_data['DEVICE_METADATA']['localhost']['type'] = 'LeafRouter'
     return new_data
 
+def generate_global_dualtor_tables():
+    data = defaultdict(lambda: defaultdict(dict))
+    data['LOOPBACK_INTERFACE'] = {
+                                    'Loopback2': {},
+                                    'Loopback2|3.3.3.3': {}
+                                    }
+    data['MUX_CABLE'] = {}
+    data['PEER_SWITCH'] = {
+                            "peer_switch_hostname": {
+                                "address_ipv4": "1.1.1.1"
+                            }
+                            }
+    data['TUNNEL'] = {
+                        "MuxTunnel0": {
+                            "dscp_mode": "uniform",
+                            "dst_ip": "2.2.2.2",
+                            "ecn_mode": "copy_from_outer",
+                            "encap_ecn_mode": "standard",
+                            "ttl_mode": "pipe",
+                            "tunnel_type": "IPINIP"
+                        }
+                    }
+    return data
+
 def generate_l2_config(data):
+    # Check if dual ToR configs are needed
     if 'is_dualtor' in data and data['is_dualtor']:
         is_dualtor = True
         data.pop('is_dualtor')
     else:
         is_dualtor = False
+
+    if 'uplinks' in data:
+        uplinks = data['uplinks']
+        data.pop('uplinks')
+    
+    if 'downlinks' in data:
+        downlinks = data['downlinks']
+        data.pop('downlinks')
+
+    # VLAN initial data
     data['VLAN'] = {'Vlan1000': {'vlanid': '1000'}}
     data['VLAN_MEMBER'] = {}
+
     if is_dualtor:
         data['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
-        data['LOOPBACK_INTERFACE'] = {
-                                        'Loopback2': {},
-                                        'Loopback2|3.3.3.3': {}
-                                     }
-        data['MUX_CABLE'] = {}
-        data['PEER_SWITCH'] = {
-                                "peer_switch_hostname": {
-                                    "address_ipv4": "1.1.1.1"
-                                }
-                              }
-        data['TUNNEL'] = {
-                            "MuxTunnel0": {
-                                "dscp_mode": "uniform",
-                                "dst_ip": "2.2.2.2",
-                                "ecn_mode": "copy_from_outer",
-                                "encap_ecn_mode": "standard",
-                                "ttl_mode": "pipe",
-                                "tunnel_type": "IPINIP"
-                            }
-                         }
+        data['DEVICE_METADATA']['localhost']['peer_switch'] = 'peer_switch_hostname'
+        data.update(generate_global_dualtor_tables())
 
         server_ipv4_base = ip_interface(UNICODE_TYPE('192.168.0.1/32'))
         server_ipv6_base = ip_interface(UNICODE_TYPE('fc02:1000::1/128'))
-    for i, port in enumerate(natsorted(data['PORT'])):
-        data['PORT'][port].setdefault('admin_status', 'up')
-        data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
+        server_offset = 1
+    for port in natsorted(data['PORT']):
         if is_dualtor:
-            mux_cable_entry = {
-                'server_ipv4': str(server_ipv4_base + i),
-                'server_ipv6': str(server_ipv6_base + i),
-                'state': 'auto'
-            }
-            data['MUX_CABLE'][port] = mux_cable_entry
+            # Ports in use should be admin up, unused ports default to admin down
+            if port in downlinks or port in uplinks:
+                data['PORT'][port].setdefault('admin_status', 'up')
+                data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
+
+            # Downlinks (connected to mux cable) need a MUX_CABLE entry
+            # as well as the `mux_cable` field in the PORT table
+            if port in downlinks:
+                mux_cable_entry = {
+                    'server_ipv4': str(server_ipv4_base + server_offset),
+                    'server_ipv6': str(server_ipv6_base + server_offset),
+                    'state': 'auto'
+                }
+                server_offset += 1
+                data['MUX_CABLE'][port] = mux_cable_entry
+                data['PORT'][port]['mux_cable'] = 'true'
+        else:
+            data['PORT'][port].setdefault('admin_status', 'up')
+            data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
     return data
 
 _sample_generators = {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
index ab8f2d0b05f0..44edd892ab91 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json
@@ -1,170 +1,403 @@
 {
     "DEVICE_METADATA": {
         "localhost": {
-            "hwsku": "Mellanox-SN2700",
-            "subtype": "DualToR"
+            "hwsku": "Arista-7050CX3-32S-D48C8",
+            "subtype": "DualToR",
+            "peer_switch": "peer_switch_hostname"
         }
     },
     "PORT": {
         "Ethernet0": {
-            "alias": "fortyGigE0/0",
-            "lanes": "29,30,31,32",
-            "admin_status": "up"
+            "lanes": "1,2",
+            "alias": "Ethernet1/1",
+            "index": "1",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet2": {
+            "lanes": "3,4",
+            "alias": "Ethernet1/3",
+            "index": "1",
+            "speed": "50000"
         },
         "Ethernet4": {
-            "alias": "fortyGigE0/4",
-            "lanes": "25,26,27,28",
-            "admin_status": "up"
+            "lanes": "5,6",
+            "alias": "Ethernet2/1",
+            "index": "2",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet6": {
+            "lanes": "7,8",
+            "alias": "Ethernet2/3",
+            "index": "2",
+            "speed": "50000"
         },
         "Ethernet8": {
-            "alias": "fortyGigE0/8",
-            "lanes": "37,38,39,40",
-            "admin_status": "up"
+            "lanes": "9,10",
+            "alias": "Ethernet3/1",
+            "index": "3",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet10": {
+            "lanes": "11,12",
+            "alias": "Ethernet3/3",
+            "index": "3",
+            "speed": "50000"
         },
         "Ethernet12": {
-            "alias": "fortyGigE0/12",
-            "lanes": "33,34,35,36",
-            "admin_status": "up"
+            "lanes": "13,14",
+            "alias": "Ethernet4/1",
+            "index": "4",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet14": {
+            "lanes": "15,16",
+            "alias": "Ethernet4/3",
+            "index": "4",
+            "speed": "50000"
         },
         "Ethernet16": {
-            "alias": "fortyGigE0/16",
-            "lanes": "41,42,43,44",
-            "admin_status": "up"
+            "lanes": "21,22",
+            "alias": "Ethernet5/1",
+            "index": "5",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet18": {
+            "lanes": "23,24",
+            "alias": "Ethernet5/3",
+            "index": "5",
+            "speed": "50000"
         },
         "Ethernet20": {
-            "alias": "fortyGigE0/20",
-            "lanes": "45,46,47,48",
-            "admin_status": "up"
+            "lanes": "17,18",
+            "alias": "Ethernet6/1",
+            "index": "6",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet22": {
+            "lanes": "19,20",
+            "alias": "Ethernet6/3",
+            "index": "6",
+            "speed": "50000"
         },
         "Ethernet24": {
-            "alias": "fortyGigE0/24",
-            "lanes": "5,6,7,8",
+            "lanes": "25,26,27,28",
+            "alias": "Ethernet7/1",
+            "index": "7",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet28": {
-            "alias": "fortyGigE0/28",
-            "lanes": "1,2,3,4",
+            "lanes": "29,30,31,32",
+            "alias": "Ethernet8/1",
+            "index": "8",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet32": {
-            "alias": "fortyGigE0/32",
-            "lanes": "9,10,11,12",
+            "lanes": "37,38,39,40",
+            "alias": "Ethernet9/1",
+            "index": "9",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet36": {
-            "alias": "fortyGigE0/36",
-            "lanes": "13,14,15,16",
+            "lanes": "33,34,35,36",
+            "alias": "Ethernet10/1",
+            "index": "10",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet40": {
-            "alias": "fortyGigE0/40",
-            "lanes": "21,22,23,24",
-            "admin_status": "up"
+            "lanes": "41,42",
+            "alias": "Ethernet11/1",
+            "index": "11",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet42": {
+            "lanes": "43,44",
+            "alias": "Ethernet11/3",
+            "index": "11",
+            "speed": "50000"
         },
         "Ethernet44": {
-            "alias": "fortyGigE0/44",
-            "lanes": "17,18,19,20",
-            "admin_status": "up"
+            "lanes": "45,46",
+            "alias": "Ethernet12/1",
+            "index": "12",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet46": {
+            "lanes": "47,48",
+            "alias": "Ethernet12/3",
+            "index": "12",
+            "speed": "50000"
         },
         "Ethernet48": {
-            "alias": "fortyGigE0/48",
-            "lanes": "49,50,51,52",
-            "admin_status": "up"
+            "lanes": "53,54",
+            "alias": "Ethernet13/1",
+            "index": "13",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet50": {
+            "lanes": "55,56",
+            "alias": "Ethernet13/3",
+            "index": "13",
+            "speed": "50000"
         },
         "Ethernet52": {
-            "alias": "fortyGigE0/52",
-            "lanes": "53,54,55,56",
-            "admin_status": "up"
+            "lanes": "49,50",
+            "alias": "Ethernet14/1",
+            "index": "14",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet54": {
+            "lanes": "51,52",
+            "alias": "Ethernet14/3",
+            "index": "14",
+            "speed": "50000"
         },
         "Ethernet56": {
-            "alias": "fortyGigE0/56",
-            "lanes": "61,62,63,64",
-            "admin_status": "up"
+            "lanes": "57,58",
+            "alias": "Ethernet15/1",
+            "index": "15",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet58": {
+            "lanes": "59,60",
+            "alias": "Ethernet15/3",
+            "index": "15",
+            "speed": "50000"
         },
         "Ethernet60": {
-            "alias": "fortyGigE0/60",
-            "lanes": "57,58,59,60",
-            "admin_status": "up"
+            "lanes": "61,62",
+            "alias": "Ethernet16/1",
+            "index": "16",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet62": {
+            "lanes": "63,64",
+            "alias": "Ethernet16/3",
+            "index": "16",
+            "speed": "50000"
         },
         "Ethernet64": {
-            "alias": "fortyGigE0/64",
-            "lanes": "65,66,67,68",
-            "admin_status": "up"
+            "lanes": "69,70",
+            "alias": "Ethernet17/1",
+            "index": "17",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet66": {
+            "lanes": "71,72",
+            "alias": "Ethernet17/3",
+            "index": "17",
+            "speed": "50000"
         },
         "Ethernet68": {
-            "alias": "fortyGigE0/68",
-            "lanes": "69,70,71,72",
-            "admin_status": "up"
+            "lanes": "65,66",
+            "alias": "Ethernet18/1",
+            "index": "18",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet70": {
+            "lanes": "67,68",
+            "alias": "Ethernet18/3",
+            "index": "18",
+            "speed": "50000"
         },
         "Ethernet72": {
-            "alias": "fortyGigE0/72",
-            "lanes": "77,78,79,80",
-            "admin_status": "up"
+            "lanes": "73,74",
+            "alias": "Ethernet19/1",
+            "index": "19",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet74": {
+            "lanes": "75,76",
+            "alias": "Ethernet19/3",
+            "index": "19",
+            "speed": "50000"
         },
         "Ethernet76": {
-            "alias": "fortyGigE0/76",
-            "lanes": "73,74,75,76",
-            "admin_status": "up"
+            "lanes": "77,78",
+            "alias": "Ethernet20/1",
+            "index": "20",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet78": {
+            "lanes": "79,80",
+            "alias": "Ethernet20/3",
+            "index": "20",
+            "speed": "50000"
         },
         "Ethernet80": {
-            "alias": "fortyGigE0/80",
-            "lanes": "105,106,107,108",
-            "admin_status": "up"
+            "lanes": "85,86",
+            "alias": "Ethernet21/1",
+            "index": "21",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet82": {
+            "lanes": "87,88",
+            "alias": "Ethernet21/3",
+            "index": "21",
+            "speed": "50000"
         },
         "Ethernet84": {
-            "alias": "fortyGigE0/84",
-            "lanes": "109,110,111,112",
-            "admin_status": "up"
+            "lanes": "81,82",
+            "alias": "Ethernet22/1",
+            "index": "22",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet86": {
+            "lanes": "83,84",
+            "alias": "Ethernet22/3",
+            "index": "22",
+            "speed": "50000"
         },
         "Ethernet88": {
-            "alias": "fortyGigE0/88",
-            "lanes": "117,118,119,120",
+            "lanes": "89,90,91,92",
+            "alias": "Ethernet23/1",
+            "index": "23",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet92": {
-            "alias": "fortyGigE0/92",
-            "lanes": "113,114,115,116",
+            "lanes": "93,94,95,96",
+            "alias": "Ethernet24/1",
+            "index": "24",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet96": {
-            "alias": "fortyGigE0/96",
-            "lanes": "121,122,123,124",
+            "lanes": "101,102,103,104",
+            "alias": "Ethernet25/1",
+            "index": "25",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet100": {
-            "alias": "fortyGigE0/100",
-            "lanes": "125,126,127,128",
+            "lanes": "97,98,99,100",
+            "alias": "Ethernet26/1",
+            "index": "26",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet104": {
-            "alias": "fortyGigE0/104",
-            "lanes": "85,86,87,88",
-            "admin_status": "up"
+            "lanes": "105,106",
+            "alias": "Ethernet27/1",
+            "index": "27",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet106": {
+            "lanes": "107,108",
+            "alias": "Ethernet27/3",
+            "index": "27",
+            "speed": "50000"
         },
         "Ethernet108": {
-            "alias": "fortyGigE0/108",
-            "lanes": "81,82,83,84",
-            "admin_status": "up"
+            "lanes": "109,110",
+            "alias": "Ethernet28/1",
+            "index": "28",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet110": {
+            "lanes": "111,112",
+            "alias": "Ethernet28/3",
+            "index": "28",
+            "speed": "50000"
         },
         "Ethernet112": {
-            "alias": "fortyGigE0/112",
-            "lanes": "89,90,91,92",
-            "admin_status": "up"
+            "lanes": "117,118",
+            "alias": "Ethernet29/1",
+            "index": "29",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet114": {
+            "lanes": "119,120",
+            "alias": "Ethernet29/3",
+            "index": "29",
+            "speed": "50000"
         },
         "Ethernet116": {
-            "alias": "fortyGigE0/116",
-            "lanes": "93,94,95,96",
-            "admin_status": "up"
+            "lanes": "113,114",
+            "alias": "Ethernet30/1",
+            "index": "30",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet118": {
+            "lanes": "115,116",
+            "alias": "Ethernet30/3",
+            "index": "30",
+            "speed": "50000"
         },
         "Ethernet120": {
-            "alias": "fortyGigE0/120",
-            "lanes": "97,98,99,100",
-            "admin_status": "up"
+            "lanes": "121,122",
+            "alias": "Ethernet31/1",
+            "index": "31",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet122": {
+            "lanes": "123,124",
+            "alias": "Ethernet31/3",
+            "index": "31",
+            "speed": "50000"
         },
         "Ethernet124": {
-            "alias": "fortyGigE0/124",
-            "lanes": "101,102,103,104",
-            "admin_status": "up"
+            "lanes": "125,126",
+            "alias": "Ethernet32/1",
+            "index": "32",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet126": {
+            "lanes": "127,128",
+            "alias": "Ethernet32/3",
+            "index": "32",
+            "speed": "50000"
         }
     },
     "VLAN": {
@@ -289,166 +522,126 @@
         "Loopback2": {},
         "Loopback2|3.3.3.3": {}
     },
-    "MUX_CABLE":{
+    "MUX_CABLE": {
         "Ethernet0": {
-            "server_ipv4": "192.168.0.1/32",
-            "server_ipv6": "fc02:1000::1/128",
-            "state": "auto"
-        },
-        "Ethernet4": {
             "server_ipv4": "192.168.0.2/32",
             "server_ipv6": "fc02:1000::2/128",
             "state": "auto"
         },
-        "Ethernet8": {
+        "Ethernet4": {
             "server_ipv4": "192.168.0.3/32",
             "server_ipv6": "fc02:1000::3/128",
             "state": "auto"
         },
-        "Ethernet12": {
+        "Ethernet8": {
             "server_ipv4": "192.168.0.4/32",
             "server_ipv6": "fc02:1000::4/128",
             "state": "auto"
         },
-        "Ethernet16": {
+        "Ethernet12": {
             "server_ipv4": "192.168.0.5/32",
             "server_ipv6": "fc02:1000::5/128",
             "state": "auto"
         },
-        "Ethernet20": {
+        "Ethernet16": {
             "server_ipv4": "192.168.0.6/32",
             "server_ipv6": "fc02:1000::6/128",
             "state": "auto"
         },
-        "Ethernet24": {
+        "Ethernet20": {
             "server_ipv4": "192.168.0.7/32",
             "server_ipv6": "fc02:1000::7/128",
             "state": "auto"
         },
-        "Ethernet28": {
+        "Ethernet40": {
             "server_ipv4": "192.168.0.8/32",
             "server_ipv6": "fc02:1000::8/128",
             "state": "auto"
         },
-        "Ethernet32": {
+        "Ethernet44": {
             "server_ipv4": "192.168.0.9/32",
             "server_ipv6": "fc02:1000::9/128",
             "state": "auto"
         },
-        "Ethernet36": {
+        "Ethernet48": {
             "server_ipv4": "192.168.0.10/32",
             "server_ipv6": "fc02:1000::a/128",
             "state": "auto"
         },
-        "Ethernet40": {
+        "Ethernet52": {
             "server_ipv4": "192.168.0.11/32",
             "server_ipv6": "fc02:1000::b/128",
             "state": "auto"
         },
-        "Ethernet44": {
+        "Ethernet56": {
             "server_ipv4": "192.168.0.12/32",
             "server_ipv6": "fc02:1000::c/128",
             "state": "auto"
         },
-        "Ethernet48": {
+        "Ethernet60": {
             "server_ipv4": "192.168.0.13/32",
             "server_ipv6": "fc02:1000::d/128",
             "state": "auto"
         },
-        "Ethernet52": {
+        "Ethernet64": {
             "server_ipv4": "192.168.0.14/32",
             "server_ipv6": "fc02:1000::e/128",
             "state": "auto"
         },
-        "Ethernet56": {
+        "Ethernet68": {
             "server_ipv4": "192.168.0.15/32",
             "server_ipv6": "fc02:1000::f/128",
             "state": "auto"
         },
-        "Ethernet60": {
+        "Ethernet72": {
             "server_ipv4": "192.168.0.16/32",
             "server_ipv6": "fc02:1000::10/128",
             "state": "auto"
         },
-        "Ethernet64": {
+        "Ethernet76": {
             "server_ipv4": "192.168.0.17/32",
             "server_ipv6": "fc02:1000::11/128",
             "state": "auto"
         },
-        "Ethernet68": {
+        "Ethernet80": {
             "server_ipv4": "192.168.0.18/32",
             "server_ipv6": "fc02:1000::12/128",
             "state": "auto"
         },
-        "Ethernet72": {
+        "Ethernet84": {
             "server_ipv4": "192.168.0.19/32",
             "server_ipv6": "fc02:1000::13/128",
             "state": "auto"
         },
-        "Ethernet76": {
+        "Ethernet104": {
             "server_ipv4": "192.168.0.20/32",
             "server_ipv6": "fc02:1000::14/128",
             "state": "auto"
         },
-        "Ethernet80": {
+        "Ethernet108": {
             "server_ipv4": "192.168.0.21/32",
             "server_ipv6": "fc02:1000::15/128",
             "state": "auto"
         },
-        "Ethernet84": {
+        "Ethernet112": {
             "server_ipv4": "192.168.0.22/32",
             "server_ipv6": "fc02:1000::16/128",
             "state": "auto"
         },
-        "Ethernet88": {
+        "Ethernet116": {
             "server_ipv4": "192.168.0.23/32",
             "server_ipv6": "fc02:1000::17/128",
             "state": "auto"
         },
-        "Ethernet92": {
+        "Ethernet120": {
             "server_ipv4": "192.168.0.24/32",
             "server_ipv6": "fc02:1000::18/128",
             "state": "auto"
         },
-        "Ethernet96": {
+        "Ethernet124": {
             "server_ipv4": "192.168.0.25/32",
             "server_ipv6": "fc02:1000::19/128",
             "state": "auto"
-        },
-        "Ethernet100": {
-            "server_ipv4": "192.168.0.26/32",
-            "server_ipv6": "fc02:1000::1a/128",
-            "state": "auto"
-        },
-        "Ethernet104": {
-            "server_ipv4": "192.168.0.27/32",
-            "server_ipv6": "fc02:1000::1b/128",
-            "state": "auto"
-        },
-        "Ethernet108": {
-            "server_ipv4": "192.168.0.28/32",
-            "server_ipv6": "fc02:1000::1c/128",
-            "state": "auto"
-        },
-        "Ethernet112": {
-            "server_ipv4": "192.168.0.29/32",
-            "server_ipv6": "fc02:1000::1d/128",
-            "state": "auto"
-        },
-        "Ethernet116": {
-            "server_ipv4": "192.168.0.30/32",
-            "server_ipv6": "fc02:1000::1e/128",
-            "state": "auto"
-        },
-        "Ethernet120": {
-            "server_ipv4": "192.168.0.31/32",
-            "server_ipv6": "fc02:1000::1f/128",
-            "state": "auto"
-        },
-        "Ethernet124": {
-            "server_ipv4": "192.168.0.32/32",
-            "server_ipv6": "fc02:1000::20/128",
-            "state": "auto"
         }
     }
 }
diff --git a/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json
index ab8f2d0b05f0..44edd892ab91 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json
@@ -1,170 +1,403 @@
 {
     "DEVICE_METADATA": {
         "localhost": {
-            "hwsku": "Mellanox-SN2700",
-            "subtype": "DualToR"
+            "hwsku": "Arista-7050CX3-32S-D48C8",
+            "subtype": "DualToR",
+            "peer_switch": "peer_switch_hostname"
         }
     },
     "PORT": {
         "Ethernet0": {
-            "alias": "fortyGigE0/0",
-            "lanes": "29,30,31,32",
-            "admin_status": "up"
+            "lanes": "1,2",
+            "alias": "Ethernet1/1",
+            "index": "1",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet2": {
+            "lanes": "3,4",
+            "alias": "Ethernet1/3",
+            "index": "1",
+            "speed": "50000"
         },
         "Ethernet4": {
-            "alias": "fortyGigE0/4",
-            "lanes": "25,26,27,28",
-            "admin_status": "up"
+            "lanes": "5,6",
+            "alias": "Ethernet2/1",
+            "index": "2",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet6": {
+            "lanes": "7,8",
+            "alias": "Ethernet2/3",
+            "index": "2",
+            "speed": "50000"
         },
         "Ethernet8": {
-            "alias": "fortyGigE0/8",
-            "lanes": "37,38,39,40",
-            "admin_status": "up"
+            "lanes": "9,10",
+            "alias": "Ethernet3/1",
+            "index": "3",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet10": {
+            "lanes": "11,12",
+            "alias": "Ethernet3/3",
+            "index": "3",
+            "speed": "50000"
         },
         "Ethernet12": {
-            "alias": "fortyGigE0/12",
-            "lanes": "33,34,35,36",
-            "admin_status": "up"
+            "lanes": "13,14",
+            "alias": "Ethernet4/1",
+            "index": "4",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet14": {
+            "lanes": "15,16",
+            "alias": "Ethernet4/3",
+            "index": "4",
+            "speed": "50000"
         },
         "Ethernet16": {
-            "alias": "fortyGigE0/16",
-            "lanes": "41,42,43,44",
-            "admin_status": "up"
+            "lanes": "21,22",
+            "alias": "Ethernet5/1",
+            "index": "5",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet18": {
+            "lanes": "23,24",
+            "alias": "Ethernet5/3",
+            "index": "5",
+            "speed": "50000"
         },
         "Ethernet20": {
-            "alias": "fortyGigE0/20",
-            "lanes": "45,46,47,48",
-            "admin_status": "up"
+            "lanes": "17,18",
+            "alias": "Ethernet6/1",
+            "index": "6",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet22": {
+            "lanes": "19,20",
+            "alias": "Ethernet6/3",
+            "index": "6",
+            "speed": "50000"
         },
         "Ethernet24": {
-            "alias": "fortyGigE0/24",
-            "lanes": "5,6,7,8",
+            "lanes": "25,26,27,28",
+            "alias": "Ethernet7/1",
+            "index": "7",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet28": {
-            "alias": "fortyGigE0/28",
-            "lanes": "1,2,3,4",
+            "lanes": "29,30,31,32",
+            "alias": "Ethernet8/1",
+            "index": "8",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet32": {
-            "alias": "fortyGigE0/32",
-            "lanes": "9,10,11,12",
+            "lanes": "37,38,39,40",
+            "alias": "Ethernet9/1",
+            "index": "9",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet36": {
-            "alias": "fortyGigE0/36",
-            "lanes": "13,14,15,16",
+            "lanes": "33,34,35,36",
+            "alias": "Ethernet10/1",
+            "index": "10",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet40": {
-            "alias": "fortyGigE0/40",
-            "lanes": "21,22,23,24",
-            "admin_status": "up"
+            "lanes": "41,42",
+            "alias": "Ethernet11/1",
+            "index": "11",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet42": {
+            "lanes": "43,44",
+            "alias": "Ethernet11/3",
+            "index": "11",
+            "speed": "50000"
         },
         "Ethernet44": {
-            "alias": "fortyGigE0/44",
-            "lanes": "17,18,19,20",
-            "admin_status": "up"
+            "lanes": "45,46",
+            "alias": "Ethernet12/1",
+            "index": "12",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet46": {
+            "lanes": "47,48",
+            "alias": "Ethernet12/3",
+            "index": "12",
+            "speed": "50000"
         },
         "Ethernet48": {
-            "alias": "fortyGigE0/48",
-            "lanes": "49,50,51,52",
-            "admin_status": "up"
+            "lanes": "53,54",
+            "alias": "Ethernet13/1",
+            "index": "13",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet50": {
+            "lanes": "55,56",
+            "alias": "Ethernet13/3",
+            "index": "13",
+            "speed": "50000"
         },
         "Ethernet52": {
-            "alias": "fortyGigE0/52",
-            "lanes": "53,54,55,56",
-            "admin_status": "up"
+            "lanes": "49,50",
+            "alias": "Ethernet14/1",
+            "index": "14",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet54": {
+            "lanes": "51,52",
+            "alias": "Ethernet14/3",
+            "index": "14",
+            "speed": "50000"
         },
         "Ethernet56": {
-            "alias": "fortyGigE0/56",
-            "lanes": "61,62,63,64",
-            "admin_status": "up"
+            "lanes": "57,58",
+            "alias": "Ethernet15/1",
+            "index": "15",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet58": {
+            "lanes": "59,60",
+            "alias": "Ethernet15/3",
+            "index": "15",
+            "speed": "50000"
         },
         "Ethernet60": {
-            "alias": "fortyGigE0/60",
-            "lanes": "57,58,59,60",
-            "admin_status": "up"
+            "lanes": "61,62",
+            "alias": "Ethernet16/1",
+            "index": "16",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet62": {
+            "lanes": "63,64",
+            "alias": "Ethernet16/3",
+            "index": "16",
+            "speed": "50000"
         },
         "Ethernet64": {
-            "alias": "fortyGigE0/64",
-            "lanes": "65,66,67,68",
-            "admin_status": "up"
+            "lanes": "69,70",
+            "alias": "Ethernet17/1",
+            "index": "17",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet66": {
+            "lanes": "71,72",
+            "alias": "Ethernet17/3",
+            "index": "17",
+            "speed": "50000"
         },
         "Ethernet68": {
-            "alias": "fortyGigE0/68",
-            "lanes": "69,70,71,72",
-            "admin_status": "up"
+            "lanes": "65,66",
+            "alias": "Ethernet18/1",
+            "index": "18",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet70": {
+            "lanes": "67,68",
+            "alias": "Ethernet18/3",
+            "index": "18",
+            "speed": "50000"
         },
         "Ethernet72": {
-            "alias": "fortyGigE0/72",
-            "lanes": "77,78,79,80",
-            "admin_status": "up"
+            "lanes": "73,74",
+            "alias": "Ethernet19/1",
+            "index": "19",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet74": {
+            "lanes": "75,76",
+            "alias": "Ethernet19/3",
+            "index": "19",
+            "speed": "50000"
         },
         "Ethernet76": {
-            "alias": "fortyGigE0/76",
-            "lanes": "73,74,75,76",
-            "admin_status": "up"
+            "lanes": "77,78",
+            "alias": "Ethernet20/1",
+            "index": "20",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet78": {
+            "lanes": "79,80",
+            "alias": "Ethernet20/3",
+            "index": "20",
+            "speed": "50000"
         },
         "Ethernet80": {
-            "alias": "fortyGigE0/80",
-            "lanes": "105,106,107,108",
-            "admin_status": "up"
+            "lanes": "85,86",
+            "alias": "Ethernet21/1",
+            "index": "21",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet82": {
+            "lanes": "87,88",
+            "alias": "Ethernet21/3",
+            "index": "21",
+            "speed": "50000"
         },
         "Ethernet84": {
-            "alias": "fortyGigE0/84",
-            "lanes": "109,110,111,112",
-            "admin_status": "up"
+            "lanes": "81,82",
+            "alias": "Ethernet22/1",
+            "index": "22",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet86": {
+            "lanes": "83,84",
+            "alias": "Ethernet22/3",
+            "index": "22",
+            "speed": "50000"
         },
         "Ethernet88": {
-            "alias": "fortyGigE0/88",
-            "lanes": "117,118,119,120",
+            "lanes": "89,90,91,92",
+            "alias": "Ethernet23/1",
+            "index": "23",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet92": {
-            "alias": "fortyGigE0/92",
-            "lanes": "113,114,115,116",
+            "lanes": "93,94,95,96",
+            "alias": "Ethernet24/1",
+            "index": "24",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet96": {
-            "alias": "fortyGigE0/96",
-            "lanes": "121,122,123,124",
+            "lanes": "101,102,103,104",
+            "alias": "Ethernet25/1",
+            "index": "25",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet100": {
-            "alias": "fortyGigE0/100",
-            "lanes": "125,126,127,128",
+            "lanes": "97,98,99,100",
+            "alias": "Ethernet26/1",
+            "index": "26",
+            "speed": "100000",
             "admin_status": "up"
         },
         "Ethernet104": {
-            "alias": "fortyGigE0/104",
-            "lanes": "85,86,87,88",
-            "admin_status": "up"
+            "lanes": "105,106",
+            "alias": "Ethernet27/1",
+            "index": "27",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet106": {
+            "lanes": "107,108",
+            "alias": "Ethernet27/3",
+            "index": "27",
+            "speed": "50000"
         },
         "Ethernet108": {
-            "alias": "fortyGigE0/108",
-            "lanes": "81,82,83,84",
-            "admin_status": "up"
+            "lanes": "109,110",
+            "alias": "Ethernet28/1",
+            "index": "28",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet110": {
+            "lanes": "111,112",
+            "alias": "Ethernet28/3",
+            "index": "28",
+            "speed": "50000"
         },
         "Ethernet112": {
-            "alias": "fortyGigE0/112",
-            "lanes": "89,90,91,92",
-            "admin_status": "up"
+            "lanes": "117,118",
+            "alias": "Ethernet29/1",
+            "index": "29",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet114": {
+            "lanes": "119,120",
+            "alias": "Ethernet29/3",
+            "index": "29",
+            "speed": "50000"
         },
         "Ethernet116": {
-            "alias": "fortyGigE0/116",
-            "lanes": "93,94,95,96",
-            "admin_status": "up"
+            "lanes": "113,114",
+            "alias": "Ethernet30/1",
+            "index": "30",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet118": {
+            "lanes": "115,116",
+            "alias": "Ethernet30/3",
+            "index": "30",
+            "speed": "50000"
         },
         "Ethernet120": {
-            "alias": "fortyGigE0/120",
-            "lanes": "97,98,99,100",
-            "admin_status": "up"
+            "lanes": "121,122",
+            "alias": "Ethernet31/1",
+            "index": "31",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet122": {
+            "lanes": "123,124",
+            "alias": "Ethernet31/3",
+            "index": "31",
+            "speed": "50000"
         },
         "Ethernet124": {
-            "alias": "fortyGigE0/124",
-            "lanes": "101,102,103,104",
-            "admin_status": "up"
+            "lanes": "125,126",
+            "alias": "Ethernet32/1",
+            "index": "32",
+            "speed": "50000",
+            "admin_status": "up",
+            "mux_cable": "true"
+        },
+        "Ethernet126": {
+            "lanes": "127,128",
+            "alias": "Ethernet32/3",
+            "index": "32",
+            "speed": "50000"
         }
     },
     "VLAN": {
@@ -289,166 +522,126 @@
         "Loopback2": {},
         "Loopback2|3.3.3.3": {}
     },
-    "MUX_CABLE":{
+    "MUX_CABLE": {
         "Ethernet0": {
-            "server_ipv4": "192.168.0.1/32",
-            "server_ipv6": "fc02:1000::1/128",
-            "state": "auto"
-        },
-        "Ethernet4": {
             "server_ipv4": "192.168.0.2/32",
             "server_ipv6": "fc02:1000::2/128",
             "state": "auto"
         },
-        "Ethernet8": {
+        "Ethernet4": {
             "server_ipv4": "192.168.0.3/32",
             "server_ipv6": "fc02:1000::3/128",
             "state": "auto"
         },
-        "Ethernet12": {
+        "Ethernet8": {
             "server_ipv4": "192.168.0.4/32",
             "server_ipv6": "fc02:1000::4/128",
             "state": "auto"
         },
-        "Ethernet16": {
+        "Ethernet12": {
             "server_ipv4": "192.168.0.5/32",
             "server_ipv6": "fc02:1000::5/128",
             "state": "auto"
         },
-        "Ethernet20": {
+        "Ethernet16": {
             "server_ipv4": "192.168.0.6/32",
             "server_ipv6": "fc02:1000::6/128",
             "state": "auto"
         },
-        "Ethernet24": {
+        "Ethernet20": {
             "server_ipv4": "192.168.0.7/32",
             "server_ipv6": "fc02:1000::7/128",
             "state": "auto"
         },
-        "Ethernet28": {
+        "Ethernet40": {
             "server_ipv4": "192.168.0.8/32",
             "server_ipv6": "fc02:1000::8/128",
             "state": "auto"
         },
-        "Ethernet32": {
+        "Ethernet44": {
             "server_ipv4": "192.168.0.9/32",
             "server_ipv6": "fc02:1000::9/128",
             "state": "auto"
         },
-        "Ethernet36": {
+        "Ethernet48": {
             "server_ipv4": "192.168.0.10/32",
             "server_ipv6": "fc02:1000::a/128",
             "state": "auto"
         },
-        "Ethernet40": {
+        "Ethernet52": {
             "server_ipv4": "192.168.0.11/32",
             "server_ipv6": "fc02:1000::b/128",
             "state": "auto"
         },
-        "Ethernet44": {
+        "Ethernet56": {
             "server_ipv4": "192.168.0.12/32",
             "server_ipv6": "fc02:1000::c/128",
             "state": "auto"
         },
-        "Ethernet48": {
+        "Ethernet60": {
             "server_ipv4": "192.168.0.13/32",
             "server_ipv6": "fc02:1000::d/128",
             "state": "auto"
         },
-        "Ethernet52": {
+        "Ethernet64": {
             "server_ipv4": "192.168.0.14/32",
             "server_ipv6": "fc02:1000::e/128",
             "state": "auto"
         },
-        "Ethernet56": {
+        "Ethernet68": {
             "server_ipv4": "192.168.0.15/32",
             "server_ipv6": "fc02:1000::f/128",
             "state": "auto"
         },
-        "Ethernet60": {
+        "Ethernet72": {
             "server_ipv4": "192.168.0.16/32",
             "server_ipv6": "fc02:1000::10/128",
             "state": "auto"
         },
-        "Ethernet64": {
+        "Ethernet76": {
             "server_ipv4": "192.168.0.17/32",
             "server_ipv6": "fc02:1000::11/128",
             "state": "auto"
         },
-        "Ethernet68": {
+        "Ethernet80": {
             "server_ipv4": "192.168.0.18/32",
             "server_ipv6": "fc02:1000::12/128",
             "state": "auto"
         },
-        "Ethernet72": {
+        "Ethernet84": {
             "server_ipv4": "192.168.0.19/32",
             "server_ipv6": "fc02:1000::13/128",
             "state": "auto"
         },
-        "Ethernet76": {
+        "Ethernet104": {
             "server_ipv4": "192.168.0.20/32",
             "server_ipv6": "fc02:1000::14/128",
             "state": "auto"
         },
-        "Ethernet80": {
+        "Ethernet108": {
             "server_ipv4": "192.168.0.21/32",
             "server_ipv6": "fc02:1000::15/128",
             "state": "auto"
         },
-        "Ethernet84": {
+        "Ethernet112": {
             "server_ipv4": "192.168.0.22/32",
             "server_ipv6": "fc02:1000::16/128",
             "state": "auto"
         },
-        "Ethernet88": {
+        "Ethernet116": {
             "server_ipv4": "192.168.0.23/32",
             "server_ipv6": "fc02:1000::17/128",
             "state": "auto"
         },
-        "Ethernet92": {
+        "Ethernet120": {
             "server_ipv4": "192.168.0.24/32",
             "server_ipv6": "fc02:1000::18/128",
             "state": "auto"
         },
-        "Ethernet96": {
+        "Ethernet124": {
             "server_ipv4": "192.168.0.25/32",
             "server_ipv6": "fc02:1000::19/128",
             "state": "auto"
-        },
-        "Ethernet100": {
-            "server_ipv4": "192.168.0.26/32",
-            "server_ipv6": "fc02:1000::1a/128",
-            "state": "auto"
-        },
-        "Ethernet104": {
-            "server_ipv4": "192.168.0.27/32",
-            "server_ipv6": "fc02:1000::1b/128",
-            "state": "auto"
-        },
-        "Ethernet108": {
-            "server_ipv4": "192.168.0.28/32",
-            "server_ipv6": "fc02:1000::1c/128",
-            "state": "auto"
-        },
-        "Ethernet112": {
-            "server_ipv4": "192.168.0.29/32",
-            "server_ipv6": "fc02:1000::1d/128",
-            "state": "auto"
-        },
-        "Ethernet116": {
-            "server_ipv4": "192.168.0.30/32",
-            "server_ipv6": "fc02:1000::1e/128",
-            "state": "auto"
-        },
-        "Ethernet120": {
-            "server_ipv4": "192.168.0.31/32",
-            "server_ipv6": "fc02:1000::1f/128",
-            "state": "auto"
-        },
-        "Ethernet124": {
-            "server_ipv4": "192.168.0.32/32",
-            "server_ipv6": "fc02:1000::20/128",
-            "state": "auto"
         }
     }
 }
diff --git a/src/sonic-config-engine/tests/t0_7050cx3_d48c8_port_config.ini b/src/sonic-config-engine/tests/t0_7050cx3_d48c8_port_config.ini
new file mode 100644
index 000000000000..485905d9fcde
--- /dev/null
+++ b/src/sonic-config-engine/tests/t0_7050cx3_d48c8_port_config.ini
@@ -0,0 +1,57 @@
+# name          lanes             alias         index  speed
+Ethernet0       1,2               Ethernet1/1   1      50000
+Ethernet2       3,4               Ethernet1/3   1      50000
+Ethernet4       5,6               Ethernet2/1   2      50000
+Ethernet6       7,8               Ethernet2/3   2      50000
+Ethernet8       9,10              Ethernet3/1   3      50000
+Ethernet10      11,12             Ethernet3/3   3      50000
+Ethernet12      13,14             Ethernet4/1   4      50000
+Ethernet14      15,16             Ethernet4/3   4      50000
+Ethernet16      21,22             Ethernet5/1   5      50000
+Ethernet18      23,24             Ethernet5/3   5      50000
+Ethernet20      17,18             Ethernet6/1   6      50000
+Ethernet22      19,20             Ethernet6/3   6      50000
+Ethernet24      25,26,27,28       Ethernet7/1   7      100000
+Ethernet28      29,30,31,32       Ethernet8/1   8      100000
+Ethernet32      37,38,39,40       Ethernet9/1   9      100000
+Ethernet36      33,34,35,36       Ethernet10/1  10     100000
+Ethernet40      41,42             Ethernet11/1  11     50000
+Ethernet42      43,44             Ethernet11/3  11     50000
+Ethernet44      45,46             Ethernet12/1  12     50000
+Ethernet46      47,48             Ethernet12/3  12     50000
+Ethernet48      53,54             Ethernet13/1  13     50000
+Ethernet50      55,56             Ethernet13/3  13     50000
+Ethernet52      49,50             Ethernet14/1  14     50000
+Ethernet54      51,52             Ethernet14/3  14     50000
+Ethernet56      57,58             Ethernet15/1  15     50000
+Ethernet58      59,60             Ethernet15/3  15     50000
+Ethernet60      61,62             Ethernet16/1  16     50000
+Ethernet62      63,64             Ethernet16/3  16     50000
+Ethernet64      69,70             Ethernet17/1  17     50000
+Ethernet66      71,72             Ethernet17/3  17     50000
+Ethernet68      65,66             Ethernet18/1  18     50000
+Ethernet70      67,68             Ethernet18/3  18     50000
+Ethernet72      73,74             Ethernet19/1  19     50000
+Ethernet74      75,76             Ethernet19/3  19     50000
+Ethernet76      77,78             Ethernet20/1  20     50000
+Ethernet78      79,80             Ethernet20/3  20     50000
+Ethernet80      85,86             Ethernet21/1  21     50000
+Ethernet82      87,88             Ethernet21/3  21     50000
+Ethernet84      81,82             Ethernet22/1  22     50000
+Ethernet86      83,84             Ethernet22/3  22     50000
+Ethernet88      89,90,91,92       Ethernet23/1  23     100000
+Ethernet92      93,94,95,96       Ethernet24/1  24     100000
+Ethernet96      101,102,103,104   Ethernet25/1  25     100000
+Ethernet100     97,98,99,100      Ethernet26/1  26     100000
+Ethernet104     105,106           Ethernet27/1  27     50000
+Ethernet106     107,108           Ethernet27/3  27     50000
+Ethernet108     109,110           Ethernet28/1  28     50000
+Ethernet110     111,112           Ethernet28/3  28     50000
+Ethernet112     117,118           Ethernet29/1  29     50000
+Ethernet114     119,120           Ethernet29/3  29     50000
+Ethernet116     113,114           Ethernet30/1  30     50000
+Ethernet118     115,116           Ethernet30/3  30     50000
+Ethernet120     121,122           Ethernet31/1  31     50000
+Ethernet122     123,124           Ethernet31/3  31     50000
+Ethernet124     125,126           Ethernet32/1  32     50000
+Ethernet126     127,128           Ethernet32/3  32     50000
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 3c4e1b629e7d..8a6fdf5c3934 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -17,6 +17,7 @@ def setUp(self):
         self.t0_mvrf_minigraph = os.path.join(self.test_dir, 't0-sample-graph-mvrf.xml')
         self.pc_minigraph = os.path.join(self.test_dir, 'pc-test-graph.xml')
         self.t0_port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
+        self.t0_7050cx3_port_config = os.path.join(self.test_dir, 't0_7050cx3_d48c8_port_config.ini')
         self.t1_mlnx_minigraph = os.path.join(self.test_dir, 't1-sample-graph-mlnx.xml')
         self.mlnx_port_config = os.path.join(self.test_dir, 'sample-port-config-mlnx.ini')
         self.dell6100_t0_minigraph = os.path.join(self.test_dir, 'sample-dell-6100-t0-minigraph.xml')
@@ -133,7 +134,24 @@ def test_l2switch_template(self):
         self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
 
     def test_l2switch_template_dualtor(self):
-        argument = '-a \'{"is_dualtor": true}\' -k Mellanox-SN2700 --preset l2 -p ' + self.t0_port_config
+        extra_args = {
+            "is_dualtor": True,
+            "uplinks": [
+                "Ethernet24", "Ethernet28", "Ethernet32", "Ethernet36",
+                "Ethernet88", "Ethernet92", "Ethernet96", "Ethernet100"
+            ],
+            "downlinks": [
+                "Ethernet0", "Ethernet4", "Ethernet8", "Ethernet12",
+                "Ethernet16", "Ethernet20", "Ethernet40", "Ethernet44",
+                "Ethernet48", "Ethernet52", "Ethernet56", "Ethernet60",
+                "Ethernet64", "Ethernet68", "Ethernet72", "Ethernet76",
+                "Ethernet80", "Ethernet84", "Ethernet104", "Ethernet108",
+                "Ethernet112", "Ethernet116", "Ethernet120", "Ethernet124"
+            ]
+        }
+        argument = '-a \'{}\' -k Arista-7050CX3-32S-D48C8 --preset l2 -p {}'.format(
+            json.dumps(extra_args), self.t0_7050cx3_port_config
+        )
         output = self.run_script(argument)
         output_json = json.loads(output)
 

From fac5e204c49a1643ba7b0ff84e7451dc3d292b76 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 31 Mar 2021 14:23:24 -0700
Subject: [PATCH 0363/1674] 7260cx3 DualToR config.bcm support based on DualToR
 setting in device metadata at boot time (#7168)

* 7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time.
For HWSKU Arista-7260CX3-C64 the MMU setting SOC for T0/T1 is also combined into the config.bcm.j2 logic so use just one config file and adding delta based on Switch Roles.
---
 ...64-64x100G-t0.config.bcm => config.bcm.j2} |   24 +-
 .../Arista-7260CX3-C64/sai.profile            |    2 +
 .../Arista-7260CX3-C64/sai.profile.j2         |   14 -
 .../th2-a7260cx3-64-64x100G-t1.config.bcm     | 1015 -----------------
 ...12x50G+8x100G.config.bcm => config.bcm.j2} |   12 +
 .../Arista-7260CX3-D108C8/sai.profile         |    2 +-
 ...cx3-64-64x40G.config.bcm => config.bcm.j2} |   12 +
 .../Arista-7260CX3-Q64/sai.profile            |    2 +-
 platform/broadcom/docker-syncd-brcm/start.sh  |   12 +
 9 files changed, 63 insertions(+), 1032 deletions(-)
 rename device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/{th2-a7260cx3-64-64x100G-t0.config.bcm => config.bcm.j2} (97%)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm
 rename device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/{th2-a7260cx3-64-112x50G+8x100G.config.bcm => config.bcm.j2} (98%)
 rename device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/{th2-a7260cx3-64-64x40G.config.bcm => config.bcm.j2} (98%)

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
similarity index 97%
rename from device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm
rename to device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index faeeb4bb1ea5..3676e5e84b68 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -1,3 +1,24 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
+{%- set IPinIP_sock = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
+{%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
+{%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-         if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%-             set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
+{%-         endif %}
+{%-     endif %}
+{%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-         if 'dualtor' in switch_subtype.lower() %}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
+{%-         endif %}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
+
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
@@ -1012,4 +1033,5 @@ serdes_preemphasis_115=0x184606
 serdes_preemphasis_116=0x103706
 serdes_preemphasis_117=0x133c06
 
-mmu_init_config="MSFT-TH2-Tier0"
+{{ mmu_sock }}
+{{ IPinIP_sock }}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
new file mode 100644
index 000000000000..5163d6140f0e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
+SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
deleted file mode 100644
index 403c797a47f5..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-{# Get sai.profile based on switch_role #}
-{%- if DEVICE_METADATA is defined -%}
-{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
-{%-     if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
-{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t0.config.bcm' -%}
-{%-     else %}
-{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
-{%-     endif %}
-{%- else %}
-{%      set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
-{%- endif %}
-{# Write the contents of sai_ profile_filename to sai.profile file #}
-{{ sai_profile_contents }}
-SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm
deleted file mode 100644
index 96fa6f32d633..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t1.config.bcm
+++ /dev/null
@@ -1,1015 +0,0 @@
-PHY_AN_ALLOW_PLL_CHANGE=1
-arl_clean_timeout_usec=15000000
-asf_mem_profile=2
-bcm_num_cos=10
-bcm_stat_flags=1
-bcm_stat_jumbo=9236
-cdma_timeout_usec=15000000
-core_clock_frequency=1700
-dma_desc_timeout_usec=15000000
-dpp_clock_ratio=2:3
-higig2_hdr_mode=1
-ipv6_lpm_128b_enable=1
-l3_alpm_enable=2
-lpm_scaling_enable=0
-l2xmsg_mode=1
-max_vp_lags=0
-mem_scan_enable=1
-miim_intr_enable=0
-module_64ports=1
-os=unix
-oversubscribe_mode=1
-pbmp_xport_xe=0x40003ffff0000ffffc0003fffe0001fffe
-phy_an_allow_pll_change_hg=0
-phy_an_c73_100=1
-phy_an_c73_102=1
-phy_an_c73_103=1
-phy_an_c73_104=1
-phy_an_c73_105=1
-phy_an_c73_106=1
-phy_an_c73_107=1
-phy_an_c73_108=1
-phy_an_c73_109=1
-phy_an_c73_10=1
-phy_an_c73_110=1
-phy_an_c73_111=1
-phy_an_c73_112=1
-phy_an_c73_113=1
-phy_an_c73_114=1
-phy_an_c73_115=1
-phy_an_c73_116=1
-phy_an_c73_117=1
-phy_an_c73_11=1
-phy_an_c73_12=1
-phy_an_c73_13=1
-phy_an_c73_14=1
-phy_an_c73_15=1
-phy_an_c73_16=1
-phy_an_c73_1=1
-phy_an_c73_2=1
-phy_an_c73_34=1
-phy_an_c73_35=1
-phy_an_c73_36=1
-phy_an_c73_37=1
-phy_an_c73_38=1
-phy_an_c73_39=1
-phy_an_c73_3=1
-phy_an_c73_40=1
-phy_an_c73_41=1
-phy_an_c73_42=1
-phy_an_c73_43=1
-phy_an_c73_44=1
-phy_an_c73_45=1
-phy_an_c73_46=1
-phy_an_c73_47=1
-phy_an_c73_48=1
-phy_an_c73_49=1
-phy_an_c73_4=1
-phy_an_c73_5=1
-phy_an_c73_66=1
-phy_an_c73_68=1
-phy_an_c73_69=1
-phy_an_c73_6=1
-phy_an_c73_70=1
-phy_an_c73_71=1
-phy_an_c73_72=1
-phy_an_c73_73=1
-phy_an_c73_74=1
-phy_an_c73_75=1
-phy_an_c73_76=1
-phy_an_c73_77=1
-phy_an_c73_78=1
-phy_an_c73_79=1
-phy_an_c73_7=1
-phy_an_c73_80=1
-phy_an_c73_81=1
-phy_an_c73_82=1
-phy_an_c73_83=1
-phy_an_c73_8=1
-phy_an_c73_9=1
-phy_chain_rx_lane_map_physical{1.0}=0x3210
-phy_chain_rx_lane_map_physical{101.0}=0x0123
-phy_chain_rx_lane_map_physical{105.0}=0x0123
-phy_chain_rx_lane_map_physical{109.0}=0x0123
-phy_chain_rx_lane_map_physical{113.0}=0x2301
-phy_chain_rx_lane_map_physical{117.0}=0x3210
-phy_chain_rx_lane_map_physical{121.0}=0x3210
-phy_chain_rx_lane_map_physical{125.0}=0x1203
-phy_chain_rx_lane_map_physical{129.0}=0x3210
-phy_chain_rx_lane_map_physical{13.0}=0x0321
-phy_chain_rx_lane_map_physical{133.0}=0x1032
-phy_chain_rx_lane_map_physical{137.0}=0x3210
-phy_chain_rx_lane_map_physical{141.0}=0x0123
-phy_chain_rx_lane_map_physical{145.0}=0x3210
-phy_chain_rx_lane_map_physical{149.0}=0x2310
-phy_chain_rx_lane_map_physical{153.0}=0x0132
-phy_chain_rx_lane_map_physical{157.0}=0x1302
-phy_chain_rx_lane_map_physical{161.0}=0x3021
-phy_chain_rx_lane_map_physical{165.0}=0x2031
-phy_chain_rx_lane_map_physical{169.0}=0x2031
-phy_chain_rx_lane_map_physical{17.0}=0x3210
-phy_chain_rx_lane_map_physical{173.0}=0x1302
-phy_chain_rx_lane_map_physical{177.0}=0x2031
-phy_chain_rx_lane_map_physical{181.0}=0x0213
-phy_chain_rx_lane_map_physical{185.0}=0x0213
-phy_chain_rx_lane_map_physical{189.0}=0x1302
-phy_chain_rx_lane_map_physical{193.0}=0x3120
-phy_chain_rx_lane_map_physical{197.0}=0x0231
-phy_chain_rx_lane_map_physical{201.0}=0x2031
-phy_chain_rx_lane_map_physical{205.0}=0x0213
-phy_chain_rx_lane_map_physical{209.0}=0x2013
-phy_chain_rx_lane_map_physical{21.0}=0x3021
-phy_chain_rx_lane_map_physical{213.0}=0x3021
-phy_chain_rx_lane_map_physical{217.0}=0x0231
-phy_chain_rx_lane_map_physical{221.0}=0x2031
-phy_chain_rx_lane_map_physical{225.0}=0x1203
-phy_chain_rx_lane_map_physical{229.0}=0x1230
-phy_chain_rx_lane_map_physical{233.0}=0x3021
-phy_chain_rx_lane_map_physical{237.0}=0x1032
-phy_chain_rx_lane_map_physical{241.0}=0x2301
-phy_chain_rx_lane_map_physical{245.0}=0x0321
-phy_chain_rx_lane_map_physical{249.0}=0x2301
-phy_chain_rx_lane_map_physical{25.0}=0x2301
-phy_chain_rx_lane_map_physical{253.0}=0x2301
-phy_chain_rx_lane_map_physical{257.0}=0x3210
-phy_chain_rx_lane_map_physical{29.0}=0x3021
-phy_chain_rx_lane_map_physical{33.0}=0x1302
-phy_chain_rx_lane_map_physical{37.0}=0x2031
-phy_chain_rx_lane_map_physical{41.0}=0x3021
-phy_chain_rx_lane_map_physical{45.0}=0x1023
-phy_chain_rx_lane_map_physical{49.0}=0x0213
-phy_chain_rx_lane_map_physical{5.0}=0x3201
-phy_chain_rx_lane_map_physical{53.0}=0x3201
-phy_chain_rx_lane_map_physical{57.0}=0x2013
-phy_chain_rx_lane_map_physical{61.0}=0x0213
-phy_chain_rx_lane_map_physical{65.0}=0x1203
-phy_chain_rx_lane_map_physical{69.0}=0x0213
-phy_chain_rx_lane_map_physical{73.0}=0x0213
-phy_chain_rx_lane_map_physical{77.0}=0x3120
-phy_chain_rx_lane_map_physical{81.0}=0x0213
-phy_chain_rx_lane_map_physical{85.0}=0x2031
-phy_chain_rx_lane_map_physical{89.0}=0x2031
-phy_chain_rx_lane_map_physical{9.0}=0x0321
-phy_chain_rx_lane_map_physical{93.0}=0x3120
-phy_chain_rx_lane_map_physical{97.0}=0x1203
-phy_chain_rx_polarity_flip_physical{1.0}=0x1
-phy_chain_rx_polarity_flip_physical{10.0}=0x0
-phy_chain_rx_polarity_flip_physical{100.0}=0x1
-phy_chain_rx_polarity_flip_physical{101.0}=0x1
-phy_chain_rx_polarity_flip_physical{102.0}=0x0
-phy_chain_rx_polarity_flip_physical{103.0}=0x1
-phy_chain_rx_polarity_flip_physical{104.0}=0x0
-phy_chain_rx_polarity_flip_physical{105.0}=0x1
-phy_chain_rx_polarity_flip_physical{106.0}=0x0
-phy_chain_rx_polarity_flip_physical{107.0}=0x1
-phy_chain_rx_polarity_flip_physical{108.0}=0x0
-phy_chain_rx_polarity_flip_physical{109.0}=0x0
-phy_chain_rx_polarity_flip_physical{11.0}=0x1
-phy_chain_rx_polarity_flip_physical{110.0}=0x1
-phy_chain_rx_polarity_flip_physical{111.0}=0x0
-phy_chain_rx_polarity_flip_physical{112.0}=0x1
-phy_chain_rx_polarity_flip_physical{113.0}=0x1
-phy_chain_rx_polarity_flip_physical{114.0}=0x0
-phy_chain_rx_polarity_flip_physical{115.0}=0x1
-phy_chain_rx_polarity_flip_physical{116.0}=0x0
-phy_chain_rx_polarity_flip_physical{117.0}=0x0
-phy_chain_rx_polarity_flip_physical{118.0}=0x0
-phy_chain_rx_polarity_flip_physical{119.0}=0x1
-phy_chain_rx_polarity_flip_physical{12.0}=0x1
-phy_chain_rx_polarity_flip_physical{120.0}=0x0
-phy_chain_rx_polarity_flip_physical{121.0}=0x1
-phy_chain_rx_polarity_flip_physical{122.0}=0x0
-phy_chain_rx_polarity_flip_physical{123.0}=0x1
-phy_chain_rx_polarity_flip_physical{124.0}=0x0
-phy_chain_rx_polarity_flip_physical{125.0}=0x0
-phy_chain_rx_polarity_flip_physical{126.0}=0x1
-phy_chain_rx_polarity_flip_physical{127.0}=0x1
-phy_chain_rx_polarity_flip_physical{128.0}=0x1
-phy_chain_rx_polarity_flip_physical{129.0}=0x0
-phy_chain_rx_polarity_flip_physical{13.0}=0x1
-phy_chain_rx_polarity_flip_physical{130.0}=0x1
-phy_chain_rx_polarity_flip_physical{131.0}=0x1
-phy_chain_rx_polarity_flip_physical{132.0}=0x0
-phy_chain_rx_polarity_flip_physical{133.0}=0x1
-phy_chain_rx_polarity_flip_physical{134.0}=0x1
-phy_chain_rx_polarity_flip_physical{135.0}=0x1
-phy_chain_rx_polarity_flip_physical{136.0}=0x0
-phy_chain_rx_polarity_flip_physical{137.0}=0x0
-phy_chain_rx_polarity_flip_physical{138.0}=0x0
-phy_chain_rx_polarity_flip_physical{139.0}=0x1
-phy_chain_rx_polarity_flip_physical{14.0}=0x0
-phy_chain_rx_polarity_flip_physical{140.0}=0x0
-phy_chain_rx_polarity_flip_physical{141.0}=0x1
-phy_chain_rx_polarity_flip_physical{142.0}=0x0
-phy_chain_rx_polarity_flip_physical{143.0}=0x1
-phy_chain_rx_polarity_flip_physical{144.0}=0x0
-phy_chain_rx_polarity_flip_physical{145.0}=0x1
-phy_chain_rx_polarity_flip_physical{146.0}=0x0
-phy_chain_rx_polarity_flip_physical{147.0}=0x1
-phy_chain_rx_polarity_flip_physical{148.0}=0x0
-phy_chain_rx_polarity_flip_physical{149.0}=0x0
-phy_chain_rx_polarity_flip_physical{15.0}=0x1
-phy_chain_rx_polarity_flip_physical{150.0}=0x1
-phy_chain_rx_polarity_flip_physical{151.0}=0x1
-phy_chain_rx_polarity_flip_physical{152.0}=0x0
-phy_chain_rx_polarity_flip_physical{153.0}=0x0
-phy_chain_rx_polarity_flip_physical{154.0}=0x1
-phy_chain_rx_polarity_flip_physical{155.0}=0x1
-phy_chain_rx_polarity_flip_physical{156.0}=0x0
-phy_chain_rx_polarity_flip_physical{157.0}=0x0
-phy_chain_rx_polarity_flip_physical{158.0}=0x0
-phy_chain_rx_polarity_flip_physical{159.0}=0x1
-phy_chain_rx_polarity_flip_physical{16.0}=0x0
-phy_chain_rx_polarity_flip_physical{160.0}=0x0
-phy_chain_rx_polarity_flip_physical{161.0}=0x1
-phy_chain_rx_polarity_flip_physical{162.0}=0x1
-phy_chain_rx_polarity_flip_physical{163.0}=0x0
-phy_chain_rx_polarity_flip_physical{164.0}=0x1
-phy_chain_rx_polarity_flip_physical{165.0}=0x0
-phy_chain_rx_polarity_flip_physical{166.0}=0x0
-phy_chain_rx_polarity_flip_physical{167.0}=0x1
-phy_chain_rx_polarity_flip_physical{168.0}=0x1
-phy_chain_rx_polarity_flip_physical{169.0}=0x1
-phy_chain_rx_polarity_flip_physical{17.0}=0x1
-phy_chain_rx_polarity_flip_physical{170.0}=0x1
-phy_chain_rx_polarity_flip_physical{171.0}=0x0
-phy_chain_rx_polarity_flip_physical{172.0}=0x0
-phy_chain_rx_polarity_flip_physical{173.0}=0x0
-phy_chain_rx_polarity_flip_physical{174.0}=0x0
-phy_chain_rx_polarity_flip_physical{175.0}=0x1
-phy_chain_rx_polarity_flip_physical{176.0}=0x1
-phy_chain_rx_polarity_flip_physical{177.0}=0x1
-phy_chain_rx_polarity_flip_physical{178.0}=0x1
-phy_chain_rx_polarity_flip_physical{179.0}=0x0
-phy_chain_rx_polarity_flip_physical{18.0}=0x0
-phy_chain_rx_polarity_flip_physical{180.0}=0x0
-phy_chain_rx_polarity_flip_physical{181.0}=0x1
-phy_chain_rx_polarity_flip_physical{182.0}=0x1
-phy_chain_rx_polarity_flip_physical{183.0}=0x0
-phy_chain_rx_polarity_flip_physical{184.0}=0x0
-phy_chain_rx_polarity_flip_physical{185.0}=0x0
-phy_chain_rx_polarity_flip_physical{186.0}=0x0
-phy_chain_rx_polarity_flip_physical{187.0}=0x1
-phy_chain_rx_polarity_flip_physical{188.0}=0x1
-phy_chain_rx_polarity_flip_physical{189.0}=0x0
-phy_chain_rx_polarity_flip_physical{19.0}=0x1
-phy_chain_rx_polarity_flip_physical{190.0}=0x0
-phy_chain_rx_polarity_flip_physical{191.0}=0x1
-phy_chain_rx_polarity_flip_physical{192.0}=0x0
-phy_chain_rx_polarity_flip_physical{193.0}=0x0
-phy_chain_rx_polarity_flip_physical{194.0}=0x0
-phy_chain_rx_polarity_flip_physical{195.0}=0x1
-phy_chain_rx_polarity_flip_physical{196.0}=0x1
-phy_chain_rx_polarity_flip_physical{197.0}=0x1
-phy_chain_rx_polarity_flip_physical{198.0}=0x1
-phy_chain_rx_polarity_flip_physical{199.0}=0x0
-phy_chain_rx_polarity_flip_physical{2.0}=0x0
-phy_chain_rx_polarity_flip_physical{20.0}=0x0
-phy_chain_rx_polarity_flip_physical{200.0}=0x0
-phy_chain_rx_polarity_flip_physical{201.0}=0x0
-phy_chain_rx_polarity_flip_physical{202.0}=0x0
-phy_chain_rx_polarity_flip_physical{203.0}=0x1
-phy_chain_rx_polarity_flip_physical{204.0}=0x0
-phy_chain_rx_polarity_flip_physical{205.0}=0x1
-phy_chain_rx_polarity_flip_physical{206.0}=0x1
-phy_chain_rx_polarity_flip_physical{207.0}=0x0
-phy_chain_rx_polarity_flip_physical{208.0}=0x0
-phy_chain_rx_polarity_flip_physical{209.0}=0x1
-phy_chain_rx_polarity_flip_physical{21.0}=0x0
-phy_chain_rx_polarity_flip_physical{210.0}=0x1
-phy_chain_rx_polarity_flip_physical{211.0}=0x0
-phy_chain_rx_polarity_flip_physical{212.0}=0x0
-phy_chain_rx_polarity_flip_physical{213.0}=0x0
-phy_chain_rx_polarity_flip_physical{214.0}=0x0
-phy_chain_rx_polarity_flip_physical{215.0}=0x1
-phy_chain_rx_polarity_flip_physical{216.0}=0x0
-phy_chain_rx_polarity_flip_physical{217.0}=0x0
-phy_chain_rx_polarity_flip_physical{218.0}=0x0
-phy_chain_rx_polarity_flip_physical{219.0}=0x1
-phy_chain_rx_polarity_flip_physical{22.0}=0x0
-phy_chain_rx_polarity_flip_physical{220.0}=0x1
-phy_chain_rx_polarity_flip_physical{221.0}=0x0
-phy_chain_rx_polarity_flip_physical{222.0}=0x0
-phy_chain_rx_polarity_flip_physical{223.0}=0x1
-phy_chain_rx_polarity_flip_physical{224.0}=0x1
-phy_chain_rx_polarity_flip_physical{225.0}=0x1
-phy_chain_rx_polarity_flip_physical{226.0}=0x0
-phy_chain_rx_polarity_flip_physical{227.0}=0x0
-phy_chain_rx_polarity_flip_physical{228.0}=0x1
-phy_chain_rx_polarity_flip_physical{229.0}=0x0
-phy_chain_rx_polarity_flip_physical{23.0}=0x1
-phy_chain_rx_polarity_flip_physical{230.0}=0x0
-phy_chain_rx_polarity_flip_physical{231.0}=0x1
-phy_chain_rx_polarity_flip_physical{232.0}=0x1
-phy_chain_rx_polarity_flip_physical{233.0}=0x1
-phy_chain_rx_polarity_flip_physical{234.0}=0x0
-phy_chain_rx_polarity_flip_physical{235.0}=0x0
-phy_chain_rx_polarity_flip_physical{236.0}=0x0
-phy_chain_rx_polarity_flip_physical{237.0}=0x1
-phy_chain_rx_polarity_flip_physical{238.0}=0x0
-phy_chain_rx_polarity_flip_physical{239.0}=0x1
-phy_chain_rx_polarity_flip_physical{24.0}=0x0
-phy_chain_rx_polarity_flip_physical{240.0}=0x0
-phy_chain_rx_polarity_flip_physical{241.0}=0x1
-phy_chain_rx_polarity_flip_physical{242.0}=0x0
-phy_chain_rx_polarity_flip_physical{243.0}=0x1
-phy_chain_rx_polarity_flip_physical{244.0}=0x0
-phy_chain_rx_polarity_flip_physical{245.0}=0x1
-phy_chain_rx_polarity_flip_physical{246.0}=0x1
-phy_chain_rx_polarity_flip_physical{247.0}=0x1
-phy_chain_rx_polarity_flip_physical{248.0}=0x0
-phy_chain_rx_polarity_flip_physical{249.0}=0x0
-phy_chain_rx_polarity_flip_physical{25.0}=0x1
-phy_chain_rx_polarity_flip_physical{250.0}=0x1
-phy_chain_rx_polarity_flip_physical{251.0}=0x0
-phy_chain_rx_polarity_flip_physical{252.0}=0x1
-phy_chain_rx_polarity_flip_physical{253.0}=0x1
-phy_chain_rx_polarity_flip_physical{254.0}=0x0
-phy_chain_rx_polarity_flip_physical{255.0}=0x1
-phy_chain_rx_polarity_flip_physical{256.0}=0x0
-phy_chain_rx_polarity_flip_physical{257.0}=0x0
-phy_chain_rx_polarity_flip_physical{259.0}=0x0
-phy_chain_rx_polarity_flip_physical{26.0}=0x0
-phy_chain_rx_polarity_flip_physical{27.0}=0x1
-phy_chain_rx_polarity_flip_physical{28.0}=0x0
-phy_chain_rx_polarity_flip_physical{29.0}=0x0
-phy_chain_rx_polarity_flip_physical{3.0}=0x1
-phy_chain_rx_polarity_flip_physical{30.0}=0x0
-phy_chain_rx_polarity_flip_physical{31.0}=0x0
-phy_chain_rx_polarity_flip_physical{32.0}=0x1
-phy_chain_rx_polarity_flip_physical{33.0}=0x0
-phy_chain_rx_polarity_flip_physical{34.0}=0x0
-phy_chain_rx_polarity_flip_physical{35.0}=0x1
-phy_chain_rx_polarity_flip_physical{36.0}=0x1
-phy_chain_rx_polarity_flip_physical{37.0}=0x1
-phy_chain_rx_polarity_flip_physical{38.0}=0x1
-phy_chain_rx_polarity_flip_physical{39.0}=0x0
-phy_chain_rx_polarity_flip_physical{4.0}=0x0
-phy_chain_rx_polarity_flip_physical{40.0}=0x0
-phy_chain_rx_polarity_flip_physical{41.0}=0x0
-phy_chain_rx_polarity_flip_physical{42.0}=0x1
-phy_chain_rx_polarity_flip_physical{43.0}=0x1
-phy_chain_rx_polarity_flip_physical{44.0}=0x1
-phy_chain_rx_polarity_flip_physical{45.0}=0x1
-phy_chain_rx_polarity_flip_physical{46.0}=0x0
-phy_chain_rx_polarity_flip_physical{47.0}=0x0
-phy_chain_rx_polarity_flip_physical{48.0}=0x1
-phy_chain_rx_polarity_flip_physical{49.0}=0x1
-phy_chain_rx_polarity_flip_physical{5.0}=0x1
-phy_chain_rx_polarity_flip_physical{50.0}=0x1
-phy_chain_rx_polarity_flip_physical{51.0}=0x0
-phy_chain_rx_polarity_flip_physical{52.0}=0x0
-phy_chain_rx_polarity_flip_physical{53.0}=0x0
-phy_chain_rx_polarity_flip_physical{54.0}=0x0
-phy_chain_rx_polarity_flip_physical{55.0}=0x1
-phy_chain_rx_polarity_flip_physical{56.0}=0x0
-phy_chain_rx_polarity_flip_physical{57.0}=0x0
-phy_chain_rx_polarity_flip_physical{58.0}=0x0
-phy_chain_rx_polarity_flip_physical{59.0}=0x1
-phy_chain_rx_polarity_flip_physical{6.0}=0x0
-phy_chain_rx_polarity_flip_physical{60.0}=0x1
-phy_chain_rx_polarity_flip_physical{61.0}=0x0
-phy_chain_rx_polarity_flip_physical{62.0}=0x0
-phy_chain_rx_polarity_flip_physical{63.0}=0x1
-phy_chain_rx_polarity_flip_physical{64.0}=0x1
-phy_chain_rx_polarity_flip_physical{65.0}=0x1
-phy_chain_rx_polarity_flip_physical{66.0}=0x1
-phy_chain_rx_polarity_flip_physical{67.0}=0x0
-phy_chain_rx_polarity_flip_physical{68.0}=0x1
-phy_chain_rx_polarity_flip_physical{69.0}=0x0
-phy_chain_rx_polarity_flip_physical{7.0}=0x0
-phy_chain_rx_polarity_flip_physical{70.0}=0x0
-phy_chain_rx_polarity_flip_physical{71.0}=0x1
-phy_chain_rx_polarity_flip_physical{72.0}=0x1
-phy_chain_rx_polarity_flip_physical{73.0}=0x1
-phy_chain_rx_polarity_flip_physical{74.0}=0x1
-phy_chain_rx_polarity_flip_physical{75.0}=0x0
-phy_chain_rx_polarity_flip_physical{76.0}=0x0
-phy_chain_rx_polarity_flip_physical{77.0}=0x0
-phy_chain_rx_polarity_flip_physical{78.0}=0x0
-phy_chain_rx_polarity_flip_physical{79.0}=0x1
-phy_chain_rx_polarity_flip_physical{8.0}=0x1
-phy_chain_rx_polarity_flip_physical{80.0}=0x1
-phy_chain_rx_polarity_flip_physical{81.0}=0x1
-phy_chain_rx_polarity_flip_physical{82.0}=0x1
-phy_chain_rx_polarity_flip_physical{83.0}=0x0
-phy_chain_rx_polarity_flip_physical{84.0}=0x0
-phy_chain_rx_polarity_flip_physical{85.0}=0x1
-phy_chain_rx_polarity_flip_physical{86.0}=0x1
-phy_chain_rx_polarity_flip_physical{87.0}=0x0
-phy_chain_rx_polarity_flip_physical{88.0}=0x0
-phy_chain_rx_polarity_flip_physical{89.0}=0x0
-phy_chain_rx_polarity_flip_physical{9.0}=0x1
-phy_chain_rx_polarity_flip_physical{90.0}=0x0
-phy_chain_rx_polarity_flip_physical{91.0}=0x1
-phy_chain_rx_polarity_flip_physical{92.0}=0x1
-phy_chain_rx_polarity_flip_physical{93.0}=0x0
-phy_chain_rx_polarity_flip_physical{94.0}=0x0
-phy_chain_rx_polarity_flip_physical{95.0}=0x1
-phy_chain_rx_polarity_flip_physical{96.0}=0x0
-phy_chain_rx_polarity_flip_physical{97.0}=0x1
-phy_chain_rx_polarity_flip_physical{98.0}=0x1
-phy_chain_rx_polarity_flip_physical{99.0}=0x0
-phy_chain_tx_lane_map_physical{1.0}=0x2031
-phy_chain_tx_lane_map_physical{101.0}=0x1023
-phy_chain_tx_lane_map_physical{105.0}=0x1302
-phy_chain_tx_lane_map_physical{109.0}=0x0321
-phy_chain_tx_lane_map_physical{113.0}=0x2301
-phy_chain_tx_lane_map_physical{117.0}=0x3120
-phy_chain_tx_lane_map_physical{121.0}=0x3102
-phy_chain_tx_lane_map_physical{125.0}=0x3210
-phy_chain_tx_lane_map_physical{129.0}=0x1023
-phy_chain_tx_lane_map_physical{13.0}=0x3021
-phy_chain_tx_lane_map_physical{133.0}=0x3210
-phy_chain_tx_lane_map_physical{137.0}=0x2031
-phy_chain_tx_lane_map_physical{141.0}=0x1302
-phy_chain_tx_lane_map_physical{145.0}=0x3210
-phy_chain_tx_lane_map_physical{149.0}=0x0213
-phy_chain_tx_lane_map_physical{153.0}=0x3210
-phy_chain_tx_lane_map_physical{157.0}=0x1320
-phy_chain_tx_lane_map_physical{161.0}=0x3210
-phy_chain_tx_lane_map_physical{165.0}=0x0231
-phy_chain_tx_lane_map_physical{169.0}=0x3120
-phy_chain_tx_lane_map_physical{17.0}=0x1032
-phy_chain_tx_lane_map_physical{173.0}=0x0312
-phy_chain_tx_lane_map_physical{177.0}=0x0231
-phy_chain_tx_lane_map_physical{181.0}=0x3210
-phy_chain_tx_lane_map_physical{185.0}=0x3210
-phy_chain_tx_lane_map_physical{189.0}=0x1320
-phy_chain_tx_lane_map_physical{193.0}=0x0321
-phy_chain_tx_lane_map_physical{197.0}=0x3120
-phy_chain_tx_lane_map_physical{201.0}=0x3120
-phy_chain_tx_lane_map_physical{205.0}=0x0123
-phy_chain_tx_lane_map_physical{209.0}=0x3120
-phy_chain_tx_lane_map_physical{21.0}=0x0213
-phy_chain_tx_lane_map_physical{213.0}=0x3021
-phy_chain_tx_lane_map_physical{217.0}=0x0312
-phy_chain_tx_lane_map_physical{221.0}=0x2301
-phy_chain_tx_lane_map_physical{225.0}=0x0123
-phy_chain_tx_lane_map_physical{229.0}=0x2031
-phy_chain_tx_lane_map_physical{233.0}=0x0231
-phy_chain_tx_lane_map_physical{237.0}=0x0213
-phy_chain_tx_lane_map_physical{241.0}=0x1320
-phy_chain_tx_lane_map_physical{245.0}=0x2031
-phy_chain_tx_lane_map_physical{249.0}=0x3120
-phy_chain_tx_lane_map_physical{25.0}=0x0231
-phy_chain_tx_lane_map_physical{253.0}=0x0321
-phy_chain_tx_lane_map_physical{257.0}=0x3210
-phy_chain_tx_lane_map_physical{29.0}=0x1230
-phy_chain_tx_lane_map_physical{33.0}=0x1032
-phy_chain_tx_lane_map_physical{37.0}=0x0123
-phy_chain_tx_lane_map_physical{41.0}=0x0213
-phy_chain_tx_lane_map_physical{45.0}=0x0132
-phy_chain_tx_lane_map_physical{49.0}=0x2031
-phy_chain_tx_lane_map_physical{5.0}=0x2301
-phy_chain_tx_lane_map_physical{53.0}=0x2301
-phy_chain_tx_lane_map_physical{57.0}=0x2031
-phy_chain_tx_lane_map_physical{61.0}=0x2031
-phy_chain_tx_lane_map_physical{65.0}=0x1230
-phy_chain_tx_lane_map_physical{69.0}=0x2013
-phy_chain_tx_lane_map_physical{73.0}=0x0213
-phy_chain_tx_lane_map_physical{77.0}=0x2310
-phy_chain_tx_lane_map_physical{81.0}=0x0321
-phy_chain_tx_lane_map_physical{85.0}=0x2013
-phy_chain_tx_lane_map_physical{89.0}=0x0213
-phy_chain_tx_lane_map_physical{9.0}=0x3012
-phy_chain_tx_lane_map_physical{93.0}=0x3102
-phy_chain_tx_lane_map_physical{97.0}=0x3210
-phy_chain_tx_polarity_flip_physical{1.0}=0x0
-phy_chain_tx_polarity_flip_physical{10.0}=0x1
-phy_chain_tx_polarity_flip_physical{100.0}=0x0
-phy_chain_tx_polarity_flip_physical{101.0}=0x0
-phy_chain_tx_polarity_flip_physical{102.0}=0x1
-phy_chain_tx_polarity_flip_physical{103.0}=0x0
-phy_chain_tx_polarity_flip_physical{104.0}=0x0
-phy_chain_tx_polarity_flip_physical{105.0}=0x0
-phy_chain_tx_polarity_flip_physical{106.0}=0x1
-phy_chain_tx_polarity_flip_physical{107.0}=0x1
-phy_chain_tx_polarity_flip_physical{108.0}=0x1
-phy_chain_tx_polarity_flip_physical{109.0}=0x0
-phy_chain_tx_polarity_flip_physical{11.0}=0x1
-phy_chain_tx_polarity_flip_physical{110.0}=0x0
-phy_chain_tx_polarity_flip_physical{111.0}=0x0
-phy_chain_tx_polarity_flip_physical{112.0}=0x1
-phy_chain_tx_polarity_flip_physical{113.0}=0x1
-phy_chain_tx_polarity_flip_physical{114.0}=0x1
-phy_chain_tx_polarity_flip_physical{115.0}=0x1
-phy_chain_tx_polarity_flip_physical{116.0}=0x0
-phy_chain_tx_polarity_flip_physical{117.0}=0x1
-phy_chain_tx_polarity_flip_physical{118.0}=0x0
-phy_chain_tx_polarity_flip_physical{119.0}=0x0
-phy_chain_tx_polarity_flip_physical{12.0}=0x0
-phy_chain_tx_polarity_flip_physical{120.0}=0x0
-phy_chain_tx_polarity_flip_physical{121.0}=0x0
-phy_chain_tx_polarity_flip_physical{122.0}=0x0
-phy_chain_tx_polarity_flip_physical{123.0}=0x0
-phy_chain_tx_polarity_flip_physical{124.0}=0x1
-phy_chain_tx_polarity_flip_physical{125.0}=0x0
-phy_chain_tx_polarity_flip_physical{126.0}=0x1
-phy_chain_tx_polarity_flip_physical{127.0}=0x1
-phy_chain_tx_polarity_flip_physical{128.0}=0x1
-phy_chain_tx_polarity_flip_physical{129.0}=0x1
-phy_chain_tx_polarity_flip_physical{13.0}=0x0
-phy_chain_tx_polarity_flip_physical{130.0}=0x0
-phy_chain_tx_polarity_flip_physical{131.0}=0x1
-phy_chain_tx_polarity_flip_physical{132.0}=0x0
-phy_chain_tx_polarity_flip_physical{133.0}=0x1
-phy_chain_tx_polarity_flip_physical{134.0}=0x1
-phy_chain_tx_polarity_flip_physical{135.0}=0x1
-phy_chain_tx_polarity_flip_physical{136.0}=0x1
-phy_chain_tx_polarity_flip_physical{137.0}=0x1
-phy_chain_tx_polarity_flip_physical{138.0}=0x1
-phy_chain_tx_polarity_flip_physical{139.0}=0x1
-phy_chain_tx_polarity_flip_physical{14.0}=0x1
-phy_chain_tx_polarity_flip_physical{140.0}=0x1
-phy_chain_tx_polarity_flip_physical{141.0}=0x0
-phy_chain_tx_polarity_flip_physical{142.0}=0x1
-phy_chain_tx_polarity_flip_physical{143.0}=0x1
-phy_chain_tx_polarity_flip_physical{144.0}=0x1
-phy_chain_tx_polarity_flip_physical{145.0}=0x1
-phy_chain_tx_polarity_flip_physical{146.0}=0x1
-phy_chain_tx_polarity_flip_physical{147.0}=0x1
-phy_chain_tx_polarity_flip_physical{148.0}=0x0
-phy_chain_tx_polarity_flip_physical{149.0}=0x1
-phy_chain_tx_polarity_flip_physical{15.0}=0x0
-phy_chain_tx_polarity_flip_physical{150.0}=0x0
-phy_chain_tx_polarity_flip_physical{151.0}=0x0
-phy_chain_tx_polarity_flip_physical{152.0}=0x0
-phy_chain_tx_polarity_flip_physical{153.0}=0x1
-phy_chain_tx_polarity_flip_physical{154.0}=0x0
-phy_chain_tx_polarity_flip_physical{155.0}=0x0
-phy_chain_tx_polarity_flip_physical{156.0}=0x0
-phy_chain_tx_polarity_flip_physical{157.0}=0x0
-phy_chain_tx_polarity_flip_physical{158.0}=0x0
-phy_chain_tx_polarity_flip_physical{159.0}=0x0
-phy_chain_tx_polarity_flip_physical{16.0}=0x0
-phy_chain_tx_polarity_flip_physical{160.0}=0x0
-phy_chain_tx_polarity_flip_physical{161.0}=0x0
-phy_chain_tx_polarity_flip_physical{162.0}=0x1
-phy_chain_tx_polarity_flip_physical{163.0}=0x1
-phy_chain_tx_polarity_flip_physical{164.0}=0x0
-phy_chain_tx_polarity_flip_physical{165.0}=0x1
-phy_chain_tx_polarity_flip_physical{166.0}=0x1
-phy_chain_tx_polarity_flip_physical{167.0}=0x1
-phy_chain_tx_polarity_flip_physical{168.0}=0x0
-phy_chain_tx_polarity_flip_physical{169.0}=0x0
-phy_chain_tx_polarity_flip_physical{17.0}=0x0
-phy_chain_tx_polarity_flip_physical{170.0}=0x1
-phy_chain_tx_polarity_flip_physical{171.0}=0x1
-phy_chain_tx_polarity_flip_physical{172.0}=0x1
-phy_chain_tx_polarity_flip_physical{173.0}=0x0
-phy_chain_tx_polarity_flip_physical{174.0}=0x0
-phy_chain_tx_polarity_flip_physical{175.0}=0x1
-phy_chain_tx_polarity_flip_physical{176.0}=0x0
-phy_chain_tx_polarity_flip_physical{177.0}=0x1
-phy_chain_tx_polarity_flip_physical{178.0}=0x0
-phy_chain_tx_polarity_flip_physical{179.0}=0x0
-phy_chain_tx_polarity_flip_physical{18.0}=0x1
-phy_chain_tx_polarity_flip_physical{180.0}=0x0
-phy_chain_tx_polarity_flip_physical{181.0}=0x0
-phy_chain_tx_polarity_flip_physical{182.0}=0x0
-phy_chain_tx_polarity_flip_physical{183.0}=0x0
-phy_chain_tx_polarity_flip_physical{184.0}=0x1
-phy_chain_tx_polarity_flip_physical{185.0}=0x0
-phy_chain_tx_polarity_flip_physical{186.0}=0x1
-phy_chain_tx_polarity_flip_physical{187.0}=0x1
-phy_chain_tx_polarity_flip_physical{188.0}=0x1
-phy_chain_tx_polarity_flip_physical{189.0}=0x0
-phy_chain_tx_polarity_flip_physical{19.0}=0x1
-phy_chain_tx_polarity_flip_physical{190.0}=0x0
-phy_chain_tx_polarity_flip_physical{191.0}=0x0
-phy_chain_tx_polarity_flip_physical{192.0}=0x0
-phy_chain_tx_polarity_flip_physical{193.0}=0x1
-phy_chain_tx_polarity_flip_physical{194.0}=0x1
-phy_chain_tx_polarity_flip_physical{195.0}=0x1
-phy_chain_tx_polarity_flip_physical{196.0}=0x0
-phy_chain_tx_polarity_flip_physical{197.0}=0x0
-phy_chain_tx_polarity_flip_physical{198.0}=0x1
-phy_chain_tx_polarity_flip_physical{199.0}=0x1
-phy_chain_tx_polarity_flip_physical{2.0}=0x1
-phy_chain_tx_polarity_flip_physical{20.0}=0x1
-phy_chain_tx_polarity_flip_physical{200.0}=0x1
-phy_chain_tx_polarity_flip_physical{201.0}=0x1
-phy_chain_tx_polarity_flip_physical{202.0}=0x1
-phy_chain_tx_polarity_flip_physical{203.0}=0x1
-phy_chain_tx_polarity_flip_physical{204.0}=0x1
-phy_chain_tx_polarity_flip_physical{205.0}=0x0
-phy_chain_tx_polarity_flip_physical{206.0}=0x1
-phy_chain_tx_polarity_flip_physical{207.0}=0x1
-phy_chain_tx_polarity_flip_physical{208.0}=0x1
-phy_chain_tx_polarity_flip_physical{209.0}=0x1
-phy_chain_tx_polarity_flip_physical{21.0}=0x0
-phy_chain_tx_polarity_flip_physical{210.0}=0x1
-phy_chain_tx_polarity_flip_physical{211.0}=0x1
-phy_chain_tx_polarity_flip_physical{212.0}=0x0
-phy_chain_tx_polarity_flip_physical{213.0}=0x0
-phy_chain_tx_polarity_flip_physical{214.0}=0x1
-phy_chain_tx_polarity_flip_physical{215.0}=0x0
-phy_chain_tx_polarity_flip_physical{216.0}=0x1
-phy_chain_tx_polarity_flip_physical{217.0}=0x1
-phy_chain_tx_polarity_flip_physical{218.0}=0x1
-phy_chain_tx_polarity_flip_physical{219.0}=0x0
-phy_chain_tx_polarity_flip_physical{22.0}=0x0
-phy_chain_tx_polarity_flip_physical{220.0}=0x1
-phy_chain_tx_polarity_flip_physical{221.0}=0x0
-phy_chain_tx_polarity_flip_physical{222.0}=0x0
-phy_chain_tx_polarity_flip_physical{223.0}=0x0
-phy_chain_tx_polarity_flip_physical{224.0}=0x1
-phy_chain_tx_polarity_flip_physical{225.0}=0x1
-phy_chain_tx_polarity_flip_physical{226.0}=0x1
-phy_chain_tx_polarity_flip_physical{227.0}=0x1
-phy_chain_tx_polarity_flip_physical{228.0}=0x0
-phy_chain_tx_polarity_flip_physical{229.0}=0x0
-phy_chain_tx_polarity_flip_physical{23.0}=0x0
-phy_chain_tx_polarity_flip_physical{230.0}=0x1
-phy_chain_tx_polarity_flip_physical{231.0}=0x1
-phy_chain_tx_polarity_flip_physical{232.0}=0x1
-phy_chain_tx_polarity_flip_physical{233.0}=0x0
-phy_chain_tx_polarity_flip_physical{234.0}=0x0
-phy_chain_tx_polarity_flip_physical{235.0}=0x0
-phy_chain_tx_polarity_flip_physical{236.0}=0x0
-phy_chain_tx_polarity_flip_physical{237.0}=0x1
-phy_chain_tx_polarity_flip_physical{238.0}=0x1
-phy_chain_tx_polarity_flip_physical{239.0}=0x1
-phy_chain_tx_polarity_flip_physical{24.0}=0x0
-phy_chain_tx_polarity_flip_physical{240.0}=0x0
-phy_chain_tx_polarity_flip_physical{241.0}=0x1
-phy_chain_tx_polarity_flip_physical{242.0}=0x1
-phy_chain_tx_polarity_flip_physical{243.0}=0x1
-phy_chain_tx_polarity_flip_physical{244.0}=0x0
-phy_chain_tx_polarity_flip_physical{245.0}=0x1
-phy_chain_tx_polarity_flip_physical{246.0}=0x1
-phy_chain_tx_polarity_flip_physical{247.0}=0x1
-phy_chain_tx_polarity_flip_physical{248.0}=0x1
-phy_chain_tx_polarity_flip_physical{249.0}=0x1
-phy_chain_tx_polarity_flip_physical{25.0}=0x1
-phy_chain_tx_polarity_flip_physical{250.0}=0x0
-phy_chain_tx_polarity_flip_physical{251.0}=0x0
-phy_chain_tx_polarity_flip_physical{252.0}=0x0
-phy_chain_tx_polarity_flip_physical{253.0}=0x1
-phy_chain_tx_polarity_flip_physical{254.0}=0x1
-phy_chain_tx_polarity_flip_physical{255.0}=0x1
-phy_chain_tx_polarity_flip_physical{256.0}=0x0
-phy_chain_tx_polarity_flip_physical{257.0}=0x0
-phy_chain_tx_polarity_flip_physical{259.0}=0x0
-phy_chain_tx_polarity_flip_physical{26.0}=0x0
-phy_chain_tx_polarity_flip_physical{27.0}=0x0
-phy_chain_tx_polarity_flip_physical{28.0}=0x0
-phy_chain_tx_polarity_flip_physical{29.0}=0x1
-phy_chain_tx_polarity_flip_physical{3.0}=0x1
-phy_chain_tx_polarity_flip_physical{30.0}=0x1
-phy_chain_tx_polarity_flip_physical{31.0}=0x1
-phy_chain_tx_polarity_flip_physical{32.0}=0x0
-phy_chain_tx_polarity_flip_physical{33.0}=0x0
-phy_chain_tx_polarity_flip_physical{34.0}=0x0
-phy_chain_tx_polarity_flip_physical{35.0}=0x0
-phy_chain_tx_polarity_flip_physical{36.0}=0x1
-phy_chain_tx_polarity_flip_physical{37.0}=0x1
-phy_chain_tx_polarity_flip_physical{38.0}=0x1
-phy_chain_tx_polarity_flip_physical{39.0}=0x1
-phy_chain_tx_polarity_flip_physical{4.0}=0x1
-phy_chain_tx_polarity_flip_physical{40.0}=0x0
-phy_chain_tx_polarity_flip_physical{41.0}=0x0
-phy_chain_tx_polarity_flip_physical{42.0}=0x0
-phy_chain_tx_polarity_flip_physical{43.0}=0x0
-phy_chain_tx_polarity_flip_physical{44.0}=0x0
-phy_chain_tx_polarity_flip_physical{45.0}=0x1
-phy_chain_tx_polarity_flip_physical{46.0}=0x0
-phy_chain_tx_polarity_flip_physical{47.0}=0x1
-phy_chain_tx_polarity_flip_physical{48.0}=0x1
-phy_chain_tx_polarity_flip_physical{49.0}=0x0
-phy_chain_tx_polarity_flip_physical{5.0}=0x1
-phy_chain_tx_polarity_flip_physical{50.0}=0x0
-phy_chain_tx_polarity_flip_physical{51.0}=0x0
-phy_chain_tx_polarity_flip_physical{52.0}=0x1
-phy_chain_tx_polarity_flip_physical{53.0}=0x0
-phy_chain_tx_polarity_flip_physical{54.0}=0x1
-phy_chain_tx_polarity_flip_physical{55.0}=0x1
-phy_chain_tx_polarity_flip_physical{56.0}=0x0
-phy_chain_tx_polarity_flip_physical{57.0}=0x0
-phy_chain_tx_polarity_flip_physical{58.0}=0x1
-phy_chain_tx_polarity_flip_physical{59.0}=0x1
-phy_chain_tx_polarity_flip_physical{6.0}=0x1
-phy_chain_tx_polarity_flip_physical{60.0}=0x1
-phy_chain_tx_polarity_flip_physical{61.0}=0x0
-phy_chain_tx_polarity_flip_physical{62.0}=0x1
-phy_chain_tx_polarity_flip_physical{63.0}=0x1
-phy_chain_tx_polarity_flip_physical{64.0}=0x1
-phy_chain_tx_polarity_flip_physical{65.0}=0x0
-phy_chain_tx_polarity_flip_physical{66.0}=0x1
-phy_chain_tx_polarity_flip_physical{67.0}=0x1
-phy_chain_tx_polarity_flip_physical{68.0}=0x0
-phy_chain_tx_polarity_flip_physical{69.0}=0x1
-phy_chain_tx_polarity_flip_physical{7.0}=0x1
-phy_chain_tx_polarity_flip_physical{70.0}=0x1
-phy_chain_tx_polarity_flip_physical{71.0}=0x1
-phy_chain_tx_polarity_flip_physical{72.0}=0x0
-phy_chain_tx_polarity_flip_physical{73.0}=0x1
-phy_chain_tx_polarity_flip_physical{74.0}=0x0
-phy_chain_tx_polarity_flip_physical{75.0}=0x0
-phy_chain_tx_polarity_flip_physical{76.0}=0x0
-phy_chain_tx_polarity_flip_physical{77.0}=0x0
-phy_chain_tx_polarity_flip_physical{78.0}=0x0
-phy_chain_tx_polarity_flip_physical{79.0}=0x1
-phy_chain_tx_polarity_flip_physical{8.0}=0x0
-phy_chain_tx_polarity_flip_physical{80.0}=0x0
-phy_chain_tx_polarity_flip_physical{81.0}=0x1
-phy_chain_tx_polarity_flip_physical{82.0}=0x1
-phy_chain_tx_polarity_flip_physical{83.0}=0x1
-phy_chain_tx_polarity_flip_physical{84.0}=0x0
-phy_chain_tx_polarity_flip_physical{85.0}=0x1
-phy_chain_tx_polarity_flip_physical{86.0}=0x0
-phy_chain_tx_polarity_flip_physical{87.0}=0x0
-phy_chain_tx_polarity_flip_physical{88.0}=0x0
-phy_chain_tx_polarity_flip_physical{89.0}=0x1
-phy_chain_tx_polarity_flip_physical{9.0}=0x0
-phy_chain_tx_polarity_flip_physical{90.0}=0x1
-phy_chain_tx_polarity_flip_physical{91.0}=0x1
-phy_chain_tx_polarity_flip_physical{92.0}=0x0
-phy_chain_tx_polarity_flip_physical{93.0}=0x0
-phy_chain_tx_polarity_flip_physical{94.0}=0x0
-phy_chain_tx_polarity_flip_physical{95.0}=0x0
-phy_chain_tx_polarity_flip_physical{96.0}=0x0
-phy_chain_tx_polarity_flip_physical{97.0}=0x0
-phy_chain_tx_polarity_flip_physical{98.0}=0x1
-phy_chain_tx_polarity_flip_physical{99.0}=0x1
-port_init_autoneg_100=0
-port_init_autoneg_102=0
-port_init_autoneg_103=0
-port_init_autoneg_104=0
-port_init_autoneg_105=0
-port_init_autoneg_106=0
-port_init_autoneg_107=0
-port_init_autoneg_108=0
-port_init_autoneg_109=0
-port_init_autoneg_10=0
-port_init_autoneg_110=0
-port_init_autoneg_111=0
-port_init_autoneg_112=0
-port_init_autoneg_113=0
-port_init_autoneg_114=0
-port_init_autoneg_115=0
-port_init_autoneg_116=0
-port_init_autoneg_117=0
-port_init_autoneg_11=0
-port_init_autoneg_12=0
-port_init_autoneg_13=0
-port_init_autoneg_14=0
-port_init_autoneg_15=0
-port_init_autoneg_16=0
-port_init_autoneg_1=0
-port_init_autoneg_2=0
-port_init_autoneg_34=0
-port_init_autoneg_35=0
-port_init_autoneg_36=0
-port_init_autoneg_37=0
-port_init_autoneg_38=0
-port_init_autoneg_39=0
-port_init_autoneg_3=0
-port_init_autoneg_40=0
-port_init_autoneg_41=0
-port_init_autoneg_42=0
-port_init_autoneg_43=0
-port_init_autoneg_44=0
-port_init_autoneg_45=0
-port_init_autoneg_46=0
-port_init_autoneg_47=0
-port_init_autoneg_48=0
-port_init_autoneg_49=0
-port_init_autoneg_4=0
-port_init_autoneg_5=0
-port_init_autoneg_66=0
-port_init_autoneg_68=0
-port_init_autoneg_69=0
-port_init_autoneg_6=0
-port_init_autoneg_70=0
-port_init_autoneg_71=0
-port_init_autoneg_72=0
-port_init_autoneg_73=0
-port_init_autoneg_74=0
-port_init_autoneg_75=0
-port_init_autoneg_76=0
-port_init_autoneg_77=0
-port_init_autoneg_78=0
-port_init_autoneg_79=0
-port_init_autoneg_7=0
-port_init_autoneg_80=0
-port_init_autoneg_81=0
-port_init_autoneg_82=0
-port_init_autoneg_83=0
-port_init_autoneg_8=0
-port_init_autoneg_9=0
-port_init_cl72_hg=1
-port_phy_addr_100=0xff
-port_phy_addr_102=0xff
-port_phy_addr_103=0xff
-port_phy_addr_104=0xff
-port_phy_addr_105=0xff
-port_phy_addr_106=0xff
-port_phy_addr_107=0xff
-port_phy_addr_108=0xff
-port_phy_addr_109=0xff
-port_phy_addr_10=0xff
-port_phy_addr_110=0xff
-port_phy_addr_111=0xff
-port_phy_addr_112=0xff
-port_phy_addr_113=0xff
-port_phy_addr_114=0xff
-port_phy_addr_115=0xff
-port_phy_addr_116=0xff
-port_phy_addr_117=0xff
-port_phy_addr_11=0xff
-port_phy_addr_12=0xff
-port_phy_addr_13=0xff
-port_phy_addr_14=0xff
-port_phy_addr_15=0xff
-port_phy_addr_16=0xff
-port_phy_addr_1=0xff
-port_phy_addr_2=0xff
-port_phy_addr_34=0xff
-port_phy_addr_35=0xff
-port_phy_addr_36=0xff
-port_phy_addr_37=0xff
-port_phy_addr_38=0xff
-port_phy_addr_39=0xff
-port_phy_addr_3=0xff
-port_phy_addr_40=0xff
-port_phy_addr_41=0xff
-port_phy_addr_42=0xff
-port_phy_addr_43=0xff
-port_phy_addr_44=0xff
-port_phy_addr_45=0xff
-port_phy_addr_46=0xff
-port_phy_addr_47=0xff
-port_phy_addr_48=0xff
-port_phy_addr_49=0xff
-port_phy_addr_4=0xff
-port_phy_addr_5=0xff
-port_phy_addr_66=0xff
-port_phy_addr_68=0xff
-port_phy_addr_69=0xff
-port_phy_addr_6=0xff
-port_phy_addr_70=0xff
-port_phy_addr_71=0xff
-port_phy_addr_72=0xff
-port_phy_addr_73=0xff
-port_phy_addr_74=0xff
-port_phy_addr_75=0xff
-port_phy_addr_76=0xff
-port_phy_addr_77=0xff
-port_phy_addr_78=0xff
-port_phy_addr_79=0xff
-port_phy_addr_7=0xff
-port_phy_addr_80=0xff
-port_phy_addr_81=0xff
-port_phy_addr_82=0xff
-port_phy_addr_83=0xff
-port_phy_addr_8=0xff
-port_phy_addr_9=0xff
-portmap_100=259:10
-portmap_101=262:10
-portmap_102=217:100
-portmap_103=213:100
-portmap_104=229:100
-portmap_105=237:100
-portmap_106=249:100
-portmap_107=245:100
-portmap_108=209:100
-portmap_109=221:100
-portmap_10=29:100
-portmap_110=233:100
-portmap_111=225:100
-portmap_112=241:100
-portmap_113=253:100
-portmap_114=197:100
-portmap_115=205:100
-portmap_116=201:100
-portmap_117=193:100
-portmap_11=41:100
-portmap_12=33:100
-portmap_134=263:10
-portmap_13=57:100
-portmap_14=53:100
-portmap_15=49:100
-portmap_16=61:100
-portmap_1=5:100
-portmap_2=13:100
-portmap_33=260:10
-portmap_34=77:100
-portmap_35=65:100
-portmap_36=85:100
-portmap_37=89:100
-portmap_38=109:100
-portmap_39=97:100
-portmap_3=25:100
-portmap_40=69:100
-portmap_41=73:100
-portmap_42=93:100
-portmap_43=81:100
-portmap_44=101:100
-portmap_45=105:100
-portmap_46=117:100
-portmap_47=121:100
-portmap_48=125:100
-portmap_49=113:100
-portmap_4=21:100
-portmap_5=37:100
-portmap_66=257:10
-portmap_67=261:10
-portmap_68=149:100
-portmap_69=153:100
-portmap_6=45:100
-portmap_70=173:100
-portmap_71=161:100
-portmap_72=181:100
-portmap_73=185:100
-portmap_74=157:100
-portmap_75=145:100
-portmap_76=165:100
-portmap_77=169:100
-portmap_78=189:100
-portmap_79=177:100
-portmap_7=9:100
-portmap_80=141:100
-portmap_81=133:100
-portmap_82=129:100
-portmap_83=137:100
-portmap_8=1:100
-portmap_9=17:100
-robust_hash_disable_egress_vlan=1
-robust_hash_disable_mpls=1
-robust_hash_disable_vlan=1
-stable_size=0x5500000
-stable_size=0x5500000
-tdma_timeout_usec=15000000
-tslam_timeout_usec=15000000
-
-# tuning parameters
-serdes_preemphasis_1=0x184606
-serdes_preemphasis_2=0x164108
-serdes_preemphasis_3=0x164308
-serdes_preemphasis_4=0x144108
-serdes_preemphasis_5=0x144108
-serdes_preemphasis_6=0x164106
-serdes_preemphasis_7=0x184507
-serdes_preemphasis_8=0x184606
-serdes_preemphasis_9=0x184507
-serdes_preemphasis_10=0x194407
-serdes_preemphasis_11=0x194407
-serdes_preemphasis_12=0x184507
-serdes_preemphasis_13=0x144108
-serdes_preemphasis_14=0x144108
-serdes_preemphasis_15=0x194407
-serdes_preemphasis_16=0x194407
-serdes_preemphasis_34=0x184408
-serdes_preemphasis_35=0x184606
-serdes_preemphasis_36=0x164308
-serdes_preemphasis_37=0x184606
-serdes_preemphasis_38=0x164108
-serdes_preemphasis_39=0x184606
-serdes_preemphasis_40=0xe3206
-serdes_preemphasis_41=0xe3205
-serdes_preemphasis_42=0x103a06
-serdes_preemphasis_43=0xe3205
-serdes_preemphasis_44=0x184606
-serdes_preemphasis_45=0x184507
-serdes_preemphasis_46=0x144108
-serdes_preemphasis_47=0x103a07
-serdes_preemphasis_48=0x194407
-serdes_preemphasis_49=0x194407
-serdes_preemphasis_66=0x43004
-serdes_preemphasis_68=0x164308
-serdes_preemphasis_69=0x164408
-serdes_preemphasis_70=0xe3206
-serdes_preemphasis_71=0xe3205
-serdes_preemphasis_72=0xe3205
-serdes_preemphasis_73=0xe3206
-serdes_preemphasis_74=0x164108
-serdes_preemphasis_75=0x184606
-serdes_preemphasis_76=0x164608
-serdes_preemphasis_77=0x184507
-serdes_preemphasis_78=0x184507
-serdes_preemphasis_79=0x184606
-serdes_preemphasis_80=0x184606
-serdes_preemphasis_81=0x184407
-serdes_preemphasis_82=0x103706
-serdes_preemphasis_83=0x103706
-serdes_preemphasis_100=0x43004
-serdes_preemphasis_102=0x184408
-serdes_preemphasis_103=0x184606
-serdes_preemphasis_104=0x184606
-serdes_preemphasis_105=0x16410a
-serdes_preemphasis_106=0x184408
-serdes_preemphasis_107=0x194308
-serdes_preemphasis_108=0x144108
-serdes_preemphasis_109=0x144108
-serdes_preemphasis_110=0x144108
-serdes_preemphasis_111=0x144108
-serdes_preemphasis_112=0x164608
-serdes_preemphasis_113=0x164608
-serdes_preemphasis_114=0x174507
-serdes_preemphasis_115=0x184606
-serdes_preemphasis_116=0x103706
-serdes_preemphasis_117=0x133c06
-
-mmu_init_config="MSFT-TH2-Tier1"
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
similarity index 98%
rename from device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm
rename to device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 6e4c266b1db4..d07f91089859 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -1,3 +1,14 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set IPinIP_sock = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2' -%}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
@@ -934,3 +945,4 @@ serdes_preemphasis_130=0x580c
 serdes_preemphasis_131=0x580c
 
 mmu_init_config="MSFT-TH2-Tier0"
+{{ IPinIP_sock }}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/sai.profile
index 166f5c5b6e1a..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/sai.profile
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-112x50G+8x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/th2-a7260cx3-64-64x40G.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
similarity index 98%
rename from device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/th2-a7260cx3-64-64x40G.config.bcm
rename to device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index e26a8131efdb..b0de32162ddf 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/th2-a7260cx3-64-64x40G.config.bcm
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -1,3 +1,14 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set IPinIP_sock = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2' -%}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
@@ -1013,3 +1024,4 @@ serdes_preemphasis_116=0x105004
 serdes_preemphasis_117=0x105004
 
 mmu_init_config="MSFT-TH2-Tier0"
+{{ IPinIP_sock }}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/sai.profile
index a89cba46c3d1..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/sai.profile
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x40G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh
index 9927b877a619..e4a5b2e2c5bd 100755
--- a/platform/broadcom/docker-syncd-brcm/start.sh
+++ b/platform/broadcom/docker-syncd-brcm/start.sh
@@ -9,10 +9,22 @@ rm -f ${SYNCD_SOCKET_FILE}
 
 mkdir -p /etc/sai.d/
 
+# There are two ways to specify the contents of the SAI_INIT_CONFIG_FILE and they are mutually exclusive
+# via current method (sai.profile.j2) or new method (config.bcm.j2)
+# If delta is large, use sai.profile.j2 which basically require the user to select which config file to use
+# If delta is small, use config.bcm.j2 where additional SAI INIT config properties are added
+#   based on specific device metadata requirement
+#   in this case sai.profile should have been modified to use the path /etc/sai.d/config.bcm
+# There is also a possibility that both sai.profile.j2 and config.bcm.j2 are absent.  in that cacse just copy
+# sai.profile to the new /etc/said directory.
+
 # Create/Copy the sai.profile to /etc/sai.d/sai.profile
 if [ -f $HWSKU_DIR/sai.profile.j2 ]; then
     sonic-cfggen -d -t $HWSKU_DIR/sai.profile.j2 > /etc/sai.d/sai.profile
 else
+    if [ -f $HWSKU_DIR/config.bcm.j2 ]; then
+        sonic-cfggen -d -t $HWSKU_DIR/config.bcm.j2 > /etc/sai.d/config.bcm
+    fi
     if [ -f $HWSKU_DIR/sai.profile ]; then
         cp $HWSKU_DIR/sai.profile /etc/sai.d/sai.profile
     fi

From 881dbec78a4b02d35d5192ab014299f0e6cdc8ca Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 15 Apr 2021 18:48:22 -0700
Subject: [PATCH 0364/1674] [202012][sonic-platform-common] Track 202012 branch
 of submodule (#7326)

Recently created a 202012 branch of sonic-platform common.

Update .gitmodules to track that branch of the submodule in the 202012 branch of sonic-buildimage.
---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index 4e1ae4863d09..d0dfa3a28935 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,6 +41,7 @@
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
 	url = https://github.com/Azure/sonic-platform-common
+	branch = 202012
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/Azure/sonic-platform-daemons

From 731401fe4fa35ca0aebff60e426404a29d22daab Mon Sep 17 00:00:00 2001
From: Vivek Reddy Karri <vkarri@nvidia.com>
Date: Thu, 8 Apr 2021 19:40:06 +0000
Subject: [PATCH 0365/1674] Reverts the commit which reverts "Backport ethtool
 to support QSFP-DD (#5725)"

This reverts commit a86cdd87cffd1ea7535812d56719081b3550791d.
---
 build_debian.sh                               |  1 -
 dockers/docker-platform-monitor/Dockerfile.j2 |  1 -
 rules/docker-platform-monitor.mk              |  3 ++-
 rules/ethtool.dep                             |  8 ++++++++
 rules/ethtool.mk                              | 13 +++++++++++++
 src/ethtool/Makefile                          | 19 +++++++++++++++++++
 6 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 rules/ethtool.dep
 create mode 100644 rules/ethtool.mk
 create mode 100644 src/ethtool/Makefile

diff --git a/build_debian.sh b/build_debian.sh
index ceb1aa5ed266..6c1187d2e7f1 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -300,7 +300,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     squashfs-tools          \
     grub2-common            \
     rsyslog                 \
-    ethtool                 \
     screen                  \
     hping3                  \
     tcptraceroute           \
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index fc46dc6a52b9..e86f4ad0019b 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -22,7 +22,6 @@ RUN apt-get update &&   \
         rrdtool         \
         python-smbus    \
         python3-smbus   \
-        ethtool         \
         dmidecode       \
         i2c-tools
 
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index 547fbf60813f..b650f74a174d 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -6,7 +6,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK).
 
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/$(DOCKER_PLATFORM_MONITOR_STEM)
 
-$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS)
+$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(ETHTOOL)
 
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
@@ -66,4 +66,5 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool
 $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/ethtool.dep b/rules/ethtool.dep
new file mode 100644
index 000000000000..15a96084046e
--- /dev/null
+++ b/rules/ethtool.dep
@@ -0,0 +1,8 @@
+SPATH       := $($(ETHTOOL)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/ethtool.mk rules/ethtool.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(ETHTOOL)_CACHE_MODE  := GIT_CONTENT_SHA
+$(ETHTOOL)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(ETHTOOL)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/ethtool.mk b/rules/ethtool.mk
new file mode 100644
index 000000000000..b79eaad7afa9
--- /dev/null
+++ b/rules/ethtool.mk
@@ -0,0 +1,13 @@
+# ethtool
+
+ETHTOOL_VERSION_BASE = 5.9
+export ETHTOOL_VERSION_BASE
+
+ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+$(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool
+SONIC_MAKE_DEBS += $(ETHTOOL)
+
+ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+$(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG)))
+
+export ETHTOOL ETHTOOL_DBG
diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile
new file mode 100644
index 000000000000..2f5a3acc94de
--- /dev/null
+++ b/src/ethtool/Makefile
@@ -0,0 +1,19 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = $(ETHTOOL)
+DERIVED_TARGET = $(ETHTOOL_DBG)
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Obtaining the ethtool debian package
+	rm -rf ethtool*
+	git clone https://salsa.debian.org/kernel-team/ethtool/
+	pushd ethtool
+	git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
+	# Build package
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	popd
+	mv $(DERIVED_TARGET) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

From fb20fe91d34eb149221a0b2adb0b879f277c98a9 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Thu, 8 Apr 2021 12:08:22 -0400
Subject: [PATCH 0366/1674] [ethtool]: disable unit test when building ethtool
 on armhf/arm64 (#7226)

Compiling ethtool from source is causing ethtool unit tests to fail on ARM Platforms.

These tests are failing: (By default netlink-interface is enabled while compiling ethtool)
Link: ([Test File Link](https://salsa.debian.org/kernel-team/ethtool/-/blob/debian/1%255.9-1/test-cmdline.c#L28))
```
FAIL: test-cmdline
==================

E: ethtool 16_char_devname! returns 1
E: ethtool
127_char_devname0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcde returns 1
E: ethtool --change devname xcvr external returns 0
E: ethtool --change devname speed 100 duplex half port tp autoneg on advertise 0x1 phyad 1 xcvr external wol p sopass 01:23:45:67:89:ab msglvl 1 returns 0

FAIL test-cmdline (exit status: 1)
```
Tested this on Local ARM Emulated Container:

```
(Docker Container Emulating ARM)
vkarri@3a03c70eed35:/tmp/ethtool$ ./ethtool 16_char_devname!
netlink interface initialization failed, device name longer than 15 not supported
vkarri@3a03c70eed35:/tmp/ethtool$ echo $?
1 (Expected 0)
vkarri@3a03c70eed35:~/ethtool$ ./ethtool 16_char_devnameee
netlink interface initialization failed, device name longer than 15 not supported

Checked for dependencies: (all are present)
vkarri@3a03c70eed35:~/ethtool$ apt-cache policy libmnl0
libmnl0:
  Installed: 1.0.4-2
  Candidate: 1.0.4-2
  Version table:
 *** 1.0.4-2 500
        500 http://deb.debian.org/debian buster/main armhf Packages
        500 http://packages.trafficmanager.net/debian/debian buster/main armhf Packages
        100 /var/lib/dpkg/status

vkarri@3a03c70eed35:~/ethtool$ apt-cache policy libc6
libc6:
  Installed: 2.28-10
  Candidate: 2.28-10
  Version table:
 *** 2.28-10 500
        500 http://deb.debian.org/debian buster/main armhf Packages
        500 http://packages.trafficmanager.net/debian/debian buster/main armhf Packages
        100 /var/lib/dpkg/status
```

#### How I did it
Disabled netlink-interface for ethtool.

Even though Netlink is not available, it doesn't seem to impact what ethtool was supposed to do. In fact the older version which was in use before this PR [#5725](https://github.com/Azure/sonic-buildimage/pull/5725) did not have netlink support and everything seemed to work well

Article on Netlink-Support for ethtool: https://lwn.net/Articles/783633/

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 rules/ethtool.mk     | 4 ++--
 src/ethtool/Makefile | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rules/ethtool.mk b/rules/ethtool.mk
index b79eaad7afa9..11c857811a1f 100644
--- a/rules/ethtool.mk
+++ b/rules/ethtool.mk
@@ -3,11 +3,11 @@
 ETHTOOL_VERSION_BASE = 5.9
 export ETHTOOL_VERSION_BASE
 
-ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_$(CONFIGURED_ARCH).deb
 $(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool
 SONIC_MAKE_DEBS += $(ETHTOOL)
 
-ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
+ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_$(CONFIGURED_ARCH).deb
 $(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG)))
 
 export ETHTOOL ETHTOOL_DBG
diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile
index 2f5a3acc94de..071429121f6d 100644
--- a/src/ethtool/Makefile
+++ b/src/ethtool/Makefile
@@ -12,7 +12,12 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd ethtool
 	git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
 	# Build package
+ifneq (,(filter $(CONFIGURED_ARCH),arm64 armhf))
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+else
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+endif
+	
 	popd
 	mv $(DERIVED_TARGET) $* $(DEST)/
 

From 5bdbfcfb2647cf1db59401e82807c748838ffee4 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:29:00 +0300
Subject: [PATCH 0367/1674] [build_debian.sh] fix systemd is not from backports
 buster (#7323)

#### Why I did it
To fix systemd is older version.

#### How I did it
Install systemd explicitelly

#### How to verify it
systemd --version
---
 build_debian.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_debian.sh b/build_debian.sh
index 6c1187d2e7f1..5c70afad643f 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -349,6 +349,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
     picocom \
+    systemd \
     systemd-sysv
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then

From 45cb76fe25cb7d63705e368c84d71d020d7b1242 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Thu, 25 Feb 2021 22:47:45 +0530
Subject: [PATCH 0368/1674] [Marvell] Updated armhf SAI deb version info.
 (#6863)

Modified the MRVL SAI debian version format to include debian revision number. This helps in identifying the SAI deb causing any build/runtime issue.

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index 70aebfb514e3..e49050ac2acf 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,7 +1,7 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1
-export MRVL_SAI = mrvllibsai_m0_MASTER_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
+export MRVL_SAI_VERSION = 1.7.1-1
+export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
 $(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV)))

From f9d755310e69b420c9090c969bed813ec79c707c Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Mon, 19 Apr 2021 10:27:00 -0700
Subject: [PATCH 0369/1674] [202012][submodule] Update sonic-platform-daemons
 submodule (#7357)

- [muxcable] Fix Redis Selectable Processing (#173)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index cf1c531c7fee..5f24e3f5577d 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit cf1c531c7feeefbb404468561f871b5f463c2e02
+Subproject commit 5f24e3f5577d3970e2095e1b8ab7439facafcec3

From 61c3816e0ca48c3479fae8075870c4bd36b6fef8 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:45:00 -0800
Subject: [PATCH 0370/1674] Remove dummy MMU profiles for
 Arista-7050CX3-32S-C32 and Arista-7050CX3-32S-D48C8 (#6785)

---
 .../Arista-7050CX3-32S-C32/buffers.json.j2    |  2 -
 .../buffers_defaults_t0.j2                    | 54 ----------------
 .../buffers_defaults_t1.j2                    | 54 ----------------
 .../pg_profile_lookup.ini                     | 17 ------
 .../Arista-7050CX3-32S-C32/qos.json.j2        | 21 -------
 .../Arista-7050CX3-32S-D48C8/buffers.json.j2  |  2 -
 .../buffers_defaults_t0.j2                    | 61 -------------------
 .../pg_profile_lookup.ini                     | 17 ------
 .../Arista-7050CX3-32S-D48C8/qos.json.j2      | 21 -------
 9 files changed, 249 deletions(-)
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
 delete mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
deleted file mode 100644
index 1083a6210fc9..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-{%- set default_topo = 't0' %}
-{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
deleted file mode 100644
index cc7a687514ce..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-
-{%- set default_cable = '300m' %}
-
-{%- set ports2cable = {
-        'torrouter_server'       : '5m',
-        'leafrouter_torrouter'   : '40m',
-        'spinerouter_leafrouter' : '300m'
-        }
--%}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
deleted file mode 100644
index cc7a687514ce..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-
-{%- set default_cable = '300m' %}
-
-{%- set ports2cable = {
-        'torrouter_server'       : '5m',
-        'leafrouter_torrouter'   : '40m',
-        'spinerouter_leafrouter' : '300m'
-        }
--%}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
deleted file mode 100644
index 0b5d680edda7..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 79872   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 56160   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 85696   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
deleted file mode 100644
index 1083a6210fc9..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-{%- set default_topo = 't0' %}
-{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
deleted file mode 100644
index 1430479d08e0..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,61 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,6) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(10,22) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(26,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(6,10) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(22,26) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
deleted file mode 100644
index 0b5d680edda7..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 79872   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 56160   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 85696   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}

From a253f2039a5db4875bdaef794cebdb1c7a2b1c2b Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Tue, 20 Apr 2021 11:38:48 -0700
Subject: [PATCH 0371/1674] Revert "[build_debian.sh] fix systemd is not from
 backports buster (#7323)"

This reverts commit 5bdbfcfb2647cf1db59401e82807c748838ffee4.
---
 build_debian.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index 5c70afad643f..6c1187d2e7f1 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -349,7 +349,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
     picocom \
-    systemd \
     systemd-sysv
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then

From 86f9c7b7a62dc87b4f044f2ce95bb1b4ea02c5d0 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Tue, 20 Apr 2021 11:39:14 -0700
Subject: [PATCH 0372/1674] Revert "[debian] install systemd version 247 from
 buster-backports (#7228)"

This reverts commit 63885ca96d3132e483bf4aa0dde069c23b280670.
---
 build_debian.sh             | 7 ++-----
 installer/x86_64/install.sh | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 6c1187d2e7f1..c824faa4397e 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -79,8 +79,6 @@ TARGET_PATH=$TARGET_PATH scripts/build_debian_base_system.sh $CONFIGURED_ARCH $I
 # Prepare buildinfo
 sudo scripts/prepare_debian_image_buildinfo.sh $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT $http_proxy
 
-sudo chown root:root $FILESYSTEM_ROOT
-
 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '$HOSTNAME' > /etc/hostname"
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '127.0.0.1       $HOSTNAME' >> /etc/hosts"
@@ -111,7 +109,7 @@ sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-language
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y upgrade
 echo '[INFO] Install packages for building image'
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc systemd-sysv
 
 ## Create device files
 echo '[INFO] MAKEDEV'
@@ -348,8 +346,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # Install certain fundamental packages from $IMAGE_DISTRO-backports in order to get
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
-    picocom \
-    systemd-sysv
+    picocom
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index e7eb9e1a8065..9cf2f57b6e53 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -634,7 +634,6 @@ menuentry '$demo_grub_entry' {
         linux   /$image_dir/boot/vmlinuz-4.19.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
-                systemd.unified_cgroup_hierarchy=0 \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
         initrd  /$image_dir/boot/initrd.img-4.19.0-12-2-amd64

From ffb90c2551fcb7103dfd7ee0cda60e13a1433ca2 Mon Sep 17 00:00:00 2001
From: dereksun01 <52683998+dereksun01@users.noreply.github.com>
Date: Mon, 19 Apr 2021 23:56:12 +0800
Subject: [PATCH 0373/1674] [device] Add as5835_54x configuration (#6970)

Add configuration files:
- mv2-as5835-48x10G+6x100G.config.bcm
- sai.profile
- led_proc_init.soc
- custom_led.bin

Signed-off-by: derek_sun <ecsonic@edge-core.com>
---
 .../mv2-as5835-48x10G+6x100G.config.bcm       |  38 +++++++++++++-----
 .../Accton-AS5835-54X/sai.profile             |   2 +-
 .../custom_led.bin                            | Bin 0 -> 840 bytes
 .../led_proc_init.soc                         |   3 ++
 4 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/custom_led.bin
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/led_proc_init.soc

diff --git a/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/mv2-as5835-48x10G+6x100G.config.bcm b/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/mv2-as5835-48x10G+6x100G.config.bcm
index e72a490b04d2..fb40d7949103 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/mv2-as5835-48x10G+6x100G.config.bcm
+++ b/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/mv2-as5835-48x10G+6x100G.config.bcm
@@ -6,6 +6,7 @@ ptp_ts_pll_fref=50000000
 ptp_bs_fref_0=50000000
 ptp_bs_fref_1=50000000
 
+
 oversubscribe_mode=1
 
 pbmp_xport_xe=0x1FFFFFFFFFFFFFFFE
@@ -14,10 +15,32 @@ parity_enable=0
 mem_cache_enable=0
 
 l2_mem_entries=32768
-#l3_mem_entries=49152
-#fpem_mem_entries=16384
+l3_mem_entries=16384
+fpem_mem_entries=16384
 l2xmsg_mode=1
 
+# Platform specfic
+bcm_num_cos=8
+bcm_stat_interval=2000000
+cdma_timeout_usec=3000000
+help_cli_enable=1
+ifp_inports_support_enable=1
+ipv6_lpm_128b_enable=0x1
+l3_alpm_enable=2
+l3_max_ecmp_mode=1
+max_vp_lags=0
+memlist_enable=1
+reglist_enable=1
+miim_intr_enable=0
+module_64ports=1
+port_flex_enable=1
+schan_intr_enable=0
+stable_size=0x5500000 ;Specify the stable cache size in bytes used for Warm boot operations
+tdma_timeout_usec=3000000
+skip_L2_USER_ENTRY=0
+bcm_tunnel_term_compatible_mode=1
+l3_alpm_ipv6_128b_bkt_rsvd=1
+
 #FC0
 dport_map_port_1=1
 dport_map_port_2=2
@@ -218,9 +241,6 @@ phy_chain_tx_polarity_flip_physical{36.0}=0x0
 
 #FC9
 dport_map_port_27=49
-dport_map_port_28=52
-dport_map_port_29=53
-dport_map_port_30=54
 portmap_27=37:100:4
 phy_chain_rx_lane_map_physical{37.0}=0x2130
 phy_chain_rx_lane_map_physical{38.0}=0x2130
@@ -460,8 +480,8 @@ phy_chain_tx_polarity_flip_physical{76.0}=0x0
 
 #FC19
 
-dport_map_port_64=64
-portmap_64=81:10:m
-phy_chain_rx_polarity_flip_physical{81.0}=0x1
-phy_chain_tx_polarity_flip_physical{81.0}=0x1
+#dport_map_port_64=64
+#portmap_64=81:10:m
+#phy_chain_rx_polarity_flip_physical{81.0}=0x1
+#phy_chain_tx_polarity_flip_physical{81.0}=0x1
 
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile b/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile
index 744c6571f7c7..20a54db81412 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile
+++ b/device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/mv2-as5835-48x10G+6x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835-48x10G+6x100G.config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/custom_led.bin b/device/accton/x86_64-accton_as5835_54x-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..69bb371114ac83a6d58ba3e19c7981af06c472d0
GIT binary patch
literal 840
zcmY+?OH30{6b9fkk4|kVpz^Bt>H{!!Gzw!u9F(yw2bro-2u5K6Et<^Im2qWESU_9>
z#iS2JgG*yVjP5kSjqA=zV_Xa&u5{6bMlmttUojCDU(P(vz2_$Pue_SzYkY}QTzNUO
zDw8-*Q3~IWEYPI&c39SOiC;Fg(~;53^iZcR5(^=sim|DZp;1n!E9Taho=v4khzC!6
zu_>D82OW2)z-HRe<eU^Ov7n2^R>QO4(Tc25lkVzr@%{B=`gia-MXe>il~QM=TrXAk
z{`ym#+j{!`Q!IJaw(>Y9IA@sLnw)2xF0vLfC^lP9USlRvYfo@}LM(d<6q9VRP%!*S
z#ktDWD*mf-T+#ySXFKAoMaN0PNs5Ukdz__WLv>||RK-qm-bk~QEbw8o&e=Y3zp3na
zZ!xE=;)vWWMwi%0shX=TCl>7kde$0ZdsqmsPf|3Rks{fQuWKc<p6TxlXZ@X->`Hbc
zyD_zK)4SUDdX5Xc!q2$!X0ey(8#JCFa$UFIttS$QNCXLF@PGnd*abfDLk$F=7U}>?
zX*cYFz0d%S&;-rU0zrsFH}t@1z<9!V(xDH|!a3*%1I|MNl8}M{U>Jl8Fa#!~;Ucud
zK?p-99ETW8TQ`D2Z_QngDwl<jqKakZBspT}_TU=-|K~4%eBn7NevnjOS#iAR@>ToM
zCpuDy9N}+&Wm|5iSA{vUruh+#?xQy9sNQm(?;&MHB(KIOuxd4%i#(Mo(HK7-i&;Y6
z{qfFCvTh^?0`>^&$U&M(740X6g8Yo|Q{xcwvsLA|cq(x0lP#3StU#$m%fr%+JFMQ@
EAEI&CCIA2c

literal 0
HcmV?d00001

diff --git a/device/accton/x86_64-accton_as5835_54x-r0/led_proc_init.soc b/device/accton/x86_64-accton_as5835_54x-r0/led_proc_init.soc
new file mode 100644
index 000000000000..5bef973ed2ae
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/led_proc_init.soc
@@ -0,0 +1,3 @@
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
+led start
+led auto on

From 66dedf38c2305d1a9f934bf84f7d65a2911dd2dc Mon Sep 17 00:00:00 2001
From: Kuanyu Chen <kuanyu_chen@edge-core.com>
Date: Tue, 20 Apr 2021 02:40:52 +0800
Subject: [PATCH 0374/1674] [config-setup]: Fix a bug in checking if
 updategraph is enabled (#7093)

Encounter error during "config-setup boot" if the updategraph is enabled.

How I did it
Correct the code inside the config-setup script.
Remove the space between the assignment operator.

How to verify it
Remove the /etc/sonic/config_db.json and reboot the device.
Originally, it will return following error after boot up.
rv: command not found
After modification, it can correctly parse the status of updategraph without error.
---
 files/image_config/config-setup/config-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index 9bb7b33b6be6..0006b69695e6 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -158,7 +158,7 @@ updategraph_is_enabled()
     rv=1
     if [ -e ${UPDATEGRAPH_CONF} ]; then
         updategraph_mode=$(grep enabled ${UPDATEGRAPH_CONF} | head -n 1 | cut -f2 -d=)
-        [ "${updategraph_mode}" = "true" ] && rv = 0
+        [ "${updategraph_mode}" = "true" ] && rv=0
     fi
     return $rv
 }

From f7ddf1e73c672f12b280b1aa1cbe7d8257bfe196 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Mon, 19 Apr 2021 20:03:15 +0300
Subject: [PATCH 0375/1674] [Mellanox] Fix for all Spectrum based systems: SAI
 profile speed configurations (#7119)

Fix to the correct value for all SPC1 devices.
For 10G added 10GB_CX4_XAUI, 10GB_KX4, 10GB_KR, 10GB_SR and 10GB_ER_LR
For 50G added 50GB_SR2

This bitmask represents all the options available for interface type and some were missing.
Note: it was working just fine if you were setting the value from SONiC CLI but not from the default SAI Profile.

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 .../ACS-MSN2010/sai_2010.xml                  |  2 +-
 .../ACS-MSN2100/sai_2100.xml                  |  2 +-
 .../ACS-MSN2410/sai_2410.xml                  |  2 +-
 .../ACS-MSN2700/sai_2700.xml                  |  2 +-
 .../sai_2700_8x50g_28x100g.xml                | 10 ++--
 .../sai_2700_8x100g_40x50g_8x10g.xml          | 48 +++++++++---------
 .../sai_2700_48x50g_8x100g.xml                | 50 +++++++++----------
 .../ACS-MSN2740/sai_2740.xml                  |  2 +-
 8 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml
index 34151a434a23..3383a5f406ef 100644
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>0</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>939524096</port-speed>
 			</port-info>
 			<port-info>
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai_2100.xml b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai_2100.xml
index 92150596df64..efa0ccd2721f 100644
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai_2100.xml
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai_2100.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>3</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>98368</port-speed>
 			</port-info>
 			<port-info>
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai_2410.xml b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai_2410.xml
index 4884cd754a30..03d694c97723 100644
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai_2410.xml
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai_2410.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>0</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>939524096</port-speed>
 			</port-info>
 			<port-info>
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai_2700.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai_2700.xml
index eedf359fb889..f025df1d3ef0 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai_2700.xml
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai_2700.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>3</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>98368</port-speed>
 			</port-info>
 			<port-info>
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai_2700_8x50g_28x100g.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai_2700_8x50g_28x100g.xml
index ee20db3e5dde..3127518b21a9 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai_2700_8x50g_28x100g.xml
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai_2700_8x50g_28x100g.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>3</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>11534336</port-speed>
 			</port-info>
 			<port-info>
@@ -106,7 +106,7 @@
 				<width>4</width>
 				<module>28</module>
 				<breakout-modes>3</breakout-modes>
-				<port-speed>3221225472</port-speed>
+				<port-speed>3221487616</port-speed>
 				<split>2</split>
 			</port-info>
 			<port-info>
@@ -114,7 +114,7 @@
 				<width>4</width>
 				<module>29</module>
 				<breakout-modes>1</breakout-modes>
-				<port-speed>3221225472</port-speed>
+				<port-speed>3221487616</port-speed>
 				<split>2</split>
 			</port-info>
 			<port-info>
@@ -122,7 +122,7 @@
 				<width>4</width>
 				<module>30</module>
 				<breakout-modes>3</breakout-modes>
-				<port-speed>3221225472</port-speed>
+				<port-speed>3221487616</port-speed>
 				<split>2</split>
 			</port-info>
 			<port-info>
@@ -130,7 +130,7 @@
 				<width>4</width>
 				<module>31</module>
 				<breakout-modes>1</breakout-modes>
-				<port-speed>3221225472</port-speed>
+				<port-speed>3221487616</port-speed>
 				<split>2</split>
 			</port-info>
 			<port-info>
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml
index 0376eb548d26..bc2d1509fd36 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai_2700_8x100g_40x50g_8x10g.xml
@@ -22,8 +22,8 @@
                 <!-- 0 none, 1=2, 2=4, 3=2,4 -->
                 <breakout-modes>3</breakout-modes>
 
-                <!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
-                <port-speed>3221225472</port-speed>
+                <!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>3</local-port>
@@ -31,7 +31,7 @@
                 <width>4</width>
                 <module>17</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>5</local-port>
@@ -39,7 +39,7 @@
                 <width>4</width>
                 <module>18</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>7</local-port>
@@ -47,7 +47,7 @@
                 <width>4</width>
                 <module>19</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>9</local-port>
@@ -55,7 +55,7 @@
                 <width>4</width>
                 <module>20</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>11</local-port>
@@ -63,7 +63,7 @@
                 <width>4</width>
                 <module>21</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>13</local-port>
@@ -99,7 +99,7 @@
                 <width>4</width>
                 <module>26</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>23</local-port>
@@ -107,14 +107,14 @@
                 <width>4</width>
                 <module>27</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>25</local-port>
                 <width>4</width>
                 <module>28</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
                 <split>2</split>
             </port-info>
             <port-info>
@@ -123,7 +123,7 @@
                 <width>4</width>
                 <module>29</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>29</local-port>
@@ -131,7 +131,7 @@
                 <width>4</width>
                 <module>30</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>31</local-port>
@@ -139,7 +139,7 @@
                 <width>4</width>
                 <module>31</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>33</local-port>
@@ -147,7 +147,7 @@
                 <width>4</width>
                 <module>14</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>35</local-port>
@@ -155,7 +155,7 @@
                 <width>4</width>
                 <module>15</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>37</local-port>
@@ -163,7 +163,7 @@
                 <width>4</width>
                 <module>12</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>39</local-port>
@@ -171,7 +171,7 @@
                 <width>4</width>
                 <module>13</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>41</local-port>
@@ -179,7 +179,7 @@
                 <width>4</width>
                 <module>10</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>43</local-port>
@@ -187,7 +187,7 @@
                 <width>4</width>
                 <module>11</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>45</local-port>
@@ -209,7 +209,7 @@
                 <width>4</width>
                 <module>6</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>51</local-port>
@@ -224,7 +224,7 @@
                 <width>4</width>
                 <module>4</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>55</local-port>
@@ -232,7 +232,7 @@
                 <width>4</width>
                 <module>5</module>
                 <breakout-modes>1</breakout-modes>
-                <port-speed>3221225472</port-speed>
+                <port-speed>3221487616</port-speed>
             </port-info>
             <port-info>
                 <local-port>57</local-port>
@@ -240,7 +240,7 @@
                 <width>4</width>
                 <module>2</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>4096</port-speed>
+                <port-speed>28700</port-speed>
             </port-info>
             <port-info>
                 <local-port>59</local-port>
@@ -255,7 +255,7 @@
                 <width>4</width>
                 <module>0</module>
                 <breakout-modes>3</breakout-modes>
-                <port-speed>4096</port-speed>
+                <port-speed>28700</port-speed>
             </port-info>
             <port-info>
                 <local-port>63</local-port>
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
index dccb606f7435..5d92ffd45e91 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
@@ -21,8 +21,8 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>3</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
-				<port-speed>3221225472</port-speed>
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
+				<port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -30,7 +30,7 @@
 				<width>4</width>
 				<module>17</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -38,7 +38,7 @@
 				<width>4</width>
 				<module>18</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -46,7 +46,7 @@
 				<width>4</width>
 				<module>19</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -54,7 +54,7 @@
 				<width>4</width>
 				<module>20</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -62,7 +62,7 @@
 				<width>4</width>
 				<module>21</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -98,7 +98,7 @@
 				<width>4</width>
 				<module>26</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -106,7 +106,7 @@
 				<width>4</width>
 				<module>27</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>>
 			</port-info>
 			<port-info>
@@ -114,7 +114,7 @@
 				<width>4</width>
 				<module>28</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -122,7 +122,7 @@
 				<width>4</width>
 				<module>29</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -130,7 +130,7 @@
 				<width>4</width>
 				<module>30</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -138,7 +138,7 @@
 				<width>4</width>
 				<module>31</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -146,7 +146,7 @@
 				<width>4</width>
 				<module>14</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -154,7 +154,7 @@
 				<width>4</width>
 				<module>15</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -162,7 +162,7 @@
 				<width>4</width>
 				<module>12</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -170,7 +170,7 @@
 				<width>4</width>
 				<module>13</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -178,7 +178,7 @@
 				<width>4</width>
 				<module>10</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -186,7 +186,7 @@
 				<width>4</width>
 				<module>11</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -222,7 +222,7 @@
 				<width>4</width>
 				<module>4</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -230,7 +230,7 @@
 				<width>4</width>
 				<module>5</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -238,7 +238,7 @@
 				<width>4</width>
 				<module>2</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -246,7 +246,7 @@
 				<width>4</width>
 				<module>3</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -254,7 +254,7 @@
 				<width>4</width>
 				<module>0</module>
 				<breakout-modes>3</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 			<port-info>
@@ -262,7 +262,7 @@
 				<width>4</width>
 				<module>1</module>
 				<breakout-modes>1</breakout-modes>
-        <port-speed>3221225472</port-speed>
+        <port-speed>3221487616</port-speed>
         <split>2</split>
 			</port-info>
 		</ports-list>
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai_2740.xml b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai_2740.xml
index 955ea3f8b1b6..a21dc696ddd9 100644
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai_2740.xml
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai_2740.xml
@@ -21,7 +21,7 @@
 				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
 				<breakout-modes>3</breakout-modes>
 
-				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
 				<port-speed>98368</port-speed>
 			</port-info>
 			<port-info>

From 09c53af61b041589fb0d61170ece1807901b2570 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Fri, 16 Apr 2021 13:55:36 -0700
Subject: [PATCH 0376/1674]  Kubernetes server configurable using URL

1) Dropped non-required IP update in admin.conf, as all masters use VIP only (#7288)
2) Don't clear VERSION during stop, as it would overwrite new version pending to go.
3) subprocess, get return value from proc and do not imply with presence of data in stderr.
---
 src/sonic-ctrmgrd/ctrmgr/container            |  1 -
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     | 40 ++++----------
 src/sonic-ctrmgrd/tests/common_test.py        |  9 +++-
 src/sonic-ctrmgrd/tests/container_test.py     | 10 ++--
 src/sonic-ctrmgrd/tests/kube_commands_test.py | 53 -------------------
 5 files changed, 25 insertions(+), 88 deletions(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container
index ff3706a6a7a7..666c967540a7 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container
+++ b/src/sonic-ctrmgrd/ctrmgr/container
@@ -278,7 +278,6 @@ def container_stop(feature, **kwargs):
             CURRENT_OWNER: "none",
             UPD_TIMESTAMP: str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
             CONTAINER_ID: "",
-            VERSION: "",
             SYSTEM_STATE: "down"
             }
     if remote_state == "running":
diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index db8cb348fcb2..5eaad0a82bb2 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -59,10 +59,7 @@ def _run_command(cmd, timeout=5):
         (o, e) = proc.communicate(timeout)
         output = to_str(o)
         err = to_str(e)
-        if err:
-            ret = -1
-        else:
-            ret = proc.returncode
+        ret = proc.returncode
     except subprocess.TimeoutExpired as error:
         proc.kill()
         output = ""
@@ -207,25 +204,11 @@ def _download_file(server, port, insecure):
     data = r.read()
     os.write(h, data)
     os.close(h)
+    log_debug("Downloaded = {}".format(fname))
 
-    # Ensure the admin.conf has given VIP as server-IP.
-    update_file = "{}.upd".format(fname)
-    cmd = r'sed "s/server:.*:{}/server: https:\/\/{}:{}/" {} > {}'.format(
-            str(port), server, str(port), fname, update_file)
-    (ret, _, err) = _run_command(cmd)
-
-    log_debug("sed command: ret={}".format(ret))
-    if ret != 0:
-        log_error("sed update of downloaded file failed with ret={}".
-                format(ret))
-        log_debug("sed command failed: ret={}".format(ret))
-        return ret
-
-    shutil.copyfile(update_file, KUBE_ADMIN_CONF)
+    shutil.copyfile(fname, KUBE_ADMIN_CONF)
 
-    _run_command("rm -f {} {}".format(fname, update_file))
     log_debug("{} downloaded".format(KUBE_ADMIN_CONF))
-    return ret
 
 
 def _troubleshoot_tips():
@@ -284,16 +267,15 @@ def _do_join(server, port, insecure):
     KUBEADM_JOIN_CMD = "kubeadm join --discovery-file {} --node-name {}"
     err = ""
     out = ""
+    ret = 0
     try:
-        ret = _download_file(server, port, insecure)
-        log_debug("_download ret={}".format(ret))
-        if ret == 0:
-            _do_reset(True)
-            _run_command("modprobe br_netfilter")
-            # Copy flannel.conf
-            _run_command("mkdir -p {}".format(CNI_DIR))
-            _run_command("cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR))
-            (ret, _, _) = _run_command("systemctl start kubelet")
+        _download_file(server, port, insecure)
+        _do_reset(True)
+        _run_command("modprobe br_netfilter")
+        # Copy flannel.conf
+        _run_command("mkdir -p {}".format(CNI_DIR))
+        _run_command("cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR))
+        (ret, _, _) = _run_command("systemctl start kubelet")
 
         if ret == 0:
             (ret, out, err) = _run_command(KUBEADM_JOIN_CMD.format(
diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py
index 54c877f11365..6e9763962bde 100755
--- a/src/sonic-ctrmgrd/tests/common_test.py
+++ b/src/sonic-ctrmgrd/tests/common_test.py
@@ -43,6 +43,13 @@
 DO_JOIN = "do_join"
 
 # subproc key words
+
+# List all subprocess commands expected within the test.
+# Each call to subproc-side effect (mock_subproc_side_effect) increment index
+# Other key words influence how this proc command to be processed
+# PROC_RUN having true at that index, implies run it instead of mocking it
+# PROC_OUT, ERR, FAIL THROW provide data on how to mock
+#
 PROC_CMD = "subproc_cmd"
 PROC_RUN = "skip_mock"
 PROC_FAIL = "proc_fail"
@@ -606,7 +613,7 @@ def communicate(self, timeout):
             err = err_lst[self.index]
         else:
             err = ""
-        self.returncode = 0
+        self.returncode = 0 if not err else -1
         return (out, err)
 
     def kill(self):
diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py
index 146d41386de1..cc5f89e8d97f 100755
--- a/src/sonic-ctrmgrd/tests/container_test.py
+++ b/src/sonic-ctrmgrd/tests/container_test.py
@@ -179,7 +179,8 @@
                         "remote_state": "none",
                         "system_state": "up",
                         "current_owner": "local",
-                        "container_id": "snmp"
+                        "container_id": "snmp",
+                        "container_version": "20201230.0.15"
                     }
                 }
             }
@@ -192,7 +193,7 @@
                         "system_state": "down",
                         "current_owner": "none",
                         "container_id": "",
-                        "container_version": ""
+                        "container_version": "20201230.0.15"
                     }
                 },
                 common_test.KUBE_LABEL_TABLE: {
@@ -222,7 +223,8 @@
                         "container_id": "xxx",
                         "system_state": "up",
                         "current_owner": "kube",
-                        "remote_state": "running"
+                        "remote_state": "running",
+                        "container_version": "20201230.1.15"
                     }
                 }
             }
@@ -235,7 +237,7 @@
                         "system_state": "down",
                         "current_owner": "none",
                         "container_id": "",
-                        "container_version": ""
+                        "container_version": "20201230.1.15"
                     }
                 },
                 common_test.KUBE_LABEL_TABLE: {
diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py
index b76c23e100fe..7c1436e1f6eb 100755
--- a/src/sonic-ctrmgrd/tests/kube_commands_test.py
+++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py
@@ -103,8 +103,6 @@
         common_test.RETVAL: 0,
         common_test.ARGS: ["10.3.157.24", 6443, True, False],
         common_test.PROC_CMD: [
-            'sed *',
-            'rm -f *',
             "kubectl --kubeconfig {} --request-timeout 20s drain None \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
@@ -126,8 +124,6 @@
         common_test.RETVAL: 0,
         common_test.ARGS: ["10.3.157.24", 6443, False, False],
         common_test.PROC_CMD: [
-            'sed *',
-            'rm -f *',
             "kubectl --kubeconfig {} --request-timeout 20s drain None \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
@@ -154,55 +150,6 @@
         ]
     },
     3: {
-        common_test.DESCR: "Regular join: fail file update",
-        common_test.RETVAL: -1,
-        common_test.ARGS: ["10.3.157.24", 6443, False, False],
-        common_test.PROC_CMD: [
-            'sed *',
-            'rm -f *',
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
---ignore-daemonsets".format(KUBE_ADMIN_CONF),
-            "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
-            "kubeadm reset -f",
-            "rm -rf {}".format(CNI_DIR),
-            "systemctl stop kubelet",
-            "modprobe br_netfilter",
-            "mkdir -p {}".format(CNI_DIR),
-            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
-            "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name None".format(
-                KUBE_ADMIN_CONF)
-        ],
-        common_test.PROC_RUN: [True, True],
-        common_test.PROC_FAIL: [True]
-    },
-    4: {
-        common_test.DESCR: "Regular join: fail file update",
-        common_test.RETVAL: -1,
-        common_test.ARGS: ["10.3.157.24", 6443, False, False],
-        common_test.PROC_CMD: [
-            'sed *',
-            'rm -f *',
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
---ignore-daemonsets".format(KUBE_ADMIN_CONF),
-            "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
-            "kubeadm reset -f",
-            "rm -rf {}".format(CNI_DIR),
-            "systemctl stop kubelet",
-            "modprobe br_netfilter",
-            "mkdir -p {}".format(CNI_DIR),
-            "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
-            "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name None".format(
-                KUBE_ADMIN_CONF)
-        ],
-        common_test.PROC_RUN: [True, True],
-        common_test.PROC_FAIL: [True],
-        common_test.PROC_THROW: [True]
-    },
-    5: {
         common_test.DESCR: "Regular join: fail due to unable to lock",
         common_test.RETVAL: -1,
         common_test.ARGS: ["10.3.157.24", 6443, False, False],

From 80fdb299574143f5e93e87d3e27d688e71c7ff51 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 14 Apr 2021 12:12:30 -0700
Subject: [PATCH 0377/1674] Dell S6100: Modify transceiver change event from
 interrupt to poll mode (#7309)

#### Why I did it

- xcvrd crash was seen in latest 201811 images.
- For Dell S6100,API 2.0 uses poll mode while 1.0 was still using interrupt mode.

#### How I did it

- Modified get_transceiver_change_event in 1.0 to poll mode.
---
 .../plugins/sfputil.py                        | 211 +++++++-----------
 .../s6100/scripts/s6100_platform.sh           |   2 -
 2 files changed, 78 insertions(+), 135 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py
index a6a7cce72f56..6e8f024c7bbc 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py
@@ -16,7 +16,6 @@
     import time
     import os
     import logging
-    import select
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
@@ -28,7 +27,7 @@ class SfpUtil(SfpUtilBase):
     PORT_START = 0
     PORT_END = 63
     PORTS_IN_BLOCK = 64
-
+    POLL_INTERVAL = 1
     _port_to_eeprom_mapping = {}
     _port_to_i2c_mapping = {
         0: [6, 18, 34, 50, 66],
@@ -110,7 +109,6 @@ class SfpUtil(SfpUtilBase):
     IOM_4_PORT_END = 63
 
     BASE_VAL_PATH = "/sys/class/i2c-adapter/i2c-{0}/{0}-003e/"
-    OIR_FD_PATH = "/sys/devices/platform/dell_ich.0/sci_int_gpio_sus6"
 
     oir_fd = -1
     epoll = -1
@@ -235,8 +233,8 @@ def __init__(self):
                     elif (not assigned):
                         self.port_to_eeprom_mapping[port_num] =\
                             "No IOM"
-
         SfpUtilBase.__init__(self)
+        self._transceiver_presence = self._get_transceiver_presence()
 
     def __del__(self):
         if self.oir_fd != -1:
@@ -482,7 +480,7 @@ def reset(self, port_num):
     def get_register(self, reg_file):
         retval = 'ERR'
 
-        if (not os.path.isfile(reg_file)):
+        if not os.path.isfile(reg_file):
             print(reg_file + ' not found !')
             return retval
 
@@ -496,141 +494,88 @@ def get_register(self, reg_file):
         retval = retval.lstrip(" ")
         return retval
 
-    def check_interrupts(self, port_dict):
-        retval = 0
-        is_port_dict_updated = False
-
-        # Read the QSFP ABS interrupt & status registers
-        cpld2_abs_int = self.get_register(
-            "/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_int")
-        cpld2_abs_sta = self.get_register(
-            "/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_sta")
-        cpld3_abs_int = self.get_register(
-            "/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_int")
-        cpld3_abs_sta = self.get_register(
-            "/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_sta")
-        cpld4_abs_int = self.get_register(
-            "/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_int")
-        cpld4_abs_sta = self.get_register(
-            "/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_sta")
-        cpld5_abs_int = self.get_register(
-            "/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_int")
-        cpld5_abs_sta = self.get_register(
-            "/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_sta")
-
-        if (cpld2_abs_int == 'ERR' or cpld2_abs_sta == 'ERR' or
-                cpld3_abs_int == 'ERR' or cpld3_abs_sta == 'ERR' or
-                cpld4_abs_int == 'ERR' or cpld4_abs_sta == 'ERR' or
-                cpld5_abs_int == 'ERR' or cpld5_abs_sta == 'ERR'):
-            return -1
-
-        # If IOM is not present, interrupt will return 'read error'
+    def _get_transceiver_presence(self):
+
+        cpld2_modprs = self.get_register(
+                    "/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_modprs")
+        cpld3_modprs = self.get_register(
+                    "/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_modprs")
+        cpld4_modprs = self.get_register(
+                    "/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_modprs")
+        cpld5_modprs = self.get_register(
+                    "/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_modprs")
+
+        # If IOM is not present, register read will fail.
         # Handle the scenario gracefully
-        if (cpld2_abs_int == 'read error'):
-            cpld2_abs_int = "0x0"
-            cpld2_abs_sta = "0x0"
-        if (cpld3_abs_int == 'read error'):
-            cpld3_abs_int = "0x0"
-            cpld3_abs_sta = "0x0"
-        if (cpld4_abs_int == 'read error'):
-            cpld4_abs_int = "0x0"
-            cpld4_abs_sta = "0x0"
-        if (cpld5_abs_int == 'read error'):
-            cpld5_abs_int = "0x0"
-            cpld5_abs_sta = "0x0"
-
-        cpld2_abs_int = int(cpld2_abs_int, 16)
-        cpld2_abs_sta = int(cpld2_abs_sta, 16)
-        cpld3_abs_int = int(cpld3_abs_int, 16)
-        cpld3_abs_sta = int(cpld3_abs_sta, 16)
-        cpld4_abs_int = int(cpld4_abs_int, 16)
-        cpld4_abs_sta = int(cpld4_abs_sta, 16)
-        cpld5_abs_int = int(cpld5_abs_int, 16)
-        cpld5_abs_sta = int(cpld5_abs_sta, 16)
+        if cpld2_modprs == 'read error' or cpld2_modprs == 'ERR':
+            cpld2_modprs = '0x0'
+        if cpld3_modprs == 'read error' or cpld3_modprs == 'ERR':
+            cpld3_modprs = '0x0'
+        if cpld4_modprs == 'read error' or cpld4_modprs == 'ERR':
+            cpld4_modprs = '0x0'
+        if cpld5_modprs == 'read error' or cpld5_modprs == 'ERR':
+            cpld5_modprs = '0x0'
 
         # Make it contiguous
-        interrupt_reg = (cpld2_abs_int & 0xffff) | \
-                        ((cpld4_abs_int & 0xffff) << 16) | \
-                        ((cpld3_abs_int & 0xffff) << 32) | \
-                        ((cpld5_abs_int & 0xffff) << 48)
-        status_reg = (cpld2_abs_sta & 0xffff) | \
-                     ((cpld4_abs_sta & 0xffff) << 16) | \
-                     ((cpld3_abs_sta & 0xffff) << 32) | \
-                     ((cpld5_abs_sta & 0xffff) << 48)
-
-        port = self.port_start
-        while port <= self.port_end:
-            if interrupt_reg & (1 << port):
-                # update only if atleast one port has generated
-                # interrupt
-                is_port_dict_updated = True
-                if status_reg & (1 << port):
-                    # status reg 1 => optics is removed
-                    port_dict[port] = '0'
-                else:
-                    # status reg 0 => optics is inserted
-                    port_dict[port] = '1'
-            port += 1
-        return retval, is_port_dict_updated
+        transceiver_presence = (int(cpld2_modprs, 16) & 0xffff) |\
+                               ((int(cpld4_modprs, 16) & 0xffff) << 16) |\
+                               ((int(cpld3_modprs, 16) & 0xffff) << 32) |\
+                               ((int(cpld5_modprs, 16) & 0xffff) << 48)
+
+        return transceiver_presence
 
     def get_transceiver_change_event(self, timeout=0):
+        """
+        Returns a dictionary containing optics insertion/removal status.
+        Args:
+            timeout: Timeout in milliseconds (optional). If timeout == 0,
+                this method will block until a change is detected.
+        Returns:
+            (bool, dict):
+                - True if call successful, False if not;
+        """
         port_dict = {}
-        try:
-            # We get notified when there is an SCI interrupt from GPIO SUS6
-            # Open the sysfs file and register the epoll object
-            self.oir_fd = open(self.OIR_FD_PATH, "r")
-            if self.oir_fd != -1:
-                # Do a dummy read before epoll register
-                self.oir_fd.read()
-                self.epoll = select.epoll()
-                self.epoll.register(self.oir_fd.fileno(),
-                                    select.EPOLLIN & select.EPOLLET)
-            else:
-                print("get_transceiver_change_event : unable to create fd")
-                return False, {}
+        forever = False
 
-            # Check for missed interrupts by invoking self.check_interrupts
-            # which will update the port_dict.
-            while True:
-                interrupt_count_start = self.get_register(self.OIR_FD_PATH)
-
-                retval, is_port_dict_updated = \
-                    self.check_interrupts(port_dict)
-                if ((retval == 0) and (is_port_dict_updated is True)):
-                    return True, port_dict
-
-                interrupt_count_end = self.get_register(self.OIR_FD_PATH)
-
-                if (interrupt_count_start == 'ERR' or
-                        interrupt_count_end == 'ERR'):
-                    print("get_transceiver_change_event : \
-                            unable to retrive interrupt count")
-                    break
+        if timeout == 0:
+            forever = True
+        elif timeout > 0:
+            timeout = timeout / float(1000) # Convert to secs
+        else:
+            return False, port_dict # Incorrect timeout
 
-                # check_interrupts() itself may take upto 100s of msecs.
-                # We detect a missed interrupt based on the count
-                if interrupt_count_start == interrupt_count_end:
+        while True:
+            if forever:
+                timer = self.POLL_INTERVAL
+            else:
+                timer = min(timeout, self.POLL_INTERVAL)
+                start_time = time.time()
+
+            time.sleep(timer)
+            cur_presence = self._get_transceiver_presence()
+
+            # Update dict only if a change has been detected
+            if cur_presence != self._transceiver_presence:
+                changed_ports = self._transceiver_presence ^ cur_presence
+                for port in range(self.port_end):
+                    # Mask off the bit corresponding to particular port
+                    mask = 1 << port
+                    if changed_ports & mask:
+                        # qsfp_modprs 1 => optics is removed
+                        if cur_presence & mask:
+                            port_dict[port] = '0'
+                        # qsfp_modprs 0 => optics is inserted
+                        else:
+                            port_dict[port] = '1'
+
+                # Update current presence
+                self._transceiver_presence = cur_presence
+                break
+
+            if not forever:
+                elapsed_time = time.time() - start_time
+                timeout = round(timeout - elapsed_time, 3)
+                if timeout <= 0:
                     break
 
-            # Block until an xcvr is inserted or removed with timeout = -1
-            events = self.epoll.poll(
-                timeout=timeout if timeout != 0 else -1)
-            if events:
-                # check interrupts and return the port_dict
-                retval, is_port_dict_updated = \
-                    self.check_interrupts(port_dict)
-                if (retval != 0):
-                    return False, {}
-
-            return True, port_dict
-        except:
-            return False, {}
-        finally:
-            if self.oir_fd != -1:
-                self.epoll.unregister(self.oir_fd.fileno())
-                self.epoll.close()
-                self.oir_fd.close()
-                self.oir_fd = -1
-                self.epoll = -1
-
-        return False, {}
+        return True, port_dict
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index 62a8c1a2812f..6e732a439b0a 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -28,7 +28,6 @@ if [[ "$1" == "init" ]]; then
     pericom="/sys/bus/pci/devices/0000:08:00.0"
     modprobe i2c-dev
     modprobe i2c-mux-pca954x force_deselect_on_exit=1
-    modprobe dell_ich
     modprobe dell_s6100_iom_cpld
     modprobe dell_s6100_lpc
     modprobe nvram
@@ -60,7 +59,6 @@ elif [[ "$1" == "deinit" ]]; then
     modprobe -r dell_s6100_iom_cpld
     modprobe -r i2c-mux-pca954x
     modprobe -r i2c-dev
-    modprobe -r dell_ich
     modprobe -r nvram
     remove_python_api_package
 else

From 8832c10fb7494f7c267b9a4645d99ffe486b177e Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 15 Apr 2021 23:08:15 -0700
Subject: [PATCH 0378/1674] [Dell S6100]: Add dell ich driver (#7336)

dell_ich driver was removed as part of #7309 and it is needed for watchdog tickle in S6100 platform.
---
 .../sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index 6e732a439b0a..62a8c1a2812f 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -28,6 +28,7 @@ if [[ "$1" == "init" ]]; then
     pericom="/sys/bus/pci/devices/0000:08:00.0"
     modprobe i2c-dev
     modprobe i2c-mux-pca954x force_deselect_on_exit=1
+    modprobe dell_ich
     modprobe dell_s6100_iom_cpld
     modprobe dell_s6100_lpc
     modprobe nvram
@@ -59,6 +60,7 @@ elif [[ "$1" == "deinit" ]]; then
     modprobe -r dell_s6100_iom_cpld
     modprobe -r i2c-mux-pca954x
     modprobe -r i2c-dev
+    modprobe -r dell_ich
     modprobe -r nvram
     remove_python_api_package
 else

From 75ac46eab00499012c80f5c349c0a9cedbd5a6e4 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 21 Apr 2021 13:22:52 -0700
Subject: [PATCH 0379/1674] [Broadcom] Set hierarchical ecmp levels to 2
 (#7370)

Set hierarchical ecmp level to 2 instead of 3. Based on CS00011833367, ecmp level must be set to 2.
This is already handled for TH2 platforms. Change is required only for TD3

Co-authored-by: Ubuntu <prsunny@prince-vm.vzw1i4tqyeburcdz5lrgulxi2c.yx.internal.cloudapp.net>
---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm  | 2 +-
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index c3b350204875..5536bda517d8 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -5,7 +5,7 @@ riot_enable=1
 sai_tunnel_support=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
-l3_ecmp_levels=3
+l3_ecmp_levels=2
 riot_overlay_ecmp_resilient_hash_size=16384
 flow_init_mode=1
 arl_clean_timeout_usec=15000000
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 1b5b7e338708..5ec69f685ebc 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -5,7 +5,7 @@ riot_enable=1
 sai_tunnel_support=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
-l3_ecmp_levels=3
+l3_ecmp_levels=2
 riot_overlay_ecmp_resilient_hash_size=16384
 flow_init_mode=1
 arl_clean_timeout_usec=15000000

From 2208c9212a18299c1ea95f6007b16bb175a6591b Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Thu, 22 Apr 2021 01:50:14 +0800
Subject: [PATCH 0380/1674] [Mellanox] Update SDK to 4.4.2522 and FW to
 2008.2520 (#7391)

New features and fixes in the new SDK/FW:

SN4600C | AN/LT support
SN2700 | AN/LT bugs fixes
WJH | FID_MISS support

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0500c449a481..23823116af2f 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2508
+MLNX_SPC_FW_VERSION = 13.2008.2520
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2508
+MLNX_SPC2_FW_VERSION = 29.2008.2520
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2508
+MLNX_SPC3_FW_VERSION = 30.2008.2520
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 3b996a495fdf..688ae3b21121 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 3b996a495fdf521076c3e46c6bae8a57ee2001c0
+Subproject commit 688ae3b21121d3ecc961f0ca93e596a1ed5edbb7
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 0e4745522a52..c23c1d51491c 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2508
+MLNX_SDK_VERSION = 4.4.2522
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From b8daa00ef08ee774dd4fe3a3cd7d44595451ac92 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Tue, 20 Apr 2021 03:40:52 +0530
Subject: [PATCH 0381/1674] [marvell] Move armhf syncd build from stretch to
 buster. (#7366)

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/docker-saiserver-mrvl.mk           | 3 +--
 platform/marvell-armhf/docker-syncd-mrvl-rpc.mk           | 1 -
 platform/marvell-armhf/docker-syncd-mrvl.mk               | 7 ++-----
 platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2    | 5 +++--
 platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.mk b/platform/marvell-armhf/docker-saiserver-mrvl.mk
index 8720e3364688..0e40653ddbf3 100644
--- a/platform/marvell-armhf/docker-saiserver-mrvl.mk
+++ b/platform/marvell-armhf/docker-saiserver-mrvl.mk
@@ -4,9 +4,8 @@ DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz
 $(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
 $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD)
-$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
 
 $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --net=host --privileged -t
diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
index c3ce6c10119c..72c6d8722da8 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
+++ b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
@@ -12,7 +12,6 @@ $(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
 endif
 $(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
 endif
diff --git a/platform/marvell-armhf/docker-syncd-mrvl.mk b/platform/marvell-armhf/docker-syncd-mrvl.mk
index dd01caab687b..699bd8bd9b86 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl.mk
+++ b/platform/marvell-armhf/docker-syncd-mrvl.mk
@@ -3,15 +3,12 @@
 DOCKER_SYNCD_PLATFORM_CODE = mrvl
 include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
 
-$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
-
-$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+#$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2 b/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2
index afaac3fd056c..aba1cedd7965 100755
--- a/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2
+++ b/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2
@@ -1,4 +1,5 @@
-FROM docker-config-engine-stretch
+{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
+FROM docker-config-engine-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -19,7 +20,7 @@ RUN apt-get update \
     net-tools           \
     iputils-ping
 
-RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1 nfs-common
+RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common
 
 RUN dpkg -i \
 {% for deb in docker_syncd_mrvl_debs.split(' ') -%}
diff --git a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
index 021ac2cfa082..55f095d2be91 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
+++ b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:dependent-startup]
-command=python2 -m supervisord_dependent_startup
+command=python3 -m supervisord_dependent_startup
 autostart=true
 autorestart=unexpected
 startretries=0
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
-command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
+command=python3 /usr/bin/supervisor-proc-exit-listener --container-name syncd
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=unexpected

From 4c43ecc81b94abfb89aa34a158e4298773cb0305 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 22 Apr 2021 08:34:52 -0700
Subject: [PATCH 0382/1674] [202012] BRCM SAI 4.3.3.5 pick up 2 bug fixes and
 MMU changes (#7400)

This is the SAI 4.3.3.5 code drop from BRCM to address 2 CSP case and initial MMU changes
Note the MMU changes is the same as that of SAI 4.3.3.4-1 (#7341) but with official patch.

- Case CS00012178716 [4.3] Polling SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES fails often on TH3
- Case CS00012159273 [4.3.3.3] [TD3][IPFWD] subnet broadcast flooding end with extra VLAN Tag if member port of VLAN interface deleted then added back to VLAN

Once we have this PR merged, will validate each one of the above to ensure they are indeed fixed...

Preliminary tests looks fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on TD3 DUT and all passed:

     ipfwd/test_dir_bcast.py
     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     decap/test_decap.py
     fdb/test_fdb.py
---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 165579529c60..36a1546e23d4 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.4_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.4_amd64.deb?sv=2015-04-05&sr=b&sig=RaM7VKtUVZgKVvCbcBp3WP7cqrLT%2BrjwHv3kLdj8zzk%3D&se=2034-12-10T05%3A39%3A44Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.4_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.5_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7XHTTf9%2FWBxEqX0Y8g7KqH8t3AFz1dJIZeY3YEDRypc%3D&se=2034-12-30T07%3A06%3A11Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.4_amd64.deb?sv=2015-04-05&sr=b&sig=im7%2Fqp2dnoQTaPhY3Jv%2BHV0eZ4mPu27BT%2FbcF%2BQxGyQ%3D&se=2034-12-10T05%3A40%3A26Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7I70XjzysspEht%2BsOwCM5QbtCe%2Boelh0%2FfwrhHPGh1g%3D&se=2034-12-30T07%3A06%3A51Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From e6bbb3c344830c2bdb1224603e9474a67d23eab8 Mon Sep 17 00:00:00 2001
From: kakkotetsu <kakkotetsu@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:54:37 +0900
Subject: [PATCH 0383/1674] [restapi] fix python version during restapi startup
 (#7056)

changed from python3 to python in supervisord.conf.
---
 dockers/docker-sonic-restapi/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index 5cfb3f0a4549..683f10ab4da8 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:dependent-startup]
-command=python3 -m supervisord_dependent_startup
+command=python -m supervisord_dependent_startup
 autostart=true
 autorestart=unexpected
 startretries=0

From 4ac2734c34ac4852aa6a00b75ac9cba5433e2436 Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Fri, 23 Apr 2021 18:25:34 +0200
Subject: [PATCH 0384/1674] [submodule] Advance sonic-sairedis submodule
 (#7409)

To fix innovium platform compilation and fix missing -lpython3.5 module
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index ea871a8de03e..bb13d59ba6af 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit ea871a8de03e93faae2aeea327c571a1a02b56f2
+Subproject commit bb13d59ba6af76f23a6121aa9a0200f1b4cfdd2d

From f7adf9c1808375e254728810950c54e8fa35b3f0 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 24 Apr 2021 23:17:07 +0800
Subject: [PATCH 0385/1674] [ci/build]: Upgrade SONiC package versions (#7415)

---
 .../versions-deb-buster                       |  38 +++---
 .../build-sonic-slave-buster/versions-py2     |   1 +
 .../build-sonic-slave-buster/versions-py3     |   1 +
 .../versions/default/versions-deb-buster      |  27 ++--
 files/build/versions/default/versions-py2     |   2 +-
 files/build/versions/default/versions-py3     |  12 +-
 files/build/versions/default/versions-web     |   8 +-
 .../docker-base-stretch/versions-deb-stretch  |  10 +-
 .../versions-deb-buster                       |  18 +--
 .../docker-syncd-bfn/versions-deb-buster      |   4 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  38 +++---
 .../sonic-slave-buster/versions-deb-buster    | 121 +++++++++---------
 .../dockers/sonic-slave-buster/versions-py2   |   1 +
 .../dockers/sonic-slave-buster/versions-py3   |   5 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  52 ++++----
 .../dockers/sonic-slave-stretch/versions-py2  |   1 +
 .../dockers/sonic-slave-stretch/versions-py3  |   5 +-
 .../host-base-image/versions-deb-buster       |  10 +-
 .../versions/host-image/versions-deb-buster   |  29 ++---
 files/build/versions/host-image/versions-py2  |   2 +-
 files/build/versions/host-image/versions-py3  |   6 +-
 21 files changed, 200 insertions(+), 191 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 28601ef6467a..60c2b01ebed6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.2418
-applibs-dev==1.mlnx.4.4.2418
+applibs==1.mlnx.4.4.2522
+applibs-dev==1.mlnx.4.4.2522
 bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
@@ -8,8 +8,8 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2==1.mlnx.4.4.2418
-iproute2-dev==1.mlnx.4.4.2418
+iproute2==1.mlnx.4.4.2522
+iproute2-dev==1.mlnx.4.4.2522
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
 libatk-bridge2.0-dev==2.30.0-5
@@ -42,7 +42,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.1-1
+libsaibcm==4.3.3.5
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -91,23 +91,23 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
-sx-acl-helper==1.mlnx.4.4.2418
-sx-acl-helper-dev==1.mlnx.4.4.2418
-sx-complib==1.mlnx.4.4.2418
-sx-complib-dev==1.mlnx.4.4.2418
-sx-examples==1.mlnx.4.4.2418
-sx-examples-dev==1.mlnx.4.4.2418
-sx-gen-utils==1.mlnx.4.4.2418
-sx-gen-utils-dev==1.mlnx.4.4.2418
-sx-scew==1.mlnx.4.4.2418
-sx-scew-dev==1.mlnx.4.4.2418
-sxd-libs==1.mlnx.4.4.2418
-sxd-libs-dev==1.mlnx.4.4.2418
+sx-acl-helper==1.mlnx.4.4.2522
+sx-acl-helper-dev==1.mlnx.4.4.2522
+sx-complib==1.mlnx.4.4.2522
+sx-complib-dev==1.mlnx.4.4.2522
+sx-examples==1.mlnx.4.4.2522
+sx-examples-dev==1.mlnx.4.4.2522
+sx-gen-utils==1.mlnx.4.4.2522
+sx-gen-utils-dev==1.mlnx.4.4.2522
+sx-scew==1.mlnx.4.4.2522
+sx-scew-dev==1.mlnx.4.4.2522
+sxd-libs==1.mlnx.4.4.2522
+sxd-libs-dev==1.mlnx.4.4.2522
 syncd==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
-wjh-libs==1.mlnx.4.4.2418
-wjh-libs-dev==1.mlnx.4.4.2418
+wjh-libs==1.mlnx.4.4.2522
+wjh-libs-dev==1.mlnx.4.4.2522
 x11proto-composite-dev==1:2018.4-4
 x11proto-input-dev==2018.4-4
 x11proto-randr-dev==2018.4-4
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index b740e4ebeb83..3c83200bef61 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -5,6 +5,7 @@ future==0.18.2
 importlib-resources==3.3.1
 ipaddress==1.0.23
 jsonschema==2.6.0
+lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 pyangbind==0.6.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 036738d13aec..d52b83b0bc5a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,6 +1,7 @@
 bitarray==1.5.3
 ijson==2.6.1
 ipaddress==1.0.23
+lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index a49f7f5eab81..ae829825ccdd 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -1,11 +1,12 @@
-apt-utils==1.8.2.2
+apt==1.8.2.3
+apt-utils==1.8.2.3
 arping==2.19-6
 bridge-utils==1.6-2
 bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 conntrack==1:1.4.5-2
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u1
+curl==7.64.0-4+deb10u2
 dmidecode==3.2-1
 dpkg-dev==1.19.7
 fancontrol==1:3.5.0-3
@@ -24,15 +25,15 @@ isc-dhcp-relay==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
-libapt-inst2.0==1.8.2.2
+libapt-inst2.0==1.8.2.3
 libatomic1==8.3.0-6
-libbsd0==0.9.1-2
+libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1
 libc-dev-bin==2.28-10
 libc-l10n==2.28-10
 libc6-dev==2.28-10
 libcairo2==1.16.0-4+deb10u1
-libcurl4==7.64.0-4+deb10u1
+libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
@@ -111,14 +112,14 @@ libpython2.7==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u2
-libpython3.7-minimal==3.7.3-2+deb10u2
-libpython3.7-stdlib==3.7.3-2+deb10u2
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
 libreadline7==7.0-5
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.1-1
+libsaibcm==4.3.3.5
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
@@ -152,7 +153,7 @@ libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
-linux-libc-dev==4.19.171-2
+linux-libc-dev==4.19.181-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
 locales==2.28-10
@@ -186,8 +187,8 @@ python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
 python3-smbus==4.1-1
 python3-swsscommon==1.0.0
-python3.7==3.7.3-2+deb10u2
-python3.7-minimal==3.7.3-2+deb10u2
+python3.7==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
 radvd==1:2.17-2
 readline-common==7.0-5
 redis-server==5:6.0.6-1~bpo10+1
@@ -209,7 +210,7 @@ swss==1.0.0
 syncd==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
-udev==241-7~deb10u6
+udev==241-7~deb10u7
 vim-common==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index 6f9cf7f55055..eedc8044a893 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -7,7 +7,7 @@ importlib-resources==3.3.1
 ipaddress==1.0.23
 Jinja2==2.11.3
 jsonschema==2.6.0
-lxml==4.6.2
+lxml==4.6.3
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index bb5f23812ddc..b166847d8af1 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -6,11 +6,11 @@ click==7.1.2
 clickclick==20.10.2
 connexion==2.7.0
 Flask==1.1.2
-grpcio==1.36.1
+grpcio==1.37.0
 grpcio-tools==1.20.0
-hiredis==1.1.0
+hiredis==2.0.0
 idna==2.10
-importlib-metadata==3.8.0
+importlib-metadata==4.0.1
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
@@ -18,14 +18,14 @@ itsdangerous==1.1.0
 j2cli==0.3.10
 Jinja2==2.11.3
 jsonschema==3.2.0
-lxml==4.6.2
+lxml==4.6.3
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.0
-protobuf==3.15.6
+protobuf==3.15.8
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
@@ -36,7 +36,7 @@ python-dateutil==2.6.0
 PyYAML==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.3.17
+regex==2021.4.4
 requests==2.25.1
 scapy==2.4.4
 smbus==1.1.post2
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6620fb903af3..11446887ba19 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -15,8 +15,8 @@ http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210219_deb10.deb==4bd3f9c10d159d6d32e984c1de5a569c
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210219_deb10.deb==57e0b2f6a8412de63e307105571b7ed2
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
@@ -42,8 +42,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=EavLNMXA6OS3s9oD34bKbdtfYHppR4egkh7V7jc4gWM%3D&se=2034-11-14T03%3A31%3A04Z&sp=r==81da461319cada4059a94f43d4d8509c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.3.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=n7KoEZ5wXY%2FobPAy62d9C%2BKyAkKo4PIdIAWwqnDBm3E%3D&se=2034-11-14T03%3A30%3A33Z&sp=r==12b8cdd22a07c0ce6b33114cf75b2fe3
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7I70XjzysspEht%2BsOwCM5QbtCe%2Boelh0%2FfwrhHPGh1g%3D&se=2034-12-30T07%3A06%3A51Z&sp=r==873ad911d2b9b03bab053fc5df78db17
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7XHTTf9%2FWBxEqX0Y8g7KqH8t3AFz1dJIZeY3YEDRypc%3D&se=2034-12-30T07%3A06%3A11Z&sp=r==58723be632fd726323e71f81a51540e6
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index bc7c0920e5d2..74ca68b251e4 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -33,9 +33,9 @@ libpgm-5.2-0==5.2.122~dfsg-2
 libprocps6==2:3.3.12-3+deb9u1
 libpsl5==0.17.0-3
 libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u4
-libpython2.7-minimal==2.7.13-2+deb9u4
-libpython2.7-stdlib==2.7.13-2+deb9u4
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
 libreadline7==7.0-3
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -60,8 +60,8 @@ python==2.7.13-2
 python-minimal==2.7.13-2
 python-pip==9.0.1-2+deb9u2
 python-pip-whl==9.0.1-2+deb9u2
-python2.7==2.7.13-2+deb9u4
-python2.7-minimal==2.7.13-2+deb9u4
+python2.7==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
 readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index e1795bb10102..cc246ec7ec9d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.2418
-applibs-dev==1.mlnx.4.4.2418
+applibs==1.mlnx.4.4.2522
+applibs-dev==1.mlnx.4.4.2522
 ethtool==1:5.9-1
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
@@ -12,15 +12,15 @@ libsensors5-dbgsym==1:3.5.0-3
 libswsscommon-dbg==1.0.0
 lm-sensors-dbgsym==1:3.5.0-3
 openssh-client==1:7.9p1-10+deb10u2
-python-sdk-api==1.mlnx.4.4.2418
+python-sdk-api==1.mlnx.4.4.2522
 sensord-dbgsym==1:3.5.0-3
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.2418
-sx-complib-dev==1.mlnx.4.4.2418
-sx-gen-utils==1.mlnx.4.4.2418
-sx-gen-utils-dev==1.mlnx.4.4.2418
-sxd-libs==1.mlnx.4.4.2418
-sxd-libs-dev==1.mlnx.4.4.2418
+sx-complib==1.mlnx.4.4.2522
+sx-complib-dev==1.mlnx.4.4.2522
+sx-gen-utils==1.mlnx.4.4.2522
+sx-gen-utils-dev==1.mlnx.4.4.2522
+sxd-libs==1.mlnx.4.4.2522
+sxd-libs-dev==1.mlnx.4.4.2522
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 79bde915fac7..ee5c2bee1606 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,7 +1,7 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
-libcurl3-gnutls==7.64.0-4+deb10u1
-libcurl4-gnutls-dev==7.64.0-4+deb10u1
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
 liblzma-dev==5.2.4-1
 libpcap-dev==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index ac21a6977c36..05575075bf83 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,7 +1,7 @@
-applibs==1.mlnx.4.4.2418
-applibs-dev==1.mlnx.4.4.2418
-iproute2==1.mlnx.4.4.2418
-iproute2-dev==1.mlnx.4.4.2418
+applibs==1.mlnx.4.4.2522
+applibs-dev==1.mlnx.4.4.2522
+iproute2==1.mlnx.4.4.2522
+iproute2-dev==1.mlnx.4.4.2522
 libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
 libpython-dev==2.7.16-1
@@ -10,21 +10,21 @@ libpython2.7-dev==2.7.16-2+deb10u1
 mlnx-sai==1.mlnx.SAIRel1.18.1.0
 python-dev==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.2418
+python-sdk-api==1.mlnx.4.4.2522
 python-setuptools==40.8.0-1
 python2-dev==2.7.16-1
 python2.7-dev==2.7.16-2+deb10u1
-sx-acl-helper==1.mlnx.4.4.2418
-sx-acl-helper-dev==1.mlnx.4.4.2418
-sx-complib==1.mlnx.4.4.2418
-sx-complib-dev==1.mlnx.4.4.2418
-sx-examples==1.mlnx.4.4.2418
-sx-examples-dev==1.mlnx.4.4.2418
-sx-gen-utils==1.mlnx.4.4.2418
-sx-gen-utils-dev==1.mlnx.4.4.2418
-sx-scew==1.mlnx.4.4.2418
-sx-scew-dev==1.mlnx.4.4.2418
-sxd-libs==1.mlnx.4.4.2418
-sxd-libs-dev==1.mlnx.4.4.2418
-wjh-libs==1.mlnx.4.4.2418
-wjh-libs-dev==1.mlnx.4.4.2418
\ No newline at end of file
+sx-acl-helper==1.mlnx.4.4.2522
+sx-acl-helper-dev==1.mlnx.4.4.2522
+sx-complib==1.mlnx.4.4.2522
+sx-complib-dev==1.mlnx.4.4.2522
+sx-examples==1.mlnx.4.4.2522
+sx-examples-dev==1.mlnx.4.4.2522
+sx-gen-utils==1.mlnx.4.4.2522
+sx-gen-utils-dev==1.mlnx.4.4.2522
+sx-scew==1.mlnx.4.4.2522
+sx-scew-dev==1.mlnx.4.4.2522
+sxd-libs==1.mlnx.4.4.2522
+sxd-libs-dev==1.mlnx.4.4.2522
+wjh-libs==1.mlnx.4.4.2522
+wjh-libs-dev==1.mlnx.4.4.2522
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 8822045f3a06..8245c8630934 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,10 @@
 adwaita-icon-theme==3.30.1-1
 ant==1.10.5-2
 ant-optional==1.10.5-2
+apt==1.8.2.3
 apt-file==3.2.2
-apt-transport-https==1.8.2.2
-apt-utils==1.8.2.2
+apt-transport-https==1.8.2.3
+apt-utils==1.8.2.3
 arch-test==0.15-2+deb10u1
 asciidoctor==1.5.8-1
 aspell==0.60.7~20110707-6
@@ -58,7 +59,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u1
+curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 dbus-user-session==1.12.20-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
@@ -102,9 +103,9 @@ dwz==0.12-3
 eatmydata==105-7
 emacsen-common==3.0.4
 equivs==2.2.0
-exim4-base==4.92-8+deb10u4
-exim4-config==4.92-8+deb10u4
-exim4-daemon-light==4.92-8+deb10u4
+exim4-base==4.92-8+deb10u5
+exim4-config==4.92-8+deb10u5
+exim4-daemon-light==4.92-8+deb10u5
 expat==2.2.6-2+deb10u1
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
@@ -160,8 +161,8 @@ gpg-wks-server==2.2.12-1+deb10u1
 gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
 graphviz==2.40.1-6
-groff==1.22.4-3
-groff-base==1.22.4-3
+groff==1.22.4-3+deb10u1
+groff-base==1.22.4-3+deb10u1
 gsettings-desktop-schemas==3.28.1-1
 gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
 gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2
@@ -218,7 +219,7 @@ libaopalliance-java==20070526-6
 libapache-pom-java==18-1
 libapparmor1==2.13.2-10
 libappstream4==0.12.5-1
-libapt-inst2.0==1.8.2.2
+libapt-inst2.0==1.8.2.3
 libapt-pkg-perl==0.1.34+b1
 libarchive-cpio-perl==0.10-1
 libarchive-zip-perl==1.64-1
@@ -247,9 +248,9 @@ libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
 libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.7-4+b1
-libavahi-common-data==0.7-4+b1
-libavahi-common3==0.7-4+b1
+libavahi-client3==0.7-4+deb10u1
+libavahi-common-data==0.7-4+deb10u1
+libavahi-common3==0.7-4+deb10u1
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
 libavcodec58==7:4.1.6-1~deb10u1
@@ -309,8 +310,8 @@ libboost1.71-dev==1.71.0-6~bpo10+1
 libbrlapi0.6==5.6-10+deb10u1
 libbrotli1==1.0.7-2+deb10u1
 libbs2b0==3.1.0+dfsg-2.2
-libbsd-dev==0.9.1-2
-libbsd0==0.9.1-2
+libbsd-dev==0.9.1-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u1
 libc-ares-dev==1.14.0-1
@@ -379,10 +380,10 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13
 libcups2==2.2.10-6+deb10u4
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u4
-libcurl3-gnutls==7.64.0-4+deb10u1
-libcurl3-nss==7.64.0-4+deb10u1
-libcurl4==7.64.0-4+deb10u1
-libcurl4-nss-dev==7.64.0-4+deb10u1
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl3-nss==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u2
+libcurl4-nss-dev==7.64.0-4+deb10u2
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
@@ -630,7 +631,7 @@ libjemalloc2==5.1.0-3
 libjetty9-java==9.4.15-1
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjs-bootstrap==3.4.1+dfsg-1
-libjs-jquery==3.3.1~dfsg-3
+libjs-jquery==3.3.1~dfsg-3+deb10u1
 libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
 libjs-jquery-isonscreen==1.2.0-1
 libjs-jquery-metadata==12-1.1
@@ -638,7 +639,7 @@ libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
 libjs-jquery-throttle-debounce==1.1+dfsg.1-1
 libjs-modernizr==2.6.2+ds1-3
 libjs-sphinxdoc==1.8.4-1
-libjs-underscore==1.9.1~dfsg-1
+libjs-underscore==1.9.1~dfsg-1+deb10u1
 libjson-c-dev==0.12.1+ds-2+deb10u1
 libjson-c3==0.12.1+ds-2+deb10u1
 libjson-glib-1.0-0==1.4.4-2
@@ -772,7 +773,7 @@ libnorm-dev==1.5.8+dfsg2-1
 libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
-libnss-systemd==241-7~deb10u6
+libnss-systemd==241-7~deb10u7
 libnss3==2:3.42.1-1+deb10u3
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
@@ -789,7 +790,7 @@ libopencsd-dev==0.10.1-1
 libopencsd0==0.10.1-1
 libopenexr23==2.2.1-4.1+deb10u1
 libopengl0==1.1.0-1
-libopenjp2-7==2.3.0-2+deb10u1
+libopenjp2-7==2.3.0-2+deb10u2
 libopenmpi-dev==3.1.3-11
 libopenmpi3==3.1.3-11
 libopenmpt0==0.4.3-1+deb10u1
@@ -805,7 +806,7 @@ libp11-kit-dev==0.23.15-2+deb10u1
 libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
-libpam-systemd==241-7~deb10u6
+libpam-systemd==241-7~deb10u7
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
@@ -895,11 +896,11 @@ libpython3-all-dev==3.7.3-1
 libpython3-dbg==3.7.3-1
 libpython3-dev==3.7.3-1
 libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u2
-libpython3.7-dbg==3.7.3-2+deb10u2
-libpython3.7-dev==3.7.3-2+deb10u2
-libpython3.7-minimal==3.7.3-2+deb10u2
-libpython3.7-stdlib==3.7.3-2+deb10u2
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dbg==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
 libqdox-java==1.12.1-3
 libqdox2-java==2.0~M10-1
 libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
@@ -1032,7 +1033,7 @@ libswresample3==7:4.1.6-1~deb10u1
 libswscale5==7:4.1.6-1~deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
-libsystemd-dev==241-7~deb10u6
+libsystemd-dev==241-7~deb10u7
 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
@@ -1072,7 +1073,7 @@ libtype-tiny-xs-perl==0.014-1+b1
 libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
-libudev-dev==241-7~deb10u6
+libudev-dev==241-7~deb10u7
 libunbound8==1.9.0-2+deb10u2
 libunicode-utf8-perl==0.62-1
 libunwind-dev==1.2.1-10~deb10u1
@@ -1190,15 +1191,15 @@ libxdelta2==1.1.3-9.2
 libxdmcp-dev==1:1.1.2-3
 libxdmcp6==1:1.1.2-3
 libxdot4==2.40.1-6
-libxencall1==4.11.4+57-g41a822c392-2
-libxendevicemodel1==4.11.4+57-g41a822c392-2
-libxenevtchn1==4.11.4+57-g41a822c392-2
-libxenforeignmemory1==4.11.4+57-g41a822c392-2
-libxengnttab1==4.11.4+57-g41a822c392-2
-libxenmisc4.11==4.11.4+57-g41a822c392-2
-libxenstore3.0==4.11.4+57-g41a822c392-2
-libxentoolcore1==4.11.4+57-g41a822c392-2
-libxentoollog1==4.11.4+57-g41a822c392-2
+libxencall1==4.11.4+99-g8bce4698f6-1
+libxendevicemodel1==4.11.4+99-g8bce4698f6-1
+libxenevtchn1==4.11.4+99-g8bce4698f6-1
+libxenforeignmemory1==4.11.4+99-g8bce4698f6-1
+libxengnttab1==4.11.4+99-g8bce4698f6-1
+libxenmisc4.11==4.11.4+99-g8bce4698f6-1
+libxenstore3.0==4.11.4+99-g8bce4698f6-1
+libxentoolcore1==4.11.4+99-g8bce4698f6-1
+libxentoollog1==4.11.4+99-g8bce4698f6-1
 libxerces2-java==2.12.0-1
 libxext-dev==2:1.3.3-1+b2
 libxext6==2:1.3.3-1+b2
@@ -1256,12 +1257,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.171-2
-linux-headers-4.19.0-14-amd64==4.19.171-2
-linux-headers-4.19.0-14-common==4.19.171-2
-linux-headers-amd64==4.19+105+deb10u9
-linux-kbuild-4.19==4.19.171-2
-linux-libc-dev==4.19.171-2
+linux-compiler-gcc-8-x86==4.19.181-1
+linux-headers-4.19.0-16-amd64==4.19.181-1
+linux-headers-4.19.0-16-common==4.19.181-1
+linux-headers-amd64==4.19+105+deb10u11
+linux-kbuild-4.19==4.19.181-1
+linux-libc-dev==4.19.181-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1299,10 +1300,10 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.9.1+1-1~deb10u2
-openjdk-11-jdk-headless==11.0.9.1+1-1~deb10u2
-openjdk-11-jre==11.0.9.1+1-1~deb10u2
-openjdk-11-jre-headless==11.0.9.1+1-1~deb10u2
+openjdk-11-jdk==11.0.11+9-1~deb10u1
+openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
+openjdk-11-jre==11.0.11+9-1~deb10u1
+openjdk-11-jre-headless==11.0.11+9-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
@@ -1327,7 +1328,7 @@ php-deepcopy==1.8.1-1
 php-doctrine-instantiator==1.1.0-2
 php-file-iterator==2.0.2-1
 php-mbstring==2:7.3+69
-php-pear==1:1.10.6+submodules+notgz-1.1+deb10u1
+php-pear==1:1.10.6+submodules+notgz-1.1+deb10u2
 php-phar-io-manifest==1.0.3-1
 php-phar-io-version==2.0.1-1
 php-phpdocumentor-reflection-common==1.0.1-1
@@ -1424,7 +1425,7 @@ python-keyring==17.1.1-1
 python-keyrings.alt==3.1.1-1
 python-lazy-object-proxy==1.3.1-1+b1
 python-logilab-common==1.4.2-1
-python-lxml==4.3.2-1+deb10u2
+python-lxml==4.3.2-1+deb10u3
 python-markupsafe==1.1.0-1
 python-mccabe==0.6.1-2
 python-minimal==2.7.16-1
@@ -1444,7 +1445,7 @@ python-pluggy==0.8.0-1
 python-py==1.7.0-2
 python-pyasn1==0.4.2-3
 python-pyasn1-modules==0.2.1-0.2
-python-pygments==2.3.1+dfsg-1+deb10u1
+python-pygments==2.3.1+dfsg-1+deb10u2
 python-pyparsing==2.2.0+dfsg1-2
 python-pytest==3.10.1-2
 python-pytest-cov==2.6.0-1
@@ -1525,7 +1526,7 @@ python3-pkg-resources==40.8.0-1
 python3-pluggy==0.8.0-1
 python3-py==1.7.0-2
 python3-pycurl==7.43.0.2-0.1
-python3-pygments==2.3.1+dfsg-1+deb10u1
+python3-pygments==2.3.1+dfsg-1+deb10u2
 python3-pyparsing==2.2.0+dfsg1-2
 python3-pytest==3.10.1-2
 python3-pytest-cov==2.6.0-1
@@ -1542,10 +1543,10 @@ python3-unidiff==0.5.4-1
 python3-urllib3==1.24.1-1
 python3-wheel==0.32.3-2
 python3-xdg==0.25-5
-python3.7==3.7.3-2+deb10u2
-python3.7-dbg==3.7.3-2+deb10u2
-python3.7-dev==3.7.3-2+deb10u2
-python3.7-minimal==3.7.3-2+deb10u2
+python3.7==3.7.3-2+deb10u3
+python3.7-dbg==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
 qdbus==4:4.8.7+dfsg-18+deb10u1
 qemu-kvm==1:3.1+dfsg-8+deb10u8
 qemu-system-common==1:3.1+dfsg-8+deb10u8
@@ -1600,8 +1601,8 @@ strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-systemd==241-7~deb10u6
-systemd-sysv==241-7~deb10u6
+systemd==241-7~deb10u7
+systemd-sysv==241-7~deb10u7
 t1utils==1.41-3
 tcl==8.6.9+1
 tcl8.6==8.6.9+dfsg-2
@@ -1657,7 +1658,7 @@ xkb-data==2.26-2
 xml-core==0.18+nmu1
 xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.32-2.2~deb10u1
-xterm==344-1
+xterm==344-1+deb10u1
 xtrans-dev==1.3.5-1
 xxd==2:8.1.0875-5
 xz-utils==5.2.4-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
index bc9a8d62e678..2aaf37e5d3ae 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -46,6 +46,7 @@ mmh3==2.5.1
 mock==3.0.5
 mockredispy==2.9.3
 more-itertools==4.2.0
+nose==1.3.7
 nose2==0.8.0
 olefile==0.46
 packaging==19.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 96b8241df7a4..762a2a60891c 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 Babel==2.6.0
-bitarray==1.8.1
+bitarray==2.0.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -29,6 +29,7 @@ mmh3==2.5.1
 mock==2.0.0
 mockredispy==2.9.3
 more-itertools==4.2.0
+nose==1.3.7
 nose2==0.8.0
 olefile==0.46
 packaging==19.0
@@ -58,7 +59,7 @@ pytz==2019.1
 pyxdg==0.25
 PyYAML==5.4.1
 redis==3.5.3
-regex==2021.3.17
+regex==2021.4.4
 requests==2.21.0
 roman==2.0.0
 SecretStorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 146d26c60f02..f642b0336ad7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -606,7 +606,7 @@ libjs-jquery-throttle-debounce==1.1+dfsg.1-1
 libjs-modernizr==2.6.2+ds1-1
 libjs-sphinxdoc==1.4.9-2
 libjs-twitter-bootstrap==2.0.2+dfsg-10
-libjs-underscore==1.8.3~dfsg-1
+libjs-underscore==1.8.3~dfsg-1+deb9u1
 libjsch-java==0.1.54-1
 libjson-c-dev==0.12.1-1.1+deb9u1
 libjson-c3==0.12.1-1.1+deb9u1
@@ -823,20 +823,20 @@ libpulse0==10.0-1+deb9u1
 libpython-all-dev==2.7.13-2
 libpython-dev==2.7.13-2
 libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u4
-libpython2.7-dev==2.7.13-2+deb9u4
-libpython2.7-minimal==2.7.13-2+deb9u4
-libpython2.7-stdlib==2.7.13-2+deb9u4
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-dev==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
 libpython3-all-dbg==3.5.3-1
 libpython3-all-dev==3.5.3-1
 libpython3-dbg==3.5.3-1
 libpython3-dev==3.5.3-1
 libpython3-stdlib==3.5.3-1
-libpython3.5==3.5.3-1+deb9u3
-libpython3.5-dbg==3.5.3-1+deb9u3
-libpython3.5-dev==3.5.3-1+deb9u3
-libpython3.5-minimal==3.5.3-1+deb9u3
-libpython3.5-stdlib==3.5.3-1+deb9u3
+libpython3.5==3.5.3-1+deb9u4
+libpython3.5-dbg==3.5.3-1+deb9u4
+libpython3.5-dev==3.5.3-1+deb9u4
+libpython3.5-minimal==3.5.3-1+deb9u4
+libpython3.5-stdlib==3.5.3-1+deb9u4
 libqdox-java==1.12.1-2
 libqdox2-java==2.0~M3-3
 libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
@@ -1170,10 +1170,10 @@ ncurses-term==6.0+20161126-1+deb9u2
 netbase==5.4
 netpbm==2:10.0-15.3+b2
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u275-b01-1~deb9u1
-openjdk-8-jdk-headless==8u275-b01-1~deb9u1
-openjdk-8-jre==8u275-b01-1~deb9u1
-openjdk-8-jre-headless==8u275-b01-1~deb9u1
+openjdk-8-jdk==8u292-b10-0+deb9u1
+openjdk-8-jdk-headless==8u292-b10-0+deb9u1
+openjdk-8-jre==8u292-b10-0+deb9u1
+openjdk-8-jre-headless==8u292-b10-0+deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
@@ -1196,7 +1196,7 @@ php-common==1:49
 php-deepcopy==1.5.5-1
 php-doctrine-instantiator==1.0.5-2
 php-file-iterator==1.4.1-2
-php-pear==1:1.10.1+submodules+notgz-9+deb9u2
+php-pear==1:1.10.1+submodules+notgz-9+deb9u3
 php-phpdocumentor-reflection-docblock==2.0.4-2
 php-phpspec-prophecy==1.6.2-1
 php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
@@ -1317,9 +1317,9 @@ python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
 python-xdg==0.25-4
 python-zope.interface==4.3.2-1
-python2.7==2.7.13-2+deb9u4
-python2.7-dev==2.7.13-2+deb9u4
-python2.7-minimal==2.7.13-2+deb9u4
+python2.7==2.7.13-2+deb9u5
+python2.7-dev==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
 python3==3.5.3-1
 python3-alabaster==0.7.8-1
 python3-all==3.5.3-1
@@ -1359,15 +1359,15 @@ python3-sphinx==1.4.9-2
 python3-tz==2016.7-0.3
 python3-wheel==0.29.0-2
 python3-xdg==0.25-4
-python3.5==3.5.3-1+deb9u3
-python3.5-dbg==3.5.3-1+deb9u3
-python3.5-dev==3.5.3-1+deb9u3
-python3.5-minimal==3.5.3-1+deb9u3
+python3.5==3.5.3-1+deb9u4
+python3.5-dbg==3.5.3-1+deb9u4
+python3.5-dev==3.5.3-1+deb9u4
+python3.5-minimal==3.5.3-1+deb9u4
 qdbus==4:4.8.7+dfsg-11+deb9u1
-qemu-kvm==1:2.8+dfsg-6+deb9u13
-qemu-system-common==1:2.8+dfsg-6+deb9u13
-qemu-system-x86==1:2.8+dfsg-6+deb9u13
-qemu-utils==1:2.8+dfsg-6+deb9u13
+qemu-kvm==1:2.8+dfsg-6+deb9u14
+qemu-system-common==1:2.8+dfsg-6+deb9u14
+qemu-system-x86==1:2.8+dfsg-6+deb9u14
+qemu-utils==1:2.8+dfsg-6+deb9u14
 qt-at-spi==0.4.0-5
 qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
 qt4-qmake==4:4.8.7+dfsg-11+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index 6588cc6c920d..c1a558f686db 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -35,6 +35,7 @@ M2Crypto==0.36.0
 MarkupSafe==1.1.1
 mmh3==3.0.0
 mockredispy==2.9.3
+nose==1.3.7
 nose2==0.6.5
 PAM==0.4.2
 parse==1.6.6
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 14615c3137b7..d144264bd918 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 Babel==2.3.4
-bitarray==1.8.1
+bitarray==2.0.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -14,6 +14,7 @@ keyrings.alt==1.3
 lxml==4.6.2
 MarkupSafe==0.23
 mockredispy==2.9.3
+nose==1.3.7
 Pillow==4.0.0
 pyang==2.4.0
 pyangbind==0.8.1
@@ -28,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 PyYAML==5.3.1
 redis==3.5.3
-regex==2021.3.17
+regex==2021.4.4
 roman==2.0.0
 SecretStorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
index 0325858b9320..7899f38da183 100644
--- a/files/build/versions/host-base-image/versions-deb-buster
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -1,13 +1,13 @@
 adduser==3.118
 apt==1.8.2.2
-base-files==10.3+deb10u8
+base-files==10.3+deb10u9
 base-passwd==3.5.46
 bash==5.0-4
 bsdutils==1:2.33.1-0.1
 coreutils==8.30-3
 dash==0.5.10.2-5
 debconf==1.5.71
-debian-archive-keyring==2019.1
+debian-archive-keyring==2019.1+deb10u1
 debianutils==4.8.6.1
 diffutils==1:3.7-3
 dpkg==1.19.7
@@ -62,13 +62,13 @@ libsepol1==2.8-1
 libsmartcols1==2.33.1-0.1
 libss2==1.44.5-1+deb10u3
 libstdc++6==8.3.0-6
-libsystemd0==241-7~deb10u6
+libsystemd0==241-7~deb10u7
 libtasn1-6==4.13-3
 libtinfo6==6.1+20181013-2+deb10u2
-libudev1==241-7~deb10u6
+libudev1==241-7~deb10u7
 libunistring2==0.9.10-1
 libuuid1==2.33.1-0.1
-libzstd1==1.3.8+dfsg-3
+libzstd1==1.3.8+dfsg-3+deb10u2
 login==1:4.5-1.1
 mawk==1.3.3-17+b3
 mount==2.33.1-0.1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 768bb6151d90..5d9037df546c 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -12,7 +12,7 @@ conntrack==1:1.4.5-2
 containerd.io==1.4.4-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u1
+curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 device-tree-compiler==1.4.7-4
 dirmngr==2.2.12-1+deb10u1
@@ -46,7 +46,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2000
+hw-management==1.mlnx.7.0010.2002
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
@@ -57,7 +57,7 @@ ipmitool==1.8.18-6
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
 iptables-persistent==1.0.11+deb10u1
-iputils-ping==3:20180629-2+deb10u1
+iputils-ping==3:20180629-2+deb10u2
 isc-dhcp-client==4.4.1-2
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
@@ -73,13 +73,13 @@ libassuan0==2.5.2-1
 libboost-filesystem1.67.0==1.67.0-13+deb10u1
 libboost-program-options1.67.0==1.67.0-13+deb10u1
 libboost-system1.67.0==1.67.0-13+deb10u1
-libbsd0==0.9.1-2
+libbsd0==0.9.1-2+deb10u1
 libc-l10n==2.28-10
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
-libcurl4==7.64.0-4+deb10u1
+libcurl4==7.64.0-4+deb10u2
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
@@ -161,9 +161,9 @@ libpython2.7==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u2
-libpython3.7-minimal==3.7.3-2+deb10u2
-libpython3.7-stdlib==3.7.3-2+deb10u2
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsasl2-2==2.1.27+dfsg-1+deb10u1
@@ -184,7 +184,6 @@ libxtables12==1.8.2-4
 libyaml-0-2==0.2.1-1
 libyang==1.0.73
 libyang-cpp==1.0.73
-libzstd1==1.3.8+dfsg-3+deb10u2
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
 locales==2.28-10
@@ -246,8 +245,8 @@ python3-sonic-platform-arista==1.0
 python3-swsscommon==1.0.0
 python3-yaml==3.13-2
 python3-yang==1.0.73
-python3.7==3.7.3-2+deb10u2
-python3.7-minimal==3.7.3-2+deb10u2
+python3.7==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
 rasdaemon==0.6.0-1.2
 readline-common==7.0-5
 rsyslog==8.1901.0-1
@@ -261,17 +260,17 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.2418
+sx-kernel==1.mlnx.4.4.2522
 sysfsutils==2.1.0+repack-5
-systemd==241-7~deb10u6
+systemd==241-7~deb10u7
 systemd-sonic-generator==1.0.0
-systemd-sysv==241-7~deb10u6
+systemd-sysv==241-7~deb10u7
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
-udev==241-7~deb10u6
+udev==241-7~deb10u7
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 7b7f1c9f1946..d74742f391f6 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -10,7 +10,7 @@ ipaddr==2.2.0
 ipaddress==1.0.23
 Jinja2==2.11.3
 jsonschema==2.6.0
-lxml==4.6.2
+lxml==4.6.3
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 5ca158e7ec5c..562427bf68a2 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -8,6 +8,7 @@ cffi==1.14.5
 chardet==3.0.4
 Click==7.0
 cryptography==3.4.7
+deepdiff==5.2.3
 docker==4.3.1
 idna==2.10
 ijson==2.6.1
@@ -15,12 +16,13 @@ ipaddress==1.0.23
 Jinja2==2.11.3
 jsondiff==1.2.0
 jsonschema==2.6.0
-lxml==4.6.2
+lxml==4.6.3
 M2Crypto==0.31.0
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.7
+ordered-set==4.0.2
 pathtools==0.1.2
 pexpect==4.8.0
 platform-arista==1.0
@@ -32,7 +34,7 @@ pycparser==2.20
 python-dateutil==2.8.1
 PyYAML==5.4.1
 redis==3.5.3
-regex==2021.3.17
+regex==2021.4.4
 requests==2.25.0
 scapy==2.4.4
 six==1.15.0

From c91b02cb1b7c92c3a61ab5080c69c5bd46ba947a Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sun, 25 Apr 2021 04:13:37 +0800
Subject: [PATCH 0386/1674] [submodule][202012] Advance submodule head for
 sonic-swss (#7411)

adf5ab58 [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (#1663)
8a732726 [intfsorch] Create subport with the entry contains necessary attributes (#1650)
7ba813b2 [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (#1634)
ed32e333 [portsorch] Configure hostif tagging for subports (#1573)
b5209c43 Handle IPv6 and ECMP routes to be programmed to ASIC (#1711)
515cc1a7 [Dynamic buffer calc][Mellanox] Fix bug: buffer over subscription in buffer pool size calculation (#1706)
0ad524b2 [202012] Allowing the first time FEC and AN configuration to be pushed to SAI (#1710)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index aec77ef490d5..adf5ab588335 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit aec77ef490d5f610d1e57725dc618b20996473a6
+Subproject commit adf5ab588335c05d974ca3c0778b2d8e58895879

From bf02ba16eed4ba7db96a97b48ce6168a88af486e Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 22 Apr 2021 10:11:11 +0800
Subject: [PATCH 0387/1674] [CI] Add azure pipeline file for official build

Signed-off-by: Shilong Liu <shilongliu@microsoft.com>
---
 .../azure-pipelines-UpgrateVersion.yml        |  24 +++-
 .azure-pipelines/azure-pipelines-build.yml    | 131 +++++++++++-------
 .../azure-pipelines-image-template.yml        |  56 ++++++++
 .../azure-pipelines-job-groups.yml            |   8 +-
 .azure-pipelines/build-template.yml           |   9 ++
 .azure-pipelines/cleanup.yml                  |   5 +-
 .azure-pipelines/official-build.yml           |  50 ++-----
 .azure-pipelines/run-test-template.yml        |   2 +
 8 files changed, 183 insertions(+), 102 deletions(-)
 create mode 100644 .azure-pipelines/azure-pipelines-image-template.yml

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 3cec0871ed05..b0b84cf3b1fb 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -18,10 +18,25 @@ pool: sonicbld
 
 stages:
 - stage: Build
+  variables:
+    CACHE_MODE: none
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
-      buildSlave: y
+      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
+      preSteps:
+      - script: |
+          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
+          if [ ! -z "$containers" ]; then
+            docker container kill $containers || true
+            sleep 5
+          fi
+          images=$(docker images 'sonic-slave-*' -a -q)
+          if [ ! -z "$images" ]; then
+            docker rmi -f $images
+          fi
+        displayName: 'Cleanup sonic slave'
 - stage: UpgradeVersions
   jobs:
   - job: UpgradeVersions
@@ -48,11 +63,14 @@ stages:
         cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/versions target/
         make freeze FREEZE_VERSION_OPTIONS=-r
         find files/build/versions 
-        for artifact in $artifacts
+        ordered_artifacts=$(echo "$artifacts" | grep -v -E "arm64|armhf" && echo "$artifacts" | grep -E "arm64|armhf")
+        for artifact in $ordered_artifacts
         do
           rm -rf target/versions
           cp -r $artifact/versions target/
-          make freeze FREEZE_VERSION_OPTIONS="-a -d"
+          OPTIONS="-a -d"
+          [[ "$artifact" == *arm64* || "$artifact" == *armhf* ]] && OPTIONS="-d"
+          make freeze FREEZE_VERSION_OPTIONS="$OPTIONS"
         done
         git diff files/build/versions
       displayName: 'Freeze Versions'
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 550e2ccd9799..278778df2a22 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -1,3 +1,5 @@
+# The azure pipeline template for Official build, and upgrade version build
+
 parameters:
 - name: 'jobFilters'
   type: object
@@ -5,68 +7,95 @@ parameters:
 - name: 'buildOptions'
   type: string
   default: 'SONIC_CONFIG_BUILD_JOBS=1'
-- name: 'buildSlave'
-  type: string
-  default: 'n'
+- name: 'preSteps'
+  type: stepList
+  default: []
 - name: 'postSteps'
   type: stepList
   default: []
 
 jobs:
-- template: azure-pipelines-job-groups.yml
+- template: azure-pipelines-image-template.yml
   parameters:
     jobFilters: ${{ parameters.jobFilters }}
-    preSteps:
-      - script: |
-          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
-          if [ ! -z "$containers" ]; then
-            docker container kill $containers || true
-            sleep 5
-          fi
-          if [ "${{ parameters.buildSlave }}" == "y" ]; then
-            images=$(docker images 'sonic-slave-*' -a -q)
-            [ ! -z "$images" ] && docker rmi -f $images
-          fi
-          sudo rm -rf $(ls -A1)
-        displayName: 'Init'
-      - checkout: self
-        submodules: recursive
-        displayName: 'Checkout code'
-      - script: |
-          make ${{ parameters.buildOptions }} PLATFORM=$GROUP_NAME configure
-        displayName: 'Make configure'
-    postSteps:
-      - ${{ parameters.postSteps }}
-      - publish: $(System.DefaultWorkingDirectory)/target
-        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
-        displayName: "Archive sonic image"
+    preSteps: ${{ parameters.preSteps }}
+    postSteps: ${{ parameters.postSteps }}
+    jobVariables:
+      PLATFORM_AZP: $(GROUP_NAME)
+      PLATFORM_ARCH: amd64
+      BUILD_OPTIONS: ${{ parameters.buildOptions }}
+      DOCKER_DATA_ROOT_FOR_MULTIARCH: /data/march/docker
+      dbg_image: false
+      swi_image: false
+      raw_image: false
+      sync_rpc_image: false
+      platform_rpc: false
     jobGroups:
       - name: vs
-        script: |
-          sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
-          make ${{ parameters.buildOptions }} target/sonic-vs.img.gz
-      - name: broadcom
-        script: |
-          make ${{ parameters.buildOptions }} target/sonic-broadcom.bin target/sonic-aboot-broadcom.swi
+        variables:
+          dbg_image: true
       - name: barefoot
-        script: |
-          make ${{ parameters.buildOptions }} target/sonic-barefoot.bin target/sonic-aboot-barefoot.swi
+        variables:
+          swi_image: true
+      - name: broadcom
+        variables:
+          dbg_image: true
+          swi_image: true
+          raw_image: true
+          sync_rpc_image: true
+          platform_rpc: brcm
       - name: centec
-        script: |
-          make ${{ parameters.buildOptions }} INSTALL_DEBUG_TOOLS=y target/sonic-centec.bin
-          mv target/sonic-centec.bin target/sonic-centec-dbg.bin
-          make ${{ parameters.buildOptions }} target/sonic-centec.bin
-          make ${{ parameters.buildOptions }} ENABLE_SYNCD_RPC=y target/docker-syncd-centec-rpc.gz
+        variables:
+          dbg_image: true
+          sync_rpc_image: true
+          platform_rpc: centec
+      - name: centec-arm64
+        pool: sonicbld_8c
+        timeoutInMinutes: 1800
+        variables:
+          PLATFORM_ARCH: arm64
+      - name: generic
+        variables:
+          dbg_image: true
       - name: innovium
-        script: |
-          make ${{ parameters.buildOptions }} SONIC_CONFIG_BUILD_JOBS=1 target/sonic-innovium.bin
+        variables:
+          swi_image: true
+      - name: marvell-armhf
+        pool: sonicbld_8c
+        timeoutInMinutes: 1800
+        variables:
+          PLATFORM_ARCH: armhf
       - name: mellanox
-        script: |
-          make ${{ parameters.buildOptions }} target/sonic-mellanox.bin
-      - name: mellanox
-        extName: _rpc
-        script: |
-          make ${{ parameters.buildOptions }} ENABLE_SYNCD_RPC=y all
+        variables:
+          dbg_image: true
+          sync_rpc_image: true
+          platform_rpc: mlnx
       - name: nephos
-        script: |
-          make ${{ parameters.buildOptions }} target/sonic-nephos.bin
+        variables:
+          dbg_image: true
+          sync_rpc_image: true
+          platform_rpc: nephos
+    buildSteps:
+      - bash: |
+          if [ $(GROUP_NAME) == vs ]; then
+            if [ $(dbg_image) == true ]; then
+              make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
+            fi
+            make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
+          else
+            if [ $(dbg_image) == true ]; then
+              make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \
+                mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
+            fi
+            if [ $(swi_image) == true ]; then
+              make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
+            fi
+            if [ $(raw_image) == true ]; then
+              make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
+            fi
+            if [ $(sync_rpc_image) == true ]; then
+              make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
+            fi
+            make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
+          fi
+        displayName: "Build sonic image"
diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
new file mode 100644
index 000000000000..c43836f1e31e
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -0,0 +1,56 @@
+# The azure pipeline template for PR build, Official build, and upgrade version build
+
+parameters:
+- name: 'jobFilters'
+  type: object
+  default: ''
+- name: 'preSteps'
+  type: stepList
+  default: []
+- name: 'buildSteps'
+  type: stepList
+  default: []
+- name: 'postSteps'
+  type: stepList
+  default: []
+- name: jobGroups
+  type: object
+  default: []
+- name: jobVariables
+  type: object
+  default: []
+jobs:
+- template: azure-pipelines-job-groups.yml
+  parameters:
+    jobFilters: ${{ parameters.jobFilters }}
+    jobVariables: ${{ parameters.jobVariables }}
+    preSteps:
+      - template: cleanup.yml
+      - ${{ parameters. preSteps }}
+      - script: |
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
+            CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
+            BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
+            echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
+          fi
+        displayName: "Set cache options"
+      - checkout: self
+        submodules: recursive
+        displayName: 'Checkout code'
+      - script: |
+          git checkout -b $(Build.SourceBranchName)
+          sudo modprobe overlay
+          sudo apt-get install -y acl
+          sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
+          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
+        displayName: 'Make configure'
+    postSteps:
+      - script: cp target -r $(Build.ArtifactStagingDirectory)/
+        displayName: Copy Artifacts
+      - publish:  $(Build.ArtifactStagingDirectory)
+        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+        displayName: "Archive sonic image"
+      - ${{ parameters.postSteps }}
+      - template: cleanup.yml
+    jobGroups: ${{ parameters.jobGroups }}
+    buildSteps: ${{ parameters.buildSteps }}
diff --git a/.azure-pipelines/azure-pipelines-job-groups.yml b/.azure-pipelines/azure-pipelines-job-groups.yml
index 1ca5c932b0a6..d5be80dcde3f 100644
--- a/.azure-pipelines/azure-pipelines-job-groups.yml
+++ b/.azure-pipelines/azure-pipelines-job-groups.yml
@@ -2,6 +2,9 @@ parameters:
 - name: 'preSteps'
   type: stepList
   default: []
+- name: 'buildSteps'
+  type: stepList
+  default: []
 - name: "postSteps"
   type: stepList
   default: []
@@ -16,14 +19,14 @@ parameters:
   default: ''
 - name: 'timeoutInMinutes'
   type: 'number'
-  default: 1440
+  default: 600
 - name: 'jobFilters'
   type: object
   default: ''
 
 jobs:
 - ${{ each jobGroup in parameters.jobGroups }}:
-  - ${{ if or(eq(parameters.jobFilters, ''), containsValue(parameters.jobFilters, jobGroup.name)) }}:
+  - ${{ if or(eq(parameters.jobFilters, ''), containsValue(parameters.jobFilters, jobGroup.name), endswith(variables['Build.DefinitionName'], format('.{0}{1}', jobGroup.name, jobGroup.extName))) }}:
     - job: ${{ replace(format('{0}{1}', jobGroup.name, jobGroup.extName), '-', '_') }}
       ${{ each pair in jobGroup }}:
         ${{ if not(in(pair.key, 'job', 'name', 'extName', 'variables', 'steps', 'script', 'scriptEnv')) }}:
@@ -50,4 +53,5 @@ jobs:
           displayName: 'JobScript'
       - ${{ if ne(jobGroup.steps, '') }}:
         - ${{ jobGroup.steps }}
+      - ${{ parameters.buildSteps }}
       - ${{ parameters.postSteps }}
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index c1cc04836a94..2665f46452c7 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -114,3 +114,12 @@ jobs:
   - publish: $(System.DefaultWorkingDirectory)/
     artifact: sonic-buildimage.${{ parameters.platform }}
     displayName: "Archive sonic image"
+  - script: |
+      set -x
+      find target -name "*.log" | xargs -I{} cp {} $(Build.ArtifactStagingDirectory)/
+    condition: failed()
+    displayName: "Copy build logs"
+  - publish: $(Build.ArtifactStagingDirectory)/
+    artifact: sonic-buildimage.${{ parameters.platform}}.logs@$(System.JobAttempt)
+    displayName: "Archive build logs"
+    condition: failed()
diff --git a/.azure-pipelines/cleanup.yml b/.azure-pipelines/cleanup.yml
index ffbcf298b6c9..6569c8ed0bf3 100644
--- a/.azure-pipelines/cleanup.yml
+++ b/.azure-pipelines/cleanup.yml
@@ -10,8 +10,5 @@ steps:
     if sudo [ -f dockerfs/var/run/docker.pid ] ; then
         pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
     fi
-    sudo rm -rf dockerfs
-    sudo rm -rf fsroot
-    username=$(id -un)
-    sudo chown -R ${username}.${username} .
+    sudo rm -rf $(ls -A1)
   displayName: "Clean Workspace"
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index b09a3bca7f6d..fa79be969746 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -17,47 +17,13 @@ pr: none
 
 stages:
 - stage: Build
-
+  pool: sonicbld
+  variables:
+    CACHE_MODE: wcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
   jobs:
-  - template: build-template.yml
-    parameters:
-      platform: broadcom
-      platform_short: brcm
-      cache_mode: wcache
-      dbg_image: true
-      swi_image: true
-      raw_image: true
-      sync_rpc_image: true
-
-  - template: build-template.yml
-    parameters:
-      platform: mellanox
-      platform_short: mlnx
-      cache_mode: wcache
-      dbg_image: true
-      sync_rpc_image: true
-
-  - template: build-template.yml
-    parameters:
-      platform: vs
-      platform_short: vs
-      dbg_image: true
-      cache_mode: wcache
-
-  - template: build-template.yml
-    parameters:
-      timeout: 3600
-      platform: marvell-armhf
-      platform_arch: armhf
-      platform_short: marvell-armhf
-      cache_mode: wcache
-      pool: sonicbld_8c
-
-  - template: build-template.yml
+  - template: azure-pipelines-build.yml
     parameters:
-      timeout: 3600
-      platform: centec-arm64
-      platform_arch: arm64
-      platform_short: centec-arm64
-      cache_mode: wcache
-      pool: sonicbld_8c
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobFilters: none
diff --git a/.azure-pipelines/run-test-template.yml b/.azure-pipelines/run-test-template.yml
index afe5eadec338..071286d0fb5e 100644
--- a/.azure-pipelines/run-test-template.yml
+++ b/.azure-pipelines/run-test-template.yml
@@ -49,6 +49,8 @@ steps:
         virsh -c qemu:///system dumpxml ${{ parameters.dut }} > $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.xml
         img=$(virsh -c qemu:///system domblklist ${{ parameters.dut }} | grep vda | awk '{print $2}')
         cp $img $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.img
+        gzip $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.img
+        sudo gzip $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.memdmp
         virsh -c qemu:///system undefine ${{ parameters.dut }}
     fi
 

From e45d636b7712e474448d40aaca31bd352e4e52cd Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 22 Apr 2021 10:18:04 +0800
Subject: [PATCH 0388/1674] fix

---
 azure-pipelines.yml | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fdc13b70f485..21c8d12324c8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,27 +33,18 @@ resources:
 stages:
 - stage: Build
   pool: sonicbld
-
+  variables:
+    CACHE_MODE: rcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
   jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      platform: broadcom
-      platform_short: brcm
-      cache_mode: rcache
-      sync_rpc_image: true
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      platform: mellanox
-      platform_short: mlnx
-      cache_mode: rcache
-      sync_rpc_image: true
-
-  - template: .azure-pipelines/build-template.yml
+  - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
-      platform: vs
-      platform_short: vs
-      cache_mode: rcache
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobFilters:
+      - vs
+      - broadcom
+      - mellanox
 
 - stage: Test
   variables:

From fd8e84ac508b14e4b15aa70507072839961ea84e Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 23 Apr 2021 09:26:16 +0800
Subject: [PATCH 0389/1674] [ci] Fix the boolean value case sensitive issue in
 Azure Pipelines (#7399)

Why I did it
Fix the boolean value case sensitive issue in Azure Pipelines

When passing parameters to a template, the "true" or "false" will have case sensitive issue, it should be a type casting issue.
To fix it, we change the true/false to yes/no, to escape the trap.

Support to override the job groups in the template, so PR build has chance to use different build parameters, only build simple targets. For example, for broadcom, we only build target/sonic-broadcom.bin, the other images, such as swi, debug bin, etc, will not be built.
---
 .azure-pipelines/azure-pipelines-build.yml | 116 +++++++++++----------
 azure-pipelines.yml                        |   8 +-
 2 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 278778df2a22..37d5463ffc76 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -13,6 +13,9 @@ parameters:
 - name: 'postSteps'
   type: stepList
   default: []
+- name: 'jobGroups'
+  type: object
+  default: []
 
 jobs:
 - template: azure-pipelines-image-template.yml
@@ -25,75 +28,78 @@ jobs:
       PLATFORM_ARCH: amd64
       BUILD_OPTIONS: ${{ parameters.buildOptions }}
       DOCKER_DATA_ROOT_FOR_MULTIARCH: /data/march/docker
-      dbg_image: false
-      swi_image: false
-      raw_image: false
-      sync_rpc_image: false
-      platform_rpc: false
-    jobGroups:
-      - name: vs
-        variables:
-          dbg_image: true
-      - name: barefoot
-        variables:
-          swi_image: true
-      - name: broadcom
-        variables:
-          dbg_image: true
-          swi_image: true
-          raw_image: true
-          sync_rpc_image: true
-          platform_rpc: brcm
-      - name: centec
-        variables:
-          dbg_image: true
-          sync_rpc_image: true
-          platform_rpc: centec
-      - name: centec-arm64
-        pool: sonicbld_8c
-        timeoutInMinutes: 1800
-        variables:
-          PLATFORM_ARCH: arm64
-      - name: generic
-        variables:
-          dbg_image: true
-      - name: innovium
-        variables:
-          swi_image: true
-      - name: marvell-armhf
-        pool: sonicbld_8c
-        timeoutInMinutes: 1800
-        variables:
-          PLATFORM_ARCH: armhf
-      - name: mellanox
-        variables:
-          dbg_image: true
-          sync_rpc_image: true
-          platform_rpc: mlnx
-      - name: nephos
-        variables:
-          dbg_image: true
-          sync_rpc_image: true
-          platform_rpc: nephos
+      dbg_image: no
+      swi_image: no
+      raw_image: no
+      sync_rpc_image: no
+      platform_rpc: no
+    ${{ if ne(parameters.jobGroups, '') }}:
+      jobGroups: ${{ parameters.jobGroups }}
+    ${{ if eq(parameters.jobGroups, '') }}:
+      jobGroups:
+        - name: vs
+          variables:
+            dbg_image: yes
+        - name: barefoot
+          variables:
+            swi_image: yes
+        - name: broadcom
+          variables:
+            dbg_image: yes
+            swi_image: yes
+            raw_image: yes
+            sync_rpc_image: yes
+            platform_rpc: brcm
+        - name: centec
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: centec
+        - name: centec-arm64
+          pool: sonicbld_8c
+          timeoutInMinutes: 1800
+          variables:
+            PLATFORM_ARCH: arm64
+        - name: generic
+          variables:
+            dbg_image: yes
+        - name: innovium
+          variables:
+            swi_image: yes
+        - name: marvell-armhf
+          pool: sonicbld_8c
+          timeoutInMinutes: 1800
+          variables:
+            PLATFORM_ARCH: armhf
+        - name: mellanox
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: mlnx
+        - name: nephos
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: nephos
     buildSteps:
       - bash: |
           if [ $(GROUP_NAME) == vs ]; then
-            if [ $(dbg_image) == true ]; then
+            if [ $(dbg_image) == yes ]; then
               make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
             fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
           else
-            if [ $(dbg_image) == true ]; then
+            if [ $(dbg_image) == yes ]; then
               make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \
                 mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
             fi
-            if [ $(swi_image) == true ]; then
+            if [ $(swi_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
             fi
-            if [ $(raw_image) == true ]; then
+            if [ $(raw_image) == yes ]; then
               make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
             fi
-            if [ $(sync_rpc_image) == true ]; then
+            if [ $(sync_rpc_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
             fi
             make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 21c8d12324c8..c842b4a44480 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,10 +41,10 @@ stages:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
-      jobFilters:
-      - vs
-      - broadcom
-      - mellanox
+      jobGroups:
+      - name: vs
+      - name: broadcom
+      - name: mellanox
 
 - stage: Test
   variables:

From a2d27eeb78a30ed412bb80a50800deab2d0be05b Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 23 Apr 2021 10:24:00 +0800
Subject: [PATCH 0390/1674] Improve the PR build version (#7381)

Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
---
 .azure-pipelines/azure-pipelines-image-template.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index c43836f1e31e..81f181cf3cb9 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -38,7 +38,9 @@ jobs:
         submodules: recursive
         displayName: 'Checkout code'
       - script: |
-          git checkout -b $(Build.SourceBranchName)
+          BRANCH_NAME=$(Build.SourceBranchName)
+          [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
+          git checkout -b $BRANCH_NAME
           sudo modprobe overlay
           sudo apt-get install -y acl
           sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"

From 2694afb0cd7eec1b97d898081910bdbbf074da2f Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 23 Apr 2021 12:56:09 +0800
Subject: [PATCH 0391/1674] [ci]: Fix official build not existing issue (#7408)

When submitting a new official build for broadcom, vs, it prompts a error message, which says the job is not defined.
It was caused by the default option "[]", which is not empty, it is used as the jobGroups parameter.
---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 37d5463ffc76..68ddd191186f 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -15,7 +15,7 @@ parameters:
   default: []
 - name: 'jobGroups'
   type: object
-  default: []
+  default: ''
 
 jobs:
 - template: azure-pipelines-image-template.yml

From 193c376f97ff1a5039d630825dbacfd875f25da9 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 23 Apr 2021 17:58:46 +0800
Subject: [PATCH 0392/1674] Export the azure pipeline build id for SONiC
 version (#7406)

Improve the SONiC version, fix the "azure pipeline build id" part

<target branch name>-<pullrequest id>.<azure pipelines build id>-<merge commit id>
Example: master-7381.11668-43df5c87
---
 .azure-pipelines/azure-pipelines-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 68ddd191186f..d482934f57bf 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -26,6 +26,7 @@ jobs:
     jobVariables:
       PLATFORM_AZP: $(GROUP_NAME)
       PLATFORM_ARCH: amd64
+      BUILD_NUMBER: $(Build.BuildId)
       BUILD_OPTIONS: ${{ parameters.buildOptions }}
       DOCKER_DATA_ROOT_FOR_MULTIARCH: /data/march/docker
       dbg_image: no

From 16dc30b9448167ddbe97913380a42855720af6af Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:44:36 +0300
Subject: [PATCH 0393/1674] [Mellanox] [202012] Update SAI version 1.18.3.0
 (#7427)

- Why I did it
Changes in the new release:
1. Fix 10G and 50G speeds in SAI XML to support all interface types
2. Enable SMAC=DMAC and SMAC MC in tunnel debug counter
3. Add tunnel statistics
4. Add isolation group API implementation
5. Fix ACL ANY debug counter to correctly track ACL drops
6. Add VXLAN source port hard coded range, controlled by K/V
7. FW dump me now feature
8. Add mlxtrace to saidump
9. Speed lane setting and AN control
10. Implement query stats API
11. VNI miss part of tunnel decal drop reason

- How I did it
Update the version number in SAI make file, update the mlnx-sai submodule pointer.

- How to verify it
Run full regression tests on Mellanox platforms

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 platform/mellanox/mlnx-sai.mk                 | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 7f16a72cc076..3e6638005d3a 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.18.1.0
+MLNX_SAI_VERSION = SAIRel1.18.3.0
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 8dc2afd21ff6..099ad578a059 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 8dc2afd21ff6578cd0736b70aaa6ce5f1135265d
+Subproject commit 099ad578a059fa9d5a492561eca1281a830fb7b6

From 59cae24e43b13af29c52d037e6f92ee709a84fa4 Mon Sep 17 00:00:00 2001
From: Praveen Chaudhary <pchaudhary@linkedin.com>
Date: Mon, 26 Apr 2021 21:53:23 -0700
Subject: [PATCH 0394/1674] [sonic-slave-buster]: upgrade pyang version to
 2.4.0 and install only using pip3. (#7441)

[sonic-slave-stretch]: upgrade pyang version to 2.4.0.

Signed-off-by: Praveen Chaudhary <pchaudhary@linkedin.com>
---
 sonic-slave-buster/Dockerfile.j2  | 3 +--
 sonic-slave-stretch/Dockerfile.j2 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 2ab975502cf7..075bb6916af9 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -431,8 +431,7 @@ RUN pip2 install Pympler==0.8
 RUN pip3 install Pympler==0.8
 
 # For sonic_yang_model build
-RUN pip2 install pyang==2.1.1
-RUN pip3 install pyang==2.1.1
+RUN pip3 install pyang==2.4.0
 
 # For mgmt-framework build
 RUN pip2 install mmh3==2.5.1
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index afb69af16b26..b22a3d0c2238 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -369,7 +369,7 @@ RUN pip2 install setuptools==40.8.0
 RUN pip2 install Pympler==0.8
 
 # For sonic_yang_model build
-RUN pip2 install pyang==2.1.1
+RUN pip3 install pyang==2.4.0
 
 # For mgmt-framework build
 RUN pip2 install mmh3

From a53e9ebfa6f9e902ceb6d504279dd813874612ff Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:22:53 +0800
Subject: [PATCH 0395/1674] [ci] Add the platform filter to ignore some
 platforms not ready to use (#7453)

Why I did it
Add the platform filter to ignore some platforms not ready to use
The platform centos-arm64 and the platform marvell-armhf are not ready to use now. We will add it when it is available.
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index b0b84cf3b1fb..5ed7740b6d8c 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -16,6 +16,18 @@ schedules:
 
 pool: sonicbld
 
+parameters:
+  - name: jobFilters
+    type: object
+    default:
+    - vs
+    - broadcom
+    - centec
+    - generic
+    - innovium
+    - mellanox
+    - nephos
+
 stages:
 - stage: Build
   variables:
@@ -25,6 +37,7 @@ stages:
   - template: azure-pipelines-build.yml
     parameters:
       buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
+      jobFilters: ${{ parameters.jobFilters }}
       preSteps:
       - script: |
           containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')

From 83e23801fd8af848b7902493844f72f06a16f3fd Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Thu, 22 Apr 2021 00:00:12 -0400
Subject: [PATCH 0396/1674] [build]: Fix ARM build break introduced in PR# 7249
 (#7395)

PR# 7249 introduced a new bit of logic _after_ the point where the qemu based
build environment for ARM is removed. Hence the new logic fails when building
for ARM. Builds for AMD64 were not affected.

This commit moves the new logic introduced by PR# 7249 to just _before_ the
point where the qemu based build environment for ARM is removed. A comment is
added to reduce the likelihood of this sort of ARM build break from happening
again.
---
 build_debian.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index c824faa4397e..af5f4ca94f6d 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -581,18 +581,21 @@ sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker
 
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
 
-if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
-    # Remove qemu arm bin executable used for cross-building
-    sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true
-    DOCKERFS_PATH=../dockerfs/
-fi
-
 # Ensure admin gid is 1000
 gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"
 if [ "${gid_user}" != "1000" ]; then
     die "expect gid 1000. current:${gid_user}"
 fi
 
+# ALERT: This bit of logic tears down the qemu based build environment used to
+# perform builds for the ARM architecture. This must be the last step in this
+# script before creating the Sonic installer payload zip file.
+if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+    # Remove qemu arm bin executable used for cross-building
+    sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true
+    DOCKERFS_PATH=../dockerfs/
+fi
+
 ## Compress docker files
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 

From 04723238601c9a58e1c6381fe9c76ecbcfc64180 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 29 Apr 2021 07:01:07 +0800
Subject: [PATCH 0397/1674] [ci] Fix the generating version file failure issue
 caused by artifacts folder change (#7464)

Fix the generating version file failure issue caused by artifacts folder change.
When changing to use the same template for PR build, official build and packages version upgrade, the artifacts folder adding a "target" folder, the version upgrade task should be changed accordingly.
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 5ed7740b6d8c..76c7c911a211 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -73,14 +73,14 @@ stages:
         default_platform=broadcom
         artifacts=$(find $(Pipeline.Workspace) -maxdepth 1 -type d -name 'sonic-buildimage.*' | grep -v "sonic-buildimage.${default_platform}")
         echo "artifacts$artifacts"
-        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/versions target/
+        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/target/versions target/
         make freeze FREEZE_VERSION_OPTIONS=-r
         find files/build/versions 
         ordered_artifacts=$(echo "$artifacts" | grep -v -E "arm64|armhf" && echo "$artifacts" | grep -E "arm64|armhf")
         for artifact in $ordered_artifacts
         do
           rm -rf target/versions
-          cp -r $artifact/versions target/
+          cp -r $artifact/target/versions target/
           OPTIONS="-a -d"
           [[ "$artifact" == *arm64* || "$artifact" == *armhf* ]] && OPTIONS="-d"
           make freeze FREEZE_VERSION_OPTIONS="$OPTIONS"

From 051b848377a0d001414c5eaab68df65eb7493197 Mon Sep 17 00:00:00 2001
From: madhanmellanox <62459540+madhanmellanox@users.noreply.github.com>
Date: Thu, 29 Apr 2021 08:54:22 -0700
Subject: [PATCH 0398/1674] 202012: Created new SKU Mellanox-SN3800-D28C49S1
 (#7466)

platform files for the new SKU D28C49S1
---
 .../Mellanox-SN3800-D28C49S1/buffers.json.j2  |   1 +
 .../buffers_defaults_t0.j2                    | 100 ++++
 .../buffers_defaults_t1.j2                    | 100 ++++
 .../buffers_dynamic.json.j2                   |   1 +
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN3800-D28C49S1/port_config.ini  |  79 +++
 .../Mellanox-SN3800-D28C49S1/qos.json.j2      |   1 +
 .../Mellanox-SN3800-D28C49S1/sai.profile      |   1 +
 .../sai_3800_1x10g_28x50g_49x100g.xml         | 484 ++++++++++++++++++
 9 files changed, 768 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai_3800_1x10g_28x50g_49x100g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers.json.j2
new file mode 120000
index 000000000000..dc17caa0aa32
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers.json.j2
@@ -0,0 +1 @@
+../ACS-MSN3800/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..67aca79510a6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
@@ -0,0 +1,100 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '24360960' %}
+{% set ingress_lossless_pool_xoff =  '2795520' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '24360960' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..a005006db514
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
@@ -0,0 +1,100 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '22380544' %}
+{% set ingress_lossless_pool_xoff =  '4775936' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '22380544' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/pg_profile_lookup.ini
new file mode 120000
index 000000000000..ccbbfa44cd9c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN3800-D112C8/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/port_config.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/port_config.ini
new file mode 100644
index 000000000000..5f9a4de25b96
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/port_config.ini
@@ -0,0 +1,79 @@
+# name       lanes            alias      index    speed
+Ethernet0    0,1,2,3          etp1           1   100000
+Ethernet4    4,5,6,7          etp2           2   100000
+Ethernet8    8,9,10,11        etp3           3   100000
+Ethernet12   12,13,14,15      etp4           4   100000
+Ethernet16   16,17,18,19      etp5           5   100000
+Ethernet20   20,21,22,23      etp6           6   100000
+Ethernet24   24,25,26,27      etp7           7   100000
+Ethernet28   28,29,30,31      etp8           8   100000
+Ethernet32   32,33            etp9a          9    50000
+Ethernet34   34,35            etp9b          9    50000
+Ethernet36   36,37            etp10a        10    50000
+Ethernet38   38,39            etp10b        10    50000
+Ethernet40   40,41            etp11a        11    50000
+Ethernet42   42,43            etp11b        11    50000
+Ethernet44   44,45            etp12a        12    50000
+Ethernet46   46,47            etp12b        12    50000
+Ethernet48   48,49,50,51      etp13         13   100000
+Ethernet52   52,53,54,55      etp14         14   100000
+Ethernet56   56,57,58,59      etp15         15   100000
+Ethernet60   60,61,62,63      etp16         16   100000
+Ethernet64   64,65,66,67      etp17         17   100000
+Ethernet68   68,69,70,71      etp18         18   100000
+Ethernet72   72,73,74,75      etp19         19   100000
+Ethernet76   76,77,78,79      etp20         20   100000
+Ethernet80   80,81,82,83      etp21         21   100000
+Ethernet84   84,85,86,87      etp22         22   100000
+Ethernet88   88,89,90,91      etp23         23   100000
+Ethernet92   92,93,94,95      etp24         24   100000
+Ethernet96   96,97,98,99      etp25         25   100000
+Ethernet100  100,101,102,103  etp26         26   100000
+Ethernet104  104,105          etp27a        27    50000
+Ethernet106  106,107          etp27b        27    50000
+Ethernet108  108,109          etp28a        28    50000
+Ethernet110  110,111          etp28b        28    50000
+Ethernet112  112,113,114,115  etp29         29   100000
+Ethernet116  116,117,118,119  etp30         30   100000
+Ethernet120  120,121,122,123  etp31         31   100000
+Ethernet124  124,125,126,127  etp32         32   100000
+Ethernet128  128,129,130,131  etp33         33   100000
+Ethernet132  132,133,134,135  etp34         34   100000
+Ethernet136  136,137,138,139  etp35         35   100000
+Ethernet140  140,141,142,143  etp36         36   100000
+Ethernet144  144,145,146,147  etp37         37   100000
+Ethernet148  148,149,150,151  etp38         38   100000
+Ethernet152  152,153,154,155  etp39         38   100000
+Ethernet156  156,157,158,159  etp40         40   100000
+Ethernet160  160,161,162,163  etp41         41   100000
+Ethernet164  164,165          etp42a        42   50000
+Ethernet166  166,167          etp42b        42   50000
+Ethernet168  168,169,170,171  etp43         43   100000
+Ethernet172  172,173,174,175  etp44         44   100000
+Ethernet176  176,177          etp45a        45    50000
+Ethernet178  178,179          etp45b        45    50000
+Ethernet180  180,181          etp46a        46    50000
+Ethernet182  182,183          etp46b        46    50000
+Ethernet184  184,185          etp47a        47    50000
+Ethernet186  186,187          etp47b        47    50000
+Ethernet188  188,189          etp48a        48    50000
+Ethernet190  190,191          etp48b        48    50000
+Ethernet192  192,193,194,195  etp49         49   100000
+Ethernet196  196,197,198,199  etp50         50   100000
+Ethernet200  200,201,202,203  etp51         51   100000
+Ethernet204  204,205,206,207  etp52         52   100000
+Ethernet208  208,209,210,211  etp53         53   100000
+Ethernet212  212,213,214,215  etp54         54   100000
+Ethernet216  216,217,218,219  etp55         55   100000
+Ethernet220  220,221,222,223  etp56         56   100000
+Ethernet224  224,225,226,227  etp57         57   100000
+Ethernet228  228,229,230,231  etp58         58   100000
+Ethernet232  232,233,234,235  etp59         59   100000
+Ethernet236  236,237,238,239  etp60         60   100000
+Ethernet240  240,241          etp61a        61    50000
+Ethernet242  242,243          etp61b        61    50000
+Ethernet244  244,245          etp62a        62    50000
+Ethernet246  246,247          etp62b        62    50000
+Ethernet248  248,249          etp63a        63    50000
+Ethernet250  250,251          etp63b        63    50000
+Ethernet252  252,253,254,255  etp64        64     10000
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/qos.json.j2
new file mode 120000
index 000000000000..26b0dac51846
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/qos.json.j2
@@ -0,0 +1 @@
+../ACS-MSN3800/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
new file mode 100644
index 000000000000..4ecb05a1a9e5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai_3800_1x10g_28x50g_49x100g.xml b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai_3800_1x10g_28x50g_49x100g.xml
new file mode 100644
index 000000000000..5844f53f4c0a
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai_3800_1x10g_28x50g_49x100g.xml
@@ -0,0 +1,484 @@
+<?xml version="1.0"?>
+<root>
+    <platform_info type="3800">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+		<!-- ISSU enabled -->
+		<issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>64</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>4</width>
+                <module>48</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <width>4</width>
+                <module>49</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>50</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <width>4</width>
+                <module>51</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>52</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <width>4</width>
+                <module>53</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>54</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>55</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>56</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <width>4</width>
+                <module>57</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>4</width>
+                <module>58</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <width>4</width>
+                <module>59</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>60</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <width>4</width>
+                <module>61</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>4</width>
+                <module>62</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <width>4</width>
+                <module>63</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>4</width>
+                <module>0</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>44</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>67</local-port>
+                <width>4</width>
+                <module>45</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>4</width>
+                <module>46</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>71</local-port>
+                <width>4</width>
+                <module>47</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>40</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>75</local-port>
+                <width>4</width>
+                <module>41</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>4</width>
+                <module>42</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>79</local-port>
+                <width>4</width>
+                <module>43</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>4</width>
+                <module>36</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>83</local-port>
+                <width>4</width>
+                <module>37</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>4</width>
+                <module>38</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>87</local-port>
+                <width>4</width>
+                <module>39</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>4</width>
+                <module>32</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>91</local-port>
+                <width>4</width>
+                <module>33</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>4</width>
+                <module>34</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>95</local-port>
+                <width>4</width>
+                <module>35</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>99</local-port>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>103</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>107</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>111</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>115</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>119</local-port>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>123</local-port>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>127</local-port>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>16</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From 17d5e69c5bf443675baabf82362f2c78c1c21bb3 Mon Sep 17 00:00:00 2001
From: anish-n <44376847+anish-n@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:33:41 -0700
Subject: [PATCH 0399/1674] Add downstreamsubrole parsing to minigraph.py
 (#7193)

---
 src/sonic-config-engine/minigraph.py                  | 11 +++++++++--
 .../tests/simple-sample-graph-metadata.xml            |  5 +++++
 src/sonic-config-engine/tests/test_cfggen.py          |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index eb6a11237e92..7b5b5ab095d4 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -787,6 +787,7 @@ def parse_meta(meta, hname):
     region = None
     cloudtype = None
     resource_type = None
+    downstream_subrole = None
     kube_data = {}
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
@@ -816,11 +817,13 @@ def parse_meta(meta, hname):
                     cloudtype = value
                 elif name == "ResourceType":
                     resource_type = value
+                elif name == "DownStreamSubRole":
+                    downstream_subrole = value
                 elif name == "KubernetesEnabled":
                     kube_data["enable"] = value
                 elif name == "KubernetesServerIp":
                     kube_data["ip"] = value
-    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data
+    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
 
 
 def parse_linkmeta(meta, hname):
@@ -1093,6 +1096,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     devices = None
     sub_role = None
     resource_type = None
+    downstream_subrole = None
     docker_routing_config_mode = "separated"
     port_speeds_default = {}
     port_speed_png = {}
@@ -1151,7 +1155,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
-                (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data) = parse_meta(child, hostname)
+                (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data) = parse_meta(child, hostname)
             elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -1226,6 +1230,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     if resource_type is not None:
         results['DEVICE_METADATA']['localhost']['resource_type'] = resource_type
 
+    if downstream_subrole is not None:
+        results['DEVICE_METADATA']['localhost']['downstream_subrole'] = downstream_subrole
+
     results['BGP_NEIGHBOR'] = bgp_sessions
     results['BGP_MONITORS'] = bgp_monitors
     results['BGP_PEER_RANGE'] = bgp_peers_with_range
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
index ee26ee2111ec..80430633b1f8 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
@@ -258,6 +258,11 @@
      <a:Reference i:nil="true"/>
      <a:Value>resource_type_x</a:Value>
     </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>DownStreamSubRole</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>downstream_subrole_y</a:Value>
+    </a:DeviceProperty>
   </a:Properties>
   </a:DeviceMetadata>
  </Devices>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index c81d56a4fabf..63e2ac044a91 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -88,6 +88,11 @@ def test_minigraph_resourcetype(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), 'resource_type_x')
 
+    def test_minigraph_downstream_subrole(self):
+        argument = '-v "DEVICE_METADATA[\'localhost\'][\'downstream_subrole\']" -m "' + self.sample_graph_metadata + '"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), 'downstream_subrole_y')
+
     def test_print_data(self):
         argument = '-m "' + self.sample_graph + '" --print-data'
         output = self.run_script(argument)

From 1b059827274c9a1be25c50efa07c39d2ffb4c3d2 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 25 Apr 2021 16:32:02 +0800
Subject: [PATCH 0400/1674] Support readonly vtysh for sudoers (#7383)

Why I did it
Support readonly version of the command vtysh

How I did it
Check if the command starting with "show", and verify only contains single command in script.
---
 .../docker-fpm-frr/base_image_files/rvtysh    | 22 +++++++++++++++++++
 .../docker-fpm-quagga/base_image_files/rvtysh |  1 +
 files/image_config/sudoers/sudoers            |  1 +
 rules/docker-fpm-frr.mk                       |  1 +
 rules/docker-fpm-quagga.mk                    |  1 +
 5 files changed, 26 insertions(+)
 create mode 100755 dockers/docker-fpm-frr/base_image_files/rvtysh
 create mode 120000 dockers/docker-fpm-quagga/base_image_files/rvtysh

diff --git a/dockers/docker-fpm-frr/base_image_files/rvtysh b/dockers/docker-fpm-frr/base_image_files/rvtysh
new file mode 100755
index 000000000000..fb61b949e02b
--- /dev/null
+++ b/dockers/docker-fpm-frr/base_image_files/rvtysh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# The command rvtysh can be run as root priviledge by any user without password, only allow to execute readonly commands.
+
+# The options in the show command cannot contains any charactors to run multiple sub-commands potentially, such as "\n", "\r", "|", "&", "$" and ";".
+if printf -- "$*" | grep -qPz '[\n\r|&$;]'; then
+    echo "Not allow to run the command, please use the comand 'sudo vtysh' instead." 1>&2
+    exit 1
+fi
+
+# The sub commands must start with "show"
+LAST_PARA=
+for para in "$@"
+do
+    if [ "$LAST_PARA" == "-c" ] && [[ "$para" != show*  ]]; then
+        echo "Not allow to run the command '$para', please use the comand 'sudo vtysh' instead." 1>&2
+        exit 1
+    fi
+    LAST_PARA=$para
+done
+
+vtysh "$@"
diff --git a/dockers/docker-fpm-quagga/base_image_files/rvtysh b/dockers/docker-fpm-quagga/base_image_files/rvtysh
new file mode 120000
index 000000000000..3956b5bfb373
--- /dev/null
+++ b/dockers/docker-fpm-quagga/base_image_files/rvtysh
@@ -0,0 +1 @@
+../../docker-fpm-frr/base_image_files/rvtysh
\ No newline at end of file
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index fbe4cf1f7f91..041290151a98 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -30,6 +30,7 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/bin/lldpctl, \
                                  /usr/bin/sensors, \
                                  /usr/bin/tail -F /var/log/syslog, \
+                                 /usr/bin/rvtysh *, \
                                  /usr/bin/vtysh -c show *, \
                                  /usr/bin/vtysh -n [0-9] -c show *, \
                                  /usr/local/bin/decode-syseeprom, \
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index d4aace307a19..3a6f2a20587d 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -27,6 +27,7 @@ $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_FPM_FRR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
+$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSA:/usr/bin/TSA
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
diff --git a/rules/docker-fpm-quagga.mk b/rules/docker-fpm-quagga.mk
index 5a384eedab2c..ba3d8a428b05 100644
--- a/rules/docker-fpm-quagga.mk
+++ b/rules/docker-fpm-quagga.mk
@@ -13,3 +13,4 @@ $(DOCKER_FPM_QUAGGA)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_FPM_QUAGGA)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
 $(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
+$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh

From bdb23a0d9460fc60d88841941eb3525428db748f Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 25 Apr 2021 10:02:58 +0800
Subject: [PATCH 0401/1674] Fix workflow permission issue when running in merge
 branch (#7417)

Fix the labeler workflow permission issue when merging from fork repo.
It impacts the labeler workflow to support auto-merge for package versions upgrade on 202012 branch. The current workaround is to add the label "automerge" on the PR sent by mssonicbld, then the automerge workflow will merge the PR.
---
 .github/workflows/label.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index f70194e04737..f8ae8e7199a2 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -7,7 +7,7 @@
 
 name: Labeler
 on:
-  pull_request:
+  pull_request_target:
     types:
     - opened
     - reopened

From d4e8c3f666d0ae51aeb7ec461f046741895144ef Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:21:55 +0800
Subject: [PATCH 0402/1674] [Mellanox] Upgrade hw-mgmt to 7.0100.2303 (#7419)

- Why I did it
Upgrade hw-mgmt to 7.0100.2303

Bug fixes

1. Fan direction feature fix for fixed FAN system (using shell instead of binutils/strings)
2. Remove cpld 4th link on systems with only 3 CPLD's
3. hw-mgmt: thermal: Add hardcoded critical trip point. Follow-up after patch "Removing critical thermal zones to prevent unexpected software system shutdown".
4. Fix sensor attribute mapping to be label based instead of index based to allow common handling of voltage regulator names independently of hardware changes.
5. Update 'lm-sensors' custom configuration file. Relevant only for users utilizing sensors.conf files coming along with hw-management package.
6. For full feature list please follow https://github.com/Mellanox/hw-mgmt/blob/V.7.0010.2300_BR/debian/Release.txt

- How I did it
Update hw-mgmt pointer
Remove unused patches
Fix existing patch to make sure it apply successfully

- How to verify it
Full platform regression on all mellanox platforms
---
 platform/mellanox/hw-management.mk            |  2 +-
 ...dd-support-for-SDK-OFFLINE-event-for.patch | 30 -------------------
 .../0003-Make-hw-mgmt-SimX-compatiable.patch  | 21 ++++++++++---
 platform/mellanox/hw-management/hw-mgmt       |  2 +-
 4 files changed, 19 insertions(+), 36 deletions(-)
 delete mode 100644 platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 4929a5500df1..0c2f6a7d28d0 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2002
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2303
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch b/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch
deleted file mode 100644
index 6c58f7299c2c..000000000000
--- a/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3e511778248403968e0a02857b7003f352669ba3 Mon Sep 17 00:00:00 2001
-From: Vadim Pasternak <vadimp@nvidia.com>
-Date: Wed, 13 Jan 2021 13:19:17 +0200
-Subject: [PATCH] hw-mgmt: events: Add support for SDK OFFLINE event for
- handling flow with in service firmware upgrade
-
-In order to prevent "mlxsw_minimal" driver access to ASIC during in
-service firmware upgrade flow, SDK will raise "OFFLINE" 'udev' event
-at early beginning of such flow. When this event is received,
-hw-managemnet will remove "mlxsw_minimal" driver.
-There is no need to implement opposite "ONLINE" event, since this flow
-is ended up with "kexec".
-
-Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
----
- usr/lib/udev/rules.d/50-hw-management-events.rules | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr/lib/udev/rules.d/50-hw-management-events.rules b/usr/lib/udev/rules.d/50-hw-management-events.rules
-index cf4219e..33ea1bc 100644
---- a/usr/lib/udev/rules.d/50-hw-management-events.rules
-+++ b/usr/lib/udev/rules.d/50-hw-management-events.rules
-@@ -269,3 +269,4 @@ SUBSYSTEM=="i2c", DEVPATH=="/devices/platform/mlxplat/i2c_mlxcpld*/i2c-*/i2c-*/*
- # SDK
- SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="add", RUN+="/usr/bin/hw-management-thermal-events.sh add sxcore add"
- SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="remove", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove"
-+SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="offline", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove"
--- 
-1.9.1
-
diff --git a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
index 0eb3daa7977e..4e49516c8d54 100644
--- a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
+++ b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
@@ -1,3 +1,13 @@
+From 5858f60aa5948a502ca8a1c9357ac81baa6f68dc Mon Sep 17 00:00:00 2001
+From: junchao <junchao@nvidia.com>
+Date: Fri, 23 Apr 2021 09:27:43 +0800
+Subject: [PATCH] Make hw-mgmt SimX compatible
+
+---
+ usr/usr/bin/hw-management-ready.sh | 11 +++++++----
+ usr/usr/bin/hw-management.sh       |  9 +++++++++
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
 diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
 index 3c9f7b6..05d143f 100755
 --- a/usr/usr/bin/hw-management-ready.sh
@@ -20,10 +30,10 @@ index 3c9f7b6..05d143f 100755
  echo "Start Chassis HW management service."
  logger -t hw-management -p daemon.notice "Start Chassis HW management service."
 diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
-index 70f1297..e427a3d 100755
+index 991cf45..16ad0bf 100755
 --- a/usr/usr/bin/hw-management.sh
 +++ b/usr/usr/bin/hw-management.sh
-@@ -1110,6 +1110,13 @@ do_chip_down()
+@@ -1265,6 +1265,13 @@ do_chip_down()
  	/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
  }
  
@@ -35,9 +45,9 @@ index 70f1297..e427a3d 100755
 +}
 +
  __usage="
- Usage: $(basename $0) [Options]
+ Usage: $(basename "$0") [Options]
  
-@@ -1135,6 +1142,8 @@ Options:
+@@ -1290,6 +1297,8 @@ Options:
  	force-reload	Performs hw-management 'stop' and the 'start.
  "
  
@@ -46,3 +56,6 @@ index 70f1297..e427a3d 100755
  case $ACTION in
  	start)
  		if [ -d /var/run/hw-management ]; then
+-- 
+1.9.1
+
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 298ffebcb802..8cd7f9872ec4 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 298ffebcb8026caafba36727ce2fba1f26b100aa
+Subproject commit 8cd7f9872ec4f8ca54863fc2c83722ae7ecc196a

From 48908b1c5a182a6808a5b02e8a8aa1b10e85fbfe Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Thu, 29 Apr 2021 16:33:39 +0800
Subject: [PATCH 0403/1674] Fix issue: exception occurred during chassis object
 being destroyed (#7446)

The following error message is observed during chassis object being destroyed

"Exception ignored in: <function Chassis.__del__ at 0x7fd22165cd08>
Traceback (most recent call last):
  File "/usr/local/lib/python3.7/dist-packages/sonic_platform/chassis.py", line 83, in __del__
ImportError: sys.meta_path is None, Python is likely shutting down
The chassis tries to import deinitialize_sdk_handle during being destroyed for the purpose of releasing the sdk_handle.
However, importing another module during shutting down can cause the error because some of the fundamental infrastructures are no longer available."

This error occurs when a chassis object is created and then destroyed in the Python shell.

- How I did it
To fix it, record the deinitialize_sdk_handle in the chassis object when sdk_handle is being initialized and call the deinitialize handler when the chassis object is being destroyed

- How to verify it
Manually test.
---
 .../mlnx-platform-api/sonic_platform/chassis.py        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index 585a664efce1..2ae93e14d4c0 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -73,6 +73,7 @@ def __init__(self):
         self.sfp_event_initialized = False
         self.reboot_cause_initialized = False
         self.sdk_handle = None
+        self.deinitialize_sdk_handle = None
         logger.log_info("Chassis loaded successfully")
 
 
@@ -80,9 +81,8 @@ def __del__(self):
         if self.sfp_event_initialized:
             self.sfp_event.deinitialize()
 
-        if self.sdk_handle:
-            from sonic_platform.sfp import deinitialize_sdk_handle
-            deinitialize_sdk_handle(self.sdk_handle)
+        if self.deinitialize_sdk_handle:
+            self.deinitialize_sdk_handle(self.sdk_handle)
 
 
     def initialize_psu(self):
@@ -140,10 +140,12 @@ def initialize_sfp(self):
 
     def get_sdk_handle(self):
         if not self.sdk_handle:
-            from sonic_platform.sfp import initialize_sdk_handle
+            from sonic_platform.sfp import initialize_sdk_handle, deinitialize_sdk_handle
             self.sdk_handle = initialize_sdk_handle()
             if self.sdk_handle is None:
                 logger.log_error('Failed to open SDK handle')
+            else:
+                self.deinitialize_sdk_handle = deinitialize_sdk_handle
         return self.sdk_handle
 
 

From c65a8a227f8b01c7bb65aaffc213aafc606c768d Mon Sep 17 00:00:00 2001
From: Andriy Yurkiv <70649192+ayurkiv-nvda@users.noreply.github.com>
Date: Thu, 29 Apr 2021 20:05:02 +0300
Subject: [PATCH 0404/1674] [devices][hwsku] add support to VXLAN src port
 range feature (#7394)

Enable VXLAN src port range configuration via SAI profile
---
 .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile   | 1 +
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile     | 3 ++-
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
index bfbcb1e78f47..b1ff086c68a5 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
deleted file mode 120000
index f6fb0ccbfc97..000000000000
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
+++ /dev/null
@@ -1 +0,0 @@
-../ACS-MSN3800/sai.profile
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
new file mode 100644
index 000000000000..4ea8c4897815
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
index aa37fb30dbd0..60da1086ba81 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1

From 55f8f8647b147dad3323a76a412c98fb92026e73 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 1 May 2021 19:43:04 -0700
Subject: [PATCH 0405/1674] Revert "Revert "[debian] install systemd version
 247 from buster-backports (#7228)""

This reverts commit 86f9c7b7a62dc87b4f044f2ce95bb1b4ea02c5d0.
---
 build_debian.sh             | 7 +++++--
 installer/x86_64/install.sh | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index af5f4ca94f6d..e6e73bc5281e 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -79,6 +79,8 @@ TARGET_PATH=$TARGET_PATH scripts/build_debian_base_system.sh $CONFIGURED_ARCH $I
 # Prepare buildinfo
 sudo scripts/prepare_debian_image_buildinfo.sh $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT $http_proxy
 
+sudo chown root:root $FILESYSTEM_ROOT
+
 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '$HOSTNAME' > /etc/hostname"
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '127.0.0.1       $HOSTNAME' >> /etc/hosts"
@@ -109,7 +111,7 @@ sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-language
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y upgrade
 echo '[INFO] Install packages for building image'
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc systemd-sysv
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc
 
 ## Create device files
 echo '[INFO] MAKEDEV'
@@ -346,7 +348,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # Install certain fundamental packages from $IMAGE_DISTRO-backports in order to get
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
-    picocom
+    picocom \
+    systemd-sysv
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 9cf2f57b6e53..e7eb9e1a8065 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -634,6 +634,7 @@ menuentry '$demo_grub_entry' {
         linux   /$image_dir/boot/vmlinuz-4.19.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
+                systemd.unified_cgroup_hierarchy=0 \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
         initrd  /$image_dir/boot/initrd.img-4.19.0-12-2-amd64

From 4f33a90a8202c1cd293d932d80eeb9b96d20897f Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 1 May 2021 19:43:15 -0700
Subject: [PATCH 0406/1674] Revert "Revert "[build_debian.sh] fix systemd is
 not from backports buster (#7323)""

This reverts commit a253f2039a5db4875bdaef794cebdb1c7a2b1c2b.
---
 build_debian.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_debian.sh b/build_debian.sh
index e6e73bc5281e..6c4f959bc7e6 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -349,6 +349,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 # more up-to-date (but potentially less stable) versions
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
     picocom \
+    systemd \
     systemd-sysv
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then

From ae574ab00051330e4cb987dd7c0edfe487644c79 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 22 Apr 2021 03:50:00 +0300
Subject: [PATCH 0407/1674] [systemd] disable default systemd udev rules for
 interfaces (#7369)

Fix #7364

99-default.link - was always in SONiC, but previous systemd (<247) had an issue and it did not work due to issue systemd/systemd#3374. Now systemd 247 works.

However, such policy overrides teamd provided mac address which causes teamd netdev to use a random mac
address. Therefore, needs to be disabled.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 files/build_templates/sonic_debian_extension.j2    | 3 +++
 files/image_config/systemd/network/99-default.link | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 files/image_config/systemd/network/99-default.link

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 9d2556edb572..7a0da05b26bc 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -380,6 +380,9 @@ sudo cp files/dhcp/90-dhcp6-systcl.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMP
 sudo cp $IMAGE_CONFIGS/interfaces/init_interfaces $FILESYSTEM_ROOT/etc/network/interfaces
 sudo mkdir -p $FILESYSTEM_ROOT/etc/network/interfaces.d
 
+# System'd network udev rules
+sudo cp $IMAGE_CONFIGS/systemd/network/* $FILESYSTEM_ROOT_ETC/systemd/network/
+
 # copy core file uploader files
 sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable core_uploader.service
diff --git a/files/image_config/systemd/network/99-default.link b/files/image_config/systemd/network/99-default.link
new file mode 100644
index 000000000000..3ee67ecd9f50
--- /dev/null
+++ b/files/image_config/systemd/network/99-default.link
@@ -0,0 +1,7 @@
+[Match]
+OriginalName=*
+
+[Link]
+# Override default systemd policy
+MACAddressPolicy=none
+

From 30cc959787402b3cd0d26cee748dbd4d6e90723e Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Tue, 20 Apr 2021 14:55:14 -0700
Subject: [PATCH 0408/1674] [Arista] Fix dockerd issue on Arista platforms
 (#7376)

Why I did it
Recent systemd upgrade from #7228 requires an extra cmdline parameter for dockerd to start properly.
Updating boot0 was missed as part of the systemd upgrade change.

How I did it
Just added the missing cmdline parameter in files/Aboot/boot0.j2
This change fixes #7372

How to verify it
Boot the image and dockerd should start normally.
---
 files/Aboot/boot0.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 7e1f41ac04c4..35893eb2f35e 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -614,6 +614,9 @@ write_image_specific_cmdline() {
     # disable deterministic interface naming
     cmdline_add net.ifnames=0
 
+    # disable unified cgroup hierarchy to workaround dockerd limitation
+    cmdline_add systemd.unified_cgroup_hierarchy=0
+
     # verbosity
     cmdline_add quiet
     # Start showing systemd information from the first failing unit if any.

From a0fde3a626997dd87ac85267f7813c81da576f27 Mon Sep 17 00:00:00 2001
From: guxianghong <gxh2001757@163.com>
Date: Sun, 18 Apr 2021 23:17:57 +0800
Subject: [PATCH 0409/1674] [arm] support compile sonic arm image on arm server
 (#7285)

- Support compile sonic arm image on arm server. If arm image compiling is executed on arm server instead of using qemu mode on x86 server, compile time can be saved significantly.
- Add kernel argument systemd.unified_cgroup_hierarchy=0 for upgrade systemd to version 247, according to #7228
- rename multiarch docker to sonic-slave-${distro}-march-${arch}

Co-authored-by: Xianghong Gu <xgu@centecnetworks.com>
Co-authored-by: Shi Lei <shil@centecnetworks.com>
---
 Makefile.work                                 | 25 ++++++++++++++++---
 build_debian.sh                               | 10 ++++----
 dockers/docker-base-buster/Dockerfile.j2      |  4 +--
 dockers/docker-base-stretch/Dockerfile.j2     |  4 +--
 dockers/docker-base/Dockerfile.j2             |  4 +--
 dockers/docker-ptf/Dockerfile.j2              |  4 +--
 .../build_templates/sonic_debian_extension.j2 | 12 ++++++---
 platform/centec-arm64/platform.conf           |  2 +-
 platform/marvell-arm64/platform.conf          |  4 +--
 platform/marvell-armhf/platform.conf          |  4 +--
 scripts/build_debian_base_system.sh           |  8 +++---
 slave.mk                                      |  3 +++
 sonic-slave-buster/Dockerfile.j2              |  4 +--
 sonic-slave-buster/Dockerfile.user.j2         |  4 +--
 sonic-slave-stretch/Dockerfile.j2             |  4 +--
 sonic-slave-stretch/Dockerfile.user.j2        |  4 +--
 src/ethtool/Makefile                          |  2 +-
 src/snmpd/Makefile                            |  2 +-
 18 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index 0d7f62af3917..d844d716af59 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -49,6 +49,15 @@ USER_LC := $(shell echo $(USER) | tr A-Z a-z)
 
 comma := ,
 
+ifeq ($(shell uname -m), aarch64)
+COMPILE_HOST_ARCH := arm64
+else ifeq ($(shell uname -m), armv7l)
+COMPILE_HOST_ARCH := armhf
+else
+COMPILE_HOST_ARCH := amd64
+endif
+
+
 ifeq ($(USER), root)
 $(error Add your user account to docker group and use your user account to make. root or sudo are not supported!)
 endif
@@ -98,8 +107,15 @@ endif
 
 ifeq ($(CONFIGURED_ARCH),amd64)
 SLAVE_BASE_IMAGE = $(SLAVE_DIR)
+MULTIARCH_QEMU_ENVIRON = n
 else
-SLAVE_BASE_IMAGE = $(SLAVE_DIR)-$(CONFIGURED_ARCH)
+ifeq ($(CONFIGURED_ARCH), $(COMPILE_HOST_ARCH))
+SLAVE_BASE_IMAGE = $(SLAVE_DIR)
+MULTIARCH_QEMU_ENVIRON = n
+else ifneq ($(CONFIGURED_ARCH),)
+SLAVE_BASE_IMAGE = $(SLAVE_DIR)-march-$(CONFIGURED_ARCH)
+MULTIARCH_QEMU_ENVIRON = y
+endif
 endif
 SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER_LC)
 
@@ -109,8 +125,8 @@ $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
     scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
-$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
-$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
+$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
+$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
 $(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
@@ -157,7 +173,7 @@ ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
     DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
 endif
 
-ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),)
 	DOCKER_DATA_ROOT_FOR_MULTIARCH := /var/lib/march/docker
 endif
@@ -216,6 +232,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            -f slave.mk \
                            PLATFORM=$(PLATFORM) \
                            PLATFORM_ARCH=$(PLATFORM_ARCH) \
+                           MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON)  \
                            BUILD_NUMBER=$(BUILD_NUMBER) \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
                            SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
diff --git a/build_debian.sh b/build_debian.sh
index 6c4f959bc7e6..59eeea63d97a 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -189,6 +189,9 @@ if [ -f platform/$CONFIGURED_PLATFORM/modules ]; then
     cat platform/$CONFIGURED_PLATFORM/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
 fi
 
+## Add mtd and uboot firmware tools package
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils device-tree-compiler
+
 ## Install docker
 echo '[INFO] Install docker'
 ## Install apparmor utils since they're missing and apparmor is enabled in the kernel
@@ -493,7 +496,7 @@ fi
 sudo cp ./asic_config_checksum $FILESYSTEM_ROOT/etc/sonic/asic_config_checksum
 
 if [ -f sonic_debian_extension.sh ]; then
-    ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR
+    ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR $IMAGE_DISTRO
 fi
 
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
@@ -531,9 +534,6 @@ then
 
 fi
 
-## Add mtd and uboot firmware tools package
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils device-tree-compiler
-
 ## Update initramfs
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 ## Convert initrd image to u-boot format
@@ -594,7 +594,7 @@ fi
 # ALERT: This bit of logic tears down the qemu based build environment used to
 # perform builds for the ARM architecture. This must be the last step in this
 # script before creating the Sonic installer payload zip file.
-if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
     # Remove qemu arm bin executable used for cross-building
     sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true
     DOCKERFS_PATH=../dockerfs/
diff --git a/dockers/docker-base-buster/Dockerfile.j2 b/dockers/docker-base-buster/Dockerfile.j2
index 1f80775f11a4..a87ca31c6073 100644
--- a/dockers/docker-base-buster/Dockerfile.j2
+++ b/dockers/docker-base-buster/Dockerfile.j2
@@ -1,7 +1,7 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-{% if CONFIGURED_ARCH == "armhf" %}
+{% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:armhf-buster
-{% elif CONFIGURED_ARCH == "arm64" %}
+{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-buster
 {% else %}
 FROM debian:buster
diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index aa6eda8a955c..652dec979b60 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -1,7 +1,7 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-{% if CONFIGURED_ARCH == "armhf" %}
+{% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:armhf-stretch
-{% elif CONFIGURED_ARCH == "arm64" %}
+{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-stretch
 {% else %}
 FROM debian:stretch
diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index fc293da9da1e..ecdbfda11a78 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -1,6 +1,6 @@
-{% if CONFIGURED_ARCH == "armhf" %}
+{% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:armhf-jessie
-{% elif CONFIGURED_ARCH == "arm64" %}
+{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-jessie
 {% else %}
 FROM debian:jessie
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index eba818da9fcc..861056726056 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -1,6 +1,6 @@
-{% if CONFIGURED_ARCH == "armhf" %}
+{% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:armhf-stretch
-{% elif CONFIGURED_ARCH == "arm64" %}
+{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-stretch
 {% else %}
 FROM debian:stretch
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 7a0da05b26bc..eae99551eb3c 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -21,6 +21,12 @@ PLATFORM_DIR=$2
     exit 1
 }
 
+IMAGE_DISTRO=$3
+[ -n "$IMAGE_DISTRO" ] || {
+    echo "Error: no or empty IMAGE_DISTRO argument"
+    exit 1
+}
+
 ## Enable debug output for script
 set -x -e
 
@@ -54,7 +60,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount sysfs /sys -t sysfs
 
 sudo bash -c "echo \"DOCKER_OPTS=\"--storage-driver=overlay2\"\" >> $FILESYSTEM_ROOT/etc/default/docker"
 sudo cp files/docker/docker $FILESYSTEM_ROOT/etc/init.d/
-if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
     SONIC_NATIVE_DOCKERD_FOR_DOCKERFS=" -H unix:///dockerfs/var/run/docker.sock "
     SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID="cat `pwd`/dockerfs/var/run/docker.pid"
 else
@@ -578,7 +584,7 @@ EOF
 {% endif %}
 
 ## Bind docker path
-if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
     sudo mkdir -p $FILESYSTEM_ROOT/dockerfs
     sudo mount --bind dockerfs $FILESYSTEM_ROOT/dockerfs
 fi
@@ -613,7 +619,7 @@ echo "docker images pull complete"
 
 sudo umount $FILESYSTEM_ROOT/target
 sudo rm -r $FILESYSTEM_ROOT/target
-if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
     sudo umount $FILESYSTEM_ROOT/dockerfs
     sudo rm -fr $FILESYSTEM_ROOT/dockerfs
     sudo kill -9 `sudo $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID` || true
diff --git a/platform/centec-arm64/platform.conf b/platform/centec-arm64/platform.conf
index 8b29d0ded3a9..2577f64ea274 100755
--- a/platform/centec-arm64/platform.conf
+++ b/platform/centec-arm64/platform.conf
@@ -37,7 +37,7 @@ bootloader_menu_config() {
     (cat <<EOF
 hw_load $hw_load_str
 copy_img echo "Loading Demo $platform image..." && run hw_load
-nos_bootcmd run copy_img && setenv bootargs quiet console=\$consoledev,\$baudrate root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=$image_dir/fs.squashfs && bootm \$loadaddr
+nos_bootcmd run copy_img && setenv bootargs quiet console=\$consoledev,\$baudrate root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=$image_dir/fs.squashfs systemd.unified_cgroup_hierarchy=0 && bootm \$loadaddr
 EOF
     ) > /tmp/env.txt
 
diff --git a/platform/marvell-arm64/platform.conf b/platform/marvell-arm64/platform.conf
index 15f25a27b6b9..8ecdfa317425 100644
--- a/platform/marvell-arm64/platform.conf
+++ b/platform/marvell-arm64/platform.conf
@@ -108,8 +108,8 @@ prepare_boot_menu() {
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
 
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS varlog_size=$VAR_LOG" > /dev/null
-    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS varlog_size=$VAR_LOG" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG" > /dev/null
     sonic_bootargs_old='setenv bootargs root='$demo_dev' rw rootwait rootfstype=ext4 panic=1 console=ttyS0,115200 ${othbootargs} ${mtdparts} ${linuxargs_old}'
     fw_setenv ${FW_ARG} sonic_bootargs_old $sonic_bootargs_old > /dev/null || true
     sonic_boot_load_old=$(fw_printenv -n sonic_boot_load || true)
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 78f64b6fbe18..651b01bea18d 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -146,8 +146,8 @@ prepare_boot_menu() {
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
 
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS varlog_size=$VAR_LOG loglevel=4" > /dev/null
-    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS varlog_size=$VAR_LOG loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
 
     # Set boot configs
     fw_setenv ${FW_ARG} kernel_addr $kernel_addr > /dev/null
diff --git a/scripts/build_debian_base_system.sh b/scripts/build_debian_base_system.sh
index a85b3b5bf0ee..fe7841067e82 100755
--- a/scripts/build_debian_base_system.sh
+++ b/scripts/build_debian_base_system.sh
@@ -20,9 +20,11 @@ generate_version_file()
 
 if [ "$ENABLE_VERSION_CONTROL_DEB" != "y" ]; then
     if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
-        # qemu arm bin executable for cross-building
-        sudo mkdir -p $FILESYSTEM_ROOT/usr/bin
-        sudo cp /usr/bin/qemu*static $FILESYSTEM_ROOT/usr/bin || true
+        if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
+            # qemu arm bin executable for cross-building
+            sudo mkdir -p $FILESYSTEM_ROOT/usr/bin
+            sudo cp /usr/bin/qemu*static $FILESYSTEM_ROOT/usr/bin || true
+        fi
         sudo http_proxy=$HTTP_PROXY SKIP_BUILD_HOOK=y debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://deb.debian.org/debian
     else
         sudo http_proxy=$HTTP_PROXY SKIP_BUILD_HOOK=y debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
diff --git a/slave.mk b/slave.mk
index 54470e27dc34..05f2b56aa08d 100644
--- a/slave.mk
+++ b/slave.mk
@@ -61,6 +61,7 @@ export CONFIGURED_ARCH
 export PYTHON_WHEELS_PATH
 export IMAGE_DISTRO
 export IMAGE_DISTRO_DEBS_PATH
+export MULTIARCH_QEMU_ENVIRON
 
 ###############################################################################
 ## Utility rules
@@ -254,6 +255,7 @@ $(info "INCLUDE_NAT"                     : "$(INCLUDE_NAT)")
 $(info "INCLUDE_KUBERNETES"              : "$(INCLUDE_KUBERNETES)")
 $(info "TELEMETRY_WRITABLE"              : "$(TELEMETRY_WRITABLE)")
 $(info "PDDF_SUPPORT"                    : "$(PDDF_SUPPORT)")
+$(info "MULTIARCH_QEMU_ENVIRON"          : "$(MULTIARCH_QEMU_ENVIRON)")
 $(info )
 else
 $(info SONiC Build System for $(CONFIGURED_PLATFORM):$(CONFIGURED_ARCH))
@@ -1007,6 +1009,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	SONIC_ENFORCE_VERSIONS=$(SONIC_ENFORCE_VERSIONS) \
 	TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) \
 	PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
+	MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) \
 		./build_debian.sh $(LOG)
 
 	USERNAME="$(USERNAME)" \
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 075bb6916af9..4b3e371fb8c7 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -1,8 +1,8 @@
-{%- if CONFIGURED_ARCH == "armhf" %}
+{%- if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/qemu-user-static:x86_64-arm-5.0.0-2 as qemu
 FROM multiarch/debian-debootstrap:armhf-buster
 COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
-{%- elif CONFIGURED_ARCH == "arm64" %}
+{%- elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-buster
 {%- else -%}
 FROM debian:buster
diff --git a/sonic-slave-buster/Dockerfile.user.j2 b/sonic-slave-buster/Dockerfile.user.j2
index a1181524bd91..8b17e482356c 100644
--- a/sonic-slave-buster/Dockerfile.user.j2
+++ b/sonic-slave-buster/Dockerfile.user.j2
@@ -1,8 +1,8 @@
 ARG slave_base_tag_ref=latest
-{%- if CONFIGURED_ARCH == "amd64" %}
+{%- if MULTIARCH_QEMU_ENVIRON != "y" %}
 FROM sonic-slave-buster:${slave_base_tag_ref}
 {%- else %}
-FROM sonic-slave-buster-{{ CONFIGURED_ARCH }}:${slave_base_tag_ref}
+FROM sonic-slave-buster-march-{{ CONFIGURED_ARCH }}:${slave_base_tag_ref}
 {%- endif %}
 
 # Add user
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index b22a3d0c2238..8a1236b56ccd 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -1,6 +1,6 @@
-{%- if CONFIGURED_ARCH == "armhf" %}
+{%- if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:armhf-stretch
-{%- elif CONFIGURED_ARCH == "arm64" %}
+{%- elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-stretch
 {%- else -%}
 FROM debian:stretch
diff --git a/sonic-slave-stretch/Dockerfile.user.j2 b/sonic-slave-stretch/Dockerfile.user.j2
index 8e94b7046ae3..fd39b1fde954 100644
--- a/sonic-slave-stretch/Dockerfile.user.j2
+++ b/sonic-slave-stretch/Dockerfile.user.j2
@@ -1,8 +1,8 @@
 ARG slave_base_tag_ref=latest
-{%- if CONFIGURED_ARCH == "amd64"  %}
+{%- if MULTIARCH_QEMU_ENVIRON != "y"  %}
 FROM sonic-slave-stretch:${slave_base_tag_ref}
 {%- else %}
-FROM sonic-slave-stretch-{{ CONFIGURED_ARCH }}:${slave_base_tag_ref}
+FROM sonic-slave-stretch-march-{{ CONFIGURED_ARCH }}:${slave_base_tag_ref}
 {%- endif %}
 
 # Add user
diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile
index 071429121f6d..779a3b9e40ff 100644
--- a/src/ethtool/Makefile
+++ b/src/ethtool/Makefile
@@ -12,7 +12,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd ethtool
 	git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
 	# Build package
-ifneq (,(filter $(CONFIGURED_ARCH),arm64 armhf))
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 else
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile
index 2e0ac828169c..af225cfe61b6 100644
--- a/src/snmpd/Makefile
+++ b/src/snmpd/Makefile
@@ -29,7 +29,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg init
 	stg import -s ../patch-$(SNMPD_VERSION)/series
 
-ifeq ($(CONFIGURED_ARCH), arm64)
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	dpkg-buildpackage -rfakeroot -b -d -us -uc -j1 --admindir $(SONIC_DPKG_ADMINDIR)
 else
 	dpkg-buildpackage -rfakeroot -b -d -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)

From 0e970582c1b611c006018aa47edaa70ff7e5aa91 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Mon, 3 May 2021 20:38:11 +0300
Subject: [PATCH 0410/1674] [swss_vars]: Add 'resource_type' attribute. (#7188)

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 files/build_templates/swss_vars.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/build_templates/swss_vars.j2 b/files/build_templates/swss_vars.j2
index a9bd01565c89..d720a61e674f 100644
--- a/files/build_templates/swss_vars.j2
+++ b/files/build_templates/swss_vars.j2
@@ -2,5 +2,6 @@
     "asic_type": "{{ asic_type }}",
     "asic_id": "{{ DEVICE_METADATA.localhost.asic_id }}",
     "mac": "{{ DEVICE_METADATA.localhost.mac }}",
-    "synchronous_mode": {% if DEVICE_METADATA.localhost.synchronous_mode == "disable" %}"disable"{% else %}"enable"{% endif %}
+    "synchronous_mode": {% if DEVICE_METADATA.localhost.synchronous_mode == "disable" %}"disable"{% else %}"enable"{% endif %},
+    "resource_type": "{{ DEVICE_METADATA.localhost.resource_type }}"
 }

From 7ae4a990e7abd800859d2c2c63eae681707a3538 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Fri, 12 Feb 2021 10:56:44 -0800
Subject: [PATCH 0411/1674] [docker-fpm-frr]: TSA/B/C changes for multi-asic
 (#6510)

- Introduced TS common file in docker as well and moved common functions.
- TSA/B/C scripts run only in BGP instances for front end ASICs.
       In addition skip enforcing it on route maps used between internal BGP sessions.

admin@str--acs-1:~$ sudo /usr/bin/TSA
System Mode: Normal -> Maintenance

and in case of Multi-ASIC
admin@str--acs-1:~$ sudo /usr/bin/TSA
BGP0 : System Mode: Normal -> Maintenance
BGP1 : System Mode: Normal -> Maintenance
BGP2 : System Mode: Normal -> Maintenance
---
 dockers/docker-fpm-frr/Dockerfile.j2        |  1 +
 dockers/docker-fpm-frr/TS                   | 40 +++++++++++++++++++++
 dockers/docker-fpm-frr/TSA                  | 16 ++-------
 dockers/docker-fpm-frr/TSB                  | 19 ++--------
 dockers/docker-fpm-frr/TSC                  | 36 ++-----------------
 dockers/docker-fpm-frr/base_image_files/TS  | 29 +++++++++++++++
 dockers/docker-fpm-frr/base_image_files/TSA |  2 +-
 dockers/docker-fpm-frr/base_image_files/TSB |  2 +-
 dockers/docker-fpm-frr/base_image_files/TSC |  2 +-
 rules/docker-fpm-frr.mk                     |  1 +
 10 files changed, 82 insertions(+), 66 deletions(-)
 create mode 100755 dockers/docker-fpm-frr/TS
 create mode 100755 dockers/docker-fpm-frr/base_image_files/TS

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 360d64a12b82..42df1c6f38f8 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -53,6 +53,7 @@ COPY ["snmp.conf", "/etc/snmp/frr.conf"]
 COPY ["TSA", "/usr/bin/TSA"]
 COPY ["TSB", "/usr/bin/TSB"]
 COPY ["TSC", "/usr/bin/TSC"]
+COPY ["TS", "/usr/bin/TS"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["zsocket.sh", "/usr/bin/"]
 RUN chmod a+x /usr/bin/TSA && \
diff --git a/dockers/docker-fpm-frr/TS b/dockers/docker-fpm-frr/TS
new file mode 100755
index 000000000000..78ba24d5db63
--- /dev/null
+++ b/dockers/docker-fpm-frr/TS
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Check whether the routemap is for internal BGP sessions.
+function is_internal_route_map()
+{
+    [[ "$1" =~ .*"_INTERNAL_".* ]]
+}
+
+function check_not_installed()
+{
+  c=0
+  config=$(vtysh -c "show run")
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  do
+    is_internal_route_map $route_map_name && continue
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
+    c=$((c+$?))
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
+    c=$((c+$?))
+  done
+  return $c
+}
+
+function check_installed()
+{
+  c=0
+  e=0
+  config=$(vtysh -c "show run")
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  do
+    is_internal_route_map $route_map_name && continue
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
+    c=$((c+$?))
+    e=$((e+1))
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
+    c=$((c+$?))
+    e=$((e+1))
+  done
+  return $((e-c))
+}
diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
index 524e4297d1c0..6312bf0ba5e6 100755
--- a/dockers/docker-fpm-frr/TSA
+++ b/dockers/docker-fpm-frr/TSA
@@ -1,18 +1,7 @@
 #!/bin/bash
 
-function check_not_installed()
-{
-  c=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-  done
-  return $c
-}
+# Load the common functions
+source /usr/bin/TS
 
 check_not_installed
 not_installed=$?
@@ -21,6 +10,7 @@ then
   TSA_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
       *V4*)
         ip_version=V4
diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
index 8592ad76cf69..44f9b15aea27 100755
--- a/dockers/docker-fpm-frr/TSB
+++ b/dockers/docker-fpm-frr/TSB
@@ -1,21 +1,7 @@
 #!/bin/bash
 
-function check_installed()
-{
-  c=0
-  e=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    e=$((e+1))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-    e=$((e+1))
-  done
-  return $((e-c))
-}
+# Load the common functions
+source /usr/bin/TS
 
 check_installed
 installed=$?
@@ -24,6 +10,7 @@ then
   TSB_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
       *V4*)
       ;;
diff --git a/dockers/docker-fpm-frr/TSC b/dockers/docker-fpm-frr/TSC
index c7fd8a2ff157..a0e908439e41 100755
--- a/dockers/docker-fpm-frr/TSC
+++ b/dockers/docker-fpm-frr/TSC
@@ -1,37 +1,7 @@
 #!/bin/bash
 
-function check_not_installed()
-{
-  c=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-  done
-  return $c
-}
-
-function check_installed()
-{
-  c=0
-  e=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    e=$((e+1))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-    e=$((e+1))
-  done
-  return $((e-c))
-}
-
-echo "Traffic Shift Check:"
+# Load the common functions
+source /usr/bin/TS
 
 check_not_installed
 not_installed=$?
@@ -48,5 +18,3 @@ then
 else
   echo "System Mode: Not consistent"
 fi
-
-echo
diff --git a/dockers/docker-fpm-frr/base_image_files/TS b/dockers/docker-fpm-frr/base_image_files/TS
new file mode 100755
index 000000000000..de1e50b7a306
--- /dev/null
+++ b/dockers/docker-fpm-frr/base_image_files/TS
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# read SONiC immutable variables
+[ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment
+
+PLATFORM=${PLATFORM:-`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`}
+
+# Parse the device specific asic conf file, if it exists
+ASIC_CONF=/usr/share/sonic/device/$PLATFORM/asic.conf
+[ -f $ASIC_CONF ] && . $ASIC_CONF
+
+if [[ ($NUM_ASIC -gt 1) ]]; then
+    asic=0
+    NAMESPACE_PREFIX='asic'
+
+    while [ $asic -lt $NUM_ASIC ]
+    do
+        # Run TSA/TSB/TSC scripts in BGP instance for frontend ASICs.
+        sub_role=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['sub_role']" -n $NAMESPACE_PREFIX$asic`
+        if [ $sub_role == 'FrontEnd' ]
+        then
+            echo -e "BGP"$asic" : \c"
+            docker exec -i bgp$asic /usr/bin/$1
+        fi
+        asic=$[$asic+1]
+    done
+else
+    docker exec -i bgp /usr/bin/$1
+fi
diff --git a/dockers/docker-fpm-frr/base_image_files/TSA b/dockers/docker-fpm-frr/base_image_files/TSA
index 95c7957f7dc1..e96c76dd67b2 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSA
+++ b/dockers/docker-fpm-frr/base_image_files/TSA
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSA
+/usr/bin/TS TSA
diff --git a/dockers/docker-fpm-frr/base_image_files/TSB b/dockers/docker-fpm-frr/base_image_files/TSB
index f292d2031db3..176b10c684c8 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSB
+++ b/dockers/docker-fpm-frr/base_image_files/TSB
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSB
+/usr/bin/TS TSB
diff --git a/dockers/docker-fpm-frr/base_image_files/TSC b/dockers/docker-fpm-frr/base_image_files/TSC
index b8136ae4f4c3..09d1409c50c7 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSC
+++ b/dockers/docker-fpm-frr/base_image_files/TSC
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSC
+/usr/bin/TS TSC
 
 portstat -p 5
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index 3a6f2a20587d..e584bf55104e 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -31,4 +31,5 @@ $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSA:/usr/bin/TSA
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
+$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TS:/usr/bin/TS
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += monit_bgp:/etc/monit/conf.d

From 8cea931cadf960a21a8bcced2cc0dcfbc11cee6e Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Thu, 8 Apr 2021 15:16:43 -0700
Subject: [PATCH 0412/1674] Fixes for errors seen in staging devices (#7171)

With the latest 201911 image, the following error was seen on staging devices with TSB command ( for both single asic, multi asic ). Though this err message doesn't affect the TSB functionality, it is good to fix.

admin@STG01-0101-0102-01T1:~$ TSB
BGP0 : % Could not find route-map entry TO_TIER0_V4 20
line 1: Failure to communicate[13] to zebra, line: no route-map TO_TIER0_V4 permit 20
% Could not find route-map entry TO_TIER0_V4 30
line 2: Failure to communicate[13] to zebra, line: no route-map TO_TIER0_V4 deny 30

In addition, in this PR I am fixing the message displayed to user when there are no BGP neighbors configured on that BGP instance. In multi-asic device there could be case where there are no BGP neighbors configured on a particular ASIC.
---
 dockers/docker-fpm-frr/TS  | 16 ++++++++++++++--
 dockers/docker-fpm-frr/TSA | 10 ++++++++--
 dockers/docker-fpm-frr/TSB | 10 ++++++++--
 dockers/docker-fpm-frr/TSC |  7 ++++++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-fpm-frr/TS b/dockers/docker-fpm-frr/TS
index 78ba24d5db63..5057802c7661 100755
--- a/dockers/docker-fpm-frr/TS
+++ b/dockers/docker-fpm-frr/TS
@@ -10,7 +10,7 @@ function check_not_installed()
 {
   c=0
   config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6' | uniq);
   do
     is_internal_route_map $route_map_name && continue
     echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
@@ -26,7 +26,7 @@ function check_installed()
   c=0
   e=0
   config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6' | uniq);
   do
     is_internal_route_map $route_map_name && continue
     echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
@@ -38,3 +38,15 @@ function check_installed()
   done
   return $((e-c))
 }
+
+function find_num_routemap()
+{
+  c=0
+  config=$(vtysh -c "show run")
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6' | uniq);
+  do
+    is_internal_route_map $route_map_name && continue
+    c=$((c+1))
+  done
+  return $c
+}
diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
index 6312bf0ba5e6..f45d3bf0bcb3 100755
--- a/dockers/docker-fpm-frr/TSA
+++ b/dockers/docker-fpm-frr/TSA
@@ -3,12 +3,18 @@
 # Load the common functions
 source /usr/bin/TS
 
+find_num_routemap
+routemap_count=$?
 check_not_installed
 not_installed=$?
-if [[ $not_installed -ne 0 ]];
+
+if [[ $routemap_count -eq 0 ]];
+then
+  echo "System Mode: No external neighbors"
+elif [[ $not_installed -ne 0 ]];
 then
   TSA_FILE=$(mktemp)
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | uniq);
   do
     is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
index 44f9b15aea27..50f1ebc3ce8b 100755
--- a/dockers/docker-fpm-frr/TSB
+++ b/dockers/docker-fpm-frr/TSB
@@ -3,12 +3,18 @@
 # Load the common functions
 source /usr/bin/TS
 
+find_num_routemap
+routemap_count=$?
 check_installed
 installed=$?
-if [[ $installed -ne 0 ]];
+
+if [[ $routemap_count -eq 0 ]];
+then
+  echo "System Mode: No external neighbors"
+elif [[ $installed -ne 0 ]]; 
 then
   TSB_FILE=$(mktemp)
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | uniq);
   do
     is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
diff --git a/dockers/docker-fpm-frr/TSC b/dockers/docker-fpm-frr/TSC
index a0e908439e41..45d22bdf55c1 100755
--- a/dockers/docker-fpm-frr/TSC
+++ b/dockers/docker-fpm-frr/TSC
@@ -3,13 +3,18 @@
 # Load the common functions
 source /usr/bin/TS
 
+find_num_routemap
+routemap_count=$?
 check_not_installed
 not_installed=$?
 
 check_installed
 installed=$?
 
-if [[ $installed -eq 0 ]];
+if [[ $routemap_count -eq 0 ]];
+then 
+  echo "System Mode: No external neighbors"
+elif [[ $installed -eq 0 ]];
 then
   echo "System Mode: Normal"
 elif [[ $not_installed -eq 0 ]];

From 4152c3e3379f78557f1463d2e77b31e3b732a394 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Tue, 4 May 2021 17:29:47 +0300
Subject: [PATCH 0413/1674] [Mellanox] [202012] Update SAI submodule pointer
 (#7499)

- Why I did it
To include below changes:
Set monitoring VLAN hostif up dy default (for VNET ping tool)

- How I did it
Updated SAI submodule pointer

- How to verify it
Create VLAN hostif according to changes in PR: Azure/sonic-swss#1645
Verify it is admin up by default

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 099ad578a059..8f654f4413d5 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 099ad578a059fa9d5a492561eca1281a830fb7b6
+Subproject commit 8f654f4413d5a73be2bce394ce1fdeecd43e77fa

From 6060da3a3679119a04f1e319dfd0687a742b111d Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 4 May 2021 08:35:48 -0700
Subject: [PATCH 0414/1674] [202012][swss/swss-common/utilities/kernel] Update
 submodule (#7487)

* [202012][swss/swss-common/utilities/kernel] Update submodule

sonic-swss:
- [Monitor Vlan] Fix a typo in hostif (#1722)
- Update pool sizes during initialization from timer only (#1708)
- [SflowMgr] SamplingRate Update by Speed Change Added (#1721)

sonic-swss-common:
- [swss-common] Add MUX Metrics Table (#482)
- [azp] Purge swss before installing the newly built deb package (#472)

sonic-utilities:
- disk_check: Check & mount RO as RW using tmpfs (#1569)
- No more IP validation as it is more likely a URL (#1555)
- Stop PMON docker before cold and soft reboots (#1514)
- Add soft-reboot reboot type (#1453)
- [acl] Use a list instead of a comma-separated string for ACL port list (#1519)
- sonic-installer: fix py3 issues in bootloader.aboot (#1553)
- Fix unsupported fs.squashfs extraction in sonic-installer (#1366)
- [show][config] cli support for firmware upgrade on Y-Cable (#1528) (#1558)

sonic-linux-kernel:
- [Mellanox] backport kernel patches for hw-management 7.0100.2303 (#211)

Signed-off-by: Danny Allen <daall@microsoft.com>

* Update utilities w/ build fix
---
 src/sonic-linux-kernel | 2 +-
 src/sonic-swss         | 2 +-
 src/sonic-swss-common  | 2 +-
 src/sonic-utilities    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index b67c27820ada..24eaf3c1339b 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit b67c27820adaa182d97f402c5f90af62a55e7b5b
+Subproject commit 24eaf3c1339b3ef47096c47c6694e25d94ba449d
diff --git a/src/sonic-swss b/src/sonic-swss
index adf5ab588335..e72fc8d615b0 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit adf5ab588335c05d974ca3c0778b2d8e58895879
+Subproject commit e72fc8d615b03563d5e72b6b35c5b781db781a97
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index f59b5720d88f..2dd0dd9fe812 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit f59b5720d88f58dd575a56040bb75bb1bcd4f913
+Subproject commit 2dd0dd9fe812b88b2adce8da36507e557a359ab6
diff --git a/src/sonic-utilities b/src/sonic-utilities
index a5b52851f1a5..efa0924a6ec7 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit a5b52851f1a59b92606e3929fe96e0025b55061f
+Subproject commit efa0924a6ec7fdf5d6da7f7f39fe43c3c16703c7

From e27293f4dfb5562510562d04b4ece20d67a04e14 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 5 May 2021 21:02:39 +0800
Subject: [PATCH 0415/1674] Disable the reproducible build for arm64 and armhf
 temporarily (#7517)

Disable the reproducible build for arm64 and armhf temporarily.
The package version upgrade has been disabled for armhf and armhf for long run time, so disable the reproducible build for the official builds as well. we will enable it when arm64 azure agent ready.
---
 .azure-pipelines/azure-pipelines-build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index d482934f57bf..6c3c8a19b715 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -61,6 +61,7 @@ jobs:
           timeoutInMinutes: 1800
           variables:
             PLATFORM_ARCH: arm64
+            BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
         - name: generic
           variables:
             dbg_image: yes
@@ -72,6 +73,7 @@ jobs:
           timeoutInMinutes: 1800
           variables:
             PLATFORM_ARCH: armhf
+            BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
         - name: mellanox
           variables:
             dbg_image: yes

From a0575a7790ac17e0f5c313726ae10bd7e2ebbd93 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Mon, 3 May 2021 12:29:57 -0700
Subject: [PATCH 0416/1674] [ci]: increase official build to 12 hours

10-hour limit is not enough to finish several jobs.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/azure-pipelines-job-groups.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-job-groups.yml b/.azure-pipelines/azure-pipelines-job-groups.yml
index d5be80dcde3f..1a4dbb79cc0e 100644
--- a/.azure-pipelines/azure-pipelines-job-groups.yml
+++ b/.azure-pipelines/azure-pipelines-job-groups.yml
@@ -19,7 +19,7 @@ parameters:
   default: ''
 - name: 'timeoutInMinutes'
   type: 'number'
-  default: 600
+  default: 720
 - name: 'jobFilters'
   type: object
   default: ''

From 7841b7513c62499b86b03d821418b3225b498235 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sun, 2 May 2021 09:55:15 -0700
Subject: [PATCH 0417/1674] [ci]: change timeout to 36 hours for armhf/arm64
 build

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/azure-pipelines-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 6c3c8a19b715..4b2459e56c80 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -58,7 +58,7 @@ jobs:
             platform_rpc: centec
         - name: centec-arm64
           pool: sonicbld_8c
-          timeoutInMinutes: 1800
+          timeoutInMinutes: 2160
           variables:
             PLATFORM_ARCH: arm64
             BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
@@ -70,7 +70,7 @@ jobs:
             swi_image: yes
         - name: marvell-armhf
           pool: sonicbld_8c
-          timeoutInMinutes: 1800
+          timeoutInMinutes: 2160
           variables:
             PLATFORM_ARCH: armhf
             BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=

From 90bcc51203c3b14d54e893e5171be8e33262a09a Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Sat, 1 May 2021 07:35:38 +0800
Subject: [PATCH 0418/1674] [CI] Add Bldenv pipeline files (#7458)

Add 3 pipeline files:

- pipeline for build docker image sonic-slave-[buster|jessie|stretch] for amd64/armhf/arm64, and push to ACR(sonicdev-microsoft.com)
- pipeline for build docker image sonic-mgmt, and push to ACR
- pipeline for cleaning dpkg cache which are created more than 30 days.

Co-authored-by: lguohan <lguohan@gmail.com>
---
 .azure-pipelines/docker-sonic-mgmt.yml  |  57 +++++++++++++
 .azure-pipelines/docker-sonic-slave.yml | 106 ++++++++++++++++++++++++
 .azure-pipelines/dpkg-cache-cleanup.yml |  27 ++++++
 3 files changed, 190 insertions(+)
 create mode 100644 .azure-pipelines/docker-sonic-mgmt.yml
 create mode 100644 .azure-pipelines/docker-sonic-slave.yml
 create mode 100644 .azure-pipelines/dpkg-cache-cleanup.yml

diff --git a/.azure-pipelines/docker-sonic-mgmt.yml b/.azure-pipelines/docker-sonic-mgmt.yml
new file mode 100644
index 000000000000..4dc9aee9bb89
--- /dev/null
+++ b/.azure-pipelines/docker-sonic-mgmt.yml
@@ -0,0 +1,57 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+# Build and push sonic-mgmt image
+
+schedules:
+- cron: "0 8 * * *"
+  branches:
+    include:
+    - master
+  always: true
+
+trigger: none
+pr:
+  branches:
+    include:
+    - master
+  paths:
+    include:
+    - dockers/docker-sonic-mgmt
+
+parameters:
+- name: registry_url
+  type: string
+  default: sonicdev-microsoft.azurecr.io
+- name: registry_conn
+  type: string
+  default: sonicdev
+
+stages:
+- stage: Build
+  jobs:
+  - job: Build
+    pool: sonicbld
+    timeoutInMinutes: 360
+    steps:
+    - template: cleanup.yml
+    - checkout: self
+      clean: true
+      submodules: recursive
+    - bash: |
+        set -xe
+        make configure PLATFORM=generic
+        make target/docker-sonic-mgmt.gz
+        docker load -i target/docker-sonic-mgmt.gz
+        docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest
+      env:
+        REGISTRY_SERVER: ${{ parameters.registry_url }}
+      displayName: Build docker-sonic-mgmt.gz
+    - task: Docker@2
+      displayName: Upload image
+      inputs:
+        containerRegistry: ${{ parameters.registry_conn }}
+        repository: docker-sonic-mgmt
+        command: push
+        tags: latest
diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
new file mode 100644
index 000000000000..1da5f4c911ee
--- /dev/null
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -0,0 +1,106 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+
+schedules:
+- cron: "0 8 * * *"
+  branches:
+    include:
+    - master
+  always: true
+
+trigger: none
+pr:
+  branches:
+    include:
+    - master
+  paths:
+    include:
+    - sonic-slave-jessie
+    - sonic-slave-stretch
+    - sonic-slave-buster   
+
+parameters:
+- name: 'arches'
+  type: object
+  default: 
+  - amd64
+  - armhf
+  - arm64
+- name: 'dists'
+  type: object
+  default:
+  - buster
+  - stretch
+  - jessie
+- name: registry_url
+  type: string
+  default: sonicdev-microsoft.azurecr.io
+- name: registry_conn
+  type: string
+  default: sonicdev
+
+stages:
+- stage: Build
+  jobs:
+  - ${{ each dist in parameters.dists }}:
+    - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
+      - ${{ each arch in parameters.arches }}:
+        - job: Build_${{ dist }}_${{ arch }}
+          timeoutInMinutes: 360
+          pool: sonicbld
+          steps:
+          - template: cleanup.yml
+          - checkout: self
+            clean: true
+            submodules: recursive
+          - bash: |
+              set -ex
+
+              containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
+              if [ ! -z "$containers" ]; then
+                docker container kill $containers || true
+                sleep 5
+              fi
+              images=$(docker images 'sonic-slave-*' -a -q)
+              if [ ! -z "$images" ]; then
+                docker rmi -f $images
+              fi
+
+              SLAVE_DIR=sonic-slave-${{ dist }}
+              if [ x${{ arch }} == x"amd64" ]; then
+                SLAVE_BASE_IMAGE=${SLAVE_DIR}
+              else
+                SLAVE_BASE_IMAGE=${SLAVE_DIR}-march-${{ arch }}
+              fi
+
+              tmpfile=$(mktemp)
+
+              echo ${{ arch }} > .arch
+
+              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} make -f Makefile.work sonic-slave-build | tee $tmpfile
+              SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
+              SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
+
+              mkdir -p target
+
+              docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE:latest
+              docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG
+              set +x
+              echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_IMAGE]$SLAVE_BASE_IMAGE"
+              echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_TAG]$SLAVE_BASE_TAG"
+            env:
+              REGISTRY_SERVER: ${{ parameters.registry_url }}
+            displayName: Build sonic-slave-${{ dist }}-${{ arch }}
+
+          - task: Docker@2
+            displayName: Upload image
+            inputs:
+              containerRegistry: ${{ parameters.registry_conn }}
+              repository: $(VARIABLE_SLAVE_BASE_IMAGE)
+              command: push
+              tags: |
+                $(VARIABLE_SLAVE_BASE_TAG)
+                latest
diff --git a/.azure-pipelines/dpkg-cache-cleanup.yml b/.azure-pipelines/dpkg-cache-cleanup.yml
new file mode 100644
index 000000000000..2789d1818819
--- /dev/null
+++ b/.azure-pipelines/dpkg-cache-cleanup.yml
@@ -0,0 +1,27 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+# Clean up the cache 30 days ago
+
+schedules:
+- cron: "0 0 * * *"
+  branches:
+    include:
+    - master
+  always: true
+
+trigger: none
+pr: none
+
+jobs:
+- job: Build
+  pool: sonicbld
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      set -xe
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+    displayName: clean dpkg cache
+    

From 9d5b8994523549fae0b80a468abd83577d81750d Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 5 May 2021 07:31:27 -0700
Subject: [PATCH 0419/1674] [ci]: enable sonic-slave build on 202012 branch

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/docker-sonic-slave.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 1da5f4c911ee..078c8e53a5d3 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -8,7 +8,7 @@ schedules:
 - cron: "0 8 * * *"
   branches:
     include:
-    - master
+    - 202012
   always: true
 
 trigger: none
@@ -20,12 +20,12 @@ pr:
     include:
     - sonic-slave-jessie
     - sonic-slave-stretch
-    - sonic-slave-buster   
+    - sonic-slave-buster
 
 parameters:
 - name: 'arches'
   type: object
-  default: 
+  default:
   - amd64
   - armhf
   - arm64

From f766a1bccf7783870966095db5b5e2608abd1ad3 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Fri, 30 Apr 2021 10:02:08 -0700
Subject: [PATCH 0420/1674] Updated Qos/MMU settings for Arista-7050CX3-32S-C32
 & Arista-7050CX3-32S-D48C8 (#7068)

* TD3 Qos/MMU settings for Arista-7050CX3-32S-C32 & Arista-7050CX3-32S-D48C8
---
 .../Arista-7050CX3-32S-C32/buffers.json.j2    |  2 +
 .../buffers_defaults_t0.j2                    | 46 ++++++++++++++++++
 .../pg_profile_lookup.ini                     |  8 ++++
 .../Arista-7050CX3-32S-C32/qos.json.j2        |  1 +
 .../td3-a7050cx3-32s-32x100G.config.bcm       |  7 ++-
 .../Arista-7050CX3-32S-D48C8/buffers.json.j2  |  2 +
 .../buffers_defaults_t0.j2                    | 47 +++++++++++++++++++
 .../pg_profile_lookup.ini                     |  8 ++++
 .../Arista-7050CX3-32S-D48C8/qos.json.j2      |  1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm |  5 ++
 src/sonic-device-data/tests/permitted_list    |  4 ++
 11 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
new file mode 100644
index 000000000000..1083a6210fc9
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..f5b7327e705d
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32712448",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "1622016"
+        },
+        "egress_lossy_pool": {
+            "size": "24709632",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32599040",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32599040"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
new file mode 100644
index 000000000000..e30c3aeae2e0
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  50000  5m   4608    4608 33792   -3        4608
+ 100000  5m   4608    4608 49408   -3        4608
+  50000  40m  4608    4608 36352   -3        4608
+ 100000  40m  4608    4608 54528   -3        4608
+  50000  300m 4608    4608 55296   -3        4608
+ 100000  300m 4608    4608 92672   -3        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index 5536bda517d8..c93de2859539 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -48,6 +48,11 @@ robust_hash_disable_vlan=1
 stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
+sai_optimized_mmu=1
+mmu_init_config="TD3-MSFT-T0-100G"
+buf.map.egress_pool0.ingress_pool=0
+buf.map.egress_pool1.ingress_pool=0
+buf.map.egress_pool2.ingress_pool=1
 phy_chain_rx_lane_map_physical{1.0}=0x1302
 phy_chain_rx_lane_map_physical{101.0}=0x0213
 phy_chain_rx_lane_map_physical{105.0}=0x2031
@@ -509,4 +514,4 @@ serdes_preemphasis_119=0x14410a
 serdes_preemphasis_123=0x14410a
 serdes_preemphasis_127=0x14410a
 serdes_driver_current_130=0xe
-serdes_preemphasis_130=0x102804
+serdes_preemphasis_130=0x102804
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
new file mode 100644
index 000000000000..1083a6210fc9
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..e4d43cf75c23
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -0,0 +1,47 @@
+
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32669440",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "2058240"
+        },
+        "egress_lossy_pool": {
+            "size": "24192256",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32340992",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32340992"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
new file mode 100644
index 000000000000..44880400d0f6
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  50000  5m   4608    4608 79872   -3        4608
+ 100000  5m   4608    4608 54528   -3        4608
+  50000  40m  4608    4608 39936   -3        4608
+ 100000  40m  4608    4608 60416   -3        4608
+  50000  300m 4608    4608 61440   -3        4608
+ 100000  300m 4608    4608 103680  -3        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 5ec69f685ebc..1204e2dcb6ab 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -48,6 +48,11 @@ robust_hash_disable_vlan=1
 stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
+sai_optimized_mmu=1
+mmu_init_config="TD3-MSFT-T0-50G"
+buf.map.egress_pool0.ingress_pool=0
+buf.map.egress_pool1.ingress_pool=0
+buf.map.egress_pool2.ingress_pool=1
 phy_chain_rx_lane_map_physical{1.0}=0x1302
 phy_chain_rx_lane_map_physical{5.0}=0x3120
 phy_chain_rx_lane_map_physical{9.0}=0x3120
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 997250cbf6b8..f152140e9070 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -230,3 +230,7 @@ pbmp_gport_stack
 reglist_enable
 scache_filename
 host_as_route_disable
+sai_optimized_mmu
+buf.map.egress_pool0.ingress_pool
+buf.map.egress_pool1.ingress_pool
+buf.map.egress_pool2.ingress_pool

From a554ddc91de999cd68bd35d3ae340e417fdb5130 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Tue, 4 May 2021 08:10:18 +0800
Subject: [PATCH 0421/1674] [Mellanox] Adopt single way to get fan direction
 for all ASIC types (#7386)

#### Why I did it
Adopt a single way to get fan direction for all ASIC types.
It depends on hw-mgmt V.7.0010.2000.2303. Depends on https://github.com/Azure/sonic-buildimage/pull/7419

#### How I did it
Originally, the get_direction was implemented by fetching and parsing `/var/run/hw-management/system/fan_dir` on the Spectrum-2 and the Spectrum-3 systems. It isn't supported on the Spectrum system.
Now, it is implemented by fetching `/var/run/hw-management/thermal/fanX_dir` for all the platforms.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../sonic_platform/device_data.py               | 10 +++++-----
 .../mlnx-platform-api/sonic_platform/fan.py     |  6 ++++--
 .../sonic_platform/fan_drawer.py                | 17 +++++++++--------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
index a52886a9de51..e1124d0d55e3 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
@@ -10,7 +10,7 @@
             'drawer_num': 4,
             'drawer_type': 'real',
             'fan_num_per_drawer': 2,
-            'support_fan_direction': False,
+            'support_fan_direction': True,
             'hot_swappable': True
         },
         'psus': {
@@ -31,7 +31,7 @@
             'drawer_num': 4,
             'drawer_type': 'real',
             'fan_num_per_drawer': 1,
-            'support_fan_direction': False,
+            'support_fan_direction': True,
             'hot_swappable': True
         },
         'psus': {
@@ -52,7 +52,7 @@
             'drawer_num': 1,
             'drawer_type': 'virtual',
             'fan_num_per_drawer': 4,
-            'support_fan_direction': False,
+            'support_fan_direction': True,
             'hot_swappable': False
         },
         'psus': {
@@ -73,7 +73,7 @@
             'drawer_num': 4,
             'drawer_type': 'real',
             'fan_num_per_drawer': 2,
-            'support_fan_direction': False,
+            'support_fan_direction': True,
             'hot_swappable': True
         },
         'psus': {
@@ -94,7 +94,7 @@
             'drawer_num': 1,
             'drawer_type': 'virtual',
             'fan_num_per_drawer': 4,
-            'support_fan_direction': False,
+            'support_fan_direction': True,
             'hot_swappable': False
         },
         'psus': {
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
index cad7d014e0f7..0fb05f69455c 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
@@ -22,8 +22,10 @@
 
 FAN_PATH = "/var/run/hw-management/thermal/"
 CONFIG_PATH = "/var/run/hw-management/config"
-# fan_dir isn't supported on Spectrum 1. It is supported on Spectrum 2 and later switches
-FAN_DIR = "/var/run/hw-management/system/fan_dir"
+
+FAN_DIR = "/var/run/hw-management/thermal/fan{}_dir"
+FAN_DIR_VALUE_EXHAUST = 0
+FAN_DIR_VALUE_INTAKE = 1
 COOLING_STATE_PATH = "/var/run/hw-management/thermal/cooling_cur_state"
 
 class Fan(FanBase):
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
index 66ee39491735..fcf9b802636e 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
@@ -14,6 +14,7 @@
     from sonic_platform_base.fan_drawer_base import FanDrawerBase
     from sonic_platform_base.fan_base import FanBase
     from .led import FanLed, SharedLed
+    from .utils import read_int_from_file
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
@@ -51,14 +52,14 @@ def get_direction(self):
             return FanBase.FAN_DIRECTION_NOT_APPLICABLE
         
         try:
-            from .fan import FAN_DIR
-            with open(FAN_DIR, 'r') as fan_dir:
-                fan_dir_bits = int(fan_dir.read())
-                fan_mask = 1 << self._index - 1
-                if fan_dir_bits & fan_mask:
-                    return FanBase.FAN_DIRECTION_INTAKE
-                else:
-                    return FanBase.FAN_DIRECTION_EXHAUST
+            from .fan import FAN_DIR, FAN_DIR_VALUE_INTAKE, FAN_DIR_VALUE_EXHAUST
+            fan_dir = read_int_from_file(FAN_DIR.format(self._index), raise_exception=True)
+            if fan_dir == FAN_DIR_VALUE_INTAKE:
+                return FanBase.FAN_DIRECTION_INTAKE
+            elif fan_dir == FAN_DIR_VALUE_EXHAUST:
+                return FanBase.FAN_DIRECTION_EXHAUST
+            else:
+                raise RuntimeError("Got wrong value {} for fan direction {}".format(fan_dir, self._index))
         except (ValueError, IOError) as e:
             raise RuntimeError("Failed to read fan direction status to {}".format(repr(e)))
 

From d76206bae4af28137dddf4f37f98465d5ae2479f Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 3 May 2021 10:51:34 -0700
Subject: [PATCH 0422/1674] dhcpmon: support dual tor in docker template
 (#7470)

---
 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index e6558312f6fe..a1811226a885 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -132,6 +132,8 @@ dhcpmon-{{ vlan_name }}
 [program:dhcpmon-{{ vlan_name }}]
 {# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
 command=/usr/sbin/dhcpmon -id {{ vlan_name }}
+{#- Dual ToR Option #}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0{% endif -%}
 {#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
 {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
 {% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}

From 1c2c1f50ba901ee6d5945032fe360719095880bb Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 3 May 2021 10:51:26 -0700
Subject: [PATCH 0423/1674] dhcpmon: support dual tor scenario (#7471)

---
 src/dhcpmon/src/dhcp_device.c | 12 +++++------
 src/dhcpmon/src/dhcp_device.h | 19 +++++++++++++----
 src/dhcpmon/src/dhcp_devman.c | 39 ++++++++++++++++++++++++++++++++++-
 src/dhcpmon/src/dhcp_devman.h | 11 ++++++++++
 src/dhcpmon/src/main.c        | 11 ++++++++--
 5 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/dhcpmon/src/dhcp_device.c b/src/dhcpmon/src/dhcp_device.c
index f5cb705ee285..f45483f8504c 100644
--- a/src/dhcpmon/src/dhcp_device.c
+++ b/src/dhcpmon/src/dhcp_device.c
@@ -130,7 +130,7 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     case DHCP_MESSAGE_TYPE_INFORM:
         giaddr = ntohl(dhcphdr[DHCP_GIADDR_OFFSET] << 24 | dhcphdr[DHCP_GIADDR_OFFSET + 1] << 16 |
                        dhcphdr[DHCP_GIADDR_OFFSET + 2] << 8 | dhcphdr[DHCP_GIADDR_OFFSET + 3]);
-        if ((context->vlan_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
+        if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
             (!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) {
             context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
             aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
@@ -140,7 +140,7 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     case DHCP_MESSAGE_TYPE_OFFER:
     case DHCP_MESSAGE_TYPE_ACK:
     case DHCP_MESSAGE_TYPE_NAK:
-        if ((context->vlan_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
+        if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
             (!context->is_uplink && dir == DHCP_TX)) {
             context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
             aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
@@ -438,7 +438,7 @@ static int init_socket(dhcp_device_context_t *context, const char *intf)
  *
  * @return 0 on success, otherwise for failure
  */
-static int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
+int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
 {
     int rv = -1;
 
@@ -543,14 +543,14 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 }
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, vlan_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t vlan_ip)
+                              in_addr_t giaddr_ip)
 {
     int rv = -1;
 
@@ -565,7 +565,7 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
             break;
         }
 
-        context->vlan_ip = vlan_ip;
+        context->giaddr_ip = giaddr_ip;
 
         context->buffer = (uint8_t *) malloc(snaplen);
         if (context->buffer == NULL) {
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index 133b9265a434..aa686f4e2718 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -73,7 +73,7 @@ typedef struct
     int sock;                       /** Raw socket associated with this device/interface */
     in_addr_t ip;                   /** network address of this device (interface) */
     uint8_t mac[ETHER_ADDR_LEN];    /** hardware address of this device (interface) */
-    in_addr_t vlan_ip;              /** Vlan IP address */
+    in_addr_t giaddr_ip;            /** Gateway IP address */
     uint8_t is_uplink;              /** north interface? */
     char intf[IF_NAMESIZE];         /** device (interface) name */
     uint8_t *buffer;                /** buffer used to read socket data */
@@ -82,6 +82,17 @@ typedef struct
                                     /** current/snapshot counters of DHCP packets */
 } dhcp_device_context_t;
 
+/**
+ * @code initialize_intf_mac_and_ip_addr(context);
+ *
+ * @brief initializes device (interface) mac/ip addresses
+ *
+ * @param context           pointer to device (interface) context
+ *
+ * @return 0 on success, otherwise for failure
+ */
+int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context);
+
 /**
  * @code dhcp_device_get_ip(context, ip);
  *
@@ -119,21 +130,21 @@ int dhcp_device_init(dhcp_device_context_t **context,
                      uint8_t is_uplink);
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, vlan_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  *
  * @param context           pointer to device (interface) context
  * @param snaplen           length of packet capture
  * @param base              pointer to libevent base
- * @param vlan_ip           vlan IP address
+ * @param giaddr_ip         gateway IP address
  *
  * @return 0 on success, otherwise for failure
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t vlan_ip);
+                              in_addr_t giaddr_ip);
 
 /**
  * @code dhcp_device_shutdown(context);
diff --git a/src/dhcpmon/src/dhcp_devman.c b/src/dhcpmon/src/dhcp_devman.c
index 35378a631ca7..65484798dbd6 100644
--- a/src/dhcpmon/src/dhcp_devman.c
+++ b/src/dhcpmon/src/dhcp_devman.c
@@ -37,6 +37,12 @@ static uint32_t dhcp_num_mgmt_intf = 0;
  *  This IP is used to filter Offer/Ack packet coming from DHCP server */
 static in_addr_t vlan_ip = 0;
 
+/* Device loopback interface ip, which will be used as the giaddr in dual tor setup. */
+static in_addr_t loopback_ip = 0;
+
+/* Whether the device is in dual tor mode, 0 as default for single tor mode. */
+static int dual_tor_mode = 0;
+
 /** mgmt interface */
 static struct intf *mgmt_intf = NULL;
 
@@ -148,6 +154,37 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
     return rv;
 }
 
+/**
+ * @code dhcp_devman_setup_dual_tor_mode(name);
+ *
+ * @brief set up dual tor mode: 1) set dual_tor_mode flag and 2) retrieve loopback_ip.
+ */
+int dhcp_devman_setup_dual_tor_mode(const char *name)
+{
+    int rv = -1;
+
+    dhcp_device_context_t loopback_intf_context;
+
+    if (strlen(name) < sizeof(loopback_intf_context.intf)) {
+        strncpy(loopback_intf_context.intf, name, sizeof(loopback_intf_context.intf) - 1);
+        loopback_intf_context.intf[sizeof(loopback_intf_context.intf) - 1] = '\0';
+    } else {
+        syslog(LOG_ALERT, "loopback interface name (%s) is too long", name);
+        return rv;
+    }
+
+    if (initialize_intf_mac_and_ip_addr(&loopback_intf_context) == 0 &&
+        dhcp_device_get_ip(&loopback_intf_context, &loopback_ip) == 0) {
+            dual_tor_mode = 1;
+    } else {
+        syslog(LOG_ALERT, "failed to retrieve ip addr for loopback interface (%s)", name);
+        return rv;
+    }
+
+    rv = 0;
+    return rv;
+}
+
 /**
  * @code dhcp_devman_start_capture(snaplen, base);
  *
@@ -160,7 +197,7 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 
     if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) {
         LIST_FOREACH(int_ptr, &intfs, entry) {
-            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, vlan_ip);
+            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
             if (rv == 0) {
                 syslog(LOG_INFO,
                        "Capturing DHCP packets on interface %s, ip: 0x%08x, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
diff --git a/src/dhcpmon/src/dhcp_devman.h b/src/dhcpmon/src/dhcp_devman.h
index bba7076902cb..948e79cde4f4 100644
--- a/src/dhcpmon/src/dhcp_devman.h
+++ b/src/dhcpmon/src/dhcp_devman.h
@@ -63,6 +63,17 @@ dhcp_device_context_t* dhcp_devman_get_mgmt_dev();
  */
 int dhcp_devman_add_intf(const char *name, char intf_type);
 
+/**
+ * @code dhcp_devman_setup_dual_tor_mode(name);
+ *
+ * @brief set up dual tor mode: 1) set dual_tor_mode flag and 2) retrieve loopback_ip.
+ *
+ * @param name              interface name
+ *
+ * @return 0 on success, nonzero otherwise
+ */
+int dhcp_devman_setup_dual_tor_mode(const char *name);
+
 /**
  * @code dhcp_devman_start_capture(snaplen, base);
  *
diff --git a/src/dhcpmon/src/main.c b/src/dhcpmon/src/main.c
index bb8c45867f66..29bc534accf0 100644
--- a/src/dhcpmon/src/main.c
+++ b/src/dhcpmon/src/main.c
@@ -40,11 +40,12 @@ static const uint32_t dhcpmon_default_unhealthy_max_count = 10;
  */
 static void usage(const char *prog)
 {
-    printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-w <snapshot window in sec>]"
-            "[-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
+    printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]"
+            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
     printf("where\n");
     printf("\tsouth interface: is a vlan interface,\n");
     printf("\tnorth interface: is a TOR-T1 interface,\n");
+    printf("\tloopback interface: is the loopback interface for dual tor setup,\n");
     printf("\tsnapshot window: during which DHCP counters are gathered and DHCP status is validated (default %d),\n",
             dhcpmon_default_health_check_window);
     printf("\tunhealthy status count: count of consecutive unhealthy status before writing an alert to syslog "
@@ -132,6 +133,12 @@ int main(int argc, char **argv)
             }
             i += 2;
             break;
+        case 'u':
+            if (dhcp_devman_setup_dual_tor_mode(argv[i + 1]) != 0) {
+                usage(basename(argv[0]));
+            }
+            i += 2;
+            break;
         case 'd':
             make_daemon = 1;
             i++;

From b9680e9e251f46a58229201ec3791e3a2a48fe28 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 2 May 2021 23:14:56 +0800
Subject: [PATCH 0424/1674] [Mellanox] Adjust PSU fan name to align with sysfs
 file name (#7490)

Change PSU fan name from psu_{psu_index}fan{fan_index} to psu{psu_index}_fan{fan_index}
---
 platform/mellanox/mlnx-platform-api/sonic_platform/fan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
index 0fb05f69455c..3ae5c4847c92 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
@@ -66,7 +66,7 @@ def __init__(self, fan_index, fan_drawer, position, psu_fan = False, psu=None):
         else:
             self.fan_speed_get_path = "psu{}_fan1_speed_get".format(self.index)
             self.fan_presence_path = "psu{}_fan1_speed_get".format(self.index)
-            self._name = 'psu_{}_fan_{}'.format(self.index, 1)
+            self._name = 'psu{}_fan{}'.format(self.index, 1)
             self.fan_max_speed_path = os.path.join(CONFIG_PATH, "psu_fan_max")
             self.fan_min_speed_path = os.path.join(CONFIG_PATH, "psu_fan_min")
             self.psu_i2c_bus_path = os.path.join(CONFIG_PATH, 'psu{0}_i2c_bus'.format(self.index))

From 684e0c508cf28327fb8b365d4c991253c6da6dbf Mon Sep 17 00:00:00 2001
From: Andriy Yurkiv <70649192+ayurkiv-nvda@users.noreply.github.com>
Date: Tue, 4 May 2021 17:34:33 +0300
Subject: [PATCH 0425/1674] [Mellanox] Add support to VXLAN src port range
 setting via SAI profile for r SN3800-D28C49S1 (#7500)

- Why I did it
Enable VXLAN src port range configuration via SAI profile for Mellanox-SN3800-D28C49S1 SKU

- How I did it
Added SAI_VXLAN_SRCPORT_RANGE_ENABLE=1 configuration to appropriate sai.profile

Signed-off-by: Andriy Yurkiv <ayurkiv@nvidia.com>
---
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
index 4ecb05a1a9e5..24a5baa1174d 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1

From ad05c98d34489f0f0e541c61d777e53b72b94b5e Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 5 May 2021 09:47:57 +0300
Subject: [PATCH 0426/1674] [Mellanox] Update FW to xx.2008.2526 (#7511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Why I did it
Updated FW to xx.2008.2526 version.

Fixed issues:
1. Spectrum-2, Spectrum-3 | sFlow | High CPU load and high on fully loaded switch.
2. Spectrum-2, Spectrum-3 | Fine grain LAG | in rare cases doesn’t update the right entry

- How I did it
Updated submodule pointer and version in a Makefile.

- How to verify it
Full regression and bugs validation

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 23823116af2f..0a23317e3812 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2520
+MLNX_SPC_FW_VERSION = 13.2008.2526
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2520
+MLNX_SPC2_FW_VERSION = 29.2008.2526
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2520
+MLNX_SPC3_FW_VERSION = 30.2008.2526
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 688ae3b21121..29b0dd657444 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 688ae3b21121d3ecc961f0ca93e596a1ed5edbb7
+Subproject commit 29b0dd6574448e15aa207a23bda89afc2d19a831

From 7d98a3fe47dba9176e6f71667aa2c13b55eae347 Mon Sep 17 00:00:00 2001
From: vpsubramaniam <75294883+vpsubramaniam@users.noreply.github.com>
Date: Thu, 11 Mar 2021 00:19:33 +0530
Subject: [PATCH 0427/1674] DellEMC: Z9332F - Watchdog support, add
 platform.json, new platform API implementation and fixes (#6988)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Incorporate the below changes in DellEMC Z9332F platform:

- Implemented watchdog platform API support
- Implement ‘get_position_in_parent’, ‘is_replaceable’ methods for all device types
- Change return type of SFP methods to match specification in sonic_platform_common/sfp_base.py
- Added platform.json file in device directory.

Co-authored-by: V P Subramaniam <Subramaniam_Vellalap@dell.com>
---
 .../platform.json                             | 317 ++++++++++++++++++
 .../z9332f/sonic_platform/chassis.py          |  16 +
 .../z9332f/sonic_platform/component.py        |  54 ++-
 .../z9332f/sonic_platform/fan.py              |  65 +++-
 .../z9332f/sonic_platform/fan_drawer.py       |  68 ++++
 .../z9332f/sonic_platform/psu.py              |  17 +
 .../z9332f/sonic_platform/sfp.py              |  85 +++--
 .../z9332f/sonic_platform/thermal.py          |  74 ++--
 .../z9332f/sonic_platform/watchdog.py         |  93 ++---
 9 files changed, 646 insertions(+), 143 deletions(-)
 create mode 100644 device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
new file mode 100644
index 000000000000..e8add067ca00
--- /dev/null
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
@@ -0,0 +1,317 @@
+{
+    "chassis": {
+        "name": "Z9332F-ON",
+        "components": [
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "FPGA"
+            },
+            {
+                "name": "BMC"
+            },
+            {
+                "name": "Baseboard CPLD"
+            },
+            {
+                "name": "Switch CPLD 1"
+            },
+            {
+                "name": "Switch CPLD 2"
+            }
+        ],
+        "fans": [
+            {
+                "name": "FanTray1-Fan1"
+            },
+            {
+                "name": "FanTray1-Fan2"
+            },
+            {
+                "name": "FanTray2-Fan1"
+            },
+            {
+                "name": "FanTray2-Fan2"
+            },
+            {
+                "name": "FanTray3-Fan1"
+            },
+            {
+                "name": "FanTray3-Fan2"
+            },
+            {
+                "name": "FanTray4-Fan1"
+            },
+            {
+                "name": "FanTray4-Fan2"
+            },
+            {
+                "name": "FanTray5-Fan1"
+            },
+            {
+                "name": "FanTray5-Fan2"
+            },
+            {
+                "name": "FanTray6-Fan1"
+            },
+            {
+                "name": "FanTray6-Fan2"
+            },
+            {
+                "name": "FanTray7-Fan1"
+            },
+            {
+                "name": "FanTray7-Fan2"
+            }
+        ],
+        "fan_drawers":[
+            {
+                "name": "FanTray1",
+                "fans": [
+                    {
+                        "name": "FanTray1-Fan1"
+                    },
+                    {
+                        "name": "FanTray1-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray2",
+                "fans": [
+                    {
+                        "name": "FanTray2-Fan1"
+                    },
+                    {
+                        "name": "FanTray2-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray3",
+                "fans": [
+                    {
+                        "name": "FanTray3-Fan1"
+                    },
+                    {
+                        "name": "FanTray3-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray4",
+                "fans": [
+                    {
+                        "name": "FanTray4-Fan1"
+                    },
+                    {
+                        "name": "FanTray4-Fan2"
+                    }
+                ]
+            },
+                        {
+                "name": "FanTray5",
+                "fans": [
+                    {
+                        "name": "FanTray5-Fan1"
+                    },
+                    {
+                        "name": "FanTray5-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray6",
+                "fans": [
+                    {
+                        "name": "FanTray6-Fan1"
+                    },
+                    {
+                        "name": "FanTray6-Fan2"
+                    }
+                ]
+            },
+            {
+                "name": "FanTray7",
+                "fans": [
+                    {
+                        "name": "FanTray7-Fan1"
+                    },
+                    {
+                        "name": "FanTray7-Fan2"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU1",
+                "fans": [
+                    {
+                        "name": "PSU1 Fan"
+                    }
+                ]
+            },
+            {
+                "name": "PSU2",
+                "fans": [
+                    {
+                        "name": "PSU2 Fan"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "CPU On-board"
+            },
+            {
+                "name": "Baseboard U3"
+            },
+            {
+                "name": "SW Internal"
+            },
+            {
+                "name": "Fan U52"
+            },
+            {
+                "name": "Fan U17"
+            },
+            {
+                "name": "SW U52"
+            },
+            {
+                "name": "SW U16"
+            },
+            {
+                "name": "PSU1 Inlet"
+            },
+            {
+                "name": "PSU1 Hotspot"
+            },
+            {
+                "name": "PSU2 Inlet"
+            },
+            {
+                "name": "PSU2 Hotspot"
+            },
+            {
+                "name": "SW U04"
+            },
+            {
+                "name": "SW U14"
+            },
+            {
+                "name": "SW U4403"
+            }
+        ],
+        "modules": [],
+        "sfps": [
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "QSFP-DD Double Density 8X Pluggable Transceiver"
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+            }
+
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 8ac97943cc09..e337922a3424 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -366,3 +366,19 @@ def set_status_led(self, color):
         self.sys_ledcolor = color
         return True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether Chassis is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index b564c1664533..c60cc06b8f57 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -19,7 +19,8 @@
 
 
 def get_bios_version():
-    return subprocess.check_output(['dmidecode', '-s', 'bios-version']).strip()
+    return subprocess.check_output(
+        ['dmidecode', '-s', 'bios-version']).decode('utf-8').strip()
 
 def get_fpga_version():
     val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:09:00.0/resource0', 0)
@@ -28,7 +29,7 @@ def get_fpga_version():
 def get_bmc_version():
     return subprocess.check_output(
         ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
-        ).strip()
+        ).decode('utf-8').strip()
 
 def get_cpld_version(bus, i2caddr):
     return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
@@ -120,3 +121,52 @@ def install_firmware(self, image_path):
         A boolean, True if install was successful, False if not
         """
         return False
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the component
+        Returns:
+            bool: True if  present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'NA'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'NA'
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the component
+        Returns:
+            bool: True if component is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether component is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
index d7bc0fdd3924..6ffadb2a1e5f 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
@@ -9,7 +9,7 @@
 ########################################################################
 try:
     from sonic_platform_base.fan_base import FanBase
-    from sonic_platform.ipmihelper import IpmiSensor, IpmiFru, get_ipmitool_raw_output
+    from sonic_platform.ipmihelper import IpmiSensor, get_ipmitool_raw_output
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -33,10 +33,6 @@ class Fan(FanBase):
     PSU_FAN_SENSOR_MAPPING = { 1: {"State": 0x2f, "Speed": 0x33},
                                2: {"State": 0x39, "Speed": 0x3d} }
 
-    # { FANTRAY-ID: FRU-ID }
-    FAN_FRU_MAPPING = { 1: 6, 2: 7, 3: 8, 4: 9, 5: 10, 6: 11, 7: 12 }
-    PSU_FRU_MAPPING = { 1: 3, 2: 4 }
-
     def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None):
         FanBase.__init__(self)
         self.is_psu_fan = psu_fan
@@ -51,7 +47,6 @@ def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None)
             self.state_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["State"],
                                            is_discrete=True)
             self.speed_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["Speed"])
-            self.fru = IpmiFru(self.FAN_FRU_MAPPING[self.fantrayindex])
             self.fan_dir_raw_cmd = "0x3a 0x0a {}".format(fantray_index)
         else:
             self.dependency = dependency
@@ -59,7 +54,6 @@ def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None)
             self.state_sensor = IpmiSensor(self.PSU_FAN_SENSOR_MAPPING[self.fanindex]["State"],
                                            is_discrete=True)
             self.speed_sensor = IpmiSensor(self.PSU_FAN_SENSOR_MAPPING[self.fanindex]["Speed"])
-            self.fru = IpmiFru(self.PSU_FRU_MAPPING[self.fanindex])
             self.fan_dir_raw_cmd = "0x3a 0x0a {}".format(7+(fan_index-1))
         self.max_speed = 23500
 
@@ -80,10 +74,7 @@ def get_model(self):
         Returns:
             String: Part number of FAN
         """
-        if self.is_psu_fan:
-            return None
-        else:
-            return self.fru.get_board_part_number()
+        return 'NA'
 
     def get_serial(self):
         """
@@ -91,10 +82,7 @@ def get_serial(self):
         Returns:
             String: Serial number of FAN
         """
-        if self.is_psu_fan:
-            return None
-        else:
-            return self.fru.get_board_serial()
+        return 'NA'
 
     def get_presence(self):
         """
@@ -159,7 +147,7 @@ def get_speed(self):
         if not is_valid or self.max_speed == 0:
             return None
         else:
-            speed = (100 * fan_speed)/self.max_speed
+            speed = (100 * fan_speed)//self.max_speed
         return speed
 
     def get_speed_rpm(self):
@@ -170,3 +158,48 @@ def get_speed_rpm(self):
         """
         is_valid, fan_speed = self.speed_sensor.get_reading()
         return fan_speed if is_valid else None
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.fanindex
+
+    def is_replaceable(self):
+        """
+        Indicate whether Fan is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+            considered tolerable
+        """
+        if self.get_presence():
+            # The tolerance value is fixed as 20% for all the DellEMC platforms
+            tolerance = 20
+        else:
+            tolerance = 0
+
+        return tolerance
+
+    def set_status_led(self, color):
+        """
+        Set led to expected color
+        Args:
+           color: A string representing the color with which to set the
+                 fan status LED
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        # Fan tray status LED controlled by HW
+        # Return True to avoid thermalctld alarm
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
index 0fdc80e651ed..f7ea8a4cbf6c 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
@@ -11,6 +11,7 @@
 try:
     from sonic_platform_base.fan_drawer_base import FanDrawerBase
     from sonic_platform.fan import Fan
+    from sonic_platform.ipmihelper import IpmiFru
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -20,6 +21,7 @@
 class FanDrawer(FanDrawerBase):
     """DellEMC Platform-specific Fan class"""
 
+    FAN_FRU_MAPPING = { 1: 6, 2: 7, 3: 8, 4: 9, 5: 10, 6: 11, 7: 12 }
     def __init__(self, fantray_index):
 
         FanDrawerBase.__init__(self)
@@ -27,6 +29,7 @@ def __init__(self, fantray_index):
         self.fantrayindex = fantray_index + 1
         for i in range(Z9332F_FANS_PER_FANTRAY):
             self._fan_list.append(Fan(fantray_index, i))
+        self.fru = IpmiFru(self.FAN_FRU_MAPPING[self.fantrayindex])
 
     def get_name(self):
         """
@@ -35,3 +38,68 @@ def get_name(self):
             string: The name of the device
         """
         return "FanTray{}".format(self.fantrayindex)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the fan drawer
+        Returns:
+            bool: True if fan_tray is present, False if not
+        """
+        return self.get_fan(0).get_presence()
+
+    def get_model(self):
+        """
+        Retrieves the part number of the fan drawer
+        Returns:
+            string: Part number of fan drawer
+        """
+        return self.fru.get_board_part_number()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the fan drawer
+        Returns:
+            string: Serial number of the fan drawer
+        """
+        return self.fru.get_board_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the fan drawer
+        Returns:
+            bool: True if fan drawer is operating properly, False if not
+        """
+        status = True
+        for fan in self.get_all_fans():
+            status &= fan.get_status()
+        return status
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.fantrayindex
+
+    def is_replaceable(self):
+        """
+        Indicate whether this fan drawer is replaceable.
+        Returns:
+            bool: True if it is replaceable, False if not
+        """
+        return True
+
+    def set_status_led(self, color):
+        """
+        Set led to expected color
+        Args:
+            color: A string representing the color with which to set the
+            fan module status LED
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        # Fan tray status LED controlled by BMC
+        # Return True to avoid thermalctld alarm
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
index 0d06c31fcf8f..f099c6f650df 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
@@ -212,3 +212,20 @@ def get_type(self):
         if type_res is not None and len(type_res) == 1 :
             return psu_type[type_res[0]]
         return None
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this PSU is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index efda0d13c63f..a6aa228ac333 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -10,6 +10,7 @@
 
 try:
     import os
+    import re
     import time
     import subprocess
     import struct
@@ -75,7 +76,8 @@
                   'manufacturer', 'model', 'connector',
                   'encoding', 'ext_identifier', 'ext_rateselect_compliance',
                   'cable_type', 'cable_length', 'nominal_bit_rate',
-                  'specification_compliance', 'type_abbrv_name','vendor_date', 'vendor_oui']
+                  'specification_compliance', 'type_abbrv_name', 'vendor_date',
+                  'vendor_oui', 'application_advertisement']
 
 dom_dict_keys = ['rx_los',       'tx_fault',   'reset_status',
                  'power_lpmode', 'tx_disable', 'tx_disable_channel',
@@ -236,6 +238,15 @@ def __init__(self, index, sfp_type, eeprom_path):
     def get_eeprom_sysfs_path(self):
         return self.eeprom_path
 
+    def _strip_unit_from_str(self, value_str):
+        match = re.match(r'(.*)C$|(.*)Volts$|(.*)mA$|(.*)dBm$', value_str)
+        if match:
+            for value in match.groups():
+                if value is not None:
+                    return float(value)
+
+        return None
+
     def pci_mem_read(self, mm, offset):
         mm.seek(offset)
         read_data_stream = mm.read(4)
@@ -356,8 +367,8 @@ def get_transceiver_info(self):
         compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(info_dict_keys, 'N/A')
         self.media_type = self.set_media_type()
-        if self.reinit_sfp_driver() == False:
-           return transceiver_info_dict
+        if not self.reinit_sfp_driver():
+            return transceiver_info_dict
 
         # BaseInformation
         try:
@@ -663,59 +674,59 @@ def get_rx_los(self):
         """
         Retrieves the RX LOS (lost-of-signal) status of SFP
         """
-        rx_los = False
+        rx_los_list = []
         try:
             if  self.media_type.startswith('QSFP'):
                 rx_los_data = self._get_eeprom_data('rx_los')
                 # As the function expects a single boolean, if any one channel experience LOS,
                 # is considered LOS for QSFP 
                 for rx_los_id in ('Rx1LOS', 'Rx2LOS', 'Rx3LOS', 'Rx4LOS') :
-                    rx_los |= (rx_los_data['data'][rx_los_id]['value'] is 'On')
+                    rx_los_list.append(rx_los_data['data'][rx_los_id]['value'] == 'On')
             else:
                 rx_los_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
                 data = int(rx_los_data[0], 16)
-                rx_los = sffbase().test_bit(data, 1) != 0
+                rx_los_list.append(sffbase().test_bit(data, 1) != 0)
         except (TypeError, ValueError):
             return 'N/A'
-        return rx_los
+        return rx_los_list
 
     def get_tx_fault(self):
         """
         Retrieves the TX fault status of SFP
         """
-        tx_fault = False
+        tx_fault_list = []
         try:
             if  self.media_type.startswith('QSFP'):
                 tx_fault_data = self._get_eeprom_data('tx_fault')
                 for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') : 
-                    tx_fault |= (tx_fault_data['data'][tx_fault_id]['value'] is 'On')
+                    tx_fault_list.append(tx_fault_data['data'][tx_fault_id]['value'] == 'On')
             else:
                 tx_fault_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
                 data = int(tx_fault_data[0], 16)
-                tx_fault = (sffbase().test_bit(data, 2) != 0)
+                tx_fault_list.append(sffbase().test_bit(data, 2) != 0)
         except (TypeError, ValueError):
             return 'N/A'
-        return tx_fault
+        return tx_fault_list
 
     def get_tx_disable(self):
         """
         Retrieves the tx_disable status of this SFP
         """
-        tx_disable = False
+        tx_disable_list = []
         try:
             if  self.media_type.startswith('QSFP'):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
-                    tx_disable |= (tx_disable_data['data'][tx_disable_id]['value'] is 'On')
+                    tx_disable_list.append(tx_disable_data['data'][tx_disable_id]['value'] == 'On')
             else:
                 tx_disable_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
                 data = int(tx_disable_data[0], 16)
                 tx_disable_hard = (sffbase().test_bit(data, SFP_TX_DISABLE_HARD_BIT) != 0)
                 tx_disable_soft = (sffbase().test_bit(data, SFP_TX_DISABLE_SOFT_BIT) != 0)
-                tx_disable = tx_disable_hard | tx_disable_soft
+                tx_disable_list.append(tx_disable_hard | tx_disable_soft)
         except (TypeError, ValueError):
             return 'N/A'
-        return tx_disable
+        return tx_disable_list
 
     def get_tx_disable_channel(self):
         """
@@ -727,7 +738,7 @@ def get_tx_disable_channel(self):
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_channel <<= 1
-                    tx_disable_channel |= (tx_disable_data['data']['Tx1Disable']['value'] is 'On')
+                    tx_disable_channel |= (tx_disable_data['data']['Tx1Disable']['value'] == 'On')
         except (TypeError, ValueError):
             return 'N/A'
         return tx_disable_channel
@@ -762,7 +773,7 @@ def get_power_override(self):
             if  self.media_type.startswith('QSFP'):
                 power_override_data = self._get_eeprom_data('power_override')
                 power_override = power_override_data['data']['PowerOverRide']['value']
-                power_override_state = (power_override is 'On')
+                power_override_state = (power_override == 'On')
         except (TypeError, ValueError): pass
         return power_override_state
 
@@ -773,7 +784,7 @@ def get_temperature(self):
         temperature = None
         try :
             temperature_data = self._get_eeprom_data('Temperature')
-            temperature = temperature_data['data']['Temperature']['value']
+            temperature = self._strip_unit_from_str(temperature_data['data']['Temperature']['value'])
         except (TypeError, ValueError):
             return None
         return temperature
@@ -785,7 +796,7 @@ def get_voltage(self):
         voltage = None
         try:
             voltage_data = self._get_eeprom_data('Voltage')
-            voltage = voltage_data['data']['Vcc']['value']
+            voltage = self._strip_unit_from_str(voltage_data['data']['Vcc']['value'])
         except (TypeError, ValueError):
             return None
         return voltage
@@ -799,11 +810,11 @@ def get_tx_bias(self):
             tx_bias_data = self._get_eeprom_data('ChannelMonitor')
             if  self.media_type.startswith('QSFP'):
                 for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias') :
-                    tx_bias = tx_bias_data['data'][tx_bias_id]['value']
+                    tx_bias = self._strip_unit_from_str(tx_bias_data['data'][tx_bias_id]['value'])
                     tx_bias_list.append(tx_bias)
             else:
                 tx1_bias = tx_bias_data['data']['TXBias']['value']
-                tx_bias_list =  [tx1_bias, "N/A", "N/A", "N/A"]
+                tx_bias_list.append(self._strip_unit_from_str(tx1_bias))
         except (TypeError, ValueError):
             return None
         return tx_bias_list
@@ -817,11 +828,11 @@ def get_rx_power(self):
             rx_power_data = self._get_eeprom_data('ChannelMonitor')
             if  self.media_type.startswith('QSFP'):
                 for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power'):
-                    rx_power = rx_power_data['data'][rx_power_id]['value']
-                    rx_power_list.append(rx_power)
+                    rx_power = self._strip_unit_from_str(rx_power_data['data'][rx_power_id]['value'])
+                    rx_power_list.append(self._strip_unit_from_str(rx_power))
             else:
                 rx1_pw = rx_power_data['data']['RXPower']['value']
-                rx_power_list =  [rx1_pw, "N/A", "N/A", "N/A"]
+                rx_power_list.append(self._strip_unit_from_str(rx1_pw))
         except (TypeError, ValueError):
             return None
         return rx_power_list
@@ -849,11 +860,11 @@ def get_tx_power(self):
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor_TxPower')
                 for tx_power_id in ('TX1Power', 'TX2Power', 'TX3Power', 'TX4Power'):
                     tx_pw = channel_monitor_data['data'][tx_power_id]['value']
-                    tx_power_list.append(tx_pw)
+                    tx_power_list.append(self._strip_unit_from_str(tx_pw))
             else:
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor')
                 tx1_pw = channel_monitor_data['data']['TXPower']['value'] 
-                tx_power_list = [tx1_pw, 'N/A', 'N/A', 'N/A']
+                tx_power_list.append(self._strip_unit_from_str(tx1_pw))
         except (TypeError, ValueError):
             return None
         return tx_power_list
@@ -1012,7 +1023,7 @@ def reinit_sfp_driver(self):
         if not os.path.isfile(driver_path):
             print(driver_path, "does not exist")
             return False
- 
+
         try:
             with os.fdopen(os.open(driver_path, os.O_RDONLY)) as fd:
                 driver_name = fd.read()
@@ -1038,3 +1049,23 @@ def reinit_sfp_driver(self):
 
         except IOError as e:
             print("Error: Unable to open file: %s" % str(e))
+            return False
+
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
index 1c7fe59857a3..578be59735a9 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/thermal.py
@@ -19,28 +19,30 @@
 class Thermal(ThermalBase):
     """DellEMC Platform-specific Thermal class"""
 
-    # [ Sensor-Name, Sensor-ID ]
+    # [ Sensor-Name, Sensor-ID, high threshold, high critical_threshold ]
     SENSOR_MAPPING = [
-        ['CPU On-board', 0x5],
-        ['Baseboard U3', 0x4],
-        ['SW Internal', 0x61],
-        ['Fan U52', 0x0],
-        ['Fan U17', 0x1],
-        ['SW U52', 0x2],
-        ['SW U16', 0x3],
-        ['PSU1 Inlet', 0x34],
-        ['PSU1 Hotspot', 0x35],
-        ['PSU2 Inlet',  0x3E],
-        ['PSU2 Hotspot', 0x3F],
-        ['SW U04', 0x4F],
-        ['SW U14', 0x56],
-        ['SW U4403', 0x5D]
+        ['CPU On-board', 0x5, False, True],
+        ['Baseboard U3', 0x4, False, False],
+        ['SW Internal', 0x61, True, True],
+        ['Fan U52', 0x0, True, True],
+        ['Fan U17', 0x1, False, False],
+        ['SW U52', 0x2, False, False],
+        ['SW U16', 0x3, True, True],
+        ['PSU1 Inlet', 0x34, False, False],
+        ['PSU1 Hotspot', 0x35, False, False],
+        ['PSU2 Inlet',  0x3E, False, False],
+        ['PSU2 Hotspot', 0x3F, False, False],
+        ['SW U04', 0x4F, False, False],
+        ['SW U14', 0x56, False, False],
+        ['SW U4403', 0x5D, False, False]
     ]
 
     def __init__(self, thermal_index=0):
         ThermalBase.__init__(self)
         self.index = thermal_index + 1
         self.sensor = IpmiSensor(self.SENSOR_MAPPING[self.index - 1][1])
+        self.has_high_threshold = self.SENSOR_MAPPING[self.index - 1][2]
+        self.has_high_crit_threshold = self.SENSOR_MAPPING[self.index - 1][3]
 
     def get_name(self):
         """
@@ -111,11 +113,12 @@ def get_high_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-        is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
-        if not is_valid:
-            return super(Thermal, self).get_high_threshold()
+        if self.has_high_threshold:
+            is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
+            if is_valid:
+                return float(high_threshold)
 
-        return float(high_threshold)
+        return super(Thermal, self).get_high_threshold()
 
     def get_low_threshold(self):
         """
@@ -126,11 +129,7 @@ def get_low_threshold(self):
             Celsius up to nearest thousandth of one degree Celsius,
             e.g. 30.125
         """
-        is_valid, low_threshold = self.sensor.get_threshold("LowerNonRecoverable")
-        if not is_valid:
-            low_threshold = 0
-
-        return float(low_threshold)
+        return 0.0
 
     def get_high_critical_threshold(self):
         """
@@ -140,12 +139,12 @@ def get_high_critical_threshold(self):
             thermal in Celsius up to nearest thousandth of one degree
             Celsius, e.g. 30.125
         """
-        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
-        if not is_valid:
-            return super(Thermal, self).get_high_critical_threshold()
+        if self.has_high_crit_threshold:
+            is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
+            if is_valid:
+                return float(high_crit_threshold)
 
-        return float(high_crit_threshold)
-	
+        return super(Thermal, self).get_high_critical_threshold()
 
     def set_high_threshold(self, temperature):
         """
@@ -174,3 +173,20 @@ def set_low_threshold(self, temperature):
         """
         # Thermal threshold values are pre-defined based on HW.
         return False
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this Thermal is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
index 76a7584e91aa..55460bdf06e1 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py
@@ -11,8 +11,8 @@
 
 try:
     import ctypes
-    import subprocess
     from sonic_platform_base.watchdog_base import WatchdogBase
+    from sonic_platform.hwaccess import io_reg_read, io_reg_write
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -29,7 +29,14 @@ class Watchdog(WatchdogBase):
     Abstract base class for interfacing with a hardware watchdog module
     """
 
-    TIMERS = [15,20,30,40,50,60,65,70]
+    TIMERS = [0.2, 30, 60, 180, 240, 300, 420, 600]
+    io_resource = "/dev/port"
+    wd_timer_offset = 0xA181
+    wd_status_offset = 0xA182
+    wd_timer_punch_offset = 0xA184
+    wd_enable = 1
+    wd_disable = 0
+    wd_punch_enable = 0
 
     armed_time = 0
     timeout = 0
@@ -41,34 +48,6 @@ def __init__(self):
         self._clock_gettime = self._librt.clock_gettime
         self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]
 
-    def _get_command_result(self, cmdline):
-        try:
-            proc = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            result = stdout.rstrip('\n')
-        except OSError:
-            result = None
-
-        return result
-
-    def _get_reg_val(self):
-        # 0x31 = CPLD I2C Base Address
-        # 0x07 = Watchdog Function Register
-        value = self._get_command_result("/usr/sbin/i2cget -y 601 0x31 0x07")
-        if not value:
-            return None
-        else:
-            return int(value, 16)
-
-    def _set_reg_val(self,val):
-        # 0x31 = CPLD I2C Base Address
-        # 0x07 = Watchdog Function Register
-        value = self._get_command_result("/usr/sbin/i2cset -y 601 0x31 0x07 %s"
-                % (val))
-        return value
-
     def _get_time(self):
         """
         To get clock monotonic time
@@ -94,7 +73,7 @@ def arm(self, seconds):
         """
         timer_offset = -1
         for key,timer_seconds in enumerate(self.TIMERS):
-            if seconds <= timer_seconds:
+            if seconds > 0 and seconds <= timer_seconds:
                 timer_offset = key
                 seconds = timer_seconds
                 break
@@ -102,43 +81,25 @@ def arm(self, seconds):
         if timer_offset == -1:
             return -1
 
-        # Extracting 5th to 7th bits for WD timer values
-        # 000 - 15 sec
-        # 001 - 20 sec
-        # 010 - 30 sec
-        # 011 - 40 sec
-        # 100 - 50 sec
-        # 101 - 60 sec
-        # 110 - 65 sec
-        # 111 - 70 sec
-        reg_val = self._get_reg_val()
-        wd_timer_offset = (reg_val >> 4) & 0x7
-
-        if wd_timer_offset != timer_offset:
-            # Setting 5th to 7th bits
-            # value from timer_offset
+        wd_timer_val = io_reg_read(self.io_resource, self.wd_timer_offset)
+
+        if wd_timer_val != timer_offset:
             self.disarm()
-            self._set_reg_val(reg_val | (timer_offset << 4))
+            io_reg_write(self.io_resource, self.wd_timer_offset, timer_offset)
 
         if self.is_armed():
-            # Setting last bit to WD Timer punch
-            # Last bit = WD Timer punch
-            self._set_reg_val(reg_val & 0xFE)
-
+            # Setting the WD timer punch
+            io_reg_write(self.io_resource, self.wd_timer_punch_offset, self.wd_punch_enable)
             self.armed_time = self._get_time()
             self.timeout = seconds
             return seconds
         else:
-            # Setting 4th bit to enable WD
-            # 4th bit = Enable WD
-            reg_val = self._get_reg_val()
-            self._set_reg_val(reg_val | 0x8)
-
+            # Enable WD
+            io_reg_write(self.io_resource, self.wd_status_offset, self.wd_enable)
             self.armed_time = self._get_time()
             self.timeout = seconds
             return seconds
 
-
     def disarm(self):
         """
         Disarm the hardware watchdog
@@ -148,11 +109,8 @@ def disarm(self):
             if not
         """
         if self.is_armed():
-            # Setting 4th bit to disable WD
-            # 4th bit = Disable WD
-            reg_val = self._get_reg_val()
-            self._set_reg_val(reg_val & 0xF7)
-
+            # Disable WD
+            io_reg_write(self.io_resource, self.wd_status_offset, self.wd_disable)
             self.armed_time = 0
             self.timeout = 0
             return True
@@ -166,14 +124,11 @@ def is_armed(self):
         Returns:
             A boolean, True if watchdog is armed, False if not
         """
-
-        # Extracting 4th bit to get WD Enable/Disable status
+        # Getting the WD Enable/Disable status
         # 0 - Disabled WD
         # 1 - Enabled WD
-        reg_val = self._get_reg_val()
-        wd_offset = (reg_val >> 3) & 1
-
-        return bool(wd_offset)
+        wd_status = io_reg_read(self.io_resource, self.wd_status_offset)
+        return bool(wd_status)
 
     def get_remaining_time(self):
         """
@@ -185,7 +140,7 @@ def get_remaining_time(self):
             their watchdog timer. If the watchdog is not armed, returns
             -1.
 
-            S5232 doesnot have hardware support to show remaining time.
+            Z9332 does not have hardware support to show remaining time.
             Due to this limitation, this API is implemented in software.
             This API would return correct software time difference if it
             is called from the process which armed the watchdog timer.

From 5dc2860d379e60a29cc671f30ff4812abdf35b47 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 5 May 2021 10:03:11 -0700
Subject: [PATCH 0428/1674] DellEMC: Z9332f SFP enhancements (#7457)

#### Why I did it
400G media EEPROM and DOM information are not populated properly in DellEMC Z9332f platform.

#### How I did it
Handled QSFP_DD, QSFP28/QSFP+, SFP+ accordingly based on media type detected.
---
 .../z9332f/sonic_platform/chassis.py          |   2 +-
 .../z9332f/sonic_platform/sfp.py              | 591 +++++++++++++-----
 2 files changed, 452 insertions(+), 141 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index e337922a3424..d32e3c8c1c5a 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -121,7 +121,7 @@ def __init__(self):
         eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
         for index in range(self.PORT_START, self.PORTS_IN_BLOCK):
             eeprom_path = eeprom_base.format(self._port_to_i2c_mapping[index])
-            port_type = 'SFP' if index in _sfp_port else 'QSFP'
+            port_type = 'SFP' if index in _sfp_port else 'QSFP_DD'
             sfp_node = Sfp(index, port_type, eeprom_path)
             self._sfp_list.append(sfp_node)
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index a6aa228ac333..7934b08626bf 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -21,23 +21,45 @@
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8024 import type_of_media_interface
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_Dom
 
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-# Enabled when ext_media is available
-#ext_media_module = None
-#try:
-#    import ext_media_api as ext_media_module
-#except :
-#    ext_media_module = None
-#    pass
-
 PAGE_OFFSET = 0
 KEY_OFFSET = 1
 KEY_WIDTH = 2
 FUNC_NAME = 3
 
+QSFP_DD_PAGE0 = 0
+QSFP_DD_PAGE1 = 128
+QSFP_DD_PAGE2 = 256
+QSFP_DD_PAGE3 = 384
+QSFP_DD_DOM_CAPABILITY_OFFSET = 2
+QSFP_DD_DOM_CAPABILITY_WIDTH = 1
+QSFP_DD_TEMP_OFFSET = 14
+QSFP_DD_TEMP_WIDTH = 2
+QSFP_DD_VOLT_OFFSET = 16
+QSFP_DD_VOLT_WIDTH = 2
+QSFP_DD_TXBIAS_OFFSET = 26
+QSFP_DD_TXBIAS_WIDTH = 16
+QSFP_DD_TXPOWER_OFFSET = 42
+QSFP_DD_TXPOWER_WIDTH = 16
+QSFP_DD_RXPOWER_WIDTH = 58
+QSFP_DD_RXPOWER_OFFSET = 16
+QSFP_DD_RXLOS_OFFSET = 19
+QSFP_DD_RXLOS_WIDTH = 1
+QSFP_DD_TX_DISABLE_OFFSET = 86
+QSFP_DD_TX_DISABLE_WIDTH = 1
+QSFP_DD_MEDIA_TYPE_OFFSET = 85
+QSFP_DD_MEDIA_TYPE_WIDTH = 1
+QSFP_DD_APP1_ADV_OFFSET = 86
+QSFP_DD_APP1_ADV_WIDTH = 32
+QSFP_DD_APP2_ADV_OFFSET = 351
+QSFP_DD_APP2_ADV_WIDTH = 28
+
 QSFP_INFO_OFFSET = 128
 QSFP_DOM_OFFSET = 0
 QSFP_DOM_OFFSET1 = 384
@@ -83,9 +105,13 @@
                  'power_lpmode', 'tx_disable', 'tx_disable_channel',
                  'temperature',  'voltage',    'rx1power',
                  'rx2power',     'rx3power',   'rx4power',
-                 'tx1bias',      'tx2bias',    'tx3bias',
-                 'tx4bias',      'tx1power',   'tx2power',
-                 'tx3power',     'tx4power']
+                 'rx5power',     'rx6power',   'rx7power',
+                 'rx8power',     'tx1bias',    'tx2bias',
+                 'tx3bias',      'tx4bias',    'tx5bias',
+                 'tx6bias',      'tx7bias',    'tx8bias',
+                 'tx1power',     'tx2power',   'tx3power',
+                 'tx4power',     'tx5power',   'tx6power',
+                 'tx7power',     'tx8power']
 
 threshold_dict_keys = ['temphighalarm',    'temphighwarning',
                        'templowalarm',     'templowwarning',
@@ -97,6 +123,22 @@
                        'txpowerlowalarm',  'txpowerlowwarning',
                        'txbiashighalarm',  'txbiashighwarning',
                        'txbiaslowalarm',   'txbiaslowwarning']
+qsfp_dd_parser = {
+ 'ChannelThreshold': [QSFP_DD_PAGE3,  0, 72,  'parse_module_threshold_values'],
+     'cable_length': [QSFP_DD_PAGE1, 74,  1,  'parse_cable_len'],
+        'connector': [QSFP_DD_PAGE1, 75,  1,  'parse_connector'],
+             'type': [QSFP_DD_PAGE1,  0,  1,  'parse_sfp_type'],
+   'ext_identifier': [QSFP_DD_PAGE1, 72,  2,  'parse_ext_iden'],
+  'type_abbrv_name': [QSFP_DD_PAGE1,  0, 21,  'parse_sfp_type_abbrv_name'],
+     'manufacturer': [QSFP_DD_PAGE1,  1, 16,  'parse_vendor_name'],
+       'vendor_oui': [QSFP_DD_PAGE1, 17,  3,  'parse_vendor_oui'],
+            'model': [QSFP_DD_PAGE1, 20, 16,  'parse_vendor_pn'],
+     'hardware_rev': [QSFP_DD_PAGE1, 36,  2,  'parse_vendor_rev'],
+           'serial': [QSFP_DD_PAGE1, 38, 16,  'parse_vendor_sn'],
+      'vendor_date': [QSFP_DD_PAGE1, 54,  8,  'parse_vendor_date'],
+  'ModuleThreshold': [QSFP_DD_PAGE3,  0, 72,  'parse_module_threshold_values'],
+   'dom_capability': [QSFP_DD_PAGE0,  2 , 1,  'parse_dom_capability'],
+}
 
 sff8436_parser = {
      'reset_status': [QSFP_DOM_OFFSET,   2,  1, 'parse_dom_status_indicator'],
@@ -108,9 +150,8 @@
       'Temperature': [QSFP_DOM_OFFSET,  22,  2, 'parse_temperature'],
           'Voltage': [QSFP_DOM_OFFSET,  26,  2, 'parse_voltage'],
    'ChannelMonitor': [QSFP_DOM_OFFSET,  34, 16, 'parse_channel_monitor_params'],
-   'ChannelMonitor_TxPower': 
+   'ChannelMonitor_TxPower':
                      [QSFP_DOM_OFFSET,  34, 24, 'parse_channel_monitor_params_with_tx_power'],
-
        'cable_type': [QSFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
      'cable_length': [QSFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
         'connector': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
@@ -172,7 +213,7 @@
     '11'  # QSFP28 or later
 ]
 QSFP_DD_TYPE_LIST = [
-    '18' #QSFP-DD Type
+    '18' #QSFP_DD Type
 ]
 OSFP_TYPE_LIST=[
     '19' # OSFP 8X Type
@@ -226,25 +267,50 @@ def __init__(self, index, sfp_type, eeprom_path):
         SfpBase.__init__(self)
         self.index = index
         self.eeprom_path = eeprom_path
-        #sfp_type is the native port type and media_type is the transceiver type
-        #media_type will be detected in get_transceiver_info
-        self.sfp_type = sfp_type
-        self.media_type = self.sfp_type
+        #port_type is the native port type and sfp_type is the transceiver type
+        #sfp_type will be detected in get_transceiver_info
+        self.port_type = sfp_type
+        self.sfp_type = self.port_type
         self.qsfpInfo = sff8436InterfaceId()
         self.qsfpDomInfo = sff8436Dom()
         self.sfpInfo = sff8472InterfaceId()
         self.sfpDomInfo = sff8472Dom(None,1)
+        self.qsfp_dd_Info = qsfp_dd_InterfaceId()
+        self.qsfp_dd_DomInfo = qsfp_dd_Dom()
 
     def get_eeprom_sysfs_path(self):
         return self.eeprom_path
 
+    def detect_dom_capability(self):
+        if self.sfp_type == 'QSFP_DD':
+            offset = 0
+            qsfp_dom_capability_raw = self._read_eeprom_bytes(
+                self.eeprom_path, offset + QSFP_DD_DOM_CAPABILITY_OFFSET, QSFP_DD_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                if self.qsfp_dd_Info is None:
+                    return None
+                dom_capability = self.qsfp_dd_Info.parse_dom_capability(qsfp_dom_capability_raw, 0)
+                if dom_capability['data']['Flat_MEM']['value'] == 'Off':
+                    self.qsfp_dd_app2_list = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    self.dom_tx_bias_supported = True
+                else:
+                    self.qsfp_dd_app2_list = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.dom_tx_bias_supported = False
+            else:
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.dom_tx_bias_supported = False
+
     def _strip_unit_from_str(self, value_str):
         match = re.match(r'(.*)C$|(.*)Volts$|(.*)mA$|(.*)dBm$', value_str)
         if match:
             for value in match.groups():
                 if value is not None:
                     return float(value)
-
         return None
 
     def pci_mem_read(self, mm, offset):
@@ -312,24 +378,46 @@ def _get_eeprom_data(self, eeprom_key):
         eeprom_data = None
         page_offset = None
 
-        if self.media_type.startswith('QSFP'):
+        if self.sfp_type == 'QSFP_DD':
+            page_offset = qsfp_dd_parser[eeprom_key][PAGE_OFFSET]
+            eeprom_data_raw = self._read_eeprom_bytes(
+                self.eeprom_path,
+                (qsfp_dd_parser[eeprom_key][PAGE_OFFSET] +
+                 qsfp_dd_parser[eeprom_key][KEY_OFFSET]),
+                 qsfp_dd_parser[eeprom_key][KEY_WIDTH])
+            if eeprom_data_raw is not None:
+                # Offset 128 is used to retrieve qsfpDD_InterfaceId Info
+                # Offset 0 is used to retrieve QsfpDD_Dom Info
+                if page_offset <= 128:
+                    if self.qsfp_dd_Info is None:
+                        return None
+                    eeprom_data = getattr(
+                        self.qsfp_dd_Info, qsfp_dd_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+                else:
+                    if self.qsfp_dd_DomInfo is None:
+                        return None
+                    eeprom_data = getattr(
+                        self.qsfp_dd_DomInfo, qsfp_dd_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+        elif self.sfp_type == 'QSFP':
             page_offset = sff8436_parser[eeprom_key][PAGE_OFFSET]
             eeprom_data_raw = self._read_eeprom_bytes(
                 self.eeprom_path,
                 (sff8436_parser[eeprom_key][PAGE_OFFSET] +
                  sff8436_parser[eeprom_key][KEY_OFFSET]),
                  sff8436_parser[eeprom_key][KEY_WIDTH])
-            if (eeprom_data_raw is not None):
+            if eeprom_data_raw is not None:
                 # Offset 128 is used to retrieve sff8436InterfaceId Info
                 # Offset 0 is used to retrieve sff8436Dom Info
-                if (page_offset == 128):
-                    if ( self.qsfpInfo is None):
+                if page_offset == 128:
+                    if self.qsfpInfo is None:
                         return None
                     eeprom_data = getattr(
                         self.qsfpInfo, sff8436_parser[eeprom_key][FUNC_NAME])(
                         eeprom_data_raw, 0)
                 else:
-                    if ( self.qsfpDomInfo is None):
+                    if self.qsfpDomInfo is None:
                         return None
                     eeprom_data = getattr(
                         self.qsfpDomInfo, sff8436_parser[eeprom_key][FUNC_NAME])(
@@ -341,17 +429,17 @@ def _get_eeprom_data(self, eeprom_key):
                 (sff8472_parser[eeprom_key][PAGE_OFFSET] +
                  sff8472_parser[eeprom_key][KEY_OFFSET]),
                  sff8472_parser[eeprom_key][KEY_WIDTH])
-            if (eeprom_data_raw is not None):
+            if eeprom_data_raw is not None:
                 # Offset 0 is used to retrieve sff8472InterfaceId Info
                 # Offset 256 is used to retrieve sff8472Dom Info
-                if (page_offset == 0):
-                    if ( self.sfpInfo is None):
+                if page_offset == 0:
+                    if self.sfpInfo is None:
                         return None
                     eeprom_data = getattr(
                         self.sfpInfo, sff8472_parser[eeprom_key][FUNC_NAME])(
                         eeprom_data_raw, 0)
                 else:
-                    if ( self.sfpDomInfo is None):
+                    if self.sfpDomInfo is None:
                         return None
                     eeprom_data = getattr(
                         self.sfpDomInfo, sff8472_parser[eeprom_key][FUNC_NAME])(
@@ -366,12 +454,17 @@ def get_transceiver_info(self):
         transceiver_info_dict = {}
         compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(info_dict_keys, 'N/A')
-        self.media_type = self.set_media_type()
-        if not self.reinit_sfp_driver():
+        if not self.get_presence():
             return transceiver_info_dict
 
+        self.sfp_type = self.set_media_type()
+        if self.reinit_sfp_driver() is False:
+           return transceiver_info_dict
+
+        self.detect_dom_capability()
+
         # BaseInformation
-        try:
+        if self.sfp_type != 'QSFP_DD':
             iface_data = self._get_eeprom_data('type')
             connector = iface_data['data']['Connector']['value']
             encoding = iface_data['data']['EncodingCodes']['value']
@@ -379,9 +472,8 @@ def get_transceiver_info(self):
             rate_identifier = iface_data['data']['RateIdentifier']['value']
             identifier = iface_data['data']['type']['value']
             type_abbrv_name=iface_data['data']['type_abbrv_name']['value']
-            if self.media_type.startswith('QSFP'):
-                bit_rate = str(
-                    iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+            if self.sfp_type == 'QSFP':
+                bit_rate = str(iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
                 for key in qsfp_compliance_code_tup:
                     if key in iface_data['data']['Specification compliance']['value']:
                         compliance_code_dict[key] = iface_data['data']['Specification compliance']['value'][key]['value']
@@ -400,7 +492,7 @@ def get_transceiver_info(self):
                         cable_type = key
                         cable_length = str(iface_data['data'][key]['value'])
 
-            transceiver_info_dict['type_abbrv_name']=type_abbrv_name
+            transceiver_info_dict['type_abbrv_name'] = type_abbrv_name
             transceiver_info_dict['type'] = identifier
             transceiver_info_dict['connector'] = connector
             transceiver_info_dict['encoding'] = encoding
@@ -410,58 +502,135 @@ def get_transceiver_info(self):
             transceiver_info_dict['cable_length'] = cable_length
             transceiver_info_dict['nominal_bit_rate'] = bit_rate
             transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
-        except (ValueError, TypeError) : pass
 
-        # Vendor Date
-        try:
             vendor_date_data = self._get_eeprom_data('vendor_date')
-            vendor_date = vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
-            transceiver_info_dict['vendor_date'] = vendor_date
-        except (ValueError, TypeError) : pass
+            if vendor_date_data is not None:
+                vendor_date = vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+                transceiver_info_dict['vendor_date'] = vendor_date
 
-        # Vendor Name
-        try:
             vendor_name_data = self._get_eeprom_data('manufacturer')
-            vendor_name = vendor_name_data['data']['Vendor Name']['value']
-            transceiver_info_dict['manufacturer'] = vendor_name
-        except (ValueError, TypeError) : pass
+            if vendor_name_data is not None:
+                vendor_name = vendor_name_data['data']['Vendor Name']['value']
+                transceiver_info_dict['manufacturer'] = vendor_name
 
-        # Vendor OUI
-        try:
             vendor_oui_data = self._get_eeprom_data('vendor_oui')
-            vendor_oui = vendor_oui_data['data']['Vendor OUI']['value']
-            transceiver_info_dict['vendor_oui'] = vendor_oui
-        except (ValueError, TypeError) : pass
+            if vendor_oui_data is not None:
+                vendor_oui = vendor_oui_data['data']['Vendor OUI']['value']
+                transceiver_info_dict['vendor_oui'] = vendor_oui
 
-        # Vendor PN
-        try:
             vendor_pn_data = self._get_eeprom_data('model')
-            vendor_pn = vendor_pn_data['data']['Vendor PN']['value']
-            transceiver_info_dict['model'] = vendor_pn
-        except (ValueError, TypeError) : pass
+            if vendor_pn_data is not None:
+                vendor_pn = vendor_pn_data['data']['Vendor PN']['value']
+                transceiver_info_dict['model'] = vendor_pn
 
-        # Vendor Revision
-        try:
             vendor_rev_data = self._get_eeprom_data('hardware_rev')
-            vendor_rev = vendor_rev_data['data']['Vendor Rev']['value']
-            transceiver_info_dict['hardware_rev'] = vendor_rev
-        except (ValueError, TypeError) : pass
+            if vendor_rev_data is not None:
+                vendor_rev = vendor_rev_data['data']['Vendor Rev']['value']
+                transceiver_info_dict['hardware_rev'] = vendor_rev
 
-        # Vendor Serial Number
-        try:
             vendor_sn_data = self._get_eeprom_data('serial')
-            vendor_sn = vendor_sn_data['data']['Vendor SN']['value']
-            transceiver_info_dict['serial'] = vendor_sn
-        except (ValueError, TypeError) : pass
+            if vendor_sn_data is not None:
+                vendor_sn = vendor_sn_data['data']['Vendor SN']['value']
+                transceiver_info_dict['serial'] = vendor_sn
+
+        else:
+            #QSFP_DD
+            type_abbrv_name = self._get_eeprom_data('type_abbrv_name')
+            if type_abbrv_name is not None:
+                transceiver_info_dict['type_abbrv_name'] = type_abbrv_name['data']['type_abbrv_name']['value']
+
+            identifier = self._get_eeprom_data('type')
+            if identifier is not None:
+                transceiver_info_dict['type'] = identifier['data']['type']['value']
+
+            connector = self._get_eeprom_data('connector')
+            if connector is not None:
+                transceiver_info_dict['connector'] = connector['data']['Connector']['value']
+
+            ext_id = self._get_eeprom_data('ext_identifier')
+            if ext_id is not None:
+                transceiver_info_dict['ext_identifier'] = ext_id['data']['Extended Identifier']['value']
+
+            cable_length = self._get_eeprom_data('cable_length')
+            if cable_length is not None:
+                #Since the cable length field can be returned as decimal and float in M,converting it to float as common type.
+                #If the currentreturn type persists, cable length has to defined twice for the same length(e.g. 1 and 1.0M)
+                transceiver_info_dict['cable_length'] = str(float(cable_length['data']['Length Cable Assembly(m)']['value']))
+
+            transceiver_info_dict['encoding'] = "Not supported"
+            transceiver_info_dict['nominal_bit_rate'] = "Not supported"
+            transceiver_info_dict['ext_rateselect_compliance'] = "Not supported"
+
+            eeprom_raw = []
+            eeprom_raw = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_MEDIA_TYPE_OFFSET,
+                                                 QSFP_DD_MEDIA_TYPE_WIDTH)
+            if eeprom_raw is not None:
+                transceiver_info_dict['specification_compliance'] = type_of_media_interface[eeprom_raw[0]]
+
+            transceiver_info_dict['cable_type'] = "Length Cable Assembly(m)"
+
+            vendor_date = self._get_eeprom_data('vendor_date')
+            if vendor_date is not None:
+                transceiver_info_dict['vendor_date'] = vendor_date['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+
+            vendor_name = self._get_eeprom_data('manufacturer')
+            if vendor_name is not None:
+                transceiver_info_dict['manufacturer'] = vendor_name['data']['Vendor Name']['value']
+
+            vendor_oui = self._get_eeprom_data('vendor_oui')
+            if vendor_oui is not None:
+                transceiver_info_dict['vendor_oui'] = vendor_oui['data']['Vendor OUI']['value']
+
+            vendor_pn = self._get_eeprom_data('model')
+            if vendor_pn is not None:
+                transceiver_info_dict['model'] = vendor_pn['data']['Vendor PN']['value']
+
+            vendor_rev = self._get_eeprom_data('hardware_rev')
+            if vendor_rev is not None:
+                transceiver_info_dict['hardware_rev'] = vendor_rev['data']['Vendor Rev']['value']
+
+            vendor_sn = self._get_eeprom_data('serial')
+            if vendor_sn is not None:
+                transceiver_info_dict['serial'] = vendor_sn['data']['Vendor SN']['value']
+
+            if self.qsfp_dd_Info is None:
+                return None
+
+            sfp_media_type_raw = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_MEDIA_TYPE_OFFSET,
+                                                         QSFP_DD_MEDIA_TYPE_WIDTH)
+            if sfp_media_type_raw is not None:
+                sfp_media_type_dict = self.qsfp_dd_Info.parse_media_type(sfp_media_type_raw, 0)
+                if sfp_media_type_dict is None:
+                    return None
+
+            host_media_list = ""
+            if self.qsfp_dd_Info is None:
+                return None
+            qsfp_dd_app1_list = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_APP1_ADV_OFFSET,
+                                                                      QSFP_DD_APP1_ADV_WIDTH)
+            if self.qsfp_dd_app2_list:
+                possible_application_count = 15
+                #Additional application advertisement
+                qsfp_dd_app2_list = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_APP2_ADV_OFFSET,
+                                                                           QSFP_DD_APP2_ADV_WIDTH)
+                if qsfp_dd_app1_list is not None and qsfp_dd_app2_list is not None:
+                    sfp_application_type_list = qsfp_dd_app1_list + qsfp_dd_app2_list
+                else:
+                    return None
+            else:
+                possible_application_count = 8
+                if qsfp_dd_app1_list is not None:
+                    sfp_application_type_list = qsfp_dd_app1_list
+                else:
+                    return None
 
-        # Attempt ext_media read
-#        if ext_media_module is not None:
-#            ext_media_dict = ext_media_module.get_ext_media_info(self)
-#            for key in ext_media_dict:
-#                value = ext_media_dict[key]
-#                if value in [None, 'None', 'none','n/a', '']:
-#                    value = 'N/A'
-#                transceiver_info_dict[key] = str(value)
+            for i in range(0, possible_application_count):
+                if sfp_application_type_list[i * 4] == 'ff':
+                    break
+                host_electrical, media_interface = self.qsfp_dd_Info.parse_application(sfp_media_type_dict,
+                                            sfp_application_type_list[i * 4], sfp_application_type_list[i * 4 + 1])
+                host_media_list = host_media_list + host_electrical + ' - ' + media_interface
+            transceiver_info_dict['application_advertisement'] = host_media_list
 
         return transceiver_info_dict
 
@@ -474,9 +643,30 @@ def get_transceiver_threshold_info(self):
                 threshold_dict_keys, 'N/A')
 
         try:
-            # Module Threshold
-            module_threshold_data = self._get_eeprom_data('ModuleThreshold')
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                module_threshold_data = self._get_eeprom_data('ModuleThreshold')
+                transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['data']['VccHighAlarm']['value']
+                transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['data']['VccHighWarning']['value']
+                transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['data']['VccLowAlarm']['value']
+                transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['data']['VccLowWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = module_threshold_data['data']['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = module_threshold_data['data']['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = module_threshold_data['data']['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = module_threshold_data['data']['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txbiashighalarm'] = module_threshold_data['data']['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = module_threshold_data['data']['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = module_threshold_data['data']['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = module_threshold_data['data']['TxBiasLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = module_threshold_data['data']['TxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = module_threshold_data['data']['TxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = module_threshold_data['data']['TxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = module_threshold_data['data']['TxPowerLowWarning']['value']
+            elif self.sfp_type == 'QSFP':
+                module_threshold_data = self._get_eeprom_data('ModuleThreshold')
                 transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
                 transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
                 transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
@@ -509,7 +699,7 @@ def get_transceiver_threshold_info(self):
         except (ValueError, TypeError) : pass
 
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP':
                 channel_threshold_data = self._get_eeprom_data('ChannelThreshold')
                 transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['data']['RxPowerHighAlarm']['value']
                 transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['data']['RxPowerHighWarning']['value']
@@ -565,23 +755,58 @@ def get_transceiver_bulk_status(self):
         # rx power
         rx_power_list = self.get_rx_power()
 
-        if tx_bias_list is not None:
-            transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
-            transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
-            transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
-            transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
+        if self.sfp_type == 'QSFP_DD':
+            if tx_bias_list is not None:
+                transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
+                transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
+                transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
+                transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
+                transceiver_dom_dict['tx5bias'] = tx_bias_list[4]
+                transceiver_dom_dict['tx6bias'] = tx_bias_list[5]
+                transceiver_dom_dict['tx7bias'] = tx_bias_list[6]
+                transceiver_dom_dict['tx8bias'] = tx_bias_list[7]
 
-        if rx_power_list is not None:
-            transceiver_dom_dict['rx1power'] = rx_power_list[0]
-            transceiver_dom_dict['rx2power'] = rx_power_list[1]
-            transceiver_dom_dict['rx3power'] = rx_power_list[2]
-            transceiver_dom_dict['rx4power'] = rx_power_list[3]
+        else:
+            if tx_bias_list is not None:
+                transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
+                transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
+                transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
+                transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
+
+        if self.sfp_type == 'QSFP_DD':
+            if rx_power_list is not None:
+                transceiver_dom_dict['rx1power'] = rx_power_list[0]
+                transceiver_dom_dict['rx2power'] = rx_power_list[1]
+                transceiver_dom_dict['rx3power'] = rx_power_list[2]
+                transceiver_dom_dict['rx4power'] = rx_power_list[3]
+                transceiver_dom_dict['rx5power'] = rx_power_list[4]
+                transceiver_dom_dict['rx6power'] = rx_power_list[5]
+                transceiver_dom_dict['rx7power'] = rx_power_list[6]
+                transceiver_dom_dict['rx8power'] = rx_power_list[7]
 
-        if tx_power_list is not None:
-            transceiver_dom_dict['tx1power'] = tx_power_list[0]
-            transceiver_dom_dict['tx2power'] = tx_power_list[1]
-            transceiver_dom_dict['tx3power'] = tx_power_list[2]
-            transceiver_dom_dict['tx4power'] = tx_power_list[3]
+        else:
+            if rx_power_list is not None:
+                transceiver_dom_dict['rx1power'] = rx_power_list[0]
+                transceiver_dom_dict['rx2power'] = rx_power_list[1]
+                transceiver_dom_dict['rx3power'] = rx_power_list[2]
+                transceiver_dom_dict['rx4power'] = rx_power_list[3]
+
+        if self.sfp_type == 'QSFP_DD':
+            if tx_power_list is not None:
+                transceiver_dom_dict['tx1power'] = tx_power_list[0]
+                transceiver_dom_dict['tx2power'] = tx_power_list[1]
+                transceiver_dom_dict['tx3power'] = tx_power_list[2]
+                transceiver_dom_dict['tx4power'] = tx_power_list[3]
+                transceiver_dom_dict['tx5power'] = tx_power_list[4]
+                transceiver_dom_dict['tx6power'] = tx_power_list[5]
+                transceiver_dom_dict['tx7power'] = tx_power_list[6]
+                transceiver_dom_dict['tx8power'] = tx_power_list[7]
+        else:
+            if tx_power_list is not None:
+                transceiver_dom_dict['tx1power'] = tx_power_list[0]
+                transceiver_dom_dict['tx2power'] = tx_power_list[1]
+                transceiver_dom_dict['tx3power'] = tx_power_list[2]
+                transceiver_dom_dict['tx4power'] = tx_power_list[3]
 
         transceiver_dom_dict['rx_los'] = rx_los
         transceiver_dom_dict['tx_fault'] = tx_fault
@@ -612,7 +837,7 @@ def get_presence(self):
         Returns : True if sfp is present and false if it is absent
         """
         # Check for invalid port_num
-        mask  = {'QSFP' : (1 << 4), 'SFP' : (1 << 0)}
+        mask  = {'QSFP_DD' : (1 << 4), 'SFP' : (1 << 0)}
         # Port offset starts with 0x4004
         port_offset = 16388 + ((self.index-1) * 16)
 
@@ -620,7 +845,7 @@ def get_presence(self):
             status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
             reg_value = int(status)
             # ModPrsL is active low
-            if reg_value & mask[self.sfp_type] == 0:
+            if reg_value & mask[self.port_type] == 0:
                 return True
         except ValueError: pass
 
@@ -656,7 +881,7 @@ def get_reset_status(self):
         """
         reset_status = False
         try:
-            if (self.sfp_type == 'QSFP'):
+            if self.port_type == 'QSFP_DD':
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -676,10 +901,20 @@ def get_rx_los(self):
         """
         rx_los_list = []
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                offset = 512
+                rx_los_mask = [ 0x01, 0x02, 0x04, 0x08 ,0x10, 0x20, 0x40, 0x80 ]
+                dom_channel_monitor_raw = self._read_eeprom_bytes(self.eeprom_path,
+                    offset + QSFP_DD_RXLOS_OFFSET, QSFP_DD_RXLOS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    rx_los_data = int(dom_channel_monitor_raw[0], 8)
+                    for mask in rx_los_mask:
+                        rx_los_list.append(rx_los_data & mask != 0)
+
+            elif self.sfp_type == 'QSFP':
                 rx_los_data = self._get_eeprom_data('rx_los')
                 # As the function expects a single boolean, if any one channel experience LOS,
-                # is considered LOS for QSFP 
+                # is considered LOS for QSFP
                 for rx_los_id in ('Rx1LOS', 'Rx2LOS', 'Rx3LOS', 'Rx4LOS') :
                     rx_los_list.append(rx_los_data['data'][rx_los_id]['value'] == 'On')
             else:
@@ -696,7 +931,9 @@ def get_tx_fault(self):
         """
         tx_fault_list = []
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                tx_fault_list = False
+            elif self.sfp_type == 'QSFP':
                 tx_fault_data = self._get_eeprom_data('tx_fault')
                 for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') : 
                     tx_fault_list.append(tx_fault_data['data'][tx_fault_id]['value'] == 'On')
@@ -714,7 +951,9 @@ def get_tx_disable(self):
         """
         tx_disable_list = []
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                return False
+            elif self.sfp_type == 'QSFP':
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_list.append(tx_disable_data['data'][tx_disable_id]['value'] == 'On')
@@ -734,7 +973,9 @@ def get_tx_disable_channel(self):
         """
         tx_disable_channel = 0
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                tx_disable_channel = 0
+            elif self.sfp_type == 'QSFP':
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_channel <<= 1
@@ -748,8 +989,8 @@ def get_lpmode(self):
         Retrieves the lpmode(low power mode) of this SFP
         """
         lpmode_state = False
-        try: 
-            if  self.media_type.startswith('QSFP'):
+        try:
+            if self.sfp_type.startswith('QSFP'):
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -770,10 +1011,10 @@ def get_power_override(self):
         power_override_state = False
 
         try:
-            if  self.media_type.startswith('QSFP'):
+            if self.sfp_type.startswith('QSFP'):
                 power_override_data = self._get_eeprom_data('power_override')
                 power_override = power_override_data['data']['PowerOverRide']['value']
-                power_override_state = (power_override == 'On')
+                power_override_state = (power_override is 'On')
         except (TypeError, ValueError): pass
         return power_override_state
 
@@ -782,8 +1023,18 @@ def get_temperature(self):
         Retrieves the temperature of this SFP
         """
         temperature = None
-        try :
-            temperature_data = self._get_eeprom_data('Temperature')
+        try:
+            if self.sfp_type == 'QSFP_DD':
+                if self.qsfp_dd_DomInfo is None:
+                    return None
+                dom_data_raw = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_TEMP_OFFSET, QSFP_DD_TEMP_WIDTH)
+                if dom_data_raw is None:
+                    return None
+                temperature_data = self.qsfp_dd_DomInfo.parse_temperature(dom_data_raw, 0)
+
+            elif self.sfp_type == 'QSFP':
+                temperature_data = self._get_eeprom_data('Temperature')
+
             temperature = self._strip_unit_from_str(temperature_data['data']['Temperature']['value'])
         except (TypeError, ValueError):
             return None
@@ -795,8 +1046,19 @@ def get_voltage(self):
         """
         voltage = None
         try:
-            voltage_data = self._get_eeprom_data('Voltage')
+            if self.sfp_type == 'QSFP_DD':
+                if self.qsfp_dd_DomInfo is None:
+                    return None
+                dom_data_raw = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_VOLT_OFFSET, QSFP_DD_VOLT_WIDTH)
+                if dom_data_raw is None:
+                    return None
+                voltage_data = self.qsfp_dd_DomInfo.parse_voltage(dom_data_raw, 0)
+
+            elif self.sfp_type == 'QSFP':
+                voltage_data = self._get_eeprom_data('Voltage')
+
             voltage = self._strip_unit_from_str(voltage_data['data']['Vcc']['value'])
+
         except (TypeError, ValueError):
             return None
         return voltage
@@ -807,14 +1069,29 @@ def get_tx_bias(self):
         """
         tx_bias_list = []
         try:
-            tx_bias_data = self._get_eeprom_data('ChannelMonitor')
-            if  self.media_type.startswith('QSFP'):
-                for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias') :
+            offset = 128
+            if self.sfp_type == 'QSFP_DD':
+                if self.qsfp_dd_DomInfo is None:
+                    return None
+                if not self.dom_tx_bias_supported:
+                    return None
+                tx_bias_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXBIAS_OFFSET, QSFP_DD_TXBIAS_WIDTH)
+                tx_bias_data = self.qsfp_dd_DomInfo.parse_dom_tx_bias(tx_bias_data_raw, 0)
+
+                for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias',
+                                   'TX5Bias', 'TX6Bias', 'TX7Bias', 'TX8Bias'):
+                    tx_bias = self._strip_unit_from_str(tx_bias_data['data'][tx_bias_id]['value'])
+                    tx_bias_list.append(tx_bias)
+
+            elif self.sfp_type == 'QSFP':
+                tx_bias_data = self._get_eeprom_data('ChannelMonitor')
+                for tx_bias_id in ('TX1Bias', 'TX2Bias', 'TX3Bias', 'TX4Bias'):
                     tx_bias = self._strip_unit_from_str(tx_bias_data['data'][tx_bias_id]['value'])
                     tx_bias_list.append(tx_bias)
             else:
-                tx1_bias = tx_bias_data['data']['TXBias']['value']
-                tx_bias_list.append(self._strip_unit_from_str(tx1_bias))
+                tx1_bias = self._strip_unit_from_str(tx_bias_data['data']['TXBias']['value'])
+                tx_bias_list.append(tx1_bias)
+
         except (TypeError, ValueError):
             return None
         return tx_bias_list
@@ -824,15 +1101,29 @@ def get_rx_power(self):
         Retrieves the received optical power for this SFP
         """
         rx_power_list = []
+        offset = 128
         try:
-            rx_power_data = self._get_eeprom_data('ChannelMonitor')
-            if  self.media_type.startswith('QSFP'):
-                for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power'):
+            if self.sfp_type == 'QSFP_DD':
+                if self.qsfp_dd_DomInfo is None:
+                    return None
+                if not self.dom_rx_power_supported:
+                    return None
+                rx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_RXPOWER_OFFSET, QSFP_DD_TXPOWER_WIDTH)
+                rx_power_data = self.qsfp_dd_DomInfo.parse_dom_rx_power(rx_power_data_raw, 0)
+
+                for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power',
+                                     'RX5Power', 'RX6Power', 'RX7Power', 'RX8Power'):
                     rx_power = self._strip_unit_from_str(rx_power_data['data'][rx_power_id]['value'])
-                    rx_power_list.append(self._strip_unit_from_str(rx_power))
+                    rx_power_list.append(rx_power)
+
+            elif self.sfp_type == 'QSFP':
+                rx_power_data = self._get_eeprom_data('ChannelMonitor')
+                for rx_power_id in ('RX1Power', 'RX2Power', 'RX3Power', 'RX4Power'):
+                    rx_power = rx_power_data['data'][rx_power_id]['value']
+                    rx_power_list.append(rx_power)
             else:
-                rx1_pw = rx_power_data['data']['RXPower']['value']
-                rx_power_list.append(self._strip_unit_from_str(rx1_pw))
+                rx1_pw = self._strip_unit_from_str(rx_power_data['data']['RXPower']['value'])
+                rx_power_list.append(rx1_pw)
         except (TypeError, ValueError):
             return None
         return rx_power_list
@@ -842,8 +1133,25 @@ def get_tx_power(self):
         Retrieves the TX power of this SFP
         """
         tx_power_list = []
+        offset = 128
         try:
-            if self.media_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                if self.qsfp_dd_DomInfo is None:
+                    return None
+
+                if not self.dom_tx_power_supported:
+                    return None
+
+                tx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXPOWER_OFFSET,
+                                                         QSFP_DD_TXPOWER_WIDTH)
+                tx_power_data = self.qsfp_dd_DomInfo.parse_dom_tx_power(tx_power_data_raw, 0)
+
+                for tx_power_id in ('TX1Power', 'TX2Power', 'TX3Power', 'TX4Power',
+                                     'TX5Power', 'TX6Power', 'TX7Power', 'TX8Power'):
+                    tx_pw = self._strip_unit_from_str(tx_power_data['data'][tx_power_id]['value'])
+                    tx_power_list.append(tx_pw)
+
+            elif self.sfp_type == 'QSFP':
                 # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
                 # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
                 # need to add more code for determining the capability and version compliance
@@ -859,12 +1167,12 @@ def get_tx_power(self):
                     return None
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor_TxPower')
                 for tx_power_id in ('TX1Power', 'TX2Power', 'TX3Power', 'TX4Power'):
-                    tx_pw = channel_monitor_data['data'][tx_power_id]['value']
-                    tx_power_list.append(self._strip_unit_from_str(tx_pw))
+                    tx_pw = self._strip_unit_from_str(channel_monitor_data['data'][tx_power_id]['value'])
+                    tx_power_list.append(tx_pw)
             else:
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor')
-                tx1_pw = channel_monitor_data['data']['TXPower']['value'] 
-                tx_power_list.append(self._strip_unit_from_str(tx1_pw))
+                tx1_pw = self._strip_unit_from_str(channel_monitor_data['data']['TXPower']['value'])
+                tx_power_list.append(tx1_pw)
         except (TypeError, ValueError):
             return None
         return tx_power_list
@@ -874,7 +1182,7 @@ def reset(self):
         Reset the SFP and returns all user settings to their default state
         """
         try:
-            if (self.sfp_type == 'QSFP'):
+            if self.port_type == 'QSFP_DD':
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -906,7 +1214,7 @@ def set_lpmode(self, lpmode):
         Sets the lpmode(low power mode) of this SFP
         """
         try:
-            if (self.sfp_type == 'QSFP'):
+            if self.port_type == 'QSFP_DD':
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -933,8 +1241,8 @@ def get_intl_state(self):
         Sets the intL (interrupt; active low) pin of this SFP
         """
         intl_state = True
-        try: 
-            if (self.sfp_type == 'QSFP'):
+        try:
+            if self.port_type == 'QSFP_DD':
                 # Port offset starts with 0x4004
                 port_offset = 16388 + ((self.index-1) * 16)
 
@@ -977,18 +1285,18 @@ def get_port_form_factor(self):
         """
         Retrieves the native port type
         """
-        return self.sfp_type
+        return self.port_type
 
     def get_max_port_power(self):
         """
         Retrieves the maximum power allowed on the port in watts
-        
+
         ***
         This method of fetching power values is not ideal.
         TODO: enhance by placing power limits in config file
         ***
         """
-        return (12.0 if self.sfp_type=='QSFP' else 2.5)
+        return 12.0 if self.port_type == 'QSFP_DD' else 2.5
 
     def set_media_type(self):
         """
@@ -998,18 +1306,18 @@ def set_media_type(self):
         eeprom_raw = self._read_eeprom_bytes(self.eeprom_path, MEDIA_TYPE_OFFSET, MEDIA_TYPE_WIDTH)
         if eeprom_raw is not None:
             if eeprom_raw[0] in SFP_TYPE_LIST:
-                self.media_type = 'SFP'
+                self.sfp_type = 'SFP'
             elif eeprom_raw[0] in QSFP_TYPE_LIST:
-                self.media_type = 'QSFP'
+                self.sfp_type = 'QSFP'
             elif eeprom_raw[0] in QSFP_DD_TYPE_LIST:
-                self.media_type = 'QSFP-DD'
+                self.sfp_type = 'QSFP_DD'
             else:
                 #Set native port type if EEPROM type is not recognized/readable
-                self.media_type = self.sfp_type
+                self.sfp_type = self.port_type
         else:
-            self.media_type = self.sfp_type
+            self.sfp_type = self.port_type
 
-        return self.media_type
+        return self.sfp_type
 
     def reinit_sfp_driver(self):
         """
@@ -1031,18 +1339,21 @@ def reinit_sfp_driver(self):
                 driver_name = driver_name.lstrip(" ")
 
             #Avoid re-initialization of the QSFP/SFP optic on QSFP/SFP port.
-            if (self.media_type == 'SFP' and (driver_name == 'optoe1' or driver_name == 'optoe3')):
+            if self.sfp_type == 'SFP' and driver_name in ['optoe1', 'optoe3']:
                 subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(0.2)
                 new_device = "echo optoe2 0x50 >" + new_sfp_path
                 subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
                 time.sleep(2)
-            elif (self.media_type == 'QSFP' and (driver_name == 'optoe2' or driver_name  == 'optoe3')):
+            elif self.sfp_type == 'QSFP' and driver_name in ['optoe2', 'optoe3']:
                 subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(0.2)
                 new_device = "echo optoe1 0x50 >" + new_sfp_path
                 subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
                 time.sleep(2)
-            elif (self.media_type == 'QSFP-DD' and (driver_name == 'optoe1' or driver_name  == 'optoe2')):
+            elif self.sfp_type == 'QSFP_DD' and driver_name in ['optoe1', 'optoe2']:
                 subprocess.Popen(delete_device, shell=True, stdout=subprocess.PIPE)
+                time.sleep(0.2)
                 new_device = "echo optoe3 0x50 >" + new_sfp_path
                 subprocess.Popen(new_device, shell=True, stdout=subprocess.PIPE)
                 time.sleep(2)

From b0460c7ce182de8abac85294b207eae85fd942b3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 6 May 2021 06:50:02 +0800
Subject: [PATCH 0429/1674] [ci/build]: Upgrade SONiC package versions (#7480)

Co-authored-by: mssonicbld <vsts@fv-az196-264.g5lmldmxpfterdw5iojffagm3c.gx.internal.cloudapp.net>
---
 .../versions-deb-buster                       |   4 +-
 .../build-sonic-slave-buster/versions-py2     |   1 +
 .../versions-deb-stretch                      |   6 +
 .../build-sonic-slave-stretch/versions-py2    |   3 +-
 .../versions/default/versions-deb-buster      |  90 +++++++
 files/build/versions/default/versions-py2     |   5 +
 files/build/versions/default/versions-web     |   3 +-
 .../docker-database/versions-deb-buster       |  12 -
 .../docker-dhcp-relay/versions-deb-buster     |  13 -
 .../docker-fpm-frr/versions-deb-buster        |  19 +-
 .../dockers/docker-lldp/versions-deb-buster   |  16 +-
 .../dockers/docker-nat/versions-deb-buster    |  14 -
 .../docker-orchagent/versions-deb-buster      |  15 --
 .../versions-deb-buster                       |  18 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 240 ++++++++++++++++++
 .../versions/dockers/docker-ptf/versions-py2  |  50 ++++
 .../versions-deb-buster                       |  12 -
 .../dockers/docker-sflow/versions-deb-buster  |  12 -
 .../dockers/docker-snmp/versions-deb-buster   |  17 +-
 .../versions-deb-buster                       |  13 -
 .../versions-deb-buster                       |  12 -
 .../docker-sonic-vs/versions-deb-buster       |  40 +++
 .../dockers/docker-sonic-vs/versions-py2      |  11 +
 .../dockers/docker-sonic-vs/versions-py3      |  15 ++
 .../docker-syncd-mlnx/versions-deb-buster     |   2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |   8 +-
 .../dockers/docker-teamd/versions-deb-buster  |  16 --
 .../sonic-slave-buster/versions-deb-buster    |  12 +-
 .../dockers/sonic-slave-buster/versions-py2   |   1 -
 .../dockers/sonic-slave-buster/versions-py3   |   2 +-
 .../dockers/sonic-slave-stretch/versions-py2  |   1 -
 .../versions/host-image/versions-deb-buster   |  22 --
 files/build/versions/host-image/versions-py2  |   4 -
 files/build/versions/host-image/versions-py3  |   3 -
 34 files changed, 479 insertions(+), 233 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-ptf/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-ptf/versions-py2
 delete mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-vs/versions-py2
 create mode 100644 files/build/versions/dockers/docker-sonic-vs/versions-py3
 delete mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 60c2b01ebed6..c123a94cff81 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,6 +1,5 @@
 applibs==1.mlnx.4.4.2522
 applibs-dev==1.mlnx.4.4.2522
-bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -8,7 +7,6 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2==1.mlnx.4.4.2522
 iproute2-dev==1.mlnx.4.4.2522
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
@@ -91,6 +89,7 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
+swss==1.0.0
 sx-acl-helper==1.mlnx.4.4.2522
 sx-acl-helper-dev==1.mlnx.4.4.2522
 sx-complib==1.mlnx.4.4.2522
@@ -104,6 +103,7 @@ sx-scew-dev==1.mlnx.4.4.2522
 sxd-libs==1.mlnx.4.4.2522
 sxd-libs-dev==1.mlnx.4.4.2522
 syncd==1.0.0
+syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.2522
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index 3c83200bef61..f0ec8d2011c5 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -8,6 +8,7 @@ jsonschema==2.6.0
 lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
+pyang==2.4.0
 pyangbind==0.6.0
 redis==3.5.3
 SaiRedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index df28b25a1ff2..59f60131f98c 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -12,12 +12,18 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
+libsaimetadata==1.0.0
+libsaimetadata-dev==1.0.0
 libsainps==1.5.0
 libsairedis==1.0.0
 libsaithrift-dev==0.9.4
+libsaivs==1.0.0
+libsaivs-dev==1.0.0
 libswsscommon==1.0.0
 libswsscommon-dev==1.0.0
 libthrift-0.11.0==0.11.0-4
 libthrift-dev==0.11.0-4
 python-swsscommon==1.0.0
+python-thrift==0.11.0-4
+syncd==1.0.0
 thrift-compiler==0.11.0-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index e4755ea87a52..4211881987c2 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,3 +1,4 @@
 natsort==6.2.1
 redis==3.5.3
-SaiRedis==1.0
\ No newline at end of file
+SaiRedis==1.0
+thrift==0.11.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index ae829825ccdd..db39cba3353f 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -1,10 +1,18 @@
 apt==1.8.2.3
 apt-utils==1.8.2.3
 arping==2.19-6
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
 bridge-utils==1.6-2
+build-essential==12.6
 bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
+cmake==3.13.4-1
+cmake-data==3.13.4-1
 conntrack==1:1.4.5-2
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
 dmidecode==3.2-1
@@ -15,42 +23,66 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
 libapt-inst2.0==1.8.2.3
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
 libatomic1==8.3.0-6
+libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1
 libc-dev-bin==2.28-10
 libc-l10n==2.28-10
 libc6-dev==2.28-10
 libcairo2==1.16.0-4+deb10u1
+libcc1-0==8.3.0-6
 libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
 libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
 libexplain51==1.4.D001-8
 libfastjson4==0.99.8-2
+libffi-dev==3.2.1-9
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libfribidi0==1.0.5-3.1+deb10u1
+libgcc-8-dev==8.3.0-6
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u2
+libgomp1==8.3.0-6
+libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -59,14 +91,18 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
+libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
 libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisl19==0.20-2
+libitm1==8.3.0-6
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
+libjsoncpp1==1.7.4-3
 libk5crypto3==1.17-3+deb10u1
 libkeyutils1==1.6-6
 libkmod2==26-1
@@ -75,9 +111,13 @@ libkrb5support0==1.17-3+deb10u1
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
+liblsan0==8.3.0-6
 liblua5.1-0==5.1.5-8.1+b2
 libmariadb3==1:10.3.27-0+deb10u1
+libmpc3==1.1.0-1
 libmpdec2==2.4.2-2
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libncurses6==6.1+20181013-2+deb10u2
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
@@ -96,6 +136,8 @@ libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
 libpcap0.8==1.8.1-6
 libpci3==1:3.5.2-1
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
 libperl5.28==5.28.1-6+deb10u1
 libpgm-5.2-0==5.2.122~dfsg-3
 libpixman-1-0==0.36.0-1
@@ -106,37 +148,58 @@ libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
 libpsl5==0.20.2-2
+libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
 libpython2-stdlib==2.7.16-1
 libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-stdlib==3.7.3-1
 libpython3.7==3.7.3-2+deb10u3
 libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
 libreadline7==7.0-5
+librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.5
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
+libuv1==1.24.1-1
 libwrap0==7.6.q-28
 libx11-6==2:1.6.7-1+deb10u1
 libx11-data==2:1.6.7-1+deb10u1
@@ -152,34 +215,49 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.181-1
 lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
 lsof==4.91+dfsg-1
 lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
+make==4.2.1-1.2
 mariadb-common==1:10.3.27-0+deb10u1
 mime-support==3.62
 mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
+openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
+patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
 psample==1.1-1
 python==2.7.16-1
+python-dev==2.7.16-1
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
+python2-dev==2.7.16-1
 python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3==3.7.3-1
 python3-distutils==3.7.3-1
@@ -197,22 +275,34 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
 swss==1.0.0
+swss-dbg==1.0.0
 syncd==1.0.0
+syncd-dbg==1.0.0
+syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
+vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
+wget==1.20.1-1.1
 xxd==2:8.1.0875-5
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index eedc8044a893..59ca48893410 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -1,4 +1,5 @@
 bitarray==1.5.3
+cffi==1.7.0
 contextlib2==0.6.0.post1
 enum34==1.1.10
 functools32==3.2.3.post2
@@ -11,13 +12,17 @@ lxml==4.6.3
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
+nnpy==1.4.2
 pathlib2==2.3.5
+ptf==0.9.1
 pyang==2.4.0
 pyangbind==0.6.0
+pycparser==2.20
 PyYAML==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
+scapy==2.4.0
 singledispatch==3.6.1
 six==1.15.0
 thrift==0.13.0
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 11446887ba19..cc8d5bf31cd9 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -12,11 +12,10 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
+https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
deleted file mode 100644
index 090a9af05b59..000000000000
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-isc-dhcp-relay-dbgsym==4.4.1-2
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 861bf8125805..8ce0c99a8c4d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,19 +1,2 @@
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libswsscommon-dbg==1.0.0
-libyang1-dbgsym==1.0.184-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index dced6f540d81..3424f739f586 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,16 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libswsscommon-dbg==1.0.0
-lldpd-dbgsym==1.0.4-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
deleted file mode 100644
index 159c8c90df8b..000000000000
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ /dev/null
@@ -1,14 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
deleted file mode 100644
index 0969e5edd95e..000000000000
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ /dev/null
@@ -1,15 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index cc246ec7ec9d..1532ae12707d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,26 +1,10 @@
 applibs==1.mlnx.4.4.2522
 applibs-dev==1.mlnx.4.4.2522
 ethtool==1:5.9-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsensors5-dbgsym==1:3.5.0-3
-libswsscommon-dbg==1.0.0
-lm-sensors-dbgsym==1:3.5.0-3
-openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.2522
-sensord-dbgsym==1:3.5.0-3
-sshpass==1.06-1
-strace==4.26-0.2
 sx-complib==1.mlnx.4.4.2522
 sx-complib-dev==1.mlnx.4.4.2522
 sx-gen-utils==1.mlnx.4.4.2522
 sx-gen-utils-dev==1.mlnx.4.4.2522
 sxd-libs==1.mlnx.4.4.2522
-sxd-libs-dev==1.mlnx.4.4.2522
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.2522
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
new file mode 100644
index 000000000000..56b2e60fdf47
--- /dev/null
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -0,0 +1,240 @@
+arping==2.14-1+b1
+autoconf==2.69-10
+automake==1:1.15-6
+autotools-dev==20161112.1
+binutils==2.28-5
+bridge-utils==1.5-13+deb9u1
+build-essential==12.3
+bzip2==1.0.6-8.1
+ca-certificates==20200601~deb9u2
+cgmanager==0.41-2
+cmake==3.7.2-1
+cmake-data==3.7.2-1
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+cron==3.0pl1-128+deb9u1
+curl==7.52.1-5+deb9u13
+dbus==1.10.32-0+deb9u1
+dirmngr==2.1.18-8~deb9u4
+dmsetup==2:1.02.137-2
+dpkg-dev==1.18.25
+ethtool==1:4.8-1+b1
+exim4==4.89-2+deb9u7
+exim4-base==4.89-2+deb9u7
+exim4-config==4.89-2+deb9u7
+exim4-daemon-light==4.89-2+deb9u7
+fakeroot==1.21-3.1
+file==1:5.30-1+deb9u3
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+git==1:2.11.0-3+deb9u7
+git-man==1:2.11.0-3+deb9u7
+gnupg==2.1.18-8~deb9u4
+gnupg-agent==2.1.18-8~deb9u4
+gnupg-l10n==2.1.18-8~deb9u4
+guile-2.0-libs==2.0.13+1-4
+hping3==3.a2.ds2-7
+krb5-locales==1.15-1+deb9u2
+less==481-2.1
+libalgorithm-diff-perl==1.19.03-1
+libalgorithm-diff-xs-perl==0.04-4+b2
+libalgorithm-merge-perl==0.08-3
+libapparmor1==2.11.0-3+deb9u2
+libarchive13==3.2.2-2+deb9u2
+libasan3==6.3.0-18+deb9u1
+libassuan0==2.4.3-2
+libatomic1==6.3.0-18+deb9u1
+libboost-atomic1.62.0==1.62.0+dfsg-4
+libbsd0==0.8.3-1+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcc1-0==6.3.0-18+deb9u1
+libcgmanager0==0.41-2
+libcilkrts5==6.3.0-18+deb9u1
+libcryptsetup4==2:1.7.3-4
+libcurl3==7.52.1-5+deb9u13
+libcurl3-gnutls==7.52.1-5+deb9u13
+libdbus-1-3==1.10.32-0+deb9u1
+libdevmapper1.02.1==2:1.02.137-2
+libdouble-conversion1==2.0.1-4
+libdpkg-perl==1.18.25
+libedit2==3.1-20160903-3
+liberror-perl==0.17024-1
+libestr0==0.1.10-2
+libevent-2.0-5==2.0.21-stable-3
+libexpat1==2.2.0-2+deb9u3
+libexpat1-dev==2.2.0-2+deb9u3
+libfakeroot==1.21-3.1
+libfastjson4==0.99.4-1
+libffi-dev==3.2.1-6
+libffi6==3.2.1-6
+libfile-fcntllock-perl==0.22-3+b2
+libfribidi0==0.19.7-1+deb9u1
+libgc1c2==1:7.4.2-8
+libgcc-6-dev==6.3.0-18+deb9u1
+libgdbm3==1.8.3-14
+libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-data==2.50.3-2+deb9u2
+libgmp10==2:6.1.2+dfsg-1
+libgnutls30==3.5.8-5+deb9u5
+libgomp1==6.3.0-18+deb9u1
+libgpm2==1.20.4-6.2+b1
+libgsasl7==1.8.0-8+b2
+libgssapi-krb5-2==1.15-1+deb9u2
+libhogweed4==3.3-1+b2
+libicu57==57.1-6+deb9u4
+libidn2-0==0.16-1+deb9u1
+libip4tc0==1.6.0+snapshot20161117-6
+libisl15==0.18-1
+libitm1==6.3.0-18+deb9u1
+libjsoncpp1==1.7.4-3
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkmod2==23-2
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+liblocale-gettext-perl==1.07-3+b1
+liblogging-stdlog0==1.0.5-2+b2
+liblognorm5==2.0.1-1.1+b1
+liblsan0==6.3.0-18+deb9u1
+libltdl7==2.4.6-2
+liblzo2-2==2.08-1.2+b2
+libmagic-mgc==1:5.30-1+deb9u3
+libmagic1==1:5.30-1+deb9u3
+libmailutils5==1:3.1.1-1
+libmariadbclient18==10.1.48-0+deb9u2
+libmpc3==1.0.3-1+b2
+libmpfr4==3.1.5-1
+libmpx2==6.3.0-18+deb9u1
+libncurses5==6.0+20161126-1+deb9u2
+libnet1==1.1.6+dfsg-3
+libnghttp2-14==1.18.1-1+deb9u1
+libnih-dbus1==1.0.3-8
+libnih1==1.0.3-8
+libnpth0==1.3-1
+libntlm0==1.4-8
+libopts25==1:5.18.12-3
+libp11-kit0==0.23.3-2+deb9u1
+libpam-systemd==232-25+deb9u12
+libpcap0.8==1.8.1-3
+libpcre16-3==2:8.39-3
+libperl5.24==5.24.1-3+deb9u7
+libpopt0==1.16-10+b2
+libprocps6==2:3.3.12-3+deb9u1
+libproxy1v5==0.4.14-2+deb9u2
+libpsl5==0.17.0-3
+libpython-dev==2.7.13-2
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-dev==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
+libqt5core5a==5.7.1+dfsg-3+deb9u3
+libqt5dbus5==5.7.1+dfsg-3+deb9u3
+libqt5network5==5.7.1+dfsg-3+deb9u3
+libquadmath0==6.3.0-18+deb9u1
+libreadline7==7.0-3
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libseccomp2==2.3.1-2.1+deb9u1
+libsigsegv2==2.10-5
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl-dev==1.1.0l-1~deb9u3
+libssl-doc==1.1.0l-1~deb9u3
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libstdc++-6-dev==6.3.0-18+deb9u1
+libtacacs+1==4.0.4.27a-3
+libtasn1-6==4.10-1.1+deb9u1
+libtcl8.6==8.6.6+dfsg-1+b1
+libthrift-0.11.0==0.11.0-4
+libtsan0==6.3.0-18+deb9u1
+libubsan0==6.3.0-18+deb9u1
+libunistring0==0.9.6+really0.9.3-0.1
+libutempter0==1.1.6-3
+libuv1==1.9.1-3
+libwrap0==7.6.q-26
+libx11-6==2:1.6.4-3+deb9u3
+libx11-data==2:1.6.4-3+deb9u3
+libxau6==1:1.0.8-1
+libxcb1==1.12-1
+libxdmcp6==1:1.1.2-3
+libxext6==2:1.3.3-1+b2
+libxml2==2.9.4+dfsg1-2.2+deb9u3
+libxmuu1==2:1.1.2-2
+linux-libc-dev==4.9.258-1
+logrotate==3.11.0-0.1
+lsof==4.89+dfsg-0.1
+m4==1.4.18-1
+mailutils==1:3.1.1-1
+mailutils-common==1:3.1.1-1
+make==4.1-9.1
+manpages==4.10-2
+manpages-dev==4.10-2
+mime-support==3.60
+mysql-common==5.8+1.0.2
+ncurses-term==6.0+20161126-1+deb9u2
+net-tools==1.60+git20161116.90da8a0-1
+netbase==5.4
+ntp==1:4.2.8p10+dfsg-3+deb9u2
+ntpdate==1:4.2.8p10+dfsg-3+deb9u2
+ntpstat==0.0.0.1-1+b1
+openssh-client==1:7.4p1-10+deb9u7
+openssh-server==1:7.4p1-10+deb9u7
+openssh-sftp-server==1:7.4p1-10+deb9u7
+openssl==1.1.0l-1~deb9u3
+patch==2.7.5-1+deb9u2
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+pinentry-curses==1.0.0-2
+pkg-config==0.29-4+b1
+procps==2:3.3.12-3+deb9u1
+psmisc==22.21-2.1+b2
+publicsuffix==20190415.1030-0+deb9u1
+python==2.7.13-2
+python-dev==2.7.13-2
+python-libpcap==0.6.4-1
+python-minimal==2.7.13-2
+python-ptf==0.9-1
+python-saithrift==0.9.4
+python-scapy==2.3.3-1
+python-six==1.10.0-3
+python-thrift==0.11.0-4
+python2.7==2.7.13-2+deb9u5
+python2.7-dev==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
+qttranslations5-l10n==5.7.1~20161021-1
+readline-common==7.0-3
+rename==0.20-4
+rsync==3.1.2-1+deb9u2
+rsyslog==8.24.0-1
+sgml-base==1.29
+shared-mime-info==1.8-1+deb9u1
+systemd==232-25+deb9u12
+systemd-shim==10-3
+tacacs+==4.0.4.27a-3
+tcpd==7.6.q-26
+tcpdump==4.9.3-1~deb9u2
+telnet==0.17-41
+tmux==2.3-4
+traceroute==1:2.1.0-2
+ucf==3.0036
+unzip==6.0-21+deb9u2
+vim==2:8.0.0197-4+deb9u3
+vim-common==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
+wget==1.18-5+deb9u3
+xauth==1:1.0.9-1+b2
+xdg-user-dirs==0.15-2+b1
+xml-core==0.17
+xxd==2:8.0.0197-4+deb9u3
+xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
new file mode 100644
index 000000000000..e10f946d766d
--- /dev/null
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -0,0 +1,50 @@
+backports.functools-lru-cache==1.6.4
+backports.shutil-get-terminal-size==1.0.0
+bcrypt==3.1.7
+cffi==1.14.5
+click==7.1.2
+cryptography==3.3.2
+decorator==4.4.2
+dpkt==1.9.5
+enum34==1.1.6
+exabgp==3.4.17
+Flask==1.0
+Flask-HTTPAuth==2.5.0
+futures==3.2.0
+grpcio==1.18.0
+grpcio-tools==1.15.0
+ipython==5.4.1
+ipython-genutils==0.2.0
+itsdangerous==1.1.0
+oslo.config==2.1.0
+paramiko==2.7.2
+pbr==2.0.0
+pexpect==4.8.0
+pickleshare==0.7.5
+plumbum==1.7.0
+prompt-toolkit==1.0.18
+protobuf==3.6.1
+ptyprocess==0.7.0
+pyaml==20.4.0
+pybrctl==0.1.3
+Pygments==2.5.2
+pylibpcap==0.6.4
+PyNaCl==1.4.0
+Pyro4==4.80
+pysubnettree==0.26
+rpyc==4.1.5
+saithrift==0.9
+scapy==2.2.0.dev0
+selectors34==1.2
+serpent==1.28
+simplegeneric==0.8.1
+six==1.12.0
+stevedore==1.32.0
+supervisor==4.2.2
+thrift==0.11.0
+traitlets==4.3.3
+Twisted==16.0.0
+wcwidth==0.2.5
+Werkzeug==1.0.1
+yabgp==0.8.2
+zope.interface==5.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 8baa3d5cd96b..3424f739f586 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,17 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libsnmp30-dbg==5.7.3+dfsg-5
-openssh-client==1:7.9p1-10+deb10u2
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index a29d8370e78a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sonic-mgmt-framework-dbg==1.0-01
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
new file mode 100644
index 000000000000..0b568f271095
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -0,0 +1,40 @@
+bash-completion==1:2.8-6
+dirmngr==2.2.12-1+deb10u1
+dmsetup==2:1.02.155-3
+ethtool==1:4.19-1
+gettext-base==0.19.8.1-9
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+grub-common==2.02+dfsg1-20+deb10u4
+grub2-common==2.02+dfsg1-20+deb10u4
+libassuan0==2.5.2-1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libdevmapper1.02.1==2:1.02.155-3
+libefiboot1==37-2+deb10u1
+libefivar1==37-2+deb10u1
+libfuse2==2.9.9-1+deb10u1
+libjudydebian1==1.0.5-5
+libksba8==1.3.5-2
+libnpth0==1.6-1
+libsaivs==1.0.0
+libyang-cpp==1.0.73
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+pinentry-curses==1.1.0-2
+psmisc==23.2-1
+python-ply==3.11-3
+python2-yang==1.0.73
+python3-yang==1.0.73
+sonic-device-data==1.0-1
+sonic-host-services-data==1.0-1
+sonic-utilities-data==1.0-1
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
new file mode 100644
index 000000000000..96e7e5b1c7e9
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -0,0 +1,11 @@
+certifi==2020.12.5
+chardet==4.0.0
+crontab==0.23.0
+idna==2.10
+monotonic==1.5
+netifaces==0.10.7
+ply==3.11
+py2-ipaddress==3.4.2
+pyroute2==0.5.3
+requests==2.25.1
+urllib3==1.26.4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
new file mode 100644
index 000000000000..ae7bcd1adcb3
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -0,0 +1,15 @@
+certifi==2020.12.5
+chardet==3.0.4
+Click==7.0
+deepdiff==5.2.3
+ijson==2.6.1
+jsondiff==1.2.0
+M2Crypto==0.31.0
+netifaces==0.10.7
+ordered-set==4.0.2
+pexpect==4.8.0
+ptyprocess==0.7.0
+requests==2.25.0
+tabulate==0.8.2
+urllib3==1.26.4
+xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 05575075bf83..a562e132a732 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -7,7 +7,7 @@ libexpat1-dev==2.2.6-2+deb10u1
 libpython-dev==2.7.16-1
 libpython2-dev==2.7.16-1
 libpython2.7-dev==2.7.16-2+deb10u1
-mlnx-sai==1.mlnx.SAIRel1.18.1.0
+mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-dev==2.7.16-1
 python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.2522
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 6494a41ddc7f..09f43f402e3f 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -2,7 +2,7 @@ gdb==7.12-6
 gdbserver==7.12-6
 libbabeltrace-ctf1==1.5.1-1
 libbabeltrace1==1.5.1-1
-libbsd0==0.8.3-1
+libbsd0==0.8.3-1+deb9u1
 libdw1==0.168-1
 libedit2==3.1-20160903-3
 libglib2.0-0==2.50.3-2+deb9u2
@@ -10,9 +10,9 @@ libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u4
 libmpdec2==2.4.2-1
 libpopt0==1.16-10+b2
-libpython3.5==3.5.3-1+deb9u3
-libpython3.5-minimal==3.5.3-1+deb9u3
-libpython3.5-stdlib==3.5.3-1+deb9u3
+libpython3.5==3.5.3-1+deb9u4
+libpython3.5-minimal==3.5.3-1+deb9u4
+libpython3.5-stdlib==3.5.3-1+deb9u4
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsainps==1.5.0
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
deleted file mode 100644
index eeb36c01b260..000000000000
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ /dev/null
@@ -1,16 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-libteam-utils-dbgsym==1.30-1
-libteamdctl0-dbgsym==1.30-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 8245c8630934..ebf84b97150b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -165,11 +165,11 @@ groff==1.22.4-3+deb10u1
 groff-base==1.22.4-3+deb10u1
 gsettings-desktop-schemas==3.28.1-1
 gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
-gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2
-gstreamer1.0-plugins-base==1.14.4-2
-gstreamer1.0-plugins-good==1.14.4-1
-gstreamer1.0-plugins-ugly==1.14.4-1
-gstreamer1.0-x==1.14.4-2
+gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2+deb10u1
+gstreamer1.0-plugins-base==1.14.4-2+deb10u1
+gstreamer1.0-plugins-good==1.14.4-1+deb10u1
+gstreamer1.0-plugins-ugly==1.14.4-1+deb10u1
+gstreamer1.0-x==1.14.4-2+deb10u1
 gtk-update-icon-cache==3.24.5-1
 guile-2.0-libs==2.0.13+1-5.1
 hicolor-icon-theme==0.17-2
@@ -536,7 +536,7 @@ libgs9-common==9.27~dfsg-2+deb10u4
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u1
 libgssrpc4==1.17-3+deb10u1
-libgstreamer-plugins-base1.0-0==1.14.4-2
+libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
index 2aaf37e5d3ae..e87f798b9145 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -58,7 +58,6 @@ Pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
-pyang==2.1.1
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pycrypto==2.6.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 762a2a60891c..8d632cbd97f4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -40,7 +40,7 @@ Pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
-pyang==2.1.1
+pyang==2.4.0
 pyangbind==0.8.1
 pycrypto==2.6.1
 pycurl==7.43.0.2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index c1a558f686db..aeb7e36ef89a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -43,7 +43,6 @@ pexpect==4.6.0
 Pillow==4.0.0
 ptyprocess==0.7.0
 py==1.4.32
-pyang==2.1.1
 pyasn1==0.1.9
 pyasn1-modules==0.0.7
 pycrypto==2.6.1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 5d9037df546c..57f7d015d0ab 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -2,7 +2,6 @@ acl==2.2.53-4
 apparmor==2.13.2-10
 apt-transport-https==1.8.2.2
 bash-completion==1:2.8-6
-bfn-modules==1.0
 bridge-utils==1.6-2
 bsdmainutils==11.1.2+b1
 busybox==1:1.30.1-4
@@ -21,7 +20,6 @@ dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
 docker-ce-cli==5:18.09.8~3-0~debian-buster
 dpkg-dev==1.19.7
-drivers-sonic-platform-arista==1.0
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
 file==1:5.35-4+deb10u2
@@ -70,9 +68,6 @@ libapparmor1==2.13.2-10
 libapt-inst2.0==1.8.2.2
 libargon2-1==0~20171227-0.2
 libassuan0==2.5.2-1
-libboost-filesystem1.67.0==1.67.0-13+deb10u1
-libboost-program-options1.67.0==1.67.0-13+deb10u1
-libboost-system1.67.0==1.67.0-13+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-l10n==2.28-10
 libcap2==1:2.25-2
@@ -85,14 +80,12 @@ libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
-libdouble-conversion1==3.1.0-3
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
@@ -102,9 +95,7 @@ libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgflags2.2==2.2.2-1
 libglib2.0-0==2.58.3-2+deb10u2
-libgoogle-glog0v5==0.3.5-1
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u1
 libhavege1==1.9.1-7
@@ -175,13 +166,11 @@ libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
-libunwind8==1.2.1-10~deb10u1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
 libwrap0==7.6.q-28
 libxtables12==1.8.2-4
-libyaml-0-2==0.2.1-1
 libyang==1.0.73
 libyang-cpp==1.0.73
 linux-base==4.6
@@ -213,7 +202,6 @@ openssl==1.1.1d-0+deb10u6
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
-phy-credo==1.0
 picocom==3.1-2
 pinentry-curses==1.1.0-2
 procps==2:3.3.15-2
@@ -222,28 +210,19 @@ python==2.7.16-1
 python-apt==1.8.4.3
 python-apt-common==1.8.4.3
 python-argcomplete==1.8.1-1
-python-bottle==0.12.15-2+deb10u1
-python-enum34==1.1.6-2
 python-ipaddr==2.2.0-2
 python-minimal==2.7.16-1
-python-smbus==4.1-1
-python-sonic-platform-arista==1.0
 python-swsscommon==1.0.0
-python-yaml==3.13-2
 python2==2.7.16-1
 python2-minimal==2.7.16-1
 python2-yang==1.0.73
 python2.7==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3==3.7.3-1
-python3-bottle==0.12.15-2+deb10u1
 python3-distutils==3.7.3-1
 python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
-python3-smbus==4.1-1
-python3-sonic-platform-arista==1.0
 python3-swsscommon==1.0.0
-python3-yaml==3.13-2
 python3-yang==1.0.73
 python3.7==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
@@ -255,7 +234,6 @@ sensible-utils==0.0.12
 software-properties-common==0.96.20.2-2
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
-sonic-platform-arista==1.0
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index d74742f391f6..c70251b7cd82 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -1,8 +1,6 @@
 argcomplete==1.8.1
 bitarray==1.5.3
-bottle==0.12.15
 contextlib2==0.6.0.post1
-enum34==1.1.6
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
@@ -15,7 +13,6 @@ MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
-platform-arista==1.0
 pyang==2.4.0
 pyangbind==0.6.0
 python-apt==1.8.4.3
@@ -24,6 +21,5 @@ redis==3.5.3
 scandir==1.10.0
 singledispatch==3.6.1
 six==1.15.0
-thrift==0.13.0
 typing==3.7.4.3
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 562427bf68a2..5e4ad547c81a 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,6 @@ azure-common==1.1.27
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-bottle==0.12.15
 certifi==2020.12.5
 cffi==1.14.5
 chardet==3.0.4
@@ -25,7 +24,6 @@ netifaces==0.10.7
 ordered-set==4.0.2
 pathtools==0.1.2
 pexpect==4.8.0
-platform-arista==1.0
 psutil==5.8.0
 ptyprocess==0.7.0
 pyang==2.4.0
@@ -39,7 +37,6 @@ requests==2.25.0
 scapy==2.4.4
 six==1.15.0
 tabulate==0.8.2
-thrift==0.13.0
 urllib3==1.26.4
 watchdog==0.10.3
 websocket-client==0.58.0

From 97066cbf4625d36c4e0c6ca4ff8e9969455763f4 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 5 May 2021 18:39:31 -0700
Subject: [PATCH 0430/1674] [202012][submodule] Update sonic-utilities
 submodule (#7528)

Includes below commits:
```
3f8bc52 2021-05-05 | Relax the install_requires, no need to exact version as long as there are no broken changes with future versions (#1530) (#1592) [Qi Luo]
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index efa0924a6ec7..3f8bc5206897 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit efa0924a6ec7fdf5d6da7f7f39fe43c3c16703c7
+Subproject commit 3f8bc5206897be337a4437ab863cef8513f734f3

From c7540a8aba946166fd35ee41a4032a2a71601aac Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 6 May 2021 09:20:30 -0700
Subject: [PATCH 0431/1674] [202012] BRCM SAI 4.3.3.5-1 Added Support for 100G
 special AN/LT mode (#7534)

---
 platform/broadcom/sai.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 36a1546e23d4..d91408d13c4a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.5_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7XHTTf9%2FWBxEqX0Y8g7KqH8t3AFz1dJIZeY3YEDRypc%3D&se=2034-12-30T07%3A06%3A11Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.5-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=WHmBcthD%2FqBv4Pia0GH4GQ%2BdKm8rolG8dJSh%2BYoGEr8%3D&se=2035-01-12T01%3A52%3A20Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7I70XjzysspEht%2BsOwCM5QbtCe%2Boelh0%2FfwrhHPGh1g%3D&se=2034-12-30T07%3A06%3A51Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=BcGHyOGfS%2FypmiNUtHnX8WCbUwqoXPiRRe9E%2FUl9Sp8%3D&se=2035-01-12T01%3A52%3A57Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 2fc748eade198fc86760e9a94cf97566df9238bc Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Fri, 7 May 2021 00:37:24 +0800
Subject: [PATCH 0432/1674] [202012][utilities] Update submodule (#7542)

68ea9efc Add pg-drop script to sonic filesystem (#1583)
b216bf0a Fixing serial number read to get from DB if it is populated (#1580)
fa7230c6 Handle the new db version which mellanox_buffer_migrator isn't interested (#1566)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 3f8bc5206897..68ea9efccd01 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 3f8bc5206897be337a4437ab863cef8513f734f3
+Subproject commit 68ea9efccd015d208037c29db7f0ca629adb5b9b

From 11aa05b1d3eecd99c7eba737f38dee682680390d Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 6 May 2021 11:53:42 -0700
Subject: [PATCH 0433/1674] [202012][DellEMC] Z9332f PSU data is not updated in
 state DB (#7543)

#### Why I did it

- PSU data is loaded into state DB.
   Following errors are seen in syslogs:
  "Failed to update PSU data - '<=' not supported between instances of 'float' and 'str'"

- Issue is not seen in master image as the PSU API return type is different.

#### How I did it

- Changed the return type in PSU API's.
---
 .../z9332f/sonic_platform/psu.py                            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
index f099c6f650df..a12ecbc65d89 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
@@ -113,7 +113,7 @@ def get_voltage(self):
         if not is_valid:
             return None
 
-        return "{:.1f}".format(voltage)
+        return float(voltage)
 
     def get_voltage_low_threshold(self):
         """
@@ -159,7 +159,7 @@ def get_current(self):
         if not is_valid:
             return None
 
-        return "{:.1f}".format(current)
+        return float(current)
 
     def get_power(self):
         """
@@ -173,7 +173,7 @@ def get_power(self):
         if not is_valid:
             return None
 
-        return "{:.1f}".format(power)
+        return float(power)
 
     def get_powergood_status(self):
         """

From 95a1f7686f3a27c76d9987954aa99e9b82762c55 Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Thu, 6 May 2021 21:48:58 +0200
Subject: [PATCH 0434/1674] Add aspell-en to main package list
 sonic-slave-buster docker file (#7521)

---
 sonic-slave-buster/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 4b3e371fb8c7..dd752138e50e 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -145,6 +145,7 @@ RUN apt-get update && apt-get install -y \
         bison \
         expat \
         libexpat1-dev \
+        aspell-en \
         dpatch \
         libdb-dev \
         iptables-dev \

From f88767b2ced110327edcbc6aaf3680932b749aa3 Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Fri, 7 May 2021 07:11:06 +0200
Subject: [PATCH 0435/1674] [sonic-slave]: Disable aspell for armhf (#7549)

Read more here: https://bugs.launchpad.net/qemu/+bug/1805913
---
 sonic-slave-buster/Dockerfile.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index dd752138e50e..0b3c2f4f9038 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -343,6 +343,9 @@ RUN apt-get update && apt-get install -y \
        # Aspell is unable to locate the language dictionaries.
        # Re-installing aspell-en dictionary to fix it.
        RUN apt-get install --reinstall -y aspell-en
+
+       # workaround because of https://bugs.launchpad.net/qemu/+bug/1805913, just disable aspell
+       RUN cp /bin/true /usr/bin/aspell
 {%- endif %}
 
 ## Config dpkg

From deb9e67838b91953c05a25977e26f018bc7ec591 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 6 May 2021 22:21:43 -0700
Subject: [PATCH 0436/1674] [202012] Add SOC property to enable AN/LT on some
 platforms (#7547)

* [202012] Add SOC property to enable AN/LT on some platforms

Why I did it
To enable autonegotiation/link training on some Broadcom-based platforms (Arista 7060CX, 7260CX3, 7050cx3, Celestica DX010)

How I did it
Add appropriate SOC property for enabling the feature to the Broadcom config files of appropriate platforms
Also convert line endings to UNIX format for one Celestica file

* Add 'phy_an_lt_msft' to BCM config file permitted list
---
 .../td3-a7050cx3-32s-32x100G.config.bcm       |    4 +-
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm |    2 +
 .../th-a7060-cx32s-32x100G-t1.config.bcm      |    2 +
 .../th-a7060-cx32s-8x100G+48x50G.config.bcm   |    2 +
 .../th-a7060-cx32s-8x100G+24x40G.config.bcm   |    2 +
 .../th-a7060-cx32s-32x40G-t0.config.bcm       |    2 +
 .../th-a7060-cx32s-32x40G-t1.config.bcm       |    2 +
 .../th-a7060-cx32s-8x100G+96x25G.config.bcm   |    2 +
 .../Arista-7260CX3-C64/config.bcm.j2          |    2 +
 .../Arista-7260CX3-D108C8/config.bcm.j2       |    2 +
 .../Arista-7260CX3-Q64/config.bcm.j2          |    2 +
 .../th-seastone-dx010-32x100G-t0.config.bcm   |    2 +
 .../th-seastone-dx010-32x100G-t1.config.bcm   |    2 +
 ...th-seastone-dx010-48x50G+8x100G.config.bcm | 1297 +++++++++--------
 src/sonic-device-data/tests/permitted_list    |    1 +
 15 files changed, 677 insertions(+), 649 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index c93de2859539..c9c8d8f26f02 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -514,4 +514,6 @@ serdes_preemphasis_119=0x14410a
 serdes_preemphasis_123=0x14410a
 serdes_preemphasis_127=0x14410a
 serdes_driver_current_130=0xe
-serdes_preemphasis_130=0x102804
\ No newline at end of file
+serdes_preemphasis_130=0x102804
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 1204e2dcb6ab..f9144f8d41c6 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -558,3 +558,5 @@ serdes_preemphasis_123=0x85804
 serdes_preemphasis_125=0x85804
 serdes_preemphasis_127=0x85804
 serdes_preemphasis_129=0x85804
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
index 95a947003fbc..bf0bd8554ebb 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
@@ -444,3 +444,5 @@ serdes_driver_current_109=0xa
 serdes_preemphasis_109=0x284008
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
index 5c70d324dbb3..5385c2a957ef 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
@@ -545,3 +545,5 @@ serdes_driver_current_115=0xa
 serdes_preemphasis_115=0x284008
 
 mmu_init_config="MSFT-TH-Tier0"
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
index 05908a259c48..4c2013462f58 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
@@ -444,3 +444,5 @@ serdes_driver_current_109=0x4
 serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
index c011ad93f4d7..7616acc7a3a2 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
@@ -442,3 +442,5 @@ serdes_driver_current_109=0x4
 serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier0"
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
index 65a7d57b5513..9f87aa089986 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
@@ -442,3 +442,5 @@ serdes_driver_current_109=0x4
 serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
index 467d428830c9..e75c9ff6fb9d 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
@@ -778,3 +778,5 @@ serdes_driver_current_126=0xa
 serdes_preemphasis_126=0x284008
 serdes_driver_current_127=0xa
 serdes_preemphasis_127=0x284008
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 3676e5e84b68..8e7129b179da 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -1035,3 +1035,5 @@ serdes_preemphasis_117=0x133c06
 
 {{ mmu_sock }}
 {{ IPinIP_sock }}
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index d07f91089859..4f3daccaa376 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -946,3 +946,5 @@ serdes_preemphasis_131=0x580c
 
 mmu_init_config="MSFT-TH2-Tier0"
 {{ IPinIP_sock }}
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index b0de32162ddf..807b3d9f18cb 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -1025,3 +1025,5 @@ serdes_preemphasis_117=0x105004
 
 mmu_init_config="MSFT-TH2-Tier0"
 {{ IPinIP_sock }}
+
+phy_an_lt_msft=1
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
index 7c315460dc8e..111605a257f8 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
@@ -374,3 +374,5 @@ phy_xaui_tx_polarity_flip_130=0x0006
 phy_xaui_rx_polarity_flip_130=0x0000
 
 mmu_init_config="MSFT-TH-Tier0"
+
+phy_an_lt_msft=1
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
index effdfb5d7570..cbad9dc64c7e 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
@@ -694,3 +694,5 @@ serdes_preemphasis_lane2_130=0x2b4104
 serdes_preemphasis_lane3_130=0x2b4104
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
index 6707aa71df09..27136c5b1fb9 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
@@ -1,648 +1,649 @@
-os=unix 
-l2xmsg_mode=1 
-parity_enable=0 
-rate_ext_mdio_divisor=0x80 
-phy_ext_rom_boot=0 
-fpem_mem_entries=32768 
-l2xmsg_mode=1 
-oversubscribe_mode=1 
-pbmp_xport_xe=0xcccc44cc33113333044cccccc66666622
-
-
-dport_map_enable=1
-dport_map_port_68=1
-dport_map_port_69=2
-
-dport_map_port_72=5
-dport_map_port_73=6
-
-dport_map_port_76=9
-dport_map_port_77=10
-
-dport_map_port_80=13
-dport_map_port_81=14
-
-dport_map_port_34=17
-dport_map_port_35=18
-
-dport_map_port_38=21
-dport_map_port_39=22
-
-dport_map_port_42=25
-dport_map_port_43=26
-
-dport_map_port_46=29
-dport_map_port_47=30
-
-dport_map_port_50=33
-dport_map_port_51=34
-
-dport_map_port_54=37
-dport_map_port_55=38
-
-dport_map_port_58=41
-
-dport_map_port_62=45
-
-dport_map_port_84=49
-
-dport_map_port_88=53
-
-dport_map_port_92=57
-dport_map_port_93=58
-
-dport_map_port_96=61
-dport_map_port_97=62
-
-dport_map_port_102=65
-dport_map_port_103=66
-
-dport_map_port_106=69
-dport_map_port_107=70
-
-dport_map_port_110=73
-
-dport_map_port_114=77
-
-dport_map_port_1=81
-
-dport_map_port_5=85
-
-dport_map_port_9=89
-dport_map_port_10=90
-
-dport_map_port_13=93
-dport_map_port_14=94
-
-dport_map_port_17=97
-dport_map_port_18=98
-
-dport_map_port_21=101
-dport_map_port_22=102
-
-dport_map_port_25=105
-dport_map_port_26=106
-
-dport_map_port_29=109
-dport_map_port_30=110
-
-dport_map_port_118=113
-dport_map_port_119=114
-
-dport_map_port_122=117
-dport_map_port_123=118
-
-dport_map_port_126=121
-dport_map_port_127=122
-
-dport_map_port_130=125
-dport_map_port_131=126
-
-
-# port mapping
-portmap_68=65:50:2
-portmap_69=67:50:2
-
-portmap_72=69:50:2
-portmap_73=71:50:2
-
-portmap_76=73:50:2
-portmap_77=75:50:2
-
-portmap_80=77:50:2
-portmap_81=79:50:2
-
-portmap_34=33:50:2
-portmap_35=35:50:2
-
-portmap_38=37:50:2
-portmap_39=39:50:2
-
-portmap_42=41:50:2
-portmap_43=43:50:2
-
-portmap_46=45:50:2
-portmap_47=47:50:2
-
-portmap_50=49:50:2
-portmap_51=51:50:2
-
-portmap_54=53:50:2
-portmap_55=55:50:2
-
-portmap_58=57:100:4
-
-portmap_62=61:100:4
-
-portmap_84=81:100:4
-
-portmap_88=85:100:4
-
-portmap_92=89:50:2
-portmap_93=91:50:2
-
-portmap_96=93:50:2
-portmap_97=95:50:2
-
-portmap_102=97:50:2
-portmap_103=99:50:2
-
-portmap_106=101:50:2
-portmap_107=103:50:2
-
-portmap_110=105:100:4
-
-portmap_114=109:100:4
-
-portmap_1=1:100:4
-
-portmap_5=5:100:4
-
-portmap_9=9:50:2
-portmap_10=11:50:2
-
-portmap_13=13:50:2
-portmap_14=15:50:2
-
-portmap_17=17:50:2
-portmap_18=19:50:2
-
-portmap_21=21:50:2
-portmap_22=23:50:2
-
-portmap_25=25:50:2
-portmap_26=27:50:2
-
-portmap_29=29:50:2
-portmap_30=31:50:2
-
-portmap_118=113:50:2
-portmap_119=115:50:2
-
-portmap_122=117:50:2
-portmap_123=119:50:2
-
-portmap_126=121:50:2
-portmap_127=123:50:2
-
-portmap_130=125:50:2
-portmap_131=127:50:2
-
-
-#WC16
-xgxs_tx_lane_map_68=0x1023
-xgxs_rx_lane_map_68=0x0132
-xgxs_tx_lane_map_69=0x1023
-xgxs_rx_lane_map_69=0x0132
-
-
-#WC17
-xgxs_tx_lane_map_72=0x1023
-xgxs_rx_lane_map_72=0x1032
-xgxs_tx_lane_map_73=0x1023
-xgxs_rx_lane_map_73=0x1032
-
-#WC18
-xgxs_tx_lane_map_76=0x2310
-xgxs_rx_lane_map_76=0x3210
-xgxs_tx_lane_map_77=0x2310
-xgxs_rx_lane_map_77=0x3210
-
-#WC19
-xgxs_tx_lane_map_80=0x1302
-xgxs_rx_lane_map_80=0x0231
-xgxs_tx_lane_map_81=0x1302
-xgxs_rx_lane_map_81=0x0231
-#WC8
-xgxs_tx_lane_map_34=0x1203
-xgxs_rx_lane_map_34=0x3120
-xgxs_tx_lane_map_35=0x1203
-xgxs_rx_lane_map_35=0x3120
-
-#WC9
-xgxs_tx_lane_map_38=0x0123
-xgxs_rx_lane_map_38=0x3201
-xgxs_tx_lane_map_39=0x0123
-xgxs_rx_lane_map_39=0x3201
-
-#WC10
-xgxs_tx_lane_map_42=0x0132
-xgxs_rx_lane_map_42=0x0123
-xgxs_tx_lane_map_43=0x0132
-xgxs_rx_lane_map_43=0x0123
-
-#WC11
-xgxs_tx_lane_map_46=0x2301
-xgxs_rx_lane_map_46=0x2031
-xgxs_tx_lane_map_47=0x2301
-xgxs_rx_lane_map_47=0x2031
-
-#WC12
-xgxs_tx_lane_map_50=0x1032
-xgxs_rx_lane_map_50=0x3120
-xgxs_tx_lane_map_51=0x1032
-xgxs_rx_lane_map_51=0x3120
-
-
-#WC13
-xgxs_tx_lane_map_54=0x1032
-xgxs_rx_lane_map_54=0x0132
-xgxs_tx_lane_map_55=0x1032
-xgxs_rx_lane_map_55=0x0132
-
-#WC14
- xgxs_tx_lane_map_58=0x1032 
- xgxs_rx_lane_map_58=0x3120 
- 
-#WC15
-xgxs_tx_lane_map_62=0x2031
-xgxs_rx_lane_map_62=0x0132
-
-#WC20
- xgxs_tx_lane_map_84=0x3120 
- xgxs_rx_lane_map_84=0x1032 
- 
-#WC21
-xgxs_tx_lane_map_88=0x2310
-xgxs_rx_lane_map_88=0x0123
-
-#WC22
-xgxs_tx_lane_map_92=0x2310
-xgxs_rx_lane_map_92=0x1302
-xgxs_tx_lane_map_93=0x2310
-xgxs_rx_lane_map_93=0x1302
-
-#WC23
-xgxs_tx_lane_map_96=0x1302
-xgxs_rx_lane_map_96=0x1023
-xgxs_tx_lane_map_97=0x1302
-xgxs_rx_lane_map_97=0x1023
-
-#WC24
-xgxs_tx_lane_map_102=0x2310
-xgxs_rx_lane_map_102=0x1032
-xgxs_tx_lane_map_103=0x2310
-xgxs_rx_lane_map_103=0x1032
-
-#WC25
-xgxs_tx_lane_map_106=0x2310
-xgxs_rx_lane_map_106=0x1023
-xgxs_tx_lane_map_107=0x2310
-xgxs_rx_lane_map_107=0x1023
-
-#WC26
-xgxs_tx_lane_map_110=0x2310
-xgxs_rx_lane_map_110=0x1302
-
-#WC27
-xgxs_tx_lane_map_114=0x1302
-xgxs_rx_lane_map_114=0x1032
-
-#WC0
-xgxs_tx_lane_map_1=0x0123
-xgxs_rx_lane_map_1=0x0213
-
-#WC1
-xgxs_tx_lane_map_5=0x2310
-xgxs_rx_lane_map_5=0x3201
-
-#WC2
-xgxs_tx_lane_map_9=0x1023
-xgxs_rx_lane_map_9=0x0213
-xgxs_tx_lane_map_10=0x1023
-xgxs_rx_lane_map_10=0x0213
-
-#WC3
-xgxs_tx_lane_map_13=0x1302
-xgxs_rx_lane_map_13=0x3201
-xgxs_tx_lane_map_14=0x1302
-xgxs_rx_lane_map_14=0x3201
-
-#WC4
-xgxs_tx_lane_map_17=0x0132
-xgxs_rx_lane_map_17=0x0123
-xgxs_tx_lane_map_18=0x0132
-xgxs_rx_lane_map_18=0x0123
-
-#WC5
-xgxs_tx_lane_map_21=0x1032
-xgxs_rx_lane_map_21=0x0213
-xgxs_tx_lane_map_22=0x1032
-xgxs_rx_lane_map_22=0x0213
-
-#WC6
-xgxs_tx_lane_map_25=0x1023
-xgxs_rx_lane_map_25=0x3120
-xgxs_tx_lane_map_26=0x1023
-xgxs_rx_lane_map_26=0x3120
-
-#WC7
-xgxs_tx_lane_map_29=0x2031
-xgxs_rx_lane_map_29=0x3201
-xgxs_tx_lane_map_30=0x2031
-xgxs_rx_lane_map_30=0x3201
-
-#WC28
-xgxs_tx_lane_map_118=0x0231
-xgxs_rx_lane_map_118=0x2031
-xgxs_tx_lane_map_119=0x0231
-xgxs_rx_lane_map_119=0x2031
-
-#WC29
-xgxs_tx_lane_map_122=0x3201
-xgxs_rx_lane_map_122=0x2301
-xgxs_tx_lane_map_123=0x3201
-xgxs_rx_lane_map_123=0x2301
-
-#WC30
-xgxs_tx_lane_map_126=0x0213
-xgxs_rx_lane_map_126=0x0213
-xgxs_tx_lane_map_127=0x0213
-xgxs_rx_lane_map_127=0x0213
-
-#WC31
-xgxs_tx_lane_map_130=0x2031
-xgxs_rx_lane_map_130=0x1032
-xgxs_tx_lane_map_131=0x2031
-xgxs_rx_lane_map_131=0x1032
-
-#PN
-
-#WC16
-phy_xaui_tx_polarity_flip_68=0x0000
-phy_xaui_rx_polarity_flip_68=0x0000
-phy_xaui_tx_polarity_flip_69=0x0000
-phy_xaui_rx_polarity_flip_69=0x0000
-
-#WC17
-phy_xaui_tx_polarity_flip_72=0x0003
-phy_xaui_rx_polarity_flip_72=0x0000
-phy_xaui_tx_polarity_flip_73=0x0002
-phy_xaui_rx_polarity_flip_73=0x0001
-
-
-
-#WC18
-phy_xaui_tx_polarity_flip_76=0x0003
-phy_xaui_rx_polarity_flip_76=0x0000
-phy_xaui_tx_polarity_flip_77=0x0003
-phy_xaui_rx_polarity_flip_77=0x0000
-
-
-#WC19
-phy_xaui_tx_polarity_flip_80=0x0003
-phy_xaui_rx_polarity_flip_80=0x0003
-phy_xaui_tx_polarity_flip_81=0x0003
-phy_xaui_rx_polarity_flip_81=0x0003
-
-
-#WC8
-phy_xaui_tx_polarity_flip_34=0x0003
-phy_xaui_rx_polarity_flip_34=0x0000
-phy_xaui_tx_polarity_flip_35=0x0001
-phy_xaui_rx_polarity_flip_35=0x0000
-
-
-#WC9
-phy_xaui_tx_polarity_flip_38=0x0001
-phy_xaui_rx_polarity_flip_38=0x0000
-phy_xaui_tx_polarity_flip_39=0x0000
-phy_xaui_rx_polarity_flip_39=0x0000
-
-
-#WC10
-phy_xaui_tx_polarity_flip_42=0x0003
-phy_xaui_rx_polarity_flip_42=0x0000
-phy_xaui_tx_polarity_flip_43=0x0002
-phy_xaui_rx_polarity_flip_43=0x0000
-
-
-#WC11
-phy_xaui_tx_polarity_flip_46=0x0000
-phy_xaui_rx_polarity_flip_46=0x0000
-phy_xaui_tx_polarity_flip_47=0x0000
-phy_xaui_rx_polarity_flip_47=0x0000
-
-
-#WC12
-phy_xaui_tx_polarity_flip_50=0x0000
-phy_xaui_rx_polarity_flip_50=0x0000
-phy_xaui_tx_polarity_flip_51=0x0001
-phy_xaui_rx_polarity_flip_51=0x0000
-
-#WC13
-phy_xaui_tx_polarity_flip_54=0x0000
-phy_xaui_rx_polarity_flip_54=0x0000
-phy_xaui_tx_polarity_flip_55=0x0001
-phy_xaui_rx_polarity_flip_55=0x0000
-
-#WC14
-phy_xaui_tx_polarity_flip_58=0x0000
-phy_xaui_rx_polarity_flip_58=0x0000
-
-#WC15
-phy_xaui_tx_polarity_flip_62=0x0005
-phy_xaui_rx_polarity_flip_62=0x000F
-
-#WC20
- phy_xaui_tx_polarity_flip_84=0x000E 
- phy_xaui_rx_polarity_flip_84=0x0007 
-
-#WC21
-phy_xaui_tx_polarity_flip_88=0x000B
-phy_xaui_rx_polarity_flip_88=0x000B
-
-#WC22
-phy_xaui_tx_polarity_flip_92=0x0003
-phy_xaui_rx_polarity_flip_92=0x0001
-phy_xaui_tx_polarity_flip_93=0x0003
-phy_xaui_rx_polarity_flip_93=0x0000
-
-
-#WC23
-phy_xaui_tx_polarity_flip_96=0x0002
-phy_xaui_rx_polarity_flip_96=0x0000
-phy_xaui_tx_polarity_flip_97=0x0002
-phy_xaui_rx_polarity_flip_97=0x0000
-
-#WC24
-phy_xaui_tx_polarity_flip_102=0x0000
-phy_xaui_rx_polarity_flip_102=0x0003
-phy_xaui_tx_polarity_flip_103=0x0000
-phy_xaui_rx_polarity_flip_103=0x0003
-
-
-#WC25
-phy_xaui_tx_polarity_flip_106=0x0003
-phy_xaui_rx_polarity_flip_106=0x0000
-phy_xaui_tx_polarity_flip_107=0x0003
-phy_xaui_rx_polarity_flip_107=0x0000
-
-#WC26
-phy_xaui_tx_polarity_flip_110=0x000F
-phy_xaui_rx_polarity_flip_110=0x000F
-
-#WC27
-phy_xaui_tx_polarity_flip_114=0x000F
-phy_xaui_rx_polarity_flip_114=0x000E
-
-#WC0
-phy_xaui_tx_polarity_flip_1=0x000C
-phy_xaui_rx_polarity_flip_1=0x000F
-
-#WC1
-phy_xaui_tx_polarity_flip_5=0x000E
-phy_xaui_rx_polarity_flip_5=0x0000
-
-#WC2
-phy_xaui_tx_polarity_flip_9=0x0000
-phy_xaui_rx_polarity_flip_9=0x0001
-phy_xaui_tx_polarity_flip_10=0x0001
-phy_xaui_rx_polarity_flip_10=0x0000
-
-
-#WC3
-phy_xaui_tx_polarity_flip_13=0x0003
-phy_xaui_rx_polarity_flip_13=0x0000
-phy_xaui_tx_polarity_flip_14=0x0003
-phy_xaui_rx_polarity_flip_14=0x0000
-
-#WC4
-phy_xaui_tx_polarity_flip_17=0x0002
-phy_xaui_rx_polarity_flip_17=0x0000
-phy_xaui_tx_polarity_flip_18=0x0003
-phy_xaui_rx_polarity_flip_18=0x0000
-
-
-#WC5
-phy_xaui_tx_polarity_flip_21=0x0000
-phy_xaui_rx_polarity_flip_21=0x0000
-phy_xaui_tx_polarity_flip_22=0x0000
-phy_xaui_rx_polarity_flip_22=0x0000
-
-
-#WC6
-phy_xaui_tx_polarity_flip_25=0x0000
-phy_xaui_rx_polarity_flip_25=0x0002
-phy_xaui_tx_polarity_flip_26=0x0001
-phy_xaui_rx_polarity_flip_26=0x0002
-
-
-#WC7
-phy_xaui_tx_polarity_flip_29=0x0000
-phy_xaui_rx_polarity_flip_29=0x0000
-phy_xaui_tx_polarity_flip_30=0x0001
-phy_xaui_rx_polarity_flip_30=0x0000
-
-
-#WC28
-phy_xaui_tx_polarity_flip_118=0x0003
-phy_xaui_rx_polarity_flip_118=0x0003
-phy_xaui_tx_polarity_flip_119=0x0003
-phy_xaui_rx_polarity_flip_119=0x0003
-
-
-#WC29
-phy_xaui_tx_polarity_flip_122=0x0002
-phy_xaui_rx_polarity_flip_122=0x0000
-phy_xaui_tx_polarity_flip_123=0x0000
-phy_xaui_rx_polarity_flip_123=0x0000
-
-
-#WC30
-phy_xaui_tx_polarity_flip_126=0x0003
-phy_xaui_rx_polarity_flip_126=0x0000
-phy_xaui_tx_polarity_flip_127=0x0003
-phy_xaui_rx_polarity_flip_127=0x0000
-
-
-#WC31
-phy_xaui_tx_polarity_flip_130=0x0002
-phy_xaui_rx_polarity_flip_130=0x0000
-phy_xaui_tx_polarity_flip_131=0x0001
-phy_xaui_rx_polarity_flip_131=0x0000
-
-#xe 
-serdes_driver_current=0x0a
-serdes_preemphasis=0x1a5402
-
-#ce0
-serdes_driver_current_lane0_58=0x0a
-serdes_driver_current_lane1_58=0x09
-serdes_driver_current_lane2_58=0x09
-serdes_driver_current_lane3_58=0x0a
-serdes_preemphasis_lane0_58=0x254902
-serdes_preemphasis_lane1_58=0x244a02
-serdes_preemphasis_lane2_58=0x244a02
-serdes_preemphasis_lane3_58=0x254902
-
-#ce1
-serdes_driver_current_lane0_62=0x09
-serdes_driver_current_lane1_62=0x0a
-serdes_driver_current_lane2_62=0x09
-serdes_driver_current_lane3_62=0x09
-serdes_preemphasis_lane0_62=0x244a02
-serdes_preemphasis_lane1_62=0x254902
-serdes_preemphasis_lane2_62=0x244a02
-serdes_preemphasis_lane3_62=0x244a02
-
-#ce2
-serdes_driver_current_lane0_84=0x09
-serdes_driver_current_lane1_84=0x09
-serdes_driver_current_lane2_84=0x09
-serdes_driver_current_lane3_84=0x09
-serdes_preemphasis_lane0_84=0x204e02
-serdes_preemphasis_lane1_84=0x204e02
-serdes_preemphasis_lane2_84=0x204e02
-serdes_preemphasis_lane3_84=0x204e02
-
-#ce3
-serdes_driver_current_lane0_88=0x09
-serdes_driver_current_lane1_88=0x08
-serdes_driver_current_lane2_88=0x08
-serdes_driver_current_lane3_88=0x09
-serdes_preemphasis_lane0_88=0x204e02
-serdes_preemphasis_lane1_88=0x1d5102
-serdes_preemphasis_lane2_88=0x1d5102
-serdes_preemphasis_lane3_88=0x204e02
-
-#ce4
-serdes_driver_current_lane0_110=0x09
-serdes_driver_current_lane1_110=0x08
-serdes_driver_current_lane2_110=0x08
-serdes_driver_current_lane3_110=0x09
-serdes_preemphasis_lane0_110=0x204e02
-serdes_preemphasis_lane1_110=0x1d5102
-serdes_preemphasis_lane2_110=0x1d5102
-serdes_preemphasis_lane3_110=0x204e02
-
-#ce5
-serdes_driver_current_lane0_114=0x09
-serdes_driver_current_lane1_114=0x08
-serdes_driver_current_lane2_114=0x09
-serdes_driver_current_lane3_114=0x09
-serdes_preemphasis_lane0_114=0x204e02
-serdes_preemphasis_lane1_114=0x1d5102
-serdes_preemphasis_lane2_114=0x224c02
-serdes_preemphasis_lane3_114=0x224c02
-
-#ce6
-serdes_driver_current_lane0_1=0x09
-serdes_driver_current_lane1_1=0x0a
-serdes_driver_current_lane2_1=0x09
-serdes_driver_current_lane3_1=0x0a
-serdes_preemphasis_lane0_1=0x244a02
-serdes_preemphasis_lane1_1=0x254902
-serdes_preemphasis_lane2_1=0x244a02
-serdes_preemphasis_lane3_1=0x254902
-
-#ce7
-serdes_driver_current_lane0_5=0x09
-serdes_driver_current_lane1_5=0x09
-serdes_driver_current_lane2_5=0x09
-serdes_driver_current_lane3_5=0x0a
-serdes_preemphasis_lane0_5=0x244a02
-serdes_preemphasis_lane1_5=0x244a02
-serdes_preemphasis_lane2_5=0x244a02
-serdes_preemphasis_lane3_5=0x254902
-
+os=unix 
+l2xmsg_mode=1 
+parity_enable=0 
+rate_ext_mdio_divisor=0x80 
+phy_ext_rom_boot=0 
+fpem_mem_entries=32768 
+l2xmsg_mode=1 
+oversubscribe_mode=1 
+pbmp_xport_xe=0xcccc44cc33113333044cccccc66666622
+
+
+dport_map_enable=1
+dport_map_port_68=1
+dport_map_port_69=2
+
+dport_map_port_72=5
+dport_map_port_73=6
+
+dport_map_port_76=9
+dport_map_port_77=10
+
+dport_map_port_80=13
+dport_map_port_81=14
+
+dport_map_port_34=17
+dport_map_port_35=18
+
+dport_map_port_38=21
+dport_map_port_39=22
+
+dport_map_port_42=25
+dport_map_port_43=26
+
+dport_map_port_46=29
+dport_map_port_47=30
+
+dport_map_port_50=33
+dport_map_port_51=34
+
+dport_map_port_54=37
+dport_map_port_55=38
+
+dport_map_port_58=41
+
+dport_map_port_62=45
+
+dport_map_port_84=49
+
+dport_map_port_88=53
+
+dport_map_port_92=57
+dport_map_port_93=58
+
+dport_map_port_96=61
+dport_map_port_97=62
+
+dport_map_port_102=65
+dport_map_port_103=66
+
+dport_map_port_106=69
+dport_map_port_107=70
+
+dport_map_port_110=73
+
+dport_map_port_114=77
+
+dport_map_port_1=81
+
+dport_map_port_5=85
+
+dport_map_port_9=89
+dport_map_port_10=90
+
+dport_map_port_13=93
+dport_map_port_14=94
+
+dport_map_port_17=97
+dport_map_port_18=98
+
+dport_map_port_21=101
+dport_map_port_22=102
+
+dport_map_port_25=105
+dport_map_port_26=106
+
+dport_map_port_29=109
+dport_map_port_30=110
+
+dport_map_port_118=113
+dport_map_port_119=114
+
+dport_map_port_122=117
+dport_map_port_123=118
+
+dport_map_port_126=121
+dport_map_port_127=122
+
+dport_map_port_130=125
+dport_map_port_131=126
+
+
+# port mapping
+portmap_68=65:50:2
+portmap_69=67:50:2
+
+portmap_72=69:50:2
+portmap_73=71:50:2
+
+portmap_76=73:50:2
+portmap_77=75:50:2
+
+portmap_80=77:50:2
+portmap_81=79:50:2
+
+portmap_34=33:50:2
+portmap_35=35:50:2
+
+portmap_38=37:50:2
+portmap_39=39:50:2
+
+portmap_42=41:50:2
+portmap_43=43:50:2
+
+portmap_46=45:50:2
+portmap_47=47:50:2
+
+portmap_50=49:50:2
+portmap_51=51:50:2
+
+portmap_54=53:50:2
+portmap_55=55:50:2
+
+portmap_58=57:100:4
+
+portmap_62=61:100:4
+
+portmap_84=81:100:4
+
+portmap_88=85:100:4
+
+portmap_92=89:50:2
+portmap_93=91:50:2
+
+portmap_96=93:50:2
+portmap_97=95:50:2
+
+portmap_102=97:50:2
+portmap_103=99:50:2
+
+portmap_106=101:50:2
+portmap_107=103:50:2
+
+portmap_110=105:100:4
+
+portmap_114=109:100:4
+
+portmap_1=1:100:4
+
+portmap_5=5:100:4
+
+portmap_9=9:50:2
+portmap_10=11:50:2
+
+portmap_13=13:50:2
+portmap_14=15:50:2
+
+portmap_17=17:50:2
+portmap_18=19:50:2
+
+portmap_21=21:50:2
+portmap_22=23:50:2
+
+portmap_25=25:50:2
+portmap_26=27:50:2
+
+portmap_29=29:50:2
+portmap_30=31:50:2
+
+portmap_118=113:50:2
+portmap_119=115:50:2
+
+portmap_122=117:50:2
+portmap_123=119:50:2
+
+portmap_126=121:50:2
+portmap_127=123:50:2
+
+portmap_130=125:50:2
+portmap_131=127:50:2
+
+
+#WC16
+xgxs_tx_lane_map_68=0x1023
+xgxs_rx_lane_map_68=0x0132
+xgxs_tx_lane_map_69=0x1023
+xgxs_rx_lane_map_69=0x0132
+
+
+#WC17
+xgxs_tx_lane_map_72=0x1023
+xgxs_rx_lane_map_72=0x1032
+xgxs_tx_lane_map_73=0x1023
+xgxs_rx_lane_map_73=0x1032
+
+#WC18
+xgxs_tx_lane_map_76=0x2310
+xgxs_rx_lane_map_76=0x3210
+xgxs_tx_lane_map_77=0x2310
+xgxs_rx_lane_map_77=0x3210
+
+#WC19
+xgxs_tx_lane_map_80=0x1302
+xgxs_rx_lane_map_80=0x0231
+xgxs_tx_lane_map_81=0x1302
+xgxs_rx_lane_map_81=0x0231
+#WC8
+xgxs_tx_lane_map_34=0x1203
+xgxs_rx_lane_map_34=0x3120
+xgxs_tx_lane_map_35=0x1203
+xgxs_rx_lane_map_35=0x3120
+
+#WC9
+xgxs_tx_lane_map_38=0x0123
+xgxs_rx_lane_map_38=0x3201
+xgxs_tx_lane_map_39=0x0123
+xgxs_rx_lane_map_39=0x3201
+
+#WC10
+xgxs_tx_lane_map_42=0x0132
+xgxs_rx_lane_map_42=0x0123
+xgxs_tx_lane_map_43=0x0132
+xgxs_rx_lane_map_43=0x0123
+
+#WC11
+xgxs_tx_lane_map_46=0x2301
+xgxs_rx_lane_map_46=0x2031
+xgxs_tx_lane_map_47=0x2301
+xgxs_rx_lane_map_47=0x2031
+
+#WC12
+xgxs_tx_lane_map_50=0x1032
+xgxs_rx_lane_map_50=0x3120
+xgxs_tx_lane_map_51=0x1032
+xgxs_rx_lane_map_51=0x3120
+
+
+#WC13
+xgxs_tx_lane_map_54=0x1032
+xgxs_rx_lane_map_54=0x0132
+xgxs_tx_lane_map_55=0x1032
+xgxs_rx_lane_map_55=0x0132
+
+#WC14
+ xgxs_tx_lane_map_58=0x1032 
+ xgxs_rx_lane_map_58=0x3120 
+ 
+#WC15
+xgxs_tx_lane_map_62=0x2031
+xgxs_rx_lane_map_62=0x0132
+
+#WC20
+ xgxs_tx_lane_map_84=0x3120 
+ xgxs_rx_lane_map_84=0x1032 
+ 
+#WC21
+xgxs_tx_lane_map_88=0x2310
+xgxs_rx_lane_map_88=0x0123
+
+#WC22
+xgxs_tx_lane_map_92=0x2310
+xgxs_rx_lane_map_92=0x1302
+xgxs_tx_lane_map_93=0x2310
+xgxs_rx_lane_map_93=0x1302
+
+#WC23
+xgxs_tx_lane_map_96=0x1302
+xgxs_rx_lane_map_96=0x1023
+xgxs_tx_lane_map_97=0x1302
+xgxs_rx_lane_map_97=0x1023
+
+#WC24
+xgxs_tx_lane_map_102=0x2310
+xgxs_rx_lane_map_102=0x1032
+xgxs_tx_lane_map_103=0x2310
+xgxs_rx_lane_map_103=0x1032
+
+#WC25
+xgxs_tx_lane_map_106=0x2310
+xgxs_rx_lane_map_106=0x1023
+xgxs_tx_lane_map_107=0x2310
+xgxs_rx_lane_map_107=0x1023
+
+#WC26
+xgxs_tx_lane_map_110=0x2310
+xgxs_rx_lane_map_110=0x1302
+
+#WC27
+xgxs_tx_lane_map_114=0x1302
+xgxs_rx_lane_map_114=0x1032
+
+#WC0
+xgxs_tx_lane_map_1=0x0123
+xgxs_rx_lane_map_1=0x0213
+
+#WC1
+xgxs_tx_lane_map_5=0x2310
+xgxs_rx_lane_map_5=0x3201
+
+#WC2
+xgxs_tx_lane_map_9=0x1023
+xgxs_rx_lane_map_9=0x0213
+xgxs_tx_lane_map_10=0x1023
+xgxs_rx_lane_map_10=0x0213
+
+#WC3
+xgxs_tx_lane_map_13=0x1302
+xgxs_rx_lane_map_13=0x3201
+xgxs_tx_lane_map_14=0x1302
+xgxs_rx_lane_map_14=0x3201
+
+#WC4
+xgxs_tx_lane_map_17=0x0132
+xgxs_rx_lane_map_17=0x0123
+xgxs_tx_lane_map_18=0x0132
+xgxs_rx_lane_map_18=0x0123
+
+#WC5
+xgxs_tx_lane_map_21=0x1032
+xgxs_rx_lane_map_21=0x0213
+xgxs_tx_lane_map_22=0x1032
+xgxs_rx_lane_map_22=0x0213
+
+#WC6
+xgxs_tx_lane_map_25=0x1023
+xgxs_rx_lane_map_25=0x3120
+xgxs_tx_lane_map_26=0x1023
+xgxs_rx_lane_map_26=0x3120
+
+#WC7
+xgxs_tx_lane_map_29=0x2031
+xgxs_rx_lane_map_29=0x3201
+xgxs_tx_lane_map_30=0x2031
+xgxs_rx_lane_map_30=0x3201
+
+#WC28
+xgxs_tx_lane_map_118=0x0231
+xgxs_rx_lane_map_118=0x2031
+xgxs_tx_lane_map_119=0x0231
+xgxs_rx_lane_map_119=0x2031
+
+#WC29
+xgxs_tx_lane_map_122=0x3201
+xgxs_rx_lane_map_122=0x2301
+xgxs_tx_lane_map_123=0x3201
+xgxs_rx_lane_map_123=0x2301
+
+#WC30
+xgxs_tx_lane_map_126=0x0213
+xgxs_rx_lane_map_126=0x0213
+xgxs_tx_lane_map_127=0x0213
+xgxs_rx_lane_map_127=0x0213
+
+#WC31
+xgxs_tx_lane_map_130=0x2031
+xgxs_rx_lane_map_130=0x1032
+xgxs_tx_lane_map_131=0x2031
+xgxs_rx_lane_map_131=0x1032
+
+#PN
+
+#WC16
+phy_xaui_tx_polarity_flip_68=0x0000
+phy_xaui_rx_polarity_flip_68=0x0000
+phy_xaui_tx_polarity_flip_69=0x0000
+phy_xaui_rx_polarity_flip_69=0x0000
+
+#WC17
+phy_xaui_tx_polarity_flip_72=0x0003
+phy_xaui_rx_polarity_flip_72=0x0000
+phy_xaui_tx_polarity_flip_73=0x0002
+phy_xaui_rx_polarity_flip_73=0x0001
+
+
+
+#WC18
+phy_xaui_tx_polarity_flip_76=0x0003
+phy_xaui_rx_polarity_flip_76=0x0000
+phy_xaui_tx_polarity_flip_77=0x0003
+phy_xaui_rx_polarity_flip_77=0x0000
+
+
+#WC19
+phy_xaui_tx_polarity_flip_80=0x0003
+phy_xaui_rx_polarity_flip_80=0x0003
+phy_xaui_tx_polarity_flip_81=0x0003
+phy_xaui_rx_polarity_flip_81=0x0003
+
+
+#WC8
+phy_xaui_tx_polarity_flip_34=0x0003
+phy_xaui_rx_polarity_flip_34=0x0000
+phy_xaui_tx_polarity_flip_35=0x0001
+phy_xaui_rx_polarity_flip_35=0x0000
+
+
+#WC9
+phy_xaui_tx_polarity_flip_38=0x0001
+phy_xaui_rx_polarity_flip_38=0x0000
+phy_xaui_tx_polarity_flip_39=0x0000
+phy_xaui_rx_polarity_flip_39=0x0000
+
+
+#WC10
+phy_xaui_tx_polarity_flip_42=0x0003
+phy_xaui_rx_polarity_flip_42=0x0000
+phy_xaui_tx_polarity_flip_43=0x0002
+phy_xaui_rx_polarity_flip_43=0x0000
+
+
+#WC11
+phy_xaui_tx_polarity_flip_46=0x0000
+phy_xaui_rx_polarity_flip_46=0x0000
+phy_xaui_tx_polarity_flip_47=0x0000
+phy_xaui_rx_polarity_flip_47=0x0000
+
+
+#WC12
+phy_xaui_tx_polarity_flip_50=0x0000
+phy_xaui_rx_polarity_flip_50=0x0000
+phy_xaui_tx_polarity_flip_51=0x0001
+phy_xaui_rx_polarity_flip_51=0x0000
+
+#WC13
+phy_xaui_tx_polarity_flip_54=0x0000
+phy_xaui_rx_polarity_flip_54=0x0000
+phy_xaui_tx_polarity_flip_55=0x0001
+phy_xaui_rx_polarity_flip_55=0x0000
+
+#WC14
+phy_xaui_tx_polarity_flip_58=0x0000
+phy_xaui_rx_polarity_flip_58=0x0000
+
+#WC15
+phy_xaui_tx_polarity_flip_62=0x0005
+phy_xaui_rx_polarity_flip_62=0x000F
+
+#WC20
+ phy_xaui_tx_polarity_flip_84=0x000E 
+ phy_xaui_rx_polarity_flip_84=0x0007 
+
+#WC21
+phy_xaui_tx_polarity_flip_88=0x000B
+phy_xaui_rx_polarity_flip_88=0x000B
+
+#WC22
+phy_xaui_tx_polarity_flip_92=0x0003
+phy_xaui_rx_polarity_flip_92=0x0001
+phy_xaui_tx_polarity_flip_93=0x0003
+phy_xaui_rx_polarity_flip_93=0x0000
+
+
+#WC23
+phy_xaui_tx_polarity_flip_96=0x0002
+phy_xaui_rx_polarity_flip_96=0x0000
+phy_xaui_tx_polarity_flip_97=0x0002
+phy_xaui_rx_polarity_flip_97=0x0000
+
+#WC24
+phy_xaui_tx_polarity_flip_102=0x0000
+phy_xaui_rx_polarity_flip_102=0x0003
+phy_xaui_tx_polarity_flip_103=0x0000
+phy_xaui_rx_polarity_flip_103=0x0003
+
+
+#WC25
+phy_xaui_tx_polarity_flip_106=0x0003
+phy_xaui_rx_polarity_flip_106=0x0000
+phy_xaui_tx_polarity_flip_107=0x0003
+phy_xaui_rx_polarity_flip_107=0x0000
+
+#WC26
+phy_xaui_tx_polarity_flip_110=0x000F
+phy_xaui_rx_polarity_flip_110=0x000F
+
+#WC27
+phy_xaui_tx_polarity_flip_114=0x000F
+phy_xaui_rx_polarity_flip_114=0x000E
+
+#WC0
+phy_xaui_tx_polarity_flip_1=0x000C
+phy_xaui_rx_polarity_flip_1=0x000F
+
+#WC1
+phy_xaui_tx_polarity_flip_5=0x000E
+phy_xaui_rx_polarity_flip_5=0x0000
+
+#WC2
+phy_xaui_tx_polarity_flip_9=0x0000
+phy_xaui_rx_polarity_flip_9=0x0001
+phy_xaui_tx_polarity_flip_10=0x0001
+phy_xaui_rx_polarity_flip_10=0x0000
+
+
+#WC3
+phy_xaui_tx_polarity_flip_13=0x0003
+phy_xaui_rx_polarity_flip_13=0x0000
+phy_xaui_tx_polarity_flip_14=0x0003
+phy_xaui_rx_polarity_flip_14=0x0000
+
+#WC4
+phy_xaui_tx_polarity_flip_17=0x0002
+phy_xaui_rx_polarity_flip_17=0x0000
+phy_xaui_tx_polarity_flip_18=0x0003
+phy_xaui_rx_polarity_flip_18=0x0000
+
+
+#WC5
+phy_xaui_tx_polarity_flip_21=0x0000
+phy_xaui_rx_polarity_flip_21=0x0000
+phy_xaui_tx_polarity_flip_22=0x0000
+phy_xaui_rx_polarity_flip_22=0x0000
+
+
+#WC6
+phy_xaui_tx_polarity_flip_25=0x0000
+phy_xaui_rx_polarity_flip_25=0x0002
+phy_xaui_tx_polarity_flip_26=0x0001
+phy_xaui_rx_polarity_flip_26=0x0002
+
+
+#WC7
+phy_xaui_tx_polarity_flip_29=0x0000
+phy_xaui_rx_polarity_flip_29=0x0000
+phy_xaui_tx_polarity_flip_30=0x0001
+phy_xaui_rx_polarity_flip_30=0x0000
+
+
+#WC28
+phy_xaui_tx_polarity_flip_118=0x0003
+phy_xaui_rx_polarity_flip_118=0x0003
+phy_xaui_tx_polarity_flip_119=0x0003
+phy_xaui_rx_polarity_flip_119=0x0003
+
+
+#WC29
+phy_xaui_tx_polarity_flip_122=0x0002
+phy_xaui_rx_polarity_flip_122=0x0000
+phy_xaui_tx_polarity_flip_123=0x0000
+phy_xaui_rx_polarity_flip_123=0x0000
+
+
+#WC30
+phy_xaui_tx_polarity_flip_126=0x0003
+phy_xaui_rx_polarity_flip_126=0x0000
+phy_xaui_tx_polarity_flip_127=0x0003
+phy_xaui_rx_polarity_flip_127=0x0000
+
+
+#WC31
+phy_xaui_tx_polarity_flip_130=0x0002
+phy_xaui_rx_polarity_flip_130=0x0000
+phy_xaui_tx_polarity_flip_131=0x0001
+phy_xaui_rx_polarity_flip_131=0x0000
+
+#xe 
+serdes_driver_current=0x0a
+serdes_preemphasis=0x1a5402
+
+#ce0
+serdes_driver_current_lane0_58=0x0a
+serdes_driver_current_lane1_58=0x09
+serdes_driver_current_lane2_58=0x09
+serdes_driver_current_lane3_58=0x0a
+serdes_preemphasis_lane0_58=0x254902
+serdes_preemphasis_lane1_58=0x244a02
+serdes_preemphasis_lane2_58=0x244a02
+serdes_preemphasis_lane3_58=0x254902
+
+#ce1
+serdes_driver_current_lane0_62=0x09
+serdes_driver_current_lane1_62=0x0a
+serdes_driver_current_lane2_62=0x09
+serdes_driver_current_lane3_62=0x09
+serdes_preemphasis_lane0_62=0x244a02
+serdes_preemphasis_lane1_62=0x254902
+serdes_preemphasis_lane2_62=0x244a02
+serdes_preemphasis_lane3_62=0x244a02
+
+#ce2
+serdes_driver_current_lane0_84=0x09
+serdes_driver_current_lane1_84=0x09
+serdes_driver_current_lane2_84=0x09
+serdes_driver_current_lane3_84=0x09
+serdes_preemphasis_lane0_84=0x204e02
+serdes_preemphasis_lane1_84=0x204e02
+serdes_preemphasis_lane2_84=0x204e02
+serdes_preemphasis_lane3_84=0x204e02
+
+#ce3
+serdes_driver_current_lane0_88=0x09
+serdes_driver_current_lane1_88=0x08
+serdes_driver_current_lane2_88=0x08
+serdes_driver_current_lane3_88=0x09
+serdes_preemphasis_lane0_88=0x204e02
+serdes_preemphasis_lane1_88=0x1d5102
+serdes_preemphasis_lane2_88=0x1d5102
+serdes_preemphasis_lane3_88=0x204e02
+
+#ce4
+serdes_driver_current_lane0_110=0x09
+serdes_driver_current_lane1_110=0x08
+serdes_driver_current_lane2_110=0x08
+serdes_driver_current_lane3_110=0x09
+serdes_preemphasis_lane0_110=0x204e02
+serdes_preemphasis_lane1_110=0x1d5102
+serdes_preemphasis_lane2_110=0x1d5102
+serdes_preemphasis_lane3_110=0x204e02
+
+#ce5
+serdes_driver_current_lane0_114=0x09
+serdes_driver_current_lane1_114=0x08
+serdes_driver_current_lane2_114=0x09
+serdes_driver_current_lane3_114=0x09
+serdes_preemphasis_lane0_114=0x204e02
+serdes_preemphasis_lane1_114=0x1d5102
+serdes_preemphasis_lane2_114=0x224c02
+serdes_preemphasis_lane3_114=0x224c02
+
+#ce6
+serdes_driver_current_lane0_1=0x09
+serdes_driver_current_lane1_1=0x0a
+serdes_driver_current_lane2_1=0x09
+serdes_driver_current_lane3_1=0x0a
+serdes_preemphasis_lane0_1=0x244a02
+serdes_preemphasis_lane1_1=0x254902
+serdes_preemphasis_lane2_1=0x244a02
+serdes_preemphasis_lane3_1=0x254902
+
+#ce7
+serdes_driver_current_lane0_5=0x09
+serdes_driver_current_lane1_5=0x09
+serdes_driver_current_lane2_5=0x09
+serdes_driver_current_lane3_5=0x0a
+serdes_preemphasis_lane0_5=0x244a02
+serdes_preemphasis_lane1_5=0x244a02
+serdes_preemphasis_lane2_5=0x244a02
+serdes_preemphasis_lane3_5=0x254902
+
+phy_an_lt_msft=1
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index f152140e9070..467780f2b519 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -91,6 +91,7 @@ phy_an_allow_pll_change_hg
 phy_an_c37
 phy_an_c73
 phy_an_fec
+phy_an_lt_msft
 phy_automedium
 phy_aux_voltage_enable
 phy_chain_rx_lane_map_physical

From 2dabad0b5e40686bc16fe88003b1a6e13d1b7a04 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 7 May 2021 16:52:18 +0800
Subject: [PATCH 0437/1674] [build]: Fix build wrapper commands not cleanup
 issue (#7553)

cleanup the build commands after build finished.
---
 build_debian.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 59eeea63d97a..81118e20e239 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -581,9 +581,8 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 ## Note: -x to skip directories on different file systems, such as /proc
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
-sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
-
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
+sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 
 # Ensure admin gid is 1000
 gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"

From 0a6149abda7f224ed82da722fcad0d5168811974 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 8 May 2021 05:22:24 +0800
Subject: [PATCH 0438/1674] [ci] Fix official builds timeout issue (#7516)

The default value is 600 minutes, it is not enough when building multiple images for a platform, change to 720 minutes.

From b95f86722c9407676d7e3eb5f683e3d6ba5d1e38 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 9 May 2021 12:44:39 +0800
Subject: [PATCH 0439/1674] [ci/build]: Upgrade SONiC package versions (#7540)

---
 .../versions-deb-buster                       |  2 +-
 .../versions/default/versions-deb-buster      | 10 +++---
 files/build/versions/default/versions-py2     |  4 +--
 files/build/versions/default/versions-py3     |  8 ++---
 files/build/versions/default/versions-web     |  4 +--
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  8 ++---
 .../dockers/docker-sonic-vs/versions-py3      |  7 ++--
 .../sonic-slave-buster/versions-deb-buster    | 36 +++++++++----------
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 36 +++++++++----------
 .../dockers/sonic-slave-stretch/versions-py2  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   | 17 +++++----
 files/build/versions/host-image/versions-py2  |  4 +--
 files/build/versions/host-image/versions-py3  | 19 +++++-----
 16 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index c123a94cff81..432707b8d8ee 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -40,7 +40,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.5
+libsaibcm==4.3.3.5-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index db39cba3353f..4f3a2a3aea5b 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -61,7 +61,7 @@ libdaemon0==0.14-7
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
 libdbus-1-3==1.12.20-0+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
 libdw1==0.176-1.1
@@ -93,9 +93,9 @@ libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libipt2==2.0-2
 libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjansson4==2.12-1
@@ -169,7 +169,7 @@ librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.5
+libsaibcm==4.3.3.5-1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index 59ca48893410..a7cabd9fb532 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -24,7 +24,7 @@ redis-dump-load==1.1
 scandir==1.10.0
 scapy==2.4.0
 singledispatch==3.6.1
-six==1.15.0
+six==1.16.0
 thrift==0.13.0
-typing==3.7.4.3
+typing==3.10.0.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index b166847d8af1..ce55dc947527 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -1,4 +1,4 @@
-attrs==20.3.0
+attrs==21.2.0
 bitarray==1.5.3
 certifi==2017.4.17
 chardet==4.0.0
@@ -6,7 +6,7 @@ click==7.1.2
 clickclick==20.10.2
 connexion==2.7.0
 Flask==1.1.2
-grpcio==1.37.0
+grpcio==1.37.1
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.0
-protobuf==3.15.8
+protobuf==3.16.0
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
@@ -44,6 +44,6 @@ supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
 thrift==0.13.0
 toposort==1.6
-typing-extensions==3.7.4.3
+typing-extensions==3.10.0.0
 urllib3==1.21.1
 Werkzeug==1.0.1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index cc8d5bf31cd9..fe9797c9024f 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -41,8 +41,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7I70XjzysspEht%2BsOwCM5QbtCe%2Boelh0%2FfwrhHPGh1g%3D&se=2034-12-30T07%3A06%3A51Z&sp=r==873ad911d2b9b03bab053fc5df78db17
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=7XHTTf9%2FWBxEqX0Y8g7KqH8t3AFz1dJIZeY3YEDRypc%3D&se=2034-12-30T07%3A06%3A11Z&sp=r==58723be632fd726323e71f81a51540e6
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=BcGHyOGfS%2FypmiNUtHnX8WCbUwqoXPiRRe9E%2FUl9Sp8%3D&se=2035-01-12T01%3A52%3A57Z&sp=r==c6a8e39823441c331d3baf7541d88bcd
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=WHmBcthD%2FqBv4Pia0GH4GQ%2BdKm8rolG8dJSh%2BYoGEr8%3D&se=2035-01-12T01%3A52%3A20Z&sp=r==731894feaf45cda01cacbaa61071db2c
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 80be8cff9a6c..e0a1dbad64b1 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -1 +1 @@
-six==1.15.0
\ No newline at end of file
+six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 56b2e60fdf47..b66b3a6cee6a 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -19,10 +19,10 @@ dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
 dpkg-dev==1.18.25
 ethtool==1:4.8-1+b1
-exim4==4.89-2+deb9u7
-exim4-base==4.89-2+deb9u7
-exim4-config==4.89-2+deb9u7
-exim4-daemon-light==4.89-2+deb9u7
+exim4==4.89-2+deb9u8
+exim4-base==4.89-2+deb9u8
+exim4-config==4.89-2+deb9u8
+exim4-daemon-light==4.89-2+deb9u8
 fakeroot==1.21-3.1
 file==1:5.30-1+deb9u3
 g++==4:6.3.0-4
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index ae7bcd1adcb3..9bc2af8ab980 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -3,13 +3,14 @@ chardet==3.0.4
 Click==7.0
 deepdiff==5.2.3
 ijson==2.6.1
-jsondiff==1.2.0
-M2Crypto==0.31.0
+jsondiff==1.3.0
+M2Crypto==0.37.1
 netifaces==0.10.7
 ordered-set==4.0.2
+parameterized==0.8.1
 pexpect==4.8.0
 ptyprocess==0.7.0
 requests==2.25.0
-tabulate==0.8.2
+tabulate==0.8.9
 urllib3==1.26.4
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index ebf84b97150b..26738f17a569 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -25,7 +25,7 @@ autopoint==0.19.8.1-9
 autotools-dev==20180224.1
 bash-completion==1:2.8-6
 bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u3
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
 binfmt-support==2.2.0-2
 binutils==2.31.1-16
 binutils-common==2.31.1-16
@@ -88,7 +88,7 @@ distro-info-data==0.41+deb10u3
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u3
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
 docker-ce==5:18.09.5~3-0~debian-buster
 docker-ce-cli==5:18.09.5~3-0~debian-buster
 docutils-common==0.14+dfsg-4
@@ -103,9 +103,9 @@ dwz==0.12-3
 eatmydata==105-7
 emacsen-common==3.0.4
 equivs==2.2.0
-exim4-base==4.92-8+deb10u5
-exim4-config==4.92-8+deb10u5
-exim4-daemon-light==4.92-8+deb10u5
+exim4-base==4.92-8+deb10u6
+exim4-config==4.92-8+deb10u6
+exim4-daemon-light==4.92-8+deb10u6
 expat==2.2.6-2+deb10u1
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
@@ -263,8 +263,8 @@ libbabeltrace-dev==1.5.6-2+deb10u1
 libbabeltrace1==1.5.6-2+deb10u1
 libbatik-java==1.10-2+deb10u1
 libbdplus0==0.1.2-3
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u3
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u3
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
@@ -405,8 +405,8 @@ libdigest-hmac-perl==1.03+dfsg-2
 libdistro-info-perl==0.21
 libdjvulibre-text==3.5.27.1-10
 libdjvulibre21==3.5.27.1-10
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdom4j-java==2.1.1-2
 libdouble-conversion1==3.1.0-3
 libdoxia-core-java==1.7-2
@@ -606,14 +606,14 @@ libipc-system-simple-perl==1.25-4
 libipt2==2.0-2
 libiptc-dev==1.8.2-4
 libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisl19==0.20-2
 libitext1-java==1.4-7
 libitm1==8.3.0-6
@@ -692,7 +692,7 @@ liblua5.1-0-dev==5.1.5-8.1+b2
 liblvm2cmd2.03==2.03.02-3
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u3
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
 liblzma-dev==5.2.4-1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 8d632cbd97f4..6e978c2c412f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 Babel==2.6.0
-bitarray==2.0.1
+bitarray==2.1.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index f642b0336ad7..1aa02d0b145f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -22,7 +22,7 @@ autopoint==0.19.8.1-2+deb9u1
 autotools-dev==20161112.1
 bash-completion==1:2.1-4.3
 bc==1.06.95-9+b3
-bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u8
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
 binfmt-support==2.1.6-2
 binutils==2.28-5
 bison==2:3.0.4.dfsg-1+b1
@@ -78,7 +78,7 @@ distro-info-data==0.36
 dkms==2.3-2
 dmeventd==2:1.02.137-2
 dmsetup==2:1.02.137-2
-dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u8
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
 docbook-xml==4.5-8
 docbook-xsl==1.79.1+dfsg-2
 docker-ce==5:18.09.5~3-0~debian-stretch
@@ -94,10 +94,10 @@ dwz==0.12-1+b1
 eatmydata==105-5
 emacsen-common==2.0.8
 equivs==2.0.9+nmu1
-exim4==4.89-2+deb9u7
-exim4-base==4.89-2+deb9u7
-exim4-config==4.89-2+deb9u7
-exim4-daemon-light==4.89-2+deb9u7
+exim4==4.89-2+deb9u8
+exim4-base==4.89-2+deb9u8
+exim4-config==4.89-2+deb9u8
+exim4-daemon-light==4.89-2+deb9u8
 expat==2.2.0-2+deb9u3
 exuberant-ctags==1:5.9~svn20110310-11
 fakeroot==1.21-3.1
@@ -227,8 +227,8 @@ libbabeltrace-ctf1==1.5.1-1
 libbabeltrace-dev==1.5.1-1
 libbabeltrace1==1.5.1-1
 libbatik-java==1.8-4+deb9u2
-libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u8
-libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
 libbison-dev==2:3.0.4.dfsg-1+b1
 libbit-vector-perl==7.4-1+b2
 libbluetooth3==5.43-2+deb9u3
@@ -405,8 +405,8 @@ libdigest-hmac-perl==1.03+dfsg-1
 libdistro-info-perl==0.14
 libdjvulibre-text==3.5.27.1-7
 libdjvulibre21==3.5.27.1-7
-libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u8
-libdns162==1:9.10.3.dfsg.P4-12.3+deb9u8
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
 libdom4j-java==1.6.1+dfsg.3-2+deb9u1
 libdouble-conversion1==2.0.1-4
 libdoxia-core-java==1.1.4-6
@@ -573,13 +573,13 @@ libipc-run-perl==0.94-1+deb9u1
 libipc-system-simple-perl==1.25-3
 libiptc-dev==1.6.0+snapshot20161117-6
 libiptc0==1.6.0+snapshot20161117-6
-libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisc160==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u8
-libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u8
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
 libisl15==0.18-1
 libisorelax-java==20041111-9
 libitext1-java==1.4-6
@@ -651,7 +651,7 @@ liblvm2app2.2==2.02.168-2
 liblvm2cmd2.02==2.02.168-2
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.06-2
-liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u8
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
 liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index aeb7e36ef89a..15ecd8e774ce 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -72,7 +72,7 @@ sphinx-rtd-theme==0.1.9
 stdeb==0.8.5
 stgit===0.17.1-dirty
 Twisted==16.6.0
-typing==3.7.4.3
+typing==3.10.0.0
 urllib3==1.19.1
 webencodings==0.5
 wrapt==1.9.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index d144264bd918..f29ccad16735 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 Babel==2.3.4
-bitarray==2.0.1
+bitarray==2.1.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 57f7d015d0ab..c36d1baf7d14 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -44,7 +44,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2002
+hw-management==1.mlnx.7.0010.2303
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
@@ -79,7 +79,7 @@ libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
@@ -101,11 +101,10 @@ libgssapi-krb5-2==1.17-3+deb10u1
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
 libi2c0==4.1-1
-libidn11==1.33-2.2
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
 libk5crypto3==1.17-3+deb10u1
@@ -164,8 +163,10 @@ libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
+libsystemd0==247.3-3~bpo10+1
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
+libudev1==247.3-3~bpo10+1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
@@ -173,6 +174,7 @@ libwrap0==7.6.q-28
 libxtables12==1.8.2-4
 libyang==1.0.73
 libyang-cpp==1.0.73
+libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
 locales==2.28-10
@@ -240,15 +242,16 @@ squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
 sx-kernel==1.mlnx.4.4.2522
 sysfsutils==2.1.0+repack-5
-systemd==241-7~deb10u7
+systemd==247.3-3~bpo10+1
 systemd-sonic-generator==1.0.0
-systemd-sysv==241-7~deb10u7
+systemd-sysv==247.3-3~bpo10+1
+systemd-timesyncd==247.3-3~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
-udev==241-7~deb10u7
+udev==247.3-3~bpo10+1
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index c70251b7cd82..73e978935267 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -20,6 +20,6 @@ PyYAML==5.4.1
 redis==3.5.3
 scandir==1.10.0
 singledispatch==3.6.1
-six==1.15.0
-typing==3.7.4.3
+six==1.16.0
+typing==3.10.0.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 5e4ad547c81a..3465732c3900 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,24 +4,23 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2020.12.5
 cffi==1.14.5
-chardet==3.0.4
+chardet==4.0.0
 Click==7.0
 cryptography==3.4.7
-deepdiff==5.2.3
 docker==4.3.1
 idna==2.10
 ijson==2.6.1
 ipaddress==1.0.23
 Jinja2==2.11.3
-jsondiff==1.2.0
+jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
-M2Crypto==0.31.0
+M2Crypto==0.37.1
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
-netifaces==0.10.7
-ordered-set==4.0.2
+netifaces==0.10.9
+parameterized==0.8.1
 pathtools==0.1.2
 pexpect==4.8.0
 psutil==5.8.0
@@ -33,11 +32,11 @@ python-dateutil==2.8.1
 PyYAML==5.4.1
 redis==3.5.3
 regex==2021.4.4
-requests==2.25.0
+requests==2.25.1
 scapy==2.4.4
-six==1.15.0
-tabulate==0.8.2
+six==1.16.0
+tabulate==0.8.9
 urllib3==1.26.4
 watchdog==0.10.3
-websocket-client==0.58.0
+websocket-client==0.59.0
 xmltodict==0.12.0
\ No newline at end of file

From 100c14007f7d99dfa4a1ce1956e91d5d7f5341d6 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Sun, 9 May 2021 15:45:36 +0800
Subject: [PATCH 0440/1674] [Mellanox] [202012] Enhance the platform.json with
 adding more platform device facts. (#7496)

- Why I did it
Current platform.json lacks some peripheral device related facts, like chassis/fan/pasu/drawer/thermal/components names, numbers, etc.

- How I did it
Add platform device facts to the platform.json file

- How to verify it
Run sonic-mgmt platform API tests which depend on these facts.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../x86_64-mlnx_msn2010-r0/platform.json      | 252 ++++++
 .../x86_64-mlnx_msn2100-r0/platform.json      | 204 +++++
 .../x86_64-mlnx_msn2410-r0/platform.json      | 571 ++++++++++++++
 .../x86_64-mlnx_msn2700-r0/platform.json      |   6 +-
 .../x86_64-mlnx_msn2740-r0/platform.json      | 367 +++++++++
 .../x86_64-mlnx_msn3420-r0/platform.json      | 617 +++++++++++++++
 .../x86_64-mlnx_msn3700-r0/platform.json      | 410 ++++++++++
 .../x86_64-mlnx_msn3700c-r0/platform.json     | 382 +++++++++
 .../x86_64-mlnx_msn3800-r0/platform.json      | 723 ++++++++++++++++++
 .../x86_64-mlnx_msn4410-r0/platform.json      | 410 ++++++++++
 .../x86_64-mlnx_msn4600-r0/platform.json      | 624 +++++++++++++++
 .../x86_64-mlnx_msn4600c-r0/platform.json     | 618 +++++++++++++++
 .../x86_64-mlnx_msn4700-r0/platform.json      | 410 ++++++++++
 13 files changed, 5591 insertions(+), 3 deletions(-)
 create mode 100644 device/mellanox/x86_64-mlnx_msn2010-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn2100-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn2410-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn2740-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn3420-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn3700-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn4410-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/platform.json

diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2010-r0/platform.json
new file mode 100644
index 000000000000..290a1b780390
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/platform.json
@@ -0,0 +1,252 @@
+{
+    "chassis": {
+        "name": "MSN2010",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "N/A",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    },
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+			}
+		],
+        "psus": [
+            {
+                "name": "PSU 1"
+            },
+            {
+                "name": "PSU 2"
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json
new file mode 100644
index 000000000000..21ad5796519e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json
@@ -0,0 +1,204 @@
+{
+    "chassis": {
+        "name": "MSN2100",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "N/A",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    },
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+			}
+		],
+        "psus": [
+            {
+                "name": "PSU 1"
+            },
+            {
+                "name": "PSU 2"
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json
new file mode 100644
index 000000000000..b0ee5d19863a
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json
@@ -0,0 +1,571 @@
+{
+    "chassis": {
+        "name": "MSN2410",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp33",
+                "thermals": [
+                    {
+                        "name": "xSFP module 33 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp34",
+                "thermals": [
+                    {
+                        "name": "xSFP module 34 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp35",
+                "thermals": [
+                    {
+                        "name": "xSFP module 35 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp36",
+                "thermals": [
+                    {
+                        "name": "xSFP module 36 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp37",
+                "thermals": [
+                    {
+                        "name": "xSFP module 37 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp38",
+                "thermals": [
+                    {
+                        "name": "xSFP module 38 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp39",
+                "thermals": [
+                    {
+                        "name": "xSFP module 39 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp40",
+                "thermals": [
+                    {
+                        "name": "xSFP module 40 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp41",
+                "thermals": [
+                    {
+                        "name": "xSFP module 41 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp42",
+                "thermals": [
+                    {
+                        "name": "xSFP module 42 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp43",
+                "thermals": [
+                    {
+                        "name": "xSFP module 43 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp44",
+                "thermals": [
+                    {
+                        "name": "xSFP module 44 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp45",
+                "thermals": [
+                    {
+                        "name": "xSFP module 45 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp46",
+                "thermals": [
+                    {
+                        "name": "xSFP module 46 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp47",
+                "thermals": [
+                    {
+                        "name": "xSFP module 47 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp48",
+                "thermals": [
+                    {
+                        "name": "xSFP module 48 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp49",
+                "thermals": [
+                    {
+                        "name": "xSFP module 49 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp50",
+                "thermals": [
+                    {
+                        "name": "xSFP module 50 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp51",
+                "thermals": [
+                    {
+                        "name": "xSFP module 51 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp52",
+                "thermals": [
+                    {
+                        "name": "xSFP module 52 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp53",
+                "thermals": [
+                    {
+                        "name": "xSFP module 53 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp54",
+                "thermals": [
+                    {
+                        "name": "xSFP module 54 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp55",
+                "thermals": [
+                    {
+                        "name": "xSFP module 55 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp56",
+                "thermals": [
+                    {
+                        "name": "xSFP module 56 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
index 38abbc40bb49..68d299aff76b 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json
@@ -73,7 +73,7 @@
                 "name": "PSU 1",
                 "fans": [
                     {
-                        "name": "psu_1_fan_1"
+                        "name": "psu1_fan1"
                     }
                 ],
                 "thermals": [
@@ -86,12 +86,12 @@
                 "name": "PSU 2",
                 "fans": [
                     {
-                        "name": "PSU-2 Temp"
+                        "name": "psu2_fan1"
                     }
                 ],
                 "thermals": [
                     {
-                        "name": "xSFP module 1 Temp"
+                        "name": "PSU-2 Temp"
                     }
                 ]
             }
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json
new file mode 100644
index 000000000000..ebd3bfa8ed99
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json
@@ -0,0 +1,367 @@
+{
+    "chassis": {
+        "name": "MSN2740",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Core 4 Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json
new file mode 100644
index 000000000000..7d8dec685a5e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json
@@ -0,0 +1,617 @@
+{
+    "chassis": {
+        "name": "MSN3420",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            },
+            {
+                "name": "drawer5",
+                "fans": [
+                    {
+                        "name": "fan9"
+                    },
+                    {
+                        "name": "fan10"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp33",
+                "thermals": [
+                    {
+                        "name": "xSFP module 33 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp34",
+                "thermals": [
+                    {
+                        "name": "xSFP module 34 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp35",
+                "thermals": [
+                    {
+                        "name": "xSFP module 35 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp36",
+                "thermals": [
+                    {
+                        "name": "xSFP module 36 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp37",
+                "thermals": [
+                    {
+                        "name": "xSFP module 37 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp38",
+                "thermals": [
+                    {
+                        "name": "xSFP module 38 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp39",
+                "thermals": [
+                    {
+                        "name": "xSFP module 39 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp40",
+                "thermals": [
+                    {
+                        "name": "xSFP module 40 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp41",
+                "thermals": [
+                    {
+                        "name": "xSFP module 41 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp42",
+                "thermals": [
+                    {
+                        "name": "xSFP module 42 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp43",
+                "thermals": [
+                    {
+                        "name": "xSFP module 43 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp44",
+                "thermals": [
+                    {
+                        "name": "xSFP module 44 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp45",
+                "thermals": [
+                    {
+                        "name": "xSFP module 45 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp46",
+                "thermals": [
+                    {
+                        "name": "xSFP module 46 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp47",
+                "thermals": [
+                    {
+                        "name": "xSFP module 47 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp48",
+                "thermals": [
+                    {
+                        "name": "xSFP module 48 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp49",
+                "thermals": [
+                    {
+                        "name": "xSFP module 49 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp50",
+                "thermals": [
+                    {
+                        "name": "xSFP module 50 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp51",
+                "thermals": [
+                    {
+                        "name": "xSFP module 51 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp52",
+                "thermals": [
+                    {
+                        "name": "xSFP module 52 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp53",
+                "thermals": [
+                    {
+                        "name": "xSFP module 53 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp54",
+                "thermals": [
+                    {
+                        "name": "xSFP module 54 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp55",
+                "thermals": [
+                    {
+                        "name": "xSFP module 55 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp56",
+                "thermals": [
+                    {
+                        "name": "xSFP module 56 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp57",
+                "thermals": [
+                    {
+                        "name": "xSFP module 57 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp58",
+                "thermals": [
+                    {
+                        "name": "xSFP module 58 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp59",
+                "thermals": [
+                    {
+                        "name": "xSFP module 59 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp60",
+                "thermals": [
+                    {
+                        "name": "xSFP module 60 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json
new file mode 100644
index 000000000000..4bc8fe5991d0
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json
@@ -0,0 +1,410 @@
+{
+    "chassis": {
+        "name": "MSN3700",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            },
+            {
+                "name": "drawer5",
+                "fans": [
+                    {
+                        "name": "fan9"
+                    },
+                    {
+                        "name": "fan10"
+                    }
+                ]
+            },
+            {
+                "name": "drawer6",
+                "fans": [
+                    {
+                        "name": "fan11"
+                    },
+                    {
+                        "name": "fan12"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
new file mode 100644
index 000000000000..105c5c207d7e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json
@@ -0,0 +1,382 @@
+{
+    "chassis": {
+        "name": "MSN3700C",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json
new file mode 100644
index 000000000000..6de5df957572
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json
@@ -0,0 +1,723 @@
+{
+    "chassis": {
+        "name": "MSN3800",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            },
+            {
+                "name": "CPLD4"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            },
+            {
+                "name": "Gearbox 1 Temp"
+            },
+            {
+                "name": "Gearbox 2 Temp"
+            },
+            {
+                "name": "Gearbox 3 Temp"
+            },
+            {
+                "name": "Gearbox 4 Temp"
+            },
+            {
+                "name": "Gearbox 5 Temp"
+            },
+            {
+                "name": "Gearbox 6 Temp"
+            },
+            {
+                "name": "Gearbox 7 Temp"
+            },
+            {
+                "name": "Gearbox 8 Temp"
+            },
+            {
+                "name": "Gearbox 9 Temp"
+            },
+            {
+                "name": "Gearbox 10 Temp"
+            },
+            {
+                "name": "Gearbox 11 Temp"
+            },
+            {
+                "name": "Gearbox 12 Temp"
+            },
+            {
+                "name": "Gearbox 13 Temp"
+            },
+            {
+                "name": "Gearbox 14 Temp"
+            },
+            {
+                "name": "Gearbox 15 Temp"
+            },
+            {
+                "name": "Gearbox 16 Temp"
+            },
+            {
+                "name": "Gearbox 17 Temp"
+            },
+            {
+                "name": "Gearbox 18 Temp"
+            },
+            {
+                "name": "Gearbox 19 Temp"
+            },
+            {
+                "name": "Gearbox 20 Temp"
+            },
+            {
+                "name": "Gearbox 21 Temp"
+            },
+            {
+                "name": "Gearbox 22 Temp"
+            },
+            {
+                "name": "Gearbox 23 Temp"
+            },
+            {
+                "name": "Gearbox 24 Temp"
+            },
+            {
+                "name": "Gearbox 25 Temp"
+            },
+            {
+                "name": "Gearbox 26 Temp"
+            },
+            {
+                "name": "Gearbox 27 Temp"
+            },
+            {
+                "name": "Gearbox 28 Temp"
+            },
+            {
+                "name": "Gearbox 29 Temp"
+            },
+            {
+                "name": "Gearbox 30 Temp"
+            },
+            {
+                "name": "Gearbox 31 Temp"
+            },
+            {
+                "name": "Gearbox 32 Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp33",
+                "thermals": [
+                    {
+                        "name": "xSFP module 33 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp34",
+                "thermals": [
+                    {
+                        "name": "xSFP module 34 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp35",
+                "thermals": [
+                    {
+                        "name": "xSFP module 35 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp36",
+                "thermals": [
+                    {
+                        "name": "xSFP module 36 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp37",
+                "thermals": [
+                    {
+                        "name": "xSFP module 37 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp38",
+                "thermals": [
+                    {
+                        "name": "xSFP module 38 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp39",
+                "thermals": [
+                    {
+                        "name": "xSFP module 39 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp40",
+                "thermals": [
+                    {
+                        "name": "xSFP module 40 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp41",
+                "thermals": [
+                    {
+                        "name": "xSFP module 41 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp42",
+                "thermals": [
+                    {
+                        "name": "xSFP module 42 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp43",
+                "thermals": [
+                    {
+                        "name": "xSFP module 43 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp44",
+                "thermals": [
+                    {
+                        "name": "xSFP module 44 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp45",
+                "thermals": [
+                    {
+                        "name": "xSFP module 45 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp46",
+                "thermals": [
+                    {
+                        "name": "xSFP module 46 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp47",
+                "thermals": [
+                    {
+                        "name": "xSFP module 47 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp48",
+                "thermals": [
+                    {
+                        "name": "xSFP module 48 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp49",
+                "thermals": [
+                    {
+                        "name": "xSFP module 49 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp50",
+                "thermals": [
+                    {
+                        "name": "xSFP module 50 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp51",
+                "thermals": [
+                    {
+                        "name": "xSFP module 51 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp52",
+                "thermals": [
+                    {
+                        "name": "xSFP module 52 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp53",
+                "thermals": [
+                    {
+                        "name": "xSFP module 53 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp54",
+                "thermals": [
+                    {
+                        "name": "xSFP module 54 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp55",
+                "thermals": [
+                    {
+                        "name": "xSFP module 55 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp56",
+                "thermals": [
+                    {
+                        "name": "xSFP module 56 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp57",
+                "thermals": [
+                    {
+                        "name": "xSFP module 57 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp58",
+                "thermals": [
+                    {
+                        "name": "xSFP module 58 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp59",
+                "thermals": [
+                    {
+                        "name": "xSFP module 59 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp60",
+                "thermals": [
+                    {
+                        "name": "xSFP module 60 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp61",
+                "thermals": [
+                    {
+                        "name": "xSFP module 61 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp62",
+                "thermals": [
+                    {
+                        "name": "xSFP module 62 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp63",
+                "thermals": [
+                    {
+                        "name": "xSFP module 63 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp64",
+                "thermals": [
+                    {
+                        "name": "xSFP module 64 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json
new file mode 100644
index 000000000000..7d1c23974bf1
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json
@@ -0,0 +1,410 @@
+{
+    "chassis": {
+        "name": "MSN4410",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            },
+            {
+                "name": "drawer5",
+                "fans": [
+                    {
+                        "name": "fan9"
+                    },
+                    {
+                        "name": "fan10"
+                    }
+                ]
+            },
+            {
+                "name": "drawer6",
+                "fans": [
+                    {
+                        "name": "fan11"
+                    },
+                    {
+                        "name": "fan12"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json
new file mode 100644
index 000000000000..fa31d5509c45
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json
@@ -0,0 +1,624 @@
+{
+    "chassis": {
+        "name": "MSN4600",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp33",
+                "thermals": [
+                    {
+                        "name": "xSFP module 33 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp34",
+                "thermals": [
+                    {
+                        "name": "xSFP module 34 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp35",
+                "thermals": [
+                    {
+                        "name": "xSFP module 35 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp36",
+                "thermals": [
+                    {
+                        "name": "xSFP module 36 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp37",
+                "thermals": [
+                    {
+                        "name": "xSFP module 37 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp38",
+                "thermals": [
+                    {
+                        "name": "xSFP module 38 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp39",
+                "thermals": [
+                    {
+                        "name": "xSFP module 39 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp40",
+                "thermals": [
+                    {
+                        "name": "xSFP module 40 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp41",
+                "thermals": [
+                    {
+                        "name": "xSFP module 41 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp42",
+                "thermals": [
+                    {
+                        "name": "xSFP module 42 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp43",
+                "thermals": [
+                    {
+                        "name": "xSFP module 43 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp44",
+                "thermals": [
+                    {
+                        "name": "xSFP module 44 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp45",
+                "thermals": [
+                    {
+                        "name": "xSFP module 45 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp46",
+                "thermals": [
+                    {
+                        "name": "xSFP module 46 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp47",
+                "thermals": [
+                    {
+                        "name": "xSFP module 47 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp48",
+                "thermals": [
+                    {
+                        "name": "xSFP module 48 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp49",
+                "thermals": [
+                    {
+                        "name": "xSFP module 49 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp50",
+                "thermals": [
+                    {
+                        "name": "xSFP module 50 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp51",
+                "thermals": [
+                    {
+                        "name": "xSFP module 51 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp52",
+                "thermals": [
+                    {
+                        "name": "xSFP module 52 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp53",
+                "thermals": [
+                    {
+                        "name": "xSFP module 53 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp54",
+                "thermals": [
+                    {
+                        "name": "xSFP module 54 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp55",
+                "thermals": [
+                    {
+                        "name": "xSFP module 55 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp56",
+                "thermals": [
+                    {
+                        "name": "xSFP module 56 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp57",
+                "thermals": [
+                    {
+                        "name": "xSFP module 57 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp58",
+                "thermals": [
+                    {
+                        "name": "xSFP module 58 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp59",
+                "thermals": [
+                    {
+                        "name": "xSFP module 59 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp60",
+                "thermals": [
+                    {
+                        "name": "xSFP module 60 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp61",
+                "thermals": [
+                    {
+                        "name": "xSFP module 61 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp62",
+                "thermals": [
+                    {
+                        "name": "xSFP module 62 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp63",
+                "thermals": [
+                    {
+                        "name": "xSFP module 63 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp64",
+                "thermals": [
+                    {
+                        "name": "xSFP module 64 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
new file mode 100644
index 000000000000..3f427dabe4b0
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
@@ -0,0 +1,618 @@
+{
+    "chassis": {
+        "name": "MSN4600C",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp33",
+                "thermals": [
+                    {
+                        "name": "xSFP module 33 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp34",
+                "thermals": [
+                    {
+                        "name": "xSFP module 34 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp35",
+                "thermals": [
+                    {
+                        "name": "xSFP module 35 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp36",
+                "thermals": [
+                    {
+                        "name": "xSFP module 36 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp37",
+                "thermals": [
+                    {
+                        "name": "xSFP module 37 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp38",
+                "thermals": [
+                    {
+                        "name": "xSFP module 38 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp39",
+                "thermals": [
+                    {
+                        "name": "xSFP module 39 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp40",
+                "thermals": [
+                    {
+                        "name": "xSFP module 40 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp41",
+                "thermals": [
+                    {
+                        "name": "xSFP module 41 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp42",
+                "thermals": [
+                    {
+                        "name": "xSFP module 42 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp43",
+                "thermals": [
+                    {
+                        "name": "xSFP module 43 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp44",
+                "thermals": [
+                    {
+                        "name": "xSFP module 44 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp45",
+                "thermals": [
+                    {
+                        "name": "xSFP module 45 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp46",
+                "thermals": [
+                    {
+                        "name": "xSFP module 46 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp47",
+                "thermals": [
+                    {
+                        "name": "xSFP module 47 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp48",
+                "thermals": [
+                    {
+                        "name": "xSFP module 48 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp49",
+                "thermals": [
+                    {
+                        "name": "xSFP module 49 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp50",
+                "thermals": [
+                    {
+                        "name": "xSFP module 50 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp51",
+                "thermals": [
+                    {
+                        "name": "xSFP module 51 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp52",
+                "thermals": [
+                    {
+                        "name": "xSFP module 52 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp53",
+                "thermals": [
+                    {
+                        "name": "xSFP module 53 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp54",
+                "thermals": [
+                    {
+                        "name": "xSFP module 54 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp55",
+                "thermals": [
+                    {
+                        "name": "xSFP module 55 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp56",
+                "thermals": [
+                    {
+                        "name": "xSFP module 56 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp57",
+                "thermals": [
+                    {
+                        "name": "xSFP module 57 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp58",
+                "thermals": [
+                    {
+                        "name": "xSFP module 58 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp59",
+                "thermals": [
+                    {
+                        "name": "xSFP module 59 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp60",
+                "thermals": [
+                    {
+                        "name": "xSFP module 60 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp61",
+                "thermals": [
+                    {
+                        "name": "xSFP module 61 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp62",
+                "thermals": [
+                    {
+                        "name": "xSFP module 62 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp63",
+                "thermals": [
+                    {
+                        "name": "xSFP module 63 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp64",
+                "thermals": [
+                    {
+                        "name": "xSFP module 64 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json
new file mode 100644
index 000000000000..afa6aee14ef0
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json
@@ -0,0 +1,410 @@
+{
+    "chassis": {
+        "name": "MSN4700",
+        "components": [
+            {
+                "name": "ONIE"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "CPLD1"
+            },
+            {
+                "name": "CPLD2"
+            },
+            {
+                "name": "CPLD3"
+            }
+        ],
+        "fans": [],
+        "fan_drawers": [
+            {
+                "name": "drawer1",
+                "fans": [
+                    {
+                        "name": "fan1"
+                    },
+                    {
+                        "name": "fan2"
+                    }
+                ]
+            },
+            {
+                "name": "drawer2",
+                "fans": [
+                    {
+                        "name": "fan3"
+                    },
+                    {
+                        "name": "fan4"
+                    }
+                ]
+            },
+            {
+                "name": "drawer3",
+                "fans": [
+                    {
+                        "name": "fan5"
+                    },
+                    {
+                        "name": "fan6"
+                    }
+                ]
+            },
+            {
+                "name": "drawer4",
+                "fans": [
+                    {
+                        "name": "fan7"
+                    },
+                    {
+                        "name": "fan8"
+                    }
+                ]
+            },
+            {
+                "name": "drawer5",
+                "fans": [
+                    {
+                        "name": "fan9"
+                    },
+                    {
+                        "name": "fan10"
+                    }
+                ]
+            },
+            {
+                "name": "drawer6",
+                "fans": [
+                    {
+                        "name": "fan11"
+                    },
+                    {
+                        "name": "fan12"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1",
+                "fans": [
+                    {
+                        "name": "psu1_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 2",
+                "fans": [
+                    {
+                        "name": "psu2_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "ASIC"
+            },
+            {
+                "name": "Ambient COMEX Temp"
+            },
+            {
+                "name": "Ambient Fan Side Temp"
+            },
+            {
+                "name": "Ambient Port Side Temp"
+            },
+            {
+                "name": "CPU Core 0 Temp"
+            },
+            {
+                "name": "CPU Core 1 Temp"
+            },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Pack Temp"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "sfp1",
+                "thermals": [
+                    {
+                        "name": "xSFP module 1 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp2",
+                "thermals": [
+                    {
+                        "name": "xSFP module 2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp3",
+                "thermals": [
+                    {
+                        "name": "xSFP module 3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp4",
+                "thermals": [
+                    {
+                        "name": "xSFP module 4 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp5",
+                "thermals": [
+                    {
+                        "name": "xSFP module 5 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp6",
+                "thermals": [
+                    {
+                        "name": "xSFP module 6 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp7",
+                "thermals": [
+                    {
+                        "name": "xSFP module 7 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp8",
+                "thermals": [
+                    {
+                        "name": "xSFP module 8 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp9",
+                "thermals": [
+                    {
+                        "name": "xSFP module 9 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp10",
+                "thermals": [
+                    {
+                        "name": "xSFP module 10 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp11",
+                "thermals": [
+                    {
+                        "name": "xSFP module 11 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp12",
+                "thermals": [
+                    {
+                        "name": "xSFP module 12 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp13",
+                "thermals": [
+                    {
+                        "name": "xSFP module 13 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp14",
+                "thermals": [
+                    {
+                        "name": "xSFP module 14 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp15",
+                "thermals": [
+                    {
+                        "name": "xSFP module 15 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp16",
+                "thermals": [
+                    {
+                        "name": "xSFP module 16 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp17",
+                "thermals": [
+                    {
+                        "name": "xSFP module 17 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp18",
+                "thermals": [
+                    {
+                        "name": "xSFP module 18 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp19",
+                "thermals": [
+                    {
+                        "name": "xSFP module 19 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp20",
+                "thermals": [
+                    {
+                        "name": "xSFP module 20 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp21",
+                "thermals": [
+                    {
+                        "name": "xSFP module 21 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp22",
+                "thermals": [
+                    {
+                        "name": "xSFP module 22 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp23",
+                "thermals": [
+                    {
+                        "name": "xSFP module 23 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp24",
+                "thermals": [
+                    {
+                        "name": "xSFP module 24 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp25",
+                "thermals": [
+                    {
+                        "name": "xSFP module 25 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp26",
+                "thermals": [
+                    {
+                        "name": "xSFP module 26 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp27",
+                "thermals": [
+                    {
+                        "name": "xSFP module 27 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp28",
+                "thermals": [
+                    {
+                        "name": "xSFP module 28 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp29",
+                "thermals": [
+                    {
+                        "name": "xSFP module 29 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp30",
+                "thermals": [
+                    {
+                        "name": "xSFP module 30 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp31",
+                "thermals": [
+                    {
+                        "name": "xSFP module 31 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "sfp32",
+                "thermals": [
+                    {
+                        "name": "xSFP module 32 Temp"
+                    }
+                ]
+            }
+        ]
+    },
+    "interfaces": {}
+}

From d634a85e445e6ff843a181ff1f45434a7af32162 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 9 May 2021 22:45:28 +0800
Subject: [PATCH 0441/1674] [ci/build]: Upgrade SONiC package versions (#7567)


From 6e12c40f4015d37e279fb56982ac5c7132bcc476 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Fri, 7 May 2021 01:13:26 +0800
Subject: [PATCH 0442/1674] [Mellanox] Support new sensor conf file for MSN4700
 A1/A0 (#7535)

#### Why I did it

MSN4700 A1/A0 used different sensor chip but keep the existing platform name *x86_64-mlnx_msn4700-r0*, this is a workaround to replace the sensor conf on MSN4700 A1/A0

#### How I did it

Use a shell script to get the sensor conf path and copy that files to /etc/sensors.d/sensors.conf
---
 .../get_sensors_conf_path                     |  21 +++
 .../x86_64-mlnx_msn4700-r0/sensors.conf.a1    | 142 ++++++++++++++++++
 dockers/docker-platform-monitor/Dockerfile.j2 |   8 +-
 .../{docker_init.sh => docker_init.j2}        |   9 +-
 4 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100755 device/mellanox/x86_64-mlnx_msn4700-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf.a1
 rename dockers/docker-platform-monitor/{docker_init.sh => docker_init.j2} (92%)

diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4700-r0/get_sensors_conf_path
new file mode 100755
index 000000000000..c347d7435416
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/get_sensors_conf_path
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+HW_VERSION="/var/run/hw-management/system/config1"
+SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
+SENSORS_CONF_FILE_A1="/usr/share/sonic/platform/sensors.conf.a1"
+
+function get_sensor_conf_path() {
+    local _HW_VERSION="0"
+    if [[ -e $HW_VERSION ]]; then
+        _HW_VERSION=$(cat $HW_VERSION 2>&1)
+        if [[ "$_HW_VERSION" == "1" ]]; then
+            if [[ -e $SENSORS_CONF_FILE_A1 ]]; then
+                echo $SENSORS_CONF_FILE_A1
+                return
+            fi
+        fi
+    fi
+    echo $SENSORS_CONF_FILE
+}
+
+get_sensor_conf_path
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf.a1 b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf.a1
new file mode 100644
index 000000000000..9511fac1278e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf.a1
@@ -0,0 +1,142 @@
+################################################################################
+# Copyright (C) 20xx-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED.
+#
+# Platform specific sensors config for SN4700 A0/A1
+################################################################################
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label power1 "PMIC-1 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-1 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)"
+        label in3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label power1 "PMIC-2 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-2 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)"
+        label curr3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 ASIC 0.85V T0_1 Rail (out)"
+        label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-3 ASIC 0.85V T0_1 Rail Pwr (out)"
+        label curr1 "PMIC-3 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)"
+        label curr3 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 ASIC 0.85V T2_3 Rail (out)"
+        label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label power1 "PMIC-4 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-4 ASIC 0.85V T2_3 Rail Pwr (out)"
+        label curr1 "PMIC-4 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)"
+        label curr3 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
+    chip "mp2975-i2c-*-6e"
+        label in1 "PMIC-5 PSU 12V Rail (in1)"
+        label in2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)"
+        label in3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)"
+        label temp1 "PMIC-5 Temp 1"
+        label power1 "PMIC-5 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Pwr (out)"
+        label power3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Pwr (out)"
+        label curr1 "PMIC-5 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)"
+        label curr3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-8 PSU 12V Rail (in1)"
+        label in2 "PMIC-8 PSU 12V Rail (in2)"
+        label in3 "PMIC-8 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-8 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-8 Temp 1"
+        label temp2 "PMIC-8 Temp 2"
+        label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-9 PSU 12V Rail (in1)"
+        label in2 "PMIC-9 PSU 12V Rail (in2)"
+        label in3 "PMIC-9 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-9 Temp 1"
+        label temp2 "PMIC-9 Temp 2"
+        label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
+        ignore power2 
+        label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
+        ignore curr2 
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1 Tach 1"
+    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan7 "Chassis Fan Drawer-4 Tach 1"
+    label fan8 "Chassis Fan Drawer-4 Tach 2"
+    label fan9 "Chassis Fan Drawer-5 Tach 1"
+    label fan10 "Chassis Fan Drawer-5 Tach 2"
+    label fan11 "Chassis Fan Drawer-6 Tach 1"
+    label fan12 "Chassis Fan Drawer-6 Tach 2"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index e86f4ad0019b..7e8d75680fa8 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -84,10 +84,14 @@ RUN apt-get purge -y           \
            /python-wheels      \
            ~/.cache
 
-COPY ["docker_init.sh", "lm-sensors.sh", "/usr/bin/"]
-COPY ["docker-pmon.supervisord.conf.j2", "/usr/share/sonic/templates/"]
+COPY ["lm-sensors.sh", "/usr/bin/"]
+COPY ["docker-pmon.supervisord.conf.j2", "docker_init.j2", "/usr/share/sonic/templates/"]
 COPY ["ssd_tools/*", "/usr/bin/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 
+RUN sonic-cfggen -a "{\"CONFIGURED_PLATFORM\":\"{{CONFIGURED_PLATFORM}}\"}" -t /usr/share/sonic/templates/docker_init.j2 > /usr/bin/docker_init.sh
+RUN rm -f /usr/share/sonic/templates/docker_init.j2
+RUN chmod 755 /usr/bin/docker_init.sh
+
 ENTRYPOINT ["/usr/bin/docker_init.sh"]
diff --git a/dockers/docker-platform-monitor/docker_init.sh b/dockers/docker-platform-monitor/docker_init.j2
similarity index 92%
rename from dockers/docker-platform-monitor/docker_init.sh
rename to dockers/docker-platform-monitor/docker_init.j2
index 6fc7ffeb5114..1d22e19b239b 100755
--- a/dockers/docker-platform-monitor/docker_init.sh
+++ b/dockers/docker-platform-monitor/docker_init.j2
@@ -78,10 +78,17 @@ else
     SONIC_PLATFORM_API_PYTHON_VERSION=3
 fi
 
+{% if CONFIGURED_PLATFORM == "mellanox" %}
+SENSORS_CONF_PATH_GETTER="/usr/share/sonic/platform/get_sensors_conf_path"
+if [ -e $SENSORS_CONF_PATH_GETTER ]; then
+    SENSORS_CONF_FILE=$($SENSORS_CONF_PATH_GETTER 2>&1)
+fi
+{% endif %}
+
 if [ -e $SENSORS_CONF_FILE ]; then
     HAVE_SENSORS_CONF=1
     mkdir -p /etc/sensors.d
-    /bin/cp -f $SENSORS_CONF_FILE /etc/sensors.d/
+    /bin/cp -f $SENSORS_CONF_FILE /etc/sensors.d/sensors.conf
 fi
 
 if [ -e $FANCONTROL_CONF_FILE ]; then

From 506c0e8e64d01efaceb7e49a63349b8474aa3947 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Mon, 10 May 2021 15:53:43 -0700
Subject: [PATCH 0443/1674] [202012][swss-common/utilities/platform-daemons]
 Update submodule (#7563)

* [202012][swss/swss-common/utilities/platform-daemons] Update submodule

sonic-swss
- [flex-counters] Delay flex counters stats init for faster boot time [202012] (#1736)

sonic-swss-common
- [swig] allow threads (#477)

sonic-utilities
- [sfpshow] Gracefully handle improper 'specification_compliance' field (#1594)

sonic-platform-daemons
- [xcvrd] Change the y_cable presence logic to use "mux_cable" table as identifier from Config DB (#176)
- [xcvrd] Enhance Media Settings (#177)

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 src/sonic-swss-common      | 2 +-
 src/sonic-utilities        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 5f24e3f5577d..6f535dd49f83 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 5f24e3f5577d3970e2095e1b8ab7439facafcec3
+Subproject commit 6f535dd49f83043e085c9616586e27c2002cb207
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 2dd0dd9fe812..fb08c1ff0273 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 2dd0dd9fe812b88b2adce8da36507e557a359ab6
+Subproject commit fb08c1ff0273e37427f131770d3671a5cde3eccf
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 68ea9efccd01..9ad356a34b55 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 68ea9efccd015d208037c29db7f0ca629adb5b9b
+Subproject commit 9ad356a34b55529cd8f46e3f1bce1109e25256d2

From cf36209ae1bd7037e92d815ed102ef412f629e78 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Mon, 10 May 2021 14:40:06 -0700
Subject: [PATCH 0444/1674] DellEMC: Fix Z9332f xcvrd crash (#7544)

---
 .../z9332f/sonic_platform/sfp.py              | 65 ++++++++++++-------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 7934b08626bf..318e9485b88f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -499,7 +499,7 @@ def get_transceiver_info(self):
             transceiver_info_dict['ext_identifier'] = ext_id
             transceiver_info_dict['ext_rateselect_compliance'] = rate_identifier
             transceiver_info_dict['cable_type'] = cable_type
-            transceiver_info_dict['cable_length'] = cable_length
+            transceiver_info_dict['cable_length'] = str(float(cable_length))
             transceiver_info_dict['nominal_bit_rate'] = bit_rate
             transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
 
@@ -643,8 +643,8 @@ def get_transceiver_threshold_info(self):
                 threshold_dict_keys, 'N/A')
 
         try:
+            module_threshold_data = self._get_eeprom_data('ModuleThreshold')
             if self.sfp_type == 'QSFP_DD':
-                module_threshold_data = self._get_eeprom_data('ModuleThreshold')
                 transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
                 transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
                 transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
@@ -666,7 +666,6 @@ def get_transceiver_threshold_info(self):
                 transceiver_dom_threshold_dict['txpowerlowalarm'] = module_threshold_data['data']['TxPowerLowAlarm']['value']
                 transceiver_dom_threshold_dict['txpowerlowwarning'] = module_threshold_data['data']['TxPowerLowWarning']['value']
             elif self.sfp_type == 'QSFP':
-                module_threshold_data = self._get_eeprom_data('ModuleThreshold')
                 transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
                 transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
                 transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
@@ -766,12 +765,15 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['tx7bias'] = tx_bias_list[6]
                 transceiver_dom_dict['tx8bias'] = tx_bias_list[7]
 
-        else:
+        elif self.sfp_type == 'QSFP':
             if tx_bias_list is not None:
                 transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
                 transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
                 transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
                 transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
+        else:
+            if tx_bias_list is not None:
+               transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
 
         if self.sfp_type == 'QSFP_DD':
             if rx_power_list is not None:
@@ -784,12 +786,15 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['rx7power'] = rx_power_list[6]
                 transceiver_dom_dict['rx8power'] = rx_power_list[7]
 
-        else:
+        elif self.sfp_type == 'QSFP':
             if rx_power_list is not None:
                 transceiver_dom_dict['rx1power'] = rx_power_list[0]
                 transceiver_dom_dict['rx2power'] = rx_power_list[1]
                 transceiver_dom_dict['rx3power'] = rx_power_list[2]
                 transceiver_dom_dict['rx4power'] = rx_power_list[3]
+        else:
+            if rx_power_list is not None:
+                transceiver_dom_dict['rx1power'] = rx_power_list[0]
 
         if self.sfp_type == 'QSFP_DD':
             if tx_power_list is not None:
@@ -801,13 +806,15 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['tx6power'] = tx_power_list[5]
                 transceiver_dom_dict['tx7power'] = tx_power_list[6]
                 transceiver_dom_dict['tx8power'] = tx_power_list[7]
-        else:
+        elif self.sfp_type == 'QSFP':
             if tx_power_list is not None:
                 transceiver_dom_dict['tx1power'] = tx_power_list[0]
                 transceiver_dom_dict['tx2power'] = tx_power_list[1]
                 transceiver_dom_dict['tx3power'] = tx_power_list[2]
                 transceiver_dom_dict['tx4power'] = tx_power_list[3]
-
+        else:
+             if tx_power_list is not None:
+                 transceiver_dom_dict['tx1power'] = tx_power_list[0]
         transceiver_dom_dict['rx_los'] = rx_los
         transceiver_dom_dict['tx_fault'] = tx_fault
         transceiver_dom_dict['reset_status'] = reset_state
@@ -932,10 +939,10 @@ def get_tx_fault(self):
         tx_fault_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                tx_fault_list = False
+                tx_fault_list.append(False)
             elif self.sfp_type == 'QSFP':
                 tx_fault_data = self._get_eeprom_data('tx_fault')
-                for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') : 
+                for tx_fault_id in ('Tx1Fault', 'Tx2Fault', 'Tx3Fault', 'Tx4Fault') :
                     tx_fault_list.append(tx_fault_data['data'][tx_fault_id]['value'] == 'On')
             else:
                 tx_fault_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
@@ -1022,7 +1029,7 @@ def get_temperature(self):
         """
         Retrieves the temperature of this SFP
         """
-        temperature = None
+        temperature = 0.0
         try:
             if self.sfp_type == 'QSFP_DD':
                 if self.qsfp_dd_DomInfo is None:
@@ -1032,10 +1039,10 @@ def get_temperature(self):
                     return None
                 temperature_data = self.qsfp_dd_DomInfo.parse_temperature(dom_data_raw, 0)
 
-            elif self.sfp_type == 'QSFP':
+            else:
                 temperature_data = self._get_eeprom_data('Temperature')
-
-            temperature = self._strip_unit_from_str(temperature_data['data']['Temperature']['value'])
+            if temperature_data is not None:
+                temperature = self._strip_unit_from_str(temperature_data['data']['Temperature']['value'])
         except (TypeError, ValueError):
             return None
         return temperature
@@ -1044,7 +1051,7 @@ def get_voltage(self):
         """
         Retrieves the supply voltage of this SFP
         """
-        voltage = None
+        voltage = 0.0
         try:
             if self.sfp_type == 'QSFP_DD':
                 if self.qsfp_dd_DomInfo is None:
@@ -1054,11 +1061,10 @@ def get_voltage(self):
                     return None
                 voltage_data = self.qsfp_dd_DomInfo.parse_voltage(dom_data_raw, 0)
 
-            elif self.sfp_type == 'QSFP':
+            else:
                 voltage_data = self._get_eeprom_data('Voltage')
-
-            voltage = self._strip_unit_from_str(voltage_data['data']['Vcc']['value'])
-
+            if voltage_data is not None:
+                voltage = self._strip_unit_from_str(voltage_data['data']['Vcc']['value'])
         except (TypeError, ValueError):
             return None
         return voltage
@@ -1089,8 +1095,12 @@ def get_tx_bias(self):
                     tx_bias = self._strip_unit_from_str(tx_bias_data['data'][tx_bias_id]['value'])
                     tx_bias_list.append(tx_bias)
             else:
-                tx1_bias = self._strip_unit_from_str(tx_bias_data['data']['TXBias']['value'])
-                tx_bias_list.append(tx1_bias)
+                tx_bias_data = self._get_eeprom_data('ChannelMonitor')
+                if tx_bias_data is not None:
+                    tx1_bias = self._strip_unit_from_str(tx_bias_data['data']['TXBias']['value'])
+                    tx_bias_list.append(tx1_bias)
+                else:
+                    tx_bias_list.append(0.0)
 
         except (TypeError, ValueError):
             return None
@@ -1101,13 +1111,14 @@ def get_rx_power(self):
         Retrieves the received optical power for this SFP
         """
         rx_power_list = []
-        offset = 128
         try:
             if self.sfp_type == 'QSFP_DD':
                 if self.qsfp_dd_DomInfo is None:
                     return None
                 if not self.dom_rx_power_supported:
                     return None
+
+                offset = 128
                 rx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_RXPOWER_OFFSET, QSFP_DD_TXPOWER_WIDTH)
                 rx_power_data = self.qsfp_dd_DomInfo.parse_dom_rx_power(rx_power_data_raw, 0)
 
@@ -1122,7 +1133,11 @@ def get_rx_power(self):
                     rx_power = rx_power_data['data'][rx_power_id]['value']
                     rx_power_list.append(rx_power)
             else:
-                rx1_pw = self._strip_unit_from_str(rx_power_data['data']['RXPower']['value'])
+                rx_power_data = self._get_eeprom_data('ChannelMonitor')
+                if rx_power_data is not None:
+                     rx1_pw = self._strip_unit_from_str(rx_power_data['data']['RXPower']['value'])
+                else:
+                     rx1_pw = 0.0
                 rx_power_list.append(rx1_pw)
         except (TypeError, ValueError):
             return None
@@ -1171,7 +1186,10 @@ def get_tx_power(self):
                     tx_power_list.append(tx_pw)
             else:
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor')
-                tx1_pw = self._strip_unit_from_str(channel_monitor_data['data']['TXPower']['value'])
+                if channel_monitor_data is not None:
+                    tx1_pw = self._strip_unit_from_str(channel_monitor_data['data']['TXPower']['value'])
+                else:
+                    tx1_pw = 0.0
                 tx_power_list.append(tx1_pw)
         except (TypeError, ValueError):
             return None
@@ -1290,7 +1308,6 @@ def get_port_form_factor(self):
     def get_max_port_power(self):
         """
         Retrieves the maximum power allowed on the port in watts
-
         ***
         This method of fetching power values is not ideal.
         TODO: enhance by placing power limits in config file

From 37d4b9525badec37e9fd23fc18759b4aa209d636 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 5 May 2021 06:50:24 -0700
Subject: [PATCH 0445/1674] DellEMC: Z9332f media settings (#7485)

Changed DellEMC Z9932f media settings from Vendor Name + PN method to common method.
---
 .../media_settings.json                       | 7746 +++++++----------
 1 file changed, 2912 insertions(+), 4834 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json
index efd181116976..130427ae99cb 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/media_settings.json
@@ -1,7 +1,7 @@
 {
     "PORT_MEDIA_SETTINGS":{
         "1":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -63,7 +63,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -125,7 +125,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -187,7 +187,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -249,131 +249,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -435,7 +311,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -497,7 +373,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -529,7 +405,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -561,7 +437,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -593,7 +469,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -655,7 +531,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000048",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000048",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -687,7 +595,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -719,7 +627,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -751,7 +659,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -783,7 +691,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -814,10 +722,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "2":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -879,7 +819,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -941,7 +881,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1003,7 +943,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -1065,69 +1005,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1189,7 +1067,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1251,18 +1129,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -1272,91 +1150,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -1377,7 +1193,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -1409,7 +1225,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -1471,7 +1287,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000044",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+			"QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -1503,7 +1351,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -1535,7 +1383,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -1567,7 +1415,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -1599,7 +1447,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -1630,10 +1478,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "3":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1695,7 +1575,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1757,7 +1637,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -1819,7 +1699,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -1881,131 +1761,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2067,7 +1823,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2129,7 +1885,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -2161,7 +1917,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -2193,7 +1949,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -2225,7 +1981,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -2287,7 +2043,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x00000048",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x00000048",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -2319,7 +2107,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -2351,7 +2139,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -2383,7 +2171,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -2415,7 +2203,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -2446,18 +2234,50 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
-            }
-        },
-        "4":{
-            "Amphenol-NDVYYF-0001":{
+            },
+            "QSFP+-*":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
+            }
+        },
+        "4":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
+                "main":{
+                    "lane0": "0x00000088",
+                    "lane1": "0x00000088",
+                    "lane2": "0x0000008c",
+                    "lane3": "0x00000088",
+                    "lane4": "0x00000088",
+                    "lane5": "0x00000088",
+                    "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
                 "post1":{
@@ -2511,7 +2331,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2573,7 +2393,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2635,7 +2455,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -2697,131 +2517,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2883,7 +2579,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -2945,7 +2641,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -2977,7 +2673,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3009,7 +2705,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3041,7 +2737,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3103,7 +2799,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000036",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000036",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },		
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -3135,7 +2863,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -3167,7 +2895,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -3199,7 +2927,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -3231,7 +2959,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -3262,10 +2990,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "5":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -3327,7 +3087,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -3389,7 +3149,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -3451,7 +3211,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -3513,69 +3273,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -3637,7 +3335,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -3699,80 +3397,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -3793,7 +3429,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3825,7 +3461,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3857,7 +3493,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -3919,7 +3555,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x00000040",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x00000040",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x00000040",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff6",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff6",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -3951,7 +3619,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -3983,7 +3651,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -4015,7 +3683,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -4047,7 +3715,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -4078,10 +3746,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "6":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4143,7 +3843,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4205,7 +3905,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4267,7 +3967,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -4329,131 +4029,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4515,7 +4091,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4577,7 +4153,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -4609,7 +4185,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -4641,7 +4217,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -4673,7 +4249,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -4735,7 +4311,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000036",
+                    "lane1": "0x00000044",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000036",
+                    "lane5": "0x00000044",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff6",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff6",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -4767,7 +4375,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -4799,7 +4407,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -4831,7 +4439,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -4863,7 +4471,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -4894,10 +4502,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "7":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -4959,7 +4599,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5021,7 +4661,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5083,7 +4723,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -5145,18 +4785,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -5166,7 +4806,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post2":{
+                "post3":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -5176,7 +4816,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
+                "pre2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -5185,140 +4825,16 @@
                     "lane5": "0x00000000",
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
                 },
                 "pre1":{
                     "lane0": "0xfffffff0",
@@ -5331,7 +4847,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5393,7 +4909,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -5425,7 +4941,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -5457,7 +4973,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -5489,7 +5005,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -5551,7 +5067,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x00000038",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x00000038"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff6",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff6",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -5583,7 +5131,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -5615,7 +5163,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -5647,7 +5195,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -5679,7 +5227,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -5710,10 +5258,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "8":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5775,7 +5355,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5837,7 +5417,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -5899,7 +5479,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -5961,69 +5541,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6085,7 +5603,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6147,80 +5665,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -6241,7 +5697,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -6273,7 +5729,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -6305,7 +5761,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -6367,7 +5823,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000036",
+                    "lane1": "0x00000042",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x00000036",
+                    "lane5": "0x00000042",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -6399,7 +5887,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -6431,7 +5919,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -6463,7 +5951,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -6495,7 +5983,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -6526,10 +6014,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
         "9":{
-            "Amphenol-NDVYYF-0001":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6591,7 +6111,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6653,7 +6173,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6715,7 +6235,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -6777,131 +6297,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -6963,7 +6359,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -7025,7 +6421,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7057,7 +6453,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7089,7 +6485,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7121,7 +6517,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7183,7 +6579,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000048",
+                    "lane2": "0x00000040",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000048",
+                    "lane6": "0x00000040",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -7215,7 +6643,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -7247,7 +6675,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -7279,7 +6707,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -7311,7 +6739,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -7342,10 +6770,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "10":{
-            "Amphenol-NDVYYF-0001":{
+       "10":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -7407,7 +6867,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -7469,7 +6929,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -7531,7 +6991,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -7593,18 +7053,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -7614,7 +7074,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post2":{
+                "post3":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -7624,7 +7084,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
+                "pre2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -7634,139 +7094,15 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
                 },
                 "pre1":{
                     "lane0": "0xfffffff0",
@@ -7779,7 +7115,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -7841,7 +7177,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7873,7 +7209,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7905,7 +7241,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7937,7 +7273,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -7999,7 +7335,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -8031,7 +7399,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -8063,7 +7431,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -8095,7 +7463,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -8127,7 +7495,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -8158,10 +7526,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "11":{
-            "Amphenol-NDVYYF-0001":{
+       "11":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -8223,7 +7623,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -8285,7 +7685,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -8347,7 +7747,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -8409,69 +7809,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -8533,7 +7871,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -8595,18 +7933,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -8616,91 +7954,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -8721,7 +7997,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -8753,7 +8029,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -8815,7 +8091,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -8847,7 +8155,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -8879,7 +8187,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -8911,7 +8219,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -8943,7 +8251,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -8974,10 +8282,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "12":{
-            "Amphenol-NDVYYF-0001":{
+       "12":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9039,7 +8379,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9101,7 +8441,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9163,7 +8503,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -9225,131 +8565,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9411,7 +8627,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9473,7 +8689,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -9505,7 +8721,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -9537,7 +8753,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -9569,7 +8785,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -9631,7 +8847,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000044",
+                    "lane2": "0x0000003a",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000044",
+                    "lane6": "0x0000003a",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -9663,7 +8911,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -9695,7 +8943,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -9727,7 +8975,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -9759,7 +9007,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -9790,10 +9038,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "13":{
-            "Amphenol-NDVYYF-0001":{
+       "13":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9855,7 +9135,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9917,7 +9197,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -9979,7 +9259,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -10041,18 +9321,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -10062,7 +9342,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post2":{
+                "post3":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -10072,131 +9352,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
+                "pre2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -10227,7 +9383,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -10289,7 +9445,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -10321,7 +9477,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -10353,7 +9509,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -10385,7 +9541,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -10447,7 +9603,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003c",
+                    "lane1": "0x0000003a",
+                    "lane2": "0x00000036",
+                    "lane3": "0x0000003a",
+                    "lane4": "0x0000003c",
+                    "lane5": "0x0000003a",
+                    "lane6": "0x00000036",
+                    "lane7": "0x0000003a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff6",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff6",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -10479,7 +9667,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -10511,7 +9699,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -10543,7 +9731,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -10575,7 +9763,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -10606,10 +9794,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "14":{
-            "Amphenol-NDVYYF-0001":{
+       "14":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -10671,7 +9891,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -10733,7 +9953,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -10795,7 +10015,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -10857,69 +10077,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -10981,7 +10139,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11043,18 +10201,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -11064,91 +10222,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -11169,7 +10265,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -11201,7 +10297,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -11263,7 +10359,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000032",
+                    "lane1": "0x00000040",
+                    "lane2": "0x00000034",
+                    "lane3": "0x00000032",
+                    "lane4": "0x00000032",
+                    "lane5": "0x00000040",
+                    "lane6": "0x00000034",
+                    "lane7": "0x00000032"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -11295,7 +10423,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -11327,7 +10455,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -11359,7 +10487,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -11391,7 +10519,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -11422,10 +10550,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "15":{
-            "Amphenol-NDVYYF-0001":{
+       "15":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11487,7 +10647,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11549,7 +10709,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11611,7 +10771,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -11673,131 +10833,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11859,7 +10895,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -11921,7 +10957,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -11953,7 +10989,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -11985,7 +11021,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12017,7 +11053,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12079,7 +11115,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000032",
+                    "lane1": "0x00000034",
+                    "lane2": "0x00000030",
+                    "lane3": "0x00000032",
+                    "lane4": "0x00000032",
+                    "lane5": "0x00000034",
+                    "lane6": "0x00000030",
+                    "lane7": "0x00000032"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -12111,7 +11179,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -12143,7 +11211,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -12175,7 +11243,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -12207,7 +11275,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -12238,10 +11306,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "16":{
-            "Amphenol-NDVYYF-0001":{
+       "16":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -12303,7 +11403,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -12365,7 +11465,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -12427,7 +11527,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -12489,18 +11589,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -12510,7 +11610,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post2":{
+                "post3":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -12520,131 +11620,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
+                "pre2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -12675,7 +11651,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -12737,7 +11713,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12769,7 +11745,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12801,7 +11777,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12833,7 +11809,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -12895,7 +11871,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000030",
+                    "lane1": "0x00000032",
+                    "lane2": "0x0000002c",
+                    "lane3": "0x0000002c",
+                    "lane4": "0x00000030",
+                    "lane5": "0x00000032",
+                    "lane6": "0x0000002c",
+                    "lane7": "0x0000002c"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -12927,7 +11935,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -12959,7 +11967,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -12991,7 +11999,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -13023,7 +12031,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -13054,10 +12062,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "17":{
-            "Amphenol-NDVYYF-0001":{
+       "17":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13119,7 +12159,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13181,7 +12221,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13243,7 +12283,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -13305,69 +12345,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13429,7 +12407,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13491,18 +12469,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -13512,91 +12490,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -13617,7 +12533,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -13649,7 +12565,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -13711,7 +12627,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000036",
+                    "lane1": "0x00000032",
+                    "lane2": "0x00000030",
+                    "lane3": "0x00000030",
+                    "lane4": "0x00000036",
+                    "lane5": "0x00000032",
+                    "lane6": "0x00000030",
+                    "lane7": "0x00000030"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -13743,7 +12691,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -13775,7 +12723,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -13807,7 +12755,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -13839,7 +12787,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -13870,10 +12818,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "18":{
-            "Amphenol-NDVYYF-0001":{
+       "18":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13935,7 +12915,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -13997,7 +12977,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14059,7 +13039,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -14121,131 +13101,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14307,7 +13163,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14369,7 +13225,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -14401,7 +13257,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -14433,7 +13289,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -14465,7 +13321,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -14527,7 +13383,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000030",
+                    "lane1": "0x00000036",
+                    "lane2": "0x00000032",
+                    "lane3": "0x00000032",
+                    "lane4": "0x00000030",
+                    "lane5": "0x00000036",
+                    "lane6": "0x00000032",
+                    "lane7": "0x00000032"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -14559,7 +13447,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -14591,7 +13479,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -14623,7 +13511,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -14655,7 +13543,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -14686,10 +13574,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "19":{
-            "Amphenol-NDVYYF-0001":{
+       "19":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14751,7 +13671,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14813,7 +13733,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -14875,7 +13795,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -14937,18 +13857,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -14958,7 +13878,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post2":{
+                "post3":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -14968,7 +13888,7 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
+                "pre2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -14977,140 +13897,16 @@
                     "lane5": "0x00000000",
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
                 },
                 "pre1":{
                     "lane0": "0xfffffff0",
@@ -15123,7 +13919,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15185,7 +13981,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -15217,7 +14013,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -15249,7 +14045,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -15281,7 +14077,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -15343,7 +14139,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000036",
+                    "lane1": "0x00000038",
+                    "lane2": "0x00000032",
+                    "lane3": "0x00000032",
+                    "lane4": "0x00000036",
+                    "lane5": "0x00000038",
+                    "lane6": "0x00000032",
+                    "lane7": "0x00000032"
+                },
+                "post1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -15375,7 +14203,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -15407,7 +14235,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -15439,7 +14267,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -15471,7 +14299,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -15502,10 +14330,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "20":{
-            "Amphenol-NDVYYF-0001":{
+       "20":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15567,7 +14427,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15629,7 +14489,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15691,7 +14551,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -15753,69 +14613,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15877,7 +14675,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -15939,18 +14737,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -15960,91 +14758,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -16065,7 +14801,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16097,7 +14833,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16159,7 +14895,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003a",
+                    "lane1": "0x0000003a",
+                    "lane2": "0x00000034",
+                    "lane3": "0x00000036",
+                    "lane4": "0x0000003a",
+                    "lane5": "0x0000003a",
+                    "lane6": "0x00000034",
+                    "lane7": "0x00000036"
+                },
+                "post1":{
+                    "lane0": "0xfffffff6",
+                    "lane1": "0xfffffff6",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffff6",
+                    "lane5": "0xfffffff6",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffffc"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -16191,7 +14959,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -16223,7 +14991,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -16255,7 +15023,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -16287,7 +15055,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -16318,10 +15086,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff8",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff8",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0x00000000",
+                    "lane1": "0x00000000",
+                    "lane2": "0x00000000",
+                    "lane3": "0x00000000",
+                    "lane4": "0x00000000",
+                    "lane5": "0x00000000",
+                    "lane6": "0x00000000",
+                    "lane7": "0x00000000"
+                }
             }
         },
-        "21":{
-            "Amphenol-NDVYYF-0001":{
+       "21":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -16383,7 +15183,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -16445,7 +15245,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -16507,7 +15307,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -16569,131 +15369,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -16755,7 +15431,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -16817,7 +15493,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16849,7 +15525,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16881,7 +15557,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16913,7 +15589,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -16975,7 +15651,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000048",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000048",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -17007,7 +15715,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -17039,7 +15747,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -17071,7 +15779,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -17103,7 +15811,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -17134,10 +15842,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "22":{
-            "Amphenol-NDVYYF-0001":{
+       "22":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -17199,7 +15939,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -17261,7 +16001,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -17323,7 +16063,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -17385,135 +16125,11 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
@@ -17571,7 +16187,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -17633,7 +16249,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -17665,7 +16281,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -17697,7 +16313,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -17729,7 +16345,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -17791,7 +16407,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000042",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000042",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -17823,7 +16471,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -17855,7 +16503,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -17887,7 +16535,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -17919,7 +16567,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -17950,10 +16598,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "23":{
-            "Amphenol-NDVYYF-0001":{
+       "23":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18015,7 +16695,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18077,7 +16757,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18139,7 +16819,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -18201,69 +16881,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18325,7 +16943,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18387,18 +17005,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -18408,91 +17026,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -18513,7 +17069,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -18545,7 +17101,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -18607,7 +17163,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000048",
+                    "lane1": "0x00000042",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000048",
+                    "lane5": "0x00000042",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xfffffff6",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xfffffff6",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -18639,7 +17227,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -18671,7 +17259,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -18703,7 +17291,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -18735,7 +17323,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -18766,10 +17354,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "24":{
-            "Amphenol-NDVYYF-0001":{
+       "24":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18831,7 +17451,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18893,7 +17513,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -18955,7 +17575,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -19017,131 +17637,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -19203,7 +17699,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -19265,7 +17761,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -19297,7 +17793,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -19329,7 +17825,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -19361,7 +17857,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -19423,7 +17919,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000048",
+                    "lane2": "0x00000040",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000048",
+                    "lane6": "0x00000040",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -19455,7 +17983,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -19487,7 +18015,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -19519,7 +18047,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -19551,7 +18079,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -19582,10 +18110,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "25":{
-            "Amphenol-NDVYYF-0001":{
+       "25":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -19647,7 +18207,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -19709,7 +18269,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -19771,7 +18331,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -19833,135 +18393,11 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
@@ -20019,7 +18455,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20081,7 +18517,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -20113,7 +18549,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -20145,7 +18581,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -20177,7 +18613,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -20239,7 +18675,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000042",
+                    "lane1": "0x0000003c",
+                    "lane2": "0x00000042",
+                    "lane3": "0x0000003a",
+                    "lane4": "0x00000042",
+                    "lane5": "0x0000003c",
+                    "lane6": "0x00000042",
+                    "lane7": "0x0000003a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -20271,7 +18739,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -20303,7 +18771,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -20335,7 +18803,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -20367,7 +18835,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -20398,10 +18866,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "26":{
-            "Amphenol-NDVYYF-0001":{
+       "26":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20463,7 +18963,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20525,7 +19025,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20587,7 +19087,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -20649,69 +19149,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20773,7 +19211,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -20835,18 +19273,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -20856,91 +19294,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -20961,7 +19337,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -20993,7 +19369,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -21055,7 +19431,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000042",
+                    "lane2": "0x00000038",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000042",
+                    "lane6": "0x00000038",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff6",
+                    "lane2": "0xfffffff6",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff6",
+                    "lane6": "0xfffffff6",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -21087,7 +19495,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -21119,7 +19527,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -21151,7 +19559,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -21183,7 +19591,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -21214,10 +19622,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "27":{
-            "Amphenol-NDVYYF-0001":{
+       "27":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -21279,7 +19719,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -21341,7 +19781,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -21403,7 +19843,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -21465,131 +19905,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -21651,7 +19967,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -21713,7 +20029,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -21745,7 +20061,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -21777,7 +20093,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -21809,7 +20125,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -21871,7 +20187,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000040",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000040",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff0",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff0",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -21903,7 +20251,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -21935,7 +20283,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -21967,7 +20315,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -21999,7 +20347,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -22030,10 +20378,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "28":{
-            "Amphenol-NDVYYF-0001":{
+       "28":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22095,7 +20475,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22157,7 +20537,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22219,7 +20599,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -22281,142 +20661,18 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
+                    "lane2": "0x00000088",
                     "lane3": "0x00000088",
                     "lane4": "0x00000088",
                     "lane5": "0x00000088",
                     "lane6": "0x00000088",
                     "lane7": "0x00000088"
                 },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
+                "post2":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -22467,7 +20723,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22529,7 +20785,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -22561,7 +20817,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -22593,7 +20849,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -22625,7 +20881,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -22687,7 +20943,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x0000003e",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000040",
+                    "lane3": "0x0000003c",
+                    "lane4": "0x0000003e",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000040",
+                    "lane7": "0x0000003c"
+                },
+                "post1":{
+                    "lane0": "0xfffffff6",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff8",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff6",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff8",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -22719,7 +21007,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -22751,7 +21039,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -22783,7 +21071,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -22815,7 +21103,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -22846,10 +21134,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "29":{
-            "Amphenol-NDVYYF-0001":{
+       "29":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22911,7 +21231,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -22973,7 +21293,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23035,7 +21355,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -23097,69 +21417,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23221,7 +21479,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23283,18 +21541,18 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
                 },
-                "post2":{
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -23304,91 +21562,29 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffec",
-                    "lane1": "0xffffffec",
-                    "lane2": "0xffffffec",
-                    "lane3": "0xffffffec",
-                    "lane4": "0xffffffec",
-                    "lane5": "0xffffffec",
-                    "lane6": "0xffffffec",
-                    "lane7": "0xffffffec"
-                }
-            },
-            "QSFP28-40GBASE-CR4-2M":{              
-                "main":{
-                    "lane0": "0x00000069",
-                    "lane1": "0x00000069",
-                    "lane2": "0x00000069",
-                    "lane3": "0x00000069",
-                    "lane4": "0x00000069",
-                    "lane5": "0x00000069",
-                    "lane6": "0x00000069",
-                    "lane7": "0x00000069"
-                },
-                "post1":{
+                "pre1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xffffffec",
+                    "lane3": "0xffffffec",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xffffffec",
+                    "lane7": "0xffffffec"
+                }
+            },
+            "QSFP28-40GBASE-CR4-2.0M":{
+                "main":{
+                    "lane0": "0x00000069",
+                    "lane1": "0x00000069",
+                    "lane2": "0x00000069",
+                    "lane3": "0x00000069",
+                    "lane4": "0x00000069",
+                    "lane5": "0x00000069",
+                    "lane6": "0x00000069",
+                    "lane7": "0x00000069"
+                },
+                "post1":{
                     "lane0": "0x00000000",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
@@ -23409,7 +21605,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -23441,7 +21637,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -23503,7 +21699,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000044",
+                    "lane1": "0x00000040",
+                    "lane2": "0x0000003c",
+                    "lane3": "0x00000040",
+                    "lane4": "0x00000044",
+                    "lane5": "0x00000040",
+                    "lane6": "0x0000003c",
+                    "lane7": "0x00000040"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xfffffff8",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff8",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xfffffff8",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff8"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -23535,7 +21763,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -23567,7 +21795,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -23599,7 +21827,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -23631,7 +21859,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -23662,10 +21890,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "30":{
-            "Amphenol-NDVYYF-0001":{
+       "30":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23727,7 +21987,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23789,7 +22049,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -23851,7 +22111,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -23913,69 +22173,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24037,7 +22235,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24099,69 +22297,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -24193,7 +22329,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -24225,7 +22361,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -24257,7 +22393,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -24319,7 +22455,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x00000044",
+                    "lane2": "0x00000040",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000040",
+                    "lane5": "0x00000044",
+                    "lane6": "0x00000040",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -24351,7 +22519,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -24383,7 +22551,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -24415,7 +22583,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -24447,7 +22615,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -24478,72 +22646,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
-            }
-        },
-        "31":{
-            "Amphenol-NDVYYF-0001":{
+            },
+            "QSFP+-*":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000046",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000046",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000046",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000046",
+                    "lane7": "0x00000046"
                 },
                 "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
+                    "lane0": "0xfffffff4",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff4",
+                    "lane4": "0xfffffff4",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff4"
                 },
                 "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
                 }
-            },
-            "Amphenol-NDVYYF-0003":{               
+            }
+        },
+       "31":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24605,7 +22743,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24648,88 +22786,26 @@
                 },
                 "pre1":{
                     "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "Amphenol-NDVYYF-0002":{               
-                "main":{
-                    "lane0": "0x00000070",
-                    "lane1": "0x0000008c",
-                    "lane2": "0x00000080",
-                    "lane3": "0x00000070",
-                    "lane4": "0x00000070",
-                    "lane5": "0x00000070",
-                    "lane6": "0x00000070",
-                    "lane7": "0x00000084"
-                },
-                "post1":{
-                    "lane0": "0xffffffe8",
-                    "lane1": "0xfffffffc",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xffffffe8",
-                    "lane4": "0xffffffe8",
-                    "lane5": "0xffffffe8",
-                    "lane6": "0xffffffe8",
-                    "lane7": "0xfffffff4"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe8",
-                    "lane2": "0xffffffe8",
+                    "lane1": "0xffffffe4",
+                    "lane2": "0xffffffe4",
                     "lane3": "0xffffffe4",
                     "lane4": "0xffffffe4",
                     "lane5": "0xffffffe4",
                     "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe8"
+                    "lane7": "0xffffffe4"
                 },
                 "pre2":{
-                    "lane0": "0x00000004",
-                    "lane1": "0x00000000",
+                    "lane0": "0x00000002",
+                    "lane1": "0x00000004",
                     "lane2": "0x00000000",
                     "lane3": "0x00000004",
                     "lane4": "0x00000004",
                     "lane5": "0x00000004",
                     "lane6": "0x00000004",
-                    "lane7": "0x00000000"
+                    "lane7": "0x00000004"
                 }
             },
-            "Molex-2170601001":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24791,16 +22867,26 @@
                     "lane7": "0x00000004"
                 }
             },
-            "ONET-1AT-5QAM10XX-10A":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
+                    "lane0": "0x00000070",
+                    "lane1": "0x0000008c",
+                    "lane2": "0x00000080",
+                    "lane3": "0x00000070",
+                    "lane4": "0x00000070",
+                    "lane5": "0x00000070",
+                    "lane6": "0x00000070",
+                    "lane7": "0x00000084"
+                },
+                "post1":{
+                    "lane0": "0xffffffe8",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xffffffe8",
+                    "lane4": "0xffffffe8",
+                    "lane5": "0xffffffe8",
+                    "lane6": "0xffffffe8",
+                    "lane7": "0xfffffff4"
                 },
                 "post2":{
                     "lane0": "0x00000000",
@@ -24822,38 +22908,28 @@
                     "lane6": "0x00000000",
                     "lane7": "0x00000000"
                 },
+                "pre1":{
+                    "lane0": "0xffffffe4",
+                    "lane1": "0xffffffe8",
+                    "lane2": "0xffffffe8",
+                    "lane3": "0xffffffe4",
+                    "lane4": "0xffffffe4",
+                    "lane5": "0xffffffe4",
+                    "lane6": "0xffffffe4",
+                    "lane7": "0xffffffe8"
+                },
                 "pre2":{
-                    "lane0": "0x00000000",
+                    "lane0": "0x00000004",
                     "lane1": "0x00000000",
                     "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
+                    "lane3": "0x00000004",
+                    "lane4": "0x00000004",
+                    "lane5": "0x00000004",
+                    "lane6": "0x00000004",
                     "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24915,7 +22991,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -24977,7 +23053,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25009,7 +23085,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25041,7 +23117,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25073,7 +23149,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25135,7 +23211,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000048",
+                    "lane1": "0x00000046",
+                    "lane2": "0x00000040",
+                    "lane3": "0x00000044",
+                    "lane4": "0x00000048",
+                    "lane5": "0x00000046",
+                    "lane6": "0x00000040",
+                    "lane7": "0x00000044"
+                },
+                "post1":{
+                    "lane0": "0xffffffec",
+                    "lane1": "0xfffffff4",
+                    "lane2": "0xfffffff0",
+                    "lane3": "0xfffffff6",
+                    "lane4": "0xffffffec",
+                    "lane5": "0xfffffff4",
+                    "lane6": "0xfffffff0",
+                    "lane7": "0xfffffff6"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -25167,7 +23275,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -25199,7 +23307,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -25231,7 +23339,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -25263,7 +23371,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -25294,10 +23402,42 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP+-*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         },
-        "32":{
-            "Amphenol-NDVYYF-0001":{
+       "32":{
+            "QSFP-DD-passive_copper_media_interface-1.0M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -25359,7 +23499,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0003":{               
+            "QSFP-DD-passive_copper_media_interface-1.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -25421,7 +23561,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0004":{               
+            "QSFP-DD-passive_copper_media_interface-0.5M":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -25483,7 +23623,7 @@
                     "lane7": "0x00000004"
                 }
             },
-            "Amphenol-NDVYYF-0002":{               
+            "QSFP-DD-passive_copper_media_interface-2.0M":{
                 "main":{
                     "lane0": "0x00000070",
                     "lane1": "0x0000008c",
@@ -25545,131 +23685,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "Molex-2170601001":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x0000008c",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post1":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre1":{
-                    "lane0": "0xffffffe4",
-                    "lane1": "0xffffffe4",
-                    "lane2": "0xffffffe4",
-                    "lane3": "0xffffffe4",
-                    "lane4": "0xffffffe4",
-                    "lane5": "0xffffffe4",
-                    "lane6": "0xffffffe4",
-                    "lane7": "0xffffffe4"
-                },
-                "pre2":{
-                    "lane0": "0x00000002",
-                    "lane1": "0x00000004",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000004",
-                    "lane4": "0x00000004",
-                    "lane5": "0x00000004",
-                    "lane6": "0x00000004",
-                    "lane7": "0x00000004"
-                }
-            },
-            "ONET-1AT-5QAM10XX-10A":{               
-                "main":{
-                    "lane0": "0x00000088",
-                    "lane1": "0x00000088",
-                    "lane2": "0x00000088",
-                    "lane3": "0x00000088",
-                    "lane4": "0x00000088",
-                    "lane5": "0x00000088",
-                    "lane6": "0x00000088",
-                    "lane7": "0x00000088"
-                },
-                "post2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post3":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "pre2":{
-                    "lane0": "0x00000000",
-                    "lane1": "0x00000000",
-                    "lane2": "0x00000000",
-                    "lane3": "0x00000000",
-                    "lane4": "0x00000000",
-                    "lane5": "0x00000000",
-                    "lane6": "0x00000000",
-                    "lane7": "0x00000000"
-                },
-                "post1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                },
-                "pre1":{
-                    "lane0": "0xfffffff0",
-                    "lane1": "0xfffffff0",
-                    "lane2": "0xfffffff0",
-                    "lane3": "0xfffffff0",
-                    "lane4": "0xfffffff0",
-                    "lane5": "0xfffffff0",
-                    "lane6": "0xfffffff0",
-                    "lane7": "0xfffffff0"
-                }
-            },
-            "ONET-1AT-5QAM15XX-10A":{               
+			"QSFP-DD-sm_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -25731,7 +23747,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "ONET-1AT-5QAM20XX-10A":{               
+            "QSFP-DD-active_cable_media_interface":{
                 "main":{
                     "lane0": "0x00000088",
                     "lane1": "0x00000088",
@@ -25793,7 +23809,7 @@
                     "lane7": "0xfffffff0"
                 }
             },
-            "QSFP28-40GBASE-CR4-1M":{               
+            "QSFP28-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25825,7 +23841,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-2M":{              
+            "QSFP28-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25857,7 +23873,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-3M":{             
+            "QSFP28-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25889,7 +23905,7 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP28-40GBASE-CR4-5M":{              
+            "QSFP28-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000069",
                     "lane1": "0x00000069",
@@ -25951,7 +23967,39 @@
                     "lane7": "0xffffffec"
                 }
             },
-            "QSFP+-40GBASE-CR4-1M":{          
+            "QSFP28-*":{
+                "main":{
+                    "lane0": "0x00000040",
+                    "lane1": "0x0000004e",
+                    "lane2": "0x00000044",
+                    "lane3": "0x00000046",
+                    "lane4": "0x00000040",
+                    "lane5": "0x0000004e",
+                    "lane6": "0x00000044",
+                    "lane7": "0x00000046"
+                },
+                "post1":{
+                    "lane0": "0xfffffff0",
+                    "lane1": "0xffffffec",
+                    "lane2": "0xfffffff4",
+                    "lane3": "0xfffffff0",
+                    "lane4": "0xfffffff0",
+                    "lane5": "0xffffffec",
+                    "lane6": "0xfffffff4",
+                    "lane7": "0xfffffff0"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffc",
+                    "lane1": "0xfffffffc",
+                    "lane2": "0xfffffffc",
+                    "lane3": "0xfffffffc",
+                    "lane4": "0xfffffffc",
+                    "lane5": "0xfffffffc",
+                    "lane6": "0xfffffffc",
+                    "lane7": "0xfffffffc"
+                }
+            },
+            "QSFP+-40GBASE-CR4-1.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -25983,7 +24031,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-2M":{         
+            "QSFP+-40GBASE-CR4-2.0M":{
                 "main":{
                     "lane0": "0x0000001e",
                     "lane1": "0x0000001e",
@@ -26015,7 +24063,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-3M":{        
+            "QSFP+-40GBASE-CR4-3.0M":{
                 "main":{
                     "lane0": "0x0000003c",
                     "lane1": "0x0000003c",
@@ -26047,7 +24095,7 @@
                     "lane7": "0x00000000"
                 }
             },
-            "QSFP+-40GBASE-CR4-5M":{                
+            "QSFP+-40GBASE-CR4-5.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -26079,7 +24127,7 @@
                     "lane7": "0xfffffffa"
                 }
             },
-            "QSFP+-40GBASE-CR4-7M":{               
+            "QSFP+-40GBASE-CR4-7.0M":{
                 "main":{
                     "lane0": "0x00000057",
                     "lane1": "0x00000057",
@@ -26110,9 +24158,39 @@
                     "lane6": "0xfffffffa",
                     "lane7": "0xfffffffa"
                 }
+            },
+            "QSFP-+*":{
+                "main":{
+                    "lane0": "0x0000004a",
+                    "lane1": "0x0000004a",
+                    "lane2": "0x0000004a",
+                    "lane3": "0x0000004a",
+                    "lane4": "0x0000004a",
+                    "lane5": "0x0000004a",
+                    "lane6": "0x0000004a",
+                    "lane7": "0x0000004a"
+                },
+                "post1":{
+                    "lane0": "0xfffffff2",
+                    "lane1": "0xfffffff2",
+                    "lane2": "0xfffffff2",
+                    "lane3": "0xfffffff2",
+                    "lane4": "0xfffffff2",
+                    "lane5": "0xfffffff2",
+                    "lane6": "0xfffffff2",
+                    "lane7": "0xfffffff2"
+                },
+                "pre1":{
+                    "lane0": "0xfffffffe",
+                    "lane1": "0xfffffffe",
+                    "lane2": "0xfffffffe",
+                    "lane3": "0xfffffffe",
+                    "lane4": "0xfffffffe",
+                    "lane5": "0xfffffffe",
+                    "lane6": "0xfffffffe",
+                    "lane7": "0xfffffffe"
+                }
             }
         }
     }
 }
-
-

From 446f9ed27489db3ee57d7984b14993e79adfa52e Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Sun, 18 Apr 2021 08:00:28 +0200
Subject: [PATCH 0446/1674] [build] Extend rules/config.user to more Makefiles
 (#7344)

rules/config.user allows overriding default properties without
touching tracked files. This change makes sure all properties
can be set and not just the ones used in slave.mk.

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 Makefile.work | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.work b/Makefile.work
index d844d716af59..3d9968f3bb18 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -100,6 +100,7 @@ SLAVE_DIR = sonic-slave-jessie
 endif
 
 include rules/config
+-include rules/config.user
 
 ifeq ($(ENABLE_DOCKER_BASE_PULL),)
 	override ENABLE_DOCKER_BASE_PULL = n

From 61bb5c168cf5072b90d3d6f346899b48d1494662 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 30 Apr 2021 13:04:15 -0700
Subject: [PATCH 0447/1674] [makefile] define a do-nothing target for
 config.user (#7483)

Why I did it
After PR #7344, 'make init' and/or 'make reset' will also build sonic slave dockers.

'-include rules/config.user' is supposed to be fine when the file is missing. However, when the file is missing, it generates a delayed error which later causes make init and make reset trying to build the sonic slave dockers.

How I did it
Define a do-nothing target for config.user to catch config.user build therefore preventing other builds to be triggered unexpectedly.

How to verify it
did make init and it is now only doing submodule init.
---
 Makefile.work | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.work b/Makefile.work
index 3d9968f3bb18..1835c8a65651 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -99,6 +99,11 @@ else
 SLAVE_DIR = sonic-slave-jessie
 endif
 
+# Define a do-nothing target for rules/config.user so that when
+# the file is missing, make won't try to rebuld everything.
+rules/config.user:
+	@echo -n ""
+
 include rules/config
 -include rules/config.user
 

From e4a9e0c1b6ae8fe123fa898257c63e16dacbcc1b Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 29 Apr 2021 11:07:04 -0700
Subject: [PATCH 0448/1674] [caclmgrd] Remove sleep which allowed threads to
 progress (#7475)

Previously, a brief sleep was necessary in order to get Python threads to progress. The root cause of this has since been found and fixed in sonic-swss-common: Azure/sonic-swss-common#477. The submodule was updated here, so we can now safely remove this sleep.

This PR should also be cherry-picked to the 202012 branch once the submodule is updated there to also include the fix.
---
 src/sonic-host-services/scripts/caclmgrd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index e029066a6e47..db2eeeba5c28 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -602,11 +602,6 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         while True:
             ctrl_plane_acl_notification = set()
 
-            # A brief sleep appears necessary in this loop or any spawned
-            # update threads will get stuck. Appears to be due to the sel.select() call.
-            # TODO: Eliminate the need for this sleep.
-            time.sleep(0.1)
-
             (state, selectableObj) = sel.select(SELECT_TIMEOUT_MS)
             # Continue if select is timeout or selectable object is not return
             if state != swsscommon.Select.OBJECT:

From 99958304c172ff777c5a6d0e5dbb83b6a9537b59 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Fri, 7 May 2021 08:42:15 -0700
Subject: [PATCH 0449/1674] [container_checker] Use Feature table to get
 running containers  (#7474)

Why I did it
Finding running containers through "docker ps" breaks when kubernetes deploys container, as the names are mangled.

How I did it
The data is is available from FEATURE table, which takes care of kubernetes deployment too.

How to verify it
Deploy a feature via kubernetes and don't expect error from container_check.
---
 files/image_config/monit/container_checker | 112 ++++++++++++++-------
 1 file changed, 76 insertions(+), 36 deletions(-)

diff --git a/files/image_config/monit/container_checker b/files/image_config/monit/container_checker
index 88c288fccd65..2a000d1e6bb7 100755
--- a/files/image_config/monit/container_checker
+++ b/files/image_config/monit/container_checker
@@ -16,50 +16,31 @@ check program container_checker with path "/usr/bin/container_checker"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
 """
 
-import subprocess
+import docker
 import sys
 
 import swsssdk
 from sonic_py_common import multi_asic
-
-
-def get_command_result(command):
-    """
-    @summary: This function will execute the command and return the resulting output.
-    @return: A string which contains the output of command.
-    """
-    command_stdout = ""
-
-    try:
-        proc_instance = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                                         shell=True, universal_newlines=True)
-        command_stdout, command_stderr = proc_instance.communicate()
-        if proc_instance.returncode != 0:
-            print("Failed to execute the command '{}'. Return code: '{}'".format(
-                command, proc_instance.returncode))
-            sys.exit(1)
-    except (OSError, ValueError) as err:
-        print("Failed to execute the command '{}'. Error: '{}'".format(command, err))
-        sys.exit(2)
-
-    return command_stdout.rstrip().split("\n")
+from swsscommon import swsscommon
 
 
 def get_expected_running_containers():
     """
-    @summary: This function will get the expected running containers by following the rule:
+    @summary: This function will get the expected running & always-enabled containers by following the rule:
               The 'state' field of container in 'FEATURE' table should not be 'disabled' or 'always_disabled'.
               If the device has Multi-ASIC, this function will get container list by determining the
               value of field 'has_global_scope', the number of ASICs and the value of field
               'has_per_asic_scope'.
               If the device has single ASIC, the container name was put into the list.
-    @return:  A set which contains the expected running containers.
+    @return:  A set which contains the expected running containers and a set that has 
+              containers marked as "always_enabled".
     """
     config_db = swsssdk.ConfigDBConnector()
     config_db.connect()
     feature_table = config_db.get_table("FEATURE")
 
     expected_running_containers = set()
+    always_running_containers = set()
 
     for container_name in feature_table.keys():
         if feature_table[container_name]["state"] not in ["disabled", "always_disabled"]:
@@ -70,37 +51,95 @@ def get_expected_running_containers():
                     num_asics = multi_asic.get_num_asics()
                     for asic_id in range(num_asics):
                         expected_running_containers.add(container_name + str(asic_id))
+            elif feature_table[container_name]["state"] == 'always_enabled':
+                always_running_containers.add(container_name)
             else:
                 expected_running_containers.add(container_name)
 
-    return expected_running_containers
+    return expected_running_containers, always_running_containers
 
 
-def get_current_running_containers():
+def get_current_running_from_DB(always_running_containers):
     """
-    @summary: This function will get the current running container list by analyzing the
-              output of command `docker ps`.
-    @return:  A set which contains the current running contianers.
+    @summary: This function will get the current running container list
+              from FEATURE table @ STATE_DB, if this table is available.
+    @return:  a tuple
+              First: Return value indicating if info can be obtained from
+              DB or not.
+              Second: A set which contains the current running containers,
+              if this info is available in DB.
     """
     running_containers = set()
 
-    command = "docker ps"
-    command_stdout = get_command_result(command)
-    for line in command_stdout[1:]:
-        running_containers.add(line.split()[-1].strip())
+    state_db = swsscommon.DBConnector("STATE_DB", 0)
+    tbl = swsscommon.Table(state_db, "FEATURE")
+    if not tbl.getKeys():
+        return False, None
+
+    for name in tbl.getKeys():
+        data = dict(tbl.get(name)[1])
+        if data.get('container_id'):
+            running_containers.add(name)
+
+    DOCKER_CLIENT = docker.DockerClient(base_url='unix://var/run/docker.sock')
+    RUNNING = 'running'
+    for name in always_running_containers:
+        try:
+            container = DOCKER_CLIENT.containers.get(name)
+            container_state = container.attrs.get('State', {})
+            if container_state.get('Status', "") == RUNNING:
+                running_containers.add(name)
+        except (docker.errors.NotFound, docker.errors.APIError) as err:
+            print("Failed to get container '{}'. Error: '{}'".format(name, err))
+            pass
+
+    return True, running_containers
 
+
+def get_current_running_from_dockers():
+    """
+    @summary: This function will get all running containers from
+              the list of docker containers in running state.
+    @return:  A set which contains containers that are
+              in running state.
+    """
+    DOCKER_CLIENT = docker.DockerClient(base_url='unix://var/run/docker.sock')
+    running_containers = set()
+    ctrs = DOCKER_CLIENT.containers
+    try:
+        lst = ctrs.list(filters={"status": "running"})
+        for ctr in lst:
+            running_containers.add(ctr.name)
+    except docker.errors.APIError as err:
+        print("Failed to retrieve the running container list. Error: '{}'".format(err))
+        pass
     return running_containers
 
 
+def get_current_running_containers(always_running_containers):
+    """
+    @summary: This function will get the list of currently running containers.
+              If available in STATE-DB, get from DB else from list of dockers.
+              
+    @return:  A set of currently running containers.
+    """
+
+    ret, current_running_containers = get_current_running_from_DB(always_running_containers)
+    if not ret:
+        current_running_containers = get_current_running_from_dockers()
+    return current_running_containers
+
+
 def main():
     """
     @summary: This function will compare the difference between the current running containers
               and the containers which were expected to run. If containers which were exepcted
               to run were not running, then an alerting message will be written into syslog.
     """
-    expected_running_containers = get_expected_running_containers()
-    current_running_containers = get_current_running_containers()
+    expected_running_containers, always_running_containers = get_expected_running_containers()
+    current_running_containers = get_current_running_containers(always_running_containers)
 
+    expected_running_containers |= always_running_containers
     not_running_containers = expected_running_containers.difference(current_running_containers)
     if not_running_containers:
         print("Expected containers not running: " + ", ".join(not_running_containers))
@@ -114,3 +153,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+    sys.exit(0)

From 91b4ce649e82c16811857aabbabfc0becb224174 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Thu, 6 May 2021 22:24:07 -0700
Subject: [PATCH 0450/1674] [pmon]: add psmisc to bring fuser that dentifies
 processes that are using files or sockets (#7509)

fuser support is required since new cisco hardware watchdog plugin uses them to check anyone else use's /dev/watchdogX resource. The actual validation happens in the platform code, but the package is required for pmon container. Currently the /dev/watchdogX is being used by cisco platform-monitor service. Cisco chassis level watchdog plugin uses "fuser" to claim the watchdog release from platform-monitor service.
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 7e8d75680fa8..482b5ccd9b25 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -23,7 +23,8 @@ RUN apt-get update &&   \
         python-smbus    \
         python3-smbus   \
         dmidecode       \
-        i2c-tools
+        i2c-tools       \
+        psmisc
 
 # TODO: Remove these lines once we no longer need Python 2
 RUN apt-get install -f -y python-dev python-pip

From ed52c938c1ed40a3ed31519dfec2255eeb4460a5 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Fri, 7 May 2021 01:55:40 -0700
Subject: [PATCH 0451/1674] [brcm] Fix and simplify start_led.sh (#7548)

LED_PROC_INIT_SOC variable was incorrectly referenced as LED_SOC_INIT_SOC. Introduced in #5483

Rather than fixing the typo, I decided to simplify the script, removing the need for the conditional altogether by moving the bcmcmd call inside the conditional which checks for the presence of LED_SOC_INIT_SOC.
---
 platform/broadcom/docker-syncd-brcm/start_led.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/platform/broadcom/docker-syncd-brcm/start_led.sh b/platform/broadcom/docker-syncd-brcm/start_led.sh
index 964aa23eb04f..0b133d6d811e 100755
--- a/platform/broadcom/docker-syncd-brcm/start_led.sh
+++ b/platform/broadcom/docker-syncd-brcm/start_led.sh
@@ -4,11 +4,6 @@ PLATFORM_DIR=/usr/share/sonic/platform
 SYNCD_SOCKET_FILE=/var/run/sswsyncd/sswsyncd.socket
 LED_PROC_INIT_SOC=${PLATFORM_DIR}/led_proc_init.soc
 
-if [ ! -f "$LED_PROC_INIT_SOC" ]; then
-   echo "No soc led configuration found under $LED_SOC_INIT_SOC"
-   exit 0
-fi
-
 # Function: wait until syncd has created the socket for bcmcmd to connect to
 wait_syncd() {
     while true; do
@@ -38,6 +33,6 @@ wait_syncd() {
 # If this platform has an initialization file for the Broadcom LED microprocessor, load it
 if [[ -r "$LED_PROC_INIT_SOC" && ! -f /var/warmboot/warm-starting ]]; then
     wait_syncd
+    /usr/bin/bcmcmd -t 60 "rcload $LED_PROC_INIT_SOC"
 fi
 
-/usr/bin/bcmcmd -t 60 "rcload $LED_PROC_INIT_SOC"

From 06c1de67ee7d491f3045287cff4d3d16f8172e1a Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Thu, 6 May 2021 10:57:03 -0700
Subject: [PATCH 0452/1674] [sonic-yang-models]: fix unit test failure (#7436)

https://github.com/mbj4668/pyang/blob/master/pyang/repository.py#L93 throws an exception with pip 21.1

add ietf yang model explicitly to the build process fix the test failure.

tests/test_sonic_yang_models.py .F [ 66%]
tests/yang_model_tests/test_yang_model.py . [100%]
Failed: pyang -f tree ./yang-models/*.yang > ./yang-models/sonic_yang_tree
----------------------------- Captured stderr call -----------------------------
./yang-models/sonic-acl.yang:8: error: module "ietf-inet-types" not found in search path
./yang-models/sonic-device_metadata.yang:8: error: module "ietf-yang-types" not found in search path

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-yang-models/tests/test_sonic_yang_models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sonic-yang-models/tests/test_sonic_yang_models.py b/src/sonic-yang-models/tests/test_sonic_yang_models.py
index e5b801a94cb5..6db0c1b5678a 100644
--- a/src/sonic-yang-models/tests/test_sonic_yang_models.py
+++ b/src/sonic-yang-models/tests/test_sonic_yang_models.py
@@ -24,9 +24,12 @@ def test_content(response):
 def test_generate_yang_tree():
 
     # Generate YANG Tree, see no error in it.
-    pyang_tree_cmd = "pyang -f tree ./yang-models/*.yang > ./yang-models/sonic_yang_tree"
+    pyang_tree_cmd = "pyang -Vf tree -p /usr/local/share/yang/modules/ietf ./yang-models/*.yang > ./yang-models/sonic_yang_tree"
     if (system(pyang_tree_cmd)):
         print("Failed: {}".format(pyang_tree_cmd))
+        system("pyang --version")
+        system("env")
+        system("ls -l /usr/local/share/yang/modules/ietf/")
         exit(1)
     else:
         print("Passed: {}".format(pyang_tree_cmd))

From 79dd3b15e741541761e5874534bd6424d554085a Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 11 May 2021 18:04:01 +0800
Subject: [PATCH 0453/1674] Fix the /var wrong permission issue (#7571)

Why I did it
Build broken when reproducible build enabled, relative to backport package systemd.
The root cause is the bad permission of /var.
---
 scripts/build_debian_base_system.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build_debian_base_system.sh b/scripts/build_debian_base_system.sh
index fe7841067e82..e8c5ab42fe18 100755
--- a/scripts/build_debian_base_system.sh
+++ b/scripts/build_debian_base_system.sh
@@ -78,7 +78,7 @@ do
 done
 touch $APTDEBIAN
 touch $DEBOOTSTRAP_BASE
-(cd $BASEIMAGE_TARBALLPATH && tar -zcf $BASEIMAGE_TARBALL .)
+(cd $BASEIMAGE_TARBALLPATH && fakeroot tar -zcf $BASEIMAGE_TARBALL .)
 
 sudo debootstrap --verbose --variant=minbase --arch $CONFIGURED_ARCH --unpack-tarball=$BASEIMAGE_TARBALL $IMAGE_DISTRO $FILESYSTEM_ROOT
 RET=$?

From a3980f948ab1f32f0146c9e53ee4a841cf95d273 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 11 May 2021 22:35:57 +0800
Subject: [PATCH 0454/1674] [ci/build]: Upgrade SONiC package versions (#7576)

---
 files/build/versions/default/versions-deb-buster            | 1 +
 .../build/versions/dockers/docker-ptf/versions-deb-stretch  | 2 +-
 .../dockers/docker-syncd-nephos/versions-deb-stretch        | 2 +-
 .../dockers/sonic-slave-stretch/versions-deb-stretch        | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 4f3a2a3aea5b..4ae3df645b30 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -242,6 +242,7 @@ perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
 psample==1.1-1
+psmisc==23.2-1
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index b66b3a6cee6a..87f698d85b21 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -169,7 +169,7 @@ libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-2.2+deb9u3
+libxml2==2.9.4+dfsg1-2.2+deb9u4
 libxmuu1==2:1.1.2-2
 linux-libc-dev==4.9.258-1
 logrotate==3.11.0-0.1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 09f43f402e3f..391fec95be16 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -19,7 +19,7 @@ libsainps==1.5.0
 libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
-libxml2==2.9.4+dfsg1-2.2+deb9u3
+libxml2==2.9.4+dfsg1-2.2+deb9u4
 openssh-client==1:7.4p1-10+deb9u7
 sshpass==1.06-1
 strace==4.15-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 1aa02d0b145f..0fe91467bfed 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1092,9 +1092,9 @@ libxml-sax-perl==0.99+dfsg-2
 libxml-simple-perl==2.22-1
 libxml-twig-perl==1:3.50-1
 libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u3
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u3
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u3
+libxml2==2.9.4+dfsg1-2.2+deb9u4
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u4
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u4
 libxmlgraphics-commons-java==2.1-2
 libxmlrpc-lite-perl==0.717-1
 libxmu6==2:1.1.2-2

From dc6d5a78b9769a0694041a421f6d3b3e3e5320da Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 11 May 2021 23:01:15 +0800
Subject: [PATCH 0455/1674] Fix old versions not cleanup issue (#7575)

Why I did it
Fix some of the versions in files/build/versions folder not cleanup issue when generating new version configuration.
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 76c7c911a211..b247b5d5c212 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -69,6 +69,9 @@ stages:
     - download: current
       patterns: '**/versions-*'
     - script: |
+        # Cleanup the old versions
+        rm -rf files/build/versions
+
         mkdir -p target
         default_platform=broadcom
         artifacts=$(find $(Pipeline.Workspace) -maxdepth 1 -type d -name 'sonic-buildimage.*' | grep -v "sonic-buildimage.${default_platform}")

From 262d0948f100e446b782e1bf52d8c220ebed74ad Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Tue, 11 May 2021 09:19:52 -0700
Subject: [PATCH 0456/1674] [build]: Update the netifaces pip3 package version
 (#7574)

202012 branch is using reproducible build. The versions-py3 file must contains correct pip3 package version. Otherwise we will get a build error

```
Step 31/74 : RUN pip3 install          scapy==2.4.4          pyroute2==0.5.14          netifaces==0.10.9
 ---> Running in d7a2401dd21d
Collecting scapy==2.4.4
  Downloading scapy-2.4.4.tar.gz (1.0 MB)
Collecting pyroute2==0.5.14
  Downloading pyroute2-0.5.14.tar.gz (873 kB)
ERROR: Cannot install netifaces==0.10.9 because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested netifaces==0.10.9
    The user requested (constraint) netifaces==0.10.7

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency conflict

ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/user_guide/#fixing-conflicting-dependencies
The command '/bin/sh -c pip3 install          scapy==2.4.4          pyroute2==0.5.14          netifaces==0.10.9' returned a non-zero code: 1
[  FAIL LOG END  ] [ target/docker-sonic-vs.gz ]
```
---
 files/build/versions/dockers/docker-sonic-vs/versions-py3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 9bc2af8ab980..7e59fc6ebb41 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -5,7 +5,7 @@ deepdiff==5.2.3
 ijson==2.6.1
 jsondiff==1.3.0
 M2Crypto==0.37.1
-netifaces==0.10.7
+netifaces==0.10.9
 ordered-set==4.0.2
 parameterized==0.8.1
 pexpect==4.8.0

From aac5c04d91c8f3be2bfa0c811bc3e66063903440 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 12 May 2021 15:19:54 +0800
Subject: [PATCH 0457/1674] [ci/build]: Upgrade SONiC package versions (#7583)

---
 .../docker-config-engine-stretch/versions-py2 |  1 -
 .../docker-gbsyncd-vs/versions-deb-buster     |  1 -
 .../docker-sonic-mgmt-framework/versions-py3  |  3 +
 .../docker-sonic-vs/versions-deb-buster       |  1 -
 .../dockers/docker-sonic-vs/versions-py3      |  5 --
 .../docker-syncd-bfn/versions-deb-buster      | 12 ----
 .../versions-deb-buster                       | 60 -------------------
 .../docker-syncd-centec-rpc/versions-py2      |  5 --
 .../docker-syncd-centec/versions-deb-buster   | 14 +----
 .../docker-syncd-mlnx-rpc/versions-deb-buster | 60 -------------------
 .../docker-syncd-mlnx-rpc/versions-py2        |  5 --
 .../docker-syncd-mlnx/versions-deb-buster     |  9 ---
 .../docker-syncd-vs/versions-deb-buster       |  1 -
 files/build/versions/host-image/versions-py3  |  4 +-
 14 files changed, 6 insertions(+), 175 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
 delete mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2

diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index c2bea3fa5a42..60522867999c 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -1,4 +1,3 @@
-six==1.15.0
 sonic-config-engine==1.0
 sonic-py-common==1.0
 swsssdk==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index abd21dae6b32..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,3 @@
-iproute2==4.20.0-2
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
 syncd-vs==1.0.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 9ecf272e6792..35e67ea2d85d 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,2 +1,5 @@
+click==8.0.0
+itsdangerous==2.0.0
 six==1.11.0
+Werkzeug==2.0.0
 zipp==3.4.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 0b568f271095..2f3ae7e0335d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -30,7 +30,6 @@ libyang-cpp==1.0.73
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
-psmisc==23.2-1
 python-ply==3.11-3
 python2-yang==1.0.73
 python3-yang==1.0.73
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 7e59fc6ebb41..920a529e3bd7 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,16 +1,11 @@
 certifi==2020.12.5
-chardet==3.0.4
 Click==7.0
-deepdiff==5.2.3
 ijson==2.6.1
 jsondiff==1.3.0
 M2Crypto==0.37.1
-netifaces==0.10.9
-ordered-set==4.0.2
 parameterized==0.8.1
 pexpect==4.8.0
 ptyprocess==0.7.0
-requests==2.25.0
 tabulate==0.8.9
 urllib3==1.26.4
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
deleted file mode 100644
index ee5c2bee1606..000000000000
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-bfnplatform==1.0.0
-bfnsdk==1.0.0
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4-gnutls-dev==7.64.0-4+deb10u2
-libgoogle-perftools4==2.7-1
-liblzma-dev==5.2.4-1
-libpcap-dev==1.8.1-6
-libpcap0.8-dev==1.8.1-6
-libtcmalloc-minimal4==2.7-1
-libunwind-dev==1.2.1-10~deb10u1
-libusb-1.0-0==2:1.0.22-2
-libusb-1.0-0-dev==2:1.0.22-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
deleted file mode 100644
index 6d93dfe784fc..000000000000
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ /dev/null
@@ -1,60 +0,0 @@
-binutils==2.31.1-16
-binutils-common==2.31.1-16
-binutils-x86-64-linux-gnu==2.31.1-16
-build-essential==12.6
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
-libasan5==8.3.0-6
-libbinutils==2.31.1-16
-libboost-atomic1.67.0==1.67.0-13+deb10u1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libcc1-0==8.3.0-6
-libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
-libffi-dev==3.2.1-9
-libgcc-8-dev==8.3.0-6
-libgomp1==8.3.0-6
-libisl19==0.20-2
-libitm1==8.3.0-6
-libjsoncpp1==1.7.4-3
-liblsan0==8.3.0-6
-libmpc3==1.1.0-1
-libmpfr6==4.0.2-1
-libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libquadmath0==8.3.0-6
-librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
-libstdc++-8-dev==8.3.0-6
-libthrift-0.11.0==0.11.0-4
-libtsan0==8.3.0-6
-libubsan1==8.3.0-6
-libuv1==1.24.1-1
-make==4.2.1-1.2
-patch==2.7.6-3+deb10u1
-python-dev==2.7.16-1
-python-pip==18.1-5
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-ptf==0.9-1
-python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
-syncd-rpc==1.0.0
-wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
deleted file mode 100644
index f2d6dd3c856c..000000000000
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
+++ /dev/null
@@ -1,5 +0,0 @@
-cffi==1.7.0
-nnpy==1.4.2
-ptf==0.9.1
-pycparser==2.20
-scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 74abbdb5bd6f..e5836f0be374 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1,13 +1 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsai==1.6.3-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsai==1.6.3-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
deleted file mode 100644
index 6d93dfe784fc..000000000000
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ /dev/null
@@ -1,60 +0,0 @@
-binutils==2.31.1-16
-binutils-common==2.31.1-16
-binutils-x86-64-linux-gnu==2.31.1-16
-build-essential==12.6
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
-libasan5==8.3.0-6
-libbinutils==2.31.1-16
-libboost-atomic1.67.0==1.67.0-13+deb10u1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libcc1-0==8.3.0-6
-libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
-libffi-dev==3.2.1-9
-libgcc-8-dev==8.3.0-6
-libgomp1==8.3.0-6
-libisl19==0.20-2
-libitm1==8.3.0-6
-libjsoncpp1==1.7.4-3
-liblsan0==8.3.0-6
-libmpc3==1.1.0-1
-libmpfr6==4.0.2-1
-libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libquadmath0==8.3.0-6
-librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
-libstdc++-8-dev==8.3.0-6
-libthrift-0.11.0==0.11.0-4
-libtsan0==8.3.0-6
-libubsan1==8.3.0-6
-libuv1==1.24.1-1
-make==4.2.1-1.2
-patch==2.7.6-3+deb10u1
-python-dev==2.7.16-1
-python-pip==18.1-5
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-ptf==0.9-1
-python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
-syncd-rpc==1.0.0
-wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
deleted file mode 100644
index f2d6dd3c856c..000000000000
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
+++ /dev/null
@@ -1,5 +0,0 @@
-cffi==1.7.0
-nnpy==1.4.2
-ptf==0.9.1
-pycparser==2.20
-scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index a562e132a732..d7f3b10e7de4 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -3,17 +3,8 @@ applibs-dev==1.mlnx.4.4.2522
 iproute2==1.mlnx.4.4.2522
 iproute2-dev==1.mlnx.4.4.2522
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u1
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-python-dev==2.7.16-1
-python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.2522
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
 sx-acl-helper==1.mlnx.4.4.2522
 sx-acl-helper-dev==1.mlnx.4.4.2522
 sx-complib==1.mlnx.4.4.2522
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index abd21dae6b32..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,3 @@
-iproute2==4.20.0-2
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
 syncd-vs==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3465732c3900..92bd5b54d785 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -11,12 +11,12 @@ docker==4.3.1
 idna==2.10
 ijson==2.6.1
 ipaddress==1.0.23
-Jinja2==2.11.3
+Jinja2==3.0.0
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
 M2Crypto==0.37.1
-MarkupSafe==1.1.1
+MarkupSafe==2.0.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9

From c8ee27319b9a59995c4df0b6d9ded9e3be7ff3ca Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 12 May 2021 22:11:06 +0800
Subject: [PATCH 0458/1674] [ci/build]: Upgrade SONiC package versions (#7589)

---
 files/build/versions/default/versions-py3 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index ce55dc947527..4017ce18db7c 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -2,10 +2,10 @@ attrs==21.2.0
 bitarray==1.5.3
 certifi==2017.4.17
 chardet==4.0.0
-click==7.1.2
+click==8.0.0
 clickclick==20.10.2
 connexion==2.7.0
-Flask==1.1.2
+Flask==2.0.0
 grpcio==1.37.1
 grpcio-tools==1.20.0
 hiredis==2.0.0
@@ -14,12 +14,12 @@ importlib-metadata==4.0.1
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
-itsdangerous==1.1.0
+itsdangerous==2.0.0
 j2cli==0.3.10
-Jinja2==2.11.3
+Jinja2==3.0.0
 jsonschema==3.2.0
 lxml==4.6.3
-MarkupSafe==1.1.1
+MarkupSafe==2.0.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
@@ -46,4 +46,4 @@ thrift==0.13.0
 toposort==1.6
 typing-extensions==3.10.0.0
 urllib3==1.21.1
-Werkzeug==1.0.1
\ No newline at end of file
+Werkzeug==2.0.0
\ No newline at end of file

From 3eaadec21cae968f0ac4dfa1c614e0cb5372f6d6 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 12 May 2021 07:56:46 -0700
Subject: [PATCH 0459/1674] [202012] BRCM SAI 4.3.3.5-2 picked up BRCM
 hsdk-6.5.21-p1.patch and CS00012097141 fix (#7581)

This is to pick up BRCM SAI 4.3.3.5-2 which contains 2 main changes:
1.  hsdk-6.5.21-p1.patch (to address some field problems related to SDK issue.
2. Fix for CS00012097141 (remove some unnecessary debug setting that was causing non functional impacting problem at boot time)

Preliminary tests looks fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on S6100 DUT and all passed:
```
     ipfwd/test_dir_bcast.py
     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     decap/test_decap.py
     fdb/test_fdb.py
```
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index fe9797c9024f..5cad05332e33 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -42,7 +42,9 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=BcGHyOGfS%2FypmiNUtHnX8WCbUwqoXPiRRe9E%2FUl9Sp8%3D&se=2035-01-12T01%3A52%3A57Z&sp=r==c6a8e39823441c331d3baf7541d88bcd
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r==033eb38248063745cb27efcd70f942a7
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=WHmBcthD%2FqBv4Pia0GH4GQ%2BdKm8rolG8dJSh%2BYoGEr8%3D&se=2035-01-12T01%3A52%3A20Z&sp=r==731894feaf45cda01cacbaa61071db2c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r==211346a9163a9a7bc57d5bcd1ae85eb0
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index d91408d13c4a..74fb8bb58ebb 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.5-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=WHmBcthD%2FqBv4Pia0GH4GQ%2BdKm8rolG8dJSh%2BYoGEr8%3D&se=2035-01-12T01%3A52%3A20Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.5-2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=BcGHyOGfS%2FypmiNUtHnX8WCbUwqoXPiRRe9E%2FUl9Sp8%3D&se=2035-01-12T01%3A52%3A57Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 7424a1377531bfee458d179247b2f5cee38bdfdd Mon Sep 17 00:00:00 2001
From: Yilan <baxia.lan@gmail.com>
Date: Tue, 30 Mar 2021 08:34:25 -0700
Subject: [PATCH 0460/1674] [build]: Update versions_manager.py to make
 versions map key unique (#7146)

py2/py3/deb packages names are case insensitive, and the versions map
key should be the same for packages whose name can have different cases.

For example, in files/build/versions/default/versions-py3, package
"click==7.1.2" is pinned; and in
files/build/versions/dockers/docker-sonic-vs/versions-py3, package
"Click==7.0" is pinned.
Without this fix, the aggregated versions-py3 file used for building
docker-sonic-vs looks like below:
...
click==7.1.2
Click==7.0
...
However, we actually want "click==7.0" to overwrite "click==7.1.2" for
docker-sonic-vs build.
---
 scripts/versions_manager.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index 336568bfb4e0..a59d85dd8a96 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -22,7 +22,7 @@ class Component:
     ctype -- Component Type, such as deb, py2, etc
     dist  -- Distribution, such as stretch, buster, etc
     arch  -- Architectrue, such as amd64, arm64, etc
-    
+
     '''
     def __init__(self, versions, ctype, dist=ALL_DIST, arch=ALL_ARCH):
         self.versions = versions
@@ -44,6 +44,8 @@ def get_versions(cls, version_file):
                 offset = line.rfind('==')
                 if offset > 0:
                     package = line[:offset].strip()
+                    if 'py2' in version_file.lower() or 'py3' in version_file.lower():
+                        package = package.lower()
                     version = line[offset+2:].strip()
                     result[package] = version
         return result
@@ -86,7 +88,7 @@ def dump_to_path(self, file_path, config=False, priority=999):
         if config and self.ctype == 'deb':
             none_config_file_path = os.path.join(file_path, filename)
             self.dump_to_file(none_config_file_path, False, priority)
-            filename = VERSION_DEB_PREFERENCE 
+            filename = VERSION_DEB_PREFERENCE
         file_path = os.path.join(file_path, filename)
         self.dump_to_file(file_path, config, priority)
 

From 3db6572e6785ffcd4ef0a4575b16f95c7606c327 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Fri, 14 May 2021 12:30:23 +0300
Subject: [PATCH 0461/1674] [202012][sonic-utilities] submodule update

[vnet] Add "vnet_route_check" script (#1300)
Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 9ad356a34b55..ab440675ed80 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 9ad356a34b55529cd8f46e3f1bce1109e25256d2
+Subproject commit ab440675ed80c2ff6e996ef2cfbcbb1cf77375fa

From 1461c9f98f2ee2dd5398867a932dddb7ee8a29e3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 19 May 2021 22:02:10 +0800
Subject: [PATCH 0462/1674] [ci/build]: Upgrade SONiC package versions (#7613)

---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-py2     |  2 +-
 .../build-sonic-slave-stretch/versions-py2    |  2 +-
 .../versions/default/versions-deb-buster      |  3 +-
 files/build/versions/default/versions-py2     |  6 ++--
 files/build/versions/default/versions-py3     | 16 +++++-----
 files/build/versions/default/versions-web     |  4 +--
 .../docker-base-stretch/versions-deb-stretch  |  4 +--
 .../dockers/docker-ptf/versions-deb-stretch   |  7 +++--
 .../versions/dockers/docker-ptf/versions-py2  | 14 ++++-----
 .../docker-sonic-mgmt-framework/versions-py3  |  3 --
 .../dockers/docker-sonic-vs/versions-py3      |  4 +--
 .../sonic-slave-buster/versions-deb-buster    | 17 +++++------
 .../dockers/sonic-slave-buster/versions-py2   | 30 +++++++++----------
 .../dockers/sonic-slave-buster/versions-py3   | 22 +++++++-------
 .../sonic-slave-stretch/versions-deb-stretch  | 26 ++++++++--------
 .../dockers/sonic-slave-stretch/versions-py2  | 28 ++++++++---------
 .../dockers/sonic-slave-stretch/versions-py3  | 16 +++++-----
 .../versions/host-image/versions-deb-buster   | 12 ++++----
 files/build/versions/host-image/versions-py2  |  6 ++--
 files/build/versions/host-image/versions-py3  | 12 ++++----
 21 files changed, 115 insertions(+), 121 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 432707b8d8ee..c8f1783a726c 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -40,7 +40,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.5-1
+libsaibcm==4.3.3.5-2
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index f0ec8d2011c5..65b9ae160bb9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -11,6 +11,6 @@ netaddr==0.8.0
 pyang==2.4.0
 pyangbind==0.6.0
 redis==3.5.3
-SaiRedis==1.0
+sairedis==1.0
 thrift==0.11.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index 4211881987c2..70ef1f2f0036 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,4 +1,4 @@
 natsort==6.2.1
 redis==3.5.3
-SaiRedis==1.0
+sairedis==1.0
 thrift==0.11.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 4ae3df645b30..6a35f501a1f0 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -1,4 +1,3 @@
-apt==1.8.2.3
 apt-utils==1.8.2.3
 arping==2.19-6
 binutils==2.31.1-16
@@ -169,7 +168,7 @@ librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.5-1
+libsaibcm==4.3.3.5-2
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index a7cabd9fb532..2dd02d4fcd76 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -6,10 +6,10 @@ functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
 ipaddress==1.0.23
-Jinja2==2.11.3
+jinja2==2.11.3
 jsonschema==2.6.0
 lxml==4.6.3
-MarkupSafe==1.1.1
+markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 nnpy==1.4.2
@@ -18,7 +18,7 @@ ptf==0.9.1
 pyang==2.4.0
 pyangbind==0.6.0
 pycparser==2.20
-PyYAML==5.4.1
+pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 4017ce18db7c..4ab1fddb7905 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -5,7 +5,7 @@ chardet==4.0.0
 click==8.0.0
 clickclick==20.10.2
 connexion==2.7.0
-Flask==2.0.0
+flask==2.0.0
 grpcio==1.37.1
 grpcio-tools==1.20.0
 hiredis==2.0.0
@@ -14,18 +14,18 @@ importlib-metadata==4.0.1
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
-itsdangerous==2.0.0
+itsdangerous==2.0.1
 j2cli==0.3.10
-Jinja2==3.0.0
+jinja2==3.0.1
 jsonschema==3.2.0
 lxml==4.6.3
-MarkupSafe==2.0.0
+markupsafe==2.0.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
-openapi-spec-validator==0.3.0
-protobuf==3.16.0
+openapi-spec-validator==0.3.1
+protobuf==3.17.0
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
@@ -33,7 +33,7 @@ pyroute2==0.5.14
 pyrsistent==0.17.3
 python-arptable==0.0.2
 python-dateutil==2.6.0
-PyYAML==5.4.1
+pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 regex==2021.4.4
@@ -46,4 +46,4 @@ thrift==0.13.0
 toposort==1.6
 typing-extensions==3.10.0.0
 urllib3==1.21.1
-Werkzeug==2.0.0
\ No newline at end of file
+werkzeug==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 5cad05332e33..9405b9a97814 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -29,7 +29,7 @@ https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==6289
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.dsc==e76d5deda89795939828c3b39b31d38f
-https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==e3afaa4ac1387449dec703da494dd991
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==d41d8cd98f00b204e9800998ecf8427e
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.debian.tar.xz==0a529cf8d1717b5c3dbe0c61b3512aa1
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.dsc==b88b922d96688c948e90987fcaa3a2de
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4.orig.tar.gz==33e8d58623f99184e4e709cbbfe45db3
@@ -41,9 +41,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=BcGHyOGfS%2FypmiNUtHnX8WCbUwqoXPiRRe9E%2FUl9Sp8%3D&se=2035-01-12T01%3A52%3A57Z&sp=r==c6a8e39823441c331d3baf7541d88bcd
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r==033eb38248063745cb27efcd70f942a7
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-1_amd64.deb?sv=2015-04-05&sr=b&sig=WHmBcthD%2FqBv4Pia0GH4GQ%2BdKm8rolG8dJSh%2BYoGEr8%3D&se=2035-01-12T01%3A52%3A20Z&sp=r==731894feaf45cda01cacbaa61071db2c
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r==211346a9163a9a7bc57d5bcd1ae85eb0
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 74ca68b251e4..e8a75896ca3d 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -1,8 +1,8 @@
 ca-certificates==20200601~deb9u2
-curl==7.52.1-5+deb9u13
+curl==7.52.1-5+deb9u14
 jq==1.5+dfsg-1.3
 less==481-2.1
-libcurl3==7.52.1-5+deb9u13
+libcurl3==7.52.1-5+deb9u14
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
 libestr0==0.1.10-2
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 87f698d85b21..1eb02dcf4b72 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -13,7 +13,7 @@ cmake-data==3.7.2-1
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u13
+curl==7.52.1-5+deb9u14
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
@@ -54,8 +54,8 @@ libcc1-0==6.3.0-18+deb9u1
 libcgmanager0==0.41-2
 libcilkrts5==6.3.0-18+deb9u1
 libcryptsetup4==2:1.7.3-4
-libcurl3==7.52.1-5+deb9u13
-libcurl3-gnutls==7.52.1-5+deb9u13
+libcurl3==7.52.1-5+deb9u14
+libcurl3-gnutls==7.52.1-5+deb9u14
 libdbus-1-3==1.10.32-0+deb9u1
 libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
@@ -104,6 +104,7 @@ liblogging-stdlog0==1.0.5-2+b2
 liblognorm5==2.0.1-1.1+b1
 liblsan0==6.3.0-18+deb9u1
 libltdl7==2.4.6-2
+liblz4-1==0.0~r131-2+deb9u1
 liblzo2-2==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
 libmagic1==1:5.30-1+deb9u3
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index e10f946d766d..2479cfd03739 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -8,8 +8,8 @@ decorator==4.4.2
 dpkt==1.9.5
 enum34==1.1.6
 exabgp==3.4.17
-Flask==1.0
-Flask-HTTPAuth==2.5.0
+flask==1.0
+flask-httpauth==2.5.0
 futures==3.2.0
 grpcio==1.18.0
 grpcio-tools==1.15.0
@@ -27,10 +27,10 @@ protobuf==3.6.1
 ptyprocess==0.7.0
 pyaml==20.4.0
 pybrctl==0.1.3
-Pygments==2.5.2
+pygments==2.5.2
 pylibpcap==0.6.4
-PyNaCl==1.4.0
-Pyro4==4.80
+pynacl==1.4.0
+pyro4==4.80
 pysubnettree==0.26
 rpyc==4.1.5
 saithrift==0.9
@@ -43,8 +43,8 @@ stevedore==1.32.0
 supervisor==4.2.2
 thrift==0.11.0
 traitlets==4.3.3
-Twisted==16.0.0
+twisted==16.0.0
 wcwidth==0.2.5
-Werkzeug==1.0.1
+werkzeug==1.0.1
 yabgp==0.8.2
 zope.interface==5.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 35e67ea2d85d..9ecf272e6792 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,5 +1,2 @@
-click==8.0.0
-itsdangerous==2.0.0
 six==1.11.0
-Werkzeug==2.0.0
 zipp==3.4.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 920a529e3bd7..a0516fadd483 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,8 +1,8 @@
 certifi==2020.12.5
-Click==7.0
+click==7.0
 ijson==2.6.1
 jsondiff==1.3.0
-M2Crypto==0.37.1
+m2crypto==0.37.1
 parameterized==0.8.1
 pexpect==4.8.0
 ptyprocess==0.7.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
index 26738f17a569..95759538295b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1,7 +1,6 @@
 adwaita-icon-theme==3.30.1-1
 ant==1.10.5-2
 ant-optional==1.10.5-2
-apt==1.8.2.3
 apt-file==3.2.2
 apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
@@ -160,7 +159,7 @@ gpg-wks-client==2.2.12-1+deb10u1
 gpg-wks-server==2.2.12-1+deb10u1
 gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
-graphviz==2.40.1-6
+graphviz==2.40.1-6+deb10u1
 groff==1.22.4-3+deb10u1
 groff-base==1.22.4-3+deb10u1
 gsettings-desktop-schemas==3.28.1-1
@@ -337,11 +336,11 @@ libcc1-0==8.3.0-6
 libcdi-api-java==1.2-2
 libcdio18==2.0.0-2
 libcdparanoia0==3.10.2+debian-13
-libcdt5==2.40.1-6
+libcdt5==2.40.1-6+deb10u1
 libcgi-fast-perl==1:2.13-1
 libcgi-pm-perl==4.40-1
 libcglib-java==3.2.10-1
-libcgraph6==2.40.1-6
+libcgraph6==2.40.1-6+deb10u1
 libchromaprint1==1.4.3-3
 libclang-common-7-dev==1:7.0.1-8+deb10u2
 libclang1-6.0==1:6.0.1-10
@@ -550,8 +549,8 @@ libgts-bin==0.7.6+darcs121130-4
 libguava-java==19.0-1
 libgudev-1.0-0==232-2
 libguice-java==4.2.1-1
-libgvc6==2.40.1-6
-libgvpr2==2.40.1-6
+libgvc6==2.40.1-6+deb10u1
+libgvpr2==2.40.1-6+deb10u1
 libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
@@ -665,7 +664,7 @@ libkrb5-3==1.17-3+deb10u1
 libkrb5-dev==1.17-3+deb10u1
 libkrb5support0==1.17-3+deb10u1
 libksba8==1.3.5-2
-liblab-gamut1==2.40.1-6
+liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
@@ -820,7 +819,7 @@ libparboiled-java==1.1.7-2
 libparse-debianchangelog-perl==1.2.0-13
 libpath-iterator-rule-perl==1.014-1
 libpath-tiny-perl==0.108-1
-libpathplan4==2.40.1-6
+libpathplan4==2.40.1-6+deb10u1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
 libpcap0.8-dev==1.8.1-6
@@ -1190,7 +1189,7 @@ libxdamage1==1:1.1.4-3+b3
 libxdelta2==1.1.3-9.2
 libxdmcp-dev==1:1.1.2-3
 libxdmcp6==1:1.1.2-3
-libxdot4==2.40.1-6
+libxdot4==2.40.1-6+deb10u1
 libxencall1==4.11.4+99-g8bce4698f6-1
 libxendevicemodel1==4.11.4+99-g8bce4698f6-1
 libxenevtchn1==4.11.4+99-g8bce4698f6-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
index e87f798b9145..182ead414d40 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -3,13 +3,13 @@ asn1crypto==0.24.0
 astroid==1.6.5
 atomicwrites==1.1.5
 attrs==18.2.0
-Automat==0.6.0
-Babel==2.6.0
+automat==0.6.0
+babel==2.6.0
 backports.functools-lru-cache==1.5
 beautifulsoup4==4.7.1
 certifi==2018.8.24
 chardet==3.0.4
-Click==7.0
+click==7.0
 colorama==0.3.7
 configparser==3.5.0b2
 constantly==15.1.0
@@ -33,14 +33,14 @@ ipaddr==2.2.0
 ipaddress==1.0.17
 isort==4.3.4
 j2cli==0.3.10
-Jinja2==2.10
+jinja2==2.10
 keyring==17.1.1
 keyrings.alt==3.1.1
 lazy-object-proxy==1.3.1
 logilab-common==1.4.2
 lxml==4.6.2
-M2Crypto==0.36.0
-MarkupSafe==1.1.0
+m2crypto==0.36.0
+markupsafe==1.1.0
 mccabe==0.6.1
 mmh3==2.5.1
 mock==3.0.5
@@ -54,37 +54,37 @@ parse==1.6.6
 pathlib2==2.3.3
 pbr==4.2.0
 pexpect==4.6.0
-Pillow==5.4.1
+pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pycrypto==2.6.1
-Pygments==2.3.1
-PyGObject==3.30.4
+pygments==2.3.1
+pygobject==3.30.4
 pylint==1.9.4
-Pympler==0.8
-pyOpenSSL==19.0.0
+pympler==0.8
+pyopenssl==19.0.0
 pyparsing==2.2.0
 pytest==3.10.1
 pytest-cov==2.6.0
 pytest-runner==4.4
 pytz==2019.1
 pyxdg==0.25
-PyYAML==5.4.1
+pyyaml==5.4.1
 requests==2.21.0
 roman==2.0.0
 scandir==1.9.0
-SecretStorage==2.3.1
+secretstorage==2.3.1
 service-identity==16.0.0
 singledispatch==3.4.0.3
 six==1.12.0
 soupsieve==1.8
-Sphinx==1.8.4
+sphinx==1.8.4
 stdeb==0.8.5
 stgit==0.18
-Twisted==18.9.0
+twisted==18.9.0
 typing==3.6.6
 urllib3==1.24.1
 webencodings==0.5.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 6e978c2c412f..4b38beec295e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -2,7 +2,7 @@ alabaster==0.7.8
 asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
-Babel==2.6.0
+babel==2.6.0
 bitarray==2.1.0
 certifi==2018.8.24
 chardet==3.0.4
@@ -19,12 +19,12 @@ gcovr==4.1
 gpg==1.12.0
 idna==2.6
 imagesize==1.0.0
-Jinja2==2.10
+jinja2==2.10
 keyring==17.1.1
 keyrings.alt==3.1.1
 lxml==4.6.2
-M2Crypto==0.37.1
-MarkupSafe==1.1.0
+m2crypto==0.37.1
+markupsafe==1.1.0
 mmh3==2.5.1
 mock==2.0.0
 mockredispy==2.9.3
@@ -36,7 +36,7 @@ packaging==19.0
 parameterized==0.8.1
 pbr==4.2.0
 pexpect==4.8.0
-Pillow==5.4.1
+pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
@@ -44,9 +44,9 @@ pyang==2.4.0
 pyangbind==0.8.1
 pycrypto==2.6.1
 pycurl==7.43.0.2
-Pygments==2.3.1
-PyGObject==3.30.4
-Pympler==0.8
+pygments==2.3.1
+pygobject==3.30.4
+pympler==0.8
 pyparsing==2.2.0
 pytest==3.10.1
 pytest-cov==2.6.0
@@ -57,14 +57,14 @@ python-debian==0.1.35
 python-magic==0.4.16
 pytz==2019.1
 pyxdg==0.25
-PyYAML==5.4.1
+pyyaml==5.4.1
 redis==3.5.3
 regex==2021.4.4
 requests==2.21.0
 roman==2.0.0
-SecretStorage==2.3.1
+secretstorage==2.3.1
 six==1.12.0
-Sphinx==1.8.4
+sphinx==1.8.4
 sphinx-rtd-theme==0.4.3
 unattended-upgrades==0.1
 unidiff==0.5.4
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 0fe91467bfed..b760be99ccd8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -52,7 +52,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u13
+curl==7.52.1-5+deb9u14
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -144,7 +144,7 @@ gnupg-agent==2.1.18-8~deb9u4
 gnupg-l10n==2.1.18-8~deb9u4
 gnupg2==2.1.18-8~deb9u4
 googletest==1.8.0-6
-graphviz==2.38.0-17
+graphviz==2.38.0-17+deb9u1
 groff==1.22.3-9
 groff-base==1.22.3-9
 gsettings-desktop-schemas==3.22.0-1
@@ -344,12 +344,12 @@ libcap2-bin==1:2.25-1
 libcarp-clan-perl==6.06-1
 libcc1-0==6.3.0-18+deb9u1
 libcdi-api-java==1.0-2
-libcdt5==2.38.0-17
+libcdt5==2.38.0-17+deb9u1
 libcgi-fast-perl==1:2.12-1
 libcgi-pm-perl==4.35-1
 libcglib-java==3.2.4-1
 libcgmanager0==0.41-2
-libcgraph6==2.38.0-17
+libcgraph6==2.38.0-17+deb9u1
 libcilkrts5==6.3.0-18+deb9u1
 libclang-common-3.8-dev==1:3.8.1-24
 libclang1-3.8==1:3.8.1-24
@@ -383,10 +383,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u13
-libcurl3-gnutls==7.52.1-5+deb9u13
-libcurl3-nss==7.52.1-5+deb9u13
-libcurl4-nss-dev==7.52.1-5+deb9u13
+libcurl3==7.52.1-5+deb9u14
+libcurl3-gnutls==7.52.1-5+deb9u14
+libcurl3-nss==7.52.1-5+deb9u14
+libcurl4-nss-dev==7.52.1-5+deb9u14
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -524,8 +524,8 @@ libgts-bin==0.7.6+darcs121130-4
 libguava-java==19.0-1
 libgudev-1.0-0==230-3
 libguice-java==4.0-3
-libgvc6==2.38.0-17
-libgvpr2==2.38.0-17
+libgvc6==2.38.0-17+deb9u1
+libgvpr2==2.38.0-17+deb9u1
 libhamcrest-java==1.3-6
 libharfbuzz-icu0==1.4.2-1
 libharfbuzz0b==1.4.2-1
@@ -593,7 +593,7 @@ libjbig2dec0==0.13-4.1
 libjdom1-java==1.1.3-1
 libjemalloc-dev==3.6.0-9.1
 libjemalloc1==3.6.0-9.1
-libjetty9-java==9.2.21-1+deb9u1
+libjetty9-java==9.2.30-0+deb9u1
 libjline-java==1.0-2
 libjpeg62-turbo==1:1.5.1-2+deb9u1
 libjs-bootstrap==3.3.7+dfsg-2+deb9u2
@@ -759,7 +759,7 @@ libparams-validate-perl==1.26-1
 libparse-debianchangelog-perl==1.2.0-12
 libpath-iterator-rule-perl==1.009-1
 libpath-tiny-perl==0.100-1
-libpathplan4==2.38.0-17
+libpathplan4==2.38.0-17+deb9u1
 libpcap-dev==1.8.1-3
 libpcap0.8==1.8.1-3
 libpcap0.8-dev==1.8.1-3
@@ -1068,7 +1068,7 @@ libxdamage1==1:1.1.4-2+b3
 libxdelta2==1.1.3-9.1+b1
 libxdmcp-dev==1:1.1.2-3
 libxdmcp6==1:1.1.2-3
-libxdot4==2.38.0-17
+libxdot4==2.38.0-17+deb9u1
 libxen-4.8==4.8.5.final+shim4.10.4-1+deb9u12
 libxenstore3.0==4.8.5.final+shim4.10.4-1+deb9u12
 libxerces2-java==2.11.0-7
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index 15ecd8e774ce..53073b5ae1d9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -1,7 +1,7 @@
 alabaster==0.7.8
 astroid==1.4.9
 attrs==16.3.0
-Babel==2.3.4
+babel==2.3.4
 backports.functools-lru-cache==1.3
 beautifulsoup4==4.5.3
 chardet==2.3.0
@@ -26,33 +26,33 @@ ipaddr==2.1.11
 ipaddress==1.0.17
 isort==4.2.5
 j2cli==0.3.10
-Jinja2==2.11.3
+jinja2==2.11.3
 keyring==10.1
 keyrings.alt==1.3
 lazy-object-proxy==1.2.2
 lxml==4.6.2
-M2Crypto==0.36.0
-MarkupSafe==1.1.1
+m2crypto==0.36.0
+markupsafe==1.1.1
 mmh3==3.0.0
 mockredispy==2.9.3
 nose==1.3.7
 nose2==0.6.5
-PAM==0.4.2
+pam==0.4.2
 parse==1.6.6
 pexpect==4.6.0
-Pillow==4.0.0
+pillow==4.0.0
 ptyprocess==0.7.0
 py==1.4.32
 pyasn1==0.1.9
 pyasn1-modules==0.0.7
 pycrypto==2.6.1
-Pygments==2.2.0
+pygments==2.2.0
 pygobject==3.22.0
 pylint==1.6.5
-Pympler==0.8
-pyOpenSSL==16.2.0
+pympler==0.8
+pyopenssl==16.2.0
 pyserial==3.2.1
-Pyste==0.9.10
+pyste==0.9.10
 pytest==3.0.6
 pytest-cov==2.4.0
 pytest-runner==4.4
@@ -61,17 +61,17 @@ python-dateutil==2.5.3
 python-debian==0.1.30
 pytz==2016.7
 pyxdg==0.25
-PyYAML==5.3.1
+pyyaml==5.3.1
 requests==2.12.4
 roman==2.0.0
-SecretStorage==2.3.1
+secretstorage==2.3.1
 service-identity==16.0.0
 six==1.10.0
-Sphinx==1.4.9
+sphinx==1.4.9
 sphinx-rtd-theme==0.1.9
 stdeb==0.8.5
 stgit===0.17.1-dirty
-Twisted==16.6.0
+twisted==16.6.0
 typing==3.10.0.0
 urllib3==1.19.1
 webencodings==0.5
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index f29ccad16735..dc83f78eeeb7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,5 +1,5 @@
 alabaster==0.7.8
-Babel==2.3.4
+babel==2.3.4
 bitarray==2.1.0
 chardet==2.3.0
 cryptography==1.7.1
@@ -8,30 +8,30 @@ docutils==0.13.1
 file-magic==0.3.0
 idna==2.2
 imagesize==0.7.1
-Jinja2==2.8
+jinja2==2.8
 keyring==10.1
 keyrings.alt==1.3
 lxml==4.6.2
-MarkupSafe==0.23
+markupsafe==0.23
 mockredispy==2.9.3
 nose==1.3.7
-Pillow==4.0.0
+pillow==4.0.0
 pyang==2.4.0
 pyangbind==0.8.1
 pyasn1==0.1.9
 pycrypto==2.6.1
 pycurl==7.43.0
-Pygments==2.2.0
+pygments==2.2.0
 pygobject==3.22.0
 python-apt==1.4.3
 python-debian==0.1.30
 pytz==2016.7
 pyxdg==0.25
-PyYAML==5.3.1
+pyyaml==5.3.1
 redis==3.5.3
 regex==2021.4.4
 roman==2.0.0
-SecretStorage==2.3.1
+secretstorage==2.3.1
 six==1.10.0
-Sphinx==1.4.9
+sphinx==1.4.9
 unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index c36d1baf7d14..135b627ab8d1 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -163,10 +163,10 @@ libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
-libsystemd0==247.3-3~bpo10+1
+libsystemd0==247.3-5~bpo10+1
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
-libudev1==247.3-3~bpo10+1
+libudev1==247.3-5~bpo10+1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
@@ -242,16 +242,16 @@ squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
 sx-kernel==1.mlnx.4.4.2522
 sysfsutils==2.1.0+repack-5
-systemd==247.3-3~bpo10+1
+systemd==247.3-5~bpo10+1
 systemd-sonic-generator==1.0.0
-systemd-sysv==247.3-3~bpo10+1
-systemd-timesyncd==247.3-3~bpo10+1
+systemd-sysv==247.3-5~bpo10+1
+systemd-timesyncd==247.3-5~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
-udev==247.3-3~bpo10+1
+udev==247.3-5~bpo10+1
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 73e978935267..e7c51629f9d7 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -6,17 +6,17 @@ future==0.18.2
 importlib-resources==3.3.1
 ipaddr==2.2.0
 ipaddress==1.0.23
-Jinja2==2.11.3
+jinja2==2.11.3
 jsonschema==2.6.0
 lxml==4.6.3
-MarkupSafe==1.1.1
+markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
 pyang==2.4.0
 pyangbind==0.6.0
 python-apt==1.8.4.3
-PyYAML==5.4.1
+pyyaml==5.4.1
 redis==3.5.3
 scandir==1.10.0
 singledispatch==3.6.1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 92bd5b54d785..7f1b649a8a76 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -5,18 +5,18 @@ bitarray==1.5.3
 certifi==2020.12.5
 cffi==1.14.5
 chardet==4.0.0
-Click==7.0
+click==7.0
 cryptography==3.4.7
 docker==4.3.1
 idna==2.10
 ijson==2.6.1
 ipaddress==1.0.23
-Jinja2==3.0.0
+jinja2==3.0.1
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
-M2Crypto==0.37.1
-MarkupSafe==2.0.0
+m2crypto==0.37.1
+markupsafe==2.0.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9
@@ -29,7 +29,7 @@ pyang==2.4.0
 pyangbind==0.8.1
 pycparser==2.20
 python-dateutil==2.8.1
-PyYAML==5.4.1
+pyyaml==5.4.1
 redis==3.5.3
 regex==2021.4.4
 requests==2.25.1
@@ -38,5 +38,5 @@ six==1.16.0
 tabulate==0.8.9
 urllib3==1.26.4
 watchdog==0.10.3
-websocket-client==0.59.0
+websocket-client==1.0.0
 xmltodict==0.12.0
\ No newline at end of file

From 6d732b5857aa168a07e5eb2d1abebf43ad90010d Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:56:59 +0530
Subject: [PATCH 0463/1674] Dell S6000,S6100 system health changes (#6788)

Needed support for platform system health in Dell platforms
---
 .../system_health_monitoring_config.json              | 11 +++++++++++
 .../system_health_monitoring_config.json              | 11 +++++++++++
 .../s6000/sonic_platform/chassis.py                   |  3 +++
 .../s6100/sonic_platform/chassis.py                   |  3 +++
 4 files changed, 28 insertions(+)
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/system_health_monitoring_config.json
 create mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/system_health_monitoring_config.json

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/system_health_monitoring_config.json b/device/dell/x86_64-dell_s6000_s1220-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..bb8ffbcd2172
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+	"services_to_ignore": [],
+	"devices_to_ignore": [],
+	"user_defined_checkers": [],
+	"polling_interval": 60,
+	"led_color": {
+		"fault": "amber",
+		"normal": "green",
+		"booting": "blinking green"
+	}
+}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/system_health_monitoring_config.json b/device/dell/x86_64-dell_s6100_c2538-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..bb8ffbcd2172
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+	"services_to_ignore": [],
+	"devices_to_ignore": [],
+	"user_defined_checkers": [],
+	"polling_interval": 60,
+	"led_color": {
+		"fault": "amber",
+		"normal": "green",
+		"booting": "blinking green"
+	}
+}
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
index 7f6e9ec573f4..08c128d678bc 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
@@ -341,6 +341,9 @@ def get_change_event(self, timeout=0):
                     return True, ret_dict
         return False, ret_dict
 
+    def initizalize_system_led(self):
+        return True
+
     def set_status_led(self, color):
         """
         Sets the state of the system LED
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
index f8e009cdbefd..4527f6947321 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
@@ -372,6 +372,9 @@ def get_change_event(self, timeout=0):
 
         return True, ret_dict
 
+    def initizalize_system_led(self):
+        return True
+
     def set_status_led(self, color):
         """
         Sets the state of the system LED

From d1043e3c91698c809067ef52640d1baf1d9b32e3 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Tue, 18 May 2021 14:19:02 -0700
Subject: [PATCH 0464/1674] add config-setup.service as dependency for
 pcie-check.service (#7599)

Why I did it
start pcie-check.service after config-setup.service since pcie_util depends on device_info which is available with config db metadata.

How I did it
Add config-setup.service as a dependency of pcie-check.service

How to verify it
Upon reboot, check if the pcie-check.sh throws the platform api error which is dependent on DEVICE_METADATA
---
 files/image_config/pcie-check/pcie-check.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/pcie-check/pcie-check.service b/files/image_config/pcie-check/pcie-check.service
index 9df04ea840bc..03c57e28b537 100644
--- a/files/image_config/pcie-check/pcie-check.service
+++ b/files/image_config/pcie-check/pcie-check.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Check the PCIe device presence and status
-After=rc.local.service database.service
+After=rc.local.service database.service config-setup.service
 
 [Service]
 Type=simple

From 839527def838a85160940f7b761b40ffc6757704 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 20 May 2021 22:05:56 +0800
Subject: [PATCH 0465/1674] [ci/build]: Upgrade SONiC package versions (#7659)

---
 files/build/versions/default/versions-py3 | 2 +-
 files/build/versions/default/versions-web | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 4ab1fddb7905..b899a9bb7350 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -2,7 +2,7 @@ attrs==21.2.0
 bitarray==1.5.3
 certifi==2017.4.17
 chardet==4.0.0
-click==8.0.0
+click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.0
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 9405b9a97814..3a49a2f113f0 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -13,7 +13,7 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:6484b93c6b0dfc5f2c425e8abc1e3737850851e7==e3b2bf07ac069c32110a2ebd7425b44d
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
@@ -29,7 +29,7 @@ https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==6289
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.dsc==e76d5deda89795939828c3b39b31d38f
-https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==d41d8cd98f00b204e9800998ecf8427e
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==e3afaa4ac1387449dec703da494dd991
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.debian.tar.xz==0a529cf8d1717b5c3dbe0c61b3512aa1
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.dsc==b88b922d96688c948e90987fcaa3a2de
 https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4.orig.tar.gz==33e8d58623f99184e4e709cbbfe45db3

From 4a53031f59f53284271cf0d4a30b37f479e68f5d Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 20 May 2021 09:59:48 -0700
Subject: [PATCH 0466/1674] [202012][swss/platform-daemons/utilities/kernel]
 Update submodules (#7647)

Includes below commits
```
sonic-swss
05f0438 2021-05-19 | Fix build error (#1751) [Shi Su]
1682a8d 2021-05-12 | [Bulk mode] Improve log in bulk failures (#1740) [Shi Su]
4509e88 2021-04-27 | [routeorch] Add support for blackhole routes (#1723) [Shi Su]
642014d 2019-10-31 | [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (#1111) [Wenda Ni]

sonic-utilities
97fc442 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (#1602) [Lawrence Lee]
f60d579 2021-04-15 | [techsupport] Update show ip interface command (#1562) [Mahesh Maddikayala]
821d29d 2021-04-14 | Fix Multi-ASIC show specific resursive route by using common parsing function (#1560) [gechiang]

sonic-linux-kernel
61b331f 2021-05-06 | [dps200] Add dps200 PSU module driver (#207) [schobtr]

sonic-platform-daemons
5d2960f 2021-05-17 | [xcvrd] add support for logging mux_metrics events into state DB (#185) [vdahiya12]
a5c9207 2021-05-11 | [thermalctld] Enable stopping thermal manager (#180) [Junchao-Mellanox]
9123f63 2021-05-10 | [muxcable] Remove Xcvrd Sleep (#174) [Tamer Ahmed]
```
---
 src/sonic-linux-kernel     | 2 +-
 src/sonic-platform-daemons | 2 +-
 src/sonic-swss             | 2 +-
 src/sonic-utilities        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 24eaf3c1339b..61b331f8b023 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 24eaf3c1339b3ef47096c47c6694e25d94ba449d
+Subproject commit 61b331f8b0231883fe59ba274915f570e8dcea1e
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 6f535dd49f83..5d2960f6b1f7 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 6f535dd49f83043e085c9616586e27c2002cb207
+Subproject commit 5d2960f6b1f7a226f86025d33550767ac7fbe9ad
diff --git a/src/sonic-swss b/src/sonic-swss
index e72fc8d615b0..05f043869591 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e72fc8d615b03563d5e72b6b35c5b781db781a97
+Subproject commit 05f04386959106a4f120e44671205f074442151e
diff --git a/src/sonic-utilities b/src/sonic-utilities
index ab440675ed80..97fc442fb839 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ab440675ed80c2ff6e996ef2cfbcbb1cf77375fa
+Subproject commit 97fc442fb8394ee7ce6a02a372870911ec2a20a0

From 460e1501879ad98bb6b382ce36f5612bc274020b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 22 May 2021 21:14:06 +0800
Subject: [PATCH 0467/1674] [ci/build]: Upgrade SONiC package versions (#7664)

---
 files/build/versions/default/versions-py3            | 4 ++--
 files/build/versions/dockers/docker-ptf/versions-py2 | 2 +-
 files/build/versions/host-image/versions-deb-buster  | 1 +
 files/build/versions/host-image/versions-py3         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index b899a9bb7350..d18a7a081246 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -5,8 +5,8 @@ chardet==4.0.0
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.0.0
-grpcio==1.37.1
+flask==2.0.1
+grpcio==1.38.0
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 2479cfd03739..660f7b46c470 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -5,7 +5,7 @@ cffi==1.14.5
 click==7.1.2
 cryptography==3.3.2
 decorator==4.4.2
-dpkt==1.9.5
+dpkt==1.9.6
 enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 135b627ab8d1..e7153add5ef2 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -117,6 +117,7 @@ libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
+liblz4-1==1.8.3-1+deb10u1
 liblzo2-2==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 7f1b649a8a76..9fb6faf7e1ba 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -38,5 +38,5 @@ six==1.16.0
 tabulate==0.8.9
 urllib3==1.26.4
 watchdog==0.10.3
-websocket-client==1.0.0
+websocket-client==1.0.1
 xmltodict==0.12.0
\ No newline at end of file

From a9af05d1a7c9f84e4617d9df4184c5e1be4341d8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 24 May 2021 21:02:24 +0800
Subject: [PATCH 0468/1674] [ci/build]: Upgrade SONiC package versions (#7686)

---
 files/build/versions/dockers/docker-ptf/versions-deb-stretch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 1eb02dcf4b72..ddf95c3257ae 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -164,8 +164,8 @@ libunistring0==0.9.6+really0.9.3-0.1
 libutempter0==1.1.6-3
 libuv1==1.9.1-3
 libwrap0==7.6.q-26
-libx11-6==2:1.6.4-3+deb9u3
-libx11-data==2:1.6.4-3+deb9u3
+libx11-6==2:1.6.4-3+deb9u4
+libx11-data==2:1.6.4-3+deb9u4
 libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3

From 82093fd669876e14ba2dd1c8a474be10784ac784 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 25 Feb 2021 09:39:36 -0800
Subject: [PATCH 0469/1674] [multi-asic] Enhanced iptable default rules (#6765)

What I did:-

For multi-asic platforms added iptable v4 rule to communicate on docker bridge ip
For multi-asic platforms extend iptable v4 rule for iptable v6 also
For multi-asic program made all internal rules applicable for all protocols (not filter based on tcp/udp). This is done to be consistent same as local host rule
For multi-asic platforms made nat rule (to forward traffic from namespace to host) generic for all protocols and also use Source IP if present for matching
---
 src/sonic-host-services/scripts/caclmgrd | 142 +++++++++++++++--------
 1 file changed, 93 insertions(+), 49 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index db2eeeba5c28..f1d2a41abd90 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -63,19 +63,23 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
     ACL_SERVICES = {
         "NTP": {
             "ip_protocols": ["udp"],
-            "dst_ports": ["123"]
+            "dst_ports": ["123"],
+            "multi_asic_ns_to_host_fwd":False
         },
         "SNMP": {
             "ip_protocols": ["tcp", "udp"],
-            "dst_ports": ["161"]
+            "dst_ports": ["161"],
+            "multi_asic_ns_to_host_fwd":True
         },
         "SSH": {
             "ip_protocols": ["tcp"],
-            "dst_ports": ["22"]
+            "dst_ports": ["22"],
+            "multi_asic_ns_to_host_fwd":True
         },
         "ANY": {
             "ip_protocols": ["any"],
-            "dst_ports": ["0"]
+            "dst_ports": ["0"],
+            "multi_asic_ns_to_host_fwd":False
         }
     }
 
@@ -226,54 +230,81 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -s {} -d {} -j ACCEPT".format
                                                 (self.namespace_docker_mgmt_ip[namespace], self.namespace_docker_mgmt_ip[namespace]))
 
-            # For namespace docker allow all tcp/udp traffic from host docker bridge to its eth0 management ip
-            allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p tcp -s {} -d {} -j ACCEPT".format
+            allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -s {} -d {} -j ACCEPT".format
+                                                (self.namespace_docker_mgmt_ipv6[namespace], self.namespace_docker_mgmt_ipv6[namespace]))
+            allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -s {} -d {} -j ACCEPT".format
                                                  (self.namespace_mgmt_ip, self.namespace_docker_mgmt_ip[namespace]))
 
-            allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p udp -s {} -d {} -j ACCEPT".format
-                                                 (self.namespace_mgmt_ip, self.namespace_docker_mgmt_ip[namespace]))
+            allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -s {} -d {} -j ACCEPT".format
+                                                 (self.namespace_mgmt_ipv6, self.namespace_docker_mgmt_ipv6[namespace]))
+
         else:
+
+            # Also host namespace communication on docker bridge on multi-asic.
+            if self.namespace_docker_mgmt_ip:
+                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -s {} -d {} -j ACCEPT".format
+                                                    (self.namespace_mgmt_ip, self.namespace_mgmt_ip))
+
+            if self.namespace_docker_mgmt_ipv6:
+                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -s {} -d {} -j ACCEPT".format
+                                                    (self.namespace_mgmt_ipv6, self.namespace_mgmt_ipv6))
             # In host allow all tcp/udp traffic from namespace docker eth0 management ip to host docker bridge
             for docker_mgmt_ip in list(self.namespace_docker_mgmt_ip.values()):
-                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p tcp -s {} -d {} -j ACCEPT".format
+                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -s {} -d {} -j ACCEPT".format
                                                      (docker_mgmt_ip, self.namespace_mgmt_ip))
 
-                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p udp -s {} -d {} -j ACCEPT".format
-                                                     (docker_mgmt_ip, self.namespace_mgmt_ip))
+            for docker_mgmt_ipv6 in list(self.namespace_docker_mgmt_ipv6.values()):
+                allow_internal_docker_ip_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -s {} -d {} -j ACCEPT".format
+                                                     (docker_mgmt_ipv6, self.namespace_mgmt_ipv6))
+
         return allow_internal_docker_ip_cmds
 
-    def generate_fwd_snmp_traffic_from_namespace_to_host_commands(self, namespace):
+    def generate_fwd_traffic_from_namespace_to_host_commands(self, namespace, acl_source_ip_map):
         """
-        The below SNAT and DNAT rules are added in asic namespace in multi-ASIC platforms. It helps to forward the SNMP request coming
-        in through the front panel interfaces created/present in the asic namespace to the SNMP Agent running in SNMP container in
-        linux host network namespace. The external IP addresses are NATed to the internal docker IP addresses for the SNMP Agent to respond.
+        The below SNAT and DNAT rules are added in asic namespace in multi-ASIC platforms. It helps to forward request coming
+        in through the front panel interfaces created/present in the asic namespace for the servie running in linux host network namespace. 
+        The external IP addresses are NATed to the internal docker IP addresses for the Host service to respond.
         """
-        fwd_snmp_traffic_from_namespace_to_host_cmds = []
 
-        if namespace:
-            # IPv4 rules
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -t nat -X")
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -t nat -F")
-
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                               "iptables -t nat -A PREROUTING -p udp --dport {}  -j DNAT --to-destination {}".format
-                                               (self.ACL_SERVICES['SNMP']['dst_ports'][0], self.namespace_mgmt_ip))
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                               "iptables -t nat -A POSTROUTING -p udp --dport {} -j SNAT --to-source {}".format
-                                               (self.ACL_SERVICES['SNMP']['dst_ports'][0], self.namespace_docker_mgmt_ip[namespace]))
-
-            # IPv6 rules
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -t nat -X")
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -t nat -F")
-
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                               "ip6tables -t nat -A PREROUTING -p udp --dport {}  -j DNAT --to-destination {}".format
-                                               (self.ACL_SERVICES['SNMP']['dst_ports'][0], self.namespace_mgmt_ipv6))
-            fwd_snmp_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                               "ip6tables -t nat -A POSTROUTING -p udp --dport {} -j SNAT --to-source {}".format
-                                               (self.ACL_SERVICES['SNMP']['dst_ports'][0], self.namespace_docker_mgmt_ipv6[namespace]))
-
-        return fwd_snmp_traffic_from_namespace_to_host_cmds
+        if not namespace:
+            return []
+
+        fwd_traffic_from_namespace_to_host_cmds = []
+        fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -t nat -X")
+        fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -t nat -F")
+        fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -t nat -X")
+        fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -t nat -F")
+
+        for acl_service in self.ACL_SERVICES:
+            if self.ACL_SERVICES[acl_service]["multi_asic_ns_to_host_fwd"]:
+                # Get the Source IP Set if exists else use default source ip prefix
+                nat_source_ipv4_set = acl_source_ip_map[acl_service]["ipv4"] if acl_source_ip_map and acl_source_ip_map[acl_service]["ipv4"] else { "0.0.0.0/0" }
+                nat_source_ipv6_set = acl_source_ip_map[acl_service]["ipv6"] if acl_source_ip_map and acl_source_ip_map[acl_service]["ipv6"] else { "::/0" }
+
+                for ip_protocol in self.ACL_SERVICES[acl_service]["ip_protocols"]:
+                    for dst_port in  self.ACL_SERVICES[acl_service]["dst_ports"]: 
+                        for ipv4_src_ip in nat_source_ipv4_set:
+                            # IPv4 rules
+                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                               "iptables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
+                                                               (ip_protocol, ipv4_src_ip, dst_port,
+                                                                self.namespace_mgmt_ip))
+                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                               "iptables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
+                                                               (ip_protocol, ipv4_src_ip, dst_port,
+                                                                self.namespace_docker_mgmt_ip[namespace]))
+                        for ipv6_src_ip in nat_source_ipv6_set:
+                            # IPv6 rules
+                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                               "ip6tables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
+                                                               (ip_protocol, ipv6_src_ip, dst_port,
+                                                                self.namespace_mgmt_ipv6))
+                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                               "ip6tables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
+                                                               (ip_protocol,ipv6_src_ip, dst_port,
+                                                                self.namespace_docker_mgmt_ipv6[namespace]))
+
+        return fwd_traffic_from_namespace_to_host_cmds
 
     def is_rule_ipv4(self, rule_props):
         if (("SRC_IP" in rule_props and rule_props["SRC_IP"]) or
@@ -298,6 +329,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             A list of strings, each string is an iptables shell command
         """
         iptables_cmds = []
+        service_to_source_ip_map = {}
 
         # First, add iptables commands to set default policies to accept all
         # traffic. In case we are connected remotely, the connection will not
@@ -436,7 +468,8 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                     self.log_warning("Unable to determine if ACL table '{}' contains IPv4 or IPv6 rules. Skipping table..."
                                      .format(table_name))
                     continue
-
+                ipv4_src_ip_set = set()
+                ipv6_src_ip_set = set()
                 # For each ACL rule in this table (in descending order of priority)
                 for priority in sorted(iter(acl_rules.keys()), reverse=True):
                     rule_props = acl_rules[priority]
@@ -456,8 +489,12 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
  
                             if "SRC_IPV6" in rule_props and rule_props["SRC_IPV6"]:
                                 rule_cmd += " -s {}".format(rule_props["SRC_IPV6"])
+                                if rule_props["PACKET_ACTION"] == "ACCEPT":
+                                    ipv6_src_ip_set.add(rule_props["SRC_IPV6"])
                             elif "SRC_IP" in rule_props and rule_props["SRC_IP"]:
                                 rule_cmd += " -s {}".format(rule_props["SRC_IP"])
+                                if rule_props["PACKET_ACTION"] == "ACCEPT":
+                                    ipv4_src_ip_set.add(rule_props["SRC_IP"])
 
                             # Destination port 0 is reserved/unused port, so, using it to apply the rule to all ports.
                             if dst_port != "0":
@@ -479,6 +516,9 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                             iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + rule_cmd)
                             num_ctrl_plane_acl_rules += 1
 
+
+                service_to_source_ip_map.update({ acl_service:{ "ipv4":ipv4_src_ip_set, "ipv6":ipv6_src_ip_set } })
+
         # Add iptables commands to block ip2me traffic
         iptables_cmds += self.generate_block_ip2me_traffic_iptables_commands(namespace)
 
@@ -493,7 +533,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -j DROP")
             iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -j DROP")
 
-        return iptables_cmds
+        return iptables_cmds, service_to_source_ip_map
 
     def update_control_plane_acls(self, namespace):
         """
@@ -501,20 +541,25 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         Config DB, translates control plane ACLs into a list of iptables
         commands and runs them.
         """
-        iptables_cmds = self.get_acl_rules_and_translate_to_iptables_commands(namespace)
+        iptables_cmds, service_to_source_ip_map  = self.get_acl_rules_and_translate_to_iptables_commands(namespace)
         self.log_info("Issuing the following iptables commands:")
         for cmd in iptables_cmds:
             self.log_info("  " + cmd)
 
         self.run_commands(iptables_cmds)
 
-    def update_control_plane_nat_acls(self, namespace):
+        self.update_control_plane_nat_acls(namespace, service_to_source_ip_map)
+
+    def update_control_plane_nat_acls(self, namespace, service_to_source_ip_map):
         """
-        Convenience wrapper which programs the NAT rules for allowing the
-        snmp traffic coming on the front panel interface
+        Convenience wrapper for multi-asic platforms 
+        which programs the NAT rules for redirecting the
+        traffic coming on the front panel interface map to namespace 
+        to the host.
         """
-        # Add iptables commands to allow front panel snmp traffic
-        iptables_cmds = self.generate_fwd_snmp_traffic_from_namespace_to_host_commands(namespace)
+        # Add iptables commands to allow front panel traffic
+        iptables_cmds = self.generate_fwd_traffic_from_namespace_to_host_commands(namespace, service_to_source_ip_map)
+
         self.log_info("Issuing the following iptables commands:")
         for cmd in iptables_cmds:
             self.log_info("  " + cmd)
@@ -580,7 +625,6 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         for namespace in list(self.config_db_map.keys()):
             # Unconditionally update control plane ACLs once at start on given namespace
             self.update_control_plane_acls(namespace)
-            self.update_control_plane_nat_acls(namespace)
             # Connect to Config DB of given namespace
             acl_db_connector = swsscommon.DBConnector("CONFIG_DB", 0, False, namespace)
             # Subscribe to notifications when ACL tables changes

From 8f6b3456ab583c47f49b8c065a0c27ff2a5b3d68 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 25 Feb 2021 23:15:02 -0800
Subject: [PATCH 0470/1674] [multi-asic] BBR support on internal-peers for
 multi-asic platfroms. (#6848)

Enable BBR config allowas-in 1 for internal peers

Why I did:
To advertise BBR routes learnt via e-BGP peer in one asic/namespace to another iBGP asic/namespace via Route Reflector.
---
 .../frr/bgpd/templates/internal/peer-group.conf.j2              | 2 ++
 .../tests/data/internal/peer-group.conf/result_back.conf        | 2 ++
 .../tests/data/internal/peer-group.conf/result_front.conf       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2
index 323c13447ed0..c0ee4d99b796 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2
@@ -8,6 +8,7 @@
     neighbor INTERNAL_PEER_V4 route-reflector-client
 {% endif %}
     neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V4 allowas-in 1
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
   exit-address-family
@@ -16,6 +17,7 @@
     neighbor INTERNAL_PEER_V6 route-reflector-client
 {% endif %}
     neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V6 allowas-in 1
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
   exit-address-family
diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf
index 15076685eb1a..28a543841fef 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf
@@ -6,12 +6,14 @@
   address-family ipv4
     neighbor INTERNAL_PEER_V4 route-reflector-client
     neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V4 allowas-in 1
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
   exit-address-family
   address-family ipv6
     neighbor INTERNAL_PEER_V6 route-reflector-client
     neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V6 allowas-in 1
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
   exit-address-family
diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf
index 8f4aa450f5db..5b061fa52b44 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf
@@ -5,11 +5,13 @@
   neighbor INTERNAL_PEER_V6 peer-group
   address-family ipv4
     neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V4 allowas-in 1
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
   exit-address-family
   address-family ipv6
     neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
+    neighbor INTERNAL_PEER_V6 allowas-in 1
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
   exit-address-family

From dbded1f48ee7bef8397ba87442e5136d7ea6eaa4 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Fri, 26 Feb 2021 17:05:15 -0800
Subject: [PATCH 0471/1674] Changes in FRR temapltes for multi-asic (#6901)

1. Made the command next-hop-self force only applicable on back-end asic bgp. This is done so that BGPL iBGP session running on backend can send e-BGP learn nexthop. Back end asic FRR is able to recursively resolve the eBGP nexthop in its routing table since it knows about all the connected routes advertise from front end asic.

2. Made all front-end asic bgp use global loopback ip (Loopback0) as router id and back end asic bgp use Loopbacl4096 as ruter-id and originator id for Route-Reflector. This is done so that routes learnt by external peer do not see Loopback4096 as router id in show ip bgp <route-prerfix> output.

3. To handle above change need to pass Loopback4096 from BGP manager for jinja2 template generation. This was missing and this change/fix is needed for this also https://github.com/Azure/sonic-buildimage/blob/master/dockers/docker-fpm-frr/frr/bgpd/templates/dynamic/instance.conf.j2#L27

4. Enhancement to add mult_asic specific bgpd template generation unit test cases.
---
 .../docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 |  7 +-
 .../bgpd/templates/internal/instance.conf.j2  |  3 +-
 .../bgpd/templates/internal/policies.conf.j2  |  7 +-
 src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py     |  4 +-
 .../instance.conf/result_back_v4.conf         |  2 +-
 .../instance.conf/result_back_v6.conf         |  2 +-
 .../instance.conf/result_front_v4.conf        |  1 -
 .../instance.conf/result_front_v6.conf        |  1 -
 .../internal/policies.conf/param_back.json    |  6 +-
 .../internal/policies.conf/result_back.conf   |  2 +-
 .../internal/policies.conf/result_front.conf  |  2 +-
 .../data/sonic-cfggen/bgpd.conf.j2/all.conf   |  4 +
 .../data/sonic-cfggen/bgpd.conf.j2/all.json   |  4 +-
 .../sonic-cfggen/bgpd.main.conf.j2/all.conf   |  4 +
 .../sonic-cfggen/bgpd.main.conf.j2/all.json   |  4 +-
 .../bgpd.main.conf.j2/defaults.conf           |  4 +
 .../bgpd.main.conf.j2/defaults.json           |  4 +-
 .../data/sonic-cfggen/frr.conf.j2/all.conf    |  7 +-
 .../data/sonic-cfggen/frr.conf.j2/all.json    |  6 +-
 src/sonic-config-engine/sonic-cfggen          |  4 +-
 .../py2/bgpd_frr_backend_asic.conf            | 78 +++++++++++++++++
 .../py2/bgpd_frr_frontend_asic.conf           | 84 +++++++++++++++++++
 .../py3/bgpd_frr_backend_asic.conf            | 78 +++++++++++++++++
 .../py3/bgpd_frr_frontend_asic.conf           | 84 +++++++++++++++++++
 .../tests/test_multinpu_cfggen.py             | 23 +++++
 25 files changed, 399 insertions(+), 26 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index 9568d4821547..cf0b0f0077c6 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -33,6 +33,7 @@ ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq {{ loop.index * 5 }} permit {{ prefi
 {% if DEVICE_METADATA['localhost']['sub_role'] == 'FrontEnd' or DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
 route-map HIDE_INTERNAL permit 10
   set community local-AS
+{% set multi_asic = True %}
 !
 {% endif %}
 !
@@ -54,7 +55,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% endif %}
 !
 {# set router-id #}
-{% if multi_asic() %}
+{% if DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
   bgp router-id {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}
 {% else %}
   bgp router-id {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}
@@ -62,7 +63,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 !
 {# advertise loopback #}
   network {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/32
-{% if multi_asic()  %}
+{% if multi_asic is defined  %}
   network {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/32 route-map HIDE_INTERNAL
 {% endif %}
 !
@@ -71,7 +72,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
     network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/64
   exit-address-family
 {% endif %}
-{% if multi_asic() %}
+{% if multi_asic is defined %}
 {% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") != 'None' %}
   address-family ipv6
     network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/64 route-map HIDE_INTERNAL
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
index 59781d024ab0..44c70f49bd67 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
@@ -11,6 +11,7 @@
     neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V4
 !
 {%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
+    neighbor {{ neighbor_addr }} next-hop-self force
     neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V4 in
 {%   endif %}
 !
@@ -19,6 +20,7 @@
     neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V6
 !
 {%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
+    neighbor {{ neighbor_addr }} next-hop-self force
     neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V6 in
 {%   endif %}
 {% endif %}
@@ -27,7 +29,6 @@
     neighbor {{ neighbor_addr }} route-reflector-client
 {%   endif %}
 !
-    neighbor {{ neighbor_addr }} next-hop-self force
 !
     neighbor {{ neighbor_addr }} activate
   exit-address-family
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/policies.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/policies.conf.j2
index 81d3b0041179..855a68635653 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/policies.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/policies.conf.j2
@@ -2,6 +2,7 @@
 ! template: bgpd/templates/internal/policies.conf.j2
 !
 !
+{% from "common/functions.conf.j2" import get_ipv4_loopback_address %}
 !
 route-map FROM_BGP_INTERNAL_PEER_V4 permit 100
 !
@@ -9,8 +10,8 @@ route-map TO_BGP_INTERNAL_PEER_V4 permit 100
 !
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 1
- on-match next
  set ipv6 next-hop prefer-global
+ on-match next
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 100
 !
@@ -18,10 +19,10 @@ route-map TO_BGP_INTERNAL_PEER_V6 permit 100
 !
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
 route-map FROM_BGP_INTERNAL_PEER_V4 permit 2
- set originator-id {{ loopback0_ipv4 | ip }}
+ set originator-id {{ get_ipv4_loopback_address(CONFIG_DB__LOOPBACK_INTERFACE, "Loopback4096") | ip }}
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 2
- set originator-id {{ loopback0_ipv4 | ip }}
+ set originator-id {{ get_ipv4_loopback_address(CONFIG_DB__LOOPBACK_INTERFACE, "Loopback4096") | ip }}
 {% endif %}
 !
 ! end of template: bgpd/templates/internal/policies.conf.j2
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py b/src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py
index f6108bfb61c4..3ab7dba4f612 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py
@@ -191,6 +191,8 @@ def add_peer(self, vrf, nbr, data):
             'neighbor_addr': nbr,
             'bgp_session': data,
             'loopback0_ipv4': lo0_ipv4,
+            'CONFIG_DB__LOOPBACK_INTERFACE':{ tuple(key.split('|')) : {} for key in self.directory.get_slot("CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME)
+                                                                         if '|' in key }
         }
         if self.check_neig_meta:
             neigmeta = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_NEIGHBOR_METADATA_TABLE_NAME)
@@ -384,4 +386,4 @@ def load_peers():
                 log_crit("Can't read vrf '%s' neighbors: %s" % (vrf, str(err)))
                 raise Exception("Can't read vrf '%s' neighbors: %s" % (vrf, str(err)))
 
-        return peers
\ No newline at end of file
+        return peers
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
index df8db8311f35..43fdc12921bc 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
@@ -7,9 +7,9 @@
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
+    neighbor 10.10.10.10 next-hop-self force
     neighbor 10.10.10.10 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor 10.10.10.10 route-reflector-client
-    neighbor 10.10.10.10 next-hop-self force
     neighbor 10.10.10.10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
index a300edb0e512..811f7b808478 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
@@ -7,9 +7,9 @@
   neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
+    neighbor fc::10 next-hop-self force
     neighbor fc::10 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor fc::10 route-reflector-client
-    neighbor fc::10 next-hop-self force
     neighbor fc::10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
index f848ebd457d4..baabea0091e4 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
@@ -7,7 +7,6 @@
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
-    neighbor 10.10.10.10 next-hop-self force
     neighbor 10.10.10.10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
index 09c021b9195b..b6c1355f73c2 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
@@ -7,7 +7,6 @@
   neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
-    neighbor fc::10 next-hop-self force
     neighbor fc::10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/param_back.json b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/param_back.json
index 148456fe960f..37e54d785e27 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/param_back.json
+++ b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/param_back.json
@@ -4,5 +4,7 @@
             "sub_role": "BackEnd"
         }
     },
-    "loopback0_ipv4": "10.10.10.10/32"
-}
\ No newline at end of file
+    "CONFIG_DB__LOOPBACK_INTERFACE": {
+        "Loopback4096|10.10.10.10/32": {}
+    }
+}
diff --git a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_back.conf b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_back.conf
index 81bf0808f77a..81b5aab193c6 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_back.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_back.conf
@@ -6,8 +6,8 @@ route-map FROM_BGP_INTERNAL_PEER_V4 permit 100
 route-map TO_BGP_INTERNAL_PEER_V4 permit 100
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 1
- on-match next
  set ipv6 next-hop prefer-global
+ on-match next
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 100
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_front.conf b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_front.conf
index 94dc55a5458f..880530a2797e 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_front.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/policies.conf/result_front.conf
@@ -6,8 +6,8 @@ route-map FROM_BGP_INTERNAL_PEER_V4 permit 100
 route-map TO_BGP_INTERNAL_PEER_V4 permit 100
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 1
- on-match next
  set ipv6 next-hop prefer-global
+ on-match next
 !
 route-map FROM_BGP_INTERNAL_PEER_V6 permit 100
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index 43a65bd2dd61..e2f9964766c1 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -51,10 +51,14 @@ router bgp 55555
   bgp router-id 55.55.55.55
 !
   network 55.55.55.55/32
+  network 55.55.55.56/32 route-map HIDE_INTERNAL
 !
   address-family ipv6
     network fc00::1/64
   exit-address-family
+  address-family ipv6
+    network fc00::2/64 route-map HIDE_INTERNAL
+  exit-address-family
 !
   network 10.10.10.1/24
   address-family ipv6
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
index 17e32589d84c..bc266ed70429 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
@@ -8,7 +8,9 @@
     },
     "LOOPBACK_INTERFACE": {
         "Loopback0|55.55.55.55/32": {},
-        "Loopback0|fc00::1/128": {}
+        "Loopback0|fc00::1/128": {},
+        "Loopback4096|55.55.55.56/32": {},
+        "Loopback4096|fc00::2/128": {}
     },
     "VLAN_INTERFACE": {
         "Vlan10|10.10.10.1/24": {},
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index 4a749516fe18..c7f2971fd7c0 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -33,10 +33,14 @@ router bgp 55555
   bgp router-id 55.55.55.55
 !
   network 55.55.55.55/32
+  network 55.55.55.56/32 route-map HIDE_INTERNAL
 !
   address-family ipv6
     network fc00::1/64
   exit-address-family
+  address-family ipv6
+    network fc00::2/64 route-map HIDE_INTERNAL
+  exit-address-family
 !
   network 10.10.10.1/24
   address-family ipv6
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
index 3d5d07d95f09..c8f0141ec4f5 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
@@ -7,7 +7,9 @@
     },
     "LOOPBACK_INTERFACE": {
         "Loopback0|55.55.55.55/32": {},
-        "Loopback0|fc00::1/128": {}
+        "Loopback0|fc00::1/128": {},
+        "Loopback4096|55.55.55.56/32": {},
+        "Loopback4096|fc00::2/128": {}
     },
     "VLAN_INTERFACE": {
         "Vlan10|10.10.10.1/24": {},
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 30fc479d6af8..431499ceaf92 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -33,10 +33,14 @@ router bgp 55555
   bgp router-id 55.55.55.55
 !
   network 55.55.55.55/32
+  network 55.55.55.56/32 route-map HIDE_INTERNAL
 !
   address-family ipv6
     network fc00::1/64
   exit-address-family
+  address-family ipv6
+    network fc00::2/64 route-map HIDE_INTERNAL
+  exit-address-family
 !
   network 10.10.10.1/24
   address-family ipv6
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
index e841437650ac..5b30406668ab 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
@@ -7,7 +7,9 @@
     },
     "LOOPBACK_INTERFACE": {
         "Loopback0|55.55.55.55/32": {},
-        "Loopback0|fc00::1/128": {}
+        "Loopback0|fc00::1/128": {},
+        "Loopback4096|55.55.55.56/32": {},
+        "Loopback4096|fc00::2/128": {}
     },
     "VLAN_INTERFACE": {
         "Vlan10|10.10.10.1/24": {},
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index 37b7691ad95f..e977d2b5cffc 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -36,11 +36,10 @@ link-detect
 ip route 0.0.0.0/0 10.10.10.1 200
 !!
 !
-!
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00::/64 Loopback0
-!
 !!
+!
 ! template: bgpd/bgpd.main.conf.j2
 !
 ! bgp multiple-instance
@@ -75,10 +74,14 @@ router bgp 55555
   bgp router-id 55.55.55.55
 !
   network 55.55.55.55/32
+  network 55.55.55.56/32 route-map HIDE_INTERNAL
 !
   address-family ipv6
     network fc00::1/64
   exit-address-family
+  address-family ipv6
+    network fc00::2/64 route-map HIDE_INTERNAL
+  exit-address-family
 !
   network 10.10.10.1/24
   address-family ipv6
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
index d81eba2b0fe6..92143a2a9deb 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
@@ -21,7 +21,9 @@
     },
     "LOOPBACK_INTERFACE": {
         "Loopback0|55.55.55.55/32": {},
-        "Loopback0|fc00::1/128": {}
+        "Loopback0|fc00::1/128": {},
+        "Loopback4096|55.55.55.56/32": {},
+        "Loopback4096|fc00::2/128": {}
     },
     "VLAN_INTERFACE": {
         "Vlan10|10.10.10.1/24": {},
@@ -43,4 +45,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index e6a1726052f4..d895c0dde12c 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -41,7 +41,7 @@ from functools import partial
 from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role
 from portconfig import get_port_config, get_breakout_mode
 from redis_bcc import RedisBytecodeCache
-from sonic_py_common.multi_asic import get_asic_id_from_name, is_multi_asic
+from sonic_py_common.multi_asic import get_asic_id_from_name
 from sonic_py_common import device_info
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
 
@@ -251,8 +251,6 @@ def _get_jinja2_env(paths):
     env.filters['ip_network'] = ip_network
     for attr in ['ip', 'network', 'prefixlen', 'netmask', 'broadcast']:
         env.filters[attr] = partial(prefix_attr, attr)
-    # Pass the is_multi_asic function as global
-    env.globals['multi_asic'] = is_multi_asic
 
     return env
 
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
new file mode 100644
index 000000000000..ce4f4d7ce23f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -0,0 +1,78 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname multi_npu_platform_01
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+!
+route-map HIDE_INTERNAL permit 10
+  set community local-AS
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+!
+  bgp router-id 8.0.0.5
+!
+  network 10.1.0.32/32
+  network 8.0.0.5/32 route-map HIDE_INTERNAL
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+  address-family ipv6
+    network fd00:4::32/64 route-map HIDE_INTERNAL
+  exit-address-family
+!
+!
+!
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
new file mode 100644
index 000000000000..dcdcc78af033
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -0,0 +1,84 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname multi_npu_platform_01
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+!
+route-map HIDE_INTERNAL permit 10
+  set community local-AS
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+!
+  bgp router-id 10.1.0.32
+!
+  network 10.1.0.32/32
+  network 8.0.0.0/32 route-map HIDE_INTERNAL
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+  address-family ipv6
+    network fd00:1::32/64 route-map HIDE_INTERNAL
+  exit-address-family
+!
+!
+!
+  address-family ipv4
+    redistribute connected route-map HIDE_INTERNAL
+  exit-address-family
+  address-family ipv6
+    redistribute connected route-map HIDE_INTERNAL
+  exit-address-family
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
new file mode 100644
index 000000000000..ce4f4d7ce23f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -0,0 +1,78 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname multi_npu_platform_01
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+!
+route-map HIDE_INTERNAL permit 10
+  set community local-AS
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+!
+  bgp router-id 8.0.0.5
+!
+  network 10.1.0.32/32
+  network 8.0.0.5/32 route-map HIDE_INTERNAL
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+  address-family ipv6
+    network fd00:4::32/64 route-map HIDE_INTERNAL
+  exit-address-family
+!
+!
+!
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
new file mode 100644
index 000000000000..dcdcc78af033
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -0,0 +1,84 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname multi_npu_platform_01
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+!
+route-map HIDE_INTERNAL permit 10
+  set community local-AS
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+!
+  bgp router-id 10.1.0.32
+!
+  network 10.1.0.32/32
+  network 8.0.0.0/32 route-map HIDE_INTERNAL
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+  address-family ipv6
+    network fd00:1::32/64 route-map HIDE_INTERNAL
+  exit-address-family
+!
+!
+!
+  address-family ipv4
+    redistribute connected route-map HIDE_INTERNAL
+  exit-address-family
+  address-family ipv6
+    redistribute connected route-map HIDE_INTERNAL
+  exit-address-family
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
index 542b480da72d..37a3351dd5ee 100644
--- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py
+++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
@@ -1,3 +1,4 @@
+import filecmp
 import json
 import os
 import shutil
@@ -26,6 +27,7 @@ def setUp(self):
         self.port_config = []
         for asic in range(NUM_ASIC):
             self.port_config.append(os.path.join(self.test_data_dir, "sample_port_config-{}.ini".format(asic)))
+        self.output_file = os.path.join(self.test_dir, 'output')
 
     def run_script(self, argument, check_stderr=False):
         print('\n    Running sonic-cfggen ' + argument)
@@ -47,6 +49,22 @@ def run_script(self, argument, check_stderr=False):
     def run_diff(self, file1, file2):
         return subprocess.check_output('diff -u {} {} || true'.format(file1, file2), shell=True)
 
+    def run_frr_asic_case(self, template, target, asic, port_config):
+        template_dir = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-frr', "frr")
+        conf_template = os.path.join(template_dir, template)
+        constants = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'constants', 'constants.yml')
+        cmd_args = asic, self.sample_graph, port_config, constants, conf_template, template_dir, self.output_file
+        cmd = "-n %s -m %s -p %s -y %s -t %s -T %s > %s" % cmd_args
+        self.run_script(cmd)
+
+        original_filename = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, target)
+        r = filecmp.cmp(original_filename, self.output_file)
+        diff_output = self.run_diff(original_filename, self.output_file) if not r else ""
+
+        return r, "Diff:\n" + diff_output
+
+
+
     def run_script_for_asic(self,argument,asic, port_config=None):
         argument = "{} -n asic{} ".format(argument, asic)
         if port_config:
@@ -352,3 +370,8 @@ def test_buffers_multi_asic_template(self):
                 }
             }
         )
+    def test_bgpd_frr_frontendasic(self):
+        self.assertTrue(*self.run_frr_asic_case('bgpd/bgpd.conf.j2', 'bgpd_frr_frontend_asic.conf', "asic0", self.port_config[0]))
+    
+    def test_bgpd_frr_backendasic(self):
+        self.assertTrue(*self.run_frr_asic_case('bgpd/bgpd.conf.j2', 'bgpd_frr_backend_asic.conf', "asic3", self.port_config[3]))

From c692148205c54f9d369a728a3df61d55d956c4a5 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Mon, 5 Apr 2021 18:55:10 -0700
Subject: [PATCH 0472/1674] [multi-asic] optimize api that checks
 port/port-channel/bgp is internal (#7232)

Optimize the API's is_port_internal() , is_portchannel_internal() and is_bgp_internal ()to call get_entry(Redis hget) instead of get_table (Redis keys *)
---
 .../sonic_py_common/multi_asic.py             | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/sonic-py-common/sonic_py_common/multi_asic.py b/src/sonic-py-common/sonic_py_common/multi_asic.py
index 4a35848722ea..3bb2984c8b95 100644
--- a/src/sonic-py-common/sonic_py_common/multi_asic.py
+++ b/src/sonic-py-common/sonic_py_common/multi_asic.py
@@ -230,6 +230,23 @@ def get_namespace_list(namespace=None):
 
     return ns_list
 
+def get_port_entry(port, namespace):
+    """
+    Retrieves the given port information
+
+    Returns:
+        a dict of given port entry
+    """
+    all_ports = {}
+    ns_list = get_namespace_list(namespace)
+
+    for ns in ns_list:
+        ports = get_port_entry_for_asic(port, ns)
+        if ports:
+            return ports
+
+    return all_ports
+
 
 def get_port_table(namespace=None):
     """
@@ -247,6 +264,12 @@ def get_port_table(namespace=None):
 
     return all_ports
 
+def get_port_entry_for_asic(port, namespace):
+
+    config_db = connect_config_db_for_ns(namespace)
+    ports = config_db.get_entry(PORT_CFG_DB_TABLE, port)
+    return ports
+
 
 def get_port_table_for_asic(namespace):
 
@@ -274,14 +297,14 @@ def get_namespace_for_port(port_name):
 
 def get_port_role(port_name, namespace=None):
 
-    ports_config = get_port_table(namespace)
-    if port_name not in ports_config:
+    ports_config = get_port_entry(port_name, namespace)
+    if not ports_config:
         raise ValueError('Unknown port name {}'.format(port_name))
 
-    if PORT_ROLE not in ports_config[port_name]:
+    if PORT_ROLE not in ports_config:
         return EXTERNAL_PORT
 
-    role = ports_config[port_name][PORT_ROLE]
+    role = ports_config[PORT_ROLE]
     return role
 
 
@@ -315,11 +338,11 @@ def is_port_channel_internal(port_channel, namespace=None):
 
     for ns in ns_list:
         config_db = connect_config_db_for_ns(ns)
-        port_channels = config_db.get_table(PORT_CHANNEL_CFG_DB_TABLE)
+        port_channels = config_db.get_entry(PORT_CHANNEL_CFG_DB_TABLE, port_channel)
 
-        if port_channel in port_channels:
-            if 'members' in port_channels[port_channel]:
-                members = port_channels[port_channel]['members']
+        if port_channels:
+            if 'members' in port_channels:
+                members = port_channels['members']
                 if is_port_internal(members[0], namespace):
                     return True
 
@@ -363,8 +386,8 @@ def is_bgp_session_internal(bgp_neigh_ip, namespace=None):
     for ns in ns_list:
 
         config_db = connect_config_db_for_ns(ns)
-        bgp_sessions = config_db.get_table(BGP_INTERNAL_NEIGH_CFG_DB_TABLE)
-        if bgp_neigh_ip in bgp_sessions:
+        bgp_sessions = config_db.get_entry(BGP_INTERNAL_NEIGH_CFG_DB_TABLE, bgp_neigh_ip)
+        if bgp_sessions:
             return True
 
     return False

From 75071a98f47a0afbfffa8f6db8685b05d904d5d9 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 7 Apr 2021 13:35:34 -0700
Subject: [PATCH 0473/1674] [multi-asic] Make sure Everflow tables always gets
 classified as Mirror table (#7241)

Make sure Everflow always gets classified as Mirror table and not as Control Plane on multi-asic platforms.

Why I did:
In Multi-asic platforms we generate Everflow acl table data from minigraph for both host and namespace.
It is possible in multi-asic minigraph if there are no external port-channel (Only Router Port IP Interface) then Everflow table will have no binded interface in host and will gets classified as Control Plane ACL while in namespace gets classified as Mirror Table.
For ACL Rule generation we read global db as source of truth for acl table information and so for everflow rule generation if tables gets classified as Control plane we can generate rules with invalid action causing orchagent to throw runtime error.

How I did:
If the table is attach to erspan interface in minigraph then it always gets classified as mirror table.
---
 src/sonic-config-engine/minigraph.py          |    6 +-
 .../sample-minigraph-noportchannel.xml        | 1299 +++++++++++++++++
 .../tests/test_multinpu_cfggen.py             |   34 +
 3 files changed, 1338 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/tests/multi_npu_data/sample-minigraph-noportchannel.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 7b5b5ab095d4..661287791763 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -606,7 +606,11 @@ def parse_dpg(dpg, hname):
                         if panel_port not in intfs_inpc and panel_port not in acl_intfs:
                             acl_intfs.append(panel_port)
                     break
-            if acl_intfs:
+            # if acl is classified as mirror (erpsan) or acl interface 
+            # are binded then do not classify as Control plane.
+            # For multi-asic platforms it's possible there is no
+            # interface are binded to everflow in host namespace.
+            if acl_intfs or is_mirror_v6 or is_mirror:
                 # Remove duplications
                 dedup_intfs = []
                 for intf in acl_intfs:
diff --git a/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph-noportchannel.xml b/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph-noportchannel.xml
new file mode 100644
index 000000000000..460f71e21c2a
--- /dev/null
+++ b/src/sonic-config-engine/tests/multi_npu_data/sample-minigraph-noportchannel.xml
@@ -0,0 +1,1299 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>multi_npu_platform_01</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>multi_npu_platform_01</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>multi_npu_platform_01</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>multi_npu_platform_01</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <ElementType>BGPSession</ElementType>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC2</StartRouter>
+        <StartPeer>10.1.0.0</StartPeer>
+        <EndRouter>ASIC0</EndRouter>
+        <EndPeer>10.1.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>0</HoldTime>
+        <KeepAliveTime>0</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <ElementType>BGPSession</ElementType>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC2</StartRouter>
+        <StartPeer>10.1.0.4</StartPeer>
+        <EndRouter>ASIC1</EndRouter>
+        <EndPeer>10.1.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>0</HoldTime>
+        <KeepAliveTime>0</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <ElementType>BGPSession</ElementType>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC3</StartRouter>
+        <StartPeer>10.1.0.2</StartPeer>
+        <EndRouter>ASIC0</EndRouter>
+        <EndPeer>10.1.0.3</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>0</HoldTime>
+        <KeepAliveTime>0</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <ElementType>BGPSession</ElementType>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC3</StartRouter>
+        <StartPeer>10.1.0.6</StartPeer>
+        <EndRouter>ASIC1</EndRouter>
+        <EndPeer>10.1.0.7</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>0</HoldTime>
+        <KeepAliveTime>0</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC0</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>ASIC0</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>ASIC1</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>ASIC1</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>multi_npu_platform_01</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:BgpGroups/>
+        <a:Hostname>ASIC0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.3</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>FC00::1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:BgpGroups/>
+        <a:Hostname>ASIC1</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.7</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>FC00::A</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:BgpGroups/>
+        <a:Hostname>ASIC2</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.0</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.4</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:BgpGroups/>
+        <a:Hostname>ASIC3</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.2</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.6</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>3.10.147.150/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>3.10.147.150/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>multi_npu_platform_01</Hostname>
+      <PortChannelInterfaces>
+      </PortChannelInterfaces>
+      <VlanInterfaces></VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/1</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/1</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/2</AttachTo>
+          <Prefix>10.0.0.2/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/2</AttachTo>
+          <Prefix>FC00::2/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/5</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/5</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/8</AttachTo>
+          <Prefix>10.0.0.10/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/8</AttachTo>
+          <Prefix>FC00::10/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+             </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <ElementType>LoopbackInterface</ElementType>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
+            <b:IPPrefix>8.0.0.0/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>8.0.0.0/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FD00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FD00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>ASIC0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4001</Name>
+          <AttachTo>Eth4-ASIC0;Eth5-ASIC0</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4002</Name>
+          <AttachTo>Eth6-ASIC0;Eth7-ASIC0</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <SubInterfaces/>
+      <VlanInterfaces/>
+      <IPInterfaces>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4001</AttachTo>
+          <Prefix>10.1.0.1/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4002</AttachTo>
+          <Prefix>10.1.0.3/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/1</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/1</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/2</AttachTo>
+          <Prefix>10.0.0.2/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/2</AttachTo>
+          <Prefix>FC00::2/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <NatInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <ElementType>LoopbackInterface</ElementType>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
+            <b:IPPrefix>8.0.0.1/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>8.0.0.1/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FD00:2::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FD00:2::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>ASIC1</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4003</Name>
+          <AttachTo>Eth4-ASIC1;Eth5-ASIC1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4004</Name>
+          <AttachTo>Eth6-ASIC1;Eth7-ASIC1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <SubInterfaces/>
+      <VlanInterfaces/>
+      <IPInterfaces>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4003</AttachTo>
+          <Prefix>10.1.0.5/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4004</AttachTo>
+          <Prefix>10.1.0.7/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/5</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/5</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+	  <AttachTo>Ethernet1/8</AttachTo>
+          <Prefix>10.0.0.10/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+	  <AttachTo>Ethernet1/8</AttachTo>
+          <Prefix>FC00::10/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <NatInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <ElementType>LoopbackInterface</ElementType>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
+            <b:IPPrefix>8.0.0.4/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>8.0.0.4/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FD00:3::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FD00:3::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>ASIC2</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4009</Name>
+          <AttachTo>Eth0-ASIC2;Eth1-ASIC2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4010</Name>
+          <AttachTo>Eth2-ASIC2;Eth3-ASIC2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <SubInterfaces/>
+      <VlanInterfaces/>
+      <IPInterfaces>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4009</AttachTo>
+          <Prefix>10.1.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4010</AttachTo>
+          <Prefix>10.1.0.4/31</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <NatInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <ElementType>LoopbackInterface</ElementType>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
+            <b:IPPrefix>8.0.0.5/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>8.0.0.5/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback4096</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FD00:4::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FD00:4::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>ASIC3</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4013</Name>
+          <AttachTo>Eth0-ASIC3;Eth1-ASIC3</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <ElementType>PortChannelInterface</ElementType>
+          <Name>PortChannel4014</Name>
+          <AttachTo>Eth2-ASIC3;Eth3-ASIC3</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <SubInterfaces/>
+      <VlanInterfaces/>
+      <IPInterfaces>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4013</AttachTo>
+          <Prefix>10.1.0.2/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <ElementType>IPInterface</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel4014</AttachTo>
+          <Prefix>10.1.0.6/31</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <NatInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/2</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/5</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/6</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC2</EndDevice>
+        <EndPort>Eth0-ASIC2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC0</StartDevice>
+        <StartPort>Eth4-ASIC0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC2</EndDevice>
+        <EndPort>Eth1-ASIC2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC0</StartDevice>
+        <StartPort>Eth5-ASIC0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC3</EndDevice>
+        <EndPort>Eth0-ASIC3</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC0</StartDevice>
+        <StartPort>Eth6-ASIC0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC3</EndDevice>
+        <EndPort>Eth1-ASIC3</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC0</StartDevice>
+        <StartPort>Eth7-ASIC0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC2</EndDevice>
+        <EndPort>Eth2-ASIC2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC1</StartDevice>
+        <StartPort>Eth4-ASIC1</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC2</EndDevice>
+        <EndPort>Eth3-ASIC2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC1</StartDevice>
+        <StartPort>Eth5-ASIC1</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC3</EndDevice>
+        <EndPort>Eth2-ASIC3</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC1</StartDevice>
+        <StartPort>Eth6-ASIC1</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC3</EndDevice>
+        <EndPort>Eth3-ASIC3</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ASIC1</StartDevice>
+        <StartPort>Eth7-ASIC1</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC0</EndDevice>
+        <EndPort>Eth0-ASIC0</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/1</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC0</EndDevice>
+        <EndPort>Eth1-ASIC0</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/2</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC0</EndDevice>
+        <EndPort>Eth2-ASIC0</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/3</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC0</EndDevice>
+        <EndPort>Eth3-ASIC0</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/4</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC1</EndDevice>
+        <EndPort>Eth0-ASIC1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/5</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC1</EndDevice>
+        <EndPort>Eth1-ASIC1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/6</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC1</EndDevice>
+        <EndPort>Eth2-ASIC1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/7</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <ChassisInternal>true</ChassisInternal>
+        <EndDevice>ASIC1</EndDevice>
+        <EndPort>Eth3-ASIC1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>multi_npu_platform_01</StartDevice>
+        <StartPort>Ethernet1/8</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>multi_npu_platform_01</Hostname>
+        <HwSku>multi-npu-01</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>3.10.147.150</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="SpineRouter">
+        <Hostname>07T2</Hostname>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>89.139.132.43</a:IPPrefix>
+        </ManagementAddress>
+        <HwSku>VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+        <Hostname>01T2</Hostname>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>89.139.132.40</a:IPPrefix>
+        </ManagementAddress>
+        <HwSku>VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+        <Hostname>05T2</Hostname>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>89.139.132.42</a:IPPrefix>
+        </ManagementAddress>
+        <HwSku>VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+        <Hostname>03T2</Hostname>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>89.139.132.41</a:IPPrefix>
+        </ManagementAddress>
+        <HwSku>VM</HwSku>
+      </Device>
+      <Device i:type="Asic">
+        <ElementType>Asic</ElementType>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </AddressV6>
+        <AssociatedClustersStr/>
+        <AssociatedSliceStr/>
+        <AssociatedTagsStr/>
+        <ClusterName/>
+        <DeploymentId i:nil="true"/>
+        <DeviceLocation i:nil="true"/>
+        <HomeDatacenter i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true"/>
+        <Hostname>ASIC0</Hostname>
+        <HwSku>multi-npu-asic</HwSku>
+      </Device>
+      <Device i:type="Asic">
+        <ElementType>Asic</ElementType>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </AddressV6>
+        <AssociatedClustersStr/>
+        <AssociatedSliceStr/>
+        <AssociatedTagsStr/>
+        <ClusterName/>
+        <DeploymentId i:nil="true"/>
+        <DeviceLocation i:nil="true"/>
+        <HomeDatacenter i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true"/>
+        <Hostname>ASIC1</Hostname>
+        <HwSku>multi-npu-asic</HwSku>
+      </Device>
+      <Device i:type="Asic">
+        <ElementType>Asic</ElementType>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </AddressV6>
+        <AssociatedClustersStr/>
+        <AssociatedSliceStr/>
+        <AssociatedTagsStr/>
+        <ClusterName/>
+        <DeploymentId i:nil="true"/>
+        <DeviceLocation i:nil="true"/>
+        <HomeDatacenter i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true"/>
+        <Hostname>ASIC2</Hostname>
+        <HwSku>multi-npu-asic</HwSku>
+      </Device>
+      <Device i:type="Asic">
+        <ElementType>Asic</ElementType>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </AddressV6>
+        <AssociatedClustersStr/>
+        <AssociatedSliceStr/>
+        <AssociatedTagsStr/>
+        <ClusterName/>
+        <DeploymentId i:nil="true"/>
+        <DeviceLocation i:nil="true"/>
+        <HomeDatacenter i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>::/0</a:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true"/>
+        <Hostname>ASIC3</Hostname>
+        <HwSku>multi-npu-asic</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/5</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/6</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/7</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>multi-npu-01</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>multi_npu_platform_01</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>169.118.23.1;169.118.23.2;169.118.23.3;169.118.23.4;169.118.23.5;169.118.23.6;169.118.23.7;169.118.23.8;169.118.23.9;169.118.23.10;169.118.23.11;169.118.23.12;169.118.23.13;169.118.23.14;169.118.23.15;169.118.23.16;169.118.23.17;169.118.23.18;169.118.23.19;169.118.23.20;169.118.23.21;169.118.23.22;169.118.23.23;169.118.23.24;169.118.23.25;169.118.23.26;169.118.23.27;169.118.23.28;169.118.23.29;169.118.23.30;169.118.23.31;169.118.23.32;169.118.23.33;169.118.23.34;169.118.23.35;169.118.23.36;169.118.23.37;169.118.23.38;169.118.23.39;169.118.23.40;169.118.23.41;169.118.23.42;169.118.23.43;169.118.23.44;169.118.23.45;169.118.23.46;169.118.23.47;169.118.23.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>17.39.1.129;17.39.1.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>71.49.219.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>71.49.219.8;123.46.98.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>123.46.98.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>71.49.219.98/31;71.49.219.8;123.46.98.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;71.49.219.14</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>FrontEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC1</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>FrontEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC2</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>FrontEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC3</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>FrontEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC2</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>BackEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+      <a:DeviceMetadata>
+        <a:Name>ASIC3</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>SubRole</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>BackEnd</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/1;01T2:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/2;01T2:Ethernet2</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/5;05T2:Ethernet1</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>multi_npu_platform_01:Ethernet1/6;05T2:Ethernet2</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+  <Hostname>multi_npu_platform_01</Hostname>
+  <HwSku>multi-npu-01</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
index 37a3351dd5ee..15e1600255ec 100644
--- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py
+++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
@@ -24,6 +24,7 @@ def setUp(self):
         self.test_data_dir = os.path.join(self.test_dir,  'multi_npu_data')
         self.script_file = utils.PYTHON_INTERPRETTER + ' ' + os.path.join(self.test_dir, '..', 'sonic-cfggen')
         self.sample_graph = os.path.join(self.test_data_dir, 'sample-minigraph.xml')
+        self.sample_graph1 = os.path.join(self.test_data_dir, 'sample-minigraph-noportchannel.xml')
         self.port_config = []
         for asic in range(NUM_ASIC):
             self.port_config.append(os.path.join(self.test_data_dir, "sample_port_config-{}.ini".format(asic)))
@@ -183,6 +184,14 @@ def test_frontend_asic_portchannel_intf(self):
             utils.liststr_to_dict("['PortChannel4001|10.1.0.1/31', 'PortChannel0002|FC00::1/126', 'PortChannel4002|10.1.0.3/31', 'PortChannel0002', 'PortChannel0002|10.0.0.0/31', 'PortChannel4001', 'PortChannel4002']")
         )
 
+    def test_frontend_asic_routerport_intf(self):
+        argument = "-m {} -p {} -n asic0 -v \"INTERFACE.keys()|list\"".format(self.sample_graph1, self.port_config[0])
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.liststr_to_dict(output.strip()),
+            utils.liststr_to_dict("['Ethernet0', ('Ethernet0', '10.0.0.0/31'), 'Ethernet4', ('Ethernet0', 'FC00::1/126'), ('Ethernet4', 'FC00::2/126'), ('Ethernet4', '10.0.0.2/31')]")
+        )
+
     def test_backend_asic_portchannel_intf(self):
         argument = "-m {} -p {} -n asic3 -v \"PORTCHANNEL_INTERFACE.keys()|list\"".format(self.sample_graph, self.port_config[3])
         output = self.run_script(argument)
@@ -282,6 +291,15 @@ def test_global_asic_acl(self):
                              'EVERFLOWV6':{'policy_desc': 'EVERFLOWV6', 'ports': ['PortChannel0002','PortChannel0008'], 'stage': 'ingress', 'type': 'MIRRORV6'},
                              'SNMP_ACL':  {'policy_desc': 'SNMP_ACL',    'services': ['SNMP'],        'stage': 'ingress', 'type': 'CTRLPLANE'},
                              'SSH_ONLY':  {'policy_desc': 'SSH_ONLY',    'services': ['SSH'],         'stage': 'ingress', 'type': 'CTRLPLANE'}})
+    def test_global_asic_acl1(self):
+        argument = "-m {} --var-json \"ACL_TABLE\"".format(self.sample_graph1)
+        output = json.loads(self.run_script(argument))
+        self.assertDictEqual(output, {\
+                             'EVERFLOW':  {'policy_desc': 'EVERFLOW',   'ports': [], 'stage': 'ingress', 'type': 'MIRROR'},
+                             'EVERFLOWV6':{'policy_desc': 'EVERFLOWV6', 'ports': [], 'stage': 'ingress', 'type': 'MIRRORV6'},
+                             'SNMP_ACL':  {'policy_desc': 'SNMP_ACL',    'services': ['SNMP'],        'stage': 'ingress', 'type': 'CTRLPLANE'},
+                             'SSH_ONLY':  {'policy_desc': 'SSH_ONLY',    'services': ['SSH'],         'stage': 'ingress', 'type': 'CTRLPLANE'}})
+
 
     def test_front_end_asic_acl(self):
         argument = "-m {} -p {} -n asic0 --var-json \"ACL_TABLE\"".format(self.sample_graph, self.port_config[0])
@@ -293,11 +311,27 @@ def test_front_end_asic_acl(self):
                              'SNMP_ACL':  {'policy_desc': 'SNMP_ACL',    'services': ['SNMP'],        'stage': 'ingress', 'type': 'CTRLPLANE'},
                              'SSH_ONLY':  {'policy_desc': 'SSH_ONLY',    'services': ['SSH'],         'stage': 'ingress', 'type': 'CTRLPLANE'}})
 
+    def test_front_end_asic_acl1(self):
+        argument = "-m {} -p {} -n asic0 --var-json \"ACL_TABLE\"".format(self.sample_graph1, self.port_config[0])
+        output = json.loads(self.run_script(argument))
+        self.assertDictEqual(output, {\
+                             'EVERFLOW':  {'policy_desc': 'EVERFLOW',   'ports': ['Ethernet0','Ethernet4'], 'stage': 'ingress', 'type': 'MIRROR'},
+                             'EVERFLOWV6':{'policy_desc': 'EVERFLOWV6', 'ports': ['Ethernet0','Ethernet4'], 'stage': 'ingress', 'type': 'MIRRORV6'},
+                             'SNMP_ACL':  {'policy_desc': 'SNMP_ACL',    'services': ['SNMP'],        'stage': 'ingress', 'type': 'CTRLPLANE'},
+                             'SSH_ONLY':  {'policy_desc': 'SSH_ONLY',    'services': ['SSH'],         'stage': 'ingress', 'type': 'CTRLPLANE'}})
+
+
     def test_back_end_asic_acl(self):
         argument = "-m {} -p {} -n asic3 --var-json \"ACL_TABLE\"".format(self.sample_graph, self.port_config[3])
         output = json.loads(self.run_script(argument))
         self.assertDictEqual(output, {})
 
+    def test_back_end_asic_acl1(self):
+        argument = "-m {} -p {} -n asic3 --var-json \"ACL_TABLE\"".format(self.sample_graph1, self.port_config[3])
+        output = json.loads(self.run_script(argument))
+        self.assertDictEqual(output, {})
+
+
     def test_loopback_intfs(self):
         argument = "-m {} --var-json \"LOOPBACK_INTERFACE\"".format(self.sample_graph)
         output = json.loads(self.run_script(argument))

From 97bea6170851fca11c2352426a8f7dcb82f920b8 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Thu, 8 Apr 2021 13:51:58 -0700
Subject: [PATCH 0474/1674] [bgpcfgd] Add bgpcfgd support for static routes
 (#7233)

Why I did it
Add bgpcfgd support for static routes.

How I did it
Add bgpcfgd support to subscribe changes in STATIC_ROUTE table in CONFIG_DB and program via vtysh. The key of STATIC_ROUTE table is formatted as STATIC_ROUTE|vrf|ip_prefix, while the vrf is optional. If would be treated the same as "default" if no vrf is given.

Add unit tests.
---
 src/sonic-bgpcfgd/bgpcfgd/main.py             |   3 +
 .../bgpcfgd/managers_static_rt.py             | 173 +++++++
 src/sonic-bgpcfgd/tests/test_static_rt.py     | 487 ++++++++++++++++++
 3 files changed, 663 insertions(+)
 create mode 100644 src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_static_rt.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 360b54dc11aa..64d2edbed174 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -15,6 +15,7 @@
 from .managers_db import BGPDataBaseMgr
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
+from .managers_static_rt import StaticRouteMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
 from .utils import read_constants
@@ -53,6 +54,8 @@ def do_work():
         BGPAllowListMgr(common_objs, "CONFIG_DB", "BGP_ALLOWED_PREFIXES"),
         # BBR Manager
         BBRMgr(common_objs, "CONFIG_DB", "BGP_BBR"),
+        # Static Route Managers
+        StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
new file mode 100644
index 000000000000..f6dd77a520d2
--- /dev/null
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
@@ -0,0 +1,173 @@
+import traceback
+from .log import log_crit, log_err, log_debug
+from .manager import Manager
+from .template import TemplateFabric
+import socket
+
+class StaticRouteMgr(Manager):
+    """ This class updates static routes when STATIC_ROUTE table is updated """
+    def __init__(self, common_objs, db, table):
+        """
+        Initialize the object
+        :param common_objs: common object dictionary
+        :param db: name of the db
+        :param table: name of the table in the db
+        """
+        super(StaticRouteMgr, self).__init__(
+            common_objs,
+            [],
+            db,
+            table,
+        )
+
+        self.static_routes = {}
+
+    OP_DELETE = 'DELETE'
+    OP_ADD = 'ADD'
+
+    def set_handler(self, key, data):
+        vrf, ip_prefix = self.split_key(key)
+        is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
+
+        arg_list    = lambda v: v.split(',') if len(v.strip()) != 0 else None
+        bkh_list    = arg_list(data['blackhole']) if 'blackhole' in data else None
+        nh_list     = arg_list(data['nexthop']) if 'nexthop' in data else None
+        intf_list   = arg_list(data['ifname']) if 'ifname' in data else None
+        dist_list   = arg_list(data['distance']) if 'distance' in data else None
+        nh_vrf_list = arg_list(data['nexthop-vrf']) if 'nexthop-vrf' in data else None
+
+        try:
+            ip_nh_set = IpNextHopSet(is_ipv6, bkh_list, nh_list, intf_list, dist_list, nh_vrf_list)
+            cur_nh_set = self.static_routes.get(vrf, {}).get(ip_prefix, IpNextHopSet(is_ipv6))
+            cmd_list = self.static_route_commands(ip_nh_set, cur_nh_set, ip_prefix, vrf)
+        except Exception as exc:
+            log_crit("Got an exception %s: Traceback: %s" % (str(exc), traceback.format_exc()))
+            return False
+
+        if cmd_list:
+            self.cfg_mgr.push_list(cmd_list)
+            log_debug("Static route {} is scheduled for updates".format(key))
+        else:
+            log_debug("Nothing to update for static route {}".format(key))
+
+        self.static_routes.setdefault(vrf, {})[ip_prefix] = ip_nh_set
+
+        return True
+
+
+    def del_handler(self, key):
+        vrf, ip_prefix = self.split_key(key)
+        is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
+
+        ip_nh_set = IpNextHopSet(is_ipv6)
+        cur_nh_set = self.static_routes.get(vrf, {}).get(ip_prefix, IpNextHopSet(is_ipv6))
+        cmd_list = self.static_route_commands(ip_nh_set, cur_nh_set, ip_prefix, vrf)
+
+        if cmd_list:
+            self.cfg_mgr.push_list(cmd_list)
+            log_debug("Static route {} is scheduled for updates".format(key))
+        else:
+            log_debug("Nothing to update for static route {}".format(key))
+
+        self.static_routes.setdefault(vrf, {}).pop(ip_prefix, None)
+
+    @staticmethod
+    def split_key(key):
+        """
+        Split key into vrf name and prefix.
+        :param key: key to split
+        :return: vrf name extracted from the key, ip prefix extracted from the key
+        """
+        if '|' not in key:
+            return 'default', key
+        else:
+            return tuple(key.split('|', 1))
+
+    def static_route_commands(self, ip_nh_set, cur_nh_set, ip_prefix, vrf):
+        diff_set = ip_nh_set.symmetric_difference(cur_nh_set)
+
+        op_cmd_list = {}
+        for ip_nh in diff_set:
+            if ip_nh in cur_nh_set:
+                op = self.OP_DELETE
+            else:
+                op = self.OP_ADD
+
+            op_cmds = op_cmd_list.setdefault(op, [])
+            op_cmds.append(self.generate_command(op, ip_nh, ip_prefix, vrf))
+
+        cmd_list = op_cmd_list.get(self.OP_DELETE, [])
+        cmd_list += op_cmd_list.get(self.OP_ADD, [])
+
+        return cmd_list
+
+    def generate_command(self, op, ip_nh, ip_prefix, vrf):
+        return '{}{} route {}{}{}'.format(
+            'no ' if op == self.OP_DELETE else '',
+            'ipv6' if ip_nh.af == socket.AF_INET6 else 'ip',
+            ip_prefix,
+            ip_nh,
+            ' vrf {}'.format(vrf) if vrf != 'default' else ''
+        )
+
+class IpNextHop:
+    def __init__(self, af_id, blackhole, dst_ip, if_name, dist, vrf):
+        zero_ip = lambda af: '0.0.0.0' if af == socket.AF_INET else '::'
+        self.af = af_id
+        self.blackhole = 'false' if blackhole is None or blackhole == '' else blackhole
+        self.distance = 0 if dist is None else int(dist)
+        if self.blackhole == 'true':
+            dst_ip = if_name = vrf = None
+        self.ip = zero_ip(af_id) if dst_ip is None or dst_ip == '' else dst_ip
+        self.interface = '' if if_name is None else if_name
+        self.nh_vrf = '' if vrf is None else vrf
+        if self.blackhole != 'true' and self.is_zero_ip() and len(self.interface.strip()) == 0:
+            log_err('Mandatory attribute not found for nexthop')
+            raise ValueError
+    def __eq__(self, other):
+        return (self.af == other.af and self.blackhole == other.blackhole and
+                self.ip == other.ip and self.interface == other.interface and
+                self.distance == other.distance and self.nh_vrf == other.nh_vrf)
+    def __ne__(self, other):
+        return (self.af != other.af or self.blackhole != other.blackhole or
+                self.ip != other.ip or self.interface != other.interface or
+                self.distance != other.distance or self.nh_vrf != other.nh_vrf)
+    def __hash__(self):
+        return hash((self.af, self.blackhole, self.ip, self.interface, self.distance, self.nh_vrf))
+    def is_zero_ip(self):
+        return sum([x for x in socket.inet_pton(self.af, self.ip)]) == 0
+    def __format__(self, format):
+        ret_val = ''
+        if self.blackhole == 'true':
+            ret_val += ' blackhole'
+        if not (self.ip is None or self.is_zero_ip()):
+            ret_val += ' %s' % self.ip
+        if not (self.interface is None or self.interface == ''):
+            ret_val += ' %s' % self.interface
+        if not (self.distance is None or self.distance == 0):
+            ret_val += ' %d' % self.distance
+        if not (self.nh_vrf is None or self.nh_vrf == ''):
+            ret_val += ' nexthop-vrf %s' % self.nh_vrf
+        return ret_val
+
+class IpNextHopSet(set):
+    def __init__(self, is_ipv6, bkh_list = None, ip_list = None, intf_list = None, dist_list = None, vrf_list = None):
+        super(IpNextHopSet, self).__init__()
+        af = socket.AF_INET6 if is_ipv6 else socket.AF_INET
+        if bkh_list is None and ip_list is None and intf_list is None:
+            # empty set, for delete case
+            return
+        nums = {len(x) for x in [bkh_list, ip_list, intf_list, dist_list, vrf_list] if x is not None}
+        if len(nums) != 1:
+            log_err("Lists of next-hop attribute have different sizes: %s" % nums)
+            for x in [bkh_list, ip_list, intf_list, dist_list, vrf_list]:
+                log_debug("List: %s" % x)
+            raise ValueError
+        nh_cnt = nums.pop()
+        item = lambda lst, i: lst[i] if lst is not None else None
+        for idx in range(nh_cnt):
+            try:
+                self.add(IpNextHop(af, item(bkh_list, idx), item(ip_list, idx), item(intf_list, idx),
+                                   item(dist_list, idx), item(vrf_list, idx), ))
+            except ValueError:
+                continue
diff --git a/src/sonic-bgpcfgd/tests/test_static_rt.py b/src/sonic-bgpcfgd/tests/test_static_rt.py
new file mode 100644
index 000000000000..c6a3e40fab48
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_static_rt.py
@@ -0,0 +1,487 @@
+from unittest.mock import MagicMock, patch
+
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from bgpcfgd.managers_static_rt import StaticRouteMgr
+from collections import Counter
+
+def constructor():
+    cfg_mgr = MagicMock()
+
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': {},
+    }
+
+    mgr = StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE")
+    assert len(mgr.static_routes) == 0
+
+    return mgr
+
+def set_del_test(mgr, op, args, expected_ret, expected_cmds):
+    set_del_test.push_list_called = False
+    def push_list(cmds):
+        set_del_test.push_list_called = True
+        assert Counter(cmds) == Counter(expected_cmds) # check if commands are expected (regardless of the order)
+        max_del_idx = -1
+        min_set_idx = len(cmds)
+        for idx in range(len(cmds)):
+            if cmds[idx].startswith('no') and idx > max_del_idx:
+                max_del_idx = idx
+            if not cmds[idx].startswith('no') and idx < min_set_idx:
+                min_set_idx = idx
+        assert max_del_idx < min_set_idx, "DEL command comes after SET command" # DEL commands should be done first
+        return True
+    mgr.cfg_mgr.push_list = push_list
+
+    if op == "SET":
+        ret = mgr.set_handler(*args)
+        assert ret == expected_ret
+    elif op == "DEL":
+        mgr.del_handler(*args)
+    else:
+        assert False, "Wrong operation"
+
+    if expected_cmds:
+        assert set_del_test.push_list_called, "cfg_mgr.push_list wasn't called"
+    else:
+        assert not set_del_test.push_list_called, "cfg_mgr.push_list was called"
+
+def test_set():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("10.1.0.0/24", {
+            "nexthop": "10.0.0.57",
+        }),
+        True,
+        [
+            "ip route 10.1.0.0/24 10.0.0.57"
+        ]
+    )
+
+def test_set_nhvrf():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.1.0/24", {
+            "nexthop": "10.0.0.57",
+            "ifname": "PortChannel0001",
+            "distance": "10",
+            "nexthop-vrf": "nh_vrf",
+            "blackhole": "false",
+        }),
+        True,
+        [
+            "ip route 10.1.1.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf"
+        ]
+    )
+
+def test_set_blackhole():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.2.0/24", {
+            "nexthop": "10.0.0.57",
+            "ifname": "PortChannel0001",
+            "distance": "10",
+            "nexthop-vrf": "nh_vrf",
+            "blackhole": "true",
+        }),
+        True,
+        [
+            "ip route 10.1.2.0/24 blackhole 10"
+        ]
+    )
+
+def test_set_vrf():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57",
+            "ifname": "PortChannel0001",
+            "distance": "10",
+            "nexthop-vrf": "nh_vrf",
+            "blackhole": "false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED"
+        ]
+    )
+
+def test_set_ipv6():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|fc00:10::/64", {
+            "nexthop": "fc00::72",
+            "ifname": "PortChannel0001",
+            "distance": "10",
+            "nexthop-vrf": "",
+            "blackhole": "false",
+        }),
+        True,
+        [
+            "ipv6 route fc00:10::/64 fc00::72 PortChannel0001 10"
+        ]
+    )
+
+def test_set_nh_only():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_ifname_only():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_with_empty_ifname():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_with_empty_nh():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,,",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_del():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+    set_del_test(
+        mgr,
+        "DEL",
+        ("vrfRED|10.1.3.0/24",),
+        True,
+        [
+            "no ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_same_route():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "40,50,60",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "no ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 40 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 50 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 60 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+
+def test_set_add_del_nh():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61,10.0.0.63",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003,PortChannel0004",
+            "distance": "10,20,30,30",
+            "nexthop-vrf": "nh_vrf,,default,",
+            "blackhole": "false,false,false,",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.63 PortChannel0004 30 vrf vrfRED",
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59",
+            "ifname": "PortChannel0001,PortChannel0002",
+            "distance": "10,20",
+            "nexthop-vrf": "nh_vrf,",
+            "blackhole": "false,false",
+        }),
+        True,
+        [
+            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.63 PortChannel0004 30 vrf vrfRED",
+        ]
+    )
+
+def test_set_add_del_nh_ethernet():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|20.1.3.0/24", {
+            "nexthop": "20.0.0.57,20.0.0.59,20.0.0.61",
+            "ifname": "Ethernet4,Ethernet8,Ethernet12",
+            "distance": "10,20,30",
+            "nexthop-vrf": "default,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 20.1.3.0/24 20.0.0.57 Ethernet4 10 nexthop-vrf default",
+            "ip route 20.1.3.0/24 20.0.0.59 Ethernet8 20",
+            "ip route 20.1.3.0/24 20.0.0.61 Ethernet12 30 nexthop-vrf default"
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|20.1.3.0/24", {
+            "nexthop": "20.0.0.57,20.0.0.59,20.0.0.61,20.0.0.63",
+            "ifname": "Ethernet4,Ethernet8,Ethernet12,Ethernet16",
+            "distance": "10,20,30,30",
+            "nexthop-vrf": "default,,default,",
+            "blackhole": "false,false,false,",
+        }),
+        True,
+        [
+            "ip route 20.1.3.0/24 20.0.0.63 Ethernet16 30",
+        ]
+    )
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|20.1.3.0/24", {
+            "nexthop": "20.0.0.57,20.0.0.59",
+            "ifname": "Ethernet4,Ethernet8",
+            "distance": "10,20",
+            "nexthop-vrf": "default,",
+            "blackhole": "false,false",
+        }),
+        True,
+        [
+            "no ip route 20.1.3.0/24 20.0.0.61 Ethernet12 30 nexthop-vrf default",
+            "no ip route 20.1.3.0/24 20.0.0.63 Ethernet16 30",
+        ]
+    )
+
+@patch('bgpcfgd.managers_static_rt.log_debug')
+def test_set_no_action(mocked_log_debug):
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.1.0/24", {
+            "nexthop": "10.0.0.57",
+            "ifname": "PortChannel0001",
+            "blackhole": "true",
+        }),
+        True,
+        [
+            "ip route 10.1.1.0/24 blackhole"
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.1.0/24", {
+            "nexthop": "10.0.0.59",
+            "ifname": "PortChannel0002",
+            "blackhole": "true",
+        }),
+        True,
+        []
+    )
+    mocked_log_debug.assert_called_with("Nothing to update for static route default|10.1.1.0/24")
+
+@patch('bgpcfgd.managers_static_rt.log_debug')
+def test_del_no_action(mocked_log_debug):
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "DEL",
+        ("default|10.1.1.0/24",),
+        True,
+        []
+    )
+    mocked_log_debug.assert_called_with("Nothing to update for static route default|10.1.1.0/24")
+
+def test_set_invalid_arg():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.1.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59",
+            "ifname": "PortChannel0001",
+        }),
+        False,
+        []
+    )
+
+@patch('bgpcfgd.managers_static_rt.log_err')
+def test_set_invalid_blackhole(mocked_log_err):
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("default|10.1.1.0/24", {
+            "nexthop": "",
+            "ifname": "",
+            "blackhole": "false",
+        }),
+        True,
+        []
+    )
+    mocked_log_err.assert_called_with("Mandatory attribute not found for nexthop")
+
+def test_set_invalid_ipaddr():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("10.1.0.0/24", {
+            "nexthop": "invalid_ipaddress",
+        }),
+        False,
+        []
+    )

From 7a69e0ffb26ef76c432246226565fcc8091f3342 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 9 May 2021 01:33:37 +0800
Subject: [PATCH 0475/1674] [mellaonox]: No need enable thermal zones in
 thermal_manager.deinitialize since they are enabled by default (#7556)

No need enable thermal zones in thermal_manager.deinitialize since they are enabled by default. And removing this will faster thermalctld exit speed
---
 .../mlnx-platform-api/sonic_platform/thermal_manager.py  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
index 914eec79816c..c2acf49a2245 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
@@ -16,15 +16,6 @@ def initialize(cls):
         """
         cls._add_private_thermal_policy()
 
-    @classmethod
-    def deinitialize(cls):
-        """
-        Destroy thermal manager, including any vendor specific cleanup. The default behavior of this function
-        is a no-op.
-        :return:
-        """
-        cls.start_thermal_control_algorithm()
-
     @classmethod
     def start_thermal_control_algorithm(cls):
         """

From 86e78d231e976c90646cd881d708988962d15277 Mon Sep 17 00:00:00 2001
From: schobtr <schobtr@celestica.com>
Date: Sun, 9 May 2021 23:03:12 +0700
Subject: [PATCH 0476/1674] [Haliburton-Celestica] Use psu driver dps200 from
 Linux kernel (#7247)

Why I did it
Fix issues below.
#7133
#6602

So, remove the dps200 driver from the platform-specific driver.
Then, add the dps200 module driver to the Linux kernel tree.

How I did it
Remove the dps200 driver from the platform-specific driver and add the dps200 module driver to the Linux kernel.

How to verify it
Build an image with Azure/sonic-linux-kernel#207
Then, install to the Haliburton.
---
 .../haliburton/modules/Makefile               |   2 +-
 .../haliburton/modules/dps200.c               | 128 ------
 .../haliburton/modules/pmbus.h                | 425 ------------------
 3 files changed, 1 insertion(+), 554 deletions(-)
 delete mode 100644 platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
 delete mode 100644 platform/broadcom/sonic-platform-modules-cel/haliburton/modules/pmbus.h

diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/Makefile b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/Makefile
index 415d1b5e62f0..b34cf2cabe20 100644
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/Makefile
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/Makefile
@@ -1 +1 @@
-obj-m := mc24lc64t.o emc2305.o smc.o hlx_gpio_ich.o dps200.o
+obj-m := mc24lc64t.o emc2305.o smc.o hlx_gpio_ich.o
diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
deleted file mode 100644
index 6279ca70decf..000000000000
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Hardware monitoring driver for Delta DPS200
- *
- * (C) Copyright 2019, Celestica Inc.
- * Author: Pradchaya Phucharoen <pphuchar@celestica.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-#include <linux/mutex.h>
-#include <linux/i2c.h>
-#include <linux/pmbus.h>
-#include "pmbus.h"
-
-
-static int dps200_read_word_data(struct i2c_client *client, int page, int reg)
-{
-
-    if (reg >= PMBUS_VIRT_BASE ||
-        reg == PMBUS_VOUT_OV_FAULT_LIMIT ||
-        reg == PMBUS_VOUT_OV_WARN_LIMIT ||
-        reg == PMBUS_VOUT_UV_WARN_LIMIT ||
-        reg == PMBUS_VOUT_UV_FAULT_LIMIT ||
-        reg == PMBUS_IOUT_OC_LV_FAULT_LIMIT ||
-        reg == PMBUS_IOUT_UC_FAULT_LIMIT ||
-        reg == PMBUS_UT_WARN_LIMIT ||
-        reg == PMBUS_UT_FAULT_LIMIT ||
-        reg == PMBUS_VIN_OV_FAULT_LIMIT ||
-        reg == PMBUS_VIN_OV_WARN_LIMIT ||
-        reg == PMBUS_IIN_OC_FAULT_LIMIT ||
-        reg == PMBUS_POUT_MAX)
-        return -ENXIO;
-
-    /* 
-     * WARNING: The following feild have coinstant driver value.
-     * If the register are 
-     * PMBUS_IOUT_OC_WARN_LIMIT or PMBUS_IOUT_OC_FAULT_LIMIT convert 
-     * the constant value from linear to direct fomat.
-     */
-    if (reg == PMBUS_IOUT_OC_WARN_LIMIT)
-        return 0xb4;
-    else if (reg == PMBUS_IOUT_OC_FAULT_LIMIT)
-        return 0xc8;
-    else
-        return pmbus_read_word_data(client, page, reg);
-}
-
-/*
- * Form DPS-200 datasheet the supported sensors format defined as:
- * VOUT: direct mode with one decimal place.
- * 
- * Other sensors:
- * IOUT: direct mode with one decimal place.
- * IOUT Limits: linear mode, which difference from IOUT.
- * VIN, IIN, POWER, TEMP, & FAN: linear mode.
- */
-static struct pmbus_driver_info dps200_info = {
-    .pages = 1,
-    .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
-                 | PMBUS_HAVE_IIN | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT
-                 | PMBUS_HAVE_PIN | PMBUS_HAVE_POUT
-                 | PMBUS_HAVE_FAN12 | PMBUS_HAVE_STATUS_FAN12
-                 | PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_TEMP
-                 | PMBUS_HAVE_STATUS_INPUT,
-    .format = {
-        [PSC_VOLTAGE_OUT] = direct,
-        [PSC_CURRENT_OUT] = direct,
-    },
-    .m = {
-        [PSC_VOLTAGE_OUT] = 10,
-        [PSC_CURRENT_OUT] = 10,
-    },
-    .b = {
-        [PSC_VOLTAGE_OUT] = 0,
-        [PSC_CURRENT_OUT] = 0,
-    },
-    .R = {
-        [PSC_VOLTAGE_OUT] = 0,
-        [PSC_CURRENT_OUT] = 0,
-    },
-    .read_word_data = &dps200_read_word_data,
-};
-
-static int pmbus_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
-{
-    return pmbus_do_probe(client, id, &dps200_info);
-}
-/* user driver datat to pass the grpup */
-static const struct i2c_device_id dps200_id[] = {
-    {"dps200", 0},
-    {}
-};
-
-MODULE_DEVICE_TABLE(i2c, dps200_id);
-
-/* This is the driver that will be inserted */
-static struct i2c_driver dps200_driver = {
-    .driver = {
-           .name = "dps200",
-           },
-    .probe = pmbus_probe,
-    .remove = pmbus_do_remove,
-    .id_table = dps200_id,
-};
-
-module_i2c_driver(dps200_driver);
-
-MODULE_AUTHOR("Pradchaya Phucharoen");
-MODULE_DESCRIPTION("PMBus driver for Delta DPS200");
-MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/pmbus.h b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/pmbus.h
deleted file mode 100644
index 521baf6da49a..000000000000
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/pmbus.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * pmbus.h - Common defines and structures for PMBus devices
- *
- * Copyright (c) 2010, 2011 Ericsson AB.
- * Copyright (c) 2012 Guenter Roeck
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef PMBUS_H
-#define PMBUS_H
-
-#include <linux/bitops.h>
-#include <linux/regulator/driver.h>
-
-/*
- * Registers
- */
-enum pmbus_regs {
-        PMBUS_PAGE                      = 0x00,
-        PMBUS_OPERATION                 = 0x01,
-        PMBUS_ON_OFF_CONFIG             = 0x02,
-        PMBUS_CLEAR_FAULTS              = 0x03,
-        PMBUS_PHASE                     = 0x04,
-
-        PMBUS_CAPABILITY                = 0x19,
-        PMBUS_QUERY                     = 0x1A,
-
-        PMBUS_VOUT_MODE                 = 0x20,
-        PMBUS_VOUT_COMMAND              = 0x21,
-        PMBUS_VOUT_TRIM                 = 0x22,
-        PMBUS_VOUT_CAL_OFFSET           = 0x23,
-        PMBUS_VOUT_MAX                  = 0x24,
-        PMBUS_VOUT_MARGIN_HIGH          = 0x25,
-        PMBUS_VOUT_MARGIN_LOW           = 0x26,
-        PMBUS_VOUT_TRANSITION_RATE      = 0x27,
-        PMBUS_VOUT_DROOP                = 0x28,
-        PMBUS_VOUT_SCALE_LOOP           = 0x29,
-        PMBUS_VOUT_SCALE_MONITOR        = 0x2A,
-
-        PMBUS_COEFFICIENTS              = 0x30,
-        PMBUS_POUT_MAX                  = 0x31,
-
-        PMBUS_FAN_CONFIG_12             = 0x3A,
-        PMBUS_FAN_COMMAND_1             = 0x3B,
-        PMBUS_FAN_COMMAND_2             = 0x3C,
-        PMBUS_FAN_CONFIG_34             = 0x3D,
-        PMBUS_FAN_COMMAND_3             = 0x3E,
-        PMBUS_FAN_COMMAND_4             = 0x3F,
-
-        PMBUS_VOUT_OV_FAULT_LIMIT       = 0x40,
-        PMBUS_VOUT_OV_FAULT_RESPONSE    = 0x41,
-        PMBUS_VOUT_OV_WARN_LIMIT        = 0x42,
-        PMBUS_VOUT_UV_WARN_LIMIT        = 0x43,
-        PMBUS_VOUT_UV_FAULT_LIMIT       = 0x44,
-        PMBUS_VOUT_UV_FAULT_RESPONSE    = 0x45,
-        PMBUS_IOUT_OC_FAULT_LIMIT       = 0x46,
-        PMBUS_IOUT_OC_FAULT_RESPONSE    = 0x47,
-        PMBUS_IOUT_OC_LV_FAULT_LIMIT    = 0x48,
-        PMBUS_IOUT_OC_LV_FAULT_RESPONSE = 0x49,
-        PMBUS_IOUT_OC_WARN_LIMIT        = 0x4A,
-        PMBUS_IOUT_UC_FAULT_LIMIT       = 0x4B,
-        PMBUS_IOUT_UC_FAULT_RESPONSE    = 0x4C,
-
-        PMBUS_OT_FAULT_LIMIT            = 0x4F,
-        PMBUS_OT_FAULT_RESPONSE         = 0x50,
-        PMBUS_OT_WARN_LIMIT             = 0x51,
-        PMBUS_UT_WARN_LIMIT             = 0x52,
-        PMBUS_UT_FAULT_LIMIT            = 0x53,
-        PMBUS_UT_FAULT_RESPONSE         = 0x54,
-        PMBUS_VIN_OV_FAULT_LIMIT        = 0x55,
-        PMBUS_VIN_OV_FAULT_RESPONSE     = 0x56,
-        PMBUS_VIN_OV_WARN_LIMIT         = 0x57,
-        PMBUS_VIN_UV_WARN_LIMIT         = 0x58,
-        PMBUS_VIN_UV_FAULT_LIMIT        = 0x59,
-
-        PMBUS_IIN_OC_FAULT_LIMIT        = 0x5B,
-        PMBUS_IIN_OC_WARN_LIMIT         = 0x5D,
-
-        PMBUS_POUT_OP_FAULT_LIMIT       = 0x68,
-        PMBUS_POUT_OP_WARN_LIMIT        = 0x6A,
-        PMBUS_PIN_OP_WARN_LIMIT         = 0x6B,
-
-        PMBUS_STATUS_BYTE               = 0x78,
-        PMBUS_STATUS_WORD               = 0x79,
-        PMBUS_STATUS_VOUT               = 0x7A,
-        PMBUS_STATUS_IOUT               = 0x7B,
-        PMBUS_STATUS_INPUT              = 0x7C,
-        PMBUS_STATUS_TEMPERATURE        = 0x7D,
-        PMBUS_STATUS_CML                = 0x7E,
-        PMBUS_STATUS_OTHER              = 0x7F,
-        PMBUS_STATUS_MFR_SPECIFIC       = 0x80,
-        PMBUS_STATUS_FAN_12             = 0x81,
-        PMBUS_STATUS_FAN_34             = 0x82,
-
-        PMBUS_READ_VIN                  = 0x88,
-        PMBUS_READ_IIN                  = 0x89,
-        PMBUS_READ_VCAP                 = 0x8A,
-        PMBUS_READ_VOUT                 = 0x8B,
-        PMBUS_READ_IOUT                 = 0x8C,
-        PMBUS_READ_TEMPERATURE_1        = 0x8D,
-        PMBUS_READ_TEMPERATURE_2        = 0x8E,
-        PMBUS_READ_TEMPERATURE_3        = 0x8F,
-        PMBUS_READ_FAN_SPEED_1          = 0x90,
-        PMBUS_READ_FAN_SPEED_2          = 0x91,
-        PMBUS_READ_FAN_SPEED_3          = 0x92,
-        PMBUS_READ_FAN_SPEED_4          = 0x93,
-        PMBUS_READ_DUTY_CYCLE           = 0x94,
-        PMBUS_READ_FREQUENCY            = 0x95,
-        PMBUS_READ_POUT                 = 0x96,
-        PMBUS_READ_PIN                  = 0x97,
-
-        PMBUS_REVISION                  = 0x98,
-        PMBUS_MFR_ID                    = 0x99,
-        PMBUS_MFR_MODEL                 = 0x9A,
-        PMBUS_MFR_REVISION              = 0x9B,
-        PMBUS_MFR_LOCATION              = 0x9C,
-        PMBUS_MFR_DATE                  = 0x9D,
-        PMBUS_MFR_SERIAL                = 0x9E,
-
-/*
- * Virtual registers.
- * Useful to support attributes which are not supported by standard PMBus
- * registers but exist as manufacturer specific registers on individual chips.
- * Must be mapped to real registers in device specific code.
- *
- * Semantics:
- * Virtual registers are all word size.
- * READ registers are read-only; writes are either ignored or return an error.
- * RESET registers are read/write. Reading reset registers returns zero
- * (used for detection), writing any value causes the associated history to be
- * reset.
- * Virtual registers have to be handled in device specific driver code. Chip
- * driver code returns non-negative register values if a virtual register is
- * supported, or a negative error code if not. The chip driver may return
- * -ENODATA or any other error code in this case, though an error code other
- * than -ENODATA is handled more efficiently and thus preferred. Either case,
- * the calling PMBus core code will abort if the chip driver returns an error
- * code when reading or writing virtual registers.
- */
-        PMBUS_VIRT_BASE                 = 0x100,
-        PMBUS_VIRT_READ_TEMP_AVG,
-        PMBUS_VIRT_READ_TEMP_MIN,
-        PMBUS_VIRT_READ_TEMP_MAX,
-        PMBUS_VIRT_RESET_TEMP_HISTORY,
-        PMBUS_VIRT_READ_VIN_AVG,
-        PMBUS_VIRT_READ_VIN_MIN,
-        PMBUS_VIRT_READ_VIN_MAX,
-        PMBUS_VIRT_RESET_VIN_HISTORY,
-        PMBUS_VIRT_READ_IIN_AVG,
-        PMBUS_VIRT_READ_IIN_MIN,
-        PMBUS_VIRT_READ_IIN_MAX,
-        PMBUS_VIRT_RESET_IIN_HISTORY,
-        PMBUS_VIRT_READ_PIN_AVG,
-        PMBUS_VIRT_READ_PIN_MIN,
-        PMBUS_VIRT_READ_PIN_MAX,
-        PMBUS_VIRT_RESET_PIN_HISTORY,
-        PMBUS_VIRT_READ_POUT_AVG,
-        PMBUS_VIRT_READ_POUT_MIN,
-        PMBUS_VIRT_READ_POUT_MAX,
-        PMBUS_VIRT_RESET_POUT_HISTORY,
-        PMBUS_VIRT_READ_VOUT_AVG,
-        PMBUS_VIRT_READ_VOUT_MIN,
-        PMBUS_VIRT_READ_VOUT_MAX,
-        PMBUS_VIRT_RESET_VOUT_HISTORY,
-        PMBUS_VIRT_READ_IOUT_AVG,
-        PMBUS_VIRT_READ_IOUT_MIN,
-        PMBUS_VIRT_READ_IOUT_MAX,
-        PMBUS_VIRT_RESET_IOUT_HISTORY,
-        PMBUS_VIRT_READ_TEMP2_AVG,
-        PMBUS_VIRT_READ_TEMP2_MIN,
-        PMBUS_VIRT_READ_TEMP2_MAX,
-        PMBUS_VIRT_RESET_TEMP2_HISTORY,
-
-        PMBUS_VIRT_READ_VMON,
-        PMBUS_VIRT_VMON_UV_WARN_LIMIT,
-        PMBUS_VIRT_VMON_OV_WARN_LIMIT,
-        PMBUS_VIRT_VMON_UV_FAULT_LIMIT,
-        PMBUS_VIRT_VMON_OV_FAULT_LIMIT,
-        PMBUS_VIRT_STATUS_VMON,
-};
-
-/*
- * OPERATION
- */
-#define PB_OPERATION_CONTROL_ON         BIT(7)
-
-/*
- * CAPABILITY
- */
-#define PB_CAPABILITY_SMBALERT          BIT(4)
-#define PB_CAPABILITY_ERROR_CHECK       BIT(7)
-
-/*
- * VOUT_MODE
- */
-#define PB_VOUT_MODE_MODE_MASK          0xe0
-#define PB_VOUT_MODE_PARAM_MASK         0x1f
-
-#define PB_VOUT_MODE_LINEAR             0x00
-#define PB_VOUT_MODE_VID                0x20
-#define PB_VOUT_MODE_DIRECT             0x40
-
-/*
- * Fan configuration
- */
-#define PB_FAN_2_PULSE_MASK             (BIT(0) | BIT(1))
-#define PB_FAN_2_RPM                    BIT(2)
-#define PB_FAN_2_INSTALLED              BIT(3)
-#define PB_FAN_1_PULSE_MASK             (BIT(4) | BIT(5))
-#define PB_FAN_1_RPM                    BIT(6)
-#define PB_FAN_1_INSTALLED              BIT(7)
-
-/*
- * STATUS_BYTE, STATUS_WORD (lower)
- */
-#define PB_STATUS_NONE_ABOVE            BIT(0)
-#define PB_STATUS_CML                   BIT(1)
-#define PB_STATUS_TEMPERATURE           BIT(2)
-#define PB_STATUS_VIN_UV                BIT(3)
-#define PB_STATUS_IOUT_OC               BIT(4)
-#define PB_STATUS_VOUT_OV               BIT(5)
-#define PB_STATUS_OFF                   BIT(6)
-#define PB_STATUS_BUSY                  BIT(7)
-
-/*
- * STATUS_WORD (upper)
- */
-#define PB_STATUS_UNKNOWN               BIT(8)
-#define PB_STATUS_OTHER                 BIT(9)
-#define PB_STATUS_FANS                  BIT(10)
-#define PB_STATUS_POWER_GOOD_N          BIT(11)
-#define PB_STATUS_WORD_MFR              BIT(12)
-#define PB_STATUS_INPUT                 BIT(13)
-#define PB_STATUS_IOUT_POUT             BIT(14)
-#define PB_STATUS_VOUT                  BIT(15)
-
-/*
- * STATUS_IOUT
- */
-#define PB_POUT_OP_WARNING              BIT(0)
-#define PB_POUT_OP_FAULT                BIT(1)
-#define PB_POWER_LIMITING               BIT(2)
-#define PB_CURRENT_SHARE_FAULT          BIT(3)
-#define PB_IOUT_UC_FAULT                BIT(4)
-#define PB_IOUT_OC_WARNING              BIT(5)
-#define PB_IOUT_OC_LV_FAULT             BIT(6)
-#define PB_IOUT_OC_FAULT                BIT(7)
-
-/*
- * STATUS_VOUT, STATUS_INPUT
- */
-#define PB_VOLTAGE_UV_FAULT             BIT(4)
-#define PB_VOLTAGE_UV_WARNING           BIT(5)
-#define PB_VOLTAGE_OV_WARNING           BIT(6)
-#define PB_VOLTAGE_OV_FAULT             BIT(7)
-
-/*
- * STATUS_INPUT
- */
-#define PB_PIN_OP_WARNING               BIT(0)
-#define PB_IIN_OC_WARNING               BIT(1)
-#define PB_IIN_OC_FAULT                 BIT(2)
-
-/*
- * STATUS_TEMPERATURE
- */
-#define PB_TEMP_UT_FAULT                BIT(4)
-#define PB_TEMP_UT_WARNING              BIT(5)
-#define PB_TEMP_OT_WARNING              BIT(6)
-#define PB_TEMP_OT_FAULT                BIT(7)
-
-/*
- * STATUS_FAN
- */
-#define PB_FAN_AIRFLOW_WARNING          BIT(0)
-#define PB_FAN_AIRFLOW_FAULT            BIT(1)
-#define PB_FAN_FAN2_SPEED_OVERRIDE      BIT(2)
-#define PB_FAN_FAN1_SPEED_OVERRIDE      BIT(3)
-#define PB_FAN_FAN2_WARNING             BIT(4)
-#define PB_FAN_FAN1_WARNING             BIT(5)
-#define PB_FAN_FAN2_FAULT               BIT(6)
-#define PB_FAN_FAN1_FAULT               BIT(7)
-
-/*
- * CML_FAULT_STATUS
- */
-#define PB_CML_FAULT_OTHER_MEM_LOGIC    BIT(0)
-#define PB_CML_FAULT_OTHER_COMM         BIT(1)
-#define PB_CML_FAULT_PROCESSOR          BIT(3)
-#define PB_CML_FAULT_MEMORY             BIT(4)
-#define PB_CML_FAULT_PACKET_ERROR       BIT(5)
-#define PB_CML_FAULT_INVALID_DATA       BIT(6)
-#define PB_CML_FAULT_INVALID_COMMAND    BIT(7)
-
-enum pmbus_sensor_classes {
-        PSC_VOLTAGE_IN = 0,
-        PSC_VOLTAGE_OUT,
-        PSC_CURRENT_IN,
-        PSC_CURRENT_OUT,
-        PSC_POWER,
-        PSC_TEMPERATURE,
-        PSC_FAN,
-        PSC_NUM_CLASSES         /* Number of power sensor classes */
-};
-
-#define PMBUS_PAGES     32      /* Per PMBus specification */
-
-/* Functionality bit mask */
-#define PMBUS_HAVE_VIN          BIT(0)
-#define PMBUS_HAVE_VCAP         BIT(1)
-#define PMBUS_HAVE_VOUT         BIT(2)
-#define PMBUS_HAVE_IIN          BIT(3)
-#define PMBUS_HAVE_IOUT         BIT(4)
-#define PMBUS_HAVE_PIN          BIT(5)
-#define PMBUS_HAVE_POUT         BIT(6)
-#define PMBUS_HAVE_FAN12        BIT(7)
-#define PMBUS_HAVE_FAN34        BIT(8)
-#define PMBUS_HAVE_TEMP         BIT(9)
-#define PMBUS_HAVE_TEMP2        BIT(10)
-#define PMBUS_HAVE_TEMP3        BIT(11)
-#define PMBUS_HAVE_STATUS_VOUT  BIT(12)
-#define PMBUS_HAVE_STATUS_IOUT  BIT(13)
-#define PMBUS_HAVE_STATUS_INPUT BIT(14)
-#define PMBUS_HAVE_STATUS_TEMP  BIT(15)
-#define PMBUS_HAVE_STATUS_FAN12 BIT(16)
-#define PMBUS_HAVE_STATUS_FAN34 BIT(17)
-#define PMBUS_HAVE_VMON         BIT(18)
-#define PMBUS_HAVE_STATUS_VMON  BIT(19)
-
-enum pmbus_data_format { linear = 0, direct, vid };
-enum vrm_version { vr11 = 0, vr12 };
-
-struct pmbus_driver_info {
-        int pages;              /* Total number of pages */
-        enum pmbus_data_format format[PSC_NUM_CLASSES];
-        enum vrm_version vrm_version;
-        /*
-         * Support one set of coefficients for each sensor type
-         * Used for chips providing data in direct mode.
-         */
-        int m[PSC_NUM_CLASSES]; /* mantissa for direct data format */
-        int b[PSC_NUM_CLASSES]; /* offset */
-        int R[PSC_NUM_CLASSES]; /* exponent */
-
-        u32 func[PMBUS_PAGES];  /* Functionality, per page */
-        /*
-         * The following functions map manufacturing specific register values
-         * to PMBus standard register values. Specify only if mapping is
-         * necessary.
-         * Functions return the register value (read) or zero (write) if
-         * successful. A return value of -ENODATA indicates that there is no
-         * manufacturer specific register, but that a standard PMBus register
-         * may exist. Any other negative return value indicates that the
-         * register does not exist, and that no attempt should be made to read
-         * the standard register.
-         */
-        int (*read_byte_data)(struct i2c_client *client, int page, int reg);
-        int (*read_word_data)(struct i2c_client *client, int page, int reg);
-        int (*write_word_data)(struct i2c_client *client, int page, int reg,
-                               u16 word);
-        int (*write_byte)(struct i2c_client *client, int page, u8 value);
-        /*
-         * The identify function determines supported PMBus functionality.
-         * This function is only necessary if a chip driver supports multiple
-         * chips, and the chip functionality is not pre-determined.
-         */
-        int (*identify)(struct i2c_client *client,
-                        struct pmbus_driver_info *info);
-
-        /* Regulator functionality, if supported by this chip driver. */
-        int num_regulators;
-        const struct regulator_desc *reg_desc;
-};
-
-/* Regulator ops */
-
-extern const struct regulator_ops pmbus_regulator_ops;
-
-/* Macro for filling in array of struct regulator_desc */
-#define PMBUS_REGULATOR(_name, _id)                             \
-        [_id] = {                                               \
-                .name = (_name # _id),                          \
-                .id = (_id),                                    \
-                .of_match = of_match_ptr(_name # _id),          \
-                .regulators_node = of_match_ptr("regulators"),  \
-                .ops = &pmbus_regulator_ops,                    \
-                .type = REGULATOR_VOLTAGE,                      \
-                .owner = THIS_MODULE,                           \
-        }
-
-/* Function declarations */
-
-void pmbus_clear_cache(struct i2c_client *client);
-int pmbus_set_page(struct i2c_client *client, u8 page);
-int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 reg);
-int pmbus_write_word_data(struct i2c_client *client, u8 page, u8 reg, u16 word);
-int pmbus_read_byte_data(struct i2c_client *client, int page, u8 reg);
-int pmbus_write_byte(struct i2c_client *client, int page, u8 value);
-int pmbus_write_byte_data(struct i2c_client *client, int page, u8 reg,
-                          u8 value);
-int pmbus_update_byte_data(struct i2c_client *client, int page, u8 reg,
-                           u8 mask, u8 value);
-void pmbus_clear_faults(struct i2c_client *client);
-bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);
-bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);
-int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
-                   struct pmbus_driver_info *info);
-int pmbus_do_remove(struct i2c_client *client);
-const struct pmbus_driver_info *pmbus_get_driver_info(struct i2c_client
-                                                      *client);
-
-#endif /* PMBUS_H */
\ No newline at end of file

From ced3b3f310e9a456adf3cd92fc08af4ea7932993 Mon Sep 17 00:00:00 2001
From: ec-michael-shih <71379738+ec-michael-shih@users.noreply.github.com>
Date: Wed, 12 May 2021 10:06:36 +0800
Subject: [PATCH 0477/1674] [Platform] Accton add to support as9726-32d
 platform. (#7479)

Add support for Accton as9726-32d platform

This pull request is based on as9716-32d, so I reference as9716-32d to create new model: as9726-32d.
This module do not need led driver to control led, FPGA can handle it.
I also implement API2.0(sonic_platform) for this model, CPLD driver, PSU driver, Fan driver to control these HW behavior.
---
 .../Accton-AS9726-32D/port_config.ini         |   35 +
 .../x86_64-accton_as9726_32d-r0/default_sku   |    1 +
 .../installer.conf                            |    3 +
 .../plugins/eeprom.py                         |   13 +
 .../plugins/psuutil.py                        |   61 +
 .../plugins/sfputil.py                        |  293 +++
 .../pmon_daemon_control.json                  |    5 +
 .../sonic_platform/__init__.py                |    2 +
 .../sonic_platform/chassis.py                 |  201 ++
 .../sonic_platform/component.py               |  121 +
 .../sonic_platform/eeprom.py                  |  102 +
 .../sonic_platform/fan.py                     |  171 ++
 .../sonic_platform/helper.py                  |  117 +
 .../sonic_platform/platform.py                |   21 +
 .../sonic_platform/psu.py                     |  226 ++
 .../sonic_platform/sfp.py                     | 2221 +++++++++++++++++
 .../sonic_platform/thermal.py                 |  151 ++
 platform/broadcom/one-image.mk                |    1 +
 platform/broadcom/platform-modules-accton.mk  |    6 +
 .../as9726-32d/classes/__init__.py            |    0
 .../as9726-32d/classes/fanutil.py             |  216 ++
 .../as9726-32d/classes/thermalutil.py         |   89 +
 .../as9726-32d/modules/Makefile               |   19 +
 .../modules/x86-64-accton-as9726-32d-cpld.c   |  987 ++++++++
 .../modules/x86-64-accton-as9726-32d-fan.c    |  717 ++++++
 .../modules/x86-64-accton-as9726-32d-psu.c    |  321 +++
 .../as9726-32d/modules/ym2651y.c              |  678 +++++
 .../as9726-32d-platform-monitor-fan.service   |   16 +
 .../as9726-32d-platform-monitor-psu.service   |   16 +
 .../as9726-32d-platform-monitor.service       |   17 +
 .../as9726-32d/setup.py                       |   14 +
 .../as9726-32d/sonic_platform_setup.py        |   34 +
 .../as9726-32d/utils/README                   |   65 +
 .../utils/accton_as9726_32d_monitor.py        |  565 +++++
 .../utils/accton_as9726_32d_monitor_fan.py    |  186 ++
 .../utils/accton_as9726_32d_monitor_psu.py    |  159 ++
 .../utils/accton_as9726_32d_util.py           |  680 +++++
 .../debian/control                            |    4 +
 .../debian/rules                              |    2 +-
 .../sonic-platform-accton-as9726-32d.install  |    2 +
 40 files changed, 8537 insertions(+), 1 deletion(-)
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/Accton-AS9726-32D/port_config.ini
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/default_sku
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/installer.conf
 create mode 100755 device/accton/x86_64-accton_as9726_32d-r0/plugins/eeprom.py
 create mode 100755 device/accton/x86_64-accton_as9726_32d-r0/plugins/psuutil.py
 create mode 100755 device/accton/x86_64-accton_as9726_32d-r0/plugins/sfputil.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/pmon_daemon_control.json
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/__init__.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/chassis.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/component.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/eeprom.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/fan.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/helper.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/platform.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/psu.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/sfp.py
 create mode 100644 device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/thermal.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/__init__.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/fanutil.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/thermalutil.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/Makefile
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-cpld.c
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-fan.c
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-psu.c
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/ym2651y.c
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-fan.service
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-psu.service
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor.service
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as9726-32d/sonic_platform_setup.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/README
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_fan.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_psu.py
 create mode 100755 platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_util.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as9726-32d.install

diff --git a/device/accton/x86_64-accton_as9726_32d-r0/Accton-AS9726-32D/port_config.ini b/device/accton/x86_64-accton_as9726_32d-r0/Accton-AS9726-32D/port_config.ini
new file mode 100644
index 000000000000..f7fcf8517df8
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/Accton-AS9726-32D/port_config.ini
@@ -0,0 +1,35 @@
+# name          lanes                                alias              index    speed
+Ethernet1       73,74,75,76,77,78,79,80              fourHundredGigE1   1        400000
+Ethernet2       65,66,67,68,69,70,71,72              fourHundredGigE2   2        400000
+Ethernet3       81,82,83,84,85,86,87,88              fourHundredGigE3   3        400000
+Ethernet4       89,90,91,92,93,94,95,96              fourHundredGigE4   4        400000
+Ethernet5       97,98,99,100,101,102,103,104         fourHundredGigE5   5        400000
+Ethernet6       105,106,107,108,109,110,111,112      fourHundredGigE6   6        400000
+Ethernet7       113,114,115,116,117,118,119,120      fourHundredGigE7   7        400000
+Ethernet8       121,122,123,124,125,126,127,128      fourHundredGigE8   8        400000
+Ethernet9       41,42,43,44,45,46,47,48              fourHundredGigE9   9        400000
+Ethernet10      33,34,35,36,37,38,39,40              fourHundredGigE10  10       400000
+Ethernet11      49,50,51,52,53,54,55,56              fourHundredGigE11  11       400000
+Ethernet12      57,58,59,60,61,62,63,64              fourHundredGigE12  12       400000
+Ethernet13      129,130,131,132,133,134,135,136      fourHundredGigE13  13       400000
+Ethernet14      137,138,139,140,141,142,143,144      fourHundredGigE14  14       400000
+Ethernet15      145,146,147,148,149,150,151,152      fourHundredGigE15  15       400000
+Ethernet16      153,154,155,156,157,158,159,160      fourHundredGigE16  16       400000
+Ethernet17      169,170,171,172,173,174,175,176      fourHundredGigE17  17       400000
+Ethernet18      161,162,163,164,165,166,167,168      fourHundredGigE18  18       400000
+Ethernet19      177,178,179,180,181,182,183,184      fourHundredGigE19  19       400000
+Ethernet20      185,186,187,188,189,190,191,192      fourHundredGigE20  20       400000
+Ethernet21      1,2,3,4,5,6,7,8                      fourHundredGigE21  21       400000
+Ethernet22      9,10,11,12,13,14,15,16               fourHundredGigE22  22       400000
+Ethernet23      17,18,19,20,21,22,23,24              fourHundredGigE23  23       400000
+Ethernet24      25,26,27,28,29,30,31,32              fourHundredGigE24  24       400000
+Ethernet25      201,202,203,204,205,206,207,208      fourHundredGigE25  25       400000
+Ethernet26      193,194,195,196,197,198,199,200      fourHundredGigE26  26       400000
+Ethernet27      217,218,219,220,221,222,223,224      fourHundredGigE27  27       400000
+Ethernet28      209,210,211,212,213,214,215,216      fourHundredGigE28  28       400000
+Ethernet29      233,234,235,236,237,238,239,240      fourHundredGigE29  29       400000
+Ethernet30      225,226,227,228,229,230,231,232      fourHundredGigE30  30       400000
+Ethernet31      249,250,251,252,253,254,255,256      fourHundredGigE31  31       400000
+Ethernet32      241,242,243,244,245,246,247,248      fourHundredGigE32  32       400000
+Ethernet33      249                                  tenGigE33          33       10000
+Ethernet34      250                                  tenGigE34          34       10000
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/default_sku b/device/accton/x86_64-accton_as9726_32d-r0/default_sku
new file mode 100644
index 000000000000..bfc864f74c74
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/default_sku
@@ -0,0 +1 @@
+Accton-AS9726-32D t1
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/installer.conf b/device/accton/x86_64-accton_as9726_32d-r0/installer.conf
new file mode 100644
index 000000000000..925a32fc0c3a
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/installer.conf
@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as9726_32d-r0/plugins/eeprom.py
new file mode 100755
index 000000000000..7409239d01f3
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/plugins/eeprom.py
@@ -0,0 +1,13 @@
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+    _TLV_INFO_MAX_LEN = 256
+
+    def __init__(self, name, path, cpld_root, ro):
+        self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+        super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/plugins/psuutil.py b/device/accton/x86_64-accton_as9726_32d-r0/plugins/psuutil.py
new file mode 100755
index 000000000000..104fee28c8b5
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/plugins/psuutil.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC PSU Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    def __init__(self):
+        PsuBase.__init__(self)
+
+        self.psu_path = "/sys/bus/i2c/devices/"
+        self.psu_presence = "/psu_present"
+        self.psu_oper_status = "/psu_power_good"
+        self.psu_mapping = {
+            1: "9-0050",
+            2: "9-0051",
+        }
+
+    def get_num_psus(self):
+        return len(self.psu_mapping)
+
+    def get_psu_status(self, index):
+        if index is None:
+            return False
+
+        status = 0
+        node = self.psu_path + self.psu_mapping[index] + self.psu_oper_status
+        try:
+            with open(node, 'r') as power_status:
+                status = int(power_status.read())
+        except IOError:
+            return False
+
+        return status == 1
+
+    def get_psu_presence(self, index):
+        if index is None:
+            return False
+
+        status = 0
+        node = self.psu_path + self.psu_mapping[index] + self.psu_presence
+        try:
+            with open(node, 'r') as presence_status:
+                status = int(presence_status.read())
+        except IOError:
+            return False
+
+        return status == 1
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/plugins/sfputil.py b/device/accton/x86_64-accton_as9726_32d-r0/plugins/sfputil.py
new file mode 100755
index 000000000000..2a365815cab6
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/plugins/sfputil.py
@@ -0,0 +1,293 @@
+# sfputil.py
+#
+# Platform-specific SFP transceiver interface for SONiC
+#
+
+try:
+    import time
+    from ctypes import create_string_buffer
+    from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
+
+
+class SfpUtil(SfpUtilBase):
+    """Platform-specific SfpUtil class"""
+
+    PORT_START = 1
+    QSFP_PORT_END = 32
+    PORT_END = 34
+    PORTS_IN_BLOCK = 34
+
+    BASE_OOM_PATH = "/sys/bus/i2c/devices/{0}-0050/"
+    BASE_CPLD2_PATH = "/sys/bus/i2c/devices/10-0061/"
+    BASE_CPLD3_PATH = "/sys/bus/i2c/devices/10-0062/"
+
+    _port_to_is_present = {}
+    _port_to_lp_mode = {}
+
+    _port_to_eeprom_mapping = {}
+    _port_to_i2c_mapping = {
+        1: 17,
+        2: 18,
+        3: 19,
+        4: 20,
+        5: 21,
+        6: 22,
+        7: 23,
+        8: 24,
+        9: 25,
+        10: 26,
+        11: 27,
+        12: 28,
+        13: 29,
+        14: 30,
+        15: 31,
+        16: 32,
+        17: 33,
+        18: 34,
+        19: 35,
+        20: 36,
+        21: 37,
+        22: 38,
+        23: 39,
+        24: 40,
+        25: 41,
+        26: 42,
+        27: 43,
+        28: 44,
+        29: 45,
+        30: 46,
+        31: 47,
+        32: 48,
+        33: 49,
+        34: 50,
+    }
+
+    @property
+    def port_start(self):
+        return self.PORT_START
+
+    @property
+    def port_end(self):
+        return self.PORT_END
+
+    @property
+    def qsfp_ports(self):
+        return list(range(self.PORT_START, self.PORTS_IN_BLOCK - 1))
+
+    @property
+    def port_to_eeprom_mapping(self):
+        return self._port_to_eeprom_mapping
+
+    def __init__(self):
+        eeprom_path = self.BASE_OOM_PATH + "eeprom"
+
+        for x in range(self.port_start, self.port_end+1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(
+                self._port_to_i2c_mapping[x]
+            )
+
+        SfpUtilBase.__init__(self)
+
+    def __write_txt_file(self, file_path, value):
+        try:
+            reg_file = open(file_path, "w")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_file.write(str(value))
+        reg_file.close()
+
+        return True
+
+    def get_presence(self, port_num):
+        if port_num <= 16:
+            present_path = self.BASE_CPLD2_PATH + "module_present_" + str(port_num)
+        else:
+            present_path = self.BASE_CPLD3_PATH + "module_present_" + str(port_num)
+        self.__port_to_is_present = present_path
+
+        try:
+            val_file = open(present_path)
+            content = val_file.readline().rstrip()
+            val_file.close()
+        except IOError as e:
+            print("Error: unable to access file: %s" % str(e))
+            return False
+
+        if content == "1":
+            return True
+
+        return False
+
+    def get_low_power_mode(self, port_num):
+        if port_num > self.QSFP_PORT_END: #sfp not support lpmode
+            return False
+        try:
+            eeprom = None
+
+            if not self.get_presence(port_num):
+                return False
+
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "rb")
+            eeprom.seek(93)
+            lpmode = ord(eeprom.read(1))
+
+            if ((lpmode & 0x3) == 0x3):
+                return True  # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1
+            else:
+                # High Power Mode if one of the following conditions is matched:
+                # 1. "Power override" bit is 0
+                # 2. "Power override" bit is 1 and "Power set" bit is 0
+                return False
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+    def set_low_power_mode(self, port_num, lpmode):
+        # Check for invalid port_num
+        if port_num > self.QSFP_PORT_END: #sfp not support lpmode:
+            return False
+
+        try:
+            eeprom = None
+            if not self.get_presence(port_num):
+                return False  # Port is not present, unable to set the eeprom
+
+            # Fill in write buffer
+            # 0x3:Low Power Mode. "Power override" bit is 1 and "Power set" bit is 1
+            # 0x9:High Power Mode. "Power override" bit is 1 ,"Power set" bit is 0 and "High Power Class Enable" bit is 1
+            regval = 0x3 if lpmode else 0x9
+
+            buffer = create_string_buffer(1)
+            buffer[0] = regval
+
+            # Write to eeprom
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "r+b")
+            eeprom.seek(93)
+            eeprom.write(buffer[0])
+            return True
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+    def reset(self, port_num):
+        if port_num > self.QSFP_PORT_END: #sfp not support lpmode:
+            return False
+        if not self.get_presence(port_num):
+            return False  # Port is not present, unable to set reset
+
+        if port_num < 16:
+            mod_rst_path = self.BASE_CPLD2_PATH + "module_reset_" + str(port_num)
+        else:
+            mod_rst_path = self.BASE_CPLD3_PATH + "module_reset_" + str(port_num)
+
+        self.__port_to_mod_rst = mod_rst_path
+
+        ret = self.__write_txt_file(self.__port_to_mod_rst, 1)
+        if ret is not True:
+            return ret
+        
+        time.sleep(0.2)
+        ret = self.__write_txt_file(self.__port_to_mod_rst, 0)
+        time.sleep(0.2)
+        
+        return ret
+
+    def get_cpld_interrupt(self):
+        port_dict = {}
+        for i in range(0, 4):
+            if i == 0 or i == 1:
+                cpld_i2c_path = self.BASE_CPLD2_PATH + "cpld_intr_" + str(i+1)
+            else:
+                cpld_i2c_path = self.BASE_CPLD3_PATH + "cpld_intr_" + str(i+1)
+
+            start_i = (i*8)
+            end_i = (i*8+8)
+            try:
+                val_file = open(cpld_i2c_path)
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+
+                for k in range(start_i, end_i):
+                    port_dict[k] = 0
+                return port_dict
+
+            status = val_file.readline().rstrip()
+            val_file.close()
+            status = status.strip()
+            status = int(status, 16)
+
+            interrupt_status = ~(status & 0xff)
+            if interrupt_status:
+                port_shift = 0
+                for k in range(start_i, end_i):
+                    if interrupt_status & (0x1 << port_shift):
+                        port_dict[k] = 1
+                    else:
+                        port_dict[k] = 0
+                    port_shift = port_shift+1
+
+        return port_dict
+
+    def get_transceiver_change_event(self, timeout=0):
+        start_time = time.time()
+        port_dict = {}
+        forever = False
+
+        if timeout == 0:
+            forever = True
+        elif timeout > 0:
+            timeout = timeout / float(1000)  # Convert to secs
+        else:
+            print("get_transceiver_change_event:Invalid timeout value", timeout)
+            return False, {}
+
+        end_time = start_time + timeout
+        if start_time > end_time:
+            print('get_transceiver_change_event:'
+                  'time wrap / invalid timeout value', timeout)
+
+            return False, {}  # Time wrap or possibly incorrect timeout
+
+        # for i in range(self.port_start, self.port_end+1):
+        #        ori_present[i]=self.get_presence(i)
+
+        while timeout >= 0:
+            change_status = 0
+
+            port_dict = self.get_cpld_interrupt()
+            present = 0
+            for key, value in port_dict.items():
+                if value == 1:
+                    present = self.get_presence(key)
+                    change_status = 1
+                    if present:
+                        port_dict[key] = '1'
+                    else:
+                        port_dict[key] = '0'
+
+            if change_status:
+                return True, port_dict
+            if forever:
+                time.sleep(1)
+            else:
+                timeout = end_time - time.time()
+                if timeout >= 1:
+                    time.sleep(1)  # We poll at 1 second granularity
+                else:
+                    if timeout > 0:
+                        time.sleep(timeout)
+                    return True, {}
+        print("get_evt_change_event: Should not reach here.")
+        return False, {}
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/pmon_daemon_control.json b/device/accton/x86_64-accton_as9726_32d-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..584a14b9d942
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/pmon_daemon_control.json
@@ -0,0 +1,5 @@
+{
+    "skip_ledd": true,
+    "skip_thermalctld": true
+}
+
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/__init__.py
new file mode 100644
index 000000000000..a18a2a2d2a3b
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+from . import platform 
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/chassis.py
new file mode 100644
index 000000000000..7eb9601d8b56
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/chassis.py
@@ -0,0 +1,201 @@
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Chassis information which are available in the platform
+#
+#############################################################################
+
+import os
+
+try:
+    from sonic_platform_base.chassis_base import ChassisBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN_TRAY = 6
+NUM_FAN = 2
+NUM_PSU = 2
+NUM_THERMAL = 3
+NUM_QSFP = 32
+PORT_START = 1
+PORT_END = 34
+QSFP_PORT_START = 0
+QSFP_PORT_END = 31
+NUM_COMPONENT = 2
+HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
+PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
+REBOOT_CAUSE_FILE = "reboot-cause.txt"
+PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+
+class Chassis(ChassisBase):
+    """Platform-specific Chassis class"""
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self._api_helper = APIHelper()
+        self.is_host = self._api_helper.is_host()
+
+        self.config_data = {}
+
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
+        self.__initialize_sfp()
+        self.__initialize_eeprom()
+
+    def __initialize_sfp(self):
+        from sonic_platform.sfp import Sfp
+
+        self.QSFP_PORT_START = QSFP_PORT_START
+        self.QSFP_PORT_END = QSFP_PORT_END
+        for index in range(0, PORT_END):
+            if index in range(self.QSFP_PORT_START, self.QSFP_PORT_END + 1):
+                sfp_module = Sfp(index, 'QSFP')
+            else:
+                sfp_module = Sfp(index, 'SFP')
+            self._sfp_list.append(sfp_module)
+        self.sfp_module_initialized = True
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fant_index in range(0, NUM_FAN_TRAY):
+            for fan_index in range(0, NUM_FAN):
+                fan = Fan(fant_index, fan_index)
+                self._fan_list.append(fan)
+
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
+        for index in range(0, NUM_THERMAL):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
+        for index in range(0, NUM_COMPONENT):
+            component = Component(index)
+            self._component_list.append(component)
+
+    def __initialize_watchdog(self):
+        from sonic_platform.watchdog import Watchdog
+        self._watchdog = Watchdog()
+
+
+    def __is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.get_mac()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.get_eeprom()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+
+        reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
+        sw_reboot_cause = self._api_helper.read_txt_file(
+            reboot_cause_path) or "Unknown"
+
+
+        return ('REBOOT_CAUSE_NON_HARDWARE', sw_reboot_cause)
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/component.py
new file mode 100644
index 000000000000..c34da704432a
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/component.py
@@ -0,0 +1,121 @@
+#############################################################################
+# Accton
+#
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
+#
+#############################################################################
+
+import shlex
+import subprocess
+
+
+try:
+    from sonic_platform_base.component_base import ComponentBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_ADDR_MAPPING = {
+    "CPLD1": "3-0060"
+}
+SYSFS_PATH = "/sys/bus/i2c/devices/"
+BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
+COMPONENT_LIST= [
+   ("CPLD1", "CPLD 1"),
+   ("BIOS", "Basic Input/Output System")
+
+]
+
+class Component(ComponentBase):
+    """Platform-specific Component class"""
+
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_index=0):
+        self._api_helper=APIHelper()
+        ComponentBase.__init__(self)
+        self.index = component_index
+        self.name = self.get_name()        
+
+    def __run_command(self, command):
+        # Run bash command and print output to stdout
+        try:
+            process = subprocess.Popen(
+                shlex.split(command), stdout=subprocess.PIPE)
+            while True:
+                output = process.stdout.readline()
+                if output == '' and process.poll() is not None:
+                    break
+            rc = process.poll()
+            if rc != 0:
+                return False
+        except Exception:
+            return False
+        return True
+
+    def __get_bios_version(self):
+        # Retrieves the BIOS firmware version
+        try:
+            with open(BIOS_VERSION_PATH, 'r') as fd:
+                bios_version = fd.read()
+                return bios_version.strip()
+        except Exception as e:
+            return None
+
+    def __get_cpld_version(self):
+        # Retrieves the CPLD firmware version
+        cpld_version = dict()
+        for cpld_name in CPLD_ADDR_MAPPING:
+            try:
+                cpld_path = "{}{}{}".format(SYSFS_PATH, CPLD_ADDR_MAPPING[cpld_name], '/version')
+                cpld_version_raw= self._api_helper.read_txt_file(cpld_path)               
+                cpld_version[cpld_name] = "{}".format(int(cpld_version_raw,16))
+            except Exception as e:
+                print('Get exception when read cpld')
+                cpld_version[cpld_name] = 'None'
+
+        return cpld_version
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+         Returns:
+            A string containing the name of the component
+        """
+        return COMPONENT_LIST[self.index][0]
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+            Returns:
+            A string containing the description of the component
+        """
+        return COMPONENT_LIST[self.index][1]
+
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of module
+        Returns:
+            string: The firmware versions of the module
+        """
+        fw_version = None
+
+        if self.name == "BIOS":
+            fw_version = self.__get_bios_version()
+        elif "CPLD" in self.name:
+            cpld_version = self.__get_cpld_version()           
+            fw_version = cpld_version.get(self.name)
+
+        return fw_version
+
+    def install_firmware(self, image_path):
+        """
+        Install firmware to module
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        raise NotImplementedError
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/eeprom.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..7bf2bb58d19f
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/eeprom.py
@@ -0,0 +1,102 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+
+    def get_eeprom(self):
+        return self._eeprom
+
+    def get_serial(self):
+        return self._eeprom.get('0x23', "Undefined.")
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', "Undefined.")
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/fan.py
new file mode 100644
index 000000000000..a42bdba3bd7e
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/fan.py
@@ -0,0 +1,171 @@
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PSU_FAN_MAX_RPM = 26688
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/14-0066/fan_"
+PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_I2C_MAPPING = {
+    0: {
+        "num": 9,
+        "addr": "58"
+    },
+    1: {
+        "num": 9,
+        "addr": "59"
+    },
+}
+
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        self._api_helper=APIHelper()
+        self.fan_index = fan_index
+        self.fan_tray_index = fan_tray_index
+        self.is_psu_fan = is_psu_fan
+
+        if self.is_psu_fan:
+            self.psu_index = psu_index
+            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+
+        FanBase.__init__(self)  
+
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+
+
+        if not self.is_psu_fan:
+            dir_str = "{}{}{}".format(CPLD_I2C_PATH, 'direction_', self.fan_tray_index)
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val==0:#F2B
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        else: #For PSU
+            dir_str = "{}{}".format(self.psu_hwmon_path,'psu_fan_dir')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val=='F2B':
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        return direction
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+                         
+        """
+        speed = 0
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
+            fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
+            if fan_speed_rpm is not None:
+                speed = (int(fan_speed_rpm,10))*100/26688
+                if speed > 100:
+                    speed=100
+            else:
+                return 0
+        elif self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, 'duty_cycle_percentage')
+            speed=self._api_helper.read_txt_file(speed_path)
+            if speed is None:
+                return 0
+        return int(speed)
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        Note:
+            speed_pc = pwm_target/255*100
+            0   : when PWM mode is use
+            pwm : when pwm mode is not use
+        """
+        return False #Not supported
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return False #Not supported
+
+    def set_speed(self, speed):
+        """
+        Sets the fan speed
+        Args:
+            speed: An integer, the percentage of full fan speed to set fan to,
+                   in the range 0 (off) to 100 (full speed)
+        Returns:
+            A boolean, True if speed is set successfully, False if not
+        """
+
+        if not self.is_psu_fan and self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, 'duty_cycle_percentage')
+            return self._api_helper.write_txt_file(speed_path, int(speed))
+
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return False #Not supported
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        present_path = "{}{}{}".format(CPLD_I2C_PATH, 'present_', self.fan_index+1)
+        val=self._api_helper.read_txt_file(present_path)
+        if not self.is_psu_fan:
+            if val is not None:
+                return int(val, 10)==1
+            else:
+                return False
+        else:
+            return True
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..4cd60ac90611
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/helper.py
@@ -0,0 +1,117 @@
+import os
+import struct
+import subprocess
+from mmap import *
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except IOError:
+            return False
+        return True
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/platform.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/platform.py
new file mode 100644
index 000000000000..b6bc56b5cc67
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/platform.py
@@ -0,0 +1,21 @@
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """Platform-specific Platform class"""
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/psu.py
new file mode 100644
index 000000000000..0ccd83faf57d
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/psu.py
@@ -0,0 +1,226 @@
+#############################################################################
+# Accton
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    #from sonic_platform.fan import Fan
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+I2C_PATH ="/sys/bus/i2c/devices/{0}-00{1}/"
+
+PSU_NAME_LIST = ["PSU-1", "PSU-2"]
+PSU_NUM_FAN = [1, 1]
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 9,
+        "addr": "58"
+    },
+    1: {
+        "num": 9,
+        "addr": "59"
+    },
+}
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 9,
+        "addr": "50"
+    },
+    1: {
+        "num": 9,
+        "addr": "51"
+    },
+}
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+
+    def __init__(self, psu_index=0):
+        PsuBase.__init__(self)
+        self.index = psu_index
+        self._api_helper = APIHelper()
+
+        self.i2c_num = PSU_HWMON_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_HWMON_I2C_MAPPING[self.index]["addr"]
+        self.hwmon_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+
+        self.i2c_num = PSU_CPLD_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_CPLD_I2C_MAPPING[self.index]["addr"]
+        self.cpld_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        self.__initialize_fan()
+        '''
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            #def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+            #fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            fan = Fan(fan_index, 0, True, self.index)
+            self._fan_list.append(fan)
+        '''
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            self._fan_list.append(fan)
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_v_out')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        iout_path = "{}{}".format(self.hwmon_path, 'psu_i_out')        
+        val=self._api_helper.read_txt_file(iout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        pout_path = "{}{}".format(self.hwmon_path, 'psu_p_out')        
+        val=self._api_helper.read_txt_file(pout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+
+        return False  #Controlled by HW
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+
+        return False  #Controlled by HW
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125 
+        """
+        temp_path = "{}{}".format(self.hwmon_path, 'psu_temp1_input')        
+        val=self._api_helper.read_txt_file(temp_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return False #Not supported
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_max')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_min')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """        
+        presence_path="{}{}".format(self.cpld_path, 'psu_present')
+        val=self._api_helper.read_txt_file(presence_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        power_path="{}{}".format(self.cpld_path, 'psu_power_good')
+        val=self._api_helper.read_txt_file(power_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/sfp.py
new file mode 100644
index 000000000000..70c6838a8e88
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/sfp.py
@@ -0,0 +1,2221 @@
+#############################################################################
+# Accton
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import sys
+import time
+import struct
+
+from ctypes import create_string_buffer
+
+try:
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_InterfaceId
+    from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_Dom
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+#Edge-core definitions
+CPLD2_I2C_PATH = "/sys/bus/i2c/devices/10-0061/"
+CPLD3_I2C_PATH = "/sys/bus/i2c/devices/10-0062/"
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET = 64
+XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH = 1
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+QSFP_DD_DOM_BULK_DATA_START = 14
+QSFP_DD_DOM_BULK_DATA_SIZE = 4
+
+# definitions of the offset for values in OSFP info eeprom
+OSFP_TYPE_OFFSET = 0
+OSFP_VENDOR_NAME_OFFSET = 129
+OSFP_VENDOR_PN_OFFSET = 148
+OSFP_HW_REV_OFFSET = 164
+OSFP_VENDOR_SN_OFFSET = 166
+
+# definitions of the offset for values in QSFP_DD info eeprom
+QSFP_DD_TYPE_OFFSET = 0
+QSFP_DD_VENDOR_NAME_OFFSET = 1
+QSFP_DD_VENDOR_PN_OFFSET = 20
+QSFP_DD_VENDOR_SN_OFFSET = 38
+QSFP_DD_VENDOR_OUI_OFFSET = 17
+
+# definitions of the offset and width for values in XCVR_QSFP_DD info eeprom
+XCVR_EXT_TYPE_OFFSET_QSFP_DD = 72
+XCVR_EXT_TYPE_WIDTH_QSFP_DD = 2
+XCVR_CONNECTOR_OFFSET_QSFP_DD = 75
+XCVR_CONNECTOR_WIDTH_QSFP_DD = 1
+XCVR_CABLE_LENGTH_OFFSET_QSFP_DD = 74
+XCVR_CABLE_LENGTH_WIDTH_QSFP_DD = 1
+XCVR_HW_REV_OFFSET_QSFP_DD = 36
+XCVR_HW_REV_WIDTH_QSFP_DD = 2
+XCVR_VENDOR_DATE_OFFSET_QSFP_DD = 54
+XCVR_VENDOR_DATE_WIDTH_QSFP_DD = 8
+XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD = 2
+XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD = 1
+XCVR_MEDIA_TYPE_OFFSET_QSFP_DD = 85
+XCVR_MEDIA_TYPE_WIDTH_QSFP_DD = 1
+XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD = 86
+XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD = 32
+XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD = 351
+XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD = 28
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+QSFP_MODULE_UPPER_PAGE3_START = 384
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNL_THRESHOLD_OFFSET = 176
+QSFP_CHANNL_THRESHOLD_WIDTH = 24
+
+SFP_MODULE_ADDRA2_OFFSET = 256
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 56
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_CHANNL_STATUS_OFFSET = 110
+SFP_CHANNL_STATUS_WIDTH = 1
+
+QSFP_DD_TEMPE_OFFSET = 14
+QSFP_DD_TEMPE_WIDTH = 2
+QSFP_DD_VOLT_OFFSET = 16
+QSFP_DD_VOLT_WIDTH = 2
+QSFP_DD_TX_BIAS_OFFSET = 42
+QSFP_DD_TX_BIAS_WIDTH = 16
+QSFP_DD_RX_POWER_OFFSET = 58
+QSFP_DD_RX_POWER_WIDTH = 16
+QSFP_DD_TX_POWER_OFFSET = 26
+QSFP_DD_TX_POWER_WIDTH = 16
+QSFP_DD_CHANNL_MON_OFFSET = 154
+QSFP_DD_CHANNL_MON_WIDTH = 48
+QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET = 19
+QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET = 7
+QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_DD_MODULE_THRESHOLD_OFFSET = 0
+QSFP_DD_MODULE_THRESHOLD_WIDTH = 72
+QSFP_DD_CHANNL_STATUS_OFFSET = 26
+QSFP_DD_CHANNL_STATUS_WIDTH = 1
+
+
+sfp_cable_length_tup = (
+    'LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+    'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+    'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)'
+)
+
+sfp_compliance_code_tup = (
+    '10GEthernetComplianceCode', 'InfinibandComplianceCode',
+    'ESCONComplianceCodes', 'SONETComplianceCodes',
+    'EthernetComplianceCodes', 'FibreChannelLinkLength',
+    'FibreChannelTechnology', 'SFP+CableTechnology',
+    'FibreChannelTransmissionMedia', 'FibreChannelSpeed'
+)
+
+qsfp_compliance_code_tup = (
+    '10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+    'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+    'Fibre Channel link length/Transmitter Technology',
+    'Fibre Channel transmission media', 'Fibre Channel Speed'
+)
+
+info_dict_keys = [
+    'type', 'hardware_rev', 'serial', 'manufacturer',
+    'model', 'connector', 'encoding', 'ext_identifier',
+    'ext_rateselect_compliance', 'cable_type', 'cable_length',
+    'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+    'vendor_oui', 'application_advertisement', 'type_abbrv_name'
+]
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+dom_info_dict_keys = [
+    'rx_los', 'tx_fault', 'reset_status', 'lp_mode',
+    'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+    'rx1power', 'rx2power', 'rx3power', 'rx4power',
+    'rx5power', 'rx6power', 'rx7power', 'rx8power',
+    'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias',
+    'tx5bias', 'tx6bias', 'tx7bias', 'tx8bias',
+    'tx1power', 'tx2power', 'tx3power', 'tx4power',
+    'tx5power', 'tx6power', 'tx7power', 'tx8power']
+
+threshold_dict_keys = [
+    'temphighalarm', 'temphighwarning',
+    'templowalarm', 'templowwarning',
+    'vcchighalarm', 'vcchighwarning',
+    'vcclowalarm', 'vcclowwarning',
+    'rxpowerhighalarm', 'rxpowerhighwarning',
+    'rxpowerlowalarm', 'rxpowerlowwarning',
+    'txpowerhighalarm', 'txpowerhighwarning',
+    'txpowerlowalarm', 'txpowerlowwarning',
+    'txbiashighalarm', 'txbiashighwarning',
+    'txbiaslowalarm', 'txbiaslowwarning']
+
+SFP_TYPE_CODE_LIST = [
+    '03'  # SFP/SFP+/SFP28
+]
+QSFP_TYPE_CODE_LIST = [
+    '0d',  # QSFP+ or later
+    '11'  # QSFP28 or later
+]
+QSFP_DD_TYPE_CODE_LIST = [
+    '18'  # QSFP-DD Double Density 8X Pluggable Transceiver
+]
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+OSFP_TYPE = "OSFP"
+QSFP_DD_TYPE = "QSFP_DD"
+
+NULL_VAL = 'N/A'
+
+PORT_START = 1
+PORT_END = 34
+QSFP_PORT_START = 1
+QSFP_PORT_END = 32
+
+SFP_I2C_START = 17
+I2C_EEPROM_PATH = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+    PLATFORM = "x86_64-accton_as9726_32d-r0"
+    HWSKU = "Accton-AS9726-32D"
+
+    # Path to sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+
+    CPLD2_PORT_START = 1
+    CPLD2_PORT_END = 16
+    CPLD3_PORT_START = 17
+    CPLD3_PORT_END = 32
+    PRS_PATH = "/sys/devices/platform/dx010_cpld/qsfp_modprs"
+
+    def __init__(self, sfp_index=0, sfp_name=None):
+
+        self._index = sfp_index
+        self._port_num = self._index + 1
+        self._api_helper = APIHelper()
+        self._name = sfp_name
+
+        self._dom_capability_detect()
+        self._eeprom_path = self._get_eeprom_path()
+        SfpBase.__init__(self)
+
+    def __write_txt_file(self, file_path, value):
+        try:
+            reg_file = open(file_path, "w")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_file.write(str(value))
+        reg_file.close()
+
+        return True
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfs_sfp_i2c_client_eeprom_path = self._get_eeprom_path()
+        eeprom_raw = []
+        try:
+            eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path,
+                mode="rb", buffering=0)
+        except IOError:
+            return None
+
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        try:
+            eeprom.seek(offset)
+            raw = eeprom.read(num_bytes)
+        except IOError:
+            eeprom.close()
+            return None
+
+        try:
+            if isinstance(raw, str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
+        except BaseException:
+            eeprom.close()
+            return None
+
+        eeprom.close()
+        return eeprom_raw
+
+    def _detect_sfp_type(self):
+        sfp_type = QSFP_TYPE
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_specific_bytes(
+            XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH)
+        if eeprom_raw:
+            if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
+                self.sfp_type = SFP_TYPE
+            elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_TYPE
+            elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_DD_TYPE
+            else:
+                self.sfp_type = sfp_type
+        else:
+            self.sfp_type = sfp_type
+
+    def _get_eeprom_path(self):
+        port_to_i2c_mapping = SFP_I2C_START + self._index
+        port_eeprom_path = I2C_EEPROM_PATH.format(port_to_i2c_mapping)
+        return port_eeprom_path
+
+    def _dom_capability_detect(self):
+        self._detect_sfp_type()
+    
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == QSFP_TYPE:
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse,
+            # through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET),
+                XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_version_compliance_raw = self._read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET,
+                    QSFP_VERSION_COMPLIANCE_WIDTH)
+                qsfp_version_compliance = int(
+                    qsfp_version_compliance_raw[0], 16)
+                dom_capability = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
+                    self.dom_volt_supported = dom_capability['data']['Voltage_support']['value'] == 'On'
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = dom_capability['data']['Tx_power_support']['value'] == 'On'
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = True
+
+                self.dom_supported = True
+                self.calibration = 1
+                sfpd_obj = sff8436Dom()
+                if sfpd_obj is None:
+                    return None
+                qsfp_option_value_raw = self._read_eeprom_specific_bytes(
+                    QSFP_OPTION_VALUE_OFFSET, QSFP_OPTION_VALUE_WIDTH)
+                if qsfp_option_value_raw is not None:
+                    optional_capability = sfpd_obj.parse_option_params(
+                        qsfp_option_value_raw, 0)
+                    self.dom_tx_disable_supported = optional_capability[
+                        'data']['TxDisable']['value'] == 'On'
+                dom_status_indicator = sfpd_obj.parse_dom_status_indicator(
+                    qsfp_version_compliance_raw, 1)
+                self.qsfp_page3_available = dom_status_indicator['data']['FlatMem']['value'] == 'Off'
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+                self.qsfp_page3_available = False
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+
+            offset = 0
+            # two types of QSFP-DD cable types supported: Copper and Optical.
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD), XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD)
+            if qsfp_dom_capability_raw is not None:
+                self.dom_temp_supported = True
+                self.dom_volt_supported = True
+                dom_capability = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+                if dom_capability['data']['Flat_MEM']['value'] == 'Off':
+                    self.dom_supported = True
+                    self.second_application_list = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    self.dom_tx_bias_power_supported = True
+                    self.dom_thresholds_supported = True
+                    # currently set to False becasue Page 11h is not supported by FW
+                    self.dom_rx_tx_power_bias_supported = False
+                else:
+                    self.dom_supported = False
+                    self.second_application_list = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.dom_tx_bias_power_supported = False
+                    self.dom_thresholds_supported = False
+                    self.dom_rx_tx_power_bias_supported = False
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.dom_tx_bias_power_supported = False
+                self.dom_thresholds_supported = False
+                self.dom_rx_tx_power_bias_supported = False
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self._read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (
+                    int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ================================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ================================================================================
+        """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(
+            info_dict_keys, NULL_VAL)
+        transceiver_info_dict["specification_compliance"] = '{}'
+
+        # ToDo: OSFP tranceiver info parsing not fully supported.
+        # in inf8628.py lack of some memory map definition
+        # will be implemented when the inf8628 memory map ready
+        if self.sfp_type == OSFP_TYPE:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_OSFP
+
+            sfpi_obj = inf8628InterfaceId()
+            if sfpi_obj is None:
+                return transceiver_info_dict
+
+            sfp_type_raw = self._read_eeprom_specific_bytes(
+                (offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                    sfp_vendor_name_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                    sfp_vendor_pn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes(
+                (offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                    sfp_vendor_rev_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                    sfp_vendor_sn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 128
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+            sfp_type_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                    sfp_vendor_name_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                    sfp_vendor_pn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET_QSFP_DD), XCVR_HW_REV_WIDTH_QSFP_DD)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                    sfp_vendor_rev_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                    sfp_vendor_sn_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_oui_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+            if sfp_vendor_oui_raw is not None:
+                sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                    sfp_vendor_oui_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_vendor_date_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_VENDOR_DATE_OFFSET_QSFP_DD), XCVR_VENDOR_DATE_WIDTH_QSFP_DD)
+            if sfp_vendor_date_raw is not None:
+                sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+                    sfp_vendor_date_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_connector_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_CONNECTOR_OFFSET_QSFP_DD), XCVR_CONNECTOR_WIDTH_QSFP_DD)
+            if sfp_connector_raw is not None:
+                sfp_connector_data = sfpi_obj.parse_connector(
+                    sfp_connector_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_ext_identifier_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_EXT_TYPE_OFFSET_QSFP_DD), XCVR_EXT_TYPE_WIDTH_QSFP_DD)
+            if sfp_ext_identifier_raw is not None:
+                sfp_ext_identifier_data = sfpi_obj.parse_ext_iden(
+                    sfp_ext_identifier_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_cable_len_raw = self._read_eeprom_specific_bytes(
+                (offset + XCVR_CABLE_LENGTH_OFFSET_QSFP_DD), XCVR_CABLE_LENGTH_WIDTH_QSFP_DD)
+            if sfp_cable_len_raw is not None:
+                sfp_cable_len_data = sfpi_obj.parse_cable_len(
+                    sfp_cable_len_raw, 0)
+            else:
+                return transceiver_info_dict
+
+            sfp_media_type_raw = self._read_eeprom_specific_bytes(
+                XCVR_MEDIA_TYPE_OFFSET_QSFP_DD, XCVR_MEDIA_TYPE_WIDTH_QSFP_DD)
+            if sfp_media_type_raw is not None:
+                sfp_media_type_dict = sfpi_obj.parse_media_type(
+                    sfp_media_type_raw, 0)
+                if sfp_media_type_dict is None:
+                    return transceiver_info_dict
+
+                host_media_list = ""
+                sfp_application_type_first_list = self._read_eeprom_specific_bytes(
+                    (XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD)
+                if self.second_application_list:
+                    possible_application_count = 15
+                    sfp_application_type_second_list = self._read_eeprom_specific_bytes(
+                        (XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD)
+                    if sfp_application_type_first_list is not None and sfp_application_type_second_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list + \
+                            sfp_application_type_second_list
+                    else:
+                        return transceiver_info_dict
+                else:
+                    possible_application_count = 8
+                    if sfp_application_type_first_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list
+                    else:
+                        return transceiver_info_dict
+
+                for i in range(0, possible_application_count):
+                    if sfp_application_type_list[i * 4] == 'ff':
+                        break
+                    host_electrical, media_interface = sfpi_obj.parse_application(
+                        sfp_media_type_dict, sfp_application_type_list[i * 4], sfp_application_type_list[i * 4 + 1])
+                    host_media_list = host_media_list + host_electrical + \
+                        ' - ' + media_interface + '\n\t\t\t\t   '
+            else:
+                return transceiver_info_dict
+
+            transceiver_info_dict['type'] = str(
+                sfp_type_data['data']['type']['value'])
+            transceiver_info_dict['manufacturer'] = str(
+                sfp_vendor_name_data['data']['Vendor Name']['value'])
+            transceiver_info_dict['model'] = str(
+                sfp_vendor_pn_data['data']['Vendor PN']['value'])
+            transceiver_info_dict['hardware_rev'] = str(
+                sfp_vendor_rev_data['data']['Vendor Rev']['value'])
+            transceiver_info_dict['serial'] = str(
+                sfp_vendor_sn_data['data']['Vendor SN']['value'])
+            transceiver_info_dict['vendor_oui'] = str(
+                sfp_vendor_oui_data['data']['Vendor OUI']['value'])
+            transceiver_info_dict['vendor_date'] = str(
+                sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'])
+            transceiver_info_dict['connector'] = str(
+                sfp_connector_data['data']['Connector']['value'])
+            transceiver_info_dict['encoding'] = "Not supported for CMIS cables"
+            transceiver_info_dict['ext_identifier'] = str(
+                sfp_ext_identifier_data['data']['Extended Identifier']['value'])
+            transceiver_info_dict['ext_rateselect_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['specification_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['cable_type'] = "Length Cable Assembly(m)"
+            transceiver_info_dict['cable_length'] = str(
+                sfp_cable_len_data['data']['Length Cable Assembly(m)']['value'])
+            transceiver_info_dict['nominal_bit_rate'] = "Not supported for CMIS cables"
+            transceiver_info_dict['application_advertisement'] = host_media_list
+
+        else:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        if self.sfp_type != QSFP_DD_TYPE:
+            sfp_interface_bulk_raw = self._read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is None:
+                return transceiver_info_dict
+
+            start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + interface_info_bulk_width
+            sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_NAME_WIDTH
+            sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_PN_WIDTH
+            sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + vendor_rev_width
+            sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_SN_WIDTH
+            sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_OUI_WIDTH
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_DATE_WIDTH
+            sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
+            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+                'data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+
+            if self.sfp_type == QSFP_TYPE:
+                for key in qsfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(
+                            sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in qsfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                sfp_ext_specification_compliance_raw = self._read_eeprom_specific_bytes(
+                    offset + XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET, XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH)
+                if sfp_ext_specification_compliance_raw is not None:
+                    sfp_ext_specification_compliance_data = sfpi_obj.parse_ext_specification_compliance(
+                        sfp_ext_specification_compliance_raw[0: 1], 0)
+                    if sfp_ext_specification_compliance_data['data']['Extended Specification compliance']['value'] != "Unspecified":
+                        compliance_code_dict['Extended Specification compliance'] = sfp_ext_specification_compliance_data[
+                            'data']['Extended Specification compliance']['value']
+                transceiver_info_dict['specification_compliance'] = str(
+                    compliance_code_dict)
+                transceiver_info_dict['nominal_bit_rate'] = str(
+                    sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+            else:
+                for key in sfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(
+                            sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in sfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                transceiver_info_dict['specification_compliance'] = str(
+                    compliance_code_dict)
+
+                transceiver_info_dict['nominal_bit_rate'] = str(
+                    sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+        transceiver_dom_info_dict = dict.fromkeys(
+            dom_info_dict_keys, NULL_VAL)
+
+        if self.sfp_type == OSFP_TYPE:
+            pass
+
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_BULK_DATA_START), QSFP_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_TEMPE_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_data_raw[start: end], 0)
+                temp = dom_temperature_data['data']['Temperature']['value']
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_VOLT_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(
+                    dom_data_raw[start: end], 0)
+                volt = dom_voltage_data['data']['Vcc']['value']
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            start = QSFP_CHANNL_MON_OFFSET - QSFP_DOM_BULK_DATA_START
+            end = start + QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                dom_data_raw[start: end], 0)
+
+            if self.dom_tx_power_supported:
+                transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if self.dom_rx_power_supported:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+
+            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+            transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+            transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+            transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+
+            offset = 0
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_DOM_BULK_DATA_START), QSFP_DD_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_DD_TEMPE_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_data_raw[start: end], 0)
+                temp = dom_temperature_data['data']['Temperature']['value']
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_DD_VOLT_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(
+                    dom_data_raw[start: end], 0)
+                volt = dom_voltage_data['data']['Vcc']['value']
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            if self.dom_rx_tx_power_bias_supported:
+                # page 11h
+                dom_data_raw = self._read_eeprom_specific_bytes(
+                    (QSFP_DD_CHANNL_MON_OFFSET), QSFP_DD_CHANNL_MON_WIDTH)
+                if dom_data_raw is None:
+                    return transceiver_dom_info_dict
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_data_raw, 0)
+
+                if self.dom_tx_power_supported:
+                    transceiver_dom_info_dict['tx1power'] = str(
+                        dom_channel_monitor_data['data']['TX1Power']['value'])
+                    transceiver_dom_info_dict['tx2power'] = str(
+                        dom_channel_monitor_data['data']['TX2Power']['value'])
+                    transceiver_dom_info_dict['tx3power'] = str(
+                        dom_channel_monitor_data['data']['TX3Power']['value'])
+                    transceiver_dom_info_dict['tx4power'] = str(
+                        dom_channel_monitor_data['data']['TX4Power']['value'])
+                    transceiver_dom_info_dict['tx5power'] = str(
+                        dom_channel_monitor_data['data']['TX5Power']['value'])
+                    transceiver_dom_info_dict['tx6power'] = str(
+                        dom_channel_monitor_data['data']['TX6Power']['value'])
+                    transceiver_dom_info_dict['tx7power'] = str(
+                        dom_channel_monitor_data['data']['TX7Power']['value'])
+                    transceiver_dom_info_dict['tx8power'] = str(
+                        dom_channel_monitor_data['data']['TX8Power']['value'])
+
+                if self.dom_rx_power_supported:
+                    transceiver_dom_info_dict['rx1power'] = str(
+                        dom_channel_monitor_data['data']['RX1Power']['value'])
+                    transceiver_dom_info_dict['rx2power'] = str(
+                        dom_channel_monitor_data['data']['RX2Power']['value'])
+                    transceiver_dom_info_dict['rx3power'] = str(
+                        dom_channel_monitor_data['data']['RX3Power']['value'])
+                    transceiver_dom_info_dict['rx4power'] = str(
+                        dom_channel_monitor_data['data']['RX4Power']['value'])
+                    transceiver_dom_info_dict['rx5power'] = str(
+                        dom_channel_monitor_data['data']['RX5Power']['value'])
+                    transceiver_dom_info_dict['rx6power'] = str(
+                        dom_channel_monitor_data['data']['RX6Power']['value'])
+                    transceiver_dom_info_dict['rx7power'] = str(
+                        dom_channel_monitor_data['data']['RX7Power']['value'])
+                    transceiver_dom_info_dict['rx8power'] = str(
+                        dom_channel_monitor_data['data']['RX8Power']['value'])
+
+                if self.dom_tx_bias_power_supported:
+                    transceiver_dom_info_dict['tx1bias'] = str(
+                        dom_channel_monitor_data['data']['TX1Bias']['value'])
+                    transceiver_dom_info_dict['tx2bias'] = str(
+                        dom_channel_monitor_data['data']['TX2Bias']['value'])
+                    transceiver_dom_info_dict['tx3bias'] = str(
+                        dom_channel_monitor_data['data']['TX3Bias']['value'])
+                    transceiver_dom_info_dict['tx4bias'] = str(
+                        dom_channel_monitor_data['data']['TX4Bias']['value'])
+                    transceiver_dom_info_dict['tx5bias'] = str(
+                        dom_channel_monitor_data['data']['TX5Bias']['value'])
+                    transceiver_dom_info_dict['tx6bias'] = str(
+                        dom_channel_monitor_data['data']['TX6Bias']['value'])
+                    transceiver_dom_info_dict['tx7bias'] = str(
+                        dom_channel_monitor_data['data']['TX7Bias']['value'])
+                    transceiver_dom_info_dict['tx8bias'] = str(
+                        dom_channel_monitor_data['data']['TX8Bias']['value'])
+
+            return transceiver_dom_info_dict
+
+        else:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_data_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_DOM_BULK_DATA_START), SFP_DOM_BULK_DATA_SIZE)
+
+            start = SFP_TEMPE_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_TEMPE_WIDTH
+            dom_temperature_data = sfpd_obj.parse_temperature(
+                dom_data_raw[start: end], 0)
+
+            start = SFP_VOLT_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_VOLT_WIDTH
+            dom_voltage_data = sfpd_obj.parse_voltage(
+                dom_data_raw[start: end], 0)
+
+            start = SFP_CHANNL_MON_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_CHANNL_MON_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                dom_data_raw[start: end], 0)
+
+            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+            transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RXPower']['value']
+            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TXBias']['value']
+            transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TXPower']['value']
+
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disabled_channel'] = self.get_tx_disable_channel(
+        )
+
+        for key in transceiver_dom_info_dict:
+            val = transceiver_dom_info_dict[key]
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                val) if type(val) is str else val
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict = dict.fromkeys(
+            threshold_dict_keys, NULL_VAL)
+
+        if self.sfp_type == OSFP_TYPE:
+            pass
+
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported or not self.qsfp_page3_available:
+                return transceiver_dom_threshold_info_dict
+
+            # Dom Threshold data starts from offset 384
+            # Revert offset back to 0 once data is retrieved
+            offset = QSFP_MODULE_UPPER_PAGE3_START
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
+                dom_module_threshold_raw, 0)
+
+            dom_channel_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
+                                                                         QSFP_CHANNL_THRESHOLD_WIDTH)
+            if dom_channel_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+            dom_channel_threshold_data = sfpd_obj.parse_channel_threshold_values(
+                dom_channel_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_channel_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_channel_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_channel_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_channel_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_channel_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_channel_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_channel_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_channel_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_channel_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_channel_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_channel_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_channel_threshold_data['data']['TxPowerLowWarning']['value']
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            if not self.dom_thresholds_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            # page 02
+            offset = 384
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_DD_MODULE_THRESHOLD_OFFSET), QSFP_DD_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
+                dom_module_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TxPowerLowWarning']['value']
+
+        else:
+            offset = SFP_MODULE_ADDRA2_OFFSET
+
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = sff8472Dom(None, self.calibration)
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
+                                                                        SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+            else:
+                return transceiver_dom_threshold_info_dict
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data[
+                'data']['VoltageHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+        for key in transceiver_dom_threshold_info_dict:
+            transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_threshold_info_dict[key])
+
+        return transceiver_dom_threshold_info_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        if self._port_num <= 16: 
+            reset_path = "{}{}{}".format(CPLD2_I2C_PATH, '/module_reset_', self._port_num)
+        else:
+            reset_path = "{}{}{}".format(CPLD3_I2C_PATH, '/module_reset_', self._port_num)
+
+        val=self._api_helper.read_txt_file(reset_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:           
+            return False
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        rx_los_list = []
+
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET),
+                QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+            else:
+                return [False] * 4
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    rx_los_data = int(dom_channel_monitor_raw[0], 8)
+                    rx_los_list.append(rx_los_data & 0x01 != 0)
+                    rx_los_list.append(rx_los_data & 0x02 != 0)
+                    rx_los_list.append(rx_los_data & 0x04 != 0)
+                    rx_los_list.append(rx_los_data & 0x08 != 0)
+                    rx_los_list.append(rx_los_data & 0x10 != 0)
+                    rx_los_list.append(rx_los_data & 0x20 != 0)
+                    rx_los_list.append(rx_los_data & 0x40 != 0)
+                    rx_los_list.append(rx_los_data & 0x80 != 0)
+                else:
+                    return [False] * 8
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return [False]
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        tx_fault_list = []
+
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET),
+                QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+            else:
+                return [False] * 4
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    tx_fault_data = int(dom_channel_monitor_raw[0], 8)
+                    tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x10 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x20 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x40 != 0)
+                    tx_fault_list.append(tx_fault_data & 0x80 != 0)
+                else:
+                    return [False] * 8
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A list of boolean values, representing the TX disable status
+            of each available channel, value is True if SFP channel
+            is TX disabled, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
+        """
+        tx_disable_list = []
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET),
+                QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+            else:
+                return [False] * 4
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET),
+                    QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                    tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x08 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x10 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x20 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x40 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x80 != 0)
+                else:
+                    return [False] * 8
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return [False]
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0 
+            and channel 2 have been disabled.
+        """
+        tx_disable_list = self.get_tx_disable()
+        if tx_disable_list is None:
+            return 0
+        tx_disabled = 0
+        for i in range(len(tx_disable_list)):
+            if tx_disable_list[i]:
+                tx_disabled |= 1 << i
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this SFP
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        if self._port_num > 32: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            try:
+                eeprom = None
+    
+                if not self.get_presence():
+                    return False
+                # Write to eeprom
+                port_to_i2c_mapping = SFP_I2C_START + self._index
+                port_eeprom_path = I2C_EEPROM_PATH.format(port_to_i2c_mapping)
+    
+                eeprom = open(port_eeprom_path, "rb")
+                eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                lpmode = ord(eeprom.read(1))
+    
+                if ((lpmode & 0x3) == 0x3):
+                    return True  # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1
+                else:
+                    # High Power Mode if one of the following conditions is matched:
+                    # 1. "Power override" bit is 0
+                    # 2. "Power override" bit is 1 and "Power set" bit is 0
+                    return False
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if eeprom is not None:
+                    eeprom.close()
+                    time.sleep(0.01)
+
+    def get_power_set(self):        
+
+        if self._port_num > 32: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set = False    
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self._read_eeprom_specific_bytes(
+                QSFP_POWEROVERRIDE_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_set = (
+                    'On' == dom_control_data['data']['PowerSet']['value'])
+
+            return power_set
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CONTROL_OFFSET), QSFP_CONTROL_WIDTH)
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(
+                    dom_control_raw, 0)
+                return ('On' == dom_control_data['data']['PowerOverride'])
+            else:
+                return False
+        else:
+            return NotImplementedError
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        default = 0.0
+        if not self.dom_supported:
+            return default
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(
+                        dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 0
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_TEMPE_OFFSET), QSFP_DD_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(
+                        dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+
+        else:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+
+        return default
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        default = 0.0
+
+        if not self.dom_supported:
+            return default
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(
+                        dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+
+        if self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_DD_VOLT_OFFSET), QSFP_DD_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(
+                        dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+
+        else:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+
+        return default
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                    dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if dom_tx_bias_power_supported:
+                    dom_tx_bias_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_TX_BIAS_OFFSET), QSFP_DD_TX_BIAS_WIDTH)
+                    if dom_tx_bias_raw is not None:
+                        dom_tx_bias_data = sfpd_obj.parse_dom_tx_bias(
+                            dom_tx_bias_raw, 0)
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX1Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX2Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX3Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX4Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX5Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX6Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX7Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(
+                            dom_tx_bias_data['data']['TX8Bias']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return default
+            else:
+                return default
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return None
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return default
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+            # page 11
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if self.dom_rx_power_supported:
+                    dom_rx_power_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_RX_POWER_OFFSET), QSFP_DD_RX_POWER_WIDTH)
+                    if dom_rx_power_raw is not None:
+                        dom_rx_power_data = sfpd_obj.parse_dom_rx_power(
+                            dom_rx_power_raw, 0)
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX1Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX2Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX3Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX4Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX5Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX6Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX7Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(
+                            dom_rx_power_data['data']['RX8Power']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return default
+            else:
+                return default
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return tx_power_list
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            default = [0.0] * 4
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return tx_power_list
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET),
+                    QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return default
+            else:
+                return default
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            default = [0.0] * 8
+
+            # page 11
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return default
+
+                if self.dom_tx_power_supported:
+                    dom_tx_power_raw = self._read_eeprom_specific_bytes(
+                        (offset + QSFP_DD_TX_POWER_OFFSET),
+                        QSFP_DD_TX_POWER_WIDTH)
+                    if dom_tx_power_raw is not None:
+                        dom_tx_power_data = sfpd_obj.parse_dom_tx_power(
+                            dom_tx_power_raw, 0)
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX1Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX2Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX3Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX4Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX5Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX6Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX7Power']['value']))
+                        tx_power_list.append(self._convert_string_to_num(
+                            dom_tx_power_data['data']['TX8Power']['value']))
+                    else:
+                        return default
+                else:
+                    return default
+
+        else:
+            offset = 256
+            default = [0.0]
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return default
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return default
+            else:
+                return default
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default srate.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        # Check for invalid port_num
+
+        if self._port_num > 32:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+
+            if self._port_num <= self.CPLD2_PORT_END:
+                reset_path = "{}{}{}".format(CPLD2_I2C_PATH, 'module_reset_', self._port_num)
+            else:
+                reset_path = "{}{}{}".format(CPLD3_I2C_PATH, 'module_reset_', self._port_num)
+
+        ret = self.__write_txt_file(reset_path, 1) #sysfs 1: enable reset
+        if ret is not True:
+            return ret
+        
+        time.sleep(0.2)
+        ret = self.__write_txt_file(reset_path, 0) #sysfs 0: disable reset
+        time.sleep(0.2)
+        
+        return ret
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if self.sfp_type == QSFP_TYPE:
+            sysfsfile_eeprom = None
+            try:
+                tx_disable_value = 0xf if tx_disable else 0x0
+                # Write to eeprom
+                sysfsfile_eeprom = open(self._eeprom_path, "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(struct.pack('B', tx_disable_value))
+            except IOError:
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+            return True
+        return False
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if self.sfp_type == QSFP_TYPE:
+            sysfsfile_eeprom = None
+            try:
+                current_state = self.get_tx_disable_channel()
+                tx_disable_value = (current_state | channel) if \
+                    disable else (current_state & (~channel))
+
+                # Write to eeprom
+                sysfsfile_eeprom = open(self._eeprom_path, "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(struct.pack('B', tx_disable_value))
+            except IOError:
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+            return True
+        return False
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if self._port_num > 32:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+
+            if lpmode is True:
+                self.set_power_override(True, True)
+            else:
+                self.set_power_override(True, False)
+
+            return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        if self._port_num > 32:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+            try:
+                power_override_bit = (1 << 0) if power_override else 0
+                power_set_bit      = (1 << 1) if power_set else (1 << 3)
+
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = (power_override_bit | power_set_bit)
+                else:
+                    buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                port_to_i2c_mapping = SFP_I2C_START + self._index
+                port_eeprom_path = I2C_EEPROM_PATH.format(port_to_i2c_mapping)
+                with open(port_eeprom_path, "r+b") as fd:
+                    fd.seek(QSFP_POWEROVERRIDE_OFFSET)
+                    fd.write(buffer[0])
+                    time.sleep(0.01)
+            except Exception as e:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            return True
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(
+            self.__get_path_to_port_config_file())
+        name = sfputil_helper.logical[self.index] or "Unknown"
+        return name
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        if self._port_num <= 16: 
+            present_path = "{}{}{}".format(CPLD2_I2C_PATH, '/module_present_', self._port_num)
+        else:
+            present_path = "{}{}{}".format(CPLD3_I2C_PATH, '/module_present_', self._port_num)
+
+        val=self._api_helper.read_txt_file(present_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:           
+            return False
+
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("model", "N/A")
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and not self.get_reset_status()
+
+    def get_position_in_parent(self):
+        """
+        Returns:
+            Temp return 0
+        """
+        return 0
+
+    def is_replaceable(self):
+        """
+        Retrieves if replaceable
+        Returns:
+            A boolean value, True if replaceable
+        """
+        return True
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/thermal.py
new file mode 100644
index 000000000000..1a811719deaf
--- /dev/null
+++ b/device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/thermal.py
@@ -0,0 +1,151 @@
+#############################################################################
+# Accton
+#
+# Thermal contains an implementation of SONiC Platform Base API and
+# provides the thermal device status which are available in the platform
+#
+#############################################################################
+
+import os
+import os.path
+import glob
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    THERMAL_NAME_LIST = []
+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.THERMAL_NAME_LIST = []
+        self.SYSFS_PATH = "/sys/bus/i2c/devices"
+        self.index = thermal_index
+        # Add thermal name
+        self.THERMAL_NAME_LIST.append("Temp sensor 1")
+        self.THERMAL_NAME_LIST.append("Temp sensor 2")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")        
+        self.THERMAL_NAME_LIST.append("Temp sensor 4")       
+        self.THERMAL_NAME_LIST.append("Temp sensor 5")        
+        self.THERMAL_NAME_LIST.append("Temp sensor 6")        
+
+        # Set hwmon path
+        i2c_path = {
+            0: "15-0048/hwmon/hwmon*/", 
+            1: "15-0049/hwmon/hwmon*/", 
+            2: "15-004a/hwmon/hwmon*/", 
+            3: "15-004b/hwmon/hwmon*/", 
+            4: "15-004c/hwmon/hwmon*/", 
+            5: "15-004f/hwmon/hwmon*/"
+        }.get(self.index, None)
+
+        self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
+        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self.ss_index = 1
+
+    def __read_txt_file(self, file_path):
+        for filename in glob.glob(file_path):
+            try:
+                with open(filename, 'r') as fd:                    
+                    data =fd.readline().rstrip()
+                    return data
+            except IOError as e:
+                pass
+
+        return None
+
+    def __get_temp(self, temp_file):
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_temp = self.__read_txt_file(temp_file_path)
+        if raw_temp is not None:
+            return float(raw_temp)/1000
+        else:
+            return 0        
+
+    def __set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        for filename in glob.glob(temp_file_path):
+            try:
+                with open(filename, 'w') as fd:
+                    fd.write(str(temperature))
+                return True
+            except IOError as e:
+                print("IOError")
+
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+        Args :
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        temperature = temperature *1000
+        self.__set_threshold(temp_file, temperature)
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal device
+            Returns:
+            string: The name of the thermal device
+        """
+        return self.THERMAL_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Thermal
+        Returns:
+            bool: True if Thermal is present, False if not
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_txt = self.__read_txt_file(temp_file_path)
+        if raw_txt is not None:
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+
+        file_str = "temp{}_input".format(self.ss_index)
+        file_path = os.path.join(self.hwmon_path, file_str)
+        raw_txt = self.__read_txt_file(file_path)
+        if raw_txt is None:
+            return False
+        else:     
+            return int(raw_txt) != 0
diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk
index fb67521acf6c..f054f02b4188 100644
--- a/platform/broadcom/one-image.mk
+++ b/platform/broadcom/one-image.mk
@@ -35,6 +35,7 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
                                $(ACCTON_AS5812_54T_PLATFORM_MODULE) \
                                $(ACCTON_AS5835_54X_PLATFORM_MODULE) \
                                $(ACCTON_AS9716_32D_PLATFORM_MODULE) \
+                               $(ACCTON_AS9726_32D_PLATFORM_MODULE) \
                                $(ACCTON_AS5835_54T_PLATFORM_MODULE) \
                                $(ACCTON_AS7312_54XS_PLATFORM_MODULE) \
                                $(ACCTON_AS7315_27XB_PLATFORM_MODULE) \
diff --git a/platform/broadcom/platform-modules-accton.mk b/platform/broadcom/platform-modules-accton.mk
index 3ccf2d675cbd..1e2bfdcf82de 100755
--- a/platform/broadcom/platform-modules-accton.mk
+++ b/platform/broadcom/platform-modules-accton.mk
@@ -16,6 +16,7 @@ ACCTON_AS5812_54X_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS5812_54T_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS5835_54X_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS9716_32D_PLATFORM_MODULE_VERSION = 1.1
+ACCTON_AS9726_32D_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS5835_54T_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS7312_54XS_PLATFORM_MODULE_VERSION = 1.1
 ACCTON_AS7315_27XB_PLATFORM_MODULE_VERSION = 1.1
@@ -36,6 +37,7 @@ export ACCTON_AS5812_54X_PLATFORM_MODULE_VERSION
 export ACCTON_AS5812_54T_PLATFORM_MODULE_VERSION
 export ACCTON_AS5835_54X_PLATFORM_MODULE_VERSION
 export ACCTON_AS9716_32D_PLATFORM_MODULE_VERSION
+export ACCTON_AS9726_32D_PLATFORM_MODULE_VERSION
 export ACCTON_AS5835_54T_PLATFORM_MODULE_VERSION
 export ACCTON_AS7312_54XS_PLATFORM_MODULE_VERSION
 export ACCTON_AS7315_27XB_PLATFORM_MODULE_VERSION
@@ -110,6 +112,10 @@ ACCTON_AS9716_32D_PLATFORM_MODULE = sonic-platform-accton-as9716-32d_$(ACCTON_AS
 $(ACCTON_AS9716_32D_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as9716_32d-r0
 $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS9716_32D_PLATFORM_MODULE)))
 
+ACCTON_AS9726_32D_PLATFORM_MODULE = sonic-platform-accton-as9726-32d_$(ACCTON_AS9726_32D_PLATFORM_MODULE_VERSION)_amd64.deb
+$(ACCTON_AS9726_32D_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as9726_32d-r0
+$(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS9726_32D_PLATFORM_MODULE)))
+
 ACCTON_AS5835_54T_PLATFORM_MODULE = sonic-platform-accton-as5835-54t_$(ACCTON_AS5835_54T_PLATFORM_MODULE_VERSION)_amd64.deb
 $(ACCTON_AS5835_54T_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as5835_54t-r0
 $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS5835_54T_PLATFORM_MODULE)))
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/__init__.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/__init__.py
new file mode 100755
index 000000000000..e69de29bb2d1
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/fanutil.py
new file mode 100755
index 000000000000..1231b458801e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/fanutil.py
@@ -0,0 +1,216 @@
+#!/usr/bin/env python
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+# 
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    04/06/2021:Michael_Shih craete for as9726_32d
+# ------------------------------------------------------------------
+
+try:
+    import logging
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+
+class FanUtil(object):
+    """Platform-specific FanUtil class"""
+
+    FAN_NUM_ON_MAIN_BROAD = 6
+    FAN_NUM_1_IDX = 1
+    FAN_NUM_2_IDX = 2
+    FAN_NUM_3_IDX = 3
+    FAN_NUM_4_IDX = 4
+    FAN_NUM_5_IDX = 5
+    FAN_NUM_6_IDX = 6
+
+    FAN_NODE_NUM_OF_MAP = 2
+    FAN_NODE_FAULT_IDX_OF_MAP = 1    
+    FAN_NODE_DIR_IDX_OF_MAP = 2
+    
+    BASE_VAL_PATH = '/sys/bus/i2c/devices/14-0066/{0}'
+    FAN_DUTY_PATH = '/sys/bus/i2c/devices/14-0066/fan_duty_cycle_percentage'
+
+    #logfile = ''
+    #loglevel = logging.INFO
+
+    """ Dictionary where
+        key1 = fan id index (integer) starting from 1
+        key2 = fan node index (interger) starting from 1
+        value = path to fan device file (string) """
+    _fan_device_path_mapping = {}
+    
+#fan1_direction
+#fan1_fault
+#fan1_present
+
+ #(FAN_NUM_2_IDX, FAN_NODE_DUTY_IDX_OF_MAP): 'fan2_duty_cycle_percentage',
+    _fan_device_node_mapping = {
+           (FAN_NUM_1_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan1_fault',           
+           (FAN_NUM_1_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan1_direction',           
+
+           (FAN_NUM_2_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan2_fault',
+           (FAN_NUM_2_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan2_direction',
+
+           (FAN_NUM_3_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan3_fault',
+           (FAN_NUM_3_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan3_direction',
+
+           (FAN_NUM_4_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan4_fault',
+           (FAN_NUM_4_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan4_direction',
+
+           (FAN_NUM_5_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan5_fault',
+           (FAN_NUM_5_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan5_direction',
+            
+           (FAN_NUM_6_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan6_fault',
+           (FAN_NUM_6_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan6_direction',
+           }
+
+    def _get_fan_device_node(self, fan_num, node_num):
+        return self._fan_device_node_mapping[(fan_num, node_num)]
+
+    def _get_fan_node_val(self, fan_num, node_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
+
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
+            return None
+
+        device_path = self.get_fan_device_path(fan_num, node_num)
+       
+        try:
+            val_file = open(device_path, 'r')
+        except IOError as e:
+            logging.error('GET. unable to open file: %s', str(e))
+            return None
+
+        content = val_file.readline().rstrip()
+        
+        if content == '':
+            logging.debug('GET. content is NULL. device_path:%s', device_path)
+            return None
+
+        try:
+		    val_file.close()
+        except IOError:
+            logging.debug('GET. unable to close file. device_path:%s', device_path)
+            return None
+
+        return int(content)
+
+    def _set_fan_node_val(self, fan_num, node_num, val):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
+
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
+            return None
+
+        content = str(val)
+        if content == '':
+            logging.debug('GET. content is NULL. device_path:%s', device_path)
+            return None
+
+        device_path = self.get_fan_device_path(fan_num, node_num)
+        try:
+            val_file = open(device_path, 'w')
+        except IOError as e:
+            logging.error('GET. unable to open file: %s', str(e))
+            return None
+
+        val_file.write(content)
+
+        try:
+		    val_file.close()
+        except BaseException:
+            logging.debug('GET. unable to close file. device_path:%s', device_path)
+            return None
+
+        return True
+
+    def __init__(self):
+        fan_path = self.BASE_VAL_PATH 
+
+        for fan_num in range(self.FAN_NUM_1_IDX, self.FAN_NUM_ON_MAIN_BROAD+1):
+            for node_num in range(self.FAN_NODE_FAULT_IDX_OF_MAP, self.FAN_NODE_NUM_OF_MAP+1):
+                self._fan_device_path_mapping[(fan_num, node_num)] = fan_path.format(
+                   self._fan_device_node_mapping[(fan_num, node_num)])
+               
+    def get_num_fans(self):
+        return self.FAN_NUM_ON_MAIN_BROAD
+
+    def get_idx_fan_start(self):
+        return self.FAN_NUM_1_IDX
+
+    def get_num_nodes(self):
+        return self.FAN_NODE_NUM_OF_MAP
+
+    def get_idx_node_start(self):
+        return self.FAN_NODE_FAULT_IDX_OF_MAP
+
+    def get_size_node_map(self):
+        return len(self._fan_device_node_mapping)
+
+    def get_size_path_map(self):
+        return len(self._fan_device_path_mapping)
+
+    def get_fan_device_path(self, fan_num, node_num):
+        return self._fan_device_path_mapping[(fan_num, node_num)]
+
+    def get_fan_fault(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_FAULT_IDX_OF_MAP)
+
+    def get_fan_dir(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_DIR_IDX_OF_MAP)
+
+    def get_fan_duty_cycle(self):
+        #duty_path = self.FAN_DUTY_PATH
+        try:
+            val_file = open(self.FAN_DUTY_PATH)
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)          
+            return False
+
+        content = val_file.readline().rstrip()
+        val_file.close()
+        
+        return int(content)
+       
+    def set_fan_duty_cycle(self, val):
+        try:
+            fan_file = open(self.FAN_DUTY_PATH, 'r+')
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)          
+            return False
+        
+        fan_file.write(str(val))
+        fan_file.close()
+        return True
+  
+    def get_fanr_speed(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FANR_NODE_SPEED_IDX_OF_MAP)
+
+    def get_fan_status(self, fan_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num, %d', fan_num)
+            return None
+
+        if self.get_fan_fault(fan_num) is not None and self.get_fan_fault(fan_num) > 0:
+            logging.debug('GET. FAN fault. fan_num, %d', fan_num)
+            return False
+
+        return True
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/thermalutil.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/thermalutil.py
new file mode 100755
index 000000000000..1f00d72b8411
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/classes/thermalutil.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+# 
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    04/06/2021: Michael_Shih craete for as9726_32d
+# ------------------------------------------------------------------
+
+try:
+    import logging
+    import glob
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+class ThermalUtil(object):
+    """Platform-specific ThermalUtil class"""
+    THERMAL_NUM_MAX = 7
+    THERMAL_NUM_1_IDX = 1 # 1~6 are mainboard thermal sensors
+    THERMAL_NUM_2_IDX = 2 
+    THERMAL_NUM_3_IDX = 3 
+    THERMAL_NUM_4_IDX = 4 
+    THERMAL_NUM_5_IDX = 5 
+    THERMAL_NUM_6_IDX = 6 # CPU core
+    THERMAL_NUM_7_IDX = 7 
+
+    """ Dictionary where
+        key1 = thermal id index (integer) starting from 1
+        value = path to fan device file (string) """
+    #_thermal_to_device_path_mapping = {}
+        
+    thermal_sysfspath ={
+    THERMAL_NUM_1_IDX: ["/sys/bus/i2c/devices/15-0048/hwmon/hwmon*/temp1_input"],
+    THERMAL_NUM_2_IDX: ["/sys/bus/i2c/devices/15-0049/hwmon/hwmon*/temp1_input"],  
+    THERMAL_NUM_3_IDX: ["/sys/bus/i2c/devices/15-004a/hwmon/hwmon*/temp1_input"],    
+    THERMAL_NUM_4_IDX: ["/sys/bus/i2c/devices/15-004c/hwmon/hwmon*/temp1_input"],      
+    THERMAL_NUM_5_IDX: ["/sys/bus/i2c/devices/15-004f/hwmon/hwmon*/temp1_input"],     
+    THERMAL_NUM_6_IDX: ["/sys/class/hwmon/hwmon0/temp1_input"],     
+    THERMAL_NUM_7_IDX: ["/sys/bus/i2c/devices/15-004b/hwmon/hwmon*/temp1_input"],    
+    }
+
+    #def __init__(self):
+        
+    def _get_thermal_val(self, thermal_num):
+        if thermal_num < self.THERMAL_NUM_1_IDX or thermal_num > self.THERMAL_NUM_MAX:
+            logging.debug('GET. Parameter error. thermal_num, %d', thermal_num)
+            return None
+        
+        device_path = self.get_thermal_path(thermal_num)
+        for filename in glob.glob(device_path):
+            try:
+                val_file = open(filename, 'r')
+            except IOError as e:
+                logging.error('GET. unable to open file: %s', str(e))
+                return None
+            content = val_file.readline().rstrip()
+            if content == '':
+                logging.debug('GET. content is NULL. device_path:%s', device_path)
+                return None
+            try:
+		        val_file.close()
+            except BaseException:
+                logging.debug('GET. unable to close file. device_path:%s', device_path)
+                return None
+              
+            return int(content)
+                
+        return 0
+ 
+    def get_num_thermals(self):
+        return self.THERMAL_NUM_MAX  
+
+    def get_size_path_map(self):
+        return len(self.thermal_sysfspath)
+
+    def get_thermal_path(self, thermal_num):
+        return self.thermal_sysfspath[thermal_num][0]
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/Makefile b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/Makefile
new file mode 100755
index 000000000000..d27e10b6d8de
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/Makefile
@@ -0,0 +1,19 @@
+ifneq ($(KERNELRELEASE),)
+obj-m:= x86-64-accton-as9726-32d-cpld.o x86-64-accton-as9726-32d-psu.o  \
+	    x86-64-accton-as9726-32d-fan.o ym2651y.o
+	    
+else
+ifeq (,$(KERNEL_SRC))
+#$(error KERNEL_SRC is not defined)
+KVERSION=3.16.0-8-amd64
+KERNEL_DIR   = /usr/src/linux-headers-$(KVERSION)/
+KERNELDIR:=$(KERNEL_DIR)
+else
+KERNELDIR:=$(KERNEL_SRC)
+endif
+PWD:=$(shell pwd)
+default:
+	$(MAKE) -C $(KERNELDIR)  M=$(PWD) modules
+clean:
+	rm -rf *.o *.mod.o *.mod.o *.mod.c *.ko .*cmd .tmp_versions Module.markers Module.symvers modules.order
+endif
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-cpld.c b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-cpld.c
new file mode 100755
index 000000000000..096d1384b650
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-cpld.c
@@ -0,0 +1,987 @@
+/*
+ * Copyright (C)  Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * This module supports the accton cpld that hold the channel select
+ * mechanism for other i2c slave devices, such as SFP.
+ * This includes the:
+ *	 Accton as9726_32d CPU-CPLD/CPLD2/CPLD3
+ *
+ * Based on:
+ *	pca954x.c from Kumar Gala <galak@kernel.crashing.org>
+ * Copyright (C) 2006
+ *
+ * Based on:
+ *	pca954x.c from Ken Harrenstien
+ * Copyright (C) 2004 Google, Inc. (Ken Harrenstien)
+ *
+ * Based on:
+ *	i2c-virtual_cb.c from Brian Kuschak <bkuschak@yahoo.com>
+ * and
+ *	pca9540.c from Jean Delvare <khali@linux-fr.org>.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/stat.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/delay.h>
+
+#define I2C_RW_RETRY_COUNT				10
+#define I2C_RW_RETRY_INTERVAL			60 /* ms */
+
+static LIST_HEAD(cpld_client_list);
+static struct mutex     list_lock;
+
+struct cpld_client_node {
+    struct i2c_client *client;
+    struct list_head   list;
+};
+
+enum cpld_type {
+    as9726_32d_fpga,
+    as9726_32d_cpld2,
+    as9726_32d_cpld3,
+    as9726_32d_cpld_cpu
+};
+
+struct as9726_32d_cpld_data {
+    enum cpld_type   type;
+    struct device   *hwmon_dev;
+    struct mutex     update_lock;
+};
+
+static const struct i2c_device_id as9726_32d_cpld_id[] = {
+    { "as9726_32d_fpga", as9726_32d_fpga },
+    { "as9726_32d_cpld2", as9726_32d_cpld2 },
+    { "as9726_32d_cpld3", as9726_32d_cpld3 },
+    { "as9726_32d_cpld_cpu", as9726_32d_cpld_cpu },
+    { }
+};
+MODULE_DEVICE_TABLE(i2c, as9726_32d_cpld_id);
+
+#define TRANSCEIVER_PRESENT_ATTR_ID(index)   	MODULE_PRESENT_##index
+#define TRANSCEIVER_TXDISABLE_ATTR_ID(index)   	MODULE_TXDISABLE_##index
+#define TRANSCEIVER_RXLOS_ATTR_ID(index)   		MODULE_RXLOS_##index
+#define TRANSCEIVER_TXFAULT_ATTR_ID(index)   	MODULE_TXFAULT_##index
+#define TRANSCEIVER_RESET_ATTR_ID(index)   	    MODULE_RESET_##index
+#define CPLD_INTR_ATTR_ID(index)   	            CPLD_INTR_##index
+
+enum as9726_32d_cpld_sysfs_attributes {
+	CPLD_VERSION,
+	ACCESS,
+	/* transceiver attributes */
+	TRANSCEIVER_PRESENT_ATTR_ID(1),
+	TRANSCEIVER_PRESENT_ATTR_ID(2),
+	TRANSCEIVER_PRESENT_ATTR_ID(3),
+	TRANSCEIVER_PRESENT_ATTR_ID(4),
+	TRANSCEIVER_PRESENT_ATTR_ID(5),
+	TRANSCEIVER_PRESENT_ATTR_ID(6),
+	TRANSCEIVER_PRESENT_ATTR_ID(7),
+	TRANSCEIVER_PRESENT_ATTR_ID(8),
+	TRANSCEIVER_PRESENT_ATTR_ID(9),
+	TRANSCEIVER_PRESENT_ATTR_ID(10),
+	TRANSCEIVER_PRESENT_ATTR_ID(11),
+	TRANSCEIVER_PRESENT_ATTR_ID(12),
+	TRANSCEIVER_PRESENT_ATTR_ID(13),
+	TRANSCEIVER_PRESENT_ATTR_ID(14),
+	TRANSCEIVER_PRESENT_ATTR_ID(15),
+	TRANSCEIVER_PRESENT_ATTR_ID(16),
+	TRANSCEIVER_PRESENT_ATTR_ID(17),
+	TRANSCEIVER_PRESENT_ATTR_ID(18),
+	TRANSCEIVER_PRESENT_ATTR_ID(19),
+	TRANSCEIVER_PRESENT_ATTR_ID(20),
+	TRANSCEIVER_PRESENT_ATTR_ID(21),
+	TRANSCEIVER_PRESENT_ATTR_ID(22),
+	TRANSCEIVER_PRESENT_ATTR_ID(23),
+	TRANSCEIVER_PRESENT_ATTR_ID(24),
+	TRANSCEIVER_PRESENT_ATTR_ID(25),
+	TRANSCEIVER_PRESENT_ATTR_ID(26),
+	TRANSCEIVER_PRESENT_ATTR_ID(27),
+	TRANSCEIVER_PRESENT_ATTR_ID(28),
+	TRANSCEIVER_PRESENT_ATTR_ID(29),
+	TRANSCEIVER_PRESENT_ATTR_ID(30),
+	TRANSCEIVER_PRESENT_ATTR_ID(31),
+	TRANSCEIVER_PRESENT_ATTR_ID(32),
+	TRANSCEIVER_PRESENT_ATTR_ID(33),
+	TRANSCEIVER_PRESENT_ATTR_ID(34),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(33),
+	TRANSCEIVER_TXDISABLE_ATTR_ID(34),
+	TRANSCEIVER_RXLOS_ATTR_ID(33),
+	TRANSCEIVER_RXLOS_ATTR_ID(34),
+	TRANSCEIVER_TXFAULT_ATTR_ID(33),
+	TRANSCEIVER_TXFAULT_ATTR_ID(34),
+	TRANSCEIVER_RESET_ATTR_ID(1),
+	TRANSCEIVER_RESET_ATTR_ID(2),
+	TRANSCEIVER_RESET_ATTR_ID(3),
+	TRANSCEIVER_RESET_ATTR_ID(4),
+	TRANSCEIVER_RESET_ATTR_ID(5),
+	TRANSCEIVER_RESET_ATTR_ID(6),
+	TRANSCEIVER_RESET_ATTR_ID(7),
+	TRANSCEIVER_RESET_ATTR_ID(8),
+	TRANSCEIVER_RESET_ATTR_ID(9),
+	TRANSCEIVER_RESET_ATTR_ID(10),
+	TRANSCEIVER_RESET_ATTR_ID(11),
+	TRANSCEIVER_RESET_ATTR_ID(12),
+	TRANSCEIVER_RESET_ATTR_ID(13),
+	TRANSCEIVER_RESET_ATTR_ID(14),
+	TRANSCEIVER_RESET_ATTR_ID(15),
+	TRANSCEIVER_RESET_ATTR_ID(16),
+	TRANSCEIVER_RESET_ATTR_ID(17),
+	TRANSCEIVER_RESET_ATTR_ID(18),
+	TRANSCEIVER_RESET_ATTR_ID(19),
+	TRANSCEIVER_RESET_ATTR_ID(20),
+	TRANSCEIVER_RESET_ATTR_ID(21),
+	TRANSCEIVER_RESET_ATTR_ID(22),
+	TRANSCEIVER_RESET_ATTR_ID(23),
+	TRANSCEIVER_RESET_ATTR_ID(24),
+	TRANSCEIVER_RESET_ATTR_ID(25),
+	TRANSCEIVER_RESET_ATTR_ID(26),
+	TRANSCEIVER_RESET_ATTR_ID(27),
+	TRANSCEIVER_RESET_ATTR_ID(28),
+	TRANSCEIVER_RESET_ATTR_ID(29),
+	TRANSCEIVER_RESET_ATTR_ID(30),
+	TRANSCEIVER_RESET_ATTR_ID(31),
+	TRANSCEIVER_RESET_ATTR_ID(32),
+	CPLD_INTR_ATTR_ID(1),
+	CPLD_INTR_ATTR_ID(2),
+	CPLD_INTR_ATTR_ID(3),
+	CPLD_INTR_ATTR_ID(4),
+	
+};
+
+/* sysfs attributes for hwmon 
+ */
+static ssize_t show_interrupt(struct device *dev, struct device_attribute *da,
+             char *buf);
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+             char *buf);
+static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count);
+static ssize_t access(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count);
+static ssize_t show_version(struct device *dev, struct device_attribute *da,
+             char *buf);
+static ssize_t get_mode_reset(struct device *dev, struct device_attribute *da,
+			char *buf);
+static ssize_t set_mode_reset(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count);
+static int as9726_32d_cpld_read_internal(struct i2c_client *client, u8 reg);
+static int as9726_32d_cpld_write_internal(struct i2c_client *client, u8 reg, u8 value);
+
+/* transceiver attributes */
+#define DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(index) \
+	static SENSOR_DEVICE_ATTR(module_present_##index, S_IRUGO, show_status, NULL, MODULE_PRESENT_##index)
+#define DECLARE_TRANSCEIVER_PRESENT_ATTR(index)  &sensor_dev_attr_module_present_##index.dev_attr.attr
+
+#define DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(index) \
+	static SENSOR_DEVICE_ATTR(module_tx_disable_##index, S_IRUGO | S_IWUSR, show_status, set_tx_disable, MODULE_TXDISABLE_##index); \
+	static SENSOR_DEVICE_ATTR(module_rx_los_##index, S_IRUGO, show_status, NULL, MODULE_RXLOS_##index);  \
+	static SENSOR_DEVICE_ATTR(module_tx_fault_##index, S_IRUGO, show_status, NULL, MODULE_RXLOS_##index); 
+	
+#define DECLARE_SFP_TRANSCEIVER_ATTR(index)  \
+	&sensor_dev_attr_module_tx_disable_##index.dev_attr.attr, \
+	&sensor_dev_attr_module_rx_los_##index.dev_attr.attr,     \
+	&sensor_dev_attr_module_tx_fault_##index.dev_attr.attr
+	
+/*reset*/
+#define DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(index) \
+	static SENSOR_DEVICE_ATTR(module_reset_##index, S_IWUSR | S_IRUGO, get_mode_reset, set_mode_reset, MODULE_RESET_##index)
+#define DECLARE_TRANSCEIVER_RESET_ATTR(index)  &sensor_dev_attr_module_reset_##index.dev_attr.attr
+
+/*cpld interrupt*/
+#define DECLARE_CPLD_DEVICE_INTR_ATTR(index) \
+	static SENSOR_DEVICE_ATTR(cpld_intr_##index, S_IRUGO, show_interrupt, NULL, CPLD_INTR_##index)
+#define DECLARE_CPLD_INTR_ATTR(index)  &sensor_dev_attr_cpld_intr_##index.dev_attr.attr
+
+
+
+static SENSOR_DEVICE_ATTR(version, S_IRUGO, show_version, NULL, CPLD_VERSION);
+static SENSOR_DEVICE_ATTR(access, S_IWUSR, NULL, access, ACCESS);
+/* transceiver attributes */
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(1);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(2);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(3);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(4);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(5);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(6);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(7);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(8);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(9);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(10);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(11);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(12);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(13);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(14);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(15);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(16);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(17);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(18);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(19);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(20);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(21);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(22);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(23);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(24);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(25);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(26);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(27);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(28);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(29);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(30);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(31);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(32);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(33);
+DECLARE_TRANSCEIVER_PRESENT_SENSOR_DEVICE_ATTR(34);
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(33);
+DECLARE_SFP_TRANSCEIVER_SENSOR_DEVICE_ATTR(34);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(1);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(2);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(3);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(4);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(5);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(6);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(7);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(8);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(9);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(10);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(11);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(12);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(13);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(14);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(15);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(16);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(17);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(18);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(19);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(20);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(21);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(22);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(23);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(24);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(25);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(26);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(27);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(28);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(29);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(30);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(31);
+DECLARE_TRANSCEIVER_SENSOR_DEVICE_RESET_ATTR(32);
+DECLARE_CPLD_DEVICE_INTR_ATTR(1);
+DECLARE_CPLD_DEVICE_INTR_ATTR(2);
+DECLARE_CPLD_DEVICE_INTR_ATTR(3);
+DECLARE_CPLD_DEVICE_INTR_ATTR(4);
+
+
+
+static struct attribute *as9726_32d_fpga_attributes[] = {
+    &sensor_dev_attr_version.dev_attr.attr,
+    &sensor_dev_attr_access.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group as9726_32d_fpga_group = {
+	.attrs = as9726_32d_fpga_attributes,
+};
+
+static struct attribute *as9726_32d_cpld2_attributes[] = {
+    &sensor_dev_attr_version.dev_attr.attr,
+    &sensor_dev_attr_access.dev_attr.attr,
+    DECLARE_TRANSCEIVER_PRESENT_ATTR(1),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(2),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(3),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(4),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(5),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(6),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(7),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(8),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(9),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(10),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(11),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(12),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(13),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(14),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(15),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(16),
+	DECLARE_TRANSCEIVER_RESET_ATTR(1),
+	DECLARE_TRANSCEIVER_RESET_ATTR(2),
+	DECLARE_TRANSCEIVER_RESET_ATTR(3),
+	DECLARE_TRANSCEIVER_RESET_ATTR(4),
+	DECLARE_TRANSCEIVER_RESET_ATTR(5),
+	DECLARE_TRANSCEIVER_RESET_ATTR(6),
+	DECLARE_TRANSCEIVER_RESET_ATTR(7),
+	DECLARE_TRANSCEIVER_RESET_ATTR(8),
+	DECLARE_TRANSCEIVER_RESET_ATTR(9),
+	DECLARE_TRANSCEIVER_RESET_ATTR(10),
+	DECLARE_TRANSCEIVER_RESET_ATTR(11),
+	DECLARE_TRANSCEIVER_RESET_ATTR(12),
+	DECLARE_TRANSCEIVER_RESET_ATTR(13),
+	DECLARE_TRANSCEIVER_RESET_ATTR(14),
+	DECLARE_TRANSCEIVER_RESET_ATTR(15),
+	DECLARE_TRANSCEIVER_RESET_ATTR(16),
+	DECLARE_CPLD_INTR_ATTR(1),
+	DECLARE_CPLD_INTR_ATTR(2),
+	NULL
+};
+
+static const struct attribute_group as9726_32d_cpld2_group = {
+	.attrs = as9726_32d_cpld2_attributes,
+};
+
+static struct attribute *as9726_32d_cpld3_attributes[] = {
+    &sensor_dev_attr_version.dev_attr.attr,
+    &sensor_dev_attr_access.dev_attr.attr,	
+    DECLARE_TRANSCEIVER_PRESENT_ATTR(17),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(18),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(19),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(20),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(21),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(22),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(23),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(24),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(25),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(26),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(27),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(28),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(29),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(30),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(31),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(32),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(33),
+	DECLARE_TRANSCEIVER_PRESENT_ATTR(34),
+    DECLARE_SFP_TRANSCEIVER_ATTR(33),
+    DECLARE_SFP_TRANSCEIVER_ATTR(34),
+    DECLARE_TRANSCEIVER_RESET_ATTR(17),
+	DECLARE_TRANSCEIVER_RESET_ATTR(18),
+	DECLARE_TRANSCEIVER_RESET_ATTR(19),
+	DECLARE_TRANSCEIVER_RESET_ATTR(20),
+	DECLARE_TRANSCEIVER_RESET_ATTR(21),
+	DECLARE_TRANSCEIVER_RESET_ATTR(22),
+	DECLARE_TRANSCEIVER_RESET_ATTR(23),
+	DECLARE_TRANSCEIVER_RESET_ATTR(24),
+	DECLARE_TRANSCEIVER_RESET_ATTR(25),
+	DECLARE_TRANSCEIVER_RESET_ATTR(26),
+	DECLARE_TRANSCEIVER_RESET_ATTR(27),
+	DECLARE_TRANSCEIVER_RESET_ATTR(28),
+	DECLARE_TRANSCEIVER_RESET_ATTR(29),
+	DECLARE_TRANSCEIVER_RESET_ATTR(30),
+	DECLARE_TRANSCEIVER_RESET_ATTR(31),
+	DECLARE_TRANSCEIVER_RESET_ATTR(32),
+	DECLARE_CPLD_INTR_ATTR(3),
+	DECLARE_CPLD_INTR_ATTR(4),
+	NULL
+};
+
+static const struct attribute_group as9726_32d_cpld3_group = {
+	.attrs = as9726_32d_cpld3_attributes,
+};
+
+static struct attribute *as9726_32d_cpld_cpu_attributes[] = {
+    &sensor_dev_attr_version.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group as9726_32d_cpld_cpu_group = {
+	.attrs = as9726_32d_cpld_cpu_attributes,
+};
+
+static  ssize_t show_interrupt(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+    int status = 0;
+    u8 reg = 0; 
+    
+    switch (attr->index)
+	{   
+        case CPLD_INTR_1:
+            reg  = 0x10;
+            break;
+        case CPLD_INTR_3:
+            reg  = 0x10;
+            break;
+        case CPLD_INTR_2:
+            reg  = 0x11;
+            break;
+        case CPLD_INTR_4:
+            reg  = 0x11;
+            break; 
+        default:
+            return -ENODEV;
+    }
+    mutex_lock(&data->update_lock);
+    status = as9726_32d_cpld_read_internal(client, reg);
+    if (unlikely(status < 0)) {
+        goto exit;
+    }
+    mutex_unlock(&data->update_lock);
+
+    return sprintf(buf, "0x%x\n", status);
+
+exit:
+    mutex_unlock(&data->update_lock);
+    return status;
+}
+
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+	int status = 0;
+	u8 reg = 0, mask = 0, revert = 0;
+    
+	switch (attr->index) {
+	case MODULE_PRESENT_1 ... MODULE_PRESENT_8:
+		reg  = 0x12;
+		mask = 0x1 << (attr->index - MODULE_PRESENT_1);
+		break;
+	case MODULE_PRESENT_9 ... MODULE_PRESENT_16:
+		reg  = 0x13;
+		mask = 0x1 << (attr->index - MODULE_PRESENT_9);
+		break;
+	case MODULE_PRESENT_17 ... MODULE_PRESENT_24:
+		reg  = 0x12;
+		mask = 0x1 << (attr->index - MODULE_PRESENT_17);
+		break;
+	case MODULE_PRESENT_25 ... MODULE_PRESENT_32:
+		reg  = 0x13;
+		mask = 0x1 << (attr->index - MODULE_PRESENT_25);
+	    break;
+    case MODULE_PRESENT_33:
+        reg  = 0x20;
+        mask = 0x1;
+        break;
+     case MODULE_PRESENT_34:
+        reg  = 0x20;
+        mask = 0x2;
+        break;
+    case MODULE_RXLOS_33:
+        reg  = 0x26;
+        mask = 0x1;
+        break;
+     case MODULE_RXLOS_34:
+        reg  = 0x26;
+        mask = 0x2;
+        break;    
+	case MODULE_TXDISABLE_33:
+		reg  = 0x21;
+		mask = 0x1;
+		break;
+	case MODULE_TXDISABLE_34:
+		reg  = 0x21;
+		mask = 0x2;
+		break;	
+	
+	default:
+		return 0;
+	}
+
+    if (attr->index >= MODULE_PRESENT_1 && attr->index <= MODULE_PRESENT_34) {
+        revert = 1;
+    }
+
+    mutex_lock(&data->update_lock);
+	status = as9726_32d_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+
+	return sprintf(buf, "%d\n", revert ? !(status & mask) : !!(status & mask));
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+	long disable;
+	int status;
+    u8 reg = 0, mask = 0;
+     
+	status = kstrtol(buf, 10, &disable);
+	if (status) {
+		return status;
+	}
+
+	switch (attr->index) {
+	case MODULE_TXDISABLE_33:
+		reg  = 0x21;
+		mask = 0x1;
+		break;
+	case MODULE_TXDISABLE_34:
+		reg  = 0x21;
+		mask = 0x2;
+		break;
+	default:
+		return 0;
+	}
+
+    /* Read current status */
+    mutex_lock(&data->update_lock);
+	status = as9726_32d_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+
+	/* Update tx_disable status */
+	if (disable) {
+		status |= mask;
+	}
+	else {
+		status &= ~mask;
+	}
+
+    status = as9726_32d_cpld_write_internal(client, reg, status);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+    
+    mutex_unlock(&data->update_lock);
+    return count;
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static ssize_t access(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+	int status;
+	u32 addr, val;
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+    
+	if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
+		return -EINVAL;
+	}
+
+	if (addr > 0xFF || val > 0xFF) {
+		return -EINVAL;
+	}
+
+	mutex_lock(&data->update_lock);
+	status = as9726_32d_cpld_write_internal(client, addr, val);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+	return count;
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+static void as9726_32d_cpld_add_client(struct i2c_client *client)
+{
+    struct cpld_client_node *node = kzalloc(sizeof(struct cpld_client_node), GFP_KERNEL);
+
+    if (!node) {
+        dev_dbg(&client->dev, "Can't allocate cpld_client_node (0x%x)\n", client->addr);
+        return;
+    }
+
+    node->client = client;
+
+	mutex_lock(&list_lock);
+    list_add(&node->list, &cpld_client_list);
+	mutex_unlock(&list_lock);
+}
+
+static void as9726_32d_cpld_remove_client(struct i2c_client *client)
+{
+    struct list_head    *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int found = 0;
+
+	mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client == client) {
+            found = 1;
+            break;
+        }
+    }
+
+    if (found) {
+        list_del(list_node);
+        kfree(cpld_node);
+    }
+
+	mutex_unlock(&list_lock);
+}
+
+static ssize_t show_version(struct device *dev, struct device_attribute *attr, char *buf)
+{
+    int val = 0;
+    struct i2c_client *client = to_i2c_client(dev);
+	
+	val = i2c_smbus_read_byte_data(client, 0x1);
+
+    if (val < 0) {
+        dev_dbg(&client->dev, "cpld(0x%x) reg(0x1) err %d\n", client->addr, val);
+    }
+	
+    return sprintf(buf, "0x%x\n", val);
+}
+
+static ssize_t get_mode_reset(struct device *dev, struct device_attribute *da,
+			char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+	int status = 0;
+	u8 reg = 0, mask = 0;
+    
+	switch (attr->index) {
+	case MODULE_RESET_1 ... MODULE_RESET_8:
+		reg  = 0x14;
+		mask = 0x1 << (attr->index - MODULE_RESET_1);
+		break;
+	case MODULE_RESET_9 ... MODULE_RESET_16:
+		reg  = 0x15;
+		mask = 0x1 << (attr->index - MODULE_RESET_9);
+		break;
+	case MODULE_RESET_17 ... MODULE_RESET_24:
+		reg  = 0x14;
+		mask = 0x1 << (attr->index - MODULE_RESET_17);
+		break;
+	case MODULE_RESET_25 ... MODULE_RESET_32:
+		reg  = 0x15;
+		mask = 0x1 << (attr->index - MODULE_RESET_25);
+		break;
+	default:
+		return 0;
+	}
+	
+
+    mutex_lock(&data->update_lock);
+	status = as9726_32d_cpld_read_internal(client, reg);
+	
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+
+	return sprintf(buf, "%d\r\n", !(status & mask));
+	
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;	
+}
+
+static ssize_t set_mode_reset(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{    
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+    long reset;
+    int status=0, val, error;
+	u8 reg = 0, mask = 0;
+	
+
+    error = kstrtol(buf, 10, &reset);
+    if (error) {
+        return error;
+    }
+    
+    switch (attr->index) {
+	case MODULE_RESET_1 ... MODULE_RESET_8:
+		reg  = 0x14;
+		mask = 0x1 << (attr->index - MODULE_RESET_1);
+		break;
+	case MODULE_RESET_9 ... MODULE_RESET_16:
+		reg  = 0x15;
+		mask = 0x1 << (attr->index - MODULE_RESET_9);
+		break;
+	case MODULE_RESET_17 ... MODULE_RESET_24:
+		reg  = 0x14;
+		mask = 0x1 << (attr->index - MODULE_RESET_17);
+		break;
+	case MODULE_RESET_25 ... MODULE_RESET_32:
+		reg  = 0x15;
+		mask = 0x1 << (attr->index - MODULE_RESET_25);
+		break;
+	default:
+		return 0;
+	}
+	mutex_lock(&data->update_lock);
+	
+	status = as9726_32d_cpld_read_internal(client, reg);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	
+	/* Update lp_mode status */
+    if (reset)
+    {       
+        val = status&(~mask);
+    }
+    else
+    {       
+        val =status | (mask);
+    }
+	
+	status = as9726_32d_cpld_write_internal(client, reg, val);
+	if (unlikely(status < 0)) {
+		goto exit;
+	}
+	mutex_unlock(&data->update_lock);
+	return count;
+
+exit:
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
+
+
+/*
+ * I2C init/probing/exit functions
+ */
+static int as9726_32d_cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+	struct as9726_32d_cpld_data *data;
+	int ret = -ENODEV;
+	int status;	
+	const struct attribute_group *group = NULL;
+
+	if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
+		goto exit;
+
+	data = kzalloc(sizeof(struct as9726_32d_cpld_data), GFP_KERNEL);
+	if (!data) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+    mutex_init(&data->update_lock);
+	data->type = id->driver_data;
+
+   
+    /* Register sysfs hooks */
+    switch (data->type) {
+    case as9726_32d_fpga:
+        group = &as9726_32d_fpga_group;
+        break;
+    case as9726_32d_cpld2:
+        group = &as9726_32d_cpld2_group;
+        /*Set interrupt mask to 0, and then can get intr from 0x8*/
+        status=as9726_32d_cpld_write_internal(client, 0x9, 0x0); 
+        if (status < 0)
+        {
+           dev_dbg(&client->dev, "cpld2 reg 0x9 err %d\n", status);            
+        } 
+        break;
+    case as9726_32d_cpld3:
+        group = &as9726_32d_cpld3_group;
+        /*Set interrupt mask to 0, and then can get intr from 0x8*/
+        status=as9726_32d_cpld_write_internal(client, 0x9, 0x0); 
+        if (status < 0)
+        {
+           dev_dbg(&client->dev, "cpld3 reg 0x9 err %d\n", status);            
+        } 
+         break; 
+     case as9726_32d_cpld_cpu:
+	    group = &as9726_32d_cpld_cpu_group;
+         /* Disable CPLD reset to avoid DUT will be reset.
+          */
+//         status=as9726_32d_cpld_write_internal(client, 0x3, 0x0); 
+//         if (status < 0)
+//         {
+//            dev_dbg(&client->dev, "cpu_cpld reg 0x65 err %d\n", status);            
+//         }
+        break;
+    default:
+        break;
+    }
+
+    if (group) {
+        ret = sysfs_create_group(&client->dev.kobj, group);
+        if (ret) {
+            goto exit_free;
+        }
+    }
+
+    as9726_32d_cpld_add_client(client);
+    return 0;
+
+exit_free:
+    kfree(data);
+exit:
+	return ret;
+}
+
+static int as9726_32d_cpld_remove(struct i2c_client *client)
+{
+    struct as9726_32d_cpld_data *data = i2c_get_clientdata(client);
+    const struct attribute_group *group = NULL;
+
+    as9726_32d_cpld_remove_client(client);
+
+    /* Remove sysfs hooks */
+    switch (data->type) {
+    case as9726_32d_fpga:
+        group = &as9726_32d_fpga_group;
+        break;
+    case as9726_32d_cpld2:
+        group = &as9726_32d_cpld2_group;
+        break;
+    case as9726_32d_cpld3:
+        group = &as9726_32d_cpld3_group;
+        break;
+	case as9726_32d_cpld_cpu:
+	    group = &as9726_32d_cpld_cpu_group;
+        break;
+    default:
+        break;
+    }
+
+    if (group) {
+        sysfs_remove_group(&client->dev.kobj, group);
+    }
+
+    kfree(data);
+
+    return 0;
+}
+
+static int as9726_32d_cpld_read_internal(struct i2c_client *client, u8 reg)
+{
+	int status = 0, retry = I2C_RW_RETRY_COUNT;
+
+	while (retry) {
+		status = i2c_smbus_read_byte_data(client, reg);
+		if (unlikely(status < 0)) {
+			msleep(I2C_RW_RETRY_INTERVAL);
+			retry--;
+			continue;
+		}
+
+		break;
+	}
+
+    return status;
+}
+
+static int as9726_32d_cpld_write_internal(struct i2c_client *client, u8 reg, u8 value)
+{
+	int status = 0, retry = I2C_RW_RETRY_COUNT;
+    
+	while (retry) {
+		status = i2c_smbus_write_byte_data(client, reg, value);
+		if (unlikely(status < 0)) {
+			msleep(I2C_RW_RETRY_INTERVAL);
+			retry--;
+			continue;
+		}
+
+		break;
+	}
+
+    return status;
+}
+
+int as9726_32d_cpld_read(unsigned short cpld_addr, u8 reg)
+{
+    struct list_head   *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int ret = -EPERM;
+
+    mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client->addr == cpld_addr) {
+            ret = as9726_32d_cpld_read_internal(cpld_node->client, reg);
+    		break;
+        }
+    }
+
+	mutex_unlock(&list_lock);
+
+    return ret;
+}
+EXPORT_SYMBOL(as9726_32d_cpld_read);
+
+int as9726_32d_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
+{
+    struct list_head   *list_node = NULL;
+    struct cpld_client_node *cpld_node = NULL;
+    int ret = -EIO;
+    
+	mutex_lock(&list_lock);
+
+    list_for_each(list_node, &cpld_client_list)
+    {
+        cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+        if (cpld_node->client->addr == cpld_addr) {
+            ret = as9726_32d_cpld_write_internal(cpld_node->client, reg, value);
+            break;
+        }
+    }
+
+	mutex_unlock(&list_lock);
+
+    return ret;
+}
+EXPORT_SYMBOL(as9726_32d_cpld_write);
+
+static struct i2c_driver as9726_32d_cpld_driver = {
+	.driver		= {
+		.name	= "as9726_32d_cpld",
+		.owner	= THIS_MODULE,
+	},
+	.probe		= as9726_32d_cpld_probe,
+	.remove		= as9726_32d_cpld_remove,
+	.id_table	= as9726_32d_cpld_id,
+};
+
+static int __init as9726_32d_cpld_init(void)
+{
+    mutex_init(&list_lock);
+    return i2c_add_driver(&as9726_32d_cpld_driver);
+}
+
+static void __exit as9726_32d_cpld_exit(void)
+{
+    i2c_del_driver(&as9726_32d_cpld_driver);
+}
+
+MODULE_AUTHOR("Michael Shih <michael_shih@edge-core.com>");
+MODULE_DESCRIPTION("Accton I2C CPLD driver");
+MODULE_LICENSE("GPL");
+
+module_init(as9726_32d_cpld_init);
+module_exit(as9726_32d_cpld_exit);
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-fan.c b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-fan.c
new file mode 100755
index 000000000000..faf1e84acc37
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-fan.c
@@ -0,0 +1,717 @@
+/*
+ * A hwmon driver for the Accton as9726 32d fan
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/slab.h>
+#include <linux/dmi.h>
+#include <linux/fs.h>
+#include <asm/uaccess.h>
+
+#define DRVNAME "as9726_32d_fan"
+
+static struct as9726_32d_fan_data *as9726_32d_fan_update_device(struct device *dev);
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+                              const char *buf, size_t count);                            
+
+/* fan related data, the index should match sysfs_fan_attributes
+ */
+static const u8 fan_reg[] = {
+    0x0F,       /* fan 1-6 present status */
+    0x10,	    /* fan 1-6 direction(0:F2B 1:B2F) */
+    0x11,       /* fan PWM(for all fan) */
+    0x12,       /* front fan 1 speed(rpm) */
+    0x13,       /* front fan 2 speed(rpm) */
+    0x14,       /* front fan 3 speed(rpm) */
+    0x15,       /* front fan 4 speed(rpm) */
+    0x16,       /* front fan 5 speed(rpm) */
+    0x17,       /* front fan 6 speed(rpm) */
+    0x22,       /* rear fan 1 speed(rpm) */
+    0x23,       /* rear fan 2 speed(rpm) */
+    0x24,       /* rear fan 3 speed(rpm) */
+    0x25,       /* rear fan 4 speed(rpm) */
+    0x26,       /* rear fan 5 speed(rpm) */
+    0x27,       /* rear fan 6 speed(rpm) */
+};
+
+/* Each client has this additional data */
+struct as9726_32d_fan_data {
+    struct device   *hwmon_dev;
+    struct mutex     update_lock;
+    char             valid;           /* != 0 if registers are valid */
+    unsigned long    last_updated;    /* In jiffies */
+    u8               reg_val[ARRAY_SIZE(fan_reg)]; /* Register value */
+    int              system_temp;    /*In unit of mini-Celsius*/
+    int              sensors_found;
+};
+
+enum fan_id {
+    FAN1_ID,
+    FAN2_ID,
+    FAN3_ID,
+    FAN4_ID,
+    FAN5_ID,
+    FAN6_ID
+};
+
+enum sysfs_fan_attributes {
+    FAN_PRESENT_REG,
+    FAN_DIRECTION_REG,
+    FAN_DUTY_CYCLE_PERCENTAGE, /* Only one CPLD register to control duty cycle for all fans */
+    FAN1_FRONT_SPEED_RPM,
+    FAN2_FRONT_SPEED_RPM,
+    FAN3_FRONT_SPEED_RPM,
+    FAN4_FRONT_SPEED_RPM,
+    FAN5_FRONT_SPEED_RPM,
+    FAN6_FRONT_SPEED_RPM,
+    FAN1_REAR_SPEED_RPM,
+    FAN2_REAR_SPEED_RPM,
+    FAN3_REAR_SPEED_RPM,
+    FAN4_REAR_SPEED_RPM,
+    FAN5_REAR_SPEED_RPM,
+    FAN6_REAR_SPEED_RPM,
+    FAN1_DIRECTION,
+    FAN2_DIRECTION,
+    FAN3_DIRECTION,
+    FAN4_DIRECTION,
+    FAN5_DIRECTION,
+    FAN6_DIRECTION,
+    FAN1_PRESENT,
+    FAN2_PRESENT,
+    FAN3_PRESENT,
+    FAN4_PRESENT,
+    FAN5_PRESENT,
+    FAN6_PRESENT,
+    FAN1_FAULT,
+    FAN2_FAULT,
+    FAN3_FAULT,
+    FAN4_FAULT,
+    FAN5_FAULT,
+    FAN6_FAULT
+};
+
+/* Define attributes
+ */
+#define DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan##index##_fault, S_IRUGO, fan_show_value, NULL, FAN##index##_FAULT)
+
+#define DECLARE_FAN_FAULT_ATTR(index)  &sensor_dev_attr_fan##index##_fault.dev_attr.attr
+
+#define DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan##index##_direction, S_IRUGO, fan_show_value, NULL, FAN##index##_DIRECTION)
+
+#define DECLARE_FAN_DIRECTION_ATTR(index)  &sensor_dev_attr_fan##index##_direction.dev_attr.attr
+
+#define DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan##index##_duty_cycle_percentage, S_IWUSR | S_IRUGO, fan_show_value, set_duty_cycle, FAN##index##_DUTY_CYCLE_PERCENTAGE)
+
+#define DECLARE_FAN_DUTY_CYCLE_ATTR(index) &sensor_dev_attr_fan##index##_duty_cycle_percentage.dev_attr.attr
+
+#define DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(index) \
+    static SENSOR_DEVICE_ATTR(fan##index##_present, S_IRUGO, fan_show_value, NULL, FAN##index##_PRESENT)
+
+#define DECLARE_FAN_PRESENT_ATTR(index)      &sensor_dev_attr_fan##index##_present.dev_attr.attr
+
+#define DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(index, index2) \
+    static SENSOR_DEVICE_ATTR(fan##index##_front_speed_rpm, S_IRUGO, fan_show_value, NULL, FAN##index##_FRONT_SPEED_RPM);\
+    static SENSOR_DEVICE_ATTR(fan##index##_rear_speed_rpm, S_IRUGO, fan_show_value, NULL, FAN##index##_REAR_SPEED_RPM);\
+    static SENSOR_DEVICE_ATTR(fan##index##_input, S_IRUGO, fan_show_value, NULL, FAN##index##_FRONT_SPEED_RPM);\
+    static SENSOR_DEVICE_ATTR(fan##index2##_input, S_IRUGO, fan_show_value, NULL, FAN##index##_REAR_SPEED_RPM)
+
+#define DECLARE_FAN_SPEED_RPM_ATTR(index, index2)  &sensor_dev_attr_fan##index##_front_speed_rpm.dev_attr.attr, \
+                                           &sensor_dev_attr_fan##index##_rear_speed_rpm.dev_attr.attr, \
+                                           &sensor_dev_attr_fan##index##_input.dev_attr.attr, \
+                                           &sensor_dev_attr_fan##index2##_input.dev_attr.attr
+
+/* 6 fan fault attributes in this platform */
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(5);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(6);
+/* 6 fan speed(rpm) attributes in this platform */
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(1,11);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(2,12);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(3,13);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(4,14);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(5,15);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(6,16);
+/* 6 fan present attributes in this platform */
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(5);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(6);
+/* 6 fan direction attribute in this platform */
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(5);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(6);
+/* 1 fan duty cycle attribute in this platform */
+DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR();
+
+static struct attribute *as9726_32d_fan_attributes[] = {
+    /* fan related attributes */
+    DECLARE_FAN_FAULT_ATTR(1),
+    DECLARE_FAN_FAULT_ATTR(2),
+    DECLARE_FAN_FAULT_ATTR(3),
+    DECLARE_FAN_FAULT_ATTR(4),
+    DECLARE_FAN_FAULT_ATTR(5),
+    DECLARE_FAN_FAULT_ATTR(6),
+    DECLARE_FAN_SPEED_RPM_ATTR(1,11),
+    DECLARE_FAN_SPEED_RPM_ATTR(2,12),
+    DECLARE_FAN_SPEED_RPM_ATTR(3,13),
+    DECLARE_FAN_SPEED_RPM_ATTR(4,14),
+    DECLARE_FAN_SPEED_RPM_ATTR(5,15),
+    DECLARE_FAN_SPEED_RPM_ATTR(6,16),
+    DECLARE_FAN_PRESENT_ATTR(1),
+    DECLARE_FAN_PRESENT_ATTR(2),
+    DECLARE_FAN_PRESENT_ATTR(3),
+    DECLARE_FAN_PRESENT_ATTR(4),
+    DECLARE_FAN_PRESENT_ATTR(5),
+    DECLARE_FAN_PRESENT_ATTR(6),
+    DECLARE_FAN_DIRECTION_ATTR(1),
+    DECLARE_FAN_DIRECTION_ATTR(2),
+    DECLARE_FAN_DIRECTION_ATTR(3),
+    DECLARE_FAN_DIRECTION_ATTR(4),
+    DECLARE_FAN_DIRECTION_ATTR(5),
+    DECLARE_FAN_DIRECTION_ATTR(6),
+    DECLARE_FAN_DUTY_CYCLE_ATTR(),
+    NULL
+};
+
+#define FAN_DUTY_CYCLE_REG_MASK         0xF
+#define FAN_MAX_DUTY_CYCLE              100
+#define FAN_REG_VAL_TO_SPEED_RPM_STEP   200
+
+static int as9726_32d_fan_read_value(struct i2c_client *client, u8 reg)
+{
+    return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int as9726_32d_fan_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+    return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/* fan utility functions
+ */
+static u32 reg_val_to_duty_cycle(u8 reg_val)
+{
+    reg_val &= FAN_DUTY_CYCLE_REG_MASK;
+    u32 duty_cycle = 0;
+
+    switch(reg_val)
+    {
+        case 0:
+            duty_cycle = 0;
+            break;
+        case 5 ... 6:
+            duty_cycle = ( ((u32)(reg_val)+1) *6) + 1;
+            break;
+        case 7 ... 10:
+            duty_cycle = ( ((u32)(reg_val)+1) *6) + 2;
+            break;
+        case 11 ... 14:
+            duty_cycle = ( ((u32)(reg_val)+1) *6) + 3;
+            break;
+        case 15:
+            duty_cycle = 100;
+            break;
+        default: // 1~4
+            duty_cycle = 31;
+            break;
+    }
+
+    return duty_cycle;
+}
+
+static u8 duty_cycle_to_reg_val(u8 duty_cycle)
+{
+    u32 reg_val = 0;
+
+    if((u32)duty_cycle == 0) {
+        reg_val = 0;
+    }
+    else if((u32)duty_cycle <= 31) {
+        reg_val = 4;
+    }
+    else if((u32)duty_cycle <= 37) {
+        reg_val = 5;
+    }
+    else if((u32)duty_cycle <= 43) {
+        reg_val = 6;
+    }
+    else if((u32)duty_cycle <= 50) {
+        reg_val = 7;
+    }
+    else if((u32)duty_cycle <=  56) {
+        reg_val = 8;
+    }
+    else if((u32)duty_cycle <= 62) {
+        reg_val = 9;
+    }
+    else if((u32)duty_cycle <= 68) {
+        reg_val = 10;
+    }
+    else if((u32)duty_cycle <= 75) {
+        reg_val = 11;
+    }
+    else if((u32)duty_cycle <= 81) {
+        reg_val = 12;
+    }
+    else if((u32)duty_cycle <= 87) {
+        reg_val = 13;
+    }
+    else if((u32)duty_cycle <= 93) {
+        reg_val = 14;
+    }
+    else {
+        reg_val = 15;
+    }
+
+    return reg_val;
+}
+
+static u32 reg_val_to_speed_rpm(u8 reg_val)
+{
+    return (u32)reg_val * FAN_REG_VAL_TO_SPEED_RPM_STEP;
+}
+
+static u8 reg_val_to_direction(u8 reg_val, enum fan_id id)
+{
+	u8 mask = (1 << id);
+
+	reg_val &= mask;
+
+	return reg_val ? 1 : 0;
+}
+static u8 reg_val_to_is_present(u8 reg_val, enum fan_id id)
+{
+    u8 mask = (1 << id);
+
+    reg_val &= mask;
+
+    return reg_val ? 0 : 1;
+}
+
+static u8 is_fan_fault(struct as9726_32d_fan_data *data, enum fan_id id)
+{
+    u8 ret = 1;
+    int front_fan_index = FAN1_FRONT_SPEED_RPM + id;
+    int rear_fan_index  = FAN1_REAR_SPEED_RPM  + id;
+
+    /* Check if the speed of front or rear fan is ZERO,
+     */
+    if (reg_val_to_speed_rpm(data->reg_val[front_fan_index]) &&
+            reg_val_to_speed_rpm(data->reg_val[rear_fan_index]))  {
+        ret = 0;
+    }
+
+    return ret;
+}
+
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+                              const char *buf, size_t count)
+{
+    int error, value;
+    struct i2c_client *client = to_i2c_client(dev);
+
+    error = kstrtoint(buf, 10, &value);
+    if (error)
+        return error;
+
+    if (value < 0 || value > FAN_MAX_DUTY_CYCLE)
+        return -EINVAL;
+
+    as9726_32d_fan_write_value(client, 0x33, 0); /* Disable fan speed watch dog */
+    as9726_32d_fan_write_value(client, fan_reg[FAN_DUTY_CYCLE_PERCENTAGE], duty_cycle_to_reg_val(value));
+    return count;
+}
+
+/* Due to this struct is declared at lm75.c, it cannot be include
+ * under Sonic environment. I duplicate it from lm75.c.
+ */
+struct lm75_data {
+    struct i2c_client       *client;
+    struct device           *hwmon_dev;
+    struct thermal_zone_device      *tz;
+    struct mutex            update_lock;
+    u8                      orig_conf;
+    u8                      resolution;     /* In bits, between 9 and 12 */
+    u8                      resolution_limits;
+    char                    valid;          /* !=0 if registers are valid */
+    unsigned long           last_updated;   /* In jiffies */
+    unsigned long           sample_time;    /* In jiffies */
+    s16                     temp[3];        /* Register values,
+                                                   0 = input
+                                                   1 = max
+                                                   2 = hyst */
+};
+
+/*Copied from lm75.c*/
+static inline long lm75_reg_to_mc(s16 temp, u8 resolution)
+{
+    return ((temp >> (16 - resolution)) * 1000) >> (resolution - 8);
+}
+
+/*Get hwmon_dev from i2c_client, set hwmon_dev = NULL is failed.*/
+static struct device * get_hwmon_dev(
+    struct i2c_client *client)
+{
+    struct lm75_data *data = NULL;
+
+    data = i2c_get_clientdata(client);
+    if(data)
+    {
+        if( data->valid == 1  && data->hwmon_dev)
+        {
+            return data->hwmon_dev;
+        }
+
+    }
+    return NULL;
+}
+
+/* To find hwmon index by opening hwmon under that i2c address.
+ */
+static int find_hwmon_index_by_FileOpen(
+    int bus_nr,
+    unsigned short addr,
+    int *index)
+{
+#define MAX_HWMON_DEVICE        (10)    /* Find hwmon device in 0~10*/
+    struct file *sfd;
+    char client_name[96];
+    int  i=0;
+
+    do {
+        snprintf(client_name, sizeof(client_name),
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/hwmon%d/temp1_input",
+                 bus_nr, addr, i);
+
+        sfd = filp_open(client_name, O_RDONLY, 0);
+        i++;
+    } while( IS_ERR(sfd) && i < MAX_HWMON_DEVICE);
+
+    if (IS_ERR(sfd)) {
+        pr_err("Failed to open file(%s)#%d\r\n", client_name, __LINE__);
+        return -ENOENT;
+    }
+    filp_close(sfd, 0);
+    *index = i - 1;
+    return 0;
+
+#undef MAX_HWMON_DEVICE
+}
+
+static int get_temp_file_path(
+    int bus_nr, unsigned short addr,
+    struct device *hwmon_dev
+    ,char *path, int max_len)
+{
+
+    if(hwmon_dev && strlen(dev_name(hwmon_dev)))
+    {
+        snprintf(path, max_len,
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/%s/temp1_input",
+                 bus_nr, addr, dev_name(hwmon_dev));
+    }
+    else
+    {
+        int  i=0;
+        if(find_hwmon_index_by_FileOpen( bus_nr, addr, &i))
+        {
+            return  -EIO;
+        }
+        snprintf(path, max_len,
+                 "/sys/bus/i2c/devices/%d-%04x/hwmon/hwmon%d/temp1_input",
+                 bus_nr, addr, i);
+    }
+    
+    return 0;
+}
+
+/*File read the dev file at user space.*/
+static int read_devfile_temp1_input(
+    struct device *dev,
+    int bus_nr,
+    unsigned short addr,
+    struct device *hwmon_dev,
+    int *miniCelsius)
+{
+    struct file *sfd;
+    char buffer[96];
+    char devfile[96];
+    int     rc, status;
+    int     rdlen, value;
+    mm_segment_t old_fs;
+
+    rc = 0;
+    get_temp_file_path(bus_nr, addr, hwmon_dev, devfile, sizeof(devfile));
+    sfd = filp_open(devfile, O_RDONLY, 0);
+    if (IS_ERR(sfd)) {
+        pr_err("Failed to open file(%s)#%d\r\n", devfile, __LINE__);
+        return -ENOENT;
+    }
+    dev_dbg(dev, "Found device:%s\n",devfile);
+
+    if(!(sfd->f_op) || !(sfd->f_op->read) ) {
+        pr_err("file %s cann't readable ?\n",devfile);
+        return -ENOENT;
+    }
+
+    old_fs = get_fs();
+    set_fs(KERNEL_DS);
+    rdlen = sfd->f_op->read(sfd, buffer, sizeof(buffer), &sfd->f_pos);
+    if (rdlen == 0) {
+        pr_err( "File(%s) empty!\n", devfile);
+        rc = -EIO;
+        goto exit;
+    }
+    status = sscanf(buffer, "%d", &value);
+    if (status != 1) {
+        rc = -EIO;
+        goto exit;
+    }
+    *miniCelsius = value;
+    dev_dbg(dev,"found sensors: %d @i2c %d-%04x\n", value, bus_nr, addr);
+
+exit:
+    set_fs(old_fs);
+    filp_close(sfd, 0);
+    return rc;
+}
+
+static u8 is_lm75_data_due(struct i2c_client *client)
+{
+    struct lm75_data *data = NULL;
+
+    data = i2c_get_clientdata(client);
+    if (time_after(jiffies, data->last_updated + data->sample_time))
+    {
+        return 1;
+    }
+    return 0;
+}
+
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da,
+                              char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as9726_32d_fan_data *data = as9726_32d_fan_update_device(dev);
+    ssize_t ret = 0;
+
+    if (data->valid) {
+        switch (attr->index) {
+        case FAN_DUTY_CYCLE_PERCENTAGE:
+        {
+            u32 duty_cycle = reg_val_to_duty_cycle(data->reg_val[FAN_DUTY_CYCLE_PERCENTAGE]);
+            ret = sprintf(buf, "%u\n", duty_cycle);
+            break;
+        }
+        case FAN1_FRONT_SPEED_RPM:
+        case FAN2_FRONT_SPEED_RPM:
+        case FAN3_FRONT_SPEED_RPM:
+        case FAN4_FRONT_SPEED_RPM:
+        case FAN5_FRONT_SPEED_RPM:
+        case FAN6_FRONT_SPEED_RPM:
+        case FAN1_REAR_SPEED_RPM:
+        case FAN2_REAR_SPEED_RPM:
+        case FAN3_REAR_SPEED_RPM:
+        case FAN4_REAR_SPEED_RPM:
+        case FAN5_REAR_SPEED_RPM:
+        case FAN6_REAR_SPEED_RPM:
+            ret = sprintf(buf, "%u\n", reg_val_to_speed_rpm(data->reg_val[attr->index]));
+            break;
+        case FAN1_PRESENT:
+        case FAN2_PRESENT:
+        case FAN3_PRESENT:
+        case FAN4_PRESENT:
+        case FAN5_PRESENT:
+        case FAN6_PRESENT:
+            ret = sprintf(buf, "%d\n",
+                          reg_val_to_is_present(data->reg_val[FAN_PRESENT_REG],
+                                                attr->index - FAN1_PRESENT));
+            break;
+        case FAN1_FAULT:
+        case FAN2_FAULT:
+        case FAN3_FAULT:
+        case FAN4_FAULT:
+        case FAN5_FAULT:
+        case FAN6_FAULT:
+            ret = sprintf(buf, "%d\n", is_fan_fault(data, attr->index - FAN1_FAULT));
+            break;
+        case FAN1_DIRECTION:
+        case FAN2_DIRECTION:
+        case FAN3_DIRECTION:
+        case FAN4_DIRECTION:
+        case FAN5_DIRECTION:
+        case FAN6_DIRECTION:
+            ret = sprintf(buf, "%d\n",
+                          reg_val_to_direction(data->reg_val[FAN_DIRECTION_REG],
+                                               attr->index - FAN1_DIRECTION));
+            break;
+        default:
+            break;
+        }
+    }
+
+    return ret;
+}
+
+static const struct attribute_group as9726_32d_fan_group = {
+    .attrs = as9726_32d_fan_attributes,
+};
+
+static struct as9726_32d_fan_data *as9726_32d_fan_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_fan_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->update_lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2) ||
+            !data->valid) {
+        int i;
+
+        dev_dbg(&client->dev, "Starting as9726_32d_fan update\n");
+        data->valid = 0;
+
+        /* Update fan data
+         */
+        for (i = 0; i < ARRAY_SIZE(data->reg_val); i++) {
+            int status = as9726_32d_fan_read_value(client, fan_reg[i]);
+            if (status < 0) {
+                data->valid = 0;
+                mutex_unlock(&data->update_lock);
+                dev_dbg(&client->dev, "reg %d, err %d\n", fan_reg[i], status);
+                return data;
+            }
+            else {
+                data->reg_val[i] = status;
+            }
+        }
+
+        data->last_updated = jiffies;
+        data->valid = 1;
+    }
+
+    mutex_unlock(&data->update_lock);
+
+    return data;
+}
+
+static int as9726_32d_fan_probe(struct i2c_client *client,
+                                const struct i2c_device_id *dev_id)
+{
+    struct as9726_32d_fan_data *data;
+    int status;
+
+    if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+        status = -EIO;
+        goto exit;
+    }
+
+    data = kzalloc(sizeof(struct as9726_32d_fan_data), GFP_KERNEL);
+    if (!data) {
+        status = -ENOMEM;
+        goto exit;
+    }
+
+    i2c_set_clientdata(client, data);
+    data->valid = 0;
+    mutex_init(&data->update_lock);
+
+    dev_info(&client->dev, "chip found\n");
+
+    /* Register sysfs hooks */
+    status = sysfs_create_group(&client->dev.kobj, &as9726_32d_fan_group);
+    if (status) {
+        goto exit_free;
+    }
+
+    data->hwmon_dev = hwmon_device_register(&client->dev);
+    if (IS_ERR(data->hwmon_dev)) {
+        status = PTR_ERR(data->hwmon_dev);
+        goto exit_remove;
+    }
+
+    dev_info(&client->dev, "%s: fan '%s'\n",
+             dev_name(data->hwmon_dev), client->name);
+
+    return 0;
+
+exit_remove:
+    sysfs_remove_group(&client->dev.kobj, &as9726_32d_fan_group);
+exit_free:
+    kfree(data);
+exit:
+
+    return status;
+}
+
+static int as9726_32d_fan_remove(struct i2c_client *client)
+{
+    struct as9726_32d_fan_data *data = i2c_get_clientdata(client);
+    hwmon_device_unregister(data->hwmon_dev);
+    sysfs_remove_group(&client->dev.kobj, &as9726_32d_fan_group);
+
+    return 0;
+}
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x66, I2C_CLIENT_END };
+
+static const struct i2c_device_id as9726_32d_fan_id[] = {
+    { "as9726_32d_fan", 0 },
+    {}
+};
+MODULE_DEVICE_TABLE(i2c, as9726_32d_fan_id);
+
+static struct i2c_driver as9726_32d_fan_driver = {
+    .class        = I2C_CLASS_HWMON,
+    .driver = {
+        .name     = DRVNAME,
+    },
+    .probe        = as9726_32d_fan_probe,
+    .remove       = as9726_32d_fan_remove,
+    .id_table     = as9726_32d_fan_id,
+    .address_list = normal_i2c,
+};
+
+module_i2c_driver(as9726_32d_fan_driver);
+
+MODULE_AUTHOR("Michael Shih <michael_shih@edge-core.com>");
+MODULE_DESCRIPTION("as9726_32d_fan driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-psu.c b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-psu.c
new file mode 100755
index 000000000000..cdf11f503d6e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/x86-64-accton-as9726-32d-psu.c
@@ -0,0 +1,321 @@
+/*
+ * An hwmon driver for accton as9726_32d Power Module
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese <sr at denx.de>, DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/dmi.h>
+
+#define MAX_MODEL_NAME          20
+#define MAX_SERIAL_NUMBER       19
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_string(struct device *dev, struct device_attribute *da, char *buf);
+static int as9726_32d_psu_read_block(struct i2c_client *client, u8 command, u8 *data,int data_len);
+extern int as9726_32d_cpld_read(unsigned short cpld_addr, u8 reg);
+
+/* Addresses scanned
+ */
+static const unsigned short normal_i2c[] = { 0x50, 0x51, I2C_CLIENT_END };
+
+/* Each client has this additional data
+ */
+struct as9726_32d_psu_data {
+    struct device      *hwmon_dev;
+    struct mutex        update_lock;
+    char                valid;           /* !=0 if registers are valid */
+    unsigned long       last_updated;    /* In jiffies */
+    u8  index;           /* PSU index */
+    u8  status;          /* Status(present/power_good) register read from CPLD */
+    char model_name[MAX_MODEL_NAME]; /* Model name, read from eeprom */
+    char serial_number[MAX_SERIAL_NUMBER];
+};
+
+static struct as9726_32d_psu_data *as9726_32d_psu_update_device(struct device *dev);
+
+enum as9726_32d_psu_sysfs_attributes {
+    PSU_PRESENT,
+    PSU_MODEL_NAME,
+    PSU_POWER_GOOD,
+    PSU_SERIAL_NUMBER
+};
+
+/* sysfs attributes for hwmon
+ */
+static SENSOR_DEVICE_ATTR(psu_present,    S_IRUGO, show_status,    NULL, PSU_PRESENT);
+static SENSOR_DEVICE_ATTR(psu_model_name, S_IRUGO, show_string,    NULL, PSU_MODEL_NAME);
+static SENSOR_DEVICE_ATTR(psu_power_good, S_IRUGO, show_status,    NULL, PSU_POWER_GOOD);
+static SENSOR_DEVICE_ATTR(psu_serial_number, S_IRUGO, show_string, NULL, PSU_SERIAL_NUMBER);
+
+
+static struct attribute *as9726_32d_psu_attributes[] = {
+    &sensor_dev_attr_psu_present.dev_attr.attr,
+    &sensor_dev_attr_psu_model_name.dev_attr.attr,
+    &sensor_dev_attr_psu_power_good.dev_attr.attr,
+    &sensor_dev_attr_psu_serial_number.dev_attr.attr,
+    NULL
+};
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+                           char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as9726_32d_psu_data *data = as9726_32d_psu_update_device(dev);
+    u8 status = 0;
+
+    //printk("data->status=0x%x, attr->index=%d,data->index=%d \n", data->status, attr->index, data->index);
+    if (attr->index == PSU_PRESENT) {
+        if(data->index==0)
+            status = !( (data->status) & 0x1);
+        else
+            status = !( (data->status >> 1) & 0x1);
+    }
+    else { /* PSU_POWER_GOOD */
+        if(data->index==0)
+           status = ( (data->status >> 2) & 0x1);
+        else
+           status = ( (data->status >> 3) & 0x1); 
+    }
+
+    return sprintf(buf, "%d\n", status);
+}
+
+static ssize_t show_string(struct device *dev, struct device_attribute *da,
+                               char *buf)
+{
+   struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct as9726_32d_psu_data *data = as9726_32d_psu_update_device(dev);
+    char *ptr = NULL;
+
+    if (!data->valid) {
+        return -EIO;
+    }
+
+	switch (attr->index) {
+	case PSU_MODEL_NAME:
+		ptr = data->model_name;
+		break;
+	case PSU_SERIAL_NUMBER:
+		ptr = data->serial_number;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+    return sprintf(buf, "%s\n", ptr);
+}
+
+static const struct attribute_group as9726_32d_psu_group = {
+    .attrs = as9726_32d_psu_attributes,
+};
+
+static int as9726_32d_psu_probe(struct i2c_client *client,
+                                const struct i2c_device_id *dev_id)
+{
+    struct as9726_32d_psu_data *data;
+    int status;
+
+    if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+        status = -EIO;
+        goto exit;
+    }
+
+    data = kzalloc(sizeof(struct as9726_32d_psu_data), GFP_KERNEL);
+    if (!data) {
+        status = -ENOMEM;
+        goto exit;
+    }
+
+    i2c_set_clientdata(client, data);
+    data->valid = 0;
+    data->index = dev_id->driver_data;
+    mutex_init(&data->update_lock);
+
+    dev_info(&client->dev, "chip found\n");
+
+    /* Register sysfs hooks */
+    status = sysfs_create_group(&client->dev.kobj, &as9726_32d_psu_group);
+    if (status) {
+        goto exit_free;
+    }
+
+    data->hwmon_dev = hwmon_device_register(&client->dev);
+    if (IS_ERR(data->hwmon_dev)) {
+        status = PTR_ERR(data->hwmon_dev);
+        goto exit_remove;
+    }
+
+    dev_info(&client->dev, "%s: psu '%s'\n",
+             dev_name(data->hwmon_dev), client->name);
+
+    return 0;
+
+exit_remove:
+    sysfs_remove_group(&client->dev.kobj, &as9726_32d_psu_group);
+exit_free:
+    kfree(data);
+exit:
+
+    return status;
+}
+
+static int as9726_32d_psu_remove(struct i2c_client *client)
+{
+    struct as9726_32d_psu_data *data = i2c_get_clientdata(client);
+
+    hwmon_device_unregister(data->hwmon_dev);
+    sysfs_remove_group(&client->dev.kobj, &as9726_32d_psu_group);
+    kfree(data);
+
+    return 0;
+}
+
+enum psu_index
+{
+    as9726_32d_psu1,
+    as9726_32d_psu2
+};
+
+static const struct i2c_device_id as9726_32d_psu_id[] = {
+    { "as9726_32d_psu1", as9726_32d_psu1 },
+    { "as9726_32d_psu2", as9726_32d_psu2 },
+    {}
+};
+MODULE_DEVICE_TABLE(i2c, as9726_32d_psu_id);
+
+static struct i2c_driver as9726_32d_psu_driver = {
+    .class        = I2C_CLASS_HWMON,
+    .driver = {
+        .name     = "as9726_32d_psu",
+    },
+    .probe        = as9726_32d_psu_probe,
+    .remove       = as9726_32d_psu_remove,
+    .id_table     = as9726_32d_psu_id,
+    .address_list = normal_i2c,
+};
+
+static int as9726_32d_psu_read_block(struct i2c_client *client, u8 command, u8 *data,
+                                     int data_len)
+{
+    int result = 0;
+    int retry_count = 5;
+
+    while (retry_count) {
+        retry_count--;
+
+        result = i2c_smbus_read_i2c_block_data(client, command, data_len, data);
+
+        if (unlikely(result < 0)) {
+            msleep(10);
+            continue;
+        }
+
+        if (unlikely(result != data_len)) {
+            result = -EIO;
+            msleep(10);
+            continue;
+        }
+
+        result = 0;
+        break;
+    }
+
+    return result;
+}
+
+static struct as9726_32d_psu_data *as9726_32d_psu_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct as9726_32d_psu_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->update_lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+            || !data->valid) {
+        int status;
+        int psu_present = 0;
+
+        dev_dbg(&client->dev, "Starting as9726_32d update\n");
+
+        /* Read psu status */
+        status = as9726_32d_cpld_read(0x60, 0x03);
+        //printk("status=0x%x in %s\n", status, __FUNCTION__);
+
+        if (status < 0) {
+            dev_dbg(&client->dev, "cpld reg 0x60 err %d\n", status);
+        }
+        else {
+            data->status = status;
+        }
+
+        /* Read model name */
+        memset(data->model_name, 0, sizeof(data->model_name));
+        memset(data->serial_number, 0, sizeof(data->serial_number));
+        psu_present = (data->status >> (data->index) & 0x1); //0:present, 1:not present
+       
+        if (!psu_present) {
+            status = as9726_32d_psu_read_block(client, 0x20, data->model_name,
+                                               ARRAY_SIZE(data->model_name)-1);                                               
+            if (status < 0) {
+                data->model_name[0] = '\0';
+                dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
+                printk("unable to read model name from (0x%x)\n", client->addr);
+            }
+            else {
+                data->model_name[ARRAY_SIZE(data->model_name)-1] = '\0';
+                
+            }
+             /* Read from offset 0x35 ~ 0x46 (18 bytes) */
+            status = as9726_32d_psu_read_block(client, 0x35,data->serial_number, MAX_SERIAL_NUMBER);
+            if (status < 0)
+            {
+                data->serial_number[0] = '\0';
+                dev_dbg(&client->dev, "unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
+                printk("unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
+            }
+            data->serial_number[MAX_SERIAL_NUMBER-1]='\0';
+        }
+
+        data->last_updated = jiffies;
+        data->valid = 1;
+    }
+
+    mutex_unlock(&data->update_lock);
+
+    return data;
+}
+
+module_i2c_driver(as9726_32d_psu_driver);
+
+MODULE_AUTHOR("Michael Shih <michael_shih@edge-core.com>");
+MODULE_DESCRIPTION("as9726_32d_psu driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/ym2651y.c b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/ym2651y.c
new file mode 100755
index 000000000000..63488d2c6c78
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/modules/ym2651y.c
@@ -0,0 +1,678 @@
+/*
+ * An hwmon driver for the 3Y Power YM-2651Y Power Module
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang <brandon_chuang@accton.com.tw>
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese <sr at denx.de>, DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/slab.h>
+
+#define MAX_FAN_DUTY_CYCLE 100
+
+/* Addresses scanned
+ */
+static const unsigned short normal_i2c[] = { 0x58, 0x59, I2C_CLIENT_END };
+
+enum chips {
+	YM2651,
+	YM2401,
+	YM2851,
+    YPEB1200AM,
+};
+
+/* Each client has this additional data
+ */
+struct ym2651y_data {
+    struct device      *hwmon_dev;
+    struct mutex        update_lock;
+    char                valid;           /* !=0 if registers are valid */
+    unsigned long       last_updated;    /* In jiffies */
+    u8   chip;           /* chip id */
+    u8   capability;     /* Register value */
+    u16  status_word;    /* Register value */
+    u8   fan_fault;      /* Register value */
+    u8   over_temp;      /* Register value */
+    u16  v_out;          /* Register value */
+    u16  i_out;          /* Register value */
+    u16  p_out;          /* Register value */
+    u8   vout_mode;      /* Register value */
+    u16  temp;           /* Register value */
+    u16  fan_speed;      /* Register value */
+    u16  fan_duty_cycle[2];  /* Register value */
+    u8   fan_dir[4];     /* Register value */
+    u8   pmbus_revision; /* Register value */
+    u8   mfr_id[10];     /* Register value */
+    u8   mfr_model[10];  /* Register value */
+    u8   mfr_revsion[3]; /* Register value */
+    u16  mfr_vin_min;    /* Register value */
+    u16  mfr_vin_max;    /* Register value */
+    u16  mfr_iin_max;    /* Register value */
+    u16  mfr_iout_max;   /* Register value */
+    u16  mfr_pin_max;    /* Register value */
+    u16  mfr_pout_max;   /* Register value */
+    u16  mfr_vout_min;   /* Register value */
+    u16  mfr_vout_max;   /* Register value */
+};
+
+static ssize_t show_vout(struct device *dev, struct device_attribute *da,
+             char *buf);
+static ssize_t show_byte(struct device *dev, struct device_attribute *da,
+                         char *buf);
+static ssize_t show_word(struct device *dev, struct device_attribute *da,
+                         char *buf);
+static ssize_t show_linear(struct device *dev, struct device_attribute *da,
+                           char *buf);
+static ssize_t show_fan_fault(struct device *dev, struct device_attribute *da,
+                              char *buf);
+static ssize_t show_over_temp(struct device *dev, struct device_attribute *da,
+                              char *buf);
+static ssize_t show_ascii(struct device *dev, struct device_attribute *da,
+                          char *buf);
+static struct ym2651y_data *ym2651y_update_device(struct device *dev);
+static ssize_t set_fan_duty_cycle(struct device *dev, struct device_attribute *da,
+                                  const char *buf, size_t count);
+static int ym2651y_write_word(struct i2c_client *client, u8 reg, u16 value);
+
+enum ym2651y_sysfs_attributes {
+    PSU_POWER_ON = 0,
+    PSU_TEMP_FAULT,
+    PSU_POWER_GOOD,
+    PSU_FAN1_FAULT,
+    PSU_FAN_DIRECTION,
+    PSU_OVER_TEMP,
+    PSU_V_OUT,
+    PSU_I_OUT,
+    PSU_P_OUT,
+    PSU_P_OUT_UV,     /*In Unit of microVolt, instead of mini.*/
+    PSU_TEMP1_INPUT,
+    PSU_FAN1_SPEED,
+    PSU_FAN1_DUTY_CYCLE,
+    PSU_PMBUS_REVISION,
+    PSU_MFR_ID,
+    PSU_MFR_MODEL,
+    PSU_MFR_REVISION,
+    PSU_MFR_VIN_MIN,
+    PSU_MFR_VIN_MAX,
+    PSU_MFR_VOUT_MIN,
+    PSU_MFR_VOUT_MAX,
+    PSU_MFR_IIN_MAX,
+    PSU_MFR_IOUT_MAX,
+    PSU_MFR_PIN_MAX,
+    PSU_MFR_POUT_MAX
+};
+
+/* sysfs attributes for hwmon
+ */
+static SENSOR_DEVICE_ATTR(psu_power_on,    S_IRUGO, show_word,      NULL, PSU_POWER_ON);
+static SENSOR_DEVICE_ATTR(psu_temp_fault,  S_IRUGO, show_word,      NULL, PSU_TEMP_FAULT);
+static SENSOR_DEVICE_ATTR(psu_power_good,  S_IRUGO, show_word,      NULL, PSU_POWER_GOOD);
+static SENSOR_DEVICE_ATTR(psu_fan1_fault,  S_IRUGO, show_fan_fault, NULL, PSU_FAN1_FAULT);
+static SENSOR_DEVICE_ATTR(psu_over_temp,   S_IRUGO, show_over_temp, NULL, PSU_OVER_TEMP);
+static SENSOR_DEVICE_ATTR(psu_v_out,       S_IRUGO, show_vout,    NULL, PSU_V_OUT);
+static SENSOR_DEVICE_ATTR(psu_i_out,       S_IRUGO, show_linear,    NULL, PSU_I_OUT);
+static SENSOR_DEVICE_ATTR(psu_p_out,       S_IRUGO, show_linear,    NULL, PSU_P_OUT);
+static SENSOR_DEVICE_ATTR(psu_temp1_input, S_IRUGO, show_linear,    NULL, PSU_TEMP1_INPUT);
+static SENSOR_DEVICE_ATTR(psu_fan1_speed_rpm, S_IRUGO, show_linear, NULL, PSU_FAN1_SPEED);
+static SENSOR_DEVICE_ATTR(psu_fan1_duty_cycle_percentage, S_IWUSR | S_IRUGO, show_linear, set_fan_duty_cycle, PSU_FAN1_DUTY_CYCLE);
+static SENSOR_DEVICE_ATTR(psu_fan_dir,     S_IRUGO, show_ascii,     NULL, PSU_FAN_DIRECTION);
+static SENSOR_DEVICE_ATTR(psu_pmbus_revision, S_IRUGO, show_byte,   NULL, PSU_PMBUS_REVISION);
+static SENSOR_DEVICE_ATTR(psu_mfr_id,         S_IRUGO, show_ascii,  NULL, PSU_MFR_ID);
+static SENSOR_DEVICE_ATTR(psu_mfr_model,      S_IRUGO, show_ascii,  NULL, PSU_MFR_MODEL);
+static SENSOR_DEVICE_ATTR(psu_mfr_revision,    S_IRUGO, show_ascii, NULL, PSU_MFR_REVISION);
+static SENSOR_DEVICE_ATTR(psu_mfr_vin_min,    S_IRUGO, show_linear, NULL, PSU_MFR_VIN_MIN);
+static SENSOR_DEVICE_ATTR(psu_mfr_vin_max,    S_IRUGO, show_linear, NULL, PSU_MFR_VIN_MAX);
+static SENSOR_DEVICE_ATTR(psu_mfr_vout_min,   S_IRUGO, show_linear, NULL, PSU_MFR_VOUT_MIN);
+static SENSOR_DEVICE_ATTR(psu_mfr_vout_max,   S_IRUGO, show_linear, NULL, PSU_MFR_VOUT_MAX);
+static SENSOR_DEVICE_ATTR(psu_mfr_iin_max,   S_IRUGO, show_linear, NULL, PSU_MFR_IIN_MAX);
+static SENSOR_DEVICE_ATTR(psu_mfr_iout_max,   S_IRUGO, show_linear, NULL, PSU_MFR_IOUT_MAX);
+static SENSOR_DEVICE_ATTR(psu_mfr_pin_max,   S_IRUGO, show_linear, NULL, PSU_MFR_PIN_MAX);
+static SENSOR_DEVICE_ATTR(psu_mfr_pout_max,   S_IRUGO, show_linear, NULL, PSU_MFR_POUT_MAX);
+
+/*Duplicate nodes for lm-sensors.*/
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_vout,    NULL, PSU_V_OUT);
+static SENSOR_DEVICE_ATTR(curr2_input, S_IRUGO, show_linear,    NULL, PSU_I_OUT);
+static SENSOR_DEVICE_ATTR(power2_input, S_IRUGO, show_linear,    NULL, PSU_P_OUT_UV);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_linear,    NULL, PSU_TEMP1_INPUT);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_linear, NULL, PSU_FAN1_SPEED);
+static SENSOR_DEVICE_ATTR(temp1_fault,  S_IRUGO, show_word,      NULL, PSU_TEMP_FAULT);
+
+static struct attribute *ym2651y_attributes[] = {
+    &sensor_dev_attr_psu_power_on.dev_attr.attr,
+    &sensor_dev_attr_psu_temp_fault.dev_attr.attr,
+    &sensor_dev_attr_psu_power_good.dev_attr.attr,
+    &sensor_dev_attr_psu_fan1_fault.dev_attr.attr,
+    &sensor_dev_attr_psu_over_temp.dev_attr.attr,
+    &sensor_dev_attr_psu_v_out.dev_attr.attr,
+    &sensor_dev_attr_psu_i_out.dev_attr.attr,
+    &sensor_dev_attr_psu_p_out.dev_attr.attr,
+    &sensor_dev_attr_psu_temp1_input.dev_attr.attr,
+    &sensor_dev_attr_psu_fan1_speed_rpm.dev_attr.attr,
+    &sensor_dev_attr_psu_fan1_duty_cycle_percentage.dev_attr.attr,
+    &sensor_dev_attr_psu_fan_dir.dev_attr.attr,
+    &sensor_dev_attr_psu_pmbus_revision.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_id.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_model.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_revision.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_vin_min.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_vin_max.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_pout_max.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_iin_max.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_pin_max.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_vout_min.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_vout_max.dev_attr.attr,
+    &sensor_dev_attr_psu_mfr_iout_max.dev_attr.attr,
+    /*Duplicate nodes for lm-sensors.*/
+    &sensor_dev_attr_curr2_input.dev_attr.attr,
+    &sensor_dev_attr_in3_input.dev_attr.attr,
+    &sensor_dev_attr_power2_input.dev_attr.attr,
+    &sensor_dev_attr_temp1_input.dev_attr.attr,
+    &sensor_dev_attr_fan1_input.dev_attr.attr,
+    &sensor_dev_attr_temp1_fault.dev_attr.attr,
+    NULL
+};
+
+static ssize_t show_byte(struct device *dev, struct device_attribute *da,
+                         char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+
+    return (attr->index == PSU_PMBUS_REVISION) ? sprintf(buf, "%d\n", data->pmbus_revision) :
+           sprintf(buf, "0\n");
+}
+
+static ssize_t show_word(struct device *dev, struct device_attribute *da,
+                         char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+    u16 status = 0;
+
+    switch (attr->index) {
+    case PSU_POWER_ON: /* psu_power_on, low byte bit 6 of status_word, 0=>ON, 1=>OFF */
+        status = (data->status_word & 0x40) ? 0 : 1;
+        break;
+    case PSU_TEMP_FAULT: /* psu_temp_fault, low byte bit 2 of status_word, 0=>Normal, 1=>temp fault */
+        status = (data->status_word & 0x4) >> 2;
+        break;
+    case PSU_POWER_GOOD: /* psu_power_good, high byte bit 3 of status_word, 0=>OK, 1=>FAIL */
+        status = (data->status_word & 0x800) ? 0 : 1;
+        break;
+    }
+
+    return sprintf(buf, "%d\n", status);
+}
+
+static int two_complement_to_int(u16 data, u8 valid_bit, int mask)
+{
+    u16  valid_data  = data & mask;
+    bool is_negative = valid_data >> (valid_bit - 1);
+
+    return is_negative ? (-(((~valid_data) & mask) + 1)) : valid_data;
+}
+
+static ssize_t set_fan_duty_cycle(struct device *dev, struct device_attribute *da,
+                                  const char *buf, size_t count)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct i2c_client *client = to_i2c_client(dev);
+    struct ym2651y_data *data = i2c_get_clientdata(client);
+    int nr = (attr->index == PSU_FAN1_DUTY_CYCLE) ? 0 : 1;
+    long speed;
+    int error;
+
+    error = kstrtol(buf, 10, &speed);
+    if (error)
+        return error;
+
+    if (speed < 0 || speed > MAX_FAN_DUTY_CYCLE)
+        return -EINVAL;
+
+    mutex_lock(&data->update_lock);
+    data->fan_duty_cycle[nr] = speed;
+    ym2651y_write_word(client, 0x3B + nr, data->fan_duty_cycle[nr]);
+    mutex_unlock(&data->update_lock);
+
+    return count;
+}
+
+static ssize_t show_linear(struct device *dev, struct device_attribute *da,
+                           char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+
+    u16 value = 0;
+    int exponent, mantissa;
+    int multiplier = 1000;
+
+    switch (attr->index) {
+    case PSU_V_OUT:
+        value = data->v_out;
+        break;
+    case PSU_I_OUT:
+        value = data->i_out;
+        break;
+    case PSU_P_OUT_UV:
+        multiplier = 1000000;  /*For lm-sensors, unit is micro-Volt.*/
+    /*Passing through*/
+    case PSU_P_OUT:
+        value = data->p_out;
+        break;
+    case PSU_TEMP1_INPUT:
+        value = data->temp;
+        break;
+    case PSU_FAN1_SPEED:
+        value = data->fan_speed;
+        multiplier = 1;
+        break;
+    case PSU_FAN1_DUTY_CYCLE:
+        value = data->fan_duty_cycle[0];
+        multiplier = 1;
+        break;
+    case PSU_MFR_VIN_MIN:
+        value = data->mfr_vin_min;
+        break;
+    case PSU_MFR_VIN_MAX:
+        value = data->mfr_vin_max;
+        break;
+    case PSU_MFR_VOUT_MIN:
+        value = data->mfr_vout_min;
+        break;
+    case PSU_MFR_VOUT_MAX:
+        value = data->mfr_vout_max;
+        break;
+    case PSU_MFR_PIN_MAX:
+        value = data->mfr_pin_max;
+        break;
+    case PSU_MFR_POUT_MAX:
+        value = data->mfr_pout_max;
+        break;
+    case PSU_MFR_IOUT_MAX:
+        value = data->mfr_iout_max;
+        break;
+    case PSU_MFR_IIN_MAX:
+        value = data->mfr_iin_max;
+        break;
+    }
+
+    exponent = two_complement_to_int(value >> 11, 5, 0x1f);
+    mantissa = two_complement_to_int(value & 0x7ff, 11, 0x7ff);
+    return (exponent >= 0) ? sprintf(buf, "%d\n", (mantissa << exponent) * multiplier) :
+           sprintf(buf, "%d\n", (mantissa * multiplier) / (1 << -exponent));
+}
+
+static ssize_t show_fan_fault(struct device *dev, struct device_attribute *da,
+                              char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+
+    u8 shift = (attr->index == PSU_FAN1_FAULT) ? 7 : 6;
+
+    return sprintf(buf, "%d\n", data->fan_fault >> shift);
+}
+
+static ssize_t show_over_temp(struct device *dev, struct device_attribute *da,
+                              char *buf)
+{
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+
+    return sprintf(buf, "%d\n", data->over_temp >> 7);
+}
+
+static ssize_t show_ascii(struct device *dev, struct device_attribute *da,
+                          char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+    u8 *ptr = NULL;
+
+    switch (attr->index) {
+    case PSU_FAN_DIRECTION: /* psu_fan_dir */
+        if (data->chip==YPEB1200AM)
+        {
+            memcpy(data->fan_dir, "F2B", 3);
+            data->fan_dir[3]='\0';
+        }
+        ptr = data->fan_dir;
+        break;
+    case PSU_MFR_ID: /* psu_mfr_id */
+        ptr = data->mfr_id;
+        break;
+    case PSU_MFR_MODEL: /* psu_mfr_model */
+        ptr = data->mfr_model;
+        break;
+    case PSU_MFR_REVISION: /* psu_mfr_revision */
+        ptr = data->mfr_revsion;
+        break;
+    default:
+        return 0;
+    }
+
+    return sprintf(buf, "%s\n", ptr);
+}
+
+static ssize_t show_vout_by_mode(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+    struct ym2651y_data *data = ym2651y_update_device(dev);
+    int exponent, mantissa;
+    int multiplier = 1000;
+
+    if (!data->valid) {
+        return 0;
+    }
+
+    exponent = two_complement_to_int(data->vout_mode, 5, 0x1f);
+    switch (attr->index) {
+    case PSU_MFR_VOUT_MIN:
+        mantissa = data->mfr_vout_min;
+        break;
+    case PSU_MFR_VOUT_MAX:
+        mantissa = data->mfr_vout_max;
+        break;
+    case PSU_V_OUT:
+        mantissa = data->v_out;
+        break;
+    default:
+        return 0;
+    }
+
+    return (exponent > 0) ? sprintf(buf, "%d\n", (mantissa << exponent) * multiplier) :
+                            sprintf(buf, "%d\n", (mantissa * multiplier) / (1 << -exponent));
+}
+
+static ssize_t show_vout(struct device *dev, struct device_attribute *da,
+             char *buf)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct ym2651y_data *data = i2c_get_clientdata(client);
+    u8 *ptr = NULL;
+
+    ptr = data->mfr_model + 1; /* The first byte is the count byte of string. */
+    if (data->chip == YM2401) {
+        return show_vout_by_mode(dev, da, buf);
+    }
+    else {
+        return show_linear(dev, da, buf);
+    }
+}
+
+static const struct attribute_group ym2651y_group = {
+    .attrs = ym2651y_attributes,
+};
+
+static int ym2651y_probe(struct i2c_client *client,
+                         const struct i2c_device_id *dev_id)
+{
+    struct ym2651y_data *data;
+    int status;
+
+    if (!i2c_check_functionality(client->adapter,
+                                 I2C_FUNC_SMBUS_BYTE_DATA |
+                                 I2C_FUNC_SMBUS_WORD_DATA |
+                                 I2C_FUNC_SMBUS_I2C_BLOCK)) {
+        status = -EIO;
+        goto exit;
+    }
+
+    data = kzalloc(sizeof(struct ym2651y_data), GFP_KERNEL);
+    if (!data) {
+        status = -ENOMEM;
+        goto exit;
+    }
+
+    i2c_set_clientdata(client, data);
+    mutex_init(&data->update_lock);
+    data->chip = dev_id->driver_data;
+    dev_info(&client->dev, "chip found\n");
+
+    /* Register sysfs hooks */
+    status = sysfs_create_group(&client->dev.kobj, &ym2651y_group);
+    if (status) {
+        goto exit_free;
+    }
+
+    data->hwmon_dev = hwmon_device_register(&client->dev);
+    if (IS_ERR(data->hwmon_dev)) {
+        status = PTR_ERR(data->hwmon_dev);
+        goto exit_remove;
+    }
+
+    dev_info(&client->dev, "%s: psu '%s'\n",
+             dev_name(data->hwmon_dev), client->name);
+
+    return 0;
+
+exit_remove:
+    sysfs_remove_group(&client->dev.kobj, &ym2651y_group);
+exit_free:
+    kfree(data);
+exit:
+
+    return status;
+}
+
+static int ym2651y_remove(struct i2c_client *client)
+{
+    struct ym2651y_data *data = i2c_get_clientdata(client);
+
+    hwmon_device_unregister(data->hwmon_dev);
+    sysfs_remove_group(&client->dev.kobj, &ym2651y_group);
+    kfree(data);
+
+    return 0;
+}
+
+static const struct i2c_device_id ym2651y_id[] = {
+    { "ym2651", YM2651 },
+    { "ym2401", YM2401 },
+    { "ym2851", YM2851 },
+    { "ype1200am", YPEB1200AM },
+    {}
+};
+MODULE_DEVICE_TABLE(i2c, ym2651y_id);
+
+static struct i2c_driver ym2651y_driver = {
+    .class        = I2C_CLASS_HWMON,
+    .driver = {
+        .name    = "ym2651",
+    },
+    .probe      = ym2651y_probe,
+    .remove      = ym2651y_remove,
+    .id_table = ym2651y_id,
+    .address_list = normal_i2c,
+};
+
+static int ym2651y_read_byte(struct i2c_client *client, u8 reg)
+{
+    return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int ym2651y_read_word(struct i2c_client *client, u8 reg)
+{
+    return i2c_smbus_read_word_data(client, reg);
+}
+
+static int ym2651y_write_word(struct i2c_client *client, u8 reg, u16 value)
+{
+    return i2c_smbus_write_word_data(client, reg, value);
+}
+
+static int ym2651y_read_block(struct i2c_client *client, u8 command, u8 *data,
+                              int data_len)
+{
+    int result = i2c_smbus_read_i2c_block_data(client, command, data_len, data);
+
+    if (unlikely(result < 0))
+        goto abort;
+    if (unlikely(result != data_len)) {
+        result = -EIO;
+        goto abort;
+    }
+
+    result = 0;
+
+abort:
+    return result;
+}
+
+struct reg_data_byte {
+    u8   reg;
+    u8  *value;
+};
+
+struct reg_data_word {
+    u8   reg;
+    u16 *value;
+};
+
+static struct ym2651y_data *ym2651y_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct ym2651y_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->update_lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+            || !data->valid) {
+        int i, status;
+        u8 command;
+        u8 fan_dir[5] = {0};
+        struct reg_data_byte regs_byte[] = { {0x19, &data->capability},
+            {0x20, &data->vout_mode},
+            {0x7d, &data->over_temp},
+            {0x81, &data->fan_fault},
+            {0x98, &data->pmbus_revision}
+        };
+        struct reg_data_word regs_word[] = { {0x79, &data->status_word},
+            {0x8b, &data->v_out},
+            {0x8c, &data->i_out},
+            {0x96, &data->p_out},
+            {0x8d, &data->temp},
+            {0x3b, &(data->fan_duty_cycle[0])},
+            {0x3c, &(data->fan_duty_cycle[1])},
+            {0x90, &data->fan_speed},
+            {0xa0, &data->mfr_vin_min},
+            {0xa1, &data->mfr_vin_max},
+            {0xa2, &data->mfr_iin_max},
+            {0xa3, &data->mfr_pin_max},
+            {0xa4, &data->mfr_vout_min},
+            {0xa5, &data->mfr_vout_max},
+            {0xa6, &data->mfr_iout_max},
+            {0xa7, &data->mfr_pout_max}
+        };
+
+        dev_dbg(&client->dev, "Starting ym2651 update\n");
+
+        /* Read byte data */
+        for (i = 0; i < ARRAY_SIZE(regs_byte); i++) {
+            status = ym2651y_read_byte(client, regs_byte[i].reg);
+
+            if (status < 0)
+            {
+                dev_dbg(&client->dev, "reg %d, err %d\n",
+                        regs_byte[i].reg, status);
+                *(regs_byte[i].value) = 0;
+            }
+            else {
+                *(regs_byte[i].value) = status;
+            }
+        }
+
+        /* Read word data */
+        for (i = 0; i < ARRAY_SIZE(regs_word); i++) {
+            status = ym2651y_read_word(client, regs_word[i].reg);
+
+            if (status < 0)
+            {
+                dev_dbg(&client->dev, "reg %d, err %d\n",
+                        regs_word[i].reg, status);
+                *(regs_word[i].value) = 0;
+            }
+            else {
+                *(regs_word[i].value) = status;
+            }
+        }
+
+        /* Read fan_direction */
+        command = 0xC3;
+        status = ym2651y_read_block(client, command, fan_dir, ARRAY_SIZE(fan_dir)-1);
+
+        if (status < 0) {
+            dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
+        }
+
+        strncpy(data->fan_dir, fan_dir+1, ARRAY_SIZE(data->fan_dir)-1);
+        data->fan_dir[ARRAY_SIZE(data->fan_dir)-1] = '\0';
+
+        /* Read mfr_id */
+        command = 0x99;
+        status = ym2651y_read_block(client, command, data->mfr_id,
+                                    ARRAY_SIZE(data->mfr_id)-1);
+        data->mfr_id[ARRAY_SIZE(data->mfr_id)-1] = '\0';
+
+        if (status < 0)
+            dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
+
+        /* Read mfr_model */
+        command = 0x9a;
+        status = ym2651y_read_block(client, command, data->mfr_model,
+                                    ARRAY_SIZE(data->mfr_model)-1);
+        data->mfr_model[ARRAY_SIZE(data->mfr_model)-1] = '\0';
+
+        if (status < 0)
+            dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
+
+        /* Read mfr_revsion */
+        command = 0x9b;
+        status = ym2651y_read_block(client, command, data->mfr_revsion,
+                                    ARRAY_SIZE(data->mfr_revsion)-1);
+        data->mfr_revsion[ARRAY_SIZE(data->mfr_revsion)-1] = '\0';
+
+        if (status < 0)
+            dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
+
+        data->last_updated = jiffies;
+        data->valid = 1;
+    }
+
+    mutex_unlock(&data->update_lock);
+
+    return data;
+}
+
+module_i2c_driver(ym2651y_driver);
+
+MODULE_AUTHOR("Michael Shih <michael_shih@edge-core.com>");
+MODULE_DESCRIPTION("3Y Power YM-2651Y driver");
+MODULE_LICENSE("GPL");
+
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-fan.service b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-fan.service
new file mode 100644
index 000000000000..ac0114c8f507
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-fan.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Accton AS9726_32D Platform Monitoring FAN service
+Before=pmon.service
+After=as9726-32d-platform-monitor.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/local/bin/accton_as9726_32d_monitor_fan.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-psu.service b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-psu.service
new file mode 100644
index 000000000000..916219c9f7de
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor-psu.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Accton AS9726_32D Platform Monitoring PSU service
+Before=pmon.service
+After=as9726-32d-platform-monitor.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/local/bin/accton_as9726_32d_monitor_psu.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor.service b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor.service
new file mode 100644
index 000000000000..072a8227e7e9
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/service/as9726-32d-platform-monitor.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Accton AS9726_32D Platform Monitoring service
+Before=pmon.service
+After=sysinit.target
+DefaultDependencies=no
+
+[Service]
+ExecStartPre=/usr/local/bin/accton_as9726_32d_util.py install
+ExecStart=/usr/local/bin/accton_as9726_32d_monitor.py
+KillSignal=SIGKILL
+SuccessExitStatus=SIGKILL
+
+# Resource Limitations
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
new file mode 100755
index 000000000000..7b84a9cab7ec
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='as9726_32d',
+    version='1.0',
+    description='Module to initialize Accton AS9726_32D platforms',
+
+    packages=['as9726_32d'],
+    package_dir={'as9726_32d': 'as9726-32d/classes'},
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/sonic_platform_setup.py
new file mode 100644
index 000000000000..474094b28dcb
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/sonic_platform_setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+DEVICE_NAME = 'accton'
+HW_SKU = 'x86_64-accton_as9726_32d-r0'  
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Accton Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='Michael Shih',
+    maintainer_email='michael_shih@edge-core.com',
+    packages=[
+        'sonic_platform',
+    ],
+    package_dir={
+        'sonic_platform': '../../../../device/{}/{}/sonic_platform'.format(DEVICE_NAME, HW_SKU)},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/README b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/README
new file mode 100755
index 000000000000..16efca9ef848
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/README
@@ -0,0 +1,65 @@
+Copyright (C) 2019 Accton Networks, Inc.
+
+This program is free software: you can redistribute it and/or modify
+It under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+All Linux kernel code is licensed under the GPLv1. All other code is
+licensed under the GPLv3. Please see the LICENSE file for copies of
+both licenses.
+
+The code for integacting with Accton AS9726-32D has 2 parts, 
+kernel drivers and operational script. 
+The kernel drivers of peripherals are under module/ directory.
+1.  These drivers are at module dir.
+2.  A operational script, accton_as9726_32d_util.py, for device initializatian and 
+    peripheral accessing should be installed at /usr/bin. 
+    Run "accton_as9726_32d_util.py install" to install drivers.
+
+To initialize the system, run "accton_as9726_32d_util.py install".
+To clean up the drivers & devices, run "accton_as9726_32d_util.py clean".
+To dump information of sensors, run "accton_as9726_32d_util.py show".
+To dump SFP EEPROM, run "accton_as9726_32d_util.py sff".
+To set fan speed, run "accton_as9726_32d_util.py set fan".
+To enable/disable SFP emission, run "accton_as9726_32d_util.py set sfp".
+To set system LEDs' color, run "accton_as9726_32d_util.py set led"
+For more information, run "accton_as9726_32d_util.py --help".
+
+====================================================================
+Besides applying accton_as9726_32d_util.py to access peripherals, you can 
+access peripherals by sysfs nodes directly after the installation is run.
+
+System LED:
+    There are 5 system LEDs at the lower-left corner of front panel.
+    They are  loc, diag, psu1, psu2 and fan. 
+    The sysfs interface color mappings are as follows:
+    Brightness:
+        0 => off
+        1 => green
+        2 => amber
+    But not all colors are available for each LED.
+
+Fan Control:
+    There are 12 fans inside 6 fan modules.
+    All fans share 1 duty setting, ranged from 0~100.
+
+Thermal sensers:
+    6 temperature sensors are controlled by the lm75 kernel modules. 
+
+PSUs:
+    There 2 power supplies slot at the left/right side of the back.
+    Once if a PSU is not plugged, the status of it is shown failed.
+
+There are 32 QSFP56-DD and 2 SFP+ modules are equipped. 
+Before operating on PSU and QSFP+, please make sure it is well plugged. 
+Otherwise, operation is going to fail.
+
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor.py
new file mode 100755
index 000000000000..9d91e942baa2
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor.py
@@ -0,0 +1,565 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*
+# Copyright (c) 2019 Edgecore Networks Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT
+# LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS
+# FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
+#
+# See the Apache Version 2.0 License for specific language governing
+# permissions and limitations under the License.
+# 
+# HISTORY:
+#    mm/dd/yyyy (A.D.)#   
+#    04/23/2021: Michael_Shih create for as9726_32d thermal plan
+# ------------------------------------------------------------------
+
+try:
+    import commands
+    import getopt
+    import sys
+    import logging
+    import logging.config
+    import logging.handlers
+    import time  # this is only being used as part of the example
+    from as9726_32d.fanutil import FanUtil
+    from as9726_32d.thermalutil import ThermalUtil
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as9726_32d_monitor'
+
+class switch(object):
+    def __init__(self, value):
+        self.value = value
+        self.fall = False
+ 
+    def __iter__(self):
+        """Return the match method once, then stop"""
+        yield self.match
+        raise StopIteration
+     
+    def match(self, *args):
+        """Indicate whether or not to enter a case suite"""
+        if self.fall or not args:
+            return True
+        elif self.value in args: # changed for v1.5, see below
+            self.fall = True
+            return True
+        else:
+            return False
+
+
+
+# Read fanN_direction=1: The air flow of Fan6 is “AFI-Back to Front”
+#                     0: The air flow of Fan6 is “AFO-Front to back”
+#
+# Thermal policy:
+# a.Defaut fan duty_cycle=100%
+# b.One fan fail, set to fan duty_cycle=100%
+# 1.For AFI:
+#   Default fan duty_cycle will be 100%(fan_policy_state=LEVEL_FAN_MAX).
+#   If all below case meet with, set to 75%(LEVEL_FAN_MID).
+#   MB board
+#   (MB board)
+#   LM75-1(0X48)>=49.5
+#   LM75-2(0X49)>=42.9
+#   LM75-3(0X4A)>=46.3
+#   LM75-4(0X4C)>=40.1
+#   LM75-6(0X4F)>=39.4
+#   (CPU board)
+#   Core>=46
+#   LM75-1(0X4B)>=34.8
+
+#   When fan_policy_state=LEVEL_FAN_MID, meet with below case,  Fan duty_cycle will be 100%(LEVEL_FAN_DAX)
+#   (MB board)
+#   LM75-1(0X48)>=55.9
+#   LM75-2(0X49)>=48.8
+#   LM75-3(0X4A)>=51.5
+#   LM75-4(0X4C)>=45.3
+#   LM75-6(0X4F)>=43.4
+#   (CPU board)
+#   Core>=50
+#   LM75-1(0X4B)>=43.4
+
+#Yellow Alarm
+#MB board
+#LM75-1(0X48)>=57.9
+#LM75-2(0X49)>=51.9
+#LM75-3(0X4A)>=48.9
+#LM75-4(0X4C)>=55.9
+#LM75-6(0X4F)>=48.5
+#CPU Board
+#Core>=52
+#LM75-1(0X4B)>=41.8
+
+#Red Alarm
+#MB board
+#LM75-1(0X48)>=62.9
+#LM75-2(0X49)>=56.9
+#LM75-3(0X4A)>=53.9
+#LM75-4(0X4C)>=58.9
+#LM75-6(0X4F)>=53.5
+#CPU Board
+#Core>=57
+#LM75-1(0X4B)>=46.8
+
+#Shut down
+#MB board
+#LM75-1(0X48)>=67.9
+#LM75-2(0X49)>=61.9
+#LM75-3(0X4A)>=58.9
+#LM75-4(0X4C)>=63.9
+#LM75-6(0X4F)>=58.5
+#CPU Board
+#Core>=62
+#LM75-1(0X4B)>=51.8
+ 
+# 2. For AFO:
+#  At default, FAN duty_cycle was 100%(LEVEL_FAN_MAX). If all below case meet with, set to 75%(LEVEL_FAN_MID).
+# (MB board)
+# LM75-1(0X48)<=56
+# LM75-2(0X49)<=53.5
+# LM75-3(0X4A)<=52.5
+# LM75-4(0X4C)<=52
+# LM75-6(0X4F)<=52.8
+# (CPU board)
+# Core<=62
+# LM75-1(0X4B)<=45.8
+
+# When FAN duty_cycle was 75%(LEVEL_FAN_MID). If all below case meet with, set to 50%(LEVEL_FAN_DEF).
+# (MB board)
+# LM75-1(0X48)<=50
+# LM75-2(0X49)<=47.3
+# LM75-3(0X4A)<=46.4
+# LM75-4(0X4C)<=44.6
+# LM75-6(0X4F)<=47
+# (CPU board)
+# Core<=56
+# LM75-1(0X4B)<=38.8
+ 
+# When fan_speed 50%(LEVEL_FAN_DEF).
+# Meet with below case, Fan duty_cycle will be 75%(LEVEL_FAN_MID)
+# (MB board)
+# LM75-1(0X48)>=63
+# LM75-2(0X49)>=60.5
+# LM75-3(0X4A)>=60
+# LM75-4(0X4C)>=60
+# LM75-6(0X4F)>=61
+# (CPU board)
+# Core>=72
+# LM75-1(0X4B)>=50
+
+# When FAN duty_cycle was 75%(LEVEL_FAN_MID). If all below case meet with, set to 100%(LEVEL_FAN_MAX).
+# (MB board)
+# LM75-1(0X48)>=63
+# LM75-2(0X49)>=60
+# LM75-3(0X4A)>=60
+# LM75-4(0X4C)>=59
+# LM75-6(0X4F)>=60
+
+# (CPU board)
+# Core >=69
+# LM75-1(0X4B)>=51.5
+
+
+#Yellow Alarm
+#MB board
+#LM75-1(0X48)>=67
+#LM75-2(0X49)>=65
+#LM75-3(0X4A)>=64
+#LM75-4(0X4C)>=62
+#LM75-6(0X4F)>=64
+#CPU Board
+#Core>=73
+#LM75-1(0X4B)>=67
+
+#Red Alarm
+#MB board
+#LM75-1(0X48)>=72
+#LM75-2(0X49)>=70
+#LM75-3(0X4A)>=69
+#LM75-4(0X4C)>=67
+#LM75-6(0X4F)>=69
+#CPU Board
+#Core>=78
+#LM75-1(0X4B)>=72
+
+#Shut down
+#MB board
+#LM75-1(0X48)>=77
+#LM75-2(0X49)>=75
+#LM75-3(0X4A)>=74
+#LM75-4(0X4C)>=72
+#LM75-6(0X4F)>=74
+#CPU Board
+#Core>=83
+#LM75-1(0X4B)>=77
+
+def power_off_dut():
+    cmd_str="i2cset -y -f 1 0x60 0x60 0x10"
+    status, output = commands.getstatusoutput(cmd_str)
+    return status
+
+#If only one PSU insert(or one of PSU pwoer fail), and watt >800w. Must let DUT fan pwm >= 75% in AFO.
+# Because the psu temp is high.
+# Return 1: full load
+# Return 0: Not full load
+def check_psu_loading():
+    psu_power_status=[1, 1]
+            
+    psu_power_good = {
+        2: "/sys/bus/i2c/devices/9-0051/psu_power_good",
+        1: "/sys/bus/i2c/devices/9-0050/psu_power_good",
+    }
+    psu_power_out = {
+        2: "/sys/bus/i2c/devices/9-0059/psu_p_out",
+        1: "/sys/bus/i2c/devices/9-0058/psu_p_out",
+    }
+    
+    check_psu_watt=0
+    for i in range(1,3):
+        node = psu_power_good[i]
+        try:
+            with open(node, 'r') as power_status:
+                status = int(power_status.read())
+        except IOError:
+            return None
+            
+        psu_power_status[i-1]=int(status)
+        if status==0:
+            check_psu_watt=1           
+    
+    if check_psu_watt:
+        for i in range(1,3):
+            if psu_power_status[i-1]==1:
+              #check watt
+                node = psu_power_out[i]
+                try:
+                    with open(node, 'r') as power_status:
+                        status = int(power_status.read())
+                except IOError:
+                    return None
+                psu_p_out= int(status)
+                if psu_p_out/1000 > 800:
+                    return True
+    else:
+        return False
+    
+    
+    return False
+
+fan_policy_state=0
+fan_policy_alarm=0
+send_yellow_alarm=0
+send_red_alarm=0
+fan_fail=0
+count_check=0
+
+test_temp = 0
+test_temp_list = [0, 0, 0, 0, 0, 0, 0]
+temp_test_data=0
+test_temp_revert=0
+
+# Make a class we can use to capture stdout and sterr in the log
+class device_monitor(object):
+    # static temp var
+    temp = 0
+    new_duty_cycle = 0
+    duty_cycle=0
+    ori_duty_cycle = 0
+   
+
+    def __init__(self, log_file, log_level):
+        """Needs a logger and a logger level."""
+
+        self.thermal = ThermalUtil()
+        self.fan = FanUtil()
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format= '[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S'
+        )
+        # set up logging to console
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(log_level)
+            formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(address = '/dev/log')
+        sys_handler.setLevel(logging.WARNING)       
+        logging.getLogger('').addHandler(sys_handler)
+        #logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
+          
+    
+    def manage_fans(self):
+       
+        global fan_policy_state
+        global fan_policy_alarm
+        global send_yellow_alarm
+        global send_red_alarm
+        global fan_fail
+        global count_check
+        global test_temp
+        global test_temp_list
+        global temp_test_data
+        global test_temp_revert
+      
+        CHECK_TIMES=3
+           
+        LEVEL_FAN_INIT=0
+        LEVEL_FAN_MIN=1
+        LEVEL_FAN_MID=2       
+        LEVEL_FAN_MAX=3
+        LEVEL_FAN_YELLOW_ALARM=4
+        LEVEL_FAN_RED_ALARM=5
+        LEVEL_FAN_SHUTDOWN=6
+    
+        fan_policy_f2b = {  #AFO
+            LEVEL_FAN_MIN: [50,  0x7],
+            LEVEL_FAN_MID: [75,  0xb],
+            LEVEL_FAN_MAX: [100, 0xf]
+        }
+        fan_policy_b2f = { #AFI
+            LEVEL_FAN_MID: [75,  0xb],
+            LEVEL_FAN_MAX: [100, 0xf]
+        }
+         
+        afi_thermal_spec={
+            "mid_to_max_temp":[61500, 51500, 49400, 49400, 45100, 46750, 48000, 38500],
+            "max_to_mid_temp":[57000, 47300, 45000, 45100, 40750, 42100, 44000, 35000],
+            "max_to_yellow_alarm":   [57900, 51900, 48900, 55900, 48500, 52000, 41800], 
+            "yellow_to_red_alarm":   [62900, 56900, 53900, 58900, 53500, 57000, 46800], 
+            "red_alarm_to_shutdown": [67900, 61900, 58900, 63900, 58500, 62000, 51800]
+        }
+        afo_thermal_spec={
+            "min_to_mid_temp": [63000, 60500, 60000, 60000, 61000, 72000, 50000],
+            "mid_to_max_temp": [63000, 60000, 60000, 59000, 60000, 69000, 51500],
+            "max_to_mid_temp": [56000, 53500, 52500, 52000, 52800, 62000, 45800],
+            "mid_to_min_temp": [50000, 47300, 46400, 44600, 47000, 56000, 38800],
+            "max_to_yellow_alarm":   [67000, 65000, 64000, 62000, 64000, 73000, 67000], 
+            "yellow_to_red_alarm":   [72000, 70000, 69000, 67000, 69000, 78000, 72000], 
+            "red_alarm_to_shutdown": [77000, 75000, 74000, 72000, 74000, 83000, 77000] 
+        }
+
+        thermal_val=[0,0,0,0,0,0,0]        
+        max_to_mid=0
+        mid_to_min=0
+        
+        fan = self.fan
+        if fan_policy_state==LEVEL_FAN_INIT:
+            fan_policy_state=LEVEL_FAN_MAX #This is default state
+            logging.debug("fan_policy_state=LEVEL_FAN_MAX")
+            return
+    
+        count_check=count_check+1
+        if count_check < CHECK_TIMES:
+            return
+        else:
+            count_check=0
+        
+        thermal = self.thermal
+        fan_dir=fan.get_fan_dir(1)
+       
+        if fan_dir==1:   # AFI
+            fan_thermal_spec = afi_thermal_spec
+            fan_policy=fan_policy_b2f
+        elif fan_dir==0: # AFO
+            fan_thermal_spec = afo_thermal_spec
+            fan_policy=fan_policy_f2b           
+        else:
+            logging.debug( "NULL case")
+        
+        ori_duty_cycle=fan.get_fan_duty_cycle()
+        new_duty_cycle=0
+
+        if test_temp_revert==0:
+            temp_test_data=temp_test_data+2000
+        else:            
+            temp_test_data=temp_test_data-2000
+            
+        if test_temp==0:
+            for i in range (thermal.THERMAL_NUM_1_IDX, thermal.THERMAL_NUM_MAX+1):
+                thermal_val[i-1]=thermal._get_thermal_val(i)
+        else:
+            for i in range (thermal.THERMAL_NUM_1_IDX, thermal.THERMAL_NUM_MAX+1):
+                thermal_val[i-1]=test_temp_list[i-1]
+                thermal_val[i-1]= thermal_val[i-1] + temp_test_data
+            logging.debug(thermal_val)
+            fan_fail=0
+       
+        ori_state=fan_policy_state;
+        current_state=fan_policy_state;
+       
+        if fan_dir==1: #AFI
+            for i in range (0, thermal.THERMAL_NUM_MAX):
+                if ori_state==LEVEL_FAN_MID:
+                    if thermal_val[i] >= fan_thermal_spec["mid_to_max_temp"][i]:
+                        current_state=LEVEL_FAN_MAX
+                        logging.debug("current_state=LEVEL_FAN_MAX")
+                        break
+                else:
+                    if (thermal_val[i] <= fan_thermal_spec["max_to_mid_temp"][i]):
+                        max_to_mid=max_to_mid+1
+                    if fan_policy_alarm==0: 
+                        if thermal_val[i] >= fan_thermal_spec["max_to_yellow_alarm"][i]:
+                            if send_yellow_alarm==0:
+                                logging.warning('Alarm-Yellow for temperature high is detected')
+                                fan_policy_alarm=LEVEL_FAN_YELLOW_ALARM
+                                send_yellow_alarm=1
+                    elif fan_policy_alarm==LEVEL_FAN_YELLOW_ALARM:
+                        if thermal_val[i] >= fan_thermal_spec["yellow_to_red_alarm"][i]:
+                            if send_red_alarm==0:
+                                logging.warning('Alarm-Red for temperature high is detected')
+                                fan_policy_alarm=LEVEL_FAN_RED_ALARM
+                                send_red_alarm=1
+                    elif fan_policy_alarm==LEVEL_FAN_RED_ALARM:
+                        if thermal_val[i] >= fan_thermal_spec["red_alarm_to_shutdown"][i]:
+                            logging.critical('Alarm-Critical for temperature high is detected, shutdown DUT')                            
+                            fan_policy_alarm=LEVEL_FAN_SHUTDOWN
+                            time.sleep(2)
+                            power_off_dut()
+        
+            if max_to_mid==thermal.THERMAL_NUM_MAX and  fan_policy_state==LEVEL_FAN_MAX:
+                current_state=LEVEL_FAN_MID
+                if fan_policy_alarm!=0:
+                    logging.warning('Alarm for temperature high is cleared')
+                    fan_policy_alarm=0
+                    send_yellow_alarm=0
+                    send_red_alarm=0
+                    test_temp_revert=0
+                logging.debug("current_state=LEVEL_FAN_MID")
+                
+        else: #AFO
+            psu_full_load=check_psu_loading()
+            for i in range (0, thermal.THERMAL_NUM_MAX):
+                if ori_state==LEVEL_FAN_MID:
+                    if thermal_val[i] >= fan_thermal_spec["mid_to_max_temp"][i]:
+                        current_state=LEVEL_FAN_MAX
+                        break
+                    else:
+                        if psu_full_load!=True and thermal_val[i] <= fan_thermal_spec["mid_to_min_temp"][i]:
+                            mid_to_min=mid_to_min+1
+
+                elif ori_state==LEVEL_FAN_MIN:
+                    if psu_full_load==True:
+                        current_state=LEVEL_FAN_MID
+                        logging.debug("psu_full_load, set current_state=LEVEL_FAN_MID")
+                    if thermal_val[i] >= fan_thermal_spec["min_to_mid_temp"][i]:
+                        current_state=LEVEL_FAN_MID
+
+                else:
+                    if thermal_val[i] <= fan_thermal_spec["max_to_mid_temp"][i] :
+                        max_to_mid=max_to_mid+1
+                    if fan_policy_alarm==0: 
+                        if thermal_val[i] >= fan_thermal_spec["max_to_yellow_alarm"][i]:
+                            if send_yellow_alarm==0:
+                                logging.warning('Alarm-Yellow for temperature high is detected')
+                                fan_policy_alarm=LEVEL_FAN_YELLOW_ALARM
+                                send_yellow_alarm=1
+                    elif fan_policy_alarm==LEVEL_FAN_YELLOW_ALARM:
+                        if thermal_val[i] >= fan_thermal_spec["yellow_to_red_alarm"][i]:
+                            if send_red_alarm==0:
+                                logging.warning('Alarm-Red for temperature high is detected')
+                                fan_policy_alarm=LEVEL_FAN_RED_ALARM
+                                send_red_alarm=1
+                    elif fan_policy_alarm==LEVEL_FAN_RED_ALARM:
+                        if thermal_val[i] >= fan_thermal_spec["red_alarm_to_shutdown"][i]:
+                            logging.critical('Alarm-Critical for temperature high is detected, shutdown DUT')                            
+                            fan_policy_alarm=LEVEL_FAN_SHUTDOWN
+                            time.sleep(2)
+                            power_off_dut()
+                        
+            if max_to_mid==thermal.THERMAL_NUM_MAX and ori_state==LEVEL_FAN_MAX:
+                current_state=LEVEL_FAN_MID
+                if fan_policy_alarm!=0:
+                    logging.warning('Alarm for temperature high is cleared')
+                    fan_policy_alarm=0
+                    send_yellow_alarm=0
+                    send_red_alarm=0
+                    test_temp_revert=0
+                logging.debug("current_state=LEVEL_FAN_MID")
+            
+            if mid_to_min==thermal.THERMAL_NUM_MAX and ori_state==LEVEL_FAN_MID:
+                if psu_full_load==0:
+                    current_state=LEVEL_FAN_MIN
+                    logging.debug("current_state=LEVEL_FAN_MIN")
+           
+        #Check Fan fault status. True: fan not fault/present, 1: fan fault/un-present
+        for i in range (fan.FAN_NUM_1_IDX, fan.FAN_NUM_ON_MAIN_BROAD+1):
+            if fan.get_fan_status(i)==False:
+                new_duty_cycle=100
+                current_state=LEVEL_FAN_MAX
+                logging.debug('fan_%d fail, set duty_cycle to 100',i)                
+                if test_temp==0:
+                    fan_fail=1
+                    fan.set_fan_duty_cycle(new_duty_cycle)
+                    break
+            else:
+                fan_fail=0
+
+        if current_state!=ori_state:
+            fan_policy_state=current_state
+            new_duty_cycle=fan_policy[current_state][0]
+            logging.debug("fan_policy_state=%d, new_duty_cycle=%d", fan_policy_state, new_duty_cycle)
+            if new_duty_cycle!=ori_duty_cycle and fan_fail==0:
+                fan.set_fan_duty_cycle(new_duty_cycle)
+                return True
+            if new_duty_cycle==0 and fan_fail==0:
+                fan.set_fan_duty_cycle(FAN_DUTY_CYCLE_MAX)
+
+        return True
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    global test_temp
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv,'hdlt:',['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg            
+        
+        if sys.argv[1]== '-t':
+            if len(sys.argv)!=9:
+                print "temp test, need input 7 temp"
+                return 0
+            i=0
+            for x in range(2, 9):
+               test_temp_list[i]= int(sys.argv[x])*1000
+               i=i+1
+            test_temp = 1
+            log_level = logging.DEBUG
+            print test_temp_list
+    
+    fan = FanUtil()
+    fan.set_fan_duty_cycle(100)
+    monitor = device_monitor(log_file, log_level)
+    # Loop forever, doing something useful hopefully:
+    while True:
+        monitor.manage_fans()
+        time.sleep(3)
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_fan.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_fan.py
new file mode 100755
index 000000000000..0e3d8ee08a63
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_fan.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Accton Technology Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    04/23/2021:  Michael_Shih create for as9726-32d
+# ------------------------------------------------------------------
+
+try:
+    import getopt
+    import sys
+    import logging
+    import logging.config
+    import logging.handlers
+    import time  # this is only being used as part of the example
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as9726_32d_monitor_fan'
+
+class switch(object):
+    def __init__(self, value):
+        self.value = value
+        self.fall = False
+ 
+    def __iter__(self):
+        """Return the match method once, then stop"""
+        yield self.match
+        raise StopIteration
+     
+    def match(self, *args):
+        """Indicate whether or not to enter a case suite"""
+        if self.fall or not args:
+            return True
+        elif self.value in args: # changed for v1.5, see below
+            self.fall = True
+            return True
+        else:
+            return False
+
+
+fan_state=[2, 2, 2, 2, 2, 2]  #init state=2, insert=1, remove=0
+fan_status_state=[2, 2, 2, 2, 2, 2]  #init state=2, fault=1, normal=0
+# Make a class we can use to capture stdout and sterr in the log
+class device_monitor(object):
+
+    def __init__(self, log_file, log_level):
+        
+        self.fan_num = 6
+        self.fan_path = "/sys/bus/i2c/devices/14-0066/"        
+        self.present = {
+            0: "fan1_present",
+            1: "fan2_present",
+            2: "fan3_present",
+            3: "fan4_present",
+            4: "fan5_present",
+            5: "fan6_present",
+        }
+        
+        self.fault = {
+            0: "fan1_fault",
+            1: "fan2_fault",
+            2: "fan3_fault",
+            3: "fan4_fault",
+            4: "fan5_fault",
+            5: "fan6_fault",
+        }
+        
+        
+        """Needs a logger and a logger level."""
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format= '[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S'
+        )
+        
+        # set up logging to console
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(logging.DEBUG)
+            formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(address = '/dev/log')
+        #sys_handler.setLevel(logging.WARNING)       
+        sys_handler.setLevel(logging.INFO)       
+        logging.getLogger('').addHandler(sys_handler)
+        
+
+        #logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
+        
+    def manage_fan(self):      
+        
+        FAN_STATE_REMOVE = 0
+        FAN_STATE_INSERT = 1
+        
+        FAN_STATUS_FAULT = 1
+        FAN_STATUS_NORMAL = 0
+        
+        global fan_state
+        global fan_status_state
+        
+        for idx in range (0, self.fan_num):           
+            node = self.fan_path + self.present[idx]
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)          
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if fan_state[idx]!=1:
+                    fan_state[idx]=FAN_STATE_INSERT
+                    logging.info("FAN-%d present is detected", idx+1);
+            else:
+                if fan_state[idx]!=0:
+                    fan_state[idx]=FAN_STATE_REMOVE
+                    logging.warning("Alarm for FAN-%d absent is detected", idx+1)  
+                                    
+        for idx in range (0, self.fan_num):           
+            node = self.fan_path + self.fault[idx]
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)          
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if fan_status_state[idx]!=FAN_STATUS_FAULT:                    
+                    if fan_state[idx] == FAN_STATE_INSERT:
+                        logging.warning("Alarm for FAN-%d failed is detected", idx+1);
+                        fan_status_state[idx]=FAN_STATUS_FAULT
+            else:
+                fan_status_state[idx]=FAN_STATUS_NORMAL
+      
+        return True
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv,'hdl:',['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg
+    monitor = device_monitor(log_file, log_level)
+    while True:
+        monitor.manage_fan()
+        time.sleep(3)
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_psu.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_psu.py
new file mode 100755
index 000000000000..d9159c38bcf1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_monitor_psu.py
@@ -0,0 +1,159 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Accton Technology Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    04/23/2021:  Michael_shih create for as9726-32d
+# ------------------------------------------------------------------
+
+try:
+    import getopt
+    import sys
+    import logging
+    import logging.config
+    import logging.handlers
+    import time  # this is only being used as part of the example
+except ImportError as e:
+    raise ImportError('%s - required module not found' % str(e))
+
+# Deafults
+VERSION = '1.0'
+FUNCTION_NAME = '/usr/local/bin/accton_as9726_32d_monitor_psu'
+
+psu_state=[2, 2]
+psu_status_state=[2, 2]
+# Make a class we can use to capture stdout and sterr in the log
+class device_monitor(object):
+
+    def __init__(self, log_file, log_level):
+        
+        self.psu_num = 2
+        self.psu_path = "/sys/bus/i2c/devices/"
+        self.presence = "/psu_present"
+        self.oper_status = "/psu_power_good"
+        self.mapping = {
+            0: "9-0050",
+            1: "9-0051",
+        }
+        
+        """Needs a logger and a logger level."""
+        # set up logging to file
+        logging.basicConfig(
+            filename=log_file,
+            filemode='w',
+            level=log_level,
+            format= '[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s',
+            datefmt='%H:%M:%S'
+        )
+        # set up logging to console
+        
+        if log_level == logging.DEBUG:
+            console = logging.StreamHandler()
+            console.setLevel(log_level)
+            formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+            console.setFormatter(formatter)
+            logging.getLogger('').addHandler(console)
+
+        sys_handler = logging.handlers.SysLogHandler(address = '/dev/log')
+        #sys_handler.setLevel(logging.WARNING)       
+        sys_handler.setLevel(logging.INFO)       
+        logging.getLogger('').addHandler(sys_handler)
+
+        #logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
+        
+    def manage_psu(self):      
+        
+        PSU_STATE_REMOVE = 0
+        PSU_STATE_INSERT = 1
+        
+        PSU_STATUS_NO_POWER = 0
+        PSU_STATUS_POWER_GOOD = 1
+        PSU_STATUS_IDLE =2
+        
+        global psu_state
+        
+        for idx in range (0, self.psu_num):           
+            node = self.psu_path + self.mapping[idx] + self.presence
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)          
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "1":
+                if psu_state[idx]!=1:
+                    psu_state[idx]=PSU_STATE_INSERT
+                    logging.info("PSU-%d present is detected", idx+1);
+                    #psu_status_state[idx]=PSU_STATUS_POWER_GOOD #when insert, assume power is good. If no_power, next code will find it.
+            else:
+                if psu_state[idx]!=0:
+                    psu_state[idx]=PSU_STATE_REMOVE
+                    logging.warning("Alarm for PSU-%d absent is detected", idx+1);
+                    psu_status_state[idx]=PSU_STATUS_IDLE
+        
+        for idx in range (0, self.psu_num):           
+            node = self.psu_path + self.mapping[idx] + self.oper_status
+            try:
+                val_file = open(node)
+            except IOError as e:
+                print "Error: unable to open file: %s" % str(e)          
+                return False
+            content = val_file.readline().rstrip()
+            val_file.close()
+            # content is a string, either "0" or "1"
+            if content == "0":
+                if psu_status_state[idx]!=PSU_STATUS_NO_POWER:
+                    if psu_state[idx]==PSU_STATE_INSERT:
+                        logging.warning("Alarm for PSU-%d failed is detected", idx+1);
+                        psu_status_state[idx]=PSU_STATUS_NO_POWER
+            else:
+                if psu_state[idx]==PSU_STATE_INSERT:
+                    if psu_status_state[idx]!=PSU_STATUS_POWER_GOOD:
+                        logging.info("PSU-%d power_good is detected", idx+1);
+                        psu_status_state[idx]=PSU_STATUS_POWER_GOOD
+                    
+      
+        return True
+
+def main(argv):
+    log_file = '%s.log' % FUNCTION_NAME
+    log_level = logging.INFO
+    if len(sys.argv) != 1:
+        try:
+            opts, args = getopt.getopt(argv,'hdl:',['lfile='])
+        except getopt.GetoptError:
+            print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+            return 0
+        for opt, arg in opts:
+            if opt == '-h':
+                print 'Usage: %s [-d] [-l <log_file>]' % sys.argv[0]
+                return 0
+            elif opt in ('-d', '--debug'):
+                log_level = logging.DEBUG
+            elif opt in ('-l', '--lfile'):
+                log_file = arg
+    monitor = device_monitor(log_file, log_level)
+    # Loop forever, doing something useful hopefully:
+    while True:
+        monitor.manage_psu()
+        time.sleep(3)
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_util.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_util.py
new file mode 100755
index 000000000000..d686a77b91c5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/utils/accton_as9726_32d_util.py
@@ -0,0 +1,680 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2016 Accton Networks, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Usage: %(scriptName)s [options] command object
+options:
+    -h | --help     : this help message
+    -d | --debug    : run with debug mode
+    -f | --force    : ignore error during installation or clean
+command:
+    install     : install drivers and generate related sysfs nodes
+    clean       : uninstall drivers and remove related sysfs nodes
+    show        : show all systen status
+    sfp         : dump SFP eeprom
+    set         : change board setting with fan|sfp
+"""
+
+import commands
+import getopt
+import sys
+import logging
+import re
+import time
+import os
+
+PROJECT_NAME = 'as9726_32d'
+version = '0.0.1'
+verbose = False
+DEBUG = False
+args = []
+ALL_DEVICE = {}
+DEVICE_NO = {
+    'fan1': 3,
+    'fan2': 3,
+    'fan3': 3,
+    'fan4': 3,
+    'fan5': 3,
+    'fan6': 3,
+    'thermal': 6,
+    'psu': 2,
+    'sfp': 34}
+
+fan_prefix = '/sys/devices/platform/as9726_32d_'
+hwmon_types = {'fan1': ['fan'],
+               'fan2': ['fan'],
+               'fan3': ['fan'],
+               'fan4': ['fan'],
+               'fan5': ['fan'],
+               'fan6': ['fan'],
+               }
+hwmon_nodes = {
+    'fan1': [
+        'fan_duty_cycle_percentage',
+        'fan1_fault',
+        'fan1_front_speed_rpm',
+        'fan1_direction',
+        'fan1_rear_speed_rpm'],
+    'fan2': [
+        'fan_duty_cycle_percentage',
+        'fan2_fault',
+        'fan2_front_speed_rpm',
+        'fan2_direction',
+        'fan2_rear_speed_rpm'],
+    'fan3': [
+        'fan_duty_cycle_percentage',
+        'fan3_fault',
+        'fan3_front_speed_rpm',
+        'fan3_direction',
+        'fan3_rear_speed_rpm'],
+    'fan4': [
+        'fan4_duty_cycle_percentage',
+        'fan4_fault',
+        'fan4_front_speed_rpm',
+        'fan4_direction',
+        'fan4_rear_speed_rpm'],
+    'fan5': [
+        'fan_duty_cycle_percentage',
+        'fan5_fault',
+        'fan5_front_speed_rpm',
+        'fan5_direction',
+        'fan5_rear_speed_rpm'],
+    'fan6': [
+        'fan_duty_cycle_percentage',
+        'fan6_fault',
+        'fan6_front_speed_rpm',
+        'fan6_direction',
+        'fan6_rear_speed_rpm'],
+}
+hwmon_prefix = {'fan1': fan_prefix,
+                'fan2': fan_prefix,
+                'fan3': fan_prefix,
+                'fan4': fan_prefix,
+                'fan5': fan_prefix,
+                'fan6': fan_prefix,
+                }
+
+i2c_prefix = '/sys/bus/i2c/devices/'
+i2c_bus = {'fan': ['14-0066'],
+           'thermal': ['15-0048', '15-0049', '15-004a', '15-004b', '15-004c', '15-004f'],
+           'psu': ['9-0050', '9-0051'],
+           'sfp': ['10-0061', '10-0062']}
+i2c_nodes = {'fan': ['present', 'front_speed_rpm', 'rear_speed_rpm'],
+             'thermal': ['hwmon/hwmon*/temp1_input'],
+             'psu': ['psu_present ', 'psu_power_good'],
+             'sfp': ['module_present_', 'module_tx_disable_']}
+
+sfp_map = [17, 18, 19, 20, 21, 22, 23, 24,
+           25, 26, 27, 28, 29, 30, 31, 32,
+           33, 34, 35, 36, 37, 38, 39, 40,
+           41, 42, 43, 44, 45, 46, 47, 48,
+           49, 50]
+
+mknod = [
+    # i2c-mux
+    'echo pca9548 0x77 > /sys/bus/i2c/devices/i2c-0/new_device',
+    'echo pca9548 0x71 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x72 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x73 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x74 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x75 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo pca9548 0x76 > /sys/bus/i2c/devices/i2c-1/new_device',
+
+    # CPLD
+    'echo as9726_32d_cpld_cpu 0x65 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo as9726_32d_fpga 0x60 > /sys/bus/i2c/devices/i2c-1/new_device',
+    'echo as9726_32d_cpld2 0x61 > /sys/bus/i2c/devices/i2c-10/new_device',
+    'echo as9726_32d_cpld3 0x62 > /sys/bus/i2c/devices/i2c-10/new_device',
+
+    # FAN
+    'echo as9726_32d_fan 0x66 > /sys/bus/i2c/devices/i2c-14/new_device',
+
+    # LM75
+    'echo lm75 0x48 > /sys/bus/i2c/devices/i2c-15/new_device',
+    'echo lm75 0x49 > /sys/bus/i2c/devices/i2c-15/new_device',
+    'echo lm75 0x4a > /sys/bus/i2c/devices/i2c-15/new_device',
+    'echo lm75 0x4b > /sys/bus/i2c/devices/i2c-15/new_device',
+    'echo lm75 0x4c > /sys/bus/i2c/devices/i2c-15/new_device',
+    'echo lm75 0x4f > /sys/bus/i2c/devices/i2c-15/new_device',
+
+    # PSU-1
+    'echo ym2401 0x58 > /sys/bus/i2c/devices/i2c-9/new_device',
+    'echo as9726_32d_psu1 0x50 > /sys/bus/i2c/devices/i2c-9/new_device',
+
+    # PSU-2
+    'echo ym2401 0x59 > /sys/bus/i2c/devices/i2c-9/new_device',
+    'echo as9726_32d_psu2 0x51 > /sys/bus/i2c/devices/i2c-9/new_device',
+
+    # CPU EERPOM
+    'echo 24c02 0x57 > /sys/bus/i2c/devices/i2c-1/new_device',
+    # MAINBOARD EEPROM
+    'echo 24c02 0x56 > /sys/bus/i2c/devices/i2c-13/new_device',
+]
+
+FORCE = 0
+
+def main():
+    global DEBUG
+    global args
+    global FORCE
+
+    if len(sys.argv) < 2:
+        show_help()
+
+    options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
+                                                        'debug',
+                                                        'force',
+                                                        ])
+    if DEBUG:
+        print options
+        print args
+        print len(sys.argv)
+
+    for opt, arg in options:
+        if opt in ('-h', '--help'):
+            show_help()
+        elif opt in ('-d', '--debug'):
+            DEBUG = True
+            logging.basicConfig(level=logging.INFO)
+        elif opt in ('-f', '--force'):
+            FORCE = 1
+        else:
+            print "TEST"
+            logging.info('no option')
+    for arg in args:
+        if arg == 'install':
+            do_install()
+        elif arg == 'clean':
+            do_uninstall()
+        elif arg == 'api':
+            do_sonic_platform_install()
+        elif arg == 'api_clean':   
+           do_sonic_platform_clean()
+        elif arg == 'show':
+            device_traversal()
+        elif arg == 'sff':
+            if len(args) != 2:
+                show_eeprom_help()
+            elif int(args[1]) == 0 or int(args[1]) > DEVICE_NO['sfp']:
+                show_eeprom_help()
+            else:
+                show_eeprom(args[1])
+            return
+        elif arg == 'set':
+            if len(args) < 3:
+                show_set_help()
+            else:
+                set_device(args[1:])
+            return
+        else:
+            show_help()
+
+    return 0
+
+
+def show_help():
+    print __doc__ % {'scriptName': sys.argv[0].split("/")[-1]}
+    sys.exit(0)
+
+
+def show_set_help():
+    cmd = sys.argv[0].split("/")[-1] + " " + args[0]
+    print cmd + " [sfp|fan]"
+    print "    use \"" + cmd + " fan 0-100\" to set fan duty percetage"
+    print "    use \"" + cmd + " sfp 33-34 {0|1}\" to set sfp# tx_disable"
+    sys.exit(0)
+
+
+def show_eeprom_help():
+    cmd = sys.argv[0].split("/")[-1] + " " + args[0]
+    print "    use \"" + cmd + " 1-32 \" to dump sfp# eeprom"
+    sys.exit(0)
+
+
+def my_log(txt):
+    if DEBUG:
+        print "[ACCTON DBG]: " + txt
+    return
+
+
+def log_os_system(cmd, show):
+    logging.info('Run :' + cmd)
+    output = ""
+    status, output = commands.getstatusoutput(cmd)
+    my_log(cmd + "with result:" + str(status))
+    my_log("cmd:" + cmd)
+    my_log("      output:" + output)
+    if status:
+        logging.info('Failed :' + cmd)
+        if show:
+            print('Failed :' + cmd)
+    return status, output
+
+
+def driver_inserted():
+    ret, lsmod = log_os_system("ls /sys/module/*accton*", 0)
+    logging.info('mods:' + lsmod)
+    if ret:
+        return False
+
+#'modprobe cpr_4011_4mxx',
+
+
+kos = [
+    'depmod -ae',
+    'modprobe i2c_dev',
+    'modprobe i2c_mux_pca954x force_deselect_on_exit=1',
+    'modprobe ym2651y',
+    'modprobe x86-64-accton-as9726-32d_cpld',
+    'modprobe x86-64-accton-as9726-32d_fan',
+    'modprobe x86-64-accton-as9726-32d_psu',
+    'modprobe optoe',
+    'modprobe lm75']
+
+
+def driver_install():
+    global FORCE
+
+    for i in range(0, len(kos)):
+        status, output = log_os_system(kos[i], 1)
+        if status:
+            if FORCE == 0:
+                return status
+    return 0
+
+
+def driver_uninstall():
+    global FORCE
+    for i in range(0, len(kos)):
+        rm = kos[-(i + 1)].replace("modprobe", "modprobe -rq")
+        lst = rm.split(" ")
+        print "lst=%s" % lst
+        if len(lst) > 3:
+            del(lst[3])
+        rm = " ".join(lst)
+        status, output = log_os_system(rm, 1)
+        if status:
+            if FORCE == 0:
+                return status
+    return 0
+
+
+def device_install():
+    global FORCE
+
+    for i in range(0, len(mknod)):
+        # for pca954x need times to built new i2c buses
+        if mknod[i].find('pca954') != -1:
+            time.sleep(2)
+
+        status, output = log_os_system(mknod[i], 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+    print("Check SFP")
+    for i in range(0, len(sfp_map)):
+        if(i >= (len(sfp_map)-2)):
+            opt = 'optoe2' #last 2 port is sfp
+        else:
+            opt = 'optoe1' #first 32 port is qsfp
+        status, output = log_os_system("echo " +
+                                       str(opt) +
+                                       " 0x50 > /sys/bus/i2c/devices/i2c-" +
+                                       str(sfp_map[i]) +
+                                       "/new_device", 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+        status, output = log_os_system("echo port" +
+                                       str(i) +
+                                       " > /sys/bus/i2c/devices/" +
+                                       str(sfp_map[i]) +
+                                       "-0050/port_name", 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    return
+
+
+def device_uninstall():
+    global FORCE
+
+    for i in range(0, len(sfp_map)):
+        target = "/sys/bus/i2c/devices/i2c-" + \
+            str(sfp_map[i]) + "/delete_device"
+        status, output = log_os_system("echo 0x50 > " + target, 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    nodelist = mknod
+
+    for i in range(len(nodelist)):
+        target = nodelist[-(i + 1)]
+        temp = target.split()
+        del temp[1]
+        temp[-1] = temp[-1].replace('new_device', 'delete_device')
+        status, output = log_os_system(" ".join(temp), 1)
+        if status:
+            print output
+            if FORCE == 0:
+                return status
+
+    return
+
+
+def system_ready():
+    if driver_inserted() == False:
+        return False
+    if not device_exist():
+        print "not device_exist()"
+        return False
+    return True
+
+PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
+PLATFORM_API2_WHL_FILE_PY3 ='sonic_platform-1.0-py3-none-any.whl'
+def do_sonic_platform_install():
+    device_path = "{}{}{}{}".format(PLATFORM_ROOT_PATH, '/x86_64-accton_', PROJECT_NAME, '-r0')
+    SONIC_PLATFORM_BSP_WHL_PKG_PY3 = "/".join([device_path, PLATFORM_API2_WHL_FILE_PY3])
+
+    #Check API2.0 on py whl file
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3): 
+            status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
+            if status:
+                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                return status
+            else:
+                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+        else:
+            print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
+    else:        
+        print('{} has installed'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    return 
+
+def do_sonic_platform_clean():
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)   
+    if status:
+        print('{} does not install, not need to uninstall'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    else:        
+        status, output = log_os_system("pip3 uninstall sonic-platform -y", 0)
+        if status:
+            print('Error: Failed to uninstall {}'.format(PLATFORM_API2_WHL_FILE_PY3))
+            return status
+        else:
+            print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    return
+
+
+def do_install():
+    if driver_inserted() == False:
+        status = driver_install()
+        if status:
+            if FORCE == 0:
+                return status
+    else:
+        print PROJECT_NAME.upper() + " drivers detected...."
+    if not device_exist():
+        status = device_install()
+        if status:
+            if FORCE == 0:
+                return status
+    else:
+        print PROJECT_NAME.upper() + " devices detected...."
+
+#    for i in range(len(cpld_set)):
+#        status, output = log_os_system(cpld_set[i], 1)
+#        if status:
+#            if FORCE == 0:
+#                return status
+
+    do_sonic_platform_install()
+
+    return
+
+
+def do_uninstall():
+    if not device_exist():
+        print PROJECT_NAME.upper() + " has no device installed...."
+    else:
+        print "Removing device...."
+        status = device_uninstall()
+        if status:
+            if FORCE == 0:
+                return status
+
+    if driver_inserted() == False:
+        print PROJECT_NAME.upper() + " has no driver installed...."
+    else:
+        print "Removing installed driver...."
+        status = driver_uninstall()
+        if status:
+            if FORCE == 0:
+                return status
+
+    do_sonic_platform_clean()
+
+    return
+
+
+def devices_info():
+    global DEVICE_NO
+    global ALL_DEVICE
+    global i2c_bus, hwmon_types
+    for key in DEVICE_NO:
+        ALL_DEVICE[key] = {}
+        for i in range(0, DEVICE_NO[key]):
+            ALL_DEVICE[key][key + str(i + 1)] = []
+
+    for key in i2c_bus:
+        buses = i2c_bus[key]
+        nodes = i2c_nodes[key]
+        for i in range(0, len(buses)):
+            for j in range(0, len(nodes)):
+                if 'fan' == key:
+                    for k in range(0, 6):
+                        node = key + str(k + 1)
+                        path = i2c_prefix + \
+                            buses[i] + "/fan" + str(k + 1) + "_" + nodes[j]
+                        my_log(node + ": " + path)
+                        ALL_DEVICE[key + str(k + 1)][node + str(j + 1)].append(path)
+                elif 'sfp' == key:
+                    for k in range(0, DEVICE_NO[key]):
+                        node = key + str(k + 1)
+                        if k < 16 and i==0 and j==0:
+                            path = i2c_prefix + \
+                            str(buses[0] + "/" + nodes[j] + str(k+1))
+                            my_log(node + ": " + path)
+                            ALL_DEVICE[key][node].append(path)
+                        if k >= 16 and i==1 and j==0:
+                            path = i2c_prefix + \
+                            str(buses[1] + "/" + nodes[j] + str(k+1))
+                            my_log(node + ": " + path)
+                            ALL_DEVICE[key][node].append(path)
+                        if k >= 32 and i==1 and j==1:
+                            path = i2c_prefix + \
+                            str(buses[1] + "/" + nodes[j] + str(k+1))
+                            my_log(node + ": " + path)
+                            ALL_DEVICE[key][node].append(path)
+                else:
+                    node = key + str(i + 1)
+                    path = i2c_prefix + buses[i] + "/" + nodes[j]
+                    my_log(node + ": " + path)
+                    ALL_DEVICE[key][node].append(path)
+
+    #for key in hwmon_types:
+    #    itypes = hwmon_types[key]
+    #    nodes = hwmon_nodes[key]
+    #    for i in range(0, len(itypes)):
+    #        for j in range(0, len(nodes)):
+    #            node = key + "_" + itypes[i]
+    #            path = hwmon_prefix[key] + itypes[i] + "/" + nodes[j]
+    #            my_log(node + ": " + path)
+    #            ALL_DEVICE[key][key + str(i + 1)].append(path)
+
+    # show dict all in the order
+    if DEBUG:
+        for i in sorted(ALL_DEVICE.keys()):
+            print(i + ": ")
+            for j in sorted(ALL_DEVICE[i].keys()):
+                print("   " + j)
+                for k in (ALL_DEVICE[i][j]):
+                    print("   " + "   " + k)
+    return
+
+
+def show_eeprom(index):
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+    node = ALL_DEVICE['sfp']['sfp' + str(index)][0]
+    node = node.replace(node.split("/")[-1], 'eeprom')
+    sfp_node = str(sfp_map[int(index)-1]) + '-0050'
+    node = node.replace(node.split("/")[-2], sfp_node)
+    # check if got hexdump command in current environment
+    ret, log = log_os_system("which hexdump", 0)
+    ret, log2 = log_os_system("which busybox hexdump", 0)
+    if len(log):
+        hex_cmd = 'hexdump'
+    elif len(log2):
+        hex_cmd = ' busybox hexdump'
+    else:
+        log = 'Failed : no hexdump cmd!!'
+        logging.info(log)
+        print log
+        return 1
+    print "node=%s" % node
+    print node + ":"
+    ret, log = log_os_system("cat " + node + "| " + hex_cmd + " -C", 1)
+    if ret == 0:
+        print log
+    else:
+        print "**********device no found**********"
+    return
+
+
+def set_device(args):
+    global DEVICE_NO
+    global ALL_DEVICE
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+
+    if args[0] == 'fan':
+        if int(args[1]) > 100:
+            show_set_help()
+            return
+        #print  ALL_DEVICE['fan']
+        # fan1~6 is all fine, all fan share same setting
+        node = ALL_DEVICE['fan1']['fan11'][0]
+        node = node.replace(node.split("/")[-1], 'fan_duty_cycle_percentage')
+        ret, log = log_os_system("cat " + node, 1)
+        if ret == 0:
+            print ("Previous fan duty: " + log.strip() + "%")
+        ret, log = log_os_system("echo " + args[1] + " >" + node, 1)
+        if ret == 0:
+            print ("Current fan duty: " + args[1] + "%")
+        return ret
+    elif args[0] == 'sfp':
+        if int(args[1]) > DEVICE_NO[args[0]] or int(args[1]) < DEVICE_NO[args[0]]-1: #33-34
+            show_set_help()
+            return
+        if len(args)<3 or len(args)>4: #len(args)=3
+            show_set_help()
+            return
+        if int(args[2])>1 or int(args[2])<0: #0|1
+            show_set_help()
+            return
+
+        #print  ALL_DEVICE[args[0]]
+        for i in range(0, len(ALL_DEVICE[args[0]])):
+            for j in ALL_DEVICE[args[0]][args[0] + str(args[1])]:
+                if j.find('tx_disable') != -1:
+                    ret, log = log_os_system("echo " + args[2] + " >" + j, 1)
+                    if ret:
+                        return ret
+    else:
+        show_set_help()
+
+    return
+
+# get digits inside a string.
+# Ex: 31 for "sfp31"
+
+
+def get_value(input):
+    digit = re.findall(r'\d+', input)
+    return int(digit[0])
+
+
+def device_traversal():
+    if system_ready() == False:
+        print("System's not ready.")
+        print("Please install first!")
+        return
+
+    if len(ALL_DEVICE) == 0:
+        devices_info()
+    for i in sorted(ALL_DEVICE.keys()):
+        print("============================================")
+        print(i.upper() + ": ")
+        print("============================================")
+
+        for j in sorted(ALL_DEVICE[i].keys(), key=get_value):
+            print "   " + j + ":",
+            for k in (ALL_DEVICE[i][j]):
+                ret, log = log_os_system("cat " + k, 0)
+                func = k.split("/")[-1].strip()
+                func = re.sub(j + '_', '', func, 1)
+                func = re.sub(i.lower() + '_', '', func, 1)
+                if ret == 0:
+                    print func + "=" + log + " ",
+                else:
+                    print func + "=" + "X" + " ",
+            print
+            print("----------------------------------------------------------------")
+
+        print
+    return
+
+
+def device_exist():
+    ret1, log = log_os_system("ls " + i2c_prefix + "*0077", 0)
+    ret2, log = log_os_system("ls " + i2c_prefix + "i2c-2", 0)
+    return not(ret1 or ret2)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/control b/platform/broadcom/sonic-platform-modules-accton/debian/control
index 431e177cea48..4410a2f07796 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/control
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/control
@@ -69,6 +69,10 @@ Package: sonic-platform-accton-as9716-32d
 Architecture: amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
+Package: sonic-platform-accton-as9726-32d
+Architecture: amd64
+Description: kernel modules for platform devices such as fan, led, sfp
+
 Package: sonic-platform-accton-as5835-54t
 Architecture: amd64
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/rules b/platform/broadcom/sonic-platform-modules-accton/debian/rules
index a672ec655d41..678d649a79ed 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/rules
@@ -22,7 +22,7 @@ KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
 MODULE_DIRS := as7712-32x as5712-54x as7816-64x as7716-32x as7716-32xb as7312-54x
 MODULE_DIRS += as7326-56x as6712-32x as7726-32x as4630-54pe as4630-54te minipack as5812-54x
-MODULE_DIRS += as5835-54x as9716-32d as5835-54t as7312-54xs as7315-27xb as5812-54t
+MODULE_DIRS += as5835-54x as9716-32d as9726-32d as5835-54t as7312-54xs as7315-27xb as5812-54t
 MODULE_DIR := modules
 UTILS_DIR := utils
 SERVICE_DIR := service
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as9726-32d.install b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as9726-32d.install
new file mode 100644
index 000000000000..01eb8dff9e41
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as9726-32d.install
@@ -0,0 +1,2 @@
+as9726-32d/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-accton_as9726_32d-r0
+

From 7c844c77447ccddda30a21f6d55e8fca6cd1af31 Mon Sep 17 00:00:00 2001
From: SeanWu <81406250+seanwu-ec@users.noreply.github.com>
Date: Thu, 13 May 2021 03:42:20 +0800
Subject: [PATCH 0478/1674] [accton] Add sensors.conf to multiple models
 (#7494)

#### Why I did it
Improve readability of `show environment` output.

#### How I did it
In all sensors.conf, give the customized labels according to HW specifications for each model.

Signed-off-by: Sean Wu <sean_wu@edge-core.com>
---
 .../x86_64-accton_as4630_54pe-r0/sensors.conf | 40 +++++++++++
 .../x86_64-accton_as4630_54te-r0/sensors.conf | 40 +++++++++++
 .../x86_64-accton_as5712_54x-r0/sensors.conf  | 51 ++++++++++++++
 .../x86_64-accton_as5812_54t-r0/sensors.conf  | 66 ++++++++++++++++++
 .../x86_64-accton_as5812_54x-r0/sensors.conf  | 31 +++++++++
 .../x86_64-accton_as5835_54t-r0/sensors.conf  | 50 ++++++++++++++
 .../x86_64-accton_as5835_54x-r0/sensors.conf  | 51 ++++++++++++++
 .../x86_64-accton_as6712_32x-r0/sensors.conf  | 67 ++++++++++++++-----
 .../x86_64-accton_as7315_27xb-r0/sensors.conf | 42 ++++++++++++
 .../x86_64-accton_as7326_56x-r0/sensors.conf  | 50 ++++++++++++++
 .../x86_64-accton_as7712_32x-r0/sensors.conf  | 67 +++++++++++++------
 .../x86_64-accton_as7716_32x-r0/sensors.conf  | 43 ++++++++++++
 .../x86_64-accton_as7726_32x-r0/sensors.conf  | 49 ++++++++++++++
 .../x86_64-accton_as7816_64x-r0/sensors.conf  | 51 ++++++++++++++
 .../x86_64-accton_as9716_32d-r0/sensors.conf  | 59 ++++++++++++++++
 15 files changed, 720 insertions(+), 37 deletions(-)
 create mode 100644 device/accton/x86_64-accton_as4630_54pe-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as4630_54te-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as5712_54x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as5812_54t-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as5812_54x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as5835_54t-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as7315_27xb-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as7326_56x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as7716_32x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as7816_64x-r0/sensors.conf
 create mode 100644 device/accton/x86_64-accton_as9716_32d-r0/sensors.conf

diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/sensors.conf b/device/accton/x86_64-accton_as4630_54pe-r0/sensors.conf
new file mode 100644
index 000000000000..d34edc0f5a1a
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54pe-r0/sensors.conf
@@ -0,0 +1,40 @@
+# libsensors configuration file for as4630-54pe
+# ------------------------------------------------
+#
+
+bus "i2c-3" "i2c-1-mux (chan_id 1)"
+bus "i2c-10" "i2c-2-mux (chan_id 0)"
+bus "i2c-11" "i2c-2-mux (chan_id 1)"
+bus "i2c-14" "i2c-2-mux (chan_id 4)"
+bus "i2c-24" "i2c-3-mux (chan_id 6)"
+bus "i2c-25" "i2c-3-mux (chan_id 7)"
+
+
+chip "ype1200am-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ype1200am-i2c-*-59"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as4630_54pe_cpld-*"
+    label fan1 "Fan 1"
+    label fan2 "Fan 2"
+    label fan3 "Fan 3"
+
+
+chip "lm77-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Fan Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/sensors.conf b/device/accton/x86_64-accton_as4630_54te-r0/sensors.conf
new file mode 100644
index 000000000000..b22fff04d027
--- /dev/null
+++ b/device/accton/x86_64-accton_as4630_54te-r0/sensors.conf
@@ -0,0 +1,40 @@
+# libsensors configuration file for as4630-54te
+# ------------------------------------------------
+#
+
+bus "i2c-3" "i2c-1-mux (chan_id 1)"
+bus "i2c-10" "i2c-2-mux (chan_id 0)"
+bus "i2c-11" "i2c-2-mux (chan_id 1)"
+bus "i2c-14" "i2c-2-mux (chan_id 4)"
+bus "i2c-24" "i2c-3-mux (chan_id 6)"
+bus "i2c-25" "i2c-3-mux (chan_id 7)"
+
+
+chip "ype1200am-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ype1200am-i2c-*-59"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as4630_54te_cpld-*"
+    label fan1 "Fan 1"
+    label fan2 "Fan 2"
+    label fan3 "Fan 3"
+
+
+chip "lm77-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Fan Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as5712_54x-r0/sensors.conf b/device/accton/x86_64-accton_as5712_54x-r0/sensors.conf
new file mode 100644
index 000000000000..913022987a6b
--- /dev/null
+++ b/device/accton/x86_64-accton_as5712_54x-r0/sensors.conf
@@ -0,0 +1,51 @@
+# libsensors configuration file for as5712-54x
+# ------------------------------------------------
+#
+
+bus "i2c-57" "i2c-0-mux (chan_id 1)"
+bus "i2c-58" "i2c-0-mux (chan_id 2)"
+bus "i2c-61" "i2c-0-mux (chan_id 5)"
+bus "i2c-62" "i2c-0-mux (chan_id 6)"
+bus "i2c-63" "i2c-0-mux (chan_id 7)"
+
+chip "cpr_4011_4mxx-i2c-*-3c"
+    label in1 "PSU 1 Voltage In"
+    label in2 "PSU 1 Voltage Out"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power1 "PSU 1 Power In"
+    label power2 "PSU 1 Power Out"
+    label curr1 "PSU 1 Current In"
+    label curr2 "PSU 1 Current Out"
+
+chip "cpr_4011_4mxx-i2c-*-3f"
+    label in1 "PSU 2 Voltage In"
+    label in2 "PSU 2 Voltage Out"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power1 "PSU 2 Power In"
+    label power2 "PSU 2 Power Out"
+    label curr1 "PSU 2 Current In"
+    label curr2 "PSU 2 Current Out"
+
+chip "as5712_54x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as5812_54t-r0/sensors.conf b/device/accton/x86_64-accton_as5812_54t-r0/sensors.conf
new file mode 100644
index 000000000000..ebd3e6f8b9e2
--- /dev/null
+++ b/device/accton/x86_64-accton_as5812_54t-r0/sensors.conf
@@ -0,0 +1,66 @@
+# libsensors configuration file for as5812-54t
+# ------------------------------------------------
+#
+
+bus "i2c-16" "i2c-0-mux (chan_id 6)"
+bus "i2c-17" "i2c-0-mux (chan_id 7)"
+bus "i2c-11" "i2c-0-mux (chan_id 1)"
+bus "i2c-12" "i2c-0-mux (chan_id 2)"
+bus "i2c-15" "i2c-0-mux (chan_id 5)"
+
+
+chip "cpr_4011_4mxx-i2c-*-3c"
+    label in1 "PSU 1 Voltage In"
+    label in2 "PSU 1 Voltage Out"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power1 "PSU 1 Power In"
+    label power2 "PSU 1 Power Out"
+    label curr1 "PSU 1 Current In"
+    label curr2 "PSU 1 Current Out"
+
+chip "cpr_4011_4mxx-i2c-*-3f"
+    label in1 "PSU 2 Voltage In"
+    label in2 "PSU 2 Voltage Out"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power1 "PSU 2 Power In"
+    label power2 "PSU 2 Power Out"
+    label curr1 "PSU 2 Current In"
+    label curr2 "PSU 2 Current Out"
+
+chip "ym2401-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2401-i2c-*-5b"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as5812_54t_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as5812_54x-r0/sensors.conf b/device/accton/x86_64-accton_as5812_54x-r0/sensors.conf
new file mode 100644
index 000000000000..73038a4131c2
--- /dev/null
+++ b/device/accton/x86_64-accton_as5812_54x-r0/sensors.conf
@@ -0,0 +1,31 @@
+# libsensors configuration file for as5812-54x
+# ------------------------------------------------
+#
+
+bus "i2c-57" "i2c-0-mux (chan_id 1)"
+bus "i2c-58" "i2c-0-mux (chan_id 2)"
+bus "i2c-61" "i2c-0-mux (chan_id 5)"
+bus "i2c-62" "i2c-0-mux (chan_id 6)"
+bus "i2c-63" "i2c-0-mux (chan_id 7)"
+
+chip "as5812_54x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as5835_54t-r0/sensors.conf b/device/accton/x86_64-accton_as5835_54t-r0/sensors.conf
new file mode 100644
index 000000000000..3767cafdb580
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54t-r0/sensors.conf
@@ -0,0 +1,50 @@
+# libsensors configuration file for as5835-54t
+# ------------------------------------------------
+#
+
+bus "i2c-3" "i2c-0-mux (chan_id 1)"
+bus "i2c-11" "i2c-2-mux (chan_id 1)"
+bus "i2c-12" "i2c-2-mux (chan_id 2)"
+bus "i2c-18" "i2c-2-mux (chan_id 0)"
+bus "i2c-19" "i2c-2-mux (chan_id 1)"
+bus "i2c-20" "i2c-2-mux (chan_id 2)"
+bus "i2c-21" "i2c-2-mux (chan_id 3)"
+
+chip "ym2401-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2401-i2c-*-5b"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as5835_54t_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4c"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sensors.conf b/device/accton/x86_64-accton_as5835_54x-r0/sensors.conf
new file mode 100644
index 000000000000..38cf89fc68c4
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sensors.conf
@@ -0,0 +1,51 @@
+# libsensors configuration file for as5835-54x
+# ------------------------------------------------
+#
+
+bus "i2c-3" "i2c-0-mux (chan_id 1)"
+bus "i2c-11" "i2c-2-mux (chan_id 1)"
+bus "i2c-12" "i2c-2-mux (chan_id 2)"
+bus "i2c-18" "i2c-2-mux (chan_id 0)"
+bus "i2c-19" "i2c-2-mux (chan_id 1)"
+bus "i2c-20" "i2c-2-mux (chan_id 2)"
+bus "i2c-21" "i2c-2-mux (chan_id 3)"
+
+
+chip "ym2401-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2401-i2c-*-5b"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as5835_54x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4c"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as6712_32x-r0/sensors.conf b/device/accton/x86_64-accton_as6712_32x-r0/sensors.conf
index 84ee0fd9f333..60b8f4734304 100644
--- a/device/accton/x86_64-accton_as6712_32x-r0/sensors.conf
+++ b/device/accton/x86_64-accton_as6712_32x-r0/sensors.conf
@@ -1,23 +1,56 @@
-# libsensors configuration file for AS6712-32X
+# libsensors configuration file for as6712-32x
 # ------------------------------------------------
+#
+
+bus "i2c-35" "i2c-0-mux (chan_id 1)"
+bus "i2c-36" "i2c-0-mux (chan_id 2)"
+bus "i2c-38" "i2c-0-mux (chan_id 4)"
+bus "i2c-39" "i2c-0-mux (chan_id 5)"
+bus "i2c-40" "i2c-0-mux (chan_id 6)"
+bus "i2c-41" "i2c-0-mux (chan_id 7)"
+
 
 chip "cpr_4011_4mxx-i2c-*-3c"
-    label in1 "PSU1_VIN"
-    label in2 "PSU1_VOUT"
-    label curr1  "PSU1_IIN"
-    label curr2  "PSU1_IOUT"
-    label power1 "PSU1_PIN"
-    label power2 "PSU1_POUT"
-    label fan1   "PSU1_FAN"
-    label temp1  "PSU1_TEMP"
+    label in1 "PSU 1 Voltage In"
+    label in2 "PSU 1 Voltage Out"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power1 "PSU 1 Power In"
+    label power2 "PSU 1 Power Out"
+    label curr1 "PSU 1 Current In"
+    label curr2 "PSU 1 Current Out"
 
 chip "cpr_4011_4mxx-i2c-*-3f"
-    label in1 "PSU2_VIN"
-    label in2 "PSU2_VOUT"
-    label curr1  "PSU2_IIN"
-    label curr2  "PSU2_IOUT"
-    label power1 "PSU2_PIN"
-    label power2 "PSU2_POUT"
-    label fan1   "PSU2_FAN"
-    label temp1  "PSU2_TEMP"
+    label in1 "PSU 2 Voltage In"
+    label in2 "PSU 2 Voltage Out"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power1 "PSU 2 Power In"
+    label power2 "PSU 2 Power Out"
+    label curr1 "PSU 2 Current In"
+    label curr2 "PSU 2 Current Out"
+
+chip "as6712_32x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
 
+chip "lm75-i2c-*-4b"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as7315_27xb-r0/sensors.conf b/device/accton/x86_64-accton_as7315_27xb-r0/sensors.conf
new file mode 100644
index 000000000000..1b5c9059c94d
--- /dev/null
+++ b/device/accton/x86_64-accton_as7315_27xb-r0/sensors.conf
@@ -0,0 +1,42 @@
+# libsensors configuration file for as7315-27xb
+# ------------------------------------------------
+#
+
+bus "i2c-12" "i2c-3-mux (chan_id 2)"
+bus "i2c-13" "i2c-3-mux (chan_id 3)"
+bus "i2c-50" "i2c-7-mux (chan_id 0)"
+bus "i2c-51" "i2c-7-mux (chan_id 1)"
+bus "i2c-52" "i2c-7-mux (chan_id 2)"
+bus "i2c-53" "i2c-7-mux (chan_id 3)"
+
+
+chip "ym2401-i2c-*-5b"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2401-i2c-*-58"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as7315_fan-*"
+    label fan1 "Fan 1"
+    label fan2 "Fan 2"
+    label fan3 "Fan 3"
+    label fan4 "Fan 4"
+    label fan5 "Fan 5"
+
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4c"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as7326_56x-r0/sensors.conf b/device/accton/x86_64-accton_as7326_56x-r0/sensors.conf
new file mode 100644
index 000000000000..ec28b6875a0c
--- /dev/null
+++ b/device/accton/x86_64-accton_as7326_56x-r0/sensors.conf
@@ -0,0 +1,50 @@
+# libsensors configuration file for as7326-56x
+# ------------------------------------------------
+#
+
+bus "i2c-11" "i2c-1-mux (chan_id 2)"
+bus "i2c-13" "i2c-1-mux (chan_id 4)"
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+bus "i2c-17" "i2c-1-mux (chan_id 0)"
+
+
+chip "ym2651-i2c-*-59"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2651-i2c-*-5b"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as7326_56x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan6 "Fan 6 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+    label fan16 "Fan 6 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as7712_32x-r0/sensors.conf b/device/accton/x86_64-accton_as7712_32x-r0/sensors.conf
index 33d75d598123..39796a5c2d13 100644
--- a/device/accton/x86_64-accton_as7712_32x-r0/sensors.conf
+++ b/device/accton/x86_64-accton_as7712_32x-r0/sensors.conf
@@ -1,23 +1,50 @@
-# libsensors configuration file for AS7712-32X
+# libsensors configuration file for as7712-32x
 # ------------------------------------------------
 #
 
-#Comment out the following for sku-sensors-data.yml
-#chip "ym2651-*"
-#    label power1 "PSU Output Power"
-#    label temp1  "Power Supply Temp"
-#    label fan1   "Fan Speed"
-#
-#chip "as7712_32x_fan-*"
-#    label fan1  "Fan tray 1 front"
-#    label fan2  "Fan tray 2 front"
-#    label fan3  "Fan tray 3 front"
-#    label fan4  "Fan tray 4 front"
-#    label fan5  "Fan tray 5 front"
-#    label fan6  "Fan tray 6 front"
-#    label fan11 "Fan tray 1 rear"
-#    label fan12 "Fan tray 2 rear"
-#    label fan13 "Fan tray 3 rear"
-#    label fan14 "Fan tray 4 rear"
-#    label fan15 "Fan tray 5 rear"
-#    label fan16 "Fan tray 6 rear"
+bus "i2c-2" "i2c-1-mux (chan_id 0)"
+bus "i2c-3" "i2c-1-mux (chan_id 1)"
+bus "i2c-10" "i2c-0-mux (chan_id 0)"
+bus "i2c-11" "i2c-0-mux (chan_id 1)"
+
+
+chip "ym2651-i2c-*-5b"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2651-i2c-*-58"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as7712_32x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan6 "Fan 6 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+    label fan16 "Fan 6 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
diff --git a/device/accton/x86_64-accton_as7716_32x-r0/sensors.conf b/device/accton/x86_64-accton_as7716_32x-r0/sensors.conf
new file mode 100644
index 000000000000..30e5bdbd6003
--- /dev/null
+++ b/device/accton/x86_64-accton_as7716_32x-r0/sensors.conf
@@ -0,0 +1,43 @@
+# libsensors configuration file for as7716-32x
+# ------------------------------------------------
+#
+
+bus "i2c-9" "i2c-1-mux (chan_id 0)"
+bus "i2c-10" "i2c-1-mux (chan_id 1)"
+bus "i2c-17" "i2c-2-mux (chan_id 0)"
+bus "i2c-18" "i2c-2-mux (chan_id 1)"
+
+
+chip "ym2651-i2c-*-5b"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power1 "PSU 1 Power"
+
+chip "ym2651-i2c-*-58"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power1 "PSU 2 Power"
+
+chip "as7716_32x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan6 "Fan 6 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+    label fan16 "Fan 6 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sensors.conf b/device/accton/x86_64-accton_as7726_32x-r0/sensors.conf
new file mode 100644
index 000000000000..a7b356ee0b1f
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sensors.conf
@@ -0,0 +1,49 @@
+# libsensors configuration file for as7726-32x
+# ------------------------------------------------
+#
+
+bus "i2c-49" "i2c-2-mux (chan_id 0)"
+bus "i2c-50" "i2c-2-mux (chan_id 1)"
+bus "i2c-54" "i2c-2-mux (chan_id 5)"
+bus "i2c-55" "i2c-2-mux (chan_id 6)"
+
+
+chip "ym2651-i2c-*-5b"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power1 "PSU 1 Power"
+
+chip "ym2651-i2c-*-58"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power1 "PSU 2 Power"
+
+chip "as7726_32x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan6 "Fan 6 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+    label fan16 "Fan 6 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
+
+chip "lm75-i2c-*-4c"
+    label temp1 "Fan Board Temperature"
diff --git a/device/accton/x86_64-accton_as7816_64x-r0/sensors.conf b/device/accton/x86_64-accton_as7816_64x-r0/sensors.conf
new file mode 100644
index 000000000000..56e4817a1b51
--- /dev/null
+++ b/device/accton/x86_64-accton_as7816_64x-r0/sensors.conf
@@ -0,0 +1,51 @@
+# libsensors configuration file for as7816-64x
+# ------------------------------------------------
+#
+
+bus "i2c-9" "i2c-1-mux (chan_id 0)"
+bus "i2c-10" "i2c-1-mux (chan_id 1)"
+bus "i2c-17" "i2c-1-mux (chan_id 0)"
+bus "i2c-18" "i2c-1-mux (chan_id 1)"
+
+
+chip "ym2851-i2c-*-5b"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "ym2851-i2c-*-58"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as7816_64x_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
+
+chip "lm75-i2c-*-4d"
+    label temp1 "Fan Board Temperature"
+
+chip "lm75-i2c-*-4e"
+    label temp1 "Fan Board Temperature"
diff --git a/device/accton/x86_64-accton_as9716_32d-r0/sensors.conf b/device/accton/x86_64-accton_as9716_32d-r0/sensors.conf
new file mode 100644
index 000000000000..d375d2315d5c
--- /dev/null
+++ b/device/accton/x86_64-accton_as9716_32d-r0/sensors.conf
@@ -0,0 +1,59 @@
+# libsensors configuration file for as9716-32d
+# ------------------------------------------------
+#
+
+bus "i2c-9" "i2c-1-mux (chan_id 0)"
+bus "i2c-10" "i2c-1-mux (chan_id 1)"
+bus "i2c-17" "i2c-1-mux (chan_id 0)"
+bus "i2c-18" "i2c-1-mux (chan_id 1)"
+
+
+chip "acbel_fsh082-i2c-*-58"
+    label in3 "PSU 1 Voltage"
+    label fan1 "PSU 1 Fan"
+    label temp1 "PSU 1 Temperature"
+    label power2 "PSU 1 Power"
+    label curr2 "PSU 1 Current"
+
+chip "acbel_fsh082-i2c-*-59"
+    label in3 "PSU 2 Voltage"
+    label fan1 "PSU 2 Fan"
+    label temp1 "PSU 2 Temperature"
+    label power2 "PSU 2 Power"
+    label curr2 "PSU 2 Current"
+
+chip "as9716_32d_fan-*"
+    label fan1 "Fan 1 Front"
+    label fan2 "Fan 2 Front"
+    label fan3 "Fan 3 Front"
+    label fan4 "Fan 4 Front"
+    label fan5 "Fan 5 Front"
+    label fan6 "Fan 6 Front"
+    label fan11 "Fan 1 Rear"
+    label fan12 "Fan 2 Rear"
+    label fan13 "Fan 3 Rear"
+    label fan14 "Fan 4 Rear"
+    label fan15 "Fan 5 Rear"
+    label fan16 "Fan 6 Rear"
+
+
+chip "lm75-i2c-*-48"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-49"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4a"
+    label temp1 "Main Board Temperature"
+
+chip "lm75-i2c-*-4b"
+    label temp1 "CPU Board Temperature"
+
+chip "lm75-i2c-*-4c"
+    label temp1 "OCXO Temperature"
+
+chip "lm75-i2c-*-4e"
+    label temp1 "Fan Board Temperature"
+
+chip "lm75-i2c-*-4f"
+    label temp1 "Fan Board Temperature"

From 162ec20fedf7d3ac75977cba9f394c4bee929719 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 12 May 2021 21:28:19 -0700
Subject: [PATCH 0479/1674] Updated MMU settings for Arista-7050CX3-32S-C32 T1
 topology (#7597)

---
 .../buffers_defaults_t1.j2                    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..f5b7327e705d
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32712448",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "1622016"
+        },
+        "egress_lossy_pool": {
+            "size": "24709632",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32599040",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32599040"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}

From 14ed0baed03891e8a3658960986d63391c9452c0 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 14 May 2021 08:58:51 -0700
Subject: [PATCH 0480/1674] Vxlan src port range for breakout SKU (#7612)

*Extended Vxlan src port range for lab breakout SKU - Mellanox-SN3800-D112C8
---
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
index c5bb0c90f3d7..ab1e27c6aec4 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1

From dc44da4e0f990b4c36a6e16fc2fd463b2e80c332 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 18 May 2021 14:28:32 +0800
Subject: [PATCH 0481/1674] Skip the web proxy when downloading from proxy
 endpoint (#7592)

Why I did it
Skip to use the web proxy when the packages have been in the proxy server.
For sai packages or the other packages, we will upload the the proxy server directly, the reproducible will skip to check the site, not necessary to change the version files.
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index ae85c2dcf129..cc3d7aedf8bc 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -71,6 +71,12 @@ download_packages()
         if [[ "$para" == *://* ]]; then
             local url=$para
             local real_version=
+
+            # Skip to use the proxy, if the url has already used the proxy server
+            if [[ $url == ${URL_PREFIX}* ]]; then
+                continue
+            fi
+
             if [ "$ENABLE_VERSION_CONTROL_WEB" == y ]; then
                 local version=
                 local filename=$(echo $url | awk -F"/" '{print $NF}' | cut -d? -f1 | cut -d# -f1)

From 0a5551aabfd28d7c8f2a551d2566c1ef98f0b722 Mon Sep 17 00:00:00 2001
From: sudhanshukumar22 <51457531+sudhanshukumar22@users.noreply.github.com>
Date: Tue, 18 May 2021 22:21:02 +0530
Subject: [PATCH 0482/1674] docker-lldp:intermittent DB errors will result in
 Client termination (#6119)

This PR allows listen to hostname changes and mgmt ip changes.
---
 dockers/docker-lldp/lldpmgrd | 113 +++++++++++++++++++++++++++++++++--
 1 file changed, 107 insertions(+), 6 deletions(-)

diff --git a/dockers/docker-lldp/lldpmgrd b/dockers/docker-lldp/lldpmgrd
index 61d6034faa15..9ff6aa24b922 100755
--- a/dockers/docker-lldp/lldpmgrd
+++ b/dockers/docker-lldp/lldpmgrd
@@ -50,14 +50,51 @@ class LldpManager(daemon_base.DaemonBase):
         # Open a handle to the Config database
         self.config_db = swsscommon.DBConnector("CONFIG_DB",
                                                 self.REDIS_TIMEOUT_MS,
-                                                True)
+                                                False)
 
         # Open a handle to the Application database
         self.appl_db = swsscommon.DBConnector("APPL_DB",
                                               self.REDIS_TIMEOUT_MS,
-                                              True)
+                                              False)
 
         self.pending_cmds = {}
+        self.hostname = "None"
+        self.mgmt_ip = "None"
+
+        self.device_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)
+        self.port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
+        self.mgmt_table = swsscommon.Table(self.config_db, swsscommon.CFG_MGMT_INTERFACE_TABLE_NAME)
+        self.app_port_table = swsscommon.Table(self.appl_db, swsscommon.APP_PORT_TABLE_NAME)
+
+    def update_hostname(self, hostname):
+        cmd = "lldpcli configure system hostname {0}".format(hostname)
+        self.log_debug("Running command: '{}'".format(cmd))
+
+        proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (stdout, stderr) = proc.communicate()
+        
+        if proc.returncode != 0:
+            log_warning("Command failed '{}': {}".format(cmd, stderr))
+        else:
+            self.hostname = hostname
+
+    def update_mgmt_addr(self, ip):
+        if ip == "None":
+            cmd = "lldpcli unconfigure system ip management pattern"
+            self.log_info("Mgmt IP {0} deleted".format(self.mgmt_ip))
+        else:
+            cmd = "lldpcli configure system ip management pattern {0}".format(ip)
+            self.log_info("Mgmt IP changed old ip {0}, new ip {1}".format(self.mgmt_ip, ip))
+
+        self.log_debug("Running command: '{}'".format(cmd))
+
+        proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (stdout, stderr) = proc.communicate()
+        
+        if proc.returncode != 0:
+            log_warning("Command failed '{}': {}".format(cmd, stderr))
+        else:
+            self.mgmt_ip = ip
 
     def is_port_up(self, port_name):
         """
@@ -65,8 +102,7 @@ class LldpManager(daemon_base.DaemonBase):
         PORT TABLE in the Application DB
         """
         # Retrieve all entires for this port from the Port table
-        port_table = swsscommon.Table(self.appl_db, swsscommon.APP_PORT_TABLE_NAME)
-        (status, fvp) = port_table.get(port_name)
+        (status, fvp) = self.app_port_table.get(port_name)
         if status:
             # Convert list of tuples to a dictionary
             port_table_dict = dict(fvp)
@@ -95,8 +131,7 @@ class LldpManager(daemon_base.DaemonBase):
         port_desc = None
 
         # Retrieve all entires for this port from the Port table
-        port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
-        (status, fvp) = port_table.get(port_name)
+        (status, fvp) = self.port_table.get(port_name)
         if status:
             # Convert list of tuples to a dictionary
             port_table_dict = dict(fvp)
@@ -150,6 +185,56 @@ class LldpManager(daemon_base.DaemonBase):
         for port_name in to_delete:
             self.pending_cmds.pop(port_name, None)
 
+    def lldp_get_mgmt_ip(self):
+        mgmt_intf_keys = self.mgmt_table.getKeys()        
+        ipv4_addr = "None"
+        ipv6_addr = "None"
+        for key in mgmt_intf_keys:
+            if '|' in key:
+                key = key.split('|', 1)
+                if '/' in key[1]:
+                    ip = key[1].split('/', 1)
+                    if self.mgmt_ip != ip[0]:
+                        if '.' in ip[0]:
+                            ipv4_addr = ip[0]
+                        else:
+                            ipv6_addr = ip[0]
+        
+        if ipv4_addr != "None":
+            return ipv4_addr
+        elif ipv6_addr != "None":
+            return ipv6_addr
+        else:
+            return "None"
+
+    def lldp_process_mgmt_info_change(self, op, mgmt_dict, key):
+        if not op in ["SET", "DEL"]:
+            return
+        self.log_info("Mgmt Config Opcode: {} Dict {} Key {} Curr {}".format(op, mgmt_dict, key, self.mgmt_ip))
+        if '|' in key:
+            key = key.split('|', 1)
+            if '/' in key[1]:
+                ip = key[1].split('/', 1)
+                if op == "DEL":
+                    if self.mgmt_ip == ip[0]:
+                        ip_addr = self.lldp_get_mgmt_ip()
+                        self.update_mgmt_addr(ip_addr)
+                else:
+                    if not self.mgmt_ip == ip[0]:
+                        if '.' in ip[0]:
+                            self.update_mgmt_addr(ip[0]) 
+                        elif '.' not in self.mgmt_ip:
+                            self.update_mgmt_addr(ip[0])
+
+    def lldp_process_device_table_event(self, op, device_dict, key):
+        if not op in ["SET", "DEL"]:
+            return
+        self.log_info("Device Config Opcode: {} Dict {} Key {}".format(op, device_dict, key))
+        hostname = device_dict.get("hostname")
+        if not self.hostname == hostname:
+            self.log_info("Hostname changed old {0}, new {1}".format(self.hostname, hostname))
+            self.update_hostname(hostname)
+
     def run(self):
         """
         Subscribes to notifications of changes in the PORT table
@@ -184,6 +269,14 @@ class LldpManager(daemon_base.DaemonBase):
         # Subscribe to PORT table notifications in the App DB
         sst_appdb = swsscommon.SubscriberStateTable(self.appl_db, swsscommon.APP_PORT_TABLE_NAME)
         sel.addSelectable(sst_appdb)
+        
+        # Subscribe to MGMT PORT table notifications in the Config DB
+        sst_mgmt_ip_confdb = swsscommon.SubscriberStateTable(self.config_db, swsscommon.CFG_MGMT_INTERFACE_TABLE_NAME)
+        sel.addSelectable(sst_mgmt_ip_confdb)
+        
+        # Subscribe to DEVICE_METADATA table notifications in the Config DB
+        sst_device_confdb = swsscommon.SubscriberStateTable(self.config_db, swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)
+        sel.addSelectable(sst_device_confdb)
 
         # Listen for changes to the PORT table in the CONFIG_DB and APP_DB
         while True:
@@ -201,6 +294,14 @@ class LldpManager(daemon_base.DaemonBase):
                         else:
                             self.pending_cmds.pop(key, None)
 
+                (key, op, fvp) = sst_mgmt_ip_confdb.pop()
+                if key:
+                    self.lldp_process_mgmt_info_change(op, dict(fvp), key)
+
+                (key, op, fvp) = sst_device_confdb.pop()
+                if key:
+                    self.lldp_process_device_table_event(op, dict(fvp), key)
+
                 (key, op, fvp) = sst_appdb.pop()
                 if (key != "PortInitDone") and (key != "PortConfigDone"):
                     if fvp:

From 2973a63f1dc0f32330ec5ff7746b330a0996b512 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 20 May 2021 21:35:23 +0800
Subject: [PATCH 0483/1674] Fix the type issue in rvtysh (#7648)

Why I did it
Change the type issue in the command rvtysh
change PARA/para to PARAM/param
---
 dockers/docker-fpm-frr/base_image_files/rvtysh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dockers/docker-fpm-frr/base_image_files/rvtysh b/dockers/docker-fpm-frr/base_image_files/rvtysh
index fb61b949e02b..81fb23046a6d 100755
--- a/dockers/docker-fpm-frr/base_image_files/rvtysh
+++ b/dockers/docker-fpm-frr/base_image_files/rvtysh
@@ -9,14 +9,14 @@ if printf -- "$*" | grep -qPz '[\n\r|&$;]'; then
 fi
 
 # The sub commands must start with "show"
-LAST_PARA=
-for para in "$@"
+LAST_PARAM=
+for param in "$@"
 do
-    if [ "$LAST_PARA" == "-c" ] && [[ "$para" != show*  ]]; then
-        echo "Not allow to run the command '$para', please use the comand 'sudo vtysh' instead." 1>&2
+    if [ "$LAST_PARAM" == "-c" ] && [[ "$param" != show*  ]]; then
+        echo "Not allow to run the command '$param', please use the comand 'sudo vtysh' instead." 1>&2
         exit 1
     fi
-    LAST_PARA=$para
+    LAST_PARAM=$param
 done
 
 vtysh "$@"

From cb930c30cd68ce01a4d2aa39f5f26d460df0c8be Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 20 May 2021 10:36:39 -0700
Subject: [PATCH 0484/1674] [qos]: modify dot1p to tc mapping (#7661)

Map priority 0 to TC 1 and priority 1 to TC 0

Send traffic on priority 0 and 1 and verified that it gets mapped correctly in hw

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 files/build_templates/qos_config.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index a7c361d69fa5..c2b0fe32bcde 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -76,8 +76,8 @@
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
     "DOT1P_TO_TC_MAP": {
         "AZURE": {
-            "0": "0",
-            "1": "1",
+            "0": "1",
+            "1": "0",
             "2": "2",
             "3": "3",
             "4": "4",

From 4ec13fd556f7d7768b9733b8f1edf7012b04544f Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Fri, 21 May 2021 01:47:46 +0300
Subject: [PATCH 0485/1674] Fix python version (#7658)

#### Why I did it
To avoid the following logs
```
Mar 15 15:52:04.599302 igk-dut-04 INFO database#/supervisord: flushdb /bin/bash: /usr/local/bin/flush_unused_database: /usr/bin/python: bad interpreter: No such file or directory
Mar 15 15:52:04.599947 igk-dut-04 INFO database#supervisord 2021-03-15 15:52:04,599 INFO exited: flushdb (exit status 126; not expected)
```

#### How I did it
Fix  shebang
#### How to verify it
Check the logs
---
 dockers/docker-database/flush_unused_database | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-database/flush_unused_database b/dockers/docker-database/flush_unused_database
index 10cacb5e0b33..e253bc2a4c5d 100755
--- a/dockers/docker-database/flush_unused_database
+++ b/dockers/docker-database/flush_unused_database
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import swsssdk
 import redis
 import subprocess

From 63354c0daaa8aaf0a35f3388701f7c312050cf9e Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Mon, 24 May 2021 09:20:39 -0700
Subject: [PATCH 0486/1674] DellEMC: Z9332f fix SFP issues (#7677)

#### Why I did it
xcvrd crashes when the application advertisement capability flag is not seen for few transceivers.

#### How I did it
Initialize the additional application capability in dunder init
---
 .../z9332f/sonic_platform/sfp.py              | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 318e9485b88f..7089e8698d68 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -277,6 +277,7 @@ def __init__(self, index, sfp_type, eeprom_path):
         self.sfpDomInfo = sff8472Dom(None,1)
         self.qsfp_dd_Info = qsfp_dd_InterfaceId()
         self.qsfp_dd_DomInfo = qsfp_dd_Dom()
+        self.qsfp_dd_app2_list = False
 
     def get_eeprom_sysfs_path(self):
         return self.eeprom_path
@@ -292,18 +293,6 @@ def detect_dom_capability(self):
                 dom_capability = self.qsfp_dd_Info.parse_dom_capability(qsfp_dom_capability_raw, 0)
                 if dom_capability['data']['Flat_MEM']['value'] == 'Off':
                     self.qsfp_dd_app2_list = True
-                    self.dom_rx_power_supported = True
-                    self.dom_tx_power_supported = True
-                    self.dom_tx_bias_supported = True
-                else:
-                    self.qsfp_dd_app2_list = False
-                    self.dom_rx_power_supported = False
-                    self.dom_tx_power_supported = False
-                    self.dom_tx_bias_supported = False
-            else:
-                self.dom_rx_power_supported = False
-                self.dom_tx_power_supported = False
-                self.dom_tx_bias_supported = False
 
     def _strip_unit_from_str(self, value_str):
         match = re.match(r'(.*)C$|(.*)Volts$|(.*)mA$|(.*)dBm$', value_str)
@@ -629,7 +618,7 @@ def get_transceiver_info(self):
                     break
                 host_electrical, media_interface = self.qsfp_dd_Info.parse_application(sfp_media_type_dict,
                                             sfp_application_type_list[i * 4], sfp_application_type_list[i * 4 + 1])
-                host_media_list = host_media_list + host_electrical + ' - ' + media_interface
+                host_media_list = host_media_list + host_electrical + ' - ' + media_interface + '    '
             transceiver_info_dict['application_advertisement'] = host_media_list
 
         return transceiver_info_dict
@@ -1079,8 +1068,6 @@ def get_tx_bias(self):
             if self.sfp_type == 'QSFP_DD':
                 if self.qsfp_dd_DomInfo is None:
                     return None
-                if not self.dom_tx_bias_supported:
-                    return None
                 tx_bias_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXBIAS_OFFSET, QSFP_DD_TXBIAS_WIDTH)
                 tx_bias_data = self.qsfp_dd_DomInfo.parse_dom_tx_bias(tx_bias_data_raw, 0)
 
@@ -1115,8 +1102,6 @@ def get_rx_power(self):
             if self.sfp_type == 'QSFP_DD':
                 if self.qsfp_dd_DomInfo is None:
                     return None
-                if not self.dom_rx_power_supported:
-                    return None
 
                 offset = 128
                 rx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_RXPOWER_OFFSET, QSFP_DD_TXPOWER_WIDTH)
@@ -1154,9 +1139,6 @@ def get_tx_power(self):
                 if self.qsfp_dd_DomInfo is None:
                     return None
 
-                if not self.dom_tx_power_supported:
-                    return None
-
                 tx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXPOWER_OFFSET,
                                                          QSFP_DD_TXPOWER_WIDTH)
                 tx_power_data = self.qsfp_dd_DomInfo.parse_dom_tx_power(tx_power_data_raw, 0)

From ff1e5ef8b77432db85c7418a124ac8015c2123d7 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 24 May 2021 09:33:33 -0700
Subject: [PATCH 0487/1674] Update MMU and QOS settings for
 Arista-7050QX-32S-S4Q31 (#7672)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
Need proper MMU and Qos settings for Arista-7050QX-32S-S4Q31

How I did it
Updated the settings based on Arista-7050-QX-32S
---
 .../buffers_defaults_t0.j2                    |  49 ++++++
 .../buffers_defaults_t1.j2                    |   2 +-
 .../Arista-7050QX-32S-S4Q31/qos.json.j2       | 149 +-----------------
 3 files changed, 51 insertions(+), 149 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..d93aa34893d6
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -0,0 +1,49 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
+    {% for port_idx in range(1,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
index f72e3eb06fb5..d93aa34893d6 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
@@ -24,7 +24,7 @@
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "8072396",
+            "size": "7326924",
             "type": "egress",
             "mode": "dynamic"
         }
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
index 1accac3ddd0d..3e548325ea30 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
@@ -1,148 +1 @@
-{
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "MAP_PFC_PRIORITY_TO_QUEUE": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "TC_TO_QUEUE_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0":"0",
-            "1":"0",
-            "2":"0",
-            "3":"3",
-            "4":"4",
-            "5":"0",
-            "6":"0",
-            "7":"0",
-            "8":"1",
-            "9":"0",
-            "10":"0",
-            "11":"0",
-            "12":"0",
-            "13":"0",
-            "14":"0",
-            "15":"0",
-            "16":"0",
-            "17":"0",
-            "18":"0",
-            "19":"0",
-            "20":"0",
-            "21":"0",
-            "22":"0",
-            "23":"0",
-            "24":"0",
-            "25":"0",
-            "26":"0",
-            "27":"0",
-            "28":"0",
-            "29":"0",
-            "30":"0",
-            "31":"0",
-            "32":"0",
-            "33":"0",
-            "34":"0",
-            "35":"0",
-            "36":"0",
-            "37":"0",
-            "38":"0",
-            "39":"0",
-            "40":"0",
-            "41":"0",
-            "42":"0",
-            "43":"0",
-            "44":"0",
-            "45":"0",
-            "46":"0",
-            "47":"0",
-            "48":"0",
-            "49":"0",
-            "50":"0",
-            "51":"0",
-            "52":"0",
-            "53":"0",
-            "54":"0",
-            "55":"0",
-            "56":"0",
-            "57":"0",
-            "58":"0",
-            "59":"0",
-            "60":"0",
-            "61":"0",
-            "62":"0",
-            "63":"0"
-        }
-    },
-    "SCHEDULER": {
-        "scheduler.0" : {
-            "type":"DWRR",
-            "weight": "25"
-        },
-        "scheduler.1" : {
-            "type":"DWRR",
-            "weight": "30"
-        },
-        "scheduler.2" : {
-            "type":"DWRR",
-            "weight": "20"
-        }
-    },
-    "PORT_QOS_MAP": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
-            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable": "3,4"
-        }
-    },
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable":"true",
-            "wred_yellow_enable":"true",
-            "wred_red_enable":"true",
-            "ecn":"ecn_all",
-            "red_max_threshold":"312000",
-            "red_min_threshold":"104000",
-            "yellow_max_threshold":"312000",
-            "yellow_min_threshold":"104000",
-            "green_max_threshold":"312000",
-            "green_min_threshold":"104000"
-        }
-    },
-    "QUEUE": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.0]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3" : {
-            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|4" : {
-            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.1]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|1" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.2]"
-        }
-    }
-}
+{%- include 'qos_config.j2' %}

From 38a29254a63466fae4bbdae76acc2e4f7ace415e Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Tue, 25 May 2021 02:23:32 +0300
Subject: [PATCH 0488/1674] [sonic-snmpagent] submodule update (#7636)

Includes below commits:
748b545 2021-04-05 [SNMP] Update description of entPhysicalDescr mib in case interface is not configured.
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index c20bf604361c..748b545f396f 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit c20bf604361c7a1ea47f0815897df6dbb2239a01
+Subproject commit 748b545f396f132b8decb206d2f6a5bcf5445cac

From 7a8e77d8beef0dc572c468d6dc7e7606c7f4b677 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Tue, 25 May 2021 09:35:25 -0700
Subject: [PATCH 0489/1674] [202012] FEC none config through minigraph (#7670)

When FECDisabled is set to true in minigraph.py, push 'fec' 'none' explicitly to config_db. When 'fec' is defined in port_config.ini do not override it with 'rs' for 100G

Backport of #7667 to 202012 branch.
---
 src/sonic-config-engine/minigraph.py         |  6 ++++--
 src/sonic-config-engine/tests/test_cfggen.py | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 661287791763..cc00b485e0aa 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1329,9 +1329,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     for port_name, port in list(ports.items()):
         # get port alias from port_config.ini
         alias = port.get('alias', port_name)
-        # generate default 100G FEC
+        # generate default 100G FEC only if FECDisabled is not true and 'fec' is not defined in port_config.ini
         # Note: FECDisabled only be effective on 100G port right now
-        if port.get('speed') == '100000' and linkmetas.get(alias, {}).get('FECDisabled', '').lower() != 'true':
+        if linkmetas.get(alias, {}).get('FECDisabled', '').lower() == 'true':
+            port['fec'] = 'none'
+        elif not port.get('fec') and port.get('speed') == '100000':
             port['fec'] = 'rs'
 
         # If AutoNegotiation is available in the minigraph, we override any value we may have received from port_config.ini
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 63e2ac044a91..2ca675c165c2 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -336,7 +336,7 @@ def test_minigraph_port_fec_disabled(self):
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
-            utils.to_dict("{'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '100000', 'autoneg': '1'}")
+            utils.to_dict("{'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '100000', 'autoneg': '1', 'fec': 'none'}")
         )
 
     def test_minigraph_port_autonegotiation(self):
@@ -347,8 +347,8 @@ def test_minigraph_port_autonegotiation(self):
             utils.to_dict(output.strip()),
             utils.to_dict(
                 "{'Ethernet0': {'alias': 'fortyGigE0/0', 'pfc_asym': 'off', 'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'mtu': '9100'}, "
-                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000'}, "
-                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000', 'fec': 'none'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0', 'fec': 'none'}, "
                 "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'fortyGigE0/12', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up'}, "
                 "'Ethernet16': {'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/16', 'admin_status': 'up'}, "
                 "'Ethernet20': {'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/20', 'admin_status': 'up'}, "
@@ -388,8 +388,8 @@ def test_minigraph_port_autonegotiation(self):
             utils.to_dict(output.strip()),
             utils.to_dict(
                 "{'Ethernet0': {'lanes': '29,30,31,32', 'description': 'fortyGigE0/0', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'pfc_asym': 'off', 'autoneg': '0'}, "
-                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000'}, "
-                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'Servers0:eth0', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'autoneg': '1', 'speed': '100000', 'fec': 'none'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'fortyGigE0/8', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'autoneg': '0', 'fec': 'none'}, "
                 "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'fortyGigE0/12', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'autoneg': '0'}, "
                 "'Ethernet16': {'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/16', 'admin_status': 'up', 'autoneg': '0'}, "
                 "'Ethernet20': {'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/20', 'admin_status': 'up', 'autoneg': '0'}, "

From bc5b367d3700a7a388d93ec5dc29a504189ec440 Mon Sep 17 00:00:00 2001
From: LuiSzee <luisze9512@gmail.com>
Date: Tue, 25 May 2021 23:17:44 +0800
Subject: [PATCH 0490/1674] [radv] fix bug for radv can't startup if
 DEVICE_METADATA.localhost.type is NULL (#7651)

Co-authored-by: Shi Lei <shil@centecnetworks.com>
---
 ...ocker-router-advertiser.supervisord.conf.j2 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index 6df8e4527af4..3be84f54fda5 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -44,14 +44,16 @@ dependent_startup_wait_for=rsyslogd:running
 {# But not for specific deployment_id #}
 {%- set vlan_v6 = namespace(count=0) -%}
 {%- if DEVICE_METADATA.localhost.deployment_id != "8" -%}
-  {%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%}
-    {%- if VLAN_INTERFACE -%}
-      {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
-        {# If this VLAN has an IPv6 address... #}
-        {%- if prefix | ipv6 -%}
-          {%- set vlan_v6.count = vlan_v6.count + 1 -%}
-        {%- endif -%}
-      {%- endfor -%}
+  {%- if DEVICE_METADATA.localhost.type -%}
+    {%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%}
+      {%- if VLAN_INTERFACE -%}
+        {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
+          {# If this VLAN has an IPv6 address... #}
+          {%- if prefix | ipv6 -%}
+            {%- set vlan_v6.count = vlan_v6.count + 1 -%}
+          {%- endif -%}
+        {%- endfor -%}
+      {%- endif -%}
     {%- endif -%}
   {%- endif -%}
 {%- endif -%}

From 908e1a75246360e79e5bf273e3b5ef5a973f2d5c Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 20 May 2021 05:51:05 -0700
Subject: [PATCH 0491/1674] [bgpcfgd] Enable BGP sessions over subinterfaces
 (#7654)

Signed-off-by: Neetha John nejo@microsoft.com

Fixes #7531

Why I did it
To enable bgp sessions to be established over subinterfaces

How I did it
Listen to VLAN_SUB_INTERFACE table in config db

How to verify it
Bgp sessions were established successfully over subinterface
---
 src/sonic-bgpcfgd/bgpcfgd/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 64d2edbed174..799390273dae 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -43,6 +43,7 @@ def do_work():
         InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME),
         InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_VLAN_INTF_TABLE_NAME),
         InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_LAG_INTF_TABLE_NAME),
+        InterfaceMgr(common_objs, "CONFIG_DB", swsscommon.CFG_VLAN_SUB_INTF_TABLE_NAME),
         # State DB managers
         ZebraSetSrc(common_objs, "STATE_DB", swsscommon.STATE_INTERFACE_TABLE_NAME),
         # Peer Managers

From 55c798adf35c304163f8510db9f8fb287cc2654b Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 24 May 2021 17:15:37 -0700
Subject: [PATCH 0492/1674] Update PG profile settings for
 Arista-7050QX-32S-S4Q31 (#7673)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
PG profile settings need to be aligned with Arista-7050-QX-32S

How I did it
Copy over the current settings from Arista-7050-QX-32S and define params for 10G and 1G speeds as well
---
 .../pg_profile_lookup.ini                     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
index f961fd33b138..389a7da97287 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
@@ -1,14 +1,17 @@
 # PG lossless profiles.
 # speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   41808     18432   40560  -4        2496
-  40000  5m   41808     18432   40560  -4        2496
-  50000  5m   41808     18432   40560  -4        2496
- 100000  5m   41808     18432   40560  -4        2496
-  10000  40m  41808     18432   40560  -4        2496
-  40000  40m  41808     18432   40560  -4        2496
-  50000  40m  41808     18432   40560  -4        2496
- 100000  40m  41808     18432   40560  -4        2496
-  10000  300m 41808     18432   40560  -4        2496
-  40000  300m 41808     18432   40560  -4        2496
-  50000  300m 41808     18432   40560  -4        2496
- 100000  300m 41808     18432   40560  -4        2496
+   1000  5m   41808     18432   40560  -3        2496
+  10000  5m   41808     18432   40560  -3        2496
+  40000  5m   46384     18432   45136  -3        2496
+  50000  5m   46592     18432   45344  -3        2496
+ 100000  5m   48464     18432   47216  -3        2496
+   1000  40m  41808     18432   40560  -3        2496
+  10000  40m  41808     18432   40560  -3        2496
+  40000  40m  48464     18432   47216  -3        2496
+  50000  40m  49296     18432   48048  -3        2496
+ 100000  40m  53872     18432   52624  -3        2496
+   1000  300m 41808     18432   40560  -3        2496
+  10000  300m 41808     18432   40560  -3        2496
+  40000  300m 64064     18432   62816  -3        2496
+  50000  300m 68848     18432   67600  -3        2496
+ 100000  300m 92976     18432   91728  -3        2496

From c53f58e488b515aa31f29eeca93171102b26835f Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Tue, 25 May 2021 03:23:49 +0300
Subject: [PATCH 0493/1674] Remove 'vm.panic_on_oom=1' (#7678)

#### Why I did it
If a process limits using nodes by mempolicy/cpusets, and those nodes become memory exhaustion status, one process may be killed by oom-killer.
No panic occurs in this case, because other node's memory may be free.
This means system total status may be not fatal yet.

#### How I did it
Remove 'vm.panic_on_oom=1' kernel flag from 'vmcore-sysctl.conf '
---
 files/image_config/kdump/vmcore-sysctl.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/image_config/kdump/vmcore-sysctl.conf b/files/image_config/kdump/vmcore-sysctl.conf
index 9a4016197cbd..1eb8646683a2 100755
--- a/files/image_config/kdump/vmcore-sysctl.conf
+++ b/files/image_config/kdump/vmcore-sysctl.conf
@@ -4,4 +4,3 @@ kernel.panic_on_io_nmi=1
 kernel.panic_on_stackoverflow=1
 kernel.hung_task_panic=1
 kernel.unknown_nmi_panic=1
-vm.panic_on_oom=1

From 0fa3404a62fd08a978a9b53b0e7227dbbfc62f00 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Tue, 25 May 2021 23:48:17 +0300
Subject: [PATCH 0494/1674] [barefoot][device] Support pcied on Mavericks
 (#7705)

Add pcie.yaml to enable pcied on Mavericks platform

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../x86_64-accton_wedge100bf_65x-r0/pcie.yaml | 412 ++++++++++++++++++
 .../pmon_daemon_control.json                  |   2 +-
 2 files changed, 413 insertions(+), 1 deletion(-)
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_65x-r0/pcie.yaml

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pcie.yaml b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pcie.yaml
new file mode 100644
index 000000000000..52035fa8df81
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pcie.yaml
@@ -0,0 +1,412 @@
+- bus: '00'
+  dev: '00'
+  fn: '0'
+  id: 6f00
+  name: 'Host bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+    (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 6f02
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '1'
+  id: 6f03
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '0'
+  id: 6f04
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '2'
+  id: 6f06
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '0'
+  id: 6f28
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Map/VTd_Misc/System Management (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '1'
+  id: 6f29
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO Hot Plug (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '2'
+  id: 6f2a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO RAS/Control Status/Global Errors (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '4'
+  id: 6f2c
+  name: 'PIC: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC (rev
+    03)'
+- bus: '00'
+  dev: '16'
+  fn: '0'
+  id: 8c3a
+  name: 'Communication controller: Intel Corporation 8 Series/C220 Series Chipset
+    Family MEI Controller #1 (rev 04)'
+- bus: '00'
+  dev: '16'
+  fn: '1'
+  id: 8c3b
+  name: 'Communication controller: Intel Corporation 8 Series/C220 Series Chipset
+    Family MEI Controller #2 (rev 04)'
+- bus: '00'
+  dev: 1d
+  fn: '0'
+  id: 8c26
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #1 (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '0'
+  id: 8c54
+  name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
+    SKU LPC Controller (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '3'
+  id: 8c22
+  name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
+    (rev 05)'
+- bus: '02'
+  dev: '00'
+  fn: '0'
+  id: '1533'
+  name: 'Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev
+    03)'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: 6f50
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 0'
+- bus: '03'
+  dev: '00'
+  fn: '1'
+  id: 6f51
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 1'
+- bus: '03'
+  dev: '00'
+  fn: '2'
+  id: 6f52
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 2'
+- bus: '03'
+  dev: '00'
+  fn: '3'
+  id: 6f53
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 3'
+- bus: '04'
+  dev: '00'
+  fn: '0'
+  id: 10a6
+  name: 'Unassigned class [ff00]: Intel Corporation 82599EB 10-Gigabit Dummy Function'
+- bus: '05'
+  dev: '00'
+  fn: '0'
+  id: '0010'
+  name: 'Unassigned class [ff00]: Device 1d1c:0010 (rev 10)'
+- bus: ff
+  dev: 0b
+  fn: '0'
+  id: 6f81
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '1'
+  id: 6f36
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '2'
+  id: 6f37
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: 6f76
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link Debug (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '0'
+  id: 6fe0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '1'
+  id: 6fe1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '2'
+  id: 6fe2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '3'
+  id: 6fe3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '0'
+  id: 6ff8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '4'
+  id: 6ffc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '5'
+  id: 6ffd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '6'
+  id: 6ffe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '0'
+  id: 6f1d
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '1'
+  id: 6f34
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '5'
+  id: 6f1e
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '6'
+  id: 6f7d
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '7'
+  id: 6f1f
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '0'
+  id: 6fa0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '1'
+  id: 6f30
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '0'
+  id: 6fa8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '1'
+  id: 6f71
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '2'
+  id: 6faa
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '3'
+  id: 6fab
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '4'
+  id: 6fac
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '5'
+  id: 6fad
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '6'
+  id: 6fae
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Broadcast (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '7'
+  id: 6faf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Global Broadcast (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '0'
+  id: 6fb0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '1'
+  id: 6fb1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '2'
+  id: 6fb2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '3'
+  id: 6fb3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '4'
+  id: 6fbc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '5'
+  id: 6fbd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '6'
+  id: 6fbe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '7'
+  id: 6fbf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '0'
+  id: 6fb4
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '1'
+  id: 6fb5
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '2'
+  id: 6fb6
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Error (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '3'
+  id: 6fb7
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Error (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '0'
+  id: 6f98
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '1'
+  id: 6f99
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '2'
+  id: 6f9a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '3'
+  id: 6fc0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '4'
+  id: 6f9c
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '0'
+  id: 6f88
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '2'
+  id: 6f8a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
index d23e302dab34..b58e59ba000c 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json
@@ -1,5 +1,5 @@
 {
-    "skip_pcied": true,
+    "skip_pcied": false,
     "skip_fancontrol": true,
     "skip_thermalctld": false,
     "skip_ledd": true,

From ef7ac729cc47a5f69c1cc95f994e683202ea82c3 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Wed, 26 May 2021 01:41:53 +0800
Subject: [PATCH 0495/1674] [Mellanox] Update the Spectrum-2 platform PSU
 sensor's label in the sensor conf file (#7706)

#### Why I did it
The label for PSU related sensors on the Spectrum-2 platform is not aligned with the physical location of the PSU.

#### How I did it
Update the label in the sensor conf file for those relevant platforms

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../x86_64-mlnx_msn3420-r0/sensors.conf       | 22 +++++++--------
 .../x86_64-mlnx_msn3700-r0/sensors.conf       | 28 +++++++++----------
 .../x86_64-mlnx_msn3700c-r0/sensors.conf      | 28 +++++++++----------
 .../x86_64-mlnx_msn3800-r0/sensors.conf       | 28 +++++++++----------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn3420-r0/sensors.conf
index f31cbe7adbc7..b0e4901eccca 100644
--- a/device/mellanox/x86_64-mlnx_msn3420-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/sensors.conf
@@ -79,17 +79,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
     chip "dps460-i2c-*-58"
-        label in1 "PSU-1 220V Rail (in)"
-        label in2 "PSU-1 12V Rail (out)"
-        label fan1 "PSU-1 Fan 1"
-        label temp1 "PSU-1 Temp 1"
-        label temp2 "PSU-1 Temp 2"
-        label temp3 "PSU-1 Temp 3"
-        label power1 "PSU-1 220V Rail Pwr (in)"
-        label power2 "PSU-1 12V Rail Pwr (out)"
-        label curr1 "PSU-1 220V Rail Curr (in)"
-        label curr2 "PSU-1 12V Rail Curr (out)"
-    chip "dps460-i2c-*-59"
         label in1 "PSU-2 220V Rail (in)"
         label in2 "PSU-2 12V Rail (out)"
         label fan1 "PSU-2 Fan 1"
@@ -100,6 +89,17 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
         label power2 "PSU-2 12V Rail Pwr (out)"
         label curr1 "PSU-2 220V Rail Curr (in)"
         label curr2 "PSU-2 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-1 220V Rail (in)"
+        label in2 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf
index 28a889aa27d2..281f0a54dfa3 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf
@@ -72,20 +72,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
     chip "dps460-i2c-*-58"
-        label in1 "PSU-1 220V Rail (in)"
-        ignore in2
-        label in3 "PSU-1 12V Rail (out)"
-        label fan1 "PSU-1 Fan 1"
-        ignore fan2
-        ignore fan3
-        label temp1 "PSU-1 Temp 1"
-        label temp2 "PSU-1 Temp 2"
-        label temp3 "PSU-1 Temp 3"
-        label power1 "PSU-1 220V Rail Pwr (in)"
-        label power2 "PSU-1 12V Rail Pwr (out)"
-        label curr1 "PSU-1 220V Rail Curr (in)"
-        label curr2 "PSU-1 12V Rail Curr (out)"
-    chip "dps460-i2c-*-59"
         label in1 "PSU-2 220V Rail (in)"
         ignore in2
         label in3 "PSU-2 12V Rail (out)"
@@ -99,6 +85,20 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
         label power2 "PSU-2 12V Rail Pwr (out)"
         label curr1 "PSU-2 220V Rail Curr (in)"
         label curr2 "PSU-2 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf
index 3c58e27f3e68..094cd78cde57 100644
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf
@@ -72,20 +72,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
     chip "dps460-i2c-*-58"
-        label in1 "PSU-1 220V Rail (in)"
-        ignore in2
-        label in3 "PSU-1 12V Rail (out)"
-        label fan1 "PSU-1 Fan 1"
-        ignore fan2
-        ignore fan3
-        label temp1 "PSU-1 Temp 1"
-        label temp2 "PSU-1 Temp 2"
-        label temp3 "PSU-1 Temp 3"
-        label power1 "PSU-1 220V Rail Pwr (in)"
-        label power2 "PSU-1 12V Rail Pwr (out)"
-        label curr1 "PSU-1 220V Rail Curr (in)"
-        label curr2 "PSU-1 12V Rail Curr (out)"
-    chip "dps460-i2c-*-59"
         label in1 "PSU-2 220V Rail (in)"
         ignore in2
         label in3 "PSU-2 12V Rail (out)"
@@ -99,6 +85,20 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
         label power2 "PSU-2 12V Rail Pwr (out)"
         label curr1 "PSU-2 220V Rail Curr (in)"
         label curr2 "PSU-2 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf
index 9777c5e84398..7ba5f9c8c050 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf
@@ -93,20 +93,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
     chip "dps460-i2c-*-58"
-        label in1 "PSU-1 220V Rail (in)"
-        ignore in2
-        label in3 "PSU-1 12V Rail (out)"
-        label fan1 "PSU-1 Fan 1"
-        ignore fan2
-        ignore fan3
-        label temp1 "PSU-1 Temp 1"
-        label temp2 "PSU-1 Temp 2"
-        label temp3 "PSU-1 Temp 3"
-        label power1 "PSU-1 220V Rail Pwr (in)"
-        label power2 "PSU-1 12V Rail Pwr (out)"
-        label curr1 "PSU-1 220V Rail Curr (in)"
-        label curr2 "PSU-1 12V Rail Curr (out)"
-    chip "dps460-i2c-*-59"
         label in1 "PSU-2 220V Rail (in)"
         ignore in2
         label in3 "PSU-2 12V Rail (out)"
@@ -120,6 +106,20 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
         label power2 "PSU-2 12V Rail Pwr (out)"
         label curr1 "PSU-2 220V Rail Curr (in)"
         label curr2 "PSU-2 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"

From 5b5131f26dfd3804121d901c119e94ac6ce1fab5 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 26 May 2021 21:58:58 +0800
Subject: [PATCH 0496/1674] [ci/build]: Upgrade SONiC package versions (#7701)

---
 files/build/versions/default/versions-deb-buster     |  4 ++--
 files/build/versions/default/versions-py3            |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster   | 10 +++++-----
 .../dockers/sonic-slave-stretch/versions-deb-stretch | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 6a35f501a1f0..f1c6f764a439 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -200,8 +200,8 @@ libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libuv1==1.24.1-1
 libwrap0==7.6.q-28
-libx11-6==2:1.6.7-1+deb10u1
-libx11-data==2:1.6.7-1+deb10u1
+libx11-6==2:1.6.7-1+deb10u2
+libx11-data==2:1.6.7-1+deb10u2
 libxau6==1:1.0.8-1+b2
 libxcb-render0==1.13.1-2
 libxcb-shm0==1.13.1-2
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index d18a7a081246..7137358b1b38 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.17.0
+protobuf==3.17.1
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 95759538295b..a0e3ecdc197a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1131,12 +1131,12 @@ libwrap0==7.6.q-28
 libwrap0-dev==7.6.q-28
 libwww-perl==6.36-2
 libwww-robotrules-perl==6.02-1
-libx11-6==2:1.6.7-1+deb10u1
-libx11-data==2:1.6.7-1+deb10u1
-libx11-dev==2:1.6.7-1+deb10u1
+libx11-6==2:1.6.7-1+deb10u2
+libx11-data==2:1.6.7-1+deb10u2
+libx11-dev==2:1.6.7-1+deb10u2
 libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.7-1+deb10u1
-libx11-xcb1==2:1.6.7-1+deb10u1
+libx11-xcb-dev==2:1.6.7-1+deb10u2
+libx11-xcb1==2:1.6.7-1+deb10u2
 libx264-155==2:0.155.2917+git0a84d98-2
 libx265-165==2.9-4
 libx32asan5==8.3.0-6
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index b760be99ccd8..32b11f9ce7d3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1010,13 +1010,13 @@ libwrap0==7.6.q-26
 libwrap0-dev==7.6.q-26
 libwww-perl==6.15-1
 libwww-robotrules-perl==6.01-1
-libx11-6==2:1.6.4-3+deb9u3
-libx11-data==2:1.6.4-3+deb9u3
-libx11-dev==2:1.6.4-3+deb9u3
-libx11-doc==2:1.6.4-3+deb9u3
+libx11-6==2:1.6.4-3+deb9u4
+libx11-data==2:1.6.4-3+deb9u4
+libx11-dev==2:1.6.4-3+deb9u4
+libx11-doc==2:1.6.4-3+deb9u4
 libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.4-3+deb9u3
-libx11-xcb1==2:1.6.4-3+deb9u3
+libx11-xcb-dev==2:1.6.4-3+deb9u4
+libx11-xcb1==2:1.6.4-3+deb9u4
 libx32asan3==6.3.0-18+deb9u1
 libx32atomic1==6.3.0-18+deb9u1
 libx32cilkrts5==6.3.0-18+deb9u1

From 9e3e769b8907cba01fe8cdcf204322bf614a4841 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 27 May 2021 08:19:09 -0700
Subject: [PATCH 0497/1674] [bgpcfgd] Enable BGP sessions over subinterfaces
 (#7654) (#7696)

Signed-off-by: Neetha John nejo@microsoft.com

Fixes #7531

Why I did it
To enable bgp sessions to be established over subinterfaces

How I did it
Listen to VLAN_SUB_INTERFACE table in config db

How to verify it
Bgp sessions were established successfully over subinterface

From c67ead6558314898c024750a49f96a05abfb70e1 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 27 May 2021 08:19:29 -0700
Subject: [PATCH 0498/1674] [202012][sonic-platform-common] Update submodule
 (#7695)

---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 872f0a306bb8..5f4b2c9054e2 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 872f0a306bb8508b1974cebdf62482a25ce7cf1a
+Subproject commit 5f4b2c9054e2cdb776ff2f8a36aef1ad35e6cfed

From 5d29a2c2a66c03dfbf13b09e5dd1edf71fe9d4b2 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 27 May 2021 15:11:03 -0700
Subject: [PATCH 0499/1674] [202012] BRCM SAI 4.3.3.5-3 Enable VFP-based
 subintf on td2 (#7728)

Why I did it
This SAI change is to Enable TD2 platforms to also be able to handle VFP-based sub-interfaces.
This is the feature that is also needed for TD2 platforms.

How to verify it
Guohan and Team has validated this feature change on TD2 platforms
---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 3a49a2f113f0..44e837229187 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -42,7 +42,9 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r==033eb38248063745cb27efcd70f942a7
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r==2e8e0d581fdf9748269f63e887afec6b
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r==211346a9163a9a7bc57d5bcd1ae85eb0
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r==5300744d3bdfbe42b5486d540453abf4
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
@@ -57,4 +59,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 74fb8bb58ebb..884f381aed08 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.5-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.5-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 53b3d378c79ede95cedeb490934486a545cd5c8e Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Wed, 26 May 2021 17:59:08 -0700
Subject: [PATCH 0500/1674] Invoke disk check periodically. (#7374)

Why I did it
Helps with periodic scan of disk for RO state.
If found, this script makes transient fix and raise error message.
---
 files/image_config/monit/conf.d/sonic-host | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/files/image_config/monit/conf.d/sonic-host b/files/image_config/monit/conf.d/sonic-host
index 17d7c64af7e2..8af94b3f2964 100644
--- a/files/image_config/monit/conf.d/sonic-host
+++ b/files/image_config/monit/conf.d/sonic-host
@@ -31,5 +31,12 @@ check program routeCheck with path "/usr/local/bin/route_check.py"
     every 5 cycles
     if status != 0 for 3 cycle then alert repeat every 1 cycles
 
+# Check if /etc & /home are writable. If not, make them writable.
+# Raise syslog error message, in case of underlying issues
+#
+check program diskCheck with path "/usr/local/bin/disk_check.py"
+    every 5 cycles
+    if status != 0 for 3 cycle then alert repeat every 1 cycles
+
 check program container_checker with path "/usr/bin/container_checker"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

From bd6096a018c14e2e9866f77950371359eb8fc3d2 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Sun, 23 May 2021 16:40:43 -0400
Subject: [PATCH 0501/1674] [ntp] Fix ntp.conf template to allow setting of
 source port in CONFIG_DB (#7586)

Why I did it
Currently, there is a bug in the ntp.conf jinja2 template where it will ignore the src_intf directive in CONFIG_DB if there are multiple IP addresses associated with an interface. This code change fixes that bug and allows the template to select the correct source interface for NTP.

How I did it
I did this by modifying the macro in ntp.conf.j2 which determines if there is an ip address associated with an interface to set a state variable when it detects a valid interface entry in CONFIG_DB instead of outputting "true" directly (which could result in multiple "trues" outputted for interfaces with multiple valid IP addresses).

How to verify it
Add two ipv4 addresses to an interface in SONiC

Add the following configuration to config_db.json

{
"NTP": {
    "global": {
        "src_intf": "Ethernet1"
        }
    }
}
Replace Ethernet1 with the interface name of the one you assigned the IP addresses to.

Run sudo config reload -y

Open /etc/ntp.conf and verify that the following line exists

...
interface listen Ethernet1
...
The interface specified should be the one set in the previous steps.

Description for the changelog
[ntp] Fix ntp.conf template to allow setting of source port in CONFIG_DB
---
 files/image_config/ntp/ntp.conf.j2            |  4 +-
 .../tests/data/ntp/ntp_interfaces.json        | 12 ++++
 src/sonic-config-engine/tests/ntp.conf.j2     |  1 +
 .../tests/sample_output/py2/ntp.conf          | 72 +++++++++++++++++++
 .../tests/sample_output/py3/ntp.conf          | 72 +++++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py |  9 +++
 6 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/tests/data/ntp/ntp_interfaces.json
 create mode 120000 src/sonic-config-engine/tests/ntp.conf.j2
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/ntp.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/ntp.conf

diff --git a/files/image_config/ntp/ntp.conf.j2 b/files/image_config/ntp/ntp.conf.j2
index 4b763219325c..280b46a426d8 100644
--- a/files/image_config/ntp/ntp.conf.j2
+++ b/files/image_config/ntp/ntp.conf.j2
@@ -41,13 +41,15 @@ interface ignore wildcard
 # if the source interface is configured but no ip on that interface, then listen on another
 # interface based on existing logic
 {%- macro check_ip_on_interface(interface_name, table_name) %}
+    {%- set ns = namespace(valid_intf = 'false') %}
     {%- if table_name %}
         {%- for (name, source_prefix) in table_name|pfx_filter %}
             {%- if source_prefix and name == interface_name %}
-true
+                {%- set ns.valid_intf = 'true' %}
             {%- endif %}
         {%- endfor %}
     {%- endif %}
+{{ ns.valid_intf }}
 {%- endmacro %}
 
 {% set ns = namespace(source_intf = "") %}
diff --git a/src/sonic-config-engine/tests/data/ntp/ntp_interfaces.json b/src/sonic-config-engine/tests/data/ntp/ntp_interfaces.json
new file mode 100644
index 000000000000..284758301411
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/ntp/ntp_interfaces.json
@@ -0,0 +1,12 @@
+{
+    "NTP": {
+        "global": {
+            "src_intf": "Ethernet0"
+        }
+    },
+    "INTERFACE": {
+        "Ethernet0": {},
+        "Ethernet0|10.0.0.0/31": {},
+        "Ethernet0|192.168.0.122/24": {}
+    }
+}
diff --git a/src/sonic-config-engine/tests/ntp.conf.j2 b/src/sonic-config-engine/tests/ntp.conf.j2
new file mode 120000
index 000000000000..bc52df834e26
--- /dev/null
+++ b/src/sonic-config-engine/tests/ntp.conf.j2
@@ -0,0 +1 @@
+../../../files/image_config/ntp/ntp.conf.j2
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/sample_output/py2/ntp.conf b/src/sonic-config-engine/tests/sample_output/py2/ntp.conf
new file mode 100644
index 000000000000..bc98019e88f7
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/ntp.conf
@@ -0,0 +1,72 @@
+###############################################################################
+# Managed by Ansible
+# file: ansible/roles/acs/templates/ntp.conf.j2
+###############################################################################
+
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+# To avoid ntpd from panic and exit if the drift between new time and
+# current system time is large.
+tinker panic 0
+
+driftfile /var/lib/ntp/ntp.drift
+
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+#server ntp.your-provider.example
+
+# pool.ntp.org maps to about 1000 low-stratum NTP servers.  Your server will
+# pick a different set every time it starts up.  Please consider joining the
+# pool: <http://www.pool.ntp.org/join.html>
+
+#listen on source interface if configured, else 
+#only listen on MGMT_INTERFACE, LOOPBACK_INTERFACE ip when MGMT_INTERFACE is not defined, or eth0 
+# if we don't have both of them (default is to listen on all ip addresses)
+interface ignore wildcard
+
+# set global variable for configured source interface name
+# set global boolean to indicate if the ip of the configured source interface is configured
+# if the source interface is configured but no ip on that interface, then listen on another
+# interface based on existing logic
+                                        
+interface listen Ethernet0
+interface listen 127.0.0.1
+
+# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
+# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
+# might also be helpful.
+#
+# Note that "restrict" applies to both servers and clients, so a configuration
+# that might be intended to block requests from certain clients could also end
+# up blocking replies from your own upstream servers.
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access, but only if
+# cryptographically authenticated.
+#restrict 192.168.123.0 mask 255.255.255.0 notrust
+
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet, de-comment the
+# next lines.  Please do this only if you trust everybody on the network!
+#disable auth
+#broadcastclient
diff --git a/src/sonic-config-engine/tests/sample_output/py3/ntp.conf b/src/sonic-config-engine/tests/sample_output/py3/ntp.conf
new file mode 100644
index 000000000000..bc98019e88f7
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/ntp.conf
@@ -0,0 +1,72 @@
+###############################################################################
+# Managed by Ansible
+# file: ansible/roles/acs/templates/ntp.conf.j2
+###############################################################################
+
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+# To avoid ntpd from panic and exit if the drift between new time and
+# current system time is large.
+tinker panic 0
+
+driftfile /var/lib/ntp/ntp.drift
+
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+#server ntp.your-provider.example
+
+# pool.ntp.org maps to about 1000 low-stratum NTP servers.  Your server will
+# pick a different set every time it starts up.  Please consider joining the
+# pool: <http://www.pool.ntp.org/join.html>
+
+#listen on source interface if configured, else 
+#only listen on MGMT_INTERFACE, LOOPBACK_INTERFACE ip when MGMT_INTERFACE is not defined, or eth0 
+# if we don't have both of them (default is to listen on all ip addresses)
+interface ignore wildcard
+
+# set global variable for configured source interface name
+# set global boolean to indicate if the ip of the configured source interface is configured
+# if the source interface is configured but no ip on that interface, then listen on another
+# interface based on existing logic
+                                        
+interface listen Ethernet0
+interface listen 127.0.0.1
+
+# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
+# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
+# might also be helpful.
+#
+# Note that "restrict" applies to both servers and clients, so a configuration
+# that might be intended to block requests from certain clients could also end
+# up blocking replies from your own upstream servers.
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access, but only if
+# cryptographically authenticated.
+#restrict 192.168.123.0 mask 255.255.255.0 notrust
+
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet, de-comment the
+# next lines.  Please do this only if you trust everybody on the network!
+#disable auth
+#broadcastclient
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 8a6fdf5c3934..8b4e9c686bae 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -297,6 +297,15 @@ def test_ndppd_conf(self):
         self.run_script(argument)
         assert filecmp.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
 
+    def test_ntp_conf(self):
+        conf_template = os.path.join(self.test_dir, "ntp.conf.j2")
+        ntp_interfaces_json = os.path.join(self.test_dir, "data", "ntp", "ntp_interfaces.json")
+        expected = os.path.join(self.test_dir, "sample_output", utils.PYvX_DIR, "ntp.conf")
+
+        argument = '-j {} -t {} > {}'.format(ntp_interfaces_json, conf_template, self.output_file)
+        self.run_script(argument)
+        assert filecmp.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
+
     def tearDown(self):
         try:
             os.remove(self.output_file)

From cb3a9eec5830609ddd713a3f1e37b65d378ddb09 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 26 May 2021 09:12:54 -0700
Subject: [PATCH 0502/1674] [swss.service]: Remove ordering with pmon (#7614)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/per_namespace/swss.service.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2
index 5fb86929d3ba..9dd7b42c4d9d 100644
--- a/files/build_templates/per_namespace/swss.service.j2
+++ b/files/build_templates/per_namespace/swss.service.j2
@@ -14,7 +14,7 @@ After=updategraph.service
 After=interfaces-config.service
 BindsTo=sonic.target
 After=sonic.target
-Before=ntp-config.service pmon.service
+Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 

From c5d27750f23ab6868d98b01fbe9e0f5ba90ccc92 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Wed, 26 May 2021 18:28:10 +0800
Subject: [PATCH 0503/1674] Fix supervisor-proc-exit-listener startup issue in
 restapi (#7681)

* Fix supervisor-proc-exit-listener startup issue in restapi

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 dockers/docker-sonic-restapi/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index 683f10ab4da8..4286a6dd3ec3 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name restapi
+command=python2 /usr/bin/supervisor-proc-exit-listener --container-name restapi
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false

From cd7d04d08abd26194dbb42d18ebe4d0f4e0815d3 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Wed, 26 May 2021 09:17:48 -0700
Subject: [PATCH 0504/1674] K8S handles hostname in lower case (#7694)

Why I did it
k8s handles in lower case, so the code ensures that it uses hostname in all lower case

How I did it
Wrapper for device_info.get_hostname that returns in lower case. This wrapper is used in all places that require hostname to use in kubectl commands.

How to verify it
Device joins successfully.
---
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     | 18 +++++-----
 src/sonic-ctrmgrd/tests/kube_commands_test.py | 36 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index 5eaad0a82bb2..9a6ea9ed8dff 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -25,9 +25,6 @@
 FLANNEL_CONF_FILE = "/usr/share/sonic/templates/kube_cni.10-flannel.conflist"
 CNI_DIR = "/etc/cni/net.d"
 
-# kubectl --kubeconfig <KUBE_ADMIN_CONF> label nodes
-#       <device_info.get_hostname()> <label to be added>
-
 def log_debug(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
     print(msg)
@@ -49,6 +46,9 @@ def to_str(s):
 
     return str(s)
 
+def get_device_name():
+    return str(device_info.get_hostname()).lower()
+
 
 def _run_command(cmd, timeout=5):
     """ Run shell command and return exit code, along with stdout. """
@@ -82,7 +82,7 @@ def kube_read_labels():
 
     labels = {}
     ret, out, _ = _run_command(KUBECTL_GET_CMD.format(
-        KUBE_ADMIN_CONF, device_info.get_hostname()))
+        KUBE_ADMIN_CONF, get_device_name()))
 
     if ret == 0:
         lst = out.split(",")
@@ -130,9 +130,9 @@ def kube_write_labels(set_labels):
         # First remove if any
         if del_label_str:
             (ret, _, _) = _run_command(KUBECTL_SET_CMD.format(
-            KUBE_ADMIN_CONF, device_info.get_hostname(), del_label_str.strip()))
+            KUBE_ADMIN_CONF, get_device_name(), del_label_str.strip()))
         (ret, _, _) = _run_command(KUBECTL_SET_CMD.format(
-            KUBE_ADMIN_CONF, device_info.get_hostname(), add_label_str.strip()))
+            KUBE_ADMIN_CONF, get_device_name(), add_label_str.strip()))
 
         log_debug("{} kube labels {} ret={}".format(
             "Applied" if ret == 0 else "Failed to apply", add_label_str, ret))
@@ -251,10 +251,10 @@ def _do_reset(pending_join = False):
     if os.path.exists(KUBE_ADMIN_CONF):
         _run_command(
                 "kubectl --kubeconfig {} --request-timeout 20s drain {} --ignore-daemonsets".
-                format(KUBE_ADMIN_CONF, device_info.get_hostname()))
+                format(KUBE_ADMIN_CONF, get_device_name()))
 
         _run_command("kubectl --kubeconfig {} --request-timeout 20s delete node {}".
-                format(KUBE_ADMIN_CONF, device_info.get_hostname()))
+                format(KUBE_ADMIN_CONF, get_device_name()))
 
     _run_command("kubeadm reset -f", 10)
     _run_command("rm -rf {}".format(CNI_DIR))
@@ -279,7 +279,7 @@ def _do_join(server, port, insecure):
 
         if ret == 0:
             (ret, out, err) = _run_command(KUBEADM_JOIN_CMD.format(
-                KUBE_ADMIN_CONF, device_info.get_hostname()), timeout=60)
+                KUBE_ADMIN_CONF, get_device_name()), timeout=60)
             log_debug("ret = {}".format(ret))
 
     except IOError as e:
diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py
index 7c1436e1f6eb..637802ab1d9f 100755
--- a/src/sonic-ctrmgrd/tests/kube_commands_test.py
+++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py
@@ -26,7 +26,7 @@
         common_test.RETVAL: 0,
         common_test.PROC_CMD: ["\
 kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: ["foo=bar,hello=world"],
         common_test.POST: {
             "foo": "bar",
@@ -40,7 +40,7 @@
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
 kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.POST: {
         },
         common_test.PROC_KILLED: 1
@@ -50,7 +50,7 @@
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
 kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: [""],
         common_test.PROC_ERR: ["command failed"],
         common_test.POST: {
@@ -66,10 +66,10 @@
         common_test.ARGS: { "foo": "bar", "hello": "World!", "test": "ok" },
         common_test.PROC_CMD: [
 "kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
-"kubectl --kubeconfig {} label --overwrite nodes None hello-".format(
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
+"kubectl --kubeconfig {} label --overwrite nodes none hello-".format(
     KUBE_ADMIN_CONF),
-"kubectl --kubeconfig {} label --overwrite nodes None hello=World! test=ok".format(
+"kubectl --kubeconfig {} label --overwrite nodes none hello=World! test=ok".format(
     KUBE_ADMIN_CONF)
  ],
         common_test.PROC_OUT: ["foo=bar,hello=world", "", ""]
@@ -80,7 +80,7 @@
         common_test.ARGS: { "foo": "bar", "hello": "world" },
         common_test.PROC_CMD: [
 "kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
  ],
         common_test.PROC_OUT: ["foo=bar,hello=world"]
     },
@@ -91,7 +91,7 @@
         common_test.RETVAL: -1,
         common_test.PROC_CMD: [
 "kubectl --kubeconfig {} get nodes --show-labels |\
- grep None | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+ grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
 ],
         common_test.PROC_ERR: ["read failed"]
     }
@@ -103,10 +103,10 @@
         common_test.RETVAL: 0,
         common_test.ARGS: ["10.3.157.24", 6443, True, False],
         common_test.PROC_CMD: [
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
+            "kubectl --kubeconfig {} --request-timeout 20s drain none \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
+none".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
             "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
@@ -114,7 +114,7 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name None".format(
+            "kubeadm join --discovery-file {} --node-name none".format(
                 KUBE_ADMIN_CONF)
         ],
         common_test.PROC_RUN: [True, True]
@@ -124,10 +124,10 @@
         common_test.RETVAL: 0,
         common_test.ARGS: ["10.3.157.24", 6443, False, False],
         common_test.PROC_CMD: [
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
+            "kubectl --kubeconfig {} --request-timeout 20s drain none \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
+none".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
             "rm -rf {}".format(CNI_DIR),
             "systemctl stop kubelet",
@@ -135,7 +135,7 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name None".format(
+            "kubeadm join --discovery-file {} --node-name none".format(
                 KUBE_ADMIN_CONF)
         ],
         common_test.PROC_RUN: [True, True]
@@ -165,10 +165,10 @@
         common_test.DO_JOIN: True,
         common_test.ARGS: [False],
         common_test.PROC_CMD: [
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
+            "kubectl --kubeconfig {} --request-timeout 20s drain none \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
+none".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
             "rm -rf {}".format(CNI_DIR),
             "rm -f {}".format(KUBE_ADMIN_CONF),
@@ -180,10 +180,10 @@
         common_test.RETVAL: 0,
         common_test.ARGS: [False],
         common_test.PROC_CMD: [
-            "kubectl --kubeconfig {} --request-timeout 20s drain None \
+            "kubectl --kubeconfig {} --request-timeout 20s drain none \
 --ignore-daemonsets".format(KUBE_ADMIN_CONF),
             "kubectl --kubeconfig {} --request-timeout 20s delete node \
-None".format(KUBE_ADMIN_CONF),
+none".format(KUBE_ADMIN_CONF),
             "kubeadm reset -f",
             "rm -rf {}".format(CNI_DIR),
             "rm -f {}".format(KUBE_ADMIN_CONF),

From 7a816ed5fadc26e099507fedd7ea3d1b190f3694 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 26 May 2021 09:12:34 -0700
Subject: [PATCH 0505/1674] [Mux] Do not clean-up HW_MUX_CABLE_TABLE from State
 DB (#7710)

Co-authored-by: Ubuntu <prsunny@prince-vm.vzw1i4tqyeburcdz5lrgulxi2c.yx.internal.cloudapp.net>
---
 files/scripts/swss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 97e50cb975e7..25e948e5e6da 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -146,7 +146,7 @@ start() {
         $SONIC_DB_CLI ASIC_DB FLUSHDB
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', '*MUX_CABLE_TABLE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*'"
     fi
 
     # start service docker

From aa445bec9a3f82bd1f0adec0a984f6d45021a63c Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 27 May 2021 08:20:07 -0700
Subject: [PATCH 0506/1674] [MMU] define T1 MMU configuratino for
 Arista-7260CX3-Q64 (#7718)

Why I did it
Arista-7260CX3-Q64 is missing T1 MMU configuration.

How I did it
Define T1 MMU configuration for Arista-7260CX3-Q64.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Arista-7260CX3-Q64/buffers.json.j2        |  2 +-
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 46 +++++++++++++++++++
 .../Arista-7260CX3-Q64/config.bcm.j2          | 23 +++++++---
 3 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2
index e6e9e844469b..b67cf577ab75 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2
@@ -1,3 +1,3 @@
-{%- set default_topo = 't0' %}
+{%- set default_topo = 't1' %}
 {%- include 'buffers_config.j2' %}
 
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..2fff9cbc771b
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index 807b3d9f18cb..616ccb0e990b 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -1,11 +1,20 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
-{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
-{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
-{%-     if 'dualtor' in switch_subtype.lower() %}
-{%-         set IPinIP_sock = 'sai_tunnel_support=1
-                               host_as_route_disable=1
-                               l3_ecmp_levels=2' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
+{%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
+{%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-         if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%-             set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
+{%-         endif %}
+{%-     endif %}
+{%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-         if 'dualtor' in switch_subtype.lower() %}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
+{%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
@@ -1023,7 +1032,7 @@ serdes_preemphasis_115=0x61c01
 serdes_preemphasis_116=0x105004
 serdes_preemphasis_117=0x105004
 
-mmu_init_config="MSFT-TH2-Tier0"
+{{ mmu_sock }}
 {{ IPinIP_sock }}
 
 phy_an_lt_msft=1

From 7ca8b458ee68db44e5bf89ecbcf6ee2487bc5c8a Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Thu, 27 May 2021 19:17:23 +0800
Subject: [PATCH 0507/1674] update hw-mgmt version to 2304 (#7725)

- Why I did it
Pick up fix from new hw-management package:
Fix gearbox thermal zone name, which was lack suffix thermal zone number

- How I did it
Update the hw-management version number in the make file
Update hw-management submodule pointer

- How to verify it
Run platform related test cases on Mellanox platform
---
 platform/mellanox/hw-management.mk      | 2 +-
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 0c2f6a7d28d0..3f8724fa1358 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2303
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2304
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 8cd7f9872ec4..5aaacf787c8f 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 8cd7f9872ec4f8ca54863fc2c83722ae7ecc196a
+Subproject commit 5aaacf787c8f1631e1617884abf4d9879ac23151

From babaaaad6b17f06af35c93d3cd62796323754561 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Fri, 28 May 2021 00:52:45 +0800
Subject: [PATCH 0508/1674] [Mellanox] Add support for MSN4600 A1 system
 (#7732)

Add new sensor conf for MSN4600 A1 system
Add a Mellanox hw-management patch to support MSN4600 A1 system
---
 .../get_sensors_conf_path                     |   1 +
 .../x86_64-mlnx_msn4600-r0/sensors.conf.a1    | 133 ++++++++++++++++++
 ...gmt-system-MSN4600-A1-BU-config1-fix.patch |  28 ++++
 3 files changed, 162 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1
 create mode 100644 platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch

diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path
new file mode 120000
index 000000000000..f1509a1e1d3d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path
@@ -0,0 +1 @@
+../x86_64-mlnx_msn4700-r0/get_sensors_conf_path
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1 b/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1
new file mode 100644
index 000000000000..dfe848ca8aa4
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1
@@ -0,0 +1,133 @@
+################################################################################
+# Copyright (c) 2021 Mellanox Technologies
+#
+# Platform specific sensors config for SN4600
+################################################################################
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label power1 "PMIC-1 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-1 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)"
+        label in3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label power1 "PMIC-2 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-2 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)"
+        label curr3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 ASIC 0.85V T0_1 Rail (out)"
+        label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-3 ASIC 0.85V T0_1 Rail Pwr (out)"
+        label curr1 "PMIC-3 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)"
+        label curr3 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 ASIC 0.85V T2_3 Rail (out)"
+        label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label power1 "PMIC-4 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-4 ASIC 0.85V T2_3 Rail Pwr (out)"
+        label curr1 "PMIC-4 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)"
+        label curr3 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
+    chip "mp2975-i2c-*-6e"
+        label in1 "PMIC-5 PSU 12V Rail (in1)"
+        label in2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)"
+        label in3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)"
+        label temp1 "PMIC-5 Temp 1"
+        label power1 "PMIC-5 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Pwr (out)"
+        label power3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Pwr (out)"
+        label curr1 "PMIC-5 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)"
+        label curr3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-6 PSU 12V Rail (in1)"
+        label in2 "PMIC-6 PSU 12V Rail (in2)"
+        label in3 "PMIC-6 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-6 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-7 PSU 12V Rail (in1)"
+        label in2 "PMIC-7 PSU 12V Rail (in2)"
+        label in3 "PMIC-7 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-7 Temp 1"
+        label temp2 "PMIC-7 Temp 2"
+        label power1 "PMIC-7 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-7 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"
diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch b/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch
new file mode 100644
index 000000000000..391121cff4b8
--- /dev/null
+++ b/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch
@@ -0,0 +1,28 @@
+From 1b2c2343d62b2fadb5c8fc9e61f2f654f4085193 Mon Sep 17 00:00:00 2001
+From: Mykola Kostenok <c_mykolak@nvidia.com>
+Date: Wed, 12 May 2021 10:59:57 +0300
+Subject: [PATCH] hw-mgmt: system: MSN4600 A1 BU config1 fix
+
+Fix config1 matching for MSN4600.
+
+Signed-off-by: Mykola Kostenok <c_mykolak@nvidia.com>
+---
+ usr/usr/bin/hw-management.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
+index d5b2728..150e583 100755
+--- a/usr/usr/bin/hw-management.sh
++++ b/usr/usr/bin/hw-management.sh
+@@ -728,7 +728,7 @@ msn46xx_specific()
+ 	if [ $res -eq 0 ]; then
+ 		sys_ver=$(cut "$regio_path"/config1 -d' ' -f 1)
+ 		case $sys_ver in
+-			3)
++			1)
+ 				connect_msn4700_msn4600_A1
+ 			;;
+ 			*)
+-- 
+1.7.1
+

From 8fc68f9781d95208a8769e59354ef3c3ab73b1c7 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 28 May 2021 08:41:09 -0700
Subject: [PATCH 0509/1674] [202012][swss][utilities] advance submodule heads
 (#7739)

sonic-utilities:
* 8b98d45 2021-05-25 | [show] support for show muxcable firmware version of only active banks (#1629) (HEAD -> 202012) [vdahiya12]
* afd0975 2021-05-20 | [show] add support for muxcable metrics (#1615) [vdahiya12]

sonic-swss
* 7611df5 2021-05-27 | [tunneldecaporch] Set default MTU for the overlay loopback interface (#1756) (HEAD -> 202012) [Volodymyr Samotiy]
* 22fbb5c 2021-05-27 | [202012] Resolve neighbor when nexthop does not exist (#1759) (github/202012) [Shi Su]
* ec7710c 2021-05-27 | [Bulk mode] Limit the size of bulker (#1760) [Shi Su]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss      | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 05f043869591..22fbb5c9f21e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 05f04386959106a4f120e44671205f074442151e
+Subproject commit 22fbb5c9f21e0f1273463048b5a63120ce0c1696
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 97fc442fb839..8b98d453418d 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 97fc442fb8394ee7ce6a02a372870911ec2a20a0
+Subproject commit 8b98d453418d80a1c2f24717d8294b8d19d1d858

From bedcc44cb733b31b2c0f3b8e501d2596da1b2bce Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Sat, 29 May 2021 03:23:20 +0800
Subject: [PATCH 0510/1674] [as7726-32x] Support API2.0 (#7729)

Add platform API 2.0 support for as7726-32x platform

Signed-off-by: Jostar Yang <jostar_yang@accton.com.tw>
---
 .../sonic_platform/__init__.py                |    2 +
 .../sonic_platform/chassis.py                 |  212 +++
 .../sonic_platform/component.py               |  123 ++
 .../sonic_platform/eeprom.py                  |  131 ++
 .../sonic_platform/event.py                   |   55 +
 .../sonic_platform/fan.py                     |  238 ++++
 .../sonic_platform/helper.py                  |  117 ++
 .../sonic_platform/platform.py                |   21 +
 .../sonic_platform/psu.py                     |  257 ++++
 .../sonic_platform/sfp.py                     | 1166 +++++++++++++++++
 .../sonic_platform/thermal.py                 |  147 +++
 .../as7726-32x/sonic_platform_setup.py        |   34 +
 .../utils/accton_as7726_32x_util.py           |   50 +-
 .../sonic-platform-accton-as7726-32x.install  |    2 +
 14 files changed, 2552 insertions(+), 3 deletions(-)
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/__init__.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/chassis.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/component.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/eeprom.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/event.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/fan.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/helper.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/platform.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/psu.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/sfp.py
 create mode 100644 device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform_setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7726-32x.install

diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/__init__.py
new file mode 100644
index 000000000000..43435472a423
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+from . import platform
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/chassis.py
new file mode 100644
index 000000000000..01d552382dc1
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/chassis.py
@@ -0,0 +1,212 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Chassis information which are available in the platform
+#
+#############################################################################
+
+import os
+import sys
+
+try:
+    from sonic_platform_base.chassis_base import ChassisBase
+    from .helper import APIHelper
+    from .event import SfpEvent
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN_TRAY = 6
+NUM_FAN = 2
+NUM_PSU = 2
+NUM_THERMAL = 5
+NUM_PORT = 34
+NUM_COMPONENT = 4
+HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
+PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
+REBOOT_CAUSE_FILE = "reboot-cause.txt"
+PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+
+class Chassis(ChassisBase):
+    """Platform-specific Chassis class"""
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self._api_helper = APIHelper()
+        self._api_helper = APIHelper()
+        self.is_host = self._api_helper.is_host()
+        
+        self.config_data = {}
+        
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
+        self.__initialize_sfp()
+        self.__initialize_eeprom()
+    
+    def __initialize_sfp(self):
+        from sonic_platform.sfp import Sfp
+        for index in range(0, NUM_PORT):
+            sfp = Sfp(index)
+            self._sfp_list.append(sfp)
+        self.sfp_module_initialized = True
+        
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fant_index in range(0, NUM_FAN_TRAY):
+            for fan_index in range(0, NUM_FAN):
+                fan = Fan(fant_index, fan_index)
+                self._fan_list.append(fan)
+                
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+    
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
+        for index in range(0, NUM_THERMAL):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+    
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
+        for index in range(0, NUM_COMPONENT):
+            component = Component(index)
+            self._component_list.append(component)
+
+    def __initialize_watchdog(self):
+        from sonic_platform.watchdog import Watchdog
+        self._watchdog = Watchdog()
+    
+
+    def __is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+    
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+    
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.get_mac()
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._eeprom.get_pn()
+        
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.get_eeprom()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+      
+        reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
+        sw_reboot_cause = self._api_helper.read_txt_file(
+            reboot_cause_path) or "Unknown"
+
+
+        return ('REBOOT_CAUSE_NON_HARDWARE', sw_reboot_cause)
+
+    def get_change_event(self, timeout=0):
+        # SFP event
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        status, sfp_event = SfpEvent(self._sfp_list).get_sfp_event(timeout)
+        
+        return status, sfp_event
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/component.py
new file mode 100644
index 000000000000..e1e5b2cd4b7f
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/component.py
@@ -0,0 +1,123 @@
+#############################################################################
+# Edgecore
+#
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
+#
+#############################################################################
+
+import shlex
+import subprocess
+
+try:
+    from sonic_platform_base.component_base import ComponentBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_ADDR_MAPPING = {
+    "CPLD1": "11-0060",
+    "CPLD2": "12-0062",
+    "CPLD3": "13-0064",
+}
+SYSFS_PATH = "/sys/bus/i2c/devices/"
+BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
+COMPONENT_LIST= [
+   ("CPLD1", "CPLD 1"),
+   ("CPLD2", "CPLD 2"),
+   ("CPLD3", "CPLD 3"),
+   ("BIOS", "Basic Input/Output System")
+   
+]
+
+class Component(ComponentBase):
+    """Platform-specific Component class"""
+
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_index=0):
+        self._api_helper=APIHelper()
+        ComponentBase.__init__(self)
+        self.index = component_index
+        self.name = self.get_name()
+
+    def __run_command(self, command):
+        # Run bash command and print output to stdout
+        try:
+            process = subprocess.Popen(
+                shlex.split(command), stdout=subprocess.PIPE)
+            while True:
+                output = process.stdout.readline()
+                if output == '' and process.poll() is not None:
+                    break
+            rc = process.poll()
+            if rc != 0:
+                return False
+        except Exception:
+            return False
+        return True
+
+    def __get_bios_version(self):
+        # Retrieves the BIOS firmware version
+        try:
+            with open(BIOS_VERSION_PATH, 'r') as fd:
+                bios_version = fd.read()
+                return bios_version.strip()
+        except Exception as e:
+            return None
+   
+    def __get_cpld_version(self):
+        # Retrieves the CPLD firmware version
+        cpld_version = dict()
+        for cpld_name in CPLD_ADDR_MAPPING:
+            try:
+                cpld_path = "{}{}{}".format(SYSFS_PATH, CPLD_ADDR_MAPPING[cpld_name], '/version')
+                cpld_version_raw= self._api_helper.read_txt_file(cpld_path)
+                cpld_version[cpld_name] = "{}".format(int(cpld_version_raw,16))
+            except Exception as e:
+                print('Get exception when read cpld')
+                cpld_version[cpld_name] = 'None'
+        
+        return cpld_version
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+         Returns:
+            A string containing the name of the component
+        """
+        return COMPONENT_LIST[self.index][0]
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+            Returns:
+            A string containing the description of the component
+        """
+        return COMPONENT_LIST[self.index][1]
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of module
+        Returns:
+            string: The firmware versions of the module
+        """
+        fw_version = None
+
+        if self.name == "BIOS":
+            fw_version = self.__get_bios_version()
+        elif "CPLD" in self.name:
+            cpld_version = self.__get_cpld_version()
+            fw_version = cpld_version.get(self.name)
+
+        return fw_version
+
+    def install_firmware(self, image_path):
+        """
+        Install firmware to module
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        raise NotImplementedError
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/eeprom.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..5b586fa09362
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/eeprom.py
@@ -0,0 +1,131 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+    
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+NULL = 'N/A'
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/0-0056/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+               
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+    
+    def _valid_tlv(self, eeprom_data):
+        tlvinfo_type_codes_list = [
+            self._TLV_CODE_PRODUCT_NAME,
+            self._TLV_CODE_PART_NUMBER,
+            self._TLV_CODE_SERIAL_NUMBER,
+            self._TLV_CODE_MAC_BASE,
+            self._TLV_CODE_MANUF_DATE,
+            self._TLV_CODE_DEVICE_VERSION,
+            self._TLV_CODE_LABEL_REVISION,
+            self._TLV_CODE_PLATFORM_NAME,
+            self._TLV_CODE_ONIE_VERSION,
+            self._TLV_CODE_MAC_SIZE,
+            self._TLV_CODE_MANUF_NAME,
+            self._TLV_CODE_MANUF_COUNTRY,
+            self._TLV_CODE_VENDOR_NAME,
+            self._TLV_CODE_DIAG_VERSION,
+            self._TLV_CODE_SERVICE_TAG,
+            self._TLV_CODE_VENDOR_EXT,
+            self._TLV_CODE_CRC_32
+        ]
+
+        for code in tlvinfo_type_codes_list:
+            code_str = "0x{:X}".format(code)
+            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
+        return eeprom_data
+
+    def get_eeprom(self):
+        return self._valid_tlv(self._eeprom)
+
+    def get_pn(self):
+        return self._eeprom.get('0x22', NULL)
+
+    def get_serial(self):
+        return self._eeprom.get('0x23', NULL)
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', NULL)
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/event.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/event.py
new file mode 100644
index 000000000000..d77ee8c29dc5
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/event.py
@@ -0,0 +1,55 @@
+try:
+    import time
+    from .helper import APIHelper
+    from sonic_py_common.logger import Logger
+except ImportError as e:
+    raise ImportError(repr(e) + " - required module not found")
+
+
+class SfpEvent:
+    ''' Listen to insert/remove sfp events '''
+   
+    def __init__(self, sfp_list):
+        self._api_helper = APIHelper()
+        self._sfp_list = sfp_list
+        self._logger = Logger()
+
+    sfp_change_event_data = {'valid': 0, 'last': 0, 'present': 0}
+    def get_sfp_event(self, timeout=2000):
+        now = time.time()
+        port_dict = {}
+        change_dict = {}
+        change_dict['sfp'] = port_dict
+
+        if timeout < 1000:
+            timeout = 1000
+        timeout = timeout / float(1000)  # Convert to secs
+
+        if now < (self.sfp_change_event_data['last'] + timeout) and self.sfp_change_event_data['valid']:
+            return True, change_dict
+        
+        bitmap = 0
+        for sfp in self._sfp_list:
+            modpres = sfp.get_presence()
+            i=sfp.port_num-1
+            if modpres:
+                bitmap = bitmap | (1 << i)
+
+        changed_ports = self.sfp_change_event_data['present'] ^ bitmap
+        if changed_ports:
+            for sfp in self._sfp_list:
+                i=sfp.port_num-1
+                if (changed_ports & (1 << i)):
+                    if (bitmap & (1 << i)) == 0:
+                        port_dict[i+1] = '0'
+                    else:
+                        port_dict[i+1] = '1'
+
+
+            # Update the cache dict
+            self.sfp_change_event_data['present'] = bitmap
+            self.sfp_change_event_data['last'] = now
+            self.sfp_change_event_data['valid'] = 1
+            return True, change_dict
+        else:
+            return True, change_dict
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/fan.py
new file mode 100644
index 000000000000..839c3f09b616
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/fan.py
@@ -0,0 +1,238 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PSU_FAN_MAX_RPM = 25500
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/54-0066/fan"
+PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_I2C_MAPPING = {
+    0: {
+        "num": 50,
+        "addr": "5b"
+    },
+    1: {
+        "num": 49,
+        "addr": "58"
+    },
+}
+
+FAN_NAME_LIST = ["FAN-1F", "FAN-1R", "FAN-2F", "FAN-2R",
+                 "FAN-3F", "FAN-3R", "FAN-4F", "FAN-4R", 
+                 "FAN-5F", "FAN-5R", "FAN-6F", "FAN-6R"]
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        self._api_helper=APIHelper()
+        self.fan_index = fan_index
+        self.fan_tray_index = fan_tray_index
+        self.is_psu_fan = is_psu_fan
+        
+        if self.is_psu_fan:
+            self.psu_index = psu_index
+            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+
+        FanBase.__init__(self)
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        if not self.is_psu_fan:
+            dir_str = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_direction')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None: #F2B is FAN_DIRECTION_EXHAUST
+                direction = self.FAN_DIRECTION_EXHAUST if (
+                val == "0") else self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+
+        else: #For PSU
+            dir_str = "{}{}".format(self.psu_hwmon_path,'psu_fan_dir')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:
+                if val=='F2B':
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+                
+        return direction
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+                         
+        """
+        speed = 0
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
+            fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
+            if fan_speed_rpm is not None:
+                speed = (int(fan_speed_rpm,10))*100/PSU_FAN_MAX_RPM
+                if speed > 100:
+                    speed=100
+            else:
+                return 0
+        elif self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            speed=self._api_helper.read_txt_file(speed_path)
+            if speed is None:
+                return 0
+        return int(speed)
+            
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+
+        Note:
+            speed_pc = pwm_target/255*100
+
+            0   : when PWM mode is use
+            pwm : when pwm mode is not use
+        """
+        return False #Not supported
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return False #Not supported
+
+    def set_speed(self, speed):
+        """
+        Sets the fan speed
+        Args:
+            speed: An integer, the percentage of full fan speed to set fan to,
+                   in the range 0 (off) to 100 (full speed)
+        Returns:
+            A boolean, True if speed is set successfully, False if not
+
+        """
+        
+        if not self.is_psu_fan and self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            return self._api_helper.write_txt_file(speed_path, int(speed))
+
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return False #Not supported
+   
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status=self.get_presence()
+        if status is None:
+            return  self.STATUS_LED_COLOR_OFF
+
+        return {
+            1: self.STATUS_LED_COLOR_GREEN,
+            0: self.STATUS_LED_COLOR_RED            
+        }.get(status, self.STATUS_LED_COLOR_OFF)
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        fan_name = FAN_NAME_LIST[self.fan_tray_index*2 + self.fan_index] \
+            if not self.is_psu_fan \
+            else "PSU-{} FAN-{}".format(self.psu_index+1, self.fan_index+1)
+
+        return fan_name
+            
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        if not self.is_psu_fan:
+            present_path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_index+1, '_present')
+            val=self._api_helper.read_txt_file(present_path)
+            if val is not None:
+                return int(val, 10)==1
+            else:
+                return False
+        else:
+            return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_fault')
+            val=self._api_helper.read_txt_file(psu_fan_path)
+            if val is not None:
+                return int(val, 10)==0
+            else:
+                return False
+        else:    
+            path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_index+1, '_fault')
+            val=self._api_helper.read_txt_file(path)
+            if val is not None:
+                return int(val, 10)==0
+            else:
+                return False
+
+    
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+               
+        return "N/A"
+    
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return "N/A"
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..4cd60ac90611
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/helper.py
@@ -0,0 +1,117 @@
+import os
+import struct
+import subprocess
+from mmap import *
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except IOError:
+            return False
+        return True
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/platform.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/platform.py
new file mode 100644
index 000000000000..2f2c2a447fcf
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/platform.py
@@ -0,0 +1,21 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """Platform-specific Platform class"""
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/psu.py
new file mode 100644
index 000000000000..d8f4614b03b3
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/psu.py
@@ -0,0 +1,257 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+
+import logging
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+I2C_PATH ="/sys/bus/i2c/devices/{0}-00{1}/"
+
+PSU_NAME_LIST = ["PSU-1", "PSU-2"]
+PSU_NUM_FAN = [1, 1]
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 50,
+        "addr": "53"
+    },
+    1: {
+        "num": 49,
+        "addr": "50"
+    },
+}
+
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 50,
+        "addr": "5b"
+    },
+    1: {
+        "num": 49,
+        "addr": "58"
+    },
+}
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+    def __init__(self, psu_index=0):
+        PsuBase.__init__(self)
+        self.index = psu_index
+        self._api_helper = APIHelper()
+        
+        self.i2c_num = PSU_HWMON_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_HWMON_I2C_MAPPING[self.index]["addr"]
+        self.hwmon_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        
+        self.i2c_num = PSU_CPLD_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_CPLD_I2C_MAPPING[self.index]["addr"]
+        self.cpld_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+
+        self.__initialize_fan()
+        
+        logging.basicConfig(level=logging.DEBUG)
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            self._fan_list.append(fan)
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_v_out')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        iout_path = "{}{}".format(self.hwmon_path, 'psu_i_out')        
+        val=self._api_helper.read_txt_file(iout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        pout_path = "{}{}".format(self.hwmon_path, 'psu_p_out')        
+        val=self._api_helper.read_txt_file(pout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        
+        return False  #Controlled by HW
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status=self.get_status()
+        if status is None:
+            return  self.STATUS_LED_COLOR_OFF
+        
+        return {
+            1: self.STATUS_LED_COLOR_GREEN,
+            0: self.STATUS_LED_COLOR_RED            
+        }.get(status, self.STATUS_LED_COLOR_OFF)
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125 
+        """
+        temp_path = "{}{}".format(self.hwmon_path, 'psu_temp1_input')        
+        val=self._api_helper.read_txt_file(temp_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return False #Not supported
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_max')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_min')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """        
+        presence_path="{}{}".format(self.cpld_path, 'psu_present')
+        val=self._api_helper.read_txt_file(presence_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        power_path="{}{}".format(self.cpld_path, 'psu_power_good')
+        val=self._api_helper.read_txt_file(power_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        model_path="{}{}".format(self.cpld_path, 'psu_model_name')
+        model=self._api_helper.read_txt_file(model_path)
+        
+        if model is None:
+            return "N/A"
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        serial_path="{}{}".format(self.cpld_path, 'psu_serial_number')
+        serial=self._api_helper.read_txt_file(serial_path)
+        
+        if serial is None:
+            return "N/A"
+        return serial
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/sfp.py
new file mode 100644
index 000000000000..fdd11be0f253
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/sfp.py
@@ -0,0 +1,1166 @@
+#############################################################################
+# Edgecore
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+import sys
+
+from ctypes import create_string_buffer
+
+try:
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/11-0060/"
+
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 1
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 176
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+
+# Offset for values in SFP eeprom
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
+                           
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 34
+
+    # Path to sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+        
+    PLATFORM = "x86_64-accton_as7726_32x-r0"
+    HWSKU = "Accton-AS7726-32X"
+
+    _port_to_i2c_mapping = {
+        1:  21,
+        2:  22,
+        3:  23,
+        4:  24,
+        5:  26,
+        6:  25,
+        7:  28,
+        8:  27,
+        9:  17,
+        10: 18,
+        11: 19,
+        12: 20,
+        13: 29,
+        14: 30,
+        15: 31,
+        16: 32,
+        17: 33,
+        18: 34,
+        19: 35,
+        20: 36,
+        21: 45,
+        22: 46,
+        23: 47,
+        24: 48,
+        25: 37,
+        26: 38,
+        27: 39,
+        28: 40,
+        29: 41,
+        30: 42,
+        31: 43,
+        32: 44,
+        33: 15,
+        34: 16
+    }
+
+    def __init__(self, sfp_index=0):
+        self._api_helper=APIHelper()
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index + 1
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+        
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
+                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui',
+                               'application_advertisement', 'type_abbrv_name']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+                              'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+                                    'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            if sys.version_info[0] >= 3:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+        except Exception:
+            pass
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+        """
+        if self.port_num >= 33:
+            sfpi_obj = sff8472InterfaceId() #SFP
+        else:    
+            sfpi_obj = sff8436InterfaceId() #QSFP
+
+        if not self.get_presence() or not sfpi_obj:
+            return {}
+
+        if self.port_num >=33:
+            offset = SFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_SFP)
+        else:
+            offset = QSFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_QSFP)
+                
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+            sfp_interface_bulk_raw, 0)
+
+        sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+            sfp_vendor_name_raw, 0)
+
+        sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+            sfp_vendor_pn_raw, 0)
+
+        if self.port_num >=33:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_SFP)
+        else:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_QSFP)
+        
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+            sfp_vendor_rev_raw, 0)
+
+        sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+            sfp_vendor_sn_raw, 0)
+
+        sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+        if sfp_vendor_oui_raw is not None:
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_vendor_oui_raw, 0)
+
+        sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+            sfp_vendor_date_raw, 0)
+
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        compliance_code_dict = dict()
+
+        if sfp_interface_bulk_data:
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+            transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
+
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
+            'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
+        transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+            'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
+        transceiver_info_dict['cable_type'] = "Unknown"
+        transceiver_info_dict['cable_length'] = "Unknown"
+
+        if self.port_num >=33:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+            
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+        else:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+        
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+       
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num >=33: #SFP case
+            sfpd_obj = sff8472Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+            
+        else: #QSFP case
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not self.get_presence() or not sfpi_obj or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+    
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+    
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+    
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+    
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+    
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+    
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        #End of else
+        
+        
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num >= 33:
+            sfpd_obj = sff8472Dom()    
+            
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+                
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+    
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data[
+                    'data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_info_dict[key])
+    
+            return transceiver_dom_threshold_info_dict
+            
+            
+        else:
+            sfpd_obj = sff8436Dom()
+    
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_threshold_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_MODULE_THRESHOLD_OFFSET, QSFP_MODULE_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+    
+            if dom_thres_raw:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(
+                    dom_thres_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['VccLowWarning']['value']
+    
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+            channel_threshold_values = sfpd_obj.parse_channel_threshold_values(
+                dom_thres_raw, 0)
+            channel_threshold_data = channel_threshold_values.get('data')
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm'] = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = channel_threshold_data['TxBiasLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_dict[key])
+    
+            return transceiver_dom_threshold_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        if self.port_num >=33:
+            return False
+
+        reset_path="{}{}{}".format(CPLD_I2C_PATH , "module_reset_" , str(self.port_num))
+        val = self._api_helper.read_txt_file(reset_path)
+        
+        if val is not None:
+            return int(val, 10) == 1
+        else:        
+            return False
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        #rx_los = False
+        rx_los_list = []
+        
+        if self.port_num >=33:
+            #offset = 256
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    offset+SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    rx_los_list.append(rx_los_data & 0x02 != 0)
+            rx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_rx_los_', self.port_num)
+            rx_los=self._api_helper.read_txt_file(rx_path)
+            if rx_los is None:
+                return [False]
+            else:
+                return rx_los
+
+        else:
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_CHANNL_RX_LOS_STATUS_OFFSET, QSFP_CHANNL_RX_LOS_STATUS_WIDTH) if self.get_presence() else None
+            
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+                #rx_los = rx_los_list[0] and rx_los_list[1] and rx_los_list[2] and rx_los_list[3]
+            else:
+                return [False] * 4
+        
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        #tx_fault = False
+
+        tx_fault_list = []
+        
+        if self.port_num >=33:
+            offset=256
+            status_control_raw = self.__read_eeprom_specific_bytes(
+                    offset+SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            if status_control_raw is not None:
+                tx_fault_data = int(status_control_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+                
+        else:        
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_CHANNL_TX_FAULT_STATUS_OFFSET, QSFP_CHANNL_TX_FAULT_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                #tx_fault = tx_fault_list[0] and tx_fault_list[1] and tx_fault_list[2] and tx_fault_list[3]
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        
+        tx_disable_list = []
+        
+        if self.port_num >=33:
+            #offset = 256
+            #status_control_raw = self._read_eeprom_specific_bytes(
+            #    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw is not None:
+            #    tx_disable_data = int(status_control_raw[0], 16)
+            #    tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            #else:
+            #    return [False]
+            tx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_tx_disable_', self.port_num)
+            tx_disable=self._api_helper.read_txt_file(tx_path)
+            if tx_disable is not None:
+                return tx_disable 
+            else:
+                return False
+            
+            
+        else:
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX1Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX2Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX3Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX4Disable']['value'])
+            else:
+                return [False] * 4
+    
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        tx_disable_list = self.get_tx_disable()
+        if tx_disable_list is None:
+            return 0
+        tx_disabled = 0
+        for i in range(len(tx_disable_list)):
+            if tx_disable_list[i]:
+                tx_disabled |= 1 << i
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this SFP
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        if self.port_num >=33: #SFP not support it
+            return False
+        
+        power_set=self.get_power_set()
+        power_override = self.get_power_override()
+        return power_set and power_override
+
+    def get_power_set(self):
+        power_set = False
+        sfpd_obj = sff8436Dom()
+        if sfpd_obj is None:
+            return False
+        
+        dom_control_raw = self.__read_eeprom_specific_bytes(
+            QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+        if dom_control_raw is not None:
+            dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+            power_set = (
+                'On' == dom_control_data['data']['PowerSet']['value'])
+    
+        return power_set
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+        power_override = False
+        sfpd_obj = sff8436Dom()
+        if sfpd_obj is None:
+            return False
+    
+        dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+        if dom_control_raw is not None:
+            dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+            power_override = (
+                'On' == dom_control_data['data']['PowerOverride']['value'])
+
+        return power_override
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("temperature", "N/A")
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("voltage", "N/A")
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        tx1_bs = transceiver_dom_info_dict.get("tx1bias", "N/A")
+        tx2_bs = transceiver_dom_info_dict.get("tx2bias", "N/A")
+        tx3_bs = transceiver_dom_info_dict.get("tx3bias", "N/A")
+        tx4_bs = transceiver_dom_info_dict.get("tx4bias", "N/A")
+        
+        return [tx1_bs, tx2_bs, tx3_bs, tx4_bs] if transceiver_dom_info_dict else []
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        rx1_pw = transceiver_dom_info_dict.get("rx1power", "N/A")
+        rx2_pw = transceiver_dom_info_dict.get("rx2power", "N/A")
+        rx3_pw = transceiver_dom_info_dict.get("rx3power", "N/A")
+        rx4_pw = transceiver_dom_info_dict.get("rx4power", "N/A")
+        
+        return [rx1_pw, rx2_pw, rx3_pw, rx4_pw] if transceiver_dom_info_dict else []
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        tx1_pw = transceiver_dom_info_dict.get("tx1power", "N/A")
+        tx2_pw = transceiver_dom_info_dict.get("tx2power", "N/A")
+        tx3_pw = transceiver_dom_info_dict.get("tx3power", "N/A")
+        tx4_pw = transceiver_dom_info_dict.get("tx4power", "N/A")
+
+        return [tx1_pw, tx2_pw, tx3_pw, tx4_pw]
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default srate.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if self.port_num >=33: #SFP not support it
+            return False
+            
+        reset_path = "{}{}{}".format(CPLD_I2C_PATH , 'module_reset_' , self.port_num)
+        ret=self._api_helper.write_txt_file(reset_path, 1)
+        if ret is not True:
+            return ret
+
+        time.sleep(0.01)
+        ret=self._api_helper.write_txt_file(reset_path, 0)
+        
+        time.sleep(0.2)
+
+        return ret
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if self.port_num >=33:
+            tx_path = "{}{}{}".format(CPLD_I2C_PATH , 'module_tx_disable_' , self.port_num)
+            if tx_disable:
+                ret=self._api_helper.write_txt_file(tx_path, 1)
+            else:
+                ret=self._api_helper.write_txt_file(tx_path, 0)
+
+            if ret is not None:
+                time.sleep(0.01)
+                return ret
+            else:
+                return False
+         
+        if not self.get_presence():
+            return False
+       
+        sysfsfile_eeprom = None
+        try:
+            tx_disable_ctl = 0xf if tx_disable else 0x0
+            buffer = create_string_buffer(1)
+            if sys.version_info[0] >= 3:
+                buffer[0] = tx_disable_ctl
+            else:
+                buffer[0] = chr(tx_disable_ctl)
+            # Write to eeprom
+            sysfsfile_eeprom = open(
+                self.port_to_eeprom_mapping[self.port_num], "r+b")
+            sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+            sysfsfile_eeprom.write(buffer[0])
+        except IOError as e:
+            print ('Error: unable to open file: ',str(e))
+            return False
+        finally:
+            if sysfsfile_eeprom is not None:
+                sysfsfile_eeprom.close()
+                time.sleep(0.01)
+        
+        return True
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """ 
+        if self.port_num >=33:
+           return False
+               
+        if not self.get_presence():
+            return False
+
+        sysfsfile_eeprom = None
+        try:
+            channel_state = self.get_tx_disable_channel()
+            for i in range(4):
+                channel_mask = (1 << i)
+                if not (channel & channel_mask):
+                    continue
+
+                if disable:
+                    channel_state |= channel_mask
+                else:
+                    channel_state &= ~channel_mask
+
+            buffer = create_string_buffer(1)
+            if sys.version_info[0] >= 3:
+                buffer[0] = channel_state
+            else:
+                buffer[0] = chr(channel_state)
+            # Write to eeprom
+            sysfsfile_eeprom = open(
+                self.port_to_eeprom_mapping[self.port_num], "r+b")
+            sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+            sysfsfile_eeprom.write(buffer[0])
+        except IOError as e:
+            print ('Error: unable to open file: ', str(e))
+            return False
+        finally:
+            if sysfsfile_eeprom is not None:
+                sysfsfile_eeprom.close()
+                time.sleep(0.01)
+
+        return True
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if self.port_num >=33: #SFP not support it.
+            return False
+              
+        if lpmode:
+            self.set_power_override(True, True)
+        else:
+            self.set_power_override(False, False)
+    
+        return True
+       
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        if self.port_num >=33: #SFP not support it.
+            return False
+       
+        if not self.get_presence():
+            return False
+        try:
+            power_override_bit = (1 << 0) if power_override else 0
+            power_set_bit      = (1 << 1) if power_set else (1 << 3)
+    
+            buffer = create_string_buffer(1)
+            if sys.version_info[0] >= 3:
+                buffer[0] = (power_override_bit | power_set_bit)
+            else:
+                buffer[0] = chr(power_override_bit | power_set_bit)
+            # Write to eeprom
+            with open(self.port_to_eeprom_mapping[self.port_num], "r+b") as fd:
+                fd.seek(QSFP_POWEROVERRIDE_OFFSET)
+                fd.write(buffer[0])
+                time.sleep(0.01)
+        except Exception:
+            print ('Error: unable to open file: ', str(e))
+            return False
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(
+            self.__get_path_to_port_config_file())
+        name = sfputil_helper.logical[self.index] or "Unknown"
+        return name
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        present_path = "{}{}{}".format(CPLD_I2C_PATH , '/module_present_' , self.port_num)
+        val=self._api_helper.read_txt_file(present_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:
+            return False
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("model", "N/A")
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and self.get_transceiver_bulk_status()
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/thermal.py
new file mode 100644
index 000000000000..fea074ec37bb
--- /dev/null
+++ b/device/accton/x86_64-accton_as7726_32x-r0/sonic_platform/thermal.py
@@ -0,0 +1,147 @@
+#############################################################################
+# Edgecore
+#
+# Thermal contains an implementation of SONiC Platform Base API and
+# provides the thermal device status which are available in the platform
+#
+#############################################################################
+
+import os
+import os.path
+import glob
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    THERMAL_NAME_LIST = []
+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.index = thermal_index
+        # Add thermal name
+        self.THERMAL_NAME_LIST.append("Temp sensor 1")
+        self.THERMAL_NAME_LIST.append("Temp sensor 2")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")
+        self.THERMAL_NAME_LIST.append("Temp sensor 4")
+        self.THERMAL_NAME_LIST.append("Temp sensor 5")
+
+        # Set hwmon path
+        i2c_path = {
+            0: "55-0048/hwmon/hwmon*/", 
+            1: "55-0049/hwmon/hwmon*/", 
+            2: "55-004a/hwmon/hwmon*/",
+            3: "55-004b/hwmon/hwmon*/",
+            4: "54-004c/hwmon/hwmon*/"
+        }.get(self.index, None)
+          
+        self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
+        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self.ss_index = 1
+
+    def __read_txt_file(self, file_path):
+        for filename in glob.glob(file_path):
+            try:
+                with open(filename, 'r') as fd:
+                    data =fd.readline().rstrip()
+                    return data
+            except IOError as e:
+                pass
+
+        return None
+        
+    def __get_temp(self, temp_file):
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_temp = self.__read_txt_file(temp_file_path)
+        if raw_temp is not None:
+            return float(raw_temp)/1000
+        else:
+            return 0        
+
+    def __set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        for filename in glob.glob(temp_file_path):
+            try:
+                with open(filename, 'w') as fd:
+                    fd.write(str(temperature))
+                return True
+            except IOError as e:
+                print("IOError")
+
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+        Args :
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        temperature = temperature *1000
+        self.__set_threshold(temp_file, temperature)
+        
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal device
+            Returns:
+            string: The name of the thermal device
+        """
+        return self.THERMAL_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Thermal
+        Returns:
+            bool: True if Thermal is present, False if not
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_txt = self.__read_txt_file(temp_file_path)
+        if raw_txt is not None:
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+
+        file_str = "temp{}_input".format(self.ss_index)
+        file_path = os.path.join(self.hwmon_path, file_str)
+        raw_txt = self.__read_txt_file(file_path)
+        if raw_txt is None:
+            return False
+        else:     
+            return int(raw_txt) != 0
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform_setup.py
new file mode 100644
index 000000000000..96e64460d56c
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform_setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+DEVICE_NAME = 'accton'
+HW_SKU = 'x86_64-accton_as7726_32x-r0'  
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Accton Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='Jostar Yang',
+    maintainer_email='jostar_yang@edge-core.com',
+    packages=[
+        'sonic_platform',
+    ],
+    package_dir={
+        'sonic_platform': '../../../../device/{}/{}/sonic_platform'.format(DEVICE_NAME, HW_SKU)},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
index a6aa855174be..9518e0ba64ed 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
@@ -25,9 +25,6 @@
 command:
     install     : install drivers and generate related sysfs nodes
     clean       : uninstall drivers and remove related sysfs nodes
-    show        : show all systen status
-    sff         : dump SFP eeprom
-    set         : change board setting with fan|led|sfp
 """
 
 import commands
@@ -36,6 +33,7 @@
 import logging
 import re
 import time
+import os
 
 PROJECT_NAME = 'as7726_32x'
 version = '0.0.1'
@@ -165,6 +163,10 @@ def main():
            do_install()
         elif arg == 'clean':
            do_uninstall()
+        elif arg == 'api':
+           do_sonic_platform_install()
+        elif arg == 'api_clean':   
+           do_sonic_platform_clean()
         elif arg == 'show':
            device_traversal()
         elif arg == 'sff':
@@ -371,6 +373,43 @@ def system_ready():
         return False
     return True
 
+PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
+PLATFORM_API2_WHL_FILE_PY3 ='sonic_platform-1.0-py3-none-any.whl'
+def do_sonic_platform_install():
+    device_path = "{}{}{}{}".format(PLATFORM_ROOT_PATH, '/x86_64-accton_', PROJECT_NAME, '-r0')
+    SONIC_PLATFORM_BSP_WHL_PKG_PY3 = "/".join([device_path, PLATFORM_API2_WHL_FILE_PY3])
+        
+    #Check API2.0 on py whl file
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3): 
+            status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
+            if status:
+                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                return status
+            else:
+                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+        else:
+            print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
+    else:        
+        print('{} has installed'.format(PLATFORM_API2_WHL_FILE_PY3))
+     
+    return 
+     
+def do_sonic_platform_clean():
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)   
+    if status:
+        print('{} does not install, not need to uninstall'.format(PLATFORM_API2_WHL_FILE_PY3))
+        
+    else:        
+        status, output = log_os_system("pip3 uninstall sonic-platform -y", 0)
+        if status:
+            print('Error: Failed to uninstall {}'.format(PLATFORM_API2_WHL_FILE_PY3))
+            return status
+        else:
+            print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
+
+    return
 def do_install():
     if driver_inserted() == False:
         status = driver_install()
@@ -389,6 +428,9 @@ def do_install():
                 return  status
     else:
         print PROJECT_NAME.upper()+" devices detected...."
+
+    do_sonic_platform_install()
+
     return
 
 def do_uninstall():
@@ -410,6 +452,8 @@ def do_uninstall():
             if FORCE == 0:
                 return  status
 
+    do_sonic_platform_clean() 
+
     return
 
 def devices_info():
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7726-32x.install b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7726-32x.install
new file mode 100644
index 000000000000..f6a25d920cde
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as7726-32x.install
@@ -0,0 +1,2 @@
+as7726-32x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-accton_as7726_32x-r0
+

From 39a4cd9c3adca66cc2fabd2744851dbead910bb9 Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Fri, 28 May 2021 15:43:30 -0700
Subject: [PATCH 0511/1674] [202012][Arista] Update Arista submodule to include
 pmbus fix (#7737)

Why I did it
Microsoft reported occasional daemon crashes on devices running 201911. On close inspection it was due to PMBus reads failing on IOError on very rare occasions.

This is the fix for 202012 branch.

How I did it
Add try/except block on performing reads on PMBus GPIOs.

How to verify it
Which release branch to backport (provide reason below if selected)

Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 6ec714040c57..e25beb333451 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6ec714040c5733d4c0b2e3feb347a1e980280bf9
+Subproject commit e25beb333451b3134e234e63f7b32a8ac4d52a2c
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 6ec714040c57..e25beb333451 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6ec714040c5733d4c0b2e3feb347a1e980280bf9
+Subproject commit e25beb333451b3134e234e63f7b32a8ac4d52a2c

From 71d4b17ad01ecf1bcedfffd764c6d022f66a6f93 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 29 May 2021 22:22:37 +0800
Subject: [PATCH 0512/1674] [ci/build]: Upgrade SONiC package versions (#7746)

---
 .../build/build-sonic-slave-buster/versions-deb-buster        | 2 +-
 files/build/versions/default/versions-deb-buster              | 2 +-
 files/build/versions/default/versions-py2                     | 2 +-
 files/build/versions/default/versions-py3                     | 2 +-
 files/build/versions/default/versions-web                     | 4 +---
 files/build/versions/dockers/docker-sonic-vs/versions-py2     | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py3     | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster   | 2 +-
 .../versions/dockers/sonic-slave-stretch/versions-deb-stretch | 4 ++--
 files/build/versions/host-image/versions-deb-buster           | 4 ++--
 files/build/versions/host-image/versions-py2                  | 2 +-
 files/build/versions/host-image/versions-py3                  | 2 +-
 12 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index c8f1783a726c..5093f5dded34 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -40,7 +40,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.5-2
+libsaibcm==4.3.3.5-3
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index f1c6f764a439..082dcc53a269 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -168,7 +168,7 @@ librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.5-2
+libsaibcm==4.3.3.5-3
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index 2dd02d4fcd76..abeb3e20fe3f 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -23,7 +23,7 @@ redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
 scapy==2.4.0
-singledispatch==3.6.1
+singledispatch==3.6.2
 six==1.16.0
 thrift==0.13.0
 typing==3.10.0.0
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 7137358b1b38..d425097bf70e 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -10,7 +10,7 @@ grpcio==1.38.0
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
-importlib-metadata==4.0.1
+importlib-metadata==4.3.1
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 44e837229187..7f2513b1af50 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -41,9 +41,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=4NbjhnzdvOOJ2IBdgxBQ8S%2BW5OY2EIt2YFEp47pFLDI%3D&se=2035-01-18T07%3A16%3A08Z&sp=r==033eb38248063745cb27efcd70f942a7
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r==2e8e0d581fdf9748269f63e887afec6b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-2_amd64.deb?sv=2015-04-05&sr=b&sig=pxqZN%2Fi3op3Fwpu%2BAE6Aa%2BLa%2Bs03UkSoucOXuCn9q7o%3D&se=2035-01-18T07%3A16%3A41Z&sp=r==211346a9163a9a7bc57d5bcd1ae85eb0
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r==5300744d3bdfbe42b5486d540453abf4
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
@@ -59,4 +57,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 96e7e5b1c7e9..56e2856d4860 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -8,4 +8,4 @@ ply==3.11
 py2-ipaddress==3.4.2
 pyroute2==0.5.3
 requests==2.25.1
-urllib3==1.26.4
\ No newline at end of file
+urllib3==1.26.5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index a0516fadd483..3d9558ae4858 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -7,5 +7,5 @@ parameterized==0.8.1
 pexpect==4.8.0
 ptyprocess==0.7.0
 tabulate==0.8.9
-urllib3==1.26.4
+urllib3==1.26.5
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index a0e3ecdc197a..e72d5d859081 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.4-1
+containerd.io==1.4.6-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 32b11f9ce7d3..a9b145840556 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -403,8 +403,8 @@ libdevmapper-event1.02.1==2:1.02.137-2
 libdevmapper1.02.1==2:1.02.137-2
 libdigest-hmac-perl==1.03+dfsg-1
 libdistro-info-perl==0.14
-libdjvulibre-text==3.5.27.1-7
-libdjvulibre21==3.5.27.1-7
+libdjvulibre-text==3.5.27.1-7+deb9u1
+libdjvulibre21==3.5.27.1-7+deb9u1
 libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
 libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
 libdom4j-java==1.6.1+dfsg.3-2+deb9u1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index e7153add5ef2..996efcd39b97 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -8,7 +8,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.4-1
+containerd.io==1.4.6-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
@@ -44,7 +44,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2303
+hw-management==1.mlnx.7.0010.2304
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index e7c51629f9d7..4985465af0ef 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -19,7 +19,7 @@ python-apt==1.8.4.3
 pyyaml==5.4.1
 redis==3.5.3
 scandir==1.10.0
-singledispatch==3.6.1
+singledispatch==3.6.2
 six==1.16.0
 typing==3.10.0.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 9fb6faf7e1ba..ae8913284152 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -36,7 +36,7 @@ requests==2.25.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
-urllib3==1.26.4
+urllib3==1.26.5
 watchdog==0.10.3
 websocket-client==1.0.1
 xmltodict==0.12.0
\ No newline at end of file

From 74216f871005e5b3ba51d97aad6ddcea6d6a5cd5 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 25 May 2021 02:36:39 +0800
Subject: [PATCH 0513/1674] [Mellanox] clear fan from chassis._fan_list (#7682)

#### Why I did it

According to thermalctld hld, each fan must belong to a fan drawer, if the fan drawer does not physically exist, put fan into a virtual fan drawer. This PR is to clear fan from chassis._fan_list

#### How I did it

1. Don't put fan to chassis._fan_list
2. Always query fan from fan_drawer
---
 .../sonic_platform/chassis.py                 |  1 -
 .../sonic_platform/thermal_infos.py           | 41 ++++++++++---------
 .../mlnx-platform-api/tests/mock_platform.py  | 16 +++++++-
 .../tests/test_thermal_policy.py              | 29 +++++++------
 4 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index 2ae93e14d4c0..bc23a5c97044 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -112,7 +112,6 @@ def initialize_fan(self):
                 fan = Fan(fan_index, drawer, index + 1)
                 fan_index += 1
                 drawer._fan_list.append(fan)
-                self._fan_list.append(fan)
 
 
     def initialize_sfp(self):
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
index e810a5646456..df262557c417 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
@@ -24,26 +24,27 @@ def collect(self, chassis):
         :return:
         """
         self._status_changed = False
-        for fan in chassis.get_all_fans():
-            presence = fan.get_presence()
-            status = fan.get_status()
-            if presence and fan not in self._presence_fans:
-                self._presence_fans.add(fan)
-                self._status_changed = True
-                if fan in self._absence_fans:
-                    self._absence_fans.remove(fan)
-            elif not presence and fan not in self._absence_fans:
-                self._absence_fans.add(fan)
-                self._status_changed = True
-                if fan in self._presence_fans:
-                    self._presence_fans.remove(fan)
-
-            if not status and fan not in self._fault_fans:
-                self._fault_fans.add(fan)
-                self._status_changed = True
-            elif status and fan in self._fault_fans:
-                self._fault_fans.remove(fan)
-                self._status_changed = True
+        for fan_drawer in chassis.get_all_fan_drawers():
+            for fan in fan_drawer.get_all_fans():
+                presence = fan.get_presence()
+                status = fan.get_status()
+                if presence and fan not in self._presence_fans:
+                    self._presence_fans.add(fan)
+                    self._status_changed = True
+                    if fan in self._absence_fans:
+                        self._absence_fans.remove(fan)
+                elif not presence and fan not in self._absence_fans:
+                    self._absence_fans.add(fan)
+                    self._status_changed = True
+                    if fan in self._presence_fans:
+                        self._presence_fans.remove(fan)
+
+                if not status and fan not in self._fault_fans:
+                    self._fault_fans.add(fan)
+                    self._status_changed = True
+                elif status and fan in self._fault_fans:
+                    self._fault_fans.remove(fan)
+                    self._status_changed = True
                     
 
     def get_absence_fans(self):
diff --git a/platform/mellanox/mlnx-platform-api/tests/mock_platform.py b/platform/mellanox/mlnx-platform-api/tests/mock_platform.py
index 8edb9d4fb163..1cd8f89d4805 100644
--- a/platform/mellanox/mlnx-platform-api/tests/mock_platform.py
+++ b/platform/mellanox/mlnx-platform-api/tests/mock_platform.py
@@ -36,10 +36,19 @@ def get_all_fans(self):
         return []
 
 
+class MockFanDrawer:
+    def __init__(self):
+        self.fan_list = []
+
+    def get_all_fans(self):
+        return self.fan_list
+
+
 class MockChassis:
     def __init__(self):
         self.fan_list = []
         self.psu_list = []
+        self.fan_drawer_list = []
 
     def get_all_psus(self):
         return self.psu_list
@@ -47,6 +56,9 @@ def get_all_psus(self):
     def get_all_fans(self):
         return self.fan_list
 
+    def get_all_fan_drawers(self):
+        return self.fan_drawer_list
+
     def get_thermal_manager(self):
         from sonic_platform.thermal_manager import ThermalManager
         return ThermalManager
@@ -54,7 +66,9 @@ def get_thermal_manager(self):
     def make_fan_absence(self):
         fan = MockFan()
         fan.presence = False
-        self.fan_list.append(fan)
+        fan_drawer = MockFanDrawer()
+        self.fan_drawer_list.append(fan_drawer)
+        fan_drawer.fan_list.append(fan)
 
     def make_psu_absence(self):
         psu = MockPsu()
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
index 4d69a39c58a1..e2fb26cf6083 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
@@ -3,7 +3,7 @@
 import pytest
 import json
 from mock import MagicMock
-from .mock_platform import MockChassis, MockFan, MockPsu
+from .mock_platform import MockChassis, MockFan, MockFanDrawer, MockPsu
 
 test_path = os.path.dirname(os.path.abspath(__file__))
 modules_path = os.path.dirname(test_path)
@@ -49,15 +49,14 @@ def test_fan_info():
     assert len(fan_info.get_fault_fans()) == 0
     assert fan_info.is_status_changed()
 
-    fan_list = chassis.get_all_fans()
-    fan_list[0].presence = True
+    chassis.get_all_fan_drawers()[0].get_all_fans()[0].presence = True
     fan_info.collect(chassis)
     assert len(fan_info.get_absence_fans()) == 0
     assert len(fan_info.get_presence_fans()) == 1
     assert len(fan_info.get_fault_fans()) == 0
     assert fan_info.is_status_changed()
 
-    fan_list[0].status = False
+    chassis.get_all_fan_drawers()[0].get_all_fans()[0].status = False
     fan_info.collect(chassis)
     assert len(fan_info.get_absence_fans()) == 0
     assert len(fan_info.get_presence_fans()) == 1
@@ -90,10 +89,10 @@ def test_psu_info():
 def test_fan_policy(thermal_manager):
     chassis = MockChassis()
     chassis.make_fan_absence()
-    chassis.fan_list.append(MockFan())
+    chassis.get_all_fan_drawers()[0].get_all_fans().append(MockFan())
     thermal_manager.run_policy(chassis)
 
-    fan_list = chassis.get_all_fans()
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     assert fan_list[1].speed == 100
     Thermal.set_thermal_algorithm_status.assert_called_with(False, False)
 
@@ -144,7 +143,7 @@ def test_any_fan_absence_condition():
     condition = AnyFanAbsenceCondition()
     assert condition.is_match({'fan_info': fan_info})
 
-    fan = chassis.get_all_fans()[0]
+    fan = chassis.get_all_fan_drawers()[0].get_all_fans()[0]
     fan.presence = True
     fan_info.collect(chassis)
     assert not condition.is_match({'fan_info': fan_info})
@@ -154,7 +153,7 @@ def test_all_fan_absence_condition():
     chassis = MockChassis()
     chassis.make_fan_absence()
     fan = MockFan()
-    fan_list = chassis.get_all_fans()
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(fan)
     fan_info = FanInfo()
     fan_info.collect(chassis)
@@ -172,7 +171,7 @@ def test_all_fan_presence_condition():
     chassis = MockChassis()
     chassis.make_fan_absence()
     fan = MockFan()
-    fan_list = chassis.get_all_fans()
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(fan)
     fan_info = FanInfo()
     fan_info.collect(chassis)
@@ -187,8 +186,9 @@ def test_all_fan_presence_condition():
 
 def test_any_fan_fault_condition():
     chassis = MockChassis()
+    chassis.get_all_fan_drawers().append(MockFanDrawer())
     fan = MockFan()
-    fan_list = chassis.get_all_fans()
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(fan)
     fault_fan = MockFan()
     fault_fan.status = False
@@ -206,8 +206,9 @@ def test_any_fan_fault_condition():
 
 def test_all_fan_good_condition():
     chassis = MockChassis()
+    chassis.get_all_fan_drawers().append(MockFanDrawer())
     fan = MockFan()
-    fan_list = chassis.get_all_fans()
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(fan)
     fault_fan = MockFan()
     fault_fan.status = False
@@ -302,7 +303,8 @@ def test_load_set_fan_speed_action():
 
 def test_execute_set_fan_speed_action():
     chassis = MockChassis()
-    fan_list = chassis.get_all_fans()
+    chassis.get_all_fan_drawers().append(MockFanDrawer())
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(MockFan())
     fan_list.append(MockFan())
     fan_info = FanInfo()
@@ -364,7 +366,8 @@ def test_load_check_and_set_speed_action():
 
 def test_execute_check_and_set_fan_speed_action():
     chassis = MockChassis()
-    fan_list = chassis.get_all_fans()
+    chassis.get_all_fan_drawers().append(MockFanDrawer())
+    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
     fan_list.append(MockFan())
     fan_list.append(MockFan())
     fan_info = FanInfo()

From 3af05fdffe03893c9fc20eb73e296af5563262e9 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Fri, 28 May 2021 11:13:44 -0700
Subject: [PATCH 0514/1674] [Monit] Restart telemetry container if memory usage
 is beyond the threshold (#7645)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
This PR aims to monitor the memory usage of streaming telemetry container and restart streaming telemetry container if memory usage is larger than the pre-defined threshold.

How I did it
I borrowed the system tool Monit to run a script memory_checker which will periodically check the memory usage of streaming telemetry container. If the memory usage of telemetry container is larger than the pre-defined threshold for 10 times during 20 cycles, then an alerting message will be written into syslog and at the same time Monit will run the script restart_service to restart the streaming telemetry container.

How to verify it
I verified this implementation on device str-7260cx3-acs-1.
---
 .../base_image_files/monit_telemetry          |   3 +
 .../build_templates/sonic_debian_extension.j2 |   4 +
 files/image_config/monit/memory_checker       | 109 ++++++++++++++++++
 files/image_config/monit/restart_service      | 105 +++++++++++++++++
 4 files changed, 221 insertions(+)
 create mode 100755 files/image_config/monit/memory_checker
 create mode 100755 files/image_config/monit/restart_service

diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
index 3680bbe6cf9a..ab3000c899d0 100644
--- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
+++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
@@ -9,3 +9,6 @@ check program telemetry|telemetry with path "/usr/bin/process_checker telemetry
 
 check program telemetry|dialout_client with path "/usr/bin/process_checker telemetry /usr/sbin/dialout_client_cli"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
+
+check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
+    if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index eae99551eb3c..4e27def8f1af 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -314,6 +314,10 @@ sudo cp $IMAGE_CONFIGS/monit/process_checker $FILESYSTEM_ROOT/usr/bin/
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/process_checker
 sudo cp $IMAGE_CONFIGS/monit/container_checker $FILESYSTEM_ROOT/usr/bin/
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
+sudo cp $IMAGE_CONFIGS/monit/memory_checker $FILESYSTEM_ROOT/usr/bin/
+sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/memory_checker
+sudo cp $IMAGE_CONFIGS/monit/restart_service $FILESYSTEM_ROOT/usr/bin/
+sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service
 
 
 # Install custom-built openssh sshd
diff --git a/files/image_config/monit/memory_checker b/files/image_config/monit/memory_checker
new file mode 100755
index 000000000000..4f7912c1e56c
--- /dev/null
+++ b/files/image_config/monit/memory_checker
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+"""
+memory_checker
+
+This script is part of the feature which will restart the container if memory
+usage of it is larger than the threshold value.
+
+This script is used to check the memory usage of specified cotnainer and
+is intended to be run by Monit. It will write an alerting message into
+syslog if memory usage of the container is larger than the threshold value for X
+times within Y cycles/minutes. Note that if print(...) statement in this script
+was executed, the string in it will be appended to Monit syslog messages.
+
+The following is an example in Monit configuration file to show how Monit will run
+this script:
+
+check program container_memory_<container_name> with path "/usr/bin/memory_checker <container_name> <threshold_value>"
+    if status == 3 for X times within Y cycles exec "/usr/bin/restart_service <container_name>"
+"""
+
+import argparse
+import subprocess
+import sys
+import syslog
+import re
+
+
+def get_command_result(command):
+    """Executes the command and return the resulting output.
+
+    Args:
+        command: A string contains the command to be executed.
+
+    Returns:
+        A string which contains the output of command.
+    """
+    command_stdout = ""
+
+    try:
+        proc_instance = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                         shell=True, universal_newlines=True)
+        command_stdout, command_stderr = proc_instance.communicate()
+        if proc_instance.returncode != 0:
+            syslog.syslog(syslog.LOG_ERR, "[memory_checker] Failed to execute the command '{}'. Return code: '{}'"
+                          .format(command, proc_instance.returncode))
+            sys.exit(1)
+    except (OSError, ValueError) as err:
+        syslog.syslog(syslog.LOG_ERR, "[memory_checker] Failed to execute the command '{}'. Error: '{}'"
+                      .format(command, err))
+        sys.exit(2)
+
+    return command_stdout.strip()
+
+
+def check_memory_usage(container_name, threshold_value):
+    """Checks the memory usage of a container and writes an alerting messages into
+    the syslog if the memory usage is larger than the threshold value.
+
+    Args:
+        container_name: A string represtents name of a container
+        threshold_value: An integer indicates the threshold value (Bytes) of memory usage.
+
+    Returns:
+        None.
+    """
+    command = "docker stats --no-stream --format \{{\{{.MemUsage\}}\}} {}".format(container_name)
+    command_stdout = get_command_result(command)
+    mem_usage = command_stdout.split("/")[0].strip()
+    match_obj = re.match(r"\d+\.?\d*", mem_usage)
+    if match_obj:
+        mem_usage_value = float(mem_usage[match_obj.start():match_obj.end()])
+        mem_usage_unit = mem_usage[match_obj.end():]
+
+        mem_usage_bytes = 0.0
+        if mem_usage_unit == "B":
+            mem_usage_bytes = mem_usage_value
+        elif mem_usage_unit == "KiB":
+            mem_usage_bytes = mem_usage_value * 1024
+        elif mem_usage_unit == "MiB":
+            mem_usage_bytes = mem_usage_value * 1024 ** 2
+        elif mem_usage_unit == "GiB":
+            mem_usage_bytes = mem_usage_value * 1024 ** 3
+
+        if mem_usage_bytes > threshold_value:
+            print("[{}]: Memory usage ({} Bytes) is larger than the threshold ({} Bytes)!"
+                  .format(container_name, mem_usage_bytes, threshold_value))
+            sys.exit(3)
+    else:
+        syslog.syslog(syslog.LOG_ERR, "[memory_checker] Failed to retrieve memory value from '{}'"
+                      .format(mem_usage))
+        sys.exit(4)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Check memory usage of a container \
+            and an alerting message will be written into syslog if memory usage \
+            is larger than the threshold value", usage="/usr/bin/memory_checker <container_name> <threshold_value_in_bytes>")
+    parser.add_argument("container_name", help="container name")
+    # TODO: Currently the threshold value is hard coded as a command line argument and will
+    # remove this in the new version since we want to read this value from 'CONFIG_DB'.
+    parser.add_argument("threshold_value", type=int, help="threshold value in bytes")
+    args = parser.parse_args()
+
+    check_memory_usage(args.container_name, args.threshold_value)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/files/image_config/monit/restart_service b/files/image_config/monit/restart_service
new file mode 100755
index 000000000000..40da147e9526
--- /dev/null
+++ b/files/image_config/monit/restart_service
@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+
+"""
+restart_service
+
+This script is part of the feature which will restart the container if memory
+usage of it is larger than the threshold value.
+
+This script is intended to be run by Monit and is used to restart the specified
+container if the memory usage of it is larger than the threshold value for X
+times within Y cycles/minutes.
+
+The following is an example in Monit configuration file to show how Monit will run
+this script:
+
+check program container_memory_<container_name> with path "/usr/bin/memory_checker <container_name> <threshold_value>"
+    if status == 3 for X times within Y cycles exec "/usr/bin/restart_service <container_name>"
+"""
+
+import argparse
+import sys
+import syslog
+import subprocess
+
+
+def get_command_result(command):
+    """Executes command and return the exit code, stdout and stderr.
+
+    Args:
+        command: A string contains the command to be executed.
+
+    Returns:
+        An integer contains the exit code.
+        A string contains the output of stdout.
+        A string contains the output of stderr.
+    """
+    command_stdout = ""
+    command_stderr = ""
+
+    try:
+        proc_instance = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                         shell=True, universal_newlines=True)
+        command_stdout, command_stderr = proc_instance.communicate()
+        if proc_instance.returncode != 0:
+            return 1, command_stdout.strip(), command_stderr.strip()
+    except (OSError, ValueError) as err:
+        return 2, command_stdout.strip(), err
+
+    return 0, command_stdout.strip(), command_stderr.strip()
+
+
+def reset_failed_flag(service_name):
+    """Reset the failed status of a service.
+
+    Args:
+        service_name: Name of the service.
+
+    Returns:
+        None
+    """
+    reset_failed_command = "sudo systemctl reset-failed {}.service".format(service_name)
+
+    syslog.syslog(syslog.LOG_INFO, "Resetting failed status of service '{}' ..."
+                  .format(service_name))
+
+    exit_code, command_stdout, command_stderr = get_command_result(reset_failed_command)
+    if exit_code == 0:
+        syslog.syslog(syslog.LOG_INFO, "Succeeded to reset failed status of service '{}.service'."
+                      .format(service_name))
+    else:
+        syslog.syslog(syslog.LOG_ERR, "Failed to reset failed status of service '{}'. Error: {}"
+                      .format(service_name, command_stderr))
+
+
+def restart_service(service_name):
+    """Reset the failed status of a service and then restart it.
+
+    Args:
+        service_name: Name of specified service.
+
+    Returns:
+        None.
+    """
+    restart_command = "sudo systemctl restart {}.service".format(service_name)
+
+    reset_failed_flag(service_name)
+
+    syslog.syslog(syslog.LOG_INFO, "Restarting service '{}' ...".format(service_name))
+    exit_code, command_stdout, command_stderr = get_command_result(restart_command)
+    if exit_code != 0:
+        syslog.syslog(syslog.LOG_ERR, "Failed to restart the service '{}'. Error: {}"
+                      .format(service_name, command_stderr))
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Restart a specific service",
+                                     usage="/usr/bin/restart_service <service_name>")
+    parser.add_argument("service_name", help="service name")
+    args = parser.parse_args()
+
+    restart_service(args.service_name)
+
+
+if __name__ == "__main__":
+    main()

From 85fccfe8bf4627f265fde46bacc8e70edfaf4e4f Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Sat, 29 May 2021 02:56:09 +0700
Subject: [PATCH 0515/1674] [device/celestica]: Fix remaining failed test cases
 of Seastone-DX010 platform API (#7743)

**- Why I did it**
- To fix failed test cases of Seastone-DX010 platform APIs that found on [platform_tests](https://github.com/Azure/sonic-mgmt/tree/master/tests/platform_tests/api) script

**- How I did it**
1. Add device/celestica/x86_64-cel_seastone-r0/platform.json
2. Update functions to support python3.7
3. Add more functions follow latest sonic_platform_base
4. Fix the bug
---
 .../platform_components.json                  |  13 ++
 .../sonic_platform/component.py               |  37 ++++
 .../sonic_platform/psu.py                     | 160 ++++++++++--------
 .../sonic_platform/thermal.py                 |  68 +++++++-
 4 files changed, 203 insertions(+), 75 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/platform_components.json

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform_components.json b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
new file mode 100644
index 000000000000..cd89d358d46f
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
@@ -0,0 +1,13 @@
+{
+    "chassis": {
+        "Celestica-DX010-C32": {
+            "component": {
+                "CPLD1": {},
+                "CPLD2": {},
+                "CPLD3": {},
+                "CPLD4": {},
+                "BIOS": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
index 2db8418e18a9..782708025ab6 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
@@ -106,6 +106,29 @@ def get_firmware_version(self):
 
         return fw_version
 
+    def get_available_firmware_version(self, image_path):
+        """
+        Retrieves the available firmware version of the component
+        Note: the firmware version will be read from image
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the available firmware version of the component
+        """
+        return "N/A"
+
+    def get_firmware_update_notification(self, image_path):
+        """
+        Retrieves a notification on what should be done in order to complete
+        the component firmware update
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the component firmware update notification if required.
+            By default 'None' value will be used, which indicates that no actions are required
+        """
+        return "None"
+
     def install_firmware(self, image_path):
         """
         Install firmware to module
@@ -130,6 +153,20 @@ def install_firmware(self, image_path):
         return self.__run_command(install_command)
 
 
+    def update_firmware(self, image_path):
+        """
+        Updates firmware of the component
+        This API performs firmware update: it assumes firmware installation and loading in a single call.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this will be done automatically by API
+        Args:
+            image_path: A string, path to firmware image
+        Raises:
+            RuntimeError: update failed
+        """
+        return False
+
+
     ##############################################################
     ###################### Device methods ########################
     ##############################################################
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
index 8bc95fa4f081..da365dff59ab 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
@@ -226,72 +226,6 @@ def get_status_led(self):
 
         return status_str
 
-    def get_name(self):
-        """
-        Retrieves the name of the device
-            Returns:
-            string: The name of the device
-        """
-        return PSU_NAME_LIST[self.index]
-
-    def get_presence(self):
-        """
-        Retrieves the presence of the PSU
-        Returns:
-            bool: True if PSU is present, False if not
-        """
-        raw = self.__get_gpio_value(self.dx010_psu_gpio[self.index + 1]['prs'])
-        return int(raw, 10) == 0
-
-    def get_status(self):
-        """
-        Retrieves the operational status of the device
-        Returns:
-            A boolean value, True if device is operating properly, False if not
-        """
-        raw = self.__get_gpio_value(
-            self.dx010_psu_gpio[self.index + 1]['status'])
-        return int(raw, 10) == 1
-
-    def get_model(self):
-        """
-        Retrieves the model number (or part number) of the device
-        Returns:
-            string: Model/part number of device
-        """
-        model = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_MODEL)
-        if not model:
-            return "N/A"
-        return model
-
-    def get_serial(self):
-        """
-        Retrieves the serial number of the device
-        Returns:
-            string: Serial number of device
-        """
-        serial = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_SERIAL)
-        if not serial:
-            return "N/A"
-        return serial
-
-    def get_position_in_parent(self):
-        """
-        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
-        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
-        Returns:
-            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
-        """
-        return -1
-
-    def is_replaceable(self):
-        """
-        Indicate whether this device is replaceable.
-        Returns:
-            bool: True if it is replaceable.
-        """
-        return True
-
     def get_temperature(self):
         """
         Retrieves current temperature reading from PSU
@@ -389,3 +323,97 @@ def get_voltage_low_threshold(self):
             psu_voltage = float(vout_val) / 1000
 
         return psu_voltage
+
+    def get_maximum_supplied_power(self):
+        """
+        Retrieves the maximum supplied power by PSU
+        Returns:
+            A float number, the maximum power output in Watts.
+            e.g. 1200.1
+        """
+        psu_power = 0.0
+        current_name = "power{}_max"
+        current_label = "pout1"
+
+        pw_label_path = self.__search_file_by_contain(
+            self.hwmon_path, current_label, "power")
+        if pw_label_path:
+            dir_name = os.path.dirname(pw_label_path)
+            basename = os.path.basename(pw_label_path)
+            pw_num = ''.join(list(filter(str.isdigit, basename)))
+            pw_path = os.path.join(
+                dir_name, current_name.format(pw_num))
+            pw_val = self._api_helper.read_txt_file(pw_path)
+            psu_power = float(pw_val) / 1000000
+
+        return psu_power
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """
+        raw = self.__get_gpio_value(self.dx010_psu_gpio[self.index + 1]['prs'])
+        return int(raw, 10) == 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        raw = self.__get_gpio_value(
+            self.dx010_psu_gpio[self.index + 1]['status'])
+        return int(raw, 10) == 1
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        model = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_MODEL)
+        if not model:
+            return "N/A"
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        serial = self.read_fru(self.eeprom_addr, TLV_ATTR_TYPE_SERIAL)
+        if not serial:
+            return "N/A"
+        return serial
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
index ce2a45f0c5bb..c605a28d220c 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
@@ -23,7 +23,7 @@
         "B2F_max_crit": 75,
         "postion": "asic",
         "name": "Front-panel temp sensor 1",
-        "i2c_path": "i2c-5/5-0048/hwmon/hwmon1",    # u4 system-inlet
+        "i2c_path": "i2c-5/5-0048/hwmon",    # u4 system-inlet
     },
     1: {
         "F2B_max": 50,
@@ -32,7 +32,7 @@
         "B2F_max_crit": 75,
         "postion": "asic",
         "name": "Front-panel temp sensor 2",
-        "i2c_path": "i2c-6/6-0049/hwmon/hwmon2",    # u2 system-inlet
+        "i2c_path": "i2c-6/6-0049/hwmon",    # u2 system-inlet
     },
     2: {
         "F2B_max": 70,
@@ -41,7 +41,7 @@
         "B2F_max_crit": 65,
         "postion": "asic",
         "name": "ASIC temp sensor",
-        "i2c_path": "i2c-7/7-004a/hwmon/hwmon3",    # u44 bmc56960-on-board
+        "i2c_path": "i2c-7/7-004a/hwmon",    # u44 bmc56960-on-board
     },
     3: {
         "F2B_max": 70,
@@ -50,7 +50,7 @@
         "B2F_max_crit": 75,
         "postion": "cpu",
         "name": "Rear-panel temp sensor 1",
-        "i2c_path": "i2c-14/14-0048/hwmon/hwmon4",  # u9200 cpu-on-board
+        "i2c_path": "i2c-14/14-0048/hwmon",  # u9200 cpu-on-board
     },
     4: {
         "F2B_max": 70,
@@ -59,7 +59,7 @@
         "B2F_max_crit": 75,
         "postion": "cpu",
         "name": "Rear-panel temp sensor 2",
-        "i2c_path": "i2c-15/15-004e/hwmon/hwmon5"   # u9201 system-outlet
+        "i2c_path": "i2c-15/15-004e/hwmon"   # u9201 system-outlet
     }
 }
 NULL_VAL = "N/A"
@@ -77,17 +77,38 @@ def __init__(self, thermal_index, airflow):
         self._api_helper = APIHelper()
         self._airflow = airflow
         self._thermal_info = THERMAL_INFO[self.index]
-        self._hwmon_path = "{}/{}".format(I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
+
+        self._i2c_hwmon_path = "{}/{}".format(
+            I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
+        self._hwmon_path = os.path.join(
+            self._i2c_hwmon_path, self.__get_hwmon_name(self._i2c_hwmon_path))
         self.name = self.get_name()
         self.postion = self._thermal_info["postion"]
         self.ss_index = 1
 
+        self.minimum_thermal = self.get_temperature()
+        self.maximum_thermal = self.get_temperature()
+
+    def __get_hwmon_name(self, path):
+        return os.listdir(path)[0]
+
     def __get_temp(self, temp_file):
         temp_file_path = os.path.join(self._hwmon_path, temp_file)
         raw_temp = self._api_helper.read_txt_file(temp_file_path)
         temp = float(raw_temp)/1000
         return float("{:.3f}".format(temp))
 
+    def __get_threshold(self, file_name):
+        temp_file_path = os.path.join(self._hwmon_path, file_name)
+        data = self._api_helper.read_txt_file(temp_file_path)
+        if data:
+            try:
+                threshold = float(data)
+                return round(threshold/1000, 3)
+            except Exception:
+                pass
+        return None
+
     def __set_threshold(self, file_name, temperature):
         temp_file_path = os.path.join(self._hwmon_path, file_name)
         try:
@@ -114,9 +135,10 @@ def get_high_threshold(self):
             A float number, the high threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        temp_file = "temp{}_max".format(self.ss_index)
-        temp = float(self.__get_temp(temp_file))
-        return temp
+        max_crit_key = '{}_max'.format(self._airflow)
+        high_threshold_file = "temp{}_max".format(self.ss_index)
+        return self.__get_threshold(high_threshold_file) or self._thermal_info.get(max_crit_key, None)
+
 
     def get_low_threshold(self):
         """
@@ -194,6 +216,34 @@ def get_low_critical_threshold(self):
         """
         return 0.001
 
+    def get_minimum_recorded(self):
+        """
+        Retrieves the minimum recorded temperature of thermal
+        Returns:
+            A float number, the minimum recorded temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        tmp = self.get_temperature()
+        if tmp < self.minimum_thermal:
+            self.minimum_thermal = tmp
+        return self.minimum_thermal
+
+    def get_maximum_recorded(self):
+        """
+        Retrieves the maximum recorded temperature of thermal
+        Returns:
+            A float number, the maximum recorded temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        tmp = self.get_temperature()
+        if tmp > self.maximum_thermal:
+            self.maximum_thermal = tmp
+        return self.maximum_thermal
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
     def get_name(self):
         """
         Retrieves the name of the thermal device

From 20b76543894fe4a116950d0b7b8a3b8bc26aece0 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 28 May 2021 15:20:30 -0700
Subject: [PATCH 0516/1674] [minigraph] Parse bandwidth for DeviceMgmtLinks
 (#7744)

Why I did it
The current code skips parsing bandwidth for DeviceMgmtLinks. We have a use case to set the speed for these type of links based on the bandwidth attribute in the minigraph

How to verify it
Ran sonic-cfggen on a minigraph and verified that interface of type DeviceMgmtLink has speed set in the PORT table from the bandwidth attribute in the minigraph
---
 src/sonic-config-engine/minigraph.py          | 12 +++++--
 .../tests/sample_output/py2/ports.json        |  7 +++++
 .../tests/sample_output/py3/ports.json        |  7 +++++
 .../tests/simple-sample-graph.xml             | 31 +++++++++++++++++++
 src/sonic-config-engine/tests/test_cfggen.py  |  2 +-
 5 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index cc00b485e0aa..9a3555e199aa 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -218,7 +218,7 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                     startdevice = link.find(str(QName(ns, "StartDevice"))).text
                     port_device_map[endport] = startdevice
 
-                if linktype != "DeviceInterfaceLink" and linktype != "UnderlayInterfaceLink":
+                if linktype != "DeviceInterfaceLink" and linktype != "UnderlayInterfaceLink" and linktype != "DeviceMgmtLink":
                     continue
 
                 enddevice = link.find(str(QName(ns, "EndDevice"))).text
@@ -230,13 +230,15 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                 if enddevice.lower() == hname.lower():
                     if endport in port_alias_map:
                         endport = port_alias_map[endport]
-                    neighbors[endport] = {'name': startdevice, 'port': startport}
+                    if linktype != "DeviceMgmtLink":
+                        neighbors[endport] = {'name': startdevice, 'port': startport}
                     if bandwidth:
                         port_speeds[endport] = bandwidth
                 elif startdevice.lower() == hname.lower():
                     if startport in port_alias_map:
                         startport = port_alias_map[startport]
-                    neighbors[startport] = {'name': enddevice, 'port': endport}
+                    if linktype != "DeviceMgmtLink":
+                        neighbors[startport] = {'name': enddevice, 'port': endport}
                     if bandwidth:
                         port_speeds[startport] = bandwidth
 
@@ -1324,6 +1326,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 print("Warning: ignore interface '%s' as it is not in the port_config.ini" % port_name, file=sys.stderr)
                 continue
 
+        # skip management ports
+        if port_name in mgmt_alias_reverse_mapping.keys():
+            continue
+
         ports.setdefault(port_name, {})['speed'] = port_speed_png[port_name]
 
     for port_name, port in list(ports.items()):
diff --git a/src/sonic-config-engine/tests/sample_output/py2/ports.json b/src/sonic-config-engine/tests/sample_output/py2/ports.json
index 0e174972fbe4..4b36790c7cd0 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/ports.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/ports.json
@@ -20,6 +20,13 @@
         },
         "OP": "SET"
     },
+    {
+        "PORT_TABLE:Ethernet16": {
+            "speed": "1000",
+            "description": "fortyGigE0/16"
+        },
+        "OP": "SET"
+    },
     {
         "PORT_TABLE:Ethernet12": {
             "speed": "100000",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/ports.json b/src/sonic-config-engine/tests/sample_output/py3/ports.json
index 36f5ad117c39..1fee36338bd2 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/ports.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/ports.json
@@ -26,5 +26,12 @@
             "description": "Interface description"
         },
         "OP": "SET"
+    },
+    {
+        "PORT_TABLE:Ethernet16": {
+            "speed": "1000",
+            "description": "fortyGigE0/16"
+        },
+        "OP": "SET"
     }
 ]
diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
index 0ac08a3fff04..64d7477fbaf9 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -276,6 +276,25 @@
         <StartPort>Ethernet1/33</StartPort>
         <Validate>true</Validate>
       </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+        <ElementType>DeviceMgmtLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/16</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ChassisMTS1</StartDevice>
+        <StartPort>mgmt0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+      <ElementType>DeviceMgmtLink</ElementType>
+      <Bandwidth>1000</Bandwidth>
+      <EndDevice>switch-t0</EndDevice>
+      <EndPort>Management1</EndPort>
+      <StartDevice>switch-m0</StartDevice>
+      <StartPort>Management1</StartPort>
+      <Validate>true</Validate>
+      </DeviceLinkBase>
     </DeviceInterfaceLinks>
     <Devices>
       <Device i:type="ToRRouter">
@@ -378,6 +397,18 @@
           <Speed>100000</Speed>
           <Description>Interface description</Description>
         </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
       </EthernetInterfaces>
       <FlowControl>true</FlowControl>
       <Height>0</Height>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 2ca675c165c2..c488a3be1279 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -518,7 +518,7 @@ def test_minigraph_extra_ethernet_interfaces(self):
                 "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'fortyGigE0/4', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '25000'}, "
                 "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '1000'}, "
                 "'Ethernet12': {'lanes': '33,34,35,36', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '100000', 'description': 'Interface description'}, "
-                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'fortyGigE0/16', 'mtu': '9100'}, "
+                "'Ethernet16': {'lanes': '41,42,43,44', 'pfc_asym': 'off', 'description': 'fortyGigE0/16', 'mtu': '9100', 'alias': 'fortyGigE0/16', 'speed': '1000'}, "
                 "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'fortyGigE0/20', 'mtu': '9100'}, "
                 "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'fortyGigE0/24', 'mtu': '9100'}, "
                 "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'fortyGigE0/28', 'mtu': '9100'}, "

From b0f3ecb5cf4fc202e9b745ce599ccae9dc318473 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 28 May 2021 22:46:49 -0700
Subject: [PATCH 0517/1674] Rename AristaQX-32S skus (#7751)

This PR contains the following changes
Original Arista-7050-QX-32S sku (32x40G ports) has been renamed to Arista-7050QX32S-Q32
Arista-7050-QX-32S is symlinked to Arista-7050QX-32S-S4Q31 (4x10G, 31x40G ports)

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S        | 1 +
 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32      | 1 -
 .../{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/buffers.json.j2 | 0
 .../buffers_defaults_t0.j2                                       | 0
 .../buffers_defaults_t1.j2                                       | 0
 .../{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/hwsku-init      | 0
 .../pg_profile_lookup.ini                                        | 0
 .../{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/port_config.ini | 0
 .../{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/qos.json.j2     | 0
 .../{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/sai.profile     | 0
 .../td2-a7050-qx32s-32x40G.config.bcm                            | 0
 11 files changed, 1 insertion(+), 1 deletion(-)
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S
 delete mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/buffers.json.j2 (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/buffers_defaults_t0.j2 (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/buffers_defaults_t1.j2 (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/hwsku-init (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/pg_profile_lookup.ini (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/port_config.ini (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/qos.json.j2 (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/sai.profile (100%)
 rename device/arista/x86_64-arista_7050_qx32s/{Arista-7050-QX-32S => Arista-7050QX32S-Q32}/td2-a7050-qx32s-32x40G.config.bcm (100%)

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S
new file mode 120000
index 000000000000..16c96007892e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S
@@ -0,0 +1 @@
+Arista-7050QX-32S-S4Q31
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32
deleted file mode 120000
index 6a90d8a3ac70..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32
+++ /dev/null
@@ -1 +0,0 @@
-Arista-7050-QX-32S
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers.json.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers.json.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/hwsku-init b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/hwsku-init
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/hwsku-init
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/hwsku-init
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/port_config.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/port_config.ini
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/port_config.ini
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/port_config.ini
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm
rename to device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm

From d387d75420fde2f16b9718efa4fabfb6999e9304 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Mon, 31 May 2021 11:07:10 +0800
Subject: [PATCH 0518/1674] [Mellanox] Support buffer configuration for 2km
 cables (#7337)

#### Why I did it
Support 2km cables for Microsoft SKUs

#### How I did it
1. Update pg_profile_lookup.ini with 2000m cable supported
2. Update buffer configuration for t1 with uplink cable 2000m
  - For SN3800 platform:
    - C64:
      - t0: 32 100G down links and 32 100G up links.
      - t1: 56 100G down links and 8 100G up links with 2 km cable.
    - D112C8: 112 50G down links and 8 100G up links.
    - D24C52: 24 50G down links, 20 100G down links, and 32 100G up links.
    - D28C50: 28 50G down links, 18 100G down links, and 32 100G up links.
  - For SN2700 platform:
    - D48C8: 48 50G down links and 8 100G up links.
    - C32:
      - t0: 16 100G down links and 16 100G up links.
      - t1: 24 100G down links and 8 100G up links with 2 km cable.
  - For SN4600C platform:
    - D112C8: 112 50G down links and 8 100G up links.

#### How to verify it
Run regression test
---
 .../Mellanox-SN2700-D48C8/pg_profile_lookup.ini            | 5 +++++
 .../Mellanox-SN2700/buffers_defaults_t1.j2                 | 6 +++---
 .../Mellanox-SN3800-C64/buffers_defaults_t1.j2             | 6 +++---
 .../Mellanox-SN3800-D112C8/pg_profile_lookup.ini           | 7 ++++++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
index cdd674e4e715..b4bb2aaadb92 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
@@ -15,3 +15,8 @@
   40000  300m 19456  19456  45056          0
   50000  300m 19456  19456  50176          0
  100000  300m 19456  19456  78848          0
+  10000 2000m 19456  19456  29696          0
+  25000 2000m 19456  19456  58368          0
+  40000 2000m 19456  19456  87040          0
+  50000 2000m 19456  19456 105472          0
+ 100000 2000m 19456  19456 199680          0
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
index c4422556d87a..eef4f811e01c 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '9292800' %}
-{% set ingress_lossless_pool_xoff =  '1572864' %}
+{% set ingress_lossless_pool_size =  '8719360' %}
+{% set ingress_lossless_pool_xoff =  '2146304' %}
 {% set egress_lossless_pool_size =  '13945824' %}
-{% set egress_lossy_pool_size =  '9292800' %}
+{% set egress_lossy_pool_size =  '8719360' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
index d610abeb4f26..0cc5cced0c23 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '23900160' %}
-{% set ingress_lossless_pool_xoff =  '4489216' %}
+{% set ingress_lossless_pool_size =  '24219648' %}
+{% set ingress_lossless_pool_xoff =  '4169728' %}
 {% set egress_lossless_pool_size =  '34287552' %}
-{% set egress_lossy_pool_size =  '23900160' %}
+{% set egress_lossy_pool_size =  '24219648' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
index 810d7e77e61f..fd98cbe468bc 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini
@@ -14,4 +14,9 @@
   25000  300m 19456  19456  44032          0
   40000  300m 19456  19456  55296          0
   50000  300m 19456  19456  63488          0
- 100000  300m 19456  19456  102400         0
+ 100000  300m 19456  19456 102400          0
+  10000 2000m 19456  19456  33792          0
+  25000 2000m 19456  19456  65536          0
+  40000 2000m 19456  19456  97280          0
+  50000 2000m 19456  19456 118784          0
+ 100000 2000m 19456  19456 225280          0

From eddce4d58b12a3a5f544a4c4f2c843a971acd2e4 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 31 May 2021 21:02:58 +0800
Subject: [PATCH 0519/1674] [ci/build]: Upgrade SONiC package versions (#7755)

---
 .../build/versions/dockers/docker-ptf/versions-deb-stretch  | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py2   | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py3   | 2 +-
 .../dockers/docker-syncd-nephos/versions-deb-stretch        | 2 +-
 .../dockers/sonic-slave-stretch/versions-deb-stretch        | 6 +++---
 files/build/versions/host-image/versions-py3                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index ddf95c3257ae..a3abc7969e52 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -170,7 +170,7 @@ libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-2.2+deb9u4
+libxml2==2.9.4+dfsg1-2.2+deb9u5
 libxmuu1==2:1.1.2-2
 linux-libc-dev==4.9.258-1
 logrotate==3.11.0-0.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 56e2856d4860..003d17b5dbb9 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -1,4 +1,4 @@
-certifi==2020.12.5
+certifi==2021.5.30
 chardet==4.0.0
 crontab==0.23.0
 idna==2.10
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 3d9558ae4858..0fb3fff7589f 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2020.12.5
+certifi==2021.5.30
 click==7.0
 ijson==2.6.1
 jsondiff==1.3.0
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 391fec95be16..e11c780c1f26 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -19,7 +19,7 @@ libsainps==1.5.0
 libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
-libxml2==2.9.4+dfsg1-2.2+deb9u4
+libxml2==2.9.4+dfsg1-2.2+deb9u5
 openssh-client==1:7.4p1-10+deb9u7
 sshpass==1.06-1
 strace==4.15-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index a9b145840556..5ff89f5bd0c3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1092,9 +1092,9 @@ libxml-sax-perl==0.99+dfsg-2
 libxml-simple-perl==2.22-1
 libxml-twig-perl==1:3.50-1
 libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u4
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u4
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u4
+libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
 libxmlgraphics-commons-java==2.1-2
 libxmlrpc-lite-perl==0.717-1
 libxmu6==2:1.1.2-2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index ae8913284152..bbc51d37adc7 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,7 @@ azure-common==1.1.27
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2020.12.5
+certifi==2021.5.30
 cffi==1.14.5
 chardet==4.0.0
 click==7.0

From 556bb62db45eb548f4ded32da0719d98c162dd90 Mon Sep 17 00:00:00 2001
From: novikauanton <81817644+novikauanton@users.noreply.github.com>
Date: Wed, 2 Jun 2021 04:18:00 +0300
Subject: [PATCH 0520/1674] added barefoot to job filters (#7771)

Build failed with error "Failed to verify the package"
The reason of the fail is version verification
Version manager didn't find dependencies for the barefoot platform
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index b247b5d5c212..62b188e56a27 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -22,6 +22,7 @@ parameters:
     default:
     - vs
     - broadcom
+    - barefoot
     - centec
     - generic
     - innovium

From 6a0e9078d4cda09f48c65fda8ef5cbafd23481d2 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 30 Apr 2021 16:30:30 -0700
Subject: [PATCH 0521/1674] [docker-orchagent]: Increase ndppd kernel poll
 interval (#7456)

Why I did it
ndppd by default reads /proc/net/ipv6_route ever 30 seconds. Since T1s advertise so many routes to ToRs, this file is extremely large, and reading it causes ndppd's CPU usage to spike every 30 seconds

How I did it
Increase the delay for reading this file to the maximum possible value (max integer value), which will result in CPU spikes every ~24 days instead of every 30 seconds

How to verify it
Start ndppd with the new config file, confirm that no CPU spikes are seen except at startup

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-orchagent/ndppd.conf.j2                     | 2 +-
 src/sonic-config-engine/tests/sample_output/py2/ndppd.conf | 1 +
 src/sonic-config-engine/tests/sample_output/py3/ndppd.conf | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/ndppd.conf.j2 b/dockers/docker-orchagent/ndppd.conf.j2
index bc375f3c4987..dbb70734680d 100644
--- a/dockers/docker-orchagent/ndppd.conf.j2
+++ b/dockers/docker-orchagent/ndppd.conf.j2
@@ -21,7 +21,7 @@
 {%              set _x = proxy_interfaces[intf].append(prefix) %}
 {%          endif %}
 {%      endfor -%}
-
+route-ttl 2147483647
 {%      for intf, prefix_list in proxy_interfaces.items() %}
 {%          if prefix_list %}
 
diff --git a/src/sonic-config-engine/tests/sample_output/py2/ndppd.conf b/src/sonic-config-engine/tests/sample_output/py2/ndppd.conf
index 71ff1dfaf9ca..edae81fffdb4 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/ndppd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/ndppd.conf
@@ -4,6 +4,7 @@
 #
 # Config file for ndppd, the NDP Proxy Daemon
 # See man page for ndppd.conf.5 for descriptions of all available options
+route-ttl 2147483647
 
 proxy Vlan1000 {
     rule fc02:1000::/64 {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/ndppd.conf b/src/sonic-config-engine/tests/sample_output/py3/ndppd.conf
index 28a239006d24..66117155cdbf 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/ndppd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/ndppd.conf
@@ -4,6 +4,7 @@
 #
 # Config file for ndppd, the NDP Proxy Daemon
 # See man page for ndppd.conf.5 for descriptions of all available options
+route-ttl 2147483647
 
 proxy Vlan1000 {
     rule fc01:1000::/64 {

From eb8c05c30661a7b979585489d800867766997d30 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Mon, 31 May 2021 16:41:28 +0800
Subject: [PATCH 0522/1674] Fix lldpmgrd syntax issue (#7742)

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 dockers/docker-lldp/lldpmgrd | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dockers/docker-lldp/lldpmgrd b/dockers/docker-lldp/lldpmgrd
index 9ff6aa24b922..af45e79762d1 100755
--- a/dockers/docker-lldp/lldpmgrd
+++ b/dockers/docker-lldp/lldpmgrd
@@ -72,9 +72,9 @@ class LldpManager(daemon_base.DaemonBase):
 
         proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (stdout, stderr) = proc.communicate()
-        
+
         if proc.returncode != 0:
-            log_warning("Command failed '{}': {}".format(cmd, stderr))
+            self.log_warning("Command failed '{}': {}".format(cmd, stderr))
         else:
             self.hostname = hostname
 
@@ -90,15 +90,15 @@ class LldpManager(daemon_base.DaemonBase):
 
         proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (stdout, stderr) = proc.communicate()
-        
+
         if proc.returncode != 0:
-            log_warning("Command failed '{}': {}".format(cmd, stderr))
+            self.log_warning("Command failed '{}': {}".format(cmd, stderr))
         else:
             self.mgmt_ip = ip
 
     def is_port_up(self, port_name):
         """
-        Determine if a port is up or down by looking into the oper-status for the port in 
+        Determine if a port is up or down by looking into the oper-status for the port in
         PORT TABLE in the Application DB
         """
         # Retrieve all entires for this port from the Port table
@@ -116,7 +116,7 @@ class LldpManager(daemon_base.DaemonBase):
                 return False
         else:
             # Retrieve PortInitDone entry from the Port table
-            (init_status, init_fvp) = port_table.get("PortInitDone")
+            (init_status, init_fvp) = self.port_table.get("PortInitDone")
             # The initialization procedure is done, but don't have this port entry
             if init_status:
                 self.log_error("Port '{}' not found in {} table in App DB".format(
@@ -186,7 +186,7 @@ class LldpManager(daemon_base.DaemonBase):
             self.pending_cmds.pop(port_name, None)
 
     def lldp_get_mgmt_ip(self):
-        mgmt_intf_keys = self.mgmt_table.getKeys()        
+        mgmt_intf_keys = self.mgmt_table.getKeys()
         ipv4_addr = "None"
         ipv6_addr = "None"
         for key in mgmt_intf_keys:
@@ -199,7 +199,7 @@ class LldpManager(daemon_base.DaemonBase):
                             ipv4_addr = ip[0]
                         else:
                             ipv6_addr = ip[0]
-        
+
         if ipv4_addr != "None":
             return ipv4_addr
         elif ipv6_addr != "None":
@@ -222,7 +222,7 @@ class LldpManager(daemon_base.DaemonBase):
                 else:
                     if not self.mgmt_ip == ip[0]:
                         if '.' in ip[0]:
-                            self.update_mgmt_addr(ip[0]) 
+                            self.update_mgmt_addr(ip[0])
                         elif '.' not in self.mgmt_ip:
                             self.update_mgmt_addr(ip[0])
 
@@ -269,11 +269,11 @@ class LldpManager(daemon_base.DaemonBase):
         # Subscribe to PORT table notifications in the App DB
         sst_appdb = swsscommon.SubscriberStateTable(self.appl_db, swsscommon.APP_PORT_TABLE_NAME)
         sel.addSelectable(sst_appdb)
-        
+
         # Subscribe to MGMT PORT table notifications in the Config DB
         sst_mgmt_ip_confdb = swsscommon.SubscriberStateTable(self.config_db, swsscommon.CFG_MGMT_INTERFACE_TABLE_NAME)
         sel.addSelectable(sst_mgmt_ip_confdb)
-        
+
         # Subscribe to DEVICE_METADATA table notifications in the Config DB
         sst_device_confdb = swsscommon.SubscriberStateTable(self.config_db, swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)
         sel.addSelectable(sst_device_confdb)

From e7009513da2f9b634cafffa1fb5f18f553615b9a Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Mon, 31 May 2021 15:36:24 +0300
Subject: [PATCH 0523/1674] [docker-database] Fix Python3 issue (#7700)

#### Why I did it
To avoid the following error
```
Traceback (most recent call last):
  File "/usr/local/bin/flush_unused_database", line 10, in <module>
    if 'PONG' in output:
TypeError: a bytes-like object is required, not 'str'
```
`communicate` method returns the strings if streams were opened in text mode; otherwise, bytes.
In our case text arg  in Popen is not true and that means that `communicate` return the bytes
#### How I did it
Set `text=True` to get strings instead of bytes
#### How to verify it
run `/usr/local/bin/flush_unused_database` inside database container
---
 dockers/docker-database/flush_unused_database | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-database/flush_unused_database b/dockers/docker-database/flush_unused_database
index e253bc2a4c5d..b1d4af063860 100755
--- a/dockers/docker-database/flush_unused_database
+++ b/dockers/docker-database/flush_unused_database
@@ -5,7 +5,7 @@ import subprocess
 import time
 
 while(True):
-    output = subprocess.Popen(['sonic-db-cli', 'PING'], stdout=subprocess.PIPE).communicate()[0]
+    output = subprocess.Popen(['sonic-db-cli', 'PING'], stdout=subprocess.PIPE, text=True).communicate()[0]
     if 'PONG' in output:
         break
     time.sleep(1)

From 202c31ebbeff9a312cee90d3b1b90d8e4478d820 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:52:48 +0200
Subject: [PATCH 0524/1674] [barefoot][platform] Support fans and thermal
 (#7004)

Add support for fans and thermals to sonic-platform package for Montara platform

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/chassis.py                 |   5 +
 .../sonic_platform/fan_drawer.py              |  77 +++++++++++++
 .../sonic_platform/thermal.py                 | 109 ++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
 create mode 100644 platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/thermal.py

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
index fad16cbdb8a2..42364d6e5688 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
@@ -5,6 +5,8 @@
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.sfp import Sfp
     from sonic_platform.psu import Psu
+    from sonic_platform.fan_drawer import fan_drawer_list_get
+    from sonic_platform.thermal import thermal_list_get
     from eeprom import Eeprom
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
@@ -26,6 +28,9 @@ def __init__(self):
             psu = Psu(i)
             self._psu_list.append(psu)
 
+        self._fan_drawer_list = fan_drawer_list_get()
+        self._thermal_list = thermal_list_get()
+
     def get_name(self):
         """
         Retrieves the name of the chassis
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..92120c4e6242
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
@@ -0,0 +1,77 @@
+try:
+    from sonic_platform.platform_thrift_client import thrift_try
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+_MAX_FAN = 10
+
+def _fan_info_get(fan_num, cb, default=None):
+    def get_data(client):
+        return client.pltfm_mgr.pltfm_mgr_fan_info_get(fan_num)
+    fan_info = thrift_try(get_data)
+    if fan_num == fan_info.fan_num:
+        return cb(fan_info)
+    if default is None:
+        raise LookupError
+    return default
+
+def _fan_info_get_all():
+    for fan_num in range(1, _MAX_FAN + 1):
+        def get_data(client, fan_num=fan_num):
+            return client.pltfm_mgr.pltfm_mgr_fan_info_get(fan_num)
+        fan_info = thrift_try(get_data)
+        if fan_info.fan_num == fan_num:
+            yield fan_info
+
+# Fan -> FanBase -> DeviceBase
+class Fan(FanBase):
+    def __init__(self, num):
+        self.__num = num
+
+    # FanBase interface methods:
+    # returns speed in percents
+    def get_speed(self):
+        def cb(info): return info.percent
+        return _fan_info_get(self.__num, cb, 0)
+
+    def set_speed(self, percent):
+        def set_fan_speed(client):
+            return client.pltfm_mgr.pltfm_mgr_fan_speed_set(fan, percent)
+        return thrift_try(set_fan_speed)
+
+    # DeviceBase interface methods:
+    def get_name(self):
+        return f"counter-rotating-fan-{self.__num}"
+
+    def get_presence(self):
+        return _fan_info_get(self.__num, lambda _: True, False)
+
+    def get_position_in_parent(self):
+        return self.__num
+
+    def is_replaceable(self):
+        return True
+
+    def get_status(self):
+        return True
+
+# FanDrawer -> FanDrawerBase -> DeviceBase
+class FanDrawer(FanDrawerBase):
+    def __init__(self):
+        # For now we return only present fans
+        self._fan_list = [Fan(i.fan_num) for i in _fan_info_get_all()]
+
+    # DeviceBase interface methods:
+    def get_name(self):
+        return 'fantray'
+
+    def get_presence(self):
+        return True
+
+    def get_status(self):
+        return True
+
+def fan_drawer_list_get():
+    return [FanDrawer()]
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/thermal.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/thermal.py
new file mode 100644
index 000000000000..3a39c10a1e1f
--- /dev/null
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/thermal.py
@@ -0,0 +1,109 @@
+try:
+    import subprocess
+
+    from sonic_platform.bfn_extensions.platform_sensors import platform_sensors_get
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+'''
+data argument is in "sensors -A -u" format, example:
+coretemp-isa-0000
+Package id 0:
+  temp1_input: 37.000
+  temp1_max: 82.000
+  temp1_crit: 104.000
+  temp1_crit_alarm: 0.000
+Core 0:
+  temp2_input: 37.000
+  ...
+'''
+def _sensors_chip_parsed(data: str):
+    def kv(line):
+        k, v, *_ = [t.strip(': ') for t in line.split(':') if t] + ['']
+        return k, v
+
+    chip, *data = data.strip().split('\n')
+    chip = chip.strip(': ')
+
+    sensors = []
+    for line in data:
+        if not line.startswith(' '):
+            sensor_label = line.strip(': ')
+            sensors.append((sensor_label, {}))
+            continue
+
+        if len(sensors) == 0:
+            raise RuntimeError(f'invalid data to parse: {data}')
+
+        attr, value = kv(line)
+        sensor_label, sensor_data = sensors[-1]
+        sensor_data.update({attr: value})
+
+    return chip, dict(sensors)
+
+'''
+Example of returned dict:
+{
+    'coretemp-isa-0000': {
+        'Core 1': { "temp1_input": 40, ...  },
+        'Core 2': { ... }
+    }
+}
+'''
+def _sensors_get() -> dict:
+    data = platform_sensors_get(['-A', '-u']) or ''
+    data += subprocess.check_output("/usr/bin/sensors -A -u",
+                shell=True, text=True)
+    data = data.split('\n\n')
+    data = [_sensors_chip_parsed(chip_data) for chip_data in data if chip_data]
+    data = dict(data)
+    return data
+
+def _value_get(d: dict, key_prefix, key_suffix=''):
+    for k, v in d.items():
+        if k.startswith(key_prefix) and k.endswith(key_suffix):
+            return v
+    return None
+
+# Thermal -> ThermalBase -> DeviceBase
+class Thermal(ThermalBase):
+    def __init__(self, chip, label):
+        self.__chip = chip
+        self.__label = label
+        self.__name = f"{chip}:{label}".lower().replace(' ', '-')
+
+    def __get(self, attr_prefix, attr_suffix):
+        sensor_data = _sensors_get().get(self.__chip, {}).get(self.__label, {})
+        value = _value_get(sensor_data, attr_prefix, attr_suffix)
+        if value is not None: return value
+        raise NotImplementedError
+
+    # ThermalBase interface methods:
+    def get_temperature(self) -> float:
+        return float(self.__get('temp', 'input'))
+
+    def get_high_threshold(self) -> float:
+        return float(self.__get('temp', 'max'))
+
+    def get_high_critical_threshold(self) -> float:
+        return float(self.__get('temp', 'crit'))
+
+    # DeviceBase interface methods:
+    def get_name(self):
+        return self.__name
+
+    def get_presence(self):
+        return True
+
+    def get_status(self):
+        return True
+
+def thermal_list_get():
+    l = []
+    for chip, chip_data in _sensors_get().items():
+        for sensor, sensor_data in chip_data.items():
+            # add only temperature sensors
+            if _value_get(sensor_data, "temp") is not None:
+                l.append(Thermal(chip, sensor))
+    return l

From 6a90c09cc757d7538657a5535137c6587f5888a8 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Tue, 1 Jun 2021 19:38:54 +0300
Subject: [PATCH 0525/1674] [barefoot][sonic-platform] Fix Fan.set_speed
 (#7763)

Fixed typo

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/fan_drawer.py                                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
index 92120c4e6242..b30ea24e0e41 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
@@ -38,7 +38,7 @@ def cb(info): return info.percent
 
     def set_speed(self, percent):
         def set_fan_speed(client):
-            return client.pltfm_mgr.pltfm_mgr_fan_speed_set(fan, percent)
+            return client.pltfm_mgr.pltfm_mgr_fan_speed_set(self.__num, percent)
         return thrift_try(set_fan_speed)
 
     # DeviceBase interface methods:

From b65b59c1b501124fc899401da547ecb8d3b4a44a Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Wed, 2 Jun 2021 15:01:35 +0300
Subject: [PATCH 0526/1674] [BFN] Enable syncd-rpc build (#7646)

Why I did it
To enable syncd-rpc for Barefoot build

How I did it
Set the flag

How to verify it
ENABLE_SYNCD_RPC=y make configure PLATFORM=barefoot
ENABLE_SYNCD_RPC=y make all
---
 .azure-pipelines/azure-pipelines-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 4b2459e56c80..c6bd8ca5a15b 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -43,6 +43,7 @@ jobs:
             dbg_image: yes
         - name: barefoot
           variables:
+            sync_rpc_image: yes
             swi_image: yes
         - name: broadcom
           variables:

From 754e4fea178d00b8d58cb3c91fa6496a6fcdb751 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Fri, 4 Jun 2021 05:18:07 +0300
Subject: [PATCH 0527/1674] [Mellanox] Update SDK to 4.4.3106 and FW to
 xx.2008.3106 (#7785)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0a23317e3812..2079c8a42ea1 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.2526
+MLNX_SPC_FW_VERSION = 13.2008.3106
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.2526
+MLNX_SPC2_FW_VERSION = 29.2008.3106
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.2526
+MLNX_SPC3_FW_VERSION = 30.2008.3106
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 29b0dd657444..5e613209042d 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 29b0dd6574448e15aa207a23bda89afc2d19a831
+Subproject commit 5e613209042d2ea3286d43e45531cfee60dd14d0
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index c23c1d51491c..b59da0c2f7d6 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.2522
+MLNX_SDK_VERSION = 4.4.3106
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 1e9cb30008654f297eecd33312a6c7443b52deee Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 5 Jun 2021 22:03:04 +0800
Subject: [PATCH 0528/1674] [ci/build]: Upgrade SONiC package versions (#7770)

---
 .../versions-deb-buster                       | 35 ++++++++---------
 files/build/versions/default/versions-py3     |  4 +-
 files/build/versions/default/versions-web     |  2 +
 .../versions-deb-buster                       | 18 ++++-----
 .../docker-platform-monitor/versions-py2      |  1 +
 .../docker-syncd-bfn/versions-deb-buster      | 12 ++++++
 .../docker-syncd-mlnx/versions-deb-buster     | 38 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  1 +
 .../sonic-slave-stretch/versions-deb-stretch  | 12 +++---
 .../versions/host-image/versions-deb-buster   |  3 +-
 files/build/versions/host-image/versions-py2  |  1 +
 files/build/versions/host-image/versions-py3  |  3 +-
 12 files changed, 75 insertions(+), 55 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx/versions-py2

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 5093f5dded34..00f60d261955 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,5 +1,6 @@
-applibs==1.mlnx.4.4.2522
-applibs-dev==1.mlnx.4.4.2522
+applibs==1.mlnx.4.4.3106
+applibs-dev==1.mlnx.4.4.3106
+bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -7,7 +8,7 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2-dev==1.mlnx.4.4.2522
+iproute2-dev==1.mlnx.4.4.3106
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
 libatk-bridge2.0-dev==2.30.0-5
@@ -90,24 +91,24 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.2522
-sx-acl-helper-dev==1.mlnx.4.4.2522
-sx-complib==1.mlnx.4.4.2522
-sx-complib-dev==1.mlnx.4.4.2522
-sx-examples==1.mlnx.4.4.2522
-sx-examples-dev==1.mlnx.4.4.2522
-sx-gen-utils==1.mlnx.4.4.2522
-sx-gen-utils-dev==1.mlnx.4.4.2522
-sx-scew==1.mlnx.4.4.2522
-sx-scew-dev==1.mlnx.4.4.2522
-sxd-libs==1.mlnx.4.4.2522
-sxd-libs-dev==1.mlnx.4.4.2522
+sx-acl-helper==1.mlnx.4.4.3106
+sx-acl-helper-dev==1.mlnx.4.4.3106
+sx-complib==1.mlnx.4.4.3106
+sx-complib-dev==1.mlnx.4.4.3106
+sx-examples==1.mlnx.4.4.3106
+sx-examples-dev==1.mlnx.4.4.3106
+sx-gen-utils==1.mlnx.4.4.3106
+sx-gen-utils-dev==1.mlnx.4.4.3106
+sx-scew==1.mlnx.4.4.3106
+sx-scew-dev==1.mlnx.4.4.3106
+sxd-libs==1.mlnx.4.4.3106
+sxd-libs-dev==1.mlnx.4.4.3106
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
-wjh-libs==1.mlnx.4.4.2522
-wjh-libs-dev==1.mlnx.4.4.2522
+wjh-libs==1.mlnx.4.4.3106
+wjh-libs-dev==1.mlnx.4.4.3106
 x11proto-composite-dev==1:2018.4-4
 x11proto-input-dev==2018.4-4
 x11proto-randr-dev==2018.4-4
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index d425097bf70e..9ef81ce56009 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -10,7 +10,7 @@ grpcio==1.38.0
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
-importlib-metadata==4.3.1
+importlib-metadata==4.5.0
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.17.1
+protobuf==3.17.2
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 7f2513b1af50..b6dab87e57dd 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -16,6 +16,8 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:6484b93c6b0dfc5f2c425e8abc1e3737850851e7==e3b2bf07ac069c32110a2ebd7425b44d
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 1532ae12707d..eb5e901597f5 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,10 @@
-applibs==1.mlnx.4.4.2522
-applibs-dev==1.mlnx.4.4.2522
+applibs==1.mlnx.4.4.3106
+applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
-python-sdk-api==1.mlnx.4.4.2522
-sx-complib==1.mlnx.4.4.2522
-sx-complib-dev==1.mlnx.4.4.2522
-sx-gen-utils==1.mlnx.4.4.2522
-sx-gen-utils-dev==1.mlnx.4.4.2522
-sxd-libs==1.mlnx.4.4.2522
-sxd-libs-dev==1.mlnx.4.4.2522
\ No newline at end of file
+python-sdk-api==1.mlnx.4.4.3106
+sx-complib==1.mlnx.4.4.3106
+sx-complib-dev==1.mlnx.4.4.3106
+sx-gen-utils==1.mlnx.4.4.3106
+sx-gen-utils-dev==1.mlnx.4.4.3106
+sxd-libs==1.mlnx.4.4.3106
+sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
new file mode 100644
index 000000000000..e644301c7273
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -0,0 +1 @@
+python-sdk-api==4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
new file mode 100644
index 000000000000..ee5c2bee1606
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -0,0 +1,12 @@
+bfnplatform==1.0.0
+bfnsdk==1.0.0
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl4-gnutls-dev==7.64.0-4+deb10u2
+libgoogle-perftools4==2.7-1
+liblzma-dev==5.2.4-1
+libpcap-dev==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libtcmalloc-minimal4==2.7-1
+libunwind-dev==1.2.1-10~deb10u1
+libusb-1.0-0==2:1.0.22-2
+libusb-1.0-0-dev==2:1.0.22-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index d7f3b10e7de4..eae492ab577e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,21 +1,21 @@
-applibs==1.mlnx.4.4.2522
-applibs-dev==1.mlnx.4.4.2522
-iproute2==1.mlnx.4.4.2522
-iproute2-dev==1.mlnx.4.4.2522
+applibs==1.mlnx.4.4.3106
+applibs-dev==1.mlnx.4.4.3106
+iproute2==1.mlnx.4.4.3106
+iproute2-dev==1.mlnx.4.4.3106
 libelf1==0.176-1.1
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-python-sdk-api==1.mlnx.4.4.2522
-sx-acl-helper==1.mlnx.4.4.2522
-sx-acl-helper-dev==1.mlnx.4.4.2522
-sx-complib==1.mlnx.4.4.2522
-sx-complib-dev==1.mlnx.4.4.2522
-sx-examples==1.mlnx.4.4.2522
-sx-examples-dev==1.mlnx.4.4.2522
-sx-gen-utils==1.mlnx.4.4.2522
-sx-gen-utils-dev==1.mlnx.4.4.2522
-sx-scew==1.mlnx.4.4.2522
-sx-scew-dev==1.mlnx.4.4.2522
-sxd-libs==1.mlnx.4.4.2522
-sxd-libs-dev==1.mlnx.4.4.2522
-wjh-libs==1.mlnx.4.4.2522
-wjh-libs-dev==1.mlnx.4.4.2522
\ No newline at end of file
+python-sdk-api==1.mlnx.4.4.3106
+sx-acl-helper==1.mlnx.4.4.3106
+sx-acl-helper-dev==1.mlnx.4.4.3106
+sx-complib==1.mlnx.4.4.3106
+sx-complib-dev==1.mlnx.4.4.3106
+sx-examples==1.mlnx.4.4.3106
+sx-examples-dev==1.mlnx.4.4.3106
+sx-gen-utils==1.mlnx.4.4.3106
+sx-gen-utils-dev==1.mlnx.4.4.3106
+sx-scew==1.mlnx.4.4.3106
+sx-scew-dev==1.mlnx.4.4.3106
+sxd-libs==1.mlnx.4.4.3106
+sxd-libs-dev==1.mlnx.4.4.3106
+wjh-libs==1.mlnx.4.4.3106
+wjh-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
new file mode 100644
index 000000000000..e644301c7273
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -0,0 +1 @@
+python-sdk-api==4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 5ff89f5bd0c3..ec74d3d7b4b1 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -154,9 +154,9 @@ guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
 icu-devtools==57.1-6+deb9u4
-imagemagick==8:6.9.7.4+dfsg-11+deb9u12
-imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u12
-imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u12
+imagemagick==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
 install-info==6.3.0.dfsg.1-1+b2
 intltool-debian==0.35.0+20060710.4
 iptables==1.6.0+snapshot20161117-6
@@ -656,9 +656,9 @@ liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
 libmagic1==1:5.30-1+deb9u3
-libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u12
-libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u12
-libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u12
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
 libmail-sendmail-perl==0.79.16-2
 libmailtools-perl==2.18-1
 libmailutils5==1:3.1.1-1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 996efcd39b97..ad03e1db4214 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -2,6 +2,7 @@ acl==2.2.53-4
 apparmor==2.13.2-10
 apt-transport-https==1.8.2.2
 bash-completion==1:2.8-6
+bfn-modules==1.0
 bridge-utils==1.6-2
 bsdmainutils==11.1.2+b1
 busybox==1:1.30.1-4
@@ -241,7 +242,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.2522
+sx-kernel==1.mlnx.4.4.3106
 sysfsutils==2.1.0+repack-5
 systemd==247.3-5~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 4985465af0ef..87f2068bc20e 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -21,5 +21,6 @@ redis==3.5.3
 scandir==1.10.0
 singledispatch==3.6.2
 six==1.16.0
+thrift==0.13.0
 typing==3.10.0.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index bbc51d37adc7..2b7ae9fa5043 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -19,7 +19,7 @@ m2crypto==0.37.1
 markupsafe==2.0.1
 natsort==6.2.1
 netaddr==0.8.0
-netifaces==0.10.9
+netifaces==0.11.0
 parameterized==0.8.1
 pathtools==0.1.2
 pexpect==4.8.0
@@ -36,6 +36,7 @@ requests==2.25.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
+thrift==0.13.0
 urllib3==1.26.5
 watchdog==0.10.3
 websocket-client==1.0.1

From 32e5137ab75e8228199885687749ea180908fa27 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Thu, 3 Jun 2021 20:07:17 -0700
Subject: [PATCH 0529/1674] Add service to restore TACACS from old config
 (#7560)

Why I did it
In upgrade scenarios, where config_db.json is not carry forwarded to new image, it could be left w/o TACACS credentials.
Added a service to trigger 5 minutes after boot and restore TACACS, if /etc/sonic/old_config/tacacs.json is present.

How I did it
By adding a service, that would fire 5 mins after boot.
This service apply tacacs if available.

How to verify it
Upgrade and watch status of tacacs.timer & tacacs.service
You may create /etc/sonic/old_config/tacacs.json, with updated credentials
(before 5mins after boot) and see that appears in config & persisted too.

Which release branch to backport (provide reason below if selected)
 201911
 202006
 202012
---
 files/build_templates/sonic_debian_extension.j2 |  7 +++++++
 files/build_templates/tacacs-config.service     | 12 ++++++++++++
 files/build_templates/tacacs-config.timer       | 12 ++++++++++++
 files/image_config/config-setup/config-setup    | 14 +++++++++++++-
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 files/build_templates/tacacs-config.service
 create mode 100644 files/build_templates/tacacs-config.timer

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 4e27def8f1af..4a2b93f80e77 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -507,6 +507,13 @@ sudo cp $IMAGE_CONFIGS/config-setup/config-setup $FILESYSTEM_ROOT/usr/bin/config
 echo "config-setup.service" | sudo tee -a $GENERATED_SERVICE_FILE
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable config-setup.service
 
+# Add delayed tacacs application service
+sudo cp files/build_templates/tacacs-config.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/
+echo "tacacs-config.timer" | sudo tee -a $GENERATED_SERVICE_FILE
+
+sudo cp files/build_templates/tacacs-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/
+echo "tacacs-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
+
 # Copy config-chassisdb script and service file
 j2 files/build_templates/config-chassisdb.service.j2 | sudo tee $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/config-chassisdb.service
 sudo cp $IMAGE_CONFIGS/config-chassisdb/config-chassisdb $FILESYSTEM_ROOT/usr/bin/config-chassisdb
diff --git a/files/build_templates/tacacs-config.service b/files/build_templates/tacacs-config.service
new file mode 100644
index 000000000000..27e0e6891ec6
--- /dev/null
+++ b/files/build_templates/tacacs-config.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=TACACS application
+Requires=updategraph.service
+After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/config-setup apply_tacacs
+RemainAfterExit=yes
+
diff --git a/files/build_templates/tacacs-config.timer b/files/build_templates/tacacs-config.timer
new file mode 100644
index 000000000000..28314e06f4cb
--- /dev/null
+++ b/files/build_templates/tacacs-config.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Delays tacacs apply until SONiC has started
+PartOf=tacacs-config.service
+After=updategraph.service
+
+[Timer]
+OnUnitActiveSec=0 sec
+OnBootSec=5min 30 sec
+Unit=tacacs-config.service
+
+[Install]
+WantedBy=timers.target updategraph.service
diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index 0006b69695e6..edf4ad4ffee3 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -110,12 +110,19 @@ reload_minigraph()
 {
     echo "Reloading minigraph..."
     config load_minigraph -y -n 
+    config save -y
+}
+
+# Apply tacacs config
+apply_tacacs()
+{
     if [ -r /etc/sonic/old_config/${TACACS_JSON_BACKUP} ]; then
         sonic-cfggen -j /etc/sonic/old_config/${TACACS_JSON_BACKUP} --write-to-db
+        echo "Applied tacacs json to restore tacacs credentials"
+        config save -y
     else
         echo "Missing tacacs json to restore tacacs credentials"
     fi
-    config save -y
 }
 
 # Reload exisitng config db file on disk
@@ -421,4 +428,9 @@ if [ "$CMD" = "backup" ]; then
     do_config_backup
 fi
 
+# Apply tacacs from old configuration
+if [ "$CMD" = "apply_tacacs" ]; then
+    apply_tacacs
+fi
+
 exit 0

From 33cb83cbd13956d8d978760ae932161e87e18b55 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Sat, 5 Jun 2021 00:40:23 +0800
Subject: [PATCH 0530/1674] [Mellanox] Align PSU name convention returned from
 psu.get_name platform API (#7783)

Make PSU name returned from platform API aligned with the convention "PSU {X}" instead of "PSU{X}".
---
 platform/mellanox/mlnx-platform-api/sonic_platform/psu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
index cb05278d5b66..2d0e099c1b29 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
@@ -65,7 +65,7 @@ def __init__(self, psu_index, platform):
         psu_oper_status = "thermal/psu{}_pwr_status".format(self.index)
         #psu_oper_status should always be present for all platforms
         self.psu_oper_status = os.path.join(self.psu_path, psu_oper_status)
-        self._name = "PSU{}".format(psu_index + 1)
+        self._name = "PSU {}".format(psu_index + 1)
 
         if platform in platform_dict_psu:
             filemap = psu_profile_list[platform_dict_psu[platform]]

From f0efc090f0b8a86666628c73a8324c01cd9a8bff Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Sat, 5 Jun 2021 21:50:01 -0700
Subject: [PATCH 0531/1674] [7050] updating 7050 MMU configurations (#7801)

Why I did it
7050 S4Q31 mmu configuration is missing ALPM configurations, causing not enough memory reserved for routes. Orchagent crashes on a nightly testbed with 6400 route entries.

How I did it
Add the missing ALPM configurations.

How to verify it
Load the configuration on testbed and verified new configuration exists and no more crash.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 .../td2-a7050-q31s4-31x40G-4x10G.config.bcm   | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
index 4819c7929ecd..c5666bbc745d 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
@@ -1,17 +1,51 @@
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=8
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+
+stable_size=0x2000000
+
+tdma_timeout_usec=5000000
+tslam_timeout_usec=15000000
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay=0x0d
+###############################
+xgxs_lcpll_xtal_refclk=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+table_dma_enable=1
+
 arl_clean_timeout_usec=15000000
-bcm_num_cos.0=8
 bcm_stat_flags=1
 bcm_stat_jumbo.0=9236
-cdma_timeout_usec.0=15000000
-dma_desc_timeout_usec.0=15000000
-higig2_hdr_mode.0=1
-ipv6_lpm_128b_enable.0=2
-l2xmsg_mode.0=1
-max_vp_lags.0=0
-mdio_output_delay=0x0d
-miim_intr_enable.0=0
-module_64ports.0=0
-os=unix
+
 pbmp_oversubscribe.0=0x1fffffffffffffffffffffffffe
 pbmp_xport_xe.0=0x1fffffffffffffffffffffffffe
 phy_an_c37_1.0=3
@@ -243,10 +277,6 @@ serdes_firmware_mode_101.0=2
 serdes_firmware_mode_102.0=2
 serdes_firmware_mode_103.0=2
 serdes_firmware_mode_104.0=2
-stable_size=0x2000000
-tdma_timeout_usec.0=15000000
-tslam_timeout_usec.0=15000000
-xgxs_lcpll_xtal_refclk.0=1
 xgxs_rx_lane_map_1.0=0x3210
 xgxs_rx_lane_map_5.0=0x0321
 xgxs_rx_lane_map_9.0=0x1302

From 4506525b617f593161895cc0528d9c0e366adb52 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Mon, 7 Jun 2021 12:05:34 +0300
Subject: [PATCH 0532/1674] [sonic-linux-kernel] submodule update (#7776)

Includes below comments:
```
fcf7cdc [patch] add patch "net: sch_generic: fix the missing new qdisc assignment bug" (#213)
```

#### Why I did it
To bring the fix "net: sch_generic: fix the missing new qdisc assignment bug".

#### How I did it
Updated submodule.

#### How to verify it

Build and run.
Verify that flapping a LAG member port does not lead to this member beeing stuck in disabled state.
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 61b331f8b023..4601fa8bdd60 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 61b331f8b0231883fe59ba274915f570e8dcea1e
+Subproject commit 4601fa8bdd6077f69d6922ed30e5905aad36b36b

From 9b5e0694e3d829a88b52c34192c20e7d94802479 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:06:14 +0300
Subject: [PATCH 0533/1674] [Mellanox][202012] Update FW version to 2008_3110
 (#7807)

- Why I did it
Update FW version to 2008_3110 fixing SN3800 specific warm boot scenario:

1. Disable interface
2. Warm Boot
3. Enable Interface --> link will remain down.

- How I did it
Use new FW that contains the fix for the problem mentioned above

- How to verify it
Run the scenario mentioned above and make sure that the link is up after warm boot

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 2079c8a42ea1..fd7623d40cc7 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3106
+MLNX_SPC_FW_VERSION = 13.2008.3110
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3106
+MLNX_SPC2_FW_VERSION = 29.2008.3110
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3106
+MLNX_SPC3_FW_VERSION = 30.2008.3110
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 5e613209042d..13a09e5177b8 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 5e613209042d2ea3286d43e45531cfee60dd14d0
+Subproject commit 13a09e5177b800f846ca444257f15696c6e17eb8

From 384680a83f2714b9cc6ec7d6b5c70acbbe22598f Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 26 Mar 2021 19:18:54 +0200
Subject: [PATCH 0534/1674] [platform][barefoot] Lazy initialize fans and
 thermals list (#7103)

Initialize fans and thermals lists on demand; make them properties in order to reduce Chassis object initialization time

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/chassis.py                 | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
index 42364d6e5688..47ebcb0e1eea 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
@@ -28,8 +28,28 @@ def __init__(self):
             psu = Psu(i)
             self._psu_list.append(psu)
 
-        self._fan_drawer_list = fan_drawer_list_get()
-        self._thermal_list = thermal_list_get()
+        self.__fan_drawers = None
+        self.__thermals = None
+
+    @property
+    def _fan_drawer_list(self):
+        if self.__fan_drawers is None:
+            self.__fan_drawers = fan_drawer_list_get()
+        return self.__fan_drawers
+
+    @_fan_drawer_list.setter
+    def _fan_drawer_list(self, value):
+        pass
+
+    @property
+    def _thermal_list(self):
+        if self.__thermals is None:
+            self.__thermals = thermal_list_get()
+        return self.__thermals
+
+    @_thermal_list.setter
+    def _thermal_list(self, value):
+        pass
 
     def get_name(self):
         """

From 44d9489b8d15e5b14910b44464958e4222e61161 Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 4 Jun 2021 19:48:57 +0300
Subject: [PATCH 0535/1674] [barefoot][platform] Refactor chassis.py (#7704)

#### Why I did it
On our platforms syncd must be up while using the sonic_platform.
The issue is warm-reboot script first disables syncd then instantiate Chassis, which tries to connect syncd in __init__.

#### How I did it
Refactor Chassis to lazy initialize components.

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/chassis.py                 | 47 ++++++++++++++-----
 .../sonic_platform/psu.py                     |  7 +++
 .../sonic_platform/sfp.py                     |  7 +++
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
index 47ebcb0e1eea..76e6895df2b8 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
@@ -3,8 +3,8 @@
 try:
     import sys
     from sonic_platform_base.chassis_base import ChassisBase
-    from sonic_platform.sfp import Sfp
-    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp, sfp_list_get
+    from sonic_platform.psu import psu_list_get
     from sonic_platform.fan_drawer import fan_drawer_list_get
     from sonic_platform.thermal import thermal_list_get
     from eeprom import Eeprom
@@ -18,18 +18,21 @@ class Chassis(ChassisBase):
     def __init__(self):
         ChassisBase.__init__(self)
 
-        self._eeprom = Eeprom()
-
-        for index in range(Sfp.port_start(), Sfp.port_end() + 1):
-            sfp_node = Sfp(index)
-            self._sfp_list.append(sfp_node)
-
-        for i in range(1, Psu.get_num_psus() + 1):
-            psu = Psu(i)
-            self._psu_list.append(psu)
-
+        self.__eeprom = None
         self.__fan_drawers = None
         self.__thermals = None
+        self.__psu_list = None
+        self.__sfp_list = None
+
+    @property
+    def _eeprom(self):
+        if self.__eeprom is None:
+            self.__eeprom = Eeprom()
+        return self.__eeprom
+
+    @_eeprom.setter
+    def _eeprom(self, value):
+        pass
 
     @property
     def _fan_drawer_list(self):
@@ -51,6 +54,26 @@ def _thermal_list(self):
     def _thermal_list(self, value):
         pass
 
+    @property
+    def _psu_list(self):
+        if self.__psu_list is None:
+            self.__psu_list = psu_list_get()
+        return self.__psu_list
+
+    @_psu_list.setter
+    def _psu_list(self, value):
+        pass
+
+    @property
+    def _sfp_list(self):
+        if self.__sfp_list is None:
+            self.__sfp_list = sfp_list_get()
+        return self.__sfp_list
+
+    @_sfp_list.setter
+    def _sfp_list(self, value):
+        pass
+
     def get_name(self):
         """
         Retrieves the name of the chassis
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
index d46cbcca545d..e5f245d53074 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py
@@ -101,3 +101,10 @@ def get_model(self):
 
     def is_replaceable(self):
         return True
+
+def psu_list_get():
+    psu_list = []
+    for i in range(1, Psu.get_num_psus() + 1):
+        psu = Psu(i)
+        psu_list.append(psu)
+    return psu_list
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
index 739a48a8f1eb..640b1c41948c 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py
@@ -269,3 +269,10 @@ def get_transceiver_threshold_info(self):
 
     def get_change_event(self, timeout=0):
         return Sfp.get_transceiver_change_event(timeout)
+
+def sfp_list_get():
+    sfp_list = []
+    for index in range(Sfp.port_start(), Sfp.port_end() + 1):
+        sfp_node = Sfp(index)
+        sfp_list.append(sfp_node)
+    return sfp_list

From 31a8b1c87a344cbeba84bbda2784f3a9b7a3b396 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Sat, 5 Jun 2021 06:04:19 +0530
Subject: [PATCH 0536/1674] [DellEMC] Z9332: Change in i2c mapping (#7797)

#### Why I did it
- After [sonic-linux-kernel#177](https://github.com/Azure/sonic-linux-kernel/pull/177)  changes, the I2C mux channels of Baseboard and Switchboard CPLDs are moved from i2c-4 and i2c-5 to i2c-36 and i2c-37 respectively.
- This caused QSFP driver initialization of i2c-36 to i2c-41 to fail causing the ports from Ethernet208 to Ethernet248 fail.

#### How I did it
- The fix to this problem is to change the order of QSFP driver initialization to I2C mux channels.
- Instead of the order i2c-10 to i2c-41, the order i2c-4 to i2c-35 is being utilized.
- Also, need to change the i2c-mux-channel number for Baseboard CPLD and switchboard CPLD in scripts to access them.
---
 .../plugins/sfputil.py                        | 64 +++++++++----------
 .../z9332f/scripts/z9332f_platform.sh         | 14 ++--
 .../z9332f/sonic_platform/chassis.py          | 64 +++++++++----------
 .../z9332f/sonic_platform/component.py        |  6 +-
 .../z9332f/sonic_platform/sfp.py              | 64 +++++++++----------
 5 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
index d037fd9273dd..9ac14d83d73a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
@@ -31,38 +31,38 @@ class SfpUtil(SfpUtilBase):
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
 
     _port_to_i2c_mapping = {
-        1:  10,
-        2:  11,
-        3:  12,
-        4:  13,
-        5:  14,
-        6:  15,
-        7:  16,
-        8:  17,
-        9:  18,
-        10: 19,
-        11: 20,
-        12: 21,
-        13: 22,
-        14: 23,
-        15: 24,
-        16: 25,
-        17: 26,
-        18: 27,
-        19: 28,
-        20: 29,
-        21: 30,
-        22: 31,
-        23: 32,
-        24: 33,
-        25: 34,
-        26: 35,
-        27: 36,
-        28: 37,
-        29: 38,
-        30: 39,
-        31: 40,
-        32: 41,
+        1:  4,
+        2:  5,
+        3:  6,
+        4:  7,
+        5:  8,
+        6:  9,
+        7:  10,
+        8:  11,
+        9:  12,
+        10: 13,
+        11: 14,
+        12: 15,
+        13: 16,
+        14: 17,
+        15: 18,
+        16: 19,
+        17: 20,
+        18: 21,
+        19: 22,
+        20: 23,
+        21: 24,
+        22: 25,
+        23: 26,
+        24: 27,
+        25: 28,
+        26: 29,
+        27: 30,
+        28: 31,
+        29: 32,
+        30: 33,
+        31: 34,
+        32: 35,
         33: 1,
         34: 2,
     }
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
index f80207df8ea2..a5f8a2e6d62e 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
@@ -56,14 +56,14 @@ switch_board_qsfp_mux() {
 switch_board_qsfp() {
         case $1 in
         "new_device")
-                        for ((i=10;i<=41;i++));
+                        for ((i=4;i<=35;i++));
                         do
                             echo optoe3 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
                         done
                         ;;
  
         "delete_device")
-                        for ((i=10;i<=41;i++));
+                        for ((i=4;i<=35;i++));
                         do
                             echo 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
                         done
@@ -112,7 +112,7 @@ switch_board_modsel() {
 
 #This enables the led control for CPU and default states 
 switch_board_led_default() {
-	/usr/sbin/i2cset -y 5 0x0d 0x62 0xd0
+	/usr/sbin/i2cset -y 37 0x0d 0x62 0xd0
 }
 
 # Readout firmware version of the system and
@@ -135,15 +135,15 @@ platform_firmware_versions() {
 	echo "BMC: $r" >> $FIRMWARE_VERSION_FILE
 
 	#BaseBoard CPLD 0x0d on i2c bus 5 ( physical FPGA I2C-5)
-	ver=`/usr/sbin/i2cget -y 5 0x0d 0x0`
+	ver=`/usr/sbin/i2cget -y 37 0x0d 0x0`
 	echo "Baseboard CPLD: $((ver))" >> $FIRMWARE_VERSION_FILE
 
 	#Switch CPLD 1 0x30 on i2c bus 4 ( physical FPGA I2C-4)
-	ver=`/usr/sbin/i2cget -y 4 0x30 0x0`
+	ver=`/usr/sbin/i2cget -y 36 0x30 0x0`
 	echo "Switch CPLD 1: $((ver))" >> $FIRMWARE_VERSION_FILE
 
 	#Switch CPLD 1 0x30 on i2c bus 4 ( physical FPGA I2C-4)
-	ver=`/usr/sbin/i2cget -y 4 0x31 0x0`
+	ver=`/usr/sbin/i2cget -y 36 0x31 0x0`
 	echo "Switch CPLD 2: $((ver))" >> $FIRMWARE_VERSION_FILE
 }
 
@@ -176,7 +176,7 @@ get_reboot_cause() {
     if [[ ! -e $REBOOT_REASON_FILE ]]; then
         echo "0" > $REBOOT_REASON_FILE
     else
-        /usr/sbin/i2cget -y 5 0x0d 0x06  > $REBOOT_REASON_FILE
+        /usr/sbin/i2cget -y 37 0x0d 0x06  > $REBOOT_REASON_FILE
     fi
 }
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index d32e3c8c1c5a..bc7e1d793c60 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -74,38 +74,38 @@ class Chassis(ChassisBase):
 
     _global_port_pres_dict = {}
     _port_to_i2c_mapping = {
-            1:  10,
-            2:  11,
-            3:  12,
-            4:  13,
-            5:  14,
-            6:  15,
-            7:  16,
-            8:  17,
-            9:  18,
-            10: 19,
-            11: 20,
-            12: 21,
-            13: 22,
-            14: 23,
-            15: 24,
-            16: 25,
-            17: 26,
-            18: 27,
-            19: 28,
-            20: 29,
-            21: 30,
-            22: 31,
-            23: 32,
-            24: 33,
-            25: 34,
-            26: 35,
-            27: 36,
-            28: 37,
-            29: 38,
-            30: 39,
-            31: 40,
-            32: 41,
+            1:  4,
+            2:  5,
+            3:  6,
+            4:  7,
+            5:  8,
+            6:  9,
+            7:  10,
+            8:  11,
+            9:  12,
+            10: 13,
+            11: 14,
+            12: 15,
+            13: 16,
+            14: 17,
+            15: 18,
+            16: 19,
+            17: 20,
+            18: 21,
+            19: 22,
+            20: 23,
+            21: 24,
+            22: 25,
+            23: 26,
+            24: 27,
+            25: 28,
+            26: 29,
+            27: 30,
+            28: 31,
+            29: 32,
+            30: 33,
+            31: 34,
+            32: 35,
             33: 1,
             34: 2,
             }
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index c60cc06b8f57..8b7ae004e8a4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -35,13 +35,13 @@ def get_cpld_version(bus, i2caddr):
     return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
 
 def get_cpld0_version():
-    return get_cpld_version(5, 0x0d)
+    return get_cpld_version(37, 0x0d)
 
 def get_cpld1_version():
-    return get_cpld_version(4, 0x30)
+    return get_cpld_version(36, 0x30)
 
 def get_cpld2_version():
-    return get_cpld_version(4, 0x31)
+    return get_cpld_version(36, 0x31)
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 7089e8698d68..1897177dbbc4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -227,38 +227,38 @@ class Sfp(SfpBase):
     """
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
     _port_to_i2c_mapping = {
-            1:  10,
-            2:  11,
-            3:  12,
-            4:  13,
-            5:  14,
-            6:  15,
-            7:  16,
-            8:  17,
-            9:  18,
-            10: 19,
-            11: 20,
-            12: 21,
-            13: 22,
-            14: 23,
-            15: 24,
-            16: 25,
-            17: 26,
-            18: 27,
-            19: 28,
-            20: 29,
-            21: 30,
-            22: 31,
-            23: 32,
-            24: 33,
-            25: 34,
-            26: 35,
-            27: 36,
-            28: 37,
-            29: 38,
-            30: 39,
-            31: 40,
-            32: 41,
+            1:  4,
+            2:  5,
+            3:  6,
+            4:  7,
+            5:  8,
+            6:  9,
+            7:  10,
+            8:  11,
+            9:  12,
+            10: 13,
+            11: 14,
+            12: 15,
+            13: 16,
+            14: 17,
+            15: 18,
+            16: 19,
+            17: 20,
+            18: 21,
+            19: 22,
+            20: 23,
+            21: 24,
+            22: 25,
+            23: 26,
+            24: 27,
+            25: 28,
+            26: 29,
+            27: 30,
+            28: 31,
+            29: 32,
+            30: 33,
+            31: 34,
+            32: 35,
             33: 1,
             34: 2
             }

From ce3bdaf6971ec115411e5937398af8a68484a20a Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 8 Jun 2021 19:38:00 +0300
Subject: [PATCH 0537/1674] [nvidia/mellanox] add MLNX_SDK_DEB_VERSION to SDK
 packages flags list. (#7747)

This is due to the fact that we use SONIC_OVERRIDE_BUILD_VARS internally
in our build jobs and this is not accounted in caching framework.
So we add MLNX_SDK_DEB_VERSION to force rebuild if we changed it via
SONIC_OVERRIDE_BUILD_VARS.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 platform/mellanox/sdk.dep | 72 ++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/platform/mellanox/sdk.dep b/platform/mellanox/sdk.dep
index bf3ecb95d8ae..08c9f2e7c980 100644
--- a/platform/mellanox/sdk.dep
+++ b/platform/mellanox/sdk.dep
@@ -1,5 +1,15 @@
 # DPKG FRK
 
+# Append MLNX_SDK_DEB_VERSION to flags list.
+# We use SONIC_OVERRIDE_BUILD_VARS in order to build SONiC with any SDK we want
+# by passing it in environment variable. This approach does not work well with
+# caching framework which assumes that if the corresponding makefile didn't change
+# the version didn't change neither. There is no ultimate solution to support
+# caching and anything user can pass in SONIC_OVERRIDE_BUILD_VARS, so as a W/A
+# we append MLNX_SDK_DEB_VERSION to flags to invalidate cache in case we use
+# SONIC_OVERRIDE_BUILD_VARS.
+MLNX_SDK_COMMON_FLAGS_LIST = $(SONIC_COMMON_FLAGS_LIST) $(MLNX_SDK_DEB_VERSION)
+
 # APPLIBS
 
 SPATH := $($(APPLIBS)_SRC_PATH)
@@ -8,16 +18,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(APPLIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(APPLIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(APPLIBS)_DEP_FILES := $(DEP_FILES)
 
 $(APPLIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(APPLIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(APPLIBS_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(APPLIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(APPLIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(APPLIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -29,16 +39,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(IPROUTE2_MLNX)_CACHE_MODE := GIT_CONTENT_SHA
-$(IPROUTE2_MLNX)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(IPROUTE2_MLNX)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(IPROUTE2_MLNX)_DEP_FILES := $(DEP_FILES)
 
 $(IPROUTE2_MLNX_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(IPROUTE2_MLNX_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(IPROUTE2_MLNX_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(IPROUTE2_MLNX_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(IPROUTE2_MLNX_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(IPROUTE2_MLNX_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(IPROUTE2_MLNX_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(IPROUTE2_MLNX_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -50,16 +60,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SX_COMPLIB)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_COMPLIB)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_COMPLIB)_DEP_FILES := $(DEP_FILES)
 
 $(SX_COMPLIB_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_COMPLIB_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_COMPLIB_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SX_COMPLIB_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_COMPLIB_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_COMPLIB_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -71,16 +81,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SX_EXAMPLES)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_EXAMPLES)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_EXAMPLES)_DEP_FILES := $(DEP_FILES)
 
 $(SX_EXAMPLES_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_EXAMPLES_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_EXAMPLES_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SX_EXAMPLES_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_EXAMPLES_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_EXAMPLES_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -92,16 +102,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SX_GEN_UTILS)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_GEN_UTILS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_GEN_UTILS)_DEP_FILES := $(DEP_FILES)
 
 $(SX_GEN_UTILS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_GEN_UTILS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_GEN_UTILS_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SX_GEN_UTILS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_GEN_UTILS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_GEN_UTILS_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -113,16 +123,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SX_SCEW)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_SCEW)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_SCEW)_DEP_FILES := $(DEP_FILES)
 
 $(SX_SCEW_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_SCEW_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_SCEW_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SX_SCEW_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_SCEW_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_SCEW_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -134,16 +144,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SXD_LIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SXD_LIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SXD_LIBS)_DEP_FILES := $(DEP_FILES)
 
 $(SXD_LIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SXD_LIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SXD_LIBS_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SXD_LIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SXD_LIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SXD_LIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -155,12 +165,12 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(PYTHON_SDK_API)_CACHE_MODE := GIT_CONTENT_SHA
-$(PYTHON_SDK_API)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(PYTHON_SDK_API)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(PYTHON_SDK_API)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(PYTHON_SDK_API_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(PYTHON_SDK_API_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(PYTHON_SDK_API_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(PYTHON_SDK_API_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -172,16 +182,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(SX_ACL_HELPER)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_ACL_HELPER)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_ACL_HELPER)_DEP_FILES := $(DEP_FILES)
 
 $(SX_ACL_HELPER_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_ACL_HELPER_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_ACL_HELPER_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(SX_ACL_HELPER_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_ACL_HELPER_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_ACL_HELPER_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -193,16 +203,16 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(shell git ls-files -- $(SPATH))
 
 $(WJH_LIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(WJH_LIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(WJH_LIBS)_DEP_FILES := $(DEP_FILES)
 
 $(WJH_LIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(WJH_LIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(WJH_LIBS_DEV)_DEP_FILES := $(DEP_FILES)
 
 ifeq ($(SDK_FROM_SRC),y)
 $(WJH_LIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS_DBGSYM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(WJH_LIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(WJH_LIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
 endif
 
@@ -217,13 +227,13 @@ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES += $(filter-out $(SMDEP_PATHS),$(shell git ls-files -- $(SPATH) | grep -Ev ' '))
 
 $(SX_KERNEL)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_KERNEL)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_KERNEL)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_KERNEL)_DEP_FILES := $(filter-out $(SLINKS),$(DEP_FILES))
 $(SX_KERNEL)_SMDEP_FILES := $(filter-out $(SLINKS),$(SMDEP_FILES))
 $(SX_KERNEL)_SMDEP_PATHS := $(SMDEP_PATHS)
 
 $(SX_KERNEL_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_KERNEL_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(SX_KERNEL_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
 $(SX_KERNEL_DEV)_DEP_FILES := $(filter-out $(SLINKS),$(DEP_FILES))
 $(SX_KERNEL_DEV)_SMDEP_FILES := $(filter-out $(SLINKS),$(SMDEP_FILES))
 $(SX_KERNEL_DEV)_SMDEP_PATHS := $(SMDEP_PATHS)

From a9824b73c6e678e79e8607bf58e23cc3e011a644 Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Wed, 9 Jun 2021 00:46:38 +0800
Subject: [PATCH 0538/1674] [as7726-32x] Fix module_reset sysfs (#7715)

Fix modules_reset sysfs due to need to do revert.

Signed-off-by: Jostar Yang <jostar_yang@accton.com.tw>
---
 .../as7726-32x/modules/accton_as7726_32x_cpld.c               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_cpld.c b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_cpld.c
index 9ffc3353839c..6ca5b1c1296a 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_cpld.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_cpld.c
@@ -498,6 +498,10 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
     if (attr->index >= MODULE_PRESENT_1 && attr->index <= MODULE_PRESENT_34) {
         revert = 1;
     }
+    if (attr->index >= MODULE_RESET_1 && attr->index <= MODULE_RESET_32) {
+        revert = 1;
+    }
+    
 
     mutex_lock(&data->update_lock);
 	status = as7726_32x_cpld_read_internal(client, reg);

From fb2c995f53f6d48edd8f0eb8f9dec4dc8f43335c Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Wed, 9 Jun 2021 09:04:22 -0700
Subject: [PATCH 0539/1674] [202012][Monit] Deprecate the feature of monitoring
 the critical processes by Monit (#7823)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
Currently we leveraged the Supervisor to monitor the running status of critical processes in each container and it is more reliable and flexible than doing the monitoring by Monit. So we removed the functionality of monitoring the critical processes by Monit.

How I did it
I removed the script process_checker and corresponding Monit configuration entries of critical processes.

How to verify it
I verified this on the device str-7260cx3-acs-1.
---
 .../base_image_files/monit_database           |  7 --
 .../docker-fpm-frr/base_image_files/monit_bgp | 27 -----
 .../docker-lldp/base_image_files/monit_lldp   | 15 ---
 .../base_image_files/monit_swss               | 56 -----------
 .../docker-sflow/base_image_files/monit_sflow |  7 --
 .../docker-snmp/base_image_files/monit_snmp   | 11 ---
 .../base_image_files/monit_restapi            |  7 --
 .../base_image_files/monit_telemetry          |  9 --
 .../docker-teamd/base_image_files/monit_teamd | 11 ---
 .../build_templates/sonic_debian_extension.j2 |  2 -
 files/image_config/monit/process_checker      | 98 -------------------
 platform/barefoot/docker-syncd-bfn.mk         |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/broadcom/docker-syncd-brcm.mk        |  1 -
 .../base_image_files/monit_syncd              | 11 ---
 platform/cavium/docker-syncd-cavm.mk          |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/centec/docker-syncd-centec.mk        |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/marvell-arm64/docker-syncd-mrvl.mk   |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/marvell-armhf/docker-syncd-mrvl.mk   |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/marvell/docker-syncd-mrvl.mk         |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/mellanox/docker-syncd-mlnx.mk        |  1 -
 .../base_image_files/monit_syncd              |  7 --
 platform/nephos/docker-syncd-nephos.mk        |  1 -
 .../base_image_files/monit_syncd              | 11 ---
 rules/docker-database.mk                      |  1 -
 rules/docker-fpm-frr.mk                       |  1 -
 rules/docker-lldp.mk                          |  1 -
 rules/docker-orchagent.mk                     |  1 -
 rules/docker-restapi.mk                       |  1 -
 rules/docker-sflow.mk                         |  1 -
 rules/docker-snmp.mk                          |  1 -
 rules/docker-teamd.mk                         |  1 -
 37 files changed, 338 deletions(-)
 delete mode 100644 dockers/docker-database/base_image_files/monit_database
 delete mode 100644 dockers/docker-fpm-frr/base_image_files/monit_bgp
 delete mode 100644 dockers/docker-lldp/base_image_files/monit_lldp
 delete mode 100644 dockers/docker-orchagent/base_image_files/monit_swss
 delete mode 100644 dockers/docker-sflow/base_image_files/monit_sflow
 delete mode 100644 dockers/docker-snmp/base_image_files/monit_snmp
 delete mode 100644 dockers/docker-sonic-restapi/base_image_files/monit_restapi
 delete mode 100644 dockers/docker-teamd/base_image_files/monit_teamd
 delete mode 100755 files/image_config/monit/process_checker
 delete mode 100644 platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd
 delete mode 100644 platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd
 delete mode 100644 platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd
 delete mode 100644 platform/centec/docker-syncd-centec/base_image_files/monit_syncd
 delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd
 delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd
 delete mode 100644 platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd
 delete mode 100644 platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd
 delete mode 100644 platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd

diff --git a/dockers/docker-database/base_image_files/monit_database b/dockers/docker-database/base_image_files/monit_database
deleted file mode 100644
index 47c9d1b2d47f..000000000000
--- a/dockers/docker-database/base_image_files/monit_database
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for database container
-## process list:
-##  redis_server
-###############################################################################
-check program database|redis_server with path "/usr/bin/process_checker database /usr/bin/redis-server"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp b/dockers/docker-fpm-frr/base_image_files/monit_bgp
deleted file mode 100644
index 07705e84179d..000000000000
--- a/dockers/docker-fpm-frr/base_image_files/monit_bgp
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-## Monit configuration for BGP container
-## process list:
-##  zebra
-##  fpmsyncd
-##  bgpd
-##  staticd
-##  bgpcfgd
-##  bgpmon
-###############################################################################
-check program bgp|zebra with path "/usr/bin/process_checker bgp /usr/lib/frr/zebra"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program bgp|fpmsyncd with path "/usr/bin/process_checker bgp fpmsyncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program bgp|bgpd with path "/usr/bin/process_checker bgp /usr/lib/frr/bgpd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program bgp|staticd with path "/usr/bin/process_checker bgp /usr/lib/frr/staticd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program bgp|bgpcfgd with path "/usr/bin/process_checker bgp /usr/bin/python3 /usr/local/bin/bgpcfgd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program bgp|bgpmon with path "/usr/bin/process_checker bgp /usr/bin/python3 /usr/local/bin/bgpmon"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-lldp/base_image_files/monit_lldp b/dockers/docker-lldp/base_image_files/monit_lldp
deleted file mode 100644
index d470972ace30..000000000000
--- a/dockers/docker-lldp/base_image_files/monit_lldp
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-## Monit configuration for lldp container
-## process list:
-##  lldpd
-##  lldp-syncd
-##  lldpmgrd
-###############################################################################
-check program lldp|lldpd_monitor with path "/usr/bin/process_checker lldp lldpd:"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program lldp|lldp_syncd with path "/usr/bin/process_checker lldp python3 -m lldp_syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program lldp|lldpmgrd with path "/usr/bin/process_checker lldp python3 /usr/bin/lldpmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss
deleted file mode 100644
index d4ea5454ef6b..000000000000
--- a/dockers/docker-orchagent/base_image_files/monit_swss
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-## Monit configuration for swss container
-## process list:
-##  orchagent
-##  portsyncd
-##  neighsyncd
-##  fdbsyncd
-##  vrfmgrd
-##  vlanmgrd
-##  intfmgrd
-##  portmgrd
-##  buffermgrd
-##  nbrmgrd
-##  vxlanmgrd
-##  coppmgrd
-##  tunnelmgrd
-
-##############################################################################
-check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|portsyncd with path "/usr/bin/process_checker swss /usr/bin/portsyncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|neighsyncd with path "/usr/bin/process_checker swss /usr/bin/neighsyncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|fdbsyncd with path "/usr/bin/process_checker swss /usr/bin/fdbsyncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|vrfmgrd with path "/usr/bin/process_checker swss /usr/bin/vrfmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|vlanmgrd with path "/usr/bin/process_checker swss /usr/bin/vlanmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|intfmgrd with path "/usr/bin/process_checker swss /usr/bin/intfmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|portmgrd with path "/usr/bin/process_checker swss /usr/bin/portmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|buffermgrd with path "/usr/bin/process_checker swss /usr/bin/buffermgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|nbrmgrd with path "/usr/bin/process_checker swss /usr/bin/nbrmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|vxlanmgrd with path "/usr/bin/process_checker swss /usr/bin/vxlanmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program swss|tunnelmgrd with path "/usr/bin/process_checker swss /usr/bin/tunnelmgrd"
-        if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-sflow/base_image_files/monit_sflow b/dockers/docker-sflow/base_image_files/monit_sflow
deleted file mode 100644
index 84b36b18ce65..000000000000
--- a/dockers/docker-sflow/base_image_files/monit_sflow
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for sflow container
-## process list:
-##  sflowmgrd
-###############################################################################
-check program sflow|sflowmgrd with path "/usr/bin/process_checker sflow /usr/bin/sflowmgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-snmp/base_image_files/monit_snmp b/dockers/docker-snmp/base_image_files/monit_snmp
deleted file mode 100644
index 6a368a9b6035..000000000000
--- a/dockers/docker-snmp/base_image_files/monit_snmp
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-## Monit configuration for snmp container
-## process list:
-##  snmpd
-##  snmpd_subagent
-###############################################################################
-check program snmp|snmpd with path "/usr/bin/process_checker snmp /usr/sbin/snmpd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program snmp|snmp_subagent with path "/usr/bin/process_checker snmp python3 -m sonic_ax_impl"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-sonic-restapi/base_image_files/monit_restapi b/dockers/docker-sonic-restapi/base_image_files/monit_restapi
deleted file mode 100644
index 6752100b84f2..000000000000
--- a/dockers/docker-sonic-restapi/base_image_files/monit_restapi
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for restapi container
-## process list:
-##  restapi
-###############################################################################
-check program restapi|restapi with path "/usr/bin/process_checker restapi /usr/sbin/go-server-server"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
index ab3000c899d0..b3ba8b25fe1a 100644
--- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
+++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
@@ -1,14 +1,5 @@
 ###############################################################################
 ## Monit configuration for telemetry container
-## process list:
-##  telemetry
-##  dialout_client
 ###############################################################################
-check program telemetry|telemetry with path "/usr/bin/process_checker telemetry /usr/sbin/telemetry"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program telemetry|dialout_client with path "/usr/bin/process_checker telemetry /usr/sbin/dialout_client_cli"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
 check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
     if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
diff --git a/dockers/docker-teamd/base_image_files/monit_teamd b/dockers/docker-teamd/base_image_files/monit_teamd
deleted file mode 100644
index 626a6145604e..000000000000
--- a/dockers/docker-teamd/base_image_files/monit_teamd
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-## Monit configuration for teamd container
-## process list:
-##  teamsyncd
-##  teammgrd
-###############################################################################
-check program teamd|teamsyncd with path "/usr/bin/process_checker teamd /usr/bin/teamsyncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program teamd|teammgrd with path "/usr/bin/process_checker teamd /usr/bin/teammgrd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 4a2b93f80e77..eecf4064cac8 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -310,8 +310,6 @@ sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
 sudo cp $IMAGE_CONFIGS/monit/conf.d/* $FILESYSTEM_ROOT/etc/monit/conf.d/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/conf.d/*
-sudo cp $IMAGE_CONFIGS/monit/process_checker $FILESYSTEM_ROOT/usr/bin/
-sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/process_checker
 sudo cp $IMAGE_CONFIGS/monit/container_checker $FILESYSTEM_ROOT/usr/bin/
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
 sudo cp $IMAGE_CONFIGS/monit/memory_checker $FILESYSTEM_ROOT/usr/bin/
diff --git a/files/image_config/monit/process_checker b/files/image_config/monit/process_checker
deleted file mode 100755
index 68c8f3e945fd..000000000000
--- a/files/image_config/monit/process_checker
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import ast
-import sys
-import syslog
-
-import psutil
-from sonic_py_common import multi_asic
-import swsssdk
-
-
-def check_process_existence(container_name, process_cmdline):
-    """
-    @summary: Check whether the process in the specified container is running or not and
-              an alerting message will written into syslog if it failed to run.
-    """
-    config_db = swsssdk.ConfigDBConnector()
-    config_db.connect()
-    feature_table = config_db.get_table("FEATURE")
-
-    if container_name in feature_table:
-        # We look into the 'FEATURE' table to verify whether the container is disabled or not.
-        # If the container is diabled, we exit.
-        if ("state" in feature_table[container_name]
-                and feature_table[container_name]["state"] == "disabled"):
-            sys.exit(0)
-        else:
-            # We leveraged the psutil library to help us check whether the process is running or not.
-            # If the process entity is found in process tree and it is also in the 'running' or 'sleeping'
-            # state, then it will be marked as 'running'.
-
-            # For given feature we get the host and network namespace instances it's processes should be running
-            # based on it's scope and add it to expected set.
-
-            # From psutil we get number of running instances of the processes and add it to the the actual set
-
-            # Difference bwetween expected and actual set provides instances where the processes are not running
-            # and will be logged as syslog message by monit
-
-            process_namespace_expected_set = set()
-            process_namespace_found_set = set()
-
-            has_global_scope = ast.literal_eval(feature_table[container_name].get('has_global_scope', 'True'))
-            has_per_asic_scope = ast.literal_eval(feature_table[container_name].get('has_per_asic_scope', 'False'))
-
-            if has_global_scope:
-                process_namespace_expected_set.add(multi_asic.DEFAULT_NAMESPACE)
-
-            if has_per_asic_scope:
-                process_namespace_expected_set.update(multi_asic.get_namespace_list())
-
-            for process in psutil.process_iter(["cmdline", "status", "pid"]):
-                try:
-                    if ((' '.join(process.cmdline())).startswith(process_cmdline) and process.status() in ["running", "sleeping"]):
-                         process_namespace_found_set.add(multi_asic.get_current_namespace(process.info['pid']))
-                except psutil.NoSuchProcess:
-                    pass
-
-            process_namespace_diff_set = process_namespace_expected_set.difference(process_namespace_found_set)
-
-            if process_namespace_diff_set:
-                 host_display_str = ""
-                 namespace_display_str = ""
-
-                 for ns in process_namespace_diff_set:
-                     if ns == multi_asic.DEFAULT_NAMESPACE:
-                         host_display_str = " in host"
-                     else:
-                         if not namespace_display_str:
-                             namespace_display_str = " in namespace " + ns
-                         else:
-                             namespace_display_str += ", " + ns
-
-                 join_str = " and" if host_display_str and namespace_display_str else ""
-                 
-                 # If this script is run by Monit, then the following output will be appended to
-                 # Monit's syslog message.
-                 print("'{}' is not running{}{}{}".format(process_cmdline, host_display_str, join_str, namespace_display_str))
-                 sys.exit(1)
-    else:
-        syslog.syslog(syslog.LOG_ERR, "container '{}' is not included in SONiC image or the given container name is invalid!"
-                      .format(container_name))
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Check whether the process in the specified \
-             container is running and an alerting message will be written into syslog if it \
-             failed to run.", usage="/usr/bin/process_checker <container_name> <process_cmdline>")
-    parser.add_argument("container_name", help="container name")
-    parser.add_argument("process_cmdline", nargs=argparse.REMAINDER, help="process command line")
-    args = parser.parse_args()
-
-    check_process_existence(args.container_name, ' '.join(args.process_cmdline))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk
index 3a5c693e2fa8..2ada27bed7e4 100644
--- a/platform/barefoot/docker-syncd-bfn.mk
+++ b/platform/barefoot/docker-syncd-bfn.mk
@@ -11,4 +11,3 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                $(LIBSAIREDIS_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
index d23141481915..2e66979ea2f2 100644
--- a/platform/broadcom/docker-syncd-brcm.mk
+++ b/platform/broadcom/docker-syncd-brcm.mk
@@ -16,4 +16,3 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd
deleted file mode 100644
index d63346d9ee20..000000000000
--- a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-##  dsserve
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program syncd|dsserve with path "/usr/bin/process_checker syncd /usr/bin/dsserve /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk
index 059d2c71ebb4..eeeb312ad4d1 100644
--- a/platform/cavium/docker-syncd-cavm.mk
+++ b/platform/cavium/docker-syncd-cavm.mk
@@ -20,4 +20,3 @@ $(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_SYNCD_CAVM)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/centec/docker-syncd-centec.mk b/platform/centec/docker-syncd-centec.mk
index 75cc45c28559..73810463944e 100644
--- a/platform/centec/docker-syncd-centec.mk
+++ b/platform/centec/docker-syncd-centec.mk
@@ -14,4 +14,3 @@ $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_SYNCD_CENTEC)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/marvell-arm64/docker-syncd-mrvl.mk b/platform/marvell-arm64/docker-syncd-mrvl.mk
index dd01caab687b..32b3899e191b 100644
--- a/platform/marvell-arm64/docker-syncd-mrvl.mk
+++ b/platform/marvell-arm64/docker-syncd-mrvl.mk
@@ -14,4 +14,3 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/marvell-armhf/docker-syncd-mrvl.mk b/platform/marvell-armhf/docker-syncd-mrvl.mk
index 699bd8bd9b86..4904ac3af104 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl.mk
+++ b/platform/marvell-armhf/docker-syncd-mrvl.mk
@@ -11,4 +11,3 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
 #$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/marvell/docker-syncd-mrvl.mk b/platform/marvell/docker-syncd-mrvl.mk
index d6d7d032b8ac..db1b505062a2 100644
--- a/platform/marvell/docker-syncd-mrvl.mk
+++ b/platform/marvell/docker-syncd-mrvl.mk
@@ -15,4 +15,3 @@ SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
index 9bdc5a8ad8ec..3f9e64b985c7 100644
--- a/platform/mellanox/docker-syncd-mlnx.mk
+++ b/platform/mellanox/docker-syncd-mlnx.mk
@@ -15,4 +15,3 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM)
 endif
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd
deleted file mode 100644
index 61e290e3189e..000000000000
--- a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/platform/nephos/docker-syncd-nephos.mk b/platform/nephos/docker-syncd-nephos.mk
index 146523ec1c64..a546b6860694 100644
--- a/platform/nephos/docker-syncd-nephos.mk
+++ b/platform/nephos/docker-syncd-nephos.mk
@@ -18,4 +18,3 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += npx_diag:/usr/bin/npx_diag
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd
deleted file mode 100644
index d63346d9ee20..000000000000
--- a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-## Monit configuration for syncd container
-## process list:
-##  syncd
-##  dsserve
-###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program syncd|dsserve with path "/usr/bin/process_checker syncd /usr/bin/dsserve /usr/bin/syncd"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/rules/docker-database.mk b/rules/docker-database.mk
index 0a2f46d19223..aa19d6f04433 100644
--- a/rules/docker-database.mk
+++ b/rules/docker-database.mk
@@ -23,6 +23,5 @@ $(DOCKER_DATABASE)_RUN_OPT += --privileged -t
 $(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli
-$(DOCKER_DATABASE)_BASE_IMAGE_FILES += monit_database:/etc/monit/conf.d
 $(DOCKER_DATABASE)_FILES += $(SYSCTL_NET_CONFIG) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 $(DOCKER_DATABASE)_FILES += $(UPDATE_CHASSISDB_CONFIG_SCRIPT)
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index e584bf55104e..dca3f30ad53a 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -32,4 +32,3 @@ $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSA:/usr/bin/TSA
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TS:/usr/bin/TS
-$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += monit_bgp:/etc/monit/conf.d
diff --git a/rules/docker-lldp.mk b/rules/docker-lldp.mk
index 5cd4fd02a04f..446a8cd608be 100644
--- a/rules/docker-lldp.mk
+++ b/rules/docker-lldp.mk
@@ -29,5 +29,4 @@ $(DOCKER_LLDP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:r
 
 $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl
 $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli
-$(DOCKER_LLDP)_BASE_IMAGE_FILES += monit_lldp:/etc/monit/conf.d
 $(DOCKER_LLDP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk
index 5e2e08ee2437..78cef9fd1a6e 100644
--- a/rules/docker-orchagent.mk
+++ b/rules/docker-orchagent.mk
@@ -32,5 +32,4 @@ $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
-$(DOCKER_ORCHAGENT)_BASE_IMAGE_FILES += monit_swss:/etc/monit/conf.d
 $(DOCKER_ORCHAGENT)_FILES += $(ARP_UPDATE_SCRIPT) $(ARP_UPDATE_VARS_TEMPLATE) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-restapi.mk b/rules/docker-restapi.mk
index ef56789dd759..98f43b2395b7 100644
--- a/rules/docker-restapi.mk
+++ b/rules/docker-restapi.mk
@@ -24,4 +24,3 @@ $(DOCKER_RESTAPI)_RUN_OPT += -p=8081:8081/tcp
 $(DOCKER_RESTAPI)_RUN_OPT += -p=8090:8090/tcp
 
 $(DOCKER_RESTAPI)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
-$(DOCKER_RESTAPI)_BASE_IMAGE_FILES += monit_restapi:/etc/monit/conf.d
diff --git a/rules/docker-sflow.mk b/rules/docker-sflow.mk
index 6888304b8bce..f9386190a4d5 100644
--- a/rules/docker-sflow.mk
+++ b/rules/docker-sflow.mk
@@ -30,5 +30,4 @@ $(DOCKER_SFLOW)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
 $(DOCKER_SFLOW)_BASE_IMAGE_FILES += psample:/usr/bin/psample
 $(DOCKER_SFLOW)_BASE_IMAGE_FILES += sflowtool:/usr/bin/sflowtool
-$(DOCKER_SFLOW)_BASE_IMAGE_FILES += monit_sflow:/etc/monit/conf.d
 $(DOCKER_SFLOW)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk
index cbc69dc92b1b..a2e8540ca9ae 100644
--- a/rules/docker-snmp.mk
+++ b/rules/docker-snmp.mk
@@ -28,4 +28,3 @@ $(DOCKER_SNMP)_RUN_OPT += --privileged -t
 $(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SNMP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro
 $(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
-$(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d
diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk
index 5442d5bf6b3f..c0fe6bfb6bb1 100644
--- a/rules/docker-teamd.mk
+++ b/rules/docker-teamd.mk
@@ -27,5 +27,4 @@ $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_TEAMD)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
 $(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl
-$(DOCKER_TEAMD)_BASE_IMAGE_FILES += monit_teamd:/etc/monit/conf.d
 $(DOCKER_TEAMD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

From c1b380df738f80a02139d7a28abda38385d5529e Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 11 Jun 2021 03:49:18 +0800
Subject: [PATCH 0540/1674] [docker-teamd]: Increase teammgrd timeout to allow
 graceful shutdown. (#7662) (#7842)

The PR is a cherry-pick of #7662.

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 dockers/docker-teamd/supervisord.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
index 1c0d498c10b8..db6a8cfb9a5a 100644
--- a/dockers/docker-teamd/supervisord.conf
+++ b/dockers/docker-teamd/supervisord.conf
@@ -44,6 +44,7 @@ command=/usr/bin/teammgrd
 priority=3
 autostart=false
 autorestart=false
+stopwaitsecs=60
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true

From b5551f044e8abdb7e13c918e851d8d3ae4394295 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 11 Jun 2021 20:58:22 +0800
Subject: [PATCH 0541/1674] [ci/build]: Upgrade SONiC package versions (#7805)

---
 .../versions-deb-buster                       |  2 +-
 .../versions/default/versions-deb-buster      | 31 -------------------
 files/build/versions/default/versions-py3     |  2 +-
 .../docker-database/versions-deb-buster       | 12 +++++++
 .../docker-dhcp-relay/versions-deb-buster     | 13 ++++++++
 .../docker-fpm-frr/versions-deb-buster        | 19 +++++++++++-
 .../docker-gbsyncd-vs/versions-deb-buster     |  4 +--
 .../dockers/docker-lldp/versions-deb-buster   | 16 +++++++++-
 .../dockers/docker-nat/versions-deb-buster    | 14 +++++++++
 .../docker-orchagent/versions-deb-buster      | 15 +++++++++
 .../versions-deb-buster                       | 18 ++++++++++-
 .../versions-deb-buster                       | 12 +++++++
 .../dockers/docker-sflow/versions-deb-buster  | 12 +++++++
 .../dockers/docker-snmp/versions-deb-buster   | 17 +++++++++-
 .../versions-deb-buster                       | 13 ++++++++
 .../versions-deb-buster                       | 12 +++++++
 .../docker-sonic-vs/versions-deb-buster       |  2 ++
 .../docker-syncd-centec/versions-deb-buster   | 14 ++++++++-
 .../docker-syncd-mlnx/versions-deb-buster     |  1 -
 .../docker-syncd-vs/versions-deb-buster       |  4 +--
 .../dockers/docker-teamd/versions-deb-buster  | 16 ++++++++++
 .../sonic-slave-stretch/versions-deb-stretch  |  6 ++--
 files/build/versions/host-image/versions-py3  |  2 +-
 23 files changed, 208 insertions(+), 49 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 00f60d261955..e388527ff9b1 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -76,6 +76,7 @@ libxtst-dev==2:1.2.3-1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang-dev==1.0.73
+libyang1==1.0.184-2
 linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
@@ -104,7 +105,6 @@ sx-scew-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
 sxd-libs-dev==1.mlnx.4.4.3106
 syncd==1.0.0
-syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.3106
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 082dcc53a269..b706ed23ba07 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,22 +22,17 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
-frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
-isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -45,7 +40,6 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
-libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -63,8 +57,6 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -81,7 +73,6 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u2
 libgomp1==8.3.0-6
-libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -90,7 +81,6 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
-libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -170,15 +160,11 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.5-3
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libsensors5-dbgsym==1:3.5.0-3
-libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -186,12 +172,9 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
-libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
-libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
-libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
@@ -214,13 +197,10 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
-libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.181-1
 lldpd==1.0.4-1
-lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
-lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -234,7 +214,6 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
-openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -275,32 +254,22 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
-sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
-snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
-sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
-sshpass==1.06-1
-strace==4.26-0.2
 swss==1.0.0
-swss-dbg==1.0.0
 syncd==1.0.0
-syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
-vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 9ef81ce56009..f30152d61d71 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -25,7 +25,7 @@ netaddr==0.8.0
 netifaces==0.10.9
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.17.2
+protobuf==3.17.3
 psutil==5.8.0
 pyang==2.4.0
 pyangbind==0.8.1
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
new file mode 100644
index 000000000000..090a9af05b59
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+isc-dhcp-relay-dbgsym==4.4.1-2
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8ce0c99a8c4d..861bf8125805 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,2 +1,19 @@
+frr-dbgsym==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libswsscommon-dbg==1.0.0
+libyang1-dbgsym==1.0.184-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 35fa7ba37f8c..473553ddec20 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,2 @@
 libsaivs==1.0.0
-libsaivs-dbg==1.0.0
-syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 3424f739f586..dced6f540d81 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,2 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libswsscommon-dbg==1.0.0
+lldpd-dbgsym==1.0.4-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 000000000000..159c8c90df8b
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,14 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
new file mode 100644
index 000000000000..0969e5edd95e
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,15 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index eb5e901597f5..16d8aadf78c3 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,26 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsensors5-dbgsym==1:3.5.0-3
+libswsscommon-dbg==1.0.0
+lm-sensors-dbgsym==1:3.5.0-3
+openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
+sensord-dbgsym==1:3.5.0-3
+sshpass==1.06-1
+strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 3424f739f586..8baa3d5cd96b 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,2 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libsnmp30-dbg==5.7.3+dfsg-5
+openssh-client==1:7.9p1-10+deb10u2
+snmp-dbgsym==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..a29d8370e78a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sonic-mgmt-framework-dbg==1.0-01
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 2f3ae7e0335d..a329339c843b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,6 +19,7 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
+libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -27,6 +28,7 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index e5836f0be374..74abbdb5bd6f 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1 +1,13 @@
-libsai==1.6.3-1
\ No newline at end of file
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsai==1.6.3-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index eae492ab577e..f5a146c70791 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,7 +2,6 @@ applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
-libelf1==0.176-1.1
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
 sx-acl-helper==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 35fa7ba37f8c..473553ddec20 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,2 @@
 libsaivs==1.0.0
-libsaivs-dbg==1.0.0
-syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 000000000000..eeb36c01b260
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+libteam-utils-dbgsym==1.30-1
+libteamdctl0-dbgsym==1.30-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index ec74d3d7b4b1..806a09374429 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1002,9 +1002,9 @@ libwayland-client0==1.12.0-1+deb9u1
 libwayland-cursor0==1.12.0-1+deb9u1
 libwayland-egl1-mesa==13.0.6-1+b2
 libwayland-server0==1.12.0-1+deb9u1
-libwebp6==0.5.2-1
-libwebpdemux2==0.5.2-1
-libwebpmux2==0.5.2-1
+libwebp6==0.5.2-1+deb9u1
+libwebpdemux2==0.5.2-1+deb9u1
+libwebpmux2==0.5.2-1+deb9u1
 libwmf0.2-7==0.2.8.4-10.6
 libwrap0==7.6.q-26
 libwrap0-dev==7.6.q-26
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 2b7ae9fa5043..bc97a89d4762 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -39,5 +39,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.5
 watchdog==0.10.3
-websocket-client==1.0.1
+websocket-client==1.1.0
 xmltodict==0.12.0
\ No newline at end of file

From 79617d24fd08cf21e8f6d03da4f7e1b8e4550d89 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Fri, 11 Jun 2021 21:53:43 +0800
Subject: [PATCH 0542/1674] [submodule][202012] Advance submodule head for
 sonic-utilities (#7836)

Advance submodule head for sonic-utilities

b894c5b5 Fix build test failure caused by error module name (Azure/sonic-utilities#1662)
5a7c06a0 [config]][tacacs+] Change tacacs+ minimum timeout value base on spec (Azure/sonic-utilities#1631)
080a689c [202012] [db_migrator] fix old 1911 feature config migration to a new one. (Azure/sonic-utilities#1636)
43fff88c Change to use rvtysh when calling the show commands (Azure/sonic-utilities#1646)
88a823f0 [db_migrator][Mellanox] Update Mellanox buffer migrator with 2km-cable supported (Azure/sonic-utilities#1564)
d096ff78 [config]Static routes to config_db (1534)
a68d8d09 route_check: Updates  (Azure/sonic-utilities#1645)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 8b98d453418d..b894c5b551ae 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 8b98d453418d80a1c2f24717d8294b8d19d1d858
+Subproject commit b894c5b551ae6c35f107475c7327edfbd460e0fb

From 99b03cff4571fcb6983e902ad2bbfbaaf0f442df Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 12 Jun 2021 22:22:14 +0800
Subject: [PATCH 0543/1674] [ci/build]: Upgrade SONiC package versions (#7856)

---
 .../versions-deb-buster                       |  2 +-
 .../versions/default/versions-deb-buster      | 31 +++++++++++++++++++
 .../docker-database/versions-deb-buster       | 12 -------
 .../docker-dhcp-relay/versions-deb-buster     | 13 --------
 .../docker-fpm-frr/versions-deb-buster        | 19 +-----------
 .../docker-gbsyncd-vs/versions-deb-buster     |  4 ++-
 .../dockers/docker-lldp/versions-deb-buster   | 16 +---------
 .../dockers/docker-nat/versions-deb-buster    | 14 ---------
 .../docker-orchagent/versions-deb-buster      | 15 ---------
 .../versions-deb-buster                       | 18 +----------
 .../versions-deb-buster                       | 12 -------
 .../dockers/docker-sflow/versions-deb-buster  | 12 -------
 .../dockers/docker-snmp/versions-deb-buster   | 17 +---------
 .../versions-deb-buster                       | 13 --------
 .../versions-deb-buster                       | 12 -------
 .../docker-sonic-vs/versions-deb-buster       |  2 --
 .../docker-syncd-centec/versions-deb-buster   | 14 +--------
 .../docker-syncd-mlnx/versions-deb-buster     |  1 +
 .../docker-syncd-vs/versions-deb-buster       |  4 ++-
 .../dockers/docker-teamd/versions-deb-buster  | 16 ----------
 .../sonic-slave-buster/versions-deb-buster    |  6 ++--
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 22 files changed, 48 insertions(+), 207 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index e388527ff9b1..00f60d261955 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -76,7 +76,6 @@ libxtst-dev==2:1.2.3-1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang-dev==1.0.73
-libyang1==1.0.184-2
 linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
@@ -105,6 +104,7 @@ sx-scew-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
 sxd-libs-dev==1.mlnx.4.4.3106
 syncd==1.0.0
+syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.3106
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index b706ed23ba07..082dcc53a269 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,17 +22,22 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -40,6 +45,7 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
+libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -57,6 +63,8 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -73,6 +81,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u2
 libgomp1==8.3.0-6
+libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -81,6 +90,7 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
+libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -160,11 +170,15 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.5-3
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -172,9 +186,12 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
@@ -197,10 +214,13 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.181-1
 lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -214,6 +234,7 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
+openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -254,22 +275,32 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
 swss==1.0.0
+swss-dbg==1.0.0
 syncd==1.0.0
+syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
+vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
deleted file mode 100644
index 090a9af05b59..000000000000
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-isc-dhcp-relay-dbgsym==4.4.1-2
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 861bf8125805..8ce0c99a8c4d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,19 +1,2 @@
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libswsscommon-dbg==1.0.0
-libyang1-dbgsym==1.0.184-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 473553ddec20..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,2 +1,4 @@
 libsaivs==1.0.0
-syncd-vs==1.0.0
\ No newline at end of file
+libsaivs-dbg==1.0.0
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index dced6f540d81..3424f739f586 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,16 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libswsscommon-dbg==1.0.0
-lldpd-dbgsym==1.0.4-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
deleted file mode 100644
index 159c8c90df8b..000000000000
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ /dev/null
@@ -1,14 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
deleted file mode 100644
index 0969e5edd95e..000000000000
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ /dev/null
@@ -1,15 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 16d8aadf78c3..eb5e901597f5 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,26 +1,10 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsensors5-dbgsym==1:3.5.0-3
-libswsscommon-dbg==1.0.0
-lm-sensors-dbgsym==1:3.5.0-3
-openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
-sensord-dbgsym==1:3.5.0-3
-sshpass==1.06-1
-strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 8baa3d5cd96b..3424f739f586 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,17 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libsnmp30-dbg==5.7.3+dfsg-5
-openssh-client==1:7.9p1-10+deb10u2
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index a29d8370e78a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sonic-mgmt-framework-dbg==1.0-01
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index a329339c843b..2f3ae7e0335d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,7 +19,6 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
-libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -28,7 +27,6 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
-openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 74abbdb5bd6f..e5836f0be374 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1,13 +1 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsai==1.6.3-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsai==1.6.3-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index f5a146c70791..eae492ab577e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,6 +2,7 @@ applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
+libelf1==0.176-1.1
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
 sx-acl-helper==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 473553ddec20..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,2 +1,4 @@
 libsaivs==1.0.0
-syncd-vs==1.0.0
\ No newline at end of file
+libsaivs-dbg==1.0.0
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
deleted file mode 100644
index eeb36c01b260..000000000000
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ /dev/null
@@ -1,16 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-libteam-utils-dbgsym==1.30-1
-libteamdctl0-dbgsym==1.30-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index e72d5d859081..e3491a6071aa 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1121,9 +1121,9 @@ libwayland-client0==1.16.0-1
 libwayland-cursor0==1.16.0-1
 libwayland-egl1==1.16.0-1
 libwayland-server0==1.16.0-1
-libwebp6==0.6.1-2
-libwebpdemux2==0.6.1-2
-libwebpmux3==0.6.1-2
+libwebp6==0.6.1-2+deb10u1
+libwebpdemux2==0.6.1-2+deb10u1
+libwebpmux3==0.6.1-2+deb10u1
 libwebsocket-api-java==1.1-1+deb10u1
 libwmf0.2-7==0.2.8.4-14
 libwoff1==1.0.2-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index dc83f78eeeb7..d31f8ace7dd5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.1.0
+bitarray==2.1.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2

From 341e15b620da091932b5ac9908072f35944f0aca Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Mon, 14 Jun 2021 17:52:35 -0700
Subject: [PATCH 0544/1674] [202012] Bring in BRCM SAI changes from SAI 4.3.3.7
 (#7850)

---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index b6dab87e57dd..06910a6c63e6 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -44,7 +44,9 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r==2e8e0d581fdf9748269f63e887afec6b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=tDjHGUadHf9xr%2FcJ8DWYzv%2Fbj%2FDsTA%2FCtdJYsRXpiQQ%3D&se=2035-02-18T05%3A54%3A26Z&sp=r==283fec6dfe348391c573183335ade1b9
 https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r==5300744d3bdfbe42b5486d540453abf4
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=g2jgs1YZk3CXk4vyY0gaWhHZB9hfJBiHbJ0P0BNHFB4%3D&se=2035-02-18T05%3A53%3A40Z&sp=r==da7afd0d2435dded48dc964c06f57a8a
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 884f381aed08..7f910eecc286 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.5-3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.5-3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.7_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=g2jgs1YZk3CXk4vyY0gaWhHZB9hfJBiHbJ0P0BNHFB4%3D&se=2035-02-18T05%3A53%3A40Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.7_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=tDjHGUadHf9xr%2FcJ8DWYzv%2Fbj%2FDsTA%2FCtdJYsRXpiQQ%3D&se=2035-02-18T05%3A54%3A26Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From fa321f182cbda765dab30e16b60afcfacbdf4b1f Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Mon, 3 May 2021 12:31:52 -0700
Subject: [PATCH 0545/1674] [ci]: set -ex for official build to exit on any
 build failures

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/azure-pipelines-build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index c6bd8ca5a15b..c65eb996e5a0 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -41,10 +41,12 @@ jobs:
         - name: vs
           variables:
             dbg_image: yes
+
         - name: barefoot
           variables:
             sync_rpc_image: yes
             swi_image: yes
+
         - name: broadcom
           variables:
             dbg_image: yes
@@ -52,11 +54,13 @@ jobs:
             raw_image: yes
             sync_rpc_image: yes
             platform_rpc: brcm
+
         - name: centec
           variables:
             dbg_image: yes
             sync_rpc_image: yes
             platform_rpc: centec
+
         - name: centec-arm64
           pool: sonicbld_8c
           timeoutInMinutes: 2160
@@ -66,9 +70,11 @@ jobs:
         - name: generic
           variables:
             dbg_image: yes
+
         - name: innovium
           variables:
             swi_image: yes
+
         - name: marvell-armhf
           pool: sonicbld_8c
           timeoutInMinutes: 2160
@@ -80,13 +86,16 @@ jobs:
             dbg_image: yes
             sync_rpc_image: yes
             platform_rpc: mlnx
+
         - name: nephos
           variables:
             dbg_image: yes
             sync_rpc_image: yes
             platform_rpc: nephos
+
     buildSteps:
       - bash: |
+          set -ex
           if [ $(GROUP_NAME) == vs ]; then
             if [ $(dbg_image) == yes ]; then
               make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz

From 15bc3c3ae0683138598d9924f0d4e30510c6a1d7 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Tue, 18 May 2021 10:55:46 -0700
Subject: [PATCH 0546/1674] [bgpcfgd] Redistribute static routes (#7492)

Why I did it
Enable redistribution of static routes

How I did it
Enable redistribution of static routes when the first route is added to STATIC_ROUTE table of Config_DB and disable the redistribution when the last route is removed from STATIC_ROUTE table.
---
 .../bgpcfgd/managers_static_rt.py             |  27 +++-
 src/sonic-bgpcfgd/tests/test_static_rt.py     | 126 +++++++++++++++---
 2 files changed, 133 insertions(+), 20 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
index f6dd77a520d2..974843366a90 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
@@ -3,6 +3,7 @@
 from .manager import Manager
 from .template import TemplateFabric
 import socket
+from swsscommon import swsscommon
 
 class StaticRouteMgr(Manager):
     """ This class updates static routes when STATIC_ROUTE table is updated """
@@ -15,7 +16,7 @@ def __init__(self, common_objs, db, table):
         """
         super(StaticRouteMgr, self).__init__(
             common_objs,
-            [],
+            [("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),],
             db,
             table,
         )
@@ -44,6 +45,18 @@ def set_handler(self, key, data):
             log_crit("Got an exception %s: Traceback: %s" % (str(exc), traceback.format_exc()))
             return False
 
+        # Enable redistribution of static routes when it is the first one get set
+        if not self.static_routes.get(vrf, {}):
+            log_debug("Enabling static route redistribution")
+            bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+            if vrf == 'default':
+                cmd_list.append("router bgp %s" % bgp_asn)
+            else:
+                cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+            for af in ["ipv4", "ipv6"]:
+                cmd_list.append(" address-family %s" % af)
+                cmd_list.append("  redistribute static")
+
         if cmd_list:
             self.cfg_mgr.push_list(cmd_list)
             log_debug("Static route {} is scheduled for updates".format(key))
@@ -63,6 +76,18 @@ def del_handler(self, key):
         cur_nh_set = self.static_routes.get(vrf, {}).get(ip_prefix, IpNextHopSet(is_ipv6))
         cmd_list = self.static_route_commands(ip_nh_set, cur_nh_set, ip_prefix, vrf)
 
+        # Disable redistribution of static routes when it is the last one to delete
+        if self.static_routes.get(vrf, {}).keys() == {ip_prefix}:
+            log_debug("Disabling static route redistribution")
+            bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+            if vrf == 'default':
+                cmd_list.append("router bgp %s" % bgp_asn)
+            else:
+                cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+            for af in ["ipv4", "ipv6"]:
+                cmd_list.append(" address-family %s" % af)
+                cmd_list.append("  no redistribute static")
+
         if cmd_list:
             self.cfg_mgr.push_list(cmd_list)
             log_debug("Static route {} is scheduled for updates".format(key))
diff --git a/src/sonic-bgpcfgd/tests/test_static_rt.py b/src/sonic-bgpcfgd/tests/test_static_rt.py
index c6a3e40fab48..0fa2e3df6c2f 100644
--- a/src/sonic-bgpcfgd/tests/test_static_rt.py
+++ b/src/sonic-bgpcfgd/tests/test_static_rt.py
@@ -4,6 +4,7 @@
 from bgpcfgd.template import TemplateFabric
 from bgpcfgd.managers_static_rt import StaticRouteMgr
 from collections import Counter
+from swsscommon import swsscommon
 
 def constructor():
     cfg_mgr = MagicMock()
@@ -16,6 +17,7 @@ def constructor():
     }
 
     mgr = StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE")
+    mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
     assert len(mgr.static_routes) == 0
 
     return mgr
@@ -28,9 +30,9 @@ def push_list(cmds):
         max_del_idx = -1
         min_set_idx = len(cmds)
         for idx in range(len(cmds)):
-            if cmds[idx].startswith('no') and idx > max_del_idx:
+            if cmds[idx].startswith('no ip') and idx > max_del_idx:
                 max_del_idx = idx
-            if not cmds[idx].startswith('no') and idx < min_set_idx:
+            if cmds[idx].startswith('ip') and idx < min_set_idx:
                 min_set_idx = idx
         assert max_del_idx < min_set_idx, "DEL command comes after SET command" # DEL commands should be done first
         return True
@@ -59,7 +61,12 @@ def test_set():
         }),
         True,
         [
-            "ip route 10.1.0.0/24 10.0.0.57"
+            "ip route 10.1.0.0/24 10.0.0.57",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -77,7 +84,12 @@ def test_set_nhvrf():
         }),
         True,
         [
-            "ip route 10.1.1.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf"
+            "ip route 10.1.1.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -95,7 +107,12 @@ def test_set_blackhole():
         }),
         True,
         [
-            "ip route 10.1.2.0/24 blackhole 10"
+            "ip route 10.1.2.0/24 blackhole 10",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -113,7 +130,12 @@ def test_set_vrf():
         }),
         True,
         [
-            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -131,7 +153,12 @@ def test_set_ipv6():
         }),
         True,
         [
-            "ipv6 route fc00:10::/64 fc00::72 PortChannel0001 10"
+            "ipv6 route fc00:10::/64 fc00::72 PortChannel0001 10",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -150,7 +177,12 @@ def test_set_nh_only():
         [
             "ip route 10.1.3.0/24 10.0.0.57 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -169,7 +201,12 @@ def test_set_ifname_only():
         [
             "ip route 10.1.3.0/24 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -189,7 +226,12 @@ def test_set_with_empty_ifname():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -209,7 +251,12 @@ def test_set_with_empty_nh():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -229,7 +276,12 @@ def test_set_del():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
     set_del_test(
@@ -240,7 +292,12 @@ def test_set_del():
         [
             "no ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "no ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
-            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  no redistribute static",
+            " address-family ipv6",
+            "  no redistribute static"
         ]
     )
     set_del_test(
@@ -257,7 +314,12 @@ def test_set_del():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -277,7 +339,12 @@ def test_set_same_route():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
     set_del_test(
@@ -317,7 +384,12 @@ def test_set_add_del_nh():
         [
             "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
             "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
-            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED"
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+            "router bgp 65100 vrf vrfRED",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
     set_del_test(
@@ -368,7 +440,12 @@ def test_set_add_del_nh_ethernet():
         [
             "ip route 20.1.3.0/24 20.0.0.57 Ethernet4 10 nexthop-vrf default",
             "ip route 20.1.3.0/24 20.0.0.59 Ethernet8 20",
-            "ip route 20.1.3.0/24 20.0.0.61 Ethernet12 30 nexthop-vrf default"
+            "ip route 20.1.3.0/24 20.0.0.61 Ethernet12 30 nexthop-vrf default",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
     set_del_test(
@@ -416,7 +493,12 @@ def test_set_no_action(mocked_log_debug):
         }),
         True,
         [
-            "ip route 10.1.1.0/24 blackhole"
+            "ip route 10.1.1.0/24 blackhole",
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
         ]
     )
 
@@ -470,7 +552,13 @@ def test_set_invalid_blackhole(mocked_log_err):
             "blackhole": "false",
         }),
         True,
-        []
+        [
+            "router bgp 65100",
+            " address-family ipv4",
+            "  redistribute static",
+            " address-family ipv6",
+            "  redistribute static"
+        ]
     )
     mocked_log_err.assert_called_with("Mandatory attribute not found for nexthop")
 

From 2fe91ae30f54b661ca4f28115e0a68557d49f85d Mon Sep 17 00:00:00 2001
From: Andriy Yurkiv <70649192+ayurkiv-nvda@users.noreply.github.com>
Date: Wed, 9 Jun 2021 13:39:22 +0300
Subject: [PATCH 0547/1674] Set default values only on the first start (#7735)

---
 dockers/docker-orchagent/enable_counters.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
index 5455f5923571..a00bd3facce7 100755
--- a/dockers/docker-orchagent/enable_counters.py
+++ b/dockers/docker-orchagent/enable_counters.py
@@ -11,10 +11,12 @@
 
 
 def enable_counter_group(db, name):
-    info = {}
-    info['FLEX_COUNTER_STATUS'] = 'enable'
-    db.mod_entry("FLEX_COUNTER_TABLE", name, info)
+    entry_info = db.get_entry("FLEX_COUNTER_TABLE", name)
 
+    if not entry_info:
+        info = {}
+        info['FLEX_COUNTER_STATUS'] = 'enable'
+        db.mod_entry("FLEX_COUNTER_TABLE", name, info)
 
 def enable_rates():
     # set the default interval for rates

From 26c6f2a4b2845a561038eafb3fa316e32bbe58ab Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <66446128+vboykox@users.noreply.github.com>
Date: Fri, 11 Jun 2021 23:30:03 +0300
Subject: [PATCH 0548/1674] [barefoot][platform] Chassis.get_reboot_cause
 (#7794)

To fix determine-reboot-cause service which was failing due to non-implemented thrown from get_reboot_case, if the reboot was done with `sudo reboot` (cold reboot)

Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
---
 .../sonic_platform/chassis.py                       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
index 76e6895df2b8..319d29ef1727 100644
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py
@@ -161,3 +161,16 @@ def get_system_eeprom_info(self):
     def get_change_event(self, timeout=0):
         ready, event_sfp = Sfp.get_transceiver_change_event(timeout)
         return ready, { 'sfp': event_sfp } if ready else {}
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        return self.REBOOT_CAUSE_NON_HARDWARE, ''

From a2e729122d3f1e12a167c7df342eae4814b0180b Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Tue, 15 Jun 2021 22:54:14 +0800
Subject: [PATCH 0549/1674] [Mellanox] Adjust Makefile for SDK/python-sdk-api
 to support both python2 and python3 (#7848)

- Why I did it
Adjust the Makefile for SDK/python-SDK-API to support both python2 and python3

- How to verify it
Build the image and check whether python2 and python3 are both supported by SDK API.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 platform/mellanox/sdk-src/python-sdk-api/Makefile      | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/sdk-src/python-sdk-api/Makefile b/platform/mellanox/sdk-src/python-sdk-api/Makefile
index 9c41be75725b..47f0ad5a01ff 100644
--- a/platform/mellanox/sdk-src/python-sdk-api/Makefile
+++ b/platform/mellanox/sdk-src/python-sdk-api/Makefile
@@ -18,7 +18,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 		./autogen.sh
 	fi
 
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	debuild -e PYTHON_INTERPRETERS="\"python2 python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 
 	popd
 
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 13a09e5177b8..d7e88d9d70b9 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 13a09e5177b800f846ca444257f15696c6e17eb8
+Subproject commit d7e88d9d70b9e7b9d8b1a81d18f27df8d1056f8e

From 11b2a607f88a4df7ac5b6bed6ff91b1def055c6f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 15 Jun 2021 11:15:55 -0700
Subject: [PATCH 0550/1674] [minigraph] Check for null VLAN MAC (#7854)

Explicitly check for null VLAN MAC in minigraph parser before setting it - if it is null, do not set the VLAN MAC attribute
---
 src/sonic-config-engine/minigraph.py          |  2 +-
 .../tests/simple-sample-graph-case.xml        |  8 ++++++
 .../tests/test_minigraph_case.py              | 27 +++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 9a3555e199aa..c84fca445e40 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -547,7 +547,7 @@ def parse_dpg(dpg, hname):
                 vlan_attributes['dhcp_servers'] = vdhcpserver_list
 
             vlanmac = vintf.find(str(QName(ns, "MacAddress")))
-            if vlanmac != None:
+            if vlanmac is not None and vlanmac.text is not None:
                 vlan_attributes['mac'] = vlanmac.text
 
             sonic_vlan_name = "Vlan%s" % vlanid
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index 9292170034b3..ae7bd50a6f53 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -139,6 +139,14 @@
           <Subnets>192.168.0.0/27</Subnets>
           <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
         </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <DhcpRelays>192.0.0.1</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <MacAddress i:nil="true"/>
+        </VlanInterface>
       </VlanInterfaces>
       <IPInterfaces>
         <IPInterface>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 806916639b76..abee457a0d4f 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -92,15 +92,38 @@ def test_minigraph_interfaces(self):
     def test_minigraph_vlans(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v VLAN'
         output = self.run_script(argument)
+
+        expected = {
+                   'Vlan1000': {
+                       'alias': 'ab1',
+                       'dhcp_servers': ['192.0.0.1', '192.0.0.2'],
+                       'vlanid': '1000',
+                       'mac': '00:aa:bb:cc:dd:ee',
+                       'members': ['Ethernet8']
+                       },
+                   'Vlan2000': {
+                       'alias': 'ab2',
+                       'dhcp_servers': ['192.0.0.1'],
+                       'members': ['Ethernet4'],
+                       'vlanid': '2000'
+                       }
+                   }
         self.assertEqual(
             utils.to_dict(output.strip()),
-            utils.to_dict("{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'mac': '00:aa:bb:cc:dd:ee', 'members': ['Ethernet8'] }}")
+            expected
         )
 
     def test_minigraph_vlan_members(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
         output = self.run_script(argument)
-        self.assertEqual(output.strip(), "{('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}}")
+        expected = {
+                       'Vlan1000|Ethernet8': {'tagging_mode': 'untagged'},
+                       'Vlan2000|Ethernet4': {'tagging_mode': 'untagged'}
+                   }
+        self.assertEqual(
+                utils.to_dict(output.strip()),
+                expected
+        )
 
     def test_minigraph_vlan_interfaces_keys(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "VLAN_INTERFACE.keys()|list"'

From 74955f53017cd18a0cfde7dae9cf20b3821cc50c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 16 Jun 2021 10:09:29 +0800
Subject: [PATCH 0551/1674] [build]: Fix missing the depended files of dpkg
 cache in config engine (#7840)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### Why I did it
The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected.

https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console
…
07:13:24  ======================================================================
07:13:24  ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files)
07:13:24  ----------------------------------------------------------------------
…
07:13:24  ======================================================================
07:13:24  ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files)
07:13:24  ----------------------------------------------------------------------
…
07:13:24  error: Test failed: <unittest.runner.TextTestResult run=161 errors=2 failures=0>
07:13:24  [  FAIL LOG END  ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ]
07:13:24  make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1
07:13:24  Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed
07:13:24  make[1]: *** [target/sonic-mellanox.bin] Error 2
07:13:24  make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all'
07:13:24  Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed
07:13:24  make: *** [target/sonic-mellanox.bin] Error 2

See PR: https://github.com/Azure/sonic-buildimage/pull/7476


#### How I did it
Add the depended files.
See src/sonic-config-engine/tests/test_j2files.py
---
 rules/sonic-config.dep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/sonic-config.dep b/rules/sonic-config.dep
index 148e43a96a5c..61202e5675be 100644
--- a/rules/sonic-config.dep
+++ b/rules/sonic-config.dep
@@ -4,6 +4,7 @@ SPATH       := $($(SONIC_CONFIG_ENGINE_PY2)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-config.mk rules/sonic-config.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(SPATH))
+DEP_FILES   += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-fpm-quagga/bgpd.conf.j2 dockers/docker-fpm-quagga/zebra.conf.j2 dockers/docker-orchagent/ipinip.json.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 files/build_templates/qos_config.j2 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml
 
 $(SONIC_CONFIG_ENGINE_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_CONFIG_ENGINE_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)

From 4cbf7e975b5f3e9e30ec54bc76fe15c53da6e5f6 Mon Sep 17 00:00:00 2001
From: Blueve <672454911@qq.com>
Date: Wed, 16 Jun 2021 16:07:07 +0800
Subject: [PATCH 0552/1674] [console][minigraph] Avoid generate config for self
 console port (#7817)

Signed-off-by: Jing Kan jika@microsoft.com
---
 src/sonic-config-engine/minigraph.py                     | 8 ++++----
 .../tests/simple-sample-graph-case.xml                   | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index c84fca445e40..39d594806174 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -199,18 +199,18 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                     startport = link.find(str(QName(ns, "StartPort"))).text
                     baudrate = link.find(str(QName(ns, "Bandwidth"))).text
                     flowcontrol = 1 if link.find(str(QName(ns, "FlowControl"))) is not None and link.find(str(QName(ns, "FlowControl"))).text == 'true' else 0
-                    if enddevice.lower() == hname.lower():
+                    if enddevice.lower() == hname.lower() and endport.isdigit():
                         console_ports[endport] = {
                             'remote_device': startdevice,
                             'baud_rate': baudrate,
                             'flow_control': flowcontrol
-                            }
-                    else:
+                        }
+                    elif startport.isdigit():
                         console_ports[startport] = {
                             'remote_device': enddevice,
                             'baud_rate': baudrate,
                             'flow_control': flowcontrol
-                            }
+                        }
                     continue
 
                 if linktype == "DeviceInterfaceLink":
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index ae7bd50a6f53..7717157f186e 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -194,6 +194,15 @@
   </DpgDec>
   <PngDec>
     <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>console</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t1</StartDevice>
+        <StartPort>1</StartPort>
+      </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceSerialLink">
         <ElementType>DeviceSerialLink</ElementType>
         <Bandwidth>9600</Bandwidth>

From 199c75f36b232856a2a4bca08a5e86a75ad9f96c Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 16 Jun 2021 08:33:41 -0700
Subject: [PATCH 0553/1674] [202012][sonic-utilities] submodule update (#7891)

d86d765 [202012]Fixing db_migrator for Feature table (#1676)
440b0f4 [config] Sort Config Db When Saving (#1623) (#1651)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index b894c5b551ae..d86d7652de9a 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit b894c5b551ae6c35f107475c7327edfbd460e0fb
+Subproject commit d86d7652de9a29a62d612edf435b658ab78a0029

From 49388fd595533f4b8b81a6b4d01ad7f03dec7bab Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Mon, 14 Jun 2021 18:25:58 +0300
Subject: [PATCH 0554/1674] [Mellanox] Install MFT packages on Syncd container
 (#7844)

To have access to MFT tools in the Syncd container on Mellanox switches due to SAI dump API implementation enhancements
---
 platform/mellanox/docker-syncd-mlnx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
index 3f9e64b985c7..662c094bef5a 100644
--- a/platform/mellanox/docker-syncd-mlnx.mk
+++ b/platform/mellanox/docker-syncd-mlnx.mk
@@ -3,7 +3,7 @@
 DOCKER_SYNCD_PLATFORM_CODE = mlnx
 include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
 
-$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MFT)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \

From e851a42db75d1238aea01ebcd0c13c49fc9b9a9d Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Wed, 16 Jun 2021 07:46:01 -0700
Subject: [PATCH 0555/1674] [Kubernetes]: The kube server could be used as
 http-proxy for docker (#7469)

Why I did it
The SONiC switches get their docker images from local repo, populated during install with container images pre-built into SONiC FW. With the introduction of kubernetes, new docker images available in remote repo could be deployed. This requires dockerd to be able to pull images from remote repo.

Depending on the Switch network domain & config, it may or may not be able to reach the remote repo. In the case where remote repo is unreachable, we could potentially make Kubernetes server to also act as http-proxy.

How I did it
When admin explicitly enables, the kubernetes-server could be configured as docker-proxy. But any update to docker-proxy has to be via service-conf file environment variable, implying a "service restart docker" is required. But restart of dockerd is vey expensive, as it would restarts all dockers, including database docker.

To avoid dockerd restart, pre-configure an http_proxy using an unused IP. When k8s server is enabled to act as http-proxy, an IP table entry would be created to direct all traffic to the configured-unused-proxy-ip to the kubernetes-master IP. This way any update to Kubernetes master config would be just manipulating IPTables, which will be transparent to all modules, until dockerd needs to download from remote repo.

How to verify it
Configure a switch such that image repo is unreachable
Pre-configure dockerd with http_proxy.conf using an unused IP (e.g. 172.16.1.1)
Update ctrmgrd.service to invoke ctrmgrd.py with "-p" option.
Configure a k8s server, and deploy an image for feature with set_owner="kube"
Check if switch could successfully download the image or not.
---
 build_debian.sh                               |   1 -
 .../build_templates/sonic_debian_extension.j2 |  23 +++
 rules/config                                  |   7 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py   | 135 +++++++++++++
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  13 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service      |   9 +-
 .../ctrmgr/remote_ctr.config.json             |   3 +-
 .../tests/ctrmgr_iptables_test.py             | 178 ++++++++++++++++++
 src/sonic-ctrmgrd/tests/ctrmgrd_test.py       |   9 +
 src/sonic-ctrmgrd/tests/http_proxy.conf       |   2 +
 src/sonic-ctrmgrd/tests/no_proxy.conf         |   2 +
 11 files changed, 371 insertions(+), 11 deletions(-)
 create mode 100644 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
 create mode 100755 src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
 create mode 100644 src/sonic-ctrmgrd/tests/http_proxy.conf
 create mode 100644 src/sonic-ctrmgrd/tests/no_proxy.conf

diff --git a/build_debian.sh b/build_debian.sh
index 81118e20e239..6970bfe3cf3f 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -235,7 +235,6 @@ then
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
-    # kubeadm package auto install kubelet & kubectl
 else
     echo '[INFO] Skipping Install kubernetes'
 fi
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index eecf4064cac8..5d3892fafeb8 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -414,6 +414,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
 
 {% if include_kubernetes == "y" %}
+# Point to kubelet to /etc/resolv.conf
+#
+echo 'KUBELET_EXTRA_ARGS="--resolv-conf=/etc/resolv.conf"' | sudo tee -a  $FILESYSTEM_ROOT/etc/default/kubelet
+
 # Copy Flannel conf file into sonic-templates
 #
 sudo cp $BUILD_TEMPLATES/kube_cni.10-flannel.conflist $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
@@ -434,6 +438,25 @@ sudo cp ${files_path}/container_startup.py ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCR
 sudo chmod a+x ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/container_startup.py
 
 # Config file used by container mgmt scripts/service
+fl="${files_path}/remote_ctr.config.json"
+use_k8s_as_http_proxy=$(python3 -c 'import json
+with open("'${fl}'", "r") as s:
+    d=json.load(s);print(d.get("use_k8s_as_http_proxy", ""))
+')
+if [ "${use_k8s_as_http_proxy}" == "y" ]; then
+    # create proxy files for docker using private IP which will
+    # be later directed to k8s master upon config
+    PROXY_INFO="http://172.16.1.1:3128/"
+    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/http_proxy.conf > /dev/null
+[Service]
+Environment="HTTP_PROXY=${PROXY_INFO}"
+EOT
+    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/https_proxy.conf > /dev/null
+[Service]
+Environment="HTTPS_PROXY=${PROXY_INFO}"
+EOT
+fi
+
 sudo cp ${files_path}/remote_ctr.config.json ${FILESYSTEM_ROOT_ETC_SONIC}/
 
 # Remote container management service files
diff --git a/rules/config b/rules/config
index 39eb786f2ff0..043c02dfeedf 100644
--- a/rules/config
+++ b/rules/config
@@ -142,6 +142,7 @@ INCLUDE_NAT = y
 # TELEMETRY_WRITABLE - Enable write/config operations via the gNMI interface.
 # Uncomment to enable:
 # TELEMETRY_WRITABLE = y
+
 # INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to
 # run as worker node in kubernetes cluster.
 INCLUDE_KUBERNETES = n
@@ -151,9 +152,9 @@ INCLUDE_KUBERNETES = n
 # These are Used *only* when INCLUDE_KUBERNETES=y
 # NOTE: As a worker node it has to run version compatible to kubernetes master.
 #
-KUBERNETES_VERSION = 1.18.6
-KUBERNETES_CNI_VERSION = 0.8.6
-K8s_GCR_IO_PAUSE_VERSION = 3.2
+KUBERNETES_VERSION = 1.21.1
+KUBERNETES_CNI_VERSION = 0.8.7
+K8s_GCR_IO_PAUSE_VERSION = 3.4.1
 
 # SONIC_ENABLE_IMAGE_SIGNATURE - enable image signature
 # To not use the auto-generated self-signed certificate, the required files to sign the image as below:
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
new file mode 100644
index 000000000000..74b9bfe44fc9
--- /dev/null
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+
+import ipaddress
+import os
+import re
+import socket
+import subprocess
+import syslog
+
+UNIT_TESTING = 0
+
+# NOTE:
+# Unable to use python-iptables as that does not create rules per ip-tables default
+# which is nf_tables. So rules added via iptc package will not be listed under
+# "sudo iptables -t nat -L -n". But available in kernel. To list, we need to 
+# use legacy mode as "sudo iptables-legacy -t nat -L -n".
+# As we can't use two modes and using non-default could make any debugging effort
+# very tough.
+
+
+from urllib.parse import urlparse
+
+DST_FILE = "/etc/systemd/system/docker.service.d/http_proxy.conf"
+DST_IP = None
+DST_PORT = None
+SQUID_PORT = "3128"
+
+def _get_ip(ip_str):
+    ret = ""
+    if ip_str:
+        try:
+            ipaddress.ip_address(ip_str)
+            ret = ip_str
+        except ValueError:
+            pass
+
+        if not ret:
+            try:
+                ret = socket.gethostbyname(ip_str)
+            except (OSError, socket.error):
+                pass
+        if not ret:
+            syslog.syslog(syslog.LOG_ERR, "{} is neither IP nor resolves to IP".
+                    format(ip_str))
+    return ret
+
+
+def _get_dst_info():
+    global DST_IP, DST_PORT
+    DST_IP = None
+    DST_PORT = None
+    print("DST_FILE={}".format(DST_FILE))
+    if os.path.exists(DST_FILE):
+        with open(DST_FILE, "r") as s:
+            for line in s.readlines():
+                url_match = re.search('^Environment=.HTTP_PROXY=(.+?)"', line)
+                if url_match:
+                    url = urlparse(url_match.group(1))
+                    DST_IP = _get_ip(url.hostname)
+                    DST_PORT = url.port
+                    break
+    else:
+        print("{} not available".format(DST_FILE))
+    print("DST_IP={}".format(DST_IP))
+
+
+def _is_rule_match(rule):
+    expect = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:".format(
+            DST_IP, DST_PORT)
+
+    # Remove duplicate spaces
+    rule = " ".join(rule.split()).strip()
+
+    if rule.startswith(expect):
+        return rule[len(expect):]
+    else:
+        return ""
+
+
+def check_proc(proc):
+    if proc.returncode:
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: cmd: {}".format(proc.args))
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: stdout: {}".format(proc.stdout))
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: stderr: {}".format(proc.stderr))
+        if not UNIT_TESTING:
+            assert False
+
+
+def iptable_proxy_rule_upd(ip_str, port = SQUID_PORT):
+    _get_dst_info()
+    if not DST_IP:
+        # There is no proxy in use. Bail out.
+        return ""
+
+    destination = ""
+    if ip_str:
+        upd_ip = _get_ip(ip_str)
+        if not upd_ip:
+            return ""
+        destination = "{}:{}".format(upd_ip, port)
+
+    found = False
+    num = 0
+
+    while True:
+        num += 1
+
+        cmd = "sudo iptables -t nat -n -L OUTPUT {}".format(num)
+        proc = subprocess.run(cmd, shell=True, capture_output=True)
+        check_proc(proc)
+
+        if not proc.stdout:
+            # No more rule
+            break
+
+        rule_dest = _is_rule_match(proc.stdout.decode("utf-8").strip())
+        if rule_dest:
+            if not found and destination and (rule_dest == destination):
+                found = True
+            else:
+                # Duplicate or different IP - delete it
+                cmd = "sudo iptables -t nat -D OUTPUT {}".format(num)
+                proc = subprocess.run(cmd, shell=True, capture_output=True)
+                check_proc(proc)
+                # Decrement number to accommodate deleted rule
+                num -= 1
+
+    if destination and not found:
+        cmd = "sudo iptables -t nat -A OUTPUT -p tcp -d {} --dport {} -j DNAT --to-destination {}".format(
+                DST_IP, DST_PORT, destination)
+        proc = subprocess.run(cmd, shell=True, capture_output=True)
+
+        check_proc(proc)
+
+    return destination
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index 49c11d278170..3941a05a738a 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -8,6 +8,7 @@
 import syslog
 
 from collections import defaultdict
+from ctrmgr.ctrmgr_iptables import iptable_proxy_rule_upd
 
 from swsscommon import swsscommon
 from sonic_py_common import device_info
@@ -87,11 +88,13 @@
 JOIN_LATENCY = "join_latency_on_boot_seconds"
 JOIN_RETRY = "retry_join_interval_seconds"
 LABEL_RETRY = "retry_labels_update_seconds"
+USE_K8S_PROXY = "use_k8s_as_http_proxy"
 
 remote_ctr_config = {
     JOIN_LATENCY: 10,
     JOIN_RETRY: 10,
-    LABEL_RETRY: 2
+    LABEL_RETRY: 2,
+    USE_K8S_PROXY: ""
     }
 
 def log_debug(m):
@@ -309,6 +312,9 @@ def __init__(self, server):
 
         self.start_time = datetime.datetime.now()
 
+        if remote_ctr_config[USE_K8S_PROXY] == "y":
+            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
+
         if not self.st_server[ST_FEAT_UPDATE_TS]:
             # This is upon system start. Sleep 10m before join
             self.start_time += datetime.timedelta(
@@ -336,6 +342,9 @@ def on_config_update(self, key, op, data):
         log_debug("Received config update: {}".format(str(data)))
         self.cfg_server = cfg_data
 
+        if remote_ctr_config[USE_K8S_PROXY] == "y":
+            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
+
         if self.pending:
             tnow = datetime.datetime.now()
             if tnow < self.start_time:
@@ -359,7 +368,7 @@ def handle_update(self):
 
         ip = self.cfg_server[CFG_SER_IP]
         disable = self.cfg_server[CFG_SER_DISABLE] != "false"
-        
+
         pre_state = dict(self.st_server)
         log_debug("server: handle_update: disable={} ip={}".format(disable, ip))
         if disable or not ip:
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
index 6052c10785da..f59314259bc6 100644
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Container Manager watcher daemon
-Requires=updategraph.service
-After=updategraph.service
-
+Requires=caclmgrd.service
+After=caclmgrd.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=simple
@@ -11,4 +12,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
index e7bca832e18b..9ef41d085329 100644
--- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
+++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
@@ -2,6 +2,7 @@
     "join_latency_on_boot_seconds": 300,
     "retry_join_interval_seconds": 30,
     "retry_labels_update_seconds": 5,
-    "revert_to_local_on_wait_seconds": 60
+    "revert_to_local_on_wait_seconds": 60,
+    "use_k8s_as_http_proxy": "y"
 }
 
diff --git a/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py b/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
new file mode 100755
index 000000000000..fc28cbecc8da
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
@@ -0,0 +1,178 @@
+import os
+import re
+import sys
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from . import common_test
+
+sys.path.append("ctrmgr")
+import ctrmgr_iptables
+
+
+PROXY_FILE="http_proxy.conf"
+
+test_data = {
+    "1": {
+        "ip": "10.10.20.20",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:10.10.20.20:3128"
+            ],
+        "ret": "10.10.20.20:3128"
+    },
+    "2": {
+        "ip": "",
+        "port": "",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080"
+        ],
+        "ret": ""
+    },
+    "3": {
+        "ip": "www.google.com",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:.*3128"
+        ]
+    },
+    "4": {
+        "ip": "www.google.comx",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "ret": ""
+    },
+    "5": {
+        "ip": "www.google.comx",
+        "port": "3128",
+        "conf_file": "no_proxy.conf",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "ret": ""
+    }
+}
+
+
+current_tc = None
+current_rules = None
+
+class proc:
+    returncode = 0
+    stdout = None
+    stderr = None
+
+    def __init__(self, ret, stdout, stderr):
+        self.returncode = ret
+        self.stdout = bytearray(stdout, 'utf-8')
+        self.stderr = bytearray(stderr, 'utf-8')
+        print("out={} err={}".format(stdout, stderr))
+
+
+def mock_subproc_run(cmd, shell, capture_output):
+    cmd_prefix = "sudo iptables -t nat "
+    list_cmd = "{}-n -L OUTPUT ".format(cmd_prefix)
+    del_cmd = "{}-D OUTPUT ".format(cmd_prefix)
+    ins_cmd = "{}-A OUTPUT -p tcp -d ".format(cmd_prefix)
+
+    assert shell
+    
+    print("cmd={}".format(cmd))
+    if cmd.startswith(list_cmd):
+        num = int(cmd[len(list_cmd):])
+        out = current_rules[num] if len(current_rules) > num else ""
+        return proc(0, out, "")
+
+    if cmd.startswith(del_cmd):
+        num = int(cmd[len(del_cmd):])
+        if num >= len(current_rules):
+            print("delete num={} is greater than len={}".format(num, len(current_rules)))
+            print("current_rules = {}".format(current_rules))
+            assert False
+        del current_rules[num]
+        return proc(0, "", "")
+
+    if cmd.startswith(ins_cmd):
+        l = cmd.split()
+        assert len(l) == 16
+        rule = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:{}".format(l[9], l[11], l[-1])
+        current_rules.append(rule)
+        return proc(0, "", "")
+
+    print("unknown cmd: {}".format(cmd))
+    return None
+
+
+def match_rules(pattern_list, str_list):
+    if len(pattern_list) != len(str_list):
+        print("pattern len {} != given {}".format(
+            len(pattern_list), len(str_list)))
+        return False
+
+    for i in range(len(pattern_list)):
+        if not re.match(pattern_list[i], str_list[i]):
+            print("{}: {} != {}".format(i, pattern_list[i], str_list[i]))
+            return False
+    return True
+
+
+class TestIPTableUpdate(object):
+
+    @patch("ctrmgr_iptables.subprocess.run")
+    def test_table(self, mock_proc):
+        global current_rules, current_tc
+
+        mock_proc.side_effect = mock_subproc_run
+        for i, tc in test_data.items():
+            print("----- Test: {} Start ------------------".format(i))
+            current_tc = tc
+            current_rules = tc["pre_rules"].copy()
+
+            ctrmgr_iptables.DST_IP = ""
+            ctrmgr_iptables.DST_PORT = ""
+            ctrmgr_iptables.DST_FILE = os.path.join(
+                    os.path.dirname(os.path.realpath(__file__)),
+                    tc.get("conf_file", PROXY_FILE))
+            ret = ctrmgr_iptables.iptable_proxy_rule_upd(tc["ip"], tc["port"])
+            if "ret" in tc:
+                assert ret == tc["ret"]
+            if not match_rules(tc["post_rules"], current_rules):
+                print("current_rules={}".format(current_rules))
+                print("post_rules={}".format(tc["post_rules"]))
+                assert False
+            print("----- Test: {} End   ------------------".format(i))
+
+
diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
index e0e821089346..171534b5a8d1 100755
--- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
+++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
@@ -8,6 +8,7 @@
 
 sys.path.append("ctrmgr")
 import ctrmgrd
+import ctrmgr.ctrmgr_iptables
 
 
 # ctrmgrd test cases
@@ -387,6 +388,11 @@ def init(self):
         ctrmgrd.UNIT_TESTING = 1
         ctrmgrd.SONIC_CTR_CONFIG = (
                 common_test.create_remote_ctr_config_json())
+        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 1
+
+
+    def clear(self):
+        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 0
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -421,6 +427,7 @@ def test_server(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
             ret = common_test.check_kube_actions()
             assert ret == 0
             common_test.mock_selector.SLEEP_SECS = 0
+        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -450,6 +457,7 @@ def test_feature(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_tables_returned()
             assert ret == 0
+        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -486,3 +494,4 @@ def test_labels(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_kube_actions()
             assert ret == 0
+        self.clear()
diff --git a/src/sonic-ctrmgrd/tests/http_proxy.conf b/src/sonic-ctrmgrd/tests/http_proxy.conf
new file mode 100644
index 000000000000..4947352418a5
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/http_proxy.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="HTTP_PROXY=http://172.16.1.1:3128/"
diff --git a/src/sonic-ctrmgrd/tests/no_proxy.conf b/src/sonic-ctrmgrd/tests/no_proxy.conf
new file mode 100644
index 000000000000..ffdfa671bacb
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/no_proxy.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="NO_PROXY=10.10.10.10"

From d67a5b887f641873f8a1bbb65caa2ff5c26bfc83 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Wed, 16 Jun 2021 16:05:48 -0700
Subject: [PATCH 0556/1674] Support multiple pcie configuration file and change
 the pcie status table name to match with pcied changes (#7886)

Why I did it
Support multiple pcie configuration file and change the pcie status table name
This is to match with below two PRs.
Azure/sonic-platform-common#195
Azure/sonic-platform-daemons#189

How I did it
Check pcie configuration file with wild card and change the device status table name

How to verify it
Restart with changes and see if the pcie check works as expected.
---
 files/image_config/pcie-check/pcie-check.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/files/image_config/pcie-check/pcie-check.sh b/files/image_config/pcie-check/pcie-check.sh
index 01a952d01374..3d4184c8684c 100755
--- a/files/image_config/pcie-check/pcie-check.sh
+++ b/files/image_config/pcie-check/pcie-check.sh
@@ -5,6 +5,7 @@ VERBOSE="no"
 RESULTS="PCIe Device Checking All Test"
 EXPECTED="PCIe Device Checking All Test ----------->>> PASSED"
 MAX_WAIT_SECONDS=15
+PCIE_STATUS_TABLE="PCIE_DEVICES|status"
 
 function debug()
 {
@@ -19,7 +20,7 @@ function check_and_rescan_pcie_devices()
     PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
     PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
+    if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie*.yaml ]; then
         debug "pcie.yaml does not exist! Can't check PCIe status!"
         exit
     fi
@@ -37,7 +38,7 @@ function check_and_rescan_pcie_devices()
         fi
 
         if [ "$(eval $PCIE_CHK_CMD)" = "$EXPECTED" ]; then
-            redis-cli -n 6 HSET "PCIE_DEVICES" "status" "PASSED"
+            redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "PASSED"
             debug "PCIe check passed"
             exit
         else
@@ -53,7 +54,7 @@ function check_and_rescan_pcie_devices()
 
      done
      debug "PCIe check failed"
-     redis-cli -n 6 HSET "PCIE_DEVICES" "status" "FAILED"
+     redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "FAILED"
 }
 
 check_and_rescan_pcie_devices

From c46bf41ea52ed3c83d6bf11278eb1228f4068942 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:04:49 -0700
Subject: [PATCH 0557/1674] [sonic-host-services] Add 'parameterized' package
 as a test dependency (#7900)

#### Why I did it

Recently, the build started failing with messages like

```
2021-06-16T16:55:02.8675603Z tests/hostcfgd/hostcfgd_test.py:5: in <module>
2021-06-16T16:55:02.8676208Z     from parameterized import parameterized
2021-06-16T16:55:02.8677145Z E   ModuleNotFoundError: No module named 'parameterized'
```

Unit tests for hostcfgd depend on the `parameterized` Python package, but it was never added as a dependency to the setup.py file. This dependency was added ~3 months ago. I'm not sure why we only started seeing this failure recently.

#### How I did it

Add 'parameterized' package as a test dependency in setup.py for sonic-host-services package
---
 src/sonic-host-services/setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sonic-host-services/setup.py b/src/sonic-host-services/setup.py
index 8f06dfa60193..d610af2ca506 100644
--- a/src/sonic-host-services/setup.py
+++ b/src/sonic-host-services/setup.py
@@ -27,6 +27,7 @@
         'wheel'
     ],
     tests_require = [
+        'parameterized',
         'pytest',
         'sonic-py-common'
     ],

From e3151acd414aac1b1479b0782f979181b168c4ed Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 17 Jun 2021 08:21:14 -0700
Subject: [PATCH 0558/1674] [202012] start_led.sh re-enable LED INIT for
 warmreboot (#7901)

---
 platform/broadcom/docker-syncd-brcm/start_led.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/broadcom/docker-syncd-brcm/start_led.sh b/platform/broadcom/docker-syncd-brcm/start_led.sh
index 0b133d6d811e..43a914173452 100755
--- a/platform/broadcom/docker-syncd-brcm/start_led.sh
+++ b/platform/broadcom/docker-syncd-brcm/start_led.sh
@@ -31,8 +31,9 @@ wait_syncd() {
 }
 
 # If this platform has an initialization file for the Broadcom LED microprocessor, load it
-if [[ -r "$LED_PROC_INIT_SOC" && ! -f /var/warmboot/warm-starting ]]; then
-    wait_syncd
+if [ -r "$LED_PROC_INIT_SOC" ]; then
+    if [ ! -f /var/warmboot/warm-starting ]; then
+        wait_syncd
+    fi
     /usr/bin/bcmcmd -t 60 "rcload $LED_PROC_INIT_SOC"
 fi
-

From c406d42a2695d627619adb3b8ebac00cd6b16ec5 Mon Sep 17 00:00:00 2001
From: Mykola Gerasymenko
 <79265711+mykolaxgerasymenko@users.noreply.github.com>
Date: Thu, 17 Jun 2021 20:32:45 +0300
Subject: [PATCH 0559/1674] Add PG_DROP yang model (#7899)

Add PG_DROP yang model and add check this field in unit test for yang model

How to verify it
Firstly try to do DPB (2x50G) for Ethernet0 port:
sudo config interface breakout Ethernet0 2x50G -f
After that try to do DPB (1x100G[40G]) for Ethernet0 port:
sudo config interface breakout Ethernet0 1x100G[40G] -f
Both commands should work correctly.

Signed-off-by: Mykola Gerasymenko <mykolax.gerasymenko@intel.com>
---
 .../tests/yang_model_tests/yangTest.json                 | 9 +++++++++
 .../yang-models/sonic-flex_counter.yang                  | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/sonic-yang-models/tests/yang_model_tests/yangTest.json b/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
index d898582605e9..f40df4fbe0a6 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
@@ -886,6 +886,9 @@
                 "PFCWD": {
                     "FLEX_COUNTER_STATUS": "enable"
                 },
+                "PG_DROP": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
                 "PG_WATERMARK": {
                     "FLEX_COUNTER_STATUS": "enable"
                 },
@@ -969,6 +972,9 @@
 				"QUEUE": {
 					"FLEX_COUNTER_STATUS": "enable"
 				},
+				"PG_DROP": {
+					"FLEX_COUNTER_STATUS": "enable"
+				},
 				"PG_WATERMARK": {
 					"FLEX_COUNTER_STATUS": "enable"
 				},
@@ -1680,6 +1686,9 @@
             "PFCWD": {
                 "FLEX_COUNTER_STATUS": "enable"
             },
+            "PG_DROP": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
             "PG_WATERMARK": {
                 "FLEX_COUNTER_STATUS": "enable"
             },
diff --git a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
index dbafc33bae2d..3f0c805e1e99 100644
--- a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
+++ b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
@@ -48,6 +48,13 @@ module sonic-flex_counter {
                 }
             }
 
+            container PG_DROP {
+                /* PG_DROP_STAT_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
             container PG_WATERMARK {
                 /* PG_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {

From de7c3daa7d9520e01e9d09516defc5358dc47833 Mon Sep 17 00:00:00 2001
From: ec-michael-shih <71379738+ec-michael-shih@users.noreply.github.com>
Date: Fri, 18 Jun 2021 02:29:56 +0800
Subject: [PATCH 0560/1674] [202012][as7916-32d] Accton platform sfputil
 support QSFP-DD (#7904)

#### Why I did it
sfputil eeprom need to support QSFP-DD

#### How I did it
plugins/sfputil.py include inf8628.py
---
 .../plugins/sfputil.py                        | 140 +++++++++++++++++-
 1 file changed, 139 insertions(+), 1 deletion(-)

diff --git a/device/accton/x86_64-accton_as9716_32d-r0/plugins/sfputil.py b/device/accton/x86_64-accton_as9716_32d-r0/plugins/sfputil.py
index 7b3ca53d4ed4..5a6c664b7217 100755
--- a/device/accton/x86_64-accton_as9716_32d-r0/plugins/sfputil.py
+++ b/device/accton/x86_64-accton_as9716_32d-r0/plugins/sfputil.py
@@ -9,15 +9,44 @@
     import sys
     from ctypes import create_string_buffer
     from sonic_sfp.sfputilbase import SfpUtilBase
+    from sonic_sfp.sff8472 import sff8472InterfaceId
+    from sonic_sfp.sff8472 import sff8472Dom
+    from sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_sfp.sff8436 import sff8436Dom
+    from sonic_sfp.inf8628 import inf8628InterfaceId
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+
+SFP_TYPE_CODE_LIST = [
+    '03'  # SFP/SFP+/SFP28
+]
+QSFP_TYPE_CODE_LIST = [
+    '0d',  # QSFP+ or later
+    '11'  # QSFP28 or later
+]
+QSFP_DD_TYPE_CODE_LIST = [
+    '18'  # QSFP-DD Double Density 8X Pluggable Transceiver
+]
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+OSFP_TYPE = "OSFP"
+QSFP_DD_TYPE = "QSFP_DD"
+
+SFP_I2C_START = 25
+I2C_EEPROM_PATH = '/sys/bus/i2c/devices/{0}-0050/eeprom'
 
 class SfpUtil(SfpUtilBase):
     """Platform-specific SfpUtil class"""
 
     PORT_START = 0
     PORT_END = 33
+    OSFP_PORT_START = 0
+    OSFP_PORT_END = 31
     PORTS_IN_BLOCK = 34
 
     BASE_OOM_PATH = "/sys/bus/i2c/devices/{0}-0050/"
@@ -75,7 +104,11 @@ def port_end(self):
 
     @property
     def qsfp_ports(self):
-        return list(range(self.PORT_START, self.PORTS_IN_BLOCK + 1))
+        return []
+
+    @property
+    def osfp_ports(self):
+        return list(range(self.OSFP_PORT_START, self.OSFP_PORT_END + 1))
 
     @property
     def port_to_eeprom_mapping(self):
@@ -91,6 +124,111 @@ def __init__(self):
 
         SfpUtilBase.__init__(self)
 
+    def _get_eeprom_path(self, port_num):
+        port_to_i2c_mapping = SFP_I2C_START + port_num
+        port_eeprom_path = I2C_EEPROM_PATH.format(port_to_i2c_mapping)
+        return port_eeprom_path
+
+    def _read_eeprom_specific_bytes_(self, offset, num_bytes, port_num):
+        sysfs_sfp_i2c_client_eeprom_path = self._get_eeprom_path(port_num)
+        eeprom_raw = []
+        try:
+            eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path,
+                mode="rb", buffering=0)
+        except IOError:
+            return None
+
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        try:
+            eeprom.seek(offset)
+            raw = eeprom.read(num_bytes)
+        except IOError:
+            eeprom.close()
+            return None
+
+        try:
+            if isinstance(raw, str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
+        except BaseException:
+            eeprom.close()
+            return None
+
+        eeprom.close()
+        return eeprom_raw
+
+    def _detect_sfp_type(self, port_num):
+        sfp_type = QSFP_TYPE
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_specific_bytes_(
+            XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH, port_num)
+        if eeprom_raw:
+            if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
+                self.sfp_type = SFP_TYPE
+            elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_TYPE
+            elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_DD_TYPE
+            else:
+                self.sfp_type = sfp_type
+        else:
+            self.sfp_type = sfp_type
+
+    def get_eeprom_dict(self, port_num):
+        """Returns dictionary of interface and dom data.
+        format: {<port_num> : {'interface': {'version' : '1.0', 'data' : {...}},
+                               'dom' : {'version' : '1.0', 'data' : {...}}}}
+        """
+        self._detect_sfp_type(port_num)
+        sfp_data = {}
+
+        eeprom_ifraw = self.get_eeprom_raw(port_num)
+        eeprom_domraw = self.get_eeprom_dom_raw(port_num)
+
+        if eeprom_ifraw is None:
+            return None
+
+        if self.sfp_type == QSFP_DD_TYPE:
+            sfpi_obj = inf8628InterfaceId(eeprom_ifraw)
+
+            if sfpi_obj is not None:
+                sfp_data['interface'] = sfpi_obj.get_data_pretty()
+
+            return sfp_data
+        elif self.sfp_type == QSFP_TYPE:
+            sfpi_obj = sff8436InterfaceId(eeprom_ifraw)
+
+            if sfpi_obj is not None:
+                sfp_data['interface'] = sfpi_obj.get_data_pretty()
+
+            # For Qsfp's the dom data is part of eeprom_if_raw
+            # The first 128 bytes
+            sfpd_obj = sff8436Dom(eeprom_ifraw)
+            if sfpd_obj is not None:
+                sfp_data['dom'] = sfpd_obj.get_data_pretty()
+
+            return sfp_data
+        else:
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+
+            if sfpi_obj is not None:
+                sfp_data['interface'] = sfpi_obj.get_data_pretty()
+                cal_type = sfpi_obj.get_calibration_type()
+
+            if eeprom_domraw is not None:
+                sfpd_obj = sff8472Dom(eeprom_domraw, cal_type)
+                if sfpd_obj is not None:
+                    sfp_data['dom'] = sfpd_obj.get_data_pretty()
+
+            return sfp_data
+
     def get_presence(self, port_num):
         # Check for invalid port_num
         if port_num < self.port_start or port_num > self.port_end:

From 547aa9b2c754a0c736e2cc1522b38b7bfb32dd8f Mon Sep 17 00:00:00 2001
From: liushilongbuaa <584370777@qq.com>
Date: Thu, 21 Jan 2021 14:16:02 +0800
Subject: [PATCH 0561/1674] [files/build/versions]: support reproduceable build
 for git (#5774)

* support reproduceable build for git clone

Signed-off-by: shilongliu <shilongliu@microsoft.com>

* fix

Co-authored-by: shilongliu <shilongliu@microsoft.com>
---
 src/sonic-build-hooks/hooks/git | 76 +++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100755 src/sonic-build-hooks/hooks/git

diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
new file mode 100755
index 000000000000..b818cbbb16c7
--- /dev/null
+++ b/src/sonic-build-hooks/hooks/git
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+parse_config(){
+    . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+    [ -z $REAL_COMMAND ] && REAL_COMMAND=$(get_command git)
+
+    version_file=$VERSION_PATH/versions-git
+    new_version_file=$BUILD_VERSION_PATH/versions-git
+
+    MODE_CLONE=0
+    # parse input parameters
+    for i in "$@"
+    do
+        if [[ $i == "clone" ]];then
+            MODE_CLONE=1
+        fi
+    done
+}
+
+get_clone_path(){
+    # get paremater of clone path
+    while (( "$#" )); do
+        case $1 in
+            -b|--branch|--reference|--reference-if-able|-c|--config|--origin|-u|--upload-pack|-j|--jobs|--depth|--dissociate)
+                shift 2
+                ;;
+            clone|-l|--local|--no-hardlinks|-s|--shared|--dissociate|-q|--quiet|-v|--verbose|--progress|--server-option=*|--bare|--sparse|--filter=*|--template=*|--mirror|--reference|--shallow-*|--no-tags|--recurse-submodules*|--remote-submodules|--no-remote-submodules|--separate-git-dir*)
+                shift 1
+                ;;
+            *)
+                if [[ $URL == "" ]];then
+                    URL=$1
+                else
+                    clone_PATH=$1
+                fi
+                shift 1
+                ;;
+        esac
+    done
+
+    # if not specific clone path, get default clone path
+    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
+}
+
+main(){
+    parse_config "$@"
+
+    # execute git.
+    $REAL_COMMAND "$@"
+    result=$?
+
+    # if sub command is not "clone", exit
+    if [[ $MODE_CLONE != 1 ]];then
+        exit $result
+    fi
+
+    get_clone_path "$@"
+    pushd $clone_PATH &> /dev/null
+    commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
+    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
+
+    # control version or record version file
+    if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
+        # control version
+        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
+    else
+        # record version file
+        echo "$URL==$commit_latest" >> $new_version_file
+        sort $new_version_file -o $new_version_file -u &> /dev/null
+    fi
+    popd &> /dev/null
+
+    exit $result
+}
+
+main "$@"

From 1cb8daf585180a56f8d3c060140464f5523771d9 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 22 Jan 2021 10:28:44 -0800
Subject: [PATCH 0562/1674] Revert "[files/build/versions]: support
 reproduceable build for git (#5774)"

This reverts commit d75c290f00e03148dcaa34c1284600e43ff6dc78.
---
 src/sonic-build-hooks/hooks/git | 76 ---------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100755 src/sonic-build-hooks/hooks/git

diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
deleted file mode 100755
index b818cbbb16c7..000000000000
--- a/src/sonic-build-hooks/hooks/git
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-parse_config(){
-    . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
-    [ -z $REAL_COMMAND ] && REAL_COMMAND=$(get_command git)
-
-    version_file=$VERSION_PATH/versions-git
-    new_version_file=$BUILD_VERSION_PATH/versions-git
-
-    MODE_CLONE=0
-    # parse input parameters
-    for i in "$@"
-    do
-        if [[ $i == "clone" ]];then
-            MODE_CLONE=1
-        fi
-    done
-}
-
-get_clone_path(){
-    # get paremater of clone path
-    while (( "$#" )); do
-        case $1 in
-            -b|--branch|--reference|--reference-if-able|-c|--config|--origin|-u|--upload-pack|-j|--jobs|--depth|--dissociate)
-                shift 2
-                ;;
-            clone|-l|--local|--no-hardlinks|-s|--shared|--dissociate|-q|--quiet|-v|--verbose|--progress|--server-option=*|--bare|--sparse|--filter=*|--template=*|--mirror|--reference|--shallow-*|--no-tags|--recurse-submodules*|--remote-submodules|--no-remote-submodules|--separate-git-dir*)
-                shift 1
-                ;;
-            *)
-                if [[ $URL == "" ]];then
-                    URL=$1
-                else
-                    clone_PATH=$1
-                fi
-                shift 1
-                ;;
-        esac
-    done
-
-    # if not specific clone path, get default clone path
-    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
-}
-
-main(){
-    parse_config "$@"
-
-    # execute git.
-    $REAL_COMMAND "$@"
-    result=$?
-
-    # if sub command is not "clone", exit
-    if [[ $MODE_CLONE != 1 ]];then
-        exit $result
-    fi
-
-    get_clone_path "$@"
-    pushd $clone_PATH &> /dev/null
-    commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
-    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
-
-    # control version or record version file
-    if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
-        # control version
-        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
-    else
-        # record version file
-        echo "$URL==$commit_latest" >> $new_version_file
-        sort $new_version_file -o $new_version_file -u &> /dev/null
-    fi
-    popd &> /dev/null
-
-    exit $result
-}
-
-main "$@"

From 52b87753db36370f123bccce83edcb5ec574dfab Mon Sep 17 00:00:00 2001
From: liushilongbuaa <584370777@qq.com>
Date: Thu, 4 Feb 2021 17:01:06 +0800
Subject: [PATCH 0563/1674] Version control git (#6562)

* support reproduceable build for git clone

Signed-off-by: shilongliu <shilongliu@microsoft.com>

* fix

* bug-fix

Signed-off-by: shilongliu <shilongliu@microsoft.com>

* bug-fix

Signed-off-by: shilongliu <shilongliu@microsoft.com>

Co-authored-by: shilongliu <shilongliu@microsoft.com>
---
 Makefile.work                   |  2 +-
 src/sonic-build-hooks/hooks/git | 76 +++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100755 src/sonic-build-hooks/hooks/git

diff --git a/Makefile.work b/Makefile.work
index 1835c8a65651..56660f168fe6 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -136,7 +136,7 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QE
 $(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
-SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
 
 OVERLAY_MODULE_CHECK := \
diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
new file mode 100755
index 000000000000..644a01d5fe1e
--- /dev/null
+++ b/src/sonic-build-hooks/hooks/git
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+parse_config(){
+    . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+    REAL_COMMAND=$(get_command git)
+
+    version_file=$VERSION_PATH/versions-git
+    new_version_file=$BUILD_VERSION_PATH/versions-git
+
+    MODE_CLONE=0
+    # parse input parameters
+    for i in "$@"
+    do
+        if [[ $i == "clone" ]];then
+            MODE_CLONE=1
+        fi
+    done
+}
+
+get_clone_path(){
+    # get paremater of clone path
+    while (( "$#" )); do
+        case $1 in
+            -b|--branch|--reference|--reference-if-able|-c|--config|--origin|-u|--upload-pack|-j|--jobs|--depth|--dissociate)
+                shift 2
+                ;;
+            clone|-l|--local|--no-hardlinks|-s|--shared|--dissociate|-q|--quiet|-v|--verbose|--progress|--server-option=*|--bare|--sparse|--filter=*|--template=*|--mirror|--reference|--shallow-*|--no-tags|--recurse-submodules*|--remote-submodules|--no-remote-submodules|--separate-git-dir*)
+                shift 1
+                ;;
+            *)
+                if [[ $URL == "" ]];then
+                    URL=$1
+                else
+                    clone_PATH=$1
+                fi
+                shift 1
+                ;;
+        esac
+    done
+
+    # if not specific clone path, get default clone path
+    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
+}
+
+main(){
+    parse_config "$@"
+
+    # execute git.
+    $REAL_COMMAND "$@"
+    result=$?
+
+    # if sub command is not "clone", exit
+    if [[ $MODE_CLONE != 1 ]];then
+        exit $result
+    fi
+
+    get_clone_path "$@"
+    pushd $clone_PATH &> /dev/null
+    commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
+    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
+
+    # control version or record version file
+    if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
+        # control version
+        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
+    else
+        # record version file
+        echo "$URL==$commit_latest" >> $new_version_file
+        sort $new_version_file -o $new_version_file -u &> /dev/null
+    fi
+    popd &> /dev/null
+
+    exit $result
+}
+
+main "$@"

From 93585b0a0af2b3df938327a64b53b1a5cb7c8674 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 18 Jun 2021 13:38:13 +0800
Subject: [PATCH 0564/1674] fix

---
 .../azure-pipelines-UpgrateVersion.yml        | 55 -------------------
 1 file changed, 55 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 62b188e56a27..9850e51b8c1f 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -57,14 +57,6 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     steps:
-    - script: |
-        if [ -z "$(which gh)" ]; then
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0
-          sudo apt-add-repository https://cli.github.com/packages
-          sudo apt update
-          sudo apt install gh
-        fi
-      displayName: 'Install gh'
     - checkout: self
       displayName: 'Checkout code'
     - download: current
@@ -91,53 +83,6 @@ stages:
         done
         git diff files/build/versions
       displayName: 'Freeze Versions'
-    - script: |
-        if [ -z "$GIT_USER" ]; then
-          echo "Skipped to send the pull request, GIT_USER not set."
-          exit 0
-        fi
-        GIT_STATUS=$(git status  --porcelain files/build/versions)
-        if [ -z "$GIT_STATUS" ]; then
-          echo "Skipped to send the pull request, no version change in files/build/versions"
-          exit 0
-        fi
-        if [ ! -d "$HOME" ]; then
-          sudo mkdir -p $HOME
-          sudo chown -R $(id -un):$(id -gn) $HOME
-        fi
-        SOURCE_BRANCH=$(Build.SourceBranch)
-        REPO_NAME=$(Build.Repository.Name)
-        [ -z "$GIT_REPO" ] && GIT_REPO=${REPO_NAME#*/}
-        BRANCH_NAME=repd/versions/${SOURCE_BRANCH#refs/heads/}
-        echo '#!/bin/bash' > git_env_password.sh
-        echo 'echo $GIT_PASSWORD' >> git_env_password.sh
-        chmod a+x git_env_password.sh
-        export GIT_ASKPASS=./git_env_password.sh
-
-        git config user.name $GIT_USER
-        git config credential.https://github.com.username $GIT_USER
-        git add files/build/versions
-        git commit -m "[ci/build]: Upgrade SONiC package versions"
-        git checkout -b $BRANCH_NAME
-        git remote add remote https://github.com/$GIT_USER/$GIT_REPO
-        git push remote HEAD:refs/heads/$BRANCH_NAME -f
-        git branch -u remote/$BRANCH_NAME
-
-        echo $GIT_PASSWORD | gh auth login --with-token
-        TITLE="Upgrade SONiC Versions"
-        BODY="Upgrade SONiC Versions"
-        RET=0
-        if ! gh pr create -t "$TITLE" -b "$BODY" -B $(Build.SourceBranch) -R $(Build.Repository.Name) > pr.log 2>&1; then
-          if ! grep -q "already exists" pr.log; then
-            RET=1
-          fi
-        fi
-        cat pr.log
-        exit $RET
-      env:
-        GIT_USER: $(GIT_USER)
-        GIT_PASSWORD: $(GIT_PASSWORD)
-      displayName: 'Send Pull Request'
     - publish: $(System.DefaultWorkingDirectory)/files/build/versions
       artifact: 'sonic-buildimage.versions'
       displayName: 'Archive SONiC versions'

From 346b916c0e1957067aa585da966dc0395a79dd07 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sat, 19 Jun 2021 00:46:41 +0800
Subject: [PATCH 0565/1674] [Mellanox] Enhance Python3 support for platform API
 (#7410) (#7910)

- Why I did it
This is to back-port Azure 7410 to 202012 branch.
Enhance the Python3 support for platform API. Originally, some platform APIs call SDK API which didn't support Python 3. Now the Python 3 APIs have been supported in SDK 4.4.3XXX, Python3 is completely supported by platform API

- How I did it
Start all platform daemons from python3
1. Remove #/usr/bin/env python at the beginning of each platform API file as the platform API won't be started as daemons but be imported from other daemons.
2. Adjust SDK API calls accordingly

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../pmon_daemon_control.json                  |  3 +--
 .../sonic_platform/chassis.py                 |  2 --
 .../sonic_platform/component.py               |  2 --
 .../mlnx-platform-api/sonic_platform/fan.py   |  2 --
 .../sonic_platform/fan_drawer.py              |  2 --
 .../sonic_platform/platform.py                |  2 --
 .../mlnx-platform-api/sonic_platform/psu.py   |  2 --
 .../mlnx-platform-api/sonic_platform/sfp.py   | 23 ++++++++++++-------
 .../sonic_platform/sfp_event.py               |  1 -
 .../sonic_platform/thermal.py                 |  2 --
 .../sonic_platform/watchdog.py                |  2 --
 11 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
index dec2ba6d7826..86910af29e89 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
@@ -1,7 +1,6 @@
 {
     "skip_ledd": true,
     "skip_fancontrol": true,
-    "delay_xcvrd": true,
-    "python2_daemons": ["xcvrd"]
+    "delay_xcvrd": true
 }
 
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index bc23a5c97044..2d4267379101 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
index f2a66c6d42ee..8845b3faedba 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
index 3ae5c4847c92..b40712a91d06 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
index fcf9b802636e..d73b52368100 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan_drawer.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
index 480db41dadb8..f3f710da9929 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
index 2d0e099c1b29..7d6357b33ef3 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 39ced89fcd59..16e8dc2b3859 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
@@ -1479,9 +1477,12 @@ def mgmt_phy_mod_pwr_attr_get(self, power_attr_type):
         sx_mgmt_phy_mod_pwr_attr = sx_mgmt_phy_mod_pwr_attr_t()
         sx_mgmt_phy_mod_pwr_attr.power_attr_type = power_attr_type
         sx_mgmt_phy_mod_pwr_attr_t_p_assign(sx_mgmt_phy_mod_pwr_attr_p, sx_mgmt_phy_mod_pwr_attr)
+        module_id_info = sx_mgmt_module_id_info_t()
+        module_id_info.slot_id = 0
+        module_id_info.module_id = self.sdk_index
         try:
-            rc = sx_mgmt_phy_mod_pwr_attr_get(self.sdk_handle, self.sdk_index, sx_mgmt_phy_mod_pwr_attr_p)
-            assert SX_STATUS_SUCCESS == rc, "sx_mgmt_phy_mod_pwr_attr_get failed"
+            rc = sx_mgmt_phy_module_pwr_attr_get(self.sdk_handle, module_id_info, sx_mgmt_phy_mod_pwr_attr_p)
+            assert SX_STATUS_SUCCESS == rc, "sx_mgmt_phy_module_pwr_attr_get failed {}".format(rc)
             sx_mgmt_phy_mod_pwr_attr = sx_mgmt_phy_mod_pwr_attr_t_p_value(sx_mgmt_phy_mod_pwr_attr_p)
             pwr_mode_attr = sx_mgmt_phy_mod_pwr_attr.pwr_mode_attr
             return pwr_mode_attr.admin_pwr_mode_e, pwr_mode_attr.oper_pwr_mode_e
@@ -1872,9 +1873,12 @@ def reset(self):
 
         refer plugins/sfpreset.py
         """
-        rc = sx_mgmt_phy_mod_reset(self.sdk_handle, self.sdk_index)
+        module_id_info = sx_mgmt_module_id_info_t()
+        module_id_info.slot_id = 0
+        module_id_info.module_id = self.sdk_index
+        rc = sx_mgmt_phy_module_reset(self.sdk_handle, module_id_info)
         if rc != SX_STATUS_SUCCESS:
-            logger.log_warning("sx_mgmt_phy_mod_reset failed, rc = %d" % rc)
+            logger.log_error("Error occurred when resetting SFP module {}, error code {}".format(self.sdk_index, rc))
 
         return rc == SX_STATUS_SUCCESS
 
@@ -1982,10 +1986,13 @@ def mgmt_phy_mod_pwr_attr_set(self, power_attr_type, admin_pwr_mode):
         sx_mgmt_phy_mod_pwr_attr.pwr_mode_attr = sx_mgmt_phy_mod_pwr_mode_attr
         sx_mgmt_phy_mod_pwr_attr_p = new_sx_mgmt_phy_mod_pwr_attr_t_p()
         sx_mgmt_phy_mod_pwr_attr_t_p_assign(sx_mgmt_phy_mod_pwr_attr_p, sx_mgmt_phy_mod_pwr_attr)
+        module_id_info = sx_mgmt_module_id_info_t()
+        module_id_info.slot_id = 0
+        module_id_info.module_id = self.sdk_index
         try:
-            rc = sx_mgmt_phy_mod_pwr_attr_set(self.sdk_handle, SX_ACCESS_CMD_SET, self.sdk_index, sx_mgmt_phy_mod_pwr_attr_p)
+            rc = sx_mgmt_phy_module_pwr_attr_set(self.sdk_handle, SX_ACCESS_CMD_SET, module_id_info, sx_mgmt_phy_mod_pwr_attr_p)
             if SX_STATUS_SUCCESS != rc:
-                logger.log_error("sx_mgmt_phy_mod_pwr_attr_set failed, rc = %d" % rc)
+                logger.log_error("Error occurred when setting power mode for SFP module {}, error code {}".format(self.sdk_index, rc))
                 result = False
             else:
                 result = True
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
index ba3ab68a9576..faf3859f49cd 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 '''
 listen to the SDK for the SFP change event and return to chassis.
 '''
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index b0ddf13f7bb5..38c66ef45739 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #############################################################################
 # Mellanox
 #
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
index 909ec6a8884a..06780627d52e 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 """
 Mellanox
 

From 7e4d42eb887dc3ae3c765d03dffa5ca1b02073fb Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sun, 20 Jun 2021 22:50:32 -0700
Subject: [PATCH 0566/1674] [202012] Pick up BRCM SAI 4.3.3.8 Changes that
 fixed several issues (#7918)

---
 files/build/versions/default/versions-web | 8 +++-----
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 06910a6c63e6..300a7b2f72b7 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -43,10 +43,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=JDFMqPxyb8bJlRG0UFQtpQ3opmP%2FQt%2F08PlMn1RXN%2F4%3D&se=2035-02-03T05%3A59%3A23Z&sp=r==2e8e0d581fdf9748269f63e887afec6b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=tDjHGUadHf9xr%2FcJ8DWYzv%2Fbj%2FDsTA%2FCtdJYsRXpiQQ%3D&se=2035-02-18T05%3A54%3A26Z&sp=r==283fec6dfe348391c573183335ade1b9
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.5-3_amd64.deb?sv=2015-04-05&sr=b&sig=EqEEo7pUSwkzxVidHnbSlENWyJQkqWZZ4JLN%2B1JZsBY%3D&se=2035-02-03T05%3A58%3A49Z&sp=r==5300744d3bdfbe42b5486d540453abf4
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=g2jgs1YZk3CXk4vyY0gaWhHZB9hfJBiHbJ0P0BNHFB4%3D&se=2035-02-18T05%3A53%3A40Z&sp=r==da7afd0d2435dded48dc964c06f57a8a
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=2N3yC%2BDAXt%2BN98V5Qc8cxBV7V%2FE%2B4C%2BYTSzs0d3MIOA%3D&se=2035-02-25T22%3A17%3A52Z&sp=r==8cc8831d91ced4abc4692f4121d03aa7
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=OPgORcuUzFLJdt9VwqnZuRx2TgGUo5tbDIOtpJuoHB4%3D&se=2035-02-25T22%3A17%3A13Z&sp=r==cbbe0dbd85546731993ed135b3480911
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
@@ -61,4 +59,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 7f910eecc286..3f1cfa9e3f91 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.7_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=g2jgs1YZk3CXk4vyY0gaWhHZB9hfJBiHbJ0P0BNHFB4%3D&se=2035-02-18T05%3A53%3A40Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.7_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.8_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=OPgORcuUzFLJdt9VwqnZuRx2TgGUo5tbDIOtpJuoHB4%3D&se=2035-02-25T22%3A17%3A13Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.8_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=tDjHGUadHf9xr%2FcJ8DWYzv%2Fbj%2FDsTA%2FCtdJYsRXpiQQ%3D&se=2035-02-18T05%3A54%3A26Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=2N3yC%2BDAXt%2BN98V5Qc8cxBV7V%2FE%2B4C%2BYTSzs0d3MIOA%3D&se=2035-02-25T22%3A17%3A52Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 8b7091ff512972aceb35545efcfffe12c13afdce Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Sun, 20 Jun 2021 23:11:38 -0700
Subject: [PATCH 0567/1674] Revert some mistakenly merged/pushed code

* Revert "fix"

This reverts commit 93585b0a0af2b3df938327a64b53b1a5cb7c8674.

* Revert "Version control git (#6562)"

This reverts commit 52b87753db36370f123bccce83edcb5ec574dfab.

* Revert "Revert "[files/build/versions]: support reproduceable build for git (#5774)""

This reverts commit 1cb8daf585180a56f8d3c060140464f5523771d9.

* Revert "[files/build/versions]: support reproduceable build for git (#5774)"

This reverts commit 547aa9b2c754a0c736e2cc1522b38b7bfb32dd8f.
---
 .../azure-pipelines-UpgrateVersion.yml        | 55 ++++++++++++++
 Makefile.work                                 |  2 +-
 src/sonic-build-hooks/hooks/git               | 76 -------------------
 3 files changed, 56 insertions(+), 77 deletions(-)
 delete mode 100755 src/sonic-build-hooks/hooks/git

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 9850e51b8c1f..62b188e56a27 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -57,6 +57,14 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     steps:
+    - script: |
+        if [ -z "$(which gh)" ]; then
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0
+          sudo apt-add-repository https://cli.github.com/packages
+          sudo apt update
+          sudo apt install gh
+        fi
+      displayName: 'Install gh'
     - checkout: self
       displayName: 'Checkout code'
     - download: current
@@ -83,6 +91,53 @@ stages:
         done
         git diff files/build/versions
       displayName: 'Freeze Versions'
+    - script: |
+        if [ -z "$GIT_USER" ]; then
+          echo "Skipped to send the pull request, GIT_USER not set."
+          exit 0
+        fi
+        GIT_STATUS=$(git status  --porcelain files/build/versions)
+        if [ -z "$GIT_STATUS" ]; then
+          echo "Skipped to send the pull request, no version change in files/build/versions"
+          exit 0
+        fi
+        if [ ! -d "$HOME" ]; then
+          sudo mkdir -p $HOME
+          sudo chown -R $(id -un):$(id -gn) $HOME
+        fi
+        SOURCE_BRANCH=$(Build.SourceBranch)
+        REPO_NAME=$(Build.Repository.Name)
+        [ -z "$GIT_REPO" ] && GIT_REPO=${REPO_NAME#*/}
+        BRANCH_NAME=repd/versions/${SOURCE_BRANCH#refs/heads/}
+        echo '#!/bin/bash' > git_env_password.sh
+        echo 'echo $GIT_PASSWORD' >> git_env_password.sh
+        chmod a+x git_env_password.sh
+        export GIT_ASKPASS=./git_env_password.sh
+
+        git config user.name $GIT_USER
+        git config credential.https://github.com.username $GIT_USER
+        git add files/build/versions
+        git commit -m "[ci/build]: Upgrade SONiC package versions"
+        git checkout -b $BRANCH_NAME
+        git remote add remote https://github.com/$GIT_USER/$GIT_REPO
+        git push remote HEAD:refs/heads/$BRANCH_NAME -f
+        git branch -u remote/$BRANCH_NAME
+
+        echo $GIT_PASSWORD | gh auth login --with-token
+        TITLE="Upgrade SONiC Versions"
+        BODY="Upgrade SONiC Versions"
+        RET=0
+        if ! gh pr create -t "$TITLE" -b "$BODY" -B $(Build.SourceBranch) -R $(Build.Repository.Name) > pr.log 2>&1; then
+          if ! grep -q "already exists" pr.log; then
+            RET=1
+          fi
+        fi
+        cat pr.log
+        exit $RET
+      env:
+        GIT_USER: $(GIT_USER)
+        GIT_PASSWORD: $(GIT_PASSWORD)
+      displayName: 'Send Pull Request'
     - publish: $(System.DefaultWorkingDirectory)/files/build/versions
       artifact: 'sonic-buildimage.versions'
       displayName: 'Archive SONiC versions'
diff --git a/Makefile.work b/Makefile.work
index 56660f168fe6..1835c8a65651 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -136,7 +136,7 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QE
 $(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
-SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
 
 OVERLAY_MODULE_CHECK := \
diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
deleted file mode 100755
index 644a01d5fe1e..000000000000
--- a/src/sonic-build-hooks/hooks/git
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-parse_config(){
-    . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
-    REAL_COMMAND=$(get_command git)
-
-    version_file=$VERSION_PATH/versions-git
-    new_version_file=$BUILD_VERSION_PATH/versions-git
-
-    MODE_CLONE=0
-    # parse input parameters
-    for i in "$@"
-    do
-        if [[ $i == "clone" ]];then
-            MODE_CLONE=1
-        fi
-    done
-}
-
-get_clone_path(){
-    # get paremater of clone path
-    while (( "$#" )); do
-        case $1 in
-            -b|--branch|--reference|--reference-if-able|-c|--config|--origin|-u|--upload-pack|-j|--jobs|--depth|--dissociate)
-                shift 2
-                ;;
-            clone|-l|--local|--no-hardlinks|-s|--shared|--dissociate|-q|--quiet|-v|--verbose|--progress|--server-option=*|--bare|--sparse|--filter=*|--template=*|--mirror|--reference|--shallow-*|--no-tags|--recurse-submodules*|--remote-submodules|--no-remote-submodules|--separate-git-dir*)
-                shift 1
-                ;;
-            *)
-                if [[ $URL == "" ]];then
-                    URL=$1
-                else
-                    clone_PATH=$1
-                fi
-                shift 1
-                ;;
-        esac
-    done
-
-    # if not specific clone path, get default clone path
-    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
-}
-
-main(){
-    parse_config "$@"
-
-    # execute git.
-    $REAL_COMMAND "$@"
-    result=$?
-
-    # if sub command is not "clone", exit
-    if [[ $MODE_CLONE != 1 ]];then
-        exit $result
-    fi
-
-    get_clone_path "$@"
-    pushd $clone_PATH &> /dev/null
-    commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
-    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
-
-    # control version or record version file
-    if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
-        # control version
-        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
-    else
-        # record version file
-        echo "$URL==$commit_latest" >> $new_version_file
-        sort $new_version_file -o $new_version_file -u &> /dev/null
-    fi
-    popd &> /dev/null
-
-    exit $result
-}
-
-main "$@"

From bfa8549f9be20a0fb30819e12e70b9483e62757d Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Tue, 8 Jun 2021 19:43:00 +0300
Subject: [PATCH 0568/1674] [BFN] Add missed param for syncd-rpc build (#7792)

To fix syncd-rpc build for BFN paltform
---
 .azure-pipelines/azure-pipelines-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index c65eb996e5a0..9c0e7aeeb854 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -45,6 +45,7 @@ jobs:
         - name: barefoot
           variables:
             sync_rpc_image: yes
+            platform_rpc: bfn
             swi_image: yes
 
         - name: broadcom

From 30a05f81b36b87eb78b4b73092c17c0fa6ac9226 Mon Sep 17 00:00:00 2001
From: Andriy Kokhan <43479230+akokhan@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:08:47 +0300
Subject: [PATCH 0569/1674] [Arista] Added pcie.yaml for
 x86_64-arista_7170_32cd (#7788)

Process pcied failed on Arista-7170-32CD-C32
```
root@sonic:/# supervisorctl
chassis_db_init                  EXITED    Jun 03 08:48 AM
dependent-startup                EXITED    Jun 03 08:48 AM
ledd                             RUNNING   pid 28, uptime 3:07:49
lm-sensors                       EXITED    Jun 03 08:48 AM
pcied                            FATAL     Exited too quickly (process log may have details)
```

Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com>
---
 .../arista/x86_64-arista_7170_32cd/pcie.yaml  | 433 ++++++++++++++++++
 1 file changed, 433 insertions(+)
 create mode 100644 device/arista/x86_64-arista_7170_32cd/pcie.yaml

diff --git a/device/arista/x86_64-arista_7170_32cd/pcie.yaml b/device/arista/x86_64-arista_7170_32cd/pcie.yaml
new file mode 100644
index 000000000000..eafae4eb1472
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_32cd/pcie.yaml
@@ -0,0 +1,433 @@
+- bus: '00'
+  dev: '00'
+  fn: '0'
+  id: 6f00
+  name: 'Host bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+    (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 6f02
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '1'
+  id: 6f03
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '0'
+  id: 6f04
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '2'
+  id: 6f06
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '0'
+  id: 6f28
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Map/VTd_Misc/System Management (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '1'
+  id: 6f29
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO Hot Plug (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '2'
+  id: 6f2a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO RAS/Control Status/Global Errors (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '4'
+  id: 6f2c
+  name: 'PIC: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC (rev
+    03)'
+- bus: '00'
+  dev: '14'
+  fn: '0'
+  id: 8c31
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    xHCI (rev 05)'
+- bus: '00'
+  dev: 1a
+  fn: '0'
+  id: 8c2d
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #2 (rev 05)'
+- bus: '00'
+  dev: 1c
+  fn: '0'
+  id: 8c10
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #1 (rev d5)'
+- bus: '00'
+  dev: 1c
+  fn: '4'
+  id: 8c18
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #5 (rev d5)'
+- bus: '00'
+  dev: 1d
+  fn: '0'
+  id: 8c26
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #1 (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '0'
+  id: 8c54
+  name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
+    SKU LPC Controller (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '3'
+  id: 8c22
+  name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
+    (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '6'
+  id: 8c24
+  name: 'Signal processing controller: Intel Corporation 8 Series Chipset Family Thermal
+    Management Controller (rev 05)'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: '1682'
+  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
+    PCIe (rev 20)'
+- bus: '02'
+  dev: '00'
+  fn: '0'
+  id: '1682'
+  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
+    PCIe (rev 20)'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: 6f50
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 0'
+- bus: '03'
+  dev: '00'
+  fn: '1'
+  id: 6f51
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 1'
+- bus: '03'
+  dev: '00'
+  fn: '2'
+  id: 6f52
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 2'
+- bus: '03'
+  dev: '00'
+  fn: '3'
+  id: 6f53
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 3'
+- bus: '04'
+  dev: '00'
+  fn: '0'
+  id: 15ab
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection X552 10 GbE Backplane'
+- bus: '04'
+  dev: '00'
+  fn: '1'
+  id: 15ab
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection X552 10 GbE Backplane'
+- bus: '06'
+  dev: '00'
+  fn: '0'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001'
+- bus: '07'
+  dev: '00'
+  fn: '0'
+  id: '0010'
+  name: 'Unassigned class [ff00]: Device 1d1c:0010 (rev 10)'
+- bus: ff
+  dev: 0b
+  fn: '0'
+  id: 6f81
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '1'
+  id: 6f36
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '2'
+  id: 6f37
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '0'
+  id: 6fe0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '1'
+  id: 6fe1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '0'
+  id: 6ff8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '4'
+  id: 6ffc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '5'
+  id: 6ffd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '6'
+  id: 6ffe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '0'
+  id: 6f1d
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '1'
+  id: 6f34
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '5'
+  id: 6f1e
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '6'
+  id: 6f7d
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '7'
+  id: 6f1f
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '0'
+  id: 6fa0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '1'
+  id: 6f30
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '0'
+  id: 6fa8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '1'
+  id: 6f71
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '2'
+  id: 6faa
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '3'
+  id: 6fab
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '4'
+  id: 6fac
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '5'
+  id: 6fad
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '6'
+  id: 6fae
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Broadcast (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '7'
+  id: 6faf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Global Broadcast (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '0'
+  id: 6fb0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '1'
+  id: 6fb1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '2'
+  id: 6fb2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '3'
+  id: 6fb3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '4'
+  id: 6fbc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '5'
+  id: 6fbd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '6'
+  id: 6fbe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '7'
+  id: 6fbf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '0'
+  id: 6fb4
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '1'
+  id: 6fb5
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '2'
+  id: 6fb6
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Error (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '3'
+  id: 6fb7
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Error (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '0'
+  id: 6f98
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '1'
+  id: 6f99
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '2'
+  id: 6f9a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '3'
+  id: 6fc0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '4'
+  id: 6f9c
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '0'
+  id: 6f88
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '2'
+  id: 6f8a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'

From be7bd73bbb065eb46775e5fcbf69f24d85b4b5d0 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 16 Jun 2021 07:38:02 +0800
Subject: [PATCH 0570/1674] [CI] Fix azp targets for innovium platform (#7870)

There is no rule to build swi target. The correct target is *.bin.
---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 9c0e7aeeb854..40fc9b8054ca 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -74,7 +74,7 @@ jobs:
 
         - name: innovium
           variables:
-            swi_image: yes
+            dbg_image: yes
 
         - name: marvell-armhf
           pool: sonicbld_8c

From 59e5716d2c9a2db4d67ca61bbabed5f34288660a Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 22:06:48 -0700
Subject: [PATCH 0571/1674] Updated 7260 64x100 MMU Profile. (#7849)

What I did:

Updated 7260 MMU Profile based on latest MSFT Tier 1 Tomahawk2_MMU_Setting_48x100G_40m_16x100G_300m_v1.0 and
TH2_PGHdrm_MSFT.

How I verify:
Made sure image is up/traffic is flowing/mmu dump looked fine.
SAI qos test need will be updated to support this SKU.
---
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2    | 16 +++++++++++-----
 .../Arista-7260CX3-C64/pg_profile_lookup.ini     |  9 +++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index 2fff9cbc771b..949e632035cd 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -10,18 +10,22 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            {# SS Tab2 Row 71 #}
+            "size": "33582016",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "7827456"
+            {# SS Tab2 Row 68 #}
+            "xoff": "8965632"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            {# SS Tab2 Row 60 #}
+            "size": "26866112",
             "type": "egress",
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "42349632",
+            {# SS Tab2 Row 56 #}
+            "size": "43481152",
             "type": "egress",
             "mode": "static"
         }
@@ -30,12 +34,14 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
+            {# SS Tab1 Row 9 #}
             "static_th":"44302336"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
-            "static_th":"42349632"
+            {# SS Tab2 Row 56 #}
+            "static_th":"43481152"
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
index ed0005610b71..254e58d3940e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
@@ -1,8 +1,5 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
-  50000  5m   1248    1248 56160    -3        2496
- 100000  5m   1248    1248 96928    -3        2496
-  50000  40m  1248    1248 96096    -3        2496
- 100000  40m  1248    1248 177632   -3        2496
-  50000  300m 1248    1248 141856   -3        2496
- 100000  300m 1248    1248 268736   -3        2496
+ 100000  5m   1248    1248 96928     -3        2496
+ 100000  40m  1248    1248 59696     -3        2496
+ 100000  300m 1248    1248 101088    -3        2496

From 44625215d8ed3fdb8100f0cee435966af26f3b3a Mon Sep 17 00:00:00 2001
From: madhanmellanox <62459540+madhanmellanox@users.noreply.github.com>
Date: Thu, 17 Jun 2021 10:04:38 -0700
Subject: [PATCH 0572/1674] Adding new SKU Mellanox-SN4600C-C4 (#7815)

Add new SKU of SN4600C switch: Mellanox-SN4600c-c64

Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
---
 .../Mellanox-SN4600C-C64/buffers.json.j2      |   1 +
 .../buffers_defaults_t0.j2                    | 112 ++++++++++
 .../buffers_defaults_t1.j2                    | 112 ++++++++++
 .../buffers_dynamic.json.j2                   |   1 +
 .../Mellanox-SN4600C-C64/hwsku.json           | 196 ++++++++++++++++++
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN4600C-C64/port_config.ini      |   1 +
 .../Mellanox-SN4600C-C64/qos.json.j2          |   1 +
 .../Mellanox-SN4600C-C64/sai.profile          |   2 +
 .../Mellanox-SN4600C-C64/sai_4600C.xml        |   1 +
 10 files changed, 428 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_dynamic.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/pg_profile_lookup.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai_4600C.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..03b1f23d94b6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -0,0 +1,112 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '53379072' %}
+{% set ingress_lossy_pool_size =  '1540096' %}
+{% set egress_lossless_pool_size =  '60817408' %}
+{% set egress_lossy_pool_size =  '53379072' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..432f125d6cb5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -0,0 +1,112 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '52723712' %}
+{% set ingress_lossless_pool_xoff =  '2195456' %}
+{% set egress_lossless_pool_size =  '60817408' %}
+{% set egress_lossy_pool_size =  '52723712' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json
new file mode 100644
index 000000000000..b73944cba7a0
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json
@@ -0,0 +1,196 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet8": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet16": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet24": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet32": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet40": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet48": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet56": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet64": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet72": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet80": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet88": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet96": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet104": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet112": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet120": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet128": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet136": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet144": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet152": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet160": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet168": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet176": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet184": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet192": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet200": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet208": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet216": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet224": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet232": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet240": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet248": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet256": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet264": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet272": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet280": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet288": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet296": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet304": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet312": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet320": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet328": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet336": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet344": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet352": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet360": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet368": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet376": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet384": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet392": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet400": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet408": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet416": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet424": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet432": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet440": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet448": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet456": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet464": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet472": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet480": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet488": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet496": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }, 
+        "Ethernet504": {
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
+        }
+    }
+}
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/pg_profile_lookup.ini
new file mode 120000
index 000000000000..49745268908f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/port_config.ini
new file mode 120000
index 000000000000..ff6597161314
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/port_config.ini
@@ -0,0 +1 @@
+../ACS-MSN4600C/port_config.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
new file mode 120000
index 000000000000..eccf286dc879
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
new file mode 100644
index 000000000000..9f075500b86c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai_4600C.xml b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai_4600C.xml
new file mode 120000
index 000000000000..26aa2d41010e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai_4600C.xml
@@ -0,0 +1 @@
+../ACS-MSN4600C/sai_4600C.xml
\ No newline at end of file

From 4123b21a79d86ae8ad2842e7c1e2aece8f43bb1a Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:36:27 -0700
Subject: [PATCH 0573/1674] DellEMC: Update Z9332f reboot reason (#7876)

#### Why I did it
Updated DellEMC Z9332f reboot reason

#### How I did it
Edited chassis.py::get_reboot_cause() to update the reboot reason.
---
 .../z9332f/sonic_platform/chassis.py          | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index bc7e1d793c60..a412122bae48 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -110,6 +110,14 @@ class Chassis(ChassisBase):
             34: 2,
             }
 
+    reboot_reason_dict = { 0x11: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Power on reset"),
+                           0x22: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Soft-set CPU warm reset"),
+                           0x33: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Soft-set CPU cold reset"),
+                           0x66: (ChassisBase.REBOOT_CAUSE_WATCHDOG, "GPIO watchdog reset"),
+                           0x77: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Power cycle reset"),
+                           0x88: (ChassisBase.REBOOT_CAUSE_WATCHDOG, "CPLD watchdog reset")
+                        }
+
     def __init__(self):
         ChassisBase.__init__(self)
         # sfp.py will read eeprom contents and retrive the eeprom data.
@@ -312,22 +320,8 @@ def get_reboot_cause(self):
         except EnvironmentError:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
 
-        if reboot_cause & 0x1:
-            return (self.REBOOT_CAUSE_POWER_LOSS, None)
-        elif reboot_cause & 0x2:
-            return (self.REBOOT_CAUSE_NON_HARDWARE, None)
-        elif reboot_cause & 0x44:
-            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "CPU warm reset")
-        elif reboot_cause & 0x8:
-            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
-        elif reboot_cause & 0x66:
-            return (self.REBOOT_CAUSE_WATCHDOG, None)
-        elif reboot_cause & 0x55:
-            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "CPU cold reset")
-        elif reboot_cause & 0x11:
-            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Power on reset")
-        elif reboot_cause & 0x77:
-            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Power Cycle reset")
+        if reboot_cause in self.reboot_reason_dict.keys():
+            return self.reboot_reason_dict.get(reboot_cause)
         else:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
 

From 2b6c1cd1cb61fd7286629e011417176cef354a21 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:38:54 -0700
Subject: [PATCH 0574/1674] [build_debian.sh] Configure sshd to listen for IPv6
 connections (#7719)

#### Why I did it

To allow SSH connections from IPv6 addresses

Resolves https://github.com/Azure/sonic-buildimage/issues/7668

#### How I did it

In build_debian.sh, modify sshd_config file so as to enable listening for IPv6 connections
---
 build_debian.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 6970bfe3cf3f..a966519a8034 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -389,9 +389,9 @@ set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliv
 save
 quit
 EOF
-# Configure sshd to listen for v4 connections; disable listening for v6 connections
-sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
+# Configure sshd to listen for v4 and v6 connections
 sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
+sudo sed -i 's/^#ListenAddress ::/ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
 
 ## Config rsyslog
 sudo augtool -r $FILESYSTEM_ROOT --autosave "

From b577b32ddd5f2ea78ef87f40ccf8cefd72bf07e2 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:41:39 -0700
Subject: [PATCH 0575/1674] DellEMC: Z9332f update PSU threshold (#7832)

#### Why I did it
Updated Z9332f PSU threshold values.

#### How I did it
Fetch the PSU voltage and temperature threshold via ipmitool
---
 .../z9332f/sonic_platform/psu.py              | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
index a12ecbc65d89..28d62aa0152b 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
@@ -21,11 +21,12 @@ class Psu(PsuBase):
 
     # { PSU-ID: { Sensor-Name: Sensor-ID } }
     SENSOR_MAPPING = { 1: { "State": 0x2f, "Current": 0x37,
-                            "Power": 0x38, "Voltage": 0x36, 
+                            "Power": 0x38, "Voltage": 0x36,
                             "Temperature": 0x35 },
                        2: { "State": 0x39, "Current": 0x41,
-                            "Power": 0x42, "Voltage": 0x40, 
+                            "Power": 0x42, "Voltage": 0x40,
                             "Temperature": 0x3F } }
+
     # ( PSU-ID: FRU-ID }
     FRU_MAPPING = { 1: 3, 2: 4 }
 
@@ -119,13 +120,24 @@ def get_voltage_low_threshold(self):
         """
         Returns PSU low threshold in Volts
         """
-        return 11.4
+        is_valid, low_threshold = self.voltage_sensor.get_threshold("LowerCritical")
+        if not is_valid:
+            low_threshold = 11.4
+        low_threshold = "{:.2f}".format(low_threshold)
+
+        return float(low_threshold)
+
 
     def get_voltage_high_threshold(self):
         """
         Returns PSU high threshold in Volts
         """
-        return 12.6
+        is_valid, high_threshold = self.voltage_sensor.get_threshold("UpperCritical")
+        if not is_valid:
+            high_threshold = 12.6
+        high_threshold = "{:.2f}".format(high_threshold)
+
+        return float(high_threshold)
 
     def get_temperature(self):
         """
@@ -145,7 +157,13 @@ def get_temperature_high_threshold(self):
         """
         Returns the high temperature threshold for PSU in Celsius
         """
-        return 45.0
+        is_valid, high_threshold = self.temp_sensor.get_threshold("UpperCritical")
+        if not is_valid:
+            high_threshold = 113
+        high_threshold = "{:.2f}".format(high_threshold)
+
+        return float(high_threshold)
+
 
     def get_current(self):
         """

From c6282294b9b564efe4886bcb8f9d6bde110ff156 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Sat, 19 Jun 2021 00:02:30 +0530
Subject: [PATCH 0576/1674] [Marvell] Fix system MAC parsing logic for Marvell
 platform. (#7914)

Fixed parsing logic in file "src/sonic-py-common/sonic_py_common/device_info.py"

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 src/sonic-py-common/sonic_py_common/device_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index f486113196fb..52b7900b119b 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -400,7 +400,7 @@ def get_system_mac(namespace=None):
         machine_vars = get_machine_info()
         if machine_vars is not None and machine_key in machine_vars:
             hwsku = machine_vars[machine_key]
-            profile_cmd = 'cat' + HOST_DEVICE_PATH + '/' + platform + '/' + hwsku + '/profile.ini | grep switchMacAddress | cut -f2 -d='
+            profile_cmd = 'cat ' + HOST_DEVICE_PATH + '/' + platform + '/' + hwsku + '/profile.ini | grep switchMacAddress | cut -f2 -d='
         else:
             profile_cmd = "false"
         hw_mac_entry_cmds = ["sudo decode-syseeprom -m", profile_cmd, "ip link show eth0 | grep ether | awk '{print $2}'"]

From d47a035852af93053f79ff60d5b22f97799eead0 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 21 Jun 2021 14:12:25 +0800
Subject: [PATCH 0577/1674] [ci]: build rpc image for mellanox (#7905)

---
 .azure-pipelines/azure-pipelines-build.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 40fc9b8054ca..781983fcb724 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -32,7 +32,8 @@ jobs:
       dbg_image: no
       swi_image: no
       raw_image: no
-      sync_rpc_image: no
+      docker_syncd_rpc_image: no
+      syncd_rpc_image: no
       platform_rpc: no
     ${{ if ne(parameters.jobGroups, '') }}:
       jobGroups: ${{ parameters.jobGroups }}
@@ -44,7 +45,7 @@ jobs:
 
         - name: barefoot
           variables:
-            sync_rpc_image: yes
+            docker_syncd_rpc_image: yes
             platform_rpc: bfn
             swi_image: yes
 
@@ -53,13 +54,13 @@ jobs:
             dbg_image: yes
             swi_image: yes
             raw_image: yes
-            sync_rpc_image: yes
+            docker_syncd_rpc_image: yes
             platform_rpc: brcm
 
         - name: centec
           variables:
             dbg_image: yes
-            sync_rpc_image: yes
+            docker_syncd_rpc_image: yes
             platform_rpc: centec
 
         - name: centec-arm64
@@ -85,13 +86,14 @@ jobs:
         - name: mellanox
           variables:
             dbg_image: yes
-            sync_rpc_image: yes
+            docker_syncd_rpc_image: yes
+            syncd_rpc_image: yes
             platform_rpc: mlnx
 
         - name: nephos
           variables:
             dbg_image: yes
-            sync_rpc_image: yes
+            docker_syncd_rpc_image: yes
             platform_rpc: nephos
 
     buildSteps:
@@ -113,9 +115,13 @@ jobs:
             if [ $(raw_image) == yes ]; then
               make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
             fi
-            if [ $(sync_rpc_image) == yes ]; then
+            if [ $(docker_syncd_rpc_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
             fi
+            if [ $(syncd_rpc_image) == yes ]; then
+              make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/sonic-$(GROUP_NAME).bin
+              mv target/sonic-mellanox.bin target/sonic-$(GROUP_NAME)-rpc.bin
+            fi
             make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
           fi
         displayName: "Build sonic image"

From 873f6a8b920f63ddadb73233d4e699b75aa397a1 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 22 Jun 2021 00:15:42 +0800
Subject: [PATCH 0578/1674] [202012] [sonic-platform-common] Update submodule
 (#7929)

b0dad8c Add to check pcie configuration revision to get the right configuration. (#195)
f66ffc3 [eeprom_tlv_info] Optimize EEPROM data process by using visitor pattern (#193)
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 5f4b2c9054e2..b0dad8c6918c 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 5f4b2c9054e2cdb776ff2f8a36aef1ad35e6cfed
+Subproject commit b0dad8c6918c48cb973396273f071ada66c88d4a

From b4832d40a905ef037d9af1a2c3edd2ebb4449b3a Mon Sep 17 00:00:00 2001
From: andywongarista <78833093+andywongarista@users.noreply.github.com>
Date: Mon, 21 Jun 2021 18:00:01 -0700
Subject: [PATCH 0579/1674] [202012] [Arista] Update platform drivers
 submodules (#7916)

There was an issue on master where `thermal.get_position_in_parent` in the platform API was returning -1 instead of a proper index. This is a backport of the fix for that issue.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index e25beb333451..00c8e731a213 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit e25beb333451b3134e234e63f7b32a8ac4d52a2c
+Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index e25beb333451..00c8e731a213 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit e25beb333451b3134e234e63f7b32a8ac4d52a2c
+Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7

From b128bdc246b07a543ad6f75be22ca37bff718d73 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Tue, 22 Jun 2021 09:33:35 -0400
Subject: [PATCH 0580/1674] Bump sonic-platform-daemons (#7936)

3ab5a04 [xcvrd] Force cleanup of chassis global variable on deinit (#193)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 5d2960f6b1f7..3ab5a04b6aa3 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 5d2960f6b1f7a226f86025d33550767ac7fbe9ad
+Subproject commit 3ab5a04b6aa35230c4c57d9514e4c43055e3756f

From bc796e3ea4e6e94a2a48de75db2cff0c7def7ee4 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Mon, 21 Jun 2021 20:58:26 -0400
Subject: [PATCH 0581/1674] [Nokia ixs7215] Platform API 2.0 improvements
 (#7931)

#### Why I did it
Failures observed when running the open community platform test suite (sonic-mgmt)

#### How I did it
Call PSUBase class initializer from derived class
---
 .../sonic-platform-nokia/7215/sonic_platform/psu.py              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
index 9de9ebec3699..6a338f5a166e 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
@@ -31,6 +31,7 @@ class Psu(PsuBase):
     """Nokia platform-specific PSU class for 7215 """
 
     def __init__(self, psu_index):
+        PsuBase.__init__(self)
         # PSU is 1-based in Nokia platforms
         self.index = psu_index + 1
         self._fan_list = []

From 7d14a60620d2a3cc1c9bdc7cc7cce6bc85f441bd Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Tue, 22 Jun 2021 09:49:49 -0700
Subject: [PATCH 0582/1674] [ci]: bump up build timeout to 48 hours for armhf
 and arm64

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/azure-pipelines-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 781983fcb724..b758fb5da097 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -65,7 +65,7 @@ jobs:
 
         - name: centec-arm64
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: arm64
             BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
@@ -79,7 +79,7 @@ jobs:
 
         - name: marvell-armhf
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: armhf
             BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=

From ccb663c39bfc4d99ce7f9073907408460efbfeb3 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 23 Jun 2021 23:09:53 +0800
Subject: [PATCH 0583/1674] [Mellanox] [202012] Backport 'Read EEPROM data from
 DB if possible'(7808) to 202012 (#7928)

- Why I did it
Remove EEPROM cache file and use DB instead

- How I did it
Read EEPROM data from DB if possible
If data is not ready in DB, read from hardware using a visitor pattern

- How to verify it
Manual test and regression
---
 .../sonic_platform/eeprom.py                  | 202 +++++++-----------
 .../mlnx-platform-api/sonic_platform/utils.py |  47 ++++
 2 files changed, 130 insertions(+), 119 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
index ef13bbd89e27..da6b70f7890e 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
@@ -6,15 +6,8 @@
 #
 #############################################################################
 import os
-import sys
-import re
 import time
 
-if sys.version_info.major == 3:
-    from io import StringIO
-else:
-    from cStringIO import StringIO
-
 from sonic_py_common.logger import Logger
 
 try:
@@ -22,16 +15,9 @@
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
-logger = Logger()
+from .utils import default_return
 
-#
-# CACHE_XXX stuffs are supposted to be moved to the base classes
-# since they are common for all vendors
-# they are defined in decode-syseeprom which might be removed in the future
-# currently we just copy them here
-#
-CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
-CACHE_FILE = 'syseeprom_cache'
+logger = Logger()
 
 #
 # this is mlnx-specific
@@ -41,10 +27,6 @@
 
 class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
     RETRIES = 3
-    EEPROM_DECODE_HEADLINES = 6
-    EEPROM_DECODE_MAXITEM = 3
-    EEPROM_DECODE_OFFSET = 0
-    EEPROM_DECODE_CONTENT = 2
 
     def __init__(self):
         for attempt in range(self.RETRIES):
@@ -53,95 +35,15 @@ def __init__(self):
             else:
                 break  
 
-        if not (os.path.exists(EEPROM_SYMLINK) \
-                or os.path.isfile(os.path.join(CACHE_ROOT, CACHE_FILE))):
-            log_error("Nowhere to read syseeprom from! No symlink or cache file found")
+        if not os.path.exists(EEPROM_SYMLINK):
+            logger.log_error("Nowhere to read syseeprom from! No symlink or cache file found")
             raise RuntimeError("No syseeprom symlink or cache file found")
 
         self.eeprom_path = EEPROM_SYMLINK
         super(Eeprom, self).__init__(self.eeprom_path, 0, '', True)
-        self._eeprom_loaded = False
-        self._load_eeprom()
-        self._eeprom_loaded = True
-
-    def _load_eeprom(self):
-        cache_file = os.path.join(CACHE_ROOT, CACHE_FILE)
-        if not os.path.exists(CACHE_ROOT):
-            try:
-                os.makedirs(CACHE_ROOT)
-            except:
-                pass
-        else:
-            try:
-                # Make sure first time always read eeprom data from hardware
-                if os.path.exists(cache_file):
-                    os.remove(cache_file)
-            except Exception as e:
-                logger.log_error('Failed to remove cache file {} - {}'.format(cache_file, repr(e)))
-
-        try:
-            self.set_cache_name(cache_file)
-        except:
-            pass
-
-        eeprom = self.read_eeprom()
-        if eeprom is None :
-            return 0
-
-        try:
-            self.update_cache(eeprom)
-        except:
-            pass
-
-        self._base_mac = self.mgmtaddrstr(eeprom)
-        if self._base_mac is None:
-            self._base_mac = "Undefined."
-        else:
-            self._base_mac = self._base_mac.strip('\0')
-
-        self._serial_str = self.serial_number_str(eeprom)
-        if self._serial_str is None:
-            self._serial_str = "Undefined."
-        else:
-            self._serial_str = self._serial_str.strip('\0')
-
-        self._product_name = self.modelstr(eeprom)
-        if self._product_name is None:
-            self._product_name = "Undefined."
-        else:
-            self._product_name = self._product_name.strip('\0')
-
-        self._part_number = self.part_number_str(eeprom)
-        if self._part_number is None:
-            self._part_number = "Undefined."
-        else:
-            self._part_number = self._part_number.strip('\0')
-
-        original_stdout = sys.stdout
-        sys.stdout = StringIO()
-        self.decode_eeprom(eeprom)
-        decode_output = sys.stdout.getvalue()
-        sys.stdout = original_stdout
-
-        #parse decode_output into a dictionary
-        decode_output.replace('\0', '')
-        lines = decode_output.split('\n')
-        lines = lines[self.EEPROM_DECODE_HEADLINES:]
-        self._eeprom_info_dict = dict()
-
-        for line in lines:
-            try:
-                match = re.search('(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+[\s]*[\S]*)', line)
-                if match is not None:
-                    idx = match.group(1)
-                    value = match.group(3).rstrip('\0')
-
-                self._eeprom_info_dict[idx] = value
-            except:
-                pass
-
-        return 0
+        self._eeprom_info_dict = None
 
+    @default_return(return_value='Undefined.')
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the chassis
@@ -150,10 +52,9 @@ def get_base_mac(self):
             A string containing the MAC address in the format
             'XX:XX:XX:XX:XX:XX'
         """
-        if not self._eeprom_loaded:
-            self._load_eeprom()
-        return self._base_mac
-
+        return self._get_eeprom_value(self._TLV_CODE_MAC_BASE)
+        
+    @default_return(return_value='Undefined.')
     def get_serial_number(self):
         """
         Retrieves the hardware serial number for the chassis
@@ -161,10 +62,9 @@ def get_serial_number(self):
         Returns:
             A string containing the hardware serial number for this chassis.
         """
-        if not self._eeprom_loaded:
-            self._load_eeprom()
-        return self._serial_str
+        return self._get_eeprom_value(self._TLV_CODE_SERIAL_NUMBER)
 
+    @default_return(return_value='Undefined.')
     def get_product_name(self):
         """
         Retrieves the hardware product name for the chassis
@@ -172,10 +72,9 @@ def get_product_name(self):
         Returns:
             A string containing the hardware product name for this chassis.
         """
-        if not self._eeprom_loaded:
-            self._load_eeprom()
-        return self._product_name
+        return self._get_eeprom_value(self._TLV_CODE_PRODUCT_NAME)
 
+    @default_return(return_value='Undefined.')
     def get_part_number(self):
         """
         Retrieves the hardware part number for the chassis
@@ -183,10 +82,9 @@ def get_part_number(self):
         Returns:
             A string containing the hardware part number for this chassis.
         """
-        if not self._eeprom_loaded:
-            self._load_eeprom()
-        return self._part_number
+        return self._get_eeprom_value(self._TLV_CODE_PART_NUMBER)
 
+    @default_return({})
     def get_system_eeprom_info(self):
         """
         Retrieves the full content of system EEPROM information for the chassis
@@ -196,6 +94,72 @@ def get_system_eeprom_info(self):
             OCP ONIE TlvInfo EEPROM format and values are their corresponding
             values.
         """
-        if not self._eeprom_loaded:
-            self._load_eeprom()
+        if self._eeprom_info_dict is None:
+            self._eeprom_info_dict = {}
+
+            # Try get from DB first
+            db_initialized = self._redis_hget('EEPROM_INFO|State', 'Initialized')
+            if db_initialized == '1':
+                code = self._TLV_CODE_PRODUCT_NAME
+                while code <= self._TLV_CODE_SERVICE_TAG:
+                    value = self._redis_hget('EEPROM_INFO|{}'.format(hex(code)), 'Value')
+                    if value:
+                        self._eeprom_info_dict[hex(code)] = value
+                    code += 1
+
+                # Handle vendor extension TLV
+                vendor_extension_tlv_code = hex(self._TLV_CODE_VENDOR_EXT)
+                try:
+                    vendor_extension_num = int(self._redis_hget('EEPROM_INFO|{}'.format(vendor_extension_tlv_code), 'Num_vendor_ext'))
+                except (ValueError, TypeError):
+                    vendor_extension_num = 0
+
+                if vendor_extension_num != 0:
+                    for i in range(vendor_extension_num):
+                        value = self._redis_hget('EEPROM_INFO|{}'.format(vendor_extension_tlv_code), 'Value_{}'.format(i))
+                        if value:
+                            if vendor_extension_tlv_code not in self._eeprom_info_dict:
+                                self._eeprom_info_dict[vendor_extension_tlv_code] = [value]
+                            else:
+                                self._eeprom_info_dict[vendor_extension_tlv_code].append(value)
+            
+                # Get CRC 
+                value = self._redis_hget('EEPROM_INFO|{}'.format(hex(self._TLV_CODE_CRC_32)), 'Value')
+                if value:
+                    self._eeprom_info_dict[hex(self._TLV_CODE_CRC_32)] = value
+            else:
+                eeprom = self.read_eeprom()
+                visitor = EepromContentVisitor(self._eeprom_info_dict)
+                self.visit_eeprom(eeprom, visitor)
         return self._eeprom_info_dict
+
+    def _get_eeprom_value(self, code):
+        """Helper function to help get EEPROM data by code
+
+        Args:
+            code (int): EEPROM TLV code
+
+        Returns:
+            str: value of EEPROM TLV
+        """
+        eeprom_info_dict = self.get_system_eeprom_info()
+        return eeprom_info_dict[hex(code)]
+
+
+class EepromContentVisitor(eeprom_tlvinfo.EepromDefaultVisitor):
+    def __init__(self, content):
+        self.content = content
+
+    def visit_tlv(self, name, code, length, value):
+        if code != Eeprom._TLV_CODE_VENDOR_EXT:
+            self.content[hex(code)] = value.rstrip('\0')
+        else:
+            if value:
+                value = value.rstrip('\0')
+                if value:
+                    code = hex(code)
+                    if code not in self.content:
+                        self.content[code] = [value]
+                    else:
+                        self.content[code].append(value)
+
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/utils.py b/platform/mellanox/mlnx-platform-api/sonic_platform/utils.py
index d5175acf8d0e..cee6d27b63fa 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/utils.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/utils.py
@@ -1,3 +1,10 @@
+import functools
+import subprocess
+
+# flags to indicate whether this process is running in docker or host
+_is_host = None
+
+
 def read_str_from_file(file_path, default='', raise_exception=False):
     """
     Read string content from file
@@ -55,3 +62,43 @@ def write_file(file_path, content, raise_exception=False):
         else:
             raise e
     return True
+
+
+def is_host():
+    """
+    Test whether current process is running on the host or an docker
+    return True for host and False for docker
+    """
+    global _is_host
+    if _is_host is not None:
+        return _is_host
+        
+    _is_host = False
+    try:
+        proc = subprocess.Popen("docker --version 2>/dev/null", 
+                                stdout=subprocess.PIPE, 
+                                shell=True, 
+                                stderr=subprocess.STDOUT, 
+                                universal_newlines=True)
+        stdout = proc.communicate()[0]
+        proc.wait()
+        result = stdout.rstrip('\n')
+        if result != '':
+            _is_host = True
+
+    except OSError as e:
+        pass
+
+    return _is_host
+
+
+def default_return(return_value):
+    def wrapper(method):
+        @functools.wraps(method)
+        def _impl(*args, **kwargs):
+            try:
+                return method(*args, **kwargs)
+            except:
+                return return_value
+        return _impl
+    return wrapper

From b9d21a5779fc3dc9cc58367dacceabf1ab47dbab Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:44:33 +0300
Subject: [PATCH 0584/1674] Update SAI submodule (#7926)

- Why I did it
Split and bulk counter bug fixes:
Init port auto neg to default on static (SAI XML) port split for 2nd+ port

- How I did it
Update submodule hash pointer.

- How to verify it
Verify the above is handled properly and reported issues are assumed to be fixed.

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 8f654f4413d5..0996474288e7 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 8f654f4413d5a73be2bce394ce1fdeecd43e77fa
+Subproject commit 0996474288e720a251e355d0bc7ce32ecce79410

From 48e0461c7e1f6b0b0851fc16df915997284e27c2 Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Thu, 24 Jun 2021 06:11:57 +0800
Subject: [PATCH 0585/1674] [as5835-54x] Add api2 and modify sfp.py to 202012br
 (#7951)

Add platform API 2.0 support for as5835-54x platform to 202012 branch

Signed-off-by: Jostar Yang <jostar_yang@accton.com.tw>
---
 .../sonic_platform/__init__.py                |    2 +
 .../sonic_platform/chassis.py                 |  214 +++
 .../sonic_platform/component.py               |  128 ++
 .../sonic_platform/eeprom.py                  |  131 ++
 .../sonic_platform/eeprom.py.bak              |  131 ++
 .../sonic_platform/event.py                   |   55 +
 .../sonic_platform/fan.py                     |  247 ++++
 .../sonic_platform/helper.py                  |  117 ++
 .../sonic_platform/platform.py                |   21 +
 .../sonic_platform/psu.py                     |  253 ++++
 .../sonic_platform/sfp.py                     | 1255 +++++++++++++++++
 .../sonic_platform/thermal.py                 |  150 ++
 .../as5835-54x/sonic_platform_setup.py        |   34 +
 .../utils/accton_as5835_54x_util.py           |   46 +
 .../sonic-platform-accton-as5835-54x.install  |    3 +
 15 files changed, 2787 insertions(+)
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/event.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/platform.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/as5835-54x/sonic_platform_setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as5835-54x.install

diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
new file mode 100644
index 000000000000..43435472a423
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+from . import platform
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
new file mode 100644
index 000000000000..11c7ebda6bd8
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
@@ -0,0 +1,214 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Chassis information which are available in the platform
+#
+#############################################################################
+
+import os
+import sys
+
+try:
+    from sonic_platform_base.chassis_base import ChassisBase
+    from .helper import APIHelper
+    from .event import SfpEvent
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN_TRAY = 5
+NUM_FAN = 2
+NUM_PSU = 2
+NUM_THERMAL = 4
+NUM_QSFP = 54
+PORT_START = 1
+PORT_END = 54
+NUM_COMPONENT = 4
+HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
+PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
+REBOOT_CAUSE_FILE = "reboot-cause.txt"
+PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+
+class Chassis(ChassisBase):
+    """Platform-specific Chassis class"""
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self._api_helper = APIHelper()
+        self._api_helper = APIHelper()
+        self.is_host = self._api_helper.is_host()
+        
+        self.config_data = {}
+        
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
+        self.__initialize_sfp()
+        self.__initialize_eeprom()
+    
+    def __initialize_sfp(self):
+        from sonic_platform.sfp import Sfp
+        for index in range(0, PORT_END):
+            sfp = Sfp(index)
+            self._sfp_list.append(sfp)
+        self.sfp_module_initialized = True
+        
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fant_index in range(0, NUM_FAN_TRAY):
+            for fan_index in range(0, NUM_FAN):
+                fan = Fan(fant_index, fan_index)
+                self._fan_list.append(fan)
+                
+    def __initialize_psu(self):
+        from sonic_platform.psu import Psu
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+    
+    def __initialize_thermals(self):
+        from sonic_platform.thermal import Thermal
+        for index in range(0, NUM_THERMAL):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+    
+    def __initialize_eeprom(self):
+        from sonic_platform.eeprom import Tlv
+        self._eeprom = Tlv()
+
+    def __initialize_components(self):
+        from sonic_platform.component import Component
+        for index in range(0, NUM_COMPONENT):
+            component = Component(index)
+            self._component_list.append(component)
+    
+    def __initialize_watchdog(self):
+        from sonic_platform.watchdog import Watchdog
+        self._watchdog = Watchdog()
+    
+    
+    def __is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        
+        return self._api_helper.hwsku
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Chassis
+        Returns:
+            bool: True if Chassis is present, False if not
+        """
+        return True
+    
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+    
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.get_mac()
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._eeprom.get_pn()
+        
+    def get_serial(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.get_eeprom()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        
+        reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
+        sw_reboot_cause = self._api_helper.read_txt_file(
+            reboot_cause_path) or "Unknown"
+
+
+        return ('REBOOT_CAUSE_NON_HARDWARE', sw_reboot_cause)
+
+    def get_change_event(self, timeout=0):
+        # SFP event
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        status, sfp_event = SfpEvent(self._sfp_list).get_sfp_event(timeout)
+        
+        return status, sfp_event
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+            The index should be the sequence of a physical port in a chassis,
+            starting from 1.
+            For example, 1 for Ethernet0, 2 for Ethernet4 and so on.
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+        if not self.sfp_module_initialized:
+            self.__initialize_sfp()
+
+        try:
+            # The index will start from 1
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
new file mode 100644
index 000000000000..53ece8d22825
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
@@ -0,0 +1,128 @@
+#############################################################################
+# Edgecore
+#
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
+#
+#############################################################################
+
+import shlex
+import subprocess
+
+
+try:
+    from sonic_platform_base.component_base import ComponentBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_ADDR_MAPPING = {
+    "CPLD1": "3-0060",
+    "CPLD2": "3-0061",
+    "CPLD3": "3-0062",
+}
+SYSFS_PATH = "/sys/bus/i2c/devices/"
+BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
+COMPONENT_LIST= [
+   ("CPLD1", "CPLD 1"),
+   ("CPLD2", "CPLD 2"),
+   ("CPLD3", "CPLD 3"),
+   ("BIOS", "Basic Input/Output System")
+   
+]
+COMPONENT_DES_LIST = ["CPLD","Basic Input/Output System"]
+
+
+class Component(ComponentBase):
+    """Platform-specific Component class"""
+
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_index=0):
+        self._api_helper=APIHelper()
+        ComponentBase.__init__(self)
+        self.index = component_index
+        self.name = self.get_name()
+
+
+    def __run_command(self, command):
+        # Run bash command and print output to stdout
+        try:
+            process = subprocess.Popen(
+                shlex.split(command), stdout=subprocess.PIPE)
+            while True:
+                output = process.stdout.readline()
+                if output == '' and process.poll() is not None:
+                    break
+            rc = process.poll()
+            if rc != 0:
+                return False
+        except Exception:
+            return False
+        return True
+
+    def __get_bios_version(self):
+        # Retrieves the BIOS firmware version
+        try:
+            with open(BIOS_VERSION_PATH, 'r') as fd:
+                bios_version = fd.read()
+                return bios_version.strip()
+        except Exception as e:    
+            print('Get exception when read bios')
+        return None
+
+    def __get_cpld_version(self):
+        # Retrieves the CPLD firmware version
+        cpld_version = dict()
+        for cpld_name in CPLD_ADDR_MAPPING:            
+            try:
+                cpld_path = "{}{}{}".format(SYSFS_PATH, CPLD_ADDR_MAPPING[cpld_name], '/version')
+                cpld_version_raw= self._api_helper.read_txt_file(cpld_path)
+                cpld_version[cpld_name] = "{}".format(int(cpld_version_raw,16))
+            except Exception as e:
+                print('Get exception when read cpld')
+                cpld_version[cpld_name] = 'None'
+        
+        return cpld_version
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+         Returns:
+            A string containing the name of the component
+        """
+        return COMPONENT_LIST[self.index][0]
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+            Returns:
+            A string containing the description of the component
+        """
+        return COMPONENT_LIST[self.index][1]
+        #return "testhwsku"
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of module
+        Returns:
+            string: The firmware versions of the module
+        """
+        fw_version = None
+        if self.name == "BIOS":
+            fw_version = self.__get_bios_version()
+        elif "CPLD" in self.name:
+            cpld_version = self.__get_cpld_version()
+            fw_version = cpld_version.get(self.name)
+
+        return fw_version
+
+    def install_firmware(self, image_path):
+        """
+        Install firmware to module
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        raise NotImplementedError
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..eba070a9e9b5
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py
@@ -0,0 +1,131 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+    
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+NULL = 'N/A'
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+
+    def _valid_tlv(self, eeprom_data):
+        tlvinfo_type_codes_list = [
+            self._TLV_CODE_PRODUCT_NAME,
+            self._TLV_CODE_PART_NUMBER,
+            self._TLV_CODE_SERIAL_NUMBER,
+            self._TLV_CODE_MAC_BASE,
+            self._TLV_CODE_MANUF_DATE,
+            self._TLV_CODE_DEVICE_VERSION,
+            self._TLV_CODE_LABEL_REVISION,
+            self._TLV_CODE_PLATFORM_NAME,
+            self._TLV_CODE_ONIE_VERSION,
+            self._TLV_CODE_MAC_SIZE,
+            self._TLV_CODE_MANUF_NAME,
+            self._TLV_CODE_MANUF_COUNTRY,
+            self._TLV_CODE_VENDOR_NAME,
+            self._TLV_CODE_DIAG_VERSION,
+            self._TLV_CODE_SERVICE_TAG,
+            self._TLV_CODE_VENDOR_EXT,
+            self._TLV_CODE_CRC_32
+        ]
+
+        for code in tlvinfo_type_codes_list:
+            code_str = "0x{:X}".format(code)
+            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
+        return eeprom_data
+
+    def get_eeprom(self):
+        return self._valid_tlv(self._eeprom)
+
+    def get_pn(self):
+        return self._eeprom.get('0x22', NULL)
+
+    def get_serial(self):
+        return self._eeprom.get('0x23', NULL)
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', NULL)
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
new file mode 100644
index 000000000000..f3bdcbccad3f
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
@@ -0,0 +1,131 @@
+try:
+    import os
+    import sys
+    import re
+    if sys.version_info[0] >= 3:
+        from io import StringIO
+    else:
+        from cStringIO import StringIO
+    
+    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
+CACHE_FILE = 'syseeprom_cache'
+NULL = 'N/A'
+
+class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
+
+    EEPROM_DECODE_HEADLINES = 6
+
+    def __init__(self):
+        self._eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
+        self._eeprom = self._load_eeprom()
+
+    def __parse_output(self, decode_output):
+        decode_output.replace('\0', '')
+        lines = decode_output.split('\n')
+        lines = lines[self.EEPROM_DECODE_HEADLINES:]
+        _eeprom_info_dict = dict()
+
+        for line in lines:
+            try:
+                match = re.search(
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                if match is not None:
+                    idx = match.group(1)
+                    value = match.group(3).rstrip('\0')
+
+                _eeprom_info_dict[idx] = value
+            except Exception:
+                pass
+
+        return _eeprom_info_dict
+
+    def _load_eeprom(self):
+        original_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            self.read_eeprom_db()
+        except Exception:
+            decode_output = sys.stdout.getvalue()
+            sys.stdout = original_stdout
+            return self.__parse_output(decode_output)
+
+        status = self.check_status()
+        if 'ok' not in status:
+            return False
+
+        if not os.path.exists(CACHE_ROOT):
+            try:
+                os.makedirs(CACHE_ROOT)
+            except Exception:
+                pass
+
+        #
+        # only the eeprom classes that inherit from eeprom_base
+        # support caching. Others will work normally
+        #
+        try:
+            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
+        except Exception:
+            pass
+
+        e = self.read_eeprom()
+        if e is None:
+            return 0
+
+        try:
+            self.update_cache(e)
+        except Exception:
+            pass
+
+        self.decode_eeprom(e)
+        decode_output = sys.stdout.getvalue()
+        sys.stdout = original_stdout
+
+        (is_valid, valid_crc) = self.is_checksum_valid(e)
+        if not is_valid:
+            return False
+
+        return self.__parse_output(decode_output)
+
+    def _valid_tlv(self, eeprom_data):
+        tlvinfo_type_codes_list = [
+            self._TLV_CODE_PRODUCT_NAME,
+            self._TLV_CODE_PART_NUMBER,
+            self._TLV_CODE_SERIAL_NUMBER,
+            self._TLV_CODE_MAC_BASE,
+            self._TLV_CODE_MANUF_DATE,
+            self._TLV_CODE_DEVICE_VERSION,
+            self._TLV_CODE_LABEL_REVISION,
+            self._TLV_CODE_PLATFORM_NAME,
+            self._TLV_CODE_ONIE_VERSION,
+            self._TLV_CODE_MAC_SIZE,
+            self._TLV_CODE_MANUF_NAME,
+            self._TLV_CODE_MANUF_COUNTRY,
+            self._TLV_CODE_VENDOR_NAME,
+            self._TLV_CODE_DIAG_VERSION,
+            self._TLV_CODE_SERVICE_TAG,
+            self._TLV_CODE_VENDOR_EXT,
+            self._TLV_CODE_CRC_32
+        ]
+
+        for code in tlvinfo_type_codes_list:
+            code_str = "0x{:X}".format(code)
+            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
+        return eeprom_data
+
+    def get_eeprom(self):
+        return self._valid_tlv(self._eeprom)
+
+    def get_pn(self):
+        return self._eeprom.get('0x22', NULL)
+        
+    def get_serial(self):
+        return self._eeprom.get('0x23', NULL)
+
+    def get_mac(self):
+        return self._eeprom.get('0x24', NULL)
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/event.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/event.py
new file mode 100644
index 000000000000..d77ee8c29dc5
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/event.py
@@ -0,0 +1,55 @@
+try:
+    import time
+    from .helper import APIHelper
+    from sonic_py_common.logger import Logger
+except ImportError as e:
+    raise ImportError(repr(e) + " - required module not found")
+
+
+class SfpEvent:
+    ''' Listen to insert/remove sfp events '''
+   
+    def __init__(self, sfp_list):
+        self._api_helper = APIHelper()
+        self._sfp_list = sfp_list
+        self._logger = Logger()
+
+    sfp_change_event_data = {'valid': 0, 'last': 0, 'present': 0}
+    def get_sfp_event(self, timeout=2000):
+        now = time.time()
+        port_dict = {}
+        change_dict = {}
+        change_dict['sfp'] = port_dict
+
+        if timeout < 1000:
+            timeout = 1000
+        timeout = timeout / float(1000)  # Convert to secs
+
+        if now < (self.sfp_change_event_data['last'] + timeout) and self.sfp_change_event_data['valid']:
+            return True, change_dict
+        
+        bitmap = 0
+        for sfp in self._sfp_list:
+            modpres = sfp.get_presence()
+            i=sfp.port_num-1
+            if modpres:
+                bitmap = bitmap | (1 << i)
+
+        changed_ports = self.sfp_change_event_data['present'] ^ bitmap
+        if changed_ports:
+            for sfp in self._sfp_list:
+                i=sfp.port_num-1
+                if (changed_ports & (1 << i)):
+                    if (bitmap & (1 << i)) == 0:
+                        port_dict[i+1] = '0'
+                    else:
+                        port_dict[i+1] = '1'
+
+
+            # Update the cache dict
+            self.sfp_change_event_data['present'] = bitmap
+            self.sfp_change_event_data['last'] = now
+            self.sfp_change_event_data['valid'] = 1
+            return True, change_dict
+        else:
+            return True, change_dict
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
new file mode 100644
index 000000000000..6ed25df58d36
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
@@ -0,0 +1,247 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PSU_FAN_MAX_RPM = 26688
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/3-0063/fan"
+PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "58"
+    },
+    1: {
+        "num": 12,
+        "addr": "5b"
+    },
+}
+
+FAN_NAME_LIST = ["FAN-1F", "FAN-1R", "FAN-2F", "FAN-2R",
+                 "FAN-3F", "FAN-3R", "FAN-4F", "FAN-4R", 
+                 "FAN-5F", "FAN-5R"]
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        self._api_helper=APIHelper()
+        self.fan_index = fan_index
+        self.fan_tray_index = fan_tray_index
+        self.is_psu_fan = is_psu_fan
+        if self.is_psu_fan:
+            self.psu_index = psu_index
+            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+        
+        FanBase.__init__(self)
+        
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        
+
+        if not self.is_psu_fan:
+            dir_str = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_direction')
+            val=self._api_helper.read_txt_file(dir_str)
+            if val is not None:                
+                if int(val, 10)==0:
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+        else: #For PSU
+            dir_str = "{}{}".format(self.psu_hwmon_path,'psu_fan_dir')
+            
+            val=self._api_helper.read_txt_file(dir_str)
+
+            if val is not None: 
+                if val=='F2B':
+                    direction=self.FAN_DIRECTION_EXHAUST
+                else:
+                    direction=self.FAN_DIRECTION_INTAKE
+            else:
+                direction=self.FAN_DIRECTION_EXHAUST
+                
+        return direction
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+
+        """
+        speed = 0
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
+            fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
+            if fan_speed_rpm is not None:
+                speed = (int(fan_speed_rpm,10))*100/26688               
+                if speed > 100:
+                    speed=100
+            else:
+                return 0
+        elif self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            speed=self._api_helper.read_txt_file(speed_path)
+            if speed is None:
+                return 0
+            	
+        return int(speed)
+            
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+
+        Note:
+            speed_pc = pwm_target/255*100
+
+            0   : when PWM mode is use
+            pwm : when pwm mode is not use
+        """
+        return False #Not supported
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return False #Not supported
+
+    def set_speed(self, speed):
+        """
+        Sets the fan speed
+        Args:
+            speed: An integer, the percentage of full fan speed to set fan to,
+                   in the range 0 (off) to 100 (full speed)
+        Returns:
+            A boolean, True if speed is set successfully, False if not
+
+        """
+        
+        if not self.is_psu_fan and self.get_presence():            
+            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            return self._api_helper.write_txt_file(speed_path, int(speed))
+
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return False #Not supported
+   
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status=self.get_presence()
+        if status is None:
+            return  self.STATUS_LED_COLOR_OFF
+
+        return {
+            1: self.STATUS_LED_COLOR_GREEN,
+            0: self.STATUS_LED_COLOR_RED            
+        }.get(status, self.STATUS_LED_COLOR_OFF)
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        fan_name = FAN_NAME_LIST[self.fan_tray_index*2 + self.fan_index] \
+            if not self.is_psu_fan \
+            else "PSU-{} FAN-{}".format(self.psu_index+1, self.fan_index+1)
+
+        return fan_name
+            
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        present_path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_present')
+        val=self._api_helper.read_txt_file(present_path)
+
+        if not self.is_psu_fan:
+            if val is not None:
+                return int(val, 10)==1
+            else:
+                return False
+            
+        else:
+            return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.is_psu_fan:
+            psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_fault')
+            val=self._api_helper.read_txt_file(psu_fan_path)
+            if val is not None:
+                return int(val, 10)==0
+            else:
+                return False
+        else:    
+            path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_fault')
+            val=self._api_helper.read_txt_file(path)
+            if val is not None:
+                return int(val, 10)==0
+            else:
+                return False
+
+    
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+               
+        return "N/A"
+    
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return "N/A"
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
new file mode 100644
index 000000000000..4cd60ac90611
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
@@ -0,0 +1,117 @@
+import os
+import struct
+import subprocess
+from mmap import *
+from sonic_py_common import device_info
+
+HOST_CHK_CMD = "docker > /dev/null 2>&1"
+EMPTY_STRING = ""
+
+
+class APIHelper():
+
+    def __init__(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def is_host(self):
+        return os.system(HOST_CHK_CMD) == 0
+
+    def pci_get_value(self, resource, offset):
+        status = True
+        result = ""
+        try:
+            fd = os.open(resource, os.O_RDWR)
+            mm = mmap(fd, 0)
+            mm.seek(int(offset))
+            read_data_stream = mm.read(4)
+            result = struct.unpack('I', read_data_stream)
+        except Exception:
+            status = False
+        return status, result
+
+    def run_command(self, cmd):
+        status = True
+        result = ""
+        try:
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+        except Exception:
+            status = False
+        return status, result
+
+    def run_interactive_command(self, cmd):
+        try:
+            os.system(cmd)
+        except Exception:
+            return False
+        return True
+
+    def read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return None
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except IOError:
+            return False
+        return True
+
+    def ipmi_raw(self, netfn, cmd):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_fru_id(self, id, key=None):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool fru print {}".format(str(
+                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
+
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
+
+    def ipmi_set_ss_thres(self, id, threshold_key, value):
+        status = True
+        result = ""
+        try:
+            cmd = "ipmitool sensor thresh '{}' {} {}".format(str(id), str(threshold_key), str(value))
+            p = subprocess.Popen(
+                cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                result = raw_data.strip()
+            else:
+                status = False
+        except Exception:
+            status = False
+        return status, result
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/platform.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/platform.py
new file mode 100644
index 000000000000..2f2c2a447fcf
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/platform.py
@@ -0,0 +1,21 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """Platform-specific Platform class"""
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
new file mode 100644
index 000000000000..a35febb6527a
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
@@ -0,0 +1,253 @@
+#############################################################################
+# Edgecore
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+#import sonic_platform
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    #from sonic_platform.fan import Fan
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+I2C_PATH ="/sys/bus/i2c/devices/{0}-00{1}/"
+
+PSU_NAME_LIST = ["PSU-1", "PSU-2"]
+PSU_NUM_FAN = [1, 1]
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "58"
+    },
+    1: {
+        "num": 12,
+        "addr": "5b"
+    },
+}
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "50"
+    },
+    1: {
+        "num": 12,
+        "addr": "53"
+    },
+}
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+
+    def __init__(self, psu_index=0):
+        PsuBase.__init__(self)
+        self.index = psu_index
+        self._api_helper = APIHelper()
+       
+        self.i2c_num = PSU_HWMON_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_HWMON_I2C_MAPPING[self.index]["addr"]
+        self.hwmon_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        
+        self.i2c_num = PSU_CPLD_I2C_MAPPING[self.index]["num"]
+        self.i2c_addr = PSU_CPLD_I2C_MAPPING[self.index]["addr"]
+        self.cpld_path = I2C_PATH.format(self.i2c_num, self.i2c_addr)
+        self.__initialize_fan()
+
+    def __initialize_fan(self):
+        from sonic_platform.fan import Fan
+        for fan_index in range(0, PSU_NUM_FAN[self.index]):
+            fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
+            self._fan_list.append(fan)
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_v_out')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        iout_path = "{}{}".format(self.hwmon_path, 'psu_i_out')        
+        val=self._api_helper.read_txt_file(iout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        pout_path = "{}{}".format(self.hwmon_path, 'psu_p_out')        
+        val=self._api_helper.read_txt_file(pout_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+
+        return False  #Controlled by HW
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status=self.get_status()
+        if status is None:
+            return  self.STATUS_LED_COLOR_OFF
+        
+        return {
+            1: self.STATUS_LED_COLOR_GREEN,
+            0: self.STATUS_LED_COLOR_RED            
+        }.get(status, self.STATUS_LED_COLOR_OFF)
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125 
+        """
+        temp_path = "{}{}".format(self.hwmon_path, 'psu_temp1_input')        
+        val=self._api_helper.read_txt_file(temp_path)
+        if val is not None:
+            return float(val)/1000
+        else:
+            return 0
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return False #Not supported
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_max')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts, 
+            e.g. 12.1 
+        """
+        vout_path = "{}{}".format(self.hwmon_path, 'psu_mfr_vout_min')        
+        vout_val=self._api_helper.read_txt_file(vout_path)
+        if vout_val is not None:
+            return float(vout_val)/ 1000
+        else:
+            return 0
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return PSU_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the PSU
+        Returns:
+            bool: True if PSU is present, False if not
+        """        
+        presence_path="{}{}".format(self.cpld_path, 'psu_present')
+        val=self._api_helper.read_txt_file(presence_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        power_path="{}{}".format(self.cpld_path, 'psu_power_good')
+        val=self._api_helper.read_txt_file(power_path)
+        if val is not None:
+            return int(val, 10) == 1
+        else:
+            return 0
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        model_path="{}{}".format(self.cpld_path, 'psu_model_name')
+        model=self._api_helper.read_txt_file(model_path)
+        
+        if model is None:
+            return "N/A"
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        serial_path="{}{}".format(self.cpld_path, 'psu_serial_numer')
+        serial=self._api_helper.read_txt_file(serial_path)
+        
+        if serial is None:
+            return "N/A"
+        return serial
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
new file mode 100644
index 000000000000..08e67519b2c9
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
@@ -0,0 +1,1255 @@
+#############################################################################
+# Edgecore
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+import sys
+
+from ctypes import create_string_buffer
+
+try:
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    #from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+    from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+    from .helper import APIHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+CPLD_I2C_PATH = "/sys/bus/i2c/devices/"
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 1
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 176
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+qsfp_dom_capability_tup = ('Tx_power_support', 'Rx_power_support',
+                           'Voltage_support', 'Temp_support')
+
+# Add an EOL to prevent this being viewed as string instead of list
+sfp_dom_capability_tup = ('sff8472_dom_support', 'EOL')
+
+
+# Offset for values in SFP eeprom
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
+                           
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 54
+    QSFP_PORT_START = 49
+
+    # Path to sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+        
+    PLATFORM = "x86_64-accton_as5835_54x-r0"
+    HWSKU = "Accton-AS5835-54X"
+
+    _cpld_mapping = {
+        0:  "3-0060",
+        1:  "3-0061",
+        2:  "3-0062",
+    }
+    _port_to_i2c_mapping = {
+        1:  42,
+        2:  43,
+        3:  44,
+        4:  45,
+        5:  46,
+        6:  47,
+        7:  48,
+        8:  49,
+        9:  50,
+        10: 51,
+        11: 52,
+        12: 53,
+        13: 54,
+        14: 55,
+        15: 56,
+        16: 57,
+        17: 58,
+        18: 59,
+        19: 60,
+        20: 61,
+        21: 62,
+        22: 63,
+        23: 64,
+        24: 65,
+        25: 66,
+        26: 67,
+        27: 68,
+        28: 69,
+        29: 70,
+        30: 71,
+        31: 72,
+        32: 73,
+        33: 74,
+        34: 75,
+        35: 76,
+        36: 77,
+        37: 78,
+        38: 79,
+        39: 80,
+        40: 81,
+        41: 82,
+        42: 83,
+        43: 84,
+        44: 85,
+        45: 86,
+        46: 87,
+        47: 88,
+        48: 89,
+        49: 28,  # QSFP49
+        50: 29,  # QSFP50
+        51: 26,  # QSFP51
+        52: 30,  # QSFP52
+        53: 31,  # QSFP53
+        54: 27,  # QSFP54
+        
+    }
+
+    def __init__(self, sfp_index=0):
+        self._api_helper=APIHelper()
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index + 1
+
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+        
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
+                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui',
+                               'application_advertisement', 'type_abbrv_name', 'dom_capability']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+                              'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+                                    'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+    
+    # For cage 1~38 are at cpld2, others are at cpld3.
+    def __get_cpld_num(self, port_num):
+        return 1 if (port_num < 39) else 2
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            if sys.version_info[0] >= 3:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+        except Exception:
+            pass
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49:
+            sfpi_obj = sff8472InterfaceId() #SFP
+        else:    
+            sfpi_obj = sff8436InterfaceId() #QSFP
+        if not self.get_presence() or not sfpi_obj:
+            return {}
+
+        if self.port_num < 49:
+            offset = SFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_SFP)
+        else:
+            offset = QSFP_INFO_OFFSET
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_QSFP)
+                
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+            sfp_interface_bulk_raw, 0)
+
+        sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+            sfp_vendor_name_raw, 0)
+
+        sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+            sfp_vendor_pn_raw, 0)
+
+        if self.port_num < 49:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_SFP)
+        else:
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_QSFP)
+        
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+            sfp_vendor_rev_raw, 0)
+
+        sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+            sfp_vendor_sn_raw, 0)
+
+        sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+        if sfp_vendor_oui_raw is not None:
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_vendor_oui_raw, 0)
+
+        sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+            sfp_vendor_date_raw, 0)
+
+        sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+            (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+        if sfp_dom_capability_raw is not None:
+            sfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                sfp_dom_capability_raw, 0)
+
+
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        compliance_code_dict = dict()
+        dom_capability_dict = dict()
+
+        if sfp_interface_bulk_data:
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+            transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
+
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
+            'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
+        transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+            'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
+        transceiver_info_dict['cable_type'] = "Unknown"
+        transceiver_info_dict['cable_length'] = "Unknown"
+
+        if self.port_num < 49:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+            
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+            for key in sfp_dom_capability_tup:
+                if key in sfp_dom_capability_data['data']:
+                    dom_capability_dict[key] = "yes" if sfp_dom_capability_data['data'][key]['value'] == 'on' else "no"
+            transceiver_info_dict['dom_capability'] = str(dom_capability_dict)
+
+        else:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+        
+            transceiver_info_dict['specification_compliance'] = str(
+                compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = str(
+                sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+
+            for key in qsfp_dom_capability_tup:
+                if key in sfp_dom_capability_data['data']:
+                    dom_capability_dict[key] = "yes" if sfp_dom_capability_data['data'][key]['value'] == 'on' else "no"
+            transceiver_info_dict['dom_capability'] = str(dom_capability_dict)
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49: #SFP case
+            sfpd_obj = sff8472Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']            
+            
+        else: #QSFP case
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not self.get_presence() or not sfpi_obj or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+    
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qspf_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+    
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+    
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+    
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+    
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+    
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+    
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        #End of else
+        
+        
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        # check present status
+        if self.port_num < 49:
+            sfpd_obj = sff8472Dom()    
+            
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+                
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+            cal_type = sfpi_obj.get_calibration_type()
+            sfpd_obj._calibration_type = cal_type
+    
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+    
+                transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data[
+                    'data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_info_dict[key])
+    
+            return transceiver_dom_threshold_info_dict
+            
+            
+        else:
+            sfpd_obj = sff8436Dom()
+    
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+    
+            transceiver_dom_threshold_dict = dict.fromkeys(
+                self.threshold_dict_keys, 'N/A')
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_MODULE_THRESHOLD_OFFSET, QSFP_MODULE_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+    
+            if dom_thres_raw:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(
+                    dom_thres_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['VccLowWarning']['value']
+    
+            dom_thres_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNEL_THRESHOLD_OFFSET, QSFP_CHANNEL_THRESHOLD_WIDTH) if self.get_presence() and sfpd_obj else None
+            channel_threshold_values = sfpd_obj.parse_channel_threshold_values(
+                dom_thres_raw, 0)
+            channel_threshold_data = channel_threshold_values.get('data')
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm'] = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = channel_threshold_data['TxBiasLowWarning']['value']
+    
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self._convert_string_to_num(
+                    transceiver_dom_threshold_dict[key])
+    
+            return transceiver_dom_threshold_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        if self.port_num <49:
+            return False # SPF port doesn't support this feature
+          
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]        
+        reset_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_reset_', self.port_num)
+        val=self._api_helper.read_txt_file(reset_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:
+            return False
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        rx_los = False
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            rx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_rx_los_', self.port_num)
+
+            rx_los=self._api_helper.read_txt_file(rx_path)
+            if int(rx_los, 10) == 1:
+                return [True]
+            else:
+                return [False]
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    rx_los = (sffbase().test_bit(data, 1) != 0)
+            
+        else:
+            rx_los_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_RX_LOS_STATUS_OFFSET, QSFP_CHANNL_RX_LOS_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+                return rx_los_list
+            else:
+                return [False]*4
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A list of boolean values, representing the TX fault status
+            of each available channel, value is True if SFP channel
+            has TX fault, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        tx_fault = False
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_fault_', self.port_num)
+
+            tx_fault=self._api_helper.read_txt_file(tx_path)
+            if int(tx_fault, 10) == 1:
+                return [True]
+            else:
+                return [False]
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_fault = (sffbase().test_bit(data, 2) != 0)
+        else:
+            tx_fault_list = []
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CHANNL_TX_FAULT_STATUS_OFFSET, QSFP_CHANNL_TX_FAULT_STATUS_WIDTH) if self.get_presence() else None
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+                return tx_fault_list
+            else:
+                return [False]*4
+
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A list of boolean values, representing the TX disable status
+            of each available channel, value is True if SFP channel
+            is TX disabled, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
+        """
+        if self.port_num < 49: 
+            tx_disable = False
+            
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_disable_', self.port_num)
+
+            tx_disable=self._api_helper.read_txt_file(tx_path)
+            
+            #status_control_raw = self.__read_eeprom_specific_bytes(
+            #    SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            #if status_control_raw:
+            #    data = int(status_control_raw[0], 16)
+            #    tx_disable_hard = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_HARD_BIT) != 0)
+            #    tx_disable_soft = (sffbase().test_bit(
+            #        data, SFP_TX_DISABLE_SOFT_BIT) != 0)
+            #    tx_disable = tx_disable_hard | tx_disable_soft
+            if int(tx_disable, 10)==0:
+                return [False]
+            else:
+                return [True]
+
+        else:
+            tx_disable_list = []
+    
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX1Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX2Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX3Disable']['value'])
+                tx_disable_list.append(
+                    'On' == dom_control_data['data']['TX4Disable']['value'])
+                return tx_disable_list
+            else:
+                return [False]*4
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        tx_disable_list = self.get_tx_disable()
+        if tx_disable_list is None:
+            return 0
+        tx_disabled = 0
+        for i in range(len(tx_disable_list)):
+            if tx_disable_list[i]:
+                tx_disabled |= 1 << i
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this SFP
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        if self.port_num < 49: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set=self.get_power_set()
+            power_override = self.get_power_override()
+            return power_set and power_override
+       
+    
+    def get_power_set(self):
+        
+        if self.port_num < 49: 
+            # SFP doesn't support this feature
+            return False
+        else:
+            power_set = False
+            
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_set = (
+                    'On' == dom_control_data['data']['PowerSet']['value'])
+    
+            return power_set
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            power_override = False
+    
+            
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+    
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                QSFP_CONTROL_OFFSET, QSFP_CONTROL_WIDTH) if self.get_presence() else None
+            if dom_control_raw is not None:
+                dom_control_data = sfpd_obj.parse_control_bytes(dom_control_raw, 0)
+                power_override = (
+                    'On' == dom_control_data['data']['PowerOverride']['value'])
+    
+            return power_override
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("temperature", "N/A")
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        return transceiver_dom_info_dict.get("voltage", "N/A")
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        
+        tx1_bs = transceiver_dom_info_dict.get("tx1bias", "N/A")
+        if self.port_num < 49:
+            return [tx1_bs, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+             
+        tx2_bs = transceiver_dom_info_dict.get("tx2bias", "N/A")
+        tx3_bs = transceiver_dom_info_dict.get("tx3bias", "N/A")
+        tx4_bs = transceiver_dom_info_dict.get("tx4bias", "N/A")
+        return [tx1_bs, tx2_bs, tx3_bs, tx4_bs] if transceiver_dom_info_dict else []
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        
+        rx1_pw = transceiver_dom_info_dict.get("rx1power", "N/A")
+        if self.port_num < 49:
+            return [rx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        rx2_pw = transceiver_dom_info_dict.get("rx2power", "N/A")
+        rx3_pw = transceiver_dom_info_dict.get("rx3power", "N/A")
+        rx4_pw = transceiver_dom_info_dict.get("rx4power", "N/A")
+        return [rx1_pw, rx2_pw, rx3_pw, rx4_pw] if transceiver_dom_info_dict else []
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
+        tx1_pw = transceiver_dom_info_dict.get("tx1power", "N/A")
+        if self.port_num < 49:
+             return [tx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        tx2_pw = transceiver_dom_info_dict.get("tx2power", "N/A")
+        tx3_pw = transceiver_dom_info_dict.get("tx3power", "N/A")
+        tx4_pw = transceiver_dom_info_dict.get("tx4power", "N/A")
+        return [tx1_pw, tx2_pw, tx3_pw, tx4_pw]
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default srate.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if self.port_num <49:
+            return False # SFP doesn't support this feature
+          
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]        
+        reset_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_reset_', self.port_num)      
+        ret = self._api_helper.write_txt_file(reset_path, 1)
+
+        if ret is not True:
+            return ret
+
+        time.sleep(0.01)
+        ret = self._api_helper.write_txt_file(reset_path, 0)
+        time.sleep(0.2)
+        
+        return ret
+      
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if self.port_num < 49:
+            cpld_i = self.__get_cpld_num(self.port_num)
+            cpld_path = self._cpld_mapping[cpld_i]        
+            tx_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_tx_disable_', self.port_num)      
+            ret = self._api_helper.write_txt_file(tx_path,  1 if tx_disable else 0)
+
+            if ret is not None:
+                time.sleep(0.01)
+                return ret
+            else:
+                return False
+        
+        else:
+            if not self.get_presence():
+                return False
+            sysfsfile_eeprom = None
+            try:
+                tx_disable_ctl = 0xf if tx_disable else 0x0
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = tx_disable_ctl
+                else:
+                    buffer[0] = chr(tx_disable_ctl)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ',str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        return True
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+
+            sysfsfile_eeprom = None
+            try:
+                channel_state = self.get_tx_disable_channel()
+
+                for i in range(4):
+                    channel_mask = (1 << i)
+                    if not (channel & channel_mask):
+                        continue
+
+                    if disable:
+                        channel_state |= channel_mask
+                    else:
+                        channel_state &= ~channel_mask
+
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = channel_state
+                else:
+                    buffer[0] = chr(channel_state)
+                # Write to eeprom
+                sysfsfile_eeprom = open(
+                    self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+            return True
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if lpmode:
+                self.set_power_override(True, True)
+            else:
+                self.set_power_override(False, False)
+    
+            return True
+       
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        if self.port_num < 49:
+            return False # SFP doesn't support this feature
+        else:
+            if not self.get_presence():
+                return False
+            try:
+                power_override_bit = (1 << 0) if power_override else 0
+                power_set_bit      = (1 << 1) if power_set else (1 << 3)
+    
+                buffer = create_string_buffer(1)
+                if sys.version_info[0] >= 3:
+                    buffer[0] = (power_override_bit | power_set_bit)
+                else:
+                    buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                with open(self.port_to_eeprom_mapping[self.port_num], "r+b") as fd:
+                    fd.seek(QSFP_POWEROVERRIDE_OFFSET)
+                    fd.write(buffer[0])
+                    time.sleep(0.01)
+            except Exception:
+                print ('Error: unable to open file: ', str(e))
+                return False
+            return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(
+            self.__get_path_to_port_config_file())
+        name = sfputil_helper.logical[self.index] or "Unknown"
+        return name
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        cpld_i = self.__get_cpld_num(self.port_num)
+        cpld_path = self._cpld_mapping[cpld_i]          
+        present_path = "{}{}{}{}".format(CPLD_I2C_PATH, cpld_path, '/module_present_', self.port_num)
+        val=self._api_helper.read_txt_file(present_path)
+        if val is not None:
+            return int(val, 10)==1
+        else:
+            return False
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("model", "N/A")
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        transceiver_dom_info_dict = self.get_transceiver_info()
+        return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and self.get_transceiver_bulk_status()
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
new file mode 100644
index 000000000000..c500a72e1bac
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
@@ -0,0 +1,150 @@
+#############################################################################
+# Edgecore
+#
+# Thermal contains an implementation of SONiC Platform Base API and
+# provides the thermal device status which are available in the platform
+#
+#############################################################################
+
+import os
+import os.path
+import glob
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    THERMAL_NAME_LIST = []
+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.index = thermal_index
+
+        # Add thermal name
+        self.THERMAL_NAME_LIST.append("Temp sensor 1")
+        self.THERMAL_NAME_LIST.append("Temp sensor 2")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")        
+        self.THERMAL_NAME_LIST.append("Temp sensor 4")
+
+        # Set hwmon path
+        i2c_path = {
+            0: "18-004b/hwmon/hwmon*/", 
+            1: "19-004c/hwmon/hwmon*/", 
+            2: "20-0049/hwmon/hwmon*/",
+            3: "21-004a/hwmon/hwmon*/"
+        }.get(self.index, None)
+          
+        self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
+        self.ss_key = self.THERMAL_NAME_LIST[self.index]
+        self.ss_index = 1
+
+    def __read_txt_file(self, file_path):
+        for filename in glob.glob(file_path):
+            try:
+                with open(filename, 'r') as fd:
+                    data =fd.readline().rstrip()
+                    return data
+            except IOError as e:
+                pass
+        
+        return None
+        
+            
+    def __get_temp(self, temp_file):
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_temp = self.__read_txt_file(temp_file_path)
+        if raw_temp is not None:
+            return float(raw_temp)/1000
+        else:
+            return 0
+        
+
+    def __set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self.hwmon_path, file_name)
+        for filename in glob.glob(temp_file_path):
+            try:
+                with open(filename, 'w') as fd:
+                    fd.write(str(temperature))
+                return True
+            except IOError as e:
+                print("IOError")
+                return False
+
+
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        return self.__get_temp(temp_file)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+        Args :
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        temp_file = "temp{}_max".format(self.ss_index)
+        temperature = temperature *1000
+        self.__set_threshold(temp_file, temperature)
+        
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal device
+            Returns:
+            string: The name of the thermal device
+        """
+        return self.THERMAL_NAME_LIST[self.index]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Thermal
+        Returns:
+            bool: True if Thermal is present, False if not
+        """
+        temp_file = "temp{}_input".format(self.ss_index)
+        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        raw_txt = self.__read_txt_file(temp_file_path)
+        if raw_txt is not None:
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+
+        file_str = "temp{}_input".format(self.ss_index)
+        file_path = os.path.join(self.hwmon_path, file_str)
+        raw_txt = self.__read_txt_file(file_path)
+        if raw_txt is None:
+            return False
+        else:     
+            return int(raw_txt) != 0
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/sonic_platform_setup.py
new file mode 100644
index 000000000000..a775511c643d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/sonic_platform_setup.py
@@ -0,0 +1,34 @@
+from setuptools import setup
+
+DEVICE_NAME = 'accton'
+HW_SKU = 'x86_64-accton_as5835_54x-r0'  
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Accton Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='Jostar Yang',
+    maintainer_email='jostar_yang@accton.com',
+    packages=[
+        'sonic_platform',
+    ],
+    package_dir={
+        'sonic_platform': '../../../../device/{}/{}/sonic_platform'.format(DEVICE_NAME, HW_SKU)},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
index 738a1766fbef..9753a46e436b 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
@@ -36,6 +36,7 @@
 import logging
 import re
 import time
+import os
 
 
 
@@ -89,6 +90,10 @@ def main():
            do_install()
         elif arg == 'clean':
            do_uninstall()
+        elif arg == 'api':
+           do_sonic_platform_install()
+        elif arg == 'api_clean':   
+           do_sonic_platform_clean()
         elif arg == 'show':
            device_traversal()
         elif arg == 'sff':
@@ -364,6 +369,42 @@ def system_ready():
         return False
     return True
 
+PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
+PLATFORM_API2_WHL_FILE_PY3 ='sonic_platform-1.0-py3-none-any.whl'
+def do_sonic_platform_install():
+    device_path = "{}{}{}{}".format(PLATFORM_ROOT_PATH, '/x86_64-accton_', PROJECT_NAME, '-r0')
+    SONIC_PLATFORM_BSP_WHL_PKG_PY3 = "/".join([device_path, PLATFORM_API2_WHL_FILE_PY3])
+        
+    #Check API2.0 on py whl file
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)
+    if status:
+        if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3): 
+            status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
+            if status:
+                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                return status
+            else:
+                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+        else:
+            print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
+    else:        
+        print('{} has installed'.format(PLATFORM_API2_WHL_FILE_PY3))
+     
+    return 
+     
+def do_sonic_platform_clean():
+    status, output = log_os_system("pip3 show sonic-platform > /dev/null 2>&1", 0)   
+    if status:
+        print('{} does not install, not need to uninstall'.format(PLATFORM_API2_WHL_FILE_PY3))
+        
+    else:        
+        status, output = log_os_system("pip3 uninstall sonic-platform -y", 0)
+        if status:
+            print('Error: Failed to uninstall {}'.format(PLATFORM_API2_WHL_FILE_PY3))
+            return status
+        else:
+            print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
+
 def do_install():
     print "Checking system...."
     if driver_check() == False:
@@ -382,6 +423,9 @@ def do_install():
                 return  status
     else:
         print PROJECT_NAME.upper()+" devices detected...."
+
+    do_sonic_platform_install()
+
     return
 
 def do_uninstall():
@@ -404,6 +448,8 @@ def do_uninstall():
             if FORCE == 0:
                 return  status
 
+    do_sonic_platform_clean()
+
     return
 
 def devices_info():
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as5835-54x.install b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as5835-54x.install
new file mode 100644
index 000000000000..556e3964ee28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/sonic-platform-accton-as5835-54x.install
@@ -0,0 +1,3 @@
+as5835-54x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-accton_as5835_54x-r0
+
+

From 1f1718ace695489b62cde20d2c31bb77714fa515 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 24 Jun 2021 12:00:35 -0700
Subject: [PATCH 0586/1674] Revert "[DellEMC] Z9332: Change in i2c mapping
 (#7797)"

This reverts commit 31a8b1c87a344cbeba84bbda2784f3a9b7a3b396.
---
 .../plugins/sfputil.py                        | 64 +++++++++----------
 .../z9332f/scripts/z9332f_platform.sh         | 14 ++--
 .../z9332f/sonic_platform/chassis.py          | 64 +++++++++----------
 .../z9332f/sonic_platform/component.py        |  6 +-
 .../z9332f/sonic_platform/sfp.py              | 64 +++++++++----------
 5 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
index 9ac14d83d73a..d037fd9273dd 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
@@ -31,38 +31,38 @@ class SfpUtil(SfpUtilBase):
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
 
     _port_to_i2c_mapping = {
-        1:  4,
-        2:  5,
-        3:  6,
-        4:  7,
-        5:  8,
-        6:  9,
-        7:  10,
-        8:  11,
-        9:  12,
-        10: 13,
-        11: 14,
-        12: 15,
-        13: 16,
-        14: 17,
-        15: 18,
-        16: 19,
-        17: 20,
-        18: 21,
-        19: 22,
-        20: 23,
-        21: 24,
-        22: 25,
-        23: 26,
-        24: 27,
-        25: 28,
-        26: 29,
-        27: 30,
-        28: 31,
-        29: 32,
-        30: 33,
-        31: 34,
-        32: 35,
+        1:  10,
+        2:  11,
+        3:  12,
+        4:  13,
+        5:  14,
+        6:  15,
+        7:  16,
+        8:  17,
+        9:  18,
+        10: 19,
+        11: 20,
+        12: 21,
+        13: 22,
+        14: 23,
+        15: 24,
+        16: 25,
+        17: 26,
+        18: 27,
+        19: 28,
+        20: 29,
+        21: 30,
+        22: 31,
+        23: 32,
+        24: 33,
+        25: 34,
+        26: 35,
+        27: 36,
+        28: 37,
+        29: 38,
+        30: 39,
+        31: 40,
+        32: 41,
         33: 1,
         34: 2,
     }
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
index a5f8a2e6d62e..f80207df8ea2 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
@@ -56,14 +56,14 @@ switch_board_qsfp_mux() {
 switch_board_qsfp() {
         case $1 in
         "new_device")
-                        for ((i=4;i<=35;i++));
+                        for ((i=10;i<=41;i++));
                         do
                             echo optoe3 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
                         done
                         ;;
  
         "delete_device")
-                        for ((i=4;i<=35;i++));
+                        for ((i=10;i<=41;i++));
                         do
                             echo 0x50 > /sys/bus/i2c/devices/i2c-$i/$1
                         done
@@ -112,7 +112,7 @@ switch_board_modsel() {
 
 #This enables the led control for CPU and default states 
 switch_board_led_default() {
-	/usr/sbin/i2cset -y 37 0x0d 0x62 0xd0
+	/usr/sbin/i2cset -y 5 0x0d 0x62 0xd0
 }
 
 # Readout firmware version of the system and
@@ -135,15 +135,15 @@ platform_firmware_versions() {
 	echo "BMC: $r" >> $FIRMWARE_VERSION_FILE
 
 	#BaseBoard CPLD 0x0d on i2c bus 5 ( physical FPGA I2C-5)
-	ver=`/usr/sbin/i2cget -y 37 0x0d 0x0`
+	ver=`/usr/sbin/i2cget -y 5 0x0d 0x0`
 	echo "Baseboard CPLD: $((ver))" >> $FIRMWARE_VERSION_FILE
 
 	#Switch CPLD 1 0x30 on i2c bus 4 ( physical FPGA I2C-4)
-	ver=`/usr/sbin/i2cget -y 36 0x30 0x0`
+	ver=`/usr/sbin/i2cget -y 4 0x30 0x0`
 	echo "Switch CPLD 1: $((ver))" >> $FIRMWARE_VERSION_FILE
 
 	#Switch CPLD 1 0x30 on i2c bus 4 ( physical FPGA I2C-4)
-	ver=`/usr/sbin/i2cget -y 36 0x31 0x0`
+	ver=`/usr/sbin/i2cget -y 4 0x31 0x0`
 	echo "Switch CPLD 2: $((ver))" >> $FIRMWARE_VERSION_FILE
 }
 
@@ -176,7 +176,7 @@ get_reboot_cause() {
     if [[ ! -e $REBOOT_REASON_FILE ]]; then
         echo "0" > $REBOOT_REASON_FILE
     else
-        /usr/sbin/i2cget -y 37 0x0d 0x06  > $REBOOT_REASON_FILE
+        /usr/sbin/i2cget -y 5 0x0d 0x06  > $REBOOT_REASON_FILE
     fi
 }
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index a412122bae48..41078bb1eec9 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -74,38 +74,38 @@ class Chassis(ChassisBase):
 
     _global_port_pres_dict = {}
     _port_to_i2c_mapping = {
-            1:  4,
-            2:  5,
-            3:  6,
-            4:  7,
-            5:  8,
-            6:  9,
-            7:  10,
-            8:  11,
-            9:  12,
-            10: 13,
-            11: 14,
-            12: 15,
-            13: 16,
-            14: 17,
-            15: 18,
-            16: 19,
-            17: 20,
-            18: 21,
-            19: 22,
-            20: 23,
-            21: 24,
-            22: 25,
-            23: 26,
-            24: 27,
-            25: 28,
-            26: 29,
-            27: 30,
-            28: 31,
-            29: 32,
-            30: 33,
-            31: 34,
-            32: 35,
+            1:  10,
+            2:  11,
+            3:  12,
+            4:  13,
+            5:  14,
+            6:  15,
+            7:  16,
+            8:  17,
+            9:  18,
+            10: 19,
+            11: 20,
+            12: 21,
+            13: 22,
+            14: 23,
+            15: 24,
+            16: 25,
+            17: 26,
+            18: 27,
+            19: 28,
+            20: 29,
+            21: 30,
+            22: 31,
+            23: 32,
+            24: 33,
+            25: 34,
+            26: 35,
+            27: 36,
+            28: 37,
+            29: 38,
+            30: 39,
+            31: 40,
+            32: 41,
             33: 1,
             34: 2,
             }
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index 8b7ae004e8a4..c60cc06b8f57 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -35,13 +35,13 @@ def get_cpld_version(bus, i2caddr):
     return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
 
 def get_cpld0_version():
-    return get_cpld_version(37, 0x0d)
+    return get_cpld_version(5, 0x0d)
 
 def get_cpld1_version():
-    return get_cpld_version(36, 0x30)
+    return get_cpld_version(4, 0x30)
 
 def get_cpld2_version():
-    return get_cpld_version(36, 0x31)
+    return get_cpld_version(4, 0x31)
 
 
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 1897177dbbc4..7089e8698d68 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -227,38 +227,38 @@ class Sfp(SfpBase):
     """
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
     _port_to_i2c_mapping = {
-            1:  4,
-            2:  5,
-            3:  6,
-            4:  7,
-            5:  8,
-            6:  9,
-            7:  10,
-            8:  11,
-            9:  12,
-            10: 13,
-            11: 14,
-            12: 15,
-            13: 16,
-            14: 17,
-            15: 18,
-            16: 19,
-            17: 20,
-            18: 21,
-            19: 22,
-            20: 23,
-            21: 24,
-            22: 25,
-            23: 26,
-            24: 27,
-            25: 28,
-            26: 29,
-            27: 30,
-            28: 31,
-            29: 32,
-            30: 33,
-            31: 34,
-            32: 35,
+            1:  10,
+            2:  11,
+            3:  12,
+            4:  13,
+            5:  14,
+            6:  15,
+            7:  16,
+            8:  17,
+            9:  18,
+            10: 19,
+            11: 20,
+            12: 21,
+            13: 22,
+            14: 23,
+            15: 24,
+            16: 25,
+            17: 26,
+            18: 27,
+            19: 28,
+            20: 29,
+            21: 30,
+            22: 31,
+            23: 32,
+            24: 33,
+            25: 34,
+            26: 35,
+            27: 36,
+            28: 37,
+            29: 38,
+            30: 39,
+            31: 40,
+            32: 41,
             33: 1,
             34: 2
             }

From 8e8a26fd41bfd0ee5394bab3e08d63d04e16a34e Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Sun, 20 Jun 2021 18:06:00 -0700
Subject: [PATCH 0587/1674] Update DellEMC-Z9332f-M-O16C64 SKU settings (#7908)

---
 .../DellEMC-Z9332f-M-O16C64/sai.profile       |   2 +-
 .../sai_postinit_cmd.soc                      | 185 ++++++++++++------
 ... => th3-z9332f-16x400G-64x100G.config.bcm} |  96 +++++++--
 3 files changed, 200 insertions(+), 83 deletions(-)
 rename device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/{th3-z9332f-32x400G.config.bcm => th3-z9332f-16x400G-64x100G.config.bcm} (92%)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai.profile b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai.profile
index 26867a291b00..6c38b0ff1966 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai.profile
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-z9332f-32x400G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-z9332f-16x400G-64x100G.config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
index 9550e9c822c8..4a5b5ffcad9a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
@@ -3,10 +3,10 @@ link off
 counter off
 
 #***
-#*** Port CD0 Preemphasis setting ***
+#*** Port CE0-CE3 Preemphasis setting ***
 #***
 
-local port cd0
+local port ce0
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -25,6 +25,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce1
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -43,6 +44,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce2
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -61,6 +63,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce3
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E4
@@ -82,10 +85,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD1 Preemphasis setting ***
+#*** Port CE4-CE7 Preemphasis setting ***
 #***
 
-local port cd1
+local port ce4
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -104,6 +107,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce5
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -122,6 +126,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce6
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -140,6 +145,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce7
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E4
@@ -161,10 +167,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD2 Preemphasis setting ***
+#*** Port CE8-CE11 Preemphasis setting ***
 #***
 
-local port cd2
+local port ce8
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -183,6 +189,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce9
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -201,6 +208,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce10
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -219,6 +227,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce11
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -240,10 +249,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD3 Preemphasis setting ***
+#*** Port CE12-CE15 Preemphasis setting ***
 #***
 
-local port cd3
+local port ce12
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -262,6 +271,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce13
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -280,6 +290,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce14
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -298,6 +309,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce15
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -319,10 +331,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD4 Preemphasis setting ***
+#*** Port CE16-CE19 Preemphasis setting ***
 #***
 
-local port cd4
+local port ce16
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -341,6 +353,8 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+
+local port ce17
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E4
@@ -368,6 +382,8 @@ phy $port TXFIR_TAP_CTL4r.4 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.4 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP_LOAD=0x1
 
+
+local port ce18
 #*** lane 5 ***
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.5 TXFIR_TAP1_COEFF=0x1E8
@@ -386,6 +402,7 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1
 
+local port ce19
 #*** lane 7 ***
 phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
@@ -397,11 +414,12 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 
 delay 10
 
+
 #***
-#*** Port CD5 Preemphasis setting ***
+#*** Port CE20-CE23 Preemphasis setting ***
 #***
 
-local port cd5
+local port ce20
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -420,6 +438,8 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+
+local port ce21
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E4
@@ -438,6 +458,8 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+
+local port ce22
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -456,6 +478,8 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+
+local port ce23
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -476,11 +500,12 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 
 delay 10
 
+
 #***
-#*** Port CD6 Preemphasis setting ***
+#*** Port CD24-27 Preemphasis setting ***
 #***
 
-local port cd6
+local port ce24
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -499,6 +524,8 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+
+local port ce25
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -517,6 +544,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce26
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -535,6 +563,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce27
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E4
@@ -555,11 +584,12 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 
 delay 10
 
+
+local port ce28
 #***
-#*** Port CD7 Preemphasis setting ***
+#*** Port CE28-CE31 Preemphasis setting ***
 #***
 
-local port cd7
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -578,6 +608,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce29
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -596,6 +627,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce30
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -614,6 +646,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce31
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -635,10 +668,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD8 Preemphasis setting ***
+#*** Port CE32-CE35 Preemphasis setting ***
 #***
 
-local port cd8
+local port ce32
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -657,6 +690,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce33
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E4
@@ -675,6 +709,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce34
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -693,6 +728,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce35
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -714,10 +750,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD9 Preemphasis setting ***
+#*** Port CD36-39 Preemphasis setting ***
 #***
 
-local port cd9
+local port ce36
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -736,6 +772,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce37
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -754,6 +791,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce38
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -772,6 +810,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce39
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E4
@@ -793,10 +832,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD10 Preemphasis setting ***
+#*** Port CE40-CE43 Preemphasis setting ***
 #***
 
-local port cd10
+local port ce40
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -815,6 +854,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce41
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -833,6 +873,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce42
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -851,6 +892,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce43
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E4
@@ -872,10 +914,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD11 Preemphasis setting ***
+#*** Port CE44-CE47 Preemphasis setting ***
 #***
 
-local port cd11
+local port ce44
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -894,6 +936,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce45
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E4
@@ -912,6 +955,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce46
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E4
@@ -939,6 +983,7 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1
 
+local port ce47
 #*** lane 7 ***
 phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
@@ -951,10 +996,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD12 Preemphasis setting ***
+#*** Port CD0 Preemphasis setting ***
 #***
 
-local port cd12
+local port cd0
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1030,10 +1075,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD13 Preemphasis setting ***
+#*** Port CD1 Preemphasis setting ***
 #***
 
-local port cd13
+local port cd1
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1108,10 +1153,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD14 Preemphasis setting ***
+#*** Port CD2 Preemphasis setting ***
 #***
 
-local port cd14
+local port cd2
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1187,10 +1232,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD15 Preemphasis setting ***
+#*** Port CD3 Preemphasis setting ***
 #***
 
-local port cd15
+local port cd3
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1266,10 +1311,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD16 Preemphasis setting ***
+#*** Port CE48-CE51 Preemphasis setting ***
 #***
 
-local port cd16
+local port ce48
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1288,6 +1333,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce49
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -1306,6 +1352,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce50
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -1324,6 +1371,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce51
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -1345,10 +1393,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD17 Preemphasis setting ***
+#*** Port CE52-CE55 Preemphasis setting ***
 #***
 
-local port cd17
+local port ce52
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1367,6 +1415,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce53
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -1385,6 +1434,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce54
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -1403,6 +1453,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce55
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -1424,10 +1475,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD18 Preemphasis setting ***
+#*** Port CD56-59 Preemphasis setting ***
 #***
 
-local port cd18
+local port ce56
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1446,6 +1497,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce57
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E8
@@ -1464,6 +1516,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce58
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -1482,6 +1535,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce59
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -1503,10 +1557,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD19 Preemphasis setting ***
+#*** Port CE60-CE63 Preemphasis setting ***
 #***
 
-local port cd19
+local port ce60
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1525,6 +1579,7 @@ phy $port TXFIR_TAP_CTL4r.1 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.1 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.1 TXFIR_TAP_LOAD=0x1
 
+local port ce61
 #*** lane 2 ***
 phy $port TXFIR_TAP_CTL0r.2 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.2 TXFIR_TAP1_COEFF=0x1E4
@@ -1543,6 +1598,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce62
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -1561,6 +1617,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce63
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -1582,10 +1639,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD20 Preemphasis setting ***
+#*** Port CD4 Preemphasis setting ***
 #***
 
-local port cd20
+local port cd4
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1661,10 +1718,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD21 Preemphasis setting ***
+#*** Port CD5 Preemphasis setting ***
 #***
 
-local port cd21
+local port cd5
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -1740,10 +1797,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD22 Preemphasis setting ***
+#*** Port CD6 Preemphasis setting ***
 #***
 
-local port cd22
+local port cd6
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1819,10 +1876,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD23 Preemphasis setting ***
+#*** Port CD7 Preemphasis setting ***
 #***
 
-local port cd23
+local port cd7
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -1898,10 +1955,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD24 Preemphasis setting ***
+#*** Port CD8 Preemphasis setting ***
 #***
 
-local port cd24
+local port cd8
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -1977,10 +2034,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD25 Preemphasis setting ***
+#*** Port CD9 Preemphasis setting ***
 #***
 
-local port cd25
+local port cd9
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -2055,10 +2112,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD26 Preemphasis setting ***
+#*** Port CD10 Preemphasis setting ***
 #***
 
-local port cd26
+local port cd10
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -2134,10 +2191,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD27 Preemphasis setting ***
+#*** Port CD11 Preemphasis setting ***
 #***
 
-local port cd27
+local port cd11
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -2213,10 +2270,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD28 Preemphasis setting ***
+#*** Port CD12 Preemphasis setting ***
 #***
 
-local port cd28
+local port cd12
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -2292,10 +2349,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD29 Preemphasis setting ***
+#*** Port CD13 Preemphasis setting ***
 #***
 
-local port cd29
+local port cd13
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
@@ -2371,10 +2428,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD30 Preemphasis setting ***
+#*** Port CD14 Preemphasis setting ***
 #***
 
-local port cd30
+local port cd14
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E8
@@ -2450,10 +2507,10 @@ phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP_LOAD=0x1
 delay 10
 
 #***
-#*** Port CD31 Preemphasis setting ***
+#*** Port CD15 Preemphasis setting ***
 #***
 
-local port cd31
+local port cd15
 #*** lane 0 ***
 phy $port TXFIR_TAP_CTL0r.0 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.0 TXFIR_TAP1_COEFF=0x1E4
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
similarity index 92%
rename from device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm
rename to device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index fc6613601f52..2fe26e1e264e 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -45,34 +45,94 @@ l2xlrn_thread_interval=50000
 l2xlrn_intr_en=0
 
 pbmp_xport_xe=0xffffffFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-
 phy_an_c73=3
 
-portmap_1.0=1:400
-portmap_5.0=9:400
-portmap_10.0=17:400
-portmap_14.0=25:400
+portmap_20.0=33:100:2
+portmap_21.0=35:100:2
+portmap_22.0=37:100:2
+portmap_23.0=39:100:2
+
+portmap_24.0=41:100:2
+portmap_25.0=43:100:2
+portmap_26.0=45:100:2
+portmap_27.0=47:100:2
+
+portmap_28.0=49:100:2
+portmap_29.0=51:100:2
+portmap_30.0=53:100:2
+portmap_31.0=55:100:2
+
+portmap_33.0=57:100:2
+portmap_34.0=59:100:2
+portmap_35.0=61:100:2
+portmap_36.0=63:100:2
+
+portmap_40.0=65:100:2
+portmap_41.0=67:100:2
+portmap_42.0=69:100:2
+portmap_43.0=71:100:2
+
+portmap_44.0=73:100:2
+portmap_45.0=75:100:2
+portmap_46.0=77:100:2
+portmap_47.0=79:100:2
+
+portmap_49.0=81:100:2
+portmap_50.0=83:100:2
+portmap_51.0=85:100:2
+portmap_52.0=87:100:2
+
+portmap_53.0=89:100:2
+portmap_54.0=91:100:2
+portmap_55.0=93:100:2
+portmap_56.0=95:100:2
 
-portmap_20.0=33:400
-portmap_24.0=41:400
-portmap_29.0=49:400
-portmap_33.0=57:400
+portmap_1.0=1:100:2
+portmap_2.0=3:100:2
+portmap_3.0=5:100:2
+portmap_4.0=7:100:2
+
+portmap_5.0=9:100:2
+portmap_6.0=11:100:2
+portmap_7.0=13:100:2
+portmap_8.0=15:100:2
+
+portmap_10.0=17:100:2
+portmap_11.0=19:100:2
+portmap_12.0=21:100:2
+portmap_13.0=23:100:2
+
+portmap_14.0=25:100:2
+portmap_15.0=27:100:2
+portmap_16.0=29:100:2
+portmap_17.0=31:100:2
+
+portmap_80.0=129:100:2
+portmap_81.0=131:100:2
+portmap_82.0=133:100:2
+portmap_83.0=135:100:2
+
+portmap_84.0=137:100:2
+portmap_85.0=139:100:2
+portmap_86.0=141:100:2
+portmap_87.0=143:100:2
+
+portmap_89.0=145:100:2
+portmap_90.0=147:100:2
+portmap_91.0=149:100:2
+portmap_92.0=151:100:2
+
+portmap_93.0=153:100:2
+portmap_94.0=155:100:2
+portmap_95.0=157:100:2
+portmap_96.0=159:100:2
 
-portmap_40.0=65:400
-portmap_44.0=73:400
-portmap_49.0=81:400
-portmap_53.0=89:400
 
 portmap_60.0=97:400
 portmap_64.0=105:400
 portmap_69.0=113:400
 portmap_73.0=121:400
 
-portmap_80.0=129:400
-portmap_84.0=137:400
-portmap_89.0=145:400
-portmap_93.0=153:400
-
 portmap_100.0=161:400
 portmap_104.0=169:400
 portmap_109.0=177:400

From efb6c1d9cb39ba8660560131f844c067c00417f7 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Fri, 25 Jun 2021 08:06:45 -0700
Subject: [PATCH 0588/1674] [202012][BRCMSAI]Fix two crash issues introduced by
 SAI 4.3.3.8 (#7979)

Why I did it
There were two regression issues introduced by BRCM SAI 4.3.3.8:

CS00012196056 [4.3.3.8][WARMBOOT] syncd[2584]: segfault at 5616ad6c3d80 ip 00007f61e0c6bc65 sp 00007fff0c5a7a90 error 4 in libsai.so.1.0[7f61e0a95000+3cd8000]
CS00012195956 [4.3.3.8] [TD3]Syncd Crash at brcm_sai_tnl_mp_create_tunnel()
How I did it
Patch for CS00012195956 from BRCM was validated to have addressed the tunnel creation issue.
Temporary worked around the issue by commenting out a portion of questionable code in BRCM SAI that seems to be the root cause of CS00012196056 .
How to verify it
See the BRCM cases for details.
---
 files/build/versions/default/versions-web | 4 ++--
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 300a7b2f72b7..e132fae8df0d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -43,8 +43,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=2N3yC%2BDAXt%2BN98V5Qc8cxBV7V%2FE%2B4C%2BYTSzs0d3MIOA%3D&se=2035-02-25T22%3A17%3A52Z&sp=r==8cc8831d91ced4abc4692f4121d03aa7
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=OPgORcuUzFLJdt9VwqnZuRx2TgGUo5tbDIOtpJuoHB4%3D&se=2035-02-25T22%3A17%3A13Z&sp=r==cbbe0dbd85546731993ed135b3480911
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=ST85a0laEY245n2QAy5gtbpd8LZkIuCSiBDEVc10wC8%3D&se=2035-03-04T06%3A57%3A04Z&sp=r==aac1cba3a7402ff508ac6134a6cf887b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=gfKgP7HePZcvoESly6xJ%2BIyTovF%2BWZvyvTjfWR%2BqMcs%3D&se=2035-03-04T06%3A55%3A34Z&sp=r==e11330a3332020c1f93bb3efab588090
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 3f1cfa9e3f91..6bf94bc1c8be 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.8_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=OPgORcuUzFLJdt9VwqnZuRx2TgGUo5tbDIOtpJuoHB4%3D&se=2035-02-25T22%3A17%3A13Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.8_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.8-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=gfKgP7HePZcvoESly6xJ%2BIyTovF%2BWZvyvTjfWR%2BqMcs%3D&se=2035-03-04T06%3A55%3A34Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.8-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8_amd64.deb?sv=2015-04-05&sr=b&sig=2N3yC%2BDAXt%2BN98V5Qc8cxBV7V%2FE%2B4C%2BYTSzs0d3MIOA%3D&se=2035-02-25T22%3A17%3A52Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=ST85a0laEY245n2QAy5gtbpd8LZkIuCSiBDEVc10wC8%3D&se=2035-03-04T06%3A57%3A04Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 866df47addf7ef57322bec8ee1cd4318b1c1267c Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Fri, 25 Jun 2021 15:05:20 -0700
Subject: [PATCH 0589/1674] DellEMC: Fix Z9332f QSFP-DD DOM issue (#7983)

#### Why I did it
QSFP-DD DOM RX/TX values are not retrieved properly.

#### How I did it
Defined DOM offsets as defined in CMIS 4 spec.
---
 .../z9332f/sonic_platform/sfp.py              | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 7089e8698d68..f5dbde3cb0ed 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -37,18 +37,19 @@
 QSFP_DD_PAGE1 = 128
 QSFP_DD_PAGE2 = 256
 QSFP_DD_PAGE3 = 384
+QSFP_DD_PAGE17 = 2176
 QSFP_DD_DOM_CAPABILITY_OFFSET = 2
 QSFP_DD_DOM_CAPABILITY_WIDTH = 1
 QSFP_DD_TEMP_OFFSET = 14
 QSFP_DD_TEMP_WIDTH = 2
 QSFP_DD_VOLT_OFFSET = 16
 QSFP_DD_VOLT_WIDTH = 2
-QSFP_DD_TXBIAS_OFFSET = 26
+QSFP_DD_TXBIAS_OFFSET = 170
 QSFP_DD_TXBIAS_WIDTH = 16
-QSFP_DD_TXPOWER_OFFSET = 42
+QSFP_DD_TXPOWER_OFFSET = 154
 QSFP_DD_TXPOWER_WIDTH = 16
-QSFP_DD_RXPOWER_WIDTH = 58
-QSFP_DD_RXPOWER_OFFSET = 16
+QSFP_DD_RXPOWER_OFFSET = 186
+QSFP_DD_RXPOWER_WIDTH = 16
 QSFP_DD_RXLOS_OFFSET = 19
 QSFP_DD_RXLOS_WIDTH = 1
 QSFP_DD_TX_DISABLE_OFFSET = 86
@@ -278,6 +279,9 @@ def __init__(self, index, sfp_type, eeprom_path):
         self.qsfp_dd_Info = qsfp_dd_InterfaceId()
         self.qsfp_dd_DomInfo = qsfp_dd_Dom()
         self.qsfp_dd_app2_list = False
+        self.qsfp_dd_rxpower_supported = False
+        self.qsfp_dd_txpower_supported = False
+        self.qsfp_dd_txbias_supported = False
 
     def get_eeprom_sysfs_path(self):
         return self.eeprom_path
@@ -293,6 +297,9 @@ def detect_dom_capability(self):
                 dom_capability = self.qsfp_dd_Info.parse_dom_capability(qsfp_dom_capability_raw, 0)
                 if dom_capability['data']['Flat_MEM']['value'] == 'Off':
                     self.qsfp_dd_app2_list = True
+                    self.qsfp_dd_rxpower_supported = True
+                    self.qsfp_dd_txpower_supported = True
+                    self.qsfp_dd_txbias_supported = True
 
     def _strip_unit_from_str(self, value_str):
         match = re.match(r'(.*)C$|(.*)Volts$|(.*)mA$|(.*)dBm$', value_str)
@@ -1064,9 +1071,9 @@ def get_tx_bias(self):
         """
         tx_bias_list = []
         try:
-            offset = 128
+            offset = QSFP_DD_PAGE17
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None:
+                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_txbias_supported:
                     return None
                 tx_bias_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXBIAS_OFFSET, QSFP_DD_TXBIAS_WIDTH)
                 tx_bias_data = self.qsfp_dd_DomInfo.parse_dom_tx_bias(tx_bias_data_raw, 0)
@@ -1100,10 +1107,10 @@ def get_rx_power(self):
         rx_power_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None:
+                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_rxpower_supported:
                     return None
 
-                offset = 128
+                offset = QSFP_DD_PAGE17
                 rx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_RXPOWER_OFFSET, QSFP_DD_TXPOWER_WIDTH)
                 rx_power_data = self.qsfp_dd_DomInfo.parse_dom_rx_power(rx_power_data_raw, 0)
 
@@ -1133,12 +1140,12 @@ def get_tx_power(self):
         Retrieves the TX power of this SFP
         """
         tx_power_list = []
-        offset = 128
         try:
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None:
+                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_txpower_supported:
                     return None
 
+                offset = QSFP_DD_PAGE17
                 tx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXPOWER_OFFSET,
                                                          QSFP_DD_TXPOWER_WIDTH)
                 tx_power_data = self.qsfp_dd_DomInfo.parse_dom_tx_power(tx_power_data_raw, 0)

From f3e221a559d5d3ae30321f43c7e251df927c771b Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Fri, 25 Jun 2021 18:34:19 -0700
Subject: [PATCH 0590/1674] MMU configuration for Z9332 systems in T0 and T1
 topolgy (#7973)

Why I did it
MMU configuration for DellEMC Z9332 systems in T0/T1 topology

How I did it
Updated config.bcm, QoS/Buffer pool and lossy/lossless profile settings

How to verify it
Verified that Dell systems are booting up fine and basic test cases passing.
---
 .../DellEMC-Z9332f-M-O16C64/buffers.json.j2   |   4 +-
 .../buffers_defaults_t0.j2                    |  77 ++++--
 .../buffers_defaults_t1.j2                    |  77 ++++--
 .../pg_profile_lookup.ini                     |  35 +--
 .../DellEMC-Z9332f-M-O16C64/qos.json.j2       | 227 +-----------------
 .../th3-z9332f-16x400G-64x100G.config.bcm     |   3 +
 .../DellEMC-Z9332f-O32/buffers.json.j2        |   4 +-
 .../DellEMC-Z9332f-O32/buffers_defaults_t0.j2 |  61 +++--
 .../DellEMC-Z9332f-O32/buffers_defaults_t1.j2 |  61 +++--
 .../DellEMC-Z9332f-O32/pg_profile_lookup.ini  |  35 +--
 .../DellEMC-Z9332f-O32/qos.json.j2            | 227 +-----------------
 .../th3-z9332f-32x400G.config.bcm             |   3 +
 12 files changed, 232 insertions(+), 582 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers.json.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers.json.j2
index 0b1cb2c541b6..03cd094bc938 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers.json.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers.json.j2
@@ -1,2 +1,2 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
index 77747f6403c8..29bb64904e6c 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
@@ -1,20 +1,57 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-    },
-    "BUFFER_PROFILE": {
-    },
-{%- endmacro %}
-
-{%- macro generate_pg_profils(port_names_active) %}
-    "BUFFER_PG": {
-    },
-{%- endmacro %}
-
-{% macro generate_queue_buffers(port_names_active) %}
-    "BUFFER_QUEUE": {
-    }
-{% endmacro %}
-
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,16) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(16,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "66800476",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "8644128"
+        },
+        "egress_lossless_pool": {
+            "size": "66800476",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"66800476"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"67117468"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1778",
+            "dynamic_th":"1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
index 77747f6403c8..29bb64904e6c 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
@@ -1,20 +1,57 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-    },
-    "BUFFER_PROFILE": {
-    },
-{%- endmacro %}
-
-{%- macro generate_pg_profils(port_names_active) %}
-    "BUFFER_PG": {
-    },
-{%- endmacro %}
-
-{% macro generate_queue_buffers(port_names_active) %}
-    "BUFFER_QUEUE": {
-    }
-{% endmacro %}
-
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,16) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(16,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "66800476",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "8644128"
+        },
+        "egress_lossless_pool": {
+            "size": "66800476",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"66800476"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"67117468"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1778",
+            "dynamic_th":"1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
index a5f3286beef8..b8bb10af9685 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
@@ -1,23 +1,12 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   1270     0   190500  -2        2540
-  25000  5m   1270     0   190500  -2        2540
-  40000  5m   1270     0   190500  -2        2540
-  50000  5m   1270     0   190500  -2        2540
- 100000  5m   1270     0   190500  -2        2540
- 200000  5m   1270     0   190500  -2        2540
- 400000  5m   1270     0   190500  -2        2540
-  10000  40m  1270     0   190500  -2        2540
-  25000  40m  1270     0   190500  -2        2540
-  40000  40m  1270     0   190500  -2        2540
-  50000  40m  1270     0   190500  -2        2540
- 100000  40m  1270     0   190500  -2        2540
- 200000  40m  1270     0   190500  -2        2540
- 400000  40m  1270     0   190500  -2        2540
-  10000  300m 1270     0   190500  -2        2540
-  25000  300m 1270     0   190500  -2        2540
-  40000  300m 1270     0   190500  -2        2540
-  50000  300m 1270     0   190500  -2        2540
- 100000  300m 1270     0   190500  -2        2540
- 200000  300m 1270     0   190500  -2        2540
- 400000  300m 1270     0   190500  -2        2540
+# PG lossless profiles.
+# speed cable   size    xon   xoff   threshold xon_offset
+ 100000  5m     2540    2540  68580     -2        2540
+ 100000  40m    2540    2540  74422     -2        2540
+ 100000  300m   2540    2540  117348    -2        2540
+ 100000  1000m  2540    2540  233172    -2        2540
+ 100000  2000m  2540    2540  398526    -2        2540
+ 400000  5m     2540    2540  35776     -2        2540
+ 400000  40m    2540    2540  53248     -2        2540
+ 400000  300m   2540    2540  66560     -2        2540
+ 400000  1000m  2540    2540  79872     -2        2540
+ 400000  2000m  2540    2540  54528     -2        2540
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/qos.json.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/qos.json.j2
index a48e1b56621c..3e548325ea30 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/qos.json.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/qos.json.j2
@@ -1,226 +1 @@
-{%- set PORT_ALL = [] %}
-{%- for port in PORT %}
-    {%- if PORT_ALL.append(port) %}{% endif %}
-{%- endfor %}
-{%- if PORT_ALL | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_all = [] %}
-{%- for port in PORT_ALL %}
-    {%- if port_names_list_all.append(port) %}{% endif %}
-{%- endfor %}
-{%- set port_names_all = port_names_list_all | join(',') -%}
-
-
-{%- set PORT_ACTIVE = [] %}
-{%- if DEVICE_NEIGHBOR is not defined %}
-    {%- set PORT_ACTIVE = PORT_ALL %}
-{%- else %}
-    {%- for port in DEVICE_NEIGHBOR.keys() %}
-        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
-    {%- endfor %}
-{%- endif %}
-{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_active = [] %}
-{%- for port in PORT_ACTIVE %}
-    {%- if port_names_list_active.append(port) %}{%- endif %}
-{%- endfor %}
-{%- set port_names_active = port_names_list_active | join(',') -%}
-
-
-{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
-
-
-{
-{% if generate_tc_to_pg_map is defined %}
-    {{- generate_tc_to_pg_map() }}
-{% else %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "0",
-            "2": "0",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "0",
-            "7": "7"
-        }
-    },
-{% endif %}
-    "MAP_PFC_PRIORITY_TO_QUEUE": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "TC_TO_QUEUE_MAP": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "DSCP_TO_TC_MAP": {
-        "DEFAULT": {
-            "0" : "0",
-            "1" : "0",
-            "2" : "0",
-            "3" : "0",
-            "4" : "0",
-            "5" : "0",
-            "6" : "0",
-            "7" : "0",
-            "8" : "0",
-            "9" : "0",
-            "10": "0",
-            "11": "0",
-            "12": "0",
-            "13": "0",
-            "14": "0",
-            "15": "0",
-            "16": "0",
-            "17": "0",
-            "18": "0",
-            "19": "0",
-            "20": "0",
-            "21": "0",
-            "22": "0",
-            "23": "0",
-            "24": "0",
-            "25": "0",
-            "26": "0",
-            "27": "0",
-            "28": "0",
-            "29": "0",
-            "30": "0",
-            "31": "0",
-            "32": "0",
-            "33": "0",
-            "34": "0",
-            "35": "0",
-            "36": "0",
-            "37": "0",
-            "38": "0",
-            "39": "0",
-            "40": "0",
-            "41": "0",
-            "42": "0",
-            "43": "0",
-            "44": "0",
-            "45": "0",
-            "46": "0",
-            "47": "0",
-            "48": "0",
-            "49": "0",
-            "50": "0",
-            "51": "0",
-            "52": "0",
-            "53": "0",
-            "54": "0",
-            "55": "0",
-            "56": "0",
-            "57": "0",
-            "58": "0",
-            "59": "0",
-            "60": "0",
-            "61": "0",
-            "62": "0",
-            "63": "0"
-        }
-    },
-    "SCHEDULER": {
-        "scheduler.0": {
-            "type"  : "DWRR",
-            "weight": "1"
-        },
-        "scheduler.1": {
-            "type"  : "DWRR",
-            "weight": "2"
-        },
-        "scheduler.2": {
-            "type"  : "DWRR",
-            "weight": "3"
-        },
-        "scheduler.3": {
-            "type"  : "DWRR",
-            "weight": "4"
-        },
-        "scheduler.4": {
-            "type"  : "DWRR",
-            "weight": "5"
-        },
-        "scheduler.5": {
-            "type"  : "DWRR",
-            "weight": "10"
-        },
-        "scheduler.6": {
-            "type"  : "DWRR",
-            "weight": "25"
-        },
-        "scheduler.7": {
-            "type"  : "STRICT"
-        }
-    },
-    "PORT_QOS_MAP": {
-        "{{ port_names_active }}": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|DEFAULT]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
-            "pfc_enable"      : "3,4",
-            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
-        }
-    },
-    "QUEUE": {
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|0": {
-            "scheduler"   : "[SCHEDULER|scheduler.0]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|1": {
-            "scheduler"   : "[SCHEDULER|scheduler.1]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|2": {
-            "scheduler": "[SCHEDULER|scheduler.2]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|3": {
-            "scheduler": "[SCHEDULER|scheduler.3]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|4": {
-            "scheduler": "[SCHEDULER|scheduler.4]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|5": {
-            "scheduler": "[SCHEDULER|scheduler.5]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|6": {
-            "scheduler": "[SCHEDULER|scheduler.6]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|7": {
-            "scheduler": "[SCHEDULER|scheduler.7]"
-        }{% if not loop.last %},{% endif %}
-{% endfor %}
-    }
-}
+{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index 2fe26e1e264e..e450564d17a2 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -44,6 +44,9 @@ l3_mem_entries=40960
 l2xlrn_thread_interval=50000
 l2xlrn_intr_en=0
 
+sai_optimized_mmu=1
+mmu_init_config="TH3-MSFT-T0"
+
 pbmp_xport_xe=0xffffffFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
 phy_an_c73=3
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers.json.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers.json.j2
index 0b1cb2c541b6..dadf74d555c5 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers.json.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers.json.j2
@@ -1,2 +1,2 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
index 77747f6403c8..94a40d257f6c 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
@@ -1,20 +1,41 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-    },
-    "BUFFER_PROFILE": {
-    },
-{%- endmacro %}
-
-{%- macro generate_pg_profils(port_names_active) %}
-    "BUFFER_PG": {
-    },
-{%- endmacro %}
-
-{% macro generate_queue_buffers(port_names_active) %}
-    "BUFFER_QUEUE": {
-    }
-{% endmacro %}
-
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "66435732",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "27400374"
+        },
+        "egress_lossless_pool": {
+            "size": "66435732",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"66435732"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"67117468"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1778",
+            "dynamic_th":"1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
index 77747f6403c8..94a40d257f6c 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
@@ -1,20 +1,41 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-    },
-    "BUFFER_PROFILE": {
-    },
-{%- endmacro %}
-
-{%- macro generate_pg_profils(port_names_active) %}
-    "BUFFER_PG": {
-    },
-{%- endmacro %}
-
-{% macro generate_queue_buffers(port_names_active) %}
-    "BUFFER_QUEUE": {
-    }
-{% endmacro %}
-
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "66435732",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "27400374"
+        },
+        "egress_lossless_pool": {
+            "size": "66435732",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"66435732"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"67117468"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1778",
+            "dynamic_th":"1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
index a5f3286beef8..b8bb10af9685 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
@@ -1,23 +1,12 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   1270     0   190500  -2        2540
-  25000  5m   1270     0   190500  -2        2540
-  40000  5m   1270     0   190500  -2        2540
-  50000  5m   1270     0   190500  -2        2540
- 100000  5m   1270     0   190500  -2        2540
- 200000  5m   1270     0   190500  -2        2540
- 400000  5m   1270     0   190500  -2        2540
-  10000  40m  1270     0   190500  -2        2540
-  25000  40m  1270     0   190500  -2        2540
-  40000  40m  1270     0   190500  -2        2540
-  50000  40m  1270     0   190500  -2        2540
- 100000  40m  1270     0   190500  -2        2540
- 200000  40m  1270     0   190500  -2        2540
- 400000  40m  1270     0   190500  -2        2540
-  10000  300m 1270     0   190500  -2        2540
-  25000  300m 1270     0   190500  -2        2540
-  40000  300m 1270     0   190500  -2        2540
-  50000  300m 1270     0   190500  -2        2540
- 100000  300m 1270     0   190500  -2        2540
- 200000  300m 1270     0   190500  -2        2540
- 400000  300m 1270     0   190500  -2        2540
+# PG lossless profiles.
+# speed cable   size    xon   xoff   threshold xon_offset
+ 100000  5m     2540    2540  68580     -2        2540
+ 100000  40m    2540    2540  74422     -2        2540
+ 100000  300m   2540    2540  117348    -2        2540
+ 100000  1000m  2540    2540  233172    -2        2540
+ 100000  2000m  2540    2540  398526    -2        2540
+ 400000  5m     2540    2540  35776     -2        2540
+ 400000  40m    2540    2540  53248     -2        2540
+ 400000  300m   2540    2540  66560     -2        2540
+ 400000  1000m  2540    2540  79872     -2        2540
+ 400000  2000m  2540    2540  54528     -2        2540
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/qos.json.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/qos.json.j2
index a48e1b56621c..3e548325ea30 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/qos.json.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/qos.json.j2
@@ -1,226 +1 @@
-{%- set PORT_ALL = [] %}
-{%- for port in PORT %}
-    {%- if PORT_ALL.append(port) %}{% endif %}
-{%- endfor %}
-{%- if PORT_ALL | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_all = [] %}
-{%- for port in PORT_ALL %}
-    {%- if port_names_list_all.append(port) %}{% endif %}
-{%- endfor %}
-{%- set port_names_all = port_names_list_all | join(',') -%}
-
-
-{%- set PORT_ACTIVE = [] %}
-{%- if DEVICE_NEIGHBOR is not defined %}
-    {%- set PORT_ACTIVE = PORT_ALL %}
-{%- else %}
-    {%- for port in DEVICE_NEIGHBOR.keys() %}
-        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
-    {%- endfor %}
-{%- endif %}
-{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_active = [] %}
-{%- for port in PORT_ACTIVE %}
-    {%- if port_names_list_active.append(port) %}{%- endif %}
-{%- endfor %}
-{%- set port_names_active = port_names_list_active | join(',') -%}
-
-
-{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
-
-
-{
-{% if generate_tc_to_pg_map is defined %}
-    {{- generate_tc_to_pg_map() }}
-{% else %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "0",
-            "2": "0",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "0",
-            "7": "7"
-        }
-    },
-{% endif %}
-    "MAP_PFC_PRIORITY_TO_QUEUE": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "TC_TO_QUEUE_MAP": {
-        "DEFAULT": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "DSCP_TO_TC_MAP": {
-        "DEFAULT": {
-            "0" : "0",
-            "1" : "0",
-            "2" : "0",
-            "3" : "0",
-            "4" : "0",
-            "5" : "0",
-            "6" : "0",
-            "7" : "0",
-            "8" : "0",
-            "9" : "0",
-            "10": "0",
-            "11": "0",
-            "12": "0",
-            "13": "0",
-            "14": "0",
-            "15": "0",
-            "16": "0",
-            "17": "0",
-            "18": "0",
-            "19": "0",
-            "20": "0",
-            "21": "0",
-            "22": "0",
-            "23": "0",
-            "24": "0",
-            "25": "0",
-            "26": "0",
-            "27": "0",
-            "28": "0",
-            "29": "0",
-            "30": "0",
-            "31": "0",
-            "32": "0",
-            "33": "0",
-            "34": "0",
-            "35": "0",
-            "36": "0",
-            "37": "0",
-            "38": "0",
-            "39": "0",
-            "40": "0",
-            "41": "0",
-            "42": "0",
-            "43": "0",
-            "44": "0",
-            "45": "0",
-            "46": "0",
-            "47": "0",
-            "48": "0",
-            "49": "0",
-            "50": "0",
-            "51": "0",
-            "52": "0",
-            "53": "0",
-            "54": "0",
-            "55": "0",
-            "56": "0",
-            "57": "0",
-            "58": "0",
-            "59": "0",
-            "60": "0",
-            "61": "0",
-            "62": "0",
-            "63": "0"
-        }
-    },
-    "SCHEDULER": {
-        "scheduler.0": {
-            "type"  : "DWRR",
-            "weight": "1"
-        },
-        "scheduler.1": {
-            "type"  : "DWRR",
-            "weight": "2"
-        },
-        "scheduler.2": {
-            "type"  : "DWRR",
-            "weight": "3"
-        },
-        "scheduler.3": {
-            "type"  : "DWRR",
-            "weight": "4"
-        },
-        "scheduler.4": {
-            "type"  : "DWRR",
-            "weight": "5"
-        },
-        "scheduler.5": {
-            "type"  : "DWRR",
-            "weight": "10"
-        },
-        "scheduler.6": {
-            "type"  : "DWRR",
-            "weight": "25"
-        },
-        "scheduler.7": {
-            "type"  : "STRICT"
-        }
-    },
-    "PORT_QOS_MAP": {
-        "{{ port_names_active }}": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|DEFAULT]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
-            "pfc_enable"      : "3,4",
-            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
-        }
-    },
-    "QUEUE": {
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|0": {
-            "scheduler"   : "[SCHEDULER|scheduler.0]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|1": {
-            "scheduler"   : "[SCHEDULER|scheduler.1]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|2": {
-            "scheduler": "[SCHEDULER|scheduler.2]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|3": {
-            "scheduler": "[SCHEDULER|scheduler.3]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|4": {
-            "scheduler": "[SCHEDULER|scheduler.4]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|5": {
-            "scheduler": "[SCHEDULER|scheduler.5]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|6": {
-            "scheduler": "[SCHEDULER|scheduler.6]"
-        },
-{% endfor %}
-{% for port in PORT_ACTIVE %}
-        "{{ port }}|7": {
-            "scheduler": "[SCHEDULER|scheduler.7]"
-        }{% if not loop.last %},{% endif %}
-{% endfor %}
-    }
-}
+{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index fc6613601f52..cf584cee0b14 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -44,6 +44,9 @@ l3_mem_entries=40960
 l2xlrn_thread_interval=50000
 l2xlrn_intr_en=0
 
+sai_optimized_mmu=1
+mmu_init_config="TH3-MSFT-T1"
+
 pbmp_xport_xe=0xffffffFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
 
 phy_an_c73=3

From 6d4bbdca92ba982dc04defcc4f1f22299efd4fb2 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Sat, 26 Jun 2021 12:08:04 +0300
Subject: [PATCH 0591/1674] [sonic-utilities][202012] submodule update (#7981)

Update submodule for sonic-utilities to include the following PRs:

Make the soft-reboot available in the SONiC image on master (#1681)
[config]: Update environment file during config reload (#1673)
Enable pr checker form 202012 (#1649)
[config] support for configuring muxcable to manual mode of operation (#1642)
[config] Fix config int add incorrect ip (#1414)

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d86d7652de9a..8b64f005f9d8 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d86d7652de9a29a62d612edf435b658ab78a0029
+Subproject commit 8b64f005f9d8207881f6904f0d6989d381b8e5fa

From b70a46cd3ebb5c3ea97149eadb3bb02706ffa3d8 Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Sun, 27 Jun 2021 10:05:14 +0300
Subject: [PATCH 0592/1674] [Mellanox] Update SKUs to enable SDK dumps (#7708)
 (#7978)

- Why I did it
To create SDK dump on Mellanox devices when SDK event has occurred.

- How I did it
Set the SKUs keys needed to initialize the feature in SAI.

- How to verify it
Simulate SDK event and check that dump is created in the expected path.
---
 device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile | 2 ++
 .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile   | 2 ++
 .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile | 2 ++
 .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile   | 2 ++
 device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile | 2 ++
 .../mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile  | 2 ++
 device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile | 2 ++
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile     | 2 ++
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile  | 2 ++
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile  | 2 ++
 .../Mellanox-SN3800-D28C49S1/sai.profile                       | 2 ++
 .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile  | 2 ++
 device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile | 2 ++
 .../mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile  | 2 ++
 .../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile   | 2 ++
 .../Mellanox-SN4600C-D112C8/sai.profile                        | 2 ++
 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile | 2 ++
 device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile | 3 +++
 24 files changed, 49 insertions(+)
 create mode 100644 device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile

diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile
index c13ca373750d..fa261ec655c2 100644
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2010.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile
index 5a381e4666ee..25f879a531d4 100644
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2100.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile
index f7cb264c2287..b707c2692102 100644
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2410.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile
index 696f3d8182f9..2b855ccb2d8e 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
index cfeb4a5fa4ba..68e245a2ce1b 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
index a98e620cfa10..4cfa685a0ab2 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
index b1ff086c68a5..aa93654b5406 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile
index adaa280e6cd5..e212df2e5ea1 100644
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2740.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile b/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile
index a30106c8674d..74228eb6446c 100644
--- a/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3420.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile
index 4907e971a2dd..a2f615568e59 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile
index 46750fb2e07b..21afbfe5c6d3 100644
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700c.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile
index 367f6c4e99c0..9c74ce166084 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
index 4ea8c4897815..35d3ce25a43a 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
index ab1e27c6aec4..8e672b95e232 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile
index 7c632389b58c..6580208c68de 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_24x50g_52x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
index 24a5baa1174d..4846e323ae99 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
index 60da1086ba81..ea9a7997fc04 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile
index be729cb4e06a..1fd5ba39f3af 100644
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4410.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
index 8d18361c1620..8dc29d810f8e 100644
--- a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile
index e9d1e3e5f591..33f195e4a17f 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
index 9f075500b86c..a9835c51dc3f 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
@@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
 SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile
index 15fccb416efd..eef447eba2f4 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_112x50g_8x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile
index d145093cab96..c6fb815168fe 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile
@@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile b/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile
new file mode 100644
index 000000000000..c00fc21f89c5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/sai.profile
@@ -0,0 +1,3 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4800.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10

From 4594e32f0c8f0563cb80a7579e78a2837fde2997 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:24:35 +0300
Subject: [PATCH 0593/1674] [Makefile.work] Add DOCKER_EXTRA_OPTS (#7775)

#### Why I did it

Usecase:

export DOCKER_EXTRA_OPTS="--registry-mirror=https://some.host" - to avoid DockerHub pull rate limiting.

#### How I did it

Added DOCKER_EXTRA_OPTS

#### How to verify it

export DOCKER_EXTRA_OPTS="--registry-mirror=https://some.host"
make target/sonic-mellanox.bin
---
 Makefile.work                     | 3 ++-
 sonic-slave-buster/Dockerfile.j2  | 2 +-
 sonic-slave-jessie/Dockerfile.j2  | 2 +-
 sonic-slave-stretch/Dockerfile.j2 | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index 1835c8a65651..a084fc68bee3 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -38,6 +38,7 @@
 #  * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
 #  * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
 #  * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
+#  * DOCKER_EXTRA_OPTS: Extra command line arguments for dockerd running in slave container.
 #
 ###############################################################################
 
@@ -131,7 +132,7 @@ $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
     scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
-$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
+$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
 $(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 0b3c2f4f9038..2efb61f733b2 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -479,7 +479,7 @@ RUN add-apt-repository \
            stable"
 RUN apt-get update
 RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-buster docker-ce-cli=5:18.09.5~3-0~debian-buster
-RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
+RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
 RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 
 # Install m2crypto package, needed by SWI tools
diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index f103dfb789b9..3c3e773ed2f9 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -332,7 +332,7 @@ RUN apt-get install -y docker-ce=18.03.1~ce-0~debian
 {%- elif CONFIGURED_ARCH == "armhf" %}
 RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
 {%- endif %}
-RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
+RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
 
 # For jenkins slave
 RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 8a1236b56ccd..5933bc4ea016 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -428,7 +428,7 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch docker-ce-cli=5:18
 {%- else %}
 RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
 {%- endif %}
-RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
+RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
 
 # Install m2crypto package, needed by SWI tools
 RUN pip install m2crypto==0.36.0

From 7ae509b3f8a603fa9de092e24fbb19054449ba0f Mon Sep 17 00:00:00 2001
From: roberthong-qct <79961212+roberthong-qct@users.noreply.github.com>
Date: Tue, 22 Jun 2021 00:24:41 +0800
Subject: [PATCH 0594/1674] [Quanta] Add and update platform and device files
 (#6971)

Add device and platform code for ix7-bwde, ix8a-bwde.
Support platform API 2.0 for all quanta platforms except for ix1b

Co-authored-by: robert.hong <robert.hong@qct.io>
---
 .../Quanta-IX7-BWDE-32X/buffers.json.j2       |    3 +
 .../buffers_defaults_def.j2                   |   46 +
 .../buffers_defaults_t0.j2                    |   45 +
 .../buffers_defaults_t1.j2                    |   46 +
 .../Quanta-IX7-BWDE-32X/l2/config             |    3 +
 .../Quanta-IX7-BWDE-32X/l3/config             |    5 +
 .../Quanta-IX7-BWDE-32X/pg_profile_lookup.ini |   17 +
 .../Quanta-IX7-BWDE-32X/platform-def.json     |   32 +
 .../Quanta-IX7-BWDE-32X/port_config.ini       |   33 +
 .../Quanta-IX7-BWDE-32X/qos.json.j2           |    1 +
 .../Quanta-IX7-BWDE-32X/qos_config_t1.j2      |  175 ++
 .../Quanta-IX7-BWDE-32X/sai.profile           |    2 +
 .../td3-ix7-bwde-32x100G.config.bcm           |  612 +++++
 .../x86_64-quanta_ix7_bwde-r0/custom_led.bin  |  Bin 0 -> 228 bytes
 .../x86_64-quanta_ix7_bwde-r0/default_sku     |    1 +
 .../x86_64-quanta_ix7_bwde-r0/installer.conf  |    4 +
 .../led_proc_init.soc                         |    4 +
 .../plugins/eeprom.py                         |   12 +
 .../plugins/fanutil.py                        |  110 +
 .../plugins/psuutil.py                        |  251 ++
 .../plugins/sfputil.py                        |  172 ++
 .../pmon_daemon_control.json                  |    3 +
 .../preemphasis-32x100G.soc                   |  546 +++++
 .../Quanta-IX7-32X/buffers.json.j2            |    3 +
 .../Quanta-IX7-32X/buffers_defaults_def.j2    |   46 +
 .../Quanta-IX7-32X/buffers_defaults_t0.j2     |   45 +
 .../Quanta-IX7-32X/buffers_defaults_t1.j2     |   46 +
 .../Quanta-IX7-32X/l2/config                  |    3 +
 .../Quanta-IX7-32X/l3/config                  |    5 +
 .../Quanta-IX7-32X/pg_profile_lookup.ini      |   17 +
 .../Quanta-IX7-32X/platform-def.json          |   32 +
 .../Quanta-IX7-32X/qos.json.j2                |    1 +
 .../Quanta-IX7-32X/qos_config_t1.j2           |  175 ++
 .../Quanta-IX7-32X/td3-ix7-32x100G.config.bcm |  249 +-
 .../custom_led.bin                            |  Bin 0 -> 228 bytes
 .../led_proc_init.soc                         |    8 +-
 .../plugins/eeprom.py                         |    2 +-
 .../plugins/fanutil.py                        |  110 +
 .../plugins/psuutil.py                        |  301 ++-
 .../plugins/sfputil.py                        |   64 +-
 .../pmon_daemon_control.json                  |    3 +
 .../preemphasis-32x100G.soc                   |  546 +++++
 .../Quanta-IX8-56X/buffers.json.j2            |    3 +
 .../Quanta-IX8-56X/buffers_defaults_def.j2    |   46 +
 .../Quanta-IX8-56X/buffers_defaults_t0.j2     |   45 +
 .../Quanta-IX8-56X/buffers_defaults_t1.j2     |   46 +
 .../Quanta-IX8-56X/l2/config                  |    3 +
 .../Quanta-IX8-56X/l3/config                  |    5 +
 .../Quanta-IX8-56X/pg_profile_lookup.ini      |   17 +
 .../Quanta-IX8-56X/platform-def.json          |   84 +
 .../Quanta-IX8-56X/port_config.ini            |  114 +-
 .../Quanta-IX8-56X/qos.json.j2                |    1 +
 .../Quanta-IX8-56X/qos_config_t1.j2           |  175 ++
 .../td3-ix8-48x25G+8x100G.config.bcm          |   93 +-
 .../custom_led.bin                            |  Bin 0 -> 196 bytes
 .../installer.conf                            |    1 +
 .../led_proc_init.soc                         |    8 +-
 .../plugins/eeprom.py                         |    2 +-
 .../plugins/fanutil.py                        |  110 +
 .../plugins/psuutil.py                        |  301 ++-
 .../plugins/sfputil.py                        |  112 +-
 .../pmon_daemon_control.json                  |    3 +
 .../preemphasis-48x25_8x100.soc               |  325 +++
 .../Quanta-IX8A-BWDE-56X/buffers.json.j2      |    3 +
 .../buffers_defaults_def.j2                   |   46 +
 .../buffers_defaults_t0.j2                    |   45 +
 .../buffers_defaults_t1.j2                    |   46 +
 .../Quanta-IX8A-BWDE-56X/l2/config            |    3 +
 .../Quanta-IX8A-BWDE-56X/l3/config            |    5 +
 .../pg_profile_lookup.ini                     |   17 +
 .../Quanta-IX8A-BWDE-56X/platform-def.json    |   48 +
 .../Quanta-IX8A-BWDE-56X/port_config.ini      |   57 +
 .../Quanta-IX8A-BWDE-56X/qos.json.j2          |    1 +
 .../Quanta-IX8A-BWDE-56X/qos_config_t1.j2     |  175 ++
 .../Quanta-IX8A-BWDE-56X/sai.profile          |    2 +
 .../td3-ix8a-bwde-48x25G+8x100G.config.bcm    |  475 ++++
 .../x86_64-quanta_ix8a_bwde-r0/custom_led.bin |  Bin 0 -> 564 bytes
 .../x86_64-quanta_ix8a_bwde-r0/default_sku    |    1 +
 .../x86_64-quanta_ix8a_bwde-r0/installer.conf |    3 +
 .../led_proc_init.soc                         |    3 +
 .../plugins/eeprom.py                         |   12 +
 .../plugins/fanutil.py                        |  110 +
 .../plugins/psuutil.py                        |  250 ++
 .../plugins/sfputil.py                        |  213 ++
 .../pmon_daemon_control.json                  |    3 +
 .../preemphasis-48x25_8x100.soc               |  349 +++
 .../td3-ix8c-48x25G+8x100G.config.bcm         |   87 +-
 .../x86_64-quanta_ix8c_bwde-r0/custom_led.bin |  Bin 0 -> 388 bytes
 .../led_proc_init.soc                         |    6 +-
 .../plugins/eeprom.py                         |    2 +-
 .../plugins/sfputil.py                        |  112 +-
 .../pmon_daemon_control.json                  |    4 +
 .../Quanta-IX9-32X/buffers.json.j2            |    2 +
 .../Quanta-IX9-32X/buffers_defaults_t0.j2     |   57 +
 .../Quanta-IX9-32X/buffers_defaults_t1.j2     |   57 +
 .../Quanta-IX9-32X/pg_profile_lookup.ini      |   23 +
 .../Quanta-IX9-32X/platform-def.json          |   43 +
 .../Quanta-IX9-32X/port_config.ini            |   66 +-
 .../Quanta-IX9-32X/qos.json.j2                |  230 ++
 .../Quanta-IX9-32X/th3-ix9-32x400G.config.bcm |  301 ++-
 .../x86_64-quanta_ix9_bwde-r0/custom_led.bin  |  Bin 0 -> 204 bytes
 .../led_proc_init.soc                         |    4 +
 .../plugins/eeprom.py                         |    2 +-
 .../plugins/sfputil.py                        |   90 +-
 .../pmon_daemon_control.json                  |    4 +
 .../preemphasis-32x400G.soc                   | 1057 ++++++++
 platform/broadcom/one-image.mk                |    2 +
 platform/broadcom/platform-modules-quanta.mk  |   12 +
 .../sonic-platform-modules-quanta/LICENSE     |    0
 .../debian/changelog                          |   14 +
 .../debian/compat                             |    0
 .../debian/control                            |    8 +
 .../debian/rules                              |   28 +-
 .../ix1b-32x/modules/qci_cpld_qsfp28.c        |    5 +-
 .../ix7-32x/modules/Makefile                  |    2 +-
 .../ix7-32x/modules/qci_cpld.c                |   20 +-
 .../ix7-32x/modules/qci_cpld_led.c            |    7 +-
 .../ix7-32x/modules/quanta_hwmon_ipmi.c       | 1908 +++++++++++++++
 .../ix7-32x/modules/quanta_platform_ix7.c     |  314 ++-
 .../ix7-32x/service/ix7-platform-init.service |    0
 .../ix7-32x/setup.py                          |    1 -
 .../ix7-32x/sonic_platform/__init__.py        |    2 +
 .../ix7-32x/sonic_platform/chassis.py         |  256 ++
 .../ix7-32x/sonic_platform/eeprom.py          |  209 ++
 .../ix7-32x/sonic_platform/fan.py             |  220 ++
 .../ix7-32x/sonic_platform/fan_drawer.py      |   47 +
 .../ix7-32x/sonic_platform/platform.py        |   20 +
 .../ix7-32x/sonic_platform/psu.py             |  320 +++
 .../ix7-32x/sonic_platform/sfp.py             | 1596 ++++++++++++
 .../ix7-32x/sonic_platform/thermal.py         |  154 ++
 .../ix7-32x/sonic_platform/watchdog.py        |  234 ++
 .../ix7-32x/sonic_platform_setup.py           |   24 +
 .../ix7-32x/utils/quanta_ix7_util.py          |  141 +-
 .../ix7-bwde-32x/classes/__init__.py          |    0
 .../ix7-bwde-32x/modules/Makefile             |    3 +
 .../ix7-bwde-32x/modules/qci_cpld.c           |  463 ++++
 .../ix7-bwde-32x/modules/qci_cpld_led.c       |  284 +++
 .../ix7-bwde-32x/modules/quanta_hwmon_ipmi.c  | 1908 +++++++++++++++
 .../modules/quanta_platform_ix7_bwde.c        |  303 +++
 .../service/ix7-bwde-platform-init.service    |   13 +
 .../ix7-bwde-32x/setup.py                     |   15 +
 .../ix7-bwde-32x/sonic_platform/__init__.py   |    3 +
 .../ix7-bwde-32x/sonic_platform/chassis.py    |  210 ++
 .../ix7-bwde-32x/sonic_platform/eeprom.py     |  110 +
 .../ix7-bwde-32x/sonic_platform/fan.py        |  220 ++
 .../ix7-bwde-32x/sonic_platform/fan_drawer.py |   47 +
 .../ix7-bwde-32x/sonic_platform/platform.py   |   20 +
 .../ix7-bwde-32x/sonic_platform/psu.py        |  320 +++
 .../ix7-bwde-32x/sonic_platform/sfp.py        | 1596 ++++++++++++
 .../ix7-bwde-32x/sonic_platform/thermal.py    |  157 ++
 .../ix7-bwde-32x/sonic_platform_setup.py      |   24 +
 .../utils/quanta_ix7_bwde_util.py             |  241 ++
 .../ix8-56x/classes/__init__.py               |    0
 .../ix8-56x/modules/Makefile                  |    2 +-
 .../ix8-56x/modules/qci_cpld_led.c            |    7 +-
 .../ix8-56x/modules/qci_cpld_sfp28.c          |    9 +-
 .../ix8-56x/modules/qci_platform_ix8.c        |  452 ++--
 .../ix8-56x/modules/quanta_hwmon_ipmi.c       | 1909 +++++++++++++++
 .../ix8-56x/service/ix8-platform-init.service |    0
 .../ix8-56x/setup.py                          |    1 -
 .../ix8-56x/sonic_platform/__init__.py        |    3 +
 .../ix8-56x/sonic_platform/chassis.py         |  232 ++
 .../ix8-56x/sonic_platform/eeprom.py          |  212 ++
 .../ix8-56x/sonic_platform/fan.py             |  226 ++
 .../ix8-56x/sonic_platform/fan_drawer.py      |   47 +
 .../ix8-56x/sonic_platform/platform.py        |   20 +
 .../ix8-56x/sonic_platform/psu.py             |  316 +++
 .../ix8-56x/sonic_platform/sfp.py             | 1625 +++++++++++++
 .../ix8-56x/sonic_platform/thermal.py         |  153 ++
 .../ix8-56x/sonic_platform/watchdog.py        |  234 ++
 .../ix8-56x/sonic_platform_setup.py           |   24 +
 .../ix8-56x/utils/quanta_ix8_util.py          |  187 +-
 .../ix8a-bwde-56x/classes/__init__.py         |    0
 .../ix8a-bwde-56x/modules/Makefile            |    1 +
 .../ix8a-bwde-56x/modules/qci_cpld_led.c      |  279 +++
 .../ix8a-bwde-56x/modules/qci_cpld_sfp28.c    |  381 +++
 .../modules/qci_platform_ix8a_bwde.c          |  372 +++
 .../ix8a-bwde-56x/modules/quanta_hwmon_ipmi.c | 1814 ++++++++++++++
 .../service/ix8a-bwde-platform-init.service   |   13 +
 .../ix8a-bwde-56x/setup.py                    |   15 +
 .../ix8a-bwde-56x/sonic_platform/__init__.py  |    3 +
 .../ix8a-bwde-56x/sonic_platform/chassis.py   |  232 ++
 .../ix8a-bwde-56x/sonic_platform/eeprom.py    |  110 +
 .../ix8a-bwde-56x/sonic_platform/fan.py       |  226 ++
 .../sonic_platform/fan_drawer.py              |   47 +
 .../ix8a-bwde-56x/sonic_platform/platform.py  |   20 +
 .../ix8a-bwde-56x/sonic_platform/psu.py       |  319 +++
 .../ix8a-bwde-56x/sonic_platform/sfp.py       | 1633 +++++++++++++
 .../ix8a-bwde-56x/sonic_platform/thermal.py   |  169 ++
 .../ix8a-bwde-56x/sonic_platform/watchdog.py  |  234 ++
 .../ix8a-bwde-56x/sonic_platform_setup.py     |   24 +
 .../utils/quanta_ix8a_bwde_util.py            |  336 +++
 .../ix8c-56x/modules/Makefile                 |    2 +-
 .../ix8c-56x/modules/qci_cpld_led.c           |    4 +-
 .../ix8c-56x/modules/qci_cpld_sfp28.c         |   32 +-
 .../ix8c-56x/modules/qci_platform_ix8c.c      |  394 ++-
 .../ix8c-56x/modules/quanta_hwmon_ipmi.c      | 1587 ++++++++++++
 .../service/ix8c-platform-init.service        |    0
 .../ix8c-56x/setup.py                         |    3 +-
 .../ix8c-56x/sonic_platform/__init__.py       |    3 +
 .../ix8c-56x/sonic_platform/chassis.py        |  222 ++
 .../ix8c-56x/sonic_platform/eeprom.py         |  212 ++
 .../ix8c-56x/sonic_platform/fan.py            |  226 ++
 .../ix8c-56x/sonic_platform/fan_drawer.py     |   47 +
 .../ix8c-56x/sonic_platform/platform.py       |   20 +
 .../ix8c-56x/sonic_platform/psu.py            |  223 ++
 .../ix8c-56x/sonic_platform/sfp.py            | 1625 +++++++++++++
 .../ix8c-56x/sonic_platform/thermal.py        |  140 ++
 .../ix8c-56x/sonic_platform_setup.py          |   24 +
 .../ix8c-56x/utils/quanta_ix8c_util.py        |  187 +-
 .../ix9-32x/modules/Makefile                  |    2 +-
 .../ix9-32x/modules/qci_cpld_led.c            |    9 +-
 .../ix9-32x/modules/qci_cpld_qsfpdd.c         |   12 +-
 .../ix9-32x/modules/qci_platform_ix9.c        |  277 +--
 .../ix9-32x/modules/quanta_hwmon_ipmi.c       | 1669 +++++++++++++
 .../ix9-32x/setup.py                          |    1 -
 .../ix9-32x/sonic_platform/__init__.py        |    3 +
 .../ix9-32x/sonic_platform/chassis.py         |  217 ++
 .../ix9-32x/sonic_platform/eeprom.py          |  212 ++
 .../ix9-32x/sonic_platform/fan.py             |  226 ++
 .../ix9-32x/sonic_platform/fan_drawer.py      |   47 +
 .../ix9-32x/sonic_platform/platform.py        |   20 +
 .../ix9-32x/sonic_platform/psu.py             |  319 +++
 .../ix9-32x/sonic_platform/sfp.py             | 2130 +++++++++++++++++
 .../ix9-32x/sonic_platform/thermal.py         |  158 ++
 .../ix9-32x/sonic_platform/watchdog.py        |  234 ++
 .../ix9-32x/sonic_platform_setup.py           |   24 +
 .../ix9-32x/utils/quanta_ix9_util.py          |  104 +-
 228 files changed, 41614 insertions(+), 1656 deletions(-)
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_def.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t0.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l2/config
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l3/config
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/pg_profile_lookup.ini
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/platform-def.json
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/port_config.ini
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos_config_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/sai.profile
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/td3-ix7-bwde-32x100G.config.bcm
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/custom_led.bin
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/default_sku
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/installer.conf
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/led_proc_init.soc
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/eeprom.py
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/fanutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/psuutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/sfputil.py
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix7_bwde-r0/preemphasis-32x100G.soc
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_def.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t0.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l2/config
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l3/config
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/pg_profile_lookup.ini
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/platform-def.json
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos_config_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/custom_led.bin
 mode change 100755 => 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/led_proc_init.soc
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/fanutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix7_rglbmc-r0/preemphasis-32x100G.soc
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_def.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t0.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l2/config
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l3/config
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/pg_profile_lookup.ini
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/platform-def.json
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos_config_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/custom_led.bin
 mode change 100755 => 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/led_proc_init.soc
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/fanutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix8_rglbmc-r0/preemphasis-48x25_8x100.soc
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_def.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t0.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l2/config
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l3/config
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/pg_profile_lookup.ini
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/platform-def.json
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/port_config.ini
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos_config_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/sai.profile
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/td3-ix8a-bwde-48x25G+8x100G.config.bcm
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/custom_led.bin
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/default_sku
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/installer.conf
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/led_proc_init.soc
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/eeprom.py
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/fanutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/psuutil.py
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/sfputil.py
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix8a_bwde-r0/preemphasis-48x25_8x100.soc
 create mode 100644 device/quanta/x86_64-quanta_ix8c_bwde-r0/custom_led.bin
 create mode 100644 device/quanta/x86_64-quanta_ix8c_bwde-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t0.j2
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t1.j2
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/pg_profile_lookup.ini
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/platform-def.json
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/qos.json.j2
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/custom_led.bin
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/pmon_daemon_control.json
 create mode 100644 device/quanta/x86_64-quanta_ix9_bwde-r0/preemphasis-32x400G.soc
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/LICENSE
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/debian/compat
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_hwmon_ipmi.c
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/service/ix7-platform-init.service
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/watchdog.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform_setup.py
 mode change 100644 => 100755 platform/broadcom/sonic-platform-modules-quanta/ix7-32x/utils/quanta_ix7_util.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/classes/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/Makefile
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld_led.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_hwmon_ipmi.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_platform_ix7_bwde.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/service/ix7-bwde-platform-init.service
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform_setup.py
 create mode 100755 platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/utils/quanta_ix7_bwde_util.py
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/classes/__init__.py
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/Makefile
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_led.c
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_sfp28.c
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/quanta_hwmon_ipmi.c
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/service/ix8-platform-init.service
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/watchdog.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform_setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/classes/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/Makefile
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_led.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_sfp28.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_platform_ix8a_bwde.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/quanta_hwmon_ipmi.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/service/ix8a-bwde-platform-init.service
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/watchdog.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform_setup.py
 create mode 100755 platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/utils/quanta_ix8a_bwde_util.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/quanta_hwmon_ipmi.c
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/service/ix8c-platform-init.service
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform_setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/quanta_hwmon_ipmi.c
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan_drawer.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/watchdog.py
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform_setup.py

diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers.json.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers.json.j2
new file mode 100644
index 000000000000..b67cf577ab75
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_def.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_def.j2
new file mode 100644
index 000000000000..740cfdf79e96
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_def.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "4625920",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t0.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..44fcf21887a6
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t0.j2
@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t1.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..5fe9cabcfd34
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "196608",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "33004032",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"33004032"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l2/config b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l2/config
new file mode 100644
index 000000000000..b2d4a1e80592
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l2/config
@@ -0,0 +1,3 @@
+l2_mem_entries=294912
+l3_mem_entries=16384
+l3_alpm_enable=0
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l3/config b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l3/config
new file mode 100644
index 000000000000..fff0cf54b08a
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/l3/config
@@ -0,0 +1,5 @@
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+sai_tunnel_support=1
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/pg_profile_lookup.ini b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..6d91d03ae684
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   9427       0     50176    1        3584
+  25000  5m   9427       0     50176    1        3584
+  40000  5m   9427       0     50176    1        3584
+  50000  5m   9427       0     50176    1        3584
+ 100000  5m   9427       0     50176    1        3584
+  10000  40m  9427       0     50176    1        3584
+  25000  40m  9427       0     50176    1        3584
+  40000  40m  9427       0     50176    1        3584
+  50000  40m  9427       0     50176    1        3584
+ 100000  40m  9427       0     50176    1        3584
+  10000  300m 9427       0     50176    1        3584
+  25000  300m 9427       0     50176    1        3584
+  40000  300m 9427       0     50176    1        3584
+  50000  300m 9427       0     50176    1        3584
+ 100000  300m 9427       0     50176    1        3584
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/platform-def.json b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/platform-def.json
new file mode 100644
index 000000000000..ed3f9fcbf2bf
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/platform-def.json
@@ -0,0 +1,32 @@
+{
+    "fec-mode": {
+        "Ethernet0-127": {
+            "1": {
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            },
+            "2": {
+                 "20000":  [ "none", "fc" ],
+                 "50000":  [ "none", "rs" ]
+            },
+            "4": {
+                 "40000":  [ "none", "fc" ],
+                 "100000": [ "none", "rs" ]
+            }
+        }
+    },
+    "default-fec-mode": {
+        "Ethernet0-127": {
+            "4": {
+                 "40000":  "none",
+                 "100000": "rs"
+            }
+        }
+    },
+    "native-port-supported-speeds": {
+        "Ethernet0-127": {
+            "4": ["100000","40000"]
+        }        
+    }
+}
+
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/port_config.ini b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/port_config.ini
new file mode 100644
index 000000000000..14f4716d9091
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/port_config.ini
@@ -0,0 +1,33 @@
+# name          lanes                 alias             index    speed
+Ethernet0       29,30,31,32           hundredGigE1      1        100000
+Ethernet4       33,34,35,36           hundredGigE2      2        100000
+Ethernet8       41,42,43,44           hundredGigE3      3        100000
+Ethernet12      45,46,47,48           hundredGigE4      4        100000
+Ethernet16      1,2,3,4               hundredGigE5      5        100000
+Ethernet20      5,6,7,8               hundredGigE6      6        100000
+Ethernet24      9,10,11,12            hundredGigE7      7        100000
+Ethernet28      13,14,15,16           hundredGigE8      8        100000
+Ethernet32      17,18,19,20           hundredGigE9      9        100000
+Ethernet36      21,22,23,24           hundredGigE10     10       100000
+Ethernet40      25,26,27,28           hundredGigE11     11       100000
+Ethernet44      37,38,39,40           hundredGigE12     12       100000
+Ethernet48      49,50,51,52           hundredGigE13     13       100000
+Ethernet52      53,54,55,56           hundredGigE14     14       100000
+Ethernet56      57,58,59,60           hundredGigE15     15       100000
+Ethernet60      61,62,63,64           hundredGigE16     16       100000
+Ethernet64      65,66,67,68           hundredGigE17     17       100000
+Ethernet68      69,70,71,72           hundredGigE18     18       100000
+Ethernet72      73,74,75,76           hundredGigE19     19       100000
+Ethernet76      77,78,79,80           hundredGigE20     20       100000
+Ethernet80      93,94,95,96           hundredGigE21     21       100000
+Ethernet84      101,102,103,104       hundredGigE22     22       100000
+Ethernet88      105,106,107,108       hundredGigE23     23       100000
+Ethernet92      109,110,111,112       hundredGigE24     24       100000
+Ethernet96      113,114,115,116       hundredGigE25     25       100000
+Ethernet100     117,118,119,120       hundredGigE26     26       100000
+Ethernet104     121,122,123,124       hundredGigE27     27       100000
+Ethernet108     125,126,127,128       hundredGigE28     28       100000
+Ethernet112     81,82,83,84           hundredGigE29     29       100000
+Ethernet116     85,86,87,88           hundredGigE30     30       100000
+Ethernet120     89,90,91,92           hundredGigE31     31       100000
+Ethernet124     97,98,99,100          hundredGigE32     32       100000
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos.json.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos.json.j2
new file mode 100644
index 000000000000..ee67c6e26221
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config_t1.j2' %}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos_config_t1.j2 b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos_config_t1.j2
new file mode 100644
index 000000000000..5fe5324a85c1
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/qos_config_t1.j2
@@ -0,0 +1,175 @@
+{%- set PORT_ALL = [] %}
+{%- for port in PORT %}
+    {%- if PORT_ALL.append(port) %}{% endif %}
+{%- endfor %}
+{%- if PORT_ALL | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_all = [] %}
+{%- for port in PORT_ALL %}
+    {%- if port_names_list_all.append(port) %}{% endif %}
+{%- endfor %}
+{%- set port_names_all = port_names_list_all | join(',') -%}
+
+
+{%- set PORT_ACTIVE = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_active = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active = port_names_list_active | join(',') -%}
+
+
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+
+
+{
+{% if generate_tc_to_pg_map is defined %}
+    {{- generate_tc_to_pg_map() }}
+{% else %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+{% endif %}
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+{% if asic_type in pfc_to_pg_map_supported_asics  %}
+    "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "3": "3",
+            "4": "4"
+        }
+    },
+{% endif %}
+    "PORT_QOS_MAP": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+{% if asic_type in pfc_to_pg_map_supported_asics %}
+            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+{% endif %}
+            "pfc_enable"      : "3,4"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/sai.profile b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/sai.profile
new file mode 100644
index 000000000000..5f6bb039153c
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-ix7-bwde-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/td3-ix7-bwde-32x100G.config.bcm b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/td3-ix7-bwde-32x100G.config.bcm
new file mode 100644
index 000000000000..0f64dfeed2c9
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/Quanta-IX7-BWDE-32X/td3-ix7-bwde-32x100G.config.bcm
@@ -0,0 +1,612 @@
+#polarity/lanemap is using TH2 style.
+core_clock_frequency=1525
+dpp_clock_ratio=2:3
+
+oversubscribe_mode=1
+
+#RIOT Enable
+riot_enable=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384
+
+pbmp_xport_xe=0x3ffffffffffffffffffffffffffffffffe
+
+port_flex_enable=1
+mem_cache_enable=0
+
+l3_alpm_ipv6_128b_bkt_rsvd=1
+fpem_mem_entries=0
+ifp_inports_support_enable=1
+l2xmsg_mode=1
+
+# Platform specfic
+bcm_num_cos=10
+default_cpu_tx_queue=9
+bcm_stat_interval=2000000
+cdma_timeout_usec=3000000
+ipv6_lpm_128b_enable=0x1
+l3_max_ecmp_mode=1
+lpm_scaling_enable=0
+max_vp_lags=0
+miim_intr_enable=0
+module_64ports=1
+schan_intr_enable=0
+stable_size=0x5500000
+tdma_timeout_usec=3000000
+skip_L2_USER_ENTRY=0
+bcm_tunnel_term_compatible_mode=1
+
+phy_an_c73=1
+# portmap settings
+
+portmap_1=1:100
+portmap_5=5:100
+portmap_9=9:100
+portmap_13=13:100
+portmap_17=17:100
+portmap_21=21:100
+portmap_25=25:100
+portmap_29=29:100
+
+portmap_33=33:100
+portmap_37=37:100
+portmap_41=41:100
+portmap_45=45:100
+portmap_49=49:100
+portmap_53=53:100
+portmap_57=57:100
+portmap_61=61:100
+
+portmap_67=65:100
+portmap_71=69:100
+portmap_75=73:100
+portmap_79=77:100
+portmap_83=81:100
+portmap_87=85:100
+portmap_91=89:100
+portmap_95=93:100
+
+portmap_99=97:100
+portmap_103=101:100
+portmap_107=105:100
+portmap_111=109:100
+portmap_115=113:100
+portmap_119=117:100
+portmap_123=121:100
+portmap_127=125:100
+
+# datapath port -- MerlinCore
+#Hide these to prevent SAI from initializing them...they are physically not on system 
+#front panel
+#portmap_66=129:10:m
+#portmap_130=128:10:m
+
+# loopback port
+portmap_65=130:10
+portmap_131=131:10
+
+# port order remap
+dport_map_port_29=1
+dport_map_port_30=2
+dport_map_port_31=3
+dport_map_port_32=4
+
+dport_map_port_33=5
+dport_map_port_34=6
+dport_map_port_35=7
+dport_map_port_36=8
+
+dport_map_port_41=9
+dport_map_port_42=10
+dport_map_port_43=11
+dport_map_port_44=12
+
+dport_map_port_45=13
+dport_map_port_46=14
+dport_map_port_47=15
+dport_map_port_48=16
+
+dport_map_port_1=17
+dport_map_port_2=18
+dport_map_port_3=19
+dport_map_port_4=20
+
+dport_map_port_5=21
+dport_map_port_6=22
+dport_map_port_7=23
+dport_map_port_8=24
+
+dport_map_port_9=25
+dport_map_port_10=26
+dport_map_port_11=27
+dport_map_port_12=28
+
+dport_map_port_13=29
+dport_map_port_14=30
+dport_map_port_15=31
+dport_map_port_16=32
+
+dport_map_port_17=33
+dport_map_port_18=34
+dport_map_port_19=35
+dport_map_port_20=36
+
+dport_map_port_21=37
+dport_map_port_22=38
+dport_map_port_23=39
+dport_map_port_24=40
+
+dport_map_port_25=41
+dport_map_port_26=42
+dport_map_port_27=43
+dport_map_port_28=44
+
+dport_map_port_37=45
+dport_map_port_38=46
+dport_map_port_39=47
+dport_map_port_40=48
+
+dport_map_port_49=49
+dport_map_port_50=50
+dport_map_port_51=51
+dport_map_port_52=52
+
+dport_map_port_53=53
+dport_map_port_54=54
+dport_map_port_55=55
+dport_map_port_56=56
+
+dport_map_port_57=57
+dport_map_port_58=58
+dport_map_port_59=59
+dport_map_port_60=60
+
+dport_map_port_61=61
+dport_map_port_62=62
+dport_map_port_63=63
+dport_map_port_64=64
+
+dport_map_port_67=65
+dport_map_port_68=66
+dport_map_port_69=67
+dport_map_port_70=68
+
+dport_map_port_71=69
+dport_map_port_72=70
+dport_map_port_73=71
+dport_map_port_74=72
+
+dport_map_port_75=73
+dport_map_port_76=74
+dport_map_port_77=75
+dport_map_port_78=76
+
+dport_map_port_79=77
+dport_map_port_80=78
+dport_map_port_81=79
+dport_map_port_82=80
+
+dport_map_port_95=81
+dport_map_port_96=82
+dport_map_port_97=83
+dport_map_port_98=84
+
+dport_map_port_103=85
+dport_map_port_104=86
+dport_map_port_105=87
+dport_map_port_106=88
+
+dport_map_port_107=89
+dport_map_port_108=90
+dport_map_port_109=91
+dport_map_port_110=92
+
+dport_map_port_111=93
+dport_map_port_112=94
+dport_map_port_113=95
+dport_map_port_114=96
+
+dport_map_port_115=97
+dport_map_port_116=98
+dport_map_port_117=99
+dport_map_port_118=100
+
+dport_map_port_119=101
+dport_map_port_120=102
+dport_map_port_121=103
+dport_map_port_122=104
+
+dport_map_port_123=105
+dport_map_port_124=106
+dport_map_port_125=107
+dport_map_port_126=108
+
+dport_map_port_127=109
+dport_map_port_128=110
+dport_map_port_129=111
+dport_map_port_130=112
+
+dport_map_port_83=113
+dport_map_port_84=114
+dport_map_port_85=115
+dport_map_port_86=116
+
+dport_map_port_87=117
+dport_map_port_88=118
+dport_map_port_89=119
+dport_map_port_90=120
+
+dport_map_port_91=121
+dport_map_port_92=122
+dport_map_port_93=123
+dport_map_port_94=124
+
+dport_map_port_99=125
+dport_map_port_100=126
+dport_map_port_101=127
+dport_map_port_102=128
+
+dport_map_port_66=129
+dport_map_port_130=130
+
+
+### lane swap and polarity follow physical port
+phy_chain_tx_lane_map_physical{29.0}=0x1230
+phy_chain_tx_polarity_flip_physical{29.0}=0x1
+phy_chain_tx_polarity_flip_physical{30.0}=0x0
+phy_chain_tx_polarity_flip_physical{31.0}=0x1
+phy_chain_tx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_lane_map_physical{29.0}=0x1302
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x1
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+
+phy_chain_tx_lane_map_physical{33.0}=0x3210
+phy_chain_tx_polarity_flip_physical{33.0}=0x1
+phy_chain_tx_polarity_flip_physical{34.0}=0x1
+phy_chain_tx_polarity_flip_physical{35.0}=0x1
+phy_chain_tx_polarity_flip_physical{36.0}=0x1
+phy_chain_rx_lane_map_physical{33.0}=0x0123
+phy_chain_rx_polarity_flip_physical{33.0}=0x0
+phy_chain_rx_polarity_flip_physical{34.0}=0x1
+phy_chain_rx_polarity_flip_physical{35.0}=0x0
+phy_chain_rx_polarity_flip_physical{36.0}=0x1
+
+phy_chain_tx_lane_map_physical{41.0}=0x0213
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x1
+phy_chain_tx_polarity_flip_physical{43.0}=0x1
+phy_chain_tx_polarity_flip_physical{44.0}=0x0
+phy_chain_rx_lane_map_physical{41.0}=0x1302
+phy_chain_rx_polarity_flip_physical{41.0}=0x1
+phy_chain_rx_polarity_flip_physical{42.0}=0x1
+phy_chain_rx_polarity_flip_physical{43.0}=0x0
+phy_chain_rx_polarity_flip_physical{44.0}=0x0
+
+phy_chain_tx_lane_map_physical{45.0}=0x3210
+phy_chain_tx_polarity_flip_physical{45.0}=0x1
+phy_chain_tx_polarity_flip_physical{46.0}=0x1
+phy_chain_tx_polarity_flip_physical{47.0}=0x1
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_lane_map_physical{45.0}=0x2103
+phy_chain_rx_polarity_flip_physical{45.0}=0x0
+phy_chain_rx_polarity_flip_physical{46.0}=0x0
+phy_chain_rx_polarity_flip_physical{47.0}=0x1
+phy_chain_rx_polarity_flip_physical{48.0}=0x0
+
+phy_chain_tx_lane_map_physical{1.0}=0x0213
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{2.0}=0x1
+phy_chain_tx_polarity_flip_physical{3.0}=0x1
+phy_chain_tx_polarity_flip_physical{4.0}=0x0
+phy_chain_rx_lane_map_physical{1.0}=0x1302
+phy_chain_rx_polarity_flip_physical{1.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x0
+phy_chain_rx_polarity_flip_physical{3.0}=0x1
+phy_chain_rx_polarity_flip_physical{4.0}=0x1
+
+phy_chain_tx_lane_map_physical{5.0}=0x3210
+phy_chain_tx_polarity_flip_physical{5.0}=0x1
+phy_chain_tx_polarity_flip_physical{6.0}=0x1
+phy_chain_tx_polarity_flip_physical{7.0}=0x1
+phy_chain_tx_polarity_flip_physical{8.0}=0x1
+phy_chain_rx_lane_map_physical{5.0}=0x2103
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x1
+phy_chain_rx_polarity_flip_physical{7.0}=0x0
+phy_chain_rx_polarity_flip_physical{8.0}=0x1
+
+phy_chain_tx_lane_map_physical{9.0}=0x0213
+phy_chain_tx_polarity_flip_physical{9.0}=0x0
+phy_chain_tx_polarity_flip_physical{10.0}=0x1
+phy_chain_tx_polarity_flip_physical{11.0}=0x1
+phy_chain_tx_polarity_flip_physical{12.0}=0x0
+phy_chain_rx_lane_map_physical{9.0}=0x1302
+phy_chain_rx_polarity_flip_physical{9.0}=0x0
+phy_chain_rx_polarity_flip_physical{10.0}=0x1
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x1
+
+phy_chain_tx_lane_map_physical{13.0}=0x3210
+phy_chain_tx_polarity_flip_physical{13.0}=0x1
+phy_chain_tx_polarity_flip_physical{14.0}=0x1
+phy_chain_tx_polarity_flip_physical{15.0}=0x1
+phy_chain_tx_polarity_flip_physical{16.0}=0x1
+phy_chain_rx_lane_map_physical{13.0}=0x2031
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x0
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x1
+
+phy_chain_tx_lane_map_physical{17.0}=0x0123
+phy_chain_tx_polarity_flip_physical{17.0}=0x0
+phy_chain_tx_polarity_flip_physical{18.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x1
+phy_chain_tx_polarity_flip_physical{20.0}=0x1
+phy_chain_rx_lane_map_physical{17.0}=0x1302
+phy_chain_rx_polarity_flip_physical{17.0}=0x0
+phy_chain_rx_polarity_flip_physical{18.0}=0x0
+phy_chain_rx_polarity_flip_physical{19.0}=0x1
+phy_chain_rx_polarity_flip_physical{20.0}=0x1
+
+phy_chain_tx_lane_map_physical{21.0}=0x3210
+phy_chain_tx_polarity_flip_physical{21.0}=0x1
+phy_chain_tx_polarity_flip_physical{22.0}=0x1
+phy_chain_tx_polarity_flip_physical{23.0}=0x1
+phy_chain_tx_polarity_flip_physical{24.0}=0x1
+phy_chain_rx_lane_map_physical{21.0}=0x1032
+phy_chain_rx_polarity_flip_physical{21.0}=0x0
+phy_chain_rx_polarity_flip_physical{22.0}=0x1
+phy_chain_rx_polarity_flip_physical{23.0}=0x1
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+
+phy_chain_tx_lane_map_physical{25.0}=0x0213
+phy_chain_tx_polarity_flip_physical{25.0}=0x1
+phy_chain_tx_polarity_flip_physical{26.0}=0x0
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x1
+phy_chain_rx_lane_map_physical{25.0}=0x1302
+phy_chain_rx_polarity_flip_physical{25.0}=0x1
+phy_chain_rx_polarity_flip_physical{26.0}=0x1
+phy_chain_rx_polarity_flip_physical{27.0}=0x0
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+
+phy_chain_tx_lane_map_physical{37.0}=0x3210
+phy_chain_tx_polarity_flip_physical{37.0}=0x1
+phy_chain_tx_polarity_flip_physical{38.0}=0x1
+phy_chain_tx_polarity_flip_physical{39.0}=0x1
+phy_chain_tx_polarity_flip_physical{40.0}=0x1
+phy_chain_rx_lane_map_physical{37.0}=0x2103
+phy_chain_rx_polarity_flip_physical{37.0}=0x0
+phy_chain_rx_polarity_flip_physical{38.0}=0x0
+phy_chain_rx_polarity_flip_physical{39.0}=0x1
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+
+phy_chain_tx_lane_map_physical{49.0}=0x0213
+phy_chain_tx_polarity_flip_physical{49.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x1
+phy_chain_rx_lane_map_physical{49.0}=0x1302
+phy_chain_rx_polarity_flip_physical{49.0}=0x1
+phy_chain_rx_polarity_flip_physical{50.0}=0x1
+phy_chain_rx_polarity_flip_physical{51.0}=0x0
+phy_chain_rx_polarity_flip_physical{52.0}=0x0
+
+phy_chain_tx_lane_map_physical{53.0}=0x3210
+phy_chain_tx_polarity_flip_physical{53.0}=0x0
+phy_chain_tx_polarity_flip_physical{54.0}=0x0
+phy_chain_tx_polarity_flip_physical{55.0}=0x0
+phy_chain_tx_polarity_flip_physical{56.0}=0x0
+phy_chain_rx_lane_map_physical{53.0}=0x2103
+phy_chain_rx_polarity_flip_physical{53.0}=0x0
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x1
+phy_chain_rx_polarity_flip_physical{56.0}=0x0
+
+phy_chain_tx_lane_map_physical{57.0}=0x0213
+phy_chain_tx_polarity_flip_physical{57.0}=0x0
+phy_chain_tx_polarity_flip_physical{58.0}=0x1
+phy_chain_tx_polarity_flip_physical{59.0}=0x1
+phy_chain_tx_polarity_flip_physical{60.0}=0x0
+phy_chain_rx_lane_map_physical{57.0}=0x1302
+phy_chain_rx_polarity_flip_physical{57.0}=0x1
+phy_chain_rx_polarity_flip_physical{58.0}=0x1
+phy_chain_rx_polarity_flip_physical{59.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x0
+
+phy_chain_tx_lane_map_physical{61.0}=0x3210
+phy_chain_tx_polarity_flip_physical{61.0}=0x1
+phy_chain_tx_polarity_flip_physical{62.0}=0x1
+phy_chain_tx_polarity_flip_physical{63.0}=0x1
+phy_chain_tx_polarity_flip_physical{64.0}=0x1
+phy_chain_rx_lane_map_physical{61.0}=0x2103
+phy_chain_rx_polarity_flip_physical{61.0}=0x0
+phy_chain_rx_polarity_flip_physical{62.0}=0x0
+phy_chain_rx_polarity_flip_physical{63.0}=0x1
+phy_chain_rx_polarity_flip_physical{64.0}=0x0
+
+phy_chain_tx_lane_map_physical{65.0}=0x3210
+phy_chain_tx_polarity_flip_physical{65.0}=0x0
+phy_chain_tx_polarity_flip_physical{66.0}=0x0
+phy_chain_tx_polarity_flip_physical{67.0}=0x1
+phy_chain_tx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_lane_map_physical{65.0}=0x3120
+phy_chain_rx_polarity_flip_physical{65.0}=0x0
+phy_chain_rx_polarity_flip_physical{66.0}=0x0
+phy_chain_rx_polarity_flip_physical{67.0}=0x1
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+
+phy_chain_tx_lane_map_physical{69.0}=0x0123
+phy_chain_tx_polarity_flip_physical{69.0}=0x0
+phy_chain_tx_polarity_flip_physical{70.0}=0x0
+phy_chain_tx_polarity_flip_physical{71.0}=0x0
+phy_chain_tx_polarity_flip_physical{72.0}=0x0
+phy_chain_rx_lane_map_physical{69.0}=0x2301
+phy_chain_rx_polarity_flip_physical{69.0}=0x1
+phy_chain_rx_polarity_flip_physical{70.0}=0x0
+phy_chain_rx_polarity_flip_physical{71.0}=0x0
+phy_chain_rx_polarity_flip_physical{72.0}=0x0
+
+phy_chain_tx_lane_map_physical{73.0}=0x3120
+phy_chain_tx_polarity_flip_physical{73.0}=0x1
+phy_chain_tx_polarity_flip_physical{74.0}=0x0
+phy_chain_tx_polarity_flip_physical{75.0}=0x0
+phy_chain_tx_polarity_flip_physical{76.0}=0x1
+phy_chain_rx_lane_map_physical{73.0}=0x3120
+phy_chain_rx_polarity_flip_physical{73.0}=0x0
+phy_chain_rx_polarity_flip_physical{74.0}=0x0
+phy_chain_rx_polarity_flip_physical{75.0}=0x1
+phy_chain_rx_polarity_flip_physical{76.0}=0x1
+
+phy_chain_tx_lane_map_physical{77.0}=0x0213
+phy_chain_tx_polarity_flip_physical{77.0}=0x1
+phy_chain_tx_polarity_flip_physical{78.0}=0x0
+phy_chain_tx_polarity_flip_physical{79.0}=0x0
+phy_chain_tx_polarity_flip_physical{80.0}=0x1
+phy_chain_rx_lane_map_physical{77.0}=0x0321
+phy_chain_rx_polarity_flip_physical{77.0}=0x1
+phy_chain_rx_polarity_flip_physical{78.0}=0x1
+phy_chain_rx_polarity_flip_physical{79.0}=0x0
+phy_chain_rx_polarity_flip_physical{80.0}=0x1
+
+phy_chain_tx_lane_map_physical{93.0}=0x3120
+phy_chain_tx_polarity_flip_physical{93.0}=0x1
+phy_chain_tx_polarity_flip_physical{94.0}=0x0
+phy_chain_tx_polarity_flip_physical{95.0}=0x0
+phy_chain_tx_polarity_flip_physical{96.0}=0x1
+phy_chain_rx_lane_map_physical{93.0}=0x3120
+phy_chain_rx_polarity_flip_physical{93.0}=0x1
+phy_chain_rx_polarity_flip_physical{94.0}=0x1
+phy_chain_rx_polarity_flip_physical{95.0}=0x0
+phy_chain_rx_polarity_flip_physical{96.0}=0x0
+
+phy_chain_tx_lane_map_physical{101.0}=0x0321
+phy_chain_tx_polarity_flip_physical{101.0}=0x0
+phy_chain_tx_polarity_flip_physical{102.0}=0x1
+phy_chain_tx_polarity_flip_physical{103.0}=0x1
+phy_chain_tx_polarity_flip_physical{104.0}=0x1
+phy_chain_rx_lane_map_physical{101.0}=0x0321
+phy_chain_rx_polarity_flip_physical{101.0}=0x1
+phy_chain_rx_polarity_flip_physical{102.0}=0x1
+phy_chain_rx_polarity_flip_physical{103.0}=0x0
+phy_chain_rx_polarity_flip_physical{104.0}=0x1
+
+phy_chain_tx_lane_map_physical{105.0}=0x3120
+phy_chain_tx_polarity_flip_physical{105.0}=0x1
+phy_chain_tx_polarity_flip_physical{106.0}=0x0
+phy_chain_tx_polarity_flip_physical{107.0}=0x0
+phy_chain_tx_polarity_flip_physical{108.0}=0x1
+phy_chain_rx_lane_map_physical{105.0}=0x3120
+phy_chain_rx_polarity_flip_physical{105.0}=0x1
+phy_chain_rx_polarity_flip_physical{106.0}=0x1
+phy_chain_rx_polarity_flip_physical{107.0}=0x0
+phy_chain_rx_polarity_flip_physical{108.0}=0x0
+
+phy_chain_tx_lane_map_physical{109.0}=0x0123
+phy_chain_tx_polarity_flip_physical{109.0}=0x1
+phy_chain_tx_polarity_flip_physical{110.0}=0x1
+phy_chain_tx_polarity_flip_physical{111.0}=0x1
+phy_chain_tx_polarity_flip_physical{112.0}=0x1
+phy_chain_rx_lane_map_physical{109.0}=0x0321
+phy_chain_rx_polarity_flip_physical{109.0}=0x0
+phy_chain_rx_polarity_flip_physical{110.0}=0x0
+phy_chain_rx_polarity_flip_physical{111.0}=0x1
+phy_chain_rx_polarity_flip_physical{112.0}=0x0
+
+phy_chain_tx_lane_map_physical{113.0}=0x0312
+phy_chain_tx_polarity_flip_physical{113.0}=0x0
+phy_chain_tx_polarity_flip_physical{114.0}=0x0
+phy_chain_tx_polarity_flip_physical{115.0}=0x1
+phy_chain_tx_polarity_flip_physical{116.0}=0x0
+phy_chain_rx_lane_map_physical{113.0}=0x3120
+phy_chain_rx_polarity_flip_physical{113.0}=0x1
+phy_chain_rx_polarity_flip_physical{114.0}=0x1
+phy_chain_rx_polarity_flip_physical{115.0}=0x0
+phy_chain_rx_polarity_flip_physical{116.0}=0x1
+
+phy_chain_tx_lane_map_physical{117.0}=0x0123
+phy_chain_tx_polarity_flip_physical{117.0}=0x1
+phy_chain_tx_polarity_flip_physical{118.0}=0x1
+phy_chain_tx_polarity_flip_physical{119.0}=0x1
+phy_chain_tx_polarity_flip_physical{120.0}=0x1
+phy_chain_rx_lane_map_physical{117.0}=0x1320
+phy_chain_rx_polarity_flip_physical{117.0}=0x1
+phy_chain_rx_polarity_flip_physical{118.0}=0x1
+phy_chain_rx_polarity_flip_physical{119.0}=0x1
+phy_chain_rx_polarity_flip_physical{120.0}=0x0
+
+phy_chain_tx_lane_map_physical{121.0}=0x3120
+phy_chain_tx_polarity_flip_physical{121.0}=0x1
+phy_chain_tx_polarity_flip_physical{122.0}=0x0
+phy_chain_tx_polarity_flip_physical{123.0}=0x0
+phy_chain_tx_polarity_flip_physical{124.0}=0x1
+phy_chain_rx_lane_map_physical{121.0}=0x0123
+phy_chain_rx_polarity_flip_physical{121.0}=0x0
+phy_chain_rx_polarity_flip_physical{122.0}=0x1
+phy_chain_rx_polarity_flip_physical{123.0}=0x0
+phy_chain_rx_polarity_flip_physical{124.0}=0x1
+
+phy_chain_tx_lane_map_physical{125.0}=0x0123
+phy_chain_tx_polarity_flip_physical{125.0}=0x0
+phy_chain_tx_polarity_flip_physical{126.0}=0x0
+phy_chain_tx_polarity_flip_physical{127.0}=0x0
+phy_chain_tx_polarity_flip_physical{128.0}=0x0
+phy_chain_rx_lane_map_physical{125.0}=0x0321
+phy_chain_rx_polarity_flip_physical{125.0}=0x0
+phy_chain_rx_polarity_flip_physical{126.0}=0x0
+phy_chain_rx_polarity_flip_physical{127.0}=0x1
+phy_chain_rx_polarity_flip_physical{128.0}=0x0
+
+phy_chain_tx_lane_map_physical{81.0}=0x3201
+phy_chain_tx_polarity_flip_physical{81.0}=0x0
+phy_chain_tx_polarity_flip_physical{82.0}=0x1
+phy_chain_tx_polarity_flip_physical{83.0}=0x1
+phy_chain_tx_polarity_flip_physical{84.0}=0x1
+phy_chain_rx_lane_map_physical{81.0}=0x3120
+phy_chain_rx_polarity_flip_physical{81.0}=0x0
+phy_chain_rx_polarity_flip_physical{82.0}=0x0
+phy_chain_rx_polarity_flip_physical{83.0}=0x1
+phy_chain_rx_polarity_flip_physical{84.0}=0x0
+
+phy_chain_tx_lane_map_physical{85.0}=0x0123
+phy_chain_tx_polarity_flip_physical{85.0}=0x1
+phy_chain_tx_polarity_flip_physical{86.0}=0x1
+phy_chain_tx_polarity_flip_physical{87.0}=0x1
+phy_chain_tx_polarity_flip_physical{88.0}=0x1
+phy_chain_rx_lane_map_physical{85.0}=0x0321
+phy_chain_rx_polarity_flip_physical{85.0}=0x1
+phy_chain_rx_polarity_flip_physical{86.0}=0x1
+phy_chain_rx_polarity_flip_physical{87.0}=0x0
+phy_chain_rx_polarity_flip_physical{88.0}=0x1
+
+phy_chain_tx_lane_map_physical{89.0}=0x3210
+phy_chain_tx_polarity_flip_physical{89.0}=0x1
+phy_chain_tx_polarity_flip_physical{90.0}=0x1
+phy_chain_tx_polarity_flip_physical{91.0}=0x1
+phy_chain_tx_polarity_flip_physical{92.0}=0x1
+phy_chain_rx_lane_map_physical{89.0}=0x0123
+phy_chain_rx_polarity_flip_physical{89.0}=0x1
+phy_chain_rx_polarity_flip_physical{90.0}=0x0
+phy_chain_rx_polarity_flip_physical{91.0}=0x1
+phy_chain_rx_polarity_flip_physical{92.0}=0x0
+
+phy_chain_tx_lane_map_physical{97.0}=0x0312
+phy_chain_tx_polarity_flip_physical{97.0}=0x0
+phy_chain_tx_polarity_flip_physical{98.0}=0x0
+phy_chain_tx_polarity_flip_physical{99.0}=0x1
+phy_chain_tx_polarity_flip_physical{100.0}=0x1
+phy_chain_rx_lane_map_physical{97.0}=0x0321
+phy_chain_rx_polarity_flip_physical{97.0}=0x1
+phy_chain_rx_polarity_flip_physical{98.0}=0x0
+phy_chain_rx_polarity_flip_physical{99.0}=0x1
+phy_chain_rx_polarity_flip_physical{100.0}=0x0
+
+
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix7_bwde-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..813addd1ac063143aebd0a748819c0505e1ba1b4
GIT binary patch
literal 228
zcmV<A02}}CwO>Y7MomUUM)0(Quq;a;JDNrSCjldwMgt_EMgk)XKw3gmL0durlLsM;
zMke3~Xw+Nb2~S2jKu1O=LIKbLoFPCg91kr3*))ix02~>lvZMe<Xg?XcMr1|+DFD!1
zMo~r#fB`d`vIH^&E8o!opRz^)Hv%J?L?AB*(7m!c0RSTeB%?+EmsUp5=K&+bU_c@Q
zVSge*VFMz9VZ&koBLibUAwgq;W5Z#?W5Z+vuspnwMwv#UMyp2fy}(AqH~;__02lxo
e02=@t0384x01yBl01*HZ022Td02Kfh02u(cZ$n`K

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/default_sku b/device/quanta/x86_64-quanta_ix7_bwde-r0/default_sku
new file mode 100644
index 000000000000..bd318bb8fc69
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/default_sku
@@ -0,0 +1 @@
+Quanta-IX7-BWDE-32X t1
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/installer.conf b/device/quanta/x86_64-quanta_ix7_bwde-r0/installer.conf
new file mode 100644
index 000000000000..90f773149c41
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/installer.conf
@@ -0,0 +1,4 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200
+
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix7_bwde-r0/led_proc_init.soc
new file mode 100644
index 000000000000..7b049da0eab0
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/led_proc_init.soc
@@ -0,0 +1,4 @@
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
+led start
+
+rcload /usr/share/sonic/platform/preemphasis-32x100G.soc
\ No newline at end of file
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/eeprom.py
new file mode 100644
index 000000000000..0a6121c3cd92
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/eeprom.py
@@ -0,0 +1,12 @@
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+    _TLV_INFO_MAX_LEN = 256
+
+    def __init__(self, name, path, cpld_root, ro):
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/fanutil.py b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/fanutil.py
new file mode 100644
index 000000000000..2cf72ddf7e5b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/fanutil.py
@@ -0,0 +1,110 @@
+#
+# fanutil.py
+# Platform-specific Fan status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_fan.fan_base import FanBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+class FanUtil(FanBase):
+    """Platform-specific FANutil class"""
+
+    SYS_FAN_NUM = 6
+    NUM_FANS_PERTRAY = 2
+    HWMON_PATH = '/sys/class/hwmon/hwmon2/'
+    FAN_INDEX_START = 18
+
+    logger = logging.getLogger(__name__)
+
+    def __init__(self, log_level=logging.DEBUG):
+        FanBase.__init__(self)
+        self.num_fans = (self.SYS_FAN_NUM * self.NUM_FANS_PERTRAY) 
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def check_fan_index(self, index):
+        if index is None:
+            return False
+
+        if index < 1 or index > self.num_fans:
+            logging.error("Invalid Fan index:", index)
+            return False
+
+        return True
+
+    def get_num_fans(self):
+        return self.num_fans
+
+    def get_status(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        if fantray_speed == '0.0' :
+           return False
+
+        return True
+
+    def get_presence(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_present_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_present'
+        fantray_present = self.get_attr_value(self.HWMON_PATH + fantray_present_file)
+
+        if fantray_present == '1' :
+           return True
+
+        return False
+
+    def get_direction(self, index):
+        if self.check_fan_index(index) == False:
+           return None
+
+        fantray_direction_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_direction'
+        fantray_direction = self.get_attr_value(self.HWMON_PATH + fantray_direction_file)
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if fantray_direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_speed(self, index):
+        if self.check_fan_index(index) == False:
+           return 0
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        return int(float(fantray_speed))
+
+
+    def set_speed(self, val):
+        logging.error("Not allowed to set fan speed!")
+
+        return False
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/psuutil.py b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..1761fcd3d30e
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/psuutil.py
@@ -0,0 +1,251 @@
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    HWMON_PATH = '/sys/class/hwmon/hwmon2/'
+    PSU1_PREFIX = 'power39_'
+    PSU2_PREFIX = 'power49_'
+    MAX_PSUS = 2
+    def __init__(self):
+        PsuBase.__init__(self)
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def get_attr_filename(self, index, attr):
+        if (index == 1):
+            attr_file = self.PSU1_PREFIX + attr
+        elif (index == 2):
+            attr_file = self.PSU2_PREFIX + attr
+        else:
+            logging.error("Invalid PSU number:", index)
+            return ''
+
+        return attr_file
+
+    def get_num_psus(self):
+        """
+        Retrieves the number of PSUs available on the device
+        :return: An integer, the number of PSUs available on the device
+         """
+
+        return self.MAX_PSUS
+
+    def get_psu_status(self, index):
+        """
+        Retrieves the oprational status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is operating properly, False if PSU is\
+        faulty
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+            return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+
+    def get_psu_presence(self, index):
+        """
+        Retrieves the presence status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is plugged, False if not
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'present')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check PSU status
+            if (attr_value == 1):
+                status = True
+        return status
+
+    def get_powergood_status(self, index):
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+    
+    def get_model(self, index):
+        attr_filename = self.get_attr_filename(index, 'model')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_mfr_id(self, index):
+        attr_filename = self.get_attr_filename(index, 'mfrid')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_serial(self, index):
+        attr_filename = self.get_attr_filename(index, 'sn')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_direction(self, index):
+        if (index == 1):
+            direction_file = 'fan37_direction'
+        elif (index == 2):
+            direction_file = 'fan47_direction'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return None
+
+        direction = self.get_attr_value(self.HWMON_PATH + direction_file)
+        direction = direction.rstrip()
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_output_voltage(self, index):
+        if (index == 1):
+            attr_file = 'in44_input'
+        elif (index == 2):
+            attr_file = 'in54_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        voltage = self.get_attr_value(self.HWMON_PATH + attr_file)
+        voltage = voltage.rstrip()
+
+        if (voltage != 'ERR'):
+            voltage, dummy = voltage.split('.', 1)
+        else:
+            return 0.0
+
+        return float(voltage)/1000
+
+    def get_output_current(self, index):
+        if (index == 1):
+            attr_file = 'curr36_input'
+        elif (index == 2):
+            attr_file = 'curr46_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        current = self.get_attr_value(self.HWMON_PATH + attr_file)
+        current = current.rstrip()
+
+        if (current != 'ERR'):
+            current, dummy = current.split('.',1)
+        else:
+            return 0.0
+
+        return float(current)/1000
+
+    def get_output_power(self, index):
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return 0.0
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+        else:
+            return 0.0
+
+        return float(attr_value/1000)
+
+    def get_fan_rpm(self, index, fan_idx):
+        if (index == 1):
+            rpm_file = 'fan37_input'
+        elif (index == 2):
+            rpm_file = 'fan47_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0
+
+        rpm = self.get_attr_value(self.HWMON_PATH + rpm_file)
+        rpm = rpm.rstrip()
+        if (rpm != 'ERR'):
+            rpm = float(rpm)
+        else:
+            return 0
+
+        return int(rpm)
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/sfputil.py
new file mode 100644
index 000000000000..1cc3a12b372c
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/plugins/sfputil.py
@@ -0,0 +1,172 @@
+# sfputil.py
+#
+# Platform-specific SFP transceiver interface for SONiC
+#
+
+try:
+    import time
+    from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
+
+
+class SfpUtil(SfpUtilBase):
+    """Platform-specific SfpUtil class"""
+
+    PORT_START = 1
+    PORT_END = 32
+    PORTS_IN_BLOCK = 32
+
+    _port_to_eeprom_mapping = {}
+    _port_to_i2c_mapping = {
+         1 : 13,
+         2 : 14,
+         3 : 15,
+         4 : 16,
+         5 : 17,
+         6 : 18,
+         7 : 19,
+         8 : 20,
+         9 : 21,
+        10 : 22,
+        11 : 23,
+        12 : 24,
+        13 : 25,
+        14 : 26,
+        15 : 27,
+        16 : 28,
+        17 : 29,
+        18 : 30,
+        19 : 31,
+        20 : 32,
+        21 : 33,
+        22 : 34,
+        23 : 35,
+        24 : 36,
+        25 : 37,
+        26 : 38,
+        27 : 39,
+        28 : 40,
+        29 : 41,
+        30 : 42,
+        31 : 43,
+        32 : 44
+    }
+
+    @property
+    def port_start(self):
+        return self.PORT_START
+
+    @property
+    def port_end(self):
+        return self.PORT_END
+
+    @property
+    def qsfp_ports(self):
+        return list(range(self.PORT_START, self.PORTS_IN_BLOCK + 1))
+
+    @property
+    def port_to_eeprom_mapping(self):
+        return self._port_to_eeprom_mapping
+
+    def __init__(self):
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        for x in range(self.port_start, self.port_end+1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+        SfpUtilBase.__init__(self)
+
+    def get_presence(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(port_num)+"/module_present")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        if reg_value == '1':
+            return True
+
+        return False
+
+    def get_low_power_mode(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(port_num)+"/lpmode")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = int(reg_file.readline().rstrip())
+
+        if reg_value == 0:
+            return False
+
+        return True
+
+    def set_low_power_mode(self, port_num, lpmode):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(port_num)+"/lpmode", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        # LPMode is active high; set or clear the bit accordingly
+        if lpmode is True:
+            reg_value = 1
+        else:
+            reg_value = 0
+
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        return True
+
+    def reset(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(port_num)+"/reset", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = 0
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        # Sleep 2 second to allow it to settle
+        time.sleep(2)
+
+        # Flip the value back write back to the register to take port out of reset
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(port_num)+"/reset", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = 1
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        return True
+
+    def get_transceiver_change_event(self):
+        """
+        TODO: This function need to be implemented
+        when decide to support monitoring SFP(Xcvrd)
+        on this platform.
+        """
+        raise NotImplementedError
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix7_bwde-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..94592fa8cebc
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/quanta/x86_64-quanta_ix7_bwde-r0/preemphasis-32x100G.soc b/device/quanta/x86_64-quanta_ix7_bwde-r0/preemphasis-32x100G.soc
new file mode 100644
index 000000000000..986bb271ca1b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_bwde-r0/preemphasis-32x100G.soc
@@ -0,0 +1,546 @@
+# Pre-emphasis
+
+phy raw c45 0xa5 0x1 0xffde 0
+phy raw c45 0xa5 0x1 0xd130 0x4d
+phy raw c45 0xa5 0x1 0xd131 0x0611
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 1
+phy raw c45 0xa5 0x1 0xd130 0x4d
+phy raw c45 0xa5 0x1 0xd131 0x0611
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 2
+phy raw c45 0xa5 0x1 0xd130 0x4e
+phy raw c45 0xa5 0x1 0xd131 0x0610
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 3
+phy raw c45 0xa5 0x1 0xd130 0x4e
+phy raw c45 0xa5 0x1 0xd131 0x0610
+phy raw c45 0xa5 0x1 0xd134 1
+
+phy raw c45 0xa9 0x1 0xffde 0
+phy raw c45 0xa9 0x1 0xd130 0x4e
+phy raw c45 0xa9 0x1 0xd131 0x0610
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 1
+phy raw c45 0xa9 0x1 0xd130 0x4e
+phy raw c45 0xa9 0x1 0xd131 0x0610
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 2
+phy raw c45 0xa9 0x1 0xd130 0x4e
+phy raw c45 0xa9 0x1 0xd131 0x0610
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 3
+phy raw c45 0xa9 0x1 0xd130 0x4e
+phy raw c45 0xa9 0x1 0xd131 0x0610
+phy raw c45 0xa9 0x1 0xd134 1
+
+phy raw c45 0xc1 0x1 0xffde 0
+phy raw c45 0xc1 0x1 0xd130 0x4e
+phy raw c45 0xc1 0x1 0xd131 0x0610
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 1
+phy raw c45 0xc1 0x1 0xd130 0x4d
+phy raw c45 0xc1 0x1 0xd131 0x0611
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 2
+phy raw c45 0xc1 0x1 0xd130 0x4e
+phy raw c45 0xc1 0x1 0xd131 0x0610
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 3
+phy raw c45 0xc1 0x1 0xd130 0x4e
+phy raw c45 0xc1 0x1 0xd131 0x0610
+phy raw c45 0xc1 0x1 0xd134 1
+
+phy raw c45 0xc5 0x1 0xffde 0
+phy raw c45 0xc5 0x1 0xd130 0x4e
+phy raw c45 0xc5 0x1 0xd131 0x0610
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 1
+phy raw c45 0xc5 0x1 0xd130 0x4e
+phy raw c45 0xc5 0x1 0xd131 0x0610
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 2
+phy raw c45 0xc5 0x1 0xd130 0x4d
+phy raw c45 0xc5 0x1 0xd131 0x0611
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 3
+phy raw c45 0xc5 0x1 0xd130 0x4e
+phy raw c45 0xc5 0x1 0xd131 0x0610
+phy raw c45 0xc5 0x1 0xd134 1
+
+phy raw c45 0x81 0x1 0xffde 0
+phy raw c45 0x81 0x1 0xd130 0x4e
+phy raw c45 0x81 0x1 0xd131 0x0610
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 1
+phy raw c45 0x81 0x1 0xd130 0x4d
+phy raw c45 0x81 0x1 0xd131 0x0611
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 2
+phy raw c45 0x81 0x1 0xd130 0x4e
+phy raw c45 0x81 0x1 0xd131 0x0610
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 3
+phy raw c45 0x81 0x1 0xd130 0x4e
+phy raw c45 0x81 0x1 0xd131 0x0610
+phy raw c45 0x81 0x1 0xd134 1
+
+phy raw c45 0x85 0x1 0xffde 0
+phy raw c45 0x85 0x1 0xd130 0x4e
+phy raw c45 0x85 0x1 0xd131 0x0610
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 1
+phy raw c45 0x85 0x1 0xd130 0x4e
+phy raw c45 0x85 0x1 0xd131 0x0610
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 2
+phy raw c45 0x85 0x1 0xd130 0x4e
+phy raw c45 0x85 0x1 0xd131 0x0610
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 3
+phy raw c45 0x85 0x1 0xd130 0x4d
+phy raw c45 0x85 0x1 0xd131 0x0611
+phy raw c45 0x85 0x1 0xd134 1
+
+phy raw c45 0x89 0x1 0xffde 0
+phy raw c45 0x89 0x1 0xd130 0x50
+phy raw c45 0x89 0x1 0xd131 0x060e
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 1
+phy raw c45 0x89 0x1 0xd130 0x50
+phy raw c45 0x89 0x1 0xd131 0x060e
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 2
+phy raw c45 0x89 0x1 0xd130 0x50
+phy raw c45 0x89 0x1 0xd131 0x060e
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 3
+phy raw c45 0x89 0x1 0xd130 0x50
+phy raw c45 0x89 0x1 0xd131 0x060e
+phy raw c45 0x89 0x1 0xd134 1
+
+phy raw c45 0x8d 0x1 0xffde 0
+phy raw c45 0x8d 0x1 0xd130 0x4f
+phy raw c45 0x8d 0x1 0xd131 0x060f
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 1
+phy raw c45 0x8d 0x1 0xd130 0x4f
+phy raw c45 0x8d 0x1 0xd131 0x060f
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 2
+phy raw c45 0x8d 0x1 0xd130 0x4f
+phy raw c45 0x8d 0x1 0xd131 0x060f
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 3
+phy raw c45 0x8d 0x1 0xd130 0x4f
+phy raw c45 0x8d 0x1 0xd131 0x060f
+phy raw c45 0x8d 0x1 0xd134 1
+
+phy raw c45 0x91 0x1 0xffde 0
+phy raw c45 0x91 0x1 0xd130 0x50
+phy raw c45 0x91 0x1 0xd131 0x060e
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 1
+phy raw c45 0x91 0x1 0xd130 0x50
+phy raw c45 0x91 0x1 0xd131 0x060e
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 2
+phy raw c45 0x91 0x1 0xd130 0x50
+phy raw c45 0x91 0x1 0xd131 0x060e
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 3
+phy raw c45 0x91 0x1 0xd130 0x50
+phy raw c45 0x91 0x1 0xd131 0x060e
+phy raw c45 0x91 0x1 0xd134 1
+
+phy raw c45 0x95 0x1 0xffde 0
+phy raw c45 0x95 0x1 0xd130 0x52
+phy raw c45 0x95 0x1 0xd131 0x060c
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 1
+phy raw c45 0x95 0x1 0xd130 0x52
+phy raw c45 0x95 0x1 0xd131 0x060c
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 2
+phy raw c45 0x95 0x1 0xd130 0x52
+phy raw c45 0x95 0x1 0xd131 0x060c
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 3
+phy raw c45 0x95 0x1 0xd130 0x52
+phy raw c45 0x95 0x1 0xd131 0x060c
+phy raw c45 0x95 0x1 0xd134 1
+
+phy raw c45 0xa1 0x1 0xffde 0
+phy raw c45 0xa1 0x1 0xd130 0x52
+phy raw c45 0xa1 0x1 0xd131 0x060c
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 1
+phy raw c45 0xa1 0x1 0xd130 0x52
+phy raw c45 0xa1 0x1 0xd131 0x060c
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 2
+phy raw c45 0xa1 0x1 0xd130 0x52
+phy raw c45 0xa1 0x1 0xd131 0x060c
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 3
+phy raw c45 0xa1 0x1 0xd130 0x52
+phy raw c45 0xa1 0x1 0xd131 0x060c
+phy raw c45 0xa1 0x1 0xd134 1
+
+phy raw c45 0xad 0x1 0xffde 0
+phy raw c45 0xad 0x1 0xd130 0x53
+phy raw c45 0xad 0x1 0xd131 0x060b
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 1
+phy raw c45 0xad 0x1 0xd130 0x53
+phy raw c45 0xad 0x1 0xd131 0x060b
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 2
+phy raw c45 0xad 0x1 0xd130 0x53
+phy raw c45 0xad 0x1 0xd131 0x060b
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 3
+phy raw c45 0xad 0x1 0xd130 0x53
+phy raw c45 0xad 0x1 0xd131 0x060b
+phy raw c45 0xad 0x1 0xd134 1
+
+phy raw c45 0xc9 0x1 0xffde 0
+phy raw c45 0xc9 0x1 0xd130 0x53
+phy raw c45 0xc9 0x1 0xd131 0x060b
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 1
+phy raw c45 0xc9 0x1 0xd130 0x53
+phy raw c45 0xc9 0x1 0xd131 0x060b
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 2
+phy raw c45 0xc9 0x1 0xd130 0x53
+phy raw c45 0xc9 0x1 0xd131 0x060b
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 3
+phy raw c45 0xc9 0x1 0xd130 0x53
+phy raw c45 0xc9 0x1 0xd131 0x060b
+phy raw c45 0xc9 0x1 0xd134 1
+
+phy raw c45 0xcd 0x1 0xffde 0
+phy raw c45 0xcd 0x1 0xd130 0x54
+phy raw c45 0xcd 0x1 0xd131 0x060a
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 1
+phy raw c45 0xcd 0x1 0xd130 0x54
+phy raw c45 0xcd 0x1 0xd131 0x060a
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 2
+phy raw c45 0xcd 0x1 0xd130 0x54
+phy raw c45 0xcd 0x1 0xd131 0x060a
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 3
+phy raw c45 0xcd 0x1 0xd130 0x54
+phy raw c45 0xcd 0x1 0xd131 0x060a
+phy raw c45 0xcd 0x1 0xd134 1
+
+phy raw c45 0xd1 0x1 0xffde 0
+phy raw c45 0xd1 0x1 0xd130 0x56
+phy raw c45 0xd1 0x1 0xd131 0x0608
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 1
+phy raw c45 0xd1 0x1 0xd130 0x56
+phy raw c45 0xd1 0x1 0xd131 0x0608
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 2
+phy raw c45 0xd1 0x1 0xd130 0x56
+phy raw c45 0xd1 0x1 0xd131 0x0608
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 3
+phy raw c45 0xd1 0x1 0xd130 0x56
+phy raw c45 0xd1 0x1 0xd131 0x0608
+phy raw c45 0xd1 0x1 0xd134 1
+
+phy raw c45 0xd5 0x1 0xffde 0
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x0609
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 1
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x0609
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 2
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x0609
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 3
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x0609
+phy raw c45 0xd5 0x1 0xd134 1
+
+phy raw c45 0xe1 0x1 0xffde 0
+phy raw c45 0xe1 0x1 0xd130 0x56
+phy raw c45 0xe1 0x1 0xd131 0x0608
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 1
+phy raw c45 0xe1 0x1 0xd130 0x56
+phy raw c45 0xe1 0x1 0xd131 0x0608
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 2
+phy raw c45 0xe1 0x1 0xd130 0x56
+phy raw c45 0xe1 0x1 0xd131 0x0608
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 3
+phy raw c45 0xe1 0x1 0xd130 0x56
+phy raw c45 0xe1 0x1 0xd131 0x0608
+phy raw c45 0xe1 0x1 0xd134 1
+
+phy raw c45 0xe5 0x1 0xffde 0
+phy raw c45 0xe5 0x1 0xd130 0x55
+phy raw c45 0xe5 0x1 0xd131 0x0609
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 1
+phy raw c45 0xe5 0x1 0xd130 0x55
+phy raw c45 0xe5 0x1 0xd131 0x0609
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 2
+phy raw c45 0xe5 0x1 0xd130 0x55
+phy raw c45 0xe5 0x1 0xd131 0x0609
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 3
+phy raw c45 0xe5 0x1 0xd130 0x55
+phy raw c45 0xe5 0x1 0xd131 0x0609
+phy raw c45 0xe5 0x1 0xd134 1
+
+phy raw c45 0xe9 0x1 0xffde 0
+phy raw c45 0xe9 0x1 0xd130 0x56
+phy raw c45 0xe9 0x1 0xd131 0x0608
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 1
+phy raw c45 0xe9 0x1 0xd130 0x56
+phy raw c45 0xe9 0x1 0xd131 0x0608
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 2
+phy raw c45 0xe9 0x1 0xd130 0x56
+phy raw c45 0xe9 0x1 0xd131 0x0608
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 3
+phy raw c45 0xe9 0x1 0xd130 0x56
+phy raw c45 0xe9 0x1 0xd131 0x0608
+phy raw c45 0xe9 0x1 0xd134 1
+
+phy raw c45 0xed 0x1 0xffde 0
+phy raw c45 0xed 0x1 0xd130 0x55
+phy raw c45 0xed 0x1 0xd131 0x0609
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 1
+phy raw c45 0xed 0x1 0xd130 0x53
+phy raw c45 0xed 0x1 0xd131 0x060b
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 2
+phy raw c45 0xed 0x1 0xd130 0x54
+phy raw c45 0xed 0x1 0xd131 0x060a
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 3
+phy raw c45 0xed 0x1 0xd130 0x54
+phy raw c45 0xed 0x1 0xd131 0x060a
+phy raw c45 0xed 0x1 0xd134 1
+
+phy raw c45 0x185 0x1 0xffde 0
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x0609
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 1
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x0609
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 2
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x0609
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 3
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x0609
+phy raw c45 0x185 0x1 0xd134 1
+
+phy raw c45 0x18d 0x1 0xffde 0
+phy raw c45 0x18d 0x1 0xd130 0x54
+phy raw c45 0x18d 0x1 0xd131 0x060a
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 1
+phy raw c45 0x18d 0x1 0xd130 0x53
+phy raw c45 0x18d 0x1 0xd131 0x060b
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 2
+phy raw c45 0x18d 0x1 0xd130 0x53
+phy raw c45 0x18d 0x1 0xd131 0x060b
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 3
+phy raw c45 0x18d 0x1 0xd130 0x53
+phy raw c45 0x18d 0x1 0xd131 0x060b
+phy raw c45 0x18d 0x1 0xd134 1
+
+phy raw c45 0x1a1 0x1 0xffde 0
+phy raw c45 0x1a1 0x1 0xd130 0x55
+phy raw c45 0x1a1 0x1 0xd131 0x0609
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 1
+phy raw c45 0x1a1 0x1 0xd130 0x54
+phy raw c45 0x1a1 0x1 0xd131 0x060a
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 2
+phy raw c45 0x1a1 0x1 0xd130 0x55
+phy raw c45 0x1a1 0x1 0xd131 0x0609
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 3
+phy raw c45 0x1a1 0x1 0xd130 0x53
+phy raw c45 0x1a1 0x1 0xd131 0x060b
+phy raw c45 0x1a1 0x1 0xd134 1
+
+phy raw c45 0x1a5 0x1 0xffde 0
+phy raw c45 0x1a5 0x1 0xd130 0x54
+phy raw c45 0x1a5 0x1 0xd131 0x060a
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 1
+phy raw c45 0x1a5 0x1 0xd130 0x53
+phy raw c45 0x1a5 0x1 0xd131 0x060b
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 2
+phy raw c45 0x1a5 0x1 0xd130 0x53
+phy raw c45 0x1a5 0x1 0xd131 0x060b
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 3
+phy raw c45 0x1a5 0x1 0xd130 0x53
+phy raw c45 0x1a5 0x1 0xd131 0x060b
+phy raw c45 0x1a5 0x1 0xd134 1
+
+phy raw c45 0x1a9 0x1 0xffde 0
+phy raw c45 0x1a9 0x1 0xd130 0x54
+phy raw c45 0x1a9 0x1 0xd131 0x060a
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 1
+phy raw c45 0x1a9 0x1 0xd130 0x51
+phy raw c45 0x1a9 0x1 0xd131 0x060d
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 2
+phy raw c45 0x1a9 0x1 0xd130 0x52
+phy raw c45 0x1a9 0x1 0xd131 0x060c
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 3
+phy raw c45 0x1a9 0x1 0xd130 0x52
+phy raw c45 0x1a9 0x1 0xd131 0x060c
+phy raw c45 0x1a9 0x1 0xd134 1
+
+phy raw c45 0x1ad 0x1 0xffde 0
+phy raw c45 0x1ad 0x1 0xd130 0x51
+phy raw c45 0x1ad 0x1 0xd131 0x060d
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 1
+phy raw c45 0x1ad 0x1 0xd130 0x4f
+phy raw c45 0x1ad 0x1 0xd131 0x060f
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 2
+phy raw c45 0x1ad 0x1 0xd130 0x4f
+phy raw c45 0x1ad 0x1 0xd131 0x060f
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 3
+phy raw c45 0x1ad 0x1 0xd130 0x4f
+phy raw c45 0x1ad 0x1 0xd131 0x060f
+phy raw c45 0x1ad 0x1 0xd134 1
+
+phy raw c45 0x1b1 0x1 0xffde 0
+phy raw c45 0x1b1 0x1 0xd130 0x4f
+phy raw c45 0x1b1 0x1 0xd131 0x060f
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 1
+phy raw c45 0x1b1 0x1 0xd130 0x4f
+phy raw c45 0x1b1 0x1 0xd131 0x060f
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 2
+phy raw c45 0x1b1 0x1 0xd130 0x4f
+phy raw c45 0x1b1 0x1 0xd131 0x060f
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 3
+phy raw c45 0x1b1 0x1 0xd130 0x4f
+phy raw c45 0x1b1 0x1 0xd131 0x060f
+phy raw c45 0x1b1 0x1 0xd134 1
+
+phy raw c45 0x1b5 0x1 0xffde 0
+phy raw c45 0x1b5 0x1 0xd130 0x4e
+phy raw c45 0x1b5 0x1 0xd131 0x0610
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 1
+phy raw c45 0x1b5 0x1 0xd130 0x4d
+phy raw c45 0x1b5 0x1 0xd131 0x0611
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 2
+phy raw c45 0x1b5 0x1 0xd130 0x4d
+phy raw c45 0x1b5 0x1 0xd131 0x0611
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 3
+phy raw c45 0x1b5 0x1 0xd130 0x4d
+phy raw c45 0x1b5 0x1 0xd131 0x0611
+phy raw c45 0x1b5 0x1 0xd134 1
+
+phy raw c45 0xf1 0x1 0xffde 0
+phy raw c45 0xf1 0x1 0xd130 0x4f
+phy raw c45 0xf1 0x1 0xd131 0x060f
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 1
+phy raw c45 0xf1 0x1 0xd130 0x4f
+phy raw c45 0xf1 0x1 0xd131 0x060f
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 2
+phy raw c45 0xf1 0x1 0xd130 0x4f
+phy raw c45 0xf1 0x1 0xd131 0x060f
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 3
+phy raw c45 0xf1 0x1 0xd130 0x4f
+phy raw c45 0xf1 0x1 0xd131 0x060f
+phy raw c45 0xf1 0x1 0xd134 1
+
+phy raw c45 0xf5 0x1 0xffde 0
+phy raw c45 0xf5 0x1 0xd130 0x4d
+phy raw c45 0xf5 0x1 0xd131 0x0611
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 1
+phy raw c45 0xf5 0x1 0xd130 0x4d
+phy raw c45 0xf5 0x1 0xd131 0x0611
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 2
+phy raw c45 0xf5 0x1 0xd130 0x4d
+phy raw c45 0xf5 0x1 0xd131 0x0611
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 3
+phy raw c45 0xf5 0x1 0xd130 0x4d
+phy raw c45 0xf5 0x1 0xd131 0x0611
+phy raw c45 0xf5 0x1 0xd134 1
+
+phy raw c45 0x181 0x1 0xffde 0
+phy raw c45 0x181 0x1 0xd130 0x4e
+phy raw c45 0x181 0x1 0xd131 0x0610
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 1
+phy raw c45 0x181 0x1 0xd130 0x4e
+phy raw c45 0x181 0x1 0xd131 0x0610
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 2
+phy raw c45 0x181 0x1 0xd130 0x4e
+phy raw c45 0x181 0x1 0xd131 0x0610
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 3
+phy raw c45 0x181 0x1 0xd130 0x4e
+phy raw c45 0x181 0x1 0xd131 0x0610
+phy raw c45 0x181 0x1 0xd134 1
+
+phy raw c45 0x189 0x1 0xffde 0
+phy raw c45 0x189 0x1 0xd130 0x4d
+phy raw c45 0x189 0x1 0xd131 0x0611
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 1
+phy raw c45 0x189 0x1 0xd130 0x4d
+phy raw c45 0x189 0x1 0xd131 0x0611
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 2
+phy raw c45 0x189 0x1 0xd130 0x4d
+phy raw c45 0x189 0x1 0xd131 0x0611
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 3
+phy raw c45 0x189 0x1 0xd130 0x4d
+phy raw c45 0x189 0x1 0xd131 0x0611
+phy raw c45 0x189 0x1 0xd134 1
+
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers.json.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers.json.j2
new file mode 100644
index 000000000000..b67cf577ab75
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_def.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_def.j2
new file mode 100644
index 000000000000..740cfdf79e96
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_def.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "4625920",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t0.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..44fcf21887a6
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t0.j2
@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t1.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..5fe9cabcfd34
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "196608",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "33004032",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"33004032"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l2/config b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l2/config
new file mode 100644
index 000000000000..b2d4a1e80592
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l2/config
@@ -0,0 +1,3 @@
+l2_mem_entries=294912
+l3_mem_entries=16384
+l3_alpm_enable=0
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l3/config b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l3/config
new file mode 100644
index 000000000000..fff0cf54b08a
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/l3/config
@@ -0,0 +1,5 @@
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+sai_tunnel_support=1
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/pg_profile_lookup.ini b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..6d91d03ae684
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   9427       0     50176    1        3584
+  25000  5m   9427       0     50176    1        3584
+  40000  5m   9427       0     50176    1        3584
+  50000  5m   9427       0     50176    1        3584
+ 100000  5m   9427       0     50176    1        3584
+  10000  40m  9427       0     50176    1        3584
+  25000  40m  9427       0     50176    1        3584
+  40000  40m  9427       0     50176    1        3584
+  50000  40m  9427       0     50176    1        3584
+ 100000  40m  9427       0     50176    1        3584
+  10000  300m 9427       0     50176    1        3584
+  25000  300m 9427       0     50176    1        3584
+  40000  300m 9427       0     50176    1        3584
+  50000  300m 9427       0     50176    1        3584
+ 100000  300m 9427       0     50176    1        3584
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/platform-def.json b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/platform-def.json
new file mode 100644
index 000000000000..ed3f9fcbf2bf
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/platform-def.json
@@ -0,0 +1,32 @@
+{
+    "fec-mode": {
+        "Ethernet0-127": {
+            "1": {
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            },
+            "2": {
+                 "20000":  [ "none", "fc" ],
+                 "50000":  [ "none", "rs" ]
+            },
+            "4": {
+                 "40000":  [ "none", "fc" ],
+                 "100000": [ "none", "rs" ]
+            }
+        }
+    },
+    "default-fec-mode": {
+        "Ethernet0-127": {
+            "4": {
+                 "40000":  "none",
+                 "100000": "rs"
+            }
+        }
+    },
+    "native-port-supported-speeds": {
+        "Ethernet0-127": {
+            "4": ["100000","40000"]
+        }        
+    }
+}
+
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos.json.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos.json.j2
new file mode 100644
index 000000000000..ee67c6e26221
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config_t1.j2' %}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos_config_t1.j2 b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos_config_t1.j2
new file mode 100644
index 000000000000..5fe5324a85c1
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/qos_config_t1.j2
@@ -0,0 +1,175 @@
+{%- set PORT_ALL = [] %}
+{%- for port in PORT %}
+    {%- if PORT_ALL.append(port) %}{% endif %}
+{%- endfor %}
+{%- if PORT_ALL | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_all = [] %}
+{%- for port in PORT_ALL %}
+    {%- if port_names_list_all.append(port) %}{% endif %}
+{%- endfor %}
+{%- set port_names_all = port_names_list_all | join(',') -%}
+
+
+{%- set PORT_ACTIVE = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_active = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active = port_names_list_active | join(',') -%}
+
+
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+
+
+{
+{% if generate_tc_to_pg_map is defined %}
+    {{- generate_tc_to_pg_map() }}
+{% else %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+{% endif %}
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+{% if asic_type in pfc_to_pg_map_supported_asics  %}
+    "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "3": "3",
+            "4": "4"
+        }
+    },
+{% endif %}
+    "PORT_QOS_MAP": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+{% if asic_type in pfc_to_pg_map_supported_asics %}
+            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+{% endif %}
+            "pfc_enable"      : "3,4"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
index 7361ad2f57f3..43ccba2a4956 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/Quanta-IX7-32X/td3-ix7-32x100G.config.bcm
@@ -1,37 +1,45 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
-bcm_tunnel_term_compatible_mode=1
+#polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
-parity_enable=0
+
+oversubscribe_mode=1
+
+#RIOT Enable
+riot_enable=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384
+
+pbmp_xport_xe=0x3ffffffffffffffffffffffffffffffffe
+
+port_flex_enable=1
 mem_cache_enable=0
-l2_mem_entries=40960
-l3_mem_entries=40960
-fpem_mem_entries=16384
+
+l3_alpm_ipv6_128b_bkt_rsvd=1
+fpem_mem_entries=0
+ifp_inports_support_enable=1
 l2xmsg_mode=1
 
+# Platform specfic
 bcm_num_cos=10
+default_cpu_tx_queue=9
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
-
-ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
 l3_max_ecmp_mode=1
-l3_alpm_enable=2
 lpm_scaling_enable=0
-
+max_vp_lags=0
 miim_intr_enable=0
 module_64ports=1
-
 schan_intr_enable=0
-skip_L2_USER_ENTRY=0
 stable_size=0x5500000
 tdma_timeout_usec=3000000
-
+skip_L2_USER_ENTRY=0
+bcm_tunnel_term_compatible_mode=1
+phy_an_c73=1
 # portmap settings
-oversubscribe_mode=1
-pbmp_xport_xe=0x4888888888888888c2222222222222222
-
-port_flex_enable=1
 
 portmap_1=1:100
 portmap_5=5:100
@@ -69,9 +77,11 @@ portmap_119=117:100
 portmap_123=121:100
 portmap_127=125:100
 
-# datapath port -- merlin core
-portmap_66=129:10:m
-portmap_130=128:10:m
+# datapath port -- MerlinCore
+#Hide these to prevent SAI from initializing them...they are physically not on system 
+#front panel
+#portmap_66=129:10:m
+#portmap_130=128:10:m
 
 # loopback port
 portmap_65=130:10
@@ -79,41 +89,167 @@ portmap_131=131:10
 
 # port order remap
 dport_map_port_29=1
-dport_map_port_33=2
-dport_map_port_41=3
-dport_map_port_45=4
-dport_map_port_1=5
-dport_map_port_5=6
-dport_map_port_9=7
-dport_map_port_13=8
-dport_map_port_17=9
-dport_map_port_21=10
-dport_map_port_25=11
-dport_map_port_37=12
-dport_map_port_49=13
-dport_map_port_53=14
-dport_map_port_57=15
-dport_map_port_61=16
-
-dport_map_port_67=17
-dport_map_port_71=18
-dport_map_port_75=19
-dport_map_port_79=20
-dport_map_port_95=21
-dport_map_port_103=22
-dport_map_port_107=23
-dport_map_port_111=24
-dport_map_port_115=25
-dport_map_port_119=26
-dport_map_port_123=27
-dport_map_port_127=28
-dport_map_port_83=29
-dport_map_port_87=30
-dport_map_port_91=31
-dport_map_port_99=32
-
-dport_map_port_66=33
-dport_map_port_130=34
+dport_map_port_30=2
+dport_map_port_31=3
+dport_map_port_32=4
+
+dport_map_port_33=5
+dport_map_port_34=6
+dport_map_port_35=7
+dport_map_port_36=8
+
+dport_map_port_41=9
+dport_map_port_42=10
+dport_map_port_43=11
+dport_map_port_44=12
+
+dport_map_port_45=13
+dport_map_port_46=14
+dport_map_port_47=15
+dport_map_port_48=16
+
+dport_map_port_1=17
+dport_map_port_2=18
+dport_map_port_3=19
+dport_map_port_4=20
+
+dport_map_port_5=21
+dport_map_port_6=22
+dport_map_port_7=23
+dport_map_port_8=24
+
+dport_map_port_9=25
+dport_map_port_10=26
+dport_map_port_11=27
+dport_map_port_12=28
+
+dport_map_port_13=29
+dport_map_port_14=30
+dport_map_port_15=31
+dport_map_port_16=32
+
+dport_map_port_17=33
+dport_map_port_18=34
+dport_map_port_19=35
+dport_map_port_20=36
+
+dport_map_port_21=37
+dport_map_port_22=38
+dport_map_port_23=39
+dport_map_port_24=40
+
+dport_map_port_25=41
+dport_map_port_26=42
+dport_map_port_27=43
+dport_map_port_28=44
+
+dport_map_port_37=45
+dport_map_port_38=46
+dport_map_port_39=47
+dport_map_port_40=48
+
+dport_map_port_49=49
+dport_map_port_50=50
+dport_map_port_51=51
+dport_map_port_52=52
+
+dport_map_port_53=53
+dport_map_port_54=54
+dport_map_port_55=55
+dport_map_port_56=56
+
+dport_map_port_57=57
+dport_map_port_58=58
+dport_map_port_59=59
+dport_map_port_60=60
+
+dport_map_port_61=61
+dport_map_port_62=62
+dport_map_port_63=63
+dport_map_port_64=64
+
+dport_map_port_67=65
+dport_map_port_68=66
+dport_map_port_69=67
+dport_map_port_70=68
+
+dport_map_port_71=69
+dport_map_port_72=70
+dport_map_port_73=71
+dport_map_port_74=72
+
+dport_map_port_75=73
+dport_map_port_76=74
+dport_map_port_77=75
+dport_map_port_78=76
+
+dport_map_port_79=77
+dport_map_port_80=78
+dport_map_port_81=79
+dport_map_port_82=80
+
+dport_map_port_95=81
+dport_map_port_96=82
+dport_map_port_97=83
+dport_map_port_98=84
+
+dport_map_port_103=85
+dport_map_port_104=86
+dport_map_port_105=87
+dport_map_port_106=88
+
+dport_map_port_107=89
+dport_map_port_108=90
+dport_map_port_109=91
+dport_map_port_110=92
+
+dport_map_port_111=93
+dport_map_port_112=94
+dport_map_port_113=95
+dport_map_port_114=96
+
+dport_map_port_115=97
+dport_map_port_116=98
+dport_map_port_117=99
+dport_map_port_118=100
+
+dport_map_port_119=101
+dport_map_port_120=102
+dport_map_port_121=103
+dport_map_port_122=104
+
+dport_map_port_123=105
+dport_map_port_124=106
+dport_map_port_125=107
+dport_map_port_126=108
+
+dport_map_port_127=109
+dport_map_port_128=110
+dport_map_port_129=111
+dport_map_port_130=112
+
+dport_map_port_83=113
+dport_map_port_84=114
+dport_map_port_85=115
+dport_map_port_86=116
+
+dport_map_port_87=117
+dport_map_port_88=118
+dport_map_port_89=119
+dport_map_port_90=120
+
+dport_map_port_91=121
+dport_map_port_92=122
+dport_map_port_93=123
+dport_map_port_94=124
+
+dport_map_port_99=125
+dport_map_port_100=126
+dport_map_port_101=127
+dport_map_port_102=128
+
+dport_map_port_66=129
+dport_map_port_130=130
 
 ### interface setting
 # TSCF / TSCE interface definition
@@ -533,3 +669,8 @@ phy_chain_rx_polarity_flip_physical{98.0}=0x0
 phy_chain_rx_polarity_flip_physical{99.0}=0x1
 phy_chain_rx_polarity_flip_physical{100.0}=0x0
 
+
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..813addd1ac063143aebd0a748819c0505e1ba1b4
GIT binary patch
literal 228
zcmV<A02}}CwO>Y7MomUUM)0(Quq;a;JDNrSCjldwMgt_EMgk)XKw3gmL0durlLsM;
zMke3~Xw+Nb2~S2jKu1O=LIKbLoFPCg91kr3*))ix02~>lvZMe<Xg?XcMr1|+DFD!1
zMo~r#fB`d`vIH^&E8o!opRz^)Hv%J?L?AB*(7m!c0RSTeB%?+EmsUp5=K&+bU_c@Q
zVSge*VFMz9VZ&koBLibUAwgq;W5Z#?W5Z+vuspnwMwv#UMyp2fy}(AqH~;__02lxo
e02=@t0384x01yBl01*HZ022Td02Kfh02u(cZ$n`K

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/led_proc_init.soc
old mode 100755
new mode 100644
index 0861486660c3..f82bbc8e335b
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/led_proc_init.soc
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/led_proc_init.soc
@@ -1,6 +1,4 @@
-sleep 10
-led stop
-sleep 3
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
 led start
-sleep 3
-led auto on
\ No newline at end of file
+
+rcload /usr/share/sonic/platform/preemphasis-32x100G.soc
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/eeprom.py
index fa34110c04ea..3752a919cba4 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/eeprom.py
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/eeprom.py
@@ -16,5 +16,5 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     _TLV_INFO_MAX_LEN = 256
 
     def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/18-0054/eeprom"
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/fanutil.py b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/fanutil.py
new file mode 100644
index 000000000000..dad8dcfedd7b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/fanutil.py
@@ -0,0 +1,110 @@
+#
+# fanutil.py
+# Platform-specific Fan status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_fan.fan_base import FanBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+class FanUtil(FanBase):
+    """Platform-specific FANutil class"""
+
+    SYS_FAN_NUM = 6
+    NUM_FANS_PERTRAY = 2
+    HWMON_PATH = '/sys/class/hwmon/hwmon1/'
+    FAN_INDEX_START = 21
+
+    logger = logging.getLogger(__name__)
+
+    def __init__(self, log_level=logging.DEBUG):
+        FanBase.__init__(self)
+        self.num_fans = (self.SYS_FAN_NUM * self.NUM_FANS_PERTRAY) 
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def check_fan_index(self, index):
+        if index is None:
+            return False
+
+        if index < 1 or index > self.num_fans:
+            logging.error("Invalid Fan index:", index)
+            return False
+
+        return True
+
+    def get_num_fans(self):
+        return self.num_fans
+
+    def get_status(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        if fantray_speed == '0.0' :
+           return False
+
+        return True
+
+    def get_presence(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_present_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_present'
+        fantray_present = self.get_attr_value(self.HWMON_PATH + fantray_present_file)
+
+        if fantray_present == '1' :
+           return True
+
+        return False
+
+    def get_direction(self, index):
+        if self.check_fan_index(index) == False:
+           return None
+
+        fantray_direction_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_direction'
+        fantray_direction = self.get_attr_value(self.HWMON_PATH + fantray_direction_file)
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if fantray_direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_speed(self, index):
+        if self.check_fan_index(index) == False:
+           return 0
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        return int(float(fantray_speed))
+
+
+    def set_speed(self, val):
+        logging.error("Not allowed to set fan speed!")
+
+        return False
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/psuutil.py b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/psuutil.py
index 5cf06fb5d66a..3b07edcda0b3 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/psuutil.py
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/psuutil.py
@@ -1,50 +1,251 @@
-#
-# psuutil.py
-# Platform-specific PSU status interface for SONiC
-#
-
-import os.path
-
-try:
-    from sonic_psu.psu_base import PsuBase
-except ImportError as e:
-    raise ImportError(str(e) + "- required module not found")
-
-
-class PsuUtil(PsuBase):
-    """Platform-specific PSUutil class"""
-
-    def __init__(self):
-        PsuBase.__init__(self)
-
-    def get_num_psus(self):
-        """
-        Retrieves the number of PSUs available on the device
-        :return: An integer, the number of PSUs available on the device
-         """
-        MAX_PSUS = 2
-
-        return MAX_PSUS
-
-    def get_psu_status(self, index):
-        """
-        Retrieves the oprational status of power supply unit (PSU) defined
-                by index <index>
-        :param index: An integer, index of the PSU of which to query status
-        :return: Boolean, True if PSU is operating properly, False if PSU is\
-        faulty
-        """
-        status = 1
-
-        return status
-
-    def get_psu_presence(self, index):
-        """
-        Retrieves the presence status of power supply unit (PSU) defined
-                by index <index>
-        :param index: An integer, index of the PSU of which to query status
-        :return: Boolean, True if PSU is plugged, False if not
-        """
-        status = 1
-
-        return status
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    HWMON_PATH = '/sys/class/hwmon/hwmon1/'
+    PSU1_PREFIX = 'power42_'
+    PSU2_PREFIX = 'power52_'
+    MAX_PSUS = 2
+    def __init__(self):
+        PsuBase.__init__(self)
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def get_attr_filename(self, index, attr):
+        if (index == 1):
+            attr_file = self.PSU1_PREFIX + attr
+        elif (index == 2):
+            attr_file = self.PSU2_PREFIX + attr
+        else:
+            logging.error("Invalid PSU number:", index)
+            return ''
+
+        return attr_file
+
+    def get_num_psus(self):
+        """
+        Retrieves the number of PSUs available on the device
+        :return: An integer, the number of PSUs available on the device
+         """
+
+        return self.MAX_PSUS
+
+    def get_psu_status(self, index):
+        """
+        Retrieves the oprational status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is operating properly, False if PSU is\
+        faulty
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+            return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+
+    def get_psu_presence(self, index):
+        """
+        Retrieves the presence status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is plugged, False if not
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'present')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check PSU status
+            if (attr_value == 1):
+                status = True
+        return status
+
+    def get_powergood_status(self, index):
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+    
+    def get_model(self, index):
+        attr_filename = self.get_attr_filename(index, 'model')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_mfr_id(self, index):
+        attr_filename = self.get_attr_filename(index, 'mfrid')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_serial(self, index):
+        attr_filename = self.get_attr_filename(index, 'sn')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_direction(self, index):
+        if (index == 1):
+            direction_file = 'fan40_direction'
+        elif (index == 2):
+            direction_file = 'fan50_direction'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return None
+
+        direction = self.get_attr_value(self.HWMON_PATH + direction_file)
+        direction = direction.rstrip()
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_output_voltage(self, index):
+        if (index == 1):
+            attr_file = 'in47_input'
+        elif (index == 2):
+            attr_file = 'in57_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        voltage = self.get_attr_value(self.HWMON_PATH + attr_file)
+        voltage = voltage.rstrip()
+
+        if (voltage != 'ERR'):
+            voltage, dummy = voltage.split('.', 1)
+        else:
+            return 0.0
+
+        return float(voltage)/1000
+
+    def get_output_current(self, index):
+        if (index == 1):
+            attr_file = 'curr39_input'
+        elif (index == 2):
+            attr_file = 'curr49_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        current = self.get_attr_value(self.HWMON_PATH + attr_file)
+        current = current.rstrip()
+
+        if (current != 'ERR'):
+            current, dummy = current.split('.',1)
+        else:
+            return 0.0
+
+        return float(current)/1000
+
+    def get_output_power(self, index):
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return 0.0
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+        else:
+            return 0.0
+
+        return float(attr_value/1000)
+
+    def get_fan_rpm(self, index, fan_idx):
+        if (index == 1):
+            rpm_file = 'fan40_input'
+        elif (index == 2):
+            rpm_file = 'fan50_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0
+
+        rpm = self.get_attr_value(self.HWMON_PATH + rpm_file)
+        rpm = rpm.rstrip()
+        if (rpm != 'ERR'):
+            rpm = float(rpm)
+        else:
+            return 0
+
+        return int(rpm)
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/sfputil.py
index 14b0ef6674be..e0302e620f47 100644
--- a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/sfputil.py
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/plugins/sfputil.py
@@ -21,38 +21,38 @@ class SfpUtil(SfpUtilBase):
 
     _port_to_eeprom_mapping = {}
     _port_to_i2c_mapping = {
-        1: 32,
-        2: 33,
-        3: 34,
-        4: 35,
-        5: 36,
-        6: 37,
-        7: 38,
-        8: 39,
-        9: 40,
-        10: 41,
-        11: 42,
-        12: 43,
-        13: 44,
-        14: 45,
-        15: 46,
-        16: 47,
-        17: 48,
-        18: 49,
-        19: 50,
-        20: 51,
-        21: 52,
-        22: 53,
-        23: 54,
-        24: 55,
-        25: 56,
-        26: 57,
-        27: 58,
-        28: 59,
-        29: 60,
-        30: 61,
-        31: 62,
-        32: 63,
+         1 : 17,
+         2 : 18,
+         3 : 19,
+         4 : 20,
+         5 : 21,
+         6 : 22,
+         7 : 23,
+         8 : 24,
+         9 : 25,
+        10 : 26,
+        11 : 27,
+        12 : 28,
+        13 : 29,
+        14 : 30,
+        15 : 31,
+        16 : 32,
+        17 : 33,
+        18 : 34,
+        19 : 35,
+        20 : 36,
+        21 : 37,
+        22 : 38,
+        23 : 39,
+        24 : 40,
+        25 : 41,
+        26 : 42,
+        27 : 43,
+        28 : 44,
+        29 : 45,
+        30 : 46,
+        31 : 47,
+        32 : 48
     }
 
     @property
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..94592fa8cebc
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/quanta/x86_64-quanta_ix7_rglbmc-r0/preemphasis-32x100G.soc b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/preemphasis-32x100G.soc
new file mode 100644
index 000000000000..5837a6fdce87
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix7_rglbmc-r0/preemphasis-32x100G.soc
@@ -0,0 +1,546 @@
+# Pre-emphasis
+
+phy raw c45 0xa5 0x1 0xffde 0
+phy raw c45 0xa5 0x1 0xd130 0x41
+phy raw c45 0xa5 0x1 0xd131 0xd
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 1
+phy raw c45 0xa5 0x1 0xd130 0x41
+phy raw c45 0xa5 0x1 0xd131 0xd
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 2
+phy raw c45 0xa5 0x1 0xd130 0x41
+phy raw c45 0xa5 0x1 0xd131 0xd
+phy raw c45 0xa5 0x1 0xd134 1
+phy raw c45 0xa5 0x1 0xffde 3
+phy raw c45 0xa5 0x1 0xd130 0x41
+phy raw c45 0xa5 0x1 0xd131 0xd
+phy raw c45 0xa5 0x1 0xd134 1
+
+phy raw c45 0xa9 0x1 0xffde 0
+phy raw c45 0xa9 0x1 0xd130 0x41
+phy raw c45 0xa9 0x1 0xd131 0xd
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 1
+phy raw c45 0xa9 0x1 0xd130 0x41
+phy raw c45 0xa9 0x1 0xd131 0xd
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 2
+phy raw c45 0xa9 0x1 0xd130 0x41
+phy raw c45 0xa9 0x1 0xd131 0xd
+phy raw c45 0xa9 0x1 0xd134 1
+phy raw c45 0xa9 0x1 0xffde 3
+phy raw c45 0xa9 0x1 0xd130 0x41
+phy raw c45 0xa9 0x1 0xd131 0xd
+phy raw c45 0xa9 0x1 0xd134 1
+
+phy raw c45 0xc1 0x1 0xffde 0
+phy raw c45 0xc1 0x1 0xd130 0x41
+phy raw c45 0xc1 0x1 0xd131 0xd
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 1
+phy raw c45 0xc1 0x1 0xd130 0x41
+phy raw c45 0xc1 0x1 0xd131 0xd
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 2
+phy raw c45 0xc1 0x1 0xd130 0x41
+phy raw c45 0xc1 0x1 0xd131 0xd
+phy raw c45 0xc1 0x1 0xd134 1
+phy raw c45 0xc1 0x1 0xffde 3
+phy raw c45 0xc1 0x1 0xd130 0x41
+phy raw c45 0xc1 0x1 0xd131 0xd
+phy raw c45 0xc1 0x1 0xd134 1
+
+phy raw c45 0xc5 0x1 0xffde 0
+phy raw c45 0xc5 0x1 0xd130 0x41
+phy raw c45 0xc5 0x1 0xd131 0xd
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 1
+phy raw c45 0xc5 0x1 0xd130 0x41
+phy raw c45 0xc5 0x1 0xd131 0xd
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 2
+phy raw c45 0xc5 0x1 0xd130 0x41
+phy raw c45 0xc5 0x1 0xd131 0xd
+phy raw c45 0xc5 0x1 0xd134 1
+phy raw c45 0xc5 0x1 0xffde 3
+phy raw c45 0xc5 0x1 0xd130 0x41
+phy raw c45 0xc5 0x1 0xd131 0xd
+phy raw c45 0xc5 0x1 0xd134 1
+
+phy raw c45 0x81 0x1 0xffde 0
+phy raw c45 0x81 0x1 0xd130 0x41
+phy raw c45 0x81 0x1 0xd131 0xd
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 1
+phy raw c45 0x81 0x1 0xd130 0x41
+phy raw c45 0x81 0x1 0xd131 0xd
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 2
+phy raw c45 0x81 0x1 0xd130 0x41
+phy raw c45 0x81 0x1 0xd131 0xd
+phy raw c45 0x81 0x1 0xd134 1
+phy raw c45 0x81 0x1 0xffde 3
+phy raw c45 0x81 0x1 0xd130 0x41
+phy raw c45 0x81 0x1 0xd131 0xd
+phy raw c45 0x81 0x1 0xd134 1
+
+phy raw c45 0x85 0x1 0xffde 0
+phy raw c45 0x85 0x1 0xd130 0x41
+phy raw c45 0x85 0x1 0xd131 0xd
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 1
+phy raw c45 0x85 0x1 0xd130 0x41
+phy raw c45 0x85 0x1 0xd131 0xd
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 2
+phy raw c45 0x85 0x1 0xd130 0x41
+phy raw c45 0x85 0x1 0xd131 0xd
+phy raw c45 0x85 0x1 0xd134 1
+phy raw c45 0x85 0x1 0xffde 3
+phy raw c45 0x85 0x1 0xd130 0x41
+phy raw c45 0x85 0x1 0xd131 0xd
+phy raw c45 0x85 0x1 0xd134 1
+
+phy raw c45 0x89 0x1 0xffde 0
+phy raw c45 0x89 0x1 0xd130 0x41
+phy raw c45 0x89 0x1 0xd131 0xd
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 1
+phy raw c45 0x89 0x1 0xd130 0x41
+phy raw c45 0x89 0x1 0xd131 0xd
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 2
+phy raw c45 0x89 0x1 0xd130 0x41
+phy raw c45 0x89 0x1 0xd131 0xd
+phy raw c45 0x89 0x1 0xd134 1
+phy raw c45 0x89 0x1 0xffde 3
+phy raw c45 0x89 0x1 0xd130 0x41
+phy raw c45 0x89 0x1 0xd131 0xd
+phy raw c45 0x89 0x1 0xd134 1
+
+phy raw c45 0x8d 0x1 0xffde 0
+phy raw c45 0x8d 0x1 0xd130 0x41
+phy raw c45 0x8d 0x1 0xd131 0xd
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 1
+phy raw c45 0x8d 0x1 0xd130 0x41
+phy raw c45 0x8d 0x1 0xd131 0xd
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 2
+phy raw c45 0x8d 0x1 0xd130 0x41
+phy raw c45 0x8d 0x1 0xd131 0xd
+phy raw c45 0x8d 0x1 0xd134 1
+phy raw c45 0x8d 0x1 0xffde 3
+phy raw c45 0x8d 0x1 0xd130 0x41
+phy raw c45 0x8d 0x1 0xd131 0xd
+phy raw c45 0x8d 0x1 0xd134 1
+
+phy raw c45 0x91 0x1 0xffde 0
+phy raw c45 0x91 0x1 0xd130 0x41
+phy raw c45 0x91 0x1 0xd131 0x0408
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 1
+phy raw c45 0x91 0x1 0xd130 0x41
+phy raw c45 0x91 0x1 0xd131 0x0408
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 2
+phy raw c45 0x91 0x1 0xd130 0x41
+phy raw c45 0x91 0x1 0xd131 0x0408
+phy raw c45 0x91 0x1 0xd134 1
+phy raw c45 0x91 0x1 0xffde 3
+phy raw c45 0x91 0x1 0xd130 0x41
+phy raw c45 0x91 0x1 0xd131 0x0408
+phy raw c45 0x91 0x1 0xd134 1
+
+phy raw c45 0x95 0x1 0xffde 0
+phy raw c45 0x95 0x1 0xd130 0x41
+phy raw c45 0x95 0x1 0xd131 0x0307
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 1
+phy raw c45 0x95 0x1 0xd130 0x41
+phy raw c45 0x95 0x1 0xd131 0x0307
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 2
+phy raw c45 0x95 0x1 0xd130 0x41
+phy raw c45 0x95 0x1 0xd131 0x0307
+phy raw c45 0x95 0x1 0xd134 1
+phy raw c45 0x95 0x1 0xffde 3
+phy raw c45 0x95 0x1 0xd130 0x41
+phy raw c45 0x95 0x1 0xd131 0x0307
+phy raw c45 0x95 0x1 0xd134 1
+
+phy raw c45 0xa1 0x1 0xffde 0
+phy raw c45 0xa1 0x1 0xd130 0x41
+phy raw c45 0xa1 0x1 0xd131 0x0307
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 1
+phy raw c45 0xa1 0x1 0xd130 0x41
+phy raw c45 0xa1 0x1 0xd131 0x0307
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 2
+phy raw c45 0xa1 0x1 0xd130 0x41
+phy raw c45 0xa1 0x1 0xd131 0x0307
+phy raw c45 0xa1 0x1 0xd134 1
+phy raw c45 0xa1 0x1 0xffde 3
+phy raw c45 0xa1 0x1 0xd130 0x41
+phy raw c45 0xa1 0x1 0xd131 0x0307
+phy raw c45 0xa1 0x1 0xd134 1
+
+phy raw c45 0xad 0x1 0xffde 0
+phy raw c45 0xad 0x1 0xd130 0x41
+phy raw c45 0xad 0x1 0xd131 0x0307
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 1
+phy raw c45 0xad 0x1 0xd130 0x41
+phy raw c45 0xad 0x1 0xd131 0x0307
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 2
+phy raw c45 0xad 0x1 0xd130 0x41
+phy raw c45 0xad 0x1 0xd131 0x0307
+phy raw c45 0xad 0x1 0xd134 1
+phy raw c45 0xad 0x1 0xffde 3
+phy raw c45 0xad 0x1 0xd130 0x41
+phy raw c45 0xad 0x1 0xd131 0x0307
+phy raw c45 0xad 0x1 0xd134 1
+
+phy raw c45 0xc9 0x1 0xffde 0
+phy raw c45 0xc9 0x1 0xd130 0x41
+phy raw c45 0xc9 0x1 0xd131 0x0307
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 1
+phy raw c45 0xc9 0x1 0xd130 0x41
+phy raw c45 0xc9 0x1 0xd131 0x0307
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 2
+phy raw c45 0xc9 0x1 0xd130 0x41
+phy raw c45 0xc9 0x1 0xd131 0x0307
+phy raw c45 0xc9 0x1 0xd134 1
+phy raw c45 0xc9 0x1 0xffde 3
+phy raw c45 0xc9 0x1 0xd130 0x41
+phy raw c45 0xc9 0x1 0xd131 0x0307
+phy raw c45 0xc9 0x1 0xd134 1
+
+phy raw c45 0xcd 0x1 0xffde 0
+phy raw c45 0xcd 0x1 0xd130 0x41
+phy raw c45 0xcd 0x1 0xd131 0x0307
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 1
+phy raw c45 0xcd 0x1 0xd130 0x41
+phy raw c45 0xcd 0x1 0xd131 0x0307
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 2
+phy raw c45 0xcd 0x1 0xd130 0x41
+phy raw c45 0xcd 0x1 0xd131 0x0307
+phy raw c45 0xcd 0x1 0xd134 1
+phy raw c45 0xcd 0x1 0xffde 3
+phy raw c45 0xcd 0x1 0xd130 0x41
+phy raw c45 0xcd 0x1 0xd131 0x0307
+phy raw c45 0xcd 0x1 0xd134 1
+
+phy raw c45 0xd1 0x1 0xffde 0
+phy raw c45 0xd1 0x1 0xd130 0x41
+phy raw c45 0xd1 0x1 0xd131 0x0307
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 1
+phy raw c45 0xd1 0x1 0xd130 0x41
+phy raw c45 0xd1 0x1 0xd131 0x0307
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 2
+phy raw c45 0xd1 0x1 0xd130 0x41
+phy raw c45 0xd1 0x1 0xd131 0x0307
+phy raw c45 0xd1 0x1 0xd134 1
+phy raw c45 0xd1 0x1 0xffde 3
+phy raw c45 0xd1 0x1 0xd130 0x41
+phy raw c45 0xd1 0x1 0xd131 0x0307
+phy raw c45 0xd1 0x1 0xd134 1
+
+phy raw c45 0xd5 0x1 0xffde 0
+phy raw c45 0xd5 0x1 0xd130 0x41
+phy raw c45 0xd5 0x1 0xd131 0x0307
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 1
+phy raw c45 0xd5 0x1 0xd130 0x41
+phy raw c45 0xd5 0x1 0xd131 0x0307
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 2
+phy raw c45 0xd5 0x1 0xd130 0x41
+phy raw c45 0xd5 0x1 0xd131 0x0307
+phy raw c45 0xd5 0x1 0xd134 1
+phy raw c45 0xd5 0x1 0xffde 3
+phy raw c45 0xd5 0x1 0xd130 0x41
+phy raw c45 0xd5 0x1 0xd131 0x0307
+phy raw c45 0xd5 0x1 0xd134 1
+
+phy raw c45 0xe1 0x1 0xffde 0
+phy raw c45 0xe1 0x1 0xd130 0x41
+phy raw c45 0xe1 0x1 0xd131 0x0307
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 1
+phy raw c45 0xe1 0x1 0xd130 0x41
+phy raw c45 0xe1 0x1 0xd131 0x0307
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 2
+phy raw c45 0xe1 0x1 0xd130 0x41
+phy raw c45 0xe1 0x1 0xd131 0x0307
+phy raw c45 0xe1 0x1 0xd134 1
+phy raw c45 0xe1 0x1 0xffde 3
+phy raw c45 0xe1 0x1 0xd130 0x41
+phy raw c45 0xe1 0x1 0xd131 0x0307
+phy raw c45 0xe1 0x1 0xd134 1
+
+phy raw c45 0xe5 0x1 0xffde 0
+phy raw c45 0xe5 0x1 0xd130 0x41
+phy raw c45 0xe5 0x1 0xd131 0x0307
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 1
+phy raw c45 0xe5 0x1 0xd130 0x41
+phy raw c45 0xe5 0x1 0xd131 0x0307
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 2
+phy raw c45 0xe5 0x1 0xd130 0x41
+phy raw c45 0xe5 0x1 0xd131 0x0307
+phy raw c45 0xe5 0x1 0xd134 1
+phy raw c45 0xe5 0x1 0xffde 3
+phy raw c45 0xe5 0x1 0xd130 0x41
+phy raw c45 0xe5 0x1 0xd131 0x0307
+phy raw c45 0xe5 0x1 0xd134 1
+
+phy raw c45 0xe9 0x1 0xffde 0
+phy raw c45 0xe9 0x1 0xd130 0x41
+phy raw c45 0xe9 0x1 0xd131 0x0307
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 1
+phy raw c45 0xe9 0x1 0xd130 0x41
+phy raw c45 0xe9 0x1 0xd131 0x0307
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 2
+phy raw c45 0xe9 0x1 0xd130 0x41
+phy raw c45 0xe9 0x1 0xd131 0x0307
+phy raw c45 0xe9 0x1 0xd134 1
+phy raw c45 0xe9 0x1 0xffde 3
+phy raw c45 0xe9 0x1 0xd130 0x41
+phy raw c45 0xe9 0x1 0xd131 0x0307
+phy raw c45 0xe9 0x1 0xd134 1
+
+phy raw c45 0xed 0x1 0xffde 0
+phy raw c45 0xed 0x1 0xd130 0x41
+phy raw c45 0xed 0x1 0xd131 0xb
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 1
+phy raw c45 0xed 0x1 0xd130 0x41
+phy raw c45 0xed 0x1 0xd131 0xb
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 2
+phy raw c45 0xed 0x1 0xd130 0x41
+phy raw c45 0xed 0x1 0xd131 0xb
+phy raw c45 0xed 0x1 0xd134 1
+phy raw c45 0xed 0x1 0xffde 3
+phy raw c45 0xed 0x1 0xd130 0x41
+phy raw c45 0xed 0x1 0xd131 0xb
+phy raw c45 0xed 0x1 0xd134 1
+
+phy raw c45 0x185 0x1 0xffde 0
+phy raw c45 0x185 0x1 0xd130 0x41
+phy raw c45 0x185 0x1 0xd131 0x0307
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 1
+phy raw c45 0x185 0x1 0xd130 0x41
+phy raw c45 0x185 0x1 0xd131 0x0307
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 2
+phy raw c45 0x185 0x1 0xd130 0x41
+phy raw c45 0x185 0x1 0xd131 0x0307
+phy raw c45 0x185 0x1 0xd134 1
+phy raw c45 0x185 0x1 0xffde 3
+phy raw c45 0x185 0x1 0xd130 0x41
+phy raw c45 0x185 0x1 0xd131 0x0307
+phy raw c45 0x185 0x1 0xd134 1
+
+phy raw c45 0x18d 0x1 0xffde 0
+phy raw c45 0x18d 0x1 0xd130 0x41
+phy raw c45 0x18d 0x1 0xd131 0x0307
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 1
+phy raw c45 0x18d 0x1 0xd130 0x41
+phy raw c45 0x18d 0x1 0xd131 0x0307
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 2
+phy raw c45 0x18d 0x1 0xd130 0x41
+phy raw c45 0x18d 0x1 0xd131 0x0307
+phy raw c45 0x18d 0x1 0xd134 1
+phy raw c45 0x18d 0x1 0xffde 3
+phy raw c45 0x18d 0x1 0xd130 0x41
+phy raw c45 0x18d 0x1 0xd131 0x0307
+phy raw c45 0x18d 0x1 0xd134 1
+
+phy raw c45 0x1a1 0x1 0xffde 0
+phy raw c45 0x1a1 0x1 0xd130 0x41
+phy raw c45 0x1a1 0x1 0xd131 0x0408
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 1
+phy raw c45 0x1a1 0x1 0xd130 0x41
+phy raw c45 0x1a1 0x1 0xd131 0x0408
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 2
+phy raw c45 0x1a1 0x1 0xd130 0x41
+phy raw c45 0x1a1 0x1 0xd131 0x0408
+phy raw c45 0x1a1 0x1 0xd134 1
+phy raw c45 0x1a1 0x1 0xffde 3
+phy raw c45 0x1a1 0x1 0xd130 0x41
+phy raw c45 0x1a1 0x1 0xd131 0x0408
+phy raw c45 0x1a1 0x1 0xd134 1
+
+phy raw c45 0x1a5 0x1 0xffde 0
+phy raw c45 0x1a5 0x1 0xd130 0x41
+phy raw c45 0x1a5 0x1 0xd131 0x0408
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 1
+phy raw c45 0x1a5 0x1 0xd130 0x41
+phy raw c45 0x1a5 0x1 0xd131 0x0408
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 2
+phy raw c45 0x1a5 0x1 0xd130 0x41
+phy raw c45 0x1a5 0x1 0xd131 0x0408
+phy raw c45 0x1a5 0x1 0xd134 1
+phy raw c45 0x1a5 0x1 0xffde 3
+phy raw c45 0x1a5 0x1 0xd130 0x41
+phy raw c45 0x1a5 0x1 0xd131 0x0408
+phy raw c45 0x1a5 0x1 0xd134 1
+
+phy raw c45 0x1a9 0x1 0xffde 0
+phy raw c45 0x1a9 0x1 0xd130 0x41
+phy raw c45 0x1a9 0x1 0xd131 0xb
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 1
+phy raw c45 0x1a9 0x1 0xd130 0x41
+phy raw c45 0x1a9 0x1 0xd131 0xb
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 2
+phy raw c45 0x1a9 0x1 0xd130 0x41
+phy raw c45 0x1a9 0x1 0xd131 0xb
+phy raw c45 0x1a9 0x1 0xd134 1
+phy raw c45 0x1a9 0x1 0xffde 3
+phy raw c45 0x1a9 0x1 0xd130 0x41
+phy raw c45 0x1a9 0x1 0xd131 0xb
+phy raw c45 0x1a9 0x1 0xd134 1
+
+phy raw c45 0x1ad 0x1 0xffde 0
+phy raw c45 0x1ad 0x1 0xd130 0x41
+phy raw c45 0x1ad 0x1 0xd131 0xc
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 1
+phy raw c45 0x1ad 0x1 0xd130 0x41
+phy raw c45 0x1ad 0x1 0xd131 0xc
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 2
+phy raw c45 0x1ad 0x1 0xd130 0x41
+phy raw c45 0x1ad 0x1 0xd131 0xc
+phy raw c45 0x1ad 0x1 0xd134 1
+phy raw c45 0x1ad 0x1 0xffde 3
+phy raw c45 0x1ad 0x1 0xd130 0x41
+phy raw c45 0x1ad 0x1 0xd131 0xc
+phy raw c45 0x1ad 0x1 0xd134 1
+
+phy raw c45 0x1b1 0x1 0xffde 0
+phy raw c45 0x1b1 0x1 0xd130 0x41
+phy raw c45 0x1b1 0x1 0xd131 0xd
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 1
+phy raw c45 0x1b1 0x1 0xd130 0x41
+phy raw c45 0x1b1 0x1 0xd131 0xd
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 2
+phy raw c45 0x1b1 0x1 0xd130 0x41
+phy raw c45 0x1b1 0x1 0xd131 0xd
+phy raw c45 0x1b1 0x1 0xd134 1
+phy raw c45 0x1b1 0x1 0xffde 3
+phy raw c45 0x1b1 0x1 0xd130 0x41
+phy raw c45 0x1b1 0x1 0xd131 0xd
+phy raw c45 0x1b1 0x1 0xd134 1
+
+phy raw c45 0x1b5 0x1 0xffde 0
+phy raw c45 0x1b5 0x1 0xd130 0x41
+phy raw c45 0x1b5 0x1 0xd131 0xf
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 1
+phy raw c45 0x1b5 0x1 0xd130 0x41
+phy raw c45 0x1b5 0x1 0xd131 0xf
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 2
+phy raw c45 0x1b5 0x1 0xd130 0x41
+phy raw c45 0x1b5 0x1 0xd131 0xf
+phy raw c45 0x1b5 0x1 0xd134 1
+phy raw c45 0x1b5 0x1 0xffde 3
+phy raw c45 0x1b5 0x1 0xd130 0x41
+phy raw c45 0x1b5 0x1 0xd131 0xf
+phy raw c45 0x1b5 0x1 0xd134 1
+
+phy raw c45 0xf1 0x1 0xffde 0
+phy raw c45 0xf1 0x1 0xd130 0x41
+phy raw c45 0xf1 0x1 0xd131 0xd
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 1
+phy raw c45 0xf1 0x1 0xd130 0x41
+phy raw c45 0xf1 0x1 0xd131 0xd
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 2
+phy raw c45 0xf1 0x1 0xd130 0x41
+phy raw c45 0xf1 0x1 0xd131 0xd
+phy raw c45 0xf1 0x1 0xd134 1
+phy raw c45 0xf1 0x1 0xffde 3
+phy raw c45 0xf1 0x1 0xd130 0x41
+phy raw c45 0xf1 0x1 0xd131 0xd
+phy raw c45 0xf1 0x1 0xd134 1
+
+phy raw c45 0xf5 0x1 0xffde 0
+phy raw c45 0xf5 0x1 0xd130 0x41
+phy raw c45 0xf5 0x1 0xd131 0xf
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 1
+phy raw c45 0xf5 0x1 0xd130 0x41
+phy raw c45 0xf5 0x1 0xd131 0xf
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 2
+phy raw c45 0xf5 0x1 0xd130 0x41
+phy raw c45 0xf5 0x1 0xd131 0xf
+phy raw c45 0xf5 0x1 0xd134 1
+phy raw c45 0xf5 0x1 0xffde 3
+phy raw c45 0xf5 0x1 0xd130 0x41
+phy raw c45 0xf5 0x1 0xd131 0xf
+phy raw c45 0xf5 0x1 0xd134 1
+
+phy raw c45 0x181 0x1 0xffde 0
+phy raw c45 0x181 0x1 0xd130 0x41
+phy raw c45 0x181 0x1 0xd131 0xd
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 1
+phy raw c45 0x181 0x1 0xd130 0x41
+phy raw c45 0x181 0x1 0xd131 0xd
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 2
+phy raw c45 0x181 0x1 0xd130 0x41
+phy raw c45 0x181 0x1 0xd131 0xd
+phy raw c45 0x181 0x1 0xd134 1
+phy raw c45 0x181 0x1 0xffde 3
+phy raw c45 0x181 0x1 0xd130 0x41
+phy raw c45 0x181 0x1 0xd131 0xd
+phy raw c45 0x181 0x1 0xd134 1
+
+phy raw c45 0x189 0x1 0xffde 0
+phy raw c45 0x189 0x1 0xd130 0x41
+phy raw c45 0x189 0x1 0xd131 0xe
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 1
+phy raw c45 0x189 0x1 0xd130 0x41
+phy raw c45 0x189 0x1 0xd131 0xe
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 2
+phy raw c45 0x189 0x1 0xd130 0x41
+phy raw c45 0x189 0x1 0xd131 0xe
+phy raw c45 0x189 0x1 0xd134 1
+phy raw c45 0x189 0x1 0xffde 3
+phy raw c45 0x189 0x1 0xd130 0x41
+phy raw c45 0x189 0x1 0xd131 0xe
+phy raw c45 0x189 0x1 0xd134 1
+
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers.json.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers.json.j2
new file mode 100644
index 000000000000..b67cf577ab75
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_def.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_def.j2
new file mode 100644
index 000000000000..740cfdf79e96
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_def.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "4625920",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t0.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..44fcf21887a6
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t0.j2
@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t1.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..5fe9cabcfd34
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "196608",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "33004032",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"33004032"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l2/config b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l2/config
new file mode 100644
index 000000000000..b2d4a1e80592
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l2/config
@@ -0,0 +1,3 @@
+l2_mem_entries=294912
+l3_mem_entries=16384
+l3_alpm_enable=0
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l3/config b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l3/config
new file mode 100644
index 000000000000..fff0cf54b08a
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/l3/config
@@ -0,0 +1,5 @@
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+sai_tunnel_support=1
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/pg_profile_lookup.ini b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..6d91d03ae684
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   9427       0     50176    1        3584
+  25000  5m   9427       0     50176    1        3584
+  40000  5m   9427       0     50176    1        3584
+  50000  5m   9427       0     50176    1        3584
+ 100000  5m   9427       0     50176    1        3584
+  10000  40m  9427       0     50176    1        3584
+  25000  40m  9427       0     50176    1        3584
+  40000  40m  9427       0     50176    1        3584
+  50000  40m  9427       0     50176    1        3584
+ 100000  40m  9427       0     50176    1        3584
+  10000  300m 9427       0     50176    1        3584
+  25000  300m 9427       0     50176    1        3584
+  40000  300m 9427       0     50176    1        3584
+  50000  300m 9427       0     50176    1        3584
+ 100000  300m 9427       0     50176    1        3584
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/platform-def.json b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/platform-def.json
new file mode 100644
index 000000000000..f052663135eb
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/platform-def.json
@@ -0,0 +1,84 @@
+{
+    "port-group": {
+        "1": {
+            "members": "Ethernet0-3",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "2": {
+            "members": "Ethernet4-7",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "3": {
+            "members": "Ethernet8-11",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "4": {
+            "members": "Ethernet12-15",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "5": {
+            "members": "Ethernet16-19",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "6": {
+            "members": "Ethernet20-23",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "7": {
+            "members": "Ethernet24-27",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "8": {
+            "members": "Ethernet28-31",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "9": {
+            "members": "Ethernet32-35",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "10": {
+            "members": "Ethernet36-39",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "11": {
+            "members": "Ethernet40-43",
+            "valid_speeds": ["25000",["10000","1000"]]
+        },
+        "12": {
+            "members": "Ethernet44-47",
+            "valid_speeds": ["25000",["10000","1000"]]
+        }
+    },
+    "fec-mode": {
+        "Ethernet0-47": {
+            "1": {
+                 "1000":   [ "none" ],
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            }
+        },
+        "Ethernet48-79": {
+            "1": {
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            },
+            "2": {
+                 "20000":  [ "none", "fc" ],
+                 "50000":  [ "none", "rs" ]
+            },
+            "4": {
+                 "40000":  [ "none", "fc" ],
+                 "100000": [ "none", "rs" ]
+            }
+        }
+    },
+    "native-port-supported-speeds": {
+        "Ethernet0-47": {
+            "1": ["25000","10000","1000"]
+        },
+        "Ethernet48-79": {
+            "4": ["100000","40000"]
+        }
+    }
+}
+
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/port_config.ini b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/port_config.ini
index c9dd2fb999f9..c2808b2a5e98 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/port_config.ini
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/port_config.ini
@@ -1,57 +1,57 @@
-# name          lanes                 alias             index    speed
-Ethernet0       60                    twentyfiveGigE1   1        25000
-Ethernet1       59                    twentyfiveGigE2   2        25000
-Ethernet2       58                    twentyfiveGigE3   3        25000
-Ethernet3       57                    twentyfiveGigE4   4        25000
-Ethernet4       64                    twentyfiveGigE5   5        25000
-Ethernet5       63                    twentyfiveGigE6   6        25000
-Ethernet6       62                    twentyfiveGigE7   7        25000
-Ethernet7       61                    twentyfiveGigE8   8        25000
-Ethernet8       49                    twentyfiveGigE9   9        25000
-Ethernet9       50                    twentyfiveGigE10  10       25000
-Ethernet10      51                    twentyfiveGigE11  11       25000
-Ethernet11      52                    twentyfiveGigE12  12       25000
-Ethernet12      4                     twentyfiveGigE13  13       25000
-Ethernet13      3                     twentyfiveGigE14  14       25000
-Ethernet14      2                     twentyfiveGigE15  15       25000
-Ethernet15      1                     twentyfiveGigE16  16       25000
-Ethernet16      8                     twentyfiveGigE17  17       25000
-Ethernet17      7                     twentyfiveGigE18  18       25000
-Ethernet18      6                     twentyfiveGigE19  19       25000
-Ethernet19      5                     twentyfiveGigE20  20       25000
-Ethernet20      16                    twentyfiveGigE21  21       25000
-Ethernet21      15                    twentyfiveGigE22  22       25000
-Ethernet22      14                    twentyfiveGigE23  23       25000
-Ethernet23      13                    twentyfiveGigE24  24       25000
-Ethernet24      24                    twentyfiveGigE25  25       25000
-Ethernet25      23                    twentyfiveGigE26  26       25000
-Ethernet26      22                    twentyfiveGigE27  27       25000
-Ethernet27      21                    twentyfiveGigE28  28       25000
-Ethernet28      32                    twentyfiveGigE29  29       25000
-Ethernet29      31                    twentyfiveGigE30  30       25000
-Ethernet30      30                    twentyfiveGigE31  31       25000
-Ethernet31      29                    twentyfiveGigE32  32       25000
-Ethernet32      36                    twentyfiveGigE33  33       25000
-Ethernet33      35                    twentyfiveGigE34  34       25000
-Ethernet34      34                    twentyfiveGigE35  35       25000
-Ethernet35      33                    twentyfiveGigE36  36       25000
-Ethernet36      44                    twentyfiveGigE37  37       25000
-Ethernet37      43                    twentyfiveGigE38  38       25000
-Ethernet38      42                    twentyfiveGigE39  39       25000
-Ethernet39      41                    twentyfiveGigE40  40       25000
-Ethernet40      86                    twentyfiveGigE41  41       25000
-Ethernet41      85                    twentyfiveGigE42  42       25000
-Ethernet42      88                    twentyfiveGigE43  43       25000
-Ethernet43      87                    twentyfiveGigE44  44       25000
-Ethernet44      94                    twentyfiveGigE45  45       25000
-Ethernet45      93                    twentyfiveGigE46  46       25000
-Ethernet46      96                    twentyfiveGigE47  47       25000
-Ethernet47      95                    twentyfiveGigE48  48       25000
-Ethernet48      97,98,99,100          hundredGigE49     49      100000
-Ethernet52      105,106,107,108       hundredGigE50     50      100000
-Ethernet56      113,114,115,116       hundredGigE51     51      100000
-Ethernet60      121,122,123,124       hundredGigE52     52      100000
-Ethernet64      77,78,79,80           hundredGigE53     53      100000
-Ethernet68      65,66,67,68           hundredGigE54     54      100000
-Ethernet72      69,70,71,72           hundredGigE55     55      100000
-Ethernet76      125,126,127,128       hundredGigE56     56      100000
+# name          lanes                 alias             index  speed
+Ethernet0       60                    twentyfiveGigE1   1      25000
+Ethernet1       59                    twentyfiveGigE2   2      25000
+Ethernet2       58                    twentyfiveGigE3   3      25000
+Ethernet3       57                    twentyfiveGigE4   4      25000
+Ethernet4       64                    twentyfiveGigE5   5      25000
+Ethernet5       63                    twentyfiveGigE6   6      25000
+Ethernet6       62                    twentyfiveGigE7   7      25000
+Ethernet7       61                    twentyfiveGigE8   8      25000
+Ethernet8       49                    twentyfiveGigE9   9      25000
+Ethernet9       50                    twentyfiveGigE10  10     25000
+Ethernet10      51                    twentyfiveGigE11  11     25000
+Ethernet11      52                    twentyfiveGigE12  12     25000
+Ethernet12      4                     twentyfiveGigE13  13     25000
+Ethernet13      3                     twentyfiveGigE14  14     25000
+Ethernet14      2                     twentyfiveGigE15  15     25000
+Ethernet15      1                     twentyfiveGigE16  16     25000
+Ethernet16      8                     twentyfiveGigE17  17     25000
+Ethernet17      7                     twentyfiveGigE18  18     25000
+Ethernet18      6                     twentyfiveGigE19  19     25000
+Ethernet19      5                     twentyfiveGigE20  20     25000
+Ethernet20      16                    twentyfiveGigE21  21     25000
+Ethernet21      15                    twentyfiveGigE22  22     25000
+Ethernet22      14                    twentyfiveGigE23  23     25000
+Ethernet23      13                    twentyfiveGigE24  24     25000
+Ethernet24      24                    twentyfiveGigE25  25     25000
+Ethernet25      23                    twentyfiveGigE26  26     25000
+Ethernet26      22                    twentyfiveGigE27  27     25000
+Ethernet27      21                    twentyfiveGigE28  28     25000
+Ethernet28      32                    twentyfiveGigE29  29     25000
+Ethernet29      31                    twentyfiveGigE30  30     25000
+Ethernet30      30                    twentyfiveGigE31  31     25000
+Ethernet31      29                    twentyfiveGigE32  32     25000
+Ethernet32      36                    twentyfiveGigE33  33     25000
+Ethernet33      35                    twentyfiveGigE34  34     25000
+Ethernet34      34                    twentyfiveGigE35  35     25000
+Ethernet35      33                    twentyfiveGigE36  36     25000
+Ethernet36      44                    twentyfiveGigE37  37     25000
+Ethernet37      43                    twentyfiveGigE38  38     25000
+Ethernet38      42                    twentyfiveGigE39  39     25000
+Ethernet39      41                    twentyfiveGigE40  40     25000
+Ethernet40      86                    twentyfiveGigE41  41     25000
+Ethernet41      85                    twentyfiveGigE42  42     25000
+Ethernet42      88                    twentyfiveGigE43  43     25000
+Ethernet43      87                    twentyfiveGigE44  44     25000
+Ethernet44      94                    twentyfiveGigE45  45     25000
+Ethernet45      93                    twentyfiveGigE46  46     25000
+Ethernet46      96                    twentyfiveGigE47  47     25000
+Ethernet47      95                    twentyfiveGigE48  48     25000
+Ethernet48      97,98,99,100          hundredGigE49     49    100000
+Ethernet52      105,106,107,108       hundredGigE50     50    100000
+Ethernet56      113,114,115,116       hundredGigE51     51    100000
+Ethernet60      121,122,123,124       hundredGigE52     52    100000
+Ethernet64      77,78,79,80           hundredGigE53     53    100000
+Ethernet68      65,66,67,68           hundredGigE54     54    100000
+Ethernet72      69,70,71,72           hundredGigE55     55    100000
+Ethernet76      125,126,127,128       hundredGigE56     56    100000
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos.json.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos.json.j2
new file mode 100644
index 000000000000..ee67c6e26221
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config_t1.j2' %}
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos_config_t1.j2 b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos_config_t1.j2
new file mode 100644
index 000000000000..5fe5324a85c1
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/qos_config_t1.j2
@@ -0,0 +1,175 @@
+{%- set PORT_ALL = [] %}
+{%- for port in PORT %}
+    {%- if PORT_ALL.append(port) %}{% endif %}
+{%- endfor %}
+{%- if PORT_ALL | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_all = [] %}
+{%- for port in PORT_ALL %}
+    {%- if port_names_list_all.append(port) %}{% endif %}
+{%- endfor %}
+{%- set port_names_all = port_names_list_all | join(',') -%}
+
+
+{%- set PORT_ACTIVE = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_active = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active = port_names_list_active | join(',') -%}
+
+
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+
+
+{
+{% if generate_tc_to_pg_map is defined %}
+    {{- generate_tc_to_pg_map() }}
+{% else %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+{% endif %}
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+{% if asic_type in pfc_to_pg_map_supported_asics  %}
+    "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "3": "3",
+            "4": "4"
+        }
+    },
+{% endif %}
+    "PORT_QOS_MAP": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+{% if asic_type in pfc_to_pg_map_supported_asics %}
+            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+{% endif %}
+            "pfc_enable"      : "3,4"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
index 94560fb7e86c..06ff6dc80037 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/Quanta-IX8-56X/td3-ix8-48x25G+8x100G.config.bcm
@@ -1,15 +1,22 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
-bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
-parity_enable=0
 mem_cache_enable=0
 l2_mem_entries=40960
 l3_mem_entries=40960
-fpem_mem_entries=16384
+fpem_mem_entries=0
 l2xmsg_mode=1
+l3_alpm_ipv6_128b_bkt_rsvd=1
+
+#RIOT Enable
+riot_enable=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384
 
 bcm_num_cos=10
+default_cpu_tx_queue=9
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
 
@@ -29,7 +36,8 @@ tdma_timeout_usec=3000000
 
 # portmap settings
 oversubscribe_mode=1
-pbmp_xport_xe=0x48808080f8780808dfe1e1e1fe1e1e1fe
+#pbmp_xport_xe=0x48808080f8780808dfe1e1e1fe1e1e1fe
+pbmp_xport_xe=0x7F878787F878787FDFE1E1E1FE1E1E1FE
 
 port_flex_enable=1
 
@@ -73,9 +81,6 @@ portmap_61=61:25
 portmap_62=62:25
 portmap_63=63:25
 portmap_64=64:25
-portmap_67=65:100
-portmap_71=69:100
-portmap_79=77:100
 portmap_87=85:25
 portmap_88=86:25
 portmap_89=87:25
@@ -84,6 +89,10 @@ portmap_95=93:25
 portmap_96=94:25
 portmap_97=95:25
 portmap_98=96:25
+
+portmap_67=65:100
+portmap_71=69:100
+portmap_79=77:100
 portmap_99=97:100
 portmap_107=105:100
 portmap_115=113:100
@@ -91,8 +100,10 @@ portmap_123=121:100
 portmap_127=125:100
 
 # datapath port -- MerlinCore
-portmap_66=129:10:m
-portmap_130=128:10:m
+#Hide these to prevent SAI from initializing them...they are physically not on system 
+#front panel
+#portmap_66=129:10:m
+#portmap_130=128:10:m
 
 # loopback port
 portmap_65=130:10
@@ -166,9 +177,6 @@ serdes_if_type_61=13
 serdes_if_type_62=13
 serdes_if_type_63=13
 serdes_if_type_64=13
-serdes_if_type_67=14
-serdes_if_type_71=14
-serdes_if_type_79=14
 serdes_if_type_87=13
 serdes_if_type_88=13
 serdes_if_type_89=13
@@ -177,11 +185,16 @@ serdes_if_type_95=13
 serdes_if_type_96=13
 serdes_if_type_97=13
 serdes_if_type_98=13
+
+serdes_if_type_67=14
+serdes_if_type_71=14
+serdes_if_type_79=14
 serdes_if_type_99=14
 serdes_if_type_107=14
 serdes_if_type_115=14
 serdes_if_type_123=14
 serdes_if_type_127=14
+
 serdes_if_type_66=11
 serdes_if_type_130=11
 
@@ -234,17 +247,48 @@ dport_map_port_96=45
 dport_map_port_95=46
 dport_map_port_98=47
 dport_map_port_97=48
-dport_map_port_99=49
-dport_map_port_107=50
-dport_map_port_115=51
-dport_map_port_123=52
-dport_map_port_79=53
-dport_map_port_67=54
-dport_map_port_71=55
-dport_map_port_127=56
 
-dport_map_port_66=57
-dport_map_port_130=58
+dport_map_port_67=49
+dport_map_port_68=50
+dport_map_port_69=51
+dport_map_port_70=52
+
+dport_map_port_71=53
+dport_map_port_72=54
+dport_map_port_73=55
+dport_map_port_74=56
+
+dport_map_port_79=57
+dport_map_port_80=58
+dport_map_port_81=59
+dport_map_port_82=60
+
+dport_map_port_99=61
+dport_map_port_100=62
+dport_map_port_101=63
+dport_map_port_102=64
+
+dport_map_port_107=65
+dport_map_port_108=66
+dport_map_port_109=67
+dport_map_port_110=68
+
+dport_map_port_115=69
+dport_map_port_116=70
+dport_map_port_117=71
+dport_map_port_118=72
+
+dport_map_port_123=73
+dport_map_port_124=74
+dport_map_port_125=75
+dport_map_port_126=76
+
+# Not able to breakout, Since overlap with mgmt port
+dport_map_port_127=77
+
+# mgmt ports
+dport_map_port_66=81
+dport_map_port_130=82
 
 
 phy_chain_tx_lane_map_physical{1.0}=0x3210
@@ -479,3 +523,8 @@ phy_chain_rx_polarity_flip_physical{130.0}=0x0
 phy_chain_rx_polarity_flip_physical{131.0}=0x0
 phy_chain_rx_polarity_flip_physical{132.0}=0x0
 
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7f3ff6a684df8d89d2ed015684760127d2b3a676
GIT binary patch
literal 196
zcmeycHQp`E&DYJv?ZXys83x5pHwLu^r73RgDvRA%R9Cn$DM>j@a+80+n9&oJ>Za<z
ztf=V3c!5FR?BW-RC7YHoIA(B4b^&!W=rUZ4aSL_RX<#&FF=Ekvc5#;*i`lkK0*ak3
z4SLKMyxbU+!`*H_XH+_r#GuHSEUxUF%&gp;d?-Ogg(Xp2#U-&h@ldjX3QLN;ic3m!
v%ArIDC8nf$C8wn3q=PAJ4<NR=X6Q<;ay#|hX3qq-nQn{RR=a)Jd%z6<F=<0~

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/installer.conf b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/installer.conf
index 14404194ef53..8b2b94dfebea 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/installer.conf
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/installer.conf
@@ -1,3 +1,4 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
 CONSOLE_SPEED=115200
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=i2c-ismt,i2c_ismt,ixgbe"
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/led_proc_init.soc
old mode 100755
new mode 100644
index 0861486660c3..bf9f29924dab
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/led_proc_init.soc
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/led_proc_init.soc
@@ -1,6 +1,4 @@
-sleep 10
-led stop
-sleep 3
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
 led start
-sleep 3
-led auto on
\ No newline at end of file
+rcload /usr/share/sonic/platform/preemphasis-48x25_8x100.soc
+
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/eeprom.py
index fa34110c04ea..3752a919cba4 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/eeprom.py
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/eeprom.py
@@ -16,5 +16,5 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     _TLV_INFO_MAX_LEN = 256
 
     def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/18-0054/eeprom"
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/fanutil.py b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/fanutil.py
new file mode 100644
index 000000000000..dad8dcfedd7b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/fanutil.py
@@ -0,0 +1,110 @@
+#
+# fanutil.py
+# Platform-specific Fan status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_fan.fan_base import FanBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+class FanUtil(FanBase):
+    """Platform-specific FANutil class"""
+
+    SYS_FAN_NUM = 6
+    NUM_FANS_PERTRAY = 2
+    HWMON_PATH = '/sys/class/hwmon/hwmon1/'
+    FAN_INDEX_START = 21
+
+    logger = logging.getLogger(__name__)
+
+    def __init__(self, log_level=logging.DEBUG):
+        FanBase.__init__(self)
+        self.num_fans = (self.SYS_FAN_NUM * self.NUM_FANS_PERTRAY) 
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def check_fan_index(self, index):
+        if index is None:
+            return False
+
+        if index < 1 or index > self.num_fans:
+            logging.error("Invalid Fan index:", index)
+            return False
+
+        return True
+
+    def get_num_fans(self):
+        return self.num_fans
+
+    def get_status(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        if fantray_speed == '0.0' :
+           return False
+
+        return True
+
+    def get_presence(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_present_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_present'
+        fantray_present = self.get_attr_value(self.HWMON_PATH + fantray_present_file)
+
+        if fantray_present == '1' :
+           return True
+
+        return False
+
+    def get_direction(self, index):
+        if self.check_fan_index(index) == False:
+           return None
+
+        fantray_direction_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_direction'
+        fantray_direction = self.get_attr_value(self.HWMON_PATH + fantray_direction_file)
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if fantray_direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_speed(self, index):
+        if self.check_fan_index(index) == False:
+           return 0
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        return int(float(fantray_speed))
+
+
+    def set_speed(self, val):
+        logging.error("Not allowed to set fan speed!")
+
+        return False
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/psuutil.py b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/psuutil.py
index 5cf06fb5d66a..b2753d1759e4 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/psuutil.py
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/psuutil.py
@@ -1,50 +1,251 @@
-#
-# psuutil.py
-# Platform-specific PSU status interface for SONiC
-#
-
-import os.path
-
-try:
-    from sonic_psu.psu_base import PsuBase
-except ImportError as e:
-    raise ImportError(str(e) + "- required module not found")
-
-
-class PsuUtil(PsuBase):
-    """Platform-specific PSUutil class"""
-
-    def __init__(self):
-        PsuBase.__init__(self)
-
-    def get_num_psus(self):
-        """
-        Retrieves the number of PSUs available on the device
-        :return: An integer, the number of PSUs available on the device
-         """
-        MAX_PSUS = 2
-
-        return MAX_PSUS
-
-    def get_psu_status(self, index):
-        """
-        Retrieves the oprational status of power supply unit (PSU) defined
-                by index <index>
-        :param index: An integer, index of the PSU of which to query status
-        :return: Boolean, True if PSU is operating properly, False if PSU is\
-        faulty
-        """
-        status = 1
-
-        return status
-
-    def get_psu_presence(self, index):
-        """
-        Retrieves the presence status of power supply unit (PSU) defined
-                by index <index>
-        :param index: An integer, index of the PSU of which to query status
-        :return: Boolean, True if PSU is plugged, False if not
-        """
-        status = 1
-
-        return status
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    HWMON_PATH = '/sys/class/hwmon/hwmon1/'
+    PSU1_PREFIX = 'power43_'
+    PSU2_PREFIX = 'power54_'
+    MAX_PSUS = 2
+    def __init__(self):
+        PsuBase.__init__(self)
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def get_attr_filename(self, index, attr):
+        if (index == 1):
+            attr_file = self.PSU1_PREFIX + attr
+        elif (index == 2):
+            attr_file = self.PSU2_PREFIX + attr
+        else:
+            logging.error("Invalid PSU number:", index)
+            return ''
+
+        return attr_file
+
+    def get_num_psus(self):
+        """
+        Retrieves the number of PSUs available on the device
+        :return: An integer, the number of PSUs available on the device
+         """
+
+        return self.MAX_PSUS
+
+    def get_psu_status(self, index):
+        """
+        Retrieves the oprational status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is operating properly, False if PSU is\
+        faulty
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+            return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+
+    def get_psu_presence(self, index):
+        """
+        Retrieves the presence status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is plugged, False if not
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'present')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check PSU status
+            if (attr_value == 1):
+                status = True
+        return status
+
+    def get_powergood_status(self, index):
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+    
+    def get_model(self, index):
+        attr_filename = self.get_attr_filename(index, 'model')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_mfr_id(self, index):
+        attr_filename = self.get_attr_filename(index, 'mfrid')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_serial(self, index):
+        attr_filename = self.get_attr_filename(index, 'sn')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_direction(self, index):
+        if (index == 1):
+            direction_file = 'fan41_direction'
+        elif (index == 2):
+            direction_file = 'fan52_direction'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return None
+
+        direction = self.get_attr_value(self.HWMON_PATH + direction_file)
+        direction = direction.rstrip()
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_output_voltage(self, index):
+        if (index == 1):
+            attr_file = 'in48_input'
+        elif (index == 2):
+            attr_file = 'in59_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        voltage = self.get_attr_value(self.HWMON_PATH + attr_file)
+        voltage = voltage.rstrip()
+
+        if (voltage != 'ERR'):
+            voltage, dummy = voltage.split('.', 1)
+        else:
+            return 0.0
+
+        return float(voltage)/1000
+
+    def get_output_current(self, index):
+        if (index == 1):
+            attr_file = 'curr40_input'
+        elif (index == 2):
+            attr_file = 'curr51_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        current = self.get_attr_value(self.HWMON_PATH + attr_file)
+        current = current.rstrip()
+
+        if (current != 'ERR'):
+            current, dummy = current.split('.',1)
+        else:
+            return 0.0
+
+        return float(current)/1000
+
+    def get_output_power(self, index):
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return 0.0
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+        else:
+            return 0.0
+
+        return float(attr_value/1000)
+
+    def get_fan_rpm(self, index, fan_idx):
+        if (index == 1):
+            rpm_file = 'fan41_input'
+        elif (index == 2):
+            rpm_file = 'fan52_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0
+
+        rpm = self.get_attr_value(self.HWMON_PATH + rpm_file)
+        rpm = rpm.rstrip()
+        if (rpm != 'ERR'):
+            rpm = float(rpm)
+        else:
+            return 0
+
+        return int(rpm)
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/sfputil.py
index 3067919795d5..4dc269829c0a 100644
--- a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/sfputil.py
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/plugins/sfputil.py
@@ -23,62 +23,62 @@ class SfpUtil(SfpUtilBase):
 
     _port_to_eeprom_mapping = {}
     _port_to_i2c_mapping = {
-        1: 32,
-        2: 33,
-        3: 34,
-        4: 35,
-        5: 36,
-        6: 37,
-        7: 38,
-        8: 39,
-        9: 40,
-        10: 41,
-        11: 42,
-        12: 43,
-        13: 44,
-        14: 45,
-        15: 46,
-        16: 47,
-        17: 48,
-        18: 49,
-        19: 50,
-        20: 51,
-        21: 52,
-        22: 53,
-        23: 54,
-        24: 55,
-        25: 56,
-        26: 57,
-        27: 58,
-        28: 59,
-        29: 60,
-        30: 61,
-        31: 62,
-        32: 63,
-        33: 64,
-        34: 65,
-        35: 66,
-        36: 67,
-        37: 68,
-        38: 69,
-        39: 70,
-        40: 71,
-        41: 72,
-        42: 73,
-        43: 74,
-        44: 75,
-        45: 76,
-        46: 77,
-        47: 78,
-        48: 79,
-        49: 80,  # QSFP49
-        50: 81,  # QSFP50
-        51: 82,  # QSFP51
-        52: 83,  # QSFP52
-        53: 84,  # QSFP53
-        54: 85,  # QSFP54
-        55: 86,  # QSFP55
-        56: 87,  # QSFP56
+         1 : 17,
+         2 : 18,
+         3 : 19,
+         4 : 20,
+         5 : 21,
+         6 : 22,
+         7 : 23,
+         8 : 24,
+         9 : 25,
+        10 : 26,
+        11 : 27,
+        12 : 28,
+        13 : 29,
+        14 : 30,
+        15 : 31,
+        16 : 32,
+        17 : 33,
+        18 : 34,
+        19 : 35,
+        20 : 36,
+        21 : 37,
+        22 : 38,
+        23 : 39,
+        24 : 40,
+        25 : 41,
+        26 : 42,
+        27 : 43,
+        28 : 44,
+        29 : 45,
+        30 : 46,
+        31 : 47,
+        32 : 48,
+        33 : 49,
+        34 : 50,
+        35 : 51,
+        36 : 52,
+        37 : 53,
+        38 : 54,
+        39 : 55,
+        40 : 56,
+        41 : 57,
+        42 : 58,
+        43 : 59,
+        44 : 60,
+        45 : 61,
+        46 : 62,
+        47 : 63,
+        48 : 64,
+        49 : 65,#QSFP49
+        50 : 66,#QSFP50
+        51 : 67,#QSFP51
+        52 : 68,#QSFP52
+        53 : 69,#QSFP53
+        54 : 70,#QSFP54
+        55 : 71,#QSFP55
+        56 : 72,#QSFP56
     }
 
     @property
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..98506b46146d
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
\ No newline at end of file
diff --git a/device/quanta/x86_64-quanta_ix8_rglbmc-r0/preemphasis-48x25_8x100.soc b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/preemphasis-48x25_8x100.soc
new file mode 100644
index 000000000000..3a0193b73da5
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8_rglbmc-r0/preemphasis-48x25_8x100.soc
@@ -0,0 +1,325 @@
+# 48x25G 8x100G pre-emphasis setting for Quanta IX8
+echo "Set tx pre-emphasis and idriver values"
+linkscan off
+
+# Start of 48x25G
+
+phy raw c45 0xd1 0x1 0xffde 0
+phy raw c45 0xd1 0x1 0xd130 0x55
+phy raw c45 0xd1 0x1 0xd131 0x303
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 1
+phy raw c45 0xd1 0x1 0xd130 0x55
+phy raw c45 0xd1 0x1 0xd131 0x303
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 2
+phy raw c45 0xd1 0x1 0xd130 0x55
+phy raw c45 0xd1 0x1 0xd131 0x303
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 3
+phy raw c45 0xd1 0x1 0xd130 0x55
+phy raw c45 0xd1 0x1 0xd131 0x303
+phy raw c45 0xd1 0x1 0xd134 0x1
+
+phy raw c45 0xd5 0x1 0xffde 0
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x303
+phy raw c45 0xd5 0x1 0xd134 0x1
+phy raw c45 0xd5 0x1 0xffde 1
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x303
+phy raw c45 0xd5 0x1 0xd134 0x1
+phy raw c45 0xd5 0x1 0xffde 2
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x303
+phy raw c45 0xd5 0x1 0xd134 0x1
+phy raw c45 0xd5 0x1 0xffde 3
+phy raw c45 0xd5 0x1 0xd130 0x55
+phy raw c45 0xd5 0x1 0xd131 0x303
+phy raw c45 0xd5 0x1 0xd134 0x1
+
+phy raw c45 0xc9 0x1 0xffde 0
+phy raw c45 0xc9 0x1 0xd130 0x55
+phy raw c45 0xc9 0x1 0xd131 0x303
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 1
+phy raw c45 0xc9 0x1 0xd130 0x55
+phy raw c45 0xc9 0x1 0xd131 0x303
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 2
+phy raw c45 0xc9 0x1 0xd130 0x55
+phy raw c45 0xc9 0x1 0xd131 0x303
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 3
+phy raw c45 0xc9 0x1 0xd130 0x55
+phy raw c45 0xc9 0x1 0xd131 0x303
+phy raw c45 0xc9 0x1 0xd134 0x1
+
+phy raw c45 0x81 0x1 0xffde 0
+phy raw c45 0x81 0x1 0xd130 0x55
+phy raw c45 0x81 0x1 0xd131 0x303
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 1
+phy raw c45 0x81 0x1 0xd130 0x55
+phy raw c45 0x81 0x1 0xd131 0x303
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 2
+phy raw c45 0x81 0x1 0xd130 0x55
+phy raw c45 0x81 0x1 0xd131 0x303
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 3
+phy raw c45 0x81 0x1 0xd130 0x55
+phy raw c45 0x81 0x1 0xd131 0x303
+phy raw c45 0x81 0x1 0xd134 0x1
+
+phy raw c45 0x85 0x1 0xffde 0
+phy raw c45 0x85 0x1 0xd130 0x55
+phy raw c45 0x85 0x1 0xd131 0x303
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 1
+phy raw c45 0x85 0x1 0xd130 0x55
+phy raw c45 0x85 0x1 0xd131 0x303
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 2
+phy raw c45 0x85 0x1 0xd130 0x55
+phy raw c45 0x85 0x1 0xd131 0x303
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 3
+phy raw c45 0x85 0x1 0xd130 0x55
+phy raw c45 0x85 0x1 0xd131 0x303
+phy raw c45 0x85 0x1 0xd134 0x1
+
+phy raw c45 0x8d 0x1 0xffde 0
+phy raw c45 0x8d 0x1 0xd130 0x55
+phy raw c45 0x8d 0x1 0xd131 0x303
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 1
+phy raw c45 0x8d 0x1 0xd130 0x55
+phy raw c45 0x8d 0x1 0xd131 0x303
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 2
+phy raw c45 0x8d 0x1 0xd130 0x55
+phy raw c45 0x8d 0x1 0xd131 0x303
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 3
+phy raw c45 0x8d 0x1 0xd130 0x55
+phy raw c45 0x8d 0x1 0xd131 0x303
+phy raw c45 0x8d 0x1 0xd134 0x1
+
+phy raw c45 0x95 0x1 0xffde 0
+phy raw c45 0x95 0x1 0xd130 0x55
+phy raw c45 0x95 0x1 0xd131 0x303
+phy raw c45 0x95 0x1 0xd134 0x1
+phy raw c45 0x95 0x1 0xffde 1
+phy raw c45 0x95 0x1 0xd130 0x55
+phy raw c45 0x95 0x1 0xd131 0x303
+phy raw c45 0x95 0x1 0xd134 0x1
+phy raw c45 0x95 0x1 0xffde 2
+phy raw c45 0x95 0x1 0xd130 0x55
+phy raw c45 0x95 0x1 0xd131 0x303
+phy raw c45 0x95 0x1 0xd134 0x1
+phy raw c45 0x95 0x1 0xffde 3
+phy raw c45 0x95 0x1 0xd130 0x55
+phy raw c45 0x95 0x1 0xd131 0x303
+phy raw c45 0x95 0x1 0xd134 0x1
+
+phy raw c45 0xa5 0x1 0xffde 0
+phy raw c45 0xa5 0x1 0xd130 0x55
+phy raw c45 0xa5 0x1 0xd131 0x303
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 1
+phy raw c45 0xa5 0x1 0xd130 0x55
+phy raw c45 0xa5 0x1 0xd131 0x303
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 2
+phy raw c45 0xa5 0x1 0xd130 0x55
+phy raw c45 0xa5 0x1 0xd131 0x303
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 3
+phy raw c45 0xa5 0x1 0xd130 0x55
+phy raw c45 0xa5 0x1 0xd131 0x303
+phy raw c45 0xa5 0x1 0xd134 0x1
+
+phy raw c45 0xa9 0x1 0xffde 0
+phy raw c45 0xa9 0x1 0xd130 0x55
+phy raw c45 0xa9 0x1 0xd131 0x303
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 1
+phy raw c45 0xa9 0x1 0xd130 0x55
+phy raw c45 0xa9 0x1 0xd131 0x303
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 2
+phy raw c45 0xa9 0x1 0xd130 0x55
+phy raw c45 0xa9 0x1 0xd131 0x303
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 3
+phy raw c45 0xa9 0x1 0xd130 0x55
+phy raw c45 0xa9 0x1 0xd131 0x303
+phy raw c45 0xa9 0x1 0xd134 0x1
+
+phy raw c45 0xc1 0x1 0xffde 0
+phy raw c45 0xc1 0x1 0xd130 0x55
+phy raw c45 0xc1 0x1 0xd131 0x303
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 1
+phy raw c45 0xc1 0x1 0xd130 0x55
+phy raw c45 0xc1 0x1 0xd131 0x303
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 2
+phy raw c45 0xc1 0x1 0xd130 0x55
+phy raw c45 0xc1 0x1 0xd131 0x303
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 3
+phy raw c45 0xc1 0x1 0xd130 0x55
+phy raw c45 0xc1 0x1 0xd131 0x303
+phy raw c45 0xc1 0x1 0xd134 0x1
+
+phy raw c45 0xf5 0x1 0xffde 0
+phy raw c45 0xf5 0x1 0xd130 0x55
+phy raw c45 0xf5 0x1 0xd131 0x303
+phy raw c45 0xf5 0x1 0xd134 0x1
+phy raw c45 0xf5 0x1 0xffde 1
+phy raw c45 0xf5 0x1 0xd130 0x55
+phy raw c45 0xf5 0x1 0xd131 0x303
+phy raw c45 0xf5 0x1 0xd134 0x1
+phy raw c45 0xf5 0x1 0xffde 2
+phy raw c45 0xf5 0x1 0xd130 0x55
+phy raw c45 0xf5 0x1 0xd131 0x303
+phy raw c45 0xf5 0x1 0xd134 0x1
+phy raw c45 0xf5 0x1 0xffde 3
+phy raw c45 0xf5 0x1 0xd130 0x55
+phy raw c45 0xf5 0x1 0xd131 0x303
+phy raw c45 0xf5 0x1 0xd134 0x1
+
+phy raw c45 0x185 0x1 0xffde 0
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x303
+phy raw c45 0x185 0x1 0xd134 0x1
+phy raw c45 0x185 0x1 0xffde 1
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x303
+phy raw c45 0x185 0x1 0xd134 0x1
+phy raw c45 0x185 0x1 0xffde 2
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x303
+phy raw c45 0x185 0x1 0xd134 0x1
+phy raw c45 0x185 0x1 0xffde 3
+phy raw c45 0x185 0x1 0xd130 0x55
+phy raw c45 0x185 0x1 0xd131 0x303
+phy raw c45 0x185 0x1 0xd134 0x1
+
+# Start of 8x100G
+
+phy raw c45 0xe1 0x1 0xffde 0
+phy raw c45 0xe1 0x1 0xd130 0x55
+phy raw c45 0xe1 0x1 0xd131 0x303
+phy raw c45 0xe1 0x1 0xffde 1
+phy raw c45 0xe1 0x1 0xd130 0x55
+phy raw c45 0xe1 0x1 0xd131 0x303
+phy raw c45 0xe1 0x1 0xffde 2
+phy raw c45 0xe1 0x1 0xd130 0x55
+phy raw c45 0xe1 0x1 0xd131 0x303
+phy raw c45 0xe1 0x1 0xffde 3
+phy raw c45 0xe1 0x1 0xd130 0x59
+phy raw c45 0xe1 0x1 0xd131 0x505
+phy raw c45 0xe1 0x1 0xd134 0x1
+
+phy raw c45 0xe5 0x1 0xffde 0
+phy raw c45 0xe5 0x1 0xd130 0x59
+phy raw c45 0xe5 0x1 0xd131 0x502
+phy raw c45 0xe5 0x1 0xffde 1
+phy raw c45 0xe5 0x1 0xd130 0x59
+phy raw c45 0xe5 0x1 0xd131 0x502
+phy raw c45 0xe5 0x1 0xffde 2
+phy raw c45 0xe5 0x1 0xd130 0x59
+phy raw c45 0xe5 0x1 0xd131 0x502
+phy raw c45 0xe5 0x1 0xffde 3
+phy raw c45 0xe5 0x1 0xd130 0x59
+phy raw c45 0xe5 0x1 0xd131 0x502
+phy raw c45 0xe5 0x1 0xd134 0x1
+
+phy raw c45 0xed 0x1 0xffde 0
+phy raw c45 0xed 0x1 0xd130 0x59
+phy raw c45 0xed 0x1 0xd131 0x502
+phy raw c45 0xed 0x1 0xffde 1
+phy raw c45 0xed 0x1 0xd130 0x59
+phy raw c45 0xed 0x1 0xd131 0x502
+phy raw c45 0xed 0x1 0xffde 2
+phy raw c45 0xed 0x1 0xd130 0x59
+phy raw c45 0xed 0x1 0xd131 0x502
+phy raw c45 0xed 0x1 0xffde 3
+phy raw c45 0xed 0x1 0xd130 0x59
+phy raw c45 0xed 0x1 0xd131 0x502
+phy raw c45 0xed 0x1 0xd134 0x1
+
+phy raw c45 0x189 0x1 0xffde 0
+phy raw c45 0x189 0x1 0xd130 0x59
+phy raw c45 0x189 0x1 0xd131 0x502
+phy raw c45 0x189 0x1 0xffde 1
+phy raw c45 0x189 0x1 0xd130 0x59
+phy raw c45 0x189 0x1 0xd131 0x502
+phy raw c45 0x189 0x1 0xffde 2
+phy raw c45 0x189 0x1 0xd130 0x59
+phy raw c45 0x189 0x1 0xd131 0x502
+phy raw c45 0x189 0x1 0xffde 3
+phy raw c45 0x189 0x1 0xd130 0x59
+phy raw c45 0x189 0x1 0xd131 0x502
+phy raw c45 0x189 0x1 0xd134 0x1
+
+phy raw c45 0x1a1 0x1 0xffde 0
+phy raw c45 0x1a1 0x1 0xd130 0x59
+phy raw c45 0x1a1 0x1 0xd131 0x502
+phy raw c45 0x1a1 0x1 0xffde 1
+phy raw c45 0x1a1 0x1 0xd130 0x59
+phy raw c45 0x1a1 0x1 0xd131 0x502
+phy raw c45 0x1a1 0x1 0xffde 2
+phy raw c45 0x1a1 0x1 0xd130 0x59
+phy raw c45 0x1a1 0x1 0xd131 0x502
+phy raw c45 0x1a1 0x1 0xffde 3
+phy raw c45 0x1a1 0x1 0xd130 0x59
+phy raw c45 0x1a1 0x1 0xd131 0x502
+phy raw c45 0x1a1 0x1 0xd134 0x1
+
+phy raw c45 0x1a9 0x1 0xffde 0
+phy raw c45 0x1a9 0x1 0xd130 0x59
+phy raw c45 0x1a9 0x1 0xd131 0x502
+phy raw c45 0x1a9 0x1 0xffde 1
+phy raw c45 0x1a9 0x1 0xd130 0x59
+phy raw c45 0x1a9 0x1 0xd131 0x502
+phy raw c45 0x1a9 0x1 0xffde 2
+phy raw c45 0x1a9 0x1 0xd130 0x59
+phy raw c45 0x1a9 0x1 0xd131 0x502
+phy raw c45 0x1a9 0x1 0xffde 3
+phy raw c45 0x1a9 0x1 0xd130 0x59
+phy raw c45 0x1a9 0x1 0xd131 0x502
+phy raw c45 0x1a9 0x1 0xd134 0x1
+
+phy raw c45 0x1b1 0x1 0xffde 0
+phy raw c45 0x1b1 0x1 0xd130 0x59
+phy raw c45 0x1b1 0x1 0xd131 0x502
+phy raw c45 0x1b1 0x1 0xffde 1
+phy raw c45 0x1b1 0x1 0xd130 0x59
+phy raw c45 0x1b1 0x1 0xd131 0x502
+phy raw c45 0x1b1 0x1 0xffde 2
+phy raw c45 0x1b1 0x1 0xd130 0x59
+phy raw c45 0x1b1 0x1 0xd131 0x502
+phy raw c45 0x1b1 0x1 0xffde 3
+phy raw c45 0x1b1 0x1 0xd130 0x59
+phy raw c45 0x1b1 0x1 0xd131 0x502
+phy raw c45 0x1b1 0x1 0xd134 0x1
+
+phy raw c45 0x1b5 0x1 0xffde 0
+phy raw c45 0x1b5 0x1 0xd130 0x59
+phy raw c45 0x1b5 0x1 0xd131 0x502
+phy raw c45 0x1b5 0x1 0xffde 1
+phy raw c45 0x1b5 0x1 0xd130 0x59
+phy raw c45 0x1b5 0x1 0xd131 0x502
+phy raw c45 0x1b5 0x1 0xffde 2
+phy raw c45 0x1b5 0x1 0xd130 0x59
+phy raw c45 0x1b5 0x1 0xd131 0x502
+phy raw c45 0x1b5 0x1 0xffde 3
+phy raw c45 0x1b5 0x1 0xd130 0x59
+phy raw c45 0x1b5 0x1 0xd131 0x502
+phy raw c45 0x1b5 0x1 0xd134 0x1
+
+linkscan on
\ No newline at end of file
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers.json.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers.json.j2
new file mode 100644
index 000000000000..b67cf577ab75
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_def.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_def.j2
new file mode 100644
index 000000000000..740cfdf79e96
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_def.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "4625920",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t0.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..44fcf21887a6
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t0.j2
@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t1.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..5fe9cabcfd34
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "xoff": "196608",
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "33004032",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"33004032"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l2/config b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l2/config
new file mode 100644
index 000000000000..b2d4a1e80592
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l2/config
@@ -0,0 +1,3 @@
+l2_mem_entries=294912
+l3_mem_entries=16384
+l3_alpm_enable=0
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l3/config b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l3/config
new file mode 100644
index 000000000000..fff0cf54b08a
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/l3/config
@@ -0,0 +1,5 @@
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+sai_tunnel_support=1
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/pg_profile_lookup.ini b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..6d91d03ae684
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   9427       0     50176    1        3584
+  25000  5m   9427       0     50176    1        3584
+  40000  5m   9427       0     50176    1        3584
+  50000  5m   9427       0     50176    1        3584
+ 100000  5m   9427       0     50176    1        3584
+  10000  40m  9427       0     50176    1        3584
+  25000  40m  9427       0     50176    1        3584
+  40000  40m  9427       0     50176    1        3584
+  50000  40m  9427       0     50176    1        3584
+ 100000  40m  9427       0     50176    1        3584
+  10000  300m 9427       0     50176    1        3584
+  25000  300m 9427       0     50176    1        3584
+  40000  300m 9427       0     50176    1        3584
+  50000  300m 9427       0     50176    1        3584
+ 100000  300m 9427       0     50176    1        3584
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/platform-def.json b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/platform-def.json
new file mode 100644
index 000000000000..4758d031e641
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/platform-def.json
@@ -0,0 +1,48 @@
+{
+    "fec-mode": {
+        "Ethernet0-47": {
+            "1": {
+                 "1000":   [ "none" ],
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            }
+        },
+        "Ethernet48-79": {
+            "1": {
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "rs" ]
+            },
+            "2": {
+                 "20000":  [ "none", "fc" ],
+                 "50000":  [ "none", "rs" ]
+            },
+            "4": {
+                 "40000":  [ "none", "fc" ],
+                 "100000": [ "none", "rs" ]
+            }
+        }
+    },
+    "default-fec-mode": {
+        "Ethernet0-47": {
+            "1": {
+                 "1000":   "none",
+                 "10000":  "none",
+                 "25000":  "rs"
+            }
+        },
+        "Ethernet48-79": {
+            "4": {
+                 "40000":  "none",
+                 "100000": "rs"
+            }
+        }
+    },
+    "native-port-supported-speeds": {
+        "Ethernet0-47": {
+            "1": ["25000","10000","1000"]
+        },
+        "Ethernet48-79": {
+            "4": ["100000","40000"]
+        }
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/port_config.ini b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/port_config.ini
new file mode 100644
index 000000000000..d499031feef7
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/port_config.ini
@@ -0,0 +1,57 @@
+# name          lanes                 alias             index  speed
+Ethernet0       1                     twentyfiveGigE1   1      25000
+Ethernet1       2                     twentyfiveGigE2   2      25000
+Ethernet2       3                     twentyfiveGigE3   3      25000
+Ethernet3       4                     twentyfiveGigE4   4      25000
+Ethernet4       5                     twentyfiveGigE5   5      25000
+Ethernet5       6                     twentyfiveGigE6   6      25000
+Ethernet6       7                     twentyfiveGigE7   7      25000
+Ethernet7       8                     twentyfiveGigE8   8      25000
+Ethernet8       9                     twentyfiveGigE9   9      25000
+Ethernet9       10                    twentyfiveGigE10  10     25000
+Ethernet10      11                    twentyfiveGigE11  11     25000
+Ethernet11      12                    twentyfiveGigE12  12     25000
+Ethernet12      13                    twentyfiveGigE13  13     25000
+Ethernet13      14                    twentyfiveGigE14  14     25000
+Ethernet14      15                    twentyfiveGigE15  15     25000
+Ethernet15      16                    twentyfiveGigE16  16     25000
+Ethernet16      17                    twentyfiveGigE17  17     25000
+Ethernet17      18                    twentyfiveGigE18  18     25000
+Ethernet18      19                    twentyfiveGigE19  19     25000
+Ethernet19      20                    twentyfiveGigE20  20     25000
+Ethernet20      21                    twentyfiveGigE21  21     25000
+Ethernet21      22                    twentyfiveGigE22  22     25000
+Ethernet22      23                    twentyfiveGigE23  23     25000
+Ethernet23      24                    twentyfiveGigE24  24     25000
+Ethernet24      57                    twentyfiveGigE25  25     25000
+Ethernet25      58                    twentyfiveGigE26  26     25000
+Ethernet26      59                    twentyfiveGigE27  27     25000
+Ethernet27      60                    twentyfiveGigE28  28     25000
+Ethernet28      61                    twentyfiveGigE29  29     25000
+Ethernet29      62                    twentyfiveGigE30  30     25000
+Ethernet30      63                    twentyfiveGigE31  31     25000
+Ethernet31      64                    twentyfiveGigE32  32     25000
+Ethernet32      65                    twentyfiveGigE33  33     25000
+Ethernet33      66                    twentyfiveGigE34  34     25000
+Ethernet34      67                    twentyfiveGigE35  35     25000
+Ethernet35      68                    twentyfiveGigE36  36     25000
+Ethernet36      69                    twentyfiveGigE37  37     25000
+Ethernet37      70                    twentyfiveGigE38  38     25000
+Ethernet38      71                    twentyfiveGigE39  39     25000
+Ethernet39      72                    twentyfiveGigE40  40     25000
+Ethernet40      73                    twentyfiveGigE41  41     25000
+Ethernet41      74                    twentyfiveGigE42  42     25000
+Ethernet42      75                    twentyfiveGigE43  43     25000
+Ethernet43      76                    twentyfiveGigE44  44     25000
+Ethernet44      77                    twentyfiveGigE45  45     25000
+Ethernet45      78                    twentyfiveGigE46  46     25000
+Ethernet46      79                    twentyfiveGigE47  47     25000
+Ethernet47      80                    twentyfiveGigE48  48     25000
+Ethernet48      41,42,43,44           hundredGigE49     49    100000
+Ethernet52      45,46,47,48           hundredGigE50     50    100000
+Ethernet56      49,50,51,52           hundredGigE51     51    100000
+Ethernet60      53,54,55,56           hundredGigE52     52    100000
+Ethernet64      33,34,35,36           hundredGigE53     53    100000
+Ethernet68      37,38,39,40           hundredGigE54     54    100000
+Ethernet72      25,26,27,28           hundredGigE55     55    100000
+Ethernet76      29,30,31,32           hundredGigE56     56    100000
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos.json.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos.json.j2
new file mode 100644
index 000000000000..ee67c6e26221
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config_t1.j2' %}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos_config_t1.j2 b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos_config_t1.j2
new file mode 100644
index 000000000000..5fe5324a85c1
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/qos_config_t1.j2
@@ -0,0 +1,175 @@
+{%- set PORT_ALL = [] %}
+{%- for port in PORT %}
+    {%- if PORT_ALL.append(port) %}{% endif %}
+{%- endfor %}
+{%- if PORT_ALL | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_all = [] %}
+{%- for port in PORT_ALL %}
+    {%- if port_names_list_all.append(port) %}{% endif %}
+{%- endfor %}
+{%- set port_names_all = port_names_list_all | join(',') -%}
+
+
+{%- set PORT_ACTIVE = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_active = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active = port_names_list_active | join(',') -%}
+
+
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+
+
+{
+{% if generate_tc_to_pg_map is defined %}
+    {{- generate_tc_to_pg_map() }}
+{% else %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+{% endif %}
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+{% if asic_type in pfc_to_pg_map_supported_asics  %}
+    "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "3": "3",
+            "4": "4"
+        }
+    },
+{% endif %}
+    "PORT_QOS_MAP": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+{% if asic_type in pfc_to_pg_map_supported_asics %}
+            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+{% endif %}
+            "pfc_enable"      : "3,4"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/sai.profile b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/sai.profile
new file mode 100644
index 000000000000..fc6a62e31fa7
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-ix8a-bwde-48x25G+8x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/td3-ix8a-bwde-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/td3-ix8a-bwde-48x25G+8x100G.config.bcm
new file mode 100644
index 000000000000..6baa313b2542
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/Quanta-IX8A-BWDE-56X/td3-ix8a-bwde-48x25G+8x100G.config.bcm
@@ -0,0 +1,475 @@
+core_clock_frequency=1525
+dpp_clock_ratio=2:3
+parity_enable=1
+mem_cache_enable=0
+l2_mem_entries=40960
+l3_mem_entries=40960
+fpem_mem_entries=0
+l2xmsg_mode=1
+bcm_stat_flags=0
+l3_alpm_ipv6_128b_bkt_rsvd=1
+
+#RIOT Enable
+riot_enable=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384
+
+bcm_num_cos=10
+default_cpu_tx_queue=9
+bcm_stat_interval=2000000
+cdma_timeout_usec=3000000
+
+ifp_inports_support_enable=1
+ipv6_lpm_128b_enable=0x1
+l3_max_ecmp_mode=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+
+miim_intr_enable=0
+module_64ports=1
+
+schan_intr_enable=0
+skip_L2_USER_ENTRY=0
+stable_size=0x5500000
+tdma_timeout_usec=3000000
+
+# portmap settings
+oversubscribe_mode=1
+pbmp_xport_xe=0x3ffffffffffffffffffffffffffffffffe
+port_flex_enable=1
+stable_size=0x5500000
+
+#falcon core 0 flex [1:32]
+portmap_1=1:25
+portmap_2=2:25
+portmap_3=3:25
+portmap_4=4:25
+
+#falcon core 1
+portmap_5=5:25
+portmap_6=6:25
+portmap_7=7:25
+portmap_8=8:25
+
+#falcon core 2
+portmap_9=9:25
+portmap_10=10:25
+portmap_11=11:25
+portmap_12=12:25
+
+#falcon core 3
+portmap_13=13:25
+portmap_14=14:25
+portmap_15=15:25
+portmap_16=16:25
+
+#falcon core 4
+portmap_17=17:25
+portmap_18=18:25
+portmap_19=19:25
+portmap_20=20:25
+
+#falcon core 5
+portmap_21=21:25
+portmap_22=22:25
+portmap_23=23:25
+portmap_24=24:25
+
+#falcon core 6
+portmap_25=25:100
+
+#falcon core 7, port 56 supports breakout
+portmap_26=29:100
+
+#falcon core 8
+portmap_30=33:100
+
+#falcon core 9
+portmap_31=37:100
+
+#falcon core 10 flex [33:64], port 49 supports breakout
+portmap_33=41:100
+
+#falcon core 11
+portmap_37=45:100
+
+#falcon core 12
+portmap_38=49:100
+
+#falcon core 13
+portmap_39=53:100
+
+#falcon core 14
+portmap_40=57:25
+portmap_41=58:25
+portmap_42=59:25
+portmap_43=60:25
+
+#falcon core 15
+portmap_44=61:25
+portmap_45=62:25
+portmap_46=63:25
+portmap_47=64:25
+
+#falcon core 16
+portmap_48=65:25
+portmap_49=66:25
+portmap_50=67:25
+portmap_51=68:25
+
+#falcon core 17
+portmap_52=69:25
+portmap_53=70:25
+portmap_54=71:25
+portmap_55=72:25
+
+#falcon core 18
+portmap_56=73:25
+portmap_57=74:25
+portmap_58=75:25
+portmap_59=76:25
+
+#falcon core 19
+portmap_60=77:25
+portmap_61=78:25
+portmap_62=79:25
+portmap_63=80:25
+
+# datapath port -- MerlinCore
+#Hide these to prevent SAI from initializing them...they are physically not on system
+#portmap_64=81:10:m
+
+### port remap
+
+dport_map_port_1=1
+dport_map_port_2=2
+dport_map_port_3=3
+dport_map_port_4=4
+
+dport_map_port_5=5
+dport_map_port_6=6
+dport_map_port_7=7
+dport_map_port_8=8
+
+dport_map_port_9=9
+dport_map_port_10=10
+dport_map_port_11=11
+dport_map_port_12=12
+
+dport_map_port_13=13
+dport_map_port_14=14
+dport_map_port_15=15
+dport_map_port_16=16
+
+dport_map_port_17=17
+dport_map_port_18=18
+dport_map_port_19=19
+dport_map_port_20=20
+
+dport_map_port_21=21
+dport_map_port_22=22
+dport_map_port_23=23
+dport_map_port_24=24
+
+dport_map_port_40=25
+dport_map_port_41=26
+dport_map_port_42=27
+dport_map_port_43=28
+
+dport_map_port_44=29
+dport_map_port_45=30
+dport_map_port_46=31
+dport_map_port_47=32
+
+dport_map_port_48=33
+dport_map_port_49=34
+dport_map_port_50=35
+dport_map_port_51=36
+
+dport_map_port_52=37
+dport_map_port_53=38
+dport_map_port_54=39
+dport_map_port_55=40
+
+dport_map_port_56=41
+dport_map_port_57=42
+dport_map_port_58=43
+dport_map_port_59=44
+
+dport_map_port_60=45
+dport_map_port_61=46
+dport_map_port_62=47
+dport_map_port_63=48
+
+dport_map_port_33=49
+dport_map_port_34=50
+dport_map_port_35=51
+dport_map_port_36=52
+dport_map_port_37=53
+dport_map_port_38=54
+dport_map_port_39=55
+
+dport_map_port_30=56
+dport_map_port_31=57
+dport_map_port_25=58
+dport_map_port_26=59
+dport_map_port_27=60
+dport_map_port_28=61
+dport_map_port_29=62
+
+#dport_map_port_64=63
+
+### lane swap and polarity follow physical port
+
+### FC0
+phy_chain_tx_lane_map_physical{1.0}=0x3210
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{2.0}=0x0
+phy_chain_tx_polarity_flip_physical{3.0}=0x0
+phy_chain_tx_polarity_flip_physical{4.0}=0x0
+phy_chain_rx_lane_map_physical{1.0}=0x1320
+phy_chain_rx_polarity_flip_physical{1.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x1
+phy_chain_rx_polarity_flip_physical{3.0}=0x1
+phy_chain_rx_polarity_flip_physical{4.0}=0x0
+
+### FC1
+phy_chain_tx_lane_map_physical{5.0}=0x0132
+phy_chain_tx_polarity_flip_physical{5.0}=0x0
+phy_chain_tx_polarity_flip_physical{6.0}=0x0
+phy_chain_tx_polarity_flip_physical{7.0}=0x1
+phy_chain_tx_polarity_flip_physical{8.0}=0x1
+phy_chain_rx_lane_map_physical{5.0}=0x1032
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x1
+phy_chain_rx_polarity_flip_physical{7.0}=0x1
+phy_chain_rx_polarity_flip_physical{8.0}=0x1
+
+### FC2
+phy_chain_tx_lane_map_physical{9.0}=0x0123
+phy_chain_tx_polarity_flip_physical{9.0}=0x1
+phy_chain_tx_polarity_flip_physical{10.0}=0x1
+phy_chain_tx_polarity_flip_physical{11.0}=0x1
+phy_chain_tx_polarity_flip_physical{12.0}=0x1
+phy_chain_rx_lane_map_physical{9.0}=0x1032
+phy_chain_rx_polarity_flip_physical{9.0}=0x1
+phy_chain_rx_polarity_flip_physical{10.0}=0x1
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x1
+
+### FC3
+phy_chain_tx_lane_map_physical{13.0}=0x0123
+phy_chain_tx_polarity_flip_physical{13.0}=0x1
+phy_chain_tx_polarity_flip_physical{14.0}=0x1
+phy_chain_tx_polarity_flip_physical{15.0}=0x1
+phy_chain_tx_polarity_flip_physical{16.0}=0x1
+phy_chain_rx_lane_map_physical{13.0}=0x1032
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x1
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x1
+
+### FC4
+phy_chain_tx_lane_map_physical{17.0}=0x0123
+phy_chain_tx_polarity_flip_physical{17.0}=0x1
+phy_chain_tx_polarity_flip_physical{18.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x0
+phy_chain_tx_polarity_flip_physical{20.0}=0x0
+phy_chain_rx_lane_map_physical{17.0}=0x1032
+phy_chain_rx_polarity_flip_physical{17.0}=0x1
+phy_chain_rx_polarity_flip_physical{18.0}=0x0
+phy_chain_rx_polarity_flip_physical{19.0}=0x1
+phy_chain_rx_polarity_flip_physical{20.0}=0x1
+
+### FC5
+phy_chain_tx_lane_map_physical{21.0}=0x0123
+phy_chain_tx_polarity_flip_physical{21.0}=0x0
+phy_chain_tx_polarity_flip_physical{22.0}=0x0
+phy_chain_tx_polarity_flip_physical{23.0}=0x0
+phy_chain_tx_polarity_flip_physical{24.0}=0x0
+phy_chain_rx_lane_map_physical{21.0}=0x1032
+phy_chain_rx_polarity_flip_physical{21.0}=0x0
+phy_chain_rx_polarity_flip_physical{22.0}=0x0
+phy_chain_rx_polarity_flip_physical{23.0}=0x0
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+
+### FC6
+phy_chain_tx_lane_map_physical{25.0}=0x3021
+phy_chain_tx_polarity_flip_physical{25.0}=0x1
+phy_chain_tx_polarity_flip_physical{26.0}=0x1
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x0
+phy_chain_rx_lane_map_physical{25.0}=0x1032
+phy_chain_rx_polarity_flip_physical{25.0}=0x0
+phy_chain_rx_polarity_flip_physical{26.0}=0x0
+phy_chain_rx_polarity_flip_physical{27.0}=0x1
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+
+### FC7
+phy_chain_tx_lane_map_physical{29.0}=0x0213
+phy_chain_tx_polarity_flip_physical{29.0}=0x1
+phy_chain_tx_polarity_flip_physical{30.0}=0x0
+phy_chain_tx_polarity_flip_physical{31.0}=0x0
+phy_chain_tx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_lane_map_physical{29.0}=0x1203
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x0
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+
+### FC8
+phy_chain_tx_lane_map_physical{33.0}=0x0213
+phy_chain_tx_polarity_flip_physical{33.0}=0x1
+phy_chain_tx_polarity_flip_physical{34.0}=0x0
+phy_chain_tx_polarity_flip_physical{35.0}=0x0
+phy_chain_tx_polarity_flip_physical{36.0}=0x0
+phy_chain_rx_lane_map_physical{33.0}=0x1302
+phy_chain_rx_polarity_flip_physical{33.0}=0x0
+phy_chain_rx_polarity_flip_physical{34.0}=0x1
+phy_chain_rx_polarity_flip_physical{35.0}=0x0
+phy_chain_rx_polarity_flip_physical{36.0}=0x0
+
+### FC9
+phy_chain_tx_lane_map_physical{37.0}=0x3120
+phy_chain_tx_polarity_flip_physical{37.0}=0x1
+phy_chain_tx_polarity_flip_physical{38.0}=0x0
+phy_chain_tx_polarity_flip_physical{39.0}=0x0
+phy_chain_tx_polarity_flip_physical{40.0}=0x1
+phy_chain_rx_lane_map_physical{37.0}=0x2031
+phy_chain_rx_polarity_flip_physical{37.0}=0x0
+phy_chain_rx_polarity_flip_physical{38.0}=0x1
+phy_chain_rx_polarity_flip_physical{39.0}=0x0
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+
+### FC10
+phy_chain_tx_lane_map_physical{41.0}=0x0213
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x0
+phy_chain_tx_polarity_flip_physical{43.0}=0x0
+phy_chain_tx_polarity_flip_physical{44.0}=0x1
+phy_chain_rx_lane_map_physical{41.0}=0x2013
+phy_chain_rx_polarity_flip_physical{41.0}=0x1
+phy_chain_rx_polarity_flip_physical{42.0}=0x0
+phy_chain_rx_polarity_flip_physical{43.0}=0x1
+phy_chain_rx_polarity_flip_physical{44.0}=0x1
+
+### FC11
+phy_chain_tx_lane_map_physical{45.0}=0x2031
+phy_chain_tx_polarity_flip_physical{45.0}=0x1
+phy_chain_tx_polarity_flip_physical{46.0}=0x0
+phy_chain_tx_polarity_flip_physical{47.0}=0x0
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_lane_map_physical{45.0}=0x2031
+phy_chain_rx_polarity_flip_physical{45.0}=0x1
+phy_chain_rx_polarity_flip_physical{46.0}=0x1
+phy_chain_rx_polarity_flip_physical{47.0}=0x0
+phy_chain_rx_polarity_flip_physical{48.0}=0x1
+
+### FC12
+phy_chain_tx_lane_map_physical{49.0}=0x3120
+phy_chain_tx_polarity_flip_physical{49.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x1
+phy_chain_rx_lane_map_physical{49.0}=0x0123
+phy_chain_rx_polarity_flip_physical{49.0}=0x1
+phy_chain_rx_polarity_flip_physical{50.0}=0x1
+phy_chain_rx_polarity_flip_physical{51.0}=0x1
+phy_chain_rx_polarity_flip_physical{52.0}=0x0
+
+### FC13
+phy_chain_tx_lane_map_physical{53.0}=0x0123
+phy_chain_tx_polarity_flip_physical{53.0}=0x1
+phy_chain_tx_polarity_flip_physical{54.0}=0x1
+phy_chain_tx_polarity_flip_physical{55.0}=0x1
+phy_chain_tx_polarity_flip_physical{56.0}=0x1
+phy_chain_rx_lane_map_physical{53.0}=0x0312
+phy_chain_rx_polarity_flip_physical{53.0}=0x1
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x0
+## This polarity filp is due to the reverse RX connection in HW
+phy_chain_rx_polarity_flip_physical{56.0}=0x1
+
+### FC14
+phy_chain_tx_lane_map_physical{57.0}=0x3210
+phy_chain_tx_polarity_flip_physical{57.0}=0x0
+phy_chain_tx_polarity_flip_physical{58.0}=0x0
+phy_chain_tx_polarity_flip_physical{59.0}=0x0
+phy_chain_tx_polarity_flip_physical{60.0}=0x0
+phy_chain_rx_lane_map_physical{57.0}=0x2301
+phy_chain_rx_polarity_flip_physical{57.0}=0x0
+phy_chain_rx_polarity_flip_physical{58.0}=0x0
+phy_chain_rx_polarity_flip_physical{59.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x0
+
+### FC15
+phy_chain_tx_lane_map_physical{61.0}=0x3210
+phy_chain_tx_polarity_flip_physical{61.0}=0x0
+phy_chain_tx_polarity_flip_physical{62.0}=0x0
+phy_chain_tx_polarity_flip_physical{63.0}=0x0
+phy_chain_tx_polarity_flip_physical{64.0}=0x1
+phy_chain_rx_lane_map_physical{61.0}=0x2301
+phy_chain_rx_polarity_flip_physical{61.0}=0x1
+phy_chain_rx_polarity_flip_physical{62.0}=0x1
+phy_chain_rx_polarity_flip_physical{63.0}=0x0
+phy_chain_rx_polarity_flip_physical{64.0}=0x1
+
+### FC16
+phy_chain_tx_lane_map_physical{65.0}=0x3210
+phy_chain_tx_polarity_flip_physical{65.0}=0x1
+phy_chain_tx_polarity_flip_physical{66.0}=0x1
+phy_chain_tx_polarity_flip_physical{67.0}=0x1
+phy_chain_tx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_lane_map_physical{65.0}=0x2301
+phy_chain_rx_polarity_flip_physical{65.0}=0x1
+phy_chain_rx_polarity_flip_physical{66.0}=0x1
+phy_chain_rx_polarity_flip_physical{67.0}=0x1
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+
+### FC17
+phy_chain_tx_lane_map_physical{69.0}=0x3210
+phy_chain_tx_polarity_flip_physical{69.0}=0x1
+phy_chain_tx_polarity_flip_physical{70.0}=0x1
+phy_chain_tx_polarity_flip_physical{71.0}=0x1
+phy_chain_tx_polarity_flip_physical{72.0}=0x1
+phy_chain_rx_lane_map_physical{69.0}=0x2301
+phy_chain_rx_polarity_flip_physical{69.0}=0x1
+phy_chain_rx_polarity_flip_physical{70.0}=0x1
+phy_chain_rx_polarity_flip_physical{71.0}=0x1
+phy_chain_rx_polarity_flip_physical{72.0}=0x1
+
+### FC18
+phy_chain_tx_lane_map_physical{73.0}=0x3210
+phy_chain_tx_polarity_flip_physical{73.0}=0x1
+phy_chain_tx_polarity_flip_physical{74.0}=0x1
+phy_chain_tx_polarity_flip_physical{75.0}=0x1
+phy_chain_tx_polarity_flip_physical{76.0}=0x1
+phy_chain_rx_lane_map_physical{73.0}=0x2301
+phy_chain_rx_polarity_flip_physical{73.0}=0x1
+phy_chain_rx_polarity_flip_physical{74.0}=0x1
+phy_chain_rx_polarity_flip_physical{75.0}=0x1
+phy_chain_rx_polarity_flip_physical{76.0}=0x1
+
+### FC19
+phy_chain_tx_lane_map_physical{77.0}=0x0213
+phy_chain_tx_polarity_flip_physical{77.0}=0x0
+phy_chain_tx_polarity_flip_physical{78.0}=0x1
+phy_chain_tx_polarity_flip_physical{79.0}=0x1
+phy_chain_tx_polarity_flip_physical{80.0}=0x0
+phy_chain_rx_lane_map_physical{77.0}=0x0213
+phy_chain_rx_polarity_flip_physical{77.0}=0x0
+phy_chain_rx_polarity_flip_physical{78.0}=0x1
+phy_chain_rx_polarity_flip_physical{79.0}=0x1
+phy_chain_rx_polarity_flip_physical{80.0}=0x0
+
+### MerlinCore
+#phy_chain_tx_polarity_flip_physical{81.0}=0x0
+#phy_chain_rx_polarity_flip_physical{81.0}=0x0
+
+l2_mem_entries=40960
+l3_mem_entries=40960
+l3_alpm_enable=2
+use_all_splithorizon_groups=1
+
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix8a_bwde-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4902628c7fec42871a607761d489ec513a1c0375
GIT binary patch
literal 564
zcmZ9J-Ahw(7{@<nXU&!`waVIRz3fHHmsY8nGs~Uhe9F>UJ1ErxTieB<J4vLwhD9h8
zwL!%aBD(FyhTYZGyb6h3+THHFi~R}x4h2F#`0~J)&-3AdU*qeX%*vD`rLq2Wjj&eI
zB4yE|AH@}EPTVyuBV(>gI#rQpb;>{dMclSGv*}IAKtiO=)M|I6C6Q)UN||4QmCAE_
z{+=HHS@Fc?w!Sc)n!o)@N*H$9-xZ{nnmgnx%+yPWT?*_pld9Qa4Dl7l>P5vY`q$+z
z<qG8`RJavfQSD2ssAke`we&v6^v2TrS1aBBZA^%>q5UH?MFbSl8C)<IjJ(;K5c`GY
z_#BVpbG(kvuxHYa&!uik+U=IJsrRt;WLx{-9@O66jCpEW`Jud9CeqYF@zJ&x-FQGm
z&rOGnoE~1vZQR$hMs_J%%~o^OyuLQ_?X{HUlYExO_s4PY52K!j3mrGR@X*9=yzHTw
z7FuazFZ=MZp937EokJYv8WUXS29r#YVwwa7CSxQSN4Uy4&eKOf16*K`iwqHGm`jXs
znJbLqC%_So666@iIl)OngozNPgHBFynl8HOQD1b17-z{3K~UYgsOGZDdzDR<-zt9q
D%vFln

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/default_sku b/device/quanta/x86_64-quanta_ix8a_bwde-r0/default_sku
new file mode 100644
index 000000000000..377de21e65fa
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/default_sku
@@ -0,0 +1 @@
+Quanta-IX8A-BWDE-56X t1
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/installer.conf b/device/quanta/x86_64-quanta_ix8a_bwde-r0/installer.conf
new file mode 100644
index 000000000000..925a32fc0c3a
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/installer.conf
@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix8a_bwde-r0/led_proc_init.soc
new file mode 100644
index 000000000000..dac21e51e485
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/led_proc_init.soc
@@ -0,0 +1,3 @@
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
+led start
+rcload /usr/share/sonic/platform/preemphasis-48x25_8x100.soc
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/eeprom.py
new file mode 100644
index 000000000000..0a6121c3cd92
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/eeprom.py
@@ -0,0 +1,12 @@
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+    _TLV_INFO_MAX_LEN = 256
+
+    def __init__(self, name, path, cpld_root, ro):
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/fanutil.py b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/fanutil.py
new file mode 100644
index 000000000000..2cf72ddf7e5b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/fanutil.py
@@ -0,0 +1,110 @@
+#
+# fanutil.py
+# Platform-specific Fan status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_fan.fan_base import FanBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+class FanUtil(FanBase):
+    """Platform-specific FANutil class"""
+
+    SYS_FAN_NUM = 6
+    NUM_FANS_PERTRAY = 2
+    HWMON_PATH = '/sys/class/hwmon/hwmon2/'
+    FAN_INDEX_START = 18
+
+    logger = logging.getLogger(__name__)
+
+    def __init__(self, log_level=logging.DEBUG):
+        FanBase.__init__(self)
+        self.num_fans = (self.SYS_FAN_NUM * self.NUM_FANS_PERTRAY) 
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def check_fan_index(self, index):
+        if index is None:
+            return False
+
+        if index < 1 or index > self.num_fans:
+            logging.error("Invalid Fan index:", index)
+            return False
+
+        return True
+
+    def get_num_fans(self):
+        return self.num_fans
+
+    def get_status(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        if fantray_speed == '0.0' :
+           return False
+
+        return True
+
+    def get_presence(self, index):
+        if self.check_fan_index(index) == False:
+           return False
+
+        fantray_present_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_present'
+        fantray_present = self.get_attr_value(self.HWMON_PATH + fantray_present_file)
+
+        if fantray_present == '1' :
+           return True
+
+        return False
+
+    def get_direction(self, index):
+        if self.check_fan_index(index) == False:
+           return None
+
+        fantray_direction_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_direction'
+        fantray_direction = self.get_attr_value(self.HWMON_PATH + fantray_direction_file)
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if fantray_direction == '2':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_speed(self, index):
+        if self.check_fan_index(index) == False:
+           return 0
+
+        fantray_speed_file = 'fan' + str(self.FAN_INDEX_START+(index-1)) + '_input'
+        fantray_speed = self.get_attr_value(self.HWMON_PATH + fantray_speed_file)
+
+        return int(float(fantray_speed))
+
+
+    def set_speed(self, val):
+        logging.error("Not allowed to set fan speed!")
+
+        return False
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/psuutil.py b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..2394ad0ea044
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/psuutil.py
@@ -0,0 +1,250 @@
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+import logging
+import os.path
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    HWMON_PATH = '/sys/class/hwmon/hwmon1/'
+    PSU1_PREFIX = 'power114_'
+    PSU2_PREFIX = 'power126_'
+    MAX_PSUS = 2
+    def __init__(self):
+        PsuBase.__init__(self)
+
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def get_attr_filename(self, index, attr):
+        if (index == 1):
+            attr_file = self.PSU1_PREFIX + attr
+        elif (index == 2):
+            attr_file = self.PSU2_PREFIX + attr
+        else:
+            logging.error("Invalid PSU number:", index)
+            return ''
+
+        return attr_file
+
+    def get_num_psus(self):
+        """
+        Retrieves the number of PSUs available on the device
+        :return: An integer, the number of PSUs available on the device
+         """
+
+        return self.MAX_PSUS
+
+    def get_psu_status(self, index):
+        """
+        Retrieves the oprational status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is operating properly, False if PSU is\
+        faulty
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+            return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+
+    def get_psu_presence(self, index):
+        """
+        Retrieves the presence status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is plugged, False if not
+        """
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'present')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check PSU status
+            if (attr_value == 1):
+                status = True
+        return status
+
+    def get_powergood_status(self, index):
+        status = False
+
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return status
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+
+            # Check PSU status
+            if (attr_value != 0.0):
+                status = True
+
+        return status
+    
+    def get_model(self, index):
+        attr_filename = self.get_attr_filename(index, 'model')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_mfr_id(self, index):
+        attr_filename = self.get_attr_filename(index, 'mfrid')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_serial(self, index):
+        attr_filename = self.get_attr_filename(index, 'sn')
+        if attr_filename == '':
+           return None
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            return attr_value.rstrip()
+
+    def get_direction(self, index):
+        if (index == 1):
+            direction_file = 'fan120_direction'
+        elif (index == 2):
+            direction_file = 'fan132_direction'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return None
+
+        direction = self.get_attr_value(self.HWMON_PATH + direction_file)
+        direction = direction.rstrip()
+
+        """
+        1: FB 2: BF
+        Since the fan is at rear of the switch, FB means Exhaust; BF means Intake
+        """
+        if direction == '"\"':
+            return "INTAKE"
+        else:
+            return "EXHAUST"
+
+    def get_output_voltage(self, index):
+        if (index == 1):
+            attr_file = 'in129_input'
+        elif (index == 2):
+            attr_file = 'in124_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        voltage = self.get_attr_value(self.HWMON_PATH + attr_file)
+        voltage = voltage.rstrip()
+
+        if (voltage != 'ERR'):
+            voltage, dummy = voltage.split('.', 1)
+        else:
+            return 0.0
+
+        return float(voltage)/1000
+
+    def get_output_current(self, index):
+        if (index == 1):
+            attr_file = 'curr130_input'
+        elif (index == 2):
+            attr_file = 'curr115_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0.0
+
+        current = self.get_attr_value(self.HWMON_PATH + attr_file)
+        current = current.rstrip()
+
+        if (current != 'ERR'):
+            current, dummy = current.split('.',1)
+        else:
+            return 0.0
+
+        return float(current)/1000
+
+    def get_output_power(self, index):
+        attr_filename = self.get_attr_filename(index, 'input')
+        if attr_filename == '':
+           return 0.0
+
+        attr_path = self.HWMON_PATH + attr_filename
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = float(attr_value)
+        else:
+            return 0.0
+
+        return float(attr_value/1000)
+
+    def get_fan_rpm(self, index, fan_idx):
+        if (index == 1):
+            rpm_file = 'fan120_input'
+        elif (index == 2):
+            rpm_file = 'fan132_input'
+        else:
+            logging.error("Invalid PSU number:", index)
+            return 0
+
+        rpm = self.get_attr_value(self.HWMON_PATH + rpm_file)
+        rpm = rpm.rstrip()
+        if (rpm != 'ERR'):
+            rpm = float(rpm)
+        else:
+            return 0
+
+        return int(rpm)
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/sfputil.py
new file mode 100644
index 000000000000..3479e46f1f68
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/plugins/sfputil.py
@@ -0,0 +1,213 @@
+# sfputil.py
+#
+# Platform-specific SFP transceiver interface for SONiC
+#
+
+try:
+    import time
+    from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
+
+
+class SfpUtil(SfpUtilBase):
+    """Platform-specific SfpUtil class"""
+
+    PORT_START = 1
+    PORT_END = 56
+    PORTS_IN_BLOCK = 56
+    QSFP_PORT_START = 49
+    QSFP_PORT_END = 56
+
+    _port_to_eeprom_mapping = {}
+    _port_to_i2c_mapping = {
+         1 : 13,
+         2 : 14,
+         3 : 15,
+         4 : 16,
+         5 : 17,
+         6 : 18,
+         7 : 19,
+         8 : 20,
+         9 : 21,
+        10 : 22,
+        11 : 23,
+        12 : 24,
+        13 : 25,
+        14 : 26,
+        15 : 27,
+        16 : 28,
+        17 : 29,
+        18 : 30,
+        19 : 31,
+        20 : 32,
+        21 : 33,
+        22 : 34,
+        23 : 35,
+        24 : 36,
+        25 : 37,
+        26 : 38,
+        27 : 39,
+        28 : 40,
+        29 : 41,
+        30 : 42,
+        31 : 43,
+        32 : 44,
+        33 : 45,
+        34 : 46,
+        35 : 47,
+        36 : 48,
+        37 : 49,
+        38 : 50,
+        39 : 51,
+        40 : 52,
+        41 : 53,
+        42 : 54,
+        43 : 55,
+        44 : 56,
+        45 : 57,
+        46 : 58,
+        47 : 59,
+        48 : 60,
+        49 : 61,#QSFP49
+        50 : 62,#QSFP50
+        51 : 63,#QSFP51
+        52 : 64,#QSFP52
+        53 : 65,#QSFP53
+        54 : 66,#QSFP54
+        55 : 67,#QSFP55
+        56 : 68,#QSFP56
+    }
+
+    @property
+    def port_start(self):
+        return self.PORT_START
+
+    @property
+    def port_end(self):
+        return self.PORT_END
+
+    @property
+    def qsfp_port_start(self):
+        return self.QSFP_PORT_START
+
+    @property
+    def qsfp_port_end(self):
+        return self.QSFP_PORT_END
+
+    @property
+    def qsfp_ports(self):
+        return range(self.QSFP_PORT_START, self.PORTS_IN_BLOCK + 1)
+
+    @property
+    def port_to_eeprom_mapping(self):
+         return self._port_to_eeprom_mapping
+
+    def __init__(self):
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        for x in range(self.port_start, self.port_end+1):
+            self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
+        SfpUtilBase.__init__(self)
+
+    def get_presence(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            if port_num < self.qsfp_port_start:
+                reg_file = open("/sys/class/cpld-sfp28/port-"+str(port_num)+"/pre_n")
+            else:
+                reg_file = open("/sys/class/gpio/gpio"+str((port_num-self.qsfp_port_start)*4+34)+"/value")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        if port_num < self.qsfp_port_start:
+            if reg_value == '1':
+                return True
+        else:
+            if reg_value == '0':
+                return True
+
+        return False
+
+    def get_low_power_mode(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.qsfp_port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/gpio/gpio"+str((port_num-self.qsfp_port_start)*4+35)+"/value")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = int(reg_file.readline().rstrip())
+
+        if reg_value == 0:
+            return False
+
+        return True
+
+    def set_low_power_mode(self, port_num, lpmode):
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.qsfp_port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/gpio/gpio"+str((port_num-self.qsfp_port_start)*4+35)+"/value", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        # LPMode is active high; set or clear the bit accordingly
+        if lpmode is True:
+            reg_value = 1
+        else:
+            reg_value = 0
+
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        return True
+
+    def reset(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/class/gpio/gpio"+str((port_num-self.qsfp_port_start)*4+32)+"/value", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = 0
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        # Sleep 2 second to allow it to settle
+        time.sleep(2)
+
+        # Flip the value back write back to the register to take port out of reset
+        try:
+            reg_file = open("/sys/class/gpio/gpio"+str((port_num-self.qsfp_port_start)*4+32)+"/value", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = 1
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        return True
+
+    def get_transceiver_change_event(self):
+        """
+        TODO: This function need to be implemented
+        when decide to support monitoring SFP(Xcvrd)
+        on this platform.
+        """
+        raise NotImplementedError
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix8a_bwde-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..94592fa8cebc
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/quanta/x86_64-quanta_ix8a_bwde-r0/preemphasis-48x25_8x100.soc b/device/quanta/x86_64-quanta_ix8a_bwde-r0/preemphasis-48x25_8x100.soc
new file mode 100644
index 000000000000..00192697ffbc
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8a_bwde-r0/preemphasis-48x25_8x100.soc
@@ -0,0 +1,349 @@
+# 48x25G 8x100G pre-emphasis setting for Quanta IX8A-BWDE
+echo "Set tx pre-emphasis and idriver values"
+linkscan off
+
+# Start of 48x25G
+
+phy raw c45 0x81 0x1 0xffde 0
+phy raw c45 0x81 0x1 0xd130 0x32
+phy raw c45 0x81 0x1 0xd131 0x306
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 1
+phy raw c45 0x81 0x1 0xd130 0x32
+phy raw c45 0x81 0x1 0xd131 0x306
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 2
+phy raw c45 0x81 0x1 0xd130 0x32
+phy raw c45 0x81 0x1 0xd131 0x306
+phy raw c45 0x81 0x1 0xd134 0x1
+phy raw c45 0x81 0x1 0xffde 3
+phy raw c45 0x81 0x1 0xd130 0x32
+phy raw c45 0x81 0x1 0xd131 0x306
+phy raw c45 0x81 0x1 0xd134 0x1
+
+phy raw c45 0x85 0x1 0xffde 0
+phy raw c45 0x85 0x1 0xd130 0x32
+phy raw c45 0x85 0x1 0xd131 0x306
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 1
+phy raw c45 0x85 0x1 0xd130 0x32
+phy raw c45 0x85 0x1 0xd131 0x306
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 2
+phy raw c45 0x85 0x1 0xd130 0x32
+phy raw c45 0x85 0x1 0xd131 0x306
+phy raw c45 0x85 0x1 0xd134 0x1
+phy raw c45 0x85 0x1 0xffde 3
+phy raw c45 0x85 0x1 0xd130 0x32
+phy raw c45 0x85 0x1 0xd131 0x306
+phy raw c45 0x85 0x1 0xd134 0x1
+
+phy raw c45 0x89 0x1 0xffde 0
+phy raw c45 0x89 0x1 0xd130 0x32
+phy raw c45 0x89 0x1 0xd131 0x306
+phy raw c45 0x89 0x1 0xd134 0x1
+phy raw c45 0x89 0x1 0xffde 1
+phy raw c45 0x89 0x1 0xd130 0x32
+phy raw c45 0x89 0x1 0xd131 0x306
+phy raw c45 0x89 0x1 0xd134 0x1
+phy raw c45 0x89 0x1 0xffde 2
+phy raw c45 0x89 0x1 0xd130 0x32
+phy raw c45 0x89 0x1 0xd131 0x306
+phy raw c45 0x89 0x1 0xd134 0x1
+phy raw c45 0x89 0x1 0xffde 3
+phy raw c45 0x89 0x1 0xd130 0x32
+phy raw c45 0x89 0x1 0xd131 0x306
+phy raw c45 0x89 0x1 0xd134 0x1
+
+phy raw c45 0x8d 0x1 0xffde 0
+phy raw c45 0x8d 0x1 0xd130 0x32
+phy raw c45 0x8d 0x1 0xd131 0x306
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 1
+phy raw c45 0x8d 0x1 0xd130 0x32
+phy raw c45 0x8d 0x1 0xd131 0x306
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 2
+phy raw c45 0x8d 0x1 0xd130 0x32
+phy raw c45 0x8d 0x1 0xd131 0x306
+phy raw c45 0x8d 0x1 0xd134 0x1
+phy raw c45 0x8d 0x1 0xffde 3
+phy raw c45 0x8d 0x1 0xd130 0x32
+phy raw c45 0x8d 0x1 0xd131 0x306
+phy raw c45 0x8d 0x1 0xd134 0x1
+
+phy raw c45 0x91 0x1 0xffde 0
+phy raw c45 0x91 0x1 0xd130 0x32
+phy raw c45 0x91 0x1 0xd131 0x306
+phy raw c45 0x91 0x1 0xd134 0x1
+phy raw c45 0x91 0x1 0xffde 1
+phy raw c45 0x91 0x1 0xd130 0x32
+phy raw c45 0x91 0x1 0xd131 0x306
+phy raw c45 0x91 0x1 0xd134 0x1
+phy raw c45 0x91 0x1 0xffde 2
+phy raw c45 0x91 0x1 0xd130 0x32
+phy raw c45 0x91 0x1 0xd131 0x306
+phy raw c45 0x91 0x1 0xd134 0x1
+phy raw c45 0x91 0x1 0xffde 3
+phy raw c45 0x91 0x1 0xd130 0x32
+phy raw c45 0x91 0x1 0xd131 0x306
+phy raw c45 0x91 0x1 0xd134 0x1
+
+phy raw c45 0xa1 0x1 0xffde 0
+phy raw c45 0xa1 0x1 0xd130 0x32
+phy raw c45 0xa1 0x1 0xd131 0x306
+phy raw c45 0xa1 0x1 0xd134 0x1
+phy raw c45 0xa1 0x1 0xffde 1
+phy raw c45 0xa1 0x1 0xd130 0x32
+phy raw c45 0xa1 0x1 0xd131 0x306
+phy raw c45 0xa1 0x1 0xd134 0x1
+phy raw c45 0xa1 0x1 0xffde 2
+phy raw c45 0xa1 0x1 0xd130 0x32
+phy raw c45 0xa1 0x1 0xd131 0x306
+phy raw c45 0xa1 0x1 0xd134 0x1
+phy raw c45 0xa1 0x1 0xffde 3
+phy raw c45 0xa1 0x1 0xd130 0x32
+phy raw c45 0xa1 0x1 0xd131 0x306
+phy raw c45 0xa1 0x1 0xd134 0x1
+
+phy raw c45 0xd1 0x1 0xffde 0
+phy raw c45 0xd1 0x1 0xd130 0x32
+phy raw c45 0xd1 0x1 0xd131 0x306
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 1
+phy raw c45 0xd1 0x1 0xd130 0x32
+phy raw c45 0xd1 0x1 0xd131 0x306
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 2
+phy raw c45 0xd1 0x1 0xd130 0x32
+phy raw c45 0xd1 0x1 0xd131 0x306
+phy raw c45 0xd1 0x1 0xd134 0x1
+phy raw c45 0xd1 0x1 0xffde 3
+phy raw c45 0xd1 0x1 0xd130 0x32
+phy raw c45 0xd1 0x1 0xd131 0x306
+phy raw c45 0xd1 0x1 0xd134 0x1
+
+phy raw c45 0xe1 0x1 0xffde 0
+phy raw c45 0xe1 0x1 0xd130 0x32
+phy raw c45 0xe1 0x1 0xd131 0x306
+phy raw c45 0xe1 0x1 0xd134 0x1
+phy raw c45 0xe1 0x1 0xffde 1
+phy raw c45 0xe1 0x1 0xd130 0x32
+phy raw c45 0xe1 0x1 0xd131 0x306
+phy raw c45 0xe1 0x1 0xd134 0x1
+phy raw c45 0xe1 0x1 0xffde 2
+phy raw c45 0xe1 0x1 0xd130 0x32
+phy raw c45 0xe1 0x1 0xd131 0x306
+phy raw c45 0xe1 0x1 0xd134 0x1
+phy raw c45 0xe1 0x1 0xffde 3
+phy raw c45 0xe1 0x1 0xd130 0x32
+phy raw c45 0xe1 0x1 0xd131 0x306
+phy raw c45 0xe1 0x1 0xd134 0x1
+
+phy raw c45 0xe5 0x1 0xffde 0
+phy raw c45 0xe5 0x1 0xd130 0x32
+phy raw c45 0xe5 0x1 0xd131 0x306
+phy raw c45 0xe5 0x1 0xd134 0x1
+phy raw c45 0xe5 0x1 0xffde 1
+phy raw c45 0xe5 0x1 0xd130 0x32
+phy raw c45 0xe5 0x1 0xd131 0x306
+phy raw c45 0xe5 0x1 0xd134 0x1
+phy raw c45 0xe5 0x1 0xffde 2
+phy raw c45 0xe5 0x1 0xd130 0x32
+phy raw c45 0xe5 0x1 0xd131 0x306
+phy raw c45 0xe5 0x1 0xd134 0x1
+phy raw c45 0xe5 0x1 0xffde 3
+phy raw c45 0xe5 0x1 0xd130 0x32
+phy raw c45 0xe5 0x1 0xd131 0x306
+phy raw c45 0xe5 0x1 0xd134 0x1
+
+phy raw c45 0xe9 0x1 0xffde 0
+phy raw c45 0xe9 0x1 0xd130 0x32
+phy raw c45 0xe9 0x1 0xd131 0x306
+phy raw c45 0xe9 0x1 0xd134 0x1
+phy raw c45 0xe9 0x1 0xffde 1
+phy raw c45 0xe9 0x1 0xd130 0x32
+phy raw c45 0xe9 0x1 0xd131 0x306
+phy raw c45 0xe9 0x1 0xd134 0x1
+phy raw c45 0xe9 0x1 0xffde 2
+phy raw c45 0xe9 0x1 0xd130 0x32
+phy raw c45 0xe9 0x1 0xd131 0x306
+phy raw c45 0xe9 0x1 0xd134 0x1
+phy raw c45 0xe9 0x1 0xffde 3
+phy raw c45 0xe9 0x1 0xd130 0x32
+phy raw c45 0xe9 0x1 0xd131 0x306
+phy raw c45 0xe9 0x1 0xd134 0x1
+
+phy raw c45 0xed 0x1 0xffde 0
+phy raw c45 0xed 0x1 0xd130 0x32
+phy raw c45 0xed 0x1 0xd131 0x306
+phy raw c45 0xed 0x1 0xd134 0x1
+phy raw c45 0xed 0x1 0xffde 1
+phy raw c45 0xed 0x1 0xd130 0x32
+phy raw c45 0xed 0x1 0xd131 0x306
+phy raw c45 0xed 0x1 0xd134 0x1
+phy raw c45 0xed 0x1 0xffde 2
+phy raw c45 0xed 0x1 0xd130 0x32
+phy raw c45 0xed 0x1 0xd131 0x306
+phy raw c45 0xed 0x1 0xd134 0x1
+phy raw c45 0xed 0x1 0xffde 3
+phy raw c45 0xed 0x1 0xd130 0x32
+phy raw c45 0xed 0x1 0xd131 0x306
+phy raw c45 0xed 0x1 0xd134 0x1
+
+phy raw c45 0xf1 0x1 0xffde 0
+phy raw c45 0xf1 0x1 0xd130 0x32
+phy raw c45 0xf1 0x1 0xd131 0x306
+phy raw c45 0xf1 0x1 0xd134 0x1
+phy raw c45 0xf1 0x1 0xffde 1
+phy raw c45 0xf1 0x1 0xd130 0x32
+phy raw c45 0xf1 0x1 0xd131 0x306
+phy raw c45 0xf1 0x1 0xd134 0x1
+phy raw c45 0xf1 0x1 0xffde 2
+phy raw c45 0xf1 0x1 0xd130 0x32
+phy raw c45 0xf1 0x1 0xd131 0x306
+phy raw c45 0xf1 0x1 0xd134 0x1
+phy raw c45 0xf1 0x1 0xffde 3
+phy raw c45 0xf1 0x1 0xd130 0x32
+phy raw c45 0xf1 0x1 0xd131 0x306
+phy raw c45 0xf1 0x1 0xd134 0x1
+
+# Start of 8x100G
+
+phy raw c45 0xc1 0x1 0xffde 0
+phy raw c45 0xc1 0x1 0xd130 0x50
+phy raw c45 0xc1 0x1 0xd131 0xa0a
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 1
+phy raw c45 0xc1 0x1 0xd130 0x50
+phy raw c45 0xc1 0x1 0xd131 0xa0a
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 2
+phy raw c45 0xc1 0x1 0xd130 0x50
+phy raw c45 0xc1 0x1 0xd131 0xa0a
+phy raw c45 0xc1 0x1 0xd134 0x1
+phy raw c45 0xc1 0x1 0xffde 3
+phy raw c45 0xc1 0x1 0xd130 0x50
+phy raw c45 0xc1 0x1 0xd131 0xa0a
+phy raw c45 0xc1 0x1 0xd134 0x1
+
+phy raw c45 0xc5 0x1 0xffde 0
+phy raw c45 0xc5 0x1 0xd130 0x50
+phy raw c45 0xc5 0x1 0xd131 0xa0a
+phy raw c45 0xc5 0x1 0xd134 0x1
+phy raw c45 0xc5 0x1 0xffde 1
+phy raw c45 0xc5 0x1 0xd130 0x50
+phy raw c45 0xc5 0x1 0xd131 0xa0a
+phy raw c45 0xc5 0x1 0xd134 0x1
+phy raw c45 0xc5 0x1 0xffde 2
+phy raw c45 0xc5 0x1 0xd130 0x50
+phy raw c45 0xc5 0x1 0xd131 0xa0a
+phy raw c45 0xc5 0x1 0xd134 0x1
+phy raw c45 0xc5 0x1 0xffde 3
+phy raw c45 0xc5 0x1 0xd130 0x50
+phy raw c45 0xc5 0x1 0xd131 0xa0a
+phy raw c45 0xc5 0x1 0xd134 0x1
+
+phy raw c45 0xc9 0x1 0xffde 0
+phy raw c45 0xc9 0x1 0xd130 0x50
+phy raw c45 0xc9 0x1 0xd131 0xa0a
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 1
+phy raw c45 0xc9 0x1 0xd130 0x50
+phy raw c45 0xc9 0x1 0xd131 0xa0a
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 2
+phy raw c45 0xc9 0x1 0xd130 0x50
+phy raw c45 0xc9 0x1 0xd131 0xa0a
+phy raw c45 0xc9 0x1 0xd134 0x1
+phy raw c45 0xc9 0x1 0xffde 3
+phy raw c45 0xc9 0x1 0xd130 0x50
+phy raw c45 0xc9 0x1 0xd131 0xa0a
+phy raw c45 0xc9 0x1 0xd134 0x1
+
+phy raw c45 0xcd 0x1 0xffde 0
+phy raw c45 0xcd 0x1 0xd130 0x50
+phy raw c45 0xcd 0x1 0xd131 0xa0a
+phy raw c45 0xcd 0x1 0xd134 0x1
+phy raw c45 0xcd 0x1 0xffde 1
+phy raw c45 0xcd 0x1 0xd130 0x50
+phy raw c45 0xcd 0x1 0xd131 0xa0a
+phy raw c45 0xcd 0x1 0xd134 0x1
+phy raw c45 0xcd 0x1 0xffde 2
+phy raw c45 0xcd 0x1 0xd130 0x50
+phy raw c45 0xcd 0x1 0xd131 0xa0a
+phy raw c45 0xcd 0x1 0xd134 0x1
+phy raw c45 0xcd 0x1 0xffde 3
+phy raw c45 0xcd 0x1 0xd130 0x50
+phy raw c45 0xcd 0x1 0xd131 0xa0a
+phy raw c45 0xcd 0x1 0xd134 0x1
+
+phy raw c45 0xad 0x1 0xffde 0
+phy raw c45 0xad 0x1 0xd130 0x50
+phy raw c45 0xad 0x1 0xd131 0xa0a
+phy raw c45 0xad 0x1 0xd134 0x1
+phy raw c45 0xad 0x1 0xffde 1
+phy raw c45 0xad 0x1 0xd130 0x50
+phy raw c45 0xad 0x1 0xd131 0xa0a
+phy raw c45 0xad 0x1 0xd134 0x1
+phy raw c45 0xad 0x1 0xffde 2
+phy raw c45 0xad 0x1 0xd130 0x50
+phy raw c45 0xad 0x1 0xd131 0xa0a
+phy raw c45 0xad 0x1 0xd134 0x1
+phy raw c45 0xad 0x1 0xffde 3
+phy raw c45 0xad 0x1 0xd130 0x50
+phy raw c45 0xad 0x1 0xd131 0xa0a
+phy raw c45 0xad 0x1 0xd134 0x1
+
+phy raw c45 0xb1 0x1 0xffde 0
+phy raw c45 0xb1 0x1 0xd130 0x50
+phy raw c45 0xb1 0x1 0xd131 0xa0a
+phy raw c45 0xb1 0x1 0xd134 0x1
+phy raw c45 0xb1 0x1 0xffde 1
+phy raw c45 0xb1 0x1 0xd130 0x50
+phy raw c45 0xb1 0x1 0xd131 0xa0a
+phy raw c45 0xb1 0x1 0xd134 0x1
+phy raw c45 0xb1 0x1 0xffde 2
+phy raw c45 0xb1 0x1 0xd130 0x50
+phy raw c45 0xb1 0x1 0xd131 0xa0a
+phy raw c45 0xb1 0x1 0xd134 0x1
+phy raw c45 0xb1 0x1 0xffde 3
+phy raw c45 0xb1 0x1 0xd130 0x50
+phy raw c45 0xb1 0x1 0xd131 0xa0a
+phy raw c45 0xb1 0x1 0xd134 0x1
+
+phy raw c45 0xa5 0x1 0xffde 0
+phy raw c45 0xa5 0x1 0xd130 0x50
+phy raw c45 0xa5 0x1 0xd131 0xa0a
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 1
+phy raw c45 0xa5 0x1 0xd130 0x50
+phy raw c45 0xa5 0x1 0xd131 0xa0a
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 2
+phy raw c45 0xa5 0x1 0xd130 0x50
+phy raw c45 0xa5 0x1 0xd131 0xa0a
+phy raw c45 0xa5 0x1 0xd134 0x1
+phy raw c45 0xa5 0x1 0xffde 3
+phy raw c45 0xa5 0x1 0xd130 0x50
+phy raw c45 0xa5 0x1 0xd131 0xa0a
+phy raw c45 0xa5 0x1 0xd134 0x1
+
+phy raw c45 0xa9 0x1 0xffde 0
+phy raw c45 0xa9 0x1 0xd130 0x50
+phy raw c45 0xa9 0x1 0xd131 0xa0a
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 1
+phy raw c45 0xa9 0x1 0xd130 0x50
+phy raw c45 0xa9 0x1 0xd131 0xa0a
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 2
+phy raw c45 0xa9 0x1 0xd130 0x50
+phy raw c45 0xa9 0x1 0xd131 0xa0a
+phy raw c45 0xa9 0x1 0xd134 0x1
+phy raw c45 0xa9 0x1 0xffde 3
+phy raw c45 0xa9 0x1 0xd130 0x50
+phy raw c45 0xa9 0x1 0xd131 0xa0a
+phy raw c45 0xa9 0x1 0xd134 0x1
+
+linkscan on
\ No newline at end of file
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
index 94560fb7e86c..bf2248fbe443 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/Quanta-IX8C-56X/td3-ix8c-48x25G+8x100G.config.bcm
@@ -2,7 +2,6 @@ sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 bcm_tunnel_term_compatible_mode=1
 core_clock_frequency=1525
 dpp_clock_ratio=2:3
-parity_enable=0
 mem_cache_enable=0
 l2_mem_entries=40960
 l3_mem_entries=40960
@@ -91,8 +90,8 @@ portmap_123=121:100
 portmap_127=125:100
 
 # datapath port -- MerlinCore
-portmap_66=129:10:m
-portmap_130=128:10:m
+#portmap_66=129:10:m
+#portmap_130=128:10:m
 
 # loopback port
 portmap_65=130:10
@@ -479,3 +478,85 @@ phy_chain_rx_polarity_flip_physical{130.0}=0x0
 phy_chain_rx_polarity_flip_physical{131.0}=0x0
 phy_chain_rx_polarity_flip_physical{132.0}=0x0
 
+
+serdes_preemphasis_1=0x35503
+serdes_preemphasis_2=0x35503
+serdes_preemphasis_3=0x35503
+serdes_preemphasis_4=0x35503
+serdes_preemphasis_5=0x35503
+serdes_preemphasis_6=0x35503
+serdes_preemphasis_7=0x35503
+serdes_preemphasis_8=0x35503
+serdes_preemphasis_13=0x35503
+serdes_preemphasis_14=0x35503
+serdes_preemphasis_15=0x35503
+serdes_preemphasis_16=0x35503
+serdes_preemphasis_21=0x35503
+serdes_preemphasis_22=0x35503
+serdes_preemphasis_23=0x35503
+serdes_preemphasis_24=0x35503
+serdes_preemphasis_29=0x35503
+serdes_preemphasis_30=0x35503
+serdes_preemphasis_31=0x35503
+serdes_preemphasis_32=0x35503
+serdes_preemphasis_33=0x35503
+serdes_preemphasis_34=0x35503
+serdes_preemphasis_35=0x35503
+serdes_preemphasis_36=0x35503
+serdes_preemphasis_41=0x35503
+serdes_preemphasis_42=0x35503
+serdes_preemphasis_43=0x35503
+serdes_preemphasis_44=0x35503
+serdes_preemphasis_49=0x35503
+serdes_preemphasis_50=0x35503
+serdes_preemphasis_51=0x35503
+serdes_preemphasis_52=0x35503
+serdes_preemphasis_57=0x35503
+serdes_preemphasis_58=0x35503
+serdes_preemphasis_59=0x35503
+serdes_preemphasis_60=0x35503
+serdes_preemphasis_61=0x35503
+serdes_preemphasis_62=0x35503
+serdes_preemphasis_63=0x35503
+serdes_preemphasis_64=0x35503
+serdes_preemphasis_lane0_67=0x25905
+serdes_preemphasis_lane1_67=0x25905
+serdes_preemphasis_lane2_67=0x25905
+serdes_preemphasis_lane3_67=0x25905
+serdes_preemphasis_lane0_71=0x25905
+serdes_preemphasis_lane1_71=0x25905
+serdes_preemphasis_lane2_71=0x25905
+serdes_preemphasis_lane3_71=0x25905
+serdes_preemphasis_lane0_79=0x25905
+serdes_preemphasis_lane1_79=0x25905
+serdes_preemphasis_lane2_79=0x25905
+serdes_preemphasis_lane3_79=0x25905
+serdes_preemphasis_87=0x35503
+serdes_preemphasis_88=0x35503
+serdes_preemphasis_89=0x35503
+serdes_preemphasis_90=0x35503
+serdes_preemphasis_95=0x35503
+serdes_preemphasis_96=0x35503
+serdes_preemphasis_97=0x35503
+serdes_preemphasis_98=0x35503
+serdes_preemphasis_lane0_99=0x35503
+serdes_preemphasis_lane1_99=0x35503
+serdes_preemphasis_lane2_99=0x35503
+serdes_preemphasis_lane3_99=0x55905
+serdes_preemphasis_lane0_107=0x25905
+serdes_preemphasis_lane1_107=0x25905
+serdes_preemphasis_lane2_107=0x25905
+serdes_preemphasis_lane3_107=0x25905
+serdes_preemphasis_lane0_115=0x25905
+serdes_preemphasis_lane1_115=0x25905
+serdes_preemphasis_lane2_115=0x25905
+serdes_preemphasis_lane3_115=0x25905
+serdes_preemphasis_lane0_123=0x25905
+serdes_preemphasis_lane1_123=0x25905
+serdes_preemphasis_lane2_123=0x25905
+serdes_preemphasis_lane3_123=0x25905
+serdes_preemphasis_lane0_127=0x25905
+serdes_preemphasis_lane1_127=0x25905
+serdes_preemphasis_lane2_127=0x25905
+serdes_preemphasis_lane3_127=0x25905
+
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix8c_bwde-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4b23c95ce9d4394beec28e3b3acbddc92491df78
GIT binary patch
literal 388
zcmeycHQp`E&DYJv?ZcMl4Gc<?+!&Q-x-qLPaAQ*Dc8GEcc8qqK?Z&QJ{(y1bCy7Z6
zj2S^u7dd_06dl~$#GDu}M7aq%+>)HMsV!qm46DtvO)Pq0H?}ai`k6#7cbmlEk|89i
zBg3G{aDhcdq`~LGBnG#PNl+0NH<1SC2UCC|W|CXnAgY*D65V(j0%baZI(dU90%^C5
z-e6{<Neqq|p+U^Xvo~p>>F{v_>0kt^aLEu2W(2B`1ghYZDRe4y^mNj6aLZU2jL$qK
zpqpSinYDXvvZ!rx33O}FWW5mNHhmL=a+n+Aw8rO*N{5md6d9Anm7SBBm79|fC5Wi7
zBx<X;BsM1=N;XhoNwHUPNoh_wl<1(ulvJ<el+>JbFok)8&7KKvGu;-st#<pc_kdf0
VB?Ci@1p`AK5H|qvCLq27!~h7CdP)EQ

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix8c_bwde-r0/led_proc_init.soc
index 0861486660c3..49f097daca34 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/led_proc_init.soc
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/led_proc_init.soc
@@ -1,6 +1,4 @@
 sleep 10
-led stop
-sleep 3
+m0 Load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
+led auto on
 led start
-sleep 3
-led auto on
\ No newline at end of file
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/eeprom.py
index fa34110c04ea..3752a919cba4 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/eeprom.py
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/eeprom.py
@@ -16,5 +16,5 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     _TLV_INFO_MAX_LEN = 256
 
     def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/18-0054/eeprom"
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/sfputil.py
index 3067919795d5..aed53ca0c083 100644
--- a/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/sfputil.py
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/plugins/sfputil.py
@@ -23,62 +23,62 @@ class SfpUtil(SfpUtilBase):
 
     _port_to_eeprom_mapping = {}
     _port_to_i2c_mapping = {
-        1: 32,
-        2: 33,
-        3: 34,
-        4: 35,
-        5: 36,
-        6: 37,
-        7: 38,
-        8: 39,
-        9: 40,
-        10: 41,
-        11: 42,
-        12: 43,
-        13: 44,
-        14: 45,
-        15: 46,
-        16: 47,
-        17: 48,
-        18: 49,
-        19: 50,
-        20: 51,
-        21: 52,
-        22: 53,
-        23: 54,
-        24: 55,
-        25: 56,
-        26: 57,
-        27: 58,
-        28: 59,
-        29: 60,
-        30: 61,
-        31: 62,
-        32: 63,
-        33: 64,
-        34: 65,
-        35: 66,
-        36: 67,
-        37: 68,
-        38: 69,
-        39: 70,
-        40: 71,
-        41: 72,
-        42: 73,
-        43: 74,
-        44: 75,
-        45: 76,
-        46: 77,
-        47: 78,
-        48: 79,
-        49: 80,  # QSFP49
-        50: 81,  # QSFP50
-        51: 82,  # QSFP51
-        52: 83,  # QSFP52
-        53: 84,  # QSFP53
-        54: 85,  # QSFP54
-        55: 86,  # QSFP55
-        56: 87,  # QSFP56
+         1 : 13,
+         2 : 14,
+         3 : 15,
+         4 : 16,
+         5 : 17,
+         6 : 18,
+         7 : 19,
+         8 : 20,
+         9 : 21,
+        10 : 22,
+        11 : 23,
+        12 : 24,
+        13 : 25,
+        14 : 26,
+        15 : 27,
+        16 : 28,
+        17 : 29,
+        18 : 30,
+        19 : 31,
+        20 : 32,
+        21 : 33,
+        22 : 34,
+        23 : 35,
+        24 : 36,
+        25 : 37,
+        26 : 38,
+        27 : 39,
+        28 : 40,
+        29 : 41,
+        30 : 42,
+        31 : 43,
+        32 : 44,
+        33 : 45,
+        34 : 46,
+        35 : 47,
+        36 : 48,
+        37 : 49,
+        38 : 50,
+        39 : 51,
+        40 : 52,
+        41 : 53,
+        42 : 54,
+        43 : 55,
+        44 : 56,
+        45 : 57,
+        46 : 58,
+        47 : 59,
+        48 : 60,
+        49 : 61,#QSFP49
+        50 : 62,#QSFP50
+        51 : 63,#QSFP51
+        52 : 64,#QSFP52
+        53 : 65,#QSFP53
+        54 : 66,#QSFP54
+        55 : 67,#QSFP55
+        56 : 68,#QSFP56
     }
 
     @property
diff --git a/device/quanta/x86_64-quanta_ix8c_bwde-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix8c_bwde-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..44bad6494229
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix8c_bwde-r0/pmon_daemon_control.json
@@ -0,0 +1,4 @@
+{
+    "skip_ledd": true
+}
+
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers.json.j2 b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers.json.j2
new file mode 100644
index 000000000000..1083a6210fc9
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t0.j2 b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..9a25d6fe9fd3
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t0.j2
@@ -0,0 +1,57 @@
+
+{%- set default_cable = '40m' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "egress_lossy_pool": {
+            "size": "67108864",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "0",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "ingress_lossless_pool": {
+            "mode": "dynamic",
+            "size": "59001152",
+            "xoff": "7428992",
+            "type": "ingress"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"67108864"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+    "BUFFER_PG": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    },
+
+    "BUFFER_QUEUE": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|0-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t1.j2 b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..9a25d6fe9fd3
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/buffers_defaults_t1.j2
@@ -0,0 +1,57 @@
+
+{%- set default_cable = '40m' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "egress_lossy_pool": {
+            "size": "67108864",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "0",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "ingress_lossless_pool": {
+            "mode": "dynamic",
+            "size": "59001152",
+            "xoff": "7428992",
+            "type": "ingress"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"67108864"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+    "BUFFER_PG": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    },
+
+    "BUFFER_QUEUE": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|0-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/pg_profile_lookup.ini b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..a5f3286beef8
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/pg_profile_lookup.ini
@@ -0,0 +1,23 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   1270     0   190500  -2        2540
+  25000  5m   1270     0   190500  -2        2540
+  40000  5m   1270     0   190500  -2        2540
+  50000  5m   1270     0   190500  -2        2540
+ 100000  5m   1270     0   190500  -2        2540
+ 200000  5m   1270     0   190500  -2        2540
+ 400000  5m   1270     0   190500  -2        2540
+  10000  40m  1270     0   190500  -2        2540
+  25000  40m  1270     0   190500  -2        2540
+  40000  40m  1270     0   190500  -2        2540
+  50000  40m  1270     0   190500  -2        2540
+ 100000  40m  1270     0   190500  -2        2540
+ 200000  40m  1270     0   190500  -2        2540
+ 400000  40m  1270     0   190500  -2        2540
+  10000  300m 1270     0   190500  -2        2540
+  25000  300m 1270     0   190500  -2        2540
+  40000  300m 1270     0   190500  -2        2540
+  50000  300m 1270     0   190500  -2        2540
+ 100000  300m 1270     0   190500  -2        2540
+ 200000  300m 1270     0   190500  -2        2540
+ 400000  300m 1270     0   190500  -2        2540
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/platform-def.json b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/platform-def.json
new file mode 100644
index 000000000000..4885a3e17207
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/platform-def.json
@@ -0,0 +1,43 @@
+{
+    "fec-mode": {
+        "Ethernet0-255": {
+            "1": {
+                 "10000":  [ "none", "fc" ],
+                 "25000":  [ "none", "fc", "rs" ],
+                 "50000":  [ "none", "rs" ]
+            },
+            "2": [ "none", "rs" ], 
+            "4": {
+                 "40000":  [ "none", "fc" ],
+                 "100000": [ "none", "rs" ],
+                 "200000": [ "none", "rs" ]
+            },
+            "8": [ "rs" ]
+        }
+    },
+    "default-fec-mode": {
+        "Ethernet0-255": {
+            "1": {
+                 "10000": "none",
+                 "25000": "none",
+                 "50000": "none"
+            },
+            "2": {
+                 "20000": "none",
+                 "50000": "none",
+                 "100000": "rs"
+            },
+            "4": {
+                 "40000":  "none",
+                 "100000": "none",
+                 "200000": "none"
+            },
+            "8": "rs"
+        }
+    },
+    "native-port-supported-speeds": {
+        "Ethernet0-255": {
+        }
+    }
+}
+
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/port_config.ini b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/port_config.ini
index 8f770329437f..831083b3ace1 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/port_config.ini
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/port_config.ini
@@ -1,33 +1,33 @@
-# name          lanes                             alias              index
-Ethernet0       33,34,35,36,37,38,39,40           fourhundredGigE1   0
-Ethernet4       25,26,27,28,29,30,31,32           fourhundredGigE2   1
-Ethernet8       49,50,51,52,53,54,55,56           fourhundredGigE3   2
-Ethernet12      57,58,59,60,61,62,63,64           fourhundredGigE4   3
-Ethernet16      65,66,67,68,69,70,71,72           fourhundredGigE5   4
-Ethernet20      73,74,75,76,77,78,79,80           fourhundredGigE6   5
-Ethernet24      81,82,83,84,85,86,87,88           fourhundredGigE7   6
-Ethernet28      89,90,91,92,93,94,95,96           fourhundredGigE8   7
-Ethernet32      17,18,19,20,21,22,23,24           fourhundredGigE9   8
-Ethernet36      97,98,99,100,101,102,103,104      fourhundredGigE10  9
-Ethernet40      9,10,11,12,13,14,15,16            fourhundredGigE11  10
-Ethernet44      41,42,43,44,45,46,47,48           fourhundredGigE12  11
-Ethernet48      113,114,115,116,117,118,119,120   fourhundredGigE13  12
-Ethernet52      105,106,107,108,109,110,111,112   fourhundredGigE14  13
-Ethernet56      121,122,123,124,125,126,127,128   fourhundredGigE15  14
-Ethernet60      1,2,3,4,5,6,7,8                   fourhundredGigE16  15
-Ethernet64      137,138,139,140,141,142,143,144   fourhundredGigE17  16
-Ethernet68      129,130,131,132,133,134,135,136   fourhundredGigE18  17
-Ethernet72      241,242,243,244,245,246,247,248   fourhundredGigE19  18
-Ethernet76      249,250,251,252,253,254,255,256   fourhundredGigE20  19
-Ethernet80      225,226,227,228,229,230,231,232   fourhundredGigE21  20
-Ethernet84      145,146,147,148,149,150,151,152   fourhundredGigE22  21
-Ethernet88      153,154,155,156,157,158,159,160   fourhundredGigE23  22
-Ethernet92      233,234,235,236,237,238,239,240   fourhundredGigE24  23
-Ethernet96      161,162,163,164,165,166,167,168   fourhundredGigE25  24
-Ethernet100     169,170,171,172,173,174,175,176   fourhundredGigE26  25
-Ethernet104     177,178,179,180,181,182,183,184   fourhundredGigE27  26
-Ethernet108     185,186,187,188,189,190,191,192   fourhundredGigE28  27
-Ethernet112     193,194,195,196,197,198,199,200   fourhundredGigE29  28
-Ethernet116     201,202,203,204,205,206,207,208   fourhundredGigE30  29
-Ethernet120     209,210,211,212,213,214,215,216   fourhundredGigE31  30
-Ethernet124     217,218,219,220,221,222,223,224   fourhundredGigE32  31
+# name          lanes                             alias              index  speed    fec
+Ethernet0       33,34,35,36,37,38,39,40           fourhundredGigE1   1      400000    rs
+Ethernet8       25,26,27,28,29,30,31,32           fourhundredGigE2   2      400000    rs
+Ethernet16      49,50,51,52,53,54,55,56           fourhundredGigE3   3      400000    rs
+Ethernet24      57,58,59,60,61,62,63,64           fourhundredGigE4   4      400000    rs
+Ethernet32      65,66,67,68,69,70,71,72           fourhundredGigE5   5      400000    rs
+Ethernet40      73,74,75,76,77,78,79,80           fourhundredGigE6   6      400000    rs
+Ethernet48      81,82,83,84,85,86,87,88           fourhundredGigE7   7      400000    rs
+Ethernet56      89,90,91,92,93,94,95,96           fourhundredGigE8   8      400000    rs
+Ethernet64      17,18,19,20,21,22,23,24           fourhundredGigE9   9      400000    rs
+Ethernet72      97,98,99,100,101,102,103,104      fourhundredGigE10  10     400000    rs
+Ethernet80      9,10,11,12,13,14,15,16            fourhundredGigE11  11     400000    rs
+Ethernet88      41,42,43,44,45,46,47,48           fourhundredGigE12  12     400000    rs
+Ethernet96      113,114,115,116,117,118,119,120   fourhundredGigE13  13     400000    rs
+Ethernet104     105,106,107,108,109,110,111,112   fourhundredGigE14  14     400000    rs
+Ethernet112     121,122,123,124,125,126,127,128   fourhundredGigE15  15     400000    rs
+Ethernet120     1,2,3,4,5,6,7,8                   fourhundredGigE16  16     400000    rs
+Ethernet128     137,138,139,140,141,142,143,144   fourhundredGigE17  17     400000    rs
+Ethernet136     129,130,131,132,133,134,135,136   fourhundredGigE18  18     400000    rs
+Ethernet144     241,242,243,244,245,246,247,248   fourhundredGigE19  19     400000    rs
+Ethernet152     249,250,251,252,253,254,255,256   fourhundredGigE20  20     400000    rs
+Ethernet160     225,226,227,228,229,230,231,232   fourhundredGigE21  21     400000    rs
+Ethernet168     145,146,147,148,149,150,151,152   fourhundredGigE22  22     400000    rs
+Ethernet176     153,154,155,156,157,158,159,160   fourhundredGigE23  23     400000    rs
+Ethernet184     233,234,235,236,237,238,239,240   fourhundredGigE24  24     400000    rs
+Ethernet192     161,162,163,164,165,166,167,168   fourhundredGigE25  25     400000    rs
+Ethernet200     169,170,171,172,173,174,175,176   fourhundredGigE26  26     400000    rs
+Ethernet208     177,178,179,180,181,182,183,184   fourhundredGigE27  27     400000    rs
+Ethernet216     185,186,187,188,189,190,191,192   fourhundredGigE28  28     400000    rs
+Ethernet224     193,194,195,196,197,198,199,200   fourhundredGigE29  29     400000    rs
+Ethernet232     201,202,203,204,205,206,207,208   fourhundredGigE30  30     400000    rs
+Ethernet240     209,210,211,212,213,214,215,216   fourhundredGigE31  31     400000    rs
+Ethernet248     217,218,219,220,221,222,223,224   fourhundredGigE32  32     400000    rs
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/qos.json.j2 b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/qos.json.j2
new file mode 100644
index 000000000000..5f957d503971
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/qos.json.j2
@@ -0,0 +1,230 @@
+{%- set PORT_ALL = [] %}
+{%- for port in PORT %}
+    {%- if PORT_ALL.append(port) %}{% endif %}
+{%- endfor %}
+{%- if PORT_ALL | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_all = [] %}
+{%- for port in PORT_ALL %}
+    {%- if port_names_list_all.append(port) %}{% endif %}
+{%- endfor %}
+{%- set port_names_all = port_names_list_all | join(',') -%}
+
+
+{%- set PORT_ACTIVE = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
+
+{%- set port_names_list_active = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active = port_names_list_active | join(',') -%}
+
+
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+
+
+{
+{% if generate_tc_to_pg_map is defined %}
+    {{- generate_tc_to_pg_map() }}
+{% else %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "DEFAULT": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+{% endif %}
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "DEFAULT": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "DEFAULT": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "DEFAULT": {
+            "0" : "0",
+            "1" : "0",
+            "2" : "0",
+            "3" : "0",
+            "4" : "0",
+            "5" : "0",
+            "6" : "0",
+            "7" : "0",
+            "8" : "0",
+            "9" : "0",
+            "10": "0",
+            "11": "0",
+            "12": "0",
+            "13": "0",
+            "14": "0",
+            "15": "0",
+            "16": "0",
+            "17": "0",
+            "18": "0",
+            "19": "0",
+            "20": "0",
+            "21": "0",
+            "22": "0",
+            "23": "0",
+            "24": "0",
+            "25": "0",
+            "26": "0",
+            "27": "0",
+            "28": "0",
+            "29": "0",
+            "30": "0",
+            "31": "0",
+            "32": "0",
+            "33": "0",
+            "34": "0",
+            "35": "0",
+            "36": "0",
+            "37": "0",
+            "38": "0",
+            "39": "0",
+            "40": "0",
+            "41": "0",
+            "42": "0",
+            "43": "0",
+            "44": "0",
+            "45": "0",
+            "46": "0",
+            "47": "0",
+            "48": "0",
+            "49": "0",
+            "50": "0",
+            "51": "0",
+            "52": "0",
+            "53": "0",
+            "54": "0",
+            "55": "0",
+            "56": "0",
+            "57": "0",
+            "58": "0",
+            "59": "0",
+            "60": "0",
+            "61": "0",
+            "62": "0",
+            "63": "0"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "2"
+        },
+        "scheduler.2": {
+            "type"  : "DWRR",
+            "weight": "3"
+        },
+        "scheduler.3": {
+            "type"  : "DWRR",
+            "weight": "4"
+        },
+        "scheduler.4": {
+            "type"  : "DWRR",
+            "weight": "5"
+        },
+        "scheduler.5": {
+            "type"  : "DWRR",
+            "weight": "10"
+        },
+        "scheduler.6": {
+            "type"  : "DWRR",
+            "weight": "25"
+        },
+        "scheduler.7": {
+            "type"  : "DWRR",
+            "weight": "50"
+        }
+    },
+    "PORT_QOS_MAP": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|DEFAULT]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
+            "pfc_enable"      : "3,4",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|DEFAULT]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    },
+    "QUEUE": {
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|2": {
+            "scheduler": "[SCHEDULER|scheduler.2]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|3": {
+            "scheduler": "[SCHEDULER|scheduler.3]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|4": {
+            "scheduler": "[SCHEDULER|scheduler.4]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|5": {
+            "scheduler": "[SCHEDULER|scheduler.5]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|6": {
+            "scheduler": "[SCHEDULER|scheduler.6]"
+        },
+{% endfor %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|7": {
+            "scheduler": "[SCHEDULER|scheduler.7]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
index 704183e10924..93937398e832 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
@@ -1,23 +1,27 @@
-ccm_dma_enable=0
-ccmdma_intr_enable=0
-ctr_evict_enable=0
-mem_cache_enable=0
-parity_correction=0
-parity_enable=0
-phy_enable=0
 phy_null=1
 pll_bypass=1
 
-init_all_modules=0
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325
-
-load_firmware=0x2
 port_flex_enable=1
 
+l2xmsg_mode.0=1
+l2_mem_entries.0=8192
+l3_alpm_enable.0=2
+l3_mem_entries.0=16384
+ipv6_lpm_128b_enable=1
+lpm_ipv6_128b_reserved=0
+l3_alpm_ipv6_128b_bkt_rsvd=0
+num_ipv6_lpm_128b_entries=768
+mmu_port_num_mc_queue.0=1
+module_64ports.0=1
+multicast_l2_range.0=511
+oversubscribe_mode=1
+led_fw_path="/usr/share/sonic/platform/"
+
 # portmap settings
-pbmp_xport_xe=0x111101111411110111101111011114111102222
+pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe
 
 portmap_1=1:400
 portmap_5=9:400
@@ -47,17 +51,18 @@ portmap_108=177:400
 portmap_112=185:400
 
 portmap_120=193:400
-portmap_124=201:400
-portmap_128=209:400
-portmap_132=217:400
+portmap_121=201:400
+portmap_122=209:400
+portmap_130=217:400
+
 portmap_140=225:400
 portmap_144=233:400
 portmap_148=241:400
 portmap_152=249:400
 
 # datapath port
-portmap_38=257:10
-portmap_118=258:10
+#portmap_38=257:10
+#portmap_118=258:10
 
 # loopback port
 portmap_19=260:10
@@ -71,41 +76,165 @@ portmap_159=266:10
 
 # port order remap
 dport_map_port_20=1
-dport_map_port_13=2
-dport_map_port_28=3
-dport_map_port_32=4
-dport_map_port_40=5
-dport_map_port_44=6
-dport_map_port_48=7
-dport_map_port_52=8
-dport_map_port_9=9
-dport_map_port_60=10
-dport_map_port_5=11
-dport_map_port_24=12
-dport_map_port_68=13
-dport_map_port_64=14
-dport_map_port_72=15
-dport_map_port_1=16
-
-dport_map_port_84=17
-dport_map_port_80=18
-dport_map_port_148=19
-dport_map_port_152=20
-dport_map_port_140=21
-dport_map_port_88=22
-dport_map_port_92=23
-dport_map_port_144=24
-dport_map_port_100=25
-dport_map_port_104=26
-dport_map_port_108=27
-dport_map_port_112=28
-dport_map_port_120=29
-dport_map_port_124=30
-dport_map_port_128=31
-dport_map_port_132=32
-
-dport_map_port_38=33
-dport_map_port_118=34
+dport_map_port_21=2
+dport_map_port_22=3
+dport_map_port_23=4
+
+dport_map_port_13=5
+dport_map_port_14=6
+dport_map_port_15=7
+dport_map_port_16=8
+
+dport_map_port_28=9
+dport_map_port_29=10
+dport_map_port_30=11
+dport_map_port_31=12
+
+dport_map_port_32=13
+dport_map_port_33=14
+dport_map_port_34=15
+dport_map_port_35=16
+
+dport_map_port_40=17
+dport_map_port_41=18
+dport_map_port_42=19
+dport_map_port_43=20
+
+dport_map_port_44=21
+dport_map_port_45=22
+dport_map_port_46=23
+dport_map_port_47=24
+
+dport_map_port_48=25
+dport_map_port_49=26
+dport_map_port_50=27
+dport_map_port_51=28
+
+dport_map_port_52=29
+dport_map_port_53=30
+dport_map_port_54=31
+dport_map_port_55=32
+
+dport_map_port_9=33
+dport_map_port_10=34
+dport_map_port_11=35
+dport_map_port_12=36
+
+dport_map_port_60=37
+dport_map_port_61=38
+dport_map_port_62=39
+dport_map_port_63=40
+
+dport_map_port_5=41
+dport_map_port_6=42
+dport_map_port_7=43
+dport_map_port_8=44
+
+dport_map_port_24=45
+dport_map_port_25=46
+dport_map_port_26=47
+dport_map_port_27=48
+
+dport_map_port_68=49
+dport_map_port_69=50
+dport_map_port_70=51
+dport_map_port_71=52
+
+dport_map_port_64=53
+dport_map_port_65=54
+dport_map_port_66=55
+dport_map_port_67=56
+
+dport_map_port_72=57
+dport_map_port_73=58
+dport_map_port_74=59
+dport_map_port_75=60
+
+dport_map_port_1=61
+dport_map_port_2=62
+dport_map_port_3=63
+dport_map_port_4=64
+ 
+dport_map_port_84=65
+dport_map_port_85=66
+dport_map_port_86=67
+dport_map_port_87=68
+
+dport_map_port_80=69
+dport_map_port_81=70
+dport_map_port_82=71
+dport_map_port_83=72
+
+dport_map_port_148=73
+dport_map_port_149=74
+dport_map_port_150=75
+dport_map_port_151=76
+
+dport_map_port_152=77
+dport_map_port_153=78
+dport_map_port_154=79
+dport_map_port_155=80
+
+dport_map_port_140=81
+dport_map_port_141=82
+dport_map_port_142=83
+dport_map_port_143=84
+
+
+dport_map_port_88=85
+dport_map_port_89=86
+dport_map_port_90=87
+dport_map_port_91=88
+
+dport_map_port_92=89
+dport_map_port_93=90
+dport_map_port_94=91
+dport_map_port_95=92
+
+dport_map_port_144=93
+dport_map_port_145=94
+dport_map_port_146=95
+dport_map_port_147=96
+
+dport_map_port_100=97
+dport_map_port_101=98
+dport_map_port_102=99
+dport_map_port_103=100
+
+dport_map_port_104=101
+dport_map_port_105=102
+dport_map_port_106=103
+dport_map_port_107=104
+
+dport_map_port_108=105
+dport_map_port_109=106
+dport_map_port_110=107
+dport_map_port_111=108
+
+dport_map_port_112=109
+dport_map_port_113=110
+dport_map_port_114=111
+dport_map_port_115=112
+
+dport_map_port_120=113
+dport_map_port_121=114
+dport_map_port_122=115
+dport_map_port_123=116
+
+dport_map_port_124=117
+dport_map_port_125=118
+dport_map_port_126=119
+dport_map_port_127=120
+
+dport_map_port_128=121
+dport_map_port_129=122
+dport_map_port_130=123
+dport_map_port_131=124
+
+dport_map_port_132=125
+dport_map_port_133=126
+dport_map_port_134=127
+dport_map_port_135=128
 
 ### lane swap and polarity follow front port order ###
 phy_chain_tx_lane_map_physical{33.0}=0x75206431
@@ -269,73 +398,3 @@ phy_chain_rx_lane_map_physical{217.0}=0x67541203
 serdes_core_rx_polarity_flip_physical{217}=0x33
 
 
-port_fec_20=9
-port_fec_13=9
-port_fec_28=9
-port_fec_32=9
-port_fec_40=9
-port_fec_44=9
-port_fec_48=9
-port_fec_52=9
-port_fec_9=9
-port_fec_60=9
-port_fec_5=9
-port_fec_24=9
-port_fec_68=9
-port_fec_64=9
-port_fec_72=9
-port_fec_1=9
-
-port_fec_84=9
-port_fec_80=9
-port_fec_148=9
-port_fec_152=9
-port_fec_140=9
-port_fec_88=9
-port_fec_92=9
-port_fec_144=9
-port_fec_100=9
-port_fec_104=9
-port_fec_108=9
-port_fec_112=9
-port_fec_120=9
-port_fec_124=9
-port_fec_128=9
-port_fec_132=9
-
-
-port_init_cl72_20=1
-port_init_cl72_13=1
-port_init_cl72_28=1
-port_init_cl72_32=1
-port_init_cl72_40=1
-port_init_cl72_44=1
-port_init_cl72_48=1
-port_init_cl72_52=1
-port_init_cl72_9=1
-port_init_cl72_60=1
-port_init_cl72_5=1
-port_init_cl72_24=1
-port_init_cl72_68=1
-port_init_cl72_64=1
-port_init_cl72_72=1
-port_init_cl72_1=1
-
-port_init_cl72_84=1
-port_init_cl72_80=1
-port_init_cl72_148=1
-port_init_cl72_152=1
-port_init_cl72_140=1
-port_init_cl72_88=1
-port_init_cl72_92=1
-port_init_cl72_144=1
-port_init_cl72_100=1
-port_init_cl72_104=1
-port_init_cl72_108=1
-port_init_cl72_112=1
-port_init_cl72_120=1
-port_init_cl72_124=1
-port_init_cl72_128=1
-port_init_cl72_132=1
-
-
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/custom_led.bin b/device/quanta/x86_64-quanta_ix9_bwde-r0/custom_led.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1f12caa4fa08118ecc4d4be3e4ae5ffd5340a16c
GIT binary patch
literal 204
zcmeycHQde5&DHI}76#RoZj9>8YD~)94pC0Qj?qpt-1wE}xamBQ>^Q|~<-q5}c)`()
z%R$7M#W>jY%SGpmR}#r?3_1)K*p-DF95b>dlH6v2X{kmKZx)!8Y67#tq*ODQ-K=2R
zpnRKQt`pk@ri@@o1*0IzNp3!Fr=K$_9ZFzOW=^zMc1~nbZcaRu=%C1$RIlim)SPrE
osX>u3dB37#a&z*b<O51fDgTw6Qkqj__Dpb_>9)x2!`=gK0AzJVhX4Qo

literal 0
HcmV?d00001

diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/led_proc_init.soc b/device/quanta/x86_64-quanta_ix9_bwde-r0/led_proc_init.soc
index adff95218e4f..b6c5d5073931 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/led_proc_init.soc
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/led_proc_init.soc
@@ -1,2 +1,6 @@
 sleep 10
+m0 Load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
 led auto on
+led start
+
+rcload /usr/share/sonic/platform/preemphasis-32x400G.soc
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/eeprom.py b/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/eeprom.py
index fa34110c04ea..3752a919cba4 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/eeprom.py
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/eeprom.py
@@ -16,5 +16,5 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     _TLV_INFO_MAX_LEN = 256
 
     def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/18-0054/eeprom"
+        self.eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/sfputil.py b/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/sfputil.py
index 832dac4e0570..6735a7579ad5 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/sfputil.py
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/plugins/sfputil.py
@@ -8,52 +8,52 @@
 class SfpUtil(SfpUtilBase):
     """Platform specific SfpUtill class"""
 
-    _port_start = 0
-    _port_end = 31
+    _port_start = 1
+    _port_end = 32
     ports_in_block = 32
 
     _port_to_eeprom_mapping = {}
     port_to_i2c_mapping = {
-        1: 32,
-        2: 33,
-        3: 34,
-        4: 35,
-        5: 36,
-        6: 37,
-        7: 38,
-        8: 39,
-        9: 40,
-        10: 41,
-        11: 42,
-        12: 43,
-        13: 44,
-        14: 45,
-        15: 46,
-        16: 47,
-        17: 48,
-        18: 49,
-        19: 50,
-        20: 51,
-        21: 52,
-        22: 53,
-        23: 54,
-        24: 55,
-        25: 56,
-        26: 57,
-        27: 58,
-        28: 59,
-        29: 60,
-        30: 61,
-        31: 62,
-        32: 63,
+         1 : 13,
+         2 : 14,
+         3 : 15,
+         4 : 16,
+         5 : 17,
+         6 : 18,
+         7 : 19,
+         8 : 20,
+         9 : 21,
+        10 : 22,
+        11 : 23,
+        12 : 24,
+        13 : 25,
+        14 : 26,
+        15 : 27,
+        16 : 28,
+        17 : 29,
+        18 : 30,
+        19 : 31,
+        20 : 32,
+        21 : 33,
+        22 : 34,
+        23 : 35,
+        24 : 36,
+        25 : 37,
+        26 : 38,
+        27 : 39,
+        28 : 40,
+        29 : 41,
+        30 : 42,
+        31 : 43,
+        32 : 44,
     }
 
-    _qsfp_ports = list(range(0, ports_in_block + 1))
+    _qsfp_ports = range(1, ports_in_block + 1)
 
     def __init__(self):
         eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
-        for x in range(0, self._port_end + 1):
-            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x+1])
+        for x in range(self.port_start, self.port_end + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
             self._port_to_eeprom_mapping[x] = port_eeprom_path
         SfpUtilBase.__init__(self)
 
@@ -63,7 +63,7 @@ def reset(self, port_num):
             return False
 
         try:
-            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num+1)+"/reset", "r+")
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num)+"/reset", "r+")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
             return False
@@ -77,7 +77,7 @@ def reset(self, port_num):
 
         # Flip the value back write back to the register to take port out of reset
         try:
-            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num+1)+"/reset", "r+")
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num)+"/reset", "r+")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
             return False
@@ -94,7 +94,7 @@ def set_low_power_mode(self, port_num, lpmode):
             return False
 
         try:
-            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num+1)+"/lpmode", "r+")
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num)+"/lpmode", "r+")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
             return False
@@ -118,7 +118,7 @@ def get_low_power_mode(self, port_num):
             return False
 
         try:
-            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num+1)+"/lpmode")
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num)+"/lpmode")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
             return False
@@ -136,7 +136,7 @@ def get_presence(self, port_num):
             return False
 
         try:
-            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num+1)+"/module_present")
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(port_num)+"/module_present")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
             return False
@@ -155,9 +155,13 @@ def port_start(self):
     def port_end(self):
         return self._port_end
 
+    @property
+    def osfp_ports(self):
+        return range(self.port_start, self.ports_in_block + 1)
+
     @property
     def qsfp_ports(self):
-        return list(range(0, self.ports_in_block + 1))
+        return {}
 
     @property
     def port_to_eeprom_mapping(self):
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/pmon_daemon_control.json b/device/quanta/x86_64-quanta_ix9_bwde-r0/pmon_daemon_control.json
new file mode 100644
index 000000000000..44bad6494229
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/pmon_daemon_control.json
@@ -0,0 +1,4 @@
+{
+    "skip_ledd": true
+}
+
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/preemphasis-32x400G.soc b/device/quanta/x86_64-quanta_ix9_bwde-r0/preemphasis-32x400G.soc
new file mode 100644
index 000000000000..f324ad96708b
--- /dev/null
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/preemphasis-32x400G.soc
@@ -0,0 +1,1057 @@
+# Pre-emphasis
+
+phy raw c45 0xa9 0x1 0xffde 0
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 1
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 2
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 3
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 4
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 5
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 6
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+phy raw c45 0xa9 0x1 0xffde 7
+phy raw c45 0xa9 0x1 0xd134 0x1f0
+phy raw c45 0xa9 0x1 0xd135 0x98
+phy raw c45 0xa9 0x1 0xd136 0x0
+
+phy raw c45 0xa1 0x1 0xffde 0
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 1
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 2
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 3
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 4
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 5
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 6
+phy raw c45 0xa1 0x1 0xd134 0x1f0
+phy raw c45 0xa1 0x1 0xd135 0x98
+phy raw c45 0xa1 0x1 0xd136 0x0
+phy raw c45 0xa1 0x1 0xffde 7
+phy raw c45 0xa1 0x1 0xd134 0x1ee
+phy raw c45 0xa1 0x1 0xd135 0x90
+phy raw c45 0xa1 0x1 0xd136 0x1fc
+
+phy raw c45 0xc1 0x1 0xffde 0
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 1
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 2
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 3
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 4
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 5
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 6
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+phy raw c45 0xc1 0x1 0xffde 7
+phy raw c45 0xc1 0x1 0xd134 0x1f0
+phy raw c45 0xc1 0x1 0xd135 0x98
+phy raw c45 0xc1 0x1 0xd136 0x0
+
+phy raw c45 0xc9 0x1 0xffde 0
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 1
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 2
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 3
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 4
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 5
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 6
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+phy raw c45 0xc9 0x1 0xffde 7
+phy raw c45 0xc9 0x1 0xd134 0x1f0
+phy raw c45 0xc9 0x1 0xd135 0x98
+phy raw c45 0xc9 0x1 0xd136 0x0
+
+phy raw c45 0xd1 0x1 0xffde 0
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 1
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 2
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 3
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 4
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 5
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 6
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+phy raw c45 0xd1 0x1 0xffde 7
+phy raw c45 0xd1 0x1 0xd134 0x1f0
+phy raw c45 0xd1 0x1 0xd135 0x98
+phy raw c45 0xd1 0x1 0xd136 0x0
+
+phy raw c45 0xe1 0x1 0xffde 0
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 1
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 2
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 3
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 4
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 5
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 6
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+phy raw c45 0xe1 0x1 0xffde 7
+phy raw c45 0xe1 0x1 0xd134 0x1f0
+phy raw c45 0xe1 0x1 0xd135 0x98
+phy raw c45 0xe1 0x1 0xd136 0x0
+
+phy raw c45 0xe9 0x1 0xffde 0
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 1
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 2
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 3
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 4
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 5
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 6
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+phy raw c45 0xe9 0x1 0xffde 7
+phy raw c45 0xe9 0x1 0xd134 0x1f0
+phy raw c45 0xe9 0x1 0xd135 0x98
+phy raw c45 0xe9 0x1 0xd136 0x0
+
+phy raw c45 0xf1 0x1 0xffde 0
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 1
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 2
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 3
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 4
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 5
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 6
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+phy raw c45 0xf1 0x1 0xffde 7
+phy raw c45 0xf1 0x1 0xd134 0x1f0
+phy raw c45 0xf1 0x1 0xd135 0x98
+phy raw c45 0xf1 0x1 0xd136 0x0
+
+phy raw c45 0x91 0x1 0xffde 0
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 1
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 2
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 3
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 4
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 5
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 6
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+phy raw c45 0x91 0x1 0xffde 7
+phy raw c45 0x91 0x1 0xd134 0x1f0
+phy raw c45 0x91 0x1 0xd135 0x98
+phy raw c45 0x91 0x1 0xd136 0x0
+
+phy raw c45 0x181 0x1 0xffde 0
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 1
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 2
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 3
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 4
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 5
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 6
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+phy raw c45 0x181 0x1 0xffde 7
+phy raw c45 0x181 0x1 0xd134 0x1f0
+phy raw c45 0x181 0x1 0xd135 0x98
+phy raw c45 0x181 0x1 0xd136 0x0
+
+phy raw c45 0x89 0x1 0xffde 0
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 1
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 2
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 3
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 4
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 5
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 6
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+phy raw c45 0x89 0x1 0xffde 7
+phy raw c45 0x89 0x1 0xd134 0x1f0
+phy raw c45 0x89 0x1 0xd135 0x98
+phy raw c45 0x89 0x1 0xd136 0x0
+
+phy raw c45 0xb1 0x1 0xffde 0
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 1
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 2
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 3
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 4
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 5
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 6
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+phy raw c45 0xb1 0x1 0xffde 7
+phy raw c45 0xb1 0x1 0xd134 0x1f0
+phy raw c45 0xb1 0x1 0xd135 0x98
+phy raw c45 0xb1 0x1 0xd136 0x0
+
+phy raw c45 0x191 0x1 0xffde 0
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 1
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 2
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 3
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 4
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 5
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 6
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+phy raw c45 0x191 0x1 0xffde 7
+phy raw c45 0x191 0x1 0xd134 0x1f0
+phy raw c45 0x191 0x1 0xd135 0x98
+phy raw c45 0x191 0x1 0xd136 0x0
+
+phy raw c45 0x189 0x1 0xffde 0
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 1
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 2
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 3
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 4
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 5
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 6
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+phy raw c45 0x189 0x1 0xffde 7
+phy raw c45 0x189 0x1 0xd134 0x1f0
+phy raw c45 0x189 0x1 0xd135 0x98
+phy raw c45 0x189 0x1 0xd136 0x0
+
+phy raw c45 0x1a1 0x1 0xffde 0
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 1
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 2
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 3
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 4
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 5
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 6
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+phy raw c45 0x1a1 0x1 0xffde 7
+phy raw c45 0x1a1 0x1 0xd134 0x1f0
+phy raw c45 0x1a1 0x1 0xd135 0x98
+phy raw c45 0x1a1 0x1 0xd136 0x0
+
+phy raw c45 0x81 0x1 0xffde 0
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 1
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 2
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 3
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 4
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 5
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 6
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+phy raw c45 0x81 0x1 0xffde 7
+phy raw c45 0x81 0x1 0xd134 0x1f0
+phy raw c45 0x81 0x1 0xd135 0x98
+phy raw c45 0x81 0x1 0xd136 0x0
+
+phy raw c45 0x1b1 0x1 0xffde 0
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 1
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 2
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 3
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 4
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 5
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 6
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+phy raw c45 0x1b1 0x1 0xffde 7
+phy raw c45 0x1b1 0x1 0xd134 0x1f0
+phy raw c45 0x1b1 0x1 0xd135 0x98
+phy raw c45 0x1b1 0x1 0xd136 0x0
+
+phy raw c45 0x1a9 0x1 0xffde 0
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 1
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 2
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 3
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 4
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 5
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 6
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+phy raw c45 0x1a9 0x1 0xffde 7
+phy raw c45 0x1a9 0x1 0xd134 0x1f0
+phy raw c45 0x1a9 0x1 0xd135 0x98
+phy raw c45 0x1a9 0x1 0xd136 0x0
+
+phy raw c45 0x2c1 0x1 0xffde 0
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 1
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 2
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 3
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 4
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 5
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 6
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+phy raw c45 0x2c1 0x1 0xffde 7
+phy raw c45 0x2c1 0x1 0xd134 0x1f0
+phy raw c45 0x2c1 0x1 0xd135 0x98
+phy raw c45 0x2c1 0x1 0xd136 0x0
+
+phy raw c45 0x2c9 0x1 0xffde 0
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 1
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 2
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 3
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 4
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 5
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 6
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+phy raw c45 0x2c9 0x1 0xffde 7
+phy raw c45 0x2c9 0x1 0xd134 0x1f0
+phy raw c45 0x2c9 0x1 0xd135 0x98
+phy raw c45 0x2c9 0x1 0xd136 0x0
+
+phy raw c45 0x2a9 0x1 0xffde 0
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 1
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 2
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 3
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 4
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 5
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 6
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+phy raw c45 0x2a9 0x1 0xffde 7
+phy raw c45 0x2a9 0x1 0xd134 0x1f0
+phy raw c45 0x2a9 0x1 0xd135 0x98
+phy raw c45 0x2a9 0x1 0xd136 0x0
+
+phy raw c45 0x1c1 0x1 0xffde 0
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 1
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 2
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 3
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 4
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 5
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 6
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+phy raw c45 0x1c1 0x1 0xffde 7
+phy raw c45 0x1c1 0x1 0xd134 0x1f0
+phy raw c45 0x1c1 0x1 0xd135 0x98
+phy raw c45 0x1c1 0x1 0xd136 0x0
+
+phy raw c45 0x1c9 0x1 0xffde 0
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 1
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 2
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 3
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 4
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 5
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 6
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+phy raw c45 0x1c9 0x1 0xffde 7
+phy raw c45 0x1c9 0x1 0xd134 0x1f0
+phy raw c45 0x1c9 0x1 0xd135 0x98
+phy raw c45 0x1c9 0x1 0xd136 0x0
+
+phy raw c45 0x2b1 0x1 0xffde 0
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 1
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 2
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 3
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 4
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 5
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 6
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+phy raw c45 0x2b1 0x1 0xffde 7
+phy raw c45 0x2b1 0x1 0xd134 0x1f0
+phy raw c45 0x2b1 0x1 0xd135 0x98
+phy raw c45 0x2b1 0x1 0xd136 0x0
+
+phy raw c45 0x1d1 0x1 0xffde 0
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 1
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 2
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 3
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 4
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 5
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 6
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+phy raw c45 0x1d1 0x1 0xffde 7
+phy raw c45 0x1d1 0x1 0xd134 0x1f0
+phy raw c45 0x1d1 0x1 0xd135 0x98
+phy raw c45 0x1d1 0x1 0xd136 0x0
+
+phy raw c45 0x1e1 0x1 0xffde 0
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 1
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 2
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 3
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 4
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 5
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 6
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+phy raw c45 0x1e1 0x1 0xffde 7
+phy raw c45 0x1e1 0x1 0xd134 0x1f0
+phy raw c45 0x1e1 0x1 0xd135 0x98
+phy raw c45 0x1e1 0x1 0xd136 0x0
+
+phy raw c45 0x1e9 0x1 0xffde 0
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 1
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 2
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 3
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 4
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 5
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 6
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+phy raw c45 0x1e9 0x1 0xffde 7
+phy raw c45 0x1e9 0x1 0xd134 0x1f0
+phy raw c45 0x1e9 0x1 0xd135 0x98
+phy raw c45 0x1e9 0x1 0xd136 0x0
+
+phy raw c45 0x1f1 0x1 0xffde 0
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 1
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 2
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 3
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 4
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 5
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 6
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+phy raw c45 0x1f1 0x1 0xffde 7
+phy raw c45 0x1f1 0x1 0xd134 0x1f0
+phy raw c45 0x1f1 0x1 0xd135 0x98
+phy raw c45 0x1f1 0x1 0xd136 0x0
+
+phy raw c45 0x281 0x1 0xffde 0
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 1
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 2
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 3
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 4
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 5
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 6
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+phy raw c45 0x281 0x1 0xffde 7
+phy raw c45 0x281 0x1 0xd134 0x1f0
+phy raw c45 0x281 0x1 0xd135 0x98
+phy raw c45 0x281 0x1 0xd136 0x0
+
+phy raw c45 0x289 0x1 0xffde 0
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 1
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 2
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 3
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 4
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 5
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 6
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+phy raw c45 0x289 0x1 0xffde 7
+phy raw c45 0x289 0x1 0xd134 0x1f0
+phy raw c45 0x289 0x1 0xd135 0x98
+phy raw c45 0x289 0x1 0xd136 0x0
+
+phy raw c45 0x291 0x1 0xffde 0
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 1
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 2
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 3
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 4
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 5
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 6
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+phy raw c45 0x291 0x1 0xffde 7
+phy raw c45 0x291 0x1 0xd134 0x1f0
+phy raw c45 0x291 0x1 0xd135 0x98
+phy raw c45 0x291 0x1 0xd136 0x0
+
+phy raw c45 0x2a1 0x1 0xffde 0
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 1
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 2
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 3
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 4
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 5
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 6
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
+phy raw c45 0x2a1 0x1 0xffde 7
+phy raw c45 0x2a1 0x1 0xd134 0x1f0
+phy raw c45 0x2a1 0x1 0xd135 0x98
+phy raw c45 0x2a1 0x1 0xd136 0x0
diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk
index f054f02b4188..1d14d56f70ab 100644
--- a/platform/broadcom/one-image.mk
+++ b/platform/broadcom/one-image.mk
@@ -53,7 +53,9 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
                                $(DELTA_ET6248BRB_PLATFORM_MODULE) \
                                $(QUANTA_IX1B_32X_PLATFORM_MODULE) \
                                $(QUANTA_IX7_32X_PLATFORM_MODULE) \
+                               $(QUANTA_IX7_BWDE_32X_PLATFORM_MODULE) \
                                $(QUANTA_IX8_56X_PLATFORM_MODULE) \
+                               $(QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE) \
                                $(QUANTA_IX8C_56X_PLATFORM_MODULE) \
                                $(QUANTA_IX9_32X_PLATFORM_MODULE) \
                                $(MITAC_LY1200_32X_PLATFORM_MODULE) \
diff --git a/platform/broadcom/platform-modules-quanta.mk b/platform/broadcom/platform-modules-quanta.mk
index 267d3d9e7378..4847af29837e 100644
--- a/platform/broadcom/platform-modules-quanta.mk
+++ b/platform/broadcom/platform-modules-quanta.mk
@@ -2,13 +2,17 @@
 
 QUANTA_IX1B_32X_PLATFORM_MODULE_VERSION = 1.0
 QUANTA_IX7_32X_PLATFORM_MODULE_VERSION = 1.0
+QUANTA_IX7_BWDE_32X_PLATFORM_MODULE_VERSION = 1.0
 QUANTA_IX8_56X_PLATFORM_MODULE_VERSION = 1.0
+QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE_VERSION = 1.0
 QUANTA_IX8C_56X_PLATFORM_MODULE_VERSION = 1.0
 QUANTA_IX9_32X_PLATFORM_MODULE_VERSION = 1.0
 
 export QUANTA_IX1B_32X_PLATFORM_MODULE_VERSION
 export QUANTA_IX7_32X_PLATFORM_MODULE_VERSION
+export QUANTA_IX7_BWDE_32X_PLATFORM_MODULE_VERSION
 export QUANTA_IX8_56X_PLATFORM_MODULE_VERSION
+export QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE_VERSION
 export QUANTA_IX8C_56X_PLATFORM_MODULE_VERSION
 export QUANTA_IX9_32X_PLATFORM_MODULE_VERSION
 
@@ -22,10 +26,18 @@ QUANTA_IX7_32X_PLATFORM_MODULE = sonic-platform-quanta-ix7-32x_$(QUANTA_IX7_32X_
 $(QUANTA_IX7_32X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix7_rglbmc-r0
 $(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX7_32X_PLATFORM_MODULE)))
 
+QUANTA_IX7_BWDE_32X_PLATFORM_MODULE = sonic-platform-quanta-ix7-bwde-32x_$(QUANTA_IX7_BWDE_32X_PLATFORM_MODULE_VERSION)_amd64.deb
+$(QUANTA_IX7_BWDE_32X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix7_bwde-r0
+$(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX7_BWDE_32X_PLATFORM_MODULE)))
+
 QUANTA_IX8_56X_PLATFORM_MODULE = sonic-platform-quanta-ix8-56x_$(QUANTA_IX8_56X_PLATFORM_MODULE_VERSION)_amd64.deb
 $(QUANTA_IX8_56X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix8_rglbmc-r0
 $(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX8_56X_PLATFORM_MODULE)))
 
+QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE = sonic-platform-quanta-ix8a-bwde-56x_$(QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE_VERSION)_amd64.deb
+$(QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix8a_bwde-r0
+$(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX8A_BWDE_56X_PLATFORM_MODULE)))
+
 QUANTA_IX8C_56X_PLATFORM_MODULE = sonic-platform-quanta-ix8c-56x_$(QUANTA_IX8C_56X_PLATFORM_MODULE_VERSION)_amd64.deb
 $(QUANTA_IX8C_56X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix8c_bwde-r0
 $(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX8C_56X_PLATFORM_MODULE)))
diff --git a/platform/broadcom/sonic-platform-modules-quanta/LICENSE b/platform/broadcom/sonic-platform-modules-quanta/LICENSE
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/changelog b/platform/broadcom/sonic-platform-modules-quanta/debian/changelog
index fe1cfa45490b..ff5d9587c4c9 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/debian/changelog
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/changelog
@@ -32,3 +32,17 @@ sonic-quanta-platform-modules (1.0) unstable; urgency=low
   * Initial release
 
  -- Jonathan Tsai <jonathan.tsai@quantatw.com>  Thu, 31 Jan 2019 13:09:01 +0800
+
+sonic-quanta-platform-modules (1.0) unstable; urgency=low
+
+  * Add support for Quanta IX7-BWDE-32X
+  * Initial release
+
+ -- Robert Hong <robert.hong@qct.io> Tue, 2 Mar 2021 11:07:01 +0800
+
+sonic-quanta-platform-modules (1.0) unstable; urgency=low
+
+  * Add support for Quanta IX8A-BWDE-56X
+  * Initial release
+
+ -- Robert Hong <robert.hong@qct.io> Tue, 2 Mar 2021 15:20:01 +0800
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/compat b/platform/broadcom/sonic-platform-modules-quanta/debian/compat
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/control b/platform/broadcom/sonic-platform-modules-quanta/debian/control
index f25b0d8e3c5b..c42a033806ab 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/debian/control
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/control
@@ -13,10 +13,18 @@ Package: sonic-platform-quanta-ix7-32x
 Architecture: amd64
 Description: kernel modules for platform devices such as psu, led, sfp
 
+Package: sonic-platform-quanta-ix7-bwde-32x
+Architecture: amd64
+Description: kernel modules for platform devices such as psu, led, sfp
+
 Package: sonic-platform-quanta-ix8-56x
 Architecture: amd64
 Description: kernel modules for platform devices such as psu, led, sfp
 
+Package: sonic-platform-quanta-ix8a-bwde-56x
+Architecture: amd64
+Description: kernel modules for platform devices such as psu, led, sfp
+
 Package: sonic-platform-quanta-ix8c-56x
 Architecture: amd64
 Description: kernel modules for platform devices such as psu, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/rules b/platform/broadcom/sonic-platform-modules-quanta/debian/rules
index 46b9607135a8..9ddb76355592 100755
--- a/platform/broadcom/sonic-platform-modules-quanta/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/rules
@@ -13,44 +13,54 @@ include /usr/share/dpkg/pkg-info.mk
 
 export INSTALL_MOD_DIR:=extra
 
-PYTHON         ?= python2
 
 PACKAGE_PRE_NAME := sonic-platform-quanta
 KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
-MODULE_DIRS:= ix1b-32x ix7-32x ix8-56x ix8c-56x ix9-32x
+MODULE_DIRS:= ix1b-32x ix7-32x ix7-bwde-32x ix8-56x ix8a-bwde-56x ix8c-56x ix9-32x
 MODULE_DIR := modules
 UTILS_DIR := utils
 SERVICE_DIR := service
 CLASSES_DIR := classes
 CONF_DIR := conf
-
+SYSTEMD_DIR := systemd
 %:
-	dh $@ --with systemd,python2,python3 --buildsystem=pybuild
+	dh $@ --with systemd,python3 --buildsystem=pybuild
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
+	(for mod in $(MODULE_DIRS); do \
+		if [ -f $(MOD_SRC_DIR)/$${mod}/*.whl ]; then \
+		    rm -f $(MOD_SRC_DIR)/$${mod}/*.whl; \
+		fi; \
+	done)
 
 build:
 	#make modules -C $(KERNEL_SRC)/build M=$(MODULE_SRC)
 	(for mod in $(MODULE_DIRS); do \
 		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
-		$(PYTHON) $${mod}/setup.py build; \
+		python3 $${mod}/setup.py build; \
+		cd $(MOD_SRC_DIR)/$${mod}; \
+		if [ -f sonic_platform_setup.py ]; then \
+			python3 sonic_platform_setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
+			echo "Finished makig whl package for $$mod"; \
+		fi; \
+		cd $(MOD_SRC_DIR); \
 	done)
 
 binary: binary-arch binary-indep
 	# Nothing to do
 
-binary-arch: 
+binary-arch:
 	# Nothing to do
 
 #install: build
 	#dh_testdir
 	#dh_testroot
-	#dh_clean -k 
+	#dh_clean -k
 	#dh_installdirs
 
 binary-indep:
@@ -62,10 +72,12 @@ binary-indep:
 		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} $(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} usr/local/bin; \
 		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} lib/systemd/system; \
+		dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} lib/systemd/system.conf.d/; \
 		cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \
 		cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
-		$(PYTHON) $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
+		cp $(MOD_SRC_DIR)/$${mod}/$(SYSTEMD_DIR)/*.conf debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system.conf.d/; \
+		python3 $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
 	done)
 	# Resuming debhelper scripts
 	dh_testroot
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_cpld_qsfp28.c b/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_cpld_qsfp28.c
index 15c5369fd219..92fa9a13c493 100755
--- a/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_cpld_qsfp28.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_cpld_qsfp28.c
@@ -396,8 +396,11 @@ static int cpld_remove(struct i2c_client *client)
 		kfree(data->port_data[i]);
 	}
 
-	if (cpld_idr_is_empty(&cpld_ida.idr))
+	if (ida_is_empty(&cpld_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/Makefile
index 405c9153c091..c36586fa82ad 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/Makefile
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/Makefile
@@ -1,3 +1,3 @@
-obj-m:=qci_cpld.o qci_cpld_led.o quanta_platform_ix7.o
+obj-m:=qci_cpld.o qci_cpld_led.o quanta_platform_ix7.o quanta_hwmon_ipmi.o
 
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld.c
index e8556bc72d46..1d2bf2023336 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld.c
@@ -172,11 +172,20 @@ static ssize_t get_module_present(struct device *dev,
 	u8 group = (u8)(data->cpld_port / 4);
 	u8 group_port = data->cpld_port % 4;
 	s32 value;
+	int retry = 0;
 
 	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
 				data->cpld_port + 1, group + 1, group_port + 1);
 
-	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	for (retry = 0; retry < 10; retry++)
+	{		
+	    value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+		if (value >= 0)
+			break;
+		else
+			printk("%s: retry:%d\n", __FUNCTION__, retry);
+		msleep(1);		
+	}
 	if (value < 0)
 		return -ENODEV;
 
@@ -338,7 +347,7 @@ static int cpld_probe(struct i2c_client *client,
 
 	if (!cpld_class)
 	{
-		cpld_class = class_create(THIS_MODULE, name);
+		cpld_class = class_create(THIS_MODULE, "cpld-qsfp28");
 		if (IS_ERR(cpld_class)) {
 			pr_err("couldn't create sysfs class\n");
 			return PTR_ERR(cpld_class);
@@ -405,7 +414,7 @@ static int cpld_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
-#if 1
+#if 0
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -438,8 +447,11 @@ static int cpld_remove(struct i2c_client *client)
 		kfree(data->port_data[i]);
 	}
 
-	if (cpld_idr_is_empty(&cpld_ida.idr))
+	if (ida_is_empty(&cpld_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld_led.c
index 37fc2e07246e..64841e8538f6 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld_led.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/qci_cpld_led.c
@@ -241,6 +241,7 @@ static int cpld_led_probe(struct i2c_client *client,
 	return nr;
 }
 
+#if 0
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
 static int idr_has_entry(int id, void *p, void *data)
 {
@@ -251,6 +252,7 @@ static bool cpld_idr_is_empty(struct idr *idp)
 {
 	return !idr_for_each(idp, idr_has_entry, NULL);
 }
+#endif
 
 static int cpld_led_remove(struct i2c_client *client)
 {
@@ -261,8 +263,11 @@ static int cpld_led_remove(struct i2c_client *client)
 	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
 	kfree(data->cpld_data);
 
-	if (cpld_idr_is_empty(&cpld_led_ida.idr))
+	if (ida_is_empty(&cpld_led_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..08d6a97d9a09
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1908 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg  0
+#define DEBUGUSE_SHIFT    0
+
+#define DRVNAME   "quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)     ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)    (int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)    (int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)  (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)  (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX         19
+#define SENSOR_ATTR_NAME_LENGTH	20
+
+#define SENSOR_GET_CAP_LABEL  0x001
+#define SENSOR_GET_CAP_ALARM  0x002
+#define SENSOR_GET_CAP_INPUT  0x004
+
+#define SENSOR_GET_CAP_LNC    0x008
+#define SENSOR_GET_CAP_LCR    0x010
+#define SENSOR_GET_CAP_LNR    0x020
+
+#define SENSOR_GET_CAP_UNC    0x040
+#define SENSOR_GET_CAP_UCR    0x080
+#define SENSOR_GET_CAP_UNR    0x100
+
+#define SENSOR_GET_CAP_MODEL  0x200
+#define SENSOR_GET_CAP_SN     0x400
+#define SENSOR_GET_CAP_PWM    0x800
+
+#define SENSOR_GET_CAP_CONMODE    0x1000
+#define SENSOR_GET_CAP_DIRECTION  0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT  0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT  0x8000
+
+#define SENSOR_GET_CAP_MFRID    0x10000
+#define SENSOR_GET_CAP_VIN_TYPE	0x20000
+#define SENSOR_GET_CAP_POUT_MAX	0x40000
+
+#define SDR_SENSOR_TYPE_TEMP  0x01
+#define SDR_SENSOR_TYPE_VOLT  0x02
+#define SDR_SENSOR_TYPE_CURR  0x03
+#define SDR_SENSOR_TYPE_FAN   0x04
+#define SDR_SENSOR_TYPE_PS    0x08
+#define SDR_SENSOR_TYPE_OTHER 0x0b
+
+#define BMC_GET_DEVICE_ID   0x01
+
+#define IPMI_NETFN_SE     0x04
+#define IPMI_NETFN_APP      0x06
+#define IPMI_NETFN_STORAGE    0x0a
+#define IPMI_NETFN_TSOL     0x30
+
+#define GET_SDR_REPO_INFO   0x20
+#define GET_DEVICE_SDR      0x21
+#define GET_SDR_RESERVE_REPO  0x22
+#define GET_SDR         0x23
+#define GET_SENSOR_THRESHOLDS 0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS 0x2b
+#define GET_SENSOR_READING    0x2d
+#define GET_PSU_READING     0x52
+#define GET_FAN_INFO      0xd6
+#define GET_FRU_INFO      0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK    (0x80)  /* 1 = provides SDRs      */
+#define IPMI_TIMEOUT      (4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE 1
+
+struct quanta_hwmon_ipmi_data
+{
+  struct platform_device  *ipmi_platform_dev;
+  struct device     *ipmi_hwmon_dev;
+  /*struct mutex      ipmi_lock; */
+
+  int32_t         total_sensor_id;
+  int32_t         total_suport_sensor;
+  int32_t         total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data
+{
+  uint8_t addr;
+  uint8_t sensor_type;
+  uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+  uint32_t capability;
+
+  struct header_info
+  {
+    uint8_t header_type;
+    uint8_t header_byte;
+  } headerinfo;
+
+  struct record_info
+  {
+    uint8_t record_analog;
+    uint8_t record_linearization;
+
+    int32_t record_m;
+    int32_t record_b;
+    int32_t record_k1;
+    int32_t record_k2;
+  } recordinfo;
+
+  struct threshold_upper_info
+  {
+    uint8_t unr;
+    uint8_t ucr;
+    uint8_t unc;
+  } upperinfo;
+
+  struct threshold_lower_info
+  {
+    uint8_t lnr;
+    uint8_t lcr;
+    uint8_t lnc;
+  } lowerinfo;
+
+  struct attr_info
+  {
+    bool attr_exist;
+    char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+    char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+    struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+    struct attribute_group  attr_group;
+    struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+  } attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data
+{
+  int32_t tx_id;
+
+  int32_t rx_result;
+  int64_t rx_len;
+  void *rx_data;
+  struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator
+{
+  uint16_t reservation;
+  int32_t total;
+  int32_t next;
+};
+
+struct ipm_devid_rsp
+{
+  uint8_t device_id;
+  uint8_t device_revision;
+  uint8_t fw_rev1;
+  uint8_t fw_rev2;
+  uint8_t ipmi_version;
+  uint8_t adtl_device_support;
+  uint8_t manufacturer_id[3];
+  uint8_t product_id[2];
+  uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs
+{
+  uint8_t version;  /* SDR version (51h) */
+  uint16_t count;   /* number of records */
+  uint16_t free;    /* free space in SDR */
+  uint32_t add_stamp; /* last add timestamp */
+  uint32_t erase_stamp; /* last del timestamp */
+  uint8_t op_support; /* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs
+{
+  uint8_t count;  /* number of records */
+  uint8_t flags;  /* flags */
+  uint8_t popChangeInd[3];  /* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs
+{
+  uint16_t next;    /* next record id */
+  uint16_t id;    /* record ID */
+  uint8_t version;  /* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR     0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR    0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR  0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC    0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC 0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR  0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR  0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR 0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION   0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO  0x14
+#define SDR_RECORD_TYPE_OEM     0xc0
+  uint8_t type;   /* record type */
+  uint8_t length;   /* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq
+{
+  uint16_t reserve_id;  /* reservation ID */
+  uint16_t id;    /* record ID */
+  uint8_t offset;   /* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD 0xff
+  uint8_t length;   /* length to read */
+} __attribute__((packed));
+
+struct entity_id
+{
+  uint8_t id;     /* physical entity id */
+#ifdef WORDS_BIGENDIAN
+  uint8_t logical : 1;  /* physical/logical */
+  uint8_t instance : 7; /* instance number */
+#else
+  uint8_t instance : 7; /* instance number */
+  uint8_t logical : 1;  /* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask
+{
+  union
+  {
+    struct
+    {
+      uint16_t assert_event;  /* assertion event mask */
+      uint16_t deassert_event;  /* de-assertion event mask */
+      uint16_t read;  /* discrete reading mask */
+    } discrete;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved : 1;
+      uint16_t status_lnr : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnc : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lnc_low : 1;
+#else
+      uint16_t assert_lnc_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t status_lnc : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnr : 1;
+      uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved_2 : 1;
+      uint16_t status_unr : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unc : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lnc_low : 1;
+#else
+      uint16_t deassert_lnc_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t status_unc : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unr : 1;
+      uint16_t reserved_2 : 1;
+#endif
+      union
+      {
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* settable threshold mask */
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+          /* padding lower 8 bits */
+          uint16_t readable : 8;
+#else
+          uint16_t readable : 8;
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+#endif
+        } set;
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* readable threshold mask */
+          /* padding upper 8 bits */
+          uint16_t settable : 8;
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+#else
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+          uint16_t settable : 8;
+#endif
+        } read;
+      };
+    } threshold;
+  } type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor
+{
+  struct
+  {
+    uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+    uint8_t channel : 4;  /* channel number */
+    uint8_t __reserved : 2;
+    uint8_t lun : 2;  /* sensor owner lun */
+#else
+    uint8_t lun : 2;  /* sensor owner lun */
+    uint8_t __reserved : 2;
+    uint8_t channel : 4;  /* channel number */
+#endif
+    uint8_t sensor_num; /* unique sensor number */
+  } keys;
+
+  struct entity_id entity;
+
+  struct
+  {
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t __reserved : 1;
+      uint8_t scanning : 1;
+      uint8_t events : 1;
+      uint8_t thresholds : 1;
+      uint8_t hysteresis : 1;
+      uint8_t type : 1;
+      uint8_t event_gen : 1;
+      uint8_t sensor_scan : 1;
+#else
+      uint8_t sensor_scan : 1;
+      uint8_t event_gen : 1;
+      uint8_t type : 1;
+      uint8_t hysteresis : 1;
+      uint8_t thresholds : 1;
+      uint8_t events : 1;
+      uint8_t scanning : 1;
+      uint8_t __reserved : 1;
+#endif
+    } init;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t ignore : 1;
+      uint8_t rearm : 1;
+      uint8_t hysteresis : 2;
+      uint8_t threshold : 2;
+      uint8_t event_msg : 2;
+#else
+      uint8_t event_msg : 2;
+      uint8_t threshold : 2;
+      uint8_t hysteresis : 2;
+      uint8_t rearm : 1;
+      uint8_t ignore : 1;
+#endif
+    } capabilities;
+    uint8_t type;
+  } sensor;
+
+  uint8_t event_type; /* event/reading type code */
+
+  struct sdr_record_mask mask;
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t analog : 2;
+    uint8_t rate : 3;
+    uint8_t modifier : 2;
+    uint8_t pct : 1;
+#else
+    uint8_t pct : 1;
+    uint8_t modifier : 2;
+    uint8_t rate : 3;
+    uint8_t analog : 2;
+#endif
+    struct
+    {
+      uint8_t base;
+      uint8_t modifier;
+    } type;
+  } unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+  uint8_t linearization;  /* 70h=non linear, 71h-7Fh=non linear, OEM */
+  uint16_t mtol;    /* M, tolerance */
+  uint32_t bacc;    /* accuracy, B, Bexp, Rexp */
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t __reserved : 5;
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+#else
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t __reserved : 5;
+#endif
+  } analog_flag;
+
+  uint8_t nominal_read; /* nominal reading, raw value */
+  uint8_t normal_max; /* normal maximum, raw value */
+  uint8_t normal_min; /* normal minimum, raw value */
+  uint8_t sensor_max; /* sensor maximum, raw value */
+  uint8_t sensor_min; /* sensor minimum, raw value */
+
+  struct
+  {
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } upper;
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } lower;
+    struct
+    {
+      uint8_t positive;
+      uint8_t negative;
+    } hysteresis;
+  } threshold;
+  uint8_t __reserved[2];
+  uint8_t oem;    /* reserved for OEM use */
+  uint8_t id_code;  /* sensor ID string type/length code */
+  uint8_t id_string[16];  /* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+  /* function input parameter (a * 10 ^ b) */
+  int32_t i = 0, r = 1, temp_b = 0;
+
+  temp_b = (b > 0) ? b : -b;
+
+  for (i = 0; i < temp_b; i++)
+  {
+    r = r * 10;
+  }
+
+  if (b > 0)
+  {
+    *a = (*a) * r;
+    r = 1;
+  }
+  /* function return parameter calc_result = *a, decimal_point = r */
+  return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+  while (*buf >= '0' && *buf <= '9')
+  {
+    *output_val = *output_val * 10 + *buf - '0';
+    buf++;
+  }
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+  int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+  struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+  ipmi_wait_queue--;
+
+  if (msg->msg.data[0] != 0)
+  {
+    if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07)
+        && (msg->msg.cmd != 0x52))
+    {
+      /*skip master r/w cmd return code */
+      printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn,
+             msg->msg.cmd);
+      rv = msg->msg.data[0];
+      goto get_BMC_response_fail;
+    }
+  }
+
+  if (msg->msgid != comm_data->tx_id)
+  {
+    printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid,
+           comm_data->tx_id);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len <= 0)
+  {
+    printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len > 1)
+  {
+    if (comm_data->rx_len)
+    {
+      comm_data->rx_len = msg->msg.data_len - 1;
+      memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+    }
+    else
+    {
+      printk("ipmi: rx len = 0, it should be not retrun ?\n");
+      goto get_BMC_response_fail;
+    }
+  }
+
+  rv = 0;
+
+get_BMC_response_fail:
+  ipmi_free_recv_msg(msg);
+
+  if (ipmi_wait_queue == 0)
+  {
+    comm_data->rx_result = rv;
+    if (rv == 0)
+    {
+      complete(comm_data->rx_read_complete);
+    }
+  }
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg,
+                                       struct ipmi_comm_data *comm_data)
+{
+  int32_t rv = 0;
+  int32_t escape_time = 0;
+
+  struct ipmi_addr ipmi_address;
+
+  if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE)
+  {
+    /* printk("msg queue full, cannot send ipmi cmd\n"); */
+    return -EBUSY;
+  }
+  ipmi_wait_queue++;
+
+  ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+  ipmi_address.channel = IPMI_BMC_CHANNEL;
+  ipmi_address.data[0] = 0;
+
+  rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+  if (rv)
+  {
+    printk("ipmi_validate_addr fail, err code : %d\n", rv);
+    return rv;
+  }
+
+  ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg,
+                       comm_data, 0, 0, 0);
+
+  escape_time = wait_for_completion_timeout(comm_data->rx_read_complete,
+                                            IPMI_TIMEOUT);
+
+  rv = comm_data->rx_result;
+  if (escape_time == 0)
+  {
+    printk("BMC not response (%d)\n", escape_time);
+  }
+
+  return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len,
+                             void *msg_rx_data, int32_t msg_rx_len)
+{
+  int32_t i = 0;
+  int32_t rv = 0;
+
+  static uint64_t tx_msgid = 1;
+
+  struct kernel_ipmi_msg msg;
+  struct ipmi_comm_data *comm_data = NULL;
+  struct completion read_complete;
+
+  init_completion(&read_complete);
+
+  /* prepare transfer message */
+  msg.netfn = msg_tx_data[0];
+  msg.cmd = msg_tx_data[1];
+  msg.data_len = msg_tx_len - 2;
+
+  msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+  if (msg.data == NULL)
+  {
+    printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+  if (comm_data == NULL)
+  {
+    printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  for (i = 2; i < msg_tx_len; i++)
+  {
+    msg.data[i - 2] = msg_tx_data[i];
+  }
+
+  comm_data->tx_id = tx_msgid++;
+
+  /* prepare recive message */
+  comm_data->rx_data = msg_rx_data;
+  comm_data->rx_len = msg_rx_len;
+  comm_data->rx_result = -1;
+  comm_data->rx_read_complete = &read_complete;
+
+  rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+  if (msg.data)
+  {
+    kfree(msg.data);
+  }
+  if (comm_data)
+  {
+    kfree(comm_data);
+  }
+  if (tx_msgid > UINT_MAX)
+  {
+    tx_msgid = 1;
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t *reserve_id)
+{
+  int32_t rv = 0;
+  uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; /*netfn = 0x00; cmd = GET_SDR_RESERVE_REPO; */
+
+  msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+  /* obtain reservation ID */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+
+#if enable_debug_msg
+  printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; /*netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID; */
+
+  struct ipm_devid_rsp devid;
+
+  /* check SDRR capability */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return rv;
+  }
+
+  if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK)
+  {
+    if ((devid.adtl_device_support & 0x02) == 0)
+    {
+      if ((devid.adtl_device_support & 0x01))
+      {
+        printk("Using Device SDRs\n");
+        g_use_built_in = 1;
+      }
+      else
+      {
+        printk("Error obtaining SDR info\n");
+      }
+    }
+  }
+
+  if (g_use_built_in == 0)
+  {
+    struct sdr_repo_info_rs sdr_info;
+    /* get sdr repository info */
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+
+#if enable_debug_msg
+    printk("SDR version: 0x%x\n", sdr_info.version);
+    printk("SDR free space: %d\n", sdr_info.free);
+#endif
+  }
+  else
+  {
+    struct sdr_device_info_rs sdr_info;
+    /* get device sdr info */
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+  }
+
+#if enable_debug_msg
+  printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+  else
+  {
+    itr->next = 0;
+    rv = ipmi_sdr_get_reservation(&(itr->reservation));
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr,
+                            struct sdr_get_rs *sdr_rs)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  sdr_rq.reserve_id = itr->reservation;
+  sdr_rq.id = itr->next;
+  sdr_rq.offset = 0;
+  sdr_rq.length = 5;  /* only get the header */
+
+  if (g_use_built_in == 0)
+  {
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR;
+  }
+  else
+  {
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_DEVICE_SDR;
+  }
+
+  memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+  if ((rv) || (sdr_rs->length == 0))
+  {
+    printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+    return -1;
+  }
+
+  if (sdr_rs->id != itr->next)
+  {
+#if enable_debug_msg
+    printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+    sdr_rs->id = itr->next;
+  }
+#if enable_debug_msg
+  printk("\nSDR record ID   : 0x%04x", itr->next);
+  printk("SDR record type : 0x%02x\n", sdr_rs->type);
+  printk("SDR record next : 0x%04x\n", sdr_rs->next);
+  printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs *header,
+                            struct ipmi_sdr_iterator  *itr, uint8_t *ret_data)
+{
+  int32_t rv = 0, len = 0;
+
+  uint8_t buff[128] = "";
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  len = header->length;
+  if (len > 0)
+  {
+    memset(&sdr_rq, 0, sizeof(sdr_rq));
+    sdr_rq.reserve_id = itr->reservation;
+    sdr_rq.id = header->id;
+    sdr_rq.offset = 5;
+    sdr_rq.length = len;
+
+    if (g_use_built_in == 0)
+    {
+      msg_data[0] = IPMI_NETFN_STORAGE;
+      msg_data[1] = GET_SDR;
+    }
+    else
+    {
+      msg_data[0] = IPMI_NETFN_SE;
+      msg_data[1] = GET_DEVICE_SDR;
+    }
+
+    memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      memset(buff, 0, sizeof(buff));
+      memcpy(buff, ret_data + 2, sdr_rq.length);
+      memcpy(ret_data, buff, sdr_rq.length + 2);
+    }
+  }
+
+  return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx,
+                                   struct sdr_record_full_sensor *sensor)
+{
+
+  /* lower threshold info */
+  if (sensor->mask.type.threshold.read.lnc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+  }
+  if (sensor->mask.type.threshold.read.lcr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+  }
+  if (sensor->mask.type.threshold.read.lnr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+  }
+  g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+  g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+  g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+  /* upper threshold info */
+  if (sensor->mask.type.threshold.read.unc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+  }
+  if (sensor->mask.type.threshold.read.ucr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+  }
+  if (sensor->mask.type.threshold.read.unr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+  }
+  g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+  g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+  g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx,
+                                struct sdr_record_full_sensor *sensor)
+{
+  char *loc = NULL;
+
+  g_sensor_data[idx].sensor_type = sensor->sensor.type;
+  sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+  g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+  g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+  g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+  g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+  memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00,
+         SENSOR_ATTR_NAME_LENGTH);
+
+  switch (g_sensor_data[idx].sensor_type)
+  {
+    case SDR_SENSOR_TYPE_TEMP:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+      break;
+    case SDR_SENSOR_TYPE_VOLT:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      break;
+    case SDR_SENSOR_TYPE_FAN:
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+      break;
+    case SDR_SENSOR_TYPE_PS:
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+      if (loc)
+      {
+        if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0)
+        {
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_VIN_TYPE;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_POUT_MAX;
+        }
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      }
+
+      break;
+    case SDR_SENSOR_TYPE_CURR:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      break;
+    case SDR_SENSOR_TYPE_OTHER:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+      break;
+    default:
+      printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+      break;
+  }
+
+  if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+  }
+
+#if enable_debug_msg
+  {
+    printk("\n********************\n");
+
+    printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m,
+           g_sensor_data[idx].recordinfo.record_b
+           , g_sensor_data[idx].recordinfo.record_k1,
+           g_sensor_data[idx].recordinfo.record_k2);
+
+    printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n",
+           g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+           , g_sensor_data[idx].recordinfo.record_analog,
+           g_sensor_data[idx].recordinfo.record_linearization);
+
+    printk("\n********************\n");
+  }
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val,
+                                   int32_t *point_result)
+{
+  int32_t m = g_sensor_data[idx].recordinfo.record_m;
+  int32_t b = g_sensor_data[idx].recordinfo.record_b;
+  int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+  int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+  int32_t decimal_point = 0;
+  int32_t result = 0;
+
+  decimal_point = pow_convert(&b, k1);
+
+  switch (g_sensor_data[idx].recordinfo.record_analog)
+  {
+    case 0:
+      result = m * val * decimal_point + b;
+      break;
+    case 1:
+      if (val & 0x80)
+      {
+        val++;
+      }
+    case 2:
+      result = (m * (int16_t)val) * decimal_point + b;
+      break;
+    default:
+      return result;
+  }
+
+  pow_convert(&result, k2);
+  if (k1 < 0)
+  {
+    *point_result += -k1;
+  }
+  if (k2 < 0)
+  {
+    *point_result += -k2;
+  }
+
+  if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN)
+  {
+    result = result * 1000; /*shift for lm-sensors */
+  }
+
+  return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value,
+                               int8_t *ret_str)
+{
+  int32_t calc_result = 0, point_result = 0;
+  int32_t temp_len = 0;
+
+  uint8_t temp_str[16] = "";
+
+  calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+  temp_len = sprintf(temp_str, "%d", calc_result);
+  temp_len = temp_len - point_result;
+
+  /* int part */
+  if (temp_len <= 0)
+  {
+    sprintf(ret_str, "0");
+  }
+  else
+  {
+    snprintf(ret_str, temp_len + 1, "%s",
+             temp_str);  /* +1 for snprintf reserve space'\0' */
+  }
+
+  /* point part */
+  strcat(ret_str, ".");
+
+  /* float part */
+  if ((point_result == 0) || (temp_len < 0))
+  {
+    strcat(ret_str, "0");
+  }
+  else
+  {
+    strcat(ret_str, temp_str + temp_len);
+  }
+
+  /* EOL part */
+  strcat(ret_str, "\n\0");
+
+  return (temp_len + 1 + point_result +
+          2); /*integer + point + float + EOL + \0 */
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+  uint8_t slot_mask = 0x0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; /*netfn = 0x36; cmd = 0xB9; */
+  /*uint8_t msg_data[] = { 0x06, 0x52, 0x1B, 0x4C, 0x01, 0x00 }; //netfn = IPMI_NETFN_APP; cmd = GET_PSU_READING; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return 0;
+  }
+  else
+  {
+    slot_mask = (psu_slot == 1) ? 0x01 : 0x02;
+    return (returnData[0] & slot_mask) ? 0 : 1;
+  }
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+  uint8_t psu_slot = 0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xBB, 0x4C, 0x1C, 0x00, cmd, 0x00 }; /*netfn = 0x36; cmd = 0xBB; */
+
+  if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))
+  {
+    psu_slot = 1;
+  }
+  else
+  {
+    psu_slot = 2;
+  }
+
+  if (ipmi_check_psu_present(psu_slot))
+  {
+    msg_data[6] = psu_slot;
+    mutex_lock(&ipmi_lock);
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+    mutex_unlock(&ipmi_lock);
+
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      return sprintf(retbuf, "%s\n", returnData);
+    }
+  }
+  else
+  {
+    /*printk("Error ! cannot detect PSU%d\n", psu_slot); */
+  }
+
+  return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_vin_type(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData = 0;
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x01, 0xd8 }; // read line status
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			switch (returnData)
+			{
+				case 0x7: //LVDC
+				case 0x3: //HVDC
+					return sprintf(retbuf, "DC\n");
+				default:
+					return sprintf(retbuf, "AC\n");
+			}
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_pout_max(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0, pout_max = 0;
+
+	uint8_t returnData[2] = { 0 };
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x02, 0xa7 };
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			/* MFR_POUT_MAX has 2 data format: Direct and Linear Data (see PMbus spec).
+			   Query command is needed to tell the data format, but since we have not use PSU
+			   whose output power is over 0x07ff (2047), just check the first 5 bits*/
+			if ((returnData[1] & 0xf8) == 0) // Direct
+				pout_max = (returnData[1] << 8) | returnData[0];
+			else // Linear Data
+				pout_max = (((returnData[1] & 0x07) << 8) | returnData[0]) << ((returnData[1] & 0xf8) >> 3);
+			return sprintf(retbuf, "%d\n", pout_max);
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; /*netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  if (cmd_data1)
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+  }
+  else
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  }
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    sprintf(retbuf, "N/A\n");
+  }
+  else
+  {
+    sprintf(retbuf, "%s", returnData);
+  }
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%s\n",
+                 g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  int32_t rv = 0;
+
+  uint8_t returnData[4] = "";
+  uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; /*netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING; */
+
+  mutex_lock(&ipmi_lock);
+  msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "0.0\n");
+  }
+  else
+  {
+    return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+  }
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_vin_type(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_vin_type(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pout_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_pout_max(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  uint8_t returnData[10] = { 0 };
+  ipmi_fan_control(0x00, 0x00, returnData);
+  return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  if (g_fan_control_mode == 1)
+  {
+    ipmi_fan_control(0x01, store_input, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_controlmode(struct device *dev,
+                                struct device_attribute *devattr, char *buf)
+{
+  return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev,
+                                 struct device_attribute *devattr, const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  g_fan_control_mode = store_input;
+  if (g_fan_control_mode == 3)
+  {
+    ipmi_fan_control(0x7f, 0xff, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_direction(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; /*netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "N/A\n");
+  }
+  else
+  {
+    return sprintf(buf, "%c\n", returnData[1]);
+  }
+}
+
+static ssize_t show_fanpresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+  int32_t fan_idx = 0, fan_present = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; /*netfn = 0x36; cmd = 0xB9; */
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+  return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t psu_idx = 0;
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+  return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                           struct device_attribute *devattr, char *buf) =
+{
+  show_label, show_crit_alarm, show_input
+  , show_lnc, show_lcr, show_lnr
+  , show_unc, show_ucr, show_unr
+  , show_model, show_sn, show_pwm
+  , show_controlmode, show_direction, show_fanpresent
+  , show_psupresent, show_mfrid, show_vin_type
+  , show_pout_max
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                            struct device_attribute *devattr, const char *buf, size_t count) =
+{
+  NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, store_pwm
+  , store_controlmode, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+  "%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+  , "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+  , "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+  , "%s%d_model", "%s%d_sn", "%s%d_pwm"
+  , "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+  , "%s%d_present", "%s%d_mfrid", "%s%d_vin_type"
+  , "%s%d_pout_max"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+  int32_t i = 0, j = 0;
+
+  struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+  printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+  for (i = 0; i < SENSOR_ATTR_MAX; i++)
+  {
+    if ((g_sensor_data[attr_no].capability >> i) & 0x01)
+    {
+      snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i],
+               attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+      sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+      attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+      attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+      attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+      attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+      if (attrdata->sd_attrs[j].dev_attr.store)
+      {
+        attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+      }
+
+      attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+      attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+      j++;
+
+      data->total_create_sysfs++;
+    }
+  }
+
+  attrdata->attrs[j] = NULL;
+  attrdata->attr_group.attrs = attrdata->attrs;
+
+  g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+  return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+  int32_t i = 0;
+
+  for (i = 0; i < data->total_sensor_id; i++)
+  {
+    if (g_sensor_data[i].attrinfo.attr_exist)
+    {
+      sysfs_remove_group(&data->ipmi_hwmon_dev->kobj,
+                         &g_sensor_data[i].attrinfo.attr_group);
+    }
+  }
+  return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+  int32_t sdr_idx = 0;
+  int32_t err = 0;
+
+  struct ipmi_sdr_iterator *itr = NULL;
+  struct sdr_get_rs *header = NULL;
+
+  uint8_t *rec = NULL;
+
+  mutex_lock(&ipmi_lock);
+
+  itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+  if (itr == NULL)
+  {
+    printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+    goto itr_malloc_fail;
+  }
+
+  header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+  if (header == NULL)
+  {
+    printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+    goto header_malloc_fail;
+  }
+
+  err = ipmi_sdr_start(itr);
+  if (err)
+  {
+    printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+    goto ipmi_sdr_start_fail;
+  }
+
+  data->total_sensor_id = itr->total;
+  rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+  if (rec == NULL)
+  {
+    printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+    goto rec_malloc_fail;
+  }
+
+  g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data),
+                          GFP_KERNEL);
+  if (g_sensor_data == NULL)
+  {
+    printk("%s(%d): malloc failure", __func__, __LINE__);
+    goto g_sensor_data_malloc_fail;
+  }
+
+  memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+  for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++)
+  {
+    err = ipmi_sdr_get_header(itr, header);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_header_fail;
+    }
+
+
+    memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+    err = ipmi_sdr_get_record(header, itr, rec);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_record_fail;
+    }
+
+    itr->next = header->next;
+
+    switch (header->type)
+    {
+      case SDR_RECORD_TYPE_FULL_SENSOR:
+        /* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+        g_sensor_data[sdr_idx].addr = rec[2];
+        g_sensor_data[sdr_idx].capability =
+          SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+        g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+        g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+        ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor *) rec);
+        ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor *) rec);
+
+        if (sdr_idx >= DEBUGUSE_SHIFT)
+        {
+          err = create_sensor_attrs(sdr_idx);
+          if (err)
+          {
+            g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+            printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx,
+                   g_sensor_data[sdr_idx].sensor_idstring);
+            goto create_sysfs_fail;
+          }
+        }
+
+        data->total_suport_sensor++;
+
+        break;
+      case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+      default:
+        g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+        printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+        break;
+    }
+  }
+
+  printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n",
+         data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+  if (header)
+  {
+    kfree(header);
+    header = NULL;
+  }
+  if (rec)
+  {
+    kfree(rec);
+    rec = NULL;
+  }
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+  if (itr)
+  {
+    kfree(itr);
+    itr = NULL;
+  }
+
+itr_malloc_fail:
+  mutex_unlock(&ipmi_lock);
+
+  return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+  int32_t err = 0;
+
+  init_completion(&g_read_complete);
+
+  data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+  if (NULL == data)
+  {
+    printk("alloc data fail\n");
+    goto alloc_err;
+  }
+
+  data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+  err = IS_ERR(data->ipmi_platform_dev);
+  if (err)
+  {
+    printk("platform device register fail (err : %d)\n", err);
+    goto device_reg_err;
+  }
+
+  data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL,
+                                                           NULL);
+  err = IS_ERR(data->ipmi_hwmon_dev);
+  if (err)
+  {
+    printk("hwmon register fail\n");
+    goto hwmon_register_err;
+  }
+
+  err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+  if (err)
+  {
+    printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+    goto ipmi_create_err;
+  }
+
+  mutex_init(&ipmi_lock);
+  err = ipmi_init_sdr_sensors_data();
+  if (err)
+  {
+    printk("init sensor data fail (err : %d)\n", err);
+    goto init_sensor_err;
+  }
+
+  return 0;
+
+init_sensor_err:
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+ipmi_create_err:
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+  platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+alloc_err:
+  return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{
+  remove_sensor_attrs();
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+
+  mutex_lock(&ipmi_lock);
+  ipmi_destroy_user(ipmi_mh_user);
+  mutex_unlock(&ipmi_lock);
+
+  platform_device_unregister(data->ipmi_platform_dev);
+
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
index a6e5733199ac..02705e37d828 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
@@ -39,119 +39,12 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
 #include <linux/platform_data/pca953x.h>
 #endif
 
-#define MUX_INFO(bus, deselect) \
-	{.adap_id = bus, .deselect_on_exit = deselect}
-
-static struct pca954x_platform_mode pca9548sfp1_modes[] = {
-	MUX_INFO(0x20, 1),
-	MUX_INFO(0x21, 1),
-	MUX_INFO(0x22, 1),
-	MUX_INFO(0x23, 1),
-	MUX_INFO(0x24, 1),
-	MUX_INFO(0x25, 1),
-	MUX_INFO(0x26, 1),
-	MUX_INFO(0x27, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp1_data = {
-	.modes 		= pca9548sfp1_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp2_modes[] = {
-	MUX_INFO(0x28, 1),
-	MUX_INFO(0x29, 1),
-	MUX_INFO(0x2a, 1),
-	MUX_INFO(0x2b, 1),
-	MUX_INFO(0x2c, 1),
-	MUX_INFO(0x2d, 1),
-	MUX_INFO(0x2e, 1),
-	MUX_INFO(0x2f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp2_data = {
-	.modes 		= pca9548sfp2_modes,
-	.num_modes 	= 8,
-};
-static struct pca954x_platform_mode pca9548sfp3_modes[] = {
-	MUX_INFO(0x30, 1),
-	MUX_INFO(0x31, 1),
-	MUX_INFO(0x32, 1),
-	MUX_INFO(0x33, 1),
-	MUX_INFO(0x34, 1),
-	MUX_INFO(0x35, 1),
-	MUX_INFO(0x36, 1),
-	MUX_INFO(0x37, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp3_data = {
-	.modes 		= pca9548sfp3_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp4_modes[] = {
-	MUX_INFO(0x38, 1),
-	MUX_INFO(0x39, 1),
-	MUX_INFO(0x3a, 1),
-	MUX_INFO(0x3b, 1),
-	MUX_INFO(0x3c, 1),
-	MUX_INFO(0x3d, 1),
-	MUX_INFO(0x3e, 1),
-	MUX_INFO(0x3f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp4_data = {
-	.modes 		= pca9548sfp4_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9546_modes[] = {
-	MUX_INFO(0x10, 1),
-	MUX_INFO(0x11, 1),
-	MUX_INFO(0x12, 1),
-	MUX_INFO(0x13, 1),
-};
-
-static struct pca954x_platform_data pca9546_data = {
-	.modes 		= pca9546_modes,
-	.num_modes 	= 4,
-};
-
-static struct pca954x_platform_mode pca9548_modes[] = {
-	MUX_INFO(0x14, 1),
-	MUX_INFO(0x15, 1),
-	MUX_INFO(0x16, 1),
-	MUX_INFO(0x17, 1),
-	MUX_INFO(0x18, 1),
-	MUX_INFO(0x19, 1),
-	MUX_INFO(0x1a, 1),
-	MUX_INFO(0x1b, 1),
-};
-
-static struct pca954x_platform_data pca9548_data = {
-	.modes 		= pca9548_modes,
-	.num_modes 	= 8,
-};
-
-/* CPU Board i2c device */
-static struct pca954x_platform_mode pca9546_cpu_modes[] = {
-	MUX_INFO(0x02, 1),
-	MUX_INFO(0x03, 1),
-	MUX_INFO(0x04, 1),
-	MUX_INFO(0x05, 1),
-};
-
-static struct pca954x_platform_data pca9546_cpu_data = {
-	.modes 		= pca9546_cpu_modes,
-	.num_modes 	= 4,
-};
 //MB Board Data
 static struct pca953x_platform_data pca9555_1_data = {
 	.gpio_base = 0x10,
@@ -164,30 +57,24 @@ static struct pca953x_platform_data pca9555_CPU_data = {
 static struct i2c_board_info ix7_i2c_devices[] = {
 	{
 		I2C_BOARD_INFO("pca9546", 0x72),		// 0
-		.platform_data = &pca9546_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x77),		// 1
-		.platform_data = &pca9548_data,
 	},
 	{
 		I2C_BOARD_INFO("24c02", 0x54),			// 2 0x72 ch2 eeprom
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 3 0x77 ch0
-		.platform_data = &pca9548sfp1_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 4 0x77 ch1
-		.platform_data = &pca9548sfp2_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 5 0x77 ch2
-		.platform_data = &pca9548sfp3_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 6 0x77 ch3
-		.platform_data = &pca9548sfp4_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9555", 0x23),		// 7 0x72 ch3 pca9555 MB Board Data
@@ -201,7 +88,6 @@ static struct i2c_board_info ix7_i2c_devices[] = {
 	},
 	{
 		I2C_BOARD_INFO("pca9546", 0x71),		// 10 CPU Board i2c device
-		.platform_data = &pca9546_cpu_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9555", 0x20),		// 11 0x71 ch0 CPU Board Data
@@ -227,9 +113,13 @@ static struct platform_driver ix7_platform_driver = {
 
 static struct platform_device *ix7_device;
 
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 14; // num of ix7_i2c_devices - 1 (for optoe1)
+int numof_ports = 32;
+
 static int __init ix7_platform_init(void)
 {
-	struct i2c_client *client;
 	struct i2c_adapter *adapter;
 	int ret, i;
 
@@ -248,55 +138,139 @@ static int __init ix7_platform_init(void)
 	if (ret)
 		goto fail_platform_device;
 
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
 	adapter = i2c_get_adapter(0);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[0]);		// pca9546
-	client = i2c_new_device(adapter, &ix7_i2c_devices[1]);		// pca9548
-	client = i2c_new_device(adapter, &ix7_i2c_devices[10]);		// pca9546 in CPU board
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x02);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[11]);		// CPU Board Data
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x10);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[8]);		// CPLD2
-	client = i2c_new_device(adapter, &ix7_i2c_devices[13]);		// CPLD_led_1
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x11);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[9]);		// CPLD3
-	client = i2c_new_device(adapter, &ix7_i2c_devices[14]);		// CPLD_led_2
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x12);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x13);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[7]);		// pca9555 MB Board Data
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x14);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[3]);		// pca9548_1 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x15);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[4]);		// pca9548_2 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x16);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[5]);		// pca9548_3 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x17);
-	client = i2c_new_device(adapter, &ix7_i2c_devices[6]);		// pca9548_4 SFP
-	i2c_put_adapter(adapter);
-	for(i = 32; i < 64; i ++){									// QSFP 1~32 EEPROM
-		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix7_i2c_devices[12]);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix7_i2c_devices[0]);		// pca9546
+		g_client[1] = i2c_new_device(adapter, &ix7_i2c_devices[1]);		// pca9548
+		g_client[2] = i2c_new_device(adapter, &ix7_i2c_devices[10]);		// pca9546 in CPU board
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(13);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix7_i2c_devices[11]);		// CPU Board Data
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(1);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[4] = i2c_new_device(adapter, &ix7_i2c_devices[8]);		// CPLD2
+		g_client[5] = i2c_new_device(adapter, &ix7_i2c_devices[13]);		// CPLD_led_1
 		i2c_put_adapter(adapter);
 	}
 
+	adapter = i2c_get_adapter(2);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[6] = i2c_new_device(adapter, &ix7_i2c_devices[9]);		// CPLD3
+		g_client[7] = i2c_new_device(adapter, &ix7_i2c_devices[14]);		// CPLD_led_2
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(3);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[8] = i2c_new_device(adapter, &ix7_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(4);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[9] = i2c_new_device(adapter, &ix7_i2c_devices[7]);		// pca9555 MB Board Data
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(5);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[10] = i2c_new_device(adapter, &ix7_i2c_devices[3]);		// pca9548_1 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(6);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[11] = i2c_new_device(adapter, &ix7_i2c_devices[4]);		// pca9548_2 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(7);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix7_i2c_devices[5]);		// pca9548_3 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(8);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[13] = i2c_new_device(adapter, &ix7_i2c_devices[6]);		// pca9548_4 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	for(i = 17; i < 49; i ++){									// QSFP 1~32 EEPROM
+		adapter = i2c_get_adapter(i);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			g_client_port[i - 17] = i2c_new_device(adapter, &ix7_i2c_devices[12]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
 	return 0;
 
 fail_platform_device:
@@ -309,6 +283,26 @@ static int __init ix7_platform_init(void)
 
 static void __exit ix7_platform_exit(void)
 {
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
 	platform_device_unregister(ix7_device);
 	platform_driver_unregister(&ix7_platform_driver);
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/service/ix7-platform-init.service b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/service/ix7-platform-init.service
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/setup.py
index a2f84b31a56a..7973be92052a 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import os
-import sys
 from setuptools import setup
 os.listdir
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..d82f3749319c
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..58d44f4c553e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/chassis.py
@@ -0,0 +1,256 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    import syslog
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus     = 2
+        self.__num_of_ports    = 32
+        self.__num_of_sfps     = 0
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 15
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            if index in range(1, self.__num_of_sfps + 1):
+                sfp = Sfp(index, 'SFP')
+            else:
+                sfp = Sfp(index, 'QSFP')
+
+            self._sfp_list.append(sfp)
+
+        for index in range(1, self.__num_of_ports + 1):
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        hw_reboot_cause = ""
+        with open("/sys/class/watchdog/watchdog0/reboot_reason", "r") as f:
+            hw_reboot_cause = f.read().strip('\n')
+
+        if hw_reboot_cause == "2":
+            reboot_cause = self.REBOOT_CAUSE_WATCHDOG
+            description = 'Hardware Watchdog Reset'
+        else:
+            reboot_cause = self.REBOOT_CAUSE_NON_HARDWARE
+            description = 'Unknown reason'
+
+        return (reboot_cause, description)
+
+
+    ##############################################
+    # Other methods
+    ##############################################
+    def get_watchdog(self):
+        """
+        Retreives hardware watchdog device on this chassis
+
+        Returns:
+            An object derived from WatchdogBase representing the hardware
+            watchdog device
+        """
+        try:
+            if self._watchdog is None:
+                from sonic_platform.watchdog import Watchdog
+                # Create the watchdog Instance
+                self._watchdog = Watchdog()
+
+        except Exception as e:
+            syslog.syslog(syslog.LOG_ERR, "Fail to load watchdog due to {}".format(e))
+        return self._watchdog
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..ef01115fe7cf
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/eeprom.py
@@ -0,0 +1,209 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo    
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
+    def decoder(self, s, t):
+        '''
+        Return a string representing the contents of the TLV field. The format of
+        the string is:
+            1. The name of the field left justified in 20 characters
+            2. The type code in hex right justified in 5 characters
+            3. The length in decimal right justified in 4 characters
+            4. The value, left justified in however many characters it takes
+        The vailidity of EEPROM contents and the TLV field has been verified
+        prior to calling this function. The 's' parameter is unused
+        '''
+        if t[0] == self._TLV_CODE_PRODUCT_NAME:
+            name  = "Product Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PART_NUMBER:
+            name = "Part Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERIAL_NUMBER:
+            name  = "Serial Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_BASE:
+            name = "Base MAC Address"
+            value = ":".join(["{:02x}".format(T) for T in t[2:8]]).upper()
+        elif t[0] == self._TLV_CODE_MANUF_DATE:
+            name = "Manufacture Date"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DEVICE_VERSION:
+            name  = "Device Version"
+            value = str(t[2])
+        elif t[0] == self._TLV_CODE_LABEL_REVISION:
+            name  = "Label Revision"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PLATFORM_NAME:
+            name  = "Platform Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_ONIE_VERSION:
+            name  = "ONIE Version"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_SIZE:
+            name = "MAC Addresses"
+            value = str((t[2] << 8) | t[3])
+        elif t[0] == self._TLV_CODE_MANUF_NAME:
+            name = "Manufacturer"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MANUF_COUNTRY:
+            name = "Manufacture Country"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_NAME:
+            name = "Vendor Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DIAG_VERSION:
+            name = "Diag Version"
+            # Quanta legacy format of diag version
+            if t[1] == 4:
+                value = "{}.{}.{}.{}".format('{:02x}'.format(t[2])[0], '{:02x}'.format(t[2])[1],
+                                             '{:02x}'.format(t[3])[0], '{:02x}'.format(t[3])[1])
+            else:
+                value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERVICE_TAG:
+            name = "Service Tag"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_EXT:
+            name = "Vendor Extension"
+            value = ""
+            if self._TLV_DISPLAY_VENDOR_EXT:
+                for c in t[2:2 + t[1]]:
+                    value += "0x%02X " % c
+        elif t[0] == self._TLV_CODE_CRC_32 and len(t) == 6:
+            name = "CRC-32"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        # Quanta specific codes below here.
+        # These decodes are lifted from their U-Boot codes
+        elif t[0] == self._TLV_CODE_QUANTA_MAGIC and len(t) == 3:
+            name  = "Magic Number"
+            value = "0x%02X" % t[2]
+        elif t[0] == self._TLV_CODE_QUANTA_CRC and len(t) == 4:
+            name = "QUANTA-CRC"
+            value = "0x%04X" % ((t[2] << 8) + t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_CARD_TYPE and len(t) == 6:
+            name = "Card Type"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_HW_VERSION and len(t) == 6:
+            name = "Hardware Version"
+            value = "%d.%d" % (t[2], t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_SW_VERSION and len(t) == 6:
+            name = "Software Version"
+            value = "%d.%d.%d.%d" % ((t[2] >> 4), (t[2] & 0xF), (t[3] >> 4), (t[3] & 0xF))
+        elif t[0] == self._TLV_CODE_QUANTA_MANUF_DATE and len(t) == 6:
+            name = "Manufacture Date"
+            value = "%04d/%d/%d" % (((t[2] << 8) | t[3]), t[4], t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_MODEL_NAME:
+            name  = "Model Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        else:
+            name = "Unknown"
+            value = ""
+            for c in t[2:2 + t[1]]:
+                value += "0x%02X " % c
+        return name, value
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan.py
new file mode 100644
index 000000000000..31bbe0e52e48
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta IX7
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+FAN_INDEX_START = 21
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:40,
+            2:50,
+        }
+        self.psu_index_mapping = {
+            1:42,
+            2:52,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)//FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR' and attr_rv != '0.0'):
+            return True
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/platform.py
new file mode 100644
index 000000000000..c4f945277f4d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/psu.py
new file mode 100644
index 000000000000..49846fff48ff
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/psu.py
@@ -0,0 +1,320 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:42,
+            2:52,
+        }
+        self.psu_powerin_index_mapping = {
+            1:41,
+            2:51,
+        }
+        self.psu_currentout_index_mapping = {
+            1:39,
+            2:49,
+        }
+        self.psu_currentin_index_mapping = {
+            1:38,
+            2:48,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:47,
+            2:57,
+        }
+        self.psu_voltagein_index_mapping = {
+            1:46,
+            2:56,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+        self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
+        self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
+        self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_mfr_id(self):
+        """
+        Retrieves the manufacturer's name (or id) of the device
+
+        Returns:
+            string: Manufacturer's id of device
+        """
+        mfr_id = "N/A"
+        attr_path = HWMON_DIR+self.psu_mfr_id_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            mfr_id = attr_rv
+
+        return mfr_id
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_in = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_in = float(attr_rv) / 1000
+
+        return voltage_in
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_in = 0.0
+        attr_path = HWMON_DIR+self.psu_current_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_in = float(attr_rv) / 1000
+
+        return current_in
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_type(self):
+        """
+        Gets the type of the PSU
+
+        Returns:
+            A string, the type of PSU (AC/DC)
+        """
+        type = "AC"
+        attr_path = HWMON_DIR+self.psu_type_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            type = attr_rv
+
+        return type
+
+    def get_capacity(self):
+        """
+        Gets the capacity (maximum output power) of the PSU in watts
+
+        Returns:
+            An integer, the capacity of PSU
+        """
+        capacity = 0
+        attr_path = HWMON_DIR+self.psu_capacity_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            try:
+                capacity = int(attr_rv)
+            except ValueError:
+                capacity = 0
+
+        return capacity
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..c97e91d74a75
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/sfp.py
@@ -0,0 +1,1596 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+#import subprocess
+#import sonic_device_util
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+#     from sonic_platform_base.sonic_eeprom import eeprom_dts
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 1
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_MODULE_THRESHOLD_OFFSET = 512
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 560
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 32
+    QSFP_START = 1
+    QSFP_END = 32
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix7_rglbmc-r0"
+    HWSKU  = "Quanta-IX7-32X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        self.lpmode_path = "/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/lpmode"
+        self.reset_path = "/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/reset"
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 17,
+             2 : 18,
+             3 : 19,
+             4 : 20,
+             5 : 21,
+             6 : 22,
+             7 : 23,
+             8 : 24,
+             9 : 25,
+            10 : 26,
+            11 : 27,
+            12 : 28,
+            13 : 29,
+            14 : 30,
+            15 : 31,
+            16 : 32,
+            17 : 33,
+            18 : 34,
+            19 : 35,
+            20 : 36,
+            21 : 37,
+            22 : 38,
+            23 : 39,
+            24 : 40,
+            25 : 41,
+            26 : 42,
+            27 : 43,
+            28 : 44,
+            29 : 45,
+            30 : 46,
+            31 : 47,
+            32 : 48
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+            'vendor_oui', 'application_advertisement']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
+            'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+            'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+            'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning',
+            'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning',
+            'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+            'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm',
+            'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+            'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/module_present")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        reg_file.close()
+        if reg_value == '1':
+            return True
+
+        return False
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability = int(qsfp_dom_capability_raw[0], 16)
+
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_OFFSET)
+                if qsfp_version_compliance_raw is not None:
+                    qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                else:
+                    self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                    return
+
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = (qsfp_dom_capability & 0x20 != 0)
+                    self.dom_volt_supported = (qsfp_dom_capability & 0x10 != 0)
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = (qsfp_dom_capability & 0x04 != 0)
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                self.dom_tx_disable_supported = True
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+         """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = QSFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = SFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+        else:
+            return transceiver_info_dict
+
+        # Add retry for xcvr eeprom to get ready
+        max_retry = 10
+        for i in range(0,max_retry):
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is not None:
+                break
+            else:
+                if not self.get_presence():
+                    return transceiver_info_dict
+                elif i == max_retry-1:
+                    pass
+                else:
+                    time.sleep(0.5)
+
+        if sfp_interface_bulk_raw is None:
+                return transceiver_info_dict
+
+        start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + interface_info_bulk_width
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_NAME_WIDTH
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_PN_WIDTH
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + vendor_rev_width
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_SN_WIDTH
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_OUI_WIDTH
+        sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_DATE_WIDTH
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+        transceiver_info_dict['type'] = sfp_interface_bulk_data \
+            ['data']['type']['value']
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+            ['data']['Vendor Name']['value']
+        transceiver_info_dict['model'] = sfp_vendor_pn_data \
+            ['data']['Vendor PN']['value']
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+            ['data']['Vendor Rev']['value']
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+            ['data']['Vendor SN']['value']
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+            ['data']['Vendor OUI']['value']
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+            ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+            ['data']['Connector']['value']
+        transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+            ['data']['EncodingCodes']['value']
+        transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+            ['data']['Extended Identifier']['value']
+        transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+            ['data']['RateIdentifier']['value']
+        transceiver_info_dict['type_abbrv_name'] = 'N/A'
+        if self.sfp_type == QSFP_TYPE:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['Nominal Bit Rate(100Mbs)']['value'])
+        else:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qsfp_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+            if not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+        else:
+            return None
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disable_channel'] = self.get_tx_disable_channel()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict_keys = ['temphighalarm',    'temphighwarning',    'templowalarm',    'templowwarning',
+                                                        'vcchighalarm',     'vcchighwarning',     'vcclowalarm',     'vcclowwarning',
+                                                        'rxpowerhighalarm', 'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning',
+                                                        'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+                                                        'txbiashighalarm',  'txbiashighwarning',  'txbiaslowalarm',  'txbiaslowwarning']
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 0
+            transceiver_dom_threshold_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            offset = DOM_OFFSET
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm']   = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm']    = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning']  = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm']    = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm']     = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning']  = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning']   = module_threshold_data['VccLowWarning']['value']
+
+            dom_channel_thres_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNEL_THRESHOLD_OFFSET), QSFP_CHANNEL_THRESHOLD_WIDTH)
+            if dom_channel_thres_raw is not None:
+                channel_threshold_values = sfpd_obj.parse_channel_threshold_values(dom_channel_thres_raw, 0)
+                channel_threshold_data = channel_threshold_values.get('data')
+            else:
+                channel_threshold_data = None
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm']   = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm']    = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning']  = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm']   = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm']    = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning']  = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm']    = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm']     = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning']  = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning']   = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 256
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm']      = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm']       = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning']    = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning']     = dom_module_threshold_data['data']['TempLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['vcchighalarm']       = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm']        = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning']     = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning']      = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txbiashighalarm']    = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm']     = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning']  = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning']   = dom_module_threshold_data['data']['BiasLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txpowerhighalarm']   = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm']    = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning']  = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm']   = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm']    = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning']  = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+        else:
+            return None
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.reset_path)
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path)
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+        else:
+            return None
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+        else:
+            return None
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = \
+                    sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params( \
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.reset_path, "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 0
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                reg_file = open("/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/reset", "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 1
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path, "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..bf5757c9fa22
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/thermal.py
@@ -0,0 +1,154 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+
+thermal_index_mapping = {
+    1:43,
+    2:44,
+    3:45,
+    4:53,
+    5:54,
+    6:55,
+    7:68,
+    8:69,
+    9:70,
+   10:71,
+   11:72,
+   12:73,
+   13:74,
+   14:75,
+   15:76
+}
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_ncrit".format(thermal_index_mapping[self.index])
+        self.high_crit_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_crit_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/watchdog.py
new file mode 100644
index 000000000000..282f356f4e73
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/watchdog.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+
+#############################################################################
+# 
+# Watchdog contains an implementation of SONiC Platform Base Watchdog API
+#
+#############################################################################
+import fcntl
+import os
+import array
+
+try:
+    from sonic_platform_base.watchdog_base import WatchdogBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+""" ioctl constants """
+IO_WRITE = 0x40000000
+IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
+IO_SIZE_INT = 0x00040000
+IO_SIZE_40 = 0x00280000
+IO_TYPE_WATCHDOG = ord('W') << 8
+
+WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDR_40 = IO_READ | IO_SIZE_40 | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
+
+""" Watchdog ioctl commands """
+WDIOC_GETSUPPORT = 0 | WDR_40
+WDIOC_GETSTATUS = 1 | WDR_INT
+WDIOC_GETBOOTSTATUS = 2 | WDR_INT
+WDIOC_GETTEMP = 3 | WDR_INT
+WDIOC_SETOPTIONS = 4 | WDR_INT
+WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
+WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
+
+""" Watchdog status constants """
+WDIOS_DISABLECARD = 0x0001
+WDIOS_ENABLECARD = 0x0002
+
+WDT_COMMON_ERROR = -1
+WD_MAIN_IDENTITY = "iTCO_wdt"
+WDT_SYSFS_PATH = "/sys/class/watchdog/"
+
+DEFAULT_TIMEOUT=180
+
+class Watchdog(WatchdogBase):
+
+    def __init__(self):
+
+        self.watchdog, self.wdt_main_dev_name = self._get_wdt()
+        self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
+        self.state_path = "/sys/class/watchdog/%s/state" % self.wdt_main_dev_name
+        self.timeout_path = "/sys/class/watchdog/%s/timeout" % self.wdt_main_dev_name
+        # Set default value
+        self._disable()
+        self.armed = False
+        self.timeout = DEFAULT_TIMEOUT
+
+    def _is_wd_main(self, dev):
+        """
+        Checks watchdog identity
+        """
+        identity = self._read_file(
+            "{}/{}/identity".format(WDT_SYSFS_PATH, dev))
+        return identity == WD_MAIN_IDENTITY
+
+    def _get_wdt(self):
+        """
+        Retrieves watchdog device
+        """
+        wdt_main_dev_list = [dev for dev in os.listdir(
+            "/dev/") if dev.startswith("watchdog") and self._is_wd_main(dev)]
+        if not wdt_main_dev_list:
+            return None
+        wdt_main_dev_name = wdt_main_dev_list[0]
+        watchdog_device_path = "/dev/{}".format(wdt_main_dev_name)
+        self.watchdog = os.open(watchdog_device_path, os.O_RDWR)
+        return self.watchdog, wdt_main_dev_name
+
+    def _read_file(self, file_path):
+        """
+        Read text file
+        """
+        try:
+            with open(file_path, "r") as fd:
+                txt = fd.read()
+        except IOError:
+            return WDT_COMMON_ERROR
+        return txt.strip()
+
+    def _enable(self):
+        """
+        Turn on the watchdog timer
+        """
+        req = array.array('h', [WDIOS_ENABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _disable(self):
+        """
+        Turn off the watchdog timer
+        """
+        req = array.array('h', [WDIOS_DISABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _keepalive(self):
+        """
+        Keep alive watchdog timer
+        """
+        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
+        """
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
+        """
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+        return int(req[0])
+
+    def _gettimeout(self, timeout_path):
+        """
+        Get watchdog timeout
+        @return watchdog timeout
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
+    #################################################################
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog with a timeout of <seconds> seconds.
+        If the watchdog is currently armed, calling this function will
+        simply reset the timer to the provided value. If the underlying
+        hardware does not support the value provided in <seconds>, this
+        method should arm the watchdog with the *next greater* available
+        value.
+        Returns:
+            An integer specifying the *actual* number of seconds the watchdog
+            was armed with. On failure returns -1.
+        """
+
+        ret = WDT_COMMON_ERROR
+        if seconds < 0:
+            return ret
+
+        try:
+            if self.timeout != seconds:
+                self.timeout = self._settimeout(seconds)
+            if self.armed:
+                self._keepalive()
+            else:
+                self._settimeout(seconds)
+                self._enable()
+                self.armed = True
+            ret = self.timeout
+        except IOError as e:
+            pass
+
+        return ret
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False if not
+        """
+        disarmed = False
+        if self.is_armed():
+            try:
+                self._disable()
+                self.armed = False
+                disarmed = True
+            except IOError:
+                pass
+
+        return disarmed
+
+    def is_armed(self):
+        """
+        Retrieves the armed state of the hardware watchdog.
+        Returns:
+            A boolean, True if watchdog is armed, False if not
+        """
+
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        If the watchdog is armed, retrieve the number of seconds remaining on
+        the watchdog timer
+        Returns:
+            An integer specifying the number of seconds remaining on thei
+            watchdog timer. If the watchdog is not armed, returns -1.
+        """
+
+        timeleft = WDT_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft
+
+    def __del__(self):
+        """
+        Close watchdog
+        """
+
+        os.close(self.watchdog)
+
+
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform_setup.py
new file mode 100644
index 000000000000..a4899c618337
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',    
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/utils/quanta_ix7_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/utils/quanta_ix7_util.py
old mode 100644
new mode 100755
index e583d2374a99..901f7ba1ae86
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/utils/quanta_ix7_util.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/utils/quanta_ix7_util.py
@@ -21,19 +21,17 @@
 options:
     -h | --help     : this help message
     -d | --debug    : run with debug mode
-    -f | --force    : ignore error during installation or clean 
+    -f | --force    : ignore error during installation or clean
 command:
     install     : install drivers and generate related sysfs nodes
-    clean       : uninstall drivers and remove related sysfs nodes    
+    clean       : uninstall drivers and remove related sysfs nodes
 """
 
 import os
 import commands
 import sys, getopt
 import logging
-import re
 import time
-from collections import namedtuple
 
 DEBUG = False
 args = []
@@ -43,77 +41,68 @@
 
 if DEBUG == True:
     print sys.argv[0]
-    print 'ARGV      :', sys.argv[1:]   
+    print 'ARGV      :', sys.argv[1:]
 
 
 def main():
     global DEBUG
     global args
     global FORCE
-        
+
     if len(sys.argv)<2:
         show_help()
-         
+
     options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
                                                        'debug',
                                                        'force',
                                                           ])
-    if DEBUG == True:                                                           
+    if DEBUG == True:
         print options
         print args
         print len(sys.argv)
-            
+
     for opt, arg in options:
         if opt in ('-h', '--help'):
             show_help()
-        elif opt in ('-d', '--debug'):            
+        elif opt in ('-d', '--debug'):
             DEBUG = True
             logging.basicConfig(level=logging.INFO)
-        elif opt in ('-f', '--force'): 
+        elif opt in ('-f', '--force'):
             FORCE = 1
         else:
-            logging.info('no option')                          
-    for arg in args:            
+            logging.info('no option')
+    for arg in args:
         if arg == 'install':
            install()
         elif arg == 'clean':
            uninstall()
         else:
             show_help()
-            
-            
-    return 0              
-        
+
+
+    return 0
+
 def show_help():
     print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
     sys.exit(0)
-           
+
 def show_log(txt):
     if DEBUG == True:
         print "[IX7-32X]"+txt
     return
-    
+
 def exec_cmd(cmd, show):
-    logging.info('Run :'+cmd)  
-    status, output = commands.getstatusoutput(cmd)    
+    logging.info('Run :'+cmd)
+    status, output = commands.getstatusoutput(cmd)
     show_log (cmd +"with result:" + str(status))
-    show_log ("      output:"+output)    
+    show_log ("      output:"+output)
     if status:
         logging.info('Failed :'+cmd)
         if show:
             print('Failed :'+cmd)
     return  status, output
-        
+
 instantiate =[
-#turn on module power
-'echo 21 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio21/direction',
-'echo 1 >/sys/class/gpio/gpio21/value',
-#Reset fron-ports LED CPLD
-'echo 73 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio73/direction',
-'echo 0 >/sys/class/gpio/gpio73/value',
-'echo 1 >/sys/class/gpio/gpio73/value',
 #Enable front-ports LED decoding
 'echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode',
 'echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode',
@@ -130,27 +119,40 @@ def exec_cmd(cmd, show):
 'lpc_ich',
 'i2c-i801',
 'i2c-dev',
+'i2c-mux-pca954x force_deselect_on_exit=1',
+'gpio-pca953x',
+'optoe',
+'qci_cpld',
+'qci_cpld_led',
+'quanta_platform_ix7',
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
+]
+
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
 'i2c-mux-pca954x',
 'gpio-pca953x',
 'optoe',
 'qci_cpld',
 'qci_cpld_led',
 'quanta_platform_ix7',
-'ipmi_devintf'
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
 ]
- 
 
-                    
 def system_install():
     global FORCE
 
     #remove default drivers to avoid modprobe order conflicts
-    status, output = exec_cmd("echo 'blacklist i2c-ismt' > /etc/modprobe.d/blacklist.conf", 1)
+    exec_cmd("echo 'blacklist i2c-ismt' > /etc/modprobe.d/blacklist.conf", 1)
     time.sleep(1)
-    status, output = exec_cmd("modprobe -r i2c-ismt ", 1)
-    status, output = exec_cmd("modprobe -r i2c-i801 ", 1)
+    exec_cmd("modprobe -r i2c-ismt ", 1)
+    exec_cmd("modprobe -r i2c-i801 ", 1)
     #setup driver dependency
-    status, output = exec_cmd("depmod -a ", 1)
+    exec_cmd("depmod -a ", 1)
     #install drivers
     for i in range(0,len(drivers)):
         status, output = exec_cmd("modprobe "+drivers[i], 1)
@@ -159,6 +161,18 @@ def system_install():
         if FORCE == 0:
             return status
 
+    #turn on module power
+    exec_cmd("echo 21 > /sys/class/gpio/export ", 1)
+    exec_cmd("echo high > /sys/class/gpio/gpio21/direction ", 1)
+
+    #Reset fron-ports LED CPLD
+    exec_cmd("echo 33 > /sys/class/gpio/export ", 1)
+    status, output = exec_cmd("cat /sys/class/gpio/gpio33/value", 1)
+    if output != '1':
+        exec_cmd("echo out > /sys/class/gpio/gpio33/direction ", 1)
+        exec_cmd("echo 0 >/sys/class/gpio/gpio33/value", 1)
+        exec_cmd("echo 1 >/sys/class/gpio/gpio33/value", 1)
+
     #instantiate devices
     for i in range(0,len(instantiate)):
         status, output = exec_cmd(instantiate[i], 1)
@@ -166,26 +180,32 @@ def system_install():
         print output
         if FORCE == 0:
             return status
-    
+
     #QSFP for 1~32 port
     for port_number in range(1,33):
-        bus_number = port_number + 31
+        bus_number = port_number + 16
         os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
-    return 
-     
-        
+    return
+
+
 def system_ready():
-    if not device_found(): 
+    if not device_found():
         return False
     return True
-               
-def install():                      
+
+def install():
     if not device_found():
-        print "No device, installing...."     
-        status = system_install() 
+        print "No device, installing...."
+        status = system_install()
+        if status:
+            if FORCE == 0:
+                return  status
+
+        status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix7_rglbmc-r0/sonic_platform-1.0-py3-none-any.whl",1)
         if status:
-            if FORCE == 0:        
-                return  status        
+               print output
+               if FORCE == 0:
+                  return status
     else:
         print " ix7 driver already installed...."
     return
@@ -193,17 +213,28 @@ def install():
 def uninstall():
     global FORCE
     #uninstall drivers
-    for i in range(len(drivers)-1,-1,-1):
-       status, output = exec_cmd("rmmod "+drivers[i], 1)
+    for i in range(len(un_drivers)-1,-1,-1):
+       status, output = exec_cmd("rmmod "+un_drivers[i], 1)
     if status:
         print output
         if FORCE == 0:
             return status
+
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
     return
 
 def device_found():
-    ret1, log = exec_cmd("ls "+i2c_prefix+"i2c-0", 0)
-    return ret1
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix7 > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix7", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
 
 if __name__ == "__main__":
     main()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/classes/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/classes/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/Makefile
new file mode 100644
index 000000000000..160b2a28f1c1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/Makefile
@@ -0,0 +1,3 @@
+obj-m:=qci_cpld.o qci_cpld_led.o quanta_platform_ix7_bwde.o quanta_hwmon_ipmi.o
+
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld.c
new file mode 100644
index 000000000000..1d2bf2023336
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld.c
@@ -0,0 +1,463 @@
+/*
+ * A CPLD driver for monitor QSFP28 module I/O
+ *
+ * The CPLD is customize by Quanta for controlling QSFP28 module signals,
+ * they are RESET , INTERREPT , Module_Present, LPMODE
+ * Each CPLD control 16 modules, each module use 4 bits in register.
+ *
+ * Copyright (C) 2015 Quanta Inc.
+ *
+ * Author: Luffy Cheng <luffy.cheng@quantatw.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/log2.h>
+#include <linux/slab.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+
+static DEFINE_IDA(cpld_ida);
+
+enum platform_type {
+	SFP = 0,
+	QSFP,
+	QSFP28,
+	NONE
+};
+
+static struct class *cpld_class = NULL;
+
+struct sfp_data {
+	struct i2c_client *cpld_client;
+	char name[8];
+	char type[8];
+	u8 port_id;
+	u8 cpld_port;
+};
+
+struct cpld_data {
+	struct mutex lock;
+	struct device *port_dev[16];
+	struct sfp_data *port_data[16];
+};
+
+static int cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id);
+static int cpld_remove(struct i2c_client *client);
+
+static const struct i2c_device_id cpld_id[] = {
+	{ "CPLD-SFP", SFP },
+	{ "CPLD-QSFP", QSFP },
+	{ "CPLD-QSFP28", QSFP28 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cpld_id);
+
+static struct i2c_driver cpld_driver = {
+	.class		= I2C_CLASS_HWMON,
+	.driver = {
+		.name	= "qci_cpld",
+	},
+	.probe		= cpld_probe,
+	.remove		= cpld_remove,
+	.id_table	= cpld_id,
+//	.address_list	= normal_i2c,
+};
+
+#define CPLD_ID_PREFIX "port-"
+#define CPLD_ID_FORMAT CPLD_ID_PREFIX "%d"
+
+#define RESET_MASK 				0x08
+#define INTERRUPT_MASK	 		0x04
+#define MODULE_PRESENT_MASK 	0x02
+#define LPMODE_MASK 			0x01
+//#define I2C_MONITOR_MASK		0x01
+
+static inline u8 get_group_cmd(u8 group)
+{
+	//FIXME: if group cmd change
+	return (group + 1);
+}
+
+static inline u8 port_remapping(u8 phy_port)
+{
+	/* FIXME: implement by hardware design */
+	/* The CPLD register port mapping is weird :
+	 * MSB -------- LSB		(word data)
+	 * P3	P4	P1	P2		(per port 4 bits)
+	 * For easy coding bit shift, we treat it as hw port swap
+	 */
+	return (phy_port % 2) ? (phy_port - 1) : (phy_port + 1);
+}
+
+static ssize_t get_reset(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= RESET_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+
+static ssize_t get_interrupt(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= INTERRUPT_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+
+static ssize_t get_module_present(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+	int retry = 0;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	for (retry = 0; retry < 10; retry++)
+	{		
+	    value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+		if (value >= 0)
+			break;
+		else
+			printk("%s: retry:%d\n", __FUNCTION__, retry);
+		msleep(1);		
+	}
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= MODULE_PRESENT_MASK;
+
+	//FIXME: if present is not low active
+	return sprintf(buf, "%d\n", value ? 0 : 1);
+}
+
+static ssize_t get_lpmode(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= LPMODE_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+
+static ssize_t set_reset(struct device *dev,
+			    struct device_attribute *devattr,
+			    const char *buf,
+			    size_t count)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+	long disable;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	if (kstrtol(buf, 0, &disable))
+		return -EINVAL;
+
+	if ((disable != 1) && (disable != 0))
+		return -EINVAL;
+
+//	mutex_lock(&data->lock);
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value &= ~(RESET_MASK << (group_port * 4));
+	if (disable)
+		value |= (RESET_MASK << (group_port * 4));
+
+	dev_dbg(&client->dev, "write group%d value= %x\n", group + 1, value);
+
+	i2c_smbus_write_word_data(client, get_group_cmd(group), (u16)value);
+//	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static ssize_t set_lpmode(struct device *dev,
+			    struct device_attribute *devattr,
+			    const char *buf,
+			    size_t count)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+	long disable;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	if (kstrtol(buf, 0, &disable))
+		return -EINVAL;
+
+	if ((disable != 1) && (disable != 0))
+		return -EINVAL;
+
+//	mutex_lock(&data->lock);
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value &= ~(LPMODE_MASK << (group_port * 4));
+	if (disable)
+		value |= (LPMODE_MASK << (group_port * 4));
+
+	dev_dbg(&client->dev, "write group%d value= %x\n", group + 1, value);
+
+	i2c_smbus_write_word_data(client, get_group_cmd(group), (u16)value);
+//	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static DEVICE_ATTR(reset, S_IWUSR | S_IRUGO, get_reset, set_reset);
+static DEVICE_ATTR(lpmode, S_IWUSR | S_IRUGO, get_lpmode, set_lpmode);
+static DEVICE_ATTR(module_present, S_IRUGO, get_module_present, NULL);
+static DEVICE_ATTR(interrupt, S_IRUGO, get_interrupt, NULL);
+//static DEVICE_ATTR(led_enable, S_IWUSR | S_IRUGO, get_led_enable, set_led_enable);
+//static DEVICE_ATTR(monitor_enable, S_IWUSR | S_IRUGO, get_monitor_enable, set_monitor_enable);
+
+static const struct attribute *sfp_attrs[] = {
+	&dev_attr_reset.attr,
+	&dev_attr_lpmode.attr,
+	&dev_attr_module_present.attr,
+	&dev_attr_interrupt.attr,
+//	&dev_attr_led_enable.attr,
+	NULL,
+};
+
+static const struct attribute_group sfp_attr_group = {
+	.attrs = (struct attribute **) sfp_attrs,
+};
+
+static int cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct cpld_data *data;
+	struct sfp_data *port_data;
+//	struct i2c_monitor_data *monitor_data;
+	struct device *port_dev;
+//	struct device *i2c_dev;
+	int port_nr, i=0, err, max_port_num;
+	char name[I2C_NAME_SIZE], type[I2C_NAME_SIZE];
+
+	printk("cpld cpld_probe\n");
+
+	while(id->name[i])
+	{
+		name[i]=tolower(id->name[i]);
+		i++;
+	}
+	name[i]='\0';
+	strncpy(type,name+5,strlen(name)-5);
+	type[strlen(name)-5]='\0';
+
+	if (!cpld_class)
+	{
+		cpld_class = class_create(THIS_MODULE, "cpld-qsfp28");
+		if (IS_ERR(cpld_class)) {
+			pr_err("couldn't create sysfs class\n");
+			return PTR_ERR(cpld_class);
+		}
+	}
+
+	data = devm_kzalloc(&client->dev, sizeof(struct cpld_data),
+			    GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+    if(!strcmp(client->name, "CPLD-QSFP28")){
+	    max_port_num = 16;
+    }
+    else{
+	    max_port_num = 4;
+    }
+
+	/* register sfp port data to sysfs */
+	for (i = 0; i < max_port_num; i++)
+	{
+		port_nr = ida_simple_get(&cpld_ida, 1, 99, GFP_KERNEL);
+		if (port_nr < 0)
+			goto err_out;
+
+		port_data = kzalloc(sizeof(struct sfp_data), GFP_KERNEL);
+
+		port_dev = device_create(cpld_class, &client->dev, MKDEV(0,0), port_data, CPLD_ID_FORMAT, port_nr);
+		if (IS_ERR(port_dev)) {
+			err = PTR_ERR(port_dev);
+			printk("err_status\n");
+		}
+
+		data->port_dev[i] = port_dev;
+		data->port_data[i] = port_data;
+
+		strcpy(port_data->type, type);
+
+		dev_info(&client->dev, "Register %s port-%d\n", port_data->type , port_nr);
+
+		/* FIXME: implement Logical/Physical port remapping */
+		//port_data->cpld_port = i;
+		port_data->cpld_port = port_remapping(i);
+		sprintf(port_data->name, "port-%d", port_nr);
+		port_data->port_id = port_nr;
+		dev_set_drvdata(port_dev, port_data);
+		port_dev->init_name = port_data->name;
+		port_data->cpld_client = client;
+
+		err = sysfs_create_group(&port_dev->kobj, &sfp_attr_group);
+		// if (status)	printk("err status\n");
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->lock);
+
+	dev_info(&client->dev, "%s device found\n", client->name);
+
+
+	return 0;
+
+err_out:
+	return port_nr;
+}
+
+/* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if 0
+static int idr_has_entry(int id, void *p, void *data)
+{
+	return 1;
+}
+
+static bool cpld_idr_is_empty(struct idr *idp)
+{
+	return !idr_for_each(idp, idr_has_entry, NULL);
+}
+#endif
+
+static int cpld_remove(struct i2c_client *client)
+{
+	struct cpld_data *data = i2c_get_clientdata(client);
+	int i, max_port_num;
+//	int id;
+
+    if(!strcmp(client->name, "CPLD-QSFP28")){
+	    max_port_num = 16;
+    }
+    else{
+	    max_port_num = 4;
+    }
+
+	for (i = (max_port_num - 1); i >= 0; i--)
+	{
+		dev_info(data->port_dev[i], "Remove %s port-%d\n", data->port_data[i]->type , data->port_data[i]->port_id);
+		device_unregister(data->port_dev[i]);
+		ida_simple_remove(&cpld_ida, data->port_data[i]->port_id);
+		kfree(data->port_data[i]);
+	}
+
+	if (ida_is_empty(&cpld_ida))
+	{
+		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
+
+	return 0;
+}
+
+module_i2c_driver(cpld_driver);
+
+MODULE_AUTHOR("Luffy Cheng <luffy.cheng@quantatw.com>");
+MODULE_DESCRIPTION("Quanta Switch QSFP28 CPLD driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld_led.c
new file mode 100644
index 000000000000..d924f51ebc29
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/qci_cpld_led.c
@@ -0,0 +1,284 @@
+/*
+ * A LED CPLD driver for Quanta Switch Platform
+ *
+ * The CPLD is customize by Quanta for decode led bit stream,
+ * This driver modify from Quanta CPLD I/O driver.
+ *
+ * Copyright (C) 2015 Quanta Inc.
+ *
+ * Author: Luffy Cheng <luffy.cheng@quantatw.com>
+ * Author: Roger Chang <Roger.Chang@quantatw.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/log2.h>
+#include <linux/slab.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+
+static DEFINE_IDA(cpld_led_ida);
+
+enum platform_type {
+	IX7 = 0,
+	IX8,
+	IX7_BWDE,
+	IX8A_BWDE,
+	NONE
+};
+
+static struct class *cpld_class = NULL;
+
+struct cpld_data {
+	struct i2c_client *cpld_client;
+	char name[8];
+	u8 cpld_id;
+};
+
+struct cpld_led_data {
+	struct mutex lock;
+	struct device *port_dev;
+	struct cpld_data *cpld_data;
+};
+
+static int cpld_led_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id);
+static int cpld_led_remove(struct i2c_client *client);
+
+static const struct i2c_device_id cpld_led_id[] = {
+	{ "CPLDLED_IX7", IX7 },
+	{ "CPLDLED_IX8", IX8 },
+	{ "CPLDLED_IX7_BWDE", IX7_BWDE },
+	{ "CPLDLED_IX8A_BWDE", IX8A_BWDE },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cpld_led_id);
+
+static struct i2c_driver cpld_led_driver = {
+	.class		= I2C_CLASS_HWMON,
+	.driver = {
+		.name	= "qci_cpld_led",
+	},
+	.probe		= cpld_led_probe,
+	.remove		= cpld_led_remove,
+	.id_table	= cpld_led_id,
+//	.address_list	= normal_i2c,
+};
+
+#define CPLD_LED_ID_PREFIX "CPLDLED-"
+#define CPLD_LED_ID_FORMAT CPLD_LED_ID_PREFIX "%d"
+
+#define	CPLD_DECODER_OFFSET	0x4
+#define	CPLD_DECODER_MASK	0x1
+#define CPLD_USERCODE_START_OFFSET	0x0
+
+static ssize_t get_led_decode(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 offset = (u8)(CPLD_DECODER_OFFSET);
+	s32 value;
+
+	value = i2c_smbus_read_byte_data(client, offset);
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read led decode value= %x\n", value);
+
+	value &= CPLD_DECODER_MASK;
+
+	return sprintf(buf, "%d\n", (value == 0) ? 1 : 0);
+}
+
+static ssize_t get_usercode(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 i = 0;
+	s32 value = 0, reading = 0;
+
+	for (i = 0; i < 4; i++)
+	{
+		reading = i2c_smbus_read_byte_data(client, CPLD_USERCODE_START_OFFSET + i);
+		if (reading < 0)
+			return -ENODEV;
+
+		dev_dbg(&client->dev, "read led usercode reg %d value= %x\n", i, reading);
+
+		value |= reading << (24 - 8 * i);
+	}
+
+	return sprintf(buf, "%X\n", value);
+}
+
+static ssize_t set_led_decode(struct device *dev,
+			    struct device_attribute *devattr,
+			    const char *buf,
+			    size_t count)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	s32 value;
+	long enable;
+
+	if (kstrtol(buf, 0, &enable))
+		return -EINVAL;
+
+	if ((enable != 1) && (enable != 0))
+		return -EINVAL;
+
+//	mutex_lock(&data->lock);
+	value = i2c_smbus_read_byte_data(client, CPLD_DECODER_OFFSET);
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read led decode value= %x\n", value);
+
+	value |= CPLD_DECODER_MASK;
+	if (enable)
+		value &= ~CPLD_DECODER_MASK;
+
+	dev_dbg(&client->dev, "write led decode value= %x\n", value);
+
+	i2c_smbus_write_byte_data(client, CPLD_DECODER_OFFSET, (u8)value);
+//	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static DEVICE_ATTR(led_decode, S_IWUSR | S_IRUGO, get_led_decode, set_led_decode);
+static DEVICE_ATTR(usercode, S_IRUGO, get_usercode, NULL);
+
+static const struct attribute *led_attrs[] = {
+	&dev_attr_usercode.attr,
+	&dev_attr_led_decode.attr,
+	NULL,
+};
+
+static const struct attribute_group led_attr_group = {
+	.attrs = (struct attribute **) led_attrs,
+};
+
+static int cpld_led_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct cpld_led_data *data;
+	struct cpld_data *led_data;
+	struct device *port_dev;
+	int nr, err;
+
+	if (!cpld_class)
+	{
+		cpld_class = class_create(THIS_MODULE, "cpld-led");
+		if (IS_ERR(cpld_class)) {
+			pr_err("couldn't create sysfs class\n");
+			return PTR_ERR(cpld_class);
+		}
+	}
+
+	data = devm_kzalloc(&client->dev, sizeof(struct cpld_led_data),
+			    GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	/* Test */
+	nr = ida_simple_get(&cpld_led_ida, 1, 99, GFP_KERNEL);
+	if (nr < 0)
+		goto err_out;
+
+	led_data = kzalloc(sizeof(struct cpld_led_data), GFP_KERNEL);
+
+	port_dev = device_create(cpld_class, &client->dev, MKDEV(0,0), led_data, CPLD_LED_ID_FORMAT, nr);
+	if (IS_ERR(port_dev)) {
+		err = PTR_ERR(port_dev);
+		// printk("err_status\n");
+	}
+
+	data->port_dev = port_dev;
+	data->cpld_data = led_data;
+
+	dev_info(&client->dev, "Register CPLDLED %d\n", nr);
+
+	sprintf(led_data->name, "LED%d-data", nr);
+	led_data->cpld_id = nr;
+	dev_set_drvdata(port_dev, led_data);
+	port_dev->init_name = led_data->name;
+	led_data->cpld_client = client;
+
+	err = sysfs_create_group(&port_dev->kobj, &led_attr_group);
+	// if (status)	printk("err status\n");
+	/* end */
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->lock);
+
+	dev_info(&client->dev, "%s device found\n", client->name);
+
+
+	return 0;
+
+err_out:
+	return nr;
+}
+
+#if 0
+/* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+static int idr_has_entry(int id, void *p, void *data)
+{
+	return 1;
+}
+
+static bool cpld_idr_is_empty(struct idr *idp)
+{
+	return !idr_for_each(idp, idr_has_entry, NULL);
+}
+#endif
+
+static int cpld_led_remove(struct i2c_client *client)
+{
+	struct cpld_led_data *data = i2c_get_clientdata(client);
+
+	dev_info(data->port_dev, "Remove CPLDLED-%d\n", data->cpld_data->cpld_id);
+	device_unregister(data->port_dev);
+	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
+	kfree(data->cpld_data);
+
+	if (ida_is_empty(&cpld_led_ida))
+	{
+		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
+
+	return 0;
+}
+
+module_i2c_driver(cpld_led_driver);
+
+MODULE_AUTHOR("Luffy Cheng <luffy.cheng@quantatw.com>");
+MODULE_AUTHOR("Roger Chang <Roger.Chang@quantatw.com>");
+MODULE_DESCRIPTION("Quanta Switch LED CPLD driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..08d6a97d9a09
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1908 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg  0
+#define DEBUGUSE_SHIFT    0
+
+#define DRVNAME   "quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)     ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)    (int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)    (int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)  (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)  (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX         19
+#define SENSOR_ATTR_NAME_LENGTH	20
+
+#define SENSOR_GET_CAP_LABEL  0x001
+#define SENSOR_GET_CAP_ALARM  0x002
+#define SENSOR_GET_CAP_INPUT  0x004
+
+#define SENSOR_GET_CAP_LNC    0x008
+#define SENSOR_GET_CAP_LCR    0x010
+#define SENSOR_GET_CAP_LNR    0x020
+
+#define SENSOR_GET_CAP_UNC    0x040
+#define SENSOR_GET_CAP_UCR    0x080
+#define SENSOR_GET_CAP_UNR    0x100
+
+#define SENSOR_GET_CAP_MODEL  0x200
+#define SENSOR_GET_CAP_SN     0x400
+#define SENSOR_GET_CAP_PWM    0x800
+
+#define SENSOR_GET_CAP_CONMODE    0x1000
+#define SENSOR_GET_CAP_DIRECTION  0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT  0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT  0x8000
+
+#define SENSOR_GET_CAP_MFRID    0x10000
+#define SENSOR_GET_CAP_VIN_TYPE	0x20000
+#define SENSOR_GET_CAP_POUT_MAX	0x40000
+
+#define SDR_SENSOR_TYPE_TEMP  0x01
+#define SDR_SENSOR_TYPE_VOLT  0x02
+#define SDR_SENSOR_TYPE_CURR  0x03
+#define SDR_SENSOR_TYPE_FAN   0x04
+#define SDR_SENSOR_TYPE_PS    0x08
+#define SDR_SENSOR_TYPE_OTHER 0x0b
+
+#define BMC_GET_DEVICE_ID   0x01
+
+#define IPMI_NETFN_SE     0x04
+#define IPMI_NETFN_APP      0x06
+#define IPMI_NETFN_STORAGE    0x0a
+#define IPMI_NETFN_TSOL     0x30
+
+#define GET_SDR_REPO_INFO   0x20
+#define GET_DEVICE_SDR      0x21
+#define GET_SDR_RESERVE_REPO  0x22
+#define GET_SDR         0x23
+#define GET_SENSOR_THRESHOLDS 0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS 0x2b
+#define GET_SENSOR_READING    0x2d
+#define GET_PSU_READING     0x52
+#define GET_FAN_INFO      0xd6
+#define GET_FRU_INFO      0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK    (0x80)  /* 1 = provides SDRs      */
+#define IPMI_TIMEOUT      (4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE 1
+
+struct quanta_hwmon_ipmi_data
+{
+  struct platform_device  *ipmi_platform_dev;
+  struct device     *ipmi_hwmon_dev;
+  /*struct mutex      ipmi_lock; */
+
+  int32_t         total_sensor_id;
+  int32_t         total_suport_sensor;
+  int32_t         total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data
+{
+  uint8_t addr;
+  uint8_t sensor_type;
+  uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+  uint32_t capability;
+
+  struct header_info
+  {
+    uint8_t header_type;
+    uint8_t header_byte;
+  } headerinfo;
+
+  struct record_info
+  {
+    uint8_t record_analog;
+    uint8_t record_linearization;
+
+    int32_t record_m;
+    int32_t record_b;
+    int32_t record_k1;
+    int32_t record_k2;
+  } recordinfo;
+
+  struct threshold_upper_info
+  {
+    uint8_t unr;
+    uint8_t ucr;
+    uint8_t unc;
+  } upperinfo;
+
+  struct threshold_lower_info
+  {
+    uint8_t lnr;
+    uint8_t lcr;
+    uint8_t lnc;
+  } lowerinfo;
+
+  struct attr_info
+  {
+    bool attr_exist;
+    char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+    char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+    struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+    struct attribute_group  attr_group;
+    struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+  } attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data
+{
+  int32_t tx_id;
+
+  int32_t rx_result;
+  int64_t rx_len;
+  void *rx_data;
+  struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator
+{
+  uint16_t reservation;
+  int32_t total;
+  int32_t next;
+};
+
+struct ipm_devid_rsp
+{
+  uint8_t device_id;
+  uint8_t device_revision;
+  uint8_t fw_rev1;
+  uint8_t fw_rev2;
+  uint8_t ipmi_version;
+  uint8_t adtl_device_support;
+  uint8_t manufacturer_id[3];
+  uint8_t product_id[2];
+  uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs
+{
+  uint8_t version;  /* SDR version (51h) */
+  uint16_t count;   /* number of records */
+  uint16_t free;    /* free space in SDR */
+  uint32_t add_stamp; /* last add timestamp */
+  uint32_t erase_stamp; /* last del timestamp */
+  uint8_t op_support; /* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs
+{
+  uint8_t count;  /* number of records */
+  uint8_t flags;  /* flags */
+  uint8_t popChangeInd[3];  /* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs
+{
+  uint16_t next;    /* next record id */
+  uint16_t id;    /* record ID */
+  uint8_t version;  /* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR     0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR    0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR  0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC    0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC 0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR  0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR  0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR 0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION   0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO  0x14
+#define SDR_RECORD_TYPE_OEM     0xc0
+  uint8_t type;   /* record type */
+  uint8_t length;   /* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq
+{
+  uint16_t reserve_id;  /* reservation ID */
+  uint16_t id;    /* record ID */
+  uint8_t offset;   /* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD 0xff
+  uint8_t length;   /* length to read */
+} __attribute__((packed));
+
+struct entity_id
+{
+  uint8_t id;     /* physical entity id */
+#ifdef WORDS_BIGENDIAN
+  uint8_t logical : 1;  /* physical/logical */
+  uint8_t instance : 7; /* instance number */
+#else
+  uint8_t instance : 7; /* instance number */
+  uint8_t logical : 1;  /* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask
+{
+  union
+  {
+    struct
+    {
+      uint16_t assert_event;  /* assertion event mask */
+      uint16_t deassert_event;  /* de-assertion event mask */
+      uint16_t read;  /* discrete reading mask */
+    } discrete;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved : 1;
+      uint16_t status_lnr : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnc : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lnc_low : 1;
+#else
+      uint16_t assert_lnc_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t status_lnc : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnr : 1;
+      uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved_2 : 1;
+      uint16_t status_unr : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unc : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lnc_low : 1;
+#else
+      uint16_t deassert_lnc_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t status_unc : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unr : 1;
+      uint16_t reserved_2 : 1;
+#endif
+      union
+      {
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* settable threshold mask */
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+          /* padding lower 8 bits */
+          uint16_t readable : 8;
+#else
+          uint16_t readable : 8;
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+#endif
+        } set;
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* readable threshold mask */
+          /* padding upper 8 bits */
+          uint16_t settable : 8;
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+#else
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+          uint16_t settable : 8;
+#endif
+        } read;
+      };
+    } threshold;
+  } type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor
+{
+  struct
+  {
+    uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+    uint8_t channel : 4;  /* channel number */
+    uint8_t __reserved : 2;
+    uint8_t lun : 2;  /* sensor owner lun */
+#else
+    uint8_t lun : 2;  /* sensor owner lun */
+    uint8_t __reserved : 2;
+    uint8_t channel : 4;  /* channel number */
+#endif
+    uint8_t sensor_num; /* unique sensor number */
+  } keys;
+
+  struct entity_id entity;
+
+  struct
+  {
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t __reserved : 1;
+      uint8_t scanning : 1;
+      uint8_t events : 1;
+      uint8_t thresholds : 1;
+      uint8_t hysteresis : 1;
+      uint8_t type : 1;
+      uint8_t event_gen : 1;
+      uint8_t sensor_scan : 1;
+#else
+      uint8_t sensor_scan : 1;
+      uint8_t event_gen : 1;
+      uint8_t type : 1;
+      uint8_t hysteresis : 1;
+      uint8_t thresholds : 1;
+      uint8_t events : 1;
+      uint8_t scanning : 1;
+      uint8_t __reserved : 1;
+#endif
+    } init;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t ignore : 1;
+      uint8_t rearm : 1;
+      uint8_t hysteresis : 2;
+      uint8_t threshold : 2;
+      uint8_t event_msg : 2;
+#else
+      uint8_t event_msg : 2;
+      uint8_t threshold : 2;
+      uint8_t hysteresis : 2;
+      uint8_t rearm : 1;
+      uint8_t ignore : 1;
+#endif
+    } capabilities;
+    uint8_t type;
+  } sensor;
+
+  uint8_t event_type; /* event/reading type code */
+
+  struct sdr_record_mask mask;
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t analog : 2;
+    uint8_t rate : 3;
+    uint8_t modifier : 2;
+    uint8_t pct : 1;
+#else
+    uint8_t pct : 1;
+    uint8_t modifier : 2;
+    uint8_t rate : 3;
+    uint8_t analog : 2;
+#endif
+    struct
+    {
+      uint8_t base;
+      uint8_t modifier;
+    } type;
+  } unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+  uint8_t linearization;  /* 70h=non linear, 71h-7Fh=non linear, OEM */
+  uint16_t mtol;    /* M, tolerance */
+  uint32_t bacc;    /* accuracy, B, Bexp, Rexp */
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t __reserved : 5;
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+#else
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t __reserved : 5;
+#endif
+  } analog_flag;
+
+  uint8_t nominal_read; /* nominal reading, raw value */
+  uint8_t normal_max; /* normal maximum, raw value */
+  uint8_t normal_min; /* normal minimum, raw value */
+  uint8_t sensor_max; /* sensor maximum, raw value */
+  uint8_t sensor_min; /* sensor minimum, raw value */
+
+  struct
+  {
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } upper;
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } lower;
+    struct
+    {
+      uint8_t positive;
+      uint8_t negative;
+    } hysteresis;
+  } threshold;
+  uint8_t __reserved[2];
+  uint8_t oem;    /* reserved for OEM use */
+  uint8_t id_code;  /* sensor ID string type/length code */
+  uint8_t id_string[16];  /* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+  /* function input parameter (a * 10 ^ b) */
+  int32_t i = 0, r = 1, temp_b = 0;
+
+  temp_b = (b > 0) ? b : -b;
+
+  for (i = 0; i < temp_b; i++)
+  {
+    r = r * 10;
+  }
+
+  if (b > 0)
+  {
+    *a = (*a) * r;
+    r = 1;
+  }
+  /* function return parameter calc_result = *a, decimal_point = r */
+  return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+  while (*buf >= '0' && *buf <= '9')
+  {
+    *output_val = *output_val * 10 + *buf - '0';
+    buf++;
+  }
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+  int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+  struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+  ipmi_wait_queue--;
+
+  if (msg->msg.data[0] != 0)
+  {
+    if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07)
+        && (msg->msg.cmd != 0x52))
+    {
+      /*skip master r/w cmd return code */
+      printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn,
+             msg->msg.cmd);
+      rv = msg->msg.data[0];
+      goto get_BMC_response_fail;
+    }
+  }
+
+  if (msg->msgid != comm_data->tx_id)
+  {
+    printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid,
+           comm_data->tx_id);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len <= 0)
+  {
+    printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len > 1)
+  {
+    if (comm_data->rx_len)
+    {
+      comm_data->rx_len = msg->msg.data_len - 1;
+      memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+    }
+    else
+    {
+      printk("ipmi: rx len = 0, it should be not retrun ?\n");
+      goto get_BMC_response_fail;
+    }
+  }
+
+  rv = 0;
+
+get_BMC_response_fail:
+  ipmi_free_recv_msg(msg);
+
+  if (ipmi_wait_queue == 0)
+  {
+    comm_data->rx_result = rv;
+    if (rv == 0)
+    {
+      complete(comm_data->rx_read_complete);
+    }
+  }
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg,
+                                       struct ipmi_comm_data *comm_data)
+{
+  int32_t rv = 0;
+  int32_t escape_time = 0;
+
+  struct ipmi_addr ipmi_address;
+
+  if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE)
+  {
+    /* printk("msg queue full, cannot send ipmi cmd\n"); */
+    return -EBUSY;
+  }
+  ipmi_wait_queue++;
+
+  ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+  ipmi_address.channel = IPMI_BMC_CHANNEL;
+  ipmi_address.data[0] = 0;
+
+  rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+  if (rv)
+  {
+    printk("ipmi_validate_addr fail, err code : %d\n", rv);
+    return rv;
+  }
+
+  ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg,
+                       comm_data, 0, 0, 0);
+
+  escape_time = wait_for_completion_timeout(comm_data->rx_read_complete,
+                                            IPMI_TIMEOUT);
+
+  rv = comm_data->rx_result;
+  if (escape_time == 0)
+  {
+    printk("BMC not response (%d)\n", escape_time);
+  }
+
+  return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len,
+                             void *msg_rx_data, int32_t msg_rx_len)
+{
+  int32_t i = 0;
+  int32_t rv = 0;
+
+  static uint64_t tx_msgid = 1;
+
+  struct kernel_ipmi_msg msg;
+  struct ipmi_comm_data *comm_data = NULL;
+  struct completion read_complete;
+
+  init_completion(&read_complete);
+
+  /* prepare transfer message */
+  msg.netfn = msg_tx_data[0];
+  msg.cmd = msg_tx_data[1];
+  msg.data_len = msg_tx_len - 2;
+
+  msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+  if (msg.data == NULL)
+  {
+    printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+  if (comm_data == NULL)
+  {
+    printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  for (i = 2; i < msg_tx_len; i++)
+  {
+    msg.data[i - 2] = msg_tx_data[i];
+  }
+
+  comm_data->tx_id = tx_msgid++;
+
+  /* prepare recive message */
+  comm_data->rx_data = msg_rx_data;
+  comm_data->rx_len = msg_rx_len;
+  comm_data->rx_result = -1;
+  comm_data->rx_read_complete = &read_complete;
+
+  rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+  if (msg.data)
+  {
+    kfree(msg.data);
+  }
+  if (comm_data)
+  {
+    kfree(comm_data);
+  }
+  if (tx_msgid > UINT_MAX)
+  {
+    tx_msgid = 1;
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t *reserve_id)
+{
+  int32_t rv = 0;
+  uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; /*netfn = 0x00; cmd = GET_SDR_RESERVE_REPO; */
+
+  msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+  /* obtain reservation ID */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+
+#if enable_debug_msg
+  printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; /*netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID; */
+
+  struct ipm_devid_rsp devid;
+
+  /* check SDRR capability */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return rv;
+  }
+
+  if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK)
+  {
+    if ((devid.adtl_device_support & 0x02) == 0)
+    {
+      if ((devid.adtl_device_support & 0x01))
+      {
+        printk("Using Device SDRs\n");
+        g_use_built_in = 1;
+      }
+      else
+      {
+        printk("Error obtaining SDR info\n");
+      }
+    }
+  }
+
+  if (g_use_built_in == 0)
+  {
+    struct sdr_repo_info_rs sdr_info;
+    /* get sdr repository info */
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+
+#if enable_debug_msg
+    printk("SDR version: 0x%x\n", sdr_info.version);
+    printk("SDR free space: %d\n", sdr_info.free);
+#endif
+  }
+  else
+  {
+    struct sdr_device_info_rs sdr_info;
+    /* get device sdr info */
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+  }
+
+#if enable_debug_msg
+  printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+  else
+  {
+    itr->next = 0;
+    rv = ipmi_sdr_get_reservation(&(itr->reservation));
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr,
+                            struct sdr_get_rs *sdr_rs)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  sdr_rq.reserve_id = itr->reservation;
+  sdr_rq.id = itr->next;
+  sdr_rq.offset = 0;
+  sdr_rq.length = 5;  /* only get the header */
+
+  if (g_use_built_in == 0)
+  {
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR;
+  }
+  else
+  {
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_DEVICE_SDR;
+  }
+
+  memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+  if ((rv) || (sdr_rs->length == 0))
+  {
+    printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+    return -1;
+  }
+
+  if (sdr_rs->id != itr->next)
+  {
+#if enable_debug_msg
+    printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+    sdr_rs->id = itr->next;
+  }
+#if enable_debug_msg
+  printk("\nSDR record ID   : 0x%04x", itr->next);
+  printk("SDR record type : 0x%02x\n", sdr_rs->type);
+  printk("SDR record next : 0x%04x\n", sdr_rs->next);
+  printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs *header,
+                            struct ipmi_sdr_iterator  *itr, uint8_t *ret_data)
+{
+  int32_t rv = 0, len = 0;
+
+  uint8_t buff[128] = "";
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  len = header->length;
+  if (len > 0)
+  {
+    memset(&sdr_rq, 0, sizeof(sdr_rq));
+    sdr_rq.reserve_id = itr->reservation;
+    sdr_rq.id = header->id;
+    sdr_rq.offset = 5;
+    sdr_rq.length = len;
+
+    if (g_use_built_in == 0)
+    {
+      msg_data[0] = IPMI_NETFN_STORAGE;
+      msg_data[1] = GET_SDR;
+    }
+    else
+    {
+      msg_data[0] = IPMI_NETFN_SE;
+      msg_data[1] = GET_DEVICE_SDR;
+    }
+
+    memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      memset(buff, 0, sizeof(buff));
+      memcpy(buff, ret_data + 2, sdr_rq.length);
+      memcpy(ret_data, buff, sdr_rq.length + 2);
+    }
+  }
+
+  return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx,
+                                   struct sdr_record_full_sensor *sensor)
+{
+
+  /* lower threshold info */
+  if (sensor->mask.type.threshold.read.lnc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+  }
+  if (sensor->mask.type.threshold.read.lcr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+  }
+  if (sensor->mask.type.threshold.read.lnr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+  }
+  g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+  g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+  g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+  /* upper threshold info */
+  if (sensor->mask.type.threshold.read.unc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+  }
+  if (sensor->mask.type.threshold.read.ucr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+  }
+  if (sensor->mask.type.threshold.read.unr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+  }
+  g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+  g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+  g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx,
+                                struct sdr_record_full_sensor *sensor)
+{
+  char *loc = NULL;
+
+  g_sensor_data[idx].sensor_type = sensor->sensor.type;
+  sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+  g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+  g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+  g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+  g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+  memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00,
+         SENSOR_ATTR_NAME_LENGTH);
+
+  switch (g_sensor_data[idx].sensor_type)
+  {
+    case SDR_SENSOR_TYPE_TEMP:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+      break;
+    case SDR_SENSOR_TYPE_VOLT:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      break;
+    case SDR_SENSOR_TYPE_FAN:
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+      break;
+    case SDR_SENSOR_TYPE_PS:
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+      if (loc)
+      {
+        if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0)
+        {
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_VIN_TYPE;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_POUT_MAX;
+        }
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      }
+
+      break;
+    case SDR_SENSOR_TYPE_CURR:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      break;
+    case SDR_SENSOR_TYPE_OTHER:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+      break;
+    default:
+      printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+      break;
+  }
+
+  if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+  }
+
+#if enable_debug_msg
+  {
+    printk("\n********************\n");
+
+    printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m,
+           g_sensor_data[idx].recordinfo.record_b
+           , g_sensor_data[idx].recordinfo.record_k1,
+           g_sensor_data[idx].recordinfo.record_k2);
+
+    printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n",
+           g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+           , g_sensor_data[idx].recordinfo.record_analog,
+           g_sensor_data[idx].recordinfo.record_linearization);
+
+    printk("\n********************\n");
+  }
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val,
+                                   int32_t *point_result)
+{
+  int32_t m = g_sensor_data[idx].recordinfo.record_m;
+  int32_t b = g_sensor_data[idx].recordinfo.record_b;
+  int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+  int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+  int32_t decimal_point = 0;
+  int32_t result = 0;
+
+  decimal_point = pow_convert(&b, k1);
+
+  switch (g_sensor_data[idx].recordinfo.record_analog)
+  {
+    case 0:
+      result = m * val * decimal_point + b;
+      break;
+    case 1:
+      if (val & 0x80)
+      {
+        val++;
+      }
+    case 2:
+      result = (m * (int16_t)val) * decimal_point + b;
+      break;
+    default:
+      return result;
+  }
+
+  pow_convert(&result, k2);
+  if (k1 < 0)
+  {
+    *point_result += -k1;
+  }
+  if (k2 < 0)
+  {
+    *point_result += -k2;
+  }
+
+  if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN)
+  {
+    result = result * 1000; /*shift for lm-sensors */
+  }
+
+  return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value,
+                               int8_t *ret_str)
+{
+  int32_t calc_result = 0, point_result = 0;
+  int32_t temp_len = 0;
+
+  uint8_t temp_str[16] = "";
+
+  calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+  temp_len = sprintf(temp_str, "%d", calc_result);
+  temp_len = temp_len - point_result;
+
+  /* int part */
+  if (temp_len <= 0)
+  {
+    sprintf(ret_str, "0");
+  }
+  else
+  {
+    snprintf(ret_str, temp_len + 1, "%s",
+             temp_str);  /* +1 for snprintf reserve space'\0' */
+  }
+
+  /* point part */
+  strcat(ret_str, ".");
+
+  /* float part */
+  if ((point_result == 0) || (temp_len < 0))
+  {
+    strcat(ret_str, "0");
+  }
+  else
+  {
+    strcat(ret_str, temp_str + temp_len);
+  }
+
+  /* EOL part */
+  strcat(ret_str, "\n\0");
+
+  return (temp_len + 1 + point_result +
+          2); /*integer + point + float + EOL + \0 */
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+  uint8_t slot_mask = 0x0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; /*netfn = 0x36; cmd = 0xB9; */
+  /*uint8_t msg_data[] = { 0x06, 0x52, 0x1B, 0x4C, 0x01, 0x00 }; //netfn = IPMI_NETFN_APP; cmd = GET_PSU_READING; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return 0;
+  }
+  else
+  {
+    slot_mask = (psu_slot == 1) ? 0x01 : 0x02;
+    return (returnData[0] & slot_mask) ? 0 : 1;
+  }
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+  uint8_t psu_slot = 0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xBB, 0x4C, 0x1C, 0x00, cmd, 0x00 }; /*netfn = 0x36; cmd = 0xBB; */
+
+  if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))
+  {
+    psu_slot = 1;
+  }
+  else
+  {
+    psu_slot = 2;
+  }
+
+  if (ipmi_check_psu_present(psu_slot))
+  {
+    msg_data[6] = psu_slot;
+    mutex_lock(&ipmi_lock);
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+    mutex_unlock(&ipmi_lock);
+
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      return sprintf(retbuf, "%s\n", returnData);
+    }
+  }
+  else
+  {
+    /*printk("Error ! cannot detect PSU%d\n", psu_slot); */
+  }
+
+  return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_vin_type(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData = 0;
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x01, 0xd8 }; // read line status
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			switch (returnData)
+			{
+				case 0x7: //LVDC
+				case 0x3: //HVDC
+					return sprintf(retbuf, "DC\n");
+				default:
+					return sprintf(retbuf, "AC\n");
+			}
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_pout_max(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0, pout_max = 0;
+
+	uint8_t returnData[2] = { 0 };
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x02, 0xa7 };
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			/* MFR_POUT_MAX has 2 data format: Direct and Linear Data (see PMbus spec).
+			   Query command is needed to tell the data format, but since we have not use PSU
+			   whose output power is over 0x07ff (2047), just check the first 5 bits*/
+			if ((returnData[1] & 0xf8) == 0) // Direct
+				pout_max = (returnData[1] << 8) | returnData[0];
+			else // Linear Data
+				pout_max = (((returnData[1] & 0x07) << 8) | returnData[0]) << ((returnData[1] & 0xf8) >> 3);
+			return sprintf(retbuf, "%d\n", pout_max);
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; /*netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  if (cmd_data1)
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+  }
+  else
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  }
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    sprintf(retbuf, "N/A\n");
+  }
+  else
+  {
+    sprintf(retbuf, "%s", returnData);
+  }
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%s\n",
+                 g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  int32_t rv = 0;
+
+  uint8_t returnData[4] = "";
+  uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; /*netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING; */
+
+  mutex_lock(&ipmi_lock);
+  msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "0.0\n");
+  }
+  else
+  {
+    return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+  }
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_vin_type(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_vin_type(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pout_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_pout_max(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  uint8_t returnData[10] = { 0 };
+  ipmi_fan_control(0x00, 0x00, returnData);
+  return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  if (g_fan_control_mode == 1)
+  {
+    ipmi_fan_control(0x01, store_input, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_controlmode(struct device *dev,
+                                struct device_attribute *devattr, char *buf)
+{
+  return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev,
+                                 struct device_attribute *devattr, const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  g_fan_control_mode = store_input;
+  if (g_fan_control_mode == 3)
+  {
+    ipmi_fan_control(0x7f, 0xff, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_direction(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; /*netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "N/A\n");
+  }
+  else
+  {
+    return sprintf(buf, "%c\n", returnData[1]);
+  }
+}
+
+static ssize_t show_fanpresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+  int32_t fan_idx = 0, fan_present = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; /*netfn = 0x36; cmd = 0xB9; */
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+  return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t psu_idx = 0;
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+  return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                           struct device_attribute *devattr, char *buf) =
+{
+  show_label, show_crit_alarm, show_input
+  , show_lnc, show_lcr, show_lnr
+  , show_unc, show_ucr, show_unr
+  , show_model, show_sn, show_pwm
+  , show_controlmode, show_direction, show_fanpresent
+  , show_psupresent, show_mfrid, show_vin_type
+  , show_pout_max
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                            struct device_attribute *devattr, const char *buf, size_t count) =
+{
+  NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, store_pwm
+  , store_controlmode, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+  "%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+  , "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+  , "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+  , "%s%d_model", "%s%d_sn", "%s%d_pwm"
+  , "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+  , "%s%d_present", "%s%d_mfrid", "%s%d_vin_type"
+  , "%s%d_pout_max"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+  int32_t i = 0, j = 0;
+
+  struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+  printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+  for (i = 0; i < SENSOR_ATTR_MAX; i++)
+  {
+    if ((g_sensor_data[attr_no].capability >> i) & 0x01)
+    {
+      snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i],
+               attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+      sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+      attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+      attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+      attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+      attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+      if (attrdata->sd_attrs[j].dev_attr.store)
+      {
+        attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+      }
+
+      attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+      attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+      j++;
+
+      data->total_create_sysfs++;
+    }
+  }
+
+  attrdata->attrs[j] = NULL;
+  attrdata->attr_group.attrs = attrdata->attrs;
+
+  g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+  return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+  int32_t i = 0;
+
+  for (i = 0; i < data->total_sensor_id; i++)
+  {
+    if (g_sensor_data[i].attrinfo.attr_exist)
+    {
+      sysfs_remove_group(&data->ipmi_hwmon_dev->kobj,
+                         &g_sensor_data[i].attrinfo.attr_group);
+    }
+  }
+  return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+  int32_t sdr_idx = 0;
+  int32_t err = 0;
+
+  struct ipmi_sdr_iterator *itr = NULL;
+  struct sdr_get_rs *header = NULL;
+
+  uint8_t *rec = NULL;
+
+  mutex_lock(&ipmi_lock);
+
+  itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+  if (itr == NULL)
+  {
+    printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+    goto itr_malloc_fail;
+  }
+
+  header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+  if (header == NULL)
+  {
+    printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+    goto header_malloc_fail;
+  }
+
+  err = ipmi_sdr_start(itr);
+  if (err)
+  {
+    printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+    goto ipmi_sdr_start_fail;
+  }
+
+  data->total_sensor_id = itr->total;
+  rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+  if (rec == NULL)
+  {
+    printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+    goto rec_malloc_fail;
+  }
+
+  g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data),
+                          GFP_KERNEL);
+  if (g_sensor_data == NULL)
+  {
+    printk("%s(%d): malloc failure", __func__, __LINE__);
+    goto g_sensor_data_malloc_fail;
+  }
+
+  memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+  for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++)
+  {
+    err = ipmi_sdr_get_header(itr, header);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_header_fail;
+    }
+
+
+    memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+    err = ipmi_sdr_get_record(header, itr, rec);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_record_fail;
+    }
+
+    itr->next = header->next;
+
+    switch (header->type)
+    {
+      case SDR_RECORD_TYPE_FULL_SENSOR:
+        /* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+        g_sensor_data[sdr_idx].addr = rec[2];
+        g_sensor_data[sdr_idx].capability =
+          SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+        g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+        g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+        ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor *) rec);
+        ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor *) rec);
+
+        if (sdr_idx >= DEBUGUSE_SHIFT)
+        {
+          err = create_sensor_attrs(sdr_idx);
+          if (err)
+          {
+            g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+            printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx,
+                   g_sensor_data[sdr_idx].sensor_idstring);
+            goto create_sysfs_fail;
+          }
+        }
+
+        data->total_suport_sensor++;
+
+        break;
+      case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+      default:
+        g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+        printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+        break;
+    }
+  }
+
+  printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n",
+         data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+  if (header)
+  {
+    kfree(header);
+    header = NULL;
+  }
+  if (rec)
+  {
+    kfree(rec);
+    rec = NULL;
+  }
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+  if (itr)
+  {
+    kfree(itr);
+    itr = NULL;
+  }
+
+itr_malloc_fail:
+  mutex_unlock(&ipmi_lock);
+
+  return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+  int32_t err = 0;
+
+  init_completion(&g_read_complete);
+
+  data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+  if (NULL == data)
+  {
+    printk("alloc data fail\n");
+    goto alloc_err;
+  }
+
+  data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+  err = IS_ERR(data->ipmi_platform_dev);
+  if (err)
+  {
+    printk("platform device register fail (err : %d)\n", err);
+    goto device_reg_err;
+  }
+
+  data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL,
+                                                           NULL);
+  err = IS_ERR(data->ipmi_hwmon_dev);
+  if (err)
+  {
+    printk("hwmon register fail\n");
+    goto hwmon_register_err;
+  }
+
+  err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+  if (err)
+  {
+    printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+    goto ipmi_create_err;
+  }
+
+  mutex_init(&ipmi_lock);
+  err = ipmi_init_sdr_sensors_data();
+  if (err)
+  {
+    printk("init sensor data fail (err : %d)\n", err);
+    goto init_sensor_err;
+  }
+
+  return 0;
+
+init_sensor_err:
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+ipmi_create_err:
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+  platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+alloc_err:
+  return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{
+  remove_sensor_attrs();
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+
+  mutex_lock(&ipmi_lock);
+  ipmi_destroy_user(ipmi_mh_user);
+  mutex_unlock(&ipmi_lock);
+
+  platform_device_unregister(data->ipmi_platform_dev);
+
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_platform_ix7_bwde.c b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_platform_ix7_bwde.c
new file mode 100644
index 000000000000..4658cee28583
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/modules/quanta_platform_ix7_bwde.c
@@ -0,0 +1,303 @@
+/*
+ *  Quanta IX7-bwde platform driver
+ *
+ *
+ *  Copyright (C) 2014 Quanta Computer inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/err.h>
+#include <linux/proc_fs.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
+#include <linux/input-polldev.h>
+#include <linux/rfkill.h>
+#include <linux/slab.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
+#include <linux/i2c/pca953x.h>
+#else
+#include <linux/platform_data/pca953x.h>
+#endif
+
+//MB Board Data
+static struct pca953x_platform_data pca9555_1_data = {
+	.gpio_base = 0x10,
+};
+//CPU Board pca9555
+static struct pca953x_platform_data pca9555_CPU_data = {
+	.gpio_base = 0x20,
+};
+
+static struct i2c_board_info ix7_bwde_i2c_devices[] = {
+	{
+		I2C_BOARD_INFO("pca9546", 0x72),		// 0
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x77),		// 1
+	},
+	{
+		I2C_BOARD_INFO("24c02", 0x54),			// 2 0x72 ch2 eeprom
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),		// 3 0x77 ch0
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),		// 4 0x77 ch1
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),		// 5 0x77 ch2
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),		// 6 0x77 ch3
+	},
+	{
+		I2C_BOARD_INFO("pca9555", 0x23),		// 7 0x72 ch3 pca9555 MB Board Data
+		.platform_data = &pca9555_1_data,
+	},
+	{
+		I2C_BOARD_INFO("CPLD-QSFP28", 0x38),	// 8 0x72 ch0
+	},
+	{
+		I2C_BOARD_INFO("CPLD-QSFP28", 0x38),	// 9 0x72 ch1
+	},
+	{
+		I2C_BOARD_INFO("pca9555", 0x22),		// 10 0x71 ch0 CPU Board Data
+		.platform_data = &pca9555_CPU_data,
+	},
+	{
+		I2C_BOARD_INFO("optoe1", 0x50),          // 11 0x50 QSFP EEPROM
+	},
+	{
+		I2C_BOARD_INFO("CPLDLED_IX7_BWDE", 0x39),	// 12 0x72 ch0 CPLD_led_1
+	},
+	{
+		I2C_BOARD_INFO("CPLDLED_IX7_BWDE", 0x39),	// 13 0x72 ch1 CPLD_led_1
+	},
+};
+
+static struct platform_driver ix7_bwde_platform_driver = {
+	.driver = {
+		.name = "qci-ix7-bwde",
+		.owner = THIS_MODULE,
+	},
+};
+
+static struct platform_device *ix7_bwde_device;
+
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 13; // num of ix7_bwde_i2c_devices - 1 (for optoe1)
+int numof_ports = 32;
+
+static int __init ix7_bwde_platform_init(void)
+{
+	struct i2c_adapter *adapter;
+	int ret, i;
+
+	ret = platform_driver_register(&ix7_bwde_platform_driver);
+	if (ret < 0)
+		return ret;
+
+	/* Register platform stuff */
+	ix7_bwde_device = platform_device_alloc("qci-ix7_bwde", -1);
+	if (!ix7_bwde_device) {
+		ret = -ENOMEM;
+		goto fail_platform_driver;
+	}
+
+	ret = platform_device_add(ix7_bwde_device);
+	if (ret)
+		goto fail_platform_device;
+
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
+	adapter = i2c_get_adapter(0);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[0]);		// pca9546
+		g_client[1] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[1]);		// pca9548
+		g_client[2] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[10]);	// CPU Board Data
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x01);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[8]);		// CPLD2
+		g_client[4] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[12]);		// CPLD_led_1
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x02);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[5] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[9]);		// CPLD3
+		g_client[6] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[13]);		// CPLD_led_2
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x03);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[7] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x04);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[8] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[7]);		// pca9555 MB Board Data
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x05);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[9] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[3]);		// pca9548_1 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x06);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[10] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[4]);		// pca9548_2 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x07);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[11] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[5]);		// pca9548_3 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x08);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[6]);		// pca9548_4 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	for(i = 13; i < 45; i ++){									// QSFP 1~32 EEPROM
+		adapter = i2c_get_adapter(i);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			g_client_port[i - 13] = i2c_new_device(adapter, &ix7_bwde_i2c_devices[11]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
+	return 0;
+
+fail_platform_device:
+	platform_device_put(ix7_bwde_device);
+
+fail_platform_driver:
+	platform_driver_unregister(&ix7_bwde_platform_driver);
+	return ret;
+}
+
+static void __exit ix7_bwde_platform_exit(void)
+{
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
+	platform_device_unregister(ix7_bwde_device);
+	platform_driver_unregister(&ix7_bwde_platform_driver);
+}
+
+module_init(ix7_bwde_platform_init);
+module_exit(ix7_bwde_platform_exit);
+
+
+MODULE_AUTHOR("Robert Hong <robert.hong@qct.io>");
+MODULE_VERSION("1.0");
+MODULE_DESCRIPTION("Quanta IX7-bwde Platform Driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/service/ix7-bwde-platform-init.service b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/service/ix7-bwde-platform-init.service
new file mode 100644
index 000000000000..e1067d45c5b0
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/service/ix7-bwde-platform-init.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Quanta IX7-BWDE-32X Platform initialization service
+Before=pmon.service
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/quanta_ix7_bwde_util.py install
+ExecStop=/usr/local/bin/quanta_ix7_bwde_util.py clean
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/setup.py
new file mode 100644
index 000000000000..fa6203d436ff
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/setup.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+   name='ix7_bwde_32x',
+   version='1.0',
+   description='Module to initialize Quanta IX7-BWDE-32X platforms',
+   
+   packages=['ix7_bwde_32x'],
+   package_dir={'ix7_bwde_32x': 'ix7-bwde-32x/classes'},
+)
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..4bfefa0fb636
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..92a8c433ce80
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/chassis.py
@@ -0,0 +1,210 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus     = 2
+        self.__num_of_ports    = 32
+        self.__num_of_sfps     = 0
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 18
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            if index in range(1, self.__num_of_sfps + 1):
+                sfp = Sfp(index, 'SFP')
+            else:
+                sfp = Sfp(index, 'QSFP')
+
+            self._sfp_list.append(sfp)
+
+        for index in range(1, self.__num_of_ports + 1):
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..d154a8a0c4a0
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/eeprom.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo    
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan.py
new file mode 100644
index 000000000000..5567eaff9395
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta IX7
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+FAN_INDEX_START = 18
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:37,
+            2:47,
+        }
+        self.psu_index_mapping = {
+            1:39,
+            2:49,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)//FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR' and attr_rv != '0.0'):
+            return True
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/platform.py
new file mode 100644
index 000000000000..c4f945277f4d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/psu.py
new file mode 100644
index 000000000000..3fcb9e979ab5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/psu.py
@@ -0,0 +1,320 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:39,
+            2:49,
+        }
+        self.psu_powerin_index_mapping = {
+            1:38,
+            2:48,
+        }
+        self.psu_currentout_index_mapping = {
+            1:36,
+            2:46,
+        }
+        self.psu_currentin_index_mapping = {
+            1:35,
+            2:45,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:44,
+            2:54,
+        }
+        self.psu_voltagein_index_mapping = {
+            1:43,
+            2:53,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+        self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
+        self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
+        self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_mfr_id(self):
+        """
+        Retrieves the manufacturer's name (or id) of the device
+
+        Returns:
+            string: Manufacturer's id of device
+        """
+        mfr_id = "N/A"
+        attr_path = HWMON_DIR+self.psu_mfr_id_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            mfr_id = attr_rv
+
+        return mfr_id
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_in = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_in = float(attr_rv) / 1000
+
+        return voltage_in
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_in = 0.0
+        attr_path = HWMON_DIR+self.psu_current_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_in = float(attr_rv) / 1000
+
+        return current_in
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_type(self):
+        """
+        Gets the type of the PSU
+
+        Returns:
+            A string, the type of PSU (AC/DC)
+        """
+        type = "AC"
+        attr_path = HWMON_DIR+self.psu_type_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            type = attr_rv
+
+        return type
+
+    def get_capacity(self):
+        """
+        Gets the capacity (maximum output power) of the PSU in watts
+
+        Returns:
+            An integer, the capacity of PSU
+        """
+        capacity = 0
+        attr_path = HWMON_DIR+self.psu_capacity_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            try:
+                capacity = int(attr_rv)
+            except ValueError:
+                capacity = 0
+
+        return capacity
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..d06ae5cabed7
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/sfp.py
@@ -0,0 +1,1596 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+#import subprocess
+#import sonic_device_util
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+#     from sonic_platform_base.sonic_eeprom import eeprom_dts
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 1
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_MODULE_THRESHOLD_OFFSET = 512
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 560
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 32
+    QSFP_START = 1
+    QSFP_END = 32
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix7_bwde-r0"
+    HWSKU  = "Quanta-IX7-BWDE-32X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        self.lpmode_path = "/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/lpmode"
+        self.reset_path = "/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/reset"
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 13,
+             2 : 14,
+             3 : 15,
+             4 : 16,
+             5 : 17,
+             6 : 18,
+             7 : 19,
+             8 : 20,
+             9 : 21,
+            10 : 22,
+            11 : 23,
+            12 : 24,
+            13 : 25,
+            14 : 26,
+            15 : 27,
+            16 : 28,
+            17 : 29,
+            18 : 30,
+            19 : 31,
+            20 : 32,
+            21 : 33,
+            22 : 34,
+            23 : 35,
+            24 : 36,
+            25 : 37,
+            26 : 38,
+            27 : 39,
+            28 : 40,
+            29 : 41,
+            30 : 42,
+            31 : 43,
+            32 : 44
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+            'application_advertisement', 'vendor_oui']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
+            'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+            'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+            'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning',
+            'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning',
+            'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+            'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm',
+            'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+            'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/module_present")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        reg_file.close()
+        if reg_value == '1':
+            return True
+
+        return False
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability = int(qsfp_dom_capability_raw[0], 16)
+
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_OFFSET)
+                if qsfp_version_compliance_raw is not None:
+                    qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                else:
+                    self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                    return
+
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = (qsfp_dom_capability & 0x20 != 0)
+                    self.dom_volt_supported = (qsfp_dom_capability & 0x10 != 0)
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = (qsfp_dom_capability & 0x04 != 0)
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                self.dom_tx_disable_supported = True
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+         """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = QSFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = SFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+        else:
+            return transceiver_info_dict
+
+        # Add retry for xcvr eeprom to get ready
+        max_retry = 10
+        for i in range(0,max_retry):
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is not None:
+                break
+            else:
+                if not self.get_presence():
+                    return transceiver_info_dict
+                elif i == max_retry-1:
+                    pass
+                else:
+                    time.sleep(0.5)
+
+        if sfp_interface_bulk_raw is None:
+                return transceiver_info_dict
+
+        start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + interface_info_bulk_width
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_NAME_WIDTH
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_PN_WIDTH
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + vendor_rev_width
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_SN_WIDTH
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_OUI_WIDTH
+        sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_DATE_WIDTH
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+        transceiver_info_dict['type'] = sfp_interface_bulk_data \
+            ['data']['type']['value']
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+            ['data']['Vendor Name']['value']
+        transceiver_info_dict['model'] = sfp_vendor_pn_data \
+            ['data']['Vendor PN']['value']
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+            ['data']['Vendor Rev']['value']
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+            ['data']['Vendor SN']['value']
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+            ['data']['Vendor OUI']['value']
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+            ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+            ['data']['Connector']['value']
+        transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+            ['data']['EncodingCodes']['value']
+        transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+            ['data']['Extended Identifier']['value']
+        transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+            ['data']['RateIdentifier']['value']
+        transceiver_info_dict['type_abbrv_name'] = 'N/A'
+        if self.sfp_type == QSFP_TYPE:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['Nominal Bit Rate(100Mbs)']['value'])
+        else:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qsfp_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+            if not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+        else:
+            return None
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disable_channel'] = self.get_tx_disable_channel()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict_keys = ['temphighalarm',    'temphighwarning',    'templowalarm',    'templowwarning',
+                                                        'vcchighalarm',     'vcchighwarning',     'vcclowalarm',     'vcclowwarning',
+                                                        'rxpowerhighalarm', 'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning',
+                                                        'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+                                                        'txbiashighalarm',  'txbiashighwarning',  'txbiaslowalarm',  'txbiaslowwarning']
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 0
+            transceiver_dom_threshold_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            offset = DOM_OFFSET
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm']   = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm']    = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning']  = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm']    = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm']     = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning']  = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning']   = module_threshold_data['VccLowWarning']['value']
+
+            dom_channel_thres_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNEL_THRESHOLD_OFFSET), QSFP_CHANNEL_THRESHOLD_WIDTH)
+            if dom_channel_thres_raw is not None:
+                channel_threshold_values = sfpd_obj.parse_channel_threshold_values(dom_channel_thres_raw, 0)
+                channel_threshold_data = channel_threshold_values.get('data')
+            else:
+                channel_threshold_data = None
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm']   = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm']    = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning']  = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm']   = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm']    = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning']  = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm']    = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm']     = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning']  = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning']   = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 256
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm']      = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm']       = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning']    = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning']     = dom_module_threshold_data['data']['TempLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['vcchighalarm']       = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm']        = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning']     = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning']      = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txbiashighalarm']    = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm']     = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning']  = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning']   = dom_module_threshold_data['data']['BiasLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txpowerhighalarm']   = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm']    = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning']  = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm']   = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm']    = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning']  = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+        else:
+            return None
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.reset_path)
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path)
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+        else:
+            return None
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+        else:
+            return None
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = \
+                    sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params( \
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.reset_path, "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 0
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                reg_file = open("/sys/class/cpld-qsfp28/port-"+str(self.port_num)+"/reset", "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 1
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path, "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..a80a07a999ba
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform/thermal.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+thermal_index_mapping = {
+    1:40,
+    2:41,
+    3:42,
+    4:50,
+    5:51,
+    6:52,
+    7:73,
+    8:74,
+    9:75,
+   10:76,
+   11:77,
+   12:78,
+   13:79,
+   14:80,
+   15:81,
+   16:82,
+   17:83,
+   18:84
+}
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_ncrit".format(thermal_index_mapping[self.index])
+        self.high_crit_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_crit_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform_setup.py
new file mode 100644
index 000000000000..a4899c618337
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',    
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/utils/quanta_ix7_bwde_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/utils/quanta_ix7_bwde_util.py
new file mode 100755
index 000000000000..952fc11a6816
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-bwde-32x/utils/quanta_ix7_bwde_util.py
@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Quanta Computer Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Usage: %(scriptName)s [options] command object
+
+options:
+    -h | --help     : this help message
+    -d | --debug    : run with debug mode
+    -f | --force    : ignore error during installation or clean
+command:
+    install     : install drivers and generate related sysfs nodes
+    clean       : uninstall drivers and remove related sysfs nodes
+"""
+
+import os
+import commands
+import sys, getopt
+import logging
+
+DEBUG = False
+args = []
+FORCE = 0
+i2c_prefix = '/sys/bus/i2c/devices/'
+
+
+if DEBUG == True:
+    print sys.argv[0]
+    print 'ARGV      :', sys.argv[1:]
+
+
+def main():
+    global DEBUG
+    global args
+    global FORCE
+
+    if len(sys.argv)<2:
+        show_help()
+
+    options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
+                                                       'debug',
+                                                       'force',
+                                                          ])
+    if DEBUG == True:
+        print options
+        print args
+        print len(sys.argv)
+
+    for opt, arg in options:
+        if opt in ('-h', '--help'):
+            show_help()
+        elif opt in ('-d', '--debug'):
+            DEBUG = True
+            logging.basicConfig(level=logging.INFO)
+        elif opt in ('-f', '--force'):
+            FORCE = 1
+        else:
+            logging.info('no option')
+    for arg in args:
+        if arg == 'install':
+           install()
+        elif arg == 'clean':
+           uninstall()
+        else:
+            show_help()
+
+
+    return 0
+
+def show_help():
+    print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
+    sys.exit(0)
+
+def show_log(txt):
+    if DEBUG == True:
+        print "[IX7-BWDE-32X]"+txt
+    return
+
+def exec_cmd(cmd, show):
+    logging.info('Run :'+cmd)
+    status, output = commands.getstatusoutput(cmd)
+    show_log (cmd +"with result:" + str(status))
+    show_log ("      output:"+output)
+    if status:
+        logging.info('Failed :'+cmd)
+        if show:
+            print('Failed :'+cmd)
+    return  status, output
+
+instantiate =[
+#Enable front-ports LED decoding
+'echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode',
+'echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode',
+#Update System LED
+'echo 39 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio39/direction',
+'echo 0 > /sys/class/gpio/gpio39/value',
+'echo 40 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio40/direction',
+'echo 1 > /sys/class/gpio/gpio40/value',
+]
+
+drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
+'i2c-mux-pca954x force_deselect_on_exit=1',
+'gpio-pca953x',
+'optoe',
+'qci_cpld',
+'qci_cpld_led',
+'quanta_platform_ix7_bwde',
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
+]
+
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
+'i2c-mux-pca954x',
+'gpio-pca953x',
+'optoe',
+'qci_cpld',
+'qci_cpld_led',
+'quanta_platform_ix7_bwde',
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
+]
+
+def system_install():
+    global FORCE
+
+    #setup driver dependency
+    exec_cmd("depmod -a ", 1)
+    #install drivers
+    for i in range(0,len(drivers)):
+        status, output = exec_cmd("modprobe "+drivers[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+
+    #reload ethernet drivers for correct order
+    exec_cmd("rmmod ixgbe ", 1)
+    exec_cmd("rmmod igb ", 1)
+    exec_cmd("modprobe igb ", 1)
+    exec_cmd("modprobe ixgbe ", 1)
+
+    #turn on module power
+    exec_cmd("echo 21 > /sys/class/gpio/export ", 1)
+    exec_cmd("echo high > /sys/class/gpio/gpio21/direction ", 1)
+
+    #Reset fron-ports LED CPLD
+    exec_cmd("echo 33 > /sys/class/gpio/export ", 1)
+    status, output = exec_cmd("cat /sys/class/gpio/gpio33/value", 1)
+    if output != '1':
+        exec_cmd("echo out > /sys/class/gpio/gpio33/direction ", 1)
+        exec_cmd("echo 0 >/sys/class/gpio/gpio33/value", 1)
+        exec_cmd("echo 1 >/sys/class/gpio/gpio33/value", 1)
+
+    #instantiate devices
+    for i in range(0,len(instantiate)):
+        status, output = exec_cmd(instantiate[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+
+    #QSFP for 1~32 port
+    for port_number in range(1,33):
+        bus_number = port_number + 12
+        os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
+
+    status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix7_bwde-r0/sonic_platform-1.0-py3-none-any.whl",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+
+    return
+
+
+def system_ready():
+    if not device_found():
+        return False
+    return True
+
+def install():
+    if not device_found():
+        print "No device, installing...."
+        status = system_install()
+        if status:
+            if FORCE == 0:
+                return  status
+    else:
+        print " ix7-bwde driver already installed...."
+    return
+
+def uninstall():
+    global FORCE
+    #uninstall drivers
+    for i in range(len(un_drivers)-1,-1,-1):
+       status, output = exec_cmd("rmmod "+un_drivers[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+    return
+
+def device_found():
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix7_bwde > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix7_bwde", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
+
+if __name__ == "__main__":
+    main()
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/classes/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/classes/__init__.py
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/Makefile
old mode 100755
new mode 100644
index 011cd52d673d..8ea865a8b55f
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/Makefile
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/Makefile
@@ -1,3 +1,3 @@
-obj-m:=qci_cpld_sfp28.o qci_cpld_led.o qci_platform_ix8.o
+obj-m:=qci_cpld_sfp28.o qci_cpld_led.o qci_platform_ix8.o quanta_hwmon_ipmi.o
 
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_led.c
old mode 100755
new mode 100644
index 37fc2e07246e..64841e8538f6
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_led.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_led.c
@@ -241,6 +241,7 @@ static int cpld_led_probe(struct i2c_client *client,
 	return nr;
 }
 
+#if 0
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
 static int idr_has_entry(int id, void *p, void *data)
 {
@@ -251,6 +252,7 @@ static bool cpld_idr_is_empty(struct idr *idp)
 {
 	return !idr_for_each(idp, idr_has_entry, NULL);
 }
+#endif
 
 static int cpld_led_remove(struct i2c_client *client)
 {
@@ -261,8 +263,11 @@ static int cpld_led_remove(struct i2c_client *client)
 	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
 	kfree(data->cpld_data);
 
-	if (cpld_idr_is_empty(&cpld_led_ida.idr))
+	if (ida_is_empty(&cpld_led_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_sfp28.c b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_sfp28.c
old mode 100755
new mode 100644
index dac76667c6ca..61350cdd8c27
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_sfp28.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_cpld_sfp28.c
@@ -298,7 +298,7 @@ static int cpld_probe(struct i2c_client *client,
 
 	if (!cpld_class)
 	{
-		cpld_class = class_create(THIS_MODULE, name);
+		cpld_class = class_create(THIS_MODULE, "cpld-sfp28");
 		if (IS_ERR(cpld_class)) {
 			pr_err("couldn't create sysfs class\n");
 			return PTR_ERR(cpld_class);
@@ -358,7 +358,7 @@ static int cpld_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
-#if 1
+#if 0
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -384,8 +384,11 @@ static int cpld_remove(struct i2c_client *client)
 		kfree(data->port_data[i]);
 	}
 
-	if (cpld_idr_is_empty(&cpld_ida.idr))
+	if (ida_is_empty(&cpld_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
old mode 100755
new mode 100644
index d35a56641e38..51876246e1a2
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
@@ -39,170 +39,13 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/platform_data/pca954x.h>
+#include <linux/delay.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
 #include <linux/platform_data/pca953x.h>
 #endif
 
-#define MUX_INFO(bus, deselect) \
-	{.adap_id = bus, .deselect_on_exit = deselect}
-
-static struct pca954x_platform_mode pca9548sfp1_modes[] = {
-	MUX_INFO(0x20, 1),
-	MUX_INFO(0x21, 1),
-	MUX_INFO(0x22, 1),
-	MUX_INFO(0x23, 1),
-	MUX_INFO(0x24, 1),
-	MUX_INFO(0x25, 1),
-	MUX_INFO(0x26, 1),
-	MUX_INFO(0x27, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp1_data = {
-	.modes 		= pca9548sfp1_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp2_modes[] = {
-	MUX_INFO(0x28, 1),
-	MUX_INFO(0x29, 1),
-	MUX_INFO(0x2a, 1),
-	MUX_INFO(0x2b, 1),
-	MUX_INFO(0x2c, 1),
-	MUX_INFO(0x2d, 1),
-	MUX_INFO(0x2e, 1),
-	MUX_INFO(0x2f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp2_data = {
-	.modes 		= pca9548sfp2_modes,
-	.num_modes 	= 8,
-};
-static struct pca954x_platform_mode pca9548sfp3_modes[] = {
-	MUX_INFO(0x30, 1),
-	MUX_INFO(0x31, 1),
-	MUX_INFO(0x32, 1),
-	MUX_INFO(0x33, 1),
-	MUX_INFO(0x34, 1),
-	MUX_INFO(0x35, 1),
-	MUX_INFO(0x36, 1),
-	MUX_INFO(0x37, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp3_data = {
-	.modes 		= pca9548sfp3_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp4_modes[] = {
-	MUX_INFO(0x38, 1),
-	MUX_INFO(0x39, 1),
-	MUX_INFO(0x3a, 1),
-	MUX_INFO(0x3b, 1),
-	MUX_INFO(0x3c, 1),
-	MUX_INFO(0x3d, 1),
-	MUX_INFO(0x3e, 1),
-	MUX_INFO(0x3f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp4_data = {
-	.modes 		= pca9548sfp4_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp5_modes[] = {
-	MUX_INFO(0x40, 1),
-	MUX_INFO(0x41, 1),
-	MUX_INFO(0x42, 1),
-	MUX_INFO(0x43, 1),
-	MUX_INFO(0x44, 1),
-	MUX_INFO(0x45, 1),
-	MUX_INFO(0x46, 1),
-	MUX_INFO(0x47, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp5_data = {
-	.modes 		= pca9548sfp5_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp6_modes[] = {
-	MUX_INFO(0x48, 1),
-	MUX_INFO(0x49, 1),
-	MUX_INFO(0x4a, 1),
-	MUX_INFO(0x4b, 1),
-	MUX_INFO(0x4c, 1),
-	MUX_INFO(0x4d, 1),
-	MUX_INFO(0x4e, 1),
-	MUX_INFO(0x4f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp6_data = {
-	.modes 		= pca9548sfp6_modes,
-	.num_modes 	= 8,
-};
-
-//ZQSFP
-static struct pca954x_platform_mode pca9548sfp7_modes[] = {
-	MUX_INFO(0x50, 1),
-	MUX_INFO(0x51, 1),
-	MUX_INFO(0x52, 1),
-	MUX_INFO(0x53, 1),
-	MUX_INFO(0x54, 1),
-	MUX_INFO(0x55, 1),
-	MUX_INFO(0x56, 1),
-	MUX_INFO(0x57, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp7_data = {
-	.modes 		= pca9548sfp7_modes,
-	.num_modes 	= 8,
-};
-
-// end port
-
-static struct pca954x_platform_mode pca9546_modes[] = {
-	MUX_INFO(0x10, 1),
-	MUX_INFO(0x11, 1),
-	MUX_INFO(0x12, 1),
-	MUX_INFO(0x13, 1),
-};
-
-static struct pca954x_platform_data pca9546_data = {
-	.modes 		= pca9546_modes,
-	.num_modes 	= 4,
-};
-
-static struct pca954x_platform_mode pca9548_modes[] = {
-	MUX_INFO(0x14, 1),
-	MUX_INFO(0x15, 1),
-	MUX_INFO(0x16, 1),
-	MUX_INFO(0x17, 1),
-	MUX_INFO(0x18, 1),
-	MUX_INFO(0x19, 1),
-	MUX_INFO(0x1a, 1),
-	MUX_INFO(0x1b, 1),
-};
-
-static struct pca954x_platform_data pca9548_data = {
-	.modes 		= pca9548_modes,
-	.num_modes 	= 8,
-};
-
-/* CPU Board i2c device */
-static struct pca954x_platform_mode pca9546_cpu_modes[] = {
-	MUX_INFO(0x02, 1),
-	MUX_INFO(0x03, 1),
-	MUX_INFO(0x04, 1),
-	MUX_INFO(0x05, 1),
-};
-
-static struct pca954x_platform_data pca9546_cpu_data = {
-	.modes 		= pca9546_cpu_modes,
-	.num_modes 	= 4,
-};
 //MB Board Data
 static struct pca953x_platform_data pca9555_1_data = {
 	.gpio_base = 0x10,
@@ -218,42 +61,33 @@ static struct pca953x_platform_data pca9555_CPU_data = {
 static struct i2c_board_info ix8_i2c_devices[] = {
 	{
 		I2C_BOARD_INFO("pca9546", 0x72),		// 0
-		.platform_data = &pca9546_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x77),		// 1
-		.platform_data = &pca9548_data,
 	},
 	{
 		I2C_BOARD_INFO("24c02", 0x54),			// 2 eeprom
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 3 0x77 ch0
-		.platform_data = &pca9548sfp1_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 4 0x77 ch1
-		.platform_data = &pca9548sfp2_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 5 0x77 ch2
-		.platform_data = &pca9548sfp3_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 6 0x77 ch3
-		.platform_data = &pca9548sfp4_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 7 0x77 ch4
-		.platform_data = &pca9548sfp5_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 8 0x77 ch5
-		.platform_data = &pca9548sfp6_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 9 0x77 ch6
-		.platform_data = &pca9548sfp7_data,
 	},
 	{
 		I2C_BOARD_INFO("CPLD-SFP28", 0x38),		// 10 0x72 ch0 CPLD1_:SFP28 1~16
@@ -277,7 +111,6 @@ static struct i2c_board_info ix8_i2c_devices[] = {
 	},
 	{
 		I2C_BOARD_INFO("pca9546", 0x71),		// 16
-		.platform_data = &pca9546_cpu_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9555", 0x20),		// 17 0x71 ch0 CPU Board Data
@@ -301,11 +134,33 @@ static struct platform_driver ix8_platform_driver = {
 	},
 };
 
+static struct i2c_adapter *i2c_get_adapter_wait(int nr)
+{
+	struct i2c_adapter *adap = NULL;
+	int i = 0;
+
+	for (i = 0; i < 300; ++i) {
+		adap = i2c_get_adapter(nr);
+		if (adap)
+			break;
+		msleep(10);
+	}
+
+	if (adap == NULL)
+		printk(KERN_ERR "%s: unable to get i2c adapter for bus %d\n", __FILE__, nr);
+
+	return adap;
+}
+
 static struct platform_device *ix8_device;
 
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 19; // num of ix8_i2c_devices - 2 (for optoe1, optoe2)
+int numof_ports = 56;
+
 static int __init ix8_platform_init(void)
 {
-	struct i2c_client *client;
 	struct i2c_adapter *adapter;
 	int ret, i;
 
@@ -324,76 +179,187 @@ static int __init ix8_platform_init(void)
 	if (ret)
 		goto fail_platform_device;
 
-	adapter = i2c_get_adapter(0);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[0]);		// pca9546
-	client = i2c_new_device(adapter, &ix8_i2c_devices[1]);		// pca9548
-	client = i2c_new_device(adapter, &ix8_i2c_devices[16]);		// pca9546cpu
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x02);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[17]);		// CPU Board Data
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x10);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[10]);		// CPLD_1
-	client = i2c_new_device(adapter, &ix8_i2c_devices[18]);		// CPLD_4
-	client = i2c_new_device(adapter, &ix8_i2c_devices[19]);		// CPLD_6
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x11);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[11]);		// CPLD_2
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x12);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[12]);		// CPLD_3
-	client = i2c_new_device(adapter, &ix8_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x13);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[13]);		// MB Board Data
-	client = i2c_new_device(adapter, &ix8_i2c_devices[14]);		// QSFP:49~52
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x14);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[3]);		// pca9548_1 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x15);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[4]);		// pca9548_2 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x16);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[5]);		// pca9548_3 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x17);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[6]);		// pca9548_4 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x18);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[7]);		// pca9548_5 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x19);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[8]);		// pca9548_6 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x1a);
-	client = i2c_new_device(adapter, &ix8_i2c_devices[9]);		// pca9548_7 QSFP
-	i2c_put_adapter(adapter);
-
-	for(i = 80; i < 88; i ++){									// QSFP 49~56 EEPROM
-		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix8_i2c_devices[15]);
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
+	adapter = i2c_get_adapter_wait(0);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix8_i2c_devices[0]);		// pca9546
+		g_client[1] = i2c_new_device(adapter, &ix8_i2c_devices[1]);		// pca9548
+		g_client[2] = i2c_new_device(adapter, &ix8_i2c_devices[16]);		// pca9546cpu
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(13);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix8_i2c_devices[17]);		// CPU Board Data
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(1);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[4] = i2c_new_device(adapter, &ix8_i2c_devices[10]);		// CPLD_1
+		g_client[5] = i2c_new_device(adapter, &ix8_i2c_devices[18]);		// CPLD_4
+		g_client[6] = i2c_new_device(adapter, &ix8_i2c_devices[19]);		// CPLD_6
 		i2c_put_adapter(adapter);
 	}
 
-	for(i = 32; i < 80; i ++){									// SFP28 1~48 EEPROM
-		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix8_i2c_devices[20]);
+	adapter = i2c_get_adapter_wait(2);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[7] = i2c_new_device(adapter, &ix8_i2c_devices[11]);		// CPLD_2
 		i2c_put_adapter(adapter);
 	}
 
+	adapter = i2c_get_adapter_wait(3);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[8] = i2c_new_device(adapter, &ix8_i2c_devices[12]);		// CPLD_3
+		g_client[9] = i2c_new_device(adapter, &ix8_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(4);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[10] = i2c_new_device(adapter, &ix8_i2c_devices[13]);		// MB Board Data
+		g_client[11] = i2c_new_device(adapter, &ix8_i2c_devices[14]);		// QSFP:49~52
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(5);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix8_i2c_devices[3]);		// pca9548_1 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(6);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[13] = i2c_new_device(adapter, &ix8_i2c_devices[4]);		// pca9548_2 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(7);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[14] = i2c_new_device(adapter, &ix8_i2c_devices[5]);		// pca9548_3 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(8);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[15] = i2c_new_device(adapter, &ix8_i2c_devices[6]);		// pca9548_4 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(9);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[16] = i2c_new_device(adapter, &ix8_i2c_devices[7]);		// pca9548_5 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(10);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[17] = i2c_new_device(adapter, &ix8_i2c_devices[8]);		// pca9548_6 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter_wait(11);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[18] = i2c_new_device(adapter, &ix8_i2c_devices[9]);		// pca9548_7 QSFP
+		i2c_put_adapter(adapter);
+	}
+
+	for(i = 65; i < 73; i ++){									// QSFP 49~56 EEPROM
+		adapter = i2c_get_adapter_wait(i);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			g_client_port[i - 17] = i2c_new_device(adapter, &ix8_i2c_devices[15]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
+	for(i = 17; i < 65; i ++){									// SFP28 1~48 EEPROM
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			adapter = i2c_get_adapter_wait(i);
+			g_client_port[i - 17] = i2c_new_device(adapter, &ix8_i2c_devices[20]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
 	return 0;
 
 fail_platform_device:
@@ -406,6 +372,26 @@ static int __init ix8_platform_init(void)
 
 static void __exit ix8_platform_exit(void)
 {
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
 	platform_device_unregister(ix8_device);
 	platform_driver_unregister(&ix8_platform_driver);
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..5c9570c1035a
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1909 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg  0
+#define DEBUGUSE_SHIFT    0
+
+#define DRVNAME   "quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)     ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)    (int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)    (int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)  (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)  (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX         19
+#define SENSOR_ATTR_NAME_LENGTH	20
+
+#define SENSOR_GET_CAP_LABEL  0x001
+#define SENSOR_GET_CAP_ALARM  0x002
+#define SENSOR_GET_CAP_INPUT  0x004
+
+#define SENSOR_GET_CAP_LNC    0x008
+#define SENSOR_GET_CAP_LCR    0x010
+#define SENSOR_GET_CAP_LNR    0x020
+
+#define SENSOR_GET_CAP_UNC    0x040
+#define SENSOR_GET_CAP_UCR    0x080
+#define SENSOR_GET_CAP_UNR    0x100
+
+#define SENSOR_GET_CAP_MODEL  0x200
+#define SENSOR_GET_CAP_SN     0x400
+#define SENSOR_GET_CAP_PWM    0x800
+
+#define SENSOR_GET_CAP_CONMODE    0x1000
+#define SENSOR_GET_CAP_DIRECTION  0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT  0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT  0x8000
+
+#define SENSOR_GET_CAP_MFRID    0x10000
+#define SENSOR_GET_CAP_VIN_TYPE	0x20000
+#define SENSOR_GET_CAP_POUT_MAX	0x40000
+
+#define SDR_SENSOR_TYPE_TEMP  0x01
+#define SDR_SENSOR_TYPE_VOLT  0x02
+#define SDR_SENSOR_TYPE_CURR  0x03
+#define SDR_SENSOR_TYPE_FAN   0x04
+#define SDR_SENSOR_TYPE_PS    0x08
+#define SDR_SENSOR_TYPE_OTHER 0x0b
+
+#define BMC_GET_DEVICE_ID   0x01
+
+#define IPMI_NETFN_SE     0x04
+#define IPMI_NETFN_APP      0x06
+#define IPMI_NETFN_STORAGE    0x0a
+#define IPMI_NETFN_TSOL     0x30
+
+#define GET_SDR_REPO_INFO   0x20
+#define GET_DEVICE_SDR      0x21
+#define GET_SDR_RESERVE_REPO  0x22
+#define GET_SDR         0x23
+#define GET_SENSOR_THRESHOLDS 0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS 0x2b
+#define GET_SENSOR_READING    0x2d
+#define GET_PSU_READING     0x52
+#define GET_FAN_INFO      0xd6
+#define GET_FRU_INFO      0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK    (0x80)  /* 1 = provides SDRs      */
+#define IPMI_TIMEOUT      (4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE 1
+
+struct quanta_hwmon_ipmi_data
+{
+  struct platform_device  *ipmi_platform_dev;
+  struct device     *ipmi_hwmon_dev;
+  /*struct mutex      ipmi_lock; */
+
+  int32_t         total_sensor_id;
+  int32_t         total_suport_sensor;
+  int32_t         total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data
+{
+  uint8_t addr;
+  uint8_t sensor_type;
+  uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+  uint32_t capability;
+
+  struct header_info
+  {
+    uint8_t header_type;
+    uint8_t header_byte;
+  } headerinfo;
+
+  struct record_info
+  {
+    uint8_t record_analog;
+    uint8_t record_linearization;
+
+    int32_t record_m;
+    int32_t record_b;
+    int32_t record_k1;
+    int32_t record_k2;
+  } recordinfo;
+
+  struct threshold_upper_info
+  {
+    uint8_t unr;
+    uint8_t ucr;
+    uint8_t unc;
+  } upperinfo;
+
+  struct threshold_lower_info
+  {
+    uint8_t lnr;
+    uint8_t lcr;
+    uint8_t lnc;
+  } lowerinfo;
+
+  struct attr_info
+  {
+    bool attr_exist;
+    char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+    char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+    struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+    struct attribute_group  attr_group;
+    struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+  } attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data
+{
+  int32_t tx_id;
+
+  int32_t rx_result;
+  int64_t rx_len;
+  void *rx_data;
+  struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator
+{
+  uint16_t reservation;
+  int32_t total;
+  int32_t next;
+};
+
+struct ipm_devid_rsp
+{
+  uint8_t device_id;
+  uint8_t device_revision;
+  uint8_t fw_rev1;
+  uint8_t fw_rev2;
+  uint8_t ipmi_version;
+  uint8_t adtl_device_support;
+  uint8_t manufacturer_id[3];
+  uint8_t product_id[2];
+  uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs
+{
+  uint8_t version;  /* SDR version (51h) */
+  uint16_t count;   /* number of records */
+  uint16_t free;    /* free space in SDR */
+  uint32_t add_stamp; /* last add timestamp */
+  uint32_t erase_stamp; /* last del timestamp */
+  uint8_t op_support; /* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs
+{
+  uint8_t count;  /* number of records */
+  uint8_t flags;  /* flags */
+  uint8_t popChangeInd[3];  /* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs
+{
+  uint16_t next;    /* next record id */
+  uint16_t id;    /* record ID */
+  uint8_t version;  /* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR     0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR    0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR  0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC    0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC 0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR  0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR  0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR 0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION   0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO  0x14
+#define SDR_RECORD_TYPE_OEM     0xc0
+  uint8_t type;   /* record type */
+  uint8_t length;   /* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq
+{
+  uint16_t reserve_id;  /* reservation ID */
+  uint16_t id;    /* record ID */
+  uint8_t offset;   /* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD 0xff
+  uint8_t length;   /* length to read */
+} __attribute__((packed));
+
+struct entity_id
+{
+  uint8_t id;     /* physical entity id */
+#ifdef WORDS_BIGENDIAN
+  uint8_t logical : 1;  /* physical/logical */
+  uint8_t instance : 7; /* instance number */
+#else
+  uint8_t instance : 7; /* instance number */
+  uint8_t logical : 1;  /* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask
+{
+  union
+  {
+    struct
+    {
+      uint16_t assert_event;  /* assertion event mask */
+      uint16_t deassert_event;  /* de-assertion event mask */
+      uint16_t read;  /* discrete reading mask */
+    } discrete;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved : 1;
+      uint16_t status_lnr : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnc : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lnc_low : 1;
+#else
+      uint16_t assert_lnc_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t status_lnc : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnr : 1;
+      uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved_2 : 1;
+      uint16_t status_unr : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unc : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lnc_low : 1;
+#else
+      uint16_t deassert_lnc_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t status_unc : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unr : 1;
+      uint16_t reserved_2 : 1;
+#endif
+      union
+      {
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* settable threshold mask */
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+          /* padding lower 8 bits */
+          uint16_t readable : 8;
+#else
+          uint16_t readable : 8;
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+#endif
+        } set;
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* readable threshold mask */
+          /* padding upper 8 bits */
+          uint16_t settable : 8;
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+#else
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+          uint16_t settable : 8;
+#endif
+        } read;
+      };
+    } threshold;
+  } type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor
+{
+  struct
+  {
+    uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+    uint8_t channel : 4;  /* channel number */
+    uint8_t __reserved : 2;
+    uint8_t lun : 2;  /* sensor owner lun */
+#else
+    uint8_t lun : 2;  /* sensor owner lun */
+    uint8_t __reserved : 2;
+    uint8_t channel : 4;  /* channel number */
+#endif
+    uint8_t sensor_num; /* unique sensor number */
+  } keys;
+
+  struct entity_id entity;
+
+  struct
+  {
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t __reserved : 1;
+      uint8_t scanning : 1;
+      uint8_t events : 1;
+      uint8_t thresholds : 1;
+      uint8_t hysteresis : 1;
+      uint8_t type : 1;
+      uint8_t event_gen : 1;
+      uint8_t sensor_scan : 1;
+#else
+      uint8_t sensor_scan : 1;
+      uint8_t event_gen : 1;
+      uint8_t type : 1;
+      uint8_t hysteresis : 1;
+      uint8_t thresholds : 1;
+      uint8_t events : 1;
+      uint8_t scanning : 1;
+      uint8_t __reserved : 1;
+#endif
+    } init;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t ignore : 1;
+      uint8_t rearm : 1;
+      uint8_t hysteresis : 2;
+      uint8_t threshold : 2;
+      uint8_t event_msg : 2;
+#else
+      uint8_t event_msg : 2;
+      uint8_t threshold : 2;
+      uint8_t hysteresis : 2;
+      uint8_t rearm : 1;
+      uint8_t ignore : 1;
+#endif
+    } capabilities;
+    uint8_t type;
+  } sensor;
+
+  uint8_t event_type; /* event/reading type code */
+
+  struct sdr_record_mask mask;
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t analog : 2;
+    uint8_t rate : 3;
+    uint8_t modifier : 2;
+    uint8_t pct : 1;
+#else
+    uint8_t pct : 1;
+    uint8_t modifier : 2;
+    uint8_t rate : 3;
+    uint8_t analog : 2;
+#endif
+    struct
+    {
+      uint8_t base;
+      uint8_t modifier;
+    } type;
+  } unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+  uint8_t linearization;  /* 70h=non linear, 71h-7Fh=non linear, OEM */
+  uint16_t mtol;    /* M, tolerance */
+  uint32_t bacc;    /* accuracy, B, Bexp, Rexp */
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t __reserved : 5;
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+#else
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t __reserved : 5;
+#endif
+  } analog_flag;
+
+  uint8_t nominal_read; /* nominal reading, raw value */
+  uint8_t normal_max; /* normal maximum, raw value */
+  uint8_t normal_min; /* normal minimum, raw value */
+  uint8_t sensor_max; /* sensor maximum, raw value */
+  uint8_t sensor_min; /* sensor minimum, raw value */
+
+  struct
+  {
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } upper;
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } lower;
+    struct
+    {
+      uint8_t positive;
+      uint8_t negative;
+    } hysteresis;
+  } threshold;
+  uint8_t __reserved[2];
+  uint8_t oem;    /* reserved for OEM use */
+  uint8_t id_code;  /* sensor ID string type/length code */
+  uint8_t id_string[16];  /* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+  /* function input parameter (a * 10 ^ b) */
+  int32_t i = 0, r = 1, temp_b = 0;
+
+  temp_b = (b > 0) ? b : -b;
+
+  for (i = 0; i < temp_b; i++)
+  {
+    r = r * 10;
+  }
+
+  if (b > 0)
+  {
+    *a = (*a) * r;
+    r = 1;
+  }
+  /* function return parameter calc_result = *a, decimal_point = r */
+  return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+  while (*buf >= '0' && *buf <= '9')
+  {
+    *output_val = *output_val * 10 + *buf - '0';
+    buf++;
+  }
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+  int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+  struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+  ipmi_wait_queue--;
+
+  if (msg->msg.data[0] != 0)
+  {
+    if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07)
+        && (msg->msg.cmd != 0x52))
+    {
+      /*skip master r/w cmd return code */
+      printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn,
+             msg->msg.cmd);
+      rv = msg->msg.data[0];
+      goto get_BMC_response_fail;
+    }
+  }
+
+  if (msg->msgid != comm_data->tx_id)
+  {
+    printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid,
+           comm_data->tx_id);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len <= 0)
+  {
+    printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len > 1)
+  {
+    if (comm_data->rx_len)
+    {
+      comm_data->rx_len = msg->msg.data_len - 1;
+      memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+    }
+    else
+    {
+      printk("ipmi: rx len = 0, it should be not retrun ?\n");
+      goto get_BMC_response_fail;
+    }
+  }
+
+  rv = 0;
+
+get_BMC_response_fail:
+  ipmi_free_recv_msg(msg);
+
+  if (ipmi_wait_queue == 0)
+  {
+    comm_data->rx_result = rv;
+    if (rv == 0)
+    {
+      complete(comm_data->rx_read_complete);
+    }
+  }
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg,
+                                       struct ipmi_comm_data *comm_data)
+{
+  int32_t rv = 0;
+  int32_t escape_time = 0;
+
+  struct ipmi_addr ipmi_address;
+
+  if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE)
+  {
+    /* printk("msg queue full, cannot send ipmi cmd\n"); */
+    return -EBUSY;
+  }
+  ipmi_wait_queue++;
+
+  ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+  ipmi_address.channel = IPMI_BMC_CHANNEL;
+  ipmi_address.data[0] = 0;
+
+  rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+  if (rv)
+  {
+    printk("ipmi_validate_addr fail, err code : %d\n", rv);
+    return rv;
+  }
+
+  ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg,
+                       comm_data, 0, 0, 0);
+
+  escape_time = wait_for_completion_timeout(comm_data->rx_read_complete,
+                                            IPMI_TIMEOUT);
+
+  rv = comm_data->rx_result;
+  if (escape_time == 0)
+  {
+    printk("BMC not response (%d)\n", escape_time);
+  }
+
+  return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len,
+                             void *msg_rx_data, int32_t msg_rx_len)
+{
+  int32_t i = 0;
+  int32_t rv = 0;
+
+  static uint64_t tx_msgid = 1;
+
+  struct kernel_ipmi_msg msg;
+  struct ipmi_comm_data *comm_data = NULL;
+  struct completion read_complete;
+
+  init_completion(&read_complete);
+
+  /* prepare transfer message */
+  msg.netfn = msg_tx_data[0];
+  msg.cmd = msg_tx_data[1];
+  msg.data_len = msg_tx_len - 2;
+
+  msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+  if (msg.data == NULL)
+  {
+    printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+  if (comm_data == NULL)
+  {
+    printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  for (i = 2; i < msg_tx_len; i++)
+  {
+    msg.data[i - 2] = msg_tx_data[i];
+  }
+
+  comm_data->tx_id = tx_msgid++;
+
+  /* prepare recive message */
+  comm_data->rx_data = msg_rx_data;
+  comm_data->rx_len = msg_rx_len;
+  comm_data->rx_result = -1;
+  comm_data->rx_read_complete = &read_complete;
+
+  rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+  if (msg.data)
+  {
+    kfree(msg.data);
+  }
+  if (comm_data)
+  {
+    kfree(comm_data);
+  }
+  if (tx_msgid > UINT_MAX)
+  {
+    tx_msgid = 1;
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t *reserve_id)
+{
+  int32_t rv = 0;
+  uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; /*netfn = 0x00; cmd = GET_SDR_RESERVE_REPO; */
+
+  msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+  /* obtain reservation ID */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+
+#if enable_debug_msg
+  printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; /*netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID; */
+
+  struct ipm_devid_rsp devid;
+
+  /* check SDRR capability */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return rv;
+  }
+
+  if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK)
+  {
+    if ((devid.adtl_device_support & 0x02) == 0)
+    {
+      if ((devid.adtl_device_support & 0x01))
+      {
+        printk("Using Device SDRs\n");
+        g_use_built_in = 1;
+      }
+      else
+      {
+        printk("Error obtaining SDR info\n");
+      }
+    }
+  }
+
+  if (g_use_built_in == 0)
+  {
+    struct sdr_repo_info_rs sdr_info;
+    /* get sdr repository info */
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+
+#if enable_debug_msg
+    printk("SDR version: 0x%x\n", sdr_info.version);
+    printk("SDR free space: %d\n", sdr_info.free);
+#endif
+  }
+  else
+  {
+    struct sdr_device_info_rs sdr_info;
+    /* get device sdr info */
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+  }
+
+#if enable_debug_msg
+  printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+  else
+  {
+    itr->next = 0;
+    rv = ipmi_sdr_get_reservation(&(itr->reservation));
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr,
+                            struct sdr_get_rs *sdr_rs)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  sdr_rq.reserve_id = itr->reservation;
+  sdr_rq.id = itr->next;
+  sdr_rq.offset = 0;
+  sdr_rq.length = 5;  /* only get the header */
+
+  if (g_use_built_in == 0)
+  {
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR;
+  }
+  else
+  {
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_DEVICE_SDR;
+  }
+
+  memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+  if ((rv) || (sdr_rs->length == 0))
+  {
+    printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+    return -1;
+  }
+
+  if (sdr_rs->id != itr->next)
+  {
+#if enable_debug_msg
+    printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+    sdr_rs->id = itr->next;
+  }
+#if enable_debug_msg
+  printk("\nSDR record ID   : 0x%04x", itr->next);
+  printk("SDR record type : 0x%02x\n", sdr_rs->type);
+  printk("SDR record next : 0x%04x\n", sdr_rs->next);
+  printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs *header,
+                            struct ipmi_sdr_iterator  *itr, uint8_t *ret_data)
+{
+  int32_t rv = 0, len = 0;
+
+  uint8_t buff[128] = "";
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  len = header->length;
+  if (len > 0)
+  {
+    memset(&sdr_rq, 0, sizeof(sdr_rq));
+    sdr_rq.reserve_id = itr->reservation;
+    sdr_rq.id = header->id;
+    sdr_rq.offset = 5;
+    sdr_rq.length = len;
+
+    if (g_use_built_in == 0)
+    {
+      msg_data[0] = IPMI_NETFN_STORAGE;
+      msg_data[1] = GET_SDR;
+    }
+    else
+    {
+      msg_data[0] = IPMI_NETFN_SE;
+      msg_data[1] = GET_DEVICE_SDR;
+    }
+
+    memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      memset(buff, 0, sizeof(buff));
+      memcpy(buff, ret_data + 2, sdr_rq.length);
+      memcpy(ret_data, buff, sdr_rq.length + 2);
+    }
+  }
+
+  return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx,
+                                   struct sdr_record_full_sensor *sensor)
+{
+
+  /* lower threshold info */
+  if (sensor->mask.type.threshold.read.lnc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+  }
+  if (sensor->mask.type.threshold.read.lcr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+  }
+  if (sensor->mask.type.threshold.read.lnr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+  }
+  g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+  g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+  g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+  /* upper threshold info */
+  if (sensor->mask.type.threshold.read.unc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+  }
+  if (sensor->mask.type.threshold.read.ucr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+  }
+  if (sensor->mask.type.threshold.read.unr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+  }
+  g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+  g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+  g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx,
+                                struct sdr_record_full_sensor *sensor)
+{
+  char *loc = NULL;
+
+  g_sensor_data[idx].sensor_type = sensor->sensor.type;
+  sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+  g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+  g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+  g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+  g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+  memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00,
+         SENSOR_ATTR_NAME_LENGTH);
+
+  switch (g_sensor_data[idx].sensor_type)
+  {
+    case SDR_SENSOR_TYPE_TEMP:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+      break;
+    case SDR_SENSOR_TYPE_VOLT:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      break;
+    case SDR_SENSOR_TYPE_FAN:
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+      break;
+    case SDR_SENSOR_TYPE_PS:
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+      if (loc)
+      {
+        if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0)
+        {
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_VIN_TYPE;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_POUT_MAX;
+        }
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      }
+
+      break;
+    case SDR_SENSOR_TYPE_CURR:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      break;
+    case SDR_SENSOR_TYPE_OTHER:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+      break;
+    default:
+      printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+      break;
+  }
+
+  if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+  }
+
+#if enable_debug_msg
+  {
+    printk("\n********************\n");
+
+    printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m,
+           g_sensor_data[idx].recordinfo.record_b
+           , g_sensor_data[idx].recordinfo.record_k1,
+           g_sensor_data[idx].recordinfo.record_k2);
+
+    printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n",
+           g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+           , g_sensor_data[idx].recordinfo.record_analog,
+           g_sensor_data[idx].recordinfo.record_linearization);
+
+    printk("\n********************\n");
+  }
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val,
+                                   int32_t *point_result)
+{
+  int32_t m = g_sensor_data[idx].recordinfo.record_m;
+  int32_t b = g_sensor_data[idx].recordinfo.record_b;
+  int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+  int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+  int32_t decimal_point = 0;
+  int32_t result = 0;
+
+  decimal_point = pow_convert(&b, k1);
+
+  switch (g_sensor_data[idx].recordinfo.record_analog)
+  {
+    case 0:
+      result = m * val * decimal_point + b;
+      break;
+    case 1:
+      if (val & 0x80)
+      {
+        val++;
+      }
+    case 2:
+      result = (m * (int16_t)val) * decimal_point + b;
+      break;
+    default:
+      return;
+  }
+
+  pow_convert(&result, k2);
+  if (k1 < 0)
+  {
+    *point_result += -k1;
+  }
+  if (k2 < 0)
+  {
+    *point_result += -k2;
+  }
+
+  if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN)
+  {
+    result = result * 1000; /*shift for lm-sensors */
+  }
+
+  return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value,
+                               int8_t *ret_str)
+{
+  int32_t calc_result = 0, point_result = 0;
+  int32_t temp_len = 0;
+
+  uint8_t temp_str[16] = "";
+
+  calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+  temp_len = sprintf(temp_str, "%d", calc_result);
+  temp_len = temp_len - point_result;
+
+  /* int part */
+  if (temp_len <= 0)
+  {
+    sprintf(ret_str, "0");
+  }
+  else
+  {
+    snprintf(ret_str, temp_len + 1, "%s",
+             temp_str);  /* +1 for snprintf reserve space'\0' */
+  }
+
+  /* point part */
+  strcat(ret_str, ".");
+
+  /* float part */
+  if ((point_result == 0) || (temp_len < 0))
+  {
+    strcat(ret_str, "0");
+  }
+  else
+  {
+    strcat(ret_str, temp_str + temp_len);
+  }
+
+  /* EOL part */
+  strcat(ret_str, "\n\0");
+
+  return (temp_len + 1 + point_result +
+          2); /*integer + point + float + EOL + \0 */
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+  uint8_t slot_mask = 0x0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; /*netfn = 0x36; cmd = 0xB9; */
+  /*uint8_t msg_data[] = { 0x06, 0x52, 0x1B, 0x4C, 0x01, 0x00 }; //netfn = IPMI_NETFN_APP; cmd = GET_PSU_READING; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return 0;
+  }
+  else
+  {
+    slot_mask = (psu_slot == 1) ? 0x01 : 0x02;
+    return (returnData[0] & slot_mask) ? 0 : 1;
+  }
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+  uint8_t psu_slot = 0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xBB, 0x4C, 0x1C, 0x00, cmd, 0x00 }; /*netfn = 0x36; cmd = 0xBB; */
+
+  if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))
+  {
+    psu_slot = 1;
+  }
+  else
+  {
+    psu_slot = 2;
+  }
+
+  if (ipmi_check_psu_present(psu_slot))
+  {
+    msg_data[6] = psu_slot;
+    mutex_lock(&ipmi_lock);
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+    mutex_unlock(&ipmi_lock);
+
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      return sprintf(retbuf, "%s\n", returnData);
+    }
+  }
+  else
+  {
+    /*printk("Error ! cannot detect PSU%d\n", psu_slot); */
+  }
+
+  return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_vin_type(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData = 0;
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x01, 0xd8 }; // read line status
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {			
+			switch (returnData)
+			{
+				case 0x7: //LVDC
+				case 0x3: //HVDC
+					return sprintf(retbuf, "DC\n");
+				default:
+					return sprintf(retbuf, "AC\n");
+			}
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_pout_max(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0, pout_max = 0;
+
+	uint8_t returnData[2] = { 0 }, tempData[2] = { 0 };
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x02, 0xa7 };
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			/* MFR_POUT_MAX has 2 data format: Direct and Linear Data (see PMbus spec).
+			   Query command is needed to tell the data format, but since we have not use PSU
+			   whose output power is over 0x07ff (2047), just check the first 5 bits*/
+			if (returnData[1] & 0xf8 == 0) // Direct
+				pout_max = (returnData[1] << 8) | returnData[0];
+			else // Linear Data
+				pout_max = (((returnData[1] & 0x07) << 8) | returnData[0]) << ((returnData[1] & 0xf8) >> 3);
+			return sprintf(retbuf, "%d\n", pout_max);
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; /*netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  if (cmd_data1)
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+  }
+  else
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  }
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    sprintf(retbuf, "N/A\n");
+  }
+  else
+  {
+    sprintf(retbuf, "%s", returnData);
+  }
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%s\n",
+                 g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  int32_t rv = 0;
+
+  uint8_t returnData[4] = "";
+  uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; /*netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING; */
+
+  mutex_lock(&ipmi_lock);
+  msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "0.0\n");
+  }
+  else
+  {
+    return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+  }
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_vin_type(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_vin_type(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pout_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_pout_max(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  uint8_t returnData[10] = { 0 };
+  ipmi_fan_control(0x00, 0x00, returnData);
+  return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  if (g_fan_control_mode == 1)
+  {
+    ipmi_fan_control(0x01, store_input, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_controlmode(struct device *dev,
+                                struct device_attribute *devattr, char *buf)
+{
+  return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev,
+                                 struct device_attribute *devattr, const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  g_fan_control_mode = store_input;
+  if (g_fan_control_mode == 3)
+  {
+    ipmi_fan_control(0x7f, 0xff, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_direction(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; /*netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "N/A\n");
+  }
+  else
+  {
+    return sprintf(buf, "%c\n", returnData[1]);
+  }
+}
+
+static ssize_t show_fanpresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+  int32_t fan_idx = 0, fan_present = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; /*netfn = 0x36; cmd = 0xB9; */
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  struct kernel_ipmi_msg msg;
+
+  fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+  return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t psu_idx = 0;
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+  return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                           struct device_attribute *devattr, char *buf) =
+{
+  show_label, show_crit_alarm, show_input
+  , show_lnc, show_lcr, show_lnr
+  , show_unc, show_ucr, show_unr
+  , show_model, show_sn, show_pwm
+  , show_controlmode, show_direction, show_fanpresent
+  , show_psupresent, show_mfrid, show_vin_type
+  , show_pout_max
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                            struct device_attribute *devattr, const char *buf, size_t count) =
+{
+  NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, store_pwm
+  , store_controlmode, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+  "%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+  , "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+  , "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+  , "%s%d_model", "%s%d_sn", "%s%d_pwm"
+  , "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+  , "%s%d_present", "%s%d_mfrid", "%s%d_vin_type"
+  , "%s%d_pout_max"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+  int32_t i = 0, j = 0;
+
+  struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+  printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+  for (i = 0; i < SENSOR_ATTR_MAX; i++)
+  {
+    if ((g_sensor_data[attr_no].capability >> i) & 0x01)
+    {
+      snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i],
+               attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+      sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+      attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+      attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+      attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+      attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+      if (attrdata->sd_attrs[j].dev_attr.store)
+      {
+        attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+      }
+
+      attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+      attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+      j++;
+
+      data->total_create_sysfs++;
+    }
+  }
+
+  attrdata->attrs[j] = NULL;
+  attrdata->attr_group.attrs = attrdata->attrs;
+
+  g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+  return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+  int32_t i = 0;
+
+  for (i = 0; i < data->total_sensor_id; i++)
+  {
+    if (g_sensor_data[i].attrinfo.attr_exist)
+    {
+      sysfs_remove_group(&data->ipmi_hwmon_dev->kobj,
+                         &g_sensor_data[i].attrinfo.attr_group);
+    }
+  }
+  return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+  int32_t sdr_idx = 0;
+  int32_t err = 0;
+
+  struct ipmi_sdr_iterator *itr = NULL;
+  struct sdr_get_rs *header = NULL;
+
+  uint8_t *rec = NULL;
+
+  mutex_lock(&ipmi_lock);
+
+  itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+  if (itr == NULL)
+  {
+    printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+    goto itr_malloc_fail;
+  }
+
+  header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+  if (header == NULL)
+  {
+    printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+    goto header_malloc_fail;
+  }
+
+  err = ipmi_sdr_start(itr);
+  if (err)
+  {
+    printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+    goto ipmi_sdr_start_fail;
+  }
+
+  data->total_sensor_id = itr->total;
+  rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+  if (rec == NULL)
+  {
+    printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+    goto rec_malloc_fail;
+  }
+
+  g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data),
+                          GFP_KERNEL);
+  if (g_sensor_data == NULL)
+  {
+    printk("%s(%d): malloc failure", __func__, __LINE__);
+    goto g_sensor_data_malloc_fail;
+  }
+
+  memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+  for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++)
+  {
+    err = ipmi_sdr_get_header(itr, header);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_header_fail;
+    }
+
+
+    memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+    err = ipmi_sdr_get_record(header, itr, rec);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_record_fail;
+    }
+
+    itr->next = header->next;
+
+    switch (header->type)
+    {
+      case SDR_RECORD_TYPE_FULL_SENSOR:
+        /* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+        g_sensor_data[sdr_idx].addr = rec[2];
+        g_sensor_data[sdr_idx].capability =
+          SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+        g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+        g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+        ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor *) rec);
+        ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor *) rec);
+
+        if (sdr_idx >= DEBUGUSE_SHIFT)
+        {
+          err = create_sensor_attrs(sdr_idx);
+          if (err)
+          {
+            g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+            printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx,
+                   g_sensor_data[sdr_idx].sensor_idstring);
+            goto create_sysfs_fail;
+          }
+        }
+
+        data->total_suport_sensor++;
+
+        break;
+      case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+      default:
+        g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+        printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+        break;
+    }
+  }
+
+  printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n",
+         data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+  if (header)
+  {
+    kfree(header);
+    header = NULL;
+  }
+  if (rec)
+  {
+    kfree(rec);
+    rec = NULL;
+  }
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+  if (itr)
+  {
+    kfree(itr);
+    itr = NULL;
+  }
+
+itr_malloc_fail:
+  mutex_unlock(&ipmi_lock);
+
+  return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+  int32_t err = 0;
+
+  init_completion(&g_read_complete);
+
+  data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+  if (NULL == data)
+  {
+    printk("alloc data fail\n");
+    goto alloc_err;
+  }
+
+  data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+  err = IS_ERR(data->ipmi_platform_dev);
+  if (err)
+  {
+    printk("platform device register fail (err : %d)\n", err);
+    goto device_reg_err;
+  }
+
+  data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL,
+                                                           NULL);
+  err = IS_ERR(data->ipmi_hwmon_dev);
+  if (err)
+  {
+    printk("hwmon register fail\n");
+    goto hwmon_register_err;
+  }
+
+  err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+  if (err)
+  {
+    printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+    goto ipmi_create_err;
+  }
+
+  mutex_init(&ipmi_lock);
+  err = ipmi_init_sdr_sensors_data();
+  if (err)
+  {
+    printk("init sensor data fail (err : %d)\n", err);
+    goto init_sensor_err;
+  }
+
+  return 0;
+
+init_sensor_err:
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+ipmi_create_err:
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+  platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+alloc_err:
+  return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{
+  remove_sensor_attrs();
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+
+  mutex_lock(&ipmi_lock);
+  ipmi_destroy_user(ipmi_mh_user);
+  mutex_unlock(&ipmi_lock);
+
+  platform_device_unregister(data->ipmi_platform_dev);
+
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/service/ix8-platform-init.service b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/service/ix8-platform-init.service
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/setup.py
old mode 100755
new mode 100644
index 76c5eacbee4c..1f6a99b1a70c
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import os
-import sys
 from setuptools import setup
 os.listdir
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..4bfefa0fb636
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..b959d6678048
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/chassis.py
@@ -0,0 +1,232 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    import syslog
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus = 2
+        self.__num_of_ports = 56
+        self.__num_of_sfps = 48
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 15
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            if index in range(1, self.__num_of_sfps + 1):
+                sfp = Sfp(index, 'SFP')
+            else:
+                sfp = Sfp(index, 'QSFP')
+
+            self._sfp_list.append(sfp)
+
+        for index in range(1, self.__num_of_ports + 1):
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta IX8 the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    ##############################################
+    # Other methods
+    ##############################################
+    def get_watchdog(self):
+        """
+        Retreives hardware watchdog device on this chassis
+
+        Returns:
+            An object derived from WatchdogBase representing the hardware
+            watchdog device
+        """
+        try:
+            if self._watchdog is None:
+                from sonic_platform.watchdog import Watchdog
+                # Create the watchdog Instance
+                self._watchdog = Watchdog()
+
+        except Exception as e:
+            syslog.syslog(syslog.LOG_ERR, "Fail to load watchdog due to {}".format(e))
+        return self._watchdog
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..1c044638ed26
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/eeprom.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+    # Display vendor extension for Quanta platforms
+    _TLV_DISPLAY_VENDOR_EXT = True
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
+    def decoder(self, s, t):
+        '''
+        Return a string representing the contents of the TLV field. The format of
+        the string is:
+            1. The name of the field left justified in 20 characters
+            2. The type code in hex right justified in 5 characters
+            3. The length in decimal right justified in 4 characters
+            4. The value, left justified in however many characters it takes
+        The vailidity of EEPROM contents and the TLV field has been verified
+        prior to calling this function. The 's' parameter is unused
+        '''
+        if t[0] == self._TLV_CODE_PRODUCT_NAME:
+            name  = "Product Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PART_NUMBER:
+            name = "Part Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERIAL_NUMBER:
+            name  = "Serial Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_BASE:
+            name = "Base MAC Address"
+            value = ":".join(["{:02x}".format(T) for T in t[2:8]]).upper()
+        elif t[0] == self._TLV_CODE_MANUF_DATE:
+            name = "Manufacture Date"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DEVICE_VERSION:
+            name  = "Device Version"
+            value = str(t[2])
+        elif t[0] == self._TLV_CODE_LABEL_REVISION:
+            name  = "Label Revision"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PLATFORM_NAME:
+            name  = "Platform Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_ONIE_VERSION:
+            name  = "ONIE Version"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_SIZE:
+            name = "MAC Addresses"
+            value = str((t[2] << 8) | t[3])
+        elif t[0] == self._TLV_CODE_MANUF_NAME:
+            name = "Manufacturer"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MANUF_COUNTRY:
+            name = "Manufacture Country"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_NAME:
+            name = "Vendor Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DIAG_VERSION:
+            name = "Diag Version"
+            # Quanta legacy format of diag version
+            if t[1] == 4:
+                value = "{}.{}.{}.{}".format('{:02x}'.format(t[2])[0], '{:02x}'.format(t[2])[1],
+                                             '{:02x}'.format(t[3])[0], '{:02x}'.format(t[3])[1])
+            else:
+                value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERVICE_TAG:
+            name = "Service Tag"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_EXT:
+            name = "Vendor Extension"
+            value = ""
+            if self._TLV_DISPLAY_VENDOR_EXT:
+                for c in t[2:2 + t[1]]:
+                    value += "0x%02X " % c
+        elif t[0] == self._TLV_CODE_CRC_32 and len(t) == 6:
+            name = "CRC-32"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        # Quanta specific codes below here.
+        # These decodes are lifted from their U-Boot codes
+        elif t[0] == self._TLV_CODE_QUANTA_MAGIC and len(t) == 3:
+            name  = "Magic Number"
+            value = "0x%02X" % t[2]
+        elif t[0] == self._TLV_CODE_QUANTA_CRC and len(t) == 4:
+            name = "QUANTA-CRC"
+            value = "0x%04X" % ((t[2] << 8) + t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_CARD_TYPE and len(t) == 6:
+            name = "Card Type"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_HW_VERSION and len(t) == 6:
+            name = "Hardware Version"
+            value = "%d.%d" % (t[2], t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_SW_VERSION and len(t) == 6:
+            name = "Software Version"
+            value = "%d.%d.%d.%d" % ((t[2] >> 4), (t[2] & 0xF), (t[3] >> 4), (t[3] & 0xF))
+        elif t[0] == self._TLV_CODE_QUANTA_MANUF_DATE and len(t) == 6:
+            name = "Manufacture Date"
+            value = "%04d/%d/%d" % (((t[2] << 8) | t[3]), t[4], t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_MODEL_NAME:
+            name  = "Model Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        else:
+            name = "Unknown"
+            value = ""
+            for c in t[2:2 + t[1]]:
+                value += "0x%02X " % c
+        return name, value
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan.py
new file mode 100644
index 000000000000..97797df673e5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan.py
@@ -0,0 +1,226 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta IX8
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+FAN_INDEX_START = 21
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:41,
+            2:52,
+        }
+        self.psu_index_mapping = {
+            1:43,
+            2:54,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)//FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_rpm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR' and attr_rv != '0.0'):
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_pwm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR'):
+                return int(float(attr_rv))
+            else:
+                return False
+        else:
+            return 0
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/platform.py
new file mode 100644
index 000000000000..8d20abef9009
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+ 
+ 
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/psu.py
new file mode 100644
index 000000000000..60e0f29740db
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/psu.py
@@ -0,0 +1,316 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:43,
+            2:54,
+        }
+        self.psu_powerin_index_mapping = {
+            1:42,
+            2:53,
+        }
+        self.psu_currentout_index_mapping = {
+            1:40,
+            2:51,
+        }
+        self.psu_currentin_index_mapping = {
+            1:39,
+            2:50,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:48,
+            2:59,
+        }
+        self.psu_voltagein_index_mapping = {
+            1:47,
+            2:58,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+        self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
+        self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
+        self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_mfr_id(self):
+        """
+        Retrieves the manufacturer's name (or id) of the device
+
+        Returns:
+            string: Manufacturer's id of device
+        """
+        mfr_id = "N/A"
+        attr_path = HWMON_DIR+self.psu_mfr_id_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            mfr_id = attr_rv
+
+        return mfr_id
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_in = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_in = float(attr_rv) / 1000
+
+        return voltage_in
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_in = 0.0
+        attr_path = HWMON_DIR+self.psu_current_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_in = float(attr_rv) / 1000
+
+        return current_in
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_type(self):
+        """
+        Gets the type of the PSU
+
+        Returns:
+            A string, the type of PSU (AC/DC)
+        """
+        type = "AC"
+        attr_path = HWMON_DIR+self.psu_type_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            type = attr_rv
+
+        return type
+
+    def get_capacity(self):
+        """
+        Gets the capacity (maximum output power) of the PSU in watts
+
+        Returns:
+            An integer, the capacity of PSU
+        """
+        capacity = 0
+        attr_path = HWMON_DIR+self.psu_capacity_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            capacity = int(attr_rv)
+
+        return capacity
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..6679e96a7eb2
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/sfp.py
@@ -0,0 +1,1625 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+#import subprocess
+#import sonic_device_util
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+#     from sonic_platform_base.sonic_eeprom import eeprom_dts
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 1
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_MODULE_THRESHOLD_OFFSET = 512
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 560
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 56
+    QSFP_START = 49
+    QSFP_END = 56
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix8_rglbmc-r0"
+    HWSKU  = "Quanta-IX8-56X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 17,
+             2 : 18,
+             3 : 19,
+             4 : 20,
+             5 : 21,
+             6 : 22,
+             7 : 23,
+             8 : 24,
+             9 : 25,
+            10 : 26,
+            11 : 27,
+            12 : 28,
+            13 : 29,
+            14 : 30,
+            15 : 31,
+            16 : 32,
+            17 : 33,
+            18 : 34,
+            19 : 35,
+            20 : 36,
+            21 : 37,
+            22 : 38,
+            23 : 39,
+            24 : 40,
+            25 : 41,
+            26 : 42,
+            27 : 43,
+            28 : 44,
+            29 : 45,
+            30 : 46,
+            31 : 47,
+            32 : 48,
+            33 : 49,
+            34 : 50,
+            35 : 51,
+            36 : 52,
+            37 : 53,
+            38 : 54,
+            39 : 55,
+            40 : 56,
+            41 : 57,
+            42 : 58,
+            43 : 59,
+            44 : 60,
+            45 : 61,
+            46 : 62,
+            47 : 63,
+            48 : 64,
+            49 : 65,#QSFP49
+            50 : 66,#QSFP50
+            51 : 67,#QSFP51
+            52 : 68,#QSFP52
+            53 : 69,#QSFP53
+            54 : 70,#QSFP54
+            55 : 71,#QSFP55
+            56 : 72,#QSFP56
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+            'vendor_oui', 'application_advertisement']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
+            'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+            'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+            'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning',
+            'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning',
+            'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+            'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm',
+            'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+            'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            if self.sfp_type == SFP_TYPE:
+                reg_file = open("/sys/class/cpld-sfp28/port-"+str(self.port_num)+"/pre_n")
+            else:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+34)+"/value")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        reg_file.close()
+        if self.sfp_type == SFP_TYPE:
+            if reg_value == '1':
+                return True
+        else:
+            if reg_value == '0':
+                return True
+
+        return False
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability = int(qsfp_dom_capability_raw[0], 16)
+
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_OFFSET)
+                if qsfp_version_compliance_raw is not None:
+                    qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                else:
+                    self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                    return
+
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = (qsfp_dom_capability & 0x20 != 0)
+                    self.dom_volt_supported = (qsfp_dom_capability & 0x10 != 0)
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = (qsfp_dom_capability & 0x04 != 0)
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                self.dom_tx_disable_supported = True
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+         """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = QSFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = SFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+        else:
+            return transceiver_info_dict
+
+        # Add retry for xcvr eeprom to get ready
+        max_retry = 10
+        for i in range(0,max_retry):
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is not None:
+                break
+            else:
+                if not self.get_presence():
+                    return transceiver_info_dict
+                elif i == max_retry-1:
+                    pass
+                else:
+                    time.sleep(0.5)
+
+        if sfp_interface_bulk_raw is None:
+                return transceiver_info_dict
+
+        start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + interface_info_bulk_width
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_NAME_WIDTH
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_PN_WIDTH
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + vendor_rev_width
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_SN_WIDTH
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_OUI_WIDTH
+        sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_DATE_WIDTH
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+        transceiver_info_dict['type'] = sfp_interface_bulk_data \
+            ['data']['type']['value']
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+            ['data']['Vendor Name']['value']
+        transceiver_info_dict['model'] = sfp_vendor_pn_data \
+            ['data']['Vendor PN']['value']
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+            ['data']['Vendor Rev']['value']
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+            ['data']['Vendor SN']['value']
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+            ['data']['Vendor OUI']['value']
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+            ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+            ['data']['Connector']['value']
+        transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+            ['data']['EncodingCodes']['value']
+        transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+            ['data']['Extended Identifier']['value']
+        transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+            ['data']['RateIdentifier']['value']
+        transceiver_info_dict['type_abbrv_name'] = 'N/A'
+        if self.sfp_type == QSFP_TYPE:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['Nominal Bit Rate(100Mbs)']['value'])
+        else:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qsfp_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+            if not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+        else:
+            return None
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disable_channel'] = self.get_tx_disable_channel()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict_keys = ['temphighalarm',    'temphighwarning',    'templowalarm',    'templowwarning',
+                                                        'vcchighalarm',     'vcchighwarning',     'vcclowalarm',     'vcclowwarning',
+                                                        'rxpowerhighalarm', 'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning',
+                                                        'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+                                                        'txbiashighalarm',  'txbiashighwarning',  'txbiaslowalarm',  'txbiaslowwarning']
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 0
+            transceiver_dom_threshold_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            offset = DOM_OFFSET
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm']   = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm']    = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning']  = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm']    = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm']     = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning']  = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning']   = module_threshold_data['VccLowWarning']['value']
+
+            dom_channel_thres_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNEL_THRESHOLD_OFFSET), QSFP_CHANNEL_THRESHOLD_WIDTH)
+            if dom_channel_thres_raw is not None:
+                channel_threshold_values = sfpd_obj.parse_channel_threshold_values(dom_channel_thres_raw, 0)
+                channel_threshold_data = channel_threshold_values.get('data')
+            else:
+                channel_threshold_data = None
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm']   = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm']    = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning']  = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm']   = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm']    = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning']  = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm']    = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm']     = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning']  = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning']   = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 256
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm']      = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm']       = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning']    = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning']     = dom_module_threshold_data['data']['TempLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['vcchighalarm']       = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm']        = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning']     = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning']      = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txbiashighalarm']    = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm']     = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning']  = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning']   = dom_module_threshold_data['data']['BiasLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txpowerhighalarm']   = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm']    = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning']  = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm']   = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm']    = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning']  = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+        else:
+            return None
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+32)+"/value")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+        else:
+            return None
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+        else:
+            return None
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = \
+                    sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params( \
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/direction", 'r+') as f:
+                    f.write('out')
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+") as f:
+                    f.write('0')
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+") as f:
+                    f.write('1')
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value", "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..f2ba18754759
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/thermal.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon1/"
+
+thermal_index_mapping = {
+    1:44,
+    2:45,
+    3:46,
+    4:55,
+    5:56,
+    6:57,
+    7:70,
+    8:71,
+    9:72,
+   10:73,
+   11:74,
+   12:75,
+   13:76,
+   14:77,
+   15:78,
+}
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_ncrit".format(thermal_index_mapping[self.index])
+        self.high_crit_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_crit_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/watchdog.py
new file mode 100644
index 000000000000..282f356f4e73
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform/watchdog.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+
+#############################################################################
+# 
+# Watchdog contains an implementation of SONiC Platform Base Watchdog API
+#
+#############################################################################
+import fcntl
+import os
+import array
+
+try:
+    from sonic_platform_base.watchdog_base import WatchdogBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+""" ioctl constants """
+IO_WRITE = 0x40000000
+IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
+IO_SIZE_INT = 0x00040000
+IO_SIZE_40 = 0x00280000
+IO_TYPE_WATCHDOG = ord('W') << 8
+
+WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDR_40 = IO_READ | IO_SIZE_40 | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
+
+""" Watchdog ioctl commands """
+WDIOC_GETSUPPORT = 0 | WDR_40
+WDIOC_GETSTATUS = 1 | WDR_INT
+WDIOC_GETBOOTSTATUS = 2 | WDR_INT
+WDIOC_GETTEMP = 3 | WDR_INT
+WDIOC_SETOPTIONS = 4 | WDR_INT
+WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
+WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
+
+""" Watchdog status constants """
+WDIOS_DISABLECARD = 0x0001
+WDIOS_ENABLECARD = 0x0002
+
+WDT_COMMON_ERROR = -1
+WD_MAIN_IDENTITY = "iTCO_wdt"
+WDT_SYSFS_PATH = "/sys/class/watchdog/"
+
+DEFAULT_TIMEOUT=180
+
+class Watchdog(WatchdogBase):
+
+    def __init__(self):
+
+        self.watchdog, self.wdt_main_dev_name = self._get_wdt()
+        self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
+        self.state_path = "/sys/class/watchdog/%s/state" % self.wdt_main_dev_name
+        self.timeout_path = "/sys/class/watchdog/%s/timeout" % self.wdt_main_dev_name
+        # Set default value
+        self._disable()
+        self.armed = False
+        self.timeout = DEFAULT_TIMEOUT
+
+    def _is_wd_main(self, dev):
+        """
+        Checks watchdog identity
+        """
+        identity = self._read_file(
+            "{}/{}/identity".format(WDT_SYSFS_PATH, dev))
+        return identity == WD_MAIN_IDENTITY
+
+    def _get_wdt(self):
+        """
+        Retrieves watchdog device
+        """
+        wdt_main_dev_list = [dev for dev in os.listdir(
+            "/dev/") if dev.startswith("watchdog") and self._is_wd_main(dev)]
+        if not wdt_main_dev_list:
+            return None
+        wdt_main_dev_name = wdt_main_dev_list[0]
+        watchdog_device_path = "/dev/{}".format(wdt_main_dev_name)
+        self.watchdog = os.open(watchdog_device_path, os.O_RDWR)
+        return self.watchdog, wdt_main_dev_name
+
+    def _read_file(self, file_path):
+        """
+        Read text file
+        """
+        try:
+            with open(file_path, "r") as fd:
+                txt = fd.read()
+        except IOError:
+            return WDT_COMMON_ERROR
+        return txt.strip()
+
+    def _enable(self):
+        """
+        Turn on the watchdog timer
+        """
+        req = array.array('h', [WDIOS_ENABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _disable(self):
+        """
+        Turn off the watchdog timer
+        """
+        req = array.array('h', [WDIOS_DISABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _keepalive(self):
+        """
+        Keep alive watchdog timer
+        """
+        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
+        """
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
+        """
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+        return int(req[0])
+
+    def _gettimeout(self, timeout_path):
+        """
+        Get watchdog timeout
+        @return watchdog timeout
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
+    #################################################################
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog with a timeout of <seconds> seconds.
+        If the watchdog is currently armed, calling this function will
+        simply reset the timer to the provided value. If the underlying
+        hardware does not support the value provided in <seconds>, this
+        method should arm the watchdog with the *next greater* available
+        value.
+        Returns:
+            An integer specifying the *actual* number of seconds the watchdog
+            was armed with. On failure returns -1.
+        """
+
+        ret = WDT_COMMON_ERROR
+        if seconds < 0:
+            return ret
+
+        try:
+            if self.timeout != seconds:
+                self.timeout = self._settimeout(seconds)
+            if self.armed:
+                self._keepalive()
+            else:
+                self._settimeout(seconds)
+                self._enable()
+                self.armed = True
+            ret = self.timeout
+        except IOError as e:
+            pass
+
+        return ret
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False if not
+        """
+        disarmed = False
+        if self.is_armed():
+            try:
+                self._disable()
+                self.armed = False
+                disarmed = True
+            except IOError:
+                pass
+
+        return disarmed
+
+    def is_armed(self):
+        """
+        Retrieves the armed state of the hardware watchdog.
+        Returns:
+            A boolean, True if watchdog is armed, False if not
+        """
+
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        If the watchdog is armed, retrieve the number of seconds remaining on
+        the watchdog timer
+        Returns:
+            An integer specifying the number of seconds remaining on thei
+            watchdog timer. If the watchdog is not armed, returns -1.
+        """
+
+        timeleft = WDT_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft
+
+    def __del__(self):
+        """
+        Close watchdog
+        """
+
+        os.close(self.watchdog)
+
+
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform_setup.py
new file mode 100644
index 000000000000..1ec6ba42717e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',    
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',        
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/utils/quanta_ix8_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/utils/quanta_ix8_util.py
index fe93611b114c..19dc24e370bd 100755
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/utils/quanta_ix8_util.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/utils/quanta_ix8_util.py
@@ -21,19 +21,17 @@
 options:
     -h | --help     : this help message
     -d | --debug    : run with debug mode
-    -f | --force    : ignore error during installation or clean 
+    -f | --force    : ignore error during installation or clean
 command:
     install     : install drivers and generate related sysfs nodes
-    clean       : uninstall drivers and remove related sysfs nodes    
+    clean       : uninstall drivers and remove related sysfs nodes
 """
 
 import os
 import commands
 import sys, getopt
 import logging
-import re
 import time
-from collections import namedtuple
 
 DEBUG = False
 args = []
@@ -43,72 +41,68 @@
 
 if DEBUG == True:
     print sys.argv[0]
-    print 'ARGV      :', sys.argv[1:]   
+    print 'ARGV      :', sys.argv[1:]
 
 
 def main():
     global DEBUG
     global args
     global FORCE
-        
+
     if len(sys.argv)<2:
         show_help()
-         
+
     options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
                                                        'debug',
                                                        'force',
                                                           ])
-    if DEBUG == True:                                                           
+    if DEBUG == True:
         print options
         print args
         print len(sys.argv)
-            
+
     for opt, arg in options:
         if opt in ('-h', '--help'):
             show_help()
-        elif opt in ('-d', '--debug'):            
+        elif opt in ('-d', '--debug'):
             DEBUG = True
             logging.basicConfig(level=logging.INFO)
-        elif opt in ('-f', '--force'): 
+        elif opt in ('-f', '--force'):
             FORCE = 1
         else:
-            logging.info('no option')                          
-    for arg in args:            
+            logging.info('no option')
+    for arg in args:
         if arg == 'install':
            install()
         elif arg == 'clean':
            uninstall()
         else:
             show_help()
-            
-            
-    return 0              
-        
+
+
+    return 0
+
 def show_help():
     print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
     sys.exit(0)
-           
+
 def show_log(txt):
     if DEBUG == True:
         print "[IX8-56X]"+txt
     return
-    
+
 def exec_cmd(cmd, show):
-    logging.info('Run :'+cmd)  
-    status, output = commands.getstatusoutput(cmd)    
+    logging.info('Run :'+cmd)
+    status, output = commands.getstatusoutput(cmd)
     show_log (cmd +"with result:" + str(status))
-    show_log ("      output:"+output)    
+    show_log ("      output:"+output)
     if status:
         logging.info('Failed :'+cmd)
         if show:
             print('Failed :'+cmd)
     return  status, output
-        
+
 instantiate =[
-#turn on module power
-'echo 21 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio21/direction',
-'echo 1 >/sys/class/gpio/gpio21/value',
 #export pca9698 for qsfp present
 'echo 34 > /sys/class/gpio/export',
 'echo in > /sys/class/gpio/gpio34/direction',
@@ -126,31 +120,6 @@ def exec_cmd(cmd, show):
 'echo in > /sys/class/gpio/gpio58/direction',
 'echo 62 > /sys/class/gpio/export',
 'echo in > /sys/class/gpio/gpio62/direction',
-#export pca9698 for qsfp reset
-'echo 32 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio32/direction',
-'echo 1 >/sys/class/gpio/gpio32/value',
-'echo 36 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio36/direction',
-'echo 1 >/sys/class/gpio/gpio36/value',
-'echo 40 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio40/direction',
-'echo 1 >/sys/class/gpio/gpio40/value',
-'echo 44 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio44/direction',
-'echo 1 >/sys/class/gpio/gpio44/value',
-'echo 48 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio48/direction',
-'echo 1 >/sys/class/gpio/gpio48/value',
-'echo 52 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio52/direction',
-'echo 1 >/sys/class/gpio/gpio52/value',
-'echo 56 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio56/direction',
-'echo 1 >/sys/class/gpio/gpio56/value',
-'echo 60 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio60/direction',
-'echo 1 >/sys/class/gpio/gpio60/value',
 #export pca9698 for qsfp lpmode
 'echo 35 > /sys/class/gpio/export',
 'echo out > /sys/class/gpio/gpio35/direction',
@@ -176,14 +145,6 @@ def exec_cmd(cmd, show):
 'echo 63 > /sys/class/gpio/export',
 'echo out > /sys/class/gpio/gpio63/direction',
 'echo 0 >/sys/class/gpio/gpio63/value',
-#Reset fron-ports LED CPLD
-'echo 73 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio73/direction',
-'echo 0 >/sys/class/gpio/gpio73/value',
-'echo 1 >/sys/class/gpio/gpio73/value',
-#Enable front-ports LED decoding
-'echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode',
-'echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode',
 #SFP28 Module TxEnable
 'echo 0 > /sys/class/cpld-sfp28/port-1/tx_dis',
 'echo 0 > /sys/class/cpld-sfp28/port-2/tx_dis',
@@ -246,27 +207,40 @@ def exec_cmd(cmd, show):
 'lpc_ich',
 'i2c-i801',
 'i2c-dev',
+'i2c-mux-pca954x force_deselect_on_exit=1',
+'gpio-pca953x',
+'optoe',
+'qci_cpld_sfp28',
+'qci_cpld_led',
+'qci_platform_ix8',
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
+]
+
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
 'i2c-mux-pca954x',
 'gpio-pca953x',
 'optoe',
 'qci_cpld_sfp28',
 'qci_cpld_led',
 'qci_platform_ix8',
-'ipmi_devintf'
+'ipmi_devintf',
+'quanta_hwmon_ipmi'
 ]
- 
 
-                    
 def system_install():
     global FORCE
-	
+
     #remove default drivers to avoid modprobe order conflicts
-    status, output = exec_cmd("echo 'blacklist i2c-ismt' > /etc/modprobe.d/blacklist.conf", 1)
+    exec_cmd("echo 'blacklist i2c-ismt' > /etc/modprobe.d/blacklist.conf", 1)
     time.sleep(1)
-    status, output = exec_cmd("modprobe -r i2c-ismt ", 1)
-    status, output = exec_cmd("modprobe -r i2c-i801 ", 1)
+    exec_cmd("modprobe -r i2c-ismt ", 1)
+    exec_cmd("modprobe -r i2c-i801 ", 1)
     #setup driver dependency
-    status, output = exec_cmd("depmod -a ", 1)
+    exec_cmd("depmod -a ", 1)
     #install drivers
     for i in range(0,len(drivers)):
         status, output = exec_cmd("modprobe "+drivers[i], 1)
@@ -274,35 +248,62 @@ def system_install():
         print output
         if FORCE == 0:
             return status
-    				 
+
+    #turn on module power
+    exec_cmd("echo 21 > /sys/class/gpio/export ", 1)
+    exec_cmd("echo high > /sys/class/gpio/gpio21/direction ", 1)
+
+    # qsfp reset gpio
+    time.sleep(1)
+    for qsfp_reset in [32, 36, 40, 44, 48, 52, 56, 60]:
+        exec_cmd("echo "+str(qsfp_reset)+" > /sys/class/gpio/export", 1)
+        exec_cmd("echo high > /sys/class/gpio/gpio"+str(qsfp_reset)+"/direction", 1)
+
+    # Reset fron-ports LED CPLD
+    exec_cmd("echo 73 > /sys/class/gpio/export ", 1)
+    status, output = exec_cmd("cat /sys/class/gpio/gpio73/value", 1)
+    if output != '1':
+        exec_cmd("echo out > /sys/class/gpio/gpio73/direction ", 1)
+        exec_cmd("echo 0 >/sys/class/gpio/gpio73/value", 1)
+        exec_cmd("echo 1 >/sys/class/gpio/gpio73/value", 1)
+
     #instantiate devices
     for i in range(0,len(instantiate)):
-       status, output = exec_cmd(instantiate[i], 1)
+        status, output = exec_cmd(instantiate[i], 1)
     if status:
         print output
         if FORCE == 0:
             return status
-    
+
     #QSFP for 1~56 port
     for port_number in range(1,57):
-        bus_number = port_number + 31
+        bus_number = port_number + 16
         os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
-    
-    return 
-     
-        
+
+    status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix8_rglbmc-r0/sonic_platform-1.0-py3-none-any.whl",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+
+    #Enable front-ports LED decoding
+    exec_cmd('echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode', 1)
+    exec_cmd('echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode', 1)
+
+    return
+
 def system_ready():
-    if not device_found(): 
+    if not device_found():
         return False
     return True
-               
-def install():                      
+
+def install():
     if not device_found():
-        print "No device, installing...."     
-        status = system_install() 
+        print "No device, installing...."
+        status = system_install()
         if status:
-            if FORCE == 0:        
-                return  status        
+            if FORCE == 0:
+                return  status
     else:
         print " ix8 driver already installed...."
     return
@@ -310,17 +311,27 @@ def install():
 def uninstall():
     global FORCE
     #uninstall drivers
-    for i in range(len(drivers)-1,-1,-1):
-       status, output = exec_cmd("rmmod "+drivers[i], 1)
+    for i in range(len(un_drivers)-1,-1,-1):
+       status, output = exec_cmd("rmmod "+un_drivers[i], 1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
     if status:
 	   print output
-	   if FORCE == 0:                
+	   if FORCE == 0:
 	      return status
     return
 
 def device_found():
-    ret1, log = exec_cmd("ls "+i2c_prefix+"i2c-0", 0)
-    return ret1				
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix8 > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix8", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
 
 if __name__ == "__main__":
     main()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/classes/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/classes/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/Makefile
new file mode 100644
index 000000000000..209ad8eaaf3d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/Makefile
@@ -0,0 +1 @@
+obj-m:=qci_cpld_sfp28.o qci_cpld_led.o qci_platform_ix8a_bwde.o quanta_hwmon_ipmi.o
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_led.c
new file mode 100644
index 000000000000..9be8920f51e9
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_led.c
@@ -0,0 +1,279 @@
+/*
+ * A LED CPLD driver for Quanta Switch Platform
+ *
+ * The CPLD is customize by Quanta for decode led bit stream,
+ * This driver modify from Quanta CPLD I/O driver.
+ *
+ * Copyright (C) 2015 Quanta Inc.
+ *
+ * Author: Luffy Cheng <luffy.cheng@quantatw.com>
+ * Author: Roger Chang <Roger.Chang@quantatw.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/log2.h>
+#include <linux/slab.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+
+static DEFINE_IDA(cpld_led_ida);
+
+enum platform_type {
+	IX7 = 0,
+	IX8A_BWDE,
+	NONE
+};
+
+static struct class *cpld_class = NULL;
+
+struct cpld_data {
+	struct i2c_client *cpld_client;
+	char name[8];
+	u8 cpld_id;
+};
+
+struct cpld_led_data {
+	struct mutex lock;
+	struct device *port_dev;
+	struct cpld_data *cpld_data;
+};
+
+static int cpld_led_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id);
+static int cpld_led_remove(struct i2c_client *client);
+
+static const struct i2c_device_id cpld_led_id[] = {
+	{ "CPLDLED_IX7", IX7 },
+	{ "CPLDLED_IX8A_BWDE", IX8A_BWDE },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cpld_led_id);
+
+static struct i2c_driver cpld_led_driver = {
+	.class		= I2C_CLASS_HWMON,
+	.driver = {
+		.name	= "qci_cpld_led",
+	},
+	.probe		= cpld_led_probe,
+	.remove		= cpld_led_remove,
+	.id_table	= cpld_led_id,
+//	.address_list	= normal_i2c,
+};
+
+#define CPLD_LED_ID_PREFIX "CPLDLED-"
+#define CPLD_LED_ID_FORMAT CPLD_LED_ID_PREFIX "%d"
+
+#define	CPLD_DECODER_OFFSET	0x4
+#define	CPLD_DECODER_MASK	0x1
+#define CPLD_USERCODE_START_OFFSET	0x0
+
+static ssize_t get_led_decode(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 offset = (u8)(CPLD_DECODER_OFFSET);
+	s32 value;
+
+	value = i2c_smbus_read_byte_data(client, offset);
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read led decode value= %x\n", value);
+
+	value &= CPLD_DECODER_MASK;
+
+	return sprintf(buf, "%d\n", (value == 0) ? 1 : 0);
+}
+
+static ssize_t get_usercode(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 i = 0;
+	s32 value = 0, reading = 0;
+
+	for (i = 0; i < 4; i++)
+	{
+		reading = i2c_smbus_read_byte_data(client, CPLD_USERCODE_START_OFFSET + i);
+		if (reading < 0)
+			return -ENODEV;
+
+		dev_dbg(&client->dev, "read led usercode reg %d value= %x\n", i, reading);
+
+		value |= reading << (24 - 8 * i);
+	}
+
+	return sprintf(buf, "%X\n", value);
+}
+
+static ssize_t set_led_decode(struct device *dev,
+			    struct device_attribute *devattr,
+			    const char *buf,
+			    size_t count)
+{
+	struct cpld_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	s32 value;
+	long enable;
+
+	if (kstrtol(buf, 0, &enable))
+		return -EINVAL;
+
+	if ((enable != 1) && (enable != 0))
+		return -EINVAL;
+
+//	mutex_lock(&data->lock);
+	value = i2c_smbus_read_byte_data(client, CPLD_DECODER_OFFSET);
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read led decode value= %x\n", value);
+
+	value |= CPLD_DECODER_MASK;
+	if (enable)
+		value &= ~CPLD_DECODER_MASK;
+
+	dev_dbg(&client->dev, "write led decode value= %x\n", value);
+
+	i2c_smbus_write_byte_data(client, CPLD_DECODER_OFFSET, (u8)value);
+//	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static DEVICE_ATTR(led_decode, S_IWUSR | S_IRUGO, get_led_decode, set_led_decode);
+static DEVICE_ATTR(usercode, S_IRUGO, get_usercode, NULL);
+
+static const struct attribute *led_attrs[] = {
+	&dev_attr_usercode.attr,
+	&dev_attr_led_decode.attr,
+	NULL,
+};
+
+static const struct attribute_group led_attr_group = {
+	.attrs = (struct attribute **) led_attrs,
+};
+
+static int cpld_led_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct cpld_led_data *data;
+	struct cpld_data *led_data;
+	struct device *port_dev;
+	int nr, err;
+
+	if (!cpld_class)
+	{
+		cpld_class = class_create(THIS_MODULE, "cpld-led");
+		if (IS_ERR(cpld_class)) {
+			pr_err("couldn't create sysfs class\n");
+			return PTR_ERR(cpld_class);
+		}
+	}
+
+	data = devm_kzalloc(&client->dev, sizeof(struct cpld_led_data),
+			    GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	/* Test */
+	nr = ida_simple_get(&cpld_led_ida, 1, 99, GFP_KERNEL);
+	if (nr < 0)
+		goto err_out;
+
+	led_data = kzalloc(sizeof(struct cpld_led_data), GFP_KERNEL);
+
+	port_dev = device_create(cpld_class, &client->dev, MKDEV(0,0), led_data, CPLD_LED_ID_FORMAT, nr);
+	if (IS_ERR(port_dev)) {
+		err = PTR_ERR(port_dev);
+		// printk("err_status\n");
+	}
+
+	data->port_dev = port_dev;
+	data->cpld_data = led_data;
+
+	dev_info(&client->dev, "Register CPLDLED %d\n", nr);
+
+	sprintf(led_data->name, "LED%d-data", nr);
+	led_data->cpld_id = nr;
+	dev_set_drvdata(port_dev, led_data);
+	port_dev->init_name = led_data->name;
+	led_data->cpld_client = client;
+
+	err = sysfs_create_group(&port_dev->kobj, &led_attr_group);
+	// if (status)	printk("err status\n");
+	/* end */
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->lock);
+
+	dev_info(&client->dev, "%s device found\n", client->name);
+
+
+	return 0;
+
+err_out:
+	return nr;
+}
+
+/* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if 0
+static int idr_has_entry(int id, void *p, void *data)
+{
+	return 1;
+}
+
+static bool cpld_idr_is_empty(struct idr *idp)
+{
+	return !idr_for_each(idp, idr_has_entry, NULL);
+}
+#endif
+
+static int cpld_led_remove(struct i2c_client *client)
+{
+	struct cpld_led_data *data = i2c_get_clientdata(client);
+
+	dev_info(data->port_dev, "Remove CPLDLED-%d\n", data->cpld_data->cpld_id);
+	device_unregister(data->port_dev);
+	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
+	kfree(data->cpld_data);
+
+	if (ida_is_empty(&cpld_led_ida)) {
+		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
+
+	return 0;
+}
+
+module_i2c_driver(cpld_led_driver);
+
+MODULE_AUTHOR("Luffy Cheng <luffy.cheng@quantatw.com>");
+MODULE_AUTHOR("Roger Chang <Roger.Chang@quantatw.com>");
+MODULE_DESCRIPTION("Quanta Switch LED CPLD driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_sfp28.c b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_sfp28.c
new file mode 100644
index 000000000000..a36bdf94bcae
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_cpld_sfp28.c
@@ -0,0 +1,381 @@
+/*
+ * A CPLD driver for monitor SFP28 module I/O
+ *
+ * The CPLD is customize by Quanta for controlling SFP28 module signals,
+ * they are TX_FAULT , TX_DIS , PRE_N , RX_LOS
+ * Each CPLD control 16 modules, each module use 4 bits in register.
+ *
+ * Copyright (C) 2015 Quanta Inc.
+ *
+ * Author: Luffy Cheng <luffy.cheng@quantatw.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/log2.h>
+#include <linux/slab.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+
+static DEFINE_IDA(cpld_ida);
+
+enum platform_type {
+	SFP = 0,
+	SFP28,
+	NONE
+};
+
+static struct class *cpld_class = NULL;
+
+struct sfp_data {
+	struct i2c_client *cpld_client;
+	char name[8];
+	u8 port_id;
+	u8 cpld_port;
+};
+
+struct cpld_data {
+	struct mutex lock;
+	struct device *port_dev[16];
+	struct sfp_data *port_data[16];
+};
+
+static int cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id);
+static int cpld_remove(struct i2c_client *client);
+
+static const struct i2c_device_id cpld_id[] = {
+	{ "CPLD-SFP", SFP },
+	{ "CPLD-SFP28", SFP28 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cpld_id);
+
+static struct i2c_driver cpld_driver = {
+	.class		= I2C_CLASS_HWMON,
+	.driver = {
+		.name	= "qci_cpld_sfp28",
+	},
+	.probe		= cpld_probe,
+	.remove		= cpld_remove,
+	.id_table	= cpld_id,
+//	.address_list	= normal_i2c,
+};
+
+#define CPLD_ID_PREFIX "port-"
+#define CPLD_ID_FORMAT CPLD_ID_PREFIX "%d"
+
+//SFP28 
+#define TX_FAULT_MASK 			0x08
+#define TX_DIS_MASK	 			0x04
+#define PRE_N_MASK 				0x02
+#define RX_LOS_MASK 			0x01
+
+static inline u8 get_group_cmd(u8 group)
+{
+	//FIXME: if group cmd change
+	return (group + 1);
+}
+
+static inline u8 port_remapping(u8 phy_port)
+{
+	/* FIXME: implement by hardware design */
+	/* The CPLD register port mapping is weird :
+	 * MSB -------- LSB		(word data)
+	 * P3	P4	P1	P2		(per port 4 bits)
+	 * For easy coding bit shift, we treat it as hw port swap
+	 */
+	return (phy_port % 2) ? (phy_port - 1) : (phy_port + 1);
+}
+
+//SFP
+static ssize_t get_tx_fault(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= TX_FAULT_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+
+static ssize_t get_tx_dis(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= TX_DIS_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+
+static ssize_t get_pre_n(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= PRE_N_MASK;
+
+	//FIXME: if present is not low active
+	return sprintf(buf, "%d\n", value ? 0 : 1);
+}
+
+static ssize_t get_rx_los(struct device *dev,
+			     struct device_attribute *devattr,
+			     char *buf)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value >>= (group_port * 4);
+	value &= RX_LOS_MASK;
+
+	return sprintf(buf, "%d\n", value ? 1 : 0);
+}
+static ssize_t set_tx_dis(struct device *dev,
+			    struct device_attribute *devattr,
+			    const char *buf,
+			    size_t count)
+{
+	struct sfp_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->cpld_client;
+	u8 group = (u8)(data->cpld_port / 4);
+	u8 group_port = data->cpld_port % 4;
+	s32 value;
+	long disable;
+
+	dev_dbg(&client->dev, "port_id %d => cpld_port %d, group %d(%d)\n", data->port_id,
+				data->cpld_port + 1, group + 1, group_port + 1);
+
+	if (kstrtol(buf, 0, &disable))
+		return -EINVAL;
+
+	if ((disable != 1) && (disable != 0))
+		return -EINVAL;
+
+//	mutex_lock(&data->lock);
+	value = i2c_smbus_read_word_data(client, get_group_cmd(group));
+	if (value < 0)
+		return -ENODEV;
+
+	dev_dbg(&client->dev, "read group%d value= %x\n", group + 1, value);
+
+	value &= ~(TX_DIS_MASK << (group_port * 4));
+	if (disable)
+		value |= (TX_DIS_MASK << (group_port * 4));
+
+	dev_dbg(&client->dev, "write group%d value= %x\n", group + 1, value);
+
+	i2c_smbus_write_word_data(client, get_group_cmd(group), (u16)value);
+//	mutex_unlock(&data->lock);
+
+	return count;
+}
+//SFP
+
+//SFP
+static DEVICE_ATTR(tx_fault, S_IRUGO, get_tx_fault, NULL);
+static DEVICE_ATTR(tx_dis, S_IWUSR | S_IRUGO, get_tx_dis, set_tx_dis);
+static DEVICE_ATTR(pre_n, S_IRUGO, get_pre_n, NULL);
+static DEVICE_ATTR(rx_los, S_IRUGO, get_rx_los, NULL);
+
+static const struct attribute *sfp_attrs[] = {
+	&dev_attr_tx_fault.attr,
+	&dev_attr_tx_dis.attr,
+	&dev_attr_pre_n.attr,
+	&dev_attr_rx_los.attr,
+	NULL,
+};
+
+static const struct attribute_group sfp_attr_group = {
+	.attrs = (struct attribute **) sfp_attrs,
+};
+
+static int cpld_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct cpld_data *data;
+	struct sfp_data *port_data;
+	struct device *port_dev;
+	int port_nr, i=0, err;
+
+	printk("cpld cpld_probe\n");
+
+	if (!cpld_class)
+	{
+		cpld_class = class_create(THIS_MODULE, "cpld-sfp28");
+		if (IS_ERR(cpld_class)) {
+			pr_err("couldn't create sysfs class\n");
+			return PTR_ERR(cpld_class);
+		}
+	}
+
+	data = devm_kzalloc(&client->dev, sizeof(struct cpld_data),
+			    GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	/* register sfp port data to sysfs */
+	for (i = 0; i < 16; i++)
+	{
+		port_nr = ida_simple_get(&cpld_ida, 1, 99, GFP_KERNEL);
+		if (port_nr < 0)
+			goto err_out;
+
+		port_data = kzalloc(sizeof(struct sfp_data), GFP_KERNEL);
+
+		port_dev = device_create(cpld_class, &client->dev, MKDEV(0,0), port_data, CPLD_ID_FORMAT, port_nr);
+		if (IS_ERR(port_dev)) {
+			err = PTR_ERR(port_dev);
+			printk("err_status\n");
+		}
+
+		data->port_dev[i] = port_dev;
+		data->port_data[i] = port_data;
+
+		dev_info(&client->dev, "Register port-%d\n", port_nr);
+
+		/* FIXME: implement Logical/Physical port remapping */
+		//port_data->cpld_port = i;
+		port_data->cpld_port = port_remapping(i);
+		sprintf(port_data->name, "port-%d", port_nr);
+		port_data->port_id = port_nr;
+		dev_set_drvdata(port_dev, port_data);
+		port_dev->init_name = port_data->name;
+		port_data->cpld_client = client;
+
+		err = sysfs_create_group(&port_dev->kobj, &sfp_attr_group);
+		// if (status)	printk("err status\n");
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->lock);
+
+	dev_info(&client->dev, "%s device found\n", client->name);
+
+
+	return 0;
+
+err_out:
+	return port_nr;
+}
+
+/* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if 0
+static int idr_has_entry(int id, void *p, void *data)
+{
+	return 1;
+}
+
+static bool cpld_idr_is_empty(struct idr *idp)
+{
+	return !idr_for_each(idp, idr_has_entry, NULL);
+}
+#endif
+
+static int cpld_remove(struct i2c_client *client)
+{
+	struct cpld_data *data = i2c_get_clientdata(client);
+	int i;
+
+	for (i = 15; i >= 0; i--)
+	{
+		dev_info(data->port_dev[i], "Remove port-%d\n", data->port_data[i]->port_id);
+		device_unregister(data->port_dev[i]);
+		ida_simple_remove(&cpld_ida, data->port_data[i]->port_id);
+		kfree(data->port_data[i]);
+	}
+
+	if (ida_is_empty(&cpld_ida))
+	{
+		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
+
+	return 0;
+}
+
+module_i2c_driver(cpld_driver);
+
+MODULE_AUTHOR("Luffy Cheng <luffy.cheng@quantatw.com>");
+MODULE_DESCRIPTION("Quanta Switch SFP28 CPLD driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_platform_ix8a_bwde.c b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_platform_ix8a_bwde.c
new file mode 100644
index 000000000000..e5f6a6529d40
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/qci_platform_ix8a_bwde.c
@@ -0,0 +1,372 @@
+/*
+ *  Quanta ix8a_bwde platform driver
+ *
+ *
+ *  Copyright (C) 2014 Quanta Computer inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/err.h>
+#include <linux/proc_fs.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
+#include <linux/input-polldev.h>
+#include <linux/rfkill.h>
+#include <linux/slab.h>
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
+#include <linux/platform_data/pca953x.h>
+#else
+#include <linux/i2c/pca953x.h>
+#endif
+
+static struct pca953x_platform_data pca9539_1_data = {
+	.gpio_base = 0x10,
+};
+
+static struct pca953x_platform_data pca9698_data = {
+	.gpio_base = 0x20,
+};
+//CPU Linking Board at CPU's I2C Bus
+static struct pca953x_platform_data pca9555_CPU_data = {
+	.gpio_base = 0x48,
+};
+
+static struct i2c_board_info ix8a_bwde_i2c_devices[] = {
+	{
+		I2C_BOARD_INFO("pca9546", 0x72),	// 0
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x77),	// 1
+	},
+	{
+		I2C_BOARD_INFO("pca9539", 0x74),	// 2
+		.platform_data = &pca9539_1_data,
+	},
+	{
+		I2C_BOARD_INFO("24c02", 0x54),		// 3
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 4
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 5
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 6
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 7
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 8
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 9
+	},
+	{
+		I2C_BOARD_INFO("pca9548", 0x73),	// 10
+	},
+	{
+		I2C_BOARD_INFO("CPLD-SFP28", 0x38),	// 11
+	},
+	{
+		I2C_BOARD_INFO("CPLD-SFP28", 0x38),	// 12
+	},
+	{
+		I2C_BOARD_INFO("CPLD-SFP28", 0x38),	// 13
+	},
+	{
+		I2C_BOARD_INFO("pca9698", 0x21),
+		.platform_data = &pca9698_data,		// 14
+	},
+	{
+		I2C_BOARD_INFO("optoe1", 0x50),     // 15 0x50 QSFP EEPROM
+	},
+	{
+		I2C_BOARD_INFO("pca9555", 0x22),	// 16 CPU Linking Board at CPU's I2C Bus
+		.platform_data = &pca9555_CPU_data,
+	},
+	{
+		I2C_BOARD_INFO("CPLDLED_IX8A_BWDE", 0x3a),	// 17 0x72 ch0 CPLD4 LED function of SFP28 & QSFP28 (Port27~56)
+	},
+	{
+		I2C_BOARD_INFO("CPLDLED_IX8A_BWDE", 0x39),	// 18 0x72 ch0 CPLD6 LED function of SFP28 & QSFP28 (Port1~26)
+	},
+	{
+		I2C_BOARD_INFO("optoe2", 0x50),     // 19 0x50 SFP28 EEPROM
+	},
+};
+
+static struct platform_driver ix8a_bwde_platform_driver = {
+	.driver = {
+		.name = "qci-ix8a-bwde",
+		.owner = THIS_MODULE,
+	},
+};
+
+static struct platform_device *ix8a_bwde_device;
+
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 18; // num of ix8a_bwde_i2c_devices - 2 (for optoe1, optoe2)
+int numof_ports = 56;
+
+static int __init ix8a_bwde_platform_init(void)
+{
+	struct i2c_adapter *adapter;
+	int ret, i;
+
+	ret = platform_driver_register(&ix8a_bwde_platform_driver);
+	if (ret < 0)
+		return ret;
+
+	/* Register platform stuff */
+	ix8a_bwde_device = platform_device_alloc("qci-ix8a_bwde", -1);
+	if (!ix8a_bwde_device) {
+		ret = -ENOMEM;
+		goto fail_platform_driver;
+	}
+
+	ret = platform_device_add(ix8a_bwde_device);
+	if (ret)
+		goto fail_platform_device;
+
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
+	adapter = i2c_get_adapter(0);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[0]);		// pca9546_1
+		g_client[1] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[1]);		// pca9548_1
+		g_client[2] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[16]);	// CPU Linking Board at CPU's I2C Bus  //
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x01);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[11]);		// CPLD_1
+		g_client[4] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[17]);	// CPLD_4  //
+		g_client[5] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[18]);	// CPLD_6  //
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x02);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[6] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[12]);		// CPLD_2
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x03);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[7] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[13]);		// CPLD_3
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x04);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[8] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[2]);		// pca9539_1
+		g_client[9] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[14]);		// pca9698_QSFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x05);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[10] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[4]);		// pca9548_1 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x06);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[11] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[5]);		// pca9548_2 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x07);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[6]);		// pca9548_3 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x08);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[13] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[7]);		// pca9548_4 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x09);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[14] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[8]);		// pca9548_5 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x0a);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[15] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[9]);		// pca9548_6 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x0b);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[16] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[10]);		// pca9548_7 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x03);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[17] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[3]);		// eeprom
+		i2c_put_adapter(adapter);
+	}
+
+	for(i = 13; i < 69; i ++){
+		adapter = i2c_get_adapter(i);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			if (i < 61)  // SFP28 1~48 EEPROM
+				g_client_port[i - 13] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[19]);
+			else  // QSFP 49~56 EEPROM
+				g_client_port[i - 13] = i2c_new_device(adapter, &ix8a_bwde_i2c_devices[15]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
+	return 0;
+
+fail_platform_device:
+	platform_device_put(ix8a_bwde_device);
+
+fail_platform_driver:
+	platform_driver_unregister(&ix8a_bwde_platform_driver);
+	return ret;
+}
+
+static void __exit ix8a_bwde_platform_exit(void)
+{
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
+	platform_device_unregister(ix8a_bwde_device);
+	platform_driver_unregister(&ix8a_bwde_platform_driver);
+}
+
+module_init(ix8a_bwde_platform_init);
+module_exit(ix8a_bwde_platform_exit);
+
+
+MODULE_AUTHOR("Robert Hong (robert.hong@qct.io)");
+MODULE_DESCRIPTION("Quanta ix8a-bwde Platform Driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..65517e5d915a
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1814 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg  0
+#define DEBUGUSE_SHIFT    0
+
+#define DRVNAME   "quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)     ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)    (int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)    (int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)  (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)  (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX     17
+#define SENSOR_ATTR_NAME_LENGTH 20
+
+#define SENSOR_GET_CAP_LABEL  0x001
+#define SENSOR_GET_CAP_ALARM  0x002
+#define SENSOR_GET_CAP_INPUT  0x004
+
+#define SENSOR_GET_CAP_LNC    0x008
+#define SENSOR_GET_CAP_LCR    0x010
+#define SENSOR_GET_CAP_LNR    0x020
+
+#define SENSOR_GET_CAP_UNC    0x040
+#define SENSOR_GET_CAP_UCR    0x080
+#define SENSOR_GET_CAP_UNR    0x100
+
+#define SENSOR_GET_CAP_MODEL  0x200
+#define SENSOR_GET_CAP_SN   0x400
+#define SENSOR_GET_CAP_PWM    0x800
+
+#define SENSOR_GET_CAP_CONMODE    0x1000
+#define SENSOR_GET_CAP_DIRECTION  0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT  0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT  0x8000
+
+#define SENSOR_GET_CAP_MFRID  0x10000
+
+#define SDR_SENSOR_TYPE_TEMP  0x01
+#define SDR_SENSOR_TYPE_VOLT  0x02
+#define SDR_SENSOR_TYPE_CURR  0x03
+#define SDR_SENSOR_TYPE_FAN   0x04
+#define SDR_SENSOR_TYPE_PS    0x08
+#define SDR_SENSOR_TYPE_OTHER 0x0b
+
+#define BMC_GET_DEVICE_ID   0x01
+
+#define IPMI_NETFN_SE     0x04
+#define IPMI_NETFN_APP      0x06
+#define IPMI_NETFN_STORAGE    0x0a
+#define IPMI_NETFN_TSOL     0x30
+
+#define GET_SDR_REPO_INFO   0x20
+#define GET_DEVICE_SDR      0x21
+#define GET_SDR_RESERVE_REPO  0x22
+#define GET_SDR         0x23
+#define GET_SENSOR_THRESHOLDS 0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS 0x2b
+#define GET_SENSOR_READING    0x2d
+#define GET_PSU_READING     0x52
+#define GET_FAN_INFO      0xd6
+#define GET_FRU_INFO      0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK    (0x80)  /* 1 = provides SDRs      */
+#define IPMI_TIMEOUT      (4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE 1
+
+struct quanta_hwmon_ipmi_data
+{
+  struct platform_device  *ipmi_platform_dev;
+  struct device     *ipmi_hwmon_dev;
+  /*struct mutex      ipmi_lock; */
+
+  int32_t         total_sensor_id;
+  int32_t         total_suport_sensor;
+  int32_t         total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data
+{
+  uint8_t addr;
+  uint8_t sensor_type;
+  uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+  uint32_t capability;
+
+  struct header_info
+  {
+    uint8_t header_type;
+    uint8_t header_byte;
+  } headerinfo;
+
+  struct record_info
+  {
+    uint8_t record_analog;
+    uint8_t record_linearization;
+
+    int32_t record_m;
+    int32_t record_b;
+    int32_t record_k1;
+    int32_t record_k2;
+  } recordinfo;
+
+  struct threshold_upper_info
+  {
+    uint8_t unr;
+    uint8_t ucr;
+    uint8_t unc;
+  } upperinfo;
+
+  struct threshold_lower_info
+  {
+    uint8_t lnr;
+    uint8_t lcr;
+    uint8_t lnc;
+  } lowerinfo;
+
+  struct attr_info
+  {
+    bool attr_exist;
+    char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+    char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+    struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+    struct attribute_group  attr_group;
+    struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+  } attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data
+{
+  int32_t tx_id;
+
+  int32_t rx_result;
+  int64_t rx_len;
+  void *rx_data;
+  struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator
+{
+  uint16_t reservation;
+  int32_t total;
+  int32_t next;
+};
+
+struct ipm_devid_rsp
+{
+  uint8_t device_id;
+  uint8_t device_revision;
+  uint8_t fw_rev1;
+  uint8_t fw_rev2;
+  uint8_t ipmi_version;
+  uint8_t adtl_device_support;
+  uint8_t manufacturer_id[3];
+  uint8_t product_id[2];
+  uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs
+{
+  uint8_t version;  /* SDR version (51h) */
+  uint16_t count;   /* number of records */
+  uint16_t free;    /* free space in SDR */
+  uint32_t add_stamp; /* last add timestamp */
+  uint32_t erase_stamp; /* last del timestamp */
+  uint8_t op_support; /* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs
+{
+  uint8_t count;  /* number of records */
+  uint8_t flags;  /* flags */
+  uint8_t popChangeInd[3];  /* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs
+{
+  uint16_t next;    /* next record id */
+  uint16_t id;    /* record ID */
+  uint8_t version;  /* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR     0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR    0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR  0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC    0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC 0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR  0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR  0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR 0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION   0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO  0x14
+#define SDR_RECORD_TYPE_OEM     0xc0
+  uint8_t type;   /* record type */
+  uint8_t length;   /* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq
+{
+  uint16_t reserve_id;  /* reservation ID */
+  uint16_t id;    /* record ID */
+  uint8_t offset;   /* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD 0xff
+  uint8_t length;   /* length to read */
+} __attribute__((packed));
+
+struct entity_id
+{
+  uint8_t id;     /* physical entity id */
+#ifdef WORDS_BIGENDIAN
+  uint8_t logical : 1;  /* physical/logical */
+  uint8_t instance : 7; /* instance number */
+#else
+  uint8_t instance : 7; /* instance number */
+  uint8_t logical : 1;  /* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask
+{
+  union
+  {
+    struct
+    {
+      uint16_t assert_event;  /* assertion event mask */
+      uint16_t deassert_event;  /* de-assertion event mask */
+      uint16_t read;  /* discrete reading mask */
+    } discrete;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved : 1;
+      uint16_t status_lnr : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnc : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lnc_low : 1;
+#else
+      uint16_t assert_lnc_low : 1;
+      uint16_t assert_lnc_high : 1;
+      uint16_t assert_lcr_low : 1;
+      uint16_t assert_lcr_high : 1;
+      uint16_t assert_lnr_low : 1;
+      uint16_t assert_lnr_high : 1;
+      uint16_t assert_unc_low : 1;
+      uint16_t assert_unc_high : 1;
+      uint16_t assert_ucr_low : 1;
+      uint16_t assert_ucr_high : 1;
+      uint16_t assert_unr_low : 1;
+      uint16_t assert_unr_high : 1;
+      uint16_t status_lnc : 1;
+      uint16_t status_lcr : 1;
+      uint16_t status_lnr : 1;
+      uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+      uint16_t reserved_2 : 1;
+      uint16_t status_unr : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unc : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lnc_low : 1;
+#else
+      uint16_t deassert_lnc_low : 1;
+      uint16_t deassert_lnc_high : 1;
+      uint16_t deassert_lcr_low : 1;
+      uint16_t deassert_lcr_high : 1;
+      uint16_t deassert_lnr_low : 1;
+      uint16_t deassert_lnr_high : 1;
+      uint16_t deassert_unc_low : 1;
+      uint16_t deassert_unc_high : 1;
+      uint16_t deassert_ucr_low : 1;
+      uint16_t deassert_ucr_high : 1;
+      uint16_t deassert_unr_low : 1;
+      uint16_t deassert_unr_high : 1;
+      uint16_t status_unc : 1;
+      uint16_t status_ucr : 1;
+      uint16_t status_unr : 1;
+      uint16_t reserved_2 : 1;
+#endif
+      union
+      {
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* settable threshold mask */
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+          /* padding lower 8 bits */
+          uint16_t readable : 8;
+#else
+          uint16_t readable : 8;
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+#endif
+        } set;
+        struct
+        {
+#ifdef WORDS_BIGENDIAN      /* readable threshold mask */
+          /* padding upper 8 bits */
+          uint16_t settable : 8;
+          uint16_t reserved : 2;
+          uint16_t unr : 1;
+          uint16_t ucr : 1;
+          uint16_t unc : 1;
+          uint16_t lnr : 1;
+          uint16_t lcr : 1;
+          uint16_t lnc : 1;
+#else
+          uint16_t lnc : 1;
+          uint16_t lcr : 1;
+          uint16_t lnr : 1;
+          uint16_t unc : 1;
+          uint16_t ucr : 1;
+          uint16_t unr : 1;
+          uint16_t reserved : 2;
+          uint16_t settable : 8;
+#endif
+        } read;
+      };
+    } threshold;
+  } type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor
+{
+  struct
+  {
+    uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+    uint8_t channel : 4;  /* channel number */
+    uint8_t __reserved : 2;
+    uint8_t lun : 2;  /* sensor owner lun */
+#else
+    uint8_t lun : 2;  /* sensor owner lun */
+    uint8_t __reserved : 2;
+    uint8_t channel : 4;  /* channel number */
+#endif
+    uint8_t sensor_num; /* unique sensor number */
+  } keys;
+
+  struct entity_id entity;
+
+  struct
+  {
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t __reserved : 1;
+      uint8_t scanning : 1;
+      uint8_t events : 1;
+      uint8_t thresholds : 1;
+      uint8_t hysteresis : 1;
+      uint8_t type : 1;
+      uint8_t event_gen : 1;
+      uint8_t sensor_scan : 1;
+#else
+      uint8_t sensor_scan : 1;
+      uint8_t event_gen : 1;
+      uint8_t type : 1;
+      uint8_t hysteresis : 1;
+      uint8_t thresholds : 1;
+      uint8_t events : 1;
+      uint8_t scanning : 1;
+      uint8_t __reserved : 1;
+#endif
+    } init;
+    struct
+    {
+#ifdef WORDS_BIGENDIAN
+      uint8_t ignore : 1;
+      uint8_t rearm : 1;
+      uint8_t hysteresis : 2;
+      uint8_t threshold : 2;
+      uint8_t event_msg : 2;
+#else
+      uint8_t event_msg : 2;
+      uint8_t threshold : 2;
+      uint8_t hysteresis : 2;
+      uint8_t rearm : 1;
+      uint8_t ignore : 1;
+#endif
+    } capabilities;
+    uint8_t type;
+  } sensor;
+
+  uint8_t event_type; /* event/reading type code */
+
+  struct sdr_record_mask mask;
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t analog : 2;
+    uint8_t rate : 3;
+    uint8_t modifier : 2;
+    uint8_t pct : 1;
+#else
+    uint8_t pct : 1;
+    uint8_t modifier : 2;
+    uint8_t rate : 3;
+    uint8_t analog : 2;
+#endif
+    struct
+    {
+      uint8_t base;
+      uint8_t modifier;
+    } type;
+  } unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+  uint8_t linearization;  /* 70h=non linear, 71h-7Fh=non linear, OEM */
+  uint16_t mtol;    /* M, tolerance */
+  uint32_t bacc;    /* accuracy, B, Bexp, Rexp */
+
+  struct
+  {
+#ifdef WORDS_BIGENDIAN
+    uint8_t __reserved : 5;
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+#else
+    uint8_t nominal_read : 1; /* nominal reading field specified */
+    uint8_t normal_max : 1; /* normal max field specified */
+    uint8_t normal_min : 1; /* normal min field specified */
+    uint8_t __reserved : 5;
+#endif
+  } analog_flag;
+
+  uint8_t nominal_read; /* nominal reading, raw value */
+  uint8_t normal_max; /* normal maximum, raw value */
+  uint8_t normal_min; /* normal minimum, raw value */
+  uint8_t sensor_max; /* sensor maximum, raw value */
+  uint8_t sensor_min; /* sensor minimum, raw value */
+
+  struct
+  {
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } upper;
+    struct
+    {
+      uint8_t non_recover;
+      uint8_t critical;
+      uint8_t non_critical;
+    } lower;
+    struct
+    {
+      uint8_t positive;
+      uint8_t negative;
+    } hysteresis;
+  } threshold;
+  uint8_t __reserved[2];
+  uint8_t oem;    /* reserved for OEM use */
+  uint8_t id_code;  /* sensor ID string type/length code */
+  uint8_t id_string[16];  /* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+  /* function input parameter (a * 10 ^ b) */
+  int32_t i = 0, r = 1, temp_b = 0;
+
+  temp_b = (b > 0) ? b : -b;
+
+  for (i = 0; i < temp_b; i++)
+  {
+    r = r * 10;
+  }
+
+  if (b > 0)
+  {
+    *a = (*a) * r;
+    r = 1;
+  }
+  /* function return parameter calc_result = *a, decimal_point = r */
+  return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+  while (*buf >= '0' && *buf <= '9')
+  {
+    *output_val = *output_val * 10 + *buf - '0';
+    buf++;
+  }
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+  int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+  struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+  ipmi_wait_queue--;
+
+  if (msg->msg.data[0] != 0)
+  {
+    if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07)
+        && (msg->msg.cmd != 0x52))
+    {
+      /*skip master r/w cmd return code */
+      printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn,
+             msg->msg.cmd);
+      rv = msg->msg.data[0];
+      goto get_BMC_response_fail;
+    }
+  }
+
+  if (msg->msgid != comm_data->tx_id)
+  {
+    printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid,
+           comm_data->tx_id);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len <= 0)
+  {
+    printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+    goto get_BMC_response_fail;
+  }
+
+  if (msg->msg.data_len > 1)
+  {
+    if (comm_data->rx_len)
+    {
+      comm_data->rx_len = msg->msg.data_len - 1;
+      memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+    }
+    else
+    {
+      printk("ipmi: rx len = 0, it should be not retrun ?\n");
+      goto get_BMC_response_fail;
+    }
+  }
+
+  rv = 0;
+
+get_BMC_response_fail:
+  ipmi_free_recv_msg(msg);
+
+  if (ipmi_wait_queue == 0)
+  {
+    comm_data->rx_result = rv;
+    if (rv == 0)
+    {
+      complete(comm_data->rx_read_complete);
+    }
+  }
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg,
+                                       struct ipmi_comm_data *comm_data)
+{
+  int32_t rv = 0;
+  int32_t escape_time = 0;
+
+  struct ipmi_addr ipmi_address;
+
+  if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE)
+  {
+    /* printk("msg queue full, cannot send ipmi cmd\n"); */
+    return -EBUSY;
+  }
+  ipmi_wait_queue++;
+
+  ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+  ipmi_address.channel = IPMI_BMC_CHANNEL;
+  ipmi_address.data[0] = 0;
+
+  rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+  if (rv)
+  {
+    printk("ipmi_validate_addr fail, err code : %d\n", rv);
+    return rv;
+  }
+
+  ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg,
+                       comm_data, 0, 0, 0);
+
+  escape_time = wait_for_completion_timeout(comm_data->rx_read_complete,
+                                            IPMI_TIMEOUT);
+
+  rv = comm_data->rx_result;
+  if (escape_time == 0)
+  {
+    printk("BMC not response (%d)\n", escape_time);
+  }
+
+  return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len,
+                             void *msg_rx_data, int32_t msg_rx_len)
+{
+  int32_t i = 0;
+  int32_t rv = 0;
+
+  static uint64_t tx_msgid = 1;
+
+  struct kernel_ipmi_msg msg;
+  struct ipmi_comm_data *comm_data = NULL;
+  struct completion read_complete;
+
+  init_completion(&read_complete);
+
+  /* prepare transfer message */
+  msg.netfn = msg_tx_data[0];
+  msg.cmd = msg_tx_data[1];
+  msg.data_len = msg_tx_len - 2;
+
+  msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+  if (msg.data == NULL)
+  {
+    printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+  if (comm_data == NULL)
+  {
+    printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+    rv = -ENOMEM;
+    goto alloc_mem_fail;
+  }
+
+  for (i = 2; i < msg_tx_len; i++)
+  {
+    msg.data[i - 2] = msg_tx_data[i];
+  }
+
+  comm_data->tx_id = tx_msgid++;
+
+  /* prepare recive message */
+  comm_data->rx_data = msg_rx_data;
+  comm_data->rx_len = msg_rx_len;
+  comm_data->rx_result = -1;
+  comm_data->rx_read_complete = &read_complete;
+
+  rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+  if (msg.data)
+  {
+    kfree(msg.data);
+  }
+  if (comm_data)
+  {
+    kfree(comm_data);
+  }
+  if (tx_msgid > UINT_MAX)
+  {
+    tx_msgid = 1;
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t *reserve_id)
+{
+  int32_t rv = 0;
+  uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; /*netfn = 0x00; cmd = GET_SDR_RESERVE_REPO; */
+
+  msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+  /* obtain reservation ID */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+
+#if enable_debug_msg
+  printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; /*netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID; */
+
+  struct ipm_devid_rsp devid;
+
+  /* check SDRR capability */
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return rv;
+  }
+
+  if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK)
+  {
+    if ((devid.adtl_device_support & 0x02) == 0)
+    {
+      if ((devid.adtl_device_support & 0x01))
+      {
+        printk("Using Device SDRs\n");
+        g_use_built_in = 1;
+      }
+      else
+      {
+        printk("Error obtaining SDR info\n");
+      }
+    }
+  }
+
+  if (g_use_built_in == 0)
+  {
+    struct sdr_repo_info_rs sdr_info;
+    /* get sdr repository info */
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+
+#if enable_debug_msg
+    printk("SDR version: 0x%x\n", sdr_info.version);
+    printk("SDR free space: %d\n", sdr_info.free);
+#endif
+  }
+  else
+  {
+    struct sdr_device_info_rs sdr_info;
+    /* get device sdr info */
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_SDR_REPO_INFO;
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+    itr->total = sdr_info.count;
+  }
+
+#if enable_debug_msg
+  printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+  }
+  else
+  {
+    itr->next = 0;
+    rv = ipmi_sdr_get_reservation(&(itr->reservation));
+  }
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr,
+                            struct sdr_get_rs *sdr_rs)
+{
+  int32_t rv = 0;
+
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  sdr_rq.reserve_id = itr->reservation;
+  sdr_rq.id = itr->next;
+  sdr_rq.offset = 0;
+  sdr_rq.length = 5;  /* only get the header */
+
+  if (g_use_built_in == 0)
+  {
+    msg_data[0] = IPMI_NETFN_STORAGE;
+    msg_data[1] = GET_SDR;
+  }
+  else
+  {
+    msg_data[0] = IPMI_NETFN_SE;
+    msg_data[1] = GET_DEVICE_SDR;
+  }
+
+  memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+  if ((rv) || (sdr_rs->length == 0))
+  {
+    printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+    return -1;
+  }
+
+  if (sdr_rs->id != itr->next)
+  {
+#if enable_debug_msg
+    printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+    sdr_rs->id = itr->next;
+  }
+#if enable_debug_msg
+  printk("\nSDR record ID   : 0x%04x", itr->next);
+  printk("SDR record type : 0x%02x\n", sdr_rs->type);
+  printk("SDR record next : 0x%04x\n", sdr_rs->next);
+  printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+  return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs *header,
+                            struct ipmi_sdr_iterator  *itr, uint8_t *ret_data)
+{
+  int32_t rv = 0, len = 0;
+
+  uint8_t buff[128] = "";
+  uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /*netfn = 0x00; cmd = 0x00; */
+
+  struct sdr_get_rq sdr_rq;
+
+  len = header->length;
+  if (len > 0)
+  {
+    memset(&sdr_rq, 0, sizeof(sdr_rq));
+    sdr_rq.reserve_id = itr->reservation;
+    sdr_rq.id = header->id;
+    sdr_rq.offset = 5;
+    sdr_rq.length = len;
+
+    if (g_use_built_in == 0)
+    {
+      msg_data[0] = IPMI_NETFN_STORAGE;
+      msg_data[1] = GET_SDR;
+    }
+    else
+    {
+      msg_data[0] = IPMI_NETFN_SE;
+      msg_data[1] = GET_DEVICE_SDR;
+    }
+
+    memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      memset(buff, 0, sizeof(buff));
+      memcpy(buff, ret_data + 2, sdr_rq.length);
+      memcpy(ret_data, buff, sdr_rq.length + 2);
+    }
+  }
+
+  return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx,
+                                   struct sdr_record_full_sensor *sensor)
+{
+
+  /* lower threshold info */
+  if (sensor->mask.type.threshold.read.lnc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+  }
+  if (sensor->mask.type.threshold.read.lcr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+  }
+  if (sensor->mask.type.threshold.read.lnr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+  }
+  g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+  g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+  g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+  /* upper threshold info */
+  if (sensor->mask.type.threshold.read.unc)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+  }
+  if (sensor->mask.type.threshold.read.ucr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+  }
+  if (sensor->mask.type.threshold.read.unr)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+  }
+  g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+  g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+  g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx,
+                                struct sdr_record_full_sensor *sensor)
+{
+  char *loc = NULL;
+
+  g_sensor_data[idx].sensor_type = sensor->sensor.type;
+  sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+  g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+  g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+  g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+  g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+  g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+  memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00,
+         SENSOR_ATTR_NAME_LENGTH);
+
+  switch (g_sensor_data[idx].sensor_type)
+  {
+    case SDR_SENSOR_TYPE_TEMP:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+      break;
+    case SDR_SENSOR_TYPE_VOLT:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      break;
+    case SDR_SENSOR_TYPE_FAN:
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+      g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+      break;
+    case SDR_SENSOR_TYPE_PS:
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+      if (loc)
+      {
+        if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0)
+        {
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+          g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+        }
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+      }
+
+      loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+      if (loc)
+      {
+        sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      }
+
+      break;
+    case SDR_SENSOR_TYPE_CURR:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+      break;
+    case SDR_SENSOR_TYPE_OTHER:
+      sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+      break;
+    default:
+      printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+      break;
+  }
+
+  if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0)
+  {
+    g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+  }
+
+#if enable_debug_msg
+  {
+    printk("\n********************\n");
+
+    printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m,
+           g_sensor_data[idx].recordinfo.record_b
+           , g_sensor_data[idx].recordinfo.record_k1,
+           g_sensor_data[idx].recordinfo.record_k2);
+
+    printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n",
+           g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+           , g_sensor_data[idx].recordinfo.record_analog,
+           g_sensor_data[idx].recordinfo.record_linearization);
+
+    printk("\n********************\n");
+  }
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val,
+                                   int32_t *point_result)
+{
+  int32_t m = g_sensor_data[idx].recordinfo.record_m;
+  int32_t b = g_sensor_data[idx].recordinfo.record_b;
+  int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+  int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+  int32_t decimal_point = 0;
+  int32_t result = 0;
+
+  decimal_point = pow_convert(&b, k1);
+
+  switch (g_sensor_data[idx].recordinfo.record_analog)
+  {
+    case 0:
+      result = m * val * decimal_point + b;
+      break;
+    case 1:
+      if (val & 0x80)
+      {
+        val++;
+      }
+    case 2:
+      result = (m * (int16_t)val) * decimal_point + b;
+      break;
+    default:
+      return;
+  }
+
+  pow_convert(&result, k2);
+  if (k1 < 0)
+  {
+    *point_result += -k1;
+  }
+  if (k2 < 0)
+  {
+    *point_result += -k2;
+  }
+
+  if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN)
+  {
+    result = result * 1000; /*shift for lm-sensors */
+  }
+
+  return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value,
+                               int8_t *ret_str)
+{
+  int32_t calc_result = 0, point_result = 0;
+  int32_t temp_len = 0;
+
+  uint8_t temp_str[16] = "";
+
+  calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+  temp_len = sprintf(temp_str, "%d", calc_result);
+  temp_len = temp_len - point_result;
+
+  /* int part */
+  if (temp_len <= 0)
+  {
+    sprintf(ret_str, "0");
+  }
+  else
+  {
+    snprintf(ret_str, temp_len + 1, "%s",
+             temp_str);  /* +1 for snprintf reserve space'\0' */
+  }
+
+  /* point part */
+  strcat(ret_str, ".");
+
+  /* float part */
+  if ((point_result == 0) || (temp_len < 0))
+  {
+    strcat(ret_str, "0");
+  }
+  else
+  {
+    strcat(ret_str, temp_str + temp_len);
+  }
+
+  /* EOL part */
+  strcat(ret_str, "\n\0");
+
+  return (temp_len + 1 + point_result +
+          2); /*integer + point + float + EOL + \0 */
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+  uint8_t slot_mask = 0x0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; /*netfn = 0x36; cmd = 0xB9; */
+  /*uint8_t msg_data[] = { 0x06, 0x52, 0x1B, 0x4C, 0x01, 0x00 }; //netfn = IPMI_NETFN_APP; cmd = GET_PSU_READING; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return 0;
+  }
+  else
+  {
+    slot_mask = (psu_slot == 1) ? 0x01 : 0x02;
+    return (returnData[0] & slot_mask) ? 0 : 1;
+  }
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+  uint8_t psu_slot = 0;
+  int32_t rv = 0;
+
+  uint8_t returnData[128] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xBB, 0x4C, 0x1C, 0x00, cmd, 0x00 }; /*netfn = 0x36; cmd = 0xBB; */
+
+  if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))
+  {
+    psu_slot = 1;
+  }
+  else
+  {
+    psu_slot = 2;
+  }
+
+  if (ipmi_check_psu_present(psu_slot))
+  {
+    msg_data[6] = psu_slot;
+    mutex_lock(&ipmi_lock);
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+    mutex_unlock(&ipmi_lock);
+
+    if (rv)
+    {
+      printk("BMC down at (%d)!!\n", __LINE__);
+    }
+    else
+    {
+      return sprintf(retbuf, "%s\n", returnData);
+    }
+  }
+  else
+  {
+    /*printk("Error ! cannot detect PSU%d\n", psu_slot); */
+  }
+
+  return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; /*netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  if (cmd_data1)
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+  }
+  else
+  {
+    rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  }
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    sprintf(retbuf, "N/A\n");
+  }
+  else
+  {
+    sprintf(retbuf, "%s", returnData);
+  }
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%s\n",
+                 g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  int32_t rv = 0;
+
+  uint8_t returnData[4] = "";
+  uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; /*netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING; */
+
+  mutex_lock(&ipmi_lock);
+  msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "0.0\n");
+  }
+  else
+  {
+    return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+  }
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT,
+                                g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+  uint8_t returnData[10] = { 0 };
+  ipmi_fan_control(0x00, 0x00, returnData);
+  return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  if (g_fan_control_mode == 1)
+  {
+    ipmi_fan_control(0x01, store_input, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_controlmode(struct device *dev,
+                                struct device_attribute *devattr, char *buf)
+{
+  return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev,
+                                 struct device_attribute *devattr, const char *buf, size_t count)
+{
+  uint8_t store_input = 0;
+  uint8_t returnData[10] = { 0 };
+  simple_atoi(buf, &store_input);
+  g_fan_control_mode = store_input;
+  if (g_fan_control_mode == 3)
+  {
+    ipmi_fan_control(0x7f, 0xff, returnData);
+  }
+
+  return count;
+}
+
+static ssize_t show_direction(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; /*netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO; */
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  if (rv)
+  {
+    printk("BMC down at (%d)!!\n", __LINE__);
+    return sprintf(buf, "N/A\n");
+  }
+  else
+  {
+    return sprintf(buf, "%c\n", returnData[1]);
+  }
+}
+
+static ssize_t show_fanpresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t rv = 0;
+  int32_t fan_idx = 0, fan_present = 0;
+
+  uint8_t returnData[10] = { 0 };
+  uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; /*netfn = 0x36; cmd = 0xB9; */
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  struct kernel_ipmi_msg msg;
+
+  fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+
+  mutex_lock(&ipmi_lock);
+  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+  mutex_unlock(&ipmi_lock);
+
+  fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+  return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+  int32_t psu_idx = 0;
+
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+  psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+  return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                           struct device_attribute *devattr, char *buf) =
+{
+  show_label, show_crit_alarm, show_input
+  , show_lnc, show_lcr, show_lnr
+  , show_unc, show_ucr, show_unr
+  , show_model, show_sn, show_pwm
+  , show_controlmode, show_direction, show_fanpresent
+  , show_psupresent, show_mfrid
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
+                                                            struct device_attribute *devattr, const char *buf, size_t count) =
+{
+  NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, NULL
+  , NULL, NULL, store_pwm
+  , store_controlmode, NULL, NULL
+  , NULL, NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+  "%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+  , "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+  , "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+  , "%s%d_model", "%s%d_sn", "%s%d_pwm"
+  , "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+  , "%s%d_present", "%s%d_mfrid"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+  int32_t i = 0, j = 0;
+
+  struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+  printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+  for (i = 0; i < SENSOR_ATTR_MAX; i++)
+  {
+    if ((g_sensor_data[attr_no].capability >> i) & 0x01)
+    {
+      snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i],
+               attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+      sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+      attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+      attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+      attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+      attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+      if (attrdata->sd_attrs[j].dev_attr.store)
+      {
+        attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+      }
+
+      attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+      attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+      j++;
+
+      data->total_create_sysfs++;
+    }
+  }
+
+  attrdata->attrs[j] = NULL;
+  attrdata->attr_group.attrs = attrdata->attrs;
+
+  g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+  return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+  int32_t i = 0;
+
+  for (i = 0; i < data->total_sensor_id; i++)
+  {
+    if (g_sensor_data[i].attrinfo.attr_exist)
+    {
+      sysfs_remove_group(&data->ipmi_hwmon_dev->kobj,
+                         &g_sensor_data[i].attrinfo.attr_group);
+    }
+  }
+  return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+  int32_t sdr_idx = 0;
+  int32_t err = 0;
+
+  struct ipmi_sdr_iterator *itr = NULL;
+  struct sdr_get_rs *header = NULL;
+
+  uint8_t *rec = NULL;
+
+  mutex_lock(&ipmi_lock);
+
+  itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+  if (itr == NULL)
+  {
+    printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+    goto itr_malloc_fail;
+  }
+
+  header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+  if (header == NULL)
+  {
+    printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+    goto header_malloc_fail;
+  }
+
+  err = ipmi_sdr_start(itr);
+  if (err)
+  {
+    printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+    goto ipmi_sdr_start_fail;
+  }
+
+  data->total_sensor_id = itr->total;
+  rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+  if (rec == NULL)
+  {
+    printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+    goto rec_malloc_fail;
+  }
+
+  g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data),
+                          GFP_KERNEL);
+  if (g_sensor_data == NULL)
+  {
+    printk("%s(%d): malloc failure", __func__, __LINE__);
+    goto g_sensor_data_malloc_fail;
+  }
+
+  memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+  for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++)
+  {
+    err = ipmi_sdr_get_header(itr, header);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_header_fail;
+    }
+
+
+    memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+    err = ipmi_sdr_get_record(header, itr, rec);
+    if (err)
+    {
+      if (err == 0xC5)
+      {
+        /* C5h : Reservation Invalid */
+#if enable_debug_msg
+        printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+        printk("ipmi: retry\n");
+#endif
+        ipmi_sdr_get_reservation(&(itr->reservation));
+        sdr_idx--;
+        continue;
+      }
+      printk("ipmi: Get SDR header fail,so break this request\n");
+      goto ipmi_sdr_get_record_fail;
+    }
+
+    itr->next = header->next;
+
+    switch (header->type)
+    {
+      case SDR_RECORD_TYPE_FULL_SENSOR:
+        /* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+        g_sensor_data[sdr_idx].addr = rec[2];
+        g_sensor_data[sdr_idx].capability =
+          SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+        g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+        g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+        ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor *) rec);
+        ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor *) rec);
+
+        if (sdr_idx >= DEBUGUSE_SHIFT)
+        {
+          err = create_sensor_attrs(sdr_idx);
+          if (err)
+          {
+            g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+            printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx,
+                   g_sensor_data[sdr_idx].sensor_idstring);
+            goto create_sysfs_fail;
+          }
+        }
+
+        data->total_suport_sensor++;
+
+        break;
+      case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+      case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+      default:
+        g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+        printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+        break;
+    }
+  }
+
+  printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n",
+         data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+  if (header)
+  {
+    kfree(header);
+    header = NULL;
+  }
+  if (rec)
+  {
+    kfree(rec);
+    rec = NULL;
+  }
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+  if (itr)
+  {
+    kfree(itr);
+    itr = NULL;
+  }
+
+itr_malloc_fail:
+  mutex_unlock(&ipmi_lock);
+
+  return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+  int32_t err = 0;
+
+  init_completion(&g_read_complete);
+
+  data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+  if (NULL == data)
+  {
+    printk("alloc data fail\n");
+    goto alloc_err;
+  }
+
+  data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+  err = IS_ERR(data->ipmi_platform_dev);
+  if (err)
+  {
+    printk("platform device register fail (err : %d)\n", err);
+    goto device_reg_err;
+  }
+
+  data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL,
+                                                           NULL);
+  err = IS_ERR(data->ipmi_hwmon_dev);
+  if (err)
+  {
+    printk("hwmon register fail\n");
+    goto hwmon_register_err;
+  }
+
+  err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+  if (err)
+  {
+    printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+    goto ipmi_create_err;
+  }
+
+  mutex_init(&ipmi_lock);
+  err = ipmi_init_sdr_sensors_data();
+  if (err)
+  {
+    printk("init sensor data fail (err : %d)\n", err);
+    goto init_sensor_err;
+  }
+
+  return 0;
+
+init_sensor_err:
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+ipmi_create_err:
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+  platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+alloc_err:
+  return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{
+  remove_sensor_attrs();
+  hwmon_device_unregister(data->ipmi_hwmon_dev);
+
+  mutex_lock(&ipmi_lock);
+  ipmi_destroy_user(ipmi_mh_user);
+  mutex_unlock(&ipmi_lock);
+
+  platform_device_unregister(data->ipmi_platform_dev);
+
+  if (g_sensor_data)
+  {
+    kfree(g_sensor_data);
+    g_sensor_data = NULL;
+  }
+
+  if (data)
+  {
+    kfree(data);
+    data = NULL;
+  }
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/service/ix8a-bwde-platform-init.service b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/service/ix8a-bwde-platform-init.service
new file mode 100644
index 000000000000..4527d70bd39d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/service/ix8a-bwde-platform-init.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Quanta IX8A-BWDE-56X Platform initialization service
+Before=pmon.service
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/quanta_ix8a_bwde_util.py install
+ExecStop=/usr/local/bin/quanta_ix8a_bwde_util.py clean
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/setup.py
new file mode 100644
index 000000000000..a157e46cb60d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/setup.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+   name='ix8a_bwde_56x',
+   version='1.0',
+   description='Module to initialize Quanta IX8A-BWDE-56X platforms',
+   
+   packages=['ix8a_bwde_56x'],
+   package_dir={'ix8a_bwde_56x': 'ix8a-bwde-56x/classes'},
+)
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..4bfefa0fb636
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..c765f3734473
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/chassis.py
@@ -0,0 +1,232 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    import syslog
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus = 2
+        self.__num_of_ports = 56
+        self.__num_of_sfps = 48
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 28
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            if index in range(1, self.__num_of_sfps + 1):
+                sfp = Sfp(index, 'SFP')
+            else:
+                sfp = Sfp(index, 'QSFP')
+
+            self._sfp_list.append(sfp)
+
+        for index in range(1, self.__num_of_ports + 1):
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta IX8A the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    ##############################################
+    # Other methods
+    ##############################################
+    def get_watchdog(self):
+        """
+        Retreives hardware watchdog device on this chassis
+
+        Returns:
+            An object derived from WatchdogBase representing the hardware
+            watchdog device
+        """
+        try:
+            if self._watchdog is None:
+                from sonic_platform.watchdog import Watchdog
+                # Create the watchdog Instance
+                self._watchdog = Watchdog()
+
+        except Exception as e:
+            syslog.syslog(syslog.LOG_ERR, "Fail to load watchdog due to {}".format(e))
+        return self._watchdog
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..d154a8a0c4a0
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/eeprom.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo    
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan.py
new file mode 100644
index 000000000000..8aae9147c444
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan.py
@@ -0,0 +1,226 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta IX8A-BWDE
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+FAN_INDEX_START = 18
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:120,
+            2:132,
+        }
+        self.psu_index_mapping = {
+            1:114,
+            2:126,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)//FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_rpm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR' and attr_rv != '0.0'):
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_pwm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR'):
+                return int(float(attr_rv))
+            else:
+                return False
+        else:
+            return 0
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/platform.py
new file mode 100644
index 000000000000..8d20abef9009
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+ 
+ 
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/psu.py
new file mode 100644
index 000000000000..bd3f4ce8089e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/psu.py
@@ -0,0 +1,319 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:114,
+            2:126,
+        }
+        self.psu_powerin_index_mapping = {
+            1:119,
+            2:131,
+        }
+        self.psu_currentout_index_mapping = {
+            1:130,
+            2:115,
+        }
+        self.psu_currentin_index_mapping = {
+            1:130,
+            2:115,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:129,
+            2:124,
+        }
+        self.psu_voltagein_index_mapping = {
+            1:125,
+            2:128,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+        self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
+        self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
+        self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_mfr_id(self):
+        """
+        Retrieves the manufacturer's name (or id) of the device
+
+        Returns:
+            string: Manufacturer's id of device
+        """
+        mfr_id = "N/A"
+        attr_path = HWMON_DIR+self.psu_mfr_id_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            mfr_id = attr_rv
+
+        return mfr_id
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_in = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_in = float(attr_rv) / 1000
+
+        return voltage_in
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_in = 0.0
+        attr_path = HWMON_DIR+self.psu_current_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_in = float(attr_rv) / 1000
+
+        return current_in
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_type(self):
+        """
+        Gets the type of the PSU
+
+        Returns:
+            A string, the type of PSU (AC/DC)
+        """
+        type = "AC"
+        attr_path = HWMON_DIR+self.psu_type_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            type = attr_rv
+
+        return type
+
+    def get_capacity(self):
+        """
+        Gets the capacity (maximum output power) of the PSU in watts
+
+        Returns:
+            An integer, the capacity of PSU
+        """
+        capacity = 0
+        attr_path = HWMON_DIR+self.psu_capacity_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            try:
+                capacity = int(attr_rv)
+            except ValueError:
+                capacity = 0
+
+        return capacity
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..3b75b6927578
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/sfp.py
@@ -0,0 +1,1633 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+#import subprocess
+#import sonic_device_util
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+#     from sonic_platform_base.sonic_eeprom import eeprom_dts
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 1
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_MODULE_THRESHOLD_OFFSET = 512
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 560
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 56
+    QSFP_START = 49
+    QSFP_END = 56
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix8a_bwde-r0"
+    HWSKU  = "Quanta-IX8A-BWDE-56X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 13,
+             2 : 14,
+             3 : 15,
+             4 : 16,
+             5 : 17,
+             6 : 18,
+             7 : 19,
+             8 : 20,
+             9 : 21,
+            10 : 22,
+            11 : 23,
+            12 : 24,
+            13 : 25,
+            14 : 26,
+            15 : 27,
+            16 : 28,
+            17 : 29,
+            18 : 30,
+            19 : 31,
+            20 : 32,
+            21 : 33,
+            22 : 34,
+            23 : 35,
+            24 : 36,
+            25 : 37,
+            26 : 38,
+            27 : 39,
+            28 : 40,
+            29 : 41,
+            30 : 42,
+            31 : 43,
+            32 : 44,
+            33 : 45,
+            34 : 46,
+            35 : 47,
+            36 : 48,
+            37 : 49,
+            38 : 50,
+            39 : 51,
+            40 : 52,
+            41 : 53,
+            42 : 54,
+            43 : 55,
+            44 : 56,
+            45 : 57,
+            46 : 58,
+            47 : 59,
+            48 : 60,
+            49 : 61,#QSFP49
+            50 : 62,#QSFP50
+            51 : 63,#QSFP51
+            52 : 64,#QSFP52
+            53 : 65,#QSFP53
+            54 : 66,#QSFP54
+            55 : 67,#QSFP55
+            56 : 68,#QSFP56
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+            'vendor_oui', 'application_advertisement']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
+            'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+            'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+            'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning',
+            'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning',
+            'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+            'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm',
+            'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+            'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            if self.sfp_type == SFP_TYPE:
+                reg_file = open("/sys/class/cpld-sfp28/port-"+str(self.port_num)+"/pre_n")
+            else:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+34)+"/value")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        reg_file.close()
+        if self.sfp_type == SFP_TYPE:
+            if reg_value == '1':
+                return True
+        else:
+            if reg_value == '0':
+                return True
+
+        return False
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability = int(qsfp_dom_capability_raw[0], 16)
+
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_OFFSET)
+                if qsfp_version_compliance_raw is not None:
+                    qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                else:
+                    self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                    return
+
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = (qsfp_dom_capability & 0x20 != 0)
+                    self.dom_volt_supported = (qsfp_dom_capability & 0x10 != 0)
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = (qsfp_dom_capability & 0x04 != 0)
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                self.dom_tx_disable_supported = True
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+         """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = QSFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = SFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+        else:
+            return transceiver_info_dict
+
+        # Add retry for xcvr eeprom to get ready
+        max_retry = 10
+        for i in range(0,max_retry):
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is not None:
+                break
+            else:
+                if not self.get_presence():
+                    return transceiver_info_dict
+                elif i == max_retry-1:
+                    pass
+                else:
+                    time.sleep(0.5)
+
+        if sfp_interface_bulk_raw is None:
+                return transceiver_info_dict
+
+        start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + interface_info_bulk_width
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_NAME_WIDTH
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_PN_WIDTH
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + vendor_rev_width
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_SN_WIDTH
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_OUI_WIDTH
+        sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_DATE_WIDTH
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+        transceiver_info_dict['type'] = sfp_interface_bulk_data \
+            ['data']['type']['value']
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+            ['data']['Vendor Name']['value']
+        transceiver_info_dict['model'] = sfp_vendor_pn_data \
+            ['data']['Vendor PN']['value']
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+            ['data']['Vendor Rev']['value']
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+            ['data']['Vendor SN']['value']
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+            ['data']['Vendor OUI']['value']
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+            ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+            ['data']['Connector']['value']
+        transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+            ['data']['EncodingCodes']['value']
+        transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+            ['data']['Extended Identifier']['value']
+        transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+            ['data']['RateIdentifier']['value']
+        transceiver_info_dict['type_abbrv_name'] = 'N/A'
+        if self.sfp_type == QSFP_TYPE:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['Nominal Bit Rate(100Mbs)']['value'])
+        else:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qsfp_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+            if not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+        else:
+            return None
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disable_channel'] = self.get_tx_disable_channel()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict_keys = ['temphighalarm',    'temphighwarning',    'templowalarm',    'templowwarning',
+                                                        'vcchighalarm',     'vcchighwarning',     'vcclowalarm',     'vcclowwarning',
+                                                        'rxpowerhighalarm', 'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning',
+                                                        'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+                                                        'txbiashighalarm',  'txbiashighwarning',  'txbiaslowalarm',  'txbiaslowwarning']
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 0
+            transceiver_dom_threshold_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            offset = DOM_OFFSET
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm']   = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm']    = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning']  = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm']    = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm']     = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning']  = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning']   = module_threshold_data['VccLowWarning']['value']
+
+            dom_channel_thres_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNEL_THRESHOLD_OFFSET), QSFP_CHANNEL_THRESHOLD_WIDTH)
+            if dom_channel_thres_raw is not None:
+                channel_threshold_values = sfpd_obj.parse_channel_threshold_values(dom_channel_thres_raw, 0)
+                channel_threshold_data = channel_threshold_values.get('data')
+            else:
+                channel_threshold_data = None
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm']   = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm']    = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning']  = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm']   = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm']    = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning']  = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm']    = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm']     = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning']  = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning']   = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 256
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm']      = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm']       = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning']    = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning']     = dom_module_threshold_data['data']['TempLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['vcchighalarm']       = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm']        = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning']     = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning']      = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txbiashighalarm']    = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm']     = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning']  = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning']   = dom_module_threshold_data['data']['BiasLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txpowerhighalarm']   = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm']    = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning']  = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm']   = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm']    = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning']  = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+        else:
+            return None
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+32)+"/value")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+        else:
+            return None
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+        else:
+            return None
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = \
+                    sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params( \
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/direction", 'r+') as f:
+                    f.write('out')
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 0
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 1
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value", "r+")
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..1e07cb0e3efd
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/thermal.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+thermal_index_mapping = {
+    1:53,
+    2:54,
+    3:55,
+    4:56,
+    5:57,
+    6:58,
+    7:59,
+    8:60,
+    9:61,
+   10:62,
+   11:63,
+   12:64,
+   13:86,
+   14:87,
+   15:88,
+   16:89,
+   17:90,
+   18:91,
+   19:92,
+   20:93,
+   21:94,
+   22:109,
+   23:116,
+   24:117,
+   25:121,
+   26:122,
+   27:123,
+   28:127
+}
+
+
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_ncrit".format(thermal_index_mapping[self.index])
+        self.high_crit_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_crit_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/watchdog.py
new file mode 100644
index 000000000000..282f356f4e73
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform/watchdog.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+
+#############################################################################
+# 
+# Watchdog contains an implementation of SONiC Platform Base Watchdog API
+#
+#############################################################################
+import fcntl
+import os
+import array
+
+try:
+    from sonic_platform_base.watchdog_base import WatchdogBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+""" ioctl constants """
+IO_WRITE = 0x40000000
+IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
+IO_SIZE_INT = 0x00040000
+IO_SIZE_40 = 0x00280000
+IO_TYPE_WATCHDOG = ord('W') << 8
+
+WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDR_40 = IO_READ | IO_SIZE_40 | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
+
+""" Watchdog ioctl commands """
+WDIOC_GETSUPPORT = 0 | WDR_40
+WDIOC_GETSTATUS = 1 | WDR_INT
+WDIOC_GETBOOTSTATUS = 2 | WDR_INT
+WDIOC_GETTEMP = 3 | WDR_INT
+WDIOC_SETOPTIONS = 4 | WDR_INT
+WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
+WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
+
+""" Watchdog status constants """
+WDIOS_DISABLECARD = 0x0001
+WDIOS_ENABLECARD = 0x0002
+
+WDT_COMMON_ERROR = -1
+WD_MAIN_IDENTITY = "iTCO_wdt"
+WDT_SYSFS_PATH = "/sys/class/watchdog/"
+
+DEFAULT_TIMEOUT=180
+
+class Watchdog(WatchdogBase):
+
+    def __init__(self):
+
+        self.watchdog, self.wdt_main_dev_name = self._get_wdt()
+        self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
+        self.state_path = "/sys/class/watchdog/%s/state" % self.wdt_main_dev_name
+        self.timeout_path = "/sys/class/watchdog/%s/timeout" % self.wdt_main_dev_name
+        # Set default value
+        self._disable()
+        self.armed = False
+        self.timeout = DEFAULT_TIMEOUT
+
+    def _is_wd_main(self, dev):
+        """
+        Checks watchdog identity
+        """
+        identity = self._read_file(
+            "{}/{}/identity".format(WDT_SYSFS_PATH, dev))
+        return identity == WD_MAIN_IDENTITY
+
+    def _get_wdt(self):
+        """
+        Retrieves watchdog device
+        """
+        wdt_main_dev_list = [dev for dev in os.listdir(
+            "/dev/") if dev.startswith("watchdog") and self._is_wd_main(dev)]
+        if not wdt_main_dev_list:
+            return None
+        wdt_main_dev_name = wdt_main_dev_list[0]
+        watchdog_device_path = "/dev/{}".format(wdt_main_dev_name)
+        self.watchdog = os.open(watchdog_device_path, os.O_RDWR)
+        return self.watchdog, wdt_main_dev_name
+
+    def _read_file(self, file_path):
+        """
+        Read text file
+        """
+        try:
+            with open(file_path, "r") as fd:
+                txt = fd.read()
+        except IOError:
+            return WDT_COMMON_ERROR
+        return txt.strip()
+
+    def _enable(self):
+        """
+        Turn on the watchdog timer
+        """
+        req = array.array('h', [WDIOS_ENABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _disable(self):
+        """
+        Turn off the watchdog timer
+        """
+        req = array.array('h', [WDIOS_DISABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _keepalive(self):
+        """
+        Keep alive watchdog timer
+        """
+        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
+        """
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
+        """
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+        return int(req[0])
+
+    def _gettimeout(self, timeout_path):
+        """
+        Get watchdog timeout
+        @return watchdog timeout
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
+    #################################################################
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog with a timeout of <seconds> seconds.
+        If the watchdog is currently armed, calling this function will
+        simply reset the timer to the provided value. If the underlying
+        hardware does not support the value provided in <seconds>, this
+        method should arm the watchdog with the *next greater* available
+        value.
+        Returns:
+            An integer specifying the *actual* number of seconds the watchdog
+            was armed with. On failure returns -1.
+        """
+
+        ret = WDT_COMMON_ERROR
+        if seconds < 0:
+            return ret
+
+        try:
+            if self.timeout != seconds:
+                self.timeout = self._settimeout(seconds)
+            if self.armed:
+                self._keepalive()
+            else:
+                self._settimeout(seconds)
+                self._enable()
+                self.armed = True
+            ret = self.timeout
+        except IOError as e:
+            pass
+
+        return ret
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False if not
+        """
+        disarmed = False
+        if self.is_armed():
+            try:
+                self._disable()
+                self.armed = False
+                disarmed = True
+            except IOError:
+                pass
+
+        return disarmed
+
+    def is_armed(self):
+        """
+        Retrieves the armed state of the hardware watchdog.
+        Returns:
+            A boolean, True if watchdog is armed, False if not
+        """
+
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        If the watchdog is armed, retrieve the number of seconds remaining on
+        the watchdog timer
+        Returns:
+            An integer specifying the number of seconds remaining on thei
+            watchdog timer. If the watchdog is not armed, returns -1.
+        """
+
+        timeleft = WDT_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft
+
+    def __del__(self):
+        """
+        Close watchdog
+        """
+
+        os.close(self.watchdog)
+
+
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform_setup.py
new file mode 100644
index 000000000000..a4899c618337
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',    
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/utils/quanta_ix8a_bwde_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/utils/quanta_ix8a_bwde_util.py
new file mode 100755
index 000000000000..ed8c5fef6bd9
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8a-bwde-56x/utils/quanta_ix8a_bwde_util.py
@@ -0,0 +1,336 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 Quanta Computer Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Usage: %(scriptName)s [options] command object
+
+options:
+    -h | --help     : this help message
+    -d | --debug    : run with debug mode
+    -f | --force    : ignore error during installation or clean
+command:
+    install     : install drivers and generate related sysfs nodes
+    clean       : uninstall drivers and remove related sysfs nodes
+"""
+
+import os
+import commands
+import sys, getopt
+import logging
+import time
+
+DEBUG = False
+args = []
+FORCE = 0
+i2c_prefix = '/sys/bus/i2c/devices/'
+
+if DEBUG == True:
+    print sys.argv[0]
+    print 'ARGV      :', sys.argv[1:]
+
+def main():
+    global DEBUG
+    global args
+    global FORCE
+
+    if len(sys.argv) < 2:
+        show_help()
+
+    options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
+                                                       'debug',
+                                                       'force',
+                                                          ])
+    if DEBUG == True:
+        print options
+        print args
+        print len(sys.argv)
+
+    for opt, arg in options:
+        if opt in ('-h', '--help'):
+            show_help()
+        elif opt in ('-d', '--debug'):
+            DEBUG = True
+            logging.basicConfig(level=logging.INFO)
+        elif opt in ('-f', '--force'):
+            FORCE = 1
+        else:
+            logging.info('no option')
+    for arg in args:
+        if arg == 'install':
+           install()
+        elif arg == 'clean':
+           uninstall()
+        else:
+            show_help()
+
+    return 0
+
+def show_help():
+    print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
+    sys.exit(0)
+
+def show_log(txt):
+    if DEBUG == True:
+        print "[IX8A-BWDE-56X]" + txt
+    return
+
+def exec_cmd(cmd, show):
+    logging.info('Run :' + cmd)
+    status, output = commands.getstatusoutput(cmd)
+    show_log (cmd +"with result:" + str(status))
+    show_log ("      output:" + output)
+    if status:
+        logging.info('Failed :' + cmd)
+        if show:
+            print('Failed :' + cmd)
+    return status, output
+
+instantiate =[
+#export pca9698 for qsfp present
+'echo 34 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio34/direction',
+'echo 38 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio38/direction',
+'echo 42 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio42/direction',
+'echo 46 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio46/direction',
+'echo 50 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio50/direction',
+'echo 54 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio54/direction',
+'echo 58 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio58/direction',
+'echo 62 > /sys/class/gpio/export',
+'echo in > /sys/class/gpio/gpio62/direction',
+#export pca9698 for qsfp lpmode
+'echo 35 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio35/direction',
+'echo 0 >/sys/class/gpio/gpio35/value',
+'echo 39 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio39/direction',
+'echo 0 >/sys/class/gpio/gpio39/value',
+'echo 43 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio43/direction',
+'echo 0 >/sys/class/gpio/gpio43/value',
+'echo 47 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio47/direction',
+'echo 0 >/sys/class/gpio/gpio47/value',
+'echo 51 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio51/direction',
+'echo 0 >/sys/class/gpio/gpio51/value',
+'echo 55 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio55/direction',
+'echo 0 >/sys/class/gpio/gpio55/value',
+'echo 59 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio59/direction',
+'echo 0 >/sys/class/gpio/gpio59/value',
+'echo 63 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio63/direction',
+'echo 0 >/sys/class/gpio/gpio63/value',
+#SFP28 Module TxEnable
+'echo 0 > /sys/class/cpld-sfp28/port-1/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-2/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-3/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-4/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-5/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-6/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-7/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-8/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-9/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-10/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-11/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-12/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-13/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-14/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-15/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-16/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-17/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-18/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-19/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-20/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-21/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-22/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-23/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-24/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-25/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-26/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-27/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-28/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-29/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-30/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-31/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-32/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-33/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-34/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-35/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-36/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-37/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-38/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-39/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-40/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-41/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-42/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-43/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-44/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-45/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-46/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-47/tx_dis',
+'echo 0 > /sys/class/cpld-sfp28/port-48/tx_dis',
+#Update System LED
+'echo 79 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio79/direction',
+'echo 0 > /sys/class/gpio/gpio79/value',
+'echo 80 > /sys/class/gpio/export',
+'echo out > /sys/class/gpio/gpio80/direction',
+'echo 1 > /sys/class/gpio/gpio80/value'
+]
+
+drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
+'i2c-mux-pca954x force_deselect_on_exit=1',
+'gpio-pca953x',
+'optoe',
+'qci_cpld_sfp28',
+'qci_cpld_led',
+'qci_platform_ix8a_bwde',
+'quanta_hwmon_ipmi',
+'ipmi_devintf'
+]
+
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
+'i2c-mux-pca954x',
+'gpio-pca953x',
+'optoe',
+'qci_cpld_sfp28',
+'qci_cpld_led',
+'qci_platform_ix8a_bwde',
+'quanta_hwmon_ipmi',
+'ipmi_devintf'
+]
+
+def system_install():
+    global FORCE
+
+    #setup driver dependency
+    exec_cmd("depmod -a ", 1)
+    #install drivers
+    for i in range(0,len(drivers)):
+       status, output = exec_cmd("modprobe " + drivers[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+
+    #reload ethernet drivers in correct order
+    exec_cmd("rmmod ixgbe ", 1)
+    exec_cmd("rmmod igb ", 1)
+    exec_cmd("modprobe igb ", 1)
+    exec_cmd("modprobe ixgbe ", 1)
+
+    #turn on module power
+    exec_cmd("echo 21 > /sys/class/gpio/export ", 1)
+    exec_cmd("echo high > /sys/class/gpio/gpio21/direction ", 1)
+
+    # qsfp reset gpio
+    time.sleep(1)
+    for qsfp_reset in [32, 36, 40, 44, 48, 52, 56, 60]:
+        exec_cmd("echo "+str(qsfp_reset)+" > /sys/class/gpio/export", 1)
+        exec_cmd("echo high > /sys/class/gpio/gpio"+str(qsfp_reset)+"/direction", 1)
+
+    # Reset fron-ports LED CPLD
+    exec_cmd("echo 73 > /sys/class/gpio/export ", 1)
+    status, output = exec_cmd("cat /sys/class/gpio/gpio73/value", 1)
+    if output != '1':
+        exec_cmd("echo out > /sys/class/gpio/gpio73/direction ", 1)
+        exec_cmd("echo 0 >/sys/class/gpio/gpio73/value", 1)
+        exec_cmd("echo 1 >/sys/class/gpio/gpio73/value", 1)
+
+    #instantiate devices
+    for i in range(0, len(instantiate)):
+        status, output = exec_cmd(instantiate[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+
+    #QSFP for 1~56 port
+    for port_number in range(1, 57):
+        bus_number = port_number + 12
+        os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
+
+    #Enable front-ports LED decoding
+    exec_cmd('echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode', 1)
+    exec_cmd('echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode', 1)
+
+    return
+
+def system_ready():
+    if not device_found():
+        return False
+    return True
+
+def install():
+    if not device_found():
+        print "No device, installing...."
+        status = system_install()
+        if status:
+            if FORCE == 0:
+                return status
+        status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix8a_bwde-r0/sonic_platform-1.0-py3-none-any.whl",1)
+        if status:
+               print output
+               if FORCE == 0:
+                  return status
+    else:
+        print " ix8a-bwde driver already installed...."
+    return
+
+def uninstall():
+    global FORCE
+    #uninstall drivers
+    for i in range(len(un_drivers) - 1, -1, -1):
+       status, output = exec_cmd("rmmod " + un_drivers[i], 1)
+    if status:
+        print output
+        if FORCE == 0:
+            return status
+
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+
+    return
+
+def device_found():
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix8a > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix8a", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
+
+if __name__ == "__main__":
+    main()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/Makefile
index bfb8ec0c458f..df010f27e869 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/Makefile
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/Makefile
@@ -1,3 +1,3 @@
-obj-m:=qci_cpld_sfp28.o qci_cpld_led.o qci_platform_ix8c.o
+obj-m:=qci_cpld_sfp28.o qci_cpld_led.o qci_platform_ix8c.o quanta_hwmon_ipmi.o
 
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_led.c
index 229195249b5f..2b0fe902c4a8 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_led.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_led.c
@@ -242,6 +242,7 @@ static int cpld_led_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if 0
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -251,6 +252,7 @@ static bool cpld_idr_is_empty(struct idr *idp)
 {
 	return !idr_for_each(idp, idr_has_entry, NULL);
 }
+#endif
 
 static int cpld_led_remove(struct i2c_client *client)
 {
@@ -261,7 +263,7 @@ static int cpld_led_remove(struct i2c_client *client)
 	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
 	kfree(data->cpld_data);
 
-	if (cpld_idr_is_empty(&cpld_led_ida.idr))
+	if (ida_is_empty(&cpld_led_ida))
 		class_destroy(cpld_class);
 
 	return 0;
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_sfp28.c b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_sfp28.c
index dac76667c6ca..6e6608db6211 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_sfp28.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_cpld_sfp28.c
@@ -52,7 +52,6 @@ static struct class *cpld_class = NULL;
 struct sfp_data {
 	struct i2c_client *cpld_client;
 	char name[8];
-	char type[8];
 	u8 port_id;
 	u8 cpld_port;
 };
@@ -253,8 +252,6 @@ static ssize_t set_tx_dis(struct device *dev,
 }
 //SFP
 
-//static DEVICE_ATTR(led_enable, S_IWUSR | S_IRUGO, get_led_enable, set_led_enable);
-//static DEVICE_ATTR(monitor_enable, S_IWUSR | S_IRUGO, get_monitor_enable, set_monitor_enable);
 //SFP
 static DEVICE_ATTR(tx_fault, S_IRUGO, get_tx_fault, NULL);
 static DEVICE_ATTR(tx_dis, S_IWUSR | S_IRUGO, get_tx_dis, set_tx_dis);
@@ -262,7 +259,6 @@ static DEVICE_ATTR(pre_n, S_IRUGO, get_pre_n, NULL);
 static DEVICE_ATTR(rx_los, S_IRUGO, get_rx_los, NULL);
 
 static const struct attribute *sfp_attrs[] = {
-//	&dev_attr_led_enable.attr,
 	&dev_attr_tx_fault.attr,
 	&dev_attr_tx_dis.attr,
 	&dev_attr_pre_n.attr,
@@ -279,26 +275,14 @@ static int cpld_probe(struct i2c_client *client,
 {
 	struct cpld_data *data;
 	struct sfp_data *port_data;
-//	struct i2c_monitor_data *monitor_data;
 	struct device *port_dev;
-//	struct device *i2c_dev;
 	int port_nr, i=0, err;
-	char name[I2C_NAME_SIZE], type[I2C_NAME_SIZE];
 
 	printk("cpld cpld_probe\n");
 
-	while(id->name[i])
-	{
-		name[i]=tolower(id->name[i]);
-		i++;
-	}
-	name[i]='\0';
-	strncpy(type,name+5,strlen(name)-5);
-	type[strlen(name)-5]='\0';
-
 	if (!cpld_class)
 	{
-		cpld_class = class_create(THIS_MODULE, name);
+		cpld_class = class_create(THIS_MODULE, "cpld-sfp28");
 		if (IS_ERR(cpld_class)) {
 			pr_err("couldn't create sysfs class\n");
 			return PTR_ERR(cpld_class);
@@ -328,9 +312,7 @@ static int cpld_probe(struct i2c_client *client,
 		data->port_dev[i] = port_dev;
 		data->port_data[i] = port_data;
 
-		strcpy(port_data->type, type);
-
-		dev_info(&client->dev, "Register %s port-%d\n", port_data->type , port_nr);
+		dev_info(&client->dev, "Register port-%d\n", port_nr);
 
 		/* FIXME: implement Logical/Physical port remapping */
 		//port_data->cpld_port = i;
@@ -358,7 +340,7 @@ static int cpld_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
-#if 1
+#if 0
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -374,18 +356,20 @@ static int cpld_remove(struct i2c_client *client)
 {
 	struct cpld_data *data = i2c_get_clientdata(client);
 	int i;
-//	int id;
 
 	for (i = 15; i >= 0; i--)
 	{
-		dev_info(data->port_dev[i], "Remove %s port-%d\n", data->port_data[i]->type , data->port_data[i]->port_id);
+		dev_info(data->port_dev[i], "Remove port-%d\n", data->port_data[i]->port_id);
 		device_unregister(data->port_dev[i]);
 		ida_simple_remove(&cpld_ida, data->port_data[i]->port_id);
 		kfree(data->port_data[i]);
 	}
 
-	if (cpld_idr_is_empty(&cpld_ida.idr))
+	if (ida_is_empty(&cpld_ida))
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
index f389304a2fbd..d0ae085cd417 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
@@ -39,158 +39,12 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
 #include <linux/platform_data/pca953x.h>
 #endif
 
-#define MUX_INFO(bus, deselect) \
-	{.adap_id = bus, .deselect_on_exit = deselect}
-
-static struct pca954x_platform_mode pca9548sfp1_modes[] = {
-	MUX_INFO(0x20, 1),
-	MUX_INFO(0x21, 1),
-	MUX_INFO(0x22, 1),
-	MUX_INFO(0x23, 1),
-	MUX_INFO(0x24, 1),
-	MUX_INFO(0x25, 1),
-	MUX_INFO(0x26, 1),
-	MUX_INFO(0x27, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp1_data = {
-	.modes 		= pca9548sfp1_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp2_modes[] = {
-	MUX_INFO(0x28, 1),
-	MUX_INFO(0x29, 1),
-	MUX_INFO(0x2a, 1),
-	MUX_INFO(0x2b, 1),
-	MUX_INFO(0x2c, 1),
-	MUX_INFO(0x2d, 1),
-	MUX_INFO(0x2e, 1),
-	MUX_INFO(0x2f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp2_data = {
-	.modes 		= pca9548sfp2_modes,
-	.num_modes 	= 8,
-};
-static struct pca954x_platform_mode pca9548sfp3_modes[] = {
-	MUX_INFO(0x30, 1),
-	MUX_INFO(0x31, 1),
-	MUX_INFO(0x32, 1),
-	MUX_INFO(0x33, 1),
-	MUX_INFO(0x34, 1),
-	MUX_INFO(0x35, 1),
-	MUX_INFO(0x36, 1),
-	MUX_INFO(0x37, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp3_data = {
-	.modes 		= pca9548sfp3_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp4_modes[] = {
-	MUX_INFO(0x38, 1),
-	MUX_INFO(0x39, 1),
-	MUX_INFO(0x3a, 1),
-	MUX_INFO(0x3b, 1),
-	MUX_INFO(0x3c, 1),
-	MUX_INFO(0x3d, 1),
-	MUX_INFO(0x3e, 1),
-	MUX_INFO(0x3f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp4_data = {
-	.modes 		= pca9548sfp4_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp5_modes[] = {
-	MUX_INFO(0x40, 1),
-	MUX_INFO(0x41, 1),
-	MUX_INFO(0x42, 1),
-	MUX_INFO(0x43, 1),
-	MUX_INFO(0x44, 1),
-	MUX_INFO(0x45, 1),
-	MUX_INFO(0x46, 1),
-	MUX_INFO(0x47, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp5_data = {
-	.modes 		= pca9548sfp5_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp6_modes[] = {
-	MUX_INFO(0x48, 1),
-	MUX_INFO(0x49, 1),
-	MUX_INFO(0x4a, 1),
-	MUX_INFO(0x4b, 1),
-	MUX_INFO(0x4c, 1),
-	MUX_INFO(0x4d, 1),
-	MUX_INFO(0x4e, 1),
-	MUX_INFO(0x4f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp6_data = {
-	.modes 		= pca9548sfp6_modes,
-	.num_modes 	= 8,
-};
-
-//ZQSFP
-static struct pca954x_platform_mode pca9548sfp7_modes[] = {
-	MUX_INFO(0x50, 1),
-	MUX_INFO(0x51, 1),
-	MUX_INFO(0x52, 1),
-	MUX_INFO(0x53, 1),
-	MUX_INFO(0x54, 1),
-	MUX_INFO(0x55, 1),
-	MUX_INFO(0x56, 1),
-	MUX_INFO(0x57, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp7_data = {
-	.modes 		= pca9548sfp7_modes,
-	.num_modes 	= 8,
-};
-
-// end port
-
-static struct pca954x_platform_mode pca9546_modes[] = {
-	MUX_INFO(0x10, 1),
-	MUX_INFO(0x11, 1),
-	MUX_INFO(0x12, 1),
-	MUX_INFO(0x13, 1),
-};
-
-static struct pca954x_platform_data pca9546_data = {
-	.modes 		= pca9546_modes,
-	.num_modes 	= 4,
-};
-
-static struct pca954x_platform_mode pca9548_modes[] = {
-	MUX_INFO(0x14, 1),
-	MUX_INFO(0x15, 1),
-	MUX_INFO(0x16, 1),
-	MUX_INFO(0x17, 1),
-	MUX_INFO(0x18, 1),
-	MUX_INFO(0x19, 1),
-	MUX_INFO(0x1a, 1),
-	MUX_INFO(0x1b, 1),
-};
-
-static struct pca954x_platform_data pca9548_data = {
-	.modes 		= pca9548_modes,
-	.num_modes 	= 8,
-};
-
 //MB Board Data
 static struct pca953x_platform_data pca9555_1_data = {
 	.gpio_base = 0x10,
@@ -203,45 +57,37 @@ static struct pca953x_platform_data pca9698_2_data = {
 static struct pca953x_platform_data pca9555_CPU_data = {
 	.gpio_base = 0x48,
 };
+
 static struct i2c_board_info ix8c_i2c_devices[] = {
 	{
 		I2C_BOARD_INFO("pca9546", 0x72),		// 0
-		.platform_data = &pca9546_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x77),		// 1
-		.platform_data = &pca9548_data,
 	},
 	{
 		I2C_BOARD_INFO("24c02", 0x54),			// 2 eeprom
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 3 0x77 ch0
-		.platform_data = &pca9548sfp1_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 4 0x77 ch1
-		.platform_data = &pca9548sfp2_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 5 0x77 ch2
-		.platform_data = &pca9548sfp3_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 6 0x77 ch3
-		.platform_data = &pca9548sfp4_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 7 0x77 ch4
-		.platform_data = &pca9548sfp5_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 8 0x77 ch5
-		.platform_data = &pca9548sfp6_data,
 	},
 	{
 		I2C_BOARD_INFO("pca9548", 0x73),		// 9 0x77 ch6
-		.platform_data = &pca9548sfp7_data,
 	},
 	{
 		I2C_BOARD_INFO("CPLD-SFP28", 0x38),		// 10 0x72 ch0 CPLD1_:SFP28 1~16
@@ -287,9 +133,13 @@ static struct platform_driver ix8c_platform_driver = {
 
 static struct platform_device *ix8c_device;
 
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 18;
+int numof_ports = 56;
+
 static int __init ix8c_platform_init(void)
 {
-	struct i2c_client *client;
 	struct i2c_adapter *adapter;
 	int ret, i;
 
@@ -308,72 +158,166 @@ static int __init ix8c_platform_init(void)
 	if (ret)
 		goto fail_platform_device;
 
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
 	adapter = i2c_get_adapter(0);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[0]);		// pca9546
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[1]);		// pca9548
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[16]);		// CPU Linking Board at CPU's I2C Bus
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x10);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[10]);		// CPLD_1
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[17]);		// CPLD_4
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[18]);		// CPLD_6
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x11);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[11]);		// CPLD_2
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x12);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[12]);		// CPLD_3
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x13);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[13]);		// MB Board Data
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[14]);		// QSFP:49~52
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x14);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[3]);		// pca9548_1 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x15);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[4]);		// pca9548_2 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x16);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[5]);		// pca9548_3 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x17);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[6]);		// pca9548_4 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x18);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[7]);		// pca9548_5 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x19);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[8]);		// pca9548_6 SFP
-	i2c_put_adapter(adapter);
-
-	adapter = i2c_get_adapter(0x1a);
-	client = i2c_new_device(adapter, &ix8c_i2c_devices[9]);		// pca9548_7 QSFP
-	i2c_put_adapter(adapter);
-
-	for(i = 80; i < 88; i ++){									// QSFP 49~56 EEPROM
-		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix8c_i2c_devices[15]);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix8c_i2c_devices[0]);		// pca9546
+		g_client[1] = i2c_new_device(adapter, &ix8c_i2c_devices[1]);		// pca9548
+		g_client[2] = i2c_new_device(adapter, &ix8c_i2c_devices[16]);		// CPU Linking Board at CPU's I2C Bus
 		i2c_put_adapter(adapter);
 	}
 
-	for(i = 32; i < 80; i ++){									// SFP28 1~48 EEPROM
-		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix8c_i2c_devices[19]);
+	adapter = i2c_get_adapter(0x01);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix8c_i2c_devices[10]);		// CPLD_1
+		g_client[4] = i2c_new_device(adapter, &ix8c_i2c_devices[17]);		// CPLD_4
+		g_client[5] = i2c_new_device(adapter, &ix8c_i2c_devices[18]);		// CPLD_6
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x02);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[6] = i2c_new_device(adapter, &ix8c_i2c_devices[11]);		// CPLD_2
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x03);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[7] = i2c_new_device(adapter, &ix8c_i2c_devices[12]);		// CPLD_3
+		g_client[8] = i2c_new_device(adapter, &ix8c_i2c_devices[2]);		// MB_BOARDINFO_EEPROM
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x04);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[9] = i2c_new_device(adapter, &ix8c_i2c_devices[13]);		// MB Board Data
+		g_client[10] = i2c_new_device(adapter, &ix8c_i2c_devices[14]);		// QSFP:49~52
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x05);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[11] = i2c_new_device(adapter, &ix8c_i2c_devices[3]);		// pca9548_1 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x06);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix8c_i2c_devices[4]);		// pca9548_2 SFP
 		i2c_put_adapter(adapter);
 	}
 
+	adapter = i2c_get_adapter(0x07);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[13] = i2c_new_device(adapter, &ix8c_i2c_devices[5]);		// pca9548_3 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x08);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[14] = i2c_new_device(adapter, &ix8c_i2c_devices[6]);		// pca9548_4 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x09);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[15] = i2c_new_device(adapter, &ix8c_i2c_devices[7]);		// pca9548_5 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x0a);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[16] = i2c_new_device(adapter, &ix8c_i2c_devices[8]);		// pca9548_6 SFP
+		i2c_put_adapter(adapter);
+	}
+
+	adapter = i2c_get_adapter(0x0b);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[17] = i2c_new_device(adapter, &ix8c_i2c_devices[9]);		// pca9548_7 QSFP
+		i2c_put_adapter(adapter);
+	}
+
+	for(i = 13; i < 69; i ++){
+		adapter = i2c_get_adapter(i);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			if (i < 61)  // SFP28 1~48 EEPROM
+				g_client_port[i - 13] = i2c_new_device(adapter, &ix8c_i2c_devices[19]);
+			else  // QSFP 49~56 EEPROM
+				g_client_port[i - 13] = i2c_new_device(adapter, &ix8c_i2c_devices[15]);
+			i2c_put_adapter(adapter);
+		}
+	}
+
 	return 0;
 
 fail_platform_device:
@@ -386,6 +330,26 @@ static int __init ix8c_platform_init(void)
 
 static void __exit ix8c_platform_exit(void)
 {
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
 	platform_device_unregister(ix8c_device);
 	platform_driver_unregister(&ix8c_platform_driver);
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..157ae94778d5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1587 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg	0
+#define DEBUGUSE_SHIFT		0
+
+#define DRVNAME		"quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)			((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)			((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)		(int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)		(int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)	(int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)	(int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX			17
+#define SENSOR_ATTR_NAME_LENGTH	20
+
+#define SENSOR_GET_CAP_LABEL	0x001
+#define SENSOR_GET_CAP_ALARM	0x002
+#define SENSOR_GET_CAP_INPUT	0x004
+
+#define SENSOR_GET_CAP_LNC		0x008
+#define SENSOR_GET_CAP_LCR		0x010
+#define SENSOR_GET_CAP_LNR		0x020
+
+#define SENSOR_GET_CAP_UNC		0x040
+#define SENSOR_GET_CAP_UCR		0x080
+#define SENSOR_GET_CAP_UNR		0x100
+
+#define SENSOR_GET_CAP_MODEL	0x200
+#define SENSOR_GET_CAP_SN		0x400
+#define SENSOR_GET_CAP_PWM		0x800
+
+#define SENSOR_GET_CAP_CONMODE		0x1000
+#define SENSOR_GET_CAP_DIRECTION	0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT	0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT	0x8000
+
+#define SENSOR_GET_CAP_MFRID	0x10000
+
+#define SDR_SENSOR_TYPE_TEMP	0x01
+#define SDR_SENSOR_TYPE_VOLT	0x02
+#define SDR_SENSOR_TYPE_CURR	0x03
+#define SDR_SENSOR_TYPE_FAN		0x04
+#define SDR_SENSOR_TYPE_PS		0x08
+#define SDR_SENSOR_TYPE_OTHER	0x0b
+
+#define BMC_GET_DEVICE_ID		0x01
+
+#define IPMI_NETFN_SE			0x04
+#define IPMI_NETFN_APP			0x06
+#define IPMI_NETFN_STORAGE		0x0a
+#define IPMI_NETFN_TSOL			0x30
+
+#define GET_SDR_REPO_INFO		0x20
+#define GET_DEVICE_SDR			0x21
+#define GET_SDR_RESERVE_REPO	0x22
+#define GET_SDR					0x23
+#define GET_SENSOR_THRESHOLDS	0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS	0x2b
+#define GET_SENSOR_READING		0x2d
+#define GET_PSU_READING			0x52
+#define GET_FAN_INFO			0xd6
+#define GET_FRU_INFO			0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK		(0x80)	/* 1 = provides SDRs      */
+#define IPMI_TIMEOUT			(4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE	1
+
+struct quanta_hwmon_ipmi_data {
+	struct platform_device	*ipmi_platform_dev;
+	struct device			*ipmi_hwmon_dev;
+	//struct mutex			ipmi_lock;
+
+	int32_t					total_sensor_id;
+	int32_t					total_suport_sensor;
+	int32_t					total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data {
+	uint8_t addr;
+	uint8_t sensor_type;
+	uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+	uint32_t capability;
+
+	struct header_info {
+		uint8_t header_type;
+		uint8_t header_byte;
+	} headerinfo;
+
+	struct record_info {
+		uint8_t record_analog;
+		uint8_t record_linearization;
+
+		int32_t record_m;
+		int32_t record_b;
+		int32_t record_k1;
+		int32_t record_k2;
+	} recordinfo;
+
+	struct threshold_upper_info {
+		uint8_t unr;
+		uint8_t ucr;
+		uint8_t unc;
+	} upperinfo;
+
+	struct threshold_lower_info {
+		uint8_t lnr;
+		uint8_t lcr;
+		uint8_t lnc;
+	} lowerinfo;
+
+	struct attr_info
+	{
+		bool attr_exist;
+		char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+		char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+		struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+		struct attribute_group	attr_group;
+		struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+	} attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data {
+	int32_t tx_id;
+
+	int32_t rx_result;
+	int64_t rx_len;
+	void *rx_data;
+	struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator {
+	uint16_t reservation;
+	int32_t total;
+	int32_t next;
+};
+
+struct ipm_devid_rsp {
+	uint8_t device_id;
+	uint8_t device_revision;
+	uint8_t fw_rev1;
+	uint8_t fw_rev2;
+	uint8_t ipmi_version;
+	uint8_t adtl_device_support;
+	uint8_t manufacturer_id[3];
+	uint8_t product_id[2];
+	uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs {
+	uint8_t version;	/* SDR version (51h) */
+	uint16_t count;		/* number of records */
+	uint16_t free;		/* free space in SDR */
+	uint32_t add_stamp;	/* last add timestamp */
+	uint32_t erase_stamp;	/* last del timestamp */
+	uint8_t op_support;	/* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs {
+	uint8_t count;	/* number of records */
+	uint8_t flags;	/* flags */
+	uint8_t popChangeInd[3];	/* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs {
+	uint16_t next;		/* next record id */
+	uint16_t id;		/* record ID */
+	uint8_t version;	/* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR			0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR		0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR	0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC		0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC	0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR	0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR	0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR	0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION		0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO	0x14
+#define SDR_RECORD_TYPE_OEM			0xc0
+	uint8_t type;		/* record type */
+	uint8_t length;		/* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq {
+	uint16_t reserve_id;	/* reservation ID */
+	uint16_t id;		/* record ID */
+	uint8_t offset;		/* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD	0xff
+	uint8_t length;		/* length to read */
+} __attribute__((packed));
+
+struct entity_id {
+	uint8_t	id;			/* physical entity id */
+#ifdef WORDS_BIGENDIAN
+	uint8_t	logical : 1;	/* physical/logical */
+	uint8_t	instance : 7;	/* instance number */
+#else
+	uint8_t	instance : 7;	/* instance number */
+	uint8_t	logical : 1;	/* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask {
+	union {
+		struct {
+			uint16_t assert_event;	/* assertion event mask */
+			uint16_t deassert_event;	/* de-assertion event mask */
+			uint16_t read;	/* discrete reading mask */
+		} discrete;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint16_t reserved : 1;
+			uint16_t status_lnr : 1;
+			uint16_t status_lcr : 1;
+			uint16_t status_lnc : 1;
+			uint16_t assert_unr_high : 1;
+			uint16_t assert_unr_low : 1;
+			uint16_t assert_ucr_high : 1;
+			uint16_t assert_ucr_low : 1;
+			uint16_t assert_unc_high : 1;
+			uint16_t assert_unc_low : 1;
+			uint16_t assert_lnr_high : 1;
+			uint16_t assert_lnr_low : 1;
+			uint16_t assert_lcr_high : 1;
+			uint16_t assert_lcr_low : 1;
+			uint16_t assert_lnc_high : 1;
+			uint16_t assert_lnc_low : 1;
+#else
+			uint16_t assert_lnc_low : 1;
+			uint16_t assert_lnc_high : 1;
+			uint16_t assert_lcr_low : 1;
+			uint16_t assert_lcr_high : 1;
+			uint16_t assert_lnr_low : 1;
+			uint16_t assert_lnr_high : 1;
+			uint16_t assert_unc_low : 1;
+			uint16_t assert_unc_high : 1;
+			uint16_t assert_ucr_low : 1;
+			uint16_t assert_ucr_high : 1;
+			uint16_t assert_unr_low : 1;
+			uint16_t assert_unr_high : 1;
+			uint16_t status_lnc : 1;
+			uint16_t status_lcr : 1;
+			uint16_t status_lnr : 1;
+			uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+			uint16_t reserved_2 : 1;
+			uint16_t status_unr : 1;
+			uint16_t status_ucr : 1;
+			uint16_t status_unc : 1;
+			uint16_t deassert_unr_high : 1;
+			uint16_t deassert_unr_low : 1;
+			uint16_t deassert_ucr_high : 1;
+			uint16_t deassert_ucr_low : 1;
+			uint16_t deassert_unc_high : 1;
+			uint16_t deassert_unc_low : 1;
+			uint16_t deassert_lnr_high : 1;
+			uint16_t deassert_lnr_low : 1;
+			uint16_t deassert_lcr_high : 1;
+			uint16_t deassert_lcr_low : 1;
+			uint16_t deassert_lnc_high : 1;
+			uint16_t deassert_lnc_low : 1;
+#else
+			uint16_t deassert_lnc_low : 1;
+			uint16_t deassert_lnc_high : 1;
+			uint16_t deassert_lcr_low : 1;
+			uint16_t deassert_lcr_high : 1;
+			uint16_t deassert_lnr_low : 1;
+			uint16_t deassert_lnr_high : 1;
+			uint16_t deassert_unc_low : 1;
+			uint16_t deassert_unc_high : 1;
+			uint16_t deassert_ucr_low : 1;
+			uint16_t deassert_ucr_high : 1;
+			uint16_t deassert_unr_low : 1;
+			uint16_t deassert_unr_high : 1;
+			uint16_t status_unc : 1;
+			uint16_t status_ucr : 1;
+			uint16_t status_unr : 1;
+			uint16_t reserved_2 : 1;
+#endif
+			union {
+				struct {
+#ifdef WORDS_BIGENDIAN			/* settable threshold mask */
+					uint16_t reserved : 2;
+					uint16_t unr : 1;
+					uint16_t ucr : 1;
+					uint16_t unc : 1;
+					uint16_t lnr : 1;
+					uint16_t lcr : 1;
+					uint16_t lnc : 1;
+					/* padding lower 8 bits */
+					uint16_t readable : 8;
+#else
+					uint16_t readable : 8;
+					uint16_t lnc : 1;
+					uint16_t lcr : 1;
+					uint16_t lnr : 1;
+					uint16_t unc : 1;
+					uint16_t ucr : 1;
+					uint16_t unr : 1;
+					uint16_t reserved : 2;
+#endif
+				} set;
+				struct {
+#ifdef WORDS_BIGENDIAN			/* readable threshold mask */
+					/* padding upper 8 bits */
+					uint16_t settable : 8;
+					uint16_t reserved : 2;
+					uint16_t unr : 1;
+					uint16_t ucr : 1;
+					uint16_t unc : 1;
+					uint16_t lnr : 1;
+					uint16_t lcr : 1;
+					uint16_t lnc : 1;
+#else
+					uint16_t lnc : 1;
+					uint16_t lcr : 1;
+					uint16_t lnr : 1;
+					uint16_t unc : 1;
+					uint16_t ucr : 1;
+					uint16_t unr : 1;
+					uint16_t reserved : 2;
+					uint16_t settable : 8;
+#endif
+				} read;
+			};
+		} threshold;
+	} type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor {
+	struct {
+		uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+		uint8_t channel : 4;	/* channel number */
+		uint8_t __reserved : 2;
+		uint8_t lun : 2;	/* sensor owner lun */
+#else
+		uint8_t lun : 2;	/* sensor owner lun */
+		uint8_t __reserved : 2;
+		uint8_t channel : 4;	/* channel number */
+#endif
+		uint8_t sensor_num;	/* unique sensor number */
+	} keys;
+
+	struct entity_id entity;
+
+	struct {
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint8_t __reserved : 1;
+			uint8_t scanning : 1;
+			uint8_t events : 1;
+			uint8_t thresholds : 1;
+			uint8_t hysteresis : 1;
+			uint8_t type : 1;
+			uint8_t event_gen : 1;
+			uint8_t sensor_scan : 1;
+#else
+			uint8_t sensor_scan : 1;
+			uint8_t event_gen : 1;
+			uint8_t type : 1;
+			uint8_t hysteresis : 1;
+			uint8_t thresholds : 1;
+			uint8_t events : 1;
+			uint8_t scanning : 1;
+			uint8_t __reserved : 1;
+#endif
+		} init;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint8_t ignore : 1;
+			uint8_t rearm : 1;
+			uint8_t hysteresis : 2;
+			uint8_t threshold : 2;
+			uint8_t event_msg : 2;
+#else
+			uint8_t event_msg : 2;
+			uint8_t threshold : 2;
+			uint8_t hysteresis : 2;
+			uint8_t rearm : 1;
+			uint8_t ignore : 1;
+#endif
+		} capabilities;
+		uint8_t type;
+	} sensor;
+
+	uint8_t event_type;	/* event/reading type code */
+
+	struct sdr_record_mask mask;
+
+	struct {
+#ifdef WORDS_BIGENDIAN
+		uint8_t analog : 2;
+		uint8_t rate : 3;
+		uint8_t modifier : 2;
+		uint8_t pct : 1;
+#else
+		uint8_t pct : 1;
+		uint8_t modifier : 2;
+		uint8_t rate : 3;
+		uint8_t analog : 2;
+#endif
+		struct {
+			uint8_t base;
+			uint8_t modifier;
+		} type;
+	} unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+	uint8_t linearization;	/* 70h=non linear, 71h-7Fh=non linear, OEM */
+	uint16_t mtol;		/* M, tolerance */
+	uint32_t bacc;		/* accuracy, B, Bexp, Rexp */
+
+	struct {
+#ifdef WORDS_BIGENDIAN
+		uint8_t __reserved : 5;
+		uint8_t normal_min : 1;	/* normal min field specified */
+		uint8_t normal_max : 1;	/* normal max field specified */
+		uint8_t nominal_read : 1;	/* nominal reading field specified */
+#else
+		uint8_t nominal_read : 1;	/* nominal reading field specified */
+		uint8_t normal_max : 1;	/* normal max field specified */
+		uint8_t normal_min : 1;	/* normal min field specified */
+		uint8_t __reserved : 5;
+#endif
+	} analog_flag;
+
+	uint8_t nominal_read;	/* nominal reading, raw value */
+	uint8_t normal_max;	/* normal maximum, raw value */
+	uint8_t normal_min;	/* normal minimum, raw value */
+	uint8_t sensor_max;	/* sensor maximum, raw value */
+	uint8_t sensor_min;	/* sensor minimum, raw value */
+
+	struct {
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} upper;
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} lower;
+		struct {
+			uint8_t positive;
+			uint8_t negative;
+		} hysteresis;
+	} threshold;
+	uint8_t __reserved[2];
+	uint8_t oem;		/* reserved for OEM use */
+	uint8_t id_code;	/* sensor ID string type/length code */
+	uint8_t id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+	/* function input parameter (a * 10 ^ b) */
+	int32_t i = 0, r = 1, temp_b = 0;
+
+	temp_b = (b > 0) ? b : -b;
+
+	for (i = 0; i < temp_b; i++) r = r * 10;
+
+	if (b > 0) {
+		*a = (*a) * r;
+		r = 1;
+	}
+	/* function return parameter calc_result = *a, decimal_point = r */
+	return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+	while (*buf >= '0' && *buf <= '9') {
+		*output_val = *output_val * 10 + *buf - '0';
+		buf++;
+	}
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+	int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+	struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+	ipmi_wait_queue--;
+
+	if (msg->msg.data[0] != 0) {
+		if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07) && (msg->msg.cmd != 0x52)) {
+			//skip master r/w cmd return code
+			printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn, msg->msg.cmd);
+			rv = msg->msg.data[0];
+			goto get_BMC_response_fail;
+		}
+	}
+
+	if (msg->msgid != comm_data->tx_id) {
+		printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid, comm_data->tx_id);
+		goto get_BMC_response_fail;
+	}
+
+	if (msg->msg.data_len <= 0) {
+		printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+		goto get_BMC_response_fail;
+	}
+
+	if (msg->msg.data_len > 1) {
+		if (comm_data->rx_len) {
+			comm_data->rx_len = msg->msg.data_len - 1;
+			memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+		}
+		else {
+			printk("ipmi: rx len = 0, it should be not retrun ?\n");
+			goto get_BMC_response_fail;
+		}
+	}
+
+	rv = 0;
+
+get_BMC_response_fail:
+	ipmi_free_recv_msg(msg);
+
+	if (ipmi_wait_queue == 0) {
+		comm_data->rx_result = rv;
+		if (rv == 0) complete(comm_data->rx_read_complete);
+	}
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg, struct ipmi_comm_data *comm_data)
+{
+	int32_t rv = 0;
+	int32_t escape_time = 0;
+
+	struct ipmi_addr ipmi_address;
+
+	if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE) {
+		/* printk("msg queue full, cannot send ipmi cmd\n"); */
+		return -EBUSY;
+	}
+	ipmi_wait_queue++;
+
+	ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+	ipmi_address.channel = IPMI_BMC_CHANNEL;
+	ipmi_address.data[0] = 0;
+
+	rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+	if (rv) {
+		printk("ipmi_validate_addr fail, err code : %d\n", rv);
+		return rv;
+	}
+
+	ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg, comm_data, 0, 0, 0);
+
+	escape_time = wait_for_completion_timeout(comm_data->rx_read_complete, IPMI_TIMEOUT);
+
+	rv = comm_data->rx_result;
+	if (escape_time == 0) {
+		printk("BMC not response (%d)\n", escape_time);
+	}
+
+	return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len, void *msg_rx_data, int32_t msg_rx_len)
+{
+	int32_t i = 0;
+	int32_t rv = 0;
+
+	static uint64_t tx_msgid = 1;
+
+	struct kernel_ipmi_msg msg;
+	struct ipmi_comm_data *comm_data = NULL;
+	struct completion read_complete;
+
+	init_completion(&read_complete);
+
+	/* prepare transfer message */
+	msg.netfn = msg_tx_data[0];
+	msg.cmd = msg_tx_data[1];
+	msg.data_len = msg_tx_len - 2;
+
+	msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+	if (msg.data == NULL) {
+		printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+		rv = -ENOMEM;
+		goto alloc_mem_fail;
+	}
+
+	comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+	if (comm_data == NULL) {
+		printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+		rv = -ENOMEM;
+		goto alloc_mem_fail;
+	}
+
+	for (i = 2; i < msg_tx_len; i++) {
+		msg.data[i - 2] = msg_tx_data[i];
+	}
+
+	comm_data->tx_id = tx_msgid++;
+
+	/* prepare recive message */
+	comm_data->rx_data = msg_rx_data;
+	comm_data->rx_len = msg_rx_len;
+	comm_data->rx_result = -1;
+	comm_data->rx_read_complete = &read_complete;
+
+	rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+	if (msg.data) kfree(msg.data);
+	if (comm_data) kfree(comm_data);
+	if (tx_msgid > UINT_MAX) tx_msgid = 1;
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t * reserve_id)
+{
+	int32_t rv = 0;
+	uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; //netfn = 0x00; cmd = GET_SDR_RESERVE_REPO;
+
+	msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+	/* obtain reservation ID */
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+	if (rv) printk("BMC down at (%d)!!\n", __LINE__);
+
+#if enable_debug_msg
+	printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+	return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+	int32_t rv = 0;
+
+	uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; //netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID;
+
+	struct ipm_devid_rsp devid;
+
+	/* check SDRR capability */
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return rv;
+	}
+
+	if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK) {
+		if ((devid.adtl_device_support & 0x02) == 0) {
+			if ((devid.adtl_device_support & 0x01)) {
+				printk("Using Device SDRs\n");
+				g_use_built_in = 1;
+			}
+			else {
+				printk("Error obtaining SDR info\n");
+			}
+		}
+	}
+
+	if (g_use_built_in == 0) {
+		struct sdr_repo_info_rs sdr_info;
+		/* get sdr repository info */
+		msg_data[0] = IPMI_NETFN_STORAGE;
+		msg_data[1] = GET_SDR_REPO_INFO;
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+		itr->total = sdr_info.count;
+
+#if enable_debug_msg
+		printk("SDR version: 0x%x\n", sdr_info.version);
+		printk("SDR free space: %d\n", sdr_info.free);
+#endif
+	}
+	else {
+		struct sdr_device_info_rs sdr_info;
+		/* get device sdr info */
+		msg_data[0] = IPMI_NETFN_SE;
+		msg_data[1] = GET_SDR_REPO_INFO;
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+		itr->total = sdr_info.count;
+	}
+
+#if enable_debug_msg
+	printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+	}
+	else {
+		itr->next = 0;
+		rv = ipmi_sdr_get_reservation(&(itr->reservation));
+	}
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr, struct sdr_get_rs *sdr_rs)
+{
+	int32_t rv = 0;
+
+	uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //netfn = 0x00; cmd = 0x00;
+
+	struct sdr_get_rq sdr_rq;
+
+	sdr_rq.reserve_id = itr->reservation;
+	sdr_rq.id = itr->next;
+	sdr_rq.offset = 0;
+	sdr_rq.length = 5;	/* only get the header */
+
+	if (g_use_built_in == 0) {
+		msg_data[0] = IPMI_NETFN_STORAGE;
+		msg_data[1] = GET_SDR;
+	}
+	else {
+		msg_data[0] = IPMI_NETFN_SE;
+		msg_data[1] = GET_DEVICE_SDR;
+	}
+
+	memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+	if ((rv) || (sdr_rs->length == 0)) {
+		printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+		return -1;
+	}
+
+	if (sdr_rs->id != itr->next) {
+#if enable_debug_msg
+		printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+		sdr_rs->id = itr->next;
+	}
+#if enable_debug_msg
+	printk("\nSDR record ID   : 0x%04x", itr->next);
+	printk("SDR record type : 0x%02x\n", sdr_rs->type);
+	printk("SDR record next : 0x%04x\n", sdr_rs->next);
+	printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs * header, struct ipmi_sdr_iterator * itr, uint8_t *ret_data)
+{
+	int32_t rv = 0, len = 0;
+
+	uint8_t buff[128] = "";
+	uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //netfn = 0x00; cmd = 0x00;
+
+	struct sdr_get_rq sdr_rq;
+
+	len = header->length;
+	if (len > 0) {
+		memset(&sdr_rq, 0, sizeof(sdr_rq));
+		sdr_rq.reserve_id = itr->reservation;
+		sdr_rq.id = header->id;
+		sdr_rq.offset = 5;
+		sdr_rq.length = len;
+
+		if (g_use_built_in == 0) {
+			msg_data[0] = IPMI_NETFN_STORAGE;
+			msg_data[1] = GET_SDR;
+		}
+		else {
+			msg_data[0] = IPMI_NETFN_SE;
+			msg_data[1] = GET_DEVICE_SDR;
+		}
+
+		memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			memset(buff, 0, sizeof(buff));
+			memcpy(buff, ret_data + 2, sdr_rq.length);
+			memcpy(ret_data, buff, sdr_rq.length + 2);
+		}
+	}
+
+	return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx, struct sdr_record_full_sensor *sensor)
+{
+
+	/*refer to Table 35-, Get Sensor Event Enable*/
+	/*
+	// change detect threshold method, keep it for record detail format
+	// in this version function input is
+	"void ipmi_sdr_set_sensor_threshold(uint8_t idx, uint8_t *rec)"
+	#define offset_threshold_enable	9
+	#define offset_threshold_data	31
+	if (rec[offset_threshold_enable + 1] & 0x08)	g_sensor_data[idx].upperinfo.unr_high = 1;
+	if (rec[offset_threshold_enable + 1] & 0x04)	g_sensor_data[idx].upperinfo.unr_low = 1;
+	if (rec[offset_threshold_enable + 1] & 0x02)	g_sensor_data[idx].upperinfo.ucr_high = 1;
+	if (rec[offset_threshold_enable + 1] & 0x01)	g_sensor_data[idx].upperinfo.ucr_low = 1;
+	if (rec[offset_threshold_enable] & 0x80)		g_sensor_data[idx].upperinfo.unc_high = 1;
+	if (rec[offset_threshold_enable] & 0x40)		g_sensor_data[idx].upperinfo.unc_low = 1;
+
+	if (rec[offset_threshold_enable] & 0x20)		g_sensor_data[idx].lowerinfo.lnr_high = 1;
+	if (rec[offset_threshold_enable] & 0x10)		g_sensor_data[idx].lowerinfo.lnr_low = 1;
+	if (rec[offset_threshold_enable] & 0x08)		g_sensor_data[idx].lowerinfo.lcr_high = 1;
+	if (rec[offset_threshold_enable] & 0x04)		g_sensor_data[idx].lowerinfo.lcr_low = 1;
+	if (rec[offset_threshold_enable] & 0x02)		g_sensor_data[idx].lowerinfo.lnc_high = 1;
+	if (rec[offset_threshold_enable] & 0x01)		g_sensor_data[idx].lowerinfo.lnc_low = 1;
+	//*/
+
+	/* lower threshold info */
+	if (sensor->mask.type.threshold.read.lnc) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+	if (sensor->mask.type.threshold.read.lcr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+	if (sensor->mask.type.threshold.read.lnr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+	g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+	g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+	g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+	/* upper threshold info */
+	if (sensor->mask.type.threshold.read.unc) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+	if (sensor->mask.type.threshold.read.ucr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+	if (sensor->mask.type.threshold.read.unr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+	g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+	g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+	g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx, struct sdr_record_full_sensor *sensor)
+{
+	char *loc = NULL;
+
+	g_sensor_data[idx].sensor_type = sensor->sensor.type;
+	sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+	g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+	g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+	g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+	g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+	g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+	g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+	memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00, SENSOR_ATTR_NAME_LENGTH);
+
+	switch (g_sensor_data[idx].sensor_type)
+	{
+	case SDR_SENSOR_TYPE_TEMP:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+		break;
+	case SDR_SENSOR_TYPE_VOLT:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+		break;
+	case SDR_SENSOR_TYPE_FAN:
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+		break;
+	case SDR_SENSOR_TYPE_PS:
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+		if (loc) {
+			if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0) {
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+			}
+			sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+		}
+
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+		if (loc) sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+		if (loc) sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+
+		break;
+	case SDR_SENSOR_TYPE_CURR:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+		break;
+	case SDR_SENSOR_TYPE_OTHER:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+		break;
+	default:
+		printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+		break;
+	}
+
+	if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0) {
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+	}
+
+#if enable_debug_msg
+	{
+		printk("\n********************\n");
+
+		printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m, g_sensor_data[idx].recordinfo.record_b
+			, g_sensor_data[idx].recordinfo.record_k1, g_sensor_data[idx].recordinfo.record_k2);
+
+		printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n", g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+			, g_sensor_data[idx].recordinfo.record_analog, g_sensor_data[idx].recordinfo.record_linearization);
+
+		printk("\n********************\n");
+	}
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val, int32_t *point_result)
+{
+	int32_t m = g_sensor_data[idx].recordinfo.record_m;
+	int32_t b = g_sensor_data[idx].recordinfo.record_b;
+	int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+	int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+	int32_t decimal_point = 0;
+	int32_t result = 0;
+
+	decimal_point = pow_convert(&b, k1);
+
+	switch (g_sensor_data[idx].recordinfo.record_analog)
+	{
+	case 0:
+		result = m * val * decimal_point + b;
+		break;
+	case 1:
+		if (val & 0x80) val++;
+	case 2:
+		result = (m * (int16_t)val) * decimal_point + b;
+		break;
+	default:
+		return;
+	}
+
+	pow_convert(&result, k2);
+	if (k1 < 0) *point_result += -k1;
+	if (k2 < 0) *point_result += -k2;
+
+	if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN) {
+		result = result * 1000; //shift for lm-sensors
+	}
+
+	return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value, int8_t *ret_str)
+{
+	int32_t calc_result = 0, point_result = 0;
+	int32_t temp_len = 0;
+
+	uint8_t temp_str[16] = "";
+
+	calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+	temp_len = sprintf(temp_str, "%d", calc_result);
+	temp_len = temp_len - point_result;
+
+	/* int part */
+	if (temp_len <= 0) sprintf(ret_str, "0");
+	else snprintf(ret_str, temp_len + 1, "%s", temp_str);  // +1 for snprintf reserve space'\0'
+
+	/* point part */
+	strcat(ret_str, ".");
+
+	/* float part */
+	if ((point_result == 0) || (temp_len < 0)) strcat(ret_str, "0");
+	else strcat(ret_str, temp_str + temp_len);
+
+	/* EOL part */
+	strcat(ret_str, "\n\0");
+
+	return (temp_len + 1 + point_result + 2); //integer + point + float + EOL + \0
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+	uint8_t slot_mask = 0x0;
+	int32_t rv = 0;
+
+	uint8_t returnData[128] = { 0 };
+	uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; //netfn = 0x36; cmd = 0xB9;
+																 //uint8_t msg_data[] = { 0x06, 0x52, 0x1B, 0x4C, 0x01, 0x00 }; //netfn = IPMI_NETFN_APP; cmd = GET_PSU_READING;
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return 0;
+	}
+	else {
+		slot_mask = (psu_slot == 1) ? 0x02 : 0x01; // for IX8C, PSU order is different from other QCT projects
+		return (returnData[0] & slot_mask) ? 0 : 1;
+	}
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData[128] = { 0 };
+	uint8_t msg_data[] = { 0x36, 0xBB, 0x4C, 0x1C, 0x00, cmd, 0x00 }; //netfn = 0x36; cmd = 0xBB;
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	if (ipmi_check_psu_present(psu_slot)) {
+		msg_data[6] = psu_slot;
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			return sprintf(retbuf, "%s\n", returnData);
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+	int32_t rv = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; //netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO;
+
+	mutex_lock(&ipmi_lock);
+	if (cmd_data1) rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+	else  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		sprintf(retbuf, "N/A\n");
+	}
+	else {
+		sprintf(retbuf, "%s", returnData);
+	}
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return sprintf(buf, "%s\n", g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	int32_t rv = 0;
+
+	uint8_t returnData[4] = "";
+	uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; //netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING;
+
+	mutex_lock(&ipmi_lock);
+	msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return sprintf(buf, "0.0\n");
+	}
+	else {
+		return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+	}
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	uint8_t returnData[10] = { 0 };
+	ipmi_fan_control(0x00, 0x00, returnData);
+	return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr, const char *buf, size_t count)
+{
+	uint8_t store_input = 0;
+	uint8_t returnData[10] = { 0 };
+	simple_atoi(buf, &store_input);
+	if (g_fan_control_mode == 1) ipmi_fan_control(0x01, store_input, returnData);
+
+	return count;
+}
+
+static ssize_t show_controlmode(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev, struct device_attribute *devattr, const char *buf, size_t count)
+{
+	uint8_t store_input = 0;
+	uint8_t returnData[10] = { 0 };
+	simple_atoi(buf, &store_input);
+	g_fan_control_mode = store_input;
+	if (g_fan_control_mode == 3) ipmi_fan_control(0x7f, 0xff, returnData);
+
+	return count;
+}
+
+static ssize_t show_direction(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t rv = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; //netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO;
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return sprintf(buf, "N/A\n");
+	}
+	else {
+		return sprintf(buf, "%c\n", returnData[1]);
+	}
+}
+
+static ssize_t show_fanpresent(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t rv = 0;
+	int32_t fan_idx = 0, fan_present = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; //netfn = 0x36; cmd = 0xB9;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	struct kernel_ipmi_msg msg;
+
+	fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+	fan_idx = 5 - fan_idx; // for IX8C, FAN order is different from other QCT projects
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+	return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t psu_idx = 0;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+	psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+	return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX]) (struct device *dev, struct device_attribute *devattr, char *buf) =
+{
+	show_label, show_crit_alarm, show_input
+	, show_lnc, show_lcr, show_lnr
+	, show_unc, show_ucr, show_unr
+	, show_model, show_sn, show_pwm
+	, show_controlmode, show_direction, show_fanpresent
+	, show_psupresent, show_mfrid
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX]) (struct device *dev, struct device_attribute *devattr, const char *buf, size_t count) =
+{
+	NULL, NULL, NULL
+	, NULL, NULL, NULL
+	, NULL, NULL, NULL
+	, NULL, NULL, store_pwm
+	, store_controlmode, NULL, NULL
+	, NULL, NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+	"%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+	, "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+	, "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+	, "%s%d_model", "%s%d_sn", "%s%d_pwm"
+	, "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+	, "%s%d_present", "%s%d_mfrid"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+	int32_t i = 0, j = 0;
+
+	struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+	printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+	for (i = 0; i < SENSOR_ATTR_MAX; i++) {
+		if ((g_sensor_data[attr_no].capability >> i) & 0x01) {
+			snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i], attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+			sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+			attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+			attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+			attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+			attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+			if (attrdata->sd_attrs[j].dev_attr.store)	attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+
+			attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+			attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+			j++;
+
+			data->total_create_sysfs++;
+		}
+	}
+
+	attrdata->attrs[j] = NULL;
+	attrdata->attr_group.attrs = attrdata->attrs;
+
+	g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+	return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+	int32_t i = 0;
+
+	for (i = 0; i < data->total_sensor_id; i++) {
+		if (g_sensor_data[i].attrinfo.attr_exist) {
+			sysfs_remove_group(&data->ipmi_hwmon_dev->kobj, &g_sensor_data[i].attrinfo.attr_group);
+		}
+	}
+	return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+	int32_t sdr_idx = 0;
+	int32_t err = 0;
+
+	struct ipmi_sdr_iterator *itr = NULL;
+	struct sdr_get_rs *header = NULL;
+
+	uint8_t *rec = NULL;
+
+	mutex_lock(&ipmi_lock);
+
+	itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+	if (itr == NULL) {
+		printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+		goto itr_malloc_fail;
+	}
+
+	header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+	if (header == NULL) {
+		printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+		goto header_malloc_fail;
+	}
+
+	err = ipmi_sdr_start(itr);
+	if (err) {
+		printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+		goto ipmi_sdr_start_fail;
+	}
+
+	data->total_sensor_id = itr->total;
+	rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+	if (rec == NULL) {
+		printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+		goto rec_malloc_fail;
+	}
+
+	g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data), GFP_KERNEL);
+	if (g_sensor_data == NULL) {
+		printk("%s(%d): malloc failure", __func__, __LINE__);
+		goto g_sensor_data_malloc_fail;
+	}
+
+	memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+	for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++) {
+		err = ipmi_sdr_get_header(itr, header);
+		if (err) {
+			if (err == 0xC5) {
+				/* C5h : Reservation Invalid */
+#if enable_debug_msg
+				printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+				printk("ipmi: retry\n");
+#endif
+				ipmi_sdr_get_reservation(&(itr->reservation));
+				sdr_idx--;
+				continue;
+			}
+			printk("ipmi: Get SDR header fail,so break this request\n");
+			goto ipmi_sdr_get_header_fail;
+		}
+
+
+		memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+		err = ipmi_sdr_get_record(header, itr, rec);
+		if (err) {
+			if (err == 0xC5) {
+				/* C5h : Reservation Invalid */
+#if enable_debug_msg
+				printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+				printk("ipmi: retry\n");
+#endif
+				ipmi_sdr_get_reservation(&(itr->reservation));
+				sdr_idx--;
+				continue;
+			}
+			printk("ipmi: Get SDR header fail,so break this request\n");
+			goto ipmi_sdr_get_record_fail;
+		}
+
+		itr->next = header->next;
+
+		switch (header->type)
+		{
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+			/* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+			g_sensor_data[sdr_idx].addr = rec[2];
+			g_sensor_data[sdr_idx].capability = SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+			g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+			g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+			ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor*) rec);
+			ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor*) rec);
+
+			if (sdr_idx >= DEBUGUSE_SHIFT) {
+				err = create_sensor_attrs(sdr_idx);
+				if (err) {
+					g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+					printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx, g_sensor_data[sdr_idx].sensor_idstring);
+					goto create_sysfs_fail;
+				}
+			}
+
+			data->total_suport_sensor++;
+
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+		default:
+			g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+			printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+			break;
+		}
+	}
+
+	printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n", data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+	if (header) {
+		kfree(header);
+		header = NULL;
+	}
+	if (rec) {
+		kfree(rec);
+		rec = NULL;
+	}
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+	if (itr) {
+		kfree(itr);
+		itr = NULL;
+	}
+
+itr_malloc_fail:
+	mutex_unlock(&ipmi_lock);
+
+	return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+	int32_t err = 0;
+
+	init_completion(&g_read_complete);
+
+	data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+	if (NULL == data) {
+		printk("alloc data fail\n");
+		goto alloc_err;
+	}
+
+	data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+	err = IS_ERR(data->ipmi_platform_dev);
+	if (err) {
+		printk("platform device register fail (err : %d)\n", err);
+		goto device_reg_err;
+	}
+
+	data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL, NULL);
+	err = IS_ERR(data->ipmi_hwmon_dev);
+	if (err) {
+		printk("hwmon register fail\n");
+		goto hwmon_register_err;
+	}
+
+	err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+	if (err) {
+		printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+		goto ipmi_create_err;
+	}
+
+	mutex_init(&ipmi_lock);
+	err = ipmi_init_sdr_sensors_data();
+	if (err) {
+		printk("init sensor data fail (err : %d)\n", err);
+		goto init_sensor_err;
+	}
+
+	return 0;
+
+init_sensor_err:
+	if (g_sensor_data) {
+		kfree(g_sensor_data);
+		g_sensor_data = NULL;
+	}
+ipmi_create_err:
+	hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+	platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+	if (data) {
+		kfree(data);
+		data = NULL;
+	}
+alloc_err:
+	return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{
+	remove_sensor_attrs();
+	hwmon_device_unregister(data->ipmi_hwmon_dev);
+
+	mutex_lock(&ipmi_lock);
+	ipmi_destroy_user(ipmi_mh_user);
+	mutex_unlock(&ipmi_lock);
+
+	platform_device_unregister(data->ipmi_platform_dev);
+
+	if (g_sensor_data) {
+		kfree(g_sensor_data);
+		g_sensor_data = NULL;
+	}
+
+	if (data) {
+		kfree(data);
+		data = NULL;
+	}
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/service/ix8c-platform-init.service b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/service/ix8c-platform-init.service
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/setup.py
index 26a3101bf7a2..7d39961b70ae 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import os
-import sys
 from setuptools import setup
 os.listdir
 
@@ -9,7 +8,7 @@
    name='ix8c_56x',
    version='1.0',
    description='Module to initialize Quanta IX8C-56X platforms',
-   
+
    packages=['ix8c_56x'],
    package_dir={'ix8c_56x': 'ix8c-56x/classes'},
 )
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..4bfefa0fb636
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..544a3ee27c64
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/chassis.py
@@ -0,0 +1,222 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus     = 2
+        self.__num_of_ports    = 56
+        self.__num_of_sfps     = 48
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 18
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            if index in range(1, self.__num_of_sfps + 1):
+                sfp = Sfp(index, 'SFP')
+            else:
+                sfp = Sfp(index, 'QSFP')
+
+            self._sfp_list.append(sfp)
+
+        for index in range(1, self.__num_of_ports + 1):
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta IX8C the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        #raise NotImplementedError
+        return (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Invalid Reason")
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..1c044638ed26
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/eeprom.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+    # Display vendor extension for Quanta platforms
+    _TLV_DISPLAY_VENDOR_EXT = True
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
+    def decoder(self, s, t):
+        '''
+        Return a string representing the contents of the TLV field. The format of
+        the string is:
+            1. The name of the field left justified in 20 characters
+            2. The type code in hex right justified in 5 characters
+            3. The length in decimal right justified in 4 characters
+            4. The value, left justified in however many characters it takes
+        The vailidity of EEPROM contents and the TLV field has been verified
+        prior to calling this function. The 's' parameter is unused
+        '''
+        if t[0] == self._TLV_CODE_PRODUCT_NAME:
+            name  = "Product Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PART_NUMBER:
+            name = "Part Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERIAL_NUMBER:
+            name  = "Serial Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_BASE:
+            name = "Base MAC Address"
+            value = ":".join(["{:02x}".format(T) for T in t[2:8]]).upper()
+        elif t[0] == self._TLV_CODE_MANUF_DATE:
+            name = "Manufacture Date"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DEVICE_VERSION:
+            name  = "Device Version"
+            value = str(t[2])
+        elif t[0] == self._TLV_CODE_LABEL_REVISION:
+            name  = "Label Revision"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PLATFORM_NAME:
+            name  = "Platform Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_ONIE_VERSION:
+            name  = "ONIE Version"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_SIZE:
+            name = "MAC Addresses"
+            value = str((t[2] << 8) | t[3])
+        elif t[0] == self._TLV_CODE_MANUF_NAME:
+            name = "Manufacturer"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MANUF_COUNTRY:
+            name = "Manufacture Country"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_NAME:
+            name = "Vendor Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DIAG_VERSION:
+            name = "Diag Version"
+            # Quanta legacy format of diag version
+            if t[1] == 4:
+                value = "{}.{}.{}.{}".format('{:02x}'.format(t[2])[0], '{:02x}'.format(t[2])[1],
+                                             '{:02x}'.format(t[3])[0], '{:02x}'.format(t[3])[1])
+            else:
+                value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERVICE_TAG:
+            name = "Service Tag"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_EXT:
+            name = "Vendor Extension"
+            value = ""
+            if self._TLV_DISPLAY_VENDOR_EXT:
+                for c in t[2:2 + t[1]]:
+                    value += "0x%02X " % c
+        elif t[0] == self._TLV_CODE_CRC_32 and len(t) == 6:
+            name = "CRC-32"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        # Quanta specific codes below here.
+        # These decodes are lifted from their U-Boot codes
+        elif t[0] == self._TLV_CODE_QUANTA_MAGIC and len(t) == 3:
+            name  = "Magic Number"
+            value = "0x%02X" % t[2]
+        elif t[0] == self._TLV_CODE_QUANTA_CRC and len(t) == 4:
+            name = "QUANTA-CRC"
+            value = "0x%04X" % ((t[2] << 8) + t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_CARD_TYPE and len(t) == 6:
+            name = "Card Type"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_HW_VERSION and len(t) == 6:
+            name = "Hardware Version"
+            value = "%d.%d" % (t[2], t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_SW_VERSION and len(t) == 6:
+            name = "Software Version"
+            value = "%d.%d.%d.%d" % ((t[2] >> 4), (t[2] & 0xF), (t[3] >> 4), (t[3] & 0xF))
+        elif t[0] == self._TLV_CODE_QUANTA_MANUF_DATE and len(t) == 6:
+            name = "Manufacture Date"
+            value = "%04d/%d/%d" % (((t[2] << 8) | t[3]), t[4], t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_MODEL_NAME:
+            name  = "Model Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        else:
+            name = "Unknown"
+            value = ""
+            for c in t[2:2 + t[1]]:
+                value += "0x%02X " % c
+        return name, value
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan.py
new file mode 100644
index 000000000000..ed3a836ba150
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan.py
@@ -0,0 +1,226 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Inventec d7264
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+FAN_INDEX_START = 20
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:39,
+            2:49,
+        }
+        self.psu_index_mapping = {
+            1:41,
+            2:51,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)/FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_rpm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR' and attr_rv != '0.0'):
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_pwm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR'):
+                return int(float(attr_rv))
+            else:
+                return False
+        else:
+            return 0
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/platform.py
new file mode 100644
index 000000000000..ddad8c4c5788
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs 
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+ 
+ 
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/psu.py
new file mode 100644
index 000000000000..941d8faef4f5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/psu.py
@@ -0,0 +1,223 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:41,
+            2:51,
+        }
+        self.psu_powerin_index_mapping = {
+            1:40,
+            2:50,
+        }
+        self.psu_current_index_mapping = {
+            1:38,
+            2:48,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:46,
+            2:56,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_current_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_current_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..a85b225afec8
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/sfp.py
@@ -0,0 +1,1625 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+#import subprocess
+#import sonic_device_util
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+#     from sonic_platform_base.sonic_eeprom import eeprom_dts
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 1
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_MODULE_THRESHOLD_OFFSET = 512
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNEL_THRESHOLD_OFFSET = 560
+QSFP_CHANNEL_THRESHOLD_WIDTH = 16
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 40
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 56
+    QSFP_START = 49
+    QSFP_END = 56
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix8c_bwde-r0"
+    HWSKU  = "Quanta-IX8C-56X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 13,
+             2 : 14,
+             3 : 15,
+             4 : 16,
+             5 : 17,
+             6 : 18,
+             7 : 19,
+             8 : 20,
+             9 : 21,
+            10 : 22,
+            11 : 23,
+            12 : 24,
+            13 : 25,
+            14 : 26,
+            15 : 27,
+            16 : 28,
+            17 : 29,
+            18 : 30,
+            19 : 31,
+            20 : 32,
+            21 : 33,
+            22 : 34,
+            23 : 35,
+            24 : 36,
+            25 : 37,
+            26 : 38,
+            27 : 39,
+            28 : 40,
+            29 : 41,
+            30 : 42,
+            31 : 43,
+            32 : 44,
+            33 : 45,
+            34 : 46,
+            35 : 47,
+            36 : 48,
+            37 : 49,
+            38 : 50,
+            39 : 51,
+            40 : 52,
+            41 : 53,
+            42 : 54,
+            43 : 55,
+            44 : 56,
+            45 : 57,
+            46 : 58,
+            47 : 59,
+            48 : 60,
+            49 : 61,#QSFP49
+            50 : 62,#QSFP50
+            51 : 63,#QSFP51
+            52 : 64,#QSFP52
+            53 : 65,#QSFP53
+            54 : 66,#QSFP54
+            55 : 67,#QSFP55
+            56 : 68,#QSFP56
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serialnum', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date',
+            'vendor_oui', 'application_advertisement']
+
+        self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
+            'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
+            'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias',
+            'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
+
+        self.threshold_dict_keys = ['temphighalarm', 'temphighwarning',
+            'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning',
+            'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
+            'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm',
+            'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+            'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            if self.sfp_type == SFP_TYPE:
+                reg_file = open("/sys/class/cpld-sfp28/port-"+str(self.port_num)+"/pre_n")
+            else:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+34)+"/value")
+        except IOError as e:
+            print ("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        reg_file.close()
+        if self.sfp_type == SFP_TYPE:
+            if reg_value == '1':
+                return True
+        else:
+            if reg_value == '0':
+                return True
+
+        return False
+
+    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability = int(qsfp_dom_capability_raw[0], 16)
+
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_OFFSET)
+                if qsfp_version_compliance_raw is not None:
+                    qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                else:
+                    self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                    return
+
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = (qsfp_dom_capability & 0x20 != 0)
+                    self.dom_volt_supported = (qsfp_dom_capability & 0x10 != 0)
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = (qsfp_dom_capability & 0x04 != 0)
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = (qsfp_dom_capability & 0x08 != 0)
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                self.dom_tx_disable_supported = True
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev                |1*255VCHAR     |hardware version of SFP
+        serialnum                  |1*255VCHAR     |serial number of the SFP
+        manufacturer            |1*255VCHAR     |SFP vendor name
+        model                  |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ========================================================================
+         """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = QSFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = SFP_INFO_OFFSET
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return transceiver_info_dict
+        else:
+            return transceiver_info_dict
+
+        # Add retry for xcvr eeprom to get ready
+        max_retry = 10
+        for i in range(0,max_retry):
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is not None:
+                break
+            else:
+                if not self.get_presence():
+                    return transceiver_info_dict
+                elif i == max_retry-1:
+                    pass
+                else:
+                    time.sleep(0.5)
+
+        if sfp_interface_bulk_raw is None:
+            return transceiver_info_dict
+
+        start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + interface_info_bulk_width
+        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_NAME_WIDTH
+        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_PN_WIDTH
+        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + vendor_rev_width
+        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_SN_WIDTH
+        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_OUI_WIDTH
+        sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+        start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+        end = start + XCVR_VENDOR_DATE_WIDTH
+        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+        transceiver_info_dict['type'] = sfp_interface_bulk_data \
+            ['data']['type']['value']
+        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+            ['data']['Vendor Name']['value']
+        transceiver_info_dict['model'] = sfp_vendor_pn_data \
+            ['data']['Vendor PN']['value']
+        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+            ['data']['Vendor Rev']['value']
+        transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+            ['data']['Vendor SN']['value']
+        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+            ['data']['Vendor OUI']['value']
+        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+            ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+            ['data']['Connector']['value']
+        transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+            ['data']['EncodingCodes']['value']
+        transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+            ['data']['Extended Identifier']['value']
+        transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+            ['data']['RateIdentifier']['value']
+        transceiver_info_dict['type_abbrv_name'] = 'N/A'
+        if self.sfp_type == QSFP_TYPE:
+            for key in qsfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in qsfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['Nominal Bit Rate(100Mbs)']['value'])
+        else:
+            for key in sfp_cable_length_tup:
+                if key in sfp_interface_bulk_data['data']:
+                    transceiver_info_dict['cable_type'] = key
+                    transceiver_info_dict['cable_length'] = str(
+                        sfp_interface_bulk_data['data'][key]['value'])
+
+            for key in sfp_compliance_code_tup:
+                if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
+            transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+            transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data \
+                ['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        rx_los                     |BOOLEAN        |RX loss-of-signal status, True if has RX los, False if not.
+        tx_fault                   |BOOLEAN        |TX fault status, True if has TX fault, False if not.
+        reset_status               |BOOLEAN        |reset status, True if SFP in reset, False if not.
+        lp_mode                    |BOOLEAN        |low power mode status, True in lp mode, False if not.
+        tx_disable                 |BOOLEAN        |TX disable status, True TX disabled, False if not.
+        tx_disabled_channel        |HEX            |disabled TX channels in hex, bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        temperature                |INT            |module temperature in Celsius
+        voltage                    |INT            |supply voltage in mV
+        tx<n>bias                  |INT            |TX Bias Current in mA, n is the channel number,
+                                   |               |for example, tx2bias stands for tx bias of channel 2.
+        rx<n>power                 |INT            |received optical power in mW, n is the channel number,
+                                   |               |for example, rx2power stands for rx power of channel 2.
+        tx<n>power                 |INT            |TX output power in mW, n is the channel number,
+                                   |               |for example, tx2power stands for tx power of channel 2.
+        ========================================================================
+        """
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            sfpi_obj = sff8436InterfaceId()
+
+            if not sfpi_obj or not sfpd_obj:
+                return {}
+
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            offset = QSFP_DOM_OFFSET
+            offset_xcvr = QSFP_INFO_OFFSET
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset_xcvr + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_dom_capability_data = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+            else:
+                return None
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            qsfp_dom_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_REV_OFFSET), QSFP_DOM_REV_WIDTH)
+            if qsfp_dom_rev_raw is not None:
+                qsfp_dom_rev_data = sfpd_obj.parse_sfp_dom_rev(qsfp_dom_rev_raw, 0)
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            dom_channel_monitor_data = {}
+            dom_channel_monitor_raw = None
+            qsfp_tx_power_support = qsfp_dom_capability_data['data']['Tx_power_support']['value']
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+
+            else:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    transceiver_dom_info_dict['tx1power'] = dom_channel_monitor_data['data']['TX1Power']['value']
+                    transceiver_dom_info_dict['tx2power'] = dom_channel_monitor_data['data']['TX2Power']['value']
+                    transceiver_dom_info_dict['tx3power'] = dom_channel_monitor_data['data']['TX3Power']['value']
+                    transceiver_dom_info_dict['tx4power'] = dom_channel_monitor_data['data']['TX4Power']['value']
+
+            if dom_channel_monitor_raw:
+                transceiver_dom_info_dict['rx1power'] = dom_channel_monitor_data['data']['RX1Power']['value']
+                transceiver_dom_info_dict['rx2power'] = dom_channel_monitor_data['data']['RX2Power']['value']
+                transceiver_dom_info_dict['rx3power'] = dom_channel_monitor_data['data']['RX3Power']['value']
+                transceiver_dom_info_dict['rx4power'] = dom_channel_monitor_data['data']['RX4Power']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+                transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+                transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+                transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+            if not sfpd_obj:
+                return {}
+
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, SFP_DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = SFP_DOM_OFFSET
+            transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_temperature_raw, 0)
+                transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
+                    dom_channel_monitor_raw, 0)
+                transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
+                transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
+                transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
+        else:
+            return None
+
+        for key in transceiver_dom_info_dict:
+            transceiver_dom_info_dict[key] = self._convert_string_to_num(
+                transceiver_dom_info_dict[key])
+
+        transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
+        transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
+        transceiver_dom_info_dict['reset_status'] = self.get_reset_status()
+        transceiver_dom_info_dict['lp_mode'] = self.get_lpmode()
+        transceiver_dom_info_dict['tx_disable'] = self.get_tx_disable()
+        transceiver_dom_info_dict['tx_disable_channel'] = self.get_tx_disable_channel()
+
+        return transceiver_dom_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict_keys = ['temphighalarm',    'temphighwarning',    'templowalarm',    'templowwarning',
+                                                        'vcchighalarm',     'vcchighwarning',     'vcclowalarm',     'vcclowwarning',
+                                                        'rxpowerhighalarm', 'rxpowerhighwarning', 'rxpowerlowalarm', 'rxpowerlowwarning',
+                                                        'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning',
+                                                        'txbiashighalarm',  'txbiashighwarning',  'txbiaslowalarm',  'txbiaslowwarning']
+
+        if self.sfp_type == QSFP_TYPE:
+            sfpd_obj = sff8436Dom()
+            if not self.get_presence() or not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 0
+            transceiver_dom_threshold_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            offset = DOM_OFFSET
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                module_threshold_values = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+                module_threshold_data = module_threshold_values.get('data')
+                if module_threshold_data:
+                    transceiver_dom_threshold_dict['temphighalarm']   = module_threshold_data['TempHighAlarm']['value']
+                    transceiver_dom_threshold_dict['templowalarm']    = module_threshold_data['TempLowAlarm']['value']
+                    transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['TempHighWarning']['value']
+                    transceiver_dom_threshold_dict['templowwarning']  = module_threshold_data['TempLowWarning']['value']
+                    transceiver_dom_threshold_dict['vcchighalarm']    = module_threshold_data['VccHighAlarm']['value']
+                    transceiver_dom_threshold_dict['vcclowalarm']     = module_threshold_data['VccLowAlarm']['value']
+                    transceiver_dom_threshold_dict['vcchighwarning']  = module_threshold_data['VccHighWarning']['value']
+                    transceiver_dom_threshold_dict['vcclowwarning']   = module_threshold_data['VccLowWarning']['value']
+
+            dom_channel_thres_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNEL_THRESHOLD_OFFSET), QSFP_CHANNEL_THRESHOLD_WIDTH)
+            if dom_channel_thres_raw is not None:
+                channel_threshold_values = sfpd_obj.parse_channel_threshold_values(dom_channel_thres_raw, 0)
+                channel_threshold_data = channel_threshold_values.get('data')
+            else:
+                channel_threshold_data = None
+            if channel_threshold_data:
+                transceiver_dom_threshold_dict['rxpowerhighalarm']   = channel_threshold_data['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm']    = channel_threshold_data['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning']  = channel_threshold_data['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm']   = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowalarm']    = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = "0.0dBm"
+                transceiver_dom_threshold_dict['txpowerlowwarning']  = "0.0dBm"
+                transceiver_dom_threshold_dict['txbiashighalarm']    = channel_threshold_data['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm']     = channel_threshold_data['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning']  = channel_threshold_data['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning']   = channel_threshold_data['TxBiasLowWarning']['value']
+
+            for key in transceiver_dom_threshold_dict:
+                transceiver_dom_threshold_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_dict[key])
+
+            return transceiver_dom_threshold_dict
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpd_obj = sff8472Dom()
+
+            if not self.get_presence() and not sfpd_obj:
+                return {}
+            DOM_OFFSET  = 256
+            eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
+            if eeprom_ifraw is not None:
+                sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
+                cal_type = sfpi_obj.get_calibration_type()
+                sfpd_obj._calibration_type = cal_type
+
+            offset = DOM_OFFSET
+            transceiver_dom_threshold_info_dict = dict.fromkeys(transceiver_dom_threshold_info_dict_keys, 'N/A')
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+
+                transceiver_dom_threshold_info_dict['temphighalarm']      = dom_module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['templowalarm']       = dom_module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['temphighwarning']    = dom_module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_info_dict['templowwarning']     = dom_module_threshold_data['data']['TempLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['vcchighalarm']       = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcclowalarm']        = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['vcchighwarning']     = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_info_dict['vcclowwarning']      = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txbiashighalarm']    = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowalarm']     = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txbiashighwarning']  = dom_module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txbiaslowwarning']   = dom_module_threshold_data['data']['BiasLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['txpowerhighalarm']   = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowalarm']    = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['txpowerlowwarning']  = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+
+                transceiver_dom_threshold_info_dict['rxpowerhighalarm']   = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowalarm']    = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_info_dict['rxpowerlowwarning']  = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+            for key in transceiver_dom_threshold_info_dict:
+                transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(transceiver_dom_threshold_info_dict[key])
+
+            return transceiver_dom_threshold_info_dict
+
+        else:
+            return None
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+32)+"/value")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return rx_los_list
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_fault_list
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        else:
+            return None
+
+        return tx_disable_list
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(
+                        dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+        else:
+            return None
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(
+                        dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+        else:
+            return None
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = \
+                    sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params( \
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = \
+                        sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        else:
+            return None
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/direction", 'r+') as f:
+                    f.write('out')
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+") as f:
+                    f.write('0')
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                with open("/sys/class/gpio/gpio"+str((self.port_num-self.QSFP_START)*4+32)+"/value", "r+") as f:
+                    f.write('1')
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self.__read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print ("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                reg_file = open("/sys/class/gpio/gpio"
+                    +str((self.port_num-self.QSFP_START)*4+35)+"/value", "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print ("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..f30bdc8d71da
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform/thermal.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Inventec d7264
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+thermal_index_mapping = {
+    1:1,
+    2:2,
+    3:42,
+    4:43,
+    5:44,
+    6:52,
+    7:53,
+    8:54,
+    9:75,
+   10:76,
+   11:77,
+   12:78,
+   13:79,
+   14:80,
+   15:81,
+   16:82,
+   17:83,
+   18:84,
+}
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform_setup.py
new file mode 100644
index 000000000000..b1ba37477628
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/utils/quanta_ix8c_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/utils/quanta_ix8c_util.py
index c495533638e8..f8e8b0f0f96b 100755
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/utils/quanta_ix8c_util.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/utils/quanta_ix8c_util.py
@@ -21,94 +21,86 @@
 options:
     -h | --help     : this help message
     -d | --debug    : run with debug mode
-    -f | --force    : ignore error during installation or clean 
+    -f | --force    : ignore error during installation or clean
 command:
     install     : install drivers and generate related sysfs nodes
-    clean       : uninstall drivers and remove related sysfs nodes    
+    clean       : uninstall drivers and remove related sysfs nodes
 """
 
 import os
 import commands
 import sys, getopt
 import logging
-import re
 import time
-from collections import namedtuple
 
 DEBUG = False
 args = []
 FORCE = 0
 i2c_prefix = '/sys/bus/i2c/devices/'
 
-
 if DEBUG == True:
     print sys.argv[0]
-    print 'ARGV      :', sys.argv[1:]   
-
+    print 'ARGV      :', sys.argv[1:]
 
 def main():
     global DEBUG
     global args
     global FORCE
-        
-    if len(sys.argv)<2:
+
+    if len(sys.argv) < 2:
         show_help()
-         
+
     options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
                                                        'debug',
                                                        'force',
                                                           ])
-    if DEBUG == True:                                                           
+    if DEBUG == True:
         print options
         print args
         print len(sys.argv)
-            
+
     for opt, arg in options:
         if opt in ('-h', '--help'):
             show_help()
-        elif opt in ('-d', '--debug'):            
+        elif opt in ('-d', '--debug'):
             DEBUG = True
             logging.basicConfig(level=logging.INFO)
-        elif opt in ('-f', '--force'): 
+        elif opt in ('-f', '--force'):
             FORCE = 1
         else:
-            logging.info('no option')                          
-    for arg in args:            
+            logging.info('no option')
+    for arg in args:
         if arg == 'install':
            install()
         elif arg == 'clean':
            uninstall()
         else:
             show_help()
-            
-            
-    return 0              
-        
+
+
+    return 0
+
 def show_help():
     print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
     sys.exit(0)
-           
+
 def show_log(txt):
     if DEBUG == True:
         print "[IX8C-56X]"+txt
     return
-    
+
 def exec_cmd(cmd, show):
-    logging.info('Run :'+cmd)  
-    status, output = commands.getstatusoutput(cmd)    
+    logging.info('Run :'+cmd)
+    status, output = commands.getstatusoutput(cmd)
     show_log (cmd +"with result:" + str(status))
-    show_log ("      output:"+output)    
+    show_log ("      output:"+output)
     if status:
         logging.info('Failed :'+cmd)
         if show:
             print('Failed :'+cmd)
     return  status, output
-        
+
 instantiate =[
-#turn on module power
-'echo 21 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio21/direction',
-'echo 1 >/sys/class/gpio/gpio21/value',
 #export pca9698 for qsfp present
 'echo 34 > /sys/class/gpio/export',
 'echo in > /sys/class/gpio/gpio34/direction',
@@ -126,31 +118,6 @@ def exec_cmd(cmd, show):
 'echo in > /sys/class/gpio/gpio58/direction',
 'echo 62 > /sys/class/gpio/export',
 'echo in > /sys/class/gpio/gpio62/direction',
-#export pca9698 for qsfp reset
-'echo 32 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio32/direction',
-'echo 1 >/sys/class/gpio/gpio32/value',
-'echo 36 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio36/direction',
-'echo 1 >/sys/class/gpio/gpio36/value',
-'echo 40 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio40/direction',
-'echo 1 >/sys/class/gpio/gpio40/value',
-'echo 44 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio44/direction',
-'echo 1 >/sys/class/gpio/gpio44/value',
-'echo 48 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio48/direction',
-'echo 1 >/sys/class/gpio/gpio48/value',
-'echo 52 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio52/direction',
-'echo 1 >/sys/class/gpio/gpio52/value',
-'echo 56 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio56/direction',
-'echo 1 >/sys/class/gpio/gpio56/value',
-'echo 60 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio60/direction',
-'echo 1 >/sys/class/gpio/gpio60/value',
 #export pca9698 for qsfp lpmode
 'echo 35 > /sys/class/gpio/export',
 'echo out > /sys/class/gpio/gpio35/direction',
@@ -176,11 +143,6 @@ def exec_cmd(cmd, show):
 'echo 63 > /sys/class/gpio/export',
 'echo out > /sys/class/gpio/gpio63/direction',
 'echo 0 >/sys/class/gpio/gpio63/value',
-#Reset fron-ports LED CPLD
-'echo 73 > /sys/class/gpio/export',
-'echo out > /sys/class/gpio/gpio73/direction',
-'echo 0 >/sys/class/gpio/gpio73/value',
-'echo 1 >/sys/class/gpio/gpio73/value',
 #Enable front-ports LED decoding
 'echo 1 > /sys/class/cpld-led/CPLDLED-1/led_decode',
 'echo 1 > /sys/class/cpld-led/CPLDLED-2/led_decode',
@@ -239,41 +201,66 @@ def exec_cmd(cmd, show):
 'lpc_ich',
 'i2c-i801',
 'i2c-dev',
+'i2c-mux-pca954x force_deselect_on_exit=1',
+'gpio-pca953x',
+'optoe',
+'qci_cpld_sfp28',
+'qci_cpld_led',
+'qci_platform_ix8c',
+'quanta_hwmon_ipmi',
+'ipmi_devintf'
+]
+
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
 'i2c-mux-pca954x',
 'gpio-pca953x',
 'optoe',
 'qci_cpld_sfp28',
 'qci_cpld_led',
 'qci_platform_ix8c',
+'quanta_hwmon_ipmi',
 'ipmi_devintf'
 ]
- 
 
-                    
 def system_install():
     global FORCE
 
-    #remove default drivers to avoid modprobe order conflicts
-    status, output = exec_cmd("rmmod i2c_ismt ", 1)
-    status, output = exec_cmd("rmmod i2c-i801 ", 1)
     #setup driver dependency
-    status, output = exec_cmd("depmod -a ", 1)
+    exec_cmd("depmod -a ", 1)
     #install drivers
     for i in range(0,len(drivers)):
-       status, output = exec_cmd("modprobe "+drivers[i], 1)
+       status, output = exec_cmd("modprobe " + drivers[i], 1)
     if status:
        print output
        if FORCE == 0:
           return status
 
-    #remove net rules for generating new net rules
-    status, output = exec_cmd("systemctl stop systemd-udevd.service ", 1)
-    status, output = exec_cmd("rm /etc/udev/rules.d/70-persistent-net.rules ", 1)
-    status, output = exec_cmd("rmmod ixgbe ", 1)
-    status, output = exec_cmd("rmmod igb ", 1)
-    status, output = exec_cmd("modprobe igb ", 1)
-    status, output = exec_cmd("modprobe ixgbe ", 1)
-    status, output = exec_cmd("systemctl start systemd-udevd.service ", 1)
+    #reload ethernet drivers in correct order
+    exec_cmd("rmmod ixgbe ", 1)
+    exec_cmd("rmmod igb ", 1)
+    exec_cmd("modprobe igb ", 1)
+    exec_cmd("modprobe ixgbe ", 1)
+
+    #turn on module power
+    exec_cmd("echo 21 > /sys/class/gpio/export ", 1)
+    exec_cmd("echo high > /sys/class/gpio/gpio21/direction ", 1)
+
+    time.sleep(1)
+    # qsfp reset gpio
+    for qsfp_reset in [32, 36, 40, 44, 48, 52, 56, 60]:
+        exec_cmd("echo "+str(qsfp_reset)+" > /sys/class/gpio/export", 1)
+        exec_cmd("echo high > /sys/class/gpio/gpio"+str(qsfp_reset)+"/direction", 1)
+
+    # Reset fron-ports LED CPLD
+    exec_cmd("echo 73 > /sys/class/gpio/export ", 1)
+    status, output = exec_cmd("cat /sys/class/gpio/gpio73/value", 1)
+    if output != '1':
+        exec_cmd("echo out > /sys/class/gpio/gpio73/direction ", 1)
+        exec_cmd("echo 0 >/sys/class/gpio/gpio73/value", 1)
+        exec_cmd("echo 1 >/sys/class/gpio/gpio73/value", 1)
 
     #instantiate devices
     for i in range(0,len(instantiate)):
@@ -285,24 +272,29 @@ def system_install():
 
     #QSFP for 1~56 port
     for port_number in range(1,57):
-        bus_number = port_number + 31
+        bus_number = port_number + 12
         os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
 
     return
-     
-        
+
+
 def system_ready():
-    if not device_found(): 
+    if not device_found():
         return False
     return True
-               
-def install():                      
+
+def install():
     if not device_found():
-        print "No device, installing...."     
-        status = system_install() 
+        print "No device, installing...."
+        status = system_install()
         if status:
-            if FORCE == 0:        
-                return  status        
+            if FORCE == 0:
+                return  status
+        status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix8c_bwde-r0/sonic_platform-1.0-py3-none-any.whl",1)
+        if status:
+               print output
+               if FORCE == 0:
+                  return status
     else:
         print " ix8c driver already installed...."
     return
@@ -310,20 +302,29 @@ def install():
 def uninstall():
     global FORCE
     #uninstall drivers
-    for i in range(len(drivers)-1,-1,-1):
-       status, output = exec_cmd("rmmod "+drivers[i], 1)
+    for i in range(len(un_drivers) - 1, -1, -1):
+       status, output = exec_cmd("rmmod " + un_drivers[i], 1)
     if status:
 	   print output
-	   if FORCE == 0:                
+	   if FORCE == 0:
 	      return status
+
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+
     return
 
 def device_found():
-    ret1, log = exec_cmd("ls "+i2c_prefix+"i2c-0", 0)
-    return ret1				
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix8c > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix8c", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
 
 if __name__ == "__main__":
     main()
-
-
-
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/Makefile b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/Makefile
index 929782931a47..8ab9ee0db1fb 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/Makefile
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/Makefile
@@ -1,3 +1,3 @@
-obj-m:=qci_cpld_qsfpdd.o qci_cpld_led.o qci_platform_ix9.o
+obj-m:=qci_cpld_qsfpdd.o qci_cpld_led.o qci_platform_ix9.o quanta_hwmon_ipmi.o
 
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_led.c b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_led.c
index d8f89240a851..fdbc6c6c1634 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_led.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_led.c
@@ -26,6 +26,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
@@ -244,6 +245,8 @@ static int cpld_led_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,10,0)
+#else
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -253,6 +256,7 @@ static bool cpld_idr_is_empty(struct idr *idp)
 {
 	return !idr_for_each(idp, idr_has_entry, NULL);
 }
+#endif
 
 static int cpld_led_remove(struct i2c_client *client)
 {
@@ -262,8 +266,11 @@ static int cpld_led_remove(struct i2c_client *client)
 	device_unregister(data->port_dev);
 	ida_simple_remove(&cpld_led_ida, data->cpld_data->cpld_id);
 	kfree(data->cpld_data);
-
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,10,0)
+	if (ida_is_empty(&cpld_led_ida))
+#else
 	if (cpld_idr_is_empty(&cpld_led_ida.idr))
+#endif
 		class_destroy(cpld_class);
 
 	return 0;
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_qsfpdd.c b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_qsfpdd.c
index d616f887dbbf..89e04cee0902 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_qsfpdd.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_cpld_qsfpdd.c
@@ -26,6 +26,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
@@ -375,6 +376,8 @@ static int cpld_probe(struct i2c_client *client,
 }
 
 /* FIXME: for older kernel doesn't with idr_is_empty function, implement here */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,10,0)
+#else
 static int idr_has_entry(int id, void *p, void *data)
 {
 	return 1;
@@ -384,6 +387,7 @@ static bool cpld_idr_is_empty(struct idr *idp)
 {
 	return !idr_for_each(idp, idr_has_entry, NULL);
 }
+#endif
 
 static int cpld_remove(struct i2c_client *client)
 {
@@ -397,9 +401,15 @@ static int cpld_remove(struct i2c_client *client)
 		ida_simple_remove(&cpld_ida, data->port_data[i]->port_id);
 		kfree(data->port_data[i]);
 	}
-
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,10,0)
+	if (ida_is_empty(&cpld_ida))
+#else
 	if (cpld_idr_is_empty(&cpld_ida.idr))
+#endif
+	{
 		class_destroy(cpld_class);
+		cpld_class = NULL;
+	}
 
 	return 0;
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
index 1b98c4a2f31f..803b2b42f495 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
@@ -39,102 +39,11 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/platform_data/pca954x.h>
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
 #include <linux/platform_data/pca953x.h>
 #else
 #include <linux/i2c/pca953x.h>
 #endif
-#define MUX_INFO(bus, deselect) \
-	{.adap_id = bus, .deselect_on_exit = deselect}
-
-static struct pca954x_platform_mode pca9546_1_modes[] = {
-	MUX_INFO(0x10, 1),
-	MUX_INFO(0x11, 1),
-	MUX_INFO(0x12, 1),
-	MUX_INFO(0x13, 1),
-};
-
-static struct pca954x_platform_data pca9546_1_data = {
-	.modes 		= pca9546_1_modes,
-	.num_modes 	= 4,
-};
-
-static struct pca954x_platform_mode pca9548_1_modes[] = {
-	MUX_INFO(0x14, 1),
-	MUX_INFO(0x15, 1),
-	MUX_INFO(0x16, 1),
-	MUX_INFO(0x17, 1),
-};
-
-static struct pca954x_platform_data pca9548_1_data = {
-	.modes 		= pca9548_1_modes,
-	.num_modes 	= 4,
-};
-
-static struct pca954x_platform_mode pca9548sfp1_modes[] = {
-	MUX_INFO(0x20, 1),
-	MUX_INFO(0x21, 1),
-	MUX_INFO(0x22, 1),
-	MUX_INFO(0x23, 1),
-	MUX_INFO(0x24, 1),
-	MUX_INFO(0x25, 1),
-	MUX_INFO(0x26, 1),
-	MUX_INFO(0x27, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp1_data = {
-	.modes 		= pca9548sfp1_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp2_modes[] = {
-	MUX_INFO(0x28, 1),
-	MUX_INFO(0x29, 1),
-	MUX_INFO(0x2a, 1),
-	MUX_INFO(0x2b, 1),
-	MUX_INFO(0x2c, 1),
-	MUX_INFO(0x2d, 1),
-	MUX_INFO(0x2e, 1),
-	MUX_INFO(0x2f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp2_data = {
-	.modes 		= pca9548sfp2_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp3_modes[] = {
-	MUX_INFO(0x30, 1),
-	MUX_INFO(0x31, 1),
-	MUX_INFO(0x32, 1),
-	MUX_INFO(0x33, 1),
-	MUX_INFO(0x34, 1),
-	MUX_INFO(0x35, 1),
-	MUX_INFO(0x36, 1),
-	MUX_INFO(0x37, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp3_data = {
-	.modes 		= pca9548sfp3_modes,
-	.num_modes 	= 8,
-};
-
-static struct pca954x_platform_mode pca9548sfp4_modes[] = {
-	MUX_INFO(0x38, 1),
-	MUX_INFO(0x39, 1),
-	MUX_INFO(0x3a, 1),
-	MUX_INFO(0x3b, 1),
-	MUX_INFO(0x3c, 1),
-	MUX_INFO(0x3d, 1),
-	MUX_INFO(0x3e, 1),
-	MUX_INFO(0x3f, 1),
-};
-
-static struct pca954x_platform_data pca9548sfp4_data = {
-	.modes 		= pca9548sfp4_modes,
-	.num_modes 	= 8,
-};
 
 static struct pca953x_platform_data tca9539_1_data = {
 	.gpio_base = 0x10,
@@ -146,12 +55,10 @@ static struct pca953x_platform_data pca9555_CPU_data = {
 
 static struct i2c_board_info ix9_i2c_devices[] = {
 	{
-		I2C_BOARD_INFO("pca9546", 0x72),
-		.platform_data = &pca9546_1_data,	// 0 pca9546_1
+		I2C_BOARD_INFO("pca9546", 0x72),	// 0 pca9546_1
 	},
 	{
-		I2C_BOARD_INFO("pca9548", 0x77),
-		.platform_data = &pca9548_1_data,	// 1 pca9548_1
+		I2C_BOARD_INFO("pca9548", 0x77),	// 1 pca9548_1
 	},
 	{
 		I2C_BOARD_INFO("tca9539", 0x74),
@@ -161,20 +68,16 @@ static struct i2c_board_info ix9_i2c_devices[] = {
 		I2C_BOARD_INFO("24c02", 0x54),		// 3 MB_BOARDINFO_EEPROM
 	},
 	{
-		I2C_BOARD_INFO("pca9548", 0x73),
-		.platform_data = &pca9548sfp1_data,	// 4 0x77 ch0 pca9548 #1
+		I2C_BOARD_INFO("pca9548", 0x73),	// 4 0x77 ch0 pca9548 #1
 	},
 	{
-		I2C_BOARD_INFO("pca9548", 0x73),
-		.platform_data = &pca9548sfp2_data,	// 5 0x77 ch1 pca9548 #2
+		I2C_BOARD_INFO("pca9548", 0x73),	// 5 0x77 ch1 pca9548 #2
 	},
 	{
-		I2C_BOARD_INFO("pca9548", 0x73),
-		.platform_data = &pca9548sfp3_data,	// 6 0x77 ch2 pca9548 #3
+		I2C_BOARD_INFO("pca9548", 0x73),	// 6 0x77 ch2 pca9548 #3
 	},
 	{
-		I2C_BOARD_INFO("pca9548", 0x73),
-		.platform_data = &pca9548sfp4_data,	// 7 0x77 ch3 pca9548 #4
+		I2C_BOARD_INFO("pca9548", 0x73),	// 7 0x77 ch3 pca9548 #4
 	},
 	{
 		I2C_BOARD_INFO("CPLD-QSFPDD", 0x38),	// 8 0x72 ch0 CPLD-IO #2, #3
@@ -200,9 +103,13 @@ static struct platform_driver ix9_platform_driver = {
 
 static struct platform_device *ix9_device;
 
+static struct i2c_client **g_client;
+static struct i2c_client **g_client_port;
+int numof_i2c_devices = 13;
+int numof_ports = 32;
+
 static int __init ix9_platform_init(void)
 {
-	struct i2c_client *client;
 	struct i2c_adapter *adapter;
 	int ret, i;
 
@@ -221,51 +128,127 @@ static int __init ix9_platform_init(void)
 	if (ret)
 		goto fail_platform_device;
 
+	g_client = kmalloc(sizeof(*g_client) * numof_i2c_devices, GFP_KERNEL);
+	for (i = 0; i < numof_i2c_devices; i++) g_client[i] = NULL;
+
+	g_client_port = kmalloc(sizeof(*g_client_port) * numof_ports, GFP_KERNEL);
+	for (i = 0; i < numof_ports; i++) g_client_port[i] = NULL;
+
 	adapter = i2c_get_adapter(0);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[0]);		// pca9546_1 - Address: 0x72
-	client = i2c_new_device(adapter, &ix9_i2c_devices[1]);		// pca9548_1 - Address: 0x77
-	client = i2c_new_device(adapter, &ix9_i2c_devices[11]);		// CPU Linking Board at CPU's I2C Bus - Address: 0x22
-	i2c_put_adapter(adapter);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[0] = i2c_new_device(adapter, &ix9_i2c_devices[0]);		// pca9546_1 - Address: 0x72
+		g_client[1] = i2c_new_device(adapter, &ix9_i2c_devices[1]);		// pca9548_1 - Address: 0x77
+		g_client[2] = i2c_new_device(adapter, &ix9_i2c_devices[11]);	// CPU Linking Board at CPU's I2C Bus - Address: 0x22
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x10);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[8]);		// CPLD-IO #2 - Address: 0x38
-	client = i2c_new_device(adapter, &ix9_i2c_devices[9]);		// CPLD-LED #4 - Address: 0x39
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x01);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[3] = i2c_new_device(adapter, &ix9_i2c_devices[8]);		// CPLD-IO #2 - Address: 0x38
+		g_client[4] = i2c_new_device(adapter, &ix9_i2c_devices[9]);		// CPLD-LED #4 - Address: 0x39
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x11);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[8]);		// CPLD-IO #3 - Address: 0x38
-	client = i2c_new_device(adapter, &ix9_i2c_devices[9]);		// CPLD-LED #5 - Address: 0x39
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x02);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[5] = i2c_new_device(adapter, &ix9_i2c_devices[8]);		// CPLD-IO #3 - Address: 0x38
+		g_client[6] = i2c_new_device(adapter, &ix9_i2c_devices[9]);		// CPLD-LED #5 - Address: 0x39
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x12);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[3]);		// MB_BOARDINFO_EEPROM - Address: 0x54
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x03);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[7] = i2c_new_device(adapter, &ix9_i2c_devices[3]);		// MB_BOARDINFO_EEPROM - Address: 0x54
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x13);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[2]);		// tca9539_1 Board ID and QSFP-DD PW EN/PG - Address: 0x74
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x04);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[8] = i2c_new_device(adapter, &ix9_i2c_devices[2]);		// tca9539_1 Board ID and QSFP-DD PW EN/PG - Address: 0x74
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x14);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[4]);		// pca9548 #1 QSFPDD - Address: 0x73
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x05);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[9] = i2c_new_device(adapter, &ix9_i2c_devices[4]);		// pca9548 #1 QSFPDD - Address: 0x73
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x15);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[5]);		// pca9548 #2 QSFPDD - Address: 0x73
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x06);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[10] = i2c_new_device(adapter, &ix9_i2c_devices[5]);		// pca9548 #2 QSFPDD - Address: 0x73
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x16);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[6]);		// pca9548 #3 QSFPDD - Address: 0x73
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x07);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[11] = i2c_new_device(adapter, &ix9_i2c_devices[6]);		// pca9548 #3 QSFPDD - Address: 0x73
+		i2c_put_adapter(adapter);
+	}
 
-	adapter = i2c_get_adapter(0x17);
-	client = i2c_new_device(adapter, &ix9_i2c_devices[7]);		// pca9548 #4 QSFPDD - Address: 0x73
-	i2c_put_adapter(adapter);
+	adapter = i2c_get_adapter(0x08);
+	if (adapter == NULL)
+	{
+		printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+	}
+	else
+	{
+		g_client[12] = i2c_new_device(adapter, &ix9_i2c_devices[7]);		// pca9548 #4 QSFPDD - Address: 0x73
+		i2c_put_adapter(adapter);
+	}
 
-	for(i = 0x20; i < 0x40; i++)
+	for(i = 13; i < 45; i++)
 	{
 		adapter = i2c_get_adapter(i);
-		client = i2c_new_device(adapter, &ix9_i2c_devices[10]);		// eeprom for loopback module - Address: 0x50
-		i2c_put_adapter(adapter);
+		if (adapter == NULL)
+		{
+			printk("[%s] get i2c adapter fail at line %d", __FUNCTION__, __LINE__);
+		}
+		else
+		{
+			g_client_port[i - 13] = i2c_new_device(adapter, &ix9_i2c_devices[10]);		// eeprom for loopback module - Address: 0x50
+			i2c_put_adapter(adapter);
+		}
 	}
 
 	return 0;
@@ -280,6 +263,26 @@ static int __init ix9_platform_init(void)
 
 static void __exit ix9_platform_exit(void)
 {
+	int i = 0;
+
+	for (i = numof_ports - 1; i >= 0; i--)
+	{
+		if (g_client_port[i])
+		{
+			i2c_unregister_device(g_client_port[i]);
+			g_client_port[i] = NULL;
+		}
+	}
+
+	for (i = numof_i2c_devices - 1; i >= 0; i--)
+	{
+		if (g_client[i])
+		{
+			i2c_unregister_device(g_client[i]);
+			g_client[i] = NULL;
+		}
+	}
+
 	platform_device_unregister(ix9_device);
 	platform_driver_unregister(&ix9_platform_driver);
 }
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/quanta_hwmon_ipmi.c b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/quanta_hwmon_ipmi.c
new file mode 100644
index 000000000000..05a9e044c75b
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/quanta_hwmon_ipmi.c
@@ -0,0 +1,1669 @@
+/*
+*
+* A hwmon driver for the Quanta switch BMC hwmon
+*
+*/
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/ipmi.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/completion.h>
+
+#define enable_debug_msg	0
+#define DEBUGUSE_SHIFT		0
+
+#define DRVNAME		"quanta_hwmon_ipmi"
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+#define BSWAP_16(x)			((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define BSWAP_32(x)			((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#define __TO_M(mtol)		(int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+#define __TO_B(bacc)		(int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+#define __TO_R_EXP(bacc)	(int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+#define __TO_B_EXP(bacc)	(int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+
+#define SENSOR_ATTR_MAX			19
+#define SENSOR_ATTR_NAME_LENGTH	20
+
+#define SENSOR_GET_CAP_LABEL	0x001
+#define SENSOR_GET_CAP_ALARM	0x002
+#define SENSOR_GET_CAP_INPUT	0x004
+
+#define SENSOR_GET_CAP_LNC		0x008
+#define SENSOR_GET_CAP_LCR		0x010
+#define SENSOR_GET_CAP_LNR		0x020
+
+#define SENSOR_GET_CAP_UNC		0x040
+#define SENSOR_GET_CAP_UCR		0x080
+#define SENSOR_GET_CAP_UNR		0x100
+
+#define SENSOR_GET_CAP_MODEL	0x200
+#define SENSOR_GET_CAP_SN		0x400
+#define SENSOR_GET_CAP_PWM		0x800
+
+#define SENSOR_GET_CAP_CONMODE		0x1000
+#define SENSOR_GET_CAP_DIRECTION	0x2000
+#define SENSOR_GET_CAP_FAN_PRESENT	0x4000
+#define SENSOR_GET_CAP_PSU_PRESENT	0x8000
+
+#define SENSOR_GET_CAP_MFRID	0x10000
+#define SENSOR_GET_CAP_VIN_TYPE	0x20000
+#define SENSOR_GET_CAP_POUT_MAX	0x40000
+
+#define SDR_SENSOR_TYPE_TEMP	0x01
+#define SDR_SENSOR_TYPE_VOLT	0x02
+#define SDR_SENSOR_TYPE_CURR	0x03
+#define SDR_SENSOR_TYPE_FAN		0x04
+#define SDR_SENSOR_TYPE_PS		0x08
+#define SDR_SENSOR_TYPE_OTHER	0x0b
+
+#define BMC_GET_DEVICE_ID		0x01
+
+#define IPMI_NETFN_SE			0x04
+#define IPMI_NETFN_APP			0x06
+#define IPMI_NETFN_STORAGE		0x0a
+#define IPMI_NETFN_TSOL			0x30
+
+#define GET_SDR_REPO_INFO		0x20
+#define GET_DEVICE_SDR			0x21
+#define GET_SDR_RESERVE_REPO	0x22
+#define GET_SDR					0x23
+#define GET_SENSOR_THRESHOLDS	0x27
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS	0x2b
+#define GET_SENSOR_READING		0x2d
+#define GET_PSU_READING			0x52
+#define GET_FAN_INFO			0xd6
+#define GET_FRU_INFO			0x11
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK		(0x80)	/* 1 = provides SDRs      */
+#define IPMI_TIMEOUT			(4 * HZ)
+#define IPMI_MAX_WAIT_QUEUE	1
+
+struct quanta_hwmon_ipmi_data {
+	struct platform_device	*ipmi_platform_dev;
+	struct device			*ipmi_hwmon_dev;
+	//struct mutex			ipmi_lock;
+
+	int32_t					total_sensor_id;
+	int32_t					total_suport_sensor;
+	int32_t					total_create_sysfs;
+} *data;
+
+static struct mutex ipmi_lock;
+static struct completion g_read_complete;
+
+static ipmi_user_t ipmi_mh_user = NULL;
+
+static int8_t g_fan_control_mode = 3;
+static int32_t g_use_built_in = 0;
+static int32_t ipmi_wait_queue = 0;
+
+struct ipmi_sensor_data {
+	uint8_t addr;
+	uint8_t sensor_type;
+	uint8_t sensor_idstring[SENSOR_ATTR_NAME_LENGTH];
+
+	uint32_t capability;
+
+	struct header_info {
+		uint8_t header_type;
+		uint8_t header_byte;
+	} headerinfo;
+
+	struct record_info {
+		uint8_t record_analog;
+		uint8_t record_linearization;
+
+		int32_t record_m;
+		int32_t record_b;
+		int32_t record_k1;
+		int32_t record_k2;
+	} recordinfo;
+
+	struct threshold_upper_info {
+		uint8_t unr;
+		uint8_t ucr;
+		uint8_t unc;
+	} upperinfo;
+
+	struct threshold_lower_info {
+		uint8_t lnr;
+		uint8_t lcr;
+		uint8_t lnc;
+	} lowerinfo;
+
+	struct attr_info
+	{
+		bool attr_exist;
+		char attr_name[SENSOR_ATTR_MAX][SENSOR_ATTR_NAME_LENGTH];
+		char attr_type_str[SENSOR_ATTR_NAME_LENGTH];
+
+		struct attribute *attrs[SENSOR_ATTR_MAX + 1];
+		struct attribute_group	attr_group;
+		struct sensor_device_attribute sd_attrs[SENSOR_ATTR_MAX + 1];
+	} attrinfo;
+
+} *g_sensor_data;
+
+struct ipmi_comm_data {
+	int32_t tx_id;
+
+	int32_t rx_result;
+	int64_t rx_len;
+	void *rx_data;
+	struct completion *rx_read_complete;
+};
+
+struct ipmi_sdr_iterator {
+	uint16_t reservation;
+	int32_t total;
+	int32_t next;
+};
+
+struct ipm_devid_rsp {
+	uint8_t device_id;
+	uint8_t device_revision;
+	uint8_t fw_rev1;
+	uint8_t fw_rev2;
+	uint8_t ipmi_version;
+	uint8_t adtl_device_support;
+	uint8_t manufacturer_id[3];
+	uint8_t product_id[2];
+	uint8_t aux_fw_rev[4];
+} __attribute__((packed));
+
+struct sdr_repo_info_rs {
+	uint8_t version;	/* SDR version (51h) */
+	uint16_t count;		/* number of records */
+	uint16_t free;		/* free space in SDR */
+	uint32_t add_stamp;	/* last add timestamp */
+	uint32_t erase_stamp;	/* last del timestamp */
+	uint8_t op_support;	/* supported operations */
+} __attribute__((packed));
+
+struct sdr_device_info_rs {
+	uint8_t count;	/* number of records */
+	uint8_t flags;	/* flags */
+	uint8_t popChangeInd[3];	/* free space in SDR */
+} __attribute__((packed));
+
+struct sdr_get_rs {
+	uint16_t next;		/* next record id */
+	uint16_t id;		/* record ID */
+	uint8_t version;	/* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR			0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR		0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR	0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC		0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC	0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR	0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR	0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR	0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION		0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO	0x14
+#define SDR_RECORD_TYPE_OEM			0xc0
+	uint8_t type;		/* record type */
+	uint8_t length;		/* remaining record bytes */
+} __attribute__((packed));
+
+struct sdr_get_rq {
+	uint16_t reserve_id;	/* reservation ID */
+	uint16_t id;		/* record ID */
+	uint8_t offset;		/* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD	0xff
+	uint8_t length;		/* length to read */
+} __attribute__((packed));
+
+struct entity_id {
+	uint8_t	id;			/* physical entity id */
+#ifdef WORDS_BIGENDIAN
+	uint8_t	logical : 1;	/* physical/logical */
+	uint8_t	instance : 7;	/* instance number */
+#else
+	uint8_t	instance : 7;	/* instance number */
+	uint8_t	logical : 1;	/* physical/logical */
+#endif
+} __attribute__((packed));
+
+struct sdr_record_mask {
+	union {
+		struct {
+			uint16_t assert_event;	/* assertion event mask */
+			uint16_t deassert_event;	/* de-assertion event mask */
+			uint16_t read;	/* discrete reading mask */
+		} discrete;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint16_t reserved : 1;
+			uint16_t status_lnr : 1;
+			uint16_t status_lcr : 1;
+			uint16_t status_lnc : 1;
+			uint16_t assert_unr_high : 1;
+			uint16_t assert_unr_low : 1;
+			uint16_t assert_ucr_high : 1;
+			uint16_t assert_ucr_low : 1;
+			uint16_t assert_unc_high : 1;
+			uint16_t assert_unc_low : 1;
+			uint16_t assert_lnr_high : 1;
+			uint16_t assert_lnr_low : 1;
+			uint16_t assert_lcr_high : 1;
+			uint16_t assert_lcr_low : 1;
+			uint16_t assert_lnc_high : 1;
+			uint16_t assert_lnc_low : 1;
+#else
+			uint16_t assert_lnc_low : 1;
+			uint16_t assert_lnc_high : 1;
+			uint16_t assert_lcr_low : 1;
+			uint16_t assert_lcr_high : 1;
+			uint16_t assert_lnr_low : 1;
+			uint16_t assert_lnr_high : 1;
+			uint16_t assert_unc_low : 1;
+			uint16_t assert_unc_high : 1;
+			uint16_t assert_ucr_low : 1;
+			uint16_t assert_ucr_high : 1;
+			uint16_t assert_unr_low : 1;
+			uint16_t assert_unr_high : 1;
+			uint16_t status_lnc : 1;
+			uint16_t status_lcr : 1;
+			uint16_t status_lnr : 1;
+			uint16_t reserved : 1;
+#endif
+#ifdef WORDS_BIGENDIAN
+			uint16_t reserved_2 : 1;
+			uint16_t status_unr : 1;
+			uint16_t status_ucr : 1;
+			uint16_t status_unc : 1;
+			uint16_t deassert_unr_high : 1;
+			uint16_t deassert_unr_low : 1;
+			uint16_t deassert_ucr_high : 1;
+			uint16_t deassert_ucr_low : 1;
+			uint16_t deassert_unc_high : 1;
+			uint16_t deassert_unc_low : 1;
+			uint16_t deassert_lnr_high : 1;
+			uint16_t deassert_lnr_low : 1;
+			uint16_t deassert_lcr_high : 1;
+			uint16_t deassert_lcr_low : 1;
+			uint16_t deassert_lnc_high : 1;
+			uint16_t deassert_lnc_low : 1;
+#else
+			uint16_t deassert_lnc_low : 1;
+			uint16_t deassert_lnc_high : 1;
+			uint16_t deassert_lcr_low : 1;
+			uint16_t deassert_lcr_high : 1;
+			uint16_t deassert_lnr_low : 1;
+			uint16_t deassert_lnr_high : 1;
+			uint16_t deassert_unc_low : 1;
+			uint16_t deassert_unc_high : 1;
+			uint16_t deassert_ucr_low : 1;
+			uint16_t deassert_ucr_high : 1;
+			uint16_t deassert_unr_low : 1;
+			uint16_t deassert_unr_high : 1;
+			uint16_t status_unc : 1;
+			uint16_t status_ucr : 1;
+			uint16_t status_unr : 1;
+			uint16_t reserved_2 : 1;
+#endif
+			union {
+				struct {
+#ifdef WORDS_BIGENDIAN			/* settable threshold mask */
+					uint16_t reserved : 2;
+					uint16_t unr : 1;
+					uint16_t ucr : 1;
+					uint16_t unc : 1;
+					uint16_t lnr : 1;
+					uint16_t lcr : 1;
+					uint16_t lnc : 1;
+					/* padding lower 8 bits */
+					uint16_t readable : 8;
+#else
+					uint16_t readable : 8;
+					uint16_t lnc : 1;
+					uint16_t lcr : 1;
+					uint16_t lnr : 1;
+					uint16_t unc : 1;
+					uint16_t ucr : 1;
+					uint16_t unr : 1;
+					uint16_t reserved : 2;
+#endif
+				} set;
+				struct {
+#ifdef WORDS_BIGENDIAN			/* readable threshold mask */
+					/* padding upper 8 bits */
+					uint16_t settable : 8;
+					uint16_t reserved : 2;
+					uint16_t unr : 1;
+					uint16_t ucr : 1;
+					uint16_t unc : 1;
+					uint16_t lnr : 1;
+					uint16_t lcr : 1;
+					uint16_t lnc : 1;
+#else
+					uint16_t lnc : 1;
+					uint16_t lcr : 1;
+					uint16_t lnr : 1;
+					uint16_t unc : 1;
+					uint16_t ucr : 1;
+					uint16_t unr : 1;
+					uint16_t reserved : 2;
+					uint16_t settable : 8;
+#endif
+				} read;
+			};
+		} threshold;
+	} type;
+} __attribute__((packed));
+
+struct sdr_record_full_sensor {
+	struct {
+		uint8_t owner_id;
+#ifdef WORDS_BIGENDIAN
+		uint8_t channel : 4;	/* channel number */
+		uint8_t __reserved : 2;
+		uint8_t lun : 2;	/* sensor owner lun */
+#else
+		uint8_t lun : 2;	/* sensor owner lun */
+		uint8_t __reserved : 2;
+		uint8_t channel : 4;	/* channel number */
+#endif
+		uint8_t sensor_num;	/* unique sensor number */
+	} keys;
+
+	struct entity_id entity;
+
+	struct {
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint8_t __reserved : 1;
+			uint8_t scanning : 1;
+			uint8_t events : 1;
+			uint8_t thresholds : 1;
+			uint8_t hysteresis : 1;
+			uint8_t type : 1;
+			uint8_t event_gen : 1;
+			uint8_t sensor_scan : 1;
+#else
+			uint8_t sensor_scan : 1;
+			uint8_t event_gen : 1;
+			uint8_t type : 1;
+			uint8_t hysteresis : 1;
+			uint8_t thresholds : 1;
+			uint8_t events : 1;
+			uint8_t scanning : 1;
+			uint8_t __reserved : 1;
+#endif
+		} init;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			uint8_t ignore : 1;
+			uint8_t rearm : 1;
+			uint8_t hysteresis : 2;
+			uint8_t threshold : 2;
+			uint8_t event_msg : 2;
+#else
+			uint8_t event_msg : 2;
+			uint8_t threshold : 2;
+			uint8_t hysteresis : 2;
+			uint8_t rearm : 1;
+			uint8_t ignore : 1;
+#endif
+		} capabilities;
+		uint8_t type;
+	} sensor;
+
+	uint8_t event_type;	/* event/reading type code */
+
+	struct sdr_record_mask mask;
+
+	struct {
+#ifdef WORDS_BIGENDIAN
+		uint8_t analog : 2;
+		uint8_t rate : 3;
+		uint8_t modifier : 2;
+		uint8_t pct : 1;
+#else
+		uint8_t pct : 1;
+		uint8_t modifier : 2;
+		uint8_t rate : 3;
+		uint8_t analog : 2;
+#endif
+		struct {
+			uint8_t base;
+			uint8_t modifier;
+		} type;
+	} unit;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+	uint8_t linearization;	/* 70h=non linear, 71h-7Fh=non linear, OEM */
+	uint16_t mtol;		/* M, tolerance */
+	uint32_t bacc;		/* accuracy, B, Bexp, Rexp */
+
+	struct {
+#ifdef WORDS_BIGENDIAN
+		uint8_t __reserved : 5;
+		uint8_t normal_min : 1;	/* normal min field specified */
+		uint8_t normal_max : 1;	/* normal max field specified */
+		uint8_t nominal_read : 1;	/* nominal reading field specified */
+#else
+		uint8_t nominal_read : 1;	/* nominal reading field specified */
+		uint8_t normal_max : 1;	/* normal max field specified */
+		uint8_t normal_min : 1;	/* normal min field specified */
+		uint8_t __reserved : 5;
+#endif
+	} analog_flag;
+
+	uint8_t nominal_read;	/* nominal reading, raw value */
+	uint8_t normal_max;	/* normal maximum, raw value */
+	uint8_t normal_min;	/* normal minimum, raw value */
+	uint8_t sensor_max;	/* sensor maximum, raw value */
+	uint8_t sensor_min;	/* sensor minimum, raw value */
+
+	struct {
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} upper;
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} lower;
+		struct {
+			uint8_t positive;
+			uint8_t negative;
+		} hysteresis;
+	} threshold;
+	uint8_t __reserved[2];
+	uint8_t oem;		/* reserved for OEM use */
+	uint8_t id_code;	/* sensor ID string type/length code */
+	uint8_t id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+} __attribute__((packed));
+
+int32_t pow_convert(int32_t *a, int32_t b)
+{
+	/* function input parameter (a * 10 ^ b) */
+	int32_t i = 0, r = 1, temp_b = 0;
+
+	temp_b = (b > 0) ? b : -b;
+
+	for (i = 0; i < temp_b; i++) r = r * 10;
+
+	if (b > 0) {
+		*a = (*a) * r;
+		r = 1;
+	}
+	/* function return parameter calc_result = *a, decimal_point = r */
+	return r;
+}
+
+void simple_atoi(const char *buf, int8_t *output_val)
+{
+	while (*buf >= '0' && *buf <= '9') {
+		*output_val = *output_val * 10 + *buf - '0';
+		buf++;
+	}
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *handler_data)
+{
+	int32_t rv = -IPMI_UNKNOWN_ERR_COMPLETION_CODE;
+
+	struct ipmi_comm_data *comm_data = msg->user_msg_data;
+
+	ipmi_wait_queue--;
+
+	if (msg->msg.data[0] != 0) {
+		if ((msg->msg.data[0] != 0x83) && (msg->msg.netfn != 0x07) && (msg->msg.cmd != 0x52)) {
+			//skip master r/w cmd return code
+			printk("ipmi: Error 0x%x on cmd 0x%x/0x%x\n", msg->msg.data[0], msg->msg.netfn, msg->msg.cmd);
+			rv = msg->msg.data[0];
+			goto get_BMC_response_fail;
+		}
+	}
+
+	if (msg->msgid != comm_data->tx_id) {
+		printk("ipmi: rx msgid %d mismatch tx msgid %d\n", (int32_t)msg->msgid, comm_data->tx_id);
+		goto get_BMC_response_fail;
+	}
+
+	if (msg->msg.data_len <= 0) {
+		printk("ipmi: Data len too low (%d)\n", msg->msg.data_len);
+		goto get_BMC_response_fail;
+	}
+
+	if (msg->msg.data_len > 1) {
+		if (comm_data->rx_len) {
+			comm_data->rx_len = msg->msg.data_len - 1;
+			memcpy(comm_data->rx_data, msg->msg.data + 1, comm_data->rx_len);
+		}
+		else {
+			printk("ipmi: rx len = 0, it should be not retrun ?\n");
+			goto get_BMC_response_fail;
+	}
+}
+
+	rv = 0;
+
+get_BMC_response_fail:
+	ipmi_free_recv_msg(msg);
+
+	if (ipmi_wait_queue == 0) {
+		comm_data->rx_result = rv;
+		if (rv == 0) complete(comm_data->rx_read_complete);
+	}
+}
+static struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_msg_handler, };
+
+int32_t ipmi_request_wait_for_response(struct kernel_ipmi_msg msg, struct ipmi_comm_data *comm_data)
+{
+	int32_t rv = 0;
+	int32_t escape_time = 0;
+
+	struct ipmi_addr ipmi_address;
+
+	if (ipmi_wait_queue >= IPMI_MAX_WAIT_QUEUE) {
+		/* printk("msg queue full, cannot send ipmi cmd\n"); */
+		return -EBUSY;
+	}
+	ipmi_wait_queue++;
+
+	ipmi_address.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+	ipmi_address.channel = IPMI_BMC_CHANNEL;
+	ipmi_address.data[0] = 0;
+
+	rv = ipmi_validate_addr(&ipmi_address, sizeof(ipmi_address));
+	if (rv) {
+		printk("ipmi_validate_addr fail, err code : %d\n", rv);
+		return rv;
+	}
+
+	ipmi_request_settime(ipmi_mh_user, &ipmi_address, comm_data->tx_id, &msg, comm_data, 0, 0, 0);
+
+	escape_time = wait_for_completion_timeout(comm_data->rx_read_complete, IPMI_TIMEOUT);
+
+	rv = comm_data->rx_result;
+	if (escape_time == 0) {
+		printk("BMC not response (%d)\n", escape_time);
+	}
+
+	return rv;
+}
+
+int32_t ipmi_send_system_cmd(uint8_t *msg_tx_data, int32_t msg_tx_len, void *msg_rx_data, int32_t msg_rx_len)
+{
+	int32_t i = 0;
+	int32_t rv = 0;
+
+	static uint64_t tx_msgid = 1;
+
+	struct kernel_ipmi_msg msg;
+	struct ipmi_comm_data *comm_data = NULL;
+	struct completion read_complete;
+
+	init_completion(&read_complete);
+
+	/* prepare transfer message */
+	msg.netfn = msg_tx_data[0];
+	msg.cmd = msg_tx_data[1];
+	msg.data_len = msg_tx_len - 2;
+
+	msg.data = kzalloc(msg.data_len, GFP_KERNEL);
+	if (msg.data == NULL) {
+		printk("%s(%d): malloc [msg.data] failure", __func__, __LINE__);
+		rv = -ENOMEM;
+		goto alloc_mem_fail;
+	}
+
+	comm_data = kzalloc(sizeof(struct ipmi_comm_data), GFP_KERNEL);
+	if (comm_data == NULL) {
+		printk("%s(%d): malloc [comm_data] failure", __func__, __LINE__);
+		rv = -ENOMEM;
+		goto alloc_mem_fail;
+	}
+
+	for (i = 2; i < msg_tx_len; i++) {
+		msg.data[i - 2] = msg_tx_data[i];
+	}
+
+	comm_data->tx_id = tx_msgid++;
+
+	/* prepare recive message */
+	comm_data->rx_data = msg_rx_data;
+	comm_data->rx_len = msg_rx_len;
+	comm_data->rx_result = -1;
+	comm_data->rx_read_complete = &read_complete;
+
+	rv = ipmi_request_wait_for_response(msg, comm_data);
+
+alloc_mem_fail:
+	if (msg.data) kfree(msg.data);
+	if (comm_data) kfree(comm_data);
+	if (tx_msgid > UINT_MAX) tx_msgid = 1;
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_reservation(uint16_t * reserve_id)
+{
+	int32_t rv = 0;
+	uint8_t msg_data[] = { 0x00, GET_SDR_RESERVE_REPO }; //netfn = 0x00; cmd = GET_SDR_RESERVE_REPO;
+
+	msg_data[0] = (g_use_built_in == 0) ? IPMI_NETFN_STORAGE : IPMI_NETFN_SE;
+
+	/* obtain reservation ID */
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), reserve_id, 1);
+	if (rv) printk("BMC down at (%d)!!\n", __LINE__);
+
+#if enable_debug_msg
+	printk("SDR reservation ID %04x\n", *reserve_id);
+#endif
+
+	return rv;
+}
+
+int32_t ipmi_sdr_start(struct ipmi_sdr_iterator *itr)
+{
+	int32_t rv = 0;
+
+	uint8_t msg_data[] = { IPMI_NETFN_APP, BMC_GET_DEVICE_ID }; //netfn = IPMI_NETFN_APP; cmd = BMC_GET_DEVICE_ID;
+
+	struct ipm_devid_rsp devid;
+
+	/* check SDRR capability */
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &devid, 1);
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return rv;
+	}
+
+	if (devid.device_revision & IPM_DEV_DEVICE_ID_SDR_MASK) {
+		if ((devid.adtl_device_support & 0x02) == 0) {
+			if ((devid.adtl_device_support & 0x01)) {
+				printk("Using Device SDRs\n");
+				g_use_built_in = 1;
+			}
+			else {
+				printk("Error obtaining SDR info\n");
+			}
+		}
+	}
+
+	if (g_use_built_in == 0) {
+		struct sdr_repo_info_rs sdr_info;
+		/* get sdr repository info */
+		msg_data[0] = IPMI_NETFN_STORAGE;
+		msg_data[1] = GET_SDR_REPO_INFO;
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+		itr->total = sdr_info.count;
+
+#if enable_debug_msg
+		printk("SDR version: 0x%x\n", sdr_info.version);
+		printk("SDR free space: %d\n", sdr_info.free);
+#endif
+	}
+	else {
+		struct sdr_device_info_rs sdr_info;
+		/* get device sdr info */
+		msg_data[0] = IPMI_NETFN_SE;
+		msg_data[1] = GET_SDR_REPO_INFO;
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &sdr_info, 1);
+		itr->total = sdr_info.count;
+	}
+
+#if enable_debug_msg
+	printk("SDR records   : %d\n", sdr_info.count);
+#endif
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+	}
+	else {
+		itr->next = 0;
+		rv = ipmi_sdr_get_reservation(&(itr->reservation));
+	}
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_header(struct ipmi_sdr_iterator *itr, struct sdr_get_rs *sdr_rs)
+{
+	int32_t rv = 0;
+
+	uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //netfn = 0x00; cmd = 0x00;
+
+	struct sdr_get_rq sdr_rq;
+
+	sdr_rq.reserve_id = itr->reservation;
+	sdr_rq.id = itr->next;
+	sdr_rq.offset = 0;
+	sdr_rq.length = 5;	/* only get the header */
+
+	if (g_use_built_in == 0) {
+		msg_data[0] = IPMI_NETFN_STORAGE;
+		msg_data[1] = GET_SDR;
+	}
+	else {
+		msg_data[0] = IPMI_NETFN_SE;
+		msg_data[1] = GET_DEVICE_SDR;
+	}
+
+	memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), sdr_rs, 1);
+	if ((rv) || (sdr_rs->length == 0)) {
+		printk("SDR record id 0x%04x: invalid length %d", itr->next, sdr_rs->length);
+		return -1;
+	}
+
+	if (sdr_rs->id != itr->next) {
+#if enable_debug_msg
+		printk("SDR record id mismatch: 0x%04x\n", sdr_rs->id);
+#endif
+		sdr_rs->id = itr->next;
+	}
+#if enable_debug_msg
+	printk("\nSDR record ID   : 0x%04x", itr->next);
+	printk("SDR record type : 0x%02x\n", sdr_rs->type);
+	printk("SDR record next : 0x%04x\n", sdr_rs->next);
+	printk("SDR record bytes: %d\n", sdr_rs->length);
+#endif
+
+	return rv;
+}
+
+int32_t ipmi_sdr_get_record(struct sdr_get_rs * header, struct ipmi_sdr_iterator * itr, uint8_t *ret_data)
+{
+	int32_t rv = 0, len = 0;
+
+	uint8_t buff[128] = "";
+	uint8_t msg_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //netfn = 0x00; cmd = 0x00;
+
+	struct sdr_get_rq sdr_rq;
+
+	len = header->length;
+	if (len > 0) {
+		memset(&sdr_rq, 0, sizeof(sdr_rq));
+		sdr_rq.reserve_id = itr->reservation;
+		sdr_rq.id = header->id;
+		sdr_rq.offset = 5;
+		sdr_rq.length = len;
+
+		if (g_use_built_in == 0) {
+			msg_data[0] = IPMI_NETFN_STORAGE;
+			msg_data[1] = GET_SDR;
+		}
+		else {
+			msg_data[0] = IPMI_NETFN_SE;
+			msg_data[1] = GET_DEVICE_SDR;
+		}
+
+		memcpy(msg_data + 2, (uint8_t *)&sdr_rq, sizeof(struct sdr_get_rq));
+
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), ret_data, 1);
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			memset(buff, 0, sizeof(buff));
+			memcpy(buff, ret_data + 2, sdr_rq.length);
+			memcpy(ret_data, buff, sdr_rq.length + 2);
+		}
+	}
+
+	return rv;
+}
+
+void ipmi_sdr_set_sensor_threshold(uint8_t idx, struct sdr_record_full_sensor *sensor)
+{
+
+	/*refer to Table 35-, Get Sensor Event Enable*/
+	/*
+	// change detect threshold method, keep it for record detail format
+	// in this version function input is 
+		"void ipmi_sdr_set_sensor_threshold(uint8_t idx, uint8_t *rec)"
+		#define offset_threshold_enable	9
+		#define offset_threshold_data	31
+	if (rec[offset_threshold_enable + 1] & 0x08)	g_sensor_data[idx].upperinfo.unr_high = 1;
+	if (rec[offset_threshold_enable + 1] & 0x04)	g_sensor_data[idx].upperinfo.unr_low = 1;
+	if (rec[offset_threshold_enable + 1] & 0x02)	g_sensor_data[idx].upperinfo.ucr_high = 1;
+	if (rec[offset_threshold_enable + 1] & 0x01)	g_sensor_data[idx].upperinfo.ucr_low = 1;
+	if (rec[offset_threshold_enable] & 0x80)		g_sensor_data[idx].upperinfo.unc_high = 1;
+	if (rec[offset_threshold_enable] & 0x40)		g_sensor_data[idx].upperinfo.unc_low = 1;
+
+	if (rec[offset_threshold_enable] & 0x20)		g_sensor_data[idx].lowerinfo.lnr_high = 1;
+	if (rec[offset_threshold_enable] & 0x10)		g_sensor_data[idx].lowerinfo.lnr_low = 1;
+	if (rec[offset_threshold_enable] & 0x08)		g_sensor_data[idx].lowerinfo.lcr_high = 1;
+	if (rec[offset_threshold_enable] & 0x04)		g_sensor_data[idx].lowerinfo.lcr_low = 1;
+	if (rec[offset_threshold_enable] & 0x02)		g_sensor_data[idx].lowerinfo.lnc_high = 1;
+	if (rec[offset_threshold_enable] & 0x01)		g_sensor_data[idx].lowerinfo.lnc_low = 1;
+	//*/
+
+	/* lower threshold info */
+	if (sensor->mask.type.threshold.read.lnc) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNC;
+	if (sensor->mask.type.threshold.read.lcr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LCR;
+	if (sensor->mask.type.threshold.read.lnr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_LNR;
+	g_sensor_data[idx].lowerinfo.lnc = sensor->threshold.lower.non_critical;
+	g_sensor_data[idx].lowerinfo.lcr = sensor->threshold.lower.critical;
+	g_sensor_data[idx].lowerinfo.lnr = sensor->threshold.lower.non_recover;
+
+	/* upper threshold info */
+	if (sensor->mask.type.threshold.read.unc) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNC;
+	if (sensor->mask.type.threshold.read.ucr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UCR;
+	if (sensor->mask.type.threshold.read.unr) g_sensor_data[idx].capability |= SENSOR_GET_CAP_UNR;
+	g_sensor_data[idx].upperinfo.unc = sensor->threshold.upper.non_critical;
+	g_sensor_data[idx].upperinfo.ucr = sensor->threshold.upper.critical;
+	g_sensor_data[idx].upperinfo.unr = sensor->threshold.upper.non_recover;
+}
+
+void ipmi_sdr_set_sensor_factor(uint8_t idx, struct sdr_record_full_sensor *sensor)
+{
+	char *loc = NULL;
+
+	g_sensor_data[idx].sensor_type = sensor->sensor.type;
+	sprintf(g_sensor_data[idx].sensor_idstring, "%s", sensor->id_string);
+
+	g_sensor_data[idx].recordinfo.record_m = __TO_M(sensor->mtol);
+	g_sensor_data[idx].recordinfo.record_b = __TO_B(sensor->bacc);
+	g_sensor_data[idx].recordinfo.record_k1 = __TO_B_EXP(sensor->bacc);
+	g_sensor_data[idx].recordinfo.record_k2 = __TO_R_EXP(sensor->bacc);
+
+	g_sensor_data[idx].recordinfo.record_analog = sensor->unit.analog;
+	g_sensor_data[idx].recordinfo.record_linearization = sensor->linearization;
+
+	memset(g_sensor_data[idx].attrinfo.attr_type_str, 0x00, SENSOR_ATTR_NAME_LENGTH);
+
+	switch (g_sensor_data[idx].sensor_type)
+	{
+	case SDR_SENSOR_TYPE_TEMP:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "temp");
+		break;
+	case SDR_SENSOR_TYPE_VOLT:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+		break;
+	case SDR_SENSOR_TYPE_FAN:
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_PWM;
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_CONMODE;
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_DIRECTION;
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "fan");
+		break;
+	case SDR_SENSOR_TYPE_PS:
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "POWER");
+		if (loc) {
+			if ((strncmp(g_sensor_data[idx].sensor_idstring + 11, "OUT", 3)) == 0) {
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_MODEL;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_SN;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_MFRID;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_VIN_TYPE;
+				g_sensor_data[idx].capability |= SENSOR_GET_CAP_POUT_MAX;
+			}
+			sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
+		}
+
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "VOLTAGE");
+		if (loc) sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "in");
+
+		loc = strstr(g_sensor_data[idx].sensor_idstring, "CURRENT");
+		if (loc) sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+
+		break;
+	case SDR_SENSOR_TYPE_CURR:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "curr");
+		break;
+	case SDR_SENSOR_TYPE_OTHER:
+		sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "other");
+		break;
+	default:
+		printk("not support sensor type !! [%d]\n", g_sensor_data[idx].sensor_type);
+		break;
+	}
+
+	if ((strncmp(g_sensor_data[idx].sensor_idstring, "Fan", 3)) == 0) {
+		g_sensor_data[idx].capability |= SENSOR_GET_CAP_FAN_PRESENT;
+	}
+
+#if enable_debug_msg
+	{
+		printk("\n********************\n");
+
+		printk("m[%d], b[%d], k1[%d], k2[%d]\n", g_sensor_data[idx].recordinfo.record_m, g_sensor_data[idx].recordinfo.record_b
+			, g_sensor_data[idx].recordinfo.record_k1, g_sensor_data[idx].recordinfo.record_k2);
+
+		printk("sensor [%s] type[%d], analog[%d], linearization[%d]\n", g_sensor_data[idx].sensor_idstring, g_sensor_data[idx].sensor_type
+			, g_sensor_data[idx].recordinfo.record_analog, g_sensor_data[idx].recordinfo.record_linearization);
+
+		printk("\n********************\n");
+	}
+#endif
+
+}
+
+int32_t sdr_convert_sensor_reading(uint8_t idx, uint8_t val, int32_t *point_result)
+{
+	int32_t m = g_sensor_data[idx].recordinfo.record_m;
+	int32_t b = g_sensor_data[idx].recordinfo.record_b;
+	int32_t k1 = g_sensor_data[idx].recordinfo.record_k1;
+	int32_t k2 = g_sensor_data[idx].recordinfo.record_k2;
+	int32_t decimal_point = 0;
+	int32_t result = 0;
+
+	decimal_point = pow_convert(&b, k1);
+
+	switch (g_sensor_data[idx].recordinfo.record_analog)
+	{
+	case 0:
+		result = m * val * decimal_point + b;
+		break;
+	case 1:
+		if (val & 0x80) val++;
+	case 2:
+		result = (m * (int16_t)val) * decimal_point + b;
+		break;
+	default:
+		return result;
+	}
+
+	pow_convert(&result, k2);
+	if (k1 < 0) *point_result += -k1;
+	if (k2 < 0) *point_result += -k2;
+
+	if (g_sensor_data[idx].sensor_type != SDR_SENSOR_TYPE_FAN) {
+		result = result * 1000; //shift for lm-sensors
+	}
+
+	return result;
+}
+
+int32_t ipmi_sdr_parsing_value(int32_t idx, uint8_t input_value, int8_t *ret_str)
+{
+	int32_t calc_result = 0, point_result = 0;
+	int32_t temp_len = 0;
+
+	uint8_t temp_str[16] = "";
+
+	calc_result = sdr_convert_sensor_reading(idx, input_value, &point_result);
+
+	temp_len = sprintf(temp_str, "%d", calc_result);
+	temp_len = temp_len - point_result;
+
+	/* int part */
+	if (temp_len <= 0) sprintf(ret_str, "0");
+	else snprintf(ret_str, temp_len + 1, "%s", temp_str);  // +1 for snprintf reserve space'\0'
+
+	/* point part */
+	strcat(ret_str, ".");
+
+	/* float part */
+	if ((point_result == 0) || (temp_len < 0)) strcat(ret_str, "0");
+	else strcat(ret_str, temp_str + temp_len);
+
+	/* EOL part */
+	strcat(ret_str, "\n\0");
+
+	return (temp_len + 1 + point_result + 2); //integer + point + float + EOL + \0
+}
+
+
+uint8_t ipmi_check_psu_present(uint8_t psu_slot)
+{
+	uint8_t slot_mask = 0x0;
+	int32_t rv = 0;
+
+	uint8_t returnData[128] = { 0 };
+	uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x03 }; //netfn = 0x36; cmd = 0xB9;
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return 0;
+	}
+	else {
+		slot_mask = (psu_slot == 1) ? 0x01 : 0x02;
+		return (returnData[0] & slot_mask) ? 0 : 1;
+	}
+}
+
+int32_t ipmi_get_psu_info(uint8_t idx, uint8_t cmd, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData[128] = { 0 }, tempData[128] = { 0 };
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x80, cmd }; //netfn = 0x06; cmd = 0x52;
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			if (returnData[0] < (sizeof(returnData) - 2)) {
+				snprintf(tempData, returnData[0] + 1, "%s", returnData + 1);
+				return sprintf(retbuf, "%s\n", tempData);
+			}
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_vin_type(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0;
+
+	uint8_t returnData = 0;
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x01, 0xd8 }; // read line status
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), &returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {			
+			switch (returnData)
+			{
+				case 0x7: //LVDC
+				case 0x3: //HVDC
+					return sprintf(retbuf, "DC\n");
+				default:
+					return sprintf(retbuf, "AC\n");
+			}
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+int32_t ipmi_get_pout_max(uint8_t idx, uint8_t *retbuf)
+{
+	uint8_t psu_slot = 0;
+	int32_t rv = 0, pout_max = 0;
+
+	uint8_t returnData[2] = { 0 }, tempData[2] = { 0 };
+	uint8_t msg_data[] = { 0x06, 0x52, 0x0f, 0x00, 0x02, 0xa7 };
+
+	if (strstr(g_sensor_data[idx].sensor_idstring, "PSU1"))	psu_slot = 1;
+	else													psu_slot = 2;
+
+	msg_data[3] = (psu_slot == 1) ? 0xb0 : 0xb2;
+	if (ipmi_check_psu_present(psu_slot)) {
+		mutex_lock(&ipmi_lock);
+		rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+		mutex_unlock(&ipmi_lock);
+
+		if (rv) {
+			printk("BMC down at (%d)!!\n", __LINE__);
+		}
+		else {
+			/* MFR_POUT_MAX has 2 data format: Direct and Linear Data (see PMbus spec).
+			   Query command is needed to tell the data format, but since we have not use PSU
+			   whose output power is over 0x07ff (2047), just check the first 5 bits*/
+			if (returnData[1] & 0xf8 == 0) // Direct
+				pout_max = (returnData[1] << 8) | returnData[0];
+			else // Linear Data
+				pout_max = (((returnData[1] & 0x07) << 8) | returnData[0]) << ((returnData[1] & 0xf8) >> 3);
+			return sprintf(retbuf, "%d\n", pout_max);
+		}
+	}
+	else {
+		//printk("Error ! cannot detect PSU%d\n", psu_slot);
+	}
+
+	return sprintf(retbuf, "N/A\n");
+}
+
+void ipmi_fan_control(uint8_t cmd_data1, uint8_t cmd_data2, uint8_t *retbuf)
+{
+	int32_t rv = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { IPMI_NETFN_TSOL, GET_FAN_INFO, cmd_data1, cmd_data2 }; //netfn = IPMI_NETFN_TSOL; cmd = GET_FAN_INFO;
+
+	mutex_lock(&ipmi_lock);
+	if (cmd_data1) rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), NULL, 0);
+	else  rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		sprintf(retbuf, "N/A\n");
+	}
+	else {
+		sprintf(retbuf, "%s", returnData);
+	}
+}
+
+static ssize_t show_label(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return sprintf(buf, "%s\n", g_sensor_data[attr->index + DEBUGUSE_SHIFT].sensor_idstring);
+}
+
+static ssize_t show_crit_alarm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return sprintf(buf, "%d\n", attr->index);
+}
+
+static ssize_t show_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	int32_t rv = 0;
+
+	uint8_t returnData[4] = "";
+	uint8_t msg_data[] = { IPMI_NETFN_SE, GET_SENSOR_READING, 0x00 }; //netfn = IPMI_NETFN_SE; cmd = GET_SENSOR_READING;
+
+	mutex_lock(&ipmi_lock);
+	msg_data[2] = g_sensor_data[attr->index + DEBUGUSE_SHIFT].addr;
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return sprintf(buf, "0.0\n");
+	}
+	else {
+		return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, returnData[0], buf);
+	}
+}
+
+static ssize_t show_lnr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnr, buf);
+}
+
+static ssize_t show_lcr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lcr, buf);
+}
+
+static ssize_t show_lnc(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].lowerinfo.lnc, buf);
+}
+
+static ssize_t show_unr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unr, buf);
+}
+
+static ssize_t show_ucr(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.ucr, buf);
+}
+
+static ssize_t show_unc(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_sdr_parsing_value(attr->index + DEBUGUSE_SHIFT, g_sensor_data[attr->index + DEBUGUSE_SHIFT].upperinfo.unc, buf);
+}
+
+static ssize_t show_model(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
+}
+
+static ssize_t show_sn(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9e, buf);
+}
+
+static ssize_t show_mfrid(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x99, buf);
+}
+
+static ssize_t show_vin_type(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_vin_type(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pout_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+	return ipmi_get_pout_max(attr->index + DEBUGUSE_SHIFT, buf);
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	uint8_t returnData[10] = { 0 };
+	ipmi_fan_control(0x00, 0x00, returnData);
+	return sprintf(buf, "%d\n", returnData[0]);
+}
+
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr, const char *buf, size_t count)
+{
+	uint8_t store_input = 0;
+	uint8_t returnData[10] = { 0 };
+	simple_atoi(buf, &store_input);
+	if (g_fan_control_mode == 1) ipmi_fan_control(0x01, store_input, returnData);
+
+	return count;
+}
+
+static ssize_t show_controlmode(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	return sprintf(buf, "%d\n", g_fan_control_mode);
+}
+
+static ssize_t store_controlmode(struct device *dev, struct device_attribute *devattr, const char *buf, size_t count)
+{
+	uint8_t store_input = 0;
+	uint8_t returnData[10] = { 0 };
+	simple_atoi(buf, &store_input);
+	g_fan_control_mode = store_input;
+	if (g_fan_control_mode == 3) ipmi_fan_control(0x7f, 0xff, returnData);
+
+	return count;
+}
+
+static ssize_t show_direction(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t rv = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { IPMI_NETFN_STORAGE, GET_FRU_INFO, 0x00, 0x19, 0x00, 0x01 }; //netfn = IPMI_NETFN_STORAGE; cmd = GET_FRU_INFO;
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	if (rv) {
+		printk("BMC down at (%d)!!\n", __LINE__);
+		return sprintf(buf, "N/A\n");
+	}
+	else {
+		return sprintf(buf, "%c\n", returnData[1]);
+	}
+}
+
+static ssize_t show_fanpresent(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t rv = 0;
+	int32_t fan_idx = 0, fan_present = 0;
+
+	uint8_t returnData[10] = { 0 };
+	uint8_t msg_data[] = { 0x36, 0xB9, 0x4C, 0x1C, 0x00, 0x02 }; //netfn = 0x36; cmd = 0xB9;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);	
+
+	fan_idx = (g_sensor_data[attr->index].sensor_idstring[8] - '0') - 1;
+
+	mutex_lock(&ipmi_lock);
+	rv = ipmi_send_system_cmd(msg_data, sizeof(msg_data), returnData, 1);
+	mutex_unlock(&ipmi_lock);
+
+	fan_present = ((returnData[0] >> fan_idx) & 0x1) ? 0 : 1;
+
+	return sprintf(buf, "%d\n", fan_present);
+}
+
+static ssize_t show_psupresent(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+	int32_t psu_idx = 0;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+	psu_idx = g_sensor_data[attr->index].sensor_idstring[3] - '0';
+
+	return sprintf(buf, "%d\n", ipmi_check_psu_present(psu_idx));
+}
+
+static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX]) (struct device *dev, struct device_attribute *devattr, char *buf) =
+{
+	show_label, show_crit_alarm, show_input
+	, show_lnc, show_lcr, show_lnr
+	, show_unc, show_ucr, show_unr
+	, show_model, show_sn, show_pwm
+	, show_controlmode, show_direction, show_fanpresent
+	, show_psupresent, show_mfrid, show_vin_type
+	, show_pout_max
+};
+
+static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX]) (struct device *dev, struct device_attribute *devattr, const char *buf, size_t count) =
+{
+	NULL, NULL, NULL
+	, NULL, NULL, NULL
+	, NULL, NULL, NULL
+	, NULL, NULL, store_pwm
+	, store_controlmode, NULL, NULL
+	, NULL, NULL, NULL
+	, NULL
+};
+
+static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
+{
+	"%s%d_label", "%s%d_crit_alarm", "%s%d_input"
+	, "%s%d_lncrit", "%s%d_lcrit", "%s%d_min"
+	, "%s%d_ncrit", "%s%d_crit", "%s%d_max"
+	, "%s%d_model", "%s%d_sn", "%s%d_pwm"
+	, "%s%d_controlmode", "%s%d_direction", "%s%d_present"
+	, "%s%d_present", "%s%d_mfrid", "%s%d_vin_type"
+	, "%s%d_pout_max"
+};
+
+static int32_t create_sensor_attrs(int32_t attr_no)
+{
+	int32_t i = 0, j = 0;
+
+	struct attr_info *attrdata = &g_sensor_data[attr_no].attrinfo;
+
+#if enable_debug_msg
+	printk("##### %s:%d attr_no %d\n", __FUNCTION__, __LINE__, attr_no);
+#endif
+
+	for (i = 0; i < SENSOR_ATTR_MAX; i++) {
+		if ((g_sensor_data[attr_no].capability >> i) & 0x01) {
+			snprintf(attrdata->attr_name[j], SENSOR_ATTR_NAME_LENGTH, sensor_attrnames[i], attrdata->attr_type_str, attr_no - DEBUGUSE_SHIFT);
+
+			sysfs_attr_init(&attrdata->sd_attrs[j].dev_attr.attr);
+			attrdata->sd_attrs[j].dev_attr.attr.name = attrdata->attr_name[j];
+			attrdata->sd_attrs[j].dev_attr.show = attr_show_func_ptr[i];
+			attrdata->sd_attrs[j].dev_attr.store = attr_store_func_ptr[i];
+
+			attrdata->sd_attrs[j].dev_attr.attr.mode = S_IRUGO;
+			if (attrdata->sd_attrs[j].dev_attr.store)	attrdata->sd_attrs[j].dev_attr.attr.mode |= S_IWUSR;
+
+			attrdata->sd_attrs[j].index = attr_no - DEBUGUSE_SHIFT;
+			attrdata->attrs[j] = &attrdata->sd_attrs[j].dev_attr.attr;
+			j++;
+
+			data->total_create_sysfs++;
+		}
+	}
+
+	attrdata->attrs[j] = NULL;
+	attrdata->attr_group.attrs = attrdata->attrs;
+
+	g_sensor_data[attr_no].attrinfo.attr_exist = 1;
+
+	return sysfs_create_group(&data->ipmi_hwmon_dev->kobj, &attrdata->attr_group);
+}
+
+static int32_t remove_sensor_attrs(void)
+{
+	int32_t i = 0;
+
+	for (i = 0; i < data->total_sensor_id; i++) {
+		if (g_sensor_data[i].attrinfo.attr_exist) {
+			sysfs_remove_group(&data->ipmi_hwmon_dev->kobj, &g_sensor_data[i].attrinfo.attr_group);
+		}
+	}
+	return 0;
+}
+
+int32_t ipmi_init_sdr_sensors_data(void)
+{
+	int32_t sdr_idx = 0;
+	int32_t err = 0;
+
+	struct ipmi_sdr_iterator *itr = NULL;
+	struct sdr_get_rs *header = NULL;
+
+	uint8_t *rec = NULL;
+
+	mutex_lock(&ipmi_lock);
+
+	itr = kzalloc(sizeof(struct ipmi_sdr_iterator), GFP_KERNEL);
+	if (itr == NULL) {
+		printk("%s(%d): kzalloc failure.\n", __func__, __LINE__);
+		goto itr_malloc_fail;
+	}
+
+	header = kzalloc(sizeof(struct sdr_get_rs), GFP_KERNEL);
+	if (header == NULL) {
+		printk("%s(%d): malloc failure.\n", __func__, __LINE__);
+		goto header_malloc_fail;
+	}
+
+	err = ipmi_sdr_start(itr);
+	if (err) {
+		printk("%s(%d): ipmi_sdr_start fail.\n", __func__, __LINE__);
+		goto ipmi_sdr_start_fail;
+	}
+
+	data->total_sensor_id = itr->total;
+	rec = kzalloc(GET_SDR_ENTIRE_RECORD, GFP_KERNEL);
+	if (rec == NULL) {
+		printk("%s(%d): kzalloc failure\n", __func__, __LINE__);
+		goto rec_malloc_fail;
+	}
+
+	g_sensor_data = kzalloc(itr->total * sizeof(struct ipmi_sensor_data), GFP_KERNEL);
+	if (g_sensor_data == NULL) {
+		printk("%s(%d): malloc failure", __func__, __LINE__);
+		goto g_sensor_data_malloc_fail;
+	}
+
+	memset(g_sensor_data, 0x0, itr->total * sizeof(struct ipmi_sensor_data));
+
+	for (sdr_idx = 0; sdr_idx < itr->total; sdr_idx++) {
+		err = ipmi_sdr_get_header(itr, header);
+		if (err) {
+			if (err == 0xC5) {
+				/* C5h : Reservation Invalid */
+#if enable_debug_msg
+				printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+				printk("ipmi: retry\n");
+#endif
+				ipmi_sdr_get_reservation(&(itr->reservation));
+				sdr_idx--;
+				continue;
+			}
+			printk("ipmi: Get SDR header fail,so break this request\n");
+			goto ipmi_sdr_get_header_fail;
+		}
+
+
+		memset(rec, 0, GET_SDR_ENTIRE_RECORD);
+		err = ipmi_sdr_get_record(header, itr, rec);
+		if (err) {
+			if (err == 0xC5) {
+				/* C5h : Reservation Invalid */
+#if enable_debug_msg
+				printk("ipmi: reservation number given was invalid or the reservation was lost\n");
+				printk("ipmi: retry\n");
+#endif
+				ipmi_sdr_get_reservation(&(itr->reservation));
+				sdr_idx--;
+				continue;
+			}
+			printk("ipmi: Get SDR header fail,so break this request\n");
+			goto ipmi_sdr_get_record_fail;
+		}
+
+		itr->next = header->next;
+
+		switch (header->type)
+		{
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+			/* prepare (threshold, factor)data whilie init, for reduce reading step and improve operate speed */
+			g_sensor_data[sdr_idx].addr = rec[2];
+			g_sensor_data[sdr_idx].capability = SENSOR_GET_CAP_LABEL /*| SENSOR_GET_CAP_ALARM */ | SENSOR_GET_CAP_INPUT;
+			g_sensor_data[sdr_idx].headerinfo.header_type = header->type;
+			g_sensor_data[sdr_idx].headerinfo.header_byte = header->length;
+
+			ipmi_sdr_set_sensor_threshold(sdr_idx, (struct sdr_record_full_sensor*) rec);
+			ipmi_sdr_set_sensor_factor(sdr_idx, (struct sdr_record_full_sensor*) rec);
+
+			if (sdr_idx >= DEBUGUSE_SHIFT) {
+				err = create_sensor_attrs(sdr_idx);
+				if (err) {
+					g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+					printk("[err : %d]sysfs_create_group fail in [%d] %s\n", err, sdr_idx, g_sensor_data[sdr_idx].sensor_idstring);
+					goto create_sysfs_fail;
+				}
+			}
+
+			data->total_suport_sensor++;
+
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR: /* not supporrt now */
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR: /* not supporrt now */
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: /* not supporrt now */
+		default:
+			g_sensor_data[sdr_idx].attrinfo.attr_exist = 0;
+#if enable_debug_msg
+			printk("ID[%d] : not support type [%d]\n", sdr_idx, header->type);
+#endif
+			break;
+		}
+	}
+
+	printk("quanta_hwmon_ipmi : detected [%d] sensor, create [%d] sysfs\n", data->total_suport_sensor, data->total_create_sysfs);
+
+create_sysfs_fail:
+ipmi_sdr_get_header_fail:
+ipmi_sdr_get_record_fail:
+g_sensor_data_malloc_fail:
+	if (header) {
+		kfree(header);
+		header = NULL;
+	}
+	if (rec) {
+		kfree(rec);
+		rec = NULL;
+	}
+
+rec_malloc_fail:
+ipmi_sdr_start_fail:
+header_malloc_fail:
+	if (itr) {
+		kfree(itr);
+		itr = NULL;
+	}
+
+itr_malloc_fail:
+	mutex_unlock(&ipmi_lock);
+
+	return err;
+}
+
+static int32_t __init quanta_hwmon_ipmi_init(void)
+{
+	int32_t err = 0;
+
+	init_completion(&g_read_complete);
+
+	data = kzalloc(sizeof(struct quanta_hwmon_ipmi_data), GFP_KERNEL);
+	if (NULL == data) {
+		printk("alloc data fail\n");
+		goto alloc_err;
+	}
+
+	data->ipmi_platform_dev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+	err = IS_ERR(data->ipmi_platform_dev);
+	if (err) {
+		printk("platform device register fail (err : %d)\n", err);
+		goto device_reg_err;
+	}
+
+	data->ipmi_hwmon_dev = hwmon_device_register_with_groups(NULL, DRVNAME, NULL, NULL);
+	err = IS_ERR(data->ipmi_hwmon_dev);
+	if (err) {
+		printk("hwmon register fail\n");
+		goto hwmon_register_err;
+	}
+
+	err = ipmi_create_user(0, &ipmi_hndlrs, NULL, &ipmi_mh_user);
+	if (err) {
+		printk("warning: create user fail, watchdog broken (err : %d)\n", err);
+		goto ipmi_create_err;
+	}
+
+	mutex_init(&ipmi_lock);
+	err = ipmi_init_sdr_sensors_data();
+	if (err) {
+		printk("init sensor data fail (err : %d)\n", err);
+		goto init_sensor_err;
+	}
+
+	return 0;
+
+init_sensor_err:
+	kfree(g_sensor_data);
+ipmi_create_err:
+	hwmon_device_unregister(data->ipmi_hwmon_dev);
+hwmon_register_err:
+	platform_device_unregister(data->ipmi_platform_dev);
+device_reg_err:
+	kfree(data);
+alloc_err:
+	return err;
+}
+
+static void __exit quanta_hwmon_ipmi_exit(void)
+{	
+	remove_sensor_attrs();
+	hwmon_device_unregister(data->ipmi_hwmon_dev);
+	platform_device_unregister(data->ipmi_platform_dev);
+
+	mutex_lock(&ipmi_lock);
+	ipmi_destroy_user(ipmi_mh_user);
+	mutex_unlock(&ipmi_lock);
+
+	kfree(g_sensor_data);
+	kfree(data);
+	return;
+}
+
+module_init(quanta_hwmon_ipmi_init);
+module_exit(quanta_hwmon_ipmi_exit);
+
+MODULE_AUTHOR("Charcar~~Charcar~Charlie li li");
+MODULE_VERSION("2.0");
+MODULE_DESCRIPTION("Quanta BMC hardware monitor driver");
+MODULE_LICENSE("GPL");
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/setup.py
index b2f1b39fcd73..ad2b11a671c9 100644
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import os
-import sys
 from setuptools import setup
 os.listdir
 
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/__init__.py
new file mode 100644
index 000000000000..4bfefa0fb636
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/chassis.py
new file mode 100644
index 000000000000..33f67b0b9d90
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/chassis.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python
+#
+# Name: chassis.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import sys
+    import time
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.thermal import Thermal
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Chassis(ChassisBase):
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.__num_of_psus     = 2
+        self.__num_of_ports    = 32
+        self.__num_of_fan_drawers = 6
+        self.__fan_per_drawer = 2
+        self.__num_of_thermals = 19
+        self.__xcvr_presence = {}
+
+        # Initialize EEPROM
+        self._eeprom = Eeprom()
+
+        # Initialize watchdog
+        #self._watchdog = Watchdog()
+
+        # Initialize FAN
+        fan_index = 1
+        for drawer_index in range(1, self.__num_of_fan_drawers + 1):
+            drawer_fan_list = []
+            for index in range(0, self.__fan_per_drawer):
+                fan = Fan(fan_index, False)
+                fan_index += 1
+                self._fan_list.append(fan)
+                drawer_fan_list.append(fan)
+            fan_drawer = FanDrawer(drawer_index, drawer_fan_list)
+            self._fan_drawer_list.append(fan_drawer)
+
+        # Initialize thermal
+        for index in range(1, self.__num_of_thermals + 1):
+            thermal = Thermal(index)
+            self._thermal_list.append(thermal)
+
+        # Initialize PSU and PSU_FAN
+        for index in range(1, self.__num_of_psus + 1):
+            psu = Psu(index)
+            self._psu_list.append(psu)
+
+        # Initialize SFP
+        for index in range(1, self.__num_of_ports + 1):
+            sfp = Sfp(index, 'QSFP')
+            self._sfp_list.append(sfp)
+            self.__xcvr_presence[index] = self._sfp_list[index-1].get_presence()
+
+
+##############################################
+# Device methods
+##############################################
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (1-based) index <index>
+        For Quanta IX8C the index in sfputil.py starts from 1, so override
+
+        Args:
+            index: An integer, the index (1-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 1.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            if (index == 0):
+                raise IndexError
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("override: SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+            string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+##############################################
+# Chassis methods
+##############################################
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr()
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+            Ex. { '0x21':'AG9064', '0x22':'V1.0', '0x23':'AG9064-0109867821',
+                  '0x24':'001c0f000fcd0a', '0x25':'02/03/2018 16:22:00',
+                  '0x26':'01', '0x27':'REV01', '0x28':'AG9064-C2358-16G'}
+        """
+        return self._eeprom.system_eeprom_info()
+
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        #raise NotImplementedError
+        return (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Invalid Reason")
+
+    def get_change_event(self, timeout=0):
+        """
+        Currently only support transceiver change events
+        """
+
+        start_ms = time.time() * 1000
+        xcvr_change_event_dict = {}
+        event = False
+
+        while True:
+            time.sleep(0.5)
+            for index in range(1, self.__num_of_ports + 1):
+                cur_xcvr_presence = self._sfp_list[index-1].get_presence()
+                if cur_xcvr_presence != self.__xcvr_presence[index]:
+                    if cur_xcvr_presence is True:
+                        xcvr_change_event_dict[str(index)] = '1'
+                        self.__xcvr_presence[index] = True
+                    elif cur_xcvr_presence is False:
+                        xcvr_change_event_dict[str(index)] = '0'
+                        self.__xcvr_presence[index] = False
+                    event = True
+
+            if event is True:
+                return True, {'sfp':xcvr_change_event_dict}
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, {'sfp':xcvr_change_event_dict}
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..1c044638ed26
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/eeprom.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+#
+# Name: eeprom.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+    # Display vendor extension for Quanta platforms
+    _TLV_DISPLAY_VENDOR_EXT = True
+
+    def __init__(self):
+        self.__eeprom_path = "/sys/bus/i2c/devices/3-0054/eeprom"
+        super(Eeprom, self).__init__(self.__eeprom_path, 0, '', True)
+        self.__eeprom_tlv_dict = dict()
+        try:
+            self.__eeprom_data = self.read_eeprom()
+        except:
+            self.__eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+        else:
+            eeprom = self.__eeprom_data
+
+            if not self.is_valid_tlvinfo_header(eeprom):
+                return
+
+            total_length = (eeprom[9] << 8) | eeprom[10]
+            tlv_index = self._TLV_INFO_HDR_LEN
+            tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+            while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+                if not self.is_valid_tlv(eeprom[tlv_index:]):
+                    break
+
+                tlv = eeprom[tlv_index:tlv_index + 2
+                             + eeprom[tlv_index + 1]]
+                code = "0x%02X" % tlv[0]
+
+                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
+                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
+                                (tlv[4] << 8) | tlv[5])
+                    value += tlv[6:6 + tlv[1]].decode('ascii')
+                else:
+                    value = self.decoder(None, tlv)[30:]
+
+                self.__eeprom_tlv_dict[code] = value
+                if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                    break
+
+                tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                         self.__eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self):
+        (is_valid, results) = self.get_tlv_field(
+                          self.__eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or results[1] != 6:
+            return super(TlvInfoDecoder, self).switchaddrstr(e)
+
+        return ":".join(["{:02x}".format(T) for T in results[2]]).upper()
+
+    def modelstr(self):
+        (is_valid, results) = self.get_tlv_field(
+                        self.__eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_tag_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        (is_valid, results) = self.get_tlv_field(
+                    self.__eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.__eeprom_tlv_dict
+
+    def decoder(self, s, t):
+        '''
+        Return a string representing the contents of the TLV field. The format of
+        the string is:
+            1. The name of the field left justified in 20 characters
+            2. The type code in hex right justified in 5 characters
+            3. The length in decimal right justified in 4 characters
+            4. The value, left justified in however many characters it takes
+        The vailidity of EEPROM contents and the TLV field has been verified
+        prior to calling this function. The 's' parameter is unused
+        '''
+        if t[0] == self._TLV_CODE_PRODUCT_NAME:
+            name  = "Product Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PART_NUMBER:
+            name = "Part Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERIAL_NUMBER:
+            name  = "Serial Number"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_BASE:
+            name = "Base MAC Address"
+            value = ":".join(["{:02x}".format(T) for T in t[2:8]]).upper()
+        elif t[0] == self._TLV_CODE_MANUF_DATE:
+            name = "Manufacture Date"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DEVICE_VERSION:
+            name  = "Device Version"
+            value = str(t[2])
+        elif t[0] == self._TLV_CODE_LABEL_REVISION:
+            name  = "Label Revision"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_PLATFORM_NAME:
+            name  = "Platform Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_ONIE_VERSION:
+            name  = "ONIE Version"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MAC_SIZE:
+            name = "MAC Addresses"
+            value = str((t[2] << 8) | t[3])
+        elif t[0] == self._TLV_CODE_MANUF_NAME:
+            name = "Manufacturer"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_MANUF_COUNTRY:
+            name = "Manufacture Country"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_NAME:
+            name = "Vendor Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_DIAG_VERSION:
+            name = "Diag Version"
+            # Quanta legacy format of diag version
+            if t[1] == 4:
+                value = "{}.{}.{}.{}".format('{:02x}'.format(t[2])[0], '{:02x}'.format(t[2])[1],
+                                             '{:02x}'.format(t[3])[0], '{:02x}'.format(t[3])[1])
+            else:
+                value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_SERVICE_TAG:
+            name = "Service Tag"
+            value = t[2:2 + t[1]].decode("ascii")
+        elif t[0] == self._TLV_CODE_VENDOR_EXT:
+            name = "Vendor Extension"
+            value = ""
+            if self._TLV_DISPLAY_VENDOR_EXT:
+                for c in t[2:2 + t[1]]:
+                    value += "0x%02X " % c
+        elif t[0] == self._TLV_CODE_CRC_32 and len(t) == 6:
+            name = "CRC-32"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        # Quanta specific codes below here.
+        # These decodes are lifted from their U-Boot codes
+        elif t[0] == self._TLV_CODE_QUANTA_MAGIC and len(t) == 3:
+            name  = "Magic Number"
+            value = "0x%02X" % t[2]
+        elif t[0] == self._TLV_CODE_QUANTA_CRC and len(t) == 4:
+            name = "QUANTA-CRC"
+            value = "0x%04X" % ((t[2] << 8) + t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_CARD_TYPE and len(t) == 6:
+            name = "Card Type"
+            value = "0x%08X" % ((t[2] << 24) | (t[3] << 16) | (t[4] << 8) | t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_HW_VERSION and len(t) == 6:
+            name = "Hardware Version"
+            value = "%d.%d" % (t[2], t[3])
+        elif t[0] == self._TLV_CODE_QUANTA_SW_VERSION and len(t) == 6:
+            name = "Software Version"
+            value = "%d.%d.%d.%d" % ((t[2] >> 4), (t[2] & 0xF), (t[3] >> 4), (t[3] & 0xF))
+        elif t[0] == self._TLV_CODE_QUANTA_MANUF_DATE and len(t) == 6:
+            name = "Manufacture Date"
+            value = "%04d/%d/%d" % (((t[2] << 8) | t[3]), t[4], t[5])
+        elif t[0] == self._TLV_CODE_QUANTA_MODEL_NAME:
+            name  = "Model Name"
+            value = t[2:2 + t[1]].decode("ascii")
+        else:
+            name = "Unknown"
+            value = ""
+            for c in t[2:2 + t[1]]:
+                value += "0x%02X " % c
+        return name, value
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan.py
new file mode 100644
index 000000000000..e668013df900
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan.py
@@ -0,0 +1,226 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta IX9
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the FAN information
+#
+#############################################################################
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.fan_base import FanBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+###############
+# Global
+###############
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+FAN_INDEX_START = 18
+NUM_FANTRAYS = 6
+FANS_PERTRAY = 2
+
+class Fan(FanBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, index, is_psu_fan=False):
+        self.is_psu_fan = is_psu_fan
+        self.fan_index = index
+        self.psu_fan_index_mapping = {
+            1:37,
+            2:47,
+        }
+        self.psu_index_mapping = {
+            1:39,
+            2:49,
+        }
+        if self.is_psu_fan:
+            self.fan_presence_attr = "power{}_present".format(self.psu_index_mapping[index])
+            self.fan_pwm_attr = "fan{}_pwm".format(self.psu_fan_index_mapping[index])
+            self.fan_rpm_attr = "fan{}_input".format(self.psu_fan_index_mapping[index])
+            self.fan_direction_attr = "fan{}_direction".format(self.psu_fan_index_mapping[index])
+        else:
+            self.fan_presence_attr = "fan{}_present".format(FAN_INDEX_START+(index-1))
+            self.fan_pwm_attr = "fan{}_pwm".format(FAN_INDEX_START+(index-1))
+            self.fan_rpm_attr = "fan{}_input".format(FAN_INDEX_START+(index-1))
+            self.fan_direction_attr = "fan{}_direction".format(FAN_INDEX_START+(index-1))
+
+
+#######################
+# private function
+#######################
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+
+    ####################
+    # Device base
+    ####################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU-{}_FAN".format(self.fan_index)
+        else:
+            fantray_index = (self.fan_index-1)/FANS_PERTRAY+1
+            fan_index_intray = self.fan_index - ((fantray_index-1)*FANS_PERTRAY)
+            return "Fantray{}_{}".format(fantray_index, fan_index_intray)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.fan_presence_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == '1'):
+                return True
+            else:
+                return False
+
+        return None
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_rpm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR' and attr_rv != '0.0'):
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    #################
+    # fan base
+    #################
+
+    def get_direction(self):
+        """
+        Retrieves the direction of fan
+
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+        """
+        attr_path = HWMON_DIR + self.fan_direction_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if attr_rv == '2':
+            return self.FAN_DIRECTION_INTAKE
+        else:
+            return self.FAN_DIRECTION_EXHAUST
+
+    def get_speed(self):
+        """
+        Retrieves the speed of fan as a percentage of full speed
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        if self.get_presence():
+            attr_path = HWMON_DIR + self.fan_pwm_attr
+            attr_rv = self.__get_attr_value(attr_path)
+
+            if (attr_rv != 'ERR'):
+                return int(float(attr_rv))
+            else:
+                return False
+        else:
+            return 0
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of fan in revolutions per minute (RPM)
+
+        Returns:
+            An integer, speed of the fan in RPM
+        """
+        attr_path = HWMON_DIR + self.fan_rpm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_target_speed(self):
+        """
+        Retrieves the target (expected) speed of the fan
+
+        Returns:
+            An integer, the percentage of full fan speed, in the range 0 (off)
+                 to 100 (full speed)
+        """
+        attr_path = HWMON_DIR + self.fan_pwm_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return int(float(attr_rv))
+        else:
+            return False
+
+    def get_speed_tolerance(self):
+        """
+        Retrieves the speed tolerance of the fan
+
+        Returns:
+            An integer, the percentage of variance from target speed which is
+                 considered tolerable
+        """
+        return 25
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan module status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan module status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return True
+
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..75e954576a28
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/fan_drawer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the fan status which are available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class FanDrawer(FanDrawerBase):
+
+    def __init__(self, index, fan_list):
+        FanDrawerBase.__init__(self)
+
+        self._fan_list = fan_list
+        self._index = index
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        return 'Fan {}'.format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/platform.py
new file mode 100644
index 000000000000..a2ffe0a47e78
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/platform.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Name: platform.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/psu.py
new file mode 100644
index 000000000000..1043a4fe1857
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/psu.py
@@ -0,0 +1,319 @@
+#!/usr/bin/env python
+#
+# Name: psu.py, version: 1.0
+#
+# Description: Module contains the definitions of SONiC platform APIs
+#
+
+try:
+    import logging
+    import os
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+class Psu(PsuBase):
+    def __init__(self, index):
+        PsuBase.__init__(self)
+        fan = Fan(index, True)
+        self._fan_list.append(fan)
+
+        self.psu_index_mapping = {
+            1:39,
+            2:49,
+        }
+        self.psu_powerin_index_mapping = {
+            1:38,
+            2:48,
+        }
+        self.psu_currentout_index_mapping = {
+            1:36,
+            2:46,
+        }
+        self.psu_currentin_index_mapping = {
+            1:35,
+            2:45,
+        }
+        self.psu_voltageout_index_mapping = {
+            1:44,
+            2:54,
+        }
+        self.psu_voltagein_index_mapping = {
+            1:43,
+            2:53,
+        }
+        self.index                = index
+        self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
+        self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
+        self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
+        self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
+        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
+        self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
+        self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
+        self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
+        self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        fd.close()
+        return retval
+
+##############################################
+# Device methods
+##############################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        presence = False
+        attr_path = HWMON_DIR+self.psu_presence_attr
+        attr_normal = '1'
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            if (attr_rv == attr_normal):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+
+        Returns:
+            string: Model/part number of device
+        """
+        model = "N/A"
+        attr_path = HWMON_DIR+self.psu_model_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            model = attr_rv
+
+        return model
+
+    def get_mfr_id(self):
+        """
+        Retrieves the manufacturer's name (or id) of the device
+
+        Returns:
+            string: Manufacturer's id of device
+        """
+        mfr_id = "N/A"
+        attr_path = HWMON_DIR+self.psu_mfr_id_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            mfr_id = attr_rv
+
+        return mfr_id
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+
+        Returns:
+            string: Serial number of device
+        """
+        serial = "N/A"
+        attr_path = HWMON_DIR+self.psu_serial_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            serial = attr_rv
+
+        return serial
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        status = False
+        attr_path = HWMON_DIR+self.psu_status_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            if (int(attr_rv) != 0):
+                status = True
+
+        return status
+
+##############################################
+# PSU methods
+##############################################
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_out = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_out = float(attr_rv) / 1000
+
+        return voltage_out
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_out = 0.0
+        attr_path = HWMON_DIR+self.psu_current_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_out = float(attr_rv) / 1000
+
+        return current_out
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        voltage_in = 0.0
+        attr_path = HWMON_DIR+self.psu_voltage_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            voltage_in = float(attr_rv) / 1000
+
+        return voltage_in
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, the electric current in amperes, e.g 15.4
+        """
+        current_in = 0.0
+        attr_path = HWMON_DIR+self.psu_current_in_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            current_in = float(attr_rv) / 1000
+
+        return current_in
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts, e.g. 302.6
+        """
+        power_out = 0.0
+        attr_path = HWMON_DIR+self.psu_power_out_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            power_out = float(attr_rv) / 1000
+
+        return power_out
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and passed all
+            its internal self-tests, False if not.
+        """
+        return self.get_status()
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        if self.get_powergood_status():
+            return self.STATUS_LED_COLOR_GREEN
+        else:
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_type(self):
+        """
+        Gets the type of the PSU
+
+        Returns:
+            A string, the type of PSU (AC/DC)
+        """
+        type = "AC"
+        attr_path = HWMON_DIR+self.psu_type_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            type = attr_rv
+
+        return type
+
+    def get_capacity(self):
+        """
+        Gets the capacity (maximum output power) of the PSU in watts
+
+        Returns:
+            An integer, the capacity of PSU
+        """
+        capacity = 0
+        attr_path = HWMON_DIR+self.psu_capacity_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            try:
+                capacity = int(attr_rv)
+            except ValueError:
+                capacity = 0
+
+        return capacity
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/sfp.py
new file mode 100644
index 000000000000..e4505f509a10
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/sfp.py
@@ -0,0 +1,2130 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Sfp contains an implementation of SONiC Platform Base API and
+# provides the sfp device status which are available in the platform
+#
+#############################################################################
+
+import os
+import time
+from ctypes import create_string_buffer
+
+try:
+     from sonic_platform_base.sfp_base import SfpBase
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+     from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
+     from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_InterfaceId
+     from sonic_platform_base.sonic_sfp.qsfp_dd import qsfp_dd_Dom
+     from sonic_py_common.logger import Logger
+     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
+except ImportError as e:
+    raise ImportError (str(e) + "- required module not found")
+
+# definitions of the offset and width for values in XCVR info eeprom
+XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
+XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
+XCVR_VENDOR_NAME_OFFSET = 20
+XCVR_VENDOR_NAME_WIDTH = 16
+XCVR_VENDOR_OUI_OFFSET = 37
+XCVR_VENDOR_OUI_WIDTH = 3
+XCVR_VENDOR_PN_OFFSET = 40
+XCVR_VENDOR_PN_WIDTH = 16
+XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_QSFP = 2
+XCVR_HW_REV_WIDTH_SFP = 4
+XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET = 64
+XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH = 1
+XCVR_VENDOR_SN_OFFSET = 68
+XCVR_VENDOR_SN_WIDTH = 16
+XCVR_VENDOR_DATE_OFFSET = 84
+XCVR_VENDOR_DATE_WIDTH = 8
+XCVR_DOM_CAPABILITY_OFFSET = 92
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+# definitions of the offset and width for values in XCVR_QSFP_DD info eeprom
+XCVR_EXT_TYPE_OFFSET_QSFP_DD = 72
+XCVR_EXT_TYPE_WIDTH_QSFP_DD = 2
+XCVR_CONNECTOR_OFFSET_QSFP_DD = 75
+XCVR_CONNECTOR_WIDTH_QSFP_DD = 1
+XCVR_CABLE_LENGTH_OFFSET_QSFP_DD = 74
+XCVR_CABLE_LENGTH_WIDTH_QSFP_DD = 1
+XCVR_HW_REV_OFFSET_QSFP_DD = 36
+XCVR_HW_REV_WIDTH_QSFP_DD = 2
+XCVR_VENDOR_DATE_OFFSET_QSFP_DD = 54
+XCVR_VENDOR_DATE_WIDTH_QSFP_DD = 8
+XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD = 2
+XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD = 1
+XCVR_MEDIA_TYPE_OFFSET_QSFP_DD = 85
+XCVR_MEDIA_TYPE_WIDTH_QSFP_DD = 1
+XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD = 86
+XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD = 32
+XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD = 351
+XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD = 28
+
+# to improve performance we retrieve all eeprom data via a single ethtool command
+# in function get_transceiver_info and get_transceiver_bulk_status
+# XCVR_INTERFACE_DATA_SIZE stands for the max size to be read
+# this variable is only used by get_transceiver_info.
+# please be noted that each time some new value added to the function
+# we should make sure that it falls into the area
+# [XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE] or
+# adjust XCVR_INTERFACE_MAX_SIZE to contain the new data
+# It's same for [QSFP_DOM_BULK_DATA_START, QSFP_DOM_BULK_DATA_SIZE] and
+# [SFP_DOM_BULK_DATA_START, SFP_DOM_BULK_DATA_SIZE] which are used by
+# get_transceiver_bulk_status
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+SFP_MODULE_ADDRA2_OFFSET = 256
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 56
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+QSFP_DD_DOM_BULK_DATA_START = 14
+QSFP_DD_DOM_BULK_DATA_SIZE = 4
+
+# definitions of the offset for values in OSFP info eeprom
+OSFP_TYPE_OFFSET = 0
+OSFP_VENDOR_NAME_OFFSET = 129
+OSFP_VENDOR_PN_OFFSET = 148
+OSFP_HW_REV_OFFSET = 164
+OSFP_VENDOR_SN_OFFSET = 166
+
+# definitions of the offset for values in QSFP_DD info eeprom
+QSFP_DD_TYPE_OFFSET = 0
+QSFP_DD_VENDOR_NAME_OFFSET = 1
+QSFP_DD_VENDOR_PN_OFFSET = 20
+QSFP_DD_VENDOR_SN_OFFSET = 38
+QSFP_DD_VENDOR_OUI_OFFSET = 17
+
+#definitions of the offset and width for values in DOM info eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+
+QSFP_MODULE_UPPER_PAGE3_START = 384
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNL_THRESHOLD_OFFSET = 176
+QSFP_CHANNL_THRESHOLD_WIDTH = 24
+
+SFP_TEMPE_OFFSET = 96
+SFP_TEMPE_WIDTH = 2
+SFP_VOLT_OFFSET = 98
+SFP_VOLT_WIDTH = 2
+SFP_CHANNL_MON_OFFSET = 100
+SFP_CHANNL_MON_WIDTH = 6
+
+
+SFP_CHANNL_STATUS_OFFSET = 110
+SFP_CHANNL_STATUS_WIDTH = 1
+
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+QSFP_DD_TEMPE_OFFSET = 14
+QSFP_DD_TEMPE_WIDTH = 2
+QSFP_DD_VOLT_OFFSET = 16
+QSFP_DD_VOLT_WIDTH = 2
+QSFP_DD_TX_BIAS_OFFSET = 42
+QSFP_DD_TX_BIAS_WIDTH = 16
+QSFP_DD_RX_POWER_OFFSET = 58
+QSFP_DD_RX_POWER_WIDTH = 16
+QSFP_DD_TX_POWER_OFFSET = 26
+QSFP_DD_TX_POWER_WIDTH = 16
+QSFP_DD_CHANNL_MON_OFFSET = 26
+QSFP_DD_CHANNL_MON_WIDTH = 48
+QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET = 19
+QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET = 7
+QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_DD_MODULE_THRESHOLD_OFFSET = 0
+QSFP_DD_MODULE_THRESHOLD_WIDTH = 72
+QSFP_DD_CHANNL_STATUS_OFFSET = 26
+QSFP_DD_CHANNL_STATUS_WIDTH = 1
+
+# identifier value of xSFP module which is in the first byte of the EEPROM
+# if the identifier value falls into SFP_TYPE_CODE_LIST the module is treated as a SFP module and parsed according to 8472
+# for QSFP_TYPE_CODE_LIST the module is treated as a QSFP module and parsed according to 8436/8636
+# Originally the type (SFP/QSFP) of each module is determined according to the SKU dictionary
+# where the type of each FP port is defined. The content of EEPROM is parsed according to its type.
+# However, sometimes the SFP module can be fit in an adapter and then pluged into a QSFP port.
+# In this case the EEPROM content is in format of SFP but parsed as QSFP, causing failure.
+# To resolve that issue the type field of the xSFP module is also fetched so that we can know exectly what type the
+# module is. Currently only the following types are recognized as SFP/QSFP module.
+# Meanwhile, if the a module's identifier value can't be recognized, it will be parsed according to the SKU dictionary.
+# This is because in the future it's possible that some new identifier value which is not regonized but backward compatible
+# with the current format and by doing so it can be parsed as much as possible.
+SFP_TYPE_CODE_LIST = [
+    '03' # SFP/SFP+/SFP28
+]
+QSFP_TYPE_CODE_LIST = [
+    '0d', # QSFP+ or later
+    '11' # QSFP28 or later
+]
+QSFP_DD_TYPE_CODE_LIST = [
+    '18' # QSFP-DD Double Density 8X Pluggable Transceiver
+]
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                            'ESCONComplianceCodes', 'SONETComplianceCodes',
+                            'EthernetComplianceCodes','FibreChannelLinkLength',
+                            'FibreChannelTechnology', 'SFP+CableTechnology',
+                            'FibreChannelTransmissionMedia','FibreChannelSpeed')
+
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+OSFP_TYPE = "OSFP"
+QSFP_DD_TYPE = "QSFP_DD"
+
+# Global logger class instance
+logger = Logger()
+
+class Sfp(SfpBase):
+    """Platform-specific Sfp class"""
+
+    # Port number
+    PORT_START = 1
+    PORT_END = 32
+
+    dom_supported = True
+    dom_temp_supported = True
+    dom_volt_supported = True
+    dom_rx_power_supported = True
+    dom_tx_power_supported = True
+    dom_tx_disable_supported = True
+    calibration = 1
+
+    # Path to QSFP sysfs
+    PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
+    PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+
+    PLATFORM = "x86_64-quanta_ix9_bwde-r0"
+    HWSKU  = "Quanta-IX9-32X"
+
+    def __init__(self, sfp_index, sfp_type):
+        # Init index
+        self.index = sfp_index
+        self.port_num = self.index
+        #self.dom_supported = False
+        self.sfp_type = sfp_type
+        self.reset_path = "/sys/class/cpld-qsfpdd/port-"+str(self.port_num)+"/reset"
+        self.lpmode_path = "/sys/class/cpld-qsfpdd/port-"+str(self.port_num)+"/lpmode"
+        # Init eeprom path
+        eeprom_path = '/sys/bus/i2c/devices/{0}-0050/eeprom'
+        self.port_to_eeprom_mapping = {}
+        self.port_to_i2c_mapping = {
+             1 : 13,
+             2 : 14,
+             3 : 15,
+             4 : 16,
+             5 : 17,
+             6 : 18,
+             7 : 19,
+             8 : 20,
+             9 : 21,
+            10 : 22,
+            11 : 23,
+            12 : 24,
+            13 : 25,
+            14 : 26,
+            15 : 27,
+            16 : 28,
+            17 : 29,
+            18 : 30,
+            19 : 31,
+            20 : 32,
+            21 : 33,
+            22 : 34,
+            23 : 35,
+            24 : 36,
+            25 : 37,
+            26 : 38,
+            27 : 39,
+            28 : 40,
+            29 : 41,
+            30 : 42,
+            31 : 43,
+            32 : 44,
+        }
+
+        for x in range(self.PORT_START, self.PORT_END + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        self._detect_sfp_type(sfp_type)
+
+        self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer',
+            'model', 'connector', 'encoding', 'ext_identifier',
+            'ext_rateselect_compliance', 'cable_type', 'cable_length',
+            'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui', 'application_advertisement']
+
+        SfpBase.__init__(self)
+
+
+    def _convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def __read_txt_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.read()
+                return data.strip()
+        except IOError:
+            pass
+        return ""
+
+    def __is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def __get_path_to_port_config_file(self):
+        platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
+        hwsku_path = "/".join([platform_path, self.HWSKU]
+                              ) if self.__is_host() else self.PMON_HWSKU_PATH
+        return "/".join([hwsku_path, "port_config.ini"])
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the SFP module
+        Returns:
+            bool: True if SFP module is present, False if not
+        """
+        # Check for invalid port_num
+        if self.port_num < self.PORT_START or self.port_num > self.PORT_END:
+            return False
+
+        try:
+            reg_file = open("/sys/class/cpld-qsfpdd/port-"+str(self.port_num)+"/module_present")
+        except IOError as e:
+            print ("Error: unable to open file: %s" % str(e))
+            return False
+
+        reg_value = reg_file.readline().rstrip()
+        if reg_value == '1':
+            return True
+
+        return False
+
+    def _read_eeprom_specific_bytes(self, offset, num_bytes):
+        sysfsfile_eeprom = None
+        eeprom_raw = []
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+        try:
+            sysfsfile_eeprom = open(
+                sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
+            sysfsfile_eeprom.seek(offset)
+            raw = sysfsfile_eeprom.read(num_bytes)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except Exception:
+            eeprom_raw = None
+        finally:
+            if sysfsfile_eeprom:
+                sysfsfile_eeprom.close()
+
+        return eeprom_raw
+
+    def _detect_sfp_type(self, sfp_type):
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_specific_bytes(XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH)
+        if eeprom_raw:
+            if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
+                self.sfp_type = SFP_TYPE
+            elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_TYPE
+            elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
+                self.sfp_type = QSFP_TYPE
+            else:
+                # we don't regonize this identifier value, treat the xSFP module as the default type
+                self.sfp_type = sfp_type
+                logger.log_info("Identifier value of {} module {} is {} which isn't regonized and will be treated as default type ({})".format(
+                    sfp_type, self.index, eeprom_raw[0], sfp_type
+                ))
+        else:
+            # eeprom_raw being None indicates the module is not present.
+            # in this case we treat it as the default type according to the SKU
+            self.sfp_type = sfp_type
+
+    def __convert_string_to_num(self, value_str):
+        if "-inf" in value_str:
+            return 'N/A'
+        elif "Unknown" in value_str:
+            return 'N/A'
+        elif 'dBm' in value_str:
+            t_str = value_str.rstrip('dBm')
+            return float(t_str)
+        elif 'mA' in value_str:
+            t_str = value_str.rstrip('mA')
+            return float(t_str)
+        elif 'C' in value_str:
+            t_str = value_str.rstrip('C')
+            return float(t_str)
+        elif 'Volts' in value_str:
+            t_str = value_str.rstrip('Volts')
+            return float(t_str)
+        else:
+            return 'N/A'
+
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_bias_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == QSFP_TYPE:
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes((offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_version_compliance_raw = self._read_eeprom_specific_bytes(QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
+                qsfp_version_compliance = int(qsfp_version_compliance_raw[0], 16)
+                dom_capability = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
+                    self.dom_volt_supported = dom_capability['data']['Voltage_support']['value'] == 'On'
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = dom_capability['data']['Tx_power_support']['value'] == 'On'
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = True
+                self.dom_supported = True
+                self.calibration = 1
+                sfpd_obj = sff8436Dom()
+                if sfpd_obj is None:
+                    return None
+                qsfp_option_value_raw = self._read_eeprom_specific_bytes(QSFP_OPTION_VALUE_OFFSET, QSFP_OPTION_VALUE_WIDTH)
+                if qsfp_option_value_raw is not None:
+                    optional_capability = sfpd_obj.parse_option_params(qsfp_option_value_raw, 0)
+                    self.dom_tx_disable_supported = optional_capability['data']['TxDisable']['value'] == 'On'
+                dom_status_indicator = sfpd_obj.parse_dom_status_indicator(qsfp_version_compliance_raw, 1)
+                self.qsfp_page3_available = dom_status_indicator['data']['FlatMem']['value'] == 'Off'
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+                self.qsfp_page3_available = False
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+
+            offset = 0
+            # two types of QSFP-DD cable types supported: Copper and Optical.
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes((offset + XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD), XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD)
+            if qsfp_dom_capability_raw is not None:
+                self.dom_temp_supported = True
+                self.dom_volt_supported = True
+                dom_capability = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
+                if dom_capability['data']['Flat_MEM']['value'] == 'Off':
+                    self.dom_supported = True
+                    self.second_application_list = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    self.dom_tx_bias_power_supported = True
+                    self.dom_thresholds_supported = True
+                    self.dom_rx_tx_power_bias_supported = True
+                else:
+                    self.dom_supported = False
+                    self.second_application_list = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.dom_tx_bias_power_supported = False
+                    self.dom_thresholds_supported = False
+                    self.dom_rx_tx_power_bias_supported = False
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.dom_tx_bias_power_supported = False
+                self.dom_thresholds_supported = False
+                self.dom_rx_tx_power_bias_supported = False
+
+        elif self.sfp_type == SFP_TYPE:
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self._read_eeprom_specific_bytes(XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ================================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        type                       |1*255VCHAR     |type of SFP
+        hardware_rev               |1*255VCHAR     |hardware version of SFP
+        serial                     |1*255VCHAR     |serial number of the SFP
+        manufacturer               |1*255VCHAR     |SFP vendor name
+        model                      |1*255VCHAR     |SFP model name
+        connector                  |1*255VCHAR     |connector information
+        encoding                   |1*255VCHAR     |encoding information
+        ext_identifier             |1*255VCHAR     |extend identifier
+        ext_rateselect_compliance  |1*255VCHAR     |extended rateSelect compliance
+        cable_length               |INT            |cable length in m
+        mominal_bit_rate           |INT            |nominal bit rate by 100Mbs
+        specification_compliance   |1*255VCHAR     |specification compliance
+        vendor_date                |1*255VCHAR     |vendor date
+        vendor_oui                 |1*255VCHAR     |vendor OUI
+        application_advertisement  |1*255VCHAR     |supported applications advertisement
+        ================================================================================
+        """
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        self._detect_sfp_type(self.sfp_type)
+
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+
+        # ToDo: OSFP tranceiver info parsing not fully supported.
+        # in inf8628.py lack of some memory map definition
+        # will be implemented when the inf8628 memory map ready
+        if self.sfp_type == OSFP_TYPE:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_OSFP
+
+            sfpi_obj = inf8628InterfaceId()
+            if sfpi_obj is None:
+                return None
+
+            sfp_type_raw = self._read_eeprom_specific_bytes((offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes((offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_vendor_name_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes((offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_vendor_pn_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes((offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_vendor_rev_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes((offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_vendor_sn_raw, 0)
+            else:
+                return None
+
+            transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = 'N/A'
+            transceiver_info_dict['vendor_date'] = 'N/A'
+            transceiver_info_dict['connector'] = 'N/A'
+            transceiver_info_dict['encoding'] = 'N/A'
+            transceiver_info_dict['ext_identifier'] = 'N/A'
+            transceiver_info_dict['ext_rateselect_compliance'] = 'N/A'
+            transceiver_info_dict['cable_type'] = 'N/A'
+            transceiver_info_dict['cable_length'] = 'N/A'
+            transceiver_info_dict['specification_compliance'] = 'N/A'
+            transceiver_info_dict['nominal_bit_rate'] = 'N/A'
+            transceiver_info_dict['application_advertisement'] = 'N/A'
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 128
+            vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return None
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpi_obj = qsfp_dd_InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return None
+
+            sfp_type_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_vendor_name_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_vendor_pn_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes((offset + XCVR_HW_REV_OFFSET_QSFP_DD), XCVR_HW_REV_WIDTH_QSFP_DD)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_vendor_rev_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_vendor_sn_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_oui_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
+            if sfp_vendor_oui_raw is not None:
+                sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_vendor_oui_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_date_raw = self._read_eeprom_specific_bytes((offset + XCVR_VENDOR_DATE_OFFSET_QSFP_DD), XCVR_VENDOR_DATE_WIDTH_QSFP_DD)
+            if sfp_vendor_date_raw is not None:
+                sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_vendor_date_raw, 0)
+            else:
+                return None
+
+            sfp_connector_raw = self._read_eeprom_specific_bytes((offset + XCVR_CONNECTOR_OFFSET_QSFP_DD), XCVR_CONNECTOR_WIDTH_QSFP_DD)
+            if sfp_connector_raw is not None:
+                sfp_connector_data = sfpi_obj.parse_connector(sfp_connector_raw, 0)
+            else:
+                return None
+
+            sfp_ext_identifier_raw = self._read_eeprom_specific_bytes((offset + XCVR_EXT_TYPE_OFFSET_QSFP_DD), XCVR_EXT_TYPE_WIDTH_QSFP_DD)
+            if sfp_ext_identifier_raw is not None:
+                sfp_ext_identifier_data = sfpi_obj.parse_ext_iden(sfp_ext_identifier_raw, 0)
+            else:
+                return None
+
+            sfp_cable_len_raw = self._read_eeprom_specific_bytes((offset + XCVR_CABLE_LENGTH_OFFSET_QSFP_DD), XCVR_CABLE_LENGTH_WIDTH_QSFP_DD)
+            if sfp_cable_len_raw is not None:
+                sfp_cable_len_data = sfpi_obj.parse_cable_len(sfp_cable_len_raw, 0)
+            else:
+                return None
+
+            sfp_media_type_raw = self._read_eeprom_specific_bytes(XCVR_MEDIA_TYPE_OFFSET_QSFP_DD, XCVR_MEDIA_TYPE_WIDTH_QSFP_DD)
+            if sfp_media_type_raw is not None:
+                sfp_media_type_dict = sfpi_obj.parse_media_type(sfp_media_type_raw, 0)
+                if sfp_media_type_dict is None:
+                    return None
+
+                host_media_list = ""
+                sfp_application_type_first_list = self._read_eeprom_specific_bytes((XCVR_FIRST_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_FIRST_APPLICATION_LIST_WIDTH_QSFP_DD)
+                if self.second_application_list:
+                    possible_application_count = 15
+                    sfp_application_type_second_list = self._read_eeprom_specific_bytes((XCVR_SECOND_APPLICATION_LIST_OFFSET_QSFP_DD), XCVR_SECOND_APPLICATION_LIST_WIDTH_QSFP_DD)
+                    if sfp_application_type_first_list is not None and sfp_application_type_second_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list + sfp_application_type_second_list
+                    else:
+                        return None
+                else:
+                    possible_application_count = 8
+                    if sfp_application_type_first_list is not None:
+                        sfp_application_type_list = sfp_application_type_first_list
+                    else:
+                        return None
+
+                for i in range(0, possible_application_count):
+                    if sfp_application_type_list[i * 4] == 'ff':
+                        break
+                    host_electrical, media_interface = sfpi_obj.parse_application(sfp_media_type_dict, sfp_application_type_list[i * 4], sfp_application_type_list[i * 4 + 1])
+                    host_media_list = host_media_list + host_electrical + ' - ' + media_interface + '\n\t\t\t\t   '
+            else:
+                return None
+
+            transceiver_info_dict['type'] = str(sfp_type_data['data']['type']['value'])
+            transceiver_info_dict['manufacturer'] = str(sfp_vendor_name_data['data']['Vendor Name']['value'])
+            transceiver_info_dict['model'] = str(sfp_vendor_pn_data['data']['Vendor PN']['value'])
+            transceiver_info_dict['hardware_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value'])
+            transceiver_info_dict['serial'] = str(sfp_vendor_sn_data['data']['Vendor SN']['value'])
+            transceiver_info_dict['vendor_oui'] = str(sfp_vendor_oui_data['data']['Vendor OUI']['value'])
+            transceiver_info_dict['vendor_date'] = str(sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'])
+            transceiver_info_dict['connector'] = str(sfp_connector_data['data']['Connector']['value'])
+            transceiver_info_dict['encoding'] = "Not supported for CMIS cables"
+            transceiver_info_dict['ext_identifier'] = str(sfp_ext_identifier_data['data']['Extended Identifier']['value'])
+            transceiver_info_dict['ext_rateselect_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['specification_compliance'] = "Not supported for CMIS cables"
+            transceiver_info_dict['cable_type'] = "Length Cable Assembly(m)"
+            transceiver_info_dict['cable_length'] = str(sfp_cable_len_data['data']['Length Cable Assembly(m)']['value'])
+            transceiver_info_dict['nominal_bit_rate'] = "Not supported for CMIS cables"
+            transceiver_info_dict['application_advertisement'] = host_media_list
+
+        else:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+            interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                print("Error: sfp_object open failed")
+                return None
+
+        if self.sfp_type != QSFP_DD_TYPE:
+            # Add retry for xcvr eeprom to get ready
+            max_retry = 10
+            for i in range(0,max_retry):
+                sfp_interface_bulk_raw = self._read_eeprom_specific_bytes(
+                    offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+                if sfp_interface_bulk_raw is not None:
+                    break
+                else:
+                    if not self.get_presence():
+                        return transceiver_info_dict
+                    elif i == max_retry-1:
+                        pass
+                    else:
+                        time.sleep(0.5)
+
+            if sfp_interface_bulk_raw is None:
+                    return transceiver_info_dict
+
+            start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + interface_info_bulk_width
+            sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_NAME_WIDTH
+            sfp_vendor_name_data = sfpi_obj.parse_vendor_name(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_PN_WIDTH
+            sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + vendor_rev_width
+            sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_SN_WIDTH
+            sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_OUI_WIDTH
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(sfp_interface_bulk_raw[start : end], 0)
+
+            start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_DATE_WIDTH
+            sfp_vendor_date_data = sfpi_obj.parse_vendor_date(sfp_interface_bulk_raw[start : end], 0)
+
+            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
+            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+            transceiver_info_dict['application_advertisement'] = 'N/A'
+
+            if self.sfp_type == QSFP_TYPE:
+                for key in qsfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in qsfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                sfp_ext_specification_compliance_raw = self._read_eeprom_specific_bytes(offset + XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET, XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH)
+                if sfp_ext_specification_compliance_raw is not None:
+                    sfp_ext_specification_compliance_data = sfpi_obj.parse_ext_specification_compliance(sfp_ext_specification_compliance_raw[0 : 1], 0)
+                    if sfp_ext_specification_compliance_data['data']['Extended Specification compliance']['value'] != "Unspecified":
+                        compliance_code_dict['Extended Specification compliance'] = sfp_ext_specification_compliance_data['data']['Extended Specification compliance']['value']
+                transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+                transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+            else:
+                for key in sfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in sfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+
+                transceiver_info_dict['nominal_bit_rate'] = str(sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+
+        return transceiver_info_dict
+
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        RX LOS                     |BOOLEAN        |RX lost-of-signal status,
+                                   |               |True if has RX los, False if not.
+        TX FAULT                   |BOOLEAN        |TX fault status,
+                                   |               |True if has TX fault, False if not.
+        Reset status               |BOOLEAN        |reset status,
+                                   |               |True if SFP in reset, False if not.
+        LP mode                    |BOOLEAN        |low power mode status,
+                                   |               |True in lp mode, False if not.
+        TX disable                 |BOOLEAN        |TX disable status,
+                                   |               |True TX disabled, False if not.
+        TX disabled channel        |HEX            |disabled TX channles in hex,
+                                   |               |bits 0 to 3 represent channel 0
+                                   |               |to channel 3.
+        Temperature                |INT            |module temperature in Celsius
+        Voltage                    |INT            |supply voltage in mV
+        TX bias                    |INT            |TX Bias Current in mA
+        RX power                   |INT            |received optical power in mW
+        TX power                   |INT            |TX output power in mW
+        ========================================================================
+        """
+        transceiver_dom_info_dict = {}
+
+        dom_info_dict_keys = ['temperature',    'voltage',
+                              'rx1power',       'rx2power',
+                              'rx3power',       'rx4power',
+                              'rx5power',       'rx6power',
+                              'rx7power',       'rx8power',
+                              'tx1bias',        'tx2bias',
+                              'tx3bias',        'tx4bias',
+                              'tx5bias',        'tx6bias',
+                              'tx7bias',        'tx8bias',
+                              'tx1power',       'tx2power',
+                              'tx3power',       'tx4power',
+                              'tx5power',       'tx6power',
+                              'tx7power',       'tx8power'
+                             ]
+        transceiver_dom_info_dict = dict.fromkeys(dom_info_dict_keys, 'N/A')
+
+        if not self.get_presence():
+            return {}
+
+        self._dom_capability_detect()
+
+        if self.sfp_type == OSFP_TYPE:
+            pass
+
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self._read_eeprom_specific_bytes((offset + QSFP_DOM_BULK_DATA_START), QSFP_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_TEMPE_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_data_raw[start : end], 0)
+                temp = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_VOLT_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_data_raw[start : end], 0)
+                volt = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            start = QSFP_CHANNL_MON_OFFSET - QSFP_DOM_BULK_DATA_START
+            end = start + QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_data_raw[start : end], 0)
+
+            if self.dom_tx_power_supported:
+                transceiver_dom_info_dict['tx1power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TX1Power']['value'])
+                transceiver_dom_info_dict['tx2power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TX2Power']['value'])
+                transceiver_dom_info_dict['tx3power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TX3Power']['value'])
+                transceiver_dom_info_dict['tx4power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TX4Power']['value'])
+
+            if self.dom_rx_power_supported:
+                transceiver_dom_info_dict['rx1power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['RX1Power']['value'])
+                transceiver_dom_info_dict['rx2power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['RX2Power']['value'])
+                transceiver_dom_info_dict['rx3power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['RX3Power']['value'])
+                transceiver_dom_info_dict['rx4power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['RX4Power']['value'])
+
+            transceiver_dom_info_dict['tx1bias'] = dom_channel_monitor_data['data']['TX1Bias']['value']
+            transceiver_dom_info_dict['tx2bias'] = dom_channel_monitor_data['data']['TX2Bias']['value']
+            transceiver_dom_info_dict['tx3bias'] = dom_channel_monitor_data['data']['TX3Bias']['value']
+            transceiver_dom_info_dict['tx4bias'] = dom_channel_monitor_data['data']['TX4Bias']['value']
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+
+            offset = 0
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_DOM_BULK_DATA_START), QSFP_DD_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_DD_TEMPE_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_data_raw[start : end], 0)
+                temp = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_DD_VOLT_OFFSET - QSFP_DD_DOM_BULK_DATA_START
+                end = start + QSFP_DD_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_data_raw[start : end], 0)
+                volt = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            if self.dom_rx_tx_power_bias_supported:
+                # page 11h
+                offset = 512
+                dom_data_raw = self._read_eeprom_specific_bytes(offset + QSFP_DD_CHANNL_MON_OFFSET, QSFP_DD_CHANNL_MON_WIDTH)
+                if dom_data_raw is None:
+                    return transceiver_dom_info_dict
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_data_raw, 0)
+
+                if self.dom_tx_power_supported:
+                    transceiver_dom_info_dict['tx1power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX1Power']['value']))
+                    transceiver_dom_info_dict['tx2power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX2Power']['value']))
+                    transceiver_dom_info_dict['tx3power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX3Power']['value']))
+                    transceiver_dom_info_dict['tx4power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX4Power']['value']))
+                    transceiver_dom_info_dict['tx5power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX5Power']['value']))
+                    transceiver_dom_info_dict['tx6power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX6Power']['value']))
+                    transceiver_dom_info_dict['tx7power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX7Power']['value']))
+                    transceiver_dom_info_dict['tx8power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['TX8Power']['value']))
+
+                if self.dom_rx_power_supported:
+                    transceiver_dom_info_dict['rx1power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX1Power']['value']))
+                    transceiver_dom_info_dict['rx2power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX2Power']['value']))
+                    transceiver_dom_info_dict['rx3power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX3Power']['value']))
+                    transceiver_dom_info_dict['rx4power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX4Power']['value']))
+                    transceiver_dom_info_dict['rx5power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX5Power']['value']))
+                    transceiver_dom_info_dict['rx6power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX6Power']['value']))
+                    transceiver_dom_info_dict['rx7power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX7Power']['value']))
+                    transceiver_dom_info_dict['rx8power'] = str(self._convert_string_to_num(dom_channel_monitor_data['data']['RX8Power']['value']))
+
+                if self.dom_tx_bias_power_supported:
+                    transceiver_dom_info_dict['tx1bias'] = str(dom_channel_monitor_data['data']['TX1Bias']['value'])
+                    transceiver_dom_info_dict['tx2bias'] = str(dom_channel_monitor_data['data']['TX2Bias']['value'])
+                    transceiver_dom_info_dict['tx3bias'] = str(dom_channel_monitor_data['data']['TX3Bias']['value'])
+                    transceiver_dom_info_dict['tx4bias'] = str(dom_channel_monitor_data['data']['TX4Bias']['value'])
+                    transceiver_dom_info_dict['tx5bias'] = str(dom_channel_monitor_data['data']['TX5Bias']['value'])
+                    transceiver_dom_info_dict['tx6bias'] = str(dom_channel_monitor_data['data']['TX6Bias']['value'])
+                    transceiver_dom_info_dict['tx7bias'] = str(dom_channel_monitor_data['data']['TX7Bias']['value'])
+                    transceiver_dom_info_dict['tx8bias'] = str(dom_channel_monitor_data['data']['TX8Bias']['value'])
+
+            return transceiver_dom_info_dict
+
+        else:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_data_raw = self._read_eeprom_specific_bytes((offset + SFP_DOM_BULK_DATA_START), SFP_DOM_BULK_DATA_SIZE)
+
+            start = SFP_TEMPE_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_TEMPE_WIDTH
+            dom_temperature_data = sfpd_obj.parse_temperature(dom_data_raw[start: end], 0)
+
+            start = SFP_VOLT_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_VOLT_WIDTH
+            dom_voltage_data = sfpd_obj.parse_voltage(dom_data_raw[start: end], 0)
+
+            start = SFP_CHANNL_MON_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_CHANNL_MON_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_data_raw[start: end], 0)
+
+            transceiver_dom_info_dict['temperature'] = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+            transceiver_dom_info_dict['voltage'] = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+            transceiver_dom_info_dict['rx1power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['RXPower']['value'])
+            transceiver_dom_info_dict['tx1bias'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TXBias']['value'])
+            transceiver_dom_info_dict['tx1power'] = self._convert_string_to_num(dom_channel_monitor_data['data']['TXPower']['value'])
+
+        return transceiver_dom_info_dict
+
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+
+        Returns:
+            A dict which contains following keys/values :
+        ========================================================================
+        keys                       |Value Format   |Information
+        ---------------------------|---------------|----------------------------
+        temphighalarm              |FLOAT          |High Alarm Threshold value of temperature in Celsius.
+        templowalarm               |FLOAT          |Low Alarm Threshold value of temperature in Celsius.
+        temphighwarning            |FLOAT          |High Warning Threshold value of temperature in Celsius.
+        templowwarning             |FLOAT          |Low Warning Threshold value of temperature in Celsius.
+        vcchighalarm               |FLOAT          |High Alarm Threshold value of supply voltage in mV.
+        vcclowalarm                |FLOAT          |Low Alarm Threshold value of supply voltage in mV.
+        vcchighwarning             |FLOAT          |High Warning Threshold value of supply voltage in mV.
+        vcclowwarning              |FLOAT          |Low Warning Threshold value of supply voltage in mV.
+        rxpowerhighalarm           |FLOAT          |High Alarm Threshold value of received power in dBm.
+        rxpowerlowalarm            |FLOAT          |Low Alarm Threshold value of received power in dBm.
+        rxpowerhighwarning         |FLOAT          |High Warning Threshold value of received power in dBm.
+        rxpowerlowwarning          |FLOAT          |Low Warning Threshold value of received power in dBm.
+        txpowerhighalarm           |FLOAT          |High Alarm Threshold value of transmit power in dBm.
+        txpowerlowalarm            |FLOAT          |Low Alarm Threshold value of transmit power in dBm.
+        txpowerhighwarning         |FLOAT          |High Warning Threshold value of transmit power in dBm.
+        txpowerlowwarning          |FLOAT          |Low Warning Threshold value of transmit power in dBm.
+        txbiashighalarm            |FLOAT          |High Alarm Threshold value of tx Bias Current in mA.
+        txbiaslowalarm             |FLOAT          |Low Alarm Threshold value of tx Bias Current in mA.
+        txbiashighwarning          |FLOAT          |High Warning Threshold value of tx Bias Current in mA.
+        txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
+        ========================================================================
+        """
+        transceiver_dom_threshold_info_dict = {}
+
+        dom_info_dict_keys = ['temphighalarm',    'temphighwarning',
+                              'templowalarm',     'templowwarning',
+                              'vcchighalarm',     'vcchighwarning',
+                              'vcclowalarm',      'vcclowwarning',
+                              'rxpowerhighalarm', 'rxpowerhighwarning',
+                              'rxpowerlowalarm',  'rxpowerlowwarning',
+                              'txpowerhighalarm', 'txpowerhighwarning',
+                              'txpowerlowalarm',  'txpowerlowwarning',
+                              'txbiashighalarm',  'txbiashighwarning',
+                              'txbiaslowalarm',   'txbiaslowwarning'
+                             ]
+        transceiver_dom_threshold_info_dict = dict.fromkeys(dom_info_dict_keys, 'N/A')
+
+        if self.sfp_type == OSFP_TYPE:
+            pass
+
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported or not self.qsfp_page3_available:
+                return transceiver_dom_threshold_info_dict
+
+            # Dom Threshold data starts from offset 384
+            # Revert offset back to 0 once data is retrieved
+            offset = QSFP_MODULE_UPPER_PAGE3_START
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+
+            dom_channel_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
+                                      QSFP_CHANNL_THRESHOLD_WIDTH)
+            if dom_channel_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+            dom_channel_threshold_data = sfpd_obj.parse_channel_threshold_values(dom_channel_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_channel_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_channel_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_channel_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_channel_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_channel_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_channel_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_channel_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_channel_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_channel_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_channel_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_channel_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_channel_threshold_data['data']['TxPowerLowWarning']['value']
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            if not self.dom_thresholds_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            # page 02
+            offset = 384
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_MODULE_THRESHOLD_OFFSET), QSFP_DD_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(dom_module_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TxPowerLowWarning']['value']
+
+        else:
+            offset = SFP_MODULE_ADDRA2_OFFSET
+
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = sff8472Dom(None, self.calibration)
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
+                                         SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(dom_module_threshold_raw, 0)
+            else:
+                return transceiver_dom_threshold_info_dict
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VoltageHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VoltageLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VoltageHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VoltageLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_module_threshold_data['data']['BiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_module_threshold_data['data']['BiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_module_threshold_data['data']['BiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_module_threshold_data['data']['BiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_module_threshold_data['data']['TXPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_module_threshold_data['data']['TXPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_module_threshold_data['data']['TXPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_module_threshold_data['data']['TXPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_module_threshold_data['data']['RXPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_module_threshold_data['data']['RXPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_module_threshold_data['data']['RXPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
+
+        return transceiver_dom_threshold_info_dict
+
+    def get_reset_status(self):
+        """
+        Retrieves the reset status of SFP
+        Returns:
+            A Boolean, True if reset enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            return False
+        elif self.sfp_type == OSFP_TYPE or self.sfp_type == QSFP_DD_TYPE:
+            try:
+                reg_file = open(self.reset_path)
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return None
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+
+        Returns:
+            A Boolean, True if SFP has RX LOS, False if not.
+            Note : RX LOS status is latched until a call to get_rx_los or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        rx_los_list = []
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 512
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    rx_los_data = int(dom_channel_monitor_raw[0], 8)
+                    rx_los_list.append(rx_los_data & 0x01 != 0)
+                    rx_los_list.append(rx_los_data & 0x02 != 0)
+                    rx_los_list.append(rx_los_data & 0x04 != 0)
+                    rx_los_list.append(rx_los_data & 0x08 != 0)
+                    rx_los_list.append(rx_los_data & 0x10 != 0)
+                    rx_los_list.append(rx_los_data & 0x20 != 0)
+                    rx_los_list.append(rx_los_data & 0x40 != 0)
+                    rx_los_list.append(rx_los_data & 0x80 != 0)
+
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+            else:
+                return None
+        return rx_los_list
+
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+
+        Returns:
+            A Boolean, True if SFP has TX fault, False if not
+            Note : TX fault status is lached until a call to get_tx_fault or a reset.
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_fault_list = []
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            return None
+            # page 11h
+            #if self.dom_rx_tx_power_bias_supported:
+            #    offset = 512
+            #    dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH)
+            #    if dom_channel_monitor_raw is not None:
+            #        tx_fault_data = int(dom_channel_monitor_raw[0], 8)
+            #        tx_fault_list.append(tx_fault_data & 0x01 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x02 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x08 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x10 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x20 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x40 != 0)
+            #        tx_fault_list.append(tx_fault_data & 0x80 != 0)
+
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+            else:
+                return None
+        return tx_fault_list
+
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+
+        Returns:
+            A Boolean, True if tx_disable is enabled, False if disabled
+
+        for QSFP, the disable states of each channel which are the lower 4 bits in byte 85 page a0
+        for SFP, the TX Disable State and Soft TX Disable Select is ORed as the tx_disable status returned
+                 These two bits are bit 7 & 6 in byte 110 page a2 respectively
+        """
+        if not self.dom_supported:
+            return None
+
+        tx_disable_list = []
+        if self.sfp_type == OSFP_TYPE:
+            return None
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 128
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET), QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                    tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x08 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x10 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x20 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x40 != 0)
+                    tx_disable_list.append(tx_disable_data & 0x80 != 0)
+
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        return tx_disable_list
+
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        Returns:
+            A hex of 4 bits (bit 0 to bit 3 as channel 0 to channel 3) to represent
+            TX channels which have been disabled in this SFP.
+            As an example, a returned value of 0x5 indicates that channel 0
+            and channel 2 have been disabled.
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return 0
+        elif self.sfp_type == QSFP_TYPE:
+            tx_disable_list = self.get_tx_disable()
+            if tx_disable_list is None:
+                return 0
+            tx_disabled = 0
+            for i in range(len(tx_disable_list)):
+                if tx_disable_list[i]:
+                    tx_disabled |= 1 << i
+        else:
+            return None
+
+        return tx_disabled
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode (low power mode) status of this QSFP module
+        Returns:
+            A Boolean, True if lpmode is enabled, False if disabled
+        """
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            return False
+        elif self.sfp_type == OSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path)
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+            reg_value = int(reg_file.readline().rstrip())
+            reg_file.close()
+            if reg_value == 0:
+                return False
+            else:
+                return True
+        else:
+            return None
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        Returns:
+            A Boolean, True if power-override is enabled, False if disabled
+        """
+		# SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return False
+
+            dom_control_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_POWEROVERRIDE_OFFSET), QSFP_POWEROVERRIDE_WIDTH)
+            if dom_control_raw is not None:
+                if int(dom_control_raw[0],16) & (0x01 << QSFP_POWEROVERRIDE_BIT):
+                    return True
+                else:
+                    return False
+        else:
+            return None
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+
+        Returns:
+            An integer number of current temperature in Celsius
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes((offset + QSFP_TEMPE_OFFSET), QSFP_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+                else:
+                    return None
+            else:
+                return None
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            offset = 0
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_temp_supported:
+                dom_temperature_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_TEMPE_OFFSET), QSFP_DD_TEMPE_WIDTH)
+                if dom_temperature_raw is not None:
+                    dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                    temp = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+                    return temp
+            return None
+
+        else:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = 1
+
+            dom_temperature_raw = self._read_eeprom_specific_bytes((offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+            if dom_temperature_raw is not None:
+                dom_temperature_data = sfpd_obj.parse_temperature(dom_temperature_raw, 0)
+                temp = self._convert_string_to_num(dom_temperature_data['data']['Temperature']['value'])
+                return temp
+            else:
+                return None
+
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+
+        Returns:
+            An integer number of supply voltage in mV
+        """
+        if not self.dom_supported:
+            return None
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes((offset + QSFP_VOLT_OFFSET), QSFP_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+                else:
+                    return None
+            return None
+
+        if self.sfp_type == QSFP_DD_TYPE:
+            offset = 128
+
+            sfpd_obj = qsfp_dd_Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_volt_supported:
+                dom_voltage_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_VOLT_OFFSET), QSFP_DD_VOLT_WIDTH)
+                if dom_voltage_raw is not None:
+                    dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                    voltage = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+                    return voltage
+            return None
+
+        else:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_voltage_raw = self._read_eeprom_specific_bytes((offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
+            if dom_voltage_raw is not None:
+                dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
+                voltage = self._convert_string_to_num(dom_voltage_data['data']['Vcc']['value'])
+                return voltage
+            else:
+                return None
+
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+
+        Returns:
+            A list of four integer numbers, representing TX bias in mA
+            for channel 0 to channel 4.
+            Ex. ['110.09', '111.12', '108.21', '112.09']
+        """
+        tx_bias_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX4Bias']['value']))
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11h
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 512
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return None
+
+                if self.dom_tx_bias_power_supported:
+                    dom_tx_bias_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_TX_BIAS_OFFSET), QSFP_DD_TX_BIAS_WIDTH)
+                    if dom_tx_bias_raw is not None:
+                        dom_tx_bias_data = sfpd_obj.parse_dom_tx_bias(dom_tx_bias_raw, 0)
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX1Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX2Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX3Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX4Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX5Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX6Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX7Bias']['value']))
+                        tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX8Bias']['value']))
+
+        else:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TXBias']['value']))
+                else:
+                    return None
+            else:
+                return None
+
+        return tx_bias_list
+
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+
+        Returns:
+            A list of four integer numbers, representing received optical
+            power in mW for channel 0 to channel 4.
+            Ex. ['1.77', '1.71', '1.68', '1.70']
+        """
+        rx_power_list = []
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return None
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['RX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            # page 11
+            if self.dom_rx_tx_power_bias_supported:
+                offset = 512
+                sfpd_obj = qsfp_dd_Dom()
+                if sfpd_obj is None:
+                    return None
+
+                if self.dom_rx_power_supported:
+                    dom_rx_power_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_RX_POWER_OFFSET), QSFP_DD_RX_POWER_WIDTH)
+                    if dom_rx_power_raw is not None:
+                        dom_rx_power_data = sfpd_obj.parse_dom_rx_power(dom_rx_power_raw, 0)
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX1Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX2Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX3Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX4Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX5Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX6Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX7Power']['value']))
+                        rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX8Power']['value']))
+
+        else:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['RXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        return rx_power_list
+
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+
+        Returns:
+            A list of four integer numbers, representing TX power in mW
+            for channel 0 to channel 4.
+            Ex. ['1.86', '1.86', '1.86', '1.86']
+        """
+        tx_power_list = []
+        if self.sfp_type == OSFP_TYPE:
+            # OSFP not supported on our platform yet.
+            return None
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TX4Power']['value']))
+                else:
+                    return None
+            else:
+                return None
+
+        elif self.sfp_type == QSFP_DD_TYPE:
+            return None
+            # page 11
+            #if self.dom_rx_tx_power_bias_supported:
+            #    offset = 512
+            #    sfpd_obj = qsfp_dd_Dom()
+            #    if sfpd_obj is None:
+            #        return None
+            #
+            #    if self.dom_tx_power_supported:
+            #        dom_tx_power_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_TX_POWER_OFFSET), QSFP_DD_TX_POWER_WIDTH)
+            #        if dom_tx_power_raw is not None:
+            #            dom_tx_power_data = sfpd_obj.parse_dom_tx_power(dom_tx_power_raw, 0)
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX1Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX2Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX3Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX4Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX5Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX6Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX7Power']['value']))
+            #            tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX8Power']['value']))
+
+        else:
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(dom_channel_monitor_data['data']['TXPower']['value']))
+                else:
+                    return None
+            else:
+                return None
+        return tx_power_list
+
+
+    def reset(self):
+        """
+        Reset SFP and return all user module settings to their default state.
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            return False
+        elif self.sfp_type == OSFP_TYPE:
+            try:
+                reg_file = open(self.reset_path, "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 0
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+
+            # Sleep 2 second to allow it to settle
+            time.sleep(2)
+
+            # Flip the value back write back to the register to take port out of reset
+            try:
+                reg_file = open(self.reset_path, "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            reg_value = 1
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        Args:
+            tx_disable : A Boolean, True to enable tx_disable mode, False to disable
+                         tx_disable mode.
+        Returns:
+            A boolean, True if tx_disable is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            if self.dom_tx_disable_supported:
+                offset = 256
+                sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+                status_control_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+                if status_control_raw is not None:
+                    # Set bit 6 for Soft TX Disable Select
+                    # 01000000 = 64 and 10111111 = 191
+                    tx_disable_bit = 64 if tx_disable else 191
+                    status_control = int(status_control_raw[0], 16)
+                    tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                        status_control & tx_disable_bit)
+                    try:
+                        sysfsfile_eeprom = open(
+                            sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                        buffer = create_string_buffer(1)
+                        buffer[0] = chr(tx_disable_ctl)
+                        # Write to eeprom
+                        sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                        sysfsfile_eeprom.write(buffer[0])
+                    except IOError as e:
+                        print("Error: unable to open file: %s" % str(e))
+                        return False
+                    finally:
+                        if sysfsfile_eeprom:
+                            sysfsfile_eeprom.close()
+                            time.sleep(0.01)
+                    return True
+                return False
+            else:
+                return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                channel_mask = 0x0f
+                if tx_disable:
+                    return self.tx_disable_channel(channel_mask, True)
+                else:
+                    return self.tx_disable_channel(channel_mask, False)
+            else:
+                return False
+        else:
+            return None
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        Args:
+            channel : A hex of 4 bits (bit 0 to bit 3) which represent channel 0 to 3,
+                      e.g. 0x5 for channel 0 and channel 2.
+            disable : A boolean, True to disable TX channels specified in channel,
+                      False to enable
+        Returns:
+            A boolean, True if successful, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            if self.dom_tx_disable_supported:
+                sysfsfile_eeprom = None
+                try:
+                    channel_state = self.get_tx_disable_channel()
+                    if disable:
+                        tx_disable_ctl = channel_state | channel
+                    else:
+                        tx_disable_ctl = channel_state & (~channel)
+                    buffer = create_string_buffer(1)
+                    buffer[0] = chr(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom = open(
+                        self.port_to_eeprom_mapping[self.port_num], "r+b")
+                    sysfsfile_eeprom.seek(QSFP_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(buffer[0])
+                except IOError as e:
+                    print ("Error: unable to open file: %s" % str(e))
+                    return False
+                finally:
+                    if sysfsfile_eeprom is not None:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
+            else:
+                return False
+        else:
+            return None
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode (low power mode) of SFP
+        Args:
+            lpmode: A Boolean, True to enable lpmode, False to disable it
+            Note  : lpmode can be overridden by set_power_override
+        Returns:
+            A boolean, True if lpmode is set successfully, False if not
+        """
+        if not self.get_presence():
+            return False
+        # SFP doesn't support this feature
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            return False
+        elif self.sfp_type == OSFP_TYPE:
+            try:
+                reg_file = open(self.lpmode_path, "r+")
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode:
+                reg_value = 1
+            else:
+                reg_value = 0
+
+            reg_file.write(hex(reg_value))
+            reg_file.close()
+        else:
+            return None
+
+        return True
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        Args:
+            power_override :
+                    A Boolean, True to override set_lpmode and use power_set
+                    to control SFP power, False to disable SFP power control
+                    through power_override/power_set and use set_lpmode
+                    to control SFP power.
+            power_set :
+                    Only valid when power_override is True.
+                    A Boolean, True to set SFP to low power mode, False to set
+                    SFP to high power mode.
+        Returns:
+            A boolean, True if power-override and power_set are set successfully,
+            False if not
+        """
+        # SFP doesn't support this feature
+        if not self.get_presence():
+            return False
+
+        if self.sfp_type == SFP_TYPE:
+            return False
+        elif self.sfp_type == QSFP_TYPE:
+            try:
+                power_override_bit = 0
+                if power_override:
+                    power_override_bit |= 1 << 0
+
+                power_set_bit = 0
+                if power_set:
+                    power_set_bit |= 1 << 1
+
+                buffer = create_string_buffer(1)
+                buffer[0] = chr(power_override_bit | power_set_bit)
+                # Write to eeprom
+                sysfsfile_eeprom = open(self.port_to_eeprom_mapping[self.port_num], "r+b")
+                sysfsfile_eeprom.seek(QSFP_POWEROVERRIDE_OFFSET)
+                sysfsfile_eeprom.write(buffer[0])
+            except IOError as e:
+                print ("Error: unable to open file: %s" % str(e))
+                return False
+            finally:
+                if sysfsfile_eeprom is not None:
+                    sysfsfile_eeprom.close()
+                    time.sleep(0.01)
+        else:
+            return None
+
+        return True
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+            Returns:
+            string: The name of the device
+        """
+        sfputil_helper = SfpUtilHelper()
+        sfputil_helper.read_porttab_mappings(self.__get_path_to_port_config_file())
+        print ("self.index{}".format(self.index))
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
+        return name
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/thermal.py
new file mode 100644
index 000000000000..5fb209749223
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/thermal.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Quanta
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermal information
+#
+#############################################################################
+
+import logging
+import os
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+HWMON_DIR = "/sys/class/hwmon/hwmon2/"
+
+thermal_index_mapping = {
+    1:40,
+    2:41,
+    3:42,
+    4:50,
+    5:51,
+    6:52,
+    7:73,
+    8:74,
+    9:75,
+   10:76,
+   11:77,
+   12:78,
+   13:79,
+   14:80,
+   15:81,
+   16:82,
+   17:83,
+   18:84,
+   19:85
+}
+
+class Thermal(ThermalBase):
+    """Platform-specific Thermal class"""
+
+    def __init__(self, thermal_index):
+        self.index        = thermal_index
+        self.temp_attr    = "temp{}_input".format(thermal_index_mapping[self.index])
+        self.high_th_attr = "temp{}_ncrit".format(thermal_index_mapping[self.index])
+        self.high_crit_th_attr = "temp{}_crit".format(thermal_index_mapping[self.index])
+        self.name_attr    = "temp{}_label".format(thermal_index_mapping[self.index])
+
+
+    def __get_attr_value(self, attr_path):
+
+        retval = 'ERR'
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open " + attr_path + " file !")
+
+        retval = retval.rstrip(' \t\n\r')
+        return retval
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return attr_rv
+        else:
+            return None
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+
+        Returns:
+            bool: True if device is present, False if not
+        """
+        attr_path = HWMON_DIR + self.name_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return True
+        else:
+            return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        if (self.get_temperature() != None):
+            return True
+        else:
+            return False
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        attr_path = HWMON_DIR + self.high_crit_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/watchdog.py
new file mode 100644
index 000000000000..282f356f4e73
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform/watchdog.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+
+#############################################################################
+# 
+# Watchdog contains an implementation of SONiC Platform Base Watchdog API
+#
+#############################################################################
+import fcntl
+import os
+import array
+
+try:
+    from sonic_platform_base.watchdog_base import WatchdogBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+""" ioctl constants """
+IO_WRITE = 0x40000000
+IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
+IO_SIZE_INT = 0x00040000
+IO_SIZE_40 = 0x00280000
+IO_TYPE_WATCHDOG = ord('W') << 8
+
+WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDR_40 = IO_READ | IO_SIZE_40 | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
+
+""" Watchdog ioctl commands """
+WDIOC_GETSUPPORT = 0 | WDR_40
+WDIOC_GETSTATUS = 1 | WDR_INT
+WDIOC_GETBOOTSTATUS = 2 | WDR_INT
+WDIOC_GETTEMP = 3 | WDR_INT
+WDIOC_SETOPTIONS = 4 | WDR_INT
+WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
+WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
+
+""" Watchdog status constants """
+WDIOS_DISABLECARD = 0x0001
+WDIOS_ENABLECARD = 0x0002
+
+WDT_COMMON_ERROR = -1
+WD_MAIN_IDENTITY = "iTCO_wdt"
+WDT_SYSFS_PATH = "/sys/class/watchdog/"
+
+DEFAULT_TIMEOUT=180
+
+class Watchdog(WatchdogBase):
+
+    def __init__(self):
+
+        self.watchdog, self.wdt_main_dev_name = self._get_wdt()
+        self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
+        self.state_path = "/sys/class/watchdog/%s/state" % self.wdt_main_dev_name
+        self.timeout_path = "/sys/class/watchdog/%s/timeout" % self.wdt_main_dev_name
+        # Set default value
+        self._disable()
+        self.armed = False
+        self.timeout = DEFAULT_TIMEOUT
+
+    def _is_wd_main(self, dev):
+        """
+        Checks watchdog identity
+        """
+        identity = self._read_file(
+            "{}/{}/identity".format(WDT_SYSFS_PATH, dev))
+        return identity == WD_MAIN_IDENTITY
+
+    def _get_wdt(self):
+        """
+        Retrieves watchdog device
+        """
+        wdt_main_dev_list = [dev for dev in os.listdir(
+            "/dev/") if dev.startswith("watchdog") and self._is_wd_main(dev)]
+        if not wdt_main_dev_list:
+            return None
+        wdt_main_dev_name = wdt_main_dev_list[0]
+        watchdog_device_path = "/dev/{}".format(wdt_main_dev_name)
+        self.watchdog = os.open(watchdog_device_path, os.O_RDWR)
+        return self.watchdog, wdt_main_dev_name
+
+    def _read_file(self, file_path):
+        """
+        Read text file
+        """
+        try:
+            with open(file_path, "r") as fd:
+                txt = fd.read()
+        except IOError:
+            return WDT_COMMON_ERROR
+        return txt.strip()
+
+    def _enable(self):
+        """
+        Turn on the watchdog timer
+        """
+        req = array.array('h', [WDIOS_ENABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _disable(self):
+        """
+        Turn off the watchdog timer
+        """
+        req = array.array('h', [WDIOS_DISABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _keepalive(self):
+        """
+        Keep alive watchdog timer
+        """
+        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
+        """
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
+        """
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+        return int(req[0])
+
+    def _gettimeout(self, timeout_path):
+        """
+        Get watchdog timeout
+        @return watchdog timeout
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
+    #################################################################
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog with a timeout of <seconds> seconds.
+        If the watchdog is currently armed, calling this function will
+        simply reset the timer to the provided value. If the underlying
+        hardware does not support the value provided in <seconds>, this
+        method should arm the watchdog with the *next greater* available
+        value.
+        Returns:
+            An integer specifying the *actual* number of seconds the watchdog
+            was armed with. On failure returns -1.
+        """
+
+        ret = WDT_COMMON_ERROR
+        if seconds < 0:
+            return ret
+
+        try:
+            if self.timeout != seconds:
+                self.timeout = self._settimeout(seconds)
+            if self.armed:
+                self._keepalive()
+            else:
+                self._settimeout(seconds)
+                self._enable()
+                self.armed = True
+            ret = self.timeout
+        except IOError as e:
+            pass
+
+        return ret
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False if not
+        """
+        disarmed = False
+        if self.is_armed():
+            try:
+                self._disable()
+                self.armed = False
+                disarmed = True
+            except IOError:
+                pass
+
+        return disarmed
+
+    def is_armed(self):
+        """
+        Retrieves the armed state of the hardware watchdog.
+        Returns:
+            A boolean, True if watchdog is armed, False if not
+        """
+
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        If the watchdog is armed, retrieve the number of seconds remaining on
+        the watchdog timer
+        Returns:
+            An integer specifying the number of seconds remaining on thei
+            watchdog timer. If the watchdog is not armed, returns -1.
+        """
+
+        timeleft = WDT_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft
+
+    def __del__(self):
+        """
+        Close watchdog
+        """
+
+        os.close(self.watchdog)
+
+
+
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform_setup.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform_setup.py
new file mode 100644
index 000000000000..b1ba37477628
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/sonic_platform_setup.py
@@ -0,0 +1,24 @@
+import os
+from setuptools import setup
+os.listdir
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on Quanta Platforms',
+    license='Apache 2.0',
+    packages=['sonic_platform'],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
diff --git a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/utils/quanta_ix9_util.py b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/utils/quanta_ix9_util.py
index 4c31aa8584b8..0554ccbf1b71 100755
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/utils/quanta_ix9_util.py
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/utils/quanta_ix9_util.py
@@ -31,9 +31,6 @@
 import commands
 import sys, getopt
 import logging
-import re
-import time
-from collections import namedtuple
 
 DEBUG = False
 args = []
@@ -123,46 +120,87 @@ def exec_cmd(cmd, show):
 'echo 40 > /sys/class/gpio/export',
 'echo out > /sys/class/gpio/gpio40/direction',
 'echo 1 > /sys/class/gpio/gpio40/value',
+#Set 1 to release reset pins (low active)
+'echo 1 > /sys/class/cpld-qsfpdd/port-1/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-2/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-3/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-4/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-5/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-6/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-7/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-8/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-9/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-10/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-11/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-12/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-13/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-14/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-15/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-16/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-17/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-18/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-19/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-20/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-21/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-22/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-23/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-24/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-25/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-26/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-27/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-28/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-29/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-30/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-31/reset',
+'echo 1 > /sys/class/cpld-qsfpdd/port-32/reset'
 ]
 
 drivers =[
 'lpc_ich',
 'i2c-i801',
 'i2c-dev',
-'i2c-mux-pca954x',
+'i2c-mux-pca954x force_deselect_on_exit=1',
 'gpio-pca953x',
+'optoe',
 'qci_cpld_qsfpdd',
 'qci_cpld_led',
 'qci_platform_ix9',
+'quanta_hwmon_ipmi',
 'ipmi_devintf'
 ]
 
-
+un_drivers =[
+'lpc_ich',
+'i2c-i801',
+'i2c-dev',
+'i2c-mux-pca954x',
+'gpio-pca953x',
+'optoe',
+'qci_cpld_qsfpdd',
+'qci_cpld_led',
+'qci_platform_ix9',
+'quanta_hwmon_ipmi',
+'ipmi_devintf'
+]
 
 def system_install():
     global FORCE
 
-    #remove default drivers to avoid modprobe order conflicts
-    status, output = exec_cmd("rmmod i2c_ismt ", 1)
-    status, output = exec_cmd("rmmod i2c-i801 ", 1)
     #setup driver dependency
-    status, output = exec_cmd("depmod -a ", 1)
+    exec_cmd("depmod -a ", 1)
     #install drivers
     for i in range(0,len(drivers)):
-       status, output = exec_cmd("modprobe "+drivers[i], 1)
+       status, output = exec_cmd("modprobe " + drivers[i], 1)
     if status:
        print output
        if FORCE == 0:
           return status
 
-    #remove net rules for generating new net rules
-    status, output = exec_cmd("systemctl stop systemd-udevd.service ", 1)
-    status, output = exec_cmd("rm /etc/udev/rules.d/70-persistent-net.rules ", 1)
-    status, output = exec_cmd("rmmod ixgbe ", 1)
-    status, output = exec_cmd("rmmod igb ", 1)
-    status, output = exec_cmd("modprobe igb ", 1)
-    status, output = exec_cmd("modprobe ixgbe ", 1)
-    status, output = exec_cmd("systemctl start systemd-udevd.service ", 1)
+    #reload ethernet drivers in correct order
+    exec_cmd("rmmod ixgbe ", 1)
+    exec_cmd("rmmod igb ", 1)
+    exec_cmd("modprobe igb ", 1)
+    exec_cmd("modprobe ixgbe ", 1)
 
     #instantiate devices
     for i in range(0,len(instantiate)):
@@ -174,7 +212,7 @@ def system_install():
 
     #QSFPDD for 1~32 port
     for port_number in range(1,33):
-        bus_number = port_number + 31
+        bus_number = port_number + 12
         os.system("echo %d >/sys/bus/i2c/devices/%d-0050/port_name" % (port_number, bus_number))
 
     return
@@ -191,6 +229,11 @@ def install():
         if status:
             if FORCE == 0:
                 return  status
+        status, output = exec_cmd("pip3 install  /usr/share/sonic/device/x86_64-quanta_ix9_bwde-r0/sonic_platform-1.0-py3-none-any.whl",1)
+        if status:
+               print output
+               if FORCE == 0:
+                  return status
     else:
         print " ix9 driver already installed...."
     return
@@ -198,20 +241,29 @@ def install():
 def uninstall():
     global FORCE
     #uninstall drivers
-    for i in range(len(drivers)-1,-1,-1):
-       status, output = exec_cmd("rmmod "+drivers[i], 1)
+    for i in range(len(un_drivers) - 1, -1, -1):
+       status, output = exec_cmd("rmmod " + un_drivers[i], 1)
     if status:
 	   print output
 	   if FORCE == 0:
 	      return status
+
+    status, output = exec_cmd("pip3 uninstall  sonic-platform -y ",1)
+    if status:
+	   print output
+	   if FORCE == 0:
+	      return status
+
     return
 
 def device_found():
-    ret1, log = exec_cmd("ls "+i2c_prefix+"i2c-0", 0)
-    return ret1
+    ret1, log1 = exec_cmd("cat /proc/modules | grep ix9 > /tmp/chkdriver.log", 0)
+    ret2, log2 = exec_cmd("cat /tmp/chkdriver.log | grep ix9", 0)
+
+    if ret1 == 0 and len(log2) > 0:
+        return True
+    else:
+        return False
 
 if __name__ == "__main__":
     main()
-
-
-

From 2b645e2782a21623e74eecd9edeef6380d402d1a Mon Sep 17 00:00:00 2001
From: roberthong-qct <79961212+roberthong-qct@users.noreply.github.com>
Date: Thu, 24 Jun 2021 05:52:41 +0800
Subject: [PATCH 0595/1674] [platform][Quanta] Add debian install files for
 sonic_platform-1.0-py3-none-any.whl (#7947)

#### Why I did it
The debian install files are required for installing sonic_platform packages

#### How I did it
Add install files to under debian folder

Co-authored-by: robert.hong <robert.hong@qct.io>
---
 .../debian/sonic-platform-quanta-ix7-32x.install                 | 1 +
 .../debian/sonic-platform-quanta-ix7-bwde-32x.install            | 1 +
 .../debian/sonic-platform-quanta-ix8-56x.install                 | 1 +
 .../debian/sonic-platform-quanta-ix8a-bwde-56x.install           | 1 +
 .../debian/sonic-platform-quanta-ix8c-56x.install                | 1 +
 .../debian/sonic-platform-quanta-ix9-32x.install                 | 1 +
 6 files changed, 6 insertions(+)
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-32x.install
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-bwde-32x.install
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8-56x.install
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8a-bwde-56x.install
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8c-56x.install
 create mode 100644 platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix9-32x.install

diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-32x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-32x.install
new file mode 100644
index 000000000000..963de8a12252
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-32x.install
@@ -0,0 +1 @@
+ix7-32x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix7_rglbmc-r0
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-bwde-32x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-bwde-32x.install
new file mode 100644
index 000000000000..866d77a44ff5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix7-bwde-32x.install
@@ -0,0 +1 @@
+ix7-bwde-32x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix7_bwde-r0
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8-56x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8-56x.install
new file mode 100644
index 000000000000..5984981414b5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8-56x.install
@@ -0,0 +1 @@
+ix8-56x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix8_rglbmc-r0
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8a-bwde-56x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8a-bwde-56x.install
new file mode 100644
index 000000000000..02c2aba9a95a
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8a-bwde-56x.install
@@ -0,0 +1 @@
+ix8a-bwde-56x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix8a_bwde-r0
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8c-56x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8c-56x.install
new file mode 100644
index 000000000000..e1a2dbe98a9e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix8c-56x.install
@@ -0,0 +1 @@
+ix8c-56x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix8c_bwde-r0
diff --git a/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix9-32x.install b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix9-32x.install
new file mode 100644
index 000000000000..e1131c68c651
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-quanta/debian/sonic-platform-quanta-ix9-32x.install
@@ -0,0 +1 @@
+ix9-32x/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-quanta_ix9_bwde-r0

From c3018773d79e1320c82081ddaf4082c09f1c19b8 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 28 Jun 2021 09:57:08 +0800
Subject: [PATCH 0596/1674] Fix vtysh shell-ingestion security issue (#7759)

Fix vtysh shell-ingestion security issue
Only expose the limited parameters of the command vtysh show.
---
 files/image_config/sudoers/sudoers | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 041290151a98..42dd6d5ec751 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -31,8 +31,10 @@ Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
                                  /usr/bin/sensors, \
                                  /usr/bin/tail -F /var/log/syslog, \
                                  /usr/bin/rvtysh *, \
-                                 /usr/bin/vtysh -c show *, \
-                                 /usr/bin/vtysh -n [0-9] -c show *, \
+                                 /usr/bin/vtysh -c show version, \
+                                 /usr/bin/vtysh -c show bgp ipv[46] summary json, \
+                                 /usr/bin/vtysh -n [0-9] -c show version, \
+                                 /usr/bin/vtysh -n [0-9] -c show bgp ipv[46] summary json, \
                                  /usr/local/bin/decode-syseeprom, \
                                  /usr/local/bin/generate_dump, \
                                  /usr/local/bin/ipintutil, \

From 1d3e7ab16139f8cd0d89358f84a81d15b0bc39ea Mon Sep 17 00:00:00 2001
From: "thomas.cappleman@metaswitch.com" <thomas.cappleman@metaswitch.com>
Date: Tue, 29 Jun 2021 01:15:03 +0100
Subject: [PATCH 0597/1674] [build]: Fix sonic-cfggen contextlib err (#7996)

A recent version of contextlib2 (https://pypi.org/project/contextlib2/21.6.0/#history) has broken Python2 compatibility,
so the version picked up by netaddr when using Python2 must be specified, or else builds fail

Co-authored-by: Tom Zhu <tom.zhu@metaswitch.com>
---
 dockers/docker-sonic-mgmt/Dockerfile.j2 | 1 +
 src/sonic-config-engine/setup.py        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index b6abdb8d9363..fa965ef67c22 100644
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -35,6 +35,7 @@ RUN apt-get update && apt-get install -y build-essential \
 
 RUN pip install cffi==1.10.0 \
                 "cryptography>=2.5" \
+                contextlib2==0.6.0.post1 \
                 "future>=0.16.0" \
                 gitpython \
                 ipaddr \
diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index 3df049a3657f..9b4f2cb51160 100644
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -31,7 +31,8 @@
         'Jinja2<3.0.0',
         'pyangbind==0.6.0',
         'zipp==1.2.0',  # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
-        'importlib-resources==3.3.1'  # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2
+        'importlib-resources==3.3.1',  # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2
+        'contextlib2==0.6.0.post1'
     ]
 
 

From ec26b4b0bb8f2038026032b2174514f78ba211aa Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Mon, 28 Jun 2021 09:15:29 -0700
Subject: [PATCH 0598/1674] DellEMC: Enable Z9332f LED firmware (#7964)

#### Why I did it
Front end LED fw is not loaded in DellEMC Z9332f.

#### How I did it
Enabled LED fw files
---
 .../DellEMC-Z9332f-C32/sai_preinit_cmd.soc                   | 1 -
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm         | 3 +--
 .../DellEMC-Z9332f-M-O16C64/sai_preinit_cmd.soc              | 5 ++---
 .../th3-z9332f-16x400G-64x100G.config.bcm                    | 3 +--
 .../DellEMC-Z9332f-O32/sai_preinit_cmd.soc                   | 5 ++---
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm         | 3 +--
 device/dell/x86_64-dellemc_z9332f_d1508-r0/led_proc_init.soc | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/sai_preinit_cmd.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/sai_preinit_cmd.soc
index 920cd33016b4..4d62900f898f 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/sai_preinit_cmd.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/sai_preinit_cmd.soc
@@ -1,3 +1,2 @@
-#Not supported in current SAI version
 m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
 m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index 67a24de577d4..c9e8698436de 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -514,6 +514,5 @@ serdes_lane_config_media_type_27=copper
 serdes_lane_config_media_type_28=copper
 serdes_lane_config_media_type_24=copper
 
-#sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
+sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
-
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_preinit_cmd.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_preinit_cmd.soc
index e48c05b9f664..4d62900f898f 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_preinit_cmd.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_preinit_cmd.soc
@@ -1,3 +1,2 @@
-#Not supported Until SAI 3.6
-#m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
-#m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
+m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
+m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index e450564d17a2..caab3df1ef78 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -577,6 +577,5 @@ serdes_lane_config_media_type_27=copper
 serdes_lane_config_media_type_28=copper
 serdes_lane_config_media_type_24=copper
 
-#sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
+sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
-
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/sai_preinit_cmd.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/sai_preinit_cmd.soc
index e48c05b9f664..4d62900f898f 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/sai_preinit_cmd.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/sai_preinit_cmd.soc
@@ -1,3 +1,2 @@
-#Not supported Until SAI 3.6
-#m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
-#m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
+m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
+m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index cf584cee0b14..1376e610b220 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -517,6 +517,5 @@ serdes_lane_config_media_type_27=copper
 serdes_lane_config_media_type_28=copper
 serdes_lane_config_media_type_24=copper
 
-#sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
+sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
-
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/led_proc_init.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/led_proc_init.soc
index 0c116f35f80b..5bea525f9494 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/led_proc_init.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/led_proc_init.soc
@@ -4,4 +4,4 @@
 #Led0
 #Support only after SAI 3.6
 #led auto on
-#led start
+led start

From b7344e8ac33b29449ad15fcadd40a79019d7966f Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Mon, 28 Jun 2021 09:30:53 -0700
Subject: [PATCH 0599/1674] [sonic-py-common] Clear environment variables
 before running device_info tests (#7273)

#### Why I did it

To ensure any environment variables which are configured in the build/test environment do not influence the behavior of sonic-py-common during unit tests. For example, variables which might be set by continuous integration pipelines.

#### How I did it

Add class-scoped pytest fixture to `TestDeviceInfo` class which stashes the current environment variables, clears them and yields. Once all the test cases in the class finish, the fixture will restore the original environment variables.

Also remove unnecessary unittest-style setup and teardown functions from interface_test.py
---
 src/sonic-py-common/tests/device_info_test.py | 11 ++++++++---
 src/sonic-py-common/tests/interface_test.py   |  8 --------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/sonic-py-common/tests/device_info_test.py b/src/sonic-py-common/tests/device_info_test.py
index f3b14b0a5f13..df94d147aa0d 100644
--- a/src/sonic-py-common/tests/device_info_test.py
+++ b/src/sonic-py-common/tests/device_info_test.py
@@ -9,6 +9,8 @@
     # https://pypi.python.org/pypi/mock
     import mock
 
+import pytest
+
 from sonic_py_common import device_info
 
 
@@ -51,9 +53,12 @@
 
 
 class TestDeviceInfo(object):
-    @classmethod
-    def setup_class(cls):
-        print("SETUP")
+    @pytest.fixture(scope="class", autouse=True)
+    def sanitize_environment(self):
+        # Clear environment variables, in case a variable is set in the test
+        # environment (e.g., PLATFORM) which could modify the behavior of sonic-py-common
+        with mock.patch.dict(os.environ, {}, clear=True):
+            yield
 
     def test_get_machine_info(self):
         with mock.patch("os.path.isfile") as mock_isfile:
diff --git a/src/sonic-py-common/tests/interface_test.py b/src/sonic-py-common/tests/interface_test.py
index bb9047973381..5e5b81b0408f 100644
--- a/src/sonic-py-common/tests/interface_test.py
+++ b/src/sonic-py-common/tests/interface_test.py
@@ -4,10 +4,6 @@
 from sonic_py_common import interface
 
 class TestInterface(object):
-    @classmethod
-    def setup_class(cls):
-        print("SETUP")
-
     def test_get_interface_table_name(self):
         result = interface.get_interface_table_name("Ethernet0")
         assert result == "INTERFACE"
@@ -35,7 +31,3 @@ def test_get_port_table_name(self):
         assert result == "VLAN_INTERFACE"
         result = interface.get_port_table_name("Loopback0")
         assert result == "LOOPBACK_INTERFACE"
-
-    @classmethod
-    def teardown_class(cls):
-        print("TEARDOWN")

From a1268b34f5d9efc85abf38b759abc41d7e91eacb Mon Sep 17 00:00:00 2001
From: arunlk-dell <83708154+arunlk-dell@users.noreply.github.com>
Date: Mon, 28 Jun 2021 22:14:49 +0530
Subject: [PATCH 0600/1674] DellEMC: S5248F - Platform API 2.0 implementation
 (#7930)

#### Why I did it
Support API 2.0 for S5248F platform

#### How I did it
Making changes to S5248F platform specific directory

Co-authored-by: Arun LK <Arun_L_K@dell.com>
---
 .../common/sonic_platform/hwaccess.py         |   17 +
 .../debian/platform-modules-s5248f.install    |    1 +
 .../sonic-platform-modules-dell/debian/rules  |   10 +
 .../s5248f/scripts/s5248f_platform.sh         |   16 +
 .../s5248f/setup.py                           |   30 +
 .../s5248f/sonic_platform/__init__.py         |    3 +
 .../s5248f/sonic_platform/chassis.py          |  388 ++++++
 .../s5248f/sonic_platform/component.py        |  123 ++
 .../s5248f/sonic_platform/eeprom.py           |  133 +++
 .../s5248f/sonic_platform/fan.py              |  185 +++
 .../s5248f/sonic_platform/fan_drawer.py       |   37 +
 .../s5248f/sonic_platform/hwaccess.py         |    1 +
 .../s5248f/sonic_platform/ipmihelper.py       |  269 +++++
 .../sonic_platform/media_settings_plugin.py   |   13 +
 .../s5248f/sonic_platform/platform.py         |   24 +
 .../s5248f/sonic_platform/psu.py              |  230 ++++
 .../s5248f/sonic_platform/sfp.py              | 1050 +++++++++++++++++
 .../s5248f/sonic_platform/thermal.py          |  174 +++
 .../s5248f/sonic_platform/watchdog.py         |  212 ++++
 19 files changed, 2916 insertions(+)
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s5248f/setup.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/__init__.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/component.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/eeprom.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan_drawer.py
 create mode 120000 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/hwaccess.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/media_settings_plugin.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/platform.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/psu.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/sfp.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/thermal.py
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/watchdog.py

diff --git a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
index 567669d36fc0..373f71bdd5bf 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
@@ -19,6 +19,23 @@ def pci_get_value(resource, offset):
         mm.close()
     return val
 
+def pci_mem_write(memmap, offset, data):
+    """ Write PCI device """
+    memmap.seek(offset)
+    memmap.write(struct.pack('I', data))
+
+def pci_set_value(resource, val, offset):
+    """ Set a value to PCI device """
+    with open(resource, 'w+b') as filed:
+        memmap = None
+        try:
+            memmap = mmap.mmap(filed.fileno(), 0)
+            pci_mem_write(memmap, offset, val)
+        except EnvironmentError:
+            pass
+        if memmap is not None:
+            memmap.close()
+
 # Read I2C device
 
 def i2c_get(bus, i2caddr, ofs):
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s5248f.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s5248f.install
index 6e74fbec0ae5..1bf81a9ce2e6 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s5248f.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s5248f.install
@@ -5,6 +5,7 @@ s5248f/scripts/sensors usr/bin
 s5248f/scripts/qsfp_irq_enable.py usr/bin
 s5248f/cfg/s5248f-modules.conf etc/modules-load.d
 s5248f/systemd/platform-modules-s5248f.service etc/systemd/system
+s5248f/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-dellemc_s5248f_c3538-r0
 common/platform_reboot usr/share/sonic/device/x86_64-dellemc_s5248f_c3538-r0
 common/fw-updater usr/local/bin
 common/onie_mode_set usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/rules b/platform/broadcom/sonic-platform-modules-dell/debian/rules
index 2c16f5561f98..520331ed16d3 100755
--- a/platform/broadcom/sonic-platform-modules-dell/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/rules
@@ -45,6 +45,11 @@ override_dh_auto_build:
 			python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
 			python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
 			cd $(MOD_SRC_DIR); \
+		elif [ $$mod = "s5248f" ]; then \
+			cp $(COMMON_DIR)/ipmihelper.py $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
+			cd $(MOD_SRC_DIR)/$${mod}; \
+			python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
+			cd $(MOD_SRC_DIR); \
 		elif [ $$mod = "z9332f" ]; then \
 			cp $(COMMON_DIR)/ipmihelper.py $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
 			cd $(MOD_SRC_DIR)/$${mod}; \
@@ -103,6 +108,11 @@ override_dh_clean:
 			rm -f $(MOD_SRC_DIR)/$${mod}/modules/*.whl; \
 			rm -rf $(MOD_SRC_DIR)/$${mod}/build; \
 			rm -rf $(MOD_SRC_DIR)/$${mod}/build/*.egg-info; \
+		elif [ $$mod = "s5248f" ]; then \
+			rm -f $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
+			rm -f $(MOD_SRC_DIR)/$${mod}/modules/*.whl; \
+			rm -rf $(MOD_SRC_DIR)/$${mod}/build; \
+			rm -rf $(MOD_SRC_DIR)/$${mod}/build/*.egg-info; \
 		elif [ $$mod = "z9332f" ]; then \
 			rm -f $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
 			rm -f $(MOD_SRC_DIR)/$${mod}/modules/*.whl; \
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
index e006e53cfc49..692a6a602b0f 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
@@ -86,6 +86,20 @@ switch_board_modsel() {
 	done
 }
 
+install_python_api_package() {
+    device="/usr/share/sonic/device"
+    platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
+
+    rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
+}
+
+remove_python_api_package() {
+    rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
+    if [ $? -eq 0 ]; then
+        rv=$(pip3 uninstall -y sonic-platform > /dev/null 2>/dev/null)
+    fi
+}
+
 platform_firmware_versions() {
 	FIRMWARE_VERSION_FILE=/var/log/firmware_versions
 	rm -rf ${FIRMWARE_VERSION_FILE}
@@ -146,6 +160,7 @@ if [ "$1" == "init" ]; then
     switch_board_modsel
     switch_board_led_default
     #/usr/bin/qsfp_irq_enable.py
+    install_python_api_package
     platform_firmware_versions
 
 elif [ "$1" == "deinit" ]; then
@@ -153,6 +168,7 @@ elif [ "$1" == "deinit" ]; then
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
 
+    remove_python_api_package
     modprobe -r i2c-mux-pca954x
     modprobe -r i2c-dev
 else
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/setup.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/setup.py
new file mode 100755
index 000000000000..2febedc1801d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/setup.py
@@ -0,0 +1,30 @@
+from setuptools import setup
+
+setup(
+    name='sonic-platform',
+    version='1.0',
+    description='SONiC platform API implementation on DellEmc Platforms',
+    license='Apache 2.0',
+    author='SONiC Team',
+    author_email='linuxnetdev@microsoft.com',
+    url='https://github.com/Azure/sonic-buildimage',
+    maintainer='DellEMC',
+    maintainer_email='dell-sonic@dell.com',
+    packages=[
+        'sonic_platform',
+    ],
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Utilities',
+    ],
+    keywords='sonic SONiC platform PLATFORM',
+)
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/__init__.py
new file mode 100644
index 000000000000..929d4eac3de4
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/__init__.py
@@ -0,0 +1,3 @@
+__all__ = ["platform", "chassis", "sfp", "eeprom", "component", "thermal", "psu", "fan", "fan_drawer", "watchdog"]
+from sonic_platform import *
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
new file mode 100644
index 000000000000..089ef3e0e39d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
@@ -0,0 +1,388 @@
+#!/usr/bin/env python
+
+#############################################################################
+# DELLEMC S5248F
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    import time
+    import sys
+    from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_platform.sfp import Sfp
+    from sonic_platform.eeprom import Eeprom
+    from sonic_platform.component import Component
+    from sonic_platform.psu import Psu
+    from sonic_platform.thermal import Thermal
+    from sonic_platform.watchdog import Watchdog
+    from sonic_platform.fan import Fan
+    from sonic_platform.fan_drawer import FanDrawer
+    from sonic_platform.hwaccess import pci_get_value, pci_set_value
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+MAX_S5248F_COMPONENT = 6 # BIOS,BMC,FPGA,SYSTEM CPLD,2 SLAVE CPLDs
+MAX_S5248F_FANTRAY =4
+MAX_S5248F_FAN = 2
+MAX_S5248F_PSU = 2
+MAX_S5248F_THERMAL = 8
+SYSTEM_LED_REG          = 0x24
+SYSTEM_BEACON_LED_SET   = 0x8
+SYSTEM_BEACON_LED_CLEAR = 0xFFFFFFF7
+
+media_part_num_list = set([ \
+"8T47V","XTY28","MHVPK","GF76J","J6FGD","F1KMV","9DN5J","H4DHD","6MCNV","0WRX0","X7F70","5R2PT","WTRD1","WTRD1","WTRD1","WTRD1","5250G","WTRD1","C5RNH","C5RNH","FTLX8571D3BCL-FC",
+"C5RNH","5250G","N8TDR","7D64H","7D64H","RN84N","RN84N","HMTNW","6K3Y6","6K3Y6","TY5FM","50M0R","PGYJT","WP2PP","85Y13","1HCGH","FP9R1","FYD0M","C6Y7M","C6Y7M","V250M","V250M",
+"5CWK6","5CWK6","53HVN","53HVN","358VV","358VV","MV799","MV799","YJF03","P9GND","T1KCN","1DXKP","MT7R2","K0T7R","W5G04","7TCDN","7TCDN","7TCDN","7TCDN","7TCDN","V3XJK","0MV31",
+"5FVP7","N6KM9","C41MF","77KC3","XW7J0","V4NJV","2XJHY","H93DH","H93DH","F8CG0","F8CG0","F8CG0","119N6","WFMF5","794RX","288F6","1M31V","1M31V","5NP8R","5NP8R","4TC09","4TC09",
+"FC6KV","FC6KV","J90VN","J90VN","05RH0","05RH0","YDN52","0C2YV","YDN52","0C2YV","9JT65","D7M6H","6GW14","FYVFW","0VF5H","P4YPY","P4YPY","TCPM2","TCPM2","JNPF8","JNPF8","27GG5",
+"27GG5","P8T4W","P8T4W","JR54Y","M6N0J","XJYD0","K44H9","035KG","P7C7N","76V43","3CC35","FN4FC","26FN3","YFNDD","YFNDD","7R9N9","035KG","P7C7N","76V43","3CC35","PLRXPLSCS43811",
+"FN4FC","26FN3","YFNDD","YFNDD","7R9N9","G86YJ","V407F","V407F","9KH6T","G86YJ","V407F","9KH6T","2JVDD","D0R73","VXFJY","9X8JP","2JVDD","D0R73","VXFJY","9X8JP","2JVDD","D0R73","VXFJY",
+"9X8JP","GMFC5","GMFC5","GMFC5","D7P80","3MFXG","3MFXG","0GWXJ","THPF3","THPF3","THPF3","THPF3","THPF3","PJ62G","3XCX1","JJYKG","RRRTK","16K56","86JM2","K5R6C","7MG2C","WTPPN","9HTT2",
+"NKM4F","VXGGG","JC9W6","6MR8M","RP3GV","M5PPJ","XKY55","TKCXT","05J8P","5WGKD","XFDRT","NW8DM","YPKH3","5WGKD","XFDRT","NW8DM","YPKH3","71XXK","MVCX6","0XYP6","HPPVW","3GHRT","71XXK",
+"MVCX6","0XYP6","HPPVW","3GHRT","2X5T6","135V2","KD5MV","2X5T6","KD5MV","HHFK0","3YWG7","5CMT2","RCVP5","X5DH4","HHFK0","3YWG7","5CMT2","RCVP5","X5DH4","3YWG7","5CMT2","RCVP5","X5DH4",
+"4WJ41","4WJ41","14NV5","14NV5","14NV5","4WGYD","YKMH7","X7CCC","X7CCC","0X9CT","0CY8V","P7D7R","W4GPP","W4GPP","W4GPP","HHHCHC","07RN7","07RN7","0YR96","0YR96","JCYM9","FTLX8571D3BCL",
+"DDW0X","VPFDJ","229KM","9FC7D","DDW0X","VPFDJ","6FMR5","J7K20","N3K9W","6FMR5","8R4VM","7VN5T","D9YM8","8R4VM","VYXPW","87TPX","WY6FK","VYXPW","87TPX","WY6FK","WG8C4","N8K82","2DV6Y",
+"77C3C","RC0HM","77C3C","RC0HM","JHXTN","3P3PG","92YVM","4VX5M","4VX5M","6RRGD","W4JWV","22V6R","XR11M","9GMDY","JMCWK","TP2F0","6MGDY","78RHK", "C0TP5","0WDNV","FCLF8522P2BTL"\
+])
+
+class Chassis(ChassisBase):
+    """
+    DELLEMC Platform-specific Chassis class
+    """
+
+    REBOOT_CAUSE_PATH = "/host/reboot-cause/platform/reboot_reason"
+    oir_fd = -1
+    epoll = -1
+
+    _global_port_pres_dict = {}
+
+    _port_to_i2c_mapping = {
+                1:  2,
+                2:  3,
+                3:  4,
+                4:  5,
+                5:  6,
+                6:  7,
+                7:  8,
+                8:  9,
+                9:  10, 
+                10: 11, 
+                11: 12,
+                12: 13,
+                13: 14,
+                14: 15,
+                15: 16,
+                16: 17,
+                17: 18,
+                18: 19,
+                19: 20,
+                20: 21,
+                21: 22,
+                22: 23,
+                23: 24,
+                24: 25,
+                25: 26,
+                26: 27,
+                27: 28,
+                28: 29,
+                29: 30,
+                30: 31,
+                31: 32,
+                32: 33,
+                33: 34,
+                34: 35,
+                35: 36,
+                36: 37,
+                37: 38,
+                38: 39,
+                39: 40,
+                40: 41,
+                41: 42,
+                42: 43,
+                43: 44,
+                44: 45,
+                45: 46,
+                46: 47,
+                47: 48,
+                48: 49,
+                # DD + QSFP28 
+                49: 50,
+                50: 50,
+                51: 51,
+                52: 51,
+                53: 52,
+                54: 53,
+                55: 54,
+                56: 55,
+            }
+
+    def __init__(self):
+        ChassisBase.__init__(self)
+        # sfp.py will read eeprom contents and retrive the eeprom data.
+        # We pass the eeprom path from chassis.py
+        self.PORT_START = 1
+        self.PORT_END = 56 
+        self.PORTS_IN_BLOCK = (self.PORT_END + 1)
+        _sfp_port = range(49, self.PORTS_IN_BLOCK)
+        eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
+        for index in range(self.PORT_START, self.PORTS_IN_BLOCK):
+            eeprom_path = eeprom_base.format(self._port_to_i2c_mapping[index])
+            port_type = 'QSFP' if index in _sfp_port else 'SFP'
+            sfp_node = Sfp(index, port_type, eeprom_path)
+            self._sfp_list.append(sfp_node)
+
+        self._eeprom = Eeprom()
+        self._watchdog = Watchdog()
+        self._num_sfps = self.PORT_END
+        self._num_fans = MAX_S5248F_FANTRAY * MAX_S5248F_FAN
+        self._fan_list = [Fan(i, j) for i in range(MAX_S5248F_FANTRAY) \
+                            for j in range(MAX_S5248F_FAN)]
+        for i in range(MAX_S5248F_FANTRAY):
+            fandrawer = FanDrawer(i)
+            self._fan_drawer_list.append(fandrawer)
+            self._fan_list.extend(fandrawer._fan_list)
+
+        self._psu_list = [Psu(i) for i in range(MAX_S5248F_PSU)]
+        self._thermal_list = [Thermal(i) for i in range(MAX_S5248F_THERMAL)]
+        self._component_list = [Component(i) for i in range(MAX_S5248F_COMPONENT)]
+        for port_num in range(self.PORT_START, self.PORTS_IN_BLOCK):
+            # sfp get uses zero-indexing, but port numbers start from 1
+            presence = self.get_sfp(port_num-1).get_presence()
+            self._global_port_pres_dict[port_num] = '1' if presence else '0'
+
+        #self.LOCATOR_LED_ON = self.STATUS_LED_COLOR_BLUE_BLINK
+        #self.LOCATOR_LED_OFF = self.STATUS_LED_COLOR_OFF
+
+    def __del__(self):
+        if self.oir_fd != -1:
+            self.epoll.unregister(self.oir_fd.fileno())
+            self.epoll.close()
+            self.oir_fd.close()
+
+# check for this event change for sfp / do we need to handle timeout/sleep
+
+    def get_change_event(self, timeout=0):
+        """
+        Returns a nested dictionary containing all devices which have
+        experienced a change at chassis level
+        """
+        start_ms = time.time() * 1000
+        port_dict = {}
+        change_dict = {}
+        change_dict['sfp'] = port_dict
+        while True:
+            time.sleep(0.5)
+            for port_num in range(self.PORT_START, (self.PORT_END + 1)):
+                presence = self.get_sfp(port_num-1).get_presence()
+                if(presence and self._global_port_pres_dict[port_num] == '0'):
+                    self._global_port_pres_dict[port_num] = '1'
+                    port_dict[port_num] = '1'
+                elif(not presence and
+                        self._global_port_pres_dict[port_num] == '1'):
+                    self._global_port_pres_dict[port_num] = '0'
+                    port_dict[port_num] = '0'
+
+            if(len(port_dict) > 0):
+                return True, change_dict 
+
+            if timeout:
+                now_ms = time.time() * 1000
+                if (now_ms - start_ms >= timeout):
+                    return True, change_dict 
+
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (0-based) index <index>
+
+        Args:
+            index: An integer, the index (0-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 0.
+                   For example, 0 for Ethernet0, 1 for Ethernet1 and so on.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        sfp = None
+
+        try:
+            # The index will start from 0
+            sfp = self._sfp_list[index-1]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
+                             index, len(self._sfp_list)))
+        return sfp
+
+    def get_name(self):
+        """
+        Retrieves the name of the chassis
+        Returns:
+           string: The name of the chassis
+        """
+        return self._eeprom.modelstr()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the chassis
+        Returns:
+            bool: True if chassis is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the chassis
+        Returns:
+            string: Model/part number of chassis
+        """
+        return self._eeprom.part_number_str()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the chassis (Service tag)
+        Returns:
+            string: Serial number of chassis
+        """
+        return self._eeprom.serial_str()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the chassis
+        Returns:
+            bool: A boolean value, True if chassis is operating properly
+            False if not
+        """
+        return True
+
+    def get_base_mac(self):
+        """
+        Retrieves the base MAC address for the chassis
+        Returns:
+            A string containing the MAC address in the format
+            'XX:XX:XX:XX:XX:XX'
+        """
+        return self._eeprom.base_mac_addr('')
+
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.serial_number_str()
+
+    def get_system_eeprom_info(self):
+        """
+        Retrieves the full content of system EEPROM information for the chassis
+        Returns:
+            A dictionary where keys are the type code defined in
+            OCP ONIE TlvInfo EEPROM format and values are their corresponding
+            values.
+        """
+        return self._eeprom.system_eeprom_info()
+
+    def get_eeprom(self):
+        """
+        Retrieves the Sys Eeprom instance for the chassis.
+        Returns :
+            The instance of the Sys Eeprom
+        """
+        return self._eeprom
+
+    def get_num_fans(self):
+        """
+        Retrives the number of Fans on the chassis.
+        Returns :
+            An integer represents the number of Fans on the chassis.
+        """
+        return self._num_fans 
+
+    def get_num_sfps(self):
+        """
+        Retrives the numnber of Media on the chassis.
+        Returns:
+            An integer represences the number of SFPs on the chassis.
+        """
+        return self._num_sfps
+    def get_reboot_cause(self):
+        """
+        Retrieves the cause of the previous reboot
+        Returns:
+            A tuple (string, string) where the first element is a string
+            containing the cause of the previous reboot. This string must be
+            one of the predefined strings in this class. If the first string
+            is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
+            to pass a description of the reboot cause.
+        """
+        try:
+            with open(self.REBOOT_CAUSE_PATH) as fd:
+                reboot_cause = int(fd.read(), 16)
+        except EnvironmentError:
+            return (self.REBOOT_CAUSE_NON_HARDWARE, None)
+
+        if reboot_cause & 0x1:
+            return (self.REBOOT_CAUSE_POWER_LOSS, None)
+        elif reboot_cause & 0x2:
+            return (self.REBOOT_CAUSE_NON_HARDWARE, None)
+        elif reboot_cause & 0x4:
+            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
+        elif reboot_cause & 0x8:
+            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
+        elif reboot_cause & 0x10:
+            return (self.REBOOT_CAUSE_WATCHDOG, None)
+        elif reboot_cause & 0x20:
+            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
+        elif reboot_cause & 0x40:
+            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Hot-Swap Shutdown")
+        elif reboot_cause & 0x80:
+            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Reset Button Shutdown")
+        elif reboot_cause & 0x100:
+            return (self.REBOOT_CAUSE_HARDWARE_OTHER, "Reset Button Cold Reboot")
+        else:
+            return (self.REBOOT_CAUSE_NON_HARDWARE, None)
+
+    def get_qualified_media_list(self):
+        return media_part_num_list
+
+    def set_locator_led(self, color):
+        """
+        Sets the state of the Chassis Locator LED
+
+        Args:
+            color: A string representing the color with which to set the Chassis Locator LED
+
+        Returns:
+            bool: True if the Chassis Locator LED state is set successfully, False if not
+
+        """
+        resource = "/sys/bus/pci/devices/0000:04:00.0/resource0"
+        val = pci_get_value(resource, SYSTEM_LED_REG)
+        if  self.LOCATOR_LED_ON == color:
+            val = int(val) | SYSTEM_BEACON_LED_SET
+        elif self.LOCATOR_LED_OFF == color:
+            val = int(val) & SYSTEM_BEACON_LED_CLEAR
+        else:
+            return False
+        pci_set_value(resource, val, SYSTEM_LED_REG)
+        return True
+
+    def get_locator_led(self):
+        """
+        Gets the state of the Chassis Locator LED
+
+        Returns:
+            LOCATOR_LED_ON or LOCATOR_LED_OFF
+        """
+        resource = "/sys/bus/pci/devices/0000:04:00.0/resource0"
+        val = pci_get_value(resource, SYSTEM_LED_REG)
+        val = int(val) & SYSTEM_BEACON_LED_SET
+        if not val:
+            return self.LOCATOR_LED_OFF
+        else:
+            return self.LOCATOR_LED_ON
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/component.py
new file mode 100644
index 000000000000..fdca4614c2fa
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/component.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+
+########################################################################
+# DELLEMC S5248F
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Components' (e.g., BIOS, CPLD, FPGA, BMC etc.) available in
+# the platform
+#
+########################################################################
+
+try:
+    import subprocess
+    from sonic_platform_base.component_base import ComponentBase
+    import sonic_platform.hwaccess as hwaccess
+    
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+def get_bios_version():
+    return subprocess.check_output(['dmidecode', '-s', 'system-version']).strip()
+
+def get_fpga_version():
+    val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:04:00.0/resource0', 0)
+    return '{}.{}'.format((val >> 8) & 0xff, val & 0xff)
+    
+def get_bmc_version():
+    return subprocess.check_output(
+        ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
+        ).strip()
+
+def get_cpld_version(bus, i2caddr):
+    return '{}.{}'.format(hwaccess.i2c_get(bus, i2caddr, 1),
+                          hwaccess.i2c_get(bus, i2caddr, 0)
+                          )
+
+def get_cpld0_version():
+    return get_cpld_version(601, 0x31)
+
+def get_cpld1_version():
+    return get_cpld_version(600, 0x30)
+
+def get_cpld2_version():
+    return get_cpld_version(600, 0x31)
+
+
+
+class Component(ComponentBase):
+    """DellEMC Platform-specific Component class"""
+
+    CHASSIS_COMPONENTS = [
+        ['BIOS',
+         'Performs initialization of hardware components during booting',
+         get_bios_version
+         ],
+
+        ['FPGA',
+         'Used for managing the system LEDs',
+         get_fpga_version
+         ],
+
+        ['BMC',
+         'Platform management controller for on-board temperature monitoring, in-chassis power, Fan and LED control',
+         get_bmc_version
+         ],
+
+        ['System CPLD',
+         'Used for managing the CPU power sequence and CPU states',
+         get_cpld0_version
+         ],
+
+        ['Slave CPLD 1',
+         'Used for managing SFP28/QSFP28 port transceivers (SFP28 1-24, QSFP28 1-4)',
+         get_cpld1_version
+         ],
+
+        ['Slave CPLD 2',
+         'Used for managing SFP28/QSFP28 port transceivers (SFP28 25-48, QSFP28 5-8)',
+         get_cpld2_version
+         ]
+
+    ]
+
+    def __init__(self, component_index = 0):
+        self.index = component_index
+        self.name = self.CHASSIS_COMPONENTS[self.index][0]
+        self.description = self.CHASSIS_COMPONENTS[self.index][1]
+        self.version = self.CHASSIS_COMPONENTS[self.index][2]()
+
+    def get_name(self):
+        """
+        Retrieves the name of the component
+        Returns:
+        A string containing the name of the component
+        """
+        return self.name
+
+    def get_description(self):
+        """
+        Retrieves the description of the component
+        Returns:
+        A string containing the description of the component
+        """
+        return self.description
+
+    def get_firmware_version(self):
+        """
+        Retrieves the firmware version of the component
+        Returns:
+            A string containing the firmware version of the component
+        """
+        return self.version
+
+    def install_firmware(self, image_path):
+        """
+        Installs firmware to the component
+        Args:
+        image_path: A string, path to firmware image
+        Returns:
+        A boolean, True if install was successful, False if not
+        """
+        return False
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/eeprom.py
new file mode 100644
index 000000000000..bf3434733f36
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/eeprom.py
@@ -0,0 +1,133 @@
+#!/usr/bin/env python
+
+#############################################################################
+# DellEmc S5248F
+#
+# Platform and model specific eeprom subclass, inherits from the base class,
+# and provides the followings:
+# - the eeprom format definition
+# - specific encoder/decoder if there is special need
+#############################################################################
+try:
+    import os.path
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self):
+        self.eeprom_path = None
+        for b in (0, 1):
+            f = '/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom'.format(b)
+            if os.path.exists(f):
+                self.eeprom_path = f
+                break
+        if self.eeprom_path is None:
+            return
+        super(Eeprom, self).__init__(self.eeprom_path, 0, '', True)
+        self.eeprom_tlv_dict = dict()
+        try:
+            self.eeprom_data = self.read_eeprom()
+        except:
+            self.eeprom_data = "N/A"
+            raise RuntimeError("Eeprom is not Programmed")
+
+        eeprom = self.eeprom_data
+
+        if not self.is_valid_tlvinfo_header(eeprom):
+            return
+
+        total_length = (eeprom[9] << 8) | eeprom[10]
+        tlv_index = self._TLV_INFO_HDR_LEN
+        tlv_end = self._TLV_INFO_HDR_LEN + total_length
+
+        while (tlv_index + 2) < len(eeprom) and tlv_index < tlv_end:
+            if not self.is_valid_tlv(eeprom[tlv_index:]):
+                break
+
+            tlv = eeprom[tlv_index:tlv_index + 2
+                         + eeprom[tlv_index + 1]]
+            code = "0x%02X" % tlv[0]
+
+            name, value = self.decoder(None, tlv)
+
+            self.eeprom_tlv_dict[code] = value
+            if eeprom[tlv_index] == self._TLV_CODE_CRC_32:
+                break
+
+            tlv_index += eeprom[tlv_index+1] + 2
+
+    def serial_number_str(self):
+        """
+        Returns the serial number
+        """
+        (is_valid, results) = self.get_tlv_field(
+                         self.eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        if not is_valid:
+            return "N/A"
+        return results[2].decode('ascii')
+
+    def base_mac_addr(self, e):
+        """
+        Returns the base mac address found in the system EEPROM
+        """
+        (is_valid, t) = self.get_tlv_field(
+                          self.eeprom_data, self._TLV_CODE_MAC_BASE)
+        if not is_valid or t[1] != 6:
+            return super(eeprom_tlvinfo.TlvInfoDecoder, self).switchaddrstr(t)
+
+        return ":".join(["{:02x}".format(T) for T in t[2]]).upper()
+
+    def modelstr(self):
+        """
+        Returns the Model name
+        """
+        (is_valid, results) = self.get_tlv_field(
+                        self.eeprom_data, self._TLV_CODE_PRODUCT_NAME)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def part_number_str(self):
+        """
+        Returns the part number
+        """
+        (is_valid, results) = self.get_tlv_field(
+                    self.eeprom_data, self._TLV_CODE_PART_NUMBER)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def serial_str(self):
+        """
+        Returns the servicetag number
+        """
+        (is_valid, results) = self.get_tlv_field(
+                    self.eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def revision_str(self):
+        """
+        Returns the device revision
+        """
+        (is_valid, results) = self.get_tlv_field(
+                    self.eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+        if not is_valid:
+            return "N/A"
+
+        return results[2].decode('ascii')
+
+    def system_eeprom_info(self):
+        """
+        Returns a dictionary, where keys are the type code defined in
+        ONIE EEPROM format and values are their corresponding values
+        found in the system EEPROM.
+        """
+        return self.eeprom_tlv_dict
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan.py
new file mode 100644
index 000000000000..55327d5ddf58
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+
+########################################################################
+# DellEMC S5248F
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Fans' information which are available in the platform.
+#
+########################################################################
+
+try:
+    from sonic_platform_base.fan_base import FanBase
+    from sonic_platform.ipmihelper import IpmiSensor, IpmiFru
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+FAN1_MAX_SPEED_OFFSET = 71
+FAN2_MAX_SPEED_OFFSET = 73
+PSU_FAN_MAX_SPEED_OFFSET = 50
+FAN_DIRECTION_OFFSET = 69
+PSU_FAN_DIRECTION_OFFSET = 47
+
+
+class Fan(FanBase):
+    """DellEMC Platform-specific Fan class"""
+    # { FAN-ID: { Sensor-Name: Sensor-ID } }
+    # System rev X01, BMC firmware rev 1.02
+    FAN_SENSOR_MAPPING = { 1: {"Prsnt": 0x53, "State": 0x57, "Speed": 0x24},
+                           2: {"Prsnt": 0x53, "State": 0x5b, "Speed": 0x20},
+                           3: {"Prsnt": 0x54, "State": 0x58, "Speed": 0x25},
+                           4: {"Prsnt": 0x54, "State": 0x5c, "Speed": 0x21},
+                           5: {"Prsnt": 0x55, "State": 0x59, "Speed": 0x26},
+                           6: {"Prsnt": 0x55, "State": 0x5d, "Speed": 0x22},
+                           7: {"Prsnt": 0x56, "State": 0x5a, "Speed": 0x27},
+                           8: {"Prsnt": 0x56, "State": 0x5e, "Speed": 0x23}
+    }
+    PSU_FAN_SENSOR_MAPPING = { 1: {"State": 0x31, "Speed": 0x28},
+                               2: {"State": 0x32, "Speed": 0x29} }
+
+    # { FANTRAY-ID: FRU-ID }
+    FAN_FRU_MAPPING = { 1: 3, 2: 4, 3: 5, 4: 6 }
+    PSU_FRU_MAPPING = { 1: 1, 2: 2 }
+
+    def __init__(self, fantray_index=1, fan_index=1, psu_fan=False,
+            dependency=None):
+        FanBase.__init__(self)
+        self.is_psu_fan = psu_fan
+        if not self.is_psu_fan:
+            # API index is starting from 0, DellEMC platform index is
+            # starting from 1
+            self.fantrayindex = fantray_index + 1
+            self.fanindex = fan_index + 1
+            if (self.fanindex == 1):
+                self.max_speed_offset = FAN1_MAX_SPEED_OFFSET
+            else:
+                self.max_speed_offset = FAN2_MAX_SPEED_OFFSET
+            self.fan_direction_offset = FAN_DIRECTION_OFFSET
+            self.index = (self.fantrayindex - 1) * 2 + self.fanindex
+            self.prsnt_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["Prsnt"],
+                                           is_discrete=True)
+            self.state_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["State"],
+                                           is_discrete=True)
+            self.speed_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["Speed"])
+            self.fru = IpmiFru(self.FAN_FRU_MAPPING[self.fantrayindex])
+        else:
+            self.dependency = dependency
+            self.fanindex = fan_index
+            self.state_sensor = IpmiSensor(self.PSU_FAN_SENSOR_MAPPING[self.fanindex]["State"],
+                                           is_discrete=True)
+            self.speed_sensor = IpmiSensor(self.PSU_FAN_SENSOR_MAPPING[self.fanindex]["Speed"])
+            self.fru = IpmiFru(self.PSU_FRU_MAPPING[self.fanindex])
+            self.max_speed_offset = PSU_FAN_MAX_SPEED_OFFSET
+            self.fan_direction_offset = PSU_FAN_DIRECTION_OFFSET
+        self.max_speed = self.fru.get_fru_data(self.max_speed_offset,2)[1]
+        self.max_speed = self.max_speed[1] << 8 | self.max_speed[0]
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+        Returns:
+            String: The name of the device
+        """
+        if self.is_psu_fan:
+            return "PSU{} Fan".format(self.fanindex)
+        else:
+            return "FanTray{}-Fan{}".format(self.fantrayindex, self.fanindex)
+
+    def get_model(self):
+        """
+        Retrieves the part number of the FAN
+        Returns:
+            String: Part number of FAN
+        """
+        if self.is_psu_fan:
+            return None
+        else:
+            return self.fru.get_board_part_number()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the FAN
+        Returns:
+            String: Serial number of FAN
+        """
+        if self.is_psu_fan:
+            return None
+        else:
+            return self.fru.get_board_serial()
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if fan is present, False if not
+        """
+        presence = False
+        if self.is_psu_fan:
+            return self.dependency.get_presence()
+        else:
+            is_valid, state = self.prsnt_sensor.get_reading()
+            if is_valid:
+                if (state & 0b1):
+                    presence = True
+            return presence
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the FAN
+        Returns:
+            bool: True if FAN is operating properly, False if not
+        """
+        status = False
+        is_valid, state = self.state_sensor.get_reading()
+        if is_valid:
+            if not state > 1:
+                status = True
+        return status
+
+    def get_direction(self):
+        """
+        Retrieves the fan airfow direction
+        Returns:
+            A string, either FAN_DIRECTION_INTAKE or FAN_DIRECTION_EXHAUST
+            depending on fan direction
+
+        Notes:
+            In DellEMC platforms,
+            - Forward/Exhaust : Air flows from Port side to Fan side.
+            - Reverse/Intake  : Air flows from Fan side to Port side.
+        """
+        direction = [self.FAN_DIRECTION_EXHAUST, self.FAN_DIRECTION_INTAKE]
+        fan_status = self.get_presence()
+        if not fan_status:
+            return None
+        is_valid, fan_direction = self.fru.get_fru_data(self.fan_direction_offset)
+        if is_valid and fan_direction[0] < len(direction):
+            return direction[fan_direction[0]]
+        else:
+            return None
+
+    def get_speed(self):
+        """
+        Retrieves the speed of the fan
+        Returns:
+            int: percentage of the max fan speed
+        """
+        if self.max_speed == 0:
+            self.max_speed = self.fru.get_fru_data(self.max_speed_offset,2)[1]
+            self.max_speed = self.max_speed[1] << 8 | self.max_speed[0]
+        is_valid, fan_speed = self.speed_sensor.get_reading()
+        if not is_valid or self.max_speed == 0:
+            return None
+        else:
+            speed = (100 * fan_speed)//self.max_speed
+        return speed
+
+    def get_speed_rpm(self):
+        """
+        Retrieves the speed of the fan
+        Returns:
+            int: percentage of the max fan speed
+        """
+        fan_speed = 0
+        is_valid, fan_speed = self.speed_sensor.get_reading()
+        return fan_speed if is_valid else None
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..59391f38d4e6
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/fan_drawer.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+########################################################################
+# DellEMC S5248F 
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Fan-Drawers' information available in the platform.
+#
+########################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+S5248F_FANS_PER_FANTRAY = 2
+
+
+class FanDrawer(FanDrawerBase):
+    """DellEMC Platform-specific Fan class"""
+
+    def __init__(self, fantray_index):
+
+        FanDrawerBase.__init__(self)
+        # FanTray is 1-based in DellEMC platforms
+        self.fantrayindex = fantray_index + 1
+        for i in range(S5248F_FANS_PER_FANTRAY):
+            self._fan_list.append(Fan(fantray_index, i))
+
+    def get_name(self):
+        """
+        Retrieves the fan drawer name
+        Returns:
+            string: The name of the device
+        """
+        return "FanTray{}".format(self.fantrayindex)
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/hwaccess.py
new file mode 120000
index 000000000000..e8fa340a444d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/hwaccess.py
@@ -0,0 +1 @@
+../../common/sonic_platform/hwaccess.py
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py
new file mode 100644
index 000000000000..d95329c40de2
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py
@@ -0,0 +1,269 @@
+#!/usr/bin/python3
+
+########################################################################
+# DellEMC
+#
+# Module contains implementation of IpmiSensor and IpmiFru classes that
+# provide Sensor's and FRU's information respectively.
+#
+########################################################################
+
+import subprocess
+import re
+
+# IPMI Request Network Function Codes
+NetFn_SensorEvent = 0x04
+NetFn_Storage = 0x0A
+
+# IPMI Sensor Device Commands
+Cmd_GetSensorReadingFactors = 0x23
+Cmd_GetSensorThreshold = 0x27
+Cmd_GetSensorReading = 0x2D
+
+# IPMI FRU Device Commands
+Cmd_ReadFRUData = 0x11
+
+def get_ipmitool_raw_output(args):
+    """
+    Returns a list the elements of which are the individual bytes of
+    ipmitool raw <cmd> command output.
+    """
+    result_bytes = list()
+    result = ""
+    command = "ipmitool raw {}".format(args)
+    try:
+        proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
+                                universal_newlines=True, stderr=subprocess.STDOUT)
+        stdout = proc.communicate()[0]
+        proc.wait()
+        if not proc.returncode:
+            result = stdout.rstrip('\n')
+    except EnvironmentError:
+        pass
+
+    for i in result.split():
+        result_bytes.append(int(i, 16))
+
+    return result_bytes
+
+class IpmiSensor(object):
+
+    # Sensor Threshold types and their respective bit masks
+    THRESHOLD_BIT_MASK = {
+        "LowerNonCritical"    : 0,
+        "LowerCritical"       : 1,
+        "LowerNonRecoverable" : 2,
+        "UpperNonCritical"    : 3,
+        "UpperCritical"       : 4,
+        "UpperNonRecoverable" : 5
+    }
+
+    def __init__(self, sensor_id, is_discrete=False):
+        self.id = sensor_id
+        self.is_discrete = is_discrete
+
+    def _get_converted_sensor_reading(self, raw_value):
+        """
+        Returns a 2 element tuple(bool, int) in which first element
+        provides the validity of the reading and the second element is
+        the converted sensor reading
+        """
+        # Get Sensor Reading Factors
+        cmd_args = "{} {} {} {}".format(NetFn_SensorEvent,
+                                        Cmd_GetSensorReadingFactors,
+                                        self.id, raw_value)
+        factors = get_ipmitool_raw_output(cmd_args)
+
+        if len(factors) != 7:
+            return False, 0
+
+        # Compute Twos complement
+        def get_twos_complement(val, bits):
+            if val & (1 << (bits - 1)):
+                val = val - (1 << bits)
+            return val
+
+        # Calculate actual sensor value from the raw sensor value
+        # using the sensor reading factors.
+        M = get_twos_complement(((factors[2] & 0xC0) << 8) | factors[1], 10)
+        B = get_twos_complement(((factors[4] & 0xC0) << 8) | factors[3], 10)
+        R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
+        B_exp = get_twos_complement(factors[6] & 0x0F, 4)
+
+        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
+
+        return True, converted_reading
+
+    def get_reading(self):
+        """
+        For Threshold sensors, returns the sensor reading.
+        For Discrete sensors, returns the state value.
+
+        Returns:
+            A tuple (bool, int) where the first element provides the
+            validity of the reading and the second element provides the
+            sensor reading/state value.
+        """
+        # Get Sensor Reading
+        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorReading,
+                                     self.id)
+        output = get_ipmitool_raw_output(cmd_args)
+        if len(output) != 4:
+            return False, 0
+
+        # Check reading/state unavailable
+        if output[1] & 0x20:
+            return False, 0
+
+        if self.is_discrete:
+            state = ((output[3] & 0x7F) << 8) | output[2]
+            return True, state
+        else:
+            return self._get_converted_sensor_reading(output[0])
+
+    def get_threshold(self, threshold_type):
+        """
+        Returns the sensor's threshold value for a given threshold type.
+
+        Args:
+            threshold_type (str) - one of the below mentioned
+                                   threshold type strings
+
+                "LowerNonCritical"
+                "LowerCritical"
+                "LowerNonRecoverable"
+                "UpperNonCritical"
+                "UpperCritical"
+                "UpperNonRecoverable"
+        Returns:
+            A tuple (bool, int) where the first element provides the
+            validity of that threshold and second element provides the
+            threshold value.
+        """
+        # Thresholds are not valid for discrete sensors
+        if self.is_discrete:
+            raise TypeError("Threshold is not applicable for Discrete Sensor")
+
+        if threshold_type not in list(self.THRESHOLD_BIT_MASK.keys()):
+            raise ValueError("Invalid threshold type {} provided. Valid types "
+                             "are {}".format(threshold_type,
+                                             list(self.THRESHOLD_BIT_MASK.keys())))
+
+        bit_mask = self.THRESHOLD_BIT_MASK[threshold_type]
+
+        # Get Sensor Threshold
+        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorThreshold,
+                                     self.id)
+        thresholds = get_ipmitool_raw_output(cmd_args)
+        if len(thresholds) != 7:
+            return False, 0
+
+        valid_thresholds = thresholds.pop(0)
+        # Check whether particular threshold is readable
+        if valid_thresholds & (1 << bit_mask):
+            return self._get_converted_sensor_reading(thresholds[bit_mask])
+        else:
+            return False, 0
+
+class IpmiFru(object):
+
+    def __init__(self, fru_id):
+        self.id = fru_id
+
+    def _get_ipmitool_fru_print(self):
+        result = ""
+        command = "ipmitool fru print {}".format(self.id)
+        try:
+            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            if not proc.returncode:
+                result = stdout.rstrip('\n')
+        except EnvironmentError:
+            pass
+
+        return result
+
+    def _get_from_fru(self, info):
+        """
+        Returns a string containing the info from FRU
+        """
+        fru_output = self._get_ipmitool_fru_print()
+        if not fru_output:
+            return "NA"
+
+        info_req = re.search(r"%s\s*:(.*)" % info, fru_output)
+        if not info_req:
+            return "NA"
+
+        return info_req.group(1).strip()
+
+    def get_board_serial(self):
+        """
+        Returns a string containing the Serial Number of the device.
+        """
+        return self._get_from_fru('Board Serial')
+
+    def get_board_part_number(self):
+        """
+        Returns a string containing the Part Number of the device.
+        """
+        return self._get_from_fru('Board Part Number')
+
+    def get_board_mfr_id(self):
+        """
+        Returns a string containing the manufacturer id of the FRU.
+        """
+        return self._get_from_fru('Board Mfg')
+
+    def get_board_product(self):
+        """
+        Returns a string containing the manufacturer id of the FRU.
+        """
+        return self._get_from_fru('Board Product')
+
+    def get_fru_data(self, offset, count=1):
+        """
+        Reads and returns the FRU data at the provided offset.
+
+        Args:
+            offset (int) - FRU offset to read
+            count (int) - Number of bytes to read [optional, default = 1]
+        Returns:
+            A tuple (bool, list(int)) where the first element provides
+            the validity of the data read and the second element is a
+            list, the elements of which are the individual bytes of the
+            FRU data read.
+        """
+        result_bytes = list()
+        is_valid = True
+        result = ""
+
+        offset_LSB = offset & 0xFF
+        offset_MSB = offset & 0xFF00
+        command = "ipmitool raw {} {} {} {} {} {}".format(NetFn_Storage,
+                                                          Cmd_ReadFRUData,
+                                                          self.id, offset_LSB,
+                                                          offset_MSB, count)
+        try:
+            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            if not proc.returncode:
+                result = stdout.rstrip('\n')
+        except EnvironmentError:
+            is_valid = False
+
+        if (not result) or (not is_valid):
+            return False, result_bytes
+
+        for i in result.split():
+            result_bytes.append(int(i, 16))
+
+        read_count = result_bytes.pop(0)
+        if read_count != count:
+            return False, result_bytes
+        else:
+            return True, result_bytes
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/media_settings_plugin.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/media_settings_plugin.py
new file mode 100644
index 000000000000..3b7667846eda
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/media_settings_plugin.py
@@ -0,0 +1,13 @@
+# Media settings key plugin
+#
+# Generate keys used for lookup in media_settings,json
+
+def get_media_settings_key(physical_port, transceiver_dict):
+    d = transceiver_dict[physical_port]
+    media_interface = d['media_interface']
+    generic_key = '{}-{}'.format(d['form_factor'], media_interface)
+    if media_interface == 'CR':
+        generic_key = '{}-{}'.format(generic_key, d['cable_length_detailed'])
+    return ['{}-{}'.format(d['manufacturename'], d['modelname']),
+            generic_key
+           ]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/platform.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/platform.py
new file mode 100644
index 000000000000..996d94cf5a6e
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/platform.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+#############################################################################
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.platform_base import PlatformBase
+    from sonic_platform.chassis import Chassis
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Platform(PlatformBase):
+    """
+    DELLEMC Platform-specific class
+    """
+
+    def __init__(self):
+        PlatformBase.__init__(self)
+        self._chassis = Chassis()
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/psu.py
new file mode 100644
index 000000000000..192a93b2d3a9
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/psu.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+########################################################################
+# DellEMC S5248F 
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs' information which are available in the platform
+#
+########################################################################
+
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.ipmihelper import IpmiSensor, IpmiFru
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Psu(PsuBase):
+    """DellEMC Platform-specific PSU class"""
+
+    # { PSU-ID: { Sensor-Name: Sensor-ID } }
+    SENSOR_MAPPING = { 1: { "State": 0x31, "Current": 0x39,
+                            "Power": 0x37, "Voltage": 0x38,
+                            "InCurrent": 0x36, "InPower": 0x34,
+                            "InVoltage": 0x35 },
+                       2: { "State": 0x32, "Current": 0x3F,
+                            "Power": 0x3D, "Voltage": 0x3E,
+                            "InCurrent": 0x3C, "InPower": 0x3A,
+                            "InVoltage": 0x3B } }
+    # ( PSU-ID: FRU-ID }
+    FRU_MAPPING = { 1: 1, 2: 2 }
+
+    def __init__(self, psu_index):
+        PsuBase.__init__(self)
+        # PSU is 1-based in DellEMC platforms
+        self.index = psu_index + 1
+        self.state_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["State"],
+                                       is_discrete=True)
+        self.voltage_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Voltage"])
+        self.current_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Current"])
+        self.power_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Power"])
+        self.input_voltage_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["InVoltage"])
+        self.input_current_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["InCurrent"])
+        self.input_power_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["InPower"])
+        self.fru = IpmiFru(self.FRU_MAPPING[self.index])
+
+        self._fan_list.append(Fan(fan_index=self.index, psu_fan=True,
+            dependency=self))
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+
+        Returns:
+            string: The name of the device
+        """
+        return "PSU{}".format(self.index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the Power Supply Unit (PSU)
+
+        Returns:
+            bool: True if PSU is present, False if not
+        """
+        presence = False
+        is_valid, state = self.state_sensor.get_reading()
+        if is_valid:
+           if (state & 0b1):
+                presence = True
+
+        return presence
+
+    def get_model(self):
+        """
+        Retrieves the part number of the PSU
+
+        Returns:
+            string: Part number of PSU
+        """
+        return self.fru.get_board_part_number()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the PSU
+
+        Returns:
+            string: Serial number of PSU
+        """
+        return self.fru.get_board_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the PSU
+
+        Returns:
+            bool: True if PSU is operating properly, False if not
+        """
+        status = False
+        is_valid, state = self.state_sensor.get_reading()
+        if is_valid:
+           if (state == 0x01):
+                status = True
+
+        return status
+
+    def get_voltage(self):
+        """
+        Retrieves current PSU voltage output
+
+        Returns:
+            A float number, the output voltage in volts,
+            e.g. 12.1
+        """
+        is_valid, voltage = self.voltage_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(voltage)
+
+    def get_current(self):
+        """
+        Retrieves present electric current supplied by PSU
+
+        Returns:
+            A float number, electric current in amperes,
+            e.g. 15.4
+        """
+        is_valid, current = self.current_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(current)
+
+    def get_power(self):
+        """
+        Retrieves current energy supplied by PSU
+
+        Returns:
+            A float number, the power in watts,
+            e.g. 302.6
+        """
+        is_valid, power = self.power_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(power)
+
+    def get_input_voltage(self):
+        """
+        Retrieves current PSU voltage input
+
+        Returns:
+            A float number, the input voltage in volts,
+            e.g. 12.1
+        """
+        is_valid, input_voltage = self.input_voltage_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(input_voltage)
+
+    def get_input_current(self):
+        """
+        Retrieves present electric current supplied to PSU
+
+        Returns:
+            A float number, electric current in amperes,
+            e.g. 15.4
+        """
+        is_valid, input_current = self.input_current_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(input_current)
+
+    def get_input_power(self):
+        """
+        Retrieves current energy supplied to PSU
+
+        Returns:
+            A float number, the power in watts,
+            e.g. 302.6
+        """
+        is_valid, input_power = self.input_power_sensor.get_reading()
+        if not is_valid:
+            return None
+
+        return "{:.1f}".format(input_power)
+
+    def get_powergood_status(self):
+        """
+        Retrieves the powergood status of PSU
+
+        Returns:
+            A boolean, True if PSU has stablized its output voltages and
+            passed all its internal self-tests, False if not.
+        """
+        status = False
+        is_valid, state = self.state_sensor.get_reading()
+        if is_valid:
+           if (state == 0x01):
+                status = True
+
+        return status
+
+    def get_mfr_id(self):
+        """
+        Retrives the Manufacturer Id of PSU
+
+        Returns:
+            A string, the manunfacturer id.
+        """
+        return self.fru.get_board_mfr_id()
+
+    def get_type(self):
+        """
+        Retrives the Power Type of PSU
+
+        Returns :
+            A string, PSU power type
+        """
+        board_product = self.fru.get_board_product()
+        if board_product is not None :
+            info =  board_product.split(',')
+            if 'AC' in info : return 'AC'
+            if 'DC' in info : return 'DC'
+        return None
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/sfp.py
new file mode 100644
index 000000000000..eed6dc7b03da
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/sfp.py
@@ -0,0 +1,1050 @@
+#!/usr/bin/env python
+
+#############################################################################
+# DELLEMC
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the platform information
+#
+#############################################################################
+
+try:
+    import os
+    import time
+    import struct
+    import mmap
+    from sonic_platform_base.sfp_base import SfpBase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
+    from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+PAGE_OFFSET = 0
+KEY_OFFSET = 1
+KEY_WIDTH = 2
+FUNC_NAME = 3
+
+QSFP_INFO_OFFSET = 128
+QSFP_DOM_OFFSET = 0
+QSFP_DOM_OFFSET1 = 384
+
+SFP_INFO_OFFSET = 0
+SFP_DOM_OFFSET = 256
+
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 7
+SFP_TX_DISABLE_HARD_BIT = 7
+SFP_TX_DISABLE_SOFT_BIT = 6
+
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)', 'Length OM2(m)',
+                    'Length OM1(m)', 'Length Cable Assembly(m)')
+
+qsfp_compliance_code_tup = (
+    '10/40G Ethernet Compliance Code',
+    'SONET Compliance codes',
+    'SAS/SATA compliance codes',
+    'Gigabit Ethernet Compliant codes',
+    'Fibre Channel link length/Transmitter Technology',
+    'Fibre Channel transmission media',
+    'Fibre Channel Speed')
+
+sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
+                        'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
+                        'LengthOM3(UnitsOf10m)', 'LengthCable(UnitsOfm)')
+
+sfp_compliance_code_tup = ('10GEthernetComplianceCode', 'InfinibandComplianceCode',
+                           'ESCONComplianceCodes', 'SONETComplianceCodes',
+                           'EthernetComplianceCodes', 'FibreChannelLinkLength',
+                           'FibreChannelTechnology', 'SFP+CableTechnology',
+                           'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
+
+info_dict_keys = ['type', 'hardware_rev', 'serial',
+                  'manufacturer', 'model', 'connector',
+                  'encoding', 'ext_identifier', 'ext_rateselect_compliance',
+                  'cable_type', 'cable_length', 'nominal_bit_rate',
+                  'specification_compliance', 'type_abbrv_name','vendor_date', 'vendor_oui']
+
+dom_dict_keys = ['rx_los',       'tx_fault',   'reset_status',
+                 'power_lpmode', 'tx_disable', 'tx_disable_channel',
+                 'temperature',  'voltage',    'rx1power',
+                 'rx2power',     'rx3power',   'rx4power',
+                 'tx1bias',      'tx2bias',    'tx3bias',
+                 'tx4bias',      'tx1power',   'tx2power',
+                 'tx3power',     'tx4power']
+
+threshold_dict_keys = ['temphighalarm',    'temphighwarning',
+                       'templowalarm',     'templowwarning',
+                       'vcchighalarm',     'vcchighwarning',
+                       'vcclowalarm',      'vcclowwarning',
+                       'rxpowerhighalarm', 'rxpowerhighwarning',
+                       'rxpowerlowalarm',  'rxpowerlowwarning',
+                       'txpowerhighalarm', 'txpowerhighwarning',
+                       'txpowerlowalarm',  'txpowerlowwarning',
+                       'txbiashighalarm',  'txbiashighwarning',
+                       'txbiaslowalarm',   'txbiaslowwarning']
+
+sff8436_parser = {
+     'reset_status': [QSFP_DOM_OFFSET,   2,  1, 'parse_dom_status_indicator'],
+           'rx_los': [QSFP_DOM_OFFSET,   3,  1, 'parse_dom_tx_rx_los'],
+         'tx_fault': [QSFP_DOM_OFFSET,   4,  1, 'parse_dom_tx_fault'],
+       'tx_disable': [QSFP_DOM_OFFSET,  86,  1, 'parse_dom_tx_disable'],
+     'power_lpmode': [QSFP_DOM_OFFSET,  93,  1, 'parse_dom_power_control'],
+   'power_override': [QSFP_DOM_OFFSET,  93,  1, 'parse_dom_power_control'],
+      'Temperature': [QSFP_DOM_OFFSET,  22,  2, 'parse_temperature'],
+          'Voltage': [QSFP_DOM_OFFSET,  26,  2, 'parse_voltage'],
+   'ChannelMonitor': [QSFP_DOM_OFFSET,  34, 16, 'parse_channel_monitor_params'],
+   'ChannelMonitor_TxPower': 
+                     [QSFP_DOM_OFFSET,  34, 24, 'parse_channel_monitor_params_with_tx_power'],
+
+       'cable_type': [QSFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
+     'cable_length': [QSFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
+        'connector': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+             'type': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+         'encoding': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+   'ext_identifier': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+ 'ext_rateselect_compliance':
+                     [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+ 'nominal_bit_rate': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+ 'specification_compliance':
+                     [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+  'type_abbrv_name': [QSFP_INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+     'manufacturer': [QSFP_INFO_OFFSET, 20, 16, 'parse_vendor_name'],
+       'vendor_oui': [QSFP_INFO_OFFSET, 37,  3, 'parse_vendor_oui'],
+            'model': [QSFP_INFO_OFFSET, 40, 16, 'parse_vendor_pn'],
+     'hardware_rev': [QSFP_INFO_OFFSET, 56,  2, 'parse_vendor_rev'],
+           'serial': [QSFP_INFO_OFFSET, 68, 16, 'parse_vendor_sn'],
+      'vendor_date': [QSFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
+   'dom_capability': [QSFP_INFO_OFFSET, 92,  1, 'parse_dom_capability'],
+          'dom_rev': [QSFP_DOM_OFFSET,   1,  1, 'parse_sfp_dom_rev'],
+  'ModuleThreshold': [QSFP_DOM_OFFSET1, 128, 24, 'parse_module_threshold_values'],
+ 'ChannelThreshold': [QSFP_DOM_OFFSET1, 176, 16, 'parse_channel_threshold_values'],
+}
+
+sff8472_parser = {
+      'Temperature': [SFP_DOM_OFFSET,  96,  2, 'parse_temperature'],
+          'Voltage': [SFP_DOM_OFFSET,  98,  2, 'parse_voltage'],
+   'ChannelMonitor': [SFP_DOM_OFFSET,  100, 6, 'parse_channel_monitor_params'],
+
+       'cable_type': [SFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
+     'cable_length': [SFP_INFO_OFFSET, -1, -1, 'parse_sfp_info_bulk'],
+        'connector': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+             'type': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+         'encoding': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+   'ext_identifier': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+ 'ext_rateselect_compliance':
+                     [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+ 'nominal_bit_rate': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+ 'specification_compliance':
+                     [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+  'type_abbrv_name': [SFP_INFO_OFFSET,  0, 21, 'parse_sfp_info_bulk'],
+     'manufacturer': [SFP_INFO_OFFSET, 20, 16, 'parse_vendor_name'],
+       'vendor_oui': [SFP_INFO_OFFSET,  37, 3, 'parse_vendor_oui'],
+            'model': [SFP_INFO_OFFSET, 40, 16, 'parse_vendor_pn'],
+     'hardware_rev': [SFP_INFO_OFFSET, 56,  4, 'parse_vendor_rev'],
+           'serial': [SFP_INFO_OFFSET, 68, 16, 'parse_vendor_sn'],
+      'vendor_date': [SFP_INFO_OFFSET, 84,  8, 'parse_vendor_date'],
+  'ModuleThreshold': [SFP_DOM_OFFSET,   0, 56, 'parse_alarm_warning_threshold'],
+}
+
+
+class Sfp(SfpBase):
+    """
+    DELLEMC Platform-specific Sfp class
+    """
+    BASE_RES_PATH = "/sys/bus/pci/devices/0000:04:00.0/resource0"
+
+    def __init__(self, index=0, sfp_type=0, eeprom_path=''):
+        SfpBase.__init__(self)
+        self.sfp_type = sfp_type
+        self.index = index
+        self.eeprom_path = eeprom_path
+        self.qsfpInfo = sff8436InterfaceId()
+        self.qsfpDomInfo = sff8436Dom()
+        self.sfpInfo = sff8472InterfaceId()
+        self.sfpDomInfo = sff8472Dom(None,1)
+
+    def pci_mem_read(self, mm, offset):
+        mm.seek(offset)
+        read_data_stream = mm.read(4)
+        reg_val = struct.unpack('I', read_data_stream)
+        mem_val = str(reg_val)[1:-2]
+        # print "reg_val read:%x"%reg_val
+        return mem_val
+
+    def pci_mem_write(self, mm, offset, data):
+        mm.seek(offset)
+        # print "data to write:%x"%data
+        mm.write(struct.pack('I', data))
+
+    def pci_set_value(self, resource, val, offset):
+        fd = os.open(resource, os.O_RDWR)
+        mm = mmap.mmap(fd, 0)
+        val = self.pci_mem_write(mm, offset, val)
+        mm.close()
+        os.close(fd)
+        return val
+
+    def pci_get_value(self, resource, offset):
+        fd = os.open(resource, os.O_RDWR)
+        mm = mmap.mmap(fd, 0)
+        val = self.pci_mem_read(mm, offset)
+        mm.close()
+        os.close(fd)
+        return val
+
+    def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
+        eeprom_raw = []
+        try:
+            eeprom = open(eeprom_path, mode="rb", buffering=0)
+        except IOError:
+            return None
+
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        try:
+            eeprom.seek(offset)
+            raw = eeprom.read(num_bytes)
+        except IOError:
+            eeprom.close()
+            return None
+
+        try:
+            if isinstance(raw , str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+                
+        except BaseException:
+            eeprom.close()
+            return None
+
+        eeprom.close()
+        return eeprom_raw
+
+    def _get_eeprom_data(self, eeprom_key):
+        eeprom_data = None
+        page_offset = None
+
+        if(self.sfp_type == 'QSFP'):
+            page_offset = sff8436_parser[eeprom_key][PAGE_OFFSET]
+            eeprom_data_raw = self._read_eeprom_bytes(
+                self.eeprom_path,
+                (sff8436_parser[eeprom_key][PAGE_OFFSET] +
+                 sff8436_parser[eeprom_key][KEY_OFFSET]),
+                 sff8436_parser[eeprom_key][KEY_WIDTH])
+            if (eeprom_data_raw is not None):
+                # Offset 128 is used to retrieve sff8436InterfaceId Info
+                # Offset 0 is used to retrieve sff8436Dom Info
+                if (page_offset == 128):
+                    if ( self.qsfpInfo is None):
+                        return None
+                    eeprom_data = getattr(
+                        self.qsfpInfo, sff8436_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+                else:
+                    if ( self.qsfpDomInfo is None):
+                        return None
+                    eeprom_data = getattr(
+                        self.qsfpDomInfo, sff8436_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+        else:
+            page_offset = sff8472_parser[eeprom_key][PAGE_OFFSET]
+            eeprom_data_raw = self._read_eeprom_bytes(
+                self.eeprom_path,
+                (sff8472_parser[eeprom_key][PAGE_OFFSET] +
+                 sff8472_parser[eeprom_key][KEY_OFFSET]),
+                 sff8472_parser[eeprom_key][KEY_WIDTH])
+            if (eeprom_data_raw is not None):
+                # Offset 0 is used to retrieve sff8472InterfaceId Info
+                # Offset 256 is used to retrieve sff8472Dom Info
+                if (page_offset == 0):
+                    if ( self.sfpInfo is None):
+                        return None
+                    eeprom_data = getattr(
+                        self.sfpInfo, sff8472_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+                else:
+                    if ( self.sfpDomInfo is None):
+                        return None
+                    eeprom_data = getattr(
+                        self.sfpDomInfo, sff8472_parser[eeprom_key][FUNC_NAME])(
+                        eeprom_data_raw, 0)
+
+        return eeprom_data
+
+    def get_transceiver_info(self):
+        """
+        Retrieves transceiver info of this SFP
+        """
+        transceiver_info_dict = {}
+        compliance_code_dict = {}
+        transceiver_info_dict = dict.fromkeys(info_dict_keys, 'N/A')
+        # BaseInformation
+        iface_data = self._get_eeprom_data('type')
+        if (iface_data is not None):
+            connector = iface_data['data']['Connector']['value']
+            encoding = iface_data['data']['EncodingCodes']['value']
+            ext_id = iface_data['data']['Extended Identifier']['value']
+            rate_identifier = iface_data['data']['RateIdentifier']['value']
+            identifier = iface_data['data']['type']['value']
+            type_abbrv_name=iface_data['data']['type_abbrv_name']['value']
+            if(self.sfp_type == 'QSFP'):
+                bit_rate = str(
+                    iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+                for key in qsfp_compliance_code_tup:
+                    if key in iface_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = iface_data['data']['Specification compliance']['value'][key]['value']
+                for key in qsfp_cable_length_tup:
+                    if key in iface_data['data']:
+                        cable_type = key
+                        cable_length = str(iface_data['data'][key]['value'])
+            else:
+                bit_rate = str(
+                    iface_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+                for key in sfp_compliance_code_tup:
+                    if key in iface_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = iface_data['data']['Specification compliance']['value'][key]['value']
+                for key in sfp_cable_length_tup:
+                    if key in iface_data['data']:
+                        cable_type = key
+                        cable_length = str(iface_data['data'][key]['value'])
+        else:
+            return transceiver_info_dict
+
+        # Vendor Date
+        vendor_date_data = self._get_eeprom_data('vendor_date')
+        if (vendor_date_data is not None):
+            vendor_date = vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+        else:
+            return transceiver_info_dict
+
+        # Vendor Name
+        vendor_name_data = self._get_eeprom_data('manufacturer')
+        if (vendor_name_data is not None):
+            vendor_name = vendor_name_data['data']['Vendor Name']['value']
+        else:
+            return transceiver_info_dict
+
+        # Vendor OUI
+        vendor_oui_data = self._get_eeprom_data('vendor_oui')
+        if (vendor_oui_data is not None):
+            vendor_oui = vendor_oui_data['data']['Vendor OUI']['value']
+        else:
+            return transceiver_info_dict
+
+        # Vendor PN
+        vendor_pn_data = self._get_eeprom_data('model')
+        if (vendor_pn_data is not None):
+            vendor_pn = vendor_pn_data['data']['Vendor PN']['value']
+        else:
+            return transceiver_info_dict
+
+        # Vendor Revision
+        vendor_rev_data = self._get_eeprom_data('hardware_rev')
+        if (vendor_rev_data is not None):
+            vendor_rev = vendor_rev_data['data']['Vendor Rev']['value']
+        else:
+            return transceiver_info_dict
+
+        # Vendor Serial Number
+        vendor_sn_data = self._get_eeprom_data('serial')
+        if (vendor_sn_data is not None):
+            vendor_sn = vendor_sn_data['data']['Vendor SN']['value']
+        else:
+            return transceiver_info_dict
+
+        # Fill The Dictionary and return
+        transceiver_info_dict['type'] = identifier
+        transceiver_info_dict['hardware_rev'] = vendor_rev
+        transceiver_info_dict['serial'] = vendor_sn
+        transceiver_info_dict['manufacturer'] = vendor_name
+        transceiver_info_dict['model'] = vendor_pn
+        transceiver_info_dict['connector'] = connector
+        transceiver_info_dict['encoding'] = encoding
+        transceiver_info_dict['ext_identifier'] = ext_id
+        transceiver_info_dict['ext_rateselect_compliance'] = rate_identifier
+        transceiver_info_dict['cable_type'] = cable_type
+        transceiver_info_dict['cable_length'] = cable_length
+        transceiver_info_dict['nominal_bit_rate'] = bit_rate
+        transceiver_info_dict['specification_compliance'] = str(compliance_code_dict)
+        transceiver_info_dict['vendor_date'] = vendor_date
+        transceiver_info_dict['vendor_oui'] = vendor_oui
+        transceiver_info_dict['type_abbrv_name']=type_abbrv_name
+
+        return transceiver_info_dict
+
+    def get_transceiver_threshold_info(self):
+        """
+        Retrieves transceiver threshold info of this SFP
+        """
+        transceiver_dom_threshold_dict = {}
+        transceiver_dom_threshold_dict = dict.fromkeys(
+                threshold_dict_keys, 'N/A')
+
+        # Module Threshold
+        module_threshold_data = self._get_eeprom_data('ModuleThreshold')
+        if (self.sfp_type == 'QSFP'):
+            # Channel Threshold
+            channel_threshold_data = self._get_eeprom_data('ChannelThreshold')
+
+            if (channel_threshold_data is not None and module_threshold_data is not None):
+                transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['data']['VccHighAlarm']['value']
+                transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['data']['VccHighWarning']['value']
+                transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['data']['VccLowAlarm']['value']
+                transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['data']['VccLowWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = channel_threshold_data['data']['RxPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = channel_threshold_data['data']['RxPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = channel_threshold_data['data']['RxPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = channel_threshold_data['data']['RxPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['txbiashighalarm'] = channel_threshold_data['data']['TxBiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = channel_threshold_data['data']['TxBiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = channel_threshold_data['data']['TxBiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = channel_threshold_data['data']['TxBiasLowWarning']['value']
+
+            else:
+                return transceiver_dom_threshold_dict
+        else:
+            #SFP
+            if (module_threshold_data is not None):
+                #Threshold Data
+                transceiver_dom_threshold_dict['temphighalarm'] = module_threshold_data['data']['TempHighAlarm']['value']
+                transceiver_dom_threshold_dict['templowalarm'] = module_threshold_data['data']['TempLowAlarm']['value']
+                transceiver_dom_threshold_dict['temphighwarning'] = module_threshold_data['data']['TempHighWarning']['value']
+                transceiver_dom_threshold_dict['templowwarning'] = module_threshold_data['data']['TempLowWarning']['value']
+                transceiver_dom_threshold_dict['vcchighalarm'] = module_threshold_data['data']['VoltageHighAlarm']['value']
+                transceiver_dom_threshold_dict['vcclowalarm'] = module_threshold_data['data']['VoltageLowAlarm']['value']
+                transceiver_dom_threshold_dict['vcchighwarning'] = module_threshold_data['data']['VoltageHighWarning']['value']
+                transceiver_dom_threshold_dict['vcclowwarning'] = module_threshold_data['data']['VoltageLowWarning']['value']
+                transceiver_dom_threshold_dict['txbiashighalarm'] = module_threshold_data['data']['BiasHighAlarm']['value']
+                transceiver_dom_threshold_dict['txbiaslowalarm'] = module_threshold_data['data']['BiasLowAlarm']['value']
+                transceiver_dom_threshold_dict['txbiashighwarning'] = module_threshold_data['data']['BiasHighWarning']['value']
+                transceiver_dom_threshold_dict['txbiaslowwarning'] = module_threshold_data['data']['BiasLowWarning']['value']
+                transceiver_dom_threshold_dict['txpowerhighalarm'] = module_threshold_data['data']['TXPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['txpowerlowalarm'] = module_threshold_data['data']['TXPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['txpowerhighwarning'] = module_threshold_data['data']['TXPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['txpowerlowwarning'] = module_threshold_data['data']['TXPowerLowWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerhighalarm'] = module_threshold_data['data']['RXPowerHighAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerlowalarm'] = module_threshold_data['data']['RXPowerLowAlarm']['value']
+                transceiver_dom_threshold_dict['rxpowerhighwarning'] = module_threshold_data['data']['RXPowerHighWarning']['value']
+                transceiver_dom_threshold_dict['rxpowerlowwarning'] = module_threshold_data['data']['RXPowerLowWarning']['value']
+            else:
+                return transceiver_dom_threshold_dict
+
+        return transceiver_dom_threshold_dict
+
+    def get_transceiver_bulk_status(self):
+        """
+        Retrieves transceiver bulk status of this SFP
+        """
+        tx_bias_list = []
+        rx_power_list = []
+        transceiver_dom_dict = {}
+        transceiver_dom_dict = dict.fromkeys(dom_dict_keys, 'N/A')
+
+        # RxLos
+        rx_los = self.get_rx_los()
+
+        # TxFault
+        tx_fault = self.get_tx_fault()
+
+        # ResetStatus
+        reset_state = self.get_reset_status()
+
+        # LowPower Mode
+        lp_mode = self.get_lpmode()
+
+        # TxDisable
+        tx_disable = self.get_tx_disable()
+
+        # TxDisable Channel
+        tx_disable_channel = self.get_tx_disable_channel()
+
+        # Temperature
+        temperature = self.get_temperature()
+
+        # Voltage
+        voltage = self.get_voltage()
+
+        # Channel Monitor
+        tx_power_list = self.get_tx_power()
+
+        # tx bias
+        tx_bias_list = self.get_tx_bias()
+
+        # rx power
+        rx_power_list = self.get_rx_power()
+
+        if (len(tx_bias_list) != 0):
+            transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
+            transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
+            transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
+            transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
+
+        if (len(rx_power_list) != 0):
+            transceiver_dom_dict['rx1power'] = rx_power_list[0]
+            transceiver_dom_dict['rx2power'] = rx_power_list[1]
+            transceiver_dom_dict['rx3power'] = rx_power_list[2]
+            transceiver_dom_dict['rx4power'] = rx_power_list[3]
+
+        if (len(tx_power_list) != 0):
+            transceiver_dom_dict['tx1power'] = tx_power_list[0]
+            transceiver_dom_dict['tx2power'] = tx_power_list[1]
+            transceiver_dom_dict['tx3power'] = tx_power_list[2]
+            transceiver_dom_dict['tx4power'] = tx_power_list[3]
+
+        transceiver_dom_dict['rx_los'] = rx_los
+        transceiver_dom_dict['tx_fault'] = tx_fault
+        transceiver_dom_dict['reset_status'] = reset_state
+        transceiver_dom_dict['power_lpmode'] = lp_mode
+        transceiver_dom_dict['tx_disable'] = tx_disable
+        transceiver_dom_dict['tx_disable_channel'] = tx_disable_channel
+        transceiver_dom_dict['temperature'] = temperature
+        transceiver_dom_dict['voltage'] = voltage
+
+        return transceiver_dom_dict
+
+    def get_name(self):
+        """
+        Retrieves the name of the sfp
+        Returns : QSFP or QSFP+ or QSFP28
+        """
+
+        iface_data = self._get_eeprom_data('type')
+        if (iface_data is not None):
+            identifier = iface_data['data']['type']['value']
+        else:
+            return None
+
+        return identifier
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the sfp
+        Returns : True if sfp is present and false if it is absent
+        """
+        # Check for invalid port_num
+
+        # Port offset starts with 0x4004
+        port_offset = 16388 + ((self.index-1) * 16)
+
+        status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+        reg_value = int(status)
+
+        # Absence of status throws error
+        if (reg_value == ""):
+            return False
+
+        # Mask off 4th bit for presence
+        if(self.sfp_type == 'QSFP'):
+            mask = (1 << 4)
+
+        # Mask off 1st bit for presence 65,66
+        if (self.sfp_type == 'SFP'):
+            mask =  (1 << 0)
+        # ModPrsL is active low
+        if reg_value & mask == 0:
+            return True
+
+        return False
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the sfp
+        """
+        vendor_pn_data = self._get_eeprom_data('model')
+        if (vendor_pn_data is not None):
+            vendor_pn = vendor_pn_data['data']['Vendor PN']['value']
+        else:
+            return None
+
+        return vendor_pn
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the sfp
+        """
+        vendor_sn_data = self._get_eeprom_data('serial')
+        if (vendor_sn_data is not None):
+            vendor_sn = vendor_sn_data['data']['Vendor SN']['value']
+        else:
+            return None
+
+        return vendor_sn
+
+    def get_reset_status(self):
+        """
+        Retrives the reset status of SFP
+        """
+        reset_status = False
+        if (self.sfp_type == 'QSFP'):
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((self.index-1) * 16)
+
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            reg_value = int(status)
+
+            # Absence of status throws error
+            if (reg_value == ""):
+                return reset_status
+
+            # Mask off 4th bit for reset status
+            mask = (1 << 4)
+
+            if ((reg_value & mask) == 0):
+                reset_status = True
+            else:
+                reset_status = False
+
+        return reset_status
+
+    def get_rx_los(self):
+        """
+        Retrieves the RX LOS (lost-of-signal) status of SFP
+        """
+        rx_los = None
+        rx_los_list = []
+        if (self.sfp_type == 'QSFP'):
+            rx_los_data = self._get_eeprom_data('rx_los')
+            if (rx_los_data is not None):
+                rx_los = rx_los_data['data']['Rx1LOS']['value']
+                if (rx_los is 'On'):
+                    rx_los_list.append(True)
+                else:
+                    rx_los_list.append(False)
+                rx_los = rx_los_data['data']['Rx2LOS']['value']
+                if (rx_los is 'On'):
+                    rx_los_list.append(True)
+                else:
+                    rx_los_list.append(False)
+                rx_los = rx_los_data['data']['Rx3LOS']['value']
+                if (rx_los is 'On'):
+                    rx_los_list.append(True)
+                else:
+                    rx_los_list.append(False)
+                rx_los = rx_los_data['data']['Rx4LOS']['value']
+                if (rx_los is 'On'):
+                    rx_los_list.append(True)
+                else:
+                    rx_los_list.append(False)
+
+                if (rx_los_list[0] and rx_los_list[1]
+                        and rx_los_list[2] and rx_los_list[3]):
+                    rx_los = True
+                else:
+                    rx_los = False
+        else:
+            rx_los_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            if (rx_los_data is not None):
+                data = int(rx_los_data[0], 16)
+                rx_los = (sffbase().test_bit(data, 1) != 0)
+
+        return rx_los
+
+    def get_tx_fault(self):
+        """
+        Retrieves the TX fault status of SFP
+        """
+        tx_fault = None
+        tx_fault_list = []
+        if (self.sfp_type == 'QSFP'):
+            tx_fault_data = self._get_eeprom_data('tx_fault')
+            if (tx_fault_data is not None):
+                tx_fault = tx_fault_data['data']['Tx1Fault']['value']
+                if (tx_fault is 'On'):
+                    tx_fault_list.append(True)
+                else:
+                    tx_fault_list.append(False)
+                tx_fault = tx_fault_data['data']['Tx2Fault']['value']
+                if (tx_fault is 'On'):
+                    tx_fault_list.append(True)
+                else:
+                    tx_fault_list.append(False)
+                tx_fault = tx_fault_data['data']['Tx3Fault']['value']
+                if (tx_fault is 'On'):
+                    tx_fault_list.append(True)
+                else:
+                    tx_fault_list.append(False)
+                tx_fault = tx_fault_data['data']['Tx4Fault']['value']
+                if (tx_fault is 'On'):
+                    tx_fault_list.append(True)
+                else:
+                    tx_fault_list.append(False)
+
+                if (tx_fault_list[0] and tx_fault_list[1]
+                        and tx_fault_list[2] and tx_fault_list[3]):
+                    tx_fault = True
+                else:
+                    tx_fault = False
+
+        else:
+            tx_fault_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            if (tx_fault_data is not None):
+                data = int(tx_fault_data[0], 16)
+                tx_fault = (sffbase().test_bit(data, 2) != 0)
+
+        return tx_fault
+
+    def get_tx_disable(self):
+        """
+        Retrieves the tx_disable status of this SFP
+        """
+        tx_disable = None
+        tx_disable_list = []
+        if (self.sfp_type == 'QSFP'):
+            tx_disable_data = self._get_eeprom_data('tx_disable')
+            if (tx_disable_data is not None):
+                tx_disable = tx_disable_data['data']['Tx1Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(True)
+                else:
+                    tx_disable_list.append(False)
+                tx_disable = tx_disable_data['data']['Tx2Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(True)
+                else:
+                    tx_disable_list.append(False)
+                tx_disable = tx_disable_data['data']['Tx3Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(True)
+                else:
+                    tx_disable_list.append(False)
+                tx_disable = tx_disable_data['data']['Tx4Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(True)
+                else:
+                    tx_disable_list.append(False)
+
+                if (tx_disable_list[0] and tx_disable_list[1]
+                        and tx_disable_list[2] and tx_disable_list[3]):
+                    tx_disable = True
+                else:
+                    tx_disable = False
+
+        else:
+            tx_disable_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            if (tx_disable_data is not None):
+                data = int(tx_disable_data[0], 16)
+                tx_disable_hard = (sffbase().test_bit(data, SFP_TX_DISABLE_HARD_BIT) != 0)
+                tx_disable_soft = (sffbase().test_bit(data, SFP_TX_DISABLE_SOFT_BIT) != 0)
+                tx_disable = tx_disable_hard | tx_disable_soft
+
+
+        return tx_disable
+
+    def get_tx_disable_channel(self):
+        """
+        Retrieves the TX disabled channels in this SFP
+        """
+        tx_disable = None
+        tx_disable_list = []
+        tx_disable_channel = 0
+
+        if (self.sfp_type == 'QSFP'):
+            tx_disable_data = self._get_eeprom_data('tx_disable')
+            if (tx_disable_data is not None):
+                tx_disable = tx_disable_data['data']['Tx1Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(1)
+                else:
+                    tx_disable_list.append(0)
+                tx_disable = tx_disable_data['data']['Tx2Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(1)
+                else:
+                    tx_disable_list.append(0)
+                tx_disable = tx_disable_data['data']['Tx3Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(1)
+                else:
+                    tx_disable_list.append(0)
+                tx_disable = tx_disable_data['data']['Tx4Disable']['value']
+                if (tx_disable is 'On'):
+                    tx_disable_list.append(1)
+                else:
+                    tx_disable_list.append(0)
+
+                bit4 = int(tx_disable_list[3]) * 8
+                bit3 = int(tx_disable_list[2]) * 4
+                bit2 = int(tx_disable_list[1]) * 2
+                bit1 = int(tx_disable_list[0]) * 1
+
+                tx_disable_channel = hex(bit4 + bit3 + bit2 + bit1)
+
+        return tx_disable_channel
+
+    def get_lpmode(self):
+        """
+        Retrieves the lpmode(low power mode) of this SFP
+        """
+        lpmode_state = False
+        if (self.sfp_type == 'QSFP'):
+
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((self.index-1) * 16)
+
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            reg_value = int(status)
+
+            # Absence of status throws error
+            if (reg_value == ""):
+                return lpmode_state
+
+            # Mask off 6th bit for lpmode
+            mask = (1 << 6)
+
+            # LPMode is active high
+            if reg_value & mask == 0:
+                lpmode_state = False
+            else:
+                lpmode_state = True
+
+        return lpmode_state
+
+    def get_power_override(self):
+        """
+        Retrieves the power-override status of this SFP
+        """
+        power_override_state = False
+
+        if (self.sfp_type == 'QSFP'):
+            power_override_data = self._get_eeprom_data('power_override')
+            if (power_override_data is not None):
+                power_override = power_override_data['data']['PowerOverRide']['value']
+                if (power_override is 'On'):
+                    power_override_state = True
+                else:
+                    power_override_state = False
+
+        return power_override_state
+
+    def get_temperature(self):
+        """
+        Retrieves the temperature of this SFP
+        """
+        temperature = None
+
+        temperature_data = self._get_eeprom_data('Temperature')
+        if (temperature_data is not None):
+            temperature = temperature_data['data']['Temperature']['value']
+
+        return temperature
+
+    def get_voltage(self):
+        """
+        Retrieves the supply voltage of this SFP
+        """
+        voltage = None
+
+        voltage_data = self._get_eeprom_data('Voltage')
+        if (voltage_data is not None):
+            voltage = voltage_data['data']['Vcc']['value']
+
+        return voltage
+
+    def get_tx_bias(self):
+        """
+        Retrieves the TX bias current of this SFP
+        """
+        tx_bias = None
+        tx_bias_list = []
+
+        tx_bias_data = self._get_eeprom_data('ChannelMonitor')
+        if (tx_bias_data is not None):
+            if (self.sfp_type == 'QSFP'):
+                tx_bias = tx_bias_data['data']['TX1Bias']['value']
+                tx_bias_list.append(tx_bias)
+                tx_bias = tx_bias_data['data']['TX2Bias']['value']
+                tx_bias_list.append(tx_bias)
+                tx_bias = tx_bias_data['data']['TX3Bias']['value']
+                tx_bias_list.append(tx_bias)
+                tx_bias = tx_bias_data['data']['TX4Bias']['value']
+                tx_bias_list.append(tx_bias)
+            else:
+                tx1_bias = tx_bias_data['data']['TXBias']['value']
+                return [tx1_bias, "N/A", "N/A", "N/A"]
+
+        return tx_bias_list
+
+    def get_rx_power(self):
+        """
+        Retrieves the received optical power for this SFP
+        """
+        rx_power = None
+        rx_power_list = []
+
+        rx_power_data = self._get_eeprom_data('ChannelMonitor')
+        if (rx_power_data is not None):
+            if (self.sfp_type == 'QSFP'):
+                rx_power = rx_power_data['data']['RX1Power']['value']
+                rx_power_list.append(rx_power)
+                rx_power = rx_power_data['data']['RX2Power']['value']
+                rx_power_list.append(rx_power)
+                rx_power = rx_power_data['data']['RX3Power']['value']
+                rx_power_list.append(rx_power)
+                rx_power = rx_power_data['data']['RX4Power']['value']
+                rx_power_list.append(rx_power)
+            else:
+                rx1_pw = rx_power_data['data']['RXPower']['value']
+                return [rx1_pw, "N/A", "N/A", "N/A"]
+
+        return rx_power_list
+
+    def get_tx_power(self):
+        """
+        Retrieves the TX power of this SFP
+        """
+        tx_power_list = []
+        if(self.sfp_type == 'QSFP'):
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qspf_dom_capability_data = self._get_eeprom_data('dom_capability')
+            qsfp_dom_rev_data = self._get_eeprom_data('dom_rev')
+            if (qspf_dom_capability_data is not None and qsfp_dom_rev_data is not None):
+                qsfp_dom_rev = qsfp_dom_rev_data['data']['dom_rev']['value']
+                qsfp_tx_power_support = qspf_dom_capability_data['data']['Tx_power_support']['value']
+            else:
+                return tx_power_list
+
+            # The tx_power monitoring is only available on QSFP which compliant with SFF-8636
+            # and claimed that it support tx_power with one indicator bit.
+            if (qsfp_dom_rev[0:8] != 'SFF-8636' or (qsfp_dom_rev[0:8] == 'SFF-8636' and qsfp_tx_power_support != 'on')):
+                return tx_power_list
+            else:
+                channel_monitor_data = self._get_eeprom_data('ChannelMonitor_TxPower')
+                if (channel_monitor_data is not None):
+                    tx1_pw = channel_monitor_data['data']['TX1Power']['value']
+                    tx2_pw = channel_monitor_data['data']['TX2Power']['value']
+                    tx3_pw = channel_monitor_data['data']['TX3Power']['value']
+                    tx4_pw = channel_monitor_data['data']['TX4Power']['value']
+                else:
+                    return tx_power_list
+
+        else:
+            channel_monitor_data = self._get_eeprom_data('ChannelMonitor')
+            if (channel_monitor_data is not None):
+                tx1_pw = channel_monitor_data['data']['TXPower']['value'] 
+                tx2_pw = 'N/A'
+                tx3_pw = 'N/A'
+                tx4_pw = 'N/A'
+            else:
+                return tx_power_list
+
+        tx_power_list.append(tx1_pw)
+        tx_power_list.append(tx2_pw)
+        tx_power_list.append(tx3_pw)
+        tx_power_list.append(tx4_pw)
+
+        return tx_power_list
+
+    def reset(self):
+        """
+        Reset the SFP and returns all user settings to their default state
+        """
+        if (self.sfp_type == 'QSFP'):
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((self.index-1) * 16)
+
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            reg_value = int(status)
+
+            # Absence of status throws error
+            if (reg_value == ""):
+                return False
+
+            # Mask off 4th bit for reset
+            mask = (1 << 4)
+
+            # ResetL is active low
+            reg_value = reg_value & ~mask
+
+            # Convert our register value back to a hex string and write back
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+
+            # Sleep 1 second to allow it to settle
+            time.sleep(1)
+
+            reg_value = reg_value | mask
+
+            # Convert our register value back to a hex string and write back
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+
+            return True
+
+        else:
+            return False
+
+    def set_lpmode(self, lpmode):
+        """
+        Sets the lpmode(low power mode) of this SFP
+        """
+        if (self.sfp_type == 'QSFP'):
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((self.index-1) * 16)
+
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            reg_value = int(status)
+
+            # Absence of status throws error
+            if (reg_value == ""):
+                return False
+
+            # Mask off 6th bit for lowpower mode
+            mask = (1 << 6)
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode is True:
+                reg_value = reg_value | mask
+            else:
+                reg_value = reg_value & ~mask
+
+            # Convert our register value back to a hex string and write back
+            self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+
+            return True
+
+        else:
+            return False
+
+    def tx_disable(self, tx_disable):
+        """
+        Disable SFP TX for all channels
+        """
+        return False
+
+    def tx_disable_channel(self, channel, disable):
+        """
+        Sets the tx_disable for specified SFP channels
+        """
+        return False
+
+    def set_power_override(self, power_override, power_set):
+        """
+        Sets SFP power level using power_override and power_set
+        """
+        return False
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        """
+        reset = self.get_reset_status()
+
+        if (reset == True):
+            status = False
+        else:
+            status = True
+
+        return status
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/thermal.py
new file mode 100644
index 000000000000..b78fca2dc776
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/thermal.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+
+########################################################################
+# DellEMC S5248F
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Thermals' information which are available in the platform
+#
+########################################################################
+
+
+try:
+    from sonic_platform_base.thermal_base import ThermalBase
+    from sonic_platform.ipmihelper import IpmiSensor
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Thermal(ThermalBase):
+    """DellEMC Platform-specific Thermal class"""
+
+    # [ Sensor-Name, Sensor-ID ]
+    SENSOR_MAPPING = [
+        ['CPU On-board', 0xe],
+        ['ASIC On-board', 0x2],
+        ['System Front Left', 0x3],
+        ['System Front Middle', 0x1],
+        ['System Front Right', 0x4],
+        ['Inlet Airflow Sensor', 0x5],
+        ['PSU1 Airflow Sensor', 0x7],
+        ['PSU2 Airflow Sensor', 0x8]
+    ]
+
+    def __init__(self, thermal_index):
+        ThermalBase.__init__(self)
+        self.index = thermal_index + 1
+        self.sensor = IpmiSensor(self.SENSOR_MAPPING[self.index - 1][1])
+
+    def get_name(self):
+        """
+        Retrieves the name of the thermal
+
+        Returns:
+            string: The name of the thermal
+        """
+        return self.SENSOR_MAPPING[self.index - 1][0]
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the thermal
+
+        Returns:
+            bool: True if thermal is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the Thermal
+
+        Returns:
+            string: Model/part number of Thermal
+        """
+        return 'NA'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the Thermal
+
+        Returns:
+            string: Serial number of Thermal
+        """
+        return 'NA'
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the thermal
+
+        Returns:
+            A boolean value, True if thermal is operating properly,
+            False if not
+        """
+        return True
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to
+            nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        is_valid, temperature = self.sensor.get_reading()
+        if not is_valid:
+            temperature = 0
+
+        #return "{:.3f}".format(temperature)
+        return float(temperature)
+
+    def get_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of thermal
+
+        Returns:
+            A float number, the high threshold temperature of thermal in
+            Celsius up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        """
+        is_valid, high_threshold = self.sensor.get_threshold("UpperNonCritical")
+        if not is_valid:
+            return super(Thermal, self).get_high_threshold()
+
+        #return "{:.3f}".format(high_threshold)
+        return float(high_threshold)
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high critical threshold temperature of thermal
+
+        Returns:
+            A float number, the high critical threshold temperature of thermal in
+            Celsius up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        """
+        is_valid, high_crit_threshold = self.sensor.get_threshold("UpperCritical")
+        if not is_valid:
+            return super(Thermal, self).get_high_critical_threshold()
+
+        #return "{:.3f}".format(high_crit_threshold)
+        return float(high_crit_threshold)
+
+    def get_low_threshold(self):
+        """
+        Retrieves the low threshold temperature of thermal
+
+        Returns:
+            A float number, the low threshold temperature of thermal in
+            Celsius up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        """
+        is_valid, low_threshold = self.sensor.get_threshold("LowerNonRecoverable")
+        if not is_valid:
+            low_threshold = 0
+
+        #return "{:.3f}".format(low_threshold)
+        return float(low_threshold)
+
+    def set_high_threshold(self, temperature):
+        """
+        Sets the high threshold temperature of thermal
+
+        Args :
+            temperature: A float number up to nearest thousandth of one
+            degree Celsius, e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if
+            not
+        """
+        # Thermal threshold values are pre-defined based on HW.
+        return False
+
+    def set_low_threshold(self, temperature):
+        """
+        Sets the low threshold temperature of thermal
+
+        Args :
+            temperature: A float number up to nearest thousandth of one
+            degree Celsius, e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if
+            not
+        """
+        # Thermal threshold values are pre-defined based on HW.
+        return False
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/watchdog.py
new file mode 100644
index 000000000000..d6131821cdf4
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/watchdog.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+
+########################################################################
+#
+# DELLEMC S5248f
+#
+# Abstract base class for implementing a platform-specific class with
+# which to interact with a hardware watchdog module in SONiC
+#
+########################################################################
+
+try:
+    import ctypes
+    import subprocess
+    import syslog
+    import sonic_platform.component as Component
+    from sonic_platform_base.watchdog_base import WatchdogBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class _timespec(ctypes.Structure):
+    _fields_ = [
+            ('tv_sec', ctypes.c_long),
+            ('tv_nsec', ctypes.c_long)
+    ]
+
+
+class Watchdog(WatchdogBase):
+    """
+    Abstract base class for interfacing with a hardware watchdog module
+    """
+
+    TIMERS = [15,20,30,40,50,60,65,70,80,100,120,140,160,180,210,240]
+
+    armed_time = 0
+    timeout = 0
+    CLOCK_MONOTONIC = 1
+
+    def __init__(self):
+        self._librt = ctypes.CDLL('librt.so.1', use_errno=True)
+        self._clock_gettime = self._librt.clock_gettime
+        self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]
+
+    def _get_command_result(self, cmdline):
+        try:
+            proc = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            result = stdout.rstrip('\n'.encode())
+        except OSError:
+            result = None
+
+        return result
+
+    def _get_reg_val(self):
+        # 0x31 = CPLD I2C Base Address
+        # 0x07 = Watchdog Function Register
+        value = self._get_command_result("/usr/sbin/i2cget -y 601 0x31 0x07")
+        if not value:
+            return None
+        else:
+            return int(value, 16)
+
+    def _set_reg_val(self,val):
+        # 0x31 = CPLD I2C Base Address
+        # 0x07 = Watchdog Function Register
+        value = self._get_command_result("/usr/sbin/i2cset -y 601 0x31 0x07 %s"
+                % (val))
+        return value
+
+    def _get_time(self):
+        """
+        To get clock monotonic time
+        """
+        ts = _timespec()
+        if self._clock_gettime(self.CLOCK_MONOTONIC, ctypes.pointer(ts)) != 0:
+            self._errno = ctypes.get_errno()
+            return 0
+        return ts.tv_sec + ts.tv_nsec * 1e-9
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog with a timeout of <seconds> seconds.
+        If the watchdog is currently armed, calling this function will
+        simply reset the timer to the provided value. If the underlying
+        hardware does not support the value provided in <seconds>, this
+        method should arm the watchdog with the *next greater*
+        available value.
+
+        Returns:
+            An integer specifying the *actual* number of seconds the
+            watchdog was armed with. On failure returns -1.
+        """
+        timer_offset = -1
+        for key,timer_seconds in enumerate(self.TIMERS):
+            if seconds <= timer_seconds:
+                timer_offset = key
+                seconds = timer_seconds
+                break
+
+        if timer_offset == -1:
+            return -1
+
+        cpld_version = Component.get_cpld0_version()
+        wd_enabled_version = "0.8"
+
+        if cpld_version < wd_enabled_version:
+            syslog.syslog(syslog.LOG_ERR,
+                    'Older System CPLD ver, Update to 0.8 to support watchdog ')
+            return -1
+
+        # Extracting 5th to 8th bits for WD timer values
+        reg_val = self._get_reg_val()
+        wd_timer_offset = (reg_val >> 4) & 0xf
+
+        if wd_timer_offset != timer_offset:
+            # Setting 5th to 7th bits
+            # value from timer_offset
+            self.disarm()
+            self._set_reg_val((reg_val & 0x07) | (timer_offset << 4))
+
+        if self.is_armed():
+            # Setting last bit to WD Timer punch
+            # Last bit = WD Timer punch
+            self._set_reg_val(reg_val & 0xFE)
+
+            self.armed_time = self._get_time()
+            self.timeout = seconds
+            return seconds
+        else:
+            # Setting 4th bit to enable WD
+            # 4th bit = Enable WD
+            reg_val = self._get_reg_val()
+            self._set_reg_val(reg_val | 0x8)
+
+            self.armed_time = self._get_time()
+            self.timeout = seconds
+            return seconds
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False
+            if not
+        """
+        if self.is_armed():
+            # Setting 4th bit to disable WD
+            # 4th bit = Disable WD
+            reg_val = self._get_reg_val()
+            self._set_reg_val(reg_val & 0xF7)
+
+            self.armed_time = 0
+            self.timeout = 0
+            return True
+
+        return False
+
+    def is_armed(self):
+        """
+        Retrieves the armed state of the hardware watchdog.
+
+        Returns:
+            A boolean, True if watchdog is armed, False if not
+        """
+
+        # Extracting 4th bit to get WD Enable/Disable status
+        # 0 - Disabled WD
+        # 1 - Enabled WD
+        reg_val = self._get_reg_val()
+        wd_offset = (reg_val >> 3) & 1
+
+        return bool(wd_offset)
+
+    def get_remaining_time(self):
+        """
+        If the watchdog is armed, retrieve the number of seconds
+        remaining on the watchdog timer
+
+        Returns:
+            An integer specifying the number of seconds remaining on
+            their watchdog timer. If the watchdog is not armed, returns
+            -1.
+
+            S5248f doesnot have hardware support to show remaining time.
+            Due to this limitation, this API is implemented in software.
+            This API would return correct software time difference if it
+            is called from the process which armed the watchdog timer.
+            If this API called from any other process, it would return
+            0. If the watchdog is not armed, this API would return -1.
+        """
+        if not self.is_armed():
+            return -1
+
+        if self.armed_time > 0 and self.timeout != 0:
+            cur_time = self._get_time()
+
+            if cur_time <= 0:
+                return 0
+
+            diff_time = int(cur_time - self.armed_time)
+
+            if diff_time > self.timeout:
+                return self.timeout
+            else:
+                return self.timeout - diff_time
+
+        return 0
+

From 93a9dcb587246b1744e07eed6d1660f82ec72c21 Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Tue, 29 Jun 2021 21:37:11 +0300
Subject: [PATCH 0601/1674] [sonic-sairedis][sonic-utilities][202012] submodule
 update (#7998)

Update submodule for sonic-utilities to include the following PRs:

80b7b54 Pcieutil to load the platform api first instead of using common api (sonic-utilities#1672)
3d5e93d [Mellanox] Update mellanox dump generation to include SDK dumps (sonic-utilities#1640)
a805efc [ci]: Fix config prompt question issue (sonic-utilities#1693)
33c6d79 [vnet_route_check] Fix logic for getting VNET routes from ASIC DB (sonic-utilities#1653)

Update submodule for sonic-sairedis to include the following PRs:

74b5808 [Mellanox] Update mellanoxs dump generation to include SDK dumps (sonic-sairedis#833)
5ff9305 Fix azure-pipelines branch reference error, change master to 202012 (sonic-sairedis#834)
---
 src/sonic-sairedis  | 2 +-
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index bb13d59ba6af..74b580820419 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit bb13d59ba6af76f23a6121aa9a0200f1b4cfdd2d
+Subproject commit 74b580820419bd930deecc8ef40f6e3ee91dcc91
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 8b64f005f9d8..80b7b54fecb9 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 8b64f005f9d8207881f6904f0d6989d381b8e5fa
+Subproject commit 80b7b54fecb95d0c57fa99636d47c6b407f69eb3

From 1e0af83f6aea4c61e61a8b538e9ef7dc6c8e44f0 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 30 Jun 2021 03:49:58 +0800
Subject: [PATCH 0602/1674] [sonic-swss][202012] submodule update (#8011)

Advance submodule head for sonic-swss on 202012

bb383be2 [Dynamic Buffer Calc][Mellanox] Bug fixes and enhancements for the lua plugins for buffer pool calculation and headroom checking (Azure/sonic-swss#1781)
f949dfe9 [Dynamic Buffer Calc] Avoid creating lossy PG for admin down ports during initialization (Azure/sonic-swss#1776)
def0a914 Fix config prompt question issue (Azure/sonic-swss#1799)
21f97506 [ci]: Merge azure pipelines from master to 202012 branch (Azure/sonic-swss#1764)
a83a2a42 [vstest]: add dvs_route fixture
849bdf9c [Mux] Add support for mux metrics to State DB (Azure/sonic-swss#1757)
386de717 [qosorch] Dot1p map list initialization fix (Azure/sonic-swss#1746)
f99abdca [sub intf] Port object reference count update (Azure/sonic-swss#1712)
4a00042d [vstest/nhg]: use dvs_route fixture to make test_nhg more robust

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 22fbb5c9f21e..bb383be2042d 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 22fbb5c9f21e0f1273463048b5a63120ce0c1696
+Subproject commit bb383be2042ddff03416ed918db26126c53b8464

From f281ea269ea90ef3519fdec0bf498303acb2ef34 Mon Sep 17 00:00:00 2001
From: roman_savchuk <romanx.savchuk@intel.com>
Date: Wed, 30 Jun 2021 01:21:15 +0300
Subject: [PATCH 0603/1674] [Arista] Generated pcie.yml for
 x86_64-arista_7170_64c (#7906)

Signed-off-by: Roman Savchuk <romanx.savchuk@intel.com>
Why I did it
Platform pcie configuration file doesn't exist for x86_64-arista_7170_64c

How I did it
Generate pcie.yml

How to verify it
Started pcie daemon (pcied RUNNING pid 63, uptime 0:00:19)
---
 .../arista/x86_64-arista_7170_64c/pcie.yaml   | 433 ++++++++++++++++++
 1 file changed, 433 insertions(+)
 create mode 100644 device/arista/x86_64-arista_7170_64c/pcie.yaml

diff --git a/device/arista/x86_64-arista_7170_64c/pcie.yaml b/device/arista/x86_64-arista_7170_64c/pcie.yaml
new file mode 100644
index 000000000000..eafae4eb1472
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_64c/pcie.yaml
@@ -0,0 +1,433 @@
+- bus: '00'
+  dev: '00'
+  fn: '0'
+  id: 6f00
+  name: 'Host bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+    (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 6f02
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '01'
+  fn: '1'
+  id: 6f03
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 1 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '0'
+  id: 6f04
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '02'
+  fn: '2'
+  id: 6f06
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 2 (rev 03)'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '0'
+  id: 6f28
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Map/VTd_Misc/System Management (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '1'
+  id: 6f29
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO Hot Plug (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '2'
+  id: 6f2a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D IIO RAS/Control Status/Global Errors (rev 03)'
+- bus: '00'
+  dev: '05'
+  fn: '4'
+  id: 6f2c
+  name: 'PIC: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC (rev
+    03)'
+- bus: '00'
+  dev: '14'
+  fn: '0'
+  id: 8c31
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    xHCI (rev 05)'
+- bus: '00'
+  dev: 1a
+  fn: '0'
+  id: 8c2d
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #2 (rev 05)'
+- bus: '00'
+  dev: 1c
+  fn: '0'
+  id: 8c10
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #1 (rev d5)'
+- bus: '00'
+  dev: 1c
+  fn: '4'
+  id: 8c18
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #5 (rev d5)'
+- bus: '00'
+  dev: 1d
+  fn: '0'
+  id: 8c26
+  name: 'USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB
+    EHCI #1 (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '0'
+  id: 8c54
+  name: 'ISA bridge: Intel Corporation C224 Series Chipset Family Server Standard
+    SKU LPC Controller (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '3'
+  id: 8c22
+  name: 'SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller
+    (rev 05)'
+- bus: '00'
+  dev: 1f
+  fn: '6'
+  id: 8c24
+  name: 'Signal processing controller: Intel Corporation 8 Series Chipset Family Thermal
+    Management Controller (rev 05)'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: '1682'
+  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
+    PCIe (rev 20)'
+- bus: '02'
+  dev: '00'
+  fn: '0'
+  id: '1682'
+  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
+    PCIe (rev 20)'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: 6f50
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 0'
+- bus: '03'
+  dev: '00'
+  fn: '1'
+  id: 6f51
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 1'
+- bus: '03'
+  dev: '00'
+  fn: '2'
+  id: 6f52
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 2'
+- bus: '03'
+  dev: '00'
+  fn: '3'
+  id: 6f53
+  name: 'System peripheral: Intel Corporation Xeon Processor D Family QuickData Technology
+    Register DMA Channel 3'
+- bus: '04'
+  dev: '00'
+  fn: '0'
+  id: 15ab
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection X552 10 GbE Backplane'
+- bus: '04'
+  dev: '00'
+  fn: '1'
+  id: 15ab
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection X552 10 GbE Backplane'
+- bus: '06'
+  dev: '00'
+  fn: '0'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001'
+- bus: '07'
+  dev: '00'
+  fn: '0'
+  id: '0010'
+  name: 'Unassigned class [ff00]: Device 1d1c:0010 (rev 10)'
+- bus: ff
+  dev: 0b
+  fn: '0'
+  id: 6f81
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '1'
+  id: 6f36
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '2'
+  id: 6f37
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '0'
+  id: 6fe0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0c
+  fn: '1'
+  id: 6fe1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '0'
+  id: 6ff8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '4'
+  id: 6ffc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '5'
+  id: 6ffd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: 0f
+  fn: '6'
+  id: 6ffe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Caching Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '0'
+  id: 6f1d
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '1'
+  id: 6f34
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D R2PCIe Agent (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '5'
+  id: 6f1e
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '6'
+  id: 6f7d
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '10'
+  fn: '7'
+  id: 6f1f
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Ubox (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '0'
+  id: 6fa0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '12'
+  fn: '1'
+  id: 6f30
+  name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Home Agent 0 (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '0'
+  id: 6fa8
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '1'
+  id: 6f71
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Target Address/Thermal/RAS (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '2'
+  id: 6faa
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '3'
+  id: 6fab
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '4'
+  id: 6fac
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '5'
+  id: 6fad
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel Target Address Decoder (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '6'
+  id: 6fae
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Broadcast (rev 03)'
+- bus: ff
+  dev: '13'
+  fn: '7'
+  id: 6faf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Global Broadcast (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '0'
+  id: 6fb0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '1'
+  id: 6fb1
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Thermal Control (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '2'
+  id: 6fb2
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 0 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '3'
+  id: 6fb3
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 1 Error (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '4'
+  id: 6fbc
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '5'
+  id: 6fbd
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '6'
+  id: 6fbe
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '14'
+  fn: '7'
+  id: 6fbf
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D DDRIO Channel 0/1 Interface (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '0'
+  id: 6fb4
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '1'
+  id: 6fb5
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Thermal Control (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '2'
+  id: 6fb6
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 2 Error (rev 03)'
+- bus: ff
+  dev: '15'
+  fn: '3'
+  id: 6fb7
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Memory Controller 0 - Channel 3 Error (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '0'
+  id: 6f98
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '1'
+  id: 6f99
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '2'
+  id: 6f9a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '3'
+  id: 6fc0
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1e
+  fn: '4'
+  id: 6f9c
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '0'
+  id: 6f88
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'
+- bus: ff
+  dev: 1f
+  fn: '2'
+  id: 6f8a
+  name: 'System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
+    D Power Control Unit (rev 03)'

From d9b1089a3caa0b6abf871dfd35787779fa014a8f Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 30 Jun 2021 10:54:54 +0800
Subject: [PATCH 0604/1674] Enable reproducible build for git in 202012 branch.
 (redo 6562) (#7994)

---
 Makefile.work                   |  2 +-
 src/sonic-build-hooks/hooks/git | 76 +++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100755 src/sonic-build-hooks/hooks/git

diff --git a/Makefile.work b/Makefile.work
index a084fc68bee3..b4cbdc56ae88 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -137,7 +137,7 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QE
 $(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
-SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
 
 OVERLAY_MODULE_CHECK := \
diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
new file mode 100755
index 000000000000..e39c17f89739
--- /dev/null
+++ b/src/sonic-build-hooks/hooks/git
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+parse_config(){
+    . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+    REAL_COMMAND=$(get_command git)
+
+    version_file=$VERSION_PATH/versions-git
+    new_version_file=$BUILD_VERSION_PATH/versions-git
+
+    MODE_CLONE=0
+    # parse input parameters
+    for i in "$@"
+    do
+        if [[ $i == "clone" ]];then
+            MODE_CLONE=1
+        fi
+    done
+}
+
+get_clone_path(){
+    # get parameter of clone path
+    while (( "$#" )); do
+        case $1 in
+            -b|--branch|--reference|--reference-if-able|-c|--config|--origin|-u|--upload-pack|-j|--jobs|--depth|--dissociate)
+                shift 2
+                ;;
+            clone|-l|--local|--no-hardlinks|-s|--shared|--dissociate|-q|--quiet|-v|--verbose|--progress|--server-option=*|--bare|--sparse|--filter=*|--template=*|--mirror|--reference|--shallow-*|--no-tags|--recurse-submodules*|--remote-submodules|--no-remote-submodules|--separate-git-dir*)
+                shift 1
+                ;;
+            *)
+                if [[ $URL == "" ]];then
+                    URL=$1
+                else
+                    clone_PATH=$1
+                fi
+                shift 1
+                ;;
+        esac
+    done
+
+    # if not specific clone path, get default clone path
+    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
+}
+
+main(){
+    parse_config "$@"
+
+    # execute git.
+    $REAL_COMMAND "$@"
+    result=$?
+
+    # if sub command is not "clone", exit
+    if [[ $MODE_CLONE != 1 ]];then
+        exit $result
+    fi
+
+    get_clone_path "$@"
+    pushd $clone_PATH &> /dev/null
+    commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
+    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
+
+    # control version or record version file
+    if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
+        # control version
+        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
+    else
+        # record version file
+        echo "$URL==$commit_latest" >> $new_version_file
+        sort $new_version_file -o $new_version_file -u &> /dev/null
+    fi
+    popd &> /dev/null
+
+    exit $result
+}
+
+main "$@"

From 1f75c4fbd26efda8fbeb1424aa170a84a24e2b81 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 30 Jun 2021 15:42:57 +0800
Subject: [PATCH 0605/1674] Fix the apt-get download package disorder issue
 (#8021)

Why I did it
Multiple build failed in 202012 branch
It is caused by the disorder of the package urls retrieved from the command "apt-get download --print-urls "
---
 scripts/build_debian_base_system.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/build_debian_base_system.sh b/scripts/build_debian_base_system.sh
index e8c5ab42fe18..63eb7555fe36 100755
--- a/scripts/build_debian_base_system.sh
+++ b/scripts/build_debian_base_system.sh
@@ -63,14 +63,18 @@ mkdir -p $ARCHIEVES
 mkdir -p $APTLIST
 mkdir -p $TARGET_DEBOOTSTRAP
 PACKAGES=$(sed -E 's/=(=[^=]*)$/\1/' $BASE_VERSIONS)
-URL_ARR=($(apt-get download --print-uris $PACKAGES | cut -d" " -f1 | tr -d "'"))
+URL_ARR=$(apt-get download --print-uris $PACKAGES | cut -d" " -f1 | tr -d "'")
 PACKAGE_ARR=($PACKAGES)
 LENGTH=${#PACKAGE_ARR[@]}
 for ((i=0;i<LENGTH;i++))
 do
     package=${PACKAGE_ARR[$i]}
     packagename=$(echo $package | sed -E 's/=[^=]*$//')
-    url=${URL_ARR[$i]}
+    url=$(echo "$URL_ARR" | grep "/${packagename}_")
+    if [ -z "$url" ] || [[ $(echo "$url" | wc -l) -gt 1 ]]; then
+        echo "No found package or found multiple package for package $packagename, url: $url" 2>&1
+        exit 1
+    fi
     filename=$(basename "$url")
     SKIP_BUILD_HOOK=y wget $url -P $ARCHIEVES
     echo $packagename >> $DEBOOTSTRAP_REQUIRED

From 568def48cfc7d04d42809ebc0e1a375e23b0139b Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 30 Jun 2021 18:25:55 +0800
Subject: [PATCH 0606/1674] Disable nephos docker syncd rpc temporarily (#8015)

Why I did it
Disable the nephos docker syncd rpc image temporarily
---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index b758fb5da097..a748af337abf 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -93,7 +93,7 @@ jobs:
         - name: nephos
           variables:
             dbg_image: yes
-            docker_syncd_rpc_image: yes
+            docker_syncd_rpc_image: no
             platform_rpc: nephos
 
     buildSteps:

From 22565d03a36e7f3f9d16fcb701d837d5d499fcd2 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:39:27 +0300
Subject: [PATCH 0607/1674]  [sonic-utilities][202012] submodule update (#8029)

Update submodule for sonic-utilities to include the following PR:
[202012] [pfcwd] Fix the return code in invalid case (#1698)

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 80b7b54fecb9..d83eccdff435 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 80b7b54fecb95d0c57fa99636d47c6b407f69eb3
+Subproject commit d83eccdff435f60fdd483bd4b902bf8a1d95531e

From e611f50b4832323b58caff3f1977c30af5b8dd1e Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 1 Jul 2021 21:42:47 +0800
Subject: [PATCH 0608/1674] [ci/build]: Upgrade SONiC package versions (#7858)

Upgrade SONiC Versions
---
 .../versions-deb-buster                       |  5 +-
 .../build-sonic-slave-buster/versions-py2     |  4 +-
 .../build-sonic-slave-buster/versions-py3     |  2 -
 .../versions/default/versions-deb-buster      | 14 ++--
 files/build/versions/default/versions-git     | 18 +++++
 files/build/versions/default/versions-py2     |  2 +-
 files/build/versions/default/versions-py3     |  8 +--
 files/build/versions/default/versions-web     |  4 +-
 .../docker-platform-monitor/versions-py3      |  1 +
 .../dockers/docker-ptf/versions-deb-stretch   |  4 +-
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  5 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  1 +
 .../dockers/docker-syncd-mlnx/versions-py3    |  1 +
 .../sonic-slave-buster/versions-deb-buster    | 66 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  1 +
 .../dockers/sonic-slave-buster/versions-py3   |  5 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 20 +++---
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../host-base-image/versions-deb-buster       | 12 ++--
 .../versions/host-image/versions-deb-buster   | 29 ++++----
 files/build/versions/host-image/versions-py2  |  2 +-
 files/build/versions/host-image/versions-py3  |  7 +-
 23 files changed, 114 insertions(+), 101 deletions(-)
 create mode 100644 files/build/versions/default/versions-git
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-py3
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx/versions-py3
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 00f60d261955..b7e9050d4f31 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -41,16 +41,13 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.5-3
+libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
 libsairedis-dev==1.0.0
 libsaithrift-dev==0.9.4
 libsaivs==1.0.0
-libsnmp-base==5.7.3+dfsg-5
-libsnmp-dev==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
 libswsscommon==1.0.0
 libswsscommon-dev==1.0.0
 libtac-dev==1.4.1-1
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index 65b9ae160bb9..d42c147c9528 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -3,12 +3,10 @@ contextlib2==0.6.0.post1
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
-ipaddress==1.0.23
 jsonschema==2.6.0
-lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
-pyang==2.4.0
+pyang==2.5.0
 pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index d52b83b0bc5a..4585f9279f67 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,7 +1,5 @@
-bitarray==1.5.3
 ijson==2.6.1
 ipaddress==1.0.23
-lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 082dcc53a269..e74aed42d2cf 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -34,7 +34,7 @@ gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
-ipmitool==1.8.18-6
+ipmitool==1.8.18-6+deb10u1
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
 isc-dhcp-relay-dbgsym==4.4.1-2
@@ -79,7 +79,7 @@ libfribidi0==1.0.5-3.1+deb10u1
 libgcc-8-dev==8.3.0-6
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libglib2.0-0==2.58.3-2+deb10u2
+libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
@@ -112,7 +112,7 @@ libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
 liblsan0==8.3.0-6
 liblua5.1-0==5.1.5-8.1+b2
-libmariadb3==1:10.3.27-0+deb10u1
+libmariadb3==1:10.3.29-0+deb10u1
 libmpc3==1.1.0-1
 libmpdec2==2.4.2-2
 libmpfr6==4.0.2-1
@@ -168,7 +168,7 @@ librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.5-3
+libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
@@ -208,7 +208,7 @@ libxcb-shm0==1.13.1-2
 libxcb1==1.13.1-2
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
 libxrender1==1:0.9.10-1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
@@ -216,7 +216,7 @@ libyang==1.0.73
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
-linux-libc-dev==4.19.181-1
+linux-libc-dev==4.19.194-2
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
@@ -228,7 +228,7 @@ lsof==4.91+dfsg-1
 lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 make==4.2.1-1.2
-mariadb-common==1:10.3.27-0+deb10u1
+mariadb-common==1:10.3.29-0+deb10u1
 mime-support==3.62
 mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
new file mode 100644
index 000000000000..0206d9120b4b
--- /dev/null
+++ b/files/build/versions/default/versions-git
@@ -0,0 +1,18 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
+https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
+https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
+https://github.com/jeroennijhof/pam_tacplus.git==98aa8df54a84e9d6e21fcb82750a8e90c25e761f
+https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
+https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
+https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
+https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
+https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
+https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
+https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
+https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
+https://salsa.debian.org/kernel-team/ethtool/==568def48cfc7d04d42809ebc0e1a375e23b0139b
+https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
+https://salsa.debian.org/ssh-team/openssh.git==32717238e7587949cb2799136fd15d6fcea5341c
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index abeb3e20fe3f..f142c70980e0 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -15,7 +15,7 @@ netaddr==0.8.0
 nnpy==1.4.2
 pathlib2==2.3.5
 ptf==0.9.1
-pyang==2.4.0
+pyang==2.5.0
 pyangbind==0.6.0
 pycparser==2.20
 pyyaml==5.4.1
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index f30152d61d71..f1226aa412ed 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -6,11 +6,11 @@ click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.1
-grpcio==1.38.0
+grpcio==1.38.1
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
-importlib-metadata==4.5.0
+importlib-metadata==4.6.0
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
@@ -27,10 +27,10 @@ openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
 protobuf==3.17.3
 psutil==5.8.0
-pyang==2.4.0
+pyang==2.5.0
 pyangbind==0.8.1
 pyroute2==0.5.14
-pyrsistent==0.17.3
+pyrsistent==0.18.0
 python-arptable==0.0.2
 python-dateutil==2.6.0
 pyyaml==5.4.1
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e132fae8df0d..97b58e65820d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -13,7 +13,7 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:6484b93c6b0dfc5f2c425e8abc1e3737850851e7==e3b2bf07ac069c32110a2ebd7425b44d
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:4511c670f851c56473a7370c10c199cdad4dfc3c==dfba6e41ed652d9110c5749eae9aed0d
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
@@ -59,4 +59,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
new file mode 100644
index 000000000000..e644301c7273
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -0,0 +1 @@
+python-sdk-api==4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index a3abc7969e52..664878ec18bc 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -74,6 +74,7 @@ libfile-fcntllock-perl==0.22-3+b2
 libfribidi0==0.19.7-1+deb9u1
 libgc1c2==1:7.4.2-8
 libgcc-6-dev==6.3.0-18+deb9u1
+libgcrypt20==1.7.6-2+deb9u4
 libgdbm3==1.8.3-14
 libglib2.0-0==2.50.3-2+deb9u2
 libglib2.0-data==2.50.3-2+deb9u2
@@ -104,7 +105,6 @@ liblogging-stdlog0==1.0.5-2+b2
 liblognorm5==2.0.1-1.1+b1
 liblsan0==6.3.0-18+deb9u1
 libltdl7==2.4.6-2
-liblz4-1==0.0~r131-2+deb9u1
 liblzo2-2==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
 libmagic1==1:5.30-1+deb9u3
@@ -172,7 +172,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-2.2+deb9u5
 libxmuu1==2:1.1.2-2
-linux-libc-dev==4.9.258-1
+linux-libc-dev==4.9.272-1
 logrotate==3.11.0-0.1
 lsof==4.89+dfsg-0.1
 m4==1.4.18-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 003d17b5dbb9..b3e71c379e28 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -8,4 +8,4 @@ ply==3.11
 py2-ipaddress==3.4.2
 pyroute2==0.5.3
 requests==2.25.1
-urllib3==1.26.5
\ No newline at end of file
+urllib3==1.26.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 0fb3fff7589f..da0f66c3c3d1 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -2,10 +2,9 @@ certifi==2021.5.30
 click==7.0
 ijson==2.6.1
 jsondiff==1.3.0
-m2crypto==0.37.1
-parameterized==0.8.1
+m2crypto==0.38.0
 pexpect==4.8.0
 ptyprocess==0.7.0
 tabulate==0.8.9
-urllib3==1.26.5
+urllib3==1.26.6
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index eae492ab577e..2b09371f83a3 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -3,6 +3,7 @@ applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
 libelf1==0.176-1.1
+mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
 sx-acl-helper==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
new file mode 100644
index 000000000000..e644301c7273
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -0,0 +1 @@
+python-sdk-api==4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index e3491a6071aa..66baade984c7 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -506,11 +506,11 @@ libgl1-mesa-dri==18.3.6-2+deb10u1
 libglapi-mesa==18.3.6-2+deb10u1
 libgles1==1.1.0-1
 libgles2==1.1.0-1
-libglib2.0-0==2.58.3-2+deb10u2
-libglib2.0-bin==2.58.3-2+deb10u2
-libglib2.0-data==2.58.3-2+deb10u2
-libglib2.0-dev==2.58.3-2+deb10u2
-libglib2.0-dev-bin==2.58.3-2+deb10u2
+libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-bin==2.58.3-2+deb10u3
+libglib2.0-data==2.58.3-2+deb10u3
+libglib2.0-dev==2.58.3-2+deb10u3
+libglib2.0-dev-bin==2.58.3-2+deb10u3
 libglu1-mesa==9.0.0-2.1+b3
 libglu1-mesa-dev==9.0.0-2.1+b3
 libglvnd-core-dev==1.1.0-1
@@ -521,10 +521,10 @@ libglx0==1.1.0-1
 libgme0==0.6.2-1
 libgmp-dev==2:6.1.2+dfsg-4
 libgmpxx4ldbl==2:6.1.2+dfsg-4
-libgnutls-dane0==3.6.7-4+deb10u6
-libgnutls-openssl27==3.6.7-4+deb10u6
-libgnutls28-dev==3.6.7-4+deb10u6
-libgnutlsxx28==3.6.7-4+deb10u6
+libgnutls-dane0==3.6.7-4+deb10u7
+libgnutls-openssl27==3.6.7-4+deb10u7
+libgnutls28-dev==3.6.7-4+deb10u7
+libgnutlsxx28==3.6.7-4+deb10u7
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
@@ -702,9 +702,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.27-0+deb10u1
-libmariadb-dev-compat==1:10.3.27-0+deb10u1
-libmariadb3==1:10.3.27-0+deb10u1
+libmariadb-dev==1:10.3.29-0+deb10u1
+libmariadb-dev-compat==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.29-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -1190,15 +1190,15 @@ libxdelta2==1.1.3-9.2
 libxdmcp-dev==1:1.1.2-3
 libxdmcp6==1:1.1.2-3
 libxdot4==2.40.1-6+deb10u1
-libxencall1==4.11.4+99-g8bce4698f6-1
-libxendevicemodel1==4.11.4+99-g8bce4698f6-1
-libxenevtchn1==4.11.4+99-g8bce4698f6-1
-libxenforeignmemory1==4.11.4+99-g8bce4698f6-1
-libxengnttab1==4.11.4+99-g8bce4698f6-1
-libxenmisc4.11==4.11.4+99-g8bce4698f6-1
-libxenstore3.0==4.11.4+99-g8bce4698f6-1
-libxentoolcore1==4.11.4+99-g8bce4698f6-1
-libxentoollog1==4.11.4+99-g8bce4698f6-1
+libxencall1==4.11.4+107-gef32c7afa2-1
+libxendevicemodel1==4.11.4+107-gef32c7afa2-1
+libxenevtchn1==4.11.4+107-gef32c7afa2-1
+libxenforeignmemory1==4.11.4+107-gef32c7afa2-1
+libxengnttab1==4.11.4+107-gef32c7afa2-1
+libxenmisc4.11==4.11.4+107-gef32c7afa2-1
+libxenstore3.0==4.11.4+107-gef32c7afa2-1
+libxentoolcore1==4.11.4+107-gef32c7afa2-1
+libxentoollog1==4.11.4+107-gef32c7afa2-1
 libxerces2-java==2.12.0-1
 libxext-dev==2:1.3.3-1+b2
 libxext6==2:1.3.3-1+b2
@@ -1220,9 +1220,9 @@ libxml-sax-perl==1.00+dfsg-1
 libxml-simple-perl==2.25-1
 libxml-twig-perl==1:3.50-1.1
 libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u1
-libxml2-dev==2.9.4+dfsg1-7+deb10u1
-libxml2-utils==2.9.4+dfsg1-7+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxml2-utils==2.9.4+dfsg1-7+deb10u2
 libxmlgraphics-commons-java==2.3-1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
@@ -1256,12 +1256,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.181-1
-linux-headers-4.19.0-16-amd64==4.19.181-1
-linux-headers-4.19.0-16-common==4.19.181-1
-linux-headers-amd64==4.19+105+deb10u11
-linux-kbuild-4.19==4.19.181-1
-linux-libc-dev==4.19.181-1
+linux-compiler-gcc-8-x86==4.19.194-2
+linux-headers-4.19.0-17-amd64==4.19.194-2
+linux-headers-4.19.0-17-common==4.19.194-2
+linux-headers-amd64==4.19+105+deb10u12
+linux-kbuild-4.19==4.19.194-2
+linux-libc-dev==4.19.194-2
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1283,7 +1283,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.27-0+deb10u1
+mariadb-common==1:10.3.29-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
@@ -1296,7 +1296,7 @@ mysql-common==5.8+1.0.5
 ncurses-term==6.1+20181013-2+deb10u2
 netbase==5.6
 netpbm==2:10.0-15.3+b2
-nettle-dev==3.4.1-1
+nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.11+9-1~deb10u1
@@ -1630,7 +1630,7 @@ unzip==6.0-23+deb10u2
 uuid-dev==2.33.1-0.1
 va-driver-all==2.4.0-1
 vdpau-driver-all==1.1.1-10
-velocity==1.7-5
+velocity==1.7-5+deb10u1
 vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..e0ef836d5bd0
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 4b38beec295e..65059741579d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.1.0
+bitarray==2.1.3
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -23,7 +23,7 @@ jinja2==2.10
 keyring==17.1.1
 keyrings.alt==3.1.1
 lxml==4.6.2
-m2crypto==0.37.1
+m2crypto==0.38.0
 markupsafe==1.1.0
 mmh3==2.5.1
 mock==2.0.0
@@ -33,7 +33,6 @@ nose==1.3.7
 nose2==0.8.0
 olefile==0.46
 packaging==19.0
-parameterized==0.8.1
 pbr==4.2.0
 pexpect==4.8.0
 pillow==5.4.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 806a09374429..0ac3ad180b27 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -231,7 +231,7 @@ libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
 libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
 libbison-dev==2:3.0.4.dfsg-1+b1
 libbit-vector-perl==7.4-1+b2
-libbluetooth3==5.43-2+deb9u3
+libbluetooth3==5.43-2+deb9u4
 libboost-all-dev==1.62.0.1
 libboost-atomic-dev==1.62.0.1
 libboost-atomic1.62-dev==1.62.0+dfsg-4
@@ -593,7 +593,7 @@ libjbig2dec0==0.13-4.1
 libjdom1-java==1.1.3-1
 libjemalloc-dev==3.6.0-9.1
 libjemalloc1==3.6.0-9.1
-libjetty9-java==9.2.30-0+deb9u1
+libjetty9-java==9.2.30-0+deb9u2
 libjline-java==1.0-2
 libjpeg62-turbo==1:1.5.1-2+deb9u1
 libjs-bootstrap==3.3.7+dfsg-2+deb9u2
@@ -960,7 +960,7 @@ libtext-wrapi18n-perl==0.06-7.1
 libthai-data==0.1.26-1
 libthai0==0.1.26-1
 libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u5
+libtiff5==4.0.8-2+deb9u6
 libtimedate-perl==2.3000-2+deb9u1
 libtinfo-dev==6.0+20161126-1+deb9u2
 libtinyxml2-4==4.0.1-1
@@ -1128,12 +1128,12 @@ libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u1
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.258-1
-linux-headers-4.9.0-15-amd64==4.9.258-1
-linux-headers-4.9.0-15-common==4.9.258-1
-linux-headers-amd64==4.9+80+deb9u13
-linux-kbuild-4.9==4.9.258-1
-linux-libc-dev==4.9.258-1
+linux-compiler-gcc-6-x86==4.9.272-1
+linux-headers-4.9.0-16-amd64==4.9.272-1
+linux-headers-4.9.0-16-common==4.9.272-1
+linux-headers-amd64==4.9+80+deb9u14
+linux-kbuild-4.9==4.9.272-1
+linux-libc-dev==4.9.272-1
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
@@ -1311,7 +1311,7 @@ python-twisted==16.6.0-2
 python-twisted-bin==16.6.0-2
 python-twisted-core==16.6.0-2
 python-tz==2016.7-0.3
-python-urllib3==1.19.1-1
+python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
 python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index d31f8ace7dd5..f6013881a5b9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.1.1
+bitarray==2.1.3
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
index 7899f38da183..b146b8c4abe0 100644
--- a/files/build/versions/host-base-image/versions-deb-buster
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -1,6 +1,6 @@
 adduser==3.118
-apt==1.8.2.2
-base-files==10.3+deb10u9
+apt==1.8.2.3
+base-files==10.3+deb10u10
 base-passwd==3.5.46
 bash==5.0-4
 bsdutils==1:2.33.1-0.1
@@ -21,7 +21,7 @@ gzip==1.9-3
 hostname==3.21
 init-system-helpers==1.56+nmu1
 libacl1==2.2.53-4
-libapt-pkg5.0==1.8.2.2
+libapt-pkg5.0==1.8.2.3
 libattr1==1:2.4.48-4
 libaudit-common==1:2.8.4-3
 libaudit1==1:2.8.4-3
@@ -37,13 +37,13 @@ libext2fs2==1.44.5-1+deb10u3
 libfdisk1==2.33.1-0.1
 libffi6==3.2.1-9
 libgcc1==1:8.3.0-6
-libgcrypt20==1.8.4-5
+libgcrypt20==1.8.4-5+deb10u1
 libgmp10==2:6.1.2+dfsg-4
-libgnutls30==3.6.7-4+deb10u6
+libgnutls30==3.6.7-4+deb10u7
 libgpg-error0==1.35-1
 libhogweed4==3.4.1-1
 libidn2-0==2.0.5-1+deb10u1
-liblz4-1==1.8.3-1
+liblz4-1==1.8.3-1+deb10u1
 liblzma5==5.2.4-1
 libmount1==2.33.1-0.1
 libncursesw6==6.1+20181013-2+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index ad03e1db4214..fbe746de68d6 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -1,6 +1,6 @@
 acl==2.2.53-4
 apparmor==2.13.2-10
-apt-transport-https==1.8.2.2
+apt-transport-https==1.8.2.3
 bash-completion==1:2.8-6
 bfn-modules==1.0
 bridge-utils==1.6-2
@@ -52,21 +52,21 @@ ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
 innovium-platform-driver==0.11.1
-ipmitool==1.8.18-6
+ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
 iptables-persistent==1.0.11+deb10u1
 iputils-ping==3:20180629-2+deb10u2
-isc-dhcp-client==4.4.1-2
+isc-dhcp-client==4.4.1-2+deb10u1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
 kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.16.0
 kexec-tools==1:2.0.18-1
-klibc-utils==2.0.6-1
+klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
 less==487-0.1+b1
 libapparmor1==2.13.2-10
-libapt-inst2.0==1.8.2.2
+libapt-inst2.0==1.8.2.3
 libargon2-1==0~20171227-0.2
 libassuan0==2.5.2-1
 libbsd0==0.9.1-2+deb10u1
@@ -96,11 +96,12 @@ libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libglib2.0-0==2.58.3-2+deb10u2
+libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u1
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
+libhogweed4==3.4.1-1+deb10u1
 libi2c0==4.1-1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
@@ -110,7 +111,7 @@ libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
 libk5crypto3==1.17-3+deb10u1
 libkeyutils1==1.6-6
-libklibc==2.0.6-1
+libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
 libkrb5-3==1.17-3+deb10u1
 libkrb5support0==1.17-3+deb10u1
@@ -118,7 +119,6 @@ libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
-liblz4-1==1.8.3-1+deb10u1
 liblzo2-2==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
@@ -127,6 +127,7 @@ libmpdec2==2.4.2-2
 libncurses6==6.1+20181013-2+deb10u2
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
+libnettle6==3.4.1-1+deb10u1
 libnfnetlink0==1.0.1-3+b1
 libnftnl11==1.1.2-2
 libnghttp2-14==1.36.0-2+deb10u1
@@ -165,10 +166,10 @@ libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
-libsystemd0==247.3-5~bpo10+1
+libsystemd0==247.3-5~bpo10+2
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
-libudev1==247.3-5~bpo10+1
+libudev1==247.3-5~bpo10+2
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
@@ -244,16 +245,16 @@ squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
 sx-kernel==1.mlnx.4.4.3106
 sysfsutils==2.1.0+repack-5
-systemd==247.3-5~bpo10+1
+systemd==247.3-5~bpo10+2
 systemd-sonic-generator==1.0.0
-systemd-sysv==247.3-5~bpo10+1
-systemd-timesyncd==247.3-5~bpo10+1
+systemd-sysv==247.3-5~bpo10+2
+systemd-timesyncd==247.3-5~bpo10+2
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
-udev==247.3-5~bpo10+1
+udev==247.3-5~bpo10+2
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 87f2068bc20e..5d2d9aa42d53 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -13,7 +13,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
-pyang==2.4.0
+pyang==2.5.0
 pyangbind==0.6.0
 python-apt==1.8.4.3
 pyyaml==5.4.1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index bc97a89d4762..7fa9d072beb1 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -15,17 +15,16 @@ jinja2==3.0.1
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
-m2crypto==0.37.1
+m2crypto==0.38.0
 markupsafe==2.0.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-parameterized==0.8.1
 pathtools==0.1.2
 pexpect==4.8.0
 psutil==5.8.0
 ptyprocess==0.7.0
-pyang==2.4.0
+pyang==2.5.0
 pyangbind==0.8.1
 pycparser==2.20
 python-dateutil==2.8.1
@@ -37,7 +36,7 @@ scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
 thrift==0.13.0
-urllib3==1.26.5
+urllib3==1.26.6
 watchdog==0.10.3
 websocket-client==1.1.0
 xmltodict==0.12.0
\ No newline at end of file

From c068369b16778cccfb7f5e858c4a148e70559275 Mon Sep 17 00:00:00 2001
From: madhanmellanox <62459540+madhanmellanox@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:33:42 -0700
Subject: [PATCH 0609/1674] [202012]Removing hwsku.json file from
 Mellanox-SN4600C-C64 SKU (#8009)

removed the file hwsku.json from the Mellanox-4600C-C64
Co-authored-by: Madhan Babu <madhan@l-csi-0241l.mtl.labs.mlnx>
---
 .../Mellanox-SN4600C-C64/hwsku.json           | 196 ------------------
 1 file changed, 196 deletions(-)
 delete mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json
deleted file mode 100644
index b73944cba7a0..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/hwsku.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet8": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet16": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet24": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet32": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet40": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet48": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet56": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet64": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet72": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet80": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet88": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet96": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet104": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet112": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet120": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet128": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet136": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet144": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet152": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet160": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet168": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet176": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet184": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet192": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet200": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet208": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet216": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet224": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet232": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet240": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet248": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet256": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet264": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet272": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet280": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet288": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet296": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet304": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet312": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet320": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet328": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet336": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet344": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet352": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet360": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet368": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet376": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet384": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet392": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet400": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet408": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet416": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet424": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet432": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet440": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet448": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet456": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet464": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet472": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet480": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet488": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet496": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }, 
-        "Ethernet504": {
-            "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
-        }
-    }
-}
\ No newline at end of file

From e784c2607c7e4d2e881f9442b3daea25f66773ef Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 1 Jul 2021 16:45:07 -0700
Subject: [PATCH 0610/1674] [202012] Add BRCM SOC Property to not count ACL
 drops towards interface RX_DRP fir DualToR platforms (#8000)

---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm   | 1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2    | 1 +
 src/sonic-device-data/tests/permitted_list                       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index c9c8d8f26f02..72e02fb8d25b 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_adjust_acl_drop_in_rx_drop=1
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index f9144f8d41c6..0a6740b58b31 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_adjust_acl_drop_in_rx_drop=1
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 8e7129b179da..5ef01f2ea512 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -13,6 +13,7 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
+                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 4f3daccaa376..300f00c01460 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -5,6 +5,7 @@
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                host_as_route_disable=1
+                               sai_adjust_acl_drop_in_rx_drop=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}
 {%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index 616ccb0e990b..cc2df983429e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -13,6 +13,7 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
+                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 467780f2b519..57f49ca30746 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -235,3 +235,4 @@ sai_optimized_mmu
 buf.map.egress_pool0.ingress_pool
 buf.map.egress_pool1.ingress_pool
 buf.map.egress_pool2.ingress_pool
+sai_adjust_acl_drop_in_rx_drop

From d3e2983188582430942f71fce624cb59c7349d0c Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 1 Jul 2021 18:41:21 -0700
Subject: [PATCH 0611/1674] Revert "[Kubernetes]: The kube server could be used
 as http-proxy for docker (#7469)"

This reverts commit e851a42db75d1238aea01ebcd0c13c49fc9b9a9d.
---
 build_debian.sh                               |   1 +
 .../build_templates/sonic_debian_extension.j2 |  23 ---
 rules/config                                  |   7 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py   | 135 -------------
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  13 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service      |   9 +-
 .../ctrmgr/remote_ctr.config.json             |   3 +-
 .../tests/ctrmgr_iptables_test.py             | 178 ------------------
 src/sonic-ctrmgrd/tests/ctrmgrd_test.py       |   9 -
 src/sonic-ctrmgrd/tests/http_proxy.conf       |   2 -
 src/sonic-ctrmgrd/tests/no_proxy.conf         |   2 -
 11 files changed, 11 insertions(+), 371 deletions(-)
 delete mode 100644 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
 delete mode 100755 src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
 delete mode 100644 src/sonic-ctrmgrd/tests/http_proxy.conf
 delete mode 100644 src/sonic-ctrmgrd/tests/no_proxy.conf

diff --git a/build_debian.sh b/build_debian.sh
index a966519a8034..85e5f10a0ca2 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -235,6 +235,7 @@ then
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
+    # kubeadm package auto install kubelet & kubectl
 else
     echo '[INFO] Skipping Install kubernetes'
 fi
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 5d3892fafeb8..eecf4064cac8 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -414,10 +414,6 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
 
 {% if include_kubernetes == "y" %}
-# Point to kubelet to /etc/resolv.conf
-#
-echo 'KUBELET_EXTRA_ARGS="--resolv-conf=/etc/resolv.conf"' | sudo tee -a  $FILESYSTEM_ROOT/etc/default/kubelet
-
 # Copy Flannel conf file into sonic-templates
 #
 sudo cp $BUILD_TEMPLATES/kube_cni.10-flannel.conflist $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
@@ -438,25 +434,6 @@ sudo cp ${files_path}/container_startup.py ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCR
 sudo chmod a+x ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/container_startup.py
 
 # Config file used by container mgmt scripts/service
-fl="${files_path}/remote_ctr.config.json"
-use_k8s_as_http_proxy=$(python3 -c 'import json
-with open("'${fl}'", "r") as s:
-    d=json.load(s);print(d.get("use_k8s_as_http_proxy", ""))
-')
-if [ "${use_k8s_as_http_proxy}" == "y" ]; then
-    # create proxy files for docker using private IP which will
-    # be later directed to k8s master upon config
-    PROXY_INFO="http://172.16.1.1:3128/"
-    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/http_proxy.conf > /dev/null
-[Service]
-Environment="HTTP_PROXY=${PROXY_INFO}"
-EOT
-    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/https_proxy.conf > /dev/null
-[Service]
-Environment="HTTPS_PROXY=${PROXY_INFO}"
-EOT
-fi
-
 sudo cp ${files_path}/remote_ctr.config.json ${FILESYSTEM_ROOT_ETC_SONIC}/
 
 # Remote container management service files
diff --git a/rules/config b/rules/config
index 043c02dfeedf..39eb786f2ff0 100644
--- a/rules/config
+++ b/rules/config
@@ -142,7 +142,6 @@ INCLUDE_NAT = y
 # TELEMETRY_WRITABLE - Enable write/config operations via the gNMI interface.
 # Uncomment to enable:
 # TELEMETRY_WRITABLE = y
-
 # INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to
 # run as worker node in kubernetes cluster.
 INCLUDE_KUBERNETES = n
@@ -152,9 +151,9 @@ INCLUDE_KUBERNETES = n
 # These are Used *only* when INCLUDE_KUBERNETES=y
 # NOTE: As a worker node it has to run version compatible to kubernetes master.
 #
-KUBERNETES_VERSION = 1.21.1
-KUBERNETES_CNI_VERSION = 0.8.7
-K8s_GCR_IO_PAUSE_VERSION = 3.4.1
+KUBERNETES_VERSION = 1.18.6
+KUBERNETES_CNI_VERSION = 0.8.6
+K8s_GCR_IO_PAUSE_VERSION = 3.2
 
 # SONIC_ENABLE_IMAGE_SIGNATURE - enable image signature
 # To not use the auto-generated self-signed certificate, the required files to sign the image as below:
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
deleted file mode 100644
index 74b9bfe44fc9..000000000000
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env python3
-
-import ipaddress
-import os
-import re
-import socket
-import subprocess
-import syslog
-
-UNIT_TESTING = 0
-
-# NOTE:
-# Unable to use python-iptables as that does not create rules per ip-tables default
-# which is nf_tables. So rules added via iptc package will not be listed under
-# "sudo iptables -t nat -L -n". But available in kernel. To list, we need to 
-# use legacy mode as "sudo iptables-legacy -t nat -L -n".
-# As we can't use two modes and using non-default could make any debugging effort
-# very tough.
-
-
-from urllib.parse import urlparse
-
-DST_FILE = "/etc/systemd/system/docker.service.d/http_proxy.conf"
-DST_IP = None
-DST_PORT = None
-SQUID_PORT = "3128"
-
-def _get_ip(ip_str):
-    ret = ""
-    if ip_str:
-        try:
-            ipaddress.ip_address(ip_str)
-            ret = ip_str
-        except ValueError:
-            pass
-
-        if not ret:
-            try:
-                ret = socket.gethostbyname(ip_str)
-            except (OSError, socket.error):
-                pass
-        if not ret:
-            syslog.syslog(syslog.LOG_ERR, "{} is neither IP nor resolves to IP".
-                    format(ip_str))
-    return ret
-
-
-def _get_dst_info():
-    global DST_IP, DST_PORT
-    DST_IP = None
-    DST_PORT = None
-    print("DST_FILE={}".format(DST_FILE))
-    if os.path.exists(DST_FILE):
-        with open(DST_FILE, "r") as s:
-            for line in s.readlines():
-                url_match = re.search('^Environment=.HTTP_PROXY=(.+?)"', line)
-                if url_match:
-                    url = urlparse(url_match.group(1))
-                    DST_IP = _get_ip(url.hostname)
-                    DST_PORT = url.port
-                    break
-    else:
-        print("{} not available".format(DST_FILE))
-    print("DST_IP={}".format(DST_IP))
-
-
-def _is_rule_match(rule):
-    expect = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:".format(
-            DST_IP, DST_PORT)
-
-    # Remove duplicate spaces
-    rule = " ".join(rule.split()).strip()
-
-    if rule.startswith(expect):
-        return rule[len(expect):]
-    else:
-        return ""
-
-
-def check_proc(proc):
-    if proc.returncode:
-        syslog.syslog(syslog.LOG_ERR, "Failed to run: cmd: {}".format(proc.args))
-        syslog.syslog(syslog.LOG_ERR, "Failed to run: stdout: {}".format(proc.stdout))
-        syslog.syslog(syslog.LOG_ERR, "Failed to run: stderr: {}".format(proc.stderr))
-        if not UNIT_TESTING:
-            assert False
-
-
-def iptable_proxy_rule_upd(ip_str, port = SQUID_PORT):
-    _get_dst_info()
-    if not DST_IP:
-        # There is no proxy in use. Bail out.
-        return ""
-
-    destination = ""
-    if ip_str:
-        upd_ip = _get_ip(ip_str)
-        if not upd_ip:
-            return ""
-        destination = "{}:{}".format(upd_ip, port)
-
-    found = False
-    num = 0
-
-    while True:
-        num += 1
-
-        cmd = "sudo iptables -t nat -n -L OUTPUT {}".format(num)
-        proc = subprocess.run(cmd, shell=True, capture_output=True)
-        check_proc(proc)
-
-        if not proc.stdout:
-            # No more rule
-            break
-
-        rule_dest = _is_rule_match(proc.stdout.decode("utf-8").strip())
-        if rule_dest:
-            if not found and destination and (rule_dest == destination):
-                found = True
-            else:
-                # Duplicate or different IP - delete it
-                cmd = "sudo iptables -t nat -D OUTPUT {}".format(num)
-                proc = subprocess.run(cmd, shell=True, capture_output=True)
-                check_proc(proc)
-                # Decrement number to accommodate deleted rule
-                num -= 1
-
-    if destination and not found:
-        cmd = "sudo iptables -t nat -A OUTPUT -p tcp -d {} --dport {} -j DNAT --to-destination {}".format(
-                DST_IP, DST_PORT, destination)
-        proc = subprocess.run(cmd, shell=True, capture_output=True)
-
-        check_proc(proc)
-
-    return destination
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index 3941a05a738a..49c11d278170 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -8,7 +8,6 @@
 import syslog
 
 from collections import defaultdict
-from ctrmgr.ctrmgr_iptables import iptable_proxy_rule_upd
 
 from swsscommon import swsscommon
 from sonic_py_common import device_info
@@ -88,13 +87,11 @@
 JOIN_LATENCY = "join_latency_on_boot_seconds"
 JOIN_RETRY = "retry_join_interval_seconds"
 LABEL_RETRY = "retry_labels_update_seconds"
-USE_K8S_PROXY = "use_k8s_as_http_proxy"
 
 remote_ctr_config = {
     JOIN_LATENCY: 10,
     JOIN_RETRY: 10,
-    LABEL_RETRY: 2,
-    USE_K8S_PROXY: ""
+    LABEL_RETRY: 2
     }
 
 def log_debug(m):
@@ -312,9 +309,6 @@ def __init__(self, server):
 
         self.start_time = datetime.datetime.now()
 
-        if remote_ctr_config[USE_K8S_PROXY] == "y":
-            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
-
         if not self.st_server[ST_FEAT_UPDATE_TS]:
             # This is upon system start. Sleep 10m before join
             self.start_time += datetime.timedelta(
@@ -342,9 +336,6 @@ def on_config_update(self, key, op, data):
         log_debug("Received config update: {}".format(str(data)))
         self.cfg_server = cfg_data
 
-        if remote_ctr_config[USE_K8S_PROXY] == "y":
-            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
-
         if self.pending:
             tnow = datetime.datetime.now()
             if tnow < self.start_time:
@@ -368,7 +359,7 @@ def handle_update(self):
 
         ip = self.cfg_server[CFG_SER_IP]
         disable = self.cfg_server[CFG_SER_DISABLE] != "false"
-
+        
         pre_state = dict(self.st_server)
         log_debug("server: handle_update: disable={} ip={}".format(disable, ip))
         if disable or not ip:
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
index f59314259bc6..6052c10785da 100644
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
@@ -1,9 +1,8 @@
 [Unit]
 Description=Container Manager watcher daemon
-Requires=caclmgrd.service
-After=caclmgrd.service
-BindsTo=sonic.target
-After=sonic.target
+Requires=updategraph.service
+After=updategraph.service
+
 
 [Service]
 Type=simple
@@ -12,4 +11,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=sonic.target
+WantedBy=multi-user.target
diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
index 9ef41d085329..e7bca832e18b 100644
--- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
+++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
@@ -2,7 +2,6 @@
     "join_latency_on_boot_seconds": 300,
     "retry_join_interval_seconds": 30,
     "retry_labels_update_seconds": 5,
-    "revert_to_local_on_wait_seconds": 60,
-    "use_k8s_as_http_proxy": "y"
+    "revert_to_local_on_wait_seconds": 60
 }
 
diff --git a/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py b/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
deleted file mode 100755
index fc28cbecc8da..000000000000
--- a/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
+++ /dev/null
@@ -1,178 +0,0 @@
-import os
-import re
-import sys
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from . import common_test
-
-sys.path.append("ctrmgr")
-import ctrmgr_iptables
-
-
-PROXY_FILE="http_proxy.conf"
-
-test_data = {
-    "1": {
-        "ip": "10.10.20.20",
-        "port": "3128",
-        "pre_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088"
-        ],
-        "post_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:10.10.20.20:3128"
-            ],
-        "ret": "10.10.20.20:3128"
-    },
-    "2": {
-        "ip": "",
-        "port": "",
-        "pre_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088"
-        ],
-        "post_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080"
-        ],
-        "ret": ""
-    },
-    "3": {
-        "ip": "www.google.com",
-        "port": "3128",
-        "pre_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
-        ],
-        "post_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:.*3128"
-        ]
-    },
-    "4": {
-        "ip": "www.google.comx",
-        "port": "3128",
-        "pre_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
-        ],
-        "post_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
-        ],
-        "ret": ""
-    },
-    "5": {
-        "ip": "www.google.comx",
-        "port": "3128",
-        "conf_file": "no_proxy.conf",
-        "pre_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
-        ],
-        "post_rules": [
-            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
-            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
-        ],
-        "ret": ""
-    }
-}
-
-
-current_tc = None
-current_rules = None
-
-class proc:
-    returncode = 0
-    stdout = None
-    stderr = None
-
-    def __init__(self, ret, stdout, stderr):
-        self.returncode = ret
-        self.stdout = bytearray(stdout, 'utf-8')
-        self.stderr = bytearray(stderr, 'utf-8')
-        print("out={} err={}".format(stdout, stderr))
-
-
-def mock_subproc_run(cmd, shell, capture_output):
-    cmd_prefix = "sudo iptables -t nat "
-    list_cmd = "{}-n -L OUTPUT ".format(cmd_prefix)
-    del_cmd = "{}-D OUTPUT ".format(cmd_prefix)
-    ins_cmd = "{}-A OUTPUT -p tcp -d ".format(cmd_prefix)
-
-    assert shell
-    
-    print("cmd={}".format(cmd))
-    if cmd.startswith(list_cmd):
-        num = int(cmd[len(list_cmd):])
-        out = current_rules[num] if len(current_rules) > num else ""
-        return proc(0, out, "")
-
-    if cmd.startswith(del_cmd):
-        num = int(cmd[len(del_cmd):])
-        if num >= len(current_rules):
-            print("delete num={} is greater than len={}".format(num, len(current_rules)))
-            print("current_rules = {}".format(current_rules))
-            assert False
-        del current_rules[num]
-        return proc(0, "", "")
-
-    if cmd.startswith(ins_cmd):
-        l = cmd.split()
-        assert len(l) == 16
-        rule = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:{}".format(l[9], l[11], l[-1])
-        current_rules.append(rule)
-        return proc(0, "", "")
-
-    print("unknown cmd: {}".format(cmd))
-    return None
-
-
-def match_rules(pattern_list, str_list):
-    if len(pattern_list) != len(str_list):
-        print("pattern len {} != given {}".format(
-            len(pattern_list), len(str_list)))
-        return False
-
-    for i in range(len(pattern_list)):
-        if not re.match(pattern_list[i], str_list[i]):
-            print("{}: {} != {}".format(i, pattern_list[i], str_list[i]))
-            return False
-    return True
-
-
-class TestIPTableUpdate(object):
-
-    @patch("ctrmgr_iptables.subprocess.run")
-    def test_table(self, mock_proc):
-        global current_rules, current_tc
-
-        mock_proc.side_effect = mock_subproc_run
-        for i, tc in test_data.items():
-            print("----- Test: {} Start ------------------".format(i))
-            current_tc = tc
-            current_rules = tc["pre_rules"].copy()
-
-            ctrmgr_iptables.DST_IP = ""
-            ctrmgr_iptables.DST_PORT = ""
-            ctrmgr_iptables.DST_FILE = os.path.join(
-                    os.path.dirname(os.path.realpath(__file__)),
-                    tc.get("conf_file", PROXY_FILE))
-            ret = ctrmgr_iptables.iptable_proxy_rule_upd(tc["ip"], tc["port"])
-            if "ret" in tc:
-                assert ret == tc["ret"]
-            if not match_rules(tc["post_rules"], current_rules):
-                print("current_rules={}".format(current_rules))
-                print("post_rules={}".format(tc["post_rules"]))
-                assert False
-            print("----- Test: {} End   ------------------".format(i))
-
-
diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
index 171534b5a8d1..e0e821089346 100755
--- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
+++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
@@ -8,7 +8,6 @@
 
 sys.path.append("ctrmgr")
 import ctrmgrd
-import ctrmgr.ctrmgr_iptables
 
 
 # ctrmgrd test cases
@@ -388,11 +387,6 @@ def init(self):
         ctrmgrd.UNIT_TESTING = 1
         ctrmgrd.SONIC_CTR_CONFIG = (
                 common_test.create_remote_ctr_config_json())
-        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 1
-
-
-    def clear(self):
-        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 0
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -427,7 +421,6 @@ def test_server(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
             ret = common_test.check_kube_actions()
             assert ret == 0
             common_test.mock_selector.SLEEP_SECS = 0
-        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -457,7 +450,6 @@ def test_feature(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_tables_returned()
             assert ret == 0
-        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -494,4 +486,3 @@ def test_labels(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_kube_actions()
             assert ret == 0
-        self.clear()
diff --git a/src/sonic-ctrmgrd/tests/http_proxy.conf b/src/sonic-ctrmgrd/tests/http_proxy.conf
deleted file mode 100644
index 4947352418a5..000000000000
--- a/src/sonic-ctrmgrd/tests/http_proxy.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="HTTP_PROXY=http://172.16.1.1:3128/"
diff --git a/src/sonic-ctrmgrd/tests/no_proxy.conf b/src/sonic-ctrmgrd/tests/no_proxy.conf
deleted file mode 100644
index ffdfa671bacb..000000000000
--- a/src/sonic-ctrmgrd/tests/no_proxy.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="NO_PROXY=10.10.10.10"

From 70cb258b7eb99de168dc102bc17a929e77821b5f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 2 Jul 2021 21:52:41 +0800
Subject: [PATCH 0612/1674] [ci/build]: Upgrade SONiC package versions (#8041)

---
 .../versions-deb-buster                       |  1 -
 .../versions/default/versions-deb-buster      | 31 -------------------
 files/build/versions/default/versions-git     |  4 +--
 files/build/versions/default/versions-py3     |  2 +-
 files/build/versions/default/versions-web     |  2 +-
 .../docker-database/versions-deb-buster       | 12 +++++++
 .../docker-dhcp-relay/versions-deb-buster     | 13 ++++++++
 .../docker-fpm-frr/versions-deb-buster        | 19 +++++++++++-
 .../docker-gbsyncd-vs/versions-deb-buster     | 17 +++++++++-
 .../dockers/docker-lldp/versions-deb-buster   | 16 +++++++++-
 .../dockers/docker-nat/versions-deb-buster    | 14 +++++++++
 .../docker-orchagent/versions-deb-buster      | 15 +++++++++
 .../versions-deb-buster                       | 18 ++++++++++-
 .../versions-deb-buster                       | 12 +++++++
 .../dockers/docker-sflow/versions-deb-buster  | 12 +++++++
 .../dockers/docker-snmp/versions-deb-buster   | 17 +++++++++-
 .../versions-deb-buster                       | 13 ++++++++
 .../versions-deb-buster                       | 12 +++++++
 .../docker-sonic-vs/versions-deb-buster       |  2 ++
 .../docker-syncd-centec/versions-deb-buster   | 14 ++++++++-
 .../docker-syncd-mlnx/versions-deb-buster     |  1 -
 .../docker-syncd-vs/versions-deb-buster       | 17 +++++++++-
 .../dockers/docker-teamd/versions-deb-buster  | 16 ++++++++++
 .../dockers/sonic-slave-buster/versions-git   |  1 -
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 27 files changed, 239 insertions(+), 48 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index b7e9050d4f31..a7ae56c3490f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -77,7 +77,6 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index e74aed42d2cf..18164e80bd21 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,22 +22,17 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
-frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6+deb10u1
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
-isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -45,7 +40,6 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
-libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -63,8 +57,6 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -81,7 +73,6 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -90,7 +81,6 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
-libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -170,15 +160,11 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libsensors5-dbgsym==1:3.5.0-3
-libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -186,12 +172,9 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
-libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
-libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
-libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
@@ -214,13 +197,10 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
-libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.194-2
 lldpd==1.0.4-1
-lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
-lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -234,7 +214,6 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
-openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -275,32 +254,22 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
-sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
-snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
-sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
-sshpass==1.06-1
-strace==4.26-0.2
 swss==1.0.0
-swss-dbg==1.0.0
 syncd==1.0.0
-syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
-vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 0206d9120b4b..1792aa7bfa76 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d6d677c9e91a76f3b19e837b318533f97798535
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==568def48cfc7d04d42809ebc0e1a375e23b0139b
+https://salsa.debian.org/kernel-team/ethtool/==e784c2607c7e4d2e881f9442b3daea25f66773ef
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==32717238e7587949cb2799136fd15d6fcea5341c
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index f1226aa412ed..47eaeefcc118 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -36,7 +36,7 @@ python-dateutil==2.6.0
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.4.4
+regex==2021.7.1
 requests==2.25.1
 scapy==2.4.4
 smbus==1.1.post2
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 97b58e65820d..33cb2cf03e60 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -13,7 +13,7 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:4511c670f851c56473a7370c10c199cdad4dfc3c==dfba6e41ed652d9110c5749eae9aed0d
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
new file mode 100644
index 000000000000..090a9af05b59
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+isc-dhcp-relay-dbgsym==4.4.1-2
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8ce0c99a8c4d..861bf8125805 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,2 +1,19 @@
+frr-dbgsym==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libswsscommon-dbg==1.0.0
+libyang1-dbgsym==1.0.184-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 35fa7ba37f8c..1385fbd0ee29 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 3424f739f586..dced6f540d81 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,2 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libswsscommon-dbg==1.0.0
+lldpd-dbgsym==1.0.4-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 000000000000..159c8c90df8b
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,14 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
new file mode 100644
index 000000000000..0969e5edd95e
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,15 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index eb5e901597f5..16d8aadf78c3 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,26 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsensors5-dbgsym==1:3.5.0-3
+libswsscommon-dbg==1.0.0
+lm-sensors-dbgsym==1:3.5.0-3
+openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
+sensord-dbgsym==1:3.5.0-3
+sshpass==1.06-1
+strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 3424f739f586..8baa3d5cd96b 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,2 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libsnmp30-dbg==5.7.3+dfsg-5
+openssh-client==1:7.9p1-10+deb10u2
+snmp-dbgsym==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..a29d8370e78a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sonic-mgmt-framework-dbg==1.0-01
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 2f3ae7e0335d..a329339c843b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,6 +19,7 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
+libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -27,6 +28,7 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index e5836f0be374..74abbdb5bd6f 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1 +1,13 @@
-libsai==1.6.3-1
\ No newline at end of file
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsai==1.6.3-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 2b09371f83a3..6352f44332bc 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,7 +2,6 @@ applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
-libelf1==0.176-1.1
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 35fa7ba37f8c..1385fbd0ee29 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 000000000000..eeb36c01b260
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+libteam-utils-dbgsym==1.30-1
+libteamdctl0-dbgsym==1.30-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index e0ef836d5bd0..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 65059741579d..944476b6d50a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index f6013881a5b9..d746938454d6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 7fa9d072beb1..518aed06fb44 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -30,7 +30,7 @@ pycparser==2.20
 python-dateutil==2.8.1
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 requests==2.25.1
 scapy==2.4.4
 six==1.16.0

From f44d6cef8b362be5551ff3bae1cf34935ba4bd2d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 3 Jul 2021 21:53:50 +0800
Subject: [PATCH 0613/1674] [ci/build]: Upgrade SONiC package versions (#8051)

---
 .../versions-deb-buster                       |  1 +
 .../versions/default/versions-deb-buster      | 31 +++++++++++++++++++
 files/build/versions/default/versions-git     |  4 +--
 .../docker-database/versions-deb-buster       | 12 -------
 .../docker-dhcp-relay/versions-deb-buster     | 13 --------
 .../docker-fpm-frr/versions-deb-buster        | 19 +-----------
 .../docker-gbsyncd-vs/versions-deb-buster     | 17 +---------
 .../dockers/docker-lldp/versions-deb-buster   | 16 +---------
 .../dockers/docker-nat/versions-deb-buster    | 14 ---------
 .../docker-orchagent/versions-deb-buster      | 15 ---------
 .../versions-deb-buster                       | 18 +----------
 .../versions-deb-buster                       | 12 -------
 .../dockers/docker-sflow/versions-deb-buster  | 12 -------
 .../dockers/docker-snmp/versions-deb-buster   | 17 +---------
 .../versions-deb-buster                       | 13 --------
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../versions-deb-buster                       | 12 -------
 .../docker-sonic-vs/versions-deb-buster       |  2 --
 .../docker-syncd-centec/versions-deb-buster   | 14 +--------
 .../docker-syncd-mlnx/versions-deb-buster     |  1 +
 .../docker-syncd-vs/versions-deb-buster       | 17 +---------
 .../dockers/docker-teamd/versions-deb-buster  | 16 ----------
 .../dockers/sonic-slave-buster/versions-git   |  1 +
 .../dockers/sonic-slave-stretch/versions-git  |  1 +
 24 files changed, 45 insertions(+), 235 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index a7ae56c3490f..b7e9050d4f31 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -77,6 +77,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
+mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 18164e80bd21..e74aed42d2cf 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,17 +22,22 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6+deb10u1
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -40,6 +45,7 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
+libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -57,6 +63,8 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -73,6 +81,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
+libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -81,6 +90,7 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
+libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -160,11 +170,15 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -172,9 +186,12 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
@@ -197,10 +214,13 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.194-2
 lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -214,6 +234,7 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
+openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -254,22 +275,32 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
 swss==1.0.0
+swss-dbg==1.0.0
 syncd==1.0.0
+syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
+vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 1792aa7bfa76..6aa6767eff4b 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d6d677c9e91a76f3b19e837b318533f97798535
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6438e49f732d83bb9ed9e459e4da285be8e14da8
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==e784c2607c7e4d2e881f9442b3daea25f66773ef
+https://salsa.debian.org/kernel-team/ethtool/==70cb258b7eb99de168dc102bc17a929e77821b5f
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==32717238e7587949cb2799136fd15d6fcea5341c
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
deleted file mode 100644
index 090a9af05b59..000000000000
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-isc-dhcp-relay-dbgsym==4.4.1-2
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 861bf8125805..8ce0c99a8c4d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,19 +1,2 @@
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libswsscommon-dbg==1.0.0
-libyang1-dbgsym==1.0.184-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 1385fbd0ee29..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,19 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsaimetadata-dbg==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index dced6f540d81..3424f739f586 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,16 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libswsscommon-dbg==1.0.0
-lldpd-dbgsym==1.0.4-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
deleted file mode 100644
index 159c8c90df8b..000000000000
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ /dev/null
@@ -1,14 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
deleted file mode 100644
index 0969e5edd95e..000000000000
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ /dev/null
@@ -1,15 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 16d8aadf78c3..eb5e901597f5 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,26 +1,10 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsensors5-dbgsym==1:3.5.0-3
-libswsscommon-dbg==1.0.0
-lm-sensors-dbgsym==1:3.5.0-3
-openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
-sensord-dbgsym==1:3.5.0-3
-sshpass==1.06-1
-strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 8baa3d5cd96b..3424f739f586 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,17 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libsnmp30-dbg==5.7.3+dfsg-5
-openssh-client==1:7.9p1-10+deb10u2
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index a29d8370e78a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sonic-mgmt-framework-dbg==1.0-01
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 9ecf272e6792..511d858b0f6f 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,2 +1,2 @@
 six==1.11.0
-zipp==3.4.1
\ No newline at end of file
+zipp==3.5.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index a329339c843b..2f3ae7e0335d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,7 +19,6 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
-libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -28,7 +27,6 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
-openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 74abbdb5bd6f..e5836f0be374 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1,13 +1 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsai==1.6.3-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsai==1.6.3-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 6352f44332bc..2b09371f83a3 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,6 +2,7 @@ applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
+libelf1==0.176-1.1
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 1385fbd0ee29..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,19 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsaimetadata-dbg==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
deleted file mode 100644
index eeb36c01b260..000000000000
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ /dev/null
@@ -1,16 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-libteam-utils-dbgsym==1.30-1
-libteamdctl0-dbgsym==1.30-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..c76555955c25
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f7ff55603ce6d83570d13ea74f6181dc0fb93bf
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..78a941ce95f6
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6438e49f732d83bb9ed9e459e4da285be8e14da8
\ No newline at end of file

From de46dc53a346a849f7fab95387c1fdf964ba992d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:45:42 +0800
Subject: [PATCH 0614/1674] [ci/build]: Upgrade SONiC package versions (#8054)

---
 .../versions-deb-buster                       |  1 +
 .../versions/default/versions-deb-buster      | 31 -------------------
 files/build/versions/default/versions-git     |  6 ++--
 .../docker-database/versions-deb-buster       | 12 +++++++
 .../docker-dhcp-relay/versions-deb-buster     | 13 ++++++++
 .../docker-fpm-frr/versions-deb-buster        | 19 +++++++++++-
 .../docker-gbsyncd-vs/versions-deb-buster     | 17 +++++++++-
 .../dockers/docker-lldp/versions-deb-buster   | 16 +++++++++-
 .../dockers/docker-nat/versions-deb-buster    | 14 +++++++++
 .../docker-orchagent/versions-deb-buster      | 15 +++++++++
 .../versions-deb-buster                       | 18 ++++++++++-
 .../versions-deb-buster                       | 12 +++++++
 .../dockers/docker-sflow/versions-deb-buster  | 12 +++++++
 .../dockers/docker-snmp/versions-deb-buster   | 17 +++++++++-
 .../versions-deb-buster                       | 13 ++++++++
 .../versions-deb-buster                       | 12 +++++++
 .../docker-sonic-vs/versions-deb-buster       |  2 ++
 .../docker-syncd-centec/versions-deb-buster   | 14 ++++++++-
 .../docker-syncd-mlnx/versions-deb-buster     | 16 ++++++++++
 .../docker-syncd-vs/versions-deb-buster       | 17 +++++++++-
 .../dockers/docker-teamd/versions-deb-buster  | 16 ++++++++++
 .../dockers/sonic-slave-buster/versions-git   |  1 -
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  6 ++--
 .../dockers/sonic-slave-stretch/versions-git  |  1 -
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 26 files changed, 257 insertions(+), 48 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index b7e9050d4f31..266f0faab859 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -42,6 +42,7 @@ libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
 libsaibcm==4.3.3.8-1
+libsaibcm-dev==4.3.3.8-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index e74aed42d2cf..18164e80bd21 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,22 +22,17 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
-frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6+deb10u1
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
-isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -45,7 +40,6 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
-libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -63,8 +57,6 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -81,7 +73,6 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -90,7 +81,6 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
-libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -170,15 +160,11 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libsensors5-dbgsym==1:3.5.0-3
-libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -186,12 +172,9 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
-libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
-libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
-libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
@@ -214,13 +197,10 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
-libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.194-2
 lldpd==1.0.4-1
-lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
-lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -234,7 +214,6 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
-openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -275,32 +254,22 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
-sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
-snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
-sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
-sshpass==1.06-1
-strace==4.26-0.2
 swss==1.0.0
-swss-dbg==1.0.0
 syncd==1.0.0
-syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
-vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 6aa6767eff4b..bb254c080e69 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6438e49f732d83bb9ed9e459e4da285be8e14da8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f7ff55603ce6d83570d13ea74f6181dc0fb93bf
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==70cb258b7eb99de168dc102bc17a929e77821b5f
+https://salsa.debian.org/kernel-team/ethtool/==f44d6cef8b362be5551ff3bae1cf34935ba4bd2d
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==32717238e7587949cb2799136fd15d6fcea5341c
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==18da782ebe789d0cf107a550e474ba6352e68911
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
new file mode 100644
index 000000000000..090a9af05b59
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+isc-dhcp-relay-dbgsym==4.4.1-2
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8ce0c99a8c4d..861bf8125805 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,2 +1,19 @@
+frr-dbgsym==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libswsscommon-dbg==1.0.0
+libyang1-dbgsym==1.0.184-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 35fa7ba37f8c..1385fbd0ee29 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 3424f739f586..dced6f540d81 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,2 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libswsscommon-dbg==1.0.0
+lldpd-dbgsym==1.0.4-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 000000000000..159c8c90df8b
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,14 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
new file mode 100644
index 000000000000..0969e5edd95e
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,15 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index eb5e901597f5..16d8aadf78c3 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,26 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 ethtool==1:5.9-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsensors5-dbgsym==1:3.5.0-3
+libswsscommon-dbg==1.0.0
+lm-sensors-dbgsym==1:3.5.0-3
+openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
+sensord-dbgsym==1:3.5.0-3
+sshpass==1.06-1
+strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 3424f739f586..8baa3d5cd96b 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,2 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libsnmp30-dbg==5.7.3+dfsg-5
+openssh-client==1:7.9p1-10+deb10u2
+snmp-dbgsym==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..a29d8370e78a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,13 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sonic-mgmt-framework-dbg==1.0-01
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
new file mode 100644
index 000000000000..f8cf36dc0e12
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,12 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 2f3ae7e0335d..a329339c843b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,6 +19,7 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
+libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -27,6 +28,7 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index e5836f0be374..74abbdb5bd6f 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1 +1,13 @@
-libsai==1.6.3-1
\ No newline at end of file
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsai==1.6.3-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 2b09371f83a3..5b05a1d65dff 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,11 +1,24 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libelf1==0.176-1.1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
+openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.3106
+sshpass==1.06-1
+strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3106
 sx-acl-helper-dev==1.mlnx.4.4.3106
 sx-complib==1.mlnx.4.4.3106
@@ -18,5 +31,8 @@ sx-scew==1.mlnx.4.4.3106
 sx-scew-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
 sxd-libs-dev==1.mlnx.4.4.3106
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3106
 wjh-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 35fa7ba37f8c..1385fbd0ee29 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 000000000000..eeb36c01b260
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,16 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libswsscommon-dbg==1.0.0
+libteam-utils-dbgsym==1.30-1
+libteamdctl0-dbgsym==1.30-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index c76555955c25..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f7ff55603ce6d83570d13ea74f6181dc0fb93bf
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 944476b6d50a..f5bbd4621862 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.1.3
+bitarray==2.2.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 0ac3ad180b27..fa2e3500a9b9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -403,8 +403,8 @@ libdevmapper-event1.02.1==2:1.02.137-2
 libdevmapper1.02.1==2:1.02.137-2
 libdigest-hmac-perl==1.03+dfsg-1
 libdistro-info-perl==0.14
-libdjvulibre-text==3.5.27.1-7+deb9u1
-libdjvulibre21==3.5.27.1-7+deb9u1
+libdjvulibre-text==3.5.27.1-7+deb9u2
+libdjvulibre21==3.5.27.1-7+deb9u2
 libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
 libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
 libdom4j-java==1.6.1+dfsg.3-2+deb9u1
@@ -732,7 +732,7 @@ libobjc-6-dev==6.3.0-18+deb9u1
 libobjc4==6.3.0-18+deb9u1
 libobjenesis-java==2.5.1-1
 libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u2
+libopenexr22==2.2.0-11+deb9u3
 libopenjp2-7==2.1.2-1.1+deb9u6
 libopenmpi-dev==2.0.2-2
 libopenmpi2==2.0.2-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 78a941ce95f6..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6438e49f732d83bb9ed9e459e4da285be8e14da8
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index d746938454d6..ae43c12f315e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.1.3
+bitarray==2.2.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2

From adbc6577222fd4637a33cc3d30c666f5eadea43c Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Mon, 5 Jul 2021 09:05:49 +0300
Subject: [PATCH 0615/1674] [sonic-swss][202012] submodule update (#8058)

[flex-counters] [202012] Delay flex counters stats init for faster boot time (Azure/sonic-swss#1804)
Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index bb383be2042d..b0fb3924c47a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit bb383be2042ddff03416ed918db26126c53b8464
+Subproject commit b0fb3924c47a855926f3f2b3a1911bc46fed3c9c

From fb89c28c9521898bff254dbfd82fcffc45b0f2fd Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Tue, 6 Jul 2021 07:31:34 +0300
Subject: [PATCH 0616/1674] [202012] [Mellanox] Update SDK\FW ver.
 4.4.3216\2008.3216 (#8056)

- Changes and new features:

1. Added support in SN4600C systems for new module Finisar ET7402-CWDM4 (100G CWDM4 QSFP28 1310nm SM 2KM).
2. Added support for new module MMS1W50-HM (2km transceiver FR4) for 200GbE
3. Improved performance of "per-port-buffer" counters
4. Added support for Kernel 5.10

- Bug fix:
On rare occasions (0.5%), in SN4600C systems, when using 100GbE NRZ mode and Fastboot flow, the link up time may take up to 10 seconds

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index fd7623d40cc7..f22bb7e9f3ed 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3110
+MLNX_SPC_FW_VERSION = 13.2008.3216
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3110
+MLNX_SPC2_FW_VERSION = 29.2008.3216
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3110
+MLNX_SPC3_FW_VERSION = 30.2008.3216
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index d7e88d9d70b9..0354f2b1733c 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit d7e88d9d70b9e7b9d8b1a81d18f27df8d1056f8e
+Subproject commit 0354f2b1733cadc15443d12ed107e80725eccd47
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index b59da0c2f7d6..9690d2d06ea6 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.3106
+MLNX_SDK_VERSION = 4.4.3216
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 36d7dfbea3dcb997d463b3f00b085e19b5985aec Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Wed, 30 Jun 2021 09:35:16 -0700
Subject: [PATCH 0617/1674] Add libpci3 pkg to docker-platform-monitor (#8016)

#### Why I did it
The libpci library provides portable access to configuration registers of devices connected to the PCI bus.

#### How I did it
update dockers/docker-platform-monitor/Dockerfile.j2
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 482b5ccd9b25..556ba299275d 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -24,7 +24,8 @@ RUN apt-get update &&   \
         python3-smbus   \
         dmidecode       \
         i2c-tools       \
-        psmisc
+        psmisc          \
+        libpci3
 
 # TODO: Remove these lines once we no longer need Python 2
 RUN apt-get install -f -y python-dev python-pip

From d66425dd76dd17620c730f3f787ceba13baef4cb Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Wed, 30 Jun 2021 09:36:47 -0700
Subject: [PATCH 0618/1674] Add ethtool to docker-platform-monitor (#8017)

#### Why I did it
ethtool can be used to query and change settings such as speed, auto- negotiation and checksum offload on many network devices, especially Ethernet devices.

#### How I did it
add package extension to docker-platform-monitor/Dockerfile.j2
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 556ba299275d..fe2c3c290a2b 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -22,6 +22,7 @@ RUN apt-get update &&   \
         rrdtool         \
         python-smbus    \
         python3-smbus   \
+        ethtool         \
         dmidecode       \
         i2c-tools       \
         psmisc          \

From 049a23e5a4e8b71885a39d8444d465f8a4ebce2d Mon Sep 17 00:00:00 2001
From: rajendra-dendukuri
 <47423477+rajendra-dendukuri@users.noreply.github.com>
Date: Thu, 1 Jul 2021 14:52:38 -0400
Subject: [PATCH 0619/1674] [kdump] Fix kdump error message when a reboot is
 issued (#7985)

dash doesn't support += operation to append to a variable's value. Use KDUMP_CMDLINE_APPEND="${KDUMP_CMDLINE_APPEND} " instead

The below error message is seen when a reboot is issued.

[ 342.439096] kdump-tools[13655]: /etc/init.d/kdump-tools: 117: /etc/default/kdump-tools: KDUMP_CMDLINE_APPEND+= panic=10 debug hpet=disable pcie_port=compat pci=nommconf sonic_platform=x86_64-accton_as7326_56x-r0: not found
---
 files/image_config/kdump/kdump-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/kdump/kdump-tools b/files/image_config/kdump/kdump-tools
index 61a41eb31902..83c2766524d3 100644
--- a/files/image_config/kdump/kdump-tools
+++ b/files/image_config/kdump/kdump-tools
@@ -10,7 +10,7 @@ KDUMP_CMDLINE_APPEND="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service a
 # Disable advanced pcie features
 # Disable high precision event timer as on some platforms it is interfering with the kdump operation
 # Pass platform identifier string as part of crash kernel command line to be used by the reboot script during kdump
-KDUMP_CMDLINE_APPEND+=" panic=10 debug hpet=disable pcie_port=compat pci=nommconf sonic_platform=__PLATFORM__"
+KDUMP_CMDLINE_APPEND="${KDUMP_CMDLINE_APPEND} panic=10 debug hpet=disable pcie_port=compat pci=nommconf sonic_platform=__PLATFORM__"
 
 # Use SONiC reboot wrapper script present in /usr/local/bin post kdump
 PATH=/usr/local/bin:$PATH

From 7811e7eef13a433e60be7b148876c9f957a5d33f Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 6 Jul 2021 12:52:45 +0800
Subject: [PATCH 0620/1674] Bug fix for reproducible build (#8061)

---
 src/sonic-build-hooks/hooks/git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
index e39c17f89739..9c202ff8a06a 100755
--- a/src/sonic-build-hooks/hooks/git
+++ b/src/sonic-build-hooks/hooks/git
@@ -57,7 +57,7 @@ main(){
     get_clone_path "$@"
     pushd $clone_PATH &> /dev/null
     commit_latest=`$REAL_COMMAND log -n 1 | head -n 1| awk '{print$2}'`
-    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F, '{print$2}'`
+    [ -f $version_file ] && commit=`grep $URL $version_file | awk -F== '{print$2}'`
 
     # control version or record version file
     if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then

From 526dd3c4fbbba215734aeb14825aff7bb8c3fe45 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 7 Jul 2021 08:35:34 +0300
Subject: [PATCH 0621/1674] [Mellanox] Update FW version to 2008.3218 (#8079)

Update FW version to 2008.3218, fixing the following issues:
- 50G/100G links that are operationally down before warm-reboot are not coming up after warm-reboot
- 50G/100G links with admin shut / no shut commands are not coming up after warm-reboot

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index f22bb7e9f3ed..1e74002e458a 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3216
+MLNX_SPC_FW_VERSION = 13.2008.3218
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3216
+MLNX_SPC2_FW_VERSION = 29.2008.3218
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3216
+MLNX_SPC3_FW_VERSION = 30.2008.3218
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 0354f2b1733c..88a244e9f388 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 0354f2b1733cadc15443d12ed107e80725eccd47
+Subproject commit 88a244e9f3880aae7641cc61951cae98a8d096d4

From 3ded393093d09dcb681e3f3ec1105bb9d27947a3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 7 Jul 2021 21:26:21 +0800
Subject: [PATCH 0622/1674] [ci/build]: Upgrade SONiC package versions (#8062)

---
 .../versions-deb-buster                       | 35 ++++++------
 .../versions/default/versions-deb-buster      | 33 +++++++++++-
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-py2     |  2 +-
 files/build/versions/default/versions-py3     |  4 +-
 .../docker-database/versions-deb-buster       | 12 -----
 .../docker-dhcp-relay/versions-deb-buster     | 13 -----
 .../docker-fpm-frr/versions-deb-buster        | 19 +------
 .../docker-gbsyncd-vs/versions-deb-buster     | 17 +-----
 .../dockers/docker-lldp/versions-deb-buster   | 16 +-----
 .../dockers/docker-nat/versions-deb-buster    | 14 -----
 .../docker-orchagent/versions-deb-buster      | 15 ------
 .../versions-deb-buster                       | 34 ++++--------
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../versions-deb-buster                       | 12 -----
 .../dockers/docker-sflow/versions-deb-buster  | 12 -----
 .../dockers/docker-snmp/versions-deb-buster   | 17 +-----
 .../versions-deb-buster                       | 13 -----
 .../versions-deb-buster                       | 12 -----
 .../docker-sonic-vs/versions-deb-buster       |  2 -
 .../docker-syncd-centec/versions-deb-buster   | 14 +----
 .../docker-syncd-mlnx/versions-deb-buster     | 54 +++++++------------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../docker-syncd-vs/versions-deb-buster       | 17 +-----
 .../dockers/docker-teamd/versions-deb-buster  | 16 ------
 .../sonic-slave-buster/versions-deb-buster    | 16 +++---
 .../dockers/sonic-slave-buster/versions-git   |  1 +
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  1 +
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py2  |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 35 files changed, 108 insertions(+), 317 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 266f0faab859..e57e813a51bd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3106
-applibs-dev==1.mlnx.4.4.3106
+applibs==1.mlnx.4.4.3216
+applibs-dev==1.mlnx.4.4.3216
 bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
@@ -8,7 +8,7 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2-dev==1.mlnx.4.4.3106
+iproute2-dev==1.mlnx.4.4.3216
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
 libatk-bridge2.0-dev==2.30.0-5
@@ -42,7 +42,6 @@ libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
 libsaibcm==4.3.3.8-1
-libsaibcm-dev==4.3.3.8-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -89,24 +88,24 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.3106
-sx-acl-helper-dev==1.mlnx.4.4.3106
-sx-complib==1.mlnx.4.4.3106
-sx-complib-dev==1.mlnx.4.4.3106
-sx-examples==1.mlnx.4.4.3106
-sx-examples-dev==1.mlnx.4.4.3106
-sx-gen-utils==1.mlnx.4.4.3106
-sx-gen-utils-dev==1.mlnx.4.4.3106
-sx-scew==1.mlnx.4.4.3106
-sx-scew-dev==1.mlnx.4.4.3106
-sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
+sx-acl-helper==1.mlnx.4.4.3216
+sx-acl-helper-dev==1.mlnx.4.4.3216
+sx-complib==1.mlnx.4.4.3216
+sx-complib-dev==1.mlnx.4.4.3216
+sx-examples==1.mlnx.4.4.3216
+sx-examples-dev==1.mlnx.4.4.3216
+sx-gen-utils==1.mlnx.4.4.3216
+sx-gen-utils-dev==1.mlnx.4.4.3216
+sx-scew==1.mlnx.4.4.3216
+sx-scew-dev==1.mlnx.4.4.3216
+sxd-libs==1.mlnx.4.4.3216
+sxd-libs-dev==1.mlnx.4.4.3216
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
-wjh-libs==1.mlnx.4.4.3106
-wjh-libs-dev==1.mlnx.4.4.3106
+wjh-libs==1.mlnx.4.4.3216
+wjh-libs-dev==1.mlnx.4.4.3216
 x11proto-composite-dev==1:2018.4-4
 x11proto-input-dev==2018.4-4
 x11proto-randr-dev==2018.4-4
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 18164e80bd21..38a32a2a513e 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,17 +22,22 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6+deb10u1
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
@@ -40,6 +45,7 @@ libapt-inst2.0==1.8.2.3
 libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libatomic1==8.3.0-6
+libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
@@ -57,6 +63,8 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
@@ -73,6 +81,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
+libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -81,6 +90,7 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
+libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -160,11 +170,15 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.8-1
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
@@ -172,16 +186,19 @@ libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-libuv1==1.24.1-1
+libuv1==1.24.1-1+deb10u1
 libwrap0==7.6.q-28
 libx11-6==2:1.6.7-1+deb10u2
 libx11-data==2:1.6.7-1+deb10u2
@@ -197,10 +214,13 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.194-2
 lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -214,6 +234,7 @@ mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
+openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
@@ -254,22 +275,32 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
 swss==1.0.0
+swss-dbg==1.0.0
 syncd==1.0.0
+syncd-dbg==1.0.0
 syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
+vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
 wget==1.20.1-1.1
 xxd==2:8.1.0875-5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index bb254c080e69..4e2f322a0364 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f7ff55603ce6d83570d13ea74f6181dc0fb93bf
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b39f6bbf82e3a9bfbed3d24b561726c247d7a48d
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==f44d6cef8b362be5551ff3bae1cf34935ba4bd2d
+https://salsa.debian.org/kernel-team/ethtool/==fb89c28c9521898bff254dbfd82fcffc45b0f2fd
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==18da782ebe789d0cf107a550e474ba6352e68911
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index f142c70980e0..e654a8d5052d 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -13,7 +13,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 nnpy==1.4.2
-pathlib2==2.3.5
+pathlib2==2.3.6
 ptf==0.9.1
 pyang==2.5.0
 pyangbind==0.6.0
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index 47eaeefcc118..2b6cee02283a 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -10,7 +10,7 @@ grpcio==1.38.1
 grpcio-tools==1.20.0
 hiredis==2.0.0
 idna==2.10
-importlib-metadata==4.6.0
+importlib-metadata==4.6.1
 inflection==0.5.1
 ipaddress==1.0.23
 isodate==0.6.0
@@ -36,7 +36,7 @@ python-dateutil==2.6.0
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.7.1
+regex==2021.7.6
 requests==2.25.1
 scapy==2.4.4
 smbus==1.1.post2
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
deleted file mode 100644
index 090a9af05b59..000000000000
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-isc-dhcp-relay-dbgsym==4.4.1-2
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 861bf8125805..8ce0c99a8c4d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,19 +1,2 @@
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libswsscommon-dbg==1.0.0
-libyang1-dbgsym==1.0.184-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 1385fbd0ee29..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,19 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsaimetadata-dbg==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index dced6f540d81..3424f739f586 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,16 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libswsscommon-dbg==1.0.0
-lldpd-dbgsym==1.0.4-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
deleted file mode 100644
index 159c8c90df8b..000000000000
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ /dev/null
@@ -1,14 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
deleted file mode 100644
index 0969e5edd95e..000000000000
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ /dev/null
@@ -1,15 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 16d8aadf78c3..635d76dd6ce0 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,26 +1,10 @@
-applibs==1.mlnx.4.4.3106
-applibs-dev==1.mlnx.4.4.3106
+applibs==1.mlnx.4.4.3216
+applibs-dev==1.mlnx.4.4.3216
 ethtool==1:5.9-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsensors5-dbgsym==1:3.5.0-3
-libswsscommon-dbg==1.0.0
-lm-sensors-dbgsym==1:3.5.0-3
-openssh-client==1:7.9p1-10+deb10u2
-python-sdk-api==1.mlnx.4.4.3106
-sensord-dbgsym==1:3.5.0-3
-sshpass==1.06-1
-strace==4.26-0.2
-sx-complib==1.mlnx.4.4.3106
-sx-complib-dev==1.mlnx.4.4.3106
-sx-gen-utils==1.mlnx.4.4.3106
-sx-gen-utils-dev==1.mlnx.4.4.3106
-sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+python-sdk-api==1.mlnx.4.4.3216
+sx-complib==1.mlnx.4.4.3216
+sx-complib-dev==1.mlnx.4.4.3216
+sx-gen-utils==1.mlnx.4.4.3216
+sx-gen-utils-dev==1.mlnx.4.4.3216
+sxd-libs==1.mlnx.4.4.3216
+sxd-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index e644301c7273..3de5bb4e730e 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3106
\ No newline at end of file
+python-sdk-api==4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index e644301c7273..3de5bb4e730e 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1 +1 @@
-python-sdk-api==4.4.3106
\ No newline at end of file
+python-sdk-api==4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 8baa3d5cd96b..3424f739f586 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,17 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libsnmp30-dbg==5.7.3+dfsg-5
-openssh-client==1:7.9p1-10+deb10u2
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index a29d8370e78a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sonic-mgmt-framework-dbg==1.0-01
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index a329339c843b..2f3ae7e0335d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,7 +19,6 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libdevmapper1.02.1==2:1.02.155-3
-libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -28,7 +27,6 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
-openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 74abbdb5bd6f..e5836f0be374 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1,13 +1 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsai==1.6.3-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsai==1.6.3-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 5b05a1d65dff..6365619ffa30 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,38 +1,22 @@
-applibs==1.mlnx.4.4.3106
-applibs-dev==1.mlnx.4.4.3106
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-iproute2==1.mlnx.4.4.3106
-iproute2-dev==1.mlnx.4.4.3106
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
+applibs==1.mlnx.4.4.3216
+applibs-dev==1.mlnx.4.4.3216
+iproute2==1.mlnx.4.4.3216
+iproute2-dev==1.mlnx.4.4.3216
 libelf1==0.176-1.1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsaimetadata-dbg==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-openssh-client==1:7.9p1-10+deb10u2
-python-sdk-api==1.mlnx.4.4.3106
-sshpass==1.06-1
-strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.4.3106
-sx-acl-helper-dev==1.mlnx.4.4.3106
-sx-complib==1.mlnx.4.4.3106
-sx-complib-dev==1.mlnx.4.4.3106
-sx-examples==1.mlnx.4.4.3106
-sx-examples-dev==1.mlnx.4.4.3106
-sx-gen-utils==1.mlnx.4.4.3106
-sx-gen-utils-dev==1.mlnx.4.4.3106
-sx-scew==1.mlnx.4.4.3106
-sx-scew-dev==1.mlnx.4.4.3106
-sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
-wjh-libs==1.mlnx.4.4.3106
-wjh-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
+python-sdk-api==1.mlnx.4.4.3216
+sx-acl-helper==1.mlnx.4.4.3216
+sx-acl-helper-dev==1.mlnx.4.4.3216
+sx-complib==1.mlnx.4.4.3216
+sx-complib-dev==1.mlnx.4.4.3216
+sx-examples==1.mlnx.4.4.3216
+sx-examples-dev==1.mlnx.4.4.3216
+sx-gen-utils==1.mlnx.4.4.3216
+sx-gen-utils-dev==1.mlnx.4.4.3216
+sx-scew==1.mlnx.4.4.3216
+sx-scew-dev==1.mlnx.4.4.3216
+sxd-libs==1.mlnx.4.4.3216
+sxd-libs-dev==1.mlnx.4.4.3216
+wjh-libs==1.mlnx.4.4.3216
+wjh-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index e644301c7273..3de5bb4e730e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3106
\ No newline at end of file
+python-sdk-api==4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index e644301c7273..3de5bb4e730e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python-sdk-api==4.4.3106
\ No newline at end of file
+python-sdk-api==4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 1385fbd0ee29..35fa7ba37f8c 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,19 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsaimetadata-dbg==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs-dbg==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
deleted file mode 100644
index eeb36c01b260..000000000000
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ /dev/null
@@ -1,16 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-libteam-utils-dbgsym==1.30-1
-libteamdctl0-dbgsym==1.30-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 66baade984c7..c68c551adaef 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1085,7 +1085,7 @@ libusb-1.0-doc==2:1.0.22-2
 libusb-dev==2:0.1.12-32
 libusbredirparser1==0.8.0-1
 libutempter0==1.1.6-3
-libuv1==1.24.1-1
+libuv1==1.24.1-1+deb10u1
 libv4l-0==1.16.3-3
 libv4lconvert0==1.16.3-3
 libva-drm2==2.4.0-1
@@ -1340,13 +1340,13 @@ php-token-stream==3.0.1-1
 php-tokenizer==1.1.0-1
 php-webmozart-assert==1.4.0-3
 php-xml==2:7.3+69
-php7.3-cli==7.3.27-1~deb10u1
-php7.3-common==7.3.27-1~deb10u1
-php7.3-json==7.3.27-1~deb10u1
-php7.3-mbstring==7.3.27-1~deb10u1
-php7.3-opcache==7.3.27-1~deb10u1
-php7.3-readline==7.3.27-1~deb10u1
-php7.3-xml==7.3.27-1~deb10u1
+php7.3-cli==7.3.29-1~deb10u1
+php7.3-common==7.3.29-1~deb10u1
+php7.3-json==7.3.29-1~deb10u1
+php7.3-mbstring==7.3.29-1~deb10u1
+php7.3-opcache==7.3.29-1~deb10u1
+php7.3-readline==7.3.29-1~deb10u1
+php7.3-xml==7.3.29-1~deb10u1
 phpunit==7.5.6-1
 phpunit-code-unit-reverse-lookup==1.0.1-1
 phpunit-comparator==3.0.2-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..5b86a4de93be
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b36eeef127661cfc9a64a27fdb89a7321c53824d
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index f5bbd4621862..3a4925919aa5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.1
+regex==2021.7.6
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..403148b5b954
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b39f6bbf82e3a9bfbed3d24b561726c247d7a48d
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index ae43c12f315e..c2a283539a8f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.7.1
+regex==2021.7.6
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index fbe746de68d6..370b3e6c8a74 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -243,7 +243,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.3106
+sx-kernel==1.mlnx.4.4.3216
 sysfsutils==2.1.0+repack-5
 systemd==247.3-5~bpo10+2
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 5d2d9aa42d53..034bd65435b9 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -12,7 +12,7 @@ lxml==4.6.3
 markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
-pathlib2==2.3.5
+pathlib2==2.3.6
 pyang==2.5.0
 pyangbind==0.6.0
 python-apt==1.8.4.3
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 518aed06fb44..3086ea03106e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -30,7 +30,7 @@ pycparser==2.20
 python-dateutil==2.8.1
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.1
+regex==2021.7.6
 requests==2.25.1
 scapy==2.4.4
 six==1.16.0

From bed4c26b094ec520c9cee53a1bfce94fdbd87872 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 7 Jul 2021 23:37:28 -0700
Subject: [PATCH 0623/1674] Revert "Add ethtool to docker-platform-monitor
 (#8017)"

This reverts commit d66425dd76dd17620c730f3f787ceba13baef4cb.
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index fe2c3c290a2b..556ba299275d 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -22,7 +22,6 @@ RUN apt-get update &&   \
         rrdtool         \
         python-smbus    \
         python3-smbus   \
-        ethtool         \
         dmidecode       \
         i2c-tools       \
         psmisc          \

From cb2ffa324f887a4a46e7d9a2a35540e5315c39e1 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Thu, 8 Jul 2021 18:52:45 -0700
Subject: [PATCH 0624/1674] [Mellanox] [202012] Added D48C40 SKU for 4600C
 platform (#8133)

* Added new SKU for SN4600C Platform: Mellanox-SN4600C-D48C40
Co-authored-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 .../Mellanox-SN4600C-D48C40/buffers.json.j2   |   1 +
 .../buffers_defaults_t0.j2                    | 104 ++++
 .../buffers_defaults_t1.j2                    | 104 ++++
 .../buffers_dynamic.json.j2                   |   1 +
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN4600C-D48C40/port_config.ini   |  89 ++++
 .../Mellanox-SN4600C-D48C40/qos.json.j2       |   1 +
 .../Mellanox-SN4600C-D48C40/sai.profile       |   4 +
 .../sai_4600c_48x50g_40x100g.xml              | 494 ++++++++++++++++++
 9 files changed, 799 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai_4600c_48x50g_40x100g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers.json.j2
new file mode 120000
index 000000000000..117d740b0f5b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers.json.j2
@@ -0,0 +1 @@
+../ACS-MSN4600C/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..e3a39b9dc79b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
@@ -0,0 +1,104 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '50995200' %}
+{% set ingress_lossless_xoff_size = '1810432' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '50995200' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..149d810c983b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
@@ -0,0 +1,104 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '50143232' %}
+{% set ingress_lossless_xoff_size = '2662400' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '50143232' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/pg_profile_lookup.ini
new file mode 120000
index 000000000000..49745268908f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/port_config.ini
new file mode 100644
index 000000000000..f98cd3b232fa
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/port_config.ini
@@ -0,0 +1,89 @@
+# name       lanes            alias      index    speed
+Ethernet0    0,1              etp1a          1    50000
+Ethernet2    2,3              etp1b          1    50000
+Ethernet4    8,9              etp2a          2    50000
+Ethernet6    10,11            etp2b          2    50000
+Ethernet8    16,17            etp3a          3    50000
+Ethernet10   18,19            etp3b          3    50000
+Ethernet12   24,25            etp4a          4    50000
+Ethernet14   26,27            etp4b          4    50000
+Ethernet16   32,33            etp5a          5    50000
+Ethernet18   34,35            etp5b          5    50000
+Ethernet20   40,41            etp6a          6    50000
+Ethernet22   42,43            etp6b          6    50000
+Ethernet24   48,49            etp7a          7    50000
+Ethernet26   50,51            etp7b          7    50000
+Ethernet28   56,57            etp8a          8    50000
+Ethernet30   58,59            etp8b          8    50000
+Ethernet32   64,65            etp9a          9    50000
+Ethernet34   66,67            etp9b          9    50000
+Ethernet36   72,73            etp10a        10    50000
+Ethernet38   74,75            etp10b        10    50000
+Ethernet40   80,81,82,83      etp11         11   100000
+Ethernet44   88,89,90,91      etp12         12   100000
+Ethernet48   96,97            etp13a        13    50000
+Ethernet50   98,99            etp13b        13    50000
+Ethernet52   104,105          etp14a        14    50000
+Ethernet54   106,107          etp14b        14    50000
+Ethernet56   112,113,114,115  etp15         15   100000
+Ethernet60   120,121,122,123  etp16         16   100000
+Ethernet64   128,129,130,131  etp17         17   100000
+Ethernet68   136,137,138,139  etp18         18   100000
+Ethernet72   144,145,146,147  etp19         19   100000
+Ethernet76   152,153,154,155  etp20         20   100000
+Ethernet80   160,161,162,163  etp21         21   100000
+Ethernet84   168,169,170,171  etp22         22   100000
+Ethernet88   176,177,178,179  etp23         23   100000
+Ethernet92   184,185,186,187  etp24         24   100000
+Ethernet96   192,193,194,195  etp25         25   100000
+Ethernet100  200,201,202,203  etp26         26   100000
+Ethernet104  208,209,210,211  etp27         27   100000
+Ethernet108  216,217,218,219  etp28         28   100000
+Ethernet112  224,225,226,227  etp29         29   100000
+Ethernet116  232,233,234,235  etp30         30   100000
+Ethernet120  240,241,242,243  etp31         31   100000
+Ethernet124  248,249,250,251  etp32         32   100000
+Ethernet128  256,257,258,259  etp33         33   100000
+Ethernet132  264,265,266,267  etp34         34   100000
+Ethernet136  272,273,274,275  etp35         35   100000
+Ethernet140  280,281,282,283  etp36         36   100000
+Ethernet144  288,289,290,291  etp37         37   100000
+Ethernet148  296,297,298,299  etp38         38   100000
+Ethernet152  304,305,306,307  etp39         39   100000
+Ethernet156  312,313,314,315  etp40         40   100000
+Ethernet160  320,321,322,323  etp41         41   100000
+Ethernet164  328,329,330,331  etp42         42   100000
+Ethernet168  336,337,338,339  etp43         43   100000
+Ethernet172  344,345,346,347  etp44         44   100000
+Ethernet176  352,353,354,355  etp45         45   100000
+Ethernet180  360,361,362,363  etp46         46   100000
+Ethernet184  368,369,370,371  etp47         47   100000
+Ethernet188  376,377,378,379  etp48         48   100000
+Ethernet192  384,385          etp49a        49    50000
+Ethernet194  386,387          etp49b        49    50000
+Ethernet196  392,393          etp50a        50    50000
+Ethernet198  394,395          etp50b        50    50000
+Ethernet200  400,401,402,403  etp51         51   100000
+Ethernet204  408,409,410,411  etp52         52   100000
+Ethernet208  416,417          etp53a        53    50000
+Ethernet210  418,419          etp53b        53    50000
+Ethernet212  424,425          etp54a        54    50000
+Ethernet214  426,427          etp54b        54    50000
+Ethernet216  432,433,434,435  etp55         55   100000
+Ethernet220  440,441,442,443  etp56         56   100000
+Ethernet224  448,449          etp57a        57    50000
+Ethernet226  450,451          etp57b        57    50000
+Ethernet228  456,457          etp58a        58    50000
+Ethernet230  458,459          etp58b        58    50000
+Ethernet232  464,465          etp59a        59    50000
+Ethernet234  466,467          etp59b        59    50000
+Ethernet236  472,473          etp60a        60    50000
+Ethernet238  474,475          etp60b        60    50000
+Ethernet240  480,481          etp61a        61    50000
+Ethernet242  482,483          etp61b        61    50000
+Ethernet244  488,489          etp62a        62    50000
+Ethernet246  490,491          etp62b        62    50000
+Ethernet248  496,497          etp63a        63    50000
+Ethernet250  498,499          etp63b        63    50000
+Ethernet252  504,505          etp64a        64    50000
+Ethernet254  506,507          etp64b        64    50000
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/qos.json.j2
new file mode 120000
index 000000000000..05394016a129
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/qos.json.j2
@@ -0,0 +1 @@
+../ACS-MSN4600C/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile
new file mode 100644
index 000000000000..8719655c1ccc
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile
@@ -0,0 +1,4 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_48x50g_40x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai_4600c_48x50g_40x100g.xml b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai_4600c_48x50g_40x100g.xml
new file mode 100644
index 000000000000..bc26a518c08a
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai_4600c_48x50g_40x100g.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0"?>
+<root>
+    <platform_info type="4601">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:80</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>64</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>105</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>1</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 1536 - 200Gb -->
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>107</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>111</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>99</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>103</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>123</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>127</local-port>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>115</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>119</local-port>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>91</local-port>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>95</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>83</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>87</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>75</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>79</local-port>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>67</local-port>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>71</local-port>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>32</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <width>4</width>
+                <module>33</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>1</local-port>
+                <width>4</width>
+                <module>34</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <width>4</width>
+                <module>35</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>36</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>37</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>38</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <width>4</width>
+                <module>39</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>4</width>
+                <module>40</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <width>4</width>
+                <module>41</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>42</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <width>4</width>
+                <module>43</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>4</width>
+                <module>44</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <width>4</width>
+                <module>45</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>46</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <width>4</width>
+                <module>47</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>48</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>49</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>4</width>
+                <module>50</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <width>4</width>
+                <module>51</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>52</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>53</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>4</width>
+                <module>54</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <width>4</width>
+                <module>55</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>56</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>57</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>58</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>59</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>60</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>61</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>62</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>63</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From cd5d950c98f5078e7053b730d6a221ff60c0355f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 9 Jul 2021 21:25:21 +0800
Subject: [PATCH 0625/1674] [ci/build]: Upgrade SONiC package versions (#8127)

---
 .../versions/build/build-sonic-slave-buster/versions-web      | 1 +
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/docker-ptf/versions-py2          | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-py3  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-py3 | 2 +-
 files/build/versions/host-image/versions-py3                  | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
new file mode 100644
index 000000000000..c2c8a0a63aa8
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -0,0 +1 @@
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 4e2f322a0364..5267630dc89f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b39f6bbf82e3a9bfbed3d24b561726c247d7a48d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7d3c9f6d1f62089250957279aee8e48b8fb378ba
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==fb89c28c9521898bff254dbfd82fcffc45b0f2fd
+https://salsa.debian.org/kernel-team/ethtool/==bed4c26b094ec520c9cee53a1bfce94fdbd87872
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 660f7b46c470..b7da2dd200f8 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -1,7 +1,7 @@
 backports.functools-lru-cache==1.6.4
 backports.shutil-get-terminal-size==1.0.0
 bcrypt==3.1.7
-cffi==1.14.5
+cffi==1.14.6
 click==7.1.2
 cryptography==3.3.2
 decorator==4.4.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 5b86a4de93be..58f3c3c036e3 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1 +1 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b36eeef127661cfc9a64a27fdb89a7321c53824d
\ No newline at end of file
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==76159d5a2548bd481793ceb4903f725070d744ff
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 3a4925919aa5..e999dbff1a48 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.0
+bitarray==2.2.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 403148b5b954..696f9af56e0a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1 +1 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b39f6bbf82e3a9bfbed3d24b561726c247d7a48d
\ No newline at end of file
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7d3c9f6d1f62089250957279aee8e48b8fb378ba
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index c2a283539a8f..0c21d9af612e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.0
+bitarray==2.2.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3086ea03106e..a3c25686bc13 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -3,7 +3,7 @@ azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
-cffi==1.14.5
+cffi==1.14.6
 chardet==4.0.0
 click==7.0
 cryptography==3.4.7

From 58b8d5502b87fa38a719e2c96bbcdc02bcb540e4 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 10 Jul 2021 22:37:53 +0800
Subject: [PATCH 0626/1674] [ci/build]: Upgrade SONiC package versions (#8148)

---
 .../versions/build/build-sonic-slave-buster/versions-py2      | 2 ++
 .../versions/build/build-sonic-slave-buster/versions-py3      | 2 ++
 .../versions/build/build-sonic-slave-buster/versions-web      | 1 -
 files/build/versions/default/versions-deb-buster              | 1 -
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/docker-database/versions-web     | 1 +
 .../dockers/docker-sonic-mgmt-framework/versions-deb-buster   | 1 +
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 1 -
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 1 -
 9 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web
 create mode 100644 files/build/versions/dockers/docker-database/versions-web
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index d42c147c9528..d4585a8e9f7a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -3,7 +3,9 @@ contextlib2==0.6.0.post1
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
+ipaddress==1.0.23
 jsonschema==2.6.0
+lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 pyang==2.5.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 4585f9279f67..d52b83b0bc5a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,5 +1,7 @@
+bitarray==1.5.3
 ijson==2.6.1
 ipaddress==1.0.23
+lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
deleted file mode 100644
index c2c8a0a63aa8..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ /dev/null
@@ -1 +0,0 @@
-https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 38a32a2a513e..401359dff0ac 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -286,7 +286,6 @@ socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
-sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 5267630dc89f..027d832208f5 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7d3c9f6d1f62089250957279aee8e48b8fb378ba
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a79c441f6ac2e7506dfde7cee9c1e94af07a5a7e
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==bed4c26b094ec520c9cee53a1bfce94fdbd87872
+https://salsa.debian.org/kernel-team/ethtool/==cd5d950c98f5078e7053b730d6a221ff60c0355f
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-web b/files/build/versions/dockers/docker-database/versions-web
new file mode 100644
index 000000000000..49faeded1d44
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-web
@@ -0,0 +1 @@
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..33177b8acf5c
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1 @@
+sonic-mgmt-framework-dbg==1.0-01
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index 58f3c3c036e3..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==76159d5a2548bd481793ceb4903f725070d744ff
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 696f9af56e0a..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7d3c9f6d1f62089250957279aee8e48b8fb378ba
\ No newline at end of file

From 1b6634765c2bb22ba2477fe8ac8dc8bb5dd0fde7 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Sun, 11 Jul 2021 02:35:17 -0700
Subject: [PATCH 0627/1674] SAI fix (#8142)

[0e4f0b] Fix saisdkdump

#### Why I did it

Fix the saisdkdump failure when the vxlan src port flag is enabled in the sai.profile
---
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 0996474288e7..0e4f0bdbe8f9 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 0996474288e720a251e355d0bc7ce32ecce79410
+Subproject commit 0e4f0bdbe8f970db8a5f425191a7d9adae88ad95

From a5fe47858a8ccd806c864a247dad6446365eb97c Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 11 Jul 2021 22:18:53 +0800
Subject: [PATCH 0628/1674] [ci/build]: Upgrade SONiC package versions (#8152)

---
 .../versions/build/build-sonic-slave-buster/versions-py2      | 2 --
 .../versions/build/build-sonic-slave-buster/versions-py3      | 2 --
 files/build/versions/default/versions-deb-buster              | 1 +
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/docker-database/versions-web     | 1 -
 .../dockers/docker-sonic-mgmt-framework/versions-deb-buster   | 1 -
 6 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-database/versions-web
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index d4585a8e9f7a..d42c147c9528 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -3,9 +3,7 @@ contextlib2==0.6.0.post1
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
-ipaddress==1.0.23
 jsonschema==2.6.0
-lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 pyang==2.5.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index d52b83b0bc5a..4585f9279f67 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,7 +1,5 @@
-bitarray==1.5.3
 ijson==2.6.1
 ipaddress==1.0.23
-lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index 401359dff0ac..38a32a2a513e 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -286,6 +286,7 @@ socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 027d832208f5..4d3c2cc903ab 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a79c441f6ac2e7506dfde7cee9c1e94af07a5a7e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==41da91f968db4da9860a53793b406754d18cbe49
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==cd5d950c98f5078e7053b730d6a221ff60c0355f
+https://salsa.debian.org/kernel-team/ethtool/==58b8d5502b87fa38a719e2c96bbcdc02bcb540e4
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-web b/files/build/versions/dockers/docker-database/versions-web
deleted file mode 100644
index 49faeded1d44..000000000000
--- a/files/build/versions/dockers/docker-database/versions-web
+++ /dev/null
@@ -1 +0,0 @@
-https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index 33177b8acf5c..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1 +0,0 @@
-sonic-mgmt-framework-dbg==1.0-01
\ No newline at end of file

From 18ae4a37d8308d4ed00a5cdeb9a7e7fe8e0fa0d5 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 12 Jul 2021 22:01:55 +0800
Subject: [PATCH 0629/1674] [ci/build]: Upgrade SONiC package versions (#8156)

---
 files/build/versions/default/versions-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 4d3c2cc903ab..31d3a90c0812 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==58b8d5502b87fa38a719e2c96bbcdc02bcb540e4
+https://salsa.debian.org/kernel-team/ethtool/==a5fe47858a8ccd806c864a247dad6446365eb97c
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file

From 97460c06e51fe1f6f4656be197bc47e511a7776d Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Mon, 12 Jul 2021 10:43:50 -0700
Subject: [PATCH 0630/1674] SonicName Changes (#8154)

Edited port_config.ini files for all the 4600c for difference of 4.
Co-authored-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 .../ACS-MSN4600/port_config.ini               | 126 +++++-----
 .../ACS-MSN4600C/port_config.ini              | 126 +++++-----
 .../Mellanox-SN4600C-D112C8/port_config.ini   | 236 +++++++++---------
 3 files changed, 244 insertions(+), 244 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
index a1ecf9aa3266..2e6212ef692c 100644
--- a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/port_config.ini
@@ -1,65 +1,65 @@
 # name          lanes               alias     index
 Ethernet0       0,1,2,3             etp1      1
-Ethernet8       8,9,10,11           etp2      2
-Ethernet16      16,17,18,19         etp3      3
-Ethernet24      24,25,26,27         etp4      4
-Ethernet32      32,33,34,35         etp5      5
-Ethernet40      40,41,42,43         etp6      6
-Ethernet48      48,49,50,51         etp7      7
-Ethernet56      56,57,58,59         etp8      8
-Ethernet64      64,65,66,67         etp9      9
-Ethernet72      72,73,74,75         etp10     10
-Ethernet80      80,81,82,83         etp11     11
-Ethernet88      88,89,90,91         etp12     12
-Ethernet96      96,97,98,99         etp13     13
-Ethernet104     104,105,106,107     etp14     14
-Ethernet112     112,113,114,115     etp15     15
-Ethernet120     120,121,122,123     etp16     16
-Ethernet128     128,129,130,131     etp17     17
-Ethernet136     136,137,138,139     etp18     18
-Ethernet144     144,145,146,147     etp19     19
-Ethernet152     152,153,154,155     etp20     20
-Ethernet160     160,161,162,163     etp21     21
-Ethernet168     168,169,170,171     etp22     22
-Ethernet176     176,177,178,179     etp23     23
-Ethernet184     184,185,186,187     etp24     24
-Ethernet192     192,193,194,195     etp25     25
-Ethernet200     200,201,202,203     etp26     26
-Ethernet208     208,209,210,211     etp27     27
-Ethernet216     216,217,218,219     etp28     28
-Ethernet224     224,225,226,227     etp29     29
-Ethernet232     232,233,234,235     etp30     30
-Ethernet240     240,241,242,243     etp31     31
-Ethernet248     248,249,250,251     etp32     32
-Ethernet256     256,257,258,259     etp33     33
-Ethernet264     264,265,266,267     etp34     34
-Ethernet272     272,273,274,275     etp35     35
-Ethernet280     280,281,282,283     etp36     36
-Ethernet288     288,289,290,291     etp37     37
-Ethernet296     296,297,298,299     etp38     38
-Ethernet304     304,305,306,307     etp39     39
-Ethernet312     312,313,314,315     etp40     40
-Ethernet320     320,321,322,323     etp41     41
-Ethernet328     328,329,330,331     etp42     42
-Ethernet336     336,337,338,339     etp43     43
-Ethernet344     344,345,346,347     etp44     44
-Ethernet352     352,353,354,355     etp45     45
-Ethernet360     360,361,362,363     etp46     46
-Ethernet368     368,369,370,371     etp47     47
-Ethernet376     376,377,378,379     etp48     48
-Ethernet384     384,385,386,387     etp49     49
-Ethernet392     392,393,394,395     etp50     50
-Ethernet400     400,401,402,403     etp51     51
-Ethernet408     408,409,410,411     etp52     52
-Ethernet416     416,417,418,419     etp53     53
-Ethernet424     424,425,426,427     etp54     54
-Ethernet432     432,433,434,435     etp55     55
-Ethernet440     440,441,442,443     etp56     56
-Ethernet448     448,449,450,451     etp57     57
-Ethernet456     456,457,458,459     etp58     58
-Ethernet464     464,465,466,467     etp59     59
-Ethernet472     472,473,474,475     etp60     60
-Ethernet480     480,481,482,483     etp61     61
-Ethernet488     488,489,490,491     etp62     62
-Ethernet496     496,497,498,499     etp63     63
-Ethernet504     504,505,506,507     etp64     64
+Ethernet4       8,9,10,11           etp2      2
+Ethernet8       16,17,18,19         etp3      3
+Ethernet12      24,25,26,27         etp4      4
+Ethernet16      32,33,34,35         etp5      5
+Ethernet20      40,41,42,43         etp6      6
+Ethernet24      48,49,50,51         etp7      7
+Ethernet28      56,57,58,59         etp8      8
+Ethernet32      64,65,66,67         etp9      9
+Ethernet36      72,73,74,75         etp10     10
+Ethernet40      80,81,82,83         etp11     11
+Ethernet44      88,89,90,91         etp12     12
+Ethernet48      96,97,98,99         etp13     13
+Ethernet52      104,105,106,107     etp14     14
+Ethernet56      112,113,114,115     etp15     15
+Ethernet60      120,121,122,123     etp16     16
+Ethernet64      128,129,130,131     etp17     17
+Ethernet68      136,137,138,139     etp18     18
+Ethernet72      144,145,146,147     etp19     19
+Ethernet76      152,153,154,155     etp20     20
+Ethernet80      160,161,162,163     etp21     21
+Ethernet84      168,169,170,171     etp22     22
+Ethernet88      176,177,178,179     etp23     23
+Ethernet92      184,185,186,187     etp24     24
+Ethernet96      192,193,194,195     etp25     25
+Ethernet100     200,201,202,203     etp26     26
+Ethernet104     208,209,210,211     etp27     27
+Ethernet108     216,217,218,219     etp28     28
+Ethernet112     224,225,226,227     etp29     29
+Ethernet116     232,233,234,235     etp30     30
+Ethernet120     240,241,242,243     etp31     31
+Ethernet124     248,249,250,251     etp32     32
+Ethernet128     256,257,258,259     etp33     33
+Ethernet132     264,265,266,267     etp34     34
+Ethernet136     272,273,274,275     etp35     35
+Ethernet140     280,281,282,283     etp36     36
+Ethernet144     288,289,290,291     etp37     37
+Ethernet148     296,297,298,299     etp38     38
+Ethernet152     304,305,306,307     etp39     39
+Ethernet156     312,313,314,315     etp40     40
+Ethernet160     320,321,322,323     etp41     41
+Ethernet164     328,329,330,331     etp42     42
+Ethernet168     336,337,338,339     etp43     43
+Ethernet172     344,345,346,347     etp44     44
+Ethernet176     352,353,354,355     etp45     45
+Ethernet180     360,361,362,363     etp46     46
+Ethernet184     368,369,370,371     etp47     47
+Ethernet188     376,377,378,379     etp48     48
+Ethernet192     384,385,386,387     etp49     49
+Ethernet196     392,393,394,395     etp50     50
+Ethernet200     400,401,402,403     etp51     51
+Ethernet204     408,409,410,411     etp52     52
+Ethernet208     416,417,418,419     etp53     53
+Ethernet212     424,425,426,427     etp54     54
+Ethernet216     432,433,434,435     etp55     55
+Ethernet220     440,441,442,443     etp56     56
+Ethernet224     448,449,450,451     etp57     57
+Ethernet228     456,457,458,459     etp58     58
+Ethernet232     464,465,466,467     etp59     59
+Ethernet236     472,473,474,475     etp60     60
+Ethernet240     480,481,482,483     etp61     61
+Ethernet244     488,489,490,491     etp62     62
+Ethernet248     496,497,498,499     etp63     63
+Ethernet252     504,505,506,507     etp64     64
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/port_config.ini
index a1ecf9aa3266..2e6212ef692c 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/port_config.ini
@@ -1,65 +1,65 @@
 # name          lanes               alias     index
 Ethernet0       0,1,2,3             etp1      1
-Ethernet8       8,9,10,11           etp2      2
-Ethernet16      16,17,18,19         etp3      3
-Ethernet24      24,25,26,27         etp4      4
-Ethernet32      32,33,34,35         etp5      5
-Ethernet40      40,41,42,43         etp6      6
-Ethernet48      48,49,50,51         etp7      7
-Ethernet56      56,57,58,59         etp8      8
-Ethernet64      64,65,66,67         etp9      9
-Ethernet72      72,73,74,75         etp10     10
-Ethernet80      80,81,82,83         etp11     11
-Ethernet88      88,89,90,91         etp12     12
-Ethernet96      96,97,98,99         etp13     13
-Ethernet104     104,105,106,107     etp14     14
-Ethernet112     112,113,114,115     etp15     15
-Ethernet120     120,121,122,123     etp16     16
-Ethernet128     128,129,130,131     etp17     17
-Ethernet136     136,137,138,139     etp18     18
-Ethernet144     144,145,146,147     etp19     19
-Ethernet152     152,153,154,155     etp20     20
-Ethernet160     160,161,162,163     etp21     21
-Ethernet168     168,169,170,171     etp22     22
-Ethernet176     176,177,178,179     etp23     23
-Ethernet184     184,185,186,187     etp24     24
-Ethernet192     192,193,194,195     etp25     25
-Ethernet200     200,201,202,203     etp26     26
-Ethernet208     208,209,210,211     etp27     27
-Ethernet216     216,217,218,219     etp28     28
-Ethernet224     224,225,226,227     etp29     29
-Ethernet232     232,233,234,235     etp30     30
-Ethernet240     240,241,242,243     etp31     31
-Ethernet248     248,249,250,251     etp32     32
-Ethernet256     256,257,258,259     etp33     33
-Ethernet264     264,265,266,267     etp34     34
-Ethernet272     272,273,274,275     etp35     35
-Ethernet280     280,281,282,283     etp36     36
-Ethernet288     288,289,290,291     etp37     37
-Ethernet296     296,297,298,299     etp38     38
-Ethernet304     304,305,306,307     etp39     39
-Ethernet312     312,313,314,315     etp40     40
-Ethernet320     320,321,322,323     etp41     41
-Ethernet328     328,329,330,331     etp42     42
-Ethernet336     336,337,338,339     etp43     43
-Ethernet344     344,345,346,347     etp44     44
-Ethernet352     352,353,354,355     etp45     45
-Ethernet360     360,361,362,363     etp46     46
-Ethernet368     368,369,370,371     etp47     47
-Ethernet376     376,377,378,379     etp48     48
-Ethernet384     384,385,386,387     etp49     49
-Ethernet392     392,393,394,395     etp50     50
-Ethernet400     400,401,402,403     etp51     51
-Ethernet408     408,409,410,411     etp52     52
-Ethernet416     416,417,418,419     etp53     53
-Ethernet424     424,425,426,427     etp54     54
-Ethernet432     432,433,434,435     etp55     55
-Ethernet440     440,441,442,443     etp56     56
-Ethernet448     448,449,450,451     etp57     57
-Ethernet456     456,457,458,459     etp58     58
-Ethernet464     464,465,466,467     etp59     59
-Ethernet472     472,473,474,475     etp60     60
-Ethernet480     480,481,482,483     etp61     61
-Ethernet488     488,489,490,491     etp62     62
-Ethernet496     496,497,498,499     etp63     63
-Ethernet504     504,505,506,507     etp64     64
+Ethernet4       8,9,10,11           etp2      2
+Ethernet8       16,17,18,19         etp3      3
+Ethernet12      24,25,26,27         etp4      4
+Ethernet16      32,33,34,35         etp5      5
+Ethernet20      40,41,42,43         etp6      6
+Ethernet24      48,49,50,51         etp7      7
+Ethernet28      56,57,58,59         etp8      8
+Ethernet32      64,65,66,67         etp9      9
+Ethernet36      72,73,74,75         etp10     10
+Ethernet40      80,81,82,83         etp11     11
+Ethernet44      88,89,90,91         etp12     12
+Ethernet48      96,97,98,99         etp13     13
+Ethernet52      104,105,106,107     etp14     14
+Ethernet56      112,113,114,115     etp15     15
+Ethernet60      120,121,122,123     etp16     16
+Ethernet64      128,129,130,131     etp17     17
+Ethernet68      136,137,138,139     etp18     18
+Ethernet72      144,145,146,147     etp19     19
+Ethernet76      152,153,154,155     etp20     20
+Ethernet80      160,161,162,163     etp21     21
+Ethernet84      168,169,170,171     etp22     22
+Ethernet88      176,177,178,179     etp23     23
+Ethernet92      184,185,186,187     etp24     24
+Ethernet96      192,193,194,195     etp25     25
+Ethernet100     200,201,202,203     etp26     26
+Ethernet104     208,209,210,211     etp27     27
+Ethernet108     216,217,218,219     etp28     28
+Ethernet112     224,225,226,227     etp29     29
+Ethernet116     232,233,234,235     etp30     30
+Ethernet120     240,241,242,243     etp31     31
+Ethernet124     248,249,250,251     etp32     32
+Ethernet128     256,257,258,259     etp33     33
+Ethernet132     264,265,266,267     etp34     34
+Ethernet136     272,273,274,275     etp35     35
+Ethernet140     280,281,282,283     etp36     36
+Ethernet144     288,289,290,291     etp37     37
+Ethernet148     296,297,298,299     etp38     38
+Ethernet152     304,305,306,307     etp39     39
+Ethernet156     312,313,314,315     etp40     40
+Ethernet160     320,321,322,323     etp41     41
+Ethernet164     328,329,330,331     etp42     42
+Ethernet168     336,337,338,339     etp43     43
+Ethernet172     344,345,346,347     etp44     44
+Ethernet176     352,353,354,355     etp45     45
+Ethernet180     360,361,362,363     etp46     46
+Ethernet184     368,369,370,371     etp47     47
+Ethernet188     376,377,378,379     etp48     48
+Ethernet192     384,385,386,387     etp49     49
+Ethernet196     392,393,394,395     etp50     50
+Ethernet200     400,401,402,403     etp51     51
+Ethernet204     408,409,410,411     etp52     52
+Ethernet208     416,417,418,419     etp53     53
+Ethernet212     424,425,426,427     etp54     54
+Ethernet216     432,433,434,435     etp55     55
+Ethernet220     440,441,442,443     etp56     56
+Ethernet224     448,449,450,451     etp57     57
+Ethernet228     456,457,458,459     etp58     58
+Ethernet232     464,465,466,467     etp59     59
+Ethernet236     472,473,474,475     etp60     60
+Ethernet240     480,481,482,483     etp61     61
+Ethernet244     488,489,490,491     etp62     62
+Ethernet248     496,497,498,499     etp63     63
+Ethernet252     504,505,506,507     etp64     64
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
index 27d933d886fa..be2c7d9255ca 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini
@@ -1,121 +1,121 @@
 # name         lanes              alias     index    speed     fec
 Ethernet0      0,1                etp1a     1        50000     none
 Ethernet2      2,3                etp1b     1        50000     none
-Ethernet8      8,9                etp2a     2        50000     none
-Ethernet10     10,11              etp2b     2        50000     none
-Ethernet16     16,17              etp3a     3        50000     none
-Ethernet18     18,19              etp3b     3        50000     none
-Ethernet24     24,25              etp4a     4        50000     none
-Ethernet26     26,27              etp4b     4        50000     none
-Ethernet32     32,33              etp5a     5        50000     none
-Ethernet34     34,35              etp5b     5        50000     none
-Ethernet40     40,41              etp6a     6        50000     none
-Ethernet42     42,43              etp6b     6        50000     none
-Ethernet48     48,49              etp7a     7        50000     none
-Ethernet50     50,51              etp7b     7        50000     none
-Ethernet56     56,57              etp8a     8        50000     none
-Ethernet58     58,59              etp8b     8        50000     none
-Ethernet64     64,65              etp9a     9        50000     none
-Ethernet66     66,67              etp9b     9        50000     none
-Ethernet72     72,73              etp10a    10       50000     none
-Ethernet74     74,75              etp10b    10       50000     none
-Ethernet80     80,81              etp11a    11       50000     none
-Ethernet82     82,83              etp11b    11       50000     none
-Ethernet88     88,89              etp12a    12       50000     none
-Ethernet90     90,91              etp12b    12       50000     none
-Ethernet96     96,97              etp13a    13       50000     none
-Ethernet98     98,99              etp13b    13       50000     none
-Ethernet104    104,105            etp14a    14       50000     none
-Ethernet106    106,107            etp14b    14       50000     none
-Ethernet112    112,113            etp15a    15       50000     none
-Ethernet114    114,115            etp15b    15       50000     none
-Ethernet120    120,121            etp16a    16       50000     none
-Ethernet122    122,123            etp16b    16       50000     none
-Ethernet128    128,129            etp17a    17       50000     none
-Ethernet130    130,131            etp17b    17       50000     none
-Ethernet136    136,137            etp18a    18       50000     none
-Ethernet138    138,139            etp18b    18       50000     none
-Ethernet144    144,145            etp19a    19       50000     none
-Ethernet146    146,147            etp19b    19       50000     none
-Ethernet152    152,153            etp20a    20       50000     none
-Ethernet154    154,155            etp20b    20       50000     none
-Ethernet160    160,161            etp21a    21       50000     none
-Ethernet162    162,163            etp21b    21       50000     none
-Ethernet168    168,169            etp22a    22       50000     none
-Ethernet170    170,171            etp22b    22       50000     none
-Ethernet176    176,177            etp23a    23       50000     none
-Ethernet178    178,179            etp23b    23       50000     none
-Ethernet184    184,185            etp24a    24       50000     none
-Ethernet186    186,187            etp24b    24       50000     none
-Ethernet192    192,193,194,195    etp25     25       100000    rs
-Ethernet200    200,201,202,203    etp26     26       100000    rs
-Ethernet208    208,209            etp27a    27       50000     none
-Ethernet210    210,211            etp27b    27       50000     none
-Ethernet216    216,217            etp28a    28       50000     none
-Ethernet218    218,219            etp28b    28       50000     none
-Ethernet224    224,225,226,227    etp29     29       100000    rs
-Ethernet232    232,233,234,235    etp30     30       100000    rs
-Ethernet240    240,241            etp31a    31       50000     none
-Ethernet242    242,243            etp31b    31       50000     none
-Ethernet248    248,249            etp32a    32       50000     none
-Ethernet250    250,251            etp32b    32       50000     none
-Ethernet256    256,257,258,259    etp33     33       100000    rs
-Ethernet264    264,265,266,267    etp34     34       100000    rs
-Ethernet272    272,273            etp35a    35       50000     none
-Ethernet274    274,275            etp35b    35       50000     none
-Ethernet280    280,281            etp36a    36       50000     none
-Ethernet282    282,283            etp36b    36       50000     none
-Ethernet288    288,289,290,291    etp37     37       100000    rs
-Ethernet296    296,297,298,299    etp38     38       100000    rs
-Ethernet304    304,305            etp39a    39       50000     none
-Ethernet306    306,307            etp39b    39       50000     none
-Ethernet312    312,313            etp40a    40       50000     none
-Ethernet314    314,315            etp40b    40       50000     none
-Ethernet320    320,321            etp41a    41       50000     none
-Ethernet322    322,323            etp41b    41       50000     none
-Ethernet328    328,329            etp42a    42       50000     none
-Ethernet330    330,331            etp42b    42       50000     none
-Ethernet336    336,337            etp43a    43       50000     none
-Ethernet338    338,339            etp43b    43       50000     none
-Ethernet344    344,345            etp44a    44       50000     none
-Ethernet346    346,347            etp44b    44       50000     none
-Ethernet352    352,353            etp45a    45       50000     none
-Ethernet354    354,355            etp45b    45       50000     none
-Ethernet360    360,361            etp46a    46       50000     none
-Ethernet362    362,363            etp46b    46       50000     none
-Ethernet368    368,369            etp47a    47       50000     none
-Ethernet370    370,371            etp47b    47       50000     none
-Ethernet376    376,377            etp48a    48       50000     none
-Ethernet378    378,379            etp48b    48       50000     none
-Ethernet384    384,385            etp49a    49       50000     none
-Ethernet386    386,387            etp49b    49       50000     none
-Ethernet392    392,393            etp50a    50       50000     none
-Ethernet394    394,395            etp50b    50       50000     none
-Ethernet400    400,401            etp51a    51       50000     none
-Ethernet402    402,403            etp51b    51       50000     none
-Ethernet408    408,409            etp52a    52       50000     none
-Ethernet410    410,411            etp52b    52       50000     none
-Ethernet416    416,417            etp53a    53       50000     none
-Ethernet418    418,419            etp53b    53       50000     none
-Ethernet424    424,425            etp54a    54       50000     none
-Ethernet426    426,427            etp54b    54       50000     none
-Ethernet432    432,433            etp55a    55       50000     none
-Ethernet434    434,435            etp55b    55       50000     none
-Ethernet440    440,441            etp56a    56       50000     none
-Ethernet442    442,443            etp56b    56       50000     none
-Ethernet448    448,449            etp57a    57       50000     none
-Ethernet450    450,451            etp57b    57       50000     none
-Ethernet456    456,457            etp58a    58       50000     none
-Ethernet458    458,459            etp58b    58       50000     none
-Ethernet464    464,465            etp59a    59       50000     none
-Ethernet466    466,467            etp59b    59       50000     none
-Ethernet472    472,473            etp60a    60       50000     none
-Ethernet474    474,475            etp60b    60       50000     none
-Ethernet480    480,481            etp61a    61       50000     none
-Ethernet482    482,483            etp61b    61       50000     none
-Ethernet488    488,489            etp62a    62       50000     none
-Ethernet490    490,491            etp62b    62       50000     none
-Ethernet496    496,497            etp63a    63       50000     none
-Ethernet498    498,499            etp63b    63       50000     none
-Ethernet504    504,505            etp64a    64       50000     none
-Ethernet506    506,507            etp64b    64       50000     none
+Ethernet4      8,9                etp2a     2        50000     none
+Ethernet6      10,11              etp2b     2        50000     none
+Ethernet8      16,17              etp3a     3        50000     none
+Ethernet10     18,19              etp3b     3        50000     none
+Ethernet12     24,25              etp4a     4        50000     none
+Ethernet14     26,27              etp4b     4        50000     none
+Ethernet16     32,33              etp5a     5        50000     none
+Ethernet18     34,35              etp5b     5        50000     none
+Ethernet20     40,41              etp6a     6        50000     none
+Ethernet22     42,43              etp6b     6        50000     none
+Ethernet24     48,49              etp7a     7        50000     none
+Ethernet26     50,51              etp7b     7        50000     none
+Ethernet28     56,57              etp8a     8        50000     none
+Ethernet30     58,59              etp8b     8        50000     none
+Ethernet32     64,65              etp9a     9        50000     none
+Ethernet34     66,67              etp9b     9        50000     none
+Ethernet36     72,73              etp10a    10       50000     none
+Ethernet38     74,75              etp10b    10       50000     none
+Ethernet40     80,81              etp11a    11       50000     none
+Ethernet42     82,83              etp11b    11       50000     none
+Ethernet44     88,89              etp12a    12       50000     none
+Ethernet46     90,91              etp12b    12       50000     none
+Ethernet48     96,97              etp13a    13       50000     none
+Ethernet50     98,99              etp13b    13       50000     none
+Ethernet52     104,105            etp14a    14       50000     none
+Ethernet54     106,107            etp14b    14       50000     none
+Ethernet56     112,113            etp15a    15       50000     none
+Ethernet58     114,115            etp15b    15       50000     none
+Ethernet60     120,121            etp16a    16       50000     none
+Ethernet62     122,123            etp16b    16       50000     none
+Ethernet64     128,129            etp17a    17       50000     none
+Ethernet66     130,131            etp17b    17       50000     none
+Ethernet68     136,137            etp18a    18       50000     none
+Ethernet70     138,139            etp18b    18       50000     none
+Ethernet72     144,145            etp19a    19       50000     none
+Ethernet74     146,147            etp19b    19       50000     none
+Ethernet76     152,153            etp20a    20       50000     none
+Ethernet78     154,155            etp20b    20       50000     none
+Ethernet80     160,161            etp21a    21       50000     none
+Ethernet82     162,163            etp21b    21       50000     none
+Ethernet84     168,169            etp22a    22       50000     none
+Ethernet86     170,171            etp22b    22       50000     none
+Ethernet88     176,177            etp23a    23       50000     none
+Ethernet90     178,179            etp23b    23       50000     none
+Ethernet92     184,185            etp24a    24       50000     none
+Ethernet94     186,187            etp24b    24       50000     none
+Ethernet96     192,193,194,195    etp25     25       100000    rs
+Ethernet100    200,201,202,203    etp26     26       100000    rs
+Ethernet104    208,209            etp27a    27       50000     none
+Ethernet106    210,211            etp27b    27       50000     none
+Ethernet108    216,217            etp28a    28       50000     none
+Ethernet110    218,219            etp28b    28       50000     none
+Ethernet112    224,225,226,227    etp29     29       100000    rs
+Ethernet116    232,233,234,235    etp30     30       100000    rs
+Ethernet120    240,241            etp31a    31       50000     none
+Ethernet122    242,243            etp31b    31       50000     none
+Ethernet124    248,249            etp32a    32       50000     none
+Ethernet126    250,251            etp32b    32       50000     none
+Ethernet128    256,257,258,259    etp33     33       100000    rs
+Ethernet132    264,265,266,267    etp34     34       100000    rs
+Ethernet136    272,273            etp35a    35       50000     none
+Ethernet138    274,275            etp35b    35       50000     none
+Ethernet140    280,281            etp36a    36       50000     none
+Ethernet142    282,283            etp36b    36       50000     none
+Ethernet144    288,289,290,291    etp37     37       100000    rs
+Ethernet148    296,297,298,299    etp38     38       100000    rs
+Ethernet152    304,305            etp39a    39       50000     none
+Ethernet154    306,307            etp39b    39       50000     none
+Ethernet156    312,313            etp40a    40       50000     none
+Ethernet158    314,315            etp40b    40       50000     none
+Ethernet160    320,321            etp41a    41       50000     none
+Ethernet162    322,323            etp41b    41       50000     none
+Ethernet164    328,329            etp42a    42       50000     none
+Ethernet166    330,331            etp42b    42       50000     none
+Ethernet168    336,337            etp43a    43       50000     none
+Ethernet170    338,339            etp43b    43       50000     none
+Ethernet172    344,345            etp44a    44       50000     none
+Ethernet174    346,347            etp44b    44       50000     none
+Ethernet176    352,353            etp45a    45       50000     none
+Ethernet178    354,355            etp45b    45       50000     none
+Ethernet180    360,361            etp46a    46       50000     none
+Ethernet182    362,363            etp46b    46       50000     none
+Ethernet184    368,369            etp47a    47       50000     none
+Ethernet186    370,371            etp47b    47       50000     none
+Ethernet188    376,377            etp48a    48       50000     none
+Ethernet190    378,379            etp48b    48       50000     none
+Ethernet192    384,385            etp49a    49       50000     none
+Ethernet194    386,387            etp49b    49       50000     none
+Ethernet196    392,393            etp50a    50       50000     none
+Ethernet198    394,395            etp50b    50       50000     none
+Ethernet200    400,401            etp51a    51       50000     none
+Ethernet202    402,403            etp51b    51       50000     none
+Ethernet204    408,409            etp52a    52       50000     none
+Ethernet206    410,411            etp52b    52       50000     none
+Ethernet208    416,417            etp53a    53       50000     none
+Ethernet210    418,419            etp53b    53       50000     none
+Ethernet212    424,425            etp54a    54       50000     none
+Ethernet214    426,427            etp54b    54       50000     none
+Ethernet216    432,433            etp55a    55       50000     none
+Ethernet218    434,435            etp55b    55       50000     none
+Ethernet220    440,441            etp56a    56       50000     none
+Ethernet222    442,443            etp56b    56       50000     none
+Ethernet224    448,449            etp57a    57       50000     none
+Ethernet226    450,451            etp57b    57       50000     none
+Ethernet228    456,457            etp58a    58       50000     none
+Ethernet230    458,459            etp58b    58       50000     none
+Ethernet232    464,465            etp59a    59       50000     none
+Ethernet234    466,467            etp59b    59       50000     none
+Ethernet236    472,473            etp60a    60       50000     none
+Ethernet238    474,475            etp60b    60       50000     none
+Ethernet240    480,481            etp61a    61       50000     none
+Ethernet242    482,483            etp61b    61       50000     none
+Ethernet244    488,489            etp62a    62       50000     none
+Ethernet246    490,491            etp62b    62       50000     none
+Ethernet248    496,497            etp63a    63       50000     none
+Ethernet250    498,499            etp63b    63       50000     none
+Ethernet252    504,505            etp64a    64       50000     none
+Ethernet254    506,507            etp64b    64       50000     none
\ No newline at end of file

From af8cd03d18675b43c4f787aa375cda0830a65521 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 9 Jul 2021 14:30:26 +0800
Subject: [PATCH 0631/1674] Reproducible build support docker image (#8039)

when build docker image, we need a base image. now base image is specified by tag. we can use sha256 to specify docker image.
---
 scripts/docker_version_control.sh   | 42 +++++++++++++++++++++++++++++
 scripts/prepare_docker_buildinfo.sh |  5 +++-
 scripts/versions_manager.py         |  2 ++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 scripts/docker_version_control.sh

diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh
new file mode 100755
index 000000000000..41e536f08073
--- /dev/null
+++ b/scripts/docker_version_control.sh
@@ -0,0 +1,42 @@
+# This script is for reproducible build.
+# Reproducible build for docker enabled: Before build docker image, this script will change image:tag to image:sha256 in DOCKERFILE.
+# And record image sha256 to a target file.
+#!/bin/bash
+
+IMAGENAME=$1
+DOCKERFILE=$2
+ARCH=$3
+DOCKERFILE_TARGE=$4
+DISTRO=$5
+
+version_file=files/build/versions/default/versions-docker
+new_version_file=target/versions/default/versions-docker
+mkdir -p target/versions/default
+
+. src/sonic-build-hooks/buildinfo/config/buildinfo.config
+
+image_tag=`grep "^FROM " $DOCKERFILE | awk '{print$2}'`
+image=`echo $image_tag | cut -f1 -d:`
+tag=`echo $image_tag | cut -f2 -d:`
+
+# if docker image not in white list, exit
+if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]];then
+    exit 0
+fi
+
+if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then
+    if [ -f $version_file ];then
+        hash_value=`grep "${ARCH}:${image_tag}" $version_file | awk -F== '{print$2}'`
+    fi
+    if [ -z $hash_value ];then
+        hash_value=unknown
+    fi
+    oldimage=${image_tag//\//\\/}
+    newimage="${oldimage}@$hash_value"
+    sed -i "s/$oldimage/$newimage/" $DOCKERFILE
+else
+    hash_value=`docker pull $image_tag | grep Digest | awk '{print$2}'`
+fi
+if [[ "$hash_value" != "unknown" ]];then
+    echo -e "${ARCH}:${image_tag}==$hash_value" >> $new_version_file
+fi
diff --git a/scripts/prepare_docker_buildinfo.sh b/scripts/prepare_docker_buildinfo.sh
index aa3aaaa4bed5..d2b2c57185d1 100755
--- a/scripts/prepare_docker_buildinfo.sh
+++ b/scripts/prepare_docker_buildinfo.sh
@@ -22,7 +22,10 @@ if [ -z "$DISTRO" ]; then
     [ -z "$DISTRO" ] && DISTRO=jessie
 fi
 
-DOCKERFILE_PRE_SCRIPT='# Auto-Generated for buildinfo 
+# add script for reproducible build. using sha256 instead of tag for docker base image.
+scripts/docker_version_control.sh $@
+
+DOCKERFILE_PRE_SCRIPT='# Auto-Generated for buildinfo
 COPY ["buildinfo", "/usr/local/share/buildinfo"]
 RUN dpkg -i /usr/local/share/buildinfo/sonic-build-hooks_1.0_all.deb
 RUN pre_run_buildinfo'
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index a59d85dd8a96..3a46aaafe229 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -374,10 +374,12 @@ def __init__(self, target_path="./target", source_path='.'):
     def load_from_target(self):
         dockers_path = os.path.join(self.target_path, 'versions/dockers')
         build_path = os.path.join(self.target_path, 'versions/build')
+        default_path = os.path.join(self.target_path, 'versions/default')
         modules = {}
         self.modules = modules
         file_paths = glob.glob(dockers_path + '/*')
         file_paths += glob.glob(build_path + '/build-*')
+        file_paths += glob.glob(default_path)
         file_paths.append(os.path.join(self.target_path, 'versions/host-image'))
         file_paths.append(os.path.join(self.target_path, 'versions/host-base-image'))
         for file_path in file_paths:

From 770e05535896afb3f4dd9372696a378f2135b748 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 9 Jul 2021 14:51:17 +0800
Subject: [PATCH 0632/1674] Enable reproducible build in base docker image
 sonic-slave-* (#8116)

---
 .azure-pipelines/azure-pipelines-image-template.yml | 2 +-
 .azure-pipelines/docker-sonic-slave.yml             | 7 ++++++-
 slave.mk                                            | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 81f181cf3cb9..3c437cc56664 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -44,7 +44,7 @@ jobs:
           sudo modprobe overlay
           sudo apt-get install -y acl
           sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
-          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
+          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
       - script: cp target -r $(Build.ArtifactStagingDirectory)/
diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 078c8e53a5d3..2ca3708dabbd 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -42,6 +42,11 @@ parameters:
   type: string
   default: sonicdev
 
+variables:
+- ${{ if and(startsWith(variables['Build.SourceBranchName'], '202'), eq(length(variables['Build.SourceBranchName']), 6)) }}:
+  - name: BUILD_OPTIONS
+    value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+
 stages:
 - stage: Build
   jobs:
@@ -80,7 +85,7 @@ stages:
 
               echo ${{ arch }} > .arch
 
-              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} make -f Makefile.work sonic-slave-build | tee $tmpfile
+              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} $(BUILD_OPTIONS) make -f Makefile.work sonic-slave-build | tee $tmpfile
               SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
               SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
 
diff --git a/slave.mk b/slave.mk
index 05f2b56aa08d..42f2f8f5e208 100644
--- a/slave.mk
+++ b/slave.mk
@@ -256,6 +256,7 @@ $(info "INCLUDE_KUBERNETES"              : "$(INCLUDE_KUBERNETES)")
 $(info "TELEMETRY_WRITABLE"              : "$(TELEMETRY_WRITABLE)")
 $(info "PDDF_SUPPORT"                    : "$(PDDF_SUPPORT)")
 $(info "MULTIARCH_QEMU_ENVIRON"          : "$(MULTIARCH_QEMU_ENVIRON)")
+$(info "SONIC_VERSION_CONTROL_COMPONENTS": "$(SONIC_VERSION_CONTROL_COMPONENTS)")
 $(info )
 else
 $(info SONiC Build System for $(CONFIGURED_PLATFORM):$(CONFIGURED_ARCH))

From c857f64c00bb29eb8aef1ea49c64189997c1f92f Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Fri, 9 Jul 2021 14:24:50 -0700
Subject: [PATCH 0633/1674] [bgpcfgd] Remove unnecessary dependency for
 StaticRouteMgr (#8037)

Why I did it
Static route configuration should not depend on BGP_ASN. Remove the dependency on BGP_ASN for StaticRouteMgr.
Fix #8027

How I did it
Check if BGP_ASN field before configuring static route redistribution and wait until BGP_ASN is available to enable static route redistribution.

How to verify it
Add unit test to cover the scenario and verify the functionality on a virtual switch.
---
 .../bgpcfgd/managers_static_rt.py             | 61 +++++++++-----
 src/sonic-bgpcfgd/tests/test_static_rt.py     | 82 ++++++++++++++++++-
 2 files changed, 122 insertions(+), 21 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
index 974843366a90..6fafeda8142d 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
@@ -16,12 +16,14 @@ def __init__(self, common_objs, db, table):
         """
         super(StaticRouteMgr, self).__init__(
             common_objs,
-            [("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),],
+            [],
             db,
             table,
         )
-
+        
+        self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
         self.static_routes = {}
+        self.vrf_pending_redistribution = set()
 
     OP_DELETE = 'DELETE'
     OP_ADD = 'ADD'
@@ -47,15 +49,10 @@ def set_handler(self, key, data):
 
         # Enable redistribution of static routes when it is the first one get set
         if not self.static_routes.get(vrf, {}):
-            log_debug("Enabling static route redistribution")
-            bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
-            if vrf == 'default':
-                cmd_list.append("router bgp %s" % bgp_asn)
+            if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+                cmd_list.extend(self.enable_redistribution_command(vrf))
             else:
-                cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-            for af in ["ipv4", "ipv6"]:
-                cmd_list.append(" address-family %s" % af)
-                cmd_list.append("  redistribute static")
+                self.vrf_pending_redistribution.add(vrf)
 
         if cmd_list:
             self.cfg_mgr.push_list(cmd_list)
@@ -78,15 +75,9 @@ def del_handler(self, key):
 
         # Disable redistribution of static routes when it is the last one to delete
         if self.static_routes.get(vrf, {}).keys() == {ip_prefix}:
-            log_debug("Disabling static route redistribution")
-            bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
-            if vrf == 'default':
-                cmd_list.append("router bgp %s" % bgp_asn)
-            else:
-                cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-            for af in ["ipv4", "ipv6"]:
-                cmd_list.append(" address-family %s" % af)
-                cmd_list.append("  no redistribute static")
+            if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+                cmd_list.extend(self.disable_redistribution_command(vrf))
+            self.vrf_pending_redistribution.discard(vrf)
 
         if cmd_list:
             self.cfg_mgr.push_list(cmd_list)
@@ -135,6 +126,38 @@ def generate_command(self, op, ip_nh, ip_prefix, vrf):
             ' vrf {}'.format(vrf) if vrf != 'default' else ''
         )
 
+    def enable_redistribution_command(self, vrf):
+        log_debug("Enabling static route redistribution")
+        cmd_list = []
+        bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+        if vrf == 'default':
+            cmd_list.append("router bgp %s" % bgp_asn)
+        else:
+            cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+        for af in ["ipv4", "ipv6"]:
+            cmd_list.append(" address-family %s" % af)
+            cmd_list.append("  redistribute static")
+        return cmd_list
+
+    def disable_redistribution_command(self, vrf):
+        log_debug("Disabling static route redistribution")
+        cmd_list = []
+        bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+        if vrf == 'default':
+            cmd_list.append("router bgp %s" % bgp_asn)
+        else:
+            cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+        for af in ["ipv4", "ipv6"]:
+            cmd_list.append(" address-family %s" % af)
+            cmd_list.append("  no redistribute static")
+        return cmd_list
+
+    def on_bgp_asn_change(self):
+        if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+            for vrf in self.vrf_pending_redistribution:
+                self.cfg_mgr.push_list(self.enable_redistribution_command(vrf))
+            self.vrf_pending_redistribution.clear()
+
 class IpNextHop:
     def __init__(self, af_id, blackhole, dst_ip, if_name, dist, vrf):
         zero_ip = lambda af: '0.0.0.0' if af == socket.AF_INET else '::'
diff --git a/src/sonic-bgpcfgd/tests/test_static_rt.py b/src/sonic-bgpcfgd/tests/test_static_rt.py
index 0fa2e3df6c2f..e0b9b1b17ebf 100644
--- a/src/sonic-bgpcfgd/tests/test_static_rt.py
+++ b/src/sonic-bgpcfgd/tests/test_static_rt.py
@@ -6,7 +6,7 @@
 from collections import Counter
 from swsscommon import swsscommon
 
-def constructor():
+def constructor(skip_bgp_asn=False):
     cfg_mgr = MagicMock()
 
     common_objs = {
@@ -17,7 +17,8 @@ def constructor():
     }
 
     mgr = StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE")
-    mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
+    if not skip_bgp_asn:
+        mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
     assert len(mgr.static_routes) == 0
 
     return mgr
@@ -573,3 +574,80 @@ def test_set_invalid_ipaddr():
         False,
         []
     )
+
+def test_set_del_no_bgp_asn():
+    mgr = constructor(skip_bgp_asn=True)
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+        ]
+    )
+    set_del_test(
+        mgr,
+        "DEL",
+        ("vrfRED|10.1.3.0/24",),
+        True,
+        [
+            "no ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "no ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+        ]
+    )
+
+def test_set_del_bgp_asn_change():
+    mgr = constructor(skip_bgp_asn=True)
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.1.3.0/24", {
+            "nexthop": "10.0.0.57,10.0.0.59,10.0.0.61",
+            "ifname": "PortChannel0001,PortChannel0002,PortChannel0003",
+            "distance": "10,20,30",
+            "nexthop-vrf": "nh_vrf,,default",
+            "blackhole": "false,false,false",
+        }),
+        True,
+        [
+            "ip route 10.1.3.0/24 10.0.0.57 PortChannel0001 10 nexthop-vrf nh_vrf vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.59 PortChannel0002 20 vrf vrfRED",
+            "ip route 10.1.3.0/24 10.0.0.61 PortChannel0003 30 nexthop-vrf default vrf vrfRED",
+        ]
+    )
+
+    assert mgr.vrf_pending_redistribution == {"vrfRED"}
+
+    expected_cmds = [
+        "router bgp 65100 vrf vrfRED",
+        " address-family ipv4",
+        "  redistribute static",
+        " address-family ipv6",
+        "  redistribute static"
+    ]
+    def push_list(cmds):
+        set_del_test.push_list_called = True
+        assert Counter(cmds) == Counter(expected_cmds) # check if commands are expected (regardless of the order)
+        max_del_idx = -1
+        min_set_idx = len(cmds)
+        for idx in range(len(cmds)):
+            if cmds[idx].startswith('no ip') and idx > max_del_idx:
+                max_del_idx = idx
+            if cmds[idx].startswith('ip') and idx < min_set_idx:
+                min_set_idx = idx
+        assert max_del_idx < min_set_idx, "DEL command comes after SET command" # DEL commands should be done first
+        return True
+    mgr.cfg_mgr.push_list = push_list
+    mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
+
+    assert not mgr.vrf_pending_redistribution

From 86d64d2fef05fe14e93ac7ff50727acf0fe74e31 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Tue, 22 Jun 2021 21:27:56 +0800
Subject: [PATCH 0634/1674] mount 'mellanox' folder only instead of create each
 sub folder (#7830)

#### Why I did it

Following the discussion in another PR https://github.com/Azure/sonic-buildimage/pull/7708#discussion_r642933510 , since there will be multi subfolders under **/var/log/mellanox**, so we agreed to only mount this folder and the subfolders will be created afterward on demand.

#### How I did it

during the syncd docker creation, only mount  folder **/var/log/mellanox**

#### How to verify it

build an Mellanox image and verify the related folder on the host and docker side.
---
 files/build_templates/docker_image_ctl.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 5bc6ca0651d7..109e431f8e73 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -354,7 +354,7 @@ start() {
 {%- endif %}
 {%- if sonic_asic_platform == "mellanox" %}
 {%- if docker_container_name == "syncd" %}
-        -v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw \
+        -v /var/log/mellanox:/var/log/mellanox:rw \
         -v mlnx_sdk_socket:/var/run/sx_sdk \
         -v mlnx_sdk_ready:/tmp \
         -v /dev/shm:/dev/shm:rw \

From da7f596a553bb543cc32eda1cfd6ac10f6ae6e59 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:57:17 +0300
Subject: [PATCH 0635/1674] [hostcfgd] [202012] Enhance hostcfgd to check
 feature state and run less system calls (#8157)

Currently hostcfgd is implemented in a way each feature which is enabled/disabled triggering execution of systemctl enable/unmask commands which eventually trigger 'systemctl daemon-reload' command.
Each call like this cost 0.6s and overall add a overhead of ~12 seconds of CPU time.
This change will verify the desired state of a feature and the current state of this feature on systemd and trigger a system call only when must.
What is changed: Check each feature status on systemd before executing a system call to enable and reload the systemctl daemon.
How to verify: Build an image with this change and observe less system calls are executed.
---
 src/sonic-host-services/scripts/hostcfgd      | 14 +++
 .../tests/hostcfgd/hostcfgd_test.py           |  5 +
 .../tests/hostcfgd/test_vectors.py            | 96 +++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 3b207b7fd54f..3d6202a15ad0 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -457,6 +457,13 @@ class HostConfigDaemon:
     def enable_feature(self, feature_names, feature_suffixes):
         start_cmds = []
         for feature_name in feature_names:
+            # Check if it is already enabled, if yes skip the system call
+            cmd = "sudo systemctl status {}.{} | grep Loaded".format(feature_name, feature_suffixes[-1])
+            proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            (stdout, stderr) = proc.communicate()
+            if "enabled" in str(stdout):
+                continue
+
             for suffix in feature_suffixes:
                 start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, suffix))
             # If feature has timer associated with it, start/enable corresponding systemd .timer unit
@@ -477,6 +484,13 @@ class HostConfigDaemon:
     def disable_feature(self, feature_names, feature_suffixes):
         stop_cmds = []
         for feature_name in feature_names:
+            # Check if it is already disabled, if yes skip the system call
+            cmd = "sudo systemctl status {}.{} | grep Loaded".format(feature_name, feature_suffixes[-1])
+            proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            (stdout, stderr) = proc.communicate()
+            if "disabled" in str(stdout) or "masked" in str(stdout):
+                continue
+
             for suffix in reversed(feature_suffixes):
                 stop_cmds.append("sudo systemctl stop {}.{}".format(feature_name, suffix))
                 stop_cmds.append("sudo systemctl disable {}.{}".format(feature_name, suffix))
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index 2abbb7f7cad6..8f369ef9939e 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -65,6 +65,11 @@ def test_hostcfgd(self, test_name, test_data):
         """
         MockConfigDb.set_config_db(test_data["config_db"])
         with mock.patch("hostcfgd.subprocess") as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = test_data["popen_attributes"]
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
             host_config_daemon = hostcfgd.HostConfigDaemon()
             host_config_daemon.update_all_feature_states()
             assert self.__verify_table(
diff --git a/src/sonic-host-services/tests/hostcfgd/test_vectors.py b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
index a8ac0219d138..123a5512ad9d 100644
--- a/src/sonic-host-services/tests/hostcfgd/test_vectors.py
+++ b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
@@ -96,6 +96,9 @@
                 call("sudo systemctl enable telemetry.timer", shell=True),
                 call("sudo systemctl start telemetry.timer", shell=True),
             ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error')
+            },
         },
     ],
     [
@@ -189,6 +192,9 @@
                 call("sudo systemctl enable telemetry.timer", shell=True),
                 call("sudo systemctl start telemetry.timer", shell=True),
             ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error')
+            },
         },
     ],
     [
@@ -282,6 +288,96 @@
                 call("sudo systemctl enable telemetry.timer", shell=True),
                 call("sudo systemctl start telemetry.timer", shell=True),
             ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error')
+            },
         },
     ],
+    [
+        "DualTorCaseWithNoSystemCalls",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_config_db": {
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                    "mux": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "local",
+                        "state": "enabled"
+                    },
+                    "telemetry": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "True",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled",
+                        "status": "enabled"
+                    },
+                },
+            },
+            "expected_subprocess_calls": [
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('enabled', 'error')
+            },
+        }
+    ]
 ]

From 169af8ddabe9e3710b14277298eccb590f572107 Mon Sep 17 00:00:00 2001
From: sandycelestica <47624974+sandycelestica@users.noreply.github.com>
Date: Sun, 14 Mar 2021 07:35:59 +0800
Subject: [PATCH 0636/1674] [celestica]: Fix E1031 udev rules not work for
 sonic os first boot after be installed (#7043)

Use udevadm to trigger the udev rules on the first boot

How to verify:

- Connect C0 with E1031;
- Install or upgrade the sonic os to 202012 branch;
- When access to sonic check if /dev/C0-1 to /dev/C0-48 are existed.
---
 .../debian/platform-modules-haliburton.postinst    |  6 ++++--
 .../haliburton/script/reload_udev.sh               | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 platform/broadcom/sonic-platform-modules-cel/haliburton/script/reload_udev.sh

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
index 74a4a4b17928..1ebafb7fdabb 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
@@ -1,4 +1,7 @@
 depmod -a
+sudo chmod +x /usr/local/bin/udev_prefix.sh
+sudo chmod +x /usr/local/bin/popmsg.sh
+sudo chmod +x /usr/local/bin/reload_udev.sh
 systemctl enable platform-modules-haliburton.service
 systemctl enable fancontrol.service
 
@@ -6,5 +9,4 @@ systemctl start platform-modules-haliburton.service
 systemctl start fancontrol.service
 
 /usr/local/bin/platform_api_mgnt.sh install
-sudo chmod +x /usr/local/bin/udev_prefix.sh
-sudo chmod +x /usr/local/bin/popmsg.sh
+/usr/local/bin/reload_udev.sh
diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/script/reload_udev.sh b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/reload_udev.sh
new file mode 100644
index 000000000000..aa4e2c67cd4d
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/reload_udev.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+UDEV_DIR=/etc/udev/rules.d/50-ttyUSB-C0.rules
+TTYUSB_DIR=/dev/ttyUSB
+
+if [ -f "$UDEV_DIR" ]; then
+        for i in {0..95}
+        do
+                ttydev=$TTYUSB_DIR$i
+                if [ -c "$ttydev" ]; then
+                        udevadm trigger -c add $ttydev
+                fi
+        done
+fi

From e01a5f86c0e13f8db6bbd31cb139c931e154a5fb Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Wed, 30 Jun 2021 03:49:54 +0530
Subject: [PATCH 0637/1674] DellEMC S6100: Determine pcie.yaml revision based
 on firmware (#7875)

Why I did it
To determine the revision of the pcie.yaml to be used based on BIOS version in DellEMC S6100 platform.

Depends on: Azure/sonic-platform-common#195

How I did it
Added two revisions of pcie.yaml pcie_1.yaml and pcie_2.yaml
Included a platform-specific Pcie class to provide the revision of the pcie.yaml to be used by pcieutil/pcied.
How to verify it
Execute pcieutil check (Azure/sonic-utilities#1672) command and verify the list of PCIe devices displayed.
Logs: UT_logs.txt
---
 .../{pcie.yaml => pcie_1.yaml}                |  0
 .../x86_64-dell_s6100_c2538-r0/pcie_2.yaml    | 50 +++++++++++++++++++
 .../s6100/sonic_platform/pcie.py              | 29 +++++++++++
 3 files changed, 79 insertions(+)
 rename device/dell/x86_64-dell_s6100_c2538-r0/{pcie.yaml => pcie_1.yaml} (100%)
 create mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/pcie_2.yaml
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/pcie.py

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/pcie.yaml b/device/dell/x86_64-dell_s6100_c2538-r0/pcie_1.yaml
similarity index 100%
rename from device/dell/x86_64-dell_s6100_c2538-r0/pcie.yaml
rename to device/dell/x86_64-dell_s6100_c2538-r0/pcie_1.yaml
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/pcie_2.yaml b/device/dell/x86_64-dell_s6100_c2538-r0/pcie_2.yaml
new file mode 100644
index 000000000000..2591c5900452
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/pcie_2.yaml
@@ -0,0 +1,50 @@
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 1f10
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 1'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 1f12
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 3'
+- bus: '00'
+  dev: '04'
+  fn: '0'
+  id: 1f13
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 4'
+- bus: '00'
+  dev: 0f
+  fn: '0'
+  id: 1f16
+  name: 'IOMMU: Intel Corporation Atom processor C2000 RCEC'
+- bus: '00'
+  dev: '13'
+  fn: '0'
+  id: 1f15
+  name: 'System peripheral: Intel Corporation Atom processor C2000 SMBus 2.0'
+- bus: '00'
+  dev: '14'
+  fn: '0'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '00'
+  dev: '14'
+  fn: '1'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '00'
+  dev: '14'
+  fn: '2'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: b960
+  name: 'Ethernet controller: Broadcom Limited Broadcom BCM56960 Switch ASIC'
+- bus: '01'
+  dev: '00'
+  fn: '1'
+  id: b960
+  name: 'Ethernet controller: Broadcom Limited Broadcom BCM56960 Switch ASIC'
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/pcie.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/pcie.py
new file mode 100644
index 000000000000..cff56c1ea55f
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/pcie.py
@@ -0,0 +1,29 @@
+########################################################################
+#
+# DELLEMC S6100
+#
+# Module contains a platform specific implementation of SONiC Platform
+# Base PCIe class
+#
+########################################################################
+
+try:
+    from sonic_platform.component import Component
+    from sonic_platform_base.sonic_pcie.pcie_common import PcieUtil
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Pcie(PcieUtil):
+    """DellEMC Platform-specific PCIe class"""
+
+    def __init__(self, platform_path):
+        PcieUtil.__init__(self, platform_path)
+        bios = Component(component_index=0)
+        bios_ver = bios.get_firmware_version()
+
+        versions = bios_ver.split("-")
+        if (len(versions) == 2) and int(versions[1], 10) > 5:
+            self._conf_rev = "2"
+        else:
+            self._conf_rev = "1"

From 30e9c0e7d3e5f2b5eb949931a7275dbfa2bb9253 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:07:15 -0700
Subject: [PATCH 0638/1674] [sonic-snmpagent]: Advance submodule (#8176)

Includes below commits
```
946e5cf 2021-07-12 | Fix: SonicV2Connector behavior change: get_all will return empty dict if (#226) [Qi Luo]
```
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 748b545f396f..946e5cf2344d 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 748b545f396f132b8decb206d2f6a5bcf5445cac
+Subproject commit 946e5cf2344da47d0cdf8de5d31d70b0484664ef

From cf33a50c579ef20f9ecc3cec847192e4280fe3da Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Wed, 14 Jul 2021 10:11:26 +0300
Subject: [PATCH 0639/1674] [sonic-utilities] Update submodule (#8168)

Update:
> 2ca493b 2021-07-13 create sniffer folder if not exist (Azure/sonic-utilities#1659)
> 1695104 2021-07-07 [show priority-group drop counters] Remove backup with cached PG drop counters after 'config reload' (Azure/sonic-utilities#1679)
> e99a3c5 2021-07-07 [show][config] support for interface alias for muxcable commands (Azure/sonic-utilities#1699)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d83eccdff435..2ca493b2c679 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d83eccdff435f60fdd483bd4b902bf8a1d95531e
+Subproject commit 2ca493b2c6793c8d438e9c17016563b471f92ac8

From faf2cc2dacc42ecaad413aef7dd2fbf3e6498a94 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 14 Jul 2021 00:32:23 -0700
Subject: [PATCH 0640/1674] [submodule]: update sonic-linux-kernel

* deb716f 2021-07-14 | [Marvell] CPU1 failure on continuous reboot  (#228) (HEAD, origin/202012) [Rajkumar-Marvell]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 4601fa8bdd60..deb716fd02e8 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 4601fa8bdd6077f69d6922ed30e5905aad36b36b
+Subproject commit deb716fd02e859df9366340d007f1d9712a27048

From 90c0dcf9e0d8aadd0dcd754ed8dde8ff6871e646 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 14 Jul 2021 08:07:37 -0700
Subject: [PATCH 0641/1674] [submodule]: update sonic-platform-daemons (#8180)

* 664f0e2 2021-07-14 | [xrcvd]: Removed undefined symbol 'sfp_status_helper' (#204) (HEAD, origin/202012) [Prince George]
* 1b2d016 2021-06-16 | [CI] sonic-config-engine now depends on SONiC YANG packages (#194) [Joe LeVeque]
* 1cf5996 2021-07-14 | Introduce mgmtinit delay after transceiver module insertion (#201) [Prince George]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 3ab5a04b6aa3..664f0e256d68 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 3ab5a04b6aa35230c4c57d9514e4c43055e3756f
+Subproject commit 664f0e256d68a54b28bf2de3b8cacb65cc5840c4

From 514f7607931de95ccba1b8b23319dd0296f72776 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 14 Jul 2021 10:36:15 -0700
Subject: [PATCH 0642/1674] [202012] BRCM SAI 4.3.3.9 Changes for ISSU support
 and Dual ToR fixes (#8179)

---
 files/build/versions/default/versions-git | 2 +-
 files/build/versions/default/versions-web | 6 +++---
 platform/broadcom/sai.mk                  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 31d3a90c0812..dfd4371cc431 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==41da91f968db4da9860a53793b406754d18cbe49
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==51f9218fa39bd2126a9e43e3642fee3319ed1590
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 33cb2cf03e60..b2de79b39d7b 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -43,8 +43,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=ST85a0laEY245n2QAy5gtbpd8LZkIuCSiBDEVc10wC8%3D&se=2035-03-04T06%3A57%3A04Z&sp=r==aac1cba3a7402ff508ac6134a6cf887b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=gfKgP7HePZcvoESly6xJ%2BIyTovF%2BWZvyvTjfWR%2BqMcs%3D&se=2035-03-04T06%3A55%3A34Z&sp=r==e11330a3332020c1f93bb3efab588090
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
@@ -59,4 +59,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 6bf94bc1c8be..2f251acf9868 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.8-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=gfKgP7HePZcvoESly6xJ%2BIyTovF%2BWZvyvTjfWR%2BqMcs%3D&se=2035-03-04T06%3A55%3A34Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.8-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.3.9_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.3.9_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.8-1_amd64.deb?sv=2015-04-05&sr=b&sig=ST85a0laEY245n2QAy5gtbpd8LZkIuCSiBDEVc10wC8%3D&se=2035-03-04T06%3A57%3A04Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 14 Jul 2021 11:34:46 -0700
Subject: [PATCH 0643/1674] [submodule]: update sonic-platform-common (#8178)

* 063e915 2021-06-15 | [CI] sonic-config-engine now depends on SONiC YANG packages (#198) (HEAD, origin/202012) [Joe LeVeque]
* 2d36a79 2021-07-13 | Fix Xcvrd crash due to invalid key access in type_of_media_interface, host_electrical_interface, connector_dict (#206) [Prince George]
* 67b8a77 2021-06-18 | Fix decode error when parsing EEPROM fields (#199) [Aravind Mani]
* 238d76b 2021-06-17 | Unifying the platform api for get_pcie_aer_stats with PcieBase (#197) [Sujin Kang]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index b0dad8c6918c..063e91581bdc 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit b0dad8c6918c48cb973396273f071ada66c88d4a
+Subproject commit 063e91581bdcf9167db83f0fb6a233c7c3196a45

From acc0e6b11b10838ff86102874cb4c86ae3d06c56 Mon Sep 17 00:00:00 2001
From: jusherma <jusherma@cisco.com>
Date: Wed, 14 Jul 2021 01:27:25 -0700
Subject: [PATCH 0644/1674] [build]: Allow build-time specification of
 alternative docker registries (#8134)

Why I did it
Allows users to host their own local docker registries and utilize them via the REGISTRY_SERVER and REGISTRY_PORT environmental variables

How I did it
Only set REGISTRY_SERVER and REGISTRY_PORT in rules/config if they are unset.

How to verify it
Export environmental variables REGISTRY_SERVER and REGISTRY_PORT to an alternative docker registry. Export the environmental variable ENABLE_DOCKER_BASE_PULL to y.
Ensure the required sonic-slave docker images are not present locally, but are available in the docker registry
Execute make init and make configure
Confirm that the appropriate docker images were pulled from the appropriate docker registry, and not built locally
---
 rules/config | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/config b/rules/config
index 39eb786f2ff0..9c0c821935e5 100644
--- a/rules/config
+++ b/rules/config
@@ -182,7 +182,6 @@ SONIC_VERSION_CONTROL_COMPONENTS ?= none
 
 # SONiC docker registry
 #
-# Uncomment below line to enable pulling sonic-slave docker from registry
-# ENABLE_DOCKER_BASE_PULL = y
-REGISTRY_PORT=443
-REGISTRY_SERVER=sonicdev-microsoft.azurecr.io
+# Set the env variable ENABLE_DOCKER_BASE_PULL = y to enable pulling sonic-slave docker from registry
+REGISTRY_PORT ?= 443
+REGISTRY_SERVER ?= sonicdev-microsoft.azurecr.io

From 762847c2cfda9fa6f9fb012fa1cc6bd4cebc536a Mon Sep 17 00:00:00 2001
From: Blueve <672454911@qq.com>
Date: Thu, 15 Jul 2021 08:56:35 +0800
Subject: [PATCH 0645/1674] [port_config] Introduce ad-hoc mport_config.json
 file (#8066)

Signed-off-by: Jing Kan jika@microsoft.com
---
 files/Aboot/boot0.j2                               | 3 ++-
 files/image_config/config-setup/config-setup       | 2 +-
 files/image_config/platform/rc.local               | 6 ++++++
 files/image_config/secureboot/allowlist_paths.conf | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 35893eb2f35e..3317e6282d46 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -117,7 +117,8 @@ clean_flash() {
            [ $f != "old_config" ] &&
            [ $f != "minigraph.xml" ] &&
            [ $f != "snmp.yml" ] &&
-           [ $f != "acl.json" ]
+           [ $f != "acl.json" ] &&
+           [ $f != "port_config.json" ]
         then
             rm -rf "$target_path/$f"
         fi
diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index edf4ad4ffee3..de39586fd4f8 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -303,7 +303,7 @@ check_all_config_db_present()
 do_config_migration()
 {
     # Identify list of files to migrate
-    copy_list="minigraph.xml snmp.yml acl.json frr telemetry"
+    copy_list="minigraph.xml snmp.yml acl.json port_config.json frr telemetry"
 
     # Migrate all configuration files from old to new
     copy_config_files_and_directories $copy_list
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index 23531fb74f41..d35269cd2ec0 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -120,6 +120,8 @@ migrate_nos_configuration()
         MG_FILE=$NOS_DIR/minigraph.xml
         ACL_GZFILE=$NOS_DIR/acl.json.gz.base64.txt
         ACL_FILE=$NOS_DIR/acl.json
+        PORT_CONFIG_GZFILE=$NOS_DIR/port_config.json.gz.base64.txt
+        PORT_CONFIG_FILE=$NOS_DIR/port_config.json
         SNMP_FILE=$NOS_DIR/snmp.yml
         mkdir -p $NOS_DIR
 
@@ -131,11 +133,13 @@ migrate_nos_configuration()
             # decode & unzip minigraph.xml.gz.base64.txt
             [ -f $MG_GZFILE ] && /usr/bin/base64 -d $MG_GZFILE | /bin/gunzip > $MG_FILE
             [ -f $ACL_GZFILE ] && /usr/bin/base64 -d $ACL_GZFILE | /bin/gunzip > $ACL_FILE
+            [ -f $PORT_CONFIG_GZFILE ] && /usr/bin/base64 -d $PORT_CONFIG_GZFILE | /bin/gunzip > $PORT_CONFIG_FILE
 
             # Copy relevant files
             nos_migration_import $NOS_DIR/mgmt_interface.cfg /host/migration
             nos_migration_import $MG_FILE /host/migration
             nos_migration_import $ACL_FILE /host/migration
+            nos_migration_import $PORT_CONFIG_FILE /host/migration
             nos_migration_import $SNMP_FILE /host/migration
 
             if [ "$sonic_fast_reboot" == true ]; then
@@ -249,12 +253,14 @@ if [ -f $FIRST_BOOT_FILE ]; then
         mkdir -p /etc/sonic/old_config
         mv /host/minigraph.xml /etc/sonic/old_config/
         [ -f /host/acl.json ] && mv /host/acl.json /etc/sonic/old_config/
+        [ -f /host/port_config.json ] && mv /host/port_config.json /etc/sonic/old_config/
         [ -f /host/snmp.yml ] && mv /host/snmp.yml /etc/sonic/old_config/
         touch /tmp/pending_config_migration
     elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ];  then
         mkdir -p /etc/sonic/old_config
         mv /host/migration/minigraph.xml /etc/sonic/old_config/
         [ -f /host/migration/acl.json ] && mv /host/migration/acl.json /etc/sonic/old_config/
+        [ -f /host/migration/port_config.json ] && mv /host/migration/port_config.json /etc/sonic/old_config/
         [ -f /host/migration/snmp.yml ] && mv /host/migration/snmp.yml /etc/sonic/old_config/
         touch /tmp/pending_config_migration
         [ -f /etc/sonic/updategraph.conf ] && sed -i -e "s/enabled=false/enabled=true/g" /etc/sonic/updategraph.conf
diff --git a/files/image_config/secureboot/allowlist_paths.conf b/files/image_config/secureboot/allowlist_paths.conf
index c80b39d74bc8..e6e97dd22d16 100644
--- a/files/image_config/secureboot/allowlist_paths.conf
+++ b/files/image_config/secureboot/allowlist_paths.conf
@@ -24,6 +24,7 @@ etc/sonic/acl.json
 etc/sonic/config_db.json
 etc/sonic/minigraph.xml
 etc/sonic/old_config/.*
+etc/sonic/port_config.json
 etc/sonic/snmp.yml
 etc/sonic/sonic-environment
 etc/sonic/updategraph.conf

From b1728187be85b69393e7a3ac536102d62e130939 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 15 Jul 2021 22:57:14 +0800
Subject: [PATCH 0646/1674] [ci/build]: Upgrade SONiC package versions (#8163)

---
 .../versions-deb-buster                       |   2 +-
 .../build-sonic-slave-buster/versions-git     |  14 +
 .../build-sonic-slave-buster/versions-web     |  42 +++
 .../build-sonic-slave-stretch/versions-web    |   2 +
 .../versions/default/versions-deb-buster      | 308 ------------------
 files/build/versions/default/versions-docker  |   2 +
 files/build/versions/default/versions-git     |   4 +-
 files/build/versions/default/versions-py2     |  30 --
 files/build/versions/default/versions-py3     |  49 ---
 files/build/versions/default/versions-web     |   6 +-
 .../docker-base-buster/versions-deb-buster    |  69 ++++
 .../dockers/docker-base-buster/versions-py3   |   6 +
 .../dockers/docker-base-buster/versions-web   |   1 +
 .../dockers/docker-base-stretch/versions-py2  |   2 +
 .../versions-deb-buster                       |  14 +
 .../docker-config-engine-buster/versions-py3  |  11 +
 .../docker-config-engine-stretch/versions-py2 |  21 +-
 .../docker-database/versions-deb-buster       |  17 +
 .../dockers/docker-database/versions-web      |   2 +
 .../docker-dhcp-relay/versions-deb-buster     |  26 ++
 .../docker-fpm-frr/versions-deb-buster        |  42 ++-
 .../docker-gbsyncd-vs/versions-deb-buster     |  23 +-
 .../dockers/docker-lldp/versions-deb-buster   |  30 +-
 .../dockers/docker-nat/versions-deb-buster    |  32 ++
 .../docker-orchagent/versions-deb-buster      |  35 ++
 .../dockers/docker-orchagent/versions-py3     |   3 +
 .../versions-deb-buster                       |  86 ++++-
 .../docker-platform-monitor/versions-py2      |  27 +-
 .../docker-platform-monitor/versions-py3      |   3 +-
 .../versions/dockers/docker-ptf/versions-py2  |  16 +
 .../versions-deb-buster                       |  17 +
 .../dockers/docker-sflow/versions-deb-buster  |  25 ++
 .../dockers/docker-snmp/versions-deb-buster   |  34 +-
 .../versions/dockers/docker-snmp/versions-py3 |   4 +
 .../versions-deb-buster                       |  25 ++
 .../docker-sonic-mgmt-framework/versions-py3  |  24 ++
 .../versions-deb-buster                       |  19 ++
 .../docker-sonic-vs/versions-deb-buster       |  62 +++-
 .../dockers/docker-sonic-vs/versions-py2      |   4 +-
 .../dockers/docker-sonic-vs/versions-py3      |   6 +
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  71 ++++
 .../dockers/docker-syncd-bfn-rpc/versions-py2 |   5 +
 .../docker-syncd-bfn/versions-deb-buster      |  13 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  73 +++++
 .../docker-syncd-brcm-rpc/versions-py2        |   5 +
 .../docker-syncd-brcm-rpc/versions-web        |   2 +
 .../docker-syncd-brcm/versions-deb-buster     |  37 ++-
 .../versions-deb-buster                       |  76 +++++
 .../docker-syncd-centec-rpc/versions-py2      |   5 +
 .../docker-syncd-centec/versions-deb-buster   |  23 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  51 +++
 .../docker-syncd-mlnx-rpc/versions-py2        |   5 +
 .../docker-syncd-mlnx/versions-deb-buster     |  48 +++
 .../docker-syncd-vs/versions-deb-buster       |  23 +-
 .../dockers/docker-teamd/versions-deb-buster  |  26 ++
 .../dockers/sonic-slave-buster/versions-git   |   2 +
 .../dockers/sonic-slave-buster/versions-web   |   2 +
 .../dockers/sonic-slave-stretch/versions-git  |   2 +
 .../dockers/sonic-slave-stretch/versions-web  |   4 +
 files/build/versions/host-image/versions-py3  |   8 +-
 files/build/versions/host-image/versions-web  |   1 +
 61 files changed, 1214 insertions(+), 413 deletions(-)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web
 create mode 100644 files/build/versions/build/build-sonic-slave-stretch/versions-web
 delete mode 100644 files/build/versions/default/versions-deb-buster
 create mode 100644 files/build/versions/default/versions-docker
 delete mode 100644 files/build/versions/default/versions-py2
 delete mode 100644 files/build/versions/default/versions-py3
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-web
 create mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-database/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-database/versions-web
 create mode 100644 files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-nat/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-py3
 create mode 100644 files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sflow/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-snmp/versions-py3
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
 create mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
 create mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
 create mode 100644 files/build/versions/dockers/docker-teamd/versions-deb-buster
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-web
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-web
 create mode 100644 files/build/versions/host-image/versions-web

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index e57e813a51bd..353fd5222f8b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -41,7 +41,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.8-1
+libsaibcm==4.3.3.9
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..c4d4b15a58b2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -0,0 +1,14 @@
+https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
+https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
+https://github.com/jeroennijhof/pam_tacplus.git==98aa8df54a84e9d6e21fcb82750a8e90c25e761f
+https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
+https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
+https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
+https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
+https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
+https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
+https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60
+https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
+https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
new file mode 100644
index 000000000000..51b392f34b44
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -0,0 +1,42 @@
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.debian.tar.xz==c27e499611c48ba307792518d29cdcc7
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.dsc==d9572a9f48c88293341681601a7b18c5
+http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2.orig.tar.bz2==944558e88ddcc3b9b0d9550070fa3599
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.debian.tar.xz==c2a4cd6b79350378ca9a337b45b732c5
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.dsc==86e28662fa00bec000f22257d212873d
+http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0.orig.tar.gz==37981f5d3a0f649381529cb41c0f1ff3
+http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debian.tar.xz==a677f850ad1e4f2600cc9c3f3c872927
+http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53
+http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901
+http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
+http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
+https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
+https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
+https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.dsc==e76d5deda89795939828c3b39b31d38f
+https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==e3afaa4ac1387449dec703da494dd991
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.debian.tar.xz==0a529cf8d1717b5c3dbe0c61b3512aa1
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.dsc==b88b922d96688c948e90987fcaa3a2de
+https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4.orig.tar.gz==33e8d58623f99184e4e709cbbfe45db3
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.debian.tar.xz==f159fbedc0b69d00b2bdb08db283c0bb
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.dsc==98c68654fadc116346007be9282ae357
+https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184.orig.tar.gz==0ddfdf2dba5e73486c133c1fba1b3e8e
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
+https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
+https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
+https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
+https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.debian.tar.xz?sv=2015-04-05&sr=b&sig=yv77Fr5RtZgRTPmJK3j0lZ0BzsCiGaSs2i7NqQKEy2Y%3D&se=2155-07-05T11%3A39%3A59Z&sp=r==84dc9e966e116384ac13aeca16b9437a
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.dsc?sv=2015-04-05&sr=b&sig=Ph7aMqb%2F%2FE%2F8qwxMXoXb5oK1YPkfVt6PV8mBBv5Wi%2F4%3D&se=2155-07-05T11%3A42%3A29Z&sp=r==b14d356861eaa916f7f19098ab7b1d4e
+https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
new file mode 100644
index 000000000000..97e51bfa3cb5
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -0,0 +1,2 @@
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
deleted file mode 100644
index 38a32a2a513e..000000000000
--- a/files/build/versions/default/versions-deb-buster
+++ /dev/null
@@ -1,308 +0,0 @@
-apt-utils==1.8.2.3
-arping==2.19-6
-binutils==2.31.1-16
-binutils-common==2.31.1-16
-binutils-x86-64-linux-gnu==2.31.1-16
-bridge-utils==1.6-2
-build-essential==12.6
-bzip2==1.0.6-9.2~deb10u1
-ca-certificates==20200601~deb10u2
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-conntrack==1:1.4.5-2
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u2
-dmidecode==3.2-1
-dpkg-dev==1.19.7
-fancontrol==1:3.5.0-3
-fontconfig==2.13.1-2
-fontconfig-config==2.13.1-2
-fonts-dejavu-core==2.37-1
-freeipmi-common==1.6.3-1.1
-frr==7.5.1-sonic-0
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-hsflowd==2.0.32-1
-i2c-tools==4.1-1
-ifupdown==0.8.35
-ipmitool==1.8.18-6+deb10u1
-iptables==1.8.2-4
-isc-dhcp-relay==4.4.1-2
-isc-dhcp-relay-dbgsym==4.4.1-2
-jq==1.5+dfsg-2+b1
-kmod==26-1
-less==487-0.1+b1
-libapt-inst2.0==1.8.2.3
-libarchive13==3.3.3-4+deb10u1
-libasan5==8.3.0-6
-libatomic1==8.3.0-6
-libbabeltrace1==1.5.6-2+deb10u1
-libbinutils==2.31.1-16
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libbsd0==0.9.1-2+deb10u1
-libc-ares2==1.14.0-1
-libc-dev-bin==2.28-10
-libc-l10n==2.28-10
-libc6-dev==2.28-10
-libcairo2==1.16.0-4+deb10u1
-libcc1-0==8.3.0-6
-libcurl4==7.64.0-4+deb10u2
-libdaemon0==0.14-7
-libdatrie1==0.2.12-2
-libdbi1==0.9.0-5
-libdbus-1-3==1.12.20-0+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libestr0==0.1.10-2.1
-libevent-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
-libexplain51==1.4.D001-8
-libfastjson4==0.99.8-2
-libffi-dev==3.2.1-9
-libfontconfig1==2.13.1-2
-libfreeipmi17==1.6.3-1.1
-libfreetype6==2.9.1-3+deb10u2
-libfribidi0==1.0.5-3.1+deb10u1
-libgcc-8-dev==8.3.0-6
-libgdbm-compat4==1.18.1-4
-libgdbm6==1.18.1-4
-libglib2.0-0==2.58.3-2+deb10u3
-libgomp1==8.3.0-6
-libgpm2==1.20.7-5
-libgraphite2-3==1.3.13-7
-libgssapi-krb5-2==1.17-3+deb10u1
-libharfbuzz0b==2.3.1-1
-libhiredis0.14==0.14.0-3~bpo9+1
-libi2c0==4.1-1
-libicu63==63.1-6+deb10u1
-libip4tc0==1.8.2-4
-libip6tc0==1.8.2-4
-libipt2==2.0-2
-libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisl19==0.20-2
-libitm1==8.3.0-6
-libjansson4==2.12-1
-libjemalloc2==5.1.0-3
-libjq1==1.5+dfsg-2+b1
-libjson-c3==0.12.1+ds-2+deb10u1
-libjsoncpp1==1.7.4-3
-libk5crypto3==1.17-3+deb10u1
-libkeyutils1==1.6-6
-libkmod2==26-1
-libkrb5-3==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-liblognorm5==2.0.5-1
-liblsan0==8.3.0-6
-liblua5.1-0==5.1.5-8.1+b2
-libmariadb3==1:10.3.29-0+deb10u1
-libmpc3==1.1.0-1
-libmpdec2==2.4.2-2
-libmpfr6==4.0.2-1
-libmpx2==8.3.0-6
-libncurses6==6.1+20181013-2+deb10u2
-libnet1==1.1.6+dfsg-3.1
-libnetfilter-conntrack3==1.0.7-1
-libnfnetlink0==1.0.1-3+b1
-libnftnl11==1.1.2-2
-libnghttp2-14==1.36.0-2+deb10u1
-libnl-3-200==3.5.0-1
-libnl-cli-3-200==3.5.0-1
-libnl-genl-3-200==3.5.0-1
-libnl-nf-3-200==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnorm1==1.5.8+dfsg2-1
-libonig5==6.9.1-1
-libpango-1.0-0==1.42.4-8~deb10u1
-libpangocairo-1.0-0==1.42.4-8~deb10u1
-libpangoft2-1.0-0==1.42.4-8~deb10u1
-libpcap0.8==1.8.1-6
-libpci3==1:3.5.2-1
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
-libperl5.28==5.28.1-6+deb10u1
-libpgm-5.2-0==5.2.122~dfsg-3
-libpixman-1-0==0.36.0-1
-libpng16-16==1.6.36-6
-libpopt0==1.16-12
-libprocps7==2:3.3.15-2
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
-libpsl5==0.20.2-2
-libpython-dev==2.7.16-1
-libpython-stdlib==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2-stdlib==2.7.16-1
-libpython2.7==2.7.16-2+deb10u1
-libpython2.7-dev==2.7.16-2+deb10u1
-libpython2.7-minimal==2.7.16-2+deb10u1
-libpython2.7-stdlib==2.7.16-2+deb10u1
-libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libquadmath0==8.3.0-6
-libreadline7==7.0-5
-librhash0==1.3.8-1
-librrd-dev==1.7.1-2
-librrd8==1.7.1-2
-librtmp1==2.4+20151223.gitfa8646d.1-2
-libsaibcm==4.3.3.8-1
-libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
-libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
-libsensors-config==1:3.5.0-3
-libsensors5==1:3.5.0-3
-libsensors5-dbgsym==1:3.5.0-3
-libsnmp30-dbg==5.7.3+dfsg-5
-libsodium23==1.0.17-1
-libsqlite3-0==3.27.2-3+deb10u1
-libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u6
-libssl1.1==1.1.1d-0+deb10u6
-libstdc++-8-dev==8.3.0-6
-libswsscommon==1.0.0
-libswsscommon-dbg==1.0.0
-libteam-utils==1.30-1
-libteam-utils-dbgsym==1.30-1
-libteam5==1.30-1
-libteamdctl0==1.30-1
-libteamdctl0-dbgsym==1.30-1
-libthai-data==0.1.28-2
-libthai0==0.1.28-2
-libthrift-0.11.0==0.11.0-4
-libtsan0==8.3.0-6
-libubsan1==8.3.0-6
-libunwind8==1.2.1-10~deb10u1
-libuv1==1.24.1-1+deb10u1
-libwrap0==7.6.q-28
-libx11-6==2:1.6.7-1+deb10u2
-libx11-data==2:1.6.7-1+deb10u2
-libxau6==1:1.0.8-1+b2
-libxcb-render0==1.13.1-2
-libxcb-shm0==1.13.1-2
-libxcb1==1.13.1-2
-libxdmcp6==1:1.1.2-3
-libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxrender1==1:0.9.10-1
-libyaml-0-2==0.2.1-1
-libyaml-dev==0.2.1-1
-libyang==1.0.73
-libyang1==1.0.184-2
-libyang1-dbgsym==1.0.184-2
-libzmq5==4.3.1-4+deb10u2
-linux-libc-dev==4.19.194-2
-lldpd==1.0.4-1
-lldpd-dbgsym==1.0.4-1
-lm-sensors==1:3.5.0-3
-lm-sensors-dbgsym==1:3.5.0-3
-locales==2.28-10
-logrotate==3.14.0-4
-lsb-base==10.2019051400
-lsof==4.91+dfsg-1
-lua-bitop==1.0.2-5
-lua-cjson==2.1.0+dfsg-2.1
-make==4.2.1-1.2
-mariadb-common==1:10.3.29-0+deb10u1
-mime-support==3.62
-mysql-common==5.8+1.0.5
-ndisc6==1.0.4-1
-ndppd==0.2.5-4+deb10u1
-net-tools==1.60+git20180626.aebd88e-1
-openssh-client==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u6
-patch==2.7.6-3+deb10u1
-perl==5.28.1-6+deb10u1
-perl-modules-5.28==5.28.1-6+deb10u1
-procps==2:3.3.15-2
-psample==1.1-1
-psmisc==23.2-1
-python==2.7.16-1
-python-dev==2.7.16-1
-python-minimal==2.7.16-1
-python-pip==18.1-5
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-ptf==0.9-1
-python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python-smbus==4.1-1
-python-swsscommon==1.0.0
-python2==2.7.16-1
-python2-dev==2.7.16-1
-python2-minimal==2.7.16-1
-python2.7==2.7.16-2+deb10u1
-python2.7-dev==2.7.16-2+deb10u1
-python2.7-minimal==2.7.16-2+deb10u1
-python3==3.7.3-1
-python3-distutils==3.7.3-1
-python3-lib2to3==3.7.3-1
-python3-minimal==3.7.3-1
-python3-smbus==4.1-1
-python3-swsscommon==1.0.0
-python3.7==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
-radvd==1:2.17-2
-readline-common==7.0-5
-redis-server==5:6.0.6-1~bpo10+1
-redis-tools==5:6.0.6-1~bpo10+1
-rrdtool==1.7.1-2
-rsyslog==8.1901.0-1
-sensible-utils==0.0.12
-sensord==1:3.5.0-3
-sensord-dbgsym==1:3.5.0-3
-sflowtool==5.04
-smartmontools==6.6-1
-snmp==5.7.3+dfsg-5
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-socat==1.7.3.1-2+deb9u1
-sonic-dhcpmon==1.0.0-0
-sonic-mgmt-common==1.0.0
-sonic-mgmt-framework==1.0-01
-sonic-mgmt-framework-dbg==1.0-01
-sonic-telemetry==0.1
-sshpass==1.06-1
-strace==4.26-0.2
-swss==1.0.0
-swss-dbg==1.0.0
-syncd==1.0.0
-syncd-dbg==1.0.0
-syncd-rpc==1.0.0
-tcpdump==4.9.3-1~deb10u2
-ucf==3.0038+nmu1
-udev==241-7~deb10u7
-vim==2:8.1.0875-5
-vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
-vim-tiny==2:8.1.0875-5
-wget==1.20.1-1.1
-xxd==2:8.1.0875-5
-xz-utils==5.2.4-1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
new file mode 100644
index 000000000000..a657a7df43b5
--- /dev/null
+++ b/files/build/versions/default/versions-docker
@@ -0,0 +1,2 @@
+amd64:debian:buster==sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1
+amd64:debian:stretch==sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index dfd4371cc431..94487b18b9be 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==51f9218fa39bd2126a9e43e3642fee3319ed1590
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==a5fe47858a8ccd806c864a247dad6446365eb97c
+https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
deleted file mode 100644
index e654a8d5052d..000000000000
--- a/files/build/versions/default/versions-py2
+++ /dev/null
@@ -1,30 +0,0 @@
-bitarray==1.5.3
-cffi==1.7.0
-contextlib2==0.6.0.post1
-enum34==1.1.10
-functools32==3.2.3.post2
-future==0.18.2
-importlib-resources==3.3.1
-ipaddress==1.0.23
-jinja2==2.11.3
-jsonschema==2.6.0
-lxml==4.6.3
-markupsafe==1.1.1
-natsort==6.2.1
-netaddr==0.8.0
-nnpy==1.4.2
-pathlib2==2.3.6
-ptf==0.9.1
-pyang==2.5.0
-pyangbind==0.6.0
-pycparser==2.20
-pyyaml==5.4.1
-redis==3.5.3
-redis-dump-load==1.1
-scandir==1.10.0
-scapy==2.4.0
-singledispatch==3.6.2
-six==1.16.0
-thrift==0.13.0
-typing==3.10.0.0
-zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
deleted file mode 100644
index 2b6cee02283a..000000000000
--- a/files/build/versions/default/versions-py3
+++ /dev/null
@@ -1,49 +0,0 @@
-attrs==21.2.0
-bitarray==1.5.3
-certifi==2017.4.17
-chardet==4.0.0
-click==8.0.1
-clickclick==20.10.2
-connexion==2.7.0
-flask==2.0.1
-grpcio==1.38.1
-grpcio-tools==1.20.0
-hiredis==2.0.0
-idna==2.10
-importlib-metadata==4.6.1
-inflection==0.5.1
-ipaddress==1.0.23
-isodate==0.6.0
-itsdangerous==2.0.1
-j2cli==0.3.10
-jinja2==3.0.1
-jsonschema==3.2.0
-lxml==4.6.3
-markupsafe==2.0.1
-natsort==6.2.1
-netaddr==0.8.0
-netifaces==0.10.9
-openapi-schema-validator==0.1.5
-openapi-spec-validator==0.3.1
-protobuf==3.17.3
-psutil==5.8.0
-pyang==2.5.0
-pyangbind==0.8.1
-pyroute2==0.5.14
-pyrsistent==0.18.0
-python-arptable==0.0.2
-python-dateutil==2.6.0
-pyyaml==5.4.1
-redis==3.5.3
-redis-dump-load==1.1
-regex==2021.7.6
-requests==2.25.1
-scapy==2.4.4
-smbus==1.1.post2
-supervisor==4.2.1
-supervisord-dependent-startup==1.4.0
-thrift==0.13.0
-toposort==1.6
-typing-extensions==3.10.0.0
-urllib3==1.21.1
-werkzeug==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index b2de79b39d7b..74104f8b10b7 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -15,7 +15,6 @@ http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
@@ -41,10 +40,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
-https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
@@ -59,4 +55,4 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
new file mode 100644
index 000000000000..264f99f18d23
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -0,0 +1,69 @@
+ca-certificates==20200601~deb10u2
+curl==7.64.0-4+deb10u2
+jq==1.5+dfsg-2+b1
+less==487-0.1+b1
+libatomic1==8.3.0-6
+libcurl4==7.64.0-4+deb10u2
+libdaemon0==0.14-7
+libdbus-1-3==1.12.20-0+deb10u1
+libestr0==0.1.10-2.1
+libexpat1==2.2.6-2+deb10u1
+libfastjson4==0.99.8-2
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libgssapi-krb5-2==1.17-3+deb10u1
+libjansson4==2.12-1
+libjemalloc2==5.1.0-3
+libjq1==1.5+dfsg-2+b1
+libk5crypto3==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libkrb5-3==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+liblognorm5==2.0.5-1
+liblua5.1-0==5.1.5-8.1+b2
+libmpdec2==2.4.2-2
+libncurses6==6.1+20181013-2+deb10u2
+libnghttp2-14==1.36.0-2+deb10u1
+libnorm1==1.5.8+dfsg2-1
+libonig5==6.9.1-1
+libperl5.28==5.28.1-6+deb10u1
+libpgm-5.2-0==5.2.122~dfsg-3
+libprocps7==2:3.3.15-2
+libpsl5==0.20.2-2
+libpython3-stdlib==3.7.3-1
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
+libreadline7==7.0-5
+librtmp1==2.4+20151223.gitfa8646d.1-2
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsodium23==1.0.17-1
+libsqlite3-0==3.27.2-3+deb10u1
+libssh2-1==1.8.0-2.1
+libssl1.1==1.1.1d-0+deb10u6
+libwrap0==7.6.q-28
+libzmq5==4.3.1-4+deb10u2
+lsb-base==10.2019051400
+lua-bitop==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+mime-support==3.62
+net-tools==1.60+git20180626.aebd88e-1
+openssl==1.1.1d-0+deb10u6
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+procps==2:3.3.15-2
+python3==3.7.3-1
+python3-distutils==3.7.3-1
+python3-lib2to3==3.7.3-1
+python3-minimal==3.7.3-1
+python3.7==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
+readline-common==7.0-5
+redis-tools==5:6.0.6-1~bpo10+1
+rsyslog==8.1901.0-1
+socat==1.7.3.1-2+deb9u1
+vim-common==2:8.1.0875-5
+vim-tiny==2:8.1.0875-5
+xxd==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
new file mode 100644
index 000000000000..7641bc74756f
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -0,0 +1,6 @@
+j2cli==0.3.10
+jinja2==3.0.1
+markupsafe==2.0.1
+supervisor==4.2.1
+supervisord-dependent-startup==1.4.0
+toposort==1.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-web b/files/build/versions/dockers/docker-base-buster/versions-web
new file mode 100644
index 000000000000..d85bc54c0062
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-web
@@ -0,0 +1 @@
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
index e95c173112e9..56cab0a7c395 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -1,4 +1,6 @@
 j2cli==0.3.10
+jinja2==2.11.3
+markupsafe==1.1.1
 supervisor==4.2.2
 supervisord-dependent-startup==1.4.0
 toposort==1.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
new file mode 100644
index 000000000000..45edbd3c2bbb
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -0,0 +1,14 @@
+apt-utils==1.8.2.3
+bzip2==1.0.6-9.2~deb10u1
+dpkg-dev==1.19.7
+libapt-inst2.0==1.8.2.3
+libhiredis0.14==0.14.0-3~bpo9+1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libpython3.7==3.7.3-2+deb10u3
+libswsscommon==1.0.0
+python3-swsscommon==1.0.0
+xz-utils==5.2.4-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index e0a1dbad64b1..53e61bd7fdce 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -1 +1,12 @@
+bitarray==1.5.3
+ipaddress==1.0.23
+lxml==4.6.3
+natsort==6.2.1
+netaddr==0.8.0
+pyang==2.5.0
+pyangbind==0.8.1
+pyyaml==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+regex==2021.7.6
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index 60522867999c..d0c5e5d70197 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -1,3 +1,22 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+future==0.18.2
+importlib-resources==3.3.1
+ipaddress==1.0.23
+lxml==4.6.3
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.6
+pyang==2.5.0
+pyangbind==0.6.0
+pyyaml==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+scandir==1.10.0
+singledispatch==3.6.2
+six==1.16.0
 sonic-config-engine==1.0
 sonic-py-common==1.0
-swsssdk==2.0.1
\ No newline at end of file
+swsssdk==2.0.1
+typing==3.10.0.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 000000000000..7c9e8bec42ea
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+redis-server==5:6.0.6-1~bpo10+1
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-web b/files/build/versions/dockers/docker-database/versions-web
new file mode 100644
index 000000000000..b46cc985fa39
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-web
@@ -0,0 +1,2 @@
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
new file mode 100644
index 000000000000..32d110151483
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,26 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libevent-2.1-6==2.1.8-stable-4
+libexplain51==1.4.D001-8
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libpopt0==1.16-12
+libunwind8==1.2.1-10~deb10u1
+lsof==4.91+dfsg-1
+openssh-client==1:7.9p1-10+deb10u2
+sonic-dhcpmon==1.0.0-0
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8ce0c99a8c4d..a4ef14241d9d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,2 +1,42 @@
+cron==3.0pl1-134+deb10u1
+frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
+frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libc-ares2==1.14.0-1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libjson-c3==0.12.1+ds-2+deb10u1
+libmariadb3==1:10.3.29-0+deb10u1
+libpci3==1:3.5.2-1
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libsensors-config==1:3.5.0-3
+libsensors5==1:3.5.0-3
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libswsscommon-dbg==1.0.0
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libunwind8==1.2.1-10~deb10u1
+libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
+logrotate==3.14.0-4
+mariadb-common==1:10.3.29-0+deb10u1
+mysql-common==5.8+1.0.5
+openssh-client==1:7.9p1-10+deb10u2
+sensible-utils==0.0.12
+sshpass==1.06-1
+strace==4.26-0.2
+swss==1.0.0
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 35fa7ba37f8c..04d9d17057db 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,25 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 3424f739f586..7570479c7eda 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,2 +1,30 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libevent-2.1-6==2.1.8-stable-4
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libmariadb3==1:10.3.29-0+deb10u1
+libpci3==1:3.5.2-1
+libpopt0==1.16-12
+libsensors-config==1:3.5.0-3
+libsensors5==1:3.5.0-3
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
+mariadb-common==1:10.3.29-0+deb10u1
+mysql-common==5.8+1.0.5
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 000000000000..b8f9439971ca
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,32 @@
+bridge-utils==1.6-2
+conntrack==1:1.4.5-2
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+iptables==1.8.2-4
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libip4tc0==1.8.2-4
+libip6tc0==1.8.2-4
+libipt2==2.0-2
+libiptc0==1.8.2-4
+libnetfilter-conntrack3==1.0.7-1
+libnfnetlink0==1.0.1-3+b1
+libnftnl11==1.1.2-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libswsscommon-dbg==1.0.0
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss==1.0.0
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
new file mode 100644
index 000000000000..cd197e4142d6
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,35 @@
+arping==2.19-6
+bridge-utils==1.6-2
+conntrack==1:1.4.5-2
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+ifupdown==0.8.35
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libnet1==1.1.6+dfsg-3.1
+libnetfilter-conntrack3==1.0.7-1
+libnfnetlink0==1.0.1-3+b1
+libpcap0.8==1.8.1-6
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libunwind8==1.2.1-10~deb10u1
+ndisc6==1.0.4-1
+ndppd==0.2.5-4+deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss==1.0.0
+swss-dbg==1.0.0
+tcpdump==4.9.3-1~deb10u2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-py3 b/files/build/versions/dockers/docker-orchagent/versions-py3
new file mode 100644
index 000000000000..e81f03378794
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-py3
@@ -0,0 +1,3 @@
+netifaces==0.10.9
+pyroute2==0.5.14
+scapy==2.4.4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 635d76dd6ce0..8a04ccff3f1d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,94 @@
 applibs==1.mlnx.4.4.3216
 applibs-dev==1.mlnx.4.4.3216
+dmidecode==3.2-1
 ethtool==1:5.9-1
+fancontrol==1:3.5.0-3
+fontconfig==2.13.1-2
+fontconfig-config==2.13.1-2
+fonts-dejavu-core==2.37-1
+freeipmi-common==1.6.3-1.1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+i2c-tools==4.1-1
+ipmitool==1.8.18-6+deb10u1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libcairo2==1.16.0-4+deb10u1
+libdatrie1==0.2.12-2
+libdbi1==0.9.0-5
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libfontconfig1==2.13.1-2
+libfreeipmi17==1.6.3-1.1
+libfreetype6==2.9.1-3+deb10u2
+libfribidi0==1.0.5-3.1+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libgraphite2-3==1.3.13-7
+libharfbuzz0b==2.3.1-1
+libi2c0==4.1-1
+libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libkmod2==26-1
+libpango-1.0-0==1.42.4-8~deb10u1
+libpangocairo-1.0-0==1.42.4-8~deb10u1
+libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpci3==1:3.5.2-1
+libpixman-1-0==0.36.0-1
+libpng16-16==1.6.36-6
+libpopt0==1.16-12
+libpython-stdlib==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+librrd-dev==1.7.1-2
+librrd8==1.7.1-2
+libsensors-config==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libswsscommon-dbg==1.0.0
+libthai-data==0.1.28-2
+libthai0==0.1.28-2
+libunwind8==1.2.1-10~deb10u1
+libx11-6==2:1.6.7-1+deb10u2
+libx11-data==2:1.6.7-1+deb10u2
+libxau6==1:1.0.8-1+b2
+libxcb-render0==1.13.1-2
+libxcb-shm0==1.13.1-2
+libxcb1==1.13.1-2
+libxdmcp6==1:1.1.2-3
+libxext6==2:1.3.3-1+b2
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxrender1==1:0.9.10-1
+lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
+openssh-client==1:7.9p1-10+deb10u2
+psmisc==23.2-1
+python==2.7.16-1
+python-minimal==2.7.16-1
 python-sdk-api==1.mlnx.4.4.3216
+python-smbus==4.1-1
+python-swsscommon==1.0.0
+python2==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3-smbus==4.1-1
+rrdtool==1.7.1-2
+sensible-utils==0.0.12
+sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
+smartmontools==6.6-1
+sshpass==1.06-1
+strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3216
 sx-complib-dev==1.mlnx.4.4.3216
 sx-gen-utils==1.mlnx.4.4.3216
 sx-gen-utils-dev==1.mlnx.4.4.3216
 sxd-libs==1.mlnx.4.4.3216
-sxd-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3216
+ucf==3.0038+nmu1
+udev==241-7~deb10u7
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 3de5bb4e730e..ca2ad4c20cd5 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -1 +1,26 @@
-python-sdk-api==4.4.3216
\ No newline at end of file
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+enum34==1.1.10
+functools32==3.2.3.post2
+future==0.18.2
+importlib-resources==3.3.1
+ipaddress==1.0.23
+jinja2==2.11.3
+jsonschema==2.6.0
+lxml==4.6.3
+markupsafe==1.1.1
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.6
+pyang==2.5.0
+pyangbind==0.6.0
+python-sdk-api==4.4.3216
+pyyaml==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+scandir==1.10.0
+singledispatch==3.6.2
+six==1.16.0
+thrift==0.13.0
+typing==3.10.0.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 3de5bb4e730e..92b1eac46c34 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1 +1,2 @@
-python-sdk-api==4.4.3216
\ No newline at end of file
+python-sdk-api==4.4.3216
+thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index b7da2dd200f8..8a72b57ecf6d 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -3,6 +3,7 @@ backports.shutil-get-terminal-size==1.0.0
 bcrypt==3.1.7
 cffi==1.14.6
 click==7.1.2
+contextlib2==0.6.0.post1
 cryptography==3.3.2
 decorator==4.4.2
 dpkt==1.9.6
@@ -10,41 +11,56 @@ enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
 flask-httpauth==2.5.0
+future==0.18.2
 futures==3.2.0
 grpcio==1.18.0
 grpcio-tools==1.15.0
+importlib-resources==3.3.1
+ipaddress==1.0.23
 ipython==5.4.1
 ipython-genutils==0.2.0
 itsdangerous==1.1.0
+jinja2==2.11.3
+markupsafe==1.1.1
+netaddr==0.8.0
+nnpy==1.4.2
 oslo.config==2.1.0
 paramiko==2.7.2
+pathlib2==2.3.6
 pbr==2.0.0
 pexpect==4.8.0
 pickleshare==0.7.5
 plumbum==1.7.0
 prompt-toolkit==1.0.18
 protobuf==3.6.1
+ptf==0.9.1
 ptyprocess==0.7.0
 pyaml==20.4.0
 pybrctl==0.1.3
+pycparser==2.20
 pygments==2.5.2
 pylibpcap==0.6.4
 pynacl==1.4.0
 pyro4==4.80
 pysubnettree==0.26
+pyyaml==5.4.1
 rpyc==4.1.5
 saithrift==0.9
+scandir==1.10.0
 scapy==2.2.0.dev0
 selectors34==1.2
 serpent==1.28
 simplegeneric==0.8.1
+singledispatch==3.6.2
 six==1.12.0
 stevedore==1.32.0
 supervisor==4.2.2
 thrift==0.11.0
 traitlets==4.3.3
 twisted==16.0.0
+typing==3.10.0.0
 wcwidth==0.2.5
 werkzeug==1.0.1
 yabgp==0.8.2
+zipp==1.2.0
 zope.interface==5.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 000000000000..d506a2a4d102
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,17 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+radvd==1:2.17-2
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
new file mode 100644
index 000000000000..aee8911b3b25
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,25 @@
+dmidecode==3.2-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+hsflowd==2.0.32-1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+psample==1.1-1
+sflowtool==5.04
+sshpass==1.06-1
+strace==4.26-0.2
+swss==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 3424f739f586..c4c12519015b 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,2 +1,34 @@
+freeipmi-common==1.6.3-1.1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+ipmitool==1.8.18-6+deb10u1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libc-l10n==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libfreeipmi17==1.6.3-1.1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libmariadb3==1:10.3.29-0+deb10u1
+libpci3==1:3.5.2-1
+libpopt0==1.16-12
+libsensors-config==1:3.5.0-3
+libsensors5==1:3.5.0-3
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
+libsnmp30-dbg==5.7.3+dfsg-5
+libunwind8==1.2.1-10~deb10u1
+locales==2.28-10
+mariadb-common==1:10.3.29-0+deb10u1
+mysql-common==5.8+1.0.5
+openssh-client==1:7.9p1-10+deb10u2
+snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
+snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
new file mode 100644
index 000000000000..69cc94341cbc
--- /dev/null
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -0,0 +1,4 @@
+hiredis==2.0.0
+psutil==5.8.0
+python-arptable==0.0.2
+smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
new file mode 100644
index 000000000000..ebf3b287be99
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,25 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
+libpython2.7-minimal==2.7.16-2+deb10u1
+libunwind8==1.2.1-10~deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libyang==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
+python==2.7.16-1
+python2.7-minimal==2.7.16-2+deb10u1
+sonic-mgmt-common==1.0.0
+sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 511d858b0f6f..a7e3e6ef57e5 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,2 +1,26 @@
+attrs==21.2.0
+certifi==2017.4.17
+charset-normalizer==2.0.2
+click==8.0.1
+clickclick==20.10.2
+connexion==2.7.0
+flask==2.0.1
+grpcio==1.38.1
+grpcio-tools==1.20.0
+idna==3.2
+importlib-metadata==4.6.1
+inflection==0.5.1
+isodate==0.6.0
+itsdangerous==2.0.1
+jsonschema==3.2.0
+openapi-schema-validator==0.1.5
+openapi-spec-validator==0.3.1
+protobuf==3.17.3
+pyrsistent==0.18.0
+python-dateutil==2.6.0
+requests==2.26.0
 six==1.11.0
+typing-extensions==3.10.0.0
+urllib3==1.21.1
+werkzeug==2.0.1
 zipp==3.5.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
new file mode 100644
index 000000000000..49315e4057ce
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,19 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libunwind8==1.2.1-10~deb10u1
+libyang==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
+sonic-mgmt-common==1.0.0
+sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 2f3ae7e0335d..f2904e0a8aa8 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -1,7 +1,12 @@
+arping==2.19-6
 bash-completion==1:2.8-6
+bridge-utils==1.6-2
+conntrack==1:1.4.5-2
+cron==3.0pl1-134+deb10u1
 dirmngr==2.2.12-1+deb10u1
 dmsetup==2:1.02.155-3
 ethtool==1:4.19-1
+frr==7.5.1-sonic-0
 gettext-base==0.19.8.1-9
 gnupg==2.2.12-1+deb10u1
 gnupg-l10n==2.2.12-1+deb10u1
@@ -14,26 +19,81 @@ gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
 grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
+ifupdown==0.8.35
+iptables==1.8.2-4
 libassuan0==2.5.2-1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
+libbsd0==0.9.1-2+deb10u1
+libc-ares2==1.14.0-1
 libdevmapper1.02.1==2:1.02.155-3
+libdouble-conversion1==3.1.0-3
+libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
+libfreetype6==2.9.1-3+deb10u2
 libfuse2==2.9.9-1+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libicu63==63.1-6+deb10u1
+libip4tc0==1.8.2-4
+libip6tc0==1.8.2-4
+libiptc0==1.8.2-4
+libjson-c3==0.12.1+ds-2+deb10u1
 libjudydebian1==1.0.5-5
 libksba8==1.3.5-2
+libnet1==1.1.6+dfsg-3.1
+libnetfilter-conntrack3==1.0.7-1
+libnfnetlink0==1.0.1-3+b1
+libnftnl11==1.1.2-2
 libnpth0==1.6-1
+libpcap0.8==1.8.1-6
+libpcre2-16-0==10.32-5
+libpng16-16==1.6.36-6
+libpopt0==1.16-12
+libpython-stdlib==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libsaimetadata==1.0.0
+libsairedis==1.0.0
 libsaivs==1.0.0
+libteam-utils==1.30-1
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libunwind8==1.2.1-10~deb10u1
+libyang==1.0.73
 libyang-cpp==1.0.73
+libyang1==1.0.184-2
+logrotate==3.14.0-4
+ndisc6==1.0.4-1
+openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
+psmisc==23.2-1
+python==2.7.16-1
+python-minimal==2.7.16-1
 python-ply==3.11-3
+python-scapy==2.4.0-2
+python-swsscommon==1.0.0
+python2==2.7.16-1
+python2-minimal==2.7.16-1
 python2-yang==1.0.73
+python2.7==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
 python3-yang==1.0.73
+redis-server==5:6.0.6-1~bpo10+1
+sensible-utils==0.0.12
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
-syncd-vs==1.0.0
\ No newline at end of file
+swss==1.0.0
+syncd-vs==1.0.0
+tcpdump==4.9.3-1~deb10u2
+ucf==3.0038+nmu1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index b3e71c379e28..274524d68093 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -7,5 +7,7 @@ netifaces==0.10.7
 ply==3.11
 py2-ipaddress==3.4.2
 pyroute2==0.5.3
-requests==2.25.1
+requests==2.26.0
+scapy==2.4.0
+six==1.16.0
 urllib3==1.26.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index da0f66c3c3d1..2380496c950f 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,10 +1,16 @@
 certifi==2021.5.30
+charset-normalizer==2.0.2
 click==7.0
+idna==3.2
 ijson==2.6.1
 jsondiff==1.3.0
 m2crypto==0.38.0
+netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
+pyroute2==0.5.14
+requests==2.26.0
+scapy==2.4.4
 tabulate==0.8.9
 urllib3==1.26.6
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
new file mode 100644
index 000000000000..39a3d25633ab
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -0,0 +1,71 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u1
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1+deb10u1
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index ee5c2bee1606..bc0a5e22b366 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,12 +1,23 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
+libc-ares2==1.14.0-1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
+libicu63==63.1-6+deb10u1
 liblzma-dev==5.2.4-1
 libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
 libpcap0.8-dev==1.8.1-6
+libsaimetadata==1.0.0
+libsairedis==1.0.0
 libtcmalloc-minimal4==2.7-1
 libunwind-dev==1.2.1-10~deb10u1
+libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
-libusb-1.0-0-dev==2:1.0.22-2
\ No newline at end of file
+libusb-1.0-0-dev==2:1.0.22-2
+libxml2==2.9.4+dfsg1-7+deb10u2
+linux-libc-dev==4.19.194-2
+syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
new file mode 100644
index 000000000000..7a661be0e07f
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -0,0 +1,73 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u1
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
+libicu63==63.1-6+deb10u1
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
new file mode 100644
index 000000000000..bb00691a9700
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
@@ -0,0 +1,2 @@
+https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
+https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 28b48a115b6d..1b38738849f9 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -1 +1,36 @@
-ethtool==1:4.19-1
\ No newline at end of file
+ethtool==1:4.19-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+kmod==26-1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libkmod2==26-1
+libpopt0==1.16-12
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libsaibcm==4.3.3.9
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+linux-libc-dev==4.19.194-2
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
new file mode 100644
index 000000000000..d46082994763
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -0,0 +1,76 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u1
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
+libicu63==63.1-6+deb10u1
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+linux-libc-dev==4.19.194-2
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index e5836f0be374..0d9260683b3a 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1 +1,22 @@
-libsai==1.6.3-1
\ No newline at end of file
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+kmod==26-1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libkmod2==26-1
+libpopt0==1.16-12
+libsai==1.6.3-1
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+syncd==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
new file mode 100644
index 000000000000..b01af3937f12
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -0,0 +1,51 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libcc1-0==8.3.0-6
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libffi-dev==3.2.1-9
+libgcc-8-dev==8.3.0-6
+libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
+libisl19==0.20-2
+libitm1==8.3.0-6
+libjsoncpp1==1.7.4-3
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
+librhash0==1.3.8-1
+libssl-dev==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+libuv1==1.24.1-1+deb10u1
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+syncd-rpc==1.0.0
+wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
new file mode 100644
index 000000000000..f2d6dd3c856c
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
@@ -0,0 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
+ptf==0.9.1
+pycparser==2.20
+scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 6365619ffa30..36ee60a321fe 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,11 +1,55 @@
 applibs==1.mlnx.4.4.3216
 applibs-dev==1.mlnx.4.4.3216
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3216
 iproute2-dev==1.mlnx.4.4.3216
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libelf1==0.176-1.1
+libexpat1-dev==2.2.6-2+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+linux-libc-dev==4.19.194-2
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
+openssh-client==1:7.9p1-10+deb10u2
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.3216
+python-setuptools==40.8.0-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+sshpass==1.06-1
+strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3216
 sx-acl-helper-dev==1.mlnx.4.4.3216
 sx-complib==1.mlnx.4.4.3216
@@ -18,5 +62,9 @@ sx-scew==1.mlnx.4.4.3216
 sx-scew-dev==1.mlnx.4.4.3216
 sxd-libs==1.mlnx.4.4.3216
 sxd-libs-dev==1.mlnx.4.4.3216
+syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3216
 wjh-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 35fa7ba37f8c..04d9d17057db 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,25 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 000000000000..747832af7779
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,26 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libswsscommon-dbg==1.0.0
+libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
+libteam5==1.30-1
+libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+swss==1.0.0
+swss-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..84db3d8559a5
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-web b/files/build/versions/dockers/sonic-slave-buster/versions-web
new file mode 100644
index 000000000000..e98bc47c6359
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-web
@@ -0,0 +1,2 @@
+https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..84db3d8559a5
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-web b/files/build/versions/dockers/sonic-slave-stretch/versions-web
new file mode 100644
index 000000000000..ea55af616524
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-web
@@ -0,0 +1,4 @@
+https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index a3c25686bc13..c65f8b60b778 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,11 +4,11 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
 cffi==1.14.6
-chardet==4.0.0
+charset-normalizer==2.0.2
 click==7.0
 cryptography==3.4.7
 docker==4.3.1
-idna==2.10
+idna==3.2
 ijson==2.6.1
 ipaddress==1.0.23
 jinja2==3.0.1
@@ -27,11 +27,11 @@ ptyprocess==0.7.0
 pyang==2.5.0
 pyangbind==0.8.1
 pycparser==2.20
-python-dateutil==2.8.1
+python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
 regex==2021.7.6
-requests==2.25.1
+requests==2.26.0
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
diff --git a/files/build/versions/host-image/versions-web b/files/build/versions/host-image/versions-web
new file mode 100644
index 000000000000..c9f935ca9a85
--- /dev/null
+++ b/files/build/versions/host-image/versions-web
@@ -0,0 +1 @@
+https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
\ No newline at end of file

From 8acb206778cc7f5e9cb7104455a73fe5954af67e Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 15 Jul 2021 17:33:07 -0700
Subject: [PATCH 0647/1674] [202012] [minigraph] Update parsing logic for
 Storage backend devices (#8004)

Backport #7944

#### Why I did it
The current logic generates 'VLAN_SUB_INTERFACE' table if the device type is backend and cluster name contains 'str'. This is not a reliable method to determine a storage backend device

#### How I did it
Updated the logic to generate 'VLAN_SUB_INTERFACE' table if any of the following conditions hold true
  1. device is of type backend and ResourceType attribute is None
  2. device is of type backend and ResourceType attribute contains "Storage"
  3. device is of type backend and graph contains "Subinterface" section

Also updated the logic to set "is_storage_device" to True
  1. for Backend, if any of the above conditions hold true
  2. for Frontend, if ResourceType attribute contains "Storage"

#### How to verify it
Added new tests to verify the code changes and built sonic_config_engine-1.0-py3-none-any.whl successfully
---
 src/sonic-config-engine/minigraph.py          |  48 +-
 .../tests/sample-graph-resource-type.xml      | 446 ++++++++++++++++++
 .../tests/sample-graph-subintf.xml            | 439 +++++++++++++++++
 .../tests/simple-sample-graph-case.xml        |   5 +
 src/sonic-config-engine/tests/test_cfggen.py  | 128 +++--
 .../tests/test_minigraph_case.py              |  35 +-
 6 files changed, 1040 insertions(+), 61 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample-graph-resource-type.xml
 create mode 100644 src/sonic-config-engine/tests/sample-graph-subintf.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 39d594806174..b422af4e64dc 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -181,7 +181,6 @@ def parse_png(png, hname, dpg_ecmp_content = None):
     port_speeds = {}
     console_ports = {}
     mux_cable_ports = {}
-    is_storage_device = False
     port_device_map = {}
     png_ecmp_content = {}
     FG_NHG_MEMBER = {}
@@ -254,10 +253,6 @@ def parse_png(png, hname, dpg_ecmp_content = None):
                     device_data['lo_addr_v6'] = lo_prefix_v6
                 devices[name] = device_data
 
-                if name == hname:
-                    if cluster and "str" in cluster.lower():
-                        is_storage_device = True
-
         if child.tag == str(QName(ns, "DeviceInterfaceLinks")):
             for if_link in child.findall(str(QName(ns, 'DeviceLinkBase'))):
                 if str(QName(ns3, "type")) in if_link.attrib:
@@ -294,7 +289,7 @@ def parse_png(png, hname, dpg_ecmp_content = None):
 
             png_ecmp_content = {"FG_NHG_MEMBER": FG_NHG_MEMBER, "FG_NHG": FG_NHG, "NEIGH": NEIGH}
 
-    return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds, console_ports, mux_cable_ports, is_storage_device, png_ecmp_content)
+    return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds, console_ports, mux_cable_ports, png_ecmp_content)
 
 
 def parse_asic_external_link(link, asic_name, hostname):
@@ -403,6 +398,7 @@ def parse_loopback_intf(child):
 def parse_dpg(dpg, hname):
     aclintfs = None
     mgmtintfs = None
+    subintfs = None
     tunnelintfs = defaultdict(dict)
     for child in dpg:
         """ 
@@ -442,6 +438,16 @@ def parse_dpg(dpg, hname):
             ip_intfs_map[ipprefix] = intfalias
         lo_intfs =  parse_loopback_intf(child)
 
+        subintfs = child.find(str(QName(ns, "SubInterfaces")))
+        if subintfs is not None:
+            for subintf in subintfs.findall(str(QName(ns, "SubInterface"))):
+                intfalias = subintf.find(str(QName(ns, "AttachTo"))).text
+                intfname = port_alias_map.get(intfalias, intfalias)
+                ipprefix = subintf.find(str(QName(ns, "Prefix"))).text
+                subintfvlan = subintf.find(str(QName(ns, "Vlan"))).text
+                subintfname = intfname + VLAN_SUB_INTERFACE_SEPARATOR + subintfvlan
+                intfs[(subintfname, ipprefix)] = {}
+
         mvrfConfigs = child.find(str(QName(ns, "MgmtVrfConfigs")))
         mvrf = {}
         if mvrfConfigs != None:
@@ -1157,7 +1163,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "CpgDec")):
                 (bgp_sessions, bgp_internal_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, hostname)
             elif child.tag == str(QName(ns, "PngDec")):
-                (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speed_png, console_ports, mux_cable_ports, is_storage_device, png_ecmp_content) = parse_png(child, hostname, dpg_ecmp_content)
+                (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speed_png, console_ports, mux_cable_ports, png_ecmp_content) = parse_png(child, hostname, dpg_ecmp_content)
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
@@ -1223,9 +1229,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
 
         results['DEVICE_METADATA']['localhost']['peer_switch'] = list(results['PEER_SWITCH'].keys())[0]
 
-    if is_storage_device:
-        results['DEVICE_METADATA']['localhost']['storage_device'] = "true"
-
     # for this hostname, if sub_role is defined, add sub_role in 
     # device_metadata
     if sub_role is not None:
@@ -1304,6 +1307,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         elif intf[0][0:11] == 'PortChannel':
             pc_intfs[intf] = {}
             pc_intfs[intf[0]] = {}
+        elif VLAN_SUB_INTERFACE_SEPARATOR in intf[0]:
+            vlan_sub_intfs[intf] = {}
+            vlan_sub_intfs[intf[0]] = {'admin_status': 'up'}
         else:
             phyport_intfs[intf] = {}
             phyport_intfs[intf[0]] = {}
@@ -1382,6 +1388,13 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         if port[0] in ports:
             ports.get(port[0])['admin_status'] = 'up'
 
+    if len(vlan_sub_intfs):
+        for subintf in vlan_sub_intfs:
+            if not isinstance(subintf, tuple):
+                parent_port = subintf.split(".")[0]
+                if parent_port in ports:
+                     ports.get(parent_port)['admin_status'] = 'up'
+
     for member in list(pc_members.keys()) + list(vlan_members.keys()):
         port = ports.get(member[1])
         if port:
@@ -1421,9 +1434,16 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
 
     results['PORTCHANNEL_INTERFACE'] = pc_intfs
 
-    if current_device['type'] in backend_device_types and is_storage_device:
+    # for storage backend subinterface info present in minigraph takes precedence over ResourceType
+    if current_device['type'] in backend_device_types and bool(vlan_sub_intfs):
         del results['INTERFACE']
         del results['PORTCHANNEL_INTERFACE']
+        is_storage_device = True
+        results['VLAN_SUB_INTERFACE'] = vlan_sub_intfs
+    elif current_device['type'] in backend_device_types and (resource_type is None or 'Storage' in resource_type):
+        del results['INTERFACE']
+        del results['PORTCHANNEL_INTERFACE']
+        is_storage_device = True
 
         for intf in phyport_intfs.keys():
             if isinstance(intf, tuple):
@@ -1444,8 +1464,12 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             else:
                 sub_intf = pc_intf + VLAN_SUB_INTERFACE_SEPARATOR + VLAN_SUB_INTERFACE_VLAN_ID
                 vlan_sub_intfs[sub_intf] = {"admin_status" : "up"}
-
         results['VLAN_SUB_INTERFACE'] = vlan_sub_intfs
+    elif resource_type is not None and 'Storage' in resource_type:
+        is_storage_device = True
+
+    if is_storage_device:
+        results['DEVICE_METADATA']['localhost']['storage_device'] = "true"
 
     results['VLAN'] = vlans
     results['VLAN_MEMBER'] = vlan_members
diff --git a/src/sonic-config-engine/tests/sample-graph-resource-type.xml b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
new file mode 100644
index 000000000000..31f9fc43f2c1
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
@@ -0,0 +1,446 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>0</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1001</Name>
+          <AttachTo>fortyGigE0/1;fortyGigE0/2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>kk1</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2020</VlanID>
+          <Tag>2020</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.0/28</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab3</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2001</VlanID>
+          <Tag>2001</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1001</AttachTo>
+          <Prefix>10.0.0.57/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1001</AttachTo>
+          <Prefix>FC00::72/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>PortChannel01</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>et1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/8</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA05T1</StartDevice>
+        <StartPort>Ethernet1/32</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA06T1</StartDevice>
+        <StartPort>Ethernet1/33</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+        <ElementType>DeviceMgmtLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/16</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ChassisMTS1</StartDevice>
+        <StartPort>mgmt0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+      <ElementType>DeviceMgmtLink</ElementType>
+      <Bandwidth>1000</Bandwidth>
+      <EndDevice>switch-t0</EndDevice>
+      <EndPort>Management1</EndPort>
+      <StartDevice>switch-m0</StartDevice>
+      <StartPort>Management1</StartPort>
+      <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <Index>1</Index>
+	  <InterfaceName>Management1</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>mgmt1</PortName>
+	  <Speed>1000</Speed>
+  	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>switch-t0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>ResourceType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Storage</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-graph-subintf.xml b/src/sonic-config-engine/tests/sample-graph-subintf.xml
new file mode 100644
index 000000000000..4a7ffe2f76ed
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-graph-subintf.xml
@@ -0,0 +1,439 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>0</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1001</Name>
+          <AttachTo>fortyGigE0/1;fortyGigE0/2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>kk1</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2020</VlanID>
+          <Tag>2020</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.0/28</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab3</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2001</VlanID>
+          <Tag>2001</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <SubInterfaces>
+        <SubInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Vlan>10</Vlan>
+          <Encapsulation>dot1q</Encapsulation>
+          <Prefix>10.0.0.58/31</Prefix>
+          <Unit>10</Unit>
+        </SubInterface>
+        <SubInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Vlan>10</Vlan>
+          <Encapsulation>dot1q</Encapsulation>
+          <Prefix>FC00::75/126</Prefix>
+          <Unit>10</Unit>
+        </SubInterface>
+      </SubInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1001</AttachTo>
+          <Prefix>10.0.0.57/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1001</AttachTo>
+          <Prefix>FC00::72/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>PortChannel01</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>et1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/8</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA05T1</StartDevice>
+        <StartPort>Ethernet1/32</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/2</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA06T1</StartDevice>
+        <StartPort>Ethernet1/33</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+        <ElementType>DeviceMgmtLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/16</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ChassisMTS1</StartDevice>
+        <StartPort>mgmt0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+      <ElementType>DeviceMgmtLink</ElementType>
+      <Bandwidth>1000</Bandwidth>
+      <EndDevice>switch-t0</EndDevice>
+      <EndPort>Management1</EndPort>
+      <StartDevice>switch-m0</StartDevice>
+      <StartPort>Management1</StartPort>
+      <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <Index>1</Index>
+	  <InterfaceName>Management1</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>mgmt1</PortName>
+	  <Speed>1000</Speed>
+  	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index 7717157f186e..c1015b6b5362 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -457,6 +457,11 @@
      <a:Reference i:nil="true"/>
      <a:Value>10.10.10.10</a:Value>
     </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ResourceType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Storage</a:Value>
+    </a:DeviceProperty>
   </a:Properties>
   </a:DeviceMetadata>
  </Devices>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index c488a3be1279..e3f74fb9cf73 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -28,6 +28,8 @@ def setUp(self):
         self.output_file = os.path.join(self.test_dir, 'output')
         self.output2_file = os.path.join(self.test_dir, 'output2')
         self.ecmp_graph = os.path.join(self.test_dir, 'fg-ecmp-sample-minigraph.xml')
+        self.sample_resource_graph = os.path.join(self.test_dir, 'sample-graph-resource-type.xml')
+        self.sample_subintf_graph = os.path.join(self.test_dir, 'sample-graph-subintf.xml')
 
     def tearDown(self):
         try:
@@ -120,8 +122,9 @@ def test_additional_json_data_level2_key(self):
         output = self.run_script(argument)
         self.assertEqual(utils.to_dict(output.strip()), utils.to_dict('{\n    "k11": "v11"\n}'))
 
-    def test_var_json_data(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" --var-json VLAN_MEMBER'
+    def test_var_json_data(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" --var-json VLAN_MEMBER'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
@@ -207,8 +210,9 @@ def test_minigraph_interfaces(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "[('Ethernet0', '10.0.0.58/31'), 'Ethernet0', ('Ethernet0', 'FC00::75/126')]")
 
-    def test_minigraph_vlans(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v VLAN'
+    def test_minigraph_vlans(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v VLAN'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
@@ -220,8 +224,9 @@ def test_minigraph_vlans(self):
             )
         )
 
-    def test_minigraph_vlan_members(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
+    def test_minigraph_vlan_members(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
@@ -233,8 +238,9 @@ def test_minigraph_vlan_members(self):
             )
         )
 
-    def test_minigraph_vlan_interfaces(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "VLAN_INTERFACE.keys()|list"'
+    def test_minigraph_vlan_interfaces(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "VLAN_INTERFACE.keys()|list"'
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "[('Vlan1000', '192.168.0.1/27'), 'Vlan1000']")
 
@@ -265,8 +271,9 @@ def test_minigraph_ecmp_neighbors(self):
                                          " 'Vlan31|200:200:200:200::2', 'Vlan31|200:200:200:200::3', 'Vlan31|200:200:200:200::4', 'Vlan31|200:200:200:200::5', "
                                          "'Vlan31|200:200:200:200::6', 'Vlan31|200:200:200:200::7', 'Vlan31|200:200:200:200::8', 'Vlan31|200:200:200:200::9']")
 
-    def test_minigraph_portchannels(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v PORTCHANNEL'
+    def test_minigraph_portchannels(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v PORTCHANNEL'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
@@ -451,14 +458,15 @@ def test_minigraph_deployment_id(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "1")
 
-    def test_minigraph_ethernet_interfaces(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet8\']"'
+    def test_minigraph_ethernet_interfaces(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet8\']"'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
             utils.to_dict("{'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '1000'}")
         )
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet12\']"'
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet12\']"'
         output = self.run_script(argument)
         self.assertEqual(
             utils.to_dict(output.strip()),
@@ -507,8 +515,9 @@ def test_minigraph_neighbor_interfaces(self):
             )
         )
 
-    def test_minigraph_extra_ethernet_interfaces(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT"'
+    def test_minigraph_extra_ethernet_interfaces(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple) 
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "PORT"'
         output = self.run_script(argument)
 
         self.assertEqual(
@@ -568,13 +577,15 @@ def test_metadata_ntp(self):
         output = self.run_script(argument)
         self.assertEqual(utils.to_dict(output.strip()), utils.to_dict("{'10.0.10.1': {}, '10.0.10.2': {}}"))
 
-    def test_minigraph_vnet(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "VNET"'
+    def test_minigraph_vnet(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "VNET"'
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "")
 
-    def test_minigraph_vxlan(self):
-        argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "VXLAN_TUNNEL"'
+    def test_minigraph_vxlan(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "VXLAN_TUNNEL"'
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "")
 
@@ -587,61 +598,82 @@ def test_minigraph_bgp_mon(self):
         )
 
     def test_minigraph_sub_port_interfaces(self, check_stderr=True):
+        self.verify_sub_intf(check_stderr=check_stderr)
+
+    def test_minigraph_sub_port_intf_resource_type(self, check_stderr=True):
+        self.verify_sub_intf(graph_file=self.sample_resource_graph, check_stderr=check_stderr)
+
+    def test_minigraph_sub_port_intf_sub(self, check_stderr=True):
+        self.verify_sub_intf(graph_file=self.sample_subintf_graph, check_stderr=check_stderr)
+
+    def verify_sub_intf(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        check_stderr = kwargs.get('check_stderr', True)
         try:
             print('\n    Change device type to %s' % (BACKEND_TOR_ROUTER))
             if check_stderr:
-                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, self.sample_graph_simple), stderr=subprocess.STDOUT, shell=True)
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, graph_file), stderr=subprocess.STDOUT, shell=True)
             else:
-                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, self.sample_graph_simple), shell=True)
-
-            self.test_jinja_expression(self.sample_graph_simple, BACKEND_TOR_ROUTER)
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, graph_file), shell=True)
 
+            self.test_jinja_expression(graph_file, BACKEND_TOR_ROUTER)
 
             # INTERFACE table does not exist
-            argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "INTERFACE"'
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "INTERFACE"'
             output = self.run_script(argument)
             self.assertEqual(output.strip(), "")
 
             # PORTCHANNEL_INTERFACE table does not exist
-            argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORTCHANNEL_INTERFACE"'
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "PORTCHANNEL_INTERFACE"'
             output = self.run_script(argument)
             self.assertEqual(output.strip(), "")
 
             # All the other tables stay unchanged
-            self.test_var_json_data()
-            self.test_minigraph_vlans()
-            self.test_minigraph_vlan_members()
-            self.test_minigraph_vlan_interfaces()
-            self.test_minigraph_portchannels()
-            self.test_minigraph_ethernet_interfaces()
-            self.test_minigraph_extra_ethernet_interfaces()
-            self.test_minigraph_vnet()
-            self.test_minigraph_vxlan()
+            self.test_var_json_data(graph_file=graph_file)
+            self.test_minigraph_vlans(graph_file=graph_file)
+            self.test_minigraph_vlan_members(graph_file=graph_file)
+            self.test_minigraph_vlan_interfaces(graph_file=graph_file)
+            self.test_minigraph_portchannels(graph_file=graph_file)
+            self.test_minigraph_ethernet_interfaces(graph_file=graph_file)
+            self.test_minigraph_extra_ethernet_interfaces(graph_file=graph_file)
+            self.test_minigraph_vnet(graph_file=graph_file)
+            self.test_minigraph_vxlan(graph_file=graph_file)
 
             # VLAN_SUB_INTERFACE
-            argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v VLAN_SUB_INTERFACE'
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v VLAN_SUB_INTERFACE'
             output = self.run_script(argument)
             print(output.strip())
-            self.assertEqual(
-                utils.to_dict(output.strip()),
-                utils.to_dict(
-                    "{('PortChannel01.10', '10.0.0.56/31'): {}, "
-                    "'Ethernet0.10': {'admin_status': 'up'}, "
-                    "('Ethernet0.10', '10.0.0.58/31'): {}, "
-                    "('PortChannel01.10', 'FC00::71/126'): {}, "
-                    "'PortChannel01.10': {'admin_status': 'up'}, "
-                    "('Ethernet0.10', 'FC00::75/126'): {}}"
+            # not a usecase to parse SubInterfaces under PortChannel
+            if 'subintf' in graph_file:
+                self.assertEqual(
+                    utils.to_dict(output.strip()),
+                    utils.to_dict(
+                        "{'Ethernet0.10': {'admin_status': 'up'}, "
+                        "('Ethernet0.10', '10.0.0.58/31'): {}, "
+                        "('Ethernet0.10', 'FC00::75/126'): {}}"
+                    )
+                )
+            else:
+                self.assertEqual(
+                    utils.to_dict(output.strip()),
+                    utils.to_dict(
+                        "{('PortChannel01.10', '10.0.0.56/31'): {}, "
+                        "'Ethernet0.10': {'admin_status': 'up'}, "
+                        "('Ethernet0.10', '10.0.0.58/31'): {}, "
+                        "('PortChannel01.10', 'FC00::71/126'): {}, "
+                        "'PortChannel01.10': {'admin_status': 'up'}, "
+                        "('Ethernet0.10', 'FC00::75/126'): {}}"
+                    )
                 )
-            )
 
         finally:
             print('\n    Change device type back to %s' % (TOR_ROUTER))
             if check_stderr:
-                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, self.sample_graph_simple), stderr=subprocess.STDOUT, shell=True)
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, graph_file), stderr=subprocess.STDOUT, shell=True)
             else:
-                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, self.sample_graph_simple), shell=True)
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, graph_file), shell=True)
 
-            self.test_jinja_expression(self.sample_graph_simple, TOR_ROUTER)
+            self.test_jinja_expression(graph_file, TOR_ROUTER)
 
     def test_show_run_acl(self):
         argument = '-a \'{"key1":"value"}\' --var-json ACL_RULE'
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index abee457a0d4f..3308c5641f4b 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -7,13 +7,18 @@
 
 from unittest import TestCase
 
+TOR_ROUTER = 'ToRRouter'
+BACKEND_TOR_ROUTER = 'BackEndToRRouter'
 
 class TestCfgGenCaseInsensitive(TestCase):
 
     def setUp(self):
         self.test_dir = os.path.dirname(os.path.realpath(__file__))
         self.script_file = utils.PYTHON_INTERPRETTER + ' ' + os.path.join(self.test_dir, '..', 'sonic-cfggen')
+        self.sample_simple_graph = os.path.join(self.test_dir, 'simple-sample-graph.xml')
         self.sample_graph = os.path.join(self.test_dir, 'simple-sample-graph-case.xml')
+        self.sample_resource_graph = os.path.join(self.test_dir, 'sample-graph-resource-type.xml')
+        self.sample_subintf_graph = os.path.join(self.test_dir, 'sample-graph-subintf.xml')
         self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
 
     def run_script(self, argument, check_stderr=False):
@@ -284,7 +289,35 @@ def test_minigraph_storage_device(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'storage_device\']"'
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "true")
-        
+
+    def test_minigraph_storage_backend_no_resource_type(self):
+        self.verify_storage_device_set(self.sample_simple_graph)
+
+    def test_minigraph_storage_backend_resource_type(self):
+        self.verify_storage_device_set(self.sample_resource_graph)
+
+    def test_minigraph_storage_backend_subintf(self):
+        self.verify_storage_device_set(self.sample_subintf_graph)
+
+    def verify_storage_device_set(self, graph_file, check_stderr=False):
+        try:
+            print('\n    Change device type to %s' % (BACKEND_TOR_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, graph_file), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_TOR_ROUTER, graph_file), shell=True)
+
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'storage_device\']"'
+            output = self.run_script(argument)
+            self.assertEqual(output.strip(), "true")
+
+        finally:
+            print('\n    Change device type back to %s' % (TOR_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, graph_file), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_TOR_ROUTER, TOR_ROUTER, graph_file), shell=True)
+
     def test_minigraph_tunnel_table(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "TUNNEL"'
         expected_tunnel = {

From 763fcd7eeb28a2338900843fe6bbc163be1aac04 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 16 Jul 2021 22:34:02 +0800
Subject: [PATCH 0648/1674] [ci/build]: Upgrade SONiC package versions (#8199)

---
 .../versions-deb-buster                       |  1 -
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-git     |  4 ++--
 .../docker-syncd-mlnx/versions-deb-buster     | 21 -------------------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 12 +++++------
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 7 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 353fd5222f8b..92730cde7abd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -77,7 +77,6 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index c4d4b15a58b2..92747005c1c7 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60
+https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 94487b18b9be..c069cfa8a365 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60
+https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 36ee60a321fe..36d258222692 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,22 +1,11 @@
 applibs==1.mlnx.4.4.3216
 applibs-dev==1.mlnx.4.4.3216
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3216
 iproute2-dev==1.mlnx.4.4.3216
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
-libipt2==2.0-2
-libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -26,16 +15,11 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.194-2
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
@@ -48,8 +32,6 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
-sshpass==1.06-1
-strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3216
 sx-acl-helper-dev==1.mlnx.4.4.3216
 sx-complib==1.mlnx.4.4.3216
@@ -63,8 +45,5 @@ sx-scew-dev==1.mlnx.4.4.3216
 sxd-libs==1.mlnx.4.4.3216
 sxd-libs-dev==1.mlnx.4.4.3216
 syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3216
 wjh-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 84db3d8559a5..7f32200f52bf 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e982d5727bb51c8da2da13e5aeec02fd0b94632
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index fa2e3500a9b9..7e8937ec05be 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1204,12 +1204,12 @@ php-text-template==1.2.1-2
 php-timer==1.0.8-1
 php-token-stream==1.4.8-2
 php-xml==1:7.0+49
-php7.0-cli==7.0.33-0+deb9u10
-php7.0-common==7.0.33-0+deb9u10
-php7.0-json==7.0.33-0+deb9u10
-php7.0-opcache==7.0.33-0+deb9u10
-php7.0-readline==7.0.33-0+deb9u10
-php7.0-xml==7.0.33-0+deb9u10
+php7.0-cli==7.0.33-0+deb9u11
+php7.0-common==7.0.33-0+deb9u11
+php7.0-json==7.0.33-0+deb9u11
+php7.0-opcache==7.0.33-0+deb9u11
+php7.0-readline==7.0.33-0+deb9u11
+php7.0-xml==7.0.33-0+deb9u11
 phpunit==5.4.6-2~deb9u1
 phpunit-code-unit-reverse-lookup==1.0.0-2
 phpunit-comparator==1.2.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 84db3d8559a5..43f411ae099f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1606c25b44d7a3daab69e8ce0806c3c02780cf01
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file

From 01efb5454e4e28cecf321d6d4c27a136f1326af0 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Sat, 17 Jul 2021 04:19:01 -0700
Subject: [PATCH 0649/1674] [sonic-utilities] Update submodule (#8196)

Includes below commits
```
d19829c 2021-07-16 | Revert "[minigraph][port_config] Consume port_config.json while reloading minigraph (#1705)" [Guohan Lu]
cd1f6e6 2021-07-15 | Reworked IP validation in "config interface ip add/remove" command (#1709) [Andriy Kokhan]
66c34c0 2021-07-15 | [minigraph][port_config] Consume port_config.json while reloading minigraph (#1705) [Blueve]
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 2ca493b2c679..d19829cdf015 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 2ca493b2c6793c8d438e9c17016563b471f92ac8
+Subproject commit d19829cdf01500213101cc0d2f78587af5f86cf3

From 21927ec94169b170e8a25f6f48e6253304cbde08 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 20 Jul 2021 11:23:28 +0800
Subject: [PATCH 0650/1674] Add some versions for build of sonic-slave-stretch
 on armhf and arm64 arch. (#8221)

---
 files/build/versions/default/versions-web | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 74104f8b10b7..6ca46ffc6523 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -43,6 +43,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
+https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_armhf.deb?st=2020-03-27T02%3A29%3A41Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=sWt7kxrFumn020d2GeutGJ716cuQsFwmAmgU%2BJ0kqnk%3D==b5625da7ac620a2ae869653b9e5318ed
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
@@ -55,4 +57,6 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
+https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file

From 61fc86d83afd20304adf8bc6585b8361a7b79de5 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Mon, 3 May 2021 23:14:35 +0700
Subject: [PATCH 0651/1674] [device/celestica]: Add thermalctld support on
 Haliburton platform APIs (#6493)

- Removed the old function for detecting a faulty fan.
- Removed the old function for detecting excess temperature.
- Implement thermal_manager APIs based on ThermalManagerBase
- Implement thermal_conditions APIs based on ThermalPolicyConditionBase
- Implement thermal_actions APIs based on ThermalPolicyActionBase
- Implement thermal_info APIs based on ThermalPolicyInfoBase
- Add thermal_policy.json
---
 .../x86_64-cel_e1031-r0/fancontrol-B2F        |  20 +-
 .../x86_64-cel_e1031-r0/fancontrol-F2B        |  20 +-
 .../sonic_platform/__init__.py                |   4 +-
 .../sonic_platform/chassis.py                 |  67 +++--
 .../sonic_platform/common.py                  | 283 ++++++++++++++++++
 .../sonic_platform/component.py               |   3 +-
 .../sonic_platform/eeprom.py                  |  15 +-
 .../x86_64-cel_e1031-r0/sonic_platform/fan.py |  81 +++--
 .../x86_64-cel_e1031-r0/sonic_platform/psu.py |   1 -
 .../x86_64-cel_e1031-r0/sonic_platform/sfp.py |   6 +-
 .../sonic_platform/thermal.py                 | 231 ++++++++++----
 .../sonic_platform/thermal_actions.py         |  78 +++++
 .../sonic_platform/thermal_conditions.py      |  78 +++++
 .../sonic_platform/thermal_infos.py           | 165 ++++++++++
 .../sonic_platform/thermal_manager.py         |  47 +++
 .../sonic_platform/watchdog.py                |   3 -
 .../thermal_overload_control.sh               |  75 +++++
 .../x86_64-cel_e1031-r0/thermal_policy.json   |  93 ++++++
 .../debian/platform-modules-haliburton.init   |   7 +-
 .../platform-modules-haliburton.postinst      |  11 +-
 .../haliburton/script/fancontrol.sh           |  79 ++---
 21 files changed, 1144 insertions(+), 223 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_actions.py
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_conditions.py
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_infos.py
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_manager.py
 create mode 100755 device/celestica/x86_64-cel_e1031-r0/thermal_overload_control.sh
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/thermal_policy.json

diff --git a/device/celestica/x86_64-cel_e1031-r0/fancontrol-B2F b/device/celestica/x86_64-cel_e1031-r0/fancontrol-B2F
index 883f3c0c899d..7c16892835d5 100644
--- a/device/celestica/x86_64-cel_e1031-r0/fancontrol-B2F
+++ b/device/celestica/x86_64-cel_e1031-r0/fancontrol-B2F
@@ -1,13 +1,11 @@
 # Configuration file generated by pwmconfig, changes will be lost
 INTERVAL=2
-DEVPATH=hwmon3=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-23/23-004d hwmon2=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-11/11-001a
-DEVNAME=hwmon3=emc2305 hwmon2=max6699
-FCTEMPS=hwmon3/device/pwm1=hwmon2/temp1_input hwmon3/device/pwm2=hwmon2/temp1_input hwmon3/device/pwm4=hwmon2/temp1_input
-FCFANS=hwmon3/device/pwm1=hwmon3/device/fan1_input hwmon3/device/pwm2=hwmon3/device/fan2_input hwmon3/device/pwm4=hwmon3/device/fan4_input
-MINTEMP=hwmon3/device/pwm1=27 hwmon3/device/pwm2=27 hwmon3/device/pwm4=27
-MAXTEMP=hwmon3/device/pwm1=46 hwmon3/device/pwm2=46 hwmon3/device/pwm4=46
-MINSTART=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MINSTOP=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MINPWM=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MAXPWM=hwmon3/device/pwm1=255 hwmon3/device/pwm2=255 hwmon3/device/pwm4=255
-THYST=hwmon3/device/pwm1=2 hwmon3/device/pwm2=2 hwmon3/device/pwm4=2
+FCTEMPS=23-004d/pwm1=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp1_input 23-004d/pwm2=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp1_input 23-004d/pwm4=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp1_input
+FCFANS=23-004d/pwm1=23-004d/fan1_input 23-004d/pwm2=23-004d/fan2_input 23-004d/pwm4=23-004d/fan4_input
+MINTEMP=23-004d/pwm1=27 23-004d/pwm2=27 23-004d/pwm4=27
+MAXTEMP=23-004d/pwm1=46 23-004d/pwm2=46 23-004d/pwm4=46
+MINSTART=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MINSTOP=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MINPWM=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MAXPWM=23-004d/pwm1=255 23-004d/pwm2=255 23-004d/pwm4=255
+THYST=23-004d/pwm1=2 23-004d/pwm2=2 23-004d/pwm4=2
diff --git a/device/celestica/x86_64-cel_e1031-r0/fancontrol-F2B b/device/celestica/x86_64-cel_e1031-r0/fancontrol-F2B
index 3be1f7e339ca..a19d510b185d 100644
--- a/device/celestica/x86_64-cel_e1031-r0/fancontrol-F2B
+++ b/device/celestica/x86_64-cel_e1031-r0/fancontrol-F2B
@@ -1,13 +1,11 @@
 # Configuration file generated by pwmconfig, changes will be lost
 INTERVAL=2
-DEVPATH=hwmon3=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-23/23-004d hwmon2=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-11/11-001a
-DEVNAME=hwmon3=emc2305 hwmon2=max6697
-FCTEMPS=hwmon3/device/pwm1=hwmon2/temp3_input hwmon3/device/pwm2=hwmon2/temp3_input hwmon3/device/pwm4=hwmon2/temp3_input
-FCFANS=hwmon3/device/pwm1=hwmon3/device/fan1_input hwmon3/device/pwm2=hwmon3/device/fan2_input hwmon3/device/pwm4=hwmon3/device/fan4_input
-MINTEMP=hwmon3/device/pwm1=29 hwmon3/device/pwm2=29 hwmon3/device/pwm4=29
-MAXTEMP=hwmon3/device/pwm1=46 hwmon3/device/pwm2=46 hwmon3/device/pwm4=46
-MINSTART=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MINSTOP=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MINPWM=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102
-MAXPWM=hwmon3/device/pwm1=255 hwmon3/device/pwm2=255 hwmon3/device/pwm4=255
-THYST=hwmon3/device/pwm1=2 hwmon3/device/pwm2=2 hwmon3/device/pwm4=2
+FCTEMPS=23-004d/pwm1=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp3_input 23-004d/pwm2=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp3_input 23-004d/pwm4=/sys/bus/i2c/devices/11-001a/hwmon/hwmon*/temp3_input
+FCFANS=23-004d/pwm1=23-004d/fan1_input 23-004d/pwm2=23-004d/fan2_input 23-004d/pwm4=23-004d/fan4_input
+MINTEMP=23-004d/pwm1=29 23-004d/pwm2=29 23-004d/pwm4=29
+MAXTEMP=23-004d/pwm1=46 23-004d/pwm2=46 23-004d/pwm4=46
+MINSTART=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MINSTOP=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MINPWM=23-004d/pwm1=102 23-004d/pwm2=102 23-004d/pwm4=102
+MAXPWM=23-004d/pwm1=255 23-004d/pwm2=255 23-004d/pwm4=255
+THYST=23-004d/pwm1=2 23-004d/pwm2=2 23-004d/pwm4=2
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/__init__.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/__init__.py
index d82f3749319c..db1748e44d2c 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/__init__.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/__init__.py
@@ -1,2 +1,2 @@
-__all__ = ["platform", "chassis"]
-from sonic_platform import *
+from . import chassis
+from . import platform
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
index b6e2dea0f67c..de7a246b43f8 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -6,18 +6,12 @@
 #
 #############################################################################
 
-import sys
-import re
-import os
-import subprocess
-import json
-
 try:
+    import sys
     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
     from sonic_platform_base.chassis_base import ChassisBase
-    from sonic_py_common import device_info
+    from .common import Common
     from .event import SfpEvent
-    from .helper import APIHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -38,11 +32,10 @@ class Chassis(ChassisBase):
 
     def __init__(self):
         ChassisBase.__init__(self)
-        self._api_helper = APIHelper()
+        self._api_common = Common()
         self.sfp_module_initialized = False
         self.__initialize_eeprom()
-        self.is_host = self._api_helper.is_host()
-
+        self.is_host = self._api_common.is_host()
 
         if not self.is_host:
             self.__initialize_fan()
@@ -81,8 +74,9 @@ def __initialize_fan(self):
 
     def __initialize_thermals(self):
         from sonic_platform.thermal import Thermal
+        airflow = self.__get_air_flow()
         for index in range(0, NUM_THERMAL):
-            thermal = Thermal(index)
+            thermal = Thermal(index, airflow)
             self._thermal_list.append(thermal)
 
     def __initialize_eeprom(self):
@@ -95,17 +89,11 @@ def __initialize_components(self):
             component = Component(index)
             self._component_list.append(component)
 
-    def __is_host(self):
-        return os.system(HOST_CHK_CMD) == 0
-
-    def __read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            pass
-        return None
+    def __get_air_flow(self):
+        air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(
+            self._api_common.platform) if self.is_host else '/usr/share/sonic/platform/fan_airflow'
+        air_flow = self._api_common.read_txt_file(air_flow_path)
+        return air_flow or 'B2F'
 
     def get_base_mac(self):
         """
@@ -116,6 +104,14 @@ def get_base_mac(self):
         """
         return self._eeprom.get_mac()
 
+    def get_serial_number(self):
+        """
+        Retrieves the hardware serial number for the chassis
+        Returns:
+            A string containing the hardware serial number for this chassis.
+        """
+        return self._eeprom.get_serial()
+
     def get_system_eeprom_info(self):
         """
         Retrieves the full content of system EEPROM information for the chassis
@@ -141,7 +137,7 @@ def get_reboot_cause(self):
         reboot_cause = self.REBOOT_CAUSE_HARDWARE_OTHER
         hw_reboot_cause = self._component_list[0].get_register_value(
             RESET_REGISTER)
-        sw_reboot_cause = self.__read_txt_file(
+        sw_reboot_cause = self._api_common.read_txt_file(
             self._reboot_cause_path) or "Unknown"
 
         if hw_reboot_cause == "0x55":
@@ -151,8 +147,12 @@ def get_reboot_cause(self):
             reboot_cause = self.REBOOT_CAUSE_POWER_LOSS
         elif hw_reboot_cause == "0x33":
             reboot_cause = self.REBOOT_CAUSE_WATCHDOG
+        elif hw_reboot_cause == "0x88":
+            reboot_cause = self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU
+        elif hw_reboot_cause == "0x99":
+            reboot_cause = self.REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC
         else:
-            reboot_cause = self.REBOOT_CAUSE_HARDWARE_OTHER
+            reboot_cause = self.REBOOT_CAUSE_NON_HARDWARE
             description = 'Unknown reason'
 
         return (reboot_cause, description)
@@ -251,6 +251,14 @@ def get_sfp(self, index):
                              index, len(self._sfp_list)))
         return sfp
 
+    ##############################################################
+    ################## ThermalManager methods ####################
+    ##############################################################
+
+    def get_thermal_manager(self):
+        from .thermal_manager import ThermalManager
+        return ThermalManager
+
     ##############################################################
     ###################### Device methods ########################
     ##############################################################
@@ -261,13 +269,13 @@ def get_name(self):
             Returns:
             string: The name of the device
         """
-        return self._api_helper.hwsku
+        return self._api_common.hwsku
 
     def get_presence(self):
         """
-        Retrieves the presence of the Chassis
+        Retrieves the presence of the PSU
         Returns:
-            bool: True if Chassis is present, False if not
+            bool: True if PSU is present, False if not
         """
         return True
 
@@ -285,7 +293,7 @@ def get_serial(self):
         Returns:
             string: Serial number of device
         """
-        return self._eeprom.get_serial()
+        return self.get_serial_number()
 
     def get_status(self):
         """
@@ -294,3 +302,4 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         return True
+
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
new file mode 100644
index 000000000000..84fcafd1bcf0
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
@@ -0,0 +1,283 @@
+import os
+import imp
+import yaml
+import subprocess
+
+from sonic_py_common import device_info
+
+
+class Common:
+
+    DEVICE_PATH = '/usr/share/sonic/device/'
+    PMON_PLATFORM_PATH = '/usr/share/sonic/platform/'
+    CONFIG_DIR = 'sonic_platform_config'
+
+    OUTPUT_SOURCE_IPMI = 'ipmitool'
+    OUTPUT_SOURCE_GIVEN_LIST = 'value_list'
+    OUTPUT_SOURCE_GIVEN_VALUE = 'value'
+    OUTPUT_SOURCE_GIVEN_CLASS = 'class'
+    OUTPUT_SOURCE_SYSFS = 'sysfs_value'
+    OUTPUT_SOURCE_FUNC = 'function'
+    OUTPUT_SOURCE_GIVEN_TXT_FILE = 'txt_file'
+    OUTPUT_SOURCE_GIVEN_VER_HEX_FILE = 'hex_version_file'
+    OUTPUT_SOURCE_GIVEN_VER_HEX_ADDR = 'hex_version_getreg'
+
+    SET_METHOD_IPMI = 'ipmitool'
+    NULL_VAL = 'N/A'
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+    REF_KEY = '$ref:'
+
+    def __init__(self, conf=None):
+        self._main_conf = conf
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+
+    def run_command(self, command):
+        status = False
+        output = ""
+        try:
+            p = subprocess.Popen(
+                command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            raw_data, err = p.communicate()
+            if err == '':
+                status, output = True, raw_data.strip()
+        except Exception:
+            pass
+        return status, output
+
+    def _clean_input(self, input, config):
+        cleaned_input = input
+
+        ai = config.get('avaliable_input')
+        if ai and input not in ai:
+            return None
+
+        input_translator = config.get('input_translator')
+        if type(input_translator) is dict:
+            cleaned_input = input_translator.get(input)
+
+        elif type(input_translator) is str:
+            cleaned_input = eval(input_translator.format(input))
+
+        return cleaned_input
+
+    def _clean_output(self, index, output, config):
+        output_translator = config.get('output_translator')
+
+        if type(output_translator) is dict:
+            output = output_translator.get(output)
+        elif type(output_translator) is str:
+            output = eval(output_translator.format(output))
+        elif type(output_translator) is list:
+            output = eval(output_translator[index].format(output))
+
+        return output
+
+    def _ipmi_get(self, index, config):
+        argument = config.get('argument')
+        cmd = config['command'].format(
+            config['argument'][index]) if argument else config['command']
+        status, output = self.run_command(cmd)
+        return output if status else None
+
+    def _sysfs_read(self, index, config):
+        sysfs_path = config.get('sysfs_path')
+        argument = config.get('argument', '')
+
+        if self.REF_KEY in argument:
+            argument = self._main_conf[argument.split(":")[1]]
+
+        if type(argument) is list:
+            sysfs_path = sysfs_path.format(argument[index])
+
+        content = ""
+        try:
+            content = open(sysfs_path)
+            content = content.readline().rstrip()
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        return content
+
+    def _sysfs_write(self, index, config, input):
+        sysfs_path = config.get('sysfs_path')
+        argument = config.get('argument', '')
+
+        if self.REF_KEY in argument:
+            argument = self._main_conf[argument.split(":")[1]]
+
+        if type(argument) is list:
+            sysfs_path = sysfs_path.format(argument[index])
+
+        write_offset = int(config.get('write_offset', 0))
+        output = ""
+        try:
+            open_file = open(sysfs_path, "r+")
+            open_file.seek(write_offset)
+            open_file.write(input)
+            open_file.close()
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False, output
+        return True, output
+
+    def _ipmi_set(self, index, config, input):
+        arg = config['argument'][index].format(input)
+        return self.run_command(config['command'].format(arg))
+
+    def _hex_ver_decode(self, hver, num_of_bits, num_of_points):
+        ver_list = []
+        c_bit = 0
+        bin_val = bin(int(hver, 16))[2:].zfill(num_of_bits)
+        bit_split = num_of_bits / (num_of_points + 1)
+        for x in range(0, num_of_points+1):
+            split_bin = bin_val[c_bit:c_bit+bit_split]
+            ver_list.append(str(int(split_bin, 2)))
+            c_bit += bit_split
+        return '.'.join(ver_list)
+
+    def _get_class(self, config):
+        """
+        Retreives value of expected attribute
+        Returns:
+            A value of the attribute of object
+        """
+        path = config['host_path'] if self.is_host() else config['pmon_path']
+        module = imp.load_source(config['class'], path)
+        class_ = getattr(module, config['class'])
+        return class_
+
+    def get_reg(self, path, reg_addr):
+        cmd = "echo {1} > {0}; cat {0}".format(path, reg_addr)
+        status, output = self.run_command(cmd)
+        return output if status else None
+
+    def read_txt_file(self, path):
+        with open(path, 'r') as f:
+            output = f.readline()
+        return output.strip('\n')
+
+    def write_txt_file(self, file_path, value):
+        try:
+            with open(file_path, 'w') as fd:
+                fd.write(str(value))
+        except Exception:
+            return False
+        return True
+
+    def is_host(self):
+        return os.system(self.HOST_CHK_CMD) == 0
+
+    def load_json_file(self, path):
+        """
+        Retrieves the json object from json file path
+
+        Returns:
+            A json object
+        """
+        with open(path, 'r') as f:
+            json_data = yaml.safe_load(f)
+
+        return json_data
+
+    def get_config_path(self, config_name):
+        """
+        Retrieves the path to platform api config directory
+
+        Args:
+            config_name: A string containing the name of config file.
+
+        Returns:
+            A string containing the path to json file
+        """
+        return os.path.join(self.DEVICE_PATH, self.platform, self.CONFIG_DIR, config_name) if self.is_host() else os.path.join(self.PMON_PLATFORM_PATH, self.CONFIG_DIR, config_name)
+
+    def get_output(self, index, config, default):
+        """
+        Retrieves the output for each function base on config
+
+        Args:
+            index: An integer containing the index of device.
+            config: A dict object containing the configuration of specified function.
+            default: A string containing the default output of specified function.
+
+        Returns:
+            A string containing the output of specified function in config
+        """
+        output_source = config.get('output_source')
+
+        if output_source == self.OUTPUT_SOURCE_IPMI:
+            output = self._ipmi_get(index, config)
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_VALUE:
+            output = config["value"]
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_CLASS:
+            output = self._get_class(config)
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_LIST:
+            output = config["value_list"][index]
+
+        elif output_source == self.OUTPUT_SOURCE_SYSFS:
+            output = self._sysfs_read(index, config)
+
+        elif output_source == self.OUTPUT_SOURCE_FUNC:
+            func_conf = self._main_conf[config['function'][index]]
+            output = self.get_output(index, func_conf, default)
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_TXT_FILE:
+            path = config.get('path')
+            output = self.read_txt_file(path)
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_VER_HEX_FILE:
+            path = config.get('path')
+            hex_ver = self.read_txt_file(path)
+            output = self._hex_ver_decode(
+                hex_ver, config['num_of_bits'], config['num_of_points'])
+
+        elif output_source == self.OUTPUT_SOURCE_GIVEN_VER_HEX_ADDR:
+            path = config.get('path')
+            addr = config.get('reg_addr')
+            hex_ver = self.get_reg(path, addr)
+            output = self._hex_ver_decode(
+                hex_ver, config['num_of_bits'], config['num_of_points'])
+
+        else:
+            output = default
+
+        return self._clean_output(index, output, config) or default
+
+    def set_output(self, index, input, config):
+        """
+        Sets the output of specified function on config
+
+        Args:
+            config: A dict object containing the configuration of specified function.
+            index: An integer containing the index of device.
+            input: A string containing the input of specified function.
+
+        Returns:
+            bool: True if set function is successfully, False if not
+        """
+        cleaned_input = self._clean_input(input, config)
+        if not cleaned_input:
+            return False
+
+        set_method = config.get('set_method')
+        if set_method == self.SET_METHOD_IPMI:
+            output = self._ipmi_set(index, config, cleaned_input)[0]
+        elif set_method == self.OUTPUT_SOURCE_SYSFS:
+            output = self._sysfs_write(index, config, cleaned_input)[0]
+        else:
+            output = False
+
+        return output
+
+    def get_event(self, timeout, config, sfp_list):
+        """
+        Returns a nested dictionary containing all devices which have
+        experienced a change at chassis level
+
+        """
+        event_class = self._get_class(config)
+        return event_class(sfp_list).get_event(timeout)
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
index 7fdfc8756a4d..8d2829f90c01 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
@@ -6,7 +6,6 @@
 #
 #############################################################################
 
-import json
 import os.path
 import shutil
 import shlex
@@ -49,7 +48,7 @@ def __run_command(self, command):
             rc = process.poll()
             if rc != 0:
                 return False
-        except:
+        except Exception:
             return False
         return True
 
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
index 0058fccfa0ca..c31d29f2caef 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
@@ -8,11 +8,9 @@
 #############################################################################
 
 try:
-    import glob
     import os
     import sys
     import re
-    from array import array
 
     if sys.version_info.major == 3:
         from io import StringIO
@@ -52,7 +50,7 @@ def __parse_output(self, decode_output):
                     value = match.group(3).rstrip('\0')
 
                 _eeprom_info_dict[idx] = value
-            except:
+            except Exception:
                 pass
         return _eeprom_info_dict
 
@@ -61,7 +59,7 @@ def _load_eeprom(self):
         sys.stdout = StringIO()
         try:
             self.read_eeprom_db()
-        except:
+        except Exception:
             decode_output = sys.stdout.getvalue()
             sys.stdout = original_stdout
             return self.__parse_output(decode_output)
@@ -73,7 +71,7 @@ def _load_eeprom(self):
         if not os.path.exists(CACHE_ROOT):
             try:
                 os.makedirs(CACHE_ROOT)
-            except:
+            except Exception:
                 pass
 
         #
@@ -82,7 +80,7 @@ def _load_eeprom(self):
         #
         try:
             self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
-        except:
+        except Exception:
             pass
 
         e = self.read_eeprom()
@@ -91,7 +89,7 @@ def _load_eeprom(self):
 
         try:
             self.update_cache(e)
-        except:
+        except Exception:
             pass
 
         self.decode_eeprom(e)
@@ -112,3 +110,6 @@ def get_serial(self):
 
     def get_mac(self):
         return self._eeprom.get('0x24', "Undefined.")
+
+    def get_pn(self):
+        return self._eeprom.get('0x21', "Undefined.")
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
index cebed613db92..c066cb9c33fc 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
@@ -6,12 +6,12 @@
 #
 #############################################################################
 
-import json
 import math
 import os.path
 
 try:
     from sonic_platform_base.fan_base import FanBase
+    from .common import Common
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -67,24 +67,9 @@ def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
             self.STATUS_LED_COLOR_RED: "amber",
             self.STATUS_LED_COLOR_OFF: "off"
         }
-        FanBase.__init__(self)
 
-    def __read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            pass
-        return ""
-
-    def __write_txt_file(self, file_path, value):
-        try:
-            with open(file_path, 'w') as fd:
-                fd.write(str(value))
-        except:
-            return False
-        return True
+        self._api_common = Common()
+        FanBase.__init__(self)
 
     def __search_file_by_name(self, directory, file_name):
         for dirpath, dirnames, files in os.walk(directory):
@@ -105,7 +90,8 @@ def get_direction(self):
         if not self.is_psu_fan:
             fan_direction_file = (FAN_PATH +
                                   self.fan_e1031_direction.format(self.fan_tray_index+1))
-            raw = self.__read_txt_file(fan_direction_file).strip('\r\n')
+            raw = self._api_common.read_txt_file(
+                fan_direction_file).strip('\r\n')
             direction = self.FAN_DIRECTION_INTAKE if str(
                 raw).upper() == "F2B" else self.FAN_DIRECTION_EXHAUST
 
@@ -126,8 +112,8 @@ def get_speed(self):
             fan_speed_sysfs_name = "fan{}_input".format(self.fan_index+1)
             fan_speed_sysfs_path = self.__search_file_by_name(
                 self.psu_hwmon_path, fan_speed_sysfs_name)
-            fan_speed_rpm = self.__read_txt_file(fan_speed_sysfs_path) or 0
-            fan_speed_raw = float(fan_speed_rpm)/PSU_FAN_MAX_RPM * 100
+            fan_speed_rpm = self._api_common.read_txt_file(
+                fan_speed_sysfs_path) or 0
             speed = math.ceil(float(fan_speed_rpm) * 100 / PSU_FAN_MAX_RPM)
         elif self.get_presence():
             chip = self.emc2305_chip_mapping[self.fan_index]
@@ -136,7 +122,7 @@ def get_speed(self):
             sysfs_path = "%s%s/%s" % (
                 EMC2305_PATH, device, EMC2305_FAN_INPUT)
             sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
-            raw = self.__read_txt_file(sysfs_path).strip('\r\n')
+            raw = self._api_common.read_txt_file(sysfs_path).strip('\r\n')
             pwm = int(raw, 10) if raw else 0
             speed = math.ceil(float(pwm * 100 / EMC2305_MAX_PWM))
 
@@ -163,7 +149,7 @@ def get_target_speed(self):
             sysfs_path = "%s%s/%s" % (
                 EMC2305_PATH, device, EMC2305_FAN_TARGET)
             sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
-            raw = self.__read_txt_file(sysfs_path).strip('\r\n')
+            raw = self._api_common.read_txt_file(sysfs_path).strip('\r\n')
             pwm = int(raw, 10) if raw else 0
             target = math.ceil(float(pwm) * 100 / EMC2305_MAX_PWM)
 
@@ -202,7 +188,7 @@ def set_speed(self, speed):
             sysfs_path = "%s%s/%s" % (
                 EMC2305_PATH, device, EMC2305_FAN_PWM)
             sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
-            return self.__write_txt_file(sysfs_path, int(pwm))
+            return self._api_common.write_txt_file(sysfs_path, int(pwm))
 
         return False
 
@@ -220,7 +206,7 @@ def set_status_led(self, color):
             fan_led_file = (FAN_PATH +
                             self.fan_e1031_led.format(self.fan_tray_index+1))
 
-            set_status_led = self.__write_txt_file(
+            set_status_led = self._api_common.write_txt_file(
                 fan_led_file, self.fan_e1031_led_col_map[color]) if self.get_presence() else False
 
         return set_status_led
@@ -244,14 +230,55 @@ def get_presence(self):
         """
         fan_direction_file = (FAN_PATH +
                               self.fan_e1031_presence.format(self.fan_tray_index+1))
-        present_str = self.__read_txt_file(fan_direction_file) or '1'
+        present_str = self._api_common.read_txt_file(fan_direction_file) or '1'
 
         return int(present_str) == 0 if not self.is_psu_fan else True
 
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        if self.is_psu_fan:
+            return NULL_VAL
+
+        model = NULL_VAL
+        return model
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        if self.is_psu_fan:
+            return NULL_VAL
+
+        serial = NULL_VAL
+        return serial
+
     def get_status(self):
         """
         Retrieves the operational status of the device
         Returns:
             A boolean value, True if device is operating properly, False if not
         """
-        return self.get_presence() and self.get_speed() > 0
\ No newline at end of file
+        status = 1
+        if self.is_psu_fan:
+            fan_fault_sysfs_name = "fan1_fault"
+            fan_fault_sysfs_path = self.__search_file_by_name(
+                self.psu_hwmon_path, fan_fault_sysfs_name)
+            status = self._api_common.read_txt_file(fan_fault_sysfs_path)
+
+        elif self.get_presence():
+            chip = self.emc2305_chip_mapping[self.fan_index]
+            device = chip['device']
+            fan_index = chip['index_map']
+            sysfs_path = "%s%s/%s" % (
+                EMC2305_PATH, device, 'fan{}_fault')
+            sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
+            status = self._api_common.read_txt_file(sysfs_path)
+
+        return False if int(status) != 0 else True
+
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
index 27d70f123c59..ccc63c8ac9ae 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
@@ -7,7 +7,6 @@
 #############################################################################
 
 import os.path
-import sonic_platform
 
 try:
     from sonic_platform_base.psu_base import PsuBase
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
index 36ee9cbc01a0..91e5fec65ffc 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
@@ -8,7 +8,6 @@
 
 import os
 import time
-import subprocess
 from ctypes import create_string_buffer
 
 try:
@@ -159,7 +158,7 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
             raw = sysfsfile_eeprom.read(num_bytes)
             for n in range(0, num_bytes):
                 eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
-        except:
+        except Exception:
             pass
         finally:
             if sysfsfile_eeprom:
@@ -469,7 +468,6 @@ def get_tx_disable(self):
             A Boolean, True if tx_disable is enabled, False if disabled
         """
         tx_disable = False
-        tx_fault = False
         status_control_raw = self.__read_eeprom_specific_bytes(
             SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
         if status_control_raw:
@@ -602,7 +600,7 @@ def tx_disable(self, tx_disable):
                 # Write to eeprom
                 sysfsfile_eeprom.seek(SFP_STATUS_CONTROL_OFFSET)
                 sysfsfile_eeprom.write(buffer[0])
-            except:
+            except Exception:
                 #print("Error: unable to open file: %s" % str(e))
                 return False
             finally:
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
index 6c73845287cd..2235b4c6572a 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
@@ -6,16 +6,90 @@
 #
 #############################################################################
 
-import os
-import re
-import os.path
-
 try:
+    import os
     from sonic_platform_base.thermal_base import ThermalBase
+    from .common import Common
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 
+THERMAL_INFO = {
+    0: {
+        "F2B_max": 55.000,
+        "F2B_max_crit": 58.000,
+        "B2F_max": 55.000,
+        "B2F_max_crit": 58.000,
+        "postion": "asic",
+        "name": "Inlet ambient sensor (Rear to Front)",
+        "ss_index": 1,
+        "i2c_path": "i2c-11/11-001a/hwmon",    # U7273
+    },
+    1: {
+        "F2B_max": 85.000,
+        "F2B_max_crit": 90.000,
+        "B2F_max": 85.000,
+        "B2F_max_crit": 90.000,
+        "postion": "asic",
+        "name": "Helix shutdown sensor (Rear to Front)",
+        "ss_index": 2,
+        "i2c_path": "i2c-11/11-001a/hwmon",    # Q7000
+    },
+    2: {
+        "F2B_max": 55.000,
+        "F2B_max_crit": 58.000,
+        "B2F_max": 55.000,
+        "B2F_max_crit": 58.000,
+        "postion": "asic",
+        "name": "Inlet ambient sensor (Front to Rear, right)",
+        "ss_index": 3,
+        "i2c_path": "i2c-11/11-001a/hwmon",    # Q7001
+    },
+    3: {
+        "F2B_max": 85.000,
+        "F2B_max_crit": 90.000,
+        "B2F_max": 85.000,
+        "B2F_max_crit": 90.000,
+        "postion": "asic",
+        "name": "Helix shutdown sensor (Front to Rear)",
+        "ss_index": 4,
+        "i2c_path": "i2c-11/11-001a/hwmon",  # Q7751
+    },
+    4: {
+        "F2B_max": 55.000,
+        "F2B_max_crit": 58.000,
+        "B2F_max": 55.000,
+        "B2F_max_crit": 58.000,
+        "postion": "cpu",
+        "name": "Inlet ambient sensor (Front to Rear, left)",
+        "ss_index": 5,
+        "i2c_path": "i2c-11/11-001a/hwmon"   # Q7752
+    },
+    5: {
+        "F2B_max": 90.000,
+        "F2B_max_crit": 95.000,
+        "B2F_max": 90.000,
+        "B2F_max_crit": 95.000,
+        "postion": "cpu",
+        "name": "CPU errata sensor (Front to Rear)",
+        "ss_index": 2,
+        "i2c_path": "i2c-3/3-001a/hwmon"   # Q5
+    },
+    6: {
+        "F2B_max": 90.000,
+        "F2B_max_crit": 95.000,
+        "B2F_max": 90.000,
+        "B2F_max_crit": 95.000,
+        "postion": "cpu",
+        "name": "CPU errata sensor (Rear to Front)",
+        "ss_index": 3,
+        "i2c_path": "i2c-3/3-001a/hwmon"   # Q6
+    }
+}
+NULL_VAL = "N/A"
+I2C_ADAPTER_PATH = "/sys/class/i2c-adapter"
+
+
 class Thermal(ThermalBase):
     """Platform-specific Thermal class"""
 
@@ -24,57 +98,33 @@ class Thermal(ThermalBase):
     CPUBOARD_SS_PATH = "/sys/class/i2c-adapter/i2c-3/3-001a/hwmon/hwmon1"
     SS_CONFIG_PATH = "/usr/share/sonic/device/x86_64-cel_e1031-r0/sensors.conf"
 
-    def __init__(self, thermal_index):
+    def __init__(self, thermal_index, airflow):
         ThermalBase.__init__(self)
-
         self.index = thermal_index
+        self._api_common = Common()
+
+        self._airflow = airflow
+        self._thermal_info = THERMAL_INFO[self.index]
+        self._hwmon_path = self._get_hwmon_path()
+        self._ss_index = self._thermal_info["ss_index"]
 
-        # Add thermal name
-        self.THERMAL_NAME_LIST.append("Rear  panel-Inlet ambient sensor")
-        self.THERMAL_NAME_LIST.append("Rear  panel-Helix shutdown sensor")
-        self.THERMAL_NAME_LIST.append(
-            "Front panel-Inlet ambient sensor (right)")
-        self.THERMAL_NAME_LIST.append("Front panel-Helix shutdown sensor")
-        self.THERMAL_NAME_LIST.append(
-            "Front panel-Inlet ambient sensor (left)")
-        self.THERMAL_NAME_LIST.append("CPU board temperature sensor : 1")
-        self.THERMAL_NAME_LIST.append("CPU board temperature sensor : 2")
-
-        # Set hwmon path
-        self.ss_index, self.hwmon_path = self.__get_ss_info(self.index)
-        self.ss_key = self.THERMAL_NAME_LIST[self.index]
-
-    def __get_ss_info(self, index):
-        if self.index <= 4:
-            ss_path = self.MAINBOARD_SS_PATH
-            ss_index = index+1
-        else:
-            ss_path = self.CPUBOARD_SS_PATH
-            ss_index = index-3
-        return ss_index, ss_path
-
-    def __read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            raise IOError("Unable to open %s file !" % file_path)
-
-    def __get_temp(self, temp_file):
-        temp_file_path = os.path.join(self.hwmon_path, temp_file)
-        raw_temp = self.__read_txt_file(temp_file_path)
+        self.name = self.get_name()
+        self.postion = self._thermal_info["postion"]
+
+    def _get_hwmon_path(self):
+        hwmon_path = os.path.join(I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
+        hwmon_dir = os.listdir(hwmon_path)[0]
+        return os.path.join(hwmon_path, hwmon_dir)
+
+    def _get_temp(self, temp_file):
+        temp_file_path = os.path.join(self._hwmon_path, temp_file)
+        raw_temp = self._api_common.read_txt_file(temp_file_path)
         temp = float(raw_temp)/1000
-        return "{:.3f}".format(temp)
+        return float("{:.3f}".format(temp))
 
-    def __set_threshold(self, file_name, temperature):
-        temp_file_path = os.path.join(self.hwmon_path, file_name)
-        try:
-            with open(temp_file_path, 'w') as fd:
-                fd.write(str(temperature))
-            return True
-        except IOError:
-            return False
+    def _set_threshold(self, file_name, temperature):
+        temp_file_path = os.path.join(self._hwmon_path, file_name)
+        return self._api_common.write_txt_file(temp_file_path, str(temperature))
 
     def get_temperature(self):
         """
@@ -83,8 +133,8 @@ def get_temperature(self):
             A float number of current temperature in Celsius up to nearest thousandth
             of one degree Celsius, e.g. 30.125
         """
-        temp_file = "temp{}_input".format(self.ss_index)
-        return self.__get_temp(temp_file)
+        temp_file = "temp{}_input".format(self._ss_index)
+        return self._get_temp(temp_file)
 
     def get_high_threshold(self):
         """
@@ -93,8 +143,17 @@ def get_high_threshold(self):
             A float number, the high threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        temp_file = "temp{}_max".format(self.ss_index)
-        return self.__get_temp(temp_file)
+        max_crit_key = '{}_max'.format(self._airflow)
+        return self._thermal_info.get(max_crit_key, None)
+
+    def get_low_threshold(self):
+        """
+        Retrieves the low threshold temperature of thermal
+        Returns:
+            A float number, the low threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return 0.0
 
     def set_high_threshold(self, temperature):
         """
@@ -105,8 +164,8 @@ def set_high_threshold(self, temperature):
         Returns:
             A boolean, True if threshold is set successfully, False if not
         """
-        temp_file = "temp{}_max".format(self.ss_index)
-        is_set = self.__set_threshold(temp_file, int(temperature*1000))
+        temp_file = "temp{}_max".format(self._ss_index)
+        is_set = self._set_threshold(temp_file, int(temperature*1000))
         file_set = False
         if is_set:
             try:
@@ -115,7 +174,7 @@ def set_high_threshold(self, temperature):
                     f.seek(0)
                     ss_found = False
                     for idx, val in enumerate(content):
-                        if self.ss_key in val:
+                        if self.name in val:
                             ss_found = True
                         elif ss_found and temp_file in val:
                             content[idx] = "        set {} {}\n".format(
@@ -128,13 +187,43 @@ def set_high_threshold(self, temperature):
 
         return is_set & file_set
 
+    def set_low_threshold(self, temperature):
+        """
+        Sets the low threshold temperature of thermal
+        Args : 
+            temperature: A float number up to nearest thousandth of one degree Celsius,
+            e.g. 30.125
+        Returns:
+            A boolean, True if threshold is set successfully, False if not
+        """
+        return False
+
+    def get_high_critical_threshold(self):
+        """
+        Retrieves the high critical threshold temperature of thermal
+        Returns:
+            A float number, the high critical threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        max_crit_key = '{}_max_crit'.format(self._airflow)
+        return self._thermal_info.get(max_crit_key, None)
+
+    def get_low_critical_threshold(self):
+        """
+        Retrieves the low critical threshold temperature of thermal
+        Returns:
+            A float number, the low critical threshold temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        return 0.0
+
     def get_name(self):
         """
         Retrieves the name of the thermal device
             Returns:
             string: The name of the thermal device
         """
-        return self.THERMAL_NAME_LIST[self.index]
+        return self._thermal_info["name"]
 
     def get_presence(self):
         """
@@ -142,10 +231,26 @@ def get_presence(self):
         Returns:
             bool: True if PSU is present, False if not
         """
-        temp_file = "temp{}_input".format(self.ss_index)
-        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        temp_file = "temp{}_input".format(self._ss_index)
+        temp_file_path = os.path.join(self._hwmon_path, temp_file)
         return os.path.isfile(temp_file_path)
 
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return NULL_VAL
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return NULL_VAL
+
     def get_status(self):
         """
         Retrieves the operational status of the device
@@ -155,10 +260,10 @@ def get_status(self):
         if not self.get_presence():
             return False
 
-        fault_file = "temp{}_fault".format(self.ss_index)
-        fault_file_path = os.path.join(self.hwmon_path, fault_file)
+        fault_file = "temp{}_fault".format(self._ss_index)
+        fault_file_path = os.path.join(self._hwmon_path, fault_file)
         if not os.path.isfile(fault_file_path):
             return True
 
-        raw_txt = self.__read_txt_file(fault_file_path)
+        raw_txt = self._api_common.read_txt_file(fault_file_path)
         return int(raw_txt) == 0
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_actions.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_actions.py
new file mode 100644
index 000000000000..75307d291496
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_actions.py
@@ -0,0 +1,78 @@
+from sonic_platform_base.sonic_thermal_control.thermal_action_base import ThermalPolicyActionBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+from .thermal_infos import ChassisInfo
+from .common import Common
+
+
+@thermal_json_object('thermal_control.control')
+class ControlThermalAlgoAction(ThermalPolicyActionBase):
+    """
+    Action to control the thermal control algorithm
+    """
+    # JSON field definition
+    JSON_FIELD_STATUS = 'status'
+
+    def __init__(self):
+        self.status = True
+
+    def load_from_json(self, json_obj):
+        """
+        Construct ControlThermalAlgoAction via JSON. JSON example:
+            {
+                "type": "thermal_control.control"
+                "status": "true"
+            }
+        :param json_obj: A JSON object representing a ControlThermalAlgoAction action.
+        :return:
+        """
+        if ControlThermalAlgoAction.JSON_FIELD_STATUS in json_obj:
+            status_str = json_obj[ControlThermalAlgoAction.JSON_FIELD_STATUS].lower(
+            )
+            if status_str == 'true':
+                self.status = True
+            elif status_str == 'false':
+                self.status = False
+            else:
+                raise ValueError('Invalid {} field value, please specify true of false'.
+                                 format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
+        else:
+            raise ValueError('ControlThermalAlgoAction '
+                             'missing mandatory field {} in JSON policy file'.
+                             format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
+
+    def execute(self, thermal_info_dict):
+        """
+        Disable thermal control algorithm
+        :param thermal_info_dict: A dictionary stores all thermal information.
+        :return:
+        """
+        if ChassisInfo.INFO_NAME in thermal_info_dict:
+            chassis_info_obj = thermal_info_dict[ChassisInfo.INFO_NAME]
+            chassis = chassis_info_obj.get_chassis()
+            thermal_manager = chassis.get_thermal_manager()
+            if self.status:
+                thermal_manager.start_thermal_control_algorithm()
+            else:
+                thermal_manager.stop_thermal_control_algorithm()
+
+
+@thermal_json_object('switch.power_cycling')
+class SwitchPolicyAction(ThermalPolicyActionBase):
+    """
+    Base class for thermal action. Once all thermal conditions in a thermal policy are matched,
+    all predefined thermal action will be executed.
+    """
+
+    def execute(self, thermal_info_dict):
+        """
+        Take action when thermal condition matches. For example, power cycle the switch.
+        :param thermal_info_dict: A dictionary stores all thermal information.
+        :return:
+        """
+        thermal_overload_position_path = '/tmp/thermal_overload_position'
+        thermal_overload_position = Common().read_txt_file(
+            thermal_overload_position_path)
+
+        cmd = 'bash /usr/share/sonic/platform/thermal_overload_control.sh {}'.format(
+            thermal_overload_position)
+        Common().run_command(cmd)
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_conditions.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_conditions.py
new file mode 100644
index 000000000000..ea7b759211fb
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_conditions.py
@@ -0,0 +1,78 @@
+from sonic_platform_base.sonic_thermal_control.thermal_condition_base import ThermalPolicyConditionBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+
+
+class FanCondition(ThermalPolicyConditionBase):
+    def get_fan_info(self, thermal_info_dict):
+        from .thermal_infos import FanInfo
+        if FanInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[FanInfo.INFO_NAME], FanInfo):
+            return thermal_info_dict[FanInfo.INFO_NAME]
+        else:
+            return None
+
+
+@thermal_json_object('fan.any.absence')
+class AnyFanAbsenceCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_absence_fans()) > 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.any.fault')
+class AnyFanFaultCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_fault_fans()) > 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.all.presence')
+class AllFanPresenceCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_absence_fans()) == 0 if fan_info_obj else False
+
+
+@thermal_json_object('fan.all.good')
+class AllFanGoodCondition(FanCondition):
+    def is_match(self, thermal_info_dict):
+        fan_info_obj = self.get_fan_info(thermal_info_dict)
+        return len(fan_info_obj.get_fault_fans()) == 0 if fan_info_obj else False
+
+
+class ThermalCondition(ThermalPolicyConditionBase):
+    def get_thermal_info(self, thermal_info_dict):
+        from .thermal_infos import ThermalInfo
+        if ThermalInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[ThermalInfo.INFO_NAME], ThermalInfo):
+            return thermal_info_dict[ThermalInfo.INFO_NAME]
+        else:
+            return None
+
+
+@thermal_json_object('thermal.over.high_threshold')
+class ThermalOverHighCriticalCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return thermal_info_obj.is_over_high_threshold()
+        else:
+            return False
+
+
+@thermal_json_object('thermal.over.high_critical_threshold')
+class ThermalOverHighCriticalCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return thermal_info_obj.is_over_high_critical_threshold()
+        else:
+            return False
+
+
+@thermal_json_object('thermal.all.good')
+class ThermalGoodCondition(ThermalCondition):
+    def is_match(self, thermal_info_dict):
+        thermal_info_obj = self.get_thermal_info(thermal_info_dict)
+        if thermal_info_obj:
+            return not thermal_info_obj.is_over_threshold()
+        else:
+            return False
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_infos.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_infos.py
new file mode 100644
index 000000000000..c493ceb655bc
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_infos.py
@@ -0,0 +1,165 @@
+from sonic_platform_base.sonic_thermal_control.thermal_info_base import ThermalPolicyInfoBase
+from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
+from .common import Common
+import time
+
+
+@thermal_json_object('fan_info')
+class FanInfo(ThermalPolicyInfoBase):
+    """
+    Fan information needed by thermal policy
+    """
+
+    # Fan information name
+    INFO_NAME = 'fan_info'
+
+    def __init__(self):
+        self._absence_fans = set()
+        self._presence_fans = set()
+        self._fault_fans = set()
+        self._status_changed = False
+
+    def collect(self, chassis):
+        """
+        Collect absence and presence fans.
+        :param chassis: The chassis object
+        :return:
+        """
+        self._status_changed = False
+        for fan in chassis.get_all_fans():
+            presence = fan.get_presence()
+            status = fan.get_status()
+            if presence and fan not in self._presence_fans:
+                self._presence_fans.add(fan)
+                self._status_changed = True
+                if fan in self._absence_fans:
+                    self._absence_fans.remove(fan)
+            elif not presence and fan not in self._absence_fans:
+                self._absence_fans.add(fan)
+                self._status_changed = True
+                if fan in self._presence_fans:
+                    self._presence_fans.remove(fan)
+
+            if not status and fan not in self._fault_fans:
+                self._fault_fans.add(fan)
+                self._status_changed = True
+
+            elif status and fan in self._fault_fans:
+                self._fault_fans.remove(fan)
+                self._status_changed = True
+
+    def get_absence_fans(self):
+        """
+        Retrieves absence fans
+        :return: A set of absence fans
+        """
+        return self._absence_fans
+
+    def get_presence_fans(self):
+        """
+        Retrieves presence fans
+        :return: A set of presence fans
+        """
+        return self._presence_fans
+
+    def get_fault_fans(self):
+        """
+        Retrieves fault fans
+        :return: A set of fault fans
+        """
+        return self._fault_fans
+
+    def is_status_changed(self):
+        """
+        Retrieves if the status of fan information changed
+        :return: True if status changed else False
+        """
+        return self._status_changed
+
+
+@thermal_json_object('thermal_info')
+class ThermalInfo(ThermalPolicyInfoBase):
+    """
+    Thermal information needed by thermal policy
+    """
+
+    # Fan information name
+    INFO_NAME = 'thermal_info'
+
+    def collect(self, chassis):
+        """
+        Collect thermal sensor temperature change status
+        :param chassis: The chassis object
+        :return:
+        """
+        self._over_high_threshold = False
+        self._over_high_critical_threshold = False
+        self._thermal_overload_position = 'cpu'
+
+        # Calculate average temp within the device
+        temp = 0
+        num_of_thermals = chassis.get_num_thermals()
+        for index in range(num_of_thermals):
+            thermal = chassis.get_thermal(index)
+            temp = thermal.get_temperature()
+            high_threshold = thermal.get_high_threshold()
+            high_critical_threshold = thermal.get_high_critical_threshold()
+
+            if high_threshold and temp > high_threshold:
+                self._over_high_threshold = True
+
+            if high_critical_threshold and temp > high_critical_threshold:
+                self._thermal_overload_position = thermal.postion
+                self._over_high_critical_threshold = True
+
+    def is_over_threshold(self):
+        """
+        Retrieves if the temperature is over any threshold
+        :return: True if the temperature is over any threshold else False
+        """
+        return self._over_high_threshold or self._over_high_critical_threshold
+
+    def is_over_high_critical_threshold(self):
+        """
+        Retrieves if the temperature is over high critical threshold
+        :return: True if the temperature is over high critical threshold else False
+        """
+        thermal_overload_position_path = '/tmp/thermal_overload_position'
+        if self._over_high_critical_threshold:
+            Common().write_txt_file(thermal_overload_position_path,
+                                    self._thermal_overload_position)
+            time.sleep(1)
+        return self._over_high_critical_threshold
+
+    def is_over_high_threshold(self):
+        """
+        Retrieves if the temperature is over high threshold
+        :return: True if the temperature is over high threshold else False
+        """
+        return self._over_high_threshold
+
+
+@thermal_json_object('chassis_info')
+class ChassisInfo(ThermalPolicyInfoBase):
+    """
+    Chassis information needed by thermal policy
+    """
+    INFO_NAME = 'chassis_info'
+
+    def __init__(self):
+        self._chassis = None
+
+    def collect(self, chassis):
+        """
+        Collect platform chassis.
+        :param chassis: The chassis object
+        :return:
+        """
+        self._chassis = chassis
+
+    def get_chassis(self):
+        """
+        Retrieves platform chassis object
+        :return: A platform chassis object.
+        """
+        return self._chassis
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_manager.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_manager.py
new file mode 100644
index 000000000000..2e379f8c2a2d
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal_manager.py
@@ -0,0 +1,47 @@
+from sonic_platform_base.sonic_thermal_control.thermal_manager_base import ThermalManagerBase
+from .common import Common
+from .thermal_actions import *
+from .thermal_conditions import *
+from .thermal_infos import *
+
+
+class ThermalManager(ThermalManagerBase):
+    FSC_ALGORITHM_CMD = ' supervisorctl {} fancontrol'
+
+    @classmethod
+    def start_thermal_control_algorithm(cls):
+        """
+        Start vendor specific thermal control algorithm. The default behavior of this function is a no-op.
+        :return:
+        """
+        return cls._enable_fancontrol_service(True)
+
+    @classmethod
+    def stop_thermal_control_algorithm(cls):
+        """
+        Stop thermal control algorithm
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        return cls._enable_fancontrol_service(False)
+
+    @classmethod
+    def deinitialize(cls):
+        """
+        Destroy thermal manager, including any vendor specific cleanup. The default behavior of this function
+        is a no-op.
+        :return:
+        """
+        return cls._enable_fancontrol_service(True)
+
+    @classmethod
+    def _enable_fancontrol_service(cls, enable):
+        """
+        Control thermal by fcs algorithm
+        Args:
+            enable: Bool, indicate enable the algorithm or not
+        Returns:
+            bool: True if set success, False if fail.
+        """
+        cmd = 'start' if enable else 'stop'
+        return Common().run_command(cls.FSC_ALGORITHM_CMD.format(cmd))
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
index 6db0508cb845..62f325655cac 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
@@ -4,11 +4,8 @@
 # Watchdog contains an implementation of SONiC Platform Base API
 #
 #############################################################################
-import ctypes
 import fcntl
 import os
-import subprocess
-import time
 import array
 
 try:
diff --git a/device/celestica/x86_64-cel_e1031-r0/thermal_overload_control.sh b/device/celestica/x86_64-cel_e1031-r0/thermal_overload_control.sh
new file mode 100755
index 000000000000..67ca9b9a2e66
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/thermal_overload_control.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Copyright 2020-present Celestica. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
+SETREG_FILE=/sys/devices/platform/e1031.smc/setreg
+TOVERREG=0x115
+CPUOVER=0xa1
+ASICOVER=0xa2
+
+prog="$0"
+command="$1"
+
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root"
+    exit 1
+fi
+
+usage() {
+    echo "Usage: thermal_overload_control.sh [option] <command>"
+    echo
+    echo "Options:"
+    echo "  -h, --help          : to print this message."
+    echo
+    echo "Commands:"
+    echo
+    echo "  cpu:  To enabling CPU thermal overload handler"
+    echo
+    echo "  asic : To enabling ASIC thermal overload handler"
+    echo
+}
+
+cpu_overload() {
+	logger "Enable CPU thermal overload control"
+	set_reg=`echo ${TOVERREG} ${CPUOVER} > ${SETREG_FILE}`
+}
+
+asic_overload() {
+	logger "Enable ASIC thermal overload control"
+	set_reg=`echo ${TOVERREG} ${ASICOVER} > ${SETREG_FILE}`
+}
+
+if [ $# -lt 1 ]; then
+    usage
+    exit -1
+fi
+
+case "$command" in
+-h | --help)
+    usage
+    ;;
+cpu)
+	cpu_overload
+	;;
+asic)
+	asic_overload
+	;;
+*)
+	usage
+	exit -1
+	;;
+esac
+
+exit $?
diff --git a/device/celestica/x86_64-cel_e1031-r0/thermal_policy.json b/device/celestica/x86_64-cel_e1031-r0/thermal_policy.json
new file mode 100644
index 000000000000..276fede0b044
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/thermal_policy.json
@@ -0,0 +1,93 @@
+{
+    "thermal_control_algorithm": {
+        "run_at_boot_up": "true"
+    },
+    "info_types": [
+        {
+            "type": "chassis_info"
+        },
+        {
+            "type": "fan_info"
+        },
+        {
+            "type": "thermal_info"
+        }
+    ],
+    "policies": [
+        {
+            "name": "any fan absence",
+            "conditions": [
+                {
+                    "type": "fan.any.absence"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "any fan broken",
+            "conditions": [
+                {
+                    "type": "fan.any.fault"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "any thermal over threshold",
+            "conditions": [
+                {
+                    "type": "thermal.over.high_threshold"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                }
+            ]
+        },
+        {
+            "name": "temp over high critical threshold",
+            "conditions": [
+                {
+                    "type": "thermal.over.high_critical_threshold"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "switch.power_cycling"
+                }
+            ]
+        },
+        {
+            "name": "all fan presence / thermal no warning",
+            "conditions": [
+                {
+                    "type": "fan.all.presence"
+                },
+                {
+                    "type": "fan.all.good"
+                },
+                {
+                    "type": "thermal.all.good"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "true"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
index 80964d5338af..5c73be6ee50c 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
@@ -53,9 +53,12 @@ start)
         echo max6699 0x1a > /sys/bus/i2c/devices/i2c-3/new_device
         echo max6699 0x1a > /sys/bus/i2c/devices/i2c-11/new_device
 
+        ## TODO: fix dps200 driver cause kernel panic issue
+        # https://github.com/Azure/sonic-buildimage/issues/6602
+
         # Attach PSUs
-        echo dps200 0x5a > /sys/bus/i2c/devices/i2c-12/new_device
-        echo dps200 0x5b > /sys/bus/i2c/devices/i2c-13/new_device
+        # echo dps200 0x5a > /sys/bus/i2c/devices/i2c-12/new_device
+        # echo dps200 0x5b > /sys/bus/i2c/devices/i2c-13/new_device
 
         # Attach fans
         echo emc2305 0x4d > /sys/bus/i2c/devices/i2c-23/new_device
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
index 1ebafb7fdabb..57ac1be34152 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst
@@ -1,12 +1,15 @@
 depmod -a
+
 sudo chmod +x /usr/local/bin/udev_prefix.sh
 sudo chmod +x /usr/local/bin/popmsg.sh
 sudo chmod +x /usr/local/bin/reload_udev.sh
+
+/usr/local/bin/platform_api_mgnt.sh install
+/etc/init.d/fancontrol.sh install
+/usr/local/bin/reload_udev.sh
+
 systemctl enable platform-modules-haliburton.service
 systemctl enable fancontrol.service
 
 systemctl start platform-modules-haliburton.service
-systemctl start fancontrol.service
-
-/usr/local/bin/platform_api_mgnt.sh install
-/usr/local/bin/reload_udev.sh
+systemctl start fancontrol.service
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/script/fancontrol.sh b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/fancontrol.sh
index f2c0f3cd0f4e..03617a1fad36 100755
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/script/fancontrol.sh
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/script/fancontrol.sh
@@ -7,72 +7,37 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:
 # Short-Description: fancontrol
-# Description:       fan speed regulator
+# Description:       fancontrol configuration selector
 ### END INIT INFO
 
 . /lib/lsb/init-functions
 
 [ -f /etc/default/rcS ] && . /etc/default/rcS
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-DAEMON=/usr/local/bin/fancontrol
-DESC="fan speed regulator"
-NAME="fancontrol"
-PIDFILE=/var/run/fancontrol.pid
-PLATFORMPATH=/sys/devices/platform/e1031.smc
 MAIN_CONF=/usr/share/sonic/device/x86_64-cel_e1031-r0/fancontrol
-DEVPATH=/sys/devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-23/23-004d 
+PLATFORM_PATH=/sys/devices/platform/e1031.smc
 
-test -x $DAEMON || exit 0
+init() {
+    FANDIR=$(cat ${PLATFORM_PATH}/fan1_dir)
+    CONF=${MAIN_CONF}-${FANDIR}
+    echo $FANDIR > /usr/share/sonic/device/x86_64-cel_e1031-r0/fan_airflow
+}
 
-for i in 1 2 3
-do
-	j=$i
-	[ $i -eq 3 ] && j=4
-	FANFAULT=$(cat ${DEVPATH}/fan${j}_fault)
-  [ $FANFAULT = 1 ] && continue
-	FANDIR=$(cat ${PLATFORMPATH}/fan${i}_dir)
-done
-CONF=${MAIN_CONF}-${FANDIR}
+install() {
+    find /var/lib/docker/overlay*/ -path */sbin/fancontrol -exec cp /usr/local/bin/fancontrol {} \;
+}
 
 case "$1" in
-  start)
-  	if [ -f $CONF ] ; then
-		if $DAEMON --check $CONF 1>/dev/null 2>/dev/null ; then
-			log_daemon_msg "Starting $DESC" "$NAME\n"
-			start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON $CONF
-			log_end_msg $?
-		else
-			log_failure_msg "Not starting fancontrol, broken configuration file; please re-run pwmconfig."
-		fi
-	else
-		if [ "$VERBOSE" != no ]; then
-			log_warning_msg "Not starting fancontrol; run pwmconfig first."
-		fi
-	fi
-	;;
-  stop)
-		log_daemon_msg "Stopping $DESC" "$NAME"
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --startas $DAEMON $CONF
-		rm -f $PIDFILE
-		log_end_msg $?
-	;;
-  restart)
-  	$0 stop
-		sleep 3
-		$0 start
-	;;
-  force-reload)
-	if start-stop-daemon --stop --test --quiet --pidfile $PIDFILE --startas $DAEMON $CONF ; then
-		$0 restart
-	fi
-	;;
-  status)
-		status_of_proc $DAEMON $NAME $CONF && exit 0 || exit $?
-	;;
-  *)
-	log_success_msg "Usage: /etc/init.d/fancontrol {start|stop|restart|force-reload|status}"
-	exit 1
-	;;
+start)
+    init
+    cp $CONF $MAIN_CONF
+    ;;
+install)
+    install
+    ;;
+*)
+    log_success_msg "Usage: /etc/init.d/fancontrol {start} | {install}"
+    exit 1
+    ;;
 esac
 
-exit 0
\ No newline at end of file
+exit 0

From 4b5284858a602317112d7ab67566278170388445 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:32:16 -0700
Subject: [PATCH 0652/1674] Updated SONIC buffer pool settings to accomodate
 SAI adjustment for Arista-7050CX3-32S-C32 (#8159)

---
 .../Arista-7050CX3-32S-C32/buffers_defaults_t0.j2               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
index f5b7327e705d..2a328ac4806d 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
@@ -10,7 +10,7 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32712448",
+            "size": "32732160",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "1622016"

From 13a62666d9cba585f58fef51b062fbedadcf5ac7 Mon Sep 17 00:00:00 2001
From: tomer-israel <76040066+tomer-israel@users.noreply.github.com>
Date: Mon, 19 Jul 2021 22:08:44 +0300
Subject: [PATCH 0653/1674] [WARM-REBOOT] fix issue of watchdog on simx when
 executing warm-reboot command (#8132)

- Why I did it
to prevent python exception error when executing warm-reboot command on mellanox simulator platform

- How I did it
return None on the watchdog python script on cases that watchdog file is not exist

- How to verify it
warm-reboot is running well without the python error. error message will appear on log on these cases.
in order to avoid this error message we can simulate the watchdog on mellanox simulator platform
---
 platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
index 06780627d52e..0737b0446671 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
@@ -275,6 +275,9 @@ def get_watchdog():
         if device.startswith("watchdog") and is_mlnx_wd_main(device):
             watchdog_main_device_name = device
 
+    if watchdog_main_device_name is None:
+        return None
+
     watchdog_device_path = "/dev/{}".format(watchdog_main_device_name)
 
     watchdog = None

From 91f611157a9a4321aa8280c2c51f2d738e9e0f8c Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:52:33 -0700
Subject: [PATCH 0654/1674] cherry-pick PR #8158 & PR #8205 into 202012 (#8235)

---
 build_debian.sh                               |   1 -
 .../build_templates/sonic_debian_extension.j2 |  23 +++
 rules/config                                  |  12 +-
 slave.mk                                      |   1 +
 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py   | 135 +++++++++++++
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  13 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service      |   9 +-
 .../ctrmgr/remote_ctr.config.json             |   3 +-
 .../tests/ctrmgr_iptables_test.py             | 178 ++++++++++++++++++
 src/sonic-ctrmgrd/tests/ctrmgrd_test.py       |   9 +
 src/sonic-ctrmgrd/tests/http_proxy.conf       |   2 +
 src/sonic-ctrmgrd/tests/no_proxy.conf         |   2 +
 12 files changed, 377 insertions(+), 11 deletions(-)
 create mode 100644 src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
 create mode 100755 src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
 create mode 100644 src/sonic-ctrmgrd/tests/http_proxy.conf
 create mode 100644 src/sonic-ctrmgrd/tests/no_proxy.conf

diff --git a/build_debian.sh b/build_debian.sh
index 85e5f10a0ca2..a966519a8034 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -235,7 +235,6 @@ then
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${KUBERNETES_VERSION}-00
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
-    # kubeadm package auto install kubelet & kubectl
 else
     echo '[INFO] Skipping Install kubernetes'
 fi
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index eecf4064cac8..1bc1471da1e2 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -414,6 +414,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
 
 {% if include_kubernetes == "y" %}
+# Point to kubelet to /etc/resolv.conf
+#
+echo 'KUBELET_EXTRA_ARGS="--resolv-conf=/etc/resolv.conf"' | sudo tee -a  $FILESYSTEM_ROOT/etc/default/kubelet
+
 # Copy Flannel conf file into sonic-templates
 #
 sudo cp $BUILD_TEMPLATES/kube_cni.10-flannel.conflist $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
@@ -434,6 +438,25 @@ sudo cp ${files_path}/container_startup.py ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCR
 sudo chmod a+x ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/container_startup.py
 
 # Config file used by container mgmt scripts/service
+fl="${files_path}/remote_ctr.config.json"
+use_k8s_as_http_proxy=$(python3 -c 'import json
+with open("'${fl}'", "r") as s:
+    d=json.load(s);print(d.get("use_k8s_as_http_proxy", ""))
+')
+if [ "${use_k8s_as_http_proxy}" == "y" ]; then
+    # create proxy files for docker using private IP which will
+    # be later directed to k8s master upon config
+    PROXY_INFO="${kube_docker_proxy}"
+    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/http_proxy.conf > /dev/null
+[Service]
+Environment="HTTP_PROXY=${PROXY_INFO}"
+EOT
+    cat <<EOT | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/https_proxy.conf > /dev/null
+[Service]
+Environment="HTTPS_PROXY=${PROXY_INFO}"
+EOT
+fi
+
 sudo cp ${files_path}/remote_ctr.config.json ${FILESYSTEM_ROOT_ETC_SONIC}/
 
 # Remote container management service files
diff --git a/rules/config b/rules/config
index 9c0c821935e5..a34b0b644623 100644
--- a/rules/config
+++ b/rules/config
@@ -142,18 +142,24 @@ INCLUDE_NAT = y
 # TELEMETRY_WRITABLE - Enable write/config operations via the gNMI interface.
 # Uncomment to enable:
 # TELEMETRY_WRITABLE = y
+
+# INCLUDE_MACSEC - build docker-macsec for macsec support
+INCLUDE_MACSEC = y
+
 # INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to
 # run as worker node in kubernetes cluster.
 INCLUDE_KUBERNETES = n
 
+KUBE_DOCKER_PROXY = http://172.16.1.1:3128/
+
 # KUBERNETES_VERSION - Set to the required version.
 # K8s_GCR_IO_PAUSE_VERSION - Version of k8s universal pause container image
 # These are Used *only* when INCLUDE_KUBERNETES=y
 # NOTE: As a worker node it has to run version compatible to kubernetes master.
 #
-KUBERNETES_VERSION = 1.18.6
-KUBERNETES_CNI_VERSION = 0.8.6
-K8s_GCR_IO_PAUSE_VERSION = 3.2
+KUBERNETES_VERSION = 1.21.1
+KUBERNETES_CNI_VERSION = 0.8.7
+K8s_GCR_IO_PAUSE_VERSION = 3.4.1
 
 # SONIC_ENABLE_IMAGE_SIGNATURE - enable image signature
 # To not use the auto-generated self-signed certificate, the required files to sign the image as below:
diff --git a/slave.mk b/slave.mk
index 42f2f8f5e208..3a0ec43ef76e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -903,6 +903,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)"
 	export default_buffer_model="$(SONIC_BUFFER_MODEL)"
 	export include_kubernetes="$(INCLUDE_KUBERNETES)"
+	export kube_docker_proxy="$(KUBE_DOCKER_PROXY)"
 	export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)"
 	export installer_debs="$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$($*_INSTALLS))"
 	export lazy_installer_debs="$(foreach deb, $($*_LAZY_INSTALLS),$(foreach device, $($(deb)_PLATFORM),$(addprefix $(device)@, $(IMAGE_DISTRO_DEBS_PATH)/$(deb))))"
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
new file mode 100644
index 000000000000..74b9bfe44fc9
--- /dev/null
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgr_iptables.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+
+import ipaddress
+import os
+import re
+import socket
+import subprocess
+import syslog
+
+UNIT_TESTING = 0
+
+# NOTE:
+# Unable to use python-iptables as that does not create rules per ip-tables default
+# which is nf_tables. So rules added via iptc package will not be listed under
+# "sudo iptables -t nat -L -n". But available in kernel. To list, we need to 
+# use legacy mode as "sudo iptables-legacy -t nat -L -n".
+# As we can't use two modes and using non-default could make any debugging effort
+# very tough.
+
+
+from urllib.parse import urlparse
+
+DST_FILE = "/etc/systemd/system/docker.service.d/http_proxy.conf"
+DST_IP = None
+DST_PORT = None
+SQUID_PORT = "3128"
+
+def _get_ip(ip_str):
+    ret = ""
+    if ip_str:
+        try:
+            ipaddress.ip_address(ip_str)
+            ret = ip_str
+        except ValueError:
+            pass
+
+        if not ret:
+            try:
+                ret = socket.gethostbyname(ip_str)
+            except (OSError, socket.error):
+                pass
+        if not ret:
+            syslog.syslog(syslog.LOG_ERR, "{} is neither IP nor resolves to IP".
+                    format(ip_str))
+    return ret
+
+
+def _get_dst_info():
+    global DST_IP, DST_PORT
+    DST_IP = None
+    DST_PORT = None
+    print("DST_FILE={}".format(DST_FILE))
+    if os.path.exists(DST_FILE):
+        with open(DST_FILE, "r") as s:
+            for line in s.readlines():
+                url_match = re.search('^Environment=.HTTP_PROXY=(.+?)"', line)
+                if url_match:
+                    url = urlparse(url_match.group(1))
+                    DST_IP = _get_ip(url.hostname)
+                    DST_PORT = url.port
+                    break
+    else:
+        print("{} not available".format(DST_FILE))
+    print("DST_IP={}".format(DST_IP))
+
+
+def _is_rule_match(rule):
+    expect = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:".format(
+            DST_IP, DST_PORT)
+
+    # Remove duplicate spaces
+    rule = " ".join(rule.split()).strip()
+
+    if rule.startswith(expect):
+        return rule[len(expect):]
+    else:
+        return ""
+
+
+def check_proc(proc):
+    if proc.returncode:
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: cmd: {}".format(proc.args))
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: stdout: {}".format(proc.stdout))
+        syslog.syslog(syslog.LOG_ERR, "Failed to run: stderr: {}".format(proc.stderr))
+        if not UNIT_TESTING:
+            assert False
+
+
+def iptable_proxy_rule_upd(ip_str, port = SQUID_PORT):
+    _get_dst_info()
+    if not DST_IP:
+        # There is no proxy in use. Bail out.
+        return ""
+
+    destination = ""
+    if ip_str:
+        upd_ip = _get_ip(ip_str)
+        if not upd_ip:
+            return ""
+        destination = "{}:{}".format(upd_ip, port)
+
+    found = False
+    num = 0
+
+    while True:
+        num += 1
+
+        cmd = "sudo iptables -t nat -n -L OUTPUT {}".format(num)
+        proc = subprocess.run(cmd, shell=True, capture_output=True)
+        check_proc(proc)
+
+        if not proc.stdout:
+            # No more rule
+            break
+
+        rule_dest = _is_rule_match(proc.stdout.decode("utf-8").strip())
+        if rule_dest:
+            if not found and destination and (rule_dest == destination):
+                found = True
+            else:
+                # Duplicate or different IP - delete it
+                cmd = "sudo iptables -t nat -D OUTPUT {}".format(num)
+                proc = subprocess.run(cmd, shell=True, capture_output=True)
+                check_proc(proc)
+                # Decrement number to accommodate deleted rule
+                num -= 1
+
+    if destination and not found:
+        cmd = "sudo iptables -t nat -A OUTPUT -p tcp -d {} --dport {} -j DNAT --to-destination {}".format(
+                DST_IP, DST_PORT, destination)
+        proc = subprocess.run(cmd, shell=True, capture_output=True)
+
+        check_proc(proc)
+
+    return destination
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index 49c11d278170..3941a05a738a 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -8,6 +8,7 @@
 import syslog
 
 from collections import defaultdict
+from ctrmgr.ctrmgr_iptables import iptable_proxy_rule_upd
 
 from swsscommon import swsscommon
 from sonic_py_common import device_info
@@ -87,11 +88,13 @@
 JOIN_LATENCY = "join_latency_on_boot_seconds"
 JOIN_RETRY = "retry_join_interval_seconds"
 LABEL_RETRY = "retry_labels_update_seconds"
+USE_K8S_PROXY = "use_k8s_as_http_proxy"
 
 remote_ctr_config = {
     JOIN_LATENCY: 10,
     JOIN_RETRY: 10,
-    LABEL_RETRY: 2
+    LABEL_RETRY: 2,
+    USE_K8S_PROXY: ""
     }
 
 def log_debug(m):
@@ -309,6 +312,9 @@ def __init__(self, server):
 
         self.start_time = datetime.datetime.now()
 
+        if remote_ctr_config[USE_K8S_PROXY] == "y":
+            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
+
         if not self.st_server[ST_FEAT_UPDATE_TS]:
             # This is upon system start. Sleep 10m before join
             self.start_time += datetime.timedelta(
@@ -336,6 +342,9 @@ def on_config_update(self, key, op, data):
         log_debug("Received config update: {}".format(str(data)))
         self.cfg_server = cfg_data
 
+        if remote_ctr_config[USE_K8S_PROXY] == "y":
+            iptable_proxy_rule_upd(self.cfg_server[CFG_SER_IP])
+
         if self.pending:
             tnow = datetime.datetime.now()
             if tnow < self.start_time:
@@ -359,7 +368,7 @@ def handle_update(self):
 
         ip = self.cfg_server[CFG_SER_IP]
         disable = self.cfg_server[CFG_SER_DISABLE] != "false"
-        
+
         pre_state = dict(self.st_server)
         log_debug("server: handle_update: disable={} ip={}".format(disable, ip))
         if disable or not ip:
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
index 6052c10785da..f59314259bc6 100644
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Container Manager watcher daemon
-Requires=updategraph.service
-After=updategraph.service
-
+Requires=caclmgrd.service
+After=caclmgrd.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=simple
@@ -11,4 +12,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
index e7bca832e18b..9ef41d085329 100644
--- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
+++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
@@ -2,6 +2,7 @@
     "join_latency_on_boot_seconds": 300,
     "retry_join_interval_seconds": 30,
     "retry_labels_update_seconds": 5,
-    "revert_to_local_on_wait_seconds": 60
+    "revert_to_local_on_wait_seconds": 60,
+    "use_k8s_as_http_proxy": "y"
 }
 
diff --git a/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py b/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
new file mode 100755
index 000000000000..fc28cbecc8da
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/ctrmgr_iptables_test.py
@@ -0,0 +1,178 @@
+import os
+import re
+import sys
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from . import common_test
+
+sys.path.append("ctrmgr")
+import ctrmgr_iptables
+
+
+PROXY_FILE="http_proxy.conf"
+
+test_data = {
+    "1": {
+        "ip": "10.10.20.20",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3129 to:11.11.11.11:8088",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:10.10.20.20:3128"
+            ],
+        "ret": "10.10.20.20:3128"
+    },
+    "2": {
+        "ip": "",
+        "port": "",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8088"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080"
+        ],
+        "ret": ""
+    },
+    "3": {
+        "ip": "www.google.com",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:.*3128"
+        ]
+    },
+    "4": {
+        "ip": "www.google.comx",
+        "port": "3128",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "ret": ""
+    },
+    "5": {
+        "ip": "www.google.comx",
+        "port": "3128",
+        "conf_file": "no_proxy.conf",
+        "pre_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "post_rules": [
+            "DNAT tcp -- 20.20.0.0/0 172.16.1.1 tcp dpt:8080 to:100.127.20.21:8080",
+            "DNAT tcp -- 0.0.0.0/0 172.16.1.1 tcp dpt:3128 to:11.11.11.11:8080"
+        ],
+        "ret": ""
+    }
+}
+
+
+current_tc = None
+current_rules = None
+
+class proc:
+    returncode = 0
+    stdout = None
+    stderr = None
+
+    def __init__(self, ret, stdout, stderr):
+        self.returncode = ret
+        self.stdout = bytearray(stdout, 'utf-8')
+        self.stderr = bytearray(stderr, 'utf-8')
+        print("out={} err={}".format(stdout, stderr))
+
+
+def mock_subproc_run(cmd, shell, capture_output):
+    cmd_prefix = "sudo iptables -t nat "
+    list_cmd = "{}-n -L OUTPUT ".format(cmd_prefix)
+    del_cmd = "{}-D OUTPUT ".format(cmd_prefix)
+    ins_cmd = "{}-A OUTPUT -p tcp -d ".format(cmd_prefix)
+
+    assert shell
+    
+    print("cmd={}".format(cmd))
+    if cmd.startswith(list_cmd):
+        num = int(cmd[len(list_cmd):])
+        out = current_rules[num] if len(current_rules) > num else ""
+        return proc(0, out, "")
+
+    if cmd.startswith(del_cmd):
+        num = int(cmd[len(del_cmd):])
+        if num >= len(current_rules):
+            print("delete num={} is greater than len={}".format(num, len(current_rules)))
+            print("current_rules = {}".format(current_rules))
+            assert False
+        del current_rules[num]
+        return proc(0, "", "")
+
+    if cmd.startswith(ins_cmd):
+        l = cmd.split()
+        assert len(l) == 16
+        rule = "DNAT tcp -- 0.0.0.0/0 {} tcp dpt:{} to:{}".format(l[9], l[11], l[-1])
+        current_rules.append(rule)
+        return proc(0, "", "")
+
+    print("unknown cmd: {}".format(cmd))
+    return None
+
+
+def match_rules(pattern_list, str_list):
+    if len(pattern_list) != len(str_list):
+        print("pattern len {} != given {}".format(
+            len(pattern_list), len(str_list)))
+        return False
+
+    for i in range(len(pattern_list)):
+        if not re.match(pattern_list[i], str_list[i]):
+            print("{}: {} != {}".format(i, pattern_list[i], str_list[i]))
+            return False
+    return True
+
+
+class TestIPTableUpdate(object):
+
+    @patch("ctrmgr_iptables.subprocess.run")
+    def test_table(self, mock_proc):
+        global current_rules, current_tc
+
+        mock_proc.side_effect = mock_subproc_run
+        for i, tc in test_data.items():
+            print("----- Test: {} Start ------------------".format(i))
+            current_tc = tc
+            current_rules = tc["pre_rules"].copy()
+
+            ctrmgr_iptables.DST_IP = ""
+            ctrmgr_iptables.DST_PORT = ""
+            ctrmgr_iptables.DST_FILE = os.path.join(
+                    os.path.dirname(os.path.realpath(__file__)),
+                    tc.get("conf_file", PROXY_FILE))
+            ret = ctrmgr_iptables.iptable_proxy_rule_upd(tc["ip"], tc["port"])
+            if "ret" in tc:
+                assert ret == tc["ret"]
+            if not match_rules(tc["post_rules"], current_rules):
+                print("current_rules={}".format(current_rules))
+                print("post_rules={}".format(tc["post_rules"]))
+                assert False
+            print("----- Test: {} End   ------------------".format(i))
+
+
diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
index e0e821089346..171534b5a8d1 100755
--- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
+++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
@@ -8,6 +8,7 @@
 
 sys.path.append("ctrmgr")
 import ctrmgrd
+import ctrmgr.ctrmgr_iptables
 
 
 # ctrmgrd test cases
@@ -387,6 +388,11 @@ def init(self):
         ctrmgrd.UNIT_TESTING = 1
         ctrmgrd.SONIC_CTR_CONFIG = (
                 common_test.create_remote_ctr_config_json())
+        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 1
+
+
+    def clear(self):
+        ctrmgr.ctrmgr_iptables.UNIT_TESTING = 0
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -421,6 +427,7 @@ def test_server(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
             ret = common_test.check_kube_actions()
             assert ret == 0
             common_test.mock_selector.SLEEP_SECS = 0
+        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -450,6 +457,7 @@ def test_feature(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_tables_returned()
             assert ret == 0
+        self.clear()
 
 
     @patch("ctrmgrd.swsscommon.DBConnector")
@@ -486,3 +494,4 @@ def test_labels(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs,
 
             ret = common_test.check_kube_actions()
             assert ret == 0
+        self.clear()
diff --git a/src/sonic-ctrmgrd/tests/http_proxy.conf b/src/sonic-ctrmgrd/tests/http_proxy.conf
new file mode 100644
index 000000000000..4947352418a5
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/http_proxy.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="HTTP_PROXY=http://172.16.1.1:3128/"
diff --git a/src/sonic-ctrmgrd/tests/no_proxy.conf b/src/sonic-ctrmgrd/tests/no_proxy.conf
new file mode 100644
index 000000000000..ffdfa671bacb
--- /dev/null
+++ b/src/sonic-ctrmgrd/tests/no_proxy.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="NO_PROXY=10.10.10.10"

From 7eb6abdc7b3e7bb0a88a7898d825017d3fe9b127 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Wed, 21 Jul 2021 11:13:30 +0300
Subject: [PATCH 0655/1674] [hostcfgd] differentiate between UnitFileState and
 UnitFilePreset (#8169) (#8228)

It can be that service is not enabled but UnitFilePreset=enabled (case
for Application Extension):

```
    Loaded: loaded (/lib/systemd/system/cpu-report.service; disabled; vendor preset: enabled)
```

This makes existing logic skip enabling the service.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 src/sonic-host-services/scripts/hostcfgd | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 3d6202a15ad0..231ba63b0ecf 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -454,14 +454,25 @@ class HostConfigDaemon:
 
         return feature_names, feature_suffixes
 
+    def get_systemd_unit_state(self, unit):
+        """ Returns service configuration """
+
+        cmd = "sudo systemctl show {} --property UnitFileState".format(unit)
+        proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = proc.communicate()
+        if proc.returncode != 0:
+            syslog.syslog(syslog.LOG_ERR, "Failed to get status of {}: rc={} stderr={}".format(unit, proc.returncode, stderr))
+            return 'invalid'  # same as systemd's "invalid indicates that it could not be determined whether the unit file is enabled".
+
+        props = dict([line.split("=") for line in stdout.decode().strip().splitlines()])
+        return props["UnitFileState"]
+
     def enable_feature(self, feature_names, feature_suffixes):
         start_cmds = []
         for feature_name in feature_names:
             # Check if it is already enabled, if yes skip the system call
-            cmd = "sudo systemctl status {}.{} | grep Loaded".format(feature_name, feature_suffixes[-1])
-            proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            (stdout, stderr) = proc.communicate()
-            if "enabled" in str(stdout):
+            unit_file_state = self.get_systemd_unit_state("{}.{}".format(feature_name, feature_suffixes[-1]))
+            if unit_file_state == "enabled":
                 continue
 
             for suffix in feature_suffixes:
@@ -485,10 +496,8 @@ class HostConfigDaemon:
         stop_cmds = []
         for feature_name in feature_names:
             # Check if it is already disabled, if yes skip the system call
-            cmd = "sudo systemctl status {}.{} | grep Loaded".format(feature_name, feature_suffixes[-1])
-            proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            (stdout, stderr) = proc.communicate()
-            if "disabled" in str(stdout) or "masked" in str(stdout):
+            unit_file_state = self.get_systemd_unit_state("{}.{}".format(feature_name, feature_suffixes[-1]))
+            if unit_file_state in ("disabled", "masked"):
                 continue
 
             for suffix in reversed(feature_suffixes):

From 6d24cd6c92c11c9873f10362078bca0eb0e135f3 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 22 Jul 2021 12:31:55 +0800
Subject: [PATCH 0656/1674] Add reproducible build for armhf and arm64 related
 versions. (#8224)

* Add version for 202012 branch
---
 files/build/versions/default/versions-web | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6ca46ffc6523..81e9d1b4b709 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -1,3 +1,6 @@
+http://deb.debian.org/debian/pool/main/d/doxygen/doxygen_1.8.13-10.debian.tar.xz==09198160fb3dfa4c33ce143e3bf1c470
+http://deb.debian.org/debian/pool/main/d/doxygen/doxygen_1.8.13-10.dsc==f831a76f1a1f76622dcacba2af01ddcb
+http://deb.debian.org/debian/pool/main/d/doxygen/doxygen_1.8.13.orig.tar.gz==0fa414975f8cd6d30e126c28327c1f7c
 http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.debian.tar.xz==c27e499611c48ba307792518d29cdcc7
 http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.dsc==d9572a9f48c88293341681601a7b18c5
 http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2.orig.tar.bz2==944558e88ddcc3b9b0d9550070fa3599
@@ -14,6 +17,11 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
+https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
+https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
+https://deb.nodesource.com/node_14.x/dists/buster/Release==d6442215d8185f7bf6a30b94992e70dc
+https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
+https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817

From a90280faa5f2383148498b98d8f3c84dcfd4ee81 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 22 Jul 2021 19:39:56 +0800
Subject: [PATCH 0657/1674] Add auto-version-upgrade for arm image (#8244)

---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 62b188e56a27..f0cb85a817a2 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -28,6 +28,8 @@ parameters:
     - innovium
     - mellanox
     - nephos
+    - centec-arm64
+    - marvell-armhf
 
 stages:
 - stage: Build

From d191dcd2e9d3b63f6773ba1d07b7ff2376c49570 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Fri, 23 Jul 2021 20:16:22 +0700
Subject: [PATCH 0658/1674] [device/celestica]: Add thermalctld support on
 Haliburton platform APIs (#6493) (#8217)

- Why I did it

The thermalctld daemon on the Pmon docker requires support from the thermal manager API
- How I did it
Cherry picked from : cfda77b
Removed the old function for detecting a faulty fan.
Removed the old function for detecting excess temperature.
Implement thermal_manager APIs based on ThermalManagerBase
Implement thermal_conditions APIs based on ThermalPolicyConditionBase
Implement thermal_actions APIs based on ThermalPolicyActionBase
Implement thermal_info APIs based on ThermalPolicyInfoBase
Add thermal_policy.json

- How to verify it
Check the fan speed during temperature changes.
Examine events that will occur after the temperature has exceeded the threshold.
Check for events that will occur after the fan is removed or the fan is not working properly.

- Which release branch to backport (provide reason below if selected)
 202012

From 814865b2c5aefcda840962ab6fff7df8741022cb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 24 Jul 2021 20:27:11 +0800
Subject: [PATCH 0659/1674] [ci/build]: Upgrade SONiC package versions (#8206)

---
 .../versions-deb-buster-arm64                 |    4 +
 .../versions-deb-buster-armhf                 |    4 +
 .../build-sonic-slave-buster/versions-git     |    2 +-
 .../versions-py2-all-arm64                    |    2 +
 .../versions-py2-all-armhf                    |    2 +
 .../versions-py3-all-arm64                    |    2 +
 .../versions-py3-all-armhf                    |    2 +
 files/build/versions/default/versions-docker  |    9 +-
 files/build/versions/default/versions-git     |    5 +-
 files/build/versions/default/versions-web     |    6 +
 .../versions-deb-buster-arm64                 |    6 +
 .../versions-deb-buster-armhf                 |    6 +
 .../versions-deb-buster-arm64                 |   12 +
 .../versions-deb-buster-armhf                 |   12 +
 .../versions-deb-buster-arm64                 |    8 +
 .../versions-deb-buster-armhf                 |    8 +
 .../versions-deb-buster                       |    2 +-
 .../versions-deb-buster-arm64                 |    1 +
 .../versions-deb-buster-armhf                 |    1 +
 .../dockers/docker-ptf/versions-deb-stretch   |    7 +-
 .../docker-sonic-mgmt-framework/versions-py3  |    4 +-
 .../dockers/docker-sonic-vs/versions-py3      |    2 +-
 .../docker-syncd-bfn/versions-deb-buster      |    2 +-
 .../docker-syncd-brcm/versions-deb-buster     |    2 +-
 .../versions-deb-buster                       |    2 +-
 .../versions-deb-buster-arm64                 |   38 +
 .../docker-syncd-mlnx/versions-deb-buster     |    2 +-
 .../versions-deb-buster-armhf                 |   42 +
 .../versions-deb-buster-arm64                 | 1510 +++++++++++++++
 .../versions-py2-all-arm64                    |   92 +
 .../versions-py3-all-arm64                    |   70 +
 .../versions-deb-buster-armhf                 | 1628 +++++++++++++++++
 .../versions-py2-all-armhf                    |   92 +
 .../versions-py3-all-armhf                    |   70 +
 .../sonic-slave-buster/versions-deb-buster    |   24 +-
 .../dockers/sonic-slave-buster/versions-git   |    2 +-
 .../dockers/sonic-slave-buster/versions-py3   |    2 +-
 .../versions-deb-stretch-arm64                | 1412 ++++++++++++++
 .../versions-py2-all-arm64                    |   79 +
 .../versions-py3-all-arm64                    |   37 +
 .../versions-deb-stretch-armhf                | 1418 ++++++++++++++
 .../versions-py2-all-armhf                    |   79 +
 .../versions-py3-all-armhf                    |   37 +
 .../sonic-slave-stretch/versions-deb-stretch  |   24 +-
 .../dockers/sonic-slave-stretch/versions-git  |    2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |    2 +-
 .../versions/host-image/versions-deb-buster   |    2 +-
 .../host-image/versions-deb-buster-arm64      |   14 +
 .../host-image/versions-deb-buster-armhf      |   14 +
 files/build/versions/host-image/versions-py3  |    2 +-
 .../host-image/versions-py3-all-armhf         |    1 +
 51 files changed, 6761 insertions(+), 47 deletions(-)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
 create mode 100644 files/build/versions/host-image/versions-deb-buster-arm64
 create mode 100644 files/build/versions/host-image/versions-deb-buster-armhf
 create mode 100644 files/build/versions/host-image/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
new file mode 100644
index 000000000000..611d3d3083b7
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
@@ -0,0 +1,4 @@
+libsnmp-base==5.7.3+dfsg-5
+libsnmp-dev==5.7.3+dfsg-5
+libsnmp30==5.7.3+dfsg-5
+linux-headers-4.19.0-12-2-arm64==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
new file mode 100644
index 000000000000..9dd2de65079c
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -0,0 +1,4 @@
+libsnmp-base==5.7.3+dfsg-5
+libsnmp-dev==5.7.3+dfsg-5
+libsnmp30==5.7.3+dfsg-5
+linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 92747005c1c7..ed8498330b13 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939
+https://salsa.debian.org/kernel-team/ethtool/==a90280faa5f2383148498b98d8f3c84dcfd4ee81
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
new file mode 100644
index 000000000000..8492dcc26744
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
@@ -0,0 +1,2 @@
+ipaddress==1.0.23
+lxml==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
new file mode 100644
index 000000000000..8492dcc26744
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
@@ -0,0 +1,2 @@
+ipaddress==1.0.23
+lxml==4.6.3
\ No newline at end of file
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
new file mode 100644
index 000000000000..27431cf6ad1c
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1,2 @@
+bitarray==1.5.3
+lxml==4.6.3
\ No newline at end of file
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
new file mode 100644
index 000000000000..27431cf6ad1c
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1,2 @@
+bitarray==1.5.3
+lxml==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index a657a7df43b5..0b54d2b93b0a 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,2 +1,7 @@
-amd64:debian:buster==sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1
-amd64:debian:stretch==sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a
\ No newline at end of file
+amd64:debian:buster==sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2
+amd64:debian:stretch==sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2b45312ae503cea4ba286dbdbb14512865488f3a3e8cc702efc9e662f300b2fe
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:eed3f2c48700f15058be5dfb90beb21d3ae890f8fa592e253133b7f1e4481e87
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:c024d8233083165c079d3bbc3e336029eb8d2a147b9340ff9f259e7c902d089f
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:6aaf61a9942c6a1a4097389288182985974cefec9e574eb34797bd8b367a1dda
+multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index c069cfa8a365..fc224d8f56d1 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,10 +1,11 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==98aa8df54a84e9d6e21fcb82750a8e90c25e761f
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
+https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
 https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
@@ -12,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939
+https://salsa.debian.org/kernel-team/ethtool/==a90280faa5f2383148498b98d8f3c84dcfd4ee81
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 81e9d1b4b709..6e26ff853b9a 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -26,10 +26,12 @@ https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
+https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
 https://github.com/Innovium/SONiC/raw/master/debian/master/isai.deb==2ed19469078ff5b04208ed2042d30e05
 https://github.com/Innovium/SONiC/raw/master/debian/master/saihdr.deb==f1e60b01f5c1ae9832931166ba786202
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-1.deb==2ef2a6ac59ceb76d794de606ca1bd7f6
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
@@ -63,7 +65,11 @@ https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debia
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
 https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r==54e11e450a461b1f4ae39c3ce3f15eff
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1_bpo10+1_arm64.deb?sv=2015-04-05&sr=b&sig=622w2KzIKIjAaaA0Bz12MzU%2BUBzY2AiXFIFfuKNoKSk%3D&se=2030-10-24T04%3A21%3A44Z&sp=r==6d79c60549ce33889bfb9c4def5c532a
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1_bpo10+1_armhf.deb?sv=2015-04-05&sr=b&sig=xTdayvm0RBguxi9suyv855jKRjU%2FmKQ8nHuct4WSX%2FA%3D&se=2030-10-24T04%3A22%3A05Z&sp=r==dd2c1ce3d3d789167676c35c808f4c8a
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bpo10+1_arm64.deb?sv=2015-04-05&sr=b&sig=GbkJV2wWln3hoz27zKi5erdk3NDKrAFrQriA97bcRCY%3D&se=2030-10-24T04%3A22%3A21Z&sp=r==282b4766cc9ac7d8bb70622bd69d9f5c
+https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bpo10+1_armhf.deb?sv=2015-04-05&sr=b&sig=67vHAMxsl%2BS3X1KsqhdYhakJkGdg5FKSPgU8kUiw4as%3D&se=2030-10-24T04%3A22%3A40Z&sp=r==62f287117afab6caaec564232ebbb5de
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
new file mode 100644
index 000000000000..f3f3ca500745
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
@@ -0,0 +1,6 @@
+iproute2==4.20.0-2+deb10u1
+libcap2==1:2.25-2
+libcap2-bin==1:2.25-2
+libelf1==0.176-1.1
+libmnl0==1.0.4-2
+libxtables12==1.8.2-4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
new file mode 100644
index 000000000000..f3f3ca500745
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
@@ -0,0 +1,6 @@
+iproute2==4.20.0-2+deb10u1
+libcap2==1:2.25-2
+libcap2-bin==1:2.25-2
+libelf1==0.176-1.1
+libmnl0==1.0.4-2
+libxtables12==1.8.2-4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
new file mode 100644
index 000000000000..9dbc175d3188
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -0,0 +1,12 @@
+apt==1.8.2.3
+icu-devtools==63.1-6+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+linux-libc-dev==4.19.194-3
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
new file mode 100644
index 000000000000..9dbc175d3188
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -0,0 +1,12 @@
+apt==1.8.2.3
+icu-devtools==63.1-6+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+linux-libc-dev==4.19.194-3
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
new file mode 100644
index 000000000000..62ca4befcc27
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -0,0 +1,8 @@
+libexpat1-dev==2.2.6-2+deb10u1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
new file mode 100644
index 000000000000..62ca4befcc27
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -0,0 +1,8 @@
+libexpat1-dev==2.2.6-2+deb10u1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 8a04ccff3f1d..cb63192da75b 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -89,6 +89,6 @@ sx-gen-utils-dev==1.mlnx.4.4.3216
 sxd-libs==1.mlnx.4.4.3216
 sxd-libs-dev==1.mlnx.4.4.3216
 ucf==3.0038+nmu1
-udev==241-7~deb10u7
+udev==241-7~deb10u8
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
new file mode 100644
index 000000000000..5b2de35bbfa1
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
@@ -0,0 +1 @@
+libudev1==241-7~deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
new file mode 100644
index 000000000000..5b2de35bbfa1
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
@@ -0,0 +1 @@
+libudev1==241-7~deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 664878ec18bc..d3891fd663bb 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -74,7 +74,6 @@ libfile-fcntllock-perl==0.22-3+b2
 libfribidi0==0.19.7-1+deb9u1
 libgc1c2==1:7.4.2-8
 libgcc-6-dev==6.3.0-18+deb9u1
-libgcrypt20==1.7.6-2+deb9u4
 libgdbm3==1.8.3-14
 libglib2.0-0==2.50.3-2+deb9u2
 libglib2.0-data==2.50.3-2+deb9u2
@@ -122,7 +121,7 @@ libnpth0==1.3-1
 libntlm0==1.4-8
 libopts25==1:5.18.12-3
 libp11-kit0==0.23.3-2+deb9u1
-libpam-systemd==232-25+deb9u12
+libpam-systemd==232-25+deb9u13
 libpcap0.8==1.8.1-3
 libpcre16-3==2:8.39-3
 libperl5.24==5.24.1-3+deb9u7
@@ -172,7 +171,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-2.2+deb9u5
 libxmuu1==2:1.1.2-2
-linux-libc-dev==4.9.272-1
+linux-libc-dev==4.9.272-2
 logrotate==3.11.0-0.1
 lsof==4.89+dfsg-0.1
 m4==1.4.18-1
@@ -220,7 +219,7 @@ rsync==3.1.2-1+deb9u2
 rsyslog==8.24.0-1
 sgml-base==1.29
 shared-mime-info==1.8-1+deb9u1
-systemd==232-25+deb9u12
+systemd==232-25+deb9u13
 systemd-shim==10-3
 tacacs+==4.0.4.27a-3
 tcpd==7.6.q-26
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index a7e3e6ef57e5..3ccd6577cccf 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,11 +1,11 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.2
+charset-normalizer==2.0.3
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.1
-grpcio==1.38.1
+grpcio==1.39.0
 grpcio-tools==1.20.0
 idna==3.2
 importlib-metadata==4.6.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 2380496c950f..bc3c046c67ed 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.5.30
-charset-normalizer==2.0.2
+charset-normalizer==2.0.3
 click==7.0
 idna==3.2
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index bc0a5e22b366..a971f94b8dd3 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-2
+linux-libc-dev==4.19.194-3
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 1b38738849f9..9b62eaf5fc47 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.194-2
+linux-libc-dev==4.19.194-3
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index d46082994763..34b0dae4d865 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -54,7 +54,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-2
+linux-libc-dev==4.19.194-3
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
new file mode 100644
index 000000000000..bfbb176b7c59
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -0,0 +1,38 @@
+dmsetup==2:1.02.155-3
+iputils-ping==3:20180629-2+deb10u2
+keyutils==1.6-6
+libdevmapper1.02.1==2:1.02.155-3
+libevent-2.1-6==2.1.8-stable-4
+libexpat1-dev==2.2.6-2+deb10u1
+libnfsidmap2==0.25-5.1
+libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libsensors-config==1:3.5.0-3
+libsensors4-dev==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libtirpc-common==1.1.4-0.4
+libtirpc3==1.1.4-0.4
+nfs-common==1:1.3.4-2.5+deb10u1
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+rpcbind==1.2.5-0.3+deb10u1
+sensible-utils==0.0.12
+swig==3.0.12-2
+swig3.0==3.0.12-2
+ucf==3.0038+nmu1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 36d258222692..0010438ef1bb 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -17,7 +17,7 @@ libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-2
+linux-libc-dev==4.19.194-3
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
new file mode 100644
index 000000000000..ae722af856a8
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -0,0 +1,42 @@
+dmsetup==2:1.02.155-3
+iputils-ping==3:20180629-2+deb10u2
+keyutils==1.6-6
+libdevmapper1.02.1==2:1.02.155-3
+libevent-2.1-6==2.1.8-stable-4
+libexpat1-dev==2.2.6-2+deb10u1
+libnfsidmap2==0.25-5.1
+libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libsensors-config==1:3.5.0-3
+libsensors4-dev==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libtirpc-common==1.1.4-0.4
+libtirpc3==1.1.4-0.4
+mrvllibsai==1.7.1-1
+nfs-common==1:1.3.4-2.5+deb10u1
+python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+rpcbind==1.2.5-0.3+deb10u1
+sensible-utils==0.0.12
+swig==3.0.12-2
+swig3.0==3.0.12-2
+syncd==1.0.0
+ucf==3.0038+nmu1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
new file mode 100644
index 000000000000..41d423be42e2
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -0,0 +1,1510 @@
+adwaita-icon-theme==3.30.1-1
+ant==1.10.5-2
+ant-optional==1.10.5-2
+apt==1.8.2.3
+apt-file==3.2.2
+apt-transport-https==1.8.2.3
+apt-utils==1.8.2.3
+arch-test==0.15-2+deb10u1
+asciidoctor==1.5.8-1
+aspell==0.60.7~20110707-6
+aspell-en==2018.04.16-0-1
+at==3.1.23-1
+at-spi2-core==2.30.0-7
+aufs-dkms==4.19+20190211-1
+aufs-tools==1:4.14+20190211-1
+augeas-lenses==1.11.0-3
+augeas-tools==1.11.0-3
+autoconf==2.69-11
+autoconf-archive==20180313-1
+autogen==1:5.18.12-4
+autogen-doc==1:5.18.12-4
+automake==1:1.16.1-4
+automake1.11==1:1.11.6-5
+autopoint==0.19.8.1-9
+autotools-dev==20180224.1
+bash-completion==1:2.8-6
+bc==1.07.1-2+b1
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
+binfmt-support==2.2.0-2
+binutils==2.31.1-16
+binutils-aarch64-linux-gnu==2.31.1-16
+binutils-common==2.31.1-16
+bison==2:3.3.2.dfsg-1
+blt==2.5.3+dfsg-4
+bsd-mailx==8.1.2-0.20180807cvs-1
+bsdmainutils==11.1.2+b1
+build-essential==12.6
+byacc==20140715-1+b1
+bzip2==1.0.6-9.2~deb10u1
+bzip2-doc==1.0.6-9.2~deb10u1
+ca-certificates==20200601~deb10u2
+ca-certificates-java==20190405
+cdbs==0.4.159
+cgroupfs-mount==1.4
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:7.0-47
+clang-7==1:7.0.1-8+deb10u2
+cm-super-minimal==0.3.4-14
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cmocka-doc==1.1.3-1
+comerr-dev==2.1-1.44.5-1+deb10u3
+containerd.io==1.4.8-1
+cowbuilder==0.88
+cowdancer==0.88
+cpio==2.12+dfsg-9
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+cppcheck==1.86-1
+cron==3.0pl1-134+deb10u1
+curl==7.64.0-4+deb10u2
+dbus==1.12.20-0+deb10u1
+dbus-user-session==1.12.20-0+deb10u1
+dconf-gsettings-backend==0.30.1-2
+dconf-service==0.30.1-2
+dctrl-tools==2.24-3
+debhelper==12.1.1
+debian-keyring==2019.02.25
+debootstrap==1.0.114
+default-jdk-headless==2:1.11-71
+default-jre==2:1.11-71
+default-jre-headless==2:1.11-71
+default-libmysqlclient-dev==1.0.5
+device-tree-compiler==1.4.7-4
+devscripts==2.19.5+deb10u1
+dh-apparmor==2.13.2-10
+dh-autoreconf==19
+dh-exec==0.23.1
+dh-make==2.201802
+dh-python==3.20190308
+dh-strip-nondeterminism==1.1.2-1
+dh-systemd==12.1.1
+dictionaries-common==1.28.1
+diffstat==1.62-1
+dirmngr==2.2.12-1+deb10u1
+distro-info-data==0.41+deb10u3
+dkms==2.6.1-4
+dmsetup==2:1.02.155-3
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
+docker-ce==5:18.09.5~3-0~debian-buster
+docker-ce-cli==5:18.09.5~3-0~debian-buster
+docutils-common==0.14+dfsg-4
+docutils-doc==0.14+dfsg-4
+doxygen==1.8.13-10
+dpatch==2.0.38+nmu1
+dpkg-dev==1.19.7
+dput==1.0.3
+dvipng==1.15-1.1
+dwz==0.12-3
+eatmydata==105-7
+emacsen-common==3.0.4
+equivs==2.2.0
+exim4-base==4.92-8+deb10u6
+exim4-config==4.92-8+deb10u6
+exim4-daemon-light==4.92-8+deb10u6
+expat==2.2.6-2+deb10u1
+exuberant-ctags==1:5.9~svn20110310-12
+fakeroot==1.23-1
+file==1:5.35-4+deb10u2
+flex==2.6.4-6.2
+fontconfig==2.13.1-2
+fontconfig-config==2.13.1-2
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==5.0.10+really4.7.0~dfsg-1
+fonts-glyphicons-halflings==1.009~3.4.1+dfsg-1
+fonts-lato==2.0-2
+fonts-liberation==1:1.07.4-9
+fonts-lmodern==2.004.5-6
+fonts-noto-mono==20181227-1
+fonts-roboto-slab==1.100263+20170512-1
+fonts-texgyre==20180621-3
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gawk==1:4.2.1+dfsg-1
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+gcovr==4.1-2
+gdb==8.2.1-2+b3
+gem2deb==0.43
+gem2deb-test-runner==0.43
+geoip-database==20181108-1
+gettext==0.19.8.1-9
+gettext-base==0.19.8.1-9
+gfortran==4:8.3.0-1
+gfortran-8==8.3.0-6
+ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-glib-2.0==1.58.3-2
+gir1.2-packagekitglib-1.0==1.1.12-5
+git==1:2.20.1-2+deb10u3
+git-buildpackage==0.9.14
+git-man==1:2.20.1-2+deb10u3
+glib-networking==2.58.0-2+deb10u2
+glib-networking-common==2.58.0-2+deb10u2
+glib-networking-services==2.58.0-2+deb10u2
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gnupg2==2.2.12-1+deb10u1
+googletest==1.8.1-3
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+graphviz==2.40.1-6+deb10u1
+groff==1.22.4-3+deb10u1
+groff-base==1.22.4-3+deb10u1
+gsettings-desktop-schemas==3.28.1-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
+gtk-update-icon-cache==3.24.5-1
+guile-2.0-libs==2.0.13+1-5.1
+hicolor-icon-theme==0.17-2
+ibverbs-providers==22.1-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==63.1-6+deb10u1
+imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
+install-info==6.5.0.dfsg.1-4+b1
+intltool-debian==0.35.0+20060710.5
+iproute2==4.20.0-2+deb10u1
+iptables==1.8.2-4
+iptables-dev==1.8.2-4
+iso-codes==4.2-1
+java-common==0.71
+java-wrappers==0.3
+javahelper==0.72.9
+javascript-common==11
+kernel-wedge==2.99
+kmod==26-1
+krb5-locales==1.17-3+deb10u1
+krb5-multidev==1.17-3+deb10u1
+lcov==1.13-4
+less==487-0.1+b1
+libalgorithm-diff-perl==1.19.03-2
+libalgorithm-diff-xs-perl==0.04-5+b1
+libalgorithm-merge-perl==0.08-3
+libaopalliance-java==20070526-6
+libapache-pom-java==18-1
+libapparmor1==2.13.2-10
+libappstream4==0.12.5-1
+libapt-inst2.0==1.8.2.3
+libapt-pkg-perl==0.1.34+b1
+libarchive-cpio-perl==0.10-1
+libarchive-zip-perl==1.64-1
+libarchive13==3.3.3-4+deb10u1
+libargon2-1==0~20171227-0.2
+libasan5==8.3.0-6
+libasm-java==7.0-1
+libasound2==1.1.8-1
+libasound2-data==1.1.8-1
+libaspell15==0.60.7~20110707-6
+libassuan0==2.5.2-1
+libasync-mergepoint-perl==0.04-2
+libatinject-jsr330-api-java==1.0+ds1-5
+libatk-bridge2.0-0==2.30.0-5
+libatk-wrapper-java==0.33.3-22
+libatk-wrapper-java-jni==0.33.3-22
+libatk1.0-0==2.30.0-2
+libatk1.0-data==2.30.0-2
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==8.3.0-6
+libatspi2.0-0==2.30.0-7
+libaudio2==1.9.4-6
+libaudit-dev==1:2.8.4-3
+libaugeas0==1.11.0-3
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.7-4+deb10u1
+libavahi-common-data==0.7-4+deb10u1
+libavahi-common3==0.7-4+deb10u1
+libavalon-framework-java==4.2.0-10
+libb-hooks-endofscope-perl==0.24-1
+libb-hooks-op-check-perl==0.22-1+b1
+libbabeltrace-dev==1.5.6-2+deb10u1
+libbabeltrace1==1.5.6-2+deb10u1
+libbatik-java==1.10-2+deb10u1
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbinutils==2.31.1-16
+libbison-dev==2:3.3.2.dfsg-1
+libbit-vector-perl==7.4-1+b5
+libblkid-dev==2.33.1-0.1
+libboost-atomic1.71-dev==1.71.0-6~bpo10+1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libboost-chrono1.71-dev==1.71.0-6~bpo10+1
+libboost-chrono1.71.0==1.71.0-6~bpo10+1
+libboost-container1.71-dev==1.71.0-6~bpo10+1
+libboost-container1.71.0==1.71.0-6~bpo10+1
+libboost-context1.71-dev==1.71.0-6~bpo10+1
+libboost-context1.71.0==1.71.0-6~bpo10+1
+libboost-contract1.71-dev==1.71.0-6~bpo10+1
+libboost-contract1.71.0==1.71.0-6~bpo10+1
+libboost-coroutine1.71-dev==1.71.0-6~bpo10+1
+libboost-coroutine1.71.0==1.71.0-6~bpo10+1
+libboost-date-time1.71-dev==1.71.0-6~bpo10+1
+libboost-date-time1.71.0==1.71.0-6~bpo10+1
+libboost-fiber1.71-dev==1.71.0-6~bpo10+1
+libboost-fiber1.71.0==1.71.0-6~bpo10+1
+libboost-filesystem1.71-dev==1.71.0-6~bpo10+1
+libboost-filesystem1.71.0==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71-dev==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71.0==1.71.0-6~bpo10+1
+libboost-log1.71-dev==1.71.0-6~bpo10+1
+libboost-log1.71.0==1.71.0-6~bpo10+1
+libboost-mpi1.71.0==1.71.0-6~bpo10+1
+libboost-program-options1.71-dev==1.71.0-6~bpo10+1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-regex1.71-dev==1.71.0-6~bpo10+1
+libboost-regex1.71.0==1.71.0-6~bpo10+1
+libboost-serialization1.71-dev==1.71.0-6~bpo10+1
+libboost-serialization1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71-dev==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-test1.71-dev==1.71.0-6~bpo10+1
+libboost-test1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71-dev==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libboost1.71-dev==1.71.0-6~bpo10+1
+libbrotli1==1.0.7-2+deb10u1
+libbsd-dev==0.9.1-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libbsh-java==2.0b4-19
+libbz2-dev==1.0.6-9.2~deb10u1
+libc-ares-dev==1.14.0-1
+libc-ares2==1.14.0-1
+libc-dev-bin==2.28-10
+libc6-dbg==2.28-10
+libc6-dev==2.28-10
+libcaf-openmpi-3==2.4.0-2
+libcairo-gobject2==1.16.0-4+deb10u1
+libcairo2==1.16.0-4+deb10u1
+libcap-dev==1:2.25-2
+libcap-ng-dev==0.7.9-2
+libcap2==1:2.25-2
+libcap2-bin==1:2.25-2
+libcapture-tiny-perl==0.48-1
+libcarp-clan-perl==6.07-1
+libcc1-0==8.3.0-6
+libcdi-api-java==1.2-2
+libcdt5==2.40.1-6+deb10u1
+libcgi-fast-perl==1:2.13-1
+libcgi-pm-perl==4.40-1
+libcglib-java==3.2.10-1
+libcgraph6==2.40.1-6+deb10u1
+libclang-common-7-dev==1:7.0.1-8+deb10u2
+libclang1-6.0==1:6.0.1-10
+libclang1-7==1:7.0.1-8+deb10u2
+libclass-accessor-perl==0.51-1
+libclass-inspector-perl==1.32-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-3+b2
+libclone-perl==0.41-1+b1
+libcmocka-dev==1.1.3-1
+libcmocka0==1.1.3-1
+libcoarrays-dev==2.4.0-2
+libcoarrays-openmpi-dev==2.4.0-2
+libcolord2==1.4.3-4
+libcommon-sense-perl==3.74-2+b7
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.4-1
+libcommons-codec-java==1.11-1
+libcommons-collections3-java==3.2.2-2
+libcommons-compress-java==1.18-2+deb10u1
+libcommons-configuration-java==1.10-5
+libcommons-digester-java==1.8.1-5
+libcommons-io-java==2.6-2
+libcommons-lang-java==2.6-8
+libcommons-lang3-java==3.8-2
+libcommons-logging-java==1.2-2
+libcommons-parent-java==43-1
+libcommons-validator-java==1:1.6-2
+libconst-fast-perl==0.014-1
+libcontextual-return-perl==0.004014-2
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.12-3
+libcryptsetup12==2:2.1.0-5+deb10u2
+libcups2==2.2.10-6+deb10u4
+libcupsfilters1==1.21.6-5
+libcupsimage2==2.2.10-6+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl3-nss==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u2
+libcurl4-nss-dev==7.64.0-4+deb10u2
+libdaemon-dev==0.14-7
+libdaemon0==0.14-7
+libdata-dump-perl==1.23-1
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.12-2
+libdb-dev==5.3.1+nmu1
+libdb5.3-dev==5.3.28+dfsg1-0.5
+libdbi1==0.9.0-5
+libdbus-1-3==1.12.20-0+deb10u1
+libdbus-1-dev==1.12.20-0+deb10u1
+libdconf1==0.30.1-2
+libde265-0==1.0.3-1+b1
+libdevel-callchecker-perl==0.008-1
+libdevel-globaldestruction-perl==0.14-1
+libdevmapper1.02.1==2:1.02.155-3
+libdigest-bubblebabble-perl==0.02-2
+libdigest-hmac-perl==1.03+dfsg-2
+libdistro-info-perl==0.21
+libdjvulibre-text==3.5.27.1-10
+libdjvulibre21==3.5.27.1-10
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdom4j-java==2.1.1-2
+libdouble-conversion1==3.1.0-3
+libdoxia-core-java==1.7-2
+libdoxia-java==1.7-2
+libdoxia-sitetools-java==1.7.5-1
+libdpkg-perl==1.19.7
+libdrm-amdgpu1==2.4.97-1
+libdrm-common==2.4.97-1
+libdrm-dev==2.4.97-1
+libdrm-etnaviv1==2.4.97-1
+libdrm-freedreno1==2.4.97-1
+libdrm-nouveau2==2.4.97-1
+libdrm-radeon1==2.4.97-1
+libdrm-tegra0==2.4.97-1
+libdrm2==2.4.97-1
+libdw-dev==0.176-1.1
+libdw1==0.176-1.1
+libdynaloader-functions-perl==0.003-1
+libeatmydata1==105-7
+libedit-dev==3.1-20181209-1
+libedit2==3.1-20181209-1
+libegl-mesa0==18.3.6-2+deb10u1
+libegl1==1.1.0-1
+libel-api-java==3.0.0-2+deb10u1
+libelf-dev==0.176-1.1
+libelf1==0.176-1.1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.5.3-0.1
+liberror-perl==0.17027-2
+libestr0==0.1.10-2.1
+libevdev2==1.6.0+dfsg-1
+libevent-2.1-6==2.1.8-stable-4
+libevent-core-2.1-6==2.1.8-stable-4
+libevent-dev==2.1.8-stable-4
+libevent-extra-2.1-6==2.1.8-stable-4
+libevent-openssl-2.1-6==2.1.8-stable-4
+libevent-pthreads-2.1-6==2.1.8-stable-4
+libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
+libexplain-dev==1.4.D001-8
+libexplain51==1.4.D001-8
+libexporter-tiny-perl==1.002001-1
+libfakeroot==1.23-1
+libfastjson4==0.99.8-2
+libfcgi-perl==0.78-2+b3
+libffi-dev==3.2.1-9
+libfftw3-double3==3.3.8-2
+libfile-basedir-perl==0.08-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b5
+libfile-homedir-perl==1.004-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.29-1
+libfile-stripnondeterminism-perl==1.1.2-1
+libfile-which-perl==1.23-1
+libfl-dev==2.6.4-6.2
+libfl2==2.6.4-6.2
+libfont-afm-perl==1.20-2
+libfontbox2-java==2.0.13-2
+libfontconfig1==2.13.1-2
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.3-2
+libfreetype6==2.9.1-3+deb10u2
+libfribidi0==1.0.5-3.1+deb10u1
+libfstrm0==0.4.0-1
+libfuture-perl==0.39-1
+libgail-common==2.24.32-3
+libgail18==2.24.32-3
+libgbm1==18.3.6-2+deb10u1
+libgc1c2==1:7.6.4-0.4
+libgcc-8-dev==8.3.0-6
+libgd-perl==2.71-2
+libgd3==2.2.5-5.2
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libgdk-pixbuf2.0-0==2.38.1+dfsg-1
+libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
+libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgeoip1==1.6.12-1
+libgeronimo-annotation-1.3-spec-java==1.0-1
+libgeronimo-interceptor-3.0-spec-java==1.0.1-4
+libgetopt-long-descriptive-perl==0.103-2
+libgfortran-8-dev==8.3.0-6
+libgfortran5==8.3.0-6
+libgif7==5.1.4-3
+libgirepository-1.0-1==1.58.3-2
+libgit-wrapper-perl==0.048-1
+libgitlab-api-v4-perl==0.16-1
+libgl1==1.1.0-1
+libgl1-mesa-dev==18.3.6-2+deb10u1
+libgl1-mesa-dri==18.3.6-2+deb10u1
+libglapi-mesa==18.3.6-2+deb10u1
+libgles1==1.1.0-1
+libgles2==1.1.0-1
+libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-bin==2.58.3-2+deb10u3
+libglib2.0-data==2.58.3-2+deb10u3
+libglib2.0-dev==2.58.3-2+deb10u3
+libglib2.0-dev-bin==2.58.3-2+deb10u3
+libglu1-mesa==9.0.0-2.1+b3
+libglu1-mesa-dev==9.0.0-2.1+b3
+libglvnd-core-dev==1.1.0-1
+libglvnd-dev==1.1.0-1
+libglvnd0==1.1.0-1
+libglx-mesa0==18.3.6-2+deb10u1
+libglx0==1.1.0-1
+libgmp-dev==2:6.1.2+dfsg-4
+libgmpxx4ldbl==2:6.1.2+dfsg-4
+libgnutls-dane0==3.6.7-4+deb10u7
+libgnutls-openssl27==3.6.7-4+deb10u7
+libgnutls28-dev==3.6.7-4+deb10u7
+libgnutls30==3.6.7-4+deb10u7
+libgnutlsxx28==3.6.7-4+deb10u7
+libgomp1==8.3.0-6
+libgoogle-perftools4==2.7-1
+libgpgme11==1.12.0-6
+libgpm2==1.20.7-5
+libgraphite2-3==1.3.13-7
+libgs9==9.27~dfsg-2+deb10u4
+libgs9-common==9.27~dfsg-2+deb10u4
+libgssapi-krb5-2==1.17-3+deb10u1
+libgssrpc4==1.17-3+deb10u1
+libgstreamer1.0-0==1.14.4-1
+libgtest-dev==1.8.1-3
+libgtk-3-0==3.24.5-1
+libgtk-3-bin==3.24.5-1
+libgtk-3-common==3.24.5-1
+libgtk2.0-0==2.24.32-3
+libgtk2.0-bin==2.24.32-3
+libgtk2.0-common==2.24.32-3
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==232-2
+libguice-java==4.2.1-1
+libgvc6==2.40.1-6+deb10u1
+libgvpr2==2.40.1-6+deb10u1
+libharfbuzz-icu0==2.3.1-1
+libharfbuzz0b==2.3.1-1
+libhawtjni-runtime-java==1.16-1
+libheif1==1.3.2-2~deb10u1
+libhogweed4==3.4.1-1+deb10u1
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3+b3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.07-2
+libhttp-cookies-perl==6.04-1
+libhttp-daemon-perl==6.01-3
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.18-1
+libhttp-negotiate-perl==6.01-1
+libhttp-tiny-multipart-perl==0.08-1
+libhttpclient-java==4.5.7-1+deb10u1
+libhttpcore-java==4.4.11-1
+libhwloc-dev==1.11.12-3
+libhwloc-plugins==1.11.12-3
+libhwloc5==1.11.12-3
+libiberty-dev==20190122-1
+libibverbs-dev==22.1-1
+libibverbs1==22.1-1
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libidn11==1.33-2.2
+libidn2-dev==2.0.5-1+deb10u1
+libijs-0.35==0.35-14
+libilmbase23==2.2.1-2
+libimagequant0==2.12.2-1.1
+libimport-into-perl==1.002005-1
+libinput-bin==1.12.6-2+deb10u1
+libinput10==1.12.6-2+deb10u1
+libio-async-perl==0.72-1
+libio-html-perl==1.001-1
+libio-prompter-perl==0.004015-1
+libio-pty-perl==1:1.08-1.1+b5
+libio-sessiondata-perl==1.03-1
+libio-socket-ssl-perl==2.060-3
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-3
+libip4tc-dev==1.8.2-4
+libip4tc0==1.8.2-4
+libip6tc-dev==1.8.2-4
+libip6tc0==1.8.2-4
+libipc-run-perl==20180523.0-1
+libipc-system-simple-perl==1.25-4
+libiptc-dev==1.8.2-4
+libiptc0==1.8.2-4
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisl19==0.20-2
+libitext1-java==1.4-7
+libitm1==8.3.0-6
+libjansi-java==1.17.1-1
+libjansi-native-java==1.8-1
+libjansson-dev==2.12-1
+libjansson4==2.12-1
+libjaxen-java==1.1.6-4
+libjaxp1.3-java==1.3.05-5
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.16-1
+libjemalloc-dev==5.1.0-3
+libjemalloc2==5.1.0-3
+libjetty9-java==9.4.15-1
+libjpeg62-turbo==1:1.5.2-2+deb10u1
+libjs-bootstrap==3.4.1+dfsg-1
+libjs-jquery==3.3.1~dfsg-3+deb10u1
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==12-1.1
+libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-3
+libjs-sphinxdoc==1.8.4-1
+libjs-underscore==1.9.1~dfsg-1+deb10u1
+libjson-c-dev==0.12.1+ds-2+deb10u1
+libjson-c3==0.12.1+ds-2+deb10u1
+libjson-glib-1.0-0==1.4.4-2
+libjson-glib-1.0-common==1.4.4-2
+libjson-perl==4.02000-1
+libjson-xs-perl==3.040-1+b1
+libjsoncpp1==1.7.4-3
+libjsp-api-java==2.3.4-2+deb10u1
+libjsr305-java==0.1~+svn49-11
+libjtidy-java==7+svn20110807-5
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libk5crypto3==1.17-3+deb10u1
+libkadm5clnt-mit11==1.17-3+deb10u1
+libkadm5srv-mit11==1.17-3+deb10u1
+libkdb5-9==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libkmod2==26-1
+libkpathsea6==2018.20181218.49446-1
+libkrb5-3==1.17-3+deb10u1
+libkrb5-dev==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libksba8==1.3.5-2
+liblab-gamut1==2.40.1-6+deb10u1
+liblcms2-2==2.9-3
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+libldap2-dev==2.4.47+dfsg-3+deb10u6
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b4
+libllvm6.0==1:6.0.1-10
+libllvm7==1:7.0.1-8+deb10u2
+liblmdb0==0.9.22-1
+liblocale-gettext-perl==1.07-3+b4
+liblockfile-bin==1.14-1.1
+liblockfile1==1.14-1.1
+liblog-any-adapter-screen-perl==0.140-1
+liblog-any-perl==1.707-1
+liblog4j1.2-java==1.2.17-8+deb10u1
+liblognorm5==2.0.5-1
+liblqr-1-0==0.4.2-2.1
+liblsan0==8.3.0-6
+libltdl-dev==2.4.6-9
+libltdl7==2.4.6-9
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.07-2
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
+liblzma-dev==5.2.4-1
+liblzo2-2==2.10-0.1
+liblzo2-dev==2.10-0.1
+libmagic-mgc==1:5.35-4+deb10u2
+libmagic1==1:5.35-4+deb10u2
+libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmail-sendmail-perl==0.80-1
+libmailtools-perl==2.18-1
+libmariadb-dev==1:10.3.29-0+deb10u1
+libmariadb-dev-compat==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.29-0+deb10u1
+libmaven-archiver-java==3.2.0-2
+libmaven-clean-plugin-java==3.1.0-1
+libmaven-common-artifact-filters-java==3.0.1-3
+libmaven-compiler-plugin-java==3.8.0-2
+libmaven-filtering-java==3.1.1-1
+libmaven-jar-plugin-java==3.1.1-1
+libmaven-parent-java==31-2
+libmaven-plugin-tools-java==3.6.0-1
+libmaven-reporting-api-java==3.0-1
+libmaven-reporting-exec-java==1.4-2
+libmaven-reporting-impl-java==3.0.0-2
+libmaven-resolver-java==1.3.1-1
+libmaven-resources-plugin-java==3.1.0-1
+libmaven-shared-incremental-java==1.1-3
+libmaven-shared-utils-java==3.3.0-1
+libmaven-site-plugin-java==3.6-3
+libmaven3-core-java==3.6.0-1
+libmime-tools-perl==5.509-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmnl0==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.016-1
+libmoo-perl==2.003004-2
+libmount-dev==2.33.1-0.1
+libmpc3==1.1.0-1
+libmpdec2==2.4.2-2
+libmpfr6==4.0.2-1
+libmtdev1==1.1.5-1+b1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==1.1.5+dfsg-1
+libnanomsg5==1.1.5+dfsg-1
+libncurses-dev==6.1+20181013-2+deb10u2
+libncurses5-dev==6.1+20181013-2+deb10u2
+libncurses6==6.1+20181013-2+deb10u2
+libnet-dbus-perl==1.1.0-5+b1
+libnet-dns-perl==1.19-1
+libnet-dns-sec-perl==1.11-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.18-1
+libnet-ip-perl==1.26-2
+libnet-libidn-perl==0.12.ds-3+b1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.85-2+b1
+libnetfilter-conntrack-dev==1.0.7-1
+libnetfilter-conntrack3==1.0.7-1
+libnetpbm10==2:10.0-15.3+b2
+libnettle6==3.4.1-1+deb10u1
+libnewt-dev==0.52.20-8
+libnewt0.52==0.52.20-8
+libnfnetlink-dev==1.0.1-3+b1
+libnfnetlink0==1.0.1-3+b1
+libnftables0==0.9.0-2
+libnftnl-dev==1.1.2-2
+libnftnl11==1.1.2-2
+libnghttp2-14==1.36.0-2+deb10u1
+libnl-3-200==3.4.0-1
+libnl-3-dev==3.4.0-1
+libnl-route-3-200==3.4.0-1
+libnl-route-3-dev==3.4.0-1
+libnorm-dev==1.5.8+dfsg2-1
+libnorm1==1.5.8+dfsg2-1
+libnpth0==1.6-1
+libnspr4==2:4.20-1
+libnss-systemd==241-7~deb10u8
+libnss3==2:3.42.1-1+deb10u3
+libnuma-dev==2.0.12-1
+libnuma1==2.0.12-1
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-8-dev==8.3.0-6
+libobjc4==8.3.0-6
+libomp-7-dev==1:7.0.1-8+deb10u2
+libomp5-7==1:7.0.1-8+deb10u2
+libopencsd-dev==0.10.1-1
+libopencsd0==0.10.1-1
+libopenexr23==2.2.1-4.1+deb10u1
+libopengl0==1.1.0-1
+libopenjp2-7==2.3.0-2+deb10u2
+libopenmpi-dev==3.1.3-11
+libopenmpi3==3.1.3-11
+libopts25==1:5.18.12-4
+libopts25-dev==1:5.18.12-4
+liboro-java==2.0.8a-13
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b7
+libossp-uuid16==1.6.2-1.5+b7
+libp11-kit-dev==0.23.15-2+deb10u1
+libp11-kit0==0.23.15-2+deb10u1
+libpackage-stash-perl==0.38-1
+libpackage-stash-xs-perl==0.29-1
+libpackagekit-glib2-18==1.1.12-5
+libpam-cap==1:2.25-2
+libpam-systemd==241-7~deb10u8
+libpam0g-dev==1.3.1-5
+libpango-1.0-0==1.42.4-8~deb10u1
+libpangocairo-1.0-0==1.42.4-8~deb10u1
+libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpaper-utils==1.1.28
+libpaper1==1.1.28
+libparams-classify-perl==0.015-1+b1
+libparams-util-perl==1.07-3+b4
+libparams-validate-perl==1.29-1+b1
+libparboiled-java==1.1.7-2
+libparse-debianchangelog-perl==1.2.0-13
+libpath-iterator-rule-perl==1.014-1
+libpath-tiny-perl==0.108-1
+libpathplan4==2.40.1-6+deb10u1
+libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.14-1
+libpcre16-3==2:8.39-12
+libpcre2-16-0==10.32-5
+libpcre3-dev==2:8.39-12
+libpcre32-3==2:8.39-12
+libpcrecpp0v5==2:8.39-12
+libpcsclite1==1.8.24-1
+libpegdown-java==1.6.0-1
+libperl-dev==5.28.1-6+deb10u1
+libperl5.28==5.28.1-6+deb10u1
+libperlio-gzip-perl==0.19-1+b5
+libpgm-5.2-0==5.2.122~dfsg-3
+libpgm-dev==5.2.122~dfsg-3
+libpipeline1==1.5.1-2
+libpixman-1-0==0.36.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-4
+libplexus-archiver-java==3.6.0-2
+libplexus-bsh-factory-java==1.0~alpha7-4
+libplexus-build-api-java==0.0.7-3
+libplexus-cipher-java==1.7-3
+libplexus-classworlds-java==2.6.0-1
+libplexus-compiler-java==2.8.5-1
+libplexus-component-annotations-java==1.7.1-7
+libplexus-container-default-java==1.7.1-7
+libplexus-container-default1.5-java==1.7.1-7
+libplexus-i18n-java==1.0-beta-10-5
+libplexus-interpolation-java==1.25-1
+libplexus-io-java==3.1.1-1
+libplexus-languages-java==0.9.10-1
+libplexus-sec-dispatcher-java==1.4-4
+libplexus-utils2-java==3.1.1-1
+libplexus-velocity-java==1.2-3
+libpmix2==3.1.2-3
+libpng-dev==1.6.36-6
+libpng16-16==1.6.36-6
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-25
+libpolkit-backend-1-0==0.105-25
+libpolkit-gobject-1-0==0.105-25
+libpopt0==1.16-12
+libpotrace0==1.15-1
+libprocps7==2:3.3.15-2
+libprotobuf-c1==1.3.1-1+b1
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libprotoc17==3.6.1.3-2
+libproxy1v5==0.4.15-5+deb10u1
+libptexenc1==2018.20181218.49446-1
+libpthread-stubs0-dev==0.4-1
+libpython-all-dev==2.7.16-1
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-all-dbg==3.7.3-1
+libpython3-all-dev==3.7.3-1
+libpython3-dbg==3.7.3-1
+libpython3-dev==3.7.3-1
+libpython3-stdlib==3.7.3-1
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dbg==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
+libqdox-java==1.12.1-3
+libqdox2-java==2.0~M10-1
+libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
+libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
+libqt4-designer==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
+libqt4-help==4:4.8.7+dfsg-18+deb10u1
+libqt4-network==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
+libqt4-script==4:4.8.7+dfsg-18+deb10u1
+libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
+libqt4-svg==4:4.8.7+dfsg-18+deb10u1
+libqt4-test==4:4.8.7+dfsg-18+deb10u1
+libqt4-xml==4:4.8.7+dfsg-18+deb10u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
+libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5gui5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
+libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
+libqt5svg5==5.11.3-2
+libqt5test5==5.11.3+dfsg1-1+deb10u4
+libqt5widgets5==5.11.3+dfsg1-1+deb10u4
+libqt5xml5==5.11.3+dfsg1-1+deb10u4
+libqtcore4==4:4.8.7+dfsg-18+deb10u1
+libqtdbus4==4:4.8.7+dfsg-18+deb10u1
+libqtgui4==4:4.8.7+dfsg-18+deb10u1
+libreadline-dev==7.0-5
+libreadline7==7.0-5
+libreadonly-perl==2.050-1
+libref-util-perl==0.204-1
+libref-util-xs-perl==0.117-1+b1
+libregexp-assemble-perl==0.36-1
+libregexp-pattern-license-perl==3.0.31-4
+librest-0.7-0==0.8.1-1
+librhash0==1.3.8-1
+librole-tiny-perl==2.000006-1
+librrd-dev==1.7.1-2
+librrd8==1.7.1-2
+librsvg2-2==2.44.10-2.1
+librsvg2-common==2.44.10-2.1
+librtmp1==2.4+20151223.gitfa8646d.1-2
+libruby2.5==2.5.5-3+deb10u3
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsaxon-java==1:6.5.5-12
+libselinux1-dev==2.8-1+b1
+libsensors-config==1:3.5.0-3
+libsensors4-dev==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libsepol1-dev==2.8-1
+libsereal-decoder-perl==4.005+ds-1+b1
+libsereal-encoder-perl==4.005+ds-1+b1
+libsereal-perl==4.005-1
+libservlet-api-java==4.0.1-2
+libservlet3.1-java==1:4.0.1-2
+libsigsegv2==2.12-2
+libsisu-guice-java==4.2.0-1
+libsisu-inject-java==0.3.3-1
+libsisu-ioc-java==2.3.0-11
+libsisu-plexus-java==0.3.3-3
+libslang2==2.3.2-2
+libslang2-dev==2.3.2-2
+libslf4j-java==1.7.25-3
+libsm-dev==2:1.2.3-1
+libsm6==2:1.2.3-1
+libsnappy-java==1.1.7.2-1
+libsnappy-jni==1.1.7.2-1
+libsnappy1v5==1.1.7-1
+libsnmp-base==5.7.3+dfsg-5+deb10u2
+libsnmp-dev==5.7.3+dfsg-5+deb10u2
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libsoap-lite-perl==1.27-1
+libsodium-dev==1.0.17-1
+libsodium23==1.0.17-1
+libsort-key-perl==1.33-2+b1
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.64.2-2
+libsoup2.4-1==2.64.2-2
+libsqlite3-0==3.27.2-3+deb10u1
+libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u6
+libssl1.1==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libstemmer0d==0+svn585-1+b2
+libstrictures-perl==2.000005-1
+libstring-copyright-perl==0.003006-1
+libstring-escape-perl==2010.002-2
+libstring-shellquote-perl==1.04-1
+libstruct-dumb-perl==0.09-1
+libsub-exporter-perl==0.987-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.14-1+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1+b3
+libsub-quote-perl==2.005001-1
+libsubunit-dev==1.3.0-1
+libsubunit0==1.3.0-1
+libsurefire-java==2.22.1-1
+libswitch-perl==2.17-2
+libsynctex2==2018.20181218.49446-1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==241-7~deb10u8
+libsystemd0==241-7~deb10u8
+libtask-weaken-perl==1.06-1
+libtasn1-6-dev==4.13-3
+libtasn1-doc==4.13-3
+libtcl8.6==8.6.9+dfsg-2
+libtcmalloc-minimal4==2.7-1
+libteckit0==2.5.8+ds2-5
+libterm-readkey-perl==2.38-1
+libtest-fatal-perl==0.014-1
+libtest-refcount-perl==0.08-3
+libtexlua52==2018.20181218.49446-1
+libtexlua53==2018.20181218.49446-1
+libtext-charwidth-perl==0.04-7.1+b1
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b6
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.28-2
+libthai0==0.1.28-2
+libtie-ixhash-perl==1.23-2
+libtiff5==4.1.0+git191117-2~deb10u2
+libtimedate-perl==2.3000-2+deb10u1
+libtinyxml2-6a==7.0.0+dfsg-1
+libtinyxml2-dev==7.0.0+dfsg-1
+libtk8.6==8.6.9-2
+libtool==2.4.6-9
+libtool-bin==2.4.6-9
+libtry-tiny-perl==0.30-1
+libtsan0==8.3.0-6
+libtype-tiny-perl==1.004004-1
+libtype-tiny-xs-perl==0.014-1+b1
+libtypes-serialiser-perl==1.0-1
+libubsan1==8.3.0-6
+libuchardet0==0.0.6-3
+libudev-dev==241-7~deb10u8
+libudev1==241-7~deb10u8
+libunbound8==1.9.0-2+deb10u2
+libunicode-utf8-perl==0.62-1
+libunwind-dev==1.2.1-10~deb10u1
+libunwind8==1.2.1-10~deb10u1
+liburi-perl==1.76-1
+libusb-0.1-4==2:0.1.12-32
+libusb-1.0-0==2:1.0.22-2
+libusb-1.0-0-dev==2:1.0.22-2
+libusb-1.0-doc==2:1.0.22-2
+libusb-dev==2:0.1.12-32
+libutempter0==1.1.6-3
+libuv1==1.24.1-1+deb10u1
+libvariable-magic-perl==0.62-1+b1
+libvelocity-tools-java==2.0-7
+libvulkan-dev==1.1.97-2
+libvulkan1==1.1.97-2
+libwacom-bin==0.32-1
+libwacom-common==0.32-1
+libwacom2==0.32-1
+libwagon-file-java==3.3.1-2
+libwagon-http-shaded-java==3.3.1-2
+libwagon-provider-api-java==3.3.1-2
+libwant-perl==0.29-1+b4
+libwayland-client0==1.16.0-1
+libwayland-cursor0==1.16.0-1
+libwayland-egl1==1.16.0-1
+libwayland-server0==1.16.0-1
+libwebp6==0.6.1-2+deb10u1
+libwebpdemux2==0.6.1-2+deb10u1
+libwebpmux3==0.6.1-2+deb10u1
+libwebsocket-api-java==1.1-1+deb10u1
+libwmf0.2-7==0.2.8.4-14
+libwoff1==1.0.2-1
+libwrap0==7.6.q-28
+libwrap0-dev==7.6.q-28
+libwww-perl==6.36-2
+libwww-robotrules-perl==6.02-1
+libx11-6==2:1.6.7-1+deb10u2
+libx11-data==2:1.6.7-1+deb10u2
+libx11-dev==2:1.6.7-1+deb10u2
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.7-1+deb10u2
+libx11-xcb1==2:1.6.7-1+deb10u2
+libx265-165==2.9-4
+libxalan2-java==2.7.2-2
+libxapian30==1.4.11-1
+libxau-dev==1:1.0.8-1+b2
+libxau6==1:1.0.8-1+b2
+libxaw7==2:1.0.13-1+b2
+libxbean-reflect-java==4.5-8
+libxcb-dri2-0==1.13.1-2
+libxcb-dri2-0-dev==1.13.1-2
+libxcb-dri3-0==1.13.1-2
+libxcb-dri3-dev==1.13.1-2
+libxcb-glx0==1.13.1-2
+libxcb-glx0-dev==1.13.1-2
+libxcb-icccm4==0.4.1-1.1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.13.1-2
+libxcb-present0==1.13.1-2
+libxcb-randr0==1.13.1-2
+libxcb-randr0-dev==1.13.1-2
+libxcb-render-util0==0.3.9-1+b1
+libxcb-render0==1.13.1-2
+libxcb-render0-dev==1.13.1-2
+libxcb-shape0==1.13.1-2
+libxcb-shape0-dev==1.13.1-2
+libxcb-shm0==1.13.1-2
+libxcb-sync-dev==1.13.1-2
+libxcb-sync1==1.13.1-2
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.13.1-2
+libxcb-xfixes0-dev==1.13.1-2
+libxcb-xinerama0==1.13.1-2
+libxcb-xkb1==1.13.1-2
+libxcb1==1.13.1-2
+libxcb1-dev==1.13.1-2
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.15-2
+libxdamage-dev==1:1.1.4-3+b3
+libxdamage1==1:1.1.4-3+b3
+libxdelta2==1.1.3-9.2
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.40.1-6+deb10u1
+libxerces2-java==2.12.0-1
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.4-2
+libxkbcommon-x11-0==0.8.2-1
+libxkbcommon0==0.8.2-1
+libxml-commons-external-java==1.4.01-3
+libxml-commons-resolver1.1-java==1.2-9
+libxml-libxml-perl==2.0134+dfsg-1
+libxml-namespacesupport-perl==1.12-1
+libxml-parser-perl==2.44-4
+libxml-sax-base-perl==1.09-1
+libxml-sax-expat-perl==0.51-1
+libxml-sax-perl==1.00+dfsg-1
+libxml-simple-perl==2.25-1
+libxml-twig-perl==1:3.50-1.1
+libxml-xpathengine-perl==0.14-1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxml2-utils==2.9.4+dfsg1-7+deb10u2
+libxmlgraphics-commons-java==2.3-1
+libxmlrpc-lite-perl==0.717-2
+libxmu6==2:1.1.2-2+b3
+libxmuu1==2:1.1.2-2+b3
+libxpm4==1:3.5.12-1
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.3-1
+libxshmfence1==1.3-1
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+libxss1==1:1.2.3-1
+libxt-dev==1:1.1.5-1+b3
+libxt6==1:1.1.5-1+b3
+libxtables-dev==1.8.2-4
+libxtables12==1.8.2-4
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libxxhash0==0.6.5-2
+libxz-java==1.8-2
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+libyaml-libyaml-perl==0.76+repack-1
+libzmq3-dev==4.3.1-4+deb10u2
+libzmq5==4.3.1-4+deb10u2
+libzzip-0-13==0.13.62-3.2
+licensecheck==3.0.31-3
+lintian==2.15.0
+linux-kbuild-4.19==4.19.194-3
+linux-libc-dev==4.19.194-3
+linuxdoc-tools==0.9.73-2
+llvm-7==1:7.0.1-8+deb10u2
+llvm-7-dev==1:7.0.1-8+deb10u2
+llvm-7-runtime==1:7.0.1-8+deb10u2
+lmodern==2.004.5-6
+logrotate==3.14.0-4
+lsb-base==10.2019051400
+lsb-release==10.2019051400
+lsof==4.91+dfsg-1
+lua-bitop==1.0.2-5
+lua-bitop-dev==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+lua-cjson-dev==2.1.0+dfsg-2.1
+lynx==2.8.9rel.1-3
+lynx-common==2.8.9rel.1-3
+m4==1.4.18-2
+make==4.2.1-1.2
+man-db==2.8.5-2
+manpages==4.16-2
+manpages-dev==4.16-2
+mariadb-common==1:10.3.29-0+deb10u1
+maven==3.6.0-1
+maven-debian-helper==2.3.2
+maven-repo-helper==1.9.3
+mesa-common-dev==18.3.6-2+deb10u1
+mime-support==3.62
+module-assistant==0.11.10
+mysql-common==5.8+1.0.5
+ncurses-term==6.1+20181013-2+deb10u2
+netbase==5.6
+netpbm==2:10.0-15.3+b2
+nettle-dev==3.4.1-1+deb10u1
+nftables==0.9.0-2
+nodejs==14.17.2-1nodesource1
+ocl-icd-libopencl1==2.2.12-2
+openjdk-11-jdk==11.0.11+9-1~deb10u1
+openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
+openjdk-11-jre==11.0.11+9-1~deb10u1
+openjdk-11-jre-headless==11.0.11+9-1~deb10u1
+openmpi-bin==3.1.3-11
+openmpi-common==3.1.3-11
+opensp==1.5.2-13+b1
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+openssl==1.1.1d-0+deb10u6
+packagekit==1.1.12-5
+packagekit-tools==1.1.12-5
+patch==2.7.6-3+deb10u1
+patchutils==0.3.4-2
+pbuilder==0.230.4
+pbzip2==1.1.9-1+b1
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+perl-openssl-defaults==3
+php-cli==2:7.3+69
+php-codecoverage==6.1.4+dfsg-1
+php-common==2:69
+php-deepcopy==1.8.1-1
+php-doctrine-instantiator==1.1.0-2
+php-file-iterator==2.0.2-1
+php-mbstring==2:7.3+69
+php-pear==1:1.10.6+submodules+notgz-1.1+deb10u2
+php-phar-io-manifest==1.0.3-1
+php-phar-io-version==2.0.1-1
+php-phpdocumentor-reflection-common==1.0.1-1
+php-phpdocumentor-reflection-docblock==4.3.0-1
+php-phpdocumentor-type-resolver==0.4.0-2
+php-phpspec-prophecy==1.8.0-1
+php-text-template==1.2.1-2
+php-timer==2.1.1-1
+php-token-stream==3.0.1-1
+php-tokenizer==1.1.0-1
+php-webmozart-assert==1.4.0-3
+php-xml==2:7.3+69
+php7.3-cli==7.3.29-1~deb10u1
+php7.3-common==7.3.29-1~deb10u1
+php7.3-json==7.3.29-1~deb10u1
+php7.3-mbstring==7.3.29-1~deb10u1
+php7.3-opcache==7.3.29-1~deb10u1
+php7.3-readline==7.3.29-1~deb10u1
+php7.3-xml==7.3.29-1~deb10u1
+phpunit==7.5.6-1
+phpunit-code-unit-reverse-lookup==1.0.1-1
+phpunit-comparator==3.0.2-1
+phpunit-diff==3.0.2-1
+phpunit-environment==4.1.0-1
+phpunit-exporter==3.1.0-2
+phpunit-global-state==2.0.0really2.0.0-2
+phpunit-object-enumerator==3.0.3-3
+phpunit-object-reflector==1.1.1-2
+phpunit-recursion-context==3.0.0-2
+phpunit-resource-operations==2.0.1-1
+phpunit-version==2.0.1-1
+pigz==2.4-1
+pinentry-curses==1.1.0-2
+pkg-config==0.29-6
+pkg-php-tools==1.37
+po-debconf==1.0.21
+policykit-1==0.105-25
+poppler-data==0.4.9-2
+pps-tools==1.0.2-1
+preview-latex-style==11.91-2
+pristine-tar==1.46
+procmail==3.22-26
+procps==2:3.3.15-2
+protobuf-compiler==3.6.1.3-2
+psmisc==23.2-1
+psutils==1.17.dfsg-4
+pylint==1.9.4-1
+python==2.7.16-1
+python-alabaster==0.7.8-1
+python-all==2.7.16-1
+python-all-dev==2.7.16-1
+python-apt-common==1.8.4.3
+python-asn1crypto==0.24.0-1
+python-astroid==1.6.5-3
+python-atomicwrites==1.1.5-2
+python-attr==18.2.0-1
+python-automat==0.6.0-1
+python-babel==2.6.0+dfsg.1-1
+python-babel-localedata==2.6.0+dfsg.1-1
+python-backports.functools-lru-cache==1.5-3
+python-bs4==4.7.1-1
+python-certifi==2018.8.24-1
+python-cffi-backend==1.12.2-1
+python-chardet==3.0.4-3
+python-click==7.0-1
+python-colorama==0.3.7-1
+python-concurrent.futures==3.2.0-2
+python-configparser==3.5.0b2-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-2
+python-coverage==4.5.2+dfsg.1-1
+python-crypto==2.6.1-9+b1
+python-cryptography==2.6.1-3+deb10u2
+python-dbus==1.2.8-3
+python-dev==2.7.16-1
+python-docutils==0.14+dfsg-4
+python-egenix-mxdatetime==3.2.9-1
+python-egenix-mxtools==3.2.9-1
+python-entrypoints==0.3-1
+python-enum34==1.1.6-2
+python-funcsigs==1.0.2-4
+python-gi==3.30.4-1
+python-html5lib==1.0.1-1
+python-hyperlink==17.3.1-2
+python-idna==2.6-1
+python-imagesize==1.0.0-1
+python-incremental==16.10.1-3
+python-ipaddr==2.2.0-2
+python-ipaddress==1.0.17-1
+python-isort==4.3.4+ds1-1.1
+python-jinja2==2.10-2
+python-keyring==17.1.1-1
+python-keyrings.alt==3.1.1-1
+python-lazy-object-proxy==1.3.1-1+b1
+python-logilab-common==1.4.2-1
+python-lxml==4.3.2-1+deb10u3
+python-markupsafe==1.1.0-1
+python-mccabe==0.6.1-2
+python-minimal==2.7.16-1
+python-mock==2.0.0-4
+python-more-itertools==4.2.0-1
+python-nose2==0.8.0-1
+python-olefile==0.46-1
+python-openssl==19.0.0-1
+python-packaging==19.0-1
+python-parse==1.6.6-0.1
+python-pathlib2==2.3.3-1
+python-pbr==4.2.0-5
+python-pil==5.4.1-2+deb10u2
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-pluggy==0.8.0-1
+python-py==1.7.0-2
+python-pyasn1==0.4.2-3
+python-pyasn1-modules==0.2.1-0.2
+python-pygments==2.3.1+dfsg-1+deb10u2
+python-pyparsing==2.2.0+dfsg1-2
+python-pytest==3.10.1-2
+python-pytest-cov==2.6.0-1
+python-requests==2.21.0-1
+python-roman==2.0.0-3
+python-scandir==1.9.0-2
+python-secretstorage==2.3.1-2
+python-service-identity==16.0.0-2
+python-setuptools==40.8.0-1
+python-singledispatch==3.4.0.3-2
+python-six==1.12.0-1
+python-soupsieve==1.8+dfsg-1
+python-sphinx==1.8.4-1
+python-stdeb==0.8.5-1
+python-tk==2.7.16-2
+python-twisted==18.9.0-3
+python-twisted-bin==18.9.0-3
+python-twisted-core==18.9.0-3
+python-typing==3.6.6-1
+python-tz==2019.1-1
+python-urllib3==1.24.1-1
+python-webencodings==0.5.1-1
+python-wheel==0.32.3-2
+python-wrapt==1.10.11-1
+python-xdg==0.25-5
+python-zope.interface==4.3.2-1+b2
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3==3.7.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.7.3-1
+python3-all-dbg==3.7.3-1
+python3-all-dev==3.7.3-1
+python3-apt==1.8.4.3
+python3-asn1crypto==0.24.0-1
+python3-atomicwrites==1.1.5-2
+python3-attr==18.2.0-1
+python3-babel==2.6.0+dfsg.1-1
+python3-certifi==2018.8.24-1
+python3-cffi-backend==1.12.2-1
+python3-chardet==3.0.4-3
+python3-cov-core==1.15.0-2
+python3-coverage==4.5.2+dfsg.1-1
+python3-crypto==2.6.1-9+b1
+python3-cryptography==2.6.1-3+deb10u2
+python3-dateutil==2.7.3-3
+python3-dbg==3.7.3-1
+python3-dbus==1.2.8-3
+python3-debian==0.1.35
+python3-dev==3.7.3-1
+python3-distro-info==0.21
+python3-distutils==3.7.3-1
+python3-docutils==0.14+dfsg-4
+python3-entrypoints==0.3-1
+python3-gi==3.30.4-1
+python3-gpg==1.12.0-6
+python3-idna==2.6-1
+python3-imagesize==1.0.0-1
+python3-jinja2==2.10-2
+python3-keyring==17.1.1-1
+python3-keyrings.alt==3.1.1-1
+python3-lib2to3==3.7.3-1
+python3-magic==2:0.4.15-2
+python3-markupsafe==1.1.0-1
+python3-minimal==3.7.3-1
+python3-mock==2.0.0-4
+python3-more-itertools==4.2.0-1
+python3-nose2==0.8.0-1
+python3-olefile==0.46-1
+python3-packaging==19.0-1
+python3-pbr==4.2.0-5
+python3-pil==5.4.1-2+deb10u2
+python3-pkg-resources==40.8.0-1
+python3-pluggy==0.8.0-1
+python3-py==1.7.0-2
+python3-pycurl==7.43.0.2-0.1
+python3-pygments==2.3.1+dfsg-1+deb10u2
+python3-pyparsing==2.2.0+dfsg1-2
+python3-pytest==3.10.1-2
+python3-pytest-cov==2.6.0-1
+python3-requests==2.21.0-1
+python3-roman==2.0.0-3
+python3-secretstorage==2.3.1-2
+python3-setuptools==40.8.0-1
+python3-six==1.12.0-1
+python3-software-properties==0.96.20.2-2
+python3-sphinx==1.8.4-1
+python3-sphinx-rtd-theme==0.4.3+dfsg-1
+python3-tz==2019.1-1
+python3-unidiff==0.5.4-1
+python3-urllib3==1.24.1-1
+python3-wheel==0.32.3-2
+python3-xdg==0.25-5
+python3.7==3.7.3-2+deb10u3
+python3.7-dbg==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
+qdbus==4:4.8.7+dfsg-18+deb10u1
+qt-at-spi==0.4.0-9
+qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
+qt4-qmake==4:4.8.7+dfsg-18+deb10u1
+qt5-default==5.11.3+dfsg1-1+deb10u4
+qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
+qt5-qmake==5.11.3+dfsg1-1+deb10u4
+qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
+qtchooser==66-2
+qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
+qttranslations5-l10n==5.11.3-2
+quilt==0.65-3
+rake==12.3.1-3+deb10u1
+readline-common==7.0-5
+rrdtool==1.7.1-2
+rsync==3.1.3-6
+rsyslog==8.1901.0-1
+ruby==1:2.5.1
+ruby-all-dev==1:2.5.1
+ruby-asciidoctor==1.5.8-1
+ruby-did-you-mean==1.2.1-1
+ruby-minitest==5.11.3-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==1.1.1-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.2.8-1
+ruby-xmlrpc==0.3.0-2
+ruby2.5==2.5.5-3+deb10u3
+ruby2.5-dev==2.5.5-3+deb10u3
+ruby2.5-doc==2.5.5-3+deb10u3
+rubygems-integration==1.11+deb10u1
+sensible-utils==0.0.12
+sgml-base==1.29
+sgml-data==2.0.11
+shared-mime-info==1.10-1
+shellcheck==0.5.0-3
+software-properties-common==0.96.20.2-2
+sphinx-common==1.8.4-1
+sphinx-rtd-theme-common==0.4.3+dfsg-1
+squashfs-tools==1:4.3-12
+stgit==0.18-1
+strace==4.26-0.2
+sudo==1.8.27-1+deb10u3
+swig==3.0.12-2
+swig3.0==3.0.12-2
+systemd==241-7~deb10u8
+systemd-sysv==241-7~deb10u8
+t1utils==1.41-3
+tcl==8.6.9+1
+tcl8.6==8.6.9+dfsg-2
+telnet==0.17-41.2
+tex-common==6.11
+tex-gyre==20180621-3
+texi2html==1.82+dfsg1-5
+texinfo==6.5.0.dfsg.1-4+b1
+texlive-base==2018.20190227-2
+texlive-binaries==2018.20181218.49446-1
+texlive-fonts-recommended==2018.20190227-2
+texlive-generic-recommended==2018.20190227-2
+texlive-latex-base==2018.20190227-2
+texlive-latex-extra==2018.20190227-2
+texlive-latex-recommended==2018.20190227-2
+texlive-pictures==2018.20190227-2
+texlive-plain-generic==2018.20190227-2
+tipa==2:1.3-20
+tk==8.6.9+1
+tk8.6==8.6.9-2
+tk8.6-blt2.5==2.5.3+dfsg-4
+ucf==3.0038+nmu1
+unattended-upgrades==1.11.2
+unzip==6.0-23+deb10u2
+uuid-dev==2.33.1-0.1
+velocity==1.7-5+deb10u1
+vim==2:8.1.0875-5
+vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+wdiff==1.2.2-2+b1
+x11-common==1:7.7+19
+x11-utils==7.7+4
+x11-xserver-utils==7.7+8
+x11proto-core-dev==2018.4-4
+x11proto-damage-dev==1:2018.4-4
+x11proto-dev==2018.4-4
+x11proto-fixes-dev==1:2018.4-4
+x11proto-xext-dev==2018.4-4
+x11proto-xf86vidmode-dev==2018.4-4
+xauth==1:1.0.10-1
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.2
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.17-2
+xdg-utils==1.1.3-1+deb10u1
+xfonts-encodings==1:1.0.4-2
+xfonts-utils==1:7.7+6
+xkb-data==2.26-2
+xml-core==0.18+nmu1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.32-2.2~deb10u1
+xterm==344-1+deb10u1
+xtrans-dev==1.3.5-1
+xxd==2:8.1.0875-5
+xz-utils==5.2.4-1
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
new file mode 100644
index 000000000000..182ead414d40
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
@@ -0,0 +1,92 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+astroid==1.6.5
+atomicwrites==1.1.5
+attrs==18.2.0
+automat==0.6.0
+babel==2.6.0
+backports.functools-lru-cache==1.5
+beautifulsoup4==4.7.1
+certifi==2018.8.24
+chardet==3.0.4
+click==7.0
+colorama==0.3.7
+configparser==3.5.0b2
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.5.2
+crc16==0.1.1
+cryptography==2.6.1
+ctypesgen==1.0.2
+docutils==0.14
+entrypoints==0.3
+enum34==1.1.6
+fastentrypoints==0.12
+funcsigs==1.0.2
+futures==3.2.0
+html5lib==1.0.1
+hyperlink==17.3.1
+idna==2.6
+imagesize==1.0.0
+incremental==16.10.1
+ipaddr==2.2.0
+ipaddress==1.0.17
+isort==4.3.4
+j2cli==0.3.10
+jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lazy-object-proxy==1.3.1
+logilab-common==1.4.2
+lxml==4.6.2
+m2crypto==0.36.0
+markupsafe==1.1.0
+mccabe==0.6.1
+mmh3==2.5.1
+mock==3.0.5
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose==1.3.7
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+parse==1.6.6
+pathlib2==2.3.3
+pbr==4.2.0
+pexpect==4.6.0
+pillow==5.4.1
+pluggy==0.8.0
+ptyprocess==0.7.0
+py==1.7.0
+pyasn1==0.4.2
+pyasn1-modules==0.2.1
+pycrypto==2.6.1
+pygments==2.3.1
+pygobject==3.30.4
+pylint==1.9.4
+pympler==0.8
+pyopenssl==19.0.0
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==4.4
+pytz==2019.1
+pyxdg==0.25
+pyyaml==5.4.1
+requests==2.21.0
+roman==2.0.0
+scandir==1.9.0
+secretstorage==2.3.1
+service-identity==16.0.0
+singledispatch==3.4.0.3
+six==1.12.0
+soupsieve==1.8
+sphinx==1.8.4
+stdeb==0.8.5
+stgit==0.18
+twisted==18.9.0
+typing==3.6.6
+urllib3==1.24.1
+webencodings==0.5.1
+wrapt==1.10.11
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
new file mode 100644
index 000000000000..f6c853db88e1
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -0,0 +1,70 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+atomicwrites==1.1.5
+attrs==18.2.0
+babel==2.6.0
+bitarray==2.2.2
+certifi==2018.8.24
+chardet==3.0.4
+cov-core==1.15.0
+coverage==4.5.2
+cryptography==2.6.1
+devscripts==2.19.5+deb10u1
+distro-info==0.21
+docutils==0.14
+entrypoints==0.3
+fastentrypoints==0.12
+gbp==0.9.14
+gcovr==4.1
+gpg==1.12.0
+idna==2.6
+imagesize==1.0.0
+jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lxml==4.6.2
+m2crypto==0.38.0
+markupsafe==1.1.0
+mmh3==2.5.1
+mock==2.0.0
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose==1.3.7
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+pbr==4.2.0
+pexpect==4.8.0
+pillow==5.4.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
+pygments==2.3.1
+pygobject==3.30.4
+pympler==0.8
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==5.2
+python-apt==1.8.4.3
+python-dateutil==2.7.3
+python-debian==0.1.35
+python-magic==0.4.16
+pytz==2019.1
+pyxdg==0.25
+pyyaml==5.4.1
+redis==3.5.3
+regex==2021.7.6
+requests==2.21.0
+roman==2.0.0
+secretstorage==2.3.1
+six==1.12.0
+sphinx==1.8.4
+sphinx-rtd-theme==0.4.3
+unattended-upgrades==0.1
+unidiff==0.5.4
+urllib3==1.24.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
new file mode 100644
index 000000000000..f0bb56d302bf
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -0,0 +1,1628 @@
+adwaita-icon-theme==3.30.1-1
+ant==1.10.5-2
+ant-optional==1.10.5-2
+apt==1.8.2.3
+apt-file==3.2.2
+apt-transport-https==1.8.2.3
+apt-utils==1.8.2.3
+arch-test==0.15-2+deb10u1
+asciidoctor==1.5.8-1
+aspell==0.60.7~20110707-6
+aspell-en==2018.04.16-0-1
+at==3.1.23-1
+at-spi2-core==2.30.0-7
+aufs-dkms==4.19+20190211-1
+aufs-tools==1:4.14+20190211-1
+augeas-lenses==1.11.0-3
+augeas-tools==1.11.0-3
+autoconf==2.69-11
+autoconf-archive==20180313-1
+autogen==1:5.18.12-4
+autogen-doc==1:5.18.12-4
+automake==1:1.16.1-4
+automake1.11==1:1.11.6-5
+autopoint==0.19.8.1-9
+autotools-dev==20180224.1
+bash-completion==1:2.8-6
+bc==1.07.1-2+b1
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
+binfmt-support==2.2.0-2
+binutils==2.31.1-16
+binutils-arm-linux-gnueabihf==2.31.1-16
+binutils-common==2.31.1-16
+bison==2:3.3.2.dfsg-1
+blt==2.5.3+dfsg-4
+bsd-mailx==8.1.2-0.20180807cvs-1
+bsdmainutils==11.1.2+b1
+build-essential==12.6
+byacc==20140715-1+b1
+bzip2==1.0.6-9.2~deb10u1
+bzip2-doc==1.0.6-9.2~deb10u1
+ca-certificates==20200601~deb10u2
+ca-certificates-java==20190405
+cdbs==0.4.159
+cgroupfs-mount==1.4
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:7.0-47
+clang-7==1:7.0.1-8+deb10u2
+cm-super-minimal==0.3.4-14
+cmake==3.13.4-1
+cmake-data==3.13.4-1
+cmocka-doc==1.1.3-1
+comerr-dev==2.1-1.44.5-1+deb10u3
+containerd.io==1.4.8-1
+cowbuilder==0.88
+cowdancer==0.88
+cpio==2.12+dfsg-9
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+cppcheck==1.86-1
+cron==3.0pl1-134+deb10u1
+curl==7.64.0-4+deb10u2
+dbus==1.12.20-0+deb10u1
+dbus-user-session==1.12.20-0+deb10u1
+dconf-gsettings-backend==0.30.1-2
+dconf-service==0.30.1-2
+dctrl-tools==2.24-3
+debhelper==12.1.1
+debian-keyring==2019.02.25
+debootstrap==1.0.114
+default-jdk-headless==2:1.11-71
+default-jre==2:1.11-71
+default-jre-headless==2:1.11-71
+default-libmysqlclient-dev==1.0.5
+device-tree-compiler==1.4.7-4
+devscripts==2.19.5+deb10u1
+dh-apparmor==2.13.2-10
+dh-autoreconf==19
+dh-exec==0.23.1
+dh-make==2.201802
+dh-python==3.20190308
+dh-strip-nondeterminism==1.1.2-1
+dh-systemd==12.1.1
+dictionaries-common==1.28.1
+diffstat==1.62-1
+dirmngr==2.2.12-1+deb10u1
+distro-info-data==0.41+deb10u3
+dkms==2.6.1-4
+dmsetup==2:1.02.155-3
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
+docker-ce==5:18.09.5~3-0~debian-buster
+docker-ce-cli==5:18.09.5~3-0~debian-buster
+docutils-common==0.14+dfsg-4
+docutils-doc==0.14+dfsg-4
+doxygen==1.8.13-10
+dpatch==2.0.38+nmu1
+dpkg-dev==1.19.7
+dput==1.0.3
+dvipng==1.15-1.1
+dwz==0.12-3
+eatmydata==105-7
+emacsen-common==3.0.4
+equivs==2.2.0
+exim4-base==4.92-8+deb10u6
+exim4-config==4.92-8+deb10u6
+exim4-daemon-light==4.92-8+deb10u6
+expat==2.2.6-2+deb10u1
+exuberant-ctags==1:5.9~svn20110310-12
+fakeroot==1.23-1
+file==1:5.35-4+deb10u2
+flex==2.6.4-6.2
+fontconfig==2.13.1-2
+fontconfig-config==2.13.1-2
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==5.0.10+really4.7.0~dfsg-1
+fonts-glyphicons-halflings==1.009~3.4.1+dfsg-1
+fonts-lato==2.0-2
+fonts-liberation==1:1.07.4-9
+fonts-lmodern==2.004.5-6
+fonts-noto-mono==20181227-1
+fonts-roboto-slab==1.100263+20170512-1
+fonts-texgyre==20180621-3
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gawk==1:4.2.1+dfsg-1
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+gcovr==4.1-2
+gdb==8.2.1-2+b3
+gem2deb==0.43
+gem2deb-test-runner==0.43
+geoip-database==20181108-1
+gettext==0.19.8.1-9
+gettext-base==0.19.8.1-9
+gfortran==4:8.3.0-1
+gfortran-8==8.3.0-6
+ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-glib-2.0==1.58.3-2
+gir1.2-packagekitglib-1.0==1.1.12-5
+git==1:2.20.1-2+deb10u3
+git-buildpackage==0.9.14
+git-man==1:2.20.1-2+deb10u3
+glib-networking==2.58.0-2+deb10u2
+glib-networking-common==2.58.0-2+deb10u2
+glib-networking-services==2.58.0-2+deb10u2
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gnupg2==2.2.12-1+deb10u1
+googletest==1.8.1-3
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+graphviz==2.40.1-6+deb10u1
+groff==1.22.4-3+deb10u1
+groff-base==1.22.4-3+deb10u1
+gsettings-desktop-schemas==3.28.1-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
+gtk-update-icon-cache==3.24.5-1
+guile-2.0-libs==2.0.13+1-5.1
+hicolor-icon-theme==0.17-2
+ibverbs-providers==22.1-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==63.1-6+deb10u1
+imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
+install-info==6.5.0.dfsg.1-4+b1
+intltool-debian==0.35.0+20060710.5
+iproute2==4.20.0-2+deb10u1
+iptables==1.8.2-4
+iptables-dev==1.8.2-4
+iso-codes==4.2-1
+java-common==0.71
+java-wrappers==0.3
+javahelper==0.72.9
+javascript-common==11
+kernel-wedge==2.99
+kmod==26-1
+krb5-locales==1.17-3+deb10u1
+krb5-multidev==1.17-3+deb10u1
+lcov==1.13-4
+less==487-0.1+b1
+libalgorithm-c3-perl==0.10-1
+libalgorithm-diff-perl==1.19.03-2
+libalgorithm-diff-xs-perl==0.04-5+b1
+libalgorithm-merge-perl==0.08-3
+libaopalliance-java==20070526-6
+libapache-pom-java==18-1
+libapparmor1==2.13.2-10
+libappstream4==0.12.5-1
+libapt-inst2.0==1.8.2.3
+libapt-pkg-perl==0.1.34+b1
+libarchive-cpio-perl==0.10-1
+libarchive-zip-perl==1.64-1
+libarchive13==3.3.3-4+deb10u1
+libargon2-1==0~20171227-0.2
+libasan5==8.3.0-6
+libasm-java==7.0-1
+libasound2==1.1.8-1
+libasound2-data==1.1.8-1
+libaspell15==0.60.7~20110707-6
+libassuan0==2.5.2-1
+libasync-mergepoint-perl==0.04-2
+libatinject-jsr330-api-java==1.0+ds1-5
+libatk-bridge2.0-0==2.30.0-5
+libatk-wrapper-java==0.33.3-22
+libatk-wrapper-java-jni==0.33.3-22
+libatk1.0-0==2.30.0-2
+libatk1.0-data==2.30.0-2
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==8.3.0-6
+libatspi2.0-0==2.30.0-7
+libaudio2==1.9.4-6
+libaudit-dev==1:2.8.4-3
+libaugeas0==1.11.0-3
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.7-4+deb10u1
+libavahi-common-data==0.7-4+deb10u1
+libavahi-common3==0.7-4+deb10u1
+libavalon-framework-java==4.2.0-10
+libb-hooks-endofscope-perl==0.24-1
+libb-hooks-op-check-perl==0.22-1+b1
+libbabeltrace-dev==1.5.6-2+deb10u1
+libbabeltrace1==1.5.6-2+deb10u1
+libbatik-java==1.10-2+deb10u1
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbinutils==2.31.1-16
+libbison-dev==2:3.3.2.dfsg-1
+libbit-vector-perl==7.4-1+b5
+libblkid-dev==2.33.1-0.1
+libboost-atomic1.71-dev==1.71.0-6~bpo10+1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libboost-chrono1.71-dev==1.71.0-6~bpo10+1
+libboost-chrono1.71.0==1.71.0-6~bpo10+1
+libboost-container1.71-dev==1.71.0-6~bpo10+1
+libboost-container1.71.0==1.71.0-6~bpo10+1
+libboost-context1.71-dev==1.71.0-6~bpo10+1
+libboost-context1.71.0==1.71.0-6~bpo10+1
+libboost-contract1.71-dev==1.71.0-6~bpo10+1
+libboost-contract1.71.0==1.71.0-6~bpo10+1
+libboost-coroutine1.71-dev==1.71.0-6~bpo10+1
+libboost-coroutine1.71.0==1.71.0-6~bpo10+1
+libboost-date-time1.71-dev==1.71.0-6~bpo10+1
+libboost-date-time1.71.0==1.71.0-6~bpo10+1
+libboost-fiber1.71-dev==1.71.0-6~bpo10+1
+libboost-fiber1.71.0==1.71.0-6~bpo10+1
+libboost-filesystem1.71-dev==1.71.0-6~bpo10+1
+libboost-filesystem1.71.0==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71-dev==1.71.0-6~bpo10+1
+libboost-graph-parallel1.71.0==1.71.0-6~bpo10+1
+libboost-log1.71-dev==1.71.0-6~bpo10+1
+libboost-log1.71.0==1.71.0-6~bpo10+1
+libboost-mpi1.71.0==1.71.0-6~bpo10+1
+libboost-program-options1.71-dev==1.71.0-6~bpo10+1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-regex1.71-dev==1.71.0-6~bpo10+1
+libboost-regex1.71.0==1.71.0-6~bpo10+1
+libboost-serialization1.71-dev==1.71.0-6~bpo10+1
+libboost-serialization1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71-dev==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-test1.71-dev==1.71.0-6~bpo10+1
+libboost-test1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71-dev==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libboost1.71-dev==1.71.0-6~bpo10+1
+libbrotli1==1.0.7-2+deb10u1
+libbsd-dev==0.9.1-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libbsh-java==2.0b4-19
+libbz2-dev==1.0.6-9.2~deb10u1
+libc-ares-dev==1.14.0-1
+libc-ares2==1.14.0-1
+libc-dev-bin==2.28-10
+libc6-dbg==2.28-10
+libc6-dev==2.28-10
+libcaf-openmpi-3==2.4.0-2
+libcairo-gobject2==1.16.0-4+deb10u1
+libcairo2==1.16.0-4+deb10u1
+libcap-dev==1:2.25-2
+libcap-ng-dev==0.7.9-2
+libcap2==1:2.25-2
+libcap2-bin==1:2.25-2
+libcapture-tiny-perl==0.48-1
+libcarp-clan-perl==6.07-1
+libcc1-0==8.3.0-6
+libcdi-api-java==1.2-2
+libcdt5==2.40.1-6+deb10u1
+libcgi-fast-perl==1:2.13-1
+libcgi-pm-perl==4.40-1
+libcglib-java==3.2.10-1
+libcgraph6==2.40.1-6+deb10u1
+libclang-6.0-dev==1:6.0.1-10
+libclang-7-dev==1:7.0.1-8+deb10u2
+libclang-common-6.0-dev==1:6.0.1-10
+libclang-common-7-dev==1:7.0.1-8+deb10u2
+libclang-dev==1:7.0-47
+libclang1-6.0==1:6.0.1-10
+libclang1-7==1:7.0.1-8+deb10u2
+libclass-accessor-perl==0.51-1
+libclass-c3-perl==0.34-1
+libclass-c3-xs-perl==0.14-1+b3
+libclass-data-inheritable-perl==0.08-3
+libclass-inspector-perl==1.32-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-3+b2
+libclone-perl==0.41-1+b1
+libcmocka-dev==1.1.3-1
+libcmocka0==1.1.3-1
+libcoarrays-dev==2.4.0-2
+libcoarrays-openmpi-dev==2.4.0-2
+libcolord2==1.4.3-4
+libcommon-sense-perl==3.74-2+b7
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.4-1
+libcommons-codec-java==1.11-1
+libcommons-collections3-java==3.2.2-2
+libcommons-compress-java==1.18-2+deb10u1
+libcommons-configuration-java==1.10-5
+libcommons-digester-java==1.8.1-5
+libcommons-io-java==2.6-2
+libcommons-lang-java==2.6-8
+libcommons-lang3-java==3.8-2
+libcommons-logging-java==1.2-2
+libcommons-parent-java==43-1
+libcommons-validator-java==1:1.6-2
+libconst-fast-perl==0.014-1
+libcontextual-return-perl==0.004014-2
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.12-3
+libcryptsetup12==2:2.1.0-5+deb10u2
+libcups2==2.2.10-6+deb10u4
+libcupsfilters1==1.21.6-5
+libcupsimage2==2.2.10-6+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl3-nss==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u2
+libcurl4-nss-dev==7.64.0-4+deb10u2
+libdaemon-dev==0.14-7
+libdaemon0==0.14-7
+libdata-dump-perl==1.23-1
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.12-2
+libdb-dev==5.3.1+nmu1
+libdb5.3-dev==5.3.28+dfsg1-0.5
+libdbi1==0.9.0-5
+libdbus-1-3==1.12.20-0+deb10u1
+libdbus-1-dev==1.12.20-0+deb10u1
+libdconf1==0.30.1-2
+libde265-0==1.0.3-1+b1
+libdevel-callchecker-perl==0.008-1
+libdevel-caller-perl==2.06-2+b1
+libdevel-globaldestruction-perl==0.14-1
+libdevel-lexalias-perl==0.05-2+b1
+libdevel-stacktrace-perl==2.0300-1
+libdevmapper1.02.1==2:1.02.155-3
+libdigest-bubblebabble-perl==0.02-2
+libdigest-hmac-perl==1.03+dfsg-2
+libdist-checkconflicts-perl==0.11-1
+libdistro-info-perl==0.21
+libdjvulibre-text==3.5.27.1-10
+libdjvulibre21==3.5.27.1-10
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdom4j-java==2.1.1-2
+libdouble-conversion1==3.1.0-3
+libdoxia-core-java==1.7-2
+libdoxia-java==1.7-2
+libdoxia-sitetools-java==1.7.5-1
+libdpkg-perl==1.19.7
+libdrm-amdgpu1==2.4.97-1
+libdrm-common==2.4.97-1
+libdrm-dev==2.4.97-1
+libdrm-etnaviv1==2.4.97-1
+libdrm-exynos1==2.4.97-1
+libdrm-freedreno1==2.4.97-1
+libdrm-nouveau2==2.4.97-1
+libdrm-omap1==2.4.97-1
+libdrm-radeon1==2.4.97-1
+libdrm-tegra0==2.4.97-1
+libdrm2==2.4.97-1
+libdw-dev==0.176-1.1
+libdw1==0.176-1.1
+libdynaloader-functions-perl==0.003-1
+libeatmydata1==105-7
+libedit-dev==3.1-20181209-1
+libedit2==3.1-20181209-1
+libegl-mesa0==18.3.6-2+deb10u1
+libegl1==1.1.0-1
+libegl1-mesa-dev==18.3.6-2+deb10u1
+libel-api-java==3.0.0-2+deb10u1
+libelf-dev==0.176-1.1
+libelf1==0.176-1.1
+libemail-date-format-perl==1.005-1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.5.3-0.1
+liberror-perl==0.17027-2
+libestr0==0.1.10-2.1
+libeval-closure-perl==0.14-1
+libevdev2==1.6.0+dfsg-1
+libevent-2.1-6==2.1.8-stable-4
+libevent-core-2.1-6==2.1.8-stable-4
+libevent-dev==2.1.8-stable-4
+libevent-extra-2.1-6==2.1.8-stable-4
+libevent-openssl-2.1-6==2.1.8-stable-4
+libevent-pthreads-2.1-6==2.1.8-stable-4
+libexception-class-perl==1.44-1
+libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
+libexplain-dev==1.4.D001-8
+libexplain51==1.4.D001-8
+libexporter-tiny-perl==1.002001-1
+libfakeroot==1.23-1
+libfastjson4==0.99.8-2
+libfcgi-perl==0.78-2+b3
+libffi-dev==3.2.1-9
+libfftw3-double3==3.3.8-2
+libfile-basedir-perl==0.08-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b5
+libfile-homedir-perl==1.004-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.29-1
+libfile-stripnondeterminism-perl==1.1.2-1
+libfile-which-perl==1.23-1
+libfl-dev==2.6.4-6.2
+libfl2==2.6.4-6.2
+libfont-afm-perl==1.20-2
+libfontbox2-java==2.0.13-2
+libfontconfig1==2.13.1-2
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.3-2
+libfreetype6==2.9.1-3+deb10u2
+libfribidi0==1.0.5-3.1+deb10u1
+libfstrm0==0.4.0-1
+libfuture-perl==0.39-1
+libgail-common==2.24.32-3
+libgail18==2.24.32-3
+libgbm1==18.3.6-2+deb10u1
+libgc1c2==1:7.6.4-0.4
+libgcc-8-dev==8.3.0-6
+libgd-perl==2.71-2
+libgd3==2.2.5-5.2
+libgdbm-compat4==1.18.1-4
+libgdbm6==1.18.1-4
+libgdk-pixbuf2.0-0==2.38.1+dfsg-1
+libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
+libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgeoip1==1.6.12-1
+libgeronimo-annotation-1.3-spec-java==1.0-1
+libgeronimo-interceptor-3.0-spec-java==1.0.1-4
+libgetopt-long-descriptive-perl==0.103-2
+libgfortran-8-dev==8.3.0-6
+libgfortran5==8.3.0-6
+libgif7==5.1.4-3
+libgirepository-1.0-1==1.58.3-2
+libgit-wrapper-perl==0.048-1
+libgitlab-api-v4-perl==0.16-1
+libgl1==1.1.0-1
+libgl1-mesa-dev==18.3.6-2+deb10u1
+libgl1-mesa-dri==18.3.6-2+deb10u1
+libglapi-mesa==18.3.6-2+deb10u1
+libgles1==1.1.0-1
+libgles2==1.1.0-1
+libgles2-mesa-dev==18.3.6-2+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-bin==2.58.3-2+deb10u3
+libglib2.0-data==2.58.3-2+deb10u3
+libglib2.0-dev==2.58.3-2+deb10u3
+libglib2.0-dev-bin==2.58.3-2+deb10u3
+libglu1-mesa==9.0.0-2.1+b3
+libglu1-mesa-dev==9.0.0-2.1+b3
+libglvnd-core-dev==1.1.0-1
+libglvnd-dev==1.1.0-1
+libglvnd0==1.1.0-1
+libglx-mesa0==18.3.6-2+deb10u1
+libglx0==1.1.0-1
+libgmp-dev==2:6.1.2+dfsg-4
+libgmpxx4ldbl==2:6.1.2+dfsg-4
+libgnutls-dane0==3.6.7-4+deb10u7
+libgnutls-openssl27==3.6.7-4+deb10u7
+libgnutls28-dev==3.6.7-4+deb10u7
+libgnutls30==3.6.7-4+deb10u7
+libgnutlsxx28==3.6.7-4+deb10u7
+libgomp1==8.3.0-6
+libgoogle-perftools4==2.7-1
+libgpgme11==1.12.0-6
+libgpm2==1.20.7-5
+libgraphite2-3==1.3.13-7
+libgs9==9.27~dfsg-2+deb10u4
+libgs9-common==9.27~dfsg-2+deb10u4
+libgssapi-krb5-2==1.17-3+deb10u1
+libgssrpc4==1.17-3+deb10u1
+libgstreamer1.0-0==1.14.4-1
+libgtest-dev==1.8.1-3
+libgtk-3-0==3.24.5-1
+libgtk-3-bin==3.24.5-1
+libgtk-3-common==3.24.5-1
+libgtk2.0-0==2.24.32-3
+libgtk2.0-bin==2.24.32-3
+libgtk2.0-common==2.24.32-3
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==232-2
+libguice-java==4.2.1-1
+libgvc6==2.40.1-6+deb10u1
+libgvpr2==2.40.1-6+deb10u1
+libharfbuzz-icu0==2.3.1-1
+libharfbuzz0b==2.3.1-1
+libhawtjni-runtime-java==1.16-1
+libheif1==1.3.2-2~deb10u1
+libhogweed4==3.4.1-1+deb10u1
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3+b3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.07-2
+libhttp-cookies-perl==6.04-1
+libhttp-daemon-perl==6.01-3
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.18-1
+libhttp-negotiate-perl==6.01-1
+libhttp-tiny-multipart-perl==0.08-1
+libhttpclient-java==4.5.7-1+deb10u1
+libhttpcore-java==4.4.11-1
+libhwloc-dev==1.11.12-3
+libhwloc-plugins==1.11.12-3
+libhwloc5==1.11.12-3
+libiberty-dev==20190122-1
+libibverbs-dev==22.1-1
+libibverbs1==22.1-1
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libidn11==1.33-2.2
+libidn2-dev==2.0.5-1+deb10u1
+libijs-0.35==0.35-14
+libilmbase23==2.2.1-2
+libimagequant0==2.12.2-1.1
+libimport-into-perl==1.002005-1
+libinput-bin==1.12.6-2+deb10u1
+libinput10==1.12.6-2+deb10u1
+libio-async-perl==0.72-1
+libio-html-perl==1.001-1
+libio-prompter-perl==0.004015-1
+libio-pty-perl==1:1.08-1.1+b5
+libio-sessiondata-perl==1.03-1
+libio-socket-ssl-perl==2.060-3
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-3
+libip4tc-dev==1.8.2-4
+libip4tc0==1.8.2-4
+libip6tc-dev==1.8.2-4
+libip6tc0==1.8.2-4
+libipc-run-perl==20180523.0-1
+libipc-shareable-perl==0.61-2
+libipc-system-simple-perl==1.25-4
+libiptc-dev==1.8.2-4
+libiptc0==1.8.2-4
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisl19==0.20-2
+libitext1-java==1.4-7
+libjansi-java==1.17.1-1
+libjansi-native-java==1.8-1
+libjansson-dev==2.12-1
+libjansson4==2.12-1
+libjargs-java==1.0.0-4
+libjaxen-java==1.1.6-4
+libjaxp1.3-java==1.3.05-5
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.16-1
+libjemalloc-dev==5.1.0-3
+libjemalloc2==5.1.0-3
+libjetty9-java==9.4.15-1
+libjpeg62-turbo==1:1.5.2-2+deb10u1
+libjs-bootstrap==3.4.1+dfsg-1
+libjs-jquery==3.3.1~dfsg-3+deb10u1
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==12-1.1
+libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-3
+libjs-sphinxdoc==1.8.4-1
+libjs-underscore==1.9.1~dfsg-1+deb10u1
+libjson-c-dev==0.12.1+ds-2+deb10u1
+libjson-c3==0.12.1+ds-2+deb10u1
+libjson-glib-1.0-0==1.4.4-2
+libjson-glib-1.0-common==1.4.4-2
+libjson-perl==4.02000-1
+libjson-xs-perl==3.040-1+b1
+libjsoncpp1==1.7.4-3
+libjsp-api-java==2.3.4-2+deb10u1
+libjsr305-java==0.1~+svn49-11
+libjtidy-java==7+svn20110807-5
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libk5crypto3==1.17-3+deb10u1
+libkadm5clnt-mit11==1.17-3+deb10u1
+libkadm5srv-mit11==1.17-3+deb10u1
+libkdb5-9==1.17-3+deb10u1
+libkeyutils1==1.6-6
+libkmod2==26-1
+libkpathsea6==2018.20181218.49446-1
+libkrb5-3==1.17-3+deb10u1
+libkrb5-dev==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
+libksba8==1.3.5-2
+liblab-gamut1==2.40.1-6+deb10u1
+liblcms2-2==2.9-3
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+libldap2-dev==2.4.47+dfsg-3+deb10u6
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b4
+libllvm6.0==1:6.0.1-10
+libllvm7==1:7.0.1-8+deb10u2
+liblmdb0==0.9.22-1
+liblocale-gettext-perl==1.07-3+b4
+liblockfile-bin==1.14-1.1
+liblockfile1==1.14-1.1
+liblog-any-adapter-screen-perl==0.140-1
+liblog-any-perl==1.707-1
+liblog-dispatch-perl==2.68-1
+liblog-log4perl-perl==1.49-1
+liblog4j1.2-java==1.2.17-8+deb10u1
+liblognorm5==2.0.5-1
+liblqr-1-0==0.4.2-2.1
+libltdl-dev==2.4.6-9
+libltdl7==2.4.6-9
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.07-2
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
+liblzma-dev==5.2.4-1
+liblzo2-2==2.10-0.1
+liblzo2-dev==2.10-0.1
+libmagic-mgc==1:5.35-4+deb10u2
+libmagic1==1:5.35-4+deb10u2
+libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmail-sendmail-perl==0.80-1
+libmailtools-perl==2.18-1
+libmariadb-dev==1:10.3.29-0+deb10u1
+libmariadb-dev-compat==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.29-0+deb10u1
+libmaven-archiver-java==3.2.0-2
+libmaven-clean-plugin-java==3.1.0-1
+libmaven-common-artifact-filters-java==3.0.1-3
+libmaven-compiler-plugin-java==3.8.0-2
+libmaven-filtering-java==3.1.1-1
+libmaven-jar-plugin-java==3.1.1-1
+libmaven-parent-java==31-2
+libmaven-plugin-tools-java==3.6.0-1
+libmaven-reporting-api-java==3.0-1
+libmaven-reporting-exec-java==1.4-2
+libmaven-reporting-impl-java==3.0.0-2
+libmaven-resolver-java==1.3.1-1
+libmaven-resources-plugin-java==3.1.0-1
+libmaven-shared-incremental-java==1.1-3
+libmaven-shared-utils-java==3.3.0-1
+libmaven-site-plugin-java==3.6-3
+libmaven3-core-java==3.6.0-1
+libmime-charset-perl==1.012.2-1
+libmime-lite-perl==3.030-2
+libmime-tools-perl==5.509-1
+libmime-types-perl==2.17-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmnl0==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.016-1
+libmoo-perl==2.003004-2
+libmount-dev==2.33.1-0.1
+libmpc3==1.1.0-1
+libmpdec2==2.4.2-2
+libmpfr6==4.0.2-1
+libmro-compat-perl==0.13-1
+libmtdev1==1.1.5-1+b1
+libnamespace-autoclean-perl==0.28-1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==1.1.5+dfsg-1
+libnanomsg5==1.1.5+dfsg-1
+libncurses-dev==6.1+20181013-2+deb10u2
+libncurses5-dev==6.1+20181013-2+deb10u2
+libncurses6==6.1+20181013-2+deb10u2
+libnet-dbus-perl==1.1.0-5+b1
+libnet-dns-perl==1.19-1
+libnet-dns-sec-perl==1.11-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.18-1
+libnet-ip-perl==1.26-2
+libnet-libidn-perl==0.12.ds-3+b1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.85-2+b1
+libnetfilter-conntrack-dev==1.0.7-1
+libnetfilter-conntrack3==1.0.7-1
+libnetpbm10==2:10.0-15.3+b2
+libnettle6==3.4.1-1+deb10u1
+libnewt-dev==0.52.20-8
+libnewt0.52==0.52.20-8
+libnfnetlink-dev==1.0.1-3+b1
+libnfnetlink0==1.0.1-3+b1
+libnftables0==0.9.0-2
+libnftnl-dev==1.1.2-2
+libnftnl11==1.1.2-2
+libnghttp2-14==1.36.0-2+deb10u1
+libnl-3-200==3.4.0-1
+libnl-3-dev==3.4.0-1
+libnl-route-3-200==3.4.0-1
+libnl-route-3-dev==3.4.0-1
+libnorm-dev==1.5.8+dfsg2-1
+libnorm1==1.5.8+dfsg2-1
+libnpth0==1.6-1
+libnspr4==2:4.20-1
+libnss-systemd==241-7~deb10u8
+libnss3==2:3.42.1-1+deb10u3
+libnuma-dev==2.0.12-1
+libnuma1==2.0.12-1
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-8-dev==8.3.0-6
+libobjc4==8.3.0-6
+libomp-7-dev==1:7.0.1-8+deb10u2
+libomp5-7==1:7.0.1-8+deb10u2
+libopencsd-dev==0.10.1-1
+libopencsd0==0.10.1-1
+libopenexr23==2.2.1-4.1+deb10u1
+libopengl0==1.1.0-1
+libopenjp2-7==2.3.0-2+deb10u2
+libopenmpi-dev==3.1.3-11
+libopenmpi3==3.1.3-11
+libopts25==1:5.18.12-4
+libopts25-dev==1:5.18.12-4
+liboro-java==2.0.8a-13
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b7
+libossp-uuid16==1.6.2-1.5+b7
+libp11-kit-dev==0.23.15-2+deb10u1
+libp11-kit0==0.23.15-2+deb10u1
+libpackage-stash-perl==0.38-1
+libpackage-stash-xs-perl==0.29-1
+libpackagekit-glib2-18==1.1.12-5
+libpadwalker-perl==2.3-1+b1
+libpam-cap==1:2.25-2
+libpam-systemd==241-7~deb10u8
+libpam0g-dev==1.3.1-5
+libpango-1.0-0==1.42.4-8~deb10u1
+libpangocairo-1.0-0==1.42.4-8~deb10u1
+libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpaper-utils==1.1.28
+libpaper1==1.1.28
+libparams-classify-perl==0.015-1+b1
+libparams-util-perl==1.07-3+b4
+libparams-validate-perl==1.29-1+b1
+libparams-validationcompiler-perl==0.30-1
+libparboiled-java==1.1.7-2
+libparse-debianchangelog-perl==1.2.0-13
+libpath-iterator-rule-perl==1.014-1
+libpath-tiny-perl==0.108-1
+libpathplan4==2.40.1-6+deb10u1
+libpcap-dev==1.8.1-6
+libpcap0.8==1.8.1-6
+libpcap0.8-dev==1.8.1-6
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.14-1
+libpcre16-3==2:8.39-12
+libpcre2-16-0==10.32-5
+libpcre3-dev==2:8.39-12
+libpcre32-3==2:8.39-12
+libpcrecpp0v5==2:8.39-12
+libpcsclite1==1.8.24-1
+libpegdown-java==1.6.0-1
+libperl-dev==5.28.1-6+deb10u1
+libperl5.28==5.28.1-6+deb10u1
+libperlio-gzip-perl==0.19-1+b5
+libpgm-5.2-0==5.2.122~dfsg-3
+libpgm-dev==5.2.122~dfsg-3
+libpipeline1==1.5.1-2
+libpixman-1-0==0.36.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-4
+libplexus-archiver-java==3.6.0-2
+libplexus-bsh-factory-java==1.0~alpha7-4
+libplexus-build-api-java==0.0.7-3
+libplexus-cipher-java==1.7-3
+libplexus-classworlds-java==2.6.0-1
+libplexus-compiler-java==2.8.5-1
+libplexus-component-annotations-java==1.7.1-7
+libplexus-container-default-java==1.7.1-7
+libplexus-container-default1.5-java==1.7.1-7
+libplexus-i18n-java==1.0-beta-10-5
+libplexus-interpolation-java==1.25-1
+libplexus-io-java==3.1.1-1
+libplexus-languages-java==0.9.10-1
+libplexus-sec-dispatcher-java==1.4-4
+libplexus-utils2-java==3.1.1-1
+libplexus-velocity-java==1.2-3
+libpmix2==3.1.2-3
+libpng-dev==1.6.36-6
+libpng16-16==1.6.36-6
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-25
+libpolkit-backend-1-0==0.105-25
+libpolkit-gobject-1-0==0.105-25
+libpopt0==1.16-12
+libpotrace0==1.15-1
+libprocps7==2:3.3.15-2
+libprotobuf-c1==1.3.1-1+b1
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libprotoc17==3.6.1.3-2
+libproxy1v5==0.4.15-5+deb10u1
+libptexenc1==2018.20181218.49446-1
+libpthread-stubs0-dev==0.4-1
+libpython-all-dev==2.7.16-1
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
+libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-all-dbg==3.7.3-1
+libpython3-all-dev==3.7.3-1
+libpython3-dbg==3.7.3-1
+libpython3-dev==3.7.3-1
+libpython3-stdlib==3.7.3-1
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dbg==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
+libqdox-java==1.12.1-3
+libqdox2-java==2.0~M10-1
+libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
+libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
+libqt4-designer==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
+libqt4-help==4:4.8.7+dfsg-18+deb10u1
+libqt4-network==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
+libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
+libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
+libqt4-script==4:4.8.7+dfsg-18+deb10u1
+libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql==4:4.8.7+dfsg-18+deb10u1
+libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
+libqt4-svg==4:4.8.7+dfsg-18+deb10u1
+libqt4-test==4:4.8.7+dfsg-18+deb10u1
+libqt4-xml==4:4.8.7+dfsg-18+deb10u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
+libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5gui5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5==5.11.3+dfsg1-1+deb10u4
+libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
+libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5==5.11.3+dfsg1-1+deb10u4
+libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
+libqt5svg5==5.11.3-2
+libqt5test5==5.11.3+dfsg1-1+deb10u4
+libqt5widgets5==5.11.3+dfsg1-1+deb10u4
+libqt5xml5==5.11.3+dfsg1-1+deb10u4
+libqtcore4==4:4.8.7+dfsg-18+deb10u1
+libqtdbus4==4:4.8.7+dfsg-18+deb10u1
+libqtgui4==4:4.8.7+dfsg-18+deb10u1
+libreadline-dev==7.0-5
+libreadline7==7.0-5
+libreadonly-perl==2.050-1
+libref-util-perl==0.204-1
+libref-util-xs-perl==0.117-1+b1
+libregexp-assemble-perl==0.36-1
+libregexp-pattern-license-perl==3.0.31-4
+librest-0.7-0==0.8.1-1
+librhash0==1.3.8-1
+librole-tiny-perl==2.000006-1
+librrd-dev==1.7.1-2
+librrd8==1.7.1-2
+librsvg2-2==2.44.10-2.1
+librsvg2-common==2.44.10-2.1
+librtmp1==2.4+20151223.gitfa8646d.1-2
+libruby2.5==2.5.5-3+deb10u3
+librust-aho-corasick-dev==0.6.9-1
+librust-ansi-term-dev==0.11.0-1
+librust-atty-dev==0.2.11-1
+librust-autocfg-dev==0.1.1-1
+librust-backtrace+default-dev==0.3.13-1
+librust-backtrace+libbacktrace-dev==0.3.13-1
+librust-backtrace-dev==0.3.13-1
+librust-backtrace-sys-dev==0.1.28-1
+librust-bindgen+logging-dev==0.47.0-1
+librust-bindgen-dev==0.47.0-1
+librust-bitflags-dev==1.0.4-1
+librust-byteorder-dev==1.3.1-1
+librust-cc-dev==1.0.28-1
+librust-cexpr-dev==0.3.3-1
+librust-cfg-if-dev==0.1.6-1
+librust-clang-sys+clang-6-0-dev==0.27.0-1
+librust-clang-sys+runtime-dev==0.27.0-1
+librust-clang-sys-dev==0.27.0-1
+librust-clap+color-dev==2.32.0-4
+librust-clap+default-dev==2.32.0-4
+librust-clap+suggestions-dev==2.32.0-4
+librust-clap-dev==2.32.0-4
+librust-env-logger+default-dev==0.6.0-1
+librust-env-logger-dev==0.6.0-1
+librust-failure+default-dev==0.1.5-1
+librust-failure+derive-dev==0.1.5-1
+librust-failure+std-dev==0.1.5-1
+librust-failure-derive-dev==0.1.5-1
+librust-failure-dev==0.1.5-1
+librust-glob-dev==0.2.11-1
+librust-hashbrown-dev==0.1.8-1
+librust-humantime-dev==1.1.1-2
+librust-lazy-static-dev==1.2.0-1
+librust-libc-dev==0.2.48-1
+librust-libloading-dev==0.5.0-1
+librust-log-dev==0.4.6-1
+librust-memchr+default-dev==2.1.3-1
+librust-memchr+use-std-dev==2.1.3-1
+librust-memchr-dev==2.1.3-1
+librust-nom+std-dev==4.0.0-1
+librust-nom-dev==4.0.0-1
+librust-peeking-take-while-dev==0.1.2-1
+librust-proc-macro2-dev==0.4.27-1
+librust-quick-error-dev==1.2.2-1
+librust-quote+proc-macro-dev==0.6.11-1
+librust-quote-dev==0.6.11-1
+librust-redox-syscall-dev==0.1.40-2
+librust-redox-termios-dev==0.1.1-2
+librust-regex-dev==1.1.0-1
+librust-regex-syntax-dev==0.6.5-1
+librust-rustc-demangle-dev==0.1.13-1
+librust-scopeguard-dev==0.3.3-1
+librust-strsim-dev==0.7.0-1
+librust-syn+default-dev==0.15.26-1
+librust-syn+printing-dev==0.15.26-1
+librust-syn+proc-macro-dev==0.15.26-1
+librust-syn-dev==0.15.26-1
+librust-synstructure-dev==0.10.1-1
+librust-termcolor-dev==1.0.4-1
+librust-termion-dev==1.5.1-1
+librust-textwrap-dev==0.11.0-1
+librust-thread-local-dev==0.3.6-1
+librust-ucd-util-dev==0.1.1-1
+librust-unicode-width-dev==0.1.5-1
+librust-unicode-xid-dev==0.1.0-1
+librust-utf8-ranges-dev==1.0.2-1
+librust-vec-map-dev==0.8.1-2
+librust-which-dev==2.0.1-1
+librust-winapi-dev==0.3.6-1
+librust-winapi-i686-pc-windows-gnu-dev==0.4.0-1
+librust-winapi-x86-64-pc-windows-gnu-dev==0.4.0-1
+librust-wincolor-dev==1.0.0-1
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsass1==3.5.5-4
+libsaxon-java==1:6.5.5-12
+libselinux1-dev==2.8-1+b1
+libsensors-config==1:3.5.0-3
+libsensors4-dev==1:3.5.0-3
+libsensors5==1:3.5.0-3
+libsepol1-dev==2.8-1
+libsereal-decoder-perl==4.005+ds-1+b1
+libsereal-encoder-perl==4.005+ds-1+b1
+libsereal-perl==4.005-1
+libservlet-api-java==4.0.1-2
+libservlet3.1-java==1:4.0.1-2
+libsigsegv2==2.12-2
+libsisu-guice-java==4.2.0-1
+libsisu-inject-java==0.3.3-1
+libsisu-ioc-java==2.3.0-11
+libsisu-plexus-java==0.3.3-3
+libslang2==2.3.2-2
+libslang2-dev==2.3.2-2
+libslf4j-java==1.7.25-3
+libsm-dev==2:1.2.3-1
+libsm6==2:1.2.3-1
+libsnappy-java==1.1.7.2-1
+libsnappy-jni==1.1.7.2-1
+libsnappy1v5==1.1.7-1
+libsnmp-base==5.7.3+dfsg-5+deb10u2
+libsnmp-dev==5.7.3+dfsg-5+deb10u2
+libsnmp30==5.7.3+dfsg-5+deb10u2
+libsoap-lite-perl==1.27-1
+libsodium-dev==1.0.17-1
+libsodium23==1.0.17-1
+libsombok3==2.4.0-2
+libsort-key-perl==1.33-2+b1
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.64.2-2
+libsoup2.4-1==2.64.2-2
+libspecio-perl==0.43-1
+libsqlite3-0==3.27.2-3+deb10u1
+libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u6
+libssl1.1==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
+libstemmer0d==0+svn585-1+b2
+libstrictures-perl==2.000005-1
+libstring-copyright-perl==0.003006-1
+libstring-escape-perl==2010.002-2
+libstring-shellquote-perl==1.04-1
+libstruct-dumb-perl==0.09-1
+libsub-exporter-perl==0.987-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.14-1+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1+b3
+libsub-quote-perl==2.005001-1
+libsubunit-dev==1.3.0-1
+libsubunit0==1.3.0-1
+libsurefire-java==2.22.1-1
+libswitch-perl==2.17-2
+libsynctex2==2018.20181218.49446-1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==241-7~deb10u8
+libsystemd0==241-7~deb10u8
+libtask-weaken-perl==1.06-1
+libtasn1-6-dev==4.13-3
+libtasn1-doc==4.13-3
+libtcl8.6==8.6.9+dfsg-2
+libtcmalloc-minimal4==2.7-1
+libteckit0==2.5.8+ds2-5
+libterm-readkey-perl==2.38-1
+libtest-fatal-perl==0.014-1
+libtest-refcount-perl==0.08-3
+libtexlua52==2018.20181218.49446-1
+libtexlua53==2018.20181218.49446-1
+libtexluajit2==2018.20181218.49446-1
+libtext-charwidth-perl==0.04-7.1+b1
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b7
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.28-2
+libthai0==0.1.28-2
+libtie-ixhash-perl==1.23-2
+libtiff5==4.1.0+git191117-2~deb10u2
+libtimedate-perl==2.3000-2+deb10u1
+libtinyxml2-6a==7.0.0+dfsg-1
+libtinyxml2-dev==7.0.0+dfsg-1
+libtk8.6==8.6.9-2
+libtool==2.4.6-9
+libtool-bin==2.4.6-9
+libtry-tiny-perl==0.30-1
+libtype-tiny-perl==1.004004-1
+libtype-tiny-xs-perl==0.014-1+b1
+libtypes-serialiser-perl==1.0-1
+libubsan1==8.3.0-6
+libuchardet0==0.0.6-3
+libudev-dev==241-7~deb10u8
+libudev1==241-7~deb10u8
+libunbound8==1.9.0-2+deb10u2
+libunicode-linebreak-perl==0.0.20190101-1
+libunicode-utf8-perl==0.62-1
+libunwind-dev==1.2.1-10~deb10u1
+libunwind8==1.2.1-10~deb10u1
+liburi-perl==1.76-1
+libusb-0.1-4==2:0.1.12-32
+libusb-1.0-0==2:1.0.22-2
+libusb-1.0-0-dev==2:1.0.22-2
+libusb-1.0-doc==2:1.0.22-2
+libusb-dev==2:0.1.12-32
+libutempter0==1.1.6-3
+libuv1==1.24.1-1+deb10u1
+libvariable-magic-perl==0.62-1+b1
+libvelocity-tools-java==2.0-7
+libvulkan-dev==1.1.97-2
+libvulkan1==1.1.97-2
+libwacom-bin==0.32-1
+libwacom-common==0.32-1
+libwacom2==0.32-1
+libwagon-file-java==3.3.1-2
+libwagon-http-shaded-java==3.3.1-2
+libwagon-provider-api-java==3.3.1-2
+libwant-perl==0.29-1+b4
+libwayland-bin==1.16.0-1
+libwayland-client0==1.16.0-1
+libwayland-cursor0==1.16.0-1
+libwayland-dev==1.16.0-1
+libwayland-egl1==1.16.0-1
+libwayland-server0==1.16.0-1
+libwebp6==0.6.1-2+deb10u1
+libwebpdemux2==0.6.1-2+deb10u1
+libwebpmux3==0.6.1-2+deb10u1
+libwebsocket-api-java==1.1-1+deb10u1
+libwmf0.2-7==0.2.8.4-14
+libwoff1==1.0.2-1
+libwrap0==7.6.q-28
+libwrap0-dev==7.6.q-28
+libwww-perl==6.36-2
+libwww-robotrules-perl==6.02-1
+libx11-6==2:1.6.7-1+deb10u2
+libx11-data==2:1.6.7-1+deb10u2
+libx11-dev==2:1.6.7-1+deb10u2
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.7-1+deb10u2
+libx11-xcb1==2:1.6.7-1+deb10u2
+libx265-165==2.9-4
+libxalan2-java==2.7.2-2
+libxapian-dev==1.4.11-1
+libxapian30==1.4.11-1
+libxau-dev==1:1.0.8-1+b2
+libxau6==1:1.0.8-1+b2
+libxaw7==2:1.0.13-1+b2
+libxbean-reflect-java==4.5-8
+libxcb-dri2-0==1.13.1-2
+libxcb-dri2-0-dev==1.13.1-2
+libxcb-dri3-0==1.13.1-2
+libxcb-dri3-dev==1.13.1-2
+libxcb-glx0==1.13.1-2
+libxcb-glx0-dev==1.13.1-2
+libxcb-icccm4==0.4.1-1.1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.13.1-2
+libxcb-present0==1.13.1-2
+libxcb-randr0==1.13.1-2
+libxcb-randr0-dev==1.13.1-2
+libxcb-render-util0==0.3.9-1+b1
+libxcb-render0==1.13.1-2
+libxcb-render0-dev==1.13.1-2
+libxcb-shape0==1.13.1-2
+libxcb-shape0-dev==1.13.1-2
+libxcb-shm0==1.13.1-2
+libxcb-sync-dev==1.13.1-2
+libxcb-sync1==1.13.1-2
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.13.1-2
+libxcb-xfixes0-dev==1.13.1-2
+libxcb-xinerama0==1.13.1-2
+libxcb-xkb1==1.13.1-2
+libxcb1==1.13.1-2
+libxcb1-dev==1.13.1-2
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.15-2
+libxdamage-dev==1:1.1.4-3+b3
+libxdamage1==1:1.1.4-3+b3
+libxdelta2==1.1.3-9.2
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.40.1-6+deb10u1
+libxerces2-java==2.12.0-1
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.4-2
+libxkbcommon-x11-0==0.8.2-1
+libxkbcommon0==0.8.2-1
+libxml-commons-external-java==1.4.01-3
+libxml-commons-resolver1.1-java==1.2-9
+libxml-libxml-perl==2.0134+dfsg-1
+libxml-namespacesupport-perl==1.12-1
+libxml-parser-perl==2.44-4
+libxml-sax-base-perl==1.09-1
+libxml-sax-expat-perl==0.51-1
+libxml-sax-perl==1.00+dfsg-1
+libxml-simple-perl==2.25-1
+libxml-twig-perl==1:3.50-1.1
+libxml-xpathengine-perl==0.14-1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxml2-utils==2.9.4+dfsg1-7+deb10u2
+libxmlgraphics-commons-java==2.3-1
+libxmlrpc-lite-perl==0.717-2
+libxmu6==2:1.1.2-2+b3
+libxmuu1==2:1.1.2-2+b3
+libxpm4==1:3.5.12-1
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.3-1
+libxshmfence1==1.3-1
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+libxss1==1:1.2.3-1
+libxt-dev==1:1.1.5-1+b3
+libxt6==1:1.1.5-1+b3
+libxtables-dev==1.8.2-4
+libxtables12==1.8.2-4
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libxxhash0==0.6.5-2
+libxz-java==1.8-2
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+libyaml-libyaml-perl==0.76+repack-1
+libyaml-tiny-perl==1.73-1
+libzmq3-dev==4.3.1-4+deb10u2
+libzmq5==4.3.1-4+deb10u2
+libzzip-0-13==0.13.62-3.2
+licensecheck==3.0.31-3
+lintian==2.15.0
+linux-compiler-gcc-8-arm==4.19.194-3
+linux-kbuild-4.19==4.19.194-3
+linux-libc-dev==4.19.194-3
+linuxdoc-tools==0.9.73-2
+llvm-6.0==1:6.0.1-10
+llvm-6.0-dev==1:6.0.1-10
+llvm-6.0-runtime==1:6.0.1-10
+llvm-7==1:7.0.1-8+deb10u2
+llvm-7-dev==1:7.0.1-8+deb10u2
+llvm-7-runtime==1:7.0.1-8+deb10u2
+lmodern==2.004.5-6
+logrotate==3.14.0-4
+lsb-base==10.2019051400
+lsb-release==10.2019051400
+lsof==4.91+dfsg-1
+lua-bitop==1.0.2-5
+lua-bitop-dev==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+lua-cjson-dev==2.1.0+dfsg-2.1
+lynx==2.8.9rel.1-3
+lynx-common==2.8.9rel.1-3
+m4==1.4.18-2
+make==4.2.1-1.2
+man-db==2.8.5-2
+manpages==4.16-2
+manpages-dev==4.16-2
+mariadb-common==1:10.3.29-0+deb10u1
+maven==3.6.0-1
+maven-debian-helper==2.3.2
+maven-repo-helper==1.9.3
+mesa-common-dev==18.3.6-2+deb10u1
+mime-support==3.62
+module-assistant==0.11.10
+mysql-common==5.8+1.0.5
+ncurses-term==6.1+20181013-2+deb10u2
+netbase==5.6
+netpbm==2:10.0-15.3+b2
+nettle-dev==3.4.1-1+deb10u1
+nftables==0.9.0-2
+nodejs==14.17.2-1nodesource1
+ocl-icd-libopencl1==2.2.12-2
+openjdk-11-jdk==11.0.11+9-1~deb10u1
+openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
+openjdk-11-jre==11.0.11+9-1~deb10u1
+openjdk-11-jre-headless==11.0.11+9-1~deb10u1
+openmpi-bin==3.1.3-11
+openmpi-common==3.1.3-11
+opensp==1.5.2-13+b1
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+openssl==1.1.1d-0+deb10u6
+packagekit==1.1.12-5
+packagekit-tools==1.1.12-5
+patch==2.7.6-3+deb10u1
+patchutils==0.3.4-2
+pbuilder==0.230.4
+pbzip2==1.1.9-1+b1
+perl==5.28.1-6+deb10u1
+perl-modules-5.28==5.28.1-6+deb10u1
+perl-openssl-defaults==3
+php-cli==2:7.3+69
+php-codecoverage==6.1.4+dfsg-1
+php-common==2:69
+php-deepcopy==1.8.1-1
+php-doctrine-instantiator==1.1.0-2
+php-file-iterator==2.0.2-1
+php-mbstring==2:7.3+69
+php-pear==1:1.10.6+submodules+notgz-1.1+deb10u2
+php-phar-io-manifest==1.0.3-1
+php-phar-io-version==2.0.1-1
+php-phpdocumentor-reflection-common==1.0.1-1
+php-phpdocumentor-reflection-docblock==4.3.0-1
+php-phpdocumentor-type-resolver==0.4.0-2
+php-phpspec-prophecy==1.8.0-1
+php-text-template==1.2.1-2
+php-timer==2.1.1-1
+php-token-stream==3.0.1-1
+php-tokenizer==1.1.0-1
+php-webmozart-assert==1.4.0-3
+php-xml==2:7.3+69
+php7.3-cli==7.3.29-1~deb10u1
+php7.3-common==7.3.29-1~deb10u1
+php7.3-json==7.3.29-1~deb10u1
+php7.3-mbstring==7.3.29-1~deb10u1
+php7.3-opcache==7.3.29-1~deb10u1
+php7.3-readline==7.3.29-1~deb10u1
+php7.3-xml==7.3.29-1~deb10u1
+phpunit==7.5.6-1
+phpunit-code-unit-reverse-lookup==1.0.1-1
+phpunit-comparator==3.0.2-1
+phpunit-diff==3.0.2-1
+phpunit-environment==4.1.0-1
+phpunit-exporter==3.1.0-2
+phpunit-global-state==2.0.0really2.0.0-2
+phpunit-object-enumerator==3.0.3-3
+phpunit-object-reflector==1.1.1-2
+phpunit-recursion-context==3.0.0-2
+phpunit-resource-operations==2.0.1-1
+phpunit-version==2.0.1-1
+pigz==2.4-1
+pinentry-curses==1.1.0-2
+pkg-config==0.29-6
+pkg-php-tools==1.37
+po-debconf==1.0.21
+policykit-1==0.105-25
+poppler-data==0.4.9-2
+pps-tools==1.0.2-1
+preview-latex-style==11.91-2
+pristine-tar==1.46
+procmail==3.22-26
+procps==2:3.3.15-2
+protobuf-compiler==3.6.1.3-2
+ps2eps==1.68+binaryfree-2
+psmisc==23.2-1
+psutils==1.17.dfsg-4
+pylint==1.9.4-1
+python==2.7.16-1
+python-alabaster==0.7.8-1
+python-all==2.7.16-1
+python-all-dev==2.7.16-1
+python-apt-common==1.8.4.3
+python-asn1crypto==0.24.0-1
+python-astroid==1.6.5-3
+python-atomicwrites==1.1.5-2
+python-attr==18.2.0-1
+python-automat==0.6.0-1
+python-babel==2.6.0+dfsg.1-1
+python-babel-localedata==2.6.0+dfsg.1-1
+python-backports.functools-lru-cache==1.5-3
+python-bs4==4.7.1-1
+python-certifi==2018.8.24-1
+python-cffi-backend==1.12.2-1
+python-chardet==3.0.4-3
+python-click==7.0-1
+python-colorama==0.3.7-1
+python-concurrent.futures==3.2.0-2
+python-configparser==3.5.0b2-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-2
+python-coverage==4.5.2+dfsg.1-1
+python-crypto==2.6.1-9+b1
+python-cryptography==2.6.1-3+deb10u2
+python-dbus==1.2.8-3
+python-dev==2.7.16-1
+python-docutils==0.14+dfsg-4
+python-egenix-mxdatetime==3.2.9-1
+python-egenix-mxtools==3.2.9-1
+python-entrypoints==0.3-1
+python-enum34==1.1.6-2
+python-funcsigs==1.0.2-4
+python-gi==3.30.4-1
+python-html5lib==1.0.1-1
+python-hyperlink==17.3.1-2
+python-idna==2.6-1
+python-imagesize==1.0.0-1
+python-incremental==16.10.1-3
+python-ipaddr==2.2.0-2
+python-ipaddress==1.0.17-1
+python-isort==4.3.4+ds1-1.1
+python-jinja2==2.10-2
+python-keyring==17.1.1-1
+python-keyrings.alt==3.1.1-1
+python-lazy-object-proxy==1.3.1-1+b1
+python-logilab-common==1.4.2-1
+python-lxml==4.3.2-1+deb10u3
+python-markupsafe==1.1.0-1
+python-mccabe==0.6.1-2
+python-minimal==2.7.16-1
+python-mock==2.0.0-4
+python-more-itertools==4.2.0-1
+python-nose2==0.8.0-1
+python-olefile==0.46-1
+python-openssl==19.0.0-1
+python-packaging==19.0-1
+python-parse==1.6.6-0.1
+python-pathlib2==2.3.3-1
+python-pbr==4.2.0-5
+python-pil==5.4.1-2+deb10u2
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-pluggy==0.8.0-1
+python-py==1.7.0-2
+python-pyasn1==0.4.2-3
+python-pyasn1-modules==0.2.1-0.2
+python-pygments==2.3.1+dfsg-1+deb10u2
+python-pyparsing==2.2.0+dfsg1-2
+python-pytest==3.10.1-2
+python-pytest-cov==2.6.0-1
+python-requests==2.21.0-1
+python-roman==2.0.0-3
+python-scandir==1.9.0-2
+python-secretstorage==2.3.1-2
+python-service-identity==16.0.0-2
+python-setuptools==40.8.0-1
+python-singledispatch==3.4.0.3-2
+python-six==1.12.0-1
+python-soupsieve==1.8+dfsg-1
+python-sphinx==1.8.4-1
+python-stdeb==0.8.5-1
+python-tk==2.7.16-2
+python-twisted==18.9.0-3
+python-twisted-bin==18.9.0-3
+python-twisted-core==18.9.0-3
+python-typing==3.6.6-1
+python-tz==2019.1-1
+python-urllib3==1.24.1-1
+python-webencodings==0.5.1-1
+python-wheel==0.32.3-2
+python-wrapt==1.10.11-1
+python-xdg==0.25-5
+python-zope.interface==4.3.2-1+b2
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
+python2.7-minimal==2.7.16-2+deb10u1
+python3==3.7.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.7.3-1
+python3-all-dbg==3.7.3-1
+python3-all-dev==3.7.3-1
+python3-apt==1.8.4.3
+python3-asn1crypto==0.24.0-1
+python3-atomicwrites==1.1.5-2
+python3-attr==18.2.0-1
+python3-babel==2.6.0+dfsg.1-1
+python3-certifi==2018.8.24-1
+python3-cffi-backend==1.12.2-1
+python3-chardet==3.0.4-3
+python3-cov-core==1.15.0-2
+python3-coverage==4.5.2+dfsg.1-1
+python3-crypto==2.6.1-9+b1
+python3-cryptography==2.6.1-3+deb10u2
+python3-dateutil==2.7.3-3
+python3-dbg==3.7.3-1
+python3-dbus==1.2.8-3
+python3-debian==0.1.35
+python3-dev==3.7.3-1
+python3-distro-info==0.21
+python3-distutils==3.7.3-1
+python3-docutils==0.14+dfsg-4
+python3-entrypoints==0.3-1
+python3-gi==3.30.4-1
+python3-gpg==1.12.0-6
+python3-idna==2.6-1
+python3-imagesize==1.0.0-1
+python3-jinja2==2.10-2
+python3-keyring==17.1.1-1
+python3-keyrings.alt==3.1.1-1
+python3-lib2to3==3.7.3-1
+python3-magic==2:0.4.15-2
+python3-markupsafe==1.1.0-1
+python3-minimal==3.7.3-1
+python3-mock==2.0.0-4
+python3-more-itertools==4.2.0-1
+python3-nose2==0.8.0-1
+python3-olefile==0.46-1
+python3-packaging==19.0-1
+python3-pbr==4.2.0-5
+python3-pil==5.4.1-2+deb10u2
+python3-pkg-resources==40.8.0-1
+python3-pluggy==0.8.0-1
+python3-py==1.7.0-2
+python3-pycurl==7.43.0.2-0.1
+python3-pygments==2.3.1+dfsg-1+deb10u2
+python3-pyparsing==2.2.0+dfsg1-2
+python3-pytest==3.10.1-2
+python3-pytest-cov==2.6.0-1
+python3-requests==2.21.0-1
+python3-roman==2.0.0-3
+python3-secretstorage==2.3.1-2
+python3-setuptools==40.8.0-1
+python3-six==1.12.0-1
+python3-software-properties==0.96.20.2-2
+python3-sphinx==1.8.4-1
+python3-sphinx-rtd-theme==0.4.3+dfsg-1
+python3-tz==2019.1-1
+python3-unidiff==0.5.4-1
+python3-urllib3==1.24.1-1
+python3-wheel==0.32.3-2
+python3-xdg==0.25-5
+python3.7==3.7.3-2+deb10u3
+python3.7-dbg==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
+qdbus==4:4.8.7+dfsg-18+deb10u1
+qt-at-spi==0.4.0-9
+qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
+qt4-qmake==4:4.8.7+dfsg-18+deb10u1
+qt5-default==5.11.3+dfsg1-1+deb10u4
+qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
+qt5-qmake==5.11.3+dfsg1-1+deb10u4
+qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev==5.11.3+dfsg1-1+deb10u4
+qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
+qtchooser==66-2
+qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
+qttranslations5-l10n==5.11.3-2
+quilt==0.65-3
+rake==12.3.1-3+deb10u1
+rdfind==1.4.1-1
+readline-common==7.0-5
+rrdtool==1.7.1-2
+rsync==3.1.3-6
+rsyslog==8.1901.0-1
+ruby==1:2.5.1
+ruby-all-dev==1:2.5.1
+ruby-asciidoctor==1.5.8-1
+ruby-did-you-mean==1.2.1-1
+ruby-minitest==5.11.3-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==1.1.1-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.2.8-1
+ruby-xmlrpc==0.3.0-2
+ruby2.5==2.5.5-3+deb10u3
+ruby2.5-dev==2.5.5-3+deb10u3
+ruby2.5-doc==2.5.5-3+deb10u3
+rubygems-integration==1.11+deb10u1
+sassc==3.5.0-1
+sensible-utils==0.0.12
+sgml-base==1.29
+sgml-data==2.0.11
+shared-mime-info==1.10-1
+shellcheck==0.5.0-3
+software-properties-common==0.96.20.2-2
+sphinx-common==1.8.4-1
+sphinx-rtd-theme-common==0.4.3+dfsg-1
+squashfs-tools==1:4.3-12
+stgit==0.18-1
+strace==4.26-0.2
+sudo==1.8.27-1+deb10u3
+swig==3.0.12-2
+swig3.0==3.0.12-2
+systemd==241-7~deb10u8
+systemd-sysv==241-7~deb10u8
+t1utils==1.41-3
+tcl==8.6.9+1
+tcl8.6==8.6.9+dfsg-2
+telnet==0.17-41.2
+tex-common==6.11
+tex-gyre==20180621-3
+texi2html==1.82+dfsg1-5
+texinfo==6.5.0.dfsg.1-4+b1
+texlive-base==2018.20190227-2
+texlive-binaries==2018.20181218.49446-1
+texlive-extra-utils==2018.20190227-2
+texlive-font-utils==2018.20190227-2
+texlive-fonts-recommended==2018.20190227-2
+texlive-generic-recommended==2018.20190227-2
+texlive-latex-base==2018.20190227-2
+texlive-latex-extra==2018.20190227-2
+texlive-latex-recommended==2018.20190227-2
+texlive-pictures==2018.20190227-2
+texlive-plain-generic==2018.20190227-2
+tipa==2:1.3-20
+tk==8.6.9+1
+tk8.6==8.6.9-2
+tk8.6-blt2.5==2.5.3+dfsg-4
+ucf==3.0038+nmu1
+unattended-upgrades==1.11.2
+unzip==6.0-23+deb10u2
+uuid-dev==2.33.1-0.1
+velocity==1.7-5+deb10u1
+vim==2:8.1.0875-5
+vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+wdiff==1.2.2-2+b1
+x11-common==1:7.7+19
+x11-utils==7.7+4
+x11-xserver-utils==7.7+8
+x11proto-core-dev==2018.4-4
+x11proto-damage-dev==1:2018.4-4
+x11proto-dev==2018.4-4
+x11proto-fixes-dev==1:2018.4-4
+x11proto-xext-dev==2018.4-4
+x11proto-xf86vidmode-dev==2018.4-4
+xauth==1:1.0.10-1
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.2
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.17-2
+xdg-utils==1.1.3-1+deb10u1
+xfonts-encodings==1:1.0.4-2
+xfonts-utils==1:7.7+6
+xkb-data==2.26-2
+xml-core==0.18+nmu1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.32-2.2~deb10u1
+xterm==344-1+deb10u1
+xtrans-dev==1.3.5-1
+xxd==2:8.1.0875-5
+xz-utils==5.2.4-1
+yui-compressor==2.4.8-2
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
new file mode 100644
index 000000000000..182ead414d40
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
@@ -0,0 +1,92 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+astroid==1.6.5
+atomicwrites==1.1.5
+attrs==18.2.0
+automat==0.6.0
+babel==2.6.0
+backports.functools-lru-cache==1.5
+beautifulsoup4==4.7.1
+certifi==2018.8.24
+chardet==3.0.4
+click==7.0
+colorama==0.3.7
+configparser==3.5.0b2
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.5.2
+crc16==0.1.1
+cryptography==2.6.1
+ctypesgen==1.0.2
+docutils==0.14
+entrypoints==0.3
+enum34==1.1.6
+fastentrypoints==0.12
+funcsigs==1.0.2
+futures==3.2.0
+html5lib==1.0.1
+hyperlink==17.3.1
+idna==2.6
+imagesize==1.0.0
+incremental==16.10.1
+ipaddr==2.2.0
+ipaddress==1.0.17
+isort==4.3.4
+j2cli==0.3.10
+jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lazy-object-proxy==1.3.1
+logilab-common==1.4.2
+lxml==4.6.2
+m2crypto==0.36.0
+markupsafe==1.1.0
+mccabe==0.6.1
+mmh3==2.5.1
+mock==3.0.5
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose==1.3.7
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+parse==1.6.6
+pathlib2==2.3.3
+pbr==4.2.0
+pexpect==4.6.0
+pillow==5.4.1
+pluggy==0.8.0
+ptyprocess==0.7.0
+py==1.7.0
+pyasn1==0.4.2
+pyasn1-modules==0.2.1
+pycrypto==2.6.1
+pygments==2.3.1
+pygobject==3.30.4
+pylint==1.9.4
+pympler==0.8
+pyopenssl==19.0.0
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==4.4
+pytz==2019.1
+pyxdg==0.25
+pyyaml==5.4.1
+requests==2.21.0
+roman==2.0.0
+scandir==1.9.0
+secretstorage==2.3.1
+service-identity==16.0.0
+singledispatch==3.4.0.3
+six==1.12.0
+soupsieve==1.8
+sphinx==1.8.4
+stdeb==0.8.5
+stgit==0.18
+twisted==18.9.0
+typing==3.6.6
+urllib3==1.24.1
+webencodings==0.5.1
+wrapt==1.10.11
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
new file mode 100644
index 000000000000..f6c853db88e1
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -0,0 +1,70 @@
+alabaster==0.7.8
+asn1crypto==0.24.0
+atomicwrites==1.1.5
+attrs==18.2.0
+babel==2.6.0
+bitarray==2.2.2
+certifi==2018.8.24
+chardet==3.0.4
+cov-core==1.15.0
+coverage==4.5.2
+cryptography==2.6.1
+devscripts==2.19.5+deb10u1
+distro-info==0.21
+docutils==0.14
+entrypoints==0.3
+fastentrypoints==0.12
+gbp==0.9.14
+gcovr==4.1
+gpg==1.12.0
+idna==2.6
+imagesize==1.0.0
+jinja2==2.10
+keyring==17.1.1
+keyrings.alt==3.1.1
+lxml==4.6.2
+m2crypto==0.38.0
+markupsafe==1.1.0
+mmh3==2.5.1
+mock==2.0.0
+mockredispy==2.9.3
+more-itertools==4.2.0
+nose==1.3.7
+nose2==0.8.0
+olefile==0.46
+packaging==19.0
+pbr==4.2.0
+pexpect==4.8.0
+pillow==5.4.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
+pygments==2.3.1
+pygobject==3.30.4
+pympler==0.8
+pyparsing==2.2.0
+pytest==3.10.1
+pytest-cov==2.6.0
+pytest-runner==5.2
+python-apt==1.8.4.3
+python-dateutil==2.7.3
+python-debian==0.1.35
+python-magic==0.4.16
+pytz==2019.1
+pyxdg==0.25
+pyyaml==5.4.1
+redis==3.5.3
+regex==2021.7.6
+requests==2.21.0
+roman==2.0.0
+secretstorage==2.3.1
+six==1.12.0
+sphinx==1.8.4
+sphinx-rtd-theme==0.4.3
+unattended-upgrades==0.1
+unidiff==0.5.4
+urllib3==1.24.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index c68c551adaef..88b848de9e8d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.6-1
+containerd.io==1.4.8-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -772,7 +772,7 @@ libnorm-dev==1.5.8+dfsg2-1
 libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
-libnss-systemd==241-7~deb10u7
+libnss-systemd==241-7~deb10u8
 libnss3==2:3.42.1-1+deb10u3
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
@@ -805,7 +805,7 @@ libp11-kit-dev==0.23.15-2+deb10u1
 libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
-libpam-systemd==241-7~deb10u7
+libpam-systemd==241-7~deb10u8
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
@@ -1032,7 +1032,7 @@ libswresample3==7:4.1.6-1~deb10u1
 libswscale5==7:4.1.6-1~deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
-libsystemd-dev==241-7~deb10u7
+libsystemd-dev==241-7~deb10u8
 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
@@ -1072,7 +1072,7 @@ libtype-tiny-xs-perl==0.014-1+b1
 libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
-libudev-dev==241-7~deb10u7
+libudev-dev==241-7~deb10u8
 libunbound8==1.9.0-2+deb10u2
 libunicode-utf8-perl==0.62-1
 libunwind-dev==1.2.1-10~deb10u1
@@ -1256,12 +1256,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.194-2
-linux-headers-4.19.0-17-amd64==4.19.194-2
-linux-headers-4.19.0-17-common==4.19.194-2
+linux-compiler-gcc-8-x86==4.19.194-3
+linux-headers-4.19.0-17-amd64==4.19.194-3
+linux-headers-4.19.0-17-common==4.19.194-3
 linux-headers-amd64==4.19+105+deb10u12
-linux-kbuild-4.19==4.19.194-2
-linux-libc-dev==4.19.194-2
+linux-kbuild-4.19==4.19.194-3
+linux-libc-dev==4.19.194-3
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1600,8 +1600,8 @@ strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-systemd==241-7~deb10u7
-systemd-sysv==241-7~deb10u7
+systemd==241-7~deb10u8
+systemd-sysv==241-7~deb10u8
 t1utils==1.41-3
 tcl==8.6.9+1
 tcl8.6==8.6.9+dfsg-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 7f32200f52bf..b57ce596d98d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e982d5727bb51c8da2da13e5aeec02fd0b94632
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index e999dbff1a48..f6c853db88e1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.1
+bitarray==2.2.2
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
new file mode 100644
index 000000000000..3b87e1d39e28
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -0,0 +1,1412 @@
+adwaita-icon-theme==3.22.0-1+deb9u1
+ant==1.9.9-1+deb9u1
+ant-optional==1.9.9-1+deb9u1
+apt==1.4.11
+apt-file==3.1.4
+apt-transport-https==1.4.11
+apt-utils==1.4.11
+asciidoc-base==8.6.9-5
+asciidoc-common==8.6.9-5
+aspell==0.60.7~20110707-3+b2
+aspell-en==2016.11.20-0-0.1
+at==3.1.20-3
+at-spi2-core==2.22.0-6+deb9u1
+aufs-dkms==4.9+20161219-1
+aufs-tools==1:4.1+20161219-1
+augeas-lenses==1.8.0-1+deb9u1
+augeas-tools==1.8.0-1+deb9u1
+autoconf==2.69-10
+autoconf-archive==20160916-1
+automake==1:1.15-6
+automake1.11==1:1.11.6-4
+autopoint==0.19.8.1-2+deb9u1
+autotools-dev==20161112.1
+bash-completion==1:2.1-4.3
+bc==1.06.95-9+b3
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
+binfmt-support==2.1.6-2
+binutils==2.28-5
+bison==2:3.0.4.dfsg-1+b1
+blt==2.5.3+dfsg-3
+bsdmainutils==9.0.12+nmu1
+build-essential==12.3
+byacc==20140715-1+b1
+bzip2==1.0.6-8.1
+ca-certificates==20200601~deb9u2
+ca-certificates-java==20170929~deb9u3
+cdbs==0.4.150
+cgmanager==0.41-2
+cgroupfs-mount==1.3
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:3.8-36
+clang-3.8==1:3.8.1-24
+cm-super-minimal==0.3.4-9
+cmake==3.13.2-1~bpo9+1
+cmake-data==3.13.2-1~bpo9+1
+cmocka-doc==1.0.1-3
+cowbuilder==0.85
+cowdancer==0.85
+cpio==2.11+dfsg-6
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+cppcheck==1.76.1-1
+cron==3.0pl1-128+deb9u1
+curl==7.52.1-5+deb9u14
+dbus==1.10.32-0+deb9u1
+dconf-gsettings-backend==0.26.0-2+b1
+dconf-service==0.26.0-2+b1
+dctrl-tools==2.24-2+b1
+debhelper==12.1.1~bpo9+1
+debian-keyring==2017.05.28
+debootstrap==1.0.89
+default-jdk-headless==2:1.8-58+deb9u1
+default-jre==2:1.8-58+deb9u1
+default-jre-headless==2:1.8-58+deb9u1
+default-libmysqlclient-dev==1.0.2
+devscripts==2.17.6+deb9u2
+dh-autoreconf==17~bpo9+1
+dh-exec==0.23+b1
+dh-make==2.201608
+dh-python==2.20170125
+dh-strip-nondeterminism==0.034-1
+dh-systemd==10.2.5
+dictionaries-common==1.27.2
+diffstat==1.61-1+b1
+dirmngr==2.1.18-8~deb9u4
+distro-info-data==0.36
+dkms==2.3-2
+dmsetup==2:1.02.137-2
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
+docbook-xml==4.5-8
+docbook-xsl==1.79.1+dfsg-2
+docker-ce==18.06.3~ce~3-0~debian
+docutils-common==0.13.1+dfsg-2
+docutils-doc==0.13.1+dfsg-2
+doxygen==1.8.13-4+b1
+dpatch==2.0.38+nmu1~bpo9+1
+dpkg-dev==1.18.25
+dput==0.12.1
+dwz==0.12-1+b1
+eatmydata==105-5
+emacsen-common==2.0.8
+equivs==2.0.9+nmu1
+exim4==4.89-2+deb9u8
+exim4-base==4.89-2+deb9u8
+exim4-config==4.89-2+deb9u8
+exim4-daemon-light==4.89-2+deb9u8
+expat==2.2.0-2+deb9u3
+exuberant-ctags==1:5.9~svn20110310-11
+fakeroot==1.21-3.1
+file==1:5.30-1+deb9u3
+flex==2.6.1-1.3
+fontconfig==2.11.0-6.7+b1
+fontconfig-config==2.11.0-6.7
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==4.7.0~dfsg-1
+fonts-lato==2.0-1
+fonts-liberation==1:1.07.4-2
+fonts-lmodern==2.004.5-3
+fonts-noto-mono==20161116-1
+fonts-texgyre==20160520-1
+fop==1:2.1-6
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gawk==1:4.1.4+dfsg-1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+gcovr==3.3-1
+gdb==7.12-6
+gem2deb==0.33.1
+gem2deb-test-runner==0.33.1
+geoip-database==20170512-1
+gettext==0.19.8.1-2+deb9u1
+gettext-base==0.19.8.1-2+deb9u1
+ghostscript==9.26a~dfsg-0+deb9u7
+gir1.2-glib-2.0==1.50.0-1+b1
+gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
+git==1:2.11.0-3+deb9u7
+git-buildpackage==0.8.12.2
+git-man==1:2.11.0-3+deb9u7
+glib-networking==2.50.0-1+deb9u1
+glib-networking-common==2.50.0-1+deb9u1
+glib-networking-services==2.50.0-1+deb9u1
+gnome-icon-theme==3.12.0-2
+gnupg==2.1.18-8~deb9u4
+gnupg-agent==2.1.18-8~deb9u4
+gnupg-l10n==2.1.18-8~deb9u4
+gnupg2==2.1.18-8~deb9u4
+googletest==1.8.0-6
+graphviz==2.38.0-17+deb9u1
+groff==1.22.3-9
+groff-base==1.22.3-9
+gsettings-desktop-schemas==3.22.0-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.3
+gtk-update-icon-cache==3.22.11-1
+guile-2.0-libs==2.0.13+1-4
+hicolor-icon-theme==0.15-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==57.1-6+deb9u4
+imagemagick==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
+install-info==6.3.0.dfsg.1-1+b2
+intltool-debian==0.35.0+20060710.4
+iproute2==4.9.0-1+deb9u1
+iptables==1.6.0+snapshot20161117-6
+iptables-dev==1.6.0+snapshot20161117-6
+iso-codes==3.75-1
+java-common==0.58+deb9u1
+java-wrappers==0.1.28
+javahelper==0.59
+javascript-common==11
+junit==3.8.2-8
+junit4==4.12-4+deb9u1
+kernel-wedge==2.96
+kmod==23-2
+krb5-locales==1.15-1+deb9u2
+less==481-2.1
+libalgorithm-diff-perl==1.19.03-1
+libalgorithm-diff-xs-perl==0.04-4+b2
+libalgorithm-merge-perl==0.08-3
+libann0==1.1.2+doc-6
+libaopalliance-java==20070526-5
+libapache-pom-java==10-2
+libapparmor1==2.11.0-3+deb9u2
+libapt-inst2.0==1.4.11
+libapt-pkg-perl==0.1.32
+libarchive-zip-perl==1.59-1+deb9u1
+libarchive13==3.2.2-2+deb9u2
+libasan3==6.3.0-18+deb9u1
+libasm-java==5.2-2
+libasound2==1.1.3-5
+libasound2-data==1.1.3-5
+libaspell15==0.60.7~20110707-3+b2
+libassuan0==2.4.3-2
+libasyncns0==0.8-6
+libatinject-jsr330-api-java==1.0+ds1-2
+libatk-bridge2.0-0==2.22.0-2
+libatk-wrapper-java==0.33.3-13+deb9u1
+libatk-wrapper-java-jni==0.33.3-13+deb9u1
+libatk1.0-0==2.22.0-1
+libatk1.0-data==2.22.0-1
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==6.3.0-18+deb9u1
+libatspi2.0-0==2.22.0-6+deb9u1
+libaudio2==1.9.4-5+b1
+libaudit-dev==1:2.6.7-2
+libaugeas0==1.8.0-1+deb9u1
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.6.32-2
+libavahi-common-data==0.6.32-2
+libavahi-common3==0.6.32-2
+libavalon-framework-java==4.2.0-9
+libb-hooks-endofscope-perl==0.21-1
+libbabeltrace-ctf-dev==1.5.1-1
+libbabeltrace-ctf1==1.5.1-1
+libbabeltrace-dev==1.5.1-1
+libbabeltrace1==1.5.1-1
+libbatik-java==1.8-4+deb9u2
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbison-dev==2:3.0.4.dfsg-1+b1
+libbit-vector-perl==7.4-1+b2
+libboost-all-dev==1.62.0.1
+libboost-atomic-dev==1.62.0.1
+libboost-atomic1.62-dev==1.62.0+dfsg-4
+libboost-atomic1.62.0==1.62.0+dfsg-4
+libboost-chrono-dev==1.62.0.1
+libboost-chrono1.62-dev==1.62.0+dfsg-4
+libboost-chrono1.62.0==1.62.0+dfsg-4
+libboost-context-dev==1.62.0.1
+libboost-context1.62-dev==1.62.0+dfsg-4
+libboost-context1.62.0==1.62.0+dfsg-4
+libboost-coroutine-dev==1.62.0.1
+libboost-coroutine1.62-dev==1.62.0+dfsg-4
+libboost-coroutine1.62.0==1.62.0+dfsg-4
+libboost-date-time-dev==1.62.0.1
+libboost-date-time1.62-dev==1.62.0+dfsg-4
+libboost-date-time1.62.0==1.62.0+dfsg-4
+libboost-dev==1.62.0.1
+libboost-exception-dev==1.62.0.1
+libboost-exception1.62-dev==1.62.0+dfsg-4
+libboost-fiber-dev==1.62.0.1
+libboost-fiber1.62-dev==1.62.0+dfsg-4
+libboost-fiber1.62.0==1.62.0+dfsg-4
+libboost-filesystem-dev==1.62.0.1
+libboost-filesystem1.62-dev==1.62.0+dfsg-4
+libboost-filesystem1.62.0==1.62.0+dfsg-4
+libboost-graph-dev==1.62.0.1
+libboost-graph-parallel-dev==1.62.0.1
+libboost-graph-parallel1.62-dev==1.62.0+dfsg-4
+libboost-graph-parallel1.62.0==1.62.0+dfsg-4
+libboost-graph1.62-dev==1.62.0+dfsg-4
+libboost-graph1.62.0==1.62.0+dfsg-4
+libboost-iostreams-dev==1.62.0.1
+libboost-iostreams1.62-dev==1.62.0+dfsg-4
+libboost-iostreams1.62.0==1.62.0+dfsg-4
+libboost-locale-dev==1.62.0.1
+libboost-locale1.62-dev==1.62.0+dfsg-4
+libboost-locale1.62.0==1.62.0+dfsg-4
+libboost-log-dev==1.62.0.1
+libboost-log1.62-dev==1.62.0+dfsg-4
+libboost-log1.62.0==1.62.0+dfsg-4
+libboost-math-dev==1.62.0.1
+libboost-math1.62-dev==1.62.0+dfsg-4
+libboost-math1.62.0==1.62.0+dfsg-4
+libboost-mpi-dev==1.62.0.1
+libboost-mpi-python-dev==1.62.0.1
+libboost-mpi-python1.62-dev==1.62.0+dfsg-4
+libboost-mpi-python1.62.0==1.62.0+dfsg-4
+libboost-mpi1.62-dev==1.62.0+dfsg-4
+libboost-mpi1.62.0==1.62.0+dfsg-4
+libboost-program-options-dev==1.62.0.1
+libboost-program-options1.62-dev==1.62.0+dfsg-4
+libboost-program-options1.62.0==1.62.0+dfsg-4
+libboost-python-dev==1.62.0.1
+libboost-python1.62-dev==1.62.0+dfsg-4
+libboost-python1.62.0==1.62.0+dfsg-4
+libboost-random-dev==1.62.0.1
+libboost-random1.62-dev==1.62.0+dfsg-4
+libboost-random1.62.0==1.62.0+dfsg-4
+libboost-regex-dev==1.62.0.1
+libboost-regex1.62-dev==1.62.0+dfsg-4
+libboost-regex1.62.0==1.62.0+dfsg-4
+libboost-serialization-dev==1.62.0.1
+libboost-serialization1.62-dev==1.62.0+dfsg-4
+libboost-serialization1.62.0==1.62.0+dfsg-4
+libboost-signals-dev==1.62.0.1
+libboost-signals1.62-dev==1.62.0+dfsg-4
+libboost-signals1.62.0==1.62.0+dfsg-4
+libboost-system-dev==1.62.0.1
+libboost-system1.62-dev==1.62.0+dfsg-4
+libboost-system1.62.0==1.62.0+dfsg-4
+libboost-test-dev==1.62.0.1
+libboost-test1.62-dev==1.62.0+dfsg-4
+libboost-test1.62.0==1.62.0+dfsg-4
+libboost-thread-dev==1.62.0.1
+libboost-thread1.62-dev==1.62.0+dfsg-4
+libboost-thread1.62.0==1.62.0+dfsg-4
+libboost-timer-dev==1.62.0.1
+libboost-timer1.62-dev==1.62.0+dfsg-4
+libboost-timer1.62.0==1.62.0+dfsg-4
+libboost-tools-dev==1.62.0.1
+libboost-type-erasure-dev==1.62.0.1
+libboost-type-erasure1.62-dev==1.62.0+dfsg-4
+libboost-type-erasure1.62.0==1.62.0+dfsg-4
+libboost-wave-dev==1.62.0.1
+libboost-wave1.62-dev==1.62.0+dfsg-4
+libboost-wave1.62.0==1.62.0+dfsg-4
+libboost1.62-dev==1.62.0+dfsg-4
+libboost1.62-tools-dev==1.62.0+dfsg-4
+libbsd-dev==0.8.3-1+deb9u1
+libbsd0==0.8.3-1+deb9u1
+libbsf-java==1:2.4.0-5
+libbsh-java==2.0b4-18
+libc-ares-dev==1.12.0-1+deb9u1
+libc-ares2==1.12.0-1+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dbg==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcairo-gobject2==1.14.8-1+deb9u1
+libcairo2==1.14.8-1+deb9u1
+libcap-dev==1:2.25-1
+libcap-ng-dev==0.7.7-3+b1
+libcap2==1:2.25-1
+libcap2-bin==1:2.25-1
+libcarp-clan-perl==6.06-1
+libcc1-0==6.3.0-18+deb9u1
+libcdi-api-java==1.0-2
+libcdt5==2.38.0-17+deb9u1
+libcgi-fast-perl==1:2.12-1
+libcgi-pm-perl==4.35-1
+libcglib-java==3.2.4-1
+libcgmanager0==0.41-2
+libcgraph6==2.38.0-17+deb9u1
+libclang-common-3.8-dev==1:3.8.1-24
+libclang1-3.8==1:3.8.1-24
+libclang1-3.9==1:3.9.1-9
+libclass-accessor-perl==0.34-1
+libclass-inspector-perl==1.31-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-2+b7
+libclassworlds-java==1.1-final-5
+libclone-perl==0.38-2+b1
+libcmocka-dev==1.0.1-3
+libcmocka0==1.0.1-3
+libcolord2==1.3.3-2
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.3.1-3
+libcommons-codec-java==1.10-1
+libcommons-collections3-java==3.2.2-1
+libcommons-configuration-java==1.10-4
+libcommons-digester-java==1.8.1-4
+libcommons-httpclient-java==3.1-12
+libcommons-io-java==2.5-1
+libcommons-lang-java==2.6-6
+libcommons-lang3-java==3.5-1
+libcommons-logging-java==1.2-1
+libcommons-net-java==3.5-1
+libcommons-parent-java==39-3
+libcommons-validator-java==1:1.5.1-1
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.11-3
+libcryptsetup4==2:1.7.3-4
+libcups2==2.2.1-8+deb9u6
+libcupsfilters1==1.11.6-3+deb9u1
+libcupsimage2==2.2.1-8+deb9u6
+libcurl3==7.52.1-5+deb9u14
+libcurl3-gnutls==7.52.1-5+deb9u14
+libcurl3-nss==7.52.1-5+deb9u14
+libcurl4-nss-dev==7.52.1-5+deb9u14
+libdaemon-dev==0.14-6
+libdaemon0==0.14-6
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.10-4+b1
+libdb-dev==5.3.1
+libdb5.3-dev==5.3.28-12+deb9u1
+libdbi1==0.9.0-4+deb9u2
+libdbus-1-3==1.10.32-0+deb9u1
+libdbus-1-dev==1.10.32-0+deb9u1
+libdbus-glib-1-2==0.108-2
+libdconf1==0.26.0-2+b1
+libdevel-globaldestruction-perl==0.14-1
+libdevmapper1.02.1==2:1.02.137-2
+libdigest-hmac-perl==1.03+dfsg-1
+libdistro-info-perl==0.14
+libdjvulibre-text==3.5.27.1-7+deb9u2
+libdjvulibre21==3.5.27.1-7+deb9u2
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdom4j-java==1.6.1+dfsg.3-2+deb9u1
+libdouble-conversion1==2.0.1-4
+libdoxia-core-java==1.1.4-6
+libdoxia-java==1.1.4-6
+libdoxia-sitetools-java==1.1.4-1.1
+libdpkg-perl==1.18.25
+libdrm-amdgpu1==2.4.74-1
+libdrm-dev==2.4.74-1
+libdrm-freedreno1==2.4.74-1
+libdrm-nouveau2==2.4.74-1
+libdrm-radeon1==2.4.74-1
+libdrm-tegra0==2.4.74-1
+libdrm2==2.4.74-1
+libdw-dev==0.168-1
+libdw1==0.168-1
+libeasymock-java==3.4+ds-1
+libeatmydata1==105-5
+libeclipse-aether-java==1.0.2-1
+libedit-dev==3.1-20160903-3
+libedit2==3.1-20160903-3
+libegl1-mesa==13.0.6-1+b2
+libelf-dev==0.168-1
+libelf1==0.168-1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.3.1-2
+liberror-perl==0.17024-1
+libestr0==0.1.10-2
+libevdev2==1.5.6+dfsg-1
+libevent-2.0-5==2.0.21-stable-3
+libevent-core-2.0-5==2.0.21-stable-3
+libevent-dev==2.0.21-stable-3
+libevent-extra-2.0-5==2.0.21-stable-3
+libevent-openssl-2.0-5==2.0.21-stable-3
+libevent-pthreads-2.0-5==2.0.21-stable-3
+libexpat1==2.2.0-2+deb9u3
+libexpat1-dev==2.2.0-2+deb9u3
+libexplain-dev==1.4.D001-6
+libexplain51==1.4.D001-6
+libexporter-tiny-perl==0.042-1
+libfakeroot==1.21-3.1
+libfastjson4==0.99.4-1
+libfcgi-perl==0.78-2
+libffi-dev==3.2.1-6
+libfftw3-double3==3.3.5-3
+libfile-basedir-perl==0.07-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b2
+libfile-homedir-perl==1.00-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.27-1
+libfile-stripnondeterminism-perl==0.034-1
+libfile-which-perl==1.21-1
+libfl-dev==2.6.1-1.3
+libflac8==1.3.2-2+deb9u1
+libfont-afm-perl==1.20-2
+libfontbox-java==1:1.8.12-1
+libfontconfig1==2.11.0-6.7+b1
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.1-6
+libfreetype6==2.6.3-3.2+deb9u2
+libfribidi0==0.19.7-1+deb9u1
+libgail-common==2.24.31-2
+libgail18==2.24.31-2
+libgbm1==13.0.6-1+b2
+libgc1c2==1:7.4.2-8
+libgcc-6-dev==6.3.0-18+deb9u1
+libgd3==2.2.4-2+deb9u5
+libgdbm3==1.8.3-14
+libgdk-pixbuf2.0-0==2.36.5-2+deb9u2
+libgdk-pixbuf2.0-common==2.36.5-2+deb9u2
+libgeoip1==1.6.9-4
+libgeronimo-interceptor-3.0-spec-java==1.0.1-3
+libgetopt-long-descriptive-perl==0.100-1
+libgfortran3==6.3.0-18+deb9u1
+libgif7==5.1.4-0.4
+libgirepository-1.0-1==1.50.0-1+b1
+libgit-wrapper-perl==0.047-1
+libgl1-mesa-dev==13.0.6-1+b2
+libgl1-mesa-dri==13.0.6-1+b2
+libgl1-mesa-glx==13.0.6-1+b2
+libglapi-mesa==13.0.6-1+b2
+libglew2.0==2.0.0-3+b1
+libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-bin==2.50.3-2+deb9u2
+libglib2.0-data==2.50.3-2+deb9u2
+libglib2.0-dev==2.50.3-2+deb9u2
+libglu1-mesa==9.0.0-2.1
+libglu1-mesa-dev==9.0.0-2.1
+libgmp-dev==2:6.1.2+dfsg-1
+libgmpxx4ldbl==2:6.1.2+dfsg-1
+libgomp1==6.3.0-18+deb9u1
+libgoogle-perftools4==2.5-2.2
+libgpgme11==1.8.0-3+b2
+libgpm2==1.20.4-6.2+b1
+libgraphite2-3==1.3.10-1
+libgs9==9.26a~dfsg-0+deb9u7
+libgs9-common==9.26a~dfsg-0+deb9u7
+libgsasl7==1.8.0-8+b2
+libgssapi-krb5-2==1.15-1+deb9u2
+libgstreamer1.0-0==1.10.4-1
+libgtest-dev==1.8.0-6
+libgtk-3-0==3.22.11-1
+libgtk-3-bin==3.22.11-1
+libgtk-3-common==3.22.11-1
+libgtk2.0-0==2.24.31-2
+libgtk2.0-bin==2.24.31-2
+libgtk2.0-common==2.24.31-2
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==230-3
+libguice-java==4.0-3
+libgvc6==2.38.0-17+deb9u1
+libgvpr2==2.38.0-17+deb9u1
+libhamcrest-java==1.3-6
+libharfbuzz-icu0==1.4.2-1
+libharfbuzz0b==1.4.2-1
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.03-2
+libhttp-cookies-perl==6.01-1
+libhttp-daemon-perl==6.01-1
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.11-1
+libhttp-negotiate-perl==6.00-2
+libhttpclient-java==4.5.2-2+deb9u1
+libhttpcore-java==4.4.6-1
+libhwloc-dev==1.11.5-1
+libhwloc-plugins==1.11.5-1
+libhwloc5==1.11.5-1
+libiberty-dev==20161220-1
+libibverbs-dev==1.2.1-2
+libibverbs1==1.2.1-2
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==57.1-6+deb9u4
+libicu57==57.1-6+deb9u4
+libijs-0.35==0.35-12
+libilmbase12==2.2.0-12
+libimport-into-perl==1.002005-1
+libinput-bin==1.6.3-1
+libinput10==1.6.3-1
+libio-html-perl==1.001-1
+libio-pty-perl==1:1.08-1.1+b2
+libio-sessiondata-perl==1.03-1
+libio-socket-inet6-perl==2.72-2
+libio-socket-ssl-perl==2.044-1
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-2
+libip4tc-dev==1.6.0+snapshot20161117-6
+libip4tc0==1.6.0+snapshot20161117-6
+libip6tc-dev==1.6.0+snapshot20161117-6
+libip6tc0==1.6.0+snapshot20161117-6
+libipc-run-perl==0.94-1+deb9u1
+libipc-system-simple-perl==1.25-3
+libiptc-dev==1.6.0+snapshot20161117-6
+libiptc0==1.6.0+snapshot20161117-6
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisl15==0.18-1
+libisorelax-java==20041111-9
+libitext1-java==1.4-6
+libitm1==6.3.0-18+deb9u1
+libjansson-dev==2.9-1
+libjansson4==2.9-1
+libjaxen-java==1.1.6-1+deb9u1
+libjaxp1.3-java==1.3.05-2
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.13-4.1
+libjdom1-java==1.1.3-1+deb9u1
+libjemalloc-dev==3.6.0-9.1
+libjemalloc1==3.6.0-9.1
+libjetty9-java==9.2.30-0+deb9u2
+libjline-java==1.0-2
+libjpeg62-turbo==1:1.5.1-2+deb9u1
+libjs-bootstrap==3.3.7+dfsg-2+deb9u2
+libjs-jquery==3.1.1-2+deb9u2
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==11-3
+libjs-jquery-tablesorter==11-3
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-1
+libjs-sphinxdoc==1.4.9-2
+libjs-twitter-bootstrap==2.0.2+dfsg-10
+libjs-underscore==1.8.3~dfsg-1+deb9u1
+libjsch-java==0.1.54-1
+libjson-c-dev==0.12.1-1.1+deb9u1
+libjson-c3==0.12.1-1.1+deb9u1
+libjson-glib-1.0-0==1.2.6-1
+libjson-glib-1.0-common==1.2.6-1
+libjsoncpp1==1.7.4-3
+libjsoup-java==1.10.2-1
+libjsr305-java==0.1~+svn49-10
+libjtidy-java==7+svn20110807-4
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libjzlib-java==1.1.3-1
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkmod2==23-2
+libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
+liblcms2-2==2.8-4+deb9u1
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+libldap2-dev==2.4.44+dfsg-5+deb9u8
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b1
+libllvm3.8==1:3.8.1-24
+libllvm3.9==1:3.9.1-9
+liblocale-gettext-perl==1.07-3+b1
+liblog4j1.2-java==1.2.17-7+deb9u1
+liblogging-stdlog0==1.0.5-2+b2
+liblognorm5==2.0.1-1.1+b1
+liblqr-1-0==0.4.2-2+b2
+libltdl-dev==2.4.6-2
+libltdl7==2.4.6-2
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.06-2
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
+liblzo2-2==2.08-1.2+b2
+liblzo2-dev==2.08-1.2+b2
+libmagic-mgc==1:5.30-1+deb9u3
+libmagic1==1:5.30-1+deb9u3
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmail-sendmail-perl==0.79.16-2
+libmailtools-perl==2.18-1
+libmailutils5==1:3.1.1-1
+libmariadbclient-dev==10.1.48-0+deb9u2
+libmariadbclient-dev-compat==10.1.48-0+deb9u2
+libmariadbclient18==10.1.48-0+deb9u2
+libmaven-ant-tasks-java==2.1.3-4
+libmaven-archiver-java==2.6-3
+libmaven-clean-plugin-java==2.5-1
+libmaven-common-artifact-filters-java==1.4-1
+libmaven-compiler-plugin-java==3.2-5
+libmaven-doxia-tools-java==1.2.1-2
+libmaven-filtering-java==1.1-1
+libmaven-jar-plugin-java==2.4-1
+libmaven-parent-java==21-2
+libmaven-plugin-tools-java==3.3-5
+libmaven-reporting-impl-java==2.3-1
+libmaven-resources-plugin-java==2.6-1
+libmaven-shared-incremental-java==1.1-1
+libmaven-shared-utils-java==3.0.0-1
+libmaven-site-plugin-java==2.1-4
+libmaven2-core-java==2.2.1-26
+libmaven3-core-java==3.3.9-4
+libmime-tools-perl==5.508-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmnl0==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.014-2
+libmoo-perl==2.002005-1
+libmpc3==1.0.3-1+b2
+libmpdec2==2.4.2-1
+libmpfr4==3.1.5-1
+libmsv-java==2009.1+dfsg1-5
+libmtdev1==1.1.5-1+b1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==0.8~beta+dfsg-1+b1
+libnanomsg4==0.8~beta+dfsg-1+b1
+libncurses5==6.0+20161126-1+deb9u2
+libncurses5-dev==6.0+20161126-1+deb9u2
+libnet-dbus-perl==1.1.0-4+b1
+libnet-dns-perl==1.07-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.12-1
+libnet-ip-perl==1.26-1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.80-1
+libnetfilter-conntrack-dev==1.0.6-2
+libnetfilter-conntrack3==1.0.6-2
+libnetpbm10==2:10.0-15.3+b2
+libnewt-dev==0.52.19-1+b1
+libnewt0.52==0.52.19-1+b1
+libnfnetlink-dev==1.0.1-3
+libnfnetlink0==1.0.1-3
+libnftnl-dev==1.0.7-1
+libnftnl4==1.0.7-1
+libnghttp2-14==1.18.1-1+deb9u1
+libnih-dbus1==1.0.3-8
+libnih1==1.0.3-8
+libnl-3-200==3.2.27-2
+libnl-route-3-200==3.2.27-2
+libnpth0==1.3-1
+libnspr4==2:4.12-6
+libnss3==2:3.26.2-1.1+deb9u2
+libntlm0==1.4-8
+libnuma-dev==2.0.11-2.1
+libnuma1==2.0.11-2.1
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-6-dev==6.3.0-18+deb9u1
+libobjc4==6.3.0-18+deb9u1
+libobjenesis-java==2.5.1-1
+libogg0==1.3.2-1
+libopenexr22==2.2.0-11+deb9u3
+libopenjp2-7==2.1.2-1.1+deb9u6
+libopenmpi-dev==2.0.2-2
+libopenmpi2==2.0.2-2
+liboro-java==2.0.8a-12
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b4
+libossp-uuid16==1.6.2-1.5+b4
+libpackage-stash-perl==0.37-1
+libpackage-stash-xs-perl==0.28-3+b1
+libpackagekit-glib2-18==1.1.5-2+deb9u2
+libpam-cap==1:2.25-1
+libpam-systemd==232-25+deb9u13
+libpam0g-dev==1.1.8-3.6
+libpango-1.0-0==1.40.5-1
+libpangocairo-1.0-0==1.40.5-1
+libpangoft2-1.0-0==1.40.5-1
+libpaper-utils==1.1.24+nmu5
+libpaper1==1.1.24+nmu5
+libparams-classify-perl==0.013-6+b1
+libparams-util-perl==1.07-3+b1
+libparams-validate-perl==1.26-1
+libparse-debianchangelog-perl==1.2.0-12
+libpath-iterator-rule-perl==1.009-1
+libpath-tiny-perl==0.100-1
+libpathplan4==2.38.0-17+deb9u1
+libpcap-dev==1.8.1-3
+libpcap0.8==1.8.1-3
+libpcap0.8-dev==1.8.1-3
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.13.4-1+b2
+libpcre16-3==2:8.39-3
+libpcre3-dev==2:8.39-3
+libpcre32-3==2:8.39-3
+libpcrecpp0v5==2:8.39-3
+libpcsclite1==1.8.20-1
+libperl-dev==5.24.1-3+deb9u7
+libperl5.24==5.24.1-3+deb9u7
+libperlio-gzip-perl==0.19-1+b2
+libpgm-5.2-0==5.2.122~dfsg-2
+libpipeline1==1.4.1-2
+libpixman-1-0==0.34.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-3
+libplexus-archiver-java==2.2-1+deb9u1
+libplexus-bsh-factory-java==1.0~alpha7-3.1
+libplexus-build-api-java==0.0.7-1
+libplexus-cipher-java==1.7-1
+libplexus-classworlds-java==1.5.0-5
+libplexus-classworlds2-java==2.5.2-1
+libplexus-cli-java==1.2-5
+libplexus-compiler-java==2.4-3
+libplexus-component-annotations-java==1.6-3
+libplexus-component-metadata-java==1.6-3
+libplexus-container-default-java==1.0-alpha-9-stable-1-7
+libplexus-container-default1.5-java==1.6-3
+libplexus-containers-java==1.0~beta3.0.7-8
+libplexus-containers1.5-java==1.6-3
+libplexus-i18n-java==1.0-beta-10-3
+libplexus-interactivity-api-java==1.0-alpha-6-7
+libplexus-interpolation-java==1.21-1
+libplexus-io-java==1.0~alpha5-2
+libplexus-sec-dispatcher-java==1.3.1-6
+libplexus-utils-java==1:1.5.15-4+deb9u1
+libplexus-utils2-java==3.0.22-1
+libplexus-velocity-java==1.2-1
+libpng-dev==1.6.28-1+deb9u1
+libpng16-16==1.6.28-1+deb9u1
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-18+deb9u1
+libpolkit-backend-1-0==0.105-18+deb9u1
+libpolkit-gobject-1-0==0.105-18+deb9u1
+libpoppler64==0.48.0-2+deb9u4
+libpopt0==1.16-10+b2
+libpotrace0==1.13-3
+libprocps6==2:3.3.12-3+deb9u1
+libprotobuf-dev==3.0.0-9
+libprotobuf-lite10==3.0.0-9
+libprotobuf10==3.0.0-9
+libprotoc10==3.0.0-9
+libproxy1v5==0.4.14-2+deb9u2
+libptexenc1==2016.20160513.41080.dfsg-2+deb9u1
+libpthread-stubs0-dev==0.3-4
+libpulse0==10.0-1+deb9u1
+libpython-all-dev==2.7.13-2
+libpython-dev==2.7.13-2
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-dev==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
+libpython3-all-dbg==3.5.3-1
+libpython3-all-dev==3.5.3-1
+libpython3-dbg==3.5.3-1
+libpython3-dev==3.5.3-1
+libpython3-stdlib==3.5.3-1
+libpython3.5==3.5.3-1+deb9u4
+libpython3.5-dbg==3.5.3-1+deb9u4
+libpython3.5-dev==3.5.3-1+deb9u4
+libpython3.5-minimal==3.5.3-1+deb9u4
+libpython3.5-stdlib==3.5.3-1+deb9u4
+libqdox-java==1.12.1-2
+libqdox2-java==2.0~M3-3
+libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
+libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
+libqt4-designer==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
+libqt4-help==4:4.8.7+dfsg-11+deb9u1
+libqt4-network==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
+libqt4-script==4:4.8.7+dfsg-11+deb9u1
+libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
+libqt4-svg==4:4.8.7+dfsg-11+deb9u1
+libqt4-test==4:4.8.7+dfsg-11+deb9u1
+libqt4-xml==4:4.8.7+dfsg-11+deb9u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
+libqt5concurrent5==5.7.1+dfsg-3+deb9u3
+libqt5core5a==5.7.1+dfsg-3+deb9u3
+libqt5dbus5==5.7.1+dfsg-3+deb9u3
+libqt5gui5==5.7.1+dfsg-3+deb9u3
+libqt5network5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
+libqt5printsupport5==5.7.1+dfsg-3+deb9u3
+libqt5sql5==5.7.1+dfsg-3+deb9u3
+libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
+libqt5svg5==5.7.1~20161021-2.1
+libqt5test5==5.7.1+dfsg-3+deb9u3
+libqt5widgets5==5.7.1+dfsg-3+deb9u3
+libqt5xml5==5.7.1+dfsg-3+deb9u3
+libqtcore4==4:4.8.7+dfsg-11+deb9u1
+libqtdbus4==4:4.8.7+dfsg-11+deb9u1
+libqtgui4==4:4.8.7+dfsg-11+deb9u1
+libreadline-dev==7.0-3
+libreadline7==7.0-3
+libregexp-assemble-perl==0.36-1
+librelaxng-datatype-java==1.0+ds1-3
+librest-0.7-0==0.8.0-2
+librhash0==1.3.3-1+b2
+librhino-java==1.7.7.1-1
+librole-tiny-perl==2.000005-1
+librrd-dev==1.6.0-1+b2
+librrd8==1.6.0-1+b2
+librsvg2-2==2.40.21-0+deb9u1
+librsvg2-common==2.40.21-0+deb9u1
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libruby2.3==2.3.3-1+deb9u9
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsaxon-java==1:6.5.5-10
+libscalar-list-utils-perl==1:1.47-1
+libseccomp2==2.3.1-2.1+deb9u1
+libselinux1-dev==2.6-3+b3
+libsensors4==1:3.4.0-4
+libsensors4-dev==1:3.4.0-4
+libsepol1-dev==2.6-2
+libservlet3.1-java==8.5.54-0+deb9u6
+libsigsegv2==2.10-5
+libsisu-inject-java==0.3.2-2
+libsisu-plexus-java==0.3.2-1
+libslang2==2.3.1-5
+libslang2-dev==2.3.1-5
+libslf4j-java==1.7.22-1
+libsm-dev==2:1.2.2-1+b3
+libsm6==2:1.2.2-1+b3
+libsndfile1==1.0.27-3+deb9u1
+libsnmp-base==5.7.3+dfsg-1.7+deb9u3
+libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
+libsnmp30==5.7.3+dfsg-1.7+deb9u3
+libsoap-lite-perl==1.20-1
+libsocket6-perl==0.27-1+b1
+libsodium18==1.0.11-2
+libsort-key-perl==1.33-1+b3
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.56.0-2+deb9u2
+libsoup2.4-1==2.56.0-2+deb9u2
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl-dev==1.1.0l-1~deb9u3
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libstax-java==1.2.0-3
+libstdc++-6-dev==6.3.0-18+deb9u1
+libstrictures-perl==2.000003-1
+libstring-copyright-perl==0.003005-1
+libstring-escape-perl==2010.002-1
+libsub-exporter-perl==0.986-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.12-2+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1
+libsubunit-dev==1.1.0-3
+libsubunit0==1.1.0-3
+libsurefire-java==2.17-3
+libswitch-perl==2.17-2
+libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==232-25+deb9u13
+libsystemd0==232-25+deb9u13
+libtask-weaken-perl==1.04-1
+libtcl8.6==8.6.6+dfsg-1+b1
+libtcmalloc-minimal4==2.5-2.2
+libtexlua52==2016.20160513.41080.dfsg-2+deb9u1
+libtext-charwidth-perl==0.04-7+b3
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b3
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.26-1
+libthai0==0.1.26-1
+libtie-ixhash-perl==1.23-2
+libtiff5==4.0.8-2+deb9u6
+libtimedate-perl==2.3000-2+deb9u1
+libtinfo-dev==6.0+20161126-1+deb9u2
+libtinyxml2-4==4.0.1-1
+libtinyxml2-dev==4.0.1-1
+libtk8.6==8.6.6-1+b1
+libtool==2.4.6-2
+libtool-bin==2.4.6-2
+libtry-tiny-perl==0.28-1
+libtxc-dxtn-s2tc==1.0+git20151227-2
+libubsan0==6.3.0-18+deb9u1
+libudev-dev==232-25+deb9u13
+libudev1==232-25+deb9u13
+libunicode-utf8-perl==0.60-1+b2
+libunwind-dev==1.1-4.1
+libunwind8==1.1-4.1
+libunwind8-dev==1.1-4.1
+liburi-perl==1.71-1
+libusb-0.1-4==2:0.1.12-30
+libusb-1.0-0==2:1.0.21-1
+libusb-1.0-0-dev==2:1.0.21-1
+libusb-1.0-doc==2:1.0.21-1
+libusb-dev==2:0.1.12-30
+libutempter0==1.1.6-3
+libuv1==1.34.2-1~bpo9+1
+libvariable-magic-perl==0.61-1
+libvorbis0a==1.3.5-4+deb9u2
+libvorbisenc2==1.3.5-4+deb9u2
+libwacom-bin==0.22-1+b1
+libwacom-common==0.22-1
+libwacom2==0.22-1+b1
+libwagon-java==1.0.0-9
+libwagon2-java==2.10-6
+libwayland-client0==1.12.0-1+deb9u1
+libwayland-cursor0==1.12.0-1+deb9u1
+libwayland-egl1-mesa==13.0.6-1+b2
+libwayland-server0==1.12.0-1+deb9u1
+libwebp6==0.5.2-1+deb9u1
+libwebpdemux2==0.5.2-1+deb9u1
+libwebpmux2==0.5.2-1+deb9u1
+libwmf0.2-7==0.2.8.4-10.6
+libwrap0==7.6.q-26
+libwrap0-dev==7.6.q-26
+libwww-perl==6.15-1
+libwww-robotrules-perl==6.01-1
+libx11-6==2:1.6.4-3+deb9u4
+libx11-data==2:1.6.4-3+deb9u4
+libx11-dev==2:1.6.4-3+deb9u4
+libx11-doc==2:1.6.4-3+deb9u4
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.4-3+deb9u4
+libx11-xcb1==2:1.6.4-3+deb9u4
+libxalan2-java==2.7.1-9
+libxapian30==1.4.3-2+deb9u3
+libxau-dev==1:1.0.8-1
+libxau6==1:1.0.8-1
+libxaw7==2:1.0.13-1+b2
+libxbean-java==4.5-4
+libxcb-dri2-0==1.12-1
+libxcb-dri2-0-dev==1.12-1
+libxcb-dri3-0==1.12-1
+libxcb-dri3-dev==1.12-1
+libxcb-glx0==1.12-1
+libxcb-glx0-dev==1.12-1
+libxcb-icccm4==0.4.1-1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.12-1
+libxcb-present0==1.12-1
+libxcb-randr0==1.12-1
+libxcb-randr0-dev==1.12-1
+libxcb-render-util0==0.3.9-1
+libxcb-render0==1.12-1
+libxcb-render0-dev==1.12-1
+libxcb-shape0==1.12-1
+libxcb-shape0-dev==1.12-1
+libxcb-shm0==1.12-1
+libxcb-sync-dev==1.12-1
+libxcb-sync1==1.12-1
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.12-1
+libxcb-xfixes0-dev==1.12-1
+libxcb-xinerama0==1.12-1
+libxcb-xkb1==1.12-1
+libxcb1==1.12-1
+libxcb1-dev==1.12-1
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.14-1+deb9u2
+libxdamage-dev==1:1.1.4-2+b3
+libxdamage1==1:1.1.4-2+b3
+libxdelta2==1.1.3-9.1+b1
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.38.0-17+deb9u1
+libxerces2-java==2.11.0-7
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-1+b2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.3-1+b3
+libxkbcommon-x11-0==0.7.1-2~deb9u1
+libxkbcommon0==0.7.1-2~deb9u1
+libxml-commons-external-java==1.4.01-2
+libxml-commons-resolver1.1-java==1.2-7
+libxml-libxml-perl==2.0128+dfsg-1+deb9u1
+libxml-namespacesupport-perl==1.11-1
+libxml-parser-perl==2.44-2+b1
+libxml-sax-base-perl==1.07-1
+libxml-sax-expat-perl==0.40-2
+libxml-sax-perl==0.99+dfsg-2
+libxml-simple-perl==2.22-1
+libxml-twig-perl==1:3.50-1
+libxml-xpathengine-perl==0.13-1
+libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
+libxmlgraphics-commons-java==2.1-2
+libxmlrpc-lite-perl==0.717-1
+libxmu6==2:1.1.2-2
+libxmuu1==2:1.1.2-2
+libxom-java==1.2.10-1
+libxpm4==1:3.5.12-1
+libxpp2-java==2.1.10-7
+libxpp3-java==1.1.4c-2
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.2-1+b2
+libxshmfence1==1.2-1+b2
+libxslt1-dev==1.1.29-2.1+deb9u2
+libxslt1.1==1.1.29-2.1+deb9u2
+libxss1==1:1.2.2-1
+libxt-dev==1:1.1.5-1
+libxt6==1:1.1.5-1
+libxtables-dev==1.6.0+snapshot20161117-6
+libxtables12==1.6.0+snapshot20161117-6
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libyaml-0-2==0.1.7-2
+libyaml-dev==0.1.7-2
+libyaml-libyaml-perl==0.63-2
+libyaml-tiny-perl==1.70-1
+libzmq3-dev==4.2.1-4+deb9u4
+libzmq5==4.2.1-4+deb9u4
+libzzip-0-13==0.13.62-3.2~deb9u1
+licensecheck==3.0.29-1
+lintian==2.5.50.4
+linux-kbuild-4.9==4.9.272-2
+linux-libc-dev==4.9.272-2
+linuxdoc-tools==0.9.72-4
+llvm-3.8==1:3.8.1-24
+llvm-3.8-dev==1:3.8.1-24
+llvm-3.8-runtime==1:3.8.1-24
+lmodern==2.004.5-3
+logrotate==3.11.0-0.1
+lsb-release==9.20161125
+lsof==4.89+dfsg-0.1
+lua-bitop==1.0.2-4
+lua-bitop-dev==1.0.2-4
+lua-cjson==2.1.0+dfsg-2
+lua-cjson-dev==2.1.0+dfsg-2
+lynx==2.8.9dev11-1
+lynx-common==2.8.9dev11-1
+m4==1.4.18-1
+mailutils==1:3.1.1-1
+mailutils-common==1:3.1.1-1
+make==4.1-9.1
+man-db==2.7.6.1-2
+manpages==4.10-2
+manpages-dev==4.10-2
+maven==3.3.9-4
+maven-debian-helper==2.1.3
+maven-repo-helper==1.9.2
+mesa-common-dev==13.0.6-1+b2
+mesa-utils==8.3.0-3
+mime-support==3.60
+module-assistant==0.11.9
+mpi-default-bin==1.8
+mpi-default-dev==1.8
+mysql-common==5.8+1.0.2
+ncurses-term==6.0+20161126-1+deb9u2
+netbase==5.4
+netpbm==2:10.0-15.3+b2
+nodejs==10.24.1-1nodesource1
+ocl-icd-libopencl1==2.2.11-1
+openjdk-8-jdk==8u292-b10-0+deb9u1
+openjdk-8-jdk-headless==8u292-b10-0+deb9u1
+openjdk-8-jre==8u292-b10-0+deb9u1
+openjdk-8-jre-headless==8u292-b10-0+deb9u1
+openmpi-bin==2.0.2-2
+openmpi-common==2.0.2-2
+opensp==1.5.2-13+b1
+openssh-client==1:7.4p1-10+deb9u7
+openssh-server==1:7.4p1-10+deb9u7
+openssh-sftp-server==1:7.4p1-10+deb9u7
+openssl==1.1.0l-1~deb9u3
+packagekit==1.1.5-2+deb9u2
+packagekit-tools==1.1.5-2+deb9u2
+patch==2.7.5-1+deb9u2
+patchutils==0.3.4-2
+pbuilder==0.228.7
+pbzip2==1.1.9-1+b1
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+perl-openssl-defaults==3
+php-cli==1:7.0+49
+php-codecoverage==4.0.0+dfsg-1
+php-common==1:49
+php-deepcopy==1.5.5-1
+php-doctrine-instantiator==1.0.5-2
+php-file-iterator==1.4.1-2
+php-pear==1:1.10.1+submodules+notgz-9+deb9u3
+php-phpdocumentor-reflection-docblock==2.0.4-2
+php-phpspec-prophecy==1.6.2-1
+php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
+php-text-template==1.2.1-2
+php-timer==1.0.8-1
+php-token-stream==1.4.8-2
+php-xml==1:7.0+49
+php7.0-cli==7.0.33-0+deb9u11
+php7.0-common==7.0.33-0+deb9u11
+php7.0-json==7.0.33-0+deb9u11
+php7.0-opcache==7.0.33-0+deb9u11
+php7.0-readline==7.0.33-0+deb9u11
+php7.0-xml==7.0.33-0+deb9u11
+phpunit==5.4.6-2~deb9u1
+phpunit-code-unit-reverse-lookup==1.0.0-2
+phpunit-comparator==1.2.0-2
+phpunit-diff==1.4.1-2
+phpunit-environment==1.3.7-1
+phpunit-exporter==1.2.2-1
+phpunit-global-state==1.1.1-2
+phpunit-mock-object==3.2.3-1
+phpunit-object-enumerator==1.0.0-2
+phpunit-recursion-context==1.0.2-2
+phpunit-resource-operations==1.0.0-2
+phpunit-version==2.0.0-2
+pigz==2.3.4-1
+pinentry-curses==1.0.0-2
+pkg-config==0.29-4+b1
+pkg-php-tools==1.35
+po-debconf==1.0.20
+policykit-1==0.105-18+deb9u1
+poppler-data==0.4.7-8
+preview-latex-style==11.90-1
+pristine-tar==1.38
+procmail==3.22-25+deb9u1
+procps==2:3.3.12-3+deb9u1
+prosper==1.00.4+cvs.2007.05.01-4.1
+protobuf-compiler==3.0.0-9
+ps2eps==1.68+binaryfree-2
+psmisc==22.21-2.1+b2
+psutils==1.17.dfsg-4
+pylint==1.6.5-1
+python==2.7.13-2
+python-alabaster==0.7.8-1
+python-all==2.7.13-2
+python-all-dev==2.7.13-2
+python-apt==1.4.3
+python-apt-common==1.4.3
+python-astroid==1.4.9-1
+python-attr==16.3.0-1
+python-babel==2.3.4+dfsg.1-2
+python-babel-localedata==2.3.4+dfsg.1-2
+python-backports.functools-lru-cache==1.3-1
+python-bs4==4.5.3-1
+python-cffi-backend==1.9.1-2
+python-chardet==2.3.0-2
+python-click==6.6-1
+python-colorama==0.3.7-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-1
+python-coverage==4.2+dfsg.1-2
+python-crypto==2.6.1-7
+python-cryptography==1.7.1-3+deb9u2
+python-dateutil==2.5.3-2
+python-dbus==1.2.4-1+b1
+python-debian==0.1.30
+python-dev==2.7.13-2
+python-docutils==0.13.1+dfsg-2
+python-enum34==1.1.6-1
+python-gi==3.22.0-2
+python-gpg==1.8.0-3+b2
+python-html5lib==0.999999999-1
+python-idna==2.2-1
+python-imagesize==0.7.1-1
+python-incremental==16.10.1-3
+python-ipaddr==2.1.11-2
+python-ipaddress==1.0.17-1
+python-isort==4.2.5+ds1-2+deb9u1
+python-jinja2==2.8-1
+python-keyring==10.1-1
+python-keyrings.alt==1.3-1
+python-lazy-object-proxy==1.2.2-1
+python-lxml==3.7.1-1+deb9u4
+python-markupsafe==0.23-3
+python-minimal==2.7.13-2
+python-nose2==0.6.5-2
+python-openssl==16.2.0-1
+python-pam==0.4.2-13.2
+python-parse==1.6.6-0.1
+python-pil==4.0.0-4+deb9u2
+python-pip-whl==9.0.1-2+deb9u2
+python-pkg-resources==33.1.1-1
+python-py==1.4.32-3
+python-pyasn1==0.1.9-2
+python-pyasn1-modules==0.0.7-0.1
+python-pygments==2.2.0+dfsg-1+deb9u2
+python-pytest==3.0.6-1
+python-pytest-cov==2.4.0-2
+python-requests==2.12.4-1
+python-roman==2.0.0-2
+python-secretstorage==2.3.1-2
+python-serial==3.2.1-1
+python-service-identity==16.0.0-2
+python-setuptools==33.1.1-1
+python-six==1.10.0-3
+python-sphinx==1.4.9-2
+python-sphinx-rtd-theme==0.1.9-1
+python-stdeb==0.8.5-1
+python-tk==2.7.13-1
+python-twisted==16.6.0-2
+python-twisted-bin==16.6.0-2
+python-twisted-core==16.6.0-2
+python-tz==2016.7-0.3
+python-urllib3==1.19.1-1+deb9u1
+python-webencodings==0.5-2
+python-wheel==0.29.0-2
+python-wrapt==1.9.0-2
+python-xdg==0.25-4
+python-zope.interface==4.3.2-1
+python2.7==2.7.13-2+deb9u5
+python2.7-dev==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
+python3==3.5.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.5.3-1
+python3-all-dbg==3.5.3-1
+python3-all-dev==3.5.3-1
+python3-apt==1.4.3
+python3-babel==2.3.4+dfsg.1-2
+python3-cffi-backend==1.9.1-2
+python3-chardet==2.3.0-2
+python3-crypto==2.6.1-7
+python3-cryptography==1.7.1-3+deb9u2
+python3-dbg==3.5.3-1
+python3-dbus==1.2.4-1+b1
+python3-debian==0.1.30
+python3-dev==3.5.3-1
+python3-docutils==0.13.1+dfsg-2
+python3-gi==3.22.0-2
+python3-idna==2.2-1
+python3-imagesize==0.7.1-1
+python3-jinja2==2.8-1
+python3-keyring==10.1-1
+python3-keyrings.alt==1.3-1
+python3-magic==1:5.30-1+deb9u3
+python3-markupsafe==0.23-3
+python3-minimal==3.5.3-1
+python3-pil==4.0.0-4+deb9u2
+python3-pkg-resources==33.1.1-1
+python3-pyasn1==0.1.9-2
+python3-pycurl==7.43.0-2
+python3-pygments==2.2.0+dfsg-1+deb9u2
+python3-roman==2.0.0-2
+python3-secretstorage==2.3.1-2
+python3-setuptools==33.1.1-1
+python3-six==1.10.0-3
+python3-software-properties==0.96.20.2-1+deb9u1
+python3-sphinx==1.4.9-2
+python3-tz==2016.7-0.3
+python3-wheel==0.29.0-2
+python3-xdg==0.25-4
+python3.5==3.5.3-1+deb9u4
+python3.5-dbg==3.5.3-1+deb9u4
+python3.5-dev==3.5.3-1+deb9u4
+python3.5-minimal==3.5.3-1+deb9u4
+qdbus==4:4.8.7+dfsg-11+deb9u1
+qt-at-spi==0.4.0-5
+qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
+qt4-qmake==4:4.8.7+dfsg-11+deb9u1
+qt5-default==5.7.1+dfsg-3+deb9u3
+qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
+qt5-qmake==5.7.1+dfsg-3+deb9u3
+qtbase5-dev==5.7.1+dfsg-3+deb9u3
+qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
+qtchooser==63-g13a3d08-1
+qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
+qttranslations5-l10n==5.7.1~20161021-1
+quilt==0.65-2~bpo9+1
+rake==10.5.0-2+deb9u1
+readline-common==7.0-3
+rename==0.20-4
+rhino==1.7.7.1-1
+rrdtool==1.6.0-1+b2
+rsync==3.1.2-1+deb9u2
+rsyslog==8.24.0-1
+ruby==1:2.3.3
+ruby-all-dev==1:2.3.3
+ruby-did-you-mean==1.0.0-2
+ruby-minitest==5.9.0-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==0.3.0-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.1.7-2
+ruby2.3==2.3.3-1+deb9u9
+ruby2.3-dev==2.3.3-1+deb9u9
+rubygems-integration==1.11
+sgml-base==1.29
+sgml-data==2.0.10
+shared-mime-info==1.8-1+deb9u1
+software-properties-common==0.96.20.2-1+deb9u1
+sphinx-common==1.4.9-2
+sphinx-rtd-theme-common==0.1.9-1
+squashfs-tools==1:4.3-3+deb9u1
+stgit==0.17.1-1
+strace==4.15-2
+sudo==1.8.19p1-2.1+deb9u3
+swig==3.0.10-1.1
+swig3.0==3.0.10-1.1
+systemd==232-25+deb9u13
+systemd-shim==10-3
+t1utils==1.39-2
+tcl==8.6.0+9
+tcl8.6==8.6.6+dfsg-1+b1
+tcpd==7.6.q-26
+telnet==0.17-41
+tex-common==6.06
+tex-gyre==20160520-1
+texi2html==1.82+dfsg1-5
+texinfo==6.3.0.dfsg.1-1+b2
+texlive-base==2016.20170123-5
+texlive-binaries==2016.20160513.41080.dfsg-2+deb9u1
+texlive-extra-utils==2016.20170123-5
+texlive-font-utils==2016.20170123-5
+texlive-fonts-recommended==2016.20170123-5
+texlive-fonts-recommended-doc==2016.20170123-5
+texlive-generic-extra==2016.20170123-5
+texlive-generic-recommended==2016.20170123-5
+texlive-latex-base==2016.20170123-5
+texlive-latex-base-doc==2016.20170123-5
+texlive-latex-extra==2016.20170123-5
+texlive-latex-extra-doc==2016.20170123-5
+texlive-latex-recommended==2016.20170123-5
+texlive-latex-recommended-doc==2016.20170123-5
+texlive-pictures==2016.20170123-5
+texlive-pictures-doc==2016.20170123-5
+texlive-pstricks==2016.20170123-5
+texlive-pstricks-doc==2016.20170123-5
+tipa==2:1.3-20
+tk==8.6.0+9
+tk8.6==8.6.6-1+b1
+tk8.6-blt2.5==2.5.3+dfsg-3
+ucf==3.0036
+unattended-upgrades==0.93.1+nmu1
+unzip==6.0-21+deb9u2
+velocity==1.7-5+deb9u1
+vim==2:8.0.0197-4+deb9u3
+vim-common==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
+wdiff==1.2.2-2
+x11-common==1:7.7+19
+x11-utils==7.7+3+b1
+x11-xserver-utils==7.7+7+b1
+x11proto-core-dev==7.0.31-1
+x11proto-damage-dev==1:1.2.1-2
+x11proto-dri2-dev==2.8-2
+x11proto-fixes-dev==1:5.0-2
+x11proto-gl-dev==1.4.17-1
+x11proto-input-dev==2.3.2-1
+x11proto-kb-dev==1.0.7-1
+x11proto-xext-dev==7.3.0-1
+x11proto-xf86vidmode-dev==2.3.1-2
+xauth==1:1.0.9-1+b2
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.1+b1
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.15-2+b1
+xdg-utils==1.1.1-1+deb9u2
+xkb-data==2.19-1+deb9u1
+xml-core==0.17
+xmlto==0.0.28-1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.29-2.1+deb9u2
+xterm==327-2+deb9u2
+xtrans-dev==1.3.5-1
+xxd==2:8.0.0197-4+deb9u3
+xz-utils==5.2.2-1.2+b1
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
new file mode 100644
index 000000000000..53073b5ae1d9
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
@@ -0,0 +1,79 @@
+alabaster==0.7.8
+astroid==1.4.9
+attrs==16.3.0
+babel==2.3.4
+backports.functools-lru-cache==1.3
+beautifulsoup4==4.5.3
+chardet==2.3.0
+click==6.6
+colorama==0.3.7
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.2
+crc16==0.1.1
+cryptography==1.7.1
+ctypesgen==0.post125
+docutils==0.13.1
+enum34==1.1.6
+gbp==0.8.12.2
+gcovr==3.3
+gpg==1.8.0
+html5lib==0.999999999
+idna==2.2
+imagesize==0.7.1
+incremental==16.10.1
+ipaddr==2.1.11
+ipaddress==1.0.17
+isort==4.2.5
+j2cli==0.3.10
+jinja2==2.11.3
+keyring==10.1
+keyrings.alt==1.3
+lazy-object-proxy==1.2.2
+lxml==4.6.2
+m2crypto==0.36.0
+markupsafe==1.1.1
+mmh3==3.0.0
+mockredispy==2.9.3
+nose==1.3.7
+nose2==0.6.5
+pam==0.4.2
+parse==1.6.6
+pexpect==4.6.0
+pillow==4.0.0
+ptyprocess==0.7.0
+py==1.4.32
+pyasn1==0.1.9
+pyasn1-modules==0.0.7
+pycrypto==2.6.1
+pygments==2.2.0
+pygobject==3.22.0
+pylint==1.6.5
+pympler==0.8
+pyopenssl==16.2.0
+pyserial==3.2.1
+pyste==0.9.10
+pytest==3.0.6
+pytest-cov==2.4.0
+pytest-runner==4.4
+python-apt==1.4.3
+python-dateutil==2.5.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+pyyaml==5.3.1
+requests==2.12.4
+roman==2.0.0
+secretstorage==2.3.1
+service-identity==16.0.0
+six==1.10.0
+sphinx==1.4.9
+sphinx-rtd-theme==0.1.9
+stdeb==0.8.5
+stgit===0.17.1-dirty
+twisted==16.6.0
+typing==3.10.0.0
+urllib3==1.19.1
+webencodings==0.5
+wrapt==1.9.0
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
new file mode 100644
index 000000000000..1302868fe0ef
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -0,0 +1,37 @@
+alabaster==0.7.8
+babel==2.3.4
+bitarray==2.2.2
+chardet==2.3.0
+cryptography==1.7.1
+devscripts==2.17.6+deb9u2
+docutils==0.13.1
+file-magic==0.3.0
+idna==2.2
+imagesize==0.7.1
+jinja2==2.8
+keyring==10.1
+keyrings.alt==1.3
+lxml==4.6.2
+markupsafe==0.23
+mockredispy==2.9.3
+nose==1.3.7
+pillow==4.0.0
+pyang==2.4.0
+pyangbind==0.8.1
+pyasn1==0.1.9
+pycrypto==2.6.1
+pycurl==7.43.0
+pygments==2.2.0
+pygobject==3.22.0
+python-apt==1.4.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+pyyaml==5.3.1
+redis==3.5.3
+regex==2021.7.6
+roman==2.0.0
+secretstorage==2.3.1
+six==1.10.0
+sphinx==1.4.9
+unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
new file mode 100644
index 000000000000..cb366b9aa3be
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -0,0 +1,1418 @@
+adwaita-icon-theme==3.22.0-1+deb9u1
+ant==1.9.9-1+deb9u1
+ant-optional==1.9.9-1+deb9u1
+apt==1.4.11
+apt-file==3.1.4
+apt-transport-https==1.4.11
+apt-utils==1.4.11
+asciidoc-base==8.6.9-5
+asciidoc-common==8.6.9-5
+aspell==0.60.7~20110707-3+b2
+aspell-en==2016.11.20-0-0.1
+at==3.1.20-3
+at-spi2-core==2.22.0-6+deb9u1
+aufs-dkms==4.9+20161219-1
+aufs-tools==1:4.1+20161219-1
+augeas-lenses==1.8.0-1+deb9u1
+augeas-tools==1.8.0-1+deb9u1
+autoconf==2.69-10
+autoconf-archive==20160916-1
+automake==1:1.15-6
+automake1.11==1:1.11.6-4
+autopoint==0.19.8.1-2+deb9u1
+autotools-dev==20161112.1
+bash-completion==1:2.1-4.3
+bc==1.06.95-9+b3
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
+binfmt-support==2.1.6-2
+binutils==2.28-5
+bison==2:3.0.4.dfsg-1+b1
+blt==2.5.3+dfsg-3
+bsdmainutils==9.0.12+nmu1
+build-essential==12.3
+byacc==20140715-1+b1
+bzip2==1.0.6-8.1
+ca-certificates==20200601~deb9u2
+ca-certificates-java==20170929~deb9u3
+cdbs==0.4.150
+cgmanager==0.41-2
+cgroupfs-mount==1.3
+check==0.10.0-3+b3
+chrpath==0.16-2+b1
+clang==1:3.8-36
+clang-3.8==1:3.8.1-24
+cm-super-minimal==0.3.4-9
+cmake==3.13.2-1~bpo9+1
+cmake-data==3.13.2-1~bpo9+1
+cmocka-doc==1.0.1-3
+cowbuilder==0.85
+cowdancer==0.85
+cpio==2.11+dfsg-6
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+cppcheck==1.76.1-1
+cron==3.0pl1-128+deb9u1
+curl==7.52.1-5+deb9u14
+dbus==1.10.32-0+deb9u1
+dconf-gsettings-backend==0.26.0-2+b1
+dconf-service==0.26.0-2+b1
+dctrl-tools==2.24-2+b1
+debhelper==12.1.1~bpo9+1
+debian-keyring==2017.05.28
+debootstrap==1.0.89
+default-jdk-headless==2:1.8-58+deb9u1
+default-jre==2:1.8-58+deb9u1
+default-jre-headless==2:1.8-58+deb9u1
+default-libmysqlclient-dev==1.0.2
+devscripts==2.17.6+deb9u2
+dh-autoreconf==17~bpo9+1
+dh-exec==0.23+b1
+dh-make==2.201608
+dh-python==2.20170125
+dh-strip-nondeterminism==0.034-1
+dh-systemd==10.2.5
+dictionaries-common==1.27.2
+diffstat==1.61-1+b1
+dirmngr==2.1.18-8~deb9u4
+distro-info-data==0.36
+dkms==2.3-2
+dmsetup==2:1.02.137-2
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
+docbook-xml==4.5-8
+docbook-xsl==1.79.1+dfsg-2
+docker-ce==18.06.3~ce~3-0~debian
+docutils-common==0.13.1+dfsg-2
+docutils-doc==0.13.1+dfsg-2
+doxygen==1.8.13-4+b1
+dpatch==2.0.38+nmu1~bpo9+1
+dpkg-dev==1.18.25
+dput==0.12.1
+dwz==0.12-1+b1
+eatmydata==105-5
+emacsen-common==2.0.8
+equivs==2.0.9+nmu1
+exim4==4.89-2+deb9u8
+exim4-base==4.89-2+deb9u8
+exim4-config==4.89-2+deb9u8
+exim4-daemon-light==4.89-2+deb9u8
+expat==2.2.0-2+deb9u3
+exuberant-ctags==1:5.9~svn20110310-11
+fakeroot==1.21-3.1
+file==1:5.30-1+deb9u3
+flex==2.6.1-1.3
+fontconfig==2.11.0-6.7+b1
+fontconfig-config==2.11.0-6.7
+fonts-dejavu-core==2.37-1
+fonts-dejavu-extra==2.37-1
+fonts-droid-fallback==1:6.0.1r16-1.1
+fonts-font-awesome==4.7.0~dfsg-1
+fonts-lato==2.0-1
+fonts-liberation==1:1.07.4-2
+fonts-lmodern==2.004.5-3
+fonts-noto-mono==20161116-1
+fonts-texgyre==20160520-1
+fop==1:2.1-6
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gawk==1:4.1.4+dfsg-1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+gcovr==3.3-1
+gdb==7.12-6
+gem2deb==0.33.1
+gem2deb-test-runner==0.33.1
+geoip-database==20170512-1
+gettext==0.19.8.1-2+deb9u1
+gettext-base==0.19.8.1-2+deb9u1
+ghostscript==9.26a~dfsg-0+deb9u7
+gir1.2-glib-2.0==1.50.0-1+b1
+gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
+git==1:2.11.0-3+deb9u7
+git-buildpackage==0.8.12.2
+git-man==1:2.11.0-3+deb9u7
+glib-networking==2.50.0-1+deb9u1
+glib-networking-common==2.50.0-1+deb9u1
+glib-networking-services==2.50.0-1+deb9u1
+gnome-icon-theme==3.12.0-2
+gnupg==2.1.18-8~deb9u4
+gnupg-agent==2.1.18-8~deb9u4
+gnupg-l10n==2.1.18-8~deb9u4
+gnupg2==2.1.18-8~deb9u4
+googletest==1.8.0-6
+graphviz==2.38.0-17+deb9u1
+groff==1.22.3-9
+groff-base==1.22.3-9
+gsettings-desktop-schemas==3.22.0-1
+gsfonts==1:8.11+urwcyr1.0.7~pre44-4.3
+gtk-update-icon-cache==3.22.11-1
+guile-2.0-libs==2.0.13+1-4
+hicolor-icon-theme==0.15-1
+icc-profiles-free==2.0.1+dfsg-1
+icu-devtools==57.1-6+deb9u4
+imagemagick==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
+install-info==6.3.0.dfsg.1-1+b2
+intltool-debian==0.35.0+20060710.4
+iproute2==4.9.0-1+deb9u1
+iptables==1.6.0+snapshot20161117-6
+iptables-dev==1.6.0+snapshot20161117-6
+iso-codes==3.75-1
+java-common==0.58+deb9u1
+java-wrappers==0.1.28
+javahelper==0.59
+javascript-common==11
+junit==3.8.2-8
+junit4==4.12-4+deb9u1
+kernel-wedge==2.96
+kmod==23-2
+krb5-locales==1.15-1+deb9u2
+less==481-2.1
+libalgorithm-diff-perl==1.19.03-1
+libalgorithm-diff-xs-perl==0.04-4+b2
+libalgorithm-merge-perl==0.08-3
+libann0==1.1.2+doc-6
+libaopalliance-java==20070526-5
+libapache-pom-java==10-2
+libapparmor1==2.11.0-3+deb9u2
+libapt-inst2.0==1.4.11
+libapt-pkg-perl==0.1.32
+libarchive-zip-perl==1.59-1+deb9u1
+libarchive13==3.2.2-2+deb9u2
+libasan3==6.3.0-18+deb9u1
+libasm-java==5.2-2
+libasound2==1.1.3-5
+libasound2-data==1.1.3-5
+libaspell15==0.60.7~20110707-3+b2
+libassuan0==2.4.3-2
+libasyncns0==0.8-6
+libatinject-jsr330-api-java==1.0+ds1-2
+libatk-bridge2.0-0==2.22.0-2
+libatk-wrapper-java==0.33.3-13+deb9u1
+libatk-wrapper-java-jni==0.33.3-13+deb9u1
+libatk1.0-0==2.22.0-1
+libatk1.0-data==2.22.0-1
+libatm1==1:2.5.1-2
+libatm1-dev==1:2.5.1-2
+libatomic1==6.3.0-18+deb9u1
+libatspi2.0-0==2.22.0-6+deb9u1
+libaudio2==1.9.4-5+b1
+libaudit-dev==1:2.6.7-2
+libaugeas0==1.8.0-1+deb9u1
+libauthen-sasl-perl==2.1600-1
+libavahi-client3==0.6.32-2
+libavahi-common-data==0.6.32-2
+libavahi-common3==0.6.32-2
+libavalon-framework-java==4.2.0-9
+libb-hooks-endofscope-perl==0.21-1
+libbabeltrace-ctf-dev==1.5.1-1
+libbabeltrace-ctf1==1.5.1-1
+libbabeltrace-dev==1.5.1-1
+libbabeltrace1==1.5.1-1
+libbatik-java==1.8-4+deb9u2
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbison-dev==2:3.0.4.dfsg-1+b1
+libbit-vector-perl==7.4-1+b2
+libboost-all-dev==1.62.0.1
+libboost-atomic-dev==1.62.0.1
+libboost-atomic1.62-dev==1.62.0+dfsg-4
+libboost-atomic1.62.0==1.62.0+dfsg-4
+libboost-chrono-dev==1.62.0.1
+libboost-chrono1.62-dev==1.62.0+dfsg-4
+libboost-chrono1.62.0==1.62.0+dfsg-4
+libboost-context-dev==1.62.0.1
+libboost-context1.62-dev==1.62.0+dfsg-4
+libboost-context1.62.0==1.62.0+dfsg-4
+libboost-coroutine-dev==1.62.0.1
+libboost-coroutine1.62-dev==1.62.0+dfsg-4
+libboost-coroutine1.62.0==1.62.0+dfsg-4
+libboost-date-time-dev==1.62.0.1
+libboost-date-time1.62-dev==1.62.0+dfsg-4
+libboost-date-time1.62.0==1.62.0+dfsg-4
+libboost-dev==1.62.0.1
+libboost-exception-dev==1.62.0.1
+libboost-exception1.62-dev==1.62.0+dfsg-4
+libboost-fiber-dev==1.62.0.1
+libboost-fiber1.62-dev==1.62.0+dfsg-4
+libboost-fiber1.62.0==1.62.0+dfsg-4
+libboost-filesystem-dev==1.62.0.1
+libboost-filesystem1.62-dev==1.62.0+dfsg-4
+libboost-filesystem1.62.0==1.62.0+dfsg-4
+libboost-graph-dev==1.62.0.1
+libboost-graph-parallel-dev==1.62.0.1
+libboost-graph-parallel1.62-dev==1.62.0+dfsg-4
+libboost-graph-parallel1.62.0==1.62.0+dfsg-4
+libboost-graph1.62-dev==1.62.0+dfsg-4
+libboost-graph1.62.0==1.62.0+dfsg-4
+libboost-iostreams-dev==1.62.0.1
+libboost-iostreams1.62-dev==1.62.0+dfsg-4
+libboost-iostreams1.62.0==1.62.0+dfsg-4
+libboost-locale-dev==1.62.0.1
+libboost-locale1.62-dev==1.62.0+dfsg-4
+libboost-locale1.62.0==1.62.0+dfsg-4
+libboost-log-dev==1.62.0.1
+libboost-log1.62-dev==1.62.0+dfsg-4
+libboost-log1.62.0==1.62.0+dfsg-4
+libboost-math-dev==1.62.0.1
+libboost-math1.62-dev==1.62.0+dfsg-4
+libboost-math1.62.0==1.62.0+dfsg-4
+libboost-mpi-dev==1.62.0.1
+libboost-mpi-python-dev==1.62.0.1
+libboost-mpi-python1.62-dev==1.62.0+dfsg-4
+libboost-mpi-python1.62.0==1.62.0+dfsg-4
+libboost-mpi1.62-dev==1.62.0+dfsg-4
+libboost-mpi1.62.0==1.62.0+dfsg-4
+libboost-program-options-dev==1.62.0.1
+libboost-program-options1.62-dev==1.62.0+dfsg-4
+libboost-program-options1.62.0==1.62.0+dfsg-4
+libboost-python-dev==1.62.0.1
+libboost-python1.62-dev==1.62.0+dfsg-4
+libboost-python1.62.0==1.62.0+dfsg-4
+libboost-random-dev==1.62.0.1
+libboost-random1.62-dev==1.62.0+dfsg-4
+libboost-random1.62.0==1.62.0+dfsg-4
+libboost-regex-dev==1.62.0.1
+libboost-regex1.62-dev==1.62.0+dfsg-4
+libboost-regex1.62.0==1.62.0+dfsg-4
+libboost-serialization-dev==1.62.0.1
+libboost-serialization1.62-dev==1.62.0+dfsg-4
+libboost-serialization1.62.0==1.62.0+dfsg-4
+libboost-signals-dev==1.62.0.1
+libboost-signals1.62-dev==1.62.0+dfsg-4
+libboost-signals1.62.0==1.62.0+dfsg-4
+libboost-system-dev==1.62.0.1
+libboost-system1.62-dev==1.62.0+dfsg-4
+libboost-system1.62.0==1.62.0+dfsg-4
+libboost-test-dev==1.62.0.1
+libboost-test1.62-dev==1.62.0+dfsg-4
+libboost-test1.62.0==1.62.0+dfsg-4
+libboost-thread-dev==1.62.0.1
+libboost-thread1.62-dev==1.62.0+dfsg-4
+libboost-thread1.62.0==1.62.0+dfsg-4
+libboost-timer-dev==1.62.0.1
+libboost-timer1.62-dev==1.62.0+dfsg-4
+libboost-timer1.62.0==1.62.0+dfsg-4
+libboost-tools-dev==1.62.0.1
+libboost-type-erasure-dev==1.62.0.1
+libboost-type-erasure1.62-dev==1.62.0+dfsg-4
+libboost-type-erasure1.62.0==1.62.0+dfsg-4
+libboost-wave-dev==1.62.0.1
+libboost-wave1.62-dev==1.62.0+dfsg-4
+libboost-wave1.62.0==1.62.0+dfsg-4
+libboost1.62-dev==1.62.0+dfsg-4
+libboost1.62-tools-dev==1.62.0+dfsg-4
+libbsd-dev==0.8.3-1+deb9u1
+libbsd0==0.8.3-1+deb9u1
+libbsf-java==1:2.4.0-5
+libbsh-java==2.0b4-18
+libc-ares-dev==1.12.0-1+deb9u1
+libc-ares2==1.12.0-1+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dbg==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcairo-gobject2==1.14.8-1+deb9u1
+libcairo2==1.14.8-1+deb9u1
+libcap-dev==1:2.25-1
+libcap-ng-dev==0.7.7-3+b1
+libcap2==1:2.25-1
+libcap2-bin==1:2.25-1
+libcarp-clan-perl==6.06-1
+libcc1-0==6.3.0-18+deb9u1
+libcdi-api-java==1.0-2
+libcdt5==2.38.0-17+deb9u1
+libcgi-fast-perl==1:2.12-1
+libcgi-pm-perl==4.35-1
+libcglib-java==3.2.4-1
+libcgmanager0==0.41-2
+libcgraph6==2.38.0-17+deb9u1
+libclang-common-3.8-dev==1:3.8.1-24
+libclang1-3.8==1:3.8.1-24
+libclang1-3.9==1:3.9.1-9
+libclass-accessor-perl==0.34-1
+libclass-inspector-perl==1.31-1
+libclass-method-modifiers-perl==2.12-1
+libclass-xsaccessor-perl==1.19-2+b7
+libclassworlds-java==1.1-final-5
+libclone-perl==0.38-2+b1
+libcmocka-dev==1.0.1-3
+libcmocka0==1.0.1-3
+libcolord2==1.3.3-2
+libcommons-beanutils-java==1.9.3-1
+libcommons-cli-java==1.3.1-3
+libcommons-codec-java==1.10-1
+libcommons-collections3-java==3.2.2-1
+libcommons-configuration-java==1.10-4
+libcommons-digester-java==1.8.1-4
+libcommons-httpclient-java==3.1-12
+libcommons-io-java==2.5-1
+libcommons-lang-java==2.6-6
+libcommons-lang3-java==3.5-1
+libcommons-logging-java==1.2-1
+libcommons-net-java==3.5-1
+libcommons-parent-java==39-3
+libcommons-validator-java==1:1.5.1-1
+libconvert-binhex-perl==1.125-1
+libcroco3==0.6.11-3
+libcryptsetup4==2:1.7.3-4
+libcups2==2.2.1-8+deb9u6
+libcupsfilters1==1.11.6-3+deb9u1
+libcupsimage2==2.2.1-8+deb9u6
+libcurl3==7.52.1-5+deb9u14
+libcurl3-gnutls==7.52.1-5+deb9u14
+libcurl3-nss==7.52.1-5+deb9u14
+libcurl4-nss-dev==7.52.1-5+deb9u14
+libdaemon-dev==0.14-6
+libdaemon0==0.14-6
+libdata-optlist-perl==0.110-1
+libdatrie1==0.2.10-4+b1
+libdb-dev==5.3.1
+libdb5.3-dev==5.3.28-12+deb9u1
+libdbi1==0.9.0-4+deb9u2
+libdbus-1-3==1.10.32-0+deb9u1
+libdbus-1-dev==1.10.32-0+deb9u1
+libdbus-glib-1-2==0.108-2
+libdconf1==0.26.0-2+b1
+libdevel-globaldestruction-perl==0.14-1
+libdevmapper1.02.1==2:1.02.137-2
+libdigest-hmac-perl==1.03+dfsg-1
+libdistro-info-perl==0.14
+libdjvulibre-text==3.5.27.1-7+deb9u2
+libdjvulibre21==3.5.27.1-7+deb9u2
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdom4j-java==1.6.1+dfsg.3-2+deb9u1
+libdouble-conversion1==2.0.1-4
+libdoxia-core-java==1.1.4-6
+libdoxia-java==1.1.4-6
+libdoxia-sitetools-java==1.1.4-1.1
+libdpkg-perl==1.18.25
+libdrm-amdgpu1==2.4.74-1
+libdrm-dev==2.4.74-1
+libdrm-exynos1==2.4.74-1
+libdrm-freedreno1==2.4.74-1
+libdrm-nouveau2==2.4.74-1
+libdrm-omap1==2.4.74-1
+libdrm-radeon1==2.4.74-1
+libdrm-tegra0==2.4.74-1
+libdrm2==2.4.74-1
+libdw-dev==0.168-1
+libdw1==0.168-1
+libeasymock-java==3.4+ds-1
+libeatmydata1==105-5
+libeclipse-aether-java==1.0.2-1
+libedit-dev==3.1-20160903-3
+libedit2==3.1-20160903-3
+libegl1-mesa==13.0.6-1+b2
+libegl1-mesa-dev==13.0.6-1+b2
+libelf-dev==0.168-1
+libelf1==0.168-1
+libemail-valid-perl==1.202-1
+libencode-locale-perl==1.05-1
+libepoxy0==1.3.1-2
+liberror-perl==0.17024-1
+libestr0==0.1.10-2
+libevdev2==1.5.6+dfsg-1
+libevent-2.0-5==2.0.21-stable-3
+libevent-core-2.0-5==2.0.21-stable-3
+libevent-dev==2.0.21-stable-3
+libevent-extra-2.0-5==2.0.21-stable-3
+libevent-openssl-2.0-5==2.0.21-stable-3
+libevent-pthreads-2.0-5==2.0.21-stable-3
+libexpat1==2.2.0-2+deb9u3
+libexpat1-dev==2.2.0-2+deb9u3
+libexplain-dev==1.4.D001-6
+libexplain51==1.4.D001-6
+libexporter-tiny-perl==0.042-1
+libfakeroot==1.21-3.1
+libfastjson4==0.99.4-1
+libfcgi-perl==0.78-2
+libffi-dev==3.2.1-6
+libfftw3-double3==3.3.5-3
+libfile-basedir-perl==0.07-1
+libfile-chdir-perl==0.1008-1
+libfile-desktopentry-perl==0.22-1
+libfile-fcntllock-perl==0.22-3+b2
+libfile-homedir-perl==1.00-1
+libfile-listing-perl==6.04-1
+libfile-mimeinfo-perl==0.27-1
+libfile-stripnondeterminism-perl==0.034-1
+libfile-which-perl==1.21-1
+libfl-dev==2.6.1-1.3
+libflac8==1.3.2-2+deb9u1
+libfont-afm-perl==1.20-2
+libfontbox-java==1:1.8.12-1
+libfontconfig1==2.11.0-6.7+b1
+libfontenc1==1:1.1.3-1+b2
+libfop-java==1:2.1-6
+libfreetype6==2.6.3-3.2+deb9u2
+libfribidi0==0.19.7-1+deb9u1
+libgail-common==2.24.31-2
+libgail18==2.24.31-2
+libgbm1==13.0.6-1+b2
+libgc1c2==1:7.4.2-8
+libgcc-6-dev==6.3.0-18+deb9u1
+libgd3==2.2.4-2+deb9u5
+libgdbm3==1.8.3-14
+libgdk-pixbuf2.0-0==2.36.5-2+deb9u2
+libgdk-pixbuf2.0-common==2.36.5-2+deb9u2
+libgeoip1==1.6.9-4
+libgeronimo-interceptor-3.0-spec-java==1.0.1-3
+libgetopt-long-descriptive-perl==0.100-1
+libgfortran3==6.3.0-18+deb9u1
+libgif7==5.1.4-0.4
+libgirepository-1.0-1==1.50.0-1+b1
+libgit-wrapper-perl==0.047-1
+libgl1-mesa-dev==13.0.6-1+b2
+libgl1-mesa-dri==13.0.6-1+b2
+libgl1-mesa-glx==13.0.6-1+b2
+libglapi-mesa==13.0.6-1+b2
+libgles2-mesa==13.0.6-1+b2
+libgles2-mesa-dev==13.0.6-1+b2
+libglew2.0==2.0.0-3+b1
+libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-bin==2.50.3-2+deb9u2
+libglib2.0-data==2.50.3-2+deb9u2
+libglib2.0-dev==2.50.3-2+deb9u2
+libglu1-mesa==9.0.0-2.1
+libglu1-mesa-dev==9.0.0-2.1
+libgmp-dev==2:6.1.2+dfsg-1
+libgmpxx4ldbl==2:6.1.2+dfsg-1
+libgomp1==6.3.0-18+deb9u1
+libgoogle-perftools4==2.5-2.2
+libgpgme11==1.8.0-3+b2
+libgpm2==1.20.4-6.2+b1
+libgraphite2-3==1.3.10-1
+libgs9==9.26a~dfsg-0+deb9u7
+libgs9-common==9.26a~dfsg-0+deb9u7
+libgsasl7==1.8.0-8+b2
+libgssapi-krb5-2==1.15-1+deb9u2
+libgstreamer1.0-0==1.10.4-1
+libgtest-dev==1.8.0-6
+libgtk-3-0==3.22.11-1
+libgtk-3-bin==3.22.11-1
+libgtk-3-common==3.22.11-1
+libgtk2.0-0==2.24.31-2
+libgtk2.0-bin==2.24.31-2
+libgtk2.0-common==2.24.31-2
+libgts-0.7-5==0.7.6+darcs121130-4
+libgts-bin==0.7.6+darcs121130-4
+libguava-java==19.0-1
+libgudev-1.0-0==230-3
+libguice-java==4.0-3
+libgvc6==2.38.0-17+deb9u1
+libgvpr2==2.38.0-17+deb9u1
+libhamcrest-java==1.3-6
+libharfbuzz-icu0==1.4.2-1
+libharfbuzz0b==1.4.2-1
+libhtml-form-perl==6.03-1
+libhtml-format-perl==2.12-1
+libhtml-parser-perl==3.72-3
+libhtml-tagset-perl==3.20-3
+libhtml-tree-perl==5.03-2
+libhttp-cookies-perl==6.01-1
+libhttp-daemon-perl==6.01-1
+libhttp-date-perl==6.02-1
+libhttp-message-perl==6.11-1
+libhttp-negotiate-perl==6.00-2
+libhttpclient-java==4.5.2-2+deb9u1
+libhttpcore-java==4.4.6-1
+libhwloc-dev==1.11.5-1
+libhwloc-plugins==1.11.5-1
+libhwloc5==1.11.5-1
+libiberty-dev==20161220-1
+libibverbs-dev==1.2.1-2
+libibverbs1==1.2.1-2
+libice-dev==2:1.0.9-2
+libice6==2:1.0.9-2
+libicu-dev==57.1-6+deb9u4
+libicu57==57.1-6+deb9u4
+libijs-0.35==0.35-12
+libilmbase12==2.2.0-12
+libimport-into-perl==1.002005-1
+libinput-bin==1.6.3-1
+libinput10==1.6.3-1
+libio-html-perl==1.001-1
+libio-pty-perl==1:1.08-1.1+b2
+libio-sessiondata-perl==1.03-1
+libio-socket-inet6-perl==2.72-2
+libio-socket-ssl-perl==2.044-1
+libio-string-perl==1.08-3
+libio-stringy-perl==2.111-2
+libip4tc-dev==1.6.0+snapshot20161117-6
+libip4tc0==1.6.0+snapshot20161117-6
+libip6tc-dev==1.6.0+snapshot20161117-6
+libip6tc0==1.6.0+snapshot20161117-6
+libipc-run-perl==0.94-1+deb9u1
+libipc-system-simple-perl==1.25-3
+libiptc-dev==1.6.0+snapshot20161117-6
+libiptc0==1.6.0+snapshot20161117-6
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libisl15==0.18-1
+libisorelax-java==20041111-9
+libitext1-java==1.4-6
+libjansson-dev==2.9-1
+libjansson4==2.9-1
+libjaxen-java==1.1.6-1+deb9u1
+libjaxp1.3-java==1.3.05-2
+libjbig0==2.1-3.1+b2
+libjbig2dec0==0.13-4.1
+libjdom1-java==1.1.3-1+deb9u1
+libjemalloc-dev==3.6.0-9.1
+libjemalloc1==3.6.0-9.1
+libjetty9-java==9.2.30-0+deb9u2
+libjline-java==1.0-2
+libjpeg62-turbo==1:1.5.1-2+deb9u1
+libjs-bootstrap==3.3.7+dfsg-2+deb9u2
+libjs-jquery==3.1.1-2+deb9u2
+libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
+libjs-jquery-isonscreen==1.2.0-1
+libjs-jquery-metadata==11-3
+libjs-jquery-tablesorter==11-3
+libjs-jquery-throttle-debounce==1.1+dfsg.1-1
+libjs-modernizr==2.6.2+ds1-1
+libjs-sphinxdoc==1.4.9-2
+libjs-twitter-bootstrap==2.0.2+dfsg-10
+libjs-underscore==1.8.3~dfsg-1+deb9u1
+libjsch-java==0.1.54-1
+libjson-c-dev==0.12.1-1.1+deb9u1
+libjson-c3==0.12.1-1.1+deb9u1
+libjson-glib-1.0-0==1.2.6-1
+libjson-glib-1.0-common==1.2.6-1
+libjsoncpp1==1.7.4-3
+libjsoup-java==1.10.2-1
+libjsr305-java==0.1~+svn49-10
+libjtidy-java==7+svn20110807-4
+libjudy-dev==1.0.5-5
+libjudydebian1==1.0.5-5
+libjxr-tools==1.1-6+b1
+libjxr0==1.1-6+b1
+libjzlib-java==1.1.3-1
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkmod2==23-2
+libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
+liblcms2-2==2.8-4+deb9u1
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+libldap2-dev==2.4.44+dfsg-5+deb9u8
+liblist-compare-perl==0.53-1
+liblist-moreutils-perl==0.416-1+b1
+libllvm3.8==1:3.8.1-24
+libllvm3.9==1:3.9.1-9
+liblocale-gettext-perl==1.07-3+b1
+liblog4j1.2-java==1.2.17-7+deb9u1
+liblogging-stdlog0==1.0.5-2+b2
+liblognorm5==2.0.1-1.1+b1
+liblqr-1-0==0.4.2-2+b2
+libltdl-dev==2.4.6-2
+libltdl7==2.4.6-2
+liblua5.1-0==5.1.5-8.1+b2
+liblua5.1-0-dev==5.1.5-8.1+b2
+liblwp-mediatypes-perl==6.02-1
+liblwp-protocol-https-perl==6.06-2
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
+liblzo2-2==2.08-1.2+b2
+liblzo2-dev==2.08-1.2+b2
+libmagic-mgc==1:5.30-1+deb9u3
+libmagic1==1:5.30-1+deb9u3
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmail-sendmail-perl==0.79.16-2
+libmailtools-perl==2.18-1
+libmailutils5==1:3.1.1-1
+libmariadbclient-dev==10.1.48-0+deb9u2
+libmariadbclient-dev-compat==10.1.48-0+deb9u2
+libmariadbclient18==10.1.48-0+deb9u2
+libmaven-ant-tasks-java==2.1.3-4
+libmaven-archiver-java==2.6-3
+libmaven-clean-plugin-java==2.5-1
+libmaven-common-artifact-filters-java==1.4-1
+libmaven-compiler-plugin-java==3.2-5
+libmaven-doxia-tools-java==1.2.1-2
+libmaven-filtering-java==1.1-1
+libmaven-jar-plugin-java==2.4-1
+libmaven-parent-java==21-2
+libmaven-plugin-tools-java==3.3-5
+libmaven-reporting-impl-java==2.3-1
+libmaven-resources-plugin-java==2.6-1
+libmaven-shared-incremental-java==1.1-1
+libmaven-shared-utils-java==3.0.0-1
+libmaven-site-plugin-java==2.1-4
+libmaven2-core-java==2.2.1-26
+libmaven3-core-java==3.3.9-4
+libmime-tools-perl==5.508-1
+libmng1==1.0.10+dfsg-3.1+b5
+libmnl-dev==1.0.4-2
+libmnl0==1.0.4-2
+libmodule-implementation-perl==0.09-1
+libmodule-runtime-perl==0.014-2
+libmoo-perl==2.002005-1
+libmpc3==1.0.3-1+b2
+libmpdec2==2.4.2-1
+libmpfr4==3.1.5-1
+libmsv-java==2009.1+dfsg1-5
+libmtdev1==1.1.5-1+b1
+libnamespace-clean-perl==0.27-1
+libnanomsg-dev==0.8~beta+dfsg-1+b1
+libnanomsg4==0.8~beta+dfsg-1+b1
+libncurses5==6.0+20161126-1+deb9u2
+libncurses5-dev==6.0+20161126-1+deb9u2
+libnet-dbus-perl==1.1.0-4+b1
+libnet-dns-perl==1.07-1
+libnet-domain-tld-perl==1.75-1
+libnet-http-perl==6.12-1
+libnet-ip-perl==1.26-1
+libnet-smtp-ssl-perl==1.04-1
+libnet-ssleay-perl==1.80-1
+libnetfilter-conntrack-dev==1.0.6-2
+libnetfilter-conntrack3==1.0.6-2
+libnetpbm10==2:10.0-15.3+b2
+libnewt-dev==0.52.19-1+b1
+libnewt0.52==0.52.19-1+b1
+libnfnetlink-dev==1.0.1-3
+libnfnetlink0==1.0.1-3
+libnftnl-dev==1.0.7-1
+libnftnl4==1.0.7-1
+libnghttp2-14==1.18.1-1+deb9u1
+libnih-dbus1==1.0.3-8
+libnih1==1.0.3-8
+libnl-3-200==3.2.27-2
+libnl-route-3-200==3.2.27-2
+libnpth0==1.3-1
+libnspr4==2:4.12-6
+libnss3==2:3.26.2-1.1+deb9u2
+libntlm0==1.4-8
+libnumber-compare-perl==0.03-1
+libnumber-range-perl==0.12-1
+libobjc-6-dev==6.3.0-18+deb9u1
+libobjc4==6.3.0-18+deb9u1
+libobjenesis-java==2.5.1-1
+libogg0==1.3.2-1
+libopenexr22==2.2.0-11+deb9u3
+libopenjp2-7==2.1.2-1.1+deb9u6
+libopenmpi-dev==2.0.2-2
+libopenmpi2==2.0.2-2
+liboro-java==2.0.8a-12
+libosp5==1.5.2-13+b1
+libossp-uuid-perl==1.6.2-1.5+b4
+libossp-uuid16==1.6.2-1.5+b4
+libpackage-stash-perl==0.37-1
+libpackage-stash-xs-perl==0.28-3+b1
+libpackagekit-glib2-18==1.1.5-2+deb9u2
+libpam-cap==1:2.25-1
+libpam-systemd==232-25+deb9u13
+libpam0g-dev==1.1.8-3.6
+libpango-1.0-0==1.40.5-1
+libpangocairo-1.0-0==1.40.5-1
+libpangoft2-1.0-0==1.40.5-1
+libpaper-utils==1.1.24+nmu5
+libpaper1==1.1.24+nmu5
+libparams-classify-perl==0.013-6+b1
+libparams-util-perl==1.07-3+b1
+libparams-validate-perl==1.26-1
+libparse-debianchangelog-perl==1.2.0-12
+libpath-iterator-rule-perl==1.009-1
+libpath-tiny-perl==0.100-1
+libpathplan4==2.38.0-17+deb9u1
+libpcap-dev==1.8.1-3
+libpcap0.8==1.8.1-3
+libpcap0.8-dev==1.8.1-3
+libpci-dev==1:3.5.2-1
+libpci3==1:3.5.2-1
+libpciaccess0==0.13.4-1+b2
+libpcre16-3==2:8.39-3
+libpcre3-dev==2:8.39-3
+libpcre32-3==2:8.39-3
+libpcrecpp0v5==2:8.39-3
+libpcsclite1==1.8.20-1
+libperl-dev==5.24.1-3+deb9u7
+libperl5.24==5.24.1-3+deb9u7
+libperlio-gzip-perl==0.19-1+b2
+libpgm-5.2-0==5.2.122~dfsg-2
+libpipeline1==1.4.1-2
+libpixman-1-0==0.34.0-1
+libplexus-ant-factory-java==1.0~alpha2.1-3
+libplexus-archiver-java==2.2-1+deb9u1
+libplexus-bsh-factory-java==1.0~alpha7-3.1
+libplexus-build-api-java==0.0.7-1
+libplexus-cipher-java==1.7-1
+libplexus-classworlds-java==1.5.0-5
+libplexus-classworlds2-java==2.5.2-1
+libplexus-cli-java==1.2-5
+libplexus-compiler-java==2.4-3
+libplexus-component-annotations-java==1.6-3
+libplexus-component-metadata-java==1.6-3
+libplexus-container-default-java==1.0-alpha-9-stable-1-7
+libplexus-container-default1.5-java==1.6-3
+libplexus-containers-java==1.0~beta3.0.7-8
+libplexus-containers1.5-java==1.6-3
+libplexus-i18n-java==1.0-beta-10-3
+libplexus-interactivity-api-java==1.0-alpha-6-7
+libplexus-interpolation-java==1.21-1
+libplexus-io-java==1.0~alpha5-2
+libplexus-sec-dispatcher-java==1.3.1-6
+libplexus-utils-java==1:1.5.15-4+deb9u1
+libplexus-utils2-java==3.0.22-1
+libplexus-velocity-java==1.2-1
+libpng-dev==1.6.28-1+deb9u1
+libpng16-16==1.6.28-1+deb9u1
+libpod-constants-perl==0.19-1
+libpolkit-agent-1-0==0.105-18+deb9u1
+libpolkit-backend-1-0==0.105-18+deb9u1
+libpolkit-gobject-1-0==0.105-18+deb9u1
+libpoppler64==0.48.0-2+deb9u4
+libpopt0==1.16-10+b2
+libpotrace0==1.13-3
+libprocps6==2:3.3.12-3+deb9u1
+libprotobuf-dev==3.0.0-9
+libprotobuf-lite10==3.0.0-9
+libprotobuf10==3.0.0-9
+libprotoc10==3.0.0-9
+libproxy1v5==0.4.14-2+deb9u2
+libptexenc1==2016.20160513.41080.dfsg-2+deb9u1
+libpthread-stubs0-dev==0.3-4
+libpulse0==10.0-1+deb9u1
+libpython-all-dev==2.7.13-2
+libpython-dev==2.7.13-2
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-dev==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
+libpython3-all-dbg==3.5.3-1
+libpython3-all-dev==3.5.3-1
+libpython3-dbg==3.5.3-1
+libpython3-dev==3.5.3-1
+libpython3-stdlib==3.5.3-1
+libpython3.5==3.5.3-1+deb9u4
+libpython3.5-dbg==3.5.3-1+deb9u4
+libpython3.5-dev==3.5.3-1+deb9u4
+libpython3.5-minimal==3.5.3-1+deb9u4
+libpython3.5-stdlib==3.5.3-1+deb9u4
+libqdox-java==1.12.1-2
+libqdox2-java==2.0~M3-3
+libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
+libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
+libqt4-designer==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
+libqt4-help==4:4.8.7+dfsg-11+deb9u1
+libqt4-network==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
+libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
+libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
+libqt4-script==4:4.8.7+dfsg-11+deb9u1
+libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql==4:4.8.7+dfsg-11+deb9u1
+libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
+libqt4-svg==4:4.8.7+dfsg-11+deb9u1
+libqt4-test==4:4.8.7+dfsg-11+deb9u1
+libqt4-xml==4:4.8.7+dfsg-11+deb9u1
+libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
+libqt5concurrent5==5.7.1+dfsg-3+deb9u3
+libqt5core5a==5.7.1+dfsg-3+deb9u3
+libqt5dbus5==5.7.1+dfsg-3+deb9u3
+libqt5gui5==5.7.1+dfsg-3+deb9u3
+libqt5network5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5==5.7.1+dfsg-3+deb9u3
+libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
+libqt5printsupport5==5.7.1+dfsg-3+deb9u3
+libqt5sql5==5.7.1+dfsg-3+deb9u3
+libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
+libqt5svg5==5.7.1~20161021-2.1
+libqt5test5==5.7.1+dfsg-3+deb9u3
+libqt5widgets5==5.7.1+dfsg-3+deb9u3
+libqt5xml5==5.7.1+dfsg-3+deb9u3
+libqtcore4==4:4.8.7+dfsg-11+deb9u1
+libqtdbus4==4:4.8.7+dfsg-11+deb9u1
+libqtgui4==4:4.8.7+dfsg-11+deb9u1
+libreadline-dev==7.0-3
+libreadline7==7.0-3
+libregexp-assemble-perl==0.36-1
+librelaxng-datatype-java==1.0+ds1-3
+librest-0.7-0==0.8.0-2
+librhash0==1.3.3-1+b2
+librhino-java==1.7.7.1-1
+librole-tiny-perl==2.000005-1
+librrd-dev==1.6.0-1+b2
+librrd8==1.6.0-1+b2
+librsvg2-2==2.40.21-0+deb9u1
+librsvg2-common==2.40.21-0+deb9u1
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libruby2.3==2.3.3-1+deb9u9
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsaxon-java==1:6.5.5-10
+libscalar-list-utils-perl==1:1.47-1
+libseccomp2==2.3.1-2.1+deb9u1
+libselinux1-dev==2.6-3+b3
+libsensors4==1:3.4.0-4
+libsensors4-dev==1:3.4.0-4
+libsepol1-dev==2.6-2
+libservlet3.1-java==8.5.54-0+deb9u6
+libsigsegv2==2.10-5
+libsisu-inject-java==0.3.2-2
+libsisu-plexus-java==0.3.2-1
+libslang2==2.3.1-5
+libslang2-dev==2.3.1-5
+libslf4j-java==1.7.22-1
+libsm-dev==2:1.2.2-1+b3
+libsm6==2:1.2.2-1+b3
+libsndfile1==1.0.27-3+deb9u1
+libsnmp-base==5.7.3+dfsg-1.7+deb9u3
+libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
+libsnmp30==5.7.3+dfsg-1.7+deb9u3
+libsoap-lite-perl==1.20-1
+libsocket6-perl==0.27-1+b1
+libsodium18==1.0.11-2
+libsort-key-perl==1.33-1+b3
+libsort-versions-perl==1.62-1
+libsoup-gnome2.4-1==2.56.0-2+deb9u2
+libsoup2.4-1==2.56.0-2+deb9u2
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl-dev==1.1.0l-1~deb9u3
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libstax-java==1.2.0-3
+libstdc++-6-dev==6.3.0-18+deb9u1
+libstrictures-perl==2.000003-1
+libstring-copyright-perl==0.003005-1
+libstring-escape-perl==2010.002-1
+libsub-exporter-perl==0.986-1
+libsub-exporter-progressive-perl==0.001013-1
+libsub-identify-perl==0.12-2+b1
+libsub-install-perl==0.928-1
+libsub-name-perl==0.21-1
+libsubunit-dev==1.1.0-3
+libsubunit0==1.1.0-3
+libsurefire-java==2.17-3
+libswitch-perl==2.17-2
+libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
+libsys-hostname-long-perl==1.5-1
+libsystemd-dev==232-25+deb9u13
+libsystemd0==232-25+deb9u13
+libtask-weaken-perl==1.04-1
+libtcl8.6==8.6.6+dfsg-1+b1
+libtcmalloc-minimal4==2.5-2.2
+libtexlua52==2016.20160513.41080.dfsg-2+deb9u1
+libtexluajit2==2016.20160513.41080.dfsg-2+deb9u1
+libtext-charwidth-perl==0.04-7+b6
+libtext-glob-perl==0.10-1
+libtext-iconv-perl==1.7-5+b4
+libtext-levenshtein-perl==0.13-1
+libtext-unidecode-perl==1.30-1
+libtext-wrapi18n-perl==0.06-7.1
+libthai-data==0.1.26-1
+libthai0==0.1.26-1
+libtie-ixhash-perl==1.23-2
+libtiff5==4.0.8-2+deb9u6
+libtimedate-perl==2.3000-2+deb9u1
+libtinfo-dev==6.0+20161126-1+deb9u2
+libtinyxml2-4==4.0.1-1
+libtinyxml2-dev==4.0.1-1
+libtk8.6==8.6.6-1+b1
+libtool==2.4.6-2
+libtool-bin==2.4.6-2
+libtry-tiny-perl==0.28-1
+libtxc-dxtn-s2tc==1.0+git20151227-2
+libubsan0==6.3.0-18+deb9u1
+libudev-dev==232-25+deb9u13
+libudev1==232-25+deb9u13
+libunicode-utf8-perl==0.60-1+b3
+libunwind-dev==1.1-4.1
+libunwind8==1.1-4.1
+libunwind8-dev==1.1-4.1
+liburi-perl==1.71-1
+libusb-0.1-4==2:0.1.12-30
+libusb-1.0-0==2:1.0.21-1
+libusb-1.0-0-dev==2:1.0.21-1
+libusb-1.0-doc==2:1.0.21-1
+libusb-dev==2:0.1.12-30
+libutempter0==1.1.6-3
+libuv1==1.34.2-1~bpo9+1
+libvariable-magic-perl==0.61-1
+libvorbis0a==1.3.5-4+deb9u2
+libvorbisenc2==1.3.5-4+deb9u2
+libwacom-bin==0.22-1+b1
+libwacom-common==0.22-1
+libwacom2==0.22-1+b1
+libwagon-java==1.0.0-9
+libwagon2-java==2.10-6
+libwayland-bin==1.12.0-1+deb9u1
+libwayland-client0==1.12.0-1+deb9u1
+libwayland-cursor0==1.12.0-1+deb9u1
+libwayland-dev==1.12.0-1+deb9u1
+libwayland-egl1-mesa==13.0.6-1+b2
+libwayland-server0==1.12.0-1+deb9u1
+libwebp6==0.5.2-1+deb9u1
+libwebpdemux2==0.5.2-1+deb9u1
+libwebpmux2==0.5.2-1+deb9u1
+libwmf0.2-7==0.2.8.4-10.6
+libwrap0==7.6.q-26
+libwrap0-dev==7.6.q-26
+libwww-perl==6.15-1
+libwww-robotrules-perl==6.01-1
+libx11-6==2:1.6.4-3+deb9u4
+libx11-data==2:1.6.4-3+deb9u4
+libx11-dev==2:1.6.4-3+deb9u4
+libx11-doc==2:1.6.4-3+deb9u4
+libx11-protocol-perl==0.56-7
+libx11-xcb-dev==2:1.6.4-3+deb9u4
+libx11-xcb1==2:1.6.4-3+deb9u4
+libxalan2-java==2.7.1-9
+libxapian30==1.4.3-2+deb9u3
+libxau-dev==1:1.0.8-1
+libxau6==1:1.0.8-1
+libxaw7==2:1.0.13-1+b2
+libxbean-java==4.5-4
+libxcb-dri2-0==1.12-1
+libxcb-dri2-0-dev==1.12-1
+libxcb-dri3-0==1.12-1
+libxcb-dri3-dev==1.12-1
+libxcb-glx0==1.12-1
+libxcb-glx0-dev==1.12-1
+libxcb-icccm4==0.4.1-1
+libxcb-image0==0.4.0-1+b2
+libxcb-keysyms1==0.4.0-1+b2
+libxcb-present-dev==1.12-1
+libxcb-present0==1.12-1
+libxcb-randr0==1.12-1
+libxcb-randr0-dev==1.12-1
+libxcb-render-util0==0.3.9-1
+libxcb-render0==1.12-1
+libxcb-render0-dev==1.12-1
+libxcb-shape0==1.12-1
+libxcb-shape0-dev==1.12-1
+libxcb-shm0==1.12-1
+libxcb-sync-dev==1.12-1
+libxcb-sync1==1.12-1
+libxcb-util0==0.3.8-3+b2
+libxcb-xfixes0==1.12-1
+libxcb-xfixes0-dev==1.12-1
+libxcb-xinerama0==1.12-1
+libxcb-xkb1==1.12-1
+libxcb1==1.12-1
+libxcb1-dev==1.12-1
+libxcomposite1==1:0.4.4-2
+libxcursor1==1:1.1.14-1+deb9u2
+libxdamage-dev==1:1.1.4-2+b3
+libxdamage1==1:1.1.4-2+b3
+libxdelta2==1.1.3-9.1+b1
+libxdmcp-dev==1:1.1.2-3
+libxdmcp6==1:1.1.2-3
+libxdot4==2.38.0-17+deb9u1
+libxerces2-java==2.11.0-7
+libxext-dev==2:1.3.3-1+b2
+libxext6==2:1.3.3-1+b2
+libxfixes-dev==1:5.0.3-1
+libxfixes3==1:5.0.3-1
+libxft2==2.3.2-1+b2
+libxi6==2:1.7.9-1
+libxinerama1==2:1.1.3-1+b3
+libxkbcommon-x11-0==0.7.1-2~deb9u1
+libxkbcommon0==0.7.1-2~deb9u1
+libxml-commons-external-java==1.4.01-2
+libxml-commons-resolver1.1-java==1.2-7
+libxml-libxml-perl==2.0128+dfsg-1+deb9u1
+libxml-namespacesupport-perl==1.11-1
+libxml-parser-perl==2.44-2+b1
+libxml-sax-base-perl==1.07-1
+libxml-sax-expat-perl==0.40-2
+libxml-sax-perl==0.99+dfsg-2
+libxml-simple-perl==2.22-1
+libxml-twig-perl==1:3.50-1
+libxml-xpathengine-perl==0.13-1
+libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
+libxmlgraphics-commons-java==2.1-2
+libxmlrpc-lite-perl==0.717-1
+libxmu6==2:1.1.2-2
+libxmuu1==2:1.1.2-2
+libxom-java==1.2.10-1
+libxpm4==1:3.5.12-1
+libxpp2-java==2.1.10-7
+libxpp3-java==1.1.4c-2
+libxrandr2==2:1.5.1-1
+libxrender1==1:0.9.10-1
+libxshmfence-dev==1.2-1+b2
+libxshmfence1==1.2-1+b2
+libxslt1-dev==1.1.29-2.1+deb9u2
+libxslt1.1==1.1.29-2.1+deb9u2
+libxss1==1:1.2.2-1
+libxt-dev==1:1.1.5-1
+libxt6==1:1.1.5-1
+libxtables-dev==1.6.0+snapshot20161117-6
+libxtables12==1.6.0+snapshot20161117-6
+libxtst6==2:1.2.3-1
+libxv1==2:1.0.11-1
+libxxf86dga1==2:1.1.4-1+b3
+libxxf86vm-dev==1:1.1.4-1+b2
+libxxf86vm1==1:1.1.4-1+b2
+libyaml-0-2==0.1.7-2
+libyaml-dev==0.1.7-2
+libyaml-libyaml-perl==0.63-2
+libyaml-tiny-perl==1.70-1
+libzmq3-dev==4.2.1-4+deb9u4
+libzmq5==4.2.1-4+deb9u4
+libzzip-0-13==0.13.62-3.2~deb9u1
+licensecheck==3.0.29-1
+lintian==2.5.50.4
+linux-compiler-gcc-6-arm==4.9.272-2
+linux-kbuild-4.9==4.9.272-2
+linux-libc-dev==4.9.272-2
+linuxdoc-tools==0.9.72-4
+llvm-3.8==1:3.8.1-24
+llvm-3.8-dev==1:3.8.1-24
+llvm-3.8-runtime==1:3.8.1-24
+lmodern==2.004.5-3
+logrotate==3.11.0-0.1
+lsb-release==9.20161125
+lsof==4.89+dfsg-0.1
+lua-bitop==1.0.2-4
+lua-bitop-dev==1.0.2-4
+lua-cjson==2.1.0+dfsg-2
+lua-cjson-dev==2.1.0+dfsg-2
+lynx==2.8.9dev11-1
+lynx-common==2.8.9dev11-1
+m4==1.4.18-1
+mailutils==1:3.1.1-1
+mailutils-common==1:3.1.1-1
+make==4.1-9.1
+man-db==2.7.6.1-2
+manpages==4.10-2
+manpages-dev==4.10-2
+maven==3.3.9-4
+maven-debian-helper==2.1.3
+maven-repo-helper==1.9.2
+mesa-common-dev==13.0.6-1+b2
+mesa-utils==8.3.0-3
+mime-support==3.60
+module-assistant==0.11.9
+mpi-default-bin==1.8
+mpi-default-dev==1.8
+mysql-common==5.8+1.0.2
+ncurses-term==6.0+20161126-1+deb9u2
+netbase==5.4
+netpbm==2:10.0-15.3+b2
+nodejs==10.24.1-1nodesource1
+ocl-icd-libopencl1==2.2.11-1
+openjdk-8-jdk==8u292-b10-0+deb9u1
+openjdk-8-jdk-headless==8u292-b10-0+deb9u1
+openjdk-8-jre==8u292-b10-0+deb9u1
+openjdk-8-jre-headless==8u292-b10-0+deb9u1
+openmpi-bin==2.0.2-2
+openmpi-common==2.0.2-2
+opensp==1.5.2-13+b1
+openssh-client==1:7.4p1-10+deb9u7
+openssh-server==1:7.4p1-10+deb9u7
+openssh-sftp-server==1:7.4p1-10+deb9u7
+openssl==1.1.0l-1~deb9u3
+packagekit==1.1.5-2+deb9u2
+packagekit-tools==1.1.5-2+deb9u2
+patch==2.7.5-1+deb9u2
+patchutils==0.3.4-2
+pbuilder==0.228.7
+pbzip2==1.1.9-1+b1
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+perl-openssl-defaults==3
+php-cli==1:7.0+49
+php-codecoverage==4.0.0+dfsg-1
+php-common==1:49
+php-deepcopy==1.5.5-1
+php-doctrine-instantiator==1.0.5-2
+php-file-iterator==1.4.1-2
+php-pear==1:1.10.1+submodules+notgz-9+deb9u3
+php-phpdocumentor-reflection-docblock==2.0.4-2
+php-phpspec-prophecy==1.6.2-1
+php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
+php-text-template==1.2.1-2
+php-timer==1.0.8-1
+php-token-stream==1.4.8-2
+php-xml==1:7.0+49
+php7.0-cli==7.0.33-0+deb9u11
+php7.0-common==7.0.33-0+deb9u11
+php7.0-json==7.0.33-0+deb9u11
+php7.0-opcache==7.0.33-0+deb9u11
+php7.0-readline==7.0.33-0+deb9u11
+php7.0-xml==7.0.33-0+deb9u11
+phpunit==5.4.6-2~deb9u1
+phpunit-code-unit-reverse-lookup==1.0.0-2
+phpunit-comparator==1.2.0-2
+phpunit-diff==1.4.1-2
+phpunit-environment==1.3.7-1
+phpunit-exporter==1.2.2-1
+phpunit-global-state==1.1.1-2
+phpunit-mock-object==3.2.3-1
+phpunit-object-enumerator==1.0.0-2
+phpunit-recursion-context==1.0.2-2
+phpunit-resource-operations==1.0.0-2
+phpunit-version==2.0.0-2
+pigz==2.3.4-1
+pinentry-curses==1.0.0-2
+pkg-config==0.29-4+b1
+pkg-php-tools==1.35
+po-debconf==1.0.20
+policykit-1==0.105-18+deb9u1
+poppler-data==0.4.7-8
+preview-latex-style==11.90-1
+pristine-tar==1.38
+procmail==3.22-25+deb9u1
+procps==2:3.3.12-3+deb9u1
+prosper==1.00.4+cvs.2007.05.01-4.1
+protobuf-compiler==3.0.0-9
+ps2eps==1.68+binaryfree-2
+psmisc==22.21-2.1+b2
+psutils==1.17.dfsg-4
+pylint==1.6.5-1
+python==2.7.13-2
+python-alabaster==0.7.8-1
+python-all==2.7.13-2
+python-all-dev==2.7.13-2
+python-apt==1.4.3
+python-apt-common==1.4.3
+python-astroid==1.4.9-1
+python-attr==16.3.0-1
+python-babel==2.3.4+dfsg.1-2
+python-babel-localedata==2.3.4+dfsg.1-2
+python-backports.functools-lru-cache==1.3-1
+python-bs4==4.5.3-1
+python-cffi-backend==1.9.1-2
+python-chardet==2.3.0-2
+python-click==6.6-1
+python-colorama==0.3.7-1
+python-constantly==15.1.0-1
+python-cov-core==1.15.0-1
+python-coverage==4.2+dfsg.1-2
+python-crypto==2.6.1-7
+python-cryptography==1.7.1-3+deb9u2
+python-dateutil==2.5.3-2
+python-dbus==1.2.4-1+b1
+python-debian==0.1.30
+python-dev==2.7.13-2
+python-docutils==0.13.1+dfsg-2
+python-enum34==1.1.6-1
+python-gi==3.22.0-2
+python-gpg==1.8.0-3+b2
+python-html5lib==0.999999999-1
+python-idna==2.2-1
+python-imagesize==0.7.1-1
+python-incremental==16.10.1-3
+python-ipaddr==2.1.11-2
+python-ipaddress==1.0.17-1
+python-isort==4.2.5+ds1-2+deb9u1
+python-jinja2==2.8-1
+python-keyring==10.1-1
+python-keyrings.alt==1.3-1
+python-lazy-object-proxy==1.2.2-1
+python-lxml==3.7.1-1+deb9u4
+python-markupsafe==0.23-3
+python-minimal==2.7.13-2
+python-nose2==0.6.5-2
+python-openssl==16.2.0-1
+python-pam==0.4.2-13.2
+python-parse==1.6.6-0.1
+python-pil==4.0.0-4+deb9u2
+python-pip-whl==9.0.1-2+deb9u2
+python-pkg-resources==33.1.1-1
+python-py==1.4.32-3
+python-pyasn1==0.1.9-2
+python-pyasn1-modules==0.0.7-0.1
+python-pygments==2.2.0+dfsg-1+deb9u2
+python-pytest==3.0.6-1
+python-pytest-cov==2.4.0-2
+python-requests==2.12.4-1
+python-roman==2.0.0-2
+python-secretstorage==2.3.1-2
+python-serial==3.2.1-1
+python-service-identity==16.0.0-2
+python-setuptools==33.1.1-1
+python-six==1.10.0-3
+python-sphinx==1.4.9-2
+python-sphinx-rtd-theme==0.1.9-1
+python-stdeb==0.8.5-1
+python-tk==2.7.13-1
+python-twisted==16.6.0-2
+python-twisted-bin==16.6.0-2
+python-twisted-core==16.6.0-2
+python-tz==2016.7-0.3
+python-urllib3==1.19.1-1+deb9u1
+python-webencodings==0.5-2
+python-wheel==0.29.0-2
+python-wrapt==1.9.0-2
+python-xdg==0.25-4
+python-zope.interface==4.3.2-1
+python2.7==2.7.13-2+deb9u5
+python2.7-dev==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
+python3==3.5.3-1
+python3-alabaster==0.7.8-1
+python3-all==3.5.3-1
+python3-all-dbg==3.5.3-1
+python3-all-dev==3.5.3-1
+python3-apt==1.4.3
+python3-babel==2.3.4+dfsg.1-2
+python3-cffi-backend==1.9.1-2
+python3-chardet==2.3.0-2
+python3-crypto==2.6.1-7
+python3-cryptography==1.7.1-3+deb9u2
+python3-dbg==3.5.3-1
+python3-dbus==1.2.4-1+b1
+python3-debian==0.1.30
+python3-dev==3.5.3-1
+python3-docutils==0.13.1+dfsg-2
+python3-gi==3.22.0-2
+python3-idna==2.2-1
+python3-imagesize==0.7.1-1
+python3-jinja2==2.8-1
+python3-keyring==10.1-1
+python3-keyrings.alt==1.3-1
+python3-magic==1:5.30-1+deb9u3
+python3-markupsafe==0.23-3
+python3-minimal==3.5.3-1
+python3-pil==4.0.0-4+deb9u2
+python3-pkg-resources==33.1.1-1
+python3-pyasn1==0.1.9-2
+python3-pycurl==7.43.0-2
+python3-pygments==2.2.0+dfsg-1+deb9u2
+python3-roman==2.0.0-2
+python3-secretstorage==2.3.1-2
+python3-setuptools==33.1.1-1
+python3-six==1.10.0-3
+python3-software-properties==0.96.20.2-1+deb9u1
+python3-sphinx==1.4.9-2
+python3-tz==2016.7-0.3
+python3-wheel==0.29.0-2
+python3-xdg==0.25-4
+python3.5==3.5.3-1+deb9u4
+python3.5-dbg==3.5.3-1+deb9u4
+python3.5-dev==3.5.3-1+deb9u4
+python3.5-minimal==3.5.3-1+deb9u4
+qdbus==4:4.8.7+dfsg-11+deb9u1
+qt-at-spi==0.4.0-5
+qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
+qt4-qmake==4:4.8.7+dfsg-11+deb9u1
+qt5-default==5.7.1+dfsg-3+deb9u3
+qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
+qt5-qmake==5.7.1+dfsg-3+deb9u3
+qtbase5-dev==5.7.1+dfsg-3+deb9u3
+qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
+qtchooser==63-g13a3d08-1
+qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
+qttranslations5-l10n==5.7.1~20161021-1
+quilt==0.65-2~bpo9+1
+rake==10.5.0-2+deb9u1
+readline-common==7.0-3
+rename==0.20-4
+rhino==1.7.7.1-1
+rrdtool==1.6.0-1+b2
+rsync==3.1.2-1+deb9u2
+rsyslog==8.24.0-1
+ruby==1:2.3.3
+ruby-all-dev==1:2.3.3
+ruby-did-you-mean==1.0.0-2
+ruby-minitest==5.9.0-1
+ruby-net-telnet==0.1.1-2
+ruby-power-assert==0.3.0-1
+ruby-setup==3.4.1-9
+ruby-test-unit==3.1.7-2
+ruby2.3==2.3.3-1+deb9u9
+ruby2.3-dev==2.3.3-1+deb9u9
+rubygems-integration==1.11
+sgml-base==1.29
+sgml-data==2.0.10
+shared-mime-info==1.8-1+deb9u1
+software-properties-common==0.96.20.2-1+deb9u1
+sphinx-common==1.4.9-2
+sphinx-rtd-theme-common==0.1.9-1
+squashfs-tools==1:4.3-3+deb9u1
+stgit==0.17.1-1
+strace==4.15-2
+sudo==1.8.19p1-2.1+deb9u3
+swig==3.0.10-1.1
+swig3.0==3.0.10-1.1
+systemd==232-25+deb9u13
+systemd-shim==10-3
+t1utils==1.39-2
+tcl==8.6.0+9
+tcl8.6==8.6.6+dfsg-1+b1
+tcpd==7.6.q-26
+telnet==0.17-41
+tex-common==6.06
+tex-gyre==20160520-1
+texi2html==1.82+dfsg1-5
+texinfo==6.3.0.dfsg.1-1+b2
+texlive-base==2016.20170123-5
+texlive-binaries==2016.20160513.41080.dfsg-2+deb9u1
+texlive-extra-utils==2016.20170123-5
+texlive-font-utils==2016.20170123-5
+texlive-fonts-recommended==2016.20170123-5
+texlive-fonts-recommended-doc==2016.20170123-5
+texlive-generic-extra==2016.20170123-5
+texlive-generic-recommended==2016.20170123-5
+texlive-latex-base==2016.20170123-5
+texlive-latex-base-doc==2016.20170123-5
+texlive-latex-extra==2016.20170123-5
+texlive-latex-extra-doc==2016.20170123-5
+texlive-latex-recommended==2016.20170123-5
+texlive-latex-recommended-doc==2016.20170123-5
+texlive-pictures==2016.20170123-5
+texlive-pictures-doc==2016.20170123-5
+texlive-pstricks==2016.20170123-5
+texlive-pstricks-doc==2016.20170123-5
+tipa==2:1.3-20
+tk==8.6.0+9
+tk8.6==8.6.6-1+b1
+tk8.6-blt2.5==2.5.3+dfsg-3
+ucf==3.0036
+unattended-upgrades==0.93.1+nmu1
+unzip==6.0-21+deb9u2
+velocity==1.7-5+deb9u1
+vim==2:8.0.0197-4+deb9u3
+vim-common==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
+wdiff==1.2.2-2
+x11-common==1:7.7+19
+x11-utils==7.7+3+b1
+x11-xserver-utils==7.7+7+b1
+x11proto-core-dev==7.0.31-1
+x11proto-damage-dev==1:1.2.1-2
+x11proto-dri2-dev==2.8-2
+x11proto-fixes-dev==1:5.0-2
+x11proto-gl-dev==1.4.17-1
+x11proto-input-dev==2.3.2-1
+x11proto-kb-dev==1.0.7-1
+x11proto-xext-dev==7.3.0-1
+x11proto-xf86vidmode-dev==2.3.1-2
+xauth==1:1.0.9-1+b2
+xbitmaps==1.1.1-2
+xdelta==1.1.3-9.1+b1
+xdelta3==3.0.11-dfsg-1+b1
+xdg-user-dirs==0.15-2+b1
+xdg-utils==1.1.1-1+deb9u2
+xkb-data==2.19-1+deb9u1
+xml-core==0.17
+xmlto==0.0.28-1
+xorg-sgml-doctools==1:1.11-1
+xsltproc==1.1.29-2.1+deb9u2
+xterm==327-2+deb9u2
+xtrans-dev==1.3.5-1
+xxd==2:8.0.0197-4+deb9u3
+xz-utils==5.2.2-1.2+b1
+zip==3.0-11+b1
+zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
new file mode 100644
index 000000000000..53073b5ae1d9
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
@@ -0,0 +1,79 @@
+alabaster==0.7.8
+astroid==1.4.9
+attrs==16.3.0
+babel==2.3.4
+backports.functools-lru-cache==1.3
+beautifulsoup4==4.5.3
+chardet==2.3.0
+click==6.6
+colorama==0.3.7
+constantly==15.1.0
+cov-core==1.15.0
+coverage==4.2
+crc16==0.1.1
+cryptography==1.7.1
+ctypesgen==0.post125
+docutils==0.13.1
+enum34==1.1.6
+gbp==0.8.12.2
+gcovr==3.3
+gpg==1.8.0
+html5lib==0.999999999
+idna==2.2
+imagesize==0.7.1
+incremental==16.10.1
+ipaddr==2.1.11
+ipaddress==1.0.17
+isort==4.2.5
+j2cli==0.3.10
+jinja2==2.11.3
+keyring==10.1
+keyrings.alt==1.3
+lazy-object-proxy==1.2.2
+lxml==4.6.2
+m2crypto==0.36.0
+markupsafe==1.1.1
+mmh3==3.0.0
+mockredispy==2.9.3
+nose==1.3.7
+nose2==0.6.5
+pam==0.4.2
+parse==1.6.6
+pexpect==4.6.0
+pillow==4.0.0
+ptyprocess==0.7.0
+py==1.4.32
+pyasn1==0.1.9
+pyasn1-modules==0.0.7
+pycrypto==2.6.1
+pygments==2.2.0
+pygobject==3.22.0
+pylint==1.6.5
+pympler==0.8
+pyopenssl==16.2.0
+pyserial==3.2.1
+pyste==0.9.10
+pytest==3.0.6
+pytest-cov==2.4.0
+pytest-runner==4.4
+python-apt==1.4.3
+python-dateutil==2.5.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+pyyaml==5.3.1
+requests==2.12.4
+roman==2.0.0
+secretstorage==2.3.1
+service-identity==16.0.0
+six==1.10.0
+sphinx==1.4.9
+sphinx-rtd-theme==0.1.9
+stdeb==0.8.5
+stgit===0.17.1-dirty
+twisted==16.6.0
+typing==3.10.0.0
+urllib3==1.19.1
+webencodings==0.5
+wrapt==1.9.0
+zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
new file mode 100644
index 000000000000..1302868fe0ef
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -0,0 +1,37 @@
+alabaster==0.7.8
+babel==2.3.4
+bitarray==2.2.2
+chardet==2.3.0
+cryptography==1.7.1
+devscripts==2.17.6+deb9u2
+docutils==0.13.1
+file-magic==0.3.0
+idna==2.2
+imagesize==0.7.1
+jinja2==2.8
+keyring==10.1
+keyrings.alt==1.3
+lxml==4.6.2
+markupsafe==0.23
+mockredispy==2.9.3
+nose==1.3.7
+pillow==4.0.0
+pyang==2.4.0
+pyangbind==0.8.1
+pyasn1==0.1.9
+pycrypto==2.6.1
+pycurl==7.43.0
+pygments==2.2.0
+pygobject==3.22.0
+python-apt==1.4.3
+python-debian==0.1.30
+pytz==2016.7
+pyxdg==0.25
+pyyaml==5.3.1
+redis==3.5.3
+regex==2021.7.6
+roman==2.0.0
+secretstorage==2.3.1
+six==1.10.0
+sphinx==1.4.9
+unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 7e8937ec05be..a72b90e7d0f9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -590,7 +590,7 @@ libjaxen-java==1.1.6-1+deb9u1
 libjaxp1.3-java==1.3.05-2
 libjbig0==2.1-3.1+b2
 libjbig2dec0==0.13-4.1
-libjdom1-java==1.1.3-1
+libjdom1-java==1.1.3-1+deb9u1
 libjemalloc-dev==3.6.0-9.1
 libjemalloc1==3.6.0-9.1
 libjetty9-java==9.2.30-0+deb9u2
@@ -746,7 +746,7 @@ libpackage-stash-perl==0.37-1
 libpackage-stash-xs-perl==0.28-3+b1
 libpackagekit-glib2-18==1.1.5-2+deb9u2
 libpam-cap==1:2.25-1
-libpam-systemd==232-25+deb9u12
+libpam-systemd==232-25+deb9u13
 libpam0g-dev==1.1.8-3.6
 libpango-1.0-0==1.40.5-1
 libpangocairo-1.0-0==1.40.5-1
@@ -944,7 +944,7 @@ libsurefire-java==2.17-3
 libswitch-perl==2.17-2
 libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
 libsys-hostname-long-perl==1.5-1
-libsystemd-dev==232-25+deb9u12
+libsystemd-dev==232-25+deb9u13
 libtask-weaken-perl==1.04-1
 libtasn1-6==4.10-1.1+deb9u1
 libtcl8.6==8.6.6+dfsg-1+b1
@@ -972,7 +972,7 @@ libtry-tiny-perl==0.28-1
 libtsan0==6.3.0-18+deb9u1
 libtxc-dxtn-s2tc==1.0+git20151227-2
 libubsan0==6.3.0-18+deb9u1
-libudev-dev==232-25+deb9u12
+libudev-dev==232-25+deb9u13
 libunicode-utf8-perl==0.60-1+b3
 libunistring0==0.9.6+really0.9.3-0.1
 libunwind-dev==1.1-4.1
@@ -1128,12 +1128,12 @@ libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u1
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.272-1
-linux-headers-4.9.0-16-amd64==4.9.272-1
-linux-headers-4.9.0-16-common==4.9.272-1
+linux-compiler-gcc-6-x86==4.9.272-2
+linux-headers-4.9.0-16-amd64==4.9.272-2
+linux-headers-4.9.0-16-common==4.9.272-2
 linux-headers-amd64==4.9+80+deb9u14
-linux-kbuild-4.9==4.9.272-1
-linux-libc-dev==4.9.272-1
+linux-kbuild-4.9==4.9.272-2
+linux-libc-dev==4.9.272-2
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
@@ -1287,7 +1287,7 @@ python-nose2==0.6.5-2
 python-openssl==16.2.0-1
 python-pam==0.4.2-13.2
 python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u2
+python-pil==4.0.0-4+deb9u3
 python-pip-whl==9.0.1-2+deb9u2
 python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
@@ -1345,7 +1345,7 @@ python3-keyrings.alt==1.3-1
 python3-magic==1:5.30-1+deb9u3
 python3-markupsafe==0.23-3
 python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u2
+python3-pil==4.0.0-4+deb9u3
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
@@ -1411,7 +1411,7 @@ strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
 swig==3.0.10-1.1
 swig3.0==3.0.10-1.1
-systemd==232-25+deb9u12
+systemd==232-25+deb9u13
 systemd-shim==10-3
 t1utils==1.39-2
 tcl==8.6.0+9
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 43f411ae099f..b57ce596d98d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 0c21d9af612e..1302868fe0ef 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.1
+bitarray==2.2.2
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 370b3e6c8a74..636c9702d8ee 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.6-1
+containerd.io==1.4.8-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
new file mode 100644
index 000000000000..6837e3e746a0
--- /dev/null
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -0,0 +1,14 @@
+icu-devtools==63.1-6+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcryptsetup12==2:2.3.5-1~bpo10+1
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
+linux-libc-dev==4.19.194-3
+tsingma-bsp==1.0
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
new file mode 100644
index 000000000000..c6a9c2de77d9
--- /dev/null
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -0,0 +1,14 @@
+icu-devtools==63.1-6+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcryptsetup12==2:2.3.5-1~bpo10+1
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u1
+linux-image-4.19.0-12-2-armmp==4.19.152-1
+linux-libc-dev==4.19.194-3
+mrvlprestera==1.0
+zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c65f8b60b778..e4718673406e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
 cffi==1.14.6
-charset-normalizer==2.0.2
+charset-normalizer==2.0.3
 click==7.0
 cryptography==3.4.7
 docker==4.3.1
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
new file mode 100644
index 000000000000..431dc5a43838
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -0,0 +1 @@
+cryptography==3.3.1
\ No newline at end of file

From 4eab1514ec22d40e9e74bbe87540ec56e3a2c25a Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Sun, 25 Jul 2021 09:35:06 +0800
Subject: [PATCH 0660/1674] [AS5835-54X] Support system-health and remove extra
 code (#8137)

Co-authored-by: Jostar Yang <jostar_yang@accton.com.tw>
---
 .../pmon_daemon_control.json                  |   2 +-
 .../sonic_platform/__init__.py                |   2 +-
 .../sonic_platform/chassis.py                 |  61 +++-
 .../sonic_platform/component.py               |  54 +++-
 .../sonic_platform/eeprom.py.bak              | 131 --------
 .../sonic_platform/fan.py                     |  93 ++++--
 .../sonic_platform/fan_drawer.py              |  90 ++++++
 .../sonic_platform/helper.py                  |   2 +-
 .../sonic_platform/psu.py                     |  17 ++
 .../sonic_platform/sfp.py                     |  17 ++
 .../sonic_platform/thermal.py                 | 115 ++++++-
 .../system_health_monitoring_config.json      |  15 +
 .../utils/accton_as5835_54x_util.py           | 284 +++---------------
 13 files changed, 454 insertions(+), 429 deletions(-)
 delete mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan_drawer.py
 create mode 100644 device/accton/x86_64-accton_as5835_54x-r0/system_health_monitoring_config.json

diff --git a/device/accton/x86_64-accton_as5835_54x-r0/pmon_daemon_control.json b/device/accton/x86_64-accton_as5835_54x-r0/pmon_daemon_control.json
index 584a14b9d942..a3b204e20d8d 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/pmon_daemon_control.json
+++ b/device/accton/x86_64-accton_as5835_54x-r0/pmon_daemon_control.json
@@ -1,5 +1,5 @@
 {
     "skip_ledd": true,
-    "skip_thermalctld": true
+    "skip_pcied": true
 }
 
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
index 43435472a423..73a7720e8979 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/__init__.py
@@ -1,2 +1,2 @@
-__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+__all__ = [ "platform", "chassis", "sfp", "eeprom", "component", "psu", "thermal", "fan", "fan_drawer" ]
 from . import platform
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
index 11c7ebda6bd8..92ef83d84552 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/chassis.py
@@ -29,6 +29,14 @@
 REBOOT_CAUSE_FILE = "reboot-cause.txt"
 PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
 HOST_CHK_CMD = "docker > /dev/null 2>&1"
+SYSLED_FNODE= "/sys/class/leds/as5835_54x_led::diag/brightness"
+
+SYSLED_MODES = {
+    "0" : "STATUS_LED_COLOR_OFF",
+    "1" : "STATUS_LED_COLOR_GREEN",
+    "2" : "STATUS_LED_COLOR_AMBER",
+    "5" : "STATUS_LED_COLOR_GREEN_BLINK"
+}
 
 
 class Chassis(ChassisBase):
@@ -57,12 +65,12 @@ def __initialize_sfp(self):
         self.sfp_module_initialized = True
         
     def __initialize_fan(self):
-        from sonic_platform.fan import Fan
-        for fant_index in range(0, NUM_FAN_TRAY):
-            for fan_index in range(0, NUM_FAN):
-                fan = Fan(fant_index, fan_index)
-                self._fan_list.append(fan)
-                
+       from sonic_platform.fan_drawer import FanDrawer
+       for fant_index in range(NUM_FAN_TRAY):
+           fandrawer = FanDrawer(fant_index)
+           self._fan_drawer_list.append(fandrawer)
+           self._fan_list.extend(fandrawer._fan_list)
+
     def __initialize_psu(self):
         from sonic_platform.psu import Psu
         for index in range(0, NUM_PSU):
@@ -84,7 +92,7 @@ def __initialize_components(self):
         for index in range(0, NUM_COMPONENT):
             component = Component(index)
             self._component_list.append(component)
-    
+
     def __initialize_watchdog(self):
         from sonic_platform.watchdog import Watchdog
         self._watchdog = Watchdog()
@@ -173,7 +181,7 @@ def get_reboot_cause(self):
             is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
             to pass a description of the reboot cause.
         """
-        
+
         reboot_cause_path = (HOST_REBOOT_CAUSE_PATH + REBOOT_CAUSE_FILE)
         sw_reboot_cause = self._api_helper.read_txt_file(
             reboot_cause_path) or "Unknown"
@@ -212,3 +220,40 @@ def get_sfp(self, index):
             sys.stderr.write("SFP index {} out of range (1-{})\n".format(
                              index, len(self._sfp_list)))
         return sfp
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
+        
+    def initizalize_system_led(self):
+        return True
+
+    def get_status_led(self):
+        val = self._api_helper.read_txt_file(SYSLED_FNODE)
+        return SYSLED_MODES[val] if val in SYSLED_MODES else "UNKNOWN"
+
+    def set_status_led(self, color):
+        mode = None
+        for key, val in SYSLED_MODES.items():
+            if val == color:
+                mode = key
+                break
+        if mode is None:
+            return False
+        else:
+            return self._api_helper.write_txt_file(SYSLED_FNODE, mode)
+            
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
index 53ece8d22825..1e2febef8f46 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/component.py
@@ -67,7 +67,7 @@ def __get_bios_version(self):
             with open(BIOS_VERSION_PATH, 'r') as fd:
                 bios_version = fd.read()
                 return bios_version.strip()
-        except Exception as e:    
+        except Exception as e:
             print('Get exception when read bios')
         return None
 
@@ -126,3 +126,55 @@ def install_firmware(self, image_path):
             A boolean, True if install successfully, False if not
         """
         raise NotImplementedError
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return 'N/A'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return 'N/A'
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
deleted file mode 100644
index f3bdcbccad3f..000000000000
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/eeprom.py.bak
+++ /dev/null
@@ -1,131 +0,0 @@
-try:
-    import os
-    import sys
-    import re
-    if sys.version_info[0] >= 3:
-        from io import StringIO
-    else:
-        from cStringIO import StringIO
-    
-    from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
-except ImportError as e:
-    raise ImportError(str(e) + "- required module not found")
-
-CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
-CACHE_FILE = 'syseeprom_cache'
-NULL = 'N/A'
-
-class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
-
-    EEPROM_DECODE_HEADLINES = 6
-
-    def __init__(self):
-        self._eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
-        super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
-        self._eeprom = self._load_eeprom()
-
-    def __parse_output(self, decode_output):
-        decode_output.replace('\0', '')
-        lines = decode_output.split('\n')
-        lines = lines[self.EEPROM_DECODE_HEADLINES:]
-        _eeprom_info_dict = dict()
-
-        for line in lines:
-            try:
-                match = re.search(
-                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
-                if match is not None:
-                    idx = match.group(1)
-                    value = match.group(3).rstrip('\0')
-
-                _eeprom_info_dict[idx] = value
-            except Exception:
-                pass
-
-        return _eeprom_info_dict
-
-    def _load_eeprom(self):
-        original_stdout = sys.stdout
-        sys.stdout = StringIO()
-        try:
-            self.read_eeprom_db()
-        except Exception:
-            decode_output = sys.stdout.getvalue()
-            sys.stdout = original_stdout
-            return self.__parse_output(decode_output)
-
-        status = self.check_status()
-        if 'ok' not in status:
-            return False
-
-        if not os.path.exists(CACHE_ROOT):
-            try:
-                os.makedirs(CACHE_ROOT)
-            except Exception:
-                pass
-
-        #
-        # only the eeprom classes that inherit from eeprom_base
-        # support caching. Others will work normally
-        #
-        try:
-            self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
-        except Exception:
-            pass
-
-        e = self.read_eeprom()
-        if e is None:
-            return 0
-
-        try:
-            self.update_cache(e)
-        except Exception:
-            pass
-
-        self.decode_eeprom(e)
-        decode_output = sys.stdout.getvalue()
-        sys.stdout = original_stdout
-
-        (is_valid, valid_crc) = self.is_checksum_valid(e)
-        if not is_valid:
-            return False
-
-        return self.__parse_output(decode_output)
-
-    def _valid_tlv(self, eeprom_data):
-        tlvinfo_type_codes_list = [
-            self._TLV_CODE_PRODUCT_NAME,
-            self._TLV_CODE_PART_NUMBER,
-            self._TLV_CODE_SERIAL_NUMBER,
-            self._TLV_CODE_MAC_BASE,
-            self._TLV_CODE_MANUF_DATE,
-            self._TLV_CODE_DEVICE_VERSION,
-            self._TLV_CODE_LABEL_REVISION,
-            self._TLV_CODE_PLATFORM_NAME,
-            self._TLV_CODE_ONIE_VERSION,
-            self._TLV_CODE_MAC_SIZE,
-            self._TLV_CODE_MANUF_NAME,
-            self._TLV_CODE_MANUF_COUNTRY,
-            self._TLV_CODE_VENDOR_NAME,
-            self._TLV_CODE_DIAG_VERSION,
-            self._TLV_CODE_SERVICE_TAG,
-            self._TLV_CODE_VENDOR_EXT,
-            self._TLV_CODE_CRC_32
-        ]
-
-        for code in tlvinfo_type_codes_list:
-            code_str = "0x{:X}".format(code)
-            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
-        return eeprom_data
-
-    def get_eeprom(self):
-        return self._valid_tlv(self._eeprom)
-
-    def get_pn(self):
-        return self._eeprom.get('0x22', NULL)
-        
-    def get_serial(self):
-        return self._eeprom.get('0x23', NULL)
-
-    def get_mac(self):
-        return self._eeprom.get('0x24', NULL)
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
index 6ed25df58d36..a9f35d367ccb 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan.py
@@ -15,9 +15,10 @@
     raise ImportError(str(e) + "- required module not found")
 
 PSU_FAN_MAX_RPM = 26688
-CPLD_I2C_PATH = "/sys/bus/i2c/devices/3-0063/fan"
-PSU_HWMON_I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
-PSU_I2C_MAPPING = {
+SPEED_TOLERANCE = 15
+CPLD_FAN_I2C_PATH = "/sys/bus/i2c/devices/3-0063/fan"
+I2C_PATH ="/sys/bus/i2c/devices/{}-00{}/"
+PSU_HWMON_I2C_MAPPING = {
     0: {
         "num": 11,
         "addr": "58"
@@ -28,6 +29,20 @@
     },
 }
 
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "50"
+    },
+    1: {
+        "num": 12,
+        "addr": "53"
+    },
+}
+
+
+
 FAN_NAME_LIST = ["FAN-1F", "FAN-1R", "FAN-2F", "FAN-2R",
                  "FAN-3F", "FAN-3R", "FAN-4F", "FAN-4R", 
                  "FAN-5F", "FAN-5R"]
@@ -42,13 +57,18 @@ def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
         self.is_psu_fan = is_psu_fan
         if self.is_psu_fan:
             self.psu_index = psu_index
-            self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]['num']
-            self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]['addr']
-            self.psu_hwmon_path = PSU_HWMON_I2C_PATH.format(
+            self.psu_i2c_num = PSU_HWMON_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_HWMON_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_hwmon_path = I2C_PATH.format(
                 self.psu_i2c_num, self.psu_i2c_addr)
         
+            self.psu_i2c_num = PSU_CPLD_I2C_MAPPING[self.psu_index]['num']
+            self.psu_i2c_addr = PSU_CPLD_I2C_MAPPING[self.psu_index]['addr']
+            self.psu_cpld_path = I2C_PATH.format(
+                self.psu_i2c_num, self.psu_i2c_addr)
+
         FanBase.__init__(self)
-        
+
 
     def get_direction(self):
         """
@@ -60,9 +80,9 @@ def get_direction(self):
         
 
         if not self.is_psu_fan:
-            dir_str = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_direction')
+            dir_str = "{}{}{}".format(CPLD_FAN_I2C_PATH, self.fan_tray_index+1, '_direction')
             val=self._api_helper.read_txt_file(dir_str)
-            if val is not None:                
+            if val is not None:
                 if int(val, 10)==0:
                     direction=self.FAN_DIRECTION_EXHAUST
                 else:
@@ -97,19 +117,19 @@ def get_speed(self):
             psu_fan_path= "{}{}".format(self.psu_hwmon_path, 'psu_fan1_speed_rpm')
             fan_speed_rpm = self._api_helper.read_txt_file(psu_fan_path)
             if fan_speed_rpm is not None:
-                speed = (int(fan_speed_rpm,10))*100/26688               
+                speed = (int(fan_speed_rpm,10))*100/26688
                 if speed > 100:
                     speed=100
             else:
                 return 0
         elif self.get_presence():            
-            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            speed_path = "{}{}".format(CPLD_FAN_I2C_PATH, '_duty_cycle_percentage')
             speed=self._api_helper.read_txt_file(speed_path)
             if speed is None:
                 return 0
             	
         return int(speed)
-            
+
     def get_target_speed(self):
         """
         Retrieves the target (expected) speed of the fan
@@ -123,7 +143,7 @@ def get_target_speed(self):
             0   : when PWM mode is use
             pwm : when pwm mode is not use
         """
-        return False #Not supported
+        return self.get_speed()
 
     def get_speed_tolerance(self):
         """
@@ -132,7 +152,7 @@ def get_speed_tolerance(self):
             An integer, the percentage of variance from target speed which is
                  considered tolerable
         """
-        return False #Not supported
+        return SPEED_TOLERANCE
 
     def set_speed(self, speed):
         """
@@ -146,7 +166,7 @@ def set_speed(self, speed):
         """
         
         if not self.is_psu_fan and self.get_presence():            
-            speed_path = "{}{}".format(CPLD_I2C_PATH, '_duty_cycle_percentage')
+            speed_path = "{}{}".format(CPLD_FAN_I2C_PATH, '_duty_cycle_percentage')
             return self._api_helper.write_txt_file(speed_path, int(speed))
 
         return False
@@ -195,17 +215,18 @@ def get_presence(self):
         Returns:
             bool: True if FAN is present, False if not
         """
-        present_path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_present')
+        
+        
+        if self.is_psu_fan:
+            present_path="{}{}".format(self.psu_cpld_path, 'psu_present')
+        else:
+            present_path = "{}{}{}".format(CPLD_FAN_I2C_PATH, self.fan_tray_index+1, '_present')
+                    
         val=self._api_helper.read_txt_file(present_path)
-
-        if not self.is_psu_fan:
-            if val is not None:
-                return int(val, 10)==1
-            else:
-                return False
-            
+        if val is not None:
+            return int(val, 10)==1
         else:
-            return True
+            return False
 
     def get_status(self):
         """
@@ -221,7 +242,7 @@ def get_status(self):
             else:
                 return False
         else:    
-            path = "{}{}{}".format(CPLD_I2C_PATH, self.fan_tray_index+1, '_fault')
+            path = "{}{}{}".format(CPLD_FAN_I2C_PATH, self.fan_tray_index+1, '_fault')
             val=self._api_helper.read_txt_file(path)
             if val is not None:
                 return int(val, 10)==0
@@ -245,3 +266,25 @@ def get_serial(self):
             string: Serial number of device
         """
         return "N/A"
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return (self.fan_tray_index+1) \
+            if not self.is_psu_fan else (self.psu_index+1)
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True if not self.is_psu_fan else False
+
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan_drawer.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..17d339ee55f6
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/fan_drawer.py
@@ -0,0 +1,90 @@
+########################################################################
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the Fan-Drawers' information available in the platform.
+#
+########################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+FANS_PER_FANTRAY = 2
+
+
+class FanDrawer(FanDrawerBase):
+    """Platform-specific Fan class"""
+
+    def __init__(self, fantray_index):
+
+        FanDrawerBase.__init__(self)
+        # FanTray is 0-based in platforms
+        self.fantrayindex = fantray_index
+        self.__initialize_fan_drawer()
+        
+
+    def __initialize_fan_drawer(self):
+        from sonic_platform.fan import Fan
+        for i in range(FANS_PER_FANTRAY):
+            self._fan_list.append(Fan(self.fantrayindex, i))
+
+    def get_name(self):
+        """
+        Retrieves the fan drawer name
+        Returns:
+            string: The name of the device
+        """
+        return "FanTray{}".format(self.fantrayindex+1)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._fan_list[0].get_model()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return self._fan_list[0].get_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return (self.fantrayindex+1)
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
index 4cd60ac90611..b124ca29f0df 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/helper.py
@@ -51,7 +51,7 @@ def run_interactive_command(self, cmd):
 
     def read_txt_file(self, file_path):
         try:
-            with open(file_path, 'r') as fd:
+            with open(file_path, 'r', errors='replace') as fd:
                 data = fd.read()
                 return data.strip()
         except IOError:
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
index a35febb6527a..330d188abffb 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/psu.py
@@ -251,3 +251,20 @@ def get_serial(self):
         if serial is None:
             return "N/A"
         return serial
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return self.index+1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
index 08e67519b2c9..145f67e2111e 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py
@@ -1253,3 +1253,20 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         return self.get_presence() and self.get_transceiver_bulk_status()
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return self.port_num
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
index c500a72e1bac..4638d803ea63 100644
--- a/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
+++ b/device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/thermal.py
@@ -15,21 +15,56 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+PSU_I2C_PATH = "/sys/bus/i2c/devices/{}-00{}/"
+PSU_HWMON_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "58"
+    },
+    1: {
+        "num": 12,
+        "addr": "5b"
+    },
+}
+
+PSU_CPLD_I2C_MAPPING = {
+    0: {
+        "num": 11,
+        "addr": "50"
+    },
+    1: {
+        "num": 12,
+        "addr": "53"
+    },
+}
+
 
 class Thermal(ThermalBase):
     """Platform-specific Thermal class"""
 
     THERMAL_NAME_LIST = []
+    PSU_THERMAL_NAME_LIST = []
     SYSFS_PATH = "/sys/bus/i2c/devices"
 
-    def __init__(self, thermal_index=0):
+    def __init__(self, thermal_index=0, is_psu=False, psu_index=0):
         self.index = thermal_index
-
+        self.is_psu = is_psu
+        self.psu_index = psu_index
+
+        if self.is_psu:
+            psu_i2c_bus = PSU_HWMON_I2C_MAPPING[psu_index]["num"]
+            psu_i2c_addr = PSU_HWMON_I2C_MAPPING[psu_index]["addr"]
+            self.psu_hwmon_path = PSU_I2C_PATH.format(psu_i2c_bus,
+                                                      psu_i2c_addr)
+            psu_i2c_bus = PSU_CPLD_I2C_MAPPING[psu_index]["num"]
+            psu_i2c_addr = PSU_CPLD_I2C_MAPPING[psu_index]["addr"]
+            self.cpld_path = PSU_I2C_PATH.format(psu_i2c_bus, psu_i2c_addr)
         # Add thermal name
         self.THERMAL_NAME_LIST.append("Temp sensor 1")
         self.THERMAL_NAME_LIST.append("Temp sensor 2")
-        self.THERMAL_NAME_LIST.append("Temp sensor 3")        
-        self.THERMAL_NAME_LIST.append("Temp sensor 4")
+        self.THERMAL_NAME_LIST.append("Temp sensor 3")
+        self.PSU_THERMAL_NAME_LIST.append("PSU-1 temp sensor 1")
+        self.PSU_THERMAL_NAME_LIST.append("PSU-2 temp sensor 1")
 
         # Set hwmon path
         i2c_path = {
@@ -38,7 +73,7 @@ def __init__(self, thermal_index=0):
             2: "20-0049/hwmon/hwmon*/",
             3: "21-004a/hwmon/hwmon*/"
         }.get(self.index, None)
-          
+
         self.hwmon_path = "{}/{}".format(self.SYSFS_PATH, i2c_path)
         self.ss_key = self.THERMAL_NAME_LIST[self.index]
         self.ss_index = 1
@@ -51,20 +86,23 @@ def __read_txt_file(self, file_path):
                     return data
             except IOError as e:
                 pass
-        
+
         return None
         
-            
     def __get_temp(self, temp_file):
-        temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        if not self.is_psu:
+            temp_file_path = os.path.join(self.hwmon_path, temp_file)
+        else:
+            temp_file_path = temp_file
         raw_temp = self.__read_txt_file(temp_file_path)
         if raw_temp is not None:
             return float(raw_temp)/1000
         else:
-            return 0
-        
+            return 0        
 
     def __set_threshold(self, file_name, temperature):
+        if self.is_psu:
+            return True
         temp_file_path = os.path.join(self.hwmon_path, file_name)
         for filename in glob.glob(temp_file_path):
             try:
@@ -84,7 +122,11 @@ def get_temperature(self):
             A float number of current temperature in Celsius up to nearest thousandth
             of one degree Celsius, e.g. 30.125
         """
-        temp_file = "temp{}_input".format(self.ss_index)
+        if not self.is_psu:
+            temp_file = "temp{}_input".format(self.ss_index)
+        else:
+            temp_file = self.psu_hwmon_path + "psu_temp1_input"
+
         return self.__get_temp(temp_file)
 
     def get_high_threshold(self):
@@ -94,6 +136,9 @@ def get_high_threshold(self):
             A float number, the high threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
+        if self.is_psu:
+            return 0
+
         temp_file = "temp{}_max".format(self.ss_index)
         return self.__get_temp(temp_file)
 
@@ -118,7 +163,10 @@ def get_name(self):
             Returns:
             string: The name of the thermal device
         """
-        return self.THERMAL_NAME_LIST[self.index]
+        if self.is_psu:
+            return self.PSU_THERMAL_NAME_LIST[self.psu_index]
+        else:
+            return self.THERMAL_NAME_LIST[self.index]
 
     def get_presence(self):
         """
@@ -126,6 +174,9 @@ def get_presence(self):
         Returns:
             bool: True if Thermal is present, False if not
         """
+        if self.is_psu:
+            val = self.__read_txt_file(self.cpld_path + "psu_present")
+            return int(val, 10) == 1
         temp_file = "temp{}_input".format(self.ss_index)
         temp_file_path = os.path.join(self.hwmon_path, temp_file)
         raw_txt = self.__read_txt_file(temp_file_path)
@@ -140,11 +191,49 @@ def get_status(self):
         Returns:
             A boolean value, True if device is operating properly, False if not
         """
+        if self.is_psu:
+            temp_file = self.psu_hwmon_path + "psu_temp_fault"
+            return self.get_presence() and (not int(
+                self.__read_txt_file(temp_file)))
 
         file_str = "temp{}_input".format(self.ss_index)
         file_path = os.path.join(self.hwmon_path, file_str)
         raw_txt = self.__read_txt_file(file_path)
         if raw_txt is None:
             return False
-        else:     
+        else:
             return int(raw_txt) != 0
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+
+        return "N/A"
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return "N/A"
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Retrieves whether thermal module is replaceable
+        Returns:
+            A boolean value, True if replaceable, False if not
+        """
+        return False
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/system_health_monitoring_config.json b/device/accton/x86_64-accton_as5835_54x-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..5f3b3b07e73f
--- /dev/null
+++ b/device/accton/x86_64-accton_as5835_54x-r0/system_health_monitoring_config.json
@@ -0,0 +1,15 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [
+        "asic",
+	    "psu.temperature"
+	    
+    ],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "STATUS_LED_COLOR_AMBER",
+        "normal": "STATUS_LED_COLOR_GREEN",
+        "booting": "STATUS_LED_COLOR_GREEN"
+    }
+}
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
index 9753a46e436b..25faba378181 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/utils/accton_as5835_54x_util.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2019 Accton Networks, Inc.
 #
@@ -17,24 +17,18 @@
 
 """
 Usage: %(scriptName)s [options] command object
-
 options:
     -h | --help     : this help message
     -d | --debug    : run with debug mode
     -f | --force    : ignore error during installation or clean
 command:
     install     : install drivers and generate related sysfs nodes
-    clean       : uninstall drivers and remove related sysfs nodes
-    show        : show all systen status
-    sff         : dump SFP eeprom
-    set         : change board setting with fan|led|sfp
+    clean       : uninstall drivers and remove related sysfs nodes    
 """
-
-import commands
+import subprocess
 import getopt
 import sys
 import logging
-import re
 import time
 import os
 
@@ -47,15 +41,15 @@
 DEBUG = False
 args = []
 ALL_DEVICE = {}
-DEVICE_NO = {'led':5, 'fan':5,'thermal':4, 'psu':2, 'sfp':54}
 FORCE = 0
+
 #logging.basicConfig(filename= PROJECT_NAME+'.log', filemode='w',level=logging.DEBUG)
 #logging.basicConfig(level=logging.INFO)
 
 
 if DEBUG == True:
-    print sys.argv[0]
-    print 'ARGV      :', sys.argv[1:]
+    print(sys.argv[0])
+    print("ARGV      :", sys.argv[1:])
 
 
 def main():
@@ -71,9 +65,9 @@ def main():
                                                        'force',
                                                           ])
     if DEBUG == True:
-        print options
-        print args
-        print len(sys.argv)
+        print(options)
+        print(args)
+        print(len(sys.argv))
 
     for opt, arg in options:
         if opt in ('-h', '--help'):
@@ -94,22 +88,7 @@ def main():
            do_sonic_platform_install()
         elif arg == 'api_clean':   
            do_sonic_platform_clean()
-        elif arg == 'show':
-           device_traversal()
-        elif arg == 'sff':
-            if len(args)!=2:
-                show_eeprom_help()
-            elif int(args[1]) ==0 or int(args[1]) > DEVICE_NO['sfp']:
-                show_eeprom_help()
-            else:
-                show_eeprom(args[1])
-            return
-        elif arg == 'set':
-            if len(args)<3:
-                show_set_help()
-            else:
-                set_device(args[1:])
-            return
+        
         else:
             show_help()
 
@@ -117,30 +96,18 @@ def main():
     return 0
 
 def show_help():
-    print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
+    print(__doc__ % {'scriptName' : sys.argv[0].split("/")[-1]})
     sys.exit(0)
 
-def  show_set_help():
-    cmd =  sys.argv[0].split("/")[-1]+ " "  + args[0]
-    print  cmd +" [led|sfp|fan]"
-    print  "    use \""+ cmd + " led 0-4 \"  to set led color"
-    print  "    use \""+ cmd + " fan 0-100\" to set fan duty percetage"
-    print  "    use \""+ cmd + " sfp 1-48 {0|1}\" to set sfp# tx_disable"
-    sys.exit(0)
-
-def  show_eeprom_help():
-    cmd =  sys.argv[0].split("/")[-1]+ " "  + args[0]
-    print  "    use \""+ cmd + " 1-54 \" to dump sfp# eeprom"
-    sys.exit(0)
 
 def my_log(txt):
     if DEBUG == True:
-        print "[Debug]"+txt
+        print("[Debug]"+txt)
     return
 
 def log_os_system(cmd, show):
     logging.info('Run :'+cmd)
-    status, output = commands.getstatusoutput(cmd)
+    status, output = subprocess.getstatusoutput(cmd)
     my_log (cmd +"with result:" + str(status))
     my_log ("      output:"+output)
     if status:
@@ -177,6 +144,8 @@ def driver_install():
         if ret[0]:
             if FORCE == 0:
                 return ret[0]
+    print("Done driver_install")
+    
     return 0
 
 def driver_uninstall():
@@ -194,12 +163,8 @@ def driver_uninstall():
                 return ret[0]
     return 0
 
-led_prefix ='/sys/class/leds/'+PROJECT_NAME+'_led::'
-hwmon_types = {'led': ['diag','fan','loc','psu1','psu2']}
-hwmon_nodes = {'led': ['brightness'] }
-hwmon_prefix ={'led': led_prefix}
-
 i2c_prefix = '/sys/bus/i2c/devices/'
+'''
 i2c_bus = {'fan': ['3-0063']                 ,
            'thermal': ['18-004b','19-004c', '20-0049', '21-004a'] ,
            'psu': ['11-0050','12-0053'],
@@ -208,7 +173,7 @@ def driver_uninstall():
            'thermal': ['hwmon/hwmon*/temp1_input'] ,
            'psu': ['psu_present ', 'psu_power_good']    ,
            'sfp': ['module_present_', 'module_tx_disable_']}
-
+'''
 sfp_map =  [42,43,44,45,46,47,48,49,50,51,
             52,53,54,55,56,57,58,59,60,61,
             62,63,64,65,66,67,68,69,70,71,
@@ -303,7 +268,7 @@ def device_install():
             status, output = log_os_system(mknod2[i], 1)
             time.sleep(0.01)
             if status:
-                print output
+                print(output)
                 if FORCE == 0:
                     return status
     else:
@@ -314,7 +279,7 @@ def device_install():
 
             status, output = log_os_system(mknod[i], 1)
             if status:
-                print output
+                print(output)
                 if FORCE == 0:
                     return status
 
@@ -327,9 +292,11 @@ def device_install():
         else:
             status, output =log_os_system("echo optoe1 0x50 > /sys/bus/i2c/devices/i2c-"+str(sfp_map[i])+"/new_device", 1)
         if status:
-            print output
+            print(output)
             if FORCE == 0:
                 return status
+    print("Done device_install")
+    
     return
 
 def device_uninstall():
@@ -339,7 +306,7 @@ def device_uninstall():
         target = "/sys/bus/i2c/devices/i2c-"+str(sfp_map[i])+"/delete_device"
         status, output =log_os_system("echo 0x50 > "+ target, 1)
         if status:
-            print output
+            print(output)
             if FORCE == 0:
                 return status
 
@@ -356,7 +323,7 @@ def device_uninstall():
         temp[-1] = temp[-1].replace('new_device', 'delete_device')
         status, output = log_os_system(" ".join(temp), 1)
         if status:
-            print output
+            print(output)
             if FORCE == 0:
                 return status
 
@@ -381,10 +348,10 @@ def do_sonic_platform_install():
         if os.path.exists(SONIC_PLATFORM_BSP_WHL_PKG_PY3): 
             status, output = log_os_system("pip3 install "+ SONIC_PLATFORM_BSP_WHL_PKG_PY3, 1)
             if status:
-                print "Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3)
+                print("Error: Failed to install {}".format(PLATFORM_API2_WHL_FILE_PY3) )
                 return status
             else:
-                print "Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3)
+                print("Successfully installed {} package".format(PLATFORM_API2_WHL_FILE_PY3) )
         else:
             print('{} is not found'.format(PLATFORM_API2_WHL_FILE_PY3))
     else:        
@@ -406,43 +373,43 @@ def do_sonic_platform_clean():
             print('{} is uninstalled'.format(PLATFORM_API2_WHL_FILE_PY3))
 
 def do_install():
-    print "Checking system...."
+    print("Checking system....")
     if driver_check() == False:
-        print "No driver, installing...."
+        print("No driver, installing....")
         status = driver_install()
         if status:
             if FORCE == 0:
                 return  status
     else:
-        print PROJECT_NAME.upper()+" drivers detected...."
+        print(PROJECT_NAME.upper()+" drivers detected....")
     if not device_exist():
-        print "No device, installing...."
+        print("No device, installing....")
         status = device_install()
         if status:
             if FORCE == 0:
                 return  status
     else:
-        print PROJECT_NAME.upper()+" devices detected...."
+        print(PROJECT_NAME.upper()+" devices detected....")
 
     do_sonic_platform_install()
 
     return
 
 def do_uninstall():
-    print "Checking system...."
+    print("Checking system....")
     if not device_exist():
-        print PROJECT_NAME.upper() +" has no device installed...."
+        print(PROJECT_NAME.upper() +" has no device installed....")
     else:
-        print "Removing device...."
+        print("Removing device....")
         status = device_uninstall()
         if status:
             if FORCE == 0:
                 return  status
 
     if driver_check()== False :
-        print PROJECT_NAME.upper() +" has no driver installed...."
+        print(PROJECT_NAME.upper() +" has no driver installed....")
     else:
-        print "Removing installed driver...."
+        print("Removing installed driver....")
         status = driver_uninstall()
         if status:
             if FORCE == 0:
@@ -452,185 +419,6 @@ def do_uninstall():
 
     return
 
-def devices_info():
-    global DEVICE_NO
-    global ALL_DEVICE
-    global i2c_bus, hwmon_types
-    for key in DEVICE_NO:
-        ALL_DEVICE[key]= {}
-        for i in range(0,DEVICE_NO[key]):
-            ALL_DEVICE[key][key+str(i+1)] = []
-
-    for key in i2c_bus:
-        buses = i2c_bus[key]
-        nodes = i2c_nodes[key]
-        for i in range(0,len(buses)):
-            for j in range(0,len(nodes)):
-                if  'fan' == key:
-                    for k in range(0,DEVICE_NO[key]):
-                        node = key+str(k+1)
-                        path = i2c_prefix+ buses[i]+"/fan"+str(k+1)+"_"+ nodes[j]
-                        my_log(node+": "+ path)
-                        ALL_DEVICE[key][node].append(path)
-                elif  'sfp' == key:
-                    for k in range(0,DEVICE_NO[key]):
-                        for lk in cpld_of_module:
-                            if k in cpld_of_module[lk]:
-                                node = key+str(k+1)
-                                path = i2c_prefix + lk + "/"+ nodes[j] + str(k+1)
-                                my_log(node+": "+ path)
-                                ALL_DEVICE[key][node].append(path)
-                else:
-                    node = key+str(i+1)
-                    path = i2c_prefix+ buses[i]+"/"+ nodes[j]
-                    my_log(node+": "+ path)
-                    ALL_DEVICE[key][node].append(path)
-
-    for key in hwmon_types:
-        itypes = hwmon_types[key]
-        nodes = hwmon_nodes[key]
-        for i in range(0,len(itypes)):
-            for j in range(0,len(nodes)):
-                node = key+"_"+itypes[i]
-                path = hwmon_prefix[key]+ itypes[i]+"/"+ nodes[j]
-                my_log(node+": "+ path)
-                ALL_DEVICE[key][ key+str(i+1)].append(path)
-
-    #show dict all in the order
-    if DEBUG == True:
-        for i in sorted(ALL_DEVICE.keys()):
-            print(i+": ")
-            for j in sorted(ALL_DEVICE[i].keys()):
-                print("   "+j)
-                for k in (ALL_DEVICE[i][j]):
-                    print("   "+"   "+k)
-    return
-
-def show_eeprom(index):
-    if system_ready()==False:
-        print("System's not ready.")
-        print("Please install first!")
-        return
-
-    if len(ALL_DEVICE)==0:
-        devices_info()
-    node = ALL_DEVICE['sfp'] ['sfp'+str(index)][0]
-    node = node.replace(node.split("/")[-1], 'sfp_eeprom')
-    # check if got hexdump command in current environment
-    ret, log = log_os_system("which hexdump", 0)
-    ret, log2 = log_os_system("which busybox hexdump", 0)
-    if log :
-        hex_cmd = 'hexdump'
-    elif log2 :
-        hex_cmd = ' busybox hexdump'
-    else:
-        log = 'Failed : no hexdump cmd!!'
-        logging.info(log)
-        print log
-        return 1
-
-    print node + ":"
-    ret, log = log_os_system("cat "+node+"| "+hex_cmd+" -C", 1)
-    if ret==0:
-        print  log
-    else:
-        print "**********device no found**********"
-    return
-
-def set_device(args):
-    global DEVICE_NO
-    global ALL_DEVICE
-    if system_ready()==False:
-        print("System's not ready.")
-        print("Please install first!")
-        return
-
-    if len(ALL_DEVICE)==0:
-        devices_info()
-
-    if args[0]=='led':
-        if int(args[1])>4:
-            show_set_help()
-            return
-        #print  ALL_DEVICE['led']
-        for i in range(0,len(ALL_DEVICE['led'])):
-            for k in (ALL_DEVICE['led']['led'+str(i+1)]):
-                ret = log_os_system("echo "+args[1]+" >"+k, 1)
-                if ret[0]:
-                    return ret[0]
-    elif args[0]=='fan':
-        if int(args[1])>100:
-            show_set_help()
-            return
-        #print  ALL_DEVICE['fan']
-        #fan1~5 is all fine, all fan share same setting
-        node = ALL_DEVICE['fan'] ['fan1'][0]
-        node = node.replace(node.split("/")[-1], 'fan_duty_cycle_percentage')
-        ret = log_os_system("cat "+ node, 1)
-        if ret[0] == 0:
-            print ("Previous fan duty: " + log.strip() +"%")
-        ret = log_os_system("echo "+args[1]+" >"+node, 1)
-        if ret[0] == 0:
-            print ("Current fan duty: " + args[1] +"%")
-        return ret[0]
-    elif args[0]=='sfp':
-        if int(args[1])> qsfp_start or int(args[1])==0:
-            show_set_help()
-            return
-        if len(args)<2:
-            show_set_help()
-            return
-
-        if int(args[2])>1:
-            show_set_help()
-            return
-
-        #print  ALL_DEVICE[args[0]]
-        for i in range(0,len(ALL_DEVICE[args[0]])):
-            for j in ALL_DEVICE[args[0]][args[0]+str(args[1])]:
-                if j.find('tx_disable')!= -1:
-                    ret = log_os_system("echo "+args[2]+" >"+ j, 1)
-                    if ret[0]:
-                        return ret[0]
-
-    return
-
-#get digits inside a string.
-#Ex: 31 for "sfp31"
-def get_value(input):
-    digit = re.findall('\d+', input)
-    return int(digit[0])
-
-def device_traversal():
-    if system_ready()==False:
-        print("System's not ready.")
-        print("Please install first!")
-        return
-
-    if len(ALL_DEVICE)==0:
-        devices_info()
-    for i in sorted(ALL_DEVICE.keys()):
-        print("============================================")
-        print(i.upper()+": ")
-        print("============================================")
-
-        for j in sorted(ALL_DEVICE[i].keys(), key=get_value):
-            print "   "+j+":",
-            for k in (ALL_DEVICE[i][j]):
-                ret, log = log_os_system("cat "+k, 0)
-                func = k.split("/")[-1].strip()
-                func = re.sub(j+'_','',func,1)
-                func = re.sub(i.lower()+'_','',func,1)
-                if ret==0:
-                    print func+"="+log+" ",
-                else:
-                    print func+"="+"X"+" ",
-            print
-            print("----------------------------------------------------------------")
-
-
-        print
-    return
 
 def device_exist():
     ret1 = log_os_system("ls "+i2c_prefix+"*0077", 0)

From be6cd44ddf584163c9fa5b66c66e04b2552e2a4d Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Fri, 23 Jul 2021 03:00:16 +0300
Subject: [PATCH 0661/1674] Update SDK\FW to version 4.4.3222\2008.3224 (#8247)

*Update SDK\FW Version to 4.4.3222\2008.3224.

Signed-off-by: Dror Prital <drorp@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 1e74002e458a..0b8768b4755f 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3218
+MLNX_SPC_FW_VERSION = 13.2008.3224
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3218
+MLNX_SPC2_FW_VERSION = 29.2008.3224
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3218
+MLNX_SPC3_FW_VERSION = 30.2008.3224
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 88a244e9f388..3a0e3a26de2e 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 88a244e9f3880aae7641cc61951cae98a8d096d4
+Subproject commit 3a0e3a26de2e1384b7ed216dc4cd842b36655e27
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 9690d2d06ea6..67f8ab3fced9 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.3216
+MLNX_SDK_VERSION = 4.4.3222
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 67202cc2bb8a79297f793750182f706a551aab33 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Wed, 14 Jul 2021 11:37:00 -0700
Subject: [PATCH 0662/1674] autorestart inside restapi docker is disabled
 (#8006)

Fix issue with critical process in the restapi docker restarting immediately after getting killed
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 dockers/docker-sonic-restapi/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index 4286a6dd3ec3..a873ba03d7da 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -43,7 +43,7 @@ dependent_startup_wait_for=rsyslogd:running
 command=/usr/bin/restapi.sh
 priority=1
 autostart=false
-autorestart=true
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true

From 84dcc9d0867922bec29d6999c1aaf8dba160d105 Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Sun, 25 Jul 2021 01:33:25 +0200
Subject: [PATCH 0663/1674] [DellEmc] Fix port lanes for 10G ports on
 alternative S5232 SKUs (#8208)

Backport the fix (444cede11) that was made for the default SKU to the alternative SKUs.

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 .../DellEMC-S5232f-P-100G/port_config.ini                     | 4 ++--
 .../DellEMC-S5232f-P-10G/port_config.ini                      | 4 ++--
 .../DellEMC-S5232f-P-25G/port_config.ini                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/port_config.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/port_config.ini
index 55c8fb3dcf64..2b24bea93107 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/port_config.ini
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/port_config.ini
@@ -31,5 +31,5 @@ Ethernet112     113,114,115,116       hundredGigE1/29    29	100000
 Ethernet116     117,118,119,120       hundredGigE1/30    30	100000
 Ethernet120     121,122,123,124       hundredGigE1/31    31	100000
 Ethernet124     125,126,127,128       hundredGigE1/32    32	100000
-Ethernet128     128                   tenGigE1/33        33	10000
-Ethernet129     129                   tenGigE1/34        34	10000
+Ethernet128     129                   tenGigE1/33        33	10000
+Ethernet129     128                   tenGigE1/34        34	10000
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/port_config.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/port_config.ini
index 726427759c08..c38b0e9b6f84 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/port_config.ini
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/port_config.ini
@@ -103,5 +103,5 @@ Ethernet112     113,114,115,116       hundredGigE1/29  29	100000
 Ethernet116     117,118,119,120       hundredGigE1/30  30	100000
 Ethernet120     121,122,123,124       hundredGigE1/31  31	100000
 Ethernet124     125,126,127,128       hundredGigE1/32  32	100000
-Ethernet128     128                   tenGigE1/33      33	10000
-Ethernet129     129                   tenGigE1/34      34	10000
+Ethernet128     129                   tenGigE1/33      33	10000
+Ethernet129     128                   tenGigE1/34      34	10000
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/port_config.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/port_config.ini
index 7366a95cf8b8..e78fafdc24e0 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/port_config.ini
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/port_config.ini
@@ -103,5 +103,5 @@ Ethernet112     113,114,115,116       hundredGigE1/29         29       100000
 Ethernet116     117,118,119,120       hundredGigE1/30         30       100000
 Ethernet120     121,122,123,124       hundredGigE1/31         31       100000
 Ethernet124     125,126,127,128       hundredGigE1/32         32       100000
-Ethernet128     128                   tenGigE1/33             33       10000
-Ethernet129     129                   tenGigE1/34             34       10000
+Ethernet128     129                   tenGigE1/33             33       10000
+Ethernet129     128                   tenGigE1/34             34       10000

From 45e100b61bde28e289b75eb139819dcce1585759 Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Mon, 26 Jul 2021 18:43:42 +0300
Subject: [PATCH 0664/1674] [Mellanox][pcied] Ignore bus on pcie.yaml for
 Mellanox switches (#8063)

Why I did it
BIOS upgrade on rare cases cannot guarantee bus value remain the same on every BIOS release. Ignoring this field in order for pcied not to fail but still verify device id in a different way. The solution is future proof and will not require changes in code when new BIOS version is available

How I did it
Since bus is not a fixed value (it is determined by the bios version) we are ignoring this field, and instead checking if there is a device that match on all other fields that and in addition has a matching device id.

How to verify it
Verify no errors or failures in pcied on different BIOS version with the same code base.
---
 .../mlnx-platform-api/sonic_platform/pcie.py  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py b/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py
new file mode 100644
index 000000000000..f7c8150d50c4
--- /dev/null
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py
@@ -0,0 +1,69 @@
+########################################################################
+#
+# Copyright (C) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+# Module contains a platform specific implementation of SONiC Platform
+# Base PCIe class
+#
+########################################################################
+import os
+import re
+
+try:
+    from sonic_platform_base.sonic_pcie.pcie_common import PcieUtil
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+SYSFS_PCI_DEVICE_PATH = '/sys/bus/pci/devices/'
+
+
+class Pcie(PcieUtil):
+    # check the current PCIe device with config file and return the result
+    # use bus from _device_id_to_bus_map instead of from yaml file
+    def get_pcie_check(self):
+        self.load_config_file()
+        for item_conf in self.confInfo:
+            id_conf = item_conf["id"]
+            dev_conf = item_conf["dev"]
+            fn_conf = item_conf["fn"]
+            bus_conf = self._device_id_to_bus_map.get(id_conf)
+            if bus_conf and self.check_pcie_sysfs(bus=int(bus_conf, base=16), device=int(dev_conf, base=16),
+                                                  func=int(fn_conf, base=16)):
+                item_conf["result"] = "Passed"
+            else:
+                item_conf["result"] = "Failed"
+        return self.confInfo
+
+    # Create
+    def _create_device_id_to_bus_map(self):
+        self._device_id_to_bus_map = {}
+        self.load_config_file()
+        device_folders = os.listdir(SYSFS_PCI_DEVICE_PATH)
+        for folder in device_folders:
+            # For each folder in the sysfs tree we check if it matches the normal PCIe device folder pattern,
+            # If match we add the device id from the device file and the bus from the folder name to the map
+            #
+            # Example for device folder name: 0000:ff:0b.1
+            #
+            # The folder name is built from:
+            #   4 hex digit of domain
+            #   colon ':'
+            #   2 hex digit of bus - this is what we are looking for
+            #   colon ':'
+            #   2 hex digit of id
+            #   dot '.'
+            #   1 digit of fn
+            pattern_for_device_folder = re.search('....:(..):..\..', folder)
+            if pattern_for_device_folder:
+                bus = pattern_for_device_folder.group(1)
+                with open(os.path.join('/sys/bus/pci/devices', folder, 'device'), 'r') as device_file:
+                    # The 'device' file contain an hex repesantaion of the id key in the yaml file.
+                    # Example of the file contact:
+                    # 0x6fe2
+                    # We will strip the new line character, and remove the 0x prefix that is not needed.
+                    device_id = device_file.read().strip().replace('0x', '')
+                    self._device_id_to_bus_map[device_id] = bus
+
+    def __init__(self, platform_path):
+        PcieUtil.__init__(self, platform_path)
+        self._create_device_id_to_bus_map()

From a8a6d40a14a050e67c9675eb711ac23689e233c7 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Tue, 27 Jul 2021 03:49:34 -0700
Subject: [PATCH 0665/1674] [Submodule update:202012] sonic-platform-common,
 sonic-platform-daemons (#8262)

sonic-platform-daemons:
* c90bb29 [202012] Refactor Pcied and add unittest (Azure/sonic-platform-daemons#199)

sonic-platform-common:
* 9a59e19 Revert "Unifying the platform api for get_pcie_aer_stats with PcieBase (Azure/sonic-platform-common#197)" (Azure/sonic-platform-common#207)
* d35960b Revert "Revert "Unifying the platform api for get_pcie_aer_stats with PcieBase (Azure/sonic-platform-common#197)" (Azure/sonic-platform-common#207)" (Azure/sonic-platform-common#210)
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 063e91581bdc..d35960b2cf96 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 063e91581bdcf9167db83f0fb6a233c7c3196a45
+Subproject commit d35960b2cf96ac0e1f6ed34efca1bf68a9018606
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 664f0e256d68..c90bb2987707 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 664f0e256d68a54b28bf2de3b8cacb65cc5840c4
+Subproject commit c90bb2987707c20bbbcb175bcc6b45e8114e883d

From 9642ea0bb9b9df9ab5e8897eb6a7d8c7bb9b609e Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 01:27:15 -0700
Subject: [PATCH 0666/1674] [sonic-swss-common] Update submodule (#8272)

Includes below commits
```
bf8c832 2021-07-22 | Fix DBInterface blocking operations (#505) (HEAD -> 202012, origin/202012) [Qi Luo]
0e9385f 2021-04-21 | [swig] Implement SonicV2Connector.hmset() (#480) [Qi Luo]
76be49f 2021-07-25 | Modify the hardcode separator ":" to variable. (#473) [PJHsieh]
142ae3c 2021-06-23 | Fix config prompt question issue (#500) [xumia]
e7bebe1 2021-06-14 | Fix repo reference issue (#487) [xumia]
```
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index fb08c1ff0273..bf8c832cf1c7 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit fb08c1ff0273e37427f131770d3671a5cde3eccf
+Subproject commit bf8c832cf1c7a6e72d7b1c843888ffb4a27088c8

From cdbcf7da47feff0873dc329459a4de7755ae065b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 28 Jul 2021 16:44:24 +0800
Subject: [PATCH 0667/1674] [ci/build]: Upgrade SONiC package versions (#8256)

---
 .../versions-deb-buster                       | 36 +++++------
 .../build-sonic-slave-buster/versions-git     |  4 +-
 files/build/versions/default/versions-docker  |  8 +--
 files/build/versions/default/versions-git     |  6 +-
 .../docker-base-buster/versions-deb-buster    |  8 +--
 .../versions-deb-buster-arm64                 |  1 -
 .../versions-deb-buster-armhf                 |  1 -
 .../docker-gbsyncd-vs/versions-deb-buster     | 23 +-------
 .../versions-deb-buster                       | 18 +++---
 .../versions-deb-buster-arm64                 |  1 -
 .../versions-deb-buster-armhf                 |  1 -
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 59 +++++++++++++------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../docker-syncd-vs/versions-deb-buster       | 23 +-------
 .../versions-deb-buster-arm64                 |  7 ---
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-buster-armhf                 |  7 ---
 .../versions-py3-all-armhf                    |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../versions-deb-stretch-arm64                |  7 +--
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                |  7 +--
 .../versions-py3-all-armhf                    |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   | 10 ++--
 .../host-image/versions-deb-buster-arm64      |  4 ++
 .../host-image/versions-deb-buster-armhf      |  4 ++
 30 files changed, 109 insertions(+), 146 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
 delete mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 92730cde7abd..d0e6fb054888 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3216
-applibs-dev==1.mlnx.4.4.3216
+applibs==1.mlnx.4.4.3222
+applibs-dev==1.mlnx.4.4.3222
 bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
@@ -8,7 +8,7 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2-dev==1.mlnx.4.4.3216
+iproute2-dev==1.mlnx.4.4.3222
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
 libatk-bridge2.0-dev==2.30.0-5
@@ -77,6 +77,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
+mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
@@ -87,24 +88,23 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.3216
-sx-acl-helper-dev==1.mlnx.4.4.3216
-sx-complib==1.mlnx.4.4.3216
-sx-complib-dev==1.mlnx.4.4.3216
-sx-examples==1.mlnx.4.4.3216
-sx-examples-dev==1.mlnx.4.4.3216
-sx-gen-utils==1.mlnx.4.4.3216
-sx-gen-utils-dev==1.mlnx.4.4.3216
-sx-scew==1.mlnx.4.4.3216
-sx-scew-dev==1.mlnx.4.4.3216
-sxd-libs==1.mlnx.4.4.3216
-sxd-libs-dev==1.mlnx.4.4.3216
+sx-acl-helper==1.mlnx.4.4.3222
+sx-acl-helper-dev==1.mlnx.4.4.3222
+sx-complib==1.mlnx.4.4.3222
+sx-complib-dev==1.mlnx.4.4.3222
+sx-examples==1.mlnx.4.4.3222
+sx-examples-dev==1.mlnx.4.4.3222
+sx-gen-utils==1.mlnx.4.4.3222
+sx-gen-utils-dev==1.mlnx.4.4.3222
+sx-scew==1.mlnx.4.4.3222
+sx-scew-dev==1.mlnx.4.4.3222
+sxd-libs==1.mlnx.4.4.3222
+sxd-libs-dev==1.mlnx.4.4.3222
 syncd==1.0.0
-syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
-wjh-libs==1.mlnx.4.4.3216
-wjh-libs-dev==1.mlnx.4.4.3216
+wjh-libs==1.mlnx.4.4.3222
+wjh-libs-dev==1.mlnx.4.4.3222
 x11proto-composite-dev==1:2018.4-4
 x11proto-input-dev==2018.4-4
 x11proto-randr-dev==2018.4-4
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index ed8498330b13..51314d4e81f9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==98aa8df54a84e9d6e21fcb82750a8e90c25e761f
+https://github.com/jeroennijhof/pam_tacplus.git==b2ae0ee763936fd0d72bb9673108f98a6824c7a2
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==a90280faa5f2383148498b98d8f3c84dcfd4ee81
+https://salsa.debian.org/kernel-team/ethtool/==be6cd44ddf584163c9fa5b66c66e04b2552e2a4d
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 0b54d2b93b0a..8ac70a3e2147 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
 amd64:debian:buster==sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2
 amd64:debian:stretch==sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2b45312ae503cea4ba286dbdbb14512865488f3a3e8cc702efc9e662f300b2fe
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:eed3f2c48700f15058be5dfb90beb21d3ae890f8fa592e253133b7f1e4481e87
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:c024d8233083165c079d3bbc3e336029eb8d2a147b9340ff9f259e7c902d089f
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:6aaf61a9942c6a1a4097389288182985974cefec9e574eb34797bd8b367a1dda
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:9cfe993f035d8a774e7ae147dd12a673f8db35c0e42f135221ff0b317b9f5731
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:1c80f6ff2d7253e0b774160273f45e39f7d1fbdf503ae4797f5ed41445536e65
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:b25fb12e70b8b55df8b96654d49e8536213faca1c1b113ea61ec2f3481be0b16
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:4574770026cff9fe17ff666f932c366a771ce4d6f6a6a8a02cb9e9e0710343bd
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index fc224d8f56d1..5a1c1147fb78 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,8 +1,8 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==98aa8df54a84e9d6e21fcb82750a8e90c25e761f
+https://github.com/jeroennijhof/pam_tacplus.git==b2ae0ee763936fd0d72bb9673108f98a6824c7a2
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==a90280faa5f2383148498b98d8f3c84dcfd4ee81
+https://salsa.debian.org/kernel-team/ethtool/==be6cd44ddf584163c9fa5b66c66e04b2552e2a4d
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 264f99f18d23..973c17fe48c1 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -11,14 +11,14 @@ libexpat1==2.2.6-2+deb10u1
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgssapi-krb5-2==1.17-3+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u2
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
-libk5crypto3==1.17-3+deb10u1
+libk5crypto3==1.17-3+deb10u2
 libkeyutils1==1.6-6
-libkrb5-3==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u2
+libkrb5support0==1.17-3+deb10u2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 9dbc175d3188..be7e3ca9ba14 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,4 +1,3 @@
-apt==1.8.2.3
 icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 9dbc175d3188..be7e3ca9ba14 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,4 +1,3 @@
-apt==1.8.2.3
 icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 04d9d17057db..cdeca7d09f45 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,25 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libpopt0==1.16-12
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
-libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index cb63192da75b..92f742a4e1cd 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3216
-applibs-dev==1.mlnx.4.4.3216
+applibs==1.mlnx.4.4.3222
+applibs-dev==1.mlnx.4.4.3222
 dmidecode==3.2-1
 ethtool==1:5.9-1
 fancontrol==1:3.5.0-3
@@ -67,7 +67,7 @@ openssh-client==1:7.9p1-10+deb10u2
 psmisc==23.2-1
 python==2.7.16-1
 python-minimal==2.7.16-1
-python-sdk-api==1.mlnx.4.4.3216
+python-sdk-api==1.mlnx.4.4.3222
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -82,12 +82,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.3216
-sx-complib-dev==1.mlnx.4.4.3216
-sx-gen-utils==1.mlnx.4.4.3216
-sx-gen-utils-dev==1.mlnx.4.4.3216
-sxd-libs==1.mlnx.4.4.3216
-sxd-libs-dev==1.mlnx.4.4.3216
+sx-complib==1.mlnx.4.4.3222
+sx-complib-dev==1.mlnx.4.4.3222
+sx-gen-utils==1.mlnx.4.4.3222
+sx-gen-utils-dev==1.mlnx.4.4.3222
+sxd-libs==1.mlnx.4.4.3222
+sxd-libs-dev==1.mlnx.4.4.3222
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
deleted file mode 100644
index 5b2de35bbfa1..000000000000
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
+++ /dev/null
@@ -1 +0,0 @@
-libudev1==241-7~deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
deleted file mode 100644
index 5b2de35bbfa1..000000000000
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
+++ /dev/null
@@ -1 +0,0 @@
-libudev1==241-7~deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index ca2ad4c20cd5..1f55921253d6 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.6
 pyang==2.5.0
 pyangbind==0.6.0
-python-sdk-api==4.4.3216
+python-sdk-api==4.4.3222
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 92b1eac46c34..8edce224c50f 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,2 +1,2 @@
-python-sdk-api==4.4.3216
+python_sdk_api==4.4.3222
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 0010438ef1bb..ae13d077f448 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,11 +1,22 @@
-applibs==1.mlnx.4.4.3216
-applibs-dev==1.mlnx.4.4.3216
-iproute2==1.mlnx.4.4.3216
-iproute2-dev==1.mlnx.4.4.3216
+applibs==1.mlnx.4.4.3222
+applibs-dev==1.mlnx.4.4.3222
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+iproute2==1.mlnx.4.4.3222
+iproute2-dev==1.mlnx.4.4.3222
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -15,16 +26,21 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.194-3
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
+openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.3216
+python-sdk-api==1.mlnx.4.4.3222
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -32,18 +48,23 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
-sx-acl-helper==1.mlnx.4.4.3216
-sx-acl-helper-dev==1.mlnx.4.4.3216
-sx-complib==1.mlnx.4.4.3216
-sx-complib-dev==1.mlnx.4.4.3216
-sx-examples==1.mlnx.4.4.3216
-sx-examples-dev==1.mlnx.4.4.3216
-sx-gen-utils==1.mlnx.4.4.3216
-sx-gen-utils-dev==1.mlnx.4.4.3216
-sx-scew==1.mlnx.4.4.3216
-sx-scew-dev==1.mlnx.4.4.3216
-sxd-libs==1.mlnx.4.4.3216
-sxd-libs-dev==1.mlnx.4.4.3216
+sshpass==1.06-1
+strace==4.26-0.2
+sx-acl-helper==1.mlnx.4.4.3222
+sx-acl-helper-dev==1.mlnx.4.4.3222
+sx-complib==1.mlnx.4.4.3222
+sx-complib-dev==1.mlnx.4.4.3222
+sx-examples==1.mlnx.4.4.3222
+sx-examples-dev==1.mlnx.4.4.3222
+sx-gen-utils==1.mlnx.4.4.3222
+sx-gen-utils-dev==1.mlnx.4.4.3222
+sx-scew==1.mlnx.4.4.3222
+sx-scew-dev==1.mlnx.4.4.3222
+sxd-libs==1.mlnx.4.4.3222
+sxd-libs-dev==1.mlnx.4.4.3222
 syncd==1.0.0
-wjh-libs==1.mlnx.4.4.3216
-wjh-libs-dev==1.mlnx.4.4.3216
\ No newline at end of file
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
+wjh-libs==1.mlnx.4.4.3222
+wjh-libs-dev==1.mlnx.4.4.3222
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index 3de5bb4e730e..ae4b00c6355d 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3216
\ No newline at end of file
+python-sdk-api==4.4.3222
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 3de5bb4e730e..67be4647c9fc 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python-sdk-api==4.4.3216
\ No newline at end of file
+python_sdk_api==4.4.3222
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 04d9d17057db..cdeca7d09f45 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,25 +1,4 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libpopt0==1.16-12
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
 libsaivs==1.0.0
-libsaivs-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 41d423be42e2..b18d11ead157 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -1,7 +1,6 @@
 adwaita-icon-theme==3.30.1-1
 ant==1.10.5-2
 ant-optional==1.10.5-2
-apt==1.8.2.3
 apt-file==3.2.2
 apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
@@ -471,7 +470,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4
 libgnutls-dane0==3.6.7-4+deb10u7
 libgnutls-openssl27==3.6.7-4+deb10u7
 libgnutls28-dev==3.6.7-4+deb10u7
-libgnutls30==3.6.7-4+deb10u7
 libgnutlsxx28==3.6.7-4+deb10u7
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
@@ -501,7 +499,6 @@ libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
 libheif1==1.3.2-2~deb10u1
-libhogweed4==3.4.1-1+deb10u1
 libhtml-form-perl==6.03-1
 libhtml-format-perl==2.12-1
 libhtml-parser-perl==3.72-3+b3
@@ -693,7 +690,6 @@ libnet-ssleay-perl==1.85-2+b1
 libnetfilter-conntrack-dev==1.0.7-1
 libnetfilter-conntrack3==1.0.7-1
 libnetpbm10==2:10.0-15.3+b2
-libnettle6==3.4.1-1+deb10u1
 libnewt-dev==0.52.20-8
 libnewt0.52==0.52.20-8
 libnfnetlink-dev==1.0.1-3+b1
@@ -734,7 +730,6 @@ libosp5==1.5.2-13+b1
 libossp-uuid-perl==1.6.2-1.5+b7
 libossp-uuid16==1.6.2-1.5+b7
 libp11-kit-dev==0.23.15-2+deb10u1
-libp11-kit0==0.23.15-2+deb10u1
 libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
@@ -942,7 +937,6 @@ libswitch-perl==2.17-2
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u8
-libsystemd0==241-7~deb10u8
 libtask-weaken-perl==1.06-1
 libtasn1-6-dev==4.13-3
 libtasn1-doc==4.13-3
@@ -978,7 +972,6 @@ libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
 libudev-dev==241-7~deb10u8
-libudev1==241-7~deb10u8
 libunbound8==1.9.0-2+deb10u2
 libunicode-utf8-perl==0.62-1
 libunwind-dev==1.2.1-10~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index f6c853db88e1..77aead425e6c 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.2
+bitarray==2.2.3
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index f0bb56d302bf..47c654f6a362 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -1,7 +1,6 @@
 adwaita-icon-theme==3.30.1-1
 ant==1.10.5-2
 ant-optional==1.10.5-2
-apt==1.8.2.3
 apt-file==3.2.2
 apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
@@ -490,7 +489,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4
 libgnutls-dane0==3.6.7-4+deb10u7
 libgnutls-openssl27==3.6.7-4+deb10u7
 libgnutls28-dev==3.6.7-4+deb10u7
-libgnutls30==3.6.7-4+deb10u7
 libgnutlsxx28==3.6.7-4+deb10u7
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
@@ -520,7 +518,6 @@ libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
 libheif1==1.3.2-2~deb10u1
-libhogweed4==3.4.1-1+deb10u1
 libhtml-form-perl==6.03-1
 libhtml-format-perl==2.12-1
 libhtml-parser-perl==3.72-3+b3
@@ -719,7 +716,6 @@ libnet-ssleay-perl==1.85-2+b1
 libnetfilter-conntrack-dev==1.0.7-1
 libnetfilter-conntrack3==1.0.7-1
 libnetpbm10==2:10.0-15.3+b2
-libnettle6==3.4.1-1+deb10u1
 libnewt-dev==0.52.20-8
 libnewt0.52==0.52.20-8
 libnfnetlink-dev==1.0.1-3+b1
@@ -760,7 +756,6 @@ libosp5==1.5.2-13+b1
 libossp-uuid-perl==1.6.2-1.5+b7
 libossp-uuid16==1.6.2-1.5+b7
 libp11-kit-dev==0.23.15-2+deb10u1
-libp11-kit0==0.23.15-2+deb10u1
 libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
@@ -1045,7 +1040,6 @@ libswitch-perl==2.17-2
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u8
-libsystemd0==241-7~deb10u8
 libtask-weaken-perl==1.06-1
 libtasn1-6-dev==4.13-3
 libtasn1-doc==4.13-3
@@ -1081,7 +1075,6 @@ libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
 libudev-dev==241-7~deb10u8
-libudev1==241-7~deb10u8
 libunbound8==1.9.0-2+deb10u2
 libunicode-linebreak-perl==0.0.20190101-1
 libunicode-utf8-perl==0.62-1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index f6c853db88e1..77aead425e6c 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.2
+bitarray==2.2.3
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b57ce596d98d..d2248170128f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 3b87e1d39e28..c21c72341258 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -1,7 +1,6 @@
 adwaita-icon-theme==3.22.0-1+deb9u1
 ant==1.9.9-1+deb9u1
 ant-optional==1.9.9-1+deb9u1
-apt==1.4.11
 apt-file==3.1.4
 apt-transport-https==1.4.11
 apt-utils==1.4.11
@@ -902,7 +901,6 @@ libswitch-perl==2.17-2
 libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==232-25+deb9u13
-libsystemd0==232-25+deb9u13
 libtask-weaken-perl==1.04-1
 libtcl8.6==8.6.6+dfsg-1+b1
 libtcmalloc-minimal4==2.5-2.2
@@ -928,7 +926,6 @@ libtry-tiny-perl==0.28-1
 libtxc-dxtn-s2tc==1.0+git20151227-2
 libubsan0==6.3.0-18+deb9u1
 libudev-dev==232-25+deb9u13
-libudev1==232-25+deb9u13
 libunicode-utf8-perl==0.60-1+b2
 libunwind-dev==1.1-4.1
 libunwind8==1.1-4.1
@@ -1221,7 +1218,7 @@ python-nose2==0.6.5-2
 python-openssl==16.2.0-1
 python-pam==0.4.2-13.2
 python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u2
+python-pil==4.0.0-4+deb9u3
 python-pip-whl==9.0.1-2+deb9u2
 python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
@@ -1279,7 +1276,7 @@ python3-keyrings.alt==1.3-1
 python3-magic==1:5.30-1+deb9u3
 python3-markupsafe==0.23-3
 python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u2
+python3-pil==4.0.0-4+deb9u3
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 1302868fe0ef..c22a63d257a6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.2
+bitarray==2.2.3
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index cb366b9aa3be..347577c5c8a3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -1,7 +1,6 @@
 adwaita-icon-theme==3.22.0-1+deb9u1
 ant==1.9.9-1+deb9u1
 ant-optional==1.9.9-1+deb9u1
-apt==1.4.11
 apt-file==3.1.4
 apt-transport-https==1.4.11
 apt-utils==1.4.11
@@ -904,7 +903,6 @@ libswitch-perl==2.17-2
 libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==232-25+deb9u13
-libsystemd0==232-25+deb9u13
 libtask-weaken-perl==1.04-1
 libtcl8.6==8.6.6+dfsg-1+b1
 libtcmalloc-minimal4==2.5-2.2
@@ -931,7 +929,6 @@ libtry-tiny-perl==0.28-1
 libtxc-dxtn-s2tc==1.0+git20151227-2
 libubsan0==6.3.0-18+deb9u1
 libudev-dev==232-25+deb9u13
-libudev1==232-25+deb9u13
 libunicode-utf8-perl==0.60-1+b3
 libunwind-dev==1.1-4.1
 libunwind8==1.1-4.1
@@ -1227,7 +1224,7 @@ python-nose2==0.6.5-2
 python-openssl==16.2.0-1
 python-pam==0.4.2-13.2
 python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u2
+python-pil==4.0.0-4+deb9u3
 python-pip-whl==9.0.1-2+deb9u2
 python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
@@ -1285,7 +1282,7 @@ python3-keyrings.alt==1.3-1
 python3-magic==1:5.30-1+deb9u3
 python3-markupsafe==0.23-3
 python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u2
+python3-pil==4.0.0-4+deb9u3
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 1302868fe0ef..c22a63d257a6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.2
+bitarray==2.2.3
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b57ce596d98d..d2248170128f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e0e9638c2a3341c7788f5dce6fbda74a9049944
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 636c9702d8ee..8a21bbe9e490 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -98,7 +98,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libgssapi-krb5-2==1.17-3+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u2
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
 libhogweed4==3.4.1-1+deb10u1
@@ -109,12 +109,12 @@ libiptc0==1.8.2-4
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
-libk5crypto3==1.17-3+deb10u1
+libk5crypto3==1.17-3+deb10u2
 libkeyutils1==1.6-6
 libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
-libkrb5-3==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u2
+libkrb5support0==1.17-3+deb10u2
 libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
@@ -243,7 +243,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.3216
+sx-kernel==1.mlnx.4.4.3222
 sysfsutils==2.1.0+repack-5
 systemd==247.3-5~bpo10+2
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 6837e3e746a0..fa3220479bd2 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -2,8 +2,12 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
+libgssapi-krb5-2==1.17-3+deb10u1
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
+libk5crypto3==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index c6a9c2de77d9..89df03e3cb27 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -2,8 +2,12 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
+libgssapi-krb5-2==1.17-3+deb10u1
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
+libk5crypto3==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u1
+libkrb5support0==1.17-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1

From 5651977f652debf3471b10753c9acfcbd54e46c3 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 29 Jul 2021 07:58:07 -0700
Subject: [PATCH 0668/1674] [sonic-utilities] submodule update (#8284)

This PR updates the following commits

a9606fb [show] fix show muxcable metrics <port> for sorted output (#1731)
7355016 [minigraph][port_config] Use imported config.main and add conditional patch (#1728)
cc1d6e4 [configlet] Python3 compatible syntax for extracting a key from the dict (#1721)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d19829cdf015..a9606fb3d81e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d19829cdf01500213101cc0d2f78587af5f86cf3
+Subproject commit a9606fb3d81ebdec8c90e058c9bda8f73bdbe31d

From f1c8a6ab96d4188e650964aa820baf87dc5c5f17 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Fri, 30 Jul 2021 17:49:40 +0800
Subject: [PATCH 0669/1674] [sonic-swss][202012] Update submodule (#8286)

Update submodule for swss

f54b7d0b [Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer profile for active ports without speed configured (Azure/sonic-swss#1820)
ac7f5cff Td2: Reclaim buffer from unused ports (Azure/sonic-swss#1830)
04105a4b [debugcounterorch] check if counter type is supported before querying (Azure/sonic-swss#1789)
a67d8af6 [202012][portsorch] fix errors when moving port from one lag to another. (Azure/sonic-swss#1819)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index b0fb3924c47a..f54b7d0b634b 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit b0fb3924c47a855926f3f2b3a1911bc46fed3c9c
+Subproject commit f54b7d0b634b466c06867858d843744216f09efa

From ada56abe6efa17d3bac0c88661876b6da213b003 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Sat, 31 Jul 2021 02:24:35 +0300
Subject: [PATCH 0670/1674] [submodule]: Advance sonic-swss & sonic-sairedis.
 (#8296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sairedis:
*[recorder] Fix incorrect attribute enum value capability query (#843) d86b051
*[syncd] Fix fdb flood queue size limit check (#863) 3a2af76
*[vslib] implement query for SAI_DEBUG_COUNTER_TYPE enum values (#842) 575dcb4

swss:
*[portsorch] fix errors when moving port from one lag to anoth… a67d8af
*[debugcounterorch] check if counter type is supported before querying… ( 04105a4
*Td2: Reclaim buffer from unused ports (#1830) ac7f5cf
*[Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer pr… f54b7d0

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 74b580820419..575dcb49685f 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 74b580820419bd930deecc8ef40f6e3ee91dcc91
+Subproject commit 575dcb49685f3aa4532ba24a353264bbc2f33c1a

From cb49c6522fca696326f3ebe70e876c097d52a7be Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 30 Jul 2021 17:09:35 -0700
Subject: [PATCH 0671/1674] [submodule]: Advance swss submodule pointer (#8288)

This PR includes the following commits

a67d8af [202012][portsorch] fix errors when moving port from one lag to another (Azure/sonic-swss#1819)
04105a4 [debugcounterorch] check if counter type is supported before querying (Azure/sonic-swss#1789)
ac7f5cff Td2: Reclaim buffer from unused ports (Azure/sonic-swss#1830)
f54b7d0 [Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer profile for active ports without speed configured  (Azure/sonic-swss#1820)

Signed-off-by: Neetha John <nejo@microsoft.com>

From 2a41adcdc13235cf6036f932d21a2919319f0759 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 2 Aug 2021 10:21:04 +0800
Subject: [PATCH 0672/1674] [ci/build]: Upgrade SONiC package versions (#8303)

---
 .../versions-deb-buster                       |  1 +
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-git     |  4 ++--
 .../docker-gbsyncd-vs/versions-deb-buster     | 23 ++++++++++++++++++-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../versions-py3-all-arm64                    |  1 +
 .../versions-py3-all-armhf                    |  1 +
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-vs/versions-deb-buster       | 23 ++++++++++++++++++-
 .../versions-git                              |  1 +
 .../versions-git                              |  1 +
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../versions-deb-stretch-arm64                |  2 +-
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 20 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index d0e6fb054888..dd102e1d8282 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -101,6 +101,7 @@ sx-scew-dev==1.mlnx.4.4.3222
 sxd-libs==1.mlnx.4.4.3222
 sxd-libs-dev==1.mlnx.4.4.3222
 syncd==1.0.0
+syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.3222
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 51314d4e81f9..6bc8e892bb9c 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==be6cd44ddf584163c9fa5b66c66e04b2552e2a4d
+https://salsa.debian.org/kernel-team/ethtool/==ada56abe6efa17d3bac0c88661876b6da213b003
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 5a1c1147fb78..342b84447d0b 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==be6cd44ddf584163c9fa5b66c66e04b2552e2a4d
+https://salsa.debian.org/kernel-team/ethtool/==ada56abe6efa17d3bac0c88661876b6da213b003
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index cdeca7d09f45..04d9d17057db 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,25 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
-syncd-vs==1.0.0
\ No newline at end of file
+libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 3ccd6577cccf..5b91d3d95c03 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.3
+charset-normalizer==2.0.4
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
new file mode 100644
index 000000000000..d10196807972
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
@@ -0,0 +1 @@
+importlib-metadata==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
new file mode 100644
index 000000000000..d10196807972
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
@@ -0,0 +1 @@
+importlib-metadata==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index bc3c046c67ed..46432428293a 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.5.30
-charset-normalizer==2.0.3
+charset-normalizer==2.0.4
 click==7.0
 idna==3.2
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index cdeca7d09f45..04d9d17057db 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,25 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
-syncd-vs==1.0.0
\ No newline at end of file
+libsaivs-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+syncd-vs==1.0.0
+syncd-vs-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
new file mode 100644
index 000000000000..757cd229ab42
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==517f6beeaacf3773b0510ad0c764f57301eb0ab5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git
new file mode 100644
index 000000000000..757cd229ab42
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==517f6beeaacf3773b0510ad0c764f57301eb0ab5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index d2248170128f..7510491d8ee3 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index c21c72341258..d4cc44e6c217 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -868,7 +868,7 @@ libslang2-dev==2.3.1-5
 libslf4j-java==1.7.22-1
 libsm-dev==2:1.2.2-1+b3
 libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u1
+libsndfile1==1.0.27-3+deb9u2
 libsnmp-base==5.7.3+dfsg-1.7+deb9u3
 libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
 libsnmp30==5.7.3+dfsg-1.7+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index c22a63d257a6..f4072500defe 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.3
+bitarray==2.2.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index 347577c5c8a3..e68cb5e95b8f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -870,7 +870,7 @@ libslang2-dev==2.3.1-5
 libslf4j-java==1.7.22-1
 libsm-dev==2:1.2.2-1+b3
 libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u1
+libsndfile1==1.0.27-3+deb9u2
 libsnmp-base==5.7.3+dfsg-1.7+deb9u3
 libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
 libsnmp30==5.7.3+dfsg-1.7+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index c22a63d257a6..f4072500defe 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.3
+bitarray==2.2.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index a72b90e7d0f9..ddf9bc506e5a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -911,7 +911,7 @@ libslang2-dev==2.3.1-5
 libslf4j-java==1.7.22-1
 libsm-dev==2:1.2.2-1+b3
 libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u1
+libsndfile1==1.0.27-3+deb9u2
 libsnmp-base==5.7.3+dfsg-1.7+deb9u3
 libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
 libsnmp30==5.7.3+dfsg-1.7+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index d2248170128f..7510491d8ee3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==591a55886aa2502eb783f8b238e7b0c1fa88a68c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 8a21bbe9e490..d85fce0d805d 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.8-1
+containerd.io==1.4.9-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index e4718673406e..d6cb0766adde 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
 cffi==1.14.6
-charset-normalizer==2.0.3
+charset-normalizer==2.0.4
 click==7.0
 cryptography==3.4.7
 docker==4.3.1

From 1eaa9519666f02dd767fec35e6c698962295101b Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Thu, 29 Jul 2021 08:21:28 -0700
Subject: [PATCH 0673/1674] [Mellanox] [SKU] Fix the shared headroom for
 4600C-C64 SKU (#8242)

Removed ingress_lossy_pool from the BUFFER_POOL list
Fx the the egress_lossless_pool_size value

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 .../Mellanox-SN4600C-C64/buffers_defaults_t0.j2  | 16 +++++-----------
 .../Mellanox-SN4600C-C64/buffers_defaults_t1.j2  | 16 +++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
index 03b1f23d94b6..c6ec42948ec6 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -1,7 +1,7 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '53379072' %}
-{% set ingress_lossy_pool_size =  '1540096' %}
-{% set egress_lossless_pool_size =  '60817408' %}
+{% set ingress_lossless_xoff_size  =  '1540096' %}
+{% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '53379072' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
@@ -16,13 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -47,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -73,7 +67,7 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST": {
 {% for port in port_names.split(',') %}
         "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
index 432f125d6cb5..cbe3511a8311 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -1,7 +1,7 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '52723712' %}
-{% set ingress_lossless_pool_xoff =  '2195456' %}
-{% set egress_lossless_pool_size =  '60817408' %}
+{% set ingress_lossless_xoff_size  =  '2195456' %}
+{% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '52723712' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
@@ -16,13 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -47,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -73,7 +67,7 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST": {
 {% for port in port_names.split(',') %}
         "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}

From af2024e5674e342b90c4b6a18b18eede3182b498 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 2 Aug 2021 09:09:22 -0700
Subject: [PATCH 0674/1674] Update default cable len to 0m for TD2 (#8298)

Signed-off-by: Neetha John <nejo@microsoft.com>

As part of the buffer reclamation efforts for TD2, setting the default cable len to 0m which means unused ports will have a cable len of 0m.

Why I did it
To align with the changes in Azure/sonic-swss#1830

How to verify it
With the default cable len set to 0m and the associated changes in swss, CABLE_LENGTH table had '0m' set for unused ports and accordingly more space was reserved for the shared pool
---
 .../Arista-7050-QX32/buffers_defaults_t0.j2                     | 2 +-
 .../Arista-7050-QX32/buffers_defaults_t1.j2                     | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2              | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2              | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t0.j2                 | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t1.j2                 | 2 +-
 .../Force10-S6000/buffers_defaults_def.j2                       | 2 +-
 .../Force10-S6000/buffers_defaults_t0.j2                        | 2 +-
 .../Force10-S6000/buffers_defaults_t1.j2                        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
index d93aa34893d6..3c0a68f1da88 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
index d93aa34893d6..3c0a68f1da88 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}

From cb50baeec2491b1c8e15d049736ba901c69a4151 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 4 Aug 2021 00:30:43 -0700
Subject: [PATCH 0675/1674] [k8s]: disable http_proxy for docker by default
 (#8328)

disable http_proxy for docker by default. by default, we should not use proxy.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
index 9ef41d085329..3fb0c20fddcf 100644
--- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
+++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
@@ -3,6 +3,6 @@
     "retry_join_interval_seconds": 30,
     "retry_labels_update_seconds": 5,
     "revert_to_local_on_wait_seconds": 60,
-    "use_k8s_as_http_proxy": "y"
+    "use_k8s_as_http_proxy": "n"
 }
 

From fa239270c12e9ae62b3c811418edb7a250dc16ec Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 4 Aug 2021 08:40:36 -0700
Subject: [PATCH 0676/1674] Revert "Update default cable len to 0m for TD2
 (#8298)"

This reverts commit af2024e5674e342b90c4b6a18b18eede3182b498.
---
 .../Arista-7050-QX32/buffers_defaults_t0.j2                     | 2 +-
 .../Arista-7050-QX32/buffers_defaults_t1.j2                     | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2              | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2              | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t0.j2                 | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t1.j2                 | 2 +-
 .../Force10-S6000/buffers_defaults_def.j2                       | 2 +-
 .../Force10-S6000/buffers_defaults_t0.j2                        | 2 +-
 .../Force10-S6000/buffers_defaults_t1.j2                        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
index 3c0a68f1da88..d93aa34893d6 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
index 3c0a68f1da88..d93aa34893d6 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
index dc04b2265f33..38e34eb571e8 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '0m' %}
+{%- set default_cable = '300m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}

From 7aad61683264daedcd04a78b21f502d4683faef5 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 5 Aug 2021 00:59:02 +0800
Subject: [PATCH 0677/1674] [build]: Enable reproducible build for git docker
 (#8331)

---
 .azure-pipelines/docker-sonic-slave.yml | 2 +-
 .azure-pipelines/official-build.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 2ca3708dabbd..02d1e0e58844 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -45,7 +45,7 @@ parameters:
 variables:
 - ${{ if and(startsWith(variables['Build.SourceBranchName'], '202'), eq(length(variables['Build.SourceBranchName']), 6)) }}:
   - name: BUILD_OPTIONS
-    value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+    value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
 
 stages:
 - stage: Build
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index fa79be969746..bcda8f210c75 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -21,7 +21,7 @@ stages:
   variables:
     CACHE_MODE: wcache
     ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
   jobs:
   - template: azure-pipelines-build.yml
     parameters:

From 08dc00f81768be64758d823851b243f0527e5620 Mon Sep 17 00:00:00 2001
From: novikauanton <81817644+novikauanton@users.noreply.github.com>
Date: Thu, 1 Jul 2021 10:47:26 +0300
Subject: [PATCH 0678/1674] [iccpd][docker] fix initial startup configuration
 (#7982)

#### Why I did it
The process of config generation (sonic-cfggen) fails, but the services continue to run with invalid config

#### How I did it
* add exit with error on errors in start.sh script (because supervisord relies on start.sh return code).
* fix jinja template. Jinja use common python expressions under the hood and `has_key` method was removed from dict in py3, so use check by `in` operator as it is supported by both py2 and py3.
#### How to verify it
* compile sonic with enabled iccp.
* add mclag config to CONFIG_DB.
    ```
    'MC_LAG|1' => {
        "local_ip": "10.0.0.2",
        "peer_ip": "10.0.0.3",
        "peer_link": "Ethernet8",
        "mclag_interface": "Ethernet12"
    }
* unmaks, enable and start swss and iccpd services in sonic.
* log in into the iccpd container and check the config file `/etc/iccpd/iccpd.conf`
* expected config:
    ```
    mclag_id:1
        local_ip:10.0.0.2
        peer_ip:10.0.0.3
        peer_link:Ethernet8
        mclag_interface:Ethernet12
    system_mac:YOUR_SYSTEM_MAC

#### Description for the changelog
Fixed initial iccpd startup configuration.
---
 dockers/docker-iccpd/iccpd.j2 | 2 +-
 dockers/docker-iccpd/start.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-iccpd/iccpd.j2 b/dockers/docker-iccpd/iccpd.j2
index 6c6f9fab1afa..fa7543422cca 100644
--- a/dockers/docker-iccpd/iccpd.j2
+++ b/dockers/docker-iccpd/iccpd.j2
@@ -2,7 +2,7 @@
 mclag_id:{{mclag_id}}
     local_ip:{{MC_LAG[mclag_id]['local_ip']}}
     peer_ip:{{MC_LAG[mclag_id]['peer_ip']}}
-{% if MC_LAG[mclag_id].has_key('peer_link') %}
+{% if 'peer_link' in MC_LAG[mclag_id] %}
     peer_link:{{MC_LAG[mclag_id]['peer_link']}}
 {% endif %}
     mclag_interface:{{MC_LAG[mclag_id]['mclag_interface']}}
diff --git a/dockers/docker-iccpd/start.sh b/dockers/docker-iccpd/start.sh
index f2e9807f314f..bba5e490c466 100644
--- a/dockers/docker-iccpd/start.sh
+++ b/dockers/docker-iccpd/start.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+set -e
 
 ICCPD_CONF_PATH=/etc/iccpd
 

From 5e594043cec3760ea3347a4b84929c63f69143ed Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 3 Aug 2021 09:39:39 -0700
Subject: [PATCH 0679/1674] [pmon] create and mount firmware directory on PMON
 for firmware upgrade support on muxcable (#8283)

This PR creates a directory firmware on the HOST with the path /usr/share/sonic/firmware, as well as this is
mounted on PMON container with the same path /usr/share/sonic/firmware. This is required for firmware
upgrade support for muxcable as currently by design all Y-Cable API's are called by xcvrd. As such if CLI has
to transfer a file to PMON we need to mount a directory from host to PMON just for getting the firmware files.
Hence we require this change.

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 files/build_templates/docker_image_ctl.j2       | 3 +++
 files/build_templates/sonic_debian_extension.j2 | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 109e431f8e73..0a03ca3bcb0d 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -374,6 +374,9 @@ start() {
         -v /var/run/docker-syncd$DEV:/var/run/sswsyncd \
 {%- endif %}
 {%- endif %}
+{%- if docker_container_name == "pmon" %}
+    -v /usr/share/sonic/firmware:/usr/share/sonic/firmware:rw \
+{%- endif %}
 {%- if docker_container_name == "swss" %}
         -e ASIC_VENDOR=$ASIC_VENDOR \
 {%- endif -%}
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 1bc1471da1e2..018dd1fe2aea 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -45,6 +45,7 @@ FILESYSTEM_ROOT_USR_SHARE="$FILESYSTEM_ROOT_USR/share"
 FILESYSTEM_ROOT_USR_SHARE_SONIC="$FILESYSTEM_ROOT_USR_SHARE/sonic"
 FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS="$FILESYSTEM_ROOT_USR_SHARE_SONIC/scripts"
 FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES="$FILESYSTEM_ROOT_USR_SHARE_SONIC/templates"
+FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE="$FILESYSTEM_ROOT_USR_SHARE_SONIC/firmware"
 FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc"
 FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
 
@@ -85,6 +86,7 @@ sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic/
 sudo mkdir -p $FILESYSTEM_ROOT/etc/modprobe.d/
 sudo mkdir -p $FILESYSTEM_ROOT/var/cache/sonic/
 sudo mkdir -p $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+sudo mkdir -p $FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE/
 # This is needed for Stretch and might not be needed for Buster where Linux create this directory by default.
 # Keeping it generic. It should not harm anyways.
 sudo mkdir -p $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM

From 0551fed7547b5c408e1f9bad78e221759b11bdcb Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Wed, 4 Aug 2021 01:25:28 +0300
Subject: [PATCH 0680/1674] [Mellanox][Pcie] Fix issue on pcied with an id that
 contains only decimal digits was treated as a decimal number (#8309)

A device that contains only decimal digits was mistreated as a decimal integer resulting in failure to find it in the id to bus map.
---
 platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py b/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py
index f7c8150d50c4..96d590e5e2e3 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/pcie.py
@@ -26,7 +26,7 @@ def get_pcie_check(self):
             id_conf = item_conf["id"]
             dev_conf = item_conf["dev"]
             fn_conf = item_conf["fn"]
-            bus_conf = self._device_id_to_bus_map.get(id_conf)
+            bus_conf = self._device_id_to_bus_map.get(str(id_conf))
             if bus_conf and self.check_pcie_sysfs(bus=int(bus_conf, base=16), device=int(dev_conf, base=16),
                                                   func=int(fn_conf, base=16)):
                 item_conf["result"] = "Passed"

From cb8ff6dba11eecac304e5dfdb43d8a40f3e73985 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Tue, 3 Aug 2021 18:06:59 -0700
Subject: [PATCH 0681/1674] [baseimage]: add j2cli to sonic_debian_extension.j2
 (#8019)

j2cli provides access to jinja library. cisco platform.py requires j2cli to handle jinja template configuration files.
---
 files/build_templates/sonic_debian_extension.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 018dd1fe2aea..19566fd611ba 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -109,6 +109,9 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-dev     \
     python3-dev
 
+# Install j2cli for handling jinja template
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "j2cli==0.3.10"
+
 # Install Python client for Redis
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install "redis==3.5.3"
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "redis==3.5.3"

From 3aed7eab8f0083760bdaf722f223393c824361e4 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Tue, 3 Aug 2021 18:08:09 -0700
Subject: [PATCH 0682/1674] [pmon]: add python3-jsonschema pmon (#8018)

jsonschema is an implementation of JSON Schema for Python .

Signed-off-by: Venkat Garigipati <venkatg@cisco.com>
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 556ba299275d..d8988b8f6ebe 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -25,6 +25,7 @@ RUN apt-get update &&   \
         dmidecode       \
         i2c-tools       \
         psmisc          \
+        python3-jsonschema \
         libpci3
 
 # TODO: Remove these lines once we no longer need Python 2

From 4c0daa80c0df0abae600e56bf3df0b91f318d1bb Mon Sep 17 00:00:00 2001
From: jusherma <jusherma@cisco.com>
Date: Wed, 4 Aug 2021 00:56:29 -0700
Subject: [PATCH 0683/1674] [build] Always use -j1 for libsnmp to avoid race
 condition (#8324)

I have been seeing intermittent (~40%) build failures with the same error described in PR https://github.com/Azure/sonic-buildimage/pull/6592, even with that fix present

```
/usr/bin/ld: mibgroup/ip-forward-mib/ipCidrRouteTable/.libs/ipCidrRouteTable_interface.o: file not recognized: file truncated
...
libtool:   error: 'mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.lo' is not a valid libtool object
make[5]: *** [Makefile:1020: libnetsnmpmibs.la] Error 1
make[5]: *** Waiting for unfinished jobs....
```

#### How I did it

Use `-j1` for the libsnmp build regardless of the value of `$(MULTIARCH_QEMU_ENVIRON)`

#### How to verify it

Performed 10 builds of the libsnmp target (`target/debs/buster/libsnmp-base_5.7.3+dfsg-5_all.deb`) with and without this change. Without the change, hit the error 40% of the time. With the change did not see the error at all

Signed-off-by: Justin Sherman <jusherma@cisco.com>
---
 src/snmpd/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile
index af225cfe61b6..50d0303540d6 100644
--- a/src/snmpd/Makefile
+++ b/src/snmpd/Makefile
@@ -29,11 +29,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg init
 	stg import -s ../patch-$(SNMPD_VERSION)/series
 
-ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	dpkg-buildpackage -rfakeroot -b -d -us -uc -j1 --admindir $(SONIC_DPKG_ADMINDIR)
-else
-	dpkg-buildpackage -rfakeroot -b -d -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-endif
 	popd
 
 	mv $(DERIVED_TARGETS) $* $(DEST)/

From d2f2a07c7c3a2ce790d4c3f8189d0f85be8f6f5e Mon Sep 17 00:00:00 2001
From: Blueve <672454911@qq.com>
Date: Thu, 5 Aug 2021 22:00:50 +0800
Subject: [PATCH 0684/1674] [ARM] Fix issue whre the ping6 tool is missing from
 orchagent docker (#8345)

Signed-off-by: Jing Kan jika@microsoft.com
---
 dockers/docker-orchagent/Dockerfile.j2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 17c0983c58b2..fd914802cd51 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -24,9 +24,11 @@ RUN apt-get update &&       \
         python3-dev
 
 {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
-# Fix for gcc/python not found in arm docker
+# Fix for gcc/python/iputils-ping not found in arm docker
 RUN apt-get install -f -y python2.7 python2.7-dev
-RUN apt-get install -y gcc-8
+RUN apt-get install -y   \
+        gcc-8            \
+        iputils-ping
 {% endif %}
 {% if CONFIGURED_ARCH == "armhf" %}
 RUN ln -s -f /usr/bin/gcc-8 /usr/bin/arm-linux-gnueabihf-gcc

From 99efd5346e347ab2c1e099f98ae22c4e8a40e4e9 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Thu, 5 Aug 2021 18:35:31 -0700
Subject: [PATCH 0685/1674] [202012][Arista] Update platform library submodules
 (#8339)

This PR only contains backports from master

Fix leak discovered on master, though 202012 is not affected it's better to have the fix (fixes [master] thermalctld leak on Arista devices makes them unreachable when memory is exhausted #7515)
Fix EepromDecoderimplementation in the platform API (fixes syseepromd crashing repeatedly on SONiC.20201231.02 #8263)
Fix Mineral platform definition and configuration
Fix build issues in environments where /proc is not mounted/restricted (fixes PLATFORM=broadcom fails arista "ReloadCauseManagerTest" first time #7800)
Fix some pytest issues
Add sfp-eeprom C API and also mount it in pmon
---
 .../Arista-7170-32C-C32/board_lane_map.json   | 62 +++++++++----------
 .../arista/x86_64-arista_7170_32c/default_sku |  2 +-
 .../x86_64-arista_7170_32c/sensors.conf       | 58 ++++++++++++++++-
 .../x86_64-arista_7170_32cd/sensors.conf      |  2 +-
 .../barefoot/sonic-platform-modules-arista    |  2 +-
 .../broadcom/sonic-platform-modules-arista    |  2 +-
 rules/docker-platform-monitor.mk              |  1 +
 7 files changed, 93 insertions(+), 36 deletions(-)
 mode change 120000 => 100644 device/arista/x86_64-arista_7170_32c/sensors.conf

diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json
index 6ab72e55ab47..b78f75fbf284 100644
--- a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json
+++ b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json
@@ -5,7 +5,7 @@
         {
             "connector": 1,
             "device_id": 0,
-            "mac_block": 14,
+            "mac_block": 7,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -59,7 +59,7 @@
         {
             "connector": 2,
             "device_id": 0,
-            "mac_block": 12,
+            "mac_block": 6,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -113,7 +113,7 @@
         {
             "connector": 3,
             "device_id": 0,
-            "mac_block": 10,
+            "mac_block": 5,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -167,7 +167,7 @@
         {
             "connector": 4,
             "device_id": 0,
-            "mac_block": 8,
+            "mac_block": 4,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -221,7 +221,7 @@
         {
             "connector": 5,
             "device_id": 0,
-            "mac_block": 6,
+            "mac_block": 3,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -275,7 +275,7 @@
         {
             "connector": 6,
             "device_id": 0,
-            "mac_block": 4,
+            "mac_block": 2,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -329,7 +329,7 @@
         {
             "connector": 7,
             "device_id": 0,
-            "mac_block": 2,
+            "mac_block": 1,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -437,7 +437,7 @@
         {
             "connector": 9,
             "device_id": 0,
-            "mac_block": 62,
+            "mac_block": 31,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -491,7 +491,7 @@
         {
             "connector": 10,
             "device_id": 0,
-            "mac_block": 60,
+            "mac_block": 30,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -545,7 +545,7 @@
         {
             "connector": 11,
             "device_id": 0,
-            "mac_block": 58,
+            "mac_block": 29,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -599,7 +599,7 @@
         {
             "connector": 12,
             "device_id": 0,
-            "mac_block": 56,
+            "mac_block": 28,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -653,7 +653,7 @@
         {
             "connector": 13,
             "device_id": 0,
-            "mac_block": 54,
+            "mac_block": 27,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -707,7 +707,7 @@
         {
             "connector": 14,
             "device_id": 0,
-            "mac_block": 52,
+            "mac_block": 26,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -761,7 +761,7 @@
         {
             "connector": 15,
             "device_id": 0,
-            "mac_block": 50,
+            "mac_block": 25,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -815,7 +815,7 @@
         {
             "connector": 16,
             "device_id": 0,
-            "mac_block": 48,
+            "mac_block": 24,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -869,7 +869,7 @@
         {
             "connector": 17,
             "device_id": 0,
-            "mac_block": 46,
+            "mac_block": 23,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -923,7 +923,7 @@
         {
             "connector": 18,
             "device_id": 0,
-            "mac_block": 44,
+            "mac_block": 22,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -977,7 +977,7 @@
         {
             "connector": 19,
             "device_id": 0,
-            "mac_block": 42,
+            "mac_block": 21,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1031,7 +1031,7 @@
         {
             "connector": 20,
             "device_id": 0,
-            "mac_block": 40,
+            "mac_block": 20,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1085,7 +1085,7 @@
         {
             "connector": 21,
             "device_id": 0,
-            "mac_block": 38,
+            "mac_block": 19,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1139,7 +1139,7 @@
         {
             "connector": 22,
             "device_id": 0,
-            "mac_block": 36,
+            "mac_block": 18,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1193,7 +1193,7 @@
         {
             "connector": 23,
             "device_id": 0,
-            "mac_block": 34,
+            "mac_block": 17,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1247,7 +1247,7 @@
         {
             "connector": 24,
             "device_id": 0,
-            "mac_block": 32,
+            "mac_block": 16,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1301,7 +1301,7 @@
         {
             "connector": 25,
             "device_id": 0,
-            "mac_block": 30,
+            "mac_block": 15,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1355,7 +1355,7 @@
         {
             "connector": 26,
             "device_id": 0,
-            "mac_block": 28,
+            "mac_block": 14,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1409,7 +1409,7 @@
         {
             "connector": 27,
             "device_id": 0,
-            "mac_block": 26,
+            "mac_block": 13,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1463,7 +1463,7 @@
         {
             "connector": 28,
             "device_id": 0,
-            "mac_block": 24,
+            "mac_block": 12,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1517,7 +1517,7 @@
         {
             "connector": 29,
             "device_id": 0,
-            "mac_block": 22,
+            "mac_block": 11,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1571,7 +1571,7 @@
         {
             "connector": 30,
             "device_id": 0,
-            "mac_block": 20,
+            "mac_block": 10,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1625,7 +1625,7 @@
         {
             "connector": 31,
             "device_id": 0,
-            "mac_block": 18,
+            "mac_block": 9,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
@@ -1679,7 +1679,7 @@
         {
             "connector": 32,
             "device_id": 0,
-            "mac_block": 16,
+            "mac_block": 8,
             "media_type": "copper",
             "lane0": {
                 "mac_ch": 0,
diff --git a/device/arista/x86_64-arista_7170_32c/default_sku b/device/arista/x86_64-arista_7170_32c/default_sku
index 536bad44f086..e396ca3395f6 100644
--- a/device/arista/x86_64-arista_7170_32c/default_sku
+++ b/device/arista/x86_64-arista_7170_32c/default_sku
@@ -1 +1 @@
-Arista-7170-32CD-C32 t1
+Arista-7170-32C-C32 t1
diff --git a/device/arista/x86_64-arista_7170_32c/sensors.conf b/device/arista/x86_64-arista_7170_32c/sensors.conf
deleted file mode 120000
index 1ab9e0f47704..000000000000
--- a/device/arista/x86_64-arista_7170_32c/sensors.conf
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-arista_7170_64c/sensors.conf
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_32c/sensors.conf b/device/arista/x86_64-arista_7170_32c/sensors.conf
new file mode 100644
index 000000000000..d3de228da97a
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_32c/sensors.conf
@@ -0,0 +1,57 @@
+# libsensors configuration file for DCS-7170-32C
+# ------------------------------------------------
+
+bus "i2c-6" "SCD 0000:06:00.0 SMBus master 0 bus 5"
+bus "i2c-7" "SCD 0000:06:00.0 SMBus master 0 bus 6"
+bus "i2c-8" "SCD 0000:06:00.0 SMBus master 0 bus 7"
+bus "i2c-81" "SCD 0000:ff:0b.3 SMBus master 0 bus 0"
+
+chip "max6658-i2c-8-4c"
+    label temp1 "Temp sensor near ASIC"
+
+    set temp1_max 100
+    set temp1_crit 110
+    set temp1_min -55
+
+    set temp2_max 100
+    set temp2_crit 110
+    set temp2_min -55
+    ignore temp2
+
+chip "pmbus-i2c-6-58"
+    label temp1 "PSU1 primary hotspot temp"
+    label temp2 "PSU1 inlet temp"
+    label temp3 "PSU1 exhaust temp"
+
+    # setting maximum and critical thresholds is not supported for this psu
+    # fault and warning limits defined internally by hardware
+
+    ignore fan2
+    ignore fan3
+
+chip "pmbus-i2c-7-58"
+    label temp1 "PSU2 primary hotspot temp"
+    label temp2 "PSU2 inlet temp"
+    label temp3 "PSU2 exhaust temp"
+
+    # setting maximum and critical thresholds is not supported for this psu
+    # fault and warning limits defined internally by hardware
+
+    ignore fan2
+    ignore fan3
+
+chip "max6658-i2c-81-4c"
+    label temp1 "Rear air temp1"
+    label temp2 "Rear air temp2"
+
+    set temp1_max 70
+    set temp1_crit 80
+    set temp1_min -55
+    set temp2_max 70
+    set temp2_crit 80
+    set temp2_min -55
+
+chip "lm73-i2c-8-4a"
+    label temp1 "Front air temp"
+
+    set temp1_max 65
diff --git a/device/arista/x86_64-arista_7170_32cd/sensors.conf b/device/arista/x86_64-arista_7170_32cd/sensors.conf
index 1ab9e0f47704..39485db7bba1 120000
--- a/device/arista/x86_64-arista_7170_32cd/sensors.conf
+++ b/device/arista/x86_64-arista_7170_32cd/sensors.conf
@@ -1 +1 @@
-../x86_64-arista_7170_64c/sensors.conf
\ No newline at end of file
+../x86_64-arista_7170_32c/sensors.conf
\ No newline at end of file
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 00c8e731a213..cf24d4c8c8ce 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7
+Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 00c8e731a213..cf24d4c8c8ce 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7
+Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index b650f74a174d..807513e39af4 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -57,6 +57,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platfo
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro
 
 # Mount Arista python library on Aboot images to be used by plugins
+$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/libsfp-eeprom.so:/usr/lib/libsfp-eeprom.so:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro

From 886846f7199d87889f9e75956b83412944974f0f Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Thu, 5 Aug 2021 17:02:36 -0700
Subject: [PATCH 0686/1674] Dell Z9332 systems optimized MMU settings for T0/T1
 topology (#8341)

---
 .../DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2        | 6 +++---
 .../DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2        | 6 +++---
 .../th3-z9332f-16x400G-64x100G.config.bcm                 | 1 -
 .../DellEMC-Z9332f-O32/buffers_defaults_t0.j2             | 8 ++++----
 .../DellEMC-Z9332f-O32/buffers_defaults_t1.j2             | 8 ++++----
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm      | 1 -
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
index 29bb64904e6c..5ecbe788e3ab 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
@@ -26,13 +26,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66800476",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "8644128"
         },
         "egress_lossless_pool": {
-            "size": "66800476",
+            "size": "55921148",
             "type": "egress",
             "mode": "static"
         }
@@ -41,7 +41,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66800476"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
index 29bb64904e6c..5ecbe788e3ab 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
@@ -26,13 +26,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66800476",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "8644128"
         },
         "egress_lossless_pool": {
-            "size": "66800476",
+            "size": "55921148",
             "type": "egress",
             "mode": "static"
         }
@@ -41,7 +41,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66800476"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index caab3df1ef78..1a41367d9410 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -31,7 +31,6 @@ max_vp_lags.0=0
 tdma_intr_enable=1
 tdma_timeout_usec.0=5000000
 parity_correction.0=1
-mmu_lossless.0=0
 bcm_num_cos=10
 default_cpu_tx_queue=7
 pktdma_poll_mode_channel_bitmap=1
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
index 94a40d257f6c..7254e841d8b4 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2
@@ -10,13 +10,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66435732",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "27400374"
+            "xoff": "27200352"
         },
         "egress_lossless_pool": {
-            "size": "66435732",
+            "size": "38462204",
             "type": "egress",
             "mode": "static"
         }
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66435732"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
index 94a40d257f6c..7254e841d8b4 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2
@@ -10,13 +10,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66435732",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "27400374"
+            "xoff": "27200352"
         },
         "egress_lossless_pool": {
-            "size": "66435732",
+            "size": "38462204",
             "type": "egress",
             "mode": "static"
         }
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66435732"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index 1376e610b220..a189a8b1731f 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -31,7 +31,6 @@ max_vp_lags.0=0
 tdma_intr_enable=1
 tdma_timeout_usec.0=5000000
 parity_correction.0=1
-mmu_lossless.0=0
 bcm_num_cos=10
 default_cpu_tx_queue=7
 pktdma_poll_mode_channel_bitmap=1

From 9b50d631ff3338728e85c4b8d777a305d696dc96 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 6 Aug 2021 07:20:06 +0530
Subject: [PATCH 0687/1674] DellEMC: Add pcie.yaml for Z9332f (#8329)

Why I did it
To support "pcied" and "pcieutil" commands in DellEMC Z9332f.

How I did it
Add 'pcie.yaml' in device/dell/[PLATFORM]/ directory.

How to verify it
Execute "pcieutil check" command.
Logs: UT_logs.txt
---
 .../x86_64-dellemc_z9332f_d1508-r0/pcie.yaml  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 device/dell/x86_64-dellemc_z9332f_d1508-r0/pcie.yaml

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/pcie.yaml b/device/dell/x86_64-dellemc_z9332f_d1508-r0/pcie.yaml
new file mode 100644
index 000000000000..fbd2549082a6
--- /dev/null
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/pcie.yaml
@@ -0,0 +1,28 @@
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: 1c
+  fn: '0'
+  id: 8c10
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #1 (rev d5)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '05'
+  dev: '00'
+  fn: '0'
+  id: b980
+  name: 'Ethernet controller: Broadcom Limited Device b980 (rev 11)'
+- bus: 09
+  dev: '00'
+  fn: '0'
+  id: '7021'
+  name: 'Memory controller: Xilinx Corporation Device 7021'

From 0f3f0c2a1a203ccb9c08952bb41727d4598b485d Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 5 Aug 2021 19:03:06 -0700
Subject: [PATCH 0688/1674] [202012] BRCM SAI 4.3.5.1 Fix for TH3 FDB Flush
 Timeout (#8342)

This is to pick up BRCM SAI 4.3.5.1 which contains the following fix:
CS00012201406: [4.3.3.9] SAI_STATUS_FAILURE on FDB flush after all ports flapped

Preliminary tests looks fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on z9332f (TH3) T0 DUT and all passed:
```
     ipfwd/test_dir_bcast.py
     fib/test_fib.py
```
Manually ran the following test cases on S6100 (TH) and all passed:
```
     ipfwd/test_dir_bcast.py
     fdb/test_fdb.py
```
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6e26ff853b9a..f1d101cc4321 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 2f251acf9868..93851b2f308a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.3.9_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.3.9_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a21fdeb58ca29ce0a88a8c55970982f7bd3ff895 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 6 Aug 2021 03:40:24 -0700
Subject: [PATCH 0689/1674] [202012][utilities] advance sonic-utilities
 submodule head (#8355)

To include following changes:

* d84a8cc 2021-08-05 | [fast-reboot] revert the change of disabling counter polling before fast-reboot (#1744) (HEAD -> 202012, github/202012) [Ying Xie]
* e900bc5 2021-08-04 | Add script null_route_helper (#1718) [bingwang-ms]
* 85f14e1 2021-08-02 | disk_check updates: (#1736) [Renuka Manavalan]
* d68ac1c 2021-05-27 | [console][show] Force refresh all lines status during show line (#1641) [Blueve]
* a0e417f 2021-04-25 | [console] Display success message after line cleared (#1579) [Blueve]
* 0c6bb27 2021-04-07 | [console] Include Flow Control status in show line result (#1549) [Blueve]
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index a9606fb3d81e..d84a8cc55777 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit a9606fb3d81ebdec8c90e058c9bda8f73bdbe31d
+Subproject commit d84a8cc55777f2fec90e2a079105339d54f736fa

From 0162cee667f191c0a7a8024c1750b2356ff8dd53 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 6 Aug 2021 03:41:36 -0700
Subject: [PATCH 0690/1674] [sonic-swss-common][sonic-snmpagent] Update
 submodule (#8357)

Include below commits

sonic-swss-common
```
83d3351 2021-04-22 | [swig] fix ConfigDBConnector.db_name (#483) [Qi Luo]
fdf296f 2021-04-09 | Fix: ConfigDBConnector call super init with proper parameter name (#470) [Qi Luo]
4f580e3 2021-03-26 | [swig] translate SonicV2Connector::keys return type from C++ vector<string> to Python list (#468) [Qi Luo]
```

sonic-snmpagent
```
c160c2b 2021-08-04 | CPU Spike because of redundant and flooded keyspace notifis handled (#230) [Vivek Reddy]
a4dd3bf 2021-08-03 | Non-block reading counters to tolerate corrupted/delayed counters in COUNTERS_DB (#231) [Qi Luo]
```
---
 src/sonic-snmpagent   | 2 +-
 src/sonic-swss-common | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 946e5cf2344d..c160c2b2a12d 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 946e5cf2344da47d0cdf8de5d31d70b0484664ef
+Subproject commit c160c2b2a12d1c4d139b223165818f50f426dd39
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index bf8c832cf1c7..83d3351bc54f 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit bf8c832cf1c7a6e72d7b1c843888ffb4a27088c8
+Subproject commit 83d3351bc54fabb3b87789af31d664c5a0c00d00

From db8cc247e0da3a19957602ec825de07e2dd8c30a Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 6 Aug 2021 23:33:40 -0700
Subject: [PATCH 0691/1674] [build]: Fix docker pull on armhf platform

armhf build uses native dockerd

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 files/build_templates/sonic_debian_extension.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 19566fd611ba..25bee2dce313 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -650,7 +650,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS ta
 {% if include_kubernetes == "y" %}
 ## Pull in kubernetes docker images
 echo "pulling universal k8s images ..."
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT docker pull k8s.gcr.io/pause:${K8s_GCR_IO_PAUSE_VERSION}
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS pull k8s.gcr.io/pause:${K8s_GCR_IO_PAUSE_VERSION}
 echo "docker images pull complete"
 {% endif %}
 

From 99d3e2767ebc73e375c0afb1f4ebcc3999781a19 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Wed, 7 Jul 2021 22:57:58 -0700
Subject: [PATCH 0692/1674] Support L1 & L3 Config generation in SONiC  (#7637)

Why I did it
This provides support for: PR #7074.

How I did it
Extend sonic-config-engine/config_samples.py to provide support for l1 & l3
---
 src/sonic-config-engine/config_samples.py     |  29 +-
 src/sonic-config-engine/data/l1intf.j2        |  26 ++
 src/sonic-config-engine/data/l3intf.j2        |  65 ++++
 .../tests/l1-l3-sample-port-config.ini        |  33 ++
 .../tests/sample_output/py2/l1_intfs.json     | 261 +++++++++++++++
 .../tests/sample_output/py2/l3_intfs.json     | 301 ++++++++++++++++++
 .../tests/sample_output/py3/l1_intfs.json     | 261 +++++++++++++++
 .../tests/sample_output/py3/l3_intfs.json     | 301 ++++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py |  37 +++
 9 files changed, 1313 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/data/l1intf.j2
 create mode 100644 src/sonic-config-engine/data/l3intf.j2
 create mode 100644 src/sonic-config-engine/tests/l1-l3-sample-port-config.ini
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json

diff --git a/src/sonic-config-engine/config_samples.py b/src/sonic-config-engine/config_samples.py
index 5a58ca560221..f8dc4b1c13b3 100644
--- a/src/sonic-config-engine/config_samples.py
+++ b/src/sonic-config-engine/config_samples.py
@@ -10,6 +10,31 @@
 else:
     UNICODE_TYPE = unicode
 
+# The following config generation methods exits:
+#    't1': generate_t1_sample_config,
+#    'l2': generate_l2_config,
+#    'empty': generate_empty_config,
+#    'l1': generate_l1_config,
+#    'l3': generate_l3_config
+
+def generate_l1_config(data):
+    for port in natsorted(data['PORT']):
+        data['PORT'][port]['admin_status'] = 'up'
+        data['PORT'][port]['mtu'] = '9100'
+    return data;
+
+def generate_l3_config(data):
+    data['LOOPBACK_INTERFACE'] = {"Loopback0": {},
+                                  "Loopback0|10.1.0.1/32": {}}
+    data['BGP_NEIGHBOR'] = {}
+    data['DEVICE_NEIGHBOR'] = {}
+    data['INTERFACE'] = {}
+    for port in natsorted(data['PORT']):
+        data['PORT'][port]['admin_status'] = 'up'
+        data['PORT'][port]['mtu'] = '9100'
+        data['INTERFACE']['{}'.format(port)] = {}
+    return data;
+
 def generate_t1_sample_config(data):
     data['DEVICE_METADATA']['localhost']['hostname'] = 'sonic'
     data['DEVICE_METADATA']['localhost']['type'] = 'LeafRouter'
@@ -126,7 +151,9 @@ def generate_l2_config(data):
 _sample_generators = {
         't1': generate_t1_sample_config,
         'l2': generate_l2_config,
-        'empty': generate_empty_config
+        'empty': generate_empty_config,
+        'l1': generate_l1_config,
+        'l3': generate_l3_config
         }
 
 def get_available_config():
diff --git a/src/sonic-config-engine/data/l1intf.j2 b/src/sonic-config-engine/data/l1intf.j2
new file mode 100644
index 000000000000..06222632e0da
--- /dev/null
+++ b/src/sonic-config-engine/data/l1intf.j2
@@ -0,0 +1,26 @@
+{
+    "DEVICE_METADATA": {
+        "localhost" : {
+        "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
+    }
+    },
+    {% set ns = {'firstPrinted': False} -%}
+    "PORT": {
+        {%- for key, value in PORT.items() -%}
+        {%- if ns.firstPrinted %},{% endif %}
+
+        "{{ key }}": {
+            {%- for keyPort, valuePort in value.items() %}
+
+            {% if keyPort != "admin_status" %}"{{ keyPort }}": "{{ valuePort }}",{% endif %}
+            {%- endfor %}
+
+            "admin_status": "{{ value.admin_status|default("up") }}",
+            "mtu": "9100"
+        }
+        {%- if ns.update({'firstPrinted': True}) %}{% endif -%}
+        {%- endfor %}
+
+    }
+}
+
diff --git a/src/sonic-config-engine/data/l3intf.j2 b/src/sonic-config-engine/data/l3intf.j2
new file mode 100644
index 000000000000..255868eb8257
--- /dev/null
+++ b/src/sonic-config-engine/data/l3intf.j2
@@ -0,0 +1,65 @@
+{
+    "DEVICE_METADATA": {
+        "localhost" : {
+        "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
+    }
+    },
+    {% set ns = {'firstPrinted': False} -%}
+    "PORT": {
+        {%- for key, value in PORT.items() -%}
+        {%- if ns.firstPrinted %},{% endif %}
+
+        "{{ key }}": {
+            {%- for keyPort, valuePort in value.items() %}
+
+            {% if keyPort != "admin_status" %}"{{ keyPort }}": "{{ valuePort }}",{% endif %}
+            {%- endfor %}
+
+            "admin_status": "{{ value.admin_status|default("up") }}",
+            "mtu": "9100"
+        }
+        {%- if ns.update({'firstPrinted': True}) %}{% endif -%}
+        {%- endfor %}
+
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback0": {},
+        "Loopback0|10.1.0.1/32": {}
+    },
+    "BGP_NEIGHBOR": {},
+    "DEVICE_NEIGHBOR": {},
+    "INTERFACE": {
+        "Ethernet0": {},
+        "Ethernet1": {},
+        "Ethernet2": {},
+        "Ethernet3": {},
+        "Ethernet4": {},
+        "Ethernet5": {},
+        "Ethernet6": {},
+        "Ethernet7": {},
+        "Ethernet8": {},
+        "Ethernet9": {},
+        "Ethernet10": {},
+        "Ethernet11": {},
+        "Ethernet12": {},
+        "Ethernet13": {},
+        "Ethernet14": {},
+        "Ethernet15": {},
+        "Ethernet16": {},
+        "Ethernet17": {},
+        "Ethernet18": {},
+        "Ethernet19": {},
+        "Ethernet20": {},
+        "Ethernet21": {},
+        "Ethernet22": {},
+        "Ethernet23": {},
+        "Ethernet24": {},
+        "Ethernet25": {},
+        "Ethernet26": {},
+        "Ethernet27": {},
+        "Ethernet28": {},
+        "Ethernet29": {},
+        "Ethernet30": {},
+        "Ethernet31": {}
+    }
+}
diff --git a/src/sonic-config-engine/tests/l1-l3-sample-port-config.ini b/src/sonic-config-engine/tests/l1-l3-sample-port-config.ini
new file mode 100644
index 000000000000..f6a3ea049b85
--- /dev/null
+++ b/src/sonic-config-engine/tests/l1-l3-sample-port-config.ini
@@ -0,0 +1,33 @@
+# name lanes alias index speed
+Ethernet0      1296,1297,1298,1299       Ethernet0   0    100000
+Ethernet1      1300,1301,1302,1303       Ethernet1   1    100000
+Ethernet2      1288,1289,1290,1291       Ethernet2   2    100000
+Ethernet3      1292,1293,1294,1295       Ethernet3   3    100000
+Ethernet4      1280,1281,1282,1283       Ethernet4   4    100000
+Ethernet5      1284,1285,1286,1287       Ethernet5   5    100000
+Ethernet6      1032,1033,1034,1035       Ethernet6   6    100000
+Ethernet7      1036,1037,1038,1039       Ethernet7   7    100000
+Ethernet8      1024,1025,1026,1027       Ethernet8   8    100000
+Ethernet9      1028,1029,1030,1031       Ethernet9   9    100000
+Ethernet10      772,773,774,775       Ethernet10   10    100000
+Ethernet11      768,769,770,771       Ethernet11   11    100000
+Ethernet12      780,781,782,783       Ethernet12   12    100000
+Ethernet13      776,777,778,779       Ethernet13   13    100000
+Ethernet14      528,529,530,531       Ethernet14   14    100000
+Ethernet15      532,533,534,535       Ethernet15   15    100000
+Ethernet16      520,521,522,523       Ethernet16   16    100000
+Ethernet17      524,525,526,527       Ethernet17   17    100000
+Ethernet18      512,513,514,515       Ethernet18   18    100000
+Ethernet19      516,517,518,519       Ethernet19   19    100000
+Ethernet20      272,273,274,275       Ethernet20   20    100000
+Ethernet21      276,277,278,279       Ethernet21   21    100000
+Ethernet22      264,265,266,267       Ethernet22   22    100000
+Ethernet23      268,269,270,271       Ethernet23   23    100000
+Ethernet24      256,257,258,259       Ethernet24   24    100000
+Ethernet25      260,261,262,263       Ethernet25   25    100000
+Ethernet26      16,17,18,19       Ethernet26   26    100000
+Ethernet27      20,21,22,23       Ethernet27   27    100000
+Ethernet28      8,9,10,11       Ethernet28   28    100000
+Ethernet29      12,13,14,15       Ethernet29   29    100000
+Ethernet30      0,1,2,3       Ethernet30   30    100000
+Ethernet31      4,5,6,7       Ethernet31   31    100000
diff --git a/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json b/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json
new file mode 100644
index 000000000000..bc2d533e87a1
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json
@@ -0,0 +1,261 @@
+{
+    "DEVICE_METADATA": {"localhost": {"hwsku": "32x1000Gb"}},
+    "PORT": {
+        "Ethernet0": {
+            "admin_status": "up",
+            "alias": "Ethernet0",
+            "index": "0",
+            "lanes": "1296,1297,1298,1299",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet1": {
+            "admin_status": "up",
+            "alias": "Ethernet1",
+            "index": "1",
+            "lanes": "1300,1301,1302,1303",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet10": {
+            "admin_status": "up",
+            "alias": "Ethernet10",
+            "index": "10",
+            "lanes": "772,773,774,775",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet11": {
+            "admin_status": "up",
+            "alias": "Ethernet11",
+            "index": "11",
+            "lanes": "768,769,770,771",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet12": {
+            "admin_status": "up",
+            "alias": "Ethernet12",
+            "index": "12",
+            "lanes": "780,781,782,783",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet13": {
+            "admin_status": "up",
+            "alias": "Ethernet13",
+            "index": "13",
+            "lanes": "776,777,778,779",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet14": {
+            "admin_status": "up",
+            "alias": "Ethernet14",
+            "index": "14",
+            "lanes": "528,529,530,531",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet15": {
+            "admin_status": "up",
+            "alias": "Ethernet15",
+            "index": "15",
+            "lanes": "532,533,534,535",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet16": {
+            "admin_status": "up",
+            "alias": "Ethernet16",
+            "index": "16",
+            "lanes": "520,521,522,523",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet17": {
+            "admin_status": "up",
+            "alias": "Ethernet17",
+            "index": "17",
+            "lanes": "524,525,526,527",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet18": {
+            "admin_status": "up",
+            "alias": "Ethernet18",
+            "index": "18",
+            "lanes": "512,513,514,515",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet19": {
+            "admin_status": "up",
+            "alias": "Ethernet19",
+            "index": "19",
+            "lanes": "516,517,518,519",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet2": {
+            "admin_status": "up",
+            "alias": "Ethernet2",
+            "index": "2",
+            "lanes": "1288,1289,1290,1291",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet20": {
+            "admin_status": "up",
+            "alias": "Ethernet20",
+            "index": "20",
+            "lanes": "272,273,274,275",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet21": {
+            "admin_status": "up",
+            "alias": "Ethernet21",
+            "index": "21",
+            "lanes": "276,277,278,279",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet22": {
+            "admin_status": "up",
+            "alias": "Ethernet22",
+            "index": "22",
+            "lanes": "264,265,266,267",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet23": {
+            "admin_status": "up",
+            "alias": "Ethernet23",
+            "index": "23",
+            "lanes": "268,269,270,271",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet24": {
+            "admin_status": "up",
+            "alias": "Ethernet24",
+            "index": "24",
+            "lanes": "256,257,258,259",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet25": {
+            "admin_status": "up",
+            "alias": "Ethernet25",
+            "index": "25",
+            "lanes": "260,261,262,263",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet26": {
+            "admin_status": "up",
+            "alias": "Ethernet26",
+            "index": "26",
+            "lanes": "16,17,18,19",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet27": {
+            "admin_status": "up",
+            "alias": "Ethernet27",
+            "index": "27",
+            "lanes": "20,21,22,23",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet28": {
+            "admin_status": "up",
+            "alias": "Ethernet28",
+            "index": "28",
+            "lanes": "8,9,10,11",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet29": {
+            "admin_status": "up",
+            "alias": "Ethernet29",
+            "index": "29",
+            "lanes": "12,13,14,15",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet3": {
+            "admin_status": "up",
+            "alias": "Ethernet3",
+            "index": "3",
+            "lanes": "1292,1293,1294,1295",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet30": {
+            "admin_status": "up",
+            "alias": "Ethernet30",
+            "index": "30",
+            "lanes": "0,1,2,3",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet31": {
+            "admin_status": "up",
+            "alias": "Ethernet31",
+            "index": "31",
+            "lanes": "4,5,6,7",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet4": {
+            "admin_status": "up",
+            "alias": "Ethernet4",
+            "index": "4",
+            "lanes": "1280,1281,1282,1283",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet5": {
+            "admin_status": "up",
+            "alias": "Ethernet5",
+            "index": "5",
+            "lanes": "1284,1285,1286,1287",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet6": {
+            "admin_status": "up",
+            "alias": "Ethernet6",
+            "index": "6",
+            "lanes": "1032,1033,1034,1035",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet7": {
+            "admin_status": "up",
+            "alias": "Ethernet7",
+            "index": "7",
+            "lanes": "1036,1037,1038,1039",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet8": {
+            "admin_status": "up",
+            "alias": "Ethernet8",
+            "index": "8",
+            "lanes": "1024,1025,1026,1027",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet9": {
+            "admin_status": "up",
+            "alias": "Ethernet9",
+            "index": "9",
+            "lanes": "1028,1029,1030,1031",
+            "mtu": "9100",
+            "speed": "100000"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json b/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json
new file mode 100644
index 000000000000..9ca31832303f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json
@@ -0,0 +1,301 @@
+{
+    "DEVICE_METADATA": {"localhost": {"hwsku": "32x1000Gb"}},
+    "PORT": {
+        "Ethernet0": {
+            "admin_status": "up",
+            "alias": "Ethernet0",
+            "index": "0",
+            "lanes": "1296,1297,1298,1299",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet1": {
+            "admin_status": "up",
+            "alias": "Ethernet1",
+            "index": "1",
+            "lanes": "1300,1301,1302,1303",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet10": {
+            "admin_status": "up",
+            "alias": "Ethernet10",
+            "index": "10",
+            "lanes": "772,773,774,775",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet11": {
+            "admin_status": "up",
+            "alias": "Ethernet11",
+            "index": "11",
+            "lanes": "768,769,770,771",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet12": {
+            "admin_status": "up",
+            "alias": "Ethernet12",
+            "index": "12",
+            "lanes": "780,781,782,783",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet13": {
+            "admin_status": "up",
+            "alias": "Ethernet13",
+            "index": "13",
+            "lanes": "776,777,778,779",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet14": {
+            "admin_status": "up",
+            "alias": "Ethernet14",
+            "index": "14",
+            "lanes": "528,529,530,531",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet15": {
+            "admin_status": "up",
+            "alias": "Ethernet15",
+            "index": "15",
+            "lanes": "532,533,534,535",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet16": {
+            "admin_status": "up",
+            "alias": "Ethernet16",
+            "index": "16",
+            "lanes": "520,521,522,523",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet17": {
+            "admin_status": "up",
+            "alias": "Ethernet17",
+            "index": "17",
+            "lanes": "524,525,526,527",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet18": {
+            "admin_status": "up",
+            "alias": "Ethernet18",
+            "index": "18",
+            "lanes": "512,513,514,515",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet19": {
+            "admin_status": "up",
+            "alias": "Ethernet19",
+            "index": "19",
+            "lanes": "516,517,518,519",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet2": {
+            "admin_status": "up",
+            "alias": "Ethernet2",
+            "index": "2",
+            "lanes": "1288,1289,1290,1291",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet20": {
+            "admin_status": "up",
+            "alias": "Ethernet20",
+            "index": "20",
+            "lanes": "272,273,274,275",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet21": {
+            "admin_status": "up",
+            "alias": "Ethernet21",
+            "index": "21",
+            "lanes": "276,277,278,279",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet22": {
+            "admin_status": "up",
+            "alias": "Ethernet22",
+            "index": "22",
+            "lanes": "264,265,266,267",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet23": {
+            "admin_status": "up",
+            "alias": "Ethernet23",
+            "index": "23",
+            "lanes": "268,269,270,271",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet24": {
+            "admin_status": "up",
+            "alias": "Ethernet24",
+            "index": "24",
+            "lanes": "256,257,258,259",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet25": {
+            "admin_status": "up",
+            "alias": "Ethernet25",
+            "index": "25",
+            "lanes": "260,261,262,263",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet26": {
+            "admin_status": "up",
+            "alias": "Ethernet26",
+            "index": "26",
+            "lanes": "16,17,18,19",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet27": {
+            "admin_status": "up",
+            "alias": "Ethernet27",
+            "index": "27",
+            "lanes": "20,21,22,23",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet28": {
+            "admin_status": "up",
+            "alias": "Ethernet28",
+            "index": "28",
+            "lanes": "8,9,10,11",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet29": {
+            "admin_status": "up",
+            "alias": "Ethernet29",
+            "index": "29",
+            "lanes": "12,13,14,15",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet3": {
+            "admin_status": "up",
+            "alias": "Ethernet3",
+            "index": "3",
+            "lanes": "1292,1293,1294,1295",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet30": {
+            "admin_status": "up",
+            "alias": "Ethernet30",
+            "index": "30",
+            "lanes": "0,1,2,3",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet31": {
+            "admin_status": "up",
+            "alias": "Ethernet31",
+            "index": "31",
+            "lanes": "4,5,6,7",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet4": {
+            "admin_status": "up",
+            "alias": "Ethernet4",
+            "index": "4",
+            "lanes": "1280,1281,1282,1283",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet5": {
+            "admin_status": "up",
+            "alias": "Ethernet5",
+            "index": "5",
+            "lanes": "1284,1285,1286,1287",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet6": {
+            "admin_status": "up",
+            "alias": "Ethernet6",
+            "index": "6",
+            "lanes": "1032,1033,1034,1035",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet7": {
+            "admin_status": "up",
+            "alias": "Ethernet7",
+            "index": "7",
+            "lanes": "1036,1037,1038,1039",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet8": {
+            "admin_status": "up",
+            "alias": "Ethernet8",
+            "index": "8",
+            "lanes": "1024,1025,1026,1027",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet9": {
+            "admin_status": "up",
+            "alias": "Ethernet9",
+            "index": "9",
+            "lanes": "1028,1029,1030,1031",
+            "mtu": "9100",
+            "speed": "100000"
+        }
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback0": {},
+        "Loopback0|10.1.0.1/32": {}
+    },
+    "BGP_NEIGHBOR": {},
+    "DEVICE_NEIGHBOR": {},
+    "INTERFACE": {
+        "Ethernet0": {},
+        "Ethernet1": {},
+        "Ethernet2": {},
+        "Ethernet3": {},
+        "Ethernet4": {},
+        "Ethernet5": {},
+        "Ethernet6": {},
+        "Ethernet7": {},
+        "Ethernet8": {},
+        "Ethernet9": {},
+        "Ethernet10": {},
+        "Ethernet11": {},
+        "Ethernet12": {},
+        "Ethernet13": {},
+        "Ethernet14": {},
+        "Ethernet15": {},
+        "Ethernet16": {},
+        "Ethernet17": {},
+        "Ethernet18": {},
+        "Ethernet19": {},
+        "Ethernet20": {},
+        "Ethernet21": {},
+        "Ethernet22": {},
+        "Ethernet23": {},
+        "Ethernet24": {},
+        "Ethernet25": {},
+        "Ethernet26": {},
+        "Ethernet27": {},
+        "Ethernet28": {},
+        "Ethernet29": {},
+        "Ethernet30": {},
+        "Ethernet31": {}
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json b/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json
new file mode 100644
index 000000000000..bc2d533e87a1
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json
@@ -0,0 +1,261 @@
+{
+    "DEVICE_METADATA": {"localhost": {"hwsku": "32x1000Gb"}},
+    "PORT": {
+        "Ethernet0": {
+            "admin_status": "up",
+            "alias": "Ethernet0",
+            "index": "0",
+            "lanes": "1296,1297,1298,1299",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet1": {
+            "admin_status": "up",
+            "alias": "Ethernet1",
+            "index": "1",
+            "lanes": "1300,1301,1302,1303",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet10": {
+            "admin_status": "up",
+            "alias": "Ethernet10",
+            "index": "10",
+            "lanes": "772,773,774,775",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet11": {
+            "admin_status": "up",
+            "alias": "Ethernet11",
+            "index": "11",
+            "lanes": "768,769,770,771",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet12": {
+            "admin_status": "up",
+            "alias": "Ethernet12",
+            "index": "12",
+            "lanes": "780,781,782,783",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet13": {
+            "admin_status": "up",
+            "alias": "Ethernet13",
+            "index": "13",
+            "lanes": "776,777,778,779",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet14": {
+            "admin_status": "up",
+            "alias": "Ethernet14",
+            "index": "14",
+            "lanes": "528,529,530,531",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet15": {
+            "admin_status": "up",
+            "alias": "Ethernet15",
+            "index": "15",
+            "lanes": "532,533,534,535",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet16": {
+            "admin_status": "up",
+            "alias": "Ethernet16",
+            "index": "16",
+            "lanes": "520,521,522,523",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet17": {
+            "admin_status": "up",
+            "alias": "Ethernet17",
+            "index": "17",
+            "lanes": "524,525,526,527",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet18": {
+            "admin_status": "up",
+            "alias": "Ethernet18",
+            "index": "18",
+            "lanes": "512,513,514,515",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet19": {
+            "admin_status": "up",
+            "alias": "Ethernet19",
+            "index": "19",
+            "lanes": "516,517,518,519",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet2": {
+            "admin_status": "up",
+            "alias": "Ethernet2",
+            "index": "2",
+            "lanes": "1288,1289,1290,1291",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet20": {
+            "admin_status": "up",
+            "alias": "Ethernet20",
+            "index": "20",
+            "lanes": "272,273,274,275",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet21": {
+            "admin_status": "up",
+            "alias": "Ethernet21",
+            "index": "21",
+            "lanes": "276,277,278,279",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet22": {
+            "admin_status": "up",
+            "alias": "Ethernet22",
+            "index": "22",
+            "lanes": "264,265,266,267",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet23": {
+            "admin_status": "up",
+            "alias": "Ethernet23",
+            "index": "23",
+            "lanes": "268,269,270,271",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet24": {
+            "admin_status": "up",
+            "alias": "Ethernet24",
+            "index": "24",
+            "lanes": "256,257,258,259",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet25": {
+            "admin_status": "up",
+            "alias": "Ethernet25",
+            "index": "25",
+            "lanes": "260,261,262,263",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet26": {
+            "admin_status": "up",
+            "alias": "Ethernet26",
+            "index": "26",
+            "lanes": "16,17,18,19",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet27": {
+            "admin_status": "up",
+            "alias": "Ethernet27",
+            "index": "27",
+            "lanes": "20,21,22,23",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet28": {
+            "admin_status": "up",
+            "alias": "Ethernet28",
+            "index": "28",
+            "lanes": "8,9,10,11",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet29": {
+            "admin_status": "up",
+            "alias": "Ethernet29",
+            "index": "29",
+            "lanes": "12,13,14,15",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet3": {
+            "admin_status": "up",
+            "alias": "Ethernet3",
+            "index": "3",
+            "lanes": "1292,1293,1294,1295",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet30": {
+            "admin_status": "up",
+            "alias": "Ethernet30",
+            "index": "30",
+            "lanes": "0,1,2,3",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet31": {
+            "admin_status": "up",
+            "alias": "Ethernet31",
+            "index": "31",
+            "lanes": "4,5,6,7",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet4": {
+            "admin_status": "up",
+            "alias": "Ethernet4",
+            "index": "4",
+            "lanes": "1280,1281,1282,1283",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet5": {
+            "admin_status": "up",
+            "alias": "Ethernet5",
+            "index": "5",
+            "lanes": "1284,1285,1286,1287",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet6": {
+            "admin_status": "up",
+            "alias": "Ethernet6",
+            "index": "6",
+            "lanes": "1032,1033,1034,1035",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet7": {
+            "admin_status": "up",
+            "alias": "Ethernet7",
+            "index": "7",
+            "lanes": "1036,1037,1038,1039",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet8": {
+            "admin_status": "up",
+            "alias": "Ethernet8",
+            "index": "8",
+            "lanes": "1024,1025,1026,1027",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet9": {
+            "admin_status": "up",
+            "alias": "Ethernet9",
+            "index": "9",
+            "lanes": "1028,1029,1030,1031",
+            "mtu": "9100",
+            "speed": "100000"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json b/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json
new file mode 100644
index 000000000000..9ca31832303f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json
@@ -0,0 +1,301 @@
+{
+    "DEVICE_METADATA": {"localhost": {"hwsku": "32x1000Gb"}},
+    "PORT": {
+        "Ethernet0": {
+            "admin_status": "up",
+            "alias": "Ethernet0",
+            "index": "0",
+            "lanes": "1296,1297,1298,1299",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet1": {
+            "admin_status": "up",
+            "alias": "Ethernet1",
+            "index": "1",
+            "lanes": "1300,1301,1302,1303",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet10": {
+            "admin_status": "up",
+            "alias": "Ethernet10",
+            "index": "10",
+            "lanes": "772,773,774,775",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet11": {
+            "admin_status": "up",
+            "alias": "Ethernet11",
+            "index": "11",
+            "lanes": "768,769,770,771",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet12": {
+            "admin_status": "up",
+            "alias": "Ethernet12",
+            "index": "12",
+            "lanes": "780,781,782,783",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet13": {
+            "admin_status": "up",
+            "alias": "Ethernet13",
+            "index": "13",
+            "lanes": "776,777,778,779",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet14": {
+            "admin_status": "up",
+            "alias": "Ethernet14",
+            "index": "14",
+            "lanes": "528,529,530,531",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet15": {
+            "admin_status": "up",
+            "alias": "Ethernet15",
+            "index": "15",
+            "lanes": "532,533,534,535",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet16": {
+            "admin_status": "up",
+            "alias": "Ethernet16",
+            "index": "16",
+            "lanes": "520,521,522,523",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet17": {
+            "admin_status": "up",
+            "alias": "Ethernet17",
+            "index": "17",
+            "lanes": "524,525,526,527",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet18": {
+            "admin_status": "up",
+            "alias": "Ethernet18",
+            "index": "18",
+            "lanes": "512,513,514,515",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet19": {
+            "admin_status": "up",
+            "alias": "Ethernet19",
+            "index": "19",
+            "lanes": "516,517,518,519",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet2": {
+            "admin_status": "up",
+            "alias": "Ethernet2",
+            "index": "2",
+            "lanes": "1288,1289,1290,1291",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet20": {
+            "admin_status": "up",
+            "alias": "Ethernet20",
+            "index": "20",
+            "lanes": "272,273,274,275",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet21": {
+            "admin_status": "up",
+            "alias": "Ethernet21",
+            "index": "21",
+            "lanes": "276,277,278,279",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet22": {
+            "admin_status": "up",
+            "alias": "Ethernet22",
+            "index": "22",
+            "lanes": "264,265,266,267",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet23": {
+            "admin_status": "up",
+            "alias": "Ethernet23",
+            "index": "23",
+            "lanes": "268,269,270,271",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet24": {
+            "admin_status": "up",
+            "alias": "Ethernet24",
+            "index": "24",
+            "lanes": "256,257,258,259",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet25": {
+            "admin_status": "up",
+            "alias": "Ethernet25",
+            "index": "25",
+            "lanes": "260,261,262,263",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet26": {
+            "admin_status": "up",
+            "alias": "Ethernet26",
+            "index": "26",
+            "lanes": "16,17,18,19",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet27": {
+            "admin_status": "up",
+            "alias": "Ethernet27",
+            "index": "27",
+            "lanes": "20,21,22,23",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet28": {
+            "admin_status": "up",
+            "alias": "Ethernet28",
+            "index": "28",
+            "lanes": "8,9,10,11",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet29": {
+            "admin_status": "up",
+            "alias": "Ethernet29",
+            "index": "29",
+            "lanes": "12,13,14,15",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet3": {
+            "admin_status": "up",
+            "alias": "Ethernet3",
+            "index": "3",
+            "lanes": "1292,1293,1294,1295",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet30": {
+            "admin_status": "up",
+            "alias": "Ethernet30",
+            "index": "30",
+            "lanes": "0,1,2,3",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet31": {
+            "admin_status": "up",
+            "alias": "Ethernet31",
+            "index": "31",
+            "lanes": "4,5,6,7",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet4": {
+            "admin_status": "up",
+            "alias": "Ethernet4",
+            "index": "4",
+            "lanes": "1280,1281,1282,1283",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet5": {
+            "admin_status": "up",
+            "alias": "Ethernet5",
+            "index": "5",
+            "lanes": "1284,1285,1286,1287",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet6": {
+            "admin_status": "up",
+            "alias": "Ethernet6",
+            "index": "6",
+            "lanes": "1032,1033,1034,1035",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet7": {
+            "admin_status": "up",
+            "alias": "Ethernet7",
+            "index": "7",
+            "lanes": "1036,1037,1038,1039",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet8": {
+            "admin_status": "up",
+            "alias": "Ethernet8",
+            "index": "8",
+            "lanes": "1024,1025,1026,1027",
+            "mtu": "9100",
+            "speed": "100000"
+        },
+        "Ethernet9": {
+            "admin_status": "up",
+            "alias": "Ethernet9",
+            "index": "9",
+            "lanes": "1028,1029,1030,1031",
+            "mtu": "9100",
+            "speed": "100000"
+        }
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback0": {},
+        "Loopback0|10.1.0.1/32": {}
+    },
+    "BGP_NEIGHBOR": {},
+    "DEVICE_NEIGHBOR": {},
+    "INTERFACE": {
+        "Ethernet0": {},
+        "Ethernet1": {},
+        "Ethernet2": {},
+        "Ethernet3": {},
+        "Ethernet4": {},
+        "Ethernet5": {},
+        "Ethernet6": {},
+        "Ethernet7": {},
+        "Ethernet8": {},
+        "Ethernet9": {},
+        "Ethernet10": {},
+        "Ethernet11": {},
+        "Ethernet12": {},
+        "Ethernet13": {},
+        "Ethernet14": {},
+        "Ethernet15": {},
+        "Ethernet16": {},
+        "Ethernet17": {},
+        "Ethernet18": {},
+        "Ethernet19": {},
+        "Ethernet20": {},
+        "Ethernet21": {},
+        "Ethernet22": {},
+        "Ethernet23": {},
+        "Ethernet24": {},
+        "Ethernet25": {},
+        "Ethernet26": {},
+        "Ethernet27": {},
+        "Ethernet28": {},
+        "Ethernet29": {},
+        "Ethernet30": {},
+        "Ethernet31": {}
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 8b4e9c686bae..ee03d3d382fc 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -17,6 +17,7 @@ def setUp(self):
         self.t0_mvrf_minigraph = os.path.join(self.test_dir, 't0-sample-graph-mvrf.xml')
         self.pc_minigraph = os.path.join(self.test_dir, 'pc-test-graph.xml')
         self.t0_port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
+        self.l1_l3_port_config = os.path.join(self.test_dir, 'l1-l3-sample-port-config.ini')
         self.t0_7050cx3_port_config = os.path.join(self.test_dir, 't0_7050cx3_d48c8_port_config.ini')
         self.t1_mlnx_minigraph = os.path.join(self.test_dir, 't1-sample-graph-mlnx.xml')
         self.mlnx_port_config = os.path.join(self.test_dir, 'sample-port-config-mlnx.ini')
@@ -132,6 +133,42 @@ def test_l2switch_template(self):
         output_json = json.loads(output)
 
         self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
+    
+    def test_l1_ports_template(self):
+        argument = '-k 32x1000Gb --preset l1 -p ' + self.l1_l3_port_config
+        output = self.run_script(argument)
+        output_json = json.loads(output)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'l1_intfs.json')
+        with open(sample_output_file) as sample_output_fd:
+            sample_output_json = json.load(sample_output_fd)
+
+        self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
+
+        template_dir = os.path.join(self.test_dir, '..', 'data', 'l1intf.j2')
+        argument = '-t ' + template_dir + ' -k 32x1000Gb -p ' + self.l1_l3_port_config
+        output = self.run_script(argument)
+        output_json = json.loads(output)
+
+        self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
+
+    def test_l3_ports_template(self):
+        argument = '-k 32x1000Gb --preset l3 -p ' + self.l1_l3_port_config
+        output = self.run_script(argument)
+        output_json = json.loads(output)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'l3_intfs.json')
+        with open(sample_output_file) as sample_output_fd:
+            sample_output_json = json.load(sample_output_fd)
+
+        self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
+
+        template_dir = os.path.join(self.test_dir, '..', 'data', 'l3intf.j2')
+        argument = '-t ' + template_dir + ' -k 32x1000Gb -p ' + self.l1_l3_port_config
+        output = self.run_script(argument)
+        output_json = json.loads(output)
+
+        self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
 
     def test_l2switch_template_dualtor(self):
         extra_args = {

From 7be487bcc8546e357190546e3c27d2cea6c023fc Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 5 Aug 2021 20:42:04 -0700
Subject: [PATCH 0693/1674] DellEMC: Z9332f platform API changes (#8258)

Why I did it
platform test suite failed for few API's in DellEMC Z9332f platform.

How I did it
Modified the API's to return the expected values in the script.

How to verify it
Run platform test suite after making the changes.
---
 .../z9332f/sonic_platform/component.py        |  4 +--
 .../z9332f/sonic_platform/sfp.py              | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index c60cc06b8f57..f831c5c40b40 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -70,12 +70,12 @@ class Component(ComponentBase):
          ],
 
         ['Switch CPLD 1',
-         'Used for managing QSFP28/SFP port transceivers ',
+         'Used for managing QSFP-DD/QSFP28/SFP port transceivers ',
          get_cpld1_version
          ],
 
         ['Switch CPLD 2',
-         'Used for managing QSFP28/SFP port transceivers',
+         'Used for managing QSFP-DD/QSFP28/SFP port transceivers',
          get_cpld2_version
          ]
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index f5dbde3cb0ed..f4cec75ca79c 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -1073,8 +1073,13 @@ def get_tx_bias(self):
         try:
             offset = QSFP_DD_PAGE17
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_txbias_supported:
+                if self.qsfp_dd_DomInfo is None:
                     return None
+                if not self.qsfp_dd_txbias_supported:
+                    for lane in range(0, 8):
+                        tx_bias_list.append("N/A")
+                    return tx_bias_list
+
                 tx_bias_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXBIAS_OFFSET, QSFP_DD_TXBIAS_WIDTH)
                 tx_bias_data = self.qsfp_dd_DomInfo.parse_dom_tx_bias(tx_bias_data_raw, 0)
 
@@ -1093,8 +1098,6 @@ def get_tx_bias(self):
                 if tx_bias_data is not None:
                     tx1_bias = self._strip_unit_from_str(tx_bias_data['data']['TXBias']['value'])
                     tx_bias_list.append(tx1_bias)
-                else:
-                    tx_bias_list.append(0.0)
 
         except (TypeError, ValueError):
             return None
@@ -1107,8 +1110,12 @@ def get_rx_power(self):
         rx_power_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_rxpower_supported:
+                if self.qsfp_dd_DomInfo is None:
                     return None
+                if not self.qsfp_dd_rxpower_supported:
+                    for lane in range(0, 8):
+                        rx_power_list.append("N/A")
+                    return rx_power_list
 
                 offset = QSFP_DD_PAGE17
                 rx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_RXPOWER_OFFSET, QSFP_DD_TXPOWER_WIDTH)
@@ -1128,9 +1135,7 @@ def get_rx_power(self):
                 rx_power_data = self._get_eeprom_data('ChannelMonitor')
                 if rx_power_data is not None:
                      rx1_pw = self._strip_unit_from_str(rx_power_data['data']['RXPower']['value'])
-                else:
-                     rx1_pw = 0.0
-                rx_power_list.append(rx1_pw)
+                     rx_power_list.append(rx1_pw)
         except (TypeError, ValueError):
             return None
         return rx_power_list
@@ -1142,8 +1147,12 @@ def get_tx_power(self):
         tx_power_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                if self.qsfp_dd_DomInfo is None or not self.qsfp_dd_txpower_supported:
+                if self.qsfp_dd_DomInfo is None:
                     return None
+                if not self.qsfp_dd_txpower_supported:
+                    for lane in range(0, 8):
+                        tx_power_list.append("N/A")
+                    return tx_power_list
 
                 offset = QSFP_DD_PAGE17
                 tx_power_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXPOWER_OFFSET,
@@ -1177,9 +1186,7 @@ def get_tx_power(self):
                 channel_monitor_data = self._get_eeprom_data('ChannelMonitor')
                 if channel_monitor_data is not None:
                     tx1_pw = self._strip_unit_from_str(channel_monitor_data['data']['TXPower']['value'])
-                else:
-                    tx1_pw = 0.0
-                tx_power_list.append(tx1_pw)
+                    tx_power_list.append(tx1_pw)
         except (TypeError, ValueError):
             return None
         return tx_power_list
@@ -1212,6 +1219,8 @@ def reset(self):
 
                 # Convert our register value back to a hex string and write back
                 self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+            else:
+                return False
         except  ValueError:
             return  False
         return True

From 66c8934d84d21df90a2cfead26f80de21255a3cd Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 6 Aug 2021 10:36:10 -0700
Subject: [PATCH 0694/1674] Revert "Revert "Update default cable len to 0m for
 TD2"" (#8354)

* Update default cable len to 0m for TD2 (#8298)
* Update sonic-cfggen tests with the correct cable len

Signed-off-by: Neetha John <nejo@microsoft.com>

As part of the buffer reclamation efforts for TD2, setting the default cable len to 0m which means unused ports will have a cable len of 0m.

Why I did it
To align with the changes in Azure/sonic-swss#1830

How to verify it
- With the default cable len set to 0m and the associated changes in swss, CABLE_LENGTH table had '0m' set for unused ports and accordingly more space was reserved for the shared pool
- Cfggen tests passed with the cable len update
---
 .../Arista-7050-QX32/buffers_defaults_t0.j2                   | 2 +-
 .../Arista-7050-QX32/buffers_defaults_t1.j2                   | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2            | 2 +-
 .../Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2            | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t0.j2               | 2 +-
 .../Arista-7050QX32S-Q32/buffers_defaults_t1.j2               | 2 +-
 .../Force10-S6000/buffers_defaults_def.j2                     | 2 +-
 .../Force10-S6000/buffers_defaults_t0.j2                      | 2 +-
 .../Force10-S6000/buffers_defaults_t1.j2                      | 2 +-
 src/sonic-config-engine/tests/test_multinpu_cfggen.py         | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
index d93aa34893d6..3c0a68f1da88 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
index d93aa34893d6..3c0a68f1da88 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_def.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
index 38e34eb571e8..dc04b2265f33 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
@@ -1,4 +1,4 @@
-{%- set default_cable = '300m' %}
+{%- set default_cable = '0m' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
index 15e1600255ec..ab952515f96c 100644
--- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py
+++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
@@ -393,14 +393,14 @@ def test_buffers_multi_asic_template(self):
             output['CABLE_LENGTH'],
             {
                 'AZURE': {
-                    'Ethernet8': '300m',
+                    'Ethernet8': '0m',
                     'Ethernet0': '300m',
                     'Ethernet4': '300m',
                     'Ethernet-BP4': '5m',
                     'Ethernet-BP0': '5m',
                     'Ethernet-BP12': '5m',
                     'Ethernet-BP8': '5m',
-                    'Ethernet12': '300m'
+                    'Ethernet12': '0m'
                 }
             }
         )

From 25f53289eb0484be5bca04ce531f07529025a055 Mon Sep 17 00:00:00 2001
From: Longxiang Lyu <35479537+lolyu@users.noreply.github.com>
Date: Sat, 7 Aug 2021 12:14:18 +0800
Subject: [PATCH 0695/1674] [swss][arp_update] Send ipv6 pings over vlan sub
 interfaces (#8363)

#### Why I did it
* `arp_update` fails to ping those neighbors over vlan sub interfaces.

#### How I did it
* modify `arp_update_vars.j2` to get vlan sub interfaces with ipv6 addresses assigned.
* modify `arp_update` to send ipv6 pings over those retrieved vlan sub interfaces.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
---
 files/build_templates/arp_update_vars.j2 | 1 +
 files/scripts/arp_update                 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/build_templates/arp_update_vars.j2 b/files/build_templates/arp_update_vars.j2
index b9315b5ebe50..3cdfa8102340 100644
--- a/files/build_templates/arp_update_vars.j2
+++ b/files/build_templates/arp_update_vars.j2
@@ -1,5 +1,6 @@
 {
     "interface": "{% for (name, prefix) in INTERFACE|pfx_filter %}{% if prefix|ipv6 %}{{ name }} {% endif %}{% endfor %}",
     "pc_interface" : "{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}{% if prefix|ipv6 %}{{ name }} {% endif %}{% endfor %}",
+    "vlan_sub_interface": "{% for (name, prefix) in VLAN_SUB_INTERFACE|pfx_filter %}{% if prefix|ipv6 %}{{ name }} {% endif %}{% endfor %}",
     "vlan" : "{% if VLAN %}{{ VLAN.keys() | join(' ') }}{% endif %}"
 }
diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index 2fec40c14beb..1d4cf1ec541f 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -14,8 +14,9 @@ while /bin/true; do
   ARP_UPDATE_VARS=$(sonic-cfggen -d -t ${ARP_UPDATE_VARS_FILE})
   INTERFACE=$(echo $ARP_UPDATE_VARS | jq -r '.interface')
   PC_INTERFACE=$(echo $ARP_UPDATE_VARS | jq -r '.pc_interface')
+  VLAN_SUB_INTERFACE=$(echo $ARP_UPDATE_VARS | jq -r '.vlan_sub_interface')
 
-  ALL_INTERFACE="$INTERFACE $PC_INTERFACE"
+  ALL_INTERFACE="$INTERFACE $PC_INTERFACE $VLAN_SUB_INTERFACE"
   for intf in $ALL_INTERFACE; do
       ping6cmd="ping6 -I $intf -n -q -i 0 -c 1 -W 0 ff02::1 >/dev/null"
       intf_up=$(ip link show $intf | grep "state UP")

From e38cc58bbc7398f21c8d8b4d0d54a82769de5cc2 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Tue, 5 Jan 2021 02:17:26 -0800
Subject: [PATCH 0696/1674] [build]: add branch and release name in
 sonic_version.yml

the branch refers the branch name that the commit is in,
for example master, 202012, 201911, ...
In case there is no branch, the name will be HEAD.

release is encoded in /etc/sonic/sonic_release file.
the file is only available for a release branch.
It is not available in master branch.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 build_debian.sh                                  | 5 +++++
 platform/vs/sonic-version/build_sonic_version.sh | 1 +
 2 files changed, 6 insertions(+)

diff --git a/build_debian.sh b/build_debian.sh
index a966519a8034..6ec8abd0c604 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -471,12 +471,17 @@ fi
 
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
+if [ -f files/image_config/sonic_release ]; then
+    sudo cp files/image_config/sonic_release $FILESYSTEM_ROOT/etc/sonic/
+fi
 sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
 build_version: '${SONIC_IMAGE_VERSION}'
 debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
 kernel_version: '$kversion'
 asic_type: $sonic_asic_platform
 commit_id: '$(git rev-parse --short HEAD)'
+branch: '$(git rev-parse --abbrev-ref HEAD)'
+release: '$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $FILESYSTEM_ROOT/etc/sonic/sonic_release; else echo none; fi)'
 build_date: $(date -u)
 build_number: ${BUILD_NUMBER:-0}
 built_by: $USER@$BUILD_HOSTNAME
diff --git a/platform/vs/sonic-version/build_sonic_version.sh b/platform/vs/sonic-version/build_sonic_version.sh
index f118a1c20a6d..13c0be39bb79 100755
--- a/platform/vs/sonic-version/build_sonic_version.sh
+++ b/platform/vs/sonic-version/build_sonic_version.sh
@@ -2,6 +2,7 @@ tee $1 > /dev/null <<EOF
 build_version: '$sonic_version'
 asic_type: $sonic_asic_platform
 commit_id: '$(git rev-parse --short HEAD)'
+branch: '$(git rev-parse --abbrev-ref HEAD)'
 build_date: $(date -u)
 build_number: ${BUILD_NUMBER:-0}
 built_by: $USER@$BUILD_HOSTNAME

From ceab083fc52dba51efa179a3a6bf04988971b597 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 6 Aug 2021 21:20:10 -0700
Subject: [PATCH 0697/1674] [build]: add sonic_release 202012

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 files/image_config/sonic_release | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 files/image_config/sonic_release

diff --git a/files/image_config/sonic_release b/files/image_config/sonic_release
new file mode 100644
index 000000000000..5877a99dfbe2
--- /dev/null
+++ b/files/image_config/sonic_release
@@ -0,0 +1 @@
+202012

From ae7fa3269128f00bda928047b7c8c38e87b3ab69 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Sat, 7 Aug 2021 22:43:38 -0700
Subject: [PATCH 0698/1674] [pmon]: Enable Autorestart of the daemons in PMON
 for unexpected exit (#8358)

Enable Autorestart of the daemons in PMON for unexpected exit
Remove the daemon list from the critical_process which prevent the PMON
from restarting when the individual daemon crashes.
---
 .../docker-platform-monitor/critical_processes   |  3 ---
 .../docker-pmon.supervisord.conf.j2              | 16 ++++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dockers/docker-platform-monitor/critical_processes b/dockers/docker-platform-monitor/critical_processes
index 3165d13ecdbc..e69de29bb2d1 100644
--- a/dockers/docker-platform-monitor/critical_processes
+++ b/dockers/docker-platform-monitor/critical_processes
@@ -1,3 +0,0 @@
-program:ledd
-program:xcvrd
-program:psud
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 8347ee10f968..0af4ea03f7c2 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -33,10 +33,10 @@ dependent_startup=true
 command=/usr/local/bin/chassisd
 priority=3
 autostart=false
-autorestart=false
+autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
-startsecs=0
+startsecs=10
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}
@@ -72,10 +72,10 @@ dependent_startup_wait_for=rsyslogd:running
 command={% if API_VERSION == 3 and 'ledd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/ledd
 priority=5
 autostart=false
-autorestart=false
+autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
-startsecs=0
+startsecs=10
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}
@@ -89,10 +89,10 @@ command={% if API_VERSION == 3 and 'xcvrd' not in python2_daemons %}python3 {% e
 {% endif %}
 priority=6
 autostart=false
-autorestart=false
+autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
-startsecs=0
+startsecs=10
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}
@@ -102,10 +102,10 @@ dependent_startup_wait_for=rsyslogd:running
 command={% if API_VERSION == 3 and 'psud' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/psud
 priority=7
 autostart=false
-autorestart=false
+autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
-startsecs=0
+startsecs=10
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}

From 1c30a8b0c1fa527ac196a76a20626b284ddd0eff Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 9 Aug 2021 03:05:13 +0800
Subject: [PATCH 0699/1674] [ci/build]: Upgrade SONiC package versions (#8376)

---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-git     |  4 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  |  8 ++--
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-web     |  4 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-buster-arm64                 |  1 +
 .../versions-deb-buster-armhf                 |  1 +
 .../versions-deb-buster                       |  2 +
 .../docker-platform-monitor/versions-py3      |  1 +
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../versions-py3-all-arm64                    |  1 -
 .../versions-py3-all-armhf                    |  1 -
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster-arm64                 | 40 +++++++++----------
 .../versions-git                              |  1 -
 .../versions-py3-all-arm64                    |  4 +-
 .../versions-deb-buster-armhf                 | 40 +++++++++----------
 .../versions-git                              |  1 -
 .../versions-py3-all-armhf                    |  4 +-
 .../sonic-slave-buster/versions-deb-buster    | 40 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../versions-deb-stretch-arm64                | 12 +++---
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                | 12 +++---
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 12 +++---
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  4 +-
 .../versions/host-image/versions-deb-buster   | 12 +++---
 files/build/versions/host-image/versions-py3  |  5 ++-
 34 files changed, 122 insertions(+), 122 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index dd102e1d8282..b35ab8b34a08 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -41,7 +41,7 @@ libnl-route-3-dev==3.5.0-1
 libpango1.0-dev==1.42.4-8~deb10u1
 libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpixman-1-dev==0.36.0-1
-libsaibcm==4.3.3.9
+libsaibcm==4.3.5.1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 6bc8e892bb9c..62138f21c846 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==b2ae0ee763936fd0d72bb9673108f98a6824c7a2
+https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==ada56abe6efa17d3bac0c88661876b6da213b003
+https://salsa.debian.org/kernel-team/ethtool/==0162cee667f191c0a7a8024c1750b2356ff8dd53
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 51b392f34b44..74e73079eb17 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 97e51bfa3cb5..e77ffa5870f7 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=yQJG%2Fy%2BRyxbgHXERIHMeHDGcy%2BSjV%2BFeCTop9wfW5hQ%3D&se=2035-03-23T05%3A33%3A01Z&sp=r==73e00bc480f157a683d5f870a9f7230e
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.3.9_amd64.deb?sv=2015-04-05&sr=b&sig=UgZ4pYi9Q5mSK6QLlDCkz%2Br3u0WBdbS28K5apa0RmgQ%3D&se=2035-03-23T05%3A31%3A58Z&sp=r==dc19ba17c86e1e1c3bcfff0d6fd84fd1
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 8ac70a3e2147..9ce0f1c35e88 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
 amd64:debian:buster==sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2
 amd64:debian:stretch==sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:9cfe993f035d8a774e7ae147dd12a673f8db35c0e42f135221ff0b317b9f5731
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:1c80f6ff2d7253e0b774160273f45e39f7d1fbdf503ae4797f5ed41445536e65
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:b25fb12e70b8b55df8b96654d49e8536213faca1c1b113ea61ec2f3481be0b16
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:4574770026cff9fe17ff666f932c366a771ce4d6f6a6a8a02cb9e9e0710343bd
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:20a9076db81d2c40ef1632b791ee86931a6601862188f0280f118badb7863178
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:58047fedaeaa15d59394c1d6fa527c786701ceed67413262a5c79dad8f01ddb0
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:701b65ffb1f53e6f3f2123f9790a2a1d6d20a1813a4c9b7ab2982a30b9cc3a35
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:53be70d0dfdbb8be1735544dfe30a762061550a09bb246a2cf1e18ee1bbf0e44
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 342b84447d0b..7bfb14672227 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,8 +1,8 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==b2ae0ee763936fd0d72bb9673108f98a6824c7a2
+https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==ada56abe6efa17d3bac0c88661876b6da213b003
+https://salsa.debian.org/kernel-team/ethtool/==0162cee667f191c0a7a8024c1750b2356ff8dd53
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f1d101cc4321..62123ac7db78 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,7 +19,7 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==d6442215d8185f7bf6a30b94992e70dc
+https://deb.nodesource.com/node_14.x/dists/buster/Release==5cf451f38943b867b88ac066b9da4599
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 53e61bd7fdce..e86fb5e260bb 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.7.6
+regex==2021.8.3
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 62ca4befcc27..9007939e262b 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,3 +1,4 @@
+iputils-ping==3:20180629-2+deb10u2
 libexpat1-dev==2.2.6-2+deb10u1
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 62ca4befcc27..9007939e262b 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,3 +1,4 @@
+iputils-ping==3:20180629-2+deb10u2
 libexpat1-dev==2.2.6-2+deb10u1
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 92f742a4e1cd..86e85498d8e5 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -74,6 +74,8 @@ python2==2.7.16-1
 python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+python3-jsonschema==2.6.0-4
+python3-pkg-resources==40.8.0-1
 python3-smbus==4.1-1
 rrdtool==1.7.1-2
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 8edce224c50f..8934340ef51d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,2 +1,3 @@
+jsonschema==2.6.0
 python_sdk_api==4.4.3222
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 5b91d3d95c03..38ecef795c29 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.0.1
 grpcio==1.39.0
 grpcio-tools==1.20.0
 idna==3.2
-importlib-metadata==4.6.1
+importlib-metadata==4.6.3
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
deleted file mode 100644
index d10196807972..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-importlib-metadata==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
deleted file mode 100644
index d10196807972..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-importlib-metadata==4.6.3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 9b62eaf5fc47..5ce78730bfd9 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.3.9
+libsaibcm==4.3.5.1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index b18d11ead157..9d4056ff52ed 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -6,7 +6,7 @@ apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
 arch-test==0.15-2+deb10u1
 asciidoctor==1.5.8-1
-aspell==0.60.7~20110707-6
+aspell==0.60.7~20110707-6+deb10u1
 aspell-en==2018.04.16-0-1
 at==3.1.23-1
 at-spi2-core==2.30.0-7
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.8-1
+containerd.io==1.4.9-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -181,8 +181,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u1
-krb5-multidev==1.17-3+deb10u1
+krb5-locales==1.17-3+deb10u2
+krb5-multidev==1.17-3+deb10u2
 lcov==1.13-4
 less==487-0.1+b1
 libalgorithm-diff-perl==1.19.03-2
@@ -202,7 +202,7 @@ libasan5==8.3.0-6
 libasm-java==7.0-1
 libasound2==1.1.8-1
 libasound2-data==1.1.8-1
-libaspell15==0.60.7~20110707-6
+libaspell15==0.60.7~20110707-6+deb10u1
 libassuan0==2.5.2-1
 libasync-mergepoint-perl==0.04-2
 libatinject-jsr330-api-java==1.0+ds1-5
@@ -478,8 +478,8 @@ libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
-libgssapi-krb5-2==1.17-3+deb10u1
-libgssrpc4==1.17-3+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u2
+libgssrpc4==1.17-3+deb10u2
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
@@ -567,7 +567,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.16-1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
-libjetty9-java==9.4.15-1
+libjetty9-java==9.4.16-0+deb10u1
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjs-bootstrap==3.4.1+dfsg-1
 libjs-jquery==3.3.1~dfsg-3+deb10u1
@@ -593,16 +593,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u1
-libkadm5clnt-mit11==1.17-3+deb10u1
-libkadm5srv-mit11==1.17-3+deb10u1
-libkdb5-9==1.17-3+deb10u1
+libk5crypto3==1.17-3+deb10u2
+libkadm5clnt-mit11==1.17-3+deb10u2
+libkadm5srv-mit11==1.17-3+deb10u2
+libkdb5-9==1.17-3+deb10u2
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u1
-libkrb5-dev==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u2
+libkrb5-dev==1.17-3+deb10u2
+libkrb5support0==1.17-3+deb10u2
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -1148,12 +1148,12 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.2-1nodesource1
+nodejs==14.17.4-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.11+9-1~deb10u1
-openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
-openjdk-11-jre==11.0.11+9-1~deb10u1
-openjdk-11-jre-headless==11.0.11+9-1~deb10u1
+openjdk-11-jdk==11.0.12+7-2~deb10u1
+openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
+openjdk-11-jre==11.0.12+7-2~deb10u1
+openjdk-11-jre-headless==11.0.12+7-2~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
deleted file mode 100644
index 757cd229ab42..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==517f6beeaacf3773b0510ad0c764f57301eb0ab5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index 77aead425e6c..a7ad8ff12364 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.3
+bitarray==2.2.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index 47c654f6a362..c9c378fdfc2d 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -6,7 +6,7 @@ apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
 arch-test==0.15-2+deb10u1
 asciidoctor==1.5.8-1
-aspell==0.60.7~20110707-6
+aspell==0.60.7~20110707-6+deb10u1
 aspell-en==2018.04.16-0-1
 at==3.1.23-1
 at-spi2-core==2.30.0-7
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.8-1
+containerd.io==1.4.9-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -181,8 +181,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u1
-krb5-multidev==1.17-3+deb10u1
+krb5-locales==1.17-3+deb10u2
+krb5-multidev==1.17-3+deb10u2
 lcov==1.13-4
 less==487-0.1+b1
 libalgorithm-c3-perl==0.10-1
@@ -203,7 +203,7 @@ libasan5==8.3.0-6
 libasm-java==7.0-1
 libasound2==1.1.8-1
 libasound2-data==1.1.8-1
-libaspell15==0.60.7~20110707-6
+libaspell15==0.60.7~20110707-6+deb10u1
 libassuan0==2.5.2-1
 libasync-mergepoint-perl==0.04-2
 libatinject-jsr330-api-java==1.0+ds1-5
@@ -497,8 +497,8 @@ libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
-libgssapi-krb5-2==1.17-3+deb10u1
-libgssrpc4==1.17-3+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u2
+libgssrpc4==1.17-3+deb10u2
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
@@ -587,7 +587,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.16-1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
-libjetty9-java==9.4.15-1
+libjetty9-java==9.4.16-0+deb10u1
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjs-bootstrap==3.4.1+dfsg-1
 libjs-jquery==3.3.1~dfsg-3+deb10u1
@@ -613,16 +613,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u1
-libkadm5clnt-mit11==1.17-3+deb10u1
-libkadm5srv-mit11==1.17-3+deb10u1
-libkdb5-9==1.17-3+deb10u1
+libk5crypto3==1.17-3+deb10u2
+libkadm5clnt-mit11==1.17-3+deb10u2
+libkadm5srv-mit11==1.17-3+deb10u2
+libkdb5-9==1.17-3+deb10u2
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u1
-libkrb5-dev==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u2
+libkrb5-dev==1.17-3+deb10u2
+libkrb5support0==1.17-3+deb10u2
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -1260,12 +1260,12 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.2-1nodesource1
+nodejs==14.17.4-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.11+9-1~deb10u1
-openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
-openjdk-11-jre==11.0.11+9-1~deb10u1
-openjdk-11-jre-headless==11.0.11+9-1~deb10u1
+openjdk-11-jdk==11.0.12+7-2~deb10u1
+openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
+openjdk-11-jre==11.0.12+7-2~deb10u1
+openjdk-11-jre-headless==11.0.12+7-2~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git
deleted file mode 100644
index 757cd229ab42..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==517f6beeaacf3773b0510ad0c764f57301eb0ab5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index 77aead425e6c..a7ad8ff12364 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.3
+bitarray==2.2.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 88b848de9e8d..de4a6549115f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -6,7 +6,7 @@ apt-transport-https==1.8.2.3
 apt-utils==1.8.2.3
 arch-test==0.15-2+deb10u1
 asciidoctor==1.5.8-1
-aspell==0.60.7~20110707-6
+aspell==0.60.7~20110707-6+deb10u1
 aspell-en==2018.04.16-0-1
 at==3.1.23-1
 at-spi2-core==2.30.0-7
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.8-1
+containerd.io==1.4.9-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -192,8 +192,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u1
-krb5-multidev==1.17-3+deb10u1
+krb5-locales==1.17-3+deb10u2
+krb5-multidev==1.17-3+deb10u2
 lcov==1.13-4
 less==487-0.1+b1
 lib32asan5==8.3.0-6
@@ -228,7 +228,7 @@ libasan5==8.3.0-6
 libasm-java==7.0-1
 libasound2==1.1.8-1
 libasound2-data==1.1.8-1
-libaspell15==0.60.7~20110707-6
+libaspell15==0.60.7~20110707-6+deb10u1
 libass9==1:0.14.0-2
 libassuan0==2.5.2-1
 libasync-mergepoint-perl==0.04-2
@@ -533,8 +533,8 @@ libgraphite2-3==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
 libgsm1==1.0.18-2
-libgssapi-krb5-2==1.17-3+deb10u1
-libgssrpc4==1.17-3+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u2
+libgssrpc4==1.17-3+deb10u2
 libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
@@ -627,7 +627,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.16-1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
-libjetty9-java==9.4.15-1
+libjetty9-java==9.4.16-0+deb10u1
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjs-bootstrap==3.4.1+dfsg-1
 libjs-jquery==3.3.1~dfsg-3+deb10u1
@@ -653,16 +653,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u1
-libkadm5clnt-mit11==1.17-3+deb10u1
-libkadm5srv-mit11==1.17-3+deb10u1
-libkdb5-9==1.17-3+deb10u1
+libk5crypto3==1.17-3+deb10u2
+libkadm5clnt-mit11==1.17-3+deb10u2
+libkadm5srv-mit11==1.17-3+deb10u2
+libkdb5-9==1.17-3+deb10u2
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u1
-libkrb5-dev==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
+libkrb5-3==1.17-3+deb10u2
+libkrb5-dev==1.17-3+deb10u2
+libkrb5support0==1.17-3+deb10u2
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -990,7 +990,7 @@ libsm6==2:1.2.3-1
 libsnappy-java==1.1.7.2-1
 libsnappy-jni==1.1.7.2-1
 libsnappy1v5==1.1.7-1
-libsndfile1==1.0.28-6
+libsndfile1==1.0.28-6+deb10u1
 libsnmp-base==5.7.3+dfsg-5+deb10u2
 libsnmp-dev==5.7.3+dfsg-5+deb10u2
 libsnmp30==5.7.3+dfsg-5+deb10u2
@@ -1299,10 +1299,10 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.11+9-1~deb10u1
-openjdk-11-jdk-headless==11.0.11+9-1~deb10u1
-openjdk-11-jre==11.0.11+9-1~deb10u1
-openjdk-11-jre-headless==11.0.11+9-1~deb10u1
+openjdk-11-jdk==11.0.12+7-2~deb10u1
+openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
+openjdk-11-jre==11.0.12+7-2~deb10u1
+openjdk-11-jre-headless==11.0.12+7-2~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 7510491d8ee3..e9778435bfe4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index f6c853db88e1..a7ad8ff12364 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.2
+bitarray==2.2.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index d4cc44e6c217..94ef3ca8a165 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -6,7 +6,7 @@ apt-transport-https==1.4.11
 apt-utils==1.4.11
 asciidoc-base==8.6.9-5
 asciidoc-common==8.6.9-5
-aspell==0.60.7~20110707-3+b2
+aspell==0.60.7~20110707-3+deb9u1
 aspell-en==2016.11.20-0-0.1
 at==3.1.20-3
 at-spi2-core==2.22.0-6+deb9u1
@@ -182,7 +182,7 @@ libasan3==6.3.0-18+deb9u1
 libasm-java==5.2-2
 libasound2==1.1.3-5
 libasound2-data==1.1.3-5
-libaspell15==0.60.7~20110707-3+b2
+libaspell15==0.60.7~20110707-3+deb9u1
 libassuan0==2.4.3-2
 libasyncns0==0.8-6
 libatinject-jsr330-api-java==1.0+ds1-2
@@ -697,7 +697,7 @@ libobjc-6-dev==6.3.0-18+deb9u1
 libobjc4==6.3.0-18+deb9u1
 libobjenesis-java==2.5.1-1
 libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u3
+libopenexr22==2.2.0-11+deb9u4
 libopenjp2-7==2.1.2-1.1+deb9u6
 libopenmpi-dev==2.0.2-2
 libopenmpi2==2.0.2-2
@@ -859,7 +859,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u6
+libservlet3.1-java==8.5.54-0+deb9u7
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -1246,7 +1246,7 @@ python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
 python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
-python-xdg==0.25-4
+python-xdg==0.25-4+deb9u1
 python-zope.interface==4.3.2-1
 python2.7==2.7.13-2+deb9u5
 python2.7-dev==2.7.13-2+deb9u5
@@ -1289,7 +1289,7 @@ python3-software-properties==0.96.20.2-1+deb9u1
 python3-sphinx==1.4.9-2
 python3-tz==2016.7-0.3
 python3-wheel==0.29.0-2
-python3-xdg==0.25-4
+python3-xdg==0.25-4+deb9u1
 python3.5==3.5.3-1+deb9u4
 python3.5-dbg==3.5.3-1+deb9u4
 python3.5-dev==3.5.3-1+deb9u4
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index f4072500defe..ad74a1f0da69 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index e68cb5e95b8f..e7c0f0c87ace 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -6,7 +6,7 @@ apt-transport-https==1.4.11
 apt-utils==1.4.11
 asciidoc-base==8.6.9-5
 asciidoc-common==8.6.9-5
-aspell==0.60.7~20110707-3+b2
+aspell==0.60.7~20110707-3+deb9u1
 aspell-en==2016.11.20-0-0.1
 at==3.1.20-3
 at-spi2-core==2.22.0-6+deb9u1
@@ -182,7 +182,7 @@ libasan3==6.3.0-18+deb9u1
 libasm-java==5.2-2
 libasound2==1.1.3-5
 libasound2-data==1.1.3-5
-libaspell15==0.60.7~20110707-3+b2
+libaspell15==0.60.7~20110707-3+deb9u1
 libassuan0==2.4.3-2
 libasyncns0==0.8-6
 libatinject-jsr330-api-java==1.0+ds1-2
@@ -699,7 +699,7 @@ libobjc-6-dev==6.3.0-18+deb9u1
 libobjc4==6.3.0-18+deb9u1
 libobjenesis-java==2.5.1-1
 libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u3
+libopenexr22==2.2.0-11+deb9u4
 libopenjp2-7==2.1.2-1.1+deb9u6
 libopenmpi-dev==2.0.2-2
 libopenmpi2==2.0.2-2
@@ -861,7 +861,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u6
+libservlet3.1-java==8.5.54-0+deb9u7
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -1252,7 +1252,7 @@ python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
 python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
-python-xdg==0.25-4
+python-xdg==0.25-4+deb9u1
 python-zope.interface==4.3.2-1
 python2.7==2.7.13-2+deb9u5
 python2.7-dev==2.7.13-2+deb9u5
@@ -1295,7 +1295,7 @@ python3-software-properties==0.96.20.2-1+deb9u1
 python3-sphinx==1.4.9-2
 python3-tz==2016.7-0.3
 python3-wheel==0.29.0-2
-python3-xdg==0.25-4
+python3-xdg==0.25-4+deb9u1
 python3.5==3.5.3-1+deb9u4
 python3.5-dbg==3.5.3-1+deb9u4
 python3.5-dev==3.5.3-1+deb9u4
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index f4072500defe..ad74a1f0da69 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index ddf9bc506e5a..593172f15892 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -6,7 +6,7 @@ apt-transport-https==1.4.11
 apt-utils==1.4.11
 asciidoc-base==8.6.9-5
 asciidoc-common==8.6.9-5
-aspell==0.60.7~20110707-3+b2
+aspell==0.60.7~20110707-3+deb9u1
 aspell-en==2016.11.20-0-0.1
 at==3.1.20-3
 at-spi2-core==2.22.0-6+deb9u1
@@ -200,7 +200,7 @@ libasan3==6.3.0-18+deb9u1
 libasm-java==5.2-2
 libasound2==1.1.3-5
 libasound2-data==1.1.3-5
-libaspell15==0.60.7~20110707-3+b2
+libaspell15==0.60.7~20110707-3+deb9u1
 libassuan0==2.4.3-2
 libasyncns0==0.8-6
 libatinject-jsr330-api-java==1.0+ds1-2
@@ -732,7 +732,7 @@ libobjc-6-dev==6.3.0-18+deb9u1
 libobjc4==6.3.0-18+deb9u1
 libobjenesis-java==2.5.1-1
 libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u3
+libopenexr22==2.2.0-11+deb9u4
 libopenjp2-7==2.1.2-1.1+deb9u6
 libopenmpi-dev==2.0.2-2
 libopenmpi2==2.0.2-2
@@ -902,7 +902,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u6
+libservlet3.1-java==8.5.54-0+deb9u7
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -1315,7 +1315,7 @@ python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
 python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
-python-xdg==0.25-4
+python-xdg==0.25-4+deb9u1
 python-zope.interface==4.3.2-1
 python2.7==2.7.13-2+deb9u5
 python2.7-dev==2.7.13-2+deb9u5
@@ -1358,7 +1358,7 @@ python3-software-properties==0.96.20.2-1+deb9u1
 python3-sphinx==1.4.9-2
 python3-tz==2016.7-0.3
 python3-wheel==0.29.0-2
-python3-xdg==0.25-4
+python3-xdg==0.25-4+deb9u1
 python3.5==3.5.3-1+deb9u4
 python3.5-dbg==3.5.3-1+deb9u4
 python3.5-dev==3.5.3-1+deb9u4
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 7510491d8ee3..e9778435bfe4 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==248bf5e88ca4c63e844187bddb9a184288ce128e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 1302868fe0ef..ad74a1f0da69 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.2
+bitarray==2.2.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index d85fce0d805d..01b448601593 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -166,10 +166,10 @@ libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1d-0+deb10u6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
-libsystemd0==247.3-5~bpo10+2
+libsystemd0==247.3-6~bpo10+1
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
-libudev1==247.3-5~bpo10+2
+libudev1==247.3-6~bpo10+1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
@@ -245,16 +245,16 @@ squashfs-tools==1:4.3-12
 sudo==1.8.27-1+deb10u3
 sx-kernel==1.mlnx.4.4.3222
 sysfsutils==2.1.0+repack-5
-systemd==247.3-5~bpo10+2
+systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
-systemd-sysv==247.3-5~bpo10+2
-systemd-timesyncd==247.3-5~bpo10+2
+systemd-sysv==247.3-6~bpo10+1
+systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
-udev==247.3-5~bpo10+2
+udev==247.3-6~bpo10+1
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index d6cb0766adde..8b2b4c6ff5c8 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -11,6 +11,7 @@ docker==4.3.1
 idna==3.2
 ijson==2.6.1
 ipaddress==1.0.23
+j2cli==0.3.10
 jinja2==3.0.1
 jsondiff==1.3.0
 jsonschema==2.6.0
@@ -30,7 +31,7 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.7.6
+regex==2021.8.3
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0
@@ -38,5 +39,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.6
 watchdog==0.10.3
-websocket-client==1.1.0
+websocket-client==1.1.1
 xmltodict==0.12.0
\ No newline at end of file

From 09b4e04f7e6a7734a80175b6eb3f9fc6e5b6cbfd Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 8 Aug 2021 20:40:22 -0700
Subject: [PATCH 0700/1674] [build]: add debug info for dpkg frontend lock
 (#8375)

print out the process that hold the dpkg frontend lock.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 slave.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slave.mk b/slave.mk
index 3a0ec43ef76e..740a366deaf7 100644
--- a/slave.mk
+++ b/slave.mk
@@ -535,7 +535,7 @@ $(SONIC_INSTALL_DEBS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install
 			{ while dpkg -s $(firstword $(subst _, ,$(basename $(deb)))) | grep "^Version: $(word 2, $(subst _, ,$(basename $(deb))))" &> /dev/null; do echo "waiting for $(deb) to be uninstalled" $(LOG); sleep 1; done } )
 		# put a lock here because dpkg does not allow installing packages in parallel
 		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
-			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }
+			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && sudo lsof /var/lib/dpkg/lock-frontend && ps aux && exit 1 ; }
 		fi
 	done
 	$(FOOTER)

From 8b4f6943a95a12515763cfd95896ca6877d1a9f9 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Sun, 8 Aug 2021 20:42:46 -0700
Subject: [PATCH 0701/1674] [submodule]: update sonic-swss (#8374)

* 41dfaad 2021-08-02 | Bridge mac setting, fix statedb time format (#1844) (HEAD, origin/202012) [Prince Sunny]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index f54b7d0b634b..41dfaad2699e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit f54b7d0b634b466c06867858d843744216f09efa
+Subproject commit 41dfaad2699e8cd91964c293291f2ccc518b4640

From e62ae02fb29225154b11120cdc2ab3c830cdcf1a Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:52:08 +0300
Subject: [PATCH 0702/1674] [hostcfgd] [202012] Delay hostcfgd for faster boot
 time (#8117)

#### Why I did it
hostcfgd is starting at the same time as 'create_switch' method is called on orchagent process.
This introduce a degradation on the function execution time which eventually cause the fast-boot flow and a boot scenario in general to run slower (~6 seconds).
This change will delay the start time of this daemon.
90 seconds determined as the maximum allowed downtime for control plane to come back up on fast-boot flow.

#### How I did it
Add a timer for hostcfgd service in order to delay the startup of this service.

#### How to verify it
Install an image with this change and observe the daemon start 90 seconds after the system boot.
---
 .../debian/sonic-host-services-data.hostcfgd.service  |  3 ---
 .../debian/sonic-host-services-data.hostcfgd.timer    | 11 +++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer

diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
index 4adf2aba77ad..5e2434527124 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.service
@@ -9,6 +9,3 @@ After=sonic.target
 Type=simple
 ExecStart=/usr/local/bin/hostcfgd
 
-[Install]
-WantedBy=sonic.target
-
diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
new file mode 100644
index 000000000000..baf80f4b4cbd
--- /dev/null
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Delays hostcfgd daemon until SONiC has started
+PartOf=hostcfgd.service
+
+[Timer]
+OnActiveSec=1min 30 sec
+Unit=hostcfgd.service
+
+[Install]
+WantedBy=timers.target sonic.target
+

From a06cd18dbe409e99af6e976d1ec89bf8340f6689 Mon Sep 17 00:00:00 2001
From: roman_savchuk <romanx.savchuk@intel.com>
Date: Tue, 10 Aug 2021 18:19:37 +0300
Subject: [PATCH 0703/1674] [BFN]: update bfnsdk package (#8350)

Signed-off-by: Roman Savchuk <romanx.savchuk@intel.com>
---
 platform/barefoot/bfn-platform.mk | 2 +-
 platform/barefoot/bfn-sai.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index b7db62f64adc..d9e2b3393c58 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20210324_deb10.deb
+BFN_PLATFORM = bfnplatform_20210805_sai.1.7.1_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index bf533012dfc3..b8ea520f4035 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20210324_deb10.deb
+BFN_SAI = bfnsdk_20210805_sai.1.7.1_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

From 4629c302c032bbbb60b1ee846f5a04267409d290 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 10 Aug 2021 11:23:22 -0700
Subject: [PATCH 0704/1674] <202012> Dell S6100: Monitor serial getty service
 (#8407)

Why I did it
serial-getty service exited in Dell S6100 device randomly.

How I did it
Added serial-getty to monit services.

How to verify it
Stop serial-getty in ssh session and check whether the service restarts or not.
---
 .../debian/platform-modules-s6100.install                     | 1 +
 .../s6100/scripts/s6100_platform.sh                           | 1 +
 .../s6100/scripts/s6100_serial_getty_monitor                  | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor

diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
index a9eb63eeea45..c65ce950a43e 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
@@ -12,6 +12,7 @@ s6100/scripts/track_reboot_reason.sh usr/share/sonic/device/x86_64-dell_s6100_c2
 s6100/scripts/warm-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/ssd-fw-upgrade usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/override.conf /etc/systemd/system/systemd-reboot.service.d
+s6100/scripts/s6100_serial_getty_monitor etc/monit/conf.d
 common/dell_lpc_mon.sh usr/local/bin
 s6100/scripts/platform_sensors.py usr/local/bin
 s6100/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index 62a8c1a2812f..5c7c2308c1f0 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -52,6 +52,7 @@ if [[ "$1" == "init" ]]; then
     fi
 
     install_python_api_package
+    monit reload
 
 elif [[ "$1" == "deinit" ]]; then
     /usr/local/bin/s6100_i2c_enumeration.sh deinit
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor
new file mode 100644
index 000000000000..1b5d0c90db37
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor
@@ -0,0 +1,4 @@
+#Dell S6100 serial getty monitor
+check process serial-getty matching "ttyS"
+start program = "/bin/systemctl start serial-getty@ttyS1.service"
+stop program = "/bin/systemctl stop serial-getty@ttyS1.service"

From 8285cf232980b392b15707f493eed89d4824aeac Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:04:55 +0800
Subject: [PATCH 0705/1674] [Mellanox] [202012] Upgrade hw-mgmt to 7.0100.2344
 (#8408)

To support new PSU fan on Mellanox platforms
---
 platform/mellanox/hw-management.mk      | 2 +-
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 3f8724fa1358..6dc1f2655629 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2304
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2344
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 5aaacf787c8f..fedae3bfe21c 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 5aaacf787c8f1631e1617884abf4d9879ac23151
+Subproject commit fedae3bfe21c98fd61e6d1252ee0a67516bcc553

From b0ea180fd42b2a395a57d06e855e0621e25afeae Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 04:09:10 -0700
Subject: [PATCH 0706/1674] Updated PGHeadroom settings for 400G speed
 (DellEMC-Z9332f-M-O16C64 & DellEMC-Z9332f-O32) (#8420)

Updated pg_profile_lookup.ini for both HWSKU to match with BRCM recommendation
---
 .../DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini      | 10 +++++-----
 .../DellEMC-Z9332f-O32/pg_profile_lookup.ini           | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
index b8bb10af9685..06d19555c746 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/pg_profile_lookup.ini
@@ -5,8 +5,8 @@
  100000  300m   2540    2540  117348    -2        2540
  100000  1000m  2540    2540  233172    -2        2540
  100000  2000m  2540    2540  398526    -2        2540
- 400000  5m     2540    2540  35776     -2        2540
- 400000  40m    2540    2540  53248     -2        2540
- 400000  300m   2540    2540  66560     -2        2540
- 400000  1000m  2540    2540  79872     -2        2540
- 400000  2000m  2540    2540  54528     -2        2540
+ 400000  5m     2540    2540  178562    -2        2540
+ 400000  40m    2540    2540  201930    -2        2540
+ 400000  300m   2540    2540  373888    -2        2540
+ 400000  1000m  2540    2540  836676    -2        2540
+ 400000  2000m  2540    2540  1498092   -2        2540
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
index b8bb10af9685..06d19555c746 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/pg_profile_lookup.ini
@@ -5,8 +5,8 @@
  100000  300m   2540    2540  117348    -2        2540
  100000  1000m  2540    2540  233172    -2        2540
  100000  2000m  2540    2540  398526    -2        2540
- 400000  5m     2540    2540  35776     -2        2540
- 400000  40m    2540    2540  53248     -2        2540
- 400000  300m   2540    2540  66560     -2        2540
- 400000  1000m  2540    2540  79872     -2        2540
- 400000  2000m  2540    2540  54528     -2        2540
+ 400000  5m     2540    2540  178562    -2        2540
+ 400000  40m    2540    2540  201930    -2        2540
+ 400000  300m   2540    2540  373888    -2        2540
+ 400000  1000m  2540    2540  836676    -2        2540
+ 400000  2000m  2540    2540  1498092   -2        2540

From 76def5c3a0c60ae1efe992530ded6d0c998fe12b Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Mon, 9 Aug 2021 19:26:50 -0700
Subject: [PATCH 0707/1674] Fix TH3 Warm-reboot failure due to Tunnel
 termination SAI failure (#8395)

---
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm             | 1 +
 .../th3-z9332f-16x400G-64x100G.config.bcm                        | 1 +
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm             | 1 +
 src/sonic-device-data/tests/permitted_list                       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index c9e8698436de..deedcbd2c455 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index 1a41367d9410..6731d61ccb75 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index a189a8b1731f..39ecf13d5521 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -1,3 +1,4 @@
+sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 57f49ca30746..2f90c67c0229 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -223,6 +223,7 @@ sai_preinit_cmd_file
 sai_preinit_warmboot_cmd_file
 sai_postinit_cmd_file
 sai_postinit_warmboot_cmd_file
+sai_tunnel_global_sip_mask_enable
 help_cli_enable
 memlist_enable
 serdes_lane_config_dfe

From 8915e488b793b75066c0a70eb2199be2cde0bc24 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 11 Aug 2021 09:10:17 -0700
Subject: [PATCH 0708/1674] [202012] BRCM Disable ACL Drop counted towards
 interface RX_DRP counters (#8383)

* [202012] BRCM Disable ACL Drop counted towards interface RX_DRP counters
---
 .../td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm              | 3 +++
 .../Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm          | 3 +++
 .../td2-a7050-q31s4-31x40G-4x10G.config.bcm                    | 3 +++
 .../Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm     | 3 +++
 .../Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm | 3 +++
 .../th-a7060-cx32s-8x100G+48x50G.config.bcm                    | 3 +++
 .../th-a7060-cx32s-8x100G+24x40G.config.bcm                    | 3 +++
 .../Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm  | 3 +++
 .../Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm  | 3 +++
 .../th-a7060-cx32s-8x100G+96x25G.config.bcm                    | 3 +++
 .../Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm      | 2 ++
 .../Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm     | 2 ++
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2  | 2 +-
 .../Arista-7260CX3-D108C8/config.bcm.j2                        | 2 +-
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2  | 2 +-
 .../broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm | 3 +++
 .../Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm  | 3 +++
 .../th-seastone-dx010-32x100G-t0.config.bcm                    | 3 +++
 .../th-seastone-dx010-48x50G+8x100G.config.bcm                 | 3 +++
 .../th-seastone-dx010-config-flex-all.bcm                      | 3 +++
 .../Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm    | 3 +++
 .../Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm    | 3 +++
 .../Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm    | 3 +++
 .../Force10-S6000/td2-s6000-32x40G.config.bcm                  | 3 +++
 .../Force10-S6100/th-s6100-64x40G-t0.config.bcm                | 3 +++
 .../Force10-S6100/th-s6100-64x40G-t1.config.bcm                | 3 +++
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm           | 3 +++
 .../th3-z9332f-16x400G-64x100G.config.bcm                      | 3 +++
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm           | 3 +++
 29 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
index d3ee2d5e3b0a..00714fbd400e 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
@@ -24,6 +24,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
index 7537b36411f7..074cd523c072 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
@@ -24,6 +24,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
index c5666bbc745d..1fa9817ff522 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
@@ -4,6 +4,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
index 31521e4c43ae..5ffd9530a7c9 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
@@ -18,6 +18,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
index bf0bd8554ebb..d8f902aa6058 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
index 5385c2a957ef..2bc25fdbdb62 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
index 4c2013462f58..2adf2e8dfb02 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
index 7616acc7a3a2..3800dd2cb2aa 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
index 9f87aa089986..3a518b5a0e58 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
index e75c9ff6fb9d..1208b349882a 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
index 52e3424aaf55..eb2c7bc0f5fb 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
@@ -1,3 +1,5 @@
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile.0=2
 bcm_num_cos.0=8
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
index 0cf9ae8f3a65..f9e731e58823 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
@@ -1,3 +1,5 @@
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile.0=2
 bcm_num_cos.0=8
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 5ef01f2ea512..34b83bda4e47 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -13,13 +13,13 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
-                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
 
+sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 300f00c01460..17f54d358e85 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -5,11 +5,11 @@
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                host_as_route_disable=1
-                               sai_adjust_acl_drop_in_rx_drop=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
+sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index cc2df983429e..515c7c5d0238 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -13,12 +13,12 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
-                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
+sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
index 16f18dcd2fd0..772db95d7f34 100644
--- a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
+++ b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
@@ -1,3 +1,6 @@
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 portmap_1=1:100                                       
 portmap_2=5:100                                       
 portmap_3=9:100                                       
diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
index c7942d6fc0b8..e7272ea9d12a 100644
--- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
@@ -1,3 +1,6 @@
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 bcm56340_4x10=1
 bcm56340_config=1
 dport_map_direct=0
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
index 111605a257f8..f022435dc6c1 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
@@ -17,6 +17,9 @@ l3_alpm_enable=2
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 ###################################################################################
 # Celestica Customize for SeaStone
 ###################################################################################
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
index 27136c5b1fb9..e5a0e2fecd06 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
@@ -1,3 +1,6 @@
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 os=unix 
 l2xmsg_mode=1 
 parity_enable=0 
diff --git a/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm b/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
index dc2cdf1c200d..ed5c1b6d9b19 100644
--- a/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
@@ -19,6 +19,9 @@ ipv6_lpm_128b_enable=1
 #Use MMU lossy configuration
 mmu_lossless=0
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 ###################################################################################
 # SeaStone customized configuration
 ###################################################################################
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
index d63f589d4fc9..ca155cb83041 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
index 5734e9ee5b1d..32d86d8474b3 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
index e0ebfd96f00b..af18c034fdd2 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
index 0e25b4d4232d..2626674d67ca 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 # From old config file
 os=unix
 higig2_hdr_mode=1
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
index 7fa577052635..dac4967f8a5f 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
@@ -1,4 +1,7 @@
 #TH S6100 64x40
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 l3_alpm_enable=2
 pfc_deadlock_seq_control=1
 bcm_stat_interval=2000000
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
index f55fb9d3ab51..20234ea9a66c 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
@@ -1,4 +1,7 @@
 #TH S6100 64x40
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 l3_alpm_enable=2
 pfc_deadlock_seq_control=1
 bcm_stat_interval=2000000
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index deedcbd2c455..827cf9c754e1 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 #firmware load method, use fast load
 load_firmware=0x2
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index 6731d61ccb75..d207912c5ef1 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 #firmware load method, use fast load
 load_firmware=0x2
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index 39ecf13d5521..cbccb223e98a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 #firmware load method, use fast load
 load_firmware=0x2
 

From 491ab3d977374ab334680b3b954cdec1e2cb915a Mon Sep 17 00:00:00 2001
From: anamehra <54692434+anamehra@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:04:36 -0700
Subject: [PATCH 0709/1674] Platform/cisco-8000 module for sonic-buildimage
 (8172) (#8399)

Update Makefile, so it does the following:
For a given platform, verify if platform/checkout/.ini exists and
hence run the platform/checkout/template.j2. This allows platform
code to be checked out during the 'make configure' stage.
---
 .gitignore                       |  1 +
 Makefile                         | 39 ++++++++++++++++++++++++++------
 platform/checkout/cisco-8000.ini |  3 +++
 platform/checkout/template.j2    | 11 +++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 platform/checkout/cisco-8000.ini
 create mode 100644 platform/checkout/template.j2

diff --git a/.gitignore b/.gitignore
index 5e76a6cf92da..c0384e7505ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
 platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
+platform/cisco-8000/
 
 # buildinfo
 files/build/buildinfo
diff --git a/Makefile b/Makefile
index 2231e6d98231..e1864ea991bc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,19 @@
 NOJESSIE ?= 1
 NOSTRETCH ?= 0
 
+ifeq ($(NOJESSIE),0)
+BUILD_JESSIE=1
+endif
+
+ifeq ($(NOSTRETCH),0)
+BUILD_STRETCH=1
+endif
+
+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
@@ -29,15 +42,27 @@ init:
 	@echo "+++ Making $@ +++"
 	make -f Makefile.work $@
 
-clean configure reset showtag sonic-slave-build sonic-slave-bash :
+#
+# Function to invoke target $@ in Makefile.work with proper BLDENV
+#
+define make_work
 	@echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
-	make -f Makefile.work $@
-endif
-ifeq ($(NOSTRETCH), 0)
-	BLDENV=stretch make -f Makefile.work $@
-endif
+	$(if $(BUILD_JESSIE),make -f Makefile.work $@,)
+	$(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
 	BLDENV=buster make -f Makefile.work $@
+endef
+
+.PHONY: $(PLATFORM_PATH)
+
+$(PLATFORM_PATH):
+	@echo "+++ Cheking $@ +++"
+	$(PLATFORM_CHECKOUT_CMD)
+
+configure : $(PLATFORM_PATH)
+	$(call make_work, $@)
+
+clean reset showtag sonic-slave-build sonic-slave-bash :
+	$(call make_work, $@)
 
 # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
 freeze:
diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
new file mode 100644
index 000000000000..f92e08f56d46
--- /dev/null
+++ b/platform/checkout/cisco-8000.ini
@@ -0,0 +1,3 @@
+[module]
+repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
+ref=202012-v0.2
diff --git a/platform/checkout/template.j2 b/platform/checkout/template.j2
new file mode 100644
index 000000000000..17b8f00c8902
--- /dev/null
+++ b/platform/checkout/template.j2
@@ -0,0 +1,11 @@
+{% set path = env('PLATFORM_PATH') %}
+if [ ! -d {{ path }} ]; then git clone {{ module.repo }} {{ path }}; fi;
+if [ -d {{ path }}/.git ]; then cd {{ path }} &&
+
+{% if module.ref is defined %}
+git checkout {{ module.ref }} && git submodule update --init --recursive;
+{% else %}
+git submodule update --init --recursive;
+{% endif %}
+
+else echo "{{ path }}/.git not found"; exit 1; fi

From e5428ecb2d1abd2f8ebb41436d2fab78c66cc342 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 10 Aug 2021 10:55:49 +0800
Subject: [PATCH 0710/1674] Reproducible build add docker image debian* to
 white list. (#8330)

#### Why I did it
1. Add version control for debian* docker image to white list.
2. Always record docker image sha256 value, regardless of white list.
---
 scripts/docker_version_control.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh
index 41e536f08073..9dd3ad55bad0 100755
--- a/scripts/docker_version_control.sh
+++ b/scripts/docker_version_control.sh
@@ -19,12 +19,11 @@ image_tag=`grep "^FROM " $DOCKERFILE | awk '{print$2}'`
 image=`echo $image_tag | cut -f1 -d:`
 tag=`echo $image_tag | cut -f2 -d:`
 
-# if docker image not in white list, exit
-if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]];then
-    exit 0
-fi
-
 if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then
+    # if docker image not in white list, exit
+    if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]] && [[ "$IMAGENAME" != debian:* ]] && [[ "$IMAGENAME" != multiarch/debian-debootstrap:* ]];then
+        exit 0
+    fi
     if [ -f $version_file ];then
         hash_value=`grep "${ARCH}:${image_tag}" $version_file | awk -F== '{print$2}'`
     fi
@@ -36,6 +35,9 @@ if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION
     sed -i "s/$oldimage/$newimage/" $DOCKERFILE
 else
     hash_value=`docker pull $image_tag | grep Digest | awk '{print$2}'`
+    if [ -z hash_value ];then
+        hash_value=unknown
+    fi
 fi
 if [[ "$hash_value" != "unknown" ]];then
     echo -e "${ARCH}:${image_tag}==$hash_value" >> $new_version_file

From 01e223513d0993565bbafb7a9003d8dc5101b091 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:52:09 +0530
Subject: [PATCH 0711/1674] [reboot-cause] Fixed determine-reboot-cause.service
 failure. (#8210)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rajkumar Pennadam Ramamoorthy rpennadamram@marvell.com

Why I did it
Install sonic image from ONIE. Once system is up, execute "config reload" command.

Root cause is that "determine-reboot-cause.service" was in failed state.
root@sonic:/host/reboot-cause# systemctl list-units --failed
UNIT LOAD ACTIVE SUB DESCRIPTION
● determine-reboot-cause.service loaded failed failed Reboot cause determination service

How I did it
Fixed the issue by setting default reason to "REBOOT_CAUSE_UNKNOWN" instead of "None".

How to verify it
Check " determine-reboot-cause.service' loaded successfully post image installation from ONIE.
Verify "reboot-cause.txt" file is created and config reload succeeds.
---
 src/sonic-host-services/scripts/determine-reboot-cause | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-host-services/scripts/determine-reboot-cause b/src/sonic-host-services/scripts/determine-reboot-cause
index ac304a06a027..1408ad0e2952 100755
--- a/src/sonic-host-services/scripts/determine-reboot-cause
+++ b/src/sonic-host-services/scripts/determine-reboot-cause
@@ -62,7 +62,7 @@ def parse_warmfast_reboot_from_proc_cmdline():
 
 
 def find_software_reboot_cause_from_reboot_cause_file():
-    software_reboot_cause = None
+    software_reboot_cause = REBOOT_CAUSE_UNKNOWN
     if os.path.isfile(REBOOT_CAUSE_FILE):
         with open(REBOOT_CAUSE_FILE) as cause_file:
             software_reboot_cause = cause_file.readline().rstrip('\n')

From 1fc4cb1d4853b4160a339d0a7715c1271916b6d4 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Wed, 11 Aug 2021 02:23:05 -0400
Subject: [PATCH 0712/1674] [Nokia ixs7215] Watchdog timer support (#8377)

---
 .../7215/sonic_platform/test/test-watchdog.py |  22 ++++
 .../7215/sonic_platform/watchdog.py           | 108 +++++++++++++-----
 2 files changed, 100 insertions(+), 30 deletions(-)
 create mode 100755 platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py
new file mode 100755
index 000000000000..20805e04ed29
--- /dev/null
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+from sonic_platform.chassis import Chassis
+
+
+def main():
+    print("---------------------")
+    print("Chassis Watchdog Test")
+    print("---------------------")
+
+    chassis = Chassis()
+
+    watchdog = chassis.get_watchdog()
+
+    print("    Armed: {}".format(watchdog.is_armed()))
+    print("    Time Left: {}".format(watchdog.get_remaining_time()))
+
+    return
+
+
+if __name__ == '__main__':
+    main()
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
index 75ec3ab177ae..903b6365dc48 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
@@ -10,19 +10,25 @@
 import array
 
 from sonic_platform_base.watchdog_base import WatchdogBase
-from sonic_py_common import logger
 
 """ ioctl constants """
+IO_WRITE = 0x40000000
 IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
 IO_SIZE_INT = 0x00040000
 IO_TYPE_WATCHDOG = ord('W') << 8
 
 WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
 
 """ Watchdog ioctl commands """
 WDIOC_SETOPTIONS = 4 | WDR_INT
 WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
 WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
 
 """ Watchdog status constants """
 WDIOS_DISABLECARD = 0x0001
@@ -33,8 +39,6 @@
 
 WD_COMMON_ERROR = -1
 
-sonic_logger = logger.Logger()
-
 
 class WatchdogImplBase(WatchdogBase):
     """
@@ -47,6 +51,7 @@ def __init__(self, wd_device_path):
         Open a watchdog handle
         @param wd_device_path Path to watchdog device
         """
+        super(WatchdogImplBase, self).__init__()
 
         self.watchdog_path = wd_device_path
         self.watchdog = os.open(self.watchdog_path, os.O_WRONLY)
@@ -57,32 +62,40 @@ def __init__(self, wd_device_path):
         self.armed = False
         self.timeout = self._gettimeout()
 
-    def disarm(self):
+    def _disablewatchdog(self):
+        """
+        Turn off the watchdog timer
         """
-        Disarm the hardware watchdog
 
-        Returns:
-            A boolean, True if watchdog is disarmed successfully, False
-            if not
+        req = array.array('h', [WDIOS_DISABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+
+    def _enablewatchdog(self):
+        """
+        Turn on the watchdog timer
         """
-        sonic_logger.log_info(" Debug disarm watchdog ")
 
-        try:
-            self._disablewatchdog()
-            self.armed = False
-            self.timeout = 0
-        except IOError:
-            return False
+        req = array.array('h', [WDIOS_ENABLECARD])
+        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
 
-        return True
+    def _keepalive(self):
+        """
+        Keep alive watchdog timer
+        """
 
-    def _disablewatchdog(self):
+        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
         """
-        Turn off the watchdog timer
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
         """
 
-        req = array.array('h', [WDIOS_DISABLECARD])
-        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+
+        return int(req[0])
 
     def _gettimeout(self):
         """
@@ -95,11 +108,22 @@ def _gettimeout(self):
 
         return int(req[0])
 
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
     def arm(self, seconds):
         """
-        Implements arm WatchdogBase API
+        Arm the hardware watchdog
         """
-        sonic_logger.log_info(" Debug arm watchdog4 ")
+
         ret = WD_COMMON_ERROR
         if seconds < 0:
             return ret
@@ -110,7 +134,6 @@ def arm(self, seconds):
             if self.armed:
                 self._keepalive()
             else:
-                sonic_logger.log_info(" Debug arm watchdog5 ")
                 self._enablewatchdog()
                 self.armed = True
             ret = self.timeout
@@ -119,17 +142,42 @@ def arm(self, seconds):
 
         return ret
 
-    def _enablewatchdog(self):
+    def disarm(self):
         """
-        Turn on the watchdog timer
+        Disarm the hardware watchdog
+
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False
+            if not
         """
 
-        req = array.array('h', [WDIOS_ENABLECARD])
-        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+        try:
+            self._disablewatchdog()
+            self.armed = False
+            self.timeout = 0
+        except IOError:
+            return False
 
-    def _keepalive(self):
+        return True
+
+    def is_armed(self):
         """
-        Keep alive watchdog timer
+        Implements is_armed WatchdogBase API
         """
 
-        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        Implements get_remaining_time WatchdogBase API
+        """
+
+        timeleft = WD_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft

From 3b9b9462be586b8b72fc40e13677d7a13d692010 Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Wed, 11 Aug 2021 05:13:15 -0400
Subject: [PATCH 0713/1674] [sonic-device-data]: add port_type to
 OPTIONAL_PORT_ATTRIBUTES (#8370)

enable automated test suites to selectively run relevant tests ( or not run tests ) based upon a new port_type identifier in hwsku.json

How I did it
Modified the valid optional fields in validity check for hwsku.json per recommendation from Joe in
https://github.com/Azure/sonic-mgmt/pull/2654/files

Co-authored-by: Carl Keene <keene@nokia.com>
---
 src/sonic-device-data/tests/hwsku_json_checker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-device-data/tests/hwsku_json_checker b/src/sonic-device-data/tests/hwsku_json_checker
index 6fd3d82c4cfb..ee15c6fb4b5e 100755
--- a/src/sonic-device-data/tests/hwsku_json_checker
+++ b/src/sonic-device-data/tests/hwsku_json_checker
@@ -7,7 +7,7 @@ import sys
 
 # Global variable
 PORT_ATTRIBUTES = ["default_brkout_mode"]
-OPTIONAL_PORT_ATTRIBUTES = ["fec", "autoneg"]
+OPTIONAL_PORT_ATTRIBUTES = ["fec", "autoneg", "port_type"]
 PORT_REG = "Ethernet(\d+)"
 HWSKU_JSON = '*hwsku.json'
 INTF_KEY = "interfaces"

From 133caf6db271aaa67e0746b53ca171bf42c5877e Mon Sep 17 00:00:00 2001
From: jerseyang <48576574+jerseyang@users.noreply.github.com>
Date: Thu, 12 Aug 2021 09:41:21 +0800
Subject: [PATCH 0714/1674] enable the emc2305 fan controller and NCP power
 controller 30ms timeout mechanism (#8138)

Why I did it
fix the dx010 system eeprom unavailable issue

How I did it
enable the i2c slave 30ms timeout mechanism

How to verify it
i2cstress test in DX010 iSMT controller bus

Co-authored-by: nicwu-cel <nicwu@celestica.com>
---
 .../debian/platform-modules-dx010.init              | 13 ++++++++++++-
 .../dx010/modules/emc2305.c                         |  6 ++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
index 8ee3d4465588..21587bfbd3fd 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
@@ -147,7 +147,18 @@ start)
         sleep 0.1
         done
 
-        /bin/sh /usr/local/bin/platform_api_mgnt.sh init
+	bus_en=8
+	sleep 1
+	cfg_r=`i2cget -y -f 8 0x60 0xD1`
+	((cfg_w=$cfg_r+$bus_en))	
+	i2cset -y -f 8 0x60 0xD1 $cfg_w
+	sleep 1
+	cfg_r=`i2cget -y -f 9 0x20 0xD1`
+	((cfg_w=$cfg_r+$bus_en))	
+	i2cset -y -f 9 0x20 0xD1 $cfg_w
+	sleep 1
+
+	/bin/sh /usr/local/bin/platform_api_mgnt.sh init
 
         echo "done."
         ;;
diff --git a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/emc2305.c b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/emc2305.c
index b406a29fd9be..b7a85c17a332 100644
--- a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/emc2305.c
+++ b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/emc2305.c
@@ -742,6 +742,7 @@ emc2305_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	int status;
 	int i;
 	int fan_idx;
+	unsigned char dis_to = 0;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
 		return -EIO;
@@ -752,6 +753,11 @@ emc2305_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
 	i2c_set_clientdata(client, data);
 	mutex_init(&data->update_lock);
+	
+	dis_to = i2c_smbus_read_byte_data(client, REG_CONFIGURATION);
+	dis_to &= 0xBF;
+	/* The SMBus timeout function is enabled */
+	(void)i2c_smbus_write_byte_data(client, REG_CONFIGURATION, dis_to);
 
 	status = i2c_smbus_read_byte_data(client, REG_PRODUCT_ID);
 	switch (status) {

From 36ab000557ffa929b9b18fd4108c480ff2cc99c8 Mon Sep 17 00:00:00 2001
From: richardyu <richardyu81@yahoo.com>
Date: Wed, 11 Aug 2021 20:55:21 -0700
Subject: [PATCH 0715/1674] PTF adds unittest-xml-reporting (#8417)

Co-authored-by: richardyu-ms <richard.yu@microsoft.com>
---
 dockers/docker-ptf/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 861056726056..dfb8b924c5f1 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -118,6 +118,7 @@ RUN rm -rf /debs \
     && pip install exabgp==3.4.17\
     && pip install pyaml   \
     && pip install pybrctl pyro4 rpyc yabgp \
+    && pip install unittest-xml-reporting \
     && mkdir -p /opt       \
     && cd /opt             \
     && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py

From c1e31a52cb84a463adafaf09d9c9df4e1df9728f Mon Sep 17 00:00:00 2001
From: madhanmellanox <62459540+madhanmellanox@users.noreply.github.com>
Date: Thu, 12 Aug 2021 10:14:22 -0700
Subject: [PATCH 0716/1674] [202012]:Adding Mellanox-SN3800-D100C12S2 SKU
 (#8444)

*To create a new SKU Mellanox-SN3800-D100C12S2
Co-authored-by: Madhan Babu <madhan@l-csi-0241l.mtl.labs.mlnx>
---
 .../Mellanox-SN3800-D100C12S2/buffers.json.j2 |   1 +
 .../buffers_defaults_t0.j2                    | 100 ++++
 .../buffers_defaults_t1.j2                    | 100 ++++
 .../buffers_dynamic.json.j2                   |   1 +
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN3800-D100C12S2/port_config.ini | 115 ++++
 .../Mellanox-SN3800-D100C12S2/qos.json.j2     |   1 +
 .../Mellanox-SN3800-D100C12S2/sai.profile     |   2 +
 .../sai_3800_2x10g_100x50g_12x100g.xml        | 521 ++++++++++++++++++
 9 files changed, 842 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai_3800_2x10g_100x50g_12x100g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..df453006bd12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
@@ -0,0 +1,100 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '20664320' %}
+{% set ingress_lossless_xoff_size =  '3321856' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '20664320' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..d75ccfe4fed9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
@@ -0,0 +1,100 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '19601408' %}
+{% set ingress_lossless_xoff_size =  '4384768' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '19601408' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/pg_profile_lookup.ini
new file mode 120000
index 000000000000..ccbbfa44cd9c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN3800-D112C8/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/port_config.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/port_config.ini
new file mode 100644
index 000000000000..535556ebfb3b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/port_config.ini
@@ -0,0 +1,115 @@
+# name       lanes            alias      index    speed
+Ethernet0    0,1              etp1a          1    50000
+Ethernet2    2,3              etp1b          1    50000
+Ethernet4    4,5              etp2a          2    50000
+Ethernet6    6,7              etp2b          2    50000
+Ethernet8    8,9              etp3a          3    50000
+Ethernet10   10,11            etp3b          3    50000
+Ethernet12   12,13            etp4a          4    50000
+Ethernet14   14,15            etp4b          4    50000
+Ethernet16   16,17            etp5a          5    50000
+Ethernet18   18,19            etp5b          5    50000
+Ethernet20   20,21            etp6a          6    50000
+Ethernet22   22,23            etp6b          6    50000
+Ethernet24   24,25            etp7a          7    50000
+Ethernet26   26,27            etp7b          7    50000
+Ethernet28   28,29            etp8a          8    50000
+Ethernet30   30,31            etp8b          8    50000
+Ethernet32   32,33            etp9a          9    50000
+Ethernet34   34,35            etp9b          9    50000
+Ethernet36   36,37            etp10a        10    50000
+Ethernet38   38,39            etp10b        10    50000
+Ethernet40   40,41            etp11a        11    50000
+Ethernet42   42,43            etp11b        11    50000
+Ethernet44   44,45            etp12a        12    50000
+Ethernet46   46,47            etp12b        12    50000
+Ethernet48   48,49            etp13a        13    50000
+Ethernet50   50,51            etp13b        13    50000
+Ethernet52   52,53            etp14a        14    50000
+Ethernet54   54,55            etp14b        14    50000
+Ethernet56   56,57            etp15a        15    50000
+Ethernet58   58,59            etp15b        15    50000
+Ethernet60   60,61            etp16a        16    50000
+Ethernet62   62,63            etp16b        16    50000
+Ethernet64   64,65            etp17a        17    50000
+Ethernet66   66,67            etp17b        17    50000
+Ethernet68   68,69            etp18a        18    50000
+Ethernet70   70,71            etp18b        18    50000
+Ethernet72   72,73            etp19a        19    50000
+Ethernet74   74,75            etp19b        19    50000
+Ethernet76   76,77            etp20a        20    50000
+Ethernet78   78,79            etp20b        20    50000
+Ethernet80   80,81            etp21a        21    50000
+Ethernet82   82,83            etp21b        21    50000
+Ethernet84   84,85            etp22a        22    50000
+Ethernet86   86,87            etp22b        22    50000
+Ethernet88   88,89            etp23a        23    50000
+Ethernet90   90,91            etp23b        23    50000
+Ethernet92   92,93            etp24a        24    50000
+Ethernet94   94,95            etp24b        24    50000
+Ethernet96   96,97            etp25a        25    50000
+Ethernet98   98,99            etp25b        25    50000
+Ethernet100  100,101          etp26a        26    50000
+Ethernet102  102,103          etp26b        26    50000
+Ethernet104  104,105          etp27a        27    50000
+Ethernet106  106,107          etp27b        27    50000
+Ethernet108  108,109          etp28a        28    50000
+Ethernet110  110,111          etp28b        28    50000
+Ethernet112  112,113          etp29a        29    50000
+Ethernet114  114,115          etp29b        29    50000
+Ethernet116  116,117          etp30a        30    50000
+Ethernet118  118,119          etp30b        30    50000
+Ethernet120  120,121          etp31a        31    50000
+Ethernet122  122,123          etp31b        31    50000
+Ethernet124  124,125          etp32a        32    50000
+Ethernet126  126,127          etp32b        32    50000
+Ethernet128  128,129          etp33a        33    50000
+Ethernet130  130,131          etp33b        33    50000
+Ethernet132  132,133          etp34a        34    50000
+Ethernet134  134,135          etp34b        34    50000
+Ethernet136  136,137          etp35a        35    50000
+Ethernet138  138,139          etp35b        35    50000
+Ethernet140  140,141          etp36a        36    50000
+Ethernet142  142,143          etp36b        36    50000
+Ethernet144  144,145          etp37a        37    50000
+Ethernet146  146,147          etp37b        37    50000
+Ethernet148  148,149,150,151  etp38         38    10000
+Ethernet152  152,153          etp39a        39    50000
+Ethernet154  154,155          etp39b        39    50000
+Ethernet156  156,157,158,159  etp40         40    10000
+Ethernet160  160,161          etp41a        41    50000
+Ethernet162  162,163          etp41b        41    50000
+Ethernet164  164,165          etp42a        42    50000
+Ethernet166  166,167          etp42b        42    50000
+Ethernet168  168,169          etp43a        43    50000
+Ethernet170  170,171          etp43b        43    50000
+Ethernet172  172,173          etp44a        44    50000
+Ethernet174  174,175          etp44b        44    50000
+Ethernet176  176,177          etp45a        45    50000
+Ethernet178  178,179          etp45b        45    50000
+Ethernet180  180,181          etp46a        46    50000
+Ethernet182  182,183          etp46b        46    50000
+Ethernet184  184,185          etp47a        47    50000
+Ethernet186  186,187          etp47b        47    50000
+Ethernet188  188,189          etp48a        48    50000
+Ethernet190  190,191          etp48b        48    50000
+Ethernet192  192,193          etp49a        49    50000
+Ethernet194  194,195          etp49b        49    50000
+Ethernet196  196,197          etp50a        50    50000
+Ethernet198  198,199          etp50b        50    50000
+Ethernet200  200,201          etp51a        51    50000
+Ethernet202  202,203          etp51b        51    50000
+Ethernet204  204,205          etp52a        52    50000
+Ethernet206  206,207          etp52b        52    50000
+Ethernet208  208,209,210,211  etp53         53   100000
+Ethernet212  212,213,214,215  etp54         54   100000
+Ethernet216  216,217,218,219  etp55         55   100000
+Ethernet220  220,221,222,223  etp56         56   100000
+Ethernet224  224,225,226,227  etp57         57   100000
+Ethernet228  228,229,230,231  etp58         58   100000
+Ethernet232  232,233,234,235  etp59         59   100000
+Ethernet236  236,237,238,239  etp60         60   100000
+Ethernet240  240,241,242,243  etp61         61   100000
+Ethernet244  244,245,246,247  etp62         62   100000
+Ethernet248  248,249,250,251  etp63         63   100000
+Ethernet252  252,253,254,255  etp64         64   100000
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/qos.json.j2
new file mode 120000
index 000000000000..eccf286dc879
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile
new file mode 100644
index 000000000000..5543225b55f5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_2x10g_100x50g_12x100g.xml
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai_3800_2x10g_100x50g_12x100g.xml b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai_3800_2x10g_100x50g_12x100g.xml
new file mode 100644
index 000000000000..bf0fa4ca6909
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai_3800_2x10g_100x50g_12x100g.xml
@@ -0,0 +1,521 @@
+<?xml version="1.0"?>
+<root>
+    <platform_info type="3800">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+		<!-- ISSU enabled -->
+		<issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>64</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>4</width>
+                <module>48</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <width>4</width>
+                <module>49</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>50</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <width>4</width>
+                <module>51</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>52</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <width>4</width>
+                <module>53</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>54</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>55</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>56</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <width>4</width>
+                <module>57</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>4</width>
+                <module>58</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <width>4</width>
+                <module>59</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>60</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <width>4</width>
+                <module>61</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>4</width>
+                <module>62</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <width>4</width>
+                <module>63</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>4</width>
+                <module>0</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>44</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>67</local-port>
+                <width>4</width>
+                <module>45</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>4</width>
+                <module>46</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>71</local-port>
+                <width>4</width>
+                <module>47</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>40</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>75</local-port>
+                <width>4</width>
+                <module>41</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>16</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>4</width>
+                <module>42</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>79</local-port>
+                <width>4</width>
+                <module>43</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>16</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>4</width>
+                <module>36</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>83</local-port>
+                <width>4</width>
+                <module>37</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>4</width>
+                <module>38</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>87</local-port>
+                <width>4</width>
+                <module>39</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>4</width>
+                <module>32</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>91</local-port>
+                <width>4</width>
+                <module>33</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>4</width>
+                <module>34</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>95</local-port>
+                <width>4</width>
+                <module>35</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>99</local-port>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>103</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>107</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>111</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>115</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>119</local-port>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>123</local-port>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>127</local-port>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>
+

From 8fe11740f048107b3c9e93fcb86f9f608fac4264 Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Thu, 12 Aug 2021 03:41:41 -0400
Subject: [PATCH 0717/1674] [Nokia] Add hwsku.json for the Nokia-7215 (#8372)

* add hwsku.json for the Nokia-7215
* added required default_brkout_mode to hwsku as its not optional
* remove tabs from the file so spacing consistent

Co-authored-by: Carl Keene <keene@nokia.com>
---
 .../Nokia-7215/hwsku.json                     | 212 ++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/hwsku.json

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/hwsku.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/hwsku.json
new file mode 100644
index 000000000000..4ae62e8d4b01
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/hwsku.json
@@ -0,0 +1,212 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet1": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet2": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet3": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet5": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet6": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet7": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet9": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet10": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet11": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet13": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet14": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet15": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet17": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet18": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet19": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet21": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet22": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet23": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet25": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet26": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet27": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet29": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet30": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet31": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet33": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet34": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet35": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet37": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet38": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet39": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet41": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet42": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet43": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet45": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet46": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet47": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet49": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet50": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet51": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        }
+    }   
+}

From 754378f1d8651a1975ec0a3236c094677e287fbe Mon Sep 17 00:00:00 2001
From: Vladyslav Morokhovych <vladyslavx.morokhovych@intel.com>
Date: Fri, 13 Aug 2021 09:25:28 +0300
Subject: [PATCH 0718/1674] [swss] Fix arp_update script (#8412)

Fix #7968

Issue is detected on SONiC.20201231.11

In test_static_route.py::test_static_route_ecmp static routes are configured, but neighbors are not resolved after config reload even after 10 minutes.
It looks like the arp_update script is starting to ping when Vlan1000 is not fully configured.
When issue is reproduced, stuck ping6 process is observed in swss container :

USER         PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         180  0.1  0.0   6296  1272 pts/0    S    17:03   0:03 ping6 -I Vlan1000 -n -q -i 0 -c 1 -W 0 ff02::1
And when arp_update script successfully resolves neighbors, we observe sleep 300 instead of ping process
---
 files/scripts/arp_update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index 1d4cf1ec541f..e7f083e20d27 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -37,7 +37,7 @@ while /bin/true; do
       eval `eval $ipcmd`
 
       # send ipv6 multicast pings to Vlan interfaces to get/refresh link-local addrs
-      ping6cmd="ping6 -I $vlan -n -q -i 0 -c 1 -W 0 ff02::1 >/dev/null"
+      ping6cmd="timeout 1 ping6 -I $vlan -n -q -i 0 -c 1 -W 0 ff02::1 >/dev/null"
       eval $ping6cmd
 
       # generate a list of ndisc6 commands (exclude link-local addrs since it is done above):

From e71eeb7de9b0ceebbb375f330eec7853d5489159 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Thu, 12 Aug 2021 21:41:04 -0700
Subject: [PATCH 0719/1674] [FRR]: Upgrade FRR to frr-7.5.1-s1 tag (#8443)

Update FRR 7.5.1 head.
---
 rules/frr.mk      | 2 +-
 src/sonic-frr/frr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index 82db96557007..72cde12ebf75 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -3,7 +3,7 @@
 FRR_VERSION = 7.5.1
 FRR_SUBVERSION = 0
 FRR_BRANCH = frr/7.5
-FRR_TAG = frr-7.5.1
+FRR_TAG = frr-7.5.1-s1
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
index df7ab485bde1..c69608a68083 160000
--- a/src/sonic-frr/frr
+++ b/src/sonic-frr/frr
@@ -1 +1 @@
-Subproject commit df7ab485bde1a511f131f7ad6b70cb43c48c8e6d
+Subproject commit c69608a68083d1017257977bd0260bebdb12322f

From 03ef27531408fbcf9060b62f24ae8d968085353f Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Fri, 13 Aug 2021 06:27:06 -0400
Subject: [PATCH 0720/1674] [Nokia ixs7215] sfputil support + component tests
 (#8445)

Deliver sfputil support for sfputil show eeprom and sfputil reset along with some component test case fixes

Co-authored-by: Carl Keene <keene@nokia.com>
---
 .../plugins/sfputil.py                        | 22 ++++++-
 .../7215/sonic_platform/component.py          | 49 ++++++++++++++++
 .../7215/sonic_platform/sfp.py                | 57 ++++++++++++-------
 3 files changed, 106 insertions(+), 22 deletions(-)

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/sfputil.py b/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/sfputil.py
index 1ca3b9ec6f2d..3280ffdc92b9 100755
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/sfputil.py
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/plugins/sfputil.py
@@ -1,4 +1,5 @@
 try:
+    import glob
     import sonic_platform.platform
     import sonic_platform.chassis
     from sonic_sfp.sfputilbase import SfpUtilBase
@@ -14,6 +15,12 @@ class SfpUtil(SfpUtilBase):
     ports_in_block = 4
 
     _port_to_eeprom_mapping = {}
+    port_to_i2c_mapping = {
+        49: 2,
+        50: 3,
+        51: 4,
+        52: 5
+    }
     _changed_ports = [0, 0, 0, 0]
 
     @property
@@ -33,10 +40,21 @@ def port_to_eeprom_mapping(self):
         return self._port_to_eeprom_mapping
 
     def __init__(self):
-        # print " SfpUtil(SfpUtilBase) re-directed to chassis PMON 2.0  "
+        # Mux Ordering
+        mux_dev = sorted(glob.glob("/sys/class/i2c-adapter/i2c-0/i2c-[0-9]"))
+        eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
+        y = 0
+        for x in range(self.port_start, self.port_end + 1):
+            mux_dev_num = mux_dev[y]
+            self.port_to_i2c_mapping[x] = mux_dev_num[-1]
+            y = y + 1
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+            self._port_to_eeprom_mapping[x] = port_eeprom_path
         SfpUtilBase.__init__(self)
-        self.chassis = sonic_platform.platform.Platform().get_chassis()
 
+        self.chassis = sonic_platform.platform.Platform().get_chassis()
+        
     def reset(self, port_num):
         # print " SfpUtil(SfpUtilBase) re-directed to chassis PMON 2.0 "
         if self.chassis is not None:
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
index 1c219d7920a5..134856ea4213 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py
@@ -75,6 +75,55 @@ def get_name(self):
         """
         return self.name
 
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'NA'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'NA'
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the component
+        Returns:
+            bool: True if  present, False if not
+        """
+        return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the component
+        Returns:
+            bool: True if component is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether component is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_description(self):
         """
         Retrieves the description of the component
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index 57fcde16149d..ead408b41b8b 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -777,42 +777,59 @@ def get_tx_power(self):
 
     def reset(self):
         """
-        Reset SFP and return all user module settings to their default srate.
+        Reset SFP.
         Returns:
             A boolean, True if successful, False if not
-        """
+        """        
         if self.sfp_type == COPPER_TYPE:
             return False
 
-        path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/sfp_port_reset"
-        port_ps = path.format(self.port_to_i2c_mapping)
-
-        try:
-            reg_file = open(port_ps, 'w')
-        except IOError as e:
-            # print "Error: unable to open file: %s" % str(e)
-            return False
-
-        # toggle reset
-        reg_file.seek(0)
-        reg_file.write('1')
+        self.tx_disable(True)
         time.sleep(1)
-        reg_file.seek(0)
-        reg_file.write('0')
-        reg_file.close()
+        self.tx_disable(False)
+        
         return True
 
     def tx_disable(self, tx_disable):
         """
-        Disable SFP TX for all channels
+        Disable SFP TX 
         Args:
             tx_disable : A Boolean, True to enable tx_disable mode, False to disable
                          tx_disable mode.
-        Returns:
+        Returns: 
             A boolean, True if tx_disable is set successfully, False if not
         """
+        if smbus_present == 0:  # if called from sfputil outside of pmon
+            cmdstatus, register = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x5')
+            if cmdstatus:
+                sonic_logger.log_warning("sfp cmdstatus i2c get failed %s" % register )
+                return False
+            register = int(register, 16)
+        else:
+            bus = smbus.SMBus(0)
+            DEVICE_ADDRESS = 0x41
+            DEVICE_REG = 0x5
+            register = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
 
-        return NotImplementedError
+        pos = [1, 2, 4, 8]
+        mask = pos[self.index-SFP_PORT_START]
+        if tx_disable == True:
+            setbits = register | mask
+        else:
+            setbits = register & ~mask   
+  
+        if smbus_present == 0:  # if called from sfputil outside of pmon
+            cmdstatus, output = cmd.getstatusoutput('sudo i2cset -y -m 0x0f 0 0x41 0x5 %d' % setbits)
+            if cmdstatus:
+                sonic_logger.log_warning("sfp cmdstatus i2c write failed %s" % output )
+                return False
+        else:
+            bus = smbus.SMBus(0)
+            DEVICE_ADDRESS = 0x41
+            DEVICE_REG = 0x5
+            bus.write_byte_data(DEVICE_ADDRESS, DEVICE_REG, setbits)
+                        
+        return True
 
     def tx_disable_channel(self, channel, disable):
         """

From b1c2659044f2fd15fc62d33b4aade456c30e42ca Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 13 Aug 2021 19:33:08 +0800
Subject: [PATCH 0721/1674] Support to build armhf/arm64 platforms on arm based
 system (#7731) (#8458)

Why I did it
Support to build armhf/arm64 platforms on arm based system without qemu simulator.
When building the armhf/arm64 on arm based system, it is not necessary to use qemu simulator.

How I did it
Build armhf on armhf system, or build arm64 on arm64 system, by default, qemu simulator will not be used.
When building armhf on arm64, and you have enabled armhf docker, then it will build images without simulator automatically. It is based how the docker service is run.

Docker base image change:
For amd64, change from debian:to amd64/debian:
For arm64, change from multiarch/debian-debootstrap:arm64- to arm64v8/debian:
For armhf, change from multiarch/debian-debootstrap:armhf- to arm32v7/debian:
See https://github.com/docker-library/official-images#architectures-other-than-amd64
The mapping relations:
arm32v6 --- armel
arm32v7 --- armhf
arm64v8 --- arm64

Docker image armhf deprecated info: https://hub.docker.com/r/armhf/debian, using arm32v7 instead.
---
 Makefile.work                             |  9 +++++----
 dockers/docker-base-buster/Dockerfile.j2  |  2 +-
 dockers/docker-base-stretch/Dockerfile.j2 |  2 +-
 dockers/docker-base/Dockerfile.j2         |  2 +-
 slave.mk                                  | 13 +++++++++++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index b4cbdc56ae88..f48bb9f650ff 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -47,12 +47,13 @@ SHELL = /bin/bash
 USER := $(shell id -un)
 PWD := $(shell pwd)
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
+DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
 
 comma := ,
 
-ifeq ($(shell uname -m), aarch64)
+ifeq ($(DOCKER_MACHINE), aarch64)
 COMPILE_HOST_ARCH := arm64
-else ifeq ($(shell uname -m), armv7l)
+else ifeq ($(shell echo $(DOCKER_MACHINE) | grep -qE "armv7l|armv8l" && echo y),y)
 COMPILE_HOST_ARCH := armhf
 else
 COMPILE_HOST_ARCH := amd64
@@ -278,7 +279,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
 .DEFAULT_GOAL :=  all
 
 %::
-ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	@$(DOCKER_MULTIARCH_CHECK)
 ifneq ($(BLDENV), )
 	@$(DOCKER_SERVICE_MULTIARCH_CHECK)
@@ -353,7 +354,7 @@ reset :
 	    if [ $$ans == y ]; then
 	        echo "Resetting local repository. Please wait...";
 	        $(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) sudo rm -rf fsroot;
-	        if [[ "$(CONFIGURED_ARCH)" == "armhf" || "$(CONFIGURED_ARCH)" ==  "arm64" ]]; then
+	        if [ "$(MULTIARCH_QEMU_ENVIRON)" == y ] && [[ "$(CONFIGURED_ARCH)" == "armhf" || "$(CONFIGURED_ARCH)" ==  "arm64" ]]; then
 	            echo "Stopping march $(CONFIGURED_ARCH) docker"
 	            sudo kill -9 `sudo cat /var/run/march/docker.pid` || true
 	            sudo rm -f /var/run/march/docker.pid || true
diff --git a/dockers/docker-base-buster/Dockerfile.j2 b/dockers/docker-base-buster/Dockerfile.j2
index a87ca31c6073..ac3fd7743e77 100644
--- a/dockers/docker-base-buster/Dockerfile.j2
+++ b/dockers/docker-base-buster/Dockerfile.j2
@@ -4,7 +4,7 @@ FROM multiarch/debian-debootstrap:armhf-buster
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-buster
 {% else %}
-FROM debian:buster
+FROM {{DOCKER_BASE_ARCH}}/debian:buster
 {% endif %}
 
 # Clean documentation in FROM image
diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index 652dec979b60..b77814bb2820 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -4,7 +4,7 @@ FROM multiarch/debian-debootstrap:armhf-stretch
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-stretch
 {% else %}
-FROM debian:stretch
+FROM {{DOCKER_BASE_ARCH}}/debian:stretch
 {% endif %}
 
 # Clean documentation in FROM image
diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index ecdbfda11a78..616a4cde7aff 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -3,7 +3,7 @@ FROM multiarch/debian-debootstrap:armhf-jessie
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
 FROM multiarch/debian-debootstrap:arm64-jessie
 {% else %}
-FROM debian:jessie
+FROM {{DOCKER_BASE_ARCH}}/debian:jessie
 {% endif %}
 
 ## Remove retired jessie-updates repo
diff --git a/slave.mk b/slave.mk
index 740a366deaf7..2a39b6bb547e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -49,7 +49,19 @@ CONFIGURED_ARCH := $(shell [ -f .arch ] && cat .arch || echo amd64)
 ifeq ($(PLATFORM_ARCH),)
 	override PLATFORM_ARCH = $(CONFIGURED_ARCH)
 endif
+DOCKER_BASE_ARCH := $(CONFIGURED_ARCH)
+ifeq ($(CONFIGURED_ARCH),armhf)
+	override DOCKER_BASE_ARCH = arm32v7
+else
+ifeq ($(CONFIGURED_ARCH),arm64)
+	override DOCKER_BASE_ARCH = arm64v8
+endif
+endif
+ifeq ($(BLDENV),bullseye)
+IMAGE_DISTRO := bullseye
+else
 IMAGE_DISTRO := buster
+endif
 IMAGE_DISTRO_DEBS_PATH = $(TARGET_PATH)/debs/$(IMAGE_DISTRO)
 IMAGE_DISTRO_FILES_PATH = $(TARGET_PATH)/files/$(IMAGE_DISTRO)
 
@@ -62,6 +74,7 @@ export PYTHON_WHEELS_PATH
 export IMAGE_DISTRO
 export IMAGE_DISTRO_DEBS_PATH
 export MULTIARCH_QEMU_ENVIRON
+export DOCKER_BASE_ARCH
 
 ###############################################################################
 ## Utility rules

From 28d6ea954744bdd4cefc2e75ab1d8d07a3c7d942 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Mon, 9 Aug 2021 13:48:18 -0700
Subject: [PATCH 0722/1674] [openssh]: move build dep installation to
 sonic-slave-buster (#8381)

install build dep causes dpkg lock issue in parallel build

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 sonic-slave-buster/Dockerfile.j2 | 2 ++
 src/openssh/Makefile             | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 2efb61f733b2..5db98a58c8f5 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -325,6 +325,8 @@ RUN apt-get update && apt-get install -y \
         libgtest-dev \
         libgcc-8-dev
 
+RUN apt-get -y build-dep openssh
+
 # Build fix for ARMHF buster libsairedis
 {%- if CONFIGURED_ARCH == "armhf" %}
        # Install doxygen build dependency packages
diff --git a/src/openssh/Makefile b/src/openssh/Makefile
index 0fd8642b1285..be05c6ffd675 100644
--- a/src/openssh/Makefile
+++ b/src/openssh/Makefile
@@ -19,7 +19,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg import -s ../patch/series
 
 	# Build package
-	sudo http_proxy=$(http_proxy) apt-get -y build-dep openssh
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 

From aae4e8dc7c86c2bc6dcb47bd464c524c1c8a1e7a Mon Sep 17 00:00:00 2001
From: novikauanton <antonx.novikau@intel.com>
Date: Sun, 15 Aug 2021 00:27:45 +0300
Subject: [PATCH 0723/1674] [build]: Fix bfn package version for reproducible
 build (#8468)

Barefoot pipeline is broken, because version has not been update by ci build yet.
---
 files/build/versions/default/versions-web | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 62123ac7db78..f689f4961ab8 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -23,8 +23,8 @@ https://deb.nodesource.com/node_14.x/dists/buster/Release==5cf451f38943b867b88ac
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210805_sai.1.7.1_deb10.deb==8ba915f8843cf57982825f304b629cb3
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210805_sai.1.7.1_deb10.deb==4d1e991a943a2e16be2c1db9bb3c02d6
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6

From 5ed6b64c99d049af0496199c245e0389cb9b8a27 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sat, 14 Aug 2021 17:01:00 -0700
Subject: [PATCH 0724/1674] Reapply the fix to address setting MTU > 1500
 causing portmgrd crash on BRCM platforms (#8472)

---
 .../systems/linux/kernel/modules/bcm-knet/bcm-knet.c         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
index a3f92b17584b..43edc056beff 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
@@ -6341,6 +6341,11 @@ bkn_init_ndev(u8 *mac, char *name)
         dev->mtu = rx_buffer_size;
     }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+    dev->min_mtu = 68;
+    dev->max_mtu = rx_buffer_size;
+#endif
+
     /* Device vectors */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
     dev->netdev_ops = &bkn_netdev_ops;

From 92fb9c94bda034c263b38fbf5a5cf62b3a532353 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 13 Aug 2021 09:01:34 -0700
Subject: [PATCH 0725/1674] [aboot] use ram partition for /var/log for devices
 with 3.7G disks (#8400)

Master/202012 image size grew quite a bit. 3.7G harddrive can no longer hold one image and safely upgrade to another image. Every bit of harddrive space is precious to save now.

Also sh syntax seemingly changed, [ condition ] && action was a legit syntax in 201911 branch but it is an error when condition not met with 202012 or later images. Change the syntax to if statement to avoid the issue.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 files/Aboot/boot0.j2                 | 12 +++--
 files/initramfs-tools/union-mount.j2 | 72 ++++++++++++++++++----------
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 3317e6282d46..3052f13d583b 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -591,12 +591,16 @@ write_platform_specific_cmdline() {
 
     if [ $flash_size -ge 28000 ]; then
         varlog_size=4096
-    elif [ $flash_size -ge 3700 ]; then
+    elif [ $flash_size -gt 3700 ]; then
         varlog_size=400
-    elif [ $flash_size -le 2000 ]; then
-        # enable docker_inram for switches with less than 2G of flash
-        cmdline_add docker_inram=on
+    else
+        varlog_size=256
         cmdline_add logs_inram=on
+        if [ $flash_size -le 2000 ]; then
+            # enable docker_inram for switches with less than 2G of flash
+            varlog_size=128
+            cmdline_add docker_inram=on
+        fi
     fi
 
     cmdline_add "varlog_size=$varlog_size"
diff --git a/files/initramfs-tools/union-mount.j2 b/files/initramfs-tools/union-mount.j2
index a2b5a5266da6..3ffe2f633d87 100644
--- a/files/initramfs-tools/union-mount.j2
+++ b/files/initramfs-tools/union-mount.j2
@@ -15,6 +15,7 @@ docker_inram=false
 logs_inram=false
 secureboot=false
 bootloader=generic
+varlog_size=0
 
 # Extract kernel parameters
 for x in $(cat /proc/cmdline); do
@@ -28,6 +29,9 @@ for x in $(cat /proc/cmdline); do
         logs_inram=on)
             logs_inram=true
             ;;
+        varlog_size=*)
+            varlog_size="${x#varlog_size=}"
+            ;;
         secure_boot_enable=[y1])
             secureboot=true
             docker_inram=true
@@ -40,22 +44,31 @@ done
 
 set_tmpfs_log_partition_size()
 {
-  varlogsize=128
-
-  # set varlogsize to existing var-log.ext4 size
-  if [ -f ${rootmnt}/host/disk-img/var-log.ext4 ]; then
-    varlogsize=$(ls -l ${rootmnt}/host/disk-img/var-log.ext4 | awk '{print $5}')
-    varlogsize=$(($varlogsize/1024/1024))
-  fi
-
-  # make sure varlogsize is between 5% to 10% of total memory size
-  memkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
-  memmb=$(($memkb/1024))
-  minsize=$(($memmb*5/100))
-  maxsize=$(($memmb*10/100))
-
-  [ $minsize -ge $varlogsize ] && varlogsize=$minsize
-  [ $maxsize -le $varlogsize ] && varlogsize=$maxsize
+    if [ $varlog_size -gt 0 ]; then
+        # Use the varlog_size passed in from command line
+        varlogsize=$varlog_size
+    else
+        varlogsize=128
+
+        # set varlogsize to existing var-log.ext4 size
+        if [ -f ${rootmnt}/host/disk-img/var-log.ext4 ]; then
+            varlogsize=$(ls -l ${rootmnt}/host/disk-img/var-log.ext4 | awk '{print $5}')
+            varlogsize=$(($varlogsize/1024/1024))
+        fi
+    fi
+
+    # make sure varlogsize is between 5% to 10% of total memory size
+    memkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+    memmb=$(($memkb/1024))
+    minsize=$(($memmb*5/100))
+    maxsize=$(($memmb*10/100))
+
+    if [ $minsize -ge $varlogsize ]; then
+        varlogsize=$minsize
+    fi
+    if [ $maxsize -le $varlogsize ]; then
+        varlogsize=$maxsize
+    fi
 }
 
 remove_not_in_allowlist_files()
@@ -145,16 +158,25 @@ mount --bind ${rootmnt}/host/$image_dir/boot ${rootmnt}/boot
 
 ## Mount loop device or tmpfs for /var/log
 if $logs_inram; then
-  # NOTE: some platforms, when reaching initramfs stage, have a small
-  #       limit of mounting tmpfs partition, potentially due to amount
-  #       of RAM available in this stage. e.g. Arista 7050-qx32[s] and 7060-cx32s
-  set_tmpfs_log_partition_size
-  mount -t tmpfs -o rw,nosuid,nodev,size=${varlogsize}M tmpfs ${rootmnt}/var/log
-  [ -f ${rootmnt}/host/disk-img/var-log.ext4 ] && rm -rf ${rootmnt}/host/disk-img/var-log.ext4
+    # NOTE: some platforms, when reaching initramfs stage, have a small
+    #       limit of mounting tmpfs partition, potentially due to amount
+    #       of RAM available in this stage. Therefore limiting the size
+    #       set for tmpfs partitions.
+    #
+    #       Another reason for using tmpfs /var/log partition is:
+    #       Some platforms have a small flash and therefore the log partition takes valuable space.
+    #       To improve the longevity of these devices storing the logs in memory will permit more
+    #       SONiC image growth before being bottlenecked.
+    set_tmpfs_log_partition_size
+    mount -t tmpfs -o rw,nosuid,nodev,size=${varlogsize}M tmpfs ${rootmnt}/var/log
+    if [ -f ${rootmnt}/host/disk-img/var-log.ext4 ]; then
+        rm -rf ${rootmnt}/host/disk-img/var-log.ext4
+    fi
 else
-  [ -f ${rootmnt}/host/disk-img/var-log.ext4 ] && fsck.ext4 -v -p ${rootmnt}/host/disk-img/var-log.ext4 2>&1 \
-                                                  | gzip -c >> /tmp/fsck.log.gz
-  [ -f ${rootmnt}/host/disk-img/var-log.ext4 ] && mount -t ext4 -o loop,rw ${rootmnt}/host/disk-img/var-log.ext4 ${rootmnt}/var/log
+    if [ -f ${rootmnt}/host/disk-img/var-log.ext4 ]; then
+        fsck.ext4 -v -p ${rootmnt}/host/disk-img/var-log.ext4 2>&1 | gzip -c >> /tmp/fsck.log.gz
+        mount -t ext4 -o loop,rw ${rootmnt}/host/disk-img/var-log.ext4 ${rootmnt}/var/log
+    fi
 fi
 
 ## fscklog file: /tmp will be lost when overlayfs is mounted

From e241337be026eddbf64d68fbf080757a4bad5b6a Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Fri, 13 Aug 2021 08:34:27 +0200
Subject: [PATCH 0726/1674] [frrcfgd]: Fix constant casing for prefix-list mode
 (#8454)

Fix #6943

This change makes the template match PREFIX_SET and the documentation.

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 .../templates/bgpd/bgpd.conf.db.route_map.j2                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2 b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
index 29a4817dc281..5c9e44f1d9a0 100644
--- a/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
+++ b/src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.route_map.j2
@@ -25,7 +25,7 @@ route-map {{rm_key[0]}} {{rm_val['route_operation']}} {{rm_key[1]}}
  match source-vrf {{rm_val['match_src_vrf']}}
 {% endif %}
 {# ---------------match ip/ipv6-Start-------------------------- #}
-{% set ip_str = {'ipv4':'ip', 'ipv6':'ipv6' } %}
+{% set ip_str = {'IPv4':'ip', 'IPv6':'ipv6' } %}
 {% if PREFIX_SET is defined and PREFIX_SET|length > 0 %}
 {% if 'match_prefix_set' in rm_val %}
 {% for pfx_key, pfx_val in PREFIX_SET.items() %}

From 347d7262a15b75235b220841c5904ff966f318c2 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Sun, 15 Aug 2021 14:00:08 +0700
Subject: [PATCH 0727/1674] [202012][device/celestica]: Fix failed test cases
 of Haliburton platform API  (#8297)

To fix failed test cases of Haliburton platform APIs that found on platform_tests script
- How I did it
- Add device/celestica/x86_64-cel_e1031-r0/platform.json
- Update functions to support python3.7
- Add more functions follow latest sonic_platform_base
- Fix the bug

Signed-off-by: Wirut Getbamrung [wgetbumr@celestica.com]
---
 .../x86_64-cel_e1031-r0/platform.json         | 262 ++++++
 .../platform_components.json                  |  11 +
 .../x86_64-cel_e1031-r0/plugins/sfputil.py    |  61 +-
 .../sonic_platform/chassis.py                 | 112 ++-
 .../sonic_platform/common.py                  |  39 +-
 .../sonic_platform/component.py               | 101 ++-
 .../sonic_platform/eeprom.py                  | 109 ++-
 .../sonic_platform/event.py                   |  13 +-
 .../x86_64-cel_e1031-r0/sonic_platform/fan.py |  91 +-
 .../sonic_platform/fan_drawer.py              | 108 +++
 .../sonic_platform/helper.py                  | 133 ---
 .../x86_64-cel_e1031-r0/sonic_platform/psu.py | 206 ++++-
 .../x86_64-cel_e1031-r0/sonic_platform/sfp.py | 844 ++++++++++++++----
 .../sonic_platform/thermal.py                 |  74 +-
 .../sonic_platform/watchdog.py                | 209 ++---
 .../debian/platform-modules-haliburton.init   |   9 +-
 16 files changed, 1774 insertions(+), 608 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/platform.json
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/platform_components.json
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
 delete mode 100644 device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py

diff --git a/device/celestica/x86_64-cel_e1031-r0/platform.json b/device/celestica/x86_64-cel_e1031-r0/platform.json
new file mode 100644
index 000000000000..0873a1398a3f
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/platform.json
@@ -0,0 +1,262 @@
+{
+    "chassis": {
+        "name": "Celestica-E1031-T48S4",
+        "components": [
+            {
+                "name": "SMC_CPLD"
+            },
+            {
+                "name": "MMC_CPLD"
+            },
+            {
+                "name": "BIOS"
+            }
+        ],
+        "fans": [
+            {
+                "name": "FAN-1"
+            },
+            {
+                "name": "FAN-2"
+            },
+            {
+                "name": "FAN-3"
+            }
+        ],
+        "fan_drawers": [
+            {
+                "name": "Drawer1",
+                "fans": [
+                    {
+                        "name": "FAN-1"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer2",
+                "fans": [
+                    {
+                        "name": "FAN-2"
+                    }
+                ]
+            },
+            {
+                "name": "Drawer3",
+                "fans": [
+                    {
+                        "name": "FAN-3"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU-R",
+                "fans": [
+                    {
+                        "name": "PSU-1 FAN-1"
+                    }
+                ]
+            },
+            {
+                "name": "PSU-L",
+                "fans": [
+                    {
+                        "name": "PSU-2 FAN-1"
+                    }
+                ]
+            }
+        ],
+        "thermals": [
+            {
+                "name": "Inlet ambient sensor (Rear to Front)"
+            },
+            {
+                "name": "Helix shutdown sensor (Rear to Front)"
+            },
+            {
+                "name": "Inlet ambient sensor (Front to Rear, right)"
+            },
+            {
+                "name": "Helix shutdown sensor (Front to Rear)"
+            },
+            {
+                "name": "Inlet ambient sensor (Front to Rear, left)"
+            },
+            {
+                "name": "CPU errata sensor (Front to Rear)"
+            },
+            {
+                "name": "CPU errata sensor (Rear to Front)"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "Ethernet54"
+            },
+            {
+                "name": "Ethernet0"
+            },
+            {
+                "name": "Ethernet1"
+            },
+            {
+                "name": "Ethernet2"
+            },
+            {
+                "name": "Ethernet3"
+            },
+            {
+                "name": "Ethernet4"
+            },
+            {
+                "name": "Ethernet5"
+            },
+            {
+                "name": "Ethernet6"
+            },
+            {
+                "name": "Ethernet7"
+            },
+            {
+                "name": "Ethernet8"
+            },
+            {
+                "name": "Ethernet9"
+            },
+            {
+                "name": "Ethernet10"
+            },
+            {
+                "name": "Ethernet11"
+            },
+            {
+                "name": "Ethernet12"
+            },
+            {
+                "name": "Ethernet13"
+            },
+            {
+                "name": "Ethernet14"
+            },
+            {
+                "name": "Ethernet15"
+            },
+            {
+                "name": "Ethernet16"
+            },
+            {
+                "name": "Ethernet17"
+            },
+            {
+                "name": "Ethernet18"
+            },
+            {
+                "name": "Ethernet19"
+            },
+            {
+                "name": "Ethernet20"
+            },
+            {
+                "name": "Ethernet21"
+            },
+            {
+                "name": "Ethernet22"
+            },
+            {
+                "name": "Ethernet23"
+            },
+            {
+                "name": "Ethernet24"
+            },
+            {
+                "name": "Ethernet25"
+            },
+            {
+                "name": "Ethernet26"
+            },
+            {
+                "name": "Ethernet27"
+            },
+            {
+                "name": "Ethernet28"
+            },
+            {
+                "name": "Ethernet29"
+            },
+            {
+                "name": "Ethernet30"
+            },
+            {
+                "name": "Ethernet31"
+            },
+            {
+                "name": "Ethernet32"
+            },
+            {
+                "name": "Ethernet33"
+            },
+            {
+                "name": "Ethernet34"
+            },
+            {
+                "name": "Ethernet35"
+            },
+            {
+                "name": "Ethernet36"
+            },
+            {
+                "name": "Ethernet37"
+            },
+            {
+                "name": "Ethernet38"
+            },
+            {
+                "name": "Ethernet39"
+            },
+            {
+                "name": "Ethernet40"
+            },
+            {
+                "name": "Ethernet41"
+            },
+            {
+                "name": "Ethernet42"
+            },
+            {
+                "name": "Ethernet43"
+            },
+            {
+                "name": "Ethernet44"
+            },
+            {
+                "name": "Ethernet45"
+            },
+            {
+                "name": "Ethernet46"
+            },
+            {
+                "name": "Ethernet47"
+            },
+            {
+                "name": "Ethernet48"
+            },
+            {
+                "name": "Ethernet49"
+            },
+            {
+                "name": "Ethernet50"
+            },
+            {
+                "name": "Ethernet51"
+            },
+            {
+                "name": "Ethernet52"
+            },
+            {
+                "name": "Ethernet53"
+            }
+        ]
+    },
+    "interfaces": {}
+}
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_e1031-r0/platform_components.json b/device/celestica/x86_64-cel_e1031-r0/platform_components.json
new file mode 100644
index 000000000000..97e691f90084
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/platform_components.json
@@ -0,0 +1,11 @@
+{
+    "chassis": {
+        "Celestica-E1031-T48S4": {
+            "component": {
+                "BIOS": {},
+                "SMC_CPLD": {},
+                "MMC_CPLD": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_e1031-r0/plugins/sfputil.py b/device/celestica/x86_64-cel_e1031-r0/plugins/sfputil.py
index d65f2cf3f54f..033d4668211f 100644
--- a/device/celestica/x86_64-cel_e1031-r0/plugins/sfputil.py
+++ b/device/celestica/x86_64-cel_e1031-r0/plugins/sfputil.py
@@ -11,63 +11,17 @@ class SfpUtil(SfpUtilBase):
     """Platform-specific SfpUtil class"""
 
     PORT_START = 1
-    PORT_END = 52
+    PORT_END = 55
+    SFP_PORT_START = 49
+    SFP_PORT_END = 52
     port_to_i2c_mapping = {
-        1: None,
-        2: None,
-        3: None,
-        4: None,
-        5: None,
-        6: None,
-        7: None,
-        8: None,
-        9: None,
-        10: None,
-        11: None,
-        12: None,
-        13: None,
-        14: None,
-        15: None,
-        16: None,
-        17: None,
-        18: None,
-        19: None,
-        20: None,
-        21: None,
-        22: None,
-        23: None,
-        24: None,
-        25: None,
-        26: None,
-        27: None,
-        28: None,
-        29: None,
-        30: None,
-        31: None,
-        32: None,
-        33: None,
-        34: None,
-        35: None,
-        36: None,
-        37: None,
-        38: None,
-        39: None,
-        40: None,
-        41: None,
-        42: None,
-        43: None,
-        44: None,
-        45: None,
-        46: None,
-        47: None,
-        48: None,
         49: 15,
         50: 14,
         51: 17,
         52: 16
     }
     _port_to_eeprom_mapping = {}
-    _sfp_port = list(range(49, PORT_END + 1))
+    _sfp_port = list(range(SFP_PORT_START, SFP_PORT_END + 1))
 
     @property
     def port_start(self):
@@ -89,7 +43,7 @@ def __init__(self):
         # Override port_to_eeprom_mapping for class initialization
         eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
         for x in range(self.PORT_START, self.PORT_END + 1):
-            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) if x in self._sfp_port else None
             self.port_to_eeprom_mapping[x] = port_eeprom_path
         SfpUtilBase.__init__(self)
 
@@ -103,7 +57,7 @@ def get_presence(self, port_num):
         try:
             with open(sfp_modabs_path, 'r') as port_status:
                 status = int(port_status.read(), 16)
-                status = (status >> (port_num - 49)) & 1
+                status = (status >> (port_num - self.SFP_PORT_START)) & 1
         except IOError:
             return False
 
@@ -138,7 +92,8 @@ def get_transceiver_change_event(self, timeout=0):
                     for port_num in self._sfp_port:
                         change = (changes >> (port_num - 49)) & 1
                         if change == 1:
-                            port_dict[str(port_num)] = str(int(self.get_presence(port_num)))
+                            port_dict[str(port_num)] = str(
+                                int(self.get_presence(port_num)))
                             found_flag = 1
 
                     if not found_flag:
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
index de7a246b43f8..cb442518f199 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -6,25 +6,26 @@
 #
 #############################################################################
 
+
 try:
-    import sys
     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
     from sonic_platform_base.chassis_base import ChassisBase
+    from sonic_py_common import device_info
     from .common import Common
     from .event import SfpEvent
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 NUM_FAN_TRAY = 3
-NUM_FAN = 1
 NUM_PSU = 2
 NUM_THERMAL = 7
-NUM_SFP = 52
+NUM_SFP = 55
 NUM_COMPONENT = 3
 RESET_REGISTER = "0x112"
 HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/previous-reboot-cause.txt"
 PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/previous-reboot-cause.txt"
 HOST_CHK_CMD = "docker > /dev/null 2>&1"
+STATUS_LED_PATH = "/sys/devices/platform/e1031.smc/master_led"
 
 
 class Chassis(ChassisBase):
@@ -32,66 +33,63 @@ class Chassis(ChassisBase):
 
     def __init__(self):
         ChassisBase.__init__(self)
+
         self._api_common = Common()
-        self.sfp_module_initialized = False
-        self.__initialize_eeprom()
-        self.is_host = self._api_common.is_host()
+        self._is_host = self._api_common.is_host()
 
-        if not self.is_host:
-            self.__initialize_fan()
-            self.__initialize_psu()
-            self.__initialize_thermals()
-        else:
-            self.__initialize_components()
+        self.__initialize_eeprom()
+        self.__initialize_fan()
+        self.__initialize_psu()
+        self.__initialize_thermals()
+        self.__initialize_components()
 
-        self._reboot_cause_path = HOST_REBOOT_CAUSE_PATH if self.__is_host(
-        ) else PMON_REBOOT_CAUSE_PATH
+        self.sfp_module_initialized = False
+        self._reboot_cause_path = HOST_REBOOT_CAUSE_PATH if self._is_host else PMON_REBOOT_CAUSE_PATH
 
     def __initialize_sfp(self):
         sfputil_helper = SfpUtilHelper()
         port_config_file_path = device_info.get_path_to_port_config_file()
         sfputil_helper.read_porttab_mappings(port_config_file_path, 0)
 
-        from sonic_platform.sfp import Sfp
+        from .sfp import Sfp
         for index in range(0, NUM_SFP):
-            name_idx = 0 if index+1 == NUM_SFP else index+1
-            sfp = Sfp(index, sfputil_helper.logical[name_idx])
+            sfp = Sfp(index, sfputil_helper.logical[index])
             self._sfp_list.append(sfp)
         self.sfp_module_initialized = True
 
     def __initialize_psu(self):
-        from sonic_platform.psu import Psu
+        from .psu import Psu
         for index in range(0, NUM_PSU):
             psu = Psu(index)
             self._psu_list.append(psu)
 
     def __initialize_fan(self):
-        from sonic_platform.fan import Fan
-        for fant_index in range(0, NUM_FAN_TRAY):
-            for fan_index in range(0, NUM_FAN):
-                fan = Fan(fant_index, fan_index)
-                self._fan_list.append(fan)
+        from .fan_drawer import FanDrawer
+        for i in range(NUM_FAN_TRAY):
+            fandrawer = FanDrawer(i)
+            self._fan_drawer_list.append(fandrawer)
+            self._fan_list += fandrawer.get_all_fans()
 
     def __initialize_thermals(self):
-        from sonic_platform.thermal import Thermal
+        from .thermal import Thermal
         airflow = self.__get_air_flow()
         for index in range(0, NUM_THERMAL):
             thermal = Thermal(index, airflow)
             self._thermal_list.append(thermal)
 
     def __initialize_eeprom(self):
-        from sonic_platform.eeprom import Tlv
+        from .eeprom import Tlv
         self._eeprom = Tlv()
 
     def __initialize_components(self):
-        from sonic_platform.component import Component
+        from .component import Component
         for index in range(0, NUM_COMPONENT):
             component = Component(index)
             self._component_list.append(component)
 
     def __get_air_flow(self):
         air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(
-            self._api_common.platform) if self.is_host else '/usr/share/sonic/platform/fan_airflow'
+            self._api_common.get_platform()) if self._is_host else '/usr/share/sonic/platform/fan_airflow'
         air_flow = self._api_common.read_txt_file(air_flow_path)
         return air_flow or 'B2F'
 
@@ -154,7 +152,6 @@ def get_reboot_cause(self):
         else:
             reboot_cause = self.REBOOT_CAUSE_NON_HARDWARE
             description = 'Unknown reason'
-
         return (reboot_cause, description)
 
     def get_watchdog(self):
@@ -247,8 +244,8 @@ def get_sfp(self, index):
             # The index will start from 1
             sfp = self._sfp_list[index-1]
         except IndexError:
-            sys.stderr.write("SFP index {} out of range (1-{})\n".format(
-                             index, len(self._sfp_list)))
+            print("SFP index {} out of range (1-{})\n".format(
+                index, len(self._sfp_list)))
         return sfp
 
     ##############################################################
@@ -269,13 +266,13 @@ def get_name(self):
             Returns:
             string: The name of the device
         """
-        return self._api_common.hwsku
+        return self._api_common.get_hwsku()
 
     def get_presence(self):
         """
-        Retrieves the presence of the PSU
+        Retrieves the presence of the Chassis
         Returns:
-            bool: True if PSU is present, False if not
+            bool: True if Chassis is present, False if not
         """
         return True
 
@@ -303,3 +300,52 @@ def get_status(self):
         """
         return True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+
+        status_str = {
+            self.STATUS_LED_COLOR_GREEN: 'green',
+            self.STATUS_LED_COLOR_AMBER: 'amber',
+            self.STATUS_LED_COLOR_OFF: 'off'
+        }.get(color, 'off')
+
+        return self._api_common.write_txt_file(STATUS_LED_PATH, status_str)
+
+    def get_status_led(self):
+        """
+        Gets the state of the PSU status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        status = self._api_common.read_txt_file(STATUS_LED_PATH)
+        status_str = {
+            'on': self.STATUS_LED_COLOR_GREEN,
+            'amber': self.STATUS_LED_COLOR_AMBER,
+            'off': self.STATUS_LED_COLOR_OFF
+        }.get(status, None)
+
+        return status_str
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
index 84fcafd1bcf0..08e8fc41475c 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
@@ -29,7 +29,18 @@ class Common:
 
     def __init__(self, conf=None):
         self._main_conf = conf
-        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
+        self.platform = None
+        self.hwsku = None
+
+    def get_platform(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku(
+        ) if not self.platform else (self.platform, self.hwsku)
+        return self.platform
+
+    def get_hwsku(self):
+        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku(
+        ) if not self.hwsku else (self.platform, self.hwsku)
+        return self.hwsku
 
     def run_command(self, command):
         status = False
@@ -38,7 +49,7 @@ def run_command(self, command):
             p = subprocess.Popen(
                 command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             raw_data, err = p.communicate()
-            if err == '':
+            if p.returncode == 0:
                 status, output = True, raw_data.strip()
         except Exception:
             pass
@@ -152,10 +163,28 @@ def get_reg(self, path, reg_addr):
         status, output = self.run_command(cmd)
         return output if status else None
 
+    def set_reg(self, path, reg_addr, value):
+        cmd = "echo {0} {1} > {2}".format(reg_addr, value, path)
+        status, output = self.run_command(cmd)
+        return output if status else None
+
     def read_txt_file(self, path):
-        with open(path, 'r') as f:
-            output = f.readline()
-        return output.strip('\n')
+        try:
+            with open(path, 'r') as f:
+                output = f.readline()
+            return output.strip('\n')
+        except Exception:
+            pass
+        return ''
+
+    def read_one_line_file(self, file_path):
+        try:
+            with open(file_path, 'r') as fd:
+                data = fd.readline()
+                return data.strip()
+        except IOError:
+            pass
+        return ''
 
     def write_txt_file(self, file_path, value):
         try:
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
index 8d2829f90c01..56fae35914ab 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
@@ -6,12 +6,12 @@
 #
 #############################################################################
 
-import os.path
-import shutil
-import shlex
-import subprocess
 
 try:
+    import os.path
+    import shutil
+    import shlex
+    import subprocess
     from sonic_platform_base.component_base import ComponentBase
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
@@ -119,6 +119,29 @@ def get_firmware_version(self):
 
         return fw_version
 
+    def get_available_firmware_version(self, image_path):
+        """
+        Retrieves the available firmware version of the component
+        Note: the firmware version will be read from image
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the available firmware version of the component
+        """
+        return "N/A"
+
+    def get_firmware_update_notification(self, image_path):
+        """
+        Retrieves a notification on what should be done in order to complete
+        the component firmware update
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the component firmware update notification if required.
+            By default 'None' value will be used, which indicates that no actions are required
+        """
+        return "None"
+
     def install_firmware(self, image_path):
         """
         Install firmware to module
@@ -139,5 +162,73 @@ def install_firmware(self, image_path):
             install_command = "ispvm %s" % new_image_path
         # elif self.name == "BIOS":
         #     install_command = "afulnx_64 %s /p /b /n /x /r" % image_path
-
         return self.__run_command(install_command)
+
+    def update_firmware(self, image_path):
+        """
+        Updates firmware of the component
+        This API performs firmware update: it assumes firmware installation and loading in a single call.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this will be done automatically by API
+        Args:
+            image_path: A string, path to firmware image
+        Raises:
+            RuntimeError: update failed
+        """
+        return False
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the FAN
+        Returns:
+            bool: True if FAN is present, False if not
+        """
+        return True
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return 'N/A'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return 'N/A'
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
index c31d29f2caef..dc43a4d7ddda 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
@@ -17,13 +17,14 @@
     else:
         from cStringIO import StringIO
 
-    from sonic_platform_base.sonic_eeprom import eeprom_dts
     from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
+    from sonic_platform_base.sonic_eeprom.eeprom_base import EepromDecoder
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
 CACHE_FILE = 'syseeprom_cache'
+NULL = 'N/A'
 
 
 class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
@@ -32,8 +33,8 @@ class Tlv(eeprom_tlvinfo.TlvInfoDecoder):
 
     def __init__(self):
         self._eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0050/eeprom"
+        self._eeprom = None
         super(Tlv, self).__init__(self._eeprom_path, 0, '', True)
-        self._eeprom = self._load_eeprom()
 
     def __parse_output(self, decode_output):
         decode_output.replace('\0', '')
@@ -50,7 +51,7 @@ def __parse_output(self, decode_output):
                     value = match.group(3).rstrip('\0')
 
                 _eeprom_info_dict[idx] = value
-            except Exception:
+            except BaseException:
                 pass
         return _eeprom_info_dict
 
@@ -59,7 +60,7 @@ def _load_eeprom(self):
         sys.stdout = StringIO()
         try:
             self.read_eeprom_db()
-        except Exception:
+        except BaseException:
             decode_output = sys.stdout.getvalue()
             sys.stdout = original_stdout
             return self.__parse_output(decode_output)
@@ -71,7 +72,7 @@ def _load_eeprom(self):
         if not os.path.exists(CACHE_ROOT):
             try:
                 os.makedirs(CACHE_ROOT)
-            except Exception:
+            except BaseException:
                 pass
 
         #
@@ -80,7 +81,7 @@ def _load_eeprom(self):
         #
         try:
             self.set_cache_name(os.path.join(CACHE_ROOT, CACHE_FILE))
-        except Exception:
+        except BaseException:
             pass
 
         e = self.read_eeprom()
@@ -89,7 +90,7 @@ def _load_eeprom(self):
 
         try:
             self.update_cache(e)
-        except Exception:
+        except BaseException:
             pass
 
         self.decode_eeprom(e)
@@ -102,14 +103,98 @@ def _load_eeprom(self):
 
         return self.__parse_output(decode_output)
 
+    def _valid_tlv(self, eeprom_data):
+        tlvinfo_type_codes_list = [
+            self._TLV_CODE_PRODUCT_NAME,
+            self._TLV_CODE_PART_NUMBER,
+            self._TLV_CODE_SERIAL_NUMBER,
+            self._TLV_CODE_MAC_BASE,
+            self._TLV_CODE_MANUF_DATE,
+            self._TLV_CODE_DEVICE_VERSION,
+            self._TLV_CODE_LABEL_REVISION,
+            self._TLV_CODE_PLATFORM_NAME,
+            self._TLV_CODE_ONIE_VERSION,
+            self._TLV_CODE_MAC_SIZE,
+            self._TLV_CODE_MANUF_NAME,
+            self._TLV_CODE_MANUF_COUNTRY,
+            self._TLV_CODE_VENDOR_NAME,
+            self._TLV_CODE_DIAG_VERSION,
+            self._TLV_CODE_SERVICE_TAG,
+            self._TLV_CODE_VENDOR_EXT,
+            self._TLV_CODE_CRC_32
+        ]
+
+        for code in tlvinfo_type_codes_list:
+            code_str = "0x{:X}".format(code)
+            eeprom_data[code_str] = eeprom_data.get(code_str, NULL)
+        return eeprom_data
+
     def get_eeprom(self):
-        return self._eeprom
+        self._eeprom = self._load_eeprom() if not self._eeprom else self._eeprom
+        return self._valid_tlv(self._eeprom)
+
+    def get_pn(self):
+        return self.get_eeprom()['0x22']
 
     def get_serial(self):
-        return self._eeprom.get('0x23', "Undefined.")
+        return self.get_eeprom()['0x23']
 
     def get_mac(self):
-        return self._eeprom.get('0x24', "Undefined.")
+        return self.get_eeprom()['0x24']
 
-    def get_pn(self):
-        return self._eeprom.get('0x21', "Undefined.")
+
+class DeviceEEPROM(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self, eeprom_path, device_format, start_offset):
+        # Decode device eeprom as per specified format
+        self.format = device_format
+        self.start_offset = start_offset
+
+        EepromDecoder.__init__(self, eeprom_path, self.format,
+                               self.start_offset, '', True)
+        self._load_device_eeprom()
+
+    def _load_device_eeprom(self):
+        """
+        Reads the Fan/PSU EEPROM and interprets as per the specified format
+        """
+        self.serial_number = 'NA'
+        self.model_str = 'NA'
+
+        # device eeproms use proprietary format
+        try:
+            # Read Fan/PSU EEPROM as per the specified format.
+            self.eeprom_data = EepromDecoder.read_eeprom(self)
+        except Exception as e:
+            return
+
+        if self.eeprom_data[0] == 255:
+            return
+
+        (valid, data) = self._get_eeprom_field("Model")
+        if valid:
+            self.model_str = data.decode()
+
+        try:
+            (valid, data) = self._get_eeprom_field("Serial Number")
+            if valid:
+                self.serial_number = data.decode()
+        except Exception as e:
+            return
+
+    def _get_eeprom_field(self, field_name, decode=False):
+        """
+        For a field name specified in the EEPROM format, returns the
+        presence of the field and the value for the same.
+        """
+        field_start = 0
+        for field in self.format:
+            field_end = field_start + field[2]
+            if field[0] == field_name:
+                if decode:
+                    return (True, self.eeprom_data[field_start:field_end].decode('ascii'))
+                else:
+                    return (True, self.eeprom_data[field_start:field_end])
+            field_start = field_end
+
+        return (False, None)
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
index c8a487f383ea..332751386c7f 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/event.py
@@ -1,7 +1,7 @@
 try:
     import time
     import select
-    from .helper import APIHelper
+    from .common import Common
     from sonic_py_common.logger import Logger
 except ImportError as e:
     raise ImportError(repr(e) + " - required module not found")
@@ -16,12 +16,12 @@ class SfpEvent:
     GPIO_SUS7 = '/sys/devices/platform/hlx-ich.0/sci_int_gpio_sus7'
 
     def __init__(self, sfp_list):
-        self._api_helper = APIHelper()
+        self._api_common = Common()
         self._sfp_list = sfp_list
         self._logger = Logger()
-        
+
         # clear interrupt
-        self._api_helper.read_one_line_file(self.INT_PATH)
+        self._api_common.read_one_line_file(self.INT_PATH)
 
     def get_sfp_event(self, timeout):
         epoll = select.epoll()
@@ -37,7 +37,7 @@ def get_sfp_event(self, timeout):
             events = epoll.poll(timeout=timeout_sec if timeout != 0 else -1)
             if events:
                 # Read the QSFP ABS interrupt & status registers
-                port_changes = self._api_helper.read_one_line_file(
+                port_changes = self._api_common.read_one_line_file(
                     self.INT_PATH)
                 changes = int(port_changes, 16)
                 for sfp in self._sfp_list:
@@ -48,7 +48,8 @@ def get_sfp_event(self, timeout):
                     if change == 1:
                         time.sleep(self.DELAY)
                         port_status = sfp.get_presence()
-                        port_dict[str(sfp.port_num)] = '1' if port_status else '0'
+                        port_dict[str(sfp.port_num)
+                                  ] = '1' if port_status else '0'
 
                 return port_dict
         except Exception as e:
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
index c066cb9c33fc..90029ffce47e 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
@@ -6,6 +6,7 @@
 #
 #############################################################################
 
+from __future__ import division
 import math
 import os.path
 
@@ -20,8 +21,10 @@
 EMC2305_MAX_PWM = 255
 EMC2305_FAN_PWM = "pwm{}"
 EMC2305_FAN_TARGET = "fan{}_target"
+EMC2305_FAN_PWM_MODE = "pwm{}_enable"
 EMC2305_FAN_INPUT = "pwm{}"
 FAN_NAME_LIST = ["FAN-1", "FAN-2", "FAN-3"]
+FAN_SPEED_TOLERANCE = 10
 PSU_FAN_MAX_RPM = 11000
 PSU_HWMON_PATH = "/sys/bus/i2c/devices/i2c-{0}/{0}-00{1}/hwmon"
 PSU_I2C_MAPPING = {
@@ -34,12 +37,16 @@
         "addr": "5a"
     },
 }
+NULL_VAL = 'N/A'
 
 
 class Fan(FanBase):
     """Platform-specific Fan class"""
 
     def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+        FanBase.__init__(self)
+
+        self._api_common = Common()
         self.fan_index = fan_index
         self.fan_tray_index = fan_tray_index
         self.is_psu_fan = is_psu_fan
@@ -64,13 +71,10 @@ def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
         self.fan_e1031_led = "fan{}_led"
         self.fan_e1031_led_col_map = {
             self.STATUS_LED_COLOR_GREEN: "green",
-            self.STATUS_LED_COLOR_RED: "amber",
+            self.STATUS_LED_COLOR_AMBER: "amber",
             self.STATUS_LED_COLOR_OFF: "off"
         }
 
-        self._api_common = Common()
-        FanBase.__init__(self)
-
     def __search_file_by_name(self, directory, file_name):
         for dirpath, dirnames, files in os.walk(directory):
             for name in files:
@@ -141,19 +145,26 @@ def get_target_speed(self):
             0   : when PWM mode is use
             pwm : when pwm mode is not use
         """
-        target = 0
+        target = NULL_VAL
         if not self.is_psu_fan:
             chip = self.emc2305_chip_mapping[self.fan_index]
             device = chip['device']
             fan_index = chip['index_map']
-            sysfs_path = "%s%s/%s" % (
-                EMC2305_PATH, device, EMC2305_FAN_TARGET)
-            sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
-            raw = self._api_common.read_txt_file(sysfs_path).strip('\r\n')
+
+            enable_path = "%s%s/%s" % (
+                EMC2305_PATH, device, EMC2305_FAN_PWM_MODE)
+            enable = self._api_common.read_txt_file(
+                enable_path.format(fan_index[self.fan_tray_index]))
+
+            target_mode = EMC2305_FAN_TARGET if enable != "0" else EMC2305_FAN_PWM
+            target_path = "%s%s/%s" % (EMC2305_PATH, device,
+                                       target_mode.format(fan_index[self.fan_tray_index]))
+
+            raw = self._api_common.read_txt_file(target_path)
             pwm = int(raw, 10) if raw else 0
             target = math.ceil(float(pwm) * 100 / EMC2305_MAX_PWM)
 
-        return target
+        return int(target)
 
     def get_speed_tolerance(self):
         """
@@ -162,7 +173,7 @@ def get_speed_tolerance(self):
             An integer, the percentage of variance from target speed which is
                  considered tolerable
         """
-        return 10
+        return FAN_SPEED_TOLERANCE
 
     def set_speed(self, speed):
         """
@@ -211,6 +222,28 @@ def set_status_led(self, color):
 
         return set_status_led
 
+    def get_status_led(self):
+        """
+        Gets the state of the fan status LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        led = self.STATUS_LED_COLOR_GREEN
+        if not self.is_psu_fan:
+            fan_led_file = (FAN_PATH +
+                            self.fan_e1031_led.format(self.fan_tray_index+1))
+
+            led = self._api_common.read_txt_file(fan_led_file)
+        return {
+            'green': self.STATUS_LED_COLOR_GREEN,
+            'off': self.STATUS_LED_COLOR_OFF,
+            'amber': self.STATUS_LED_COLOR_AMBER
+        }.get(led, self.STATUS_LED_COLOR_OFF)
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
     def get_name(self):
         """
         Retrieves the name of the device
@@ -240,11 +273,7 @@ def get_model(self):
         Returns:
             string: Model/part number of device
         """
-        if self.is_psu_fan:
-            return NULL_VAL
-
-        model = NULL_VAL
-        return model
+        return NULL_VAL
 
     def get_serial(self):
         """
@@ -252,11 +281,7 @@ def get_serial(self):
         Returns:
             string: Serial number of device
         """
-        if self.is_psu_fan:
-            return NULL_VAL
-
-        serial = NULL_VAL
-        return serial
+        return NULL_VAL
 
     def get_status(self):
         """
@@ -269,7 +294,7 @@ def get_status(self):
             fan_fault_sysfs_name = "fan1_fault"
             fan_fault_sysfs_path = self.__search_file_by_name(
                 self.psu_hwmon_path, fan_fault_sysfs_name)
-            status = self._api_common.read_txt_file(fan_fault_sysfs_path)
+            status = self._api_common.read_one_line_file(fan_fault_sysfs_path)
 
         elif self.get_presence():
             chip = self.emc2305_chip_mapping[self.fan_index]
@@ -278,7 +303,27 @@ def get_status(self):
             sysfs_path = "%s%s/%s" % (
                 EMC2305_PATH, device, 'fan{}_fault')
             sysfs_path = sysfs_path.format(fan_index[self.fan_tray_index])
-            status = self._api_common.read_txt_file(sysfs_path)
+            status = self._api_common.read_one_line_file(sysfs_path)
 
         return False if int(status) != 0 else True
 
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of
+        entPhysicalContainedIn is'0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device
+            or -1 if cannot determine the position
+        """
+        return (self.fan_tray_index*2 + self.fan_index + 1) \
+            if not self.is_psu_fan else (self.fan_index+1)
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True if not self.is_psu_fan else False
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
new file mode 100644
index 000000000000..fe12b0ab101e
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Celestica
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the the Fan-Drawers' information available in the platform
+#
+#############################################################################
+
+try:
+    from sonic_platform_base.fan_drawer_base import FanDrawerBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+NUM_FAN = 1
+
+
+class FanDrawer(FanDrawerBase):
+    def __init__(self, fantray_index):
+        FanDrawerBase.__init__(self)
+        self._index = fantray_index + 1
+        self._init_fan(fantray_index)
+
+    def _init_fan(self, fantray_index):
+        from sonic_platform.fan import Fan
+        for index in range(NUM_FAN):
+            fan = Fan(fantray_index, index)
+            self._fan_list.append(fan)
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the fan drawer status LED
+        Args:
+            color: A string representing the color with which to set the
+                   fan drawer status LED
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        return self._fan_list[0].set_status_led(color)
+
+    def get_status_led(self, color=None):
+        """
+        Gets the state of the fan drawer LED
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings above
+        """
+        return self._fan_list[0].get_status_led()
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
+    def get_name(self):
+        """
+        Retrieves the name of the device
+        Returns:
+            string: The name of the device
+        """
+        return "Drawer{}".format(self._index)
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the device
+        Returns:
+            bool: True if device is present, False if not
+        """
+        return self._fan_list[0].get_presence()
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        return self._fan_list[0].get_model()
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        return self._fan_list[0].get_serial()
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self._fan_list[0].get_status()
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device
+        Returns:
+            integer: The 1-based relative physical position in parent device
+        """
+        return self._index
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py
deleted file mode 100644
index 75449ab55185..000000000000
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/helper.py
+++ /dev/null
@@ -1,133 +0,0 @@
-import os
-import struct
-import subprocess
-from mmap import *
-
-from sonic_py_common import device_info
-
-HOST_CHK_CMD = "docker > /dev/null 2>&1"
-EMPTY_STRING = ""
-
-
-class APIHelper():
-
-    def __init__(self):
-        (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
-
-    def is_host(self):
-        return os.system(HOST_CHK_CMD) == 0
-
-    def pci_get_value(self, resource, offset):
-        status = True
-        result = ""
-        try:
-            fd = os.open(resource, os.O_RDWR)
-            mm = mmap(fd, 0)
-            mm.seek(int(offset))
-            read_data_stream = mm.read(4)
-            result = struct.unpack('I', read_data_stream)
-        except Exception:
-            status = False
-        return status, result
-
-    def run_command(self, cmd):
-        status = True
-        result = ""
-        try:
-            p = subprocess.Popen(
-                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            raw_data, err = p.communicate()
-            if err == '':
-                result = raw_data.strip()
-        except Exception:
-            status = False
-        return status, result
-
-    def run_interactive_command(self, cmd):
-        try:
-            os.system(cmd)
-        except Exception:
-            return False
-        return True
-
-    def read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            pass
-        return None
-
-    def read_one_line_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.readline()
-                return data.strip()
-        except IOError:
-            pass
-        return None
-
-    def write_txt_file(self, file_path, value):
-        try:
-            with open(file_path, 'w') as fd:
-                fd.write(str(value))
-        except Exception:
-            return False
-        return True
-
-    def get_cpld_reg_value(self, getreg_path, register):
-        cmd = "echo {1} > {0}; cat {0}".format(getreg_path, register)
-        status, result = self.run_command(cmd)
-        return result if status else None
-
-    def ipmi_raw(self, netfn, cmd):
-        status = True
-        result = ""
-        try:
-            cmd = "ipmitool raw {} {}".format(str(netfn), str(cmd))
-            p = subprocess.Popen(
-                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            raw_data, err = p.communicate()
-            if err == '':
-                result = raw_data.strip()
-            else:
-                status = False
-        except Exception:
-            status = False
-        return status, result
-
-    def ipmi_fru_id(self, id, key=None):
-        status = True
-        result = ""
-        try:
-            cmd = "ipmitool fru print {}".format(str(
-                id)) if not key else "ipmitool fru print {0} | grep '{1}' ".format(str(id), str(key))
-
-            p = subprocess.Popen(
-                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            raw_data, err = p.communicate()
-            if err == '':
-                result = raw_data.strip()
-            else:
-                status = False
-        except Exception:
-            status = False
-        return status, result
-
-    def ipmi_set_ss_thres(self, id, threshold_key, value):
-        status = True
-        result = ""
-        try:
-            cmd = "ipmitool sensor thresh '{}' {} {}".format(
-                str(id), str(threshold_key), str(value))
-            p = subprocess.Popen(
-                cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            raw_data, err = p.communicate()
-            if err == '':
-                result = raw_data.strip()
-            else:
-                status = False
-        except Exception:
-            status = False
-        return status, result
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
index ccc63c8ac9ae..136010802233 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
@@ -11,10 +11,13 @@
 try:
     from sonic_platform_base.psu_base import PsuBase
     from sonic_platform.fan import Fan
+    from .common import Common
+    from .eeprom import DeviceEEPROM
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 FAN_E1031_SPEED_PATH = "/sys/class/hwmon/hwmon{}/fan1_input"
+PSU_E1031_STAT_PATH = "/sys/devices/platform/e1031.smc/"
 HWMON_PATH = "/sys/bus/i2c/devices/i2c-{0}/{0}-00{1}/hwmon"
 FAN_MAX_RPM = 11000
 PSU_NAME_LIST = ["PSU-R", "PSU-L"]
@@ -22,13 +25,22 @@
 PSU_I2C_MAPPING = {
     0: {
         "num": 13,
-        "addr": "5b"
+        "addr": "5b",
+        "eeprom_addr": "53"
     },
     1: {
         "num": 12,
-        "addr": "5a"
+        "addr": "5a",
+        "eeprom_addr": "52"
     },
 }
+PSU_EEPROM_PATH = "/sys/bus/i2c/devices/{}-00{}/eeprom"
+PSU_EEPROM_FORMAT = [
+    ('Serial Number', 's', 16), ('burn', 'x', 16),
+    ('Model', 's', 16),
+    ('Part Number', 's', 16),
+]
+PSU_EEPROM_START_OFFSET = 48
 
 
 class Psu(PsuBase):
@@ -36,32 +48,26 @@ class Psu(PsuBase):
 
     def __init__(self, psu_index):
         PsuBase.__init__(self)
+
+        self._api_common = Common()
         self.index = psu_index
-        self.psu_path = "/sys/devices/platform/e1031.smc/"
         self.psu_presence = "psu{}_prs"
         self.psu_oper_status = "psu{}_status"
         self.i2c_num = PSU_I2C_MAPPING[self.index]["num"]
         self.i2c_addr = PSU_I2C_MAPPING[self.index]["addr"]
         self.hwmon_path = HWMON_PATH.format(self.i2c_num, self.i2c_addr)
+        self.eeprom_addr = PSU_EEPROM_PATH.format(
+            self.i2c_num, PSU_I2C_MAPPING[self.index]["eeprom_addr"])
+
         for fan_index in range(0, PSU_NUM_FAN[self.index]):
             fan = Fan(fan_index, 0, is_psu_fan=True, psu_index=self.index)
             self._fan_list.append(fan)
-        PsuBase.__init__(self)
 
-    def __read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            pass
-        return ""
-
-    def __search_file_by_contain(self, directory, search_str, file_start):
+    def _search_file_by_contain(self, directory, search_str, file_start):
         for dirpath, dirnames, files in os.walk(directory):
             for name in files:
                 file_path = os.path.join(dirpath, name)
-                if name.startswith(file_start) and search_str in self.__read_txt_file(file_path):
+                if name.startswith(file_start) and search_str in self._api_common.read_txt_file(file_path):
                     return file_path
         return None
 
@@ -76,7 +82,7 @@ def get_voltage(self):
         voltage_name = "in{}_input"
         voltage_label = "vout1"
 
-        vout_label_path = self.__search_file_by_contain(
+        vout_label_path = self._search_file_by_contain(
             self.hwmon_path, voltage_label, "in")
         if vout_label_path:
             dir_name = os.path.dirname(vout_label_path)
@@ -84,7 +90,7 @@ def get_voltage(self):
             in_num = ''.join(list(filter(str.isdigit, basename)))
             vout_path = os.path.join(
                 dir_name, voltage_name.format(in_num))
-            vout_val = self.__read_txt_file(vout_path)
+            vout_val = self._api_common.read_txt_file(vout_path)
             psu_voltage = float(vout_val) / 1000
 
         return psu_voltage
@@ -99,7 +105,7 @@ def get_current(self):
         current_name = "curr{}_input"
         current_label = "iout1"
 
-        curr_label_path = self.__search_file_by_contain(
+        curr_label_path = self._search_file_by_contain(
             self.hwmon_path, current_label, "cur")
         if curr_label_path:
             dir_name = os.path.dirname(curr_label_path)
@@ -107,7 +113,7 @@ def get_current(self):
             cur_num = ''.join(list(filter(str.isdigit, basename)))
             cur_path = os.path.join(
                 dir_name, current_name.format(cur_num))
-            cur_val = self.__read_txt_file(cur_path)
+            cur_val = self._api_common.read_txt_file(cur_path)
             psu_current = float(cur_val) / 1000
 
         return psu_current
@@ -122,7 +128,7 @@ def get_power(self):
         current_name = "power{}_input"
         current_label = "pout1"
 
-        pw_label_path = self.__search_file_by_contain(
+        pw_label_path = self._search_file_by_contain(
             self.hwmon_path, current_label, "power")
         if pw_label_path:
             dir_name = os.path.dirname(pw_label_path)
@@ -130,7 +136,7 @@ def get_power(self):
             pw_num = ''.join(list(filter(str.isdigit, basename)))
             pw_path = os.path.join(
                 dir_name, current_name.format(pw_num))
-            pw_val = self.__read_txt_file(pw_path)
+            pw_val = self._api_common.read_txt_file(pw_path)
             psu_power = float(pw_val) / 1000000
 
         return psu_power
@@ -165,6 +171,10 @@ def get_status_led(self):
         # Hardware not supported
         return self.STATUS_LED_COLOR_OFF
 
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
     def get_name(self):
         """
         Retrieves the name of the device
@@ -180,8 +190,8 @@ def get_presence(self):
             bool: True if PSU is present, False if not
         """
         psu_location = ["R", "L"]
-        presences_status = self.__read_txt_file(
-            self.psu_path + self.psu_presence.format(psu_location[self.index])) or 0
+        presences_status = self._api_common.read_txt_file(
+            PSU_E1031_STAT_PATH + self.psu_presence.format(psu_location[self.index])) or 0
 
         return int(presences_status) == 1
 
@@ -192,7 +202,153 @@ def get_status(self):
             A boolean value, True if device is operating properly, False if not
         """
         psu_location = ["R", "L"]
-        power_status = self.__read_txt_file(
-            self.psu_path + self.psu_oper_status.format(psu_location[self.index])) or 0
+        power_status = self._api_common.read_txt_file(
+            PSU_E1031_STAT_PATH + self.psu_oper_status.format(psu_location[self.index])) or 0
 
         return int(power_status) == 1
+
+    def get_model(self):
+        """
+        Retrieves the model number (or part number) of the device
+        Returns:
+            string: Model/part number of device
+        """
+        self._eeprom = DeviceEEPROM(
+            self.eeprom_addr, PSU_EEPROM_FORMAT, PSU_EEPROM_START_OFFSET)
+        return self._eeprom.model_str
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the device
+        Returns:
+            string: Serial number of device
+        """
+        self._eeprom = DeviceEEPROM(
+            self.eeprom_addr, PSU_EEPROM_FORMAT, PSU_EEPROM_START_OFFSET)
+        return self._eeprom.serial_number
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+        for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+        Returns:
+            integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether this device is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+            there are three temp sensors , we choose one of them
+        """
+        psu_temperature = None
+        temperature_name = "temp{}_input"
+        temperature_label = "vout1"
+
+        vout_label_path = self._search_file_by_contain(
+            self.hwmon_path, temperature_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            temp_path = os.path.join(
+                dir_name, temperature_name.format(in_num))
+            vout_val = self._api_common.read_txt_file(temp_path)
+            psu_temperature = float(vout_val) / 1000
+
+        return psu_temperature
+
+    def get_temperature_high_threshold(self):
+        """
+        Retrieves the high threshold temperature of PSU
+        Returns:
+            A float number, the high threshold temperature of PSU in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+            there are three temp sensors , we choose one of them
+        """
+        psu_temperature = None
+        temperature_name = "temp{}_max"
+        temperature_label = "vout1"
+
+        vout_label_path = self._search_file_by_contain(
+            self.hwmon_path, temperature_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            temp_path = os.path.join(
+                dir_name, temperature_name.format(in_num))
+            vout_val = self._api_common.read_txt_file(temp_path)
+            psu_temperature = float(vout_val) / 1000
+
+        return psu_temperature
+
+    def get_voltage_high_threshold(self):
+        """
+        Retrieves the high threshold PSU voltage output
+        Returns:
+            A float number, the high threshold output voltage in volts,
+            e.g. 12.1
+        """
+        psu_voltage = 12.6
+        voltage_name = "in{}_crit"
+        voltage_label = "vout1"
+
+        vout_label_path = self._search_file_by_contain(
+            self.hwmon_path, voltage_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            vout_path = os.path.join(
+                dir_name, voltage_name.format(in_num))
+            if os.path.exists(vout_path):
+                vout_val = self._api_common.read_txt_file(vout_path)
+                psu_voltage = float(vout_val) / 1000
+
+        return psu_voltage
+
+    def get_voltage_low_threshold(self):
+        """
+        Retrieves the low threshold PSU voltage output
+        Returns:
+            A float number, the low threshold output voltage in volts,
+            e.g. 12.1
+        """
+        psu_voltage = 11.4
+        voltage_name = "in{}_lcrit"
+        voltage_label = "vout1"
+
+        vout_label_path = self._search_file_by_contain(
+            self.hwmon_path, voltage_label, "in")
+        if vout_label_path:
+            dir_name = os.path.dirname(vout_label_path)
+            basename = os.path.basename(vout_label_path)
+            in_num = ''.join(list(filter(str.isdigit, basename)))
+            vout_path = os.path.join(
+                dir_name, voltage_name.format(in_num))
+            if os.path.exists(vout_path):
+                vout_val = self._api_common.read_txt_file(vout_path)
+                psu_voltage = float(vout_val) / 1000
+
+        return psu_voltage
+
+    def get_maximum_supplied_power(self):
+        """
+        Retrieves the maximum supplied power by PSU
+        Returns:
+            A float number, the maximum power output in Watts.
+            e.g. 1200.1
+        """
+        return 200.0
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
index 91e5fec65ffc..157b06de1caf 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
@@ -6,23 +6,44 @@
 #
 #############################################################################
 
-import os
-import time
-from ctypes import create_string_buffer
-
 try:
+    import time
+    from ctypes import create_string_buffer
     from sonic_platform_base.sfp_base import SfpBase
-    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sff8472 import sffbase
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
+    from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
+    from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
+    from .common import Common
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-INFO_OFFSET = 0
-DOM_OFFSET = 256
+INFO_OFFSET = 128
+DOM_OFFSET = 0
 
+# definitions of the offset and width for values in XCVR info eeprom
 XCVR_INTFACE_BULK_OFFSET = 0
+XCVR_INTFACE_BULK_WIDTH_QSFP = 20
 XCVR_INTFACE_BULK_WIDTH_SFP = 21
+XCVR_TYPE_OFFSET = 0
+XCVR_TYPE_WIDTH = 1
+XCVR_EXT_TYPE_OFFSET = 1
+XCVR_EXT_TYPE_WIDTH = 1
+XCVR_CONNECTOR_OFFSET = 2
+XCVR_CONNECTOR_WIDTH = 1
+XCVR_COMPLIANCE_CODE_OFFSET = 3
+XCVR_COMPLIANCE_CODE_WIDTH = 8
+XCVR_ENCODING_OFFSET = 11
+XCVR_ENCODING_WIDTH = 1
+XCVR_NBR_OFFSET = 12
+XCVR_NBR_WIDTH = 1
+XCVR_EXT_RATE_SEL_OFFSET = 13
+XCVR_EXT_RATE_SEL_WIDTH = 1
+XCVR_CABLE_LENGTH_OFFSET = 14
+XCVR_CABLE_LENGTH_WIDTH_QSFP = 5
+XCVR_CABLE_LENGTH_WIDTH_SFP = 6
 XCVR_VENDOR_NAME_OFFSET = 20
 XCVR_VENDOR_NAME_WIDTH = 16
 XCVR_VENDOR_OUI_OFFSET = 37
@@ -30,30 +51,86 @@
 XCVR_VENDOR_PN_OFFSET = 40
 XCVR_VENDOR_PN_WIDTH = 16
 XCVR_HW_REV_OFFSET = 56
+XCVR_HW_REV_WIDTH_OSFP = 2
+XCVR_HW_REV_WIDTH_QSFP = 2
 XCVR_HW_REV_WIDTH_SFP = 4
 XCVR_VENDOR_SN_OFFSET = 68
 XCVR_VENDOR_SN_WIDTH = 16
 XCVR_VENDOR_DATE_OFFSET = 84
 XCVR_VENDOR_DATE_WIDTH = 8
 XCVR_DOM_CAPABILITY_OFFSET = 92
-XCVR_DOM_CAPABILITY_WIDTH = 1
+XCVR_DOM_CAPABILITY_WIDTH = 2
+
+XCVR_INTERFACE_DATA_START = 0
+XCVR_INTERFACE_DATA_SIZE = 92
+
+QSFP_DOM_BULK_DATA_START = 22
+QSFP_DOM_BULK_DATA_SIZE = 36
+SFP_DOM_BULK_DATA_START = 96
+SFP_DOM_BULK_DATA_SIZE = 10
+
+# definitions of the offset for values in OSFP info eeprom
+OSFP_TYPE_OFFSET = 0
+OSFP_VENDOR_NAME_OFFSET = 129
+OSFP_VENDOR_PN_OFFSET = 148
+OSFP_HW_REV_OFFSET = 164
+OSFP_VENDOR_SN_OFFSET = 166
+
+# Offset for values in QSFP eeprom
+QSFP_DOM_REV_OFFSET = 1
+QSFP_DOM_REV_WIDTH = 1
+QSFP_TEMPE_OFFSET = 22
+QSFP_TEMPE_WIDTH = 2
+QSFP_VOLT_OFFSET = 26
+QSFP_VOLT_WIDTH = 2
+QSFP_VERSION_COMPLIANCE_OFFSET = 1
+QSFP_VERSION_COMPLIANCE_WIDTH = 2
+QSFP_CHANNL_MON_OFFSET = 34
+QSFP_CHANNL_MON_WIDTH = 16
+QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH = 24
+QSFP_CHANNL_DISABLE_STATUS_OFFSET = 86
+QSFP_CHANNL_DISABLE_STATUS_WIDTH = 1
+QSFP_CHANNL_RX_LOS_STATUS_OFFSET = 3
+QSFP_CHANNL_RX_LOS_STATUS_WIDTH = 1
+QSFP_CHANNL_TX_FAULT_STATUS_OFFSET = 4
+QSFP_CHANNL_TX_FAULT_STATUS_WIDTH = 1
+QSFP_CONTROL_OFFSET = 86
+QSFP_CONTROL_WIDTH = 8
+QSFP_MODULE_MONITOR_OFFSET = 0
+QSFP_MODULE_MONITOR_WIDTH = 9
+QSFP_POWEROVERRIDE_OFFSET = 93
+QSFP_POWEROVERRIDE_WIDTH = 1
+QSFP_POWEROVERRIDE_BIT = 0
+QSFP_POWERSET_BIT = 1
+QSFP_OPTION_VALUE_OFFSET = 192
+QSFP_OPTION_VALUE_WIDTH = 4
+QSFP_MODULE_UPPER_PAGE3_START = 384
+QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_WIDTH = 24
+QSFP_CHANNL_THRESHOLD_OFFSET = 176
+QSFP_CHANNL_THRESHOLD_WIDTH = 24
+
+SFP_MODULE_ADDRA2_OFFSET = 256
+SFP_MODULE_THRESHOLD_OFFSET = 0
+SFP_MODULE_THRESHOLD_WIDTH = 56
+SFP_CHANNL_THRESHOLD_OFFSET = 112
+SFP_CHANNL_THRESHOLD_WIDTH = 2
 
-# Offset for values in SFP eeprom
 SFP_TEMPE_OFFSET = 96
 SFP_TEMPE_WIDTH = 2
 SFP_VOLT_OFFSET = 98
 SFP_VOLT_WIDTH = 2
 SFP_CHANNL_MON_OFFSET = 100
 SFP_CHANNL_MON_WIDTH = 6
-SFP_MODULE_THRESHOLD_OFFSET = 0
-SFP_MODULE_THRESHOLD_WIDTH = 40
-SFP_CHANNL_THRESHOLD_OFFSET = 112
-SFP_CHANNL_THRESHOLD_WIDTH = 2
-SFP_STATUS_CONTROL_OFFSET = 110
-SFP_STATUS_CONTROL_WIDTH = 1
+SFP_CHANNL_STATUS_OFFSET = 110
+SFP_CHANNL_STATUS_WIDTH = 1
 SFP_TX_DISABLE_HARD_BIT = 7
 SFP_TX_DISABLE_SOFT_BIT = 6
 
+qsfp_cable_length_tup = ('Length(km)', 'Length OM3(2m)',
+                         'Length OM2(m)', 'Length OM1(m)',
+                         'Length Cable Assembly(m)')
+
 sfp_cable_length_tup = ('LengthSMFkm-UnitsOfKm', 'LengthSMF(UnitsOf100m)',
                         'Length50um(UnitsOf10m)', 'Length62.5um(UnitsOfm)',
                         'LengthCable(UnitsOfm)', 'LengthOM3(UnitsOf10m)')
@@ -64,44 +141,63 @@
                            'FibreChannelTechnology', 'SFP+CableTechnology',
                            'FibreChannelTransmissionMedia', 'FibreChannelSpeed')
 
+qsfp_compliance_code_tup = ('10/40G Ethernet Compliance Code', 'SONET Compliance codes',
+                            'SAS/SATA compliance codes', 'Gigabit Ethernet Compliant codes',
+                            'Fibre Channel link length/Transmitter Technology',
+                            'Fibre Channel transmission media', 'Fibre Channel Speed')
+
+SFP_TYPE = "SFP"
+QSFP_TYPE = "QSFP"
+OSFP_TYPE = "OSFP"
+ETP_TYPE = "ETP"
+
+SFP_PORT_START = 49
+SFP_PORT_END = 52
+
+PORT_START = 1
+PORT_END = 55
+
 
 class Sfp(SfpBase):
     """Platform-specific Sfp class"""
 
-    # Port number
-    PORT_START = 1
-    PORT_END = 52
+    # Port I2C number
     port_to_i2c_mapping = {
         49: 15,
         50: 14,
         51: 17,
         52: 16
     }
-    _sfp_port = list(range(49, PORT_END + 1))
-    PRS_PATH = "/sys/devices/platform/e1031.smc/SFP/sfp_modabs"
-    PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
-    PMON_HWSKU_PATH = '/usr/share/sonic/hwsku'
-    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+    _sfp_port = list(range(SFP_PORT_START, SFP_PORT_END + 1))
 
-    PLATFORM = "x86_64-cel_e1031-r0"
-    HWSKU = "Celestica-E1031-T48S4"
+    PRS_PATH = "/sys/devices/platform/e1031.smc/SFP/sfp_modabs"
 
     def __init__(self, sfp_index, sfp_name):
+        SfpBase.__init__(self)
+
+        # Init common function
+        self._api_common = Common()
+
         # Init index
         self.index = sfp_index
         self.port_num = self.index + 1
 
+        # Init sfp data
+        self.sfp_type = self.__get_sfp_type()
+        self.name = sfp_name
+
         # Init eeprom path
         eeprom_path = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom'
         self.port_to_eeprom_mapping = {}
-        for x in range(self.PORT_START, self.PORT_END + 1):
+        for x in range(PORT_START, PORT_END + 1):
             if x not in self._sfp_port:
                 self.port_to_i2c_mapping[x] = None
             self.port_to_eeprom_mapping[x] = eeprom_path.format(
                 self.port_to_i2c_mapping[x])
 
         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
-                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
+                               'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance',
+                               'vendor_date', 'vendor_oui', "application_advertisement", "type_abbrv_name"]
 
         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
                               'rx1power', 'rx2power', 'rx3power', 'rx4power', 'tx1bias', 'tx2bias', 'tx3bias', 'tx4bias', 'tx1power', 'tx2power', 'tx3power', 'tx4power']
@@ -109,10 +205,12 @@ def __init__(self, sfp_index, sfp_name):
         self.threshold_dict_keys = ['temphighalarm', 'temphighwarning', 'templowalarm', 'templowwarning', 'vcchighalarm', 'vcchighwarning', 'vcclowalarm', 'vcclowwarning', 'rxpowerhighalarm', 'rxpowerhighwarning',
                                     'rxpowerlowalarm', 'rxpowerlowwarning', 'txpowerhighalarm', 'txpowerhighwarning', 'txpowerlowalarm', 'txpowerlowwarning', 'txbiashighalarm', 'txbiashighwarning', 'txbiaslowalarm', 'txbiaslowwarning']
 
-        self.name = sfp_name
-        SfpBase.__init__(self)
+        self._dom_capability_detect()
 
-    def _convert_string_to_num(self, value_str):
+    def __get_sfp_type(self):
+        return SFP_TYPE if self.port_num in self._sfp_port else ETP_TYPE
+
+    def __convert_string_to_num(self, value_str):
         if "-inf" in value_str:
             return 'N/A'
         elif "Unknown" in value_str:
@@ -132,18 +230,6 @@ def _convert_string_to_num(self, value_str):
         else:
             return 'N/A'
 
-    def __read_txt_file(self, file_path):
-        try:
-            with open(file_path, 'r') as fd:
-                data = fd.read()
-                return data.strip()
-        except IOError:
-            pass
-        return ""
-
-    def __is_host(self):
-        return os.system(self.HOST_CHK_CMD) == 0
-
     def __read_eeprom_specific_bytes(self, offset, num_bytes):
         sysfsfile_eeprom = None
         eeprom_raw = []
@@ -156,9 +242,13 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
                 sysfs_sfp_i2c_client_eeprom_path, mode="rb", buffering=0)
             sysfsfile_eeprom.seek(offset)
             raw = sysfsfile_eeprom.read(num_bytes)
-            for n in range(0, num_bytes):
-                eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
-        except Exception:
+            if isinstance(raw, str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+        except BaseException:
             pass
         finally:
             if sysfsfile_eeprom:
@@ -166,6 +256,106 @@ def __read_eeprom_specific_bytes(self, offset, num_bytes):
 
         return eeprom_raw
 
+    def _dom_capability_detect(self):
+        if not self.get_presence():
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+            self.calibration = 0
+            return
+
+        if self.sfp_type == "QSFP":
+            self.calibration = 1
+            sfpi_obj = sff8436InterfaceId()
+            if sfpi_obj is None:
+                self.dom_supported = False
+            offset = 128
+
+            # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
+            # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
+            # need to add more code for determining the capability and version compliance
+            # in SFF-8636 dom capability definitions evolving with the versions.
+            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
+            if qsfp_dom_capability_raw is not None:
+                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
+                qsfp_version_compliance = int(
+                    qsfp_version_compliance_raw[0], 16)
+                dom_capability = sfpi_obj.parse_dom_capability(
+                    qsfp_dom_capability_raw, 0)
+                if qsfp_version_compliance >= 0x08:
+                    self.dom_temp_supported = dom_capability['data']['Temp_support']['value'] == 'On'
+                    self.dom_volt_supported = dom_capability['data']['Voltage_support']['value'] == 'On'
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = dom_capability['data']['Tx_power_support']['value'] == 'On'
+                else:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = dom_capability['data']['Rx_power_support']['value'] == 'On'
+                    self.dom_tx_power_supported = True
+
+                self.dom_supported = True
+                self.calibration = 1
+                sfpd_obj = sff8436Dom()
+                if sfpd_obj is None:
+                    return None
+                qsfp_option_value_raw = self.__read_eeprom_specific_bytes(
+                    QSFP_OPTION_VALUE_OFFSET, QSFP_OPTION_VALUE_WIDTH)
+                if qsfp_option_value_raw is not None:
+                    optional_capability = sfpd_obj.parse_option_params(
+                        qsfp_option_value_raw, 0)
+                    self.dom_tx_disable_supported = optional_capability[
+                        'data']['TxDisable']['value'] == 'On'
+                dom_status_indicator = sfpd_obj.parse_dom_status_indicator(
+                    qsfp_version_compliance_raw, 1)
+                self.qsfp_page3_available = dom_status_indicator['data']['FlatMem']['value'] == 'Off'
+            else:
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+                self.qsfp_page3_available = False
+
+        elif self.sfp_type == "SFP":
+            sfpi_obj = sff8472InterfaceId()
+            if sfpi_obj is None:
+                return None
+            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+                XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
+            if sfp_dom_capability_raw is not None:
+                sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
+                self.dom_supported = (sfp_dom_capability & 0x40 != 0)
+                if self.dom_supported:
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
+                    self.dom_rx_power_supported = True
+                    self.dom_tx_power_supported = True
+                    if sfp_dom_capability & 0x20 != 0:
+                        self.calibration = 1
+                    elif sfp_dom_capability & 0x10 != 0:
+                        self.calibration = 2
+                    else:
+                        self.calibration = 0
+                else:
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
+                    self.dom_rx_power_supported = False
+                    self.dom_tx_power_supported = False
+                    self.calibration = 0
+                self.dom_tx_disable_supported = (
+                    int(sfp_dom_capability_raw[1], 16) & 0x40 != 0)
+        else:
+            self.dom_supported = False
+            self.dom_temp_supported = False
+            self.dom_volt_supported = False
+            self.dom_rx_power_supported = False
+            self.dom_tx_power_supported = False
+
     def get_transceiver_info(self):
         """
         Retrieves transceiver info of this SFP
@@ -189,85 +379,183 @@ def get_transceiver_info(self):
         vendor_date                |1*255VCHAR     |vendor date
         vendor_oui                 |1*255VCHAR     |vendor OUI
         ========================================================================
-        """
-        # check present status
-        sfpi_obj = sff8472InterfaceId()
-        if not self.get_presence() or not sfpi_obj:
-            return {}
-
-        offset = INFO_OFFSET
-
-        sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_INTFACE_BULK_OFFSET), XCVR_INTFACE_BULK_WIDTH_SFP)
-        sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
-            sfp_interface_bulk_raw, 0)
-
-        sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
-        sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
-            sfp_vendor_name_raw, 0)
-
-        sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
-        sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
-            sfp_vendor_pn_raw, 0)
-
-        sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_HW_REV_OFFSET), XCVR_HW_REV_WIDTH_SFP)
-        sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
-            sfp_vendor_rev_raw, 0)
-
-        sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
-        sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
-            sfp_vendor_sn_raw, 0)
-
-        sfp_vendor_oui_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_VENDOR_OUI_OFFSET), XCVR_VENDOR_OUI_WIDTH)
-        if sfp_vendor_oui_raw is not None:
-            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
-                sfp_vendor_oui_raw, 0)
-
-        sfp_vendor_date_raw = self.__read_eeprom_specific_bytes(
-            (offset + XCVR_VENDOR_DATE_OFFSET), XCVR_VENDOR_DATE_WIDTH)
-        sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
-            sfp_vendor_date_raw, 0)
-
+         """
+        compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
-        compliance_code_dict = dict()
+        if not self.get_presence():
+            return transceiver_info_dict
+
+        # ToDo: OSFP tranceiver info parsing not fully supported.
+        # in inf8628.py lack of some memory map definition
+        # will be implemented when the inf8628 memory map ready
+        if self.sfp_type == OSFP_TYPE:
+            offset = 0
+            vendor_rev_width = XCVR_HW_REV_WIDTH_OSFP
+
+            sfpi_obj = inf8628InterfaceId()
+            if sfpi_obj is None:
+                return None
+
+            sfp_type_raw = self.__read_eeprom_specific_bytes(
+                (offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
+            if sfp_type_raw is not None:
+                sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
+            if sfp_vendor_name_raw is not None:
+                sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                    sfp_vendor_name_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
+            if sfp_vendor_pn_raw is not None:
+                sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                    sfp_vendor_pn_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+                (offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
+            if sfp_vendor_rev_raw is not None:
+                sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                    sfp_vendor_rev_raw, 0)
+            else:
+                return None
+
+            sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+                (offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
+            if sfp_vendor_sn_raw is not None:
+                sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                    sfp_vendor_sn_raw, 0)
+            else:
+                return None
+
+            transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = 'N/A'
+            transceiver_info_dict['vendor_date'] = 'N/A'
+            transceiver_info_dict['connector'] = 'N/A'
+            transceiver_info_dict['encoding'] = 'N/A'
+            transceiver_info_dict['ext_identifier'] = 'N/A'
+            transceiver_info_dict['ext_rateselect_compliance'] = 'N/A'
+            transceiver_info_dict['cable_type'] = 'N/A'
+            transceiver_info_dict['cable_length'] = 'N/A'
+            transceiver_info_dict['specification_compliance'] = '{}'
+            transceiver_info_dict['nominal_bit_rate'] = 'N/A'
 
-        if sfp_interface_bulk_data:
+        else:
+            if self.sfp_type == QSFP_TYPE:
+                offset = 128
+                vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
+                # cable_length_width = XCVR_CABLE_LENGTH_WIDTH_QSFP
+                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
+
+                sfpi_obj = sff8436InterfaceId()
+                if sfpi_obj is None:
+                    print("Error: sfp_object open failed")
+                    return None
+
+            else:
+                offset = 0
+                vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
+                # cable_length_width = XCVR_CABLE_LENGTH_WIDTH_SFP
+                interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
+
+                sfpi_obj = sff8472InterfaceId()
+                if sfpi_obj is None:
+                    print("Error: sfp_object open failed")
+                    return None
+            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+                offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
+            if sfp_interface_bulk_raw is None:
+                return None
+
+            start = XCVR_INTFACE_BULK_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + interface_info_bulk_width
+            sfp_interface_bulk_data = sfpi_obj.parse_sfp_info_bulk(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_NAME_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_NAME_WIDTH
+            sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_PN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_PN_WIDTH
+            sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_HW_REV_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + vendor_rev_width
+            sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_SN_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_SN_WIDTH
+            sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_OUI_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_OUI_WIDTH
+            sfp_vendor_oui_data = sfpi_obj.parse_vendor_oui(
+                sfp_interface_bulk_raw[start: end], 0)
+
+            start = XCVR_VENDOR_DATE_OFFSET - XCVR_INTERFACE_DATA_START
+            end = start + XCVR_VENDOR_DATE_WIDTH
+            sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
+                sfp_interface_bulk_raw[start: end], 0)
             transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
+            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
+                'data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
             transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
             transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
             transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
             transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
             transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
 
-        transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
-            'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
-        transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
-        transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
-        transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
-        transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
-        transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
-            'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
-        transceiver_info_dict['cable_type'] = "Unknown"
-        transceiver_info_dict['cable_length'] = "Unknown"
-
-        for key in sfp_cable_length_tup:
-            if key in sfp_interface_bulk_data['data']:
-                transceiver_info_dict['cable_type'] = key
-                transceiver_info_dict['cable_length'] = str(
-                    sfp_interface_bulk_data['data'][key]['value'])
-
-        for key in sfp_compliance_code_tup:
-            if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
-                compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
-        transceiver_info_dict['specification_compliance'] = str(
-            compliance_code_dict)
-        transceiver_info_dict['nominal_bit_rate'] = str(
-            sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+            if self.sfp_type == QSFP_TYPE:
+                for key in qsfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(
+                            sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in qsfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                transceiver_info_dict['specification_compliance'] = str(
+                    compliance_code_dict)
+
+                transceiver_info_dict['nominal_bit_rate'] = str(
+                    sfp_interface_bulk_data['data']['Nominal Bit Rate(100Mbs)']['value'])
+            else:
+                for key in sfp_cable_length_tup:
+                    if key in sfp_interface_bulk_data['data']:
+                        transceiver_info_dict['cable_type'] = key
+                        transceiver_info_dict['cable_length'] = str(
+                            sfp_interface_bulk_data['data'][key]['value'])
+
+                for key in sfp_compliance_code_tup:
+                    if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
+                        compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
+                transceiver_info_dict['specification_compliance'] = str(
+                    compliance_code_dict)
+
+                transceiver_info_dict['nominal_bit_rate'] = str(
+                    sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
 
         return transceiver_info_dict
 
@@ -296,44 +584,117 @@ def get_transceiver_bulk_status(self):
                                    |               |for example, tx2power stands for tx power of channel 2.
         ========================================================================
         """
-        # check present status
-        sfpd_obj = sff8472Dom()
-        if not self.get_presence() or not sfpd_obj:
-            return {}
+        transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
 
-        eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
-        sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
-        cal_type = sfpi_obj.get_calibration_type()
-        sfpd_obj._calibration_type = cal_type
+        if self.sfp_type == OSFP_TYPE:
+            pass
 
-        offset = DOM_OFFSET
-        transceiver_dom_info_dict = dict.fromkeys(self.dom_dict_keys, 'N/A')
-        dom_temperature_raw = self.__read_eeprom_specific_bytes(
-            (offset + SFP_TEMPE_OFFSET), SFP_TEMPE_WIDTH)
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 0
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+
+            dom_data_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_DOM_BULK_DATA_START), QSFP_DOM_BULK_DATA_SIZE)
+            if dom_data_raw is None:
+                return transceiver_dom_info_dict
+
+            if self.dom_temp_supported:
+                start = QSFP_TEMPE_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_TEMPE_WIDTH
+                dom_temperature_data = sfpd_obj.parse_temperature(
+                    dom_data_raw[start: end], 0)
+                temp = self.__convert_string_to_num(
+                    dom_temperature_data['data']['Temperature']['value'])
+                if temp is not None:
+                    transceiver_dom_info_dict['temperature'] = temp
+
+            if self.dom_volt_supported:
+                start = QSFP_VOLT_OFFSET - QSFP_DOM_BULK_DATA_START
+                end = start + QSFP_VOLT_WIDTH
+                dom_voltage_data = sfpd_obj.parse_voltage(
+                    dom_data_raw[start: end], 0)
+                volt = self.__convert_string_to_num(
+                    dom_voltage_data['data']['Vcc']['value'])
+                if volt is not None:
+                    transceiver_dom_info_dict['voltage'] = volt
+
+            start = QSFP_CHANNL_MON_OFFSET - QSFP_DOM_BULK_DATA_START
+            end = start + QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                dom_data_raw[start: end], 0)
+
+            if self.dom_tx_power_supported:
+                transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Power']['value'])
+                transceiver_dom_info_dict['tx2power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Power']['value'])
+                transceiver_dom_info_dict['tx3power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Power']['value'])
+                transceiver_dom_info_dict['tx4power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Power']['value'])
+
+            if self.dom_rx_power_supported:
+                transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['RX1Power']['value'])
+                transceiver_dom_info_dict['rx2power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['RX2Power']['value'])
+                transceiver_dom_info_dict['rx3power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['RX3Power']['value'])
+                transceiver_dom_info_dict['rx4power'] = self.__convert_string_to_num(
+                    dom_channel_monitor_data['data']['RX4Power']['value'])
+
+            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TX1Bias']['value'])
+            transceiver_dom_info_dict['tx2bias'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TX2Bias']['value'])
+            transceiver_dom_info_dict['tx3bias'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TX3Bias']['value'])
+            transceiver_dom_info_dict['tx4bias'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TX4Bias']['value'])
 
-        if dom_temperature_raw is not None:
+        else:
+            if not self.dom_supported:
+                return transceiver_dom_info_dict
+
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_info_dict
+            sfpd_obj._calibration_type = self.calibration
+
+            dom_data_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_DOM_BULK_DATA_START), SFP_DOM_BULK_DATA_SIZE)
+
+            start = SFP_TEMPE_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_TEMPE_WIDTH
             dom_temperature_data = sfpd_obj.parse_temperature(
-                dom_temperature_raw, 0)
-            transceiver_dom_info_dict['temperature'] = dom_temperature_data['data']['Temperature']['value']
-
-        dom_voltage_raw = self.__read_eeprom_specific_bytes(
-            (offset + SFP_VOLT_OFFSET), SFP_VOLT_WIDTH)
-        if dom_voltage_raw is not None:
-            dom_voltage_data = sfpd_obj.parse_voltage(dom_voltage_raw, 0)
-            transceiver_dom_info_dict['voltage'] = dom_voltage_data['data']['Vcc']['value']
-
-        dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
-            (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
-        if dom_channel_monitor_raw is not None:
-            dom_voltage_data = sfpd_obj.parse_channel_monitor_params(
-                dom_channel_monitor_raw, 0)
-            transceiver_dom_info_dict['tx1power'] = dom_voltage_data['data']['TXPower']['value']
-            transceiver_dom_info_dict['rx1power'] = dom_voltage_data['data']['RXPower']['value']
-            transceiver_dom_info_dict['tx1bias'] = dom_voltage_data['data']['TXBias']['value']
-
-        for key in transceiver_dom_info_dict:
-            transceiver_dom_info_dict[key] = self._convert_string_to_num(
-                transceiver_dom_info_dict[key])
+                dom_data_raw[start: end], 0)
+
+            start = SFP_VOLT_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_VOLT_WIDTH
+            dom_voltage_data = sfpd_obj.parse_voltage(
+                dom_data_raw[start: end], 0)
+
+            start = SFP_CHANNL_MON_OFFSET - SFP_DOM_BULK_DATA_START
+            end = start + SFP_CHANNL_MON_WIDTH
+            dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                dom_data_raw[start: end], 0)
+
+            transceiver_dom_info_dict['temperature'] = self.__convert_string_to_num(
+                dom_temperature_data['data']['Temperature']['value'])
+            transceiver_dom_info_dict['voltage'] = self.__convert_string_to_num(
+                dom_voltage_data['data']['Vcc']['value'])
+            transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['RXPower']['value'])
+            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TXBias']['value'])
+            transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
+                dom_channel_monitor_data['data']['TXPower']['value'])
 
         transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
         transceiver_dom_info_dict['tx_fault'] = self.get_tx_fault()
@@ -372,26 +733,79 @@ def get_transceiver_threshold_info(self):
         txbiaslowwarning           |FLOAT          |Low Warning Threshold value of tx Bias Current in mA.
         ========================================================================
         """
-        # check present status
-        sfpd_obj = sff8472Dom()
+        transceiver_dom_threshold_info_dict = dict.fromkeys(
+            self.threshold_dict_keys, 'N/A')
 
-        if not self.get_presence() and not sfpd_obj:
-            return {}
+        if self.sfp_type == OSFP_TYPE:
+            pass
 
-        eeprom_ifraw = self.__read_eeprom_specific_bytes(0, DOM_OFFSET)
-        sfpi_obj = sff8472InterfaceId(eeprom_ifraw)
-        cal_type = sfpi_obj.get_calibration_type()
-        sfpd_obj._calibration_type = cal_type
+        elif self.sfp_type == QSFP_TYPE:
+            if not self.dom_supported or not self.qsfp_page3_available:
+                return transceiver_dom_threshold_info_dict
 
-        offset = DOM_OFFSET
-        transceiver_dom_threshold_info_dict = dict.fromkeys(
-            self.threshold_dict_keys, 'N/A')
-        dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
-            (offset + SFP_MODULE_THRESHOLD_OFFSET), SFP_MODULE_THRESHOLD_WIDTH)
-        if dom_module_threshold_raw is not None:
-            dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+            # Dom Threshold data starts from offset 384
+            # Revert offset back to 0 once data is retrieved
+            offset = QSFP_MODULE_UPPER_PAGE3_START
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
                 dom_module_threshold_raw, 0)
 
+            dom_channel_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
+                                                                          QSFP_CHANNL_THRESHOLD_WIDTH)
+            if dom_channel_threshold_raw is None:
+                return transceiver_dom_threshold_info_dict
+            dom_channel_threshold_data = sfpd_obj.parse_channel_threshold_values(
+                dom_channel_threshold_raw, 0)
+
+            # Threshold Data
+            transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
+            transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['templowwarning'] = dom_module_threshold_data['data']['TempLowWarning']['value']
+            transceiver_dom_threshold_info_dict['vcchighalarm'] = dom_module_threshold_data['data']['VccHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcchighwarning'] = dom_module_threshold_data['data']['VccHighWarning']['value']
+            transceiver_dom_threshold_info_dict['vcclowalarm'] = dom_module_threshold_data['data']['VccLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['vcclowwarning'] = dom_module_threshold_data['data']['VccLowWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighalarm'] = dom_channel_threshold_data['data']['RxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerhighwarning'] = dom_channel_threshold_data['data']['RxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowalarm'] = dom_channel_threshold_data['data']['RxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_channel_threshold_data['data']['RxPowerLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiashighalarm'] = dom_channel_threshold_data['data']['TxBiasHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiashighwarning'] = dom_channel_threshold_data['data']['TxBiasHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowalarm'] = dom_channel_threshold_data['data']['TxBiasLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txbiaslowwarning'] = dom_channel_threshold_data['data']['TxBiasLowWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighalarm'] = dom_channel_threshold_data['data']['TxPowerHighAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerhighwarning'] = dom_channel_threshold_data['data']['TxPowerHighWarning']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowalarm'] = dom_channel_threshold_data['data']['TxPowerLowAlarm']['value']
+            transceiver_dom_threshold_info_dict['txpowerlowwarning'] = dom_channel_threshold_data['data']['TxPowerLowWarning']['value']
+
+        else:
+            offset = SFP_MODULE_ADDRA2_OFFSET
+
+            if not self.dom_supported:
+                return transceiver_dom_threshold_info_dict
+
+            sfpd_obj = sff8472Dom(None, self.calibration)
+            if sfpd_obj is None:
+                return transceiver_dom_threshold_info_dict
+
+            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
+                                                                         SFP_MODULE_THRESHOLD_WIDTH)
+            if dom_module_threshold_raw is not None:
+                dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
+                    dom_module_threshold_raw, 0)
+            else:
+                return transceiver_dom_threshold_info_dict
+
+            # Threshold Data
             transceiver_dom_threshold_info_dict['temphighalarm'] = dom_module_threshold_data['data']['TempHighAlarm']['value']
             transceiver_dom_threshold_info_dict['templowalarm'] = dom_module_threshold_data['data']['TempLowAlarm']['value']
             transceiver_dom_threshold_info_dict['temphighwarning'] = dom_module_threshold_data['data']['TempHighWarning']['value']
@@ -415,7 +829,7 @@ def get_transceiver_threshold_info(self):
             transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
 
         for key in transceiver_dom_threshold_info_dict:
-            transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
+            transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(
                 transceiver_dom_threshold_info_dict[key])
 
         return transceiver_dom_threshold_info_dict
@@ -437,11 +851,27 @@ def get_rx_los(self):
             Note : RX LOS status is latched until a call to get_rx_los or a reset.
         """
         rx_los = False
-        status_control_raw = self.__read_eeprom_specific_bytes(
-            SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
-        if status_control_raw:
-            data = int(status_control_raw[0], 16)
-            rx_los = (sffbase().test_bit(data, 1) != 0)
+        if self.sfp_type == OSFP_TYPE:
+            return False
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx1_los = (rx_los_data & 0x01 != 0)
+                rx2_los = (rx_los_data & 0x02 != 0)
+                rx3_los = (rx_los_data & 0x04 != 0)
+                rx4_los = (rx_los_data & 0x08 != 0)
+                rx_los = (rx1_los and rx2_los and rx3_los and rx4_los)
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                rx_los_data = int(dom_channel_monitor_raw[0], 16)
+                rx_los = (rx_los_data & 0x02 != 0)
 
         return rx_los
 
@@ -452,14 +882,32 @@ def get_tx_fault(self):
             A Boolean, True if SFP has TX fault, False if not
             Note : TX fault status is lached until a call to get_tx_fault or a reset.
         """
-        tx_fault = False
-        status_control_raw = self.__read_eeprom_specific_bytes(
-            SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
-        if status_control_raw:
-            data = int(status_control_raw[0], 16)
-            tx_fault = (sffbase().test_bit(data, 2) != 0)
+        tx4_fault = False
+
+        if self.sfp_type == OSFP_TYPE or not self.dom_supported:
+            return False
+
+        elif self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx1_fault = (tx_fault_data & 0x01 != 0)
+                tx2_fault = (tx_fault_data & 0x02 != 0)
+                tx3_fault = (tx_fault_data & 0x04 != 0)
+                tx4_fault = (tx_fault_data & 0x08 != 0)
+                tx4_fault = (
+                    tx1_fault and tx2_fault and tx3_fault and tx4_fault)
+        else:
+            offset = 256
+            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
+                tx4_fault = (tx_fault_data & 0x04 != 0)
 
-        return tx_fault
+        return tx4_fault
 
     def get_tx_disable(self):
         """
@@ -469,7 +917,7 @@ def get_tx_disable(self):
         """
         tx_disable = False
         status_control_raw = self.__read_eeprom_specific_bytes(
-            SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH)
         if status_control_raw:
             data = int(status_control_raw[0], 16)
             tx_disable_hard = (sffbase().test_bit(
@@ -516,8 +964,8 @@ def get_temperature(self):
         Returns:
             An integer number of current temperature in Celsius
         """
-        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
-        return transceiver_dom_info_dict.get("temperature", "N/A")
+        transceiver_bulk_status = self.get_transceiver_bulk_status()
+        return transceiver_bulk_status.get("temperature", "N/A")
 
     def get_voltage(self):
         """
@@ -525,8 +973,8 @@ def get_voltage(self):
         Returns:
             An integer number of supply voltage in mV
         """
-        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
-        return transceiver_dom_info_dict.get("voltage", "N/A")
+        transceiver_bulk_status = self.get_transceiver_bulk_status()
+        return transceiver_bulk_status.get("voltage", "N/A")
 
     def get_tx_bias(self):
         """
@@ -584,7 +1032,7 @@ def tx_disable(self, tx_disable):
         """
         sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
         status_control_raw = self.__read_eeprom_specific_bytes(
-            SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+            SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH)
         if status_control_raw is not None:
             # Set bit 6 for Soft TX Disable Select
             # 01000000 = 64 and 10111111 = 191
@@ -598,10 +1046,9 @@ def tx_disable(self, tx_disable):
                 buffer = create_string_buffer(1)
                 buffer[0] = chr(tx_disable_ctl)
                 # Write to eeprom
-                sysfsfile_eeprom.seek(SFP_STATUS_CONTROL_OFFSET)
+                sysfsfile_eeprom.seek(SFP_CHANNL_STATUS_OFFSET)
                 sysfsfile_eeprom.write(buffer[0])
             except Exception:
-                #print("Error: unable to open file: %s" % str(e))
                 return False
             finally:
                 if sysfsfile_eeprom:
@@ -656,6 +1103,10 @@ def set_power_override(self, power_override, power_set):
         # SFP doesn't support this feature
         return False
 
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
+
     def get_name(self):
         """
         Retrieves the name of the device
@@ -700,3 +1151,26 @@ def get_serial(self):
         """
         transceiver_dom_info_dict = self.get_transceiver_info()
         return transceiver_dom_info_dict.get("serial", "N/A")
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the device
+        Returns:
+            A boolean value, True if device is operating properly, False if not
+        """
+        return self.get_presence() and not self.get_reset_status()
+
+    def get_position_in_parent(self):
+        """
+        Returns:
+            Temp return 0
+        """
+        return 0
+
+    def is_replaceable(self):
+        """
+        Retrieves if replaceable
+        Returns:
+            A boolean value, True if replaceable
+        """
+        return True
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
index 2235b4c6572a..d224281a5935 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
@@ -93,7 +93,6 @@
 class Thermal(ThermalBase):
     """Platform-specific Thermal class"""
 
-    THERMAL_NAME_LIST = []
     MAINBOARD_SS_PATH = "/sys/class/i2c-adapter/i2c-11/11-001a/hwmon/hwmon2"
     CPUBOARD_SS_PATH = "/sys/class/i2c-adapter/i2c-3/3-001a/hwmon/hwmon1"
     SS_CONFIG_PATH = "/usr/share/sonic/device/x86_64-cel_e1031-r0/sensors.conf"
@@ -110,9 +109,12 @@ def __init__(self, thermal_index, airflow):
 
         self.name = self.get_name()
         self.postion = self._thermal_info["postion"]
+        self.minimum_thermal = self.get_temperature()
+        self.maximum_thermal = self.get_temperature()
 
     def _get_hwmon_path(self):
-        hwmon_path = os.path.join(I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
+        hwmon_path = os.path.join(
+            I2C_ADAPTER_PATH, self._thermal_info["i2c_path"])
         hwmon_dir = os.listdir(hwmon_path)[0]
         return os.path.join(hwmon_path, hwmon_dir)
 
@@ -126,6 +128,17 @@ def _set_threshold(self, file_name, temperature):
         temp_file_path = os.path.join(self._hwmon_path, file_name)
         return self._api_common.write_txt_file(temp_file_path, str(temperature))
 
+    def _get_threshold(self, file_name):
+        temp_file_path = os.path.join(self._hwmon_path, file_name)
+        data = self._api_common.read_txt_file(temp_file_path)
+        if data:
+            try:
+                threshold = float(data)
+                return round(threshold/1000, 3)
+            except Exception:
+                pass
+        return None
+
     def get_temperature(self):
         """
         Retrieves current temperature reading from thermal
@@ -144,7 +157,8 @@ def get_high_threshold(self):
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
         max_crit_key = '{}_max'.format(self._airflow)
-        return self._thermal_info.get(max_crit_key, None)
+        high_threshold_file = "temp{}_max".format(self._ss_index)
+        return self._get_threshold(high_threshold_file) or self._thermal_info.get(max_crit_key, None)
 
     def get_low_threshold(self):
         """
@@ -153,7 +167,7 @@ def get_low_threshold(self):
             A float number, the low threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        return 0.0
+        return 0.001
 
     def set_high_threshold(self, temperature):
         """
@@ -166,8 +180,8 @@ def set_high_threshold(self, temperature):
         """
         temp_file = "temp{}_max".format(self._ss_index)
         is_set = self._set_threshold(temp_file, int(temperature*1000))
-        file_set = False
-        if is_set:
+        file_set = True
+        if is_set and self._api_common.is_host():
             try:
                 with open(self.SS_CONFIG_PATH, 'r+') as f:
                     content = f.readlines()
@@ -215,7 +229,35 @@ def get_low_critical_threshold(self):
             A float number, the low critical threshold temperature of thermal in Celsius
             up to nearest thousandth of one degree Celsius, e.g. 30.125
         """
-        return 0.0
+        return 0.001
+
+    def get_minimum_recorded(self):
+        """
+        Retrieves the minimum recorded temperature of thermal
+        Returns:
+            A float number, the minimum recorded temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        tmp = self.get_temperature()
+        if tmp < self.minimum_thermal:
+            self.minimum_thermal = tmp
+        return self.minimum_thermal
+
+    def get_maximum_recorded(self):
+        """
+        Retrieves the maximum recorded temperature of thermal
+        Returns:
+            A float number, the maximum recorded temperature of thermal in Celsius
+            up to nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        tmp = self.get_temperature()
+        if tmp > self.maximum_thermal:
+            self.maximum_thermal = tmp
+        return self.maximum_thermal
+
+    ##############################################################
+    ###################### Device methods ########################
+    ##############################################################
 
     def get_name(self):
         """
@@ -267,3 +309,21 @@ def get_status(self):
 
         raw_txt = self._api_common.read_txt_file(fault_file_path)
         return int(raw_txt) == 0
+
+    def is_replaceable(self):
+        """
+        Retrieves whether thermal module is replaceable
+        Returns:
+            A boolean value, True if replaceable, False if not
+        """
+        return False
+
+    def get_position_in_parent(self):
+        """
+        Retrieves the thermal position information
+        Returns:
+            A int value, 0 represent ASIC thermal, 1 represent CPU thermal info
+        """
+        if self.postion == "cpu":
+            return 1
+        return 0
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
index 62f325655cac..93898bd646a4 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/watchdog.py
@@ -4,114 +4,107 @@
 # Watchdog contains an implementation of SONiC Platform Base API
 #
 #############################################################################
-import fcntl
-import os
-import array
 
 try:
+    import os
+    import time
     from sonic_platform_base.watchdog_base import WatchdogBase
+    from .common import Common
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-""" ioctl constants """
-IO_WRITE = 0x40000000
-IO_READ = 0x80000000
-IO_READ_WRITE = 0xC0000000
-IO_SIZE_INT = 0x00040000
-IO_SIZE_40 = 0x00280000
-IO_TYPE_WATCHDOG = ord('W') << 8
-
-WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
-WDR_40 = IO_READ | IO_SIZE_40 | IO_TYPE_WATCHDOG
-WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
-
-""" Watchdog ioctl commands """
-WDIOC_GETSUPPORT = 0 | WDR_40
-WDIOC_GETSTATUS = 1 | WDR_INT
-WDIOC_GETBOOTSTATUS = 2 | WDR_INT
-WDIOC_GETTEMP = 3 | WDR_INT
-WDIOC_SETOPTIONS = 4 | WDR_INT
-WDIOC_KEEPALIVE = 5 | WDR_INT
-WDIOC_SETTIMEOUT = 6 | WDWR_INT
-WDIOC_GETTIMEOUT = 7 | WDR_INT
-WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
-WDIOC_GETPRETIMEOUT = 9 | WDR_INT
-WDIOC_GETTIMELEFT = 10 | WDR_INT
-
-""" Watchdog status constants """
-WDIOS_DISABLECARD = 0x0001
-WDIOS_ENABLECARD = 0x0002
 
+PLATFORM_CPLD_PATH = '/sys/devices/platform/e1031.smc/'
+SETREG_FILE = 'setreg'
+GETREG_FILE = 'getreg'
 WDT_COMMON_ERROR = -1
-WD_MAIN_IDENTITY = "iTCO_wdt"
-WDT_SYSFS_PATH = "/sys/class/watchdog/"
+MMC_VERSION_REG = "0x100"
+
+# watchdog infomation for cpld v06
+V06_MMC_VERSION = 0x05
+V06_WDT_WIDTH = '0x110'
+V06_WDT_WIDTH_SELECTOR = {
+    30: '0x1',
+    60: '0x2',
+    180: '0x3'
+}
+
+V06_CPLD_WDT_INFO = {
+    'wdt_en_reg': '0x111',
+    'wdt_en_cmd': '0x0',
+    'wdt_dis_cmd': '0x1'
+}
+
+# watchdog infomation
+WDT_TIMER_L_BIT_REG = '0x117'
+WDT_TIMER_M_BIT_REG = '0x118'
+WDT_TIMER_H_BIT_REG = '0x119'
+WDT_KEEP_ALVIVE_REG = '0x11a'
+
+CPLD_WDT_INFO = {
+    'wdt_en_reg': '0x116',
+    'wdt_en_cmd': '0x1',
+    'wdt_dis_cmd': '0x0'
+}
 
 
 class Watchdog(WatchdogBase):
 
     def __init__(self):
-        WatchdogBase.__init__(self)
+        # Init api_common
+        self._api_common = Common()
+
+        # Init cpld reg path
+        self.setreg_path = os.path.join(PLATFORM_CPLD_PATH, SETREG_FILE)
+        self.getreg_path = os.path.join(PLATFORM_CPLD_PATH, GETREG_FILE)
+
+        self.mmc_v = self._get_mmc_version()
+        self.cpld_info = V06_CPLD_WDT_INFO if self.mmc_v <= V06_MMC_VERSION else CPLD_WDT_INFO
 
-        self.watchdog, self.wdt_main_dev_name = self._get_wdt()
-        self.status_path = "/sys/class/watchdog/%s/status" % self.wdt_main_dev_name
-        self.state_path = "/sys/class/watchdog/%s/state" % self.wdt_main_dev_name
-        self.timeout_path = "/sys/class/watchdog/%s/timeout" % self.wdt_main_dev_name
         # Set default value
         self._disable()
         self.armed = False
-        self.timeout = self._gettimeout(self.timeout_path)
+        self.timeout = 0
 
-    def _is_wd_main(self, dev):
-        """
-        Checks watchdog identity
-        """
-        identity = self._read_file(
-            "{}/{}/identity".format(WDT_SYSFS_PATH, dev))
-        return identity == WD_MAIN_IDENTITY
+    def _get_mmc_version(self):
+        hex_str_v = self._api_common.get_reg(self.getreg_path, MMC_VERSION_REG)
+        return int(hex_str_v, 16)
 
-    def _get_wdt(self):
-        """
-        Retrieves watchdog device
-        """
-        wdt_main_dev_list = [dev for dev in os.listdir(
-            "/dev/") if dev.startswith("watchdog") and self._is_wd_main(dev)]
-        if not wdt_main_dev_list:
-            return None
-        wdt_main_dev_name = wdt_main_dev_list[0]
-        watchdog_device_path = "/dev/{}".format(wdt_main_dev_name)
-        watchdog = os.open(watchdog_device_path, os.O_RDWR)
-        return watchdog, wdt_main_dev_name
+    def _get_level_hex(self, sub_hex):
+        sub_hex_str = sub_hex.replace("x", "0")
+        return hex(int(sub_hex_str, 16))
 
-    def _read_file(self, file_path):
-        """
-        Read text file
-        """
-        try:
-            with open(file_path, "r") as fd:
-                txt = fd.read()
-        except IOError:
-            return WDT_COMMON_ERROR
-        return txt.strip()
+    def _seconds_to_lmh_hex(self, seconds):
+        ms = seconds*1000  # calculate timeout in ms format
+        hex_str = hex(ms)
+        l = self._get_level_hex(hex_str[-2:])
+        m = self._get_level_hex(hex_str[-4:-2])
+        h = self._get_level_hex(hex_str[-6:-4])
+        return (l, m, h)
 
     def _enable(self):
         """
         Turn on the watchdog timer
         """
-        req = array.array('h', [WDIOS_ENABLECARD])
-        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+        return self._api_common.set_reg(self.setreg_path, self.cpld_info['wdt_en_reg'], self.cpld_info['wdt_en_cmd'])
 
     def _disable(self):
         """
         Turn off the watchdog timer
         """
-        req = array.array('h', [WDIOS_DISABLECARD])
-        fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
+        return self._api_common.set_reg(self.setreg_path, self.cpld_info['wdt_en_reg'], self.cpld_info['wdt_dis_cmd'])
 
     def _keepalive(self):
         """
         Keep alive watchdog timer
         """
-        fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+        if self.mmc_v <= V06_MMC_VERSION:
+            self._disable()
+            self._enable()
+
+        else:
+            self._api_common.set_reg(
+                self.setreg_path, WDT_KEEP_ALVIVE_REG, self.cpld_info['wdt_en_cmd'])
 
     def _settimeout(self, seconds):
         """
@@ -119,29 +112,23 @@ def _settimeout(self, seconds):
         @param seconds - timeout in seconds
         @return is the actual set timeout
         """
-        req = array.array('I', [seconds])
-        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
-        return int(req[0])
 
-    def _gettimeout(self, timeout_path):
-        """
-        Get watchdog timeout
-        @return watchdog timeout
-        """
-        req = array.array('I', [0])
-        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+        if self.mmc_v <= V06_MMC_VERSION:
+            timeout_hex = V06_WDT_WIDTH_SELECTOR.get(seconds, '0x2')
+            seconds = 60 if timeout_hex == '0x2' else seconds
+            self._api_common.set_reg(
+                self.setreg_path, V06_WDT_WIDTH, timeout_hex)
 
-        return int(req[0])
+        else:
+            (l, m, h) = self._seconds_to_lmh_hex(seconds)
+            self._api_common.set_reg(
+                self.setreg_path, WDT_TIMER_H_BIT_REG, h)  # set high bit
+            self._api_common.set_reg(
+                self.setreg_path, WDT_TIMER_M_BIT_REG, m)  # set med bit
+            self._api_common.set_reg(
+                self.setreg_path, WDT_TIMER_L_BIT_REG, l)  # set low bit
 
-    def _gettimeleft(self):
-        """
-        Get time left before watchdog timer expires
-        @return time left in seconds
-        """
-        req = array.array('I', [0])
-        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
-
-        return int(req[0])
+        return seconds
 
     #################################################################
 
@@ -157,22 +144,25 @@ def arm(self, seconds):
             An integer specifying the *actual* number of seconds the watchdog
             was armed with. On failure returns -1.
         """
-
         ret = WDT_COMMON_ERROR
-        if seconds < 0:
+
+        if seconds < 0 or seconds > 180:
             return ret
 
         try:
             if self.timeout != seconds:
                 self.timeout = self._settimeout(seconds)
+
             if self.armed:
                 self._keepalive()
             else:
                 self._enable()
                 self.armed = True
+
             ret = self.timeout
+            self.arm_timestamp = time.time()
         except IOError as e:
-            pass
+            print("Error: unable to enable wdt due to : {}".format(e))
 
         return ret
 
@@ -183,14 +173,12 @@ def disarm(self):
             A boolean, True if watchdog is disarmed successfully, False if not
         """
         disarmed = False
-        if self.is_armed():
-            try:
-                self._disable()
-                self.armed = False
-                disarmed = True
-            except IOError:
-                pass
-
+        try:
+            self._disable()
+            self.armed = False
+            disarmed = True
+        except IOError as e:
+            print("Error: unable to disable wdt due to : {}".format(e))
         return disarmed
 
     def is_armed(self):
@@ -199,7 +187,6 @@ def is_armed(self):
         Returns:
             A boolean, True if watchdog is armed, False if not
         """
-
         return self.armed
 
     def get_remaining_time(self):
@@ -214,16 +201,6 @@ def get_remaining_time(self):
         timeleft = WDT_COMMON_ERROR
 
         if self.armed:
-            try:
-                timeleft = self._gettimeleft()
-            except IOError:
-                pass
+            timeleft = int(self.timeout - (time.time() - self.arm_timestamp))
 
         return timeleft
-
-    def __del__(self):
-        """
-        Close watchdog
-        """
-
-        os.close(self.watchdog)
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
index 5c73be6ee50c..07a6542109b5 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
@@ -53,12 +53,11 @@ start)
         echo max6699 0x1a > /sys/bus/i2c/devices/i2c-3/new_device
         echo max6699 0x1a > /sys/bus/i2c/devices/i2c-11/new_device
 
-        ## TODO: fix dps200 driver cause kernel panic issue
-        # https://github.com/Azure/sonic-buildimage/issues/6602
-
         # Attach PSUs
-        # echo dps200 0x5a > /sys/bus/i2c/devices/i2c-12/new_device
-        # echo dps200 0x5b > /sys/bus/i2c/devices/i2c-13/new_device
+        echo dps200 0x5a > /sys/bus/i2c/devices/i2c-12/new_device
+        echo 24c02 0x52 > /sys/bus/i2c/devices/i2c-12/new_device
+        echo dps200 0x5b > /sys/bus/i2c/devices/i2c-13/new_device
+        echo 24c02 0x53 > /sys/bus/i2c/devices/i2c-13/new_device
 
         # Attach fans
         echo emc2305 0x4d > /sys/bus/i2c/devices/i2c-23/new_device

From ba2284c4c0ec9ba89afb167cc8e27b2db23109fc Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Mon, 21 Jun 2021 11:55:02 -0700
Subject: [PATCH 0728/1674] Grouping delayed services under a target for config
 reload checks (#7846)

#### Why I did it
Create a target for delayed service timers. Few services in sonic have delayed to speed up the bring up of the system and essential services. However there is no way to track when they start. This will be a problem when executing config reload as config reload expects all services to be up. Hence grouped all the timers that trigger the delayed services under one target so that they could be tracked in 'config reload' command

#### How I did it
Created delay.target service and add created dependency on the delayed targets.
---
 files/build_templates/mgmt-framework.timer      | 2 +-
 files/build_templates/snmp.timer                | 2 +-
 files/build_templates/sonic-delayed.target      | 5 +++++
 files/build_templates/sonic_debian_extension.j2 | 3 +++
 files/build_templates/telemetry.timer           | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 files/build_templates/sonic-delayed.target

diff --git a/files/build_templates/mgmt-framework.timer b/files/build_templates/mgmt-framework.timer
index 37389fbc6db5..ea868bd66743 100644
--- a/files/build_templates/mgmt-framework.timer
+++ b/files/build_templates/mgmt-framework.timer
@@ -8,4 +8,4 @@ OnBootSec=3min 30 sec
 Unit=mgmt-framework.service
 
 [Install]
-WantedBy=timers.target sonic.target
+WantedBy=timers.target sonic.target sonic-delayed.target
diff --git a/files/build_templates/snmp.timer b/files/build_templates/snmp.timer
index abbcb67f6dee..0d17391a73f6 100644
--- a/files/build_templates/snmp.timer
+++ b/files/build_templates/snmp.timer
@@ -9,4 +9,4 @@ OnBootSec=3min 30 sec
 Unit=snmp.service
 
 [Install]
-WantedBy=timers.target swss.service
+WantedBy=timers.target swss.service sonic-delayed.target
diff --git a/files/build_templates/sonic-delayed.target b/files/build_templates/sonic-delayed.target
new file mode 100644
index 000000000000..b3b5d760f136
--- /dev/null
+++ b/files/build_templates/sonic-delayed.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=SONiC delayed services target.
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 25bee2dce313..72fe14a6fc57 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -734,6 +734,9 @@ echo "mgmt-framework.timer" | sudo tee -a $GENERATED_SERVICE_FILE
 sudo cp $BUILD_TEMPLATES/sonic.target $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable sonic.target
 
+sudo cp $BUILD_TEMPLATES/sonic-delayed.target $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable sonic-delayed.target
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev python3-dev
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y build-essential libssl-dev swig
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
diff --git a/files/build_templates/telemetry.timer b/files/build_templates/telemetry.timer
index 4a605b8c50cb..0745f5369add 100644
--- a/files/build_templates/telemetry.timer
+++ b/files/build_templates/telemetry.timer
@@ -8,4 +8,4 @@ OnBootSec=3min 30 sec
 Unit=telemetry.service
 
 [Install]
-WantedBy=timers.target sonic.target
+WantedBy=timers.target sonic.target sonic-delayed.target

From d5994500522b68aad639c131f236c00f64e65e3b Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Mon, 16 Aug 2021 15:36:48 +0800
Subject: [PATCH 0729/1674] Use predefined macro as vendor information (#8361)

#### Why I did it
Use a predefined variable to get vendor information when the swss docker container is created

#### How I did it
Use `{{ sonic_asic_platform }}` instead of `$SONIC_CFGGEN -y /etc/sonic/sonic_version.yml -v asic_type`

#### How to verify it
Manually test.
---
 files/build_templates/docker_image_ctl.j2 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 0a03ca3bcb0d..fbd25d699a94 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -249,9 +249,6 @@ start() {
     {%- endif %}
 
     {%- if docker_container_name == "swss" %}
-    # Obtain the vendor name
-    ASIC_VENDOR=`$SONIC_CFGGEN -y /etc/sonic/sonic_version.yml -v asic_type`
-
     # Generate the asic_table.json and peripheral_table.json
     if [ ! -f /etc/sonic/asic_table.json ] && [ -f /usr/share/sonic/templates/asic_table.j2 ]; then
         sonic-cfggen -d -t /usr/share/sonic/templates/asic_table.j2 > /etc/sonic/asic_table.json
@@ -378,7 +375,7 @@ start() {
     -v /usr/share/sonic/firmware:/usr/share/sonic/firmware:rw \
 {%- endif %}
 {%- if docker_container_name == "swss" %}
-        -e ASIC_VENDOR=$ASIC_VENDOR \
+        -e ASIC_VENDOR={{ sonic_asic_platform }} \
 {%- endif -%}
 {%- if docker_container_name == "bgp" %}
         -v /etc/sonic/frr/$DEV:/etc/frr:rw \

From aa5d05ed2cbf5bf9733efa5b6e240c0ba58a9618 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:48:24 +0800
Subject: [PATCH 0730/1674] [ci/build]: Upgrade SONiC package versions (#8385)

---
 .../build-sonic-slave-buster/versions-git     |  4 +-
 files/build/versions/default/versions-docker  | 38 +++++++++++++++++--
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-web     |  2 +-
 .../docker-base-stretch/versions-deb-stretch  |  4 +-
 .../docker-config-engine-stretch/versions-py2 |  2 +-
 .../docker-fpm-frr/versions-deb-buster        |  2 +-
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  6 +--
 .../versions/dockers/docker-ptf/versions-py2  |  5 ++-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../versions-deb-buster-arm64                 | 10 ++---
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 10 ++---
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../versions-deb-stretch-arm64                | 28 +++++++-------
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                | 28 +++++++-------
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 28 +++++++-------
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py2  |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 29 files changed, 117 insertions(+), 86 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 62138f21c846..8e3cf5cb8dda 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==0162cee667f191c0a7a8024c1750b2356ff8dd53
+https://salsa.debian.org/kernel-team/ethtool/==b1c2659044f2fd15fc62d33b4aade456c30e42ca
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==7aabb1875cc0d2136db332c1541fed39b39923cd
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 9ce0f1c35e88..2e0a2d2e90e6 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,37 @@
+amd64:amd64/debian:buster==sha256:0c493c517180a20aecaa80fe12ec594476df79deabbed42296169380df962e86
+amd64:amd64/debian:stretch==sha256:73ac83a515905726362515b1e1f00db1b8a4274103acf50d6c21073b1fbc0473
 amd64:debian:buster==sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2
 amd64:debian:stretch==sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:20a9076db81d2c40ef1632b791ee86931a6601862188f0280f118badb7863178
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:58047fedaeaa15d59394c1d6fa527c786701ceed67413262a5c79dad8f01ddb0
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:701b65ffb1f53e6f3f2123f9790a2a1d6d20a1813a4c9b7ab2982a30b9cc3a35
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:53be70d0dfdbb8be1735544dfe30a762061550a09bb246a2cf1e18ee1bbf0e44
+amd64:docker-base-buster==
+amd64:docker-base-stretch==
+amd64:docker-config-engine-buster==
+amd64:docker-config-engine-stretch==
+amd64:docker-database==
+amd64:docker-dhcp-relay==
+amd64:docker-fpm-frr==
+amd64:docker-gbsyncd-vs==
+amd64:docker-lldp==
+amd64:docker-nat==
+amd64:docker-orchagent==
+amd64:docker-platform-monitor==
+amd64:docker-router-advertiser==
+amd64:docker-sflow==
+amd64:docker-snmp==
+amd64:docker-sonic-mgmt-framework==
+amd64:docker-sonic-telemetry==
+amd64:docker-syncd-bfn==
+amd64:docker-syncd-brcm==
+amd64:docker-syncd-centec==
+amd64:docker-syncd-mlnx==
+amd64:docker-syncd-nephos==
+amd64:docker-syncd-vs==
+amd64:docker-teamd==
+arm64:docker-base-buster==
+arm64:docker-config-engine-buster==
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2e280af381747e2206d1362c4fa670ea7da184ae3c87208756c1ba499ef0602b
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:bca4006f3e4d02f575195b2ad99f157892865c259ac27f6b68a2b994e74e88a1
+armhf:docker-base-buster==
+armhf:docker-config-engine-buster==
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:85d8900d13e686ed31a4ae7a0abb3943a750e5b4f4b171e2f8cfd48fdb63a14d
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:e499005527092fdbde0fef9223fb2f81e179d1765faf11b7c7e44891c612cb7a
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 7bfb14672227..02d64b0ab8c9 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==0162cee667f191c0a7a8024c1750b2356ff8dd53
+https://salsa.debian.org/kernel-team/ethtool/==b1c2659044f2fd15fc62d33b4aade456c30e42ca
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==7aabb1875cc0d2136db332c1541fed39b39923cd
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f689f4961ab8..6015b02c5771 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,7 +19,7 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==5cf451f38943b867b88ac066b9da4599
+https://deb.nodesource.com/node_14.x/dists/buster/Release==bf63bfc1edf2f537e490d9e9850f979d
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index e8a75896ca3d..99b977ce59a3 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -1,8 +1,8 @@
 ca-certificates==20200601~deb9u2
-curl==7.52.1-5+deb9u14
+curl==7.52.1-5+deb9u15
 jq==1.5+dfsg-1.3
 less==481-2.1
-libcurl3==7.52.1-5+deb9u14
+libcurl3==7.52.1-5+deb9u15
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
 libestr0==0.1.10-2
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index d0c5e5d70197..5712cb5f7ef8 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -13,7 +13,7 @@ pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
-singledispatch==3.6.2
+singledispatch==3.7.0
 six==1.16.0
 sonic-config-engine==1.0
 sonic-py-common==1.0
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index a4ef14241d9d..eebae8f0de40 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -7,7 +7,7 @@ gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-ares2==1.14.0-1
+libc-ares2==1.14.0-1+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 1f55921253d6..407321f34bb8 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -19,7 +19,7 @@ pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
-singledispatch==3.6.2
+singledispatch==3.7.0
 six==1.16.0
 thrift==0.13.0
 typing==3.10.0.0
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index d3891fd663bb..15875a0ce64f 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -13,7 +13,7 @@ cmake-data==3.7.2-1
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u14
+curl==7.52.1-5+deb9u15
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
@@ -54,8 +54,8 @@ libcc1-0==6.3.0-18+deb9u1
 libcgmanager0==0.41-2
 libcilkrts5==6.3.0-18+deb9u1
 libcryptsetup4==2:1.7.3-4
-libcurl3==7.52.1-5+deb9u14
-libcurl3-gnutls==7.52.1-5+deb9u14
+libcurl3==7.52.1-5+deb9u15
+libcurl3-gnutls==7.52.1-5+deb9u15
 libdbus-1-3==1.10.32-0+deb9u1
 libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 8a72b57ecf6d..6e06ab585e0e 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -35,7 +35,7 @@ prompt-toolkit==1.0.18
 protobuf==3.6.1
 ptf==0.9.1
 ptyprocess==0.7.0
-pyaml==20.4.0
+pyaml==21.8.3
 pybrctl==0.1.3
 pycparser==2.20
 pygments==2.5.2
@@ -51,7 +51,7 @@ scapy==2.2.0.dev0
 selectors34==1.2
 serpent==1.28
 simplegeneric==0.8.1
-singledispatch==3.6.2
+singledispatch==3.7.0
 six==1.12.0
 stevedore==1.32.0
 supervisor==4.2.2
@@ -59,6 +59,7 @@ thrift==0.11.0
 traitlets==4.3.3
 twisted==16.0.0
 typing==3.10.0.0
+unittest-xml-reporting==2.5.2
 wcwidth==0.2.5
 werkzeug==1.0.1
 yabgp==0.8.2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 38ecef795c29..46c95fbae33f 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.0.1
 grpcio==1.39.0
 grpcio-tools==1.20.0
 idna==3.2
-importlib-metadata==4.6.3
+importlib-metadata==4.6.4
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index f2904e0a8aa8..a3c1182481af 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -27,7 +27,7 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
-libc-ares2==1.14.0-1
+libc-ares2==1.14.0-1+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdouble-conversion1==3.1.0-3
 libedit2==3.1-20181209-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index a971f94b8dd3..7f952622c270 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,6 +1,6 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
-libc-ares2==1.14.0-1
+libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcurl3-gnutls==7.64.0-4+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 9d4056ff52ed..d6711d99b0d6 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -275,8 +275,8 @@ libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u1
-libc-ares-dev==1.14.0-1
-libc-ares2==1.14.0-1
+libc-ares-dev==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10
 libc6-dbg==2.28-10
 libc6-dev==2.28-10
@@ -1128,8 +1128,8 @@ lua-bitop==1.0.2-5
 lua-bitop-dev==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 lua-cjson-dev==2.1.0+dfsg-2.1
-lynx==2.8.9rel.1-3
-lynx-common==2.8.9rel.1-3
+lynx==2.8.9rel.1-3+deb10u1
+lynx-common==2.8.9rel.1-3+deb10u1
 m4==1.4.18-2
 make==4.2.1-1.2
 man-db==2.8.5-2
@@ -1148,7 +1148,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.4-1nodesource1
+nodejs==14.17.5-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index a7ad8ff12364..67de2d5c145e 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.4
+bitarray==2.2.5
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index a7ad8ff12364..67de2d5c145e 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.4
+bitarray==2.2.5
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.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
index de4a6549115f..dfdf60d84de7 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -268,7 +268,7 @@ libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
 libblkid-dev==2.33.1-0.1
-libbluetooth3==5.50-1.2~deb10u1
+libbluetooth3==5.50-1.2~deb10u2
 libbluray2==1:1.1.0-1
 libboost-atomic1.71-dev==1.71.0-6~bpo10+1
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
@@ -313,8 +313,8 @@ libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u1
-libc-ares-dev==1.14.0-1
-libc-ares2==1.14.0-1
+libc-ares-dev==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10
 libc6-dbg==2.28-10
 libc6-dev==2.28-10
@@ -1276,8 +1276,8 @@ lua-bitop-dev==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 lua-cjson-dev==2.1.0+dfsg-2.1
 lvm2==2.03.02-3
-lynx==2.8.9rel.1-3
-lynx-common==2.8.9rel.1-3
+lynx==2.8.9rel.1-3+deb10u1
+lynx-common==2.8.9rel.1-3+deb10u1
 m4==1.4.18-2
 make==4.2.1-1.2
 man-db==2.8.5-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index e9778435bfe4..2ce63242df55 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index a7ad8ff12364..67de2d5c145e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.4
+bitarray==2.2.5
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 94ef3ca8a165..f0186c5ee70b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -51,7 +51,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u14
+curl==7.52.1-5+deb9u15
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -305,8 +305,8 @@ libbsd-dev==0.8.3-1+deb9u1
 libbsd0==0.8.3-1+deb9u1
 libbsf-java==1:2.4.0-5
 libbsh-java==2.0b4-18
-libc-ares-dev==1.12.0-1+deb9u1
-libc-ares2==1.12.0-1+deb9u1
+libc-ares-dev==1.12.0-1+deb9u2
+libc-ares2==1.12.0-1+deb9u2
 libc-dev-bin==2.24-11+deb9u4
 libc6-dbg==2.24-11+deb9u4
 libc6-dev==2.24-11+deb9u4
@@ -344,7 +344,7 @@ libcommons-collections3-java==3.2.2-1
 libcommons-configuration-java==1.10-4
 libcommons-digester-java==1.8.1-4
 libcommons-httpclient-java==3.1-12
-libcommons-io-java==2.5-1
+libcommons-io-java==2.5-1+deb9u1
 libcommons-lang-java==2.6-6
 libcommons-lang3-java==3.5-1
 libcommons-logging-java==1.2-1
@@ -357,10 +357,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u14
-libcurl3-gnutls==7.52.1-5+deb9u14
-libcurl3-nss==7.52.1-5+deb9u14
-libcurl4-nss-dev==7.52.1-5+deb9u14
+libcurl3==7.52.1-5+deb9u15
+libcurl3-gnutls==7.52.1-5+deb9u15
+libcurl3-nss==7.52.1-5+deb9u15
+libcurl4-nss-dev==7.52.1-5+deb9u15
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -1078,8 +1078,8 @@ lua-bitop==1.0.2-4
 lua-bitop-dev==1.0.2-4
 lua-cjson==2.1.0+dfsg-2
 lua-cjson-dev==2.1.0+dfsg-2
-lynx==2.8.9dev11-1
-lynx-common==2.8.9dev11-1
+lynx==2.8.9dev11-1+deb9u1
+lynx-common==2.8.9dev11-1+deb9u1
 m4==1.4.18-1
 mailutils==1:3.1.1-1
 mailutils-common==1:3.1.1-1
@@ -1102,10 +1102,10 @@ netbase==5.4
 netpbm==2:10.0-15.3+b2
 nodejs==10.24.1-1nodesource1
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u292-b10-0+deb9u1
-openjdk-8-jdk-headless==8u292-b10-0+deb9u1
-openjdk-8-jre==8u292-b10-0+deb9u1
-openjdk-8-jre-headless==8u292-b10-0+deb9u1
+openjdk-8-jdk==8u302-b08-1~deb9u1
+openjdk-8-jdk-headless==8u302-b08-1~deb9u1
+openjdk-8-jre==8u302-b08-1~deb9u1
+openjdk-8-jre-headless==8u302-b08-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index ad74a1f0da69..90501ac085fb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.4
+bitarray==2.2.5
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index e7c0f0c87ace..32b6cb94f8e8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -51,7 +51,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u14
+curl==7.52.1-5+deb9u15
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -305,8 +305,8 @@ libbsd-dev==0.8.3-1+deb9u1
 libbsd0==0.8.3-1+deb9u1
 libbsf-java==1:2.4.0-5
 libbsh-java==2.0b4-18
-libc-ares-dev==1.12.0-1+deb9u1
-libc-ares2==1.12.0-1+deb9u1
+libc-ares-dev==1.12.0-1+deb9u2
+libc-ares2==1.12.0-1+deb9u2
 libc-dev-bin==2.24-11+deb9u4
 libc6-dbg==2.24-11+deb9u4
 libc6-dev==2.24-11+deb9u4
@@ -344,7 +344,7 @@ libcommons-collections3-java==3.2.2-1
 libcommons-configuration-java==1.10-4
 libcommons-digester-java==1.8.1-4
 libcommons-httpclient-java==3.1-12
-libcommons-io-java==2.5-1
+libcommons-io-java==2.5-1+deb9u1
 libcommons-lang-java==2.6-6
 libcommons-lang3-java==3.5-1
 libcommons-logging-java==1.2-1
@@ -357,10 +357,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u14
-libcurl3-gnutls==7.52.1-5+deb9u14
-libcurl3-nss==7.52.1-5+deb9u14
-libcurl4-nss-dev==7.52.1-5+deb9u14
+libcurl3==7.52.1-5+deb9u15
+libcurl3-gnutls==7.52.1-5+deb9u15
+libcurl3-nss==7.52.1-5+deb9u15
+libcurl4-nss-dev==7.52.1-5+deb9u15
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -1084,8 +1084,8 @@ lua-bitop==1.0.2-4
 lua-bitop-dev==1.0.2-4
 lua-cjson==2.1.0+dfsg-2
 lua-cjson-dev==2.1.0+dfsg-2
-lynx==2.8.9dev11-1
-lynx-common==2.8.9dev11-1
+lynx==2.8.9dev11-1+deb9u1
+lynx-common==2.8.9dev11-1+deb9u1
 m4==1.4.18-1
 mailutils==1:3.1.1-1
 mailutils-common==1:3.1.1-1
@@ -1108,10 +1108,10 @@ netbase==5.4
 netpbm==2:10.0-15.3+b2
 nodejs==10.24.1-1nodesource1
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u292-b10-0+deb9u1
-openjdk-8-jdk-headless==8u292-b10-0+deb9u1
-openjdk-8-jre==8u292-b10-0+deb9u1
-openjdk-8-jre-headless==8u292-b10-0+deb9u1
+openjdk-8-jdk==8u302-b08-1~deb9u1
+openjdk-8-jdk-headless==8u302-b08-1~deb9u1
+openjdk-8-jre==8u302-b08-1~deb9u1
+openjdk-8-jre-headless==8u302-b08-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index ad74a1f0da69..90501ac085fb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.4
+bitarray==2.2.5
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 593172f15892..23c0ecddecf0 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -52,7 +52,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u14
+curl==7.52.1-5+deb9u15
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -325,8 +325,8 @@ libbsd-dev==0.8.3-1+deb9u1
 libbsd0==0.8.3-1+deb9u1
 libbsf-java==1:2.4.0-5
 libbsh-java==2.0b4-18
-libc-ares-dev==1.12.0-1+deb9u1
-libc-ares2==1.12.0-1+deb9u1
+libc-ares-dev==1.12.0-1+deb9u2
+libc-ares2==1.12.0-1+deb9u2
 libc-dev-bin==2.24-11+deb9u4
 libc6-dbg==2.24-11+deb9u4
 libc6-dev==2.24-11+deb9u4
@@ -370,7 +370,7 @@ libcommons-collections3-java==3.2.2-1
 libcommons-configuration-java==1.10-4
 libcommons-digester-java==1.8.1-4
 libcommons-httpclient-java==3.1-12
-libcommons-io-java==2.5-1
+libcommons-io-java==2.5-1+deb9u1
 libcommons-lang-java==2.6-6
 libcommons-lang3-java==3.5-1
 libcommons-logging-java==1.2-1
@@ -383,10 +383,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u14
-libcurl3-gnutls==7.52.1-5+deb9u14
-libcurl3-nss==7.52.1-5+deb9u14
-libcurl4-nss-dev==7.52.1-5+deb9u14
+libcurl3==7.52.1-5+deb9u15
+libcurl3-gnutls==7.52.1-5+deb9u15
+libcurl3-nss==7.52.1-5+deb9u15
+libcurl4-nss-dev==7.52.1-5+deb9u15
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -1147,8 +1147,8 @@ lua-bitop-dev==1.0.2-4
 lua-cjson==2.1.0+dfsg-2
 lua-cjson-dev==2.1.0+dfsg-2
 lvm2==2.02.168-2
-lynx==2.8.9dev11-1
-lynx-common==2.8.9dev11-1
+lynx==2.8.9dev11-1+deb9u1
+lynx-common==2.8.9dev11-1+deb9u1
 m4==1.4.18-1
 mailutils==1:3.1.1-1
 mailutils-common==1:3.1.1-1
@@ -1170,10 +1170,10 @@ ncurses-term==6.0+20161126-1+deb9u2
 netbase==5.4
 netpbm==2:10.0-15.3+b2
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u292-b10-0+deb9u1
-openjdk-8-jdk-headless==8u292-b10-0+deb9u1
-openjdk-8-jre==8u292-b10-0+deb9u1
-openjdk-8-jre-headless==8u292-b10-0+deb9u1
+openjdk-8-jdk==8u302-b08-1~deb9u1
+openjdk-8-jdk-headless==8u302-b08-1~deb9u1
+openjdk-8-jre==8u302-b08-1~deb9u1
+openjdk-8-jre-headless==8u302-b08-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index e9778435bfe4..2ce63242df55 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e989bf92dbd9b03e0a2a0d38bdb3614245dfa562
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index ad74a1f0da69..90501ac085fb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.4
+bitarray==2.2.5
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 01b448601593..ea4e5cb46d4c 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -45,7 +45,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2304
+hw-management==1.mlnx.7.0010.2344
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 034bd65435b9..058c0288e39d 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -19,7 +19,7 @@ python-apt==1.8.4.3
 pyyaml==5.4.1
 redis==3.5.3
 scandir==1.10.0
-singledispatch==3.6.2
+singledispatch==3.7.0
 six==1.16.0
 thrift==0.13.0
 typing==3.10.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 8b2b4c6ff5c8..dfad0ed2a288 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -39,5 +39,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.6
 watchdog==0.10.3
-websocket-client==1.1.1
+websocket-client==1.2.1
 xmltodict==0.12.0
\ No newline at end of file

From feab18a41b23ca53f023e16fd6de32bdabb9b82b Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 16 Aug 2021 15:55:51 -0700
Subject: [PATCH 0731/1674] caclmgrd: monitor mux_cable_table in state_db to
 update dhcp acl (#8477)

caclmgrd: monitor mux_cable_table in state_db to update dhcp acl

- if the state changes to 'standby', add acl to block dhcp packets based on ingress interfaces
- if the state changes to 'active', delete acl
- if the state changes to 'unknown', also delete acl to avoid potential disconnect
- both addition and deletion follow checking the existence of the rules

The change has been verified on a virtual switch based testbed.

Port to 202012 branch from #8222
---
 src/sonic-host-services/scripts/caclmgrd | 134 +++++++++++++++++++++--
 1 file changed, 124 insertions(+), 10 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index f1d2a41abd90..803cc748652b 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -56,6 +56,9 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
     ACL_TABLE = "ACL_TABLE"
     ACL_RULE = "ACL_RULE"
 
+    DEVICE_METADATA_TABLE = "DEVICE_METADATA"
+    MUX_CABLE_TABLE = "MUX_CABLE_TABLE"
+
     ACL_TABLE_TYPE_CTRLPLANE = "CTRLPLANE"
 
     # To specify a port range instead of a single port, use iptables format:
@@ -85,6 +88,8 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
     UPDATE_DELAY_SECS = 0.5
 
+    DualToR = False
+
     def __init__(self, log_identifier):
         super(ControlPlaneAclManager, self).__init__(log_identifier)
 
@@ -109,6 +114,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         self.namespace_docker_mgmt_ip = {}
         self.namespace_docker_mgmt_ipv6 = {}
 
+        metadata = self.config_db_map[DEFAULT_NAMESPACE].get_table(self.DEVICE_METADATA_TABLE)
+        if 'subtype' in metadata['localhost'] and metadata['localhost']['subtype'] == 'DualToR':
+            self.DualToR = True
+
         namespaces = device_info.get_all_namespaces()
         for front_asic_namespace in namespaces['front_ns']:
             self.update_thread[front_asic_namespace] = None
@@ -320,6 +329,77 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         else:
             return False
 
+    def setup_dhcp_chain(self, namespace):
+        all_chains = self.get_chain_list(self.iptables_cmd_ns_prefix[namespace], [""])
+        dhcp_chain_exist = "DHCP" in all_chains
+
+        iptables_cmds = []
+        if dhcp_chain_exist:
+            iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -F DHCP")
+            self.log_info("DHCP chain exists, flush")
+        else:
+            iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -N DHCP")
+            self.log_info("DHCP chain does not exist, create")
+        iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A DHCP -j RETURN")
+
+        self.log_info("Issuing the following iptables commands for DHCP chain:")
+        for cmd in iptables_cmds:
+            self.log_info("  " + cmd)
+
+        self.run_commands(iptables_cmds)
+
+    def get_chain_list(self, iptable_ns_cmd_prefix, exclude_list):
+        command = iptable_ns_cmd_prefix + "iptables -L -v -n | grep Chain | awk '{print $2}'"
+        chain_list = self.run_commands([command]).splitlines()
+
+        for chain in exclude_list:
+            if chain in chain_list:
+                chain_list.remove(chain)
+
+        return chain_list
+
+    def dhcp_acl_rule(self, iptable_ns_cmd_prefix, op, intf):
+        '''
+            sample: iptables --insert/delete/check DHCP -m physdev --physdev-in Ethernet4 -j DROP
+        '''
+        return iptable_ns_cmd_prefix + 'iptables --{} DHCP -m physdev --physdev-in {} -j DROP'.format(op, intf)
+
+    def update_dhcp_chain(self, op, intf):
+        for namespace in list(self.config_db_map.keys()):
+            check_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "check", intf)
+            update_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], op, intf)
+
+            execute = 0
+            ret = subprocess.call(check_cmd, shell=True) # ret==0 indicates the rule exists
+
+            if op == "insert" and ret == 1:
+                execute = 1
+            if op == "delete" and ret == 0:
+                execute = 1
+
+            if execute == 1:
+                self.run_commands([update_cmd])
+                self.log_info("Update DHCP chain: {}".format(update_cmd))
+
+    def update_dhcp_acl(self, key, op, data):
+        if "status" not in data:
+            self.log_warning("Unexpected update in MUX_CABLE_TABLE")
+            return
+
+        intf = key
+        status = data["status"]
+
+        if status == "active":
+            self.update_dhcp_chain("delete", intf)
+        elif status == "standby":
+            self.update_dhcp_chain("insert", intf)
+        elif status == "unknown":
+            self.update_dhcp_chain("delete", intf)
+        elif status == "error":
+            self.log_warning("Cable status shows error")
+        else:
+            self.log_warning("Unexpected cable status")
+
     def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
         """
         Retrieves current ACL tables and rules from Config DB, translates
@@ -338,11 +418,12 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -P FORWARD ACCEPT")
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -P OUTPUT ACCEPT")
 
-        # Add iptables command to flush the current rules
-        iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -F")
-
-        # Add iptables command to delete all non-default chains
-        iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -X")
+        # Add iptables command to flush the current rules and delete all non-default chains
+        chain_list = self.get_chain_list(self.iptables_cmd_ns_prefix[namespace], ["DHCP"] if self.DualToR else [""])
+        for chain in chain_list:
+            iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -F " + chain)
+            if chain not in ["INPUT", "FORWARD", "OUTPUT"]:
+                iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -X " + chain)
 
         # Add same set of commands for ip6tables
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -P INPUT ACCEPT")
@@ -384,6 +465,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -p icmpv6 --icmpv6-type router-solicitation -j ACCEPT")
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -p icmpv6 --icmpv6-type router-advertisement -j ACCEPT")
 
+        # Add iptables commands to link the DCHP chain to block dhcp packets based on ingress interfaces
+        if self.DualToR:
+            iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p udp --dport 67 -j DHCP")
+
         # Add iptables/ip6tables commands to allow all incoming IPv4 DHCP packets
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -A INPUT -p udp --dport 67:68 -j ACCEPT")
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -p udp --dport 67:68 -j ACCEPT")
@@ -618,9 +703,27 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         
         # Create the Select object
         sel = swsscommon.Select()
+
+        # Set up STATE_DB connector to monitor the change in MUX_CABLE_TABLE
+        state_db_connector = None
+        subscribe_mux_cable = None
+        state_db_id = swsscommon.SonicDBConfig.getDbId("STATE_DB")
+
+        if self.DualToR:
+            self.log_info("Dual ToR mode")
+
+            # set up state_db connector
+            state_db_connector = swsscommon.DBConnector("STATE_DB", 0)
+            subscribe_mux_cable = swsscommon.SubscriberStateTable(state_db_connector, self.MUX_CABLE_TABLE)
+            sel.addSelectable(subscribe_mux_cable)
+
+            # create DHCP chain
+            for namespace in list(self.config_db_map.keys()):
+                self.setup_dhcp_chain(namespace)
+
         # Map of Namespace <--> susbcriber table's object
         config_db_subscriber_table_map = {}
-        
+
         # Loop through all asic namespaces (if present) and host namespace (DEFAULT_NAMESPACE)
         for namespace in list(self.config_db_map.keys()):
             # Unconditionally update control plane ACLs once at start on given namespace
@@ -642,10 +745,8 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         # Get the ACL rule table seprator
         acl_rule_table_seprator = subscribe_acl_rule_table.getTableNameSeparator()
 
-        # Loop on select to see if any event happen on config db of any namespace
+        # Loop on select to see if any event happen on state db or config db of any namespace
         while True:
-            ctrl_plane_acl_notification = set()
-
             (state, selectableObj) = sel.select(SELECT_TIMEOUT_MS)
             # Continue if select is timeout or selectable object is not return
             if state != swsscommon.Select.OBJECT:
@@ -654,8 +755,21 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             # Get the redisselect object from selectable object
             redisSelectObj = swsscommon.CastSelectableToRedisSelectObj(selectableObj)
 
-            # Get the corresponding namespace from redisselect db connector object
+            # Get the corresponding namespace and db_id from redisselect
             namespace = redisSelectObj.getDbConnector().getNamespace()
+            db_id = redisSelectObj.getDbConnector().getDbId()
+
+            if db_id == state_db_id:
+                if self.DualToR:
+                    while True:
+                        key, op, fvs = subscribe_mux_cable.pop()
+                        if not key:
+                            break
+                        self.log_info("mux cable update : '%s'" % str((key, op, fvs)))
+                        self.update_dhcp_acl(key, op, dict(fvs))
+                continue
+
+            ctrl_plane_acl_notification = set()
 
             # Pop data of both Subscriber Table object of namespace that got config db acl table event
             for table in config_db_subscriber_table_map[namespace]:

From 78909de378e32888211e4292cb2a0530d3ffa2f8 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 17 Aug 2021 13:22:23 -0700
Subject: [PATCH 0732/1674] [sonic-platform-common] submodule update (#8491)

ef4b3ec [Y-Cable] add the definition inside setup.py to include sonic_y_cable.credo as a package (#211)
7d81488 [Y-Cable][Credo] Credo implementation of YCable class which inherits from YCableBase required for Y-Cable API's in sonic-platform-daemons (#203)
3efb093 [sonic_y_cable] add abstract class YCableBase required for Y-cable API support for multiple vendors (#186)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index d35960b2cf96..ef4b3ec7845d 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit d35960b2cf96ac0e1f6ed34efca1bf68a9018606
+Subproject commit ef4b3ec7845d57d410c3981c8804522cb79a9f1c

From 996ff82c49623da310dcf4600a0c3f84aac479c8 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Mon, 16 Aug 2021 12:54:09 +0300
Subject: [PATCH 0733/1674] [libteam][warm-reboot] fix issue in teamd
 warm-reboot that teamd starts (#8227)

with state of tdport from previous warm-reboot.

In case LAG was down before reboot, lacp->wr is not cleared.
In lacp_event_watch_port_flush_data we incremented nr_of_tdports and add
tdport to lacp->wr.state. In case lacp->wr.state already had this tdport
we do not set new state for tdport but appened a new item in
lacp->wr.state. In case we preformed warm-reboot and PortChannel member
was down, after reboot PortChannel member became up next warm-reboot
will initialize teamd with PortChannel member in down state.

Fix this issue by calling stop_wr_mode() when LAG was down. This was probably intended but missed.

#### Why I did it

To fix an issue seen in warm-reboot-sad test cases.

#### How I did it

I fixed it in SONiC libteam patch that adds warm-reboot support. Details in commit description.

#### How to verify it

Run warm-reboot-sad test on t0-56 topology.
---
 .../0008-libteam-Add-warm_reboot-mode.patch   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/libteam/patch/0008-libteam-Add-warm_reboot-mode.patch b/src/libteam/patch/0008-libteam-Add-warm_reboot-mode.patch
index 440d351a8b6e..4ef38ee138f3 100644
--- a/src/libteam/patch/0008-libteam-Add-warm_reboot-mode.patch
+++ b/src/libteam/patch/0008-libteam-Add-warm_reboot-mode.patch
@@ -1,4 +1,4 @@
-From a4ab4de68134f6425f704a2ddcda33a4930645de Mon Sep 17 00:00:00 2001
+From cdc7eb674bb779b9e5181921e4c7c2b2f0a0db41 Mon Sep 17 00:00:00 2001
 From: Pavel Shirshov <pavelsh@microsoft.com>
 Date: Tue, 3 Mar 2020 13:04:57 -0800
 Subject: [PATCH] [libteam]: Reimplement Warm-Reboot procedure'
@@ -9,8 +9,8 @@ Subject: [PATCH] [libteam]: Reimplement Warm-Reboot procedure'
  teamd/teamd.h             |   6 +
  teamd/teamd_events.c      |  13 ++
  teamd/teamd_per_port.c    |   6 +
- teamd/teamd_runner_lacp.c | 474 +++++++++++++++++++++++++++++++++++---
- 6 files changed, 512 insertions(+), 44 deletions(-)
+ teamd/teamd_runner_lacp.c | 475 +++++++++++++++++++++++++++++++++++---
+ 6 files changed, 513 insertions(+), 44 deletions(-)
 
 diff --git a/libteam/ifinfo.c b/libteam/ifinfo.c
 index 46d56a2..b86d34c 100644
@@ -35,7 +35,7 @@ index 46d56a2..b86d34c 100644
  	}
  }
 diff --git a/teamd/teamd.c b/teamd/teamd.c
-index bf42347..221d71d 100644
+index 421e34d..33512a6 100644
 --- a/teamd/teamd.c
 +++ b/teamd/teamd.c
 @@ -117,7 +117,9 @@ static void print_help(const struct teamd_context *ctx) {
@@ -203,7 +203,7 @@ index 221803e..bd4dcc1 100644
  			   struct teamd_port *tdport)
  {
 diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c
-index 166da57..03f8d63 100644
+index 166da57..cefd6c2 100644
 --- a/teamd/teamd_per_port.c
 +++ b/teamd/teamd_per_port.c
 @@ -350,6 +350,12 @@ static int teamd_port_remove(struct teamd_context *ctx,
@@ -220,7 +220,7 @@ index 166da57..03f8d63 100644
  		      tdport->ifname, tdport->ifindex);
  	err = team_port_remove(ctx->th, tdport->ifindex);
 diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c
-index 55abe88..f225fb2 100644
+index 955ef0c..782fc05 100644
 --- a/teamd/teamd_runner_lacp.c
 +++ b/teamd/teamd_runner_lacp.c
 @@ -31,6 +31,7 @@
@@ -523,7 +523,7 @@ index 55abe88..f225fb2 100644
 +						/* the port was up before the WR. Trying to restore it */
 +						struct lacpdu lacpdu;
 +						err = lacpdu_read(lacp_port, &lacpdu);
-+						if (err) /* Can't read, so the port will start from scratch */ 
++						if (err) /* Can't read, so the port will start from scratch */
 +							continue;
 +						teamd_log_info("WR-mode. State of the LAG member port '%s' was restored.",
 +							tdport->ifname);
@@ -810,7 +810,7 @@ index 55abe88..f225fb2 100644
  static const struct teamd_event_watch_ops lacp_event_watch_ops = {
  	.hwaddr_changed = lacp_event_watch_hwaddr_changed,
  	.port_hwaddr_changed = lacp_event_watch_port_hwaddr_changed,
-@@ -1469,21 +1848,35 @@ static const struct teamd_event_watch_ops lacp_event_watch_ops = {
+@@ -1469,21 +1848,36 @@ static const struct teamd_event_watch_ops lacp_event_watch_ops = {
  	.port_changed = lacp_event_watch_port_changed,
  	.admin_state_changed = lacp_event_watch_admin_state_changed,
  	.refresh = lacp_event_watch_refresh,
@@ -832,6 +832,7 @@ index 55abe88..f225fb2 100644
 +		if (lacp->wr.carrier_up) {
 +			teamd_log_info("WR-mode. Starting in WR mode");
 +		} else {
++			stop_wr_mode(lacp);
 +			teamd_log_info("WR-mode. Starting in normal mode. The LAG interface was down before restart");
 +		}
 +		ctx->warm_start_mode = lacp->wr.carrier_up;
@@ -851,7 +852,7 @@ index 55abe88..f225fb2 100644
  	return 0;
  }
  
-@@ -1951,6 +2344,12 @@ static int lacp_init(struct teamd_context *ctx, void *priv)
+@@ -1951,6 +2345,12 @@ static int lacp_init(struct teamd_context *ctx, void *priv)
  	}
  
  	lacp->ctx = ctx;
@@ -864,7 +865,7 @@ index 55abe88..f225fb2 100644
  	err = teamd_hash_func_set(ctx);
  	if (err)
  		return err;
-@@ -1992,10 +2391,13 @@ static void lacp_fini(struct teamd_context *ctx, void *priv)
+@@ -1992,10 +2392,13 @@ static void lacp_fini(struct teamd_context *ctx, void *priv)
  {
  	struct lacp *lacp = priv;
  
@@ -880,5 +881,5 @@ index 55abe88..f225fb2 100644
  
  const struct teamd_runner teamd_runner_lacp = {
 -- 
-2.17.1.windows.2
+2.17.1
 

From 7d5ef0d9fe3bb03491204ba1175f2ad4cc89ec12 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 18 Aug 2021 17:52:01 -0700
Subject: [PATCH 0734/1674] [202012] [sonic-swss] Update submodule (#8522)

Why I did it
Update the sonic-swss submodule for the 202012 branch. The following is the new commit in the submodule.

c1cb2ca [202012] Backport SAI failure handling to 202012 branch (#1880)

How I did it
Update the sonic-swss submodule pointer for the 202012 branch.
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 41dfaad2699e..c1cb2cabae6a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 41dfaad2699e8cd91964c293291f2ccc518b4640
+Subproject commit c1cb2cabae6adbeb44b8868940499e69f16b5b1e

From 733c851fc96601f56e53e4044ec1151ac7534e71 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 20 Aug 2021 02:49:15 +0800
Subject: [PATCH 0735/1674] [ci/build]: Upgrade SONiC package versions (#8527)

---
 .../versions-deb-buster                       | 46 +------------------
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-docker  | 16 +++----
 files/build/versions/default/versions-git     |  6 +--
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../versions-deb-buster-arm64                 | 44 ++++++++++++++++++
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-buster-armhf                 | 43 ++++++++++++++++-
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 44 ++++++++++++++++++
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 16 files changed, 152 insertions(+), 67 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index b35ab8b34a08..5473c852876e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,31 +1,9 @@
 applibs==1.mlnx.4.4.3222
 applibs-dev==1.mlnx.4.4.3222
 bfnplatform==1.0.0
-gir1.2-atk-1.0==2.30.0-2
-gir1.2-atspi-2.0==2.30.0-7
-gir1.2-freedesktop==1.58.3-2
-gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
-gir1.2-gtk-3.0==3.24.5-1
-gir1.2-harfbuzz-0.0==2.3.1-1
-gir1.2-pango-1.0==1.42.4-8~deb10u1
 iproute2-dev==1.mlnx.4.4.3222
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
-libatk-bridge2.0-dev==2.30.0-5
-libatk1.0-dev==2.30.0-2
-libatspi2.0-dev==2.30.0-7
-libcairo-script-interpreter2==1.16.0-4+deb10u1
-libcairo2-dev==1.16.0-4+deb10u1
-libegl1-mesa-dev==18.3.6-2+deb10u1
-libepoxy-dev==1.5.3-0.1
-libfontconfig1-dev==2.13.1-2
-libfreetype6-dev==2.9.1-3+deb10u2
-libfribidi-dev==1.0.5-3.1+deb10u1
-libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
-libgraphite2-dev==1.3.13-7
-libgtk-3-dev==3.24.5-1
-libharfbuzz-dev==2.3.1-1
-libharfbuzz-gobject0==2.3.1-1
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -38,9 +16,6 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libpango1.0-dev==1.42.4-8~deb10u1
-libpangoxft-1.0-0==1.42.4-8~deb10u1
-libpixman-1-dev==0.36.0-1
 libsaibcm==4.3.5.1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
@@ -58,18 +33,6 @@ libteam5==1.30-1
 libteamdctl0==1.30-1
 libthrift-0.11.0==0.11.0-4
 libthrift-dev==0.11.0-4
-libwayland-bin==1.16.0-1
-libwayland-dev==1.16.0-1
-libxcb-shm0-dev==1.13.1-2
-libxcomposite-dev==1:0.4.4-2
-libxcursor-dev==1:1.1.15-2
-libxft-dev==2.3.2-2
-libxi-dev==2:1.7.9-1
-libxinerama-dev==2:1.1.4-2
-libxkbcommon-dev==0.8.2-1
-libxrandr-dev==2:1.5.1-1
-libxrender-dev==1:0.9.10-1
-libxtst-dev==2:1.2.3-1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang-dev==1.0.73
@@ -78,7 +41,6 @@ linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
 mft==4.16.0-105
-pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
@@ -103,11 +65,5 @@ sxd-libs-dev==1.mlnx.4.4.3222
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.3222
-wjh-libs-dev==1.mlnx.4.4.3222
-x11proto-composite-dev==1:2018.4-4
-x11proto-input-dev==2018.4-4
-x11proto-randr-dev==2018.4-4
-x11proto-record-dev==2018.4-4
-x11proto-xinerama-dev==2018.4-4
\ No newline at end of file
+wjh-libs-dev==1.mlnx.4.4.3222
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 8e3cf5cb8dda..a65eb1f4f5f6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==b1c2659044f2fd15fc62d33b4aade456c30e42ca
+https://salsa.debian.org/kernel-team/ethtool/==78909de378e32888211e4292cb2a0530d3ffa2f8
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==7aabb1875cc0d2136db332c1541fed39b39923cd
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 2e0a2d2e90e6..770ac2706f45 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:0c493c517180a20aecaa80fe12ec594476df79deabbed42296169380df962e86
-amd64:amd64/debian:stretch==sha256:73ac83a515905726362515b1e1f00db1b8a4274103acf50d6c21073b1fbc0473
-amd64:debian:buster==sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2
-amd64:debian:stretch==sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b
+amd64:amd64/debian:buster==sha256:2d1ab098097b2f299d3f05836a276a1a197ec221bc19620b4da16c26e83e7a2b
+amd64:amd64/debian:stretch==sha256:205cce0b204ae98be1723d2df0a188bd254ee79f949b51b35bde5dfa91320b72
+amd64:debian:buster==sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146
+amd64:debian:stretch==sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -28,10 +28,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2e280af381747e2206d1362c4fa670ea7da184ae3c87208756c1ba499ef0602b
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:bca4006f3e4d02f575195b2ad99f157892865c259ac27f6b68a2b994e74e88a1
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:0670f807ca958a0442099b34acad64675d9d80de0869da5faf2ca6f0f5381463
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:99a1f5d698a7c7ecde811004bf2efe395a590c54a9e1231c729da3a1bdaeaed6
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:85d8900d13e686ed31a4ae7a0abb3943a750e5b4f4b171e2f8cfd48fdb63a14d
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:e499005527092fdbde0fef9223fb2f81e179d1765faf11b7c7e44891c612cb7a
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:b025061867a5af54f20e7fb7c615a9fc521f491c67af12f9c4545341bcefa0ba
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:7a971bae16a7a2986d99ca0c45a1acaab3f1bdb4e80dfc4bded8645f4b1a000f
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 02d64b0ab8c9..ea84fb956666 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==b1c2659044f2fd15fc62d33b4aade456c30e42ca
+https://salsa.debian.org/kernel-team/ethtool/==78909de378e32888211e4292cb2a0530d3ffa2f8
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==7aabb1875cc0d2136db332c1541fed39b39923cd
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==78125e47f2fdbc4cb15b6be092717ccf00aededd
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 6e06ab585e0e..78cb30d1fe2c 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -6,7 +6,7 @@ click==7.1.2
 contextlib2==0.6.0.post1
 cryptography==3.3.2
 decorator==4.4.2
-dpkt==1.9.6
+dpkt==1.9.7.1
 enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index d6711d99b0d6..88581c2c1305 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -136,8 +136,15 @@ gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
 ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-atk-1.0==2.30.0-2
+gir1.2-atspi-2.0==2.30.0-7
+gir1.2-freedesktop==1.58.3-2
+gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-glib-2.0==1.58.3-2
+gir1.2-gtk-3.0==3.24.5-1
+gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
+gir1.2-pango-1.0==1.42.4-8~deb10u1
 git==1:2.20.1-2+deb10u3
 git-buildpackage==0.9.14
 git-man==1:2.20.1-2+deb10u3
@@ -207,14 +214,17 @@ libassuan0==2.5.2-1
 libasync-mergepoint-perl==0.04-2
 libatinject-jsr330-api-java==1.0+ds1-5
 libatk-bridge2.0-0==2.30.0-5
+libatk-bridge2.0-dev==2.30.0-5
 libatk-wrapper-java==0.33.3-22
 libatk-wrapper-java-jni==0.33.3-22
 libatk1.0-0==2.30.0-2
 libatk1.0-data==2.30.0-2
+libatk1.0-dev==2.30.0-2
 libatm1==1:2.5.1-2
 libatm1-dev==1:2.5.1-2
 libatomic1==8.3.0-6
 libatspi2.0-0==2.30.0-7
+libatspi2.0-dev==2.30.0-7
 libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
@@ -282,7 +292,9 @@ libc6-dbg==2.28-10
 libc6-dev==2.28-10
 libcaf-openmpi-3==2.4.0-2
 libcairo-gobject2==1.16.0-4+deb10u1
+libcairo-script-interpreter2==1.16.0-4+deb10u1
 libcairo2==1.16.0-4+deb10u1
+libcairo2-dev==1.16.0-4+deb10u1
 libcap-dev==1:2.25-2
 libcap-ng-dev==0.7.9-2
 libcap2==1:2.25-2
@@ -380,11 +392,13 @@ libedit-dev==3.1-20181209-1
 libedit2==3.1-20181209-1
 libegl-mesa0==18.3.6-2+deb10u1
 libegl1==1.1.0-1
+libegl1-mesa-dev==18.3.6-2+deb10u1
 libel-api-java==3.0.0-2+deb10u1
 libelf-dev==0.176-1.1
 libelf1==0.176-1.1
 libemail-valid-perl==1.202-1
 libencode-locale-perl==1.05-1
+libepoxy-dev==1.5.3-0.1
 libepoxy0==1.5.3-0.1
 liberror-perl==0.17027-2
 libestr0==0.1.10-2.1
@@ -419,9 +433,12 @@ libfl2==2.6.4-6.2
 libfont-afm-perl==1.20-2
 libfontbox2-java==2.0.13-2
 libfontconfig1==2.13.1-2
+libfontconfig1-dev==2.13.1-2
 libfontenc1==1:1.1.3-1+b2
 libfop-java==1:2.3-2
 libfreetype6==2.9.1-3+deb10u2
+libfreetype6-dev==2.9.1-3+deb10u2
+libfribidi-dev==1.0.5-3.1+deb10u1
 libfribidi0==1.0.5-3.1+deb10u1
 libfstrm0==0.4.0-1
 libfuture-perl==0.39-1
@@ -437,6 +454,7 @@ libgdbm6==1.18.1-4
 libgdk-pixbuf2.0-0==2.38.1+dfsg-1
 libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
 libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
 libgeoip1==1.6.12-1
 libgeronimo-annotation-1.3-spec-java==1.0-1
 libgeronimo-interceptor-3.0-spec-java==1.0.1-4
@@ -476,6 +494,7 @@ libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
+libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
 libgssapi-krb5-2==1.17-3+deb10u2
@@ -485,6 +504,7 @@ libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
 libgtk-3-bin==3.24.5-1
 libgtk-3-common==3.24.5-1
+libgtk-3-dev==3.24.5-1
 libgtk2.0-0==2.24.32-3
 libgtk2.0-bin==2.24.32-3
 libgtk2.0-common==2.24.32-3
@@ -495,6 +515,8 @@ libgudev-1.0-0==232-2
 libguice-java==4.2.1-1
 libgvc6==2.40.1-6+deb10u1
 libgvpr2==2.40.1-6+deb10u1
+libharfbuzz-dev==2.3.1-1
+libharfbuzz-gobject0==2.3.1-1
 libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
@@ -737,8 +759,10 @@ libpam-cap==1:2.25-2
 libpam-systemd==241-7~deb10u8
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
+libpango1.0-dev==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpaper-utils==1.1.28
 libpaper1==1.1.28
 libparams-classify-perl==0.015-1+b1
@@ -769,6 +793,7 @@ libpgm-5.2-0==5.2.122~dfsg-3
 libpgm-dev==5.2.122~dfsg-3
 libpipeline1==1.5.1-2
 libpixman-1-0==0.36.0-1
+libpixman-1-dev==0.36.0-1
 libplexus-ant-factory-java==1.0~alpha2.1-4
 libplexus-archiver-java==3.6.0-2
 libplexus-bsh-factory-java==1.0~alpha7-4
@@ -995,8 +1020,10 @@ libwagon-file-java==3.3.1-2
 libwagon-http-shaded-java==3.3.1-2
 libwagon-provider-api-java==3.3.1-2
 libwant-perl==0.29-1+b4
+libwayland-bin==1.16.0-1
 libwayland-client0==1.16.0-1
 libwayland-cursor0==1.16.0-1
+libwayland-dev==1.16.0-1
 libwayland-egl1==1.16.0-1
 libwayland-server0==1.16.0-1
 libwebp6==0.6.1-2+deb10u1
@@ -1041,6 +1068,7 @@ libxcb-render0-dev==1.13.1-2
 libxcb-shape0==1.13.1-2
 libxcb-shape0-dev==1.13.1-2
 libxcb-shm0==1.13.1-2
+libxcb-shm0-dev==1.13.1-2
 libxcb-sync-dev==1.13.1-2
 libxcb-sync1==1.13.1-2
 libxcb-util0==0.3.8-3+b2
@@ -1050,7 +1078,9 @@ libxcb-xinerama0==1.13.1-2
 libxcb-xkb1==1.13.1-2
 libxcb1==1.13.1-2
 libxcb1-dev==1.13.1-2
+libxcomposite-dev==1:0.4.4-2
 libxcomposite1==1:0.4.4-2
+libxcursor-dev==1:1.1.15-2
 libxcursor1==1:1.1.15-2
 libxdamage-dev==1:1.1.4-3+b3
 libxdamage1==1:1.1.4-3+b3
@@ -1063,9 +1093,13 @@ libxext-dev==2:1.3.3-1+b2
 libxext6==2:1.3.3-1+b2
 libxfixes-dev==1:5.0.3-1
 libxfixes3==1:5.0.3-1
+libxft-dev==2.3.2-2
 libxft2==2.3.2-2
+libxi-dev==2:1.7.9-1
 libxi6==2:1.7.9-1
+libxinerama-dev==2:1.1.4-2
 libxinerama1==2:1.1.4-2
+libxkbcommon-dev==0.8.2-1
 libxkbcommon-x11-0==0.8.2-1
 libxkbcommon0==0.8.2-1
 libxml-commons-external-java==1.4.01-3
@@ -1087,7 +1121,9 @@ libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
 libxpm4==1:3.5.12-1
+libxrandr-dev==2:1.5.1-1
 libxrandr2==2:1.5.1-1
+libxrender-dev==1:0.9.10-1
 libxrender1==1:0.9.10-1
 libxshmfence-dev==1.3-1
 libxshmfence1==1.3-1
@@ -1098,6 +1134,7 @@ libxt-dev==1:1.1.5-1+b3
 libxt6==1:1.1.5-1+b3
 libxtables-dev==1.8.2-4
 libxtables12==1.8.2-4
+libxtst-dev==2:1.2.3-1
 libxtst6==2:1.2.3-1
 libxv1==2:1.0.11-1
 libxxf86dga1==2:1.1.4-1+b3
@@ -1163,6 +1200,7 @@ openssh-sftp-server==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
+pango1.0-tools==1.42.4-8~deb10u1
 patch==2.7.6-3+deb10u1
 patchutils==0.3.4-2
 pbuilder==0.230.4
@@ -1473,16 +1511,22 @@ velocity==1.7-5+deb10u1
 vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
+wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 x11-common==1:7.7+19
 x11-utils==7.7+4
 x11-xserver-utils==7.7+8
+x11proto-composite-dev==1:2018.4-4
 x11proto-core-dev==2018.4-4
 x11proto-damage-dev==1:2018.4-4
 x11proto-dev==2018.4-4
 x11proto-fixes-dev==1:2018.4-4
+x11proto-input-dev==2018.4-4
+x11proto-randr-dev==2018.4-4
+x11proto-record-dev==2018.4-4
 x11proto-xext-dev==2018.4-4
 x11proto-xf86vidmode-dev==2018.4-4
+x11proto-xinerama-dev==2018.4-4
 xauth==1:1.0.10-1
 xbitmaps==1.1.1-2
 xdelta==1.1.3-9.2
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index 67de2d5c145e..aa0a970c2836 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.5
+bitarray==2.3.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index c9c378fdfc2d..d03fb468c4b6 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -136,8 +136,15 @@ gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
 ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-atk-1.0==2.30.0-2
+gir1.2-atspi-2.0==2.30.0-7
+gir1.2-freedesktop==1.58.3-2
+gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-glib-2.0==1.58.3-2
+gir1.2-gtk-3.0==3.24.5-1
+gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
+gir1.2-pango-1.0==1.42.4-8~deb10u1
 git==1:2.20.1-2+deb10u3
 git-buildpackage==0.9.14
 git-man==1:2.20.1-2+deb10u3
@@ -208,14 +215,17 @@ libassuan0==2.5.2-1
 libasync-mergepoint-perl==0.04-2
 libatinject-jsr330-api-java==1.0+ds1-5
 libatk-bridge2.0-0==2.30.0-5
+libatk-bridge2.0-dev==2.30.0-5
 libatk-wrapper-java==0.33.3-22
 libatk-wrapper-java-jni==0.33.3-22
 libatk1.0-0==2.30.0-2
 libatk1.0-data==2.30.0-2
+libatk1.0-dev==2.30.0-2
 libatm1==1:2.5.1-2
 libatm1-dev==1:2.5.1-2
 libatomic1==8.3.0-6
 libatspi2.0-0==2.30.0-7
+libatspi2.0-dev==2.30.0-7
 libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
@@ -283,7 +293,9 @@ libc6-dbg==2.28-10
 libc6-dev==2.28-10
 libcaf-openmpi-3==2.4.0-2
 libcairo-gobject2==1.16.0-4+deb10u1
+libcairo-script-interpreter2==1.16.0-4+deb10u1
 libcairo2==1.16.0-4+deb10u1
+libcairo2-dev==1.16.0-4+deb10u1
 libcap-dev==1:2.25-2
 libcap-ng-dev==0.7.9-2
 libcap2==1:2.25-2
@@ -401,6 +413,7 @@ libelf1==0.176-1.1
 libemail-date-format-perl==1.005-1
 libemail-valid-perl==1.202-1
 libencode-locale-perl==1.05-1
+libepoxy-dev==1.5.3-0.1
 libepoxy0==1.5.3-0.1
 liberror-perl==0.17027-2
 libestr0==0.1.10-2.1
@@ -437,9 +450,12 @@ libfl2==2.6.4-6.2
 libfont-afm-perl==1.20-2
 libfontbox2-java==2.0.13-2
 libfontconfig1==2.13.1-2
+libfontconfig1-dev==2.13.1-2
 libfontenc1==1:1.1.3-1+b2
 libfop-java==1:2.3-2
 libfreetype6==2.9.1-3+deb10u2
+libfreetype6-dev==2.9.1-3+deb10u2
+libfribidi-dev==1.0.5-3.1+deb10u1
 libfribidi0==1.0.5-3.1+deb10u1
 libfstrm0==0.4.0-1
 libfuture-perl==0.39-1
@@ -455,6 +471,7 @@ libgdbm6==1.18.1-4
 libgdk-pixbuf2.0-0==2.38.1+dfsg-1
 libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
 libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
 libgeoip1==1.6.12-1
 libgeronimo-annotation-1.3-spec-java==1.0-1
 libgeronimo-interceptor-3.0-spec-java==1.0.1-4
@@ -495,6 +512,7 @@ libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
+libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
 libgssapi-krb5-2==1.17-3+deb10u2
@@ -504,6 +522,7 @@ libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
 libgtk-3-bin==3.24.5-1
 libgtk-3-common==3.24.5-1
+libgtk-3-dev==3.24.5-1
 libgtk2.0-0==2.24.32-3
 libgtk2.0-bin==2.24.32-3
 libgtk2.0-common==2.24.32-3
@@ -514,6 +533,8 @@ libgudev-1.0-0==232-2
 libguice-java==4.2.1-1
 libgvc6==2.40.1-6+deb10u1
 libgvpr2==2.40.1-6+deb10u1
+libharfbuzz-dev==2.3.1-1
+libharfbuzz-gobject0==2.3.1-1
 libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
@@ -764,8 +785,10 @@ libpam-cap==1:2.25-2
 libpam-systemd==241-7~deb10u8
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
+libpango1.0-dev==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpaper-utils==1.1.28
 libpaper1==1.1.28
 libparams-classify-perl==0.015-1+b1
@@ -797,6 +820,7 @@ libpgm-5.2-0==5.2.122~dfsg-3
 libpgm-dev==5.2.122~dfsg-3
 libpipeline1==1.5.1-2
 libpixman-1-0==0.36.0-1
+libpixman-1-dev==0.36.0-1
 libplexus-ant-factory-java==1.0~alpha2.1-4
 libplexus-archiver-java==3.6.0-2
 libplexus-bsh-factory-java==1.0~alpha7-4
@@ -1148,6 +1172,7 @@ libxcb-render0-dev==1.13.1-2
 libxcb-shape0==1.13.1-2
 libxcb-shape0-dev==1.13.1-2
 libxcb-shm0==1.13.1-2
+libxcb-shm0-dev==1.13.1-2
 libxcb-sync-dev==1.13.1-2
 libxcb-sync1==1.13.1-2
 libxcb-util0==0.3.8-3+b2
@@ -1157,7 +1182,9 @@ libxcb-xinerama0==1.13.1-2
 libxcb-xkb1==1.13.1-2
 libxcb1==1.13.1-2
 libxcb1-dev==1.13.1-2
+libxcomposite-dev==1:0.4.4-2
 libxcomposite1==1:0.4.4-2
+libxcursor-dev==1:1.1.15-2
 libxcursor1==1:1.1.15-2
 libxdamage-dev==1:1.1.4-3+b3
 libxdamage1==1:1.1.4-3+b3
@@ -1170,9 +1197,13 @@ libxext-dev==2:1.3.3-1+b2
 libxext6==2:1.3.3-1+b2
 libxfixes-dev==1:5.0.3-1
 libxfixes3==1:5.0.3-1
+libxft-dev==2.3.2-2
 libxft2==2.3.2-2
+libxi-dev==2:1.7.9-1
 libxi6==2:1.7.9-1
+libxinerama-dev==2:1.1.4-2
 libxinerama1==2:1.1.4-2
+libxkbcommon-dev==0.8.2-1
 libxkbcommon-x11-0==0.8.2-1
 libxkbcommon0==0.8.2-1
 libxml-commons-external-java==1.4.01-3
@@ -1194,7 +1225,9 @@ libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
 libxpm4==1:3.5.12-1
+libxrandr-dev==2:1.5.1-1
 libxrandr2==2:1.5.1-1
+libxrender-dev==1:0.9.10-1
 libxrender1==1:0.9.10-1
 libxshmfence-dev==1.3-1
 libxshmfence1==1.3-1
@@ -1205,6 +1238,7 @@ libxt-dev==1:1.1.5-1+b3
 libxt6==1:1.1.5-1+b3
 libxtables-dev==1.8.2-4
 libxtables12==1.8.2-4
+libxtst-dev==2:1.2.3-1
 libxtst6==2:1.2.3-1
 libxv1==2:1.0.11-1
 libxxf86dga1==2:1.1.4-1+b3
@@ -1260,7 +1294,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.4-1nodesource1
+nodejs==14.17.5-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
@@ -1275,6 +1309,7 @@ openssh-sftp-server==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
+pango1.0-tools==1.42.4-8~deb10u1
 patch==2.7.6-3+deb10u1
 patchutils==0.3.4-2
 pbuilder==0.230.4
@@ -1590,16 +1625,22 @@ velocity==1.7-5+deb10u1
 vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
+wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 x11-common==1:7.7+19
 x11-utils==7.7+4
 x11-xserver-utils==7.7+8
+x11proto-composite-dev==1:2018.4-4
 x11proto-core-dev==2018.4-4
 x11proto-damage-dev==1:2018.4-4
 x11proto-dev==2018.4-4
 x11proto-fixes-dev==1:2018.4-4
+x11proto-input-dev==2018.4-4
+x11proto-randr-dev==2018.4-4
+x11proto-record-dev==2018.4-4
 x11proto-xext-dev==2018.4-4
 x11proto-xf86vidmode-dev==2018.4-4
+x11proto-xinerama-dev==2018.4-4
 xauth==1:1.0.10-1
 xbitmaps==1.1.1-2
 xdelta==1.1.3-9.2
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index 67de2d5c145e..aa0a970c2836 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.5
+bitarray==2.3.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.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
index dfdf60d84de7..a38b11e67419 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -140,8 +140,15 @@ gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
 ghostscript==9.27~dfsg-2+deb10u4
+gir1.2-atk-1.0==2.30.0-2
+gir1.2-atspi-2.0==2.30.0-7
+gir1.2-freedesktop==1.58.3-2
+gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-glib-2.0==1.58.3-2
+gir1.2-gtk-3.0==3.24.5-1
+gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
+gir1.2-pango-1.0==1.42.4-8~deb10u1
 git==1:2.20.1-2+deb10u3
 git-buildpackage==0.9.14
 git-man==1:2.20.1-2+deb10u3
@@ -235,14 +242,17 @@ libasync-mergepoint-perl==0.04-2
 libasyncns0==0.8-6
 libatinject-jsr330-api-java==1.0+ds1-5
 libatk-bridge2.0-0==2.30.0-5
+libatk-bridge2.0-dev==2.30.0-5
 libatk-wrapper-java==0.33.3-22
 libatk-wrapper-java-jni==0.33.3-22
 libatk1.0-0==2.30.0-2
 libatk1.0-data==2.30.0-2
+libatk1.0-dev==2.30.0-2
 libatm1==1:2.5.1-2
 libatm1-dev==1:2.5.1-2
 libatomic1==8.3.0-6
 libatspi2.0-0==2.30.0-7
+libatspi2.0-dev==2.30.0-7
 libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
@@ -326,7 +336,9 @@ libcaca0==0.99.beta19-2.1
 libcacard0==1:2.6.1-1
 libcaf-openmpi-3==2.4.0-2
 libcairo-gobject2==1.16.0-4+deb10u1
+libcairo-script-interpreter2==1.16.0-4+deb10u1
 libcairo2==1.16.0-4+deb10u1
+libcairo2-dev==1.16.0-4+deb10u1
 libcap-dev==1:2.25-2
 libcap-ng-dev==0.7.9-2
 libcapstone3==4.0.1+really+3.0.5-1
@@ -430,10 +442,12 @@ libedit-dev==3.1-20181209-1
 libedit2==3.1-20181209-1
 libegl-mesa0==18.3.6-2+deb10u1
 libegl1==1.1.0-1
+libegl1-mesa-dev==18.3.6-2+deb10u1
 libel-api-java==3.0.0-2+deb10u1
 libelf-dev==0.176-1.1
 libemail-valid-perl==1.202-1
 libencode-locale-perl==1.05-1
+libepoxy-dev==1.5.3-0.1
 libepoxy0==1.5.3-0.1
 liberror-perl==0.17027-2
 libestr0==0.1.10-2.1
@@ -472,9 +486,12 @@ libflite1==2.1-release-3
 libfont-afm-perl==1.20-2
 libfontbox2-java==2.0.13-2
 libfontconfig1==2.13.1-2
+libfontconfig1-dev==2.13.1-2
 libfontenc1==1:1.1.3-1+b2
 libfop-java==1:2.3-2
 libfreetype6==2.9.1-3+deb10u2
+libfreetype6-dev==2.9.1-3+deb10u2
+libfribidi-dev==1.0.5-3.1+deb10u1
 libfribidi0==1.0.5-3.1+deb10u1
 libfstrm0==0.4.0-1
 libfuture-perl==0.39-1
@@ -490,6 +507,7 @@ libgdbm6==1.18.1-4
 libgdk-pixbuf2.0-0==2.38.1+dfsg-1
 libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
 libgdk-pixbuf2.0-common==2.38.1+dfsg-1
+libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
 libgeoip1==1.6.12-1
 libgeronimo-annotation-1.3-spec-java==1.0-1
 libgeronimo-interceptor-3.0-spec-java==1.0.1-4
@@ -530,6 +548,7 @@ libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
+libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
 libgsm1==1.0.18-2
@@ -541,6 +560,7 @@ libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
 libgtk-3-bin==3.24.5-1
 libgtk-3-common==3.24.5-1
+libgtk-3-dev==3.24.5-1
 libgtk2.0-0==2.24.32-3
 libgtk2.0-bin==2.24.32-3
 libgtk2.0-common==2.24.32-3
@@ -551,6 +571,8 @@ libgudev-1.0-0==232-2
 libguice-java==4.2.1-1
 libgvc6==2.40.1-6+deb10u1
 libgvpr2==2.40.1-6+deb10u1
+libharfbuzz-dev==2.3.1-1
+libharfbuzz-gobject0==2.3.1-1
 libharfbuzz-icu0==2.3.1-1
 libharfbuzz0b==2.3.1-1
 libhawtjni-runtime-java==1.16-1
@@ -808,8 +830,10 @@ libpackagekit-glib2-18==1.1.12-5
 libpam-systemd==241-7~deb10u8
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
+libpango1.0-dev==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
+libpangoxft-1.0-0==1.42.4-8~deb10u1
 libpaper-utils==1.1.28
 libpaper1==1.1.28
 libparams-classify-perl==0.015-1+b1
@@ -841,6 +865,7 @@ libpgm-5.2-0==5.2.122~dfsg-3
 libpgm-dev==5.2.122~dfsg-3
 libpipeline1==1.5.1-2
 libpixman-1-0==0.36.0-1
+libpixman-1-dev==0.36.0-1
 libplexus-ant-factory-java==1.0~alpha2.1-4
 libplexus-archiver-java==3.6.0-2
 libplexus-bsh-factory-java==1.0~alpha7-4
@@ -1117,8 +1142,10 @@ libwagon-http-shaded-java==3.3.1-2
 libwagon-provider-api-java==3.3.1-2
 libwant-perl==0.29-1+b4
 libwavpack1==5.1.0-6
+libwayland-bin==1.16.0-1
 libwayland-client0==1.16.0-1
 libwayland-cursor0==1.16.0-1
+libwayland-dev==1.16.0-1
 libwayland-egl1==1.16.0-1
 libwayland-server0==1.16.0-1
 libwebp6==0.6.1-2+deb10u1
@@ -1173,6 +1200,7 @@ libxcb-render0-dev==1.13.1-2
 libxcb-shape0==1.13.1-2
 libxcb-shape0-dev==1.13.1-2
 libxcb-shm0==1.13.1-2
+libxcb-shm0-dev==1.13.1-2
 libxcb-sync-dev==1.13.1-2
 libxcb-sync1==1.13.1-2
 libxcb-util0==0.3.8-3+b2
@@ -1182,7 +1210,9 @@ libxcb-xinerama0==1.13.1-2
 libxcb-xkb1==1.13.1-2
 libxcb1==1.13.1-2
 libxcb1-dev==1.13.1-2
+libxcomposite-dev==1:0.4.4-2
 libxcomposite1==1:0.4.4-2
+libxcursor-dev==1:1.1.15-2
 libxcursor1==1:1.1.15-2
 libxdamage-dev==1:1.1.4-3+b3
 libxdamage1==1:1.1.4-3+b3
@@ -1204,9 +1234,13 @@ libxext-dev==2:1.3.3-1+b2
 libxext6==2:1.3.3-1+b2
 libxfixes-dev==1:5.0.3-1
 libxfixes3==1:5.0.3-1
+libxft-dev==2.3.2-2
 libxft2==2.3.2-2
+libxi-dev==2:1.7.9-1
 libxi6==2:1.7.9-1
+libxinerama-dev==2:1.1.4-2
 libxinerama1==2:1.1.4-2
+libxkbcommon-dev==0.8.2-1
 libxkbcommon-x11-0==0.8.2-1
 libxkbcommon0==0.8.2-1
 libxml-commons-external-java==1.4.01-3
@@ -1228,7 +1262,9 @@ libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
 libxpm4==1:3.5.12-1
+libxrandr-dev==2:1.5.1-1
 libxrandr2==2:1.5.1-1
+libxrender-dev==1:0.9.10-1
 libxrender1==1:0.9.10-1
 libxshmfence-dev==1.3-1
 libxshmfence1==1.3-1
@@ -1237,6 +1273,7 @@ libxss1==1:1.2.3-1
 libxt-dev==1:1.1.5-1+b3
 libxt6==1:1.1.5-1+b3
 libxtables-dev==1.8.2-4
+libxtst-dev==2:1.2.3-1
 libxtst6==2:1.2.3-1
 libxv1==2:1.0.11-1
 libxvidcore4==2:1.3.5-1
@@ -1313,6 +1350,7 @@ openssl==1.1.1d-0+deb10u6
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
+pango1.0-tools==1.42.4-8~deb10u1
 patch==2.7.6-3+deb10u1
 patchutils==0.3.4-2
 pbuilder==0.230.4
@@ -1634,17 +1672,23 @@ velocity==1.7-5+deb10u1
 vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
+wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 wget==1.20.1-1.1
 x11-common==1:7.7+19
 x11-utils==7.7+4
 x11-xserver-utils==7.7+8
+x11proto-composite-dev==1:2018.4-4
 x11proto-core-dev==2018.4-4
 x11proto-damage-dev==1:2018.4-4
 x11proto-dev==2018.4-4
 x11proto-fixes-dev==1:2018.4-4
+x11proto-input-dev==2018.4-4
+x11proto-randr-dev==2018.4-4
+x11proto-record-dev==2018.4-4
 x11proto-xext-dev==2018.4-4
 x11proto-xf86vidmode-dev==2018.4-4
+x11proto-xinerama-dev==2018.4-4
 xauth==1:1.0.10-1
 xbitmaps==1.1.1-2
 xdelta==1.1.3-9.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 2ce63242df55..bca478a198f9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 67de2d5c145e..aa0a970c2836 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.2.5
+bitarray==2.3.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 90501ac085fb..c6d6ed232cbe 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.5
+bitarray==2.3.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 90501ac085fb..c6d6ed232cbe 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.5
+bitarray==2.3.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 2ce63242df55..bca478a198f9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0c42eff6d19a79d0c8af825ece86d63d5f58e98b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 90501ac085fb..c6d6ed232cbe 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.2.5
+bitarray==2.3.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2

From 6a2d9e177c49ae39ef876b674d2508348b23fd13 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 20 Aug 2021 10:30:12 -0700
Subject: [PATCH 0736/1674] [202012][Arista] Update platform library submodules
 (#8530)

Fix Chassis.get_name to return the same value than what's in platform.json
Fix Chassis.get_system_eeprom_info when running from within pmon.
Fix Watchdog.get_remaining_time (fixes [202012 platform_tests] TestWatchdogApi::test_remaining_time failure on vms20-t1-7050cx3-3.1 #8440 and [ 202012 platform_tests ] TestWatchdogApi::test_arm_disarm_states failure on vms20-t1-7050cx3-3.1 #8439)
Implement missing thermal infos and conditions (fixes [202012 platform_tests] test_platform_info.py::test_thermal_control_psu_absence error #8453)
Fix Chassis.set_status_led return value (fixes [2020 platform_tests] TestChassisApi::test_status_led failure on vms20-t0-7050cx3-1  #8464)
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index cf24d4c8c8ce..418628537d75 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5
+Subproject commit 418628537d756b22199945170d5200798f6f5b65
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index cf24d4c8c8ce..418628537d75 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5
+Subproject commit 418628537d756b22199945170d5200798f6f5b65

From 7fc11cf4414db4b4850033f495f3f547973f0a82 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 21 Aug 2021 14:30:04 -0700
Subject: [PATCH 0737/1674] [ci]: fix artifact download syntax error for vstest
 (#8547)

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c842b4a44480..f7701703bfad 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -69,7 +69,7 @@ stages:
         source: specific
         project: build
         pipeline: 9
-        artifacts: sonic-swss-common.amd64.ubuntu20_04
+        artifact: sonic-swss-common.amd64.ubuntu20_04
         runVersion: 'latestFromBranch'
         runBranch: 'refs/heads/master'
       displayName: "Download sonic swss common deb packages"
@@ -81,8 +81,8 @@ stages:
 
     - script: |
         set -x
-        sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
+        sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i ../python3-swsscommon_1.0.0_amd64.deb
         sudo docker load -i ../target/docker-sonic-vs.gz
         docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
         username=$(id -un)

From 8365245122d64c959bf5dd12131b9f4ba09ffb60 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Fri, 20 Aug 2021 02:29:25 +0300
Subject: [PATCH 0738/1674] [monit] Periodically monitor VNET route consistency
 (#8266)

*To run VNET route consistency check periodically.
*For any failure, the monit will raise alert based on return code.
Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 files/image_config/monit/conf.d/sonic-host | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/files/image_config/monit/conf.d/sonic-host b/files/image_config/monit/conf.d/sonic-host
index 8af94b3f2964..ceebf1003eb2 100644
--- a/files/image_config/monit/conf.d/sonic-host
+++ b/files/image_config/monit/conf.d/sonic-host
@@ -40,3 +40,9 @@ check program diskCheck with path "/usr/local/bin/disk_check.py"
 
 check program container_checker with path "/usr/bin/container_checker"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
+
+# vnet_route_check.py: tool that verifies VNET routes consistancy between SONiC and vendor SDK DBs.
+check program vnetRouteCheck with path "/usr/local/bin/vnet_route_check.py"
+    every 5 cycles
+    if status != 0 for 3 cycle then alert repeat every 1 cycles
+

From 196fcffb6ffe6c6c6775fb72e8e4a880750d50a7 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Sun, 22 Aug 2021 05:54:43 -0700
Subject: [PATCH 0739/1674] [Mellanox] Upgrade Mellanox firmware tools to
 4.17.0 (#8299)

- Why I did it
New release of MFT has the following changelog / RN
 Fixed an issue that resulted in getting MVPD read errors from the mlxfwmanager during fast reboot.
 Fixed mlxuptime sometimes generating a time less than previous due the wrong frequency calculation

- How I did it
Update makefile pointer to new version.

- How to verify it
Manually tested on all Mellanox platforms.
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 919e6fae9d9a..5e9644b5703c 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.16.0
-MFT_REVISION = 105
+MFT_VERSION = 4.17.0
+MFT_REVISION = 106
 
 export MFT_VERSION MFT_REVISION
 

From 387ae82c5df361ceb32a4cb99c72eb5f56bfd064 Mon Sep 17 00:00:00 2001
From: Kostiantyn Yarovyi <kostiantynx.yarovyi@intel.com>
Date: Sun, 22 Aug 2021 20:59:57 +0300
Subject: [PATCH 0740/1674] [Pcied] run by python 3

Why I did it
Pcied running by python 2.

How I did it
dropped python2 support and add python3 support for pcied in file docker-pmon.supervisord.conf.j2

How to verify it
docker exec pmon supervisorctl status
---
 dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 0af4ea03f7c2..867974617e85 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -139,7 +139,7 @@ dependent_startup_wait_for=rsyslogd:running
 
 {% if not skip_pcied %}
 [program:pcied]
-command=/usr/local/bin/pcied
+command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
 priority=10
 autostart=false
 autorestart=unexpected

From 8f604998b471b32640d29f8003652e5b883b76d8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:32:59 +0800
Subject: [PATCH 0741/1674] [ci/build]: Upgrade SONiC package versions (#8556)

---
 .../versions/build/build-sonic-slave-buster/versions-git  | 4 ++--
 files/build/versions/default/versions-docker              | 8 ++++----
 files/build/versions/default/versions-git                 | 6 +++---
 .../dockers/docker-config-engine-buster/versions-py3      | 2 +-
 .../sonic-slave-buster-march-arm64/versions-py3-all-arm64 | 4 ++--
 .../sonic-slave-buster-march-armhf/versions-py3-all-armhf | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-git      | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-py3      | 4 ++--
 .../versions-py3-all-arm64                                | 4 ++--
 .../versions-py3-all-armhf                                | 4 ++--
 .../versions/dockers/sonic-slave-stretch/versions-git     | 2 +-
 .../versions/dockers/sonic-slave-stretch/versions-py3     | 4 ++--
 files/build/versions/host-image/versions-py3              | 2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index a65eb1f4f5f6..775a5742711a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==78909de378e32888211e4292cb2a0530d3ffa2f8
+https://salsa.debian.org/kernel-team/ethtool/==7fc11cf4414db4b4850033f495f3f547973f0a82
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==7aabb1875cc0d2136db332c1541fed39b39923cd
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==2c0c1f9d4efdde30bea7f142b2571dfede933758
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 770ac2706f45..0bc1585703a2 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -28,10 +28,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:0670f807ca958a0442099b34acad64675d9d80de0869da5faf2ca6f0f5381463
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:99a1f5d698a7c7ecde811004bf2efe395a590c54a9e1231c729da3a1bdaeaed6
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:1bc791ccf8170c4943a47b96a3d2c94721130525c875a1d2fdbff52c660f54a1
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:b4aa76ce99876db67ae2f3ead89ffac424b4d1d07b7ae6369530ae9f5e745915
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:b025061867a5af54f20e7fb7c615a9fc521f491c67af12f9c4545341bcefa0ba
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:7a971bae16a7a2986d99ca0c45a1acaab3f1bdb4e80dfc4bded8645f4b1a000f
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:79f0455cf5169e9c5b4de81f92c3d669c020b58bb0e5da6c8e0f9a0fed8d666c
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:b63f0c90d9f918b3a2311dc61944593e1f43eba1218fe90abbdb044f87b97ff9
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index ea84fb956666..cb8688e0d1da 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==78909de378e32888211e4292cb2a0530d3ffa2f8
+https://salsa.debian.org/kernel-team/ethtool/==7fc11cf4414db4b4850033f495f3f547973f0a82
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==78125e47f2fdbc4cb15b6be092717ccf00aededd
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==2c0c1f9d4efdde30bea7f142b2571dfede933758
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index e86fb5e260bb..5bb0b02f7a4a 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.8.3
+regex==2021.8.21
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index aa0a970c2836..db287ff44313 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.0
+bitarray==2.3.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index aa0a970c2836..170f09b52667 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.0
+bitarray==2.3.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index bca478a198f9..ac8947343fbc 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index aa0a970c2836..db287ff44313 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.0
+bitarray==2.3.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index c6d6ed232cbe..3da85ba50f6f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.0
+bitarray==2.3.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index c6d6ed232cbe..3da85ba50f6f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.0
+bitarray==2.3.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index bca478a198f9..ac8947343fbc 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==071528093f794444068b0b09ddbf3d1778d5b894
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index c6d6ed232cbe..3da85ba50f6f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.0
+bitarray==2.3.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index dfad0ed2a288..3fadb95eff3c 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -31,7 +31,7 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0

From 98dd76c4853bcdee2558692ed469007d7e085a81 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 24 Aug 2021 22:53:16 +0800
Subject: [PATCH 0742/1674] [ci/build]: Upgrade SONiC package versions (#8561)

---
 .../sonic-slave-buster-march-armhf/versions-py3-all-armhf       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index 170f09b52667..db287ff44313 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.3
+regex==2021.8.21
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1

From 1c5fba32ce9720b92600f81b5b990a4c6ee051d2 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Fri, 4 Jun 2021 05:02:42 -0700
Subject: [PATCH 0743/1674] Support curl options in curl command (#7343)

#### Why I did it
Provide possibility to specify curl options as the present curl support provided in Azure/sonic does not extend capability for options like --user which some of the cisco artifacts are requiring.

#### How I did it
Add extensions to the slave.mk file to include curl options as follows:

$($*_CURL_OPTIONS)


#### How to verify it

Option 1) use curl -u, and environment variables

 it with --user <user:password> curl_options. Ex: --user foo:'bar!'

curl -u ${BASIC_AUTH_HEADER} https://foo.bar

This works to obscure password/credential in a terminal session that someone else might see directly or via screen share.


Option 2)  Option 1: use curl -n

 If you run linux, create a ~/.netrc file and insert your creds there, and use curl -n.

chmod the file to 400. curl knows how to extract your creds from the file silently. You never have to type creds on the command line again.

If you run Windows, and use curl, you must name the file _netrc . As on *nix, the file should be in your home directory, and should have appropriate permissions.

For Administrative APIs , my .netrc file looks like this:

machine foobar-linux
  login foo
  password bar
---
 slave.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/slave.mk b/slave.mk
index 2a39b6bb547e..a122d6c7b72e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -344,7 +344,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_ONLINE_DEBS)) : $(DEBS_PATH)/% : .platform \
 	if [ -z '$($*_CACHE_LOADED)' ] ; then
 
 		$(foreach deb,$* $($*_DERIVED_DEBS), \
-			{ curl -L -f -o $(DEBS_PATH)/$(deb) $($(deb)_URL) $(LOG) || { exit 1 ; } } ; )
+			{ curl -L -f -o $(DEBS_PATH)/$(deb) $($(deb)_CURL_OPTIONS) $($(deb)_URL) $(LOG) || { exit 1 ; } } ; )
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)
@@ -361,7 +361,7 @@ SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_ONLINE_DEBS))
 #     SONIC_ONLINE_FILES += $(SOME_NEW_FILE)
 $(addprefix $(FILES_PATH)/, $(SONIC_ONLINE_FILES)) : $(FILES_PATH)/% : .platform
 	$(HEADER)
-	curl -L -f -o $@ $($*_URL) $(LOG)
+	curl -L -f -o $@ $($*_CURL_OPTIONS) $($*_URL) $(LOG)
 	$(FOOTER)
 
 SONIC_TARGET_LIST += $(addprefix $(FILES_PATH)/, $(SONIC_ONLINE_FILES))

From 5dce09346449b9bcbc606193beeb98c49e97fef9 Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Tue, 24 Aug 2021 19:54:13 +0200
Subject: [PATCH 0744/1674] [mgmt-framework]: Fix typo in mgmt_vars.j2 (#8475)

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 dockers/docker-sonic-mgmt-framework/mgmt_vars.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-mgmt-framework/mgmt_vars.j2 b/dockers/docker-sonic-mgmt-framework/mgmt_vars.j2
index f43b11ba4199..b04446a11a5a 100644
--- a/dockers/docker-sonic-mgmt-framework/mgmt_vars.j2
+++ b/dockers/docker-sonic-mgmt-framework/mgmt_vars.j2
@@ -1,4 +1,4 @@
 {
-    "rest_server": {% if REST_SERVER is defined and "default" in RESET_SERVER.keys() %}{{ REST_SERVER['default'] }}{% else %}""{% endif %},
+    "rest_server": {% if REST_SERVER is defined and "default" in REST_SERVER.keys() %}{{ REST_SERVER['default'] }}{% else %}""{% endif %},
     "x509" : {% if "x509" in DEVICE_METADATA.keys() %}{{ DEVICE_METADATA["x509"] }}{% else %}""{% endif %}
 }

From a66c264d9a61d2997c956b4261798bc939578b39 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Thu, 22 Apr 2021 21:59:05 -0700
Subject: [PATCH 0745/1674] [build]: Provide support for apt install packages
 (#7346)

apt-package handling: These are part of the Export variables for .j2 files and is needed for Debian and its derivatives.

How I did it
Add support to slave.mk files to export APT_PACKAGES and DBG_APT_PACKAGES

How to verify it
The apt package, provides the apt management tool, a high-level command-line interface for better interactive usage. APT also includes command-line programs for dealing with packages, which use the library. Three such programs are apt, apt-get and apt-cache and can be verified for their existence.
---
 slave.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/slave.mk b/slave.mk
index a122d6c7b72e..bc6e8f9707ab 100644
--- a/slave.mk
+++ b/slave.mk
@@ -753,6 +753,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_pydebs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_PYTHON_DEBS)))\n" | awk '!a[$$0]++'))
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_whls=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_PYTHON_WHEELS)))\n" | awk '!a[$$0]++'))
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_PACKAGES)))\n" | awk '!a[$$0]++'))
+		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_pkgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_APT_PACKAGES)))\n" | awk '!a[$$0]++'))
 		j2 $($*.gz_PATH)/Dockerfile.j2 > $($*.gz_PATH)/Dockerfile
 		# Prepare docker build info
 		PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
@@ -803,6 +804,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_DBG_IMAGES)) : $(TARGET_PATH)/%-$(DBG_IMAG
 		# Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++'))
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_image_dbgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_IMAGE_PACKAGES)))\n" | awk '!a[$$0]++'))
+		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_pkgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_APT_PACKAGES),RDEPENDS))\n" | awk '!a[$$0]++'))
 		./build_debug_docker_j2.sh $* $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_debs $(subst -,_,$(notdir $($*.gz_PATH)))_image_dbgs > $($*.gz_PATH)/Dockerfile-dbg.j2
 		j2 $($*.gz_PATH)/Dockerfile-dbg.j2 > $($*.gz_PATH)/Dockerfile-dbg
 		# Prepare docker build info

From 813ed8836e166ede5b7cdcdf1ecf2bba1574e9ee Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Wed, 25 Aug 2021 18:09:49 +0800
Subject: [PATCH 0746/1674] [submodule]: Update sonic-swss (#8574)

d29a49a [ACL] Match TCP protocol while matching TCP_FLAG (#1854)
2569ad9 Fix sFlow sampling-rate and admin-state (#1728)
8908a8f Change rif_rates.lua and port_rates.lua scripts to calculate rates correct (#1848)
b42c2fb [VS Test] Skip flaky tests (#1875)

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c1cb2cabae6a..d29a49a3579f 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c1cb2cabae6adbeb44b8868940499e69f16b5b1e
+Subproject commit d29a49a3579f57d607a7722e7b5a508c3db1b950

From 62623ccd17627a3061a7d8bdee6961dc27121cfd Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 26 Aug 2021 04:14:24 +0800
Subject: [PATCH 0747/1674] [submodule][202012] Update submodule for
 sonic-linux-kernel (#8586)

816de4f [Mellanox] Remove incorrectly generated patch allegedly avoiding kernel deadlock but causes one (#231)
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index deb716fd02e8..816de4f551d3 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit deb716fd02e859df9366340d007f1d9712a27048
+Subproject commit 816de4f551d39d595910e265144b7140f552c628

From 6a43dff59c4796ea59c42c53991aa03da2f6bac6 Mon Sep 17 00:00:00 2001
From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com>
Date: Thu, 26 Aug 2021 04:56:05 +0300
Subject: [PATCH 0748/1674] [202012] [submodule] sonic-swss submodule update
 (#8582)

In order to include the following commits:
d29a49a 2021-08-25 [ACL] Match TCP protocol while matching TCP_FLAG (Azure/sonic-swss#1854)
2569ad9 2021-08-25 Fix sFlow sampling-rate and admin-state (Azure/sonic-swss#1728)
8908a8f 2021-08-19 Change rif_rates.lua and port_rates.lua scripts to calculate rates correct (Azure/sonic-swss#1848)
b42c2fb 2021-08-19 [VS Test] Skip flaky tests (Azure/sonic-swss#1875)

From 4591c84d8517ed3fe25539088d83fd876a68f083 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 26 Aug 2021 00:18:04 -0700
Subject: [PATCH 0749/1674] BRCM Disable ACL Drop counted towards interface
 RX_DRP counters part II (#8596)

---
 .../th-seastone-dx010-32x100G-t1.config.bcm                    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
index cbad9dc64c7e..43215f78eac3 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
@@ -17,6 +17,9 @@ l3_alpm_enable=2
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
 ###################################################################################
 # Celestica Customize for SeaStone
 ###################################################################################

From 6b69ddc8611a616816b11fb02cc10f99ee07bbba Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 26 Aug 2021 18:21:18 +0800
Subject: [PATCH 0750/1674] [build] Fix reproducible build issues (#8548)

* [build] Fix reproducible build issues
---
 .azure-pipelines/docker-sonic-slave.yml | 2 +-
 azure-pipelines.yml                     | 2 +-
 scripts/docker_version_control.sh       | 7 +++++--
 src/sonic-build-hooks/hooks/git         | 6 ++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 02d1e0e58844..4724933172bc 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -43,7 +43,7 @@ parameters:
   default: sonicdev
 
 variables:
-- ${{ if and(startsWith(variables['Build.SourceBranchName'], '202'), eq(length(variables['Build.SourceBranchName']), 6)) }}:
+- ${{ if eq(variables['Build.SourceBranchName'], '202012' }}:
   - name: BUILD_OPTIONS
     value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f7701703bfad..e21035f0fa9d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,7 +36,7 @@ stages:
   variables:
     CACHE_MODE: rcache
     ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh
index 9dd3ad55bad0..595477c859c6 100755
--- a/scripts/docker_version_control.sh
+++ b/scripts/docker_version_control.sh
@@ -21,7 +21,7 @@ tag=`echo $image_tag | cut -f2 -d:`
 
 if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then
     # if docker image not in white list, exit
-    if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]] && [[ "$IMAGENAME" != debian:* ]] && [[ "$IMAGENAME" != multiarch/debian-debootstrap:* ]];then
+    if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]];then
         exit 0
     fi
     if [ -f $version_file ];then
@@ -29,12 +29,15 @@ if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION
     fi
     if [ -z $hash_value ];then
         hash_value=unknown
+        echo "$image_tag sha256 value is unknown" >> ${new_version_file}.log
+        exit 0
     fi
     oldimage=${image_tag//\//\\/}
     newimage="${oldimage}@$hash_value"
+    echo "sed -i \"s/$oldimage/$newimage/\" $DOCKERFILE" >> ${new_version_file}.log
     sed -i "s/$oldimage/$newimage/" $DOCKERFILE
 else
-    hash_value=`docker pull $image_tag | grep Digest | awk '{print$2}'`
+    hash_value=`docker pull $image_tag 2> ${new_version_file}.log | grep Digest | awk '{print$2}'`
     if [ -z hash_value ];then
         hash_value=unknown
     fi
diff --git a/src/sonic-build-hooks/hooks/git b/src/sonic-build-hooks/hooks/git
index 9c202ff8a06a..1bbffea603cf 100755
--- a/src/sonic-build-hooks/hooks/git
+++ b/src/sonic-build-hooks/hooks/git
@@ -39,7 +39,8 @@ get_clone_path(){
     done
 
     # if not specific clone path, get default clone path
-    [ -z $clone_PATH ] && clone_PATH=`echo $URL | rev | awk -F/ '{print$1}' | rev | awk -F. '{print$1}'`
+    # 1. trim tail slash sign. 2. trim all charactors before the last slash. 3.trim tail '.git'
+    [ -z $clone_PATH ] && clone_PATH=`echo $URL | sed 's/\/$//' | awk -F/ '{print$NF}' | awk -F. '{print$1}'`
 }
 
 main(){
@@ -62,7 +63,8 @@ main(){
     # control version or record version file
     if [[ $ENABLE_VERSION_CONTROL_GIT == "y" ]];then
         # control version
-        [ ! -z $commit ] && $REAL_COMMAND reset --hard $commit &> /dev/null
+        [ -n $commit ] && echo "git reset --hard $commit" >> ${new_version_file}.log
+        [ -n $commit ] && $REAL_COMMAND reset --hard $commit &> ${new_version_file}.log
     else
         # record version file
         echo "$URL==$commit_latest" >> $new_version_file

From 0239e020a8a877a1af33438824ee51f8703cc365 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Thu, 26 Aug 2021 12:52:42 -0700
Subject: [PATCH 0751/1674] [advance submodule] Update sonic-utilities 202012
 head to latest (#8590)

Update sonic-utilities submodule to latest in 202012 branch:

[show priority-group drop counters] Add user info output when user want to check PG counters and polling are disabled Azure/sonic-utilities#1678
[route_check] Filter out VNET routes Azure/sonic-utilities#1612
[Show] Update the subcommands of Kdump. Azure/sonic-utilities#1682
Add mock support for swsscommon classes Azure/sonic-utilities#1780
[acl_loader]: add iptype match to the rules for dataplane acl Azure/sonic-utilities@205aff8
[202012][fast-reboot] Remove FLEX_COUNTER_TABLE from config_db.json before fast-reboot Azure/sonic-utilities#1774
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d84a8cc55777..a72e4073fadf 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d84a8cc55777f2fec90e2a079105339d54f736fa
+Subproject commit a72e4073fadf4c27ba2dca3a825ad64e48ddf6f2

From f1d35d844589c06cea7d1fcf0db38127dc8e112d Mon Sep 17 00:00:00 2001
From: richardyu <richardyu81@yahoo.com>
Date: Thu, 26 Aug 2021 12:53:14 -0700
Subject: [PATCH 0752/1674] Update SAI submodule in sairedis (#8598)

202012, the saiserver only works for branch 202012 on brcm's

Co-authored-by: richardyu-ms <richard.yu@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 575dcb49685f..c31d9c0879b8 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 575dcb49685f3aa4532ba24a353264bbc2f33c1a
+Subproject commit c31d9c0879b8d41bae8c971d68f9bd213f30e682

From fcdd63835b741b0ff33b256aa759a713a2864d71 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 26 Aug 2021 14:30:22 -0700
Subject: [PATCH 0753/1674] [202012]BRCM SAI 4.3.5.1-1 Fix configurable drop
 counter out of resource (#8601)

* [202012]BRCM SAI 4.3.5.1 Fix for configurable drop counter out of resource
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6015b02c5771..fb779da214de 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 93851b2f308a..45942f41b3bc 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 49f4ef6438a00e8997c447b7ea626f9f56aa95f4 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 26 Aug 2021 16:03:55 +0800
Subject: [PATCH 0754/1674] [Mellanox] Read PSU fan max/min speed per PSU
 (#8563)

#### Why I did it
New PSU could install different type of fan, so fan max/min speed should be read per PSU

#### How I did it
The existing implementation read PSU max/min fan speed from a common file, change it to read from per PSU file

#### How to verify it
Manual test
---
 platform/mellanox/mlnx-platform-api/sonic_platform/fan.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
index b40712a91d06..7eb0ce946b17 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
@@ -65,8 +65,8 @@ def __init__(self, fan_index, fan_drawer, position, psu_fan = False, psu=None):
             self.fan_speed_get_path = "psu{}_fan1_speed_get".format(self.index)
             self.fan_presence_path = "psu{}_fan1_speed_get".format(self.index)
             self._name = 'psu{}_fan{}'.format(self.index, 1)
-            self.fan_max_speed_path = os.path.join(CONFIG_PATH, "psu_fan_max")
-            self.fan_min_speed_path = os.path.join(CONFIG_PATH, "psu_fan_min")
+            self.fan_max_speed_path = os.path.join(FAN_PATH, "psu{}_fan_max".format(self.index))
+            self.fan_min_speed_path = os.path.join(FAN_PATH, "psu{}_fan_min".format(self.index))
             self.psu_i2c_bus_path = os.path.join(CONFIG_PATH, 'psu{0}_i2c_bus'.format(self.index))
             self.psu_i2c_addr_path = os.path.join(CONFIG_PATH, 'psu{0}_i2c_addr'.format(self.index))
             self.psu_i2c_command_path = os.path.join(CONFIG_PATH, 'fan_command')

From 2c91efcd151fd449cbdfb20b00574910bb163f5e Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Thu, 26 Aug 2021 10:14:34 -0400
Subject: [PATCH 0755/1674] [Nokia ixs7215] Add support for changing the
 console baud rate (#8595)

This commit adds support for changing the default console baud rate configured
within the U-Boot bootloader. That default baud rate is exposed via the value
of the U-Boot 'baudrate' environment variable. This commit removes logic that
hardcoded the console baud rate to 115200 and instead ensures that the U-Boot
'baudrate' variable is always used when constructing the Linux kernel boot
arguments used when booting Sonic.

A change is also made to rc.local to ensure that the specified baud rate is set
correctly in the serial getty service.
---
 files/image_config/platform/rc.local | 12 +++++++++++-
 platform/marvell-armhf/platform.conf |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index d35269cd2ec0..9710bfcbf8db 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -186,7 +186,17 @@ program_console_speed()
         CONSOLE_SPEED=$speed
     fi
 
-    sed -i "s|\-\-keep\-baud .* %I| $CONSOLE_SPEED %I|g" /lib/systemd/system/serial-getty@.service
+    # Set correct baud rate in getty service
+    # First boot will find keep-baud argument with multiple baud rates as per Debian convention
+    # Subsequent boots may have new baud rate without finding keep-baud argument
+    grep agetty /lib/systemd/system/serial-getty@.service |grep keep-baud
+    if [ $? = 0 ]; then
+        sed -i "s|\-\-keep\-baud .* %I| $CONSOLE_SPEED %I|g" /lib/systemd/system/serial-getty@.service
+    else
+        sed -i "s|u' .* %I|u' $CONSOLE_SPEED %I|g" /lib/systemd/system/serial-getty@.service
+    fi
+
+    # Reload systemd config
     systemctl daemon-reload
 }
 
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 651b01bea18d..b0be99a8e69e 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -45,9 +45,9 @@ elif [ "$PLATFORM" = "armhf-nokia_ixs7215_52x-r0" ]; then
 
     fdt_fname="/boot/armada-385-ipd6448m.dtb"
 
-    BOOTARGS='setenv bootargs root=/dev/'$demo_dev' rw rootwait rootfstype=ext4 panic=1 console=ttyS0,115200 ${othbootargs} ${mtdparts} ${linuxargs}'
+    BOOTARGS='setenv bootargs root=/dev/'$demo_dev' rw rootwait rootfstype=ext4 panic=1 console=ttyS0,${baudrate} ${othbootargs} ${mtdparts} ${linuxargs}'
     UBI_LOAD='scsi init; ext4load scsi 0:2 $kernel_addr $image_name; ext4load scsi 0:2 $fdt_addr $fdt_name; ext4load scsi 0:2 $initrd_addr $initrd_name'
-    BOOTARGS_OLD='setenv bootargs root=/dev/'$demo_dev' rw rootwait rootfstype=ext4 panic=1 console=ttyS0,115200 ${othbootargs} ${mtdparts} ${linuxargs_old}'
+    BOOTARGS_OLD='setenv bootargs root=/dev/'$demo_dev' rw rootwait rootfstype=ext4 panic=1 console=ttyS0,${baudrate} ${othbootargs} ${mtdparts} ${linuxargs_old}'
     UBI_LOAD_OLD='scsi init; ext4load scsi 0:2 $kernel_addr $image_name_old; ext4load scsi 0:2 $fdt_addr $fdt_name_old; ext4load scsi 0:2 $initrd_addr $initrd_name_old'
     UBIBOOTCMD='run ubi_sonic_boot_bootargs; run ubi_sonic_boot_load; test -n "$boot_once" && setenv boot_once "" && saveenv; bootz $kernel_addr $initrd_addr $fdt_addr'
     UBIBOOTCMD_OLD='run ubi_sonic_boot_bootargs_old; run ubi_sonic_boot_load_old; test -n "$boot_once" && setenv boot_once "" && saveenv; bootz $kernel_addr $initrd_addr $fdt_addr'

From 01117d58b5786a575754cd154b12fec304f89aec Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Thu, 26 Aug 2021 19:02:10 -0700
Subject: [PATCH 0756/1674] [Arista] Rely on automatic flash size detection for
 Lodoga (#8608)

Lodoga actually has a 8GB storage device.
LodogaSsd variant has a 30GB SSD drive.
However, in boot0 both were mishandled and assigned 4GB for legacy reasons.

Remove the hardcoding of the flash size and let boot0 autodetect the available space.
---
 files/Aboot/boot0.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 3052f13d583b..8f0a0bb9a74c 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -509,7 +509,6 @@ write_platform_specific_cmdline() {
     fi
     if [ "$sid" = "Lodoga" ]; then
         aboot_machine=arista_7050cx3_32s
-        flash_size=3700
     fi
     if [ "$sid" = "Marysville" ]; then
         aboot_machine=arista_7050sx3_48yc8

From 06b9d3a9cfe280b1fc03441dfcc60d0511fabeec Mon Sep 17 00:00:00 2001
From: richardyu <richardyu81@yahoo.com>
Date: Thu, 12 Aug 2021 09:30:43 -0700
Subject: [PATCH 0757/1674] [202012][saiserver docker]adds saiserver
 dependences (#8447)

Co-authored-by: richardyu-ms <richard.yu@microsoft.com>
---
 .../broadcom/docker-saiserver-brcm/Dockerfile.j2    | 13 ++++++++-----
 .../broadcom/docker-saiserver-brcm/supervisord.conf |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
index a4b4fedd39ad..3fbbceb6989f 100644
--- a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
@@ -1,3 +1,4 @@
+{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
 FROM docker-config-engine-buster
 
 ARG docker_container_name
@@ -6,7 +7,11 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update
+## Pre-install the fundamental packages
+RUN apt-get update \
+ && apt-get -y install  \
+    gdb                 \
+    libboost-atomic1.71.0
 
 COPY \
 {% for deb in docker_saiserver_brcm_debs.split(' ') -%}
@@ -14,10 +19,8 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_saiserver_brcm_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_saiserver_brcm_debs.split(' ')) }}
 
 ## TODO: add kmod into Depends
 RUN apt-get install -yf kmod
diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
index cb67a0fc9a47..e90e41645042 100644
--- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf
+++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
@@ -20,7 +20,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
-command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
+command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
 autorestart=false

From 5ea763f60a4d7b4c43c5348dca414941a29d4f4a Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Mon, 30 Aug 2021 10:49:52 +0800
Subject: [PATCH 0758/1674] Fix azp pipeline file which is involved by former
 PR  (#8616)

---
 .azure-pipelines/docker-sonic-slave.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 4724933172bc..6b4fcafda947 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -43,7 +43,7 @@ parameters:
   default: sonicdev
 
 variables:
-- ${{ if eq(variables['Build.SourceBranchName'], '202012' }}:
+- ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
   - name: BUILD_OPTIONS
     value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
 

From 7eb4a345fa2a0a90cf0f52745670b1a031fbd88d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:24:18 +0800
Subject: [PATCH 0759/1674] [ci/build]: Upgrade SONiC package versions (#8584)

Co-authored-by: mssonicbld <vsts@fv-az232-326.x3jni0md3anuvcz2px3t3ecixa.bx.internal.cloudapp.net>
---
 .../build-sonic-slave-buster/versions-deb-buster   |  6 +++---
 .../build/build-sonic-slave-buster/versions-git    |  2 +-
 .../build/build-sonic-slave-buster/versions-web    |  6 +++---
 .../build/build-sonic-slave-stretch/versions-web   |  4 ++--
 files/build/versions/default/versions-git          |  6 +++---
 files/build/versions/default/versions-web          |  6 ++----
 .../dockers/docker-base-buster/versions-deb-buster |  4 ++--
 .../docker-config-engine-buster/versions-py3       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3       |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster       |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster      |  2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster  |  2 +-
 .../docker-syncd-centec-rpc/versions-deb-buster    |  2 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster      |  2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster  |  2 +-
 .../versions-deb-buster-arm64                      |  6 +++---
 .../versions-py3-all-arm64                         |  4 ++--
 .../versions-deb-buster-armhf                      | 14 +++++++-------
 .../versions-py3-all-armhf                         |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster |  6 +++---
 .../dockers/sonic-slave-buster/versions-git        |  2 +-
 .../dockers/sonic-slave-buster/versions-py3        |  4 ++--
 .../versions-py3-all-arm64                         |  4 ++--
 .../versions-py3-all-armhf                         |  4 ++--
 .../dockers/sonic-slave-stretch/versions-git       |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3       |  4 ++--
 .../build/versions/host-image/versions-deb-buster  | 10 +++++-----
 files/build/versions/host-image/versions-py3       |  4 ++--
 28 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 5473c852876e..0adb94c22a1f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -3,7 +3,7 @@ applibs-dev==1.mlnx.4.4.3222
 bfnplatform==1.0.0
 iproute2-dev==1.mlnx.4.4.3222
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.16.0-105
+kernel-mft-dkms==4.17.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -16,7 +16,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1
+libsaibcm==4.3.5.1-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -40,7 +40,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.16.0-105
+mft==4.17.0-106
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 775a5742711a..0e3bbd0abe0d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==7fc11cf4414db4b4850033f495f3f547973f0a82
+https://salsa.debian.org/kernel-team/ethtool/==4985ed2e4ddeb9f9529e4c8195fb594309c5f1a8
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==2c0c1f9d4efdde30bea7f142b2571dfede933758
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 74e73079eb17..8fb13cc4bbe9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -11,7 +11,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index e77ffa5870f7..5262b4797ff7 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=qxAl66xr1T%2B0ibG%2BSSc4xM3nfVpE5w%2Bk1z8jI%2Fihu6c%3D&se=2035-04-13T19%3A33%3A19Z&sp=r==dd96895146e18277d899ff3519c1102b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1_amd64.deb?sv=2015-04-05&sr=b&sig=c%2BgR2UeeyjEyo%2BBwCFtcTOxOQbX38EeIiwqdfQSh76o%3D&se=2035-04-13T19%3A30%3A14Z&sp=r==da08ff414f41f5228c29c5c1effaf200
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index cb8688e0d1da..7a4b7bef40fa 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==7fc11cf4414db4b4850033f495f3f547973f0a82
+https://salsa.debian.org/kernel-team/ethtool/==4985ed2e4ddeb9f9529e4c8195fb594309c5f1a8
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==2c0c1f9d4efdde30bea7f142b2571dfede933758
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==1789bc497438cff6a14dcb8e41eefb9166f812ce
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index fb779da214de..a30d4ca3e654 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -14,9 +14,9 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
+http://www.mellanox.com/downloads/MFT/mft-4.17.0-106-x86_64-deb.tgz==b3601376b785cdef9a8751e530619d88
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==bf63bfc1edf2f537e490d9e9850f979d
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 973c17fe48c1..e8a7a97fb10c 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u6
+libssl1.1==1.1.1d-0+deb10u7
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1d-0+deb10u6
+openssl==1.1.1d-0+deb10u7
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 5bb0b02f7a4a..c92c6b8dcd02 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.8.21
+regex==2021.8.28
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 46c95fbae33f..c2e3355cb98c 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.0.1
 grpcio==1.39.0
 grpcio-tools==1.20.0
 idna==3.2
-importlib-metadata==4.6.4
+importlib-metadata==4.7.1
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 39a3d25633ab..326dfb9a0a1d 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 7a661be0e07f..c6a367bd3adb 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -45,7 +45,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 5ce78730bfd9..313f6f2adb52 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1
+libsaibcm==4.3.5.1-1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 34b0dae4d865..28a7d8d98923 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -47,7 +47,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index b01af3937f12..846366f1e9eb 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index ae13d077f448..07a635d950e9 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -33,7 +33,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.194-3
-mft==4.16.0-105
+mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 88581c2c1305..7be2d59caddd 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -940,8 +940,8 @@ libsoup-gnome2.4-1==2.64.2-2
 libsoup2.4-1==2.64.2-2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u6
-libssl1.1==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1197,7 +1197,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u6
+openssl==1.1.1d-0+deb10u7
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
 pango1.0-tools==1.42.4-8~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index db287ff44313..e40791619e95 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.1
+bitarray==2.3.2
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index d03fb468c4b6..b7043edc26a8 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -286,8 +286,8 @@ libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u1
-libc-ares-dev==1.14.0-1
-libc-ares2==1.14.0-1
+libc-ares-dev==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10
 libc6-dbg==2.28-10
 libc6-dev==2.28-10
@@ -1042,8 +1042,8 @@ libsoup2.4-1==2.64.2-2
 libspecio-perl==0.43-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u6
-libssl1.1==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1274,8 +1274,8 @@ lua-bitop==1.0.2-5
 lua-bitop-dev==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 lua-cjson-dev==2.1.0+dfsg-2.1
-lynx==2.8.9rel.1-3
-lynx-common==2.8.9rel.1-3
+lynx==2.8.9rel.1-3+deb10u1
+lynx-common==2.8.9rel.1-3+deb10u1
 m4==1.4.18-2
 make==4.2.1-1.2
 man-db==2.8.5-2
@@ -1306,7 +1306,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u6
+openssl==1.1.1d-0+deb10u7
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
 pango1.0-tools==1.42.4-8~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index db287ff44313..e40791619e95 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.1
+bitarray==2.3.2
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index a38b11e67419..41449a9a1e23 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1034,8 +1034,8 @@ libsqlite3-0==3.27.2-3+deb10u1
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u6
-libssl1.1==1.1.1d-0+deb10u6
+libssl-dev==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u7
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1346,7 +1346,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u6
+openssl==1.1.1d-0+deb10u7
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index ac8947343fbc..f8bb43b33caa 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index db287ff44313..e40791619e95 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.1
+bitarray==2.3.2
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 3da85ba50f6f..660e546b3b83 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.1
+bitarray==2.3.2
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 3da85ba50f6f..660e546b3b83 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.1
+bitarray==2.3.2
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index ac8947343fbc..f8bb43b33caa 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==52b4510cde55408bb1d7b1e96d380f9cafdb4fd6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 3da85ba50f6f..660e546b3b83 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.1
+bitarray==2.3.2
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index ea4e5cb46d4c..0464818e82cf 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -60,7 +60,7 @@ iputils-ping==3:20180629-2+deb10u2
 isc-dhcp-client==4.4.1-2+deb10u1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.16.0
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.17.0
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
@@ -163,7 +163,7 @@ libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u6
+libssl1.1==1.1.1d-0+deb10u7
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libsystemd0==247.3-6~bpo10+1
@@ -186,8 +186,8 @@ lsb-base==10.2019051400
 lsb-release==10.2019051400
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.16.0-105
-mft-oem==4.16.0-105
+mft==4.17.0-106
+mft-oem==4.17.0-106
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
@@ -203,7 +203,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u6
+openssl==1.1.1d-0+deb10u7
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3fadb95eff3c..53988f2d923a 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2021.5.30
 cffi==1.14.6
 charset-normalizer==2.0.4
 click==7.0
-cryptography==3.4.7
+cryptography==3.4.8
 docker==4.3.1
 idna==3.2
 ijson==2.6.1
@@ -31,7 +31,7 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.21
+regex==2021.8.28
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0

From b5d98c82b1dd696e456cc55a94a0f1a7b3f5f700 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 31 Aug 2021 17:28:48 +0800
Subject: [PATCH 0760/1674] [submodule] [202012] Update submodule pointer for
 sonic-utilities (#8627)

7041400 [config reload] Call systemctl reset-failed for snmp,telemetry,mgmt-framework services (#1773) (#1786)
399d370 Fix logic in RIF counters print (#1732)
8329544 [vnet_route_check] don't hardcode prefix length of /24 (#1756)
193b028 [neighbor-advertiser] delete the tunnel maps appropriately (#1663)
2c82bcf [neighbor_advertiser] Use existing tunnel if present for creating tunnel mappings (#1589)
8e22960 [202012][Config] Update config command of Kdump. (#1778)
be3e5c6 [show][config] cli refactor for muxcable with abstract class implementation from vendors (#1722) (#1782)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index a72e4073fadf..70414008679e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit a72e4073fadf4c27ba2dca3a825ad64e48ddf6f2
+Subproject commit 70414008679e347596a10532427b383fae72be81

From 96f2eaaadb09d66a643c66c5299d7ae786391d5f Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Mon, 30 Aug 2021 15:26:56 -0700
Subject: [PATCH 0761/1674] [Arista] Fix flash size computation for Lodoga
 (#8622)

The Lodoga platform also matched crow which was hardcoding the flash
size to 3700. This change enables autodetect on Clearlake which in turns
allows autodetect for Lodoga.

The threshold was bumped from 3700 to 4000 because size computation can
differ slightly and report slightly above 3700.
---
 files/Aboot/boot0.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 8f0a0bb9a74c..281cfc7fa71f 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -477,7 +477,6 @@ write_platform_specific_cmdline() {
     if [ "$platform" = "crow" ]; then
         # Assuming sid=Clearlake
         aboot_machine=arista_7050_qx32s
-        flash_size=3700
         cmdline_add modprobe.blacklist=radeon,sp5100_tco
     fi
     if [ "$sid" = "Upperlake" ] || [ "$sid" = "UpperlakeES" ]; then
@@ -590,7 +589,7 @@ write_platform_specific_cmdline() {
 
     if [ $flash_size -ge 28000 ]; then
         varlog_size=4096
-    elif [ $flash_size -gt 3700 ]; then
+    elif [ $flash_size -gt 4000 ]; then
         varlog_size=400
     else
         varlog_size=256

From c8cdd6a7d3237fa59e2b2b4f2dac0347a8a52cde Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:37:03 -0700
Subject: [PATCH 0762/1674] DellEMC: Z9332f fix LED issue (#8639)

---
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm             | 1 +
 .../th3-z9332f-16x400G-64x100G.config.bcm                        | 1 +
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index 827cf9c754e1..c1101797b021 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -520,3 +520,4 @@ serdes_lane_config_media_type_24=copper
 
 sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
+led_fw_path=/usr/share/sonic/hwsku/
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index d207912c5ef1..17f2d565c26a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -582,3 +582,4 @@ serdes_lane_config_media_type_24=copper
 
 sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
+led_fw_path=/usr/share/sonic/hwsku/
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index cbccb223e98a..9f33e13cc225 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -522,3 +522,4 @@ serdes_lane_config_media_type_24=copper
 
 sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
 sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
+led_fw_path=/usr/share/sonic/hwsku/

From 08445d5b3a50816c65448eb8d140f002c28f7baf Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Tue, 31 Aug 2021 17:15:03 -0700
Subject: [PATCH 0763/1674] [7050] define hwsku.json for
 Arista-7050QX-32S-S4Q31 to skip SFP checks for first 4 ports (#8624)

Why I did it
The first 4 ports on this dut are breakout ports. They might not always be connected in lab. Mark them as 'RJ45' to skip the SFP check since they are by default disabled.

How to verify it
run platform test_reboot.py

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Arista-7050QX-32S-S4Q31/hwsku.json        | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
new file mode 100644
index 000000000000..a407ccd84052
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
@@ -0,0 +1,144 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "RJ45"
+        },
+        "Ethernet1": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "RJ45"
+        },
+        "Ethernet2": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "RJ45"
+        },
+        "Ethernet3": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet52": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet60": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet68": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet76": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet84": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet92": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet100": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet108": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet116": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        },
+        "Ethernet124": {
+            "default_brkout_mode": "1x40G",
+            "port_type": "QSFP+"
+        }
+    }
+}

From d74e927a8d7dbf264394d08835c5e32983aeeff3 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Tue, 31 Aug 2021 19:34:38 -0700
Subject: [PATCH 0764/1674] [202012][Arista] Update platform library submodules
 (#8630)

---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 418628537d75..dd7c022792ef 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 418628537d756b22199945170d5200798f6f5b65
+Subproject commit dd7c022792efe637732ceb3f19382eafe080348a
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 418628537d75..dd7c022792ef 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 418628537d756b22199945170d5200798f6f5b65
+Subproject commit dd7c022792efe637732ceb3f19382eafe080348a

From f3cb2f750fcf0f2cad15a7372924d1acea8d7ddf Mon Sep 17 00:00:00 2001
From: richardyu <richardyu81@yahoo.com>
Date: Thu, 2 Sep 2021 01:01:42 -0700
Subject: [PATCH 0765/1674] [SAIServer] sai server reads config from hwsku
 folder (#8625)

To enable saiserver docker on different platforms, it needs different configuration files. make the saiserver docker mount them in hwsku folder.

Co-authored-by: Ubuntu <richardyu@richardyu-ubuntu-vm0.trsxrdzozv2e1czsze2t05vqzh.ix.internal.cloudapp.net>
---
 .../docker-saiserver-brcm/Dockerfile.j2       |  2 --
 .../docker-saiserver-brcm/portmap.ini         | 33 -------------------
 .../docker-saiserver-brcm/profile.ini         |  1 -
 .../docker-saiserver-brcm/supervisord.conf    |  2 +-
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 platform/broadcom/docker-saiserver-brcm/portmap.ini
 delete mode 100644 platform/broadcom/docker-saiserver-brcm/profile.ini

diff --git a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
index 3fbbceb6989f..2fe765febcf3 100644
--- a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
@@ -28,8 +28,6 @@ RUN apt-get install -yf kmod
 COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"]
 RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd
 
-COPY ["profile.ini", "portmap.ini", "/etc/sai/"]
-
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ## Clean up
diff --git a/platform/broadcom/docker-saiserver-brcm/portmap.ini b/platform/broadcom/docker-saiserver-brcm/portmap.ini
deleted file mode 100644
index 7161416e4d4c..000000000000
--- a/platform/broadcom/docker-saiserver-brcm/portmap.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# alias         lanes
-Ethernet0       29,30,31,32
-Ethernet4       25,26,27,28
-Ethernet8       37,38,39,40
-Ethernet12      33,34,35,36
-Ethernet16      41,42,43,44
-Ethernet20      45,46,47,48
-Ethernet24      5,6,7,8
-Ethernet28      1,2,3,4
-Ethernet32      9,10,11,12
-Ethernet36      13,14,15,16
-Ethernet40      21,22,23,24
-Ethernet44      17,18,19,20
-Ethernet48      49,50,51,52
-Ethernet52      53,54,55,56
-Ethernet56      61,62,63,64
-Ethernet60      57,58,59,60
-Ethernet64      65,66,67,68
-Ethernet68      69,70,71,72
-Ethernet72      77,78,79,80
-Ethernet76      73,74,75,76
-Ethernet80      105,106,107,108
-Ethernet84      109,110,111,112
-Ethernet88      117,118,119,120
-Ethernet92      113,114,115,116
-Ethernet96      121,122,123,124
-Ethernet100     125,126,127,128
-Ethernet104     85,86,87,88
-Ethernet108     81,82,83,84
-Ethernet112     89,90,91,92
-Ethernet116     93,94,95,96
-Ethernet120     97,98,99,100
-Ethernet124     101,102,103,104
diff --git a/platform/broadcom/docker-saiserver-brcm/profile.ini b/platform/broadcom/docker-saiserver-brcm/profile.ini
deleted file mode 100644
index b64d997fb451..000000000000
--- a/platform/broadcom/docker-saiserver-brcm/profile.ini
+++ /dev/null
@@ -1 +0,0 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td2-s6000-32x40G.config.bcm
diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
index e90e41645042..ccb107b3d1f8 100644
--- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf
+++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
@@ -20,7 +20,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
-command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
+command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
 priority=3
 autostart=false
 autorestart=false

From 4d2acead7ce66254ff6470f9c7f853f25deb6d14 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 2 Sep 2021 01:23:37 -0700
Subject: [PATCH 0766/1674] [ci]: increase the t0 kvm test limit to 5 hours

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e21035f0fa9d..a61f721895d4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -104,7 +104,7 @@ stages:
   - job:
     pool: sonictest
     displayName: "kvmtest-t0"
-    timeoutInMinutes: 240
+    timeoutInMinutes: 300
 
     steps:
     - template: .azure-pipelines/run-test-template.yml

From a4978d61c07493d642162cd285ac2d5db9edaa53 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Thu, 2 Sep 2021 22:00:18 +0530
Subject: [PATCH 0767/1674] [Marvell] Updated SAI version(1.7.1-2) of armhf
 platform. (#8666)

Fixed Marvell SAI issues.
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index e49050ac2acf..ab1bd9f21256 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-1
+export MRVL_SAI_VERSION = 1.7.1-2
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From c0f9bb972094cb56be93110a2630cf2cb6e7a94a Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Fri, 3 Sep 2021 10:59:18 +0300
Subject: [PATCH 0768/1674] [202012] [Mellanox] Update SDK\FW to version
 4.4.3326\2008.3326 (#8602)

- Why I did it
Update SDK\FW version to 4.4.3326\2008.3326. This version contains:

New Features:
1. Add support for Fast Boot for SN3800

Bug Fixing:
1. In some cases, when the total number of allocations exceeds the resource limit, an error can occur due to incorrect resource release procedure. This issue is most likely to affect the following resources: flow counters, ACL actions, PBS, WJH filter, Tunnels, ECMP containers, MC (L2 &L3)

2. On Spectrum systems, when using Async Router API with IPV6, an error message in the log regarding failing to remove ECMP container may show up. This error is not functional and can be safely ignored.

3. On Spectrum-2 systems and above, when using warm boot, setting max_bridge_num to a value greater than 1968 will cause an error and potential crash.

4. Some Molex cables do not support speed after reboot

- How I did it
Update submodule and .mk files

- How to verify it
Verified by running regression tests that includes complete sonic-mgmt tests supported

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0b8768b4755f..6b9790374d40 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3224
+MLNX_SPC_FW_VERSION = 13.2008.3326
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3224
+MLNX_SPC2_FW_VERSION = 29.2008.3326
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3224
+MLNX_SPC3_FW_VERSION = 30.2008.3326
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 3a0e3a26de2e..726bef49c07a 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 3a0e3a26de2e1384b7ed216dc4cd842b36655e27
+Subproject commit 726bef49c07a1a0d7c52d8e3062e95ec6efa736f
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 67f8ab3fced9..3c5a46a76767 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.3222
+MLNX_SDK_VERSION = 4.4.3326
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From ab07ba29d596c08ac40c4dc17b07fe4a1a70a308 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Sat, 4 Sep 2021 00:43:30 +0300
Subject: [PATCH 0769/1674] [submodule] [202012] Update sonic-swss pointer
 (#8676)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* d240291 Update port_rates & rif_rates lua scripts to convert poll_interval to MS (#1855)
* a71a5d3 [acl mirror action] Mirror session ref count fix at acl rule attachment (#1761)
* 197f427 Fix vs test failure in test_buffer_traditional (#1881)
* 8471f42 Revert "[debugcounterorch] check if counter type is supported before querying… (#1789)" (#1884)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index d29a49a3579f..d240291fd113 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit d29a49a3579f57d607a7722e7b5a508c3db1b950
+Subproject commit d240291fd1134e6045584ad26c2fbf9fc3aaa43e

From b82abd8dff02f926e3dc886867730bbf829f374e Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Mon, 6 Sep 2021 12:49:40 -0700
Subject: [PATCH 0770/1674] [202012][submodule] update sonic-platform-common
 and sonic-platform-daemons (#8607)

This PR updates the following commits in sonic-platform-common
9d2e7d5 Add y-cable driver for simulated mux (#213)
e3e8f09 [Y-Cable][Broadcom] Broadcom implementation of YCable class which inherits from YCableBase required for Y-Cable API's in sonic-platform-daemons (#208)

This PR updates the following commits in sonic-platform-daemons

ebc4f3f [Y-Cable] create unknown entries for mux_cable when there is a cable present but module definition is not present/invalid module
b10c417 [xcvrd] initial support for integrating vendor specfic class objects for calling Y-Cable API's inside xcvrd (#197) (#213)
f3fc1ea [y-cable] fix for logging the xcvrd metrics before writing the state to the State-DB (#208)


Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index ef4b3ec7845d..9d2e7d5f8f6f 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit ef4b3ec7845d57d410c3981c8804522cb79a9f1c
+Subproject commit 9d2e7d5f8f6f3f90000539b4746e7adc72d01a67
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index c90bb2987707..ebc4f3fafb56 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit c90bb2987707c20bbbcb175bcc6b45e8114e883d
+Subproject commit ebc4f3fafb56419dcae2570851ce3a9808b6364a

From 32a58e575474e5f71e01ca33c1376ff92b5a07f9 Mon Sep 17 00:00:00 2001
From: carl-nokia <63672637+carl-nokia@users.noreply.github.com>
Date: Fri, 20 Aug 2021 01:31:18 -0400
Subject: [PATCH 0771/1674] [Nokia ixs7215] sfp get_name test case fix (#8507)

Account for sfputil_helper indexing being 0 based

Co-authored-by: Carl Keene <keene@nokia.com>
---
 .../sonic-platform-nokia/7215/sonic_platform/sfp.py          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index ead408b41b8b..308e8b29a60b 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -799,6 +799,9 @@ def tx_disable(self, tx_disable):
         Returns: 
             A boolean, True if tx_disable is set successfully, False if not
         """
+        if self.sfp_type == COPPER_TYPE:
+            return False
+        
         if smbus_present == 0:  # if called from sfputil outside of pmon
             cmdstatus, register = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x5')
             if cmdstatus:
@@ -888,7 +891,7 @@ def get_name(self):
         sfputil_helper = SfpUtilHelper()
         sfputil_helper.read_porttab_mappings(
             self.__get_path_to_port_config_file())
-        name = sfputil_helper.logical[self.index] or "Unknown"
+        name = sfputil_helper.logical[self.index-1] or "Unknown"
         return name
 
     def get_presence(self):

From 84b5659372eeb8562878972aad1ecac33a23cc4c Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Mon, 6 Sep 2021 22:12:59 -0700
Subject: [PATCH 0772/1674] [202012] BRCM SAI 4.3.5.1-2 Fix BRCM SAI regression
 due to ACL Egress Mirroring Action capability (#8682)

---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index a30d4ca3e654..7a365cfa93a7 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 45942f41b3bc..1f46473278a8 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 70b9ea5409817723c2493ed559fe339650c36156 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Wed, 8 Sep 2021 19:59:50 +0300
Subject: [PATCH 0773/1674] [Mellanox] Advance hw-mgmt to V.7.0010.2346.
 (#8667)

Commits on Sep 01, 2021
hw-mgmt: attributes: Add PSU power sensor attributes d8fce39

Commits on Sep 02, 2021
Remove MFT package flint tool from hw-management dump generation. 53d06b2
hw-mgmt: debug: Add timeout to generate-dump.sh b661fa3

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index fedae3bfe21c..b661fa329e2d 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit fedae3bfe21c98fd61e6d1252ee0a67516bcc553
+Subproject commit b661fa329e2dff4fd6c22da89d009169e1008d99

From 75cc701e5d6431e2934d6a10436d1053fc9748fd Mon Sep 17 00:00:00 2001
From: Lijitha ck <68853062+lkunjumon@users.noreply.github.com>
Date: Mon, 21 Jun 2021 12:25:02 +0530
Subject: [PATCH 0774/1674] Support for updating tmpfs size according to Image
 size (#7484)

#### Why I did it
while sonic upgrade, Image will be extracted to tmpfs for installation so tmpfs size should be larger than image size. Image installation will fail if image size is larger than tmpfs size.

we are facing below error while installing debug image with size greater than tmpfs which is 1.5g in marvell armhf platform.

sonic-installer install <url>
New image will be installed, continue? [y/N]: y
Downloading image...
...99%, 1744 MB, 708 KB/s, 0 seconds left...
Installing image SONiC-OS-202012.0-dirty-20210311.224845 and setting it as default...
Command: bash /tmp/sonic_image
tar: installer/fs.zip: Wrote only 7680 of 10240 bytes
tar: installer/onie-image-arm64.conf: Cannot write: No space left on device
tar: Exiting with failure status due to previous errors
Verifying image checksum ... OK.
Preparing image archive ...

#### How I did it
compare downloaded image size with tmpfs size, if size less than image size update the tmpfs size according to image size.

#### How to verify it
Install an Image with size larger than tmpfs. we verified by installing debug image with size 1.9gb which is larger than tmpfs size 1.5gb.
---
 installer/sharch_body.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/installer/sharch_body.sh b/installer/sharch_body.sh
index d22fe26b6998..e6289371cd58 100644
--- a/installer/sharch_body.sh
+++ b/installer/sharch_body.sh
@@ -25,6 +25,7 @@ fi
 
 echo " OK."
 
+image_size_in_kb=$((($(sed -e '1,/^exit_marker$/d' "$0"  | tar --to-stdout -xf - | wc -c) + 1023 ) / 1024))
 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
@@ -32,6 +33,15 @@ archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
     mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size_in_kb=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    #checking extra 100KB space in tmp_dir, after image extraction
+    padding=102400
+    if [ "$mount_size_in_kb" -le "$((image_size_in_kb + padding))" ]; then
+        image_size_in_mb=$(((image_size_in_kb + 1023) / 1024))
+        #Adding extra 32MB free space for image extraction.
+        mount_size_in_mb=$((((image_size_in_mb + 31) / 32) * 32))
+        mount -o remount,size="${mount_size_in_mb}M" -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    fi
 fi
 cd $tmp_dir
 echo -n "Preparing image archive ..."

From 954f0ded92fa401155510087708596da9f690069 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 8 Sep 2021 17:59:03 -0700
Subject: [PATCH 0775/1674] DellEMC: Z9332f fix reboot cause issue (#8640)

Why I did it
Power cycle test case fails for Z9332f in sonic-mgmt framework(#8605).

How I did it
Modified the platform API to return expected strings.

How to verify it
Power cycle the device and verify the reboot reason.
Run sonic-mgmt test_reboot script.
---
 .../z9332f/sonic_platform/chassis.py                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 41078bb1eec9..1fe5e96fc7c8 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -110,11 +110,11 @@ class Chassis(ChassisBase):
             34: 2,
             }
 
-    reboot_reason_dict = { 0x11: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Power on reset"),
+    reboot_reason_dict = { 0x11: (ChassisBase.REBOOT_CAUSE_POWER_LOSS, "Power on reset"),
                            0x22: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Soft-set CPU warm reset"),
                            0x33: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Soft-set CPU cold reset"),
                            0x66: (ChassisBase.REBOOT_CAUSE_WATCHDOG, "GPIO watchdog reset"),
-                           0x77: (ChassisBase.REBOOT_CAUSE_HARDWARE_OTHER, "Power cycle reset"),
+                           0x77: (ChassisBase.REBOOT_CAUSE_POWER_LOSS, "Power cycle reset"),
                            0x88: (ChassisBase.REBOOT_CAUSE_WATCHDOG, "CPLD watchdog reset")
                         }
 

From bec06910d5630f65bda054f82e200b2ce4e051c4 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Sat, 11 Sep 2021 04:18:24 -0400
Subject: [PATCH 0776/1674] [Nokia ixs7215] Miscellaneous platform API fixes
 (#8707)

* [Nokia ixs7215] Miscellaneous platform API fixes

This commit delivers the following fixes for the Nokia ixs7215 platform

- Fix bug in a fan API error path
- Add support for setting the fan drawer led
- Add support for getting/setting the front panel PSU status led
- Add support for getting the min/max observed temperature value

* [Nokia ixs7215] code review changes: temperature min/max values
---
 .../7215/sonic_platform/fan.py                | 12 ++++-------
 .../7215/sonic_platform/fan_drawer.py         |  2 +-
 .../7215/sonic_platform/psu.py                | 20 +++++++++++++++++++
 .../7215/sonic_platform/thermal.py            | 15 ++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
index 14c00c763dde..b8fd335930d6 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py
@@ -336,10 +336,10 @@ def get_status_led(self):
         """
 
         if self.is_psu_fan:
-            return False
+            return None
 
         if smbus_present == 0:
-            return False
+            return None
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
@@ -368,7 +368,7 @@ def get_target_speed(self):
             (off) to 100 (full speed)
         """
         speed = 0
-     
+
         fan_duty = self._get_i2c_register(self.set_fan_speed_reg)
         if (fan_duty != 'ERR'):
             dutyspeed = int(fan_duty)
@@ -380,9 +380,5 @@ def get_target_speed(self):
                 speed = 50
             elif dutyspeed == 255:
                 speed = 100
- 
-        return speed
-         
-
 
-    
+        return speed
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
index 35b663cbb786..e42d80cdbd52 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
@@ -54,7 +54,7 @@ def get_direction(self):
         return 'intake'
 
     def set_status_led(self, color):
-        return True
+        return self._fan_list[0].set_status_led(color)
 
     def get_status_led(self, color):
         return self._fan_list[0].get_status_led()
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
index 6a338f5a166e..90025db7ffbf 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
@@ -234,3 +234,23 @@ def set_status_led(self, color):
         # The firmware running in the PSU controls the LED
         # and the PSU LED state cannot be changed from CPU.
         return False
+
+    def get_status_master_led(self):
+        """
+        Gets the state of the front panel PSU status LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings.
+        """
+        return self._psu_master_led_color
+
+    def set_status_master_led(self, color):
+        """
+        Sets the state of the front panel PSU status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if
+                  not
+        """
+        self._psu_master_led_color = color
+        return True
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
index 528a6e49d924..20fdec61f38e 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
@@ -33,9 +33,12 @@ class Thermal(ThermalBase):
                     "CPU Core")
 
     def __init__(self, thermal_index):
+        ThermalBase.__init__(self)
         self.index = thermal_index + 1
         self.is_psu_thermal = False
         self.dependency = None
+        self._minimum = None
+        self._maximum = None
         self.thermal_high_threshold_file = None
         # PCB temperature sensors
         if self.index < 3:
@@ -163,6 +166,10 @@ def get_temperature(self):
             self.thermal_temperature_file)
         if (thermal_temperature != 'ERR'):
             thermal_temperature = float(thermal_temperature) / 1000
+            if self._minimum is None or self._minimum > thermal_temperature:
+                self._minimum = thermal_temperature
+            if self._maximum is None or self._maximum < thermal_temperature:
+                self._maximum = thermal_temperature
         else:
             thermal_temperature = 0
 
@@ -226,6 +233,14 @@ def get_high_critical_threshold(self):
 
         return float("{:.3f}".format(thermal_high_crit_threshold))
 
+    def get_minimum_recorded(self):
+        self.get_temperature()
+        return self._minimum
+
+    def get_maximum_recorded(self):
+        self.get_temperature()
+        return self._maximum
+
     def get_position_in_parent(self):
         """
         Retrieves 1-based relative physical position in parent device

From 04fd5ed3ad4323219a8ea68a7cdc5161aaa36e83 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Sat, 11 Sep 2021 06:05:47 +0530
Subject: [PATCH 0777/1674] DellEMC Z9332f: Platform API - Remove EEPROM Vendor
 Extension decoding (#8716)

---
 .../z9332f/sonic_platform/eeprom.py                       | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
index eda04ae3bd8e..1dc66935508c 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
@@ -51,13 +51,7 @@ def __init__(self):
                 tlv = eeprom[tlv_index:tlv_index + 2
                              + eeprom[tlv_index + 1]]
                 code = "0x%02X" % tlv[0]
-
-                if tlv[0] == self._TLV_CODE_VENDOR_EXT:
-                    value = str((tlv[2] << 24) | (tlv[3] << 16) |
-                                (tlv[4] << 8) | tlv[5])
-                    value += tlv[6:6 + tlv[1]].decode('ascii')
-                else:
-                    name, value = self.decoder(None, tlv)
+                name, value = self.decoder(None, tlv)
 
                 self.eeprom_tlv_dict[code] = value
                 if eeprom[tlv_index] == self._TLV_CODE_CRC_32:

From c76f884af16365b937337550b802046ce99f4659 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Mon, 13 Sep 2021 07:36:43 -0700
Subject: [PATCH 0778/1674] [202012][Arista] Update platform library (#8709)

fix mac address format for get_system_eeprom_info
harden pmbus status reading for Clearlake
force loading PSUs on Cloverdale
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index dd7c022792ef..7304dbebdd80 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit dd7c022792efe637732ceb3f19382eafe080348a
+Subproject commit 7304dbebdd80d7278abc6136e1df73190d405483
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index dd7c022792ef..7304dbebdd80 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit dd7c022792efe637732ceb3f19382eafe080348a
+Subproject commit 7304dbebdd80d7278abc6136e1df73190d405483

From 9e59b5fa13311f8921f41a318facef6b713dff97 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Tue, 14 Sep 2021 06:49:23 +0300
Subject: [PATCH 0779/1674] [submodule][202012] Update sonic-sairedis pointer
 (#8675)

* 0323d5e noaOrMlnx Fix flex counters logic of converting poll interval to seconds from MS (#878)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index c31d9c0879b8..0323d5ee0b20 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit c31d9c0879b8d41bae8c971d68f9bd213f30e682
+Subproject commit 0323d5ee0b20f735b80e3406fdd52b3d818fa91d

From 5bf81f8f777f47b9fb40cc61a4435a95d86a937b Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Tue, 14 Sep 2021 06:50:30 +0300
Subject: [PATCH 0780/1674] [submodule] [202012] Update sonic-utilities pointer
 (#8677)

* d03ba4f [202012] [portstat, intfstat] added rates and utilization  (#1812)
* 499ad3f [config reload] Fix config reload failure due to sonic.target job cancellation (#1814)
* 96d658c [202012][sonic installer] Add swap setup support (#1815)
* a9c6970 platform pre-check for reboot in 202012 branch (#1788)
* 0e0478b Unify the number format in the ourput of portstat and pfcstat in all cases (#1795)
* 2d1e00e [ecnconfig] Fix exception seen during display and add unit tests (#1784) (#1789)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 70414008679e..d03ba4faca53 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 70414008679e347596a10532427b383fae72be81
+Subproject commit d03ba4faca530bfb1898afee8cc5385b548d0033

From 67e38abe47f888ed8c31bcee82df8f7622655c6d Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 13 Sep 2021 23:29:33 -0700
Subject: [PATCH 0781/1674] [host-services] Add dependency of
 PYTHON3_SWSSCOMMON (#8651)

#### Why I did it
This is a partial backport of https://github.com/Azure/sonic-buildimage/pull/8034
In order to unblock cherry-pick other commits of test code from master to 202012.
---
 rules/sonic-host-services.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/sonic-host-services.mk b/rules/sonic-host-services.mk
index 022c237ee950..87463d2ba8cc 100644
--- a/rules/sonic-host-services.mk
+++ b/rules/sonic-host-services.mk
@@ -5,4 +5,6 @@ $(SONIC_HOST_SERVICES_PY3)_SRC_PATH = $(SRC_PATH)/sonic-host-services
 $(SONIC_HOST_SERVICES_PY3)_PYTHON_VERSION = 3
 $(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
                                       $(SWSSSDK_PY3)
+$(SONIC_HOST_SERVICES_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
+                                          $(PYTHON3_SWSSCOMMON)
 SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3)

From 4bdd31565fc726af12df79f52aeb72de2d5616e7 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 13 Sep 2021 23:59:08 -0700
Subject: [PATCH 0782/1674] Caclmgrd: port two commits from master to 202012
 branch (#8673)

Fix #8672

add two missing commits in caclmgrd: monitor state_db to update dhcp acl #8222 when porting to 202012 branch
---
 src/sonic-host-services/scripts/caclmgrd | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 803cc748652b..eccacc31b80b 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -378,27 +378,27 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 execute = 1
 
             if execute == 1:
-                self.run_commands([update_cmd])
+                subprocess.call(update_cmd, shell=True)
                 self.log_info("Update DHCP chain: {}".format(update_cmd))
 
     def update_dhcp_acl(self, key, op, data):
-        if "status" not in data:
+        if "state" not in data:
             self.log_warning("Unexpected update in MUX_CABLE_TABLE")
             return
 
         intf = key
-        status = data["status"]
+        state = data["state"]
 
-        if status == "active":
+        if state == "active":
             self.update_dhcp_chain("delete", intf)
-        elif status == "standby":
+        elif state == "standby":
             self.update_dhcp_chain("insert", intf)
-        elif status == "unknown":
+        elif state == "unknown":
             self.update_dhcp_chain("delete", intf)
-        elif status == "error":
-            self.log_warning("Cable status shows error")
+        elif state == "error":
+            self.log_warning("Cable state shows error")
         else:
-            self.log_warning("Unexpected cable status")
+            self.log_warning("Unexpected cable state")
 
     def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
         """

From e8b8012818791f157ba0b07c3f97f23a4a740ab9 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Mon, 13 Sep 2021 07:37:46 -0700
Subject: [PATCH 0783/1674] [202012][fstrim] delay fstrim timer after
 sonic.target (#8737)

Why I did it
fstrim has dependency on pmon docker.

How I did it
start fstrim timer after sonic.target.

How to verify it
local test and PR test.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 files/image_config/fstrim/fstrim.timer | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/image_config/fstrim/fstrim.timer b/files/image_config/fstrim/fstrim.timer
index c6142dd94826..3ffb2332b7a6 100644
--- a/files/image_config/fstrim/fstrim.timer
+++ b/files/image_config/fstrim/fstrim.timer
@@ -1,6 +1,7 @@
 [Unit]
 Description=Discard unused blocks once a week
 Documentation=man:fstrim
+After=sonic.target
 
 [Timer]
 OnCalendar=weekly

From 9c5917d8dd71c30eac36751c41b8d0ab2623d9c8 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Mon, 13 Sep 2021 09:10:21 -0700
Subject: [PATCH 0784/1674] Removing execute permission from copp config file
 (#8680)

*Removed execute permissions from the systemd copp-config.service file.
Without this we will get a warning: "Configuration file /lib/systemd/system/copp-config.service is marked executable. Please remove executable permission bits. Proceeding anyway."
---
 files/image_config/copp/copp-config.service | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 files/image_config/copp/copp-config.service

diff --git a/files/image_config/copp/copp-config.service b/files/image_config/copp/copp-config.service
old mode 100755
new mode 100644

From ad8a332b782e68fff14598ba3537a06ab19c9b75 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Tue, 14 Sep 2021 18:16:18 -0700
Subject: [PATCH 0785/1674] [202012] Replace swsssdk with swsscommon in
 sonic-host-services and update submodule sonic-swss-common (#8513)

#### Why I did it
Backport https://github.com/Azure/sonic-buildimage/pull/8034 to 202012 branch

sonic-swss-common submodule updating includes below commits
```
a6b98da 2021-04-29 | Add support for config_db subscribe and unsubscribe python apis (#481) [arlakshm]
2506ca0 2021-08-22 | [ci] Fix azure pipeline DownloadPipelineArtifact source branch (#514) [Qi Luo]
```
---
 src/sonic-host-services/scripts/caclmgrd                   | 7 +++----
 src/sonic-host-services/scripts/hostcfgd                   | 2 +-
 src/sonic-host-services/scripts/procdockerstatsd           | 4 ++--
 src/sonic-host-services/scripts/process-reboot-cause       | 4 ++--
 src/sonic-host-services/setup.py                           | 1 -
 .../tests/determine-reboot-cause_test.py                   | 4 ++--
 src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py    | 4 ++--
 src/sonic-host-services/tests/procdockerstatsd_test.py     | 4 ++--
 src/sonic-swss-common                                      | 2 +-
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index eccacc31b80b..4df7f51833c2 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -20,7 +20,6 @@ try:
 
     from sonic_py_common import daemon_base, device_info
     from swsscommon import swsscommon
-    from swsssdk import SonicDBConfig, ConfigDBConnector
 except ImportError as err:
     raise ImportError("%s - required module not found" % str(err))
 
@@ -103,10 +102,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         self.lock[DEFAULT_NAMESPACE] = threading.Lock()
         self.num_changes[DEFAULT_NAMESPACE] = 0
 
-        SonicDBConfig.load_sonic_global_db_config()
+        swsscommon.SonicDBConfig.load_sonic_global_db_config()
         self.config_db_map = {}
         self.iptables_cmd_ns_prefix = {}
-        self.config_db_map[DEFAULT_NAMESPACE] = ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
+        self.config_db_map[DEFAULT_NAMESPACE] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
         self.config_db_map[DEFAULT_NAMESPACE].connect()
         self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE] = ""
         self.namespace_mgmt_ip = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE], DEFAULT_NAMESPACE)
@@ -124,7 +123,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             self.lock[front_asic_namespace] = threading.Lock()
             self.num_changes[front_asic_namespace] = 0
 
-            self.config_db_map[front_asic_namespace] = ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
+            self.config_db_map[front_asic_namespace] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
             self.config_db_map[front_asic_namespace].connect()
             self.iptables_cmd_ns_prefix[front_asic_namespace] = "ip netns exec " + front_asic_namespace + " "
             self.namespace_docker_mgmt_ip[front_asic_namespace] = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[front_asic_namespace],
diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 231ba63b0ecf..06506f483eb9 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -9,7 +9,7 @@ import syslog
 
 import jinja2
 from sonic_py_common import device_info
-from swsssdk import ConfigDBConnector
+from swsscommon.swsscommon import ConfigDBConnector
 
 # FILE
 PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic"
diff --git a/src/sonic-host-services/scripts/procdockerstatsd b/src/sonic-host-services/scripts/procdockerstatsd
index d0b4c8fbf2ac..da6fa433e325 100755
--- a/src/sonic-host-services/scripts/procdockerstatsd
+++ b/src/sonic-host-services/scripts/procdockerstatsd
@@ -12,7 +12,7 @@ import time
 from datetime import datetime
 
 from sonic_py_common import daemon_base
-import swsssdk
+from swsscommon import swsscommon
 
 VERSION = '1.0'
 
@@ -25,7 +25,7 @@ class ProcDockerStats(daemon_base.DaemonBase):
 
     def __init__(self, log_identifier):
         super(ProcDockerStats, self).__init__(log_identifier)
-        self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
+        self.state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
         self.state_db.connect("STATE_DB")
 
     def run_command(self, cmd):
diff --git a/src/sonic-host-services/scripts/process-reboot-cause b/src/sonic-host-services/scripts/process-reboot-cause
index 15d19defd1b7..df43a131faa9 100755
--- a/src/sonic-host-services/scripts/process-reboot-cause
+++ b/src/sonic-host-services/scripts/process-reboot-cause
@@ -12,7 +12,7 @@ try:
     import pwd
     import sys
 
-    import swsssdk
+    from swsscommon import swsscommon
     from sonic_py_common import logger
 except ImportError as err:
     raise ImportError("%s - required module not found" % str(err))
@@ -39,7 +39,7 @@ sonic_logger = logger.Logger(SYSLOG_IDENTIFIER)
 # ============================= Functions =============================
 def read_reboot_cause_files_and_save_state_db():
     # Connect State DB
-    state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
+    state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
     state_db.connect(state_db.STATE_DB)
 
     # Sort the previous reboot cause files by creation time
diff --git a/src/sonic-host-services/setup.py b/src/sonic-host-services/setup.py
index d610af2ca506..98f5394997c4 100644
--- a/src/sonic-host-services/setup.py
+++ b/src/sonic-host-services/setup.py
@@ -20,7 +20,6 @@
     install_requires = [
         'Jinja2>=2.10',
         'sonic-py-common',
-        'swsssdk>=2.0.1',
     ],
     setup_requires = [
         'pytest-runner',
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index d9e999a5ce27..7d22a512f8ee 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -2,7 +2,7 @@
 import os
 import pytest
 
-import swsssdk
+from swsscommon import swsscommon
 from sonic_py_common.general import load_module_from_source
 
 # TODO: Remove this if/else block once we no longer support Python 2
@@ -21,7 +21,7 @@
 
 from .mock_connector import MockConnector
 
-swsssdk.SonicV2Connector = MockConnector
+swsscommon.SonicV2Connector = MockConnector
 
 test_path = os.path.dirname(os.path.abspath(__file__))
 modules_path = os.path.dirname(test_path)
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index 8f369ef9939e..c6d73d42da74 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import swsssdk
+import swsscommon
 
 from parameterized import parameterized
 from sonic_py_common.general import load_module_from_source
@@ -10,7 +10,7 @@
 from .mock_configdb import MockConfigDb
 
 
-swsssdk.ConfigDBConnector = MockConfigDb
+swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
 test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 modules_path = os.path.dirname(test_path)
 scripts_path = os.path.join(modules_path, "scripts")
diff --git a/src/sonic-host-services/tests/procdockerstatsd_test.py b/src/sonic-host-services/tests/procdockerstatsd_test.py
index 65c5a738ca67..4db198be7d75 100644
--- a/src/sonic-host-services/tests/procdockerstatsd_test.py
+++ b/src/sonic-host-services/tests/procdockerstatsd_test.py
@@ -2,12 +2,12 @@
 import os
 import pytest
 
-import swsssdk
+from swsscommon import swsscommon
 from sonic_py_common.general import load_module_from_source
 
 from .mock_connector import MockConnector
 
-swsssdk.SonicV2Connector = MockConnector
+swsscommon.SonicV2Connector = MockConnector
 
 test_path = os.path.dirname(os.path.abspath(__file__))
 modules_path = os.path.dirname(test_path)
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 83d3351bc54f..a6b98daebdb5 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 83d3351bc54fabb3b87789af31d664c5a0c00d00
+Subproject commit a6b98daebdb5a77457747333f3832b27b669a037

From 792b42b96f8bdde9f697973a01ca1d5218c54cb4 Mon Sep 17 00:00:00 2001
From: Tony Titus <ttitus@innovium.com>
Date: Tue, 14 Sep 2021 19:17:01 -0700
Subject: [PATCH 0786/1674] Innovium: update 202012 build files (#8524)

*Update makefiles for Innovium 202012 support
---
 .../innovium/docker-syncd-invm-rpc/Dockerfile.j2    | 12 +++++++-----
 platform/innovium/docker-syncd-invm.mk              |  3 ---
 platform/innovium/docker-syncd-invm/Dockerfile.j2   |  4 ++--
 platform/innovium/docker-syncd-invm/start.sh        |  6 ++++++
 .../innovium/docker-syncd-invm/supervisord.conf     | 13 ++++++++++++-
 platform/innovium/invm-sai.mk                       |  2 +-
 platform/innovium/one-image.mk                      |  7 ++++++-
 7 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100755 platform/innovium/docker-syncd-invm/start.sh

diff --git a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 b/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
index eea52e3398b8..739fe55efdbe 100755
--- a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
+++ b/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
@@ -9,19 +9,20 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN dpkg -P syncd
+RUN apt-get purge -y syncd
 
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
     python-dev          \
-    libpython2.7        \
     libjansson4         \
+    libyaml-dev         \
     wget                \
     cmake               \
     libqt5core5a        \
@@ -43,9 +44,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/innovium/docker-syncd-invm.mk b/platform/innovium/docker-syncd-invm.mk
index 52c11b90911d..3ba35c5edb97 100755
--- a/platform/innovium/docker-syncd-invm.mk
+++ b/platform/innovium/docker-syncd-invm.mk
@@ -10,7 +10,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
-
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/innovium/docker-syncd-invm/Dockerfile.j2 b/platform/innovium/docker-syncd-invm/Dockerfile.j2
index ab4be823de66..0fa521c74719 100755
--- a/platform/innovium/docker-syncd-invm/Dockerfile.j2
+++ b/platform/innovium/docker-syncd-invm/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-stretch
+FROM docker-config-engine-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -16,8 +16,8 @@ debs/
 
 # Needed for Innovium Debug Shell
 RUN apt-get install -y net-tools
-RUN apt-get install -y libpython2.7
 RUN apt-get install -y libjansson4
+RUN apt-get install -y libyaml-dev
 
 RUN dpkg -i \
 {% for deb in docker_syncd_invm_debs.split(' ') -%}
diff --git a/platform/innovium/docker-syncd-invm/start.sh b/platform/innovium/docker-syncd-invm/start.sh
new file mode 100755
index 000000000000..32bdb12ebfc0
--- /dev/null
+++ b/platform/innovium/docker-syncd-invm/start.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+if [ -f /usr/bin/ivm_start.sh ];
+then
+   /usr/bin/ivm_start.sh
+fi
diff --git a/platform/innovium/docker-syncd-invm/supervisord.conf b/platform/innovium/docker-syncd-invm/supervisord.conf
index c12c31987f1b..e69546e42db6 100755
--- a/platform/innovium/docker-syncd-invm/supervisord.conf
+++ b/platform/innovium/docker-syncd-invm/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:dependent-startup]
-command=python2 -m supervisord_dependent_startup
+command=python3 -m supervisord_dependent_startup
 autostart=true
 autorestart=unexpected
 startretries=0
@@ -21,6 +21,17 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 
+[program:start]
+command=/usr/bin/start.sh
+priority=1
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
 [program:syncd]
 command=/usr/bin/syncd_start.sh
 priority=2
diff --git a/platform/innovium/invm-sai.mk b/platform/innovium/invm-sai.mk
index 25e490e44f83..240a2b0b5f5e 100755
--- a/platform/innovium/invm-sai.mk
+++ b/platform/innovium/invm-sai.mk
@@ -1,6 +1,6 @@
 # INVM SAI
 
-INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/master
+INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/202012
 
 INVM_LIBSAI = isai.deb
 INVM_HSAI   = saihdr.deb
diff --git a/platform/innovium/one-image.mk b/platform/innovium/one-image.mk
index c88ec5e65cdf..2a9843c48b53 100755
--- a/platform/innovium/one-image.mk
+++ b/platform/innovium/one-image.mk
@@ -7,5 +7,10 @@ $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(CEL_MIDSTONE_200I_PLATFORM_MODULE)
 $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELTA_PLATFORM_MODULE)
 $(SONIC_ONE_IMAGE)_INSTALLS += $(INVM_DRV)
-$(SONIC_ONE_IMAGE)_DOCKERS  += $(SONIC_INSTALL_DOCKER_IMAGES)
+ifeq ($(INSTALL_DEBUG_TOOLS),y)
+$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
+$(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
+else
+$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
+endif
 SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)

From e486a2f01145ae165774cd8dfbc3ec29997ed6a2 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Wed, 15 Sep 2021 02:52:06 -0700
Subject: [PATCH 0787/1674] [submodule]: update sonic-utilities (#8759)

* 2a8957d 2021-09-14 | [202012][sonic-utilities] CLI support for port auto negotiation (#1817) (HEAD, origin/202012) [vdahiya12]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d03ba4faca53..2a8957d56d57 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d03ba4faca530bfb1898afee8cc5385b548d0033
+Subproject commit 2a8957d56d57d34ad328a4c1160e88784544ceff

From ce95f26a404367edc15f94b51a10fae69b7f9d6f Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Wed, 15 Sep 2021 12:14:44 -0700
Subject: [PATCH 0788/1674] caclmgrd: add test code to check dhcp acl update
 (#8509)

- add test code to check dhcp acl update
- port #8359 (caclmgrd: add test code to check dhcp acl update) to 202012 branch
---
 src/sonic-host-services/pytest.ini            |   2 +-
 src/sonic-host-services/setup.py              |   1 +
 .../tests/caclmgrd/__init__.py                |   0
 .../tests/caclmgrd/caclmgrd_dhcp_test.py      |  54 ++++++
 .../tests/caclmgrd/test_dhcp_vectors.py       | 163 ++++++++++++++++++
 .../{hostcfgd => common}/mock_configdb.py     |   2 +-
 .../tests/hostcfgd/hostcfgd_test.py           |   2 +-
 7 files changed, 221 insertions(+), 3 deletions(-)
 create mode 100644 src/sonic-host-services/tests/caclmgrd/__init__.py
 create mode 100644 src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
 create mode 100644 src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
 rename src/sonic-host-services/tests/{hostcfgd => common}/mock_configdb.py (96%)

diff --git a/src/sonic-host-services/pytest.ini b/src/sonic-host-services/pytest.ini
index 5a1e1dc94381..781d242a3aa2 100644
--- a/src/sonic-host-services/pytest.ini
+++ b/src/sonic-host-services/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml --ignore=tests/hostcfgd/test_vectors.py
+addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml --ignore=tests/hostcfgd/test_vectors.py --ignore=tests/caclmgrd/test_dhcp_vectors.py
diff --git a/src/sonic-host-services/setup.py b/src/sonic-host-services/setup.py
index 98f5394997c4..6d3add214fb8 100644
--- a/src/sonic-host-services/setup.py
+++ b/src/sonic-host-services/setup.py
@@ -28,6 +28,7 @@
     tests_require = [
         'parameterized',
         'pytest',
+        'pyfakefs',
         'sonic-py-common'
     ],
     classifiers = [
diff --git a/src/sonic-host-services/tests/caclmgrd/__init__.py b/src/sonic-host-services/tests/caclmgrd/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
new file mode 100644
index 000000000000..4624f11bb97e
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
@@ -0,0 +1,54 @@
+import os
+import sys
+
+from swsscommon import swsscommon
+from parameterized import parameterized
+from sonic_py_common.general import load_module_from_source
+from unittest import TestCase, mock
+from pyfakefs.fake_filesystem_unittest import patchfs
+
+from .test_dhcp_vectors import CACLMGRD_DHCP_TEST_VECTOR
+from tests.common.mock_configdb import MockConfigDb
+
+
+DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
+
+
+swsscommon.ConfigDBConnector = MockConfigDb
+test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+modules_path = os.path.dirname(test_path)
+scripts_path = os.path.join(modules_path, "scripts")
+sys.path.insert(0, modules_path)
+caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
+caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
+
+
+class TestCaclmgrdDhcp(TestCase):
+    """
+        Test caclmgrd dhcp
+    """
+    @parameterized.expand(CACLMGRD_DHCP_TEST_VECTOR)
+    @patchfs
+    def test_caclmgrd_dhcp(self, test_name, test_data, fs):
+        if not os.path.exists(DBCONFIG_PATH):
+            fs.create_file(DBCONFIG_PATH) # fake database_config.json
+
+        MockConfigDb.set_config_db(test_data["config_db"])
+
+        with mock.patch("caclmgrd.subprocess") as mocked_subprocess:
+            popen_mock = mock.Mock()
+            popen_attrs = test_data["popen_attributes"]
+            popen_mock.configure_mock(**popen_attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
+            call_mock = mock.Mock()
+            call_rc = test_data["call_rc"]
+            mocked_subprocess.call.return_value = call_rc
+
+            caclmgrd_daemon = caclmgrd.ControlPlaneAclManager("caclmgrd")
+            mux_update = test_data["mux_update"]
+
+            for key,data in mux_update:
+                caclmgrd_daemon.update_dhcp_acl(key, '', data)
+
+            mocked_subprocess.call.assert_has_calls(test_data["expected_subprocess_calls"], any_order=False)
diff --git a/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
new file mode 100644
index 000000000000..6a58f761251b
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
@@ -0,0 +1,163 @@
+from unittest.mock import call
+
+"""
+    caclmgrd dhcp test vector
+"""
+CACLMGRD_DHCP_TEST_VECTOR = [
+    [
+        "Active_Present",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "active"}),
+                ("Ethernet8", {"state": "active"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --delete DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+                call("iptables --delete DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+        },
+    ],
+    [
+        "Active_Absent",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "active"}),
+                ("Ethernet8", {"state": "active"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+        },
+    ],
+    [
+        "Standby_Present",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "standby"}),
+                ("Ethernet8", {"state": "standby"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+        },
+    ],
+    [
+        "Standby_Absent",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "standby"}),
+                ("Ethernet8", {"state": "standby"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --insert DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+                call("iptables --insert DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+        },
+    ],
+    [
+        "Unknown_Present",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "unknown"}),
+                ("Ethernet8", {"state": "unknown"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --delete DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+                call("iptables --delete DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+        },
+    ],
+    [
+        "Uknown_Absent",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "unknown"}),
+                ("Ethernet8", {"state": "unknown"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet4 -j DROP", shell=True),
+                call("iptables --check DHCP -m physdev --physdev-in Ethernet8 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+        },
+    ],
+]
diff --git a/src/sonic-host-services/tests/hostcfgd/mock_configdb.py b/src/sonic-host-services/tests/common/mock_configdb.py
similarity index 96%
rename from src/sonic-host-services/tests/hostcfgd/mock_configdb.py
rename to src/sonic-host-services/tests/common/mock_configdb.py
index 1a5889bb5c63..0866c2f5abfe 100644
--- a/src/sonic-host-services/tests/hostcfgd/mock_configdb.py
+++ b/src/sonic-host-services/tests/common/mock_configdb.py
@@ -5,7 +5,7 @@ class MockConfigDb(object):
     STATE_DB = None
     CONFIG_DB = None
 
-    def __init__(self):
+    def __init__(self, **kwargs):
         pass
 
     @staticmethod
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index c6d73d42da74..52737df91c18 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -7,7 +7,7 @@
 from unittest import TestCase, mock
 
 from .test_vectors import HOSTCFGD_TEST_VECTOR
-from .mock_configdb import MockConfigDb
+from tests.common.mock_configdb import MockConfigDb
 
 
 swsscommon.swsscommon.ConfigDBConnector = MockConfigDb

From 16233ef3bb728df27dc696cd6ec86f427af61280 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 15 Sep 2021 20:52:41 -0700
Subject: [PATCH 0789/1674] [202012][sonic-utilities] Submodule update for
 sonic-utilities (#8769)

Included Commits
92d0744 [config reload] Removed job-mode for sonic.target restart (#1820)
c28fb22 [ci]: Support PR coverage (#1806)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 2a8957d56d57..92d07444c457 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 2a8957d56d57d34ad328a4c1160e88784544ceff
+Subproject commit 92d07444c457d04997599d7103306a4726ec0203

From a1751f628702af898f00cb028291eba7d349c195 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Thu, 16 Sep 2021 11:56:44 +0530
Subject: [PATCH 0790/1674] [Marvell] Update armhf SAI deb to 1.7.1-3 (#8762)

1) Enhancements for squashfs issue.
2) Fixed log levels.

Fix #8479
Fix #8698
Fix #8699

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index ab1bd9f21256..eae6225cb916 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-2
+export MRVL_SAI_VERSION = 1.7.1-3
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From ce000ea845480af43a28402d05d7f668aa47d1db Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 16 Sep 2021 00:09:26 -0700
Subject: [PATCH 0791/1674] [202012][submodule-update] sonic-utilities
 submodule update (#8778)

912d443 [sonic-utilities]remove db_migrator logic for autoneg enable/disable (#1823)
5323e9d [202012] Advertise ipv6 link local address (#1811)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 92d07444c457..912d443fb34f 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 92d07444c457d04997599d7103306a4726ec0203
+Subproject commit 912d443fb34f49a267c366460ee1cbb8467ee385

From d5149889fc42faae15633166752af23ff3b3723a Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Thu, 16 Sep 2021 16:31:30 -0400
Subject: [PATCH 0792/1674] Add Mellanox-SN4600C-D100C12S2 SKU (#8754)

*[mellanox] Add D100C12S2 SKU to 4600C
---
 .../buffers.json.j2                           |   1 +
 .../buffers_defaults_t0.j2                    | 104 ++++
 .../buffers_defaults_t1.j2                    | 104 ++++
 .../buffers_dynamic.json.j2                   |   1 +
 .../pg_profile_lookup.ini                     |   1 +
 .../port_config.ini                           | 115 ++++
 .../Mellanox-SN4600C-D100C12S2/qos.json.j2    |   1 +
 .../Mellanox-SN4600C-D100C12S2/sai.profile    |   4 +
 .../sai_4600c_100x50g_12x100g_2x10g.xml       | 525 ++++++++++++++++++
 .../pg_profile_lookup.ini                     |   5 +
 10 files changed, 861 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai_4600c_100x50g_12x100g_2x10g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers.json.j2
new file mode 120000
index 000000000000..117d740b0f5b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers.json.j2
@@ -0,0 +1 @@
+../ACS-MSN4600C/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..e5785e0744e7
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
@@ -0,0 +1,104 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '48228352' %}
+{% set ingress_lossless_xoff_size = '2287616' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '48228352' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..a8f95220924f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
@@ -0,0 +1,104 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '46315520' %}
+{% set ingress_lossless_xoff_size =  '4200448' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '46315520' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
+            {%- endif %}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {%- if dynamic_mode is not defined %}
+            "size": "{{ egress_lossy_pool_size }}",
+            {%- endif %}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_dynamic.json.j2
new file mode 120000
index 000000000000..8c4117c66214
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_dynamic.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/pg_profile_lookup.ini
new file mode 120000
index 000000000000..49745268908f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/port_config.ini
new file mode 100644
index 000000000000..48f92f311a94
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/port_config.ini
@@ -0,0 +1,115 @@
+# name         lanes              alias     index    speed
+Ethernet0      0,1                etp1a     1        50000
+Ethernet2      2,3                etp1b     1        50000
+Ethernet4      8,9                etp2a     2        50000
+Ethernet6      10,11              etp2b     2        50000
+Ethernet8      16,17              etp3a     3        50000
+Ethernet10     18,19              etp3b     3        50000
+Ethernet12     24,25              etp4a     4        50000
+Ethernet14     26,27              etp4b     4        50000
+Ethernet16     32,33              etp5a     5        50000
+Ethernet18     34,35              etp5b     5        50000
+Ethernet20     40,41              etp6a     6        50000
+Ethernet22     42,43              etp6b     6        50000
+Ethernet24     48,49              etp7a     7        50000
+Ethernet26     50,51              etp7b     7        50000
+Ethernet28     56,57              etp8a     8        50000
+Ethernet30     58,59              etp8b     8        50000
+Ethernet32     64,65              etp9a     9        50000
+Ethernet34     66,67              etp9b     9        50000
+Ethernet36     72,73              etp10a    10       50000
+Ethernet38     74,75              etp10b    10       50000
+Ethernet40     80,81              etp11a    11       50000
+Ethernet42     82,83              etp11b    11       50000
+Ethernet44     88,89              etp12a    12       50000
+Ethernet46     90,91              etp12b    12       50000
+Ethernet48     96,97,98,99        etp13     13       100000
+Ethernet52     104,105            etp14a    14       50000
+Ethernet54     106,107            etp14b    14       50000
+Ethernet56     112,113            etp15a    15       50000
+Ethernet58     114,115            etp15b    15       50000
+Ethernet60     120,121,122,123    etp16     16       100000
+Ethernet64     128,129            etp17a    17       50000
+Ethernet66     130,131            etp17b    17       50000
+Ethernet68     136,137            etp18a    18       50000
+Ethernet70     138,139            etp18b    18       50000
+Ethernet72     144,145            etp19a    19       50000
+Ethernet74     146,147            etp19b    19       50000
+Ethernet76     152,153            etp20a    20       50000
+Ethernet78     154,155            etp20b    20       50000
+Ethernet80     160,161            etp21a    21       50000
+Ethernet82     162,163            etp21b    21       50000
+Ethernet84     168,169            etp22a    22       50000
+Ethernet86     170,171            etp22b    22       50000
+Ethernet88     176,177            etp23a    23       50000
+Ethernet90     178,179            etp23b    23       50000
+Ethernet92     184,185            etp24a    24       50000
+Ethernet94     186,187            etp24b    24       50000
+Ethernet96     192,193            etp25a    25       50000
+Ethernet98     194,195            etp25b    25       50000
+Ethernet100    200,201            etp26a    26       50000
+Ethernet102    202,203            etp26b    26       50000
+Ethernet104    208,209            etp27a    27       50000
+Ethernet106    210,211            etp27b    27       50000
+Ethernet108    216,217            etp28a    28       50000
+Ethernet110    218,219            etp28b    28       50000
+Ethernet112    224,225            etp29a    29       50000
+Ethernet114    226,227            etp29b    29       50000
+Ethernet116    232,233            etp30a    30       50000
+Ethernet118    234,235            etp30b    30       50000
+Ethernet120    240,241            etp31a    31       50000
+Ethernet122    242,243            etp31b    31       50000
+Ethernet124    248,249            etp32a    32       50000
+Ethernet126    250,251            etp32b    32       50000
+Ethernet128    256,257,258,259    etp33     33       100000
+Ethernet132    264,265            etp34a    34       50000
+Ethernet134    266,267            etp34b    34       50000
+Ethernet136    272,273            etp35a    35       50000
+Ethernet138    274,275            etp35b    35       50000
+Ethernet140    280,281,282,283    etp36     36       100000
+Ethernet144    288,289            etp37a    37       50000
+Ethernet146    290,291            etp37b    37       50000
+Ethernet148    296,297,298,299    etp38     38       10000
+Ethernet152    304,305            etp39a    39       50000
+Ethernet154    306,307            etp39b    39       50000
+Ethernet156    312,313,314,315    etp40     40       10000
+Ethernet160    320,321            etp41a    41       50000
+Ethernet162    322,323            etp41b    41       50000
+Ethernet164    328,329            etp42a    42       50000
+Ethernet166    330,331            etp42b    42       50000
+Ethernet168    336,337            etp43a    43       50000
+Ethernet170    338,339            etp43b    43       50000
+Ethernet172    344,345            etp44a    44       50000
+Ethernet174    346,347            etp44b    44       50000
+Ethernet176    352,353            etp45a    45       50000
+Ethernet178    354,355            etp45b    45       50000
+Ethernet180    360,361            etp46a    46       50000
+Ethernet182    362,363            etp46b    46       50000
+Ethernet184    368,369            etp47a    47       50000
+Ethernet186    370,371            etp47b    47       50000
+Ethernet188    376,377            etp48a    48       50000
+Ethernet190    378,379            etp48b    48       50000
+Ethernet192    384,385            etp49a    49       50000
+Ethernet194    386,387            etp49b    49       50000
+Ethernet196    392,393            etp50a    50       50000
+Ethernet198    394,395            etp50b    50       50000
+Ethernet200    400,401            etp51a    51       50000
+Ethernet202    402,403            etp51b    51       50000
+Ethernet204    408,409            etp52a    52       50000
+Ethernet206    410,411            etp52b    52       50000
+Ethernet208    416,417,418,419    etp53     53       100000
+Ethernet212    424,425,426,427    etp54     54       100000
+Ethernet216    432,433,434,435    etp55     55       100000
+Ethernet220    440,441,442,443    etp56     56       100000
+Ethernet224    448,449,450,451    etp57     57       100000
+Ethernet228    456,457,458,459    etp58     58       100000
+Ethernet232    464,465,466,467    etp59     59       100000
+Ethernet236    472,473,474,475    etp60     60       100000
+Ethernet240    480,481            etp61a    61       50000
+Ethernet242    482,483            etp61b    61       50000
+Ethernet244    488,489            etp62a    62       50000
+Ethernet246    490,491            etp62b    62       50000
+Ethernet248    496,497            etp63a    63       50000
+Ethernet250    498,499            etp63b    63       50000
+Ethernet252    504,505            etp64a    64       50000
+Ethernet254    506,507            etp64b    64       50000
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/qos.json.j2
new file mode 120000
index 000000000000..05394016a129
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/qos.json.j2
@@ -0,0 +1 @@
+../ACS-MSN4600C/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile
new file mode 100644
index 000000000000..c05c9ac6a1d1
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile
@@ -0,0 +1,4 @@
+SAI_VXLAN_SRCPORT_RANGE_ENABLE=1
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_100x50g_12x100g_2x10g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai_4600c_100x50g_12x100g_2x10g.xml b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai_4600c_100x50g_12x100g_2x10g.xml
new file mode 100644
index 000000000000..bcf792d6337c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai_4600c_100x50g_12x100g_2x10g.xml
@@ -0,0 +1,525 @@
+<root>
+    <platform_info type="4601">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:80</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+        
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>64</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>105</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>1</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 1536 - 200Gb -->
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>107</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>111</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>99</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>103</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>123</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>127</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>115</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>119</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>91</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>95</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>83</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>87</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>24</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>75</local-port>
+                <width>4</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>26</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>79</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>28</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>67</local-port>
+                <width>4</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>30</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>71</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>32</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            <split>1</split></port-info>
+            <port-info>
+                <local-port>7</local-port>
+                <width>4</width>
+                <module>33</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>1</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>34</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>35</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>36</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            <split>2</split></port-info>
+            <port-info>
+                <local-port>15</local-port>
+                <width>4</width>
+                <module>37</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>16</port-speed>
+            <split>1</split></port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>38</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>11</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>39</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>16</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>40</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>23</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>41</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>42</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>19</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>43</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>44</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>31</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>45</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>46</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>27</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>47</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>48</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>55</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>49</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>50</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>51</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>51</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>52</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>63</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>53</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>54</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>59</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>55</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>56</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>57</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>58</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <split>1</split>
+                <width>4</width>
+                <module>59</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>1536</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>60</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>47</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>61</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>62</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <split>2</split>
+                <width>4</width>
+                <module>63</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>384</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
index 4931d4e1d7ae..fdcf8c0c3050 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
@@ -15,3 +15,8 @@
   40000  300m 19456  19456  49152          0
   50000  300m 19456  19456  55296          0
  100000  300m 19456  19456  86016          0
+  10000 2000m 19456  19456  32768          0
+  25000 2000m 19456  19456  63488          0
+  40000 2000m 19456  19456  94208          0
+  50000 2000m 19456  19456  114688         0
+ 100000 2000m 19456  19456  217088         0

From 038fda815484609b49a63ea74bab0807625261f5 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Fri, 17 Sep 2021 01:23:26 +0300
Subject: [PATCH 0793/1674] [202012][submodule] Update swss pointer (#8782)

* c3691d3 [202012][pfcwd] Convert polling interval from ms to us in LUA scripts (#1909)
* 549c804 Mux state order change (#1902)
* 6b0b2c4 Update acl type check logic (#1886)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index d240291fd113..c3691d37b1be 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit d240291fd1134e6045584ad26c2fbf9fc3aaa43e
+Subproject commit c3691d37b1be8b9dd020cdee4ec68904ec7bd479

From 7732fa95bb9871fc404a815c81802bc38ccac278 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 15 Sep 2021 23:28:27 -0700
Subject: [PATCH 0794/1674] [baseimage]: Logrotate for wtmp and btmp files.
 (#8743)

Added logrotate file for wtmp and btmp to override default conf and set size cap as 100K as done in
PR: #865. For buster this is control by separate file wtmp and btmp.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 files/image_config/logrotate/logrotate.d/btmp | 7 +++++++
 files/image_config/logrotate/logrotate.d/wtmp | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 files/image_config/logrotate/logrotate.d/btmp
 create mode 100644 files/image_config/logrotate/logrotate.d/wtmp

diff --git a/files/image_config/logrotate/logrotate.d/btmp b/files/image_config/logrotate/logrotate.d/btmp
new file mode 100644
index 000000000000..e3554d3e6773
--- /dev/null
+++ b/files/image_config/logrotate/logrotate.d/btmp
@@ -0,0 +1,7 @@
+# no packages own btmp -- we'll rotate it here
+/var/log/btmp {
+    missingok
+    size 100k
+    create 0660 root utmp
+    rotate 1
+}
diff --git a/files/image_config/logrotate/logrotate.d/wtmp b/files/image_config/logrotate/logrotate.d/wtmp
new file mode 100644
index 000000000000..8eb2663e6b66
--- /dev/null
+++ b/files/image_config/logrotate/logrotate.d/wtmp
@@ -0,0 +1,7 @@
+# no packages own wtmp -- we'll rotate it here
+/var/log/wtmp {
+    missingok
+    size 100k
+    create 0664 root utmp
+    rotate 1
+}

From 69443d722a8dfd44aceb2d7264927050037f54f1 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Thu, 16 Sep 2021 05:07:06 -0400
Subject: [PATCH 0795/1674] [Nokia ixs7215] Add support for SFP eeprom
 type_abbrv_name attribute (#8772)

---
 .../7215/sonic_platform/fan_drawer.py         | 18 +++++-
 .../7215/sonic_platform/sfp.py                | 55 ++++++++++++-------
 2 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
index e42d80cdbd52..6c6218f0a794 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
@@ -54,9 +54,25 @@ def get_direction(self):
         return 'intake'
 
     def set_status_led(self, color):
+        """
+        Sets the state of the fan drawer status LED
+
+        Args:
+            color: A string representing the color with which to set the
+                   fan drawer status LED
+
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
         return self._fan_list[0].set_status_led(color)
 
-    def get_status_led(self, color):
+    def get_status_led(self):
+        """
+        Gets the state of the fan drawer LED
+
+        Returns:
+            A string, one of the predefined STATUS_LED_COLOR_* strings
+        """
         return self._fan_list[0].get_status_led()
 
     def is_replaceable(self):
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index 308e8b29a60b..244e48e1e639 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -143,7 +143,7 @@ def __init__(self, index, sfp_type, eeprom_path, port_i2c_map):
                                'model', 'connector', 'encoding', 'ext_identifier',
                                'ext_rateselect_compliance', 'cable_type', 'cable_length',
                                'nominal_bit_rate', 'specification_compliance',
-                               'vendor_date', 'vendor_oui']
+                               'type_abbrv_name', 'vendor_date', 'vendor_oui']
 
         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
                               'tx_disable', 'tx_disable_channel', 'temperature',
@@ -274,6 +274,7 @@ def get_transceiver_info(self):
         cable_length               |INT            |cable length in m
         nominal_bit_rate           |INT            |nominal bit rate by 100Mbs
         specification_compliance   |1*255VCHAR     |specification compliance
+        type_abbrv_name            |1*255VCHAR     |type of SFP (abbreviated)
         vendor_date                |1*255VCHAR     |vendor date
         vendor_oui                 |1*255VCHAR     |vendor OUI
         application_advertisement  |1*255VCHAR     |supported applications advertisement
@@ -338,33 +339,47 @@ def get_transceiver_info(self):
             end = start + XCVR_VENDOR_DATE_WIDTH
             sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
                 sfp_interface_bulk_raw[start: end], 0)
-            transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
-            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
-            transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
-            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
-            transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
-            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
-            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
-                'data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
-            transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
-            transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
-            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
-            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
+
+            transceiver_info_dict['type'] = sfp_interface_bulk_data \
+                ['data']['type']['value']
+            transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
+                ['data']['Vendor Name']['value']
+            transceiver_info_dict['model'] = sfp_vendor_pn_data \
+                ['data']['Vendor PN']['value']
+            transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
+                ['data']['Vendor Rev']['value']
+            transceiver_info_dict['serial'] = sfp_vendor_sn_data \
+                ['data']['Vendor SN']['value']
+            transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
+                ['data']['Vendor OUI']['value']
+            transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
+                ['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
+            transceiver_info_dict['connector'] = sfp_interface_bulk_data \
+                ['data']['Connector']['value']
+            transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
+                ['data']['EncodingCodes']['value']
+            transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
+                ['data']['Extended Identifier']['value']
+            transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
+                ['data']['RateIdentifier']['value']
+            transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data \
+                ['data']['type_abbrv_name']['value']
 
             for key in sfp_cable_length_tup:
                 if key in sfp_interface_bulk_data['data']:
                     transceiver_info_dict['cable_type'] = key
-                    transceiver_info_dict['cable_length'] = str(
-                        sfp_interface_bulk_data['data'][key]['value'])
+                    transceiver_info_dict['cable_length'] = \
+                        str(sfp_interface_bulk_data['data'][key]['value'])
 
             for key in sfp_compliance_code_tup:
                 if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
-                    compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value']
-            transceiver_info_dict['specification_compliance'] = str(
-                compliance_code_dict)
+                    compliance_code_dict[key] = sfp_interface_bulk_data \
+                        ['data']['Specification compliance']['value'][key]['value']
 
-            transceiver_info_dict['nominal_bit_rate'] = str(
-                sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
+            transceiver_info_dict['specification_compliance'] = \
+                str(compliance_code_dict)
+            transceiver_info_dict['nominal_bit_rate'] = \
+                str(sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
             transceiver_info_dict['application_advertisement'] = 'N/A'
 
         return transceiver_info_dict

From 95f54cddf62ff67379df888e225c5fe2a182ee70 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 16 Sep 2021 07:25:43 -0700
Subject: [PATCH 0796/1674] DellEMC: Z9332f fix platform bugs (#8777)

* DellEMC: Z9332f fix platform bugs

* update sfp.py
---
 .../buffers_defaults_t0.j2                    | 12 +++++------
 .../buffers_defaults_t1.j2                    | 12 +++++------
 .../sai_postinit_cmd.soc                      |  7 +++----
 .../z9332f/sonic_platform/sfp.py              | 21 ++++++++++---------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
index 5ecbe788e3ab..33aaea75935d 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
@@ -4,18 +4,18 @@
     {# Generate list of ports #}
     {%- for port_idx in range(0,12) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(12,16) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(16,20) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(20,32) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
index 5ecbe788e3ab..33aaea75935d 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
@@ -4,18 +4,18 @@
     {# Generate list of ports #}
     {%- for port_idx in range(0,12) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(12,16) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(16,20) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(20,32) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
index 4a5b5ffcad9a..3222a4906bdf 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
@@ -373,6 +373,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1
 
+local port ce18
 #*** lane 4 ***
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
@@ -382,8 +383,6 @@ phy $port TXFIR_TAP_CTL4r.4 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.4 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP_LOAD=0x1
 
-
-local port ce18
 #*** lane 5 ***
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.5 TXFIR_TAP1_COEFF=0x1E8
@@ -393,6 +392,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce19
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -402,7 +402,6 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1
 
-local port ce19
 #*** lane 7 ***
 phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
@@ -974,6 +973,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1
 
+local port ce47
 #*** lane 6 ***
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
 phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
@@ -983,7 +983,6 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
 phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
 phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1
 
-local port ce47
 #*** lane 7 ***
 phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
 phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index f4cec75ca79c..1b4327ff342c 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -713,6 +713,7 @@ def get_transceiver_bulk_status(self):
         Retrieves transceiver bulk status of this SFP
         """
         tx_bias_list = []
+        tx_power_list = []
         rx_power_list = []
         transceiver_dom_dict = {}
         transceiver_dom_dict = dict.fromkeys(dom_dict_keys, 'N/A')
@@ -751,7 +752,7 @@ def get_transceiver_bulk_status(self):
         rx_power_list = self.get_rx_power()
 
         if self.sfp_type == 'QSFP_DD':
-            if tx_bias_list is not None:
+            if tx_bias_list:
                 transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
                 transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
                 transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
@@ -762,17 +763,17 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['tx8bias'] = tx_bias_list[7]
 
         elif self.sfp_type == 'QSFP':
-            if tx_bias_list is not None:
+            if tx_bias_list:
                 transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
                 transceiver_dom_dict['tx2bias'] = tx_bias_list[1]
                 transceiver_dom_dict['tx3bias'] = tx_bias_list[2]
                 transceiver_dom_dict['tx4bias'] = tx_bias_list[3]
         else:
-            if tx_bias_list is not None:
+            if tx_bias_list:
                transceiver_dom_dict['tx1bias'] = tx_bias_list[0]
 
         if self.sfp_type == 'QSFP_DD':
-            if rx_power_list is not None:
+            if rx_power_list:
                 transceiver_dom_dict['rx1power'] = rx_power_list[0]
                 transceiver_dom_dict['rx2power'] = rx_power_list[1]
                 transceiver_dom_dict['rx3power'] = rx_power_list[2]
@@ -783,17 +784,17 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['rx8power'] = rx_power_list[7]
 
         elif self.sfp_type == 'QSFP':
-            if rx_power_list is not None:
+            if rx_power_list:
                 transceiver_dom_dict['rx1power'] = rx_power_list[0]
                 transceiver_dom_dict['rx2power'] = rx_power_list[1]
                 transceiver_dom_dict['rx3power'] = rx_power_list[2]
                 transceiver_dom_dict['rx4power'] = rx_power_list[3]
         else:
-            if rx_power_list is not None:
+            if rx_power_list:
                 transceiver_dom_dict['rx1power'] = rx_power_list[0]
 
         if self.sfp_type == 'QSFP_DD':
-            if tx_power_list is not None:
+            if tx_power_list:
                 transceiver_dom_dict['tx1power'] = tx_power_list[0]
                 transceiver_dom_dict['tx2power'] = tx_power_list[1]
                 transceiver_dom_dict['tx3power'] = tx_power_list[2]
@@ -803,14 +804,14 @@ def get_transceiver_bulk_status(self):
                 transceiver_dom_dict['tx7power'] = tx_power_list[6]
                 transceiver_dom_dict['tx8power'] = tx_power_list[7]
         elif self.sfp_type == 'QSFP':
-            if tx_power_list is not None:
+            if tx_power_list:
                 transceiver_dom_dict['tx1power'] = tx_power_list[0]
                 transceiver_dom_dict['tx2power'] = tx_power_list[1]
                 transceiver_dom_dict['tx3power'] = tx_power_list[2]
                 transceiver_dom_dict['tx4power'] = tx_power_list[3]
         else:
-             if tx_power_list is not None:
-                 transceiver_dom_dict['tx1power'] = tx_power_list[0]
+            if tx_power_list:
+                transceiver_dom_dict['tx1power'] = tx_power_list[0]
         transceiver_dom_dict['rx_los'] = rx_los
         transceiver_dom_dict['tx_fault'] = tx_fault
         transceiver_dom_dict['reset_status'] = reset_state

From f44446daf8ab943fb6b0b3fa826071fd14a8e136 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 17 Sep 2021 06:25:50 +0530
Subject: [PATCH 0797/1674] DellEMC Z9332f: Platform API - Update maximum fan
 speed (#8766)

---
 .../z9332f/sonic_platform/fan.py                            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
index 6ffadb2a1e5f..4fce691c02f1 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py
@@ -48,6 +48,10 @@ def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None)
                                            is_discrete=True)
             self.speed_sensor = IpmiSensor(self.FAN_SENSOR_MAPPING[self.index]["Speed"])
             self.fan_dir_raw_cmd = "0x3a 0x0a {}".format(fantray_index)
+            if self.fanindex == 1:
+                self.max_speed = 24700
+            else:
+                self.max_speed = 29700
         else:
             self.dependency = dependency
             self.fanindex = fan_index
@@ -55,7 +59,7 @@ def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None)
                                            is_discrete=True)
             self.speed_sensor = IpmiSensor(self.PSU_FAN_SENSOR_MAPPING[self.fanindex]["Speed"])
             self.fan_dir_raw_cmd = "0x3a 0x0a {}".format(7+(fan_index-1))
-        self.max_speed = 23500
+            self.max_speed = 26500
 
     def get_name(self):
         """

From 79ffde7c69af2119eb53625af3030600c06c5f4a Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Fri, 17 Sep 2021 00:01:12 -0400
Subject: [PATCH 0798/1674] [Nokia ixs7215] Support show system-health (#8771)

* [Nokia ixs7215] Support show system-health
* [Nokia ixs7215] Fix LGTM alert
---
 .../system_health_monitoring_config.json      | 14 +++++
 .../7215/sonic_platform/chassis.py            | 51 +++++++++++--------
 2 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..fb16658c840c
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json
@@ -0,0 +1,14 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [
+        "asic",
+        "psu"
+    ],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "amber",
+        "normal": "green",
+        "booting": "blinking green"
+    }
+}
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
index a01aca24b684..cf67a7bb30ac 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
@@ -27,6 +27,11 @@
 except ImportError as e:
     smbus_present = 0
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 MAX_SELECT_DELAY = 3600
 COPPER_PORT_START = 1
 COPPER_PORT_END = 48
@@ -278,6 +283,9 @@ def get_thermal_manager(self):
         from .thermal_manager import ThermalManager
         return ThermalManager
 
+    def initizalize_system_led(self):
+        return True
+
     def set_status_led(self, color):
         """
         Sets the state of the system LED
@@ -306,17 +314,18 @@ def set_status_led(self, color):
             return False
 
         # Write sys led
-        if smbus_present == 0:
-            sonic_logger.log_warning("PMON LED SET -> smbus present = 0")
+        if smbus_present == 0:  # called from host (e.g. 'show system-health')
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cset -y 0 0x41 0x7 %d' % value)
+            if cmdstatus:
+                sonic_logger.log_warning("  System LED set %s failed" % value)
+                return False
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
             DEVICEREG = 0x7
             bus.write_byte_data(DEVICE_ADDRESS, DEVICEREG, value)
-            sonic_logger.log_info("  System LED set O.K.  ")
-            return True
 
-        return False
+        return True
 
     def get_status_led(self):
         """
@@ -327,29 +336,29 @@ def get_status_led(self):
             specified.
         """
         # Read sys led
-        if smbus_present == 0:
-            sonic_logger.log_warning("PMON LED GET -> smbus present = 0")
-            return False
+        if smbus_present == 0:  # called from host
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x7')
+            value = int(value, 16)
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
             DEVICE_REG = 0x7
             value = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
 
-            if value == 0x00:
-                color = 'off'
-            elif value == 0x01:
-                color = 'amber'
-            elif value == 0x02:
-                color = 'green'
-            elif value == 0x03:
-                color = 'amber_blink'
-            elif value == 0x04:
-                color = 'green_blink'
-            else:
-                return False
+        if value == 0x00:
+            color = 'off'
+        elif value == 0x01:
+            color = 'amber'
+        elif value == 0x02:
+            color = 'green'
+        elif value == 0x03:
+            color = 'amber_blink'
+        elif value == 0x04:
+            color = 'green_blink'
+        else:
+            return None
 
-            return color
+        return color
 
     def get_watchdog(self):
         """

From f716745d76e1df6b436892315b5404ca1244a26e Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 18 Sep 2021 00:40:09 +0800
Subject: [PATCH 0799/1674] [ci/build]: Upgrade SONiC package versions (#8637)

---
 .../versions-deb-buster                       | 38 ++++++++++---------
 .../build-sonic-slave-buster/versions-git     |  4 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../versions-deb-stretch                      |  3 --
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  | 17 +++++----
 files/build/versions/default/versions-git     |  4 +-
 files/build/versions/default/versions-web     | 12 +++---
 .../versions-deb-buster                       | 18 ++++-----
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../versions/dockers/docker-ptf/versions-py2  |  4 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 10 ++---
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../docker-syncd-invm/versions-deb-buster     | 27 +++++++++++++
 .../docker-syncd-invm/versions-deb-stretch    |  5 ---
 .../docker-syncd-mlnx/versions-deb-buster     | 38 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-buster-arm64                 |  4 +-
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 -
 .../versions-deb-stretch-arm64                |  2 +-
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  8 ++--
 .../dockers/sonic-slave-stretch/versions-git  |  2 -
 .../versions/host-image/versions-deb-buster   |  6 +--
 .../host-image/versions-deb-buster-arm64      |  1 +
 .../host-image/versions-deb-buster-armhf      |  1 +
 files/build/versions/host-image/versions-py3  |  2 +-
 36 files changed, 130 insertions(+), 112 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 0adb94c22a1f..5f8f402317dc 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,7 +1,9 @@
-applibs==1.mlnx.4.4.3222
-applibs-dev==1.mlnx.4.4.3222
+applibs==1.mlnx.4.4.3326
+applibs-dev==1.mlnx.4.4.3326
 bfnplatform==1.0.0
-iproute2-dev==1.mlnx.4.4.3222
+innovium-sai==0.107.1
+innovium-sai-headers==0.107.1
+iproute2-dev==1.mlnx.4.4.3326
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.17.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -16,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-1
+libsaibcm==4.3.5.1-2
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -50,20 +52,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.3222
-sx-acl-helper-dev==1.mlnx.4.4.3222
-sx-complib==1.mlnx.4.4.3222
-sx-complib-dev==1.mlnx.4.4.3222
-sx-examples==1.mlnx.4.4.3222
-sx-examples-dev==1.mlnx.4.4.3222
-sx-gen-utils==1.mlnx.4.4.3222
-sx-gen-utils-dev==1.mlnx.4.4.3222
-sx-scew==1.mlnx.4.4.3222
-sx-scew-dev==1.mlnx.4.4.3222
-sxd-libs==1.mlnx.4.4.3222
-sxd-libs-dev==1.mlnx.4.4.3222
+sx-acl-helper==1.mlnx.4.4.3326
+sx-acl-helper-dev==1.mlnx.4.4.3326
+sx-complib==1.mlnx.4.4.3326
+sx-complib-dev==1.mlnx.4.4.3326
+sx-examples==1.mlnx.4.4.3326
+sx-examples-dev==1.mlnx.4.4.3326
+sx-gen-utils==1.mlnx.4.4.3326
+sx-gen-utils-dev==1.mlnx.4.4.3326
+sx-scew==1.mlnx.4.4.3326
+sx-scew-dev==1.mlnx.4.4.3326
+sxd-libs==1.mlnx.4.4.3326
+sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.4.3222
-wjh-libs-dev==1.mlnx.4.4.3222
\ No newline at end of file
+wjh-libs==1.mlnx.4.4.3326
+wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 0e3bbd0abe0d..0323cadfd1f4 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
+https://github.com/sflow/host-sflow==fb5be7f35e63e3e5e30d02068787d02f33437bf6
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==4985ed2e4ddeb9f9529e4c8195fb594309c5f1a8
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==2c0c1f9d4efdde30bea7f142b2571dfede933758
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==1789bc497438cff6a14dcb8e41eefb9166f812ce
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 8fb13cc4bbe9..53aa9c731771 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index 59f60131f98c..a7c8e756c1da 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -1,5 +1,3 @@
-innovium-sai==0.11.1
-innovium-sai-headers==0.11.1
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -16,7 +14,6 @@ libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsainps==1.5.0
 libsairedis==1.0.0
-libsaithrift-dev==0.9.4
 libsaivs==1.0.0
 libsaivs-dev==1.0.0
 libswsscommon==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 5262b4797ff7..75e909268b4e 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=2YjE1nTWN5Nr5403N4kYge1kSvgGtE3t87HY7FsGKeo%3D&se=2035-05-05T06%3A05%3A03Z&sp=r==5185993a6614aa473412d8fe334b5c8c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-1_amd64.deb?sv=2015-04-05&sr=b&sig=lQsSB%2BJnoynyjbrRl30QSWKsl5qb7kVq9L9DB%2BhZeP4%3D&se=2035-05-05T06%3A04%3A02Z&sp=r==756220037c87858c32c45404b4de0eb8
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 0bc1585703a2..b8f46604bd12 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:2d1ab098097b2f299d3f05836a276a1a197ec221bc19620b4da16c26e83e7a2b
-amd64:amd64/debian:stretch==sha256:205cce0b204ae98be1723d2df0a188bd254ee79f949b51b35bde5dfa91320b72
-amd64:debian:buster==sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146
-amd64:debian:stretch==sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c
+amd64:amd64/debian:buster==sha256:df7d71b9a1ce0fa0b774f52ac7a0d966b483f0650185cc3594ff7d367d5c6a55
+amd64:amd64/debian:stretch==sha256:b8cd84cc98da3fdd374607006327f4fad25c3190ad0f713b28f3bee58cf01919
+amd64:debian:buster==sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8
+amd64:debian:stretch==sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -22,16 +22,17 @@ amd64:docker-sonic-telemetry==
 amd64:docker-syncd-bfn==
 amd64:docker-syncd-brcm==
 amd64:docker-syncd-centec==
+amd64:docker-syncd-invm==
 amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:1bc791ccf8170c4943a47b96a3d2c94721130525c875a1d2fdbff52c660f54a1
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:b4aa76ce99876db67ae2f3ead89ffac424b4d1d07b7ae6369530ae9f5e745915
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:524901b58584598a21b72b5e2897b2980a69418b08bfecfda509b8da78132ec9
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:d8666adc8b7adf804a2db9dd670da56367c294e7c3bbe94d07f8a5aacb832a19
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:79f0455cf5169e9c5b4de81f92c3d669c020b58bb0e5da6c8e0f9a0fed8d666c
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:b63f0c90d9f918b3a2311dc61944593e1f43eba1218fe90abbdb044f87b97ff9
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:3130a6f21f7aa45db348d8e88336b1cff4ee2467565e9134f8263bb361622ad6
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:6fc1f5bd4a96eae9e687e0b5656a7de0bc25159db391642cddd589378d0f039e
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 7a4b7bef40fa..dfee47a18bfd 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==53075227f31e38bf875dad98ec57d53076316d6f
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -8,7 +8,7 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
-https://github.com/sflow/host-sflow==2b48d1bc898827f66d23a0f9dbda3cc77fbff7fc
+https://github.com/sflow/host-sflow==fb5be7f35e63e3e5e30d02068787d02f33437bf6
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 7a365cfa93a7..23e55d6982ec 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,7 +19,7 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==bf63bfc1edf2f537e490d9e9850f979d
+https://deb.nodesource.com/node_14.x/dists/buster/Release==350ad22c60b736f8cf6b31bda87450f7
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -28,10 +28,10 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210805_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
-https://github.com/Innovium/SONiC/raw/master/debian/master/isai.deb==2ed19469078ff5b04208ed2042d30e05
-https://github.com/Innovium/SONiC/raw/master/debian/master/saihdr.deb==f1e60b01f5c1ae9832931166ba786202
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-1.deb==2ef2a6ac59ceb76d794de606ca1bd7f6
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==e880e41c58e5024812a20ec28d813cda
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3a66f2e2464ce379359635720d5b199e
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==74a6977fc65cb57dcbd08c6e21d61567
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-2.deb==d3c54abb12e7e801f6ca0e2433c03119
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 86e85498d8e5..f3a78bd00341 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3222
-applibs-dev==1.mlnx.4.4.3222
+applibs==1.mlnx.4.4.3326
+applibs-dev==1.mlnx.4.4.3326
 dmidecode==3.2-1
 ethtool==1:5.9-1
 fancontrol==1:3.5.0-3
@@ -67,7 +67,7 @@ openssh-client==1:7.9p1-10+deb10u2
 psmisc==23.2-1
 python==2.7.16-1
 python-minimal==2.7.16-1
-python-sdk-api==1.mlnx.4.4.3222
+python-sdk-api==1.mlnx.4.4.3326
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -84,12 +84,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.3222
-sx-complib-dev==1.mlnx.4.4.3222
-sx-gen-utils==1.mlnx.4.4.3222
-sx-gen-utils-dev==1.mlnx.4.4.3222
-sxd-libs==1.mlnx.4.4.3222
-sxd-libs-dev==1.mlnx.4.4.3222
+sx-complib==1.mlnx.4.4.3326
+sx-complib-dev==1.mlnx.4.4.3326
+sx-gen-utils==1.mlnx.4.4.3326
+sx-gen-utils-dev==1.mlnx.4.4.3326
+sxd-libs==1.mlnx.4.4.3326
+sxd-libs-dev==1.mlnx.4.4.3326
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 407321f34bb8..e493f50be3f8 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.6
 pyang==2.5.0
 pyangbind==0.6.0
-python-sdk-api==4.4.3222
+python-sdk-api==4.4.3326
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 8934340ef51d..32f34444b068 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.4.3222
+python_sdk_api==4.4.3326
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 78cb30d1fe2c..452cee785aa5 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -6,7 +6,7 @@ click==7.1.2
 contextlib2==0.6.0.post1
 cryptography==3.3.2
 decorator==4.4.2
-dpkt==1.9.7.1
+dpkt==1.9.7.2
 enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
@@ -41,7 +41,7 @@ pycparser==2.20
 pygments==2.5.2
 pylibpcap==0.6.4
 pynacl==1.4.0
-pyro4==4.80
+pyro4==4.81
 pysubnettree==0.26
 pyyaml==5.4.1
 rpyc==4.1.5
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index c2e3355cb98c..0d3c474ce80e 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,26 +1,26 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.4
+charset-normalizer==2.0.5
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.1
-grpcio==1.39.0
+grpcio==1.40.0
 grpcio-tools==1.20.0
 idna==3.2
-importlib-metadata==4.7.1
+importlib-metadata==4.8.1
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
 jsonschema==3.2.0
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.17.3
+protobuf==3.18.0
 pyrsistent==0.18.0
 python-dateutil==2.6.0
 requests==2.26.0
 six==1.11.0
-typing-extensions==3.10.0.0
+typing-extensions==3.10.0.2
 urllib3==1.21.1
 werkzeug==2.0.1
 zipp==3.5.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 46432428293a..bcac5a66a3da 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.5.30
-charset-normalizer==2.0.4
+charset-normalizer==2.0.5
 click==7.0
 idna==3.2
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 313f6f2adb52..c5738f15797a 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-1
+libsaibcm==4.3.5.1-2
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
new file mode 100644
index 000000000000..45ce0049167e
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -0,0 +1,27 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+innovium-sai==0.107.1
+innovium-sai-headers==0.107.1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
+libpopt0==1.16-12
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
+syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
deleted file mode 100644
index c9d822e1191a..000000000000
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-stretch
+++ /dev/null
@@ -1,5 +0,0 @@
-innovium-sai==0.11.1
-innovium-sai-headers==0.11.1
-libsaimetadata==1.0.0
-libsairedis==1.0.0
-syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 07a635d950e9..c96c7f7badb4 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.4.3222
-applibs-dev==1.mlnx.4.4.3222
+applibs==1.mlnx.4.4.3326
+applibs-dev==1.mlnx.4.4.3326
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2==1.mlnx.4.4.3222
-iproute2-dev==1.mlnx.4.4.3222
+iproute2==1.mlnx.4.4.3326
+iproute2-dev==1.mlnx.4.4.3326
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
@@ -40,7 +40,7 @@ python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.3222
+python-sdk-api==1.mlnx.4.4.3326
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -50,21 +50,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.4.3222
-sx-acl-helper-dev==1.mlnx.4.4.3222
-sx-complib==1.mlnx.4.4.3222
-sx-complib-dev==1.mlnx.4.4.3222
-sx-examples==1.mlnx.4.4.3222
-sx-examples-dev==1.mlnx.4.4.3222
-sx-gen-utils==1.mlnx.4.4.3222
-sx-gen-utils-dev==1.mlnx.4.4.3222
-sx-scew==1.mlnx.4.4.3222
-sx-scew-dev==1.mlnx.4.4.3222
-sxd-libs==1.mlnx.4.4.3222
-sxd-libs-dev==1.mlnx.4.4.3222
+sx-acl-helper==1.mlnx.4.4.3326
+sx-acl-helper-dev==1.mlnx.4.4.3326
+sx-complib==1.mlnx.4.4.3326
+sx-complib-dev==1.mlnx.4.4.3326
+sx-examples==1.mlnx.4.4.3326
+sx-examples-dev==1.mlnx.4.4.3326
+sx-gen-utils==1.mlnx.4.4.3326
+sx-gen-utils-dev==1.mlnx.4.4.3326
+sx-scew==1.mlnx.4.4.3326
+sx-scew-dev==1.mlnx.4.4.3326
+sxd-libs==1.mlnx.4.4.3326
+sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
-wjh-libs==1.mlnx.4.4.3222
-wjh-libs-dev==1.mlnx.4.4.3222
\ No newline at end of file
+wjh-libs==1.mlnx.4.4.3326
+wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index ae4b00c6355d..ae714e21a0c9 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3222
\ No newline at end of file
+python-sdk-api==4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 67be4647c9fc..d7bebb037ed3 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.4.3222
\ No newline at end of file
+python_sdk_api==4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index ae722af856a8..f3f41842cfe5 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -23,7 +23,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-1
+mrvllibsai==1.7.1-2
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 7be2d59caddd..613ea778c9a9 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -1185,7 +1185,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.5-1nodesource1
+nodejs==14.17.6-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
@@ -1474,7 +1474,7 @@ shellcheck==0.5.0-3
 software-properties-common==0.96.20.2-2
 sphinx-common==1.8.4-1
 sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12
+squashfs-tools==1:4.3-12+deb10u1
 stgit==0.18-1
 strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index e40791619e95..064e66962715 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.2
+bitarray==2.3.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index b7043edc26a8..dc17507926b8 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -1294,7 +1294,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.5-1nodesource1
+nodejs==14.17.6-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index e40791619e95..064e66962715 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.2
+bitarray==2.3.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index f8bb43b33caa..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index f0186c5ee70b..ff47da854cc6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -1331,7 +1331,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u1
+squashfs-tools==1:4.3-3+deb9u2
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 660e546b3b83..1a570d60bf58 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.2
+bitarray==2.3.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index 32b6cb94f8e8..72c18aadddaa 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -1337,7 +1337,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u1
+squashfs-tools==1:4.3-3+deb9u2
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 660e546b3b83..1a570d60bf58 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.2
+bitarray==2.3.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 23c0ecddecf0..360a44beb9d2 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -1364,10 +1364,10 @@ python3.5-dbg==3.5.3-1+deb9u4
 python3.5-dev==3.5.3-1+deb9u4
 python3.5-minimal==3.5.3-1+deb9u4
 qdbus==4:4.8.7+dfsg-11+deb9u1
-qemu-kvm==1:2.8+dfsg-6+deb9u14
-qemu-system-common==1:2.8+dfsg-6+deb9u14
-qemu-system-x86==1:2.8+dfsg-6+deb9u14
-qemu-utils==1:2.8+dfsg-6+deb9u14
+qemu-kvm==1:2.8+dfsg-6+deb9u16
+qemu-system-common==1:2.8+dfsg-6+deb9u16
+qemu-system-x86==1:2.8+dfsg-6+deb9u16
+qemu-utils==1:2.8+dfsg-6+deb9u16
 qt-at-spi==0.4.0-5
 qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
 qt4-qmake==4:4.8.7+dfsg-11+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index f8bb43b33caa..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==bd0674c0d0920b9d88ae11ced057e5f4a426fa37
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 0464818e82cf..a59c98f5ba0a 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -51,7 +51,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.11.1
+innovium-platform-driver==0.107.1
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -241,9 +241,9 @@ sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
-squashfs-tools==1:4.3-12
+squashfs-tools==1:4.3-12+deb10u1
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.3222
+sx-kernel==1.mlnx.4.4.3326
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index fa3220479bd2..f8ceb4047f84 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -14,5 +14,6 @@ libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.194-3
+squashfs-tools==1:4.3-12
 tsingma-bsp==1.0
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 89df03e3cb27..ac172354c81e 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -15,4 +15,5 @@ libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
 linux-libc-dev==4.19.194-3
 mrvlprestera==1.0
+squashfs-tools==1:4.3-12
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 53988f2d923a..a1b1082e835e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
 cffi==1.14.6
-charset-normalizer==2.0.4
+charset-normalizer==2.0.5
 click==7.0
 cryptography==3.4.8
 docker==4.3.1

From 8af4d89bd8ece7cf304e067d57c63fde26f0e58a Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Sat, 18 Sep 2021 23:54:26 +0300
Subject: [PATCH 0800/1674] [202012][submodule] Update swss pointer (#8786)

* 4be4a9b [tlm teamd] Add retry mechanism before logging the ERR in get_dumps. (#1629)
* 2c0ce38 [fgnhgorch] Enable packet flow when no FG ECMP neighbors are resolved (#1900)
* fddb298 Innovium platform specific changes PFC Detect lua script for SONiC 202012 (#1893)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c3691d37b1be..4be4a9b31c8a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c3691d37b1be8b9dd020cdee4ec68904ec7bd479
+Subproject commit 4be4a9b31c8af43c9cbfca24098158ee443993ab

From 7ce529ea35ae041a35c2b9acbaa590b878b05d0b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 19 Sep 2021 23:26:49 +0800
Subject: [PATCH 0801/1674] [ci/build]: Upgrade SONiC package versions (#8795)

---
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-git     |  4 ++--
 files/build/versions/default/versions-web     |  2 +-
 .../docker-base-stretch/versions-deb-stretch  |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     | 20 -------------------
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../sonic-slave-buster/versions-deb-buster    |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 ++
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  4 ++--
 .../dockers/sonic-slave-stretch/versions-git  |  2 ++
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 17 files changed, 20 insertions(+), 36 deletions(-)
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 0323cadfd1f4..b442de3a5b71 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==fb5be7f35e63e3e5e30d02068787d02f33437bf6
+https://github.com/sflow/host-sflow==1392bd591de05fb5aa09afa39a96f2ba4e8ed7ef
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index dfee47a18bfd..cbe46244ac4a 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==53075227f31e38bf875dad98ec57d53076316d6f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -8,7 +8,7 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
-https://github.com/sflow/host-sflow==fb5be7f35e63e3e5e30d02068787d02f33437bf6
+https://github.com/sflow/host-sflow==1392bd591de05fb5aa09afa39a96f2ba4e8ed7ef
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 23e55d6982ec..4247d39cf409 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==e880e41c58e5024812a20ec28d813cda
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3a66f2e2464ce379359635720d5b199e
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==74a6977fc65cb57dcbd08c6e21d61567
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-2.deb==d3c54abb12e7e801f6ca0e2433c03119
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-3.deb==ddd833047fc213abb1187b752905e56a
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 99b977ce59a3..4cf4a6319fcc 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -11,7 +11,7 @@ libfastjson4==0.99.8-1~bpo9+1
 libffi6==3.2.1-6
 libgdbm3==1.8.3-14
 libgmp10==2:6.1.2+dfsg-1
-libgnutls30==3.5.8-5+deb9u5
+libgnutls30==3.5.8-5+deb9u6
 libgssapi-krb5-2==1.15-1+deb9u2
 libhogweed4==3.3-1+b2
 libidn2-0==0.16-1+deb9u1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 15875a0ce64f..9df6af49832c 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -78,7 +78,7 @@ libgdbm3==1.8.3-14
 libglib2.0-0==2.50.3-2+deb9u2
 libglib2.0-data==2.50.3-2+deb9u2
 libgmp10==2:6.1.2+dfsg-1
-libgnutls30==3.5.8-5+deb9u5
+libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
 libgpm2==1.20.4-6.2+b1
 libgsasl7==1.8.0-8+b2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 0d3c474ce80e..18f08ff4fa9e 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index bcac5a66a3da..a2c676bb4dac 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.5.30
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
 click==7.0
 idna==3.2
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index c5738f15797a..c8cdd58363d8 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -1,36 +1,16 @@
 ethtool==1:4.19-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 kmod==26-1
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libkmod2==26-1
-libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
 libsaibcm==4.3.5.1-2
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 linux-libc-dev==4.19.194-3
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
 syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index f3f41842cfe5..d9e2d51ba9ff 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -23,7 +23,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-2
+mrvllibsai==1.7.1-3
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index dc17507926b8..2500ffa99568 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -1586,7 +1586,7 @@ shellcheck==0.5.0-3
 software-properties-common==0.96.20.2-2
 sphinx-common==1.8.4-1
 sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12
+squashfs-tools==1:4.3-12+deb10u1
 stgit==0.18-1
 strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 41449a9a1e23..e356efaadf70 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1632,7 +1632,7 @@ shellcheck==0.5.0-3
 software-properties-common==0.96.20.2-2
 sphinx-common==1.8.4-1
 sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12
+squashfs-tools==1:4.3-12+deb10u1
 stgit==0.18-1
 strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..5ec72a8dd239
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index e40791619e95..064e66962715 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.2
+bitarray==2.3.4
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 360a44beb9d2..f6a0e265a948 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -501,7 +501,7 @@ libglu1-mesa-dev==9.0.0-2.1
 libgmp-dev==2:6.1.2+dfsg-1
 libgmp10==2:6.1.2+dfsg-1
 libgmpxx4ldbl==2:6.1.2+dfsg-1
-libgnutls30==3.5.8-5+deb9u5
+libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
 libgoogle-perftools4==2.5-2.2
 libgpgme11==1.8.0-3+b2
@@ -1405,7 +1405,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u1
+squashfs-tools==1:4.3-3+deb9u2
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..5ec72a8dd239
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 660e546b3b83..1a570d60bf58 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.2
+bitarray==2.3.4
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index a1b1082e835e..1360dedffbaf 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.5.30
 cffi==1.14.6
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
 click==7.0
 cryptography==3.4.8
 docker==4.3.1

From 35196835aea583b784ebb2178d22665c069842e0 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Sat, 18 Sep 2021 10:31:36 -0700
Subject: [PATCH 0802/1674] [healthd] Add system health configuration for
 platform Celestica E1031 (#8783)

This PR aims to fix the healthd crash issue by adding system health monitoring configuration file for platform Celestica E1031 by adding a new configuration file under the path device/celestica/x86_64-cel_e1031-r0/.

How to verify it
I manually restart the system-health.service and confirmed that healthd is running.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
---
 .../system_health_monitoring_config.json         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/system_health_monitoring_config.json

diff --git a/device/celestica/x86_64-cel_e1031-r0/system_health_monitoring_config.json b/device/celestica/x86_64-cel_e1031-r0/system_health_monitoring_config.json
new file mode 100644
index 000000000000..1733fcffdba3
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/system_health_monitoring_config.json
@@ -0,0 +1,16 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [
+        "asic",
+        "psu.temperature",
+        "PSU2 Fan",
+        "PSU1 Fan"
+    ],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "orange",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}

From 396a84752b0db8c3e87c8257b9c7cabe413cb1f0 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Mon, 20 Sep 2021 00:45:22 +0530
Subject: [PATCH 0803/1674] DellEMC: Z9332f - Platform API implementation
 (#8787)

---
 .../z9332f/sonic_platform/chassis.py          |  9 +++++++
 .../z9332f/sonic_platform/eeprom.py           |  2 +-
 .../z9332f/sonic_platform/fan_drawer.py       | 10 +++++++
 .../z9332f/sonic_platform/psu.py              | 27 +++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 1fe5e96fc7c8..8658c4ac876a 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -270,6 +270,15 @@ def get_serial_number(self):
         """
         return self._eeprom.serial_number_str()
 
+    def get_revision(self):
+        """
+        Retrieves the hardware revision of the device
+
+        Returns:
+            string: Revision value of device
+        """
+        return self._eeprom.revision_str()
+
     def get_system_eeprom_info(self):
         """
         Retrieves the full content of system EEPROM information for the chassis
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
index 1dc66935508c..fe7da80d012f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/eeprom.py
@@ -118,7 +118,7 @@ def revision_str(self):
         Returns the device revision
         """
         (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_DEVICE_VERSION)
+                    self.eeprom_data, self._TLV_CODE_LABEL_REVISION)
         if not is_valid:
             return "N/A"
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
index f7ea8a4cbf6c..98d9f95c53fb 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan_drawer.py
@@ -103,3 +103,13 @@ def set_status_led(self, color):
         # Fan tray status LED controlled by BMC
         # Return True to avoid thermalctld alarm
         return True
+
+    def get_maximum_consumed_power(self):
+        """
+        Retrives the maximum power drawn by Fan Drawer
+
+        Returns:
+            A float, with value of the maximum consumable power of the
+            component.
+        """
+        return 36.0
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
index 28d62aa0152b..5aeebd4144b2 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py
@@ -87,6 +87,19 @@ def get_serial(self):
         """
         return self.fru.get_board_serial()
 
+    def get_revision(self):
+        """
+        Retrieves the hardware revision of the device
+
+        Returns:
+            string: Revision value of device
+        """
+        serial = self.fru.get_board_serial()
+        if serial != "NA" and len(serial) == 23:
+            return serial[-3:]
+        else:
+            return "NA"
+
     def get_status(self):
         """
         Retrieves the operational status of the PSU
@@ -193,6 +206,20 @@ def get_power(self):
 
         return float(power)
 
+    def get_maximum_supplied_power(self):
+        """
+        Retrieves the maximum supplied power by PSU
+
+        Returns:
+            A float number, the maximum power output in Watts.
+            e.g. 1200.1
+        """
+        is_valid, power = self.power_sensor.get_threshold("UpperCritical")
+        if not is_valid:
+            return None
+
+        return float(power)
+
     def get_powergood_status(self):
         """
         Retrieves the powergood status of PSU

From c988a7766c2babcfb94d1a319c104ae41121e518 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 20 Sep 2021 20:48:20 +0800
Subject: [PATCH 0804/1674] [ci/build]: Upgrade SONiC package versions (#8800)

---
 files/build/versions/default/versions-docker              | 8 ++++----
 .../dockers/docker-base-stretch/versions-deb-stretch      | 5 +++--
 .../versions/dockers/docker-ptf/versions-deb-stretch      | 5 +++--
 .../versions-deb-stretch-arm64                            | 2 +-
 .../versions-deb-stretch-armhf                            | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index b8f46604bd12..b9f56396937d 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -29,10 +29,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:524901b58584598a21b72b5e2897b2980a69418b08bfecfda509b8da78132ec9
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:d8666adc8b7adf804a2db9dd670da56367c294e7c3bbe94d07f8a5aacb832a19
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:c117f3478dadec02b4628a81bc621fdefec2c301df57df760833d823184f9faa
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:57b07ff1d3c1b0da78ff9fb26ef5040c5239e7c4361f4404005487e27924b796
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:3130a6f21f7aa45db348d8e88336b1cff4ee2467565e9134f8263bb361622ad6
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:6fc1f5bd4a96eae9e687e0b5656a7de0bc25159db391642cddd589378d0f039e
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:c25c19b90282273db12807f7b0c528a6858db272fc8162b7b0b2d7e77fafda62
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:d26753fd0d7f3cec5dac9a0432fd28b2ffb8fa46ebb6b97143768552c11035b2
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 4cf4a6319fcc..eed765cc007c 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -13,7 +13,7 @@ libgdbm3==1.8.3-14
 libgmp10==2:6.1.2+dfsg-1
 libgnutls30==3.5.8-5+deb9u6
 libgssapi-krb5-2==1.15-1+deb9u2
-libhogweed4==3.3-1+b2
+libhogweed4==3.3-1+deb9u1
 libidn2-0==0.16-1+deb9u1
 libjansson4==2.9-1
 libjq1==1.5+dfsg-1.3
@@ -25,6 +25,7 @@ libldap-2.4-2==2.4.44+dfsg-5+deb9u8
 libldap-common==2.4.44+dfsg-5+deb9u8
 liblognorm5==2.0.3-1~bpo9+1
 libncurses5==6.0+20161126-1+deb9u2
+libnettle6==3.3-1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u1
 libonig4==6.1.3-2+deb9u2
 libp11-kit0==0.23.3-2+deb9u1
@@ -43,7 +44,7 @@ libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u5
 libssl1.1==1.1.0l-1~deb9u3
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 9df6af49832c..ebcf6abc9334 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -83,7 +83,7 @@ libgomp1==6.3.0-18+deb9u1
 libgpm2==1.20.4-6.2+b1
 libgsasl7==1.8.0-8+b2
 libgssapi-krb5-2==1.15-1+deb9u2
-libhogweed4==3.3-1+b2
+libhogweed4==3.3-1+deb9u1
 libicu57==57.1-6+deb9u4
 libidn2-0==0.16-1+deb9u1
 libip4tc0==1.6.0+snapshot20161117-6
@@ -114,6 +114,7 @@ libmpfr4==3.1.5-1
 libmpx2==6.3.0-18+deb9u1
 libncurses5==6.0+20161126-1+deb9u2
 libnet1==1.1.6+dfsg-3
+libnettle6==3.3-1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u1
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
@@ -150,7 +151,7 @@ libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u3
 libssl-doc==1.1.0l-1~deb9u3
-libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u5
 libssl1.1==1.1.0l-1~deb9u3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libtacacs+1==4.0.4.27a-3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index ff47da854cc6..829b2783b72e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -882,7 +882,7 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u3
-libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u5
 libssl1.1==1.1.0l-1~deb9u3
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index 72c18aadddaa..37e82236d956 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -884,7 +884,7 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u3
-libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u5
 libssl1.1==1.1.0l-1~deb9u3
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1

From f6f4c7f4b985e831b43bad703fc94dd5b8c9cf4e Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Tue, 21 Sep 2021 09:09:27 +0300
Subject: [PATCH 0805/1674] [submodule]: Advance sonic-swss. (#8804)

Commits on Sep 18, 2021
[pfcwd] Fix the polling interval time granularity (#1912) 98a3ae8

Commits on Sep 20, 2021
[202012][teammgrd]: Improve LAGs cleanup on shutdown (#1916) 5a4678e

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 4be4a9b31c8a..5a4678e75615 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 4be4a9b31c8af43c9cbfca24098158ee443993ab
+Subproject commit 5a4678e75615727903dadbf6e4fea0d19835a728

From 5921ba58b66ab5e0ef18171a1a4de25d59c872f8 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Wed, 22 Sep 2021 03:46:57 +0530
Subject: [PATCH 0806/1674] DellEMC S6100 SSD Monitor Porting Changes in 202012
 (#8626)

Why I did it
To monitor the SSD health condition in DellEMC S6100 platform post upgrade.

A daemon is introduced to monitor the SSD every one hour.

To check for SSD status at boot time and at the time of cold-reboot.

All these changes are supported only for newer SSD firmware.

Porting changes from 201911 branch

Added a platform_reboot_pre_check script to prevent cold-reboot based on SSD status.
Depends on Azure/sonic-utilities#1788
DO NOT MERGE UNTIL ABOVE PR IS MERGED

How I did it
On branch s6100_ssd_202012
Changes to be committed:
(use "git restore --staged ..." to unstage)
modified: platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
new file: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iSMART_64
new file: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_reboot_pre_check
modified: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
new file: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_mon.sh
new file: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
new file: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/soft-reboot_plugin
new file: platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.service
new file: platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.timer
new file: platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-upgrade-status.service
---
 .../debian/platform-modules-s6100.install     |   8 ++
 .../s6100/scripts/iSMART_64                   | Bin 0 -> 221840 bytes
 .../s6100/scripts/platform_reboot_pre_check   |  38 ++++++
 .../s6100/scripts/s6100_platform.sh           |   2 +
 .../s6100/scripts/s6100_ssd_mon.sh            |  21 ++++
 .../s6100/scripts/s6100_ssd_upgrade_status.sh | 118 ++++++++++++++++++
 .../s6100/scripts/soft-reboot_plugin          |   1 +
 .../s6100/systemd/s6100-ssd-monitor.service   |  12 ++
 .../s6100/systemd/s6100-ssd-monitor.timer     |  12 ++
 .../systemd/s6100-ssd-upgrade-status.service  |  14 +++
 10 files changed, 226 insertions(+)
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iSMART_64
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_reboot_pre_check
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_mon.sh
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
 create mode 120000 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/soft-reboot_plugin
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.service
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.timer
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-upgrade-status.service

diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
index c65ce950a43e..fd891f0f6e8e 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
@@ -10,18 +10,26 @@ s6100/scripts/platform_reboot_override usr/share/sonic/device/x86_64-dell_s6100_
 s6100/scripts/fast-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/track_reboot_reason.sh usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/warm-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
+s6100/scripts/soft-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/ssd-fw-upgrade usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/override.conf /etc/systemd/system/systemd-reboot.service.d
 s6100/scripts/s6100_serial_getty_monitor etc/monit/conf.d
 common/dell_lpc_mon.sh usr/local/bin
+s6100/scripts/s6100_ssd_mon.sh usr/local/bin
+s6100/scripts/s6100_ssd_upgrade_status.sh usr/local/bin
 s6100/scripts/platform_sensors.py usr/local/bin
+s6100/scripts/platform_reboot_pre_check usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/platform_watchdog_enable.sh usr/local/bin
 s6100/scripts/platform_watchdog_disable.sh usr/local/bin
 s6100/scripts/sensors usr/bin
+s6100/scripts/iSMART_64 usr/local/bin
 s6100/systemd/platform-modules-s6100.service etc/systemd/system
 s6100/systemd/s6100-lpc-monitor.service etc/systemd/system
+s6100/systemd/s6100-ssd-monitor.service etc/systemd/system
+s6100/systemd/s6100-ssd-monitor.timer etc/systemd/system
+s6100/systemd/s6100-ssd-upgrade-status.service etc/systemd/system
 s6100/systemd/s6100-reboot-cause.service etc/systemd/system
 s6100/systemd/s6100-i2c-enumerate.service etc/systemd/system
 tools/flashrom/flashrom usr/local/bin/
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iSMART_64 b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iSMART_64
new file mode 100755
index 0000000000000000000000000000000000000000..e485a6ee104e320cf8b24c78ed003782d0cf9b4b
GIT binary patch
literal 221840
zcmd>n31AdO_IFRnK!898<cNR}A|MDTAi*G@1322CXgs2LAorzQ!i?f75S)x=Y)9gO
z;*B?6D_$6)kO^WYx*icx!-^VR)M<xZBe3hJDBtf@Rrhqyl|$V1@5ip0I)3%))vH&p
zUmab&%6aB#X*Qdr|4WljmMB)=*};<dUrDODxCM*TABU7LwZ`9GQV*#m;&zrsIh5zH
z{6++6{WpW<N)k~^$A9^0JRv{L!2<ek51xz~_&=RP`lb4!{~RL7f1jDj3F^O+l*96=
z9PuhG5*03*!O|u1Tl6%KE`Nsq>g5Pc<+4S&Y=PH*>jY!^uiidt8~t~_sP6nU2VxX=
z(2sN~`y2fwEd49^$~B9^#ZF$Z*g1}+>%R*`<Mm&?+&L)6+Q-lh|H%@Nb47j0<RS_F
z^<U9k>G%cnXN(wr{DN777tCMeUOsqv{)oXNh99?V@o~dgyNNzwPd}@W)kI{7za0EW
zJa@u>qyv=yVcELd9(wnaZ~N7>n%nXDQ*S)^!Yx-(-pTlnXs~vr=SW4iPAu&dq&e{4
zfTM2iF}HAf){77S&=Jvu|8h}rqRbC~PL#d}6(&m0PLe(=37wadq+gzdPH7T+TcqdU
zzu14*A|Vl<Ba+bHk_7*^B>0Dtq`#je{fi{@3zOh~PJ-W-B>kQwbe>O=etVMie<exx
zB&j!)Bz;|y^nWLzpOz&3sU+$CB<U9<Nq;*@dR7wsKRyYb#(5&WYMlhXK8YOulO+8Z
zr03wj*ncM{p?_AAbS+8x&q>lRO_J^cBZ=C(DhYl-l5{l*otu)Rf0rbE1k!WxU+lln
zlhpe-fQk5@nFN1*68!cg_=&*h;J?^^t&-?Tha_~aOp?AON&4wX?;v%PijJJgs@9*Y
zpCCr*r7`I@2>iO3bP3O?h4fe&Ax)id{-mk1W-pyRcm6Wh?4{>V8oyxiqS@z9pRr)J
zG<E9Sg^L$WUFMp;)HQXgG<D)tQ_mH+@e8IeTQ++cFP^aQ(#7sYv#6q(yrMaC7Pyzq
zla{%b&RlYhv~0=J`HNh0q&bV1%w9x^i)JodLcdFA&RZ(Yam`+^0M*Z5ws_{qkyDq=
zoW5ud2chT^w+r<WS2M4eI&<C?Q|C;dzkpI_&YQjzs9EzDNpokrmdu|eEuDS!d@upB
zuEkeKb7n7QR2HDdg|info9!Z;D76$IP@TPW>7vC`7c8DR-8FylB5BUD*|V=8FmdNv
z>|U~D_EKr)g4xrT0!Vc&cDq<M_?k0w!Qy4JrG?WMpg7eD8sK2z;;TrKGhNp#nLTv|
zk(QS61}$C!!OoTDFP`aIAT7HF;$KJ%xf$crXTgO4&m4+mpiy|yT*<v`!R*;fq&ZhF
zo$s10%~?8o`Yf=t7{UO`HGko3X}W9ie2LnyfJKQF2-Ur4I`WoXvxqat#f@exrgl?5
ziH=@49RdW|+0yA}P8c_S>agR69hYZ>PcT9!8lj=XjbJo1^h8q8H1WR{;y0R-29Jm5
z+6|PBPW(${TPDC#dMlC6>1P-yHcTWN`=2C{|CNLP+}-B4CQs`aj92<+1KrE<tNVXP
z%%9&*k}{+dkWXn{S-h1rM#S&9^-j27Ev3^%yc5f}OXrICT`WIcx>Uq@eQ8F0k;OBp
zTIR!%?brY5<C@%A^7Hh6`naZa^7Hh6`naZahn|Sv>?NFjD}-SJjDI<%bg*Xp>u*XY
zA5;G~#FVc4)RdQRN~gN@e-2YR^G`*FVoE2T^nV4WblsLw-egmH8y$?_X{L1Y0rh|L
zOzD|=B7T>c($S&DzvZU%_C~5C6`9gyQ+kOhUDpxHE;XfhFyYsk(#_AI^``VAO!y6^
zbeaR`|2CS^JL`$~Ei<KeF{KAg>0M3f)u!}pQ+kal{YX=Kttq{mDZS2=-rbZQGNtQt
zQ_8M4r5|O&M@;EGP3h8=QN8VDO3yH*=a|y7OzFK%>Di|ATvK|EDg9_udVf=TA5;1e
zQ+i)hdcG;WpDEp8O7Cw<S4`;xOz8!t^kYrwlTGOZP3hB2>4Qw^^GxZ3P3cQa>BpJU
zmz&a$H>DSu(ubJROHAoQP3fhk^kJs-b*A*;ru6lu^gL7g22(oudiuYOrgZi=5gBEs
z^n4wR-+(FoBvX2|DSebFy~dP2+LT^vN*`lNS3G+&6xIIWlw3*i23+>gi?Ei8XM4u$
zCJ=&$^0onTsPA_Cm3ui5qWC-lX?2J2uWvcU$uw&<EdBz;$s}t57JrK3WQw(oEdDUX
z$pmZbS^OS~lj+q;S^PGNlgZVJSo|i6ld08~u=w>9CljkpWAVRG9M3>WD`4@Z6em-w
zIavI1ij#@ehOqbyij!&8a#;LgijzszvRM3FijyhTBo?1YaWbJ={jW&qJC5RHI<-0$
zKZ)XGGPN2OA4YL9m0EzskEJ-7NNppF=Te+Zqqd&KyHT7>qE^b{9Vt$xP%C2bHWVil
zs4ZdfG>Vhy)26ZbPnRN2CQmD1@qH90Q>Qst{9B5XiPMI#_?HwX)28LH_}?i`CQZv?
z@f{Q=Q>IBQ{uaf_glYA^Q2V!0Jcr_SEM87=GFe&;i@!i|GF4iD#h;=$nJ8@|i$6?p
zGELfg7Qct$WRkQ}7Qc<+WQw#R7Qcz&<XUJ;Sp0g5lS$I1vG`voPNqmJVDY6CCljPO
zSp0H|lj+fhu=os$lgZI?So~s&lc~|NSo~aylZnwJ7N1CQGA&yDLDv5iCzGPpvG_?8
zCsU%;u=p^FlL^rREPgD-PoVfl7SE+PnG$V1i+7_qnGmg%#XC}*Oovv);%z8SCPQ1o
z;%O8oQ=v`c_=|I;Ii-lRe?$K{!T0`UitkIsv!}k`{0YH;v~R4W1S?Cwr=Q?<r$Y)I
zgN{8gNA7hhp1(I@LRF{?CVx%wMA|F9udeD|Mx@9rbeK{>8HefsE@t$nyiQhN&T)Et
zE9Dm|tN+CaRQ}om1QcJrQW-i$u~jMW|LW>&P;0AGlY2>1Ugz}}jrlPR%Hi%%h=QR-
z5b%^L``1Xa?PoPrWMM&8@th*L?cv)|&LH+Z6*yEgMf(fNP#6|1OYyCU`07iX2NcyA
zQG8Vu{n2<<B=iV`1%tN$q!nK<v=e>1^-=I%G0=d}_$XR&K!P>QLpIQ73G@Yss`m2{
zd-HXw>pWDJkIJeQpF03t7lB&|T*Yx980v)TD)K3G`Ok+Ag)$$rq1x9&nUB-&--)#n
zquvYydor+!-%E=+1bM@Ne8n?Hij0qqjJJ8lSt3I-GG0VRg|r_GXg^U~oPqLeSmCX#
zYaxISsGwR1?w!?J$sChZK7yVRRI$@~sN!>m5DUqhBu|~K#Q7PIIQq+*0zT&+&x$>g
zJ4>Y57-Dz0hczx@eOT_Ns&kKT+tvwSs-h5oc*nG1jOeux>1|u5Ss~x>7Jv~)i$JIq
z$1JpBUN>Ppbw$Mi*YUjaf;1}TsavH~)@3NIYvfm`hHI#_*I>dcN~?}^WZrHiJ<rI@
zK<2~N%rlJ4Ok_T1%{<P?%tGc?Yi0){vlB9RSThg&$T}^gI<k?u$C~*uGArm27g`bF
zFf=iTi{(cv^cg`1fZiOCalj&eH44b(fNU$^@+hD$2lTN5CPV@KIAEw1&>sNK?z=x6
zIz(zCdmYfP3I({(#Ap*pi8zHNRtjI6Ff}0qb*&W@FrfmWGy~?h!tS=fpc$ghhpn)s
z7FfCgd(H|w!veD#u-B}xJ{DL@16E^&{Q?2$BgoM7Z>*SIz-Y7{ToFM=s7<s84KsOD
zjZQ#R@;(%Z$usBQ`k1@ZR7S|tC}qf($}tH?%UxzFr%Tu<s3!z`RFVljTC$I&Bp14=
zq}~fulJ!Hh<hTDZMA9b^;{9MMsdo&OWL*<2xzSRRca5o}-d9wT^;WdxRhE*xw@fAV
z?xT{d1EVEJTS~%InTj#PMP*orM$2SG%h&=T5=C*qeT3eNP=n%tT-<{UGBd^w0m4Y}
z2IRGY66fbdD?XQ8T@7=NhXFI^t>A`)I~&R5gp-x8hqnS!F%N`o|0X%dJP_Ux(C7n!
zRb?>8c$K|BLc8Tn&d)vdVBOUv$|v;>xcAlqz)JQMc|B;HS5=%~sALONZ#+Fj?sy~j
zs{_QG{jWb^x`GyTfy62t<76qc7a{F<xB!AKR3t`#NQo7o05vSYD)@N`1o#}1;{~{y
z@fah(VgXGeKpL?mpE3-OcmWE1C%|0*q!!?|{iy`_C~_gdg+Foueh6N<0H223bpgg`
z#70&|GzjX)ME@dOVQ#o@-N&RJP$hI^q0v<*p;XXW2e_m?L4}}cYGIu+bB9v-Wx8Uk
zQ9OYxMaAqhJ{^h3Lb@CH|0tDT17FYaLs<F>q#sf$zd?Eg>A*|MfGTo0JpmgY@U0d9
zMkvE6a9$NzsZuH<J>f{H&N^gI@WEYsU-9h&yK@Y7RkXt6tg|ul(kN%0yk;UORFnV_
z`s?=y?V!-36be)59)!?Up9x*BNdFHKy_9_vg|0;?oP&p)&E2hH1f|SJO3{kllB-R{
z*%ZGBahAWJVjjgOP}%D#bP9#;qfj1&Hc@CGg=#3&8=;~VpGmHqif<|2fyH-A?v_O>
zJ|*fcen9Ha^}zR_(DxJ?L7{IDD#heJ|B@-peTDa$1Mf8i@3k)Ij8Iph`E{xUdveQL
zh%qm*qJYXi1Wlo_>OAOKad3!S{1mbgl2(4gi;Qv}T#*)jw^Vf=^cT=5jO%IY(K^Lf
zn!zj>Gyzs@D^2ieB+tUk%jb-ERzxJ%d2rf2kq2CTJdp=otvr$YUG2k1S6o3{^hFE8
zT`P(yd?bb2R;;IRJJvGQzV<&{uYVzFy-Yc`6UtV~{q?cupQo(e>wp1Nd|S%kZqHKG
z^u9ESBp-KZAoLi@o#}s!W^jsnKOul$ax>-EDgH@W<vjc@u}uAUrtfRT_j#zEM#$>z
zl)04#NX4sE^&+H_$h>cZj%N$~mE_`c;AHbid-+BQ5tZeGkvHZ=#$t}8_`OuW)lDCS
zW+?u(oG~vkww2aOh>ro7#A;>KCQH8J`-pNoVKSrL!*Ual{qQ@G4SH)aUy<NQS}AO$
z)fS==#I#wv05n2g#zq1{HxnUC{af{?kB>^zoFiew&WkSyD66)B3Vu#AnnV)mhJsv<
zE#2L?)ZZqlN6;-y>eUcZ_(-1f73F+p&M7TBglblAAryt=)4UY)dFvnxoo-G{liCW-
zHXRGjoQyL|mt>0kJ1M_!GR~*{D^6Cl?nIKFLIwBI0I|vveZ%s{P(Jy52}RN>o-i$7
z5#e+yNQWg77JT=g&?lz2KarqbMlTy8^e_=g?zHfyrDfEoJR!{x*d7QhhFw}Fqgrpl
zdW?2dvRWsjRxatbdJi6f5fB<-u3qoK!Iaa(oRgdzooH<LWeK)^z=+pwpomq<w0cKu
ze~kR_{DhKvbgwR{3B-^JB{U?JoS~R{XjPEvSxoiVN*il%La199oK-YxxWUnG!o<0>
zRDm^}rJTU68CEW?2ve`juD@jLrQF!lT19_Y`&wEU*%@^11rt(5-Op&nd*5Pd;>tVt
z(!`Z(jirep2la`<LQvz_M}RF_u@h6b<4C_%XDzKzEHsegsa}zKlaV^ul=_5`+Lfqo
zM>I4ER4d-5(0B@kC^V8n*}oukJcY(ns4s=4Qm8vZs&lWuz~(F5tE?mQ8CW_4Vy&vU
z3i*6ZVN-ID*8ts`9CU{PT96#{hygl1Ip_rgl$#t>X@GvwlD4kK0M#Z3eQtnWOb+^&
z0lFnQ=obStAE1iNUm^PkLkJy1p|unmM<JC$(<ro>LhC4WHHB&@v=AX^I((1*vA&0A
zMF>yDCuvCVH72;Z#rKFPjgnhY7LVt8WY;U)w+NB@2zMdeM)53+*zl*G9Jh!v${BL?
zXZp-N$OzV~6nSevvElz%@{zFW(^txo;NiHphn_%JG>DV$2w;ROGiz7{wwfx=D0e8}
z9bltgGP@Cxp#eqpDhds8uf*0wyaha#!DEwoEQ`mc@mMyG&Ev5g9$Ug=v~U8N%Xw@F
zj}`G)K97~~n1f<?TC$(Qtj(8_9DPCf0{fN6;PNWIh}y=Nq4*u?ivQen5G|rn?DG}~
zGCVe!$4Yr@8jr2xv3WeUp2wE(*ajY3&SM*Stcb_xp@AAocr3tUr94*6W9xXVhR4?P
zSS^oj;ITR$+sI=f9xFpk_0}We^9Cr#@1@0dnA>c4N1NwZS}(*xXEVT0RYm$C-At_c
zIx00goq&MWu!TcilBJZW%hf(W5a@0YI12>Az2X2T8i2v(8cr7F&oi>yo3k$!*_RvH
z-+e_-8E-mT2(~&@tTu8!L{3<)xZ6nBj)aPhh=zXJL$Z-j25tS(06YS~emTpVg^d03
z#es^h(m1J%p8cT`Ud{8onp{O)n}Z;9B%6LfC7+-`N}(xK?~$gg$wt;VQ9&jO&5^%*
zQ$DV8X?LoT5?GDPjT*ZEt9nVjy@BOjc?k8~VG#Q_Ys4S}Kp_A&8i1VuKr}BS9ijn=
z432o)K)k?63^7Ph2qZ!V;8q40ZU86*K)OwD>=IrFsU8!5j*)W#av=VEBf-g`LWCVE
z&Ngxea_C$mp&N(3pi^CG<VYNPr;+g8KUgDQ)S=HBIUgbi47_0^Z0FFIbm(p)=P3?7
zU?kklp+a;WD%z&$4PM2eM;i%?IJ8`+dXkZIK8K!bB#cJ_20{U#q%!l3jAKn1o<I&|
z78#lCESV0<yvxX}|B|$X#y7U2FdwwJx`&4$f!uZIf`O|BF5Jh+s53I2ql~r{87;<1
zp?`b<Z%OsOW}?<UoL!Mac|qi1cBxSKRSLJQm`CB~s0_4h6K{WJ#VSg@n-F;wcT(7o
zFaTtan2J1uL_ShZpt|LX?M6Z_5&*peGe7bit13P*vRWaF9Jz?uk$V`V#q9OMu@{Uj
zq&Y0@I$><X#^EVQkDDwWtPVO~qw%S2ferDjcujKWb7Sz&x<iM?mi-4cZElr5PAYGQ
zKU=%vPeph9;hg$V5l2@5tvX+$XP&QyKRU6dlCJo+fjN4Ro~bU$N(sO=L&oTB?tUpj
z3N|&AnbqOm4WN|llmOH<@KkwIs3Fj?0M#`F8X#|~Z3xpJgc<}L15iyvl==Zw-4LiR
zK!JupeMpy_&ol%(8nhw}fw2G6AO@RA^$pR<AioLcOU7Ps4pZB)=Z!sg>^Wl#PE{v8
z<Mc&*Ke8pbd_w^<K8MZlY%lOQU$d#+2nNU~=WFts;h10Qdc6nA&Gfn_*VN9RL1&9V
zA=H*a?7?S42$+^Dr{ZtxRTm{?vzoj}HHCI@fCJmfZ;?gXXmENNst8|r*a%k|gzdyT
zYkmesG;4l4tWT6;CRdA@+}J5&FB>~mEZ(i&TY#04Sl2U!2UJl*g8Fhd1eIe)sFp%Z
zWbYz`$9+94DohhCRB_X!0LG2Of=?MD!V&Knh<OHLB1h0+3D9`gK$IAW{v46P5$_p@
z4F;km5Zr!a1=2eSMvU`!+-`7M4OplTg&5D>D71^xvJeV-UpvUwainkotUJP(6M6z|
z6!qpe=s}^U$(xGpw1`H7Q-@*dD2b`#K7*BOccUj50=l>zB}TExs)u>)_kDueGh3qe
z+bG01DxnbLXeB~PILac9Xr)Q7o;dorF&t?inu4P?RC`b2NTLwq=s$ngIogX*5{|MH
z$>_6qjvR3^y3ouKwaF@@<y8AX;%E_t7)P@VjxJ8l5jKb7W%N~JIC=v_4H=m^(k_HD
zan*tYA$t`=w|49TZ%ntUDa5$kN+H&hFCmmfZjIHgqByzrGIJTPTMnw7>DCB?qd^8o
zxyd<dtZv0~<OfkhZt)!bwH6#P-FlQlOh)%mh{>oFp(HYDtZv0~^fQPW9GQEP*WQC_
zXS&sqLX4vf3Nem;{WvK{jn%Dqj^-!hD9&a34%LhG0ngqcY|YKR(^ps%XRC3p1`8ZH
z5WeE);q4zGjKvPsxziKMv94>4#8Bea_%l=hSFE1xp4F=bn8+jI$iPGDTm!V3f$Z0R
z%C|(m1^b{XZ^bjuS<5#EKJIJ7u1lR~MIF}j?q$!`nhx&v1R%z~8EBKjnR=}IF$CVD
zb9y=G>EZT*YsLoc=$Uv@-FwFR>cQC+24}rEXQADkvjP(Aiaj$|$$Tr4<e@F4$6kex
ztj7>g54Wkfo5Fn%j+6H)ByxEh2eQnf#>NgdA~VpupmPt~)4*9LYTt>(c4b`}g<mC}
ze9qdSb0>gOI3Kct`2C%{6lF57)u@F#m6>lTY9Ty>x8zM7<*jdFOH+OhfA`ql@@09P
zJ8e{MW-SV^Dt3MdvLjz#`aGkcx@nDeINNc;8f}m=E!%OJ`K+im^N!V|ptGLyen97a
z>jsE|n7%+Tt$0?{ViBz~t+b=>%3<81C%if^Y4aX+qs2ZjC_4CYFu>a>r0_CH1RB8;
zQNyD=Ary4hkQ~A@RA-GvEOm;1bQ-5uSx(Cc>=0S#=AA^jhA*3i6n|z~d_l+)vxox&
zw)tvQcm3Tz{90o3IBRGjk7?g7Foy}>EutXXRHTJJz5vG{b5IN5Y!tQO;X0DbWgkS-
z&qX*+V<rKtYs~7sv?FO2Iuu6nd+Atkxr17S|CqR+pep=cM-f)Y#VSxRbUZC>`(8KF
z`RYzEM2p)rW8#Dq->$7s^IqdaI81%d^R~V$y7NX#^LevSvEtc6Kj_pQG_?zQBfoO@
z20=QHOe|@Cr~dYPrxBw?NH7@vm9?LhQPfl4$i_Cf?7IaBOckj#JfjxmcVy#T8aVRN
zRGg9HsWj(^CgU`b4vx^`8j9(eSXJEw8r5(giABK<x&0S7eU)Q<k*#IsW*;CCdbVe2
z{$$)lbjqH9!HtDSgBkExoroL3J7Y&Z6Ro$fcHsqEKQMDNLvW;X4)uBAXE5pWW|O3X
z-V7n`@F;Lbk*HDN5H<jKuldYlAe&KUMQkSOmG6VZD3*Nnv!GAaKo~gP$~p|I*{qMq
zre^_1&5&>G9F?uLtB=?LYU<i-(n+ogTkFlu^N=d=3>q09|AgpoZ`v55>WORG*EL8^
z)U-rOdJ)M1Ym6q&TeM<!jgOEwsbx{lk2*Y@dx&a0=YyKU`GW*j*Y-DY-r3B#Y~_6B
zkAVMnnZHT$isyXkdq{4q%)cVAx^{?(^MPj03#pE%%%6-P`rA2|6LVhnZWA~k$T`n9
zaqcj4elPV&l=JU?I4qnO64iK_|N2f6&ao0l1_A@^Zv@e8Kio3#%GEj-t;W)MG;6w%
z)e2eksIqM2K1_tvDUs;oYPp;y`L^6#{|hR5xd=aT&#tv}h=EnN*+G`Y_wjz^>7e&f
zVCi4byTJ%OV}v$}P?h(7grq9(1N`Sf`hlG)6ZxSWaD)f*K$t_S9cQn$(u1E`eLJlo
zE=Pkx*S;+{(00Ll@i2DN<TbC*BP&`C#aOvZP>%7dJq@(#eF=0uq3NDT7x_kd#odR8
zQTiJt8RO`DjM}+s2RuhVJE|d$x$ONLe8!6zar*}3;-NHph+F0@rCPKxJW~~!L-kA~
z;}sB|xkzLVlfCVc!b_7grICeJRQn_|X%ZchCGAU|IYcKdd&yY}dI`YDS8{+107<C=
z0`#%oU?=0az-<~i;9Tl9Z4EE+>HEBdpOj!7h9Y%B*j?qNPO*g-fTeN)xf~FztNXmv
zkDe{`x7W(nJTPG8xCBD~`g2|ABj8yk0K8!UIx_%MHq}d-H<oMHw4cUG<xio%(W)cS
z1wP($Td4mI$=(y_*|mu=%a6(7Y-*g&Ohqk4TbRzdh8n#Z3_aAvM%%P<#a7a%fp4LM
zeJ!yf^a(|KQ1mZ|>MflvTDod7Tmr}UP)mz`w82Fi{FJQsKJW&n=!Y>S7Y_p+b?x$z
zzaCQkBsWpi$BudB?L$pjtR^;oWbdo!8_yOtgs|hZmI8VScI0X~CQ6<yY+zA71uXf`
z<8lf3cWgYlu!**oLRNN_KJ0N$!`K*Gb55bO1Z_L+W=q>Dii&$mp-<2of~MgX_5p=(
zUv(|DL-G49Qetf#GRr2FBoI(5@<CPa#{DRVomMKYddqmMn#Te>R>Nb}JXXtNH9S_w
zW3@aM;;}j&tLL#0k41Q_p2sBWO)LoWSO$+t2N*9|JeI*@**uoTV>vvQ&13x$Q@uHe
z_`E|9_G}T|`3VL%^dW%mr=thE*}z{94$#e#wh2+yOHpMVdBN3yakcT%aVmZ&=9VC>
z=Mf0=+z9lOoB9*0VGY>{n}r4dqj-K`52{rBQ|c94t>Q1O14(ohbw@)R_Btn+wc2TN
zAx_d7q@;5gss60VAC;d<R)n_y-^cd9D9bl>D(hO%>Nov}!h?&7p<g(6>tiE9Q42B<
zEF#|20!l66!E6Lec`ygTbv)P~!Sy_d1&_5GcrYKqjV$PJkny5m^gN}nQnXr}s>J!-
z_d+cov(Q7IL3#P{riSnzK(e9FuwyFlIA!8tJweO1sBaXD$ZPUpikO*4S6_#8Y||-4
zTiCPBb&BG@pN3jPb<IUxblmfKnx~1=SMQLB8)(z<#N#`k8ig9dAF2YrO|(raSJ;Tn
zJ)@zb+o|ZM-xyVehcr~;HY#yH?Y|0vt7{$qVFPXm{qTjNr^1p{w1qhYa&Zgjz34f`
zPSf43<MCjo2is{RAlU42*6fKQ`xudZv^D!2k)6S_<>H4)rhf0n6~7)TCs)-lVEx_z
zeg9g@KtAg-&fn6r*|Xw;h8p`A5m>#K`M)^P%QVoa275fDfvbTDeZdddt<Ox8!d)sR
zgTv61ud`*S#T33DVK&C$nUS~FLtoN4fDE&@CeGX`Sku^=2G<5s;<iCWEk5U7&x*a$
zHRD2`Zi4}#hv)%f(D!=iZI&>>w`;5~u=xxokIox5(*q#yO7=76FZki4YEUPR!dVYj
zW%*XnNo|}5$BAqZ?!FzqWz>hv#_k%<Ku0js^}T$6&3D&^@DuAw2EAEWcSrr?0cML}
zmA3_j&=aNjWlU_INf72|dbSX~G*@>XXyNL}16eM3Bb3#_eGPh#idxS&D<nHklgvGk
zTWR5o6w3*(HIB*&KoQSsQ734muTu50hUf+^O*e2pEW+4(=jKW!nOLb}go)-Qun0bH
z2H5ayp}*2K7lsNesUMi9MU4$PSsdU?AwKGt;VeP)%WC4z-#G`zXV5RZ;M*$xF<;_`
z_e(zdP#cLe!zmfNp*MM}=~(Ls;JpQ(Hxu=$>@Tqq4CRtkuqYHwMguX=K-?G??NJjK
zPb*hD9%w0h*YI%~FX+$Fh!{ab9hjhZlNsclqra-+%|TVDk$&J-vo}>-SwbBiM8{}_
zIG!x}LQ#v@`F@|bKj4BVyqrYKN$V6FO9hl=*0rK{i*-u(6Q#Cslp5&P2|0SVk|yZ2
zS4J`#DAzGbxvU1tebOs&ec26^+rZ0lfwa{-DO2|LPS!~$1(J5siPRyfI!WoBQsp`s
zjo^K%<fepw-IKMMV?2?zbOtBWbs|nk>*Fu0;qkYg6A2G*N}&b3P$?Ii>~7MCKaLmX
zWji*l?7pLTH~YOqAnWqU7#+r7duS_3-?_1zj*}ayDo+iR=a^I7NKGkQFDjzZ4|k+h
znHNJKY%hBVKPAqMDa#cY<>cZ=P-9APF9YlvlM)!|p>yMIQ{{ZVOO^A57U8oI>V#0+
zurp=hSFMFX0EIiEa0V-kzt6WsC^f5YgNR)G9kdE>SUvBl#!KhVr>y&QQLM!IVoF?&
zfqOY6?#J$25GBr6QsQ<PxXmeXPaC*bQ{t8zxR+Am&M|PCQsRy^aAhfREeu?FO5E;l
zx?EmMiF?_=ZApo{#lUUV=&FH~;7bf}>P{YR;8F{*oq<cO3|}9qH#)VjD-2v}rCDd-
zQg_Og25xhZ*`f0=(8=<^9Z+DFs=WF5n+1bP&Hxe}_~EXD&pVohQ#eGKf;zK2c<Pho
zfky<FXgE>x<Degog(Fzy9f`j=LGNVzz}p84Yso5NGX#IPdUN4>38(h)&9pLz6Z0j^
zLoC|D{6x8!?gip@7)LL#sf@L;bd&`xNo!5r{xU^HLpD=#x&9K^-B?P)Oqa2yjNB%#
z!AwMVHq`7C1*frsl_1JIgP9-blVy5c6i492vnyL=toWB;zlF)sT79?VR4^wtsL(>y
zF*-@=5niY1RaZc<=o86x;XQ2bwMuw*MTD_)%(%!{y@dopi-z(o-=H^WHp_hGbok7I
zs=tIr3S!jj<q~>COk7?#AIm%EhHl-2zA^c*t63bL<T~^Y`LIh^g79JKVqo~Nmp;pU
z*v{-{Oi%o9AJ+AX;l=6hdrSAcgzmc!&?H{v4f`pJx%|n!O1?svDICiOAO@V%B^3kf
z#}EN*i6SPsWYKo=j$JP!11Hpx5jz!|k7i;{OEaD5J133=8|+Hi{6&iv&zisN3flUv
za)xkDV0UY%S<qQax)@%j&~83$R@agfOQ&EF%@EOQc@sL<S*<!UX^H4md!6sSp+S*C
zFCEwVDt-0xbCo~T42_h~UO7Qo=R2!?1$4fG67K$C#cm2B#pA4nW>9LzC}-`e)uo77
z&II3rR`a<WHd=Ggq!3O3H1HbDM3PjKUZW|Y4rMQ5r+$rQT4QjjU!!4n_WVTeZ~F@C
z;Yt@qJYPz!-|`hkaDz||UfPjgDLhC?HFNL=a=8P&!aXnln6y`O@%}Fwr`kU+&y_rp
z!Sam(EZ6!1#y+jze&t6tNlj0q;|PBHEJQFjJXELJpG65DriXc#?qHL*ml5ZRe+INi
zyPFn<?Ik+sOb#kFK>Y~hVxXBiXfy|1VSsD|I-7w`)<MT}&}jx}HyWTF%Roo!pk5r*
z+W@^nAUgvc*en>&=AeU!bH;BYP#qR*Rr`B7r~?OmY=9OL=v4-KN(b3F=mi6$5a><@
z^6H?U-)D028=#{JbR`2#(?MYlnrDE1eF>m58EBLa+QmWR4bUzE9m7CfbWo6kdK#dY
z2$aS^-<JsyY~r9F5$7UUL!eJF?p6ESI_Mz|+G&6;Cr}v!J)whc=Ah>ckdr{SGtl)q
z$jw1F8K4{jEn=W4I%p0D%{D+kzX;F-2Flk#=W&q30DVNDJ`8k(4jRuv-3`$51UiK0
zqiX-xD?$V#Ip{x#a}nH3puaQFn>uI!2fc5A<`U>-26|KnWpmIo2520CN*QRC4(h-`
zHyWU$2y_JlU95xJaL^0`6nO!l(-<gE2mQN->C+ek^Z|i-Gf<Wes^g$+1N2t{9mJDQ
zwTCwe5&VsV_9M<k;3Lq-3{<6qHgV9q251(6USObybkIW_^rQhgg+P7=x=sh(%t6Hl
zs2hRiG0=rN=o${1YJmRzJV4_aXqXPVf`d*nKs5yF$w2LN&`b{MY=E97(2wLh*+VZ2
z5uD9I^@wv3+(4k64D`AV8p}a{GeFY`^c({{po2zm(BlSZG=Xknplfu{Kn_}MfVvWB
zHUpingSv9ir3Pr<Mt~d)bi58~%|Ry`pmzw=oq^iupr77js?yN_Z6MHp@F-C2U%ezm
z@GS@Z6LBsA4}soipnwjl<DhB-bQyu3VW4|;Pz?t?Vt_^x=tc&*N(WVO&`JZ;383(7
z+!3cEHgUwI24dfHK#W)I!*s-x9C4C?s3Ame)t;pz9_EN_1MycN@J@ieB~qemx(Y^3
z?E0<RdE1NFLiT$lxcCk2E@3zM4no_->y-iKRoRPJT0UF7W|t%Yw}7YRlk>^0gQ)Vp
zO3oQ-s>g3R-8*2cjVyi^js({0DFX|9(TocyL$&t;F|{aP!6YHlLH1sVeuqz2O||>H
zwe%xm{*u<XVnMHiTr`Dm(!MeQx?zAiMnUurfS60L9nM<_$a!S12l(^alW^flo&;X7
z9C;SV)KHcFl6}O7XpgC`Gk9GBL?0qB5j5A8%j=?MQw1xb^q6e*+58^y?eFYk&)dA)
z-eqciFMhbj+Mc1>nY7@TJWJUqeJ@fmwJI*5!YY#rUT2;&CeYozJQ|l@frFzLy_y&0
zRIf$z!qhm{ss57EDBtC##w}7%odLQ#3W^n^6TqN-{`0sL7XPrRHWWXj$GT+%hq0hs
zyqYzXsb2KF<QWzC>P>*nAxKlu#GUW(CYC)ddO-A#KX1Fpd4T5(*9Gm*dr9OJ^PFzc
zR$nJ_E@wIJR#=>e3vXvqz}j_*eal9g&f7QPrx*g=&zGE;SnMPfIy!Qm?4^;eOTvDu
zNT1}!T!4$vew#>};GSxv(UvfkALc&8NW;AfBJD&Y4R<WCv=iJ%8)<inv=KO&V$TA1
z^iK<+a}0=yy$2Jr7sGaxohaK;cA{+S><l-t9c3rV_FaO-$tJefiL~>H?Tenvl@OP-
zp$XY`uQZwxmFVS0nl8~{?hA~xXcOoN3-2Yp3B%pT8EJYGM!35L?K}RO%f31U6FD9n
zRXJ=n?Lo3%I)$bRGRj$0kWtQ}g48+7GYL}XEZ-d!q%K^uAa&s~L1v)^U>N<+PTq)y
z8*H1@Fe=C>8&P(nY8YiV%0`sks2WDuMSuF9&BZ6cz{Yel8#<};OfAw$O){y5PHF<F
z#>pUsy)a4Z0#Yy%CzFww=xVD6FDKBE0Ks@m+V_~{U`*3fi|;X)lQdu~-guK6i|}J)
zEU3&^&*VyUe~z|=%7`BJ1aJqXH2N#|h0&B@loE0~qbVm-ipI7Em}Yqb6Dj3eckd|X
z0!j%}Mc1Jsdah~bTPniNoiy5JCflA;>}ImvD5bTTEMqT|$o2(Ub`SI~nAV7T37+mg
zC&~p5J(JZuC7Qyj-R>R?`L)GL(dZetJq`pAZ9~x!viC_ugZ8SYb0v0d^gUMcS+Z9n
zks1QyRmk2CEUCO2*}Da)dR1;W+QX|ENiCR(D!P+kZa0BuxV!40;qFZIKS0^Y4_~R1
znG;3i6QTzYbb)pF>;#CBg!t*HTznG-2&2`@W$zo9FX=T6mA#t~4ccpfWS3h%fvEN{
z{=m<81&Jm<V-)-){fR=a3i|WXf?T<d<H|Ka&-LdG5jmX<wOa&YJ;9518WFd+6t7ls
zGT%JPbksy<zsPxq=RkJHfJ`qULo+&%siSA2CtwFR{}ABy2Kc8ZMV&k1z<Qm_4DdSu
z(?djiEDn6TpnRGEUJvlm1YXX;?9t4Ha)kgN$-$=9bQd{?9?{3*MIdtwkr^6CrjG#c
z;9wJ(&)yKve}ha%km*lkzQruaD%&pvSdAm&7dclNWd61xR~kTM9*HA!j{u(<N2WmJ
z9BYs%2AN}t%%vtW{=B0E&}INH0dNojPp|-g#YdOOg{ys77t=5R2NSRj2bwzFE~q|j
zfb9S?nSP2Vt5rij6_i&R;MyldlQ+hJUl!nV4DizclRvI`;=q0Z?!&;ccRCP3`(IFC
zAQd>5qU?oOG(ZX;D_&-0Cli<@Wv_*d{@&f1&kJnfBlydFnX9+Z%ej}K{K~hAwy-$^
zc0Oq<6+W7bAD=xNwOBhnU2t<Jwnky}>6EDO9Up$3%l0~+)2ggDr<B7ez595sq&<$H
zUVv-#W>M&LRw()iI+JY7ohU=s;D@iY7Ag^iI`W#%({ufKJw;ArJ#pviAI+I8az0}@
z@J0I(;moo=^kXmUiyxnT04fZpmtv_uT5y0U_!uvEuAamB?<{g}<hfw_i^t&85>caa
zj{I&L7ta)qY!kG<0wlZVOg(A?720Hf7C)Gm^w#U}=UpgD9iy|2-ZHz;p3w@KT>COs
zQZ8<3(FW}+ppz)XHrX4XT>EeorJFp)srCUZ*ur(9YVXN{N4W;6_9Iv@(}j6(1`GCa
zby4lVJW9p-y4tGteJt1y8fFh8XbaE7L*O|03!@8IkFwyo?m_x{*0?$fZ|rhMO1!ib
zz<huo3bsE965)PHv7=kirk349sMEryT6FnTv|hfYE!>&#K(O#4p1ycelV9@!J&0{k
z?-=>nM}dxNAA-N0NDJ3R__L}FNu!507~{zkk>z6gkf0}$B^P@U(7JFt5p{>~c<5Tm
z`*!sMq;_&i2*9BI<41C7OGwgoA&M@w6xkc#Mb2VH=+V6aa6G>x?b!tIDgp0hz^?%u
zZiJ+*G{e~*ls|91fIA+<BMbup<R<_RXGzk|GUHEXt;xGq-~;!w26&GJCTQ=1BJdC;
zw)|tVF@uw+ltzR0i-&WiBTy)jnF*pNP9|p)le)Knu?hutdB}bA$PKag${6r0+4~TH
zLHkW0%Rb3*TU<GKq7_`2HpV`2aS7mbw_mtVbS(XV^V?+nKS3ohT^NCRK+y;^*m9o~
z$I|`x#<Jw@9JK%ZP_9H@1PQk;4Yw*4HiKW=pp>D7_=n~l?TwHR;rkfdf}sa+vlML~
zSzakQo2akePU}TtXAJi<*{5UF@0U9`55iOOqb9Y8t|mi279im|N+_iSL>9B$S%}cP
zo4DjDuwOnlfQ$=_Vs!Hp607&imsNszy9`GBB7{)^5}XIcEf(0j^11h5+Xrvn9z@$<
z!f;@bHfm^l&9+UQv<GopH7<&wW+*mnw@D>w9;D%TW80NGN{#C<)}uY<^)Gf4Tjy=-
z+0%rcN{w0nBDB8#RYY=B?M3Fa5~Njm=i)COfb;M}|6mK}0z}IR8it2zFGP$6^f{`1
zA`7OuPE+ltuwV<<DA+$1Om_`|{bND9t1s*y3$}E1gZ*Q{RxTO#j|E%H-diD_pmzb)
zO@hMPA70L4Nd`ug%5q3@mP>m`V7QEDgL_0H;R=0gfHh6)fyQ_kS?ou$y3`^GRgGe4
z@|tVWcGW)bL27JQGRjj}FdLSI5t#NZ#_`9nFRFb!%jr(`Jf8)RBzr!X1-ntvTo&x%
z&I-+6h8N8_1NXABtyorjH@@WHCHccY#smNZ2nIY8gQ`^-RfGp>877#b<aAc@od<}u
zHtsG8j!kUMfz)U$_8w}Jv|(gz3}I?*$Urqgo?q!N`78lLWD<j3SJOJi-w8+5sWjU)
zPRl`a)U`x|uE_RJ+NjuYM?CEOM!Z&ybIE)e@1?u3AJ0nJJgmYr&laN5dZpSZ?u|<6
zo^0B!PRki>V+S@!rEy_(ir)V8S9*0!Z>2VXB<8noyAzhd;9E_{0_58DpmnByT&4&r
z{=Z}x!KJu)kOAl&VZ4R19N2U4OJx*KWhYZO>zqlx$_c)R;`<(QxQxj`oHQA<j?mk4
z(62StBX?<c5tsTP2{KusdnBy6vs7iBTI{9D)U{0bOxU>PiVJ)EW|Oc_M<qfaT;>oq
z5l&zElHxB!L+L0Ed*$bsJDGLwh(4h92puGco%a%Yn&jq*ERb)gh8WSD$Eha&n1}Ea
zx&=IAsk;;qoN}NaNiKGww01fZGUNA5KMol9Sy1sWhv-BQCs%|(RY9R?avi{$EabX#
zZ8Et&g&aHw?&SmOG<C~MU{ig0BmSPM`k!Gx-VK!If0X|6K1TOkcmZ1b4SXOBJ+8#x
zL0a?@c=$BEyqC(WTM`vFy-E%`Wo9~02s$yHu>_pb(vYPy!d($%0)_!t$q;zafVv`@
z-1QFf;m-8iGf~Ut3z?VFIqg;Ir@Zhc)?Mc#hd1J4fYAp5FwR$~$g<4;EJ0$;?MM{<
z#jmJw^nBOZaV4LQ1x;`rYk<h+f`=b)w47@BoH_|DY+ba4J&0UwxVg<a3;MQ&J(Ogx
zN}40=rTrH~gvG>Dsk0}N=IQ|gNAq%IHp5+`COh0VN{=Qbyp4j1s{|7lb0%bOHdj##
zs8E3NbkKf`z*tJd1t?1gy_*1ZgaCy}+;DTfPbL8Er_O<3s&r6s0?<bS^biNRXU6ig
zMF5HffZk%UwCYI#m?{7?WwHQD1>j^3(EEj+PO5$EIvP5?=?OT31#{>LIFJSV&=W9+
z1^c>3i*AdaMB92F$rue((Rvt)b)<BjE%YO~+5t`>Zgf=puDht7esDF}Gn6`4Wg$g%
z(<vh3`Vr+;;}p^Ay;-zigBL=G(8~w#H{O$44#H@07UozDdQ!MH0WkWf+7-soQCK16
zg~f33=Ph`dcUuJ*@dj4)#pzE}j3ZY50y`Q-yx^P;*ITrjD29(Vf!ZbkA(^m!i%1J-
zBBFR6ql8t;5BJkA+_lYkYViYST@ZT;F-(Em;_MmaqZkbx3M%R(l3Awyeov=TLuSHr
z#fKAEGjTHxF%F){OEtL0rNr!`25pqpD<Y*J?CycjU+Ha(fs&DOMhw1NE1uaAFg*q5
zuk5W1j*mbrvX*h2p+vvi5V3mH&F8CCToY39wHTamNfKYven-AqH;J#0?=bUKjTm~k
zaq?o5k7y^3d6v2jH{bAX!zzNQ+wd_l-!_q@&^bUcMS(Ym_bc%R4-|lIrlyaMMS()Z
zG?$?_V}JyX9rH`tiHVqUWscFnn`@r-27Yt~t#Yz3*s`$<V*Hs}A{eCGf4B@pLxq-G
zs=zr~Q^^!ENLWQ`8PEU|O-NL=m7=-oq*5h{DH>z#r$$pup(3JlM9(*xVzYRRQ95hq
zi#|=DoK`WKa4Dr|)jD18Qx-9a319T0fgnapV@sikr%rBEsXw~_8!Nrv)=j9zGT0l`
z=GA+ramRvO`*@e4@0!Lh&In%%uaSdP&`T2!`iEt-$?Ta9Rmi}@K9gs`9^w)=b7p!p
z6W){*?rzRZLna(1A_`v{UNnWI<yds206nfdk%@)>V;`%6XSEX!a<l1<m;qjKqm`BR
z@KxED18^Y+C?ueBB%^~v$+$v->hNsKVF&p?4)p>pO9Q9t4Rnw<6K$Y|6GnJ|c#Zs=
zXg;-(&C$*IS<!rICVTn9oKFH2^wDjSMo$-WKFLtzV|_)^-i*m7F^YUz6Vc$VTFPU&
zUC(FB!aklq4ecuqTqC-UR)51wQ7t92Ax_N}nHiK>XwIZIi_F%PNu6$#qy~%3Hk3)7
zZe&txMW@3_HadN1g3h|nN1bl&EQjc<rFd%(MCa<fLPYY~Z9+Lp3Z^0NB0Z1oHbnDg
zAg?1PgshD*c{4$Q6kV}D3fA;5S3u}i^3!#gCvcSx%3-UvbcBHuxXB>ksUvyB?nej(
zEE#t>_?e~iimo)bV-}n{4>Xq6I7iZu_T$5W13=k0<>!MSkh-y)G{Z<;MyaZOG%35k
zgwG*GNpW`XXS@O%^wMeq%3*6C_xrR58kYbeNi0*{k#;ill_x3dO3t@$^ssEKt1wg~
z?J7J`?O)!+yu56*<KKEasFPcje*>1o_Hr^9kPD4BU%?Wb|3?ALg9o9&2)zL5XyO73
zG@6nrF_XS$H}F}^gd0E`WseXQ1RV>gR?UktSpP&#o(Nm?%x6Ki=sB1Ld$<Ro4DT%3
z_t85NLF$A6`+B5cdI8gKqjk_WcL#8f3qQCT(Fjb!y%{#y6PYaE5mm)G=1hmR>*t#D
zpg?A|m}ky|sLgrvg&?s0JcrK^E`=rx!$^`h710(VPdr_LDs4TNB#RmD{_B|(-Px3i
zHIK<paOsANxpb2%@0@6D^EhEekjN1vHV6_uk-ib6+lh3Cho+y)lTt<-JNrs#{IfnN
zDZu$&7viEj=d&Q|&dXS^hkKHM1|3UG8dv3*D}{$8%!001fV1_=s0{OoF$p!k?X+gK
zF$op-%R;VyzY!eT^YclJaKKgjn>+yq6AAV3^XTJ<1qibV2|6VW+mthqUK=dR!sw!%
zC5ovmhDV-p$Bdo%fWgpR)HgmT4PDS#nvF6ns1{MMJO|?*QtfyJ_&`VY>4`=5k2p=t
zUma;!XZBV_<JfKsVB^z0Im$t9EC=%g)9{!eYCTd`%~1ZlR~GTApF9dL!d(`n+i=Ua
zK%xz{EdO#&ej>=1;wo8i%ghy|p_Y&cXm%98{h|aN*#z}C_h1)Am+vU&o>kig5iUiY
z1pA~_JRz*y0~f-K5xdrqo#Gpp-Nb_WCw-ey)cB}xv&zz^SewVP{-xihH}@5X4eyOL
znO$CNa0l34n!Ptw#tz)8+Vn~{Ir!|S$+g*=Q5*L6`tzA#B`Fl5IoMTgYEw}x-%4dj
z^Qb6RDvst+nQWy}&^#*htW>5okIHf@l_kxhQd9zyVIfphL@CYbsiJjpv}h%=d9*gf
z(OTbZTC|g5ZR5t~(Nc>7D2P`+n>b+AqV48#(dQI@wozO>r(AaJd7fyp_6?ZoSBk1Z
zy;)YM=&fd#e7o5tY5%2p+}1R^<c?;Sq<h+%$1Qm!%_ylB)uLc?lx%l1%hffr9JwZ(
z&r;*gFZyN_E|;gTe{L^Yv0ZYJ<5eAG=Q-$nIK}ws4m|hf2MW@W1jp-<<+^8tM?@)|
zGa(>dw1i+eLt$%vG53sybb{kGElQV;wOi;`*0m%zi>@skuuZ`^71S^`WeovLq2N`H
z7GCAMM_{rjuIR^1kvQRpU+C6-ki$lPfV@@uTop{E;d<>P=Sj40lym2*?QoDcTnDbr
z9`jw4pmttIKYU+5y`51V?gXGyuiC%RZVx_yic=?O9i2LXhb`Hh?B)HG+`yP*;CVe}
z8}P0H>}OTxnCB?gU0Va%W4=OIF3zK1n1bGG5EQo%Xl)TzQ4K9wQ)@zWt3DUOM(Paq
z;el8Ykk6k(=gG@yy+zEpeH}5UYDjjtj?P)vFv^im--Jj_%-;iNwd$nhxIn$34)ZV1
z!M7AtXPpn{G1wwP=&qZYl)*muAD>N^BhYsi@X3QT`Ia!2Pdp2E+O+cyn{=*#@2907
zHgY{cuEBQyVT66GY7urRNt(D9=f0df<u!+}cw+vFJpZt;YQN|j8crc-BIcOT9J^vp
zfS>8CvsjzD1lA_crCXc2sI>tti?u2Eus5m*hPKHxIO);Dr(wVeTfn|Mk<=EjPfUo~
zM>%U~8dd|YCGB`N+SvC$v`nS|#s@5DLpOt(pr|PZ8;$V%O4<82(p3gdWt{v4IqIYu
z;6nT**1aF0@eP$CO@RkOjHIBg(y%0plnTa%Wvzq{Z%*2+7S^h6#tTWd57uR2*hsQ`
z$T1}_L<S}Jg2tV*CUf<Qn#&+5`IhZSFn`}y*NX91=UTO5m^s0u6}0M03=6H`#+*J&
z!mPRY!8Ztlp{%7Tl?3eIfuVlPmE?YA!T&r;65RPmQIbP995yBC>5fs7cIE_=lF%By
zNl8p=R3?X_esL=OsN?$aw~x4ftiWUSuo{sYKwo$$+DwE^U%_db5y>S+Q;%SHII%|L
zi5=K%ihg)UKZwG-4LVuWkVQ~&u8}MfJJwkD2}yE%wsxnGdupTe-!M(SVvE-44=A&3
zx+&H+ElgsYo>&^Ac6XW+Oln83q?*)Dw@u;-ZMd|-(6tLwDV>9!ivGM2Lg_MEA7-UH
z2lRENI}YI(4QTw6>z~b1x?wfRl};|EjZ@*;`azx@r;)wn;9Av@&8Fkscs!;oN_qNj
zu9VioiM;>Vv7x?)l1&={i$!G`c?C@@`*5uoJ?k1SYpedRJlM}zZ5cgbTrbBRJoEUe
zz+RH&+5RvR5<T1J(zMU)@m*j}FpZxqAppy>U7x7oTvRYL`tnr6N8*#f6NTgVru{Gv
zpT9vZ_2Glvyyg#|xhUL#mL#y*`|+)mm=TLDvH%+>uGW0Mcyf4o1B7G8Nv~Z({b-4$
ziDkd}P?Y`S82-|g7S&CpxXxI^-#>}r|LcMn#l7F0U{YLqn~Ox3Kymd0A<R9+#~6a4
z<#SW%@HDQ&%Y+WwTO4K`rpp#|9bWodbQmwkG^8#Gboh9DkR_20Z-WF~?S%RN5Rq_G
zosdgD5W4usF{A0%S#&Y68ND`E8!t<ujXAWhXf~s=Il-ij{JmX68)=zt2x%2`@8GOd
zy2ns>uUEJqKIt&)-akybhnG5=Z$DSX7iK3;nrBz<#Rnx4=_H-!ZN6O%>iXCWySfIB
z(jUyB&cDW@%Zcpj;8;!0LIQuHu!R{#Eet8ExAB)uI?9`ND87R1L=MA<xiOmF*PLL|
zbUMh@7`w~X1Ed+Lbe~^@kT+@<pYQp9Av1Xx*8@H>>HdrH>YKsk)QCkRGTI!RVqqt4
zzW2)Z#5&HGl5tW&;zz{C^BG`Morurg5enN3|M!IVMcF@&;XdOki?Sy++$Y7V`%y^@
z_uN@A>U@DY!KBV~Yfzjz$F6NLA7c2_RJy#LPb1&^fa`MQPls8T|HliU;Yu_<_5AF=
zG*3F(WzmxalcYv3fR39Hqa;Jk2__{Gn{c|XY2JkEIVF`=h)uYQMxi3O0#8Q{vsPSy
zts~vDJOSaDM{46O+&+7AEZm0`2`!u_(n>D=HwFX(tB#;I8i(UJnOr;xCQqx!?j<vL
za`BTC<kpa`DdwvW#h<}%(%zyyPK&-ZatUIJu!`2gjah=oKx3?>8d>G&W>>j(YiyNq
zjK)qKd+S!;(Od})Z8p1KZ;55MkrJBL>?)Tvw@UgFD!Fsk9*q-kg6WbJS7ltO*iO-~
zO2B-_r|Bus9JT#aP_Pz`t2hC>=e*X;PRVSxgg$#Uw#qn0V<oghmyj>cm1?98g)w7j
zUWXnZ$8IC5Y=;jXvTkjLhvk6t$IAY3JS=U2<;fXNxWZWeW6TQU{YXeOVX$8k^YA=y
zu_?jy@NCjT&3lC;Haf>#mtdD!EYy74oj*=5{r)gNPXEUXH8+$ce4O%C#^1D1^8&eV
zv|IGY(Z)+IZ-h2BdZFg($tLBi!wH8u<^+>A(w$MHUB(FqI*tT|tNgNM^xV^g^HOPH
zJzp-|jt^FmQ}@xo4zm^x27TSBYlCpJow_&Uo<?zYI>7@)+LS^Iy9$48AxQJ{QDe2Y
z;!Jv6HL;I_T=KO@AN$3zn9MfgN*?T;;)IoAeOZ=XdaM*#OT_!J_59^+G)_M!4wY!i
z)cxQ~;IC27@hDs5Y)9WPx3DGNRsPLv&5mO$UeZy9#5=szTo@LH#LJ;E4E=$u!<adZ
zunzygaVN`eSQQcyJ*zG{KgK#J<^+><pnGXe)<NG*ww`oho67ypPGuq-G@bJ2RSxAQ
z;>B+dvxyi3=U+Dw-4JfJiP%N9%%bRV8kN9AeENJs6T#+v=@`+*yl()T_l=`@-^XMz
zwn4sfaVZ7)yl*n<*Iq;1%0x0F5VPOBM3@n4;l{L}J6d2Z)yOK(Zg!RQO$=+5ag4^A
z$>F-09M)V3o!V@6f5e9@n#gXB?qzu5o(PSU?nljLcVg4oeKbHr7!RRlxcAfHs{O$n
zsy5RbVKP7XImTpeLW0#~uHKuCL214aAT%@pkE+wzQ6tLl_*FYgl*Vr|ZSdY9)xP5_
z6NLzDwJ2)bI@E2Ujk#2JPedNxmc0sZWYz;0WJlroM1mzWYSY&<f%*t@3C^v4L|*XD
z&#j6X#pG_>P`80q3cG$&t?e3L>-AlDt#|B!HD}k0!#ql1x($+At-CDz;_(zm=otWK
zflZ<r#nM*2%*n!fNZP+KD1+WTAWXGrxbqutZP!sfAZ@zR34V;Ip6`sXB5|h52H%07
zsJ)5}b}PqJOMDT2B+k$3<Q4MMwYT7VAPHGvM=iF2TVtC#1C@mpgG27qCFYQf=~{DL
z?A+W2a-nF@SAcAz=&*HdZ-{kBqgqKPe7$=ciwB#YEks>fezfYRV(MCosxO;(r+LP)
zQ{u)qYj|wOlkDX+y=kX}buaGqCQAG)@Xx={aEGI6erfsdr$Q$993zIkxOA3|2<KzW
z=bRB8vGBgh%>XAyy$(FWd|1+V0Vrn7sOASY(%K||w$n)1G@D1cQt^fg$ndepP<Vet
zjJ;dFAfF}xYW&PNaKdE|BvK{g{Sn-jY1BT-8DQ^^%$rDj=l3Tz=uEc#LY|P%66#Q(
z7H?jpArsD@{Upj%JCC9te!B9BzZ<-0f5S^8LFabjOWT03ikIJY#}LO1sdfB9DhwQw
zk=Re%9?!HfWTt=&2a6Ua0Ao&*q#mhcY)<n_J8UIm@ktTlv^kYKGD^k{Ov0MtSJE1k
zL87-_ZvQ-mSffTDOE`^3;Xt}J7uy}EtWIXH1y?6w2}TN^$q3j{fix1w|Jn8bmc}#B
zq)GDU?;VDQ(d2S$c9M#lEsGmJi`9*0a7b<T{9YV>_32^Yu;uT`;rKWX;|F8%@x|Ww
zHl(L9Gi4}RfW3c?+cZjgai82Yj+)U?{N4M*uSH|=UZZu8H-kCSqTfTsAN}MoFh>gX
zdob53j=3i54zZ<O(^&PO+avt;V`h-+I}RT*PH6R;ZBFv>Bx{r+a5mQCYa+h~8_(}*
z5*tVUPHY?-$3|S|ayhJ<#^s>BfCq<FesLxE!H4RGQS|25+YP|T9b8c@Egzax5tgT^
zg>U1%zvye2S?9%hhR*F4uV}lx#`y!y`~sjJI7+@{AYwG_%a3vRjvt%I;TyEs?C^<2
zGTq_ReW3)4WVX?%{6DcscCZt<UBS>T9~(Xw-85x#Q1lU@A4|8sKb+A2b5JwP{vS_B
z;{Q=5{6G2;{vS@E313v3fH#|T|F0jyNjiqVgxEO$?-LxNOG2jE1O05gI-i6lUjXLY
zNZo}Gbs<<_3;1&J0(er|o!lk;)45amIM{4artQsq5E>3a5+OIc<L<=r({JYRcXg)@
zd=SfFybWx$JN3E6Z~s5yPVK{i;@{jyzn42zcsQ8*z1*p?_hTj3WZhxz)CO8oFh3NM
zjbr}&uATh*_%RwD3{7C;oZpF!8BJs3tqXr2X?*fttTf^}mv_em!GQKfoL3xI!dA%z
zoO&IlAKZW1(hN2R+!tV5q$%@t4;(1fnP6F<KGFKc2e_Wcsuj&_RsW{6>X_fTRlmG*
zm|AsgQ(85^)T;jz-uG>%H^Tc4{@d(*KZ{tb_uU^0k<aIm+iJR}W4$>6OO^UP9egXq
zIK^V#8;F1T?b;!_7hV@#g{{+9VZ{!}RZsS2UU&xXs5-1KVf>F@x*vv*x6osQ_Bg~k
zt+Alk<d^QRxQ`@>&4WMAyO*7u7VS&)j!>gtx*v8zjQaI9Cz#Z)QHQ9~k4vR?;t<u;
zr?}eP`sSZY?OrWCjB0n_?mwK`-9PT|sokqXV$|*_bAn0ja`{?J^z2^r656{4rcyR>
z3GKe8xw7>M9%f}*0<T6tjx!127=x2RhTGT}ioZr7x|f=X!W=C2W)gtoFBUoLmgLGN
zd*d%FVKd-(%CV<Uo?pk+uIUVI@uMVbv)+tGR{2r0tDG2DWt<BZ+dkVLZ&;mnN`u2{
zJ$7&{hu%DFOV_i#ziBCNa{Td)!oj9d7J##HsyU$=-4)>bx#G5`faQ!u>>F|H?ati(
z`k)I$9Se{aSAx;G0Ds>7U+_Wq-0L((Hed+z?Oou6a%_m}DI7U7ws$wsLZ)D5lyd`J
z3AO>FMAGhRK?I*6f|?6q)yW9aJ$CwSKBz;?BA$t_!`O{I0fng!gP{aqG3Yh`SIrMC
z?7E2toux|VSg><#-U&32{m!zj?A0->Zpvsm9cjsHpe8<FI$@#>-q^S-d_$@XVq|Tj
z%LVBZR=jys7tMe0fujxVR4kqLM3y-1DZXAqP7mF<$UktzfpqpW3S{?((^_jBj;vN<
z9ByQ9OP`kAr{LSN;Uj5>|NU=qkF?Tyo1VOFpFBCR4_}n6-6v;FqCfUW&#+1R<clg<
zs^GeSPR1r_5FPW4)-M`Vhs3&=2GOD4D3CWO5iUI`uJH|GZJEs50CFjHhUT$l=<~)3
zi_yNUdXC(`5|SN+F@<d;;c2F<h+R;#u_1P<+0An=H2`D#4;$Idb1$id8&x+`d0L-;
z>ZDlP^o(U_J|nNW2IovX&JDPFZUaAVaw!r@QKRL!$rZUU8=mcxQ`@V@`p4L-JIo0t
zdxiBxi5eASufz>d?A6_Cj!tE$a=4*7|1)l=TH<8TVKr2zn+#Q--(sl#!M%gjy1-vU
zHyNrS`1nO~L-iwTJPcJfi4omA=aHrus+*jN4VAD)HPN%@hM}_BAB&-C{8%v?mNQOI
zU|59pO2mM$IaW(q2NjAnELIDY+^{4!K#gzE|Hp>qoDmHgmN#P!3w@L}&aias8E07N
z5ZfhvOqK-wY@cXO2vNre*#XlmZb|g{g?UwlJwow4`d+#rsf&6%Ajv%*34<FR&%jT(
zA=y$+hNK!qV=qC)C(~nZ12%a))nrx$6Qi8f<ndH9kLLl<4?3|x1CQrggz2$oTGt?z
z2QR|oc{{!i!{a%L7-eALf+YY8kEa?qaS7@-_!37<mCWOzqj7TaDKI2s=oTTlcsK>O
zQP6u5H(6k-DK)J?O%3u#x3ZDnlA1Pq=<QSstKs0l)|kXayesT<ptH7b5x6DyEK^zS
zu02GN9}019FePzv)!6q|*ta2cHayO^v2vV9pz@}I3?@G&Q|_weZ<C96<EW;F58gDR
zOU^Gk%z|pD$#goQhIt2&X^raUO~GU1=3$mWY@*Y2fgB)##4WKU5@}O(z{FCb{$Y+!
z!lpex)Y3F8vAt~>p>NA;mNNTP4acXNJ3fWXKE<D}c&}HCE!t{M2oaCLM%toByEVcV
zJt*$h8M^7uWs5FZ@!zsV-(Po_huELh7FAz+m<84B0V^G68L%cg|L1K{-@%rq{U%#9
zo?fFj?=}rHCp5_xWp`<WEjpr>`$dmE|L3wr?=Amt*`nE~$)wGR9%KA4;{We{(derW
zv!EJ~dUEH%HNY}pO?3Xx+oHSsTbkBvTht#@vRCL;INcVJ=?QT+NG$GzQY`M=*Fm>E
zq3E0pB>0?6EbiPT?$;cE3ns-^Ti78};KanFHh#Wjnv>O%$0xWL<*cPSSuLBB;R~rC
zh|~6%ll@Bb23)vElY({fCiV#!R3Ii~yW=Y`CS(Ctl3qp<+#~?A2^r&JQY~MCzQDz_
zJas8@kuf)EfHs>Z(Z^y^5rdZV`uC`Xb*j6TmW%G_hc;tNJlxge+-(ukZh6gj^b(r0
z7H)AZcZ+u*!TPqTXK#OWe;J(t*1I3v+Mh5dfG6E8Zv1t9URhU*L{oKfU7zDl{z&Th
zH1#45RY9Za>@ipn9r1tjdnKdkI~?X_#P9a;2ZeQxn-KNezE|SvV=)rH<+{GxJH{x<
z_2vYVl62ssNngh?U&gz*T`H{*m+`(OwBjK4Z2nAI(QnBgMJq1LJ#1RBA}dBK7MK%E
zTG9BsJtnqIr6l6Dg|F`7rsLzs|6EF9Tl7a!l94%wO-UxVk5Q7-%?Zs?lD@4Qp(N71
zTuEMd^v|UvyRZ18C`qTDhfPUN$c#~vTyug+NsfwtzAUkm8-#8CR;jdtq5OHrKESo&
zzK0K!R`5qXb9fV8_>G4cb5{Symk2*T|Bs?IpLIWMTJuZm7_HfBPB3W=6cw`rePah_
zHs%M`3$59eo=R&N%Ae<Yh-=N9^@mAobgkG8-Ox|3ZAQ4+r`MLFaD!fF+%@T?_%=sO
zm26w-Imk=)-V(bnvNPFHvgpNU|Ah<UKA97%$_=xX0ojC%6FPKw2QN*rEA5sXt_$K$
zjbkfr(urLwQLEDQ3*zE7WfIO9{u>_~>w)tMrtcsoI`=$0_M}|b1SjSCW3qWt%a|cN
zz?@(j!YK@Y7h9?!EDZlSkMJS<$bE--2>*`_`#UpZM?;+2{g<Yj_AVB+_$|}TKIt)9
zafCUcaatiA`c+(jlV}k_XvM3KbFJ{-^XJlvSEm0_wBoxX4x3iAPm9rtUu>oXlUAfy
zg!uMgDy<NU5Pij)5m&GKb7{pxQ~xMhu?t;fdW8HITM;>gA#7g1{KlMM(u&3}LcH-)
zDkTw%5DxK1!?}1c|Cv^*uAA~lQIePB->f8K&!_9ua^PsZ|BFdYNGq^o5e&WSW{nj)
z9^w$1b;m=$`GS3r@#%=J8HqML#38gff8`IA{5wc9YT--sm2K48ybTYq-;vl?J0C$m
z{GN<eeuKKc335I^Tb8<>_)UpK+b?`m0^g@UBzvF7+`_YBce;GzLu`t&Tk&`DQmb%x
zPS5T(Nli~9pTlqOfC!Fi9;##FP2O0xnPETWAlkw%3fY_iV&x?Lt&A)>rmUSLP4I0;
z%d?{}LX^Y#jKXdO>`WUT@OUwhZoh3*#Z^D2sQ474;s>L!_=>X$W+VQVM_~ovpnNj^
z7|r-TGs@pAKAlR{J6tgROcYV3951p*DLx2_Trh`zGMYh%@@Zz+a#O|Po3ag8{A`pW
z5i6f(rr6J@_=YHq5amnEutRN)7Kh!9>W&km<Z`Hkv9%d(?naQ~&CQC!2vI)74D&^6
z#dKu1jqa&5?We_SIG6NmKSG55GP<lrE!=|zg6PFQCxRlW75309TWhuQn!CjTvz$xD
zUOMIVLdEwLY|Id-!a^cveiU75PJsONtu$PyK&q<ml2}iqvOBKF;UFHrzA=&a8ldw2
zykDL{eHbk7tszsuHbP^z&=T%t8t?b8O+(|f>u$Qf5kj-yivHw>#}%Km9%=RBtq-1k
zTQnP|IynNR?usV+oDo1HmQw4Y*{oDN;_e0!_as2T)|6)OkzcQjM5Xe0{PB&;1_#LF
z3v>PgbPqMHG)f^3GL1uSHXv-7fG5%ynz=}<7uyT+rKP+>Q3EZSL{HvV^5ScZM7?<F
zn_O{Jd;Skmr3r?{EXFP^S1NjP^@mn<H36te_Lk-ZlUBj{OQ_GPRh4z(Z4CC>Sor%?
zYQ<XN&#T(S)oQu_Fncz)qM!8Du0;sPEInlq^TwWig5?ck&weoPaDc@FH32yOUCoEj
zPrTZ-4RVvcW6?)qb%wp`h2<i8gP}O!>Y5;Vbg6qRXE!Marqv#LOCh@aMB1s%M|BMl
zfUc;H?7l_Rt+@5Dctj(Lkiw;wA<^{It)e%a8mhl>#FQU!8Ue3M-6hm7Wv7t$QQJ_x
z{B^0_4ZvW+Ju7P2f#}_8VXf+}K>_B~U5m9{)9fOg@M}A(Vwb39#4J%^q}{jQJT@P~
z&WmMi`c~8ioqN!1DLhtn?(rA2KsPDdDkEvW*D1av9Zwa!ir52>m3@X!@F}dn;v?DO
zvGjrBJF_Ok<J^<3I<rSP_pEwFPz*XlL^$Z&OFtSmu}EENiQvo~ih62I2I)jeG15KG
zy^zFS`^usC+jZ4IMj0cc$QD<`I5%HPx#0;^VC8sGAS-17Jr_2$KLN4m%F6jlDT)@@
zJkAhW0sg2X(8-cAa+`cJ?jff05QrBsj>^~kBmWlqzw*PEO69ldf=ITg957xJy#r8A
zr12^T+Wx~2{Ba0fE6qWw`6!DoQsO))Z*m?ivH$daZ%Oo#vU+b(4vBh8$>)a-%~I6#
zzT`OIi4_?dsPf*6M6|+NhhN3#-H4x{w+w&LJ-Dp<HOeNq-&=!VIaDg@mAn*&8CCs6
zSI?(X3O^fk+PA-g)O~_Lcnmz_7r*H(scR{T^<Fx><+Vgs`0_hJ&l_-Oa;|LJ{jhHy
zM!}}CA5UcJRb{BE9%afUxTA(P4IoyK@m*|27BWI-fEAy2JxZx->8~IG-{Be=edr68
zQ5!?9y+p)MM9h_l_I#}&mz3>pY9p_U+>Z8)_@hMJOMiWg)$l;hG9AMzwiC(G$GdX%
zv?`t?d7dR<;QDPQrd4lajOvtwm51;Tz0G)2d>`-otKzFxet^sh^rpf#2c?CJk8{ll
zI?|WBsvIp1#{79R+OejE&LYwHyc<xF;@Lt!ctPfKv_alv-|<~<_6g-@5Dn*}YU+P#
z)VIS(2E220<zTm$4?%0qeMB=LMP19N>%jNRVWOq2To;0&`$J4{?)BkIKr%ozsGJ>t
zUd#4o`ICf=N*Rz(@?J#-Ds3$kBYcET0Gz(Z@?4LZk`|!C@Juvs|G%htuEA&e?GHm5
zn{R;guJ}98qE7ec<+Y`sF%M+gB;NmzQn`TuUq|2)4nC2CGdTE41AH~W@+LNZ6m?Pr
zx0z?Mf#tG?GLa=58{dkM&%MW2Sm&Fx8;_(>&fV9|z^~7FAY7n24~%lwxw~<nJO0(6
za6iRxA1fK?Ks*S$IW&|#3lCsZ1@v~W*btufyVT&+YgoB~_%d96hvHj-M>O69Gx_`!
z%U8%2;8{d@KKlj#>@AgNkYeCJ68t12gqD1R@p<7$(g~cnbl{>OJvclX925;^9EoWM
z$L2><N9#enweO&?YX5F;Z+r!2uzcetD5Ec6nyf#Dt~4g=>!@F8vL2eW4Db9r1aRmg
zEQe_1$cJ1w#jE)#^u;v@(N{%6T~{D<4TY*!A+(r66R$^THieG$B6JCbzPk~jb12jX
zFY0S}MN|rDcOf)}LO0?YSK0{_I#`C#01C~=X9Bfe2%&v-Gzv$|Vr{K6%-mTx8l(L}
z;uDBYIs&E0kc9>j0v8BNp`ITj^ge|~?m`GRjz}TrCkSn!(6mnxdXYlcevZ(S6nf$d
zgdSwMUm>)XLJPh@NTtwn4WZQ(Dh?ky6#h%-;eX<1StxBEeinpUY{k#)&@<ccb6M!u
zD*Rj+^85`y1))23;%7n#Vm=fe7wUQ+eny45tjEvrkn|LO28WKubv5CBp{H)cPp{B7
z`|*=a-K?S$JGfhguKWQh_RzP;C`CHdi>^F@des{!**l)gj&u)-M&p9XNiE7ItUZTi
zJF<Q3#(ZBv26F4G9JA>Oj(2g3if|(-Udi*+kpr`qK=maBm#g+izlAD=dU_(Vd?Sg`
zqD^uelQyLx!nBFX1|2x<#yT(p;+<hm0-=_;qySZz=;Mj(jOM4u<<B$ad+Ho8XGdC6
zvXIiMjJjX=dZ3`Fh4m%l=2&n!#R2zlq=2mj#8&ti9?^N!(@VoLWsojicrjqMQq}&5
zMq{bFtG8-j$AU+?x~O(P3wCq0RqfZaU=R1zC|b9fCV%BLeKz#A{wF*ah13Uyo;dx`
zp*iwO5zkcZ<2ikIK8lN;Eq9?sM)`^Vz>@)a!J<0!q>w6NbZ~%T`qJMMc;*lbhVz|h
z=1-puK_7^Z{Z7Jskp))`@kCm?=Hbt(cIcmC8ra&oAn1u?%Ed)sXUr4$BNx*gUK@#w
zF*PhsUyx$KRayL<)8ZSDu5~5ER}8V75cmQY3crY;b`XCWWRqqny3B@XZ#K2aaP3ZB
zgbyLPm~JR(Ql&IJs;i1Vgp6&f{XzI{p2(4|zN-BW7VPHgrrLch*uy2O_LVHyPxiKL
zOhwcQqqoW4&p;hZRcRVkquNI@B5h^wn}{}v+d<l$jKU9J6Q3RA;)fw`)gEHeqvYb-
zS#%eR=E%jxEczCU_I6#P+ACPFk86=?e~AVAx@M~OCt0wkYqDy8fCZ0nO;YW*vtWPM
zIMrUlf&*M9s`eEuc&uxXYG2BNxinzrvf$A)U@m3BK{Q~_VZp)f<C@k+tOKJU-V&ax
z+S@Y{HrJ)9y#))Vxz17Tk*}!vEnKIm_J6Wqx@(kb|B?mmt|6-ZV-{>l{rENuwxWKl
zWWfyT$4xBQTJ}zWo;Qs>tqY2%b{C_NNyO%}pe%dY8_f-kOtZ=l(%xoWbPS^awF)5G
zM0T)p19raJLn7%)V*fh}X1o8=G(zEt(0^96y?a~}i*_sxXO)KAm4@4thFg_}(@WVr
zJZ8;NUUM40f~8wAdWXHiT68P+6u_>rW4@=K%RLdh%dXwpnDS;>j}A|7us$<BKRmQi
zcs^IfVnl(1tw&QK{vHh+Re4P|EH{!us$;Y#a>#W859d>u9!_u^9S((J^u!CP1@w3z
zF#qC>uOL61ODRD|Do+s8fY6svfO;Dql<hbkw?^T~#;H2`V`kAl^x@d(6RJO}hpdQu
zHiC7SjB^Kq&M=zgK+n@?F5CAq8*SBoIn^9#<L)VdY>Cz$VEq%d?t`NBodb49q7ZmJ
zilsUR;RcV6As4(_(<3uXUPH9z0ya_|*>v~Oe!3Egitd*?I5NYdsQq8W6FfSGAf{AQ
zB+GtvnoZ(GC4F_4mh~}_QGD(?Um;(Q^4V_$(JJR5+7iREq3}sVm{y%^gAWAn;et>3
zv`-<*NFOB9PZsGzM0zig-cO`6w-5MsBE3CNceM#kA>WofWl{1MiPy9j_ZMJh4#aT0
zkEFGVBEA%ew+zI*9YD}iS<rY(AT}5XCr$%uuLFVB*)~V8!-Xm11Y*XYmxgv?=JE&%
z@hRh#fB%(V6aX>U-17v{QG)1sf@rHytCdi=D@C?bWDhs8-&c`+E~~ILUNAz1wS@8K
z-FlE!ILxR}LWSY}3@LNuUpaCvM-DNNAMK(Es#Bkds`gJm?=2a#wk-50HVE9fO?X8_
z!mSfD)kLp3Y9UL{ih7>J+`z#|5~@Ip@e0lNeD3XvudqzFSfk1AJ9THvxT>uMHvrXe
ziE(Lhk8-%cQJ?NA@Rzy_t&)ZsfY7@^dsAX??N4Z+bFU|0^Nqu|lJ??dG<~^pT&jZp
z%rv%|Y4c%Etgud*xeso2nPS@~Z|bP5D>>iR!{e;Oq#Kj^(8^6IDfLKGC+)>+c@T1$
z;nVJ>WhUSFEZV3;=~2$@^37%9?KDN)Oohd}^^low3%Try@8xOuiCMx^{9bb5%O{&<
z+l_kB@2n}$F{h?es_G>oY)KzyTahhNR7W2Sp;qOXzha_Q{t$jdPDz#l$*~2<C1oT~
zpmmKAE1`8zk>0<u&TeF=jzQRbX&o&!1nOam4!00V3$oUn7v&4HxRNUGa<HSb0SgT6
zbry;Gm_hbl7v&c<QcKEyVJ#t%VoeT)fk^}fORKz?%pb}z_|5k@akbrA5~J!RNpJP$
zLg->u@LwO1)T}E!$0ALv@T}fT`$fJL_hB%V`ab%9%zX)bRMqwWfTS!!6Z?Y}TdPki
z7FvO90|7-7l953PMj!%pjUhm4NHCeOsBDI@8OKrTPg?h-u63!{iUJx<kS4gb(PE|Q
zU!&D_VyLAqHMRcA|NA}XzBlj9Ojx@7|G)Vp@4k2Lz2}~D?z!ilyS)1%&(8p9C6VW%
zfvm#j#v7W;uU;4_ZEh9<Q>reoX&WX<5^drl;9a}whA%aiq2=Dt9M}Yn*#MGva=i%i
zooiQJ?Q8scN8mBEH%yA}#ub4qd3MtgK#YQRYXXfSf$f1!{Sgc1*yXx$;snEe@Yth)
zhuY#<3nPL1afjdmQjqyX`2%h5W)1FK+d={RpdY@q9BImIG-@uen<T;03+&E(y!`66
zcLxbD^NGOy$lEM=BQOlnz*>C?bZxLLZbdLX9>dXYfm@y~ni*`hCB6RDR7tn)awOff
zXK7^BLlE;Fk)6%u_csS_IiNhh0*v6i6};TSb<FL!xxXLC?$Yuf@{~UyP5FgR`Lod&
zxxYNpay2w7vbQ<hjL=O2zfu|t^LWf{g%G*Z(ys;%M07F22MkU`10p)Yt$<^!h}rfX
zxWf(ZcH&N|F#Mte>vUkdoV(q)i=*}odd}bj62uff0+xj-N|M<ez6;m(@ZGo;wTJIv
zY<u`#4erz6egs|Z;h!S70?mPZM8o72)ANyzcnv(%NcaXkH?{EU3!N38iq~mjr90yD
zDZ0qB@f-n6kNmDE(z^8yu!62ECY`2#!spVJor*yFPXBMnJyEfV%6J)T1dm|ZwcUqF
zl8vMrfZG6Q##~J-<9gf$V@tE1p^V}SQ51k{0E90L?=ExwE|Ek=4M5zv6TU@=<<+<P
zLQJybX3(0s$aK19;xs_4tP6lizXj^bSE2(p$oY|Qp>Sa2urtt^>Vc72!=}l-IUF(b
zd#%Vc09fcMWp|&0f(?GVpe!lq9h^8}JasK7D{VpVqT20(-jaJyK{o@77W5ISR13<o
z3$mo370Ctt@zr!3t#lRCm|9S-Q&7Yy$g&G6l!7vo3wk<jL0PVXhNc$u+-o*RmQzsS
z>dJLeM{7~NQr2Ba<&oZXY0J9%9|`H*A@?5Xo#&KAvzaKuE)Er|#pNd#SDCgrzpJ>M
z)Z#uw4QpiuoZ?u7Qydr;?tY1c9`5qf7T1pEW9!Ctx%Y6l#wqT%5SwzxhQInka}U$9
zW)8IV?BwDy(iS(@Rov{<;;6sEUC;Lu_*b8A?lJ4SW){l&0H{5z{ccw}ZR~;1YP0r7
zx%aSkH?T-q#^7XbY(+=RlRTZJmOFn1Bd~4<?Xq*2=ej)w=qe*EFT%m1ncj&o$xL^I
z>3u<7pi<&9AIG}d<}LuEVafOMwkr?|%eL-sG<!_m)FPQeCGj&}GG_0hPBnXz1z^lx
zJ2JxT-P_B+f9j`V_JRo1?41IVd%gi7{Sq=!OGgR;cnknoI#W&>ZhwJdz%AKxaoY^$
zBQ2N1xJ5Rvz%_~2_HdL2F#cCeod+Y~4S0ykm9u$YwQo6%YoJFpekB?vB5*$#UPX7g
zb}*?Oo6wW4W4j52{)am@o7%%d=QQ<>%v=vu#l%=<m_w1K7LxC49Ju8#=vgo?z868?
zUErDRVRnJr+r#Vv@6axAQ}<Y4Lcf{?@uD7o`Y{4XWDPYA1zq3TEP`FzBH|65o+xxA
zNI{`Ic)9OF(fzvmT~p{4-PDnG>8#5=y>+AZ){8V(wujWuyQ!<1>+A#>IFFpXUoE_|
z<3Dh}|L2~QOnzwJA=17cOV`F}pf0M@FcC@@5htQa+$KyF{1UXH)lq6PDU-P#O~X}X
z6?g*K7b0*|0RH;)T8#8QPeZ`tSe^0`AhYxF=I2ZkzWqgQ!pj9<ns9+s{fLi0k*dEO
zlWQ3DhY@HKzU+B4;i>Tw8^<{YN1hu86%l6O5yerUIEow`6M-X$p{e^b*uO!3v~M<O
zSNnEZv(0I2SyKyvbj_)7aLuWHeHgRHKA|++#%yYQ^-d#+jW4JqmI%N|BB)&ajoKgc
z*Y6ccT!ug;aS15ikj%zVWy58r;5xU0sz}SZP)3Yn%OuzsMBuho*pY$;mpYt1g9uZG
zvwlLOVdC-*X9-C^oMns*XEljEoHZHDNK_KZa8}{Ya8@6k;jBJ7!&!Z_hqHWYF7pm&
z3G)tT1(F!fn#Yk5dpJwLAq;0Vxo0>_fqRCt$Dnp2VJsV?KjYOG%8FmsP8Go9ab_6v
zT&QTg6x!4}2))H(q=1YW;PBAHaLYQ=!M*`vSDyj)Po%`_qz1@5CMC{YHoyT1AP$r_
zKpRne;b2Zmm`qHnW#VN~8;JL74UpMQ%0UhgvspHfnKV1*er+J*6-Y!TJL45NFe>s%
z9`ySmB^~s8hl0@OwJ>IGMaD=FTb}@g(nFkS#)K<?3=v&O;~f)TfC%k6Gmy9MF(K*+
zvH#SVuwCf6vpsw#N*~l7{t1FFYxe;w%bud&evECG_K$lUW1AQvPREV_&!{Ui{7vdp
zG)w^nV=;$av#08)i~11H{9pDVo<c<Y{}WGVI`Mej2P2+MX~grLJxSteT;4M?{*Ud(
z{*ItZU<~~y0T}!Hu-f0qhZL0mqYoHN`8xu&zkhj_;-IE+4BgY<h`KqBPQ<NX!AN^B
z^6U5m7ov}t5s%n~-a$d5&=u}Nf1`yC*Fslmp;tPEUhWi%a^Xy}_+a!rc4bG|d!Pm(
zjn^?pA8;XPinKh0<n+twY`GhaT7S-8Y%7FvKaGF!xJrpC7T(JUj%=KWe4&F)01he|
zgLhg)8_1i8C87>#YI^sc1B>I%OrH=v3|=b(oqu6jYg<UAFLZW$_!qos4{z4s2?WLM
z;jQ}gqy~>6IHEoLxIS$`u(UnA4Z+Ix@KXrt+rupgpdwErc&rDF&ixFPA@|WRC8Yk-
zXV`R;Y=<6hv+WQ>%B}pVLR<=MptIT^wTih=fBeQ)Dj6qb)SVqswnr4|&bTPl>j+e#
z?f`OZNP;enfXoF?#uX47u^rEfh?aA&+i<&{tpqVxCW@@ugZa5GEDd0TYH26-)%I^Z
zCm7{)TNz9(w!cPRhEMcEDb;^11AFrCGmzR5fU^Ys#MEqH_tWD|v13sLy3O7u>_9_A
zFUD6*t3Ekw_3J(5pr$K<mV1TKNDAC&@8}clZy}OYwEb7V4y2umRCYYh1O|I0Y~7wh
z$UD-4g&XAEjL{#0jp$Jk#DH&KNhFL(_B3j}7tn2-25_`@8LLE6%U0nqvpbRVNnA80
zm}486IT)4VqG6Ve%7_q#R^iH}H8>OEiiG2UyRZv!QGvqrB6|S}h=j4>6{(mOpb<h4
zLHwKxHkn3+CM@1S;^sjeEg6S<wmcsBjIERG8^vjiw2=D9<{d;B*~oc#m62Or(NQ+F
zFh&2yQ&0qRIQ8xaPA(v!mlPD#oVq_q6*n-jHKzr1_ne%Z`?IH0bLVL8B6sdJ!Zj|~
zlZ<MQkxr+`Us3J<)Iv;JQ_+pAUX&%tR5DF1g!xuZkLMw!OoyHhe6*^^3BZ{0Ij|>S
z;SZ{%-^L;&OnEB;t+x|E@D>^^41U-Ok}c}vBxBtU%GNbF2oh<eg|-F?N%N5;-uQ21
z-j;R{6AQTRYn&0k>M29$og(9B<0}PV2wkLvmMfvF-xESlbqHMrLWI!n*CgRa_Uh5i
z#7)5<*h)pG=z8#A26<N?ZAW-F0AvoTiMxoH?5JEL;>$$k8j)FVn8PlqjLlL&m<1GV
zQPk9hcR(1*sQhBzK2HAP?Jo#abtUHCO{x*wNj1O<f3=Bv+RtQ&xDOmNV!9nsU?Q$D
z5n~d_t~JP-6dBf*1|V_I*QK6%{%Z@npPr#xz#%J-b$D<bOjZu=L=9oVp9WVL26bB@
zW0lB(q%cHroF_PvrSQt{mD%U1JL#lw=aYR%q1i;Zq!2O4SpPtFP*Px*d>{_y0WVm-
z8G8hir0@$=1sWc4M0H^!wuRe1qninf#)v(-kq!W6?QkuM{G}+elW#Ag8#n@JwPoD`
zG+I?-wnjx|N34|A=l{t&)R`%VJ4x@{W^_Bb^%Wq3tq<8<t#1Wp;?Vk<Ie&*y0D`2}
z2f7LESj)}OM?f(EVCtuRgQRAZz?&g#_|1T0ZXZ|Q%5$+Wf*byV9U048k409jdAtI%
zBL=3M)dK_5CIHiJ?^51csI7Q^t&72wUn9^`ez_HU6~<*aGz23V#{n_4?hX{Stq=t`
z{m<`^mg>j|&x;nVh=BhMI1r&h@4y{yaK~8)s(yz|pen4>f$ehccH_=ovcfGa>m~+R
zvO++gt6k{f@C1Oh@VF85Zx>o-wuj%r6TGo^5tO!ve~%#09*!gUQhPXSFGzs8ksr9F
zxT+WRXcuh_1&WzuT)A}hgC~qAZ)43ul*<HQMA@ODtf$Jy{Fl8gqU2i>D#}YCcC8^y
zsO;<h-C>MRBgX5HF0B|>3Id9emZWbnsz482jL=Ju7_Ts5Oe37@-%b)vW_Uh|HJTfY
zHOpRVmoAu*#D#PEVER@FGA+~V5%IrMcc5M$pe~?Sdk|ov^iLXmsKK8#=m+&GY!CNG
zaH%RA@_hwQYto2y%3H}|U4J*Ky63F;u+2vEj;D4&^S*eD0Hb;GiLKa(-Y!bl-|zo0
zm@))`YM$?LTk|lpy07~J)KvT_$qy6y8%iDsA9N!eCdxVDK1H|*TLOS^D*{FM2&hq2
z#!TtHZoH2Jb^KqUn16pWNrH{o6)5JEN?9P<*M*u917(!*g|i^y()a_vFd}Y)xG0eu
z1z<#cf=Xngv}*rtcv}JzxetL#<W@*eCBoH%4aOvghN(q?nD<b;Vos8mqrQR|j(XAj
zoL-`7&kF3AYEJ1G0?pn|;76#4NZ^*HRk!$7&g=->fU@_+-}$*=q!+Pdq*DNfkwRtU
zy|>7L|JB!pk+%>iBfG$K_q)=T1I<V<gLM!3pCT^4g3#I=`0?6RKgPE7>!6z05^;xQ
z+&Y*~k=H&BKG+_(V?93pBt}ZV`@~eq8#i7+LD)mnwCV<+x`Zk@#-_W_&^^*k_gPB!
ziAwi3mF^Q9x{o5=-vJty15)T6Y(qtxB0@9c&p&F!@(u+Kv1}E95zF@!{Y%nz{7?T*
z#L|I4#nJ*&AYZta`?_}kJ4-=fEM<<Xlr!QB>{2c>rObAhvOr5&q@~Q$QYxHM=4vVM
zO7`_sxET4%hY3dTN{n5^NK?e#P2|ilQmaJ_&>}wFEsXpFfim(5G8;yyHK8FW227Mv
z)Y#FKv{bqbsqxXn6^>%A+jIZbtml?_4Il{<GIJ0nsp+-?2u8hvSjO-z@D`{)#Dx7)
zNR9@{+~{T*(bhoEcQF7>Exh`;sK}dcaKIjgX}wy12Z)V?Ya|P=zLj%2B#Ws3yN{T9
z{u`39o?jM#5zqB1o=>F#`+xhIi05qtDxOy<O2LH+2;cuCsKSokZ)85bk&I%e7p}6i
z<(GKx2|Gc0j!ca@3^oW+Hd8_&ErI0ih`;L;ku2>&h=C=bgk1vX$_@m+0$PzI=wK{k
z^W$7J$JXD>^=}Ag8FvYUds`ZhM1t$_h%LH>`I+M~S|QQQD~@2}j>)<$4B#^mvM)Xp
zB0}OtPTmk#<mYMLdD&P{zcqyNQ5zd1*mwhj*suvm5sa?P3Pvv($!VI%_V}}leLiPT
z@yD6-!^|jeg8}206yt@&cu!i4?`=-OcnL6~9+AC6BFjc&`<{i;x1^>GFzuLUgOS}S
zG(ZZ&YLVmP%z16Vb(!2AQJCNTIt8q&*Iqp<Kz&4HD^ycUGq~`rJgY<2B}LCJec0&P
z4_R%{vuXhtJ$pv=>>g?2{@Pb5^C`;_sGcqP8O&9MIE-l~`maSSy&;t8oxNO!i2wLZ
zHg|ntM)HuieNjZ}J2$?HR^na3{WH`IE4XCo<b9#x<`&IF>WN?E9mJjF$4a}*c<UFs
ziz6Qu^@`l92LA*0KJyCM&K=9xiU@4&vQ&km4~Yujt*OiMp<x?E!(tg5m@w+7%{qDX
zDD9UQdXzRxa(<k7erM+B?H^;~7B_ZXg|c<yiEQLLNeaS7E|5503oT@!8AI^UeI;Af
zya$bj)UiIHA=3n4G(^WUBbvkn`Dgq_G^8AXYRDPjN41Te4qvp+*!gp5%Nc_}2}&x=
z-?~?|>{P`uNO9b`%f>MfIE?Dj0I`B#aVu0(mnt@~3=cp}>yJheRi=m=0gxg9I}5OO
zQkOB!&hjxo^qVw$e>#|h^`g0QSuZZ=!g_I_mukH}d(^RBeEk)Tkm<aQ@E4#K<9Wa_
zXNIe9<y_r~BaQIWpBfPlMdPE0-xGilaVC5aO!^dJmlIqWzSxRJ_z?mXar^-qd#-GE
z&lRI+HuJC;Y+4`meP7X5nnz3^;U~A-Ucwz@=-<U8JF+|r<Bfi(HAk05!+D#c;iv8<
z6&YV_G8&GBm28`dX{;GAag3XZBbABE#Dw^dS0=_fOneJWs6ePEMn<7&m@Gr-ptJ$;
zqCHnhiCG!XLs?XNzNMItRm{(Kig+qtvBmQor~sw2G@t0n704@kGQ}Xf#72gMV*pb<
zImXVSdQ#3+9%uIdIHHZ7*PB=tEx<G!bz~{+$L3Z9DXJ1)dI@adQuK`KSb(wb3wawE
zLB)~G;!*r}Ha&{>0BCCA)z`QT##GW_j+^N)ea#@_Zd7LG6ZmT#<%2BLy$!#OI8-D9
zGY`3*)gM%89gfxoWxD0pBCRD(J=}ah>w)F*C+AQk9^<9=89iNq>R=V0EC8dYWs160
z+ONMzQJ;=L^|TPEyJu)GMLxX^<T}V967C|kExbxEWz!Mgb+0M7hvGuP&kDd4e2x}8
zO$*-nE8*#71X^$hi0uB2`U}~tfI<kuseo?8rtPIV5z!GYLk5^9j11@C4oGk}&$&An
zcK`u)p>wyuxm%1od%j0{m2e>-nC}TP2_(@T&f{Hs*ssAv4JK)Dk_P!2Owgb}gUK44
zticon7@nVk;M;Id_d<TbSd6?zMWnj$vE=`-KXYjmh7*_FV+4C0YKMaTz5tA1*Qj7W
zl-BC6gVliLS%E+WTZ>9i?GWSM0CoEx6b)n1)|JH_=ix8x$3cVn_;-CA%!9Yvy5MUO
z_^F*HE7FF?PwdA*gZcQe$+8n!kPq*&aA5@NGk^ypSw>mdFHmdHpr%tZgv(^pUI*4-
z+SyKBrkxuo(QLKbPq&=`0u?_|dmiKO55&}aBz!$;wW)<yUn36DksaN^NwVa>dg|7D
zOnVTE<j;9gq?hZcWj4s^5ERnXjsYF6M_H`YBE1cz8vN;A#-<j!vC>dT0)O!b?=tnd
z9m!aqHwnPh=MzfNDN51pF9=2VBhdQ1?QS%bA8SLo0~oyxr4_Mh8_Io%P<Kun$_`}J
zhO*PS;~cd%6wX=e-7e>jbK2g9vI!8^UjAUy!)pP-<_x-ZXfU!N4iYCc*w#C;S+*29
zfVkBxyZIA<(aqrpkyaf-Am9rCd~b&cbV1%p+dHT^`~dMf=(Cz-VY)s1Fu-VNKSMB)
zGhYbJU_ypd#W?iAqZOeU@gsj?YJ~O88W|)2QzLQ~RBXgUVzd0io|hW=Dgv#Mp{PAo
z3hfr9!l~@MfwG^=+7%s29)(?jQaB$2t#T=Q{2EdAk+2Mr&BJj`>7wkOh)ImDzrTPz
z(P#jgT6py}&cfca5FUH?HBO5c+-Vp*lL`U`zbyd6;Ag6GZ;0*ipZJ_G=trOoeivkR
z-$<2<hFPRn*H?kPNccpO5(}rA?s4QX-2h_*BGh!FbYr?z=jH*I>ZaFpD~zUF?+(Ir
zccBWPPwyajAG7iZ`bWc*X;W{%(7>kN{-MKrzM>YsUk^qiH1+*^u<1x_K3>J5VV~;Q
zeq-NF7f^t>JKDqS3Bph`HRU1*QMA{0Qqf#h5}F#{bi1jC4vGc!aJv9ZJ$#F+AF&a$
z#R~cF#$g^X<qsp!dbsNj`q(VMNA=<j)a!o$4JPf>97EW;9n>VFSUh7FZ|lLUfgP0@
zmCb49Q@};)w8>Q$IsVGUn3I6LXP|E^L&;_=vz6>Ow;AR>fO3(!?E)~&O;qNt5rgLM
z5ch2g*Y1_Mb_haV(1((x&cloZM(;e#wD<zMxXVm&v)#o_)#8rP;^t{_6;5$;S=<ky
zZ&7FJrKBW!k4(MX%IOnGi#}j5(#2!o;M4&oUZI)F{VGIU68S^q?fA!Z(AVu?>Yk~G
zgyR(up*Vis>ELK;NuI{}29hP$@HFrmj8*M*PB*nT{h4l(6K3n7?#Z?zU2pXy@O$>f
zt(+Dgc&n+)qp3=$%fH@2fT_##RJgB;rSSiKhbZcRU)pu~IWl+8roo7%nQ}NvNKZ56
za2O)Ak5Y@kK1wY@UwxF?0rpXPcfdZX-MzOEOLE*>h>nIG)|+cvC@}0)-f}uh#Y%Z8
zf@YbV*w21L7y!PK_GhQ3xdl%;H}Sh2GywEV>{rsJ#vi%a$hDnPfLw1AfRXEJmFpEd
zDLVgM&x%|hLZEHrC#VB`y-ExKOM(ITf;FRVP12m|afnInUtF_%7y~T@k|ZV3xd2KY
zZE*$Sy$1hk)UKxkwdbmsBmS$K41@0@85wL5fMM`Q%HX47+WgzM3xh8pPzKu|jP7qp
zZ<I!Hevepa6m7b9uIhP2q~D6#iL{5TB;cA-;g;k6p^I@@Glbp6QQci&5T}=9uK$7D
z49HynbKG>J6;M*lgQcHA{mGP4S;!bYZ?JPBJGoY*fe3JCJ6pzE>RvBU#;fu(o|NlW
z6u#Kp_U?c&+asO2<3O{0si(}{U=AwJz@DSrj-Z#0LD((tFh4-vvbdXUxqyw_o-Fby
z9ANeWHH)japBFYGPV1l(tgYk8Hnxtd@$9^N@irK?k&E!Z;(9s^yT2(~ThKwgbD7Wu
zW0k)@fwJ8Iq!68*Rx9$$QgfKk^2t$XCNl;r1JKm!sflPyolw@Gw%P7mMEb<Vtyhsw
zjE3ZtUOj6b*Vu*&T?F9}fmm>`@ihC&P?(f~hkR+%jrsSs2@Tp329l7N|8>BgAuI6-
z3Cfy;!G1U{k+uczteg!er+WiZd6~LZ5yt<1qr+6sMgKH`5p2+XEq>~cg|4X%UAHBW
zC(+e-y`xMUDaA<H0KAp*vmY7z@Jq?~Z2VRM82j*7wGTfO%jf?ICIH|8J%~W1awkeR
zV>x<2R3=o~-vKqR0w+xr9!qLdCJGNYnpAI|Vn^+8(CIaRQ7q1R>^cn~X<?4|OB)S?
z?;#lt;8OxH3=aDeSsKwweT(_qT7<#p5h#PL5JvY^{RmBC0N+KdTj`zok>?m;MnVwC
z*YW7?&<|g2Ve8;pP-y2KO5W5kP0T}Q$D=<PEqe@I2~C>+LK?U6`j7O??1V9Rq`f(a
z4gLv}!bYGbWpN8l3TwhvlBw}it~b?DPF+BCj1_>Xj&WKYIczC0f9_LK9Va2s>c~OW
z*?l+kjU_?6QC6rK(0R9&KMLHb9qvKsn>6IU^z9o-)hV+Hc8>UY|7{oyQ3=4{3;`Gh
z1Iplqt-|10PYQ$IL!b<nf#7a2yXo|;p6s}ctfO!98KL?nOM)T1Fq*K%PO@Ai;~_}q
z{fZzqKWVDmg!*m46siZ6*}a&th5e-Ncu&{2C-TSwD7&$L@_my8ChYGUsJkUIw!lz(
zUhq34l}z}6uWqACva)PFDv3Y%LsMhhDMr-TO#(1Awm@s_XOJRP@^-8Rzy#ipKx^!_
z>mbu?56yi`Sl+2PdpzG?BuQ?su^o79uhFZ-dqB;8l{m#+v~>|wrCLksr`s5LwfFW7
zMi!4F8D(*e0E{eFsVsgjX43!PkN{+H3j&qJb)ZysVnDC%0Ds#GQE86$Jw`s#spZXx
z_}8sjb|a|~eTK)d3B|kS!qhz*;LK$8`EF>J4j&TMETK9#;YA0p>P(F<z1E292dF-Z
z>jD87aowciY7#T%U+{#8YY74sS0zN7st7F<c-rB^?}0mwBCJKTY`J<3jqc{P2$Ix+
zbpfciE=Hpe3X2gwAaE)vlMyfwh=>*r(pL@m0AFgT$zb}RYfqFu2ytcx6L;t+(J$?E
z?q0+lK!9~Rce|Xs-MF)7FmcOTV~{BQ27tD>K=eT~*JBceH*1Dq(WW_qB74-8{5{}u
z(k?0+nJ|pJM}zw`_^AdDYH&9Kyt|>CV*Lkie-{A(Jm}L9G>7j+JYJjD#1CljkOmJU
zfS&ve!JoSafdD8k?#(!XY4AH}B9M}0!Je@&l*z*K+rumjQ(>;cn!9fXVlB)JT9Ae^
zKls9Ijtd6}%ghXx3lS*GN%80m>^<t3@I`6+A@53gqZ?`9`{AlCK-Fe8np^M;O~=)T
z^AJwD+BBM3RA@As?+Cy&nqF-*3&qg-$3G^GrT~F9nsG7M+wVAJ_NAg?Y4?obc#Xv-
zFKgU@64{j2Iumlq^EI0}`H<X{(%I8t*CgB1Y4Q0{!{JgylEa_?42MGplBW^ZgCX=N
zrN0mk&qkme&H!zF`<%6;Je?ISM}%5YRmA_8PdMCc5Q)YpqHT*7E?gMd`Pm0;pZAaK
zZ0kK{%=TdAc6=*%-P*NsdQ-p7w%&n}wg`e_#<XF-eOuc*gK*P1W~Yu*4IclZn_eQG
z*nlBzy@yA(8)T7AC??ABoPU7U=RJ2QVWmI$d8(CuK4Pll9SRTCu~h)3I!0@CWQck8
zKmDjwM+X9}j+U#^S?RB_LXDO7cGpvoKGjP1>LS7*&JklOZ~($2<?4{Re6%;ZUrgs6
z<lKt_BjKX}Z))LHx^2$>^B0dd8xHp&8997S0EWXN<?y7(Md9AuBpkkvKskH^(&(Pb
zk#H<*0pqqWg9xWb_#ea~Vksj$tMKnhguV7biqYgbXdiY29YxaC)WR!9#KT}{3=(th
zyL?p$3$9Y&U~(OiHd}B)N=jMkh;3xbVC?iE+t}Zj)I*p$x^XGyydkv<87K`Uk1%n%
z^$%sIi>k}zWQWfYh)7<#MnSN*^H4AiWk=Y%{-Lpluynn)h4t<Wo!pbBwao>pt#h<?
zZWT-CKjjhfKV^-he^XGC@+FfkStt<3+CtDQ3nIE4QnsJv5Hu7nhwy+dT@In@sAYZu
z67tj%mP78m(x}lEN(pMTK>$XLE>S{15rgI5_%k8&HUz3h*Z+VGMRb#s0la}Sd<dv6
zQzhHr;fO&)Vaqtj{&<s~nHJQg<;X$X;0R>Yw@>>**l_hOl98)z0x(=PD_0Ygt7je-
zu680&uAYVjy7gF#G(K$?VxeZK+SGxFgYjuquR5WPdbi8D+l@QhJHl;WKJ7>8d|K~2
z=6lszCf+emSj+Z@ldNSU_U8q5o!qZ+DE71)TCh*4dA$+g?W{D2aJc}C2=7x7ek`Wb
zfB8cq!Y~3A;bjoFVq=R*^>|r7_S{+OnN5E}NvZbKHHJTUHMt0t(zlx2-DG%tl9dV`
z|62ft$5!QWyz+R%gTmvT2$aVkgUasH)XJp}eYTQ^bZT-3BL1JKiFM$KoI6xa635~s
z)a3RDlhx!aSazh=%V3|10wt-u!U*tER44^FO8`cIZ>s=56#M3%`+x}WLIf(nvmxyL
zDapNv?^{WBqNG$MaqU3Fi^bR!m(=C9hhGDb{cY;z!wIMv@8-j4@hjFD25)42g277!
zU>N*N862w&F8ir4xCVhT*a#Bka~aNII|s4Za3=(xve^(WbnjY2Nv5IXj{-21{6i_Z
zODwd1&;3HlrwEji9#Gvg5*5g|;!uH2UH#4eH;TjFM+g&c_7Q#;lp{4GgE*Gfy`!%T
zsJuJ+4!D{HX|I63c)c6epJ(v_OP<4R9>0sKr?d}q^Eh%4xf=1B*lYhF<?#rI$AKWM
z`v`an@v--b@sxFgSQ-=lO|p=#Z4N-hf83#F8-j1^-4H=qn|iYn$E_WaIBxALjU(EH
zi#zo|mapof>0vs<;qx?eAg1e#!6eTP!(j4$1aJxHJL3(XlruZGKvbSx@0sDN`!Z>N
zSks5tUP8ow*re&2$-znp;}tF|AD&J^cq1=WLdFnYnMOiCx;IHejU0+D1$wMBW~;0m
zXTbQV3%`MRi7V0b#iy<^t#&>%nHrrV0Mlx}uNs{pU5kIhJ<@7VMWC(LzZ$J}YWyFU
z8yq7Hjz0;&;8>zK+Qhp0Ke}6R{2hVf_zTK2t9x|OxY!35?F?Ynk!|vZs7sI@W;JPJ
z_W}FfgdGp!yAn;u`kv<OErte4#TzKkvn;T37N+XhiSQRc%H}YSDh4SX?&k0Z%Hd~X
zUj13h;gJr9nV`5kf_9H4o!Spm-f7$VNJOa8a&V#Z+v<?@wbcR1kdE$}-tETSLAYyZ
zpl0sT9OuWj2q5>_A>d-mT-8Y&W6kCYAotZFct`_or|Z(~bcsz4Tw_tU{*$|K$B8q_
zGqEH&T8DS3A~_nuO)HWNL?oNPbRtpMzu>`wwF8O79B0TmG8ICfBC(uCn-Ix6KS?W+
zc2u14VouJ_49@{0c%&sh`74=Wp2o^9l8-Ag!xQxJ_k27%GyH8lHp%{!uQg6avJ8ym
zWDD;g*`7N<A7%gU7s!IB%ttUU(g|bHjAv}Z?S2o%D~ges;n$RwVO}&tU1$u-6g0OY
zr)fPvyf6ON3S%EWy-ZurO9C+V;SFs)TkmB9@xO8hgDGzy(3bh~O4yj01|16D7r)j<
zcdtRW+KujAMfZJ0*QDsKcF<h`ba)|_H6cqKyn(%W17HY36f|jvjE_-CJ20E}6!04Y
zNxqvo&OC^Z4tZUPRhPoL;0*Ctc^A&ff4crFgVx%HXBM#I403=$ML8b$DO3!5A6RZ=
z)`q;aI5!Hw$n0}v@*XkB{@ZRBncas#Wp*nB0xG(aZKt2`rX2<6B*wM{Y=n5*K{Q}<
zD}p4ZAQeV>8G49R%W)=pB8wdNKy$+%j(ccceXNha`0tk)Ha@2m!Nw~BFl-z?n1qk`
zt5{6`Yqtp-T?mwo--6}tH=x#rhF~Nk4~T8kFaV@GQzaiDElyYf343s+0s@|*z(>4N
zgX`1Bz=+y1e+y}Kiwqn~L}D_i3B($_vfU#ZqbRnq2-9We4R=xq*eQ9bQ}QO=KH7Oe
z0?tb%05$3BS%G;Yma8<Y@tnDd-8;#&iCy18$wnHDWba_5Lb59aU?e+AC40+VB-+0U
zEfS6DN(3s|%TWt@lnq-{&q@#LLP9WhRUFK_C6M!9Ao0w2mR<0-O~Ly@q{I|FNelj#
z7Cb-;9_AE$m{Twq;-}e+{;=z3J)selAxYXQ9>@s1F@R+7Y)G9unOOpwibPmOIL1iQ
z(Hxlt9Edk)RhGJCDtY>61Xx2;XPa;}k>FaCgaeA!&`56PdQfT;VWhW-L_i46&;h)u
zg;$vz<uVk1@fR9Q?Y&E;P<z`1V1)R*3h~1`rS_h|5({c?Cjza#ry=m}W4|Q)a}jIX
zP*CXTV;5qR7q?g@>KkdHIzYCO*>K_vuBv5I-=kzm9u8w=vJm#GIMjaArZ(SDJJe0>
zn@Vk=QhS6_`*nxfEK=K$(Fe7;4z&<Ey%!cPcS0?I?cp~8L*xEG2(Ux@Ed+SYF@=RS
zzuzAV->WwQzl3!Rfln8J5%^wZVbvX^(m(Si22<uDP=S|%-R?~T`e30Bu_|!bn6xaU
zq4wo>_ebqRml$fFg?LEq%>ppg`i78_5x*9*@4w?lq4uW;l-k?DS$F>gwJ>Nyx1z)F
zZ95znM^BE%H$C+o99iOwWT7>sYSVQ<rp&<(8|F|O``4yV-q{~>zg}vX`vU|==AIUS
zVeae7+();OEB~`M2y-tYQ0BHn5Z$97=(N<nhuA~b{nPeK?Xfns1%}!zH?=1!wIxdJ
z2&MLDhuYz!cDY)rRM}2&s7>g;N_l^}&yFp*`8LV%Kz%je^XrVj8&R1Qc&Px4zzday
zbz-XhvwkcBKL>#d{4B8B{TRqfEAR%yChNY7g|*C<LhY+>?@v88)f#F$ARbbCy8sNe
zWlHUDZXss>-9Hj)A4Z_m-UZIOzXS?k;9(~)>WFUK#GBYvgK+MeAto5BA4=87X`<&2
z1%~LYl4jkWED~&Q=ckaxv>Fd!8h8z2Gyjftz_)IPq)pdkE&vVbnoJr=yzo}CBuZUo
z_ueH&5-n2lv+<1rFp{WLNjxX^)_>DRk;GjHR1!BrYUo|1>tXN88}zOpQJ7-clbyqn
zh;h%GHSHM<A9puS!^98)hgo{g`+5*O;<Hsa9@DpSK0a~34?p;Q8$!pzO29kmsWGJY
zH>AHV07Lp^O8U`C`rFqF>2U-~`deVLdjwmJoVS^A3b5j~GZ@>%lbrActTgXKQ|q>&
zPvra1qwtYpnW7BDn^whrct7$So1S_QPNh2CP0tUMo@>PJ`_EK*<~j7t1U=x9u2T1E
zlw;E}vM*XF0-Kf_f0RtiuP-*T`2!_R`zHV+n;$AI{gswy|6649A_A4ocF=9p@)3%$
zX(`w*EwnF?%djL`&WIP=w0zIdlIy1B7NupG^f3O3N=u<b%LJuGJh|#%)N|(O(Ld9P
zcvAzX$A9;I!}VTBlU(l<fZ_T+EorEh^wM?0^=}a<*Dr!9aQy{pU;}lI2gU3GL&vig
z`I$w}3*6Kk9nvH@YVpWV+1}`ACQgzpv<aJQ2pjJv?0qFHdIKr)=PO~KI)vqcFg;1~
zCQ*!x>n`B{#dV;hbCTqpm^U|XaG%1o2RIvYF4PYkPQ%Bg<x`574u%4vFYgbNro%Pa
zZT)gJt&I$0P|0|=USo}edqd{q1Nvt^-3m-wkPxpad83<$_HUBR{WL>U?|@}32O{lP
z&;THO2*Lzu#|BeLYucV6M)S3Ju9v*YN#$ogUeZ59=^L4rz8U>9QV4vq=et`!*LwL_
zIspGI8$@9;oO-z#$o6*>>30#I?CE<9UdD5Es7S0qte3tonz0qnUK@BH^aP*xqlKXj
z++%Fu)kw%+{Ev%_#{UBesqw!RfYJCYIAd_)rYZw(Tq_K`hd?#{^~JD(lc6WDdriGZ
zhlWacOlBCIs$GOJ9L?x>8e_=vw>^&ws%hkPwgD1zow=T~Jn_?Q;wlVrlib98U5UF#
zIu-vZO58MuxG5kG46`|QgMOuPNM`sd+`}O4rlH<HZS6|i<v;Y$hSzL=zR(EmIo1$_
zcBcT0&_*d;!<4Rju}lv?{SgEzw0ppVp^HOHntm9HIE3(b#L#faCu!Wqq8U3FU@TT(
zAt|ysglm$?Xb(352(B`=EJ;>?dm#p_5OEC(O#p%Spvk!?6A>F25d^=E=Y0x^X<<H`
zlcojqi*KzmjCTSn8NXiuhVc?*{CMe_{13;3@y8J;;}1bd@@8ba6t_Kb6eXrhQBEO>
z*CQICQIMHXiwW8L5!VrZjFeCgv5h1alkm8DzAH!kI4|`Ko7kZ?vEMSp{(S+dH^k0T
zVwX#Q;rA)AgB@b`A#+bnM|eGp6~da$T~BFLpiQmWL0GQ!85AleDx({jB3Su6tOsi<
z*iR2golC`x{90wOf>M?2{hH*2(*BsrMB<Fq4;W#~`T`)(haS*?Ia1bb@+3eOqF@@R
z7-kXx?|I5wJf1^}BO5vS?ba5a{tmwnP;%8C?%*9JAT}X1JB)Pl!N9y*m&UNzbZ5j1
zJ<*L@h(+UZ*wjU$`u-XQ_O#Y=RFa(nEUrM6=pnxF0!d0{_*m(8{L8f69E~9U5sNkF
z^ft8!@tN!4dq7>-$&iztDLMtHbH(gwg7~ti>Eyr*Gof!h&P~h3D7;C(0k}>k7rB>Y
z^%Hh#kQb>WwNq|{TEzc!5wu6-iFZ&$TzU$#nbVon%y;`K&h92hvi)YnGR{TjtyikH
zjrk!J*nb^t5YXP{Xxk4_4wB|D=?^sN(VBFTCf(p9U5KPT$3w?FB*@IsPe(Z~IFk;j
z4g<K*o-@Q>1s~?4n)t4IwezuB+l`Kt?+l7d8`z5wFO1Q3k&mj%2WD|XJixs{e2!H<
zAH5f6nB$m?awJBg*y*@0jpN&`{Qe7ao)qY<{~hr;pTsSUta>rhxHD3|BS|mY16}xj
z<~zr<2i`rZJ@9*k?;YJ9cpu>(5dINi9RJ<8{{UeR!ac{BuX18in>M3o5ejPRIt+7b
z--?#*-gZp5=Pcb~nc?h;yts7%cT*zC3Em_Fog~$*JnrA58oVy>W-T6j2I6K3ZkkXQ
zia9Cp;^jY#23~ZEd-1@<xs&u!+yHR@O`DzJtOwYbl8i1Gn0|pbow9dc{$4b&0}y@?
zH`>Sw&bPl6@X3Wv1)DmJl)s1`hs`9|5$I*ua}Eb6IDdZlF9pns#*2SZdK01J8OJpj
zl-{pXUW{qX^1$#tHP18BfWTlsem!6hqbQwQ`OV`6y6>E~IJA;2gW9ug0dC|a(7-2#
zvW~!BQqq$jh2FUemx4hkUb+!_cA~6;?G1xb2){KP*sCSJ*c9(~Qee-THc$2_)RG1n
z-%05AJd`q8`bod%o3l1J%9t&qM<9;M(a|`$Ff+_kDy6IpIg%Ge;0YgaZY|??4CFo*
z9H}X|6LK582pBjy#Qx`SH%y8Fnqmx73{RxkkVsLeDNbREL5UQ#nqqe_V*_G>&&)i#
z)C#OvS|5xQbQBJ%YG@D<;=6zSabV#%#jz<lW$+m!v~tE}j}Jyx4C*M%${CmA>zRPm
zy~v60ezJOb+n*JOmJp0>B@%P0_ui}RUb`LIgi#I1!)I?rhq_@y>C!c|t`Nzx6YO6w
zlFNR;1X0JXIv1Ft<xrwm>|XFuAar`cdf-I0;ls~Bvhv`O)VPt1HAtEQ@&53l24-Hf
zn6BP8P_&^JJv9rMXcsV`KZh3OSjURv%hFf(XXW7@swL?l91ss~kgi?sE87a2ACqLJ
zkZ-Sk*o%9FD~|^^tKEfrxGS9-H<KCM|CNk;yep3fHx<T(8!C{NZYHyZlfZoza%LPR
zD(>X+V4vp3o`KKQL*1N|ZrYj9;6HrzPm^?nUN%em9l}KZ{b|Ux?CESjsqB15Lo#+B
zG>RE+6vGS(TLhWc)No|(d`~)?v;C2l-8c_FsUt$?N@x%tB}D(Z^<0)8>A)Jq$H9Ao
zk&l9r-sq4B-r6q28`rbY%)?CW7?8#x;_7v;fp~(k7*P-tJ{%zXrj4P9^a9)w?nO?Z
zhlu1BPR?FHI>G~xobagJMZ!KjcZ3HSXyy~)dfdt(Y$yeN*_f@b6H9EwXW}pTr$zWQ
z<tzk3O?>=0aK7J1Wg_oYnpe-wdLrDckN7NG_&pSk1aBz>FN(uHZU^8^2Ve!UIR8ZW
zbqA28fZYawW3zB#9MIq(Ir7$+hrJYh_JPI^l*ZXg<6X@{<Esdi#_0DzV-aXH{8JHK
z{G-_SP|8A_+@@qQ80BmA`KI^^!C3gGK#xQUhG&efY&@R7P||F6Ki9{>oj8j?uqTzF
z*)7R_RCFV2!XRzx%8a!A=3O3LV4yVjpyyqshe3j##&05<fcBjVyShCpm56-^5vfNU
z8;0b;lSEj{zGh1)^i54Sg~n-F7W9I`GkVd3DN@O$YJx~=OLQZ(Bl1d+dmJLFM@F5J
zJcHNg*`C2{jK>$F@56?d#tm-u=f}1A;qq7+%Esx&8MIJPeKdgh&GR|H$_(ElHX*Qq
zhvW{$VWiJxj%&-j@=8Kua2b&DWu&z48|Tt_=Q@9&D_S@_qXwHSBl5|0JZ4EB{+PxM
zjRdx^aKX#canoE9<k^eow&DE6z*EukEz#1)qJd5Fah(T01>4UuN0jFeAPBP4-GEOw
z@Y_3ABYMoUk=>C1S-K&*_ClbF1a|NNnAa-iBLX{lo@(Z}z*EbH;v?;7uKT+0hbA?x
zYW1xo1a+)42*?z8%J94FIL5C&%ACa-XvMj`ft@)2H1HHpaEt^V>RE{N8ISxxj*bkx
z$cKB)1N&ZKE(nTj3_E}UT%IpUhpmyM=L_4rkhheVjB0^uvQAUZx>XO|Ux9JUksy^f
zJz2N`{qR_E!}(x*X+C)#z4L5TO4E+T_TaH;PoY~2I7-}ddPS|3JITsL<#oa%&CboC
z``AU)2;&Tm(}ttV`GhSc5HI}FNZ`d_tZ`>BR=OjI?Ih5I&gl^h6#PepsZ3@&+a4-L
z42pr?Ha6w_D>253KtZ|Y5z9Cek31fEOj~f<+2#5RMs@~2`+(QB-cy5PpzNKZJ}*W~
zQR>cU`HP9ql03Pd+Bjv)xyKsg@((F3<30d_QTV07ypwH*`Pp*2S)kw_BBOB+@fj*n
z{=PPzP)a)Ll!MKw_>-SNV@0FV*J*KJAk@j%h!>l6zk(T~YIEwp%bnIBq8y3nFOMVA
z<PVu1CH!T?IeQDtuF1V9!QHWB<NE@572(g~;mJM(EShSjD0_<0=Aol-z?WE-M!~T}
zcL>AFX=l>Vlka50nK6wgIOzrq^yK1`=31J72RjP0@nj>%V}bXv(EEs1KrFjV*@>Cr
z?n_`)^utB5;m{pEkivfE^cXWA+<KVK#84IqzV*X3!OG`?O>IMhk>MEDiaeqlSrC2G
zrtL$5(E&UV1s~yrftC#{n7gJ&o1w^BWf~z}#>h}K<AXxj@865?P_f}0=WLr&`Ie6@
zlIQ@8=(n4wV5BU&Nvfcqow#toNdm~c7W<;$e%SS63u=I_Qpmf*|Bgz^3P$GagdtB6
zDipY+bI?CiO+YyVIS&%$K~>bDpgfqW^58>V724Fg>WTt@WZaci*k@&7MS4G#_3vs?
zBl~Dk7#RO^EeZ(Jwy1On52~UL9^t`MlN%dqsUS@)ky3AqDoC!RLH}=C)X{ylsH6Ys
z76p{)TU1(<2USsrg7RRh%7YJe6--lCq&BHV1^cWlwkU(cWlZr&g#u2RVZ6is1j8Hz
znB*#?Bdit&NwP7cw&HL)c^?INX8)1&Z(jbOsjD9bPBwV^N15~F#QY7b<ivb-Rf6>3
z^PUekc63|(+cW;L?;|>(wq0*7<2h%tACdGPJi@GDhyAO>+;m0?G5q|qZjKDvof2l&
zhHitS1;0n;(5CjdrEQx-h%$I!X%`+6gU4O|FG_ps=_w3;*=CUR9*VR#UiL2%b7Cqn
znKm)8pd-ho)-SuIy{p^ZTVP5;v>3I~{WDfcYR{=I)1h$o<fRU0Mh_3AQ5eOZIo*gF
zlT~K_vAA(JG|%XtmE3Y2$K_-Ue{3EwU1QwvSbdpudpZse=N_vUu{|i^;<)ATNP0OK
zr{qus@$;3*f;bd?HG&8P`xeC4`V_=T=>_rgW?|0krat{^DvQ=X_9crxbVB>+LlMP&
zE0RTVD7MLnV)C@UMR9bpD4ed>qZ9BA4f8*5^@!qV6~*R1^d*Wu)WURwha!ucmnX~O
zP%MX$#kkY@mc^((W#Lf^mn?ccvKXbZ`04xmbiYdS0Qw4)ZRS-Yy&UOdL?3x=2Ioxq
zmFiV-tPi4}#3BP{lB0pR4&GrNSLOiJ2~d{-VHpSW4SNB>I>H9u^EaL3N{{6iE`543
zNMa9Gvq*!!^*MIA=t~2=c1O!jc0}GX%KLnFx@|~tVr$|}lijky&@!3_Cr3702;9>m
zoE&pbmew>fF_t|@7GA?Y!5A8=u6v*4o}<k5)3F1%Bb*H+kfyKuTX>AhBW4JyTi@f{
zLhQV~!G7d4>nW6|r!yaD!r9=!8d>5jPaf$RYXq*n!LemT9L)+wHu7U!a9A+7-MC3_
z3EiT%aA-HS>aB&_oq9VOx1D;MjoaONTY%dxxh*WDzazI{ibp02m2S^mVO>Dy3co4D
zNK#B-xuy$0rI!>7Unr99h~JL%uE)Y+P6WwU#bCbqZ8K-;FkHYaHc%!I!za5zLnGlr
zeI|iYDlW0dK(v`i43{7xx{;}(G3Jd5QkgY8n;We$sVF4NyrSN5YEkcWc5xii$?Re{
zC<rLDNO%VBQCL_DJ0e_$XX;+&I4N^kW=A+5AUKNqx_3b-np&9Kx6;66s_`kniGxH^
zi7~snEXO2VJ(}1)&isy)%5R0S1k4&rYMBv~0(ve5hK$?>nS7Kl&hhyK^UQO}@f@Qj
z*!YxknOd~d5Bt2H`DGF^e6Go3!i={hPSYzsIGs}Vx)!p?smRQ0Zb9`c%Y5#RIgipJ
zRy&WJrfib7fjxeofUJ|`A@kZ7Ad>F62_@=F-}X&aefzIOQgG<fw-3GgHl7NWP`}Q?
z|6ls{hqn$+-=0Rg|Lyv=9dm$~r?>Sd<8kwRu=;kDq))GJwGy{~eOsNA(6ydXdQU~`
zIa2SbWj(|69=Ck8D=I3RJU#yCsZfV?JJ=i8Gvw>`v})f#X3#gV-N7od`MSFZ&I!lD
zYXSA{occ2`V#6CW8{2zeo@0W>q~uzU8T?%GrWiND9@|Jf_DgP-B$Bh9W-yWF<y>+0
z+n&c4<|ZD^D`@zH1}Rb$GRPWC6vn7zuID?vQDfo7vS2dME+9i*Vl%ebd_Mpa(TSac
z!znDa$9Uz9TW64UDa*qPOEzCOzJc<bM0zrnB*N&=KAB1gTZ)9w0EaJr?JUmbh97Oj
ztHVW&hvW9=avLgjNYllsj`*cWip>!C_MPIyE4no-x+DI_Q)E-%*Ap?@P0ULYgX0TX
z7><X+)yGkJRO+;OYW_2X#0LX4EJ=6=stydWzWFJz(I%Zuicaa@$v4zE@@BF~*@=P_
z%H`RBHD`+BEn(RO?$J)TNv**smZ>rdFcl8}r<YG&1^O9s0g6Qx{}98$ITSn=IR|b#
z0+jY-$g5LG)5{tEKrfcTxH*V7O}zs{BXL=SPlX&7`f^WoQ}5yYY{(IzulJk>hl-_x
z3UOwBumhwAcJ~An))Bw{WE6u8%a1}zdQ+q!da=k?7>xe}qD;ba-me4;_P6fF%Ish)
zH6UYa=Hocq&gY|ZbSIso0Q*2+_bS{oe>AX5=6CuxBav=H51&h~iEzhd+OUB_qPV!j
zkAf0cN+%C;euv&%lDBnXd-wJrPMhbnL2SdO3%t2>x1+mFe7c)e47|{rH$`9d{?a)K
z_%m#4^f{YW?e#TM&X8M2{HpB+%$-8E@BeZ72_J&-iNty6#<PY!0y(ma1)^T+6*2A&
zw#5gNcEB(#kHM8l?qwJNY-RtNfMaDALc7l1=N9Ey#_L7=I3Pb{8u~g@u?NgTaWWkg
z%XkveIJ}(bqHDW=4d2uWP2nTzrE36vSDa}x2ur*h0qJB!WCPRj4ie-N5pL~5cSG43
z6J7hJ;>ui~fwmO?<U)}}7o7U0-lH;qz-9Re^6LT)$h@E$RXU(QcX{Dkd3Znt?dytS
zp%BPb2~YTiS;-*@MBn`Yum~L)K2j9(f0-E}`f{o#T7l(3Fm!Vgf}R@Y2BUf+fpd6|
z!zfGXnTABtUXEz|st4aYSdW8vFny<3-nPZ1M*!)@me$A>f~DUErizyD;v!S^E9&WA
zrD}_|*6(Gbv0}{E{8q(iUKc)q^7iX=Yiw~MFD(c2rVa}>WOKg-2!fbpkGJV+zJ$!^
z0h<E5VDwmx>w)5=z^=?|m(uAfr<j=wGX9mTWz?Ky=mq>y_9CgR;qqq;_)uHJos0h+
zt>Lw6P<$-o#Z&g%8XiV;N^3ZS93Mn$(DnnZV>?UJHlD)hK!xgU8@taF$@JYeo>=H=
z8xP<iwQUT+%l00vO>G+=RcYIpG$~!%*!yS_f`74X{8Ae0p|p+OX!)DcNm1795%eoe
z<q(<nR*gr9Tr;?bO;2Xez>ENTX?E6f6a{R{@r{GT#*7M~XF@Gxa7Ws<5lG>@#js)m
zHf;xXJDa|Y50}PkYY$(5KHI0R$MDmsLF#^KXKp&j)39v|_A$H=bOenDW;;k1BEJLE
zt)n`CP3JVd?FV7v5Ati-WeL}4@KC{=>_5$ag$iZxHGd_MDA|9?MnW7#f<rxpoWA_A
z!HUl$+K)fh^)i*^puDh8g2`Ukj7rtR3UDip#qrNhHZjvA#_NSOOI57BhZWLKy|5;r
z1{H+BQJ_2Jd>l0+-*%_CscB^VI1v1F|3Ol)x+iy`4EsIMsqs&9`4$L_*HGvN-(h)A
z0OqxjTy`_~{w*6&%zxwp22+khps3<`)F-^!xnra~FlgG76<PH~)2c7zJ)SRsI1dyh
z_8D%X#<rY`;YJXn1_Y_Yg{6RQo9EWsR+JOOwwY~~8~OmD@a2(Q8bxOK8bljNv~aZe
zf?>qM7rYaJiQ!g!$rLR-o*&?Go<?KOpZ(N~UHo>c6X82K5m>^)?9yO6U9>R2t*gK5
zvA~0*e@B?y%udjS{sBiatpJb<QKTJ9IhcnEtW7+QjD#;w(2Eku3121wCtEmbi-bdr
zheVKZLwk57o-BvnlOx!vhKV@<qhU(=>F{w7y4h!RJ?a<VTmu-NB*WF0d3|fLPu`ki
zD-qtKSqn1~kq-?-Hs1guA{(#AH5iFCBPh}DVJ20gp0L=jk>8JScH}r#=p$h7IR+yJ
zA}}dnP_`9PN}MHqnLA5k@)C{!ot#^c)5e|jK?$yYbU5!+>K+_gN0S^(!YR>>Nce6l
z5+e?CG4}FKM|cll=HxAs9Mo@AVC7>c6GH}xf=44OYT`QxnuSXJY)D%iU$1-&sr9ir
zyczfH;U}2CJ<R&!IRKj^!7aFg=SWBVy)US~AdP$N>@sSaTKMP-Rbo_1G5JFCQNJQE
zsG>@BtGIqqOibp&+wb?=U~Kgu-n0js+A(>(Y;Q2K9NWw;9TaT(V{dTG=fN?Z{a$W*
zr?;*9u*mb+AjxTIirSPV@7Z~`f^8XZ>p|r6$lisK@;%Lgct_w1%C2W@<`d<6u(v9n
z(}{s1RP>0<CjxsGz8qiZAGCfUEKJXUg)cAJ)43$x6!@YaEW*ImFENGlwt=N{;f-Ae
zV-VdJz826H9|;yQEpFbK;R`i(OjdJ$#$eiup{5?>zz#Do2SDc@iG~8D1Iut=31nY#
zU<qUc4XnAp{gTK^bjNs?7wui?lMN`upC$Mai>Rj7!Ktw*$&MY88jCXRSR7c6V&e(S
z&HbAKy@vmxczY=G2g}iB4QU|89!7xANZD|k(lO{16c685fp-)Qe1YxJqHp71KzJYc
zB7u20FfV^Wu@1LM=!}+s(e}YesRb}OoSO>`bsClBigHAvQG;Ajhq-g%Z4>oAcu;-;
z#=()67yrhlu(=fh=G}318xvV$2zLSMJ!bo7W7#8wyZ)XWvC%}J&3JQMj)-Xa@aSe1
zff*;3ha(nnEsE@w9gC5U_+a2u=W9m%jqjSC@gs<gJ>&BNFg@ePXaeXNC!Ei~zYn|O
z(KC)d&+Zw2bs}D7W;5v?4AT)U9Ud(o8NnWF9An?rKbD_3=}HLLA}tv&n|x#wvKBj;
zZ9-<*gj5?sirj?!O$m7zMT3xKO33X9r1*HiA!IGgAuJ>q7P@xh3NvXxZpLG@aX2=!
z0it8k=W{q>z`N+sA4&MkS|q}r?|qTpV>{vZiA{yMiEU&B8DXaK@)#m*UatI(5$dh1
zCkVAs07j_tB1UY)JHmwjfpbKtzd@k9tOVaG)W<+blhD);rvd;!-gh~LU7C>37vouG
zZ)WC|N3yx7qF_k~9c@Q^6)G8;5RApBK5nw5qd|)P4#m^syT%xbdmu?t{Hy>B#d;$B
zi1A8s@Arh_vmA;$z@1QReD&lPSLY(0@3f;K7zc{&Vl+n6kruvXfOgS|04q<prfC;|
zdbRvVL<n|M)PGeX!j?lLcgqKkhb_ewwj_csa(xD~e%2XzrFs1b-b#YQB*9_n6R0Ga
zR9=iI5(Tg&x#hD&-Cs4@Nb*k9BPF>~07jCdWDGGPLn__>v-u*)fe@(H{VGUZ>wW|h
zx~q?JGKI3kNA(rE3LRk=dZH<GfV<G|YM~pX-u#oa(2Edgp@W=4?*L|K6^dfph{jke
zwp!^_+vP}$POwpIj3m@lMk=r|Ktby6`Kv9G>G9>?HX^x()dP_%6o3&)o>KRbkmbL5
zo`~cV1WMia!HL}Up<JH>7nF<I<WjE1;?B{#2y$r}lbm>kM?O7>`Fr|z@a*nD0MG7z
z1W8KQ9)1Qu7!H0H1apzNqklxf>&Gv7rw8leEA!k%OlJ{0iU;GC*!#8ej_wcNu<1mY
zR$YHZ+R;D}9~IAtCnoIM%=G&<v&4OyTXD6wdPA)Dq0M3-Vl@keYg>fQ%=J%^o{gkd
zx0J{7`)l!$j%bVw!Ve|8S_*c|!zYS-6!`}*e({N2QB&i;8f7Z#eF&Wu)gk~>QD<pI
zRZ9)|KRR0~>Kk+IifTLIP?`CN>IG(cj^8?0aSv16KT_PsIJm2T8$&^In`~S@2Z@Pe
zRv<ttvT6_aAVkXH#O=*uodrI@6+!PB3BHi(!w!XLX%}9k-OJG>26#o0UdUq`$}m$0
z`^Pm_aS?O04_vhgT#;41k;YH3Cn6px-D|&#x^9mJJ#{OeEG2EEYc4v!wGh~`t>WY0
zgX+&iCHBP!{Dp%fy7EvSrj5#jOHKX)_lFbi^F*vNI@zjUW*o5%vVB^6;*NL)&_S-m
zadIRxT#Dp){0ko+%nYBRk00^zrOfbnef*e@f6feB`uG_h;n`2=2Bo0_3Dyjr(#EF=
zJ*Q6T<;~zJe`E0Fp7A;sITBAj-_rZ9^Zsjk{|(+BuJ=db9>+w*f&LqzWAx_8&{y^5
z>!D$Kb5v&d1|$U0SPRCx_&kCZ4_N5M15evr+d`19am3mdKKl5r1`doa`~XE=sImR*
zSox9zW4B<zu4k$pJIT(Qt$D4Ph&_JmPaps|M=Q%2_}|6w7tYaLbL{r;=(o_Aq+*~|
z?KsZ??{NWj@|)X}k<6K@$`-T5w;c{eDIfq}{LdfSN&#C81RPEC%fD97N$pa>IQ5(r
zi&MN=p*S9x75RD3H#HXEG_f1BE?7WMo^DS~ye0vEi455;_mdy#y#SkJ%-L_9)ZhO=
zP|Mmhb#vfDz2P`AfJ2$nEAZtQFRC|n{MMIL&c{Nskn^RpM9vpO+|oqi(~on>`Fu!W
zLl6TE%oYu>-}QOzSc*9Fm=d3_Xl~KjMUj0)<wbL5#73Qex#cSl#>O(7Jw5W*>5*4w
zjCr3%IN0_-hsEbwFfHLfg{+)6GLKnLA^2uQK9~{tYY8yy8~$dn>Dhk4Nj;4pz=#bx
z=e(kGi_R-LzvzNzH!K`yr~mj_P)mGBf!mZ{Kej~tMm6|GE$~&=R8?S$1%BW8H~j<|
z@mbSrYwH$NH(YF0&n_*RHOE?5S8ts;dzLk-!Rq^m$nOmCmDVk&s<CEPEUB_4GyM?X
z?5g_e3V<4y*pSoaT4z_)H&oZv+7Kyv%D?I7BdMkU->9*<xecIX0SO6Nm32#3S~I2=
z`GVC87F5+*74=mW_I*S3rB#Xa*0iZZe8ncY)ex$v4<#O}Y8UwCRMam5Mj*5JIJdq!
zRAnu#uM1UGhD>@djHzZ-HB{9vt6E^OFslJc>*{?$)MV(Qs)~@cu%=>>>oHWlq^e%>
zge<*3bK$}U6k1)oplXG0TG{k7t%Z%Xl_82!VUXn5gZufWR#aZxxKxNYx66fxg%#B`
zb|l2JzzP%>TW+8VV^&pV-Lk6sm4d)|aG`KuUL+1!(ez0#G%m-w9M@b+7_zGdbty{7
zDm8Soen*Y6hCx(@CI?am(N>Fm2!cA|GI~@^%>vZ#7^)v{S8Fgt)X+EN-=v3AeA(kH
zoXk)iN^Ug197GhO0oPJdLXA$d^5r7Jt*3TQU!IAmcN9o;$MWSP!id36ETPYj2uB{S
zDBlEwYO$ksqFa{bo9HUUXq;yB6(FXhx}oBtnkv+YmB{LwgqT3BMAWHrBA!2A4%jCz
zUa-V~|I)^qQ1#f0R0kykvw(k%sJClUqI@~vpST>AH#v|60!TC<8;sCb1_3v)k=3w8
zE_Eq_&m-cB8Y<{Y>)2y0A6s*EgH>A>vhvTcDr%}1)h?;34N2Tg0IO>28W%0L8kSa6
zRta!vMPoyiZ-}R?$yRb39-Tcl*Y6*L2pRw*+62%gC27Uh=$!GnOzjbpM0sNzDS6^N
zf}-w^&Q^4)-#34|P;MUlmWJ<{u>bM;e3}W@o3JG*Ts}(Eb((PS3HrPyDa<qFY%=Kz
zN`3jIz8w7J7M$Umkbj0RFZT>z&V)03c*GOH<5pOVksvQuf}9BwXq3ie3#6o~Ayi+t
z(sx#4b>+oYpdNMYE1z97w&*mg=(O3hr(6E)+-zS-U5Vw-&CMQ{n>)6Y@#veDt+Zwq
zojv<Zt8A=4H*eC|+zGy!h$yY7ZA3?vlZVPuO!Z4vT6qQ8V{<0?W=@}7c4q19@-nM<
zam7-r;6$inWoVpLFxH=)<IX;5Y)-Ck`mE{Gteor#zLKhC)s<Dg>Z00;nw6Krm}{3%
zrriYeu(A<0ccme}vVP^#P@PpJyqsOSyrRC!H#;DvzpgRln+DAhKCR-~kmxYgby;<V
z6)Y=~UT+R$0^O^@UbxiXuD=xtuwPQt0`vSvAMq6?{{24Uu{&LUANLWDr84>T|2%#9
zSm~2rW*_m`jV-^g_7NX4@yGTNzsSUo?<2m!#Gl$nyn0#i&H9MPo`n7WvQ6y2$xY)T
zi~LgkH27Nw{vi?kwAm|bLlrB~|20_WjICQLJ><A?<IY2VL{=<WT2m#FV;5NC7gQ}9
z->~2!L7g_TcG;4u?AjdUJX0`D_E{D(PPUK}>hI8`bR(_;aZa1CMrTj9`<9%^rZ35z
zEdApc%ST+xkzPFu+rdhc2WgSC5=pfkEvm0ry12Sho0G)RCxy?YO-@=F!Sc%%Zim>9
zIo`)y?_-|#G2i>>_dZVWK2G#L7I+^gIgeu(fmk}2rDqrpD(f226M@394Z?@|o~HSe
z2}ac;ivDj1mVhwxqvR30%-~epVlA7!ba7REm9@AIiPhD&GiWFkCbyF<NGPu~aH5qr
zJ&<>z3=w9)<Hd97wA`^}5{@miPO$P|vE2C}O5|e%GFqc&&zd#HTZrq)J$x|5LP6=e
zJ7b6hc=V`-F@42Jsv$ntNF$MNh;Q!PnbvqKP(FP^z8g%rxqp+b`GMI~>J<3QGXXw0
zH~YY;d{Y}6=B!+rXeQ7Bb#Xxq#vm1NHrPj)A7aPlE`<9kv5+)6fd;TMvm#Wzj7X4x
zPVIQxsg-y;cOu?EhR|232`x?}Fa-cG#8(!uidSN&X~!l=8{#WEd)heDA4#-3Zcf#b
zrD$NGMrap*?zpnL<y9C@&a{GcjrFitY2!?(?l|y~Um)1@VpmTpT&f3sqAM|r(b`Of
zOY)h;XQfS^3YX+_W=$`3r?;`E!X>%W(VIMW@>IBDpIuekfI+wYvy;zBflKmY^&8YT
zKps1JDqOMGSJXBvL>-tPgv>@Zy*5-;zmSft{tS3_sG@d3MZKeu28{U;<I^P2P{5;&
zDIdcjxDL6*8uXc74ZbURDqc_xlj3omP^fa5D9;qrS30|#H1UF;lOD6`E^4&xCeT+k
zSddCG7^!_{IkL88#l%C>z(wLRY?)|5lsedhHC-_(J9i#(sM#$Fh3cy>YJ}DHon2AW
zSmm2lgh>*)v!<6|=$n(>U|}vJkJp?WTpP@26-yb!be<&vZx805$#ZgHCeBM>GIqcr
z#je-XPzi(5Ko@edX>2h1#?aaY0ChtSZ2Ar^g{jzCoQpWYQZ+~=3J^^=yXulgjM+Hp
zBw4H}P{UE926NosIA(}%7WBDpiHRegq<B|;Eh{PB<WJC%6z|F}<@;uHu4k}SR#jgK
zx+)e`4YrEemqTEK4QVzzLL#*y!Go6Lq1t{hQL2lad1Hk*J|M7g){3y~+y#@J3(#wh
zl!#Gzkkc^V5RERWtJN{CKAwhYAsO=4Uj)K07}YTDqUu`Tay-;57`$RIwT=b3F3<=>
z$-f6K$%bG84YLV?8^akU8{#X+?3fo)v}{qDbbzKNC1h$%UFF3Nx*-roLj|YXjy;w_
z#VzH-xh#c<!k}K3R5!?UB&GzbCH0W`b&Z@Hl$n5<x<!ist!S|7>*_+|hWJihykK(0
z<mHo>O|F_;8JgTMc~QMjZLQbmTwqHuU8GF~=39$rmriFjIX2c-heHbK)#nsU%ALqy
zYHk67NjW+BJ~)vVRB=doK_&c0r&xmFpI=a2yRdHb7;EM<(|mm0rxl7^jtgpd%QOvN
zF!0yRvmJkb(z6Z!SHoW!ypQ#P{|W;yF=0*hMRg7J<Lu!i>|(=t_#ZuH^0!98&Q;ad
zqeo?1JrPO(`(z7XG3-H2mCskTqN)<Ep773#G~R&ZnpF|1^37RX&&i*qjUhH=%!x0l
zsKwZR_R{KFt9+?72a~nTQv(%5@&y+9cFgXYrarr>ijx#1L6FHavsg=AxWqLYduA;>
za=J!pC8U5^RUu5ZDxjpEj-I+v>L;0mvr8;9vtZF0_)05QR4>82`&1ZCX&DBAHfYI&
zS&tRtj6F~Q+SWKstS-O=CHg}2;nMybTG%LDxU3mf3q!v0+Nu>x!7jK~vS!rbbXld!
z<qE23iyQ0fIj2^J3GwRMMIJd-*)t?=;aQjynTbl$8u7#|tcN9+IJJf7!|bVece>P^
zK1bB*g(|HM&@I+Ebs=;m$ugXQI<8NJCiqURpQJ2Gl*rQfBzmv4qe5mCj`NQHSU+CK
zw7NP^{bGS?C29`!PHU*ufay?myK9Zx?K`ceqG2(e3oTE}F0aLeG$(lt_0mmwb2?h(
z(js3GRsztmLBnBZOvOVLVGft5#i<lb8Z9Qs4N&3Fs#;oCPZcV!t*nEJVA56-B|1*4
z4h9`Fxm8wu)sl+pTBwgtt49Vo)PYb{tsBHf>~jQ9+C4Nvn4V{yud`-UFJ!}JK`t5k
zY>rN22ckqPM=pR<mdWWQzyL*A6J!~v;PO=$SJeRf;wn^KNkyo_LR+dzQdf6_TPpQh
zL&Z~Z&BeSvj7%-6qok@PRN*5x7Fr#QhI*h1k(Mh?KOA|>UYU|OE(qv^3wld7G0qSq
zV(KAOcZ92nL-!J5^A%lGOEXzxDUp>jlvFBbRKU@eSqdy^U@gEJy`*7`ue7?BPB50o
zU|KC`sHQPBTHCnfA~d?Xg_5zs2*ur2%YyS!pR}@CJ+wHfRuF5E22V*ftR(b^R?@Az
ztTl)vVRNNFF#74@&@?U)WkP>v7He<Q;InO=OF~Y09+<JzZWw5A`jV<;w3sTn@{-ab
zt9Vv%GNWnupr~fgC|3Pa>zj~=i{G^A(zI!BIyhXg_W?_*75$iTZ|TNig;Vt4A~8X(
zxT#nUbJvhax=N}H^95DDMBOZ_sHyg#@f9zw##p1QqFSb86Dd)F;_g@1Y91-nS6&mU
zudrpMC8z+6AY6uHxf%{@bX7&=Vl&g&2&8Zq@^VY3j*%R$^lSiqCoV0TCu^pnf-b}B
zf&1Lm+n}z3lBed@-By%f$1GORK)bV8%NJuUn?#K#Cva7y%c>G%tVq!a8mZ(Sm{EK;
z%&v4dOb8l_rDqfYkvev{xULo}Ff}!(>`-F9C&3t3rQM1vRV^1)0C9wpJ2*BEPydF#
z#oOVD5qHr?rEGxrfr8m5SYqx*Csa;r&*xb0ME8R=b8C5BJ&eo(*nxnEtFKrU>2liE
z8ZcF38sjXC<7g~Bs%PRf3udg7yFqvLB+7$PH~pSeuv=pjH9(uh8W7#`xoRM-<zNj2
z#B^wSQKUYLfgl%-t*NfXIvSgfWw#xzEyYl@41J%_msp9${G_dNPB#pF9IZ`9nUx5s
zdk=W(N?Lo<Z`(Q4zNT0Xj_<7G4qSlAy?AOrZJF9lbkvs5B{2(qZbNmWt^~OVb_i>%
zhWWLPfh&P><c$^Ss4|JntkKl*F*@Fb?Q=XNYcy3G5wOtpv?y#|D|M>{_FSNzMmN+g
z3|TWu%5($97z;@;H8j1%A|s}mpH^SxbyJkS>BcA~JFbTMwC=0BXG4B>Urq<Y=k0oY
z+!!Lt0Ywyt4VEAQORANIlun#HH@FPG8a|AE#P-?Ca=zIxTegLFbt(<kX!MU(<>Kn4
za2)Vsx=J&)*k3vofbk_}7tJXe@319p&Mw%K&S4A1x?3rRC03)m-J&|h_!|7MP446g
zG)ixJzSJg>GcwjUU+#28wUvwE_Nco`y|vwNU!VaN3e^oOokW>7F)^iJI+<>4M#2C=
z6tl8!2?o2UEKeF~)9i2(KDXgoVwlrayJ@P%j7eamINmi+Qu(H!i_j>vGiSROLfIXd
zJL9a^B%F0kYnp$RX-SS*PwzDg!ce0BVyBRU?IP$EmQ>e{HkM(G<I1^`CL%$e_>k!%
zQOoRm(?()m91JmPoK>;pqH6kieNZ6Q+vg#~$&(<(@pnBq-SIAR(&X0xj3fEcvrvs=
z%vdD>6%9)Ti*>V`fLlL2R^RCi43ztq7GZJ)ZE4or8DJknYj|=noMU_hl+`up9xkz`
zm?KEaa2hy*s-}s>YGVT&0*rj@Na#8H>oYNngAwo|3;dZqW73afpM|x&I<y#7Fd>@?
zz~M-u@}0!R+9Dtq=t&CH0ib-RWCuu=ic3q>O8__K=fndymfz8UlL$0r+WrhHM$NBG
zDOsbXsn&>LM@5ZsOG)Hli$F$|YADcDIH-Z2AoE?E=IFaBT=@i*IAYqLRm$)_Ve$1j
zrDqaO)i|kpBY5CRi@kD@&V&h91KkovgHx+&>XuuWg{x{<T!(Q$%FoDgj;k#PR#aA1
zEr97OMhVrG(5W=}O+I5zW>wWxqYLMXYe^M6H|9?NGx<uZ7F1VQ(`%sysE{*jYgWqa
zTlzeNntW&1f#GVn@}*Tv>d@~~^w^JS$Y2MbRI<tE=I@NEnq^Sc{r}SBGgj@O@_Fh3
zGa?84nevkJrIEZBmC5It?va6{H&L1=lTXyM99~a@)Wm3iPVU8hZ#4j()O=J;bY=(0
zYVrlSYeMSWG)!mZB@K-Px$|iwIJk@^pX2PKmv3xXDHG0pl%!yjPu;3w&b=In!Zi8d
zj+u4({g%Z@Qy%6JD=^_SdvRlELEZA&1D9#?X*&{s^1yjq<t63;BrjT`%+1S|rWtjZ
z-@_=i+ReHtZ*E0BClF1yEW7M52~}O&r_PvsjwxXWiy?{h8~e*>^10isS;x<zGie6V
z^(p1{oi7(Aa|Jp{PTV!fRsnbBzVl)KjZXU(2eYl>K(;%VQ-5jb%(wGNcUK%-;mO>0
zdH((COyBt?{FC`6{*(FK+e%VV*mPpA6z4KaD{3*-E!%?KqRO%6a9@SXQ8~DLxqapn
zZ(Y2V)8N_9IZ*MIUEU$(%SFB0vy`gPvTJ9w_AHo@P2<@*aV}31&N+AcIQdl1Fj6%W
z+M+or^SwIRjVYhBv%VVZ8FM&uzeWDM93L*ZyyWqc@0(g&l!FU4<W4Qlor6mrF1bay
zzNvYP$mJ!QvDw*xWy>RDvy1Y00fJoK<>D^)G{oYP>&qolTyS?9^5zo#Y+}JB*Ec(t
zcf^bf9$C=rY~B$SF8O@S@s(zm<@jb612&6!ammF65xC%v2yl@*Bw@B$L^X@0%_1|i
z$jmI#GM@-=$;Cw;kqviwyyW}l6BRCikpf%*BdYn>4~<JsHZOd{K4n~x#E*T_xbP7&
z#YOHI0h!MC=M$FC$9#G8^KJqzen$A2*iYC5K2G4{1jbI}V}V>4JBfEBgB;B#NAt<i
zeBo#|2>Kq`Dk3d&=4NO6CKXsEdDf(SYif~&ZF<?+R$jIN`wjRsFBqw_ts*=11f*6h
z6Rk;pVmYnAgQb|sbNtrC2?QsS3!2;sDR944l4GTXgUGyGlindxN+r0+Q)+<3q=Jz;
z4U#|~;69K5oNpB*Q&N;Iq=9+)OE5aoLX<;z0v@o6auOseJW$Nq$boz(nA%9d{gyvR
z;3D4yJdbd2>ra9g6A$51eTnoFEkEiBf|v9nNEYk2a-akNCu-YJlW!II-MXQvfrQ{>
zBoGZgR+i^QGLh&B_NErGPs}wGI+O&MnqY5gzg3Vg;B2R+Nr@t{#g&AlC>cp!Ur4|_
zG*o5fAc0JvvOtn5!W@AMg$dD0)#cdiC*Vq>jYrVuf^=ybNj2nwyP6E)d2AX<HLY+o
zvD|=1V+hx#1h|V#z_Gg%EfGzuU{az<0?uTjVM%b{L80EtR`hI40k_5wER{{L6yq?f
zZ7e|f+eU_|Cy`8~F7Tu#iTPGONc6i?GZDa3ts<e^#$5!k-zrW9lOI9iP3?e{O&bYu
z1Bopa8>}izVR<XVU@1x>g;*d%wE0xoLgp!O!zj>r7<H=1jRy3lRRM*gF1*c@;50R7
zQl}`4Ca3N7DvUvsT+;-nscC~9MxexPG5}5|b~o5nNea$Y1xVDi8|+Q3Mu1wBP%fl)
zw8$k~1?Q&dzZ;$;bkr$n@u*jV7LNu1jMV5yCrq^h3CfE~(l>U(VW6dPxojiB>8!dY
zS2LZT;FMt7sH@_L@@i_@W51P>x-T%yG*Ux}jUS-6k$O^*yPXp(y(7VCQkQsA=fe<b
z^Y?U`1gGg@0WL=Bblo>HpyF&KYG2{NpnnB^?RVWiMqV+S#H2iHV!&aD{*H9u1WS_^
zVF8?1#6k)7x)KwqRRrfIAxQ@Y24;sy67>VzNXqPefT1X!)DSmG^P~=BTl^FIivHfi
zCJ0vw(SgCGFb)~GclfcvvJ3;c`Q!#E^(M!U8-4c!>omTyih3;hV93n}`?Kf#;5nXi
z^5u$=0PZm;z!mN!uGzd!;-z40QSofvOyp$(FMeJmXP&P(R9|C_!cJMd3NszGnKz-R
zI0cwLVcwjyK<n(BH1NR8v_NZmabU)bzOvY{x#{!HnL0OpL{Zs{z`T?we?c0G{RJuM
z;JJGxaORv~V3rGZdg+7-6TQz6bRy3Lj4#|zaDB2TTHZVppga?@CwbBd#48Jv%oc=O
zvRKZpx29pqv(|-VcG1j|)6Se#9B{!VWGewP8}R}|^$H79;GS45HhpYxwso3YA^4o{
z%FSoD1o`Y{3eV+9&-2_&;82A?>Gatyj0R$rVbf(FV3md|vV<>?yUA2QO1im=s~c)C
zTSVMeiCYTZ7`N_}o>7pS<98LNfE3&YJil~~yRG1zwbG)p9FFJ`8j%2|!D7<8HONVy
zo01-H*J7aPu7T+@@uG#iOW`Up0ZhSAUVCwE-E!ZZIHRf^|2_E6!iiIU{C^MsYw&+J
z{-4ADhxq?5oRw98|MT#F1^(~D|BLwl3;w@~W6(~*|AqJu<NpEt{~G_F;QvS*>UIkL
zEAiiq|A+Da3jROC|4}%+t_c4N@gK$iCj7sO|IhJ%49=M>!GAUWufhK>@V^`XpX2|i
z?0@Vl#bCR_erLpNc~08z%<av5F;h2rFTfUW*=lm^u|s@0m?QCVufC5GIy*26^<>}S
z<z)k#gg3IYCuZkif+#0vLN?yP#}}S)$@QIq($B#7UMd(DOpWBid`Oj)0$z$KgOW26
zIP-iZFn1h~1J1XiQFWy`n1INg#4sDGR)U*}*#H&!^o7Fz+uoPJS5cjBPZkjnBLcFy
zG%6@6gzSV0dIMpVO$Y*RLzbHbl6%9wH!N<Y6}O5?Ep9DZL~*Ni#kv$VDq38MsMPvz
zv4*OMii&GNA@e=&Iq!QjGvsC_{p#2H|L*)4o;%NZ=ACoiv!7WqWM*ErF*$cwP7ZO?
zatiZv3r@>42IBn!*FSo3Afg{<&BB6|N|<`ZpzZ%iPHAszZ!>_G)!fgMPi??6E(7Cl
z6LdB3exrexAF)q2a)8)#vG_H1IQ4sDN=D}s;+Rm^^9h-w#}>~hH6{!hJ$6XxkO@<!
z8k2H{q2Xd5%$jDjzJ3I5Og>(hA4ZyCxkWP_53tauI5O*M>+#Im(MR*$^JD4BD1Dz#
z-KE1l{;%F^vFhJ%u@2teVqJ=TFZQ8$LaActz{;U`03L64WOg;`!&$*l1wm|a%ozD~
zi!~1W>DbT09>gBTz6ATl*ssEV1NK|6uf<;fRg1L<`%kf7iTyh4zrlVt_J^@QiT#h*
zU&DSc^bccy0{b)AH)4Mk`<vL`#{M4mkFkG&eGl}s{|)>5*gxar!#PZ$?RVNYEf(!}
z^6ow+UN}KJXTss8VNwpzo38kY+{OPiL@Aj%Ik#l;BxdN%Rtm<Ou(>7E_!s?9o2y>x
zmPcNVrs~LB+q!ystw*UU=#gNv^?rezCrA~(ik{gp8}O<J-R{vL`n>wE=mbe0Z$r$5
z^^3|Pe8$qJ4P)adt=m;B`f$|5!(ok!<qZp0eDw`odA~wMS=VHgVzs&S>QSttkJeAh
zs`oO~IYXmM@O`7`(1B5de$vb5wG}}=(9d@aj3Qj~P(s+IeI1{H>fIld>Q+a);&B>o
zqu_DASU8+Xca`HYa-2DopI#vk%s270VXzY4YAHZ<G@L<;YAa(k#?bn*#dc}yu@0X$
zdIH`=s?5sHT#U;M&2$`da@_3=Wf$)7*O?7vu^M}8PK`XB<4PBQk_7j>=^hc{k2~7>
zJs>){mY#alKEZiE#y|Cv3~n+=$*c?qqoL#RDWk>)dPIP}F+tAhO4o7d@ia%KYJOsP
zlO{8Sd)j#1qO7tK_vy*)IO76i;92JmK4-AbDpx#9F*=cJ;x-3f*~T$_fQ2uNo8aY3
zGGmBX{8L91@1fDga+D9;vM}+0V<kSLWMiaoP!|`i$4hXkA%l--TNtH>MTP{`+x0`E
zct;1fbB0DMqP10vq`0B@4OJ%&#d9c)!RV;QDtck|6g2qgYfzl<{^o4u3NXmYb244s
zf%cRA{Uev4tAWQE@hG4f#WVgYUVJRsiSU@YsKFktj^p7}AdpZcFe&=Vihi$YzADu4
z44y7=6dcwN5U&OZc-B+B4{QsQaI)VREmt}Tu263q>!L)Qvv7$@+m|$|7hhY0)GxZe
zBb=|I;-yNFSyv9%xR1#%x|HegwvKU&PJeI3c1`6^deFo~heu!O;xOW?@bxX+y;2M{
z_{HPKn6qlfDwk4t1zv?Rqj*RLTVxSj5{#IYoN)l8!(70Pr_#`WHoInJeVID0#hYd(
zJw$A(hluI@6~)i1uQjV1YQyHR_~|O$Gz%@OP{m+B7m{CcbMp&>p~T@Tf2k1J&ZhGy
z?k3)A#2cLPjrgiOvnt<I&k35kv5g0-_|RA35cN=Xti~)~Vpi1S<1xw}mqSw1u`b$p
z-;j@~9K{PRn<Slz9|hJ{s`J#bs(4&};1}JeLEzfxeBEoAe1=nyDE$0h_l?_j-mX)%
zdQQMF)}gQ4IBLPju7A0$;S=!G|Lwoo796PU9$2YHiw0gh)J=@Mc<5^1ri9fu;-nc(
z*bj}C?>scBsR^E+#yDddhKMCYOU@`cK{eK@t--}{<^0N_7{TiQj57+e^0F|xl%ad;
z&^y;qZXXy8<+Khe4ddbKEo=A<dVkaQTeyD*{si`ECtHMP-DFwYc)!T@TeyD*9{(%L
zqMd9J+H;Z0gRT79gVgVdWudXb^2ue9;)clNvLzE6LlYb8iW{qE1RJJS#HNH7mf#%&
zwPj*Vw3Nz8NvjbmM|g+yPk*AYDfGK0YF1!LNrp@A{@FQR!YI&HZl;eZE-_0`2JmL^
zep<5c($AVcp>#}pC%E)s%wJ5zQTLuymCaaVh=xM(c_Lk9zw3}2@m@IrzdGE$UNyVY
z0@=qcDnC&5<^9`)5z^7X7ccQ5T$?f00!Lav;g~KF9}Kr~?1&p#NjW_2<eCEv<6it;
z|H?jV9e&s08_Uap<*)6twgNW+_X4lNr&9-XGK`Df-e;8n&%@Va>wsO}-)F4^z6x9i
z9D%RzZUIijr*qQ}G>p%_#(6*!pTjKy9<dwe0e`V)pS2tqFj}m2z)!ohSX+TrU0ba5
z&iLDIzyZJu`?Oe-fYbW6SarbO{aUQ$z}ff&>Ak=k@b^r%0K4O_!F&ar1MJnsFs{cR
zLdyrfgufJ63M|K8<%<Eo1+D~Mi$52*4tPBN*69}DNyRuHcp<PC%IB-VeBjaed~PZ5
zIbaO<4R9rJFutU_4p<J{0!%N#`M_boUie7vJYYWXW?(7sGhhrjbrQ}8E<OY21K&6k
z=>~pyHqwnhWRzjHSc8F=l;J$!^OY^u1;C4{u|@;zHV<ntz;EhsJqizFjpSg%_-Fyv
zP=LoTfuDenoR8}O-}p(3wI0~%63j1w-L7b{x@8!~zH1Rb;Q6<-SZ4#jUEN|W11`7?
zeg$s41L*=T{w?Osz}N0aejH*L=d44106)ZEqKN?;pKP&K0b@_MSQ~&hJ=0?C1m6D~
z{D5yvZ+X7O8Uft%#}=y+IP@jtAMlGmA^pJ4n~{FtQLiKYhZ;uy7Nj3I=S`#^*z{MV
zAGl{Lt^+*mZKMZyT{F@Hd=Qx4!!S<$2hIb|1Wp3Jj(L9_@L|mPmjiG30_g&tjd}Dd
zz*^u=;2L1Jo`%r_^W%Krx_{!jz@zpceZX6QD}iGyTo;&USk`;Mp6U1#KD`X%ufTlZ
z-3MA$De&)IE$aecPB+V11$+v)9(e1)mbDf5e1>K11!i}*tO17^#(h04YZ7ovKg)^%
z>yN;Bz`q}9SsQ?>j<Kwrz@`C~)vLE*EE<H5Oam)V!l#gdPY$uH<-l8pTGl$?h8$c6
z_<W&drS~z6g5j1m82IhUh#xQwe<$Gr;FMy^x*d4;Xv=y9`1)AO`U<!Qe_QH^zDWOR
z_y#=i+DVpG2W-UODq0ELjz9mn9(dnO_yPFZZ1@46t$xXbAAmnCx2&^)f2hQVwt@Fm
zS=PP4H)||w3$V+4TnE@2*bASyz5tjH{0M)Hs1(>G1U~@NBe)(R{>te(V9!NJ7w~ZW
z?WDcHLBJypM}A%ge*pVlj_U#ouEuqNKVO0L0r#LU-T?d`^pWoYr=XwghEHhM0S5z*
zS_S_DkGlow1TF$DCtQtq1FyLa@doZ(i|Yb++=+ZU66N$R_y@QYSP8rixD0svJ-9Bg
z+r79h@B(1BqYMLCuC|o(rW+}XyQdu9?ZD0}QV#4+Jj@!+FYU8V)Drc7+j_$oz<T44
z`>fSzILPQeHly#vLk?Qhd8u(~|C3M58*mI6Ae+=-U-UBCTOx`xx?h?)`ruBf)wr^@
zLxaqh5dJjUt$6sDi__8`>8dnz8rfNnz3k0>*5^dT?d*)(xfgWqU(ipa+rlR<PrEoh
z?UQu2MDgB&y%YM8Yf^1Gy51$Jj_d73aQ)x+SuX%vulJ17P<)O^L3wy*pH+{3CLW$v
z(}@IwL5)E8T=Yj7_V`S`Chh9<s}5M+>EZ*^_NF<mR|owmAMUf(qMvKExB37Qsq`cK
zxli|54Zzm$`6(1m>ADwuPxN<B;&(h8=}LV#ei>zF3v_ou*XXd*5V!Lc_<i`;`2F^D
zjfa2MsHBl~o&WIPGW4VOp}&e>k94<oiC>W7RRUet)D~+oohbQ6@e0LdDqeNaoe3R^
zX{&CI){vd$2%nAcJ>6{KbiJM3;)cji>!3T~kQVC={ElBQb(7Li_!fk3MR=lo{R-hf
z>)v9G!Z;v)e%i<b$pFQp7s~tX7!RC^b~_$U@yPArh{p)%{(yTNOCXEuQe*LW&|lH*
zbz+M(!4X~(55EB6BN0B*?%%W`<y=a~DukbjaYnu)ABU=Zr113!59PO5H#+S9GH!n>
z!nd~*z8B%=79>9Zh;+242*1u@e?{E>2!x+jh<?!?zf>z8em25~4r{TdJI<dR55EB6
zW$lEoLijJ+315%!=MlcfVgKg1{jCTeSJYzV*~7U^lK=K1{7i%w+QS#9(^Yvr0`;_^
zo$wI|zZBt#u75VdI}cBM{R<F&cst>%5T4ae_<DpFBRr9Rw<0`>@VSn1ewHfdD*Xt5
z7~@iWzN@wTrVUVy@&HgrpnX_B5%(wHr+E3McJy><ZFM_A<Mhv_;GP}ol|$F9wY?>K
zG>(6JT8lN%tvlSQqjCOUr{jKyTUYPYt%vS}nJrcT<=AoE!q#?|uKONz#j{(i$KCes
zciQU)KfR7|^3`tLGN&#dx}tMhtdHEfW~c6K=)T1``&GB@d8cj}bhnm!`{iEfZoxQx
zB+!xGJe8#&b$)C?_`~zP)3F!2ej&8S?)>fL%wL)x9TGt~MtN~u_XO2-#ji{Ar~Zpt
ztWI`&)Nbx^=0^;=-RI#xuf5%)a`l0;Us(m+Gs{}6i!g6-TsL-*uB4pa4bb&jf&0sD
zKQ}u4yc4?6wch2b7vlBg$`)&uyIf6nreg$jJ8!@}W_x-m9d|hWR|#EgRf{#pt()r9
zEr)I`=10rjx}Q09G@tCU)?2p~y864lb?K=8ul){xvBlnwQ#!s@T}?cH2Saxk=4W2@
zw-may4|=x;7eM#RhrR9H4&91JymhZYch#e4&)wx<u(KS{{Q1|9w^+})^Y?LQ{vLsH
zSBQD1SG!gM-2lu>y>xZZ^}xK<OGoo|1M^xhKd*;w--Z^e+FoA9sqyexQevo`e-FA5
zFSc02?S4tiS5BdDS`V1{GUoS`(=vXWrK{KgPy-NtI>MK_{k5>wUv%yy=<eQ>*iIe7
z*CPCCcR5?uTF%JMO6U&4d>zxv*7%&>+Aps|cnZQVw8tlHv5E|xzXjpvzR_ZBv!9>3
zRT-dgTF>~=7R>9(&ywD>cT}T7;k~ea@$Ne<*7NpwrZvUKUHJ&Vd>iif+wG5UjbAAO
z8WBF+9<GOlYJ3?(_|*t^jPt3!RXP2z3c5G{f$@bS9yiD1LF+BE-)phvIl_bS@T~}6
zgY}7}_IRY8uOdqMx)<T8Shu*--mX)7{VQj?J^<@7Km8cb?AYx<m%2@-nP{>%3A%AR
zTdZb#zL32)TFVLPV$fNi;duo*QT$K#o@lj4`LGJQTXwnn&$O3Rxg|U65kC1#JYVF#
z-k{d&k)8LTI}__JGaP=J68BR&){(CIC!V>0HXfhU%T;9Pd|HqC7UAzY!v7u*FG2W|
zyRmNNu>T`vpW<1G@Mre4So7`S<d<`mgsdw6Er%}sJM?$%^ekvi57}D>-I*;d)^Qlu
z#N$i$`Z?!sTcMkcb)%c?^`6SvHO}@h9qVE*cCxGm?)X(Y<2M+(9-Z-rp3_~|eNb8(
zosLrI?&^m13;T5`etn$Ry#Tt~u}<}<JH7Wf(|bE~c|9!a6SqCrc<UADcK5QZId0t~
z=XJk=?u0(LpJ7k0UPpLcQcQk60_%SN=xbTWx$X6H+AD#sxj(v3cRl*b>6bd_9{-VL
zHMs3nIPI;3E(Pmx&%1SxId!x?c?;I-=x@I|%E4Yqh0YIJzx>H@mUWuj&!;&3+>O>L
zPryATx4kLO>*hoE=aVe!1h>5-oc7L!?#(RRGjiMO@3gm!>}6Zd{*KB^U#E`NRbS7=
zx}81WNLTGl?-uBe%D1d{-SK<V8Na>I{m(Fzdv|%RbmrRttiv8N!m>8P&2c}Y9;H6j
z+Fnt4nFQUl&>ic(Zg1yxX}$N!Q!Q(cyZ-KU*56goU5)k9NA3Qj`ujVlUp7E@<OIw5
zv0X=g8RFFKgl_0*mi49Ge`N1Nr~i6kQSjSImNm$2&o)n^c5wvhrdU><U6+=nE=u8N
zBmCggt%UvL1#~{vd#j+0`!%&J-mb1fcmU^z?D0*jRgoq8>k)qSbj$jYBfNh+d@I7Q
znqgVr+4Cdq8<iP!{$7OF%)<RlNBDOt{;K|CJ$(F`_@jFE^pU>~X!R@EDS>Y2*_PGW
z5s$QZJSq|1=bXfTScdR)gy*BZj{6~P=pp0?vVS|m`_^GS9KYk?sgEi@Q9L&wd>z7%
zbeE^@t>uaA(E9$}Snr-`Pfyykcz$)mfa~uu%L?1)mud6j>ji@mKI8(+YIdaaZz`Rt
z{3HC63oWbB9#5(#^IPi)#UlpYk1w*?TnD7^l?X3F_(P8C{4VZKy8rOfPvCDyI@03l
z*n;qferj2#+vAZsDPFF=LioD~SAY6X#vf_l#naIX_a~ma*s}WC%LUb^gPiqv1auEy
zYFX#l<3T#@Qo6e8*DImhaXHrY?dc)iXX=tlN9kS;-TI&7J^?Wjuhenzc;8EQ+6kxo
zE4{9?EM#-*`O~!TRsJKq3&I`cIjw8lZ{2X8W%qK+s<6kC2Pq{mIT+!At1T-?_D5xO
zzb185M&GN`#$;q(l|CwC(DDPuXJlX6X?#Y}#RpE#2t+c9iZil{GX{;y$b=61Q5l`p
z{fQXt)W8n8Ex9E<kn}*(14$1gJ&^Q3(gR5kBt7u&^gvVZfHJq5QEbx?mo_)f)3kvl
zVzu?{5m1PwQnjUjQLGS;7U?Zit`Lv>s13K6)P_fg)Yh59Y5Yx_gny0Kz3BMH)Bu4&
zOGmUdcMd3|sT^$^Qv(DBZds_Ung`9abWIzE(rQy<e*R5BQx~;0==jN4dp2JPQ(v{w
zRF5`H4b;}uEuc{NxqK|~o~uGJk6@JR<L;44&*p;yD#YSrx$Z7L9?#)?`u7ff+5hef
zox%B9#ki31QpW2U?_m5r;|q*$GHz%5hOtx6fVxy~#^V?Z8OJi7!C1w(knvK+>lyE0
z{5|6fjBhe-XZ(h-Q!l<g<8h3IjAI$kV60+X$apE^^^A8g{+{s##y1(aGk(L^=`g-N
z<8h3IjAI$kV60+X$apE^^^A8g{+{s##y1(2v)lQvdAF{w?=o&@{E+ce#xEG%rrhD*
zu<l#NeF@Hs+u^_8+nMnY#@>uaG9Jr#0;8Nil#hooj%J+6SiyJ!<5i3|GyZ|`Wk#_Z
z#}p%#+Q8;3;!N8=Qc}858{n-=?dH#3YBy>dyzQkN;?rJtinzDE)I)vhusZC^UQg;o
zd|Vf+ufBAuY4%~Sw@-V1b*jtqaos*XudBKSANKnB^j|+(uk&F~b;X`KN(46QSE);+
zGDh2qE~E611pkX(`nA<Q_0k_d>QgV{fek+O(qF&rQ!oAbCqDJk-=}r;=N}ob^!2Hi
z@zx1G^>=dq6#LZQ!}{qSdh!eT@^`GC=b@)@8s(Mf&-c(v`MIC%FZZcm$NJlS>YG^q
z2M;~Po%Uy0{}&Iv#Q%BL@9?Srko5;1<gfgE#QI}=>UXjJ6rcLfSwF$2{tMQh?V)E`
z9K>Hze?lJTi(cx(#U6SoulMj3Z}iZUeTs|d@AJ@$eJS7HSAA&W_;2ut56j{p^-uiu
zs>k{6^l$UflYMFr#9yC#=*eGp|L*nBQ+#MHC-yscYrlSAUZpm_^_AjI@%aclZHIZ-
zPltxmEc)Yp>OUsq*oJ%PDL&*Q(Vym_m;9CbWBSzlEe}$@#s6OQNBr-%KDhN>{e$TJ
z=CA1AC+A}ed-#X)m)d*rzu)pNdcWmg^nS~~=ofp$pW;qsVkdUmmU-yi<>w}!`i_(z
ziql#Z8+z`k{rXGgjr4c2e!YiY;{RLLZ}zFbm-X*@=%xHfdH%{nPjRRH4{YB!xc&5s
zeZS>d?C)Uv{XFdd(95%w2N{nH^GL7gWjr#`Loelr{7T!IKK0VxeqZ(FHXR+qtG$)<
zu4R3tNBl)E^(*F~m-2Qu+h69P7k^5BvBIZb>hBt#da1vU_|!LX{JqBe9j%X|f1mAp
z^)KWf>f@z7f59XElwVZVME^GreOG7?vgtqf&`WvvzUr6w2T@Ynff?<$hf;pN@A@V6
zCD|WI&S;eUO7=%izsS+|U0>ung6{foq|f@}cYG%Hzwh?<K2FeJpYeZ?_2Yf&A7Q=U
z{^R$o_uGGLXZ;+H_|Q5g?H{myzK34?{~_xeed=ZY=~pl9`(-}u%lPS5552p+c*3XN
zZ+|KF#Xny20nv+p{^${(ANu%M%Fj+NKVI`amc>ENr*R%_$?>oDgZxi^q5W<qe(2-h
zH$3Wt)E~e7zv%teXDV<1KaGEr^{f5y{tvx=N%@!iRiFB-U!qSxq<#Om?H}Qxm-5!c
z?NzeAvm+S(Q{#6k=d^j<ua^9i`LEagFwx6+Ki8vtNPUy_AFunvV*f53eWS#~zUZaD
zob92f{Gk3o^j_;-w7x;U5xt-LbChPk^BXB29bI3N^<l5^siar*Uh5B%UePc1@Ta@I
z@Vb94>6Q7`au55Wm;3Fjed=XByvai^<);aGMw{1qos?%8uWa$KPi2jE(eLokQ(2>3
z^m{$@68{Z2hqmtB+i%}R|3@u126^bk|C?CvRUSnDD(k(<o9H*Q-cNa^Ja~=u0iW@I
zo%J<7^>46#g@<0s!w0N?&_hrDr(N_fdFZJ=(lum0{qKH0LhOHyYtXjcXME)OtZ#hk
zDGjuF^+ysP>0kUjKR~u`Ro3C#L)$O^Vt)<mkMXIO`y<&t^=sL_SNWIt+`)RU`X%~1
zS?^U}L@)Jyn$P%4d28^gm-U;~KJ{O6{9p8`|BCf*`PBcb<?}P2_Nk4g&F}MfQl2~a
z@K-)pE9-`l=~Lg)^54<&d^^YIG@tR2@_&v`y_Ek2KJ`-mFY&2w;`ra>Q~xaMAM~l0
z{&%BK{eMe+<YdM{+6$>a+kB>{qwV{@T7UfZ2dg<nKlJ+ZjZgne{W-9wzxGAyPhX$<
zyV##6_|)Ic`eL7YS)Z8eQ~v<lU+PmY^Nm}4>K|hJkNDKf{h-%;>g9gWM?Up3pGoQE
zFMpdj{)hY2OM92+Q!nk^M4$Q>I6gH#_0m3G=~KUh?XUHzm+{S0KJ_xb`HN3|vi;-?
zae?$N|F6a$$@bHk0pkB;`|0$H9EpFLm`Jvt;u($NpYOZ<l&g9@za{ZWwzuLjCyIZP
z?XA-<awPsqj#tGaP89zn$E!}i$dUNxhdN%BbO=g%lI^K@#EIgcWP9rLiyVo6{I;j=
z`-lJO=NTma$?>t|s1wCMO-v`p$8G!P`yL-B+h?cW<w(kBvV9hhI8prLw|y3Ua(&k6
zM>!JzB-dxfBTf|m{I{*o%JUANdaUO<Q?vi~X_EKHoF0<=PPV^JzsQmJC)xgrN1Q1B
zNv=0I{US%=pC9UagT#LiC#cI|?cdLobPLM)GXCx8^JmHDd&H9(#h=ONdz^leBk_;i
z?@m77(|&ywe|2F8cJ%qU<nujJ@-&J+lh5}!{US%=pXBpB;t?l`f0EDlIQ=3=;vc`y
z_sDv+obUDiawdfGO>R2Jt37nv_j*5RP#T^Q#x7f?$9Sp;+H9M?z(c<RhA$W6K(FuX
zxZ^+3!@gU8u7`d$;xNq?p9T+o4YYG@`pZ4^4baj#vfb^WzYzn`6*3sbNq_XvllF3(
zzS%=R9yS9K8Q>ldeGxR-HvPf9+wZU4{vXsqz1RB(VqcP+>(hQJr(uFmy%gzc4?T@b
zI%Ajd+{GSx`nD0Z5u*R4hyFll)3M9^>^7hJmvIhl5Bb!;qUFYV554&Reb#UG&{KNp
zS?(RI-{zrbSsW<+biVk@%fIgY@bWL^9ohHmU(x&Zujs!o|B8KiALO4N{-w0iF8#OH
z`-YvMrCs!1?;BEn(Jp$g_YK|o+qcgsoSk^1x<hG}@(}RQi+?14YkcY@e^>a_Oa5;3
z&`Wy%%t_qkp_lZEzHi_5{UhmplkK14p_lQ>`>dbsQ@?}tOMU9){^jjH^)h~X%0n;d
zO_qPo5EqDllI7p!7(Psv|MuIHWc%N~f24jT+yD0K*AKP*clW=4_UMoP)%N83@(<Nt
z8S_yNd95#qUe;Ta-v@S<Yw^!LOna?gi2k>%_xpXvds*-I`;JYlPkt|n9l;>&v(&HT
z_qW^j&swIF-`{rnN7g&!dA0xa^Tg7gG;uVO_1&3Y-*<g?UQMr!B>PvlS6Yw7H+M6Y
z{QhXGZ|Ik_FYhy*{QkbvKhoY&Iil@<`}j3kU)rB<ceK9Hy%X~3hg5j5dHuZ*DsQw#
z`!R{J{cr#K7IGiWZ~YRz%n!fxm=B9y)@M`twV%Io-|aT-e&b-D`n9Y-(x?7T)*tVo
zXIcDvojD$QNw3TgNBY#u{BVL#z0411`P4UYLdre#Qoo*M{o)Slf73zz`VQ*<$ESWX
z$A5PR^@IAiUp~b@Vt;%G^)){A?{oaU#sgH|Qn5>Wb(x2Ks$bM5ivDH~J+%weCW?NY
zhhFNh%(q|msh9gb?|JAE6~`v^E!loK+_K++jK6<q?U&TI|Caf;l(#1KaI!sh7B$H)
zX&;mAsnb9IZSAS#7xf{uee2Qwy7j#e_t#&F{gZs^r5~BlL48dJ^{YClf5fMr<`A^K
z+(CVF2ld7g?fYNm&oW;3dR|oYGG6!kd+oH|MroDtuGjOWbbpNEB6_dy-%ELu@5g)n
zeQLMf>+kVOdYcd@+PuEkF7}_*a>MKIsf*t4c#h&@pMU<R{~oXSXD6q(qko@?+B@2%
z-^}(Xui`IhFaF!wqtkuHU)rx)554%8d_<eq`j+@d+Lxss_TBnhJ@gWv@3Xz2wBDvt
zYjpVU!#?B@e_8*(lkGq2p_lYZd*pRL*WKQ|?$f@^@BiI@-&x|{#OeKaw_j3!UuOF|
zJkl%W?S0mJ&0od-hphK=f8f8VeU$Ph^Ifm+zlvVwyI$XamHd_Z`0sumL-NaSf5zDq
z2RUDe?nkyi9&zi(cTm5ygZjrhsNdB={h*^dmfpD?)Zf@a{pJqpJO8L-@eg!Rzqo_?
z2Rf+V(LsG?X2;SyyMy`_9n^2^px!vTWAQKQpuVAl`nx))Pqq)zQfhR!hspM#eg7oe
zhxYyRLvJ6NJJ_D|J*H#r;j|9wFYlnfse}669n@zZ+p+Z4bWp##gZj5RsP8_YWAPvF
zp_lPA%_C^@nm>zP#?xNwVWRiD9!Be16qkQ>e(UwVwZuo}w_fjC%lztYat=1H`IW@q
z?|fMFGQahDzFG8g|Jv*MW=U_8ioN&x9L)`B&h#wn&+{lhR1WAGqQBlle-N~k2GKv{
zp_l&seVjwvCJ(*D|6?sTyzb{p{6+6|KUd-}dawJrl3y~v^?Ki3^fJHodf#30H(7r<
z!(EW9zwP%IQvRhrChM=W07-rPzUr^6Ps#oHw>;W6s_)dsiT*1OJ;k5$SoA#xwqG6~
zb!=Iz&toiN9LYF}aUA0$#?u+kU_6U)E@O~!9%Gm>#<+y>BF2juFK4`p@mj_k7*{dg
z%6JFkZy6t8e1!1{#-|xKFuusRiSZ4_w;11M{0HL)j5`@WXZ(ioJ4WL;?f(N9yD}ca
z*o(0r<57&qG7e%K!kEiAjBx~GG2>Xq(-@~Q&SX53(PXS-tYr)_Mj00~UdZ?}#>*I&
zGya0{dd6Qfu4Y`zcn{<KjO!R5XMBqBImV5Qe`0){@h^;98MiTRXZ)CP7vtBA-!fW^
z>BsB*>B5-7IFNA!V=3c&#)}z$&G<0mON`qXcQYO`NMGkT#*vJrjCG957*{c_V|<12
zJ;uF^Jx|bfPh>1+oXr?!yp-`~#&wJ@Gya2d4`cTewcX<xPi36N7-qbb@fOD4Gj3ws
z&e+1(`y_2Qi*XF&*^E)fpEKUd_!#4>jN2LaG4>j)?ViLqn(<7=2;<KgZ)JR(@ioRB
zj22^`A=>Ux#<7g&Fvb|KWL(4eIOAr<4;Wh*duOp97{@T4%@}38l5q{=6O6Ah?qIYS
zdk@uihcK2fp2Zkpyn=Bx<D-nPGJe3=!gyG=wmX<{G~=0!3m7kF{0-yp88<P$&nTVF
zUOqk`N88U}l<+=$d<^4ISGec|Pv-Dq#&L|38D}ugVLX?ynz4>?0pmi(^BJZ8J`^|T
zdtmQ_eJE~TpM-rN_QP;I0+?u{{+agcQuY2D;5u~h_h4U*{XramLmhsCjpie?KMo!3
z&tcERAmK3VU9rE2<I`x+kYJ<u(;h`UX<veU1|D#of_*&p7>>`T2VN6w6gAqPfbLoB
z&tM;lL3b|i>v5bTlan@VWPm#u`_u5zChV_ZKLrUIgMAeCXK-9h2~4mZ3ZC{&xW*3b
z?_iIDSc1I~`)fE}K!OC@G2m%mfonXC{eJ9^f!Kt71NN0Teu@MMwqwCl@K7XT4))Wr
zuRLDwzXayt_&T6$AE(_pVcv>wZ$8y}uxaI=-<mpZ^ynXF4w_ls7>YG!7G&jTWe+KA
zR7W`%<rHRR=V#^Qo}dFVbF*^_vkS9_i>*YMhNne}QUm)1rx~e6X`6hS5o?oAH*Rc`
zKfu`7Cf~_u?i?`OTN+Bp_=DQwI~$wZ<hvMiyS1h7YBaUUA7u3H(U!iO5onV?*l0ei
zEq#Wut4;n8BmIkF!@Z>$-HpsP`9qCmV@A2<Mw-#X*fp^&zNcY?%G=QQGCH@(A7*rK
zlkaWxZIka~><+hOzpr65w8i%`nisUi_cxaIt7s#hhwsOs+T%I-&n<TVtplbQ`^Uc@
z_*5gq$m|_(oI;j~pX=hYm|yMUOTecX{f*TePl^X^Gq9%^`}^}e@MOQqW#>|*-#=g0
zf^REb53rr>Y^M&#v^|EM;&VI4N1D>7!MA1S1*L~KBHI7iIHv7w>?uY+Bf$J1#Tv#g
z=9e;G#Qa|7o0y-*d?z?01?6_`x4JwpWd|JsBtNtqA5h9`QuPV_nZN2p%~Skn%Vd7W
zNda|SPn`(16Pa(y38>=?PH+M9n+i0)7VR=^qnVGM98kv%IHqkP^Y4xbsN*Nq|AtY{
z{9&hR{(inLo!6E>sXrsXWk$6>cXPTZ-IU(QRBdN5+rLKXyBiH%Mk(eH=5J>GN31`J
z`TJPEl=afpQoq+$d^RdQ;<Hf4XBzwG&&)49k9i!^_7CQp&)0l2^Pe!^bfM-0san66
zd1I;O(dek{AcT`2jEgltm-!=^pL?n1<y)i$%&)#e^Q&=8+gRoU%QgQ1$7dGv#?_h^
z`$6XC{zCJ+__|AkzmD~skIR{F`nBfex;Kmd7R^gM?_+-Tt(p&Txq6oQ<~yAH8_Z|k
ztN8}jf5QCg2Q|N%`2!JORqq~k>W^T)X}y!r6aBNAmw1*izw~*{OFU<YotHE(`Bg6b
zpETd3ypOSs*x97{Y3%<CnQwko^O?+F#=P;G)BZ1n-{RzdE&N}c{957v>a_n5^O=9s
zyyQEL=g4nM|E_t-_t%C0hf}|e`R4bX{BGt0A8P&qt}oqysyu(HdGY6Q%m=>IywtA|
z%&-2ZQ$L;g=DnI<!G1QGU%F58nK-6xq1Z{OP{(t*++M}J(OL6Nh&OG&VZP}g%}ab9
zWqw6(&7&t)+Xm(zaPhA*-^~16*1x0p{zen`FVg;e$oxhZ|0VOAUHxMk8aiqZQ_cw}
z%WtrKY5%t{{{r(C+i7My`Yfz9qTZ05twGJ4+C!hvA3XItnLi$-2pN(OV*TNZwSI|~
z8+pvHWPSqkl+R@UZRSUI(E&5qet_+x=T=)8>-+yKppNsoUMygK%Eg+$QH2`D&zRrt
z;;&);qGe9~D&~7%qWSCC&I8Q<mictP?gr-Xzf|j|v;NP_r(EXbKVp7{i{HomTIScV
zoeY#m^3S--wVgcXf5iNG%oj3W#QXy;ehTy3nHT$KGJp9MPW$ti|AULafcZ~d{PoNq
z{c~+c{BSq(QRe3!s3ZCa^Kbk@>rd#a`Hjr){k7)LLb;^vuguR{9Z<);QxzB=Fkin$
z^8=axiur4A*Zd;pE#|x2srdlc>kPz;{5;_v%|FiiBbiVAo#wA*ekk)R?$`WB%#UOK
zyoWUZD)Y0&{v(=~c-Ar>dQ|fxaZKA!nE&ll0d*|bUC#XQXEc8l`{y^z&w5_-RNrWO
zg!!Mp6i~;VSigb!6`M5wIoG?lnE&Zpn!gD1W!k=A-g-Bnj(@`GqMOC!w~MxGUi{pP
z`LB0qeir-rc;+YV)V#F+In3|frTIA=&y$&-`L*VkGe3s;ZF`*jROahjoctW-_oNmZ
zv{_t#E12J%u6fCqM&^$^Q1epWE@M8gi&MXf`Pm0K`TLl^@L<gsvfo~0{^3J3{~Y`0
zJ?0no)Vy5xTjrM^=Hz=I-^l-K`Z)Ok%s<vo^OCN7=HEVC^VRIn66Q-XH9wr=Ig|Md
zkJ0=Q%6o=U!Te3kFXi|*FyHSur~YT)slS-b?KuwBwu1Qv<_}~37VvG2x9?W^{zhj1
z3Z;Zw)b;>)^27Bf>+7yb(fm`)7md{XJmz0#e$6SGU#jKC2h1OHs^;(Hdh{iDivO;W
zqm+{7y|ksE-J<KhSfcfxYT7s$Jn4;7ochCA|L7R4Z<cz&`tB}$0qbv=p!I)b`^Bu!
zbm^zE{@jULFYV7+%nzBY`2xOfJ=@7<JKVh+=d-?in%2)q(HFji`A1II{8b#Em277`
z+mU(J8rF}RuJ!M-{sHC(&d~e-w!fbF38k8!&-_ble>U6CU^{QIe%(y1zlhWI5$hXV
z>DtZu+&Nl*9Qp&=x}cq-{93_!8PD`#{x0SZ)^cMY^N%qv>CIDoe`64rPp)3ZNY-z5
z#pg8UcQN0G?ayJp^QpT0i2eD@_jU10m>=ZguVlW+#oxsIc;+QtcQQYhc_|N%Fu$02
zDgVzgf4R%fYs}y1(!ay}T`v76%s<9FvPo^<fv5U)*~L1)PUHMN2oa$C+RS>?G`00(
zzL|OP=kd(%W?uYRz<l?B_OrA<qnXck@uxFCjd>ZDn#|WQFZS!1U&?%Mj_3KzuV!B2
zc?I*2F)#UY1M?f1m-4@s`L|s9hne5Sy!huC=8a-!xq6lP?#xU1f1CMi7ylXa(_H*M
z@NKo*oskgAN8>@AkD(Oph;Gb>9@6}enD5K{RS#?aJI?n3%wPVf<_+fa!BcsdJ6fkp
z(mP7@PiXxisrtI5tY6Cdft)Wv#rHR|x&ET~sV&5I?tN0*$>$6{AADQsy+qmRXEgA9
zO5(FLMf>5LceI^GwttP%qkk!J=8LRTz0P`Br;`3|7xNFnE^Rk+JlAZ~_B(TW?_~a-
zcQt>ymK(og{yXN8Nospm`1iHGFZ+2bc-61*dU$`f^AYQNeyH{5u$=>t<)qJKy{s(v
z1W)Cm;bX0*buQYDW_^J5I8@tE*4KTa^^=&tvX{2=n2SG^_358#z0~UoY=0WtmwY*k
z`MEB>miY$erCv~U+sgMvO5ek{t3u}^N7J}O@%yinQ+Qi;egVB<^xW@$!5U>}|N8>J
zWxe~p!&8di|Ng~m$_`d3T=xq;0N;b^=@;5>oQ=jmng7)Tny;ehVY8Tj?s&~h`<8+F
zL3V~*q4^WI{2a-A?`t*xF7tyGuWj1@KP3S_BLP2;?U&5c_8(>YOA_dBNWkBdfPXpx
z|3(6S2lz~Tg7|kj3f`f(k0AG7WE^XvL&?NCoBMuEU+Br7YgXuV(S2OnPEx%7ZU6t&
z1bivmIqt{WP6OMiN}ykyfWMOMoO+M8^CjE)6?jV53fDT-?^wU;Pg;K@kGq~={=%y@
zFY}aF6>m?G{{4Oe-b%ptM1}26>y{iJvDhE{p|pO^{2&fEk@-O13dION0=$fc#0KFs
z#b+3^O&$N6xWb&n{PaEnC4ZU+H08_>8?5#3aR>9csz>|ZmuyII-DL^*)d~1@3HU!H
z;I}2<n^D2r^266kpJC+QtJ5`z{m=>Gw)FiKpJ6l)*LrjxYRh8&%=<K-$98Dlu`N5L
z3HWNZ^Y|Ou&P=wmkof|hpI)7!uX`o)|HJJVt-sT@GJ*ZO67cI2@FNrW^Hu1n95%Vi
z+csq<!<c!Cj{hF6FP|}gOrz$H<8&=aQ2xJ55TE{NXArdCmZkU%V@HFwKZos~%>3$+
z0d-Cz`)vmE7yVT0yRiNo@Ko>I?btk}-|w=<MG5#{f+znhb@^wl;`<vny4sn?m7NUZ
z^-Fbp&f@rNPGJ9C)<1rc)<4hsT?zE57;j|mAARFc@Q0@MGj=Q}cZ41VzAZoJD?Y>c
z4UZ?K{0ErNtkLlq!10-tz|K6@e_p2b3sUsumw-Q%#$DWx%RKaQ)(_gH^%bn2ouL1^
ziS>J~WBY9Ae&%mjuldew=P7mFen!C6u5MC#hilY9Guv75xwaEz$*u(YbPVL$@@HT0
zR8BIx>vmh_1(`~pVH{qh?LW`)EMWdu=LXajM`3-FwlN9p-;DOTJNmW7JTK5{tb=j+
zk>^ZK<bXMB|BU7Oy2o=qh7#ESDR|Wm^l|n(*NUB!w4H5ie--oP6`FsF^W{G96i;`5
z_XO)Vj0q?U_hCJYwx^l@u3p=r`=+#QVt&e6%|FWg-<VH5HlTES`MU2i{|UF}!&NAT
zk<9nwak$LCQqhm7dhJSYPu0I<7zf;?ulr-ZZcc)J=UCR~{#xsg<#szefqrxXeiryl
zj<X%+gQs`~T=6`gdBfE%El*(omIVA`3HVnOpJ8;K7EsaIgLyS=TfnPw-cy&88cy#!
z3G95ub~4`7{t0tAPr-siTlMHL@YIgE%g@o^GgS<n|DBw`&gqKJFfM#sU$;3$pErm3
zt9TwE?Or+a;}>at3a`6<q}qY~p9c%Ge!>M>-@xVMeCFr<O7j~zy4Nya9M$}`6diE8
z;+<)tqsPG0I5xoby@(}EY^V7ZZD&36&oh7MF#*MV&iv*C_CHL(8x@gQG}c&El~rMw
z=ETv{%}Enxl$xed8H@z0YooDX#EjLO6?NfIFbYLw*sQJ#mzUL<m9cOnYL+!FHY&pP
z4Ryg-urg~{!SMXHMP^lPsMaitM9P+!!B8x+#Hfmt)d$VW#`^jtIK_5kLK$;N!%;*c
z7>yy0)xnrKKe)uG$STMgmTT0P)rP>9h05xdoQJ4Jg9{pAz83LYnB7W8%0iXldIz;I
z#|TEsqCqnnix@~<wHa=R8PS^XBC|1CRvk1Vu}E#bCTc@fVf`ywUlw7NT+@guJFro0
z*3UP!(TY$E$*c%h2Kg#PKw;F?mLoNY^3)mAN7q-X^i&2Hnl*@FU635n7^*PMtipnv
z90OiQ1ltbI9d4Ax5XJJwSP<rl)o*j+<if&Xwu78pIVjAw{VX&Kv*WVD>>?ZvZxyOT
z^NbufGhy_YNt0~+48(bCI8qT5;h2TN$hb%_7!qRgX+^m?1<oT=nQ?J*CYO#DYR2RV
zxw(0T#ZDr>aCWIfL4-XrbXI=hm?<vNm?`>#ZAm30?iqDyGGdmFnzg^7;z`rS%y!TP
zMXp#C6gk2R?WWDCv6^5+!pG*tf91!2#m^oa&yU&hd>B8&oEfJ}f@Pt&1$E$bY;hzO
ztgnrVWj-_~<qR8^TQt*6PpfO(PfDEACY~Oqf@4l8HD^qpE;hLQxL8M8r<^f4XpRq-
z)x~Pe95e0{Cmm0XqGwDlo*vKeR)!-KLyeABQH4kCtqq}-sw%6{bvYVCu`G*Js-Vi+
z=zO#%sJ<1kNS*#wJtkBUS<(=z4TltqmZYfAsHh26%r`5-Xq&=yb;zc8RV>KOAExSQ
zjY@#}87W(2R+h!e)In8US+vG%2$~g3D(rQ*AP;qz8Z6{Q1KNdHV<f1KD;gsav{H&!
zM15_@c2Kt1dB9Cd7|(bsb=ksdX=dVFG!jAT;D?1}bxIUjRA)AXqqUSw6Rl62q=p#L
z6^c%*t6hl5vnEzs9}G9fOr)w>og}f11S`U*;7iO3Znu!^n7JQI2E~^8U0)eLmY$;3
zI62WQuM5NX4Uup|IHIzJoMsCVb5%j@L*4M1p@rx`I8*GDZlsx+S5GZs>j7FsKA;vc
z{!_Pz@k8ArIuA{B87`)_B3Or>Ce8=ppK8?rvM`FWSf!fC_?eC>#B8Oi%=QCQnRZ`~
zD;^8c6{#xjJTx1qF1NusP1es>O*8BCQCkXgNqr0*tnOZ_^5Vbp<G+gHzobht7sox)
z80Vt(wI;ReWpQho$uC?S6AP`3&8b47Tj6N5GCIa>iX|wX$+oj%<%`;|RfbW_Vkciv
z<c=H~ct<SI!rP9+s)c8wwz?oUJ1%zwsRLDjTicn!yqqH2Q9gS3a1?bj)VP=iJ|?wg
z7;J>lvQ<QDRV`FUsv4A4QX4`wvz1#2Z5WkNk$S8{O;&5eR+y8=qZe0H3JP;`5E3&N
zHJDM?IeEh*gf48imS13Cco-`~lPgUGja|rqin3h`w?V7g;jn6D<_9C8AnKB%<t-eR
zuL2v&&~a4NqH(2`A-V)6(eBgl2-;+mf^Ei!VQfQT$}!SY*u!&%t8j{3W3=3zcJz;S
zabBVQD8JB%O&eXBRWPiez|I#qRE0DO9y@c&=+X&Or(iT!Fl^W`yL#AgcX$yoJoYOX
zHay36RFv&FLY}oMi*g-DdG<IJ6=vI&!<<LMRW5RiYF5_U%SF*}yVc=nCtI&LJcrUI
zF&&=kILdPz<vWfX{u*9rkLmDXj_VcKV>*1e^T?Jrh1tmHcwEq&+x%3Roky{@<w0R~
zfh`?4%A>)!>MKyaqK)-N1ifjcSyoqD9a80^wvq=7C`)P}Q5OtVJ4#v+E<z=(uC^)|
zZ72(wk+RxKqaK5Z8Z(6HO*E^Zs36}cZ>*vp1xg#AH`GK;8kFGT^<~wy6=n!gh^MAt
z`0xTFvIrBJ3e2-GORLB!#OWa#Mg&pdBlQv#ZU}}<*lMlqW~?!Uy3}f{FdHKnJ(=(l
zqFy>Ab|c6oN^GnwLZC-gYSe`ExqO{tFSCU?j(o~d`80NV@#Hb)m?<TgYwC%o{B}(L
zDh;z_&XnTG6GlU23&AK46EV{qH)W<dX1uAbjW3yQnByi*9aTKZoH};wj4`EVY4NB@
zW9SOV>k6|X+NdU?2F5t`6%9*N9l$(IhJ)1P%|ky`-B24gbt9sNA(*+<hA?9d1_Oa{
zlO~KBZRTd>W)&C>jj@WFvWSz!U<LzST)|1J7O5;oL#?`Us%^nYBoxM^umWT_<P@u-
z=%g^x4I#=-G7_xEn9Rv3VSR&>G$)i!#!OP?^re$W(~Q2ftQ>7>G**cLpHr`5OXDl*
z0b&?-MInpqcl}tnu>nKd{m<21Am*lKtgeFm6m@Fg%d$!*6~81;vSXFCF0YV6s+uZ_
zG~+|*Z;c~aMUOe(X&FTy<4c_F%#|FK!wt2rc$h&ovY#<o&nL~vlSZ34rH1o3w`iPE
zrK*(cQdE?}dU$Ts2Sbgz&dW@loQPJ$d5%dQrpZUme6y;owyrf)^?r@+2qGa^t3b&K
zRkup1IHF_3h|t9$*J|3xAQ}zni3?h+NN`bY$mIrdcI$MgwIy6wzo;yNsg_;|iADA|
z-$+fLGZth_j|0?cbjU-__<9M?!0N+rTRkeG(?C_UqAXP9<Z8neF`Ki<1CC58$jKe2
z+~0Z)s^Bt<;5I?EBql8+IjvI*;jTq=dc6JKZ^5S$6C^D7sNqh~TtH(Z)q3c*imH#>
z9{jL>`{77KZb9KV1G$Yh*BL#EN-dU*%tgU6%-}HdK)J6rs$!UtIF;x{8nH&D=c`r0
zu*-|4S&a^hieMzB+TzM+SeBzOokd<p+9*C~PSsdVWvuouETEatqbc3Iw#Ea42J~c&
zk=huR|7a*`m=mVrnyBIwxk~DEC`GL`nG9FunN|5_EF8laPt6fkZk9LJ)>Tq!g3j#D
zEky+gRkU7|3WTlUr``iyZ5<i|r>3e3Go~6RH+iaB2zAz8Q<r_c6xdofjA$E$lj5(Z
zJGMksMT0?C+vLdYJT9=9#5eL-*X~=SraTHqslJa&tm?l)t(^*8lt#5`WR4ZaQY@Ov
z^du5QX2S9CG|A%26^;nxptMn_8ak6DG!9}^O$4fFxZ!ja3U(~)N|iZrp*fw`k4Iyj
zAd1Cf$A!>*I*tqT$04HOTBm7r`O$F2@Zp#~IBGwpAgE1ct~MgLI9P#18)GLG&ls<>
zFWL~ns)(z^OM=u0rfLxirK`0vP4tg4HldC)LAOa&BkZaiwNW&cAw8#2GqwphDjqk+
zoK-uvR^?YkBbH5~dWdNoR+{B{Wkpp3iW4n}#4!A$wBn!BGguc^(XXtns?t^)cvw*p
zTY|hTr-4Q5DS1X?v@RHQ4GN5`C}#I%<v`@2!W#Ld7Lyu`tPtXmRXl3KkQkPO^ig%F
zF-uj#At)VLbX0={Fe9sSNeK2dVtS@RFrSOkLYw`-L>NkA8J)nt8tP(3ma3px_?cB5
z#$haoxpx*VS3wk3eR5V1(?E6Kpr#T=<Vc^YZyD$_<oCP^$Z(mm`q~P_Asi#~U}#R8
zg}P*9VMz+zbc}DG{9gk-Z%DU#`1VlzI|@Zi$omX(A-*jnhsLq^MYqi4{L<6_jtqQv
zL4lE}A^yMIXBQ#|KkVnnQUfX|#^(=EN3H+4&o4pHH<lHa>))6fP~sbz$W}-C8=Le~
zo+D%0n1Ublh>@JXF*SfA1K)d4VD#nZN(d<Jaz366RNEQ&pKdYA`SLx8W)@aUfR-y8
z{8PcX_#fYVjK^QT8!?`rd-@rR`F3CYI%0M{!dq<TZ$2oX&e+W7ui*13{&bGSpK0Sf
z{2-r-y}8{2Drhd>Po1ld_V=Hpe;LB*{86lH;`5vM{Mj6F0y;;oFXvwkj{M4Qj(^vp
zFW-EX=Vu{N8(qu3U4aAp`GFn*6&&F6SM&W}Ij1}S5L}64`}y*njAq=Ir%mFkkM=*l
z83Fe5<vE94e14Cu6xzDUb%nVNKkVnrcQ?|%(C6`E2qIU$jvwI1-F&{}pFGc!$>*2N
zu&WIt(|Kq-=sI7%<FRavwpb?xkI!@apT6rrF_r7f_da$_)XaLxXg=TV&lkaGV2@{0
zs9Y;U`h2(Eef(#r@n}x`eEEJzXP@V9!?_fHxxRd7q`S}ax8qzYyK=sKkEAc3-%Q4_
zN%@xeOF6g^VfO3GcT0A2iy(Ss1pmpg;AgJ$<IgKMX#dIe6P>@?b-p~0*1SNUzxqx&
zQ)8y{&}hLi#YNID&qXZlrx~(u-!kn7_??EtQ~I-AyqsU);@O?*916l?gYj$IrBBY$
z*Y74LaG>i@+0iMrpN;1mIR2dnX`bFII2<R7-=$bn{gkxZEi@Htb|0Q&uy5|`{~v@L
B<rV+{

literal 0
HcmV?d00001

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_reboot_pre_check b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_reboot_pre_check
new file mode 100755
index 000000000000..d7eac17862f6
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_reboot_pre_check
@@ -0,0 +1,38 @@
+#!/bin/bash
+SSD_FW_UPGRADE="/host/ssd_fw_upgrade"
+
+_error_msg(){
+    echo "The SSD on this unit is $1. Do not power-cycle/reboot this unit."
+    echo "soft-/fast-/warm-reboot is allowed."
+    logger -p user.crit -t DELL_S6100_SSD_MON "The SSD on this unit is $1. Do not power-cycle/reboot this unit."
+    logger -p user.crit -t DELL_S6100_SSD_MON "soft-/fast-/warm-reboot is allowed."
+}
+
+# Check SSD Status
+if [ -e $SSD_FW_UPGRADE/GPIO7_pending_upgrade ]; then
+    _error_msg "running older firmware"
+    exit 1
+fi
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_low ] || [ -e $SSD_FW_UPGRADE/GPIO7_error ]; then
+    _error_msg "faulty"
+    exit 1
+fi
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_high ]; then
+    iSMART="/usr/local/bin/iSMART_64"
+    iSMART_OPTIONS="-d /dev/sda"
+
+    iSMART_CMD=`$iSMART $iSMART_OPTIONS`
+
+    GPIO_STATUS=$(echo "$iSMART_CMD" | grep GPIO | awk '{print $NF}')
+
+    if [ $GPIO_STATUS == "0x01" ];then
+	exit 0
+    else
+        _error_msg "faulty"
+        exit 1
+    fi
+fi
+
+exit 1
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index 5c7c2308c1f0..39c9074d5f52 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -43,6 +43,8 @@ if [[ "$1" == "init" ]]; then
         /usr/local/bin/platform_watchdog_disable.sh
     fi
 
+    systemctl start --no-block s6100-ssd-upgrade-status.service
+
     is_fast_warm=$(cat /proc/cmdline | grep SONIC_BOOT_TYPE | wc -l)
 
     if [[ "$is_fast_warm" == "1" ]]; then
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_mon.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_mon.sh
new file mode 100755
index 000000000000..8691d656bf93
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_mon.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SSD_FW_UPGRADE="/host/ssd_fw_upgrade"
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_high ]; then
+    iSMART="/usr/local/bin/iSMART_64"
+    iSMART_OPTIONS="-d /dev/sda"
+
+    iSMART_CMD=`$iSMART $iSMART_OPTIONS`
+    GPIO_STATUS=$(echo "$iSMART_CMD" | grep GPIO | awk '{print $NF}')
+
+    if [ $GPIO_STATUS != "0x01" ];then
+        logger -p user.crit -t DELL_S6100_SSD_MON "The SSD on this unit is faulty. Do not power-cycle/reboot this unit!"
+        logger -p user.crit -t DELL_S6100_SSD_MON "soft-/fast-/warm-reboot is allowed."
+        rm -rf $SSD_FW_UPGRADE/GPIO7_*
+        touch $SSD_FW_UPGRADE/GPIO7_low
+        systemctl stop s6100-ssd-monitor.timer
+    fi
+else
+    systemctl stop s6100-ssd-monitor.timer
+fi
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
new file mode 100755
index 000000000000..2c074fd3319c
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+SSD_FW_UPGRADE="/host/ssd_fw_upgrade"
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_high ]; then
+    systemctl start --no-block s6100-ssd-monitor.timer
+    exit 0
+fi
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_low ] || [ -e $SSD_FW_UPGRADE/GPIO7_error ]; then
+    exit 0
+fi
+
+[ ! -d $SSD_FW_UPGRADE ] && mkdir $SSD_FW_UPGRADE
+
+SSD_UPGRADE_LOG="$SSD_FW_UPGRADE/upgrade.log"
+
+SMART_CMD=`smartctl -a /dev/sda`
+
+SSD_FW_VERSION=$(echo "$SMART_CMD" | grep "Firmware Version" | awk '{print $NF}')
+SSD_FW_VERSION=${SSD_FW_VERSION,,}
+SSD_MODEL=$(echo "$SMART_CMD" | grep "Device Model" | awk '{print $NF}')
+
+if [ -e $SSD_FW_UPGRADE/GPIO7_pending_upgrade ]; then
+    if [ $SSD_MODEL == "3IE" ] && [ $SSD_FW_VERSION == "s141002c" ]; then
+        # If SSD Firmware is not upgraded
+        exit 0
+    fi
+    if [ $SSD_FW_VERSION == "s16425c1" ] || [ $SSD_FW_VERSION == "s16425cq" ]; then
+        # If SSD Firmware is not upgraded
+        exit 0
+    fi
+fi
+
+echo "$0 `date` SSD FW upgrade logs post reboot." >> $SSD_UPGRADE_LOG
+
+iSMART="/usr/local/bin/iSMART_64"
+iSMART_OPTIONS="-d /dev/sda"
+iSMART_CMD=`$iSMART $iSMART_OPTIONS`
+
+SSD_UPGRADE_STATUS1=`io_rd_wr.py --set --val 06 --offset 210; io_rd_wr.py --set --val 09 --offset 211; io_rd_wr.py --get --offset 212`
+SSD_UPGRADE_STATUS1=$(echo "$SSD_UPGRADE_STATUS1" | awk '{print $NF}')
+
+SSD_UPGRADE_STATUS2=`io_rd_wr.py --set --val 06 --offset 210; io_rd_wr.py --set --val 0A --offset 211; io_rd_wr.py --get --offset 212`
+SSD_UPGRADE_STATUS2=$(echo "$SSD_UPGRADE_STATUS2" | awk '{print $NF}')
+
+if [ $SSD_UPGRADE_STATUS1 == "2" ]; then
+    rm -rf $SSD_FW_UPGRADE/GPIO7_*
+    touch $SSD_FW_UPGRADE/GPIO7_error
+
+    echo "$0 `date` Upgraded to unknown version after first mp_64 upgrade." >> $SSD_UPGRADE_LOG
+
+elif [ $SSD_MODEL == "3IE3" ] && [ $SSD_UPGRADE_STATUS2 == "2" ];then
+    rm -rf $SSD_FW_UPGRADE/GPIO7_*
+    touch $SSD_FW_UPGRADE/GPIO7_error
+
+    echo "$0 `date` Upgraded to unknown version after second mp_64 upgrade." >> $SSD_UPGRADE_LOG
+
+elif [ $SSD_FW_VERSION == "s210506g" ] || [ $SSD_FW_VERSION == "s16425cg" ]; then
+    # If SSD Firmware is upgraded
+    GPIO_STATUS=$(echo "$iSMART_CMD" | grep GPIO | awk '{print $NF}')
+
+    if [ $GPIO_STATUS != "0x01" ];then
+        logger -p user.crit -t DELL_S6100_SSD_MON "The SSD on this unit is faulty. Do not power-cycle/reboot this unit!"
+        logger -p user.crit -t DELL_S6100_SSD_MON "soft-/fast-/warm-reboot is allowed."
+        rm -rf $SSD_FW_UPGRADE/GPIO7_*
+        touch $SSD_FW_UPGRADE/GPIO7_low
+        echo "$0 `date` The SSD on this unit is faulty. Do not power-cycle/reboot this unit!" >> $SSD_UPGRADE_LOG
+        echo "$0 `date` soft-/fast-/warm-reboot is allowed." >> $SSD_UPGRADE_LOG
+
+    else
+        if [ $SSD_UPGRADE_STATUS1 == "0" ]; then
+            rm -rf $SSD_FW_UPGRADE/GPIO7_*
+            touch $SSD_FW_UPGRADE/GPIO7_high
+            systemctl start --no-block s6100-ssd-monitor.timer
+
+            if [ $SSD_MODEL  == "3IE" ];then
+                echo "$0 `date` SSD FW upgraded from S141002C to S210506G in first mp_64." >> $SSD_UPGRADE_LOG
+            else
+                echo "$0 `date` SSD FW upgraded from S16425c1 to S16425cG in first mp_64." >> $SSD_UPGRADE_LOG
+            fi
+        elif [ $SSD_MODEL == "3IE3" ] && [ $SSD_UPGRADE_STATUS2 == "1" ]; then
+            rm -rf $SSD_FW_UPGRADE/GPIO7_*
+            touch $SSD_FW_UPGRADE/GPIO7_low
+            logger -p user.crit -t DELL_S6100_SSD_MON "The SSD on this unit is faulty. Do not power-cycle/reboot this unit!"
+            logger -p user.crit -t DELL_S6100_SSD_MON "soft-/fast-/warm-reboot is allowed."
+
+            echo "$0 `date` SSD entered loader mode in first mp_64 and upgraded to latest version after second mp_64." >> $SSD_UPGRADE_LOG
+        fi
+    fi
+
+else
+    if [ $SSD_UPGRADE_STATUS1 == "ff" ] && [ $SSD_UPGRADE_STATUS2 == "ff" ]; then
+        rm -rf $SSD_FW_UPGRADE/GPIO7_*
+        touch $SSD_FW_UPGRADE/GPIO7_pending_upgrade
+
+        echo "$0 `date` SSD upgrade didn’t happen." >> $SSD_UPGRADE_LOG
+
+    elif [ $SSD_UPGRADE_STATUS1 == "1" ]; then
+        rm -rf $SSD_FW_UPGRADE/GPIO7_*
+        touch $SSD_FW_UPGRADE/GPIO7_low
+        logger -p user.crit -t DELL_S6100_SSD_MON "The SSD on this unit is faulty. Do not power-cycle/reboot this unit!"
+        logger -p user.crit -t DELL_S6100_SSD_MON "soft-/fast-/warm-reboot is allowed."
+
+        echo "$0 `date` SSD entered loader mode in first mp_64 upgrade." >> $SSD_UPGRADE_LOG
+
+        if [ $SSD_MODEL == "3IE3" ] && [ $SSD_UPGRADE_STATUS2 == "0" ]; then
+            echo "$0 `date` SSD entered loader mode in first mp_64 and recovered back to older version in second mp_64." >> $SSD_UPGRADE_LOG
+        fi
+    fi
+
+fi
+
+echo "$0 `date` SMF Register 1 = $SSD_UPGRADE_STATUS1" >> $SSD_UPGRADE_LOG
+echo "$0 `date` SMF Register 2 = $SSD_UPGRADE_STATUS2" >> $SSD_UPGRADE_LOG
+echo "$SMART_CMD" >> $SSD_UPGRADE_LOG
+echo "$iSMART_CMD" >> $SSD_UPGRADE_LOG
+sync
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/soft-reboot_plugin b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/soft-reboot_plugin
new file mode 120000
index 000000000000..180742bbc4d5
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/soft-reboot_plugin
@@ -0,0 +1 @@
+fast-reboot_plugin
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.service
new file mode 100644
index 000000000000..75e3b224b65b
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Dell S6100 SSD monitoring poller
+DefaultDependencies=no
+
+[Service]
+User=root
+ExecStart=/usr/local/bin/s6100_ssd_mon.sh
+RemainAfterExit=no
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.timer b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.timer
new file mode 100644
index 000000000000..ede2b636d80b
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-monitor.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Dell S6100 SSD monitoring poller timer
+DefaultDependencies=no
+After=pmon.service
+
+[Timer]
+OnBootSec=5min
+OnUnitActiveSec=60min
+
+[Install]
+WantedBy=timers.target
+
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-upgrade-status.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-upgrade-status.service
new file mode 100644
index 000000000000..4de9cf73b965
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-ssd-upgrade-status.service
@@ -0,0 +1,14 @@
+[Unit]
+Description= Checking Dell S6100 SSD upgrade status
+After=pmon.service
+DefaultDependencies=no
+
+[Service]
+User=root
+Type=oneshot
+ExecStart=/usr/local/bin/s6100_ssd_upgrade_status.sh
+RemainAfterExit=no
+
+[Install]
+WantedBy=multi-user.target
+

From d819736f16ec1a7a299db9b621fd829e10b2a44c Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Tue, 21 Sep 2021 20:18:21 -0700
Subject: [PATCH 0807/1674] [202012] [Submodule] Update submodule ptr for
 sonic-utilities (#8807)

7a58e84 [techsupport] [202012] Removed -i option for docker commands and Improved Error Reporting (#1833)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 912d443fb34f..67a58e8476db 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 912d443fb34f49a267c366460ee1cbb8467ee385
+Subproject commit 67a58e8476db957230b5e032602aeacbc817d327

From 667fe3702c0ef1a44618df74fd448271a548b6a2 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 24 Sep 2021 01:34:56 +0800
Subject: [PATCH 0808/1674] [ci/build]: Upgrade SONiC package versions (#8829)

---
 files/build/versions/default/versions-git     |  4 ++--
 .../docker-syncd-brcm/versions-deb-buster     | 20 +++++++++++++++++++
 .../dockers/sonic-slave-buster/versions-git   |  2 --
 .../sonic-slave-stretch/versions-deb-stretch  |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 --
 .../host-image/versions-py3-all-arm64         |  1 +
 .../host-image/versions-py3-all-armhf         |  3 ++-
 7 files changed, 26 insertions(+), 8 deletions(-)
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 create mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index cbe46244ac4a..a9d67a1e23d4 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==eff810e93d23a0ad00fe36e577324b67612b3ec4
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -8,7 +8,7 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
-https://github.com/sflow/host-sflow==1392bd591de05fb5aa09afa39a96f2ba4e8ed7ef
+https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index c8cdd58363d8..c5738f15797a 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -1,16 +1,36 @@
 ethtool==1:4.19-1
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 kmod==26-1
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libipt2==2.0-2
 libkmod2==26-1
+libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
 libsaibcm==4.3.5.1-2
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 linux-libc-dev==4.19.194-3
+openssh-client==1:7.9p1-10+deb10u2
+sshpass==1.06-1
+strace==4.26-0.2
 syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index 5ec72a8dd239..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index f6a0e265a948..edd288dbd099 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -926,7 +926,7 @@ libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u3
-libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u5
 libssl1.1==1.1.0l-1~deb9u3
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 5ec72a8dd239..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf9d64363b627bc156be3166aed94affb5cae6b1
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
new file mode 100644
index 000000000000..14f85edfb433
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3-all-arm64
@@ -0,0 +1 @@
+urllib3==1.26.7
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 431dc5a43838..453dc2d6d122 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1 +1,2 @@
-cryptography==3.3.1
\ No newline at end of file
+cryptography==3.3.1
+urllib3==1.26.7
\ No newline at end of file

From e9908d548fe168ed6c2861b61a336ef66544193b Mon Sep 17 00:00:00 2001
From: richardyu <richardyu81@yahoo.com>
Date: Sat, 25 Sep 2021 07:53:44 +0800
Subject: [PATCH 0809/1674] Update sairedis for taking new saiserver (#8818)

Co-authored-by: richardyu-ms <richard.yu@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 0323d5ee0b20..ca6cdf0fb9ad 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 0323d5ee0b20f735b80e3406fdd52b3d818fa91d
+Subproject commit ca6cdf0fb9ad2f251b8ea24089d373a172b109b1

From cd06aa49ef69ff05ac1ed4786fef1a6832c3d927 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Sun, 26 Sep 2021 04:43:43 +0530
Subject: [PATCH 0810/1674] [Marvell]Update driver tag to pick squashfs fix
 (#8836)

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/prestera.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/prestera.mk b/platform/marvell-armhf/prestera.mk
index 2365319b9d00..7eb7536fb6a7 100644
--- a/platform/marvell-armhf/prestera.mk
+++ b/platform/marvell-armhf/prestera.mk
@@ -4,7 +4,7 @@ export MRVL_PRESTERA_VER = 1.0
 export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH)
 export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb
 export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git
-export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.0
+export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.1
 
 $(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera
 $(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)

From ac9feadbf1525bd675d40faa656789c11dbcdc8b Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sat, 25 Sep 2021 17:09:34 -0700
Subject: [PATCH 0811/1674] [202012] BRCMSAI 4.3.5.1-3 fix CS00012203600,
 CS00012202255, CS00012208537 (#8840)

---
 files/build/versions/default/versions-docker | 1 +
 files/build/versions/default/versions-git    | 2 +-
 files/build/versions/default/versions-web    | 2 ++
 platform/broadcom/sai.mk                     | 8 ++++----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index b9f56396937d..f620479ab108 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,6 +1,7 @@
 amd64:amd64/debian:buster==sha256:df7d71b9a1ce0fa0b774f52ac7a0d966b483f0650185cc3594ff7d367d5c6a55
 amd64:amd64/debian:stretch==sha256:b8cd84cc98da3fdd374607006327f4fad25c3190ad0f713b28f3bee58cf01919
 amd64:debian:buster==sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8
+amd64:debian:jessie==sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0
 amd64:debian:stretch==sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index a9d67a1e23d4..2739d365b0f4 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==eff810e93d23a0ad00fe36e577324b67612b3ec4
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f35d3508ebd8c98d6c3b6ebfebe4895b374dbc07
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 4247d39cf409..50149dee46de 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 1f46473278a8..0c330a1056fd 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a8306b3c38b0fbf5a46512bac2b8ef2cdea14e04 Mon Sep 17 00:00:00 2001
From: Kostiantyn Yarovyi <kostiantynx.yarovyi@intel.com>
Date: Tue, 14 Sep 2021 17:34:00 +0300
Subject: [PATCH 0812/1674] [show] add platform components in Newport, Montara,
 Mavericks for fix incomprehensible firmware Error print (#8690)

What I did:
     add platform components
 How I did it:
      In platform_components.json add chassis and empty component
How to verify it:
       Run show platform firmware updates
---
 .../x86_64-accton_as9516_32d-r0/platform_components.json  | 8 ++++++++
 .../platform_components.json                              | 8 ++++++++
 .../platform_components.json                              | 8 ++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json
 create mode 100644 device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json

diff --git a/device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json b/device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json
new file mode 100644
index 000000000000..43874566a3ad
--- /dev/null
+++ b/device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json
@@ -0,0 +1,8 @@
+{
+    "chassis": {
+        "Newport": {
+            "component": {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json
new file mode 100644
index 000000000000..df77fa3e1bf9
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json
@@ -0,0 +1,8 @@
+{
+    "chassis": {
+        "Wedge100BF-32X-O-AC-F-BF": {
+            "component": {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json
new file mode 100644
index 000000000000..74e851a7c4b6
--- /dev/null
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json
@@ -0,0 +1,8 @@
+{
+    "chassis": {
+        "Wedge100BF-65X-O-AC-F-BF": {
+            "component": {
+            }
+        }
+    }
+}
\ No newline at end of file

From 7187041b7807c027c5c44fdf50bca041159c7dd6 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Tue, 21 Sep 2021 10:13:48 -0700
Subject: [PATCH 0813/1674] [RESTAPI] Update submodule

Commits included:

1. Update API description for default vrf and ecmp routes
    fad87fa20f6b15e28c90e02a131c44d236d6a751

2. Fix WS-2018-0594 potential non-random UUIDs security issue
    8d4fd4a56b637d3b7403c321aef36b8dff58cd62

3. Add BFD config to subinterface and neighbor
    d3e8b8e4aee278fa11d7d86acabdab3fffc70d5a

4. Default Vrf static route support
    6cfc8fe110c46a1ee5a8430e02a440b5a7b4006d

5. Added flag to make go/pkg/ folder writable (removable)
    ee887c785c10d8b4f70db90ca50cc398327c5d73
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 8d09602a9e3c..ee887c785c10 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 8d09602a9e3c762f86992d8eaf642e7115c5318b
+Subproject commit ee887c785c10d8b4f70db90ca50cc398327c5d73

From 636870d86f4bea8724663b47973ed43e61b971ad Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Thu, 23 Sep 2021 23:53:22 -0700
Subject: [PATCH 0814/1674] Save DB dump after warm/fast reboot (#8803)

As a part of warmboot, redis database is dumped:
https://github.com/Azure/sonic-utilities/blob/c97fe546e5a725b9049047293a4fede48fde5223/scripts/fast-reboot#L269
However, this dump file is deleted, after it is loaded back into db post reboot.
The DB dump can be useful for debugging purpose, hence taking a backup of it can be useful.
Instead of deleting the dump, rename and keep the dump.
---
 files/build_templates/docker_image_ctl.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index fbd25d699a94..0c031b103f6b 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -116,7 +116,8 @@ function postStartAction()
           sleep 1;
         done
         if [[ ("$BOOT_TYPE" == "warm" || "$BOOT_TYPE" == "fastfast") && -f $WARM_DIR/dump.rdb ]]; then
-            rm -f $WARM_DIR/dump.rdb
+            # retain the dump file from last boot for debugging purposes
+            mv $WARM_DIR/dump.rdb $WARM_DIR/dump.rdb.old
         else
             # If there is a config_db.json dump file, load it.
             if [ -r /etc/sonic/config_db$DEV.json ]; then

From 76804dab3b727095df55bd06b58fe7f7c7856a2b Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Mon, 27 Sep 2021 15:24:38 -0700
Subject: [PATCH 0815/1674] [202012][Submodule] Update for sonic-swss (#8846)

*ee9c30d - 2021-09-24 : [202012] Cache route for single nexthop for faster retrieval (#1931) [Prince Sunny]
*84f1c63 - 2021-09-24 : [lgtm] Fix LGTM build on 202012 branch (#1921) [Kamil Cudnik]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 5a4678e75615..ee9c30dfb8ef 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 5a4678e75615727903dadbf6e4fea0d19835a728
+Subproject commit ee9c30dfb8efc08f6040d1afdc9c9550d2bf1f45

From d33cd2bb6073ea24265673c8368aea517390e70a Mon Sep 17 00:00:00 2001
From: minionatwork <60480922+minionatwork@users.noreply.github.com>
Date: Tue, 17 Aug 2021 19:01:01 -0700
Subject: [PATCH 0816/1674] [multi-asic] Fix for sonic-cfggen exception during
 platform string read (#8229)

Fix for sonic-cfggen exception during platform string read during fresh install and start of sonic in multi asic, /var/run/redisX/ is created after database docker is started.
---
 src/sonic-config-engine/sonic-cfggen | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index d895c0dde12c..98ef97f8a875 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -302,10 +302,6 @@ def main():
                                 'localhost': {'namespace_id': namespace_id}
                              }
                           })
-    # Load the database config for the namespace from global database json
-    if args.namespace is not None:
-        SonicDBConfig.load_sonic_global_db_config(namespace=args.namespace)
-
     if hwsku is not None:
         hardware_data = {'DEVICE_METADATA': {'localhost': {
             'hwsku': hwsku
@@ -354,6 +350,7 @@ def main():
         if args.namespace is None:
             configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, **db_kwargs)
         else:
+            SonicDBConfig.load_sonic_global_db_config(namespace=args.namespace)
             configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, namespace=args.namespace, **db_kwargs)
 
         configdb.connect()
@@ -414,6 +411,7 @@ def main():
         if args.namespace is None:
             configdb = ConfigDBPipeConnector(use_unix_socket_path=True, **db_kwargs)
         else:
+            SonicDBConfig.load_sonic_global_db_config(namespace=args.namespace)
             configdb = ConfigDBPipeConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
 
         configdb.connect(False)

From 7ffa29001606a2e379edec28d0b78e0d9a03a09e Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:00:19 -0700
Subject: [PATCH 0817/1674] 
 [202012][sonic-platform-daemons][sonic-platform-common] submodule update
 (#8864)

* [202012][sonic-platform-daemons] submodule update

3d14066 [xcvrd][y_cable] refactor xcvrd to listen to port probe without locks; fix the get_firmware_version API to sync with download_firmware (#216)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

* update sonic-platform-common

93244bf [Y-Cable][Broadcom] upgrade to support Broadcom Y-Cable API to release 1.2 (#217)
Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 9d2e7d5f8f6f..93244bf85556 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 9d2e7d5f8f6f3f90000539b4746e7adc72d01a67
+Subproject commit 93244bf85556e1ca7d86883a8c6223c044105841
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index ebc4f3fafb56..3d14066b8f92 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit ebc4f3fafb56419dcae2570851ce3a9808b6364a
+Subproject commit 3d14066b8f92e8fa9c51e05dc5cea8634784c4dd

From d790caecbc6b2437a1f25519376ed78548c53929 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 30 Sep 2021 01:11:32 +0800
Subject: [PATCH 0818/1674] [ci/build]: Upgrade SONiC package versions (#8867)

---
 .../build-sonic-slave-buster/versions-deb-buster  |  2 +-
 .../build/build-sonic-slave-buster/versions-git   |  4 ++--
 .../build/build-sonic-slave-buster/versions-web   |  4 ++--
 .../build/build-sonic-slave-stretch/versions-web  |  4 ++--
 files/build/versions/default/versions-docker      | 15 +++++++--------
 files/build/versions/default/versions-git         |  6 +++---
 files/build/versions/default/versions-web         |  2 --
 .../docker-base-buster/versions-py3-all-arm64     |  1 +
 .../docker-base-stretch/versions-deb-stretch      |  4 ++--
 .../docker-config-engine-buster/versions-py3      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch       |  9 ++++-----
 .../docker-sonic-mgmt-framework/versions-py3      |  2 +-
 .../versions-py3-all-arm64                        |  1 +
 .../versions-py3-all-armhf                        |  1 +
 .../versions/dockers/docker-sonic-vs/versions-py2 |  2 +-
 .../versions/dockers/docker-sonic-vs/versions-py3 |  2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster |  2 +-
 .../versions-py3-all-arm64                        |  2 +-
 .../versions-py3-all-armhf                        |  2 +-
 .../versions-deb-stretch-arm64                    |  8 ++++----
 .../versions-py3-all-arm64                        |  2 +-
 .../versions-deb-stretch-armhf                    |  8 ++++----
 .../versions-py3-all-armhf                        |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch      |  8 ++++----
 .../versions/host-image/versions-deb-buster-arm64 |  1 +
 .../versions/host-image/versions-deb-buster-armhf |  1 +
 files/build/versions/host-image/versions-py3      |  4 ++--
 .../versions/host-image/versions-py3-all-arm64    |  1 -
 .../versions/host-image/versions-py3-all-armhf    |  3 +--
 29 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 delete mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 5f8f402317dc..0cf3325dea42 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-2
+libsaibcm==4.3.5.1-3
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b442de3a5b71..712cbf8aa43e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,9 +1,9 @@
-https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
+https://github.com/CESNET/libyang.git==b125e1a25297518612916c5685087f99dc95ed3a
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==1392bd591de05fb5aa09afa39a96f2ba4e8ed7ef
+https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 53aa9c731771..82c0cf542dd6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 75e909268b4e..b8af26988ffb 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-2_amd64.deb?sv=2015-04-05&sr=b&sig=RvQcM1FHKbezWN3GMHZ6VuslpR0d5TLxpuRjskjJ%2Fbw%3D&se=2035-05-13T19%3A31%3A33Z&sp=r==e7098346d6eca85af9aec81e9de890cd
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-2_amd64.deb?sv=2020-04-08&st=2021-09-03T19%3A11%3A02Z&se=2036-01-01T20%3A11%3A00Z&sr=b&sp=r&sig=N8u96t8srU9bfs8xnVlFZ4%2Fw%2BZg6YYLLSc3j%2FaNPss0%3D==36105d31385d6c6f2a77b72fe212e80d
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index f620479ab108..17ee80ee325f 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,8 +1,7 @@
-amd64:amd64/debian:buster==sha256:df7d71b9a1ce0fa0b774f52ac7a0d966b483f0650185cc3594ff7d367d5c6a55
+amd64:amd64/debian:buster==sha256:2d3ea67549bcf9c6fd5ae9323237def50d9ed39ca118217b4f4cc8df8541fa77
 amd64:amd64/debian:stretch==sha256:b8cd84cc98da3fdd374607006327f4fad25c3190ad0f713b28f3bee58cf01919
-amd64:debian:buster==sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8
-amd64:debian:jessie==sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0
-amd64:debian:stretch==sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af
+amd64:debian:buster==sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02
+amd64:debian:stretch==sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -30,10 +29,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:c117f3478dadec02b4628a81bc621fdefec2c301df57df760833d823184f9faa
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:57b07ff1d3c1b0da78ff9fb26ef5040c5239e7c4361f4404005487e27924b796
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2affdd4aed32efc2087f552b125844cf3e6ef84dd283c893e1a5f42d2c65b12a
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:c76e5386ef50035aaef9e9daea28928014dc8359c5829bb2854d12eb0fcd705f
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:c25c19b90282273db12807f7b0c528a6858db272fc8162b7b0b2d7e77fafda62
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:d26753fd0d7f3cec5dac9a0432fd28b2ffb8fa46ebb6b97143768552c11035b2
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:ea75b798b2a15d3511307b754e73f1e90e9b5515417bafdc303ce09c86bd4173
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:172911bb03322441b508e653d7654f0099a2fa6da248621bfd02dbc75b973497
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2739d365b0f4..7de2fec3e51e 100644
--- 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==f35d3508ebd8c98d6c3b6ebfebe4895b374dbc07
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==ce514ad38e0f8077d92704d2300f6ab0a1d263ad
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
-https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
+https://github.com/CESNET/libyang.git==b125e1a25297518612916c5685087f99dc95ed3a
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
-https://github.com/Marvell-switching/mrvl-prestera.git==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
+https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
 https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 50149dee46de..4247d39cf409 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64 b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..f4c44459a714
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
@@ -0,0 +1 @@
+toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index eed765cc007c..0b78af5806e6 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -45,7 +45,7 @@ libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl1.0.2==1.0.2u-1~deb9u5
-libssl1.1==1.1.0l-1~deb9u3
+libssl1.1==1.1.0l-1~deb9u4
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
 libwrap0==7.6.q-26
@@ -53,7 +53,7 @@ libzmq5==4.2.1-4+deb9u4
 lua-cjson==2.1.0+dfsg-2
 mime-support==3.60
 net-tools==1.60+git20161116.90da8a0-1
-openssl==1.1.0l-1~deb9u3
+openssl==1.1.0l-1~deb9u4
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
 procps==2:3.3.12-3+deb9u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index c92c6b8dcd02..0869cff9df4f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.8.28
+regex==2021.9.24
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index ebcf6abc9334..6322463369f6 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -114,7 +114,6 @@ libmpfr4==3.1.5-1
 libmpx2==6.3.0-18+deb9u1
 libncurses5==6.0+20161126-1+deb9u2
 libnet1==1.1.6+dfsg-3
-libnettle6==3.3-1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u1
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
@@ -149,10 +148,10 @@ libseccomp2==2.3.1-2.1+deb9u1
 libsigsegv2==2.10-5
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u3
-libssl-doc==1.1.0l-1~deb9u3
+libssl-dev==1.1.0l-1~deb9u4
+libssl-doc==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u5
-libssl1.1==1.1.0l-1~deb9u3
+libssl1.1==1.1.0l-1~deb9u4
 libstdc++-6-dev==6.3.0-18+deb9u1
 libtacacs+1==4.0.4.27a-3
 libtasn1-6==4.10-1.1+deb9u1
@@ -192,7 +191,7 @@ ntpstat==0.0.0.1-1+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u3
+openssl==1.1.0l-1~deb9u4
 patch==2.7.5-1+deb9u2
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 18f08ff4fa9e..5e10cb4a5f09 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.1
-grpcio==1.40.0
+grpcio==1.41.0
 grpcio-tools==1.20.0
 idna==3.2
 importlib-metadata==4.8.1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
new file mode 100644
index 000000000000..21eed6c09f8a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
@@ -0,0 +1 @@
+zipp==3.5.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
new file mode 100644
index 000000000000..21eed6c09f8a
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
@@ -0,0 +1 @@
+zipp==3.5.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 274524d68093..a9d12f9d2c28 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.26.0
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.6
\ No newline at end of file
+urllib3==1.26.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index a2c676bb4dac..2d3d8446d861 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.26.0
 scapy==2.4.4
 tabulate==0.8.9
-urllib3==1.26.6
+urllib3==1.26.7
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index c5738f15797a..a441700a6e4c 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-2
+libsaibcm==4.3.5.1-3
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index 064e66962715..ac8c91a16afd 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.24
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index 064e66962715..ac8c91a16afd 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.24
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 829b2783b72e..6ffebbb717a0 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -859,7 +859,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u7
+libservlet3.1-java==8.5.54-0+deb9u8
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -881,9 +881,9 @@ libsoup-gnome2.4-1==2.56.0-2+deb9u2
 libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u3
+libssl-dev==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u5
-libssl1.1==1.1.0l-1~deb9u3
+libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libstrictures-perl==2.000003-1
@@ -1112,7 +1112,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u3
+openssl==1.1.0l-1~deb9u4
 packagekit==1.1.5-2+deb9u2
 packagekit-tools==1.1.5-2+deb9u2
 patch==2.7.5-1+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 1a570d60bf58..91b030f764e7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.24
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index 37e82236d956..e267bff8e199 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -861,7 +861,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u7
+libservlet3.1-java==8.5.54-0+deb9u8
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -883,9 +883,9 @@ libsoup-gnome2.4-1==2.56.0-2+deb9u2
 libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u3
+libssl-dev==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u5
-libssl1.1==1.1.0l-1~deb9u3
+libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libstrictures-perl==2.000003-1
@@ -1118,7 +1118,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u3
+openssl==1.1.0l-1~deb9u4
 packagekit==1.1.5-2+deb9u2
 packagekit-tools==1.1.5-2+deb9u2
 patch==2.7.5-1+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 1a570d60bf58..91b030f764e7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.24
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index edd288dbd099..f819270739e4 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -902,7 +902,7 @@ libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
 libsensors4-dev==1:3.4.0-4
 libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u7
+libservlet3.1-java==8.5.54-0+deb9u8
 libsigsegv2==2.10-5
 libsisu-inject-java==0.3.2-2
 libsisu-plexus-java==0.3.2-1
@@ -925,9 +925,9 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u3
+libssl-dev==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u5
-libssl1.1==1.1.0l-1~deb9u3
+libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libstrictures-perl==2.000003-1
@@ -1180,7 +1180,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u3
+openssl==1.1.0l-1~deb9u4
 packagekit==1.1.5-2+deb9u2
 packagekit-tools==1.1.5-2+deb9u2
 patch==2.7.5-1+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index f8ceb4047f84..43905ff5f468 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -16,4 +16,5 @@ linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.194-3
 squashfs-tools==1:4.3-12
 tsingma-bsp==1.0
+tzdata==2021a-0+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index ac172354c81e..674b3458f4a8 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -16,4 +16,5 @@ linux-image-4.19.0-12-2-armmp==4.19.152-1
 linux-libc-dev==4.19.194-3
 mrvlprestera==1.0
 squashfs-tools==1:4.3-12
+tzdata==2021a-0+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 1360dedffbaf..464acd42a8d0 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -31,13 +31,13 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.24
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
 thrift==0.13.0
-urllib3==1.26.6
+urllib3==1.26.7
 watchdog==0.10.3
 websocket-client==1.2.1
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
deleted file mode 100644
index 14f85edfb433..000000000000
--- a/files/build/versions/host-image/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-urllib3==1.26.7
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 453dc2d6d122..431dc5a43838 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1,2 +1 @@
-cryptography==3.3.1
-urllib3==1.26.7
\ No newline at end of file
+cryptography==3.3.1
\ No newline at end of file

From 1a9d2187c50606c0386afe3af232d9c799256da0 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 29 Sep 2021 18:20:39 -0700
Subject: [PATCH 0819/1674] Add DHCPv6 minigraph parsing support (#8870)

---
 src/sonic-config-engine/minigraph.py              | 13 +++++++++++--
 src/sonic-config-engine/tests/t0-sample-graph.xml |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index b422af4e64dc..c5057ebaee4d 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -552,6 +552,12 @@ def parse_dpg(dpg, hname):
                 vdhcpserver_list = vintfdhcpservers.split(';')
                 vlan_attributes['dhcp_servers'] = vdhcpserver_list
 
+            vintf_node = vintf.find(str(QName(ns, "Dhcpv6Relays")))
+            if vintf_node is not None and vintf_node.text is not None:
+                vintfdhcpservers = vintf_node.text
+                vdhcpserver_list = vintfdhcpservers.split(';')
+                vlan_attributes['dhcpv6_servers'] = vdhcpserver_list
+
             vlanmac = vintf.find(str(QName(ns, "MacAddress")))
             if vlanmac is not None and vlanmac.text is not None:
                 vlan_attributes['mac'] = vlanmac.text
@@ -791,6 +797,7 @@ def parse_cpg(cpg, hname, local_devices=[]):
 def parse_meta(meta, hname):
     syslog_servers = []
     dhcp_servers = []
+    dhcpv6_servers = []
     ntp_servers = []
     tacacs_servers = []
     mgmt_routes = []
@@ -835,7 +842,7 @@ def parse_meta(meta, hname):
                     kube_data["enable"] = value
                 elif name == "KubernetesServerIp":
                     kube_data["ip"] = value
-    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
+    return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
 
 
 def parse_linkmeta(meta, hname):
@@ -1117,6 +1124,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     mux_cable_ports = {}
     syslog_servers = []
     dhcp_servers = []
+    dhcpv6_servers = []
     ntp_servers = []
     tacacs_servers = []
     mgmt_routes = []
@@ -1167,7 +1175,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
-                (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data) = parse_meta(child, hostname)
+                (syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data) = parse_meta(child, hostname)
             elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -1491,6 +1499,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key in {device['name'] for device in neighbors.values()} }
     results['SYSLOG_SERVER'] = dict((item, {}) for item in syslog_servers)
     results['DHCP_SERVER'] = dict((item, {}) for item in dhcp_servers)
+    results['DHCPv6_SERVER'] = dict((item, {}) for item in dhcpv6_servers)
     results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
     results['TACPLUS_SERVER'] = dict((item, {'priority': '1', 'tcp_port': '49'}) for item in tacacs_servers)
     results['ACL_TABLE'] = filter_acl_table_bindings(acls, neighbors, pcs, sub_role)
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index 266554dd331b..c06cc708c1ce 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -256,6 +256,7 @@
           <FhrpProtoType i:nil="true"/>
           <Type i:nil="true"/>
           <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
           <VlanID>1000</VlanID>
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>

From b94e7894ccb9fdaded3d66e3fa379644158a3fd1 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 29 Sep 2021 18:23:15 -0700
Subject: [PATCH 0820/1674] [dhcp_relay] Enhance DHCP monitor application to
 support DHCPv6 (#8060) (#8872)

---
 src/dhcpmon/src/dhcp_device.c | 564 ++++++++++++++++++++++++++--------
 src/dhcpmon/src/dhcp_device.h | 112 +++++--
 src/dhcpmon/src/dhcp_devman.c |  34 +-
 src/dhcpmon/src/dhcp_devman.h |  17 +-
 src/dhcpmon/src/dhcp_mon.c    | 106 ++++++-
 src/dhcpmon/src/dhcp_mon.h    |   4 +-
 src/dhcpmon/src/main.c        |  20 +-
 7 files changed, 674 insertions(+), 183 deletions(-)

diff --git a/src/dhcpmon/src/dhcp_device.c b/src/dhcpmon/src/dhcp_device.c
index f45483f8504c..3078295e49a4 100644
--- a/src/dhcpmon/src/dhcp_device.c
+++ b/src/dhcpmon/src/dhcp_device.c
@@ -21,25 +21,51 @@
 #include <libexplain/ioctl.h>
 #include <linux/filter.h>
 #include <netpacket/packet.h>
+#include <sys/types.h>
+#include <ifaddrs.h>
+#include <netinet/ip6.h>
 
 #include "dhcp_device.h"
 
+/** DHCP versions flags */
+static bool dhcpv4_enabled;
+static bool dhcpv6_enabled;
+
 /** Counter print width */
 #define DHCP_COUNTER_WIDTH  9
 
 /** Start of Ether header of a captured frame */
 #define ETHER_START_OFFSET  0
+/** EtherType field offset from Ether header of a captured frame */
+#define ETHER_TYPE_OFFSET (ETHER_START_OFFSET + 12)
 /** Start of IP header of a captured frame */
 #define IP_START_OFFSET (ETHER_START_OFFSET + ETHER_HDR_LEN)
-/** Start of UDP header of a captured frame */
-#define UDP_START_OFFSET (IP_START_OFFSET + sizeof(struct ip))
-/** Start of DHCP header of a captured frame */
-#define DHCP_START_OFFSET (UDP_START_OFFSET + sizeof(struct udphdr))
-/** Start of DHCP Options segment of a captured frame */
-#define DHCP_OPTIONS_HEADER_SIZE 240
+/** Start of UDP header on IPv4 packet of a captured frame */
+#define UDPv4_START_OFFSET (IP_START_OFFSET + sizeof(struct ip))
+/** Start of DHCPv4 header of a captured frame */
+#define DHCPv4_START_OFFSET (UDPv4_START_OFFSET + sizeof(struct udphdr))
+/** Start of DHCPv4 Options segment of a captured frame */
+#define DHCPv4_OPTIONS_HEADER_SIZE 240
 /** Offset of DHCP GIADDR */
 #define DHCP_GIADDR_OFFSET 24
 
+/** IPv6 link-local prefix */
+#define IPV6_LINK_LOCAL_PREFIX 0x80fe
+/** Start of UDP header on IPv6 packet of a captured frame */
+#define UDPv6_START_OFFSET (IP_START_OFFSET + sizeof(struct ip6_hdr))
+/** Start of DHCPv6 header of a captured frame */
+#define DHCPv6_START_OFFSET (UDPv6_START_OFFSET + sizeof(struct udphdr))
+/** Size of 'type' field on DHCPv6 header */
+#define DHCPv6_TYPE_LENGTH 1
+/** Size of DHCPv6 relay message header to first option */
+#define DHCPv6_RELAY_MSG_OPTIONS_OFFSET 34
+/** Size of 'option' field on DHCPv6 header */
+#define DHCPv6_OPTION_LENGTH 2
+/** Size of 'option length' field on DHCPv6 header */
+#define DHCPv6_OPTION_LEN_LENGTH 2
+/** DHCPv6 OPTION_RELAY_MSG */
+#define DHCPv6_OPTION_RELAY_MSG 9
+
 #define OP_LDHA     (BPF_LD  | BPF_H   | BPF_ABS)   /** bpf ldh Abs */
 #define OP_LDHI     (BPF_LD  | BPF_H   | BPF_IND)   /** bpf ldh Ind */
 #define OP_LDB      (BPF_LD  | BPF_B   | BPF_ABS)   /** bpf ldb Abs*/
@@ -49,34 +75,40 @@
 #define OP_JSET     (BPF_JMP | BPF_JSET | BPF_K)    /** bpf jset */
 #define OP_LDXB     (BPF_LDX | BPF_B    | BPF_MSH)  /** bpf ldxb */
 
-/** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
+/** Berkeley Packet Filter program for "udp and (port 546 or port 547 or port 67 or port 68)".
  * This program is obtained using the following command tcpdump:
- * `tcpdump -dd "udp and (port 67 or port 68)"`
+ * `tcpdump -dd "udp and (port 546 or port 547 or port 67 or port 68)"`
  */
 static struct sock_filter dhcp_bpf_code[] = {
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (000) ldh      [12]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (001) jeq      #0x86dd          jt 2	jf 9
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (002) ldb      [20]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 18, .k = 0x00000011}, // (003) jeq      #0x11            jt 4	jf 22
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036}, // (004) ldh      [54]
-    {.code = OP_JEQ,  .jt = 15, .jf = 0,  .k = 0x00000043}, // (005) jeq      #0x43            jt 21	jf 6
-    {.code = OP_JEQ,  .jt = 14, .jf = 0,  .k = 0x00000044}, // (006) jeq      #0x44            jt 21	jf 7
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038}, // (007) ldh      [56]
-    {.code = OP_JEQ,  .jt = 12, .jf = 11, .k = 0x00000043}, // (008) jeq      #0x43            jt 21	jf 20
-    {.code = OP_JEQ,  .jt = 0,  .jf = 12, .k = 0x00000800}, // (009) jeq      #0x800           jt 10	jf 22
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017}, // (010) ldb      [23]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 10, .k = 0x00000011}, // (011) jeq      #0x11            jt 12	jf 22
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014}, // (012) ldh      [20]
-    {.code = OP_JSET, .jt = 8,  .jf = 0,  .k = 0x00001fff}, // (013) jset     #0x1fff          jt 22	jf 14
-    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (014) ldxb     4*([14]&0xf)
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (015) ldh      [x + 14]
-    {.code = OP_JEQ,  .jt = 4,  .jf = 0,  .k = 0x00000043}, // (016) jeq      #0x43            jt 21	jf 17
-    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000044}, // (017) jeq      #0x44            jt 21	jf 18
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010}, // (018) ldh      [x + 16]
-    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043}, // (019) jeq      #0x43            jt 21	jf 20
-    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044}, // (020) jeq      #0x44            jt 21	jf 22
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000}, // (021) ret      #262144
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000}, // (022) ret      #0
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c},   // (000) ldh      [12]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 9,  .k = 0x000086dd},   // (001) jeq      #0x86dd          jt 2	jf 11
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014},   // (002) ldb      [20]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 24, .k = 0x00000011},   // (003) jeq      #0x11            jt 4	jf 28
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036},   // (004) ldh      [54]
+    {.code = OP_JEQ,  .jt = 21, .jf = 0,  .k = 0x00000222},   // (005) jeq      #0x222           jt 27	jf 6
+    {.code = OP_JEQ,  .jt = 20, .jf = 0,  .k = 0x00000223},   // (006) jeq      #0x223           jt 27	jf 7
+    {.code = OP_JEQ,  .jt = 19, .jf = 0,  .k = 0x00000043},   // (007) jeq      #0x43            jt 27	jf 8
+    {.code = OP_JEQ,  .jt = 18, .jf = 0,  .k = 0x00000044},   // (008) jeq      #0x44            jt 27	jf 9
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038},   // (009) ldh      [56]
+    {.code = OP_JEQ,  .jt = 16, .jf = 13, .k = 0x00000222},   // (010) jeq      #0x222           jt 27	jf 24
+    {.code = OP_JEQ,  .jt = 0,  .jf = 16, .k = 0x00000800},   // (011) jeq      #0x800           jt 12	jf 28
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017},   // (012) ldb      [23]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 14, .k = 0x00000011},   // (013) jeq      #0x11            jt 14	jf 28
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014},   // (014) ldh      [20]
+    {.code = OP_JSET, .jt = 12, .jf = 0,  .k = 0x00001fff},   // (015) jset     #0x1fff          jt 28	jf 16
+    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e},   // (016) ldxb     4*([14]&0xf)
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e},   // (017) ldh      [x + 14]
+    {.code = OP_JEQ,  .jt = 8,  .jf = 0,  .k = 0x00000222},   // (018) jeq      #0x222           jt 27	jf 19
+    {.code = OP_JEQ,  .jt = 7,  .jf = 0,  .k = 0x00000223},   // (019) jeq      #0x223           jt 27	jf 20
+    {.code = OP_JEQ,  .jt = 6,  .jf = 0,  .k = 0x00000043},   // (020) jeq      #0x43            jt 27	jf 21
+    {.code = OP_JEQ,  .jt = 5,  .jf = 0,  .k = 0x00000044},   // (021) jeq      #0x44            jt 27	jf 22
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010},   // (022) ldh      [x + 16]
+    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000222},   // (023) jeq      #0x222           jt 27	jf 24
+    {.code = OP_JEQ,  .jt = 2,  .jf = 0,  .k = 0x00000223},   // (024) jeq      #0x223           jt 27	jf 25
+    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043},   // (025) jeq      #0x43            jt 27	jf 26
+    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044},   // (026) jeq      #0x44            jt 27	jf 28
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000},   // (027) ret      #262144
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000},   // (028) ret
 };
 
 /** Filter program socket struct */
@@ -89,16 +121,27 @@ static struct sock_fprog dhcp_sock_bfp = {
  */
 static dhcp_device_context_t aggregate_dev = {0};
 
-/** Monitored DHCP message type */
-static dhcp_message_type_t monitored_msgs[] = {
-    DHCP_MESSAGE_TYPE_DISCOVER,
-    DHCP_MESSAGE_TYPE_OFFER,
-    DHCP_MESSAGE_TYPE_REQUEST,
-    DHCP_MESSAGE_TYPE_ACK
+/** Monitored DHCPv4 message type */
+static dhcpv4_message_type_t v4_monitored_msgs[] = {
+    DHCPv4_MESSAGE_TYPE_DISCOVER,
+    DHCPv4_MESSAGE_TYPE_OFFER,
+    DHCPv4_MESSAGE_TYPE_REQUEST,
+    DHCPv4_MESSAGE_TYPE_ACK
+};
+
+/** Monitored DHCPv6 message type */
+static dhcpv6_message_type_t v6_monitored_msgs[] = {
+    DHCPv6_MESSAGE_TYPE_SOLICIT,
+    DHCPv6_MESSAGE_TYPE_ADVERTISE,
+    DHCPv6_MESSAGE_TYPE_REQUEST,
+    DHCPv6_MESSAGE_TYPE_REPLY
 };
 
-/** Number of monitored DHCP message type */
-static uint8_t monitored_msg_sz = sizeof(monitored_msgs) / sizeof(*monitored_msgs);
+/** Number of monitored DHCPv4 message type */
+static uint8_t v4_monitored_msg_sz = sizeof(v4_monitored_msgs) / sizeof(*v4_monitored_msgs);
+
+/** Number of monitored DHCPv6 message type */
+static uint8_t v6_monitored_msg_sz = sizeof(v6_monitored_msgs) / sizeof(*v6_monitored_msgs);
 
 /**
  * @code handle_dhcp_option_53(context, dhcp_option, dir, iphdr, dhcphdr);
@@ -123,27 +166,27 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     switch (dhcp_option[2])
     {
     // DHCP messages send by client
-    case DHCP_MESSAGE_TYPE_DISCOVER:
-    case DHCP_MESSAGE_TYPE_REQUEST:
-    case DHCP_MESSAGE_TYPE_DECLINE:
-    case DHCP_MESSAGE_TYPE_RELEASE:
-    case DHCP_MESSAGE_TYPE_INFORM:
+    case DHCPv4_MESSAGE_TYPE_DISCOVER:
+    case DHCPv4_MESSAGE_TYPE_REQUEST:
+    case DHCPv4_MESSAGE_TYPE_DECLINE:
+    case DHCPv4_MESSAGE_TYPE_RELEASE:
+    case DHCPv4_MESSAGE_TYPE_INFORM:
         giaddr = ntohl(dhcphdr[DHCP_GIADDR_OFFSET] << 24 | dhcphdr[DHCP_GIADDR_OFFSET + 1] << 16 |
                        dhcphdr[DHCP_GIADDR_OFFSET + 2] << 8 | dhcphdr[DHCP_GIADDR_OFFSET + 3]);
         if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
             (!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) {
-            context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
-            aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
     // DHCP messages send by server
-    case DHCP_MESSAGE_TYPE_OFFER:
-    case DHCP_MESSAGE_TYPE_ACK:
-    case DHCP_MESSAGE_TYPE_NAK:
+    case DHCPv4_MESSAGE_TYPE_OFFER:
+    case DHCPv4_MESSAGE_TYPE_ACK:
+    case DHCPv4_MESSAGE_TYPE_NAK:
         if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
             (!context->is_uplink && dir == DHCP_TX)) {
-            context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
-            aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
     default:
@@ -152,6 +195,43 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     }
 }
 
+/**
+ * @code handle_dhcpv6_option(context, dhcp_option, dir);
+ *
+ * @brief handle the logic related to DHCPv6 option
+ *
+ * @param context       Device (interface) context
+ * @param dhcp_option   pointer to DHCP option buffer space
+ * @param dir           packet direction
+ *
+ * @return none
+ */
+static void handle_dhcpv6_option(dhcp_device_context_t *context,
+                                  const u_char dhcp_option,
+                                  dhcp_packet_direction_t dir)
+{
+    switch (dhcp_option)
+    {
+    case DHCPv6_MESSAGE_TYPE_SOLICIT:
+    case DHCPv6_MESSAGE_TYPE_REQUEST:
+    case DHCPv6_MESSAGE_TYPE_CONFIRM:
+    case DHCPv6_MESSAGE_TYPE_RENEW:
+    case DHCPv6_MESSAGE_TYPE_REBIND:
+    case DHCPv6_MESSAGE_TYPE_RELEASE:
+    case DHCPv6_MESSAGE_TYPE_DECLINE:
+    case DHCPv6_MESSAGE_TYPE_ADVERTISE:
+    case DHCPv6_MESSAGE_TYPE_REPLY:
+    case DHCPv6_MESSAGE_TYPE_RECONFIGURE:
+    case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
+        context->counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
+        aggregate_dev.counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
+        break;
+    default:
+        syslog(LOG_WARNING, "handle_dhcpv6_option(%s): Unknown DHCPv6 option type %d", context->intf, dhcp_option);
+        break;
+    }
+}
+
 /**
  * @code read_callback(fd, event, arg);
  *
@@ -171,16 +251,29 @@ static void read_callback(int fd, short event, void *arg)
     while ((event == EV_READ) &&
            ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0)) {
         struct ether_header *ethhdr = (struct ether_header*) context->buffer;
-        struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
-        struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
-        uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
-        int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
-
-        if ((buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
-            (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) {
-            int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
-                          ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
-            int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
+        struct ip *iphdr;
+        struct ip6_hdr *ipv6hdr;
+        struct udphdr *udp;
+        uint8_t *dhcphdr;
+        int dhcp_option_offset;
+
+        bool is_ipv4 = (ntohs(ethhdr->ether_type) == ETHERTYPE_IP);
+        if (is_ipv4) {
+            iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
+            udp = (struct udphdr*) (context->buffer + UDPv4_START_OFFSET);
+            dhcphdr = context->buffer + DHCPv4_START_OFFSET;
+            dhcp_option_offset = DHCPv4_START_OFFSET + DHCPv4_OPTIONS_HEADER_SIZE;
+        } else {
+            ipv6hdr = (struct ip6_hdr*) (context->buffer + IP_START_OFFSET);
+            udp = (struct udphdr*) (context->buffer + UDPv6_START_OFFSET);
+            dhcphdr = context->buffer + DHCPv6_START_OFFSET;
+            dhcp_option_offset = DHCPv6_START_OFFSET;
+        }
+        if (is_ipv4 && dhcpv4_enabled && (buffer_sz > UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) &&
+            (ntohs(udp->len) > DHCPv4_OPTIONS_HEADER_SIZE)) {
+            int dhcp_sz = ntohs(udp->len) < buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr) ?
+                          ntohs(udp->len) : buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr);
+            int dhcp_option_sz = dhcp_sz - DHCPv4_OPTIONS_HEADER_SIZE;
             const u_char *dhcp_option = context->buffer + dhcp_option_offset;
             dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
                                            ethhdr->ether_shost[1] == context->mac[1] &&
@@ -214,6 +307,35 @@ static void read_callback(int fd, short event, void *arg)
                     offset += dhcp_option[offset + 1] + 2;
                 }
             }
+        }
+        else if (!is_ipv4 && dhcpv6_enabled && (buffer_sz > UDPv6_START_OFFSET + sizeof(struct udphdr) + DHCPv6_TYPE_LENGTH)) {
+            const u_char* dhcp_option = context->buffer + dhcp_option_offset;
+            dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
+                                           ethhdr->ether_shost[1] == context->mac[1] &&
+                                           ethhdr->ether_shost[2] == context->mac[2] &&
+                                           ethhdr->ether_shost[3] == context->mac[3] &&
+                                           ethhdr->ether_shost[4] == context->mac[4] &&
+                                           ethhdr->ether_shost[5] == context->mac[5]) ?
+                                           DHCP_TX : DHCP_RX;
+            int offset = 0;
+            uint16_t option = 0;
+            // Get to inner DHCP header from encapsulated RELAY_FORWARD or RELAY_REPLY header
+            while (dhcp_option[offset] == DHCPv6_MESSAGE_TYPE_RELAY_FORWARD || dhcp_option[offset] == DHCPv6_MESSAGE_TYPE_RELAY_REPLY)
+            {
+                // Get to DHCPv6_OPTION_RELAY_MSG from all options
+                offset += DHCPv6_RELAY_MSG_OPTIONS_OFFSET;
+                option = htons(*((uint16_t*)(&(dhcp_option[offset]))));
+
+                while (option != DHCPv6_OPTION_RELAY_MSG)
+                {
+                    offset += DHCPv6_OPTION_LENGTH;
+                    // Add to offset the option length and get the next option ID
+                    offset += htons(*((uint16_t*)(&(dhcp_option[offset]))));
+                    option = htons(*((uint16_t*)(&(dhcp_option[offset]))));
+                }
+                offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH;
+            }
+            handle_dhcpv6_option(context, dhcp_option[offset], dir);
         } else {
             syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
                    context->intf, buffer_sz);
@@ -222,29 +344,54 @@ static void read_callback(int fd, short event, void *arg)
 }
 
 /**
- * @code dhcp_device_is_dhcp_inactive(counters);
+ * @code dhcp_device_is_dhcp_inactive(v4counters, v6counters, type);
  *
  * @brief Check if there were no DHCP activity
  *
- * @param counters  current/snapshot counter
+ * @param v4counters  current/snapshot v4counter
+ *
+ * @param v6counters  current/snapshot v6counter
+ *
+ * @param type        DHCP type
  *
  * @return true if there were no DHCP activity, false otherwise
  */
-static bool dhcp_device_is_dhcp_inactive(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
+static bool dhcp_device_is_dhcp_inactive(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
+                                         uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
+                                         dhcp_type_t type)
 {
-    uint64_t *rx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
-    uint64_t *rx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
-
     bool rv = true;
-    for (uint8_t i = 0; (i < monitored_msg_sz) && rv; i++) {
-        rv = rx_counters[monitored_msgs[i]] == rx_counter_snapshot[monitored_msgs[i]];
+    uint64_t *rx_counters;
+    uint64_t *rx_counter_snapshot;
+
+    switch (type)
+    {
+    case DHCPv4_TYPE:
+        rx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
+        rx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
+        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && rv; i++) {
+            rv = rx_counters[v4_monitored_msgs[i]] == rx_counter_snapshot[v4_monitored_msgs[i]];
+        }
+        break;
+
+    case DHCPv6_TYPE:
+        rx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
+        rx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
+        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && rv; i++) {
+            rv = rx_counters[v6_monitored_msgs[i]] == rx_counter_snapshot[v6_monitored_msgs[i]];
+        }
+        break;
+
+    default:
+        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+        break;
     }
 
     return rv;
 }
 
 /**
- * @code dhcp_device_is_dhcp_msg_unhealthy(type, counters);
+ * @code dhcp_device_is_dhcpv4_msg_unhealthy(type, counters);
  *
  * @brief Check if DHCP relay is functioning properly for message of type 'type'.
  *        For every rx of message 'type', there should be increment of the same message type.
@@ -254,34 +401,76 @@ static bool dhcp_device_is_dhcp_inactive(uint64_t counters[][DHCP_DIR_COUNT][DHC
  *
  * @return true if DHCP message 'type' is transmitted,false otherwise
  */
-static bool dhcp_device_is_dhcp_msg_unhealthy(dhcp_message_type_t type,
-                                              uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
+static bool dhcp_device_is_dhcpv4_msg_unhealthy(dhcpv4_message_type_t type,
+                                                uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT])
 {
     // check if DHCP message 'type' is being relayed
-    return ((counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
-            (counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
+    return ((v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
+            (v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
 }
 
 /**
- * @code dhcp_device_check_positive_health(counters, counters_snapshot);
+ * @code dhcp_device_is_dhcpv6_msg_unhealthy(type, counters);
  *
- * @brief Check if DHCP relay is functioning properly for monitored messages (Discover, Offer, Request, ACK.)
- *        For every rx of monitored messages, there should be increment of the same message type.
+ * @brief Check if DHCP relay is functioning properly for message of type 'type'.
+ *        For every rx of message 'type', there should be increment of the same message type.
  *
+ * @param type      DHCP message type
  * @param counters  current/snapshot counter
  *
+ * @return true if DHCP message 'type' is transmitted,false otherwise
+ */
+static bool dhcp_device_is_dhcpv6_msg_unhealthy(dhcpv6_message_type_t type,
+                                                uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT])
+{
+    // check if DHCP message 'type' is being relayed
+    return ((v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
+            (v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
+}
+
+/**
+ * @code dhcp_device_check_positive_health(v4counters, v6counters, type);
+ *
+ * @brief Check if DHCPv4/6 relay is functioning properly for monitored messages.
+ *        DHCPv4 (Discover, Offer, Request, ACK.) and DHCPv6 (Solicit, Advertise, Request, Reply).
+ *        For every rx of monitored messages, there should be increment of the same message type.
+ *
+ * @param v4counters  current/snapshot counter
+ *
+ * @param v6counters  current/snapshot counter
+ *
+ * @param type        DHCP type
+ *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
+static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
+                                                           uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
+                                                           dhcp_type_t type)
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
     bool is_dhcp_unhealthy = false;
-    for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-        is_dhcp_unhealthy = dhcp_device_is_dhcp_msg_unhealthy(monitored_msgs[i], counters);
+
+    switch (type)
+    {
+    case DHCPv4_TYPE:
+        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+            is_dhcp_unhealthy = dhcp_device_is_dhcpv4_msg_unhealthy(v4_monitored_msgs[i], v4counters);
+        }
+        break;
+
+    case DHCPv6_TYPE:
+        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+            is_dhcp_unhealthy = dhcp_device_is_dhcpv6_msg_unhealthy(v6_monitored_msgs[i], v6counters);
+        }
+        break;
+
+    default:
+        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+            break;
     }
 
-    // if we have rx DORA then we should have corresponding tx DORA (DORA being relayed)
+    // if we have rx DORA/SARR then we should have corresponding tx DORA/SARR (DORA/SARR being relayed)
     if (is_dhcp_unhealthy) {
         rv = DHCP_MON_STATUS_UNHEALTHY;
     }
@@ -290,27 +479,47 @@ static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t counters[][D
 }
 
 /**
- * @code dhcp_device_check_negative_health(counters);
+ * @code dhcp_device_check_negative_health(v4counters, v6counters, type);
  *
  * @brief Check that DHCP relayed messages are not being transmitted out of this interface/dev
  *        using its counters. The interface is negatively healthy if there are not DHCP message
  *        travelling through it.
  *
- * @param counters              recent interface counter
- * @param counters_snapshot     snapshot counters
+ * @param v4counters            current/snapshot counter
+ * @param v6counters            current/snapshot counter
+ * @param type                  DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
+static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
+                                                           uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
+                                                           dhcp_type_t type)
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
+    bool is_dhcp_unhealthy = false;
 
-    uint64_t *tx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
-    uint64_t *tx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
+    uint64_t *tx_counters;
+    uint64_t *tx_counter_snapshot;
 
-    bool is_dhcp_unhealthy = false;
-    for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-        is_dhcp_unhealthy = tx_counters[monitored_msgs[i]] > tx_counter_snapshot[monitored_msgs[i]];
+    switch (type)
+    {
+    case DHCPv4_TYPE:
+        tx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
+        tx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
+        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+            is_dhcp_unhealthy = tx_counters[v4_monitored_msgs[i]] > tx_counter_snapshot[v4_monitored_msgs[i]];
+        }
+        break;
+    case DHCPv6_TYPE:
+        tx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
+        tx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
+        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+            is_dhcp_unhealthy = tx_counters[v6_monitored_msgs[i]] > tx_counter_snapshot[v6_monitored_msgs[i]];
+        }
+        break;
+    default:
+        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+            break;
     }
 
     // for negative validation, return unhealthy if DHCP packet are being
@@ -323,7 +532,7 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t counters[][D
 }
 
 /**
- * @code dhcp_device_check_health(check_type, counters, counters_snapshot);
+ * @code dhcp_device_check_health(check_type, v4counters, v6counters, type);
  *
  * @brief Check that DHCP relay is functioning properly given a check type. Positive check
  *        indicates for every rx of DHCP message of type 'type', there would increment of
@@ -332,59 +541,80 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t counters[][D
  *        considered unhealthy.
  *
  * @param check_type    type of health check
- * @param counters      current/snapshot counter
+ * @param v4counters    current/snapshot counters
+ * @param v6counters    current/snapshot counters
+ * @param type          DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
 static dhcp_mon_status_t dhcp_device_check_health(dhcp_mon_check_t check_type,
-                                                  uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
+                                                  uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
+                                                  uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
+                                                  dhcp_type_t type)
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
-    if (dhcp_device_is_dhcp_inactive(aggregate_dev.counters)) {
+    if (dhcp_device_is_dhcp_inactive(aggregate_dev.counters.v4counters, aggregate_dev.counters.v6counters, type)) {
         rv = DHCP_MON_STATUS_INDETERMINATE;
     } else if (check_type == DHCP_MON_CHECK_POSITIVE) {
-        rv = dhcp_device_check_positive_health(counters);
+        rv = dhcp_device_check_positive_health(v4counters, v6counters, type);
     } else if (check_type == DHCP_MON_CHECK_NEGATIVE) {
-        rv = dhcp_device_check_negative_health(counters);
+        rv = dhcp_device_check_negative_health(v4counters, v6counters, type);
     }
 
     return rv;
 }
 
 /**
- * @code dhcp_print_counters(vlan_intf, type, counters);
+ * @code dhcp_print_counters(vlan_intf, type, v4counters, v6counters);
  *
  * @brief prints DHCP counters to sylsog.
  *
- * @param vlan_intf vlan interface name
- * @param type      counter type
- * @param counters  interface counter
+ * @param vlan_intf     vlan interface name
+ * @param type          counter type
+ * @param v4counters    interface counter
+ * @param v6counters    interface counter
  *
  * @return none
  */
 static void dhcp_print_counters(const char *vlan_intf,
                                 dhcp_counters_type_t type,
-                                uint64_t counters[][DHCP_MESSAGE_TYPE_COUNT])
+                                uint64_t v4counters[][DHCPv4_MESSAGE_TYPE_COUNT],
+                                uint64_t v6counters[][DHCPv6_MESSAGE_TYPE_COUNT])
 {
-    static const char *counter_desc[DHCP_COUNTERS_COUNT] = {
+    static const char *v4_counter_desc[DHCP_COUNTERS_COUNT] = {
+        [DHCP_COUNTERS_CURRENT] = " Current",
+        [DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
+    };
+    static const char *v6_counter_desc[DHCP_COUNTERS_COUNT] = {
         [DHCP_COUNTERS_CURRENT] = " Current",
         [DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
     };
 
     syslog(
         LOG_NOTICE,
-        "[%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n",
+        "DHCPv4 [%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n\
+         DHCPv6 [%*s-%*s rx/tx] Solicit: %*lu/%*lu, Advertise: %*lu/%*lu, Request: %*lu/%*lu, Reply: %*lu/%*lu\n",
+        IF_NAMESIZE, vlan_intf,
+        (int) strlen(v4_counter_desc[type]), v4_counter_desc[type],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_DISCOVER],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_DISCOVER],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_OFFER],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_OFFER],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_ACK],
+        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_ACK],
         IF_NAMESIZE, vlan_intf,
-        (int) strlen(counter_desc[type]), counter_desc[type],
-        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_DISCOVER],
-        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_DISCOVER],
-        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_OFFER],
-        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_OFFER],
-        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_ACK],
-        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_ACK]
+        (int) strlen(v6_counter_desc[type]), v6_counter_desc[type],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_SOLICIT],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_SOLICIT],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REPLY],
+        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REPLY]
     );
 }
 
@@ -454,12 +684,12 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
         strncpy(ifr.ifr_name, context->intf, sizeof(ifr.ifr_name) - 1);
         ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
-        // Get network address
+        // Get v4 network address
         if (ioctl(fd, SIOCGIFADDR, &ifr) == -1) {
             syslog(LOG_ALERT, "ioctl: %s", explain_ioctl(fd, SIOCGIFADDR, &ifr));
             break;
         }
-        context->ip = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr;
+        context->ipv4 = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr;
 
         // Get mac address
         if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
@@ -470,6 +700,30 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
 
         close(fd);
 
+        // Get v6 network address
+        memset(&context->ipv6, 0, sizeof(context->ipv6));
+        struct ifaddrs *ifa, *ifa_tmp;
+
+        if (getifaddrs(&ifa) == -1) {
+            syslog(LOG_ALERT, "getifaddrs failed");
+            break;
+        }
+
+        ifa_tmp = ifa;
+        while (ifa_tmp) {
+            // Check if current interface has a valid IPv6 address (not link local address)
+            if ((strncmp(ifa_tmp->ifa_name, context->intf, sizeof(context->intf)) == 0) &&
+                (ifa_tmp->ifa_addr) &&
+                (ifa_tmp->ifa_addr->sa_family == AF_INET6) &&
+                (((struct sockaddr_in6*)(ifa_tmp->ifa_addr))->sin6_addr.__in6_u.__u6_addr16[0] != IPV6_LINK_LOCAL_PREFIX)) {
+
+                struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+                memcpy(&context->ipv6, &in6->sin6_addr, sizeof(context->ipv6));
+            }
+            ifa_tmp = ifa_tmp->ifa_next;
+        }
+        freeifaddrs(ifa);
+
         rv = 0;
     } while (0);
 
@@ -477,20 +731,41 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
 }
 
 /**
- * @code dhcp_device_get_ip(context);
+ * @code dhcp_device_get_ipv4(context);
  *
  * @brief Accessor method
  *
  * @param context       pointer to device (interface) context
  *
- * @return interface IP
+ * @return interface IPv4
  */
-int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip)
+int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip)
 {
     int rv = -1;
 
     if (context != NULL && ip != NULL) {
-        *ip = context->ip;
+        *ip = context->ipv4;
+        rv = 0;
+    }
+
+    return rv;
+}
+
+/**
+ * @code dhcp_device_get_ipv6(context);
+ *
+ * @brief Accessor method
+ *
+ * @param context       pointer to device (interface) context
+ *
+ * @return interface IPv6
+ */
+int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip)
+{
+    int rv = -1;
+
+    if (context != NULL && ip != NULL) {
+        *ip = context->ipv6;
         rv = 0;
     }
 
@@ -528,7 +803,8 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 
                 dev_context->is_uplink = is_uplink;
 
-                memset(dev_context->counters, 0, sizeof(dev_context->counters));
+                memset(dev_context->counters.v4counters, 0, sizeof(dev_context->counters.v4counters));
+                memset(dev_context->counters.v6counters, 0, sizeof(dev_context->counters.v6counters));
 
                 *context = dev_context;
                 rv = 0;
@@ -543,14 +819,15 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 }
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip);
  *
  * @brief starts packet capture on this interface
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t giaddr_ip)
+                              in_addr_t giaddr_ip,
+                              struct in6_addr v6_vlan_ip)
 {
     int rv = -1;
 
@@ -560,12 +837,20 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
             break;
         }
 
-        if (snaplen < UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) {
-            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCP options", context->intf);
+        // snaplen check for DHCPv4 size
+        if (dhcpv4_enabled && snaplen < UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) {
+            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv4 options", context->intf);
+            break;
+        }
+
+        // snaplen check for DHCPv6 size - DHCPv6 message type is the first byte of the udp payload
+        if (dhcpv6_enabled && snaplen < DHCPv6_START_OFFSET + 1) {
+            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv6 option", context->intf);
             break;
         }
 
         context->giaddr_ip = giaddr_ip;
+        context->v6_vlan_ip = v6_vlan_ip;
 
         context->buffer = (uint8_t *) malloc(snaplen);
         if (context->buffer == NULL) {
@@ -603,17 +888,17 @@ void dhcp_device_shutdown(dhcp_device_context_t *context)
 }
 
 /**
- * @code dhcp_device_get_status(check_type, context);
+ * @code dhcp_device_get_status(check_type, context, type);
  *
  * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
  *        status
  */
-dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
+dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type)
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
     if (context != NULL) {
-        rv = dhcp_device_check_health(check_type, context->counters);
+        rv = dhcp_device_check_health(check_type, context->counters.v4counters, context->counters.v6counters, type);
     }
 
     return rv;
@@ -627,9 +912,17 @@ dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_devic
 void dhcp_device_update_snapshot(dhcp_device_context_t *context)
 {
     if (context != NULL) {
-        memcpy(context->counters[DHCP_COUNTERS_SNAPSHOT],
-               context->counters[DHCP_COUNTERS_CURRENT],
-               sizeof(context->counters[DHCP_COUNTERS_SNAPSHOT]));
+        if (dhcpv4_enabled) {
+            memcpy(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT],
+                context->counters.v4counters[DHCP_COUNTERS_CURRENT],
+                sizeof(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT]));
+        }
+
+        if (dhcpv6_enabled) {
+            memcpy(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT],
+                context->counters.v6counters[DHCP_COUNTERS_CURRENT],
+                sizeof(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT]));
+        }
     }
 }
 
@@ -641,6 +934,17 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context)
 void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type)
 {
     if (context != NULL) {
-        dhcp_print_counters(context->intf, type, context->counters[type]);
+        dhcp_print_counters(context->intf, type, context->counters.v4counters[type], context->counters.v6counters[type]);
     }
 }
+
+/**
+ * @code dhcp_device_active_types(dhcpv4, dhcpv6);
+ *
+ * @brief update local variables with active protocols
+ */
+void dhcp_device_active_types(bool dhcpv4, bool dhcpv6)
+{
+    dhcpv4_enabled = dhcpv4;
+    dhcpv6_enabled = dhcpv6;
+}
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index aa686f4e2718..f8aa874bfcce 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -18,21 +18,43 @@
 
 
 /**
- * DHCP message types
+ * DHCPv4 message types
  **/
 typedef enum
 {
-    DHCP_MESSAGE_TYPE_DISCOVER = 1,
-    DHCP_MESSAGE_TYPE_OFFER    = 2,
-    DHCP_MESSAGE_TYPE_REQUEST  = 3,
-    DHCP_MESSAGE_TYPE_DECLINE  = 4,
-    DHCP_MESSAGE_TYPE_ACK      = 5,
-    DHCP_MESSAGE_TYPE_NAK      = 6,
-    DHCP_MESSAGE_TYPE_RELEASE  = 7,
-    DHCP_MESSAGE_TYPE_INFORM   = 8,
-
-    DHCP_MESSAGE_TYPE_COUNT
-} dhcp_message_type_t;
+    DHCPv4_MESSAGE_TYPE_DISCOVER = 1,
+    DHCPv4_MESSAGE_TYPE_OFFER    = 2,
+    DHCPv4_MESSAGE_TYPE_REQUEST  = 3,
+    DHCPv4_MESSAGE_TYPE_DECLINE  = 4,
+    DHCPv4_MESSAGE_TYPE_ACK      = 5,
+    DHCPv4_MESSAGE_TYPE_NAK      = 6,
+    DHCPv4_MESSAGE_TYPE_RELEASE  = 7,
+    DHCPv4_MESSAGE_TYPE_INFORM   = 8,
+
+    DHCPv4_MESSAGE_TYPE_COUNT
+} dhcpv4_message_type_t;
+
+/**
+ * DHCPv6 message types
+ **/
+typedef enum
+{
+    DHCPv6_MESSAGE_TYPE_SOLICIT             = 1,
+    DHCPv6_MESSAGE_TYPE_ADVERTISE           = 2,
+    DHCPv6_MESSAGE_TYPE_REQUEST             = 3,
+    DHCPv6_MESSAGE_TYPE_CONFIRM             = 4,
+    DHCPv6_MESSAGE_TYPE_RENEW               = 5,
+    DHCPv6_MESSAGE_TYPE_REBIND              = 6,
+    DHCPv6_MESSAGE_TYPE_REPLY               = 7,
+    DHCPv6_MESSAGE_TYPE_RELEASE             = 8,
+    DHCPv6_MESSAGE_TYPE_DECLINE             = 9,
+    DHCPv6_MESSAGE_TYPE_RECONFIGURE         = 10,
+    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
+    DHCPv6_MESSAGE_TYPE_RELAY_FORWARD       = 12,
+    DHCPv6_MESSAGE_TYPE_RELAY_REPLY         = 13,
+
+    DHCPv6_MESSAGE_TYPE_COUNT
+} dhcpv6_message_type_t;
 
 /** packet direction */
 typedef enum
@@ -60,6 +82,13 @@ typedef enum
     DHCP_MON_STATUS_INDETERMINATE,  /** DHCP relay health could not be determined */
 } dhcp_mon_status_t;
 
+/** dhcp type */
+typedef enum
+{
+    DHCPv4_TYPE,
+    DHCPv6_TYPE,
+} dhcp_type_t;
+
 /** dhcp check type */
 typedef enum
 {
@@ -67,19 +96,28 @@ typedef enum
     DHCP_MON_CHECK_POSITIVE,    /** Validate that received DORA packets are relayed */
 } dhcp_mon_check_t;
 
+typedef struct
+{
+    uint64_t v4counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT];
+                                    /** current/snapshot counters of DHCPv4 packets */
+    uint64_t v6counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT];
+                                    /** current/snapshot counters of DHCPv6 packets */
+} counters_t;
+
 /** DHCP device (interface) context */
 typedef struct
 {
     int sock;                       /** Raw socket associated with this device/interface */
-    in_addr_t ip;                   /** network address of this device (interface) */
+    in_addr_t ipv4;                 /** ipv4 network address of this device (interface) */
+    struct in6_addr ipv6;           /** ipv6 network address of this device (interface) */
     uint8_t mac[ETHER_ADDR_LEN];    /** hardware address of this device (interface) */
-    in_addr_t giaddr_ip;            /** Gateway IP address */
+    in_addr_t giaddr_ip;            /** Gateway IPv4 address */
+    struct in6_addr v6_vlan_ip;     /** Vlan IPv6 address */
     uint8_t is_uplink;              /** north interface? */
     char intf[IF_NAMESIZE];         /** device (interface) name */
     uint8_t *buffer;                /** buffer used to read socket data */
     size_t snaplen;                 /** snap length or buffer size */
-    uint64_t counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT];
-                                    /** current/snapshot counters of DHCP packets */
+    counters_t counters;            /** counters for DHCPv4/6 packets */
 } dhcp_device_context_t;
 
 /**
@@ -94,16 +132,28 @@ typedef struct
 int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context);
 
 /**
- * @code dhcp_device_get_ip(context, ip);
+ * @code dhcp_device_get_ipv4(context, ip);
+ *
+ * @brief Accessor method
+ *
+ * @param context       pointer to device (interface) context
+ * @param ip(out)       pointer to device IPv4
+ *
+ * @return 0 on success, otherwise for failure
+ */
+int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip);
+
+/**
+ * @code dhcp_device_get_ipv6(context, ip);
  *
  * @brief Accessor method
  *
  * @param context       pointer to device (interface) context
- * @param ip(out)       pointer to device IP
+ * @param ip(out)       pointer to device IPv6
  *
  * @return 0 on success, otherwise for failure
  */
-int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip);
+int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip);
 
 /**
  * @code dhcp_device_get_aggregate_context();
@@ -130,7 +180,7 @@ int dhcp_device_init(dhcp_device_context_t **context,
                      uint8_t is_uplink);
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip);
  *
  * @brief starts packet capture on this interface
  *
@@ -138,13 +188,15 @@ int dhcp_device_init(dhcp_device_context_t **context,
  * @param snaplen           length of packet capture
  * @param base              pointer to libevent base
  * @param giaddr_ip         gateway IP address
+ * @param v6_vlan_ip        vlan IPv6 address
  *
  * @return 0 on success, otherwise for failure
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t giaddr_ip);
+                              in_addr_t giaddr_ip,
+                              struct in6_addr v6_vlan_ip);
 
 /**
  * @code dhcp_device_shutdown(context);
@@ -158,17 +210,18 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
 void dhcp_device_shutdown(dhcp_device_context_t *context);
 
 /**
- * @code dhcp_device_get_status(check_type, context);
+ * @code dhcp_device_get_status(check_type, context, type);
  *
  * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
  *        status
  *
  * @param check_type        Type of validation
  * @param context           Device (interface) context
+ * @param type              DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
+dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type);
 
 /**
  * @code dhcp_device_update_snapshot(context);
@@ -185,10 +238,21 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context);
  * @brief prints status counters to syslog. If context is null, it will print aggregate status
  *
  * @param context       Device (interface) context
- * @param counters_type Counter type to be printed
+ * @param type          Counter type to be printed
  *
  * @return none
  */
 void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
 
+/**
+ * @code dhcp_device_active_types(dhcpv4, dhcpv6);
+ *
+ * @brief update local variables with active protocols
+ *
+ * @param dhcpv4       DHCPv4 enable flag
+ * @param dhcpv6       DHCPv6 enable flag
+ *
+ * @return none
+ */
+void dhcp_device_active_types(bool dhcpv4, bool dhcpv6);
 #endif /* DHCP_DEVICE_H_ */
diff --git a/src/dhcpmon/src/dhcp_devman.c b/src/dhcpmon/src/dhcp_devman.c
index 65484798dbd6..e7a25322207f 100644
--- a/src/dhcpmon/src/dhcp_devman.c
+++ b/src/dhcpmon/src/dhcp_devman.c
@@ -9,6 +9,8 @@
 #include <syslog.h>
 #include <sys/queue.h>
 #include <stdlib.h>
+#include <arpa/inet.h>
+#include <stdbool.h>
 
 #include "dhcp_devman.h"
 
@@ -35,7 +37,8 @@ static uint32_t dhcp_num_mgmt_intf = 0;
 
 /** On Device  vlan interface IP address corresponding vlan downlink IP
  *  This IP is used to filter Offer/Ack packet coming from DHCP server */
-static in_addr_t vlan_ip = 0;
+static in_addr_t v4_vlan_ip = 0;
+static struct in6_addr v6_vlan_ip = {0};
 
 /* Device loopback interface ip, which will be used as the giaddr in dual tor setup. */
 static in_addr_t loopback_ip = 0;
@@ -136,7 +139,8 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
 
         rv = dhcp_device_init(&dev->dev_context, dev->name, dev->is_uplink);
         if (rv == 0 && intf_type == 'd') {
-            rv = dhcp_device_get_ip(dev->dev_context, &vlan_ip);
+            rv = dhcp_device_get_ipv4(dev->dev_context, &v4_vlan_ip);
+            rv = dhcp_device_get_ipv6(dev->dev_context, &v6_vlan_ip);
 
             dhcp_device_context_t *agg_dev = dhcp_device_get_aggregate_context();
 
@@ -174,7 +178,7 @@ int dhcp_devman_setup_dual_tor_mode(const char *name)
     }
 
     if (initialize_intf_mac_and_ip_addr(&loopback_intf_context) == 0 &&
-        dhcp_device_get_ip(&loopback_intf_context, &loopback_ip) == 0) {
+        dhcp_device_get_ipv4(&loopback_intf_context, &loopback_ip) == 0) {
             dual_tor_mode = 1;
     } else {
         syslog(LOG_ALERT, "failed to retrieve ip addr for loopback interface (%s)", name);
@@ -197,11 +201,13 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 
     if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) {
         LIST_FOREACH(int_ptr, &intfs, entry) {
-            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
+            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : v4_vlan_ip, v6_vlan_ip);
             if (rv == 0) {
+                char ipv6_addr[INET6_ADDRSTRLEN];
+                inet_ntop(AF_INET6, &int_ptr->dev_context->ipv6, ipv6_addr, sizeof(ipv6_addr));
                 syslog(LOG_INFO,
-                       "Capturing DHCP packets on interface %s, ip: 0x%08x, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
-                       int_ptr->name, int_ptr->dev_context->ip, int_ptr->dev_context->mac[0],
+                       "Capturing DHCP packets on interface %s, ipv4: 0x%08x, ipv6: %s, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
+                       int_ptr->name, int_ptr->dev_context->ipv4, ipv6_addr, int_ptr->dev_context->mac[0],
                        int_ptr->dev_context->mac[1], int_ptr->dev_context->mac[2], int_ptr->dev_context->mac[3],
                        int_ptr->dev_context->mac[4], int_ptr->dev_context->mac[5]);
             }
@@ -219,13 +225,13 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 }
 
 /**
- * @code dhcp_devman_get_status(check_type, context);
+ * @code dhcp_devman_get_status(check_type, context, type);
  *
  * @brief collects DHCP relay status info.
  */
-dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
+dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type)
 {
-    return dhcp_device_get_status(check_type, context);
+    return dhcp_device_get_status(check_type, context, type);
 }
 
 /**
@@ -267,3 +273,13 @@ void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type
         dhcp_device_print_status(context, type);
     }
 }
+
+/**
+ * @code dhcp_devman_active_types(dhcpv4, dhcpv6);
+ *
+ * @brief update local variables with active protocols
+ */
+void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6)
+{
+    dhcp_device_active_types(dhcpv4, dhcpv6);
+}
diff --git a/src/dhcpmon/src/dhcp_devman.h b/src/dhcpmon/src/dhcp_devman.h
index 948e79cde4f4..6e30c654f69e 100644
--- a/src/dhcpmon/src/dhcp_devman.h
+++ b/src/dhcpmon/src/dhcp_devman.h
@@ -87,16 +87,17 @@ int dhcp_devman_setup_dual_tor_mode(const char *name);
 int dhcp_devman_start_capture(size_t snaplen, struct event_base *base);
 
 /**
- * @code dhcp_devman_get_status(check_type, context);
+ * @code dhcp_devman_get_status(check_type, context, type);
  *
  * @brief collects DHCP relay status info.
  *
  * @param check_type        Type of validation
  * @param context           pointer to device (interface) context
+ * @param type              DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
+dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type);
 
 /**
  * @code dhcp_devman_update_snapshot(context);
@@ -119,4 +120,16 @@ void dhcp_devman_update_snapshot(dhcp_device_context_t *context);
  */
 void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
 
+/**
+ * @code dhcp_devman_active_types(dhcpv4, dhcpv6);
+ *
+ * @brief update local variables with active protocols
+ *
+ * @param dhcpv4       flag indicating dhcpv4 is enabled
+ * @param dhcpv6       flag indicating dhcpv6 is enabled
+ *
+ * @return none
+ */
+void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6);
+
 #endif /* DHCP_DEVMAN_H_ */
diff --git a/src/dhcpmon/src/dhcp_mon.c b/src/dhcpmon/src/dhcp_mon.c
index 74d9869741d1..2777b6484082 100644
--- a/src/dhcpmon/src/dhcp_mon.c
+++ b/src/dhcpmon/src/dhcp_mon.c
@@ -12,16 +12,24 @@
 #include <sys/syscall.h>
 #include <syslog.h>
 #include <assert.h>
+#include <stdbool.h>
 
 #include "dhcp_mon.h"
 #include "dhcp_devman.h"
 
+/** DHCP device/interface state counters */
+typedef struct
+{
+    int v4_count;                               /** count in the number of DHCPv4 unhealthy checks */
+    int v6_count;                               /** count in the number of DHCPv6 unhealthy checks */
+} dhcp_mon_count_t;
+
 /** DHCP device/interface state */
 typedef struct
 {
     dhcp_mon_check_t check_type;                /** check type */
     dhcp_device_context_t* (*get_context)();    /** functor to a device context accessor function */
-    int count;                                  /** count in the number of unhealthy checks */
+    dhcp_mon_count_t counters;                  /** count in the number of unhealthy checks */
     const char *msg;                            /** message to be printed if unhealthy state is determined */
 } dhcp_mon_state_t;
 
@@ -29,6 +37,10 @@ typedef struct
 static int window_interval_sec = 18;
 /** dhcp_unhealthy_max_count max count of consecutive unhealthy statuses before reporting to syslog */
 static int dhcp_unhealthy_max_count = 10;
+/** DHCP versions flags */
+static bool dhcpv4_enabled;
+static bool dhcpv6_enabled;
+
 /** libevent base struct */
 static struct event_base *base;
 /** libevent timeout event struct */
@@ -45,13 +57,15 @@ static dhcp_mon_state_t state_data[] = {
     [0] = {
         .check_type = DHCP_MON_CHECK_POSITIVE,
         .get_context = dhcp_devman_get_agg_dev,
-        .count = 0,
+        .counters.v4_count = 0,
+        .counters.v6_count = 0,
         .msg = "dhcpmon detected disparity in DHCP Relay behavior. Duration: %d (sec) for vlan: '%s'\n"
     },
     [1] = {
         .check_type = DHCP_MON_CHECK_NEGATIVE,
         .get_context = dhcp_devman_get_mgmt_dev,
-        .count = 0,
+        .counters.v4_count = 0,
+        .counters.v6_count = 0,
         .msg = "dhcpmon detected DHCP packets traveling through mgmt interface (please check BGP routes.)"
                " Duration: %d (sec) for intf: '%s'\n"
     }
@@ -78,36 +92,89 @@ static void signal_callback(evutil_socket_t fd, short event, void *arg)
 }
 
 /**
- * @code check_dhcp_relay_health(state_data);
+ * @code check_dhcp_relay_health(state_data, dhcp_type);
  *
  * @brief check DHCP relay overall health
  *
  * @param state_data        pointer to dhcpmon state data
  *
+ * @param type              DHCP type
+ *
  * @return none
  */
-static void check_dhcp_relay_health(dhcp_mon_state_t *state_data)
+static void check_dhcp_relay_health(dhcp_mon_state_t *state_data, dhcp_type_t type)
 {
     dhcp_device_context_t *context = state_data->get_context();
-    dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context);
+    dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context, type);
 
     switch (dhcp_mon_status)
     {
     case DHCP_MON_STATUS_UNHEALTHY:
-        if (++state_data->count > dhcp_unhealthy_max_count) {
-            syslog(LOG_ALERT, state_data->msg, state_data->count * window_interval_sec, context->intf);
-            dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
-            dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
+        switch (type)
+        {
+        case DHCPv4_TYPE:
+            if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
+                syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
+                dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
+                dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
+            }
+            break;
+        case DHCPv6_TYPE:
+            if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
+                syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
+                dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
+                dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
+            }
+            break;
+
+        default:
+            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+            break;
         }
         break;
+
     case DHCP_MON_STATUS_HEALTHY:
-        state_data->count = 0;
+        switch (type)
+        {
+        case DHCPv4_TYPE:
+            state_data->counters.v4_count = 0;
+            break;
+        case DHCPv6_TYPE:
+            state_data->counters.v6_count = 0;
+            break;
+        default:
+            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+            break;
+        }
         break;
+
     case DHCP_MON_STATUS_INDETERMINATE:
-        if (state_data->count) {
-            state_data->count++;
+        switch (type)
+        {
+        case DHCPv4_TYPE:
+            if (state_data->counters.v4_count) {
+                if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
+                    syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
+                    dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
+                    dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
+                }
+            }
+            break;
+        case DHCPv6_TYPE:
+            if (state_data->counters.v6_count) {
+                if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
+                    syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
+                    dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
+                    dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
+                }
+            }
+            break;
+        default:
+            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
+            break;
         }
         break;
+
     default:
         syslog(LOG_ERR, "DHCP Relay returned unknown status %d\n", dhcp_mon_status);
         break;
@@ -128,7 +195,12 @@ static void check_dhcp_relay_health(dhcp_mon_state_t *state_data)
 static void timeout_callback(evutil_socket_t fd, short event, void *arg)
 {
     for (uint8_t i = 0; i < sizeof(state_data) / sizeof(*state_data); i++) {
-        check_dhcp_relay_health(&state_data[i]);
+        if (dhcpv4_enabled) {
+            check_dhcp_relay_health(&state_data[i], DHCPv4_TYPE);
+        }
+        if (dhcpv6_enabled) {
+            check_dhcp_relay_health(&state_data[i], DHCPv6_TYPE);
+        }
     }
 
     dhcp_devman_update_snapshot(NULL);
@@ -141,13 +213,17 @@ static void timeout_callback(evutil_socket_t fd, short event, void *arg)
  * seconds. It also writes to syslog when dhcp relay has been unhealthy for consecutive max_count checks.
  *
  */
-int dhcp_mon_init(int window_sec, int max_count)
+int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6)
 {
     int rv = -1;
 
     do {
         window_interval_sec = window_sec;
         dhcp_unhealthy_max_count = max_count;
+        dhcpv4_enabled = dhcpv4;
+        dhcpv6_enabled = dhcpv6;
+
+        dhcp_devman_active_types(dhcpv4, dhcpv6);
 
         base = event_base_new();
         if (base == NULL) {
diff --git a/src/dhcpmon/src/dhcp_mon.h b/src/dhcpmon/src/dhcp_mon.h
index ae8911ab51fc..facd46da6860 100644
--- a/src/dhcpmon/src/dhcp_mon.h
+++ b/src/dhcpmon/src/dhcp_mon.h
@@ -17,10 +17,12 @@
  *
  * @param window_sec time interval between health checks
  * @param max_count max count of consecutive unhealthy statuses before reporting to syslog
+ * @param dhcpv4    flag indicating dhcpv4 is enabled
+ * @param dhcpv6    flag indicating dhcpv6 is enabled
  *
  * @return 0 upon success, otherwise upon failure
  */
-int dhcp_mon_init(int window_sec, int max_count);
+int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6);
 
 /**
  * @code dhcp_mon_shutdown();
diff --git a/src/dhcpmon/src/main.c b/src/dhcpmon/src/main.c
index 29bc534accf0..1cf931821495 100644
--- a/src/dhcpmon/src/main.c
+++ b/src/dhcpmon/src/main.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #include "dhcp_mon.h"
 #include "dhcp_devman.h"
@@ -41,7 +42,8 @@ static const uint32_t dhcpmon_default_unhealthy_max_count = 10;
 static void usage(const char *prog)
 {
     printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]"
-            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
+            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>]"
+            "[-4 <DHCPv4 monitoring>] [-6 <DHCPv4 monitoring>] [-d]\n", prog);
     printf("where\n");
     printf("\tsouth interface: is a vlan interface,\n");
     printf("\tnorth interface: is a TOR-T1 interface,\n");
@@ -112,6 +114,8 @@ int main(int argc, char **argv)
     int max_unhealthy_count = dhcpmon_default_unhealthy_max_count;
     size_t snaplen = dhcpmon_default_snaplen;
     int make_daemon = 0;
+    bool dhcpv4_enabled = false;
+    bool dhcpv6_enabled = false;
 
     setlogmask(LOG_UPTO(LOG_INFO));
     openlog(basename(argv[0]), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON);
@@ -155,6 +159,14 @@ int main(int argc, char **argv)
             max_unhealthy_count = atoi(argv[i + 1]);
             i += 2;
             break;
+        case '4':
+            dhcpv4_enabled = true;
+            i++;
+            break;
+        case '6':
+            dhcpv6_enabled = true;
+            i++;
+            break;
         default:
             fprintf(stderr, "%s: %c: Unknown option\n", basename(argv[0]), argv[i][1]);
             usage(basename(argv[0]));
@@ -165,7 +177,11 @@ int main(int argc, char **argv)
         dhcpmon_daemonize();
     }
 
-    if ((dhcp_mon_init(window_interval, max_unhealthy_count) == 0) &&
+    if (!dhcpv4_enabled && !dhcpv6_enabled) {
+        dhcpv4_enabled = true;
+    }
+
+    if ((dhcp_mon_init(window_interval, max_unhealthy_count, dhcpv4_enabled, dhcpv6_enabled) == 0) &&
         (dhcp_mon_start(snaplen) == 0)) {
 
         rv = EXIT_SUCCESS;

From 47ba7a90910e39692cfe850337e9e923af01f310 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 30 Sep 2021 01:33:02 -0700
Subject: [PATCH 0821/1674] [dhcp_relay] DHCP relay support for IPv6 (#7772)
 (#8871)

---
 dockers/docker-dhcp-relay/Dockerfile.j2       |   1 +
 .../docker-dhcp-relay/dhcp-relay.programs.j2  |  17 +++
 .../docker-dhcp-relay/dhcpv4-relay.agents.j2  |  40 ++++++
 .../docker-dhcp-relay/dhcpv6-relay.agents.j2  |  37 ++++++
 .../dhcpv6-relay.monitors.j2                  |  79 ++++++++++++
 .../docker-dhcp-relay.supervisord.conf.j2     | 120 ++----------------
 .../py2/docker-dhcp-relay.supervisord.conf    |  19 ++-
 .../py3/docker-dhcp-relay.supervisord.conf    |  19 ++-
 8 files changed, 214 insertions(+), 118 deletions(-)
 create mode 100644 dockers/docker-dhcp-relay/dhcp-relay.programs.j2
 create mode 100644 dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2
 create mode 100644 dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
 create mode 100644 dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2

diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
index 1100aa510742..5f6572d9d550 100644
--- a/dockers/docker-dhcp-relay/Dockerfile.j2
+++ b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -30,6 +30,7 @@ RUN apt-get clean -y         && \
 
 COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
 COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
+COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcpv6-relay.monitors.j2", "/usr/share/sonic/templates/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 
diff --git a/dockers/docker-dhcp-relay/dhcp-relay.programs.j2 b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
new file mode 100644
index 000000000000..d6c0d805a4cc
--- /dev/null
+++ b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
@@ -0,0 +1,17 @@
+[group:isc-dhcp-relay]
+programs=
+{%- set add_preceding_comma = { 'flag': False } %}
+{% for vlan_name in VLAN_INTERFACE %}
+{# Append DHCPv4 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
+{% if add_preceding_comma.flag %},{% endif %}
+{% set _dummy = add_preceding_comma.update({'flag': True}) %}
+isc-dhcpv4-relay-{{ vlan_name }}
+{%- endif %}
+{# Append DHCPv6 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% if add_preceding_comma.flag %},{% endif %}
+{% set _dummy = add_preceding_comma.update({'flag': True}) %}
+isc-dhcpv6-relay-{{ vlan_name }}
+{%- endif %}
+{% endfor %}
diff --git a/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2
new file mode 100644
index 000000000000..bf756ff63817
--- /dev/null
+++ b/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2
@@ -0,0 +1,40 @@
+{# Append DHCPv4 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
+{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
+{% if dhcp_server | ipv4 %}
+{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% if relay_for_ipv4.flag %}
+{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
+[program:isc-dhcpv4-relay-{{ vlan_name }}]
+{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id {{ vlan_name }}
+{#- Dual ToR Option #}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -U Loopback0 -dt{% endif -%}
+{#- si option to use intf addr in relay #}
+{% if DEVICE_METADATA['localhost']['deployment_id'] == '8' %} -si{% endif -%}
+{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
+{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
+{%- if dhcp_server | ipv4 %} {{ dhcp_server }}{% endif -%}
+{% endfor %}
+
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+{% endif %}
+{% endif %}
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
new file mode 100644
index 000000000000..2d95b383c093
--- /dev/null
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -0,0 +1,37 @@
+{# Append DHCPv6 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
+{% if dhcpv6_server | ipv6 %}
+{% set _dummy = relay_for_ipv6.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% if relay_for_ipv6.flag %}
+{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
+[program:isc-dhcpv6-relay-{{ vlan_name }}]
+{# We treat this VLAN as a downstream interface (-l), as we only want to listen for requests #}
+command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l {{ vlan_name }}
+{#- We treat all other interfaces as upstream interfaces (-u), as we only want to listen for replies #}
+{%- for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
+{%- if dhcpv6_server | ipv6 %}
+{%- for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+{%- if prefix | ipv6 and name != vlan_name %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
+{% endfor %}
+{% for (name, prefix) in INTERFACE|pfx_filter %}
+{% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
+{% endfor %}
+{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
+{% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
+{% endfor %}
+{% endif -%}
+{% endfor %}
+
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+{% endif %}
+{% endif %}
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
new file mode 100644
index 000000000000..8bb9e5ad8136
--- /dev/null
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
@@ -0,0 +1,79 @@
+[group:dhcpmon]
+programs=
+{%- set add_preceding_comma = { 'flag': False } %}
+{% set monitor_instance = { 'flag': False } %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
+{% set _dummy = monitor_instance.update({'flag': True}) %}
+{%- endif %}
+{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% set _dummy = monitor_instance.update({'flag': True}) %}
+{%- endif %}
+{% if monitor_instance.flag %}
+{% if add_preceding_comma.flag %},{% endif %}
+{% set _dummy = add_preceding_comma.update({'flag': True}) %}
+dhcpmon-{{ vlan_name }}
+{%- set _dummy = monitor_instance.update({'flag': False}) %}
+{%- endif %}
+{% endfor %}
+
+
+{# Create a program entry for each DHCP MONitor instance #}
+{% set relay_for_ipv4 = { 'flag': False } %}
+{% set relay_for_ipv6 = { 'flag': False } %}
+{% for vlan_name in VLAN_INTERFACE %}
+{# Check DHCPv4 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
+{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
+{% if dhcp_server | ipv4 %}
+{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# Check DHCPv6 agents #}
+{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
+{% if dhcpv6_server | ipv6 %}
+{% set _dummy = relay_for_ipv6.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if relay_for_ipv4.flag or relay_for_ipv6.flag %}
+[program:dhcpmon-{{ vlan_name }}]
+{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
+command=/usr/sbin/dhcpmon -id {{ vlan_name }}
+{#- Dual ToR Option #}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0{% endif -%}
+{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
+{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% if MGMT_INTERFACE %}
+{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %} -im {{ name }}{% endif -%}
+{% endfor %}
+{% endif %}
+{% if relay_for_ipv4.flag %} -4{% endif %}
+{% if relay_for_ipv6.flag %} -6{% endif %}
+
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=
+{%- if relay_for_ipv4.flag %}isc-dhcpv4-relay-{{ vlan_name }}:running {% endif %}
+{% if relay_for_ipv6.flag %}isc-dhcpv6-relay-{{ vlan_name }}:running{% endif %}
+
+
+{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
+{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
+{% endif %}
+{% endfor %}
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index a1811226a885..664e1f36c05e 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -42,125 +42,29 @@ dependent_startup_wait_for=rsyslogd:running
 {# If our configuration has VLANs... #}
 {% if VLAN_INTERFACE %}
 {# Count how many VLANs require a DHCP relay agent... #}
-{% set num_relays = { 'count': 0 } %}
+{% set ipv4_num_relays = { 'count': 0 } %}
+{% set ipv6_num_relays = { 'count': 0 } %}
 {% for vlan_name in VLAN_INTERFACE %}
 {% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
-{% set _dummy = num_relays.update({'count': num_relays.count + 1}) %}
+{% set _dummy = ipv4_num_relays.update({'count': ipv4_num_relays.count + 1}) %}
+{% endif %}
+{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% set _dummy = ipv6_num_relays.update({'count': ipv6_num_relays.count + 1}) %}
 {% endif %}
 {% endfor %}
 {# If one or more of the VLANs require a DHCP relay agent... #}
-{% if num_relays.count > 0 %}
-[group:isc-dhcp-relay]
-programs=
-{%- set add_preceding_comma = { 'flag': False } %}
-{% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
-{% if add_preceding_comma.flag %},{% endif %}
-{% set _dummy = add_preceding_comma.update({'flag': True}) %}
-isc-dhcp-relay-{{ vlan_name }}
-{%- endif %}
-{% endfor %}
+{% if ipv4_num_relays.count > 0 or ipv6_num_relays.count > 0 %}
+{% include 'dhcp-relay.programs.j2' %}
 
 
 {# Create a program entry for each DHCP relay agent instance #}
 {% set relay_for_ipv4 = { 'flag': False } %}
+{% set relay_for_ipv6 = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
-{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
-{% if dhcp_server | ipv4 %}
-{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
-{% endif %}
-{% endfor %}
-{% if relay_for_ipv4.flag %}
-{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
-[program:isc-dhcp-relay-{{ vlan_name }}]
-{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
-command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id {{ vlan_name }}
-{#- Dual ToR Option #}
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -U Loopback0 -dt{% endif -%}
-{#- si option to use intf addr in relay #}
-{% if DEVICE_METADATA['localhost']['deployment_id'] == '8' %} -si{% endif -%}
-{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% for (name, prefix) in INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
-{%- if dhcp_server | ipv4 %} {{ dhcp_server }}{% endif -%}
-{% endfor %}
-
-priority=3
-autostart=false
-autorestart=false
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=start:exited
-
-{% endif %}
-{% endif %}
-{% endfor %}
-
-[group:dhcpmon]
-programs=
-{%- set add_preceding_comma = { 'flag': False } %}
-{% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
-{% if add_preceding_comma.flag %},{% endif %}
-{% set _dummy = add_preceding_comma.update({'flag': True}) %}
-dhcpmon-{{ vlan_name }}
-{%- endif %}
-{% endfor %}
-
-
-{# Create a program entry for each DHCP MONitor instance #}
-{% set relay_for_ipv4 = { 'flag': False } %}
-{% for vlan_name in VLAN_INTERFACE %}
-{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
-{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
-{% if dhcp_server | ipv4 %}
-{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
-{% endif %}
-{% endfor %}
-{% if relay_for_ipv4.flag %}
-{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
-[program:dhcpmon-{{ vlan_name }}]
-{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
-command=/usr/sbin/dhcpmon -id {{ vlan_name }}
-{#- Dual ToR Option #}
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0{% endif -%}
-{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% for (name, prefix) in INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
-{% endfor %}
-{% if MGMT_INTERFACE %}
-{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %} -im {{ name }}{% endif -%}
-{% endfor %}
-{% endif %}
-
-priority=4
-autostart=false
-autorestart=false
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=isc-dhcp-relay-{{ vlan_name }}:running
-
-{% endif %}
-{% endif %}
+{% include 'dhcpv4-relay.agents.j2' %}
+{% include 'dhcpv6-relay.agents.j2' %}
 {% endfor %}
 
+{% include 'dhcpv6-relay.monitors.j2' %}
 {% endif %}
 {% endif %}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index 3a1269c43533..35dfe5ea4b5d 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -40,9 +40,9 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [group:isc-dhcp-relay]
-programs=isc-dhcp-relay-Vlan1000
+programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv6-relay-Vlan1000
 
-[program:isc-dhcp-relay-Vlan1000]
+[program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
 priority=3
 autostart=false
@@ -52,19 +52,28 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:isc-dhcpv6-relay-Vlan1000]
+command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l Vlan1000 -u fc02:2000::1%%PortChannel04  -u fc02:2000::1%%PortChannel03  -u fc02:2000::1%%PortChannel01  -u fc02:2000::1%%PortChannel02  -u fc02:2000::2%%PortChannel04  -u fc02:2000::2%%PortChannel03  -u fc02:2000::2%%PortChannel01  -u fc02:2000::2%%PortChannel02 
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
 
 [group:dhcpmon]
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0 -4 -6
 priority=4
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcp-relay-Vlan1000:running
-
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running isc-dhcpv6-relay-Vlan1000:running
 
 
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index e5e5462bde77..bc24433a14cf 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -40,9 +40,9 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [group:isc-dhcp-relay]
-programs=isc-dhcp-relay-Vlan1000
+programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv6-relay-Vlan1000
 
-[program:isc-dhcp-relay-Vlan1000]
+[program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
 priority=3
 autostart=false
@@ -52,19 +52,28 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:isc-dhcpv6-relay-Vlan1000]
+command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l Vlan1000 -u fc02:2000::1%%PortChannel01  -u fc02:2000::1%%PortChannel02  -u fc02:2000::1%%PortChannel03  -u fc02:2000::1%%PortChannel04  -u fc02:2000::2%%PortChannel01  -u fc02:2000::2%%PortChannel02  -u fc02:2000::2%%PortChannel03  -u fc02:2000::2%%PortChannel04 
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
 
 [group:dhcpmon]
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0 -4 -6
 priority=4
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcp-relay-Vlan1000:running
-
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running isc-dhcpv6-relay-Vlan1000:running
 
 

From 90cfc08aad6e48a201872f2c5418ae2b58d9f9d1 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 30 Sep 2021 09:53:30 -0700
Subject: [PATCH 0822/1674] [sonic-utilities] submodule update (#8865)

0b5f90b (HEAD -> 202012, origin/202012) [show techsupport] fix bash errors in generate_dump script (#1844)
388c50c [202012][warmboot] Add new preboot health check: verify db integrity (#1839)
d73dc98 [config] support for configuring muxcable to standby mode of operation (#1837)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 67a58e8476db..0b5f90b14d1f 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 67a58e8476db957230b5e032602aeacbc817d327
+Subproject commit 0b5f90b14d1f5baa1d9c09dc959c3e4f840db5ca

From ea064e22403660821cb6cd59c2f42c80aa0846fc Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 30 Sep 2021 13:28:28 -0700
Subject: [PATCH 0823/1674] Parse DHCP_RELAY table (#8877)

* Cherry-pick Parse DHCP Table

* Cherry pick changing DHCP table to DHCP_RELAY
---
 src/sonic-config-engine/minigraph.py          | 16 ++++++++----
 .../tests/simple-sample-graph-case.xml        |  2 ++
 src/sonic-config-engine/tests/test_cfggen.py  | 11 ++++++++
 .../tests/test_minigraph_case.py              | 26 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index c5057ebaee4d..d4fffc21c43f 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -516,6 +516,7 @@ def parse_dpg(dpg, hname):
         vlanintfs = child.find(str(QName(ns, "VlanInterfaces")))
         vlans = {}
         vlan_members = {}
+        dhcp_relay_table = {}
         vlantype_name = ""
         intf_vlan_mbr = defaultdict(list)
         for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
@@ -543,6 +544,7 @@ def parse_dpg(dpg, hname):
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'untagged'}
 
             vlan_attributes = {'vlanid': vlanid, 'members': vmbr_list }
+            dhcp_attributes = {}
 
             # If this VLAN requires a DHCP relay agent, it will contain a <DhcpRelays> element
             # containing a list of DHCP server IPs
@@ -557,6 +559,9 @@ def parse_dpg(dpg, hname):
                 vintfdhcpservers = vintf_node.text
                 vdhcpserver_list = vintfdhcpservers.split(';')
                 vlan_attributes['dhcpv6_servers'] = vdhcpserver_list
+                dhcp_attributes['dhcpv6_servers'] = vdhcpserver_list
+            sonic_vlan_member_name = "Vlan%s" % (vlanid)
+            dhcp_relay_table[sonic_vlan_member_name] = dhcp_attributes
 
             vlanmac = vintf.find(str(QName(ns, "MacAddress")))
             if vlanmac is not None and vlanmac.text is not None:
@@ -681,8 +686,8 @@ def parse_dpg(dpg, hname):
                     if mg_key in mg_tunnel.attrib:
                         tunnelintfs[tunnel_type][tunnel_name][table_key] = mg_tunnel.attrib[mg_key]
 
-        return intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, pcs, pc_members, acls, vni, tunnelintfs, dpg_ecmp_content
-    return None, None, None, None, None, None, None, None, None, None
+        return intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnelintfs, dpg_ecmp_content
+    return None, None, None, None, None, None, None, None, None, None, None, None, None
 
 def parse_host_loopback(dpg, hname):
     for child in dpg:
@@ -1108,6 +1113,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     tunnel_intfs = None
     vlans = None
     vlan_members = None
+    dhcp_relay_table = None
     pcs = None
     mgmt_intf = None
     lo_intfs = None
@@ -1167,7 +1173,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     for child in root:
         if asic_name is None:
             if child.tag == str(QName(ns, "DpgDec")):
-                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, hostname)
+                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, hostname)
             elif child.tag == str(QName(ns, "CpgDec")):
                 (bgp_sessions, bgp_internal_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, hostname)
             elif child.tag == str(QName(ns, "PngDec")):
@@ -1182,7 +1188,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
         else:
             if child.tag == str(QName(ns, "DpgDec")):
-                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, asic_name)
+                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, asic_name)
                 host_lo_intfs = parse_host_loopback(child, hostname)
             elif child.tag == str(QName(ns, "CpgDec")):
                 (bgp_sessions, bgp_internal_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, asic_name, local_devices)
@@ -1499,7 +1505,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key in {device['name'] for device in neighbors.values()} }
     results['SYSLOG_SERVER'] = dict((item, {}) for item in syslog_servers)
     results['DHCP_SERVER'] = dict((item, {}) for item in dhcp_servers)
-    results['DHCPv6_SERVER'] = dict((item, {}) for item in dhcpv6_servers)
+    results['DHCP_RELAY'] = dhcp_relay_table
     results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
     results['TACPLUS_SERVER'] = dict((item, {'priority': '1', 'tcp_port': '49'}) for item in tacacs_servers)
     results['ACL_TABLE'] = filter_acl_table_bindings(acls, neighbors, pcs, sub_role)
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index c1015b6b5362..78e81bd6df78 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -134,6 +134,7 @@
           <Name>ab1</Name>
           <AttachTo>fortyGigE0/8</AttachTo>
           <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
           <VlanID>1000</VlanID>
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>
@@ -143,6 +144,7 @@
           <Name>ab2</Name>
           <AttachTo>fortyGigE0/4</AttachTo>
           <DhcpRelays>192.0.0.1</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
           <VlanID>2000</VlanID>
           <Tag>2000</Tag>
           <MacAddress i:nil="true"/>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index e3f74fb9cf73..0a0dd54a76d7 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -684,3 +684,14 @@ def test_show_run_interfaces(self):
         argument = '-a \'{"key1":"value"}\' --var-json INTERFACE'
         output = self.run_script(argument)
         self.assertEqual(output, '')
+
+    def test_minigraph_dhcp(self):
+        argument = '-m "' + self.sample_graph_simple_case + '" -p "' + self.port_config + '" -v DHCP_RELAY'
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            utils.to_dict(
+                "{'Vlan1000': {'dhcpv6_servers': ['fc02:2000::1', 'fc02:2000::2']}, "
+                "'Vlan2000': {'dhcpv6_servers': ['fc02:2000::3', 'fc02:2000::4']}}"
+            )
+        )
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 3308c5641f4b..560d0990fdcb 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -102,6 +102,7 @@ def test_minigraph_vlans(self):
                    'Vlan1000': {
                        'alias': 'ab1',
                        'dhcp_servers': ['192.0.0.1', '192.0.0.2'],
+                       'dhcpv6_servers': ['fc02:2000::1', 'fc02:2000::2'],
                        'vlanid': '1000',
                        'mac': '00:aa:bb:cc:dd:ee',
                        'members': ['Ethernet8']
@@ -109,6 +110,7 @@ def test_minigraph_vlans(self):
                    'Vlan2000': {
                        'alias': 'ab2',
                        'dhcp_servers': ['192.0.0.1'],
+                       'dhcpv6_servers': ['fc02:2000::3', 'fc02:2000::4'],
                        'members': ['Ethernet4'],
                        'vlanid': '2000'
                        }
@@ -357,3 +359,27 @@ def test_minigraph_mux_cable_table(self):
             utils.to_dict(output.strip()),
             expected_table
         )
+    
+    def test_dhcp_table(self):
+        argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DHCP_RELAY"'
+        expected = {
+                   'Vlan1000': {
+                       'dhcpv6_servers': [
+                           "fc02:2000::1",
+                           "fc02:2000::2"
+                       ]
+                    },
+                    'Vlan2000': {
+                       'dhcpv6_servers': [
+                           "fc02:2000::3",
+                           "fc02:2000::4"
+                       ]
+                    }
+        }
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            expected
+        )
+        
+    

From a4b6788b4b68dddb30dcc91ce7fcbcd019f3ee82 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Fri, 1 Oct 2021 19:55:03 -0700
Subject: [PATCH 0824/1674] Replace isc-dhcp with DHCPv6 Relay in dhcp_relay
 docker (#8884)

---
 dockers/docker-dhcp-relay/critical_processes  |   2 +-
 .../docker-dhcp-relay/dhcp-relay.programs.j2  |   4 +-
 .../docker-dhcp-relay/dhcpv6-relay.agents.j2  |  19 +-
 .../dhcpv6-relay.monitors.j2                  |   2 +-
 rules/dhcp6relay.dep                          |   9 +
 rules/dhcp6relay.mk                           |  10 +
 rules/docker-dhcp-relay.mk                    |   2 +-
 src/dhcp6relay/.gitignore                     |   5 +
 src/dhcp6relay/Makefile                       |  42 +
 src/dhcp6relay/debian/changelog               |   5 +
 src/dhcp6relay/debian/compat                  |   1 +
 src/dhcp6relay/debian/control                 |  17 +
 src/dhcp6relay/debian/rules                   |   4 +
 src/dhcp6relay/src/configInterface.cpp        | 151 ++++
 src/dhcp6relay/src/configInterface.h          |  75 ++
 src/dhcp6relay/src/main.cpp                   |  18 +
 src/dhcp6relay/src/relay.cpp                  | 738 ++++++++++++++++++
 src/dhcp6relay/src/relay.h                    | 354 +++++++++
 src/dhcp6relay/src/subdir.mk                  |  23 +
 .../py2/docker-dhcp-relay.supervisord.conf    |  11 +-
 .../py3/docker-dhcp-relay.supervisord.conf    |  11 +-
 21 files changed, 1471 insertions(+), 32 deletions(-)
 create mode 100644 rules/dhcp6relay.dep
 create mode 100644 rules/dhcp6relay.mk
 create mode 100644 src/dhcp6relay/.gitignore
 create mode 100644 src/dhcp6relay/Makefile
 create mode 100644 src/dhcp6relay/debian/changelog
 create mode 100644 src/dhcp6relay/debian/compat
 create mode 100644 src/dhcp6relay/debian/control
 create mode 100755 src/dhcp6relay/debian/rules
 create mode 100644 src/dhcp6relay/src/configInterface.cpp
 create mode 100644 src/dhcp6relay/src/configInterface.h
 create mode 100644 src/dhcp6relay/src/main.cpp
 create mode 100644 src/dhcp6relay/src/relay.cpp
 create mode 100644 src/dhcp6relay/src/relay.h
 create mode 100644 src/dhcp6relay/src/subdir.mk

diff --git a/dockers/docker-dhcp-relay/critical_processes b/dockers/docker-dhcp-relay/critical_processes
index 855851bf2d68..43bf6af2794f 100644
--- a/dockers/docker-dhcp-relay/critical_processes
+++ b/dockers/docker-dhcp-relay/critical_processes
@@ -1 +1 @@
-group:isc-dhcp-relay
+group:dhcp-relay
diff --git a/dockers/docker-dhcp-relay/dhcp-relay.programs.j2 b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
index d6c0d805a4cc..9cb0c03876d6 100644
--- a/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
+++ b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
@@ -1,4 +1,4 @@
-[group:isc-dhcp-relay]
+[group:dhcp-relay]
 programs=
 {%- set add_preceding_comma = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
@@ -12,6 +12,6 @@ isc-dhcpv4-relay-{{ vlan_name }}
 {% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
-isc-dhcpv6-relay-{{ vlan_name }}
+dhcp6relay
 {%- endif %}
 {% endfor %}
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
index 2d95b383c093..218c95320edc 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -7,23 +7,8 @@
 {% endfor %}
 {% if relay_for_ipv6.flag %}
 {% set _dummy = relay_for_ipv6.update({'flag': False}) %}
-[program:isc-dhcpv6-relay-{{ vlan_name }}]
-{# We treat this VLAN as a downstream interface (-l), as we only want to listen for requests #}
-command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l {{ vlan_name }}
-{#- We treat all other interfaces as upstream interfaces (-u), as we only want to listen for replies #}
-{%- for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
-{%- if dhcpv6_server | ipv6 %}
-{%- for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-{%- if prefix | ipv6 and name != vlan_name %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
-{% endfor %}
-{% for (name, prefix) in INTERFACE|pfx_filter %}
-{% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
-{% endfor %}
-{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
-{% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%}
-{% endfor %}
-{% endif -%}
-{% endfor %}
+[program:dhcp6relay]
+command=/usr/sbin/dhcp6relay
 
 priority=3
 autostart=false
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
index 8bb9e5ad8136..9f2d0f01b59f 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
@@ -70,7 +70,7 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=
 {%- if relay_for_ipv4.flag %}isc-dhcpv4-relay-{{ vlan_name }}:running {% endif %}
-{% if relay_for_ipv6.flag %}isc-dhcpv6-relay-{{ vlan_name }}:running{% endif %}
+{% if relay_for_ipv6.flag %}dhcp6relay:running{% endif %}
 
 
 {% set _dummy = relay_for_ipv4.update({'flag': False}) %}
diff --git a/rules/dhcp6relay.dep b/rules/dhcp6relay.dep
new file mode 100644
index 000000000000..be82d326fe21
--- /dev/null
+++ b/rules/dhcp6relay.dep
@@ -0,0 +1,9 @@
+
+SPATH       := $($(SONIC_DHCP6RELAY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcp6relay.mk rules/dhcp6relay.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(SONIC_DHCP6RELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_DHCP6RELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_DHCP6RELAY)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
new file mode 100644
index 000000000000..d9ff506d8a27
--- /dev/null
+++ b/rules/dhcp6relay.mk
@@ -0,0 +1,10 @@
+# SONiC DHCPV6 RELAY Package
+
+SONIC_DHCP6RELAY_VERSION = 1.0.0-0
+SONIC_DHCP6RELAY_PKG_NAME = dhcp6relay
+
+SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(DOCKER_DHCP_RELAY)_INSTALL_DEBS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
+SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 6be9bb79fda4..00900f560d96 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -6,7 +6,7 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON)
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG)
diff --git a/src/dhcp6relay/.gitignore b/src/dhcp6relay/.gitignore
new file mode 100644
index 000000000000..9d09ae6b3f1a
--- /dev/null
+++ b/src/dhcp6relay/.gitignore
@@ -0,0 +1,5 @@
+debian/*
+!debian/changelog
+!debian/compat
+!debian/control
+!debian/rules
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
new file mode 100644
index 000000000000..4cbeb37fd188
--- /dev/null
+++ b/src/dhcp6relay/Makefile
@@ -0,0 +1,42 @@
+RM := rm -rf
+DHCP6RELAY_TARGET := dhcp6relay
+CP := cp
+MKDIR := mkdir
+CC := g++
+MV := mv
+LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system -I $(PWD)/../sonic-swss-common/common
+CFLAGS  = -g -Wall -std=gnu11
+PWD := $(shell pwd)
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS) $(OBJS)
+endif
+endif
+
+-include src/subdir.mk
+ 
+all: sonic-dhcp6relay
+
+sonic-dhcp6relay: $(OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: G++ Linker'
+	$(CC) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS) 
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+install:
+	$(MKDIR) -p $(DESTDIR)/usr/sbin
+	$(MV) $(DHCP6RELAY_TARGET) $(DESTDIR)/usr/sbin
+
+deinstall:
+	$(RM) $(DESTDIR)/usr/sbin/$(DHCP6RELAY_TARGET)
+	$(RM) -rf $(DESTDIR)/usr/sbin
+
+clean:
+	-$(RM) $(EXECUTABLES) $(C_DEPS) $(OBJS) $(DHCP6RELAY_TARGET)
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+
diff --git a/src/dhcp6relay/debian/changelog b/src/dhcp6relay/debian/changelog
new file mode 100644
index 000000000000..67ed277049e5
--- /dev/null
+++ b/src/dhcp6relay/debian/changelog
@@ -0,0 +1,5 @@
+sonic-dhcp6relay (1.0.0-0) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+-- Kelly Yeh <kellyyeh@microsoft.com>  
diff --git a/src/dhcp6relay/debian/compat b/src/dhcp6relay/debian/compat
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/src/dhcp6relay/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/src/dhcp6relay/debian/control b/src/dhcp6relay/debian/control
new file mode 100644
index 000000000000..31fdb6f41f3b
--- /dev/null
+++ b/src/dhcp6relay/debian/control
@@ -0,0 +1,17 @@
+Source: sonic-dhcp6relay
+Section: devel
+Priority: optional
+Maintainer: Kelly Yeh <kellyyeh@microsoft.com>
+Build-Depends: debhelper (>= 8.0.0),
+               dh-systemd
+Standards-Version: 3.9.3
+Homepage: https://github.com/Azure/sonic-buildimage
+XS-Go-Import-Path: github.com/Azure/sonic-buildimage
+
+Package: sonic-dhcp6relay
+Architecture: any
+Built-Using: ${misc:Built-Using}
+Depends: libevent-2.1-6,
+        libboost-thread1.71.0,
+        libboost-system1.71.0
+Description: SONiC DHCPv6 Relay
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
new file mode 100755
index 000000000000..ce2eb52beb5d
--- /dev/null
+++ b/src/dhcp6relay/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --parallel
diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
new file mode 100644
index 000000000000..0af4f49a285f
--- /dev/null
+++ b/src/dhcp6relay/src/configInterface.cpp
@@ -0,0 +1,151 @@
+#include <sstream>
+#include <syslog.h>
+#include <algorithm>
+#include "configInterface.h"
+
+constexpr auto DEFAULT_TIMEOUT_MSEC = 1000;
+
+bool pollSwssNotifcation = true;
+std::shared_ptr<boost::thread> mSwssThreadPtr;
+
+std::shared_ptr<swss::DBConnector> configDbPtr = std::make_shared<swss::DBConnector> ("CONFIG_DB", 0);
+swss::SubscriberStateTable ipHelpersTable(configDbPtr.get(), "DHCP_RELAY");
+swss::Select swssSelect;
+
+/**
+ * @code                void initialize_swss()
+ * 
+ * @brief               initialize DB tables and start SWSS listening thread
+ *
+ * @return              none
+ */
+void initialize_swss(std::vector<relay_config> *vlans)
+{
+    try {
+        swssSelect.addSelectable(&ipHelpersTable);
+        get_dhcp(vlans);
+        mSwssThreadPtr = std::make_shared<boost::thread> (&handleSwssNotification, vlans);
+    }
+    catch (const std::bad_alloc &e) {
+        syslog(LOG_ERR, "Failed allocate memory. Exception details: %s", e.what());
+    }
+}
+
+/**
+ * @code                void deinitialize_swss()
+ * 
+ * @brief               deinitialize DB interface and join SWSS listening thread
+ *
+ * @return              none
+ */
+void deinitialize_swss()
+{
+    stopSwssNotificationPoll();
+    mSwssThreadPtr->interrupt();
+}
+
+
+/**
+ * @code                void get_dhcp(std::vector<relay_config> *vlans)
+ * 
+ * @brief               initialize and get vlan table information from DHCP_RELAY
+ *
+ * @return              none
+ */
+void get_dhcp(std::vector<relay_config> *vlans) {
+    swss::Selectable *selectable;
+    int ret = swssSelect.select(&selectable, DEFAULT_TIMEOUT_MSEC);
+    if (ret == swss::Select::ERROR) {
+        syslog(LOG_WARNING, "Select: returned ERROR");
+    } else if (ret == swss::Select::TIMEOUT) {
+    } 
+    if (selectable == static_cast<swss::Selectable *> (&ipHelpersTable)) {
+        handleRelayNotification(ipHelpersTable, vlans);
+    }
+}
+/**
+ * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
+ * 
+ * @brief               main thread for handling SWSS notification
+ *
+ * @param context       list of vlans/argument config that contains strings of server and option
+ *
+ * @return              none
+ */
+void handleSwssNotification(std::vector<relay_config> *vlans)
+{
+    while (pollSwssNotifcation) {
+        get_dhcp(vlans);
+    } 
+}
+
+/**
+ * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   handles DHCPv6 relay configuration change notification
+ *
+ * @param ipHelpersTable    DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+{
+    std::deque<swss::KeyOpFieldsValuesTuple> entries;
+
+    ipHelpersTable.pops(entries);
+    processRelayNotification(entries, vlans);
+}
+
+/**
+ * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   process DHCPv6 relay servers and options configuration change notification
+ *
+ * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+{
+    std::vector<std::string> servers;
+
+    for (auto &entry: entries) {
+        std::string vlan = kfvKey(entry);
+        std::string operation = kfvOp(entry);
+        std::vector<swss::FieldValueTuple> fieldValues = kfvFieldsValues(entry);
+
+        relay_config intf;
+        intf.is_option_79 = true;
+        intf.interface = vlan;
+        for (auto &fieldValue: fieldValues) {
+            std::string f = fvField(fieldValue);
+            std::string v = fvValue(fieldValue);
+            if(f == "dhcpv6_servers") {
+                std::stringstream ss(v);
+                while (ss.good()) {
+                    std::string substr;
+                    getline(ss, substr, ',');
+                    intf.servers.push_back(substr);
+                }
+                syslog(LOG_DEBUG, "key: %s, Operation: %s, f: %s, v: %s", vlan.c_str(), operation.c_str(), f.c_str(), v.c_str());
+            }
+            if(f == "dhcpv6_option|rfc6939_support" && v == "false") {
+                intf.is_option_79 = false;
+            }
+        }
+        vlans->push_back(intf);
+    }
+}
+
+/**
+*@code      stopSwssNotificationPoll
+*
+*@brief     stop SWSS listening thread
+*
+*@return    none
+*/
+void stopSwssNotificationPoll() {
+    pollSwssNotifcation = false;
+};
diff --git a/src/dhcp6relay/src/configInterface.h b/src/dhcp6relay/src/configInterface.h
new file mode 100644
index 000000000000..20b0912c5cef
--- /dev/null
+++ b/src/dhcp6relay/src/configInterface.h
@@ -0,0 +1,75 @@
+#include <boost/thread.hpp>
+#include "subscriberstatetable.h"
+#include "select.h"
+#include "relay.h"
+
+/**
+ * @code                void initialize_swss()
+ * 
+ * @brief               initialize DB tables and start SWSS listening thread
+ *
+ * @return              none
+ */
+void initialize_swss(std::vector<relay_config> *vlans);
+
+/**
+ * @code                void deinitialize_swss()
+ * 
+ * @brief               deinitialize DB interface and join SWSS listening thread
+ *
+ * @return              none
+ */
+void deinitialize_swss();
+
+/**
+ * @code                void get_dhcp(std::vector<relay_config> *vlans)
+ * 
+ * @brief               initialize and get vlan information from DHCP_RELAY
+ *
+ * @return              none
+ */
+void get_dhcp(std::vector<relay_config> *vlans);
+
+/**
+ * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
+ * 
+ * @brief               main thread for handling SWSS notification
+ *
+ * @param vlans         list of vlans/argument config that contains strings of server and option
+ *
+ * @return              none
+ */
+void handleSwssNotification(std::vector<relay_config> *vlans);
+
+/**
+ * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   handles DHCPv6 relay configuration change notification
+ *
+ * @param ipHelpersTable    DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void handleRelayNotification(swss::SubscriberStateTable &configMuxTable, std::vector<relay_config> *vlans);
+
+/**
+ * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   process DHCPv6 relay servers and options configuration change notification
+ *
+ * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
+ * @param context           list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans);
+
+/**
+*@code      stopSwssNotificationPoll
+*
+*@brief     stop SWSS listening thread
+*
+*@return    none
+*/
+void stopSwssNotificationPoll();
diff --git a/src/dhcp6relay/src/main.cpp b/src/dhcp6relay/src/main.cpp
new file mode 100644
index 000000000000..9f5bc74bcfa0
--- /dev/null
+++ b/src/dhcp6relay/src/main.cpp
@@ -0,0 +1,18 @@
+#include <stdlib.h>
+#include <syslog.h>
+#include "configInterface.h"
+
+int main(int argc, char *argv[]) {
+    try {
+        std::vector<relay_config> vlans;
+        swss::DBConnector state_db("STATE_DB", 0);
+        initialize_swss(&vlans);
+        loop_relay(&vlans, &state_db);
+    }
+    catch (std::exception &e)
+    {
+        syslog(LOG_ERR, "An exception occurred.\n");
+        return 1;
+    }
+    return 0;
+}
diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
new file mode 100644
index 000000000000..e2eb8e4fac12
--- /dev/null
+++ b/src/dhcp6relay/src/relay.cpp
@@ -0,0 +1,738 @@
+#include <errno.h>
+#include <unistd.h>
+#include <event.h>
+#include <sstream>
+#include <event2/event.h>
+#include <event2/bufferevent.h>
+#include <syslog.h>
+#include <signal.h>
+
+#include "configdb.h"
+#include "sonicv2connector.h"
+#include "dbconnector.h" 
+#include "configInterface.h"
+
+
+struct event *listen_event;
+struct event *server_listen_event;
+struct event_base *base;
+struct event *ev_sigint;
+struct event *ev_sigterm;
+static std::string counter_table = "DHCPv6_COUNTER_TABLE|";
+
+/* DHCPv6 filter */
+/* sudo tcpdump -dd "ip6 dst ff02::1:2 && udp dst port 547" */
+
+static struct sock_filter ether_relay_filter[] = {
+	
+	{ 0x28, 0, 0, 0x0000000c },
+	{ 0x15, 0, 13, 0x000086dd },
+	{ 0x20, 0, 0, 0x00000026 },
+	{ 0x15, 0, 11, 0xff020000 },
+	{ 0x20, 0, 0, 0x0000002a },
+	{ 0x15, 0, 9, 0x00000000 },
+	{ 0x20, 0, 0, 0x0000002e },
+	{ 0x15, 0, 7, 0x00000000 },
+	{ 0x20, 0, 0, 0x00000032 },
+	{ 0x15, 0, 5, 0x00010002 },
+	{ 0x30, 0, 0, 0x00000014 },
+	{ 0x15, 0, 3, 0x00000011 },
+	{ 0x28, 0, 0, 0x00000038 },
+	{ 0x15, 0, 1, 0x00000223 },
+	{ 0x6, 0, 0, 0x00040000 },
+	{ 0x6, 0, 0, 0x00000000 },
+};
+const struct sock_fprog ether_relay_fprog = {
+	lengthof(ether_relay_filter),
+	ether_relay_filter
+};
+
+/* DHCPv6 Counter */
+uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
+std::map<int, std::string> counterMap = {{1, "Solicit"},
+                                      {2, "Advertise"},
+                                      {3, "Request"},
+                                      {4, "Confirm"},
+                                      {5, "Renew"},
+                                      {6, "Rebind"},
+                                      {7, "Reply"},
+                                      {8, "Release"},
+                                      {9, "Decline"},
+                                      {12, "Relay-Forward"},
+                                      {13, "Relay-Reply"}};
+
+/**
+ * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+ *
+ * @brief               initialize the counter by each Vlan
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * 
+ * @return              none
+ */
+void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
+    db->hset(counterVlan, "Solicit", toString(counters[DHCPv6_MESSAGE_TYPE_SOLICIT]));
+    db->hset(counterVlan, "Advertise", toString(counters[DHCPv6_MESSAGE_TYPE_ADVERTISE]));
+    db->hset(counterVlan, "Request", toString(counters[DHCPv6_MESSAGE_TYPE_REQUEST]));
+    db->hset(counterVlan, "Confirm", toString(counters[DHCPv6_MESSAGE_TYPE_CONFIRM]));
+    db->hset(counterVlan, "Renew", toString(counters[DHCPv6_MESSAGE_TYPE_RENEW]));
+    db->hset(counterVlan, "Rebind", toString(counters[DHCPv6_MESSAGE_TYPE_REBIND]));
+    db->hset(counterVlan, "Reply", toString(counters[DHCPv6_MESSAGE_TYPE_REPLY]));
+    db->hset(counterVlan, "Release", toString(counters[DHCPv6_MESSAGE_TYPE_RELEASE]));
+    db->hset(counterVlan, "Decline", toString(counters[DHCPv6_MESSAGE_TYPE_DECLINE]));
+    db->hset(counterVlan, "Relay-Forward", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_FORW]));
+    db->hset(counterVlan, "Relay-Reply", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_REPL]));
+}
+
+/**
+ * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
+ *
+ * @brief               update the counter in state_db with count of each DHCPv6 message type
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * @param msg_type      dhcpv6 message type to be updated in counter
+ * 
+ * @return              none
+ */
+void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type) {
+    db->hset(counterVlan, counterMap.find(msg_type)->second, toString(counters[msg_type]));
+}
+
+/**
+ * @code                std::string toString(uint16_t count);
+ *
+ * @brief               convert uint16_t to string
+ *
+ * @param count         count of messages in counter
+ * 
+ * @return              count in string
+ */
+std::string toString(uint16_t count) {
+    std::stringstream ss;
+    ss << count;
+    std::string countValue = ss.str();
+    return countValue;
+}
+
+/**
+ * @code                bool is_addr_gua(in6_addr addr);
+ *
+ * @brief               check if address is global
+ *
+ * @param addr         ipv6 address
+ * 
+ * @return              bool
+ */
+bool is_addr_gua(in6_addr addr) {
+    auto masked = addr.__in6_u.__u6_addr8[0] & 0xe0;
+    return (masked ^ 0x20) == 0x00;
+}
+
+/**
+ * @code                is_addr_link_local(in6_addr addr);
+ *
+ * @brief               check if address is link_local
+ *
+ * @param addr         ipv6 address
+ * 
+ * @return              bool
+ */
+bool is_addr_link_local(in6_addr addr)  {
+    auto masked = ntohs(addr.__in6_u.__u6_addr16[0]) & 0xffc0;
+    return (masked ^ 0xfe80) == 0x0000;
+}
+
+/**
+ * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ethernet frame
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ether_header end of ethernet header position
+ */
+const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct ether_header);
+    return (const struct ether_header *)buffer;
+}
+
+/**
+ * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ipv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ip6_hdr      end of ipv6 header position
+ */
+const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct ip6_hdr);
+    return (struct ip6_hdr *)buffer;
+}
+
+/**
+ * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through udp header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return udphdr      end of udp header position
+ */
+const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct udphdr);
+    return (const struct udphdr *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_msg   end of dhcpv6 header position
+ */
+const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer) {
+    return (const struct dhcpv6_msg *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 relay message
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
+ */
+const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer) {
+    return (const struct dhcpv6_relay_msg *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through dhcpv6 option
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end) {
+    uint32_t size = 4; // option-code + option-len
+    size += ntohs(*(uint16_t *)(buffer + 2));
+    (*out_end) = buffer + size;
+
+    return (const struct dhcpv6_option *)buffer;
+}
+
+/**
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n);
+ *
+ * @brief                           send udp packet
+ *
+ * @param *buffer                   message buffer
+ * @param sockaddr_in6 target       target socket
+ * @param n                         length of message
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n) {    
+    if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
+        syslog(LOG_ERR, "sendto: Failed to send to target address\n");
+}
+
+/**
+ * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+ *
+ * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
+ *
+ * @param buffer        pointer to buffer
+ * @param msg           pointer to parsed DHCPv6 message
+ * @param msg_length    length of DHCPv6 message
+ *
+ * @return              none
+ */
+void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length) {
+    struct dhcpv6_option option;
+    option.option_code = htons(OPTION_RELAY_MSG);
+    option.option_length = htons(msg_length);
+    memcpy(buffer, &option, sizeof(struct dhcpv6_option));
+    memcpy(buffer + sizeof(struct dhcpv6_option), msg, msg_length);
+}
+
+/**
+ * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
+ *
+ * @brief               prepare L2 socket to attach to "udp and port 547" filter 
+ *
+ * @param ifindex       interface index
+ * @param fprog         bpf filter "udp and port 547"
+ *
+ * @return              socket descriptor
+ */
+int sock_open(int ifindex, const struct sock_fprog *fprog)
+{
+	if (!ifindex) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	int s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+	if (s == -1) {
+		syslog(LOG_ERR, "socket: Failed to create socket\n");
+		return -1;
+	}
+
+	struct sockaddr_ll sll = {
+	    .sll_family = AF_PACKET,
+	    .sll_protocol = htons(ETH_P_ALL),
+	    .sll_ifindex = ifindex
+	};
+
+	if (bind(s, (struct sockaddr *)&sll, sizeof sll) == -1) {
+		syslog(LOG_ERR, "bind: Failed to bind to specified interface\n");
+		(void) close(s);
+	    return -1;
+	}
+
+	if (fprog && setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, fprog, sizeof *fprog) == -1)
+	{
+		syslog(LOG_ERR, "setsockopt: Failed to attach filter\n");
+		(void) close(s);
+	    return -1;
+	}
+
+	return s;
+}
+
+/**
+ * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
+ * 
+ * @brief                       prepare for specified relay interface config: server and link address
+ *
+ * @param interface_config      pointer to relay config to be prepared
+ * @param local_sock            L3 socket used for relaying messages
+ * @param filter                socket attached with filter
+ *
+ * @return                      none
+ */
+void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter) {
+    struct ifaddrs *ifa, *ifa_tmp;
+    sockaddr_in6 non_link_local;
+    sockaddr_in6 link_local;
+    
+    interface_config->local_sock = *local_sock; 
+    interface_config->filter = filter; 
+
+    for(auto server: interface_config->servers) {
+        sockaddr_in6 tmp;
+        if(inet_pton(AF_INET6, server.c_str(), &tmp.sin6_addr) != 1)
+        {
+            syslog(LOG_WARNING, "inet_pton: Failed to convert IPv6 address\n");
+        }
+        tmp.sin6_family = AF_INET6;
+        tmp.sin6_flowinfo = 0;
+        tmp.sin6_port = htons(RELAY_PORT);
+        tmp.sin6_scope_id = 0; 
+        interface_config->servers_sock.push_back(tmp);
+    }
+
+    if (getifaddrs(&ifa) == -1) {
+        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
+        exit(1);
+    }
+
+    ifa_tmp = ifa;
+    while (ifa_tmp) {
+        if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
+            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && is_addr_gua(in6->sin6_addr)) {    
+                non_link_local = *in6;
+                break;
+            }
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && is_addr_link_local(in6->sin6_addr)) {    
+                link_local = *in6;
+            }   
+        }
+    ifa_tmp = ifa_tmp->ifa_next;
+    }
+    freeifaddrs(ifa); 
+    
+    if(is_addr_gua(non_link_local.sin6_addr)) {
+        interface_config->link_address = non_link_local;
+    }
+    else {
+        interface_config->link_address = link_local;
+    }
+}
+
+/**
+ * @code                prepare_socket(int *local_sock);
+ * 
+ * @brief               prepare L3 socket for sending
+ *
+ * @param local_sock    pointer to socket to be prepared
+ *
+ * @return              none
+ */
+void prepare_socket(int *local_sock) {
+    int flag = 1;
+    sockaddr_in6 addr;
+    memset(&addr, 0, sizeof(addr));
+    addr.sin6_family = AF_INET6;
+    addr.sin6_addr = in6addr_any;
+    addr.sin6_port = htons(RELAY_PORT);
+
+    if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
+        syslog(LOG_ERR, "socket: Failed to create socket\n");
+    }
+
+    if((setsockopt(*local_sock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag))) == -1) {
+		syslog(LOG_ERR, "setsockopt: Unable to set socket option\n");
+	}
+    
+    if (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1) {
+        syslog(LOG_ERR, "bind: Failed to bind to socket\n");
+    }    
+}
+
+
+/**
+ * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+ * 
+ * @brief                construct relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param ether_hdr      pointer to Ethernet header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config) {    
+    static uint8_t buffer[4096];
+    auto current_buffer_position = buffer;
+    dhcpv6_relay_msg new_message;
+    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
+    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
+    new_message.hop_count = 0;
+
+    memcpy(&new_message.link_address, &config->link_address.sin6_addr, sizeof(in6_addr));
+    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
+    current_buffer_position += sizeof(dhcpv6_relay_msg);
+
+    if(config->is_option_79) {
+        linklayer_addr_option option79;
+        option79.link_layer_type = htons(1);
+        option79.option_code = htons(OPTION_CLIENT_LINKLAYER_ADDR);
+        option79.option_length = htons(2 + 6); // link_layer_type field + address
+        
+        memcpy(current_buffer_position, &option79, sizeof(linklayer_addr_option));
+        current_buffer_position += sizeof(linklayer_addr_option);
+
+        memcpy(current_buffer_position, &ether_hdr->ether_shost, sizeof(ether_hdr->ether_shost));
+        current_buffer_position += sizeof(ether_hdr->ether_shost);
+    }
+
+    auto dhcp_message_length = len;
+    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
+    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
+
+    for(auto server: config->servers_sock) {
+        send_udp(sock, buffer, server, current_buffer_position - buffer);
+    }
+}
+
+/**
+ * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+ * 
+ * @brief               relay and unwrap a relay-reply message
+ *
+ * @param sock          L3 socket for sending data to servers
+ * @param msg           pointer to dhcpv6 message header position
+ * @param len           size of data received
+ * @param config        relay interface config
+ *
+ * @return              none
+ */
+ void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs) {
+    static uint8_t buffer[4096];
+    char ifname[configs->interface.size()];
+    struct sockaddr_in6 target_addr;
+    auto current_buffer_position = buffer;
+    auto current_position = msg;
+    const uint8_t *tmp = NULL;
+    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
+    current_position += sizeof(struct dhcpv6_relay_msg);
+    
+    while ((current_position - msg) != len) {
+        auto option = parse_dhcpv6_opt(current_position, &tmp);
+        current_position = tmp;
+        switch (ntohs(option->option_code)) {
+            case OPTION_RELAY_MSG:
+                memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
+                current_buffer_position += ntohs(option->option_length);
+                break;
+            default:
+                break;
+        }
+    }
+
+    strcpy(ifname, configs->interface.c_str());
+    memcpy(&target_addr.sin6_addr, &dhcp_relay_header->peer_address, sizeof(struct in6_addr));
+    target_addr.sin6_family = AF_INET6;
+    target_addr.sin6_flowinfo = 0;
+    target_addr.sin6_port = htons(CLIENT_PORT);
+    target_addr.sin6_scope_id = if_nametoindex(ifname);
+
+    send_udp(sock, buffer, target_addr, current_buffer_position - buffer);
+} 
+
+
+/**
+ * @code                callback(evutil_socket_t fd, short event, void *arg);
+ * 
+ * @brief               callback for libevent that is called everytime data is received at the filter socket
+ *
+ * @param fd            filter socket
+ * @param event         libevent triggered event  
+ * @param arg           callback argument provided by user
+ *
+ * @return              none
+ */
+void callback(evutil_socket_t fd, short event, void *arg) {
+    struct relay_config *config = (struct relay_config *)arg;
+    static uint8_t message_buffer[4096];
+    uint32_t len = recv(config->filter, message_buffer, 4096, 0);
+    if (len <= 0) {
+        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket\n");
+    }
+
+    char* ptr = (char *)message_buffer;
+    const uint8_t *current_position = (uint8_t *)ptr; 
+    const uint8_t *tmp = NULL;
+
+    auto ether_header = parse_ether_frame(current_position, &tmp);
+    current_position = tmp;
+
+    auto ip_header = parse_ip6_hdr(current_position, &tmp);
+    current_position = tmp;
+
+    if (ip_header->ip6_ctlun.ip6_un1.ip6_un1_nxt != IPPROTO_UDP) {
+        const struct ip6_ext *ext_header;
+        do {
+            ext_header = (const struct ip6_ext *)current_position;
+            current_position += ext_header->ip6e_len;
+        }
+        while (ext_header->ip6e_nxt != IPPROTO_UDP);
+    }  
+
+    auto udp_header = parse_udp(current_position, &tmp);
+    current_position = tmp;
+
+    auto msg = parse_dhcpv6_hdr(current_position);
+    counters[msg->msg_type]++;
+    std::string counterVlan = counter_table;
+    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
+
+    relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
+}
+
+/**
+ * @code                void server_callback(evutil_socket_t fd, short event, void *arg);
+ * 
+ * @brief               callback for libevent that is called everytime data is received at the server socket
+ *
+ * @param fd            filter socket
+ * @param event         libevent triggered event  
+ * @param arg           callback argument provided by user
+ *
+ * @return              none
+ */
+void server_callback(evutil_socket_t fd, short event, void *arg) {
+    struct relay_config *config = (struct relay_config *)arg;
+    sockaddr_in6 from;
+    socklen_t len = sizeof(from);
+    int32_t data = 0;
+    static uint8_t message_buffer[4096];
+
+    if ((data = recvfrom(config->local_sock, message_buffer, 4096, 0, (sockaddr *)&from, &len)) == -1) {
+        syslog(LOG_WARNING, "recv: Failed to receive data from server\n");
+    }
+
+    auto msg = parse_dhcpv6_hdr(message_buffer);
+    counters[msg->msg_type]++;
+    std::string counterVlan = counter_table;
+    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
+    if (msg->msg_type == DHCPv6_MESSAGE_TYPE_RELAY_REPL) {
+        relay_relay_reply(config->local_sock, message_buffer, data, config);
+    }
+}
+
+/**
+ * @code signal_init();
+ *
+ * @brief initialize DHCPv6 Relay libevent signals
+ */
+int signal_init() {
+    int rv = -1;
+     do {
+        ev_sigint = evsignal_new(base, SIGINT, signal_callback, base);
+        if (ev_sigint == NULL) {
+            syslog(LOG_ERR, "Could not create SIGINT libevent signal\n");
+            break;
+        }
+
+        ev_sigterm = evsignal_new(base, SIGTERM, signal_callback, base);
+        if (ev_sigterm == NULL) {
+            syslog(LOG_ERR, "Could not create SIGTERM libevent signal\n");
+            break;
+        }
+        rv = 0;
+    } while(0);
+    return rv;
+}
+
+/**
+ * @code signal_start();
+ *
+ * @brief start DHCPv6 Relay libevent base and add signals
+ */
+int signal_start()
+{
+    int rv = -1;
+    do
+    {
+        if (evsignal_add(ev_sigint, NULL) != 0) {
+            syslog(LOG_ERR, "Could not add SIGINT libevent signal\n");
+            break;
+        }
+
+        if (evsignal_add(ev_sigterm, NULL) != 0) {
+            syslog(LOG_ERR, "Could not add SIGTERM libevent signal\n");
+            break;
+        }
+
+        if (event_base_dispatch(base) != 0) {
+            syslog(LOG_ERR, "Could not start libevent dispatching loop\n");
+        }
+
+        rv = 0;
+    } while (0);
+
+    return rv;
+}
+
+/**
+ * @code signal_callback(fd, event, arg);
+ *
+ * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
+ *
+ * @param fd        libevent socket
+ * @param event     event triggered
+ * @param arg       pointer to libevent base
+ *
+ * @return none
+ */
+void signal_callback(evutil_socket_t fd, short event, void *arg)
+{
+    syslog(LOG_ALERT, "Received signal: '%s'\n", strsignal(fd));
+    if ((fd == SIGTERM) || (fd == SIGINT)) {
+        dhcp6relay_stop();
+    }
+}
+
+/**
+ * @code dhcp6relay_stop();
+ *
+ * @brief stop DHCPv6 Relay libevent loop upon signal
+ */
+void dhcp6relay_stop()
+{
+    event_base_loopexit(base, NULL);
+}
+
+/**
+ * @code                loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
+ * 
+ * @brief               main loop: configure sockets, create libevent base, start server listener thread
+ *  
+ * @param vlans         list of vlans retrieved from config_db
+ * @param db            state_db connector
+ */
+void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
+    std::vector<int> sockets;
+    
+    for(std::size_t i = 0; i<vlans->size(); i++) {
+        struct relay_config config = vlans->at(i);
+        int filter = 0;
+        int local_sock = 0; 
+        const char *ifname = config.interface.c_str();
+        int index = if_nametoindex(ifname);
+        config.db = db;
+
+        std::string counterVlan = counter_table;
+        initialize_counter(config.db, counterVlan.append(config.interface));
+
+        filter = sock_open(index, &ether_relay_fprog);
+
+        prepare_socket(&local_sock);
+        sockets.push_back(filter);
+        sockets.push_back(local_sock);
+
+        prepare_relay_config(&config, &local_sock, filter);
+
+        evutil_make_listen_socket_reuseable(filter);
+        evutil_make_socket_nonblocking(filter);
+
+        evutil_make_listen_socket_reuseable(local_sock);
+        evutil_make_socket_nonblocking(local_sock);
+
+        base = event_base_new();
+        if(base == NULL) {
+            syslog(LOG_ERR, "libevent: Failed to create base\n");
+        }
+
+        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, (void *)&config);
+        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, (void *)&config);
+        if (listen_event == NULL || server_listen_event == NULL) {
+            syslog(LOG_ERR, "libevent: Failed to create libevent\n");
+        }
+
+        event_add(listen_event, NULL);
+        event_add(server_listen_event, NULL);
+    }
+    
+    if((signal_init() == 0) && signal_start() == 0) {
+        shutdown();
+        for(std::size_t i = 0; i<sockets.size(); i++) {
+            close(sockets.at(i));
+        }
+    }
+}
+
+/**
+ * @code shutdown();
+ *
+ * @brief free signals and terminate threads
+ */
+void shutdown() {
+    event_del(ev_sigint);
+    event_del(ev_sigterm);
+    event_free(ev_sigint); 
+    event_free(ev_sigterm);
+    event_base_free(base);
+    deinitialize_swss();
+}
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
new file mode 100644
index 000000000000..ddd63559c66b
--- /dev/null
+++ b/src/dhcp6relay/src/relay.h
@@ -0,0 +1,354 @@
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <linux/if_packet.h>
+#include <netinet/if_ether.h>	
+#include <netinet/ip6.h>
+#include <netinet/udp.h>
+#include <ifaddrs.h>
+#include <linux/filter.h>
+#include <string>
+#include <vector>
+#include <event2/util.h>
+
+
+#define PACKED __attribute__ ((packed))
+
+#define RELAY_PORT 547
+#define CLIENT_PORT 546
+#define HOP_LIMIT 32
+
+#define lengthof(A) (sizeof (A) / sizeof (A)[0])
+
+#define OPTION_RELAY_MSG 9
+#define OPTION_CLIENT_LINKLAYER_ADDR 79
+
+/* DHCPv6 message types */
+typedef enum
+{
+    DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
+    DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
+    DHCPv6_MESSAGE_TYPE_REQUEST = 3,
+    DHCPv6_MESSAGE_TYPE_CONFIRM  = 4,
+    DHCPv6_MESSAGE_TYPE_RENEW  = 5,
+    DHCPv6_MESSAGE_TYPE_REBIND = 6,
+    DHCPv6_MESSAGE_TYPE_REPLY = 7,
+    DHCPv6_MESSAGE_TYPE_RELEASE = 8,
+    DHCPv6_MESSAGE_TYPE_DECLINE = 9,
+    DHCPv6_MESSAGE_TYPE_RELAY_FORW = 12,
+    DHCPv6_MESSAGE_TYPE_RELAY_REPL = 13,
+
+    DHCPv6_MESSAGE_TYPE_COUNT
+} dhcp_message_type_t;
+
+struct relay_config {
+    int local_sock; 
+    int filter;
+    sockaddr_in6 link_address;
+    swss::DBConnector *db;
+    std::string interface;
+    std::vector<std::string> servers;
+    std::vector<sockaddr_in6> servers_sock;
+    bool is_option_79;
+};
+
+
+/* DHCPv6 messages and options */
+
+struct dhcpv6_msg {
+    uint8_t msg_type;
+};
+
+struct PACKED dhcpv6_relay_msg {
+    uint8_t msg_type;
+    uint8_t hop_count;
+    struct in6_addr link_address;
+    struct in6_addr peer_address;
+};
+
+
+struct dhcpv6_option {
+    uint16_t option_code;
+    uint16_t option_length;
+};
+
+struct linklayer_addr_option  {
+    uint16_t option_code;
+    uint16_t option_length;
+    uint16_t link_layer_type;
+};
+
+/**
+ * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
+ *
+ * @brief               prepare L2 socket to attach to "udp and port 547" filter 
+ *
+ * @param ifindex       interface index
+ * @param fprog         bpf filter "udp and port 547"
+ *
+ * @return              socket descriptor
+ */
+int sock_open(int ifindex, const struct sock_fprog *fprog);
+
+/**
+ * @code                prepare_socket(int *local_sock);
+ * 
+ * @brief               prepare L3 socket for sending
+ *
+ * @param local_sock    pointer to socket to be prepared
+ *
+ * @return              none
+ */
+void prepare_socket(int *local_sock);
+
+/**
+ * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
+ * 
+ * @brief                       prepare for specified relay interface config: server and link address
+ *
+ * @param interface_config      pointer to relay config to be prepared
+ * @param local_sock            L3 socket used for relaying messages
+ * @param filter                socket attached with filter
+ *
+ * @return                      none
+ */
+void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter);
+
+/**
+ * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+ *
+ * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
+ *
+ * @param buffer        pointer to buffer
+ * @param msg           pointer to parsed DHCPv6 message
+ * @param msg_length    length of DHCPv6 message
+ *
+ * @return              none
+ */
+void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+
+/**
+ * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+ * 
+ * @brief                construct relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param ether_hdr      pointer to Ethernet header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+
+/**
+ * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+ * 
+ * @brief               relay and unwrap a relay-reply message
+ *
+ * @param sock          L3 socket for sending data to servers
+ * @param msg           pointer to dhcpv6 message header position
+ * @param len           size of data received
+ * @param config        relay interface config
+ *
+ * @return              none
+ */
+void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+
+/**
+ * @code                loop_relay(std::vector<arg_config> *vlans, swss::DBConnector *db);
+ * 
+ * @brief               main loop: configure sockets, create libevent base, start server listener thread
+ *  
+ * @param vlans         list of vlans retrieved from config_db
+ * @param db            state_db connector
+ */
+void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
+
+/**
+ * @code signal_init();
+ *
+ * @brief initialize DHCPv6 Relay libevent signals
+ */
+int signal_init();
+
+/**
+ * @code signal_start();
+ *
+ * @brief start DHCPv6 Relay libevent base and add signals
+ */
+int signal_start();
+
+/**
+ * @code dhcp6relay_stop();
+ *
+ * @brief stop DHCPv6 Relay libevent loop upon signal
+ */
+void dhcp6relay_stop();
+
+/**
+ * @code signal_callback(fd, event, arg);
+ *
+ * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
+ *
+ * @param fd        libevent socket
+ * @param event     event triggered
+ * @param arg       pointer to libevent base
+ *
+ * @return none
+ */
+void signal_callback(evutil_socket_t fd, short event, void *arg);
+
+/**
+ * @code shutdown();
+ *
+ * @brief free signals and terminate threads
+ */
+void shutdown();
+
+/**
+ * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+ *
+ * @brief               initialize the counter by each Vlan
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * 
+ * @return              none
+ */
+void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+
+/**
+ * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
+ *
+ * @brief               update the counter in state_db with count of each DHCPv6 message type
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * @param msg_type      dhcpv6 message type to be updated in counter
+ * 
+ * @return              none
+ */
+void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type);
+
+/* Helper functions */
+
+/**
+ * @code                std::string toString(uint16_t count);
+ *
+ * @brief               convert uint16_t to string
+ *
+ * @param count         count of messages in counter
+ * 
+ * @return              count in string
+ */
+std::string toString(uint16_t count);
+
+/**
+ * @code                bool is_addr_gua(in6_addr addr);
+ *
+ * @brief               check if address is global
+ *
+ * @param addr         ipv6 address
+ * 
+ * @return              bool
+ */
+bool is_addr_gua(in6_addr addr);
+
+/**
+ * @code                is_addr_link_local(in6_addr addr);
+ *
+ * @brief               check if address is link_local
+ *
+ * @param addr         ipv6 address
+ * 
+ * @return              bool
+ */
+bool is_addr_link_local(in6_addr addr);
+
+/**
+ * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ethernet frame
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ether_header end of ethernet header position
+ */
+const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ipv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ip6_hdr      end of ipv6 header position
+ */
+const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through udp header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return udphdr      end of udp header position
+ */
+const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_msg   end of dhcpv6 header position
+ */
+const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+
+/**
+ * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 relay message
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
+ */
+const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+
+/**
+ * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through dhcpv6 option
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n);
+ *
+ * @brief                           send udp packet
+ *
+ * @param *buffer                   message buffer
+ * @param sockaddr_in6 target       target socket
+ * @param n                         length of message
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+void send_udp(int sock, struct sockaddr_in6 target, uint8_t *buffer, uint32_t n);
+
diff --git a/src/dhcp6relay/src/subdir.mk b/src/dhcp6relay/src/subdir.mk
new file mode 100644
index 000000000000..af378319d78f
--- /dev/null
+++ b/src/dhcp6relay/src/subdir.mk
@@ -0,0 +1,23 @@
+CC := g++
+
+C_SRCS += \
+../src/relay.c \
+../src/configInterface.c \
+../src/main.c 
+
+OBJS += \
+./src/relay.o \
+./src/configInterface.o \
+./src/main.o 
+
+C_DEPS += \
+./src/relay.d \
+./src/configInterface.d \
+./src/main.d 
+
+src/%.o: src/%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C++ Compiler'
+	$(CC) -std=c++17 -D__FILENAME__="$(subst src/,,$<)" $(LIBS) -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index 35dfe5ea4b5d..a9004e2b00f5 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -39,8 +39,8 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
-[group:isc-dhcp-relay]
-programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv6-relay-Vlan1000
+[group:dhcp-relay]
+programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
 
 [program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
@@ -52,8 +52,9 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
-[program:isc-dhcpv6-relay-Vlan1000]
-command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l Vlan1000 -u fc02:2000::1%%PortChannel04  -u fc02:2000::1%%PortChannel03  -u fc02:2000::1%%PortChannel01  -u fc02:2000::1%%PortChannel02  -u fc02:2000::2%%PortChannel04  -u fc02:2000::2%%PortChannel03  -u fc02:2000::2%%PortChannel01  -u fc02:2000::2%%PortChannel02 
+[program:dhcp6relay]
+command=/usr/sbin/dhcp6relay
+
 priority=3
 autostart=false
 autorestart=false
@@ -74,6 +75,6 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running isc-dhcpv6-relay-Vlan1000:running
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running dhcp6relay:running
 
 
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index bc24433a14cf..521899b939f4 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -39,8 +39,8 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
-[group:isc-dhcp-relay]
-programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv6-relay-Vlan1000
+[group:dhcp-relay]
+programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
 
 [program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
@@ -52,8 +52,9 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
-[program:isc-dhcpv6-relay-Vlan1000]
-command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l Vlan1000 -u fc02:2000::1%%PortChannel01  -u fc02:2000::1%%PortChannel02  -u fc02:2000::1%%PortChannel03  -u fc02:2000::1%%PortChannel04  -u fc02:2000::2%%PortChannel01  -u fc02:2000::2%%PortChannel02  -u fc02:2000::2%%PortChannel03  -u fc02:2000::2%%PortChannel04 
+[program:dhcp6relay]
+command=/usr/sbin/dhcp6relay
+
 priority=3
 autostart=false
 autorestart=false
@@ -74,6 +75,6 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running isc-dhcpv6-relay-Vlan1000:running
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running dhcp6relay:running
 
 

From f2f88a0fd6befa5d3c5437ecbccf73cea6598f31 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Thu, 23 Sep 2021 01:18:56 -0700
Subject: [PATCH 0825/1674] Update minigraph parser to support type MIRROR_DSCP
 (#8819)

* Update minigraph parser to support MIRROR_DSCP

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-config-engine/minigraph.py               | 13 +++++++++----
 .../tests/simple-sample-graph-case.xml             |  5 +++++
 .../tests/test_minigraph_case.py                   | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index d4fffc21c43f..927c5817f930 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -586,6 +586,7 @@ def parse_dpg(dpg, hname):
             acl_intfs = []
             is_mirror = False
             is_mirror_v6 = False
+            is_mirror_dscp = False
 
             # TODO: Ensure that acl_intfs will only ever contain front-panel interfaces (e.g.,
             # maybe we should explicity ignore management and loopback interfaces?) because we
@@ -608,8 +609,10 @@ def parse_dpg(dpg, hname):
                     # Give a warning if trying to attach ACL to a LAG member interface, correct way is to attach ACL to the LAG interface
                     if port_alias_map[member] in intfs_inpc:
                         print("Warning: ACL " + aclname + " is attached to a LAG member interface " + port_alias_map[member] + ", instead of LAG interface", file=sys.stderr)
-                elif member.lower().startswith('erspan') or member.lower().startswith('egress_erspan'):
-                    if member.lower().startswith('erspanv6') or member.lower().startswith('egress_erspanv6'):
+                elif member.lower().startswith('erspan') or member.lower().startswith('egress_erspan') or member.lower().startswith('erspan_dscp'):
+                    if 'dscp' in member.lower():
+                        is_mirror_dscp = True
+                    elif member.lower().startswith('erspanv6') or member.lower().startswith('egress_erspanv6'):
                         is_mirror_v6 = True
                     else:
                         is_mirror = True
@@ -629,7 +632,7 @@ def parse_dpg(dpg, hname):
             # are binded then do not classify as Control plane.
             # For multi-asic platforms it's possible there is no
             # interface are binded to everflow in host namespace.
-            if acl_intfs or is_mirror_v6 or is_mirror:
+            if acl_intfs or is_mirror_v6 or is_mirror or is_mirror_dscp:
                 # Remove duplications
                 dedup_intfs = []
                 for intf in acl_intfs:
@@ -643,6 +646,8 @@ def parse_dpg(dpg, hname):
                     acls[aclname]['type'] = 'MIRROR'
                 elif is_mirror_v6:
                     acls[aclname]['type'] = 'MIRRORV6'
+                elif is_mirror_dscp:
+                    acls[aclname]['type'] = 'MIRROR_DSCP'
                 else:
                     acls[aclname]['type'] = 'L3V6' if  'v6' in aclname.lower() else 'L3'
             else:
@@ -1037,7 +1042,7 @@ def filter_acl_table_bindings(acls, neighbors, port_channels, sub_role):
         # Control Plane ACL has no Interface associated and
         # Data Plane ACL Interface are attached via minigraph
         # AclInterface.
-        if group_type != 'MIRROR' and group_type != 'MIRRORV6':
+        if group_type != 'MIRROR' and group_type != 'MIRRORV6' and group_type != 'MIRROR_DSCP':
             continue
 
         # Filters out back-panel ports from the binding list for Everflow (Mirror)
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
index 78e81bd6df78..acaab2c4c7e3 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -189,6 +189,11 @@
           <InAcl>SNMP_ACL</InAcl>
           <Type>SNMP</Type>
         </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN_DSCP</AttachTo>
+          <InAcl>Everflow_dscp</InAcl>
+          <Type>Everflow_dscp</Type>
+        </AclInterface>
       </AclInterfaces>
       <DownstreamSummaries/>
       <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 560d0990fdcb..9a494e86cd2b 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -381,5 +381,19 @@ def test_dhcp_table(self):
             utils.to_dict(output.strip()),
             expected
         )
+    
+    def test_minigraph_mirror_dscp(self):
+        result = minigraph.parse_xml(self.sample_graph, port_config_file=self.port_config)
+        self.assertTrue('EVERFLOW_DSCP' in result['ACL_TABLE'])
+        everflow_dscp_entry = result['ACL_TABLE']['EVERFLOW_DSCP']
         
+        self.assertEqual(everflow_dscp_entry['type'], 'MIRROR_DSCP')
+        self.assertEqual(everflow_dscp_entry['stage'], 'ingress')
+        expected_ports = ['PortChannel01', 'Ethernet12', 'Ethernet8', 'Ethernet0']
+        self.assertEqual(
+            everflow_dscp_entry['ports'].sort(),
+            expected_ports.sort()
+        )
+
+
     

From 162e42a85f66d289a276263984aeca08cdafbdfe Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Wed, 29 Sep 2021 15:41:47 -0700
Subject: [PATCH 0826/1674] Reduce logging level for RESTAPI from trace to info
 (#8858)

---
 src/sonic-config-engine/minigraph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 927c5817f930..3f0e437b611d 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1535,7 +1535,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         'config': {
             'client_auth': 'true',
             'allow_insecure': 'false',
-            'log_level': 'trace'
+            'log_level': 'info'
         },
         'certs': {
             'server_crt': '/etc/sonic/credentials/restapiserver.crt',

From 7b90fbe52f393707c739f964fb0796830be10dbb Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Wed, 29 Sep 2021 15:43:04 -0700
Subject: [PATCH 0827/1674] [RESTAPI] submodule update (#8859)

Rejection of incorrect CIDR addresses while configuring routes.
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index ee887c785c10..e466ac226c48 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit ee887c785c10d8b4f70db90ca50cc398327c5d73
+Subproject commit e466ac226c48cf87f83aa5564efd7155ac97a0c1

From 20ff3e6ae5c2c1dc615f1cd7c360c7872abce52a Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 30 Sep 2021 15:27:54 -0700
Subject: [PATCH 0828/1674] [Nokia 7215] Rename alias column with etpN
 normination (#8879)

also add hwsku alias Nokia-M0-7215

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Nokia-7215/port_config.ini                | 106 +++++++++---------
 .../armhf-nokia_ixs7215_52x-r0/Nokia-M0-7215  |   1 +
 2 files changed, 54 insertions(+), 53 deletions(-)
 create mode 120000 device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-M0-7215

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/port_config.ini b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/port_config.ini
index 062c252ce195..ce285a14df7e 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/port_config.ini
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/port_config.ini
@@ -1,53 +1,53 @@
-# name       lanes   alias        index     speed
-Ethernet0     1      Ethernet0     1        1000
-Ethernet1     2      Ethernet1     2        1000
-Ethernet2     3      Ethernet2     3        1000
-Ethernet3     4      Ethernet3     4        1000
-Ethernet4     5      Ethernet4     5        1000
-Ethernet5     6      Ethernet5     6        1000
-Ethernet6     7      Ethernet6     7        1000
-Ethernet7     8      Ethernet7     8        1000
-Ethernet8     9      Ethernet8     9        1000
-Ethernet9     10     Ethernet9     10       1000
-Ethernet10    11     Ethernet10    11       1000
-Ethernet11    12     Ethernet11    12       1000
-Ethernet12    13     Ethernet12    13       1000
-Ethernet13    14     Ethernet13    14       1000
-Ethernet14    15     Ethernet14    15       1000
-Ethernet15    16     Ethernet15    16       1000
-Ethernet16    17     Ethernet16    17       1000
-Ethernet17    18     Ethernet17    18       1000
-Ethernet18    19     Ethernet18    19       1000
-Ethernet19    20     Ethernet19    20       1000
-Ethernet20    21     Ethernet20    21       1000
-Ethernet21    22     Ethernet21    22       1000
-Ethernet22    23     Ethernet22    23       1000
-Ethernet23    24     Ethernet23    24       1000
-Ethernet24    25     Ethernet24    25       1000
-Ethernet25    26     Ethernet25    26       1000
-Ethernet26    27     Ethernet26    27       1000
-Ethernet27    28     Ethernet27    28       1000
-Ethernet28    29     Ethernet28    29       1000
-Ethernet29    30     Ethernet29    30       1000
-Ethernet30    31     Ethernet30    31       1000
-Ethernet31    32     Ethernet31    32       1000
-Ethernet32    33     Ethernet32    33       1000
-Ethernet33    34     Ethernet33    34       1000
-Ethernet34    35     Ethernet34    35       1000
-Ethernet35    36     Ethernet35    36       1000
-Ethernet36    37     Ethernet36    37       1000
-Ethernet37    38     Ethernet37    38       1000
-Ethernet38    39     Ethernet38    39       1000
-Ethernet39    40     Ethernet39    40       1000
-Ethernet40    41     Ethernet40    41       1000
-Ethernet41    42     Ethernet41    42       1000
-Ethernet42    43     Ethernet42    43       1000
-Ethernet43    44     Ethernet43    44       1000
-Ethernet44    45     Ethernet44    45       1000
-Ethernet45    46     Ethernet45    46       1000
-Ethernet46    47     Ethernet46    47       1000
-Ethernet47    48     Ethernet47    48       1000
-Ethernet48    49     Ethernet48    49       10000
-Ethernet49    50     Ethernet49    50       10000
-Ethernet50    51     Ethernet50    51       10000
-Ethernet51    52     Ethernet51    52       10000
+# name       lanes   alias    index    speed
+Ethernet0     1      etp1     1        1000
+Ethernet1     2      etp2     2        1000
+Ethernet2     3      etp3     3        1000
+Ethernet3     4      etp4     4        1000
+Ethernet4     5      etp5     5        1000
+Ethernet5     6      etp6     6        1000
+Ethernet6     7      etp7     7        1000
+Ethernet7     8      etp8     8        1000
+Ethernet8     9      etp9     9        1000
+Ethernet9     10     etp10    10       1000
+Ethernet10    11     etp11    11       1000
+Ethernet11    12     etp12    12       1000
+Ethernet12    13     etp13    13       1000
+Ethernet13    14     etp14    14       1000
+Ethernet14    15     etp15    15       1000
+Ethernet15    16     etp16    16       1000
+Ethernet16    17     etp17    17       1000
+Ethernet17    18     etp18    18       1000
+Ethernet18    19     etp19    19       1000
+Ethernet19    20     etp20    20       1000
+Ethernet20    21     etp21    21       1000
+Ethernet21    22     etp22    22       1000
+Ethernet22    23     etp23    23       1000
+Ethernet23    24     etp24    24       1000
+Ethernet24    25     etp25    25       1000
+Ethernet25    26     etp26    26       1000
+Ethernet26    27     etp27    27       1000
+Ethernet27    28     etp28    28       1000
+Ethernet28    29     etp29    29       1000
+Ethernet29    30     etp30    30       1000
+Ethernet30    31     etp31    31       1000
+Ethernet31    32     etp32    32       1000
+Ethernet32    33     etp33    33       1000
+Ethernet33    34     etp34    34       1000
+Ethernet34    35     etp35    35       1000
+Ethernet35    36     etp36    36       1000
+Ethernet36    37     etp37    37       1000
+Ethernet37    38     etp38    38       1000
+Ethernet38    39     etp39    39       1000
+Ethernet39    40     etp40    40       1000
+Ethernet40    41     etp41    41       1000
+Ethernet41    42     etp42    42       1000
+Ethernet42    43     etp43    43       1000
+Ethernet43    44     etp44    44       1000
+Ethernet44    45     etp45    45       1000
+Ethernet45    46     etp46    46       1000
+Ethernet46    47     etp47    47       1000
+Ethernet47    48     etp48    48       1000
+Ethernet48    49     etp49    49       10000
+Ethernet49    50     etp50    50       10000
+Ethernet50    51     etp51    51       10000
+Ethernet51    52     etp52    52       10000
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-M0-7215 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-M0-7215
new file mode 120000
index 000000000000..886130efb87c
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-M0-7215
@@ -0,0 +1 @@
+Nokia-7215
\ No newline at end of file

From d4a6a009cf5b08af248873385107f88b54fc5f84 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Fri, 1 Oct 2021 23:00:17 -0700
Subject: [PATCH 0829/1674] Change radv interval to 3min (#8891)

(cherry picked from commit 0e175e6d6ca25dc4dbab979b87564a037fcde5c0)
---
 dockers/docker-router-advertiser/radvd.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-router-advertiser/radvd.conf.j2 b/dockers/docker-router-advertiser/radvd.conf.j2
index bc323977b134..1d1e9e952f1c 100644
--- a/dockers/docker-router-advertiser/radvd.conf.j2
+++ b/dockers/docker-router-advertiser/radvd.conf.j2
@@ -17,8 +17,8 @@ interface {{ name }}
 {
     IgnoreIfMissing on;
     AdvSendAdvert on;
-    MinRtrAdvInterval 200;
-    MaxRtrAdvInterval 600;
+    MinRtrAdvInterval 60;
+    MaxRtrAdvInterval 180;
     AdvManagedFlag on;
     AdvOtherConfigFlag off;
     AdvLinkMTU 9100;

From 0f4823916752259b8f693c9d73c1057ed0d70b57 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 3 Oct 2021 03:01:40 +0800
Subject: [PATCH 0830/1674] [ci/build]: Upgrade SONiC package versions (#8894)

---
 .../versions-deb-buster                       |  1 -
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-docker  |  6 ++---
 files/build/versions/default/versions-git     |  4 ++--
 files/build/versions/default/versions-web     |  2 +-
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-base-buster/versions-py3-all-arm64 |  1 -
 .../docker-base-stretch/versions-deb-stretch  | 15 ++++++------
 .../dockers/docker-base-stretch/versions-py2  |  2 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 18 +++++++-------
 .../docker-sonic-mgmt-framework/versions-py3  |  4 ++--
 .../versions-py3-all-arm64                    |  1 -
 .../versions-py3-all-armhf                    |  1 -
 .../docker-syncd-mlnx/versions-deb-buster     | 21 ----------------
 .../versions-deb-buster-arm64                 |  4 ++--
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-stretch-arm64                | 22 ++++++++---------
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                | 20 ++++++++--------
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 24 +++++++++----------
 .../dockers/sonic-slave-stretch/versions-git  |  2 ++
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py3  |  4 ++--
 27 files changed, 73 insertions(+), 97 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 0cf3325dea42..e11beda06edb 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -42,7 +42,6 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.17.0-106
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 712cbf8aa43e..de3eda9da1f8 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,4 +1,4 @@
-https://github.com/CESNET/libyang.git==b125e1a25297518612916c5685087f99dc95ed3a
+https://github.com/CESNET/libyang.git==782c032415c1ee3a6f02b1a549b5d5ea7d37de95
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 17ee80ee325f..f1f602345e4d 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
 amd64:amd64/debian:buster==sha256:2d3ea67549bcf9c6fd5ae9323237def50d9ed39ca118217b4f4cc8df8541fa77
-amd64:amd64/debian:stretch==sha256:b8cd84cc98da3fdd374607006327f4fad25c3190ad0f713b28f3bee58cf01919
-amd64:debian:buster==sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02
-amd64:debian:stretch==sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637
+amd64:amd64/debian:stretch==sha256:4cb539063de2a9b219a55efe892ba203be9bd5668cab78dad443b5ccfc751e6d
+amd64:debian:buster==sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612
+amd64:debian:stretch==sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 7de2fec3e51e..b018d79ffd08 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==ce514ad38e0f8077d92704d2300f6ab0a1d263ad
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0e2fb336b2e7ddbbb9c5ab70eab25f82f55dff2b
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
-https://github.com/CESNET/libyang.git==b125e1a25297518612916c5685087f99dc95ed3a
+https://github.com/CESNET/libyang.git==e4e7d7adb49ad585a6af26584813d363f174e909
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 4247d39cf409..d9cc554d3f06 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,7 +19,7 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==350ad22c60b736f8cf6b31bda87450f7
+https://deb.nodesource.com/node_14.x/dists/buster/Release==677724100f5b7f85462c12142ba7486e
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 7641bc74756f..8c6551521562 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -3,4 +3,4 @@ jinja2==3.0.1
 markupsafe==2.0.1
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
-toposort==1.6
\ No newline at end of file
+toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64 b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
deleted file mode 100644
index f4c44459a714..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 0b78af5806e6..d775275d0ca1 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -1,8 +1,8 @@
 ca-certificates==20200601~deb9u2
-curl==7.52.1-5+deb9u15
+curl==7.52.1-5+deb9u16
 jq==1.5+dfsg-1.3
 less==481-2.1
-libcurl3==7.52.1-5+deb9u15
+libcurl3==7.52.1-5+deb9u16
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
 libestr0==0.1.10-2
@@ -12,20 +12,19 @@ libffi6==3.2.1-6
 libgdbm3==1.8.3-14
 libgmp10==2:6.1.2+dfsg-1
 libgnutls30==3.5.8-5+deb9u6
-libgssapi-krb5-2==1.15-1+deb9u2
+libgssapi-krb5-2==1.15-1+deb9u3
 libhogweed4==3.3-1+deb9u1
 libidn2-0==0.16-1+deb9u1
 libjansson4==2.9-1
 libjq1==1.5+dfsg-1.3
-libk5crypto3==1.15-1+deb9u2
+libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
-libkrb5-3==1.15-1+deb9u2
-libkrb5support0==1.15-1+deb9u2
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
 libldap-2.4-2==2.4.44+dfsg-5+deb9u8
 libldap-common==2.4.44+dfsg-5+deb9u8
 liblognorm5==2.0.3-1~bpo9+1
 libncurses5==6.0+20161126-1+deb9u2
-libnettle6==3.3-1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u1
 libonig4==6.1.3-2+deb9u2
 libp11-kit0==0.23.3-2+deb9u1
@@ -44,7 +43,7 @@ libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
-libssl1.0.2==1.0.2u-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
index 56cab0a7c395..48fd2100defe 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -3,4 +3,4 @@ jinja2==2.11.3
 markupsafe==1.1.1
 supervisor==4.2.2
 supervisord-dependent-startup==1.4.0
-toposort==1.6
\ No newline at end of file
+toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 0869cff9df4f..68bab9a789d1 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.9.24
+regex==2021.9.30
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 6322463369f6..47d92ec4d5f9 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -13,7 +13,7 @@ cmake-data==3.7.2-1
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u15
+curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
@@ -36,7 +36,7 @@ gnupg-agent==2.1.18-8~deb9u4
 gnupg-l10n==2.1.18-8~deb9u4
 guile-2.0-libs==2.0.13+1-4
 hping3==3.a2.ds2-7
-krb5-locales==1.15-1+deb9u2
+krb5-locales==1.15-1+deb9u1
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
@@ -54,8 +54,8 @@ libcc1-0==6.3.0-18+deb9u1
 libcgmanager0==0.41-2
 libcilkrts5==6.3.0-18+deb9u1
 libcryptsetup4==2:1.7.3-4
-libcurl3==7.52.1-5+deb9u15
-libcurl3-gnutls==7.52.1-5+deb9u15
+libcurl3==7.52.1-5+deb9u16
+libcurl3-gnutls==7.52.1-5+deb9u16
 libdbus-1-3==1.10.32-0+deb9u1
 libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
@@ -82,7 +82,7 @@ libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
 libgpm2==1.20.4-6.2+b1
 libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u2
+libgssapi-krb5-2==1.15-1+deb9u3
 libhogweed4==3.3-1+deb9u1
 libicu57==57.1-6+deb9u4
 libidn2-0==0.16-1+deb9u1
@@ -90,11 +90,11 @@ libip4tc0==1.6.0+snapshot20161117-6
 libisl15==0.18-1
 libitm1==6.3.0-18+deb9u1
 libjsoncpp1==1.7.4-3
-libk5crypto3==1.15-1+deb9u2
+libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
 libkmod2==23-2
-libkrb5-3==1.15-1+deb9u2
-libkrb5support0==1.15-1+deb9u2
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
 libldap-2.4-2==2.4.44+dfsg-5+deb9u8
@@ -150,7 +150,7 @@ libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u4
 libssl-doc==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libstdc++-6-dev==6.3.0-18+deb9u1
 libtacacs+1==4.0.4.27a-3
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 5e10cb4a5f09..1ae835a58fe4 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,7 +12,7 @@ importlib-metadata==4.8.1
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
-jsonschema==3.2.0
+jsonschema==4.0.1
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
 protobuf==3.18.0
@@ -23,4 +23,4 @@ six==1.11.0
 typing-extensions==3.10.0.2
 urllib3==1.21.1
 werkzeug==2.0.1
-zipp==3.5.0
\ No newline at end of file
+zipp==3.6.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
deleted file mode 100644
index 21eed6c09f8a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-zipp==3.5.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
deleted file mode 100644
index 21eed6c09f8a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-zipp==3.5.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index c96c7f7badb4..bb8da8e06c99 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,22 +1,11 @@
 applibs==1.mlnx.4.4.3326
 applibs-dev==1.mlnx.4.4.3326
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3326
 iproute2-dev==1.mlnx.4.4.3326
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
-libipt2==2.0-2
-libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -26,16 +15,11 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.194-3
 mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
@@ -48,8 +32,6 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
-sshpass==1.06-1
-strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3326
 sx-acl-helper-dev==1.mlnx.4.4.3326
 sx-complib==1.mlnx.4.4.3326
@@ -63,8 +45,5 @@ sx-scew-dev==1.mlnx.4.4.3326
 sxd-libs==1.mlnx.4.4.3326
 sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3326
 wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 613ea778c9a9..ddb4a86af6a8 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.9-1
+containerd.io==1.4.10-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -1185,7 +1185,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.6-deb-1nodesource1
+nodejs==14.18.0-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index ac8c91a16afd..781c252dcb4e 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.24
+regex==2021.9.30
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index 2500ffa99568..56bfabba83ff 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -1294,7 +1294,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.17.6-deb-1nodesource1
+nodejs==14.18.0-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 6ffebbb717a0..6c2b922d0e9f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -51,7 +51,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u15
+curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -165,7 +165,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u2
+krb5-locales==1.15-1+deb9u1
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
@@ -357,10 +357,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u15
-libcurl3-gnutls==7.52.1-5+deb9u15
-libcurl3-nss==7.52.1-5+deb9u15
-libcurl4-nss-dev==7.52.1-5+deb9u15
+libcurl3==7.52.1-5+deb9u16
+libcurl3-gnutls==7.52.1-5+deb9u16
+libcurl3-nss==7.52.1-5+deb9u16
+libcurl4-nss-dev==7.52.1-5+deb9u16
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -480,7 +480,7 @@ libgraphite2-3==1.3.10-1
 libgs9==9.26a~dfsg-0+deb9u7
 libgs9-common==9.26a~dfsg-0+deb9u7
 libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u2
+libgssapi-krb5-2==1.15-1+deb9u3
 libgstreamer1.0-0==1.10.4-1
 libgtest-dev==1.8.0-6
 libgtk-3-0==3.22.11-1
@@ -589,12 +589,12 @@ libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
 libjzlib-java==1.1.3-1
-libk5crypto3==1.15-1+deb9u2
+libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
 libkmod2==23-2
 libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
-libkrb5-3==1.15-1+deb9u2
-libkrb5support0==1.15-1+deb9u2
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
 liblcms2-2==2.8-4+deb9u1
@@ -882,7 +882,7 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 91b030f764e7..13d7fa8dd810 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.9.24
+regex==2021.9.30
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index e267bff8e199..0eddfddd242d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -51,7 +51,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u15
+curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -165,7 +165,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u2
+krb5-locales==1.15-1+deb9u1
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
@@ -357,10 +357,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u15
-libcurl3-gnutls==7.52.1-5+deb9u15
-libcurl3-nss==7.52.1-5+deb9u15
-libcurl4-nss-dev==7.52.1-5+deb9u15
+libcurl3==7.52.1-5+deb9u16
+libcurl3-gnutls==7.52.1-5+deb9u16
+libcurl3-nss==7.52.1-5+deb9u16
+libcurl4-nss-dev==7.52.1-5+deb9u16
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -485,7 +485,7 @@ libgraphite2-3==1.3.10-1
 libgs9==9.26a~dfsg-0+deb9u7
 libgs9-common==9.26a~dfsg-0+deb9u7
 libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u2
+libgssapi-krb5-2==1.15-1+deb9u3
 libgstreamer1.0-0==1.10.4-1
 libgtest-dev==1.8.0-6
 libgtk-3-0==3.22.11-1
@@ -593,12 +593,12 @@ libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
 libjzlib-java==1.1.3-1
-libk5crypto3==1.15-1+deb9u2
+libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
 libkmod2==23-2
 libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
-libkrb5-3==1.15-1+deb9u2
-libkrb5support0==1.15-1+deb9u2
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
 liblcms2-2==2.8-4+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 91b030f764e7..13d7fa8dd810 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.9.24
+regex==2021.9.30
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index f819270739e4..2b37438fc6b2 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -52,7 +52,7 @@ cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
 cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u15
+curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
 dconf-service==0.26.0-2+b1
@@ -171,7 +171,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u2
+krb5-locales==1.15-1+deb9u1
 less==481-2.1
 lib32asan3==6.3.0-18+deb9u1
 lib32atomic1==6.3.0-18+deb9u1
@@ -383,10 +383,10 @@ libcryptsetup4==2:1.7.3-4
 libcups2==2.2.1-8+deb9u6
 libcupsfilters1==1.11.6-3+deb9u1
 libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u15
-libcurl3-gnutls==7.52.1-5+deb9u15
-libcurl3-nss==7.52.1-5+deb9u15
-libcurl4-nss-dev==7.52.1-5+deb9u15
+libcurl3==7.52.1-5+deb9u16
+libcurl3-gnutls==7.52.1-5+deb9u16
+libcurl3-nss==7.52.1-5+deb9u16
+libcurl4-nss-dev==7.52.1-5+deb9u16
 libdaemon-dev==0.14-6
 libdaemon0==0.14-6
 libdata-optlist-perl==0.110-1
@@ -510,7 +510,7 @@ libgraphite2-3==1.3.10-1
 libgs9==9.26a~dfsg-0+deb9u7
 libgs9-common==9.26a~dfsg-0+deb9u7
 libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u2
+libgssapi-krb5-2==1.15-1+deb9u3
 libgstreamer1.0-0==1.10.4-1
 libgtest-dev==1.8.0-6
 libgtk-3-0==3.22.11-1
@@ -529,7 +529,7 @@ libgvpr2==2.38.0-17+deb9u1
 libhamcrest-java==1.3-6
 libharfbuzz-icu0==1.4.2-1
 libharfbuzz0b==1.4.2-1
-libhogweed4==3.3-1+b2
+libhogweed4==3.3-1+deb9u1
 libhtml-form-perl==6.03-1
 libhtml-format-perl==2.12-1
 libhtml-parser-perl==3.72-3
@@ -621,12 +621,12 @@ libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
 libjzlib-java==1.1.3-1
-libk5crypto3==1.15-1+deb9u2
+libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
 libkmod2==23-2
 libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
-libkrb5-3==1.15-1+deb9u2
-libkrb5support0==1.15-1+deb9u2
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
 liblcms2-2==2.8-4+deb9u1
@@ -926,7 +926,7 @@ libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..8c49c29ce2c1
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b4d3954db70ed8e34838cd95bec4da7189c80983
+https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 1a570d60bf58..13d7fa8dd810 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.9.30
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index a59c98f5ba0a..f1b7ae6e411c 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.9-1
+containerd.io==1.4.10-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 464acd42a8d0..040b8d4b1814 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2021.5.30
 cffi==1.14.6
 charset-normalizer==2.0.6
 click==7.0
-cryptography==3.4.8
+cryptography==35.0.0
 docker==4.3.1
 idna==3.2
 ijson==2.6.1
@@ -31,7 +31,7 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.24
+regex==2021.9.30
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0

From ccd93cba62f614818b2d1d8160cd035df110df43 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Thu, 30 Sep 2021 12:45:51 -0700
Subject: [PATCH 0831/1674] Load global config in caclmgrd only in multi asic
 NPU (#8812)

How I did it
Added if multi npu check before invoking the load global config.

How to verify it
Restart caclmgrd after this change and check if no error log is thrown.
---
 src/sonic-host-services/scripts/caclmgrd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 4df7f51833c2..8be1f8d3d35b 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -102,7 +102,9 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         self.lock[DEFAULT_NAMESPACE] = threading.Lock()
         self.num_changes[DEFAULT_NAMESPACE] = 0
 
-        swsscommon.SonicDBConfig.load_sonic_global_db_config()
+        if device_info.is_multi_npu():
+            swsscommon.SonicDBConfig.load_sonic_global_db_config()
+
         self.config_db_map = {}
         self.iptables_cmd_ns_prefix = {}
         self.config_db_map[DEFAULT_NAMESPACE] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)

From d599a578ce00453dafe7fbda164afcef762bebae Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:49:57 -0700
Subject: [PATCH 0832/1674] [202012][utilities] advance utilities submodule
 head (#8892)

* 647f01f 2021-09-30 | [fstrim] limit smartctl execution time to 30 seconds (#1850) (HEAD -> 202012, github/202012) [Ying Xie]
* 371970e 2021-09-30 | [202012][show techsupport] address show techsupport return none zero code issue (#1847) [Ying Xie]
* 81a8386 2021-09-30 | Disable pfcwd forward action config for cisco-8000. (#1848) [Alpesh Patel]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 0b5f90b14d1f..647f01faed52 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 0b5f90b14d1f5baa1d9c09dc959c3e4f840db5ca
+Subproject commit 647f01faed52cce87d6e5b8daa8be4bcf7b9c111

From a22c82288dd2a43fe367b0b5ae23bb604a6ffaa9 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 4 Oct 2021 10:45:44 -0700
Subject: [PATCH 0833/1674] [device]: Add SAI checksum verify to TD3 config
 (#8886)

A new config option `sai_verify_incoming_chksum` was added to control the value of IPV4_INCR_CHECKSUM_ORIGINAL_VALUE_VERIFY in the EGR_FLEX_CONFIG control register (this prevents checksums of 0xffff from being propagated to other devices)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm   | 1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                    | 1 +
 src/sonic-device-data/tests/permitted_list                       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index 72e02fb8d25b..fe3a9c2792cf 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,5 +1,6 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 sai_adjust_acl_drop_in_rx_drop=1
+sai_verify_incoming_chksum=0
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 0a6740b58b31..8de71580746c 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,5 +1,6 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 sai_adjust_acl_drop_in_rx_drop=1
+sai_verify_incoming_chksum=0
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 2f90c67c0229..8eebec56caf5 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -237,3 +237,4 @@ buf.map.egress_pool0.ingress_pool
 buf.map.egress_pool1.ingress_pool
 buf.map.egress_pool2.ingress_pool
 sai_adjust_acl_drop_in_rx_drop
+sai_verify_incoming_chksum

From d69564a1e7e49c7ec59e8874f467baa773621366 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 5 Oct 2021 01:20:33 +0800
Subject: [PATCH 0834/1674] [Mellanox] Change thermal recover threshold from
 temp_trip_norm to temp_trip_high (#8792)

- Why I did it
Change thermal recover threshold from temp_trip_norm to temp_trip_high, so that thermal algorithm would set fan speed to minimum allowed earlier and save power.

- How I did it
Change thermal recover threshold from temp_trip_norm to temp_trip_high

- How to verify it
Manual test
---
 platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index 38c66ef45739..d28eabdbe6a4 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -46,7 +46,7 @@
 THERMAL_ZONE_MODE = "thermal_zone_mode"
 THERMAL_ZONE_POLICY = "thermal_zone_policy"
 THERMAL_ZONE_TEMPERATURE = "thermal_zone_temp"
-THERMAL_ZONE_NORMAL_TEMPERATURE = "temp_trip_norm"
+THERMAL_ZONE_NORMAL_TEMPERATURE = "temp_trip_high"
 
 MODULE_TEMPERATURE_FAULT_PATH = "/var/run/hw-management/thermal/module{}_temp_fault"
 

From 380ad2e8fc19f5d619ba7658c19be225acfbff94 Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Tue, 5 Oct 2021 18:29:26 -0700
Subject: [PATCH 0835/1674] [202012] [Arista] Raise ValueError on thermal
 manager invalid fan speed (#8903)

Why I did it
Vaibhav Dahiya notified me that invalid fan speed policy was expecting an error raised in sonic-mgmt testing, but it was not raised.
This change will fix test_platform_info.py::test_thermal_control_load_invalid_value_json

How I did it
Add in the suggested code chunk to Arista platform submodule to raise ValueError when an invalid fan speed is set in thermal policy.

How to verify it
Vaibhav Dahiya has verified it through sonic-mgmt testing.

Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 7304dbebdd80..cf36e513e41c 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 7304dbebdd80d7278abc6136e1df73190d405483
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 7304dbebdd80..cf36e513e41c 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 7304dbebdd80d7278abc6136e1df73190d405483
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d

From 3d8cd84b52291aff328bf1a03ed74c727626197e Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Wed, 6 Oct 2021 21:16:21 +0530
Subject: [PATCH 0836/1674] [202012][Marvell] Update armhf SAI to ver 1.7.1-4
 (#8910)

Fixed security concerns & ping issue.

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index eae6225cb916..620f2a41d237 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-3
+export MRVL_SAI_VERSION = 1.7.1-4
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From 040d5f343d7fa6f640893ba107d2874b2d489c76 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 17 Sep 2021 16:18:36 +0800
Subject: [PATCH 0837/1674] Add pipeline to build vhdx image. (#8665)

* Add pipeline to build vhdx image
---
 .azure-pipelines/azure-pipelines-build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index a748af337abf..88c87031c201 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -104,6 +104,11 @@ jobs:
               make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
             fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
+            if [ $(Build.Reason) != 'PullRequest' ];then
+              gzip -kd target/sonic-vs.img.gz
+              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
+              rm target/sonic-vs.img
+            fi
           else
             if [ $(dbg_image) == yes ]; then
               make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \

From 57df98f4a8b3fc22b4a27ca4773bc93a98b05ec7 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Fri, 8 Oct 2021 10:10:05 +0700
Subject: [PATCH 0838/1674] [Celestica/sonic_platform]: Fixed failed test cases
 in Haliburton platform testing (#8815)

* [device/celestica-e1031]: fix apis follow lastest spec
* [device/celestica-e1031]: fix lgtm (#261)
---
 .../Celestica-E1031-T48S4/hwsku.json          | 224 ++++++++++++
 .../x86_64-cel_e1031-r0/platform.json         |   6 +-
 .../sonic_platform/chassis.py                 |   9 +-
 .../x86_64-cel_e1031-r0/sonic_platform/fan.py |   2 +-
 .../sonic_platform/fan_drawer.py              |  10 +
 .../x86_64-cel_e1031-r0/sonic_platform/sfp.py | 338 +++++++++++++-----
 6 files changed, 478 insertions(+), 111 deletions(-)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json

diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json
new file mode 100644
index 000000000000..e4afe9bc5d52
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json
@@ -0,0 +1,224 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet1": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet2": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet3": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet5": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet6": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet7": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet9": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet10": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet11": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet13": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet14": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet15": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet17": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet18": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet19": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet21": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet22": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet23": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet25": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet26": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet27": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet29": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet30": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet31": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet33": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet34": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet35": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet37": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet38": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet39": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet41": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet42": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet43": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet45": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet46": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet47": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet49": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet50": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet51": {
+            "default_brkout_mode": "1x10G",
+            "port_type": "SFP+"
+        },
+        "Ethernet52": {
+            "default_brkout_mode": "1x1G",
+            "port_type": "RJ45"
+        },
+        "Ethernet53": {
+            "default_brkout_mode": "1x21G",
+            "port_type": "RJ45"
+        },
+        "Ethernet54": {
+            "default_brkout_mode": "1x21G",
+            "port_type": "RJ45"
+        }
+    }   
+}
diff --git a/device/celestica/x86_64-cel_e1031-r0/platform.json b/device/celestica/x86_64-cel_e1031-r0/platform.json
index 0873a1398a3f..0e4656feae60 100644
--- a/device/celestica/x86_64-cel_e1031-r0/platform.json
+++ b/device/celestica/x86_64-cel_e1031-r0/platform.json
@@ -91,9 +91,6 @@
             }
         ],
         "sfps": [
-            {
-                "name": "Ethernet54"
-            },
             {
                 "name": "Ethernet0"
             },
@@ -255,6 +252,9 @@
             },
             {
                 "name": "Ethernet53"
+            },
+            {
+                "name": "Ethernet54"
             }
         ]
     },
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
index cb442518f199..4b081f4e3ceb 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -236,17 +236,10 @@ def get_sfp(self, index):
         Returns:
             An object dervied from SfpBase representing the specified sfp
         """
-        sfp = None
         if not self.sfp_module_initialized:
             self.__initialize_sfp()
 
-        try:
-            # The index will start from 1
-            sfp = self._sfp_list[index-1]
-        except IndexError:
-            print("SFP index {} out of range (1-{})\n".format(
-                index, len(self._sfp_list)))
-        return sfp
+        return super(Chassis, self).get_sfp(index - 1)
 
     ##############################################################
     ################## ThermalManager methods ####################
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
index 90029ffce47e..a652fa546ed0 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
@@ -145,7 +145,7 @@ def get_target_speed(self):
             0   : when PWM mode is use
             pwm : when pwm mode is not use
         """
-        target = NULL_VAL
+        target = 0
         if not self.is_psu_fan:
             chip = self.emc2305_chip_mapping[self.fan_index]
             device = chip['device']
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
index fe12b0ab101e..9b912a52c444 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
@@ -14,6 +14,7 @@
     raise ImportError(str(e) + "- required module not found")
 
 NUM_FAN = 1
+MAX_FAN_WATT = 10.0
 
 
 class FanDrawer(FanDrawerBase):
@@ -47,6 +48,15 @@ def get_status_led(self, color=None):
         """
         return self._fan_list[0].get_status_led()
 
+    def get_maximum_consumed_power(self):
+        """
+        Retrives the maximum power drawn by Fan Drawer
+        Returns:
+            A float, with value of the maximum consumable power of the
+            component.
+        """
+        return MAX_FAN_WATT
+
     ##############################################################
     ###################### Device methods ########################
     ##############################################################
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
index 157b06de1caf..c0187819ec2c 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
@@ -12,7 +12,6 @@
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
-    from sonic_platform_base.sonic_sfp.sff8472 import sffbase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
     from sonic_platform_base.sonic_sfp.inf8628 import inf8628InterfaceId
@@ -210,9 +209,9 @@ def __init__(self, sfp_index, sfp_name):
     def __get_sfp_type(self):
         return SFP_TYPE if self.port_num in self._sfp_port else ETP_TYPE
 
-    def __convert_string_to_num(self, value_str):
+    def _convert_string_to_num(self, value_str):
         if "-inf" in value_str:
-            return 'N/A'
+            return float("-inf")
         elif "Unknown" in value_str:
             return 'N/A'
         elif 'dBm' in value_str:
@@ -230,7 +229,7 @@ def __convert_string_to_num(self, value_str):
         else:
             return 'N/A'
 
-    def __read_eeprom_specific_bytes(self, offset, num_bytes):
+    def _read_eeprom_specific_bytes(self, offset, num_bytes):
         sysfsfile_eeprom = None
         eeprom_raw = []
         for i in range(0, num_bytes):
@@ -277,10 +276,10 @@ def _dom_capability_detect(self):
             # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
             # need to add more code for determining the capability and version compliance
             # in SFF-8636 dom capability definitions evolving with the versions.
-            qsfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+            qsfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 (offset + XCVR_DOM_CAPABILITY_OFFSET), XCVR_DOM_CAPABILITY_WIDTH)
             if qsfp_dom_capability_raw is not None:
-                qsfp_version_compliance_raw = self.__read_eeprom_specific_bytes(
+                qsfp_version_compliance_raw = self._read_eeprom_specific_bytes(
                     QSFP_VERSION_COMPLIANCE_OFFSET, QSFP_VERSION_COMPLIANCE_WIDTH)
                 qsfp_version_compliance = int(
                     qsfp_version_compliance_raw[0], 16)
@@ -302,7 +301,7 @@ def _dom_capability_detect(self):
                 sfpd_obj = sff8436Dom()
                 if sfpd_obj is None:
                     return None
-                qsfp_option_value_raw = self.__read_eeprom_specific_bytes(
+                qsfp_option_value_raw = self._read_eeprom_specific_bytes(
                     QSFP_OPTION_VALUE_OFFSET, QSFP_OPTION_VALUE_WIDTH)
                 if qsfp_option_value_raw is not None:
                     optional_capability = sfpd_obj.parse_option_params(
@@ -325,7 +324,7 @@ def _dom_capability_detect(self):
             sfpi_obj = sff8472InterfaceId()
             if sfpi_obj is None:
                 return None
-            sfp_dom_capability_raw = self.__read_eeprom_specific_bytes(
+            sfp_dom_capability_raw = self._read_eeprom_specific_bytes(
                 XCVR_DOM_CAPABILITY_OFFSET, XCVR_DOM_CAPABILITY_WIDTH)
             if sfp_dom_capability_raw is not None:
                 sfp_dom_capability = int(sfp_dom_capability_raw[0], 16)
@@ -382,6 +381,7 @@ def get_transceiver_info(self):
          """
         compliance_code_dict = {}
         transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A')
+        transceiver_info_dict['specification_compliance'] = '{}'
         if not self.get_presence():
             return transceiver_info_dict
 
@@ -396,14 +396,14 @@ def get_transceiver_info(self):
             if sfpi_obj is None:
                 return None
 
-            sfp_type_raw = self.__read_eeprom_specific_bytes(
+            sfp_type_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_TYPE_OFFSET), XCVR_TYPE_WIDTH)
             if sfp_type_raw is not None:
                 sfp_type_data = sfpi_obj.parse_sfp_type(sfp_type_raw, 0)
             else:
                 return None
 
-            sfp_vendor_name_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_name_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_NAME_OFFSET), XCVR_VENDOR_NAME_WIDTH)
             if sfp_vendor_name_raw is not None:
                 sfp_vendor_name_data = sfpi_obj.parse_vendor_name(
@@ -411,7 +411,7 @@ def get_transceiver_info(self):
             else:
                 return None
 
-            sfp_vendor_pn_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_pn_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_PN_OFFSET), XCVR_VENDOR_PN_WIDTH)
             if sfp_vendor_pn_raw is not None:
                 sfp_vendor_pn_data = sfpi_obj.parse_vendor_pn(
@@ -419,7 +419,7 @@ def get_transceiver_info(self):
             else:
                 return None
 
-            sfp_vendor_rev_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_rev_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_HW_REV_OFFSET), vendor_rev_width)
             if sfp_vendor_rev_raw is not None:
                 sfp_vendor_rev_data = sfpi_obj.parse_vendor_rev(
@@ -427,7 +427,7 @@ def get_transceiver_info(self):
             else:
                 return None
 
-            sfp_vendor_sn_raw = self.__read_eeprom_specific_bytes(
+            sfp_vendor_sn_raw = self._read_eeprom_specific_bytes(
                 (offset + OSFP_VENDOR_SN_OFFSET), XCVR_VENDOR_SN_WIDTH)
             if sfp_vendor_sn_raw is not None:
                 sfp_vendor_sn_data = sfpi_obj.parse_vendor_sn(
@@ -473,7 +473,7 @@ def get_transceiver_info(self):
                 if sfpi_obj is None:
                     print("Error: sfp_object open failed")
                     return None
-            sfp_interface_bulk_raw = self.__read_eeprom_specific_bytes(
+            sfp_interface_bulk_raw = self._read_eeprom_specific_bytes(
                 offset + XCVR_INTERFACE_DATA_START, XCVR_INTERFACE_DATA_SIZE)
             if sfp_interface_bulk_raw is None:
                 return None
@@ -598,7 +598,7 @@ def get_transceiver_bulk_status(self):
             if sfpd_obj is None:
                 return transceiver_dom_info_dict
 
-            dom_data_raw = self.__read_eeprom_specific_bytes(
+            dom_data_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_DOM_BULK_DATA_START), QSFP_DOM_BULK_DATA_SIZE)
             if dom_data_raw is None:
                 return transceiver_dom_info_dict
@@ -608,7 +608,7 @@ def get_transceiver_bulk_status(self):
                 end = start + QSFP_TEMPE_WIDTH
                 dom_temperature_data = sfpd_obj.parse_temperature(
                     dom_data_raw[start: end], 0)
-                temp = self.__convert_string_to_num(
+                temp = self._convert_string_to_num(
                     dom_temperature_data['data']['Temperature']['value'])
                 if temp is not None:
                     transceiver_dom_info_dict['temperature'] = temp
@@ -618,7 +618,7 @@ def get_transceiver_bulk_status(self):
                 end = start + QSFP_VOLT_WIDTH
                 dom_voltage_data = sfpd_obj.parse_voltage(
                     dom_data_raw[start: end], 0)
-                volt = self.__convert_string_to_num(
+                volt = self._convert_string_to_num(
                     dom_voltage_data['data']['Vcc']['value'])
                 if volt is not None:
                     transceiver_dom_info_dict['voltage'] = volt
@@ -629,32 +629,32 @@ def get_transceiver_bulk_status(self):
                 dom_data_raw[start: end], 0)
 
             if self.dom_tx_power_supported:
-                transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['tx1power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['TX1Power']['value'])
-                transceiver_dom_info_dict['tx2power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['tx2power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['TX2Power']['value'])
-                transceiver_dom_info_dict['tx3power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['tx3power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['TX3Power']['value'])
-                transceiver_dom_info_dict['tx4power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['tx4power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['TX4Power']['value'])
 
             if self.dom_rx_power_supported:
-                transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['rx1power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['RX1Power']['value'])
-                transceiver_dom_info_dict['rx2power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['rx2power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['RX2Power']['value'])
-                transceiver_dom_info_dict['rx3power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['rx3power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['RX3Power']['value'])
-                transceiver_dom_info_dict['rx4power'] = self.__convert_string_to_num(
+                transceiver_dom_info_dict['rx4power'] = self._convert_string_to_num(
                     dom_channel_monitor_data['data']['RX4Power']['value'])
 
-            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx1bias'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TX1Bias']['value'])
-            transceiver_dom_info_dict['tx2bias'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx2bias'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TX2Bias']['value'])
-            transceiver_dom_info_dict['tx3bias'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx3bias'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TX3Bias']['value'])
-            transceiver_dom_info_dict['tx4bias'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx4bias'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TX4Bias']['value'])
 
         else:
@@ -667,7 +667,7 @@ def get_transceiver_bulk_status(self):
                 return transceiver_dom_info_dict
             sfpd_obj._calibration_type = self.calibration
 
-            dom_data_raw = self.__read_eeprom_specific_bytes(
+            dom_data_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_DOM_BULK_DATA_START), SFP_DOM_BULK_DATA_SIZE)
 
             start = SFP_TEMPE_OFFSET - SFP_DOM_BULK_DATA_START
@@ -685,15 +685,15 @@ def get_transceiver_bulk_status(self):
             dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
                 dom_data_raw[start: end], 0)
 
-            transceiver_dom_info_dict['temperature'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['temperature'] = self._convert_string_to_num(
                 dom_temperature_data['data']['Temperature']['value'])
-            transceiver_dom_info_dict['voltage'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['voltage'] = self._convert_string_to_num(
                 dom_voltage_data['data']['Vcc']['value'])
-            transceiver_dom_info_dict['rx1power'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['rx1power'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['RXPower']['value'])
-            transceiver_dom_info_dict['tx1bias'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx1bias'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TXBias']['value'])
-            transceiver_dom_info_dict['tx1power'] = self.__convert_string_to_num(
+            transceiver_dom_info_dict['tx1power'] = self._convert_string_to_num(
                 dom_channel_monitor_data['data']['TXPower']['value'])
 
         transceiver_dom_info_dict['rx_los'] = self.get_rx_los()
@@ -750,7 +750,7 @@ def get_transceiver_threshold_info(self):
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
 
-            dom_module_threshold_raw = self.__read_eeprom_specific_bytes(
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_MODULE_THRESHOLD_OFFSET), QSFP_MODULE_THRESHOLD_WIDTH)
             if dom_module_threshold_raw is None:
                 return transceiver_dom_threshold_info_dict
@@ -758,8 +758,8 @@ def get_transceiver_threshold_info(self):
             dom_module_threshold_data = sfpd_obj.parse_module_threshold_values(
                 dom_module_threshold_raw, 0)
 
-            dom_channel_threshold_raw = self.__read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
-                                                                          QSFP_CHANNL_THRESHOLD_WIDTH)
+            dom_channel_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_THRESHOLD_OFFSET),
+                                                                         QSFP_CHANNL_THRESHOLD_WIDTH)
             if dom_channel_threshold_raw is None:
                 return transceiver_dom_threshold_info_dict
             dom_channel_threshold_data = sfpd_obj.parse_channel_threshold_values(
@@ -797,8 +797,8 @@ def get_transceiver_threshold_info(self):
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
 
-            dom_module_threshold_raw = self.__read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
-                                                                         SFP_MODULE_THRESHOLD_WIDTH)
+            dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + SFP_MODULE_THRESHOLD_OFFSET),
+                                                                        SFP_MODULE_THRESHOLD_WIDTH)
             if dom_module_threshold_raw is not None:
                 dom_module_threshold_data = sfpd_obj.parse_alarm_warning_threshold(
                     dom_module_threshold_raw, 0)
@@ -829,7 +829,7 @@ def get_transceiver_threshold_info(self):
             transceiver_dom_threshold_info_dict['rxpowerlowwarning'] = dom_module_threshold_data['data']['RXPowerLowWarning']['value']
 
         for key in transceiver_dom_threshold_info_dict:
-            transceiver_dom_threshold_info_dict[key] = self.__convert_string_to_num(
+            transceiver_dom_threshold_info_dict[key] = self._convert_string_to_num(
                 transceiver_dom_threshold_info_dict[key])
 
         return transceiver_dom_threshold_info_dict
@@ -845,35 +845,36 @@ def get_reset_status(self):
 
     def get_rx_los(self):
         """
-        Retrieves the RX LOS (lost-of-signal) status of SFP
+        Retrieves the RX LOS (loss-of-signal) status of SFP
         Returns:
-            A Boolean, True if SFP has RX LOS, False if not.
+            A list of boolean values, representing the RX LOS status
+            of each available channel, value is True if SFP channel
+            has RX LOS, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
             Note : RX LOS status is latched until a call to get_rx_los or a reset.
         """
-        rx_los = False
-        if self.sfp_type == OSFP_TYPE:
-            return False
+        rx_los_list = []
 
-        elif self.sfp_type == QSFP_TYPE:
+        if self.sfp_type == QSFP_TYPE:
             offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx1_los = (rx_los_data & 0x01 != 0)
-                rx2_los = (rx_los_data & 0x02 != 0)
-                rx3_los = (rx_los_data & 0x04 != 0)
-                rx4_los = (rx_los_data & 0x08 != 0)
-                rx_los = (rx1_los and rx2_los and rx3_los and rx4_los)
-        else:
+                rx_los_list.append(rx_los_data & 0x01 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x04 != 0)
+                rx_los_list.append(rx_los_data & 0x08 != 0)
+
+        elif self.sfp_type == SFP_TYPE:
             offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx_los = (rx_los_data & 0x02 != 0)
+                rx_los_list.append(rx_los_data & 0x02 != 0)
 
-        return rx_los
+        return rx_los_list
 
     def get_tx_fault(self):
         """
@@ -882,51 +883,66 @@ def get_tx_fault(self):
             A Boolean, True if SFP has TX fault, False if not
             Note : TX fault status is lached until a call to get_tx_fault or a reset.
         """
-        tx4_fault = False
-
-        if self.sfp_type == OSFP_TYPE or not self.dom_supported:
-            return False
+        tx_fault_list = []
+        if not self.dom_supported:
+            return tx_fault_list
 
-        elif self.sfp_type == QSFP_TYPE:
+        if self.sfp_type == QSFP_TYPE:
             offset = 0
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx1_fault = (tx_fault_data & 0x01 != 0)
-                tx2_fault = (tx_fault_data & 0x02 != 0)
-                tx3_fault = (tx_fault_data & 0x04 != 0)
-                tx4_fault = (tx_fault_data & 0x08 != 0)
-                tx4_fault = (
-                    tx1_fault and tx2_fault and tx3_fault and tx4_fault)
-        else:
+                tx_fault_list.append(tx_fault_data & 0x01 != 0)
+                tx_fault_list.append(tx_fault_data & 0x02 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x08 != 0)
+
+        elif self.sfp_type == SFP_TYPE:
             offset = 256
-            dom_channel_monitor_raw = self.__read_eeprom_specific_bytes(
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
                 (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx4_fault = (tx_fault_data & 0x04 != 0)
+                tx_fault_list.append(tx_fault_data & 0x04 != 0)
 
-        return tx4_fault
+        return tx_fault_list
 
     def get_tx_disable(self):
         """
         Retrieves the tx_disable status of this SFP
         Returns:
-            A Boolean, True if tx_disable is enabled, False if disabled
+            A list of boolean values, representing the TX disable status
+            of each available channel, value is True if SFP channel
+            is TX disabled, False if not.
+            E.g., for a tranceiver with four channels: [False, False, True, False]
         """
-        tx_disable = False
-        status_control_raw = self.__read_eeprom_specific_bytes(
-            SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH)
-        if status_control_raw:
-            data = int(status_control_raw[0], 16)
-            tx_disable_hard = (sffbase().test_bit(
-                data, SFP_TX_DISABLE_HARD_BIT) != 0)
-            tx_disable_soft = (sffbase().test_bit(
-                data, SFP_TX_DISABLE_SOFT_BIT) != 0)
-            tx_disable = tx_disable_hard | tx_disable_soft
 
-        return tx_disable
+        tx_disable_list = []
+        if not self.dom_supported:
+            return tx_disable_list
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0x01 != 0)
+                tx_disable_list.append(tx_disable_data & 0x02 != 0)
+                tx_disable_list.append(tx_disable_data & 0x04 != 0)
+                tx_disable_list.append(tx_disable_data & 0x08 != 0)
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                tx_disable_list.append(tx_disable_data & 0xC0 != 0)
+            else:
+                return None
+        return tx_disable_list
 
     def get_tx_disable_channel(self):
         """
@@ -937,8 +953,14 @@ def get_tx_disable_channel(self):
             As an example, a returned value of 0x5 indicates that channel 0
             and channel 2 have been disabled.
         """
-        # SFP doesn't support this feature
-        return 0
+        tx_disable_list = self.get_tx_disable()
+        if tx_disable_list is None:
+            return 0
+        tx_disabled = 0
+        for i in range(len(tx_disable_list)):
+            if tx_disable_list[i]:
+                tx_disabled |= 1 << i
+        return tx_disabled
 
     def get_lpmode(self):
         """
@@ -965,7 +987,7 @@ def get_temperature(self):
             An integer number of current temperature in Celsius
         """
         transceiver_bulk_status = self.get_transceiver_bulk_status()
-        return transceiver_bulk_status.get("temperature", "N/A")
+        return transceiver_bulk_status.get("temperature", 0.0)
 
     def get_voltage(self):
         """
@@ -974,7 +996,7 @@ def get_voltage(self):
             An integer number of supply voltage in mV
         """
         transceiver_bulk_status = self.get_transceiver_bulk_status()
-        return transceiver_bulk_status.get("voltage", "N/A")
+        return transceiver_bulk_status.get("voltage", 0.0)
 
     def get_tx_bias(self):
         """
@@ -984,9 +1006,49 @@ def get_tx_bias(self):
             for channel 0 to channel 4.
             Ex. ['110.09', '111.12', '108.21', '112.09']
         """
-        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
-        tx1_bs = transceiver_dom_info_dict.get("tx1bias", "N/A")
-        return [tx1_bs, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        tx_bias_list = []
+        if not self.dom_supported:
+            return tx_bias_list
+
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return tx_bias_list
+
+            dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+            if dom_channel_monitor_raw is not None:
+                dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                    dom_channel_monitor_raw, 0)
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX1Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX2Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX3Bias']['value']))
+                tx_bias_list.append(self._convert_string_to_num(
+                    dom_channel_monitor_data['data']['TX4Bias']['value']))
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return tx_bias_list
+            sfpd_obj._calibration_type = self.calibration
+
+            if self.dom_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_bias_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXBias']['value']))
+
+        return tx_bias_list
 
     def get_rx_power(self):
         """
@@ -996,9 +1058,48 @@ def get_rx_power(self):
             power in mW for channel 0 to channel 4.
             Ex. ['1.77', '1.71', '1.68', '1.70']
         """
-        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
-        rx1_pw = transceiver_dom_info_dict.get("rx1power", "N/A")
-        return [rx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        rx_power_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return rx_power_list
+
+            if self.dom_rx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX1Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX2Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX3Power']['value']))
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RX4Power']['value']))
+
+        elif self.sfp_type == SFP_TYPE:
+            offset = 256
+
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    rx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['RXPower']['value']))
+
+        return rx_power_list
 
     def get_tx_power(self):
         """
@@ -1008,9 +1109,48 @@ def get_tx_power(self):
             for channel 0 to channel 4.
             Ex. ['1.86', '1.86', '1.86', '1.86']
         """
-        transceiver_dom_info_dict = self.get_transceiver_bulk_status()
-        tx1_pw = transceiver_dom_info_dict.get("tx1power", "N/A")
-        return [tx1_pw, "N/A", "N/A", "N/A"] if transceiver_dom_info_dict else []
+        tx_power_list = []
+        if self.sfp_type == QSFP_TYPE:
+            offset = 0
+
+            sfpd_obj = sff8436Dom()
+            if sfpd_obj is None:
+                return tx_power_list
+
+            if self.dom_tx_power_supported:
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + QSFP_CHANNL_MON_OFFSET), QSFP_CHANNL_MON_WITH_TX_POWER_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params_with_tx_power(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX1Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX2Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX3Power']['value']))
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TX4Power']['value']))
+
+        elif self.sfp_type == SFP_TYPE:
+
+            offset = 256
+            sfpd_obj = sff8472Dom()
+            if sfpd_obj is None:
+                return None
+
+            if self.dom_supported:
+                sfpd_obj._calibration_type = self.calibration
+
+                dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
+                    (offset + SFP_CHANNL_MON_OFFSET), SFP_CHANNL_MON_WIDTH)
+                if dom_channel_monitor_raw is not None:
+                    dom_channel_monitor_data = sfpd_obj.parse_channel_monitor_params(
+                        dom_channel_monitor_raw, 0)
+                    tx_power_list.append(self._convert_string_to_num(
+                        dom_channel_monitor_data['data']['TXPower']['value']))
+
+        return tx_power_list
 
     def reset(self):
         """
@@ -1031,7 +1171,7 @@ def tx_disable(self, tx_disable):
             A boolean, True if tx_disable is set successfully, False if not
         """
         sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
-        status_control_raw = self.__read_eeprom_specific_bytes(
+        status_control_raw = self._read_eeprom_specific_bytes(
             SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH)
         if status_control_raw is not None:
             # Set bit 6 for Soft TX Disable Select

From 6a6b81b9837cc346d7011bc8baca8146f53fcafb Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Thu, 7 Oct 2021 20:36:08 -0700
Subject: [PATCH 0839/1674] Add Arista eeprom platform API method to update
 database (#8914)

Why I did it
Sujin noticed that Arista eeprom platform API cannot update the redis database. Although Arista and Guohan believe that database update logic should be part of the daemon, it is easy enough to implement the fix for Arista for now.

How I did it
Made Arista eeprom platform API inherit from TlvInfoDecoder, then write Arista's own visit_eeprom method.
Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index cf36e513e41c..17d036affb13 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 17d036affb13a19c025c2affe0ff5f01af1380d7
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index cf36e513e41c..17d036affb13 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 17d036affb13a19c025c2affe0ff5f01af1380d7

From b11d6cf5ee7c9c1b7cb6aad26bd77b7e9a2cdb54 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 10 Oct 2021 03:12:09 +0800
Subject: [PATCH 0840/1674] [ci/build]: Upgrade SONiC package versions (#8919)

---
 .../versions-deb-buster                       |  1 +
 .../build-sonic-slave-buster/versions-git     |  2 +-
 .../versions-deb-stretch                      |  2 --
 files/build/versions/default/versions-docker  | 10 ++++-----
 files/build/versions/default/versions-git     |  4 ++--
 files/build/versions/default/versions-web     |  2 +-
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-dhcp-relay/versions-deb-buster     |  4 ++++
 .../dockers/docker-ptf/versions-deb-stretch   |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  6 +++---
 .../versions-py3-all-arm64                    |  1 +
 .../docker-syncd-mlnx/versions-deb-buster     | 21 +++++++++++++++++++
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-git                              |  1 +
 .../versions-py3-all-armhf                    |  2 +-
 .../versions-deb-stretch-arm64                |  4 ++--
 .../versions-deb-stretch-armhf                |  6 +++---
 .../sonic-slave-stretch/versions-deb-stretch  |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 --
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 .../host-image/versions-py3-all-arm64         |  2 ++
 .../host-image/versions-py3-all-armhf         |  4 +++-
 24 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 create mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index e11beda06edb..0cf3325dea42 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -42,6 +42,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
+mft==4.17.0-106
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index de3eda9da1f8..5d520febd6ee 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,4 +1,4 @@
-https://github.com/CESNET/libyang.git==782c032415c1ee3a6f02b1a549b5d5ea7d37de95
+https://github.com/CESNET/libyang.git==e4e7d7adb49ad585a6af26584813d363f174e909
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index a7c8e756c1da..af7a04c29723 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -1,6 +1,5 @@
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
-libnl-3-200==3.5.0-1
 libnl-3-dev==3.5.0-1
 libnl-cli-3-200==3.5.0-1
 libnl-cli-3-dev==3.5.0-1
@@ -8,7 +7,6 @@ libnl-genl-3-200==3.5.0-1
 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-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index f1f602345e4d..ecd90913c23b 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,6 +1,6 @@
 amd64:amd64/debian:buster==sha256:2d3ea67549bcf9c6fd5ae9323237def50d9ed39ca118217b4f4cc8df8541fa77
 amd64:amd64/debian:stretch==sha256:4cb539063de2a9b219a55efe892ba203be9bd5668cab78dad443b5ccfc751e6d
-amd64:debian:buster==sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612
+amd64:debian:buster==sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663
 amd64:debian:stretch==sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
@@ -29,10 +29,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:2affdd4aed32efc2087f552b125844cf3e6ef84dd283c893e1a5f42d2c65b12a
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:c76e5386ef50035aaef9e9daea28928014dc8359c5829bb2854d12eb0fcd705f
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:040cb6174966e3e72f69ec0598a5682eafde0e15ea1c202ccd5970c0bf38cdcd
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:0f3ba17fb1540051b968533b59e77853c512dd4d54892a265ac6553f2091560d
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:ea75b798b2a15d3511307b754e73f1e90e9b5515417bafdc303ce09c86bd4173
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:172911bb03322441b508e653d7654f0099a2fa6da248621bfd02dbc75b973497
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:85e85ef04df0c7946239f35e3ce3d7135e3dd243e60efc79113e8dae09437afa
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:94f652d8f34708aec60fbaa0baf9d5d4f108d0f193057020b4c28c7e79b2690e
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b018d79ffd08..2016c7b9f991 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0e2fb336b2e7ddbbb9c5ab70eab25f82f55dff2b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==dc86a4b9044f9243886ca0da0c1753820ac51f45
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
-https://github.com/CESNET/libyang.git==e4e7d7adb49ad585a6af26584813d363f174e909
+https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index d9cc554d3f06..557f9152cf5a 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==e880e41c58e5024812a20ec28d813cda
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3a66f2e2464ce379359635720d5b199e
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==74a6977fc65cb57dcbd08c6e21d61567
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-3.deb==ddd833047fc213abb1187b752905e56a
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-4.deb==d67c0001d560077ef76dcaafa043b7c6
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 8c6551521562..5800e346560c 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,5 +1,5 @@
 j2cli==0.3.10
-jinja2==3.0.1
+jinja2==3.0.2
 markupsafe==2.0.1
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index 32d110151483..00fbdf14288e 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -3,6 +3,9 @@ gdbserver==8.2.1-2+b3
 isc-dhcp-relay==4.4.1-2
 isc-dhcp-relay-dbgsym==4.4.1-2
 libbabeltrace1==1.5.6-2+deb10u1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libdw1==0.176-1.1
@@ -19,6 +22,7 @@ libpopt0==1.16-12
 libunwind8==1.2.1-10~deb10u1
 lsof==4.91+dfsg-1
 openssh-client==1:7.9p1-10+deb10u2
+sonic-dhcp6relay==1.0.0-0
 sonic-dhcpmon==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 47d92ec4d5f9..2f69274aa5fb 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -36,7 +36,7 @@ gnupg-agent==2.1.18-8~deb9u4
 gnupg-l10n==2.1.18-8~deb9u4
 guile-2.0-libs==2.0.13+1-4
 hping3==3.a2.ds2-7
-krb5-locales==1.15-1+deb9u1
+krb5-locales==1.15-1+deb9u3
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 1ae835a58fe4..e6bf8794e864 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -4,7 +4,7 @@ charset-normalizer==2.0.6
 click==8.0.1
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.0.1
+flask==2.0.2
 grpcio==1.41.0
 grpcio-tools==1.20.0
 idna==3.2
@@ -15,12 +15,12 @@ itsdangerous==2.0.1
 jsonschema==4.0.1
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.18.0
+protobuf==3.18.1
 pyrsistent==0.18.0
 python-dateutil==2.6.0
 requests==2.26.0
 six==1.11.0
 typing-extensions==3.10.0.2
 urllib3==1.21.1
-werkzeug==2.0.1
+werkzeug==2.0.2
 zipp==3.6.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
new file mode 100644
index 000000000000..51f078e566db
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
@@ -0,0 +1 @@
+click==8.0.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index bb8da8e06c99..c96c7f7badb4 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,11 +1,22 @@
 applibs==1.mlnx.4.4.3326
 applibs-dev==1.mlnx.4.4.3326
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3326
 iproute2-dev==1.mlnx.4.4.3326
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -15,11 +26,16 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.194-3
 mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
+openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
@@ -32,6 +48,8 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+sshpass==1.06-1
+strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3326
 sx-acl-helper-dev==1.mlnx.4.4.3326
 sx-complib==1.mlnx.4.4.3326
@@ -45,5 +63,8 @@ sx-scew-dev==1.mlnx.4.4.3326
 sxd-libs==1.mlnx.4.4.3326
 sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3326
 wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index d9e2d51ba9ff..73f1f041edad 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -23,7 +23,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-3
+mrvllibsai==1.7.1-4
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index ddb4a86af6a8..32172943e828 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.10-1
+containerd.io==1.4.11-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
new file mode 100644
index 000000000000..5a139e0e753c
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7cdf1424b91417c4fae021caa9ef239980b4d180
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index ac8c91a16afd..781c252dcb4e 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.24
+regex==2021.9.30
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 6c2b922d0e9f..16ac62c4c7b5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -165,7 +165,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u1
+krb5-locales==1.15-1+deb9u3
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
@@ -914,7 +914,7 @@ libtext-wrapi18n-perl==0.06-7.1
 libthai-data==0.1.26-1
 libthai0==0.1.26-1
 libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u6
+libtiff5==4.0.8-2+deb9u7
 libtimedate-perl==2.3000-2+deb9u1
 libtinfo-dev==6.0+20161126-1+deb9u2
 libtinyxml2-4==4.0.1-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index 0eddfddd242d..fff1fd860f6a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -165,7 +165,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u1
+krb5-locales==1.15-1+deb9u3
 less==481-2.1
 libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
@@ -884,7 +884,7 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u1
 libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
@@ -917,7 +917,7 @@ libtext-wrapi18n-perl==0.06-7.1
 libthai-data==0.1.26-1
 libthai0==0.1.26-1
 libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u6
+libtiff5==4.0.8-2+deb9u7
 libtimedate-perl==2.3000-2+deb9u1
 libtinfo-dev==6.0+20161126-1+deb9u2
 libtinyxml2-4==4.0.1-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 2b37438fc6b2..3d9ecb155e94 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -960,7 +960,7 @@ libtext-wrapi18n-perl==0.06-7.1
 libthai-data==0.1.26-1
 libthai0==0.1.26-1
 libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u6
+libtiff5==4.0.8-2+deb9u7
 libtimedate-perl==2.3000-2+deb9u1
 libtinfo-dev==6.0+20161126-1+deb9u2
 libtinyxml2-4==4.0.1-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 8c49c29ce2c1..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b4d3954db70ed8e34838cd95bec4da7189c80983
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index f1b7ae6e411c..3b133e70388a 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.10-1
+containerd.io==1.4.11-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 040b8d4b1814..3f42ef33bfca 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -12,7 +12,7 @@ idna==3.2
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
-jinja2==3.0.1
+jinja2==3.0.2
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
new file mode 100644
index 000000000000..f323c091fe3d
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3-all-arm64
@@ -0,0 +1,2 @@
+certifi==2021.10.8
+regex==2021.10.8
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 431dc5a43838..3c29c897d679 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1 +1,3 @@
-cryptography==3.3.1
\ No newline at end of file
+certifi==2021.10.8
+cryptography==3.3.1
+regex==2021.10.8
\ No newline at end of file

From c71a263894576d71194ff94e2173cc9057930781 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 7 Oct 2021 22:47:36 -0700
Subject: [PATCH 0841/1674] DellEMC: Fix z9332f low power mode issue (#8693)

---
 .../plugins/sfputil.py                        | 175 ++++++++++++++----
 .../z9332f/sonic_platform/sfp.py              |  42 +++--
 2 files changed, 165 insertions(+), 52 deletions(-)

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
index d037fd9273dd..f3108ff12f85 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py
@@ -2,13 +2,12 @@
 #
 # Platform-specific SFP transceiver interface for SONiC
 #
-
 try:
-    import struct
     import sys
     import getopt
     import time
     import select
+    import io
     from sonic_sfp.sfputilbase import SfpUtilBase
     from os import *
     from mmap import *
@@ -19,6 +18,25 @@
 # from xcvrd
 SFP_STATUS_REMOVED = '0'
 SFP_STATUS_INSERTED = '1'
+MEDIA_TYPE_OFFSET = 0
+MEDIA_TYPE_WIDTH = 1
+QSFP_DD_MODULE_ENC_OFFSET = 3
+QSFP_DD_MODULE_ENC_WIDTH = 1
+
+SFP_TYPE_LIST = [
+    '03' # SFP/SFP+/SFP28 and later
+]
+QSFP_TYPE_LIST = [
+    '0c', # QSFP
+    '0d', # QSFP+ or later
+    '11'  # QSFP28 or later
+]
+QSFP_DD_TYPE_LIST = [
+    '18' #QSFP_DD Type
+]
+OSFP_TYPE_LIST=[
+    '19' # OSFP 8X Type
+]
 
 
 class SfpUtil(SfpUtilBase):
@@ -87,18 +105,77 @@ def qsfp_ports(self):
     def port_to_eeprom_mapping(self):
         return self._port_to_eeprom_mapping
 
+    def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
+        eeprom_raw = []
+        try:
+            eeprom = io.open(eeprom_path, mode="rb", buffering=0)
+        except IOError:
+            return None
+
+        for i in range(0, num_bytes):
+            eeprom_raw.append("0x00")
+
+        try:
+            eeprom.seek(offset)
+            raw = eeprom.read(num_bytes)
+        except IOError:
+            eeprom.close()
+            return None
+
+        try:
+            if isinstance(raw , str):
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            else:
+                for n in range(0, num_bytes):
+                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
+
+        except (OSError, IOError):
+            eeprom.close()
+            return None
+
+        eeprom.close()
+        return eeprom_raw
+
+    def _write_eeprom_bytes(self, eeprom_path, offset, num_bytes, value):
+        try:
+            with io.open(eeprom_path, mode='r+b', buffering=0) as f:
+                f.seek(offset)
+                f.write(value[0:num_bytes])
+        except (OSError, IOError):
+            return False
+        return True
+
+
+    def get_media_type(self, port_num):
+        """
+        Reads optic eeprom byte to determine media type inserted
+        """
+        eeprom_raw = []
+        eeprom_raw = self._read_eeprom_bytes(self.port_to_eeprom_mapping[port_num], MEDIA_TYPE_OFFSET,
+                     MEDIA_TYPE_WIDTH)
+        if eeprom_raw is not None:
+            if eeprom_raw[0] in SFP_TYPE_LIST:
+                sfp_type = 'SFP'
+            elif eeprom_raw[0] in QSFP_TYPE_LIST:
+                sfp_type = 'QSFP'
+            elif eeprom_raw[0] in QSFP_DD_TYPE_LIST:
+                sfp_type = 'QSFP_DD'
+            else:
+                #Set native port type if EEPROM type is not recognized/readable
+                sfp_type = 'QSFP_DD'
+        else:
+            sfp_type = 'QSFP_DD'
+
+        return sfp_type
+
     def pci_mem_read(self, mm, offset):
         mm.seek(offset)
-        read_data_stream = mm.read(4)
-        reg_val = struct.unpack('I', read_data_stream)
-        mem_val = str(reg_val)[1:-2]
-        # print "reg_val read:%x"%reg_val
-        return mem_val
+        return mm.read_byte()
 
     def pci_mem_write(self, mm, offset, data):
         mm.seek(offset)
-        # print "data to write:%x"%data
-        mm.write(struct.pack('I', data))
+        mm.write_byte(data)
 
     def pci_set_value(self, resource, val, offset):
         fd = open(resource, O_RDWR)
@@ -181,54 +258,70 @@ def get_low_power_mode(self, port_num):
         # Check for invalid port_num
         if port_num < self.port_start or port_num > self.port_end:
             return False
-
-        # Port offset starts with 0x4000
-        port_offset = 16384 + ((port_num-1) * 16)
-
-        status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
-        reg_value = int(status)
-
-        # Absence of status throws error
-        if (reg_value == ""):
+        if port_num > self.PORTS_IN_BLOCK:
+            return False
+        if self.get_media_type(port_num) == 'QSFP_DD':
+            lpmode = self._read_eeprom_bytes(self.port_to_eeprom_mapping[port_num], QSFP_DD_MODULE_ENC_OFFSET, 
+                     QSFP_DD_MODULE_ENC_WIDTH)
+            if lpmode is not None:
+                if int(lpmode[0])>>1 == 1:
+                   return True
             return False
+        else:
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((port_num-1) * 16)
 
-        # Mask off 4th bit for presence
-        mask = (1 << 6)
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            # Absence of status throws error
+            if (status == ""):
+                return False
 
-        # LPMode is active high
-        if reg_value & mask == 0:
-            return False
+            reg_value = int(status)
 
-        return True
+            # Mask off 4th bit for presence
+            mask = (1 << 6)
+
+            # LPMode is active high
+            if reg_value & mask == 0:
+                return False
+            return True
 
     def set_low_power_mode(self, port_num, lpmode):
 
         # Check for invalid port_num
         if port_num < self.port_start or port_num > self.port_end:
             return False
-
-        # Port offset starts with 0x4000
-        port_offset = 16384 + ((port_num-1) * 16)
-
-        status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
-        reg_value = int(status)
-
-        # Absence of status throws error
-        if (reg_value == ""):
+        if port_num > self.PORTS_IN_BLOCK:
             return False
 
-        # Mask off 4th bit for presence
-        mask = (1 << 6)
+        if self.get_media_type(port_num) == 'QSFP_DD':
+            if lpmode is True:
+                write_val = 0x10
+            else:
+                write_val = 0x0
 
-        # LPMode is active high; set or clear the bit accordingly
-        if lpmode is True:
-            reg_value = reg_value | mask
+            self._write_eeprom_bytes(self.port_to_eeprom_mapping[port_num], 26, 1, bytearray([write_val]))
         else:
-            reg_value = reg_value & ~mask
+            # Port offset starts with 0x4000
+            port_offset = 16384 + ((port_num-1) * 16)
+            status = self.pci_get_value(self.BASE_RES_PATH, port_offset)
+            reg_value = int(status)
 
-        # Convert our register value back to a hex string and write back
-        status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
+            # Absence of status throws error
+            if (reg_value == ""):
+                return False
+
+            # Mask off 4th bit for presence
+            mask = (1 << 6)
+
+            # LPMode is active high; set or clear the bit accordingly
+            if lpmode is True:
+                reg_value = reg_value | mask
+            else:
+                reg_value = reg_value & ~mask
 
+            # Convert our register value back to a hex string and write back
+            status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset)
         return True
 
     def reset(self, port_num):
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index 1b4327ff342c..a08667a8e71e 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -13,7 +13,6 @@
     import re
     import time
     import subprocess
-    import struct
     import mmap
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
@@ -60,6 +59,8 @@
 QSFP_DD_APP1_ADV_WIDTH = 32
 QSFP_DD_APP2_ADV_OFFSET = 351
 QSFP_DD_APP2_ADV_WIDTH = 28
+QSFP_DD_MODULE_ENC_OFFSET = 3
+QSFP_DD_MODULE_ENC_WIDTH = 1
 
 QSFP_INFO_OFFSET = 128
 QSFP_DOM_OFFSET = 0
@@ -311,16 +312,12 @@ def _strip_unit_from_str(self, value_str):
 
     def pci_mem_read(self, mm, offset):
         mm.seek(offset)
-        read_data_stream = mm.read(4)
-        reg_val = struct.unpack('I', read_data_stream)
-        mem_val = str(reg_val)[1:-2]
-        # print "reg_val read:%x"%reg_val
-        return mem_val
+        return mm.read_byte()
 
     def pci_mem_write(self, mm, offset, data):
         mm.seek(offset)
         # print "data to write:%x"%data
-        mm.write(struct.pack('I', data))
+        mm.write_byte(data)
 
     def pci_set_value(self, resource, val, offset):
         fd = os.open(resource, os.O_RDWR)
@@ -338,6 +335,15 @@ def pci_get_value(self, resource, offset):
         os.close(fd)
         return val
 
+    def _write_eeprom_bytes(self, offset, num_bytes, value):
+        try:
+            with open(self.eeprom_path, mode='r+b', buffering=0) as f:
+                f.seek(offset)
+                f.write(value[0:num_bytes])
+        except (OSError, IOError):
+            return False
+        return True
+
     def _read_eeprom_bytes(self, eeprom_path, offset, num_bytes):
         eeprom_raw = []
         try:
@@ -994,7 +1000,13 @@ def get_lpmode(self):
         """
         lpmode_state = False
         try:
-            if self.sfp_type.startswith('QSFP'):
+            if self.sfp_type == 'QSFP_DD':
+                lpmode = self._read_eeprom_bytes(self.eeprom_path, QSFP_DD_MODULE_ENC_OFFSET, QSFP_DD_MODULE_ENC_WIDTH)
+                if lpmode is not None:
+                    if int(lpmode[0])>>1 == 1:
+                        return True
+                return False
+            else:
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 
@@ -1005,8 +1017,9 @@ def get_lpmode(self):
                 mask = (1 << 6)
 
                 lpmode_state = (reg_value & mask)
-        except  ValueError: pass
-        return lpmode_state
+        except ValueError:
+            pass
+        return bool(lpmode_state)
 
     def get_power_override(self):
         """
@@ -1231,7 +1244,14 @@ def set_lpmode(self, lpmode):
         Sets the lpmode(low power mode) of this SFP
         """
         try:
-            if self.port_type == 'QSFP_DD':
+            if self.sfp_type == 'QSFP_DD':
+                if lpmode is True:
+                    write_val = 0x10
+                else:
+                    write_val = 0x0
+
+                self._write_eeprom_bytes(26, 1, bytearray([write_val]))
+            else:
                 # Port offset starts with 0x4000
                 port_offset = 16384 + ((self.index-1) * 16)
 

From 63037a20f9854550780790db6e3de5809105009b Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 8 Oct 2021 15:31:49 +0800
Subject: [PATCH 0842/1674] [ci]: Support azp for cisco 8000 (#8654)

Why I did it
Setup Azure pipeline for cisco 8000.
---
 .../azure-pipelines-image-template.yml        |  3 +-
 .../official-build-cisco-8000.yml             | 64 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 .azure-pipelines/official-build-cisco-8000.yml

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 3c437cc56664..daee2aac30be 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -26,7 +26,7 @@ jobs:
     jobVariables: ${{ parameters.jobVariables }}
     preSteps:
       - template: cleanup.yml
-      - ${{ parameters. preSteps }}
+      - ${{ parameters.preSteps }}
       - script: |
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
@@ -36,6 +36,7 @@ jobs:
         displayName: "Set cache options"
       - checkout: self
         submodules: recursive
+        condition: eq(variables.SKIP_CHECKOUT, '') 
         displayName: 'Checkout code'
       - script: |
           BRANCH_NAME=$(Build.SourceBranchName)
diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
new file mode 100644
index 000000000000..bfeecbc81387
--- /dev/null
+++ b/.azure-pipelines/official-build-cisco-8000.yml
@@ -0,0 +1,64 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight build
+  branches:
+    include:
+    - master
+    - 202012
+  always: true
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: cisco-8000
+    type: github
+    name: Cisco-8000-sonic/platform-cisco-8000
+    endpoint: cisco-connection
+
+stages:
+- stage: Build
+  pool: sonic
+  variables:
+    CACHE_MODE: wcache
+    SKIP_CHECKOUT: true
+    TERM: ''
+
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      preSteps:
+      - checkout: self
+        submodules: recursive
+        path: s
+        displayName: 'Checkout code'
+      - checkout: cisco-8000
+        submodules: recursive
+        path: s/platform/cisco-8000
+        displayName: 'Checkout cisco-8000'
+      - script: |
+          cisco_ref=(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
+          echo "The cisco 8000 release version is $cisco_ref"
+          echo "##vso[task.setvariable variable=cisco.ref]$cisco_ref"
+        displayName: 'Export cisco release version'
+      - task: DownloadGitHubRelease@0
+        inputs:
+          connection: cisco-connection
+          userRepository: Cisco-8000-sonic/platform-cisco-8000
+          defaultVersionType: specificTag
+          version: $(cisco.ref)
+          itemPattern: 'artifactory-*.tar.gz'
+          downloadPath: '$(System.ArtifactsDirectory)'
+      - script: |
+          make PLATFORM=cisco-8000 platform/cisco-8000
+          tar xfz $(System.ArtifactsDirectory)/artifactory-*.tar.gz -C platform/cisco-8000
+        displayName: 'Setup cisco artifacts'
+      jobGroups:
+      - name: cisco-8000

From 84f6a090a6628adb947e5b64662880e8f5a3bb9a Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Sat, 9 Oct 2021 15:41:22 -0700
Subject: [PATCH 0843/1674] [RESTAPI] Update Submodule (#8931)

Include the following commits:

f9bbed3cb86a3bab9a07745096835dbdbe5a4db6
Convert Unit Tests from unittest framework to pytest framework

e842c5ff317c67919dcbcab3358143cb9a16c9dd
Generate code coverage for Unit Tests
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index e466ac226c48..e842c5ff317c 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit e466ac226c48cf87f83aa5564efd7155ac97a0c1
+Subproject commit e842c5ff317c67919dcbcab3358143cb9a16c9dd

From 4d859eb923fd55359e5a1ffad2861eb7429d34b2 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Tue, 12 Oct 2021 10:13:48 -0700
Subject: [PATCH 0844/1674] Revert "Add Arista eeprom platform API method to
 update database (#8914)" (#8955)

This reverts commit 6a6b81b9837cc346d7011bc8baca8146f53fcafb.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 17d036affb13..cf36e513e41c 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 17d036affb13a19c025c2affe0ff5f01af1380d7
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 17d036affb13..cf36e513e41c 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 17d036affb13a19c025c2affe0ff5f01af1380d7
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d

From 44474265639023217cdecd0a43dcbe861591a400 Mon Sep 17 00:00:00 2001
From: Anton Ptashnik <antonx.ptashnik@intel.com>
Date: Wed, 13 Oct 2021 00:16:27 +0300
Subject: [PATCH 0845/1674] updated platform info for device
 x86_64-accton_wedge100bf_32x-r0 (#8918)

Why I did it
For sonic-mgmt Platform API tests to have data to compare with

How I did it
How to verify it
Run sonic-mgmt Platform API tests
---
 .../platform.json                             | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json
index 0b68edf1610c..6a9779b120ed 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json
@@ -1,4 +1,209 @@
 {
+    "chassis": {
+        "name": "Wedge100BF-32X-O-AC-F-BF",
+        "fans": [
+            {
+                "name": "counter-rotating-fan-1"
+            },
+            {
+                "name": "counter-rotating-fan-2"
+            },
+            {
+                "name": "counter-rotating-fan-3"
+            },
+            {
+                "name": "counter-rotating-fan-4"
+            },
+            {
+                "name": "counter-rotating-fan-5"
+            }
+        ],
+        "fan_drawers":[
+            {
+                "name": "fantray",
+                "num_fans" : 5,
+                "fans": [
+                    {
+                        "name": "counter-rotating-fan-1"
+                    },
+                    {
+                        "name": "counter-rotating-fan-2"
+                    },
+                    {
+                        "name": "counter-rotating-fan-3"
+                    },
+                    {
+                        "name": "counter-rotating-fan-4"
+                    },
+                    {
+                        "name": "counter-rotating-fan-5"
+                    }
+                ]
+            }
+        ],
+        "psus": [
+            {
+                "name": "PSU 1"
+            },
+            {
+                "name": "PSU 2"
+            }
+        ],
+        "thermals": [
+            {
+                "name": "com_e_driver-i2c-4-33:memory-temp"
+            },
+            {
+                "name": "com_e_driver-i2c-4-33:cpu-temp"
+            },
+            {
+                "name": "pfe1100-i2c-7-59:temp1"
+            },
+            {
+                "name": "pfe1100-i2c-7-59:temp2"
+            },
+            {
+                "name": "pfe1100-i2c-7-5a:temp1"
+            },
+            {
+                "name": "pfe1100-i2c-7-5a:temp2"
+            },
+            {
+                "name": "tmp75-i2c-3-48:outlet-middle-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-49:inlet-middle-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4a:inlet-left-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4b:switch-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4c:inlet-right-temp"
+            },
+            {
+                "name": "tmp75-i2c-8-48:outlet-right-temp"
+            },
+            {
+                "name": "tmp75-i2c-8-49:outlet-left-temp"
+            },
+            {
+                "name": "coretemp-isa-0000:package-id-0"
+            },
+            {
+                "name": "coretemp-isa-0000:core-0"
+            },
+            {
+                "name": "coretemp-isa-0000:core-1"
+            },
+            {
+                "name": "coretemp-isa-0000:core-2"
+            },
+            {
+                "name": "coretemp-isa-0000:core-3"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "Ethernet0"
+            },
+            {
+                "name": "Ethernet4"
+            },
+            {
+                "name": "Ethernet8"
+            },
+            {
+                "name": "Ethernet12"
+            },
+            {
+                "name": "Ethernet16"
+            },
+            {
+                "name": "Ethernet20"
+            },
+            {
+                "name": "Ethernet24"
+            },
+            {
+                "name": "Ethernet28"
+            },
+            {
+                "name": "Ethernet32"
+            },
+            {
+                "name": "Ethernet36"
+            },
+            {
+                "name": "Ethernet40"
+            },
+            {
+                "name": "Ethernet44"
+            },
+            {
+                "name": "Ethernet48"
+            },
+            {
+                "name": "Ethernet52"
+            },
+            {
+                "name": "Ethernet56"
+            },
+            {
+                "name": "Ethernet60"
+            },
+            {
+                "name": "Ethernet64"
+            },
+            {
+                "name": "Ethernet68"
+            },
+            {
+                "name": "Ethernet72"
+            },
+            {
+                "name": "Ethernet76"
+            },
+            {
+                "name": "Ethernet80"
+            },
+            {
+                "name": "Ethernet84"
+            },
+            {
+                "name": "Ethernet88"
+            },
+            {
+                "name": "Ethernet92"
+            },
+            {
+                "name": "Ethernet96"
+            },
+            {
+                "name": "Ethernet100"
+            },
+            {
+                "name": "Ethernet104"
+            },
+            {
+                "name": "Ethernet108"
+            },
+            {
+                "name": "Ethernet112"
+            },
+            {
+                "name": "Ethernet116"
+            },
+            {
+                "name": "Ethernet120"
+            },
+            {
+                "name": "Ethernet124"
+            }
+        ]
+    },
     "interfaces": {
         "Ethernet0": {
             "index": "1,1,1,1",

From eca9020a489f0d3619f993979526c041166679ca Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 13 Oct 2021 08:25:44 -0700
Subject: [PATCH 0846/1674] [202012] BRCM SAI 4.5.3.1-4 Fixes dscp-uniform
 mode, th3 debug counter bmp crash (#8968)

* [202012] BRCM SAI 4.5.3.1-4 Fixes dscp-uniform mode, th3 debug counter bmp crash
---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 557f9152cf5a..fc173aa7d1b8 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=2WoIZ2gpylyuL6XEKTGka0zqXLNpLr407Qfyp6YFqvI%3D&se=2035-06-22T06%3A51%3A34Z&sp=r==aa26b352b58101e0d97bea9c98d75f88
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=LfRmvdkpfDcRBIW0R%2BHvD9zdc%2Br5KP%2BRY9aGK9gk1IE%3D&se=2035-06-22T06%3A50%3A41Z&sp=r==d3711211d1cfb567710bb7e5359238a8
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -73,4 +75,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 0c330a1056fd..ed288c2c7c4a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-4_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=LfRmvdkpfDcRBIW0R%2BHvD9zdc%2Br5KP%2BRY9aGK9gk1IE%3D&se=2035-06-22T06%3A50%3A41Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-4_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=2WoIZ2gpylyuL6XEKTGka0zqXLNpLr407Qfyp6YFqvI%3D&se=2035-06-22T06%3A51%3A34Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 94456b168005187ff773cef7896a3aa76ccaf584 Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Thu, 14 Oct 2021 16:43:57 -0700
Subject: [PATCH 0847/1674] [202012] [Arista] Enable syseepromd update database
 (with 202012 fix) (#8963)

Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
Why I did it
The previous PR #8914 was reverted due to crashing the 202012 syseepromd.

How I did it
Tested the 202012 image with change and fixed the disparity between master and 202012.

How to verify it
Run the built image on the dut and syseepromd will not crash, and in redis-cli can fetch the eeprom information.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index cf36e513e41c..4e6148625a88 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 4e6148625a88f4baf2b7cf0860f40dfbb53a0792
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index cf36e513e41c..4e6148625a88 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 4e6148625a88f4baf2b7cf0860f40dfbb53a0792

From dfc4bc540eff7c6600e23fcda3c3cd7917c923dc Mon Sep 17 00:00:00 2001
From: Xichen96 <lukelin0907@gmail.com>
Date: Thu, 14 Oct 2021 08:33:19 +0800
Subject: [PATCH 0848/1674] [determine-reboot-cause] delay execution (#8935)

Since database.service has been moved to execute after rc-local.service,
and determine-reboot-cause.service rely on database.service, we have to
specify that in "After=".

Signed-off-by: Xichen Lin <xichenlin@microsoft.com>

Co-authored-by: Xichen Lin <xichenlin@microsoft.com>
---
 .../sonic-host-services-data.determine-reboot-cause.service   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.determine-reboot-cause.service b/src/sonic-host-services-data/debian/sonic-host-services-data.determine-reboot-cause.service
index a6c58d4c9818..f0d9e91fe991 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.determine-reboot-cause.service
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.determine-reboot-cause.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Reboot cause determination service
-Requires=rc-local.service
-After=rc-local.service
+Requires=rc-local.service database.service
+After=rc-local.service database.service
 
 [Service]
 Type=simple

From f1d5aaced0fe16c55f4f558fd0cb2d087ec99777 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 13 Oct 2021 21:07:44 -0700
Subject: [PATCH 0849/1674] [copp] bind copp-config.service to sonic.target
 (#8969)

copp-config service needs to be started after sonic.target so that it could
render the copp-config with the latest information.

It also needs to be restarted when config reload or load_minigraph is invoked.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 files/image_config/copp/copp-config.service | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/image_config/copp/copp-config.service b/files/image_config/copp/copp-config.service
index 8eed2353eddf..bd15de80bc5f 100644
--- a/files/image_config/copp/copp-config.service
+++ b/files/image_config/copp/copp-config.service
@@ -2,10 +2,12 @@
 Description=Update CoPP configuration
 Requires=updategraph.service
 After=updategraph.service
+BindsTo=sonic.target
+After=sonic.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/copp-config.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target

From 967d8abe071a31c2cfa917416a451446116dfa75 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 14 Oct 2021 14:14:27 +0800
Subject: [PATCH 0850/1674] Fix failed to download cisco artifacts issue
 (#8942)

Why I did it
Fix the failure to download cisco artifacts issue
---
 .azure-pipelines/official-build-cisco-8000.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
index bfeecbc81387..aeec64a848a1 100644
--- a/.azure-pipelines/official-build-cisco-8000.yml
+++ b/.azure-pipelines/official-build-cisco-8000.yml
@@ -44,7 +44,7 @@ stages:
         path: s/platform/cisco-8000
         displayName: 'Checkout cisco-8000'
       - script: |
-          cisco_ref=(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
+          cisco_ref=$(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
           echo "The cisco 8000 release version is $cisco_ref"
           echo "##vso[task.setvariable variable=cisco.ref]$cisco_ref"
         displayName: 'Export cisco release version'

From 8555e41d5f181cacf626d2dab97d33bf8c2e39dd Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Mon, 18 Oct 2021 20:57:26 -0700
Subject: [PATCH 0851/1674] redis-dump-load: Pin the redis package to use 3.5.3
 (#9001)

Redis 4.0.0b1 has been uploaded to pip as a prerelease version. This
version drops support for Python 2 and only supports Python 3. Because
setup.py is being run, it will use the latest version of a package and
not the latest stable version (which is still 3.5.3).

Therefore, pin the redis package to version 3.5.3, so that it will work
for both Python 2 and 3.

#### How to verify it

Make sure that redis-dump-load for Python 2 builds today.
---
 .../0003-use-redis-3.5.3.patch                | 25 +++++++++++++++++++
 src/redis-dump-load.patch/series              |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 src/redis-dump-load.patch/0003-use-redis-3.5.3.patch

diff --git a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
new file mode 100644
index 000000000000..a58c2059e81a
--- /dev/null
+++ b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
@@ -0,0 +1,25 @@
+Pin the redis package to version 3.5.3 (the last version that supports both
+Python 2 and 3).
+
+Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
+
+diff --git a/requirements.txt b/requirements.txt
+index 7800f0f..3fc0632 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1 +1 @@
+-redis
++redis==3.5.3
+diff --git a/setup.py b/setup.py
+index 8ccf31f..6db9ec4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,7 +17,7 @@ setup(name=package_name,
+     author_email='oleg@bsdpower.com',
+     url='http://github.com/p/redis-dump-load',
+     py_modules=['redisdl'],
+-    install_requires=['redis'],
++    install_requires=['redis==3.5.3'],
+     data_files=[
+         (doc_dir, data_files),
+     ],
diff --git a/src/redis-dump-load.patch/series b/src/redis-dump-load.patch/series
index c73c3b5caa97..50beb71a677f 100644
--- a/src/redis-dump-load.patch/series
+++ b/src/redis-dump-load.patch/series
@@ -1,2 +1,3 @@
 0001-Use-pipelines-when-dumping-52.patch
 0002-Fix-setup.py-for-test-and-bdist_wheel.patch
+0003-use-redis-3.5.3.patch

From 63083b2512fe3c0bdfd2db38127e782941192355 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:02:02 -0700
Subject: [PATCH 0852/1674] [202012][sonic-platform-common] submodule update
 (#9006)

This PR updates the following commits

0770dec Add retry reading/setting mux status to simulated y-cable driver (#221)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 93244bf85556..0770dec1009f 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 93244bf85556e1ca7d86883a8c6223c044105841
+Subproject commit 0770dec1009f468aa96ad8f1ac85bb3db7153e7f

From 676793b8ee6d6a4673d4bc85a7884ab4794920d1 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Tue, 19 Oct 2021 13:47:42 -0700
Subject: [PATCH 0853/1674] Port
 PR:https://github.com/Azure/sonic-buildimage/pull/8002 (#8851)

to 202012 branch
---
 platform/broadcom/saibcm-modules/make/Make.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/broadcom/saibcm-modules/make/Make.config b/platform/broadcom/saibcm-modules/make/Make.config
index b086aa3aa79b..17c4c7f66fc3 100644
--- a/platform/broadcom/saibcm-modules/make/Make.config
+++ b/platform/broadcom/saibcm-modules/make/Make.config
@@ -174,6 +174,9 @@ CPPFLAGS += ${INCFLAGS}
 
 CFLAGS += -DSAI_FIXUP -UKCOM_FILTER_MAX -DKCOM_FILTER_MAX=1024
 
+# Flag to enable multi instance support
+CFLAGS += -DBCM_INSTANCE_SUPPORT
+
 #
 # Debug #ifdef control
 #

From c95178157d8345c8e41fc536239df205b1f70a7e Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Tue, 19 Oct 2021 14:08:31 -0700
Subject: [PATCH 0854/1674] [202012]BRCM SAI 4.5.3.1-5 picked up SAI fixes for
 several CSP cases (#9003)

---
 files/build/versions/default/versions-web | 4 ++--
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index fc173aa7d1b8..490386c24efb 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,8 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=2WoIZ2gpylyuL6XEKTGka0zqXLNpLr407Qfyp6YFqvI%3D&se=2035-06-22T06%3A51%3A34Z&sp=r==aa26b352b58101e0d97bea9c98d75f88
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=LfRmvdkpfDcRBIW0R%2BHvD9zdc%2Br5KP%2BRY9aGK9gk1IE%3D&se=2035-06-22T06%3A50%3A41Z&sp=r==d3711211d1cfb567710bb7e5359238a8
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index ed288c2c7c4a..3cdea546cebd 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-4_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=LfRmvdkpfDcRBIW0R%2BHvD9zdc%2Br5KP%2BRY9aGK9gk1IE%3D&se=2035-06-22T06%3A50%3A41Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-4_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-5_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-5_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-4_amd64.deb?sv=2015-04-05&sr=b&sig=2WoIZ2gpylyuL6XEKTGka0zqXLNpLr407Qfyp6YFqvI%3D&se=2035-06-22T06%3A51%3A34Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 82d0539c4eb2634f66458ac1bdd83c616fe595dd Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Tue, 19 Oct 2021 16:15:21 -0700
Subject: [PATCH 0855/1674] Fix dhcpmon bugs (#9008)

* Exclude incrementing on aggregate device if packet received on mgmt interface

* Fix DHCPv6 header offset calculation
---
 src/dhcpmon/src/dhcp_device.c | 45 ++++++++++++++++++++++++++++-------
 src/dhcpmon/src/dhcp_device.h | 11 +++++++++
 src/dhcpmon/src/dhcp_devman.c |  3 +++
 3 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/dhcpmon/src/dhcp_device.c b/src/dhcpmon/src/dhcp_device.c
index 3078295e49a4..e4fbc7f56909 100644
--- a/src/dhcpmon/src/dhcp_device.c
+++ b/src/dhcpmon/src/dhcp_device.c
@@ -121,6 +121,8 @@ static struct sock_fprog dhcp_sock_bfp = {
  */
 static dhcp_device_context_t aggregate_dev = {0};
 
+static dhcp_device_context_t *mgmt_intf = NULL;
+
 /** Monitored DHCPv4 message type */
 static dhcpv4_message_type_t v4_monitored_msgs[] = {
     DHCPv4_MESSAGE_TYPE_DISCOVER,
@@ -176,6 +178,11 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
         if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
             (!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) {
             context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
+            if (context == mgmt_intf)
+            {
+                break;
+            }
             aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
@@ -186,6 +193,11 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
         if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
             (!context->is_uplink && dir == DHCP_TX)) {
             context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
+            if (context == mgmt_intf)
+            {
+                break;
+            }
             aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
@@ -224,6 +236,11 @@ static void handle_dhcpv6_option(dhcp_device_context_t *context,
     case DHCPv6_MESSAGE_TYPE_RECONFIGURE:
     case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
         context->counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
+        // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
+        if (context == mgmt_intf)
+        {
+            break;
+        }
         aggregate_dev.counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
         break;
     default:
@@ -309,7 +326,7 @@ static void read_callback(int fd, short event, void *arg)
             }
         }
         else if (!is_ipv4 && dhcpv6_enabled && (buffer_sz > UDPv6_START_OFFSET + sizeof(struct udphdr) + DHCPv6_TYPE_LENGTH)) {
-            const u_char* dhcp_option = context->buffer + dhcp_option_offset;
+            const u_char* dhcp_header = context->buffer + dhcp_option_offset;
             dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
                                            ethhdr->ether_shost[1] == context->mac[1] &&
                                            ethhdr->ether_shost[2] == context->mac[2] &&
@@ -319,23 +336,25 @@ static void read_callback(int fd, short event, void *arg)
                                            DHCP_TX : DHCP_RX;
             int offset = 0;
             uint16_t option = 0;
+            uint16_t current_option_len = 0;
             // Get to inner DHCP header from encapsulated RELAY_FORWARD or RELAY_REPLY header
-            while (dhcp_option[offset] == DHCPv6_MESSAGE_TYPE_RELAY_FORWARD || dhcp_option[offset] == DHCPv6_MESSAGE_TYPE_RELAY_REPLY)
+            while (dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_FORWARD || dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_REPLY)
             {
                 // Get to DHCPv6_OPTION_RELAY_MSG from all options
                 offset += DHCPv6_RELAY_MSG_OPTIONS_OFFSET;
-                option = htons(*((uint16_t*)(&(dhcp_option[offset]))));
+                option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
 
                 while (option != DHCPv6_OPTION_RELAY_MSG)
                 {
-                    offset += DHCPv6_OPTION_LENGTH;
                     // Add to offset the option length and get the next option ID
-                    offset += htons(*((uint16_t*)(&(dhcp_option[offset]))));
-                    option = htons(*((uint16_t*)(&(dhcp_option[offset]))));
+                    current_option_len = htons(*((uint16_t*)(&(dhcp_header[offset + DHCPv6_OPTION_LENGTH]))));
+                    offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH + current_option_len;
+                    option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
                 }
+                // Set the offset to DHCP-relay-message data
                 offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH;
             }
-            handle_dhcpv6_option(context, dhcp_option[offset], dir);
+            handle_dhcpv6_option(context, dhcp_header[offset], dir);
         } else {
             syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
                    context->intf, buffer_sz);
@@ -554,7 +573,7 @@ static dhcp_mon_status_t dhcp_device_check_health(dhcp_mon_check_t check_type,
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
-    if (dhcp_device_is_dhcp_inactive(aggregate_dev.counters.v4counters, aggregate_dev.counters.v6counters, type)) {
+    if (dhcp_device_is_dhcp_inactive(v4counters, v6counters, type)) {
         rv = DHCP_MON_STATUS_INDETERMINATE;
     } else if (check_type == DHCP_MON_CHECK_POSITIVE) {
         rv = dhcp_device_check_positive_health(v4counters, v6counters, type);
@@ -948,3 +967,13 @@ void dhcp_device_active_types(bool dhcpv4, bool dhcpv6)
     dhcpv4_enabled = dhcpv4;
     dhcpv6_enabled = dhcpv6;
 }
+
+/**
+ * @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
+ *
+ * @brief assign context address of mgmt interface
+ */
+void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context)
+{
+    mgmt_intf = mgmt_intf_context;
+}
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index f8aa874bfcce..433eb0907626 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -255,4 +255,15 @@ void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type
  * @return none
  */
 void dhcp_device_active_types(bool dhcpv4, bool dhcpv6);
+
+/**
+ * @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
+ *
+ * @brief assign context address of mgmt interface
+ *
+ * @param mgmt_intf_context       MGMT interface context struct address
+ *
+ * @return none
+ */
+void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context);
 #endif /* DHCP_DEVICE_H_ */
diff --git a/src/dhcpmon/src/dhcp_devman.c b/src/dhcpmon/src/dhcp_devman.c
index e7a25322207f..b36d926c1d5b 100644
--- a/src/dhcpmon/src/dhcp_devman.c
+++ b/src/dhcpmon/src/dhcp_devman.c
@@ -148,6 +148,9 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
             strncpy(agg_dev->intf + sizeof(AGG_DEV_PREFIX) - 1, name, sizeof(agg_dev->intf) - sizeof(AGG_DEV_PREFIX));
             agg_dev->intf[sizeof(agg_dev->intf) - 1] = '\0';
         }
+        else if (rv == 0 && intf_type == 'm') {
+            dhcp_device_init_mgmt_intf(dev->dev_context);
+        }
 
         LIST_INSERT_HEAD(&intfs, dev, entry);
     }

From 2c41441edd7313f6d11db3b7aa40886da22144eb Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Fri, 22 Oct 2021 09:54:49 -0700
Subject: [PATCH 0856/1674] Revert "[202012] [Arista] Enable syseepromd update
 database (with 202012 fix) (#8963)" (#9041)

This reverts commit 94456b168005187ff773cef7896a3aa76ccaf584.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 4e6148625a88..cf36e513e41c 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 4e6148625a88f4baf2b7cf0860f40dfbb53a0792
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 4e6148625a88..cf36e513e41c 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 4e6148625a88f4baf2b7cf0860f40dfbb53a0792
+Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d

From bb1bc59a22d45ebfba082cf08073d614fc35c8a5 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 21 Oct 2021 18:45:00 -0700
Subject: [PATCH 0857/1674] docker-dhcp-relay: Fix waiting for interfaces to
 get set up (#9034)

Fix the check used to wait for interfaces to come up. The group name in
the supervisor config files has changed from isc-dhcp-relay to
dhcp-relay.

Also, in the wait script, wait 10 additional seconds after the vlans,
port channels, and any interfaces are up. This is because dhcrelay
listens on all interfaces (in addition to port channels and vlans), and
to ensure that it stays in a clean state during runtime, wait some extra
time to make sure that those interfaces are created as well.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 dockers/docker-dhcp-relay/start.sh                           | 4 ++--
 dockers/docker-dhcp-relay/wait_for_intf.sh.j2                | 5 +++++
 .../tests/sample_output/py2/wait_for_intf.sh                 | 4 ++++
 .../tests/sample_output/py3/wait_for_intf.sh                 | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh
index cb563eb003c3..87a9e5711f2f 100755
--- a/dockers/docker-dhcp-relay/start.sh
+++ b/dockers/docker-dhcp-relay/start.sh
@@ -10,8 +10,8 @@ then
     ${CTR_SCRIPT} -f dhcp_relay -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION}
 fi
 
-# If our supervisor config has entries in the "isc-dhcp-relay" group...
-if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
+# If our supervisor config has entries in the "dhcp-relay" group...
+if [ $(supervisorctl status | grep -c "^dhcp-relay:") -gt 0 ]; then
     # Wait for all interfaces to come up and be assigned IPv4 addresses before
     # starting the DHCP relay agent(s). If an interface the relay should listen
     # on is down, the relay agent will not start. If an interface the relay
diff --git a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2 b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
index 568f128b3772..b224a697b5ba 100644
--- a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
+++ b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
@@ -38,3 +38,8 @@ wait_until_iface_ready {{ name }} {{ prefix }}
 wait_until_iface_ready {{ name }} {{ prefix }}
 {% endif %}
 {% endfor %}
+
+# Wait 10 seconds for the rest of interfaces to get added/populated.
+# dhcrelay listens on each of the interfaces (in addition to the port
+# channels and vlan interfaces)
+sleep 10
diff --git a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
index 4852f6167bad..8ba15b1c8355 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
@@ -30,3 +30,7 @@ wait_until_iface_ready PortChannel03 10.0.0.60/31
 wait_until_iface_ready PortChannel04 10.0.0.62/31
 wait_until_iface_ready PortChannel01 10.0.0.56/31
 
+# Wait 10 seconds for the rest of interfaces to get added/populated.
+# dhcrelay listens on each of the interfaces (in addition to the port
+# channels and vlan interfaces)
+sleep 10
diff --git a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
index 68a3a830f068..6e5012d5939c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
@@ -30,3 +30,7 @@ wait_until_iface_ready PortChannel02 10.0.0.58/31
 wait_until_iface_ready PortChannel03 10.0.0.60/31
 wait_until_iface_ready PortChannel04 10.0.0.62/31
 
+# Wait 10 seconds for the rest of interfaces to get added/populated.
+# dhcrelay listens on each of the interfaces (in addition to the port
+# channels and vlan interfaces)
+sleep 10

From 517d81a57ac63c053cd939795c914d2dd1dff6b5 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 21 Oct 2021 23:00:37 -0700
Subject: [PATCH 0858/1674] [dhcp_relay] fix data type in dhcp6relay, add
 protection in packet data parsing (#9036)

---
 src/dhcp6relay/src/relay.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index e2eb8e4fac12..3e9c9520e602 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -515,14 +515,16 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
 void callback(evutil_socket_t fd, short event, void *arg) {
     struct relay_config *config = (struct relay_config *)arg;
     static uint8_t message_buffer[4096];
-    uint32_t len = recv(config->filter, message_buffer, 4096, 0);
+    int32_t len = recv(config->filter, message_buffer, 4096, 0);
     if (len <= 0) {
-        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket\n");
+        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
+        return;
     }
 
     char* ptr = (char *)message_buffer;
-    const uint8_t *current_position = (uint8_t *)ptr; 
+    const uint8_t *current_position = (uint8_t *)ptr;
     const uint8_t *tmp = NULL;
+    const uint8_t *prev = NULL;
 
     auto ether_header = parse_ether_frame(current_position, &tmp);
     current_position = tmp;
@@ -530,14 +532,19 @@ void callback(evutil_socket_t fd, short event, void *arg) {
     auto ip_header = parse_ip6_hdr(current_position, &tmp);
     current_position = tmp;
 
+    prev = current_position;
     if (ip_header->ip6_ctlun.ip6_un1.ip6_un1_nxt != IPPROTO_UDP) {
         const struct ip6_ext *ext_header;
         do {
             ext_header = (const struct ip6_ext *)current_position;
             current_position += ext_header->ip6e_len;
+            if((current_position == prev) || (current_position >= (uint8_t *)ptr + sizeof(message_buffer))) {
+                return;
+            }
+            prev = current_position;
         }
         while (ext_header->ip6e_nxt != IPPROTO_UDP);
-    }  
+    }
 
     auto udp_header = parse_udp(current_position, &tmp);
     current_position = tmp;

From 4139e06260e775ca112c5fcf2de945e27bfefcab Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Thu, 21 Oct 2021 11:34:37 +0530
Subject: [PATCH 0859/1674] DellEMC: Z9332f - Component firmware upgrade
 platform API implementation (#8973)

---
 .../platform.json                             |   6 +
 .../common/onie_stage_fwpkg                   |  70 +++++
 .../debian/platform-modules-z9332f.install    |   1 +
 .../z9332f/sonic_platform/chassis.py          |   2 +-
 .../z9332f/sonic_platform/component.py        | 283 +++++++++++++++++-
 5 files changed, 346 insertions(+), 16 deletions(-)
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
index e8add067ca00..2c603dd722fa 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
@@ -19,6 +19,12 @@
             },
             {
                 "name": "Switch CPLD 2"
+            },
+            {
+                "name": "SSD"
+            },
+            {
+                "name": "PCIe"
             }
         ],
         "fans": [
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
new file mode 100755
index 000000000000..1ceaf32fe8c1
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+ONIE_PATH="/mnt/onie-boot"
+ONIE_PENDING_DIR="${ONIE_PATH}/onie/update/pending"
+
+unset FWPKG
+
+function stage_fwpkg()
+{
+    local name=$(basename ${FWPKG})
+    local pending="${ONIE_PENDING_DIR}/$name"
+
+    # Exit if not superuser
+    if [[ "$EUID" -ne 0 ]]; then
+        echo "ERROR: This command must be run as root" >&2
+        exit 1
+    fi
+
+    # Mount ONIE partition if not already mounted
+    if ! grep -qs ${ONIE_PATH} /proc/mounts; then
+        mkdir -p ${ONIE_PATH}
+        mount LABEL=ONIE-BOOT ${ONIE_PATH} || {
+            echo "ERROR: Failed to mount ONIE partition"
+            exit 1
+        }
+    fi
+
+    [ -f "$pending" ] && {
+        echo "INFO: Firmware update package ${name} is already staged"
+        exit 2
+    }
+
+    ${ONIE_PATH}/onie/tools/bin/onie-fwpkg add ${FWPKG} || {
+        echo "ERROR: onie-fwpkg add for ${name} failed"
+        exit 1
+    }
+}
+
+SCRIPT=$0
+
+function show_help_and_exit()
+{
+    echo "Usage ${SCRIPT} [options]"
+    echo "    This script will stage ONIE firmware update package."
+    echo " "
+    echo "    Available options:"
+    echo "        -h, -? : getting this help"
+    echo "        -o [fwpkg]    : stages the firmware update package"
+
+    exit 0
+}
+
+
+function parse_options()
+{
+    while getopts ":h?a:" opt; do
+        case $opt in
+            a )
+                FWPKG=$(realpath $OPTARG)
+                stage_fwpkg
+                ;;
+            h|\? )
+                show_help_and_exit
+                ;;
+        esac
+    done
+}
+
+parse_options $@
+exit 0
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-z9332f.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-z9332f.install
index 9915b08b72ee..6d12d4e1732a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-z9332f.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-z9332f.install
@@ -9,3 +9,4 @@ common/platform_reboot usr/share/sonic/device/x86_64-dellemc_z9332f_d1508-r0
 common/pcisysfs.py usr/bin
 common/fw-updater usr/local/bin
 common/onie_mode_set usr/local/bin
+common/onie_stage_fwpkg usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 8658c4ac876a..72f46653d51a 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -28,7 +28,7 @@
 MAX_Z9332F_FAN = 2
 MAX_Z9332F_PSU = 2
 MAX_Z9332F_THERMAL = 14
-MAX_Z9332F_COMPONENT = 6 # BIOS,FPGA,BMC,BB CPLD and 2 Switch CPLDs
+MAX_Z9332F_COMPONENT = 8 # BIOS,FPGA,BMC,BB CPLD,2 Switch CPLDs,SSD and PCIe
 
 media_part_num_list = set([ \
 "8T47V","XTY28","MHVPK","GF76J","J6FGD","F1KMV","9DN5J","H4DHD","6MCNV","0WRX0","X7F70","5R2PT","WTRD1","WTRD1","WTRD1","WTRD1","5250G","WTRD1","C5RNH","C5RNH","FTLX8571D3BCL-FC",
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index f831c5c40b40..c308ed291903 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -10,10 +10,14 @@
 ########################################################################
 
 try:
+    import json
+    import os
+    import re
     import subprocess
+    import tarfile
+    import tempfile
     from sonic_platform_base.component_base import ComponentBase
     import sonic_platform.hwaccess as hwaccess
-    
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -24,8 +28,8 @@ def get_bios_version():
 
 def get_fpga_version():
     val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:09:00.0/resource0', 0)
-    return '{}.{}'.format((val >> 8) & 0xff, val & 0xff)
-    
+    return '{}.{}'.format((val >> 16) & 0xffff, val & 0xffff)
+
 def get_bmc_version():
     return subprocess.check_output(
         ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
@@ -43,6 +47,31 @@ def get_cpld1_version():
 def get_cpld2_version():
     return get_cpld_version(4, 0x31)
 
+def get_ssd_version():
+    val = 'NA'
+    try:
+        ssd_ver = subprocess.check_output(['ssdutil','-v'], text=True)
+    except Exception:
+        return val
+    else:
+        version = re.search(r'Firmware\s*:(.*)',ssd_ver)
+        if version:
+            val = version.group(1).strip()
+
+    return val
+
+def get_pciephy_version():
+    val = 'NA'
+    try:
+        pcie_ver = subprocess.check_output('bcmcmd "pciephy fw version"', shell=True, text=True)
+    except Exception:
+        return val
+    else:
+        version = re.search(r'PCIe FW loader version:\s(.*)', pcie_ver)
+        if version:
+            val = version.group(1).strip()
+
+    return val
 
 
 class Component(ComponentBase):
@@ -77,17 +106,83 @@ class Component(ComponentBase):
         ['Switch CPLD 2',
          'Used for managing QSFP-DD/QSFP28/SFP port transceivers',
          get_cpld2_version
-         ]
+         ],
+
+        ['SSD',
+         'Solid State Drive that stores data persistently',
+         get_ssd_version
+         ],
 
+        ['PCIe',
+         'ASIC PCIe firmware',
+         get_pciephy_version
+         ]
     ]
 
-    def __init__(self, component_index = 0):
+    def __init__(self, component_index=0):
         ComponentBase.__init__(self)
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
         self.version = self.CHASSIS_COMPONENTS[self.index][2]()
 
+    @staticmethod
+    def _get_available_firmware_version(image_path):
+        if not os.path.isfile(image_path):
+            return False, "ERROR: File not found"
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            cmd = "sed -e '1,/^exit_marker$/d' {} | tar -x -C {} installer/onie-update.tar.xz".format(image_path, tmpdir)
+            try:
+                subprocess.check_call(cmd, stdout=subprocess.DEVNULL,
+                                      stderr=subprocess.DEVNULL, shell=True)
+            except subprocess.CalledProcessError:
+                return False, "ERROR: Unable to extract firmware updater"
+
+            try:
+                updater = tarfile.open(os.path.join(tmpdir, "installer/onie-update.tar.xz"), "r")
+            except tarfile.ReadError:
+                return False, "ERROR: Unable to extract firmware updater"
+
+            try:
+                ver_info_fd = updater.extractfile("firmware/fw-component-version")
+            except KeyError:
+                updater.close()
+                return False, "ERROR: Version info not available"
+
+            ver_info = json.load(ver_info_fd)
+            ver_info_fd.close()
+            updater.close()
+
+            ver_info = ver_info.get("x86_64-dellemc_z9332f_d1508-r0")
+            if ver_info:
+                return True, ver_info
+            else:
+                return False, "ERROR: Version info not available"
+
+    @staticmethod
+    def _stage_firmware_package(image_path):
+        stage_msg = None
+        cmd = "onie_stage_fwpkg -a {}".format(image_path)
+        try:
+            subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT, text=True)
+        except subprocess.CalledProcessError as e:
+            if e.returncode != 2:
+                return False, e.output.strip()
+            else:
+                stage_msg = e.output.strip()
+
+        cmd = "onie_mode_set -o update"
+        try:
+            subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT, text=True)
+        except subprocess.CalledProcessError as e:
+            return False, e.output.strip()
+
+        if stage_msg:
+            return True, stage_msg
+        else:
+            return True, "INFO: Firmware upgrade staged"
+
     def get_name(self):
         """
         Retrieves the name of the component
@@ -112,16 +207,6 @@ def get_firmware_version(self):
         """
         return self.version
 
-    def install_firmware(self, image_path):
-        """
-        Installs firmware to the component
-        Args:
-        image_path: A string, path to firmware image
-        Returns:
-        A boolean, True if install was successful, False if not
-        """
-        return False
-
     def get_presence(self):
         """
         Retrieves the presence of the component
@@ -170,3 +255,171 @@ def is_replaceable(self):
             bool: True if it is replaceable.
         """
         return False
+
+    def get_available_firmware_version(self, image_path):
+        """
+        Retrieves the available firmware version of the component
+
+        Note: the firmware version will be read from image
+
+        Args:
+            image_path: A string, path to firmware image
+
+        Returns:
+            A string containing the available firmware version of the component
+        """
+        avail_ver = None
+        valid, version = self._get_available_firmware_version(image_path)
+        if valid:
+            avail_ver = version.get(self.name)
+            if avail_ver:
+                avail_ver = avail_ver.get("version")
+        else:
+            print(version)
+
+        return avail_ver if avail_ver else "NA"
+
+    def get_firmware_update_notification(self, image_path):
+        """
+        Retrieves a notification on what should be done in order to complete
+        the component firmware update
+
+        Args:
+            image_path: A string, path to firmware image
+
+        Returns:
+            A string containing the component firmware update notification if required.
+            By default 'None' value will be used, which indicates that no actions are required
+        """
+        valid, version = self._get_available_firmware_version(image_path)
+        if valid:
+            avail_ver = version.get(self.name)
+            if avail_ver:
+                avail_ver = avail_ver.get("version")
+                if avail_ver and avail_ver != self.get_firmware_version():
+                    return "Cold reboot is required to perform firmware upgrade"
+        else:
+            print(version)
+
+        return None
+
+    def install_firmware(self, image_path):
+        """
+        Installs firmware to the component
+
+        This API performs firmware installation only: this may/may not be the same as firmware update.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this must be done manually by user
+
+        Note: in case immediate actions are required to complete the component firmware update
+        (e.g., reboot, power cycle, etc.) - will be done automatically by API and no return value provided
+
+        Args:
+            image_path: A string, path to firmware image
+
+        Returns:
+            A boolean, True if install was successful, False if not
+        """
+        valid, version = self._get_available_firmware_version(image_path)
+        if valid:
+            avail_ver = version.get(self.name)
+            if avail_ver:
+                avail_ver = avail_ver.get("version")
+                if avail_ver and avail_ver != self.get_firmware_version():
+                    status, msg = self._stage_firmware_package(image_path)
+                    print(msg)
+                    if status:
+                        return True
+                    else:
+                        return False
+
+            print("INFO: Firmware version up-to-date")
+            return True
+        else:
+            print(version)
+
+        return False
+
+    def update_firmware(self, image_path):
+        """
+        Updates firmware of the component
+
+        This API performs firmware update: it assumes firmware installation and loading in a single call.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this will be done automatically by API
+
+        Args:
+            image_path: A string, path to firmware image
+
+        Raises:
+            RuntimeError: update failed
+        """
+        valid, version = self._get_available_firmware_version(image_path)
+        if valid:
+            avail_ver = version.get(self.name)
+            if avail_ver:
+                avail_ver = avail_ver.get("version")
+                if avail_ver and avail_ver != self.get_firmware_version():
+                    status, msg = self._stage_firmware_package(image_path)
+                    if status:
+                        print(msg)
+                        subprocess.call("reboot")
+                    else:
+                        raise RuntimeError(msg)
+
+            print("INFO: Firmware version up-to-date")
+            return None
+        else:
+            raise RuntimeError(version)
+
+    def auto_update_firmware(self, image_path, boot_type):
+        """
+        Updates firmware of the component
+
+        This API performs firmware update automatically based on boot_type: it assumes firmware installation
+        and/or creating a loading task during the reboot, if needed, in a single call.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this will be done automatically during the reboot.
+        The loading task will be created by API.
+
+        Args:
+            image_path: A string, path to firmware image
+            boot_type: A string, reboot type following the upgrade
+                         - none/fast/warm/cold
+
+        Returns:
+            Output: A return code
+                return_code: An integer number, status of component firmware auto-update
+                    - return code of a positive number indicates successful auto-update
+                        - status_installed = 1
+                        - status_updated = 2
+                        - status_scheduled = 3
+                    - return_code of a negative number indicates failed auto-update
+                        - status_err_boot_type = -1
+                        - status_err_image = -2
+                        - status_err_unknown = -3
+
+        Raises:
+            RuntimeError: auto-update failure cause
+        """
+        valid, version = self._get_available_firmware_version(image_path)
+        if valid:
+            avail_ver = version.get(self.name)
+            if avail_ver:
+                avail_ver = avail_ver.get("version")
+                if avail_ver and avail_ver != self.get_firmware_version():
+                    if boot_type != "cold":
+                        return -1
+
+                    status, msg = self._stage_firmware_package(image_path)
+                    if status:
+                        print(msg)
+                        return 3
+                    else:
+                        raise RuntimeError(msg)
+
+            print("INFO: Firmware version up-to-date")
+            return 1
+        else:
+            print(version)
+            return -2

From f63e3cd1e9f5086a72d26c2fd450abee529b7711 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Sun, 24 Oct 2021 09:06:17 -0700
Subject: [PATCH 0860/1674] [202012][sonic-utilities] submodule update (#9023)

8768089 (HEAD -> 202012, origin/202012) Remove exec from platform_reboot_plugin call to handle any hang issue. (#1879)
ae5d90c Validate input of ```config mirror_session add``` (#1825)
44d3a3b [show][config] fix the muxcable commands for interface naming mode (#1862)
0a4933e [TH3] Skipp Control Plane Assist on WARM Reboot for TH3 HWSKUs (#1861)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 647f01faed52..876808923972 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 647f01faed52cce87d6e5b8daa8be4bcf7b9c111
+Subproject commit 876808923972de537426405f87d4439c46e99614

From 027a35d7e5ff5aa8d595f582d4cde9a59ce52a2a Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 25 Oct 2021 22:38:18 +0800
Subject: [PATCH 0861/1674] [ci]: Change to build marvell-armhf on armhf pool
 (#8467)

---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 88c87031c201..5f0a74cea03f 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -78,7 +78,7 @@ jobs:
             dbg_image: yes
 
         - name: marvell-armhf
-          pool: sonicbld_8c
+          pool: sonicbld-armhf
           timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: armhf

From 1c8619641128ebb5ad4d5282e32317a5ca9e20fb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 26 Oct 2021 01:09:12 +0800
Subject: [PATCH 0862/1674] [ci/build]: Upgrade SONiC package versions (#9050)

---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-git     |  4 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  | 16 +++---
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-web     |  8 ++-
 .../docker-base-buster/versions-deb-buster    |  8 +--
 .../docker-base-stretch/versions-deb-stretch  |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../docker-fpm-frr/versions-deb-buster        |  4 +-
 .../dockers/docker-lldp/versions-deb-buster   |  4 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  4 +-
 .../versions/dockers/docker-ptf/versions-py2  |  6 +--
 .../dockers/docker-snmp/versions-deb-buster   |  4 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 10 ++--
 .../versions-py3-all-arm64                    |  1 -
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  6 +--
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  4 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  2 +-
 .../versions-deb-buster-arm64                 | 50 +++++++++----------
 .../versions-git                              |  1 -
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../versions-deb-stretch-arm64                | 22 ++++----
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-deb-stretch-armhf                | 22 ++++----
 .../versions-py3-all-armhf                    |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  |  8 +--
 .../host-base-image/versions-deb-buster       | 14 +++---
 .../versions/host-image/versions-deb-buster   | 14 +++---
 .../host-image/versions-deb-buster-arm64      |  9 +---
 .../host-image/versions-deb-buster-armhf      |  9 +---
 files/build/versions/host-image/versions-py3  | 10 ++--
 .../host-image/versions-py3-all-arm64         |  2 -
 .../host-image/versions-py3-all-armhf         |  4 +-
 45 files changed, 136 insertions(+), 156 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
 delete mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 0cf3325dea42..2fdb9a0e9a97 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-3
+libsaibcm==4.3.5.1-5
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 5d520febd6ee..c87b694dde0d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
-https://github.com/CESNET/libyang.git==e4e7d7adb49ad585a6af26584813d363f174e909
+https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
+https://github.com/jeroennijhof/pam_tacplus.git==669b189583e6ceaa2f318a585638cf234aece11a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 82c0cf542dd6..c94cdbe6997e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index b8af26988ffb..5457aaf3350c 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=G4rclB7N2TCy3ti9wKznAwKKMKi%2FSjnM9mPtDKyaHuQ%3D&se=2035-06-04T06%3A40%3A44Z&sp=r==c9ce341133ad1ff4f98f88208795905d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=SxN2prUdAEdzLZu%2BWFXkPT89KWHsOK4Io8rTr07lrdg%3D&se=2035-06-04T06%3A39%3A12Z&sp=r==39ca391e091de9c9c044f0628b55232d
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index ecd90913c23b..12dfbc8ff2d2 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:2d3ea67549bcf9c6fd5ae9323237def50d9ed39ca118217b4f4cc8df8541fa77
-amd64:amd64/debian:stretch==sha256:4cb539063de2a9b219a55efe892ba203be9bd5668cab78dad443b5ccfc751e6d
-amd64:debian:buster==sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663
-amd64:debian:stretch==sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f
+amd64:amd64/debian:buster==sha256:2f4b2c4b44ec6d9f4afc9578d8475f7272dc50783268dc672d19b0db6098b89d
+amd64:amd64/debian:stretch==sha256:856ba93f897fb7d86ce4363461fe04b6997ce64a79e8198747e472464d58e0fa
+amd64:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
+amd64:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -29,10 +29,10 @@ amd64:docker-syncd-vs==
 amd64:docker-teamd==
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:040cb6174966e3e72f69ec0598a5682eafde0e15ea1c202ccd5970c0bf38cdcd
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:0f3ba17fb1540051b968533b59e77853c512dd4d54892a265ac6553f2091560d
+arm64:multiarch/debian-debootstrap:arm64-buster==sha256:b3f7ca1b43e114f578f6ac091810e006ec93867a27399358d58a4a2359a2c2f5
+arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:4c83750ab31dd3fb4484b2a529c24ddee2c8a54b8cae7d50646bcbc2061dfa24
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:85e85ef04df0c7946239f35e3ce3d7135e3dd243e60efc79113e8dae09437afa
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:94f652d8f34708aec60fbaa0baf9d5d4f108d0f193057020b4c28c7e79b2690e
+armhf:multiarch/debian-debootstrap:armhf-buster==sha256:e658d2466544e05f45e1c7dbe16f67b64364088af5ffb62bfee5c32885629b3b
+armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:fdb4670e016e8989ba7466ef6a269204f81b813d4cfc5f07f178c0fa4db7e673
 multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2016c7b9f991..bff1c448d06f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,13 +1,13 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==dc86a4b9044f9243886ca0da0c1753820ac51f45
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7a6ff9824d74a90f7d9a6811b00a35598c8cf3ef
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==56b57a2f1640eb0be342bd4ca01b90318569c8c5
+https://github.com/jeroennijhof/pam_tacplus.git==669b189583e6ceaa2f318a585638cf234aece11a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/p4lang/scapy-vxlan.git==2ee0a8b89222b407d446c332a64812f2ca1a1c22
+https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 490386c24efb..2aed1417c29f 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,9 +19,9 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==677724100f5b7f85462c12142ba7486e
+https://deb.nodesource.com/node_14.x/dists/buster/Release==0f8fa9349b31d86f70668cca8646e5b3
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==ac77c69d672c0278c4ef2c3e1ce61b4f
+https://deb.nodesource.com/setup_14.x==871f5a56bb7bdb1bccf8f066e77399e0
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210805_sai.1.7.1_deb10.deb==8ba915f8843cf57982825f304b629cb3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210805_sai.1.7.1_deb10.deb==4d1e991a943a2e16be2c1db9bb3c02d6
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index e8a7a97fb10c..bd661e61ca8a 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -11,14 +11,14 @@ libexpat1==2.2.6-2+deb10u1
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgssapi-krb5-2==1.17-3+deb10u2
+libgssapi-krb5-2==1.17-3+deb10u3
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
-libk5crypto3==1.17-3+deb10u2
+libk5crypto3==1.17-3+deb10u3
 libkeyutils1==1.6-6
-libkrb5-3==1.17-3+deb10u2
-libkrb5support0==1.17-3+deb10u2
+libkrb5-3==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index d775275d0ca1..5b9cc4be8fa7 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -25,7 +25,7 @@ libldap-2.4-2==2.4.44+dfsg-5+deb9u8
 libldap-common==2.4.44+dfsg-5+deb9u8
 liblognorm5==2.0.3-1~bpo9+1
 libncurses5==6.0+20161126-1+deb9u2
-libnghttp2-14==1.18.1-1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
 libonig4==6.1.3-2+deb9u2
 libp11-kit0==0.23.3-2+deb9u1
 libperl5.24==5.24.1-3+deb9u7
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index be7e3ca9ba14..c6f5336889eb 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index be7e3ca9ba14..c6f5336889eb 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 68bab9a789d1..d99a1040f5f6 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.9.30
+regex==2021.10.23
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index eebae8f0de40..e3c9e5099e40 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -14,7 +14,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libjson-c3==0.12.1+ds-2+deb10u1
-libmariadb3==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsaimetadata==1.0.0
@@ -30,7 +30,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 logrotate==3.14.0-4
-mariadb-common==1:10.3.29-0+deb10u1
+mariadb-common==1:10.3.31-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 7570479c7eda..6a30ae80f65b 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -9,7 +9,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
 libipt2==2.0-2
-libmariadb3==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -21,7 +21,7 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
-mariadb-common==1:10.3.29-0+deb10u1
+mariadb-common==1:10.3.31-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index f3a78bd00341..c821abda2032 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -64,7 +64,7 @@ libxrender1==1:0.9.10-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 openssh-client==1:7.9p1-10+deb10u2
-psmisc==23.2-1
+psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-minimal==2.7.16-1
 python-sdk-api==1.mlnx.4.4.3326
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 2f69274aa5fb..ef2e5c37ba98 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -84,7 +84,7 @@ libgpm2==1.20.4-6.2+b1
 libgsasl7==1.8.0-8+b2
 libgssapi-krb5-2==1.15-1+deb9u3
 libhogweed4==3.3-1+deb9u1
-libicu57==57.1-6+deb9u4
+libicu57==57.1-6+deb9u5
 libidn2-0==0.16-1+deb9u1
 libip4tc0==1.6.0+snapshot20161117-6
 libisl15==0.18-1
@@ -114,7 +114,7 @@ libmpfr4==3.1.5-1
 libmpx2==6.3.0-18+deb9u1
 libncurses5==6.0+20161126-1+deb9u2
 libnet1==1.1.6+dfsg-3
-libnghttp2-14==1.18.1-1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
 libnpth0==1.3-1
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 452cee785aa5..52f6df05dee3 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -1,7 +1,7 @@
 backports.functools-lru-cache==1.6.4
 backports.shutil-get-terminal-size==1.0.0
 bcrypt==3.1.7
-cffi==1.14.6
+cffi==1.15.0
 click==7.1.2
 contextlib2==0.6.0.post1
 cryptography==3.3.2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.7.2
+paramiko==2.8.0
 pathlib2==2.3.6
 pbr==2.0.0
 pexpect==4.8.0
@@ -35,7 +35,7 @@ prompt-toolkit==1.0.18
 protobuf==3.6.1
 ptf==0.9.1
 ptyprocess==0.7.0
-pyaml==21.8.3
+pyaml==21.10.1
 pybrctl==0.1.3
 pycparser==2.20
 pygments==2.5.2
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index c4c12519015b..28746572151c 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -11,7 +11,7 @@ libfreeipmi17==1.6.3-1.1
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
-libmariadb3==1:10.3.29-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -21,7 +21,7 @@ libsnmp30==5.7.3+dfsg-5
 libsnmp30-dbg==5.7.3+dfsg-5
 libunwind8==1.2.1-10~deb10u1
 locales==2.28-10
-mariadb-common==1:10.3.29-0+deb10u1
+mariadb-common==1:10.3.31-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 snmp==5.7.3+dfsg-5
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index e6bf8794e864..2d74a77320af 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,21 +1,21 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.6
-click==8.0.1
+charset-normalizer==2.0.7
+click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.2
 grpcio==1.41.0
 grpcio-tools==1.20.0
-idna==3.2
+idna==3.3
 importlib-metadata==4.8.1
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
-jsonschema==4.0.1
+jsonschema==4.1.2
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.18.1
+protobuf==3.19.0
 pyrsistent==0.18.0
 python-dateutil==2.6.0
 requests==2.26.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
deleted file mode 100644
index 51f078e566db..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-click==8.0.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index a3c1182481af..4e6474db2af8 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -76,7 +76,7 @@ openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
-psmisc==23.2-1
+psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-minimal==2.7.16-1
 python-ply==3.11-3
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index a9d12f9d2c28..8bfdf2770e70 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -1,4 +1,4 @@
-certifi==2021.5.30
+certifi==2021.10.8
 chardet==4.0.0
 crontab==0.23.0
 idna==2.10
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 2d3d8446d861..4ef9838bf100 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,7 +1,7 @@
-certifi==2021.5.30
-charset-normalizer==2.0.6
+certifi==2021.10.8
+charset-normalizer==2.0.7
 click==7.0
-idna==3.2
+idna==3.3
 ijson==2.6.1
 jsondiff==1.3.0
 m2crypto==0.38.0
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 7f952622c270..d1e6f7cb0301 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index a441700a6e4c..f9bc1b2fe85e 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-3
+libsaibcm==4.3.5.1-5
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 28a7d8d98923..ea6bc9bfa49d 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -54,7 +54,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index c96c7f7badb4..1db47dd14b40 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -32,7 +32,7 @@ libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index e11c780c1f26..6f4933de8787 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -7,7 +7,7 @@ libdw1==0.168-1
 libedit2==3.1-20160903-3
 libglib2.0-0==2.50.3-2+deb9u2
 libgpm2==1.20.4-6.2+b1
-libicu57==57.1-6+deb9u4
+libicu57==57.1-6+deb9u5
 libmpdec2==2.4.2-1
 libpopt0==1.16-10+b2
 libpython3.5==3.5.3-1+deb9u4
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
index 32172943e828..39bc9d136849 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
@@ -83,7 +83,7 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u1
-distro-info-data==0.41+deb10u3
+distro-info-data==0.41+deb10u4
 dkms==2.6.1-4
 dmsetup==2:1.02.155-3
 dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -188,8 +188,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u2
-krb5-multidev==1.17-3+deb10u2
+krb5-locales==1.17-3+deb10u3
+krb5-multidev==1.17-3+deb10u3
 lcov==1.13-4
 less==487-0.1+b1
 libalgorithm-diff-perl==1.19.03-2
@@ -215,8 +215,8 @@ libasync-mergepoint-perl==0.04-2
 libatinject-jsr330-api-java==1.0+ds1-5
 libatk-bridge2.0-0==2.30.0-5
 libatk-bridge2.0-dev==2.30.0-5
-libatk-wrapper-java==0.33.3-22
-libatk-wrapper-java-jni==0.33.3-22
+libatk-wrapper-java==0.33.3-22+deb10u1
+libatk-wrapper-java-jni==0.33.3-22+deb10u1
 libatk1.0-0==2.30.0-2
 libatk1.0-data==2.30.0-2
 libatk1.0-dev==2.30.0-2
@@ -329,7 +329,7 @@ libcommons-collections3-java==3.2.2-2
 libcommons-compress-java==1.18-2+deb10u1
 libcommons-configuration-java==1.10-5
 libcommons-digester-java==1.8.1-5
-libcommons-io-java==2.6-2
+libcommons-io-java==2.6-2+deb10u1
 libcommons-lang-java==2.6-8
 libcommons-lang3-java==3.8-2
 libcommons-logging-java==1.2-2
@@ -497,8 +497,8 @@ libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
-libgssapi-krb5-2==1.17-3+deb10u2
-libgssrpc4==1.17-3+deb10u2
+libgssapi-krb5-2==1.17-3+deb10u3
+libgssrpc4==1.17-3+deb10u3
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
@@ -615,16 +615,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u2
-libkadm5clnt-mit11==1.17-3+deb10u2
-libkadm5srv-mit11==1.17-3+deb10u2
-libkdb5-9==1.17-3+deb10u2
+libk5crypto3==1.17-3+deb10u3
+libkadm5clnt-mit11==1.17-3+deb10u3
+libkadm5srv-mit11==1.17-3+deb10u3
+libkdb5-9==1.17-3+deb10u3
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u2
-libkrb5-dev==1.17-3+deb10u2
-libkrb5support0==1.17-3+deb10u2
+libkrb5-3==1.17-3+deb10u3
+libkrb5-dev==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -662,9 +662,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.29-0+deb10u1
-libmariadb-dev-compat==1:10.3.29-0+deb10u1
-libmariadb3==1:10.3.29-0+deb10u1
+libmariadb-dev==1:10.3.31-0+deb10u1
+libmariadb-dev-compat==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -1116,7 +1116,7 @@ libxml-xpathengine-perl==0.14-1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxml2-utils==2.9.4+dfsg1-7+deb10u2
-libxmlgraphics-commons-java==2.3-1
+libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
@@ -1150,8 +1150,8 @@ libzmq5==4.3.1-4+deb10u2
 libzzip-0-13==0.13.62-3.2
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-kbuild-4.19==4.19.194-3
-linux-libc-dev==4.19.194-3
+linux-kbuild-4.19==4.19.208-1
+linux-libc-dev==4.19.208-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1172,7 +1172,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.29-0+deb10u1
+mariadb-common==1:10.3.31-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
@@ -1185,7 +1185,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.18.0-deb-1nodesource1
+nodejs==14.18.1-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
@@ -1260,7 +1260,7 @@ pristine-tar==1.46
 procmail==3.22-26
 procps==2:3.3.15-2
 protobuf-compiler==3.6.1.3-2
-psmisc==23.2-1
+psmisc==23.2-1+deb10u1
 psutils==1.17.dfsg-4
 pylint==1.9.4-1
 python==2.7.16-1
@@ -1474,7 +1474,7 @@ shellcheck==0.5.0-3
 software-properties-common==0.96.20.2-2
 sphinx-common==1.8.4-1
 sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12+deb10u1
+squashfs-tools==1:4.3-12+deb10u2
 stgit==0.18-1
 strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
deleted file mode 100644
index 5a139e0e753c..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7cdf1424b91417c4fae021caa9ef239980b4d180
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
index 781c252dcb4e..b637591a0f2c 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.10.23
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
index 56bfabba83ff..fe9eb7403692 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
@@ -1294,7 +1294,7 @@ netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
-nodejs==14.18.0-deb-1nodesource1
+nodejs==14.18.1-deb-1nodesource1
 ocl-icd-libopencl1==2.2.12-2
 openjdk-11-jdk==11.0.12+7-2~deb10u1
 openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
index 781c252dcb4e..b637591a0f2c 100644
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.10.23
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
index 16ac62c4c7b5..8f227fd60bf8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
@@ -147,7 +147,7 @@ gtk-update-icon-cache==3.22.11-1
 guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==57.1-6+deb9u4
+icu-devtools==57.1-6+deb9u5
 imagemagick==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
@@ -519,8 +519,8 @@ libibverbs-dev==1.2.1-2
 libibverbs1==1.2.1-2
 libice-dev==2:1.0.9-2
 libice6==2:1.0.9-2
-libicu-dev==57.1-6+deb9u4
-libicu57==57.1-6+deb9u4
+libicu-dev==57.1-6+deb9u5
+libicu57==57.1-6+deb9u5
 libijs-0.35==0.35-12
 libilmbase12==2.2.0-12
 libimport-into-perl==1.002005-1
@@ -680,7 +680,7 @@ libnfnetlink-dev==1.0.1-3
 libnfnetlink0==1.0.1-3
 libnftnl-dev==1.0.7-1
 libnftnl4==1.0.7-1
-libnghttp2-14==1.18.1-1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
 libnl-3-200==3.2.27-2
@@ -848,7 +848,7 @@ librrd8==1.6.0-1+b2
 librsvg2-2==2.40.21-0+deb9u1
 librsvg2-common==2.40.21-0+deb9u1
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u9
+libruby2.3==2.3.3-1+deb9u10
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -1179,8 +1179,8 @@ python-apt==1.4.3
 python-apt-common==1.4.3
 python-astroid==1.4.9-1
 python-attr==16.3.0-1
-python-babel==2.3.4+dfsg.1-2
-python-babel-localedata==2.3.4+dfsg.1-2
+python-babel==2.3.4+dfsg.1-2+deb9u1
+python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
 python-backports.functools-lru-cache==1.3-1
 python-bs4==4.5.3-1
 python-cffi-backend==1.9.1-2
@@ -1257,7 +1257,7 @@ python3-all==3.5.3-1
 python3-all-dbg==3.5.3-1
 python3-all-dev==3.5.3-1
 python3-apt==1.4.3
-python3-babel==2.3.4+dfsg.1-2
+python3-babel==2.3.4+dfsg.1-2+deb9u1
 python3-cffi-backend==1.9.1-2
 python3-chardet==2.3.0-2
 python3-crypto==2.6.1-7
@@ -1322,8 +1322,8 @@ ruby-net-telnet==0.1.1-2
 ruby-power-assert==0.3.0-1
 ruby-setup==3.4.1-9
 ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u9
-ruby2.3-dev==2.3.3-1+deb9u9
+ruby2.3==2.3.3-1+deb9u10
+ruby2.3-dev==2.3.3-1+deb9u10
 rubygems-integration==1.11
 sgml-base==1.29
 sgml-data==2.0.10
@@ -1331,7 +1331,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u2
+squashfs-tools==1:4.3-3+deb9u3
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
index 13d7fa8dd810..7d2fad524590 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.10.23
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
index fff1fd860f6a..b28a93db3ebf 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
@@ -147,7 +147,7 @@ gtk-update-icon-cache==3.22.11-1
 guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==57.1-6+deb9u4
+icu-devtools==57.1-6+deb9u5
 imagemagick==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
@@ -524,8 +524,8 @@ libibverbs-dev==1.2.1-2
 libibverbs1==1.2.1-2
 libice-dev==2:1.0.9-2
 libice6==2:1.0.9-2
-libicu-dev==57.1-6+deb9u4
-libicu57==57.1-6+deb9u4
+libicu-dev==57.1-6+deb9u5
+libicu57==57.1-6+deb9u5
 libijs-0.35==0.35-12
 libilmbase12==2.2.0-12
 libimport-into-perl==1.002005-1
@@ -684,7 +684,7 @@ libnfnetlink-dev==1.0.1-3
 libnfnetlink0==1.0.1-3
 libnftnl-dev==1.0.7-1
 libnftnl4==1.0.7-1
-libnghttp2-14==1.18.1-1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
 libnl-3-200==3.2.27-2
@@ -850,7 +850,7 @@ librrd8==1.6.0-1+b2
 librsvg2-2==2.40.21-0+deb9u1
 librsvg2-common==2.40.21-0+deb9u1
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u9
+libruby2.3==2.3.3-1+deb9u10
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -1185,8 +1185,8 @@ python-apt==1.4.3
 python-apt-common==1.4.3
 python-astroid==1.4.9-1
 python-attr==16.3.0-1
-python-babel==2.3.4+dfsg.1-2
-python-babel-localedata==2.3.4+dfsg.1-2
+python-babel==2.3.4+dfsg.1-2+deb9u1
+python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
 python-backports.functools-lru-cache==1.3-1
 python-bs4==4.5.3-1
 python-cffi-backend==1.9.1-2
@@ -1263,7 +1263,7 @@ python3-all==3.5.3-1
 python3-all-dbg==3.5.3-1
 python3-all-dev==3.5.3-1
 python3-apt==1.4.3
-python3-babel==2.3.4+dfsg.1-2
+python3-babel==2.3.4+dfsg.1-2+deb9u1
 python3-cffi-backend==1.9.1-2
 python3-chardet==2.3.0-2
 python3-crypto==2.6.1-7
@@ -1328,8 +1328,8 @@ ruby-net-telnet==0.1.1-2
 ruby-power-assert==0.3.0-1
 ruby-setup==3.4.1-9
 ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u9
-ruby2.3-dev==2.3.3-1+deb9u9
+ruby2.3==2.3.3-1+deb9u10
+ruby2.3-dev==2.3.3-1+deb9u10
 rubygems-integration==1.11
 sgml-base==1.29
 sgml-data==2.0.10
@@ -1337,7 +1337,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u2
+squashfs-tools==1:4.3-3+deb9u3
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
index 13d7fa8dd810..7d2fad524590 100644
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.10.23
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 3d9ecb155e94..99c39c07041e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -890,7 +890,7 @@ librrd8==1.6.0-1+b2
 librsvg2-2==2.40.21-0+deb9u1
 librsvg2-common==2.40.21-0+deb9u1
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u9
+libruby2.3==2.3.3-1+deb9u10
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -1395,8 +1395,8 @@ ruby-net-telnet==0.1.1-2
 ruby-power-assert==0.3.0-1
 ruby-setup==3.4.1-9
 ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u9
-ruby2.3-dev==2.3.3-1+deb9u9
+ruby2.3==2.3.3-1+deb9u10
+ruby2.3-dev==2.3.3-1+deb9u10
 rubygems-integration==1.11
 seabios==1.10.2-1
 sgml-base==1.29
@@ -1405,7 +1405,7 @@ shared-mime-info==1.8-1+deb9u1
 software-properties-common==0.96.20.2-1+deb9u1
 sphinx-common==1.4.9-2
 sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u2
+squashfs-tools==1:4.3-3+deb9u3
 stgit==0.17.1-1
 strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
index b146b8c4abe0..aa81034c0356 100644
--- a/files/build/versions/host-base-image/versions-deb-buster
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -1,12 +1,12 @@
 adduser==3.118
 apt==1.8.2.3
-base-files==10.3+deb10u10
+base-files==10.3+deb10u11
 base-passwd==3.5.46
 bash==5.0-4
 bsdutils==1:2.33.1-0.1
 coreutils==8.30-3
 dash==0.5.10.2-5
-debconf==1.5.71
+debconf==1.5.71+deb10u1
 debian-archive-keyring==2019.1+deb10u1
 debianutils==4.8.6.1
 diffutils==1:3.7-3
@@ -41,13 +41,13 @@ libgcrypt20==1.8.4-5+deb10u1
 libgmp10==2:6.1.2+dfsg-4
 libgnutls30==3.6.7-4+deb10u7
 libgpg-error0==1.35-1
-libhogweed4==3.4.1-1
+libhogweed4==3.4.1-1+deb10u1
 libidn2-0==2.0.5-1+deb10u1
 liblz4-1==1.8.3-1+deb10u1
 liblzma5==5.2.4-1
 libmount1==2.33.1-0.1
 libncursesw6==6.1+20181013-2+deb10u2
-libnettle6==3.4.1-1
+libnettle6==3.4.1-1+deb10u1
 libp11-kit0==0.23.15-2+deb10u1
 libpam-modules==1.3.1-5
 libpam-modules-bin==1.3.1-5
@@ -62,10 +62,10 @@ libsepol1==2.8-1
 libsmartcols1==2.33.1-0.1
 libss2==1.44.5-1+deb10u3
 libstdc++6==8.3.0-6
-libsystemd0==241-7~deb10u7
+libsystemd0==241-7~deb10u8
 libtasn1-6==4.13-3
 libtinfo6==6.1+20181013-2+deb10u2
-libudev1==241-7~deb10u7
+libudev1==241-7~deb10u8
 libunistring2==0.9.10-1
 libuuid1==2.33.1-0.1
 libzstd1==1.3.8+dfsg-3+deb10u2
@@ -79,6 +79,6 @@ perl-base==5.28.1-6+deb10u1
 sed==4.7-1
 sysvinit-utils==2.93-8
 tar==1.30+dfsg-6
-tzdata==2021a-0+deb10u1
+tzdata==2021a-0+deb10u2
 util-linux==2.33.1-0.1
 zlib1g==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 3b133e70388a..2f3b2e44c9db 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -98,10 +98,9 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libgssapi-krb5-2==1.17-3+deb10u2
+libgssapi-krb5-2==1.17-3+deb10u3
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
-libhogweed4==3.4.1-1+deb10u1
 libi2c0==4.1-1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
@@ -109,12 +108,12 @@ libiptc0==1.8.2-4
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
-libk5crypto3==1.17-3+deb10u2
+libk5crypto3==1.17-3+deb10u3
 libkeyutils1==1.6-6
 libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
-libkrb5-3==1.17-3+deb10u2
-libkrb5support0==1.17-3+deb10u2
+libkrb5-3==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
@@ -127,7 +126,6 @@ libmpdec2==2.4.2-2
 libncurses6==6.1+20181013-2+deb10u2
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
-libnettle6==3.4.1-1+deb10u1
 libnfnetlink0==1.0.1-3+b1
 libnftnl11==1.1.2-2
 libnghttp2-14==1.36.0-2+deb10u1
@@ -210,7 +208,7 @@ perl-modules-5.28==5.28.1-6+deb10u1
 picocom==3.1-2
 pinentry-curses==1.1.0-2
 procps==2:3.3.15-2
-psmisc==23.2-1
+psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-apt==1.8.4.3
 python-apt-common==1.8.4.3
@@ -241,7 +239,7 @@ sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
-squashfs-tools==1:4.3-12+deb10u1
+squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 sx-kernel==1.mlnx.4.4.3326
 sysfsutils==2.1.0+repack-5
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 43905ff5f468..14c2a207dda6 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -2,19 +2,14 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
-libgssapi-krb5-2==1.17-3+deb10u1
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
-libk5crypto3==1.17-3+deb10u1
-libkrb5-3==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.194-3
-squashfs-tools==1:4.3-12
+linux-libc-dev==4.19.208-1
+squashfs-tools==1:4.3-12+deb10u1
 tsingma-bsp==1.0
-tzdata==2021a-0+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 674b3458f4a8..31e9f7af438a 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -2,19 +2,14 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
-libgssapi-krb5-2==1.17-3+deb10u1
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
-libk5crypto3==1.17-3+deb10u1
-libkrb5-3==1.17-3+deb10u1
-libkrb5support0==1.17-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.194-3
+linux-libc-dev==4.19.208-1
 mrvlprestera==1.0
-squashfs-tools==1:4.3-12
-tzdata==2021a-0+deb10u2
+squashfs-tools==1:4.3-12+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3f42ef33bfca..28ca11886fd0 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,13 +2,13 @@ azure-common==1.1.27
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2021.5.30
-cffi==1.14.6
-charset-normalizer==2.0.6
+certifi==2021.10.8
+cffi==1.15.0
+charset-normalizer==2.0.7
 click==7.0
 cryptography==35.0.0
 docker==4.3.1
-idna==3.2
+idna==3.3
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
@@ -31,7 +31,7 @@ pycparser==2.20
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.10.23
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
deleted file mode 100644
index f323c091fe3d..000000000000
--- a/files/build/versions/host-image/versions-py3-all-arm64
+++ /dev/null
@@ -1,2 +0,0 @@
-certifi==2021.10.8
-regex==2021.10.8
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 3c29c897d679..431dc5a43838 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1,3 +1 @@
-certifi==2021.10.8
-cryptography==3.3.1
-regex==2021.10.8
\ No newline at end of file
+cryptography==3.3.1
\ No newline at end of file

From 7137e3f949bc51ef1cd1beceee7a0df0ea62d822 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Thu, 21 Oct 2021 18:53:41 +0530
Subject: [PATCH 0863/1674] [Dell] S6000 I2C not responding to certain optics
 (#8736)

* [Dell] S6000 I2C not responding to certain optics

* Revising return states

* Moved lock file from /var/run/platform_cache to /etc/sonic
---
 .../plugins/sfputil.py                        | 102 +++++++++++++++++-
 .../s6000/modules/dell_s6000_platform.c       |  21 +++-
 .../s6000/scripts/s6000_platform.sh           |   4 +
 .../s6000/sonic_platform/sfp.py               |  78 ++++++++++++++
 4 files changed, 203 insertions(+), 2 deletions(-)

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py
index f03415cbc7ea..8d8892fdce70 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py
@@ -6,6 +6,7 @@
 try:
     import time
     import datetime
+    import fcntl
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
@@ -19,6 +20,7 @@ class SfpUtil(SfpUtilBase):
     PORTS_IN_BLOCK = 32
 
     EEPROM_OFFSET = 20
+    SFP_LOCK_FILE="/etc/sonic/sfp_lock"
 
     _port_to_eeprom_mapping = {}
     port_dict = {}
@@ -72,10 +74,19 @@ def get_presence(self, port_num):
         if port_num < self.port_start or port_num > self.port_end:
             return False
 
+        try:
+            fd = open(self.SFP_LOCK_FILE, "r")
+        except IOError as e:
+            print("Error: unable to open file: "+ str(e))
+            return False
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        self.set_modsel(port_num)
+
         try:
             reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_modprs")
         except IOError as e:
             print("Error: unable to open file: %s" % str(e))
+            fcntl.flock(fd, fcntl.LOCK_UN)
             return False
 
         content = reg_file.readline().rstrip()
@@ -85,13 +96,102 @@ def get_presence(self, port_num):
 
         # Mask off the bit corresponding to our port
         mask = (1 << port_num)
-
+        fcntl.flock(fd, fcntl.LOCK_UN)
         # ModPrsL is active low
         if reg_value & mask == 0:
             return True
 
         return False
 
+    def get_modsel(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_modsel")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << port_num)
+
+        if reg_value & mask == 1:
+            return False
+
+        return True
+
+    def set_modsel(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/devices/platform/dell-s6000-cpld.0/qsfp_modsel", "r+")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << port_num)
+        reg_value = reg_value | int("0xffffffff", 16)
+        reg_value = reg_value & ~mask
+
+        # Convert our register value back to a hex string and write back
+        content = hex(reg_value)
+
+        reg_file.seek(0)
+        reg_file.write(content)
+        reg_file.close()
+
+        return True
+
+    def get_eeprom_raw(self, port_num, num_bytes=256):
+        # Read interface id EEPROM at addr 0x50
+        try:
+            fd = open(self.SFP_LOCK_FILE, "r")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return None
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        self.set_modsel(port_num)
+        eeprom_bytes = self._read_eeprom_devid(port_num, self.IDENTITY_EEPROM_ADDR, 0, num_bytes)
+        fcntl.flock(fd, fcntl.LOCK_UN)
+        return eeprom_bytes
+
+    def get_eeprom_dom_raw(self, port_num):
+        if port_num in self.osfp_ports:
+            return None
+        if port_num in self.qsfp_ports:
+            # QSFP DOM EEPROM is also at addr 0x50 and thus also stored in eeprom_ifraw
+            return None
+        else:
+            # Read dom eeprom at addr 0x51
+            if not self.get_modsel(port_num):
+                try:
+                    fd = open(self.SFP_LOCK_FILE, "r")
+                except IOError as e:
+                    print("Error: unable to open file: %s" % str(e))
+                    return None
+                fcntl.flock(fd, fcntl.LOCK_EX)
+                self.set_modsel(port_num)
+                eeprom_bytes = self._read_eeprom_devid(port_num, self.DOM_EEPROM_ADDR, 0)
+                fcntl.flock(fd, fcntl.LOCK_UN)
+                return eeprom_bytes
+            else:
+                return self._read_eeprom_devid(port_num, self.DOM_EEPROM_ADDR, 0)
+
     def get_low_power_mode(self, port_num):
         # Check for invalid port_num
         if port_num < self.port_start or port_num > self.port_end:
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c b/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
index cbf506940ac9..351e518ba438 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
@@ -312,6 +312,25 @@ static ssize_t get_modsel(struct device *dev, struct device_attribute *devattr,
     return sprintf(buf, "0x%08x\n", data);
 }
 
+static ssize_t set_modsel(struct device *dev, struct device_attribute *devattr, const char *buf, size_t count)
+{
+    int err;
+    unsigned long data = 0;
+    struct cpld_platform_data *pdata = dev->platform_data;
+
+    err = kstrtoul(buf, 16, &data);
+    if (err)
+	return err;
+
+    dell_i2c_smbus_write_byte_data(pdata[slave_cpld].client, 0x0, (u8)(data & 0xff));
+    dell_i2c_smbus_write_byte_data(pdata[slave_cpld].client, 0x1, (u8)((data >> 8) & 0xff));
+    dell_i2c_smbus_write_byte_data(pdata[master_cpld].client, 0xa, (u8)((data >> 16) & 0xff));
+    dell_i2c_smbus_write_byte_data(pdata[master_cpld].client, 0xb, (u8)((data >> 24) & 0xff));
+
+    msleep(2); // As per HW spec
+    return count;
+}
+
 static ssize_t get_lpmode(struct device *dev, struct device_attribute *devattr, char *buf)
 {
     int ret;
@@ -1128,7 +1147,7 @@ static ssize_t get_reboot_reason(struct device *dev,
     return sprintf(buf, "0x%x\n", data);
 }
 
-static DEVICE_ATTR(qsfp_modsel, S_IRUGO, get_modsel, NULL);
+static DEVICE_ATTR(qsfp_modsel, S_IRUGO | S_IWUSR, get_modsel, set_modsel);
 static DEVICE_ATTR(qsfp_modprs, S_IRUGO, get_modprs, NULL);
 static DEVICE_ATTR(qsfp_lpmode, S_IRUGO | S_IWUSR, get_lpmode, set_lpmode);
 static DEVICE_ATTR(qsfp_reset,  S_IRUGO | S_IWUSR, get_reset, set_reset);
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/s6000_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/s6000_platform.sh
index a98df43ef27b..862667ba619e 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/s6000_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/scripts/s6000_platform.sh
@@ -97,6 +97,10 @@ remove_python_api_package() {
 # read SONiC immutable variables
 [ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment
 
+if [ ! -e /etc/sonic/sfp_lock ]; then
+    touch /etc/sonic/sfp_lock
+fi
+
 if [[ "$1" == "init" ]]; then
         depmod -a
         modprobe nvram
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
index b66cb31ec96b..56b8287302a3 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/sfp.py
@@ -12,6 +12,7 @@
     import re
     import struct
     import time
+    import fcntl
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
     from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
@@ -154,6 +155,15 @@ def _get_eeprom_data(self, eeprom_key):
         if (self.sfpInfo is None):
             return None
 
+        SFP_LOCK_FILE="/etc/sonic/sfp_lock"
+        try:
+            fd = open(SFP_LOCK_FILE, "r")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return None
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        self.set_modsel()
+
         page_offset = sff8436_parser[eeprom_key][PAGE_OFFSET]
         eeprom_data_raw = self._read_eeprom_bytes(
             self.eeprom_path,
@@ -172,6 +182,7 @@ def _get_eeprom_data(self, eeprom_key):
                     self.sfpDomInfo, sff8436_parser[eeprom_key][FUNC_NAME])(
                     eeprom_data_raw, 0)
 
+        fcntl.flock(fd, fcntl.LOCK_UN)
         return eeprom_data
 
     def _strip_unit_from_str(self, value_str):
@@ -423,6 +434,16 @@ def get_presence(self):
         Retrieves the presence of the sfp
         """
         presence_ctrl = self.sfp_control + 'qsfp_modprs'
+        SFP_LOCK_FILE="/etc/sonic/sfp_lock"
+
+        try:
+            fd = open(SFP_LOCK_FILE, "r")
+        except IOError as e:
+            print("Error: unable to open file: %s" % str(e))
+            return False
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        self.set_modsel()
+
         try:
             reg_file = open(presence_ctrl)
         except IOError as e:
@@ -437,12 +458,69 @@ def get_presence(self):
         # Mask off the bit corresponding to our port
         mask = (1 << self.sfp_ctrl_idx)
 
+        fcntl.flock(fd, fcntl.LOCK_UN)
+
         # ModPrsL is active low
         if ((reg_value & mask) == 0):
             return True
 
         return False
 
+    def get_modsel(self):
+        modsel_ctrl = self.sfp_control + 'qsfp_modsel'
+        try:
+            reg_file = open(modsel_ctrl, "r+")
+        except IOError as e:
+            return False
+
+        reg_hex = reg_file.readline().rstrip()
+
+        # content is a string containing the hex
+        # representation of the register
+        reg_value = int(reg_hex, 16)
+
+        # Mask off the bit corresponding to our port
+        index = self.sfp_ctrl_idx
+
+        mask = (1 << index)
+
+        if ((reg_value & mask) == 1):
+            modsel_state = False
+        else:
+            modsel_state = True
+
+        return modsel_state
+
+    def set_modsel(self):
+        modsel_ctrl = self.sfp_control + 'qsfp_modsel'
+        try:
+            reg_file = open(modsel_ctrl, "r+")
+        except IOError as e:
+            return False
+
+        reg_hex = reg_file.readline().rstrip()
+
+        # content is a string containing the hex
+        # representation of the register
+        reg_value = int(reg_hex, 16)
+
+        # Mask off the bit corresponding to our port
+        index = self.sfp_ctrl_idx
+
+        reg_value = reg_value | int("0xffffffff", 16)
+        mask = (1 << index)
+
+        reg_value = (reg_value & ~mask)
+
+        # Convert our register value back to a hex string and write back
+        content = hex(reg_value)
+
+        reg_file.seek(0)
+        reg_file.write(content)
+        reg_file.close()
+
+        return True
+
     def get_model(self):
         """
         Retrieves the model number (or part number) of the sfp

From 0cbda8d362298a086c3fe9cef0e01ced23cb54ba Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Tue, 26 Oct 2021 19:12:07 +0300
Subject: [PATCH 0864/1674] [teamd]: Send USR1/USR2 only to subscribers.
 (#8856)

To fix teamd signal handling, without which Process 'tlm_teamd' exited unexpectedly
---
 files/scripts/teamd.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/files/scripts/teamd.sh b/files/scripts/teamd.sh
index 626bb5186ca0..6b34323cf7d3 100755
--- a/files/scripts/teamd.sh
+++ b/files/scripts/teamd.sh
@@ -3,7 +3,7 @@
 function debug()
 {
     /usr/bin/logger $1
-    /bin/echo `date` "- $1" >> ${DEBUGLOG}
+    /bin/echo `date` "- $1" >> ${DEBUG_LOG}
 }
 
 function check_warm_boot()
@@ -69,13 +69,13 @@ stop() {
         # Send USR1 signal to all teamd instances to stop them
         # It will prepare teamd for warm-reboot
         # Note: We must send USR1 signal before syncd, because it will send the last packet through CPU port
-        docker exec -i ${SERVICE}$DEV pkill -USR1 ${SERVICE} > /dev/null || [ $? == 1 ]
+        docker exec -i ${SERVICE}$DEV pkill -USR1 -f ${TEAMD_CMD} > /dev/null || [ $? == 1 ]
     elif [[ x"$FAST_BOOT" == x"true" ]]; then
         # Kill teamd processes inside of teamd container with SIGUSR2 to allow them to send last LACP frames
         # We call `docker kill teamd` to ensure the container stops as quickly as possible,
         # Note: teamd must be killed before syncd, because it will send the last packet through CPU port
-        docker exec -i ${SERVICE}$DEV pkill -USR2 ${SERVICE} || [ $? == 1 ]
-        while docker exec -i ${SERVICE}$DEV pgrep ${SERVICE} > /dev/null; do
+        docker exec -i ${SERVICE}$DEV pkill -USR2 -f ${TEAMD_CMD} || [ $? == 1 ]
+        while docker exec -i ${SERVICE}$DEV pgrep -f ${TEAMD_CMD} > /dev/null; do
             sleep 0.05
         done
         docker kill ${SERVICE}$DEV  &> /dev/null || debug "Docker ${SERVICE}$DEV is not running ($?) ..."
@@ -88,7 +88,8 @@ stop() {
 DEV=$2
 
 SERVICE="teamd"
-DEBUGLOG="/tmp/teamd-debug$DEV.log"
+TEAMD_CMD="/usr/bin/teamd"
+DEBUG_LOG="/tmp/teamd-debug$DEV.log"
 NAMESPACE_PREFIX="asic"
 if [ "$DEV" ]; then
     NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace

From f5fbb0bb3173c7ee22a1f32ea60303ada1679f0d Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Tue, 26 Oct 2021 21:56:46 -0400
Subject: [PATCH 0865/1674] [Nokia ixs7215] Add new platform capabilities to
 platform.json (#9032)

This commit more fully declares the HW capabilities of the Nokia-7215
platform. For example, support for the threshold values associated with each
thermal sensor is described. The intent here is to inform the sonic-mgmt
platform test cases of which HW features are supported.

This commit must align with PR# 4521 within the sonic-mgmt git repo which is
currently under review. Any changes to that PR will need to be reflected in
this commit.
---
 .../armhf-nokia_ixs7215_52x-r0/platform.json  | 190 ++++++++++++------
 1 file changed, 124 insertions(+), 66 deletions(-)

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
index d6a28d19b026..4f4585b1e4de 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json
@@ -11,15 +11,28 @@
         ],
         "fans": [
             {
-                "name": "Fan1"
+                "name": "Fan1",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green"]
+                }
             },
             {
-                "name": "Fan2"
+                "name": "Fan2",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green"]
+                }
             }
-        ],   
-	"fan_drawers": [
+        ],
+        "fan_drawers": [
             {
                 "name": "drawer1",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green"]
+                },
+                "max_consumed_power": false,
                 "fans": [
                     {
                         "name": "Fan1"
@@ -28,6 +41,11 @@
             },
             {
                 "name": "drawer2",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green"]
+                },
+                "max_consumed_power": false,
                 "fans": [
                     {
                         "name": "Fan2"
@@ -35,192 +53,232 @@
                 ]
             }
         ],
-	"psus": [
+        "psus": [
             {
-                "name": "PSU1"
+                "name": "PSU1",
+                "status_led": {
+                    "controllable": false
+                },
+                "current": false,
+                "power": false,
+                "max_power": false,
+                "voltage_high_threshold": false,
+                "voltage_low_threshold": false,
+                "temperature": false
             },
             {
-                "name": "PSU2"
+                "name": "PSU2",
+                "status_led": {
+                    "controllable": false
+                },
+                "current": false,
+                "power": false,
+                "max_power": false,
+                "voltage_high_threshold": false,
+                "voltage_low_threshold": false,
+                "temperature": false
             }
         ],
         "thermals": [
             {
-                "name": "PCB PHY"
+                "name": "PCB PHY",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false
             },
             {
-                "name": "PCB MAC"
+                "name": "PCB MAC",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false
             },
             {
-                "name": "ADT7473-CPU"
+                "name": "ADT7473-CPU",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "ADT7473-LOC"
+                "name": "ADT7473-LOC",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "ADT7473-MAC"
+                "name": "ADT7473-MAC",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "CPU Core"
+                "name": "CPU Core",
+                "controllable": false,
+                "low-threshold": false,
+                "high-threshold": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false
             }
         ],
-	"sfps": [
+        "sfps": [
             {
                 "name": "Ethernet0"
             },
-	    {
+            {
                 "name": "Ethernet1"
             },
-	    {
+            {
                 "name": "Ethernet2"
             },
-	    {
+            {
                 "name": "Ethernet3"
             },
-	    {
+            {
                 "name": "Ethernet4"
             },
-	    {
+            {
                 "name": "Ethernet5"
             },
-	    {
+            {
                 "name": "Ethernet6"
             },
-	    {
+            {
                 "name": "Ethernet7"
             },
-	    {
+            {
                 "name": "Ethernet8"
             },
-	    {
+            {
                 "name": "Ethernet9"
             },
-	    {
+            {
                 "name": "Ethernet10"
             },
-	    {
+            {
                 "name": "Ethernet11"
             },
-	    {
+            {
                 "name": "Ethernet12"
             },
-	    {
+            {
                 "name": "Ethernet13"
             },
-	    {
+            {
                 "name": "Ethernet14"
             },
-	    {
+            {
                 "name": "Ethernet15"
             },
-	    {
+            {
                 "name": "Ethernet16"
             },
-	    {
+            {
                 "name": "Ethernet17"
             },
-	    {
+            {
                 "name": "Ethernet18"
             },
-	    {
+            {
                 "name": "Ethernet19"
             },
-	    {
+            {
                 "name": "Ethernet20"
             },
-	    {
+            {
                 "name": "Ethernet21"
             },
-	    {
+            {
                 "name": "Ethernet22"
             },
-	    {
+            {
                 "name": "Ethernet23"
             },
-	    {
+            {
                 "name": "Ethernet24"
             },
-	    {
+            {
                 "name": "Ethernet25"
             },
-	    {
+            {
                 "name": "Ethernet26"
             },
-	    {
+            {
                 "name": "Ethernet27"
             },
-	    {
+            {
                 "name": "Ethernet28"
             },
-	    {
+            {
                 "name": "Ethernet29"
             },
-	    {
+            {
                 "name": "Ethernet30"
             },
-	    {
+            {
                 "name": "Ethernet31"
             },
-	    {
+            {
                 "name": "Ethernet32"
             },
-	    {
+            {
                 "name": "Ethernet33"
             },
-	    {
+            {
                 "name": "Ethernet34"
             },
-	    {
+            {
                 "name": "Ethernet35"
             },
-	    {
+            {
                 "name": "Ethernet36"
             },
-	    {
+            {
                 "name": "Ethernet37"
             },
-	    {
+            {
                 "name": "Ethernet38"
             },
-	    {
+            {
                 "name": "Ethernet39"
             },
-	    {
+            {
                 "name": "Ethernet40"
             },
-	    {
+            {
                 "name": "Ethernet41"
             },
-	    {
+            {
                 "name": "Ethernet42"
             },
-	    {
+            {
                 "name": "Ethernet43"
             },
-	    {
+            {
                 "name": "Ethernet44"
             },
-	    {
+            {
                 "name": "Ethernet45"
             },
-	    {
+            {
                 "name": "Ethernet46"
             },
-	    {
+            {
                 "name": "Ethernet47"
             },
-	    {
+            {
                 "name": "Ethernet48"
             },
-	    {
+            {
                 "name": "Ethernet49"
             },
-	    {
+            {
                 "name": "Ethernet50"
             },
-	    {
+            {
                 "name": "Ethernet51"
             }
-       	]	    	
+       	]
     },
     "interfaces": {}
 }

From 5b6fdf244c4636d167d422a72ef46e9e6d9232b9 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Tue, 26 Oct 2021 21:57:56 -0400
Subject: [PATCH 0866/1674] [Nokia ixs7215] Platform API fixes (#9025)

* [Nokia ixs7215] Platform API fixes

This commit delivers the following fixes
    - Fix bug preventing access to second PSU eeprom
    - Fix bug preventing updates to front panel PSU status led
    - Fix SFP reset test case failure

* Fix LGTM alert
---
 .../7215/scripts/nokia-7215init.sh            |  2 +-
 .../7215/sonic_platform/eeprom.py             | 12 +++-
 .../7215/sonic_platform/psu.py                | 63 ++++++++++++++++++-
 .../7215/sonic_platform/sfp.py                | 25 +++-----
 4 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
index 3f23afe1fce2..f8a7ad54b310 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
@@ -52,8 +52,8 @@ echo eeprom 0x55 > /sys/class/i2c-adapter/i2c-0/new_device
 echo eeprom 0x56 > /sys/class/i2c-adapter/i2c-0/new_device
 
 # Enumerate PSU eeprom devices
+echo eeprom 0x50 > /sys/class/i2c-adapter/i2c-1/new_device
 echo eeprom 0x51 > /sys/class/i2c-adapter/i2c-1/new_device
-echo eeprom 0x52 > /sys/class/i2c-adapter/i2c-1/new_device
 
 # Enable optical SFP Tx
 i2cset -y -m 0x0f 0 0x41 0x5 0x00
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
index d0e3e00fffc2..b3b31605b246 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py
@@ -16,6 +16,7 @@
 try:
     from sonic_platform_base.sonic_eeprom.eeprom_base import EepromDecoder
     from sonic_platform_base.sonic_eeprom.eeprom_tlvinfo import TlvInfoDecoder
+    from sonic_py_common import logger
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -27,6 +28,8 @@
     ('Serial Number', 's', 11)
     ]
 
+sonic_logger = logger.Logger('eeprom')
+
 
 class Eeprom(TlvInfoDecoder):
     """Nokia platform-specific EEPROM class"""
@@ -51,7 +54,7 @@ def __init__(self, is_psu=False, psu_index=0, is_fan=False, fan_index=0):
                 self.index = psu_index
                 self.start_offset = 18
                 self.eeprom_path = self.I2C_DIR \
-                    + "i2c-1/1-005{}/eeprom".format(self.index)
+                    + "i2c-1/1-005{}/eeprom".format(self.index - 1)
                 self.format = psu_eeprom_format
 
                 # Decode device eeprom as per specified format
@@ -79,6 +82,7 @@ def _load_system_eeprom(self):
             # Read System EEPROM as per ONIE TlvInfo EEPROM format.
             self.eeprom_data = self.read_eeprom()
         except Exception as e:
+            sonic_logger.log_warning("Unable to read system eeprom")
             self.base_mac = 'NA'
             self.serial_number = 'NA'
             self.part_number = 'NA'
@@ -88,6 +92,7 @@ def _load_system_eeprom(self):
         else:
             eeprom = self.eeprom_data
             if not self.is_valid_tlvinfo_header(eeprom):
+                sonic_logger.log_warning("Invalid system eeprom TLV header")
                 self.base_mac = 'NA'
                 self.serial_number = 'NA'
                 self.part_number = 'NA'
@@ -144,10 +149,12 @@ def _load_device_eeprom(self):
                 # Read Fan/PSU EEPROM as per the specified format.
                 self.eeprom_data = EepromDecoder.read_eeprom(self)
             except Exception as e:
+                sonic_logger.log_warning("Unable to read device eeprom for PSU#{}".format(self.index))
                 return
 
             # Bail out if PSU eeprom unavailable
             if self.eeprom_data[0] == 255:
+                sonic_logger.log_warning("Uninitialized device eeprom for PSU#{}".format(self.index))
                 return
 
             (valid, data) = self._get_eeprom_field("Model")
@@ -164,6 +171,7 @@ def _load_device_eeprom(self):
                 if valid:
                     self.serial_number = data.decode()
             except Exception as e:
+                sonic_logger.log_warning("Unable to read serial# of PSU#{}".format(self.index))
                 return
 
         # Fan device eeproms use ONIE TLV format
@@ -172,10 +180,12 @@ def _load_device_eeprom(self):
                 # Read Fan EEPROM as per ONIE TlvInfo EEPROM format.
                 self.eeprom_data = self.read_eeprom()
             except Exception as e:
+                sonic_logger.log_warning("Unable to read device eeprom for Fan#{}".format(self.index))
                 return
 
             eeprom = self.eeprom_data
             if not self.is_valid_tlvinfo_header(eeprom):
+                sonic_logger.log_warning("Invalid device eeprom TLV header for Fan#{}".format(self.index))
                 return
 
             total_length = (eeprom[9] << 8) | eeprom[10]
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
index 90025db7ffbf..6217555f0d58 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py
@@ -7,6 +7,7 @@
 ########################################################################
 
 try:
+    import os
     import sys
     from sonic_platform_base.psu_base import PsuBase
     from sonic_py_common import logger
@@ -39,6 +40,34 @@ def __init__(self, psu_index):
         # PSU eeprom
         self.eeprom = Eeprom(is_psu=True, psu_index=self.index)
 
+    def _write_sysfs_file(self, sysfs_file, value):
+        rv = 'ERR'
+
+        if (not os.path.isfile(sysfs_file)):
+            return rv
+        try:
+            with open(sysfs_file, 'w') as fd:
+                rv = fd.write(str(value))
+        except Exception as e:
+            rv = 'ERR'
+
+        return rv
+
+    def _read_sysfs_file(self, sysfs_file):
+        rv = 'ERR'
+
+        if (not os.path.isfile(sysfs_file)):
+            return rv
+        try:
+            with open(sysfs_file, 'r') as fd:
+                rv = fd.read()
+        except Exception as e:
+            rv = 'ERR'
+
+        rv = rv.rstrip('\r\n')
+        rv = rv.lstrip(" ")
+        return rv
+
     def get_name(self):
         """
         Retrieves the name of the device
@@ -242,7 +271,20 @@ def get_status_master_led(self):
         Returns:
             A string, one of the predefined STATUS_LED_COLOR_* strings.
         """
-        return self._psu_master_led_color
+        if (not os.path.isfile("/sys/class/gpio/psuLedGreen/value") or
+            not os.path.isfile("/sys/class/gpio/psuLedAmber/value")):
+            return None
+
+        green = self._read_sysfs_file("/sys/class/gpio/psuLedGreen/value")
+        amber = self._read_sysfs_file("/sys/class/gpio/psuLedAmber/value")
+        if green == "ERR" or amber == "ERR":
+            return None
+        if green == "1":
+            return self.STATUS_LED_COLOR_GREEN
+        elif amber == "1":
+            return self.STATUS_LED_COLOR_AMBER
+        else:
+            return None
 
     def set_status_master_led(self, color):
         """
@@ -252,5 +294,22 @@ def set_status_master_led(self, color):
             bool: True if status LED state is set successfully, False if
                   not
         """
-        self._psu_master_led_color = color
+        if (not os.path.isfile("/sys/class/gpio/psuLedGreen/value") or
+            not os.path.isfile("/sys/class/gpio/psuLedAmber/value")):
+            return False
+
+        if color == self.STATUS_LED_COLOR_GREEN:
+            rvg = self._write_sysfs_file("/sys/class/gpio/psuLedGreen/value", 1)
+            if rvg != "ERR":
+                rva = self._write_sysfs_file("/sys/class/gpio/psuLedAmber/value", 0)
+        elif color == self.STATUS_LED_COLOR_AMBER:
+            rvg = self._write_sysfs_file("/sys/class/gpio/psuLedGreen/value", 0)
+            if rvg != "ERR":
+                rva = self._write_sysfs_file("/sys/class/gpio/psuLedAmber/value", 1)
+        else:
+            return False
+
+        if rvg == "ERR" or rva == "ERR":
+            return False
+
         return True
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
index 244e48e1e639..d5f9cdb8e76c 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
@@ -5,7 +5,6 @@
 
 import os
 import sys
-import time
 
 try:
     from sonic_platform_base.sfp_base import SfpBase
@@ -795,28 +794,22 @@ def reset(self):
         Reset SFP.
         Returns:
             A boolean, True if successful, False if not
-        """        
-        if self.sfp_type == COPPER_TYPE:
-            return False
-
-        self.tx_disable(True)
-        time.sleep(1)
-        self.tx_disable(False)
-        
-        return True
+        """
+        # RJ45 and SFP ports not resettable
+        return False
 
     def tx_disable(self, tx_disable):
         """
-        Disable SFP TX 
+        Disable SFP TX
         Args:
             tx_disable : A Boolean, True to enable tx_disable mode, False to disable
                          tx_disable mode.
-        Returns: 
+        Returns:
             A boolean, True if tx_disable is set successfully, False if not
         """
         if self.sfp_type == COPPER_TYPE:
             return False
-        
+
         if smbus_present == 0:  # if called from sfputil outside of pmon
             cmdstatus, register = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x5')
             if cmdstatus:
@@ -834,8 +827,8 @@ def tx_disable(self, tx_disable):
         if tx_disable == True:
             setbits = register | mask
         else:
-            setbits = register & ~mask   
-  
+            setbits = register & ~mask
+
         if smbus_present == 0:  # if called from sfputil outside of pmon
             cmdstatus, output = cmd.getstatusoutput('sudo i2cset -y -m 0x0f 0 0x41 0x5 %d' % setbits)
             if cmdstatus:
@@ -846,7 +839,7 @@ def tx_disable(self, tx_disable):
             DEVICE_ADDRESS = 0x41
             DEVICE_REG = 0x5
             bus.write_byte_data(DEVICE_ADDRESS, DEVICE_REG, setbits)
-                        
+
         return True
 
     def tx_disable_channel(self, channel, disable):

From 933f45e91279b983bf9361a3386804de0b4908d1 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 27 Oct 2021 10:18:00 -0700
Subject: [PATCH 0867/1674] 
 [202012][sonic-platform-common][sonic-platform-daemons] submodule update
 (#9081)

bf7214c (HEAD -> 202012, origin/202012) [y_cable] add support for manual/standby mode in xcvrd for muxcable; fix download firmware version retrieval logic while download firmware in progress (#220)

fc6a41e (HEAD -> 202012, origin/202012) Fix typo in the simulated y_cable driver (#226)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 0770dec1009f..fc6a41ea3dc8 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 0770dec1009f468aa96ad8f1ac85bb3db7153e7f
+Subproject commit fc6a41ea3dc8b1c142492a03c7ce068c79302a72
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 3d14066b8f92..bf7214c2c50d 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 3d14066b8f92e8fa9c51e05dc5cea8634784c4dd
+Subproject commit bf7214c2c50d3b59c9ab97ea60665ad9ecf23e2c

From 65626c89252f24d72add790d6839b522c593d7c3 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Thu, 28 Oct 2021 09:31:38 -0700
Subject: [PATCH 0868/1674] Flush RESTAPI DB upon config reload (#9093)

---
 files/scripts/swss.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 25e948e5e6da..63e8ba894447 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -146,6 +146,7 @@ start() {
         $SONIC_DB_CLI ASIC_DB FLUSHDB
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
+        $SONIC_DB_CLI RESTAPI_DB FLUSHDB
         clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*'"
     fi
 

From eb744552be2d527ebd577712e6a295b994d2a098 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Wed, 27 Oct 2021 12:47:56 +0300
Subject: [PATCH 0869/1674] [Makefile.cache] fix an issue that non-direct
 dependencies are not accounted in component hash calculation (#8965)

#### Why I did it

Fixed an issue that changing SDK version leads to cache framework taking cached syncd RPC image rather then rebuilding syncd RPC based on new syncd with new SDK.

Investigation showed that cache framework calculates a component hash based on direct dependencies. Syncd RPC image hash consists of two parts: one is the flags of syncd RPC (platform, ENABLE_SYNCD_RPC) and syncd RPC direct dependencies makefiles. None of the syncd RPC direct dependencies are modified when SDK version changes, so hash is unchanged.

#### How I did it

To fix this issue, include the hash of dependencies into current component hash calculation, e.g.:

In calcultation of the hash ```docker-syncd-mlnx-rpc.gz-274dfed3f52f2effa9989fc-39344350436f9b06d28b470.tgz```, the hash of syncd is included: ```docker-syncd-mlnx.gz-48ee88ac54b201e0e107b15-7bbea320025177a2121e440.tgz``` in which the hash of SDK is included.

#### How to verify it

Build with cache enabled and check that changing SDK version leads to a different hash of syncd rpc image:

SDK version 4.5.1002:
```
docker-syncd-mlnx.gz-48ee88ac54b201e0e107b15-7bbea320025177a2121e440.tgz
docker-syncd-mlnx-rpc.gz-274dfed3f52f2effa9989fc-39344350436f9b06d28b470.tgz
```

SDK version 4.5.1002-005:
```
docker-syncd-mlnx.gz-18baf952e3e0eda7cda7c3c-e5668f4784390d5dffd55af.tgz
docker-syncd-mlnx-rpc.gz-4a6e59580eda110b5709449-552f76be135deaf750aeab2.tgz
```
---
 Makefile.cache | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.cache b/Makefile.cache
index 4037222ffc93..d09211298376 100644
--- a/Makefile.cache
+++ b/Makefile.cache
@@ -182,7 +182,10 @@ define GET_MOD_DEP_SHA
 	$(eval $(1)_DEP_FILES_MISSING := $(filter-out $(wildcard $($(1)_DEP_MOD_SHA_FILES)),$($(1)_DEP_MOD_SHA_FILES)) )
 	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
 
-	$(eval $(1)_DEP_MOD_SHA := $(shell git hash-object  $($(1)_DEP_MOD_SHA_FILES) \
+	# Include package dependencies hash values into package hash calculation
+	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$(1)_MOD_DEP_PKGS,$(dfile)_DEP_MOD_SHA $(dfile)_MOD_HASH))
+
+	$(eval $(1)_DEP_MOD_SHA := $(shell bash -c "git hash-object  $($(1)_DEP_MOD_SHA_FILES) && echo $($(1)_DEP_PKGS_SHA)" \
                             | sha1sum | awk '{print substr($$1,0,23);}'))
 endef
 

From a933b20d6fdbf9cb913c450c7bff37b2718a1796 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Wed, 27 Oct 2021 09:27:18 -0700
Subject: [PATCH 0870/1674] [minigraph] Add tagged vlan member support for
 storage backend (#9045)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
Storage T0's have all vlan members as tagged

How I did it
Since currently minigraph does not have a unique way to identify if a vlan member is tagged/untagged and to ensure other scenarios are not broken, the logic used is to just update the vlan member type as 'tagged' when we determine that it is a storage backend device. This change will apply only to storage backend T0's since storage backend T1's will not have vlan member information

How to verify it
Updated the storage backend T0 testcases to check for tagged vlan members
Added testcase to check if a T1 and backend T1 device generates an empty vlan member table
Existing vlan member testcases are good enough for checking if any regression has been caused for regular T0's
Build sonic_config_engine-1.0-py3-none-any.whl successfully
---
 src/sonic-config-engine/minigraph.py         |  6 ++
 src/sonic-config-engine/tests/test_cfggen.py | 91 ++++++++++++++++----
 2 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 3f0e437b611d..6b55ab668772 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1459,6 +1459,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         del results['PORTCHANNEL_INTERFACE']
         is_storage_device = True
         results['VLAN_SUB_INTERFACE'] = vlan_sub_intfs
+        # storage backend T0 have all vlan members tagged
+        for vlan in vlan_members:
+            vlan_members[vlan]["tagging_mode"] = "tagged"
     elif current_device['type'] in backend_device_types and (resource_type is None or 'Storage' in resource_type):
         del results['INTERFACE']
         del results['PORTCHANNEL_INTERFACE']
@@ -1484,6 +1487,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 sub_intf = pc_intf + VLAN_SUB_INTERFACE_SEPARATOR + VLAN_SUB_INTERFACE_VLAN_ID
                 vlan_sub_intfs[sub_intf] = {"admin_status" : "up"}
         results['VLAN_SUB_INTERFACE'] = vlan_sub_intfs
+        # storage backend T0 have all vlan members tagged
+        for vlan in vlan_members:
+            vlan_members[vlan]["tagging_mode"] = "tagged"
     elif resource_type is not None and 'Storage' in resource_type:
         is_storage_device = True
 
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 0a0dd54a76d7..b2f8532b7636 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -8,6 +8,8 @@
 
 TOR_ROUTER = 'ToRRouter'
 BACKEND_TOR_ROUTER = 'BackEndToRRouter'
+LEAF_ROUTER = 'LeafRouter'
+BACKEND_LEAF_ROUTER = 'BackEndLeafRouter'
 
 class TestCfgGen(TestCase):
 
@@ -124,17 +126,29 @@ def test_additional_json_data_level2_key(self):
 
     def test_var_json_data(self, **kwargs):
         graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        tag_mode = kwargs.get('tag_mode', 'untagged')
         argument = '-m "' + graph_file + '" -p "' + self.port_config + '" --var-json VLAN_MEMBER'
         output = self.run_script(argument)
-        self.assertEqual(
-            utils.to_dict(output.strip()),
-            utils.to_dict(
-                '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "untagged"\n    },'
-                ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
-                ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
-                ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
+        if tag_mode == "tagged":
+            self.assertEqual(
+                utils.to_dict(output.strip()),
+                utils.to_dict(
+                    '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
+                )
+            )
+        else:
+            self.assertEqual(
+                utils.to_dict(output.strip()),
+                utils.to_dict(
+                    '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "untagged"\n    },'
+                    ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
+                )
             )
-        )
 
     def test_read_yaml(self):
         argument = '-v yml_item -y ' + os.path.join(self.test_dir, 'test.yml')
@@ -226,17 +240,29 @@ def test_minigraph_vlans(self, **kwargs):
 
     def test_minigraph_vlan_members(self, **kwargs):
         graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+        tag_mode = kwargs.get('tag_mode', 'untagged')
         argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
         output = self.run_script(argument)
-        self.assertEqual(
-            utils.to_dict(output.strip()),
-            utils.to_dict(
-                "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
-                "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}, "
-                "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
-                "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+        if tag_mode == "tagged":
+            self.assertEqual(
+                utils.to_dict(output.strip()),
+                utils.to_dict(
+                    "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+                )
+            )
+        else:
+            self.assertEqual(
+                utils.to_dict(output.strip()),
+                utils.to_dict(
+                    "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}, "
+                    "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+                )
             )
-        )
 
     def test_minigraph_vlan_interfaces(self, **kwargs):
         graph_file = kwargs.get('graph_file', self.sample_graph_simple)
@@ -606,6 +632,33 @@ def test_minigraph_sub_port_intf_resource_type(self, check_stderr=True):
     def test_minigraph_sub_port_intf_sub(self, check_stderr=True):
         self.verify_sub_intf(graph_file=self.sample_subintf_graph, check_stderr=check_stderr)
 
+    def test_minigraph_no_vlan_member(self, check_stderr=True):
+        self.verify_no_vlan_member()
+
+    def test_minigraph_sub_port_no_vlan_member(self, check_stderr=True):
+        try:
+            print('\n    Change device type to %s' % (BACKEND_LEAF_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (LEAF_ROUTER, BACKEND_LEAF_ROUTER, self.sample_graph), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (LEAF_ROUTER, BACKEND_LEAF_ROUTER, self.sample_graph), shell=True)
+
+            self.test_jinja_expression(self.sample_graph, BACKEND_LEAF_ROUTER)
+            self.verify_no_vlan_member()
+        finally:
+            print('\n    Change device type back to %s' % (LEAF_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_LEAF_ROUTER, LEAF_ROUTER, self.sample_graph), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_LEAF_ROUTER, LEAF_ROUTER, self.sample_graph), shell=True)
+
+            self.test_jinja_expression(self.sample_graph, LEAF_ROUTER)
+
+    def verify_no_vlan_member(self):
+        argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "VLAN_MEMBER"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), "{}")
+
     def verify_sub_intf(self, **kwargs):
         graph_file = kwargs.get('graph_file', self.sample_graph_simple)
         check_stderr = kwargs.get('check_stderr', True)
@@ -629,9 +682,7 @@ def verify_sub_intf(self, **kwargs):
             self.assertEqual(output.strip(), "")
 
             # All the other tables stay unchanged
-            self.test_var_json_data(graph_file=graph_file)
             self.test_minigraph_vlans(graph_file=graph_file)
-            self.test_minigraph_vlan_members(graph_file=graph_file)
             self.test_minigraph_vlan_interfaces(graph_file=graph_file)
             self.test_minigraph_portchannels(graph_file=graph_file)
             self.test_minigraph_ethernet_interfaces(graph_file=graph_file)
@@ -666,6 +717,10 @@ def verify_sub_intf(self, **kwargs):
                     )
                 )
 
+            # VLAN_MEMBER table should have all tagged members
+            self.test_var_json_data(graph_file=graph_file, tag_mode='tagged')
+            self.test_minigraph_vlan_members(graph_file=graph_file, tag_mode='tagged')
+
         finally:
             print('\n    Change device type back to %s' % (TOR_ROUTER))
             if check_stderr:

From bf1ed42588a86ef37a1b4e4f0db6b8dc08719ab1 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Mon, 25 Oct 2021 16:26:48 -0700
Subject: [PATCH 0871/1674] [ci]: build centec arm64 to sonicbld-arm64 pool

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 5f0a74cea03f..22151edd21ab 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -64,7 +64,7 @@ jobs:
             platform_rpc: centec
 
         - name: centec-arm64
-          pool: sonicbld_8c
+          pool: sonicbld-arm64
           timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: arm64

From 1fc4968cd0549d18e62522f55255989d2dd4cd36 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 29 Oct 2021 10:11:49 -0700
Subject: [PATCH 0872/1674] [swss] Update swss submodule (#9110)

Commits:
f147d9e - 2021-10-27 : [Mux orch] Handle setting unknown mux state (#1984) [Prince Sunny]
4618b2b - 2021-10-28 : Change tunnel orch order (#1990) [Prince Sunny]
505d52d - 2021-10-20 : Fix the option missing in kernel config issue (#1973) [xumia]
7bf4dfb - 2021-10-18 : SAI_REDIS_SWITCH_ATTR_CONTEXT shouldbe the last attribute. This is what sairedis library expects (#1935) [judyjoseph]
c58919e - 2021-10-08 : [logfile][202012]: Add option to specify swss rec file name (#1946) [judyjoseph]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index ee9c30dfb8ef..f147d9ee896e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit ee9c30dfb8efc08f6040d1afdc9c9550d2bf1f45
+Subproject commit f147d9ee896e2aed46cf5b994a2b8f0c97e50300

From de38cd758ec12cbf2addb872f5b3d634f0012e2d Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 29 Oct 2021 21:14:41 -0700
Subject: [PATCH 0873/1674] [build] Use pip to install setup.py dependency
 instead of `python setup.py install` (#9111)

#### Why I did it
Backport https://github.com/Azure/sonic-buildimage/pull/8997 to 202012 branch.
---
 slave.mk                                      |  2 ++
 .../0003-use-redis-3.5.3.patch                | 25 -------------------
 src/redis-dump-load.patch/series              |  1 -
 src/sonic-yang-models/setup.py                |  3 +--
 4 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 src/redis-dump-load.patch/0003-use-redis-3.5.3.patch

diff --git a/slave.mk b/slave.mk
index bc6e8f9707ab..e8a1b494bdee 100644
--- a/slave.mk
+++ b/slave.mk
@@ -620,6 +620,8 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
 		pushd $($*_SRC_PATH) $(LOG_SIMPLE)
 		# apply series of patches if exist
 		if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; fi
+		# Use pip instead of later setup.py to install dependencies into user home, but uninstall self
+		pip$($*_PYTHON_VERSION) install . && pip$($*_PYTHON_VERSION) uninstall --yes `python setup.py --name`
 		if [ ! "$($*_TEST)" = "n" ]; then python$($*_PYTHON_VERSION) setup.py test $(LOG); fi
 		python$($*_PYTHON_VERSION) setup.py bdist_wheel $(LOG)
 		# clean up
diff --git a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
deleted file mode 100644
index a58c2059e81a..000000000000
--- a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Pin the redis package to version 3.5.3 (the last version that supports both
-Python 2 and 3).
-
-Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
-
-diff --git a/requirements.txt b/requirements.txt
-index 7800f0f..3fc0632 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1 +1 @@
--redis
-+redis==3.5.3
-diff --git a/setup.py b/setup.py
-index 8ccf31f..6db9ec4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -17,7 +17,7 @@ setup(name=package_name,
-     author_email='oleg@bsdpower.com',
-     url='http://github.com/p/redis-dump-load',
-     py_modules=['redisdl'],
--    install_requires=['redis'],
-+    install_requires=['redis==3.5.3'],
-     data_files=[
-         (doc_dir, data_files),
-     ],
diff --git a/src/redis-dump-load.patch/series b/src/redis-dump-load.patch/series
index 50beb71a677f..c73c3b5caa97 100644
--- a/src/redis-dump-load.patch/series
+++ b/src/redis-dump-load.patch/series
@@ -1,3 +1,2 @@
 0001-Use-pipelines-when-dumping-52.patch
 0002-Fix-setup.py-for-test-and-bdist_wheel.patch
-0003-use-redis-3.5.3.patch
diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
index e651bb0d377d..553b44bc9508 100644
--- a/src/sonic-yang-models/setup.py
+++ b/src/sonic-yang-models/setup.py
@@ -54,8 +54,7 @@
                          './yang-models/sonic-portchannel.yang',
                          './yang-models/sonic-types.yang',
                          './yang-models/sonic-versions.yang',
-                         './yang-models/sonic-vlan.yang',
-                         './yang-models/sonic_yang_tree']),
+                         './yang-models/sonic-vlan.yang']),
     ],
     zip_safe=False,
 )

From 400e40f2553a602d0f4aaf1fe7e01919fafdc735 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 3 Nov 2021 07:24:33 -0700
Subject: [PATCH 0874/1674] [202012] BRCM SAI 4.3.5.1-6 Picked up fixes for
 CS00012213351, CS00012182162, and CS00012210826 (#9158)

This is to pick up BRCM SAI 4.3.5.1-6 fixes which contains the following fixes:

1.  CS00012213351 SONIC-50679: [TH, TH2] Warm-reboot from 3.5 to 4.3 fails due to null objects discovered
2.  CS00012182162: SONIC-49805 TD3 MMU config profile optimization changes
3.  CS00012210826:SONIC-50205/760c60fc: Should read MMU_INTFI_MMU_PORT_TO_MMU_QUEUES_FC_BKP for TH3

Preliminary tests looks fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on 7050CX3 (TD3) T0 DUT and all passed:
```
     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     fdb/test_fdb.py
     decap/test_decap.py
     ipfwd/test_dip_sip.py
     ipfwd/test_dir_bcast.py
     acl/test_acl.py
     vlan/test_vlan.py
     platform_tests/test_reboot.py
```
---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 2aed1417c29f..c3be9fc9c806 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -73,4 +75,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 3cdea546cebd..283612549d54 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-5_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-5_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-6_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-6_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From cc3e595c8cec5db9461f0dd63b9602c01e65da0f Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Wed, 3 Nov 2021 07:25:25 -0700
Subject: [PATCH 0875/1674] [202012] sairedis submodule update (#9156)

These changes are included in this PR:

07e1f79 [syncd] Add workaround for warm boot new objects (#959)
50fd353 Fix the option missing in kernel config issue (#956)
e77503c [syncd] Comparison logic workaround for empty buffer profile (#906) (#941)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index ca6cdf0fb9ad..07e1f79a8a13 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit ca6cdf0fb9ad2f251b8ea24089d373a172b109b1
+Subproject commit 07e1f79a8a13d12e0e088401b9bb6bb6e73eeefe

From fb844c754aa70f4b1dace6edf6567a665b722abc Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Wed, 3 Nov 2021 19:59:02 +0530
Subject: [PATCH 0876/1674] [202012][Marvell] Update armhf SAI to ver 1.7.1-5
 (#9118)

Fixed test_null_route_helper fix

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index 620f2a41d237..6869b442f2d9 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-4
+export MRVL_SAI_VERSION = 1.7.1-5
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From 77910e41ce1efc9f91c60dd6a3954f1aecf8b9ce Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Mon, 1 Nov 2021 18:53:26 +0200
Subject: [PATCH 0877/1674] [Mellanox] Fix split configuration for Mellanox
 SN3800-D112C8 SKU SAI profile for fast-reboot performance (#8897)

- Why I did it
Wrong SKU configuration will lead to longer init flow.
This will affect fast-reboot feature by increasing the traffic downtime.
Since MLNX met the required downtime period with this SKU this bug found with a delay.

- How I did it
Add the required split labels for ports.

- How to verify it
Run fast-reboot with this platform using SN3800-D112C8 SKU.
---
 .../sai_3800_112x50g_8x100g.xml                | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai_3800_112x50g_8x100g.xml b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai_3800_112x50g_8x100g.xml
index a72edb85633d..5bf9be0751b7 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai_3800_112x50g_8x100g.xml
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai_3800_112x50g_8x100g.xml
@@ -46,6 +46,7 @@
                 <width>4</width>
                 <module>51</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -77,6 +78,7 @@
                 <width>4</width>
                 <module>55</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -108,6 +110,7 @@
                 <width>4</width>
                 <module>59</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -139,6 +142,7 @@
                 <width>4</width>
                 <module>63</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -170,6 +174,7 @@
                 <width>4</width>
                 <module>15</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -201,6 +206,7 @@
                 <width>4</width>
                 <module>11</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -232,6 +238,7 @@
                 <width>4</width>
                 <module>7</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -263,6 +270,7 @@
                 <width>4</width>
                 <module>3</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -294,6 +302,7 @@
                 <width>4</width>
                 <module>47</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -325,6 +334,7 @@
                 <width>4</width>
                 <module>43</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -354,6 +364,7 @@
                 <width>4</width>
                 <module>39</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -383,6 +394,7 @@
                 <width>4</width>
                 <module>35</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -414,6 +426,7 @@
                 <width>4</width>
                 <module>19</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -445,6 +458,7 @@
                 <width>4</width>
                 <module>23</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -474,6 +488,7 @@
                 <width>4</width>
                 <module>27</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
             <port-info>
@@ -503,8 +518,9 @@
                 <width>4</width>
                 <module>31</module>
                 <breakout-modes>3</breakout-modes>
+                <split>2</split>
                 <port-speed>384</port-speed>
             </port-info>
         </ports-list>
     </platform_info>
-</root>
+</root>
\ No newline at end of file

From d8dd68d2f4df3877c93c2c2a2f2492a3c6536a10 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Tue, 2 Nov 2021 12:36:32 -0700
Subject: [PATCH 0878/1674] Fix invalid destination address error (#9143)

---
 src/dhcp6relay/src/relay.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index 3e9c9520e602..f5f4b056648f 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -682,16 +682,16 @@ void dhcp6relay_stop()
 void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
     std::vector<int> sockets;
     
-    for(std::size_t i = 0; i<vlans->size(); i++) {
-        struct relay_config config = vlans->at(i);
+    for(relay_config &vlan : *vlans) {
+        relay_config *config = &vlan;
         int filter = 0;
         int local_sock = 0; 
-        const char *ifname = config.interface.c_str();
+        const char *ifname = config->interface.c_str();
         int index = if_nametoindex(ifname);
-        config.db = db;
+        config->db = db;
 
         std::string counterVlan = counter_table;
-        initialize_counter(config.db, counterVlan.append(config.interface));
+        initialize_counter(config->db, counterVlan.append(config->interface));
 
         filter = sock_open(index, &ether_relay_fprog);
 
@@ -699,7 +699,7 @@ void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
         sockets.push_back(filter);
         sockets.push_back(local_sock);
 
-        prepare_relay_config(&config, &local_sock, filter);
+        prepare_relay_config(config, &local_sock, filter);
 
         evutil_make_listen_socket_reuseable(filter);
         evutil_make_socket_nonblocking(filter);
@@ -712,8 +712,8 @@ void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
             syslog(LOG_ERR, "libevent: Failed to create base\n");
         }
 
-        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, (void *)&config);
-        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, (void *)&config);
+        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, config);
+        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, config);
         if (listen_event == NULL || server_listen_event == NULL) {
             syslog(LOG_ERR, "libevent: Failed to create libevent\n");
         }

From 8ada0063029065167edd536fda99d013d0c7ab4f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 3 Nov 2021 11:03:01 -0700
Subject: [PATCH 0879/1674] [swss]: Start ndppd after vlanmgrd (#9155)

Why I did it
During swss container startup, if ndppd starts up before/with vlanmgrd, ndppd will be pinned at nearly 100% CPU usage.

How I did it
Only start ndppd after vlanmgrd is running. Also, call ndppd directly instead of through bash for improved logging and to prevent orphaned processes.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-orchagent/ndppd.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-orchagent/ndppd.conf b/dockers/docker-orchagent/ndppd.conf
index 1e97bf97e313..b9dbc293ed2a 100644
--- a/dockers/docker-orchagent/ndppd.conf
+++ b/dockers/docker-orchagent/ndppd.conf
@@ -1,9 +1,9 @@
 [program:ndppd]
-command=bash -c "/usr/sbin/ndppd | /usr/bin/logger"
+command=/usr/sbin/ndppd
 priority=7
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=swssconfig:exited
\ No newline at end of file
+dependent_startup_wait_for=vlanmgrd:running

From baa00e696914960631aa89c43099c6262baae5ef Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Mon, 8 Nov 2021 11:50:44 -0800
Subject: [PATCH 0880/1674] [202012] Disable ALPM distributed hitbit thread
 that is used for debug purpose only but interfered with Other functional
 operations (#9190)

This is to address an issue where it was observed that SAI operations sometime make take a very long to time complete (over 45ms). It was determined that the ALPM distributed thread was causing this issue.
The fix is to disable this debug thread that has no functional purpose.

Preliminary tests looks fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the fib test cases on 7050CX3 (TD3), TD2, TH, TH2, and TH3 based platforms and
thy all passed.
---
 .../td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm             | 3 +++
 .../Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm         | 3 +++
 .../td2-a7050-q31s4-31x40G-4x10G.config.bcm                   | 3 +++
 .../Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm    | 3 +++
 .../td3-a7050cx3-32s-32x100G.config.bcm                       | 1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                 | 1 +
 .../th-a7060-cx32s-32x100G-t1.config.bcm                      | 3 +++
 .../th-a7060-cx32s-8x100G+48x50G.config.bcm                   | 3 +++
 .../th-a7060-cx32s-8x100G+24x40G.config.bcm                   | 3 +++
 .../Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm | 3 +++
 .../Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm | 3 +++
 .../th-a7060-cx32s-8x100G+96x25G.config.bcm                   | 3 +++
 .../Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm     | 2 ++
 .../Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm    | 2 ++
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 | 1 +
 .../Arista-7260CX3-D108C8/config.bcm.j2                       | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 | 1 +
 .../x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm         | 3 +++
 .../Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm | 3 +++
 .../th-seastone-dx010-32x100G-t0.config.bcm                   | 3 +++
 .../th-seastone-dx010-32x100G-t1.config.bcm                   | 3 +++
 .../th-seastone-dx010-48x50G+8x100G.config.bcm                | 3 +++
 .../th-seastone-dx010-config-flex-all.bcm                     | 3 +++
 .../Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm   | 3 +++
 .../Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm   | 3 +++
 .../Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm   | 3 +++
 .../Force10-S6000/td2-s6000-32x40G.config.bcm                 | 3 +++
 .../Force10-S6100/th-s6100-64x40G-t0.config.bcm               | 4 ++++
 .../Force10-S6100/th-s6100-64x40G-t1.config.bcm               | 4 ++++
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm          | 3 +++
 .../th3-z9332f-16x400G-64x100G.config.bcm                     | 3 +++
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm          | 3 +++
 src/sonic-device-data/tests/permitted_list                    | 1 +
 33 files changed, 87 insertions(+)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
index 00714fbd400e..1686cb0bcaea 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
@@ -24,6 +24,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
index 074cd523c072..dc959c02878c 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
@@ -24,6 +24,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
index 1fa9817ff522..eecad7cee9c0 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
@@ -4,6 +4,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
index 5ffd9530a7c9..720b03e0fa11 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G.config.bcm
@@ -18,6 +18,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index fe3a9c2792cf..ed03a9d589c2 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 sai_verify_incoming_chksum=0
 host_as_route_disable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 8de71580746c..c31060f79278 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 sai_verify_incoming_chksum=0
 host_as_route_disable=1
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
index d8f902aa6058..509e801af488 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
index 2bc25fdbdb62..c37f1592456d 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
index 2adf2e8dfb02..8f8b4c0fe32d 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/th-a7060-cx32s-8x100G+24x40G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
index 3800dd2cb2aa..c2e0bdcb9c0f 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
index 3a518b5a0e58..3d4682cc42aa 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
index 1208b349882a..9244c76a0ea2 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/th-a7060-cx32s-8x100G+96x25G.config.bcm
@@ -1,5 +1,8 @@
 # Arista 7060CX-32S
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
index eb2c7bc0f5fb..c429c28bad68 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
@@ -1,5 +1,7 @@
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile.0=2
 bcm_num_cos.0=8
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
index f9e731e58823..b23b8abf1377 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
@@ -1,5 +1,7 @@
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile.0=2
 bcm_num_cos.0=8
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 34b83bda4e47..44a14508b666 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -19,6 +19,7 @@
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
 
+l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 17f54d358e85..451bf238533c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -9,6 +9,7 @@
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
+l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index 515c7c5d0238..d0fcfd032e0f 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -18,6 +18,7 @@
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
+l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
diff --git a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
index 772db95d7f34..c394602bda19 100644
--- a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
+++ b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
@@ -1,6 +1,9 @@
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 portmap_1=1:100                                       
 portmap_2=5:100                                       
 portmap_3=9:100                                       
diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
index e7272ea9d12a..02d785aa4cb0 100644
--- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
@@ -1,3 +1,6 @@
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
index f022435dc6c1..5155fdcfe5ac 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
@@ -17,6 +17,9 @@ l3_alpm_enable=2
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
index 43215f78eac3..3cf6f6f62b2b 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
@@ -17,6 +17,9 @@ l3_alpm_enable=2
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
+# Disable bcmALPMDH (ALPM distributed hitbit) thread that is used for debug only
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
index e5a0e2fecd06..9588fb59d6d8 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
@@ -1,3 +1,6 @@
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm b/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
index ed5c1b6d9b19..00af55358fbd 100644
--- a/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/th-seastone-dx010-config-flex-all.bcm
@@ -19,6 +19,9 @@ ipv6_lpm_128b_enable=1
 #Use MMU lossy configuration
 mmu_lossless=0
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
index ca155cb83041..55b5782d40ed 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/td2-s6000-20x40G-48x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
index 32d86d8474b3..ab5222bda7b7 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/td2-s6000-24x40G-32x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
index af18c034fdd2..ad97f97f94bf 100755
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/td2-s6000-28x40G-16x10G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
index 2626674d67ca..4f68aa896dd8 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm
@@ -10,6 +10,9 @@ ipv6_lpm_128b_enable=1
 l2_mem_entries=32768
 l3_mem_entries=16384
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
index dac4967f8a5f..c7540e2d2a4d 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
@@ -1,4 +1,8 @@
 #TH S6100 64x40
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
index 20234ea9a66c..8506209fb1e8 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
@@ -1,4 +1,8 @@
 #TH S6100 64x40
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index c1101797b021..73d70ce5fdab 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index 17f2d565c26a..1433de4d3b6c 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index 9f33e13cc225..a46ac765bb66 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -4,6 +4,9 @@ dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
 
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 8eebec56caf5..99086929ebc0 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -238,3 +238,4 @@ buf.map.egress_pool1.ingress_pool
 buf.map.egress_pool2.ingress_pool
 sai_adjust_acl_drop_in_rx_drop
 sai_verify_incoming_chksum
+l3_alpm_hit_skip

From 7e8ebaabeeeb9ab466c9ef520ecb95ec2eaa3241 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Mon, 8 Nov 2021 14:54:57 -0800
Subject: [PATCH 0881/1674] caclmgrd: support packet mark in DHCP chain (#9191)

* caclmgrd:support packet mark in DCHP chain
---
 src/sonic-host-services/scripts/caclmgrd      |  63 +++++--
 .../tests/caclmgrd/caclmgrd_dhcp_test.py      |   5 +-
 .../tests/caclmgrd/test_dhcp_vectors.py       | 165 +++++++++++++++++-
 3 files changed, 215 insertions(+), 18 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 8be1f8d3d35b..083975889eb8 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -359,16 +359,20 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
         return chain_list
 
-    def dhcp_acl_rule(self, iptable_ns_cmd_prefix, op, intf):
+    def dhcp_acl_rule(self, iptable_ns_cmd_prefix, op, intf, mark):
         '''
             sample: iptables --insert/delete/check DHCP -m physdev --physdev-in Ethernet4 -j DROP
+            sample: iptables --insert/delete/check DHCP -m mark --mark 0x67004 -j DROP
         '''
-        return iptable_ns_cmd_prefix + 'iptables --{} DHCP -m physdev --physdev-in {} -j DROP'.format(op, intf)
+        if mark is None:
+            return iptable_ns_cmd_prefix + 'iptables --{} DHCP -m physdev --physdev-in {} -j DROP'.format(op, intf)
+        else:
+            return iptable_ns_cmd_prefix + 'iptables --{} DHCP -m mark --mark {} -j DROP'.format(op, mark)
 
-    def update_dhcp_chain(self, op, intf):
+    def update_dhcp_chain(self, op, intf, mark):
         for namespace in list(self.config_db_map.keys()):
-            check_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "check", intf)
-            update_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], op, intf)
+            check_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "check", intf, mark)
+            update_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], op, intf, mark)
 
             execute = 0
             ret = subprocess.call(check_cmd, shell=True) # ret==0 indicates the rule exists
@@ -382,7 +386,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 subprocess.call(update_cmd, shell=True)
                 self.log_info("Update DHCP chain: {}".format(update_cmd))
 
-    def update_dhcp_acl(self, key, op, data):
+    def update_dhcp_acl(self, key, op, data, mark):
         if "state" not in data:
             self.log_warning("Unexpected update in MUX_CABLE_TABLE")
             return
@@ -391,16 +395,33 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         state = data["state"]
 
         if state == "active":
-            self.update_dhcp_chain("delete", intf)
+            self.update_dhcp_chain("delete", intf, mark)
         elif state == "standby":
-            self.update_dhcp_chain("insert", intf)
+            self.update_dhcp_chain("insert", intf, mark)
         elif state == "unknown":
-            self.update_dhcp_chain("delete", intf)
+            self.update_dhcp_chain("delete", intf, mark)
         elif state == "error":
             self.log_warning("Cable state shows error")
         else:
             self.log_warning("Unexpected cable state")
 
+    def update_dhcp_acl_for_mark_change(self, key, pre_mark, cur_mark):
+        for namespace in list(self.config_db_map.keys()):
+            check_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "check", key, pre_mark)
+
+            ret = subprocess.call(check_cmd, shell=True) # ret==0 indicates the rule exists
+
+            '''update only when the rule with  pre_mark exists'''
+            if ret == 0:
+                delete_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "delete", key, pre_mark)
+                insert_cmd = self.dhcp_acl_rule(self.iptables_cmd_ns_prefix[namespace], "insert", key, cur_mark)
+
+                subprocess.call(delete_cmd, shell=True)
+                self.log_info("Update DHCP chain: {}".format(delete_cmd))
+                subprocess.call(insert_cmd, shell=True)
+                self.log_info("Update DHCP chain: {}".format(insert_cmd))
+
+
     def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
         """
         Retrieves current ACL tables and rules from Config DB, translates
@@ -708,16 +729,22 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         # Set up STATE_DB connector to monitor the change in MUX_CABLE_TABLE
         state_db_connector = None
         subscribe_mux_cable = None
+        subscribe_dhcp_packet_mark = None
         state_db_id = swsscommon.SonicDBConfig.getDbId("STATE_DB")
+        dhcp_packet_mark_tbl = {}
 
         if self.DualToR:
             self.log_info("Dual ToR mode")
 
             # set up state_db connector
             state_db_connector = swsscommon.DBConnector("STATE_DB", 0)
+
             subscribe_mux_cable = swsscommon.SubscriberStateTable(state_db_connector, self.MUX_CABLE_TABLE)
             sel.addSelectable(subscribe_mux_cable)
 
+            subscribe_dhcp_packet_mark = swsscommon.SubscriberStateTable(state_db_connector, "DHCP_PACKET_MARK")
+            sel.addSelectable(subscribe_dhcp_packet_mark)
+
             # create DHCP chain
             for namespace in list(self.config_db_map.keys()):
                 self.setup_dhcp_chain(namespace)
@@ -762,12 +789,28 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
             if db_id == state_db_id:
                 if self.DualToR:
+                    '''dhcp packet mark update'''
+                    while True:
+                        key, op, fvs = subscribe_dhcp_packet_mark.pop()
+                        if not key:
+                            break
+                        self.log_info("dhcp packet mark update : '%s'" % str((key, op, fvs)))
+
+                        '''initial value is None'''
+                        pre_mark = None if key not in dhcp_packet_mark_tbl else dhcp_packet_mark_tbl[key]
+                        cur_mark = None if op == 'DEL' else dict(fvs)['mark']
+                        dhcp_packet_mark_tbl[key] = cur_mark
+                        self.update_dhcp_acl_for_mark_change(key, pre_mark, cur_mark)
+
+                    '''mux cable update'''
                     while True:
                         key, op, fvs = subscribe_mux_cable.pop()
                         if not key:
                             break
                         self.log_info("mux cable update : '%s'" % str((key, op, fvs)))
-                        self.update_dhcp_acl(key, op, dict(fvs))
+
+                        mark = None if key not in dhcp_packet_mark_tbl else dhcp_packet_mark_tbl[key]
+                        self.update_dhcp_acl(key, op, dict(fvs), mark)
                 continue
 
             ctrl_plane_acl_notification = set()
diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
index 4624f11bb97e..4c60870e1abb 100644
--- a/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
+++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
@@ -41,14 +41,15 @@ def test_caclmgrd_dhcp(self, test_name, test_data, fs):
             popen_mock.configure_mock(**popen_attrs)
             mocked_subprocess.Popen.return_value = popen_mock
 
-            call_mock = mock.Mock()
             call_rc = test_data["call_rc"]
             mocked_subprocess.call.return_value = call_rc
 
+            mark = test_data["mark"]
+
             caclmgrd_daemon = caclmgrd.ControlPlaneAclManager("caclmgrd")
             mux_update = test_data["mux_update"]
 
             for key,data in mux_update:
-                caclmgrd_daemon.update_dhcp_acl(key, '', data)
+                caclmgrd_daemon.update_dhcp_acl(key, '', data, mark)
 
             mocked_subprocess.call.assert_has_calls(test_data["expected_subprocess_calls"], any_order=False)
diff --git a/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
index 6a58f761251b..7ebfca22a64b 100644
--- a/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
+++ b/src/sonic-host-services/tests/caclmgrd/test_dhcp_vectors.py
@@ -5,7 +5,7 @@
 """
 CACLMGRD_DHCP_TEST_VECTOR = [
     [
-        "Active_Present",
+        "Active_Present_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -29,10 +29,36 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 0,
+            "mark": None,
         },
     ],
     [
-        "Active_Absent",
+        "Active_Present_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "active"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+                call("iptables --delete DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+            "mark": "0x67004",
+        },
+    ],
+    [
+        "Active_Absent_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -54,10 +80,35 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 1,
+            "mark": None,
         },
     ],
     [
-        "Standby_Present",
+        "Active_Absent_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "active"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+            "mark": "0x67004",
+        },
+    ],
+    [
+        "Standby_Present_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -79,10 +130,35 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 0,
+            "mark": None,
+        },
+    ],
+    [
+        "Standby_Present_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "standby"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+            "mark": "0x67004",
         },
     ],
     [
-        "Standby_Absent",
+        "Standby_Absent_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -106,10 +182,36 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 1,
+            "mark": None,
         },
     ],
     [
-        "Unknown_Present",
+        "Standby_Absent_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "standby"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+                call("iptables --insert DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+            "mark": "0x67004",
+        },
+    ],
+    [
+        "Unknown_Present_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -133,10 +235,36 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 0,
+            "mark": None,
         },
     ],
     [
-        "Uknown_Absent",
+        "Unknown_Present_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "unknown"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+                call("iptables --delete DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+            "mark": "0x67004",
+        },
+    ],
+    [
+        "Uknown_Absent_Interface",
         {
             "config_db": {
                 "DEVICE_METADATA": {
@@ -158,6 +286,31 @@
                 'communicate.return_value': ('output', 'error'),
             },
             "call_rc": 1,
+            "mark": None,
+        },
+    ],
+    [
+        "Uknown_Absent_Mark",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "mux_update": [
+                ("Ethernet4", {"state": "unknown"}),
+            ],
+            "expected_subprocess_calls": [
+                call("iptables --check DHCP -m mark --mark 0x67004 -j DROP", shell=True),
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 1,
+            "mark": "0x67004",
         },
     ],
 ]

From 1cd67bb27c0217b295ce3b8b0c944136eaa6c8a0 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Tue, 9 Nov 2021 14:09:52 -0800
Subject: [PATCH 0882/1674] [202012] update sonic-utilities submodule (#9195)

Submodule update for sonic-utilties

```
48035d75 [202012] [techsupport] Techsupport Error Reporting pending fixes (#1854)
8b2ec09a Fix log_ssd_health hang issue (#1904)
ac9c4254 Fix the option missing in kernel config issue (#1888)
5cc9417a disk_check: Script updated to run good in 201811 & 201911 (#1747)
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 876808923972..48035d75898f 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 876808923972de537426405f87d4439c46e99614
+Subproject commit 48035d75898f4e6833aabca5f1b06672a2d7d59e

From c15bae7c849a125a80916265cd8a617c0ccbe0ff Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 10 Nov 2021 06:52:26 +0800
Subject: [PATCH 0883/1674] [ci/build]: Upgrade SONiC package versions (#9128)

---
 .../versions-deb-buster                       |    6 +-
 .../build-sonic-slave-buster/versions-git     |    6 +-
 .../build-sonic-slave-buster/versions-py3     |   11 +-
 .../versions-py3-all-arm64                    |    3 +-
 .../versions-py3-all-armhf                    |    3 +-
 .../build-sonic-slave-buster/versions-web     |    4 +-
 .../build-sonic-slave-stretch/versions-py2    |   13 +-
 .../build-sonic-slave-stretch/versions-web    |    4 +-
 files/build/versions/default/versions-docker  |   13 +-
 files/build/versions/default/versions-git     |   10 +-
 files/build/versions/default/versions-web     |   12 +-
 .../versions-deb-buster-arm64                 |    6 -
 .../versions-deb-buster-armhf                 |    6 -
 .../docker-config-engine-buster/versions-py3  |    2 +-
 .../docker-dhcp-relay/versions-deb-buster     |    8 +-
 .../versions-deb-buster-arm64                 |    1 -
 .../versions-deb-buster-armhf                 |    1 -
 .../dockers/docker-ptf/versions-deb-stretch   |    4 +-
 .../versions/dockers/docker-ptf/versions-py2  |    2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |    9 +-
 .../dockers/docker-syncd-bfn-rpc/versions-py2 |    2 +-
 .../docker-syncd-brcm-rpc/versions-py2        |    2 +-
 .../docker-syncd-brcm/versions-deb-buster     |    2 +-
 .../docker-syncd-centec-rpc/versions-py2      |    2 +-
 .../versions-deb-buster-arm64                 |    1 -
 .../docker-syncd-invm/versions-deb-buster     |    4 +-
 .../docker-syncd-mlnx-rpc/versions-py2        |    2 +-
 .../versions-deb-buster-armhf                 |    3 +-
 .../docker-syncd-nephos/versions-deb-stretch  |    3 +-
 .../versions-deb-buster-arm64                 | 1547 ---------------
 .../versions-py2-all-arm64                    |   92 -
 .../versions-py3-all-arm64                    |   70 -
 .../versions-deb-buster-armhf                 | 1662 -----------------
 .../versions-py2-all-armhf                    |   92 -
 .../versions-py3-all-armhf                    |   70 -
 .../versions-deb-buster-arm64                 |   55 +
 .../versions-deb-buster-armhf                 |  171 ++
 .../sonic-slave-buster/versions-py3-all-arm64 |    1 +
 .../sonic-slave-buster/versions-py3-all-armhf |    1 +
 .../versions-deb-stretch-arm64                | 1409 --------------
 .../versions-py2-all-arm64                    |   79 -
 .../versions-py3-all-arm64                    |   37 -
 .../versions-deb-stretch-armhf                | 1415 --------------
 .../versions-py2-all-armhf                    |   79 -
 .../versions-py3-all-armhf                    |   37 -
 .../sonic-slave-stretch/versions-deb-stretch  |   40 +-
 .../versions-deb-stretch-arm64                |   33 +
 .../versions-deb-stretch-armhf                |   39 +
 .../versions-py3-all-arm64                    |    1 +
 .../versions-py3-all-armhf                    |    1 +
 .../versions/host-image/versions-deb-buster   |    6 +-
 .../host-image/versions-deb-buster-arm64      |    3 +
 .../host-image/versions-deb-buster-armhf      |    3 +
 files/build/versions/host-image/versions-py3  |    4 +-
 54 files changed, 410 insertions(+), 6682 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 2fdb9a0e9a97..8d91b11db98f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,8 +1,8 @@
 applibs==1.mlnx.4.4.3326
 applibs-dev==1.mlnx.4.4.3326
 bfnplatform==1.0.0
-innovium-sai==0.107.1
-innovium-sai-headers==0.107.1
+innovium-sai==0.107.2
+innovium-sai-headers==0.107.2
 iproute2-dev==1.mlnx.4.4.3326
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.17.0-106
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-5
+libsaibcm==4.3.5.1-6
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index c87b694dde0d..bcd457588e7d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==669b189583e6ceaa2f318a585638cf234aece11a
+https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==4985ed2e4ddeb9f9529e4c8195fb594309c5f1a8
+https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==1789bc497438cff6a14dcb8e41eefb9166f812ce
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==51161829bf022786f56f062edcaf56a9b9a8f394
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 4585f9279f67..c5cd3bebf2ce 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,5 +1,14 @@
+charset-normalizer==2.0.7
+click==7.0
 ijson==2.6.1
 ipaddress==1.0.23
+jsondiff==1.3.0
+jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
-xmltodict==0.12.0
\ No newline at end of file
+netifaces==0.11.0
+psutil==5.8.0
+python-arptable==0.0.2
+tabulate==0.8.9
+xmltodict==0.12.0
+zipp==1.2.0
\ No newline at end of file
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
index 27431cf6ad1c..d4b8a90ceb3c 100644
--- 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,3 @@
 bitarray==1.5.3
-lxml==4.6.3
\ No newline at end of file
+lxml==4.6.3
+requests==2.26.0
\ No newline at end of file
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
index 27431cf6ad1c..d4b8a90ceb3c 100644
--- 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,3 @@
 bitarray==1.5.3
-lxml==4.6.3
\ No newline at end of file
+lxml==4.6.3
+requests==2.26.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index c94cdbe6997e..952515f7476d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index 70ef1f2f0036..33cd7719830a 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,4 +1,15 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+future==0.18.2
+importlib-resources==3.3.1
 natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.6
+pyang==2.5.0
+pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
-thrift==0.11.0
\ No newline at end of file
+scandir==1.10.0
+singledispatch==3.7.0
+thrift==0.11.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 5457aaf3350c..a296fe4a1fd1 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=M%2FAiNWLGFMMzLHGJBPpZ%2B18JTYcOFPgHYtKLhkvO0r4%3D&se=2035-06-27T06%3A30%3A28Z&sp=r==aa93af48e872bf250fbf2a5041fbb685
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-5_amd64.deb?sv=2015-04-05&sr=b&sig=TpNMP8d%2BuTseukC%2BbiqS1JAsw0mKNCF1dtJOcSC4ydk%3D&se=2035-06-27T06%3A29%3A36Z&sp=r==540ffa171768473d59cd0961a545d00c
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 12dfbc8ff2d2..d412d85674f7 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -27,12 +27,13 @@ amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
+arm64:arm64v8/debian:buster==sha256:e10bf96e3d994bb35989db5acd0bc38e689fa7e88d44acaea92188a1cbb62efe
+arm64:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
+arm64:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-arm64:multiarch/debian-debootstrap:arm64-buster==sha256:b3f7ca1b43e114f578f6ac091810e006ec93867a27399358d58a4a2359a2c2f5
-arm64:multiarch/debian-debootstrap:arm64-stretch==sha256:4c83750ab31dd3fb4484b2a529c24ddee2c8a54b8cae7d50646bcbc2061dfa24
+armhf:arm32v7/debian:buster==sha256:502cc09268a941c89fd917694127bee670e25885303627116fe30039bc01115b
+armhf:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
+armhf:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
 armhf:docker-base-buster==
-armhf:docker-config-engine-buster==
-armhf:multiarch/debian-debootstrap:armhf-buster==sha256:e658d2466544e05f45e1c7dbe16f67b64364088af5ffb62bfee5c32885629b3b
-armhf:multiarch/debian-debootstrap:armhf-stretch==sha256:fdb4670e016e8989ba7466ef6a269204f81b813d4cfc5f07f178c0fa4db7e673
-multiarch/debian-debootstrap:armhf-buster==
\ No newline at end of file
+armhf:docker-config-engine-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index bff1c448d06f..f6625e8b0c2f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,8 +1,8 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7a6ff9824d74a90f7d9a6811b00a35598c8cf3ef
-https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==266129cba38431d1ee2278d6d9790168c0762909
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==669b189583e6ceaa2f318a585638cf234aece11a
+https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==4985ed2e4ddeb9f9529e4c8195fb594309c5f1a8
+https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==1789bc497438cff6a14dcb8e41eefb9166f812ce
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==51161829bf022786f56f062edcaf56a9b9a8f394
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index c3be9fc9c806..9fb67f01f0fc 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -28,10 +28,10 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210805_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==e880e41c58e5024812a20ec28d813cda
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3a66f2e2464ce379359635720d5b199e
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==74a6977fc65cb57dcbd08c6e21d61567
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-4.deb==d67c0001d560077ef76dcaafa043b7c6
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-5.deb==d1b76b7faea901027ac0ce852bce1da0
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
deleted file mode 100644
index f3f3ca500745..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-arm64
+++ /dev/null
@@ -1,6 +0,0 @@
-iproute2==4.20.0-2+deb10u1
-libcap2==1:2.25-2
-libcap2-bin==1:2.25-2
-libelf1==0.176-1.1
-libmnl0==1.0.4-2
-libxtables12==1.8.2-4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
deleted file mode 100644
index f3f3ca500745..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster-armhf
+++ /dev/null
@@ -1,6 +0,0 @@
-iproute2==4.20.0-2+deb10u1
-libcap2==1:2.25-2
-libcap2-bin==1:2.25-2
-libelf1==0.176-1.1
-libmnl0==1.0.4-2
-libxtables12==1.8.2-4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index d99a1040f5f6..63489b3e4d6c 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.10.23
+regex==2021.11.2
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index 00fbdf14288e..cdf15109f48b 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -7,7 +7,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
@@ -15,9 +15,9 @@ libexplain51==1.4.D001-8
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
 libpopt0==1.16-12
 libunwind8==1.2.1-10~deb10u1
 lsof==4.91+dfsg-1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 9007939e262b..62ca4befcc27 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,4 +1,3 @@
-iputils-ping==3:20180629-2+deb10u2
 libexpat1-dev==2.2.6-2+deb10u1
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 9007939e262b..62ca4befcc27 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,4 +1,3 @@
-iputils-ping==3:20180629-2+deb10u2
 libexpat1-dev==2.2.6-2+deb10u1
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index ef2e5c37ba98..e1d314905029 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -12,7 +12,7 @@ cmake==3.7.2-1
 cmake-data==3.7.2-1
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
-cron==3.0pl1-128+deb9u1
+cron==3.0pl1-128+deb9u2
 curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
@@ -61,6 +61,7 @@ libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
 libdpkg-perl==1.18.25
 libedit2==3.1-20160903-3
+libelf1==0.168-1+deb9u1
 liberror-perl==0.17024-1
 libestr0==0.1.10-2
 libevent-2.0-5==2.0.21-stable-3
@@ -227,6 +228,7 @@ tcpdump==4.9.3-1~deb9u2
 telnet==0.17-41
 tmux==2.3-4
 traceroute==1:2.1.0-2
+tzdata==2021a-0+deb9u2
 ucf==3.0036
 unzip==6.0-21+deb9u2
 vim==2:8.0.0197-4+deb9u3
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 52f6df05dee3..47daf3527ae1 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -37,7 +37,7 @@ ptf==0.9.1
 ptyprocess==0.7.0
 pyaml==21.10.1
 pybrctl==0.1.3
-pycparser==2.20
+pycparser==2.21
 pygments==2.5.2
 pylibpcap==0.6.4
 pynacl==1.4.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 2d74a77320af..852a897e9b18 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,17 +5,18 @@ click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.2
-grpcio==1.41.0
+grpcio==1.41.1
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.8.1
+importlib-metadata==4.8.2
+importlib-resources==5.4.0
 inflection==0.5.1
 isodate==0.6.0
 itsdangerous==2.0.1
-jsonschema==4.1.2
+jsonschema==4.2.1
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
-protobuf==3.19.0
+protobuf==3.19.1
 pyrsistent==0.18.0
 python-dateutil==2.6.0
 requests==2.26.0
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
index f2d6dd3c856c..60b9f31f8e4a 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-py2
@@ -1,5 +1,5 @@
 cffi==1.7.0
 nnpy==1.4.2
 ptf==0.9.1
-pycparser==2.20
+pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
index f2d6dd3c856c..60b9f31f8e4a 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-py2
@@ -1,5 +1,5 @@
 cffi==1.7.0
 nnpy==1.4.2
 ptf==0.9.1
-pycparser==2.20
+pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index f9bc1b2fe85e..e67efd8f8c34 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-5
+libsaibcm==4.3.5.1-6
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
index f2d6dd3c856c..60b9f31f8e4a 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
@@ -1,5 +1,5 @@
 cffi==1.7.0
 nnpy==1.4.2
 ptf==0.9.1
-pycparser==2.20
+pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index bfbb176b7c59..ef4e067538ec 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -1,5 +1,4 @@
 dmsetup==2:1.02.155-3
-iputils-ping==3:20180629-2+deb10u2
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 45ce0049167e..2b531b3a2e3e 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.1
-innovium-sai-headers==0.107.1
+innovium-sai==0.107.2
+innovium-sai-headers==0.107.2
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
index f2d6dd3c856c..60b9f31f8e4a 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
@@ -1,5 +1,5 @@
 cffi==1.7.0
 nnpy==1.4.2
 ptf==0.9.1
-pycparser==2.20
+pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 73f1f041edad..0e94738df7f3 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -1,5 +1,4 @@
 dmsetup==2:1.02.155-3
-iputils-ping==3:20180629-2+deb10u2
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
@@ -23,7 +22,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-4
+mrvllibsai==1.7.1-5
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 6f4933de8787..cfe00c3b70ed 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -3,8 +3,9 @@ gdbserver==7.12-6
 libbabeltrace-ctf1==1.5.1-1
 libbabeltrace1==1.5.1-1
 libbsd0==0.8.3-1+deb9u1
-libdw1==0.168-1
+libdw1==0.168-1+deb9u1
 libedit2==3.1-20160903-3
+libelf1==0.168-1+deb9u1
 libglib2.0-0==2.50.3-2+deb9u2
 libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u5
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
deleted file mode 100644
index 39bc9d136849..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-deb-buster-arm64
+++ /dev/null
@@ -1,1547 +0,0 @@
-adwaita-icon-theme==3.30.1-1
-ant==1.10.5-2
-ant-optional==1.10.5-2
-apt-file==3.2.2
-apt-transport-https==1.8.2.3
-apt-utils==1.8.2.3
-arch-test==0.15-2+deb10u1
-asciidoctor==1.5.8-1
-aspell==0.60.7~20110707-6+deb10u1
-aspell-en==2018.04.16-0-1
-at==3.1.23-1
-at-spi2-core==2.30.0-7
-aufs-dkms==4.19+20190211-1
-aufs-tools==1:4.14+20190211-1
-augeas-lenses==1.11.0-3
-augeas-tools==1.11.0-3
-autoconf==2.69-11
-autoconf-archive==20180313-1
-autogen==1:5.18.12-4
-autogen-doc==1:5.18.12-4
-automake==1:1.16.1-4
-automake1.11==1:1.11.6-5
-autopoint==0.19.8.1-9
-autotools-dev==20180224.1
-bash-completion==1:2.8-6
-bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
-binfmt-support==2.2.0-2
-binutils==2.31.1-16
-binutils-aarch64-linux-gnu==2.31.1-16
-binutils-common==2.31.1-16
-bison==2:3.3.2.dfsg-1
-blt==2.5.3+dfsg-4
-bsd-mailx==8.1.2-0.20180807cvs-1
-bsdmainutils==11.1.2+b1
-build-essential==12.6
-byacc==20140715-1+b1
-bzip2==1.0.6-9.2~deb10u1
-bzip2-doc==1.0.6-9.2~deb10u1
-ca-certificates==20200601~deb10u2
-ca-certificates-java==20190405
-cdbs==0.4.159
-cgroupfs-mount==1.4
-check==0.10.0-3+b3
-chrpath==0.16-2+b1
-clang==1:7.0-47
-clang-7==1:7.0.1-8+deb10u2
-cm-super-minimal==0.3.4-14
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cmocka-doc==1.1.3-1
-comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.11-1
-cowbuilder==0.88
-cowdancer==0.88
-cpio==2.12+dfsg-9
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-cppcheck==1.86-1
-cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u2
-dbus==1.12.20-0+deb10u1
-dbus-user-session==1.12.20-0+deb10u1
-dconf-gsettings-backend==0.30.1-2
-dconf-service==0.30.1-2
-dctrl-tools==2.24-3
-debhelper==12.1.1
-debian-keyring==2019.02.25
-debootstrap==1.0.114
-default-jdk-headless==2:1.11-71
-default-jre==2:1.11-71
-default-jre-headless==2:1.11-71
-default-libmysqlclient-dev==1.0.5
-device-tree-compiler==1.4.7-4
-devscripts==2.19.5+deb10u1
-dh-apparmor==2.13.2-10
-dh-autoreconf==19
-dh-exec==0.23.1
-dh-make==2.201802
-dh-python==3.20190308
-dh-strip-nondeterminism==1.1.2-1
-dh-systemd==12.1.1
-dictionaries-common==1.28.1
-diffstat==1.62-1
-dirmngr==2.2.12-1+deb10u1
-distro-info-data==0.41+deb10u4
-dkms==2.6.1-4
-dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
-docker-ce==5:18.09.5~3-0~debian-buster
-docker-ce-cli==5:18.09.5~3-0~debian-buster
-docutils-common==0.14+dfsg-4
-docutils-doc==0.14+dfsg-4
-doxygen==1.8.13-10
-dpatch==2.0.38+nmu1
-dpkg-dev==1.19.7
-dput==1.0.3
-dvipng==1.15-1.1
-dwz==0.12-3
-eatmydata==105-7
-emacsen-common==3.0.4
-equivs==2.2.0
-exim4-base==4.92-8+deb10u6
-exim4-config==4.92-8+deb10u6
-exim4-daemon-light==4.92-8+deb10u6
-expat==2.2.6-2+deb10u1
-exuberant-ctags==1:5.9~svn20110310-12
-fakeroot==1.23-1
-file==1:5.35-4+deb10u2
-flex==2.6.4-6.2
-fontconfig==2.13.1-2
-fontconfig-config==2.13.1-2
-fonts-dejavu-core==2.37-1
-fonts-dejavu-extra==2.37-1
-fonts-droid-fallback==1:6.0.1r16-1.1
-fonts-font-awesome==5.0.10+really4.7.0~dfsg-1
-fonts-glyphicons-halflings==1.009~3.4.1+dfsg-1
-fonts-lato==2.0-2
-fonts-liberation==1:1.07.4-9
-fonts-lmodern==2.004.5-6
-fonts-noto-mono==20181227-1
-fonts-roboto-slab==1.100263+20170512-1
-fonts-texgyre==20180621-3
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gawk==1:4.2.1+dfsg-1
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-gcovr==4.1-2
-gdb==8.2.1-2+b3
-gem2deb==0.43
-gem2deb-test-runner==0.43
-geoip-database==20181108-1
-gettext==0.19.8.1-9
-gettext-base==0.19.8.1-9
-gfortran==4:8.3.0-1
-gfortran-8==8.3.0-6
-ghostscript==9.27~dfsg-2+deb10u4
-gir1.2-atk-1.0==2.30.0-2
-gir1.2-atspi-2.0==2.30.0-7
-gir1.2-freedesktop==1.58.3-2
-gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
-gir1.2-glib-2.0==1.58.3-2
-gir1.2-gtk-3.0==3.24.5-1
-gir1.2-harfbuzz-0.0==2.3.1-1
-gir1.2-packagekitglib-1.0==1.1.12-5
-gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u3
-git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u3
-glib-networking==2.58.0-2+deb10u2
-glib-networking-common==2.58.0-2+deb10u2
-glib-networking-services==2.58.0-2+deb10u2
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gnupg2==2.2.12-1+deb10u1
-googletest==1.8.1-3
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
-graphviz==2.40.1-6+deb10u1
-groff==1.22.4-3+deb10u1
-groff-base==1.22.4-3+deb10u1
-gsettings-desktop-schemas==3.28.1-1
-gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
-gtk-update-icon-cache==3.24.5-1
-guile-2.0-libs==2.0.13+1-5.1
-hicolor-icon-theme==0.17-2
-ibverbs-providers==22.1-1
-icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==63.1-6+deb10u1
-imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
-install-info==6.5.0.dfsg.1-4+b1
-intltool-debian==0.35.0+20060710.5
-iproute2==4.20.0-2+deb10u1
-iptables==1.8.2-4
-iptables-dev==1.8.2-4
-iso-codes==4.2-1
-java-common==0.71
-java-wrappers==0.3
-javahelper==0.72.9
-javascript-common==11
-kernel-wedge==2.99
-kmod==26-1
-krb5-locales==1.17-3+deb10u3
-krb5-multidev==1.17-3+deb10u3
-lcov==1.13-4
-less==487-0.1+b1
-libalgorithm-diff-perl==1.19.03-2
-libalgorithm-diff-xs-perl==0.04-5+b1
-libalgorithm-merge-perl==0.08-3
-libaopalliance-java==20070526-6
-libapache-pom-java==18-1
-libapparmor1==2.13.2-10
-libappstream4==0.12.5-1
-libapt-inst2.0==1.8.2.3
-libapt-pkg-perl==0.1.34+b1
-libarchive-cpio-perl==0.10-1
-libarchive-zip-perl==1.64-1
-libarchive13==3.3.3-4+deb10u1
-libargon2-1==0~20171227-0.2
-libasan5==8.3.0-6
-libasm-java==7.0-1
-libasound2==1.1.8-1
-libasound2-data==1.1.8-1
-libaspell15==0.60.7~20110707-6+deb10u1
-libassuan0==2.5.2-1
-libasync-mergepoint-perl==0.04-2
-libatinject-jsr330-api-java==1.0+ds1-5
-libatk-bridge2.0-0==2.30.0-5
-libatk-bridge2.0-dev==2.30.0-5
-libatk-wrapper-java==0.33.3-22+deb10u1
-libatk-wrapper-java-jni==0.33.3-22+deb10u1
-libatk1.0-0==2.30.0-2
-libatk1.0-data==2.30.0-2
-libatk1.0-dev==2.30.0-2
-libatm1==1:2.5.1-2
-libatm1-dev==1:2.5.1-2
-libatomic1==8.3.0-6
-libatspi2.0-0==2.30.0-7
-libatspi2.0-dev==2.30.0-7
-libaudio2==1.9.4-6
-libaudit-dev==1:2.8.4-3
-libaugeas0==1.11.0-3
-libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.7-4+deb10u1
-libavahi-common-data==0.7-4+deb10u1
-libavahi-common3==0.7-4+deb10u1
-libavalon-framework-java==4.2.0-10
-libb-hooks-endofscope-perl==0.24-1
-libb-hooks-op-check-perl==0.22-1+b1
-libbabeltrace-dev==1.5.6-2+deb10u1
-libbabeltrace1==1.5.6-2+deb10u1
-libbatik-java==1.10-2+deb10u1
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libbinutils==2.31.1-16
-libbison-dev==2:3.3.2.dfsg-1
-libbit-vector-perl==7.4-1+b5
-libblkid-dev==2.33.1-0.1
-libboost-atomic1.71-dev==1.71.0-6~bpo10+1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libboost-chrono1.71-dev==1.71.0-6~bpo10+1
-libboost-chrono1.71.0==1.71.0-6~bpo10+1
-libboost-container1.71-dev==1.71.0-6~bpo10+1
-libboost-container1.71.0==1.71.0-6~bpo10+1
-libboost-context1.71-dev==1.71.0-6~bpo10+1
-libboost-context1.71.0==1.71.0-6~bpo10+1
-libboost-contract1.71-dev==1.71.0-6~bpo10+1
-libboost-contract1.71.0==1.71.0-6~bpo10+1
-libboost-coroutine1.71-dev==1.71.0-6~bpo10+1
-libboost-coroutine1.71.0==1.71.0-6~bpo10+1
-libboost-date-time1.71-dev==1.71.0-6~bpo10+1
-libboost-date-time1.71.0==1.71.0-6~bpo10+1
-libboost-fiber1.71-dev==1.71.0-6~bpo10+1
-libboost-fiber1.71.0==1.71.0-6~bpo10+1
-libboost-filesystem1.71-dev==1.71.0-6~bpo10+1
-libboost-filesystem1.71.0==1.71.0-6~bpo10+1
-libboost-graph-parallel1.71-dev==1.71.0-6~bpo10+1
-libboost-graph-parallel1.71.0==1.71.0-6~bpo10+1
-libboost-log1.71-dev==1.71.0-6~bpo10+1
-libboost-log1.71.0==1.71.0-6~bpo10+1
-libboost-mpi1.71.0==1.71.0-6~bpo10+1
-libboost-program-options1.71-dev==1.71.0-6~bpo10+1
-libboost-program-options1.71.0==1.71.0-6~bpo10+1
-libboost-regex1.71-dev==1.71.0-6~bpo10+1
-libboost-regex1.71.0==1.71.0-6~bpo10+1
-libboost-serialization1.71-dev==1.71.0-6~bpo10+1
-libboost-serialization1.71.0==1.71.0-6~bpo10+1
-libboost-system1.71-dev==1.71.0-6~bpo10+1
-libboost-system1.71.0==1.71.0-6~bpo10+1
-libboost-test1.71-dev==1.71.0-6~bpo10+1
-libboost-test1.71.0==1.71.0-6~bpo10+1
-libboost-thread1.71-dev==1.71.0-6~bpo10+1
-libboost-thread1.71.0==1.71.0-6~bpo10+1
-libboost1.71-dev==1.71.0-6~bpo10+1
-libbrotli1==1.0.7-2+deb10u1
-libbsd-dev==0.9.1-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
-libbsh-java==2.0b4-19
-libbz2-dev==1.0.6-9.2~deb10u1
-libc-ares-dev==1.14.0-1+deb10u1
-libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10
-libc6-dbg==2.28-10
-libc6-dev==2.28-10
-libcaf-openmpi-3==2.4.0-2
-libcairo-gobject2==1.16.0-4+deb10u1
-libcairo-script-interpreter2==1.16.0-4+deb10u1
-libcairo2==1.16.0-4+deb10u1
-libcairo2-dev==1.16.0-4+deb10u1
-libcap-dev==1:2.25-2
-libcap-ng-dev==0.7.9-2
-libcap2==1:2.25-2
-libcap2-bin==1:2.25-2
-libcapture-tiny-perl==0.48-1
-libcarp-clan-perl==6.07-1
-libcc1-0==8.3.0-6
-libcdi-api-java==1.2-2
-libcdt5==2.40.1-6+deb10u1
-libcgi-fast-perl==1:2.13-1
-libcgi-pm-perl==4.40-1
-libcglib-java==3.2.10-1
-libcgraph6==2.40.1-6+deb10u1
-libclang-common-7-dev==1:7.0.1-8+deb10u2
-libclang1-6.0==1:6.0.1-10
-libclang1-7==1:7.0.1-8+deb10u2
-libclass-accessor-perl==0.51-1
-libclass-inspector-perl==1.32-1
-libclass-method-modifiers-perl==2.12-1
-libclass-xsaccessor-perl==1.19-3+b2
-libclone-perl==0.41-1+b1
-libcmocka-dev==1.1.3-1
-libcmocka0==1.1.3-1
-libcoarrays-dev==2.4.0-2
-libcoarrays-openmpi-dev==2.4.0-2
-libcolord2==1.4.3-4
-libcommon-sense-perl==3.74-2+b7
-libcommons-beanutils-java==1.9.3-1
-libcommons-cli-java==1.4-1
-libcommons-codec-java==1.11-1
-libcommons-collections3-java==3.2.2-2
-libcommons-compress-java==1.18-2+deb10u1
-libcommons-configuration-java==1.10-5
-libcommons-digester-java==1.8.1-5
-libcommons-io-java==2.6-2+deb10u1
-libcommons-lang-java==2.6-8
-libcommons-lang3-java==3.8-2
-libcommons-logging-java==1.2-2
-libcommons-parent-java==43-1
-libcommons-validator-java==1:1.6-2
-libconst-fast-perl==0.014-1
-libcontextual-return-perl==0.004014-2
-libconvert-binhex-perl==1.125-1
-libcroco3==0.6.12-3
-libcryptsetup12==2:2.1.0-5+deb10u2
-libcups2==2.2.10-6+deb10u4
-libcupsfilters1==1.21.6-5
-libcupsimage2==2.2.10-6+deb10u4
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl3-nss==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
-libcurl4-nss-dev==7.64.0-4+deb10u2
-libdaemon-dev==0.14-7
-libdaemon0==0.14-7
-libdata-dump-perl==1.23-1
-libdata-optlist-perl==0.110-1
-libdatrie1==0.2.12-2
-libdb-dev==5.3.1+nmu1
-libdb5.3-dev==5.3.28+dfsg1-0.5
-libdbi1==0.9.0-5
-libdbus-1-3==1.12.20-0+deb10u1
-libdbus-1-dev==1.12.20-0+deb10u1
-libdconf1==0.30.1-2
-libde265-0==1.0.3-1+b1
-libdevel-callchecker-perl==0.008-1
-libdevel-globaldestruction-perl==0.14-1
-libdevmapper1.02.1==2:1.02.155-3
-libdigest-bubblebabble-perl==0.02-2
-libdigest-hmac-perl==1.03+dfsg-2
-libdistro-info-perl==0.21
-libdjvulibre-text==3.5.27.1-10
-libdjvulibre21==3.5.27.1-10
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdom4j-java==2.1.1-2
-libdouble-conversion1==3.1.0-3
-libdoxia-core-java==1.7-2
-libdoxia-java==1.7-2
-libdoxia-sitetools-java==1.7.5-1
-libdpkg-perl==1.19.7
-libdrm-amdgpu1==2.4.97-1
-libdrm-common==2.4.97-1
-libdrm-dev==2.4.97-1
-libdrm-etnaviv1==2.4.97-1
-libdrm-freedreno1==2.4.97-1
-libdrm-nouveau2==2.4.97-1
-libdrm-radeon1==2.4.97-1
-libdrm-tegra0==2.4.97-1
-libdrm2==2.4.97-1
-libdw-dev==0.176-1.1
-libdw1==0.176-1.1
-libdynaloader-functions-perl==0.003-1
-libeatmydata1==105-7
-libedit-dev==3.1-20181209-1
-libedit2==3.1-20181209-1
-libegl-mesa0==18.3.6-2+deb10u1
-libegl1==1.1.0-1
-libegl1-mesa-dev==18.3.6-2+deb10u1
-libel-api-java==3.0.0-2+deb10u1
-libelf-dev==0.176-1.1
-libelf1==0.176-1.1
-libemail-valid-perl==1.202-1
-libencode-locale-perl==1.05-1
-libepoxy-dev==1.5.3-0.1
-libepoxy0==1.5.3-0.1
-liberror-perl==0.17027-2
-libestr0==0.1.10-2.1
-libevdev2==1.6.0+dfsg-1
-libevent-2.1-6==2.1.8-stable-4
-libevent-core-2.1-6==2.1.8-stable-4
-libevent-dev==2.1.8-stable-4
-libevent-extra-2.1-6==2.1.8-stable-4
-libevent-openssl-2.1-6==2.1.8-stable-4
-libevent-pthreads-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
-libexplain-dev==1.4.D001-8
-libexplain51==1.4.D001-8
-libexporter-tiny-perl==1.002001-1
-libfakeroot==1.23-1
-libfastjson4==0.99.8-2
-libfcgi-perl==0.78-2+b3
-libffi-dev==3.2.1-9
-libfftw3-double3==3.3.8-2
-libfile-basedir-perl==0.08-1
-libfile-chdir-perl==0.1008-1
-libfile-desktopentry-perl==0.22-1
-libfile-fcntllock-perl==0.22-3+b5
-libfile-homedir-perl==1.004-1
-libfile-listing-perl==6.04-1
-libfile-mimeinfo-perl==0.29-1
-libfile-stripnondeterminism-perl==1.1.2-1
-libfile-which-perl==1.23-1
-libfl-dev==2.6.4-6.2
-libfl2==2.6.4-6.2
-libfont-afm-perl==1.20-2
-libfontbox2-java==2.0.13-2
-libfontconfig1==2.13.1-2
-libfontconfig1-dev==2.13.1-2
-libfontenc1==1:1.1.3-1+b2
-libfop-java==1:2.3-2
-libfreetype6==2.9.1-3+deb10u2
-libfreetype6-dev==2.9.1-3+deb10u2
-libfribidi-dev==1.0.5-3.1+deb10u1
-libfribidi0==1.0.5-3.1+deb10u1
-libfstrm0==0.4.0-1
-libfuture-perl==0.39-1
-libgail-common==2.24.32-3
-libgail18==2.24.32-3
-libgbm1==18.3.6-2+deb10u1
-libgc1c2==1:7.6.4-0.4
-libgcc-8-dev==8.3.0-6
-libgd-perl==2.71-2
-libgd3==2.2.5-5.2
-libgdbm-compat4==1.18.1-4
-libgdbm6==1.18.1-4
-libgdk-pixbuf2.0-0==2.38.1+dfsg-1
-libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
-libgdk-pixbuf2.0-common==2.38.1+dfsg-1
-libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
-libgeoip1==1.6.12-1
-libgeronimo-annotation-1.3-spec-java==1.0-1
-libgeronimo-interceptor-3.0-spec-java==1.0.1-4
-libgetopt-long-descriptive-perl==0.103-2
-libgfortran-8-dev==8.3.0-6
-libgfortran5==8.3.0-6
-libgif7==5.1.4-3
-libgirepository-1.0-1==1.58.3-2
-libgit-wrapper-perl==0.048-1
-libgitlab-api-v4-perl==0.16-1
-libgl1==1.1.0-1
-libgl1-mesa-dev==18.3.6-2+deb10u1
-libgl1-mesa-dri==18.3.6-2+deb10u1
-libglapi-mesa==18.3.6-2+deb10u1
-libgles1==1.1.0-1
-libgles2==1.1.0-1
-libglib2.0-0==2.58.3-2+deb10u3
-libglib2.0-bin==2.58.3-2+deb10u3
-libglib2.0-data==2.58.3-2+deb10u3
-libglib2.0-dev==2.58.3-2+deb10u3
-libglib2.0-dev-bin==2.58.3-2+deb10u3
-libglu1-mesa==9.0.0-2.1+b3
-libglu1-mesa-dev==9.0.0-2.1+b3
-libglvnd-core-dev==1.1.0-1
-libglvnd-dev==1.1.0-1
-libglvnd0==1.1.0-1
-libglx-mesa0==18.3.6-2+deb10u1
-libglx0==1.1.0-1
-libgmp-dev==2:6.1.2+dfsg-4
-libgmpxx4ldbl==2:6.1.2+dfsg-4
-libgnutls-dane0==3.6.7-4+deb10u7
-libgnutls-openssl27==3.6.7-4+deb10u7
-libgnutls28-dev==3.6.7-4+deb10u7
-libgnutlsxx28==3.6.7-4+deb10u7
-libgomp1==8.3.0-6
-libgoogle-perftools4==2.7-1
-libgpgme11==1.12.0-6
-libgpm2==1.20.7-5
-libgraphite2-3==1.3.13-7
-libgraphite2-dev==1.3.13-7
-libgs9==9.27~dfsg-2+deb10u4
-libgs9-common==9.27~dfsg-2+deb10u4
-libgssapi-krb5-2==1.17-3+deb10u3
-libgssrpc4==1.17-3+deb10u3
-libgstreamer1.0-0==1.14.4-1
-libgtest-dev==1.8.1-3
-libgtk-3-0==3.24.5-1
-libgtk-3-bin==3.24.5-1
-libgtk-3-common==3.24.5-1
-libgtk-3-dev==3.24.5-1
-libgtk2.0-0==2.24.32-3
-libgtk2.0-bin==2.24.32-3
-libgtk2.0-common==2.24.32-3
-libgts-0.7-5==0.7.6+darcs121130-4
-libgts-bin==0.7.6+darcs121130-4
-libguava-java==19.0-1
-libgudev-1.0-0==232-2
-libguice-java==4.2.1-1
-libgvc6==2.40.1-6+deb10u1
-libgvpr2==2.40.1-6+deb10u1
-libharfbuzz-dev==2.3.1-1
-libharfbuzz-gobject0==2.3.1-1
-libharfbuzz-icu0==2.3.1-1
-libharfbuzz0b==2.3.1-1
-libhawtjni-runtime-java==1.16-1
-libheif1==1.3.2-2~deb10u1
-libhtml-form-perl==6.03-1
-libhtml-format-perl==2.12-1
-libhtml-parser-perl==3.72-3+b3
-libhtml-tagset-perl==3.20-3
-libhtml-tree-perl==5.07-2
-libhttp-cookies-perl==6.04-1
-libhttp-daemon-perl==6.01-3
-libhttp-date-perl==6.02-1
-libhttp-message-perl==6.18-1
-libhttp-negotiate-perl==6.01-1
-libhttp-tiny-multipart-perl==0.08-1
-libhttpclient-java==4.5.7-1+deb10u1
-libhttpcore-java==4.4.11-1
-libhwloc-dev==1.11.12-3
-libhwloc-plugins==1.11.12-3
-libhwloc5==1.11.12-3
-libiberty-dev==20190122-1
-libibverbs-dev==22.1-1
-libibverbs1==22.1-1
-libice-dev==2:1.0.9-2
-libice6==2:1.0.9-2
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
-libidn11==1.33-2.2
-libidn2-dev==2.0.5-1+deb10u1
-libijs-0.35==0.35-14
-libilmbase23==2.2.1-2
-libimagequant0==2.12.2-1.1
-libimport-into-perl==1.002005-1
-libinput-bin==1.12.6-2+deb10u1
-libinput10==1.12.6-2+deb10u1
-libio-async-perl==0.72-1
-libio-html-perl==1.001-1
-libio-prompter-perl==0.004015-1
-libio-pty-perl==1:1.08-1.1+b5
-libio-sessiondata-perl==1.03-1
-libio-socket-ssl-perl==2.060-3
-libio-string-perl==1.08-3
-libio-stringy-perl==2.111-3
-libip4tc-dev==1.8.2-4
-libip4tc0==1.8.2-4
-libip6tc-dev==1.8.2-4
-libip6tc0==1.8.2-4
-libipc-run-perl==20180523.0-1
-libipc-system-simple-perl==1.25-4
-libiptc-dev==1.8.2-4
-libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisl19==0.20-2
-libitext1-java==1.4-7
-libitm1==8.3.0-6
-libjansi-java==1.17.1-1
-libjansi-native-java==1.8-1
-libjansson-dev==2.12-1
-libjansson4==2.12-1
-libjaxen-java==1.1.6-4
-libjaxp1.3-java==1.3.05-5
-libjbig0==2.1-3.1+b2
-libjbig2dec0==0.16-1
-libjemalloc-dev==5.1.0-3
-libjemalloc2==5.1.0-3
-libjetty9-java==9.4.16-0+deb10u1
-libjpeg62-turbo==1:1.5.2-2+deb10u1
-libjs-bootstrap==3.4.1+dfsg-1
-libjs-jquery==3.3.1~dfsg-3+deb10u1
-libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
-libjs-jquery-isonscreen==1.2.0-1
-libjs-jquery-metadata==12-1.1
-libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
-libjs-jquery-throttle-debounce==1.1+dfsg.1-1
-libjs-modernizr==2.6.2+ds1-3
-libjs-sphinxdoc==1.8.4-1
-libjs-underscore==1.9.1~dfsg-1+deb10u1
-libjson-c-dev==0.12.1+ds-2+deb10u1
-libjson-c3==0.12.1+ds-2+deb10u1
-libjson-glib-1.0-0==1.4.4-2
-libjson-glib-1.0-common==1.4.4-2
-libjson-perl==4.02000-1
-libjson-xs-perl==3.040-1+b1
-libjsoncpp1==1.7.4-3
-libjsp-api-java==2.3.4-2+deb10u1
-libjsr305-java==0.1~+svn49-11
-libjtidy-java==7+svn20110807-5
-libjudy-dev==1.0.5-5
-libjudydebian1==1.0.5-5
-libjxr-tools==1.1-6+b1
-libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u3
-libkadm5clnt-mit11==1.17-3+deb10u3
-libkadm5srv-mit11==1.17-3+deb10u3
-libkdb5-9==1.17-3+deb10u3
-libkeyutils1==1.6-6
-libkmod2==26-1
-libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u3
-libkrb5-dev==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
-libksba8==1.3.5-2
-liblab-gamut1==2.40.1-6+deb10u1
-liblcms2-2==2.9-3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-libldap2-dev==2.4.47+dfsg-3+deb10u6
-liblist-compare-perl==0.53-1
-liblist-moreutils-perl==0.416-1+b4
-libllvm6.0==1:6.0.1-10
-libllvm7==1:7.0.1-8+deb10u2
-liblmdb0==0.9.22-1
-liblocale-gettext-perl==1.07-3+b4
-liblockfile-bin==1.14-1.1
-liblockfile1==1.14-1.1
-liblog-any-adapter-screen-perl==0.140-1
-liblog-any-perl==1.707-1
-liblog4j1.2-java==1.2.17-8+deb10u1
-liblognorm5==2.0.5-1
-liblqr-1-0==0.4.2-2.1
-liblsan0==8.3.0-6
-libltdl-dev==2.4.6-9
-libltdl7==2.4.6-9
-liblua5.1-0==5.1.5-8.1+b2
-liblua5.1-0-dev==5.1.5-8.1+b2
-liblwp-mediatypes-perl==6.02-1
-liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
-liblzma-dev==5.2.4-1
-liblzo2-2==2.10-0.1
-liblzo2-dev==2.10-0.1
-libmagic-mgc==1:5.35-4+deb10u2
-libmagic1==1:5.35-4+deb10u2
-libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
-libmail-sendmail-perl==0.80-1
-libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.31-0+deb10u1
-libmariadb-dev-compat==1:10.3.31-0+deb10u1
-libmariadb3==1:10.3.31-0+deb10u1
-libmaven-archiver-java==3.2.0-2
-libmaven-clean-plugin-java==3.1.0-1
-libmaven-common-artifact-filters-java==3.0.1-3
-libmaven-compiler-plugin-java==3.8.0-2
-libmaven-filtering-java==3.1.1-1
-libmaven-jar-plugin-java==3.1.1-1
-libmaven-parent-java==31-2
-libmaven-plugin-tools-java==3.6.0-1
-libmaven-reporting-api-java==3.0-1
-libmaven-reporting-exec-java==1.4-2
-libmaven-reporting-impl-java==3.0.0-2
-libmaven-resolver-java==1.3.1-1
-libmaven-resources-plugin-java==3.1.0-1
-libmaven-shared-incremental-java==1.1-3
-libmaven-shared-utils-java==3.3.0-1
-libmaven-site-plugin-java==3.6-3
-libmaven3-core-java==3.6.0-1
-libmime-tools-perl==5.509-1
-libmng1==1.0.10+dfsg-3.1+b5
-libmnl-dev==1.0.4-2
-libmnl0==1.0.4-2
-libmodule-implementation-perl==0.09-1
-libmodule-runtime-perl==0.016-1
-libmoo-perl==2.003004-2
-libmount-dev==2.33.1-0.1
-libmpc3==1.1.0-1
-libmpdec2==2.4.2-2
-libmpfr6==4.0.2-1
-libmtdev1==1.1.5-1+b1
-libnamespace-clean-perl==0.27-1
-libnanomsg-dev==1.1.5+dfsg-1
-libnanomsg5==1.1.5+dfsg-1
-libncurses-dev==6.1+20181013-2+deb10u2
-libncurses5-dev==6.1+20181013-2+deb10u2
-libncurses6==6.1+20181013-2+deb10u2
-libnet-dbus-perl==1.1.0-5+b1
-libnet-dns-perl==1.19-1
-libnet-dns-sec-perl==1.11-1
-libnet-domain-tld-perl==1.75-1
-libnet-http-perl==6.18-1
-libnet-ip-perl==1.26-2
-libnet-libidn-perl==0.12.ds-3+b1
-libnet-smtp-ssl-perl==1.04-1
-libnet-ssleay-perl==1.85-2+b1
-libnetfilter-conntrack-dev==1.0.7-1
-libnetfilter-conntrack3==1.0.7-1
-libnetpbm10==2:10.0-15.3+b2
-libnewt-dev==0.52.20-8
-libnewt0.52==0.52.20-8
-libnfnetlink-dev==1.0.1-3+b1
-libnfnetlink0==1.0.1-3+b1
-libnftables0==0.9.0-2
-libnftnl-dev==1.1.2-2
-libnftnl11==1.1.2-2
-libnghttp2-14==1.36.0-2+deb10u1
-libnl-3-200==3.4.0-1
-libnl-3-dev==3.4.0-1
-libnl-route-3-200==3.4.0-1
-libnl-route-3-dev==3.4.0-1
-libnorm-dev==1.5.8+dfsg2-1
-libnorm1==1.5.8+dfsg2-1
-libnpth0==1.6-1
-libnspr4==2:4.20-1
-libnss-systemd==241-7~deb10u8
-libnss3==2:3.42.1-1+deb10u3
-libnuma-dev==2.0.12-1
-libnuma1==2.0.12-1
-libnumber-compare-perl==0.03-1
-libnumber-range-perl==0.12-1
-libobjc-8-dev==8.3.0-6
-libobjc4==8.3.0-6
-libomp-7-dev==1:7.0.1-8+deb10u2
-libomp5-7==1:7.0.1-8+deb10u2
-libopencsd-dev==0.10.1-1
-libopencsd0==0.10.1-1
-libopenexr23==2.2.1-4.1+deb10u1
-libopengl0==1.1.0-1
-libopenjp2-7==2.3.0-2+deb10u2
-libopenmpi-dev==3.1.3-11
-libopenmpi3==3.1.3-11
-libopts25==1:5.18.12-4
-libopts25-dev==1:5.18.12-4
-liboro-java==2.0.8a-13
-libosp5==1.5.2-13+b1
-libossp-uuid-perl==1.6.2-1.5+b7
-libossp-uuid16==1.6.2-1.5+b7
-libp11-kit-dev==0.23.15-2+deb10u1
-libpackage-stash-perl==0.38-1
-libpackage-stash-xs-perl==0.29-1
-libpackagekit-glib2-18==1.1.12-5
-libpam-cap==1:2.25-2
-libpam-systemd==241-7~deb10u8
-libpam0g-dev==1.3.1-5
-libpango-1.0-0==1.42.4-8~deb10u1
-libpango1.0-dev==1.42.4-8~deb10u1
-libpangocairo-1.0-0==1.42.4-8~deb10u1
-libpangoft2-1.0-0==1.42.4-8~deb10u1
-libpangoxft-1.0-0==1.42.4-8~deb10u1
-libpaper-utils==1.1.28
-libpaper1==1.1.28
-libparams-classify-perl==0.015-1+b1
-libparams-util-perl==1.07-3+b4
-libparams-validate-perl==1.29-1+b1
-libparboiled-java==1.1.7-2
-libparse-debianchangelog-perl==1.2.0-13
-libpath-iterator-rule-perl==1.014-1
-libpath-tiny-perl==0.108-1
-libpathplan4==2.40.1-6+deb10u1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
-libpci-dev==1:3.5.2-1
-libpci3==1:3.5.2-1
-libpciaccess0==0.14-1
-libpcre16-3==2:8.39-12
-libpcre2-16-0==10.32-5
-libpcre3-dev==2:8.39-12
-libpcre32-3==2:8.39-12
-libpcrecpp0v5==2:8.39-12
-libpcsclite1==1.8.24-1
-libpegdown-java==1.6.0-1
-libperl-dev==5.28.1-6+deb10u1
-libperl5.28==5.28.1-6+deb10u1
-libperlio-gzip-perl==0.19-1+b5
-libpgm-5.2-0==5.2.122~dfsg-3
-libpgm-dev==5.2.122~dfsg-3
-libpipeline1==1.5.1-2
-libpixman-1-0==0.36.0-1
-libpixman-1-dev==0.36.0-1
-libplexus-ant-factory-java==1.0~alpha2.1-4
-libplexus-archiver-java==3.6.0-2
-libplexus-bsh-factory-java==1.0~alpha7-4
-libplexus-build-api-java==0.0.7-3
-libplexus-cipher-java==1.7-3
-libplexus-classworlds-java==2.6.0-1
-libplexus-compiler-java==2.8.5-1
-libplexus-component-annotations-java==1.7.1-7
-libplexus-container-default-java==1.7.1-7
-libplexus-container-default1.5-java==1.7.1-7
-libplexus-i18n-java==1.0-beta-10-5
-libplexus-interpolation-java==1.25-1
-libplexus-io-java==3.1.1-1
-libplexus-languages-java==0.9.10-1
-libplexus-sec-dispatcher-java==1.4-4
-libplexus-utils2-java==3.1.1-1
-libplexus-velocity-java==1.2-3
-libpmix2==3.1.2-3
-libpng-dev==1.6.36-6
-libpng16-16==1.6.36-6
-libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-25
-libpolkit-backend-1-0==0.105-25
-libpolkit-gobject-1-0==0.105-25
-libpopt0==1.16-12
-libpotrace0==1.15-1
-libprocps7==2:3.3.15-2
-libprotobuf-c1==1.3.1-1+b1
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
-libprotoc17==3.6.1.3-2
-libproxy1v5==0.4.15-5+deb10u1
-libptexenc1==2018.20181218.49446-1
-libpthread-stubs0-dev==0.4-1
-libpython-all-dev==2.7.16-1
-libpython-dev==2.7.16-1
-libpython-stdlib==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2-stdlib==2.7.16-1
-libpython2.7==2.7.16-2+deb10u1
-libpython2.7-dev==2.7.16-2+deb10u1
-libpython2.7-minimal==2.7.16-2+deb10u1
-libpython2.7-stdlib==2.7.16-2+deb10u1
-libpython3-all-dbg==3.7.3-1
-libpython3-all-dev==3.7.3-1
-libpython3-dbg==3.7.3-1
-libpython3-dev==3.7.3-1
-libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dbg==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
-libqdox-java==1.12.1-3
-libqdox2-java==2.0~M10-1
-libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
-libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
-libqt4-designer==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
-libqt4-help==4:4.8.7+dfsg-18+deb10u1
-libqt4-network==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
-libqt4-script==4:4.8.7+dfsg-18+deb10u1
-libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
-libqt4-svg==4:4.8.7+dfsg-18+deb10u1
-libqt4-test==4:4.8.7+dfsg-18+deb10u1
-libqt4-xml==4:4.8.7+dfsg-18+deb10u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
-libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5gui5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
-libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
-libqt5svg5==5.11.3-2
-libqt5test5==5.11.3+dfsg1-1+deb10u4
-libqt5widgets5==5.11.3+dfsg1-1+deb10u4
-libqt5xml5==5.11.3+dfsg1-1+deb10u4
-libqtcore4==4:4.8.7+dfsg-18+deb10u1
-libqtdbus4==4:4.8.7+dfsg-18+deb10u1
-libqtgui4==4:4.8.7+dfsg-18+deb10u1
-libreadline-dev==7.0-5
-libreadline7==7.0-5
-libreadonly-perl==2.050-1
-libref-util-perl==0.204-1
-libref-util-xs-perl==0.117-1+b1
-libregexp-assemble-perl==0.36-1
-libregexp-pattern-license-perl==3.0.31-4
-librest-0.7-0==0.8.1-1
-librhash0==1.3.8-1
-librole-tiny-perl==2.000006-1
-librrd-dev==1.7.1-2
-librrd8==1.7.1-2
-librsvg2-2==2.44.10-2.1
-librsvg2-common==2.44.10-2.1
-librtmp1==2.4+20151223.gitfa8646d.1-2
-libruby2.5==2.5.5-3+deb10u3
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
-libsaxon-java==1:6.5.5-12
-libselinux1-dev==2.8-1+b1
-libsensors-config==1:3.5.0-3
-libsensors4-dev==1:3.5.0-3
-libsensors5==1:3.5.0-3
-libsepol1-dev==2.8-1
-libsereal-decoder-perl==4.005+ds-1+b1
-libsereal-encoder-perl==4.005+ds-1+b1
-libsereal-perl==4.005-1
-libservlet-api-java==4.0.1-2
-libservlet3.1-java==1:4.0.1-2
-libsigsegv2==2.12-2
-libsisu-guice-java==4.2.0-1
-libsisu-inject-java==0.3.3-1
-libsisu-ioc-java==2.3.0-11
-libsisu-plexus-java==0.3.3-3
-libslang2==2.3.2-2
-libslang2-dev==2.3.2-2
-libslf4j-java==1.7.25-3
-libsm-dev==2:1.2.3-1
-libsm6==2:1.2.3-1
-libsnappy-java==1.1.7.2-1
-libsnappy-jni==1.1.7.2-1
-libsnappy1v5==1.1.7-1
-libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp-dev==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libsoap-lite-perl==1.27-1
-libsodium-dev==1.0.17-1
-libsodium23==1.0.17-1
-libsort-key-perl==1.33-2+b1
-libsort-versions-perl==1.62-1
-libsoup-gnome2.4-1==2.64.2-2
-libsoup2.4-1==2.64.2-2
-libsqlite3-0==3.27.2-3+deb10u1
-libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u7
-libssl1.1==1.1.1d-0+deb10u7
-libstdc++-8-dev==8.3.0-6
-libstemmer0d==0+svn585-1+b2
-libstrictures-perl==2.000005-1
-libstring-copyright-perl==0.003006-1
-libstring-escape-perl==2010.002-2
-libstring-shellquote-perl==1.04-1
-libstruct-dumb-perl==0.09-1
-libsub-exporter-perl==0.987-1
-libsub-exporter-progressive-perl==0.001013-1
-libsub-identify-perl==0.14-1+b1
-libsub-install-perl==0.928-1
-libsub-name-perl==0.21-1+b3
-libsub-quote-perl==2.005001-1
-libsubunit-dev==1.3.0-1
-libsubunit0==1.3.0-1
-libsurefire-java==2.22.1-1
-libswitch-perl==2.17-2
-libsynctex2==2018.20181218.49446-1
-libsys-hostname-long-perl==1.5-1
-libsystemd-dev==241-7~deb10u8
-libtask-weaken-perl==1.06-1
-libtasn1-6-dev==4.13-3
-libtasn1-doc==4.13-3
-libtcl8.6==8.6.9+dfsg-2
-libtcmalloc-minimal4==2.7-1
-libteckit0==2.5.8+ds2-5
-libterm-readkey-perl==2.38-1
-libtest-fatal-perl==0.014-1
-libtest-refcount-perl==0.08-3
-libtexlua52==2018.20181218.49446-1
-libtexlua53==2018.20181218.49446-1
-libtext-charwidth-perl==0.04-7.1+b1
-libtext-glob-perl==0.10-1
-libtext-iconv-perl==1.7-5+b6
-libtext-levenshtein-perl==0.13-1
-libtext-unidecode-perl==1.30-1
-libtext-wrapi18n-perl==0.06-7.1
-libthai-data==0.1.28-2
-libthai0==0.1.28-2
-libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u2
-libtimedate-perl==2.3000-2+deb10u1
-libtinyxml2-6a==7.0.0+dfsg-1
-libtinyxml2-dev==7.0.0+dfsg-1
-libtk8.6==8.6.9-2
-libtool==2.4.6-9
-libtool-bin==2.4.6-9
-libtry-tiny-perl==0.30-1
-libtsan0==8.3.0-6
-libtype-tiny-perl==1.004004-1
-libtype-tiny-xs-perl==0.014-1+b1
-libtypes-serialiser-perl==1.0-1
-libubsan1==8.3.0-6
-libuchardet0==0.0.6-3
-libudev-dev==241-7~deb10u8
-libunbound8==1.9.0-2+deb10u2
-libunicode-utf8-perl==0.62-1
-libunwind-dev==1.2.1-10~deb10u1
-libunwind8==1.2.1-10~deb10u1
-liburi-perl==1.76-1
-libusb-0.1-4==2:0.1.12-32
-libusb-1.0-0==2:1.0.22-2
-libusb-1.0-0-dev==2:1.0.22-2
-libusb-1.0-doc==2:1.0.22-2
-libusb-dev==2:0.1.12-32
-libutempter0==1.1.6-3
-libuv1==1.24.1-1+deb10u1
-libvariable-magic-perl==0.62-1+b1
-libvelocity-tools-java==2.0-7
-libvulkan-dev==1.1.97-2
-libvulkan1==1.1.97-2
-libwacom-bin==0.32-1
-libwacom-common==0.32-1
-libwacom2==0.32-1
-libwagon-file-java==3.3.1-2
-libwagon-http-shaded-java==3.3.1-2
-libwagon-provider-api-java==3.3.1-2
-libwant-perl==0.29-1+b4
-libwayland-bin==1.16.0-1
-libwayland-client0==1.16.0-1
-libwayland-cursor0==1.16.0-1
-libwayland-dev==1.16.0-1
-libwayland-egl1==1.16.0-1
-libwayland-server0==1.16.0-1
-libwebp6==0.6.1-2+deb10u1
-libwebpdemux2==0.6.1-2+deb10u1
-libwebpmux3==0.6.1-2+deb10u1
-libwebsocket-api-java==1.1-1+deb10u1
-libwmf0.2-7==0.2.8.4-14
-libwoff1==1.0.2-1
-libwrap0==7.6.q-28
-libwrap0-dev==7.6.q-28
-libwww-perl==6.36-2
-libwww-robotrules-perl==6.02-1
-libx11-6==2:1.6.7-1+deb10u2
-libx11-data==2:1.6.7-1+deb10u2
-libx11-dev==2:1.6.7-1+deb10u2
-libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.7-1+deb10u2
-libx11-xcb1==2:1.6.7-1+deb10u2
-libx265-165==2.9-4
-libxalan2-java==2.7.2-2
-libxapian30==1.4.11-1
-libxau-dev==1:1.0.8-1+b2
-libxau6==1:1.0.8-1+b2
-libxaw7==2:1.0.13-1+b2
-libxbean-reflect-java==4.5-8
-libxcb-dri2-0==1.13.1-2
-libxcb-dri2-0-dev==1.13.1-2
-libxcb-dri3-0==1.13.1-2
-libxcb-dri3-dev==1.13.1-2
-libxcb-glx0==1.13.1-2
-libxcb-glx0-dev==1.13.1-2
-libxcb-icccm4==0.4.1-1.1
-libxcb-image0==0.4.0-1+b2
-libxcb-keysyms1==0.4.0-1+b2
-libxcb-present-dev==1.13.1-2
-libxcb-present0==1.13.1-2
-libxcb-randr0==1.13.1-2
-libxcb-randr0-dev==1.13.1-2
-libxcb-render-util0==0.3.9-1+b1
-libxcb-render0==1.13.1-2
-libxcb-render0-dev==1.13.1-2
-libxcb-shape0==1.13.1-2
-libxcb-shape0-dev==1.13.1-2
-libxcb-shm0==1.13.1-2
-libxcb-shm0-dev==1.13.1-2
-libxcb-sync-dev==1.13.1-2
-libxcb-sync1==1.13.1-2
-libxcb-util0==0.3.8-3+b2
-libxcb-xfixes0==1.13.1-2
-libxcb-xfixes0-dev==1.13.1-2
-libxcb-xinerama0==1.13.1-2
-libxcb-xkb1==1.13.1-2
-libxcb1==1.13.1-2
-libxcb1-dev==1.13.1-2
-libxcomposite-dev==1:0.4.4-2
-libxcomposite1==1:0.4.4-2
-libxcursor-dev==1:1.1.15-2
-libxcursor1==1:1.1.15-2
-libxdamage-dev==1:1.1.4-3+b3
-libxdamage1==1:1.1.4-3+b3
-libxdelta2==1.1.3-9.2
-libxdmcp-dev==1:1.1.2-3
-libxdmcp6==1:1.1.2-3
-libxdot4==2.40.1-6+deb10u1
-libxerces2-java==2.12.0-1
-libxext-dev==2:1.3.3-1+b2
-libxext6==2:1.3.3-1+b2
-libxfixes-dev==1:5.0.3-1
-libxfixes3==1:5.0.3-1
-libxft-dev==2.3.2-2
-libxft2==2.3.2-2
-libxi-dev==2:1.7.9-1
-libxi6==2:1.7.9-1
-libxinerama-dev==2:1.1.4-2
-libxinerama1==2:1.1.4-2
-libxkbcommon-dev==0.8.2-1
-libxkbcommon-x11-0==0.8.2-1
-libxkbcommon0==0.8.2-1
-libxml-commons-external-java==1.4.01-3
-libxml-commons-resolver1.1-java==1.2-9
-libxml-libxml-perl==2.0134+dfsg-1
-libxml-namespacesupport-perl==1.12-1
-libxml-parser-perl==2.44-4
-libxml-sax-base-perl==1.09-1
-libxml-sax-expat-perl==0.51-1
-libxml-sax-perl==1.00+dfsg-1
-libxml-simple-perl==2.25-1
-libxml-twig-perl==1:3.50-1.1
-libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
-libxml2-utils==2.9.4+dfsg1-7+deb10u2
-libxmlgraphics-commons-java==2.3-1+deb10u1
-libxmlrpc-lite-perl==0.717-2
-libxmu6==2:1.1.2-2+b3
-libxmuu1==2:1.1.2-2+b3
-libxpm4==1:3.5.12-1
-libxrandr-dev==2:1.5.1-1
-libxrandr2==2:1.5.1-1
-libxrender-dev==1:0.9.10-1
-libxrender1==1:0.9.10-1
-libxshmfence-dev==1.3-1
-libxshmfence1==1.3-1
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
-libxss1==1:1.2.3-1
-libxt-dev==1:1.1.5-1+b3
-libxt6==1:1.1.5-1+b3
-libxtables-dev==1.8.2-4
-libxtables12==1.8.2-4
-libxtst-dev==2:1.2.3-1
-libxtst6==2:1.2.3-1
-libxv1==2:1.0.11-1
-libxxf86dga1==2:1.1.4-1+b3
-libxxf86vm-dev==1:1.1.4-1+b2
-libxxf86vm1==1:1.1.4-1+b2
-libxxhash0==0.6.5-2
-libxz-java==1.8-2
-libyaml-0-2==0.2.1-1
-libyaml-dev==0.2.1-1
-libyaml-libyaml-perl==0.76+repack-1
-libzmq3-dev==4.3.1-4+deb10u2
-libzmq5==4.3.1-4+deb10u2
-libzzip-0-13==0.13.62-3.2
-licensecheck==3.0.31-3
-lintian==2.15.0
-linux-kbuild-4.19==4.19.208-1
-linux-libc-dev==4.19.208-1
-linuxdoc-tools==0.9.73-2
-llvm-7==1:7.0.1-8+deb10u2
-llvm-7-dev==1:7.0.1-8+deb10u2
-llvm-7-runtime==1:7.0.1-8+deb10u2
-lmodern==2.004.5-6
-logrotate==3.14.0-4
-lsb-base==10.2019051400
-lsb-release==10.2019051400
-lsof==4.91+dfsg-1
-lua-bitop==1.0.2-5
-lua-bitop-dev==1.0.2-5
-lua-cjson==2.1.0+dfsg-2.1
-lua-cjson-dev==2.1.0+dfsg-2.1
-lynx==2.8.9rel.1-3+deb10u1
-lynx-common==2.8.9rel.1-3+deb10u1
-m4==1.4.18-2
-make==4.2.1-1.2
-man-db==2.8.5-2
-manpages==4.16-2
-manpages-dev==4.16-2
-mariadb-common==1:10.3.31-0+deb10u1
-maven==3.6.0-1
-maven-debian-helper==2.3.2
-maven-repo-helper==1.9.3
-mesa-common-dev==18.3.6-2+deb10u1
-mime-support==3.62
-module-assistant==0.11.10
-mysql-common==5.8+1.0.5
-ncurses-term==6.1+20181013-2+deb10u2
-netbase==5.6
-netpbm==2:10.0-15.3+b2
-nettle-dev==3.4.1-1+deb10u1
-nftables==0.9.0-2
-nodejs==14.18.1-deb-1nodesource1
-ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.12+7-2~deb10u1
-openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
-openjdk-11-jre==11.0.12+7-2~deb10u1
-openjdk-11-jre-headless==11.0.12+7-2~deb10u1
-openmpi-bin==3.1.3-11
-openmpi-common==3.1.3-11
-opensp==1.5.2-13+b1
-openssh-client==1:7.9p1-10+deb10u2
-openssh-server==1:7.9p1-10+deb10u2
-openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u7
-packagekit==1.1.12-5
-packagekit-tools==1.1.12-5
-pango1.0-tools==1.42.4-8~deb10u1
-patch==2.7.6-3+deb10u1
-patchutils==0.3.4-2
-pbuilder==0.230.4
-pbzip2==1.1.9-1+b1
-perl==5.28.1-6+deb10u1
-perl-modules-5.28==5.28.1-6+deb10u1
-perl-openssl-defaults==3
-php-cli==2:7.3+69
-php-codecoverage==6.1.4+dfsg-1
-php-common==2:69
-php-deepcopy==1.8.1-1
-php-doctrine-instantiator==1.1.0-2
-php-file-iterator==2.0.2-1
-php-mbstring==2:7.3+69
-php-pear==1:1.10.6+submodules+notgz-1.1+deb10u2
-php-phar-io-manifest==1.0.3-1
-php-phar-io-version==2.0.1-1
-php-phpdocumentor-reflection-common==1.0.1-1
-php-phpdocumentor-reflection-docblock==4.3.0-1
-php-phpdocumentor-type-resolver==0.4.0-2
-php-phpspec-prophecy==1.8.0-1
-php-text-template==1.2.1-2
-php-timer==2.1.1-1
-php-token-stream==3.0.1-1
-php-tokenizer==1.1.0-1
-php-webmozart-assert==1.4.0-3
-php-xml==2:7.3+69
-php7.3-cli==7.3.29-1~deb10u1
-php7.3-common==7.3.29-1~deb10u1
-php7.3-json==7.3.29-1~deb10u1
-php7.3-mbstring==7.3.29-1~deb10u1
-php7.3-opcache==7.3.29-1~deb10u1
-php7.3-readline==7.3.29-1~deb10u1
-php7.3-xml==7.3.29-1~deb10u1
-phpunit==7.5.6-1
-phpunit-code-unit-reverse-lookup==1.0.1-1
-phpunit-comparator==3.0.2-1
-phpunit-diff==3.0.2-1
-phpunit-environment==4.1.0-1
-phpunit-exporter==3.1.0-2
-phpunit-global-state==2.0.0really2.0.0-2
-phpunit-object-enumerator==3.0.3-3
-phpunit-object-reflector==1.1.1-2
-phpunit-recursion-context==3.0.0-2
-phpunit-resource-operations==2.0.1-1
-phpunit-version==2.0.1-1
-pigz==2.4-1
-pinentry-curses==1.1.0-2
-pkg-config==0.29-6
-pkg-php-tools==1.37
-po-debconf==1.0.21
-policykit-1==0.105-25
-poppler-data==0.4.9-2
-pps-tools==1.0.2-1
-preview-latex-style==11.91-2
-pristine-tar==1.46
-procmail==3.22-26
-procps==2:3.3.15-2
-protobuf-compiler==3.6.1.3-2
-psmisc==23.2-1+deb10u1
-psutils==1.17.dfsg-4
-pylint==1.9.4-1
-python==2.7.16-1
-python-alabaster==0.7.8-1
-python-all==2.7.16-1
-python-all-dev==2.7.16-1
-python-apt-common==1.8.4.3
-python-asn1crypto==0.24.0-1
-python-astroid==1.6.5-3
-python-atomicwrites==1.1.5-2
-python-attr==18.2.0-1
-python-automat==0.6.0-1
-python-babel==2.6.0+dfsg.1-1
-python-babel-localedata==2.6.0+dfsg.1-1
-python-backports.functools-lru-cache==1.5-3
-python-bs4==4.7.1-1
-python-certifi==2018.8.24-1
-python-cffi-backend==1.12.2-1
-python-chardet==3.0.4-3
-python-click==7.0-1
-python-colorama==0.3.7-1
-python-concurrent.futures==3.2.0-2
-python-configparser==3.5.0b2-1
-python-constantly==15.1.0-1
-python-cov-core==1.15.0-2
-python-coverage==4.5.2+dfsg.1-1
-python-crypto==2.6.1-9+b1
-python-cryptography==2.6.1-3+deb10u2
-python-dbus==1.2.8-3
-python-dev==2.7.16-1
-python-docutils==0.14+dfsg-4
-python-egenix-mxdatetime==3.2.9-1
-python-egenix-mxtools==3.2.9-1
-python-entrypoints==0.3-1
-python-enum34==1.1.6-2
-python-funcsigs==1.0.2-4
-python-gi==3.30.4-1
-python-html5lib==1.0.1-1
-python-hyperlink==17.3.1-2
-python-idna==2.6-1
-python-imagesize==1.0.0-1
-python-incremental==16.10.1-3
-python-ipaddr==2.2.0-2
-python-ipaddress==1.0.17-1
-python-isort==4.3.4+ds1-1.1
-python-jinja2==2.10-2
-python-keyring==17.1.1-1
-python-keyrings.alt==3.1.1-1
-python-lazy-object-proxy==1.3.1-1+b1
-python-logilab-common==1.4.2-1
-python-lxml==4.3.2-1+deb10u3
-python-markupsafe==1.1.0-1
-python-mccabe==0.6.1-2
-python-minimal==2.7.16-1
-python-mock==2.0.0-4
-python-more-itertools==4.2.0-1
-python-nose2==0.8.0-1
-python-olefile==0.46-1
-python-openssl==19.0.0-1
-python-packaging==19.0-1
-python-parse==1.6.6-0.1
-python-pathlib2==2.3.3-1
-python-pbr==4.2.0-5
-python-pil==5.4.1-2+deb10u2
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-pluggy==0.8.0-1
-python-py==1.7.0-2
-python-pyasn1==0.4.2-3
-python-pyasn1-modules==0.2.1-0.2
-python-pygments==2.3.1+dfsg-1+deb10u2
-python-pyparsing==2.2.0+dfsg1-2
-python-pytest==3.10.1-2
-python-pytest-cov==2.6.0-1
-python-requests==2.21.0-1
-python-roman==2.0.0-3
-python-scandir==1.9.0-2
-python-secretstorage==2.3.1-2
-python-service-identity==16.0.0-2
-python-setuptools==40.8.0-1
-python-singledispatch==3.4.0.3-2
-python-six==1.12.0-1
-python-soupsieve==1.8+dfsg-1
-python-sphinx==1.8.4-1
-python-stdeb==0.8.5-1
-python-tk==2.7.16-2
-python-twisted==18.9.0-3
-python-twisted-bin==18.9.0-3
-python-twisted-core==18.9.0-3
-python-typing==3.6.6-1
-python-tz==2019.1-1
-python-urllib3==1.24.1-1
-python-webencodings==0.5.1-1
-python-wheel==0.32.3-2
-python-wrapt==1.10.11-1
-python-xdg==0.25-5
-python-zope.interface==4.3.2-1+b2
-python2==2.7.16-1
-python2-dev==2.7.16-1
-python2-minimal==2.7.16-1
-python2.7==2.7.16-2+deb10u1
-python2.7-dev==2.7.16-2+deb10u1
-python2.7-minimal==2.7.16-2+deb10u1
-python3==3.7.3-1
-python3-alabaster==0.7.8-1
-python3-all==3.7.3-1
-python3-all-dbg==3.7.3-1
-python3-all-dev==3.7.3-1
-python3-apt==1.8.4.3
-python3-asn1crypto==0.24.0-1
-python3-atomicwrites==1.1.5-2
-python3-attr==18.2.0-1
-python3-babel==2.6.0+dfsg.1-1
-python3-certifi==2018.8.24-1
-python3-cffi-backend==1.12.2-1
-python3-chardet==3.0.4-3
-python3-cov-core==1.15.0-2
-python3-coverage==4.5.2+dfsg.1-1
-python3-crypto==2.6.1-9+b1
-python3-cryptography==2.6.1-3+deb10u2
-python3-dateutil==2.7.3-3
-python3-dbg==3.7.3-1
-python3-dbus==1.2.8-3
-python3-debian==0.1.35
-python3-dev==3.7.3-1
-python3-distro-info==0.21
-python3-distutils==3.7.3-1
-python3-docutils==0.14+dfsg-4
-python3-entrypoints==0.3-1
-python3-gi==3.30.4-1
-python3-gpg==1.12.0-6
-python3-idna==2.6-1
-python3-imagesize==1.0.0-1
-python3-jinja2==2.10-2
-python3-keyring==17.1.1-1
-python3-keyrings.alt==3.1.1-1
-python3-lib2to3==3.7.3-1
-python3-magic==2:0.4.15-2
-python3-markupsafe==1.1.0-1
-python3-minimal==3.7.3-1
-python3-mock==2.0.0-4
-python3-more-itertools==4.2.0-1
-python3-nose2==0.8.0-1
-python3-olefile==0.46-1
-python3-packaging==19.0-1
-python3-pbr==4.2.0-5
-python3-pil==5.4.1-2+deb10u2
-python3-pkg-resources==40.8.0-1
-python3-pluggy==0.8.0-1
-python3-py==1.7.0-2
-python3-pycurl==7.43.0.2-0.1
-python3-pygments==2.3.1+dfsg-1+deb10u2
-python3-pyparsing==2.2.0+dfsg1-2
-python3-pytest==3.10.1-2
-python3-pytest-cov==2.6.0-1
-python3-requests==2.21.0-1
-python3-roman==2.0.0-3
-python3-secretstorage==2.3.1-2
-python3-setuptools==40.8.0-1
-python3-six==1.12.0-1
-python3-software-properties==0.96.20.2-2
-python3-sphinx==1.8.4-1
-python3-sphinx-rtd-theme==0.4.3+dfsg-1
-python3-tz==2019.1-1
-python3-unidiff==0.5.4-1
-python3-urllib3==1.24.1-1
-python3-wheel==0.32.3-2
-python3-xdg==0.25-5
-python3.7==3.7.3-2+deb10u3
-python3.7-dbg==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
-qdbus==4:4.8.7+dfsg-18+deb10u1
-qt-at-spi==0.4.0-9
-qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
-qt4-qmake==4:4.8.7+dfsg-18+deb10u1
-qt5-default==5.11.3+dfsg1-1+deb10u4
-qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
-qt5-qmake==5.11.3+dfsg1-1+deb10u4
-qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
-qtchooser==66-2
-qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
-qttranslations5-l10n==5.11.3-2
-quilt==0.65-3
-rake==12.3.1-3+deb10u1
-readline-common==7.0-5
-rrdtool==1.7.1-2
-rsync==3.1.3-6
-rsyslog==8.1901.0-1
-ruby==1:2.5.1
-ruby-all-dev==1:2.5.1
-ruby-asciidoctor==1.5.8-1
-ruby-did-you-mean==1.2.1-1
-ruby-minitest==5.11.3-1
-ruby-net-telnet==0.1.1-2
-ruby-power-assert==1.1.1-1
-ruby-setup==3.4.1-9
-ruby-test-unit==3.2.8-1
-ruby-xmlrpc==0.3.0-2
-ruby2.5==2.5.5-3+deb10u3
-ruby2.5-dev==2.5.5-3+deb10u3
-ruby2.5-doc==2.5.5-3+deb10u3
-rubygems-integration==1.11+deb10u1
-sensible-utils==0.0.12
-sgml-base==1.29
-sgml-data==2.0.11
-shared-mime-info==1.10-1
-shellcheck==0.5.0-3
-software-properties-common==0.96.20.2-2
-sphinx-common==1.8.4-1
-sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12+deb10u2
-stgit==0.18-1
-strace==4.26-0.2
-sudo==1.8.27-1+deb10u3
-swig==3.0.12-2
-swig3.0==3.0.12-2
-systemd==241-7~deb10u8
-systemd-sysv==241-7~deb10u8
-t1utils==1.41-3
-tcl==8.6.9+1
-tcl8.6==8.6.9+dfsg-2
-telnet==0.17-41.2
-tex-common==6.11
-tex-gyre==20180621-3
-texi2html==1.82+dfsg1-5
-texinfo==6.5.0.dfsg.1-4+b1
-texlive-base==2018.20190227-2
-texlive-binaries==2018.20181218.49446-1
-texlive-fonts-recommended==2018.20190227-2
-texlive-generic-recommended==2018.20190227-2
-texlive-latex-base==2018.20190227-2
-texlive-latex-extra==2018.20190227-2
-texlive-latex-recommended==2018.20190227-2
-texlive-pictures==2018.20190227-2
-texlive-plain-generic==2018.20190227-2
-tipa==2:1.3-20
-tk==8.6.9+1
-tk8.6==8.6.9-2
-tk8.6-blt2.5==2.5.3+dfsg-4
-ucf==3.0038+nmu1
-unattended-upgrades==1.11.2
-unzip==6.0-23+deb10u2
-uuid-dev==2.33.1-0.1
-velocity==1.7-5+deb10u1
-vim==2:8.1.0875-5
-vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
-wayland-protocols==1.17-1
-wdiff==1.2.2-2+b1
-x11-common==1:7.7+19
-x11-utils==7.7+4
-x11-xserver-utils==7.7+8
-x11proto-composite-dev==1:2018.4-4
-x11proto-core-dev==2018.4-4
-x11proto-damage-dev==1:2018.4-4
-x11proto-dev==2018.4-4
-x11proto-fixes-dev==1:2018.4-4
-x11proto-input-dev==2018.4-4
-x11proto-randr-dev==2018.4-4
-x11proto-record-dev==2018.4-4
-x11proto-xext-dev==2018.4-4
-x11proto-xf86vidmode-dev==2018.4-4
-x11proto-xinerama-dev==2018.4-4
-xauth==1:1.0.10-1
-xbitmaps==1.1.1-2
-xdelta==1.1.3-9.2
-xdelta3==3.0.11-dfsg-1+b1
-xdg-user-dirs==0.17-2
-xdg-utils==1.1.3-1+deb10u1
-xfonts-encodings==1:1.0.4-2
-xfonts-utils==1:7.7+6
-xkb-data==2.26-2
-xml-core==0.18+nmu1
-xorg-sgml-doctools==1:1.11-1
-xsltproc==1.1.32-2.2~deb10u1
-xterm==344-1+deb10u1
-xtrans-dev==1.3.5-1
-xxd==2:8.1.0875-5
-xz-utils==5.2.4-1
-zip==3.0-11+b1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
deleted file mode 100644
index 182ead414d40..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py2-all-arm64
+++ /dev/null
@@ -1,92 +0,0 @@
-alabaster==0.7.8
-asn1crypto==0.24.0
-astroid==1.6.5
-atomicwrites==1.1.5
-attrs==18.2.0
-automat==0.6.0
-babel==2.6.0
-backports.functools-lru-cache==1.5
-beautifulsoup4==4.7.1
-certifi==2018.8.24
-chardet==3.0.4
-click==7.0
-colorama==0.3.7
-configparser==3.5.0b2
-constantly==15.1.0
-cov-core==1.15.0
-coverage==4.5.2
-crc16==0.1.1
-cryptography==2.6.1
-ctypesgen==1.0.2
-docutils==0.14
-entrypoints==0.3
-enum34==1.1.6
-fastentrypoints==0.12
-funcsigs==1.0.2
-futures==3.2.0
-html5lib==1.0.1
-hyperlink==17.3.1
-idna==2.6
-imagesize==1.0.0
-incremental==16.10.1
-ipaddr==2.2.0
-ipaddress==1.0.17
-isort==4.3.4
-j2cli==0.3.10
-jinja2==2.10
-keyring==17.1.1
-keyrings.alt==3.1.1
-lazy-object-proxy==1.3.1
-logilab-common==1.4.2
-lxml==4.6.2
-m2crypto==0.36.0
-markupsafe==1.1.0
-mccabe==0.6.1
-mmh3==2.5.1
-mock==3.0.5
-mockredispy==2.9.3
-more-itertools==4.2.0
-nose==1.3.7
-nose2==0.8.0
-olefile==0.46
-packaging==19.0
-parse==1.6.6
-pathlib2==2.3.3
-pbr==4.2.0
-pexpect==4.6.0
-pillow==5.4.1
-pluggy==0.8.0
-ptyprocess==0.7.0
-py==1.7.0
-pyasn1==0.4.2
-pyasn1-modules==0.2.1
-pycrypto==2.6.1
-pygments==2.3.1
-pygobject==3.30.4
-pylint==1.9.4
-pympler==0.8
-pyopenssl==19.0.0
-pyparsing==2.2.0
-pytest==3.10.1
-pytest-cov==2.6.0
-pytest-runner==4.4
-pytz==2019.1
-pyxdg==0.25
-pyyaml==5.4.1
-requests==2.21.0
-roman==2.0.0
-scandir==1.9.0
-secretstorage==2.3.1
-service-identity==16.0.0
-singledispatch==3.4.0.3
-six==1.12.0
-soupsieve==1.8
-sphinx==1.8.4
-stdeb==0.8.5
-stgit==0.18
-twisted==18.9.0
-typing==3.6.6
-urllib3==1.24.1
-webencodings==0.5.1
-wrapt==1.10.11
-zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
deleted file mode 100644
index b637591a0f2c..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-arm64/versions-py3-all-arm64
+++ /dev/null
@@ -1,70 +0,0 @@
-alabaster==0.7.8
-asn1crypto==0.24.0
-atomicwrites==1.1.5
-attrs==18.2.0
-babel==2.6.0
-bitarray==2.3.4
-certifi==2018.8.24
-chardet==3.0.4
-cov-core==1.15.0
-coverage==4.5.2
-cryptography==2.6.1
-devscripts==2.19.5+deb10u1
-distro-info==0.21
-docutils==0.14
-entrypoints==0.3
-fastentrypoints==0.12
-gbp==0.9.14
-gcovr==4.1
-gpg==1.12.0
-idna==2.6
-imagesize==1.0.0
-jinja2==2.10
-keyring==17.1.1
-keyrings.alt==3.1.1
-lxml==4.6.2
-m2crypto==0.38.0
-markupsafe==1.1.0
-mmh3==2.5.1
-mock==2.0.0
-mockredispy==2.9.3
-more-itertools==4.2.0
-nose==1.3.7
-nose2==0.8.0
-olefile==0.46
-packaging==19.0
-pbr==4.2.0
-pexpect==4.8.0
-pillow==5.4.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
-pygments==2.3.1
-pygobject==3.30.4
-pympler==0.8
-pyparsing==2.2.0
-pytest==3.10.1
-pytest-cov==2.6.0
-pytest-runner==5.2
-python-apt==1.8.4.3
-python-dateutil==2.7.3
-python-debian==0.1.35
-python-magic==0.4.16
-pytz==2019.1
-pyxdg==0.25
-pyyaml==5.4.1
-redis==3.5.3
-regex==2021.10.23
-requests==2.21.0
-roman==2.0.0
-secretstorage==2.3.1
-six==1.12.0
-sphinx==1.8.4
-sphinx-rtd-theme==0.4.3
-unattended-upgrades==0.1
-unidiff==0.5.4
-urllib3==1.24.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
deleted file mode 100644
index fe9eb7403692..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-deb-buster-armhf
+++ /dev/null
@@ -1,1662 +0,0 @@
-adwaita-icon-theme==3.30.1-1
-ant==1.10.5-2
-ant-optional==1.10.5-2
-apt-file==3.2.2
-apt-transport-https==1.8.2.3
-apt-utils==1.8.2.3
-arch-test==0.15-2+deb10u1
-asciidoctor==1.5.8-1
-aspell==0.60.7~20110707-6+deb10u1
-aspell-en==2018.04.16-0-1
-at==3.1.23-1
-at-spi2-core==2.30.0-7
-aufs-dkms==4.19+20190211-1
-aufs-tools==1:4.14+20190211-1
-augeas-lenses==1.11.0-3
-augeas-tools==1.11.0-3
-autoconf==2.69-11
-autoconf-archive==20180313-1
-autogen==1:5.18.12-4
-autogen-doc==1:5.18.12-4
-automake==1:1.16.1-4
-automake1.11==1:1.11.6-5
-autopoint==0.19.8.1-9
-autotools-dev==20180224.1
-bash-completion==1:2.8-6
-bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
-binfmt-support==2.2.0-2
-binutils==2.31.1-16
-binutils-arm-linux-gnueabihf==2.31.1-16
-binutils-common==2.31.1-16
-bison==2:3.3.2.dfsg-1
-blt==2.5.3+dfsg-4
-bsd-mailx==8.1.2-0.20180807cvs-1
-bsdmainutils==11.1.2+b1
-build-essential==12.6
-byacc==20140715-1+b1
-bzip2==1.0.6-9.2~deb10u1
-bzip2-doc==1.0.6-9.2~deb10u1
-ca-certificates==20200601~deb10u2
-ca-certificates-java==20190405
-cdbs==0.4.159
-cgroupfs-mount==1.4
-check==0.10.0-3+b3
-chrpath==0.16-2+b1
-clang==1:7.0-47
-clang-7==1:7.0.1-8+deb10u2
-cm-super-minimal==0.3.4-14
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cmocka-doc==1.1.3-1
-comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.9-1
-cowbuilder==0.88
-cowdancer==0.88
-cpio==2.12+dfsg-9
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-cppcheck==1.86-1
-cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u2
-dbus==1.12.20-0+deb10u1
-dbus-user-session==1.12.20-0+deb10u1
-dconf-gsettings-backend==0.30.1-2
-dconf-service==0.30.1-2
-dctrl-tools==2.24-3
-debhelper==12.1.1
-debian-keyring==2019.02.25
-debootstrap==1.0.114
-default-jdk-headless==2:1.11-71
-default-jre==2:1.11-71
-default-jre-headless==2:1.11-71
-default-libmysqlclient-dev==1.0.5
-device-tree-compiler==1.4.7-4
-devscripts==2.19.5+deb10u1
-dh-apparmor==2.13.2-10
-dh-autoreconf==19
-dh-exec==0.23.1
-dh-make==2.201802
-dh-python==3.20190308
-dh-strip-nondeterminism==1.1.2-1
-dh-systemd==12.1.1
-dictionaries-common==1.28.1
-diffstat==1.62-1
-dirmngr==2.2.12-1+deb10u1
-distro-info-data==0.41+deb10u3
-dkms==2.6.1-4
-dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
-docker-ce==5:18.09.5~3-0~debian-buster
-docker-ce-cli==5:18.09.5~3-0~debian-buster
-docutils-common==0.14+dfsg-4
-docutils-doc==0.14+dfsg-4
-doxygen==1.8.13-10
-dpatch==2.0.38+nmu1
-dpkg-dev==1.19.7
-dput==1.0.3
-dvipng==1.15-1.1
-dwz==0.12-3
-eatmydata==105-7
-emacsen-common==3.0.4
-equivs==2.2.0
-exim4-base==4.92-8+deb10u6
-exim4-config==4.92-8+deb10u6
-exim4-daemon-light==4.92-8+deb10u6
-expat==2.2.6-2+deb10u1
-exuberant-ctags==1:5.9~svn20110310-12
-fakeroot==1.23-1
-file==1:5.35-4+deb10u2
-flex==2.6.4-6.2
-fontconfig==2.13.1-2
-fontconfig-config==2.13.1-2
-fonts-dejavu-core==2.37-1
-fonts-dejavu-extra==2.37-1
-fonts-droid-fallback==1:6.0.1r16-1.1
-fonts-font-awesome==5.0.10+really4.7.0~dfsg-1
-fonts-glyphicons-halflings==1.009~3.4.1+dfsg-1
-fonts-lato==2.0-2
-fonts-liberation==1:1.07.4-9
-fonts-lmodern==2.004.5-6
-fonts-noto-mono==20181227-1
-fonts-roboto-slab==1.100263+20170512-1
-fonts-texgyre==20180621-3
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gawk==1:4.2.1+dfsg-1
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-gcovr==4.1-2
-gdb==8.2.1-2+b3
-gem2deb==0.43
-gem2deb-test-runner==0.43
-geoip-database==20181108-1
-gettext==0.19.8.1-9
-gettext-base==0.19.8.1-9
-gfortran==4:8.3.0-1
-gfortran-8==8.3.0-6
-ghostscript==9.27~dfsg-2+deb10u4
-gir1.2-atk-1.0==2.30.0-2
-gir1.2-atspi-2.0==2.30.0-7
-gir1.2-freedesktop==1.58.3-2
-gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
-gir1.2-glib-2.0==1.58.3-2
-gir1.2-gtk-3.0==3.24.5-1
-gir1.2-harfbuzz-0.0==2.3.1-1
-gir1.2-packagekitglib-1.0==1.1.12-5
-gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u3
-git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u3
-glib-networking==2.58.0-2+deb10u2
-glib-networking-common==2.58.0-2+deb10u2
-glib-networking-services==2.58.0-2+deb10u2
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gnupg2==2.2.12-1+deb10u1
-googletest==1.8.1-3
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
-graphviz==2.40.1-6+deb10u1
-groff==1.22.4-3+deb10u1
-groff-base==1.22.4-3+deb10u1
-gsettings-desktop-schemas==3.28.1-1
-gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
-gtk-update-icon-cache==3.24.5-1
-guile-2.0-libs==2.0.13+1-5.1
-hicolor-icon-theme==0.17-2
-ibverbs-providers==22.1-1
-icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==63.1-6+deb10u1
-imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
-install-info==6.5.0.dfsg.1-4+b1
-intltool-debian==0.35.0+20060710.5
-iproute2==4.20.0-2+deb10u1
-iptables==1.8.2-4
-iptables-dev==1.8.2-4
-iso-codes==4.2-1
-java-common==0.71
-java-wrappers==0.3
-javahelper==0.72.9
-javascript-common==11
-kernel-wedge==2.99
-kmod==26-1
-krb5-locales==1.17-3+deb10u2
-krb5-multidev==1.17-3+deb10u2
-lcov==1.13-4
-less==487-0.1+b1
-libalgorithm-c3-perl==0.10-1
-libalgorithm-diff-perl==1.19.03-2
-libalgorithm-diff-xs-perl==0.04-5+b1
-libalgorithm-merge-perl==0.08-3
-libaopalliance-java==20070526-6
-libapache-pom-java==18-1
-libapparmor1==2.13.2-10
-libappstream4==0.12.5-1
-libapt-inst2.0==1.8.2.3
-libapt-pkg-perl==0.1.34+b1
-libarchive-cpio-perl==0.10-1
-libarchive-zip-perl==1.64-1
-libarchive13==3.3.3-4+deb10u1
-libargon2-1==0~20171227-0.2
-libasan5==8.3.0-6
-libasm-java==7.0-1
-libasound2==1.1.8-1
-libasound2-data==1.1.8-1
-libaspell15==0.60.7~20110707-6+deb10u1
-libassuan0==2.5.2-1
-libasync-mergepoint-perl==0.04-2
-libatinject-jsr330-api-java==1.0+ds1-5
-libatk-bridge2.0-0==2.30.0-5
-libatk-bridge2.0-dev==2.30.0-5
-libatk-wrapper-java==0.33.3-22
-libatk-wrapper-java-jni==0.33.3-22
-libatk1.0-0==2.30.0-2
-libatk1.0-data==2.30.0-2
-libatk1.0-dev==2.30.0-2
-libatm1==1:2.5.1-2
-libatm1-dev==1:2.5.1-2
-libatomic1==8.3.0-6
-libatspi2.0-0==2.30.0-7
-libatspi2.0-dev==2.30.0-7
-libaudio2==1.9.4-6
-libaudit-dev==1:2.8.4-3
-libaugeas0==1.11.0-3
-libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.7-4+deb10u1
-libavahi-common-data==0.7-4+deb10u1
-libavahi-common3==0.7-4+deb10u1
-libavalon-framework-java==4.2.0-10
-libb-hooks-endofscope-perl==0.24-1
-libb-hooks-op-check-perl==0.22-1+b1
-libbabeltrace-dev==1.5.6-2+deb10u1
-libbabeltrace1==1.5.6-2+deb10u1
-libbatik-java==1.10-2+deb10u1
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libbinutils==2.31.1-16
-libbison-dev==2:3.3.2.dfsg-1
-libbit-vector-perl==7.4-1+b5
-libblkid-dev==2.33.1-0.1
-libboost-atomic1.71-dev==1.71.0-6~bpo10+1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libboost-chrono1.71-dev==1.71.0-6~bpo10+1
-libboost-chrono1.71.0==1.71.0-6~bpo10+1
-libboost-container1.71-dev==1.71.0-6~bpo10+1
-libboost-container1.71.0==1.71.0-6~bpo10+1
-libboost-context1.71-dev==1.71.0-6~bpo10+1
-libboost-context1.71.0==1.71.0-6~bpo10+1
-libboost-contract1.71-dev==1.71.0-6~bpo10+1
-libboost-contract1.71.0==1.71.0-6~bpo10+1
-libboost-coroutine1.71-dev==1.71.0-6~bpo10+1
-libboost-coroutine1.71.0==1.71.0-6~bpo10+1
-libboost-date-time1.71-dev==1.71.0-6~bpo10+1
-libboost-date-time1.71.0==1.71.0-6~bpo10+1
-libboost-fiber1.71-dev==1.71.0-6~bpo10+1
-libboost-fiber1.71.0==1.71.0-6~bpo10+1
-libboost-filesystem1.71-dev==1.71.0-6~bpo10+1
-libboost-filesystem1.71.0==1.71.0-6~bpo10+1
-libboost-graph-parallel1.71-dev==1.71.0-6~bpo10+1
-libboost-graph-parallel1.71.0==1.71.0-6~bpo10+1
-libboost-log1.71-dev==1.71.0-6~bpo10+1
-libboost-log1.71.0==1.71.0-6~bpo10+1
-libboost-mpi1.71.0==1.71.0-6~bpo10+1
-libboost-program-options1.71-dev==1.71.0-6~bpo10+1
-libboost-program-options1.71.0==1.71.0-6~bpo10+1
-libboost-regex1.71-dev==1.71.0-6~bpo10+1
-libboost-regex1.71.0==1.71.0-6~bpo10+1
-libboost-serialization1.71-dev==1.71.0-6~bpo10+1
-libboost-serialization1.71.0==1.71.0-6~bpo10+1
-libboost-system1.71-dev==1.71.0-6~bpo10+1
-libboost-system1.71.0==1.71.0-6~bpo10+1
-libboost-test1.71-dev==1.71.0-6~bpo10+1
-libboost-test1.71.0==1.71.0-6~bpo10+1
-libboost-thread1.71-dev==1.71.0-6~bpo10+1
-libboost-thread1.71.0==1.71.0-6~bpo10+1
-libboost1.71-dev==1.71.0-6~bpo10+1
-libbrotli1==1.0.7-2+deb10u1
-libbsd-dev==0.9.1-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
-libbsh-java==2.0b4-19
-libbz2-dev==1.0.6-9.2~deb10u1
-libc-ares-dev==1.14.0-1+deb10u1
-libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10
-libc6-dbg==2.28-10
-libc6-dev==2.28-10
-libcaf-openmpi-3==2.4.0-2
-libcairo-gobject2==1.16.0-4+deb10u1
-libcairo-script-interpreter2==1.16.0-4+deb10u1
-libcairo2==1.16.0-4+deb10u1
-libcairo2-dev==1.16.0-4+deb10u1
-libcap-dev==1:2.25-2
-libcap-ng-dev==0.7.9-2
-libcap2==1:2.25-2
-libcap2-bin==1:2.25-2
-libcapture-tiny-perl==0.48-1
-libcarp-clan-perl==6.07-1
-libcc1-0==8.3.0-6
-libcdi-api-java==1.2-2
-libcdt5==2.40.1-6+deb10u1
-libcgi-fast-perl==1:2.13-1
-libcgi-pm-perl==4.40-1
-libcglib-java==3.2.10-1
-libcgraph6==2.40.1-6+deb10u1
-libclang-6.0-dev==1:6.0.1-10
-libclang-7-dev==1:7.0.1-8+deb10u2
-libclang-common-6.0-dev==1:6.0.1-10
-libclang-common-7-dev==1:7.0.1-8+deb10u2
-libclang-dev==1:7.0-47
-libclang1-6.0==1:6.0.1-10
-libclang1-7==1:7.0.1-8+deb10u2
-libclass-accessor-perl==0.51-1
-libclass-c3-perl==0.34-1
-libclass-c3-xs-perl==0.14-1+b3
-libclass-data-inheritable-perl==0.08-3
-libclass-inspector-perl==1.32-1
-libclass-method-modifiers-perl==2.12-1
-libclass-xsaccessor-perl==1.19-3+b2
-libclone-perl==0.41-1+b1
-libcmocka-dev==1.1.3-1
-libcmocka0==1.1.3-1
-libcoarrays-dev==2.4.0-2
-libcoarrays-openmpi-dev==2.4.0-2
-libcolord2==1.4.3-4
-libcommon-sense-perl==3.74-2+b7
-libcommons-beanutils-java==1.9.3-1
-libcommons-cli-java==1.4-1
-libcommons-codec-java==1.11-1
-libcommons-collections3-java==3.2.2-2
-libcommons-compress-java==1.18-2+deb10u1
-libcommons-configuration-java==1.10-5
-libcommons-digester-java==1.8.1-5
-libcommons-io-java==2.6-2
-libcommons-lang-java==2.6-8
-libcommons-lang3-java==3.8-2
-libcommons-logging-java==1.2-2
-libcommons-parent-java==43-1
-libcommons-validator-java==1:1.6-2
-libconst-fast-perl==0.014-1
-libcontextual-return-perl==0.004014-2
-libconvert-binhex-perl==1.125-1
-libcroco3==0.6.12-3
-libcryptsetup12==2:2.1.0-5+deb10u2
-libcups2==2.2.10-6+deb10u4
-libcupsfilters1==1.21.6-5
-libcupsimage2==2.2.10-6+deb10u4
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl3-nss==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
-libcurl4-nss-dev==7.64.0-4+deb10u2
-libdaemon-dev==0.14-7
-libdaemon0==0.14-7
-libdata-dump-perl==1.23-1
-libdata-optlist-perl==0.110-1
-libdatrie1==0.2.12-2
-libdb-dev==5.3.1+nmu1
-libdb5.3-dev==5.3.28+dfsg1-0.5
-libdbi1==0.9.0-5
-libdbus-1-3==1.12.20-0+deb10u1
-libdbus-1-dev==1.12.20-0+deb10u1
-libdconf1==0.30.1-2
-libde265-0==1.0.3-1+b1
-libdevel-callchecker-perl==0.008-1
-libdevel-caller-perl==2.06-2+b1
-libdevel-globaldestruction-perl==0.14-1
-libdevel-lexalias-perl==0.05-2+b1
-libdevel-stacktrace-perl==2.0300-1
-libdevmapper1.02.1==2:1.02.155-3
-libdigest-bubblebabble-perl==0.02-2
-libdigest-hmac-perl==1.03+dfsg-2
-libdist-checkconflicts-perl==0.11-1
-libdistro-info-perl==0.21
-libdjvulibre-text==3.5.27.1-10
-libdjvulibre21==3.5.27.1-10
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdom4j-java==2.1.1-2
-libdouble-conversion1==3.1.0-3
-libdoxia-core-java==1.7-2
-libdoxia-java==1.7-2
-libdoxia-sitetools-java==1.7.5-1
-libdpkg-perl==1.19.7
-libdrm-amdgpu1==2.4.97-1
-libdrm-common==2.4.97-1
-libdrm-dev==2.4.97-1
-libdrm-etnaviv1==2.4.97-1
-libdrm-exynos1==2.4.97-1
-libdrm-freedreno1==2.4.97-1
-libdrm-nouveau2==2.4.97-1
-libdrm-omap1==2.4.97-1
-libdrm-radeon1==2.4.97-1
-libdrm-tegra0==2.4.97-1
-libdrm2==2.4.97-1
-libdw-dev==0.176-1.1
-libdw1==0.176-1.1
-libdynaloader-functions-perl==0.003-1
-libeatmydata1==105-7
-libedit-dev==3.1-20181209-1
-libedit2==3.1-20181209-1
-libegl-mesa0==18.3.6-2+deb10u1
-libegl1==1.1.0-1
-libegl1-mesa-dev==18.3.6-2+deb10u1
-libel-api-java==3.0.0-2+deb10u1
-libelf-dev==0.176-1.1
-libelf1==0.176-1.1
-libemail-date-format-perl==1.005-1
-libemail-valid-perl==1.202-1
-libencode-locale-perl==1.05-1
-libepoxy-dev==1.5.3-0.1
-libepoxy0==1.5.3-0.1
-liberror-perl==0.17027-2
-libestr0==0.1.10-2.1
-libeval-closure-perl==0.14-1
-libevdev2==1.6.0+dfsg-1
-libevent-2.1-6==2.1.8-stable-4
-libevent-core-2.1-6==2.1.8-stable-4
-libevent-dev==2.1.8-stable-4
-libevent-extra-2.1-6==2.1.8-stable-4
-libevent-openssl-2.1-6==2.1.8-stable-4
-libevent-pthreads-2.1-6==2.1.8-stable-4
-libexception-class-perl==1.44-1
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
-libexplain-dev==1.4.D001-8
-libexplain51==1.4.D001-8
-libexporter-tiny-perl==1.002001-1
-libfakeroot==1.23-1
-libfastjson4==0.99.8-2
-libfcgi-perl==0.78-2+b3
-libffi-dev==3.2.1-9
-libfftw3-double3==3.3.8-2
-libfile-basedir-perl==0.08-1
-libfile-chdir-perl==0.1008-1
-libfile-desktopentry-perl==0.22-1
-libfile-fcntllock-perl==0.22-3+b5
-libfile-homedir-perl==1.004-1
-libfile-listing-perl==6.04-1
-libfile-mimeinfo-perl==0.29-1
-libfile-stripnondeterminism-perl==1.1.2-1
-libfile-which-perl==1.23-1
-libfl-dev==2.6.4-6.2
-libfl2==2.6.4-6.2
-libfont-afm-perl==1.20-2
-libfontbox2-java==2.0.13-2
-libfontconfig1==2.13.1-2
-libfontconfig1-dev==2.13.1-2
-libfontenc1==1:1.1.3-1+b2
-libfop-java==1:2.3-2
-libfreetype6==2.9.1-3+deb10u2
-libfreetype6-dev==2.9.1-3+deb10u2
-libfribidi-dev==1.0.5-3.1+deb10u1
-libfribidi0==1.0.5-3.1+deb10u1
-libfstrm0==0.4.0-1
-libfuture-perl==0.39-1
-libgail-common==2.24.32-3
-libgail18==2.24.32-3
-libgbm1==18.3.6-2+deb10u1
-libgc1c2==1:7.6.4-0.4
-libgcc-8-dev==8.3.0-6
-libgd-perl==2.71-2
-libgd3==2.2.5-5.2
-libgdbm-compat4==1.18.1-4
-libgdbm6==1.18.1-4
-libgdk-pixbuf2.0-0==2.38.1+dfsg-1
-libgdk-pixbuf2.0-bin==2.38.1+dfsg-1
-libgdk-pixbuf2.0-common==2.38.1+dfsg-1
-libgdk-pixbuf2.0-dev==2.38.1+dfsg-1
-libgeoip1==1.6.12-1
-libgeronimo-annotation-1.3-spec-java==1.0-1
-libgeronimo-interceptor-3.0-spec-java==1.0.1-4
-libgetopt-long-descriptive-perl==0.103-2
-libgfortran-8-dev==8.3.0-6
-libgfortran5==8.3.0-6
-libgif7==5.1.4-3
-libgirepository-1.0-1==1.58.3-2
-libgit-wrapper-perl==0.048-1
-libgitlab-api-v4-perl==0.16-1
-libgl1==1.1.0-1
-libgl1-mesa-dev==18.3.6-2+deb10u1
-libgl1-mesa-dri==18.3.6-2+deb10u1
-libglapi-mesa==18.3.6-2+deb10u1
-libgles1==1.1.0-1
-libgles2==1.1.0-1
-libgles2-mesa-dev==18.3.6-2+deb10u1
-libglib2.0-0==2.58.3-2+deb10u3
-libglib2.0-bin==2.58.3-2+deb10u3
-libglib2.0-data==2.58.3-2+deb10u3
-libglib2.0-dev==2.58.3-2+deb10u3
-libglib2.0-dev-bin==2.58.3-2+deb10u3
-libglu1-mesa==9.0.0-2.1+b3
-libglu1-mesa-dev==9.0.0-2.1+b3
-libglvnd-core-dev==1.1.0-1
-libglvnd-dev==1.1.0-1
-libglvnd0==1.1.0-1
-libglx-mesa0==18.3.6-2+deb10u1
-libglx0==1.1.0-1
-libgmp-dev==2:6.1.2+dfsg-4
-libgmpxx4ldbl==2:6.1.2+dfsg-4
-libgnutls-dane0==3.6.7-4+deb10u7
-libgnutls-openssl27==3.6.7-4+deb10u7
-libgnutls28-dev==3.6.7-4+deb10u7
-libgnutlsxx28==3.6.7-4+deb10u7
-libgomp1==8.3.0-6
-libgoogle-perftools4==2.7-1
-libgpgme11==1.12.0-6
-libgpm2==1.20.7-5
-libgraphite2-3==1.3.13-7
-libgraphite2-dev==1.3.13-7
-libgs9==9.27~dfsg-2+deb10u4
-libgs9-common==9.27~dfsg-2+deb10u4
-libgssapi-krb5-2==1.17-3+deb10u2
-libgssrpc4==1.17-3+deb10u2
-libgstreamer1.0-0==1.14.4-1
-libgtest-dev==1.8.1-3
-libgtk-3-0==3.24.5-1
-libgtk-3-bin==3.24.5-1
-libgtk-3-common==3.24.5-1
-libgtk-3-dev==3.24.5-1
-libgtk2.0-0==2.24.32-3
-libgtk2.0-bin==2.24.32-3
-libgtk2.0-common==2.24.32-3
-libgts-0.7-5==0.7.6+darcs121130-4
-libgts-bin==0.7.6+darcs121130-4
-libguava-java==19.0-1
-libgudev-1.0-0==232-2
-libguice-java==4.2.1-1
-libgvc6==2.40.1-6+deb10u1
-libgvpr2==2.40.1-6+deb10u1
-libharfbuzz-dev==2.3.1-1
-libharfbuzz-gobject0==2.3.1-1
-libharfbuzz-icu0==2.3.1-1
-libharfbuzz0b==2.3.1-1
-libhawtjni-runtime-java==1.16-1
-libheif1==1.3.2-2~deb10u1
-libhtml-form-perl==6.03-1
-libhtml-format-perl==2.12-1
-libhtml-parser-perl==3.72-3+b3
-libhtml-tagset-perl==3.20-3
-libhtml-tree-perl==5.07-2
-libhttp-cookies-perl==6.04-1
-libhttp-daemon-perl==6.01-3
-libhttp-date-perl==6.02-1
-libhttp-message-perl==6.18-1
-libhttp-negotiate-perl==6.01-1
-libhttp-tiny-multipart-perl==0.08-1
-libhttpclient-java==4.5.7-1+deb10u1
-libhttpcore-java==4.4.11-1
-libhwloc-dev==1.11.12-3
-libhwloc-plugins==1.11.12-3
-libhwloc5==1.11.12-3
-libiberty-dev==20190122-1
-libibverbs-dev==22.1-1
-libibverbs1==22.1-1
-libice-dev==2:1.0.9-2
-libice6==2:1.0.9-2
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
-libidn11==1.33-2.2
-libidn2-dev==2.0.5-1+deb10u1
-libijs-0.35==0.35-14
-libilmbase23==2.2.1-2
-libimagequant0==2.12.2-1.1
-libimport-into-perl==1.002005-1
-libinput-bin==1.12.6-2+deb10u1
-libinput10==1.12.6-2+deb10u1
-libio-async-perl==0.72-1
-libio-html-perl==1.001-1
-libio-prompter-perl==0.004015-1
-libio-pty-perl==1:1.08-1.1+b5
-libio-sessiondata-perl==1.03-1
-libio-socket-ssl-perl==2.060-3
-libio-string-perl==1.08-3
-libio-stringy-perl==2.111-3
-libip4tc-dev==1.8.2-4
-libip4tc0==1.8.2-4
-libip6tc-dev==1.8.2-4
-libip6tc0==1.8.2-4
-libipc-run-perl==20180523.0-1
-libipc-shareable-perl==0.61-2
-libipc-system-simple-perl==1.25-4
-libiptc-dev==1.8.2-4
-libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisl19==0.20-2
-libitext1-java==1.4-7
-libjansi-java==1.17.1-1
-libjansi-native-java==1.8-1
-libjansson-dev==2.12-1
-libjansson4==2.12-1
-libjargs-java==1.0.0-4
-libjaxen-java==1.1.6-4
-libjaxp1.3-java==1.3.05-5
-libjbig0==2.1-3.1+b2
-libjbig2dec0==0.16-1
-libjemalloc-dev==5.1.0-3
-libjemalloc2==5.1.0-3
-libjetty9-java==9.4.16-0+deb10u1
-libjpeg62-turbo==1:1.5.2-2+deb10u1
-libjs-bootstrap==3.4.1+dfsg-1
-libjs-jquery==3.3.1~dfsg-3+deb10u1
-libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
-libjs-jquery-isonscreen==1.2.0-1
-libjs-jquery-metadata==12-1.1
-libjs-jquery-tablesorter==1:2.31.1+dfsg1-1
-libjs-jquery-throttle-debounce==1.1+dfsg.1-1
-libjs-modernizr==2.6.2+ds1-3
-libjs-sphinxdoc==1.8.4-1
-libjs-underscore==1.9.1~dfsg-1+deb10u1
-libjson-c-dev==0.12.1+ds-2+deb10u1
-libjson-c3==0.12.1+ds-2+deb10u1
-libjson-glib-1.0-0==1.4.4-2
-libjson-glib-1.0-common==1.4.4-2
-libjson-perl==4.02000-1
-libjson-xs-perl==3.040-1+b1
-libjsoncpp1==1.7.4-3
-libjsp-api-java==2.3.4-2+deb10u1
-libjsr305-java==0.1~+svn49-11
-libjtidy-java==7+svn20110807-5
-libjudy-dev==1.0.5-5
-libjudydebian1==1.0.5-5
-libjxr-tools==1.1-6+b1
-libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u2
-libkadm5clnt-mit11==1.17-3+deb10u2
-libkadm5srv-mit11==1.17-3+deb10u2
-libkdb5-9==1.17-3+deb10u2
-libkeyutils1==1.6-6
-libkmod2==26-1
-libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u2
-libkrb5-dev==1.17-3+deb10u2
-libkrb5support0==1.17-3+deb10u2
-libksba8==1.3.5-2
-liblab-gamut1==2.40.1-6+deb10u1
-liblcms2-2==2.9-3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-libldap2-dev==2.4.47+dfsg-3+deb10u6
-liblist-compare-perl==0.53-1
-liblist-moreutils-perl==0.416-1+b4
-libllvm6.0==1:6.0.1-10
-libllvm7==1:7.0.1-8+deb10u2
-liblmdb0==0.9.22-1
-liblocale-gettext-perl==1.07-3+b4
-liblockfile-bin==1.14-1.1
-liblockfile1==1.14-1.1
-liblog-any-adapter-screen-perl==0.140-1
-liblog-any-perl==1.707-1
-liblog-dispatch-perl==2.68-1
-liblog-log4perl-perl==1.49-1
-liblog4j1.2-java==1.2.17-8+deb10u1
-liblognorm5==2.0.5-1
-liblqr-1-0==0.4.2-2.1
-libltdl-dev==2.4.6-9
-libltdl7==2.4.6-9
-liblua5.1-0==5.1.5-8.1+b2
-liblua5.1-0-dev==5.1.5-8.1+b2
-liblwp-mediatypes-perl==6.02-1
-liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
-liblzma-dev==5.2.4-1
-liblzo2-2==2.10-0.1
-liblzo2-dev==2.10-0.1
-libmagic-mgc==1:5.35-4+deb10u2
-libmagic1==1:5.35-4+deb10u2
-libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
-libmail-sendmail-perl==0.80-1
-libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.29-0+deb10u1
-libmariadb-dev-compat==1:10.3.29-0+deb10u1
-libmariadb3==1:10.3.29-0+deb10u1
-libmaven-archiver-java==3.2.0-2
-libmaven-clean-plugin-java==3.1.0-1
-libmaven-common-artifact-filters-java==3.0.1-3
-libmaven-compiler-plugin-java==3.8.0-2
-libmaven-filtering-java==3.1.1-1
-libmaven-jar-plugin-java==3.1.1-1
-libmaven-parent-java==31-2
-libmaven-plugin-tools-java==3.6.0-1
-libmaven-reporting-api-java==3.0-1
-libmaven-reporting-exec-java==1.4-2
-libmaven-reporting-impl-java==3.0.0-2
-libmaven-resolver-java==1.3.1-1
-libmaven-resources-plugin-java==3.1.0-1
-libmaven-shared-incremental-java==1.1-3
-libmaven-shared-utils-java==3.3.0-1
-libmaven-site-plugin-java==3.6-3
-libmaven3-core-java==3.6.0-1
-libmime-charset-perl==1.012.2-1
-libmime-lite-perl==3.030-2
-libmime-tools-perl==5.509-1
-libmime-types-perl==2.17-1
-libmng1==1.0.10+dfsg-3.1+b5
-libmnl-dev==1.0.4-2
-libmnl0==1.0.4-2
-libmodule-implementation-perl==0.09-1
-libmodule-runtime-perl==0.016-1
-libmoo-perl==2.003004-2
-libmount-dev==2.33.1-0.1
-libmpc3==1.1.0-1
-libmpdec2==2.4.2-2
-libmpfr6==4.0.2-1
-libmro-compat-perl==0.13-1
-libmtdev1==1.1.5-1+b1
-libnamespace-autoclean-perl==0.28-1
-libnamespace-clean-perl==0.27-1
-libnanomsg-dev==1.1.5+dfsg-1
-libnanomsg5==1.1.5+dfsg-1
-libncurses-dev==6.1+20181013-2+deb10u2
-libncurses5-dev==6.1+20181013-2+deb10u2
-libncurses6==6.1+20181013-2+deb10u2
-libnet-dbus-perl==1.1.0-5+b1
-libnet-dns-perl==1.19-1
-libnet-dns-sec-perl==1.11-1
-libnet-domain-tld-perl==1.75-1
-libnet-http-perl==6.18-1
-libnet-ip-perl==1.26-2
-libnet-libidn-perl==0.12.ds-3+b1
-libnet-smtp-ssl-perl==1.04-1
-libnet-ssleay-perl==1.85-2+b1
-libnetfilter-conntrack-dev==1.0.7-1
-libnetfilter-conntrack3==1.0.7-1
-libnetpbm10==2:10.0-15.3+b2
-libnewt-dev==0.52.20-8
-libnewt0.52==0.52.20-8
-libnfnetlink-dev==1.0.1-3+b1
-libnfnetlink0==1.0.1-3+b1
-libnftables0==0.9.0-2
-libnftnl-dev==1.1.2-2
-libnftnl11==1.1.2-2
-libnghttp2-14==1.36.0-2+deb10u1
-libnl-3-200==3.4.0-1
-libnl-3-dev==3.4.0-1
-libnl-route-3-200==3.4.0-1
-libnl-route-3-dev==3.4.0-1
-libnorm-dev==1.5.8+dfsg2-1
-libnorm1==1.5.8+dfsg2-1
-libnpth0==1.6-1
-libnspr4==2:4.20-1
-libnss-systemd==241-7~deb10u8
-libnss3==2:3.42.1-1+deb10u3
-libnuma-dev==2.0.12-1
-libnuma1==2.0.12-1
-libnumber-compare-perl==0.03-1
-libnumber-range-perl==0.12-1
-libobjc-8-dev==8.3.0-6
-libobjc4==8.3.0-6
-libomp-7-dev==1:7.0.1-8+deb10u2
-libomp5-7==1:7.0.1-8+deb10u2
-libopencsd-dev==0.10.1-1
-libopencsd0==0.10.1-1
-libopenexr23==2.2.1-4.1+deb10u1
-libopengl0==1.1.0-1
-libopenjp2-7==2.3.0-2+deb10u2
-libopenmpi-dev==3.1.3-11
-libopenmpi3==3.1.3-11
-libopts25==1:5.18.12-4
-libopts25-dev==1:5.18.12-4
-liboro-java==2.0.8a-13
-libosp5==1.5.2-13+b1
-libossp-uuid-perl==1.6.2-1.5+b7
-libossp-uuid16==1.6.2-1.5+b7
-libp11-kit-dev==0.23.15-2+deb10u1
-libpackage-stash-perl==0.38-1
-libpackage-stash-xs-perl==0.29-1
-libpackagekit-glib2-18==1.1.12-5
-libpadwalker-perl==2.3-1+b1
-libpam-cap==1:2.25-2
-libpam-systemd==241-7~deb10u8
-libpam0g-dev==1.3.1-5
-libpango-1.0-0==1.42.4-8~deb10u1
-libpango1.0-dev==1.42.4-8~deb10u1
-libpangocairo-1.0-0==1.42.4-8~deb10u1
-libpangoft2-1.0-0==1.42.4-8~deb10u1
-libpangoxft-1.0-0==1.42.4-8~deb10u1
-libpaper-utils==1.1.28
-libpaper1==1.1.28
-libparams-classify-perl==0.015-1+b1
-libparams-util-perl==1.07-3+b4
-libparams-validate-perl==1.29-1+b1
-libparams-validationcompiler-perl==0.30-1
-libparboiled-java==1.1.7-2
-libparse-debianchangelog-perl==1.2.0-13
-libpath-iterator-rule-perl==1.014-1
-libpath-tiny-perl==0.108-1
-libpathplan4==2.40.1-6+deb10u1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
-libpci-dev==1:3.5.2-1
-libpci3==1:3.5.2-1
-libpciaccess0==0.14-1
-libpcre16-3==2:8.39-12
-libpcre2-16-0==10.32-5
-libpcre3-dev==2:8.39-12
-libpcre32-3==2:8.39-12
-libpcrecpp0v5==2:8.39-12
-libpcsclite1==1.8.24-1
-libpegdown-java==1.6.0-1
-libperl-dev==5.28.1-6+deb10u1
-libperl5.28==5.28.1-6+deb10u1
-libperlio-gzip-perl==0.19-1+b5
-libpgm-5.2-0==5.2.122~dfsg-3
-libpgm-dev==5.2.122~dfsg-3
-libpipeline1==1.5.1-2
-libpixman-1-0==0.36.0-1
-libpixman-1-dev==0.36.0-1
-libplexus-ant-factory-java==1.0~alpha2.1-4
-libplexus-archiver-java==3.6.0-2
-libplexus-bsh-factory-java==1.0~alpha7-4
-libplexus-build-api-java==0.0.7-3
-libplexus-cipher-java==1.7-3
-libplexus-classworlds-java==2.6.0-1
-libplexus-compiler-java==2.8.5-1
-libplexus-component-annotations-java==1.7.1-7
-libplexus-container-default-java==1.7.1-7
-libplexus-container-default1.5-java==1.7.1-7
-libplexus-i18n-java==1.0-beta-10-5
-libplexus-interpolation-java==1.25-1
-libplexus-io-java==3.1.1-1
-libplexus-languages-java==0.9.10-1
-libplexus-sec-dispatcher-java==1.4-4
-libplexus-utils2-java==3.1.1-1
-libplexus-velocity-java==1.2-3
-libpmix2==3.1.2-3
-libpng-dev==1.6.36-6
-libpng16-16==1.6.36-6
-libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-25
-libpolkit-backend-1-0==0.105-25
-libpolkit-gobject-1-0==0.105-25
-libpopt0==1.16-12
-libpotrace0==1.15-1
-libprocps7==2:3.3.15-2
-libprotobuf-c1==1.3.1-1+b1
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
-libprotoc17==3.6.1.3-2
-libproxy1v5==0.4.15-5+deb10u1
-libptexenc1==2018.20181218.49446-1
-libpthread-stubs0-dev==0.4-1
-libpython-all-dev==2.7.16-1
-libpython-dev==2.7.16-1
-libpython-stdlib==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2-stdlib==2.7.16-1
-libpython2.7==2.7.16-2+deb10u1
-libpython2.7-dev==2.7.16-2+deb10u1
-libpython2.7-minimal==2.7.16-2+deb10u1
-libpython2.7-stdlib==2.7.16-2+deb10u1
-libpython3-all-dbg==3.7.3-1
-libpython3-all-dev==3.7.3-1
-libpython3-dbg==3.7.3-1
-libpython3-dev==3.7.3-1
-libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dbg==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
-libqdox-java==1.12.1-3
-libqdox2-java==2.0~M10-1
-libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
-libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
-libqt4-designer==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
-libqt4-help==4:4.8.7+dfsg-18+deb10u1
-libqt4-network==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
-libqt4-script==4:4.8.7+dfsg-18+deb10u1
-libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
-libqt4-svg==4:4.8.7+dfsg-18+deb10u1
-libqt4-test==4:4.8.7+dfsg-18+deb10u1
-libqt4-xml==4:4.8.7+dfsg-18+deb10u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
-libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5gui5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
-libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
-libqt5svg5==5.11.3-2
-libqt5test5==5.11.3+dfsg1-1+deb10u4
-libqt5widgets5==5.11.3+dfsg1-1+deb10u4
-libqt5xml5==5.11.3+dfsg1-1+deb10u4
-libqtcore4==4:4.8.7+dfsg-18+deb10u1
-libqtdbus4==4:4.8.7+dfsg-18+deb10u1
-libqtgui4==4:4.8.7+dfsg-18+deb10u1
-libreadline-dev==7.0-5
-libreadline7==7.0-5
-libreadonly-perl==2.050-1
-libref-util-perl==0.204-1
-libref-util-xs-perl==0.117-1+b1
-libregexp-assemble-perl==0.36-1
-libregexp-pattern-license-perl==3.0.31-4
-librest-0.7-0==0.8.1-1
-librhash0==1.3.8-1
-librole-tiny-perl==2.000006-1
-librrd-dev==1.7.1-2
-librrd8==1.7.1-2
-librsvg2-2==2.44.10-2.1
-librsvg2-common==2.44.10-2.1
-librtmp1==2.4+20151223.gitfa8646d.1-2
-libruby2.5==2.5.5-3+deb10u3
-librust-aho-corasick-dev==0.6.9-1
-librust-ansi-term-dev==0.11.0-1
-librust-atty-dev==0.2.11-1
-librust-autocfg-dev==0.1.1-1
-librust-backtrace+default-dev==0.3.13-1
-librust-backtrace+libbacktrace-dev==0.3.13-1
-librust-backtrace-dev==0.3.13-1
-librust-backtrace-sys-dev==0.1.28-1
-librust-bindgen+logging-dev==0.47.0-1
-librust-bindgen-dev==0.47.0-1
-librust-bitflags-dev==1.0.4-1
-librust-byteorder-dev==1.3.1-1
-librust-cc-dev==1.0.28-1
-librust-cexpr-dev==0.3.3-1
-librust-cfg-if-dev==0.1.6-1
-librust-clang-sys+clang-6-0-dev==0.27.0-1
-librust-clang-sys+runtime-dev==0.27.0-1
-librust-clang-sys-dev==0.27.0-1
-librust-clap+color-dev==2.32.0-4
-librust-clap+default-dev==2.32.0-4
-librust-clap+suggestions-dev==2.32.0-4
-librust-clap-dev==2.32.0-4
-librust-env-logger+default-dev==0.6.0-1
-librust-env-logger-dev==0.6.0-1
-librust-failure+default-dev==0.1.5-1
-librust-failure+derive-dev==0.1.5-1
-librust-failure+std-dev==0.1.5-1
-librust-failure-derive-dev==0.1.5-1
-librust-failure-dev==0.1.5-1
-librust-glob-dev==0.2.11-1
-librust-hashbrown-dev==0.1.8-1
-librust-humantime-dev==1.1.1-2
-librust-lazy-static-dev==1.2.0-1
-librust-libc-dev==0.2.48-1
-librust-libloading-dev==0.5.0-1
-librust-log-dev==0.4.6-1
-librust-memchr+default-dev==2.1.3-1
-librust-memchr+use-std-dev==2.1.3-1
-librust-memchr-dev==2.1.3-1
-librust-nom+std-dev==4.0.0-1
-librust-nom-dev==4.0.0-1
-librust-peeking-take-while-dev==0.1.2-1
-librust-proc-macro2-dev==0.4.27-1
-librust-quick-error-dev==1.2.2-1
-librust-quote+proc-macro-dev==0.6.11-1
-librust-quote-dev==0.6.11-1
-librust-redox-syscall-dev==0.1.40-2
-librust-redox-termios-dev==0.1.1-2
-librust-regex-dev==1.1.0-1
-librust-regex-syntax-dev==0.6.5-1
-librust-rustc-demangle-dev==0.1.13-1
-librust-scopeguard-dev==0.3.3-1
-librust-strsim-dev==0.7.0-1
-librust-syn+default-dev==0.15.26-1
-librust-syn+printing-dev==0.15.26-1
-librust-syn+proc-macro-dev==0.15.26-1
-librust-syn-dev==0.15.26-1
-librust-synstructure-dev==0.10.1-1
-librust-termcolor-dev==1.0.4-1
-librust-termion-dev==1.5.1-1
-librust-textwrap-dev==0.11.0-1
-librust-thread-local-dev==0.3.6-1
-librust-ucd-util-dev==0.1.1-1
-librust-unicode-width-dev==0.1.5-1
-librust-unicode-xid-dev==0.1.0-1
-librust-utf8-ranges-dev==1.0.2-1
-librust-vec-map-dev==0.8.1-2
-librust-which-dev==2.0.1-1
-librust-winapi-dev==0.3.6-1
-librust-winapi-i686-pc-windows-gnu-dev==0.4.0-1
-librust-winapi-x86-64-pc-windows-gnu-dev==0.4.0-1
-librust-wincolor-dev==1.0.0-1
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
-libsass1==3.5.5-4
-libsaxon-java==1:6.5.5-12
-libselinux1-dev==2.8-1+b1
-libsensors-config==1:3.5.0-3
-libsensors4-dev==1:3.5.0-3
-libsensors5==1:3.5.0-3
-libsepol1-dev==2.8-1
-libsereal-decoder-perl==4.005+ds-1+b1
-libsereal-encoder-perl==4.005+ds-1+b1
-libsereal-perl==4.005-1
-libservlet-api-java==4.0.1-2
-libservlet3.1-java==1:4.0.1-2
-libsigsegv2==2.12-2
-libsisu-guice-java==4.2.0-1
-libsisu-inject-java==0.3.3-1
-libsisu-ioc-java==2.3.0-11
-libsisu-plexus-java==0.3.3-3
-libslang2==2.3.2-2
-libslang2-dev==2.3.2-2
-libslf4j-java==1.7.25-3
-libsm-dev==2:1.2.3-1
-libsm6==2:1.2.3-1
-libsnappy-java==1.1.7.2-1
-libsnappy-jni==1.1.7.2-1
-libsnappy1v5==1.1.7-1
-libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp-dev==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libsoap-lite-perl==1.27-1
-libsodium-dev==1.0.17-1
-libsodium23==1.0.17-1
-libsombok3==2.4.0-2
-libsort-key-perl==1.33-2+b1
-libsort-versions-perl==1.62-1
-libsoup-gnome2.4-1==2.64.2-2
-libsoup2.4-1==2.64.2-2
-libspecio-perl==0.43-1
-libsqlite3-0==3.27.2-3+deb10u1
-libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u7
-libssl1.1==1.1.1d-0+deb10u7
-libstdc++-8-dev==8.3.0-6
-libstemmer0d==0+svn585-1+b2
-libstrictures-perl==2.000005-1
-libstring-copyright-perl==0.003006-1
-libstring-escape-perl==2010.002-2
-libstring-shellquote-perl==1.04-1
-libstruct-dumb-perl==0.09-1
-libsub-exporter-perl==0.987-1
-libsub-exporter-progressive-perl==0.001013-1
-libsub-identify-perl==0.14-1+b1
-libsub-install-perl==0.928-1
-libsub-name-perl==0.21-1+b3
-libsub-quote-perl==2.005001-1
-libsubunit-dev==1.3.0-1
-libsubunit0==1.3.0-1
-libsurefire-java==2.22.1-1
-libswitch-perl==2.17-2
-libsynctex2==2018.20181218.49446-1
-libsys-hostname-long-perl==1.5-1
-libsystemd-dev==241-7~deb10u8
-libtask-weaken-perl==1.06-1
-libtasn1-6-dev==4.13-3
-libtasn1-doc==4.13-3
-libtcl8.6==8.6.9+dfsg-2
-libtcmalloc-minimal4==2.7-1
-libteckit0==2.5.8+ds2-5
-libterm-readkey-perl==2.38-1
-libtest-fatal-perl==0.014-1
-libtest-refcount-perl==0.08-3
-libtexlua52==2018.20181218.49446-1
-libtexlua53==2018.20181218.49446-1
-libtexluajit2==2018.20181218.49446-1
-libtext-charwidth-perl==0.04-7.1+b1
-libtext-glob-perl==0.10-1
-libtext-iconv-perl==1.7-5+b7
-libtext-levenshtein-perl==0.13-1
-libtext-unidecode-perl==1.30-1
-libtext-wrapi18n-perl==0.06-7.1
-libthai-data==0.1.28-2
-libthai0==0.1.28-2
-libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u2
-libtimedate-perl==2.3000-2+deb10u1
-libtinyxml2-6a==7.0.0+dfsg-1
-libtinyxml2-dev==7.0.0+dfsg-1
-libtk8.6==8.6.9-2
-libtool==2.4.6-9
-libtool-bin==2.4.6-9
-libtry-tiny-perl==0.30-1
-libtype-tiny-perl==1.004004-1
-libtype-tiny-xs-perl==0.014-1+b1
-libtypes-serialiser-perl==1.0-1
-libubsan1==8.3.0-6
-libuchardet0==0.0.6-3
-libudev-dev==241-7~deb10u8
-libunbound8==1.9.0-2+deb10u2
-libunicode-linebreak-perl==0.0.20190101-1
-libunicode-utf8-perl==0.62-1
-libunwind-dev==1.2.1-10~deb10u1
-libunwind8==1.2.1-10~deb10u1
-liburi-perl==1.76-1
-libusb-0.1-4==2:0.1.12-32
-libusb-1.0-0==2:1.0.22-2
-libusb-1.0-0-dev==2:1.0.22-2
-libusb-1.0-doc==2:1.0.22-2
-libusb-dev==2:0.1.12-32
-libutempter0==1.1.6-3
-libuv1==1.24.1-1+deb10u1
-libvariable-magic-perl==0.62-1+b1
-libvelocity-tools-java==2.0-7
-libvulkan-dev==1.1.97-2
-libvulkan1==1.1.97-2
-libwacom-bin==0.32-1
-libwacom-common==0.32-1
-libwacom2==0.32-1
-libwagon-file-java==3.3.1-2
-libwagon-http-shaded-java==3.3.1-2
-libwagon-provider-api-java==3.3.1-2
-libwant-perl==0.29-1+b4
-libwayland-bin==1.16.0-1
-libwayland-client0==1.16.0-1
-libwayland-cursor0==1.16.0-1
-libwayland-dev==1.16.0-1
-libwayland-egl1==1.16.0-1
-libwayland-server0==1.16.0-1
-libwebp6==0.6.1-2+deb10u1
-libwebpdemux2==0.6.1-2+deb10u1
-libwebpmux3==0.6.1-2+deb10u1
-libwebsocket-api-java==1.1-1+deb10u1
-libwmf0.2-7==0.2.8.4-14
-libwoff1==1.0.2-1
-libwrap0==7.6.q-28
-libwrap0-dev==7.6.q-28
-libwww-perl==6.36-2
-libwww-robotrules-perl==6.02-1
-libx11-6==2:1.6.7-1+deb10u2
-libx11-data==2:1.6.7-1+deb10u2
-libx11-dev==2:1.6.7-1+deb10u2
-libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.7-1+deb10u2
-libx11-xcb1==2:1.6.7-1+deb10u2
-libx265-165==2.9-4
-libxalan2-java==2.7.2-2
-libxapian-dev==1.4.11-1
-libxapian30==1.4.11-1
-libxau-dev==1:1.0.8-1+b2
-libxau6==1:1.0.8-1+b2
-libxaw7==2:1.0.13-1+b2
-libxbean-reflect-java==4.5-8
-libxcb-dri2-0==1.13.1-2
-libxcb-dri2-0-dev==1.13.1-2
-libxcb-dri3-0==1.13.1-2
-libxcb-dri3-dev==1.13.1-2
-libxcb-glx0==1.13.1-2
-libxcb-glx0-dev==1.13.1-2
-libxcb-icccm4==0.4.1-1.1
-libxcb-image0==0.4.0-1+b2
-libxcb-keysyms1==0.4.0-1+b2
-libxcb-present-dev==1.13.1-2
-libxcb-present0==1.13.1-2
-libxcb-randr0==1.13.1-2
-libxcb-randr0-dev==1.13.1-2
-libxcb-render-util0==0.3.9-1+b1
-libxcb-render0==1.13.1-2
-libxcb-render0-dev==1.13.1-2
-libxcb-shape0==1.13.1-2
-libxcb-shape0-dev==1.13.1-2
-libxcb-shm0==1.13.1-2
-libxcb-shm0-dev==1.13.1-2
-libxcb-sync-dev==1.13.1-2
-libxcb-sync1==1.13.1-2
-libxcb-util0==0.3.8-3+b2
-libxcb-xfixes0==1.13.1-2
-libxcb-xfixes0-dev==1.13.1-2
-libxcb-xinerama0==1.13.1-2
-libxcb-xkb1==1.13.1-2
-libxcb1==1.13.1-2
-libxcb1-dev==1.13.1-2
-libxcomposite-dev==1:0.4.4-2
-libxcomposite1==1:0.4.4-2
-libxcursor-dev==1:1.1.15-2
-libxcursor1==1:1.1.15-2
-libxdamage-dev==1:1.1.4-3+b3
-libxdamage1==1:1.1.4-3+b3
-libxdelta2==1.1.3-9.2
-libxdmcp-dev==1:1.1.2-3
-libxdmcp6==1:1.1.2-3
-libxdot4==2.40.1-6+deb10u1
-libxerces2-java==2.12.0-1
-libxext-dev==2:1.3.3-1+b2
-libxext6==2:1.3.3-1+b2
-libxfixes-dev==1:5.0.3-1
-libxfixes3==1:5.0.3-1
-libxft-dev==2.3.2-2
-libxft2==2.3.2-2
-libxi-dev==2:1.7.9-1
-libxi6==2:1.7.9-1
-libxinerama-dev==2:1.1.4-2
-libxinerama1==2:1.1.4-2
-libxkbcommon-dev==0.8.2-1
-libxkbcommon-x11-0==0.8.2-1
-libxkbcommon0==0.8.2-1
-libxml-commons-external-java==1.4.01-3
-libxml-commons-resolver1.1-java==1.2-9
-libxml-libxml-perl==2.0134+dfsg-1
-libxml-namespacesupport-perl==1.12-1
-libxml-parser-perl==2.44-4
-libxml-sax-base-perl==1.09-1
-libxml-sax-expat-perl==0.51-1
-libxml-sax-perl==1.00+dfsg-1
-libxml-simple-perl==2.25-1
-libxml-twig-perl==1:3.50-1.1
-libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
-libxml2-utils==2.9.4+dfsg1-7+deb10u2
-libxmlgraphics-commons-java==2.3-1
-libxmlrpc-lite-perl==0.717-2
-libxmu6==2:1.1.2-2+b3
-libxmuu1==2:1.1.2-2+b3
-libxpm4==1:3.5.12-1
-libxrandr-dev==2:1.5.1-1
-libxrandr2==2:1.5.1-1
-libxrender-dev==1:0.9.10-1
-libxrender1==1:0.9.10-1
-libxshmfence-dev==1.3-1
-libxshmfence1==1.3-1
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
-libxss1==1:1.2.3-1
-libxt-dev==1:1.1.5-1+b3
-libxt6==1:1.1.5-1+b3
-libxtables-dev==1.8.2-4
-libxtables12==1.8.2-4
-libxtst-dev==2:1.2.3-1
-libxtst6==2:1.2.3-1
-libxv1==2:1.0.11-1
-libxxf86dga1==2:1.1.4-1+b3
-libxxf86vm-dev==1:1.1.4-1+b2
-libxxf86vm1==1:1.1.4-1+b2
-libxxhash0==0.6.5-2
-libxz-java==1.8-2
-libyaml-0-2==0.2.1-1
-libyaml-dev==0.2.1-1
-libyaml-libyaml-perl==0.76+repack-1
-libyaml-tiny-perl==1.73-1
-libzmq3-dev==4.3.1-4+deb10u2
-libzmq5==4.3.1-4+deb10u2
-libzzip-0-13==0.13.62-3.2
-licensecheck==3.0.31-3
-lintian==2.15.0
-linux-compiler-gcc-8-arm==4.19.194-3
-linux-kbuild-4.19==4.19.194-3
-linux-libc-dev==4.19.194-3
-linuxdoc-tools==0.9.73-2
-llvm-6.0==1:6.0.1-10
-llvm-6.0-dev==1:6.0.1-10
-llvm-6.0-runtime==1:6.0.1-10
-llvm-7==1:7.0.1-8+deb10u2
-llvm-7-dev==1:7.0.1-8+deb10u2
-llvm-7-runtime==1:7.0.1-8+deb10u2
-lmodern==2.004.5-6
-logrotate==3.14.0-4
-lsb-base==10.2019051400
-lsb-release==10.2019051400
-lsof==4.91+dfsg-1
-lua-bitop==1.0.2-5
-lua-bitop-dev==1.0.2-5
-lua-cjson==2.1.0+dfsg-2.1
-lua-cjson-dev==2.1.0+dfsg-2.1
-lynx==2.8.9rel.1-3+deb10u1
-lynx-common==2.8.9rel.1-3+deb10u1
-m4==1.4.18-2
-make==4.2.1-1.2
-man-db==2.8.5-2
-manpages==4.16-2
-manpages-dev==4.16-2
-mariadb-common==1:10.3.29-0+deb10u1
-maven==3.6.0-1
-maven-debian-helper==2.3.2
-maven-repo-helper==1.9.3
-mesa-common-dev==18.3.6-2+deb10u1
-mime-support==3.62
-module-assistant==0.11.10
-mysql-common==5.8+1.0.5
-ncurses-term==6.1+20181013-2+deb10u2
-netbase==5.6
-netpbm==2:10.0-15.3+b2
-nettle-dev==3.4.1-1+deb10u1
-nftables==0.9.0-2
-nodejs==14.18.1-deb-1nodesource1
-ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.12+7-2~deb10u1
-openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
-openjdk-11-jre==11.0.12+7-2~deb10u1
-openjdk-11-jre-headless==11.0.12+7-2~deb10u1
-openmpi-bin==3.1.3-11
-openmpi-common==3.1.3-11
-opensp==1.5.2-13+b1
-openssh-client==1:7.9p1-10+deb10u2
-openssh-server==1:7.9p1-10+deb10u2
-openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u7
-packagekit==1.1.12-5
-packagekit-tools==1.1.12-5
-pango1.0-tools==1.42.4-8~deb10u1
-patch==2.7.6-3+deb10u1
-patchutils==0.3.4-2
-pbuilder==0.230.4
-pbzip2==1.1.9-1+b1
-perl==5.28.1-6+deb10u1
-perl-modules-5.28==5.28.1-6+deb10u1
-perl-openssl-defaults==3
-php-cli==2:7.3+69
-php-codecoverage==6.1.4+dfsg-1
-php-common==2:69
-php-deepcopy==1.8.1-1
-php-doctrine-instantiator==1.1.0-2
-php-file-iterator==2.0.2-1
-php-mbstring==2:7.3+69
-php-pear==1:1.10.6+submodules+notgz-1.1+deb10u2
-php-phar-io-manifest==1.0.3-1
-php-phar-io-version==2.0.1-1
-php-phpdocumentor-reflection-common==1.0.1-1
-php-phpdocumentor-reflection-docblock==4.3.0-1
-php-phpdocumentor-type-resolver==0.4.0-2
-php-phpspec-prophecy==1.8.0-1
-php-text-template==1.2.1-2
-php-timer==2.1.1-1
-php-token-stream==3.0.1-1
-php-tokenizer==1.1.0-1
-php-webmozart-assert==1.4.0-3
-php-xml==2:7.3+69
-php7.3-cli==7.3.29-1~deb10u1
-php7.3-common==7.3.29-1~deb10u1
-php7.3-json==7.3.29-1~deb10u1
-php7.3-mbstring==7.3.29-1~deb10u1
-php7.3-opcache==7.3.29-1~deb10u1
-php7.3-readline==7.3.29-1~deb10u1
-php7.3-xml==7.3.29-1~deb10u1
-phpunit==7.5.6-1
-phpunit-code-unit-reverse-lookup==1.0.1-1
-phpunit-comparator==3.0.2-1
-phpunit-diff==3.0.2-1
-phpunit-environment==4.1.0-1
-phpunit-exporter==3.1.0-2
-phpunit-global-state==2.0.0really2.0.0-2
-phpunit-object-enumerator==3.0.3-3
-phpunit-object-reflector==1.1.1-2
-phpunit-recursion-context==3.0.0-2
-phpunit-resource-operations==2.0.1-1
-phpunit-version==2.0.1-1
-pigz==2.4-1
-pinentry-curses==1.1.0-2
-pkg-config==0.29-6
-pkg-php-tools==1.37
-po-debconf==1.0.21
-policykit-1==0.105-25
-poppler-data==0.4.9-2
-pps-tools==1.0.2-1
-preview-latex-style==11.91-2
-pristine-tar==1.46
-procmail==3.22-26
-procps==2:3.3.15-2
-protobuf-compiler==3.6.1.3-2
-ps2eps==1.68+binaryfree-2
-psmisc==23.2-1
-psutils==1.17.dfsg-4
-pylint==1.9.4-1
-python==2.7.16-1
-python-alabaster==0.7.8-1
-python-all==2.7.16-1
-python-all-dev==2.7.16-1
-python-apt-common==1.8.4.3
-python-asn1crypto==0.24.0-1
-python-astroid==1.6.5-3
-python-atomicwrites==1.1.5-2
-python-attr==18.2.0-1
-python-automat==0.6.0-1
-python-babel==2.6.0+dfsg.1-1
-python-babel-localedata==2.6.0+dfsg.1-1
-python-backports.functools-lru-cache==1.5-3
-python-bs4==4.7.1-1
-python-certifi==2018.8.24-1
-python-cffi-backend==1.12.2-1
-python-chardet==3.0.4-3
-python-click==7.0-1
-python-colorama==0.3.7-1
-python-concurrent.futures==3.2.0-2
-python-configparser==3.5.0b2-1
-python-constantly==15.1.0-1
-python-cov-core==1.15.0-2
-python-coverage==4.5.2+dfsg.1-1
-python-crypto==2.6.1-9+b1
-python-cryptography==2.6.1-3+deb10u2
-python-dbus==1.2.8-3
-python-dev==2.7.16-1
-python-docutils==0.14+dfsg-4
-python-egenix-mxdatetime==3.2.9-1
-python-egenix-mxtools==3.2.9-1
-python-entrypoints==0.3-1
-python-enum34==1.1.6-2
-python-funcsigs==1.0.2-4
-python-gi==3.30.4-1
-python-html5lib==1.0.1-1
-python-hyperlink==17.3.1-2
-python-idna==2.6-1
-python-imagesize==1.0.0-1
-python-incremental==16.10.1-3
-python-ipaddr==2.2.0-2
-python-ipaddress==1.0.17-1
-python-isort==4.3.4+ds1-1.1
-python-jinja2==2.10-2
-python-keyring==17.1.1-1
-python-keyrings.alt==3.1.1-1
-python-lazy-object-proxy==1.3.1-1+b1
-python-logilab-common==1.4.2-1
-python-lxml==4.3.2-1+deb10u3
-python-markupsafe==1.1.0-1
-python-mccabe==0.6.1-2
-python-minimal==2.7.16-1
-python-mock==2.0.0-4
-python-more-itertools==4.2.0-1
-python-nose2==0.8.0-1
-python-olefile==0.46-1
-python-openssl==19.0.0-1
-python-packaging==19.0-1
-python-parse==1.6.6-0.1
-python-pathlib2==2.3.3-1
-python-pbr==4.2.0-5
-python-pil==5.4.1-2+deb10u2
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-pluggy==0.8.0-1
-python-py==1.7.0-2
-python-pyasn1==0.4.2-3
-python-pyasn1-modules==0.2.1-0.2
-python-pygments==2.3.1+dfsg-1+deb10u2
-python-pyparsing==2.2.0+dfsg1-2
-python-pytest==3.10.1-2
-python-pytest-cov==2.6.0-1
-python-requests==2.21.0-1
-python-roman==2.0.0-3
-python-scandir==1.9.0-2
-python-secretstorage==2.3.1-2
-python-service-identity==16.0.0-2
-python-setuptools==40.8.0-1
-python-singledispatch==3.4.0.3-2
-python-six==1.12.0-1
-python-soupsieve==1.8+dfsg-1
-python-sphinx==1.8.4-1
-python-stdeb==0.8.5-1
-python-tk==2.7.16-2
-python-twisted==18.9.0-3
-python-twisted-bin==18.9.0-3
-python-twisted-core==18.9.0-3
-python-typing==3.6.6-1
-python-tz==2019.1-1
-python-urllib3==1.24.1-1
-python-webencodings==0.5.1-1
-python-wheel==0.32.3-2
-python-wrapt==1.10.11-1
-python-xdg==0.25-5
-python-zope.interface==4.3.2-1+b2
-python2==2.7.16-1
-python2-dev==2.7.16-1
-python2-minimal==2.7.16-1
-python2.7==2.7.16-2+deb10u1
-python2.7-dev==2.7.16-2+deb10u1
-python2.7-minimal==2.7.16-2+deb10u1
-python3==3.7.3-1
-python3-alabaster==0.7.8-1
-python3-all==3.7.3-1
-python3-all-dbg==3.7.3-1
-python3-all-dev==3.7.3-1
-python3-apt==1.8.4.3
-python3-asn1crypto==0.24.0-1
-python3-atomicwrites==1.1.5-2
-python3-attr==18.2.0-1
-python3-babel==2.6.0+dfsg.1-1
-python3-certifi==2018.8.24-1
-python3-cffi-backend==1.12.2-1
-python3-chardet==3.0.4-3
-python3-cov-core==1.15.0-2
-python3-coverage==4.5.2+dfsg.1-1
-python3-crypto==2.6.1-9+b1
-python3-cryptography==2.6.1-3+deb10u2
-python3-dateutil==2.7.3-3
-python3-dbg==3.7.3-1
-python3-dbus==1.2.8-3
-python3-debian==0.1.35
-python3-dev==3.7.3-1
-python3-distro-info==0.21
-python3-distutils==3.7.3-1
-python3-docutils==0.14+dfsg-4
-python3-entrypoints==0.3-1
-python3-gi==3.30.4-1
-python3-gpg==1.12.0-6
-python3-idna==2.6-1
-python3-imagesize==1.0.0-1
-python3-jinja2==2.10-2
-python3-keyring==17.1.1-1
-python3-keyrings.alt==3.1.1-1
-python3-lib2to3==3.7.3-1
-python3-magic==2:0.4.15-2
-python3-markupsafe==1.1.0-1
-python3-minimal==3.7.3-1
-python3-mock==2.0.0-4
-python3-more-itertools==4.2.0-1
-python3-nose2==0.8.0-1
-python3-olefile==0.46-1
-python3-packaging==19.0-1
-python3-pbr==4.2.0-5
-python3-pil==5.4.1-2+deb10u2
-python3-pkg-resources==40.8.0-1
-python3-pluggy==0.8.0-1
-python3-py==1.7.0-2
-python3-pycurl==7.43.0.2-0.1
-python3-pygments==2.3.1+dfsg-1+deb10u2
-python3-pyparsing==2.2.0+dfsg1-2
-python3-pytest==3.10.1-2
-python3-pytest-cov==2.6.0-1
-python3-requests==2.21.0-1
-python3-roman==2.0.0-3
-python3-secretstorage==2.3.1-2
-python3-setuptools==40.8.0-1
-python3-six==1.12.0-1
-python3-software-properties==0.96.20.2-2
-python3-sphinx==1.8.4-1
-python3-sphinx-rtd-theme==0.4.3+dfsg-1
-python3-tz==2019.1-1
-python3-unidiff==0.5.4-1
-python3-urllib3==1.24.1-1
-python3-wheel==0.32.3-2
-python3-xdg==0.25-5
-python3.7==3.7.3-2+deb10u3
-python3.7-dbg==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
-qdbus==4:4.8.7+dfsg-18+deb10u1
-qt-at-spi==0.4.0-9
-qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
-qt4-qmake==4:4.8.7+dfsg-18+deb10u1
-qt5-default==5.11.3+dfsg1-1+deb10u4
-qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
-qt5-qmake==5.11.3+dfsg1-1+deb10u4
-qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
-qtchooser==66-2
-qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
-qttranslations5-l10n==5.11.3-2
-quilt==0.65-3
-rake==12.3.1-3+deb10u1
-rdfind==1.4.1-1
-readline-common==7.0-5
-rrdtool==1.7.1-2
-rsync==3.1.3-6
-rsyslog==8.1901.0-1
-ruby==1:2.5.1
-ruby-all-dev==1:2.5.1
-ruby-asciidoctor==1.5.8-1
-ruby-did-you-mean==1.2.1-1
-ruby-minitest==5.11.3-1
-ruby-net-telnet==0.1.1-2
-ruby-power-assert==1.1.1-1
-ruby-setup==3.4.1-9
-ruby-test-unit==3.2.8-1
-ruby-xmlrpc==0.3.0-2
-ruby2.5==2.5.5-3+deb10u3
-ruby2.5-dev==2.5.5-3+deb10u3
-ruby2.5-doc==2.5.5-3+deb10u3
-rubygems-integration==1.11+deb10u1
-sassc==3.5.0-1
-sensible-utils==0.0.12
-sgml-base==1.29
-sgml-data==2.0.11
-shared-mime-info==1.10-1
-shellcheck==0.5.0-3
-software-properties-common==0.96.20.2-2
-sphinx-common==1.8.4-1
-sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12+deb10u1
-stgit==0.18-1
-strace==4.26-0.2
-sudo==1.8.27-1+deb10u3
-swig==3.0.12-2
-swig3.0==3.0.12-2
-systemd==241-7~deb10u8
-systemd-sysv==241-7~deb10u8
-t1utils==1.41-3
-tcl==8.6.9+1
-tcl8.6==8.6.9+dfsg-2
-telnet==0.17-41.2
-tex-common==6.11
-tex-gyre==20180621-3
-texi2html==1.82+dfsg1-5
-texinfo==6.5.0.dfsg.1-4+b1
-texlive-base==2018.20190227-2
-texlive-binaries==2018.20181218.49446-1
-texlive-extra-utils==2018.20190227-2
-texlive-font-utils==2018.20190227-2
-texlive-fonts-recommended==2018.20190227-2
-texlive-generic-recommended==2018.20190227-2
-texlive-latex-base==2018.20190227-2
-texlive-latex-extra==2018.20190227-2
-texlive-latex-recommended==2018.20190227-2
-texlive-pictures==2018.20190227-2
-texlive-plain-generic==2018.20190227-2
-tipa==2:1.3-20
-tk==8.6.9+1
-tk8.6==8.6.9-2
-tk8.6-blt2.5==2.5.3+dfsg-4
-ucf==3.0038+nmu1
-unattended-upgrades==1.11.2
-unzip==6.0-23+deb10u2
-uuid-dev==2.33.1-0.1
-velocity==1.7-5+deb10u1
-vim==2:8.1.0875-5
-vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
-wayland-protocols==1.17-1
-wdiff==1.2.2-2+b1
-x11-common==1:7.7+19
-x11-utils==7.7+4
-x11-xserver-utils==7.7+8
-x11proto-composite-dev==1:2018.4-4
-x11proto-core-dev==2018.4-4
-x11proto-damage-dev==1:2018.4-4
-x11proto-dev==2018.4-4
-x11proto-fixes-dev==1:2018.4-4
-x11proto-input-dev==2018.4-4
-x11proto-randr-dev==2018.4-4
-x11proto-record-dev==2018.4-4
-x11proto-xext-dev==2018.4-4
-x11proto-xf86vidmode-dev==2018.4-4
-x11proto-xinerama-dev==2018.4-4
-xauth==1:1.0.10-1
-xbitmaps==1.1.1-2
-xdelta==1.1.3-9.2
-xdelta3==3.0.11-dfsg-1+b1
-xdg-user-dirs==0.17-2
-xdg-utils==1.1.3-1+deb10u1
-xfonts-encodings==1:1.0.4-2
-xfonts-utils==1:7.7+6
-xkb-data==2.26-2
-xml-core==0.18+nmu1
-xorg-sgml-doctools==1:1.11-1
-xsltproc==1.1.32-2.2~deb10u1
-xterm==344-1+deb10u1
-xtrans-dev==1.3.5-1
-xxd==2:8.1.0875-5
-xz-utils==5.2.4-1
-yui-compressor==2.4.8-2
-zip==3.0-11+b1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
deleted file mode 100644
index 182ead414d40..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py2-all-armhf
+++ /dev/null
@@ -1,92 +0,0 @@
-alabaster==0.7.8
-asn1crypto==0.24.0
-astroid==1.6.5
-atomicwrites==1.1.5
-attrs==18.2.0
-automat==0.6.0
-babel==2.6.0
-backports.functools-lru-cache==1.5
-beautifulsoup4==4.7.1
-certifi==2018.8.24
-chardet==3.0.4
-click==7.0
-colorama==0.3.7
-configparser==3.5.0b2
-constantly==15.1.0
-cov-core==1.15.0
-coverage==4.5.2
-crc16==0.1.1
-cryptography==2.6.1
-ctypesgen==1.0.2
-docutils==0.14
-entrypoints==0.3
-enum34==1.1.6
-fastentrypoints==0.12
-funcsigs==1.0.2
-futures==3.2.0
-html5lib==1.0.1
-hyperlink==17.3.1
-idna==2.6
-imagesize==1.0.0
-incremental==16.10.1
-ipaddr==2.2.0
-ipaddress==1.0.17
-isort==4.3.4
-j2cli==0.3.10
-jinja2==2.10
-keyring==17.1.1
-keyrings.alt==3.1.1
-lazy-object-proxy==1.3.1
-logilab-common==1.4.2
-lxml==4.6.2
-m2crypto==0.36.0
-markupsafe==1.1.0
-mccabe==0.6.1
-mmh3==2.5.1
-mock==3.0.5
-mockredispy==2.9.3
-more-itertools==4.2.0
-nose==1.3.7
-nose2==0.8.0
-olefile==0.46
-packaging==19.0
-parse==1.6.6
-pathlib2==2.3.3
-pbr==4.2.0
-pexpect==4.6.0
-pillow==5.4.1
-pluggy==0.8.0
-ptyprocess==0.7.0
-py==1.7.0
-pyasn1==0.4.2
-pyasn1-modules==0.2.1
-pycrypto==2.6.1
-pygments==2.3.1
-pygobject==3.30.4
-pylint==1.9.4
-pympler==0.8
-pyopenssl==19.0.0
-pyparsing==2.2.0
-pytest==3.10.1
-pytest-cov==2.6.0
-pytest-runner==4.4
-pytz==2019.1
-pyxdg==0.25
-pyyaml==5.4.1
-requests==2.21.0
-roman==2.0.0
-scandir==1.9.0
-secretstorage==2.3.1
-service-identity==16.0.0
-singledispatch==3.4.0.3
-six==1.12.0
-soupsieve==1.8
-sphinx==1.8.4
-stdeb==0.8.5
-stgit==0.18
-twisted==18.9.0
-typing==3.6.6
-urllib3==1.24.1
-webencodings==0.5.1
-wrapt==1.10.11
-zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
deleted file mode 100644
index b637591a0f2c..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster-march-armhf/versions-py3-all-armhf
+++ /dev/null
@@ -1,70 +0,0 @@
-alabaster==0.7.8
-asn1crypto==0.24.0
-atomicwrites==1.1.5
-attrs==18.2.0
-babel==2.6.0
-bitarray==2.3.4
-certifi==2018.8.24
-chardet==3.0.4
-cov-core==1.15.0
-coverage==4.5.2
-cryptography==2.6.1
-devscripts==2.19.5+deb10u1
-distro-info==0.21
-docutils==0.14
-entrypoints==0.3
-fastentrypoints==0.12
-gbp==0.9.14
-gcovr==4.1
-gpg==1.12.0
-idna==2.6
-imagesize==1.0.0
-jinja2==2.10
-keyring==17.1.1
-keyrings.alt==3.1.1
-lxml==4.6.2
-m2crypto==0.38.0
-markupsafe==1.1.0
-mmh3==2.5.1
-mock==2.0.0
-mockredispy==2.9.3
-more-itertools==4.2.0
-nose==1.3.7
-nose2==0.8.0
-olefile==0.46
-packaging==19.0
-pbr==4.2.0
-pexpect==4.8.0
-pillow==5.4.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
-pygments==2.3.1
-pygobject==3.30.4
-pympler==0.8
-pyparsing==2.2.0
-pytest==3.10.1
-pytest-cov==2.6.0
-pytest-runner==5.2
-python-apt==1.8.4.3
-python-dateutil==2.7.3
-python-debian==0.1.35
-python-magic==0.4.16
-pytz==2019.1
-pyxdg==0.25
-pyyaml==5.4.1
-redis==3.5.3
-regex==2021.10.23
-requests==2.21.0
-roman==2.0.0
-secretstorage==2.3.1
-six==1.12.0
-sphinx==1.8.4
-sphinx-rtd-theme==0.4.3
-unattended-upgrades==0.1
-unidiff==0.5.4
-urllib3==1.24.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
new file mode 100644
index 000000000000..97246dbb8d1e
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -0,0 +1,55 @@
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
+binutils-aarch64-linux-gnu==2.31.1-16
+containerd.io==1.4.11-1
+distro-info-data==0.41+deb10u4
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
+krb5-locales==1.17-3+deb10u3
+krb5-multidev==1.17-3+deb10u3
+libatk-wrapper-java==0.33.3-22+deb10u1
+libatk-wrapper-java-jni==0.33.3-22+deb10u1
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libcommons-io-java==2.6-2+deb10u1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdrm-etnaviv1==2.4.97-1
+libdrm-freedreno1==2.4.97-1
+libdrm-tegra0==2.4.97-1
+libgssapi-krb5-2==1.17-3+deb10u3
+libgssrpc4==1.17-3+deb10u3
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libk5crypto3==1.17-3+deb10u3
+libkadm5clnt-mit11==1.17-3+deb10u3
+libkadm5srv-mit11==1.17-3+deb10u3
+libkdb5-9==1.17-3+deb10u3
+libkrb5-3==1.17-3+deb10u3
+libkrb5-dev==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libmariadb-dev==1:10.3.31-0+deb10u1
+libmariadb-dev-compat==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
+libtext-iconv-perl==1.7-5+b6
+libtiff5==4.1.0+git191117-2~deb10u3
+libxmlgraphics-commons-java==2.3-1+deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u1
+linux-kbuild-4.19==4.19.208-1
+linux-libc-dev==4.19.208-1
+mariadb-common==1:10.3.31-0+deb10u1
+nodejs==14.18.1-deb-1nodesource1
+php7.3-cli==7.3.31-1~deb10u1
+php7.3-common==7.3.31-1~deb10u1
+php7.3-json==7.3.31-1~deb10u1
+php7.3-mbstring==7.3.31-1~deb10u1
+php7.3-opcache==7.3.31-1~deb10u1
+php7.3-readline==7.3.31-1~deb10u1
+php7.3-xml==7.3.31-1~deb10u1
+psmisc==23.2-1+deb10u1
+squashfs-tools==1:4.3-12+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
new file mode 100644
index 000000000000..6c3ed90c9821
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -0,0 +1,171 @@
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
+binutils-arm-linux-gnueabihf==2.31.1-16
+containerd.io==1.4.11-1
+distro-info-data==0.41+deb10u4
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
+krb5-locales==1.17-3+deb10u3
+krb5-multidev==1.17-3+deb10u3
+libalgorithm-c3-perl==0.10-1
+libatk-wrapper-java==0.33.3-22+deb10u1
+libatk-wrapper-java-jni==0.33.3-22+deb10u1
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libclang-6.0-dev==1:6.0.1-10
+libclang-7-dev==1:7.0.1-8+deb10u2
+libclang-common-6.0-dev==1:6.0.1-10
+libclang-dev==1:7.0-47
+libclass-c3-perl==0.34-1
+libclass-c3-xs-perl==0.14-1+b3
+libclass-data-inheritable-perl==0.08-3
+libcommons-io-java==2.6-2+deb10u1
+libdevel-caller-perl==2.06-2+b1
+libdevel-lexalias-perl==0.05-2+b1
+libdevel-stacktrace-perl==2.0300-1
+libdist-checkconflicts-perl==0.11-1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdrm-etnaviv1==2.4.97-1
+libdrm-exynos1==2.4.97-1
+libdrm-freedreno1==2.4.97-1
+libdrm-omap1==2.4.97-1
+libdrm-tegra0==2.4.97-1
+libemail-date-format-perl==1.005-1
+libeval-closure-perl==0.14-1
+libexception-class-perl==1.44-1
+libgles2-mesa-dev==18.3.6-2+deb10u1
+libgssapi-krb5-2==1.17-3+deb10u3
+libgssrpc4==1.17-3+deb10u3
+libipc-shareable-perl==0.61-2
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libjargs-java==1.0.0-4
+libk5crypto3==1.17-3+deb10u3
+libkadm5clnt-mit11==1.17-3+deb10u3
+libkadm5srv-mit11==1.17-3+deb10u3
+libkdb5-9==1.17-3+deb10u3
+libkrb5-3==1.17-3+deb10u3
+libkrb5-dev==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
+liblog-dispatch-perl==2.68-1
+liblog-log4perl-perl==1.49-1
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libmariadb-dev==1:10.3.31-0+deb10u1
+libmariadb-dev-compat==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
+libmime-charset-perl==1.012.2-1
+libmime-lite-perl==3.030-2
+libmime-types-perl==2.17-1
+libmro-compat-perl==0.13-1
+libnamespace-autoclean-perl==0.28-1
+libpadwalker-perl==2.3-1+b1
+libparams-validationcompiler-perl==0.30-1
+librust-aho-corasick-dev==0.6.9-1
+librust-ansi-term-dev==0.11.0-1
+librust-atty-dev==0.2.11-1
+librust-autocfg-dev==0.1.1-1
+librust-backtrace+default-dev==0.3.13-1
+librust-backtrace+libbacktrace-dev==0.3.13-1
+librust-backtrace-dev==0.3.13-1
+librust-backtrace-sys-dev==0.1.28-1
+librust-bindgen+logging-dev==0.47.0-1
+librust-bindgen-dev==0.47.0-1
+librust-bitflags-dev==1.0.4-1
+librust-byteorder-dev==1.3.1-1
+librust-cc-dev==1.0.28-1
+librust-cexpr-dev==0.3.3-1
+librust-cfg-if-dev==0.1.6-1
+librust-clang-sys+clang-6-0-dev==0.27.0-1
+librust-clang-sys+runtime-dev==0.27.0-1
+librust-clang-sys-dev==0.27.0-1
+librust-clap+color-dev==2.32.0-4
+librust-clap+default-dev==2.32.0-4
+librust-clap+suggestions-dev==2.32.0-4
+librust-clap-dev==2.32.0-4
+librust-env-logger+default-dev==0.6.0-1
+librust-env-logger-dev==0.6.0-1
+librust-failure+default-dev==0.1.5-1
+librust-failure+derive-dev==0.1.5-1
+librust-failure+std-dev==0.1.5-1
+librust-failure-derive-dev==0.1.5-1
+librust-failure-dev==0.1.5-1
+librust-glob-dev==0.2.11-1
+librust-hashbrown-dev==0.1.8-1
+librust-humantime-dev==1.1.1-2
+librust-lazy-static-dev==1.2.0-1
+librust-libc-dev==0.2.48-1
+librust-libloading-dev==0.5.0-1
+librust-log-dev==0.4.6-1
+librust-memchr+default-dev==2.1.3-1
+librust-memchr+use-std-dev==2.1.3-1
+librust-memchr-dev==2.1.3-1
+librust-nom+std-dev==4.0.0-1
+librust-nom-dev==4.0.0-1
+librust-peeking-take-while-dev==0.1.2-1
+librust-proc-macro2-dev==0.4.27-1
+librust-quick-error-dev==1.2.2-1
+librust-quote+proc-macro-dev==0.6.11-1
+librust-quote-dev==0.6.11-1
+librust-redox-syscall-dev==0.1.40-2
+librust-redox-termios-dev==0.1.1-2
+librust-regex-dev==1.1.0-1
+librust-regex-syntax-dev==0.6.5-1
+librust-rustc-demangle-dev==0.1.13-1
+librust-scopeguard-dev==0.3.3-1
+librust-strsim-dev==0.7.0-1
+librust-syn+default-dev==0.15.26-1
+librust-syn+printing-dev==0.15.26-1
+librust-syn+proc-macro-dev==0.15.26-1
+librust-syn-dev==0.15.26-1
+librust-synstructure-dev==0.10.1-1
+librust-termcolor-dev==1.0.4-1
+librust-termion-dev==1.5.1-1
+librust-textwrap-dev==0.11.0-1
+librust-thread-local-dev==0.3.6-1
+librust-ucd-util-dev==0.1.1-1
+librust-unicode-width-dev==0.1.5-1
+librust-unicode-xid-dev==0.1.0-1
+librust-utf8-ranges-dev==1.0.2-1
+librust-vec-map-dev==0.8.1-2
+librust-which-dev==2.0.1-1
+librust-winapi-dev==0.3.6-1
+librust-winapi-i686-pc-windows-gnu-dev==0.4.0-1
+librust-winapi-x86-64-pc-windows-gnu-dev==0.4.0-1
+librust-wincolor-dev==1.0.0-1
+libsass1==3.5.5-4
+libsombok3==2.4.0-2
+libspecio-perl==0.43-1
+libtiff5==4.1.0+git191117-2~deb10u3
+libunicode-linebreak-perl==0.0.20190101-1
+libxapian-dev==1.4.11-1
+libxmlgraphics-commons-java==2.3-1+deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u1
+libyaml-tiny-perl==1.73-1
+linux-compiler-gcc-8-arm==4.19.208-1
+linux-kbuild-4.19==4.19.208-1
+linux-libc-dev==4.19.208-1
+llvm-6.0==1:6.0.1-10
+llvm-6.0-dev==1:6.0.1-10
+llvm-6.0-runtime==1:6.0.1-10
+mariadb-common==1:10.3.31-0+deb10u1
+nodejs==14.18.1-deb-1nodesource1
+php7.3-cli==7.3.31-1~deb10u1
+php7.3-common==7.3.31-1~deb10u1
+php7.3-json==7.3.31-1~deb10u1
+php7.3-mbstring==7.3.31-1~deb10u1
+php7.3-opcache==7.3.31-1~deb10u1
+php7.3-readline==7.3.31-1~deb10u1
+php7.3-xml==7.3.31-1~deb10u1
+ps2eps==1.68+binaryfree-2
+psmisc==23.2-1+deb10u1
+rdfind==1.4.1-1
+sassc==3.5.0-1
+squashfs-tools==1:4.3-12+deb10u2
+texlive-extra-utils==2018.20190227-2
+texlive-font-utils==2018.20190227-2
+yui-compressor==2.4.8-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..c1a0c3be0413
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1 @@
+regex==2021.11.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..c1a0c3be0413
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+regex==2021.11.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
deleted file mode 100644
index 8f227fd60bf8..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-deb-stretch-arm64
+++ /dev/null
@@ -1,1409 +0,0 @@
-adwaita-icon-theme==3.22.0-1+deb9u1
-ant==1.9.9-1+deb9u1
-ant-optional==1.9.9-1+deb9u1
-apt-file==3.1.4
-apt-transport-https==1.4.11
-apt-utils==1.4.11
-asciidoc-base==8.6.9-5
-asciidoc-common==8.6.9-5
-aspell==0.60.7~20110707-3+deb9u1
-aspell-en==2016.11.20-0-0.1
-at==3.1.20-3
-at-spi2-core==2.22.0-6+deb9u1
-aufs-dkms==4.9+20161219-1
-aufs-tools==1:4.1+20161219-1
-augeas-lenses==1.8.0-1+deb9u1
-augeas-tools==1.8.0-1+deb9u1
-autoconf==2.69-10
-autoconf-archive==20160916-1
-automake==1:1.15-6
-automake1.11==1:1.11.6-4
-autopoint==0.19.8.1-2+deb9u1
-autotools-dev==20161112.1
-bash-completion==1:2.1-4.3
-bc==1.06.95-9+b3
-bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
-binfmt-support==2.1.6-2
-binutils==2.28-5
-bison==2:3.0.4.dfsg-1+b1
-blt==2.5.3+dfsg-3
-bsdmainutils==9.0.12+nmu1
-build-essential==12.3
-byacc==20140715-1+b1
-bzip2==1.0.6-8.1
-ca-certificates==20200601~deb9u2
-ca-certificates-java==20170929~deb9u3
-cdbs==0.4.150
-cgmanager==0.41-2
-cgroupfs-mount==1.3
-check==0.10.0-3+b3
-chrpath==0.16-2+b1
-clang==1:3.8-36
-clang-3.8==1:3.8.1-24
-cm-super-minimal==0.3.4-9
-cmake==3.13.2-1~bpo9+1
-cmake-data==3.13.2-1~bpo9+1
-cmocka-doc==1.0.1-3
-cowbuilder==0.85
-cowdancer==0.85
-cpio==2.11+dfsg-6
-cpp==4:6.3.0-4
-cpp-6==6.3.0-18+deb9u1
-cppcheck==1.76.1-1
-cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u16
-dbus==1.10.32-0+deb9u1
-dconf-gsettings-backend==0.26.0-2+b1
-dconf-service==0.26.0-2+b1
-dctrl-tools==2.24-2+b1
-debhelper==12.1.1~bpo9+1
-debian-keyring==2017.05.28
-debootstrap==1.0.89
-default-jdk-headless==2:1.8-58+deb9u1
-default-jre==2:1.8-58+deb9u1
-default-jre-headless==2:1.8-58+deb9u1
-default-libmysqlclient-dev==1.0.2
-devscripts==2.17.6+deb9u2
-dh-autoreconf==17~bpo9+1
-dh-exec==0.23+b1
-dh-make==2.201608
-dh-python==2.20170125
-dh-strip-nondeterminism==0.034-1
-dh-systemd==10.2.5
-dictionaries-common==1.27.2
-diffstat==1.61-1+b1
-dirmngr==2.1.18-8~deb9u4
-distro-info-data==0.36
-dkms==2.3-2
-dmsetup==2:1.02.137-2
-dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
-docbook-xml==4.5-8
-docbook-xsl==1.79.1+dfsg-2
-docker-ce==18.06.3~ce~3-0~debian
-docutils-common==0.13.1+dfsg-2
-docutils-doc==0.13.1+dfsg-2
-doxygen==1.8.13-4+b1
-dpatch==2.0.38+nmu1~bpo9+1
-dpkg-dev==1.18.25
-dput==0.12.1
-dwz==0.12-1+b1
-eatmydata==105-5
-emacsen-common==2.0.8
-equivs==2.0.9+nmu1
-exim4==4.89-2+deb9u8
-exim4-base==4.89-2+deb9u8
-exim4-config==4.89-2+deb9u8
-exim4-daemon-light==4.89-2+deb9u8
-expat==2.2.0-2+deb9u3
-exuberant-ctags==1:5.9~svn20110310-11
-fakeroot==1.21-3.1
-file==1:5.30-1+deb9u3
-flex==2.6.1-1.3
-fontconfig==2.11.0-6.7+b1
-fontconfig-config==2.11.0-6.7
-fonts-dejavu-core==2.37-1
-fonts-dejavu-extra==2.37-1
-fonts-droid-fallback==1:6.0.1r16-1.1
-fonts-font-awesome==4.7.0~dfsg-1
-fonts-lato==2.0-1
-fonts-liberation==1:1.07.4-2
-fonts-lmodern==2.004.5-3
-fonts-noto-mono==20161116-1
-fonts-texgyre==20160520-1
-fop==1:2.1-6
-g++==4:6.3.0-4
-g++-6==6.3.0-18+deb9u1
-gawk==1:4.1.4+dfsg-1
-gcc==4:6.3.0-4
-gcc-6==6.3.0-18+deb9u1
-gcovr==3.3-1
-gdb==7.12-6
-gem2deb==0.33.1
-gem2deb-test-runner==0.33.1
-geoip-database==20170512-1
-gettext==0.19.8.1-2+deb9u1
-gettext-base==0.19.8.1-2+deb9u1
-ghostscript==9.26a~dfsg-0+deb9u7
-gir1.2-glib-2.0==1.50.0-1+b1
-gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
-git==1:2.11.0-3+deb9u7
-git-buildpackage==0.8.12.2
-git-man==1:2.11.0-3+deb9u7
-glib-networking==2.50.0-1+deb9u1
-glib-networking-common==2.50.0-1+deb9u1
-glib-networking-services==2.50.0-1+deb9u1
-gnome-icon-theme==3.12.0-2
-gnupg==2.1.18-8~deb9u4
-gnupg-agent==2.1.18-8~deb9u4
-gnupg-l10n==2.1.18-8~deb9u4
-gnupg2==2.1.18-8~deb9u4
-googletest==1.8.0-6
-graphviz==2.38.0-17+deb9u1
-groff==1.22.3-9
-groff-base==1.22.3-9
-gsettings-desktop-schemas==3.22.0-1
-gsfonts==1:8.11+urwcyr1.0.7~pre44-4.3
-gtk-update-icon-cache==3.22.11-1
-guile-2.0-libs==2.0.13+1-4
-hicolor-icon-theme==0.15-1
-icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==57.1-6+deb9u5
-imagemagick==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
-install-info==6.3.0.dfsg.1-1+b2
-intltool-debian==0.35.0+20060710.4
-iproute2==4.9.0-1+deb9u1
-iptables==1.6.0+snapshot20161117-6
-iptables-dev==1.6.0+snapshot20161117-6
-iso-codes==3.75-1
-java-common==0.58+deb9u1
-java-wrappers==0.1.28
-javahelper==0.59
-javascript-common==11
-junit==3.8.2-8
-junit4==4.12-4+deb9u1
-kernel-wedge==2.96
-kmod==23-2
-krb5-locales==1.15-1+deb9u3
-less==481-2.1
-libalgorithm-diff-perl==1.19.03-1
-libalgorithm-diff-xs-perl==0.04-4+b2
-libalgorithm-merge-perl==0.08-3
-libann0==1.1.2+doc-6
-libaopalliance-java==20070526-5
-libapache-pom-java==10-2
-libapparmor1==2.11.0-3+deb9u2
-libapt-inst2.0==1.4.11
-libapt-pkg-perl==0.1.32
-libarchive-zip-perl==1.59-1+deb9u1
-libarchive13==3.2.2-2+deb9u2
-libasan3==6.3.0-18+deb9u1
-libasm-java==5.2-2
-libasound2==1.1.3-5
-libasound2-data==1.1.3-5
-libaspell15==0.60.7~20110707-3+deb9u1
-libassuan0==2.4.3-2
-libasyncns0==0.8-6
-libatinject-jsr330-api-java==1.0+ds1-2
-libatk-bridge2.0-0==2.22.0-2
-libatk-wrapper-java==0.33.3-13+deb9u1
-libatk-wrapper-java-jni==0.33.3-13+deb9u1
-libatk1.0-0==2.22.0-1
-libatk1.0-data==2.22.0-1
-libatm1==1:2.5.1-2
-libatm1-dev==1:2.5.1-2
-libatomic1==6.3.0-18+deb9u1
-libatspi2.0-0==2.22.0-6+deb9u1
-libaudio2==1.9.4-5+b1
-libaudit-dev==1:2.6.7-2
-libaugeas0==1.8.0-1+deb9u1
-libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.6.32-2
-libavahi-common-data==0.6.32-2
-libavahi-common3==0.6.32-2
-libavalon-framework-java==4.2.0-9
-libb-hooks-endofscope-perl==0.21-1
-libbabeltrace-ctf-dev==1.5.1-1
-libbabeltrace-ctf1==1.5.1-1
-libbabeltrace-dev==1.5.1-1
-libbabeltrace1==1.5.1-1
-libbatik-java==1.8-4+deb9u2
-libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
-libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libbison-dev==2:3.0.4.dfsg-1+b1
-libbit-vector-perl==7.4-1+b2
-libboost-all-dev==1.62.0.1
-libboost-atomic-dev==1.62.0.1
-libboost-atomic1.62-dev==1.62.0+dfsg-4
-libboost-atomic1.62.0==1.62.0+dfsg-4
-libboost-chrono-dev==1.62.0.1
-libboost-chrono1.62-dev==1.62.0+dfsg-4
-libboost-chrono1.62.0==1.62.0+dfsg-4
-libboost-context-dev==1.62.0.1
-libboost-context1.62-dev==1.62.0+dfsg-4
-libboost-context1.62.0==1.62.0+dfsg-4
-libboost-coroutine-dev==1.62.0.1
-libboost-coroutine1.62-dev==1.62.0+dfsg-4
-libboost-coroutine1.62.0==1.62.0+dfsg-4
-libboost-date-time-dev==1.62.0.1
-libboost-date-time1.62-dev==1.62.0+dfsg-4
-libboost-date-time1.62.0==1.62.0+dfsg-4
-libboost-dev==1.62.0.1
-libboost-exception-dev==1.62.0.1
-libboost-exception1.62-dev==1.62.0+dfsg-4
-libboost-fiber-dev==1.62.0.1
-libboost-fiber1.62-dev==1.62.0+dfsg-4
-libboost-fiber1.62.0==1.62.0+dfsg-4
-libboost-filesystem-dev==1.62.0.1
-libboost-filesystem1.62-dev==1.62.0+dfsg-4
-libboost-filesystem1.62.0==1.62.0+dfsg-4
-libboost-graph-dev==1.62.0.1
-libboost-graph-parallel-dev==1.62.0.1
-libboost-graph-parallel1.62-dev==1.62.0+dfsg-4
-libboost-graph-parallel1.62.0==1.62.0+dfsg-4
-libboost-graph1.62-dev==1.62.0+dfsg-4
-libboost-graph1.62.0==1.62.0+dfsg-4
-libboost-iostreams-dev==1.62.0.1
-libboost-iostreams1.62-dev==1.62.0+dfsg-4
-libboost-iostreams1.62.0==1.62.0+dfsg-4
-libboost-locale-dev==1.62.0.1
-libboost-locale1.62-dev==1.62.0+dfsg-4
-libboost-locale1.62.0==1.62.0+dfsg-4
-libboost-log-dev==1.62.0.1
-libboost-log1.62-dev==1.62.0+dfsg-4
-libboost-log1.62.0==1.62.0+dfsg-4
-libboost-math-dev==1.62.0.1
-libboost-math1.62-dev==1.62.0+dfsg-4
-libboost-math1.62.0==1.62.0+dfsg-4
-libboost-mpi-dev==1.62.0.1
-libboost-mpi-python-dev==1.62.0.1
-libboost-mpi-python1.62-dev==1.62.0+dfsg-4
-libboost-mpi-python1.62.0==1.62.0+dfsg-4
-libboost-mpi1.62-dev==1.62.0+dfsg-4
-libboost-mpi1.62.0==1.62.0+dfsg-4
-libboost-program-options-dev==1.62.0.1
-libboost-program-options1.62-dev==1.62.0+dfsg-4
-libboost-program-options1.62.0==1.62.0+dfsg-4
-libboost-python-dev==1.62.0.1
-libboost-python1.62-dev==1.62.0+dfsg-4
-libboost-python1.62.0==1.62.0+dfsg-4
-libboost-random-dev==1.62.0.1
-libboost-random1.62-dev==1.62.0+dfsg-4
-libboost-random1.62.0==1.62.0+dfsg-4
-libboost-regex-dev==1.62.0.1
-libboost-regex1.62-dev==1.62.0+dfsg-4
-libboost-regex1.62.0==1.62.0+dfsg-4
-libboost-serialization-dev==1.62.0.1
-libboost-serialization1.62-dev==1.62.0+dfsg-4
-libboost-serialization1.62.0==1.62.0+dfsg-4
-libboost-signals-dev==1.62.0.1
-libboost-signals1.62-dev==1.62.0+dfsg-4
-libboost-signals1.62.0==1.62.0+dfsg-4
-libboost-system-dev==1.62.0.1
-libboost-system1.62-dev==1.62.0+dfsg-4
-libboost-system1.62.0==1.62.0+dfsg-4
-libboost-test-dev==1.62.0.1
-libboost-test1.62-dev==1.62.0+dfsg-4
-libboost-test1.62.0==1.62.0+dfsg-4
-libboost-thread-dev==1.62.0.1
-libboost-thread1.62-dev==1.62.0+dfsg-4
-libboost-thread1.62.0==1.62.0+dfsg-4
-libboost-timer-dev==1.62.0.1
-libboost-timer1.62-dev==1.62.0+dfsg-4
-libboost-timer1.62.0==1.62.0+dfsg-4
-libboost-tools-dev==1.62.0.1
-libboost-type-erasure-dev==1.62.0.1
-libboost-type-erasure1.62-dev==1.62.0+dfsg-4
-libboost-type-erasure1.62.0==1.62.0+dfsg-4
-libboost-wave-dev==1.62.0.1
-libboost-wave1.62-dev==1.62.0+dfsg-4
-libboost-wave1.62.0==1.62.0+dfsg-4
-libboost1.62-dev==1.62.0+dfsg-4
-libboost1.62-tools-dev==1.62.0+dfsg-4
-libbsd-dev==0.8.3-1+deb9u1
-libbsd0==0.8.3-1+deb9u1
-libbsf-java==1:2.4.0-5
-libbsh-java==2.0b4-18
-libc-ares-dev==1.12.0-1+deb9u2
-libc-ares2==1.12.0-1+deb9u2
-libc-dev-bin==2.24-11+deb9u4
-libc6-dbg==2.24-11+deb9u4
-libc6-dev==2.24-11+deb9u4
-libcairo-gobject2==1.14.8-1+deb9u1
-libcairo2==1.14.8-1+deb9u1
-libcap-dev==1:2.25-1
-libcap-ng-dev==0.7.7-3+b1
-libcap2==1:2.25-1
-libcap2-bin==1:2.25-1
-libcarp-clan-perl==6.06-1
-libcc1-0==6.3.0-18+deb9u1
-libcdi-api-java==1.0-2
-libcdt5==2.38.0-17+deb9u1
-libcgi-fast-perl==1:2.12-1
-libcgi-pm-perl==4.35-1
-libcglib-java==3.2.4-1
-libcgmanager0==0.41-2
-libcgraph6==2.38.0-17+deb9u1
-libclang-common-3.8-dev==1:3.8.1-24
-libclang1-3.8==1:3.8.1-24
-libclang1-3.9==1:3.9.1-9
-libclass-accessor-perl==0.34-1
-libclass-inspector-perl==1.31-1
-libclass-method-modifiers-perl==2.12-1
-libclass-xsaccessor-perl==1.19-2+b7
-libclassworlds-java==1.1-final-5
-libclone-perl==0.38-2+b1
-libcmocka-dev==1.0.1-3
-libcmocka0==1.0.1-3
-libcolord2==1.3.3-2
-libcommons-beanutils-java==1.9.3-1
-libcommons-cli-java==1.3.1-3
-libcommons-codec-java==1.10-1
-libcommons-collections3-java==3.2.2-1
-libcommons-configuration-java==1.10-4
-libcommons-digester-java==1.8.1-4
-libcommons-httpclient-java==3.1-12
-libcommons-io-java==2.5-1+deb9u1
-libcommons-lang-java==2.6-6
-libcommons-lang3-java==3.5-1
-libcommons-logging-java==1.2-1
-libcommons-net-java==3.5-1
-libcommons-parent-java==39-3
-libcommons-validator-java==1:1.5.1-1
-libconvert-binhex-perl==1.125-1
-libcroco3==0.6.11-3
-libcryptsetup4==2:1.7.3-4
-libcups2==2.2.1-8+deb9u6
-libcupsfilters1==1.11.6-3+deb9u1
-libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u16
-libcurl3-gnutls==7.52.1-5+deb9u16
-libcurl3-nss==7.52.1-5+deb9u16
-libcurl4-nss-dev==7.52.1-5+deb9u16
-libdaemon-dev==0.14-6
-libdaemon0==0.14-6
-libdata-optlist-perl==0.110-1
-libdatrie1==0.2.10-4+b1
-libdb-dev==5.3.1
-libdb5.3-dev==5.3.28-12+deb9u1
-libdbi1==0.9.0-4+deb9u2
-libdbus-1-3==1.10.32-0+deb9u1
-libdbus-1-dev==1.10.32-0+deb9u1
-libdbus-glib-1-2==0.108-2
-libdconf1==0.26.0-2+b1
-libdevel-globaldestruction-perl==0.14-1
-libdevmapper1.02.1==2:1.02.137-2
-libdigest-hmac-perl==1.03+dfsg-1
-libdistro-info-perl==0.14
-libdjvulibre-text==3.5.27.1-7+deb9u2
-libdjvulibre21==3.5.27.1-7+deb9u2
-libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
-libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
-libdom4j-java==1.6.1+dfsg.3-2+deb9u1
-libdouble-conversion1==2.0.1-4
-libdoxia-core-java==1.1.4-6
-libdoxia-java==1.1.4-6
-libdoxia-sitetools-java==1.1.4-1.1
-libdpkg-perl==1.18.25
-libdrm-amdgpu1==2.4.74-1
-libdrm-dev==2.4.74-1
-libdrm-freedreno1==2.4.74-1
-libdrm-nouveau2==2.4.74-1
-libdrm-radeon1==2.4.74-1
-libdrm-tegra0==2.4.74-1
-libdrm2==2.4.74-1
-libdw-dev==0.168-1
-libdw1==0.168-1
-libeasymock-java==3.4+ds-1
-libeatmydata1==105-5
-libeclipse-aether-java==1.0.2-1
-libedit-dev==3.1-20160903-3
-libedit2==3.1-20160903-3
-libegl1-mesa==13.0.6-1+b2
-libelf-dev==0.168-1
-libelf1==0.168-1
-libemail-valid-perl==1.202-1
-libencode-locale-perl==1.05-1
-libepoxy0==1.3.1-2
-liberror-perl==0.17024-1
-libestr0==0.1.10-2
-libevdev2==1.5.6+dfsg-1
-libevent-2.0-5==2.0.21-stable-3
-libevent-core-2.0-5==2.0.21-stable-3
-libevent-dev==2.0.21-stable-3
-libevent-extra-2.0-5==2.0.21-stable-3
-libevent-openssl-2.0-5==2.0.21-stable-3
-libevent-pthreads-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u3
-libexpat1-dev==2.2.0-2+deb9u3
-libexplain-dev==1.4.D001-6
-libexplain51==1.4.D001-6
-libexporter-tiny-perl==0.042-1
-libfakeroot==1.21-3.1
-libfastjson4==0.99.4-1
-libfcgi-perl==0.78-2
-libffi-dev==3.2.1-6
-libfftw3-double3==3.3.5-3
-libfile-basedir-perl==0.07-1
-libfile-chdir-perl==0.1008-1
-libfile-desktopentry-perl==0.22-1
-libfile-fcntllock-perl==0.22-3+b2
-libfile-homedir-perl==1.00-1
-libfile-listing-perl==6.04-1
-libfile-mimeinfo-perl==0.27-1
-libfile-stripnondeterminism-perl==0.034-1
-libfile-which-perl==1.21-1
-libfl-dev==2.6.1-1.3
-libflac8==1.3.2-2+deb9u1
-libfont-afm-perl==1.20-2
-libfontbox-java==1:1.8.12-1
-libfontconfig1==2.11.0-6.7+b1
-libfontenc1==1:1.1.3-1+b2
-libfop-java==1:2.1-6
-libfreetype6==2.6.3-3.2+deb9u2
-libfribidi0==0.19.7-1+deb9u1
-libgail-common==2.24.31-2
-libgail18==2.24.31-2
-libgbm1==13.0.6-1+b2
-libgc1c2==1:7.4.2-8
-libgcc-6-dev==6.3.0-18+deb9u1
-libgd3==2.2.4-2+deb9u5
-libgdbm3==1.8.3-14
-libgdk-pixbuf2.0-0==2.36.5-2+deb9u2
-libgdk-pixbuf2.0-common==2.36.5-2+deb9u2
-libgeoip1==1.6.9-4
-libgeronimo-interceptor-3.0-spec-java==1.0.1-3
-libgetopt-long-descriptive-perl==0.100-1
-libgfortran3==6.3.0-18+deb9u1
-libgif7==5.1.4-0.4
-libgirepository-1.0-1==1.50.0-1+b1
-libgit-wrapper-perl==0.047-1
-libgl1-mesa-dev==13.0.6-1+b2
-libgl1-mesa-dri==13.0.6-1+b2
-libgl1-mesa-glx==13.0.6-1+b2
-libglapi-mesa==13.0.6-1+b2
-libglew2.0==2.0.0-3+b1
-libglib2.0-0==2.50.3-2+deb9u2
-libglib2.0-bin==2.50.3-2+deb9u2
-libglib2.0-data==2.50.3-2+deb9u2
-libglib2.0-dev==2.50.3-2+deb9u2
-libglu1-mesa==9.0.0-2.1
-libglu1-mesa-dev==9.0.0-2.1
-libgmp-dev==2:6.1.2+dfsg-1
-libgmpxx4ldbl==2:6.1.2+dfsg-1
-libgomp1==6.3.0-18+deb9u1
-libgoogle-perftools4==2.5-2.2
-libgpgme11==1.8.0-3+b2
-libgpm2==1.20.4-6.2+b1
-libgraphite2-3==1.3.10-1
-libgs9==9.26a~dfsg-0+deb9u7
-libgs9-common==9.26a~dfsg-0+deb9u7
-libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u3
-libgstreamer1.0-0==1.10.4-1
-libgtest-dev==1.8.0-6
-libgtk-3-0==3.22.11-1
-libgtk-3-bin==3.22.11-1
-libgtk-3-common==3.22.11-1
-libgtk2.0-0==2.24.31-2
-libgtk2.0-bin==2.24.31-2
-libgtk2.0-common==2.24.31-2
-libgts-0.7-5==0.7.6+darcs121130-4
-libgts-bin==0.7.6+darcs121130-4
-libguava-java==19.0-1
-libgudev-1.0-0==230-3
-libguice-java==4.0-3
-libgvc6==2.38.0-17+deb9u1
-libgvpr2==2.38.0-17+deb9u1
-libhamcrest-java==1.3-6
-libharfbuzz-icu0==1.4.2-1
-libharfbuzz0b==1.4.2-1
-libhtml-form-perl==6.03-1
-libhtml-format-perl==2.12-1
-libhtml-parser-perl==3.72-3
-libhtml-tagset-perl==3.20-3
-libhtml-tree-perl==5.03-2
-libhttp-cookies-perl==6.01-1
-libhttp-daemon-perl==6.01-1
-libhttp-date-perl==6.02-1
-libhttp-message-perl==6.11-1
-libhttp-negotiate-perl==6.00-2
-libhttpclient-java==4.5.2-2+deb9u1
-libhttpcore-java==4.4.6-1
-libhwloc-dev==1.11.5-1
-libhwloc-plugins==1.11.5-1
-libhwloc5==1.11.5-1
-libiberty-dev==20161220-1
-libibverbs-dev==1.2.1-2
-libibverbs1==1.2.1-2
-libice-dev==2:1.0.9-2
-libice6==2:1.0.9-2
-libicu-dev==57.1-6+deb9u5
-libicu57==57.1-6+deb9u5
-libijs-0.35==0.35-12
-libilmbase12==2.2.0-12
-libimport-into-perl==1.002005-1
-libinput-bin==1.6.3-1
-libinput10==1.6.3-1
-libio-html-perl==1.001-1
-libio-pty-perl==1:1.08-1.1+b2
-libio-sessiondata-perl==1.03-1
-libio-socket-inet6-perl==2.72-2
-libio-socket-ssl-perl==2.044-1
-libio-string-perl==1.08-3
-libio-stringy-perl==2.111-2
-libip4tc-dev==1.6.0+snapshot20161117-6
-libip4tc0==1.6.0+snapshot20161117-6
-libip6tc-dev==1.6.0+snapshot20161117-6
-libip6tc0==1.6.0+snapshot20161117-6
-libipc-run-perl==0.94-1+deb9u1
-libipc-system-simple-perl==1.25-3
-libiptc-dev==1.6.0+snapshot20161117-6
-libiptc0==1.6.0+snapshot20161117-6
-libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisl15==0.18-1
-libisorelax-java==20041111-9
-libitext1-java==1.4-6
-libitm1==6.3.0-18+deb9u1
-libjansson-dev==2.9-1
-libjansson4==2.9-1
-libjaxen-java==1.1.6-1+deb9u1
-libjaxp1.3-java==1.3.05-2
-libjbig0==2.1-3.1+b2
-libjbig2dec0==0.13-4.1
-libjdom1-java==1.1.3-1+deb9u1
-libjemalloc-dev==3.6.0-9.1
-libjemalloc1==3.6.0-9.1
-libjetty9-java==9.2.30-0+deb9u2
-libjline-java==1.0-2
-libjpeg62-turbo==1:1.5.1-2+deb9u1
-libjs-bootstrap==3.3.7+dfsg-2+deb9u2
-libjs-jquery==3.1.1-2+deb9u2
-libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
-libjs-jquery-isonscreen==1.2.0-1
-libjs-jquery-metadata==11-3
-libjs-jquery-tablesorter==11-3
-libjs-jquery-throttle-debounce==1.1+dfsg.1-1
-libjs-modernizr==2.6.2+ds1-1
-libjs-sphinxdoc==1.4.9-2
-libjs-twitter-bootstrap==2.0.2+dfsg-10
-libjs-underscore==1.8.3~dfsg-1+deb9u1
-libjsch-java==0.1.54-1
-libjson-c-dev==0.12.1-1.1+deb9u1
-libjson-c3==0.12.1-1.1+deb9u1
-libjson-glib-1.0-0==1.2.6-1
-libjson-glib-1.0-common==1.2.6-1
-libjsoncpp1==1.7.4-3
-libjsoup-java==1.10.2-1
-libjsr305-java==0.1~+svn49-10
-libjtidy-java==7+svn20110807-4
-libjudy-dev==1.0.5-5
-libjudydebian1==1.0.5-5
-libjxr-tools==1.1-6+b1
-libjxr0==1.1-6+b1
-libjzlib-java==1.1.3-1
-libk5crypto3==1.15-1+deb9u3
-libkeyutils1==1.5.9-9
-libkmod2==23-2
-libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
-libkrb5-3==1.15-1+deb9u3
-libkrb5support0==1.15-1+deb9u3
-libksba8==1.3.5-2
-libkyotocabinet16v5==1.2.76-4.2+b1
-liblcms2-2==2.8-4+deb9u1
-libldap-2.4-2==2.4.44+dfsg-5+deb9u8
-libldap-common==2.4.44+dfsg-5+deb9u8
-libldap2-dev==2.4.44+dfsg-5+deb9u8
-liblist-compare-perl==0.53-1
-liblist-moreutils-perl==0.416-1+b1
-libllvm3.8==1:3.8.1-24
-libllvm3.9==1:3.9.1-9
-liblocale-gettext-perl==1.07-3+b1
-liblog4j1.2-java==1.2.17-7+deb9u1
-liblogging-stdlog0==1.0.5-2+b2
-liblognorm5==2.0.1-1.1+b1
-liblqr-1-0==0.4.2-2+b2
-libltdl-dev==2.4.6-2
-libltdl7==2.4.6-2
-liblua5.1-0==5.1.5-8.1+b2
-liblua5.1-0-dev==5.1.5-8.1+b2
-liblwp-mediatypes-perl==6.02-1
-liblwp-protocol-https-perl==6.06-2
-liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
-liblzo2-2==2.08-1.2+b2
-liblzo2-dev==2.08-1.2+b2
-libmagic-mgc==1:5.30-1+deb9u3
-libmagic1==1:5.30-1+deb9u3
-libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
-libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
-libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
-libmail-sendmail-perl==0.79.16-2
-libmailtools-perl==2.18-1
-libmailutils5==1:3.1.1-1
-libmariadbclient-dev==10.1.48-0+deb9u2
-libmariadbclient-dev-compat==10.1.48-0+deb9u2
-libmariadbclient18==10.1.48-0+deb9u2
-libmaven-ant-tasks-java==2.1.3-4
-libmaven-archiver-java==2.6-3
-libmaven-clean-plugin-java==2.5-1
-libmaven-common-artifact-filters-java==1.4-1
-libmaven-compiler-plugin-java==3.2-5
-libmaven-doxia-tools-java==1.2.1-2
-libmaven-filtering-java==1.1-1
-libmaven-jar-plugin-java==2.4-1
-libmaven-parent-java==21-2
-libmaven-plugin-tools-java==3.3-5
-libmaven-reporting-impl-java==2.3-1
-libmaven-resources-plugin-java==2.6-1
-libmaven-shared-incremental-java==1.1-1
-libmaven-shared-utils-java==3.0.0-1
-libmaven-site-plugin-java==2.1-4
-libmaven2-core-java==2.2.1-26
-libmaven3-core-java==3.3.9-4
-libmime-tools-perl==5.508-1
-libmng1==1.0.10+dfsg-3.1+b5
-libmnl-dev==1.0.4-2
-libmnl0==1.0.4-2
-libmodule-implementation-perl==0.09-1
-libmodule-runtime-perl==0.014-2
-libmoo-perl==2.002005-1
-libmpc3==1.0.3-1+b2
-libmpdec2==2.4.2-1
-libmpfr4==3.1.5-1
-libmsv-java==2009.1+dfsg1-5
-libmtdev1==1.1.5-1+b1
-libnamespace-clean-perl==0.27-1
-libnanomsg-dev==0.8~beta+dfsg-1+b1
-libnanomsg4==0.8~beta+dfsg-1+b1
-libncurses5==6.0+20161126-1+deb9u2
-libncurses5-dev==6.0+20161126-1+deb9u2
-libnet-dbus-perl==1.1.0-4+b1
-libnet-dns-perl==1.07-1
-libnet-domain-tld-perl==1.75-1
-libnet-http-perl==6.12-1
-libnet-ip-perl==1.26-1
-libnet-smtp-ssl-perl==1.04-1
-libnet-ssleay-perl==1.80-1
-libnetfilter-conntrack-dev==1.0.6-2
-libnetfilter-conntrack3==1.0.6-2
-libnetpbm10==2:10.0-15.3+b2
-libnewt-dev==0.52.19-1+b1
-libnewt0.52==0.52.19-1+b1
-libnfnetlink-dev==1.0.1-3
-libnfnetlink0==1.0.1-3
-libnftnl-dev==1.0.7-1
-libnftnl4==1.0.7-1
-libnghttp2-14==1.18.1-1+deb9u2
-libnih-dbus1==1.0.3-8
-libnih1==1.0.3-8
-libnl-3-200==3.2.27-2
-libnl-route-3-200==3.2.27-2
-libnpth0==1.3-1
-libnspr4==2:4.12-6
-libnss3==2:3.26.2-1.1+deb9u2
-libntlm0==1.4-8
-libnuma-dev==2.0.11-2.1
-libnuma1==2.0.11-2.1
-libnumber-compare-perl==0.03-1
-libnumber-range-perl==0.12-1
-libobjc-6-dev==6.3.0-18+deb9u1
-libobjc4==6.3.0-18+deb9u1
-libobjenesis-java==2.5.1-1
-libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u4
-libopenjp2-7==2.1.2-1.1+deb9u6
-libopenmpi-dev==2.0.2-2
-libopenmpi2==2.0.2-2
-liboro-java==2.0.8a-12
-libosp5==1.5.2-13+b1
-libossp-uuid-perl==1.6.2-1.5+b4
-libossp-uuid16==1.6.2-1.5+b4
-libpackage-stash-perl==0.37-1
-libpackage-stash-xs-perl==0.28-3+b1
-libpackagekit-glib2-18==1.1.5-2+deb9u2
-libpam-cap==1:2.25-1
-libpam-systemd==232-25+deb9u13
-libpam0g-dev==1.1.8-3.6
-libpango-1.0-0==1.40.5-1
-libpangocairo-1.0-0==1.40.5-1
-libpangoft2-1.0-0==1.40.5-1
-libpaper-utils==1.1.24+nmu5
-libpaper1==1.1.24+nmu5
-libparams-classify-perl==0.013-6+b1
-libparams-util-perl==1.07-3+b1
-libparams-validate-perl==1.26-1
-libparse-debianchangelog-perl==1.2.0-12
-libpath-iterator-rule-perl==1.009-1
-libpath-tiny-perl==0.100-1
-libpathplan4==2.38.0-17+deb9u1
-libpcap-dev==1.8.1-3
-libpcap0.8==1.8.1-3
-libpcap0.8-dev==1.8.1-3
-libpci-dev==1:3.5.2-1
-libpci3==1:3.5.2-1
-libpciaccess0==0.13.4-1+b2
-libpcre16-3==2:8.39-3
-libpcre3-dev==2:8.39-3
-libpcre32-3==2:8.39-3
-libpcrecpp0v5==2:8.39-3
-libpcsclite1==1.8.20-1
-libperl-dev==5.24.1-3+deb9u7
-libperl5.24==5.24.1-3+deb9u7
-libperlio-gzip-perl==0.19-1+b2
-libpgm-5.2-0==5.2.122~dfsg-2
-libpipeline1==1.4.1-2
-libpixman-1-0==0.34.0-1
-libplexus-ant-factory-java==1.0~alpha2.1-3
-libplexus-archiver-java==2.2-1+deb9u1
-libplexus-bsh-factory-java==1.0~alpha7-3.1
-libplexus-build-api-java==0.0.7-1
-libplexus-cipher-java==1.7-1
-libplexus-classworlds-java==1.5.0-5
-libplexus-classworlds2-java==2.5.2-1
-libplexus-cli-java==1.2-5
-libplexus-compiler-java==2.4-3
-libplexus-component-annotations-java==1.6-3
-libplexus-component-metadata-java==1.6-3
-libplexus-container-default-java==1.0-alpha-9-stable-1-7
-libplexus-container-default1.5-java==1.6-3
-libplexus-containers-java==1.0~beta3.0.7-8
-libplexus-containers1.5-java==1.6-3
-libplexus-i18n-java==1.0-beta-10-3
-libplexus-interactivity-api-java==1.0-alpha-6-7
-libplexus-interpolation-java==1.21-1
-libplexus-io-java==1.0~alpha5-2
-libplexus-sec-dispatcher-java==1.3.1-6
-libplexus-utils-java==1:1.5.15-4+deb9u1
-libplexus-utils2-java==3.0.22-1
-libplexus-velocity-java==1.2-1
-libpng-dev==1.6.28-1+deb9u1
-libpng16-16==1.6.28-1+deb9u1
-libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-18+deb9u1
-libpolkit-backend-1-0==0.105-18+deb9u1
-libpolkit-gobject-1-0==0.105-18+deb9u1
-libpoppler64==0.48.0-2+deb9u4
-libpopt0==1.16-10+b2
-libpotrace0==1.13-3
-libprocps6==2:3.3.12-3+deb9u1
-libprotobuf-dev==3.0.0-9
-libprotobuf-lite10==3.0.0-9
-libprotobuf10==3.0.0-9
-libprotoc10==3.0.0-9
-libproxy1v5==0.4.14-2+deb9u2
-libptexenc1==2016.20160513.41080.dfsg-2+deb9u1
-libpthread-stubs0-dev==0.3-4
-libpulse0==10.0-1+deb9u1
-libpython-all-dev==2.7.13-2
-libpython-dev==2.7.13-2
-libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u5
-libpython2.7-dev==2.7.13-2+deb9u5
-libpython2.7-minimal==2.7.13-2+deb9u5
-libpython2.7-stdlib==2.7.13-2+deb9u5
-libpython3-all-dbg==3.5.3-1
-libpython3-all-dev==3.5.3-1
-libpython3-dbg==3.5.3-1
-libpython3-dev==3.5.3-1
-libpython3-stdlib==3.5.3-1
-libpython3.5==3.5.3-1+deb9u4
-libpython3.5-dbg==3.5.3-1+deb9u4
-libpython3.5-dev==3.5.3-1+deb9u4
-libpython3.5-minimal==3.5.3-1+deb9u4
-libpython3.5-stdlib==3.5.3-1+deb9u4
-libqdox-java==1.12.1-2
-libqdox2-java==2.0~M3-3
-libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
-libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
-libqt4-designer==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
-libqt4-help==4:4.8.7+dfsg-11+deb9u1
-libqt4-network==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
-libqt4-script==4:4.8.7+dfsg-11+deb9u1
-libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
-libqt4-svg==4:4.8.7+dfsg-11+deb9u1
-libqt4-test==4:4.8.7+dfsg-11+deb9u1
-libqt4-xml==4:4.8.7+dfsg-11+deb9u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
-libqt5concurrent5==5.7.1+dfsg-3+deb9u3
-libqt5core5a==5.7.1+dfsg-3+deb9u3
-libqt5dbus5==5.7.1+dfsg-3+deb9u3
-libqt5gui5==5.7.1+dfsg-3+deb9u3
-libqt5network5==5.7.1+dfsg-3+deb9u3
-libqt5opengl5==5.7.1+dfsg-3+deb9u3
-libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
-libqt5printsupport5==5.7.1+dfsg-3+deb9u3
-libqt5sql5==5.7.1+dfsg-3+deb9u3
-libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
-libqt5svg5==5.7.1~20161021-2.1
-libqt5test5==5.7.1+dfsg-3+deb9u3
-libqt5widgets5==5.7.1+dfsg-3+deb9u3
-libqt5xml5==5.7.1+dfsg-3+deb9u3
-libqtcore4==4:4.8.7+dfsg-11+deb9u1
-libqtdbus4==4:4.8.7+dfsg-11+deb9u1
-libqtgui4==4:4.8.7+dfsg-11+deb9u1
-libreadline-dev==7.0-3
-libreadline7==7.0-3
-libregexp-assemble-perl==0.36-1
-librelaxng-datatype-java==1.0+ds1-3
-librest-0.7-0==0.8.0-2
-librhash0==1.3.3-1+b2
-librhino-java==1.7.7.1-1
-librole-tiny-perl==2.000005-1
-librrd-dev==1.6.0-1+b2
-librrd8==1.6.0-1+b2
-librsvg2-2==2.40.21-0+deb9u1
-librsvg2-common==2.40.21-0+deb9u1
-librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u10
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsaxon-java==1:6.5.5-10
-libscalar-list-utils-perl==1:1.47-1
-libseccomp2==2.3.1-2.1+deb9u1
-libselinux1-dev==2.6-3+b3
-libsensors4==1:3.4.0-4
-libsensors4-dev==1:3.4.0-4
-libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u8
-libsigsegv2==2.10-5
-libsisu-inject-java==0.3.2-2
-libsisu-plexus-java==0.3.2-1
-libslang2==2.3.1-5
-libslang2-dev==2.3.1-5
-libslf4j-java==1.7.22-1
-libsm-dev==2:1.2.2-1+b3
-libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u2
-libsnmp-base==5.7.3+dfsg-1.7+deb9u3
-libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
-libsnmp30==5.7.3+dfsg-1.7+deb9u3
-libsoap-lite-perl==1.20-1
-libsocket6-perl==0.27-1+b1
-libsodium18==1.0.11-2
-libsort-key-perl==1.33-1+b3
-libsort-versions-perl==1.62-1
-libsoup-gnome2.4-1==2.56.0-2+deb9u2
-libsoup2.4-1==2.56.0-2+deb9u2
-libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u6
-libssl1.1==1.1.0l-1~deb9u4
-libstax-java==1.2.0-3
-libstdc++-6-dev==6.3.0-18+deb9u1
-libstrictures-perl==2.000003-1
-libstring-copyright-perl==0.003005-1
-libstring-escape-perl==2010.002-1
-libsub-exporter-perl==0.986-1
-libsub-exporter-progressive-perl==0.001013-1
-libsub-identify-perl==0.12-2+b1
-libsub-install-perl==0.928-1
-libsub-name-perl==0.21-1
-libsubunit-dev==1.1.0-3
-libsubunit0==1.1.0-3
-libsurefire-java==2.17-3
-libswitch-perl==2.17-2
-libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
-libsys-hostname-long-perl==1.5-1
-libsystemd-dev==232-25+deb9u13
-libtask-weaken-perl==1.04-1
-libtcl8.6==8.6.6+dfsg-1+b1
-libtcmalloc-minimal4==2.5-2.2
-libtexlua52==2016.20160513.41080.dfsg-2+deb9u1
-libtext-charwidth-perl==0.04-7+b3
-libtext-glob-perl==0.10-1
-libtext-iconv-perl==1.7-5+b3
-libtext-levenshtein-perl==0.13-1
-libtext-unidecode-perl==1.30-1
-libtext-wrapi18n-perl==0.06-7.1
-libthai-data==0.1.26-1
-libthai0==0.1.26-1
-libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u7
-libtimedate-perl==2.3000-2+deb9u1
-libtinfo-dev==6.0+20161126-1+deb9u2
-libtinyxml2-4==4.0.1-1
-libtinyxml2-dev==4.0.1-1
-libtk8.6==8.6.6-1+b1
-libtool==2.4.6-2
-libtool-bin==2.4.6-2
-libtry-tiny-perl==0.28-1
-libtxc-dxtn-s2tc==1.0+git20151227-2
-libubsan0==6.3.0-18+deb9u1
-libudev-dev==232-25+deb9u13
-libunicode-utf8-perl==0.60-1+b2
-libunwind-dev==1.1-4.1
-libunwind8==1.1-4.1
-libunwind8-dev==1.1-4.1
-liburi-perl==1.71-1
-libusb-0.1-4==2:0.1.12-30
-libusb-1.0-0==2:1.0.21-1
-libusb-1.0-0-dev==2:1.0.21-1
-libusb-1.0-doc==2:1.0.21-1
-libusb-dev==2:0.1.12-30
-libutempter0==1.1.6-3
-libuv1==1.34.2-1~bpo9+1
-libvariable-magic-perl==0.61-1
-libvorbis0a==1.3.5-4+deb9u2
-libvorbisenc2==1.3.5-4+deb9u2
-libwacom-bin==0.22-1+b1
-libwacom-common==0.22-1
-libwacom2==0.22-1+b1
-libwagon-java==1.0.0-9
-libwagon2-java==2.10-6
-libwayland-client0==1.12.0-1+deb9u1
-libwayland-cursor0==1.12.0-1+deb9u1
-libwayland-egl1-mesa==13.0.6-1+b2
-libwayland-server0==1.12.0-1+deb9u1
-libwebp6==0.5.2-1+deb9u1
-libwebpdemux2==0.5.2-1+deb9u1
-libwebpmux2==0.5.2-1+deb9u1
-libwmf0.2-7==0.2.8.4-10.6
-libwrap0==7.6.q-26
-libwrap0-dev==7.6.q-26
-libwww-perl==6.15-1
-libwww-robotrules-perl==6.01-1
-libx11-6==2:1.6.4-3+deb9u4
-libx11-data==2:1.6.4-3+deb9u4
-libx11-dev==2:1.6.4-3+deb9u4
-libx11-doc==2:1.6.4-3+deb9u4
-libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.4-3+deb9u4
-libx11-xcb1==2:1.6.4-3+deb9u4
-libxalan2-java==2.7.1-9
-libxapian30==1.4.3-2+deb9u3
-libxau-dev==1:1.0.8-1
-libxau6==1:1.0.8-1
-libxaw7==2:1.0.13-1+b2
-libxbean-java==4.5-4
-libxcb-dri2-0==1.12-1
-libxcb-dri2-0-dev==1.12-1
-libxcb-dri3-0==1.12-1
-libxcb-dri3-dev==1.12-1
-libxcb-glx0==1.12-1
-libxcb-glx0-dev==1.12-1
-libxcb-icccm4==0.4.1-1
-libxcb-image0==0.4.0-1+b2
-libxcb-keysyms1==0.4.0-1+b2
-libxcb-present-dev==1.12-1
-libxcb-present0==1.12-1
-libxcb-randr0==1.12-1
-libxcb-randr0-dev==1.12-1
-libxcb-render-util0==0.3.9-1
-libxcb-render0==1.12-1
-libxcb-render0-dev==1.12-1
-libxcb-shape0==1.12-1
-libxcb-shape0-dev==1.12-1
-libxcb-shm0==1.12-1
-libxcb-sync-dev==1.12-1
-libxcb-sync1==1.12-1
-libxcb-util0==0.3.8-3+b2
-libxcb-xfixes0==1.12-1
-libxcb-xfixes0-dev==1.12-1
-libxcb-xinerama0==1.12-1
-libxcb-xkb1==1.12-1
-libxcb1==1.12-1
-libxcb1-dev==1.12-1
-libxcomposite1==1:0.4.4-2
-libxcursor1==1:1.1.14-1+deb9u2
-libxdamage-dev==1:1.1.4-2+b3
-libxdamage1==1:1.1.4-2+b3
-libxdelta2==1.1.3-9.1+b1
-libxdmcp-dev==1:1.1.2-3
-libxdmcp6==1:1.1.2-3
-libxdot4==2.38.0-17+deb9u1
-libxerces2-java==2.11.0-7
-libxext-dev==2:1.3.3-1+b2
-libxext6==2:1.3.3-1+b2
-libxfixes-dev==1:5.0.3-1
-libxfixes3==1:5.0.3-1
-libxft2==2.3.2-1+b2
-libxi6==2:1.7.9-1
-libxinerama1==2:1.1.3-1+b3
-libxkbcommon-x11-0==0.7.1-2~deb9u1
-libxkbcommon0==0.7.1-2~deb9u1
-libxml-commons-external-java==1.4.01-2
-libxml-commons-resolver1.1-java==1.2-7
-libxml-libxml-perl==2.0128+dfsg-1+deb9u1
-libxml-namespacesupport-perl==1.11-1
-libxml-parser-perl==2.44-2+b1
-libxml-sax-base-perl==1.07-1
-libxml-sax-expat-perl==0.40-2
-libxml-sax-perl==0.99+dfsg-2
-libxml-simple-perl==2.22-1
-libxml-twig-perl==1:3.50-1
-libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u5
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
-libxmlgraphics-commons-java==2.1-2
-libxmlrpc-lite-perl==0.717-1
-libxmu6==2:1.1.2-2
-libxmuu1==2:1.1.2-2
-libxom-java==1.2.10-1
-libxpm4==1:3.5.12-1
-libxpp2-java==2.1.10-7
-libxpp3-java==1.1.4c-2
-libxrandr2==2:1.5.1-1
-libxrender1==1:0.9.10-1
-libxshmfence-dev==1.2-1+b2
-libxshmfence1==1.2-1+b2
-libxslt1-dev==1.1.29-2.1+deb9u2
-libxslt1.1==1.1.29-2.1+deb9u2
-libxss1==1:1.2.2-1
-libxt-dev==1:1.1.5-1
-libxt6==1:1.1.5-1
-libxtables-dev==1.6.0+snapshot20161117-6
-libxtables12==1.6.0+snapshot20161117-6
-libxtst6==2:1.2.3-1
-libxv1==2:1.0.11-1
-libxxf86dga1==2:1.1.4-1+b3
-libxxf86vm-dev==1:1.1.4-1+b2
-libxxf86vm1==1:1.1.4-1+b2
-libyaml-0-2==0.1.7-2
-libyaml-dev==0.1.7-2
-libyaml-libyaml-perl==0.63-2
-libyaml-tiny-perl==1.70-1
-libzmq3-dev==4.2.1-4+deb9u4
-libzmq5==4.2.1-4+deb9u4
-libzzip-0-13==0.13.62-3.2~deb9u1
-licensecheck==3.0.29-1
-lintian==2.5.50.4
-linux-kbuild-4.9==4.9.272-2
-linux-libc-dev==4.9.272-2
-linuxdoc-tools==0.9.72-4
-llvm-3.8==1:3.8.1-24
-llvm-3.8-dev==1:3.8.1-24
-llvm-3.8-runtime==1:3.8.1-24
-lmodern==2.004.5-3
-logrotate==3.11.0-0.1
-lsb-release==9.20161125
-lsof==4.89+dfsg-0.1
-lua-bitop==1.0.2-4
-lua-bitop-dev==1.0.2-4
-lua-cjson==2.1.0+dfsg-2
-lua-cjson-dev==2.1.0+dfsg-2
-lynx==2.8.9dev11-1+deb9u1
-lynx-common==2.8.9dev11-1+deb9u1
-m4==1.4.18-1
-mailutils==1:3.1.1-1
-mailutils-common==1:3.1.1-1
-make==4.1-9.1
-man-db==2.7.6.1-2
-manpages==4.10-2
-manpages-dev==4.10-2
-maven==3.3.9-4
-maven-debian-helper==2.1.3
-maven-repo-helper==1.9.2
-mesa-common-dev==13.0.6-1+b2
-mesa-utils==8.3.0-3
-mime-support==3.60
-module-assistant==0.11.9
-mpi-default-bin==1.8
-mpi-default-dev==1.8
-mysql-common==5.8+1.0.2
-ncurses-term==6.0+20161126-1+deb9u2
-netbase==5.4
-netpbm==2:10.0-15.3+b2
-nodejs==10.24.1-1nodesource1
-ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u302-b08-1~deb9u1
-openjdk-8-jdk-headless==8u302-b08-1~deb9u1
-openjdk-8-jre==8u302-b08-1~deb9u1
-openjdk-8-jre-headless==8u302-b08-1~deb9u1
-openmpi-bin==2.0.2-2
-openmpi-common==2.0.2-2
-opensp==1.5.2-13+b1
-openssh-client==1:7.4p1-10+deb9u7
-openssh-server==1:7.4p1-10+deb9u7
-openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u4
-packagekit==1.1.5-2+deb9u2
-packagekit-tools==1.1.5-2+deb9u2
-patch==2.7.5-1+deb9u2
-patchutils==0.3.4-2
-pbuilder==0.228.7
-pbzip2==1.1.9-1+b1
-perl==5.24.1-3+deb9u7
-perl-modules-5.24==5.24.1-3+deb9u7
-perl-openssl-defaults==3
-php-cli==1:7.0+49
-php-codecoverage==4.0.0+dfsg-1
-php-common==1:49
-php-deepcopy==1.5.5-1
-php-doctrine-instantiator==1.0.5-2
-php-file-iterator==1.4.1-2
-php-pear==1:1.10.1+submodules+notgz-9+deb9u3
-php-phpdocumentor-reflection-docblock==2.0.4-2
-php-phpspec-prophecy==1.6.2-1
-php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
-php-text-template==1.2.1-2
-php-timer==1.0.8-1
-php-token-stream==1.4.8-2
-php-xml==1:7.0+49
-php7.0-cli==7.0.33-0+deb9u11
-php7.0-common==7.0.33-0+deb9u11
-php7.0-json==7.0.33-0+deb9u11
-php7.0-opcache==7.0.33-0+deb9u11
-php7.0-readline==7.0.33-0+deb9u11
-php7.0-xml==7.0.33-0+deb9u11
-phpunit==5.4.6-2~deb9u1
-phpunit-code-unit-reverse-lookup==1.0.0-2
-phpunit-comparator==1.2.0-2
-phpunit-diff==1.4.1-2
-phpunit-environment==1.3.7-1
-phpunit-exporter==1.2.2-1
-phpunit-global-state==1.1.1-2
-phpunit-mock-object==3.2.3-1
-phpunit-object-enumerator==1.0.0-2
-phpunit-recursion-context==1.0.2-2
-phpunit-resource-operations==1.0.0-2
-phpunit-version==2.0.0-2
-pigz==2.3.4-1
-pinentry-curses==1.0.0-2
-pkg-config==0.29-4+b1
-pkg-php-tools==1.35
-po-debconf==1.0.20
-policykit-1==0.105-18+deb9u1
-poppler-data==0.4.7-8
-preview-latex-style==11.90-1
-pristine-tar==1.38
-procmail==3.22-25+deb9u1
-procps==2:3.3.12-3+deb9u1
-prosper==1.00.4+cvs.2007.05.01-4.1
-protobuf-compiler==3.0.0-9
-ps2eps==1.68+binaryfree-2
-psmisc==22.21-2.1+b2
-psutils==1.17.dfsg-4
-pylint==1.6.5-1
-python==2.7.13-2
-python-alabaster==0.7.8-1
-python-all==2.7.13-2
-python-all-dev==2.7.13-2
-python-apt==1.4.3
-python-apt-common==1.4.3
-python-astroid==1.4.9-1
-python-attr==16.3.0-1
-python-babel==2.3.4+dfsg.1-2+deb9u1
-python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python-backports.functools-lru-cache==1.3-1
-python-bs4==4.5.3-1
-python-cffi-backend==1.9.1-2
-python-chardet==2.3.0-2
-python-click==6.6-1
-python-colorama==0.3.7-1
-python-constantly==15.1.0-1
-python-cov-core==1.15.0-1
-python-coverage==4.2+dfsg.1-2
-python-crypto==2.6.1-7
-python-cryptography==1.7.1-3+deb9u2
-python-dateutil==2.5.3-2
-python-dbus==1.2.4-1+b1
-python-debian==0.1.30
-python-dev==2.7.13-2
-python-docutils==0.13.1+dfsg-2
-python-enum34==1.1.6-1
-python-gi==3.22.0-2
-python-gpg==1.8.0-3+b2
-python-html5lib==0.999999999-1
-python-idna==2.2-1
-python-imagesize==0.7.1-1
-python-incremental==16.10.1-3
-python-ipaddr==2.1.11-2
-python-ipaddress==1.0.17-1
-python-isort==4.2.5+ds1-2+deb9u1
-python-jinja2==2.8-1
-python-keyring==10.1-1
-python-keyrings.alt==1.3-1
-python-lazy-object-proxy==1.2.2-1
-python-lxml==3.7.1-1+deb9u4
-python-markupsafe==0.23-3
-python-minimal==2.7.13-2
-python-nose2==0.6.5-2
-python-openssl==16.2.0-1
-python-pam==0.4.2-13.2
-python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u3
-python-pip-whl==9.0.1-2+deb9u2
-python-pkg-resources==33.1.1-1
-python-py==1.4.32-3
-python-pyasn1==0.1.9-2
-python-pyasn1-modules==0.0.7-0.1
-python-pygments==2.2.0+dfsg-1+deb9u2
-python-pytest==3.0.6-1
-python-pytest-cov==2.4.0-2
-python-requests==2.12.4-1
-python-roman==2.0.0-2
-python-secretstorage==2.3.1-2
-python-serial==3.2.1-1
-python-service-identity==16.0.0-2
-python-setuptools==33.1.1-1
-python-six==1.10.0-3
-python-sphinx==1.4.9-2
-python-sphinx-rtd-theme==0.1.9-1
-python-stdeb==0.8.5-1
-python-tk==2.7.13-1
-python-twisted==16.6.0-2
-python-twisted-bin==16.6.0-2
-python-twisted-core==16.6.0-2
-python-tz==2016.7-0.3
-python-urllib3==1.19.1-1+deb9u1
-python-webencodings==0.5-2
-python-wheel==0.29.0-2
-python-wrapt==1.9.0-2
-python-xdg==0.25-4+deb9u1
-python-zope.interface==4.3.2-1
-python2.7==2.7.13-2+deb9u5
-python2.7-dev==2.7.13-2+deb9u5
-python2.7-minimal==2.7.13-2+deb9u5
-python3==3.5.3-1
-python3-alabaster==0.7.8-1
-python3-all==3.5.3-1
-python3-all-dbg==3.5.3-1
-python3-all-dev==3.5.3-1
-python3-apt==1.4.3
-python3-babel==2.3.4+dfsg.1-2+deb9u1
-python3-cffi-backend==1.9.1-2
-python3-chardet==2.3.0-2
-python3-crypto==2.6.1-7
-python3-cryptography==1.7.1-3+deb9u2
-python3-dbg==3.5.3-1
-python3-dbus==1.2.4-1+b1
-python3-debian==0.1.30
-python3-dev==3.5.3-1
-python3-docutils==0.13.1+dfsg-2
-python3-gi==3.22.0-2
-python3-idna==2.2-1
-python3-imagesize==0.7.1-1
-python3-jinja2==2.8-1
-python3-keyring==10.1-1
-python3-keyrings.alt==1.3-1
-python3-magic==1:5.30-1+deb9u3
-python3-markupsafe==0.23-3
-python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u3
-python3-pkg-resources==33.1.1-1
-python3-pyasn1==0.1.9-2
-python3-pycurl==7.43.0-2
-python3-pygments==2.2.0+dfsg-1+deb9u2
-python3-roman==2.0.0-2
-python3-secretstorage==2.3.1-2
-python3-setuptools==33.1.1-1
-python3-six==1.10.0-3
-python3-software-properties==0.96.20.2-1+deb9u1
-python3-sphinx==1.4.9-2
-python3-tz==2016.7-0.3
-python3-wheel==0.29.0-2
-python3-xdg==0.25-4+deb9u1
-python3.5==3.5.3-1+deb9u4
-python3.5-dbg==3.5.3-1+deb9u4
-python3.5-dev==3.5.3-1+deb9u4
-python3.5-minimal==3.5.3-1+deb9u4
-qdbus==4:4.8.7+dfsg-11+deb9u1
-qt-at-spi==0.4.0-5
-qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
-qt4-qmake==4:4.8.7+dfsg-11+deb9u1
-qt5-default==5.7.1+dfsg-3+deb9u3
-qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
-qt5-qmake==5.7.1+dfsg-3+deb9u3
-qtbase5-dev==5.7.1+dfsg-3+deb9u3
-qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
-qtchooser==63-g13a3d08-1
-qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
-qttranslations5-l10n==5.7.1~20161021-1
-quilt==0.65-2~bpo9+1
-rake==10.5.0-2+deb9u1
-readline-common==7.0-3
-rename==0.20-4
-rhino==1.7.7.1-1
-rrdtool==1.6.0-1+b2
-rsync==3.1.2-1+deb9u2
-rsyslog==8.24.0-1
-ruby==1:2.3.3
-ruby-all-dev==1:2.3.3
-ruby-did-you-mean==1.0.0-2
-ruby-minitest==5.9.0-1
-ruby-net-telnet==0.1.1-2
-ruby-power-assert==0.3.0-1
-ruby-setup==3.4.1-9
-ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u10
-ruby2.3-dev==2.3.3-1+deb9u10
-rubygems-integration==1.11
-sgml-base==1.29
-sgml-data==2.0.10
-shared-mime-info==1.8-1+deb9u1
-software-properties-common==0.96.20.2-1+deb9u1
-sphinx-common==1.4.9-2
-sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u3
-stgit==0.17.1-1
-strace==4.15-2
-sudo==1.8.19p1-2.1+deb9u3
-swig==3.0.10-1.1
-swig3.0==3.0.10-1.1
-systemd==232-25+deb9u13
-systemd-shim==10-3
-t1utils==1.39-2
-tcl==8.6.0+9
-tcl8.6==8.6.6+dfsg-1+b1
-tcpd==7.6.q-26
-telnet==0.17-41
-tex-common==6.06
-tex-gyre==20160520-1
-texi2html==1.82+dfsg1-5
-texinfo==6.3.0.dfsg.1-1+b2
-texlive-base==2016.20170123-5
-texlive-binaries==2016.20160513.41080.dfsg-2+deb9u1
-texlive-extra-utils==2016.20170123-5
-texlive-font-utils==2016.20170123-5
-texlive-fonts-recommended==2016.20170123-5
-texlive-fonts-recommended-doc==2016.20170123-5
-texlive-generic-extra==2016.20170123-5
-texlive-generic-recommended==2016.20170123-5
-texlive-latex-base==2016.20170123-5
-texlive-latex-base-doc==2016.20170123-5
-texlive-latex-extra==2016.20170123-5
-texlive-latex-extra-doc==2016.20170123-5
-texlive-latex-recommended==2016.20170123-5
-texlive-latex-recommended-doc==2016.20170123-5
-texlive-pictures==2016.20170123-5
-texlive-pictures-doc==2016.20170123-5
-texlive-pstricks==2016.20170123-5
-texlive-pstricks-doc==2016.20170123-5
-tipa==2:1.3-20
-tk==8.6.0+9
-tk8.6==8.6.6-1+b1
-tk8.6-blt2.5==2.5.3+dfsg-3
-ucf==3.0036
-unattended-upgrades==0.93.1+nmu1
-unzip==6.0-21+deb9u2
-velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u3
-vim-common==2:8.0.0197-4+deb9u3
-vim-runtime==2:8.0.0197-4+deb9u3
-wdiff==1.2.2-2
-x11-common==1:7.7+19
-x11-utils==7.7+3+b1
-x11-xserver-utils==7.7+7+b1
-x11proto-core-dev==7.0.31-1
-x11proto-damage-dev==1:1.2.1-2
-x11proto-dri2-dev==2.8-2
-x11proto-fixes-dev==1:5.0-2
-x11proto-gl-dev==1.4.17-1
-x11proto-input-dev==2.3.2-1
-x11proto-kb-dev==1.0.7-1
-x11proto-xext-dev==7.3.0-1
-x11proto-xf86vidmode-dev==2.3.1-2
-xauth==1:1.0.9-1+b2
-xbitmaps==1.1.1-2
-xdelta==1.1.3-9.1+b1
-xdelta3==3.0.11-dfsg-1+b1
-xdg-user-dirs==0.15-2+b1
-xdg-utils==1.1.1-1+deb9u2
-xkb-data==2.19-1+deb9u1
-xml-core==0.17
-xmlto==0.0.28-1
-xorg-sgml-doctools==1:1.11-1
-xsltproc==1.1.29-2.1+deb9u2
-xterm==327-2+deb9u2
-xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u3
-xz-utils==5.2.2-1.2+b1
-zip==3.0-11+b1
-zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
deleted file mode 100644
index 53073b5ae1d9..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py2-all-arm64
+++ /dev/null
@@ -1,79 +0,0 @@
-alabaster==0.7.8
-astroid==1.4.9
-attrs==16.3.0
-babel==2.3.4
-backports.functools-lru-cache==1.3
-beautifulsoup4==4.5.3
-chardet==2.3.0
-click==6.6
-colorama==0.3.7
-constantly==15.1.0
-cov-core==1.15.0
-coverage==4.2
-crc16==0.1.1
-cryptography==1.7.1
-ctypesgen==0.post125
-docutils==0.13.1
-enum34==1.1.6
-gbp==0.8.12.2
-gcovr==3.3
-gpg==1.8.0
-html5lib==0.999999999
-idna==2.2
-imagesize==0.7.1
-incremental==16.10.1
-ipaddr==2.1.11
-ipaddress==1.0.17
-isort==4.2.5
-j2cli==0.3.10
-jinja2==2.11.3
-keyring==10.1
-keyrings.alt==1.3
-lazy-object-proxy==1.2.2
-lxml==4.6.2
-m2crypto==0.36.0
-markupsafe==1.1.1
-mmh3==3.0.0
-mockredispy==2.9.3
-nose==1.3.7
-nose2==0.6.5
-pam==0.4.2
-parse==1.6.6
-pexpect==4.6.0
-pillow==4.0.0
-ptyprocess==0.7.0
-py==1.4.32
-pyasn1==0.1.9
-pyasn1-modules==0.0.7
-pycrypto==2.6.1
-pygments==2.2.0
-pygobject==3.22.0
-pylint==1.6.5
-pympler==0.8
-pyopenssl==16.2.0
-pyserial==3.2.1
-pyste==0.9.10
-pytest==3.0.6
-pytest-cov==2.4.0
-pytest-runner==4.4
-python-apt==1.4.3
-python-dateutil==2.5.3
-python-debian==0.1.30
-pytz==2016.7
-pyxdg==0.25
-pyyaml==5.3.1
-requests==2.12.4
-roman==2.0.0
-secretstorage==2.3.1
-service-identity==16.0.0
-six==1.10.0
-sphinx==1.4.9
-sphinx-rtd-theme==0.1.9
-stdeb==0.8.5
-stgit===0.17.1-dirty
-twisted==16.6.0
-typing==3.10.0.0
-urllib3==1.19.1
-webencodings==0.5
-wrapt==1.9.0
-zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
deleted file mode 100644
index 7d2fad524590..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-arm64/versions-py3-all-arm64
+++ /dev/null
@@ -1,37 +0,0 @@
-alabaster==0.7.8
-babel==2.3.4
-bitarray==2.3.4
-chardet==2.3.0
-cryptography==1.7.1
-devscripts==2.17.6+deb9u2
-docutils==0.13.1
-file-magic==0.3.0
-idna==2.2
-imagesize==0.7.1
-jinja2==2.8
-keyring==10.1
-keyrings.alt==1.3
-lxml==4.6.2
-markupsafe==0.23
-mockredispy==2.9.3
-nose==1.3.7
-pillow==4.0.0
-pyang==2.4.0
-pyangbind==0.8.1
-pyasn1==0.1.9
-pycrypto==2.6.1
-pycurl==7.43.0
-pygments==2.2.0
-pygobject==3.22.0
-python-apt==1.4.3
-python-debian==0.1.30
-pytz==2016.7
-pyxdg==0.25
-pyyaml==5.3.1
-redis==3.5.3
-regex==2021.10.23
-roman==2.0.0
-secretstorage==2.3.1
-six==1.10.0
-sphinx==1.4.9
-unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
deleted file mode 100644
index b28a93db3ebf..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-deb-stretch-armhf
+++ /dev/null
@@ -1,1415 +0,0 @@
-adwaita-icon-theme==3.22.0-1+deb9u1
-ant==1.9.9-1+deb9u1
-ant-optional==1.9.9-1+deb9u1
-apt-file==3.1.4
-apt-transport-https==1.4.11
-apt-utils==1.4.11
-asciidoc-base==8.6.9-5
-asciidoc-common==8.6.9-5
-aspell==0.60.7~20110707-3+deb9u1
-aspell-en==2016.11.20-0-0.1
-at==3.1.20-3
-at-spi2-core==2.22.0-6+deb9u1
-aufs-dkms==4.9+20161219-1
-aufs-tools==1:4.1+20161219-1
-augeas-lenses==1.8.0-1+deb9u1
-augeas-tools==1.8.0-1+deb9u1
-autoconf==2.69-10
-autoconf-archive==20160916-1
-automake==1:1.15-6
-automake1.11==1:1.11.6-4
-autopoint==0.19.8.1-2+deb9u1
-autotools-dev==20161112.1
-bash-completion==1:2.1-4.3
-bc==1.06.95-9+b3
-bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
-binfmt-support==2.1.6-2
-binutils==2.28-5
-bison==2:3.0.4.dfsg-1+b1
-blt==2.5.3+dfsg-3
-bsdmainutils==9.0.12+nmu1
-build-essential==12.3
-byacc==20140715-1+b1
-bzip2==1.0.6-8.1
-ca-certificates==20200601~deb9u2
-ca-certificates-java==20170929~deb9u3
-cdbs==0.4.150
-cgmanager==0.41-2
-cgroupfs-mount==1.3
-check==0.10.0-3+b3
-chrpath==0.16-2+b1
-clang==1:3.8-36
-clang-3.8==1:3.8.1-24
-cm-super-minimal==0.3.4-9
-cmake==3.13.2-1~bpo9+1
-cmake-data==3.13.2-1~bpo9+1
-cmocka-doc==1.0.1-3
-cowbuilder==0.85
-cowdancer==0.85
-cpio==2.11+dfsg-6
-cpp==4:6.3.0-4
-cpp-6==6.3.0-18+deb9u1
-cppcheck==1.76.1-1
-cron==3.0pl1-128+deb9u1
-curl==7.52.1-5+deb9u16
-dbus==1.10.32-0+deb9u1
-dconf-gsettings-backend==0.26.0-2+b1
-dconf-service==0.26.0-2+b1
-dctrl-tools==2.24-2+b1
-debhelper==12.1.1~bpo9+1
-debian-keyring==2017.05.28
-debootstrap==1.0.89
-default-jdk-headless==2:1.8-58+deb9u1
-default-jre==2:1.8-58+deb9u1
-default-jre-headless==2:1.8-58+deb9u1
-default-libmysqlclient-dev==1.0.2
-devscripts==2.17.6+deb9u2
-dh-autoreconf==17~bpo9+1
-dh-exec==0.23+b1
-dh-make==2.201608
-dh-python==2.20170125
-dh-strip-nondeterminism==0.034-1
-dh-systemd==10.2.5
-dictionaries-common==1.27.2
-diffstat==1.61-1+b1
-dirmngr==2.1.18-8~deb9u4
-distro-info-data==0.36
-dkms==2.3-2
-dmsetup==2:1.02.137-2
-dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
-docbook-xml==4.5-8
-docbook-xsl==1.79.1+dfsg-2
-docker-ce==18.06.3~ce~3-0~debian
-docutils-common==0.13.1+dfsg-2
-docutils-doc==0.13.1+dfsg-2
-doxygen==1.8.13-4+b1
-dpatch==2.0.38+nmu1~bpo9+1
-dpkg-dev==1.18.25
-dput==0.12.1
-dwz==0.12-1+b1
-eatmydata==105-5
-emacsen-common==2.0.8
-equivs==2.0.9+nmu1
-exim4==4.89-2+deb9u8
-exim4-base==4.89-2+deb9u8
-exim4-config==4.89-2+deb9u8
-exim4-daemon-light==4.89-2+deb9u8
-expat==2.2.0-2+deb9u3
-exuberant-ctags==1:5.9~svn20110310-11
-fakeroot==1.21-3.1
-file==1:5.30-1+deb9u3
-flex==2.6.1-1.3
-fontconfig==2.11.0-6.7+b1
-fontconfig-config==2.11.0-6.7
-fonts-dejavu-core==2.37-1
-fonts-dejavu-extra==2.37-1
-fonts-droid-fallback==1:6.0.1r16-1.1
-fonts-font-awesome==4.7.0~dfsg-1
-fonts-lato==2.0-1
-fonts-liberation==1:1.07.4-2
-fonts-lmodern==2.004.5-3
-fonts-noto-mono==20161116-1
-fonts-texgyre==20160520-1
-fop==1:2.1-6
-g++==4:6.3.0-4
-g++-6==6.3.0-18+deb9u1
-gawk==1:4.1.4+dfsg-1
-gcc==4:6.3.0-4
-gcc-6==6.3.0-18+deb9u1
-gcovr==3.3-1
-gdb==7.12-6
-gem2deb==0.33.1
-gem2deb-test-runner==0.33.1
-geoip-database==20170512-1
-gettext==0.19.8.1-2+deb9u1
-gettext-base==0.19.8.1-2+deb9u1
-ghostscript==9.26a~dfsg-0+deb9u7
-gir1.2-glib-2.0==1.50.0-1+b1
-gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
-git==1:2.11.0-3+deb9u7
-git-buildpackage==0.8.12.2
-git-man==1:2.11.0-3+deb9u7
-glib-networking==2.50.0-1+deb9u1
-glib-networking-common==2.50.0-1+deb9u1
-glib-networking-services==2.50.0-1+deb9u1
-gnome-icon-theme==3.12.0-2
-gnupg==2.1.18-8~deb9u4
-gnupg-agent==2.1.18-8~deb9u4
-gnupg-l10n==2.1.18-8~deb9u4
-gnupg2==2.1.18-8~deb9u4
-googletest==1.8.0-6
-graphviz==2.38.0-17+deb9u1
-groff==1.22.3-9
-groff-base==1.22.3-9
-gsettings-desktop-schemas==3.22.0-1
-gsfonts==1:8.11+urwcyr1.0.7~pre44-4.3
-gtk-update-icon-cache==3.22.11-1
-guile-2.0-libs==2.0.13+1-4
-hicolor-icon-theme==0.15-1
-icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==57.1-6+deb9u5
-imagemagick==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
-install-info==6.3.0.dfsg.1-1+b2
-intltool-debian==0.35.0+20060710.4
-iproute2==4.9.0-1+deb9u1
-iptables==1.6.0+snapshot20161117-6
-iptables-dev==1.6.0+snapshot20161117-6
-iso-codes==3.75-1
-java-common==0.58+deb9u1
-java-wrappers==0.1.28
-javahelper==0.59
-javascript-common==11
-junit==3.8.2-8
-junit4==4.12-4+deb9u1
-kernel-wedge==2.96
-kmod==23-2
-krb5-locales==1.15-1+deb9u3
-less==481-2.1
-libalgorithm-diff-perl==1.19.03-1
-libalgorithm-diff-xs-perl==0.04-4+b2
-libalgorithm-merge-perl==0.08-3
-libann0==1.1.2+doc-6
-libaopalliance-java==20070526-5
-libapache-pom-java==10-2
-libapparmor1==2.11.0-3+deb9u2
-libapt-inst2.0==1.4.11
-libapt-pkg-perl==0.1.32
-libarchive-zip-perl==1.59-1+deb9u1
-libarchive13==3.2.2-2+deb9u2
-libasan3==6.3.0-18+deb9u1
-libasm-java==5.2-2
-libasound2==1.1.3-5
-libasound2-data==1.1.3-5
-libaspell15==0.60.7~20110707-3+deb9u1
-libassuan0==2.4.3-2
-libasyncns0==0.8-6
-libatinject-jsr330-api-java==1.0+ds1-2
-libatk-bridge2.0-0==2.22.0-2
-libatk-wrapper-java==0.33.3-13+deb9u1
-libatk-wrapper-java-jni==0.33.3-13+deb9u1
-libatk1.0-0==2.22.0-1
-libatk1.0-data==2.22.0-1
-libatm1==1:2.5.1-2
-libatm1-dev==1:2.5.1-2
-libatomic1==6.3.0-18+deb9u1
-libatspi2.0-0==2.22.0-6+deb9u1
-libaudio2==1.9.4-5+b1
-libaudit-dev==1:2.6.7-2
-libaugeas0==1.8.0-1+deb9u1
-libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.6.32-2
-libavahi-common-data==0.6.32-2
-libavahi-common3==0.6.32-2
-libavalon-framework-java==4.2.0-9
-libb-hooks-endofscope-perl==0.21-1
-libbabeltrace-ctf-dev==1.5.1-1
-libbabeltrace-ctf1==1.5.1-1
-libbabeltrace-dev==1.5.1-1
-libbabeltrace1==1.5.1-1
-libbatik-java==1.8-4+deb9u2
-libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
-libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libbison-dev==2:3.0.4.dfsg-1+b1
-libbit-vector-perl==7.4-1+b2
-libboost-all-dev==1.62.0.1
-libboost-atomic-dev==1.62.0.1
-libboost-atomic1.62-dev==1.62.0+dfsg-4
-libboost-atomic1.62.0==1.62.0+dfsg-4
-libboost-chrono-dev==1.62.0.1
-libboost-chrono1.62-dev==1.62.0+dfsg-4
-libboost-chrono1.62.0==1.62.0+dfsg-4
-libboost-context-dev==1.62.0.1
-libboost-context1.62-dev==1.62.0+dfsg-4
-libboost-context1.62.0==1.62.0+dfsg-4
-libboost-coroutine-dev==1.62.0.1
-libboost-coroutine1.62-dev==1.62.0+dfsg-4
-libboost-coroutine1.62.0==1.62.0+dfsg-4
-libboost-date-time-dev==1.62.0.1
-libboost-date-time1.62-dev==1.62.0+dfsg-4
-libboost-date-time1.62.0==1.62.0+dfsg-4
-libboost-dev==1.62.0.1
-libboost-exception-dev==1.62.0.1
-libboost-exception1.62-dev==1.62.0+dfsg-4
-libboost-fiber-dev==1.62.0.1
-libboost-fiber1.62-dev==1.62.0+dfsg-4
-libboost-fiber1.62.0==1.62.0+dfsg-4
-libboost-filesystem-dev==1.62.0.1
-libboost-filesystem1.62-dev==1.62.0+dfsg-4
-libboost-filesystem1.62.0==1.62.0+dfsg-4
-libboost-graph-dev==1.62.0.1
-libboost-graph-parallel-dev==1.62.0.1
-libboost-graph-parallel1.62-dev==1.62.0+dfsg-4
-libboost-graph-parallel1.62.0==1.62.0+dfsg-4
-libboost-graph1.62-dev==1.62.0+dfsg-4
-libboost-graph1.62.0==1.62.0+dfsg-4
-libboost-iostreams-dev==1.62.0.1
-libboost-iostreams1.62-dev==1.62.0+dfsg-4
-libboost-iostreams1.62.0==1.62.0+dfsg-4
-libboost-locale-dev==1.62.0.1
-libboost-locale1.62-dev==1.62.0+dfsg-4
-libboost-locale1.62.0==1.62.0+dfsg-4
-libboost-log-dev==1.62.0.1
-libboost-log1.62-dev==1.62.0+dfsg-4
-libboost-log1.62.0==1.62.0+dfsg-4
-libboost-math-dev==1.62.0.1
-libboost-math1.62-dev==1.62.0+dfsg-4
-libboost-math1.62.0==1.62.0+dfsg-4
-libboost-mpi-dev==1.62.0.1
-libboost-mpi-python-dev==1.62.0.1
-libboost-mpi-python1.62-dev==1.62.0+dfsg-4
-libboost-mpi-python1.62.0==1.62.0+dfsg-4
-libboost-mpi1.62-dev==1.62.0+dfsg-4
-libboost-mpi1.62.0==1.62.0+dfsg-4
-libboost-program-options-dev==1.62.0.1
-libboost-program-options1.62-dev==1.62.0+dfsg-4
-libboost-program-options1.62.0==1.62.0+dfsg-4
-libboost-python-dev==1.62.0.1
-libboost-python1.62-dev==1.62.0+dfsg-4
-libboost-python1.62.0==1.62.0+dfsg-4
-libboost-random-dev==1.62.0.1
-libboost-random1.62-dev==1.62.0+dfsg-4
-libboost-random1.62.0==1.62.0+dfsg-4
-libboost-regex-dev==1.62.0.1
-libboost-regex1.62-dev==1.62.0+dfsg-4
-libboost-regex1.62.0==1.62.0+dfsg-4
-libboost-serialization-dev==1.62.0.1
-libboost-serialization1.62-dev==1.62.0+dfsg-4
-libboost-serialization1.62.0==1.62.0+dfsg-4
-libboost-signals-dev==1.62.0.1
-libboost-signals1.62-dev==1.62.0+dfsg-4
-libboost-signals1.62.0==1.62.0+dfsg-4
-libboost-system-dev==1.62.0.1
-libboost-system1.62-dev==1.62.0+dfsg-4
-libboost-system1.62.0==1.62.0+dfsg-4
-libboost-test-dev==1.62.0.1
-libboost-test1.62-dev==1.62.0+dfsg-4
-libboost-test1.62.0==1.62.0+dfsg-4
-libboost-thread-dev==1.62.0.1
-libboost-thread1.62-dev==1.62.0+dfsg-4
-libboost-thread1.62.0==1.62.0+dfsg-4
-libboost-timer-dev==1.62.0.1
-libboost-timer1.62-dev==1.62.0+dfsg-4
-libboost-timer1.62.0==1.62.0+dfsg-4
-libboost-tools-dev==1.62.0.1
-libboost-type-erasure-dev==1.62.0.1
-libboost-type-erasure1.62-dev==1.62.0+dfsg-4
-libboost-type-erasure1.62.0==1.62.0+dfsg-4
-libboost-wave-dev==1.62.0.1
-libboost-wave1.62-dev==1.62.0+dfsg-4
-libboost-wave1.62.0==1.62.0+dfsg-4
-libboost1.62-dev==1.62.0+dfsg-4
-libboost1.62-tools-dev==1.62.0+dfsg-4
-libbsd-dev==0.8.3-1+deb9u1
-libbsd0==0.8.3-1+deb9u1
-libbsf-java==1:2.4.0-5
-libbsh-java==2.0b4-18
-libc-ares-dev==1.12.0-1+deb9u2
-libc-ares2==1.12.0-1+deb9u2
-libc-dev-bin==2.24-11+deb9u4
-libc6-dbg==2.24-11+deb9u4
-libc6-dev==2.24-11+deb9u4
-libcairo-gobject2==1.14.8-1+deb9u1
-libcairo2==1.14.8-1+deb9u1
-libcap-dev==1:2.25-1
-libcap-ng-dev==0.7.7-3+b1
-libcap2==1:2.25-1
-libcap2-bin==1:2.25-1
-libcarp-clan-perl==6.06-1
-libcc1-0==6.3.0-18+deb9u1
-libcdi-api-java==1.0-2
-libcdt5==2.38.0-17+deb9u1
-libcgi-fast-perl==1:2.12-1
-libcgi-pm-perl==4.35-1
-libcglib-java==3.2.4-1
-libcgmanager0==0.41-2
-libcgraph6==2.38.0-17+deb9u1
-libclang-common-3.8-dev==1:3.8.1-24
-libclang1-3.8==1:3.8.1-24
-libclang1-3.9==1:3.9.1-9
-libclass-accessor-perl==0.34-1
-libclass-inspector-perl==1.31-1
-libclass-method-modifiers-perl==2.12-1
-libclass-xsaccessor-perl==1.19-2+b7
-libclassworlds-java==1.1-final-5
-libclone-perl==0.38-2+b1
-libcmocka-dev==1.0.1-3
-libcmocka0==1.0.1-3
-libcolord2==1.3.3-2
-libcommons-beanutils-java==1.9.3-1
-libcommons-cli-java==1.3.1-3
-libcommons-codec-java==1.10-1
-libcommons-collections3-java==3.2.2-1
-libcommons-configuration-java==1.10-4
-libcommons-digester-java==1.8.1-4
-libcommons-httpclient-java==3.1-12
-libcommons-io-java==2.5-1+deb9u1
-libcommons-lang-java==2.6-6
-libcommons-lang3-java==3.5-1
-libcommons-logging-java==1.2-1
-libcommons-net-java==3.5-1
-libcommons-parent-java==39-3
-libcommons-validator-java==1:1.5.1-1
-libconvert-binhex-perl==1.125-1
-libcroco3==0.6.11-3
-libcryptsetup4==2:1.7.3-4
-libcups2==2.2.1-8+deb9u6
-libcupsfilters1==1.11.6-3+deb9u1
-libcupsimage2==2.2.1-8+deb9u6
-libcurl3==7.52.1-5+deb9u16
-libcurl3-gnutls==7.52.1-5+deb9u16
-libcurl3-nss==7.52.1-5+deb9u16
-libcurl4-nss-dev==7.52.1-5+deb9u16
-libdaemon-dev==0.14-6
-libdaemon0==0.14-6
-libdata-optlist-perl==0.110-1
-libdatrie1==0.2.10-4+b1
-libdb-dev==5.3.1
-libdb5.3-dev==5.3.28-12+deb9u1
-libdbi1==0.9.0-4+deb9u2
-libdbus-1-3==1.10.32-0+deb9u1
-libdbus-1-dev==1.10.32-0+deb9u1
-libdbus-glib-1-2==0.108-2
-libdconf1==0.26.0-2+b1
-libdevel-globaldestruction-perl==0.14-1
-libdevmapper1.02.1==2:1.02.137-2
-libdigest-hmac-perl==1.03+dfsg-1
-libdistro-info-perl==0.14
-libdjvulibre-text==3.5.27.1-7+deb9u2
-libdjvulibre21==3.5.27.1-7+deb9u2
-libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
-libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
-libdom4j-java==1.6.1+dfsg.3-2+deb9u1
-libdouble-conversion1==2.0.1-4
-libdoxia-core-java==1.1.4-6
-libdoxia-java==1.1.4-6
-libdoxia-sitetools-java==1.1.4-1.1
-libdpkg-perl==1.18.25
-libdrm-amdgpu1==2.4.74-1
-libdrm-dev==2.4.74-1
-libdrm-exynos1==2.4.74-1
-libdrm-freedreno1==2.4.74-1
-libdrm-nouveau2==2.4.74-1
-libdrm-omap1==2.4.74-1
-libdrm-radeon1==2.4.74-1
-libdrm-tegra0==2.4.74-1
-libdrm2==2.4.74-1
-libdw-dev==0.168-1
-libdw1==0.168-1
-libeasymock-java==3.4+ds-1
-libeatmydata1==105-5
-libeclipse-aether-java==1.0.2-1
-libedit-dev==3.1-20160903-3
-libedit2==3.1-20160903-3
-libegl1-mesa==13.0.6-1+b2
-libegl1-mesa-dev==13.0.6-1+b2
-libelf-dev==0.168-1
-libelf1==0.168-1
-libemail-valid-perl==1.202-1
-libencode-locale-perl==1.05-1
-libepoxy0==1.3.1-2
-liberror-perl==0.17024-1
-libestr0==0.1.10-2
-libevdev2==1.5.6+dfsg-1
-libevent-2.0-5==2.0.21-stable-3
-libevent-core-2.0-5==2.0.21-stable-3
-libevent-dev==2.0.21-stable-3
-libevent-extra-2.0-5==2.0.21-stable-3
-libevent-openssl-2.0-5==2.0.21-stable-3
-libevent-pthreads-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u3
-libexpat1-dev==2.2.0-2+deb9u3
-libexplain-dev==1.4.D001-6
-libexplain51==1.4.D001-6
-libexporter-tiny-perl==0.042-1
-libfakeroot==1.21-3.1
-libfastjson4==0.99.4-1
-libfcgi-perl==0.78-2
-libffi-dev==3.2.1-6
-libfftw3-double3==3.3.5-3
-libfile-basedir-perl==0.07-1
-libfile-chdir-perl==0.1008-1
-libfile-desktopentry-perl==0.22-1
-libfile-fcntllock-perl==0.22-3+b2
-libfile-homedir-perl==1.00-1
-libfile-listing-perl==6.04-1
-libfile-mimeinfo-perl==0.27-1
-libfile-stripnondeterminism-perl==0.034-1
-libfile-which-perl==1.21-1
-libfl-dev==2.6.1-1.3
-libflac8==1.3.2-2+deb9u1
-libfont-afm-perl==1.20-2
-libfontbox-java==1:1.8.12-1
-libfontconfig1==2.11.0-6.7+b1
-libfontenc1==1:1.1.3-1+b2
-libfop-java==1:2.1-6
-libfreetype6==2.6.3-3.2+deb9u2
-libfribidi0==0.19.7-1+deb9u1
-libgail-common==2.24.31-2
-libgail18==2.24.31-2
-libgbm1==13.0.6-1+b2
-libgc1c2==1:7.4.2-8
-libgcc-6-dev==6.3.0-18+deb9u1
-libgd3==2.2.4-2+deb9u5
-libgdbm3==1.8.3-14
-libgdk-pixbuf2.0-0==2.36.5-2+deb9u2
-libgdk-pixbuf2.0-common==2.36.5-2+deb9u2
-libgeoip1==1.6.9-4
-libgeronimo-interceptor-3.0-spec-java==1.0.1-3
-libgetopt-long-descriptive-perl==0.100-1
-libgfortran3==6.3.0-18+deb9u1
-libgif7==5.1.4-0.4
-libgirepository-1.0-1==1.50.0-1+b1
-libgit-wrapper-perl==0.047-1
-libgl1-mesa-dev==13.0.6-1+b2
-libgl1-mesa-dri==13.0.6-1+b2
-libgl1-mesa-glx==13.0.6-1+b2
-libglapi-mesa==13.0.6-1+b2
-libgles2-mesa==13.0.6-1+b2
-libgles2-mesa-dev==13.0.6-1+b2
-libglew2.0==2.0.0-3+b1
-libglib2.0-0==2.50.3-2+deb9u2
-libglib2.0-bin==2.50.3-2+deb9u2
-libglib2.0-data==2.50.3-2+deb9u2
-libglib2.0-dev==2.50.3-2+deb9u2
-libglu1-mesa==9.0.0-2.1
-libglu1-mesa-dev==9.0.0-2.1
-libgmp-dev==2:6.1.2+dfsg-1
-libgmpxx4ldbl==2:6.1.2+dfsg-1
-libgomp1==6.3.0-18+deb9u1
-libgoogle-perftools4==2.5-2.2
-libgpgme11==1.8.0-3+b2
-libgpm2==1.20.4-6.2+b1
-libgraphite2-3==1.3.10-1
-libgs9==9.26a~dfsg-0+deb9u7
-libgs9-common==9.26a~dfsg-0+deb9u7
-libgsasl7==1.8.0-8+b2
-libgssapi-krb5-2==1.15-1+deb9u3
-libgstreamer1.0-0==1.10.4-1
-libgtest-dev==1.8.0-6
-libgtk-3-0==3.22.11-1
-libgtk-3-bin==3.22.11-1
-libgtk-3-common==3.22.11-1
-libgtk2.0-0==2.24.31-2
-libgtk2.0-bin==2.24.31-2
-libgtk2.0-common==2.24.31-2
-libgts-0.7-5==0.7.6+darcs121130-4
-libgts-bin==0.7.6+darcs121130-4
-libguava-java==19.0-1
-libgudev-1.0-0==230-3
-libguice-java==4.0-3
-libgvc6==2.38.0-17+deb9u1
-libgvpr2==2.38.0-17+deb9u1
-libhamcrest-java==1.3-6
-libharfbuzz-icu0==1.4.2-1
-libharfbuzz0b==1.4.2-1
-libhtml-form-perl==6.03-1
-libhtml-format-perl==2.12-1
-libhtml-parser-perl==3.72-3
-libhtml-tagset-perl==3.20-3
-libhtml-tree-perl==5.03-2
-libhttp-cookies-perl==6.01-1
-libhttp-daemon-perl==6.01-1
-libhttp-date-perl==6.02-1
-libhttp-message-perl==6.11-1
-libhttp-negotiate-perl==6.00-2
-libhttpclient-java==4.5.2-2+deb9u1
-libhttpcore-java==4.4.6-1
-libhwloc-dev==1.11.5-1
-libhwloc-plugins==1.11.5-1
-libhwloc5==1.11.5-1
-libiberty-dev==20161220-1
-libibverbs-dev==1.2.1-2
-libibverbs1==1.2.1-2
-libice-dev==2:1.0.9-2
-libice6==2:1.0.9-2
-libicu-dev==57.1-6+deb9u5
-libicu57==57.1-6+deb9u5
-libijs-0.35==0.35-12
-libilmbase12==2.2.0-12
-libimport-into-perl==1.002005-1
-libinput-bin==1.6.3-1
-libinput10==1.6.3-1
-libio-html-perl==1.001-1
-libio-pty-perl==1:1.08-1.1+b2
-libio-sessiondata-perl==1.03-1
-libio-socket-inet6-perl==2.72-2
-libio-socket-ssl-perl==2.044-1
-libio-string-perl==1.08-3
-libio-stringy-perl==2.111-2
-libip4tc-dev==1.6.0+snapshot20161117-6
-libip4tc0==1.6.0+snapshot20161117-6
-libip6tc-dev==1.6.0+snapshot20161117-6
-libip6tc0==1.6.0+snapshot20161117-6
-libipc-run-perl==0.94-1+deb9u1
-libipc-system-simple-perl==1.25-3
-libiptc-dev==1.6.0+snapshot20161117-6
-libiptc0==1.6.0+snapshot20161117-6
-libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisl15==0.18-1
-libisorelax-java==20041111-9
-libitext1-java==1.4-6
-libjansson-dev==2.9-1
-libjansson4==2.9-1
-libjaxen-java==1.1.6-1+deb9u1
-libjaxp1.3-java==1.3.05-2
-libjbig0==2.1-3.1+b2
-libjbig2dec0==0.13-4.1
-libjdom1-java==1.1.3-1+deb9u1
-libjemalloc-dev==3.6.0-9.1
-libjemalloc1==3.6.0-9.1
-libjetty9-java==9.2.30-0+deb9u2
-libjline-java==1.0-2
-libjpeg62-turbo==1:1.5.1-2+deb9u1
-libjs-bootstrap==3.3.7+dfsg-2+deb9u2
-libjs-jquery==3.1.1-2+deb9u2
-libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
-libjs-jquery-isonscreen==1.2.0-1
-libjs-jquery-metadata==11-3
-libjs-jquery-tablesorter==11-3
-libjs-jquery-throttle-debounce==1.1+dfsg.1-1
-libjs-modernizr==2.6.2+ds1-1
-libjs-sphinxdoc==1.4.9-2
-libjs-twitter-bootstrap==2.0.2+dfsg-10
-libjs-underscore==1.8.3~dfsg-1+deb9u1
-libjsch-java==0.1.54-1
-libjson-c-dev==0.12.1-1.1+deb9u1
-libjson-c3==0.12.1-1.1+deb9u1
-libjson-glib-1.0-0==1.2.6-1
-libjson-glib-1.0-common==1.2.6-1
-libjsoncpp1==1.7.4-3
-libjsoup-java==1.10.2-1
-libjsr305-java==0.1~+svn49-10
-libjtidy-java==7+svn20110807-4
-libjudy-dev==1.0.5-5
-libjudydebian1==1.0.5-5
-libjxr-tools==1.1-6+b1
-libjxr0==1.1-6+b1
-libjzlib-java==1.1.3-1
-libk5crypto3==1.15-1+deb9u3
-libkeyutils1==1.5.9-9
-libkmod2==23-2
-libkpathsea6==2016.20160513.41080.dfsg-2+deb9u1
-libkrb5-3==1.15-1+deb9u3
-libkrb5support0==1.15-1+deb9u3
-libksba8==1.3.5-2
-libkyotocabinet16v5==1.2.76-4.2+b1
-liblcms2-2==2.8-4+deb9u1
-libldap-2.4-2==2.4.44+dfsg-5+deb9u8
-libldap-common==2.4.44+dfsg-5+deb9u8
-libldap2-dev==2.4.44+dfsg-5+deb9u8
-liblist-compare-perl==0.53-1
-liblist-moreutils-perl==0.416-1+b1
-libllvm3.8==1:3.8.1-24
-libllvm3.9==1:3.9.1-9
-liblocale-gettext-perl==1.07-3+b1
-liblog4j1.2-java==1.2.17-7+deb9u1
-liblogging-stdlog0==1.0.5-2+b2
-liblognorm5==2.0.1-1.1+b1
-liblqr-1-0==0.4.2-2+b2
-libltdl-dev==2.4.6-2
-libltdl7==2.4.6-2
-liblua5.1-0==5.1.5-8.1+b2
-liblua5.1-0-dev==5.1.5-8.1+b2
-liblwp-mediatypes-perl==6.02-1
-liblwp-protocol-https-perl==6.06-2
-liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
-liblzo2-2==2.08-1.2+b2
-liblzo2-dev==2.08-1.2+b2
-libmagic-mgc==1:5.30-1+deb9u3
-libmagic1==1:5.30-1+deb9u3
-libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
-libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
-libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
-libmail-sendmail-perl==0.79.16-2
-libmailtools-perl==2.18-1
-libmailutils5==1:3.1.1-1
-libmariadbclient-dev==10.1.48-0+deb9u2
-libmariadbclient-dev-compat==10.1.48-0+deb9u2
-libmariadbclient18==10.1.48-0+deb9u2
-libmaven-ant-tasks-java==2.1.3-4
-libmaven-archiver-java==2.6-3
-libmaven-clean-plugin-java==2.5-1
-libmaven-common-artifact-filters-java==1.4-1
-libmaven-compiler-plugin-java==3.2-5
-libmaven-doxia-tools-java==1.2.1-2
-libmaven-filtering-java==1.1-1
-libmaven-jar-plugin-java==2.4-1
-libmaven-parent-java==21-2
-libmaven-plugin-tools-java==3.3-5
-libmaven-reporting-impl-java==2.3-1
-libmaven-resources-plugin-java==2.6-1
-libmaven-shared-incremental-java==1.1-1
-libmaven-shared-utils-java==3.0.0-1
-libmaven-site-plugin-java==2.1-4
-libmaven2-core-java==2.2.1-26
-libmaven3-core-java==3.3.9-4
-libmime-tools-perl==5.508-1
-libmng1==1.0.10+dfsg-3.1+b5
-libmnl-dev==1.0.4-2
-libmnl0==1.0.4-2
-libmodule-implementation-perl==0.09-1
-libmodule-runtime-perl==0.014-2
-libmoo-perl==2.002005-1
-libmpc3==1.0.3-1+b2
-libmpdec2==2.4.2-1
-libmpfr4==3.1.5-1
-libmsv-java==2009.1+dfsg1-5
-libmtdev1==1.1.5-1+b1
-libnamespace-clean-perl==0.27-1
-libnanomsg-dev==0.8~beta+dfsg-1+b1
-libnanomsg4==0.8~beta+dfsg-1+b1
-libncurses5==6.0+20161126-1+deb9u2
-libncurses5-dev==6.0+20161126-1+deb9u2
-libnet-dbus-perl==1.1.0-4+b1
-libnet-dns-perl==1.07-1
-libnet-domain-tld-perl==1.75-1
-libnet-http-perl==6.12-1
-libnet-ip-perl==1.26-1
-libnet-smtp-ssl-perl==1.04-1
-libnet-ssleay-perl==1.80-1
-libnetfilter-conntrack-dev==1.0.6-2
-libnetfilter-conntrack3==1.0.6-2
-libnetpbm10==2:10.0-15.3+b2
-libnewt-dev==0.52.19-1+b1
-libnewt0.52==0.52.19-1+b1
-libnfnetlink-dev==1.0.1-3
-libnfnetlink0==1.0.1-3
-libnftnl-dev==1.0.7-1
-libnftnl4==1.0.7-1
-libnghttp2-14==1.18.1-1+deb9u2
-libnih-dbus1==1.0.3-8
-libnih1==1.0.3-8
-libnl-3-200==3.2.27-2
-libnl-route-3-200==3.2.27-2
-libnpth0==1.3-1
-libnspr4==2:4.12-6
-libnss3==2:3.26.2-1.1+deb9u2
-libntlm0==1.4-8
-libnumber-compare-perl==0.03-1
-libnumber-range-perl==0.12-1
-libobjc-6-dev==6.3.0-18+deb9u1
-libobjc4==6.3.0-18+deb9u1
-libobjenesis-java==2.5.1-1
-libogg0==1.3.2-1
-libopenexr22==2.2.0-11+deb9u4
-libopenjp2-7==2.1.2-1.1+deb9u6
-libopenmpi-dev==2.0.2-2
-libopenmpi2==2.0.2-2
-liboro-java==2.0.8a-12
-libosp5==1.5.2-13+b1
-libossp-uuid-perl==1.6.2-1.5+b4
-libossp-uuid16==1.6.2-1.5+b4
-libpackage-stash-perl==0.37-1
-libpackage-stash-xs-perl==0.28-3+b1
-libpackagekit-glib2-18==1.1.5-2+deb9u2
-libpam-cap==1:2.25-1
-libpam-systemd==232-25+deb9u13
-libpam0g-dev==1.1.8-3.6
-libpango-1.0-0==1.40.5-1
-libpangocairo-1.0-0==1.40.5-1
-libpangoft2-1.0-0==1.40.5-1
-libpaper-utils==1.1.24+nmu5
-libpaper1==1.1.24+nmu5
-libparams-classify-perl==0.013-6+b1
-libparams-util-perl==1.07-3+b1
-libparams-validate-perl==1.26-1
-libparse-debianchangelog-perl==1.2.0-12
-libpath-iterator-rule-perl==1.009-1
-libpath-tiny-perl==0.100-1
-libpathplan4==2.38.0-17+deb9u1
-libpcap-dev==1.8.1-3
-libpcap0.8==1.8.1-3
-libpcap0.8-dev==1.8.1-3
-libpci-dev==1:3.5.2-1
-libpci3==1:3.5.2-1
-libpciaccess0==0.13.4-1+b2
-libpcre16-3==2:8.39-3
-libpcre3-dev==2:8.39-3
-libpcre32-3==2:8.39-3
-libpcrecpp0v5==2:8.39-3
-libpcsclite1==1.8.20-1
-libperl-dev==5.24.1-3+deb9u7
-libperl5.24==5.24.1-3+deb9u7
-libperlio-gzip-perl==0.19-1+b2
-libpgm-5.2-0==5.2.122~dfsg-2
-libpipeline1==1.4.1-2
-libpixman-1-0==0.34.0-1
-libplexus-ant-factory-java==1.0~alpha2.1-3
-libplexus-archiver-java==2.2-1+deb9u1
-libplexus-bsh-factory-java==1.0~alpha7-3.1
-libplexus-build-api-java==0.0.7-1
-libplexus-cipher-java==1.7-1
-libplexus-classworlds-java==1.5.0-5
-libplexus-classworlds2-java==2.5.2-1
-libplexus-cli-java==1.2-5
-libplexus-compiler-java==2.4-3
-libplexus-component-annotations-java==1.6-3
-libplexus-component-metadata-java==1.6-3
-libplexus-container-default-java==1.0-alpha-9-stable-1-7
-libplexus-container-default1.5-java==1.6-3
-libplexus-containers-java==1.0~beta3.0.7-8
-libplexus-containers1.5-java==1.6-3
-libplexus-i18n-java==1.0-beta-10-3
-libplexus-interactivity-api-java==1.0-alpha-6-7
-libplexus-interpolation-java==1.21-1
-libplexus-io-java==1.0~alpha5-2
-libplexus-sec-dispatcher-java==1.3.1-6
-libplexus-utils-java==1:1.5.15-4+deb9u1
-libplexus-utils2-java==3.0.22-1
-libplexus-velocity-java==1.2-1
-libpng-dev==1.6.28-1+deb9u1
-libpng16-16==1.6.28-1+deb9u1
-libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-18+deb9u1
-libpolkit-backend-1-0==0.105-18+deb9u1
-libpolkit-gobject-1-0==0.105-18+deb9u1
-libpoppler64==0.48.0-2+deb9u4
-libpopt0==1.16-10+b2
-libpotrace0==1.13-3
-libprocps6==2:3.3.12-3+deb9u1
-libprotobuf-dev==3.0.0-9
-libprotobuf-lite10==3.0.0-9
-libprotobuf10==3.0.0-9
-libprotoc10==3.0.0-9
-libproxy1v5==0.4.14-2+deb9u2
-libptexenc1==2016.20160513.41080.dfsg-2+deb9u1
-libpthread-stubs0-dev==0.3-4
-libpulse0==10.0-1+deb9u1
-libpython-all-dev==2.7.13-2
-libpython-dev==2.7.13-2
-libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u5
-libpython2.7-dev==2.7.13-2+deb9u5
-libpython2.7-minimal==2.7.13-2+deb9u5
-libpython2.7-stdlib==2.7.13-2+deb9u5
-libpython3-all-dbg==3.5.3-1
-libpython3-all-dev==3.5.3-1
-libpython3-dbg==3.5.3-1
-libpython3-dev==3.5.3-1
-libpython3-stdlib==3.5.3-1
-libpython3.5==3.5.3-1+deb9u4
-libpython3.5-dbg==3.5.3-1+deb9u4
-libpython3.5-dev==3.5.3-1+deb9u4
-libpython3.5-minimal==3.5.3-1+deb9u4
-libpython3.5-stdlib==3.5.3-1+deb9u4
-libqdox-java==1.12.1-2
-libqdox2-java==2.0~M3-3
-libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
-libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
-libqt4-designer==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
-libqt4-help==4:4.8.7+dfsg-11+deb9u1
-libqt4-network==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
-libqt4-script==4:4.8.7+dfsg-11+deb9u1
-libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
-libqt4-svg==4:4.8.7+dfsg-11+deb9u1
-libqt4-test==4:4.8.7+dfsg-11+deb9u1
-libqt4-xml==4:4.8.7+dfsg-11+deb9u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
-libqt5concurrent5==5.7.1+dfsg-3+deb9u3
-libqt5core5a==5.7.1+dfsg-3+deb9u3
-libqt5dbus5==5.7.1+dfsg-3+deb9u3
-libqt5gui5==5.7.1+dfsg-3+deb9u3
-libqt5network5==5.7.1+dfsg-3+deb9u3
-libqt5opengl5==5.7.1+dfsg-3+deb9u3
-libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
-libqt5printsupport5==5.7.1+dfsg-3+deb9u3
-libqt5sql5==5.7.1+dfsg-3+deb9u3
-libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
-libqt5svg5==5.7.1~20161021-2.1
-libqt5test5==5.7.1+dfsg-3+deb9u3
-libqt5widgets5==5.7.1+dfsg-3+deb9u3
-libqt5xml5==5.7.1+dfsg-3+deb9u3
-libqtcore4==4:4.8.7+dfsg-11+deb9u1
-libqtdbus4==4:4.8.7+dfsg-11+deb9u1
-libqtgui4==4:4.8.7+dfsg-11+deb9u1
-libreadline-dev==7.0-3
-libreadline7==7.0-3
-libregexp-assemble-perl==0.36-1
-librelaxng-datatype-java==1.0+ds1-3
-librest-0.7-0==0.8.0-2
-librhash0==1.3.3-1+b2
-librhino-java==1.7.7.1-1
-librole-tiny-perl==2.000005-1
-librrd-dev==1.6.0-1+b2
-librrd8==1.6.0-1+b2
-librsvg2-2==2.40.21-0+deb9u1
-librsvg2-common==2.40.21-0+deb9u1
-librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u10
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsaxon-java==1:6.5.5-10
-libscalar-list-utils-perl==1:1.47-1
-libseccomp2==2.3.1-2.1+deb9u1
-libselinux1-dev==2.6-3+b3
-libsensors4==1:3.4.0-4
-libsensors4-dev==1:3.4.0-4
-libsepol1-dev==2.6-2
-libservlet3.1-java==8.5.54-0+deb9u8
-libsigsegv2==2.10-5
-libsisu-inject-java==0.3.2-2
-libsisu-plexus-java==0.3.2-1
-libslang2==2.3.1-5
-libslang2-dev==2.3.1-5
-libslf4j-java==1.7.22-1
-libsm-dev==2:1.2.2-1+b3
-libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u2
-libsnmp-base==5.7.3+dfsg-1.7+deb9u3
-libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
-libsnmp30==5.7.3+dfsg-1.7+deb9u3
-libsoap-lite-perl==1.20-1
-libsocket6-perl==0.27-1+b1
-libsodium18==1.0.11-2
-libsort-key-perl==1.33-1+b3
-libsort-versions-perl==1.62-1
-libsoup-gnome2.4-1==2.56.0-2+deb9u2
-libsoup2.4-1==2.56.0-2+deb9u2
-libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u1
-libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u6
-libssl1.1==1.1.0l-1~deb9u4
-libstax-java==1.2.0-3
-libstdc++-6-dev==6.3.0-18+deb9u1
-libstrictures-perl==2.000003-1
-libstring-copyright-perl==0.003005-1
-libstring-escape-perl==2010.002-1
-libsub-exporter-perl==0.986-1
-libsub-exporter-progressive-perl==0.001013-1
-libsub-identify-perl==0.12-2+b1
-libsub-install-perl==0.928-1
-libsub-name-perl==0.21-1
-libsubunit-dev==1.1.0-3
-libsubunit0==1.1.0-3
-libsurefire-java==2.17-3
-libswitch-perl==2.17-2
-libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
-libsys-hostname-long-perl==1.5-1
-libsystemd-dev==232-25+deb9u13
-libtask-weaken-perl==1.04-1
-libtcl8.6==8.6.6+dfsg-1+b1
-libtcmalloc-minimal4==2.5-2.2
-libtexlua52==2016.20160513.41080.dfsg-2+deb9u1
-libtexluajit2==2016.20160513.41080.dfsg-2+deb9u1
-libtext-charwidth-perl==0.04-7+b6
-libtext-glob-perl==0.10-1
-libtext-iconv-perl==1.7-5+b4
-libtext-levenshtein-perl==0.13-1
-libtext-unidecode-perl==1.30-1
-libtext-wrapi18n-perl==0.06-7.1
-libthai-data==0.1.26-1
-libthai0==0.1.26-1
-libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u7
-libtimedate-perl==2.3000-2+deb9u1
-libtinfo-dev==6.0+20161126-1+deb9u2
-libtinyxml2-4==4.0.1-1
-libtinyxml2-dev==4.0.1-1
-libtk8.6==8.6.6-1+b1
-libtool==2.4.6-2
-libtool-bin==2.4.6-2
-libtry-tiny-perl==0.28-1
-libtxc-dxtn-s2tc==1.0+git20151227-2
-libubsan0==6.3.0-18+deb9u1
-libudev-dev==232-25+deb9u13
-libunicode-utf8-perl==0.60-1+b3
-libunwind-dev==1.1-4.1
-libunwind8==1.1-4.1
-libunwind8-dev==1.1-4.1
-liburi-perl==1.71-1
-libusb-0.1-4==2:0.1.12-30
-libusb-1.0-0==2:1.0.21-1
-libusb-1.0-0-dev==2:1.0.21-1
-libusb-1.0-doc==2:1.0.21-1
-libusb-dev==2:0.1.12-30
-libutempter0==1.1.6-3
-libuv1==1.34.2-1~bpo9+1
-libvariable-magic-perl==0.61-1
-libvorbis0a==1.3.5-4+deb9u2
-libvorbisenc2==1.3.5-4+deb9u2
-libwacom-bin==0.22-1+b1
-libwacom-common==0.22-1
-libwacom2==0.22-1+b1
-libwagon-java==1.0.0-9
-libwagon2-java==2.10-6
-libwayland-bin==1.12.0-1+deb9u1
-libwayland-client0==1.12.0-1+deb9u1
-libwayland-cursor0==1.12.0-1+deb9u1
-libwayland-dev==1.12.0-1+deb9u1
-libwayland-egl1-mesa==13.0.6-1+b2
-libwayland-server0==1.12.0-1+deb9u1
-libwebp6==0.5.2-1+deb9u1
-libwebpdemux2==0.5.2-1+deb9u1
-libwebpmux2==0.5.2-1+deb9u1
-libwmf0.2-7==0.2.8.4-10.6
-libwrap0==7.6.q-26
-libwrap0-dev==7.6.q-26
-libwww-perl==6.15-1
-libwww-robotrules-perl==6.01-1
-libx11-6==2:1.6.4-3+deb9u4
-libx11-data==2:1.6.4-3+deb9u4
-libx11-dev==2:1.6.4-3+deb9u4
-libx11-doc==2:1.6.4-3+deb9u4
-libx11-protocol-perl==0.56-7
-libx11-xcb-dev==2:1.6.4-3+deb9u4
-libx11-xcb1==2:1.6.4-3+deb9u4
-libxalan2-java==2.7.1-9
-libxapian30==1.4.3-2+deb9u3
-libxau-dev==1:1.0.8-1
-libxau6==1:1.0.8-1
-libxaw7==2:1.0.13-1+b2
-libxbean-java==4.5-4
-libxcb-dri2-0==1.12-1
-libxcb-dri2-0-dev==1.12-1
-libxcb-dri3-0==1.12-1
-libxcb-dri3-dev==1.12-1
-libxcb-glx0==1.12-1
-libxcb-glx0-dev==1.12-1
-libxcb-icccm4==0.4.1-1
-libxcb-image0==0.4.0-1+b2
-libxcb-keysyms1==0.4.0-1+b2
-libxcb-present-dev==1.12-1
-libxcb-present0==1.12-1
-libxcb-randr0==1.12-1
-libxcb-randr0-dev==1.12-1
-libxcb-render-util0==0.3.9-1
-libxcb-render0==1.12-1
-libxcb-render0-dev==1.12-1
-libxcb-shape0==1.12-1
-libxcb-shape0-dev==1.12-1
-libxcb-shm0==1.12-1
-libxcb-sync-dev==1.12-1
-libxcb-sync1==1.12-1
-libxcb-util0==0.3.8-3+b2
-libxcb-xfixes0==1.12-1
-libxcb-xfixes0-dev==1.12-1
-libxcb-xinerama0==1.12-1
-libxcb-xkb1==1.12-1
-libxcb1==1.12-1
-libxcb1-dev==1.12-1
-libxcomposite1==1:0.4.4-2
-libxcursor1==1:1.1.14-1+deb9u2
-libxdamage-dev==1:1.1.4-2+b3
-libxdamage1==1:1.1.4-2+b3
-libxdelta2==1.1.3-9.1+b1
-libxdmcp-dev==1:1.1.2-3
-libxdmcp6==1:1.1.2-3
-libxdot4==2.38.0-17+deb9u1
-libxerces2-java==2.11.0-7
-libxext-dev==2:1.3.3-1+b2
-libxext6==2:1.3.3-1+b2
-libxfixes-dev==1:5.0.3-1
-libxfixes3==1:5.0.3-1
-libxft2==2.3.2-1+b2
-libxi6==2:1.7.9-1
-libxinerama1==2:1.1.3-1+b3
-libxkbcommon-x11-0==0.7.1-2~deb9u1
-libxkbcommon0==0.7.1-2~deb9u1
-libxml-commons-external-java==1.4.01-2
-libxml-commons-resolver1.1-java==1.2-7
-libxml-libxml-perl==2.0128+dfsg-1+deb9u1
-libxml-namespacesupport-perl==1.11-1
-libxml-parser-perl==2.44-2+b1
-libxml-sax-base-perl==1.07-1
-libxml-sax-expat-perl==0.40-2
-libxml-sax-perl==0.99+dfsg-2
-libxml-simple-perl==2.22-1
-libxml-twig-perl==1:3.50-1
-libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u5
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
-libxmlgraphics-commons-java==2.1-2
-libxmlrpc-lite-perl==0.717-1
-libxmu6==2:1.1.2-2
-libxmuu1==2:1.1.2-2
-libxom-java==1.2.10-1
-libxpm4==1:3.5.12-1
-libxpp2-java==2.1.10-7
-libxpp3-java==1.1.4c-2
-libxrandr2==2:1.5.1-1
-libxrender1==1:0.9.10-1
-libxshmfence-dev==1.2-1+b2
-libxshmfence1==1.2-1+b2
-libxslt1-dev==1.1.29-2.1+deb9u2
-libxslt1.1==1.1.29-2.1+deb9u2
-libxss1==1:1.2.2-1
-libxt-dev==1:1.1.5-1
-libxt6==1:1.1.5-1
-libxtables-dev==1.6.0+snapshot20161117-6
-libxtables12==1.6.0+snapshot20161117-6
-libxtst6==2:1.2.3-1
-libxv1==2:1.0.11-1
-libxxf86dga1==2:1.1.4-1+b3
-libxxf86vm-dev==1:1.1.4-1+b2
-libxxf86vm1==1:1.1.4-1+b2
-libyaml-0-2==0.1.7-2
-libyaml-dev==0.1.7-2
-libyaml-libyaml-perl==0.63-2
-libyaml-tiny-perl==1.70-1
-libzmq3-dev==4.2.1-4+deb9u4
-libzmq5==4.2.1-4+deb9u4
-libzzip-0-13==0.13.62-3.2~deb9u1
-licensecheck==3.0.29-1
-lintian==2.5.50.4
-linux-compiler-gcc-6-arm==4.9.272-2
-linux-kbuild-4.9==4.9.272-2
-linux-libc-dev==4.9.272-2
-linuxdoc-tools==0.9.72-4
-llvm-3.8==1:3.8.1-24
-llvm-3.8-dev==1:3.8.1-24
-llvm-3.8-runtime==1:3.8.1-24
-lmodern==2.004.5-3
-logrotate==3.11.0-0.1
-lsb-release==9.20161125
-lsof==4.89+dfsg-0.1
-lua-bitop==1.0.2-4
-lua-bitop-dev==1.0.2-4
-lua-cjson==2.1.0+dfsg-2
-lua-cjson-dev==2.1.0+dfsg-2
-lynx==2.8.9dev11-1+deb9u1
-lynx-common==2.8.9dev11-1+deb9u1
-m4==1.4.18-1
-mailutils==1:3.1.1-1
-mailutils-common==1:3.1.1-1
-make==4.1-9.1
-man-db==2.7.6.1-2
-manpages==4.10-2
-manpages-dev==4.10-2
-maven==3.3.9-4
-maven-debian-helper==2.1.3
-maven-repo-helper==1.9.2
-mesa-common-dev==13.0.6-1+b2
-mesa-utils==8.3.0-3
-mime-support==3.60
-module-assistant==0.11.9
-mpi-default-bin==1.8
-mpi-default-dev==1.8
-mysql-common==5.8+1.0.2
-ncurses-term==6.0+20161126-1+deb9u2
-netbase==5.4
-netpbm==2:10.0-15.3+b2
-nodejs==10.24.1-1nodesource1
-ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u302-b08-1~deb9u1
-openjdk-8-jdk-headless==8u302-b08-1~deb9u1
-openjdk-8-jre==8u302-b08-1~deb9u1
-openjdk-8-jre-headless==8u302-b08-1~deb9u1
-openmpi-bin==2.0.2-2
-openmpi-common==2.0.2-2
-opensp==1.5.2-13+b1
-openssh-client==1:7.4p1-10+deb9u7
-openssh-server==1:7.4p1-10+deb9u7
-openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u4
-packagekit==1.1.5-2+deb9u2
-packagekit-tools==1.1.5-2+deb9u2
-patch==2.7.5-1+deb9u2
-patchutils==0.3.4-2
-pbuilder==0.228.7
-pbzip2==1.1.9-1+b1
-perl==5.24.1-3+deb9u7
-perl-modules-5.24==5.24.1-3+deb9u7
-perl-openssl-defaults==3
-php-cli==1:7.0+49
-php-codecoverage==4.0.0+dfsg-1
-php-common==1:49
-php-deepcopy==1.5.5-1
-php-doctrine-instantiator==1.0.5-2
-php-file-iterator==1.4.1-2
-php-pear==1:1.10.1+submodules+notgz-9+deb9u3
-php-phpdocumentor-reflection-docblock==2.0.4-2
-php-phpspec-prophecy==1.6.2-1
-php-symfony-yaml==2.8.7+dfsg-1.3+deb9u3
-php-text-template==1.2.1-2
-php-timer==1.0.8-1
-php-token-stream==1.4.8-2
-php-xml==1:7.0+49
-php7.0-cli==7.0.33-0+deb9u11
-php7.0-common==7.0.33-0+deb9u11
-php7.0-json==7.0.33-0+deb9u11
-php7.0-opcache==7.0.33-0+deb9u11
-php7.0-readline==7.0.33-0+deb9u11
-php7.0-xml==7.0.33-0+deb9u11
-phpunit==5.4.6-2~deb9u1
-phpunit-code-unit-reverse-lookup==1.0.0-2
-phpunit-comparator==1.2.0-2
-phpunit-diff==1.4.1-2
-phpunit-environment==1.3.7-1
-phpunit-exporter==1.2.2-1
-phpunit-global-state==1.1.1-2
-phpunit-mock-object==3.2.3-1
-phpunit-object-enumerator==1.0.0-2
-phpunit-recursion-context==1.0.2-2
-phpunit-resource-operations==1.0.0-2
-phpunit-version==2.0.0-2
-pigz==2.3.4-1
-pinentry-curses==1.0.0-2
-pkg-config==0.29-4+b1
-pkg-php-tools==1.35
-po-debconf==1.0.20
-policykit-1==0.105-18+deb9u1
-poppler-data==0.4.7-8
-preview-latex-style==11.90-1
-pristine-tar==1.38
-procmail==3.22-25+deb9u1
-procps==2:3.3.12-3+deb9u1
-prosper==1.00.4+cvs.2007.05.01-4.1
-protobuf-compiler==3.0.0-9
-ps2eps==1.68+binaryfree-2
-psmisc==22.21-2.1+b2
-psutils==1.17.dfsg-4
-pylint==1.6.5-1
-python==2.7.13-2
-python-alabaster==0.7.8-1
-python-all==2.7.13-2
-python-all-dev==2.7.13-2
-python-apt==1.4.3
-python-apt-common==1.4.3
-python-astroid==1.4.9-1
-python-attr==16.3.0-1
-python-babel==2.3.4+dfsg.1-2+deb9u1
-python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python-backports.functools-lru-cache==1.3-1
-python-bs4==4.5.3-1
-python-cffi-backend==1.9.1-2
-python-chardet==2.3.0-2
-python-click==6.6-1
-python-colorama==0.3.7-1
-python-constantly==15.1.0-1
-python-cov-core==1.15.0-1
-python-coverage==4.2+dfsg.1-2
-python-crypto==2.6.1-7
-python-cryptography==1.7.1-3+deb9u2
-python-dateutil==2.5.3-2
-python-dbus==1.2.4-1+b1
-python-debian==0.1.30
-python-dev==2.7.13-2
-python-docutils==0.13.1+dfsg-2
-python-enum34==1.1.6-1
-python-gi==3.22.0-2
-python-gpg==1.8.0-3+b2
-python-html5lib==0.999999999-1
-python-idna==2.2-1
-python-imagesize==0.7.1-1
-python-incremental==16.10.1-3
-python-ipaddr==2.1.11-2
-python-ipaddress==1.0.17-1
-python-isort==4.2.5+ds1-2+deb9u1
-python-jinja2==2.8-1
-python-keyring==10.1-1
-python-keyrings.alt==1.3-1
-python-lazy-object-proxy==1.2.2-1
-python-lxml==3.7.1-1+deb9u4
-python-markupsafe==0.23-3
-python-minimal==2.7.13-2
-python-nose2==0.6.5-2
-python-openssl==16.2.0-1
-python-pam==0.4.2-13.2
-python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u3
-python-pip-whl==9.0.1-2+deb9u2
-python-pkg-resources==33.1.1-1
-python-py==1.4.32-3
-python-pyasn1==0.1.9-2
-python-pyasn1-modules==0.0.7-0.1
-python-pygments==2.2.0+dfsg-1+deb9u2
-python-pytest==3.0.6-1
-python-pytest-cov==2.4.0-2
-python-requests==2.12.4-1
-python-roman==2.0.0-2
-python-secretstorage==2.3.1-2
-python-serial==3.2.1-1
-python-service-identity==16.0.0-2
-python-setuptools==33.1.1-1
-python-six==1.10.0-3
-python-sphinx==1.4.9-2
-python-sphinx-rtd-theme==0.1.9-1
-python-stdeb==0.8.5-1
-python-tk==2.7.13-1
-python-twisted==16.6.0-2
-python-twisted-bin==16.6.0-2
-python-twisted-core==16.6.0-2
-python-tz==2016.7-0.3
-python-urllib3==1.19.1-1+deb9u1
-python-webencodings==0.5-2
-python-wheel==0.29.0-2
-python-wrapt==1.9.0-2
-python-xdg==0.25-4+deb9u1
-python-zope.interface==4.3.2-1
-python2.7==2.7.13-2+deb9u5
-python2.7-dev==2.7.13-2+deb9u5
-python2.7-minimal==2.7.13-2+deb9u5
-python3==3.5.3-1
-python3-alabaster==0.7.8-1
-python3-all==3.5.3-1
-python3-all-dbg==3.5.3-1
-python3-all-dev==3.5.3-1
-python3-apt==1.4.3
-python3-babel==2.3.4+dfsg.1-2+deb9u1
-python3-cffi-backend==1.9.1-2
-python3-chardet==2.3.0-2
-python3-crypto==2.6.1-7
-python3-cryptography==1.7.1-3+deb9u2
-python3-dbg==3.5.3-1
-python3-dbus==1.2.4-1+b1
-python3-debian==0.1.30
-python3-dev==3.5.3-1
-python3-docutils==0.13.1+dfsg-2
-python3-gi==3.22.0-2
-python3-idna==2.2-1
-python3-imagesize==0.7.1-1
-python3-jinja2==2.8-1
-python3-keyring==10.1-1
-python3-keyrings.alt==1.3-1
-python3-magic==1:5.30-1+deb9u3
-python3-markupsafe==0.23-3
-python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u3
-python3-pkg-resources==33.1.1-1
-python3-pyasn1==0.1.9-2
-python3-pycurl==7.43.0-2
-python3-pygments==2.2.0+dfsg-1+deb9u2
-python3-roman==2.0.0-2
-python3-secretstorage==2.3.1-2
-python3-setuptools==33.1.1-1
-python3-six==1.10.0-3
-python3-software-properties==0.96.20.2-1+deb9u1
-python3-sphinx==1.4.9-2
-python3-tz==2016.7-0.3
-python3-wheel==0.29.0-2
-python3-xdg==0.25-4+deb9u1
-python3.5==3.5.3-1+deb9u4
-python3.5-dbg==3.5.3-1+deb9u4
-python3.5-dev==3.5.3-1+deb9u4
-python3.5-minimal==3.5.3-1+deb9u4
-qdbus==4:4.8.7+dfsg-11+deb9u1
-qt-at-spi==0.4.0-5
-qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
-qt4-qmake==4:4.8.7+dfsg-11+deb9u1
-qt5-default==5.7.1+dfsg-3+deb9u3
-qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
-qt5-qmake==5.7.1+dfsg-3+deb9u3
-qtbase5-dev==5.7.1+dfsg-3+deb9u3
-qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
-qtchooser==63-g13a3d08-1
-qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
-qttranslations5-l10n==5.7.1~20161021-1
-quilt==0.65-2~bpo9+1
-rake==10.5.0-2+deb9u1
-readline-common==7.0-3
-rename==0.20-4
-rhino==1.7.7.1-1
-rrdtool==1.6.0-1+b2
-rsync==3.1.2-1+deb9u2
-rsyslog==8.24.0-1
-ruby==1:2.3.3
-ruby-all-dev==1:2.3.3
-ruby-did-you-mean==1.0.0-2
-ruby-minitest==5.9.0-1
-ruby-net-telnet==0.1.1-2
-ruby-power-assert==0.3.0-1
-ruby-setup==3.4.1-9
-ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u10
-ruby2.3-dev==2.3.3-1+deb9u10
-rubygems-integration==1.11
-sgml-base==1.29
-sgml-data==2.0.10
-shared-mime-info==1.8-1+deb9u1
-software-properties-common==0.96.20.2-1+deb9u1
-sphinx-common==1.4.9-2
-sphinx-rtd-theme-common==0.1.9-1
-squashfs-tools==1:4.3-3+deb9u3
-stgit==0.17.1-1
-strace==4.15-2
-sudo==1.8.19p1-2.1+deb9u3
-swig==3.0.10-1.1
-swig3.0==3.0.10-1.1
-systemd==232-25+deb9u13
-systemd-shim==10-3
-t1utils==1.39-2
-tcl==8.6.0+9
-tcl8.6==8.6.6+dfsg-1+b1
-tcpd==7.6.q-26
-telnet==0.17-41
-tex-common==6.06
-tex-gyre==20160520-1
-texi2html==1.82+dfsg1-5
-texinfo==6.3.0.dfsg.1-1+b2
-texlive-base==2016.20170123-5
-texlive-binaries==2016.20160513.41080.dfsg-2+deb9u1
-texlive-extra-utils==2016.20170123-5
-texlive-font-utils==2016.20170123-5
-texlive-fonts-recommended==2016.20170123-5
-texlive-fonts-recommended-doc==2016.20170123-5
-texlive-generic-extra==2016.20170123-5
-texlive-generic-recommended==2016.20170123-5
-texlive-latex-base==2016.20170123-5
-texlive-latex-base-doc==2016.20170123-5
-texlive-latex-extra==2016.20170123-5
-texlive-latex-extra-doc==2016.20170123-5
-texlive-latex-recommended==2016.20170123-5
-texlive-latex-recommended-doc==2016.20170123-5
-texlive-pictures==2016.20170123-5
-texlive-pictures-doc==2016.20170123-5
-texlive-pstricks==2016.20170123-5
-texlive-pstricks-doc==2016.20170123-5
-tipa==2:1.3-20
-tk==8.6.0+9
-tk8.6==8.6.6-1+b1
-tk8.6-blt2.5==2.5.3+dfsg-3
-ucf==3.0036
-unattended-upgrades==0.93.1+nmu1
-unzip==6.0-21+deb9u2
-velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u3
-vim-common==2:8.0.0197-4+deb9u3
-vim-runtime==2:8.0.0197-4+deb9u3
-wdiff==1.2.2-2
-x11-common==1:7.7+19
-x11-utils==7.7+3+b1
-x11-xserver-utils==7.7+7+b1
-x11proto-core-dev==7.0.31-1
-x11proto-damage-dev==1:1.2.1-2
-x11proto-dri2-dev==2.8-2
-x11proto-fixes-dev==1:5.0-2
-x11proto-gl-dev==1.4.17-1
-x11proto-input-dev==2.3.2-1
-x11proto-kb-dev==1.0.7-1
-x11proto-xext-dev==7.3.0-1
-x11proto-xf86vidmode-dev==2.3.1-2
-xauth==1:1.0.9-1+b2
-xbitmaps==1.1.1-2
-xdelta==1.1.3-9.1+b1
-xdelta3==3.0.11-dfsg-1+b1
-xdg-user-dirs==0.15-2+b1
-xdg-utils==1.1.1-1+deb9u2
-xkb-data==2.19-1+deb9u1
-xml-core==0.17
-xmlto==0.0.28-1
-xorg-sgml-doctools==1:1.11-1
-xsltproc==1.1.29-2.1+deb9u2
-xterm==327-2+deb9u2
-xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u3
-xz-utils==5.2.2-1.2+b1
-zip==3.0-11+b1
-zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
deleted file mode 100644
index 53073b5ae1d9..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py2-all-armhf
+++ /dev/null
@@ -1,79 +0,0 @@
-alabaster==0.7.8
-astroid==1.4.9
-attrs==16.3.0
-babel==2.3.4
-backports.functools-lru-cache==1.3
-beautifulsoup4==4.5.3
-chardet==2.3.0
-click==6.6
-colorama==0.3.7
-constantly==15.1.0
-cov-core==1.15.0
-coverage==4.2
-crc16==0.1.1
-cryptography==1.7.1
-ctypesgen==0.post125
-docutils==0.13.1
-enum34==1.1.6
-gbp==0.8.12.2
-gcovr==3.3
-gpg==1.8.0
-html5lib==0.999999999
-idna==2.2
-imagesize==0.7.1
-incremental==16.10.1
-ipaddr==2.1.11
-ipaddress==1.0.17
-isort==4.2.5
-j2cli==0.3.10
-jinja2==2.11.3
-keyring==10.1
-keyrings.alt==1.3
-lazy-object-proxy==1.2.2
-lxml==4.6.2
-m2crypto==0.36.0
-markupsafe==1.1.1
-mmh3==3.0.0
-mockredispy==2.9.3
-nose==1.3.7
-nose2==0.6.5
-pam==0.4.2
-parse==1.6.6
-pexpect==4.6.0
-pillow==4.0.0
-ptyprocess==0.7.0
-py==1.4.32
-pyasn1==0.1.9
-pyasn1-modules==0.0.7
-pycrypto==2.6.1
-pygments==2.2.0
-pygobject==3.22.0
-pylint==1.6.5
-pympler==0.8
-pyopenssl==16.2.0
-pyserial==3.2.1
-pyste==0.9.10
-pytest==3.0.6
-pytest-cov==2.4.0
-pytest-runner==4.4
-python-apt==1.4.3
-python-dateutil==2.5.3
-python-debian==0.1.30
-pytz==2016.7
-pyxdg==0.25
-pyyaml==5.3.1
-requests==2.12.4
-roman==2.0.0
-secretstorage==2.3.1
-service-identity==16.0.0
-six==1.10.0
-sphinx==1.4.9
-sphinx-rtd-theme==0.1.9
-stdeb==0.8.5
-stgit===0.17.1-dirty
-twisted==16.6.0
-typing==3.10.0.0
-urllib3==1.19.1
-webencodings==0.5
-wrapt==1.9.0
-zope.interface==4.3.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
deleted file mode 100644
index 7d2fad524590..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch-march-armhf/versions-py3-all-armhf
+++ /dev/null
@@ -1,37 +0,0 @@
-alabaster==0.7.8
-babel==2.3.4
-bitarray==2.3.4
-chardet==2.3.0
-cryptography==1.7.1
-devscripts==2.17.6+deb9u2
-docutils==0.13.1
-file-magic==0.3.0
-idna==2.2
-imagesize==0.7.1
-jinja2==2.8
-keyring==10.1
-keyrings.alt==1.3
-lxml==4.6.2
-markupsafe==0.23
-mockredispy==2.9.3
-nose==1.3.7
-pillow==4.0.0
-pyang==2.4.0
-pyangbind==0.8.1
-pyasn1==0.1.9
-pycrypto==2.6.1
-pycurl==7.43.0
-pygments==2.2.0
-pygobject==3.22.0
-python-apt==1.4.3
-python-debian==0.1.30
-pytz==2016.7
-pyxdg==0.25
-pyyaml==5.3.1
-redis==3.5.3
-regex==2021.10.23
-roman==2.0.0
-secretstorage==2.3.1
-six==1.10.0
-sphinx==1.4.9
-unattended-upgrades==0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 99c39c07041e..821701ecda3d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -22,7 +22,7 @@ autopoint==0.19.8.1-2+deb9u1
 autotools-dev==20161112.1
 bash-completion==1:2.1-4.3
 bc==1.06.95-9+b3
-bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u9
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u10
 binfmt-support==2.1.6-2
 binutils==2.28-5
 bison==2:3.0.4.dfsg-1+b1
@@ -78,7 +78,7 @@ distro-info-data==0.36
 dkms==2.3-2
 dmeventd==2:1.02.137-2
 dmsetup==2:1.02.137-2
-dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u9
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u10
 docbook-xml==4.5-8
 docbook-xsl==1.79.1+dfsg-2
 docker-ce==5:18.09.5~3-0~debian-stretch
@@ -227,8 +227,8 @@ libbabeltrace-ctf1==1.5.1-1
 libbabeltrace-dev==1.5.1-1
 libbabeltrace1==1.5.1-1
 libbatik-java==1.8-4+deb9u2
-libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u9
-libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u10
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u10
 libbison-dev==2:3.0.4.dfsg-1+b1
 libbit-vector-perl==7.4-1+b2
 libbluetooth3==5.43-2+deb9u4
@@ -405,8 +405,8 @@ libdigest-hmac-perl==1.03+dfsg-1
 libdistro-info-perl==0.14
 libdjvulibre-text==3.5.27.1-7+deb9u2
 libdjvulibre21==3.5.27.1-7+deb9u2
-libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u9
-libdns162==1:9.10.3.dfsg.P4-12.3+deb9u9
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u10
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u10
 libdom4j-java==1.6.1+dfsg.3-2+deb9u1
 libdouble-conversion1==2.0.1-4
 libdoxia-core-java==1.1.4-6
@@ -573,13 +573,13 @@ libipc-run-perl==0.94-1+deb9u1
 libipc-system-simple-perl==1.25-3
 libiptc-dev==1.6.0+snapshot20161117-6
 libiptc0==1.6.0+snapshot20161117-6
-libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisc160==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u9
-libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u9
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u10
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u10
 libisl15==0.18-1
 libisorelax-java==20041111-9
 libitext1-java==1.4-6
@@ -651,7 +651,7 @@ liblvm2app2.2==2.02.168-2
 liblvm2cmd2.02==2.02.168-2
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.06-2
-liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u9
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u10
 liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
@@ -1204,12 +1204,12 @@ php-text-template==1.2.1-2
 php-timer==1.0.8-1
 php-token-stream==1.4.8-2
 php-xml==1:7.0+49
-php7.0-cli==7.0.33-0+deb9u11
-php7.0-common==7.0.33-0+deb9u11
-php7.0-json==7.0.33-0+deb9u11
-php7.0-opcache==7.0.33-0+deb9u11
-php7.0-readline==7.0.33-0+deb9u11
-php7.0-xml==7.0.33-0+deb9u11
+php7.0-cli==7.0.33-0+deb9u12
+php7.0-common==7.0.33-0+deb9u12
+php7.0-json==7.0.33-0+deb9u12
+php7.0-opcache==7.0.33-0+deb9u12
+php7.0-readline==7.0.33-0+deb9u12
+php7.0-xml==7.0.33-0+deb9u12
 phpunit==5.4.6-2~deb9u1
 phpunit-code-unit-reverse-lookup==1.0.0-2
 phpunit-comparator==1.2.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
new file mode 100644
index 000000000000..a30ff45c0fca
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -0,0 +1,33 @@
+cron==3.0pl1-128+deb9u2
+docker-ce==18.06.3~ce~3-0~debian
+icu-devtools==57.1-6+deb9u5
+krb5-locales==1.15-1+deb9u3
+libcups2==2.2.1-8+deb9u7
+libcupsimage2==2.2.1-8+deb9u7
+libdrm-freedreno1==2.4.74-1
+libdrm-tegra0==2.4.74-1
+libdw-dev==0.168-1+deb9u1
+libdw1==0.168-1+deb9u1
+libelf-dev==0.168-1+deb9u1
+libelf1==0.168-1+deb9u1
+libicu-dev==57.1-6+deb9u5
+libicu57==57.1-6+deb9u5
+libjbig2dec0==0.13-4.1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
+libpython3.5==3.5.3-1+deb9u5
+libpython3.5-dbg==3.5.3-1+deb9u5
+libpython3.5-dev==3.5.3-1+deb9u5
+libpython3.5-minimal==3.5.3-1+deb9u5
+libpython3.5-stdlib==3.5.3-1+deb9u5
+libtext-charwidth-perl==0.04-7+b3
+libtext-iconv-perl==1.7-5+b3
+libunicode-utf8-perl==0.60-1+b2
+libxslt1-dev==1.1.29-2.1+deb9u2
+nodejs==10.24.1-1nodesource1
+python-babel==2.3.4+dfsg.1-2+deb9u1
+python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
+python3-babel==2.3.4+dfsg.1-2+deb9u1
+python3.5==3.5.3-1+deb9u5
+python3.5-dbg==3.5.3-1+deb9u5
+python3.5-dev==3.5.3-1+deb9u5
+python3.5-minimal==3.5.3-1+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
new file mode 100644
index 000000000000..e20749aa40ae
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -0,0 +1,39 @@
+cron==3.0pl1-128+deb9u2
+docker-ce==18.06.3~ce~3-0~debian
+icu-devtools==57.1-6+deb9u5
+krb5-locales==1.15-1+deb9u3
+libcups2==2.2.1-8+deb9u7
+libcupsimage2==2.2.1-8+deb9u7
+libdrm-exynos1==2.4.74-1
+libdrm-freedreno1==2.4.74-1
+libdrm-omap1==2.4.74-1
+libdrm-tegra0==2.4.74-1
+libdw-dev==0.168-1+deb9u1
+libdw1==0.168-1+deb9u1
+libegl1-mesa-dev==13.0.6-1+b2
+libelf-dev==0.168-1+deb9u1
+libelf1==0.168-1+deb9u1
+libgles2-mesa==13.0.6-1+b2
+libgles2-mesa-dev==13.0.6-1+b2
+libicu-dev==57.1-6+deb9u5
+libicu57==57.1-6+deb9u5
+libjbig2dec0==0.13-4.1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
+libpython3.5==3.5.3-1+deb9u5
+libpython3.5-dbg==3.5.3-1+deb9u5
+libpython3.5-dev==3.5.3-1+deb9u5
+libpython3.5-minimal==3.5.3-1+deb9u5
+libpython3.5-stdlib==3.5.3-1+deb9u5
+libtext-charwidth-perl==0.04-7+b6
+libwayland-bin==1.12.0-1+deb9u1
+libwayland-dev==1.12.0-1+deb9u1
+libxslt1-dev==1.1.29-2.1+deb9u2
+linux-compiler-gcc-6-arm==4.9.272-2
+nodejs==10.24.1-1nodesource1
+python-babel==2.3.4+dfsg.1-2+deb9u1
+python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
+python3-babel==2.3.4+dfsg.1-2+deb9u1
+python3.5==3.5.3-1+deb9u5
+python3.5-dbg==3.5.3-1+deb9u5
+python3.5-dev==3.5.3-1+deb9u5
+python3.5-minimal==3.5.3-1+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
new file mode 100644
index 000000000000..c1a0c3be0413
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
@@ -0,0 +1 @@
+regex==2021.11.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
new file mode 100644
index 000000000000..c1a0c3be0413
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
@@ -0,0 +1 @@
+regex==2021.11.2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 2f3b2e44c9db..08a86a1f42d4 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -51,7 +51,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.1
+innovium-platform-driver==0.107.2
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -80,7 +80,7 @@ libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
@@ -105,7 +105,7 @@ libi2c0==4.1-1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
 libk5crypto3==1.17-3+deb10u3
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 14c2a207dda6..e38296ba3161 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -2,8 +2,10 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
@@ -12,4 +14,5 @@ linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.208-1
 squashfs-tools==1:4.3-12+deb10u1
 tsingma-bsp==1.0
+tzdata==2021a-0+deb10u3
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 31e9f7af438a..8e5722c2ccf0 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -2,8 +2,10 @@ icu-devtools==63.1-6+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u1
 libicu63==63.1-6+deb10u1
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
@@ -12,4 +14,5 @@ linux-image-4.19.0-12-2-armmp==4.19.152-1
 linux-libc-dev==4.19.208-1
 mrvlprestera==1.0
 squashfs-tools==1:4.3-12+deb10u1
+tzdata==2021a-0+deb10u3
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 28ca11886fd0..ec98653494ea 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -27,11 +27,11 @@ psutil==5.8.0
 ptyprocess==0.7.0
 pyang==2.5.0
 pyangbind==0.8.1
-pycparser==2.20
+pycparser==2.21
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.10.23
+regex==2021.11.2
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0

From bea36d963e76b5034860e388674b33917639703b Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Sat, 6 Nov 2021 02:18:59 -0700
Subject: [PATCH 0884/1674] dhcp6relay: remove line overwriting
 docker-dhcp-relay variable (#9179)

The dhcp6relay rules file had a line overwriting a variable for
docker-dhcp-relay. Remove that line.

This line caused a limited impact where if some (many?) of the docker
containers were already built, except for dhcp-relay, and the build
failed or was interrupted, then dhcp-relay container would fail to build
because this variable was overwritten and the python3-swsscommon
wouldn't get installed into the slave container. Most builds would be
fine, though.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 rules/dhcp6relay.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
index d9ff506d8a27..2601fff26604 100644
--- a/rules/dhcp6relay.mk
+++ b/rules/dhcp6relay.mk
@@ -5,6 +5,5 @@ SONIC_DHCP6RELAY_PKG_NAME = dhcp6relay
 
 SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
 $(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(DOCKER_DHCP_RELAY)_INSTALL_DEBS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
 $(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
 SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)

From 9a1b1bc44e68ab708a9645e99c3d5d60eca37927 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:21:11 -0800
Subject: [PATCH 0885/1674] Fix for additional intf flap during fast-reboot
 (#9166)

---
 dockers/docker-orchagent/swssconfig.sh    | 6 ++++++
 files/build_templates/docker_image_ctl.j2 | 1 +
 2 files changed, 7 insertions(+)

diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index 0081d074ad60..929e70769a69 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -23,6 +23,12 @@ function fast_reboot {
         mv -f /default_routes.json /default_routes.json.1
       fi
 
+      if [[ -f /media_config.json ]];
+      then
+        swssconfig /media_config.json
+        mv -f /media_config.json /media_config.json.1
+      fi
+
       ;;
     *)
       ;;
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 0c031b103f6b..d57fc546ac98 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -158,6 +158,7 @@ function postStartAction()
         test -e /host/fast-reboot/fdb.json && docker cp /host/fast-reboot/fdb.json swss$DEV:/
         test -e /host/fast-reboot/arp.json && docker cp /host/fast-reboot/arp.json swss$DEV:/
         test -e /host/fast-reboot/default_routes.json && docker cp /host/fast-reboot/default_routes.json swss$DEV:/
+        test -e /host/fast-reboot/media_config.json && docker cp /host/fast-reboot/media_config.json swss$DEV:/
         rm -fr /host/fast-reboot
     fi
     docker exec swss$DEV touch /ready # signal swssconfig.sh to go

From 34e5243f641ef549235edc08fd0c7853285c32d6 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Wed, 10 Nov 2021 22:04:46 +0530
Subject: [PATCH 0886/1674] [202012][Marvell] Update armhf SAI to ver 1.7.1-6
 (#9205)

Fixed SAI error reported in issue #9172

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index 6869b442f2d9..fbdd6992db16 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-5
+export MRVL_SAI_VERSION = 1.7.1-6
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From 1bc012ab1edd863b82eb717eaf55e6a90403159a Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:00:32 -0800
Subject: [PATCH 0887/1674] [202012] sonic-utilities submodule update (#9214)

---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 48035d75898f..0c224e79e710 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 48035d75898f4e6833aabca5f1b06672a2d7d59e
+Subproject commit 0c224e79e7104472be9450e682b52380e64aa91e

From 8138a34a0bcb9452dd4e227315bcc0985f96f090 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Wed, 10 Nov 2021 17:28:51 -0800
Subject: [PATCH 0888/1674] [202012] sonic-platform-daemons submodule update
 (#9222)

---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index bf7214c2c50d..d6ae3ef07479 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit bf7214c2c50d3b59c9ab97ea60665ad9ecf23e2c
+Subproject commit d6ae3ef074792f145437c6e2f04262696ea25019

From b8f70f8986d7565ed35f3b9ba547cbca7ec379e8 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <taahme@microsoft.com>
Date: Tue, 26 Jan 2021 01:43:56 +0000
Subject: [PATCH 0889/1674] Merged PR 3845699: [linkmgrd]: Introduce MUX cable
 linkmgrd

Linkmgrd monitors link status, mux status, and link state. Has
the link becomes unhealthy, linkmgrd will trigger mux switchover
on a standby ToR ensuring uninterrupted service to servers/blades.
This PR is initial implementation of linkmgrd.

Also, docker-mux container hold packages related to maintaining and managing
mux cable. It currently runs linkmgrd binary that monitor and switches
the mux if needed.
This PR also introduces mux-container and starts linkmgrd as startup when
build is configured with INCLUDE_MUX=y

Edit: linkmgrd PR will follow.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

Related work items: #2315, #3146150
---
 Makefile.work                          |  2 ++
 dockers/docker-mux/Dockerfile.j2       | 36 ++++++++++++++++++++++
 dockers/docker-mux/critical_processes  |  1 +
 dockers/docker-mux/docker-init.sh      |  9 ++++++
 dockers/docker-mux/supervisord.conf    | 41 ++++++++++++++++++++++++++
 files/build_templates/init_cfg.json.j2 |  1 +
 files/build_templates/mux.service.j2   | 17 +++++++++++
 rules/config                           |  3 ++
 rules/docker-mux.dep                   | 12 ++++++++
 rules/docker-mux.mk                    | 32 ++++++++++++++++++++
 rules/linkmgrd.dep                     | 11 +++++++
 rules/linkmgrd.mk                      | 18 +++++++++++
 slave.mk                               |  7 ++++-
 13 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100755 dockers/docker-mux/Dockerfile.j2
 create mode 100644 dockers/docker-mux/critical_processes
 create mode 100755 dockers/docker-mux/docker-init.sh
 create mode 100644 dockers/docker-mux/supervisord.conf
 create mode 100644 files/build_templates/mux.service.j2
 create mode 100644 rules/docker-mux.dep
 create mode 100644 rules/docker-mux.mk
 create mode 100644 rules/linkmgrd.dep
 create mode 100644 rules/linkmgrd.mk

diff --git a/Makefile.work b/Makefile.work
index f48bb9f650ff..ace2e956e308 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -10,6 +10,7 @@
 #  * ENABLE_ZTP: Enables zero touch provisioning.
 #  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
 #  * INCLUDE_KUBERNETES: Allows including Kubernetes
+#  * INCLUDE_MUX: Include MUX feature/services for TOR switch.
 #  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
 #  * by default for TOR switch.
 #  * ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
@@ -267,6 +268,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            HTTPS_PROXY=$(https_proxy) \
                            SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
                            SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
+                           SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
                            TELEMETRY_WRITABLE=$(TELEMETRY_WRITABLE) \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                            BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
diff --git a/dockers/docker-mux/Dockerfile.j2 b/dockers/docker-mux/Dockerfile.j2
new file mode 100755
index 000000000000..66ec315f0809
--- /dev/null
+++ b/dockers/docker-mux/Dockerfile.j2
@@ -0,0 +1,36 @@
+{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
+FROM docker-config-engine-buster
+
+ARG docker_container_name
+RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
+
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update &&       \
+    apt-get install -f -y   \
+        libmnl0
+
+{% if docker_mux_debs.strip() -%}
+# Copy locally-built Debian package dependencies
+{{ copy_files("debs/", docker_mux_debs.split(' '), "/debs/") }}
+
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_mux_debs.split(' ')) }}
+{%- endif %}
+
+## Clean up
+RUN apt-get clean -y        && \
+    apt-get autoclean -y    && \
+    apt-get autoremove -y   && \
+    rm -rf /debs
+
+COPY ["docker-init.sh", "/usr/bin/"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
+COPY ["critical_processes", "/etc/supervisor/"]
+
+## Copy all Jinja2 template files into the templates folder
+COPY ["*.j2", "/usr/share/sonic/templates/"]
+
+ENTRYPOINT ["/usr/bin/docker-init.sh"]
diff --git a/dockers/docker-mux/critical_processes b/dockers/docker-mux/critical_processes
new file mode 100644
index 000000000000..eb2568f1ef2b
--- /dev/null
+++ b/dockers/docker-mux/critical_processes
@@ -0,0 +1 @@
+program:linkmgrd
diff --git a/dockers/docker-mux/docker-init.sh b/dockers/docker-mux/docker-init.sh
new file mode 100755
index 000000000000..bea1686132a1
--- /dev/null
+++ b/dockers/docker-mux/docker-init.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Generate supervisord config file
+mkdir -p /etc/supervisor/conf.d/
+
+# The docker container should start this script as PID 1, so now that supervisord is
+# properly configured, we exec supervisord so that it runs as PID 1 for the
+# duration of the container's lifetime
+exec /usr/local/bin/supervisord
diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf
new file mode 100644
index 000000000000..e4eff7c351b0
--- /dev/null
+++ b/dockers/docker-mux/supervisord.conf
@@ -0,0 +1,41 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[eventlistener:dependent-startup]
+command=python3 -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+buffer_size=100
+
+[eventlistener:supervisor-proc-exit-listener]
+command=/usr/bin/supervisor-proc-exit-listener --container-name mux
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
+autostart=true
+autorestart=unexpected
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+
+[program:linkmgrd]
+command=nice -n -20 /usr/sbin/linkmgrd -v warning
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+startretries=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index 0cf85cd8ab06..024d998c457f 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -31,6 +31,7 @@
 {%- if sonic_asic_platform == "vs" %}{% do features.append(("gbsyncd", "enabled", false, "enabled")) %}{% endif %}
 {%- if include_iccpd == "y" %}{% do features.append(("iccpd", "disabled", false, "enabled")) %}{% endif %}
 {%- if include_mgmt_framework == "y" %}{% do features.append(("mgmt-framework", "enabled", true, "enabled")) %}{% endif %}
+{%- if include_mux == "y" %}{% do features.append(("mux", "enabled", false, "enabled")) %}{% endif %}
 {%- if include_nat == "y" %}{% do features.append(("nat", "disabled", false, "enabled")) %}{% endif %}
 {%- if include_restapi == "y" %}{% do features.append(("restapi", "enabled", false, "enabled")) %}{% endif %}
 {%- if include_sflow == "y" %}{% do features.append(("sflow", "disabled", false, "enabled")) %}{% endif %}
diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
new file mode 100644
index 000000000000..72a5925e13ba
--- /dev/null
+++ b/files/build_templates/mux.service.j2
@@ -0,0 +1,17 @@
+[Unit]
+Description=MUX Cable Container
+Requires=database.service updategraph.service pmon.service swss.service
+After=pmon.service swss.service
+StartLimitIntervalSec=1200
+StartLimitBurst=3
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/rules/config b/rules/config
index a34b0b644623..07f868605544 100644
--- a/rules/config
+++ b/rules/config
@@ -191,3 +191,6 @@ SONIC_VERSION_CONTROL_COMPONENTS ?= none
 # Set the env variable ENABLE_DOCKER_BASE_PULL = y to enable pulling sonic-slave docker from registry
 REGISTRY_PORT ?= 443
 REGISTRY_SERVER ?= sonicdev-microsoft.azurecr.io
+
+# INCLUDE_MUX - build docker-mux for dual ToR (Gemini)
+INCLUDE_MUX = y
diff --git a/rules/docker-mux.dep b/rules/docker-mux.dep
new file mode 100644
index 000000000000..70d4dd4edf89
--- /dev/null
+++ b/rules/docker-mux.dep
@@ -0,0 +1,12 @@
+
+DPATH       := $($(DOCKER_MUX)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-mux.mk rules/docker-mux.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_MUX)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_MUX)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_MUX)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_MUX),$(DOCKER_MUX_DBG)))
+
diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk
new file mode 100644
index 000000000000..38b1e972453d
--- /dev/null
+++ b/rules/docker-mux.mk
@@ -0,0 +1,32 @@
+# Docker image for MUX
+
+DOCKER_MUX_STEM = docker-mux
+DOCKER_MUX = $(DOCKER_MUX_STEM).gz
+DOCKER_MUX_DBG = $(DOCKER_MUX_STEM)-$(DBG_IMAGE_MARK).gz
+
+$(DOCKER_MUX)_PATH = $(DOCKERS_PATH)/$(DOCKER_MUX_STEM)
+
+$(DOCKER_MUX)_DEPENDS = $(SONIC_LINKMGRD) $(LIBSWSSCOMMON) $(LIBHIREDIS)
+$(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_MUX)_DBG_DEPENDS += $(SONIC_LINKMGRD_DBG) $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DBG)
+
+$(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+
+$(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BUSTER)
+
+ifeq ($(INCLUDE_MUX), y)
+SONIC_DOCKER_IMAGES += $(DOCKER_MUX)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_MUX)
+endif
+
+ifeq ($(INCLUDE_MUX), y)
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
+endif
+
+$(DOCKER_MUX)_CONTAINER_NAME = mux
+$(DOCKER_MUX)_RUN_OPT += --privileged -t
+$(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+$(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/mux:/var/log/mux:rw
+$(DOCKER_MUX)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
+
diff --git a/rules/linkmgrd.dep b/rules/linkmgrd.dep
new file mode 100644
index 000000000000..31894e46d298
--- /dev/null
+++ b/rules/linkmgrd.dep
@@ -0,0 +1,11 @@
+
+SPATH       := $($(SONIC_LINKMGRD)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/linkmgrd.mk rules/linkmgrd.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_LINKMGRD)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SONIC_LINKMGRD)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_LINKMGRD)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_LINKMGRD)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_LINKMGRD)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/linkmgrd.mk b/rules/linkmgrd.mk
new file mode 100644
index 000000000000..ed1bd4071fe7
--- /dev/null
+++ b/rules/linkmgrd.mk
@@ -0,0 +1,18 @@
+# SONiC LINK ManaGeR Daemon package
+
+SONIC_LINKMGRD_VERSION = 1.0.0-1
+SONIC_LINKMGRD_PKG_NAME = linkmgrd
+
+export SONIC_LINKMGRD_VERSION SONIC_LINKMGRD_PKG_NAME
+
+SONIC_LINKMGRD = sonic-$(SONIC_LINKMGRD_PKG_NAME)_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_LINKMGRD)_SRC_PATH = $(SRC_PATH)/$(SONIC_LINKMGRD_PKG_NAME)
+$(SONIC_LINKMGRD)_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON) $(LIBHIREDIS_DEV) $(LIBHIREDIS)
+
+SONIC_DPKG_DEBS += $(SONIC_LINKMGRD)
+
+SONIC_LINKMGRD_DBG = sonic-$(SONIC_LINKMGRD_PKG_NAME)-dbgsym_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_LINKMGRD)_DBG_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DEV) $(LIBHIREDIS_DBG)
+$(eval $(call add_derived_package,$(SONIC_LINKMGRD),$(SONIC_LINKMGRD_DBG)))
+
+export SONIC_LINKMGRD SONIC_LINKMGRD_DBG
diff --git a/slave.mk b/slave.mk
index e8a1b494bdee..f865d04abc63 100644
--- a/slave.mk
+++ b/slave.mk
@@ -153,6 +153,10 @@ INCLUDE_NAT = y
 endif
 
 
+ifeq ($(SONIC_INCLUDE_MUX),y)
+INCLUDE_MUX = y
+endif
+
 include $(RULES_PATH)/functions
 
 ifeq ($(SONIC_USE_PDDF_FRAMEWORK),y)
@@ -266,6 +270,7 @@ $(info "INCLUDE_RESTAPI"                 : "$(INCLUDE_RESTAPI)")
 $(info "INCLUDE_SFLOW"                   : "$(INCLUDE_SFLOW)")
 $(info "INCLUDE_NAT"                     : "$(INCLUDE_NAT)")
 $(info "INCLUDE_KUBERNETES"              : "$(INCLUDE_KUBERNETES)")
+$(info "INCLUDE_MUX"                     : "$(INCLUDE_MUX)")
 $(info "TELEMETRY_WRITABLE"              : "$(TELEMETRY_WRITABLE)")
 $(info "PDDF_SUPPORT"                    : "$(PDDF_SUPPORT)")
 $(info "MULTIARCH_QEMU_ENVIRON"          : "$(MULTIARCH_QEMU_ENVIRON)")
@@ -944,7 +949,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export python_swss_debs+=" $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(LIBSWSSCOMMON)) $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(PYTHON_SWSSCOMMON)) $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(PYTHON3_SWSSCOMMON))"
 	export sonic_utilities_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_UTILITIES_PY3))"
 	export sonic_host_services_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_HOST_SERVICES_PY3))"
-
+	export include_mux="$(INCLUDE_MUX)"
 	$(foreach docker, $($*_DOCKERS),\
 		export docker_image="$(docker)"
 		export docker_image_name="$(basename $(docker))"

From a8fdeb3907ebdd5c2f0c3e7fd33c19c4da16d1cf Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 3 Feb 2021 20:15:17 -0800
Subject: [PATCH 0890/1674] [linkmgrd] Enhance Init And Switch State When
 Config Is Active

During warm reboot, linkmgrd would go away and so heartbeats will
be lost. This would result in standby link son peer ToR to pull the
link active. This is undesirable since we would not create tunnel
from the ToR that is being rebooted to the peer ToR. This PR
implicitly lock the state of the mux if config is not set to auto.

Also, orchagent does not initialize MUX to it hardware state, rather
it initilizes MUX to Unknown state. linkmgrd will detect this situation
and probe MUX state to correct orchagent state.

There a fix for the case when state os switched MUX is delayed. The
PR will poll the MUX for the new state. This is required to update
the state ds and hence create/tear tunnel.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 rules/linkmgrd.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/linkmgrd.mk b/rules/linkmgrd.mk
index ed1bd4071fe7..07101f0c47fb 100644
--- a/rules/linkmgrd.mk
+++ b/rules/linkmgrd.mk
@@ -7,12 +7,14 @@ export SONIC_LINKMGRD_VERSION SONIC_LINKMGRD_PKG_NAME
 
 SONIC_LINKMGRD = sonic-$(SONIC_LINKMGRD_PKG_NAME)_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
 $(SONIC_LINKMGRD)_SRC_PATH = $(SRC_PATH)/$(SONIC_LINKMGRD_PKG_NAME)
-$(SONIC_LINKMGRD)_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON) $(LIBHIREDIS_DEV) $(LIBHIREDIS)
+$(SONIC_LINKMGRD)_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_LINKMGRD)_RDEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS)
 
 SONIC_DPKG_DEBS += $(SONIC_LINKMGRD)
 
 SONIC_LINKMGRD_DBG = sonic-$(SONIC_LINKMGRD_PKG_NAME)-dbgsym_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_LINKMGRD)_DBG_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DEV) $(LIBHIREDIS_DBG)
+$(SONIC_LINKMGRD)_DBG_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_LINKMGRD)_DBG_RDEPENDS = $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DBG)
 $(eval $(call add_derived_package,$(SONIC_LINKMGRD),$(SONIC_LINKMGRD_DBG)))
 
 export SONIC_LINKMGRD SONIC_LINKMGRD_DBG

From b8266302620e25bdb96b1f7b8b7fba4251438ef5 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 18 Aug 2021 16:25:51 -0700
Subject: [PATCH 0891/1674] [mux] Add New Package Vars

Ading new packaging variable to mux docker

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 rules/docker-mux.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk
index 38b1e972453d..6f3b3b986418 100644
--- a/rules/docker-mux.mk
+++ b/rules/docker-mux.mk
@@ -14,6 +14,11 @@ $(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PA
 
 $(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BUSTER)
 
+$(DOCKER_MUX)_VERSION = 1.0.0
+$(DOCKER_MUX)_PACKAGE_NAME = mux
+$(DOCKER_MUX)_WARM_SHUTDOWN_BEFORE = swss
+$(DOCKER_MUX)_FAST_SHUTDOWN_BEFORE = swss
+
 ifeq ($(INCLUDE_MUX), y)
 SONIC_DOCKER_IMAGES += $(DOCKER_MUX)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_MUX)

From ed40b53ee1f5dced0c0292d4e304aaf02f0b7f78 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 11 Aug 2021 17:52:27 -0700
Subject: [PATCH 0892/1674] [linkmgrd] Relocate Linkmgrd to Github

This PR deletes local-to-buildimage linkmgrd and creates new submodule
pointing to github repo of sonic-linkmgrd.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 .gitmodules  | 3 +++
 src/linkmgrd | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 src/linkmgrd

diff --git a/.gitmodules b/.gitmodules
index d0dfa3a28935..7b5e6b99df74 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -86,3 +86,6 @@
 [submodule "src/sonic-mgmt-common"]
 	path = src/sonic-mgmt-common
 	url = https://github.com/Azure/sonic-mgmt-common.git
+[submodule "src/linkmgrd"]
+	path = src/linkmgrd
+	url = https://github.com/Azure/sonic-linkmgrd.git
diff --git a/src/linkmgrd b/src/linkmgrd
new file mode 160000
index 000000000000..97cba3e90977
--- /dev/null
+++ b/src/linkmgrd
@@ -0,0 +1 @@
+Subproject commit 97cba3e909774f252394a30c826adbea32fe9132

From b42aef68f393e3ea676a1c4e91a5c6de6ce52ccc Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <taahme@microsoft.com>
Date: Tue, 16 Mar 2021 00:16:07 +0000
Subject: [PATCH 0893/1674] Merged PR 4234524: [mux] Start Mux on Only Dual-ToR
 Platform

[mux] Start Mux on Only Dual-ToR Platform

mux docker depends on the presence of mux cable hardware and is
supposed to run only Gemini ToRs. This PR change the mux feature
config in order to enable mux docker based on device configuration.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 files/build_templates/init_cfg.json.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index 024d998c457f..2b21f270c06d 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -31,7 +31,7 @@
 {%- if sonic_asic_platform == "vs" %}{% do features.append(("gbsyncd", "enabled", false, "enabled")) %}{% endif %}
 {%- if include_iccpd == "y" %}{% do features.append(("iccpd", "disabled", false, "enabled")) %}{% endif %}
 {%- if include_mgmt_framework == "y" %}{% do features.append(("mgmt-framework", "enabled", true, "enabled")) %}{% endif %}
-{%- if include_mux == "y" %}{% do features.append(("mux", "enabled", false, "enabled")) %}{% endif %}
+{%- if include_mux == "y" %}{% do features.append(("mux", "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}", false, "enabled")) %}{% endif %}
 {%- if include_nat == "y" %}{% do features.append(("nat", "disabled", false, "enabled")) %}{% endif %}
 {%- if include_restapi == "y" %}{% do features.append(("restapi", "enabled", false, "enabled")) %}{% endif %}
 {%- if include_sflow == "y" %}{% do features.append(("sflow", "disabled", false, "enabled")) %}{% endif %}

From 70fbd6826cef4642567debc8f861dec4bffcc983 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 16 Apr 2021 01:02:18 +0000
Subject: [PATCH 0894/1674] Merged PR 4366316: [mux.service]: Bind to
 sonic.target

[mux.service]: Bind to sonic.target

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/mux.service.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index 72a5925e13ba..e959e7cf98aa 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -2,6 +2,8 @@
 Description=MUX Cable Container
 Requires=database.service updategraph.service pmon.service swss.service
 After=pmon.service swss.service
+BindsTo=sonic.target
+After=sonic.target
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 

From 18d1f65339ead502d70ac8238c25cf1bf9777a71 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <taahme@microsoft.com>
Date: Wed, 21 Jul 2021 01:21:09 +0000
Subject: [PATCH 0895/1674] Merged PR 4813977: [mux] Update Service Install
 With SONiC Target

[mux] Update Service Install With SONiC Target

Recent PR grouped all SONiC service into sonic.taget. The install section
of mux.service was not update and this causes delays when using config
reload as the service failed state is not being reset.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
---
 files/build_templates/mux.service.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index e959e7cf98aa..f7ae3725b86b 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -16,4 +16,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target

From 84cd0e94712cb2474cfcbf511b817ca11a28fa67 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 27 Apr 2021 23:44:13 +0000
Subject: [PATCH 0896/1674] [mux]: Initialize all mux ports as standby

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-mux/Dockerfile.j2    |   1 +
 dockers/docker-mux/supervisord.conf |  10 ++-
 dockers/docker-mux/write_standby.py | 121 ++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100755 dockers/docker-mux/write_standby.py

diff --git a/dockers/docker-mux/Dockerfile.j2 b/dockers/docker-mux/Dockerfile.j2
index 66ec315f0809..fb6a3f9d71ab 100755
--- a/dockers/docker-mux/Dockerfile.j2
+++ b/dockers/docker-mux/Dockerfile.j2
@@ -29,6 +29,7 @@ COPY ["docker-init.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor/"]
+COPY ["write_standby.py", "/usr/sbin/"]
 
 ## Copy all Jinja2 template files into the templates folder
 COPY ["*.j2", "/usr/share/sonic/templates/"]
diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf
index e4eff7c351b0..6e8e64dc6662 100644
--- a/dockers/docker-mux/supervisord.conf
+++ b/dockers/docker-mux/supervisord.conf
@@ -27,6 +27,15 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 
+[program:standby_init]
+command=/usr/sbin/write_standby.py
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
 [program:linkmgrd]
 command=nice -n -20 /usr/sbin/linkmgrd -v warning
 priority=2
@@ -38,4 +47,3 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
-
diff --git a/dockers/docker-mux/write_standby.py b/dockers/docker-mux/write_standby.py
new file mode 100755
index 000000000000..1a45fb5ed363
--- /dev/null
+++ b/dockers/docker-mux/write_standby.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+
+import logging
+import time
+
+from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector
+from swsscommon.swsscommon import APPL_DB, ASIC_DB
+
+logger = logging.getLogger(__name__)
+
+
+REDIS_SOCK_PATH = '/var/run/redis/redis.sock'
+
+
+def create_fvs(**kwargs):
+    return FieldValuePairs(list(kwargs.items()))
+
+class MuxStateWriter(object):
+    """
+    Class used to write standby mux state to APP DB
+    """
+
+    def __init__(self):
+        self.config_db_connector = None
+        self.appl_db_connector = None
+        self.asic_db_connector = None
+
+    @property
+    def config_db(self):
+        """
+        Returns config DB connector.
+        Initializes the connector during the first call
+        """
+        if self.config_db_connector is None:
+            self.config_db_connector = ConfigDBConnector()
+            self.config_db_connector.connect()
+
+        return self.config_db_connector
+
+    @property
+    def appl_db(self):
+        """
+        Returns the app DB connector.
+        Initializes the connector during the first call
+        """
+        if self.appl_db_connector is None:
+            self.appl_db_connector = DBConnector(APPL_DB, REDIS_SOCK_PATH, True)
+        return self.appl_db_connector
+
+    @property
+    def asic_db(self):
+        """
+        Returns the ASIC DB connector.
+        Initializes the connector during the first call
+        """
+        if self.asic_db_connector is None:
+            self.asic_db_connector = SonicV2Connector()
+            self.asic_db_connector.connect('ASIC_DB')
+
+        return self.asic_db_connector
+
+    @property
+    def tunnel_name(self):
+        """
+        Returns the name of the IP-in-IP tunnel used for Dual ToR devices
+        """
+        return self.config_db.get_keys('TUNNEL')[0]
+
+    def get_all_mux_intfs(self):
+        """
+        Returns a list of all mux cable interfaces
+        """
+        return self.config_db.get_keys('MUX_CABLE')
+
+    def tunnel_exists(self):
+        """
+        Checks if the IP-in-IP tunnel has been written to ASIC DB
+        """
+        tunnel_key_pattern = 'ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:*'
+        return len(self.asic_db.keys('ASIC_DB', tunnel_key_pattern)) > 0
+
+    def wait_for_tunnel(self, interval=1, timeout=30):
+        """
+        Waits until the IP-in-IP tunnel has been created
+
+        Returns:
+            (bool) True if the tunnel has been created
+                   False if the timeout period is exceeded
+        """
+        logger.info("Waiting for tunnel {} with timeout {} seconds".format(self.tunnel_name, timeout))
+        start = time.time()
+        curr_time = time.time()
+
+        while not self.tunnel_exists() and curr_time - start < timeout:
+            time.sleep(interval) 
+            curr_time = time.time()
+
+        # If we timed out, return False else return True
+        return curr_time - start < timeout
+
+
+    def apply_mux_config(self):
+        """
+        Writes standby mux state to APP DB for all mux interfaces
+        """
+        intfs = self.get_all_mux_intfs()
+        state = 'standby'
+        if self.wait_for_tunnel():
+            logger.warning("Applying {} state to interfaces {}".format(state, intfs))
+            producer_state_table = ProducerStateTable(self.appl_db, 'MUX_CABLE_TABLE')
+            fvs = create_fvs(state=state)
+
+            for intf in intfs:
+                producer_state_table.set(intf, fvs)
+        else:
+            logger.error("Timed out waiting for tunnel {}, mux state will not be written".format(self.tunnel_name))
+
+
+if __name__ == '__main__':
+    mux_writer = MuxStateWriter()
+    mux_writer.apply_mux_config()

From 25712c712e5d055bd7e71c7a7afa8ce86e1b380c Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Sat, 1 May 2021 00:49:00 +0000
Subject: [PATCH 0897/1674] [mux]: Make write_standby available on host

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

[write_standby]: Cleanup and fix build

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-mux/Dockerfile.j2                       | 1 -
 dockers/docker-mux/supervisord.conf                    | 2 +-
 files/build_templates/docker_image_ctl.j2              | 3 +++
 files/build_templates/mux.service.j2                   | 1 +
 files/build_templates/sonic_debian_extension.j2        | 5 +++++
 {dockers/docker-mux => files/scripts}/write_standby.py | 3 +--
 6 files changed, 11 insertions(+), 4 deletions(-)
 rename {dockers/docker-mux => files/scripts}/write_standby.py (98%)

diff --git a/dockers/docker-mux/Dockerfile.j2 b/dockers/docker-mux/Dockerfile.j2
index fb6a3f9d71ab..66ec315f0809 100755
--- a/dockers/docker-mux/Dockerfile.j2
+++ b/dockers/docker-mux/Dockerfile.j2
@@ -29,7 +29,6 @@ COPY ["docker-init.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor/"]
-COPY ["write_standby.py", "/usr/sbin/"]
 
 ## Copy all Jinja2 template files into the templates folder
 COPY ["*.j2", "/usr/share/sonic/templates/"]
diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf
index 6e8e64dc6662..7e5291bff579 100644
--- a/dockers/docker-mux/supervisord.conf
+++ b/dockers/docker-mux/supervisord.conf
@@ -28,7 +28,7 @@ stderr_logfile=syslog
 dependent_startup=true
 
 [program:standby_init]
-command=/usr/sbin/write_standby.py
+command=/opt/write_standby/bin/write_standby.py
 priority=2
 autostart=false
 autorestart=false
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index d57fc546ac98..63618df59ce2 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -389,6 +389,9 @@ start() {
         -v /var/run/redis-chassis:/var/run/redis-chassis:ro \
         -v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \
 {%- endif %}
+{%- if docker_container_name == "mux" -%}
+        -v /opt/write_standby/bin:/opt/write_standby/bin:ro \
+{%- endif -%}
         $REDIS_MNT \
         -v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \
 {%- if sonic_asic_platform != "mellanox" %}
diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index f7ae3725b86b..7f671819f9fe 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -12,6 +12,7 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStopPost=/opt/write_standby/bin/write_standby.py
 Restart=always
 RestartSec=30
 
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 72fe14a6fc57..adadbdbb3194 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -48,6 +48,7 @@ FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES="$FILESYSTEM_ROOT_USR_SHARE_SONIC/temp
 FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE="$FILESYSTEM_ROOT_USR_SHARE_SONIC/firmware"
 FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc"
 FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
+FILESYSTEM_ROOT_OPT="$FILESYSTEM_ROOT/opt"
 
 GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"
 
@@ -716,6 +717,10 @@ sudo LANG=C cp $SCRIPTS_DIR/radv.sh $FILESYSTEM_ROOT/usr/local/bin/radv.sh
 # Copy sonic-netns-exec script
 sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
 
+# Copy write_standby script for mux state
+sudo LANG=C mkdir -p $FILESYSTEM_ROOT_OPT/write_standby/bin/
+sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT_OPT/write_standby/bin/write_standby.py
+
 # Copy systemd timer configuration
 # It implements delayed start of services
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
diff --git a/dockers/docker-mux/write_standby.py b/files/scripts/write_standby.py
similarity index 98%
rename from dockers/docker-mux/write_standby.py
rename to files/scripts/write_standby.py
index 1a45fb5ed363..9fba67ac6a9c 100755
--- a/dockers/docker-mux/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-import logging
 import time
 
 from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector
-from swsscommon.swsscommon import APPL_DB, ASIC_DB
+from swsscommon.swsscommon import APPL_DB 
 
 logger = logging.getLogger(__name__)
 

From 77378b4364086f3f5af3cc86aba149c5cf167504 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 5 May 2021 06:14:48 +0000
Subject: [PATCH 0898/1674] [mux]: Call write_standby from host only

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-mux/supervisord.conf             | 9 ---------
 files/build_templates/docker_image_ctl.j2       | 3 ---
 files/build_templates/mux.service.j2            | 3 ++-
 files/build_templates/sonic_debian_extension.j2 | 4 +---
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf
index 7e5291bff579..87903f28e155 100644
--- a/dockers/docker-mux/supervisord.conf
+++ b/dockers/docker-mux/supervisord.conf
@@ -27,15 +27,6 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 
-[program:standby_init]
-command=/opt/write_standby/bin/write_standby.py
-priority=2
-autostart=false
-autorestart=false
-startsecs=0
-dependent_startup=true
-dependent_startup_wait_for=rsyslogd:running
-
 [program:linkmgrd]
 command=nice -n -20 /usr/sbin/linkmgrd -v warning
 priority=2
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 63618df59ce2..d57fc546ac98 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -389,9 +389,6 @@ start() {
         -v /var/run/redis-chassis:/var/run/redis-chassis:ro \
         -v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \
 {%- endif %}
-{%- if docker_container_name == "mux" -%}
-        -v /opt/write_standby/bin:/opt/write_standby/bin:ro \
-{%- endif -%}
         $REDIS_MNT \
         -v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \
 {%- if sonic_asic_platform != "mellanox" %}
diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index 7f671819f9fe..ac2f68216f7f 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -9,10 +9,11 @@ StartLimitBurst=3
 
 [Service]
 User={{ sonicadmin_user }}
+ExecStartPre=/usr/local/bin/write_standby.py
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-ExecStopPost=/opt/write_standby/bin/write_standby.py
+ExecStopPost=/usr/local/bin/write_standby.py
 Restart=always
 RestartSec=30
 
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index adadbdbb3194..b00119b54ff6 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -48,7 +48,6 @@ FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES="$FILESYSTEM_ROOT_USR_SHARE_SONIC/temp
 FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE="$FILESYSTEM_ROOT_USR_SHARE_SONIC/firmware"
 FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc"
 FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
-FILESYSTEM_ROOT_OPT="$FILESYSTEM_ROOT/opt"
 
 GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"
 
@@ -718,8 +717,7 @@ sudo LANG=C cp $SCRIPTS_DIR/radv.sh $FILESYSTEM_ROOT/usr/local/bin/radv.sh
 sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
 
 # Copy write_standby script for mux state
-sudo LANG=C mkdir -p $FILESYSTEM_ROOT_OPT/write_standby/bin/
-sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT_OPT/write_standby/bin/write_standby.py
+sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT/usr/local/bin/write_standby.py
 
 # Copy systemd timer configuration
 # It implements delayed start of services

From 6a9c709336ac48afef48f153bd5ea8a7f7cff6b5 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Thu, 6 May 2021 18:36:13 +0000
Subject: [PATCH 0899/1674] [write_standby]: Improve logging

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/write_standby.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 9fba67ac6a9c..72c11a7ac4d9 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -2,11 +2,11 @@
 
 import time
 
+from sonic_py_common import logger as log
 from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector
 from swsscommon.swsscommon import APPL_DB 
 
-logger = logging.getLogger(__name__)
-
+logger = log.Logger('write_standby')
 
 REDIS_SOCK_PATH = '/var/run/redis/redis.sock'
 
@@ -86,7 +86,7 @@ def wait_for_tunnel(self, interval=1, timeout=30):
             (bool) True if the tunnel has been created
                    False if the timeout period is exceeded
         """
-        logger.info("Waiting for tunnel {} with timeout {} seconds".format(self.tunnel_name, timeout))
+        logger.log_info("Waiting for tunnel {} with timeout {} seconds".format(self.tunnel_name, timeout))
         start = time.time()
         curr_time = time.time()
 
@@ -105,14 +105,14 @@ def apply_mux_config(self):
         intfs = self.get_all_mux_intfs()
         state = 'standby'
         if self.wait_for_tunnel():
-            logger.warning("Applying {} state to interfaces {}".format(state, intfs))
+            logger.log_warning("Applying {} state to interfaces {}".format(state, intfs))
             producer_state_table = ProducerStateTable(self.appl_db, 'MUX_CABLE_TABLE')
             fvs = create_fvs(state=state)
 
             for intf in intfs:
                 producer_state_table.set(intf, fvs)
         else:
-            logger.error("Timed out waiting for tunnel {}, mux state will not be written".format(self.tunnel_name))
+            logger.log_error("Timed out waiting for tunnel {}, mux state will not be written".format(self.tunnel_name))
 
 
 if __name__ == '__main__':

From 57ad50cfd93b2b51757d2385200c5dbba130cb02 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 4 Jun 2021 00:24:54 +0000
Subject: [PATCH 0900/1674] Merged PR 4559560: [bgp]: Switch to standby if BGP
 container exits

[bgp]: Switch mux to standby if BGP container exits

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/per_namespace/bgp.service.j2 |  1 +
 files/scripts/write_standby.py                     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
index 5ba49ffc441a..03fb6285fb43 100644
--- a/files/build_templates/per_namespace/bgp.service.j2
+++ b/files/build_templates/per_namespace/bgp.service.j2
@@ -15,6 +15,7 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
+ExecStopPost=/usr/local/bin/write_standby.py
 
 Restart=always
 RestartSec=30
diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 72c11a7ac4d9..52034f9ffc43 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -65,6 +65,16 @@ def tunnel_name(self):
         """
         return self.config_db.get_keys('TUNNEL')[0]
 
+    @property
+    def is_dualtor(self):
+        """
+        Checks if script is running on a dual ToR system
+        """
+        localhost_key = self.config_db.get_keys('DEVICE_METADATA')[0]
+        metadata = self.config_db.get_entry('DEVICE_METADATA', localhost_key)
+
+        return 'subtype' in metadata and 'dualtor' in metadata['subtype'].lower()
+
     def get_all_mux_intfs(self):
         """
         Returns a list of all mux cable interfaces
@@ -97,11 +107,13 @@ def wait_for_tunnel(self, interval=1, timeout=30):
         # If we timed out, return False else return True
         return curr_time - start < timeout
 
-
     def apply_mux_config(self):
         """
         Writes standby mux state to APP DB for all mux interfaces
         """
+        if not self.is_dualtor:
+            # If not running on a dual ToR system, take no action
+            return
         intfs = self.get_all_mux_intfs()
         state = 'standby'
         if self.wait_for_tunnel():

From f317d93cb0b606a061f5081d0cbd66463111b185 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 18 Jun 2021 17:19:09 +0000
Subject: [PATCH 0901/1674] Merged PR 4679112: [write_standby]: Ignore non-auto
 interfaces

[write_standby]: Ignore non-auto interfaces

* In the event that `write_standby.py` is used to automatically switchover interfaces when linkmgrd or bgp crashes, ignore any interfaces that are not configured to auto-switch

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/write_standby.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 52034f9ffc43..4c5455803fac 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -75,11 +75,14 @@ def is_dualtor(self):
 
         return 'subtype' in metadata and 'dualtor' in metadata['subtype'].lower()
 
-    def get_all_mux_intfs(self):
+    def get_auto_mux_intfs(self):
         """
-        Returns a list of all mux cable interfaces
+        Returns a list of all mux cable interfaces that are configured to auto-switch
         """
-        return self.config_db.get_keys('MUX_CABLE')
+        all_intfs = self.config_db.get_table('MUX_CABLE')
+        auto_intfs = [intf for intf, status in all_intfs.items()
+                                if status['state'].lower() == 'auto']
+        return auto_intfs
 
     def tunnel_exists(self):
         """
@@ -114,7 +117,7 @@ def apply_mux_config(self):
         if not self.is_dualtor:
             # If not running on a dual ToR system, take no action
             return
-        intfs = self.get_all_mux_intfs()
+        intfs = self.get_auto_mux_intfs()
         state = 'standby'
         if self.wait_for_tunnel():
             logger.log_warning("Applying {} state to interfaces {}".format(state, intfs))

From b027e87ffb3db0c68d740da18f382f57de20bcfb Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 10 Nov 2021 08:08:03 -0800
Subject: [PATCH 0902/1674] [mux.service]: Remove pmon dependency (#9211)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/mux.service.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index ac2f68216f7f..5aff5a24c02b 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -1,7 +1,7 @@
 [Unit]
 Description=MUX Cable Container
-Requires=database.service updategraph.service pmon.service swss.service
-After=pmon.service swss.service
+Requires=database.service updategraph.service swss.service
+After=swss.service
 BindsTo=sonic.target
 After=sonic.target
 StartLimitIntervalSec=1200

From 2a7595169b5d2e2b6d670c3ec56aae87c4a8df0b Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 11 Nov 2021 00:50:17 -0800
Subject: [PATCH 0903/1674] [sonic-swss-common] Update submodule (#9225)

ead0d5a 2021-11-10 | Exclude *.a files from python deb packages (#554) [Qi Luo]
3a660ac 2021-10-20 | Fix the option missing in kernel config issue (#541) [xumia]
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index a6b98daebdb5..ead0d5a14299 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit a6b98daebdb5a77457747333f3832b27b669a037
+Subproject commit ead0d5a1429988ca3fb20b8f45dc9e954512759c

From a7117b905fe64081afa6abaed2105448ea272d8e Mon Sep 17 00:00:00 2001
From: Mykhailo Onipko <mykhailox.onipko@intel.com>
Date: Sat, 13 Nov 2021 07:47:56 +0200
Subject: [PATCH 0904/1674] [BFN]: Updated SDK packages to 20211112 (#9244)

Signed-off-by: Mykhailo Onipko <monipko@barefootnetworks.com>
---
 files/build/versions/default/versions-web | 6 +++---
 platform/barefoot/bfn-platform.mk         | 2 +-
 platform/barefoot/bfn-sai.mk              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 9fb67f01f0fc..f78f5705542d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -23,8 +23,8 @@ https://deb.nodesource.com/node_14.x/dists/buster/Release==0f8fa9349b31d86f70668
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==871f5a56bb7bdb1bccf8f066e77399e0
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210805_sai.1.7.1_deb10.deb==8ba915f8843cf57982825f304b629cb3
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210805_sai.1.7.1_deb10.deb==4d1e991a943a2e16be2c1db9bb3c02d6
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20211112_sai.1.7.1_deb10.deb==c17beb440e2ae8d3271d78de0eede9db
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20211112_sai.1.7.1_deb10.deb==688c587d2cfb39e5d1e7148b02f13fec
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
@@ -73,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index d9e2b3393c58..87b318eeb363 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20210805_sai.1.7.1_deb10.deb
+BFN_PLATFORM = bfnplatform_20211112_sai.1.7.1_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index b8ea520f4035..8639157d5e02 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20210805_sai.1.7.1_deb10.deb
+BFN_SAI = bfnsdk_20211112_sai.1.7.1_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

From 7ac5b40f4b1b6a5b7f1933db59acbccbc35549f7 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sat, 13 Nov 2021 10:45:46 -0800
Subject: [PATCH 0905/1674] [202012]BRCM SAI 4.3.5.1-7 Picked up fixes for
 CS00012209390, CS00012212995, SONIC-51583, CS00012215744, and SONIC-51638
 (#9252)

This is to pick up BRCM SAI 4.3.5.1-7 fixes which contains the following fixes:

1.  CS00012209390: SONIC-50037, Used SAI_SWITCH_ATTR_QOS_DSCP_TO_TC_MAP as a default decap map for IPinIP tunnels.
2.  CS00012212995: SONIC-50948 SAI_API_QUEUE:_brcm_sai_cosq_stat_get:1353 egress Min limit get failed with error Invalid parameter
3.  SONIC-51583: Fixed acl group member creation failure with priority of -1
4.  CS00012215744:SONIC-51395 [TH, TH2] WB 3.5 to 4.3 fails at APPLY_VIEW while setting SAI_PORT_ATTR_EGRESS_ACL
5.  SONIC-51638: SDK-249337 ERROR: AddressSanitizer: heap-buffer-overflow in _tlv_print_array

Preliminary tests look fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on 7050CX3 (TD3) T0 DUT and all passed:
```
     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     fdb/test_fdb.py
     decap/test_decap.py
     ipfwd/test_dip_sip.py
     ipfwd/test_dir_bcast.py
     acl/test_acl.py
     vlan/test_vlan.py
     platform_tests/test_reboot.py
```
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f78f5705542d..9e9e5c2866f9 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 283612549d54..e87a0826bc6d 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-6_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-6_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-7_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-7_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 4d15a1c1f69cd3d3c80a6b6b666da79483781fab Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 14 Nov 2021 07:37:09 +0800
Subject: [PATCH 0906/1674] [ci/build]: Upgrade SONiC package versions (#9221)

---
 .../versions-deb-buster                       |  3 +-
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-docker  |  1 +
 files/build/versions/default/versions-git     |  4 +--
 files/build/versions/default/versions-web     |  2 +-
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../dockers/docker-mux/versions-deb-buster    | 29 +++++++++++++++++++
 .../docker-syncd-mlnx/versions-deb-buster     | 21 --------------
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  6 ++--
 .../sonic-slave-buster/versions-py3-all-arm64 |  2 +-
 .../sonic-slave-buster/versions-py3-all-armhf |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 26 ++++++++---------
 .../versions-deb-stretch-arm64                | 11 +------
 .../versions-deb-stretch-armhf                | 11 +------
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 files/build/versions/host-image/versions-py3  |  4 +--
 19 files changed, 63 insertions(+), 71 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-mux/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 8d91b11db98f..7cb5b72e1e76 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -42,12 +42,13 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.17.0-106
+mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
+sonic-linkmgrd==1.0.0-1
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index bcd457588e7d..706c4e6b97a2 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,4 +1,4 @@
-https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
+https://github.com/CESNET/libyang.git==25ede0234ab1cde50e7e7f7efde1a2f43bc80fdc
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index d412d85674f7..0427143732e4 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -11,6 +11,7 @@ amd64:docker-dhcp-relay==
 amd64:docker-fpm-frr==
 amd64:docker-gbsyncd-vs==
 amd64:docker-lldp==
+amd64:docker-mux==
 amd64:docker-nat==
 amd64:docker-orchagent==
 amd64:docker-platform-monitor==
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index f6625e8b0c2f..0ae0e6b7d01e 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==266129cba38431d1ee2278d6d9790168c0762909
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==08a95d8392e2249bd1c0a0b9f37cc12afb7c31e0
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
-https://github.com/CESNET/libyang.git==320f34305dd9c7d14af5f13bec18e477b37f5db8
+https://github.com/CESNET/libyang.git==25ede0234ab1cde50e7e7f7efde1a2f43bc80fdc
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 9e9e5c2866f9..e47a82b8f046 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-5.deb==d1b76b7faea901027ac0ce852bce1da0
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-6.deb==95c35d71a138c8cad4116d592cdd6a82
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 5800e346560c..969e8edb0f58 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,5 +1,5 @@
 j2cli==0.3.10
-jinja2==3.0.2
+jinja2==3.0.3
 markupsafe==2.0.1
 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
index 63489b3e4d6c..cf02a399402d 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.11.2
+regex==2021.11.10
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
new file mode 100644
index 000000000000..a12048a7b49e
--- /dev/null
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -0,0 +1,29 @@
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
+libbabeltrace1==1.5.6-2+deb10u1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libboost-chrono1.71.0==1.71.0-6~bpo10+1
+libboost-date-time1.71.0==1.71.0-6~bpo10+1
+libboost-filesystem1.71.0==1.71.0-6~bpo10+1
+libboost-log1.71.0==1.71.0-6~bpo10+1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-regex1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libbsd0==0.9.1-2+deb10u1
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
+libhiredis0.14-dbgsym==0.14.0-3~bpo9+1
+libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
+openssh-client==1:7.9p1-10+deb10u2
+sonic-linkmgrd==1.0.0-1
+sonic-linkmgrd-dbgsym==1.0.0-1
+sshpass==1.06-1
+strace==4.26-0.2
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 1db47dd14b40..04e643af41bd 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,22 +1,11 @@
 applibs==1.mlnx.4.4.3326
 applibs-dev==1.mlnx.4.4.3326
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3326
 iproute2-dev==1.mlnx.4.4.3326
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
-libglib2.0-0==2.58.3-2+deb10u3
-libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
-libipt2==2.0-2
-libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -26,16 +15,11 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.208-1
 mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
@@ -48,8 +32,6 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
-sshpass==1.06-1
-strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3326
 sx-acl-helper-dev==1.mlnx.4.4.3326
 sx-complib==1.mlnx.4.4.3326
@@ -63,8 +45,5 @@ sx-scew-dev==1.mlnx.4.4.3326
 sxd-libs==1.mlnx.4.4.3326
 sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3326
 wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 0e94738df7f3..aa77e8ed5d65 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -22,7 +22,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-5
+mrvllibsai==1.7.1-6
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index cfe00c3b70ed..d566472262e6 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -11,9 +11,9 @@ libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u5
 libmpdec2==2.4.2-1
 libpopt0==1.16-10+b2
-libpython3.5==3.5.3-1+deb9u4
-libpython3.5-minimal==3.5.3-1+deb9u4
-libpython3.5-stdlib==3.5.3-1+deb9u4
+libpython3.5==3.5.3-1+deb9u5
+libpython3.5-minimal==3.5.3-1+deb9u5
+libpython3.5-stdlib==3.5.3-1+deb9u5
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsainps==1.5.0
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
index c1a0c3be0413..31ce74f53983 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
@@ -1 +1 @@
-regex==2021.11.2
\ No newline at end of file
+regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
index c1a0c3be0413..31ce74f53983 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
@@ -1 +1 @@
-regex==2021.11.2
\ No newline at end of file
+regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 821701ecda3d..4315a11db069 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -832,11 +832,11 @@ libpython3-all-dev==3.5.3-1
 libpython3-dbg==3.5.3-1
 libpython3-dev==3.5.3-1
 libpython3-stdlib==3.5.3-1
-libpython3.5==3.5.3-1+deb9u4
-libpython3.5-dbg==3.5.3-1+deb9u4
-libpython3.5-dev==3.5.3-1+deb9u4
-libpython3.5-minimal==3.5.3-1+deb9u4
-libpython3.5-stdlib==3.5.3-1+deb9u4
+libpython3.5==3.5.3-1+deb9u5
+libpython3.5-dbg==3.5.3-1+deb9u5
+libpython3.5-dev==3.5.3-1+deb9u5
+libpython3.5-minimal==3.5.3-1+deb9u5
+libpython3.5-stdlib==3.5.3-1+deb9u5
 libqdox-java==1.12.1-2
 libqdox2-java==2.0~M3-3
 libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
@@ -1170,10 +1170,10 @@ ncurses-term==6.0+20161126-1+deb9u2
 netbase==5.4
 netpbm==2:10.0-15.3+b2
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u302-b08-1~deb9u1
-openjdk-8-jdk-headless==8u302-b08-1~deb9u1
-openjdk-8-jre==8u302-b08-1~deb9u1
-openjdk-8-jre-headless==8u302-b08-1~deb9u1
+openjdk-8-jdk==8u312-b07-1~deb9u1
+openjdk-8-jdk-headless==8u312-b07-1~deb9u1
+openjdk-8-jre==8u312-b07-1~deb9u1
+openjdk-8-jre-headless==8u312-b07-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
@@ -1359,10 +1359,10 @@ python3-sphinx==1.4.9-2
 python3-tz==2016.7-0.3
 python3-wheel==0.29.0-2
 python3-xdg==0.25-4+deb9u1
-python3.5==3.5.3-1+deb9u4
-python3.5-dbg==3.5.3-1+deb9u4
-python3.5-dev==3.5.3-1+deb9u4
-python3.5-minimal==3.5.3-1+deb9u4
+python3.5==3.5.3-1+deb9u5
+python3.5-dbg==3.5.3-1+deb9u5
+python3.5-dev==3.5.3-1+deb9u5
+python3.5-minimal==3.5.3-1+deb9u5
 qdbus==4:4.8.7+dfsg-11+deb9u1
 qemu-kvm==1:2.8+dfsg-6+deb9u16
 qemu-system-common==1:2.8+dfsg-6+deb9u16
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index a30ff45c0fca..21419d7b85ca 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -14,11 +14,6 @@ libicu-dev==57.1-6+deb9u5
 libicu57==57.1-6+deb9u5
 libjbig2dec0==0.13-4.1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u2
-libpython3.5==3.5.3-1+deb9u5
-libpython3.5-dbg==3.5.3-1+deb9u5
-libpython3.5-dev==3.5.3-1+deb9u5
-libpython3.5-minimal==3.5.3-1+deb9u5
-libpython3.5-stdlib==3.5.3-1+deb9u5
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
@@ -26,8 +21,4 @@ libxslt1-dev==1.1.29-2.1+deb9u2
 nodejs==10.24.1-1nodesource1
 python-babel==2.3.4+dfsg.1-2+deb9u1
 python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python3-babel==2.3.4+dfsg.1-2+deb9u1
-python3.5==3.5.3-1+deb9u5
-python3.5-dbg==3.5.3-1+deb9u5
-python3.5-dev==3.5.3-1+deb9u5
-python3.5-minimal==3.5.3-1+deb9u5
\ No newline at end of file
+python3-babel==2.3.4+dfsg.1-2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index e20749aa40ae..f6b245819749 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -19,11 +19,6 @@ libicu-dev==57.1-6+deb9u5
 libicu57==57.1-6+deb9u5
 libjbig2dec0==0.13-4.1+deb9u1
 libnghttp2-14==1.18.1-1+deb9u2
-libpython3.5==3.5.3-1+deb9u5
-libpython3.5-dbg==3.5.3-1+deb9u5
-libpython3.5-dev==3.5.3-1+deb9u5
-libpython3.5-minimal==3.5.3-1+deb9u5
-libpython3.5-stdlib==3.5.3-1+deb9u5
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
@@ -32,8 +27,4 @@ linux-compiler-gcc-6-arm==4.9.272-2
 nodejs==10.24.1-1nodesource1
 python-babel==2.3.4+dfsg.1-2+deb9u1
 python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python3-babel==2.3.4+dfsg.1-2+deb9u1
-python3.5==3.5.3-1+deb9u5
-python3.5-dbg==3.5.3-1+deb9u5
-python3.5-dev==3.5.3-1+deb9u5
-python3.5-minimal==3.5.3-1+deb9u5
\ No newline at end of file
+python3-babel==2.3.4+dfsg.1-2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
index c1a0c3be0413..31ce74f53983 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
@@ -1 +1 @@
-regex==2021.11.2
\ No newline at end of file
+regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
index c1a0c3be0413..31ce74f53983 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
@@ -1 +1 @@
-regex==2021.11.2
\ No newline at end of file
+regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index ec98653494ea..d21c04831efa 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -12,7 +12,7 @@ idna==3.3
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
-jinja2==3.0.2
+jinja2==3.0.3
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
@@ -31,7 +31,7 @@ pycparser==2.21
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.11.2
+regex==2021.11.10
 requests==2.26.0
 scapy==2.4.4
 six==1.16.0

From 36f1a547b1c6cf3b766b36e3db8c5a71bfc950ab Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 15 Nov 2021 07:26:35 +0800
Subject: [PATCH 0907/1674] [ci/build]: Upgrade SONiC package versions (#9255)

---
 .../versions-deb-buster                       |   4 +-
 .../build-sonic-slave-buster/versions-git     |   2 +-
 .../build-sonic-slave-buster/versions-web     |   4 +-
 .../build-sonic-slave-stretch/versions-web    |   4 +-
 files/build/versions/default/versions-git     |   4 +-
 files/build/versions/default/versions-web     |   4 +-
 .../docker-syncd-brcm/versions-deb-buster     |   2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  21 ++++
 .../sonic-slave-buster/versions-deb-buster    | 118 +++++++++---------
 .../versions-deb-buster-arm64                 |  50 +-------
 .../versions-deb-buster-armhf                 |  48 -------
 .../dockers/sonic-slave-buster/versions-git   |   2 +
 .../dockers/sonic-slave-buster/versions-py3   |   2 +-
 .../sonic-slave-buster/versions-py3-all-arm64 |   1 -
 .../sonic-slave-buster/versions-py3-all-armhf |   1 -
 .../sonic-slave-stretch/versions-deb-stretch  |  33 ++---
 .../versions-deb-stretch-arm64                |  18 +--
 .../versions-deb-stretch-armhf                |  18 +--
 .../dockers/sonic-slave-stretch/versions-git  |   2 +
 .../dockers/sonic-slave-stretch/versions-py3  |   2 +-
 .../versions-py3-all-arm64                    |   1 -
 .../versions-py3-all-armhf                    |   1 -
 22 files changed, 117 insertions(+), 225 deletions(-)
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 7cb5b72e1e76..64051004d8c2 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-6
+libsaibcm==4.3.5.1-7
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -42,7 +42,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mlnx-sai==1.mlnx.SAIRel1.18.3.0
+mft==4.17.0-106
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 706c4e6b97a2..facd7aef9209 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==51161829bf022786f56f062edcaf56a9b9a8f394
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 952515f7476d..cea5c40187ff 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index a296fe4a1fd1..a2a1515c5404 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=sxqBQ99A6FUh5fTgCTss%2FlOYXXymGOTjcMF7uofW%2FyI%3D&se=2035-07-13T03%3A23%3A37Z&sp=r==0d33b3c09c4908e193c6280a48df5fda
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-6_amd64.deb?sv=2015-04-05&sr=b&sig=F%2BWXIA%2B1BCf1lfB6X%2B3WDmfrd57TQbRIf448ry%2F0G2M%3D&se=2035-07-13T03%3A22%3A23Z&sp=r==69734d0de968d0e858f7aa54ae405827
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 0ae0e6b7d01e..02dab480a276 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==08a95d8392e2249bd1c0a0b9f37cc12afb7c31e0
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==25ede0234ab1cde50e7e7f7efde1a2f43bc80fdc
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -16,4 +16,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==51161829bf022786f56f062edcaf56a9b9a8f394
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e47a82b8f046..7176f8d8022b 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index e67efd8f8c34..688f77933875 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-6
+libsaibcm==4.3.5.1-7
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 04e643af41bd..1db47dd14b40 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,11 +1,22 @@
 applibs==1.mlnx.4.4.3326
 applibs-dev==1.mlnx.4.4.3326
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 iproute2==1.mlnx.4.4.3326
 iproute2-dev==1.mlnx.4.4.3326
+libbabeltrace1==1.5.6-2+deb10u1
+libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
+libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
+libglib2.0-0==2.58.3-2+deb10u3
+libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u1
+libipt2==2.0-2
+libpopt0==1.16-12
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
@@ -15,11 +26,16 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.208-1
 mft==4.17.0-106
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
+openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
@@ -32,6 +48,8 @@ python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+sshpass==1.06-1
+strace==4.26-0.2
 sx-acl-helper==1.mlnx.4.4.3326
 sx-acl-helper-dev==1.mlnx.4.4.3326
 sx-complib==1.mlnx.4.4.3326
@@ -45,5 +63,8 @@ sx-scew-dev==1.mlnx.4.4.3326
 sxd-libs==1.mlnx.4.4.3326
 sxd-libs-dev==1.mlnx.4.4.3326
 syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 wjh-libs==1.mlnx.4.4.3326
 wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index e356efaadf70..9e42c1ade343 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -24,7 +24,7 @@ autopoint==0.19.8.1-9
 autotools-dev==20180224.1
 bash-completion==1:2.8-6
 bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u5
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
 binfmt-support==2.2.0-2
 binutils==2.31.1-16
 binutils-common==2.31.1-16
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.9-1
+containerd.io==1.4.11-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -83,11 +83,11 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u1
-distro-info-data==0.41+deb10u3
+distro-info-data==0.41+deb10u4
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u5
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
 docker-ce==5:18.09.5~3-0~debian-buster
 docker-ce-cli==5:18.09.5~3-0~debian-buster
 docutils-common==0.14+dfsg-4
@@ -199,8 +199,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u2
-krb5-multidev==1.17-3+deb10u2
+krb5-locales==1.17-3+deb10u3
+krb5-multidev==1.17-3+deb10u3
 lcov==1.13-4
 less==487-0.1+b1
 lib32asan5==8.3.0-6
@@ -243,8 +243,8 @@ libasyncns0==0.8-6
 libatinject-jsr330-api-java==1.0+ds1-5
 libatk-bridge2.0-0==2.30.0-5
 libatk-bridge2.0-dev==2.30.0-5
-libatk-wrapper-java==0.33.3-22
-libatk-wrapper-java-jni==0.33.3-22
+libatk-wrapper-java==0.33.3-22+deb10u1
+libatk-wrapper-java-jni==0.33.3-22+deb10u1
 libatk1.0-0==2.30.0-2
 libatk1.0-data==2.30.0-2
 libatk1.0-dev==2.30.0-2
@@ -262,18 +262,18 @@ libavahi-common-data==0.7-4+deb10u1
 libavahi-common3==0.7-4+deb10u1
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
-libavcodec58==7:4.1.6-1~deb10u1
-libavfilter7==7:4.1.6-1~deb10u1
-libavformat58==7:4.1.6-1~deb10u1
-libavutil56==7:4.1.6-1~deb10u1
+libavcodec58==7:4.1.8-0+deb10u1
+libavfilter7==7:4.1.8-0+deb10u1
+libavformat58==7:4.1.8-0+deb10u1
+libavutil56==7:4.1.8-0+deb10u1
 libb-hooks-endofscope-perl==0.24-1
 libb-hooks-op-check-perl==0.22-1+b1
 libbabeltrace-dev==1.5.6-2+deb10u1
 libbabeltrace1==1.5.6-2+deb10u1
 libbatik-java==1.10-2+deb10u1
 libbdplus0==0.1.2-3
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u5
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u5
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
 libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
@@ -376,7 +376,7 @@ libcommons-collections3-java==3.2.2-2
 libcommons-compress-java==1.18-2+deb10u1
 libcommons-configuration-java==1.10-5
 libcommons-digester-java==1.8.1-5
-libcommons-io-java==2.6-2
+libcommons-io-java==2.6-2+deb10u1
 libcommons-lang-java==2.6-8
 libcommons-lang3-java==3.8-2
 libcommons-logging-java==1.2-2
@@ -416,8 +416,8 @@ libdigest-hmac-perl==1.03+dfsg-2
 libdistro-info-perl==0.21
 libdjvulibre-text==3.5.27.1-10
 libdjvulibre21==3.5.27.1-10
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u5
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdom4j-java==2.1.1-2
 libdouble-conversion1==3.1.0-3
 libdoxia-core-java==1.7-2
@@ -552,8 +552,8 @@ libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u4
 libgs9-common==9.27~dfsg-2+deb10u4
 libgsm1==1.0.18-2
-libgssapi-krb5-2==1.17-3+deb10u2
-libgssrpc4==1.17-3+deb10u2
+libgssapi-krb5-2==1.17-3+deb10u3
+libgssrpc4==1.17-3+deb10u3
 libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
@@ -627,14 +627,14 @@ libipc-system-simple-perl==1.25-4
 libipt2==2.0-2
 libiptc-dev==1.8.2-4
 libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u5
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u5
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
 libisl19==0.20-2
 libitext1-java==1.4-7
 libitm1==8.3.0-6
@@ -675,16 +675,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u2
-libkadm5clnt-mit11==1.17-3+deb10u2
-libkadm5srv-mit11==1.17-3+deb10u2
-libkdb5-9==1.17-3+deb10u2
+libk5crypto3==1.17-3+deb10u3
+libkadm5clnt-mit11==1.17-3+deb10u3
+libkadm5srv-mit11==1.17-3+deb10u3
+libkdb5-9==1.17-3+deb10u3
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u2
-libkrb5-dev==1.17-3+deb10u2
-libkrb5support0==1.17-3+deb10u2
+libkrb5-3==1.17-3+deb10u3
+libkrb5-dev==1.17-3+deb10u3
+libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -713,7 +713,7 @@ liblua5.1-0-dev==5.1.5-8.1+b2
 liblvm2cmd2.03==2.03.02-3
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u5
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
 liblzma-dev==5.2.4-1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
@@ -724,9 +724,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.29-0+deb10u1
-libmariadb-dev-compat==1:10.3.29-0+deb10u1
-libmariadb3==1:10.3.29-0+deb10u1
+libmariadb-dev==1:10.3.31-0+deb10u1
+libmariadb-dev-compat==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.31-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -891,7 +891,7 @@ libpolkit-agent-1-0==0.105-25
 libpolkit-backend-1-0==0.105-25
 libpolkit-gobject-1-0==0.105-25
 libpopt0==1.16-12
-libpostproc55==7:4.1.6-1~deb10u1
+libpostproc55==7:4.1.8-0+deb10u1
 libpotrace0==1.15-1
 libprocps7==2:3.3.15-2
 libprotobuf-c1==1.3.1-1+b1
@@ -1053,8 +1053,8 @@ libsubunit-dev==1.3.0-1
 libsubunit0==1.3.0-1
 libsurefire-java==2.22.1-1
 libswitch-perl==2.17-2
-libswresample3==7:4.1.6-1~deb10u1
-libswscale5==7:4.1.6-1~deb10u1
+libswresample3==7:4.1.8-0+deb10u1
+libswscale5==7:4.1.8-0+deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u8
@@ -1082,7 +1082,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u2
+libtiff5==4.1.0+git191117-2~deb10u3
 libtimedate-perl==2.3000-2+deb10u1
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
@@ -1257,7 +1257,7 @@ libxml-xpathengine-perl==0.14-1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxml2-utils==2.9.4+dfsg1-7+deb10u2
-libxmlgraphics-commons-java==2.3-1
+libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
@@ -1293,12 +1293,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.194-3
-linux-headers-4.19.0-17-amd64==4.19.194-3
-linux-headers-4.19.0-17-common==4.19.194-3
-linux-headers-amd64==4.19+105+deb10u12
-linux-kbuild-4.19==4.19.194-3
-linux-libc-dev==4.19.194-3
+linux-compiler-gcc-8-x86==4.19.208-1
+linux-headers-4.19.0-18-amd64==4.19.208-1
+linux-headers-4.19.0-18-common==4.19.208-1
+linux-headers-amd64==4.19+105+deb10u13
+linux-kbuild-4.19==4.19.208-1
+linux-libc-dev==4.19.208-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1320,7 +1320,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.29-0+deb10u1
+mariadb-common==1:10.3.31-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
@@ -1378,13 +1378,13 @@ php-token-stream==3.0.1-1
 php-tokenizer==1.1.0-1
 php-webmozart-assert==1.4.0-3
 php-xml==2:7.3+69
-php7.3-cli==7.3.29-1~deb10u1
-php7.3-common==7.3.29-1~deb10u1
-php7.3-json==7.3.29-1~deb10u1
-php7.3-mbstring==7.3.29-1~deb10u1
-php7.3-opcache==7.3.29-1~deb10u1
-php7.3-readline==7.3.29-1~deb10u1
-php7.3-xml==7.3.29-1~deb10u1
+php7.3-cli==7.3.31-1~deb10u1
+php7.3-common==7.3.31-1~deb10u1
+php7.3-json==7.3.31-1~deb10u1
+php7.3-mbstring==7.3.31-1~deb10u1
+php7.3-opcache==7.3.31-1~deb10u1
+php7.3-readline==7.3.31-1~deb10u1
+php7.3-xml==7.3.31-1~deb10u1
 phpunit==7.5.6-1
 phpunit-code-unit-reverse-lookup==1.0.1-1
 phpunit-comparator==3.0.2-1
@@ -1410,7 +1410,7 @@ pristine-tar==1.46
 procmail==3.22-26
 procps==2:3.3.15-2
 protobuf-compiler==3.6.1.3-2
-psmisc==23.2-1
+psmisc==23.2-1+deb10u1
 psutils==1.17.dfsg-4
 publicsuffix==20190415.1030-1
 pylint==1.9.4-1
@@ -1632,7 +1632,7 @@ shellcheck==0.5.0-3
 software-properties-common==0.96.20.2-2
 sphinx-common==1.8.4-1
 sphinx-rtd-theme-common==0.4.3+dfsg-1
-squashfs-tools==1:4.3-12+deb10u1
+squashfs-tools==1:4.3-12+deb10u2
 stgit==0.18-1
 strace==4.26-0.2
 sudo==1.8.27-1+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 97246dbb8d1e..1f9ed901f138 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,55 +1,7 @@
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
 binutils-aarch64-linux-gnu==2.31.1-16
-containerd.io==1.4.11-1
-distro-info-data==0.41+deb10u4
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
-krb5-locales==1.17-3+deb10u3
-krb5-multidev==1.17-3+deb10u3
-libatk-wrapper-java==0.33.3-22+deb10u1
-libatk-wrapper-java-jni==0.33.3-22+deb10u1
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libcommons-io-java==2.6-2+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libgssapi-krb5-2==1.17-3+deb10u3
-libgssrpc4==1.17-3+deb10u3
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
-libk5crypto3==1.17-3+deb10u3
-libkadm5clnt-mit11==1.17-3+deb10u3
-libkadm5srv-mit11==1.17-3+deb10u3
-libkdb5-9==1.17-3+deb10u3
-libkrb5-3==1.17-3+deb10u3
-libkrb5-dev==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libmariadb-dev==1:10.3.31-0+deb10u1
-libmariadb-dev-compat==1:10.3.31-0+deb10u1
-libmariadb3==1:10.3.31-0+deb10u1
 libtext-iconv-perl==1.7-5+b6
-libtiff5==4.1.0+git191117-2~deb10u3
-libxmlgraphics-commons-java==2.3-1+deb10u1
 libxslt1-dev==1.1.32-2.2~deb10u1
-linux-kbuild-4.19==4.19.208-1
-linux-libc-dev==4.19.208-1
-mariadb-common==1:10.3.31-0+deb10u1
-nodejs==14.18.1-deb-1nodesource1
-php7.3-cli==7.3.31-1~deb10u1
-php7.3-common==7.3.31-1~deb10u1
-php7.3-json==7.3.31-1~deb10u1
-php7.3-mbstring==7.3.31-1~deb10u1
-php7.3-opcache==7.3.31-1~deb10u1
-php7.3-readline==7.3.31-1~deb10u1
-php7.3-xml==7.3.31-1~deb10u1
-psmisc==23.2-1+deb10u1
-squashfs-tools==1:4.3-12+deb10u2
\ No newline at end of file
+nodejs==14.18.1-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 6c3ed90c9821..3d836a1f605f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,15 +1,5 @@
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
 binutils-arm-linux-gnueabihf==2.31.1-16
-containerd.io==1.4.11-1
-distro-info-data==0.41+deb10u4
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
-krb5-locales==1.17-3+deb10u3
-krb5-multidev==1.17-3+deb10u3
 libalgorithm-c3-perl==0.10-1
-libatk-wrapper-java==0.33.3-22+deb10u1
-libatk-wrapper-java-jni==0.33.3-22+deb10u1
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
@@ -17,13 +7,10 @@ libclang-dev==1:7.0-47
 libclass-c3-perl==0.34-1
 libclass-c3-xs-perl==0.14-1+b3
 libclass-data-inheritable-perl==0.08-3
-libcommons-io-java==2.6-2+deb10u1
 libdevel-caller-perl==2.06-2+b1
 libdevel-lexalias-perl==0.05-2+b1
 libdevel-stacktrace-perl==2.0300-1
 libdist-checkconflicts-perl==0.11-1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
@@ -33,31 +20,10 @@ libemail-date-format-perl==1.005-1
 libeval-closure-perl==0.14-1
 libexception-class-perl==1.44-1
 libgles2-mesa-dev==18.3.6-2+deb10u1
-libgssapi-krb5-2==1.17-3+deb10u3
-libgssrpc4==1.17-3+deb10u3
 libipc-shareable-perl==0.61-2
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
 libjargs-java==1.0.0-4
-libk5crypto3==1.17-3+deb10u3
-libkadm5clnt-mit11==1.17-3+deb10u3
-libkadm5srv-mit11==1.17-3+deb10u3
-libkdb5-9==1.17-3+deb10u3
-libkrb5-3==1.17-3+deb10u3
-libkrb5-dev==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
 liblog-dispatch-perl==2.68-1
 liblog-log4perl-perl==1.49-1
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libmariadb-dev==1:10.3.31-0+deb10u1
-libmariadb-dev-compat==1:10.3.31-0+deb10u1
-libmariadb3==1:10.3.31-0+deb10u1
 libmime-charset-perl==1.012.2-1
 libmime-lite-perl==3.030-2
 libmime-types-perl==2.17-1
@@ -140,32 +106,18 @@ librust-wincolor-dev==1.0.0-1
 libsass1==3.5.5-4
 libsombok3==2.4.0-2
 libspecio-perl==0.43-1
-libtiff5==4.1.0+git191117-2~deb10u3
 libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
-libxmlgraphics-commons-java==2.3-1+deb10u1
 libxslt1-dev==1.1.32-2.2~deb10u1
 libyaml-tiny-perl==1.73-1
 linux-compiler-gcc-8-arm==4.19.208-1
-linux-kbuild-4.19==4.19.208-1
-linux-libc-dev==4.19.208-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-mariadb-common==1:10.3.31-0+deb10u1
 nodejs==14.18.1-deb-1nodesource1
-php7.3-cli==7.3.31-1~deb10u1
-php7.3-common==7.3.31-1~deb10u1
-php7.3-json==7.3.31-1~deb10u1
-php7.3-mbstring==7.3.31-1~deb10u1
-php7.3-opcache==7.3.31-1~deb10u1
-php7.3-readline==7.3.31-1~deb10u1
-php7.3-xml==7.3.31-1~deb10u1
 ps2eps==1.68+binaryfree-2
-psmisc==23.2-1+deb10u1
 rdfind==1.4.1-1
 sassc==3.5.0-1
-squashfs-tools==1:4.3-12+deb10u2
 texlive-extra-utils==2018.20190227-2
 texlive-font-utils==2018.20190227-2
 yui-compressor==2.4.8-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..515a11167938
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 064e66962715..31ba77f72230 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.8.28
+regex==2021.11.10
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
deleted file mode 100644
index 31ce74f53983..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
deleted file mode 100644
index 31ce74f53983..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 4315a11db069..631b9d3e59e6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -51,7 +51,7 @@ cpio==2.11+dfsg-6
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
 cppcheck==1.76.1-1
-cron==3.0pl1-128+deb9u1
+cron==3.0pl1-128+deb9u2
 curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dconf-gsettings-backend==0.26.0-2+b1
@@ -153,7 +153,7 @@ gtk-update-icon-cache==3.22.11-1
 guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==57.1-6+deb9u4
+icu-devtools==57.1-6+deb9u5
 imagemagick==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
 imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
@@ -171,7 +171,7 @@ junit==3.8.2-8
 junit4==4.12-4+deb9u1
 kernel-wedge==2.96
 kmod==23-2
-krb5-locales==1.15-1+deb9u1
+krb5-locales==1.15-1+deb9u3
 less==481-2.1
 lib32asan3==6.3.0-18+deb9u1
 lib32atomic1==6.3.0-18+deb9u1
@@ -380,9 +380,9 @@ libcommons-validator-java==1:1.5.1-1
 libconvert-binhex-perl==1.125-1
 libcroco3==0.6.11-3
 libcryptsetup4==2:1.7.3-4
-libcups2==2.2.1-8+deb9u6
+libcups2==2.2.1-8+deb9u7
 libcupsfilters1==1.11.6-3+deb9u1
-libcupsimage2==2.2.1-8+deb9u6
+libcupsimage2==2.2.1-8+deb9u7
 libcurl3==7.52.1-5+deb9u16
 libcurl3-gnutls==7.52.1-5+deb9u16
 libcurl3-nss==7.52.1-5+deb9u16
@@ -419,15 +419,16 @@ libdrm-intel1==2.4.74-1
 libdrm-nouveau2==2.4.74-1
 libdrm-radeon1==2.4.74-1
 libdrm2==2.4.74-1
-libdw-dev==0.168-1
-libdw1==0.168-1
+libdw-dev==0.168-1+deb9u1
+libdw1==0.168-1+deb9u1
 libeasymock-java==3.4+ds-1
 libeatmydata1==105-5
 libeclipse-aether-java==1.0.2-1
 libedit-dev==3.1-20160903-3
 libedit2==3.1-20160903-3
 libegl1-mesa==13.0.6-1+b2
-libelf-dev==0.168-1
+libelf-dev==0.168-1+deb9u1
+libelf1==0.168-1+deb9u1
 libemail-valid-perl==1.202-1
 libencode-locale-perl==1.05-1
 libepoxy0==1.3.1-2
@@ -550,8 +551,8 @@ libibverbs-dev==1.2.1-2
 libibverbs1==1.2.1-2
 libice-dev==2:1.0.9-2
 libice6==2:1.0.9-2
-libicu-dev==57.1-6+deb9u4
-libicu57==57.1-6+deb9u4
+libicu-dev==57.1-6+deb9u5
+libicu57==57.1-6+deb9u5
 libidn2-0==0.16-1+deb9u1
 libijs-0.35==0.35-12
 libilmbase12==2.2.0-12
@@ -589,7 +590,7 @@ libjansson4==2.9-1
 libjaxen-java==1.1.6-1+deb9u1
 libjaxp1.3-java==1.3.05-2
 libjbig0==2.1-3.1+b2
-libjbig2dec0==0.13-4.1
+libjbig2dec0==0.13-4.1+deb9u1
 libjdom1-java==1.1.3-1+deb9u1
 libjemalloc-dev==3.6.0-9.1
 libjemalloc1==3.6.0-9.1
@@ -715,7 +716,7 @@ libnfnetlink-dev==1.0.1-3
 libnfnetlink0==1.0.1-3
 libnftnl-dev==1.0.7-1
 libnftnl4==1.0.7-1
-libnghttp2-14==1.18.1-1+deb9u1
+libnghttp2-14==1.18.1-1+deb9u2
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
 libnl-3-200==3.2.27-2
@@ -896,7 +897,7 @@ libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsaxon-java==1:6.5.5-10
 libscalar-list-utils-perl==1:1.47-1
-libsdl1.2debian==1.2.15+dfsg1-4
+libsdl1.2debian==1.2.15+dfsg1-4+deb9u1
 libseccomp2==2.3.1-2.1+deb9u1
 libselinux1-dev==2.6-3+b3
 libsensors4==1:3.4.0-4
@@ -1248,8 +1249,8 @@ python-apt==1.4.3
 python-apt-common==1.4.3
 python-astroid==1.4.9-1
 python-attr==16.3.0-1
-python-babel==2.3.4+dfsg.1-2
-python-babel-localedata==2.3.4+dfsg.1-2
+python-babel==2.3.4+dfsg.1-2+deb9u1
+python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
 python-backports.functools-lru-cache==1.3-1
 python-bs4==4.5.3-1
 python-cffi-backend==1.9.1-2
@@ -1326,7 +1327,7 @@ python3-all==3.5.3-1
 python3-all-dbg==3.5.3-1
 python3-all-dev==3.5.3-1
 python3-apt==1.4.3
-python3-babel==2.3.4+dfsg.1-2
+python3-babel==2.3.4+dfsg.1-2+deb9u1
 python3-cffi-backend==1.9.1-2
 python3-chardet==2.3.0-2
 python3-crypto==2.6.1-7
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 21419d7b85ca..00f894c2df08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,24 +1,8 @@
-cron==3.0pl1-128+deb9u2
 docker-ce==18.06.3~ce~3-0~debian
-icu-devtools==57.1-6+deb9u5
-krb5-locales==1.15-1+deb9u3
-libcups2==2.2.1-8+deb9u7
-libcupsimage2==2.2.1-8+deb9u7
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
-libdw-dev==0.168-1+deb9u1
-libdw1==0.168-1+deb9u1
-libelf-dev==0.168-1+deb9u1
-libelf1==0.168-1+deb9u1
-libicu-dev==57.1-6+deb9u5
-libicu57==57.1-6+deb9u5
-libjbig2dec0==0.13-4.1+deb9u1
-libnghttp2-14==1.18.1-1+deb9u2
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-nodejs==10.24.1-1nodesource1
-python-babel==2.3.4+dfsg.1-2+deb9u1
-python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python3-babel==2.3.4+dfsg.1-2+deb9u1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index f6b245819749..025b7efbd0db 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -1,30 +1,14 @@
-cron==3.0pl1-128+deb9u2
 docker-ce==18.06.3~ce~3-0~debian
-icu-devtools==57.1-6+deb9u5
-krb5-locales==1.15-1+deb9u3
-libcups2==2.2.1-8+deb9u7
-libcupsimage2==2.2.1-8+deb9u7
 libdrm-exynos1==2.4.74-1
 libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
 libdrm-tegra0==2.4.74-1
-libdw-dev==0.168-1+deb9u1
-libdw1==0.168-1+deb9u1
 libegl1-mesa-dev==13.0.6-1+b2
-libelf-dev==0.168-1+deb9u1
-libelf1==0.168-1+deb9u1
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
-libicu-dev==57.1-6+deb9u5
-libicu57==57.1-6+deb9u5
-libjbig2dec0==0.13-4.1+deb9u1
-libnghttp2-14==1.18.1-1+deb9u2
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.272-2
-nodejs==10.24.1-1nodesource1
-python-babel==2.3.4+dfsg.1-2+deb9u1
-python-babel-localedata==2.3.4+dfsg.1-2+deb9u1
-python3-babel==2.3.4+dfsg.1-2+deb9u1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..515a11167938
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 13d7fa8dd810..3ae516f9d45f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.9.30
+regex==2021.11.10
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
deleted file mode 100644
index 31ce74f53983..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
deleted file mode 100644
index 31ce74f53983..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-regex==2021.11.10
\ No newline at end of file

From 2cbe6a7502105d0fc255dd5389aabe2f907ae091 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 11 Nov 2021 17:49:04 -0800
Subject: [PATCH 0908/1674] DHCPv6 Relay multivlan functionality support
 (#9178)

Fix support for DHCPV6 Relay multi vlan functionality. Make sure the relayed packet is received at correct interface.

How I did it
Bind a socket to each vlan interface's global and link-local address.
Socket binded to global address is used for relaying data from client to server and receiving data from servers.
Socket binded to link-local address is used for relaying data received from server back to the client.
---
 src/dhcp6relay/src/relay.cpp | 106 ++++++++++++++++++-----------------
 src/dhcp6relay/src/relay.h   |  31 ++--------
 2 files changed, 62 insertions(+), 75 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index f5f4b056648f..11bb4ace42d1 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -116,34 +116,6 @@ std::string toString(uint16_t count) {
     return countValue;
 }
 
-/**
- * @code                bool is_addr_gua(in6_addr addr);
- *
- * @brief               check if address is global
- *
- * @param addr         ipv6 address
- * 
- * @return              bool
- */
-bool is_addr_gua(in6_addr addr) {
-    auto masked = addr.__in6_u.__u6_addr8[0] & 0xe0;
-    return (masked ^ 0x20) == 0x00;
-}
-
-/**
- * @code                is_addr_link_local(in6_addr addr);
- *
- * @brief               check if address is link_local
- *
- * @param addr         ipv6 address
- * 
- * @return              bool
- */
-bool is_addr_link_local(in6_addr addr)  {
-    auto masked = ntohs(addr.__in6_u.__u6_addr16[0]) & 0xffc0;
-    return (masked ^ 0xfe80) == 0x0000;
-}
-
 /**
  * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
  *
@@ -356,11 +328,11 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
     while (ifa_tmp) {
         if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
             struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && is_addr_gua(in6->sin6_addr)) {    
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
                 non_link_local = *in6;
                 break;
             }
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && is_addr_link_local(in6->sin6_addr)) {    
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
                 link_local = *in6;
             }   
         }
@@ -368,7 +340,7 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
     }
     freeifaddrs(ifa); 
     
-    if(is_addr_gua(non_link_local.sin6_addr)) {
+    if(!IN6_IS_ADDR_LINKLOCAL(&non_link_local.sin6_addr)) {
         interface_config->link_address = non_link_local;
     }
     else {
@@ -377,33 +349,63 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
 }
 
 /**
- * @code                prepare_socket(int *local_sock);
+ * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
  * 
  * @brief               prepare L3 socket for sending
  *
- * @param local_sock    pointer to socket to be prepared
+ * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
+ * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
+ * @param index         scope id of interface
  *
  * @return              none
  */
-void prepare_socket(int *local_sock) {
-    int flag = 1;
+void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index) {
+    struct ifaddrs *ifa, *ifa_tmp;
     sockaddr_in6 addr;
+    sockaddr_in6 ll_addr;
     memset(&addr, 0, sizeof(addr));
-    addr.sin6_family = AF_INET6;
-    addr.sin6_addr = in6addr_any;
-    addr.sin6_port = htons(RELAY_PORT);
+    memset(&ll_addr, 0, sizeof(ll_addr));
 
     if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
         syslog(LOG_ERR, "socket: Failed to create socket\n");
     }
 
-    if((setsockopt(*local_sock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag))) == -1) {
-		syslog(LOG_ERR, "setsockopt: Unable to set socket option\n");
-	}
+    if ((*server_sock= socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
+        syslog(LOG_ERR, "socket: Failed to create socket\n");
+    }
+
+
+    if (getifaddrs(&ifa) == -1) {
+        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
+        exit(1);
+    }
+
+    ifa_tmp = ifa;
+    while (ifa_tmp) {
+        if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
+            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+            if((strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {   
+                in6->sin6_family = AF_INET6;
+                in6->sin6_port = htons(RELAY_PORT);
+                addr = *in6;
+            }
+            if((strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {   
+                in6->sin6_family = AF_INET6;
+                in6->sin6_port = htons(RELAY_PORT);
+                ll_addr = *in6;
+            }
+        }
+        ifa_tmp = ifa_tmp->ifa_next;
+    }
+    freeifaddrs(ifa);
     
     if (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1) {
         syslog(LOG_ERR, "bind: Failed to bind to socket\n");
-    }    
+    }
+
+    if (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1) {
+        syslog(LOG_ERR, "bind: Failed to bind to socket\n");
+    }
 }
 
 
@@ -584,7 +586,7 @@ void server_callback(evutil_socket_t fd, short event, void *arg) {
     std::string counterVlan = counter_table;
     update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
     if (msg->msg_type == DHCPv6_MESSAGE_TYPE_RELAY_REPL) {
-        relay_relay_reply(config->local_sock, message_buffer, data, config);
+        relay_relay_reply(config->server_sock, message_buffer, data, config);
     }
 }
 
@@ -681,11 +683,16 @@ void dhcp6relay_stop()
  */
 void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
     std::vector<int> sockets;
-    
+    base = event_base_new();
+    if(base == NULL) {
+        syslog(LOG_ERR, "libevent: Failed to create base\n");
+    }
+
     for(relay_config &vlan : *vlans) {
         relay_config *config = &vlan;
         int filter = 0;
         int local_sock = 0; 
+        int server_sock = 0;
         const char *ifname = config->interface.c_str();
         int index = if_nametoindex(ifname);
         config->db = db;
@@ -694,10 +701,14 @@ void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
         initialize_counter(config->db, counterVlan.append(config->interface));
 
         filter = sock_open(index, &ether_relay_fprog);
+        prepare_socket(&local_sock, &server_sock, config, index);
+
+        config->local_sock = local_sock;
+        config->server_sock = server_sock;
 
-        prepare_socket(&local_sock);
         sockets.push_back(filter);
         sockets.push_back(local_sock);
+        sockets.push_back(server_sock);
 
         prepare_relay_config(config, &local_sock, filter);
 
@@ -707,11 +718,6 @@ void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
         evutil_make_listen_socket_reuseable(local_sock);
         evutil_make_socket_nonblocking(local_sock);
 
-        base = event_base_new();
-        if(base == NULL) {
-            syslog(LOG_ERR, "libevent: Failed to create base\n");
-        }
-
         listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, config);
         server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, config);
         if (listen_event == NULL || server_listen_event == NULL) {
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
index ddd63559c66b..6be60697da7e 100644
--- a/src/dhcp6relay/src/relay.h
+++ b/src/dhcp6relay/src/relay.h
@@ -42,6 +42,7 @@ typedef enum
 
 struct relay_config {
     int local_sock; 
+    int server_sock;
     int filter;
     sockaddr_in6 link_address;
     swss::DBConnector *db;
@@ -90,15 +91,17 @@ struct linklayer_addr_option  {
 int sock_open(int ifindex, const struct sock_fprog *fprog);
 
 /**
- * @code                prepare_socket(int *local_sock);
+ * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
  * 
  * @brief               prepare L3 socket for sending
  *
- * @param local_sock    pointer to socket to be prepared
+ * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
+ * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
+ * @param index         scope id of interface
  *
  * @return              none
  */
-void prepare_socket(int *local_sock);
+void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
 
 /**
  * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
@@ -245,28 +248,6 @@ void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_
  */
 std::string toString(uint16_t count);
 
-/**
- * @code                bool is_addr_gua(in6_addr addr);
- *
- * @brief               check if address is global
- *
- * @param addr         ipv6 address
- * 
- * @return              bool
- */
-bool is_addr_gua(in6_addr addr);
-
-/**
- * @code                is_addr_link_local(in6_addr addr);
- *
- * @brief               check if address is link_local
- *
- * @param addr         ipv6 address
- * 
- * @return              bool
- */
-bool is_addr_link_local(in6_addr addr);
-
 /**
  * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
  *

From 6cb7af73d93c630dfce59c78a4e9bd850a5446f2 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Mon, 15 Nov 2021 07:29:30 -0800
Subject: [PATCH 0909/1674] add arista.log to logrotate (#9245)

---
 files/image_config/logrotate/logrotate.d/rsyslog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/image_config/logrotate/logrotate.d/rsyslog b/files/image_config/logrotate/logrotate.d/rsyslog
index cbf6e722eb90..bedcdff896d2 100644
--- a/files/image_config/logrotate/logrotate.d/rsyslog
+++ b/files/image_config/logrotate/logrotate.d/rsyslog
@@ -24,6 +24,7 @@
 }
 
 /var/log/auth.log
+/var/log/arista.log
 /var/log/cron.log
 /var/log/syslog
 /var/log/teamd.log

From 86fa5eede2f3081fbd11bda62fb9ae5f66b74483 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Tue, 26 Oct 2021 14:10:13 -0700
Subject: [PATCH 0910/1674] Add service mark_dhcp_packet to mux container
 (#9015)

- add a new service "mark_dhcp_packet" to mux container
- apply packet marks on a per-interface basis in ebtables
- write packet marks to "DHCP_PACKET_MARK" table in state_db
---
 files/build_templates/mux.service.j2          |  10 ++
 .../build_templates/sonic_debian_extension.j2 |   3 +
 files/scripts/mark_dhcp_packet.py             | 108 ++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 files/scripts/mark_dhcp_packet.py

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index 5aff5a24c02b..eb9ea1d33396 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -17,5 +17,15 @@ ExecStopPost=/usr/local/bin/write_standby.py
 Restart=always
 RestartSec=30
 
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/local/bin/mark_dhcp_packet.py
+ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStopPost=/usr/local/bin/mark_dhcp_packet.py
+Restart=always
+RestartSec=30
+
 [Install]
 WantedBy=sonic.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index b00119b54ff6..9938b3e815cd 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -719,6 +719,9 @@ sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netn
 # Copy write_standby script for mux state
 sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT/usr/local/bin/write_standby.py
 
+# Copy mark_dhcp_packet script
+sudo LANG=C cp $SCRIPTS_DIR/mark_dhcp_packet.py $FILESYSTEM_ROOT/usr/local/bin/mark_dhcp_packet.py
+
 # Copy systemd timer configuration
 # It implements delayed start of services
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
diff --git a/files/scripts/mark_dhcp_packet.py b/files/scripts/mark_dhcp_packet.py
new file mode 100644
index 000000000000..1ad2fd6509b3
--- /dev/null
+++ b/files/scripts/mark_dhcp_packet.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import sys
+import time
+
+from sonic_py_common import logger
+from swsscommon import swsscommon
+
+log = logger.Logger('mark_dhcp_packet')
+
+class MarkDhcpPacket(object):
+    """
+    Class used to configure dhcp packet mark in ebtables
+    """
+
+    def __init__(self):
+        self.config_db_connector = None
+        self.state_db_connector = None
+
+    @property
+    def config_db(self):
+        """
+        Returns config DB connector.
+        Initializes the connector during the first call
+        """
+        if self.config_db_connector is None:
+            self.config_db_connector = swsscommon.ConfigDBConnector()
+            self.config_db_connector.connect()
+
+        return self.config_db_connector
+
+    @property
+    def state_db(self):
+        """
+        Returns the state DB connector.
+        Initializes the connector during the first call
+        """
+        if self.state_db_connector is None:
+            self.state_db_connector = swsscommon.SonicV2Connector(host='127.0.0.1')
+            self.state_db_connector.connect(self.state_db_connector.STATE_DB)
+
+        return self.state_db_connector
+
+    @property
+    def is_dualtor(self):
+        """
+        Checks if script is running on a dual ToR system
+        """
+        localhost_key = self.config_db.get_keys('DEVICE_METADATA')[0]
+        metadata = self.config_db.get_entry('DEVICE_METADATA', localhost_key)
+
+        return 'subtype' in metadata and 'dualtor' in metadata['subtype'].lower()
+
+    def get_mux_intfs(self):
+        """
+        Returns a list of mux cable interfaces
+        """
+        mux_cables = self.config_db.get_table('MUX_CABLE')
+        mux_intfs = [intf for intf in mux_cables]
+
+        return mux_intfs
+
+    def generate_mark_from_index(self, index):
+        '''
+        type: string, format: hexadecimal
+        Example: 0x67001, 0x67002, ...
+        '''
+        intf_mark = "0x67" + str(index).zfill(3)
+
+        return intf_mark
+
+    def run_command(self, cmd):
+        subprocess.call(cmd, shell=True)
+        log.log_info("run command: {}".format(cmd))
+
+    def clear_dhcp_packet_marks(self):
+        '''
+        Flush the INPUT chain in ebtables upon restart
+        '''
+        self.run_command("sudo ebtables -F INPUT")
+
+    def apply_mark_in_ebtables(self, intf, mark):
+        self.run_command("sudo ebtables -A INPUT -i {} -j mark --mark-set {}".format(intf, mark))
+
+    def update_mark_in_state_db(self, intf, mark):
+        self.state_db.set(self.state_db.STATE_DB, 'DHCP_PACKET_MARK', intf, mark)
+
+    def apply_marks(self):
+        """
+        Writes dhcp packet marks in ebtables
+        """
+        if not self.is_dualtor:
+            return
+
+        self.clear_dhcp_packet_marks()
+
+        for (index, intf) in enumerate(self.get_mux_intfs(), 1):
+            mark = self.generate_mark_from_index(index)
+            self.apply_mark_in_ebtables(intf, mark)
+            self.update_mark_in_state_db(intf, mark)
+
+        log.log_info("Finish marking dhcp packets in ebtables.")
+
+if __name__ == '__main__':
+    mark_dhcp_packet = MarkDhcpPacket()
+    mark_dhcp_packet.apply_marks()

From 19008889de9f9a170560b20d1bcf5e90ec7299e4 Mon Sep 17 00:00:00 2001
From: trzhang-msft <trzhang@microsoft.com>
Date: Tue, 2 Nov 2021 15:55:50 -0700
Subject: [PATCH 0911/1674] update DHCP_PACKET_MARK schema (#9077)

- update DHCP_PACKET_MARK schema in state_db
- this is an update over PR: Add service mark_dhcp_packet to mux container #9015
---
 files/scripts/mark_dhcp_packet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/mark_dhcp_packet.py b/files/scripts/mark_dhcp_packet.py
index 1ad2fd6509b3..937447d2ceea 100644
--- a/files/scripts/mark_dhcp_packet.py
+++ b/files/scripts/mark_dhcp_packet.py
@@ -85,7 +85,7 @@ def apply_mark_in_ebtables(self, intf, mark):
         self.run_command("sudo ebtables -A INPUT -i {} -j mark --mark-set {}".format(intf, mark))
 
     def update_mark_in_state_db(self, intf, mark):
-        self.state_db.set(self.state_db.STATE_DB, 'DHCP_PACKET_MARK', intf, mark)
+        self.state_db.set(self.state_db.STATE_DB, 'DHCP_PACKET_MARK|' + intf, 'mark', mark)
 
     def apply_marks(self):
         """

From c87ec4899300e70c182d8b541a3864484e56338c Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 15 Nov 2021 21:06:43 -0800
Subject: [PATCH 0912/1674] [sonic-utilities] submodule update (#9266)

9dd3025 2021-05-11 | [Command-Reference.md] Document new SNMP show and config commands (#1600) [Travis Van Duyn]
be40767 2021-05-05 | [show][config] Add new snmp commands (#1347) [Travis Van Duyn]
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 0c224e79e710..9dd3025e5e4b 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 0c224e79e7104472be9450e682b52380e64aa91e
+Subproject commit 9dd3025e5e4b9685d5f6f8860498bca7637f668e

From a5f4780c64966d8a5d8d2c056bca048ad68c49ff Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 17 Nov 2021 21:30:10 -0800
Subject: [PATCH 0913/1674] [202012] BRCM SAI 4.3.5.1-8 Pick up fix for PFCWD
 getting continuously triggered/restored when pause frames are sent
 continuously to both queues of a port (#9296)

1.  CS00012211718 [4.3] Pfcwd getting continuously triggered/restored when pause frames are sent continuously to both queues of a port (TD2/Th/Th2/TD3) MSFT Default

Preliminary tests look fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on 7050CX3 (TD3) T0 DUT and all passed:
```
     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     fdb/test_fdb.py
     decap/test_decap.py
     ipfwd/test_dip_sip.py
     ipfwd/test_dir_bcast.py
     acl/test_acl.py
     vlan/test_vlan.py
     platform_tests/test_reboot.py
```
---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 7176f8d8022b..2ee361f91d3b 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A11%3A49Z&se=2035-11-18T23%3A11%3A00Z&sr=b&sp=r&sig=GrvWbhm9UhQVusyEp7SdSUbauvARe6vh%2BQjXfysODBw%3D==a613ce2288092332ca2961f3025371df
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A06%3A02Z&se=2035-11-18T23%3A06%3A00Z&sr=b&sp=r&sig=0%2BkErbtVjoER05lW5XrB%2B%2BdZ%2FBifcWgk9651zsYMKNw%3D==bd8b1d3cbd2ceaa2f7cb172cf3b2ea09
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -73,4 +75,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index e87a0826bc6d..54969f64b835 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-7_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-7_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-8_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A06%3A02Z&se=2035-11-18T23%3A06%3A00Z&sr=b&sp=r&sig=0%2BkErbtVjoER05lW5XrB%2B%2BdZ%2FBifcWgk9651zsYMKNw%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-8_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A11%3A49Z&se=2035-11-18T23%3A11%3A00Z&sr=b&sp=r&sig=GrvWbhm9UhQVusyEp7SdSUbauvARe6vh%2BQjXfysODBw%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a7a4980e457f3b5077e4857e16a5c49aae4b4e19 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 17 Nov 2021 23:06:44 -0800
Subject: [PATCH 0914/1674] [202012][sonic-platform-common] submodule update
 (#9297)

6f198d0 (HEAD -> 202012, origin/202012) [Y-Cable][Broadcom] upgrade to support Broadcom Y-Cable API to release (#230)
1c3e422 SSD Health: Retrieve SSD health and temperature values from generic SSD info (#229)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index fc6a41ea3dc8..6f198d0adfd1 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit fc6a41ea3dc8b1c142492a03c7ce068c79302a72
+Subproject commit 6f198d0adfd1d7dcdafb5ec29d5bd56362b385df

From d6ab40970998a6c1025c7fcba51c3180dcec4d3c Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Thu, 18 Nov 2021 12:48:20 -0800
Subject: [PATCH 0915/1674] [202012] td2/td3 change cpu cos num to 10 (#9311)

Cherry-pick from #9301
---
 .../td2-a7050-q31s4-31x40G-4x10G.config.bcm                     | 2 +-
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                   | 2 +-
 .../td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
index eecad7cee9c0..ffb3e66e7b0b 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm
@@ -23,7 +23,7 @@ stat_if_parity_enable=0
 l2xmsg_hostbuf_size=8192
 l2xmsg_mode=1
 
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_interval=2000000
 lls_num_l2uc=12
 max_vp_lags=0
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index c31060f79278..cc5152815991 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -13,7 +13,7 @@ riot_overlay_ecmp_resilient_hash_size=16384
 flow_init_mode=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 bcm_tunnel_term_compatible_mode=1
diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
index aa9b32d4a350..e99cc4b58ea7 100644
--- a/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050sx3_48yc8/Arista-7050SX3-48YC8/td3-a7050sx3_48yc8-48x25G+8x100G.config.bcm
@@ -1,7 +1,7 @@
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 cdma_timeout_usec=15000000

From 54a29b16c55e28536d5f5622bdf002ba782f1002 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Thu, 18 Nov 2021 21:08:16 -0800
Subject: [PATCH 0916/1674] [swss] Update submodule for sonic-swss (#9314)

c31a362 - 2021-11-18 : [202012][Mux orch] set default as standby, change mux orch priority (#2015) [Prince Sunny]
9a9e8e6 - 2021-11-18 : [202012] Check VS test failure (#2033) [Prince Sunny]
7eaabca - 2021-11-11 : [202012] Fix random failure in PR/CI build. (#2016) [Shilong Liu]
85230fe - 2021-11-04 : [orchagent] Fix group name of port-buffer-drop in flexcounterorch.cpp (#1967) [Junchao-Mellanox]
a55c2ca - 2021-11-03 : [teammgrd]: Handle LAGs cleanup gracefully on Warm/Fast reboot. (#1934) [Nazarii Hnydyn]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index f147d9ee896e..c31a36261724 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit f147d9ee896e2aed46cf5b994a2b8f0c97e50300
+Subproject commit c31a3626172489e71bad4b851861489e82ef183c

From d5f95e5b2b8e2c423d44f63d0569eee76c9c1ab8 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Fri, 19 Nov 2021 13:03:26 -0800
Subject: [PATCH 0917/1674] [sonic-utilites] submodule update (#9324)

---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 9dd3025e5e4b..09ebac5a7d9c 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 9dd3025e5e4b9685d5f6f8860498bca7637f668e
+Subproject commit 09ebac5a7d9cdd753525fe726f44d23dac9985ce

From 4533e64fb41e06fd4ba8dda7fc630a1bbedb55d8 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 18 Nov 2021 13:01:41 +0800
Subject: [PATCH 0918/1674] [CI] Fix Azure pipeline set -e not work. (#9282)

In azure pipeline template 'set -e' not works as expected.
---
 .azure-pipelines/azure-pipelines-build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 22151edd21ab..d71ec5340a06 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -101,7 +101,8 @@ jobs:
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
             if [ $(dbg_image) == yes ]; then
-              make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
+              make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz
+              mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
             fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
@@ -111,8 +112,8 @@ jobs:
             fi
           else
             if [ $(dbg_image) == yes ]; then
-              make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \
-                mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
+              make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin
+              mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
             fi
             if [ $(swi_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi

From 678100a7c46d9458297e082802d8ecfb40838150 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Fri, 19 Nov 2021 17:33:13 -0800
Subject: [PATCH 0919/1674] Cherry pick of PR #9123 (#9310)

[cherry-pick PR #9123 ]

Why I did it
When sshd realizes that this login can't succeed due to internal device state
or configuration, instead of failing right there, it proceeds to prompt for
password, so as the user does not get any clue on where is the failure point.

Yet to ensure that this login does not proceed, sshd replaces user provided password
with a specific pattern of characters matching length of user provided password.
This pattern is "<BS><LF><CR><DEL>INCORRECT", which is bound to fail.

If user provided length is smaller/equal, the substring of pattern is overwritten.
If user provided length is greater, the pattern is repeated until length is exhausted.

But if the PAM-tacacs plugin would send this password to AAA, the user could get
locked out by AAA, for providing incorrect value.

How I did it
Hence this fix, matches obtained password against the pattern. If match, fail just before
reaching AAA server.

How to verify it
Make sure tacacs is properly configured.
Try logging in as, say "user-A"; ensure it succeeds
Pick another user, say user-B and ensure this user has not logged into this device before (look into /etc/passed & folders under /home)
Disable monit service (as that could fix the issue using disk_check.py)
Start TCP dump for all TACACS servers.
Simulate Read-only disk
Try logging in using user-B.
Verify it fails, after 3 attempts
Stop tcp dump.
TCP dump should show "authentication" for user-A only
---
 ...0007-handle-bad-password-set-by-sshd.patch | 133 ++++++++++++++++++
 src/tacacs/pam/Makefile                       |   1 +
 2 files changed, 134 insertions(+)
 create mode 100644 src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch

diff --git a/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch b/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
new file mode 100644
index 000000000000..36a96da77ac5
--- /dev/null
+++ b/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
@@ -0,0 +1,133 @@
+From f2687e7a442c83e19190695021fb9a60fe07ba60 Mon Sep 17 00:00:00 2001
+From: Renuka Manavalan <remanava@microsoft.com>
+Date: Wed, 17 Nov 2021 02:31:45 +0000
+Subject: [PATCH] handle bad password set by sshd
+
+---
+ pam_tacplus.c | 11 +++++++++--
+ support.c     | 37 +++++++++++++++++++++++++++++++++++++
+ support.h     |  1 +
+ tacc.c        |  4 ++--
+ 4 files changed, 49 insertions(+), 4 deletions(-)
+
+diff --git a/pam_tacplus.c b/pam_tacplus.c
+index ec8ea27..014421b 100644
+--- a/pam_tacplus.c
++++ b/pam_tacplus.c
+@@ -251,6 +251,13 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
+         return PAM_CRED_INSUFFICIENT;
+     }
+ 
++    if (validate_not_sshd_bad_pass(pass) != PAM_SUCCESS) {
++        syslog(LOG_ERR, "auth fail: Password incorrect");
++        memset(pass, 0, strlen (pass));
++        free(pass);
++        return PAM_AUTH_ERR;
++    }
++
+     retval = pam_set_item (pamh, PAM_AUTHTOK, pass);
+     if (retval != PAM_SUCCESS) {
+         _pam_log(LOG_ERR, "unable to set password");
+@@ -483,7 +490,7 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
+         syslog(LOG_DEBUG, "%s: exit with pam status: %d", __FUNCTION__, status);
+ 
+     if (NULL != pass) {
+-        bzero(pass, strlen (pass));
++        memset(pass, 0, strlen (pass));
+         free(pass);
+         pass = NULL;
+     }
+@@ -979,7 +986,7 @@ finish:
+         syslog(LOG_DEBUG, "%s: exit with pam status: %d", __FUNCTION__, status);
+ 
+     if (NULL != pass) {
+-        bzero(pass, strlen(pass));
++        memset(pass, 0, strlen (pass));
+         free(pass);
+         pass = NULL;
+     }
+diff --git a/support.c b/support.c
+index 3e55e2f..09d09bf 100644
+--- a/support.c
++++ b/support.c
+@@ -108,6 +108,43 @@ int converse(pam_handle_t * pamh, int nargs, const struct pam_message *message,
+     return retval;
+ }
+ 
++/*
++ * Ref: From <https://groups.google.com/g/mailing.unix.openssh-dev/c/ViHvtciKYh0>
++ * For future archive searchers:
++ * > Why does OpenSSH replaces the password entered by the user with the
++ * > bad password - "\b\n\r\177INCORRECT
++ *
++ * There are some situations where sshd determines a user can't log in.
++ * Typical samples of that are DenyUsers or PermitRootLogin.
++ * In those cases sshd *still* calls PAM, so that delays set by it are
++ * still performed to the user (without leaking info about accounts
++ * existing, disabled, etc.). But in order to ensure it can't succeed,
++ * replaces the password with that impossible one.
++ *
++ */
++int validate_not_sshd_bad_pass(const char *pass)
++{
++    const char *SSHD_BAD_PASS = "\010\012\015\177INCORRECT";
++    const int SSHD_BAD_PASS_LEN = strlen(SSHD_BAD_PASS);
++
++    int len = strlen(pass);
++    const char *p = pass;
++
++    if (len == 0)
++        return PAM_SUCCESS;
++
++    while (len > 0) {
++        int l = len < SSHD_BAD_PASS_LEN ? len : SSHD_BAD_PASS_LEN;
++
++        if (strncmp(p, SSHD_BAD_PASS, l) != 0)
++            return PAM_SUCCESS;
++
++        len -= l;
++        p += l;
++    }
++    return PAM_AUTH_ERR;
++}
++
+ /* stolen from pam_stress */
+ int tacacs_get_password (pam_handle_t * pamh, int flags
+     ,int ctrl, char **password) {
+diff --git a/support.h b/support.h
+index 09b8a85..cb04a4f 100644
+--- a/support.h
++++ b/support.h
+@@ -42,6 +42,7 @@ extern struct addrinfo *tac_source_addr;
+ int _pam_parse (int, const char **);
+ unsigned long _resolve_name (char *);
+ unsigned long _getserveraddr (char *serv);
++int validate_not_sshd_bad_pass(const char *pass);
+ int tacacs_get_password (pam_handle_t *, int, int, char **);
+ int converse (pam_handle_t *, int, const struct pam_message *, struct pam_response **);
+ void _pam_log (int, const char *, ...);
+diff --git a/tacc.c b/tacc.c
+index fcc7d8c..bf0f2a3 100644
+--- a/tacc.c
++++ b/tacc.c
+@@ -181,7 +181,7 @@ int main(int argc, char **argv) {
+ 				break;
+ 			case 'L':
+ 				// tac_login is a global variable initialized in libtac
+-				bzero(tac_login, sizeof(tac_login));
++				memset(tac_login, 0, sizeof(tac_login));
+ 				strncpy(tac_login, optarg, sizeof(tac_login) - 1);
+ 				break;
+ 			case 'p':
+@@ -312,7 +312,7 @@ int main(int argc, char **argv) {
+ 	}
+ 
+ 	/* we no longer need the password in our address space */
+-	bzero(pass, strlen(pass));
++	memset(pass, 0, strlen(pass));
+ 	pass = NULL;
+ 
+ 	if (do_account) {
+-- 
+2.17.1
+
diff --git a/src/tacacs/pam/Makefile b/src/tacacs/pam/Makefile
index 503bdcb864f0..843b75cc2f3d 100644
--- a/src/tacacs/pam/Makefile
+++ b/src/tacacs/pam/Makefile
@@ -20,6 +20,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git apply ../0004-management-vrf-support.patch
 	git apply ../0005-pam-Modify-parsing-of-IP-address-and-port-number-to-.patch
 	git apply ../0006-Add-support-for-source-ip-address.patch
+	git apply ../0007-handle-bad-password-set-by-sshd.patch
 
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd

From a5bf6fd874b67a407123f249032ee3c410972ba1 Mon Sep 17 00:00:00 2001
From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
Date: Tue, 23 Nov 2021 01:45:10 +0800
Subject: [PATCH 0920/1674] [sonic-utilities] submodule update (#9342)

Submodule update for sonic-utilities with following change:

ec9e5ee Backport [generate_dump] remove secrets from dump files #1886 to 202012 (#1938)
ce3b856 [fdbshow]: Handle FDB cleanup gracefully. (#1926)
1437bf2 [202012] Add DHCPv6 Relay counter and ipv6 helper CLI (#1917)
---
 .gitmodules         | 1 +
 src/sonic-utilities | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7b5e6b99df74..dab42c517d3e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,6 +35,7 @@
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
 	url = https://github.com/Azure/sonic-utilities
+	branch = 202012
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 09ebac5a7d9c..ec9e5ee37550 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 09ebac5a7d9cdd753525fe726f44d23dac9985ce
+Subproject commit ec9e5ee3755068a62b48b6242776b754197a8660

From 7fb0f3f89f3c0e43876edbc9928f4dc768638b9e Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 22 Nov 2021 11:06:12 -0800
Subject: [PATCH 0921/1674] [redis-py]: Fix redis version during pip3 install
 (#9329)

The recent release of redis 4.0.0 or newer (for python3) breaks sonic-config-engine unit test. Fix to last known good version.

ref: https://pypi.org/project/redis/#history
---
 sonic-slave-buster/Dockerfile.j2  | 2 +-
 sonic-slave-stretch/Dockerfile.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 5db98a58c8f5..3e8dad321cb7 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -426,7 +426,7 @@ RUN pip2 install "lxml==4.6.2"
 RUN pip3 install "lxml==4.6.2"
 
 # For sonic-platform-common testing
-RUN pip3 install redis
+RUN pip3 install redis==3.5.3
 
 # For vs image build
 RUN pip2 install pexpect==4.6.0
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 5933bc4ea016..2acaaf6c9cb6 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -354,7 +354,7 @@ RUN pip3 install "lxml==4.6.2"
 
 
 # For sonic-platform-common testing
-RUN pip3 install redis
+RUN pip3 install redis==3.5.3
 
 # For vs image build
 RUN pip2 install pexpect==4.6.0

From edd6b847e9b4100e4daf5417d3230de15669f942 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vivekreddykarri98@gmail.com>
Date: Mon, 22 Nov 2021 21:57:07 -0800
Subject: [PATCH 0922/1674] [hostcfgd] [202012] Fixed the brief blackout in
 hostcfgd using SubscriberStateTable   (#9228)

#### Why I did it
Backporting https://github.com/Azure/sonic-buildimage/pull/8861 to 202012
---
 src/sonic-host-services/scripts/hostcfgd      | 459 ++++++++++--------
 src/sonic-host-services/setup.py              |   3 +-
 .../tests/common/mock_configdb.py             |  85 ++++
 .../tests/hostcfgd/hostcfgd_test.py           | 187 ++++++-
 .../tests/hostcfgd/test_vectors.py            |  59 +++
 5 files changed, 562 insertions(+), 231 deletions(-)

diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 06506f483eb9..a14d4cf026c6 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -4,12 +4,15 @@ import ast
 import copy
 import ipaddress
 import os
+import sys
 import subprocess
 import syslog
+import signal
 
 import jinja2
 from sonic_py_common import device_info
-from swsscommon.swsscommon import ConfigDBConnector
+from swsscommon.swsscommon import SubscriberStateTable, DBConnector, Select
+from swsscommon.swsscommon import ConfigDBConnector, TableConsumable
 
 # FILE
 PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic"
@@ -23,6 +26,34 @@ TACPLUS_SERVER_PASSKEY_DEFAULT = ""
 TACPLUS_SERVER_TIMEOUT_DEFAULT = "5"
 TACPLUS_SERVER_AUTH_TYPE_DEFAULT = "pap"
 
+# MISC Constants
+CFG_DB = "CONFIG_DB"
+HOSTCFGD_MAX_PRI = 10  # Used to enforce ordering b/w daemons under Hostcfgd
+DEFAULT_SELECT_TIMEOUT = 1000
+
+
+def safe_eval(val, default_value=False):
+    """ Safely evaluate the expression, without raising an exception """
+    try:
+        ret = ast.literal_eval(val)
+    except ValueError:
+        ret = default_value
+    return ret
+
+
+def signal_handler(sig, frame):
+    if sig == signal.SIGHUP:
+        syslog.syslog(syslog.LOG_INFO, "HostCfgd: signal 'SIGHUP' is caught and ignoring..")
+    elif sig == signal.SIGINT:
+        syslog.syslog(syslog.LOG_INFO, "HostCfgd: signal 'SIGINT' is caught and exiting...")
+        sys.exit(128 + sig)
+    elif sig == signal.SIGTERM:
+        syslog.syslog(syslog.LOG_INFO, "HostCfgd: signal 'SIGTERM' is caught and exiting...")
+        sys.exit(128 + sig)
+    else:
+        syslog.syslog(syslog.LOG_INFO, "HostCfgd: invalid signal - ignoring..")
+
+
 def run_cmd(cmd, log_err = True):
     try:
         subprocess.check_call(cmd, shell = True)
@@ -31,6 +62,7 @@ def run_cmd(cmd, log_err = True):
             syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
                   .format(err.cmd, err.returncode, err.output))
 
+
 def is_true(val):
     if val == 'True' or val == 'true':
         return True
@@ -74,10 +106,6 @@ class Iptables(object):
         '''
         return (isinstance(key, tuple))
 
-    def load(self, lpbk_table):
-        for row in lpbk_table:
-            self.iptables_handler(row, lpbk_table[row])
-
     def command(self, chain, ip, ver, op):
         cmd = 'iptables' if ver == '4' else 'ip6tables'
         cmd += ' -t mangle --{} {} -p tcp --tcp-flags SYN SYN'.format(op, chain)
@@ -128,11 +156,8 @@ class Iptables(object):
 
         for cmd in iptables_cmds:
             syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
-            try:
-                subprocess.check_call(cmd, shell=True)
-            except subprocess.CalledProcessError as err:
-                syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
-                              .format(err.cmd, err.returncode, err.output))
+            run_cmd(cmd)
+
 
 class AaaCfg(object):
     def __init__(self):
@@ -248,19 +273,17 @@ class KdumpCfg(object):
                                 "num_dumps": "3" }
 
     def load(self, kdump_table):
-        syslog.syslog(syslog.LOG_INFO, "KdumpCfg load ...")
-        data = {}
+        """
+        Set the KDUMP table in CFG DB to kdump_defaults if not set by the user
+        """
+        syslog.syslog(syslog.LOG_INFO, "KdumpCfg init...")
         kdump_conf = kdump_table.get("config", {})
         for row in self.kdump_defaults:
             value = self.kdump_defaults.get(row)
-            if kdump_conf.get(row) is not None:
-                value = kdump_conf.get(row)
-            else:
+            if not kdump_conf.get(row):
                 self.config_db.mod_entry("KDUMP", "config", { row : value})
-            data[row] = value
-        self.kdump_update("config", data, True)
 
-    def kdump_update(self, key, data, isLoad):
+    def kdump_update(self, key, data):
         syslog.syslog(syslog.LOG_INFO, "Kdump global configuration update")
         if key == "config":
             # Admin mode
@@ -280,127 +303,109 @@ class KdumpCfg(object):
             memory = self.kdump_defaults["memory"]
             if data.get("memory") is not None:
                 memory = data.get("memory")
-            if isLoad or data.get("memory") is not None:
+            if data.get("memory") is not None:
                 run_cmd("sonic-kdump-config --memory " + memory)
 
             # Num dumps
             num_dumps = self.kdump_defaults["num_dumps"]
             if data.get("num_dumps") is not None:
                 num_dumps = data.get("num_dumps")
-            if isLoad or data.get("num_dumps") is not None:
+            if data.get("num_dumps") is not None:
                 run_cmd("sonic-kdump-config --num_dumps " + num_dumps)
 
+
 class NtpCfg(object):
-    def __init__(self, CfgDb):
-        self.config_db = CfgDb
+    """
+    NtpCfg Config Daemon
+    1) ntp-config.service handles the configuration updates and then starts ntp.service
+    2) Both of them start after all the feature services start
+    3) Purpose of this daemon is to propagate runtime config changes in
+       NTP, NTP_SERVER and LOOPBACK_INTERFACE
+    """
+    def __init__(self):
         self.ntp_global = {}
-        self.has_ntp_servers = False 
+        self.ntp_servers = set()
 
-    def load(self, ntp_global_conf, ntp_server_conf):
-        syslog.syslog(syslog.LOG_INFO, "NtpCfg load ...")
-
-        for row in ntp_global_conf:
-            self.ntp_global_update(row, ntp_global_conf[row], True)
-
-        self.ntp_server_update(0, ntp_server_conf, True)
-
-    def handle_ntp_source_intf_chg (self, key):
+    def handle_ntp_source_intf_chg(self, intf_name):
         # if no ntp server configured, do nothing
-        if self.has_ntp_servers == False:
+        if not self.ntp_servers:
             return
 
         # check only the intf configured as source interface
-        if (len(self.ntp_global) == 0):
-            return
-
-        if 'src_intf' not in self.ntp_global:
-            return
-
-        if key[0] != self.ntp_global['src_intf']:
+        if intf_name not in self.ntp_global.get('src_intf', '').split(';'):
             return
         else:
             # just restart ntp config
             cmd = 'systemctl restart ntp-config'
             run_cmd(cmd)
 
-    def ntp_global_update(self, key, data, isLoad):
-        syslog.syslog(syslog.LOG_INFO, "ntp global configuration update")
-
-        new_src = new_vrf = orig_src = orig_vrf = ""
-
-        if 'src_intf' in data:
-            new_src = data['src_intf']
-
-        if 'vrf' in data:
-            new_vrf = data['vrf']
-
-        if (len(self.ntp_global) != 0):
-
-            if 'src_intf' in self.ntp_global:
-                orig_src = self.ntp_global['src_intf']
-
-            if 'vrf' in self.ntp_global:
-                orig_vrf = self.ntp_global['vrf']
-
+    def ntp_global_update(self, key, data):
+        syslog.syslog(syslog.LOG_INFO, 'NTP GLOBAL Update')
+        orig_src = self.ntp_global.get('src_intf', '')
+        orig_src_set = set(orig_src.split(";"))
+        orig_vrf = self.ntp_global.get('vrf', '')
+
+        new_src = data.get('src_intf', '')
+        new_src_set = set(new_src.split(";"))
+        new_vrf = data.get('vrf', '')
+        
+        # Update the Local Cache
         self.ntp_global = data
 
-        # during initial load of ntp configuration, ntp server configuration decides if to restart ntp-config
-        if (isLoad):
-            syslog.syslog(syslog.LOG_INFO, "ntp global update in load")
-            return
-
         # check if ntp server configured, if not, do nothing
-        if self.has_ntp_servers == False:
-            syslog.syslog(syslog.LOG_INFO, "no ntp server when global config change, do nothing")
-            return
+        if not self.ntp_servers:
+            syslog.syslog(syslog.LOG_INFO, "No ntp server when global config change, do nothing")
+            return 
 
-        if (new_src != orig_src):
+        if orig_src_set != new_src_set:
             syslog.syslog(syslog.LOG_INFO, "ntp global update for source intf old {} new {}, restarting ntp-config"
-                          .format(orig_src, new_src))
+                          .format(orig_src_set, new_src_set))
             cmd = 'systemctl restart ntp-config'
             run_cmd(cmd)
-        else:
-            if (new_vrf != orig_vrf):
-                syslog.syslog(syslog.LOG_INFO, "ntp global update for vrf old {} new {}, restarting ntp service"
-                              .format(orig_vrf, new_vrf))
-                cmd = 'service ntp restart'
-                run_cmd(cmd)
-
-    def ntp_server_update(self, key, data, isLoad):
-        syslog.syslog(syslog.LOG_INFO, 'ntp server update key {} data {}'.format(key, data))
-
-        # during load, restart ntp-config regardless if ntp server is configured or not
-        if isLoad == True:
-            if data != {}:
-                self.has_ntp_servers = True
-        else:
-            # for runtime ntp server change, to determine if there is ntp server configured, need to
-            # get from configDB, as delete triggers 2 event handling 
-            ntp_servers_tbl = self.config_db.get_table('NTP_SERVER')
-            if ntp_servers_tbl != {}:
-                self.has_ntp_servers = True
-            else:
-                self.has_ntp_servers = False
+        elif new_vrf != orig_vrf:
+            syslog.syslog(syslog.LOG_INFO, "ntp global update for vrf old {} new {}, restarting ntp service"
+                            .format(orig_vrf, new_vrf))
+            cmd = 'service ntp restart'
+            run_cmd(cmd)
 
-        cmd = 'systemctl restart ntp-config'
-        syslog.syslog(syslog.LOG_INFO, 'ntp server update, restarting ntp-config, ntp server exists {}'.format(self.has_ntp_servers))
+    def ntp_server_update(self, key, op):
+        syslog.syslog(syslog.LOG_INFO, 'ntp server update key {}'.format(key))
 
-        run_cmd(cmd)
+        restart_config = False
+        if op == "SET" and key not in self.ntp_servers:
+            restart_config = True
+            self.ntp_servers.add(key)
+        elif op == "DEL" and key in self.ntp_servers:
+            restart_config = True
+            self.ntp_servers.remove(key)
+
+        if restart_config:
+            cmd = 'systemctl restart ntp-config'
+            syslog.syslog(syslog.LOG_INFO, 'ntp server update, restarting ntp-config, ntp servers configured {}'.format(self.ntp_servers))
+            run_cmd(cmd)
 
 
 class HostConfigDaemon:
     def __init__(self):
+        # Just a sanity check to verify if the CONFIG_DB has been initialized
+        # before moving forward
         self.config_db = ConfigDBConnector()
         self.config_db.connect(wait_for_init=True, retry_on=True)
+        self.dbconn = DBConnector(CFG_DB, 0)
+        self.selector = Select()
         syslog.syslog(syslog.LOG_INFO, 'ConfigDB connect success')
 
+        self.select = Select()
+        self.callbacks = dict()
+        self.subscriber_map = dict()
+
         # Load DEVICE metadata configurations
         self.device_config = {}
         self.device_config['DEVICE_METADATA'] = self.config_db.get_table('DEVICE_METADATA')
 
         self.aaacfg = AaaCfg()
         self.iptables = Iptables()
-        self.ntpcfg = NtpCfg(self.config_db)
+        self.ntpcfg = NtpCfg()
         # Cache the values of 'state' field in 'FEATURE' table of each container
         self.cached_feature_states = {}
 
@@ -410,34 +415,16 @@ class HostConfigDaemon:
         self.kdumpCfg = KdumpCfg(self.config_db)
         self.kdumpCfg.load(self.config_db.get_table('KDUMP'))
 
-
     def load(self):
         aaa = self.config_db.get_table('AAA')
         tacacs_global = self.config_db.get_table('TACPLUS')
         tacacs_server = self.config_db.get_table('TACPLUS_SERVER')
         self.aaacfg.load(aaa, tacacs_global, tacacs_server)
 
-        lpbk_table = self.config_db.get_table('LOOPBACK_INTERFACE')
-        self.iptables.load(lpbk_table)
-
-        # Load NTP configurations
-        ntp_server = self.config_db.get_table('NTP_SERVER')
-        ntp_global = self.config_db.get_table('NTP')
-        self.ntpcfg.load(ntp_global, ntp_server)
-
-    def get_target_state(self, feature_name, state):
-        template = jinja2.Template(state)
-        target_state = template.render(self.device_config)
-        entry = self.config_db.get_entry('FEATURE', feature_name)
-        entry["state"] = target_state
-        self.config_db.set_entry("FEATURE", feature_name, entry)
-
-        return target_state
-
-    def get_feature_attribute(self, feature_name, feature_table):
-        has_timer = ast.literal_eval(feature_table[feature_name].get('has_timer', 'False'))
-        has_global_scope = ast.literal_eval(feature_table[feature_name].get('has_global_scope', 'True'))
-        has_per_asic_scope = ast.literal_eval(feature_table[feature_name].get('has_per_asic_scope', 'False'))
+    def get_feature_attribute(self, feature_name, feature_cfg):
+        has_timer = safe_eval(feature_cfg.get('has_timer', 'False'))
+        has_global_scope = safe_eval(feature_cfg.get('has_global_scope', 'True'))
+        has_per_asic_scope = safe_eval(feature_cfg.get('has_per_asic_scope', 'False'))
 
         # Create feature name suffix depending feature is running in host or namespace or in both 
         feature_names = (
@@ -514,119 +501,135 @@ class HostConfigDaemon:
                     syslog.syslog(syslog.LOG_ERR, "Feature '{}' failed to be stopped and disabled".format(feature_name))
                     return
 
-    def is_invariant_feature(self, feature_name, state, feature_table):
-        invariant_feature = self.cached_feature_states[feature_name] == "always_enabled" or \
-                            self.cached_feature_states[feature_name] == "always_disabled"
-        if invariant_feature:
-            invariant_state = self.cached_feature_states[feature_name]
-            if state != invariant_state:
-                syslog.syslog(syslog.LOG_INFO, "Feature '{}' service is '{}'"
-                              .format(feature_name, invariant_state))
-                entry = self.config_db.get_entry('FEATURE', feature_name)
-                entry['state'] = invariant_state
-                self.config_db.set_entry('FEATURE', feature_name, entry)
-
-            if state == "always_disabled":
-                feature_names, feature_suffixes = self.get_feature_attribute(feature_name, feature_table)
-                self.disable_feature(feature_names, feature_suffixes)
-                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
-
-        return invariant_feature
-
-    def update_feature_state(self, feature_name, state, feature_table):
-        if not self.is_invariant_feature(feature_name, state, feature_table):
-            self.cached_feature_states[feature_name] = state
-
-            feature_names, feature_suffixes = self.get_feature_attribute(feature_name, feature_table)
-            if state == "enabled":
-                self.enable_feature(feature_names, feature_suffixes)
-                syslog.syslog(syslog.LOG_INFO, "Feature '{}.{}' is enabled and started"
-                              .format(feature_name, feature_suffixes[-1]))
-            elif state == "disabled":
-                self.disable_feature(feature_names, feature_suffixes)
-                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
-            else:
-                syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature '{}'"
-                              .format(state, feature_name))
+    def update_feature_state(self, feature_name, state, feature_cfg):
+        cached_feature_state = self.cached_feature_states.get(feature_name, None)
+        enable = False
+        disable = False
+
+        # Allowed transitions:
+        #  None           -> always_enabled
+        #                 -> always_disabled
+        #                 -> enabled
+        #                 -> disabled
+        #  always_enabled -> always_disabled
+        #  enabled        -> disabled
+        #  disabled       -> enabled
+        if cached_feature_state is None:
+            enable = state in ("always_enabled", "enabled")
+            disable = state in ("always_disabled", "disabled")
+        elif cached_feature_state in ("always_enabled", "always_disabled"):
+            disable = state == "always_disabled"
+            enable = state == "always_enabled"
+        elif cached_feature_state in ("enabled", "disabled"):
+            enable = state == "enabled"
+            disable = state == "disabled"
+        else:
+            syslog.syslog(syslog.LOG_INFO, "Feature {} service is {}".format(feature_name, cached_feature_state))
+            return False
 
-    def update_all_feature_states(self):
+        if not enable and not disable:
+            syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature {}"
+                          .format(state, feature_name))
+            return False
+
+        feature_names, feature_suffixes = self.get_feature_attribute(feature_name, feature_cfg)
+
+        if enable:
+            self.enable_feature(feature_names, feature_suffixes)
+            syslog.syslog(syslog.LOG_INFO, "Feature {} is enabled and started".format(feature_name))
+
+        if disable:
+            self.disable_feature(feature_names, feature_suffixes)
+            syslog.syslog(syslog.LOG_INFO, "Feature {} is stopped and disabled".format(feature_name))
+
+        return True
+
+    def render_all_feature_states(self):
+        """
+        Render the Template (if any) for the state field of the FEATURE Table.
+        Update the rendered state in the config db
+        """
         feature_table = self.config_db.get_table('FEATURE')
         for feature_name in feature_table:
             if not feature_name:
                 syslog.syslog(syslog.LOG_WARNING, "Feature is None")
                 continue
 
-            state = feature_table[feature_name]['state']
+            state = feature_table.get(feature_name, {}).get('state', '')
             if not state:
                 syslog.syslog(syslog.LOG_WARNING, "Enable state of feature '{}' is None".format(feature_name))
                 continue
 
-            target_state = self.get_target_state(feature_name, state)
-            # Store the initial value of 'state' field in 'FEATURE' table of a specific container
-            self.cached_feature_states[feature_name] = target_state
+            self.set_target_state(feature_name, state)
+    
+    def set_target_state(self, feature_name, state):
+        template = jinja2.Template(state)
+        target_state = template.render(self.device_config)
+        entry = self.config_db.get_entry('FEATURE', feature_name)
+        entry["state"] = target_state
+        self.config_db.set_entry("FEATURE", feature_name, entry)
 
-            self.update_feature_state(feature_name, target_state, feature_table)
+    def __get_intf_name(self, key):
+        if isinstance(key, tuple) and key:
+            intf = key[0]
+        else:
+            intf = key
+        return intf
 
-    def aaa_handler(self, key, data):
+    def aaa_handler(self, key, op, data):
         self.aaacfg.aaa_update(key, data)
+        syslog.syslog(syslog.LOG_INFO, 'AAA Update: key: {}, op: {}, data: {}'.format(key, op, data))
 
-    def tacacs_server_handler(self, key, data):
+    def tacacs_server_handler(self, key, op, data):
         self.aaacfg.tacacs_server_update(key, data)
         log_data = copy.deepcopy(data)
         if 'passkey' in log_data:
             log_data['passkey'] = obfuscate(log_data['passkey'])
-        syslog.syslog(syslog.LOG_INFO, 'value of {} changed to {}'.format(key, log_data))
+        syslog.syslog(syslog.LOG_INFO, 'TACPLUS_SERVER update: key: {}, op: {}, data: {}'.format(key, op, log_data))
 
-    def tacacs_global_handler(self, key, data):
+    def tacacs_global_handler(self, key, op, data):
         self.aaacfg.tacacs_global_update(key, data)
         log_data = copy.deepcopy(data)
         if 'passkey' in log_data:
             log_data['passkey'] = obfuscate(log_data['passkey'])
-        syslog.syslog(syslog.LOG_INFO, 'value of {} changed to {}'.format(key, log_data))
+        syslog.syslog(syslog.LOG_INFO, 'TACPLUS Global update: key: {}, op: {}, data: {}'.format(key, op, log_data))
 
-    def lpbk_handler(self, key, data):
+    def lpbk_handler(self, key, op, data):
         key = ConfigDBConnector.deserialize_key(key)
-        # Check if delete operation by fetch existing keys
-        keys = self.config_db.get_keys('LOOPBACK_INTERFACE')
-        if key in keys:
-            add = True
-        else:
+        if op == "DEL":
             add = False
-
+        else:
+            add = True
+        
         self.iptables.iptables_handler(key, data, add)
-        self.ntpcfg.handle_ntp_source_intf_chg(key)
-
-    def feature_state_handler(self, key, data):
-        feature_name = key
-        feature_table = self.config_db.get_table('FEATURE')
-        if feature_name not in feature_table:
-            syslog.syslog(syslog.LOG_WARNING, "Feature '{}' not in FEATURE table".format(feature_name))
-            return
-
-        state = feature_table[feature_name]['state']
+        lpbk_name = self.__get_intf_name(key)
+        self.ntpcfg.handle_ntp_source_intf_chg(lpbk_name)
+
+    def feature_state_handler(self, feature_name, op, feature_cfg):
+        if not feature_cfg:
+            syslog.syslog(syslog.LOG_WARNING, "Deregistering feature {}".format(feature_name))
+            self.cached_feature_states.pop(feature_name)
+        
+        state = feature_cfg.get("state", "")
         if not state:
             syslog.syslog(syslog.LOG_WARNING, "Enable state of feature '{}' is None".format(feature_name))
             return
 
-        self.cached_feature_states.setdefault(feature_name, 'disabled')
-
         # Enable/disable the container service if the feature state was changed from its previous state.
-        if self.cached_feature_states[feature_name] != state:
-            self.update_feature_state(feature_name, state, feature_table)
+        if self.cached_feature_states.get(feature_name, "") != state:
+            self.update_feature_state(feature_name, state, feature_cfg)
+        
+        self.cached_feature_states[feature_name] = state
 
-    def ntp_server_handler (self, key, data):
-        syslog.syslog(syslog.LOG_INFO, 'NTP server handler...')
-        ntp_server_db = self.config_db.get_table('NTP_SERVER')
-        data = ntp_server_db
-        self.ntpcfg.ntp_server_update(key, data, False)
+    def ntp_server_handler (self, key, op, data):
+        self.ntpcfg.ntp_server_update(key, op)
 
-    def ntp_global_handler (self, key, data):
-        syslog.syslog(syslog.LOG_INFO, 'NTP global handler...')
-        self.ntpcfg.ntp_global_update(key, data, False)
+    def ntp_global_handler (self, key, op, data):
+        self.ntpcfg.ntp_global_update(key, data)
 
-    def kdump_handler (self, key, data):
+    def kdump_handler (self, key, op, data):
         syslog.syslog(syslog.LOG_INFO, 'Kdump handler...')
-        self.kdumpCfg.kdump_update(key, data, False)
+        self.kdumpCfg.kdump_update(key, data)
 
     def wait_till_system_init_done(self):
 
@@ -635,36 +638,70 @@ class HostConfigDaemon:
         systemctl_cmd = "sudo systemctl is-system-running --wait --quiet"
         subprocess.call(systemctl_cmd, shell=True)
 
-    def start(self):
-
-        self.config_db.subscribe('AAA', lambda table, key, data: self.aaa_handler(key, data))
-        self.config_db.subscribe('TACPLUS_SERVER', lambda table, key, data: self.tacacs_server_handler(key, data))
-        self.config_db.subscribe('TACPLUS', lambda table, key, data: self.tacacs_global_handler(key, data))
-        self.config_db.subscribe('LOOPBACK_INTERFACE', lambda table, key, data: self.lpbk_handler(key, data))
-        self.config_db.subscribe('FEATURE', lambda table, key, data: self.feature_state_handler(key, data))
-        self.config_db.subscribe('NTP_SERVER', lambda table, key, data: self.ntp_server_handler(key, data))
-        self.config_db.subscribe('NTP', lambda table, key, data: self.ntp_global_handler(key, data))
-        self.config_db.subscribe('KDUMP', lambda table, key, data: self.kdump_handler(key, data))
-
+    def subscribe(self, table, callback, pri):
+        try:
+            if table not in self.callbacks:
+                self.callbacks[table] = []
+                subscriber = SubscriberStateTable(self.dbconn, table, TableConsumable.DEFAULT_POP_BATCH_SIZE, pri)
+                self.selector.addSelectable(subscriber) # Add to the Selector
+                self.subscriber_map[subscriber.getFd()] = (subscriber, table) # Maintain a mapping b/w subscriber & fd
+
+            self.callbacks[table].append(callback)
+        except Exception as err:
+            syslog.syslog(syslog.LOG_ERR, "Subscribe to table {} failed with error {}".format(table, err))
+
+    def register_callbacks(self):
+        self.subscribe('KDUMP', lambda table, key, op, data: self.kdump_handler(key, op, data), HOSTCFGD_MAX_PRI)
+        # Handle FEATURE updates before other tables
+        self.subscribe('FEATURE', lambda table, key, op, data: self.feature_state_handler(key, op, data), HOSTCFGD_MAX_PRI-1)
+        # Handle AAA and TACACS related tables
+        self.subscribe('AAA', lambda table, key, op, data: self.aaa_handler(key, op, data), HOSTCFGD_MAX_PRI-2)
+        self.subscribe('TACPLUS_SERVER', lambda table, key, op, data: self.tacacs_server_handler(key, op, data), HOSTCFGD_MAX_PRI-2)
+        self.subscribe('TACPLUS', lambda table, key, op, data: self.tacacs_global_handler(key, op, data), HOSTCFGD_MAX_PRI-2)
+        self.subscribe('LOOPBACK_INTERFACE', lambda table, key, op, data: self.lpbk_handler(key, op, data), HOSTCFGD_MAX_PRI-2)
+        # Handle NTP & NTP_SERVER updates
+        self.subscribe('NTP_SERVER', lambda table, key, op, data: self.ntp_server_handler(key, op, data), HOSTCFGD_MAX_PRI-3)
+        self.subscribe('NTP', lambda table, key, op, data: self.ntp_global_handler(key, op, data), HOSTCFGD_MAX_PRI-3)
+        
         syslog.syslog(syslog.LOG_INFO,
                       "Waiting for systemctl to finish initialization")
         self.wait_till_system_init_done()
         syslog.syslog(syslog.LOG_INFO,
                       "systemctl has finished initialization -- proceeding ...")
 
-        # Update all feature states once upon starting
-        self.update_all_feature_states()
-
-        # Defer load until subscribe
-        self.load()
+    def start(self):
+        while True:
+            state, selectable_ = self.selector.select(DEFAULT_SELECT_TIMEOUT)
+            if state == self.selector.TIMEOUT:
+                continue
+            elif state == self.selector.ERROR:
+                syslog.syslog(syslog.LOG_ERR,
+                        "error returned by select")
+                continue
 
-        self.config_db.listen()
+            fd = selectable_.getFd()
+            # Get the Corresponding subscriber & table
+            subscriber, table = self.subscriber_map.get(fd, (None, ""))
+            if not subscriber:
+                syslog.syslog(syslog.LOG_ERR,
+                        "No Subscriber object found for fd: {}, subscriber map: {}".format(fd, subscriber_map))
+                continue
+            key, op, fvs = subscriber.pop()
+            # Get the registered callback
+            cbs = self.callbacks.get(table, None)
+            for callback in cbs:
+                callback(table, key, op, dict(fvs))
 
 
 def main():
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGHUP, signal_handler)
     daemon = HostConfigDaemon()
+    daemon.render_all_feature_states()
+    daemon.register_callbacks()
+    daemon.load()
     daemon.start()
 
-
 if __name__ == "__main__":
     main()
diff --git a/src/sonic-host-services/setup.py b/src/sonic-host-services/setup.py
index 6d3add214fb8..0db779e8ddde 100644
--- a/src/sonic-host-services/setup.py
+++ b/src/sonic-host-services/setup.py
@@ -29,7 +29,8 @@
         'parameterized',
         'pytest',
         'pyfakefs',
-        'sonic-py-common'
+        'sonic-py-common',
+        'deepdiff'
     ],
     classifiers = [
         'Development Status :: 3 - Alpha',
diff --git a/src/sonic-host-services/tests/common/mock_configdb.py b/src/sonic-host-services/tests/common/mock_configdb.py
index 0866c2f5abfe..ce955ea86d05 100644
--- a/src/sonic-host-services/tests/common/mock_configdb.py
+++ b/src/sonic-host-services/tests/common/mock_configdb.py
@@ -12,6 +12,14 @@ def __init__(self, **kwargs):
     def set_config_db(test_config_db):
         MockConfigDb.CONFIG_DB = test_config_db
 
+    @staticmethod
+    def deserialize_key(key, separator="|"):
+        tokens = key.split(separator)
+        if len(tokens) > 1:
+            return tuple(tokens)
+        else:
+            return key
+
     @staticmethod
     def get_config_db():
         return MockConfigDb.CONFIG_DB
@@ -25,8 +33,85 @@ def get(self, db_id, key, field):
     def get_entry(self, key, field):
         return MockConfigDb.CONFIG_DB[key][field]
 
+    def mod_entry(self, key, field, data):
+        existing_data = self.get_entry(key, field)
+        existing_data.update(data)
+        self.set_entry(key, field, existing_data)
+
     def set_entry(self, key, field, data):
         MockConfigDb.CONFIG_DB[key][field] = data
 
     def get_table(self, table_name):
         return MockConfigDb.CONFIG_DB[table_name]
+
+class MockSelect():
+
+    event_queue = []
+
+    @staticmethod
+    def set_event_queue(Q):
+        MockSelect.event_queue = Q
+
+    @staticmethod
+    def get_event_queue():
+        return MockSelect.event_queue
+
+    @staticmethod
+    def reset_event_queue():
+        MockSelect.event_queue = []
+
+    def __init__(self):
+        self.sub_map = {}
+        self.TIMEOUT = "TIMEOUT"
+        self.ERROR = "ERROR"
+
+    def addSelectable(self, subscriber):
+        self.sub_map[subscriber.table] = subscriber
+
+    def select(self, TIMEOUT):
+        if not MockSelect.get_event_queue():
+            raise TimeoutError
+        table, key = MockSelect.get_event_queue().pop(0)
+        self.sub_map[table].nextKey(key)
+        return "OBJECT", self.sub_map[table]
+
+
+class MockSubscriberStateTable():
+
+    FD_INIT = 0
+
+    @staticmethod
+    def generate_fd():
+        curr = MockSubscriberStateTable.FD_INIT
+        MockSubscriberStateTable.FD_INIT = curr + 1
+        return curr
+
+    @staticmethod
+    def reset_fd():
+        MockSubscriberStateTable.FD_INIT = 0
+
+    def __init__(self, conn, table, pop, pri):
+        self.fd = MockSubscriberStateTable.generate_fd()
+        self.next_key = ''
+        self.table = table
+
+    def getFd(self):
+        return self.fd
+
+    def nextKey(self, key):
+        self.next_key = key
+
+    def pop(self):
+        table = MockConfigDb.CONFIG_DB.get(self.table, {})
+        if self.next_key not in table:
+            op = "DEL"
+            fvs = {}
+        else:
+            op = "SET"
+            fvs = table.get(self.next_key, {})
+        return self.next_key, op, fvs
+
+
+class MockDBConnector():
+    def __init__(self, db, val):
+        pass
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index 52737df91c18..1608f79e5960 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -1,16 +1,20 @@
 import os
 import sys
-import swsscommon
+import swsscommon as swsscommon_package
+from swsscommon import swsscommon
 
 from parameterized import parameterized
 from sonic_py_common.general import load_module_from_source
 from unittest import TestCase, mock
 
-from .test_vectors import HOSTCFGD_TEST_VECTOR
-from tests.common.mock_configdb import MockConfigDb
+from .test_vectors import HOSTCFGD_TEST_VECTOR, HOSTCFG_DAEMON_CFG_DB
+from tests.common.mock_configdb import MockConfigDb, MockSubscriberStateTable
+from tests.common.mock_configdb import MockSelect, MockDBConnector
 
+from pyfakefs.fake_filesystem_unittest import patchfs
+from deepdiff import DeepDiff
+from unittest.mock import call
 
-swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
 test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 modules_path = os.path.dirname(test_path)
 scripts_path = os.path.join(modules_path, "scripts")
@@ -19,7 +23,10 @@
 # Load the file under test
 hostcfgd_path = os.path.join(scripts_path, 'hostcfgd')
 hostcfgd = load_module_from_source('hostcfgd', hostcfgd_path)
-
+hostcfgd.ConfigDBConnector = MockConfigDb
+hostcfgd.SubscriberStateTable = MockSubscriberStateTable
+hostcfgd.Select = MockSelect
+hostcfgd.DBConnector = MockDBConnector
 
 class TestHostcfgd(TestCase):
     """
@@ -38,21 +45,13 @@ def __verify_table(self, table, expected_table):
             Returns:
                 None
         """
-        is_equal = len(table) == len(expected_table)
-        if is_equal:
-            for key, fields in expected_table.items():
-                is_equal = is_equal and key in table and len(fields) == len(table[key])
-                if is_equal:
-                    for field, value in fields.items():
-                        is_equal = is_equal and value == table[key][field]
-                        if not is_equal:
-                            break;
-                else:
-                    break
-        return is_equal
+        ddiff = DeepDiff(table, expected_table, ignore_order=True)
+        print('DIFF:', ddiff)
+        return True if not ddiff else False
 
     @parameterized.expand(HOSTCFGD_TEST_VECTOR)
-    def test_hostcfgd(self, test_name, test_data):
+    @patchfs
+    def test_hostcfgd(self, test_name, test_data, fs):
         """
             Test hostcfd daemon initialization
 
@@ -63,6 +62,8 @@ def test_hostcfgd(self, test_name, test_data):
             Returns:
                 None
         """
+        print(swsscommon_package.__path__)
+        fs.add_real_paths(swsscommon_package.__path__)  # add real path of swsscommon for database_config.json
         MockConfigDb.set_config_db(test_data["config_db"])
         with mock.patch("hostcfgd.subprocess") as mocked_subprocess:
             popen_mock = mock.Mock()
@@ -71,9 +72,157 @@ def test_hostcfgd(self, test_name, test_data):
             mocked_subprocess.Popen.return_value = popen_mock
 
             host_config_daemon = hostcfgd.HostConfigDaemon()
-            host_config_daemon.update_all_feature_states()
+            host_config_daemon.render_all_feature_states()
+
+            features = MockConfigDb.CONFIG_DB['FEATURE']
+            for key, fvs in features.items():
+                host_config_daemon.feature_state_handler(key, 'SET', fvs)
+
             assert self.__verify_table(
                 MockConfigDb.get_config_db()["FEATURE"],
                 test_data["expected_config_db"]["FEATURE"]
             ), "Test failed for test data: {0}".format(test_data)
             mocked_subprocess.check_call.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
+
+class TesNtpCfgd(TestCase):
+    """
+        Test hostcfd daemon - NtpCfgd
+    """
+    def setUp(self):
+        MockConfigDb.CONFIG_DB['NTP'] = {'global': {'vrf': 'mgmt', 'src_intf': 'eth0'}}
+        MockConfigDb.CONFIG_DB['NTP_SERVER'] = {'0.debian.pool.ntp.org': {}}
+
+    def tearDown(self):
+        MockConfigDb.CONFIG_DB = {}
+
+    def test_ntp_global_update_with_no_servers(self):
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
+            ntpcfgd = hostcfgd.NtpCfg()
+            ntpcfgd.ntp_global_update('global', MockConfigDb.CONFIG_DB['NTP']['global'])
+
+            mocked_subprocess.check_call.assert_not_called()
+
+    def test_ntp_global_update_ntp_servers(self):
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
+            ntpcfgd = hostcfgd.NtpCfg()
+            ntpcfgd.ntp_global_update('global', MockConfigDb.CONFIG_DB['NTP']['global'])
+            ntpcfgd.ntp_server_update('0.debian.pool.ntp.org', 'SET')
+            mocked_subprocess.check_call.assert_has_calls([call('systemctl restart ntp-config', shell=True)])
+
+    def test_loopback_update(self):
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
+            ntpcfgd = hostcfgd.NtpCfg()
+            ntpcfgd.ntp_global = MockConfigDb.CONFIG_DB['NTP']['global']
+            ntpcfgd.ntp_servers.add('0.debian.pool.ntp.org')
+
+            ntpcfgd.handle_ntp_source_intf_chg('eth0')
+            mocked_subprocess.check_call.assert_has_calls([call('systemctl restart ntp-config', shell=True)])
+
+
+class TestHostcfgdDaemon(TestCase):
+
+    def setUp(self):
+        MockConfigDb.set_config_db(HOSTCFG_DAEMON_CFG_DB)
+
+    def tearDown(self):
+        MockConfigDb.CONFIG_DB = {}
+
+    @patchfs
+    def test_feature_events(self, fs):
+        MockSelect.event_queue = [('FEATURE', 'dhcp_relay'),
+                                ('FEATURE', 'mux'),
+                                ('FEATURE', 'telemetry')]
+        daemon = hostcfgd.HostConfigDaemon()
+        daemon.render_all_feature_states()
+        daemon.register_callbacks()
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+            try:
+                daemon.start()
+            except TimeoutError:
+                pass
+            expected = [call('sudo systemctl unmask dhcp_relay.service', shell=True),
+                        call('sudo systemctl enable dhcp_relay.service', shell=True),
+                        call('sudo systemctl start dhcp_relay.service', shell=True),
+                        call('sudo systemctl unmask mux.service', shell=True),
+                        call('sudo systemctl enable mux.service', shell=True),
+                        call('sudo systemctl start mux.service', shell=True),
+                        call('sudo systemctl unmask telemetry.service', shell=True),
+                        call('sudo systemctl unmask telemetry.timer', shell=True),
+                        call('sudo systemctl enable telemetry.timer', shell=True),
+                        call('sudo systemctl start telemetry.timer', shell=True)]
+            mocked_subprocess.check_call.assert_has_calls(expected)
+
+            # Change the state to disabled
+            MockConfigDb.CONFIG_DB['FEATURE']['telemetry']['state'] = 'disabled'
+            MockSelect.event_queue = [('FEATURE', 'telemetry')]
+            try:
+                daemon.start()
+            except TimeoutError:
+                pass
+            expected = [call('sudo systemctl stop telemetry.timer', shell=True),
+                        call('sudo systemctl disable telemetry.timer', shell=True),
+                        call('sudo systemctl mask telemetry.timer', shell=True),
+                        call('sudo systemctl stop telemetry.service', shell=True),
+                        call('sudo systemctl disable telemetry.service', shell=True),
+                        call('sudo systemctl mask telemetry.service', shell=True)]
+            mocked_subprocess.check_call.assert_has_calls(expected)
+
+    def test_loopback_events(self):
+        MockConfigDb.set_config_db(HOSTCFG_DAEMON_CFG_DB)
+        MockSelect.event_queue = [('NTP', 'global'),
+                                  ('NTP_SERVER', '0.debian.pool.ntp.org'),
+                                  ('LOOPBACK_INTERFACE', 'Loopback0|10.184.8.233/32')]
+        daemon = hostcfgd.HostConfigDaemon()
+        daemon.register_callbacks()
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+            try:
+                daemon.start()
+            except TimeoutError:
+                pass
+            expected = [call('systemctl restart ntp-config', shell=True),
+            call('iptables -t mangle --append PREROUTING -p tcp --tcp-flags SYN SYN -d 10.184.8.233 -j TCPMSS --set-mss 1460', shell=True),
+            call('iptables -t mangle --append POSTROUTING -p tcp --tcp-flags SYN SYN -s 10.184.8.233 -j TCPMSS --set-mss 1460', shell=True)]
+            mocked_subprocess.check_call.assert_has_calls(expected, any_order=True)
+
+    def test_kdump_event(self):
+        MockConfigDb.set_config_db(HOSTCFG_DAEMON_CFG_DB)
+        daemon = hostcfgd.HostConfigDaemon()
+        daemon.register_callbacks()
+        assert MockConfigDb.CONFIG_DB['KDUMP']['config']
+        MockSelect.event_queue = [('KDUMP', 'config')]
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+            try:
+                daemon.start()
+            except TimeoutError:
+                pass
+            expected = [call('sonic-kdump-config --disable', shell=True),
+                        call('sonic-kdump-config --num_dumps 3', shell=True),
+                        call('sonic-kdump-config --memory 0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M', shell=True)]
+            mocked_subprocess.check_call.assert_has_calls(expected, any_order=True)
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/test_vectors.py b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
index 123a5512ad9d..439c3844cc3b 100644
--- a/src/sonic-host-services/tests/hostcfgd/test_vectors.py
+++ b/src/sonic-host-services/tests/hostcfgd/test_vectors.py
@@ -381,3 +381,62 @@
         }
     ]
 ]
+
+HOSTCFG_DAEMON_CFG_DB = {
+    "FEATURE": {
+        "dhcp_relay": {
+            "auto_restart": "enabled",
+            "has_global_scope": "True",
+            "has_per_asic_scope": "False",
+            "has_timer": "False",
+            "high_mem_alert": "disabled",
+            "set_owner": "kube",
+            "state": "{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != 'ToRRouter') %}enabled{% else %}disabled{% endif %}"
+        },
+        "mux": {
+            "auto_restart": "enabled",
+            "has_global_scope": "True",
+            "has_per_asic_scope": "False",
+            "has_timer": "False",
+            "high_mem_alert": "disabled",
+            "set_owner": "local",
+            "state": "{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}enabled{% else %}always_disabled{% endif %}"
+        },
+        "telemetry": {
+            "auto_restart": "enabled",
+            "has_global_scope": "True",
+            "has_per_asic_scope": "False",
+            "has_timer": "True",
+            "high_mem_alert": "disabled",
+            "set_owner": "kube",
+            "state": "enabled",
+            "status": "enabled"
+        },
+    },
+    "KDUMP": {
+        "config": {
+
+        }
+    },
+    "NTP": {
+        "global": {
+            "vrf": "default",
+            "src_intf": "eth0;Loopback0"
+        }
+    },
+    "NTP_SERVER": {
+        "0.debian.pool.ntp.org": {}
+    },
+    "LOOPBACK_INTERFACE": {
+        "Loopback0|10.184.8.233/32": {
+            "scope": "global",
+            "family": "IPv4"
+        }
+    },
+    "DEVICE_METADATA": {
+        "localhost": {
+            "subtype": "DualToR",
+            "type": "ToRRouter",
+        }
+    }
+}
\ No newline at end of file

From 2361e75cfbb7a099b6c04e9814fbc1d2a8c60163 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 24 Nov 2021 01:21:07 +0200
Subject: [PATCH 0923/1674] [hostcfgd] [202012] Fix the delay type to 'boot'
 delay instead of a unit activation delay (#8896)

#### Why I did it
With current code the delay will take place even if simple 'config reload' command executed and this is not desired.
This delay should be used only when fast-rebooting.

#### How I did it
Change the type of delay to OnBootSec instead of OnActiveSec.

#### How to verify it
Fast-reboot with this PR and observe the delay.
Run 'config-reload' command and observe no delay is running.
---
 .../debian/sonic-host-services-data.hostcfgd.timer             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
index baf80f4b4cbd..b45fd4b22f04 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
@@ -3,7 +3,8 @@ Description=Delays hostcfgd daemon until SONiC has started
 PartOf=hostcfgd.service
 
 [Timer]
-OnActiveSec=1min 30 sec
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
 Unit=hostcfgd.service
 
 [Install]

From 415fd176898716a6fa4d7c58c31393e14cc42bf1 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 23 Nov 2021 04:18:32 +0800
Subject: [PATCH 0924/1674] [Build]: Fix the version not found issue (#9331)

When we update the a sai package downing from a remote server, we need to update the version file as well currently, but the reproducible build feature is not enabled in master, it can only be detected when merging the code into the release branches, such as 202106, 202012, etc.
The reproducible feature is to reduce the build failure, not need to break the build when the version not specified. If version not specified, the best choice is to accept the version from remote server.

Co-authored-by: Ubuntu <xumia@xumia-vm1.jqzc3g5pdlluxln0vevsg3s20h.xx.internal.cloudapp.net>
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index cc3d7aedf8bc..0fbcd57393b3 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -82,8 +82,8 @@ download_packages()
                 local filename=$(echo $url | awk -F"/" '{print $NF}' | cut -d? -f1 | cut -d# -f1)
                 [ -f $WEB_VERSION_FILE ] && version=$(grep "^${url}=" $WEB_VERSION_FILE | awk -F"==" '{print $NF}')
                 if [ -z "$version" ]; then
-                    echo "Failed to verify the package: $url, the version is not specified" 2>&1
-                    exit 1
+                    echo "Warning: Failed to verify the package: $url, the version is not specified" 1>&2
+                    continue
                 fi
 
                 local version_filename="${filename}-${version}"

From d3a5c5ccd0b193525acee205c14a364c2c86a385 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:10:50 -0800
Subject: [PATCH 0925/1674] [202012][sonic-sairedis] update submodule (#9364)

Update sonic-sairedis submodule to get the below fixes:

7389704 [202012] Add ACL_TABLE object to break before make list (Azure/sonic-sairedis#971)
f334349 Fix hung issue when installing linux kernel modules (Azure/sonic-sairedis#969)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 07e1f79a8a13..738970496e1d 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 07e1f79a8a13d12e0e088401b9bb6bb6e73eeefe
+Subproject commit 738970496e1d9a0bfb6ebbd0be7a87e5b4963650

From 3e6cdfa3a6c0eac32a4575769b46b88f35053848 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zjsw1206@gmail.com>
Date: Wed, 24 Nov 2021 11:12:22 -0800
Subject: [PATCH 0926/1674] [sonic-linkmgrd] submodule update (#9343)

Submodule update for sonic-linkmgrd
Incorporates:

c11a576 (2021-11-22 09:38:46) [ci]: show code coverage in azure pipeline (#4)
4ceb01d (2021-11-18 20:24:20) Fix MUX toggling issue (#1)
d640527 (2021-11-12 22:31:44) [ci]: fix artifact download
b9f247d (2021-11-12 22:31:44) [ci]: use native arm64/armhf build
3059122 (2021-09-27 11:32:23) [linkgrd] Add Missing Apache License Header

signed-off-by: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 97cba3e90977..c11a5763a070 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 97cba3e909774f252394a30c826adbea32fe9132
+Subproject commit c11a5763a070a68af048ccd9ca473294f93fb256

From b1162682cbfcdf840e64b4089dfe7827a1624906 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 25 Nov 2021 07:36:14 +0800
Subject: [PATCH 0927/1674] [system-health] [202012] No longer check critical
 process/service status via monit (#9367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backport https://github.com/Azure/sonic-buildimage/pull/9068 to 202012

#### Why I did it

Command `monit summary -B` can no longer display the status for each critical process, system-health should not depend on it and need find a way to monitor the status of critical processes. The PR is to address that. monit is still used by system-health to do file system check as well as customize check.

#### How I did it

1.	Get container names from FEATURE table
2.	For each container, collect critical process names from file critical_processes
3.	Use “docker exec -it <container_name> bash -c ‘supervisorctl status’” to get processes status inside container, parse the output and check if any critical processes exit

#### How to verify it

1. Add unit test case to cover it
2. Adjust sonic-mgmt cases to cover it
3. Manual test
---
 rules/system-health.mk                        |   1 +
 src/system-health/health_checker/manager.py   |  21 +-
 .../health_checker/service_checker.py         | 287 ++++++++++++++-
 src/system-health/setup.py                    |   1 +
 .../tests/etc/supervisor/critical_processes   |   2 +
 .../system_health_monitoring_config.json      |  11 +
 src/system-health/tests/test_system_health.py | 330 +++++++++++++++++-
 7 files changed, 624 insertions(+), 29 deletions(-)
 create mode 100644 src/system-health/tests/etc/supervisor/critical_processes
 create mode 100644 src/system-health/tests/system_health_monitoring_config.json

diff --git a/rules/system-health.mk b/rules/system-health.mk
index bafc09daa70f..d4748ce1582d 100644
--- a/rules/system-health.mk
+++ b/rules/system-health.mk
@@ -4,6 +4,7 @@ SYSTEM_HEALTH = system_health-1.0-py3-none-any.whl
 $(SYSTEM_HEALTH)_SRC_PATH = $(SRC_PATH)/system-health
 $(SYSTEM_HEALTH)_PYTHON_VERSION = 3
 $(SYSTEM_HEALTH)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SWSSSDK_PY3) $(SONIC_CONFIG_ENGINE_PY3)
+$(SYSTEM_HEALTH)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 SONIC_PYTHON_WHEELS += $(SYSTEM_HEALTH)
 
 export system_health_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))"
diff --git a/src/system-health/health_checker/manager.py b/src/system-health/health_checker/manager.py
index f31e482e336a..f6bc31f874e5 100644
--- a/src/system-health/health_checker/manager.py
+++ b/src/system-health/health_checker/manager.py
@@ -1,3 +1,11 @@
+from . import utils
+from .config import Config
+from .health_checker import HealthChecker
+from .service_checker import ServiceChecker
+from .hardware_checker import HardwareChecker
+from .user_defined_checker import UserDefinedChecker
+
+
 class HealthCheckerManager(object):
     """
     Manage all system health checkers and system health configuration.
@@ -10,7 +18,6 @@ def __init__(self):
         self._checkers = []
         self._state = self.STATE_BOOTING
 
-        from .config import Config
         self.config = Config()
         self.initialize()
 
@@ -19,8 +26,6 @@ def initialize(self):
         Initialize the manager. Create service checker and hardware checker by default.
         :return:
         """
-        from .service_checker import ServiceChecker
-        from .hardware_checker import HardwareChecker
         self._checkers.append(ServiceChecker())
         self._checkers.append(HardwareChecker())
 
@@ -31,7 +36,6 @@ def check(self, chassis):
         :return: A tuple. The first element indicate the status of the checker; the second element is a dictionary that
         contains the status for all objects that was checked.
         """
-        from .health_checker import HealthChecker
         HealthChecker.summary = HealthChecker.STATUS_OK
         stats = {}
         self.config.load_config()
@@ -45,7 +49,6 @@ def check(self, chassis):
             self._do_check(checker, stats)
 
         if self.config.user_defined_checkers:
-            from .user_defined_checker import UserDefinedChecker
             for udc in self.config.user_defined_checkers:
                 checker = UserDefinedChecker(udc)
                 self._do_check(checker, stats)
@@ -71,11 +74,12 @@ def _do_check(self, checker, stats):
             else:
                 stats[category].update(info)
         except Exception as e:
-            from .health_checker import HealthChecker
+            HealthChecker.summary = HealthChecker.STATUS_NOT_OK
             error_msg = 'Failed to perform health check for {} due to exception - {}'.format(checker, repr(e))
             entry = {str(checker): {
                 HealthChecker.INFO_FIELD_OBJECT_STATUS: HealthChecker.STATUS_NOT_OK,
-                HealthChecker.INFO_FIELD_OBJECT_MSG: error_msg
+                HealthChecker.INFO_FIELD_OBJECT_MSG: error_msg,
+                HealthChecker.INFO_FIELD_OBJECT_TYPE: "Internal"
             }}
             if 'Internal' not in stats:
                 stats['Internal'] = entry
@@ -83,8 +87,7 @@ def _do_check(self, checker, stats):
                 stats['Internal'].update(entry)
 
     def _is_system_booting(self):
-        from .utils import get_uptime
-        uptime = get_uptime()
+        uptime = utils.get_uptime()
         if not self.boot_timeout:
             self.boot_timeout = self.config.get_bootup_timeout()
         booting = uptime < self.boot_timeout
diff --git a/src/system-health/health_checker/service_checker.py b/src/system-health/health_checker/service_checker.py
index a98e2d33c3ad..171f7e2e8b4d 100644
--- a/src/system-health/health_checker/service_checker.py
+++ b/src/system-health/health_checker/service_checker.py
@@ -1,12 +1,31 @@
+import docker
+import os
+import pickle
+import re
+
+from swsscommon import swsscommon
+from sonic_py_common import multi_asic
+from sonic_py_common.logger import Logger
 from .health_checker import HealthChecker
 from . import utils
 
+SYSLOG_IDENTIFIER = 'service_checker'
+logger = Logger(log_identifier=SYSLOG_IDENTIFIER)
+
 
 class ServiceChecker(HealthChecker):
     """
     Checker that checks critical system service status via monit service.
     """
 
+    # Cache file to save container_critical_processes
+    CRITICAL_PROCESS_CACHE = '/tmp/critical_process_cache'
+
+    CRITICAL_PROCESSES_PATH = 'etc/supervisor/critical_processes'
+
+    # Command to get merged directory of a container
+    GET_CONTAINER_FOLDER_CMD = 'docker inspect {} --format "{{{{.GraphDriver.Data.MergedDir}}}}"'
+
     # Command to query the status of monit service.
     CHECK_MONIT_SERVICE_CMD = 'systemctl is-active monit.service'
 
@@ -24,6 +43,160 @@ class ServiceChecker(HealthChecker):
 
     def __init__(self):
         HealthChecker.__init__(self)
+        self.container_critical_processes = {}
+        # Containers that has invalid critical_processes file
+        self.bad_containers = set()
+
+        self.container_feature_dict = {}
+
+        self.need_save_cache = False
+
+        self.load_critical_process_cache()
+
+    def get_expected_running_containers(self, feature_table):
+        """Get a set of containers that are expected to running on SONiC
+
+        Args:
+            feature_table (object): FEATURE table in CONFIG_DB
+
+        Returns:
+            expected_running_containers: A set of container names that are expected running
+            container_feature_dict: A dictionary {<container_name>:<feature_name>}
+        """
+        expected_running_containers = set()
+        container_feature_dict = {}
+        for feature_name, feature_entry in feature_table.items():
+            if feature_entry["state"] not in ["disabled", "always_disabled"]:
+                if multi_asic.is_multi_asic():
+                    if feature_entry["has_global_scope"] == "True":
+                        expected_running_containers.add(feature_name)
+                        container_feature_dict[feature_name] = feature_name
+                    if feature_entry["has_per_asic_scope"] == "True":
+                        num_asics = multi_asic.get_num_asics()
+                        for asic_id in range(num_asics):
+                            expected_running_containers.add(feature_name + str(asic_id))
+                            container_feature_dict[feature_name + str(asic_id)] = feature_name
+                else:
+                    expected_running_containers.add(feature_name)
+                    container_feature_dict[feature_name] = feature_name
+
+        return expected_running_containers, container_feature_dict
+
+    def get_current_running_containers(self):
+        """Get current running containers, if the running container is not in self.container_critical_processes,
+           try get the critical process list
+
+        Returns:
+            running_containers: A set of running container names
+        """
+        DOCKER_CLIENT = docker.DockerClient(base_url='unix://var/run/docker.sock')
+        running_containers = set()
+        ctrs = DOCKER_CLIENT.containers
+        try:
+            lst = ctrs.list(filters={"status": "running"})
+
+            for ctr in lst:
+                running_containers.add(ctr.name)
+                if ctr.name not in self.container_critical_processes:
+                    self.fill_critical_process_by_container(ctr.name)
+        except docker.errors.APIError as err:
+            logger.log_error("Failed to retrieve the running container list. Error: '{}'".format(err))
+
+        return running_containers
+
+    def get_critical_process_list_from_file(self, container, critical_processes_file):
+        """Read critical process name list from critical processes file
+
+        Args:
+            container (str): contianer name
+            critical_processes_file (str): critical processes file path
+
+        Returns:
+            critical_process_list: A list of critical process names
+        """
+        critical_process_list = []
+
+        with open(critical_processes_file, 'r') as file:
+            for line in file:
+                # Try to match a line like "program:<process_name>"
+                match = re.match(r"^\s*((.+):(.*))*\s*$", line)
+                if match is None:
+                    if container not in self.bad_containers:
+                        self.bad_containers.add(container)
+                        logger.log_error('Invalid syntax in critical_processes file of {}'.format(container))
+                    continue
+
+                identifier_key = match.group(2).strip()
+                identifier_value = match.group(3).strip()
+                if identifier_key == "program" and identifier_value:
+                    critical_process_list.append(identifier_value)
+
+        return critical_process_list
+
+    def fill_critical_process_by_container(self, container):
+        """Get critical process for a given container
+
+        Args:
+            container (str): container name
+        """
+        # Get container volumn folder
+        container_folder = self._get_container_folder(container)
+        if not container_folder:
+            logger.log_error('Failed to get container folder for {}'.format(container_folder))
+            return
+
+        if not os.path.exists(container_folder):
+            logger.log_error('Container folder does not exist: {}'.format(container_folder))
+            return
+
+        # Get critical_processes file path
+        critical_processes_file = os.path.join(container_folder, ServiceChecker.CRITICAL_PROCESSES_PATH)
+        if not os.path.isfile(critical_processes_file):
+            # Critical process file does not exist, the container has no critical processes.
+            logger.log_debug('Failed to get critical process file for {}, {} does not exist'.format(container, critical_processes_file))
+            self._update_container_critical_processes(container, [])
+            return
+
+        # Get critical process list from critical_processes
+        critical_process_list = self.get_critical_process_list_from_file(container, critical_processes_file)
+        self._update_container_critical_processes(container, critical_process_list)
+
+    def _update_container_critical_processes(self, container, critical_process_list):
+        self.container_critical_processes[container] = critical_process_list
+        self.need_save_cache = True
+
+    def _get_container_folder(self, container):
+        container_folder = utils.run_command(ServiceChecker.GET_CONTAINER_FOLDER_CMD.format(container))
+        if container_folder is None:
+            return container_folder
+
+        return container_folder.strip()
+
+    def save_critical_process_cache(self):
+        """Save self.container_critical_processes to a cache file
+        """
+        if not self.need_save_cache:
+            return
+
+        self.need_save_cache = False
+        if not self.container_critical_processes:
+            # if container_critical_processes is empty, don't save it
+            return
+
+        if os.path.exists(ServiceChecker.CRITICAL_PROCESS_CACHE):
+            # if cache file exists, remove it
+            os.remove(ServiceChecker.CRITICAL_PROCESS_CACHE)
+
+        with open(ServiceChecker.CRITICAL_PROCESS_CACHE, 'wb+') as f:
+            pickle.dump(self.container_critical_processes, f)
+
+    def load_critical_process_cache(self):
+        if not os.path.isfile(ServiceChecker.CRITICAL_PROCESS_CACHE):
+            # cache file does not exist
+            return
+
+        with open(ServiceChecker.CRITICAL_PROCESS_CACHE, 'rb') as f:
+            self.container_critical_processes = pickle.load(f)
 
     def reset(self):
         self._info = {}
@@ -31,16 +204,14 @@ def reset(self):
     def get_category(self):
         return 'Services'
 
-    def check(self, config):
+    def check_by_monit(self, config):
         """
-        Check critical system service status. Get and analyze the output of $CHECK_CMD, collect status for system, 
-        process and file system.
+        et and analyze the output of $CHECK_CMD, collect status for file system or customize checker if any.
         :param config: Health checker configuration.
         :return:
         """
-        self.reset()
-        output = utils.run_command(ServiceChecker.CHECK_MONIT_SERVICE_CMD).strip()
-        if output != 'active':
+        output = utils.run_command(ServiceChecker.CHECK_MONIT_SERVICE_CMD)
+        if not output or output.strip() != 'active':
             self.set_object_not_ok('Service', 'monit', 'monit service is not running')
             return
 
@@ -58,7 +229,7 @@ def check(self, config):
 
         for line in lines[2:]:
             name = line[0:status_begin].strip()
-            if config.ignore_services and name in config.ignore_services:
+            if config and config.ignore_services and name in config.ignore_services:
                 continue
             status = line[status_begin:type_begin].strip()
             service_type = line[type_begin:].strip()
@@ -70,3 +241,105 @@ def check(self, config):
             else:
                 self.set_object_ok(service_type, name)
         return
+
+    def check_services(self, config):
+        """Check status of critical services and critical processes
+
+        Args:
+            config (config.Config): Health checker configuration.
+        """
+        config_db = swsscommon.ConfigDBConnector()
+        config_db.connect()
+        feature_table = config_db.get_table("FEATURE")
+        expected_running_containers, self.container_feature_dict = self.get_expected_running_containers(feature_table)
+        current_running_containers = self.get_current_running_containers()
+
+        newly_disabled_containers = set(self.container_critical_processes.keys()).difference(expected_running_containers)
+        for newly_disabled_container in newly_disabled_containers:
+            self.container_critical_processes.pop(newly_disabled_container)
+
+        self.save_critical_process_cache()
+
+        not_running_containers = expected_running_containers.difference(current_running_containers)
+        for container in not_running_containers:
+            self.set_object_not_ok('Service', container, "Container '{}' is not running".format(container))
+
+        if not self.container_critical_processes:
+            # Critical process is empty, not expect
+            self.set_object_not_ok('Service', 'system', 'no critical process found')
+            return
+
+        for container, critical_process_list in self.container_critical_processes.items():
+            self.check_process_existence(container, critical_process_list, config, feature_table)
+
+        for bad_container in self.bad_containers:
+            self.set_object_not_ok('Service', bad_container, 'Syntax of critical_processes file is incorrect')
+
+    def check(self, config):
+        """Check critical system service status.
+
+        Args:
+            config (object): Health checker configuration.
+        """
+        self.reset()
+        self.check_by_monit(config)
+        self.check_services(config)
+
+
+    def _parse_supervisorctl_status(self, process_status):
+        """Expected input:
+            arp_update                       RUNNING   pid 67, uptime 1:03:56
+            buffermgrd                       RUNNING   pid 81, uptime 1:03:56
+
+        Args:
+            process_status (list): List of process status
+        """
+        data = {}
+        for line in process_status:
+            line = line.strip()
+            if not line:
+                continue
+            items = line.split()
+            if len(items) < 2:
+                continue
+            data[items[0].strip()] = items[1].strip()
+        return data
+
+    def check_process_existence(self, container_name, critical_process_list, config, feature_table):
+        """Check whether the process in the specified container is running or not.
+
+        Args:
+            container_name (str): Container name
+            critical_process_list (list): Critical processes
+            config (object): Health checker configuration.
+            feature_table (object): Feature table
+        """
+        feature_name = self.container_feature_dict[container_name]
+        if feature_name in feature_table:
+            # We look into the 'FEATURE' table to verify whether the container is disabled or not.
+            # If the container is diabled, we exit.
+            if ("state" in feature_table[feature_name]
+                    and feature_table[feature_name]["state"] not in ["disabled", "always_disabled"]):
+
+                # We are using supervisorctl status to check the critical process status. We cannot leverage psutil here because
+                # it not always possible to get process cmdline in supervisor.conf. E.g, cmdline of orchagent is "/usr/bin/orchagent",
+                # however, in supervisor.conf it is "/usr/bin/orchagent.sh"
+                cmd = 'docker exec {} bash -c "supervisorctl status"'.format(container_name)
+                process_status = utils.run_command(cmd)
+                if process_status is None:
+                    for process_name in critical_process_list:
+                        self.set_object_not_ok('Process', '{}:{}'.format(container_name, process_name), "'{}' is not running".format(process_name))
+                    return
+
+                process_status = self._parse_supervisorctl_status(process_status.strip().splitlines())
+                for process_name in critical_process_list:
+                    if config and config.ignore_services and process_name in config.ignore_services:
+                        continue
+
+                    # Sometimes process_name is in critical_processes file, but it is not in supervisor.conf, such process will not run in container.
+                    # and it is safe to ignore such process. E.g, radv. So here we only check those processes which are in process_status.
+                    if process_name in process_status:
+                        if process_status[process_name] != 'RUNNING':
+                            self.set_object_not_ok('Process', '{}:{}'.format(container_name, process_name), "'{}' is not running".format(process_name))
+                        else:
+                            self.set_object_ok('Process', '{}:{}'.format(container_name, process_name))
diff --git a/src/system-health/setup.py b/src/system-health/setup.py
index e8084701f08c..b06b557972d9 100644
--- a/src/system-health/setup.py
+++ b/src/system-health/setup.py
@@ -4,6 +4,7 @@
     'natsort',
     'sonic_py_common',
     'swsssdk>=2.0.1',
+    'docker'
 ]
 
 setup(
diff --git a/src/system-health/tests/etc/supervisor/critical_processes b/src/system-health/tests/etc/supervisor/critical_processes
new file mode 100644
index 000000000000..cff479d7fa11
--- /dev/null
+++ b/src/system-health/tests/etc/supervisor/critical_processes
@@ -0,0 +1,2 @@
+program:snmpd
+program:snmp-subagent
diff --git a/src/system-health/tests/system_health_monitoring_config.json b/src/system-health/tests/system_health_monitoring_config.json
new file mode 100644
index 000000000000..7284be7d163b
--- /dev/null
+++ b/src/system-health/tests/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": ["dummy_service"],
+    "devices_to_ignore": ["psu.voltage"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "orange",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}
diff --git a/src/system-health/tests/test_system_health.py b/src/system-health/tests/test_system_health.py
index 8fe8642b1014..4a6c4855072d 100644
--- a/src/system-health/tests/test_system_health.py
+++ b/src/system-health/tests/test_system_health.py
@@ -8,6 +8,7 @@
         2. HealthCheckerManager
         3. Config
 """
+import copy
 import os
 import sys
 import swsssdk
@@ -30,11 +31,21 @@
 from health_checker.service_checker import ServiceChecker
 from health_checker.user_defined_checker import UserDefinedChecker
 
+mock_supervisorctl_output = """
+snmpd                       RUNNING   pid 67, uptime 1:03:56
+snmp-subagent               EXITED    Oct 19 01:53 AM
+"""
 device_info.get_platform = MagicMock(return_value='unittest')
 
 
-def test_user_defined_checker():
-    utils.run_command = MagicMock(return_value='')
+def setup():
+    if os.path.exists(ServiceChecker.CRITICAL_PROCESS_CACHE):
+        os.remove(ServiceChecker.CRITICAL_PROCESS_CACHE)
+
+
+@patch('health_checker.utils.run_command')
+def test_user_defined_checker(mock_run):
+    mock_run.return_value = ''
 
     checker = UserDefinedChecker('')
     checker.check(None)
@@ -43,29 +54,195 @@ def test_user_defined_checker():
     checker.reset()
     assert len(checker._info) == 0
 
-    utils.run_command = MagicMock(return_value='\n\n\n')
+    mock_run.return_value = '\n\n\n'
     checker.check(None)
     assert checker._info[str(checker)][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
 
     valid_output = 'MyCategory\nDevice1:OK\nDevice2:Device2 is broken\n'
-    utils.run_command = MagicMock(return_value=valid_output)
+    mock_run.return_value = valid_output
     checker.check(None)
+    assert checker.get_category() == 'MyCategory'
     assert 'Device1' in checker._info
     assert 'Device2' in checker._info
     assert checker._info['Device1'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
     assert checker._info['Device2'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
 
 
-def test_service_checker():
-    return_value = ''
+@patch('swsscommon.swsscommon.ConfigDBConnector.connect', MagicMock())
+@patch('health_checker.service_checker.ServiceChecker._get_container_folder', MagicMock(return_value=test_path))
+@patch('sonic_py_common.multi_asic.is_multi_asic', MagicMock(return_value=False))
+@patch('docker.DockerClient')
+@patch('health_checker.utils.run_command')
+@patch('swsscommon.swsscommon.ConfigDBConnector')
+def test_service_checker_single_asic(mock_config_db, mock_run, mock_docker_client):
+    mock_db_data = MagicMock()
+    mock_get_table = MagicMock()
+    mock_db_data.get_table = mock_get_table
+    mock_config_db.return_value = mock_db_data
+    mock_get_table.return_value = {
+        'snmp': {
+            'state': 'enabled',
+            'has_global_scope': 'True',
+            'has_per_asic_scope': 'False',
+
+        }
+    }
+    mock_containers = MagicMock()
+    mock_snmp_container = MagicMock()
+    mock_snmp_container.name = 'snmp'
+    mock_containers.list = MagicMock(return_value=[mock_snmp_container])
+    mock_docker_client_object = MagicMock()
+    mock_docker_client.return_value = mock_docker_client_object
+    mock_docker_client_object.containers = mock_containers
+
+    mock_run.return_value = mock_supervisorctl_output
+
+    checker = ServiceChecker()
+    assert checker.get_category() == 'Services'
+    config = Config()
+    checker.check(config)
+    assert 'snmp:snmpd' in checker._info
+    assert checker._info['snmp:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+
+    assert 'snmp:snmp-subagent' in checker._info
+    assert checker._info['snmp:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+    mock_get_table.return_value = {
+        'new_service': {
+            'state': 'enabled',
+            'has_global_scope': 'True',
+            'has_per_asic_scope': 'False',
+        },
+        'snmp': {
+            'state': 'enabled',
+            'has_global_scope': 'True',
+            'has_per_asic_scope': 'False',
+
+        }
+    }
+    mock_ns_container = MagicMock()
+    mock_ns_container.name = 'new_service'
+    mock_containers.list = MagicMock(return_value=[mock_snmp_container, mock_ns_container])
+    checker.check(config)
+    assert 'new_service' in checker.container_critical_processes
+
+    assert 'new_service:snmpd' in checker._info
+    assert checker._info['new_service:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+
+    assert 'new_service:snmp-subagent' in checker._info
+    assert checker._info['new_service:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+    mock_containers.list = MagicMock(return_value=[mock_snmp_container])
+    checker.check(config)
+    assert 'new_service' in checker._info
+    assert checker._info['new_service'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+    mock_containers.list = MagicMock(return_value=[mock_snmp_container, mock_ns_container])
+    mock_run.return_value = None
+    checker.check(config)
+    assert 'new_service:snmpd' in checker._info
+    assert checker._info['new_service:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+    assert 'new_service:snmp-subagent' in checker._info
+    assert checker._info['new_service:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+    origin_container_critical_processes = copy.deepcopy(checker.container_critical_processes)
+    checker.save_critical_process_cache()
+    checker.load_critical_process_cache()
+    assert origin_container_critical_processes == checker.container_critical_processes
+
+
+
+@patch('swsscommon.swsscommon.ConfigDBConnector.connect', MagicMock())
+@patch('health_checker.service_checker.ServiceChecker._get_container_folder', MagicMock(return_value=test_path))
+@patch('health_checker.utils.run_command', MagicMock(return_value=mock_supervisorctl_output))
+@patch('sonic_py_common.multi_asic.get_num_asics', MagicMock(return_value=3))
+@patch('sonic_py_common.multi_asic.is_multi_asic', MagicMock(return_value=True))
+@patch('sonic_py_common.multi_asic.get_namespace_list', MagicMock(return_value=[str(x) for x in range(3)]))
+@patch('sonic_py_common.multi_asic.get_current_namespace', MagicMock(return_value=''))
+@patch('docker.DockerClient')
+@patch('swsscommon.swsscommon.ConfigDBConnector')
+def test_service_checker_multi_asic(mock_config_db, mock_docker_client):
+    mock_db_data = MagicMock()
+    mock_db_data.get_table = MagicMock()
+    mock_config_db.return_value = mock_db_data
+
+    mock_db_data.get_table.return_value = {
+        'snmp': {
+            'state': 'enabled',
+            'has_global_scope': 'True',
+            'has_per_asic_scope': 'True',
+
+        }
+    }
+
+    mock_containers = MagicMock()
+    mock_snmp_container = MagicMock()
+    mock_snmp_container.name = 'snmp'
+    list_return_value = [mock_snmp_container]
+    for i in range(3):
+        mock_container = MagicMock()
+        mock_container.name = 'snmp' + str(i)
+        list_return_value.append(mock_container)
+
+    mock_containers.list = MagicMock(return_value=list_return_value)
+    mock_docker_client_object = MagicMock()
+    mock_docker_client.return_value = mock_docker_client_object
+    mock_docker_client_object.containers = mock_containers
 
-    def mock_run_command(cmd):
-        if cmd == ServiceChecker.CHECK_MONIT_SERVICE_CMD:
-            return 'active'
-        else:
-            return return_value
+    checker = ServiceChecker()
 
-    utils.run_command = mock_run_command
+    config = Config()
+    checker.check(config)
+    assert 'snmp' in checker.container_critical_processes
+    assert 'snmp:snmpd' in checker._info
+    assert checker._info['snmp:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+    assert 'snmp0:snmpd' in checker._info
+    assert checker._info['snmp0:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+    assert 'snmp1:snmpd' in checker._info
+    assert checker._info['snmp1:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+    assert 'snmp2:snmpd' in checker._info
+    assert checker._info['snmp2:snmpd'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_OK
+
+    assert 'snmp:snmp-subagent' in checker._info
+    assert checker._info['snmp:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+    assert 'snmp0:snmp-subagent' in checker._info
+    assert checker._info['snmp0:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+    assert 'snmp1:snmp-subagent' in checker._info
+    assert checker._info['snmp1:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+    assert 'snmp2:snmp-subagent' in checker._info
+    assert checker._info['snmp2:snmp-subagent'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+
+@patch('swsscommon.swsscommon.ConfigDBConnector', MagicMock())
+@patch('swsscommon.swsscommon.ConfigDBConnector.connect', MagicMock())
+@patch('health_checker.service_checker.ServiceChecker.check_by_monit', MagicMock())
+@patch('docker.DockerClient')
+@patch('swsscommon.swsscommon.ConfigDBConnector.get_table')
+def test_service_checker_no_critical_process(mock_get_table, mock_docker_client):
+    mock_get_table.return_value = {
+        'snmp': {
+            'state': 'enabled',
+            'has_global_scope': 'True',
+            'has_per_asic_scope': 'True',
+
+        }
+    }
+    mock_containers = MagicMock()
+    mock_containers.list = MagicMock(return_value=[])
+    mock_docker_client_object = MagicMock()
+    mock_docker_client.return_value = mock_docker_client_object
+    mock_docker_client_object.containers = mock_containers
+
+    checker = ServiceChecker()
+    config = Config()
+    checker.check(config)
+    assert 'system' in checker._info
+    assert checker._info['system'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+@patch('health_checker.service_checker.ServiceChecker.check_services', MagicMock())
+@patch('health_checker.utils.run_command')
+def test_service_checker_check_by_monit(mock_run):
     return_value = 'Monit 5.20.0 uptime: 3h 54m\n' \
                    'Service Name                     Status                      Type\n' \
                    'sonic                            Running                     System\n' \
@@ -74,7 +251,7 @@ def mock_run_command(cmd):
                    'orchagent                        Running                     Process\n' \
                    'root-overlay                     Accessible                  Filesystem\n' \
                    'var-log                          Is not accessible           Filesystem\n'
-
+    mock_run.side_effect = ['active', return_value]
     checker = ServiceChecker()
     config = Config()
     checker.check(config)
@@ -185,6 +362,7 @@ def test_hardware_checker():
     })
 
     checker = HardwareChecker()
+    assert checker.get_category() == 'Hardware'
     config = Config()
     checker.check(config)
 
@@ -217,3 +395,129 @@ def test_hardware_checker():
 
     assert 'PSU 5' in checker._info
     assert checker._info['PSU 5'][HealthChecker.INFO_FIELD_OBJECT_STATUS] == HealthChecker.STATUS_NOT_OK
+
+
+def test_config():
+    config = Config()
+    config._config_file = os.path.join(test_path, Config.CONFIG_FILE)
+
+    assert config.config_file_exists()
+    config.load_config()
+    assert config.interval == 60
+    assert 'dummy_service' in config.ignore_services
+    assert 'psu.voltage' in config.ignore_devices
+    assert len(config.user_defined_checkers) == 0
+
+    assert config.get_led_color('fault') == 'orange'
+    assert config.get_led_color('normal') == 'green'
+    assert config.get_led_color('booting') == 'orange_blink'
+    assert config.get_bootup_timeout() == 300
+
+    config._reset()
+    assert not config.ignore_services
+    assert not config.ignore_devices
+    assert not config.user_defined_checkers
+    assert not config.config_data
+
+    assert config.get_led_color('fault') == 'red'
+    assert config.get_led_color('normal') == 'green'
+    assert config.get_led_color('booting') == 'orange_blink'
+
+    config._last_mtime  = 1
+    config._config_file = 'notExistFile'
+    config.load_config()
+    assert not config._last_mtime
+
+
+@patch('swsscommon.swsscommon.ConfigDBConnector', MagicMock())
+@patch('swsscommon.swsscommon.ConfigDBConnector.connect', MagicMock())
+@patch('health_checker.service_checker.ServiceChecker.check', MagicMock())
+@patch('health_checker.hardware_checker.HardwareChecker.check', MagicMock())
+@patch('health_checker.user_defined_checker.UserDefinedChecker.check', MagicMock())
+@patch('swsscommon.swsscommon.ConfigDBConnector.get_table', MagicMock())
+@patch('health_checker.user_defined_checker.UserDefinedChecker.get_category', MagicMock(return_value='UserDefine'))
+@patch('health_checker.user_defined_checker.UserDefinedChecker.get_info')
+@patch('health_checker.service_checker.ServiceChecker.get_info')
+@patch('health_checker.hardware_checker.HardwareChecker.get_info')
+@patch('health_checker.utils.get_uptime')
+def test_manager(mock_uptime, mock_hw_info, mock_service_info, mock_udc_info):
+    chassis = MagicMock()
+    chassis.set_status_led = MagicMock()
+
+    manager = HealthCheckerManager()
+    manager.config.user_defined_checkers = ['some check']
+    assert manager._state == HealthCheckerManager.STATE_BOOTING
+    assert len(manager._checkers) == 2
+
+    mock_uptime.return_value = 200
+    assert manager._is_system_booting()
+    state, stat = manager.check(chassis)
+    assert state == HealthCheckerManager.STATE_BOOTING
+    assert len(stat) == 0
+    chassis.set_status_led.assert_called_with('orange_blink')
+
+    mock_uptime.return_value = 500
+    assert not manager._is_system_booting()
+    assert manager._state == HealthCheckerManager.STATE_RUNNING
+    mock_hw_info.return_value = {
+        'ASIC': {
+            'type': 'ASIC',
+            'message': '',
+            'status': 'OK'
+        },
+        'fan1': {
+            'type': 'Fan',
+            'message': '',
+            'status': 'OK'
+        },
+    }
+    mock_service_info.return_value = {
+        'snmp:snmpd': {
+            'type': 'Process',
+            'message': '',
+            'status': 'OK'
+        }
+    }
+    mock_udc_info.return_value = {
+        'udc': {
+            'type': 'Database',
+            'message': '',
+            'status': 'OK'
+        }
+    }
+    state, stat = manager.check(chassis)
+    assert state == HealthCheckerManager.STATE_RUNNING
+    assert 'Services' in stat
+    assert stat['Services']['snmp:snmpd']['status'] == 'OK'
+
+    assert 'Hardware' in stat
+    assert stat['Hardware']['ASIC']['status'] == 'OK'
+    assert stat['Hardware']['fan1']['status'] == 'OK'
+
+    assert 'UserDefine' in stat
+    assert stat['UserDefine']['udc']['status'] == 'OK'
+
+    mock_hw_info.side_effect = RuntimeError()
+    mock_service_info.side_effect = RuntimeError()
+    mock_udc_info.side_effect = RuntimeError()
+    state, stat = manager.check(chassis)
+    assert 'Internal' in stat
+    assert stat['Internal']['ServiceChecker']['status'] == 'Not OK'
+    assert stat['Internal']['HardwareChecker']['status'] == 'Not OK'
+    assert stat['Internal']['UserDefinedChecker - some check']['status'] == 'Not OK'
+
+    chassis.set_status_led.side_effect = NotImplementedError()
+    manager._set_system_led(chassis, manager.config, 'normal')
+
+    chassis.set_status_led.side_effect = RuntimeError()
+    manager._set_system_led(chassis, manager.config, 'normal')
+
+def test_utils():
+    output = utils.run_command('some invalid command')
+    assert not output
+
+    output = utils.run_command('ls')
+    assert output
+
+    uptime = utils.get_uptime()
+    assert uptime > 0

From d9fd39538bb328fab6bafce364145734d16238ba Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 30 Nov 2021 16:54:40 +0800
Subject: [PATCH 0928/1674] Support dpkg cache for marvell-armhf (#9381)

Why I did it
Support marvell-armhf dpkg cache
---
 platform/marvell-armhf/docker-saiserver-mrvl.dep |  8 ++++++++
 platform/marvell-armhf/docker-syncd-mrvl-rpc.dep |  8 ++++++++
 platform/marvell-armhf/docker-syncd-mrvl.dep     | 10 ++++++++++
 platform/marvell-armhf/libsaithrift-dev.dep      | 11 +++++++++++
 platform/marvell-armhf/one-image.dep             |  1 +
 platform/marvell-armhf/platform-et6448m.dep      |  8 ++++++++
 platform/marvell-armhf/platform-nokia.dep        |  8 ++++++++
 platform/marvell-armhf/prestera.dep              |  8 ++++++++
 platform/marvell-armhf/rules.dep                 |  9 +++++++++
 platform/marvell-armhf/sai.dep                   |  9 +++++++++
 10 files changed, 80 insertions(+)
 create mode 100644 platform/marvell-armhf/docker-saiserver-mrvl.dep
 create mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc.dep
 create mode 100644 platform/marvell-armhf/docker-syncd-mrvl.dep
 create mode 100644 platform/marvell-armhf/libsaithrift-dev.dep
 create mode 100644 platform/marvell-armhf/one-image.dep
 create mode 100644 platform/marvell-armhf/platform-et6448m.dep
 create mode 100644 platform/marvell-armhf/platform-nokia.dep
 create mode 100644 platform/marvell-armhf/prestera.dep
 create mode 100644 platform/marvell-armhf/rules.dep
 create mode 100644 platform/marvell-armhf/sai.dep

diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.dep b/platform/marvell-armhf/docker-saiserver-mrvl.dep
new file mode 100644
index 000000000000..73851b9bf3ec
--- /dev/null
+++ b/platform/marvell-armhf/docker-saiserver-mrvl.dep
@@ -0,0 +1,8 @@
+DPATH       := $($(DOCKER_SAISERVER_MRVL)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-saiserver-mrvl.mk platform/marvell-armhf/docker-saiserver-mrvl.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_SAISERVER_MRVL)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_SAISERVER_MRVL)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_SAISERVER_MRVL)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep b/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep
new file mode 100644
index 000000000000..957d3f9e7ab0
--- /dev/null
+++ b/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep
@@ -0,0 +1,8 @@
+DPATH       := $($(DOCKER_SYNCD_MRVL_RPC)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_SYNCD_MRVL_RPC)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_SYNCD_MRVL_RPC)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_SYNCD_MRVL_RPC)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/marvell-armhf/docker-syncd-mrvl.dep b/platform/marvell-armhf/docker-syncd-mrvl.dep
new file mode 100644
index 000000000000..2aaef3b506f9
--- /dev/null
+++ b/platform/marvell-armhf/docker-syncd-mrvl.dep
@@ -0,0 +1,10 @@
+DPATH       := $($(DOCKER_SYNCD_BASE)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-syncd-mrvl.mk platform/marvell-armhf/docker-syncd-mrvl.dep platform/marvell-armhf/sai.mk
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_SYNCD_BASE)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_SYNCD_BASE)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_SYNCD_BASE)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_SYNCD_BASE),$(DOCKER_SYNCD_BASE_DBG)))
diff --git a/platform/marvell-armhf/libsaithrift-dev.dep b/platform/marvell-armhf/libsaithrift-dev.dep
new file mode 100644
index 000000000000..be9da37e8d0a
--- /dev/null
+++ b/platform/marvell-armhf/libsaithrift-dev.dep
@@ -0,0 +1,11 @@
+SPATH       := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/libsaithrift-dev.mk platform/marvell-armhf/libsaithrift-dev.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_PATHS := $(SPATH)  $(SPATH)/bm/behavioral-model  $(SPATH)/test/ptf  $(SPATH)/test/saithrift/ctypesgen
+$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) &&  git ls-files | grep -Ev " " )))))
+
+$(LIBSAITHRIFT_DEV)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(LIBSAITHRIFT_DEV)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(LIBSAITHRIFT_DEV)_DEP_FILES   := $(DEP_FILES)
+$(LIBSAITHRIFT_DEV)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path)))
+$(LIBSAITHRIFT_DEV)_SMDEP_PATHS := $(SMDEP_PATHS)
diff --git a/platform/marvell-armhf/one-image.dep b/platform/marvell-armhf/one-image.dep
new file mode 100644
index 000000000000..154112a82abc
--- /dev/null
+++ b/platform/marvell-armhf/one-image.dep
@@ -0,0 +1 @@
+$(SONIC_ONE_IMAGE)_CACHE_MODE  := none
diff --git a/platform/marvell-armhf/platform-et6448m.dep b/platform/marvell-armhf/platform-et6448m.dep
new file mode 100644
index 000000000000..5f7e41d1f745
--- /dev/null
+++ b/platform/marvell-armhf/platform-et6448m.dep
@@ -0,0 +1,8 @@
+MPATH       := $($(ET6448M_PLATFORM)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-et6448m.mk platform/marvell-armhf/platform-et6448m.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(MPATH))
+
+$(ET6448M_PLATFORM)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(ET6448M_PLATFORM)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(ET6448M_PLATFORM)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/marvell-armhf/platform-nokia.dep b/platform/marvell-armhf/platform-nokia.dep
new file mode 100644
index 000000000000..752a2016b6c5
--- /dev/null
+++ b/platform/marvell-armhf/platform-nokia.dep
@@ -0,0 +1,8 @@
+MPATH       := $($(NOKIA_7215_PLATFORM)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-nokia.mk platform/marvell-armhf/platform-nokia.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(MPATH))
+
+$(NOKIA_7215_PLATFORM)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(NOKIA_7215_PLATFORM)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(NOKIA_7215_PLATFORM)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/marvell-armhf/prestera.dep b/platform/marvell-armhf/prestera.dep
new file mode 100644
index 000000000000..4fd2883b1193
--- /dev/null
+++ b/platform/marvell-armhf/prestera.dep
@@ -0,0 +1,8 @@
+MPATH       := $($(MRVL_PRESTERA_DEB)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/prestera.mk platform/marvell-armhf/prestera.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(MPATH))
+
+$(MRVL_PRESTERA_DEB)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(MRVL_PRESTERA_DEB)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(MRVL_PRESTERA_DEB)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/marvell-armhf/rules.dep b/platform/marvell-armhf/rules.dep
new file mode 100644
index 000000000000..427219b355d6
--- /dev/null
+++ b/platform/marvell-armhf/rules.dep
@@ -0,0 +1,9 @@
+include $(PLATFORM_PATH)/sai.dep
+include $(PLATFORM_PATH)/prestera.dep
+include $(PLATFORM_PATH)/docker-syncd-mrvl.dep
+include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep
+include $(PLATFORM_PATH)/docker-saiserver-mrvl.dep
+include $(PLATFORM_PATH)/libsaithrift-dev.dep
+include $(PLATFORM_PATH)/platform-et6448m.dep
+include $(PLATFORM_PATH)/platform-nokia.dep
+include $(PLATFORM_PATH)/one-image.dep
diff --git a/platform/marvell-armhf/sai.dep b/platform/marvell-armhf/sai.dep
new file mode 100644
index 000000000000..d14927cdde20
--- /dev/null
+++ b/platform/marvell-armhf/sai.dep
@@ -0,0 +1,9 @@
+SPATH       := $($(MRVL_SAI)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/sai.mk platform/marvell-armhf/sai.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES	+= $(shell git ls-files $(SPATH))
+SMDEP_PATHS := $(SPATH)
+
+$(MRVL_SAI)_CACHE_MODE  := GIT_CONTENT_SHA
+$(MRVL_SAI)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(MRVL_SAI)_DEP_FILES   := $(DEP_FILES)

From 227f2f8aec9c995045a545ba289c58e3e48c5868 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 24 Nov 2021 20:56:00 +0800
Subject: [PATCH 0929/1674] [Mellanox] Fan speed should not be 100% when PSU is
 powered off (#9258)

- Why I did it
When PSU is powered off, the PSU is still on the switch and the air flow is still the same. In this case, it is not necessary to set FAN speed to 100%.

- How I did it
When PSU is powered of, don't treat it as absent.

- How to verify it
Adjust existing unit test case
Add new case in sonic-mgmt
---
 .../sonic_platform/thermal_infos.py                |  6 +++---
 .../mlnx-platform-api/tests/test_thermal_policy.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
index df262557c417..983e788c961c 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
@@ -45,7 +45,7 @@ def collect(self, chassis):
                 elif status and fan in self._fault_fans:
                     self._fault_fans.remove(fan)
                     self._status_changed = True
-                    
+
 
     def get_absence_fans(self):
         """
@@ -96,12 +96,12 @@ def collect(self, chassis):
         """
         self._status_changed = False
         for psu in chassis.get_all_psus():
-            if psu.get_presence() and psu.get_powergood_status() and psu not in self._presence_psus:
+            if psu.get_presence() and psu not in self._presence_psus:
                 self._presence_psus.add(psu)
                 self._status_changed = True
                 if psu in self._absence_psus:
                     self._absence_psus.remove(psu)
-            elif (not psu.get_presence() or not psu.get_powergood_status()) and psu not in self._absence_psus:
+            elif (not psu.get_presence()) and psu not in self._absence_psus:
                 self._absence_psus.add(psu)
                 self._status_changed = True
                 if psu in self._presence_psus:
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
index e2fb26cf6083..ed656ddd5102 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
@@ -81,9 +81,9 @@ def test_psu_info():
 
     psu_list[0].powergood = False
     psu_info.collect(chassis)
-    assert len(psu_info.get_absence_psus()) == 1
-    assert len(psu_info.get_presence_psus()) == 0
-    assert psu_info.is_status_changed()
+    assert len(psu_info.get_absence_psus()) == 0
+    assert len(psu_info.get_presence_psus()) == 1
+    assert not psu_info.is_status_changed()
 
 
 def test_fan_policy(thermal_manager):
@@ -324,12 +324,12 @@ def test_load_control_thermal_algo_action():
     json_str = '{\"status\": \"false\"}'
     json_obj = json.loads(json_str)
     action.load_from_json(json_obj)
-    assert not action.status 
+    assert not action.status
 
     json_str = '{\"status\": \"true\"}'
     json_obj = json.loads(json_str)
     action.load_from_json(json_obj)
-    assert action.status 
+    assert action.status
 
     json_str = '{\"status\": \"invalid\"}'
     json_obj = json.loads(json_str)
@@ -428,7 +428,7 @@ class MockThermalManager(ThermalManagerBase):
 
     with pytest.raises(Exception):
         MockThermalManager.load(os.path.join(test_path, 'policy_with_same_conditions.json'))
-    
+
 def test_dynamic_minimum_table_data():
     from sonic_platform.device_data import DEVICE_DATA
     for platform, platform_data in DEVICE_DATA.items():
@@ -453,7 +453,7 @@ def check_minimum_table_data(platform, minimum_table):
         for item in data_list:
             cooling_level = item[0]
             range_str = item[1]
-            
+
             ranges = range_str.split(':')
             low = int(ranges[0])
             high = int(ranges[1])

From fafd5327bdff26623e825c3eb742a913958510e9 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 24 Nov 2021 21:00:23 +0800
Subject: [PATCH 0930/1674] [Reclaim buffer] Common infrastructure update for
 reclaiming buffer (#9133)

- Why I did it
This is to update the common sonic-buildimage infra for reclaiming buffer.

- How I did it
Render zero_profiles.j2 to zero_profiles.json for vendors that support reclaiming buffer
The zero profiles will be referenced in PR [Reclaim buffer] Reclaim unused buffers by applying zero buffer profiles #8768 on Mellanox platforms and there will be test cases to verify the behavior there.
Rendering is done here for passing azure pipeline.
Load zero_profiles.json when the dynamic buffer manager starts
Generate inactive port list to reclaim buffer

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 dockers/docker-orchagent/buffermgrd.sh        | 10 ++--
 files/build_templates/buffers_config.j2       | 31 +++++++++-
 files/build_templates/docker_image_ctl.j2     |  3 +
 .../build_templates/sonic_debian_extension.j2 |  5 ++
 platform/vs/docker-sonic-vs/Dockerfile.j2     |  1 +
 platform/vs/docker-sonic-vs/buffermgrd.sh     |  6 +-
 .../vs/docker-sonic-vs/zero_profiles.json     | 57 +++++++++++++++++++
 7 files changed, 106 insertions(+), 7 deletions(-)
 create mode 100644 platform/vs/docker-sonic-vs/zero_profiles.json

diff --git a/dockers/docker-orchagent/buffermgrd.sh b/dockers/docker-orchagent/buffermgrd.sh
index 1d09cfc7d6ee..b5ddaab7df0e 100755
--- a/dockers/docker-orchagent/buffermgrd.sh
+++ b/dockers/docker-orchagent/buffermgrd.sh
@@ -3,14 +3,16 @@
 BUFFER_CALCULATION_MODE=$(redis-cli -n 4 hget "DEVICE_METADATA|localhost" buffer_model)
 
 if [ "$BUFFER_CALCULATION_MODE" == "dynamic" ]; then
+    BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json"
     if [ -f /etc/sonic/peripheral_table.json ]; then
-        BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json -p /etc/sonic/peripheral_table.json"
-    else
-        BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json"
+        BUFFERMGRD_PERIPHERIAL_ARGS=" -p /etc/sonic/peripheral_table.json"
+    fi
+    if [ -f /etc/sonic/zero_profiles.json ]; then
+        BUFFERMGRD_ZERO_PROFILE_ARGS=" -z /etc/sonic/zero_profiles.json"
     fi
 else
     # Should we use the fallback MAC in case it is not found in Device.Metadata
     BUFFERMGRD_ARGS="-l /usr/share/sonic/hwsku/pg_profile_lookup.ini"
 fi
 
-exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS}
+exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS} ${BUFFERMGRD_PERIPHERIAL_ARGS} ${BUFFERMGRD_ZERO_PROFILE_ARGS}
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 3b11b406c738..84d267f4698d 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -96,7 +96,9 @@ def
 {%- set PORT_ALL  = [] %}
 
 {%- if PORT is not defined %}
-    {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %}
+    {%- if defs.generate_port_lists is defined %}
+        {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %}
+    {%- endif %}
 {%- else %}
     {%- for port in PORT %}
         {%- if PORT_ALL.append(port) %}{%- endif %}
@@ -104,12 +106,18 @@ def
 {%- endif %}
 
 {%- set PORT_ACTIVE  = [] %}
+{%- set PORT_INACTIVE  = [] %}
 {%- if DEVICE_NEIGHBOR is not defined %}
     {%- set PORT_ACTIVE = PORT_ALL %}
 {%- else %}
     {%- for port in DEVICE_NEIGHBOR.keys() %}
         {%- if PORT_ACTIVE.append(port) %}{%- endif %}
     {%- endfor %}
+    {%- for port in PORT_ALL %}
+        {%- if port not in DEVICE_NEIGHBOR.keys() %}
+            {%- if PORT_INACTIVE.append(port) %}{%- endif %}
+        {%- endif %}
+    {%- endfor %}
 {%- endif %}
 
 {%- set port_names_list_active  = [] %}
@@ -118,6 +126,12 @@ def
 {%- endfor %}
 {%- set port_names_active  = port_names_list_active  | join(',') %}
 
+{%- set port_names_list_inactive  = [] %}
+{%- for port in PORT_INACTIVE %}
+    {%- if port_names_list_inactive.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_inactive  = port_names_list_inactive  | join(',') %}
+
 {
     "CABLE_LENGTH": {
         "AZURE": {
@@ -131,14 +145,22 @@ def
 
 {% if defs.generate_buffer_pool_and_profiles is defined %}
 {{ defs.generate_buffer_pool_and_profiles() }}
+{% elif defs.generate_buffer_pool_and_profiles_with_inactive_ports is defined %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {% endif %}
 
+
+{%- if port_names_active|length > 0 or port_names_inactive|length > 0 -%}
 {%- if defs.generate_profile_lists is defined %}
 {{ defs.generate_profile_lists(port_names_active) }},
+{% elif defs.generate_profile_lists_with_inactive_ports is defined %}
+{{ defs.generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% endif %}
 
 {%- if defs.generate_pg_profils is defined %}
 {{ defs.generate_pg_profils(port_names_active) }}
+{% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
+{{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% else %}
     "BUFFER_PG": {
 {% for port in PORT_ACTIVE %}
@@ -157,6 +179,8 @@ def
 
 {% if defs.generate_queue_buffers is defined %}
 {{ defs.generate_queue_buffers(port_names_active) }}
+{% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
+{{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
 {% else %}
     "BUFFER_QUEUE": {
 {% for port in PORT_ACTIVE %}
@@ -177,8 +201,11 @@ def
 {% endfor %}
     }
 {% endif %}
-{% if dynamic_mode is defined %}
+{%- if dynamic_mode is defined -%}
    ,
+{%- endif -%}
+{%- endif -%}
+{% if dynamic_mode is defined %}
     "DEFAULT_LOSSLESS_BUFFER_PARAMETER": {
         "AZURE": {
             "default_dynamic_th": "0"
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index d57fc546ac98..0b2e85719f29 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -258,6 +258,9 @@ start() {
     if [ ! -f /etc/sonic/peripheral_table.json ] && [ -f /usr/share/sonic/device/$PLATFORM/port_peripheral_config.j2 ]; then
         sonic-cfggen -d -t /usr/share/sonic/device/$PLATFORM/port_peripheral_config.j2 > /etc/sonic/peripheral_table.json
     fi
+    if [ ! -f /etc/sonic/zero_profiles.json ] && [ -f /usr/share/sonic/templates/zero_profiles.j2 ]; then
+        sonic-cfggen -d -t /usr/share/sonic/device/$PLATFORM/zero_profiles.j2 > /etc/sonic/zero_profiles.json
+    fi
     {%- endif %}
 
     # In Multi ASIC platforms the global database config file database_global.json will exist.
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 9938b3e815cd..393fbc042dda 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -495,6 +495,11 @@ if [ -f platform/{{ sonic_asic_platform }}/peripheral_table.j2 ]
 then
     sudo cp platform/{{ sonic_asic_platform }}/peripheral_table.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/peripheral_table.j2
 fi
+
+if [ -f platform/{{ sonic_asic_platform }}/zero_profiles.j2 ]
+then
+    sudo cp platform/{{ sonic_asic_platform }}/zero_profiles.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/zero_profiles.j2
+fi
 {% endif %}
 
 # Copy hostname configuration scripts
diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
index 837e8fc3cb66..c30c5637af65 100644
--- a/platform/vs/docker-sonic-vs/Dockerfile.j2
+++ b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -156,6 +156,7 @@ COPY ["database_config.json", "/etc/default/sonic-db/"]
 COPY ["hostname.j2", "/usr/share/sonic/templates/"]
 COPY ["default_chassis_cfg.json", "/etc/default/sonic-db/"]
 COPY ["asic_table.json", "/etc/sonic/"]
+COPY ["zero_profiles.json", "/etc/sonic"]
 COPY ["buffermgrd.sh", "/usr/bin/"]
 
 COPY ["platform.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/"]
diff --git a/platform/vs/docker-sonic-vs/buffermgrd.sh b/platform/vs/docker-sonic-vs/buffermgrd.sh
index 9cdc57434a8f..a36fc7f94ca8 100755
--- a/platform/vs/docker-sonic-vs/buffermgrd.sh
+++ b/platform/vs/docker-sonic-vs/buffermgrd.sh
@@ -5,9 +5,13 @@ export ASIC_VENDOR=vs
 
 if [ "$BUFFER_CALCULATION_MODE" == "dynamic" ]; then
     BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json"
+
+    if [ -f /etc/sonic/zero_profiles.json ]; then
+        BUFFERMGRD_ZERO_PROFILE_ARGS=" -z /etc/sonic/zero_profiles.json"
+    fi
 else
     # Should we use the fallback MAC in case it is not found in Device.Metadata
     BUFFERMGRD_ARGS="-l /usr/share/sonic/hwsku/pg_profile_lookup.ini"
 fi
 
-exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS}
+exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS} ${BUFFERMGRD_ZERO_PROFILE_ARGS}
diff --git a/platform/vs/docker-sonic-vs/zero_profiles.json b/platform/vs/docker-sonic-vs/zero_profiles.json
new file mode 100644
index 000000000000..fbd42bf7ec3e
--- /dev/null
+++ b/platform/vs/docker-sonic-vs/zero_profiles.json
@@ -0,0 +1,57 @@
+[
+    {
+        "BUFFER_POOL_TABLE:ingress_zero_pool": {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossy_pg_zero_profile" : {
+            "pool":"ingress_zero_pool",
+            "size":"0",
+            "static_th":"0"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossy_zero_profile" : {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossless_zero_profile" : {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:egress_lossy_zero_profile" : {
+            "pool":"egress_lossy_pool",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:egress_lossless_zero_profile" : {
+            "pool":"egress_lossless_pool",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "control_fields" : {
+            "pgs_to_apply_zero_profile":"0",
+            "ingress_zero_profile":"ingress_lossy_pg_zero_profile"
+        },
+        "OP": "SET"
+    }
+]

From 9f0fc89cff5b231484d7b881777c1326ace9b367 Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:32:16 -0800
Subject: [PATCH 0931/1674] remove staticd.conf.j2 (#9182)

Why I did it
resolves #8979 and #9055

How I did it
Remove the file static.conf.j2,which adds the default route on eth0 from bgp docker

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
---
 dockers/docker-fpm-frr/frr/frr.conf.j2                 |  2 --
 dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2     |  2 --
 .../frr/staticd/staticd.default_route.conf.j2          | 10 ----------
 .../tests/data/sonic-cfggen/frr.conf.j2/all.conf       |  4 ----
 .../tests/data/sonic-cfggen/staticd/staticd.conf       |  2 --
 .../tests/data/sonic-cfggen/staticd/staticd.conf.json  |  5 -----
 .../sonic-cfggen/staticd/staticd.default_route.conf    |  4 ----
 .../staticd/staticd.default_route.conf.json            |  7 -------
 src/sonic-bgpcfgd/tests/test_sonic-cfggen.py           |  6 ------
 .../tests/sample_output/py2/frr.conf                   |  4 ----
 .../tests/sample_output/py3/frr.conf                   |  4 ----
 src/sonic-config-engine/tests/test_frr.py              |  2 --
 12 files changed, 52 deletions(-)
 delete mode 100644 dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
 delete mode 100644 src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
 delete mode 100644 src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json

diff --git a/dockers/docker-fpm-frr/frr/frr.conf.j2 b/dockers/docker-fpm-frr/frr/frr.conf.j2
index 99900790366c..11878f8db9aa 100644
--- a/dockers/docker-fpm-frr/frr/frr.conf.j2
+++ b/dockers/docker-fpm-frr/frr/frr.conf.j2
@@ -13,8 +13,6 @@ agentx
 !
 {% include "zebra/zebra.interfaces.conf.j2" %}
 !
-{% include "staticd/staticd.default_route.conf.j2" %}
-!
 {% include "staticd/staticd.loopback_route.conf.j2" %}
 !
 {% include "bgpd/bgpd.main.conf.j2" %}
diff --git a/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
index 4831325276c7..6d00ac6609c7 100644
--- a/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
+++ b/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
@@ -8,7 +8,5 @@
 !
 {% include "common/daemons.common.conf.j2" %}
 !
-{% include "staticd.default_route.conf.j2" %}
-!
 {% include "staticd.loopback_route.conf.j2" %}
 !
diff --git a/dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
deleted file mode 100644
index 22d61ebbd0ff..000000000000
--- a/dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-!
-{% block default_route %}
-! set static default route to mgmt gateway as a backup to learned default
-{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %}
-ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
-{% endif %}
-{% endfor %}
-{% endblock default_route %}
-!
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index e977d2b5cffc..a43da1beedaf 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -32,10 +32,6 @@ link-detect
 !
 !!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.10.10.1 200
-!!
-!
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00::/64 Loopback0
 !!
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
index 59bbe983af76..0a2a7d4effba 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
@@ -14,8 +14,6 @@ log facility local4
 !
 ! end of template: common/daemons.common.conf.j2!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.10.10.1 200
 !!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
index 0cbd67c7ef68..3b46cc276aee 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
@@ -4,11 +4,6 @@
             "hostname": "new_hostname"
         }
     },
-    "MGMT_INTERFACE": {
-        "eth0|10.10.10.10/24": {
-            "gwaddr": "10.10.10.1"
-        }
-    },
     "LOOPBACK_INTERFACE": {
         "Loopback0|FC00:1::32/128": {}
     }
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
deleted file mode 100644
index 11adb98ebc3c..000000000000
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-!
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.10.10.1 200
-!
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json
deleted file mode 100644
index 80cd218a790e..000000000000
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "MGMT_INTERFACE": {
-        "eth0|10.10.10.10/24": {
-            "gwaddr": "10.10.10.1"
-        }
-    }
-}
diff --git a/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py b/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
index a9c93749d5c4..c11ddafa4838 100644
--- a/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
+++ b/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
@@ -69,12 +69,6 @@ def test_common_functions():
              "common/functions.conf.json",
              "common/functions.conf")
 
-def test_staticd_default_route():
-    run_test("staticd.default_route.conf.j2",
-             "staticd/staticd.default_route.conf.j2",
-             "staticd/staticd.default_route.conf.json",
-             "staticd/staticd.default_route.conf")
-
 def test_staticd_loopback_route():
     run_test("staticd.loopback_route.conf.j2",
              "staticd/staticd.loopback_route.conf.j2",
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
index 0b0c22db6809..259415e89e65 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -35,10 +35,6 @@ link-detect
 !
 !!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.0.0.1 200
-!!
-!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00:1::/64 Loopback0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
index 032eb26c5337..02173159ae9b 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -35,10 +35,6 @@ link-detect
 !
 !!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.0.0.1 200
-!!
-!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00:1::/64 Loopback0
diff --git a/src/sonic-config-engine/tests/test_frr.py b/src/sonic-config-engine/tests/test_frr.py
index 4998db2d5b25..3934f8c7d70c 100644
--- a/src/sonic-config-engine/tests/test_frr.py
+++ b/src/sonic-config-engine/tests/test_frr.py
@@ -69,6 +69,4 @@ def test_bgpd_frr(self):
     def test_zebra_frr(self):
         self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr.conf'))
 
-    def test_staticd_frr(self):
-        self.assertTrue(*self.run_case('staticd/staticd.conf.j2', 'staticd_frr.conf'))
 

From b3a3aa0c3854cf2672c4786e5b3eef6c3f649ee7 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 29 Nov 2021 12:04:06 -0800
Subject: [PATCH 0932/1674] [mux]: Fix `mark_dhcp_packet` (#9373)

- Consolidate the two [Service] sections by moving the ExecStartPre line for mark_dhcp_packet.py to the first section and removing the second.
- Make the mark_dhcp_packet.py file executable
- Also clean up mark_dhcp_packet.py
    - Remove unused imports
    - Fix spacing and line lengths to conform to PEP8
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/build_templates/mux.service.j2 | 11 +----------
 files/scripts/mark_dhcp_packet.py    | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 files/scripts/mark_dhcp_packet.py

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index eb9ea1d33396..abc04ab30d18 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -10,20 +10,11 @@ StartLimitBurst=3
 [Service]
 User={{ sonicadmin_user }}
 ExecStartPre=/usr/local/bin/write_standby.py
-ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
-ExecStart=/usr/bin/{{docker_container_name}}.sh wait
-ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-ExecStopPost=/usr/local/bin/write_standby.py
-Restart=always
-RestartSec=30
-
-[Service]
-User={{ sonicadmin_user }}
 ExecStartPre=/usr/local/bin/mark_dhcp_packet.py
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-ExecStopPost=/usr/local/bin/mark_dhcp_packet.py
+ExecStopPost=/usr/local/bin/write_standby.py
 Restart=always
 RestartSec=30
 
diff --git a/files/scripts/mark_dhcp_packet.py b/files/scripts/mark_dhcp_packet.py
old mode 100644
new mode 100755
index 937447d2ceea..c80810f0316b
--- a/files/scripts/mark_dhcp_packet.py
+++ b/files/scripts/mark_dhcp_packet.py
@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
 
-import os
 import subprocess
-import sys
-import time
 
 from sonic_py_common import logger
 from swsscommon import swsscommon
 
 log = logger.Logger('mark_dhcp_packet')
 
+
 class MarkDhcpPacket(object):
     """
     Class used to configure dhcp packet mark in ebtables
@@ -38,7 +36,9 @@ def state_db(self):
         Initializes the connector during the first call
         """
         if self.state_db_connector is None:
-            self.state_db_connector = swsscommon.SonicV2Connector(host='127.0.0.1')
+            self.state_db_connector = swsscommon.SonicV2Connector(
+                                                    host='127.0.0.1'
+                                                )
             self.state_db_connector.connect(self.state_db_connector.STATE_DB)
 
         return self.state_db_connector
@@ -51,7 +51,8 @@ def is_dualtor(self):
         localhost_key = self.config_db.get_keys('DEVICE_METADATA')[0]
         metadata = self.config_db.get_entry('DEVICE_METADATA', localhost_key)
 
-        return 'subtype' in metadata and 'dualtor' in metadata['subtype'].lower()
+        return 'subtype' in metadata and \
+               'dualtor' in metadata['subtype'].lower()
 
     def get_mux_intfs(self):
         """
@@ -82,10 +83,16 @@ def clear_dhcp_packet_marks(self):
         self.run_command("sudo ebtables -F INPUT")
 
     def apply_mark_in_ebtables(self, intf, mark):
-        self.run_command("sudo ebtables -A INPUT -i {} -j mark --mark-set {}".format(intf, mark))
+        self.run_command("sudo ebtables -A INPUT -i {} -j mark --mark-set {}"
+                         .format(intf, mark))
 
     def update_mark_in_state_db(self, intf, mark):
-        self.state_db.set(self.state_db.STATE_DB, 'DHCP_PACKET_MARK|' + intf, 'mark', mark)
+        self.state_db.set(
+            self.state_db.STATE_DB,
+            'DHCP_PACKET_MARK|' + intf,
+            'mark',
+            mark
+        )
 
     def apply_marks(self):
         """
@@ -103,6 +110,7 @@ def apply_marks(self):
 
         log.log_info("Finish marking dhcp packets in ebtables.")
 
+
 if __name__ == '__main__':
     mark_dhcp_packet = MarkDhcpPacket()
     mark_dhcp_packet.apply_marks()

From 933454dc29c6a14f6b6d094ee3dbe3a21862a2c2 Mon Sep 17 00:00:00 2001
From: Wirut Getbamrung <wgetbum@icloud.com>
Date: Tue, 30 Nov 2021 12:59:21 +0700
Subject: [PATCH 0933/1674] [device/celestica]: add controllable config to
 platform.json of e1031 (#9183)

---
 .../x86_64-cel_e1031-r0/platform.json         | 148 +++++++++++++++---
 1 file changed, 127 insertions(+), 21 deletions(-)

diff --git a/device/celestica/x86_64-cel_e1031-r0/platform.json b/device/celestica/x86_64-cel_e1031-r0/platform.json
index 0e4656feae60..a0a174c66a80 100644
--- a/device/celestica/x86_64-cel_e1031-r0/platform.json
+++ b/device/celestica/x86_64-cel_e1031-r0/platform.json
@@ -1,6 +1,10 @@
 {
     "chassis": {
         "name": "Celestica-E1031-T48S4",
+        "status_led": {
+            "controllable": true,
+            "colors": ["green", "amber","off"]
+        },
         "components": [
             {
                 "name": "SMC_CPLD"
@@ -14,37 +18,100 @@
         ],
         "fans": [
             {
-                "name": "FAN-1"
-            },
-            {
-                "name": "FAN-2"
-            },
-            {
-                "name": "FAN-3"
+                "name": "FAN-1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                }
+            },
+            {
+                "name": "FAN-2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                }
+            },
+            {
+                "name": "FAN-3",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                }
             }
         ],
         "fan_drawers": [
             {
                 "name": "Drawer1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                },
                 "fans": [
                     {
-                        "name": "FAN-1"
+                        "name": "FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": true,
+                            "colors": ["green", "amber","off"]
+                        }
                     }
                 ]
             },
             {
                 "name": "Drawer2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                },
                 "fans": [
                     {
-                        "name": "FAN-2"
+                        "name": "FAN-2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": true,
+                            "colors": ["green", "amber","off"]
+                        }
                     }
                 ]
             },
             {
                 "name": "Drawer3",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "amber","off"]
+                },
                 "fans": [
                     {
-                        "name": "FAN-3"
+                        "name": "FAN-3",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": true,
+                            "colors": ["green", "amber","off"]
+                        }
                     }
                 ]
             }
@@ -54,40 +121,79 @@
                 "name": "PSU-R",
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
-                ]
+                ],
+                "status_led": {
+                    "controllable": false
+                }
             },
             {
                 "name": "PSU-L",
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
-                ]
+                ],
+                "status_led": {
+                    "controllable": false
+                }
             }
         ],
         "thermals": [
             {
-                "name": "Inlet ambient sensor (Rear to Front)"
+                "name": "Inlet ambient sensor (Rear to Front)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Helix shutdown sensor (Rear to Front)"
+                "name": "Helix shutdown sensor (Rear to Front)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Inlet ambient sensor (Front to Rear, right)"
+                "name": "Inlet ambient sensor (Front to Rear, right)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Helix shutdown sensor (Front to Rear)"
+                "name": "Helix shutdown sensor (Front to Rear)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Inlet ambient sensor (Front to Rear, left)"
+                "name": "Inlet ambient sensor (Front to Rear, left)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "CPU errata sensor (Front to Rear)"
+                "name": "CPU errata sensor (Front to Rear)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "CPU errata sensor (Rear to Front)"
+                "name": "CPU errata sensor (Rear to Front)",
+                "controllable": false,
+                "low-threshold": false,
+                "low-crit-threshold": false
             }
         ],
         "sfps": [

From 1e8fe7dd6c962cae3b9c6812bed959bcc2eb741a Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 1 Dec 2021 07:35:07 +0800
Subject: [PATCH 0934/1674] Fix armhf version issue (#9382)

Why I did it
Fix some of the version files not used issue.
One of example version file version-py3-all-armhf, when building marvell-armhf, the version is used as expected, but it not use.
---
 scripts/versions_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index 3a46aaafe229..c986e29a4e17 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -280,11 +280,11 @@ def load(self, image_path, filter_ctype=None, filter_dist=None, filter_arch=None
             arch = ''
             if len(items) > 2:
                 dist = items[2]
-            if filter_dist and dist and filter_dist != dist:
+            if filter_dist and dist and filter_dist != dist and dist != ALL_DIST:
                 continue
             if len(items) > 3:
                 arch = items[3]
-            if filter_arch and arch and filter_arch != arch:
+            if filter_arch and arch and filter_arch != arch and arch != ALL_ARCH:
                 continue
             versions = Component.get_versions(file_path)
             component = Component(versions, ctype, dist, arch)

From 05351731d549780365c66fc89c13a50ef2c72062 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 4 Dec 2021 09:31:53 +0800
Subject: [PATCH 0935/1674] [Build]: Enable arm pr check #9362

Support marvell-armhf dpkg cache and the azp check.
Waiting for merging PR #9381 to 202012 branch, so only azp template change in this PR.

Move the VS build to a new stage BuildVS, change the Test stage only depending on BuildVS, running the BuildVS and the other platform's build in parallel. The Test stage do not has dependency on the marvel-armhf build, reduce the overall build time caused by longer build time of marvel-armhf build.
---
 .../azure-pipelines-image-template.yml        |  2 +-
 azure-pipelines.yml                           | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index daee2aac30be..37cad9e6c310 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -28,7 +28,7 @@ jobs:
       - template: cleanup.yml
       - ${{ parameters.preSteps }}
       - script: |
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
             echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a61f721895d4..1c5080806e26 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -31,7 +31,7 @@ resources:
     endpoint: build
 
 stages:
-- stage: Build
+- stage: BuildVS
   pool: sonicbld
   variables:
     CACHE_MODE: rcache
@@ -43,10 +43,29 @@ stages:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
       jobGroups:
       - name: vs
+
+- stage: Build
+  pool: sonicbld
+  dependsOn: []
+  variables:
+    CACHE_MODE: rcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+  jobs:
+  - template: .azure-pipelines/azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobGroups:
       - name: broadcom
       - name: mellanox
+      - name: marvell-armhf
+        pool: sonicbld-armhf
+        timeoutInMinutes: 1200
+        variables:
+          PLATFORM_ARCH: armhf
 
 - stage: Test
+  dependsOn: BuildVS
   variables:
   - name: inventory
     value: veos_vtb

From 0831635b1c5c4c8f055c21ac4b1dc2e658f6c19d Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Mon, 6 Dec 2021 11:01:43 +0200
Subject: [PATCH 0936/1674] [Mellanox] Update SDK to v4.4.3360 and FW to
 v2008.3358 (#9403)

- Why I did it
To include latest fixes.

1. On CMIS modules, after low power configuration, the firmware waited for the module state to be ModuleReady instead of ModuleLowPower causing delays.
2. When connecting Spectrum devices with optical transceivers that support RXLOS, remote side port down might cause the switch firmware to get stuck and cause unexpected switch behavior.
3. On rare occasions, when working with port rates of 1GbE or 10GbE and congestion occurs, packets may get stuck in the chip and may cause switch to hang.
4. When ECMP has high amount of next-hops based on VLAN interfaces, in some rare cases, packets will get a wrong VLAN tag and will be dropped.
5. Using SN4600C with copper or optics loopback cables in NRZ speeds, link may raise in long link up times ( up to 70 seconds).
6. When connecting SN4600C to SN4600C after Fastboot in 50GbE No_FEC mode with a copper cable, the link up time may take ~20 seconds.

- How I did it
Updated SDK submodule and relevant makefiles with the required versions.

- How to verify it
Build an image and run tests from "soni-mgmt".

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 6b9790374d40..9029ff47b4bf 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3326
+MLNX_SPC_FW_VERSION = 13.2008.3358
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3326
+MLNX_SPC2_FW_VERSION = 29.2008.3358
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3326
+MLNX_SPC3_FW_VERSION = 30.2008.3358
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 726bef49c07a..51a54690eac0 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 726bef49c07a1a0d7c52d8e3062e95ec6efa736f
+Subproject commit 51a54690eac0770c098aeec33f246d747c5f100a
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 3c5a46a76767..9b7616eb932d 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.3326
+MLNX_SDK_VERSION = 4.4.3360
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From a3f1769a34f2fd8c8a95b2f26ad028937a4fcb55 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 2 Dec 2021 09:04:40 +0800
Subject: [PATCH 0937/1674] [Build]: Cleanup the reproducible mirrors when
 build complete (#9132)

Why I did it
The reproducible build mirrors are only used during the build, the mirrors can be removed after that.
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 17 +++++++++++++++++
 .../scripts/post_run_buildinfo                  |  1 +
 src/sonic-build-hooks/scripts/pre_run_buildinfo |  1 +
 3 files changed, 19 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 0fbcd57393b3..d20d68581533 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -11,6 +11,7 @@ POST_VERSION_PATH=$BUILDINFO_PATH/post-versions
 VERSION_DEB_PREFERENCE=$BUILDINFO_PATH/versions/01-versions-deb
 WEB_VERSION_FILE=$VERSION_PATH/versions-web
 BUILD_WEB_VERSION_FILE=$BUILD_VERSION_PATH/versions-web
+REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/debian'
 
 . $BUILDINFO_PATH/config/buildinfo.config
 
@@ -59,6 +60,22 @@ check_if_url_exist()
     fi
 }
 
+# Enable or disable the reproducible mirrors
+set_reproducible_mirrors()
+{
+    # Remove the charater # in front of the line if matched
+    local expression="s/^#\(.*$REPR_MIRROR_URL_PATTERN\)/\1/"
+    if [ "$1" = "-d" ]; then
+        # Add the charater # in front of the line if match
+        expression="s/^deb.*$REPR_MIRROR_URL_PATTERN/#\0/"
+    fi
+
+    local mirrors="/etc/apt/sources.list $(ls /etc/apt/sources.list.d/)"
+    for mirror in $mirrors; do
+        sed -i "$expression" "$mirror"
+    done
+}
+
 download_packages()
 {
     local parameters=("$@")
diff --git a/src/sonic-build-hooks/scripts/post_run_buildinfo b/src/sonic-build-hooks/scripts/post_run_buildinfo
index a8dab41021b1..614389fd424c 100755
--- a/src/sonic-build-hooks/scripts/post_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/post_run_buildinfo
@@ -12,3 +12,4 @@ rm -rf $BUILD_VERSION_PATH/*
 
 # Disable the build hooks
 symlink_build_hooks -d
+set_reproducible_mirrors -d
diff --git a/src/sonic-build-hooks/scripts/pre_run_buildinfo b/src/sonic-build-hooks/scripts/pre_run_buildinfo
index a8450690b6ff..3cf0cf7c8dfe 100755
--- a/src/sonic-build-hooks/scripts/pre_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/pre_run_buildinfo
@@ -10,6 +10,7 @@ mkdir -p $LOG_PATH
 [ -d $PRE_VERSION_PATH ] && rm -rf $PRE_VERSION_PATH
 collect_version_files $PRE_VERSION_PATH
 symlink_build_hooks
+set_reproducible_mirrors
 
 chmod -R a+rw $BUILDINFO_PATH
 

From 5670f25416f529836fdff9c5f11271aeac66937d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 3 Dec 2021 23:32:36 +0800
Subject: [PATCH 0938/1674] [Build]: Fix tmpfs space not enough issue when
 building vs image (#9438)

Fix no space left on device issue in tmpfs.
2021-12-01T06:30:40.1651742Z cp: write error: No space left on device
2021-12-01T06:30:40.1652225Z Failure: local_fs_run():/dev/vdb Unable to copy /tmp/tmp.gl4Sgp/onie-installer.bin to tmpfs
---
 scripts/build_kvm_image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build_kvm_image.sh b/scripts/build_kvm_image.sh
index 4531ca25a5f7..71a445e66612 100755
--- a/scripts/build_kvm_image.sh
+++ b/scripts/build_kvm_image.sh
@@ -4,7 +4,7 @@
 #
 #  SPDX-License-Identifier:     GPL-2.0
 
-MEM=3072
+MEM=4096
 DISK=$1
 ONIE_RECOVERY_ISO=$2
 INSTALLER=$3

From 2019ccaa2aaa4508d822aae0a95ff4304c450ff0 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Fri, 3 Dec 2021 09:45:06 -0800
Subject: [PATCH 0939/1674] [radv] Run radv on MgmtToRRouter (#9424)

* Allow radv to run on mgmt tor and EPMS
---
 .../docker-router-advertiser.supervisord.conf.j2                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index 3be84f54fda5..7562444946ed 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -45,7 +45,7 @@ dependent_startup_wait_for=rsyslogd:running
 {%- set vlan_v6 = namespace(count=0) -%}
 {%- if DEVICE_METADATA.localhost.deployment_id != "8" -%}
   {%- if DEVICE_METADATA.localhost.type -%}
-    {%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%}
+    {%- if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type == "EPMS" -%}
       {%- if VLAN_INTERFACE -%}
         {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
           {# If this VLAN has an IPv6 address... #}

From 8f15d39baef8d2198cd952353728451b3aef33b7 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 6 Dec 2021 13:44:00 -0800
Subject: [PATCH 0940/1674] [202012] [submodule] Update sonic-utilites pointer
 (#9410)

Contains the following commits
239cb5c  [flex counter] Flex counter threads consume too much CPU resources (Azure/sonic-utilities#1925)
8a3b41a [load_minigraph] Delay pfcwd start until the buffer templates are rendered  (Azure/sonic-utilities#1937)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index ec9e5ee37550..8a3b41a9f766 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ec9e5ee3755068a62b48b6242776b754197a8660
+Subproject commit 8a3b41a9f7669fe0c6552c4fc942e2fa5ca1f891

From f93d1f64a281f7298411bf0e4e4ce211a068b0ea Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Mon, 6 Dec 2021 16:41:33 -0800
Subject: [PATCH 0941/1674] [submodule]: Update submodule sonic-linkmgrd
 (#9421)

6c6151b Fix unstable unit tests (state change handler wasn't invoked) (#8)
2f7dc0a support code diff coverage (#5)
83f0002 Force mux state switch to standby if triggered from Cli (#6)

signed-off-by: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index c11a5763a070..6c6151ba9512 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit c11a5763a070a68af048ccd9ca473294f93fb256
+Subproject commit 6c6151ba9512166de0430e8e95076809dd706496

From 6a6512246dea0a047eee9eafdda613522db87d60 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 8 Dec 2021 15:42:33 +0800
Subject: [PATCH 0942/1674] [Bug][Build]: fix the file not found issue caused
 by the relative path (#9450)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### Why I did it
Merged from master branch: https://github.com/Azure/sonic-buildimage/pull/9443
Fix the nodesource.list cannot read issue, it is cased by the full path not used.

```
2021-12-03T06:59:26.0019306Z Removing intermediate container 77cfe980cd36
2021-12-03T06:59:26.0020872Z  ---> 528fd40e60f6
2021-12-03T06:59:26.0021457Z Step 81/81 : RUN post_run_buildinfo
2021-12-03T06:59:26.0841136Z  ---> Running in d804bd7e1b06
2021-12-03T06:59:29.1626594Z DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality.
2021-12-03T06:59:34.2960105Z /usr/bin/sed: can't read nodesource.list: No such file or directory
2021-12-03T06:59:34.5094880Z The command '/bin/sh -c post_run_buildinfo' returned a non-zero code: 2
```
---
 .azure-pipelines/docker-sonic-slave.yml         | 1 +
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index 6b4fcafda947..c8209c516392 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -21,6 +21,7 @@ pr:
     - sonic-slave-jessie
     - sonic-slave-stretch
     - sonic-slave-buster
+    - src/sonic-build-hooks
 
 parameters:
 - name: 'arches'
diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index d20d68581533..f156930bf06d 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -70,7 +70,7 @@ set_reproducible_mirrors()
         expression="s/^deb.*$REPR_MIRROR_URL_PATTERN/#\0/"
     fi
 
-    local mirrors="/etc/apt/sources.list $(ls /etc/apt/sources.list.d/)"
+    local mirrors="/etc/apt/sources.list $(find /etc/apt/sources.list.d/ -type f)"
     for mirror in $mirrors; do
         sed -i "$expression" "$mirror"
     done

From acac848858b10aed86dbb769d416c8f86dde2c5c Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:34:56 +0800
Subject: [PATCH 0943/1674] [Reclaim buffer][202012] Reclaim unused buffers by
 applying zero buffer profiles (#9063)

- Why I did it
Support zero buffer profiles

1. Add buffer profiles and pool definition for zero buffer profiles
2. Support applying zero profiles on INACTIVE PORTS
3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file

- How I did it
Add buffer profiles and pool definition for zero buffer profiles

If the buffer model is static:
 * Apply normal buffer profiles to admin-up ports
 * Apply zero buffer profiles to admin-down ports
If the buffer model is dynamic:
 * Apply normal buffer profiles to all ports
 * buffer manager will take care when a port is shut down

Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists

Originally, all the macros to generate the above buffer objects took active ports only as an argument.
Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added.
To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments
The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called.
Only vendors who support zero profiles need to change their buffer templates
Enable buffer manager to load zero pools and profiles from a JSON file:

The JSON file is provided on a per-platform basis
It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created.
To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files:
One in Mellanox-SN2700-D48C8 for single ingress pool mode
The other in ACS-MSN2700 for double ingress pool mode
Those files of all other SKUs will be symbol link to the above files

Update sonic-cfggen test accordingly:
 * Adjust example output file of JSON template for unit test
 * Add unit test in for Mellanox's new buffer templates.

- How to verify it
Regression test.
Unit test in sonic-cfggen
Run regression test and manually test.

Signed-off-by: stephens <stephens@nvidia.com>
---
 .../ACS-MSN2010/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN2100/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN2410/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN2700/buffers_defaults_objects.j2   |  229 ++
 .../ACS-MSN2700/buffers_defaults_t0.j2        |  109 +-
 .../ACS-MSN2700/buffers_defaults_t1.j2        |  109 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_objects.j2               |  218 ++
 .../buffers_defaults_t0.j2                    |  103 +-
 .../buffers_defaults_t1.j2                    |  103 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../Mellanox-SN2700/buffers_defaults_t0.j2    |  103 +-
 .../Mellanox-SN2700/buffers_defaults_t1.j2    |  103 +-
 .../ACS-MSN2740/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN3420/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN3700/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN3700/buffers_defaults_t0.j2        |  107 +-
 .../ACS-MSN3700/buffers_defaults_t1.j2        |  107 +-
 .../ACS-MSN3700C/buffers_defaults_objects.j2  |    1 +
 .../ACS-MSN3800/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN3800/buffers_defaults_t0.j2        |  107 +-
 .../ACS-MSN3800/buffers_defaults_t1.j2        |  107 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |   97 +-
 .../buffers_defaults_t1.j2                    |   97 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |   97 +-
 .../buffers_defaults_t1.j2                    |   97 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../ACS-MSN4410/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN4600/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN4600C/buffers_defaults_objects.j2  |    1 +
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  103 +-
 .../buffers_defaults_t1.j2                    |  103 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../buffers_defaults_objects.j2               |    1 +
 .../buffers_defaults_t0.j2                    |  101 +-
 .../buffers_defaults_t1.j2                    |  101 +-
 .../ACS-MSN4700/buffers_defaults_objects.j2   |    1 +
 .../ACS-MSN4700/buffers_defaults_t0.j2        |  109 +-
 .../ACS-MSN4700/buffers_defaults_t1.j2        |  109 +-
 .../ACS-MSN4800/buffers_defaults_objects.j2   |    1 +
 platform/mellanox/zero_profiles.j2            |   57 +
 .../sample-mellanox-2410-t1-minigraph.xml     | 2303 +++++++++++++++++
 .../sample-mellanox-2700-t0-minigraph.xml     | 1498 +++++++++++
 .../py2/buffers-mellanox2410.json             | 1163 +++++++++
 .../py2/buffers-mellanox2700.json             | 1154 +++++++++
 .../py3/buffers-mellanox2410.json             | 1163 +++++++++
 .../py3/buffers-mellanox2700.json             | 1154 +++++++++
 src/sonic-config-engine/tests/test_j2files.py |   42 +
 65 files changed, 9306 insertions(+), 2782 deletions(-)
 create mode 120000 device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_objects.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_objects.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_objects.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2
 create mode 100644 platform/mellanox/zero_profiles.j2
 create mode 100644 src/sonic-config-engine/tests/sample-mellanox-2410-t1-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample-mellanox-2700-t0-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json

diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
new file mode 100644
index 000000000000..52baa1899e68
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
@@ -0,0 +1,229 @@
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+    "BUFFER_POOL": {
+        {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%}
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        {% endif -%}
+        "ingress_lossless_pool": {
+            {% if dynamic_mode is not defined -%}
+            "size": "{{ ingress_lossless_pool_size }}",
+            {% endif -%}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            {% if dynamic_mode is not defined -%}
+            "size": "{{ ingress_lossy_pool_size }}",
+            {% endif -%}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {% if dynamic_mode is not defined -%}
+            "size": "{{ egress_lossy_pool_size }}",
+            {% endif -%}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%}
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        {% endif -%}
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names_active, port_names_inactive) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}": {
+{% if dynamic_mode is defined %}
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+{% else %}
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}": {
+{% if dynamic_mode is defined %}
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+{% else %}
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names_active, port_names_inactive) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% if dynamic_mode is defined %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% else %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+{% endif %}
+    }
+{%- endmacro %}
+
+{%- macro generate_pg_profiles(port_names_active, port_names_inactive) %}
+    "BUFFER_PG": {
+{% for port in port_names_active.split(',') %}
+{% if dynamic_mode is defined %}
+        "{{ port }}|3-4": {
+            "profile" : "NULL"
+        },
+{% endif %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+{%- for port in port_names_inactive.split(',') %}
+       {%- if loop.first -%},{%- endif -%}
+{% if dynamic_mode is defined %}
+        "{{ port }}|3-4": {
+            "profile" : "NULL"
+        },
+{% endif %}
+       "{{ port }}|0": {
+{% if dynamic_mode is defined %}
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+{% else %}
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
index d0bce94ba51d..515761c89f8a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
@@ -4,109 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '4580864' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
index 5514c47a4090..1f6132da6380 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
@@ -4,109 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '3302912' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
new file mode 100644
index 000000000000..78cb3edb244c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
@@ -0,0 +1,218 @@
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+    "BUFFER_POOL": {
+        {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%}
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        {% endif -%}
+        "ingress_lossless_pool": {
+            {% if dynamic_mode is not defined -%}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "xoff": "{{ ingress_lossless_pool_xoff }}",
+            {% endif -%}
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            {% if dynamic_mode is not defined -%}
+            "size": "{{ egress_lossy_pool_size }}",
+            {% endif -%}
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%}
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        {% endif -%}
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names_active, port_names_inactive) %}
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}": {
+{% if dynamic_mode is defined %}
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+{% else %}
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}": {
+{% if dynamic_mode is defined %}
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+{% else %}
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names_active, port_names_inactive) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names_active.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+,
+{% if dynamic_mode is defined %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% else %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+{% endfor %}
+{% for port in port_names_inactive.split(',') %}
+        "{{ port }}|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+{% endif %}
+    }
+{%- endmacro %}
+
+{%- macro generate_pg_profiles(port_names_active, port_names_inactive) %}
+    "BUFFER_PG": {
+{% for port in port_names_active.split(',') %}
+{% if dynamic_mode is defined %}
+        "{{ port }}|3-4": {
+            "profile" : "NULL"
+        },
+{% endif %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% if port_names_inactive|length > 0 %}
+{%- for port in port_names_inactive.split(',') %}
+       {%- if loop.first -%},{%- endif -%}
+{% if dynamic_mode is defined %}
+        "{{ port }}|3-4": {
+            "profile" : "NULL"
+        },
+{% endif %}
+       "{{ port }}|0": {
+{% if dynamic_mode is defined %}
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+{% else %}
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+{% endif %}
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
+    }
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
index 6fc5efcf9b88..eb536086ef4a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '7719936' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
index 95d35539253e..11986ab5a95a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '9686016' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
index d2bf72b15f7c..0e6a110fff6e 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '10177536' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
index eef4f811e01c..ec8040e79763 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '13945824' %}
 {% set egress_lossy_pool_size =  '8719360' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
index 035a14177705..59afa7c1bb80 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
@@ -4,107 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '14542848' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
index 1032b455b8f1..d8478d18d2db 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
@@ -4,107 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '11622400' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2
index b83e142448d6..0bb568b1a00e 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2
@@ -4,107 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '13924352' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2
index abcab930c63e..0d95f59b5eef 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2
@@ -4,107 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '12457984' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
index a59beaeeb698..8c653b1049f4 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '25866240' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
index 0cc5cced0c23..23785ac7be18 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '24219648' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
index df453006bd12..c0f8def4a475 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
@@ -4,97 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '20664320' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
index d75ccfe4fed9..2b409aecb8d7 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
@@ -4,97 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '19601408' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
index 63e5d5f3a85a..afc9abab17c4 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '20017152' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
index d1ccce62bb14..6549b5532280 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '19124224' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
index 0ff424a30a57..92f65d0459c4 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '24576000' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
index 49adf1331c1c..acd7f12824e1 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '22597632' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
index 67aca79510a6..2c39cf1b059d 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t0.j2
@@ -4,97 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '24360960' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
index a005006db514..dae6bf287b4c 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/buffers_defaults_t1.j2
@@ -4,97 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '22380544' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
index c64f1c548631..2c39cf1b059d 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '24360960' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
index bbb51cc778b2..dae6bf287b4c 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '22380544' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_pool_xoff }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
index c6ec42948ec6..9b5dd7341cd2 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '53379072' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
index cbe3511a8311..f05f4e15b128 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -4,103 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '52723712' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
index aa74c4645678..a960f9573f83 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '47587328' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
index 1cc727f8c85e..ba80fcd24f4b 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '46702592' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
index e3a39b9dc79b..e4a9294e0bcd 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '50995200' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
index 149d810c983b..6f841c4f0950 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
@@ -4,101 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '50143232' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
index c115d141e152..503e43045eb8 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
@@ -4,109 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '26451968' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
index 0550c6dd3103..50f5d850be79 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
@@ -4,109 +4,20 @@
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '20627456' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..33b6704f9902
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4800-r0/ACS-MSN4800/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/platform/mellanox/zero_profiles.j2 b/platform/mellanox/zero_profiles.j2
new file mode 100644
index 000000000000..bfbbb1af95fe
--- /dev/null
+++ b/platform/mellanox/zero_profiles.j2
@@ -0,0 +1,57 @@
+[
+    {
+        "BUFFER_POOL_TABLE:ingress_zero_pool": {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossy_pg_zero_profile" : {
+            "pool":"[BUFFER_POOL_TABLE:ingress_zero_pool]",
+            "size":"0",
+            "static_th":"0"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossy_zero_profile" : {
+            "pool":"[BUFFER_POOL_TABLE:ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:ingress_lossless_zero_profile" : {
+            "pool":"[BUFFER_POOL_TABLE:ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:egress_lossy_zero_profile" : {
+            "pool":"[BUFFER_POOL_TABLE:egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "BUFFER_PROFILE_TABLE:egress_lossless_zero_profile" : {
+            "pool":"[BUFFER_POOL_TABLE:egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"-8"
+        },
+        "OP": "SET"
+    },
+    {
+        "control_fields" : {
+            "pgs_to_apply_zero_profile":"0",
+            "ingress_zero_profile":"[BUFFER_PROFILE_TABLE:ingress_lossy_pg_zero_profile]"
+        },
+        "OP": "SET"
+    }
+]
diff --git a/src/sonic-config-engine/tests/sample-mellanox-2410-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-mellanox-2410-t1-minigraph.xml
new file mode 100644
index 000000000000..b6d14c9451d8
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-mellanox-2410-t1-minigraph.xml
@@ -0,0 +1,2303 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::11</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::12</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::19</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::1A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.16</StartPeer>
+        <EndRouter>ARISTA09T2</EndRouter>
+        <EndPeer>10.0.0.17</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::21</StartPeer>
+        <EndRouter>ARISTA09T2</EndRouter>
+        <EndPeer>FC00::22</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.20</StartPeer>
+        <EndRouter>ARISTA11T2</EndRouter>
+        <EndPeer>10.0.0.21</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::29</StartPeer>
+        <EndRouter>ARISTA11T2</EndRouter>
+        <EndPeer>FC00::2A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.24</StartPeer>
+        <EndRouter>ARISTA13T2</EndRouter>
+        <EndPeer>10.0.0.25</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::31</StartPeer>
+        <EndRouter>ARISTA13T2</EndRouter>
+        <EndPeer>FC00::32</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.28</StartPeer>
+        <EndRouter>ARISTA15T2</EndRouter>
+        <EndPeer>10.0.0.29</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::39</StartPeer>
+        <EndRouter>ARISTA15T2</EndRouter>
+        <EndPeer>FC00::3A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>sonic</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>sonic</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.17</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.21</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.25</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.29</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA09T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA11T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA13T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA15T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.100.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.100.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>fe80::9a03:9bff:fe82:f226/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>fe80::9a03:9bff:fe82:f226/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>sonic</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel0002</Name>
+          <AttachTo>Ethernet0;Ethernet4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0005</Name>
+          <AttachTo>Ethernet8;Ethernet12</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0008</Name>
+          <AttachTo>Ethernet16;Ethernet20</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0011</Name>
+          <AttachTo>Ethernet24;Ethernet28</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0014</Name>
+          <AttachTo>Ethernet32;Ethernet36</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0017</Name>
+          <AttachTo>Ethernet40;Ethernet44</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0020</Name>
+          <AttachTo>Ethernet48;Ethernet52</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0023</Name>
+          <AttachTo>Ethernet56;Ethernet60</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet64</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet64</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0002</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0002</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet68</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet68</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet72</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet72</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0005</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0005</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet76</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet76</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet80</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet80</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0008</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0008</AttachTo>
+          <Prefix>FC00::11/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet84</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet84</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet88</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet88</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0011</AttachTo>
+          <Prefix>FC00::19/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet92</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet92</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet96</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet96</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0014</AttachTo>
+          <Prefix>10.0.0.16/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0014</AttachTo>
+          <Prefix>FC00::21/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet100</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet100</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet104</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet104</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0017</AttachTo>
+          <Prefix>10.0.0.20/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0017</AttachTo>
+          <Prefix>FC00::29/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet108</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet108</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet112</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet112</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0020</AttachTo>
+          <Prefix>10.0.0.24/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0020</AttachTo>
+          <Prefix>FC00::31/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet116</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet116</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet120</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet120</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0023</AttachTo>
+          <Prefix>10.0.0.28/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0023</AttachTo>
+          <Prefix>FC00::39/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet124</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>Ethernet124</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel0002;PortChannel0005;PortChannel0008;PortChannel0011;PortChannel0014;PortChannel0017;PortChannel0020;PortChannel0023;Ethernet64;Ethernet68;Ethernet72;Ethernet76;Ethernet80;Ethernet84;Ethernet88;Ethernet92;Ethernet96;Ethernet100;Ethernet104;Ethernet108;Ethernet112;Ethernet116;Ethernet120;Ethernet124</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet64</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet4</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet68</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet72</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet8</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet12</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet76</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet80</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet16</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet20</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet84</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet88</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet24</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet28</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet92</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet96</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet32</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet36</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet100</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet104</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet40</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet44</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet108</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet112</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet48</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet52</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet116</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet120</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet56</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet60</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>sonic</StartDevice>
+        <StartPort>Ethernet124</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>sonic</Hostname>
+        <HwSku>ACS-MSN2410</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.1</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.65</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.60</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.59</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA11T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.47</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA09T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.46</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.58</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.55</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.57</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.56</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.45</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.42</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.50</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.44</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.54</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.51</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.52</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.43</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.53</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.64</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA15T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.49</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.63</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.61</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA13T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.48</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.62</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet124</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet128</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet132</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet136</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet140</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet144</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet148</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet152</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet156</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet160</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet164</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet168</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet172</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet176</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet180</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet184</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet188</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet192</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet196</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet200</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet204</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet208</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet212</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet216</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet220</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+              <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>ACS-MSN2410</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>sonic</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.100.0.250</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.9</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>sonicadmin</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.100.0.20</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.100.0.0/16</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.7</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>sonic</Hostname>
+  <HwSku>ACS-MSN2410</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-mellanox-2700-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-mellanox-2700-t0-minigraph.xml
new file mode 100644
index 000000000000..b7f259e3e2db
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-mellanox-2700-t0-minigraph.xml
@@ -0,0 +1,1498 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>mellanox-2700</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>mellanox-2700</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+       <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+         <a:ManagementIPInterface>
+           <Name>HostIP</Name>
+           <AttachTo>eth0</AttachTo>
+           <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+             <b:IPPrefix>10.100.0.100/24</b:IPPrefix>
+           </a:Prefix>
+           <a:PrefixStr>10.100.0.0/24</a:PrefixStr>
+         </a:ManagementIPInterface>
+         <a:ManagementIPInterface>
+           <Name>V6HostIP</Name>
+           <AttachTo>eth0</AttachTo>
+           <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+             <b:IPPrefix>fe80::526b:4bff:fecd:30cc/64</b:IPPrefix>
+           </a:Prefix>
+           <a:PrefixStr>fe80::526b:4bff:fecd:30cc/64</a:PrefixStr>
+         </a:ManagementIPInterface>
+       </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>mellanox-2700</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel0001</Name>
+          <AttachTo>etp17a</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0002</Name>
+          <AttachTo>etp17b</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0003</Name>
+          <AttachTo>etp18a</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel0004</Name>
+          <AttachTo>etp18b</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>etp1b;etp2a;etp2b;etp3a;etp3b;etp4a;etp4b;etp5a;etp5b;etp6a;etp6b;etp7;etp8;etp9;etp10;etp11a;etp11b;etp12a;etp12b;etp13a;etp13b;etp14a;etp14b;etp15a</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <Type i:nil="true"/>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4</DhcpRelays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0001</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0001</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0002</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0002</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0003</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0003</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel0004</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel0004</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel0001;PortChannel0002;PortChannel0003;PortChannel0004</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>mellanox-2700</StartDevice>
+        <StartPort>etp17a</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>mellanox-2700</StartDevice>
+        <StartPort>etp17b</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>mellanox-2700</StartDevice>
+        <StartPort>etp18a</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>mellanox-2700</StartDevice>
+        <StartPort>etp18b</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp1b</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp2a</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp2b</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp3a</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp3b</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp4a</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp4b</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp5a</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp5b</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp6a</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp6b</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp7</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp8</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp9</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp10</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp11a</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp11b</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp12a</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp12b</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp13a</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp13b</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp14a</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp14b</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp15a</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp1b</EndPort>
+        <StartDevice>Servers24</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp2a</EndPort>
+        <StartDevice>Servers25</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp2b</EndPort>
+        <StartDevice>Servers26</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp3a</EndPort>
+        <StartDevice>Servers27</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp3b</EndPort>
+        <StartDevice>Servers28</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp4a</EndPort>
+        <StartDevice>Servers29</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp4b</EndPort>
+        <StartDevice>Servers30</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp5a</EndPort>
+        <StartDevice>Servers31</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp5b</EndPort>
+        <StartDevice>Servers32</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp6a</EndPort>
+        <StartDevice>Servers33</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp6b</EndPort>
+        <StartDevice>Servers34</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp7</EndPort>
+        <StartDevice>Servers35</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp8</EndPort>
+        <StartDevice>Servers36</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp9</EndPort>
+        <StartDevice>Servers37</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp10</EndPort>
+        <StartDevice>Servers38</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp11a</EndPort>
+        <StartDevice>Servers39</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp11b</EndPort>
+        <StartDevice>Servers40</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp12a</EndPort>
+        <StartDevice>Servers41</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp12b</EndPort>
+        <StartDevice>Servers42</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp13a</EndPort>
+        <StartDevice>Servers43</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp13b</EndPort>
+        <StartDevice>Servers44</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp14a</EndPort>
+        <StartDevice>Servers45</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp14b</EndPort>
+        <StartDevice>Servers46</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>mellanox-2700</EndDevice>
+        <EndPort>etp15a</EndPort>
+        <StartDevice>Servers47</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>mellanox-2700</Hostname>
+        <HwSku>Mellanox-SN2700-D48C8</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.1</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.2</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.3</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.0.4</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.213.80.121</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp1a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp1b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp2a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp2b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp3a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp3b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp4a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp4b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp5a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp5b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp6a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp6b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp7</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp9</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp10</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp11a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp11b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp12a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp12b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp13a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp13b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp14a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp14b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp15a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp15b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp16a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp16b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp17a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp17b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp18a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp18b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp19a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp19b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp20a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp20b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp21a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp21b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp22a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp22b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp23</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp25</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp26</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp27a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp27b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp28a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp28b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp29a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp29b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp30a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp30b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp31a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp31b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp32a</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp32b</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Mellanox-SN2700-D48C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>mellanox-2700</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.9</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.7</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>mellanox-2700</Hostname>
+  <HwSku>Mellanox-SN2700-D48C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
new file mode 100644
index 000000000000..9c1638b9a83c
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
@@ -0,0 +1,1163 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet180": "5m",
+            "Ethernet8": "300m",
+            "Ethernet44": "300m",
+            "Ethernet184": "5m",
+            "Ethernet188": "5m",
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet108": "40m",
+            "Ethernet100": "40m",
+            "Ethernet128": "5m",
+            "Ethernet104": "40m",
+            "Ethernet40": "300m",
+            "Ethernet96": "40m",
+            "Ethernet124": "40m",
+            "Ethernet148": "5m",
+            "Ethernet92": "40m",
+            "Ethernet120": "40m",
+            "Ethernet220": "5m",
+            "Ethernet144": "5m",
+            "Ethernet52": "300m",
+            "Ethernet160": "5m",
+            "Ethernet140": "5m",
+            "Ethernet56": "300m",
+            "Ethernet164": "5m",
+            "Ethernet76": "40m",
+            "Ethernet72": "40m",
+            "Ethernet64": "40m",
+            "Ethernet32": "300m",
+            "Ethernet16": "300m",
+            "Ethernet36": "300m",
+            "Ethernet12": "300m",
+            "Ethernet196": "5m",
+            "Ethernet192": "5m",
+            "Ethernet200": "5m",
+            "Ethernet68": "40m",
+            "Ethernet168": "5m",
+            "Ethernet24": "300m",
+            "Ethernet116": "40m",
+            "Ethernet80": "40m",
+            "Ethernet112": "40m",
+            "Ethernet84": "40m",
+            "Ethernet152": "5m",
+            "Ethernet136": "5m",
+            "Ethernet156": "5m",
+            "Ethernet204": "5m",
+            "Ethernet132": "5m",
+            "Ethernet48": "300m",
+            "Ethernet172": "5m",
+            "Ethernet216": "5m",
+            "Ethernet176": "5m",
+            "Ethernet212": "5m",
+            "Ethernet28": "300m",
+            "Ethernet88": "40m",
+            "Ethernet60": "300m",
+            "Ethernet20": "300m",
+            "Ethernet208": "5m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "3302912",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            "size": "3302912",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "13945824",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "3302912",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
new file mode 100644
index 000000000000..21c14374d42a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
@@ -0,0 +1,1154 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet8": "5m",
+            "Ethernet2": "5m",
+            "Ethernet0": "5m",
+            "Ethernet6": "5m",
+            "Ethernet4": "5m",
+            "Ethernet108": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet58": "5m",
+            "Ethernet126": "5m",
+            "Ethernet96": "5m",
+            "Ethernet124": "5m",
+            "Ethernet122": "5m",
+            "Ethernet92": "5m",
+            "Ethernet120": "5m",
+            "Ethernet50": "5m",
+            "Ethernet52": "5m",
+            "Ethernet54": "5m",
+            "Ethernet56": "5m",
+            "Ethernet76": "5m",
+            "Ethernet74": "5m",
+            "Ethernet18": "5m",
+            "Ethernet70": "40m",
+            "Ethernet32": "5m",
+            "Ethernet72": "5m",
+            "Ethernet16": "5m",
+            "Ethernet36": "5m",
+            "Ethernet78": "5m",
+            "Ethernet60": "5m",
+            "Ethernet28": "5m",
+            "Ethernet62": "5m",
+            "Ethernet14": "5m",
+            "Ethernet88": "5m",
+            "Ethernet118": "5m",
+            "Ethernet24": "5m",
+            "Ethernet116": "5m",
+            "Ethernet82": "5m",
+            "Ethernet114": "5m",
+            "Ethernet80": "5m",
+            "Ethernet112": "5m",
+            "Ethernet86": "5m",
+            "Ethernet110": "5m",
+            "Ethernet84": "5m",
+            "Ethernet48": "5m",
+            "Ethernet10": "5m",
+            "Ethernet44": "5m",
+            "Ethernet42": "5m",
+            "Ethernet40": "5m",
+            "Ethernet64": "40m",
+            "Ethernet66": "40m",
+            "Ethernet12": "5m",
+            "Ethernet46": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet68": "40m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "7719936",
+            "xoff": "1032192",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "13945824",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "7719936",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet2": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet6": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet50": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet54": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet18": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet70": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet14": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet10": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet42": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet66": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet46": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet22": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet106": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet58": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet126": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet122": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet74": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet78": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet62": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet118": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet82": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet114": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet86": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet110": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet2": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet6": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet50": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet54": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet18": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet70": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet14": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet10": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet42": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet66": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet46": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet22": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet2|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet6|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet50|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet54|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet18|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet70|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet14|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet10|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet42|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet66|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet46|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet22|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet106|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet58|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet126|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet122|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet74|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet78|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet62|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet118|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet82|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet114|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet86|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet110|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet2|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet6|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet50|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet54|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet18|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet70|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet14|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet10|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet42|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet66|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet46|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet22|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet2|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet6|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet50|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet54|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet18|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet70|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet14|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet10|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet42|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet66|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet46|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet22|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet2|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet6|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet50|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet54|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet18|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet70|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet14|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet10|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet42|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet66|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet46|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet22|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet106|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet58|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet126|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet122|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet74|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet78|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet62|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet118|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet82|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet114|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet86|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet110|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
new file mode 100644
index 000000000000..0e989b4c2cc5
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
@@ -0,0 +1,1163 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "300m",
+            "Ethernet12": "300m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "300m",
+            "Ethernet28": "300m",
+            "Ethernet32": "300m",
+            "Ethernet36": "300m",
+            "Ethernet40": "300m",
+            "Ethernet44": "300m",
+            "Ethernet48": "300m",
+            "Ethernet52": "300m",
+            "Ethernet56": "300m",
+            "Ethernet60": "300m",
+            "Ethernet64": "40m",
+            "Ethernet68": "40m",
+            "Ethernet72": "40m",
+            "Ethernet76": "40m",
+            "Ethernet80": "40m",
+            "Ethernet84": "40m",
+            "Ethernet88": "40m",
+            "Ethernet92": "40m",
+            "Ethernet96": "40m",
+            "Ethernet100": "40m",
+            "Ethernet104": "40m",
+            "Ethernet108": "40m",
+            "Ethernet112": "40m",
+            "Ethernet116": "40m",
+            "Ethernet120": "40m",
+            "Ethernet124": "40m",
+            "Ethernet128": "5m",
+            "Ethernet132": "5m",
+            "Ethernet136": "5m",
+            "Ethernet140": "5m",
+            "Ethernet144": "5m",
+            "Ethernet148": "5m",
+            "Ethernet152": "5m",
+            "Ethernet156": "5m",
+            "Ethernet160": "5m",
+            "Ethernet164": "5m",
+            "Ethernet168": "5m",
+            "Ethernet172": "5m",
+            "Ethernet176": "5m",
+            "Ethernet180": "5m",
+            "Ethernet184": "5m",
+            "Ethernet188": "5m",
+            "Ethernet192": "5m",
+            "Ethernet196": "5m",
+            "Ethernet200": "5m",
+            "Ethernet204": "5m",
+            "Ethernet208": "5m",
+            "Ethernet212": "5m",
+            "Ethernet216": "5m",
+            "Ethernet220": "5m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "3302912",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            "size": "3302912",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "13945824",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "3302912",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json
new file mode 100644
index 000000000000..1042578564ef
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json
@@ -0,0 +1,1154 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "5m",
+            "Ethernet4": "5m",
+            "Ethernet6": "5m",
+            "Ethernet8": "5m",
+            "Ethernet10": "5m",
+            "Ethernet12": "5m",
+            "Ethernet14": "5m",
+            "Ethernet16": "5m",
+            "Ethernet18": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet42": "5m",
+            "Ethernet44": "5m",
+            "Ethernet46": "5m",
+            "Ethernet48": "5m",
+            "Ethernet50": "5m",
+            "Ethernet52": "5m",
+            "Ethernet54": "5m",
+            "Ethernet56": "5m",
+            "Ethernet58": "5m",
+            "Ethernet60": "5m",
+            "Ethernet62": "5m",
+            "Ethernet64": "40m",
+            "Ethernet66": "40m",
+            "Ethernet68": "40m",
+            "Ethernet70": "40m",
+            "Ethernet72": "5m",
+            "Ethernet74": "5m",
+            "Ethernet76": "5m",
+            "Ethernet78": "5m",
+            "Ethernet80": "5m",
+            "Ethernet82": "5m",
+            "Ethernet84": "5m",
+            "Ethernet86": "5m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet108": "5m",
+            "Ethernet110": "5m",
+            "Ethernet112": "5m",
+            "Ethernet114": "5m",
+            "Ethernet116": "5m",
+            "Ethernet118": "5m",
+            "Ethernet120": "5m",
+            "Ethernet122": "5m",
+            "Ethernet124": "5m",
+            "Ethernet126": "5m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "7719936",
+            "xoff": "1032192",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "13945824",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "7719936",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet66": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet70": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet2": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet6": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet10": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet14": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet18": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet22": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet42": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet46": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet50": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet54": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet58": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet62": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet74": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet78": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet82": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet86": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet106": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet110": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet114": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet118": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet122": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet126": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet66": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet70": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet2": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet6": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet10": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet14": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet18": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet22": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet42": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet46": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet50": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet54": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet66|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet70|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet2|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet6|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet10|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet14|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet18|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet22|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet42|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet46|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet50|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet54|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet58|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet62|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet74|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet78|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet82|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet86|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet106|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet110|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet114|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet118|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet122|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet126|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet66|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet70|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet2|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet6|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet10|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet14|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet18|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet22|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet42|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet46|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet50|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet54|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet66|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet70|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet2|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet6|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet10|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet14|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet18|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet22|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet42|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet46|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet50|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet54|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet66|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet70|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet2|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet6|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet10|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet14|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet18|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet22|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet42|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet46|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet50|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet54|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet58|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet62|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet74|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet78|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet82|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet86|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet106|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet110|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet114|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet118|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet122|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet126|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet58|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet62|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet74|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet78|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet82|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet86|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet106|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet110|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet114|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet118|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet122|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet126|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index ee03d3d382fc..57bb74fb2e83 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -22,6 +22,8 @@ def setUp(self):
         self.t1_mlnx_minigraph = os.path.join(self.test_dir, 't1-sample-graph-mlnx.xml')
         self.mlnx_port_config = os.path.join(self.test_dir, 'sample-port-config-mlnx.ini')
         self.dell6100_t0_minigraph = os.path.join(self.test_dir, 'sample-dell-6100-t0-minigraph.xml')
+        self.mellanox2700_t0_minigraph = os.path.join(self.test_dir, 'sample-mellanox-2700-t0-minigraph.xml')
+        self.mellanox2410_t1_minigraph = os.path.join(self.test_dir, 'sample-mellanox-2410-t1-minigraph.xml')
         self.arista7050_t0_minigraph = os.path.join(self.test_dir, 'sample-arista-7050-t0-minigraph.xml')
         self.multi_asic_minigraph = os.path.join(self.test_dir, 'multi_npu_data', 'sample-minigraph.xml')
         self.multi_asic_port_config = os.path.join(self.test_dir, 'multi_npu_data', 'sample_port_config-0.ini')
@@ -255,6 +257,46 @@ def test_buffers_dell6100_render_template(self):
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-dell6100.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
+    def test_buffers_mellanox2700_render_template(self):
+        # Mellanox buffer template rendering for single ingress pool mode
+        mellanox_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8')
+        buffers_file = os.path.join(mellanox_dir_path, 'buffers.json.j2')
+        port_config_ini_file = os.path.join(mellanox_dir_path, 'port_config.ini')
+
+        # copy buffers_config.j2 to the Mellanox 2700 directory to have all templates in one directory
+        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
+        shutil.copy2(buffers_config_file, mellanox_dir_path)
+
+        argument = '-m ' + self.mellanox2700_t0_minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
+        self.run_script(argument)
+
+        # cleanup
+        buffers_config_file_new = os.path.join(mellanox_dir_path, 'buffers_config.j2')
+        os.remove(buffers_config_file_new)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2700.json')
+        assert filecmp.cmp(sample_output_file, self.output_file)
+
+    def test_buffers_mellanox2410_render_template(self):
+        # Mellanox buffer template rendering for double ingress pools mode
+        mellanox_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410')
+        buffers_file = os.path.join(mellanox_dir_path, 'buffers.json.j2')
+        port_config_ini_file = os.path.join(mellanox_dir_path, 'port_config.ini')
+
+        # copy buffers_config.j2 to the Mellanox 2410 directory to have all templates in one directory
+        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
+        shutil.copy2(buffers_config_file, mellanox_dir_path)
+
+        argument = '-m ' + self.mellanox2410_t1_minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
+        self.run_script(argument)
+
+        # cleanup
+        buffers_config_file_new = os.path.join(mellanox_dir_path, 'buffers_config.j2')
+        os.remove(buffers_config_file_new)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
+        assert filecmp.cmp(sample_output_file, self.output_file)
+
     def test_ipinip_multi_asic(self):
         ipinip_file = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ipinip.json.j2')
         argument = '-m ' + self.multi_asic_minigraph + ' -p ' + self.multi_asic_port_config + ' -t ' + ipinip_file  +  ' -n asic0 '  + ' > ' + self.output_file

From 4d18fb83771c49d9c16d6c4462507c97cfe090cc Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Fri, 10 Dec 2021 08:24:24 -0800
Subject: [PATCH 0944/1674] [202012] [Arista] Update db with eeprom info
 through syseepromd (#9109)

Why I did it
Arista did not update db with eeprom info. Previous PR had issues that were reverted.

How I did it
Had Arista eeprom class inherit the class that has method to update db. Updated platform API methods for Arista 202012.

How to verify it
In redis-cli the keys and values can be seen. Can use sonic-mgmt testing to verify behavior, and see the chassis platform API methods have not regressed.
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index cf36e513e41c..361707e1aed6 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 361707e1aed64d3d6dac34c37ae6ea71ac519637
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index cf36e513e41c..361707e1aed6 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit cf36e513e41cd10a6d6aad5bcf71ef7871a2806d
+Subproject commit 361707e1aed64d3d6dac34c37ae6ea71ac519637

From 8836b6bcd24010eb200ecad9fa6538809b92a063 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 8 Dec 2021 21:51:33 +0800
Subject: [PATCH 0945/1674] [Mellanox] Adjust buffer parameters with 2km cable
 supported for 4600C non-generic SKUs (#9215)

- Why I did it
Also recalculated all parameters with the latest algorithm with per-speed peer response time taken into account

- How I did it
Detailed information of each SKU:

C64:
t0: 32 100G downlinks and 32 100G uplinks
t1: 56 100G downlinks and 8 100G uplinks with 2km-cable supported
D112C8: 112 50G downlinks and 8 100G uplinks.
D48C40: 48 50G downlinks, 32 100G downlinks, and 8 100G uplinks
D100C12S2: 4 100G downlinks, 2 10G downlinks, 100 50G downlinks, and 8 100G uplinks
2km cable is supported for C64 on t1 only

- How to verify it
Run regression test (QoS)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 .../pg_profile_lookup.ini                     | 34 +++++++++----------
 .../buffers_defaults_t0.j2                    |  6 ++--
 .../buffers_defaults_t1.j2                    |  6 ++--
 9 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
index 9b5dd7341cd2..c004a072c6b2 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '53379072' %}
-{% set ingress_lossless_xoff_size  =  '1540096' %}
+{% set ingress_lossless_pool_size =  '49905664' %}
+{% set ingress_lossless_xoff_size  =  '3702784' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '53379072' %}
+{% set egress_lossy_pool_size =  '49905664' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
index f05f4e15b128..800b019d5fb4 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '52723712' %}
-{% set ingress_lossless_xoff_size  =  '2195456' %}
+{% set ingress_lossless_pool_size =  '48332800' %}
+{% set ingress_lossless_xoff_size  =  '5275648' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '52723712' %}
+{% set egress_lossy_pool_size =  '48332800' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
index e5785e0744e7..164fc743ac02 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '48228352' %}
-{% set ingress_lossless_xoff_size = '2287616' %}
+{% set ingress_lossless_pool_size =  '44566528' %}
+{% set ingress_lossless_xoff_size = '3614720' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '48228352' %}
+{% set egress_lossy_pool_size =  '44566528' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
index a8f95220924f..a7d1e5daef5b 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '46315520' %}
-{% set ingress_lossless_xoff_size =  '4200448' %}
+{% set ingress_lossless_pool_size =  '43794432' %}
+{% set ingress_lossless_xoff_size =  '4386816' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '46315520' %}
+{% set egress_lossy_pool_size =  '43794432' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
index a960f9573f83..409564cf6306 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '47587328' %}
-{% set ingress_lossless_xoff_size = '2400256' %}
+{% set ingress_lossless_pool_size =  '43827200' %}
+{% set ingress_lossless_xoff_size = '3702784' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '47587328' %}
+{% set egress_lossy_pool_size =  '43827200' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
index ba80fcd24f4b..3666a782877e 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '46702592' %}
-{% set ingress_lossless_xoff_size =  '3284992' %}
+{% set ingress_lossless_pool_size =  '43048960' %}
+{% set ingress_lossless_xoff_size =  '4481024' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '46702592' %}
+{% set egress_lossy_pool_size =  '43048960' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
index fdcf8c0c3050..d2b8e16d96b2 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/pg_profile_lookup.ini
@@ -1,22 +1,22 @@
 #  PG lossless profiles.
 # speed cable  size   xon    xoff   threshold
   10000    5m 19456  19456  24576          0
-  25000    5m 19456  19456  24576          0
-  40000    5m 19456  19456  24576          0
-  50000    5m 19456  19456  24576          0
- 100000    5m 19456  19456  25600          0
-  10000   40m 19456  19456  24576          0
-  25000   40m 19456  19456  26624          0
-  40000   40m 19456  19456  27648          0
-  50000   40m 19456  19456  28672          0
- 100000   40m 19456  19456  32768          0
+  25000    5m 19456  19456  26624          0
+  40000    5m 19456  19456  30720          0
+  50000    5m 19456  19456  33792          0
+ 100000    5m 19456  19456  59392          0
+  10000   40m 19456  19456  25600          0
+  25000   40m 19456  19456  28672          0
+  40000   40m 19456  19456  33792          0
+  50000   40m 19456  19456  36864          0
+ 100000   40m 19456  19456  66560          0
   10000  300m 19456  19456  30720          0
-  25000  300m 19456  19456  39936          0
-  40000  300m 19456  19456  49152          0
-  50000  300m 19456  19456  55296          0
- 100000  300m 19456  19456  86016          0
+  25000  300m 19456  19456  41984          0
+  40000  300m 19456  19456  54272          0
+  50000  300m 19456  19456  63488          0
+ 100000  300m 19456  19456  120832         0
   10000 2000m 19456  19456  32768          0
-  25000 2000m 19456  19456  63488          0
-  40000 2000m 19456  19456  94208          0
-  50000 2000m 19456  19456  114688         0
- 100000 2000m 19456  19456  217088         0
+  25000 2000m 19456  19456  64512          0
+  40000 2000m 19456  19456  97280          0
+  50000 2000m 19456  19456  119808         0
+ 100000 2000m 19456  19456  234496         0
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
index e4a9294e0bcd..c6fdcc02b65b 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '50995200' %}
-{% set ingress_lossless_xoff_size = '1810432' %}
+{% set ingress_lossless_pool_size =  '47398912' %}
+{% set ingress_lossless_xoff_size = '3604480' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '50995200' %}
+{% set egress_lossy_pool_size =  '47398912' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
index 6f841c4f0950..dbaddd802067 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '50143232' %}
-{% set ingress_lossless_xoff_size = '2662400' %}
+{% set ingress_lossless_pool_size =  '46587904' %}
+{% set ingress_lossless_xoff_size = '4415488' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '50143232' %}
+{% set egress_lossy_pool_size =  '46587904' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 

From 0226140e9cd57ebab949cec0c3ee09db1a3e851b Mon Sep 17 00:00:00 2001
From: Travis Van Duyn <tsvanduyn@yahoo.com>
Date: Tue, 5 Jan 2021 13:43:29 -0800
Subject: [PATCH 0946/1674] [snmp]: updated to support snmp config from redis
 configdb (#6134)

**- Why I did it**
I'm updating the jinja2 template to support getting SNMP information from the redis configdb.
I'm using the format approved here:
https://github.com/Azure/SONiC/pull/718

This will pave the way for us to decrement using the snmp.yml in the future.
Right now we will still be using both the snmp.yml and configdb to get variable information in order to create the snmpd.conf via the sonic-cfggen tool.

**- How I did it**
I first updated the SNMP Schema in PR #718 to get that approved as a standardized format.
Then I verified I could add snmp configs to the configdb using this standard schema.  Once the configs were added to the configdb then I updated the snmpd.conf.j2 file to support the updates via the configdb while still using the variables in the snmp.yml file in parallel.  This way we will have backward compatibility until we can fully migrate to the configdb only.

By updating the snmpd.conf.j2 template and running the sonic-cfggen tool the snmpd.conf gets generated with using the values in both the configdb and snmp.yml file.

Co-authored-by: trvanduy <trvanduy@microsoft.com>
---
 dockers/docker-snmp/snmpd.conf.j2 | 44 +++++++++++++++++++++++++++----
 dockers/docker-snmp/start.sh      |  1 -
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/dockers/docker-snmp/snmpd.conf.j2 b/dockers/docker-snmp/snmpd.conf.j2
index 7d4022501fbb..b83fbffda025 100644
--- a/dockers/docker-snmp/snmpd.conf.j2
+++ b/dockers/docker-snmp/snmpd.conf.j2
@@ -34,16 +34,40 @@ view   systemonly  included   .1.3.6.1.2.1.1
 view   systemonly  included   .1.3.6.1.2.1.25.1
 
                                                  #  Default access to basic system info
-{% if snmp_rocommunities %}
-{% for community in snmp_rocommunities %}
+
+
+{% if SNMP_COMMUNITY is defined %}
+{% for community in SNMP_COMMUNITY %}
+{% if SNMP_COMMUNITY[community]['TYPE'] == 'RO' %}
 rocommunity {{ community }}
 rocommunity6 {{ community }}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+{% if SNMP_COMMUNITY is defined %}
+{% for community in SNMP_COMMUNITY %}
+{% if SNMP_COMMUNITY[community]['TYPE'] == 'RW' %}
+rwcommunity {{ community }}
+rwcommunity6 {{ community }}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+{% if SNMP_USER is defined %}
+{% for user in SNMP_USER %}
+{% if SNMP_USER[user]['SNMP_USER_PERMISSION'] == 'RO' %}
+rouser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
+CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
+{% elif SNMP_USER[user]['SNMP_USER_PERMISSION'] == 'RW' %}
+rwuser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
+CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
+{% endif %}
 {% endfor %}
 {% else %}
-rocommunity {{ snmp_rocommunity }}
-rocommunity6 {{ snmp_rocommunity }}
 {% endif %}
 
+
 ###############################################################################
 #
 #  SYSTEM INFORMATION
@@ -51,8 +75,18 @@ rocommunity6 {{ snmp_rocommunity }}
 
 #  Note that setting these values here, results in the corresponding MIB objects being 'read-only'
 #  See snmpd.conf(5) for more details
-sysLocation    {{ snmp_location }}
+
+{% if SNMP is defined and SNMP.LOCATION is defined %}
+sysLocation    {{ SNMP.LOCATION.Location }}
+{% else %}
+sysLocation    public
+{% endif %}
+{% if SNMP is defined and SNMP.CONTACT is defined %}
+sysContact     {{ SNMP.CONTACT.keys()[0] }} {{ SNMP.CONTACT.values()[0] }}
+{% else %}
 sysContact     Azure Cloud Switch vteam <linuxnetdev@microsoft.com>
+{% endif %}
+
                                                  # Application + End-to-End layers
 sysServices    72
 
diff --git a/dockers/docker-snmp/start.sh b/dockers/docker-snmp/start.sh
index 70f139bec45e..aefd0bfc3db6 100755
--- a/dockers/docker-snmp/start.sh
+++ b/dockers/docker-snmp/start.sh
@@ -20,7 +20,6 @@ SONIC_CFGGEN_ARGS=" \
     -d \
     -y /etc/sonic/sonic_version.yml \
     -t /usr/share/sonic/templates/sysDescription.j2,/etc/ssw/sysDescription \
-    -y /etc/sonic/snmp.yml \
     -t /usr/share/sonic/templates/snmpd.conf.j2,/etc/snmp/snmpd.conf \
 "
 

From 0197855d5dbb93324ae949fe7e6874b694524322 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 14 Dec 2021 08:04:06 +0800
Subject: [PATCH 0947/1674] [Mellanox] [202012] Allow user to set LED to orange
 (#9514)

Backport https://github.com/Azure/sonic-buildimage/pull/9259 to 202012

#### Why I did it

Nvidia platform API does not support set LED to orange.

#### How I did it

Allow user to set LED to orange

#### How to verify it

Manual test
---
 .../mlnx-platform-api/sonic_platform/led.py       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/led.py b/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
index d67cbb1d9557..57c4815676c0 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/led.py
@@ -41,6 +41,17 @@ def set_status(self, color):
                 else:
                     return False
 
+                with open(led_path, 'w') as led:
+                    led.write(Led.LED_ON)
+                    status = True
+            elif color == Led.STATUS_LED_COLOR_ORANGE:
+                if Led.STATUS_LED_COLOR_ORANGE in led_cap_list:
+                    led_path = self.get_orange_led_path()
+                elif Led.STATUS_LED_COLOR_RED in led_cap_list:
+                    led_path = self.get_red_led_path()
+                else:
+                    return False
+
                 with open(led_path, 'w') as led:
                     led.write(Led.LED_ON)
                     status = True
@@ -158,7 +169,7 @@ def get_capability(self):
                 cap_list = set(caps.split())
         except (ValueError, IOError):
             pass
-        
+
         return cap_list
 
     def get_green_led_path(self):
@@ -191,7 +202,7 @@ def get_orange_led_delay_on_path(self):
     def get_led_cap_path(self):
         pass
 
- 
+
 class FanLed(Led):
     LED_PATH = "/var/run/hw-management/led/"
 

From c6f38d98151fe8f28df072f4c7eb8dfe7fb026fe Mon Sep 17 00:00:00 2001
From: Devesh Pathak <54966909+devpatha@users.noreply.github.com>
Date: Tue, 14 Dec 2021 00:03:09 -0800
Subject: [PATCH 0948/1674] [202012][sonic-swss] Updated submodule for
 sonic-swss (#9422)

---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c31a36261724..e37302d8096b 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c31a3626172489e71bad4b851861489e82ef183c
+Subproject commit e37302d8096b06d49c37e9c4062d180fc4d752e1

From 724037ebc3c93e5b7876cb11a80675227084c54d Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:56:21 -0800
Subject: [PATCH 0949/1674] BRCM SAI 4.3.5.1-9 for enabling
 SAI_SWITCH_ATTR_QOS_DSCP_TO_TC_MAP capability (#9463)

---
 files/build/versions/default/versions-web | 4 ++--
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 2ee361f91d3b..4e188c2eee83 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,8 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A11%3A49Z&se=2035-11-18T23%3A11%3A00Z&sr=b&sp=r&sig=GrvWbhm9UhQVusyEp7SdSUbauvARe6vh%2BQjXfysODBw%3D==a613ce2288092332ca2961f3025371df
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A06%3A02Z&se=2035-11-18T23%3A06%3A00Z&sr=b&sp=r&sig=0%2BkErbtVjoER05lW5XrB%2B%2BdZ%2FBifcWgk9651zsYMKNw%3D==bd8b1d3cbd2ceaa2f7cb172cf3b2ea09
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 54969f64b835..7aab123eb789 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-8_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A06%3A02Z&se=2035-11-18T23%3A06%3A00Z&sr=b&sp=r&sig=0%2BkErbtVjoER05lW5XrB%2B%2BdZ%2FBifcWgk9651zsYMKNw%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-8_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.1-9_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-9_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-8_amd64.deb?sv=2020-04-08&st=2021-11-17T23%3A11%3A49Z&se=2035-11-18T23%3A11%3A00Z&sr=b&sp=r&sig=GrvWbhm9UhQVusyEp7SdSUbauvARe6vh%2BQjXfysODBw%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a41c15a3295c0186112319d70c5dc818c460780f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 14 Dec 2021 14:45:23 -0800
Subject: [PATCH 0950/1674] [swss]: Listen for undeliverable tunnel packets
 (#9348)

- Create a script in the orchagent docker container which listens for these encapsulated packets which are trapped to CPU (indicating that they cannot be routed/no neighbor info exists for the inner packet). When such a packet is received, the script will issue a ping command to the packet's inner destination IP to start the neighbor learning process.
- This script is also resilient to portchannel status changes (i.e. interface going up or down). An interface going down does not affect traffic sniffing on interfaces which are still up. When an interface comes back up, we restart the sniffer to start capturing traffic on that interface again.
---
 dockers/docker-orchagent/Dockerfile.j2        |   2 +-
 dockers/docker-orchagent/supervisord.conf     |   9 +
 .../docker-orchagent/tunnel_packet_handler.py | 326 ++++++++++++++++++
 3 files changed, 336 insertions(+), 1 deletion(-)
 create mode 100755 dockers/docker-orchagent/tunnel_packet_handler.py

diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index fd914802cd51..41425c4d9bf6 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -68,7 +68,7 @@ RUN apt-get purge -y          \
 COPY ["files/arp_update", "/usr/bin"]
 COPY ["arp_update.conf", "files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
 COPY ["ndppd.conf", "/usr/share/sonic/templates/"]
-COPY ["enable_counters.py", "/usr/bin"]
+COPY ["enable_counters.py", "tunnel_packet_handler.py", "/usr/bin/"]
 COPY ["docker-init.sh", "orchagent.sh", "swssconfig.sh", "buffermgrd.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 984f0a2ab7df..d0264e7c5d5a 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -206,3 +206,12 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=swssconfig:exited
 
+[program:tunnel_packet_handler]
+command=/usr/bin/tunnel_packet_handler.py
+priority=12
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
diff --git a/dockers/docker-orchagent/tunnel_packet_handler.py b/dockers/docker-orchagent/tunnel_packet_handler.py
new file mode 100755
index 000000000000..7d9f7f561260
--- /dev/null
+++ b/dockers/docker-orchagent/tunnel_packet_handler.py
@@ -0,0 +1,326 @@
+#! /usr/bin/env python3
+"""
+Adds neighbor to kernel for undeliverable tunnel packets
+
+When receiving tunnel packets, if the hardware doesn't contain neighbor
+information for the inner packet's destination IP, the entire encapsulated
+packet is trapped to the CPU. In this case, we should ping the inner
+destination IP to trigger the process of obtaining neighbor information
+"""
+import subprocess
+import time
+
+from datetime import datetime
+from ipaddress import ip_interface
+from pyroute2 import IPRoute
+from scapy.layers.inet import IP
+from scapy.layers.inet6 import IPv6
+from scapy.sendrecv import AsyncSniffer
+from swsssdk import ConfigDBConnector, SonicV2Connector
+from sonic_py_common import logger as log
+
+logger = log.Logger()
+
+STATE_DB = 'STATE_DB'
+PORTCHANNEL_INTERFACE_TABLE = 'PORTCHANNEL_INTERFACE'
+TUNNEL_TABLE = 'TUNNEL'
+PEER_SWITCH_TABLE = 'PEER_SWITCH'
+INTF_TABLE_TEMPLATE = 'INTERFACE_TABLE|{}|{}'
+STATE_KEY = 'state'
+TUNNEL_TYPE_KEY = 'tunnel_type'
+DST_IP_KEY = 'dst_ip'
+ADDRESS_IPV4_KEY = 'address_ipv4'
+IPINIP_TUNNEL = 'ipinip'
+
+RTM_NEWLINK = 'RTM_NEWLINK'
+
+
+class TunnelPacketHandler(object):
+
+    def __init__(self):
+        self.config_db = ConfigDBConnector()
+        self.config_db.connect()
+        self.state_db = SonicV2Connector()
+        self.state_db.connect(STATE_DB)
+        self._portchannel_intfs = None
+        self.up_portchannels = None
+        self.netlink_api = IPRoute()
+
+    @property
+    def portchannel_intfs(self):
+        """
+        Gets all portchannel interfaces and IPv4 addresses in config DB
+
+        Returns:
+            (list) Tuples of a portchannel interface name (str) and
+                   associated IPv4 address (str)
+        """
+        if self._portchannel_intfs is None:
+            intf_keys = self.config_db.get_keys(PORTCHANNEL_INTERFACE_TABLE)
+            portchannel_intfs = []
+
+            for key in intf_keys:
+                if isinstance(key, tuple) and len(key) > 1:
+                    if ip_interface(key[1]).version == 4:
+                        portchannel_intfs.append(key)
+
+            self._portchannel_intfs = portchannel_intfs
+
+        return self._portchannel_intfs
+
+    def get_portchannel_index_mapping(self):
+        """
+        Gets a mapping of interface kernel indices to portchannel interfaces
+
+        Returns:
+            (list) integers representing kernel indices
+        """
+        index_map = {}
+        for portchannel in self.portchannel_intfs:
+            index = self.netlink_api.link_lookup(ifname=portchannel[0])[0]
+            index_map[index] = portchannel
+
+        return index_map
+
+    def get_up_portchannels(self):
+        """
+        Returns the portchannels which are operationally up
+
+        Returns:
+            (list) of interface names which are up, as strings
+        """
+        pc_index_map = self.get_portchannel_index_mapping()
+        pc_indices = list(pc_index_map.keys())
+        link_statuses = self.netlink_api.get_links(*pc_indices)
+        up_portchannels = []
+
+        for status in link_statuses:
+            if status['state'] == 'up':
+                port_index = status['index']
+                up_portchannels.append(pc_index_map[port_index][0])
+
+        return up_portchannels
+
+    def all_portchannels_established(self):
+        """
+        Checks if the portchannel interfaces are established
+
+        Note that this status does not indicate operational state
+        Returns:
+            (bool) True, if all interfaces are established
+                   False, otherwise
+        """
+        intfs = self.portchannel_intfs
+        for intf in intfs:
+            intf_table_name = INTF_TABLE_TEMPLATE.format(intf[0], intf[1])
+            intf_state = self.state_db.get(
+                                STATE_DB,
+                                intf_table_name,
+                                STATE_KEY
+                              )
+
+            if intf_state and intf_state.lower() != 'ok':
+                return False
+
+        return True
+
+    def wait_for_portchannels(self, interval=5, timeout=60):
+        """
+        Continuosly checks if all portchannel host interfaces are established
+
+        Args:
+            interval: the interval (in seconds) at which to perform the check
+            timeout: maximum allowed duration (in seconds) to wait for
+                     interfaces to come up
+
+        Raises:
+            RuntimeError if the timeout duration is reached and interfaces are
+                still not up
+        """
+        start = datetime.now()
+
+        while (datetime.now() - start).seconds < timeout:
+            if self.all_portchannels_established():
+                logger.log_info("All portchannel intfs are established")
+                return None
+            logger.log_info("Not all portchannel intfs are established")
+            time.sleep(interval)
+
+        raise RuntimeError('Portchannel intfs were not established '
+                           'within {}'.format(timeout))
+
+    def get_ipinip_tunnel_addrs(self):
+        """
+        Get the IP addresses used for the IPinIP tunnel
+
+        These should be the Loopback0 addresses for this device and the
+        peer device
+
+        Returns:
+            ((str) self_loopback_ip, (str) peer_loopback_ip)
+            or
+            (None, None) If the tunnel type is not IPinIP
+                         or
+                         if an error is encountered. This most likely means
+                         the host device is not a dual ToR device
+        """
+        try:
+            peer_switch = self.config_db.get_keys(PEER_SWITCH_TABLE)[0]
+            tunnel = self.config_db.get_keys(TUNNEL_TABLE)[0]
+        except IndexError:
+            logger.log_warning('PEER_SWITCH or TUNNEL table'
+                               'not found in config DB')
+            return None, None
+
+        try:
+            tunnel_table = self.config_db.get_entry(TUNNEL_TABLE, tunnel)
+            tunnel_type = tunnel_table[TUNNEL_TYPE_KEY].lower()
+            self_loopback_ip = tunnel_table[DST_IP_KEY]
+            peer_loopback_ip = self.config_db.get_entry(
+                                    PEER_SWITCH_TABLE, peer_switch
+                                    )[ADDRESS_IPV4_KEY]
+        except KeyError as e:
+            logger.log_warning(
+                'PEER_SWITCH or TUNNEL table missing data, '
+                'could not find key {}'
+                .format(e)
+            )
+            return None, None
+
+        if tunnel_type == IPINIP_TUNNEL:
+            return self_loopback_ip, peer_loopback_ip
+
+        return None, None
+
+    def get_inner_pkt_type(self, packet):
+        """
+        Get the type of an inner encapsulated packet
+
+        Returns:
+            (str)  'v4' if the inner packet is IPv4
+            (str)  'v6' if the inner packet is IPv6
+            (bool) False if `packet` is not an IPinIP packet
+        """
+        if packet.haslayer(IP):
+            # Determine inner packet type based on IP protocol number
+            # The outer packet type should always be IPv4
+            if packet[IP].proto == 4:
+                return IP
+            elif packet[IP].proto == 41:
+                return IPv6
+        return False
+
+    def wait_for_netlink_msgs(self):
+        """
+        Gathers any RTM_NEWLINK messages
+
+        Returns:
+            (list) containing any received messages
+        """
+        msgs = []
+        with IPRoute() as ipr:
+            ipr.bind()
+            for msg in ipr.get():
+                if msg['event'] == RTM_NEWLINK:
+                    msgs.append(msg)
+
+        return msgs
+
+    def sniffer_restart_required(self, messages):
+        """
+        Determines if the packet sniffer needs to be restarted
+
+        A restart is required if all of the following conditions are met:
+            1. A netlink message of type RTM_NEWLINK is received
+               (this is checked by `wait_for_netlink_msgs`)
+            2. The interface index of the message corresponds to a portchannel
+               interface
+            3. The state of the interface in the message is 'up'
+                    Here, we do not care about an interface going down since
+                    the sniffer is able to continue sniffing on the other
+                    interfaces. However, if an interface has gone down and
+                    come back up, we need to restart the sniffer to be able
+                    to sniff traffic on the interface that has come back up.
+        """
+        pc_index_map = self.get_portchannel_index_mapping()
+        for msg in messages:
+            if msg['index'] in pc_index_map:
+                if msg['state'] == 'up':
+                    logger.log_info('{} came back up, sniffer restart required'
+                                    .format(pc_index_map[msg['index']]))
+                    return True
+        return False
+
+    def listen_for_tunnel_pkts(self):
+        """
+        Listens for tunnel packets that are trapped to CPU
+
+        These packets may be trapped if there is no neighbor info for the
+        inner packet destination IP in the hardware.
+        """
+
+        def _ping_inner_dst(packet):
+            """
+            Pings the inner destination IP for an encapsulated packet
+
+            Args:
+                packet: The encapsulated packet received
+            """
+            inner_packet_type = self.get_inner_pkt_type(packet)
+            if inner_packet_type and packet[IP].dst == self_ip:
+                cmds = ['timeout', '0.2', 'ping', '-c1',
+                        '-W1', '-i0', '-n', '-q']
+                if inner_packet_type == IPv6:
+                    cmds.append('-6')
+                dst_ip = packet[IP].payload[inner_packet_type].dst
+                cmds.append(dst_ip)
+                logger.log_info("Running command '{}'".format(' '.join(cmds)))
+                subprocess.run(cmds, stdout=subprocess.DEVNULL)
+
+        self_ip, peer_ip = self.get_ipinip_tunnel_addrs()
+        if self_ip is None or peer_ip is None:
+            logger.log_notice('Could not get tunnel addresses from '
+                              'config DB, exiting...')
+            return None
+
+        packet_filter = 'host {} and host {}'.format(self_ip, peer_ip)
+        logger.log_notice('Starting tunnel packet handler for {}'
+                          .format(packet_filter))
+
+        sniff_intfs = self.get_up_portchannels()
+        logger.log_info("Listening on interfaces {}".format(sniff_intfs))
+
+        sniffer = AsyncSniffer(
+            iface=sniff_intfs,
+            filter=packet_filter,
+            prn=_ping_inner_dst
+
+        )
+        sniffer.start()
+        while True:
+            msgs = self.wait_for_netlink_msgs()
+            if self.sniffer_restart_required(msgs):
+                sniffer.stop()
+                sniff_intfs = self.get_up_portchannels()
+                logger.log_notice('Restarting tunnel packet handler on '
+                                  'interfaces {}'.format(sniff_intfs))
+                sniffer = AsyncSniffer(
+                    iface=sniff_intfs,
+                    filter=packet_filter,
+                    prn=_ping_inner_dst
+                )
+                sniffer.start()
+
+    def run(self):
+        self.wait_for_portchannels()
+        self.listen_for_tunnel_pkts()
+
+
+def main():
+    logger.set_min_log_priority_info()
+    handler = TunnelPacketHandler()
+    handler.run()
+
+
+if __name__ == "__main__":
+    main()

From 006582b3e21f3b463a156a91e32854c4b270f9e6 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Fri, 17 Dec 2021 11:56:01 -0800
Subject: [PATCH 0951/1674] [dhcp_relay] Update DHCPv6 counter on relayed
 messages (#9283) (#9578)

(cherry picked from commit f2ee94d201a5b8a6ebf09d0680a526fc14cc41a2)
---
 src/dhcp6relay/src/relay.cpp | 24 +++++++++++++++++++-----
 src/dhcp6relay/src/relay.h   |  7 +++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index 11bb4ace42d1..d8fa2747a544 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -49,7 +49,8 @@ const struct sock_fprog ether_relay_fprog = {
 
 /* DHCPv6 Counter */
 uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
-std::map<int, std::string> counterMap = {{1, "Solicit"},
+std::map<int, std::string> counterMap = {{0, "Unknown"},
+                                      {1, "Solicit"},
                                       {2, "Advertise"},
                                       {3, "Request"},
                                       {4, "Confirm"},
@@ -72,6 +73,7 @@ std::map<int, std::string> counterMap = {{1, "Solicit"},
  * @return              none
  */
 void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
+    db->hset(counterVlan, "Unknown", toString(counters[DHCPv6_MESSAGE_TYPE_UNKNOWN]));
     db->hset(counterVlan, "Solicit", toString(counters[DHCPv6_MESSAGE_TYPE_SOLICIT]));
     db->hset(counterVlan, "Advertise", toString(counters[DHCPv6_MESSAGE_TYPE_ADVERTISE]));
     db->hset(counterVlan, "Request", toString(counters[DHCPv6_MESSAGE_TYPE_REQUEST]));
@@ -208,19 +210,26 @@ const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_
 }
 
 /**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n);
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
  *
  * @brief                           send udp packet
  *
  * @param *buffer                   message buffer
  * @param sockaddr_in6 target       target socket
  * @param n                         length of message
+ * @param relay_config *config      pointer to relay_config
+ * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
  * 
  * @return dhcpv6_option   end of dhcpv6 message option
  */
-void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n) {    
+void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type) {
+    std::string counterVlan = counter_table;
     if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
         syslog(LOG_ERR, "sendto: Failed to send to target address\n");
+    else {
+        counters[msg_type]++;
+        update_counter(config->db, counterVlan.append(config->interface), msg_type);
+    }
 }
 
 /**
@@ -453,7 +462,7 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
     current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
 
     for(auto server: config->servers_sock) {
-        send_udp(sock, buffer, server, current_buffer_position - buffer);
+        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
     }
 }
 
@@ -471,6 +480,7 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
  */
  void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs) {
     static uint8_t buffer[4096];
+    uint8_t type = 0;
     char ifname[configs->interface.size()];
     struct sockaddr_in6 target_addr;
     auto current_buffer_position = buffer;
@@ -479,6 +489,9 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
     auto dhcp_relay_header = parse_dhcpv6_relay(msg);
     current_position += sizeof(struct dhcpv6_relay_msg);
     
+    auto position = current_position + sizeof(struct dhcpv6_option);
+    auto dhcpv6msg = parse_dhcpv6_hdr(position);
+
     while ((current_position - msg) != len) {
         auto option = parse_dhcpv6_opt(current_position, &tmp);
         current_position = tmp;
@@ -486,6 +499,7 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
             case OPTION_RELAY_MSG:
                 memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
                 current_buffer_position += ntohs(option->option_length);
+                type = dhcpv6msg->msg_type;;
                 break;
             default:
                 break;
@@ -499,7 +513,7 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
     target_addr.sin6_port = htons(CLIENT_PORT);
     target_addr.sin6_scope_id = if_nametoindex(ifname);
 
-    send_udp(sock, buffer, target_addr, current_buffer_position - buffer);
+    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, configs, type);
 } 
 
 
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
index 6be60697da7e..e50d39786b4f 100644
--- a/src/dhcp6relay/src/relay.h
+++ b/src/dhcp6relay/src/relay.h
@@ -25,6 +25,7 @@
 /* DHCPv6 message types */
 typedef enum
 {
+    DHCPv6_MESSAGE_TYPE_UNKNOWN = 0,
     DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
     DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
     DHCPv6_MESSAGE_TYPE_REQUEST = 3,
@@ -321,15 +322,17 @@ const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
 const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
 
 /**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n);
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
  *
  * @brief                           send udp packet
  *
  * @param *buffer                   message buffer
  * @param sockaddr_in6 target       target socket
  * @param n                         length of message
+ * @param relay_config *config      pointer to relay_config
+ * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
  * 
  * @return dhcpv6_option   end of dhcpv6 message option
  */
-void send_udp(int sock, struct sockaddr_in6 target, uint8_t *buffer, uint32_t n);
+void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
 

From 60ac485f96a5bf8ce3702935bf28e3caba1287ab Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Mon, 26 Jul 2021 10:16:19 -0700
Subject: [PATCH 0952/1674] Reduce route selection deferral timer for bgp
 graceful restart (#7533)

Why I did it
There are scenarios that End-of-RIB comes from a part of the peers arrives after reconciliation. In such scenarios, if the route selection deferral timer has the default value of 360 seconds, FRR would not set up routes and all routes would be removed after reconciliation. This PR reduces the route selection deferral timer so that at least routes to parts of the peers get restored at the point of reconciliation.

Fix #7488

How I did it
Reduce route selection deferral timer for bgp graceful restart to 15 seconds.
---
 dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2                | 1 +
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf  | 1 +
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf           | 1 +
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf      | 1 +
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf   | 1 +
 src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf    | 1 +
 .../tests/sample_output/py2/bgpd_frr_backend_asic.conf           | 1 +
 .../tests/sample_output/py2/bgpd_frr_frontend_asic.conf          | 1 +
 src/sonic-config-engine/tests/sample_output/py2/frr.conf         | 1 +
 .../tests/sample_output/py2/t2-chassis-fe-bgpd.conf              | 1 +
 src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf    | 1 +
 .../tests/sample_output/py3/bgpd_frr_backend_asic.conf           | 1 +
 .../tests/sample_output/py3/bgpd_frr_frontend_asic.conf          | 1 +
 src/sonic-config-engine/tests/sample_output/py3/frr.conf         | 1 +
 .../tests/sample_output/py3/t2-chassis-fe-bgpd.conf              | 1 +
 15 files changed, 15 insertions(+)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index cf0b0f0077c6..451080584d80 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -52,6 +52,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
 {% endif %}
 !
 {# set router-id #}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index e2f9964766c1..221daa00083b 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -47,6 +47,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index c7f2971fd7c0..843ea9b7b7e7 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -29,6 +29,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 431499ceaf92..8b04c4a9a7ca 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -29,6 +29,7 @@ router bgp 55555
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index a43da1beedaf..b10798220497 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -66,6 +66,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
index 4245076ad96f..2c146698a960 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -50,6 +50,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
index ce4f4d7ce23f..702f588cab57 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
index dcdcc78af033..3296bed6e6fd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
index 259415e89e65..7d985db93b97 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -69,6 +69,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
index 7633ac117bf7..d3b9b472c5bd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
@@ -66,6 +66,7 @@ router bgp 4000
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
index b8a7f2568232..e7534d4b9781 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -50,6 +50,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index ce4f4d7ce23f..702f588cab57 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index dcdcc78af033..3296bed6e6fd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
index 02173159ae9b..43bed33c4bd0 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -69,6 +69,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
index 7633ac117bf7..d3b9b472c5bd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -66,6 +66,7 @@ router bgp 4000
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !

From bdf31a6556433e065561308e1a07877cbdffa31d Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 14 Dec 2021 10:56:19 +0200
Subject: [PATCH 0953/1674] [Mellanox][SDK] Build SDK with PRM sniffer support
 (#9500)

- Why I did it
To have an ability to use PRM sniffer.

- How I did it
Enabled the option in configure flags.

- How to verify it
Built and ran on switch. Enabled the feature in runtime and checked the sniffer recording.
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 platform/mellanox/sdk-src/sxd-libs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/sdk-src/sxd-libs/Makefile b/platform/mellanox/sdk-src/sxd-libs/Makefile
index 0b142c920828..892974e75e5f 100644
--- a/platform/mellanox/sdk-src/sxd-libs/Makefile
+++ b/platform/mellanox/sdk-src/sxd-libs/Makefile
@@ -20,7 +20,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 		./autogen.sh
 	fi
 
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	debuild -e 'configure_options=--enable-sniffer=yes' -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 
 	popd
 

From 9fe3e1732a23781bf1c7bd81ab5055c930163d02 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 15 Dec 2021 17:55:55 -0800
Subject: [PATCH 0954/1674] [sonic-slave]: Upgrade python lxml library version
 to 4.6.5 (#9529)

Bumps lxml from 4.6.5.
---
 sonic-slave-buster/Dockerfile.j2  | 4 ++--
 sonic-slave-stretch/Dockerfile.j2 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 3e8dad321cb7..ba3809187381 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -422,8 +422,8 @@ RUN pip2 install j2cli==0.3.10
 # For sonic-mgmt-framework
 RUN pip2 install "PyYAML==5.4.1"
 RUN pip3 install "PyYAML==5.4.1"
-RUN pip2 install "lxml==4.6.2"
-RUN pip3 install "lxml==4.6.2"
+RUN pip2 install "lxml==4.6.5"
+RUN pip3 install "lxml==4.6.5"
 
 # For sonic-platform-common testing
 RUN pip3 install redis==3.5.3
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 2acaaf6c9cb6..1cef023b7a04 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -349,8 +349,8 @@ RUN pip3 install mockredispy==2.9.3
 # For sonic-mgmt-framework
 RUN pip2 install "PyYAML==5.3.1"
 RUN pip3 install "PyYAML==5.3.1"
-RUN pip2 install "lxml==4.6.2"
-RUN pip3 install "lxml==4.6.2"
+RUN pip2 install "lxml==4.6.5"
+RUN pip3 install "lxml==4.6.5"
 
 
 # For sonic-platform-common testing

From bbb88c4a1843f4296570dcfbdb255ab653bb382a Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Fri, 17 Dec 2021 09:21:32 -0800
Subject: [PATCH 0955/1674] [RESTAPI] Update submodule (#9547)

---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index e842c5ff317c..94805a39ac07 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit e842c5ff317c67919dcbcab3358143cb9a16c9dd
+Subproject commit 94805a39ac0712219f7dc08faa2cfdbf371dd177

From d8ee1e6a633f8782bf47d5953f8612a347598747 Mon Sep 17 00:00:00 2001
From: Vadym Hlushko <62022266+vadymhlushko-mlnx@users.noreply.github.com>
Date: Tue, 21 Dec 2021 09:42:34 +0200
Subject: [PATCH 0956/1674] [Mellanox] [SN4410] [202012] Fixed port_config.ini
 (#9542)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### Why I did it
The capability files were incorrect in comparison to the marketing spec of the SN4410 platform.

#### How I did it
Aligned the capability files according to the marketing spec.

#### How to verify it
Did basic manual sanity checks:
- Check if critical docker containers were UP
- Check if interfaces were created and were UP
- Check if interfaces created in the syncd docker container by executing – sx_api_ports_dump.py script
- Check the logs from the start of the switch – everything was OK
- Verified the port breakout
---
 .../ACS-MSN4410/port_config.ini               | 90 ++++++++++++-------
 1 file changed, 57 insertions(+), 33 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
index 5b76c3a59d40..53c86ecb055e 100644
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/port_config.ini
@@ -1,33 +1,57 @@
-# name          lanes                               alias     index
-Ethernet0       0,1,2,3                             etp1      1
-Ethernet8       8,9,10,11                           etp2      2
-Ethernet16      16,17,18,19                         etp3      3
-Ethernet24      24,25,26,27                         etp4      4
-Ethernet32      32,33,34,35                         etp5      5
-Ethernet40      40,41,42,43                         etp6      6
-Ethernet48      48,49,50,51                         etp7      7
-Ethernet56      56,57,58,59                         etp8      8
-Ethernet64      64,65,66,67                         etp9      9
-Ethernet72      72,73,74,75                         etp10     10
-Ethernet80      80,81,82,83                         etp11     11
-Ethernet88      88,89,90,91                         etp12     12
-Ethernet96      96,97,98,99                         etp13     13
-Ethernet104     104,105,106,107                     etp14     14
-Ethernet112     112,113,114,115                     etp15     15
-Ethernet120     120,121,122,123                     etp16     16
-Ethernet128     128,129,130,131                     etp17     17
-Ethernet136     136,137,138,139                     etp18     18
-Ethernet144     144,145,146,147                     etp19     19
-Ethernet152     152,153,154,155                     etp20     20
-Ethernet160     160,161,162,163                     etp21     21
-Ethernet168     168,169,170,171                     etp22     22
-Ethernet176     176,177,178,179                     etp23     23
-Ethernet184     184,185,186,187                     etp24     24
-Ethernet192     192,193,194,195,196,197,198,199     etp25     25
-Ethernet200     200,201,202,203,204,205,206,207     etp26     26
-Ethernet208     208,209,210,211,212,213,214,215     etp27     27
-Ethernet216     216,217,218,219,220,221,222,223     etp28     28
-Ethernet224     224,225,226,227,228,229,230,231     etp29     29
-Ethernet232     232,233,234,235,236,237,238,239     etp30     30
-Ethernet240     240,241,242,243,244,245,246,247     etp31     31
-Ethernet248     248,249,250,251,252,253,254,255     etp32     32
\ No newline at end of file
+# name          lanes                               alias     index    speed
+Ethernet0       0,1,2,3                             etp1a     1        100000
+Ethernet4       4,5,6,7                             etp1b     1        100000
+Ethernet8       8,9,10,11                           etp2a     2        100000
+Ethernet12      12,13,14,15                         etp2b     2        100000
+Ethernet16      16,17,18,19                         etp3a     3        100000
+Ethernet20      20,21,22,23                         etp3b     3        100000
+Ethernet24      24,25,26,27                         etp4a     4        100000
+Ethernet28      28,29,30,31                         etp4b     4        100000
+Ethernet32      32,33,34,35                         etp5a     5        100000
+Ethernet36      36,37,38,39                         etp5b     5        100000
+Ethernet40      40,41,42,43                         etp6a     6        100000
+Ethernet44      44,45,46,47                         etp6b     6        100000
+Ethernet48      48,49,50,51                         etp7a     7        100000
+Ethernet52      52,53,54,55                         etp7b     7        100000
+Ethernet56      56,57,58,59                         etp8a     8        100000
+Ethernet60      60,61,62,63                         etp8b     8        100000
+Ethernet64      64,65,66,67                         etp9a     9        100000
+Ethernet68      68,69,70,71                         etp9b     9        100000
+Ethernet72      72,73,74,75                         etp10a    10       100000
+Ethernet76      76,77,78,79                         etp10b    10       100000
+Ethernet80      80,81,82,83                         etp11a    11       100000
+Ethernet84      84,85,86,87                         etp11b    11       100000
+Ethernet88      88,89,90,91                         etp12a    12       100000
+Ethernet92      92,93,94,95                         etp12b    12       100000
+Ethernet96      96,97,98,99                         etp13a    13       100000
+Ethernet100     100,101,102,103                     etp13b    13       100000
+Ethernet104     104,105,106,107                     etp14a    14       100000
+Ethernet108     108,109,110,111                     etp14b    14       100000
+Ethernet112     112,113,114,115                     etp15a    15       100000
+Ethernet116     116,117,118,119                     etp15b    15       100000
+Ethernet120     120,121,122,123                     etp16a    16       100000
+Ethernet124     124,125,126,127                     etp16b    16       100000
+Ethernet128     128,129,130,131                     etp17a    17       100000
+Ethernet132     132,133,134,135                     etp17b    17       100000
+Ethernet136     136,137,138,139                     etp18a    18       100000
+Ethernet140     140,141,142,143                     etp18b    18       100000
+Ethernet144     144,145,146,147                     etp19a    19       100000
+Ethernet148     148,149,150,151                     etp19b    19       100000
+Ethernet152     152,153,154,155                     etp20a    20       100000
+Ethernet156     156,157,158,159                     etp20b    20       100000
+Ethernet160     160,161,162,163                     etp21a    21       100000
+Ethernet164     164,165,166,167                     etp21b    21       100000
+Ethernet168     168,169,170,171                     etp22a    22       100000
+Ethernet172     172,173,174,175                     etp22b    22       100000
+Ethernet176     176,177,178,179                     etp23a    23       100000
+Ethernet180     180,181,182,183                     etp23b    23       100000
+Ethernet184     184,185,186,187                     etp24a    24       100000
+Ethernet188     188,189,190,191                     etp24b    24       100000
+Ethernet192     192,193,194,195,196,197,198,199     etp25     25       400000
+Ethernet200     200,201,202,203,204,205,206,207     etp26     26       400000
+Ethernet208     208,209,210,211,212,213,214,215     etp27     27       400000
+Ethernet216     216,217,218,219,220,221,222,223     etp28     28       400000
+Ethernet224     224,225,226,227,228,229,230,231     etp29     29       400000
+Ethernet232     232,233,234,235,236,237,238,239     etp30     30       400000
+Ethernet240     240,241,242,243,244,245,246,247     etp31     31       400000
+Ethernet248     248,249,250,251,252,253,254,255     etp32     32       400000

From 507cb8b91cb110dd6549ff4a384d5f0cbe2a4cbf Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Tue, 21 Dec 2021 15:43:42 +0800
Subject: [PATCH 0957/1674] [202012][swss-common][swss] Submodule update
 (#9531)

#### Why I did it

Update sonic-swss-common

54879741 [202012][schema] Add vnet route tunnel and advertise network tables for state_db (Azure/sonic-swss-common#563)
a5394f9d Update for BFD, default route table (Azure/sonic-swss-common#550)

Update sonic-swss

fbbe5bcc [202012][pfc_detect] fix RedisReply errors (Azure/sonic-swss#2078)
5762b0c2 [Reclaim buffer][202012] Reclaim unused buffer for dynamic buffer model (Azure/sonic-swss#1985)
33e9bd19 [Document][202012] Supply the missing ingress/egress port profile list in document (Azure/sonic-swss#2066)
1b6ffba1 [Reclaiming buffer][202012] Support reclaiming buffer in traditional buffer model (Azure/sonic-swss#2063)
afb33f16 [202012] Update default route status to state DB (Azure/sonic-swss#2009) (Azure/sonic-swss#2067)
b9c44f75 Common code update for reclaiming buffer (backport community PR Azure/sonic-swss#1996 to 202106/202012) (Azure/sonic-swss#2061)
cf5182d8 [request parser] Allow request parser to parse multiple values
---
 src/sonic-swss        | 2 +-
 src/sonic-swss-common | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index e37302d8096b..fbbe5bccee70 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e37302d8096b06d49c37e9c4062d180fc4d752e1
+Subproject commit fbbe5bccee7038e670ee0fd9f6ae7d9d82de80f0
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index ead0d5a14299..54879741c7a7 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit ead0d5a1429988ca3fb20b8f45dc9e954512759c
+Subproject commit 54879741c7a756c1545516b23e3faec12ab3621e

From 6faeea6bf2208feb40351692e2207f05289fb13b Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Mon, 20 Dec 2021 23:45:01 -0800
Subject: [PATCH 0958/1674] [202012] Submodule Update on sonic-sairedis (#9533)

#### Why I did it
To pick up fixes from submodule sonic-sairedis which include the following fixes:
```
commit 1027eef3a331e84560827c7584ee8009baf434d5 (HEAD -> 202012, origin/202012)
Author: gechiang <62408185+gechiang@users.noreply.github.com>
Date:   Wed Dec 8 03:13:34 2021 -0800

    [202012] Prevent other notification event storms to keep enqueue unchecked and drained all memory that leads to crashing the switch router (#976)

commit 94455e50d3444dcd60093b7a39c7f427337a94d2
Author: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date:   Tue Jun 15 03:23:20 2021 -0700

    Add cisco-8000 checks to syncd_init_common (#839)

commit 2df539483ed68519c3c9c6df958d3ed2f31dd629
Author: Kamil Cudnik <kcudnik@gmail.com>
Date:   Mon Dec 6 20:50:23 2021 +0100

    [lgtm] Add gmock libs to lgtm (#979)

```
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 738970496e1d..1027eef3a331 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 738970496e1d9a0bfb6ebbd0be7a87e5b4963650
+Subproject commit 1027eef3a331e84560827c7584ee8009baf434d5

From b3ca6812795d9ec8b160823a1070909be2aa9694 Mon Sep 17 00:00:00 2001
From: anamehra <54692434+anamehra@users.noreply.github.com>
Date: Tue, 21 Dec 2021 22:44:38 -0800
Subject: [PATCH 0959/1674] Update cisco-8000 ref to release: 202012-v0.8
 (#9528)

Update cisco-8000 ref to release: 202012-v0.8
Signed-off-by: Anand Mehra anamehra@cisco.com
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index f92e08f56d46..f2c0cc183bba 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2
+ref=202012-v0.8

From b36ee67bc7998f6ae3e978329c26625645ce9cd2 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Tue, 21 Dec 2021 05:31:45 +0800
Subject: [PATCH 0960/1674] Fix typo and missing files in SN3800 and SN4600C's
 buffer templates (#9537)

Why I did it
Fix typo and missing files in SN3800 and SN4600C's buffer templates

How I did it
ingress_lossless_xoff_size => ingress_lossless_pool_xoff add missing files for SN4600C-D100C12S2

How to verify it
Deploy the fix and verify whether the device can be up.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../buffers_defaults_t0.j2                    |   2 +-
 .../buffers_defaults_t1.j2                    |   2 +-
 .../buffers_defaults_t0.j2                    |   2 +-
 .../buffers_defaults_t1.j2                    |   2 +-
 .../buffers_default_objects.j2                |   1 +
 .../buffers_defaults_t0.j2                    | 101 ++---------------
 .../buffers_defaults_t1.j2                    | 103 ++----------------
 .../buffers_defaults_t0.j2                    |   2 +-
 .../buffers_defaults_t1.j2                    |   2 +-
 .../buffers_defaults_t0.j2                    |   2 +-
 .../buffers_defaults_t1.j2                    |   2 +-
 11 files changed, 29 insertions(+), 192 deletions(-)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
index c0f8def4a475..4a518e23c549 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '20664320' %}
-{% set ingress_lossless_xoff_size =  '3321856' %}
+{% set ingress_lossless_pool_xoff =  '3321856' %}
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '20664320' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
index 2b409aecb8d7..75ee727ed400 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '19601408' %}
-{% set ingress_lossless_xoff_size =  '4384768' %}
+{% set ingress_lossless_pool_xoff =  '4384768' %}
 {% set egress_lossless_pool_size =  '34287552' %}
 {% set egress_lossy_pool_size =  '19601408' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
index c004a072c6b2..e22fc68b2de4 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '49905664' %}
-{% set ingress_lossless_xoff_size  =  '3702784' %}
+{% set ingress_lossless_pool_xoff  =  '3702784' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '49905664' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
index 800b019d5fb4..fcc499665f3d 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '48332800' %}
-{% set ingress_lossless_xoff_size  =  '5275648' %}
+{% set ingress_lossless_pool_xoff  =  '5275648' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '48332800' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
index 164fc743ac02..883e67729fa5 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2
@@ -1,104 +1,21 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '44566528' %}
-{% set ingress_lossless_xoff_size = '3614720' %}
+{% set ingress_lossless_pool_xoff = '3614720' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '44566528' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
index a7d1e5daef5b..22be04c463ee 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2
@@ -1,104 +1,23 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '43794432' %}
-{% set ingress_lossless_xoff_size =  '4386816' %}
+{% set ingress_lossless_pool_xoff =  '4386816' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '43794432' %}
 
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0, 32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
+{% import 'buffers_defaults_objects.j2' as defs with context %}
 
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "xoff": "{{ ingress_lossless_xoff_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "{{ egress_lossless_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ egress_lossy_pool_size }}",
-            {%- endif %}
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"7"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"9216",
-            "dynamic_th":"7"
-        },
-        "q_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        }
-    },
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_profile_lists(port_names) %}
-    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
-{% for port in port_names.split(',') %}
-        "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    }
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names) %}
-    "BUFFER_QUEUE": {
-{% for port in port_names.split(',') %}
-        "{{ port }}|3-4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        },
-{% endfor %}
-{% for port in port_names.split(',') %}
-        "{{ port }}|5-6": {
-            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
 
-{% endfor %}
-    }
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
index 409564cf6306..6fb737ce74b6 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '43827200' %}
-{% set ingress_lossless_xoff_size = '3702784' %}
+{% set ingress_lossless_pool_xoff = '3702784' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '43827200' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
index 3666a782877e..da83ea7444a6 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '43048960' %}
-{% set ingress_lossless_xoff_size =  '4481024' %}
+{% set ingress_lossless_pool_xoff =  '4481024' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '43048960' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
index c6fdcc02b65b..2c461a823b1f 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '47398912' %}
-{% set ingress_lossless_xoff_size = '3604480' %}
+{% set ingress_lossless_pool_xoff = '3604480' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '47398912' %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
index dbaddd802067..86cb72c9fd31 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2
@@ -1,6 +1,6 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '46587904' %}
-{% set ingress_lossless_xoff_size = '4415488' %}
+{% set ingress_lossless_pool_xoff = '4415488' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '46587904' %}
 

From 813a6387c562b7e714a52e0868f78a5efb12a8a0 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 25 Dec 2021 01:05:45 +0800
Subject: [PATCH 0961/1674] [ci/build]: Upgrade SONiC package versions (#9543)

---
 .../versions-deb-buster                       | 36 ++++++++---------
 .../build-sonic-slave-buster/versions-git     |  4 +-
 .../build-sonic-slave-buster/versions-py2     |  2 +-
 .../build-sonic-slave-buster/versions-py3     |  4 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../build-sonic-slave-stretch/versions-py2    |  2 +-
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  | 20 +++++-----
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-web     |  8 ++--
 .../docker-base-stretch/versions-deb-stretch  |  4 +-
 .../versions-deb-buster-arm64                 |  6 +--
 .../versions-deb-buster-armhf                 |  6 +--
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../docker-config-engine-stretch/versions-py2 |  2 +-
 .../dockers/docker-lldp/versions-deb-buster   |  2 +-
 .../dockers/docker-mux/versions-deb-buster    |  2 +-
 .../versions-deb-buster                       | 20 +++++-----
 .../docker-platform-monitor/versions-py2      |  4 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 14 +++----
 .../versions/dockers/docker-ptf/versions-py2  |  4 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 12 +++---
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 40 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  1 -
 .../sonic-slave-buster/versions-deb-buster    | 24 +++++------
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py2   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 35 ++++++++--------
 .../versions-deb-stretch-armhf                |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py2  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  4 +-
 .../host-image/versions-deb-buster-arm64      |  6 +--
 .../host-image/versions-deb-buster-armhf      |  6 +--
 files/build/versions/host-image/versions-py2  |  2 +-
 files/build/versions/host-image/versions-py3  |  8 ++--
 50 files changed, 164 insertions(+), 168 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 64051004d8c2..393434b66e07 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.4.3326
-applibs-dev==1.mlnx.4.4.3326
+applibs==1.mlnx.4.4.3360
+applibs-dev==1.mlnx.4.4.3360
 bfnplatform==1.0.0
 innovium-sai==0.107.2
 innovium-sai-headers==0.107.2
-iproute2-dev==1.mlnx.4.4.3326
+iproute2-dev==1.mlnx.4.4.3360
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.17.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-7
+libsaibcm==4.3.5.1-9
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -53,20 +53,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.3326
-sx-acl-helper-dev==1.mlnx.4.4.3326
-sx-complib==1.mlnx.4.4.3326
-sx-complib-dev==1.mlnx.4.4.3326
-sx-examples==1.mlnx.4.4.3326
-sx-examples-dev==1.mlnx.4.4.3326
-sx-gen-utils==1.mlnx.4.4.3326
-sx-gen-utils-dev==1.mlnx.4.4.3326
-sx-scew==1.mlnx.4.4.3326
-sx-scew-dev==1.mlnx.4.4.3326
-sxd-libs==1.mlnx.4.4.3326
-sxd-libs-dev==1.mlnx.4.4.3326
+sx-acl-helper==1.mlnx.4.4.3360
+sx-acl-helper-dev==1.mlnx.4.4.3360
+sx-complib==1.mlnx.4.4.3360
+sx-complib-dev==1.mlnx.4.4.3360
+sx-examples==1.mlnx.4.4.3360
+sx-examples-dev==1.mlnx.4.4.3360
+sx-gen-utils==1.mlnx.4.4.3360
+sx-gen-utils-dev==1.mlnx.4.4.3360
+sx-scew==1.mlnx.4.4.3360
+sx-scew-dev==1.mlnx.4.4.3360
+sxd-libs==1.mlnx.4.4.3360
+sxd-libs-dev==1.mlnx.4.4.3360
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.4.3326
-wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
+wjh-libs==1.mlnx.4.4.3360
+wjh-libs-dev==1.mlnx.4.4.3360
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index facd7aef9209..027ff5ccb838 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,4 +1,4 @@
-https://github.com/CESNET/libyang.git==25ede0234ab1cde50e7e7f7efde1a2f43bc80fdc
+https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
+https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index d42c147c9528..fbecb5ee6c10 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -6,7 +6,7 @@ importlib-resources==3.3.1
 jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index c5cd3bebf2ce..39b1179a5eef 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,5 +1,6 @@
-charset-normalizer==2.0.7
+charset-normalizer==2.0.9
 click==7.0
+docker==5.0.3
 ijson==2.6.1
 ipaddress==1.0.23
 jsondiff==1.3.0
@@ -10,5 +11,6 @@ netifaces==0.11.0
 psutil==5.8.0
 python-arptable==0.0.2
 tabulate==0.8.9
+websocket-client==1.2.3
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index cea5c40187ff..b84b1fbdbf98 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index 33cd7719830a..a5685d1b1790 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -5,7 +5,7 @@ importlib-resources==3.3.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.6
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index a2a1515c5404..1369ade80ac2 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=jZaZP84GRkdZiu%2BtoS7n7K3RC8vf%2FD1ZwnHq5vNeHGA%3D&se=2035-07-23T07%3A52%3A20Z&sp=r==100d50e0f2754036e89781457ce6e6b3
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-7_amd64.deb?sv=2015-04-05&sr=b&sig=DWwsbdvPdUHTB0x%2B5ZK%2Bp1qjqJ4TDb1FV0az09K5pXo%3D&se=2035-07-23T07%3A51%3A17Z&sp=r==20fd1629da894c5038088402ad2c4609
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 0427143732e4..2b38ff8e5196 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:2f4b2c4b44ec6d9f4afc9578d8475f7272dc50783268dc672d19b0db6098b89d
-amd64:amd64/debian:stretch==sha256:856ba93f897fb7d86ce4363461fe04b6997ce64a79e8198747e472464d58e0fa
-amd64:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
-amd64:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
+amd64:amd64/debian:buster==sha256:333b6452b51d512b0fe7c64b2b6bbf06ec433c5c18b749bf495dd0aafcc79093
+amd64:amd64/debian:stretch==sha256:69189ed69aee1b476eede838d0dcae2eacc2cfaa1bc2987aff5fdb3ba5ab64d5
+amd64:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
+amd64:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -28,13 +28,13 @@ amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
-arm64:arm64v8/debian:buster==sha256:e10bf96e3d994bb35989db5acd0bc38e689fa7e88d44acaea92188a1cbb62efe
-arm64:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
-arm64:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
+arm64:arm64v8/debian:buster==sha256:7504f55ce01c4923c307df3d8ce9634ab5358c867e6a3c4c380e4e0a3972a244
+arm64:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
+arm64:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-armhf:arm32v7/debian:buster==sha256:502cc09268a941c89fd917694127bee670e25885303627116fe30039bc01115b
-armhf:debian:buster==sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e
-armhf:debian:stretch==sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724
+armhf:arm32v7/debian:buster==sha256:9172b2999799b3fb004a3fe04d0cc64ed5596fcff8f47629f65b1f5538587723
+armhf:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
+armhf:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 02dab480a276..93ef51d31d14 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
-https://github.com/CESNET/libyang.git==25ede0234ab1cde50e7e7f7efde1a2f43bc80fdc
+https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==04d2fb902191a12d78c0db715714b7d5da9246c7
+https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 4e188c2eee83..0c4de9c0762c 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,9 +19,9 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==0f8fa9349b31d86f70668cca8646e5b3
+https://deb.nodesource.com/node_14.x/dists/buster/Release==f6a0242dc009287fbabd2108726a4519
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==871f5a56bb7bdb1bccf8f066e77399e0
+https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20211112_sai.1.7.1_deb10.deb==c17beb440e2ae8d3271d78de0eede9db
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20211112_sai.1.7.1_deb10.deb==688c587d2cfb39e5d1e7148b02f13fec
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 5b9cc4be8fa7..6343b870f3cc 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -10,7 +10,7 @@ libexpat1==2.2.0-2+deb9u3
 libfastjson4==0.99.8-1~bpo9+1
 libffi6==3.2.1-6
 libgdbm3==1.8.3-14
-libgmp10==2:6.1.2+dfsg-1
+libgmp10==2:6.1.2+dfsg-1+deb9u1
 libgnutls30==3.5.8-5+deb9u6
 libgssapi-krb5-2==1.15-1+deb9u3
 libhogweed4==3.3-1+deb9u1
@@ -42,7 +42,7 @@ libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u1
+libssh2-1==1.7.0-1+deb9u2
 libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
 libtasn1-6==4.10-1.1+deb9u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index c6f5336889eb..e19bef5ea5ef 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,8 +1,8 @@
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
+libicu-dev==63.1-6+deb10u2
+libicu63==63.1-6+deb10u2
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index c6f5336889eb..e19bef5ea5ef 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,8 +1,8 @@
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
+libicu-dev==63.1-6+deb10u2
+libicu63==63.1-6+deb10u2
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index cf02a399402d..b629fb4fd467 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -3,7 +3,7 @@ ipaddress==1.0.23
 lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index 5712cb5f7ef8..dd18005713df 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -7,7 +7,7 @@ lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.6
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.6.0
 pyyaml==5.4.1
 redis==3.5.3
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 6a30ae80f65b..8499cce24acc 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -7,7 +7,7 @@ libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libipt2==2.0-2
 libmariadb3==1:10.3.31-0+deb10u1
 libpci3==1:3.5.2-1
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
index a12048a7b49e..802c17530c9d 100644
--- a/files/build/versions/dockers/docker-mux/versions-deb-buster
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -15,7 +15,7 @@ libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libhiredis0.14-dbgsym==0.14.0-3~bpo9+1
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libipt2==2.0-2
 libpopt0==1.16-12
 libswsscommon-dbg==1.0.0
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index c821abda2032..9c583a577789 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3326
-applibs-dev==1.mlnx.4.4.3326
+applibs==1.mlnx.4.4.3360
+applibs-dev==1.mlnx.4.4.3360
 dmidecode==3.2-1
 ethtool==1:5.9-1
 fancontrol==1:3.5.0-3
@@ -27,7 +27,7 @@ libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libharfbuzz0b==2.3.1-1
 libi2c0==4.1-1
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libipt2==2.0-2
 libkmod2==26-1
 libpango-1.0-0==1.42.4-8~deb10u1
@@ -67,7 +67,7 @@ openssh-client==1:7.9p1-10+deb10u2
 psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-minimal==2.7.16-1
-python-sdk-api==1.mlnx.4.4.3326
+python-sdk-api==1.mlnx.4.4.3360
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -84,12 +84,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.3326
-sx-complib-dev==1.mlnx.4.4.3326
-sx-gen-utils==1.mlnx.4.4.3326
-sx-gen-utils-dev==1.mlnx.4.4.3326
-sxd-libs==1.mlnx.4.4.3326
-sxd-libs-dev==1.mlnx.4.4.3326
+sx-complib==1.mlnx.4.4.3360
+sx-complib-dev==1.mlnx.4.4.3360
+sx-gen-utils==1.mlnx.4.4.3360
+sx-gen-utils-dev==1.mlnx.4.4.3360
+sxd-libs==1.mlnx.4.4.3360
+sxd-libs-dev==1.mlnx.4.4.3360
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index e493f50be3f8..5ea352a5989e 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -12,9 +12,9 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.6
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.6.0
-python-sdk-api==4.4.3326
+python-sdk-api==4.4.3360
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 32f34444b068..a83de80272b1 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.4.3326
+python_sdk_api==4.4.3360
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index e1d314905029..a29a852499da 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -61,7 +61,6 @@ libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
 libdpkg-perl==1.18.25
 libedit2==3.1-20160903-3
-libelf1==0.168-1+deb9u1
 liberror-perl==0.17024-1
 libestr0==0.1.10-2
 libevent-2.0-5==2.0.21-stable-3
@@ -78,7 +77,7 @@ libgcc-6-dev==6.3.0-18+deb9u1
 libgdbm3==1.8.3-14
 libglib2.0-0==2.50.3-2+deb9u2
 libglib2.0-data==2.50.3-2+deb9u2
-libgmp10==2:6.1.2+dfsg-1
+libgmp10==2:6.1.2+dfsg-1+deb9u1
 libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
 libgpm2==1.20.4-6.2+b1
@@ -119,7 +118,7 @@ libnghttp2-14==1.18.1-1+deb9u2
 libnih-dbus1==1.0.3-8
 libnih1==1.0.3-8
 libnpth0==1.3-1
-libntlm0==1.4-8
+libntlm0==1.4-8+deb9u1
 libopts25==1:5.18.12-3
 libp11-kit0==0.23.3-2+deb9u1
 libpam-systemd==232-25+deb9u13
@@ -148,7 +147,7 @@ libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
 libseccomp2==2.3.1-2.1+deb9u1
 libsigsegv2==2.10-5
 libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u1
+libssh2-1==1.7.0-1+deb9u2
 libssl-dev==1.1.0l-1~deb9u4
 libssl-doc==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u6
@@ -172,7 +171,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-2.2+deb9u5
 libxmuu1==2:1.1.2-2
-linux-libc-dev==4.9.272-2
+linux-libc-dev==4.9.290-1
 logrotate==3.11.0-0.1
 lsof==4.89+dfsg-0.1
 m4==1.4.18-1
@@ -216,8 +215,8 @@ python2.7-minimal==2.7.13-2+deb9u5
 qttranslations5-l10n==5.7.1~20161021-1
 readline-common==7.0-3
 rename==0.20-4
-rsync==3.1.2-1+deb9u2
-rsyslog==8.24.0-1
+rsync==3.1.2-1+deb9u3
+rsyslog==8.24.0-1+deb9u1
 sgml-base==1.29
 shared-mime-info==1.8-1+deb9u1
 systemd==232-25+deb9u13
@@ -228,7 +227,6 @@ tcpdump==4.9.3-1~deb9u2
 telnet==0.17-41
 tmux==2.3-4
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb9u2
 ucf==3.0036
 unzip==6.0-21+deb9u2
 vim==2:8.0.0197-4+deb9u3
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 47daf3527ae1..41a51f7ca9c9 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,12 +25,12 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.8.0
+paramiko==2.8.1
 pathlib2==2.3.6
 pbr==2.0.0
 pexpect==4.8.0
 pickleshare==0.7.5
-plumbum==1.7.0
+plumbum==1.7.2
 prompt-toolkit==1.0.18
 protobuf==3.6.1
 ptf==0.9.1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index ebf3b287be99..be77486d97df 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -6,7 +6,7 @@ libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libipt2==2.0-2
 libpopt0==1.16-12
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 852a897e9b18..2714bc964d82 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,19 +1,19 @@
 attrs==21.2.0
 certifi==2017.4.17
-charset-normalizer==2.0.7
+charset-normalizer==2.0.9
 click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.2
-grpcio==1.41.1
+grpcio==1.43.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.8.2
+importlib-metadata==4.10.0
 importlib-resources==5.4.0
 inflection==0.5.1
-isodate==0.6.0
+isodate==0.6.1
 itsdangerous==2.0.1
-jsonschema==4.2.1
+jsonschema==4.3.2
 openapi-schema-validator==0.1.5
 openapi-spec-validator==0.3.1
 protobuf==3.19.1
@@ -21,7 +21,7 @@ pyrsistent==0.18.0
 python-dateutil==2.6.0
 requests==2.26.0
 six==1.11.0
-typing-extensions==3.10.0.2
+typing_extensions==4.0.1
 urllib3==1.21.1
 werkzeug==2.0.2
 zipp==3.6.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 4e6474db2af8..e37e424ec46b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -36,7 +36,7 @@ libefivar1==37-2+deb10u1
 libfreetype6==2.9.1-3+deb10u2
 libfuse2==2.9.9-1+deb10u1
 libglib2.0-0==2.58.3-2+deb10u3
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 4ef9838bf100..71dd3c17a748 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.10.8
-charset-normalizer==2.0.7
+charset-normalizer==2.0.9
 click==7.0
 idna==3.3
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index d1e6f7cb0301..ea05a4841b8a 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -6,7 +6,7 @@ libc6-dev==2.28-10
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 liblzma-dev==5.2.4-1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index c6a367bd3adb..d57b774f1120 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -22,7 +22,7 @@ libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjsoncpp1==1.7.4-3
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 688f77933875..0ff63a6d1d34 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-7
+libsaibcm==4.3.5.1-9
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index ea6bc9bfa49d..1e5015552a68 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -24,7 +24,7 @@ libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjsoncpp1==1.7.4-3
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 1db47dd14b40..1eb9696b4798 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.4.3326
-applibs-dev==1.mlnx.4.4.3326
+applibs==1.mlnx.4.4.3360
+applibs-dev==1.mlnx.4.4.3360
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2==1.mlnx.4.4.3326
-iproute2-dev==1.mlnx.4.4.3326
+iproute2==1.mlnx.4.4.3360
+iproute2-dev==1.mlnx.4.4.3360
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
@@ -14,7 +14,7 @@ libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u1
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u1
+libicu63==63.1-6+deb10u2
 libipt2==2.0-2
 libpopt0==1.16-12
 libpython-dev==2.7.16-1
@@ -40,7 +40,7 @@ python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.3326
+python-sdk-api==1.mlnx.4.4.3360
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -50,21 +50,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.4.3326
-sx-acl-helper-dev==1.mlnx.4.4.3326
-sx-complib==1.mlnx.4.4.3326
-sx-complib-dev==1.mlnx.4.4.3326
-sx-examples==1.mlnx.4.4.3326
-sx-examples-dev==1.mlnx.4.4.3326
-sx-gen-utils==1.mlnx.4.4.3326
-sx-gen-utils-dev==1.mlnx.4.4.3326
-sx-scew==1.mlnx.4.4.3326
-sx-scew-dev==1.mlnx.4.4.3326
-sxd-libs==1.mlnx.4.4.3326
-sxd-libs-dev==1.mlnx.4.4.3326
+sx-acl-helper==1.mlnx.4.4.3360
+sx-acl-helper-dev==1.mlnx.4.4.3360
+sx-complib==1.mlnx.4.4.3360
+sx-complib-dev==1.mlnx.4.4.3360
+sx-examples==1.mlnx.4.4.3360
+sx-examples-dev==1.mlnx.4.4.3360
+sx-gen-utils==1.mlnx.4.4.3360
+sx-gen-utils-dev==1.mlnx.4.4.3360
+sx-scew==1.mlnx.4.4.3360
+sx-scew-dev==1.mlnx.4.4.3360
+sxd-libs==1.mlnx.4.4.3360
+sxd-libs-dev==1.mlnx.4.4.3360
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
-wjh-libs==1.mlnx.4.4.3326
-wjh-libs-dev==1.mlnx.4.4.3326
\ No newline at end of file
+wjh-libs==1.mlnx.4.4.3360
+wjh-libs-dev==1.mlnx.4.4.3360
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index ae714e21a0c9..ec6168501c69 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3326
\ No newline at end of file
+python-sdk-api==4.4.3360
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index d7bebb037ed3..3c9ecbc50302 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.4.3326
\ No newline at end of file
+python_sdk_api==4.4.3360
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index d566472262e6..033494627d1d 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -5,7 +5,6 @@ libbabeltrace1==1.5.1-1
 libbsd0==0.8.3-1+deb9u1
 libdw1==0.168-1+deb9u1
 libedit2==3.1-20160903-3
-libelf1==0.168-1+deb9u1
 libglib2.0-0==2.50.3-2+deb9u2
 libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 9e42c1ade343..79216bbfe441 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.11-1
+containerd.io==1.4.12-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -182,7 +182,7 @@ hicolor-icon-theme==0.17-2
 i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
 icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u2
 imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
 imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
 imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
@@ -598,8 +598,8 @@ libibverbs-dev==22.1-1
 libibverbs1==22.1-1
 libice-dev==2:1.0.9-2
 libice6==2:1.0.9-2
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
+libicu-dev==63.1-6+deb10u2
+libicu63==63.1-6+deb10u2
 libidn11==1.33-2.2
 libidn2-dev==2.0.5-1+deb10u1
 libiec61883-0==1.2.0-3
@@ -795,7 +795,7 @@ libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
 libnss-systemd==241-7~deb10u8
-libnss3==2:3.42.1-1+deb10u3
+libnss3==2:3.42.1-1+deb10u4
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
 libnumber-compare-perl==0.03-1
@@ -1336,10 +1336,10 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.12+7-2~deb10u1
-openjdk-11-jdk-headless==11.0.12+7-2~deb10u1
-openjdk-11-jre==11.0.12+7-2~deb10u1
-openjdk-11-jre-headless==11.0.12+7-2~deb10u1
+openjdk-11-jdk==11.0.13+8-1~deb10u1
+openjdk-11-jdk-headless==11.0.13+8-1~deb10u1
+openjdk-11-jre==11.0.13+8-1~deb10u1
+openjdk-11-jre-headless==11.0.13+8-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
@@ -1424,8 +1424,8 @@ python-astroid==1.6.5-3
 python-atomicwrites==1.1.5-2
 python-attr==18.2.0-1
 python-automat==0.6.0-1
-python-babel==2.6.0+dfsg.1-1
-python-babel-localedata==2.6.0+dfsg.1-1
+python-babel==2.6.0+dfsg.1-1+deb10u1
+python-babel-localedata==2.6.0+dfsg.1-1+deb10u1
 python-backports.functools-lru-cache==1.5-3
 python-bs4==4.7.1-1
 python-certifi==2018.8.24-1
@@ -1524,7 +1524,7 @@ python3-apt==1.8.4.3
 python3-asn1crypto==0.24.0-1
 python3-atomicwrites==1.1.5-2
 python3-attr==18.2.0-1
-python3-babel==2.6.0+dfsg.1-1
+python3-babel==2.6.0+dfsg.1-1+deb10u1
 python3-certifi==2018.8.24-1
 python3-cffi-backend==1.12.2-1
 python3-chardet==3.0.4-3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 1f9ed901f138..a5fecf3be130 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.18.1-deb-1nodesource1
\ No newline at end of file
+nodejs==14.18.2-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 3d836a1f605f..de53bbddf9a8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -114,7 +114,7 @@ linux-compiler-gcc-8-arm==4.19.208-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.18.1-deb-1nodesource1
+nodejs==14.18.2-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 515a11167938..9b96a0b78716 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
index 182ead414d40..d0fec6b1186d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -38,7 +38,7 @@ keyring==17.1.1
 keyrings.alt==3.1.1
 lazy-object-proxy==1.3.1
 logilab-common==1.4.2
-lxml==4.6.2
+lxml==4.6.5
 m2crypto==0.36.0
 markupsafe==1.1.0
 mccabe==0.6.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 31ba77f72230..bbfa50776eb4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -22,7 +22,7 @@ imagesize==1.0.0
 jinja2==2.10
 keyring==17.1.1
 keyrings.alt==3.1.1
-lxml==4.6.2
+lxml==4.6.5
 m2crypto==0.38.0
 markupsafe==1.1.0
 mmh3==2.5.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 631b9d3e59e6..ab6475dc60a4 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -231,7 +231,7 @@ libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u10
 libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u10
 libbison-dev==2:3.0.4.dfsg-1+b1
 libbit-vector-perl==7.4-1+b2
-libbluetooth3==5.43-2+deb9u4
+libbluetooth3==5.43-2+deb9u5
 libboost-all-dev==1.62.0.1
 libboost-atomic-dev==1.62.0.1
 libboost-atomic1.62-dev==1.62.0+dfsg-4
@@ -428,7 +428,6 @@ libedit-dev==3.1-20160903-3
 libedit2==3.1-20160903-3
 libegl1-mesa==13.0.6-1+b2
 libelf-dev==0.168-1+deb9u1
-libelf1==0.168-1+deb9u1
 libemail-valid-perl==1.202-1
 libencode-locale-perl==1.05-1
 libepoxy0==1.3.1-2
@@ -499,9 +498,9 @@ libglib2.0-data==2.50.3-2+deb9u2
 libglib2.0-dev==2.50.3-2+deb9u2
 libglu1-mesa==9.0.0-2.1
 libglu1-mesa-dev==9.0.0-2.1
-libgmp-dev==2:6.1.2+dfsg-1
-libgmp10==2:6.1.2+dfsg-1
-libgmpxx4ldbl==2:6.1.2+dfsg-1
+libgmp-dev==2:6.1.2+dfsg-1+deb9u1
+libgmp10==2:6.1.2+dfsg-1+deb9u1
+libgmpxx4ldbl==2:6.1.2+dfsg-1+deb9u1
 libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
 libgoogle-perftools4==2.5-2.2
@@ -723,8 +722,8 @@ libnl-3-200==3.2.27-2
 libnl-route-3-200==3.2.27-2
 libnpth0==1.3-1
 libnspr4==2:4.12-6
-libnss3==2:3.26.2-1.1+deb9u2
-libntlm0==1.4-8
+libnss3==2:3.26.2-1.1+deb9u4
+libntlm0==1.4-8+deb9u1
 libnuma-dev==2.0.11-2.1
 libnuma1==2.0.11-2.1
 libnumber-compare-perl==0.03-1
@@ -925,7 +924,7 @@ libsoup-gnome2.4-1==2.56.0-2+deb9u2
 libsoup2.4-1==2.56.0-2+deb9u2
 libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u1
+libssh2-1==1.7.0-1+deb9u2
 libssl-dev==1.1.0l-1~deb9u4
 libssl1.0.2==1.0.2u-1~deb9u6
 libssl1.1==1.1.0l-1~deb9u4
@@ -992,8 +991,8 @@ libvariable-magic-perl==0.61-1
 libvdeplug2==2.3.2+r586-2.1
 libvirt-clients==3.0.0-4+deb9u5
 libvirt0==3.0.0-4+deb9u5
-libvorbis0a==1.3.5-4+deb9u2
-libvorbisenc2==1.3.5-4+deb9u2
+libvorbis0a==1.3.5-4+deb9u3
+libvorbisenc2==1.3.5-4+deb9u3
 libwacom-bin==0.22-1+b1
 libwacom-common==0.22-1
 libwacom2==0.22-1+b1
@@ -1129,12 +1128,12 @@ libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u1
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.272-2
-linux-headers-4.9.0-16-amd64==4.9.272-2
-linux-headers-4.9.0-16-common==4.9.272-2
-linux-headers-amd64==4.9+80+deb9u14
-linux-kbuild-4.9==4.9.272-2
-linux-libc-dev==4.9.272-2
+linux-compiler-gcc-6-x86==4.9.290-1
+linux-headers-4.9.0-17-amd64==4.9.290-1
+linux-headers-4.9.0-17-common==4.9.290-1
+linux-headers-amd64==4.9+80+deb9u15
+linux-kbuild-4.9==4.9.290-1
+linux-libc-dev==4.9.290-1
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
@@ -1386,8 +1385,8 @@ readline-common==7.0-3
 rename==0.20-4
 rhino==1.7.7.1-1
 rrdtool==1.6.0-1+b2
-rsync==3.1.2-1+deb9u2
-rsyslog==8.24.0-1
+rsync==3.1.2-1+deb9u3
+rsyslog==8.24.0-1+deb9u1
 ruby==1:2.3.3
 ruby-all-dev==1:2.3.3
 ruby-did-you-mean==1.0.0-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 025b7efbd0db..48c98dc20e6e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -10,5 +10,5 @@ libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
-linux-compiler-gcc-6-arm==4.9.272-2
+linux-compiler-gcc-6-arm==4.9.290-1
 nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 515a11167938..9b96a0b78716 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3fca89bbc87dda9d7fcb72cda23af4aa313d90d9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index 53073b5ae1d9..e83c0d4279cc 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -30,7 +30,7 @@ jinja2==2.11.3
 keyring==10.1
 keyrings.alt==1.3
 lazy-object-proxy==1.2.2
-lxml==4.6.2
+lxml==4.6.5
 m2crypto==0.36.0
 markupsafe==1.1.1
 mmh3==3.0.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 3ae516f9d45f..aed033feb2e3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -11,7 +11,7 @@ imagesize==0.7.1
 jinja2==2.8
 keyring==10.1
 keyrings.alt==1.3
-lxml==4.6.2
+lxml==4.6.5
 markupsafe==0.23
 mockredispy==2.9.3
 nose==1.3.7
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 08a86a1f42d4..ef382d54a031 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.11-1
+containerd.io==1.4.12-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
@@ -241,7 +241,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.3326
+sx-kernel==1.mlnx.4.4.3360
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index e38296ba3161..1164fbc4f79d 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,10 +1,10 @@
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
+libicu-dev==63.1-6+deb10u2
+libicu63==63.1-6+deb10u2
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 8e5722c2ccf0..a6be45ae44ad 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,10 +1,10 @@
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
 libcryptsetup12==2:2.3.5-1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
+libicu-dev==63.1-6+deb10u2
+libicu63==63.1-6+deb10u2
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 058c0288e39d..bbc826068de8 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -13,7 +13,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.6
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.6.0
 python-apt==1.8.4.3
 pyyaml==5.4.1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index d21c04831efa..76cc2cf4b017 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,9 +4,9 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.7
+charset-normalizer==2.0.9
 click==7.0
-cryptography==35.0.0
+cryptography==36.0.1
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
@@ -25,7 +25,7 @@ pathtools==0.1.2
 pexpect==4.8.0
 psutil==5.8.0
 ptyprocess==0.7.0
-pyang==2.5.0
+pyang==2.5.2
 pyangbind==0.8.1
 pycparser==2.21
 python-dateutil==2.8.2
@@ -39,5 +39,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.7
 watchdog==0.10.3
-websocket-client==1.2.1
+websocket-client==1.2.3
 xmltodict==0.12.0
\ No newline at end of file

From 9b1a3971bdcb19c0692f95ad1d7e87f16ba2846b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 27 Dec 2021 07:30:40 +0800
Subject: [PATCH 0962/1674] [ci/build]: Upgrade SONiC package versions (#9645)

---
 files/build/versions/dockers/docker-ptf/versions-py2          | 4 ++--
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 --
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 41a51f7ca9c9..fb71964a73ef 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.8.1
+paramiko==2.9.1
 pathlib2==2.3.6
 pbr==2.0.0
 pexpect==4.8.0
@@ -41,7 +41,7 @@ pycparser==2.21
 pygments==2.5.2
 pylibpcap==0.6.4
 pynacl==1.4.0
-pyro4==4.81
+pyro4==4.82
 pysubnettree==0.26
 pyyaml==5.4.1
 rpyc==4.1.5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index 9b96a0b78716..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 9b96a0b78716..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file

From 16a39291599918c473afc78912b5fe7d8cb2acbc Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Tue, 28 Dec 2021 15:40:58 +0800
Subject: [PATCH 0963/1674] [202012][Mellanox] Update hw-mgmt package to
 V.7.0010.2347 (#9594)

- Why I did it
Update hw-mgmt to a new version to pick up support for the SN4600C A1 system.

- How I did it
Update the pointer of the hw-mgmt submodule
Update the hw-mgmt version number
Remove the staled code patch to hw-mgmt userspace code.

- How to verify it
Run platform regression on Mellanox platforms.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/hw-management.mk            |  2 +-
 ... 0002-Make-hw-mgmt-SimX-compatiable.patch} |  0
 ...gmt-system-MSN4600-A1-BU-config1-fix.patch | 28 -------------------
 platform/mellanox/hw-management/hw-mgmt       |  2 +-
 4 files changed, 2 insertions(+), 30 deletions(-)
 rename platform/mellanox/hw-management/{0003-Make-hw-mgmt-SimX-compatiable.patch => 0002-Make-hw-mgmt-SimX-compatiable.patch} (100%)
 delete mode 100644 platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 6dc1f2655629..61157329403b 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2344
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2347
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch b/platform/mellanox/hw-management/0002-Make-hw-mgmt-SimX-compatiable.patch
similarity index 100%
rename from platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch
rename to platform/mellanox/hw-management/0002-Make-hw-mgmt-SimX-compatiable.patch
diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch b/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch
deleted file mode 100644
index 391121cff4b8..000000000000
--- a/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1b2c2343d62b2fadb5c8fc9e61f2f654f4085193 Mon Sep 17 00:00:00 2001
-From: Mykola Kostenok <c_mykolak@nvidia.com>
-Date: Wed, 12 May 2021 10:59:57 +0300
-Subject: [PATCH] hw-mgmt: system: MSN4600 A1 BU config1 fix
-
-Fix config1 matching for MSN4600.
-
-Signed-off-by: Mykola Kostenok <c_mykolak@nvidia.com>
----
- usr/usr/bin/hw-management.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
-index d5b2728..150e583 100755
---- a/usr/usr/bin/hw-management.sh
-+++ b/usr/usr/bin/hw-management.sh
-@@ -728,7 +728,7 @@ msn46xx_specific()
- 	if [ $res -eq 0 ]; then
- 		sys_ver=$(cut "$regio_path"/config1 -d' ' -f 1)
- 		case $sys_ver in
--			3)
-+			1)
- 				connect_msn4700_msn4600_A1
- 			;;
- 			*)
--- 
-1.7.1
-
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index b661fa329e2d..3a8787997d7b 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit b661fa329e2dff4fd6c22da89d009169e1008d99
+Subproject commit 3a8787997d7b0269c144861bfc9e7263c028f6bc

From 1eec2bc25e1ef6e02976be072901f5c6b75a1df6 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:51:04 +0200
Subject: [PATCH 0964/1674] [202012] [submodule] Update sonic-utilities
 submodule (#9661)

Update submodule sonic-utilities that contains the following commits:

Revert "[202012] [generate_dump] allow to extend dump with plugin scripts (#1945)" (#1993)
[soft-reboot] Add support for platforms based on Device Tree (#1963)
[Reclaiming buffer][202012] Database migrator for reclaiming buffer (#1898)
[202012] [generate_dump] allow to extend dump with plugin scripts (#1945)

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 8a3b41a9f766..466807e26e8e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 8a3b41a9f7669fe0c6552c4fc942e2fa5ca1f891
+Subproject commit 466807e26e8ec3370706c2bce142d426e05f3fc2

From dec52bb32f9887e3d0b3f263d6f6f8a19bf175cb Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Thu, 6 Jan 2022 10:00:58 +0800
Subject: [PATCH 0965/1674] Add thrift 0.13.0 (#9678)

* Add thrift 0.13.0  (#8307)

#### Why I did it
To bump thrift version to 0.13.0, to fix some dependencies issues.

#### How I did it
As there are dependencies between thrift and saithrinft server  (https://github.com/opencomputeproject/SAI/tree/bf3630316cbef484e1015478b5746067bac4e2b8/test/saithrift) which is used by syncd-rpc to update thrift version, I also need to make changes in saithrinft server, and then SAI ref point should be updated in sairedis, and then sairedis ref point should be updated too. It is too many change, so I decided to add thrift 0.13.0 as separeate target to be able to work and test father changes in saithrinft and one when appropriate changes will be merged to SAI and ref points will be updated I will squash this and the old thrift target.  I was not able to build thrift deb pkg by original rules, so I copied `debian `folder from the old version and tune it for newer one.

#### How to verify it
```
make init
make configure PLATFORM=vs
make target/debs/buster/libthrift_0.13.0_amd64.deb
```

```

* Correct the pkg name for thrift.0.13.0

Correct thrift.0.13.0 dependent package name.
In previous code, the buildout target was named as PYTHON3_THRIFT_0_13_0
But when add the prackage to LIBTHRIFT_0_13_0, it typo as PYTHON_THRIFT_0_13_0

Co-authored-by: Myron Sosyak <myronx.sosyak@intel.com>
---
 rules/thrift_0_13_0.dep                       |  8 ++
 rules/thrift_0_13_0.mk                        | 17 ++++
 src/thrift_0_13_0/.gitignore                  |  1 +
 src/thrift_0_13_0/Makefile                    | 32 +++++++
 .../patch/0001-Remove-unneeded-packages.patch | 85 +++++++++++++++++++
 5 files changed, 143 insertions(+)
 create mode 100644 rules/thrift_0_13_0.dep
 create mode 100644 rules/thrift_0_13_0.mk
 create mode 100644 src/thrift_0_13_0/.gitignore
 create mode 100644 src/thrift_0_13_0/Makefile
 create mode 100644 src/thrift_0_13_0/patch/0001-Remove-unneeded-packages.patch

diff --git a/rules/thrift_0_13_0.dep b/rules/thrift_0_13_0.dep
new file mode 100644
index 000000000000..52d8b6a525f9
--- /dev/null
+++ b/rules/thrift_0_13_0.dep
@@ -0,0 +1,8 @@
+SPATH       := $($(LIBTHRIFT_0_13_0)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/thrift_0_13_0.mk rules/thrift_0_13_0.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(LIBTHRIFT_0_13_0)_CACHE_MODE  := GIT_CONTENT_SHA
+$(LIBTHRIFT_0_13_0)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(LIBTHRIFT_0_13_0)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/thrift_0_13_0.mk b/rules/thrift_0_13_0.mk
new file mode 100644
index 000000000000..18d333910904
--- /dev/null
+++ b/rules/thrift_0_13_0.mk
@@ -0,0 +1,17 @@
+# thrift package
+
+THRIFT_VERSION_0_13_0 = 0.13.0
+THRIFT_VERSION_0_13_0_FULL = $(THRIFT_VERSION_0_13_0)-6
+
+LIBTHRIFT_0_13_0 = libthrift-$(THRIFT_VERSION_0_13_0)_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
+$(LIBTHRIFT_0_13_0)_SRC_PATH = $(SRC_PATH)/thrift_0_13_0
+SONIC_MAKE_DEBS += $(LIBTHRIFT_0_13_0)
+
+LIBTHRIFT_DEV_0_13_0 = libthrift-dev_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(LIBTHRIFT_DEV_0_13_0)))
+
+PYTHON3_THRIFT_0_13_0 = python3-thrift_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(PYTHON3_THRIFT_0_13_0)))
+
+THRIFT_COMPILER_0_13_0 = thrift-compiler_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(THRIFT_COMPILER_0_13_0)))
diff --git a/src/thrift_0_13_0/.gitignore b/src/thrift_0_13_0/.gitignore
new file mode 100644
index 000000000000..dc29c1367931
--- /dev/null
+++ b/src/thrift_0_13_0/.gitignore
@@ -0,0 +1 @@
+thrift*
\ No newline at end of file
diff --git a/src/thrift_0_13_0/Makefile b/src/thrift_0_13_0/Makefile
new file mode 100644
index 000000000000..55cb4d9212ef
--- /dev/null
+++ b/src/thrift_0_13_0/Makefile
@@ -0,0 +1,32 @@
+SHELL = /bin/bash
+.ONESHELL:
+.SHELLFLAGS += -e -x
+
+THRIFT_VERSION = 0.13.0
+THRIFT_VERSION_FULL = $(THRIFT_VERSION)-6
+
+MAIN_TARGET = libthrift-$(THRIFT_VERSION)_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+DERIVED_TARGETS = libthrift-dev_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+		  python3-thrift_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+		  thrift-compiler_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+
+THRIFT_LINK_PRE = http://deb.debian.org/debian/pool/main/t/thrift/
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	rm -rf thrift-$(THRIFT_VERSION)
+
+	wget -O "thrift_$(THRIFT_VERSION_FULL).debian.tar.xz" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).debian.tar.xz"
+	wget -O "thrift_$(THRIFT_VERSION).orig.tar.gz" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION).orig.tar.gz"
+	wget -O "thrift_$(THRIFT_VERSION_FULL).dsc" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).dsc"
+
+	dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc
+	pushd thrift-$(THRIFT_VERSION)
+
+	# Disable php perl and few other packages as they need additional packages to be installed
+	patch -p1 < ../patch/0001-Remove-unneeded-packages.patch
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	popd
+
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/src/thrift_0_13_0/patch/0001-Remove-unneeded-packages.patch b/src/thrift_0_13_0/patch/0001-Remove-unneeded-packages.patch
new file mode 100644
index 000000000000..f1565408a722
--- /dev/null
+++ b/src/thrift_0_13_0/patch/0001-Remove-unneeded-packages.patch
@@ -0,0 +1,85 @@
+From 7a8d588fa0425550cfd42c3300c8c0a643137190 Mon Sep 17 00:00:00 2001
+From: Myron Sosyak <myronx.sosyak@intel.com>
+Date: Fri, 13 Aug 2021 11:26:13 +0000
+Subject: [PATCH] Remove-unneeded-packages
+
+---
+ debian/control | 28 ----------------------------
+ debian/rules   |  7 +++----
+ 2 files changed, 3 insertions(+), 32 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index 5126e47..3f3028c 100644
+--- a/debian/control
++++ b/debian/control
+@@ -13,8 +13,6 @@ Build-Depends: debhelper-compat (= 11), dh-python,
+  python3-all-dev,
+  python3-six,
+  golang-go, golang-github-golang-mock-dev,
+- pkg-php-tools (>= 1.14~), php-dev, phpunit, php-codesniffer,
+- perl (>= 5.22), libbit-vector-perl, libclass-accessor-perl,
+ # openjdk-11-jdk, javahelper, maven-debian-helper (>= 1.5), ant (>= 1.7), ant-optional,
+ # libhttpclient-java, libslf4j-java, libservlet3.1-java (>= 8),
+ # nodejs, npm,
+@@ -175,32 +173,6 @@ Description: Python library for Thrift (debug symbols)
+ # .
+ # This package contains Javadoc HTML documentation for libthrift-java .
+ #
+-Package: php-thrift
+-Architecture: any
+-Section: php
+-Depends: ${phpcomposer:Debian-require}, ${shlibs:Depends}, ${misc:Depends}
+-Provides: ${php:Provides}
+-Conflicts: php7.0-thrift, php7.2-thrift
+-Replaces: php7.0-thrift, php7.2-thrift
+-Description: PHP language support for Thrift
+- Thrift is a software framework for the development of reliable and
+- performant communication and data serialization. It combines a software
+- stack with code generation to build services that operate seamlessly
+- across a number of different development languages.
+- .
+- This package provides the PHP5 language support for Thrift.
+-
+-Package: libthrift-perl
+-Section: perl
+-Architecture: all
+-Depends: ${perl:Depends}, ${misc:Depends}
+-Description: Perl language support for Thrift
+- Thrift is a software framework for the development of reliable and
+- performant communication and data serialization. It combines a software
+- stack with code generation to build services that operate seamlessly
+- across a number of different development languages.
+- .
+- This package provides the Perl language support for Thrift.
+
+ Package: golang-thrift-dev
+ Architecture: amd64 arm64 armel armhf i386 ppc64el
+diff --git a/debian/rules b/debian/rules
+index ba63e6f..8217796 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -47,7 +47,6 @@ override_dh_auto_clean:
+ 		$(CURDIR)/lib/go/test/gopath/src/golang.org/x/net \
+ 		$(CURDIR)/lib/go/test/gopath/src/github.com/golang/mock
+ 	[ ! -f Makefile ] || $(MAKE) clean
+-	cd $(CURDIR)/lib/php/src/ext/thrift_protocol/ && phpize --clean
+ 	find $(CURDIR) \( -name Makefile -o -name Makefile.in \) -exec rm {} \;
+ 	find $(CURDIR) -name .dirstamp -exec rm {} \;
+ 	$(RM) aclocal.m4 config.h config.log config.status configure \
+@@ -65,10 +64,10 @@ override_dh_auto_clean:
+
+ override_dh_auto_configure:
+ 	dh_auto_configure -- \
+-		--with-cpp --with-c_glib --with-php --with-php_extension \
+-		--with-perl --without-python --with-py3 --without-java \
++		--with-cpp --with-c_glib --without-php --without-php_extension \
++		--without-perl --without-python --with-py3 --without-java \
+ 		--without-nodejs --without-erlang --without-lua \
+-		--with-go --with-ruby \
++		--without-go --without-ruby \
+ 		--with-qt4=no --with-qt5=yes \
+ 		--without-rust \
+ 		--disable-tutorial
+--
+2.17.1
+

From a0376a6e5972a7dde8810c6108bd9bf7a4c29e08 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 8 Jan 2022 06:12:12 +0800
Subject: [PATCH 0966/1674] [ci/build]: Upgrade SONiC package versions (#9680)

---
 .../build/build-sonic-slave-buster/versions-git      |  2 +-
 .../build/build-sonic-slave-buster/versions-py3      |  4 ++--
 .../build-sonic-slave-buster/versions-py3-all-arm64  |  2 +-
 .../build-sonic-slave-buster/versions-py3-all-armhf  |  2 +-
 files/build/versions/default/versions-git            |  4 ++--
 .../dockers/docker-base-stretch/versions-py2         |  2 +-
 .../versions/dockers/docker-ptf/versions-deb-stretch |  2 +-
 files/build/versions/dockers/docker-ptf/versions-py2 |  2 +-
 .../build/versions/dockers/docker-snmp/versions-py3  |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3 | 12 ++++++------
 .../versions/dockers/docker-sonic-vs/versions-py2    |  2 +-
 .../versions/dockers/docker-sonic-vs/versions-py3    |  4 ++--
 .../sonic-slave-buster/versions-deb-buster-arm64     |  2 ++
 .../sonic-slave-buster/versions-deb-buster-armhf     |  2 ++
 .../dockers/sonic-slave-stretch/versions-deb-stretch |  8 ++++----
 .../sonic-slave-stretch/versions-deb-stretch-arm64   |  4 ++++
 .../sonic-slave-stretch/versions-deb-stretch-armhf   |  4 ++++
 files/build/versions/host-image/versions-deb-buster  |  2 +-
 files/build/versions/host-image/versions-py3         |  6 +++---
 .../build/versions/host-image/versions-py3-all-arm64 |  1 +
 20 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 027ff5ccb838..aca0eca7d2b5 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 39b1179a5eef..364082fcc3a9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,4 +1,4 @@
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
 click==7.0
 docker==5.0.3
 ijson==2.6.1
@@ -8,7 +8,7 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.8.0
+psutil==5.9.0
 python-arptable==0.0.2
 tabulate==0.8.9
 websocket-client==1.2.3
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
index d4b8a90ceb3c..9a4d403bca40 100644
--- 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,3 +1,3 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.26.0
\ No newline at end of file
+requests==2.27.1
\ No newline at end of file
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
index d4b8a90ceb3c..9a4d403bca40 100644
--- 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,3 +1,3 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.26.0
\ No newline at end of file
+requests==2.27.1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 93ef51d31d14..1b6cad1776b7 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9552069c06705e149b156bcc70b84c1636f22f5e
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -16,4 +16,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
index 48fd2100defe..4b348d301a65 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -1,6 +1,6 @@
 j2cli==0.3.10
 jinja2==2.11.3
 markupsafe==1.1.1
-supervisor==4.2.2
+supervisor==4.2.4
 supervisord-dependent-startup==1.4.0
 toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index a29a852499da..d5ac4633be9f 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -122,7 +122,7 @@ libntlm0==1.4-8+deb9u1
 libopts25==1:5.18.12-3
 libp11-kit0==0.23.3-2+deb9u1
 libpam-systemd==232-25+deb9u13
-libpcap0.8==1.8.1-3
+libpcap0.8==1.8.1-3+deb9u1
 libpcre16-3==2:8.39-3
 libperl5.24==5.24.1-3+deb9u7
 libpopt0==1.16-10+b2
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index fb71964a73ef..deabed87ffb5 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -54,7 +54,7 @@ simplegeneric==0.8.1
 singledispatch==3.7.0
 six==1.12.0
 stevedore==1.32.0
-supervisor==4.2.2
+supervisor==4.2.4
 thrift==0.11.0
 traitlets==4.3.3
 twisted==16.0.0
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index 69cc94341cbc..d8b86f5af1c0 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.0.0
-psutil==5.8.0
+psutil==5.9.0
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 2714bc964d82..de0fab4cca58 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
-attrs==21.2.0
+attrs==21.4.0
 certifi==2017.4.17
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
 click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
@@ -13,15 +13,15 @@ importlib-resources==5.4.0
 inflection==0.5.1
 isodate==0.6.1
 itsdangerous==2.0.1
-jsonschema==4.3.2
-openapi-schema-validator==0.1.5
+jsonschema==4.3.3
+openapi-schema-validator==0.1.6
 openapi-spec-validator==0.3.1
 protobuf==3.19.1
 pyrsistent==0.18.0
 python-dateutil==2.6.0
-requests==2.26.0
+requests==2.27.1
 six==1.11.0
 typing_extensions==4.0.1
 urllib3==1.21.1
 werkzeug==2.0.2
-zipp==3.6.0
\ No newline at end of file
+zipp==3.7.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 8bfdf2770e70..7d90a77d7bf1 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -7,7 +7,7 @@ netifaces==0.10.7
 ply==3.11
 py2-ipaddress==3.4.2
 pyroute2==0.5.3
-requests==2.26.0
+requests==2.27.1
 scapy==2.4.0
 six==1.16.0
 urllib3==1.26.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 71dd3c17a748..7ebfe4c0763f 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.10.8
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
 click==7.0
 idna==3.3
 ijson==2.6.1
@@ -9,7 +9,7 @@ netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
 pyroute2==0.5.14
-requests==2.26.0
+requests==2.27.1
 scapy==2.4.4
 tabulate==0.8.9
 urllib3==1.26.7
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index a5fecf3be130..2f0da169ee15 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,4 +1,6 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+libdjvulibre-text==3.5.27.1-10+deb10u1
+libdjvulibre21==3.5.27.1-10+deb10u1
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index de53bbddf9a8..69eb102c5cee 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -11,6 +11,8 @@ libdevel-caller-perl==2.06-2+b1
 libdevel-lexalias-perl==0.05-2+b1
 libdevel-stacktrace-perl==2.0300-1
 libdist-checkconflicts-perl==0.11-1
+libdjvulibre-text==3.5.27.1-10+deb10u1
+libdjvulibre21==3.5.27.1-10+deb10u1
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index ab6475dc60a4..6f314e77de3d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -890,7 +890,7 @@ librrd8==1.6.0-1+b2
 librsvg2-2==2.40.21-0+deb9u1
 librsvg2-common==2.40.21-0+deb9u1
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libruby2.3==2.3.3-1+deb9u10
+libruby2.3==2.3.3-1+deb9u11
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -1280,7 +1280,7 @@ python-jinja2==2.8-1
 python-keyring==10.1-1
 python-keyrings.alt==1.3-1
 python-lazy-object-proxy==1.2.2-1
-python-lxml==3.7.1-1+deb9u4
+python-lxml==3.7.1-1+deb9u5
 python-markupsafe==0.23-3
 python-minimal==2.7.13-2
 python-nose2==0.6.5-2
@@ -1395,8 +1395,8 @@ ruby-net-telnet==0.1.1-2
 ruby-power-assert==0.3.0-1
 ruby-setup==3.4.1-9
 ruby-test-unit==3.1.7-2
-ruby2.3==2.3.3-1+deb9u10
-ruby2.3-dev==2.3.3-1+deb9u10
+ruby2.3==2.3.3-1+deb9u11
+ruby2.3-dev==2.3.3-1+deb9u11
 rubygems-integration==1.11
 seabios==1.10.2-1
 sgml-base==1.29
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 00f894c2df08..99864cdeea55 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,8 +1,12 @@
 docker-ce==18.06.3~ce~3-0~debian
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
+libpcap-dev==1.8.1-3+deb9u1
+libpcap0.8==1.8.1-3+deb9u1
+libpcap0.8-dev==1.8.1-3+deb9u1
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
+libzzip-0-13==0.13.62-3.2~deb9u2
 nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 48c98dc20e6e..49b796f3bdf0 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -6,9 +6,13 @@ libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
+libpcap-dev==1.8.1-3+deb9u1
+libpcap0.8==1.8.1-3+deb9u1
+libpcap0.8-dev==1.8.1-3+deb9u1
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
+libzzip-0-13==0.13.62-3.2~deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
 nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index ef382d54a031..d8f0ac5ce096 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -45,7 +45,7 @@ grub2-common==2.02+dfsg1-20+deb10u4
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2344
+hw-management==1.mlnx.7.0010.2347
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 76cc2cf4b017..c68c16d48a46 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
 click==7.0
 cryptography==36.0.1
 docker==4.3.1
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.8.0
+psutil==5.9.0
 ptyprocess==0.7.0
 pyang==2.5.2
 pyangbind==0.8.1
@@ -32,7 +32,7 @@ python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
 regex==2021.11.10
-requests==2.26.0
+requests==2.27.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
new file mode 100644
index 000000000000..dcf488fe2aaa
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3-all-arm64
@@ -0,0 +1 @@
+urllib3==1.26.8
\ No newline at end of file

From 57abd5914e2a791ecad1637ed4978d118caa4ed6 Mon Sep 17 00:00:00 2001
From: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:24:25 +0300
Subject: [PATCH 0967/1674] [Mellanox] Upgrade Mellanox firmware tools to
 4.17.2-12 (#8978)

- Why I did it
Bug fix:
bad_param request due to missing parser rest command while running mlxlink

- How I did it
Advance to MFT tool version to 4.17.2-12.

- How to verify it
Manually tested on all mellanox platforms.
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 5e9644b5703c..41c1301f0a56 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.17.0
-MFT_REVISION = 106
+MFT_VERSION = 4.17.2
+MFT_REVISION = 12
 
 export MFT_VERSION MFT_REVISION
 

From 75bd97e176dfb820793c17f88b25a4260485d555 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Thu, 13 Jan 2022 13:59:35 +0800
Subject: [PATCH 0968/1674] [Mellanox] Add sensors conf for MSN4600C A1
 platform (#9706)

- Why I did it
Add sensor conf for MSN4600C A1 platform

- How I did it
Add a new sensor conf file and relevant scripts to support two different versions of the platform

- How to verify it
Run "sensors" cmd to check the output on the A1 platform to see whether it's as expected.
Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../get_sensors_conf_path                     |   1 +
 .../x86_64-mlnx_msn4600c-r0/sensors.conf.a1   | 146 ++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf.a1

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
new file mode 120000
index 000000000000..f1509a1e1d3d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
@@ -0,0 +1 @@
+../x86_64-mlnx_msn4700-r0/get_sensors_conf_path
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf.a1 b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf.a1
new file mode 100644
index 000000000000..44fff272e544
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf.a1
@@ -0,0 +1,146 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label power1 "PMIC-1 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-1 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)"
+        label in3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label power1 "PMIC-2 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-2 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)"
+        label curr3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 ASIC 0.85V T0_1 Rail (out)"
+        label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-3 ASIC 0.85V T0_1 Rail Pwr (out)"
+        label curr1 "PMIC-3 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)"
+        label curr3 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 ASIC 0.85V T2_3 Rail (out)"
+        label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label power1 "PMIC-4 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-4 ASIC 0.85V T2_3 Rail Pwr (out)"
+        label curr1 "PMIC-4 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)"
+        label curr3 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
+    chip "mp2975-i2c-*-6e"
+        label in1 "PMIC-5 PSU 12V Rail (in1)"
+        label in2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)"
+        label in3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)"
+        label temp1 "PMIC-5 Temp 1"
+        label power1 "PMIC-5 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Pwr (out)"
+        label power3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Pwr (out)"
+        label curr1 "PMIC-5 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)"
+        label curr3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-6 PSU 12V Rail (in1)"
+        label in2 "PMIC-6 PSU 12V Rail (in2)"
+        label in3 "PMIC-6 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-6 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-7 PSU 12V Rail (in1)"
+        label in2 "PMIC-7 PSU 12V Rail (in2)"
+        label in3 "PMIC-7 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-7 Temp 1"
+        label temp2 "PMIC-7 Temp 2"
+        label power1 "PMIC-7 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-7 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"
+

From bdc7ce86decb6d6e3559e7f261a45d853871b351 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 13 Jan 2022 11:40:43 -0800
Subject: [PATCH 0969/1674] [202012] BRCM SAI 4.3.5.2 Fixes CS00012205357,
 CS00012214196, CS00012213974 (#9754)

---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 0c4de9c0762c..dbe415cf8d7f 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -73,4 +75,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 7aab123eb789..967e488daed3 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.1-9_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.1-9_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 31065ccb931096689b2267c749c3629ad978a66b Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Fri, 14 Jan 2022 01:08:27 +0200
Subject: [PATCH 0970/1674] [Mellanox] [202012] fail the build when hw-mgmt
 patches do not apply (#9566)

Taken from https://github.com/Azure/sonic-buildimage/pull/9539

####  Why I did it
To fix an issue that hw-mgmt patches were not applied. One patch was already in upstream hw-mgmt package thus applying it again caused an error and no other patches were applied. Also, I did it to improve the Makefile, so that the make will fail in case patches fail to apply.

####  How I did it
Removed obsolete patch, made applying patches a hard failure in the build.

####  How to verify it
Run the make and verify patches are applied.
---
 platform/mellanox/hw-management/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/mellanox/hw-management/Makefile b/platform/mellanox/hw-management/Makefile
index eb087b47bfff..9c62312d18c5 100644
--- a/platform/mellanox/hw-management/Makefile
+++ b/platform/mellanox/hw-management/Makefile
@@ -6,7 +6,8 @@ MAIN_TARGET = hw-management_1.mlnx.$(MLNX_HW_MANAGEMENT_VERSION)_amd64.deb
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	pushd hw-mgmt
-	git am ../*.patch
+	git stash
+	git apply -3 ../*.patch || exit 1
 	chmod +x ./debian/rules
 	KVERSION=$(KVERSION) dpkg-buildpackage -us -uc -b -rfakeroot -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd

From 068ff9ddbdeec80c6a169fc38a25733611a9ae81 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Fri, 14 Jan 2022 14:44:43 -0800
Subject: [PATCH 0971/1674] [202012][BRCM TH3] Add SOC properties to prevent
 FDB events during warmboot (#9761)

---
 .../Accton-AS9716-32D/th3-as9716-32x400G.config.bcm           | 4 ++++
 .../Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm    | 4 ++++
 .../Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm     | 4 ++++
 .../Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm    | 4 ++++
 .../Silverstone-128x100/th3-128x100G.config.bcm               | 4 ++++
 .../Silverstone/th3-32x400G.config.bcm                        | 3 +++
 .../DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm          | 4 ++++
 .../th3-z9332f-16x400G-64x100G.config.bcm                     | 4 ++++
 .../DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm          | 4 ++++
 .../Delta-agc032/th3-agc032-32x400G.config.bcm                | 4 ++++
 .../Quanta-IX9-32X/th3-ix9-32x400G.config.bcm                 | 4 ++++
 src/sonic-device-data/tests/permitted_list                    | 2 ++
 12 files changed, 45 insertions(+)

diff --git a/device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/th3-as9716-32x400G.config.bcm b/device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/th3-as9716-32x400G.config.bcm
index 5850f4ce4d72..b3ae068dc2de 100644
--- a/device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/th3-as9716-32x400G.config.bcm
+++ b/device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/th3-as9716-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe
 
 # Reference specfic
diff --git a/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
index 7bd96fed83b8..259bc6767419 100644
--- a/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
+++ b/device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 arl_clean_timeout_usec=15000000
 asf_mem_profile.0=2
 bcm_num_cos.0=8
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
index c429c28bad68..ca72849db767 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
diff --git a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
index b23b8abf1377..8890e3d049c2 100644
--- a/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
+++ b/device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
diff --git a/device/celestica/x86_64-cel_silverstone-r0/Silverstone-128x100/th3-128x100G.config.bcm b/device/celestica/x86_64-cel_silverstone-r0/Silverstone-128x100/th3-128x100G.config.bcm
index 0b66c8b53814..0b105aeccbad 100644
--- a/device/celestica/x86_64-cel_silverstone-r0/Silverstone-128x100/th3-128x100G.config.bcm
+++ b/device/celestica/x86_64-cel_silverstone-r0/Silverstone-128x100/th3-128x100G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 pbmp_xport_xe.0=0x8ffff8ffffcffff8ffff8ffff8ffffcffff9fffe
 ccm_dma_enable=0
 ccmdma_intr_enable=0
diff --git a/device/celestica/x86_64-cel_silverstone-r0/Silverstone/th3-32x400G.config.bcm b/device/celestica/x86_64-cel_silverstone-r0/Silverstone/th3-32x400G.config.bcm
index 5e5fc82aeace..22e8d9ee9657 100644
--- a/device/celestica/x86_64-cel_silverstone-r0/Silverstone/th3-32x400G.config.bcm
+++ b/device/celestica/x86_64-cel_silverstone-r0/Silverstone/th3-32x400G.config.bcm
@@ -1,3 +1,6 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
 
 pbmp_xport_xe.0=0x8111181111c1111811118111181111c111182222
 ccm_dma_enable=0
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
index 73d70ce5fdab..207680ec374a 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
index 1433de4d3b6c..5ce4bda28535 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
index a46ac765bb66..5871d8750f5e 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
diff --git a/device/delta/x86_64-delta_agc032-r0/Delta-agc032/th3-agc032-32x400G.config.bcm b/device/delta/x86_64-delta_agc032-r0/Delta-agc032/th3-agc032-32x400G.config.bcm
index d3dfd269ff1b..6e5a8c9483c0 100644
--- a/device/delta/x86_64-delta_agc032-r0/Delta-agc032/th3-agc032-32x400G.config.bcm
+++ b/device/delta/x86_64-delta_agc032-r0/Delta-agc032/th3-agc032-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 #########################################
 ## cfg for AGC032
 #########################################
diff --git a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
index 93937398e832..f538c46d0b5e 100644
--- a/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
+++ b/device/quanta/x86_64-quanta_ix9_bwde-r0/Quanta-IX9-32X/th3-ix9-32x400G.config.bcm
@@ -1,3 +1,7 @@
+# The following 2 SOC properties are needed to prevent FDB Events during Warmboot due to TH3 is SW Managed MACs
+l2xmsg_shadow_hit_bits=0
+l2xmsg_no_cb_during_table_rebuild=1
+
 phy_null=1
 pll_bypass=1
 
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 99086929ebc0..e954014fb7f3 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -239,3 +239,5 @@ buf.map.egress_pool2.ingress_pool
 sai_adjust_acl_drop_in_rx_drop
 sai_verify_incoming_chksum
 l3_alpm_hit_skip
+l2xmsg_shadow_hit_bits
+l2xmsg_no_cb_during_table_rebuild

From d2ee7a5befc3a41f01194be779389705b71e17e3 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Wed, 12 Jan 2022 14:40:01 -0800
Subject: [PATCH 0972/1674] [docker-snmp]: Modify log level of snmpd (#9734)

#### Why I did it
resolves https://github.com/Azure/sonic-buildimage/issues/8779
snmpd writes the below error message in syslog :
snmp#snmpd[27]: truncating integer value > 32 bits
This message is written in syslog when the hrSystemUptime(1.3.6.1.2.1.25.1.1.0 / system uptime) or sysUpTime(1.3.6.1.2.1.1.3 network management portion or snmpd uptime) is queried when either of these counters overflow beyond 32 bit value. This happens the device uptime or snmpd uptime is more than 497 days.

#### How I did it
Reference: https://access.redhat.com/solutions/367093 and https://linux.die.net/man/1/snmpcmd

To avoid seeing this message if the counter grows, the snmpd error log level is changed to display  LOG_EMERG, LOG_ALERT, LOG_CRIT, and LOG_DEBUG.

Without this change, LOG_ERR and LOG_WARNING would also be logged in syslog.

#### How to verify it
On a device which is up for more than 497 days, modify supervisord.conf  with the change and restart snmp.
Query 1.3.6.1.2.1.1.3 and verify that log message is not seen.
---
 dockers/docker-snmp/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-snmp/supervisord.conf b/dockers/docker-snmp/supervisord.conf
index 06e11eb5fbed..3d11cc48eafd 100644
--- a/dockers/docker-snmp/supervisord.conf
+++ b/dockers/docker-snmp/supervisord.conf
@@ -40,7 +40,7 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [program:snmpd]
-command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid
+command=/usr/sbin/snmpd -f -LS0-2d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid
 priority=3
 autostart=false
 autorestart=false

From 3ef3e3c56fb3ed30be5d5a4d2273a0b869022c1b Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Sat, 15 Jan 2022 09:49:34 +0800
Subject: [PATCH 0973/1674] Update cisco-8000 ref to release:
 202012-v0.8-nopatches (#9763)

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index f2c0cc183bba..7a5ae521c328 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.8
+ref=202012-v0.8-nopatches

From 5a6ca0ad1a191f23e0e41f0c8db3dfa2ff4c7d3a Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Tue, 18 Jan 2022 18:50:07 +0200
Subject: [PATCH 0974/1674] [submodule]: Advance sonic-platform-common. (#9788)

Advanced submodule to pick up QSFP port mapping improvements:
[202012][sonic_sfp]: prefer Config DB port index mapping over platform.json/port_config.ini

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 6f198d0adfd1..93eedd04e64c 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 6f198d0adfd1d7dcdafb5ec29d5bd56362b385df
+Subproject commit 93eedd04e64c9f658641b735092b4b54fa0b83f7

From 8e924b9a70b030015d7180a317fbaa5a63101602 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 19 Jan 2022 17:42:55 +0800
Subject: [PATCH 0975/1674] [Mellanox] Optimize thermal policies (#9665)

- Why I did it
Optimize thermal control policies to simplify the logic and add more protection code in policies to make sure it works even if kernel algorithm does not work.

- How I did it
Reduce unused thermal policies
Add timely ASIC temperature check in thermal policy to make sure ASIC temperature and fan speed is coordinated
Minimum allowed fan speed now is calculated by max of the expected fan speed among all policies
Move some logic from fan.py to thermal.py to make it more readable

- How to verify it
1. Manual test
2. Regression
---
 .../mlnx-platform-api/sonic_platform/fan.py   |  53 +----
 .../sonic_platform/thermal.py                 | 186 +++++++++++----
 .../sonic_platform/thermal_actions.py         | 159 ++-----------
 .../sonic_platform/thermal_conditions.py      |  50 ----
 .../sonic_platform/thermal_manager.py         |  56 ++---
 .../tests/policy_with_same_conditions.json    |   9 +-
 .../tests/test_thermal_policy.py              | 222 +++++++-----------
 .../tests/thermal_policy.json                 |  19 +-
 8 files changed, 285 insertions(+), 469 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
index 7eb0ce946b17..1264517e6b6a 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
@@ -13,6 +13,7 @@
     from sonic_platform_base.fan_base import FanBase
     from .led import FanLed, ComponentFaultyIndicator
     from .utils import read_int_from_file, read_str_from_file, write_file
+    from .thermal import Thermal
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
@@ -24,22 +25,19 @@
 FAN_DIR = "/var/run/hw-management/thermal/fan{}_dir"
 FAN_DIR_VALUE_EXHAUST = 0
 FAN_DIR_VALUE_INTAKE = 1
-COOLING_STATE_PATH = "/var/run/hw-management/thermal/cooling_cur_state"
 
 class Fan(FanBase):
     """Platform-specific Fan class"""
 
     STATUS_LED_COLOR_ORANGE = "orange"
-    min_cooling_level = 2
-    MIN_VALID_COOLING_LEVEL = 1
-    MAX_VALID_COOLING_LEVEL = 10
+
     # PSU fan speed vector
     PSU_FAN_SPEED = ['0x3c', '0x3c', '0x3c', '0x3c', '0x3c',
                      '0x3c', '0x3c', '0x46', '0x50', '0x5a', '0x64']
 
     def __init__(self, fan_index, fan_drawer, position, psu_fan = False, psu=None):
         super(Fan, self).__init__()
-    
+
         # API index is starting from 0, Mellanox platform index is starting from 1
         self.index = fan_index + 1
         self.fan_drawer = fan_drawer
@@ -84,7 +82,7 @@ def get_direction(self):
             depending on fan direction
 
         Notes:
-            What Mellanox calls forward: 
+            What Mellanox calls forward:
             Air flows from fans side to QSFP side, for example: MSN2700-CS2F
             which means intake in community
             What Mellanox calls reverse:
@@ -161,7 +159,7 @@ def get_target_speed(self):
         if self.is_psu_fan:
             try:
                 # Get PSU fan target speed according to current system cooling level
-                cooling_level = self.get_cooling_level()
+                cooling_level = Thermal.get_cooling_level()
                 return int(self.PSU_FAN_SPEED[cooling_level], 16)
             except Exception:
                 return self.get_speed()
@@ -179,7 +177,7 @@ def set_speed(self, speed):
                    in the range 0 (off) to 100 (full speed)
 
         Returns:
-            bool: True if set success, False if fail. 
+            bool: True if set success, False if fail.
         """
         status = True
 
@@ -203,11 +201,6 @@ def set_speed(self, speed):
                 return False
 
         try:
-            cooling_level = int(speed // 10)
-            if cooling_level < self.min_cooling_level:
-                cooling_level = self.min_cooling_level
-                speed = self.min_cooling_level * 10
-            self.set_cooling_level(cooling_level, cooling_level)
             pwm = int(round(PWM_MAX*speed/100.0))
             write_file(os.path.join(FAN_PATH, self.fan_speed_set_path), pwm, raise_exception=True)
         except (ValueError, IOError):
@@ -225,7 +218,7 @@ def set_status_led(self, color):
                    fan module status LED
 
         Returns:
-            bool: True if set success, False if fail. 
+            bool: True if set success, False if fail.
         """
         return self.led.set_status(color)
 
@@ -267,36 +260,4 @@ def is_replaceable(self):
         """
         return False
 
-    @classmethod
-    def set_cooling_level(cls, level, cur_state):
-        """
-        Change cooling level. The input level should be an integer value [1, 10].
-        1 means 10%, 2 means 20%, 10 means 100%.
-        """
-        if not isinstance(level, int):
-            raise RuntimeError("Failed to set cooling level, input parameter must be integer")
 
-        if level < cls.MIN_VALID_COOLING_LEVEL or level > cls.MAX_VALID_COOLING_LEVEL:
-            raise RuntimeError("Failed to set cooling level, level value must be in range [{}, {}], got {}".format(
-                cls.MIN_VALID_COOLING_LEVEL,
-                cls.MAX_VALID_COOLING_LEVEL,
-                level
-                ))
-
-        try:
-            # Reset FAN cooling level vector. According to low level team,
-            # if we need set cooling level to X, we need first write a (10+X) 
-            # to cooling_cur_state file to reset the cooling level vector.
-            write_file(COOLING_STATE_PATH, level + 10, raise_exception=True)
-
-            # We need set cooling level after resetting the cooling level vector 
-            write_file(COOLING_STATE_PATH, cur_state, raise_exception=True)
-        except (ValueError, IOError) as e:
-            raise RuntimeError("Failed to set cooling level - {}".format(e))
-
-    @classmethod
-    def get_cooling_level(cls):
-        try:
-            return read_int_from_file(COOLING_STATE_PATH, raise_exception=True)
-        except (ValueError, IOError) as e:
-            raise RuntimeError("Failed to get cooling level - {}".format(e))
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index d28eabdbe6a4..2afd82f75986 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -13,6 +13,9 @@
     from os.path import isfile, join
     import io
     import os.path
+    import glob
+
+    from . import utils
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
@@ -46,7 +49,17 @@
 THERMAL_ZONE_MODE = "thermal_zone_mode"
 THERMAL_ZONE_POLICY = "thermal_zone_policy"
 THERMAL_ZONE_TEMPERATURE = "thermal_zone_temp"
-THERMAL_ZONE_NORMAL_TEMPERATURE = "temp_trip_high"
+THERMAL_ZONE_HOT_THRESHOLD = "temp_trip_hot"
+THERMAL_ZONE_HIGH_THRESHOLD = "temp_trip_high"
+THERMAL_ZONE_NORMAL_THRESHOLD = "temp_trip_norm"
+THERMAL_ZONE_FOLDER_WILDCARD = '/run/hw-management/thermal/mlxsw*'
+THERMAL_ZONE_HYSTERESIS = 5000
+COOLING_STATE_PATH = "/var/run/hw-management/thermal/cooling_cur_state"
+# Min allowed cooling level when all thermal zones are in normal state
+MIN_COOLING_LEVEL_FOR_NORMAL = 2
+# Min allowed cooling level when any thermal zone is in high state but no thermal zone is in emergency state
+MIN_COOLING_LEVEL_FOR_HIGH = 4
+MAX_COOLING_LEVEL = 10
 
 MODULE_TEMPERATURE_FAULT_PATH = "/var/run/hw-management/thermal/module{}_temp_fault"
 
@@ -96,14 +109,14 @@
     THERMAL_DEV_BOARD_AMBIENT : "Ambient Board Temp"
 }
 thermal_api_handlers = {
-    THERMAL_DEV_CATEGORY_CPU_CORE : thermal_api_handler_cpu_core, 
+    THERMAL_DEV_CATEGORY_CPU_CORE : thermal_api_handler_cpu_core,
     THERMAL_DEV_CATEGORY_CPU_PACK : thermal_api_handler_cpu_pack,
     THERMAL_DEV_CATEGORY_MODULE : thermal_api_handler_module,
     THERMAL_DEV_CATEGORY_PSU : thermal_api_handler_psu,
     THERMAL_DEV_CATEGORY_GEARBOX : thermal_api_handler_gearbox
 }
 thermal_name = {
-    THERMAL_DEV_CATEGORY_CPU_CORE : "CPU Core {} Temp", 
+    THERMAL_DEV_CATEGORY_CPU_CORE : "CPU Core {} Temp",
     THERMAL_DEV_CATEGORY_CPU_PACK : "CPU Pack Temp",
     THERMAL_DEV_CATEGORY_MODULE : "xSFP module {} Temp",
     THERMAL_DEV_CATEGORY_PSU : "PSU-{} Temp",
@@ -351,7 +364,7 @@ def initialize_sfp_thermals(platform, thermal_list, sfp_index):
     thermal = Thermal(THERMAL_DEV_CATEGORY_MODULE, sfp_index, True, 1)
     thermal_list.append(thermal)
 
-    
+
 def initialize_chassis_thermals(platform, thermal_list):
     # create thermal objects for all categories of sensors
     tp_index = platform_dict_thermal[platform]
@@ -386,6 +399,14 @@ def initialize_chassis_thermals(platform, thermal_list):
 class Thermal(ThermalBase):
     thermal_profile = None
     thermal_algorithm_status = False
+    # Expect cooling level, used for caching the cooling level value before commiting to hardware
+    expect_cooling_level = None
+    # Expect cooling state
+    expect_cooling_state = None
+    # Last committed cooling level
+    last_set_cooling_level = None
+    last_set_cooling_state = None
+    last_set_psu_cooling_level = None
 
     def __init__(self, category, index, has_index, position, dependency = None):
         """
@@ -464,7 +485,7 @@ def get_temperature(self):
 
         Returns:
             A float number of current temperature in Celsius up to nearest thousandth
-            of one degree Celsius, e.g. 30.125 
+            of one degree Celsius, e.g. 30.125
         """
         if self.dependency:
             status, hint = self.dependency()
@@ -546,7 +567,7 @@ def is_replaceable(self):
     @classmethod
     def _write_generic_file(cls, filename, content):
         """
-        Generic functions to write content to a specified file path if 
+        Generic functions to write content to a specified file path if
         the content has changed.
         """
         try:
@@ -566,8 +587,8 @@ def set_thermal_algorithm_status(cls, status, force=True):
         only adjust fan speed when temperature across some "edge", e.g temperature
         changes to exceed high threshold.
         When disable kernel thermal algorithm, kernel no longer adjust fan speed.
-        We usually disable the algorithm when we want to set a fix speed. E.g, when 
-        a fan unit is removed from system, we will set fan speed to 100% and disable 
+        We usually disable the algorithm when we want to set a fix speed. E.g, when
+        a fan unit is removed from system, we will set fan speed to 100% and disable
         the algorithm to avoid it adjust the speed.
 
         Returns:
@@ -601,51 +622,38 @@ def set_thermal_algorithm_status(cls, status, force=True):
         return True
 
     @classmethod
-    def check_thermal_zone_temperature(cls):
-        """
-        Check thermal zone current temperature with normal temperature
+    def get_min_allowed_cooling_level_by_thermal_zone(cls):
+        """Get min allowed cooling level according to thermal zone status:
+            1. If temperature of all thermal zones is less than normal threshold, min allowed cooling level is
+               $MIN_COOLING_LEVEL_FOR_NORMAL = 2
+            2. If temperature of any thermal zone is greater than normal threshold, but no thermal zone temperature
+               is greater than high threshold, min allowed cooling level is $MIN_COOLING_LEVEL_FOR_HIGH = 4
+            3. Otherwise, there is no minimum allowed value and policy should not adjust cooling level
 
         Returns:
-            True if all thermal zones current temperature less or equal than normal temperature
+            int: minimum allowed cooling level
         """
-        if not cls.thermal_profile:
-            raise Exception("Fail to get thermal profile for this switch")
-
-        if not cls._check_thermal_zone_temperature(THERMAL_ZONE_ASIC_PATH):
-            return False
-
-        if THERMAL_DEV_CATEGORY_MODULE in cls.thermal_profile:
-            start, count = cls.thermal_profile[THERMAL_DEV_CATEGORY_MODULE]
-            if count != 0:
-                for index in range(count):
-                    if not cls._check_thermal_zone_temperature(THERMAL_ZONE_MODULE_PATH.format(start + index)):
-                        return False
-
-        if THERMAL_DEV_CATEGORY_GEARBOX in cls.thermal_profile:
-            start, count = cls.thermal_profile[THERMAL_DEV_CATEGORY_GEARBOX]
-            if count != 0:
-                for index in range(count):
-                    if not cls._check_thermal_zone_temperature(THERMAL_ZONE_GEARBOX_PATH.format(start + index)):
-                        return False
-
-        return True
+        min_allowed = MIN_COOLING_LEVEL_FOR_NORMAL
+        thermal_zone_present = False
+        try:
+            for thermal_zone_folder in glob.iglob(THERMAL_ZONE_FOLDER_WILDCARD):
+                thermal_zone_present = True
+                normal_thresh = utils.read_int_from_file(os.path.join(thermal_zone_folder, THERMAL_ZONE_NORMAL_THRESHOLD))
+                current = utils.read_int_from_file(os.path.join(thermal_zone_folder, THERMAL_ZONE_TEMPERATURE))
+                if current < normal_thresh - THERMAL_ZONE_HYSTERESIS:
+                    continue
 
-    @classmethod
-    def _check_thermal_zone_temperature(cls, thermal_zone_path):
-        normal_temp_path = join(thermal_zone_path, THERMAL_ZONE_NORMAL_TEMPERATURE)
-        current_temp_path = join(thermal_zone_path, THERMAL_ZONE_TEMPERATURE)
-        normal = None
-        current = None
-        try:    
-            with open(normal_temp_path, 'r') as file_obj:
-                normal = float(file_obj.read())
-
-            with open(current_temp_path, 'r') as file_obj:
-                current = float(file_obj.read())
-
-            return current <= normal
+                hot_thresh = utils.read_int_from_file(os.path.join(thermal_zone_folder, THERMAL_ZONE_HIGH_THRESHOLD))
+                if current < hot_thresh - THERMAL_ZONE_HYSTERESIS:
+                    min_allowed = MIN_COOLING_LEVEL_FOR_HIGH
+                else:
+                    min_allowed = None
+                    break
         except Exception as e:
-            logger.log_info("Fail to check thermal zone temperature for file {} due to {}".format(thermal_zone_path, repr(e)))
+            logger.log_error('Failed to get thermal zone status for {} - {}'.format(thermal_zone_folder, repr(e)))
+            return None
+
+        return min_allowed if thermal_zone_present else None
 
     @classmethod
     def check_module_temperature_trustable(cls):
@@ -669,3 +677,85 @@ def get_min_amb_temperature(cls):
         fan_ambient_temp = int(cls._read_generic_file(fan_ambient_path, 0))
         port_ambient_temp = int(cls._read_generic_file(port_ambient_path, 0))
         return fan_ambient_temp if fan_ambient_temp < port_ambient_temp else port_ambient_temp
+
+    @classmethod
+    def set_cooling_level(cls, level):
+        """
+        Change cooling level. The input level should be an integer value [1, 10].
+        1 means 10%, 2 means 20%, 10 means 100%.
+        """
+        if cls.last_set_cooling_level != level:
+            utils.write_file(COOLING_STATE_PATH, level + 10, raise_exception=True)
+            cls.last_set_cooling_level = level
+
+    @classmethod
+    def set_cooling_state(cls, state):
+        """Change cooling state.
+
+        Args:
+            state (int): cooling state
+        """
+        if cls.last_set_cooling_state != state:
+            utils.write_file(COOLING_STATE_PATH, state, raise_exception=True)
+            cls.last_set_cooling_state = state
+
+    @classmethod
+    def get_cooling_level(cls):
+        try:
+            return utils.read_int_from_file(COOLING_STATE_PATH, raise_exception=True)
+        except (ValueError, IOError) as e:
+            raise RuntimeError("Failed to get cooling level - {}".format(e))
+
+    @classmethod
+    def set_expect_cooling_level(cls, expect_value):
+        """During thermal policy running, cache the expect cooling level generated by policies. The max expect
+           cooling level will be committed to hardware.
+
+        Args:
+            expect_value (int): Expected cooling level value
+        """
+        if cls.expect_cooling_level is None or cls.expect_cooling_level < expect_value:
+            cls.expect_cooling_level = int(expect_value)
+
+    @classmethod
+    def commit_cooling_level(cls, thermal_info_dict):
+        """Commit cooling level to hardware. This will affect system fan and PSU fan speed.
+
+        Args:
+            thermal_info_dict (dict): Thermal information dictionary
+        """
+        if cls.expect_cooling_level is not None:
+            cls.set_cooling_level(cls.expect_cooling_level)
+
+        if cls.expect_cooling_state is not None:
+            cls.set_cooling_state(cls.expect_cooling_state)
+        elif cls.expect_cooling_level is not None:
+            cls.set_cooling_state(cls.expect_cooling_level)
+
+        cls.expect_cooling_level = None
+        # We need to set system fan speed here because kernel will automaticlly adjust fan speed according to cooling level and cooling state
+
+        # Commit PSU fan speed with current state
+        from .thermal_infos import ChassisInfo
+        if ChassisInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[ChassisInfo.INFO_NAME], ChassisInfo):
+            cooling_level = cls.get_cooling_level()
+            if cls.last_set_psu_cooling_level == cooling_level:
+                return
+            speed = cooling_level * 10
+            chassis = thermal_info_dict[ChassisInfo.INFO_NAME].get_chassis()
+            for psu in chassis.get_all_psus():
+                for psu_fan in psu.get_all_fans():
+                    psu_fan.set_speed(speed)
+            cls.last_set_psu_cooling_level = cooling_level
+        
+    @classmethod
+    def monitor_asic_themal_zone(cls):
+        """This is a protection for asic thermal zone, if asic temperature is greater than hot threshold + THERMAL_ZONE_HYSTERESIS,
+           and if cooling state is not MAX, we need enforce the cooling state to MAX
+        """
+        asic_temp = utils.read_int_from_file(os.path.join(THERMAL_ZONE_ASIC_PATH, THERMAL_ZONE_TEMPERATURE), raise_exception=True)
+        hot_thresh = utils.read_int_from_file(os.path.join(THERMAL_ZONE_ASIC_PATH, THERMAL_ZONE_HOT_THRESHOLD), raise_exception=True)
+        if asic_temp >= hot_thresh + THERMAL_ZONE_HYSTERESIS:
+            cls.expect_cooling_state = MAX_COOLING_LEVEL
+        else:
+            cls.expect_cooling_state = None
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_actions.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_actions.py
index e7436bd0a5b7..c5c2645b7915 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_actions.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_actions.py
@@ -1,6 +1,5 @@
 from sonic_platform_base.sonic_thermal_control.thermal_action_base import ThermalPolicyActionBase
 from sonic_platform_base.sonic_thermal_control.thermal_json_object import thermal_json_object
-from .thermal import logger
 
 
 class SetFanSpeedAction(ThermalPolicyActionBase):
@@ -48,120 +47,30 @@ def execute(self, thermal_info_dict):
         :param thermal_info_dict: A dictionary stores all thermal information.
         :return:
         """
-        from .thermal_infos import FanInfo
-        if FanInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[FanInfo.INFO_NAME], FanInfo):
-            fan_info_obj = thermal_info_dict[FanInfo.INFO_NAME]
-            for fan in fan_info_obj.get_presence_fans():
-                fan.set_speed(self.speed)
-        logger.log_info('Set all system FAN speed to {}'.format(self.speed))
-
-        SetAllFanSpeedAction.set_psu_fan_speed(thermal_info_dict, self.speed)
-
-    @classmethod
-    def set_psu_fan_speed(cls, thermal_info_dict, speed):
-        from .thermal_infos import ChassisInfo
-        if ChassisInfo.INFO_NAME in thermal_info_dict and isinstance(thermal_info_dict[ChassisInfo.INFO_NAME], ChassisInfo):
-            chassis = thermal_info_dict[ChassisInfo.INFO_NAME].get_chassis()
-            for psu in chassis.get_all_psus():
-                for psu_fan in psu.get_all_fans():
-                    psu_fan.set_speed(speed)
-
-
-@thermal_json_object('fan.all.check_and_set_speed')
-class CheckAndSetAllFanSpeedAction(SetAllFanSpeedAction):
-    """
-    Action to check thermal zone temperature and recover speed for all fans
-    """
-    def execute(self, thermal_info_dict):
-        """
-        Check thermal zone and set speed for all fans
-        :param thermal_info_dict: A dictionary stores all thermal information.
-        :return:
-        """
         from .thermal import Thermal
-        if Thermal.check_thermal_zone_temperature():
-            SetAllFanSpeedAction.execute(self, thermal_info_dict)
-        
-
-@thermal_json_object('thermal_control.control')
-class ControlThermalAlgoAction(ThermalPolicyActionBase):
-    """
-    Action to control the thermal control algorithm
-    """
-    # JSON field definition
-    JSON_FIELD_STATUS = 'status'
-
-    def __init__(self):
-        self.status = True
-
-    def load_from_json(self, json_obj):
-        """
-        Construct ControlThermalAlgoAction via JSON. JSON example:
-            {
-                "type": "thermal_control.control"
-                "status": "true"
-            }
-        :param json_obj: A JSON object representing a ControlThermalAlgoAction action.
-        :return:
-        """
-        if ControlThermalAlgoAction.JSON_FIELD_STATUS in json_obj:
-            status_str = json_obj[ControlThermalAlgoAction.JSON_FIELD_STATUS].lower()
-            if status_str == 'true':
-                self.status = True
-            elif status_str == 'false':
-                self.status = False
-            else:
-                raise ValueError('Invalid {} field value, please specify true of false'.
-                                 format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
-        else:
-            raise ValueError('ControlThermalAlgoAction '
-                             'missing mandatory field {} in JSON policy file'.
-                             format(ControlThermalAlgoAction.JSON_FIELD_STATUS))
-
-    def execute(self, thermal_info_dict):
-        """
-        Disable thermal control algorithm
-        :param thermal_info_dict: A dictionary stores all thermal information.
-        :return:
-        """
-        from .thermal_infos import FanInfo
-        from .thermal import Thermal
-        from .thermal_conditions import UpdateCoolingLevelToMinCondition
-        from .fan import Fan
-        status_changed = Thermal.set_thermal_algorithm_status(self.status, False)
-
-        # Only update cooling level if thermal algorithm status changed
-        if status_changed:
-            if self.status:
-                # Check thermal zone temperature, if all thermal zone temperature
-                # back to normal, set it to minimum allowed speed to
-                # save power
-                UpdateCoolingLevelToMinAction.update_cooling_level_to_minimum(thermal_info_dict)
-
-            logger.log_info('Changed thermal algorithm status to {}'.format(self.status))
+        Thermal.set_expect_cooling_level(self.speed / 10)
 
 
 @thermal_json_object('thermal.recover')
 class ThermalRecoverAction(ThermalPolicyActionBase):
-    def execute(self, thermal_info_dict):
-         UpdateCoolingLevelToMinAction.update_cooling_level_to_minimum(thermal_info_dict)
-
-
-class ChangeMinCoolingLevelAction(ThermalPolicyActionBase):
     UNKNOWN_SKU_COOLING_LEVEL = 6
+
     def execute(self, thermal_info_dict):
         from .device_data import DEVICE_DATA
-        from .fan import Fan
+        from .thermal import Thermal, MAX_COOLING_LEVEL, MIN_COOLING_LEVEL_FOR_HIGH, logger
         from .thermal_infos import ChassisInfo
-        from .thermal_conditions import MinCoolingLevelChangeCondition
-        from .thermal_conditions import UpdateCoolingLevelToMinCondition
+        Thermal.monitor_asic_themal_zone()
 
+        # Calculate dynamic minimum cooling level
+        dynamic_min_cooling_level = None
         chassis = thermal_info_dict[ChassisInfo.INFO_NAME].get_chassis()
         if chassis.platform_name not in DEVICE_DATA or 'thermal' not in DEVICE_DATA[chassis.platform_name] or 'minimum_table' not in DEVICE_DATA[chassis.platform_name]['thermal']:
-            Fan.min_cooling_level = ChangeMinCoolingLevelAction.UNKNOWN_SKU_COOLING_LEVEL
+            # If there is no minimum_table defined, set dynamic_min_cooling_level to default value
+            dynamic_min_cooling_level = ThermalRecoverAction.UNKNOWN_SKU_COOLING_LEVEL
         else:
-            trust_state = MinCoolingLevelChangeCondition.trust_state
-            temperature = MinCoolingLevelChangeCondition.temperature
+            trust_state = Thermal.check_module_temperature_trustable()
+            temperature = Thermal.get_min_amb_temperature()
+            temperature = int(temperature / 1000)
             minimum_table = DEVICE_DATA[chassis.platform_name]['thermal']['minimum_table']['unk_{}'.format(trust_state)]
 
             for key, cooling_level in minimum_table.items():
@@ -169,41 +78,19 @@ def execute(self, thermal_info_dict):
                 temp_min = int(temp_range[0].strip())
                 temp_max = int(temp_range[1].strip())
                 if temp_min <= temperature <= temp_max:
-                    Fan.min_cooling_level = cooling_level - 10
+                    dynamic_min_cooling_level = cooling_level - 10
                     break
-        
-        current_cooling_level = Fan.get_cooling_level()
-        if current_cooling_level < Fan.min_cooling_level:
-            Fan.set_cooling_level(Fan.min_cooling_level, Fan.min_cooling_level)
-            SetAllFanSpeedAction.set_psu_fan_speed(thermal_info_dict, Fan.min_cooling_level * 10)
-        else:
-            Fan.set_cooling_level(Fan.min_cooling_level, current_cooling_level)
-            UpdateCoolingLevelToMinAction.update_cooling_level_to_minimum(thermal_info_dict)
-
 
-class UpdatePsuFanSpeedAction(ThermalPolicyActionBase):
-    def execute(self, thermal_info_dict):
-        from .thermal_conditions import CoolingLevelChangeCondition
-        SetAllFanSpeedAction.set_psu_fan_speed(thermal_info_dict, CoolingLevelChangeCondition.cooling_level * 10)
+        if not dynamic_min_cooling_level:
+            # Should not go to this branch, just in case
+            logger.log_error('Failed to get dynamic minimum cooling level')
+            dynamic_min_cooling_level = MAX_COOLING_LEVEL
 
-
-class UpdateCoolingLevelToMinAction(ThermalPolicyActionBase):
-    def execute(self, thermal_info_dict):
-        self.update_cooling_level_to_minimum(thermal_info_dict)
-
-    @classmethod
-    def update_cooling_level_to_minimum(cls, thermal_info_dict):
-        from .fan import Fan
-        from .thermal import Thermal
-        from .thermal_conditions import UpdateCoolingLevelToMinCondition
-        from .thermal_infos import FanInfo
-        if Thermal.check_thermal_zone_temperature():
-            fan_info_obj = thermal_info_dict[FanInfo.INFO_NAME]
-            speed = Fan.min_cooling_level * 10
-            for fan in fan_info_obj.get_presence_fans():
-                fan.set_speed(speed)
-            SetAllFanSpeedAction.set_psu_fan_speed(thermal_info_dict, speed)
-            UpdateCoolingLevelToMinCondition.enable = False
+        if Thermal.last_set_cooling_level is not None and dynamic_min_cooling_level > Thermal.last_set_cooling_level and dynamic_min_cooling_level >= MIN_COOLING_LEVEL_FOR_HIGH:
+            # No need to check thermal zone as dynamic_min_cooling_level is greater than previous value and MIN_COOLING_LEVEL_FOR_HIGH
+            Thermal.set_expect_cooling_level(dynamic_min_cooling_level)
         else:
-            UpdateCoolingLevelToMinCondition.enable = True
-
+            min_cooling_level_by_tz = Thermal.get_min_allowed_cooling_level_by_thermal_zone()
+            if min_cooling_level_by_tz is not None:
+                cooling_level = max(dynamic_min_cooling_level, min_cooling_level_by_tz)
+                Thermal.set_expect_cooling_level(cooling_level)
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
index a682061d12a8..94366c2c27ac 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_conditions.py
@@ -74,53 +74,3 @@ class AllPsuPresenceCondition(PsuCondition):
     def is_match(self, thermal_info_dict):
         psu_info_obj = self.get_psu_info(thermal_info_dict)
         return len(psu_info_obj.get_absence_psus()) == 0 if psu_info_obj else False
-
-
-class MinCoolingLevelChangeCondition(ThermalPolicyConditionBase):
-    trust_state = None
-    temperature = None
-    
-    def is_match(self, thermal_info_dict):
-        from .thermal import Thermal
-
-        trust_state = Thermal.check_module_temperature_trustable()
-        temperature = Thermal.get_min_amb_temperature()
-        temperature = int(temperature / 1000)
-
-        change_cooling_level = False
-        if trust_state != MinCoolingLevelChangeCondition.trust_state:
-            MinCoolingLevelChangeCondition.trust_state = trust_state
-            change_cooling_level = True
-        
-        if temperature != MinCoolingLevelChangeCondition.temperature:
-            MinCoolingLevelChangeCondition.temperature = temperature
-            change_cooling_level = True
-
-        return change_cooling_level
-
-
-class CoolingLevelChangeCondition(ThermalPolicyConditionBase):
-    cooling_level = None
-
-    def is_match(self, thermal_info_dict):
-        from .fan import Fan
-        current_cooling_level = Fan.get_cooling_level()
-        if current_cooling_level != CoolingLevelChangeCondition.cooling_level:
-            CoolingLevelChangeCondition.cooling_level = current_cooling_level
-            return True
-        else:
-            return False
-
-
-class UpdateCoolingLevelToMinCondition(ThermalPolicyConditionBase):
-    enable = False
-    def is_match(self, thermal_info_dict):
-        if not UpdateCoolingLevelToMinCondition.enable:
-            return False
-
-        from .fan import Fan
-        current_cooling_level = Fan.get_cooling_level()
-        if current_cooling_level == Fan.min_cooling_level:
-            UpdateCoolingLevelToMinCondition.enable = False
-            return False
-        return True
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
index c2acf49a2245..23fb22670e02 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal_manager.py
@@ -4,27 +4,18 @@
 from .thermal_actions import *
 from .thermal_conditions import *
 from .thermal_infos import *
+from .thermal import logger, MAX_COOLING_LEVEL, Thermal
 
 
 class ThermalManager(ThermalManagerBase):
-    @classmethod
-    def initialize(cls):
-        """
-        Initialize thermal manager, including register thermal condition types and thermal action types
-        and any other vendor specific initialization.
-        :return:
-        """
-        cls._add_private_thermal_policy()
-
     @classmethod
     def start_thermal_control_algorithm(cls):
         """
         Start thermal control algorithm
 
         Returns:
-            bool: True if set success, False if fail. 
+            bool: True if set success, False if fail.
         """
-        from .thermal import Thermal
         Thermal.set_thermal_algorithm_status(True)
 
     @classmethod
@@ -33,24 +24,33 @@ def stop_thermal_control_algorithm(cls):
         Stop thermal control algorithm
 
         Returns:
-            bool: True if set success, False if fail. 
+            bool: True if set success, False if fail.
         """
-        from .thermal import Thermal
         Thermal.set_thermal_algorithm_status(False)
 
     @classmethod
-    def _add_private_thermal_policy(cls):
-        dynamic_min_speed_policy = ThermalPolicy()
-        dynamic_min_speed_policy.conditions[MinCoolingLevelChangeCondition] = MinCoolingLevelChangeCondition()
-        dynamic_min_speed_policy.actions[ChangeMinCoolingLevelAction] = ChangeMinCoolingLevelAction()
-        cls._policy_dict['DynamicMinCoolingLevelPolicy'] = dynamic_min_speed_policy
-
-        update_psu_fan_speed_policy = ThermalPolicy()
-        update_psu_fan_speed_policy.conditions[CoolingLevelChangeCondition] = CoolingLevelChangeCondition()
-        update_psu_fan_speed_policy.actions[UpdatePsuFanSpeedAction] = UpdatePsuFanSpeedAction()
-        cls._policy_dict['UpdatePsuFanSpeedPolicy'] = update_psu_fan_speed_policy
-
-        update_cooling_level_policy = ThermalPolicy()
-        update_cooling_level_policy.conditions[UpdateCoolingLevelToMinCondition] = UpdateCoolingLevelToMinCondition()
-        update_cooling_level_policy.actions[UpdateCoolingLevelToMinAction] = UpdateCoolingLevelToMinAction()
-        cls._policy_dict['UpdateCoolingLevelPolicy'] = update_cooling_level_policy
+    def run_policy(cls, chassis):
+        if not cls._policy_dict:
+            return
+
+        try:
+            cls._collect_thermal_information(chassis)
+        except Exception as e:
+            logger.log_error('Failed to collect thermal information {}'.format(repr(e)))
+            Thermal.set_expect_cooling_level(MAX_COOLING_LEVEL)
+            Thermal.commit_cooling_level(cls._thermal_info_dict)
+            return
+
+        for policy in cls._policy_dict.values():
+            if not cls._running:
+                return
+            try:
+                if policy.is_match(cls._thermal_info_dict):
+                    policy.do_action(cls._thermal_info_dict)
+            except Exception as e:
+                logger.log_error('Failed to run thermal policy {} - {}'.format(policy.name, repr(e)))
+                # In case there is an exception, we put cooling level to max value
+                Thermal.set_expect_cooling_level(MAX_COOLING_LEVEL)
+
+        Thermal.commit_cooling_level(cls._thermal_info_dict)
+
diff --git a/platform/mellanox/mlnx-platform-api/tests/policy_with_same_conditions.json b/platform/mellanox/mlnx-platform-api/tests/policy_with_same_conditions.json
index ace291be1c55..9efe773a9b07 100644
--- a/platform/mellanox/mlnx-platform-api/tests/policy_with_same_conditions.json
+++ b/platform/mellanox/mlnx-platform-api/tests/policy_with_same_conditions.json
@@ -27,8 +27,7 @@
             ],
             "actions": [
                 {
-                    "type": "thermal_control.control",
-                    "status": "false"
+                    "type": "thermal.recover"
                 },
                 {
                     "type": "fan.all.set_speed",
@@ -45,8 +44,7 @@
             ],
             "actions": [
                 {
-                    "type": "thermal_control.control",
-                    "status": "false"
+                    "type": "thermal.recover"
                 },
                 {
                     "type": "fan.all.set_speed",
@@ -66,8 +64,7 @@
             ],
             "actions": [
                 {
-                    "type": "thermal_control.control",
-                    "status": "true"
+                    "type": "thermal.recover"
                 }
             ]
         }
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
index ed656ddd5102..1f7972497477 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
@@ -2,7 +2,7 @@
 import sys
 import pytest
 import json
-from mock import MagicMock
+from mock import MagicMock, patch
 from .mock_platform import MockChassis, MockFan, MockFanDrawer, MockPsu
 
 test_path = os.path.dirname(os.path.abspath(__file__))
@@ -11,11 +11,7 @@
 
 from sonic_platform.thermal_manager import ThermalManager
 from sonic_platform.thermal_infos import FanInfo, PsuInfo
-from sonic_platform.fan import Fan
-from sonic_platform.thermal import Thermal
-
-Thermal.check_thermal_zone_temperature = MagicMock()
-Thermal.set_thermal_algorithm_status = MagicMock()
+from sonic_platform.thermal import Thermal, MAX_COOLING_LEVEL
 
 
 @pytest.fixture(scope='session', autouse=True)
@@ -86,51 +82,58 @@ def test_psu_info():
     assert not psu_info.is_status_changed()
 
 
-def test_fan_policy(thermal_manager):
+@patch('sonic_platform.thermal.Thermal.monitor_asic_themal_zone', MagicMock())
+@patch('sonic_platform.thermal.Thermal.get_min_allowed_cooling_level_by_thermal_zone', MagicMock(return_value=2))
+@patch('sonic_platform.thermal.Thermal.get_cooling_level', MagicMock(return_value=6))
+@patch('sonic_platform.thermal.Thermal.set_cooling_state')
+@patch('sonic_platform.thermal.Thermal.set_cooling_level')
+def test_fan_policy(mock_set_cooling_level, mock_set_cooling_state, thermal_manager):
     chassis = MockChassis()
     chassis.make_fan_absence()
     chassis.get_all_fan_drawers()[0].get_all_fans().append(MockFan())
+    chassis.platform_name = 'some_platform'
+
     thermal_manager.run_policy(chassis)
+    mock_set_cooling_level.assert_called_with(MAX_COOLING_LEVEL)
+    mock_set_cooling_state.assert_called_with(MAX_COOLING_LEVEL)
 
+    Thermal.expect_cooling_level = None
     fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
-    assert fan_list[1].speed == 100
-    Thermal.set_thermal_algorithm_status.assert_called_with(False, False)
-
     fan_list[0].presence = True
-    Thermal.check_thermal_zone_temperature = MagicMock(return_value=True)
     thermal_manager.run_policy(chassis)
-    Thermal.set_thermal_algorithm_status.assert_called_with(True, False)
-    assert Thermal.check_thermal_zone_temperature.call_count == 2
-    assert fan_list[0].speed == 60
-    assert fan_list[1].speed == 60
+    mock_set_cooling_level.assert_called_with(6)
+    mock_set_cooling_state.assert_called_with(6)
 
+    Thermal.expect_cooling_level = None
     fan_list[0].status = False
     thermal_manager.run_policy(chassis)
-    Thermal.set_thermal_algorithm_status.assert_called_with(False, False)
+    mock_set_cooling_level.assert_called_with(MAX_COOLING_LEVEL)
 
+    Thermal.expect_cooling_level = None
     fan_list[0].status = True
-    Thermal.check_thermal_zone_temperature = MagicMock(return_value=False)
     thermal_manager.run_policy(chassis)
-    Thermal.set_thermal_algorithm_status.assert_called_with(True, False)
-    assert Thermal.check_thermal_zone_temperature.call_count == 2
-    assert fan_list[0].speed == 100
-    assert fan_list[1].speed == 100
+    mock_set_cooling_level.assert_called_with(6)
+    mock_set_cooling_state.assert_called_with(6)
 
 
-def test_psu_policy(thermal_manager):
+@patch('sonic_platform.thermal.Thermal.monitor_asic_themal_zone', MagicMock())
+@patch('sonic_platform.thermal.Thermal.get_min_allowed_cooling_level_by_thermal_zone', MagicMock(return_value=2))
+@patch('sonic_platform.thermal.Thermal.get_cooling_level', MagicMock(return_value=6))
+@patch('sonic_platform.thermal.Thermal.set_cooling_state')
+@patch('sonic_platform.thermal.Thermal.set_cooling_level')
+def test_psu_policy(mock_set_cooling_level, mock_set_cooling_state, thermal_manager):
     chassis = MockChassis()
     chassis.make_psu_absence()
-    chassis.fan_list.append(MockFan())
+    chassis.platform_name = 'some_platform'
     thermal_manager.run_policy(chassis)
-
-    fan_list = chassis.get_all_fans()
-    assert fan_list[0].speed == 100
-    Thermal.set_thermal_algorithm_status.assert_called_with(False, False)
+    mock_set_cooling_level.assert_called_with(MAX_COOLING_LEVEL)
+    mock_set_cooling_state.assert_called_with(MAX_COOLING_LEVEL)
 
     psu_list = chassis.get_all_psus()
     psu_list[0].presence = True
     thermal_manager.run_policy(chassis)
-    Thermal.set_thermal_algorithm_status.assert_called_with(True, False)
+    mock_set_cooling_level.assert_called_with(6)
+    mock_set_cooling_state.assert_called_with(6)
 
 
 def test_any_fan_absence_condition():
@@ -301,6 +304,7 @@ def test_load_set_fan_speed_action():
         action.load_from_json(json_obj)
 
 
+@patch('sonic_platform.thermal.Thermal.set_cooling_level', MagicMock())
 def test_execute_set_fan_speed_action():
     chassis = MockChassis()
     chassis.get_all_fan_drawers().append(MockFanDrawer())
@@ -310,84 +314,13 @@ def test_execute_set_fan_speed_action():
     fan_info = FanInfo()
     fan_info.collect(chassis)
 
+    Thermal.expect_cooling_level = None
     from sonic_platform.thermal_actions import SetAllFanSpeedAction
     action = SetAllFanSpeedAction()
-    action.speed = 99
-    action.execute({'fan_info': fan_info})
-    assert fan_list[0].speed == 99
-    assert fan_list[1].speed == 99
-
-
-def test_load_control_thermal_algo_action():
-    from sonic_platform.thermal_actions import ControlThermalAlgoAction
-    action = ControlThermalAlgoAction()
-    json_str = '{\"status\": \"false\"}'
-    json_obj = json.loads(json_str)
-    action.load_from_json(json_obj)
-    assert not action.status
-
-    json_str = '{\"status\": \"true\"}'
-    json_obj = json.loads(json_str)
-    action.load_from_json(json_obj)
-    assert action.status
-
-    json_str = '{\"status\": \"invalid\"}'
-    json_obj = json.loads(json_str)
-    with pytest.raises(ValueError):
-        action.load_from_json(json_obj)
-
-    json_str = '{\"invalid\": \"true\"}'
-    json_obj = json.loads(json_str)
-    with pytest.raises(ValueError):
-        action.load_from_json(json_obj)
-
-def test_load_check_and_set_speed_action():
-    from sonic_platform.thermal_actions import CheckAndSetAllFanSpeedAction
-    action = CheckAndSetAllFanSpeedAction()
-    json_str = '{\"speed\": \"40\"}'
-    json_obj = json.loads(json_str)
-    action.load_from_json(json_obj)
-    assert action.speed == 40
-
-    json_str = '{\"speed\": \"-1\"}'
-    json_obj = json.loads(json_str)
-    with pytest.raises(ValueError):
-        action.load_from_json(json_obj)
-
-    json_str = '{\"speed\": \"101\"}'
-    json_obj = json.loads(json_str)
-    with pytest.raises(ValueError):
-        action.load_from_json(json_obj)
-
-    json_str = '{\"invalid\": \"60\"}'
-    json_obj = json.loads(json_str)
-    with pytest.raises(ValueError):
-        action.load_from_json(json_obj)
-
-def test_execute_check_and_set_fan_speed_action():
-    chassis = MockChassis()
-    chassis.get_all_fan_drawers().append(MockFanDrawer())
-    fan_list = chassis.get_all_fan_drawers()[0].get_all_fans()
-    fan_list.append(MockFan())
-    fan_list.append(MockFan())
-    fan_info = FanInfo()
-    fan_info.collect(chassis)
-    Thermal.check_thermal_zone_temperature = MagicMock(return_value=True)
-
-    from sonic_platform.thermal_actions import CheckAndSetAllFanSpeedAction
-    action = CheckAndSetAllFanSpeedAction()
-    action.speed = 99
+    action.speed = 20
     action.execute({'fan_info': fan_info})
-    assert fan_list[0].speed == 99
-    assert fan_list[1].speed == 99
+    assert Thermal.expect_cooling_level == 2
 
-    Thermal.check_thermal_zone_temperature = MagicMock(return_value=False)
-    fan_list[0].speed = 100
-    fan_list[1].speed = 100
-    action.speed = 60
-    action.execute({'fan_info': fan_info})
-    assert fan_list[0].speed == 100
-    assert fan_list[1].speed == 100
 
 def test_load_duplicate_condition():
     from sonic_platform_base.sonic_thermal_control.thermal_policy import ThermalPolicy
@@ -470,48 +403,63 @@ def check_minimum_table_data(platform, minimum_table):
                 assert cooling_level > previous_cooling_level
             previous_cooling_level = cooling_level
 
-def test_dynamic_minimum_policy(thermal_manager):
-    from sonic_platform.thermal_conditions import MinCoolingLevelChangeCondition
-    from sonic_platform.thermal_actions import ChangeMinCoolingLevelAction
-    from sonic_platform.thermal_infos import ChassisInfo
-    from sonic_platform.thermal import Thermal
-    from sonic_platform.fan import Fan
-    ThermalManager.initialize()
-    assert 'DynamicMinCoolingLevelPolicy' in thermal_manager._policy_dict
-    policy = thermal_manager._policy_dict['DynamicMinCoolingLevelPolicy']
-    assert MinCoolingLevelChangeCondition in policy.conditions
-    assert ChangeMinCoolingLevelAction in policy.actions
-
-    condition = policy.conditions[MinCoolingLevelChangeCondition]
-    action = policy.actions[ChangeMinCoolingLevelAction]
-    Thermal.check_module_temperature_trustable = MagicMock(return_value='trust')
-    Thermal.get_min_amb_temperature = MagicMock(return_value=35001)
-    assert condition.is_match(None)
-    assert MinCoolingLevelChangeCondition.trust_state == 'trust'
-    assert MinCoolingLevelChangeCondition.temperature == 35
-    assert not condition.is_match(None)
-
-    Thermal.check_module_temperature_trustable = MagicMock(return_value='untrust')
-    assert condition.is_match(None)
-    assert MinCoolingLevelChangeCondition.trust_state == 'untrust'
-
-    Thermal.get_min_amb_temperature = MagicMock(return_value=25999)
-    assert condition.is_match(None)
-    assert MinCoolingLevelChangeCondition.temperature == 25
 
+@patch('sonic_platform.thermal.Thermal.monitor_asic_themal_zone', MagicMock())
+@patch('sonic_platform.thermal.Thermal.get_min_allowed_cooling_level_by_thermal_zone')
+@patch('sonic_platform.thermal.Thermal.get_min_amb_temperature')
+@patch('sonic_platform.thermal.Thermal.check_module_temperature_trustable')
+def test_thermal_recover_policy(mock_check_trustable, mock_get_min_amb, moc_get_min_allowed):
+    from sonic_platform.thermal_infos import ChassisInfo
+    from sonic_platform.thermal_actions import ThermalRecoverAction
     chassis = MockChassis()
     chassis.platform_name = 'invalid'
     info = ChassisInfo()
     info._chassis = chassis
     thermal_info_dict = {ChassisInfo.INFO_NAME: info}
-    Fan.get_cooling_level = MagicMock(return_value=5)
-    Fan.set_cooling_level = MagicMock()
+
+    Thermal.expect_cooling_level = None
+    action = ThermalRecoverAction()
+    moc_get_min_allowed.return_value = 2
     action.execute(thermal_info_dict)
-    assert Fan.min_cooling_level == 6
-    Fan.set_cooling_level.assert_called_with(6, 6)
-    Fan.set_cooling_level.call_count = 0
+    assert Thermal.expect_cooling_level == 6
+    Thermal.last_set_cooling_level = Thermal.expect_cooling_level
 
+    Thermal.expect_cooling_level = None
     chassis.platform_name = 'x86_64-mlnx_msn2700-r0'
+    mock_check_trustable.return_value = 'trust'
+    mock_get_min_amb.return_value = 29999
+    moc_get_min_allowed.return_value = None
+    action.execute(thermal_info_dict)
+    assert Thermal.expect_cooling_level is None
+
+    moc_get_min_allowed.return_value = 4
     action.execute(thermal_info_dict)
-    assert Fan.min_cooling_level == 3
-    Fan.set_cooling_level.assert_called_with(3, 5)
+    assert Thermal.expect_cooling_level == 4
+    Thermal.last_set_cooling_level = Thermal.expect_cooling_level
+
+    mock_check_trustable.return_value = 'untrust'
+    mock_get_min_amb.return_value = 31001
+    action.execute(thermal_info_dict)
+    assert Thermal.expect_cooling_level == 5
+
+
+@patch('sonic_platform.utils.read_int_from_file')
+def test_monitor_asic_themal_zone(mock_read_int):
+    mock_read_int.side_effect = [111000, 105000]
+    Thermal.monitor_asic_themal_zone()
+    assert Thermal.expect_cooling_state == MAX_COOLING_LEVEL
+    mock_read_int.reset()
+    mock_read_int.side_effect = [104000, 105000]
+    Thermal.monitor_asic_themal_zone()
+    assert Thermal.expect_cooling_state is None
+
+
+def test_set_expect_cooling_level():
+    Thermal.set_expect_cooling_level(5)
+    assert Thermal.expect_cooling_level == 5
+
+    Thermal.set_expect_cooling_level(3)
+    assert Thermal.expect_cooling_level == 5
+
+    Thermal.set_expect_cooling_level(10)
+    assert Thermal.expect_cooling_level == 10
diff --git a/platform/mellanox/mlnx-platform-api/tests/thermal_policy.json b/platform/mellanox/mlnx-platform-api/tests/thermal_policy.json
index 413211b21220..4a0dd28a2d15 100644
--- a/platform/mellanox/mlnx-platform-api/tests/thermal_policy.json
+++ b/platform/mellanox/mlnx-platform-api/tests/thermal_policy.json
@@ -23,10 +23,6 @@
                 }
             ],
             "actions": [
-                {
-                    "type": "thermal_control.control",
-                    "status": "false"
-                },
                 {
                     "type": "fan.all.set_speed",
                     "speed": "100"
@@ -41,10 +37,6 @@
                 }
             ],
             "actions": [
-                {
-                    "type": "thermal_control.control",
-                    "status": "false"
-                },
                 {
                     "type": "fan.all.set_speed",
                     "speed": "100"
@@ -59,10 +51,6 @@
                 }
             ],
             "actions": [
-                {
-                    "type": "thermal_control.control",
-                    "status": "false"
-                },
                 {
                     "type": "fan.all.set_speed",
                     "speed": "100"
@@ -84,12 +72,7 @@
             ],
             "actions": [
                 {
-                    "type": "thermal_control.control",
-                    "status": "true"
-                },
-                {
-                    "type": "fan.all.check_and_set_speed",
-                    "speed": "60"
+                    "type": "thermal.recover"
                 }
             ]
         }

From 8dc1ce4919e290ba18e0b5020ba90adb47c400f0 Mon Sep 17 00:00:00 2001
From: Devesh Pathak <54966909+devpatha@users.noreply.github.com>
Date: Wed, 19 Jan 2022 11:16:35 -0800
Subject: [PATCH 0976/1674] [202012][sonic-swss] Updated submodule for
 sonic-swss (#9790)

includes:

320591a [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2114)
5027a8f Handling Invalid CRM configuration gracefully (#2109)
0b120fa [ci]: use native arm64 and armhf pool (#2013)
394e88a Don't handle buffer pool watermark during warm reboot reconciling (#1987)
9008a01 patch for issue #1971 - enable Rx Drop handling for cisco-8000 (#2041)
2723ee3 create debug_shell_enable config to enable debug shell (#2060)
d7be0b9 [request parser] Add unit tests for request parser for multiple values (#1766)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index fbbe5bccee70..320591a05e19 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit fbbe5bccee7038e670ee0fd9f6ae7d9d82de80f0
+Subproject commit 320591a05e19a70c64c6c8f9b126291deb977af3

From 2eb8fe3a2ce4f5289fb044520c991f8c73d251b7 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 19 Jan 2022 14:46:23 -0800
Subject: [PATCH 0977/1674] [ci/build]: Upgrade SONiC package versions (#9799)

---
 .../build-sonic-slave-buster/versions-deb-buster      |  6 +++---
 .../build/build-sonic-slave-buster/versions-git       |  4 ++--
 .../build/build-sonic-slave-buster/versions-web       |  4 ++--
 .../build/build-sonic-slave-stretch/versions-web      |  4 ++--
 files/build/versions/default/versions-git             |  6 +++---
 files/build/versions/default/versions-web             |  8 +++-----
 .../dockers/docker-base-stretch/versions-deb-stretch  |  6 +++---
 .../dockers/docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-py3-all-armhf                            |  1 +
 .../versions/dockers/docker-ptf/versions-deb-stretch  |  8 ++++----
 files/build/versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3  | 11 +++++------
 .../versions/dockers/docker-sonic-vs/versions-py2     |  2 +-
 .../versions/dockers/docker-sonic-vs/versions-py3     |  2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../dockers/docker-syncd-nephos/versions-deb-stretch  |  4 ++--
 .../sonic-slave-buster/versions-deb-buster-arm64      |  6 +++++-
 .../sonic-slave-buster/versions-deb-buster-armhf      |  6 +++++-
 .../dockers/sonic-slave-buster/versions-py3-all-arm64 |  2 ++
 .../dockers/sonic-slave-buster/versions-py3-all-armhf |  1 +
 .../dockers/sonic-slave-stretch/versions-deb-stretch  |  8 ++++----
 .../sonic-slave-stretch/versions-deb-stretch-arm64    |  6 +++++-
 .../sonic-slave-stretch/versions-deb-stretch-armhf    |  6 +++++-
 .../sonic-slave-stretch/versions-py3-all-arm64        |  1 +
 .../sonic-slave-stretch/versions-py3-all-armhf        |  1 +
 files/build/versions/host-image/versions-deb-buster   |  6 +++---
 files/build/versions/host-image/versions-py3          |  4 ++--
 .../build/versions/host-image/versions-py3-all-arm64  |  1 -
 .../build/versions/host-image/versions-py3-all-armhf  |  3 ++-
 30 files changed, 72 insertions(+), 53 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
 delete mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 393434b66e07..6c66d45aae05 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -5,7 +5,7 @@ innovium-sai==0.107.2
 innovium-sai-headers==0.107.2
 iproute2-dev==1.mlnx.4.4.3360
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.17.0-106
+kernel-mft-dkms==4.17.2-12
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.1-9
+libsaibcm==4.3.5.2
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -42,7 +42,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.17.0-106
+mft==4.17.2-12
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index aca0eca7d2b5..ff5e664f7207 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
+https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
+https://salsa.debian.org/kernel-team/ethtool/==f0aad46ed404d1434af4143c9f1f96ff0a5075fc
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index b84b1fbdbf98..66f6b20c92f9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 1369ade80ac2..8041ff967498 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A32%3A45Z&se=2030-12-08T19%3A32%3A00Z&sr=b&sp=r&sig=sg2j65hKv%2BJsF%2BjATRlSxW415lT6Fa1cSaOlLIfZ7TM%3D==76bb2c1412a92ba66540e6bc2de7d653
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.1-9_amd64.deb?sv=2020-08-04&st=2021-12-07T19%3A29%3A13Z&se=2030-12-08T19%3A29%3A00Z&sr=b&sp=r&sig=0smiVHMjaLsVkr07u%2BpK9xcPFljhGKlnS92L2FGV0sc%3D==dd66f12c1a802fad58b625682456771e
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 1b6cad1776b7..0b4b04b79a47 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9552069c06705e149b156bcc70b84c1636f22f5e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cb340f5b7bbdcaba0fad346b08db91538619a531
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -8,12 +8,12 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==c143452072f2eb46edf966a96b147a646a169038
+https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0
+https://salsa.debian.org/kernel-team/ethtool/==f0aad46ed404d1434af4143c9f1f96ff0a5075fc
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index dbe415cf8d7f..5d5e8b026b60 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -14,12 +14,12 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.17.0-106-x86_64-deb.tgz==b3601376b785cdef9a8751e530619d88
+http://www.mellanox.com/downloads/MFT/mft-4.17.2-12-x86_64-deb.tgz==2b858b5da082f8aefacdd7124f4f40a3
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==f6a0242dc009287fbabd2108726a4519
+https://deb.nodesource.com/node_14.x/dists/buster/Release==c0df45490b6c88e9f60be42362950b6d
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 6343b870f3cc..fe251fb373e8 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -66,6 +66,6 @@ readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.0.0197-4+deb9u3
-vim-tiny==2:8.0.0197-4+deb9u3
-xxd==2:8.0.0197-4+deb9u3
\ No newline at end of file
+vim-common==2:8.0.0197-4+deb9u4
+vim-tiny==2:8.0.0197-4+deb9u4
+xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index b629fb4fd467..107c878519c8 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.11.10
+regex==2022.1.18
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..31ce74f53983
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index d5ac4633be9f..2f23f5dd5817 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -229,12 +229,12 @@ tmux==2.3-4
 traceroute==1:2.1.0-2
 ucf==3.0036
 unzip==6.0-21+deb9u2
-vim==2:8.0.0197-4+deb9u3
-vim-common==2:8.0.0197-4+deb9u3
-vim-runtime==2:8.0.0197-4+deb9u3
+vim==2:8.0.0197-4+deb9u4
+vim-common==2:8.0.0197-4+deb9u4
+vim-runtime==2:8.0.0197-4+deb9u4
 wget==1.18-5+deb9u3
 xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
-xxd==2:8.0.0197-4+deb9u3
+xxd==2:8.0.0197-4+deb9u4
 xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index deabed87ffb5..70c318d09db3 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.9.1
+paramiko==2.9.2
 pathlib2==2.3.6
 pbr==2.0.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index de0fab4cca58..4dd20c60c164 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,16 +8,15 @@ flask==2.0.2
 grpcio==1.43.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.10.0
-importlib-resources==5.4.0
+importlib-metadata==4.10.1
 inflection==0.5.1
 isodate==0.6.1
 itsdangerous==2.0.1
-jsonschema==4.3.3
+jsonschema==3.2.0
 openapi-schema-validator==0.1.6
-openapi-spec-validator==0.3.1
-protobuf==3.19.1
-pyrsistent==0.18.0
+openapi-spec-validator==0.3.2
+protobuf==3.19.3
+pyrsistent==0.16.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 7d90a77d7bf1..541881858917 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.7
\ No newline at end of file
+urllib3==1.26.8
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 7ebfe4c0763f..8d618b0dfbd4 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.27.1
 scapy==2.4.4
 tabulate==0.8.9
-urllib3==1.26.7
+urllib3==1.26.8
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 0ff63a6d1d34..d37275d3f9ba 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.1-9
+libsaibcm==4.3.5.2
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 1eb9696b4798..341a136120af 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -33,7 +33,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.208-1
-mft==4.17.0-106
+mft==4.17.2-12
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 033494627d1d..e60d61388961 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -25,5 +25,5 @@ sshpass==1.06-1
 strace==4.15-2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.0.0197-4+deb9u3
-vim-runtime==2:8.0.0197-4+deb9u3
\ No newline at end of file
+vim==2:8.0.0197-4+deb9u4
+vim-runtime==2:8.0.0197-4+deb9u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 2f0da169ee15..c7fd346b45e9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,9 +1,13 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+ghostscript==9.27~dfsg-2+deb10u5
 libdjvulibre-text==3.5.27.1-10+deb10u1
 libdjvulibre21==3.5.27.1-10+deb10u1
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
+libgs9==9.27~dfsg-2+deb10u5
+libgs9-common==9.27~dfsg-2+deb10u5
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.18.2-deb-1nodesource1
\ No newline at end of file
+nodejs==14.18.3-deb-1nodesource1
+python-lxml==4.3.2-1+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 69eb102c5cee..324548588c98 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,4 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+ghostscript==9.27~dfsg-2+deb10u5
 libalgorithm-c3-perl==0.10-1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
@@ -22,6 +23,8 @@ libemail-date-format-perl==1.005-1
 libeval-closure-perl==0.14-1
 libexception-class-perl==1.44-1
 libgles2-mesa-dev==18.3.6-2+deb10u1
+libgs9==9.27~dfsg-2+deb10u5
+libgs9-common==9.27~dfsg-2+deb10u5
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
 liblog-dispatch-perl==2.68-1
@@ -116,8 +119,9 @@ linux-compiler-gcc-8-arm==4.19.208-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.18.2-deb-1nodesource1
+nodejs==14.18.3-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
+python-lxml==4.3.2-1+deb10u4
 rdfind==1.4.1-1
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..147c199f8803
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1,2 @@
+bitarray==2.3.5
+regex==2022.1.18
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..ed43b36cd02d
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 6f314e77de3d..f83b36840270 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -129,7 +129,7 @@ gem2deb-test-runner==0.33.1
 geoip-database==20170512-1
 gettext==0.19.8.1-2+deb9u1
 gettext-base==0.19.8.1-2+deb9u1
-ghostscript==9.26a~dfsg-0+deb9u7
+ghostscript==9.26a~dfsg-0+deb9u8
 gir1.2-glib-2.0==1.50.0-1+b1
 gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
 git==1:2.11.0-3+deb9u7
@@ -507,8 +507,8 @@ libgoogle-perftools4==2.5-2.2
 libgpgme11==1.8.0-3+b2
 libgpm2==1.20.4-6.2+b1
 libgraphite2-3==1.3.10-1
-libgs9==9.26a~dfsg-0+deb9u7
-libgs9-common==9.26a~dfsg-0+deb9u7
+libgs9==9.26a~dfsg-0+deb9u8
+libgs9-common==9.26a~dfsg-0+deb9u8
 libgsasl7==1.8.0-8+b2
 libgssapi-krb5-2==1.15-1+deb9u3
 libgstreamer1.0-0==1.10.4-1
@@ -867,7 +867,7 @@ libqt5opengl5-dev==5.7.1+dfsg-3+deb9u3
 libqt5printsupport5==5.7.1+dfsg-3+deb9u3
 libqt5sql5==5.7.1+dfsg-3+deb9u3
 libqt5sql5-sqlite==5.7.1+dfsg-3+deb9u3
-libqt5svg5==5.7.1~20161021-2.1
+libqt5svg5==5.7.1~20161021-2.1+deb9u1
 libqt5test5==5.7.1+dfsg-3+deb9u3
 libqt5widgets5==5.7.1+dfsg-3+deb9u3
 libqt5xml5==5.7.1+dfsg-3+deb9u3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 99864cdeea55..2c59f5bd282d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -9,4 +9,8 @@ libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
 libzzip-0-13==0.13.62-3.2~deb9u2
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+vim==2:8.0.0197-4+deb9u4
+vim-common==2:8.0.0197-4+deb9u4
+vim-runtime==2:8.0.0197-4+deb9u4
+xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 49b796f3bdf0..4d6a55e9808a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -15,4 +15,8 @@ libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 libzzip-0-13==0.13.62-3.2~deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+vim==2:8.0.0197-4+deb9u4
+vim-common==2:8.0.0197-4+deb9u4
+vim-runtime==2:8.0.0197-4+deb9u4
+xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
new file mode 100644
index 000000000000..ed43b36cd02d
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
@@ -0,0 +1 @@
+bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
new file mode 100644
index 000000000000..ed43b36cd02d
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
@@ -0,0 +1 @@
+bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index d8f0ac5ce096..561bef6f19ca 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -60,7 +60,7 @@ iputils-ping==3:20180629-2+deb10u2
 isc-dhcp-client==4.4.1-2+deb10u1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.17.0
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.17.2
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
@@ -184,8 +184,8 @@ lsb-base==10.2019051400
 lsb-release==10.2019051400
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.17.0-106
-mft-oem==4.17.0-106
+mft==4.17.2-12
+mft-oem==4.17.2-12
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c68c16d48a46..92e85c005ccf 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -31,13 +31,13 @@ pycparser==2.21
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.11.10
+regex==2022.1.18
 requests==2.27.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
 thrift==0.13.0
-urllib3==1.26.7
+urllib3==1.26.8
 watchdog==0.10.3
 websocket-client==1.2.3
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
deleted file mode 100644
index dcf488fe2aaa..000000000000
--- a/files/build/versions/host-image/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-urllib3==1.26.8
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 431dc5a43838..23de5e0bad9a 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1 +1,2 @@
-cryptography==3.3.1
\ No newline at end of file
+cryptography==3.3.1
+regex==2021.11.10
\ No newline at end of file

From 090ef33ca2acab1b3075a19c2468dd21815e9117 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:28:34 -0800
Subject: [PATCH 0978/1674] [202012]BRCM SAI 4.3.5.3 Fixes
 CS00012218100,CS00012215529,CS00012208995,CS00012220761,CS00012211718,CS00012208995,CS00012220761,
 and CS00012225760 (#9815)

---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 5d5e8b026b60..77394436b996 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 967e488daed3..be10db78f92c 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 8cc5ed062fca2b6f8b730583559a88871f7a4413 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Fri, 21 Jan 2022 09:10:31 +0800
Subject: [PATCH 0979/1674] [submodule][202012] Update submodule for
 sonic-linux-kernel (#9810)

ab7a6ed [patch] Cisco Kernel Patches to support 4.19.x kernel

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 816de4f551d3..ab7a6ed4fc6f 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 816de4f551d39d595910e265144b7140f552c628
+Subproject commit ab7a6ed4fc6fed14a5e39d8768991fd3a9a776e9

From b450cd157b0ee6bcf26d52b396b47ed2584f0b0c Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 20 Jan 2022 17:46:14 -0800
Subject: [PATCH 0980/1674] [sonic-linkmgrd][202012] submodule update #9807

[sonic-linkmgrd][master] submodule update

Commits added:
0c23756 Jing Zhang      2022-01-19      Linkmgrd subscribing State DB route event  (#13)
12b9951 Longxiang Lyu   2021-12-13      Add TLV support to ICMP payload (#11)
3eedda3 Longxiang Lyu   2022-01-06      Add missing intermediate states (#16)
8da4982 Ying Xie        2022-01-04      [linkmgrd] update README, set coding style guidance (#15)
a897cf8 Longxiang Lyu   2021-12-13      Improve PR template (#16)
6fec701 Jing Zhang      2021-12-06      Add pull request template for linkmgrd repo (#9)


signed-off-by: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 6c6151ba9512..0c23756cd618 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 6c6151ba9512166de0430e8e95076809dd706496
+Subproject commit 0c23756cd618473064381618ef82687f98b7e31f

From c715bdbf56e7719d359960b09025c7a5ebfdf921 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Thu, 20 Jan 2022 21:27:10 -0500
Subject: [PATCH 0981/1674] [firsttime boot] suppress error message on
 platforms not supporting kdump (#9521)

Why I did it
Eliminate benign firsttime boot error reported when running on platforms that do not support kdump.

How I did it
Change rc.local to check for presence of the file /etc/default/kdump-tools before referencing it.

How to verify it
Install a new image on an armhf or arm64 platform and check for a failed reference to /etc/default/kdump-tools on firsttime boot.
---
 files/image_config/platform/rc.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index 9710bfcbf8db..4d0e072a8a4f 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -382,7 +382,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
     ebtables_config
 
     # Kdump tools configuration
-    sed -i -e "s/__PLATFORM__/$platform/g" /etc/default/kdump-tools
+    [ -f /etc/default/kdump-tools ] && sed -i -e "s/__PLATFORM__/$platform/g" /etc/default/kdump-tools
 
     firsttime_exit
 fi

From b2d1dfb94409729cfd075dce5037b840e8af3ddc Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 21 Jan 2022 09:47:14 -0800
Subject: [PATCH 0982/1674] [202012][Arista] Backport logrotate configuration
 (#9518)

- Backport logrotate configuration for `arista*.log` files
---
 platform/barefoot/sonic-platform-modules-arista | 2 +-
 platform/broadcom/sonic-platform-modules-arista | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 361707e1aed6..a682da369cbb 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 361707e1aed64d3d6dac34c37ae6ea71ac519637
+Subproject commit a682da369cbbab66dd477ca573dfe12f52c74c9c
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 361707e1aed6..a682da369cbb 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 361707e1aed64d3d6dac34c37ae6ea71ac519637
+Subproject commit a682da369cbbab66dd477ca573dfe12f52c74c9c

From c30f667497ea4df2ac6a69a3b24315710d02d529 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Fri, 21 Jan 2022 10:00:26 -0800
Subject: [PATCH 0983/1674] Update sairedis submodule (#9819)

Commits:

02dea43 [202012] Add support for BFD notification (#990)
337fd97 Change sonic-buildimage.vs artifact source from CI build to official build. (#992)
490f442 Support for cisco-8000 platform for sonic-sairedis/syncd (#823)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 1027eef3a331..02dea4345666 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 1027eef3a331e84560827c7584ee8009baf434d5
+Subproject commit 02dea4345666923d5351dc45d146262777e153ea

From ae7514b1bd8059656bd43b243e77d87a54da703c Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 22 Jan 2022 08:01:17 -0800
Subject: [PATCH 0984/1674] [ci/build]: Upgrade SONiC package versions (#9832)

---
 .../build-sonic-slave-buster/versions-deb-buster |  2 +-
 .../build/build-sonic-slave-buster/versions-git  |  2 +-
 .../build/build-sonic-slave-buster/versions-web  |  4 ++--
 .../build/build-sonic-slave-stretch/versions-web |  4 ++--
 files/build/versions/default/versions-git        |  4 ++--
 files/build/versions/default/versions-web        |  2 --
 .../versions-py3-all-armhf                       |  1 -
 .../docker-syncd-brcm/versions-deb-buster        |  2 +-
 .../sonic-slave-buster/versions-deb-buster       | 12 ++++++------
 .../sonic-slave-buster/versions-deb-buster-arm64 |  8 +-------
 .../sonic-slave-buster/versions-deb-buster-armhf |  6 ------
 .../dockers/sonic-slave-buster/versions-git      |  2 ++
 .../dockers/sonic-slave-buster/versions-py3      |  4 ++--
 .../sonic-slave-buster/versions-py3-all-arm64    |  2 --
 .../sonic-slave-buster/versions-py3-all-armhf    |  1 -
 .../sonic-slave-stretch/versions-deb-stretch     | 16 ++++++++--------
 .../versions-deb-stretch-arm64                   | 10 +---------
 .../versions-deb-stretch-armhf                   | 10 +---------
 .../dockers/sonic-slave-stretch/versions-git     |  2 ++
 .../dockers/sonic-slave-stretch/versions-py3     |  4 ++--
 .../sonic-slave-stretch/versions-py3-all-arm64   |  1 -
 .../sonic-slave-stretch/versions-py3-all-armhf   |  1 -
 .../versions/host-image/versions-py3-all-armhf   |  3 +--
 23 files changed, 35 insertions(+), 68 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 6c66d45aae05..fac4873b0d2b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.2
+libsaibcm==4.3.5.3
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index ff5e664f7207..6b29895ef55b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==f0aad46ed404d1434af4143c9f1f96ff0a5075fc
+https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 66f6b20c92f9..97933870d1ab 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 8041ff967498..9674bfcf0b66 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A04%3A13Z&se=2037-01-14T06%3A04%3A00Z&sr=b&sp=r&sig=Qam0Cl%2B%2BRr8qHiFj47rtDpsswpdhrlfiJwG9EjXTBV4%3D==eca9ce5eb6f1a7acc215f853cd28e519
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.2_amd64.deb?sv=2020-10-02&st=2022-01-13T06%3A01%3A24Z&se=2037-01-14T06%3A01%3A00Z&sr=b&sp=r&sig=w6pvHKumQcToTp4ooNU3rsZpYUSVaJN5CrpTEZK%2B3Ek%3D==d521c524545cdb69c668892fcdfe6b79
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 0b4b04b79a47..330a35111a89 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cb340f5b7bbdcaba0fad346b08db91538619a531
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8f1ca305854ce7fe7d9310dd3c166b68db369e1
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==f0aad46ed404d1434af4143c9f1f96ff0a5075fc
+https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 77394436b996..5d5e8b026b60 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
deleted file mode 100644
index 31ce74f53983..000000000000
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-regex==2021.11.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index d37275d3f9ba..d8a854e40010 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.2
+libsaibcm==4.3.5.3
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.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
index 79216bbfe441..d14ab78f4653 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -139,7 +139,7 @@ gettext==0.19.8.1-9
 gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
-ghostscript==9.27~dfsg-2+deb10u4
+ghostscript==9.27~dfsg-2+deb10u5
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -414,8 +414,8 @@ libdevmapper1.02.1==2:1.02.155-3
 libdigest-bubblebabble-perl==0.02-2
 libdigest-hmac-perl==1.03+dfsg-2
 libdistro-info-perl==0.21
-libdjvulibre-text==3.5.27.1-10
-libdjvulibre21==3.5.27.1-10
+libdjvulibre-text==3.5.27.1-10+deb10u1
+libdjvulibre21==3.5.27.1-10+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
 libdom4j-java==2.1.1-2
@@ -549,8 +549,8 @@ libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
-libgs9==9.27~dfsg-2+deb10u4
-libgs9-common==9.27~dfsg-2+deb10u4
+libgs9==9.27~dfsg-2+deb10u5
+libgs9-common==9.27~dfsg-2+deb10u5
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u3
 libgssrpc4==1.17-3+deb10u3
@@ -1462,7 +1462,7 @@ python-keyring==17.1.1-1
 python-keyrings.alt==3.1.1-1
 python-lazy-object-proxy==1.3.1-1+b1
 python-logilab-common==1.4.2-1
-python-lxml==4.3.2-1+deb10u3
+python-lxml==4.3.2-1+deb10u4
 python-markupsafe==1.1.0-1
 python-mccabe==0.6.1-2
 python-minimal==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index c7fd346b45e9..be02bc4f494d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,13 +1,7 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-ghostscript==9.27~dfsg-2+deb10u5
-libdjvulibre-text==3.5.27.1-10+deb10u1
-libdjvulibre21==3.5.27.1-10+deb10u1
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libgs9==9.27~dfsg-2+deb10u5
-libgs9-common==9.27~dfsg-2+deb10u5
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.18.3-deb-1nodesource1
-python-lxml==4.3.2-1+deb10u4
\ No newline at end of file
+nodejs==14.18.3-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 324548588c98..c65e50640443 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,5 +1,4 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-ghostscript==9.27~dfsg-2+deb10u5
 libalgorithm-c3-perl==0.10-1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
@@ -12,8 +11,6 @@ libdevel-caller-perl==2.06-2+b1
 libdevel-lexalias-perl==0.05-2+b1
 libdevel-stacktrace-perl==2.0300-1
 libdist-checkconflicts-perl==0.11-1
-libdjvulibre-text==3.5.27.1-10+deb10u1
-libdjvulibre21==3.5.27.1-10+deb10u1
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
@@ -23,8 +20,6 @@ libemail-date-format-perl==1.005-1
 libeval-closure-perl==0.14-1
 libexception-class-perl==1.44-1
 libgles2-mesa-dev==18.3.6-2+deb10u1
-libgs9==9.27~dfsg-2+deb10u5
-libgs9-common==9.27~dfsg-2+deb10u5
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
 liblog-dispatch-perl==2.68-1
@@ -121,7 +116,6 @@ llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
 nodejs==14.18.3-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
-python-lxml==4.3.2-1+deb10u4
 rdfind==1.4.1-1
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..ad9b609932f2
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8f1ca305854ce7fe7d9310dd3c166b68db369e1
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index bbfa50776eb4..f924faa8d3b9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.4
+bitarray==2.3.5
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.11.10
+regex==2022.1.18
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
deleted file mode 100644
index 147c199f8803..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1,2 +0,0 @@
-bitarray==2.3.5
-regex==2022.1.18
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
deleted file mode 100644
index ed43b36cd02d..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index f83b36840270..556fbb488798 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -760,9 +760,9 @@ libparse-debianchangelog-perl==1.2.0-12
 libpath-iterator-rule-perl==1.009-1
 libpath-tiny-perl==0.100-1
 libpathplan4==2.38.0-17+deb9u1
-libpcap-dev==1.8.1-3
-libpcap0.8==1.8.1-3
-libpcap0.8-dev==1.8.1-3
+libpcap-dev==1.8.1-3+deb9u1
+libpcap0.8==1.8.1-3+deb9u1
+libpcap0.8-dev==1.8.1-3+deb9u1
 libpci-dev==1:3.5.2-1
 libpci3==1:3.5.2-1
 libpciaccess0==0.13.4-1+b2
@@ -1125,7 +1125,7 @@ libyaml-libyaml-perl==0.63-2
 libyaml-tiny-perl==1.70-1
 libzmq3-dev==4.2.1-4+deb9u4
 libzmq5==4.2.1-4+deb9u4
-libzzip-0-13==0.13.62-3.2~deb9u1
+libzzip-0-13==0.13.62-3.2~deb9u2
 licensecheck==3.0.29-1
 lintian==2.5.50.4
 linux-compiler-gcc-6-x86==4.9.290-1
@@ -1448,9 +1448,9 @@ ucf==3.0036
 unattended-upgrades==0.93.1+nmu1
 unzip==6.0-21+deb9u2
 velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u3
-vim-common==2:8.0.0197-4+deb9u3
-vim-runtime==2:8.0.0197-4+deb9u3
+vim==2:8.0.0197-4+deb9u4
+vim-common==2:8.0.0197-4+deb9u4
+vim-runtime==2:8.0.0197-4+deb9u4
 wdiff==1.2.2-2
 wget==1.18-5+deb9u3
 x11-common==1:7.7+19
@@ -1478,7 +1478,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
 xterm==327-2+deb9u2
 xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u3
+xxd==2:8.0.0197-4+deb9u4
 xz-utils==5.2.2-1.2+b1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 2c59f5bd282d..00f894c2df08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,16 +1,8 @@
 docker-ce==18.06.3~ce~3-0~debian
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
-libpcap-dev==1.8.1-3+deb9u1
-libpcap0.8==1.8.1-3+deb9u1
-libpcap0.8-dev==1.8.1-3+deb9u1
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-libzzip-0-13==0.13.62-3.2~deb9u2
-nodejs==10.24.1-1nodesource1
-vim==2:8.0.0197-4+deb9u4
-vim-common==2:8.0.0197-4+deb9u4
-vim-runtime==2:8.0.0197-4+deb9u4
-xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 4d6a55e9808a..48c98dc20e6e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -6,17 +6,9 @@ libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
-libpcap-dev==1.8.1-3+deb9u1
-libpcap0.8==1.8.1-3+deb9u1
-libpcap0.8-dev==1.8.1-3+deb9u1
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
-libzzip-0-13==0.13.62-3.2~deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
-nodejs==10.24.1-1nodesource1
-vim==2:8.0.0197-4+deb9u4
-vim-common==2:8.0.0197-4+deb9u4
-vim-runtime==2:8.0.0197-4+deb9u4
-xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..53751630ec6a
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3dc0172a6b629edf575bf4851653ce6aa6635d8a
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index aed033feb2e3..7543896dce42 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.4
+bitarray==2.3.5
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.11.10
+regex==2022.1.18
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
deleted file mode 100644
index ed43b36cd02d..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
deleted file mode 100644
index ed43b36cd02d..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.5
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 23de5e0bad9a..431dc5a43838 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1,2 +1 @@
-cryptography==3.3.1
-regex==2021.11.10
\ No newline at end of file
+cryptography==3.3.1
\ No newline at end of file

From 3dae536de42c61ef5a547149c471d2fa9ae650f8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 23 Jan 2022 14:13:50 -0800
Subject: [PATCH 0985/1674] [ci/build]: Upgrade SONiC package versions (#9834)

---
 files/build/versions/default/versions-git                     | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster   | 4 ++--
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 330a35111a89..f21d5bb0737f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8f1ca305854ce7fe7d9310dd3c166b68db369e1
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index d14ab78f4653..59809793e4a7 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1475,7 +1475,7 @@ python-packaging==19.0-1
 python-parse==1.6.6-0.1
 python-pathlib2==2.3.3-1
 python-pbr==4.2.0-5
-python-pil==5.4.1-2+deb10u2
+python-pil==5.4.1-2+deb10u3
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
 python-pluggy==0.8.0-1
@@ -1558,7 +1558,7 @@ python3-nose2==0.8.0-1
 python3-olefile==0.46-1
 python3-packaging==19.0-1
 python3-pbr==4.2.0-5
-python3-pil==5.4.1-2+deb10u2
+python3-pil==5.4.1-2+deb10u3
 python3-pkg-resources==40.8.0-1
 python3-pluggy==0.8.0-1
 python3-py==1.7.0-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index ad9b609932f2..41f28165e6a8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8f1ca305854ce7fe7d9310dd3c166b68db369e1
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 53751630ec6a..41f28165e6a8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3dc0172a6b629edf575bf4851653ce6aa6635d8a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file

From 3bd032cb8e333b459543618c4c08cccb93265a04 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 24 Jan 2022 09:07:05 +0200
Subject: [PATCH 0986/1674] [202012] [submodule] Update sonic-sairedis (#9833)

Update submodule sonic-sairedis that contains the following commit:

Change the log severity leve from ERROR to NOTICE if getStatus is not supported by vendor (#908) (#991)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 02dea4345666..ef0bc578dee9 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 02dea4345666923d5351dc45d146262777e153ea
+Subproject commit ef0bc578dee90ee171fd3fa29011b4fbf550cd8c

From 9a89c1beee85ad8447e309182e28ee97bd2bb926 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Mon, 24 Jan 2022 22:06:17 -0800
Subject: [PATCH 0987/1674] Updated platform/cisco-8000 version to 202012-v0.91
 (#9847)

Signed-off-by: Venkat Garigipati <venkatg@cisco.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 7a5ae521c328..ef61c1894ff3 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.8-nopatches
+ref=202012-v0.91

From 4ec5f8e8506debaae17b13f078dc8ebac2b410c2 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Fri, 7 May 2021 09:47:26 -0700
Subject: [PATCH 0988/1674] Port the fix to get the PCI_id from asic.conf file
 from 201911 --> master branch (#7513)

Port the fix to get the pci_device ID from asic.conf file and update the "asic_id" field in DEVICE_METADATA with the pci_device_Id.

Ref: https://github.com/Azure/sonic-buildimage/pull/4705
---
 src/sonic-config-engine/sonic-cfggen          |  9 ++++++--
 .../sonic_py_common/multi_asic.py             | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index 98ef97f8a875..33133f2de154 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -41,7 +41,7 @@ from functools import partial
 from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role
 from portconfig import get_port_config, get_breakout_mode
 from redis_bcc import RedisBytecodeCache
-from sonic_py_common.multi_asic import get_asic_id_from_name
+from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id
 from sonic_py_common import device_info
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
 
@@ -377,7 +377,12 @@ def main():
             }}}
         # The ID needs to be passed to the SAI to identify the asic.
         if asic_name is not None:
-            hardware_data['DEVICE_METADATA']['localhost'].update(asic_id=asic_id)
+            device_id = get_asic_device_id(asic_id)
+            # if the device_id obtained is None, exit with error
+            if device_id is None:
+                print('Failed to get device ID for', asic_name, file=sys.stderr)
+                sys.exit(1)
+            hardware_data['DEVICE_METADATA']['localhost'].update(asic_id=device_id)
         deep_update(data, hardware_data)
 
     paths = ['/', '/usr/share/sonic/templates']
diff --git a/src/sonic-py-common/sonic_py_common/multi_asic.py b/src/sonic-py-common/sonic_py_common/multi_asic.py
index 3bb2984c8b95..1666fb47df1c 100644
--- a/src/sonic-py-common/sonic_py_common/multi_asic.py
+++ b/src/sonic-py-common/sonic_py_common/multi_asic.py
@@ -137,6 +137,29 @@ def get_asic_id_from_name(asic_name):
     else:
         raise ValueError('Unknown asic namespace name {}'.format(asic_name))
 
+def get_asic_device_id(asic_id):
+    # Get asic.conf file
+    asic_conf_file_path = get_asic_conf_file_path()
+
+    if asic_conf_file_path is None:
+        return None
+
+    # In a multi-asic device we need to have the file "asic.conf" updated with the asic instance
+    # and the corresponding device id which could be pci_id. Below is an eg: for a 2 ASIC platform/sku.
+    # DEV_ID_ASIC_0=03:00.0
+    # DEV_ID_ASIC_1=04:00.0
+    device_str = "DEV_ID_ASIC_{}".format(asic_id)
+
+    with open(asic_conf_file_path) as asic_conf_file:
+        for line in asic_conf_file:
+            tokens = line.split('=')
+            if len(tokens) < 2:
+               continue
+            if tokens[0] == device_str:
+                device_id = tokens[1].strip()
+                return device_id
+
+    return None
 
 def get_current_namespace(pid=None):
     """

From 9129827743245df5ee11a41708cf5ac145e8b64e Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 21 Oct 2021 13:24:33 -0700
Subject: [PATCH 0989/1674] dhcp6relay: Save the dbgsym package into the target
 folder (#9013)

This makes it possible to install the debug symbols if needed. Also install
the package into the debug version of sonic-dhcp-relay container.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 rules/dhcp6relay.mk          | 3 +++
 rules/docker-dhcp-relay.mk   | 2 +-
 src/dhcp6relay/Makefile      | 4 ++--
 src/dhcp6relay/src/subdir.mk | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
index 2601fff26604..204bf6fa34dd 100644
--- a/rules/dhcp6relay.mk
+++ b/rules/dhcp6relay.mk
@@ -7,3 +7,6 @@ SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION
 $(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
 $(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
 SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)
+
+SONIC_DHCP6RELAY_DBG = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)-dbgsym_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCP6RELAY),$(SONIC_DHCP6RELAY_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 00900f560d96..fd1d8fc4b858 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -9,7 +9,7 @@ $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 $(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
index 4cbeb37fd188..4d2eedd042ec 100644
--- a/src/dhcp6relay/Makefile
+++ b/src/dhcp6relay/Makefile
@@ -4,8 +4,8 @@ CP := cp
 MKDIR := mkdir
 CC := g++
 MV := mv
-LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system -I $(PWD)/../sonic-swss-common/common
-CFLAGS  = -g -Wall -std=gnu11
+LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
+CFLAGS  = -g -Wall -std=c++17 -fPIC -I $(PWD)/../sonic-swss-common/common
 PWD := $(shell pwd)
 
 ifneq ($(MAKECMDGOALS),clean)
diff --git a/src/dhcp6relay/src/subdir.mk b/src/dhcp6relay/src/subdir.mk
index af378319d78f..1c93d490ec63 100644
--- a/src/dhcp6relay/src/subdir.mk
+++ b/src/dhcp6relay/src/subdir.mk
@@ -18,6 +18,6 @@ C_DEPS += \
 src/%.o: src/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	$(CC) -std=c++17 -D__FILENAME__="$(subst src/,,$<)" $(LIBS) -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	$(CC) -D__FILENAME__="$(subst src/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '

From d3df3c9e93f4d8ab07f914f0f8310cd0f88443b6 Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Wed, 19 Jan 2022 09:42:51 +0100
Subject: [PATCH 0990/1674] [Celestica/Seastone2] Load interface LEDs (#9769)

Tested on a Celestica Seastone2 DX030 switch

Testing scenarios:
- Various QSFP ports in both normal and breakout config.
- 100G and 40G link speed show different colors.
- SFP1 port works.

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 .../x86_64-cel_seastone_2-r0/led_proc_init.soc       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone_2-r0/led_proc_init.soc b/device/celestica/x86_64-cel_seastone_2-r0/led_proc_init.soc
index a47644c032e1..b6b474bd53d6 100644
--- a/device/celestica/x86_64-cel_seastone_2-r0/led_proc_init.soc
+++ b/device/celestica/x86_64-cel_seastone_2-r0/led_proc_init.soc
@@ -1,9 +1,5 @@
-#Enable all ports
-port all en=1
-sleep 6
-#linkscan 250000; port xe,ce linkscan=on
-
-#Load LED
+linkscan off
+m0 load 0 0x3800 /usr/share/sonic/platform/custom.bin
+sleep 10
 led auto on; led start
-
-
+linkscan on

From 2247dbe25c129c18b0d1f65865b17fba2862ad16 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Wed, 26 Jan 2022 08:26:45 +0200
Subject: [PATCH 0991/1674] [202012] [submodule] Update sonic-swss pointer
 (#9848)

[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857) (#2106)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 320591a05e19..50c4f685a21e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 320591a05e19a70c64c6c8f9b126291deb977af3
+Subproject commit 50c4f685a21e0f48b33421ed54658d1715ad9d26

From e6b22b19427ee1332111b686acc8c4ce65f7342c Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Wed, 26 Jan 2022 10:58:19 +0200
Subject: [PATCH 0992/1674] [Mellanox][202012] Update SAI to 1.20.2.6 and
 SDK/FW to 4.5.1208/2010.1218 (#9818)

- Why I did it
To include latest fixes.
1. On CMIS modules, after low power configuration, the firmware waited for the module state to be ModuleReady instead of ModuleLowPower causing delays.
2. When connecting SN4600C, 100GbE port with CWDM4 module (Gen 3.0), link up time is 30 seconds.
3. Add T1 ECMP Overlay support

- How I did it
Updated SDK/SAI submodule and relevant makefiles with the required versions.

- How to verify it
Build an image and run tests from "sonic-mgmt".

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/mlnx-sai.mk                          | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation          | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 9029ff47b4bf..df8d652ddac4 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2008.3358
+MLNX_SPC_FW_VERSION = 13.2010.1218
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2008.3358
+MLNX_SPC2_FW_VERSION = 29.2010.1218
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2008.3358
+MLNX_SPC3_FW_VERSION = 30.2010.1218
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 3e6638005d3a..f1b8af7af098 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.18.3.0
+MLNX_SAI_VERSION = SAIRel1.20.2.6
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 0e4f0bdbe8f9..c5f0f46b946b 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 0e4f0bdbe8f970db8a5f425191a7d9adae88ad95
+Subproject commit c5f0f46b946b7bbf78525cd9bcc3bead906299a4
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 51a54690eac0..cae6d827c827 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 51a54690eac0770c098aeec33f246d747c5f100a
+Subproject commit cae6d827c8274d253aef8ecd85c9a186f63f21cc
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 9b7616eb932d..5da39bb9481c 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.4.3360
+MLNX_SDK_VERSION = 4.5.1208
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 4191889803b841afa8a8370e7746f92e4342e797 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:38:04 -0800
Subject: [PATCH 0993/1674] [bgpcfgd] Add bgpcfgd support to advertise routes
 (#9197) (#9697)

Why I did it
Cherry pick changes in #9197 to 202012 branch
Add bgpcfgd support to advertise routes.

How I did it
Make bgpcfgd subscribe to the ADVERTISE_NETWORK table in STATE_DB and configure route advertisement accordingly.

How to verify it
Added unit tests in bgpcfgd and verify on KVM about route advertisement.
---
 files/scripts/swss.sh                         |   2 +-
 src/sonic-bgpcfgd/bgpcfgd/main.py             |   3 +
 .../bgpcfgd/managers_advertise_rt.py          | 108 ++++++++++
 src/sonic-bgpcfgd/tests/test_advertise_rt.py  | 185 ++++++++++++++++++
 4 files changed, 297 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_advertise_rt.py

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 63e8ba894447..c8d28f8c696b 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -147,7 +147,7 @@ start() {
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
         $SONIC_DB_CLI RESTAPI_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*'"
     fi
 
     # start service docker
diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 799390273dae..52d591d1fcb0 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -9,6 +9,7 @@
 from .config import ConfigMgr
 from .directory import Directory
 from .log import log_notice, log_crit
+from .managers_advertise_rt import AdvertiseRouteMgr
 from .managers_allow_list import BGPAllowListMgr
 from .managers_bbr import BBRMgr
 from .managers_bgp import BGPPeerMgrBase
@@ -57,6 +58,8 @@ def do_work():
         BBRMgr(common_objs, "CONFIG_DB", "BGP_BBR"),
         # Static Route Managers
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
+        # Route Advertisement Managers
+        AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
new file mode 100644
index 000000000000..352b89f7286c
--- /dev/null
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
@@ -0,0 +1,108 @@
+from .manager import Manager
+from .template import TemplateFabric
+from swsscommon import swsscommon
+
+
+class AdvertiseRouteMgr(Manager):
+    """ This class Advertises routes when ADVERTISE_NETWORK_TABLE in STATE_DB is updated """
+    def __init__(self, common_objs, db, table):
+        """
+        Initialize the object
+        :param common_objs: common object dictionary
+        :param db: name of the db
+        :param table: name of the table in the db
+        """
+        super(AdvertiseRouteMgr, self).__init__(
+            common_objs,
+            [],
+            db,
+            table,
+        )
+        
+        self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
+        self.advertised_routes = dict()
+
+
+    OP_DELETE = 'DELETE'
+    OP_ADD = 'ADD'
+
+
+    def set_handler(self, key, data):
+        vrf, ip_prefix = self.split_key(key)
+        self.add_route_advertisement(vrf, ip_prefix)
+
+        return True
+
+
+    def del_handler(self, key):
+        vrf, ip_prefix = self.split_key(key)
+        self.remove_route_advertisement(vrf, ip_prefix)
+
+
+    def add_route_advertisement(self, vrf, ip_prefix):
+        if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+            if not self.advertised_routes.get(vrf, set()):
+                self.bgp_network_import_check_commands(vrf, self.OP_ADD)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD)
+
+        self.advertised_routes.setdefault(vrf, set()).add(ip_prefix)
+
+
+    def remove_route_advertisement(self, vrf, ip_prefix):
+        self.advertised_routes.setdefault(vrf, set()).discard(ip_prefix)
+        if not self.advertised_routes.get(vrf, set()):
+            self.advertised_routes.pop(vrf, None)
+
+        if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+            if not self.advertised_routes.get(vrf, set()):
+                self.bgp_network_import_check_commands(vrf, self.OP_DELETE)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_DELETE)
+
+
+    def advertise_route_commands(self, ip_prefix, vrf, op):
+        is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
+        bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+
+        cmd_list = []
+        if vrf == 'default':
+            cmd_list.append("router bgp %s" % bgp_asn)
+        else:
+            cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+
+        cmd_list.append(" address-family %s unicast" % ("ipv6" if is_ipv6 else "ipv4"))
+        cmd_list.append("  %snetwork %s" % ('no ' if op == self.OP_DELETE else '', ip_prefix))
+
+        self.cfg_mgr.push_list(cmd_list)
+
+
+    def bgp_network_import_check_commands(self, vrf, op):
+        bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
+        cmd_list = []
+        if vrf == 'default':
+            cmd_list.append("router bgp %s" % bgp_asn)
+        else:
+            cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
+        cmd_list.append(" %sbgp network import-check" % ('' if op == self.OP_DELETE else 'no '))
+
+        self.cfg_mgr.push_list(cmd_list)
+
+
+    def on_bgp_asn_change(self):
+        if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
+            for vrf, ip_prefixes in self.advertised_routes.items():
+                self.bgp_network_import_check_commands(vrf, self.OP_ADD)
+                for ip_prefix in ip_prefixes:
+                    self.add_route_advertisement(vrf, ip_prefix)
+
+
+    @staticmethod
+    def split_key(key):
+        """
+        Split key into vrf name and prefix.
+        :param key: key to split
+        :return: vrf name extracted from the key, ip prefix extracted from the key
+        """
+        if '|' not in key:
+            return 'default', key
+        else:
+            return tuple(key.split('|', 1))
diff --git a/src/sonic-bgpcfgd/tests/test_advertise_rt.py b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
new file mode 100644
index 000000000000..26f7b6617650
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
@@ -0,0 +1,185 @@
+from unittest.mock import MagicMock, patch
+
+from bgpcfgd.directory import Directory
+from bgpcfgd.template import TemplateFabric
+from bgpcfgd.managers_advertise_rt import AdvertiseRouteMgr
+from swsscommon import swsscommon
+
+def constructor(skip_bgp_asn=False):
+    cfg_mgr = MagicMock()
+
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'tf':        TemplateFabric(),
+        'constants': {},
+    }
+
+    mgr = AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME)
+    if not skip_bgp_asn:
+        mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
+    assert len(mgr.advertised_routes) == 0
+
+    return mgr
+
+def set_del_test(mgr, op, args, expected_ret, expected_cmds):
+    set_del_test.push_list_called = False
+    def push_list(cmds):
+        set_del_test.push_list_called = True
+        assert cmds in expected_cmds
+        return True
+    mgr.cfg_mgr.push_list = push_list
+
+    if op == "SET":
+        ret = mgr.set_handler(*args)
+        assert ret == expected_ret
+    elif op == "DEL":
+        mgr.del_handler(*args)
+    else:
+        assert False, "Wrong operation"
+
+    if expected_cmds:
+        assert set_del_test.push_list_called, "cfg_mgr.push_list wasn't called"
+    else:
+        assert not set_del_test.push_list_called, "cfg_mgr.push_list was called"
+
+def test_set_del():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("10.1.0.0/24", {}),
+        True,
+        [
+            ["router bgp 65100",
+             " no bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  network 10.1.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "SET",
+        ("fc00:10::/64", {}),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  network fc00:10::/64"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("10.1.0.0/24",),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  no network 10.1.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("fc00:10::/64",),
+        True,
+        [
+            ["router bgp 65100",
+             " bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  no network fc00:10::/64"]
+        ]
+    )
+
+
+def test_set_del_vrf():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.2.0.0/24", {}),
+        True,
+        [
+            ["router bgp 65100 vrf vrfRED",
+             " no bgp network import-check"],
+            ["router bgp 65100 vrf vrfRED",
+             " address-family ipv4 unicast",
+             "  network 10.2.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|fc00:20::/64", {}),
+        True,
+        [
+            ["router bgp 65100 vrf vrfRED",
+             " address-family ipv6 unicast",
+             "  network fc00:20::/64"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("vrfRED|10.2.0.0/24",),
+        True,
+        [
+            ["router bgp 65100 vrf vrfRED",
+             " address-family ipv4 unicast",
+             "  no network 10.2.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("vrfRED|fc00:20::/64",),
+        True,
+        [
+            ["router bgp 65100 vrf vrfRED",
+             " bgp network import-check"],
+            ["router bgp 65100 vrf vrfRED",
+             " address-family ipv6 unicast",
+             "  no network fc00:20::/64"]
+        ]
+    )
+
+
+def test_set_del_bgp_asn_change():
+    mgr = constructor(skip_bgp_asn=True)
+    set_del_test(
+        mgr,
+        "SET",
+        ("vrfRED|10.3.0.0/24", {}),
+        True,
+        []
+    )
+
+
+    test_set_del_bgp_asn_change.push_list_called = False
+    expected_cmds = [
+        ["router bgp 65100 vrf vrfRED",
+         " no bgp network import-check"],
+        ["router bgp 65100 vrf vrfRED",
+         " address-family ipv4 unicast",
+         "  network 10.3.0.0/24"]
+    ]
+    def push_list(cmds):
+        test_set_del_bgp_asn_change.push_list_called = True
+        assert cmds in expected_cmds
+        return True
+
+    mgr.cfg_mgr.push_list = push_list
+    assert not test_set_del_bgp_asn_change.push_list_called
+
+    mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
+
+    assert test_set_del_bgp_asn_change.push_list_called

From 00d7eb41edda08cb6449bee36ddf1947f068f950 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Thu, 27 Jan 2022 09:14:08 -0800
Subject: [PATCH 0994/1674] Submodule update swss (#9864)

Commits:
*6d66079 - 2022-01-26 : [202012] [vnetorch] Add ECMP support for vnet tunnel routes with endpoint health monitoring (#2104) [Shi Su]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 50c4f685a21e..6d660796a580 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 50c4f685a21e0f48b33421ed54658d1715ad9d26
+Subproject commit 6d660796a580fa398028aa8224b8f29eab58d82f

From 35e88e5f6a743422496d79540e46e4cb464186be Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Wed, 17 Nov 2021 14:32:14 -0800
Subject: [PATCH 0995/1674] [build]: Use zstd compression for base filesystem
 squashfs

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
(cherry picked from commit d5365928d4dc1fa9081cf9fe61ab47e0ef306e9c)
---
 build_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index 6ec8abd0c604..fa2ef041cf4c 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -586,7 +586,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
-sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
+sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
 
 # Ensure admin gid is 1000
 gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"

From 5f3269a61b7fd5c69309af89e5ea6dcfa9642c2d Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Wed, 24 Nov 2021 17:00:14 -0800
Subject: [PATCH 0996/1674] Create a docker-swss-layer that holds the swss
 package.

This is to save about 40MB of disk space, since 5 containers
individually install this package.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
(cherry picked from commit bd479cad296f435814305b63af5545416a7d1934)
---
 dockers/docker-fpm-frr/Dockerfile.j2          |  2 +-
 dockers/docker-nat/Dockerfile.j2              |  2 +-
 dockers/docker-orchagent/Dockerfile.j2        |  2 +-
 dockers/docker-sflow/Dockerfile.j2            |  2 +-
 .../docker-swss-layer-buster/Dockerfile.j2    | 22 +++++++++++++++++++
 dockers/docker-teamd/Dockerfile.j2            |  2 +-
 rules/docker-fpm-frr.mk                       |  6 ++---
 rules/docker-nat.mk                           |  6 ++---
 rules/docker-orchagent.mk                     |  6 ++---
 rules/docker-sflow.mk                         |  6 ++---
 rules/docker-swss-layer-buster.dep            | 10 +++++++++
 rules/docker-swss-layer-buster.mk             | 14 ++++++++++++
 rules/docker-teamd.mk                         |  6 ++---
 13 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 dockers/docker-swss-layer-buster/Dockerfile.j2
 create mode 100644 rules/docker-swss-layer-buster.dep
 create mode 100644 rules/docker-swss-layer-buster.mk

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 42df1c6f38f8..f392d4d3a7a6 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-swss-layer-buster
 
 ARG docker_container_name
 ARG frr_user_uid
diff --git a/dockers/docker-nat/Dockerfile.j2 b/dockers/docker-nat/Dockerfile.j2
index 36a178a68af2..066de0a70ed0 100644
--- a/dockers/docker-nat/Dockerfile.j2
+++ b/dockers/docker-nat/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-swss-layer-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 41425c4d9bf6..70dc98c34cf3 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-swss-layer-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/dockers/docker-sflow/Dockerfile.j2 b/dockers/docker-sflow/Dockerfile.j2
index 476ff3514ace..c8d0757d5fc5 100644
--- a/dockers/docker-sflow/Dockerfile.j2
+++ b/dockers/docker-sflow/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-swss-layer-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/dockers/docker-swss-layer-buster/Dockerfile.j2 b/dockers/docker-swss-layer-buster/Dockerfile.j2
new file mode 100644
index 000000000000..e8dcb9472a26
--- /dev/null
+++ b/dockers/docker-swss-layer-buster/Dockerfile.j2
@@ -0,0 +1,22 @@
+{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
+FROM docker-config-engine-buster
+
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+{% if docker_swss_layer_buster_debs.strip() -%}
+# Copy locally-built Debian package dependencies
+{{ copy_files("debs/", docker_swss_layer_buster_debs.split(' '), "/debs/") }}
+
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_swss_layer_buster_debs.split(' ')) }}
+{%- endif %}
+
+RUN apt-get clean -y      && \
+    apt-get autoclean -y  && \
+    apt-get autoremove -y && \
+    rm -rf /debs
+
+ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
index 7f4db2936857..e02000abb1c6 100644
--- a/dockers/docker-teamd/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-swss-layer-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index dca3f30ad53a..171623dd3e94 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -8,13 +8,13 @@ $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/$(DOCKER_FPM_FRR_STEM)
 $(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK)
 
 $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG1)
-$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) \
                                 $(FRR_DBG) $(FRR_SNMP_DBG) $(LIBYANG1_DBG)
 
-$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR)
 
diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk
index 981019dbcdb6..ef58241a13b8 100644
--- a/rules/docker-nat.mk
+++ b/rules/docker-nat.mk
@@ -7,11 +7,11 @@ DOCKER_NAT_DBG = $(DOCKER_NAT_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_NAT)_PATH = $(DOCKERS_PATH)/$(DOCKER_NAT_STEM)
 
 $(DOCKER_NAT)_DEPENDS += $(SWSS) $(IPTABLESIP4TC) $(IPTABLESIP6TC) $(IPTABLESIPTC) $(IPXTABLES12) $(IPTABLES)
-$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_NAT)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
 
 ifeq ($(INCLUDE_NAT), y)
 SONIC_DOCKER_IMAGES += $(DOCKER_NAT)
diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk
index 78cef9fd1a6e..a5e5823957ab 100644
--- a/rules/docker-orchagent.mk
+++ b/rules/docker-orchagent.mk
@@ -6,16 +6,16 @@ DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS)
 
-$(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_ORCHAGENT)_DBG_DEPENDS +=   $(SWSS_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
-$(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
 $(DOCKER_ORCHAGENT)_PATH = $(DOCKERS_PATH)/$(DOCKER_ORCHAGENT_STEM)
 
-$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
diff --git a/rules/docker-sflow.mk b/rules/docker-sflow.mk
index f9386190a4d5..d6d898b25254 100644
--- a/rules/docker-sflow.mk
+++ b/rules/docker-sflow.mk
@@ -7,11 +7,11 @@ DOCKER_SFLOW_DBG = $(DOCKER_SFLOW_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_SFLOW)_PATH = $(DOCKERS_PATH)/$(DOCKER_SFLOW_STEM)
 
 $(DOCKER_SFLOW)_DEPENDS += $(SWSS) $(HSFLOWD) $(SFLOWTOOL) $(PSAMPLE)
-$(DOCKER_SFLOW)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_SFLOW)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_TEAMD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_SFLOW)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_SFLOW)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_SFLOW)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_SFLOW)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_SFLOW)
 ifeq ($(INCLUDE_SFLOW), y)
diff --git a/rules/docker-swss-layer-buster.dep b/rules/docker-swss-layer-buster.dep
new file mode 100644
index 000000000000..d245a29269c3
--- /dev/null
+++ b/rules/docker-swss-layer-buster.dep
@@ -0,0 +1,10 @@
+
+DPATH       := $($(DOCKER_SWSS_LAYER_BUSTER)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-swss-layer-buster.mk rules/docker-swss-layer-buster.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_SWSS_LAYER_BUSTER)_CACHE_MODE  := GIT_CONTENT_SHA
+$(DOCKER_SWSS_LAYER_BUSTER)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_SWSS_LAYER_BUSTER)_DEP_FILES   := $(DEP_FILES)
+
diff --git a/rules/docker-swss-layer-buster.mk b/rules/docker-swss-layer-buster.mk
new file mode 100644
index 000000000000..f04a09fbca4c
--- /dev/null
+++ b/rules/docker-swss-layer-buster.mk
@@ -0,0 +1,14 @@
+# docker image for sonic swss layer
+
+DOCKER_SWSS_LAYER_BUSTER = docker-swss-layer-buster.gz
+$(DOCKER_SWSS_LAYER_BUSTER)_PATH = $(DOCKERS_PATH)/docker-swss-layer-buster
+
+$(DOCKER_SWSS_LAYER_BUSTER)_DEPENDS += $(SWSS)
+$(DOCKER_SWSS_LAYER_BUSTER)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+
+$(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS) \
+                                             $(SWSS)
+$(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+
+SONIC_DOCKER_IMAGES += $(DOCKER_SWSS_LAYER_BUSTER)
+SONIC_BUSTER_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk
index c0fe6bfb6bb1..ad89b5713758 100644
--- a/rules/docker-teamd.mk
+++ b/rules/docker-teamd.mk
@@ -7,13 +7,13 @@ DOCKER_TEAMD_DBG = $(DOCKER_TEAMD_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/$(DOCKER_TEAMD_STEM)
 
 $(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCTL) $(LIBTEAM_UTILS)
-$(DOCKER_TEAMD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_TEAMD)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_TEAMD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
 $(DOCKER_TEAMD)_DBG_DEPENDS += $(LIBTEAMDCTL_DBG) $(LIBTEAM_UTILS_DBG)
 
-$(DOCKER_TEAMD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_TEAMD)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_TEAMD)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TEAMD)

From 0b9077dc47f1e56c933dda03023328503b8a2811 Mon Sep 17 00:00:00 2001
From: Shi Su <67605788+shi-su@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:46:48 -0800
Subject: [PATCH 0997/1674] Add openbfdd to ptf docker (#9488)

Why I did it
To enable test support for BFD-related features, the PTF docker needs to have the proper support for BFD. This PR aims to add BFD support in ptf docker.

How I did it
Clone and build OpenBFDD for PTF docker.

How to verify it
Build locally and verify BFD is supported.
---
 dockers/docker-ptf/Dockerfile.j2 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index dfb8b924c5f1..fc87fa9f36f0 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -97,6 +97,14 @@ RUN rm -rf /debs \
     && make install \
     && cd  .. \
     && rm -fr sflowtool \
+    && git clone https://github.com/dyninc/OpenBFDD.git \
+    && cd OpenBFDD \
+    && ./autogen.sh \
+    && ./configure \
+    && make \
+    && make install \
+    && cd  .. \
+    && rm -fr OpenBFDD \
     && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
     && tar xvfz 1.0.0.tar.gz \
     && cd nanomsg-1.0.0    \

From 5afef51b1bebde70ae48987f012e6e53345ff06a Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 09:58:52 -0800
Subject: [PATCH 0998/1674] [dhcp6relay] a couple memory access protections
 (#9851)

Why I did it
the strcpy and buffer allocation is not safe, it corrupts 1 byte on the stack. Depending on the memory layout, it may or may not cause issue immediately.
message type is not validated before updating the counter. Which could cause segment fault.

How I did it
Remove the unsafe strcpy, use config->interface.c_str() instead.
Check message type before updating counters.

How to verify it
The issue (1) caused segment fault on a specific platform. The fix was validated there. Issue (2) was precautionary. Added log in case it triggers.
---
 src/dhcp6relay/src/configInterface.cpp |  1 +
 src/dhcp6relay/src/relay.cpp           | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
index 0af4f49a285f..ca78d80e63da 100644
--- a/src/dhcp6relay/src/configInterface.cpp
+++ b/src/dhcp6relay/src/configInterface.cpp
@@ -119,6 +119,7 @@ void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries,
         relay_config intf;
         intf.is_option_79 = true;
         intf.interface = vlan;
+        intf.db = nullptr;
         for (auto &fieldValue: fieldValues) {
             std::string f = fvField(fieldValue);
             std::string v = fvValue(fieldValue);
diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index d8fa2747a544..c6aa6fac2bcf 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -226,9 +226,11 @@ void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n,
     std::string counterVlan = counter_table;
     if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
         syslog(LOG_ERR, "sendto: Failed to send to target address\n");
-    else {
+    else if (counterMap.find(msg_type) != counterMap.end()) {
         counters[msg_type]++;
         update_counter(config->db, counterVlan.append(config->interface), msg_type);
+    } else {
+        syslog(LOG_WARNING, "unexpected message type %d(0x%x)\n", msg_type, msg_type);
     }
 }
 
@@ -478,10 +480,9 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
  *
  * @return              none
  */
- void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs) {
+ void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *config) {
     static uint8_t buffer[4096];
     uint8_t type = 0;
-    char ifname[configs->interface.size()];
     struct sockaddr_in6 target_addr;
     auto current_buffer_position = buffer;
     auto current_position = msg;
@@ -506,14 +507,13 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
         }
     }
 
-    strcpy(ifname, configs->interface.c_str());
     memcpy(&target_addr.sin6_addr, &dhcp_relay_header->peer_address, sizeof(struct in6_addr));
     target_addr.sin6_family = AF_INET6;
     target_addr.sin6_flowinfo = 0;
     target_addr.sin6_port = htons(CLIENT_PORT);
-    target_addr.sin6_scope_id = if_nametoindex(ifname);
+    target_addr.sin6_scope_id = if_nametoindex(config->interface.c_str());
 
-    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, configs, type);
+    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, config, type);
 } 
 
 
@@ -707,8 +707,7 @@ void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
         int filter = 0;
         int local_sock = 0; 
         int server_sock = 0;
-        const char *ifname = config->interface.c_str();
-        int index = if_nametoindex(ifname);
+        int index = if_nametoindex(config->interface.c_str());
         config->db = db;
 
         std::string counterVlan = counter_table;

From 67f718f83e50934bb37abc9fb7d9cb9a0488b833 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 27 Jan 2022 23:19:15 -0800
Subject: [PATCH 0999/1674] [dhcp_relay] Check payload size to prevent buffer
 overflow in dhcpv6 option (#9740)

---
 src/dhcp6relay/src/relay.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index c6aa6fac2bcf..e423f5f9fe62 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -493,14 +493,17 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
     auto position = current_position + sizeof(struct dhcpv6_option);
     auto dhcpv6msg = parse_dhcpv6_hdr(position);
 
-    while ((current_position - msg) != len) {
+    while ((current_position - msg) < len) {
         auto option = parse_dhcpv6_opt(current_position, &tmp);
         current_position = tmp;
+        if (current_position - msg > len || ntohs(option->option_length) > sizeof(buffer) - (current_buffer_position - buffer)) {
+            break;
+        }
         switch (ntohs(option->option_code)) {
             case OPTION_RELAY_MSG:
                 memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
                 current_buffer_position += ntohs(option->option_length);
-                type = dhcpv6msg->msg_type;;
+                type = dhcpv6msg->msg_type;
                 break;
             default:
                 break;

From 73b27b7c9ef4776ede5bee32c59c7d94170d240f Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 2 Feb 2022 19:22:29 -0800
Subject: [PATCH 1000/1674] fix build error (#9902)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 .../pmon_daemon_control.json                  |  3 ++-
 .../docker-pmon.supervisord.conf.j2           | 27 ++++++++++++++++---
 .../docker-platform-monitor/docker_init.j2    |  4 +--
 rules/docker-platform-monitor.mk              |  1 +
 rules/sonic-ycabled.dep                       | 10 +++++++
 rules/sonic-ycabled.mk                        | 10 +++++++
 src/sonic-platform-daemons                    |  2 +-
 7 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 rules/sonic-ycabled.dep
 create mode 100644 rules/sonic-ycabled.mk

diff --git a/device/virtual/x86_64-kvm_x86_64-r0/pmon_daemon_control.json b/device/virtual/x86_64-kvm_x86_64-r0/pmon_daemon_control.json
index 101db0ffea1a..35fd93caadcd 100644
--- a/device/virtual/x86_64-kvm_x86_64-r0/pmon_daemon_control.json
+++ b/device/virtual/x86_64-kvm_x86_64-r0/pmon_daemon_control.json
@@ -4,5 +4,6 @@
     "skip_pcied": true,
     "skip_psud": true,
     "skip_syseepromd": true,
-    "skip_thermalctld": true
+    "skip_thermalctld": true,
+    "skip_ycabled": false
 }
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 867974617e85..fcf295404073 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -97,10 +97,29 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}
 
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{% if not skip_ycabled %}
+[program:ycabled]
+{% if delay_ycabled %}
+command=bash -c "sleep 30 && nice -n -20 python3 /usr/local/bin/ycabled"
+{% else %}
+command=nice -n -20 python3 /usr/local/bin/ycabled
+{% endif %}
+priority=7
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+startsecs=10
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+{% endif %}
+{% endif %}
+
 {% if not skip_psud %}
 [program:psud]
 command={% if API_VERSION == 3 and 'psud' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/psud
-priority=7
+priority=8
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -113,7 +132,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_syseepromd %}
 [program:syseepromd]
 command={% if API_VERSION == 3 and 'syseepromd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/syseepromd
-priority=8
+priority=9
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -126,7 +145,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_thermalctld %}
 [program:thermalctld]
 command={% if API_VERSION == 3 and 'thermalctld' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/thermalctld
-priority=9
+priority=10
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -140,7 +159,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_pcied %}
 [program:pcied]
 command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
-priority=10
+priority=11
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
diff --git a/dockers/docker-platform-monitor/docker_init.j2 b/dockers/docker-platform-monitor/docker_init.j2
index 1d22e19b239b..c93d1790bd00 100755
--- a/dockers/docker-platform-monitor/docker_init.j2
+++ b/dockers/docker-platform-monitor/docker_init.j2
@@ -105,9 +105,9 @@ confvar="{\"HAVE_SENSORS_CONF\":$HAVE_SENSORS_CONF, \"HAVE_FANCONTROL_CONF\":$HA
 
 if [ -e $PMON_DAEMON_CONTROL_FILE ];
 then
-    sonic-cfggen -j $PMON_DAEMON_CONTROL_FILE -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
+    sonic-cfggen -d -j $PMON_DAEMON_CONTROL_FILE -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
 else
-    sonic-cfggen -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
+    sonic-cfggen -d -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
 fi
 
 exec /usr/local/bin/supervisord
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index 807513e39af4..64e9d252cdb7 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -29,6 +29,7 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PSUD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_XCVRD_PY3)
+$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_CHASSISD_PY3)
 
 ifeq ($(PDDF_SUPPORT),y)
diff --git a/rules/sonic-ycabled.dep b/rules/sonic-ycabled.dep
new file mode 100644
index 000000000000..b7eed99e8a59
--- /dev/null
+++ b/rules/sonic-ycabled.dep
@@ -0,0 +1,10 @@
+SPATH       := $($(SONIC_YCABLED_PY3)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-ycabled.mk rules/sonic-ycabled.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_YCABLED_PY3)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SONIC_YCABLED_PY3)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_YCABLED_PY3)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_YCABLED_PY3)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_YCABLED_PY3)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/sonic-ycabled.mk b/rules/sonic-ycabled.mk
new file mode 100644
index 000000000000..ba3531d2db7d
--- /dev/null
+++ b/rules/sonic-ycabled.mk
@@ -0,0 +1,10 @@
+# sonic-ycabled (SONiC Y-Cable daemon) Debian package
+
+# SONIC_YCABLED_PY3 package
+
+SONIC_YCABLED_PY3 = sonic_ycabled-1.0-py3-none-any.whl
+$(SONIC_YCABLED_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-ycabled
+$(SONIC_YCABLED_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3)
+$(SONIC_YCABLED_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
+$(SONIC_YCABLED_PY3)_PYTHON_VERSION = 3
+SONIC_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index d6ae3ef07479..0328497966cd 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit d6ae3ef074792f145437c6e2f04262696ea25019
+Subproject commit 0328497966cdc750055ed47cef71f1f89f614b41

From 3122c414063244f57da9541437fe22d3cf1c43f6 Mon Sep 17 00:00:00 2001
From: wenyiz2021 <91497961+wenyiz2021@users.noreply.github.com>
Date: Fri, 4 Feb 2022 16:14:22 -0800
Subject: [PATCH 1001/1674] Update Submodule Feb 4th, 2022 (#9918)

Co-authored-by: Wenyi Zhang <wenyizhang@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 466807e26e8e..40d136557acf 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 466807e26e8ec3370706c2bce142d426e05f3fc2
+Subproject commit 40d136557acf38beb67e7da53a11c22328ca3328

From 3162eb2458701b01e8a7062759754a9cc6641912 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 4 Feb 2022 20:09:53 -0800
Subject: [PATCH 1002/1674] [202012][swss] advance swss submodule head (#9920)

How I did it
Advance swss submodule head to include:

c3fb52b 2022-02-04 | Fix for missing lossless PG profile on certain ports (sonic-swss-common update for Vnet tables #2133) (HEAD -> 202012, github/202012) [Ying Xie]

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 6d660796a580..c3fb52b85658 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 6d660796a580fa398028aa8224b8f29eab58d82f
+Subproject commit c3fb52b856581a45d8e7880cb2d0b93da32406b1

From 0ccd8562cc90aaaddc53522632211740150683b8 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Sat, 5 Feb 2022 13:06:50 -0800
Subject: [PATCH 1003/1674] [sonic-linkmgrd][202012] submodule update (#9905)

[sonic-linkmgrd][202012] submodule update

ef1f5eb Jing Zhang Feb 3 09:37:25 2022 [linkmgrd] linkmgrd subscribes MUX_CABLE_INFO table to handle peer OIR events (#17)
bcd74b4 Jing Zhang Feb 1 09:52:00 2022 Collect ICMP packet loss information (#14)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 0c23756cd618..ef1f5ebc9a64 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 0c23756cd618473064381618ef82687f98b7e31f
+Subproject commit ef1f5ebc9a64207e622da1fb11eb78e6d95e7f45

From 7435613216a0e54678054c4eb31aa1181d937b71 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 08:02:57 -0800
Subject: [PATCH 1004/1674] [202012] BRCM SAI 4.3.5.3-1 Fix for CS00012218555
 (#9923)

---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 5d5e8b026b60..3f8da9d8f8da 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index be10db78f92c..68d56cd4aa6e 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.3-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 78dc2d8a7bfe5017b28e2233e2e654b6308af871 Mon Sep 17 00:00:00 2001
From: tbgowda <24815472+tbgowda@users.noreply.github.com>
Date: Tue, 1 Feb 2022 08:44:17 -0800
Subject: [PATCH 1005/1674] Enable SAI_SWITCH_ATTR_UNINIT_DATA_PLANE_ON_REMOVAL
 attribute (#9419)

Why I did it
Fixes #8980 partly.

The corresponding changes in sonic-sairedis is here :
Azure/sonic-sairedis#975

How I did it
Include changes from both repos and build an image for verification.

How to verify it
Trigger fast-reboot with the changes, see the attribute SAI_SWITCH_ATTR_UNINIT_DATA_PLANE_ON_REMOVAL being set at the SAI level.

Signed-off-by: Thushar Gowda <24815472+tbgowda@users.noreply.github.com>
---
 files/scripts/syncd_common.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/files/scripts/syncd_common.sh b/files/scripts/syncd_common.sh
index 0e9fc8ac2d7a..5d75ae841e42 100755
--- a/files/scripts/syncd_common.sh
+++ b/files/scripts/syncd_common.sh
@@ -46,6 +46,15 @@ function check_warm_boot()
     fi
 }
 
+function check_fast_boot()
+{
+    if [[ $($SONIC_DB_CLI STATE_DB GET "FAST_REBOOT|system") == "1" ]]; then
+        FAST_BOOT="true"
+    else
+        FAST_BOOT="false"
+    fi
+}
+
 function wait_for_database_service()
 {
     # Wait for redis server start before database clean
@@ -122,10 +131,14 @@ stop() {
 
     lock_service_state_change
     check_warm_boot
+    check_fast_boot
     debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
+    debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
 
     if [[ x"$WARM_BOOT" == x"true" ]]; then
         TYPE=warm
+    elif [[ x"$FAST_BOOT" == x"true" ]]; then
+        TYPE=fast
     else
         TYPE=cold
     fi

From 47e6f32d9ee4655d90463fc4fdb304a2ea94ae3d Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Tue, 1 Feb 2022 11:36:48 -0800
Subject: [PATCH 1006/1674] [dhcp6relay] Support relaying Relay-Forward message
 (#9887)

---
 src/dhcp6relay/src/relay.cpp | 53 +++++++++++++++++++++++++++++++++++-
 src/dhcp6relay/src/relay.h   | 17 +++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index e423f5f9fe62..234646c1fb74 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -468,6 +468,46 @@ void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_h
     }
 }
 
+/**
+ * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
+ *
+ * @brief                construct a relay-forward message encapsulated relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config) {
+    static uint8_t buffer[4096];
+    dhcpv6_relay_msg new_message;
+    auto current_buffer_position = buffer;
+    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
+
+    if (dhcp_relay_header->hop_count >= HOP_LIMIT)
+        return;
+
+    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
+    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
+    new_message.hop_count = dhcp_relay_header->hop_count + 1;
+
+    memset(&new_message.link_address, 0, sizeof(in6_addr));
+
+    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
+    current_buffer_position += sizeof(dhcpv6_relay_msg);
+
+    auto dhcp_message_length = len;
+    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
+    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
+
+    for(auto server: config->servers_sock) {
+        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
+    }
+}
+
 /**
  * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
  * 
@@ -573,7 +613,18 @@ void callback(evutil_socket_t fd, short event, void *arg) {
     std::string counterVlan = counter_table;
     update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
 
-    relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
+    switch (msg->msg_type) {
+        case DHCPv6_MESSAGE_TYPE_RELAY_FORW:
+        {
+            relay_relay_forw(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, config);
+            break;
+        }
+        default:
+        {
+            relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
+            break;
+        }
+    }
 }
 
 /**
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
index e50d39786b4f..c224a9b28630 100644
--- a/src/dhcp6relay/src/relay.h
+++ b/src/dhcp6relay/src/relay.h
@@ -15,7 +15,7 @@
 
 #define RELAY_PORT 547
 #define CLIENT_PORT 546
-#define HOP_LIMIT 32
+#define HOP_LIMIT 8     //HOP_LIMIT reduced from 32 to 8 as stated in RFC8415
 
 #define lengthof(A) (sizeof (A) / sizeof (A)[0])
 
@@ -146,6 +146,21 @@ void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_l
  */
 void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
 
+/**
+ * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
+ *
+ * @brief                construct a relay-forward message encapsulated relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config);
+
 /**
  * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
  * 

From c1a0871fe93b2c71441252718a54317a399659e6 Mon Sep 17 00:00:00 2001
From: Prince George <45705344+prgeor@users.noreply.github.com>
Date: Wed, 2 Feb 2022 09:41:21 +0530
Subject: [PATCH 1007/1674] Close console session due to user inactivity
 (#9890)

Signed-off-by: Prince George <prgeor@microsoft.com>
---
 files/image_config/bash/bash.bashrc | 2 +-
 files/image_config/sudoers/sudoers  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/files/image_config/bash/bash.bashrc b/files/image_config/bash/bash.bashrc
index 0f19263ae04a..96f54776f945 100644
--- a/files/image_config/bash/bash.bashrc
+++ b/files/image_config/bash/bash.bashrc
@@ -55,7 +55,7 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no
 fi
 
 # Automatically log out console ttyS* sessions after 15 minutes of inactivity
-tty | grep ttyS >/dev/null && TMOUT=900
+tty | egrep -q '^/dev/ttyS[[:digit:]]+$' && TMOUT=900
 
 # if SSH_TARGET_CONSOLE_LINE was set, attach to console line interactive cli directly
 if [ -n "$SSH_TARGET_CONSOLE_LINE" ]; then
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 42dd6d5ec751..7779f48684b6 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -60,6 +60,9 @@ ALL     ALL=NOPASSWD: READ_ONLY_CMDS
 # Prevent password related command into syslog
 Defaults!PASSWD_CMDS !syslog
 
+# Make sure sudo password prompt times out after 5 mins
+Defaults passwd_timeout=5
+
 # See sudoers(5) for more information on "#include" directives:
 
 #includedir /etc/sudoers.d

From 62ad4bf3bbc35624aa528c7f7245fe6ceeeefa60 Mon Sep 17 00:00:00 2001
From: Vadym Hlushko <62022266+vadymhlushko-mlnx@users.noreply.github.com>
Date: Fri, 4 Feb 2022 04:03:17 +0200
Subject: [PATCH 1008/1674] [install.sh] Fixed the sed pattern to match the
 current image revision (#9813)

#### Why I did it
The test plan described in the `How to verify it` section caused an issue when 3 images (instead of 2) were present when executing `show boot` or `sonic-installer list` commands:
```
root@sonic:/home/admin# show boot
Current: SONiC-OS-master.0-dirty-20220118.165941
Next: SONiC-OS-master.0-dirty-20220118.165941
Available:
SONiC-OS-master.0-dirty-20220118.165941
SONiC-OS-202012.201-a0376a6e5_Internal
SONiC-OS-202012.201-a0376a6e5_Internal_RPC
```
#### How I did it
Fixed the `sed` pattern to match the current image revision in the `install.sh` script.

#### How to verify it
Test plan:
1. Install the `imageA` by using ONIE
2. Install the `imageA-rpc` by using `sonic-installer`
3. Reboot the switch
4. Swap to the `imageA` - `sonic-installer set-default imageA`
5. Reboot the switch
6. Install  the `imageB` by using `sonic-installer`
7. Check an installed images - `show boot`
8. Reboot the switch
9. Check an installed images - `show boot`
---
 installer/x86_64/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index e7eb9e1a8065..a75e70f1f6dd 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -609,7 +609,7 @@ fi
 # Note: assume that apparmor is supported in the kernel
 demo_grub_entry="$demo_volume_revision_label"
 if [ "$install_env" = "sonic" ]; then
-    old_sonic_menuentry=$(cat /host/grub/grub.cfg | sed "/$running_sonic_revision/,/}/!d")
+    old_sonic_menuentry=$(cat /host/grub/grub.cfg | sed "/^menuentry '${demo_volume_label}-${running_sonic_revision}'/,/}/!d")
     grub_cfg_root=$(echo $old_sonic_menuentry | sed -e "s/.*root\=\(.*\)rw.*/\1/")
     onie_menuentry=$(cat /host/grub/grub.cfg | sed "/menuentry ONIE/,/}/!d")
 elif [ "$install_env" = "build" ]; then

From 59a7dc9f1e0dbf2decb44dfa644157fbb0ea0f87 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 7 Feb 2022 11:55:48 -0800
Subject: [PATCH 1009/1674] [swss]: Reduce tunnel_packet_handler memory usage
 (#9762)

* Configure scapy to not store sniffed packets

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 .../docker-orchagent/tunnel_packet_handler.py | 75 ++++++++++++-------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/dockers/docker-orchagent/tunnel_packet_handler.py b/dockers/docker-orchagent/tunnel_packet_handler.py
index 7d9f7f561260..3d9b48b450b6 100755
--- a/dockers/docker-orchagent/tunnel_packet_handler.py
+++ b/dockers/docker-orchagent/tunnel_packet_handler.py
@@ -9,15 +9,17 @@
 """
 import subprocess
 import time
-
 from datetime import datetime
 from ipaddress import ip_interface
+
+from swsssdk import ConfigDBConnector, SonicV2Connector
+from sonic_py_common import logger as log
+
 from pyroute2 import IPRoute
 from scapy.layers.inet import IP
 from scapy.layers.inet6 import IPv6
 from scapy.sendrecv import AsyncSniffer
-from swsssdk import ConfigDBConnector, SonicV2Connector
-from sonic_py_common import logger as log
+
 
 logger = log.Logger()
 
@@ -36,6 +38,10 @@
 
 
 class TunnelPacketHandler(object):
+    """
+    This class handles unroutable tunnel packets that are trapped
+    to the CPU from the ASIC.
+    """
 
     def __init__(self):
         self.config_db = ConfigDBConnector()
@@ -68,19 +74,32 @@ def portchannel_intfs(self):
 
         return self._portchannel_intfs
 
-    def get_portchannel_index_mapping(self):
+    def get_intf_name(self, msg):
+        """
+        Gets the interface name for a netlink msg
+
+        Returns:
+            (str) The interface name, or the empty string if no interface
+                  name was found
         """
-        Gets a mapping of interface kernel indices to portchannel interfaces
+        attr_list = msg.get('attrs', list())
+
+        for attribute, val in attr_list:
+            if attribute == 'IFLA_IFNAME':
+                return val
+
+        return ''
+
+    def netlink_msg_is_for_portchannel(self, msg):
+        """
+        Determines if a netlink message is about a PortChannel interface
 
         Returns:
             (list) integers representing kernel indices
         """
-        index_map = {}
-        for portchannel in self.portchannel_intfs:
-            index = self.netlink_api.link_lookup(ifname=portchannel[0])[0]
-            index_map[index] = portchannel
+        ifname = self.get_intf_name(msg)
 
-        return index_map
+        return ifname in [name for name, _ in self.portchannel_intfs]
 
     def get_up_portchannels(self):
         """
@@ -89,15 +108,16 @@ def get_up_portchannels(self):
         Returns:
             (list) of interface names which are up, as strings
         """
-        pc_index_map = self.get_portchannel_index_mapping()
-        pc_indices = list(pc_index_map.keys())
-        link_statuses = self.netlink_api.get_links(*pc_indices)
+        portchannel_intf_names = [name for name, _ in self.portchannel_intfs]
+        link_statuses = []
+        for intf in portchannel_intf_names:
+            status = self.netlink_api.link("get", ifname=intf)
+            link_statuses.append(status[0])
         up_portchannels = []
 
         for status in link_statuses:
             if status['state'] == 'up':
-                port_index = status['index']
-                up_portchannels.append(pc_index_map[port_index][0])
+                up_portchannels.append(self.get_intf_name(status))
 
         return up_portchannels
 
@@ -117,7 +137,7 @@ def all_portchannels_established(self):
                                 STATE_DB,
                                 intf_table_name,
                                 STATE_KEY
-                              )
+                        )
 
             if intf_state and intf_state.lower() != 'ok':
                 return False
@@ -177,13 +197,13 @@ def get_ipinip_tunnel_addrs(self):
             tunnel_type = tunnel_table[TUNNEL_TYPE_KEY].lower()
             self_loopback_ip = tunnel_table[DST_IP_KEY]
             peer_loopback_ip = self.config_db.get_entry(
-                                    PEER_SWITCH_TABLE, peer_switch
-                                    )[ADDRESS_IPV4_KEY]
-        except KeyError as e:
+                                PEER_SWITCH_TABLE, peer_switch
+                                )[ADDRESS_IPV4_KEY]
+        except KeyError as error:
             logger.log_warning(
                 'PEER_SWITCH or TUNNEL table missing data, '
                 'could not find key {}'
-                .format(e)
+                .format(error)
             )
             return None, None
 
@@ -242,12 +262,11 @@ def sniffer_restart_required(self, messages):
                     come back up, we need to restart the sniffer to be able
                     to sniff traffic on the interface that has come back up.
         """
-        pc_index_map = self.get_portchannel_index_mapping()
         for msg in messages:
-            if msg['index'] in pc_index_map:
+            if self.netlink_msg_is_for_portchannel(msg):
                 if msg['state'] == 'up':
                     logger.log_info('{} came back up, sniffer restart required'
-                                    .format(pc_index_map[msg['index']]))
+                                    .format(self.get_intf_name(msg)))
                     return True
         return False
 
@@ -293,8 +312,8 @@ def _ping_inner_dst(packet):
         sniffer = AsyncSniffer(
             iface=sniff_intfs,
             filter=packet_filter,
-            prn=_ping_inner_dst
-
+            prn=_ping_inner_dst,
+            store=0
         )
         sniffer.start()
         while True:
@@ -307,11 +326,15 @@ def _ping_inner_dst(packet):
                 sniffer = AsyncSniffer(
                     iface=sniff_intfs,
                     filter=packet_filter,
-                    prn=_ping_inner_dst
+                    prn=_ping_inner_dst,
+                    store=0
                 )
                 sniffer.start()
 
     def run(self):
+        """
+        Entry point for the TunnelPacketHandler class
+        """
         self.wait_for_portchannels()
         self.listen_for_tunnel_pkts()
 

From f746d27c7dd8b89dc1985a0c658b2cc52668b023 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 8 Feb 2022 16:59:47 -0800
Subject: [PATCH 1010/1674] [ci/build]: Upgrade SONiC package versions (#9933)

---
 .../versions-deb-buster                       | 35 ++++++------
 .../build-sonic-slave-buster/versions-git     |  2 +-
 .../build-sonic-slave-buster/versions-py3     |  5 +-
 files/build/versions/default/versions-docker  | 25 +++++----
 files/build/versions/default/versions-git     |  5 +-
 files/build/versions/default/versions-web     |  2 +-
 .../docker-base-stretch/versions-deb-stretch  |  2 +-
 .../docker-dhcp-relay/versions-deb-buster     |  1 +
 .../docker-fpm-frr/versions-deb-buster        |  5 --
 .../dockers/docker-nat/versions-deb-buster    |  5 --
 .../docker-orchagent/versions-deb-buster      |  5 --
 .../versions-deb-buster                       | 18 +++---
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../versions-py2-all-armhf                    |  1 +
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  4 +-
 .../dockers/docker-sflow/versions-deb-buster  |  5 --
 .../docker-sonic-mgmt-framework/versions-py3  | 14 ++---
 .../versions-py3-all-armhf                    |  1 +
 .../dockers/docker-sonic-vs/versions-py3      |  4 +-
 .../versions-deb-buster                       |  5 ++
 .../docker-syncd-mlnx/versions-deb-buster     | 40 ++++++-------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../dockers/docker-teamd/versions-deb-buster  |  5 --
 .../sonic-slave-buster/versions-deb-buster    | 10 ++--
 .../versions-deb-buster-arm64                 | 10 +++-
 .../versions-deb-buster-armhf                 | 10 +++-
 .../dockers/sonic-slave-buster/versions-git   |  2 -
 .../sonic-slave-buster/versions-py3-all-armhf |  1 +
 .../sonic-slave-stretch/versions-deb-stretch  | 56 +++++++++----------
 .../versions-deb-stretch-arm64                | 10 +++-
 .../versions-deb-stretch-armhf                | 11 +++-
 .../dockers/sonic-slave-stretch/versions-git  |  2 -
 .../versions-py3-all-armhf                    |  1 +
 .../versions/host-image/versions-deb-buster   |  2 +-
 .../host-image/versions-py2-all-armhf         |  1 +
 files/build/versions/host-image/versions-py3  |  7 ++-
 38 files changed, 171 insertions(+), 149 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
 create mode 100644 files/build/versions/host-image/versions-py2-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index fac4873b0d2b..4c5ae84a9261 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.4.3360
-applibs-dev==1.mlnx.4.4.3360
+applibs==1.mlnx.4.5.1208
+applibs-dev==1.mlnx.4.5.1208
 bfnplatform==1.0.0
 innovium-sai==0.107.2
 innovium-sai-headers==0.107.2
-iproute2-dev==1.mlnx.4.4.3360
+iproute2-dev==1.mlnx.4.5.1208
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.17.2-12
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -48,25 +48,26 @@ python-thrift==0.11.0-4
 python2-yang==1.0.73
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
+sonic-dhcp6relay==1.0.0-0
 sonic-linkmgrd==1.0.0-1
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.4.3360
-sx-acl-helper-dev==1.mlnx.4.4.3360
-sx-complib==1.mlnx.4.4.3360
-sx-complib-dev==1.mlnx.4.4.3360
-sx-examples==1.mlnx.4.4.3360
-sx-examples-dev==1.mlnx.4.4.3360
-sx-gen-utils==1.mlnx.4.4.3360
-sx-gen-utils-dev==1.mlnx.4.4.3360
-sx-scew==1.mlnx.4.4.3360
-sx-scew-dev==1.mlnx.4.4.3360
-sxd-libs==1.mlnx.4.4.3360
-sxd-libs-dev==1.mlnx.4.4.3360
+sx-acl-helper==1.mlnx.4.5.1208
+sx-acl-helper-dev==1.mlnx.4.5.1208
+sx-complib==1.mlnx.4.5.1208
+sx-complib-dev==1.mlnx.4.5.1208
+sx-examples==1.mlnx.4.5.1208
+sx-examples-dev==1.mlnx.4.5.1208
+sx-gen-utils==1.mlnx.4.5.1208
+sx-gen-utils-dev==1.mlnx.4.5.1208
+sx-scew==1.mlnx.4.5.1208
+sx-scew-dev==1.mlnx.4.5.1208
+sxd-libs==1.mlnx.4.5.1208
+sxd-libs-dev==1.mlnx.4.5.1208
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.4.3360
-wjh-libs-dev==1.mlnx.4.4.3360
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.1208
+wjh-libs-dev==1.mlnx.4.5.1208
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 6b29895ef55b..01f741c788aa 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
+https://github.com/jeroennijhof/pam_tacplus.git==8a654f2cb8a27797859d2465263169ec97226ddd
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 364082fcc3a9..b734ea3b7f1c 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,14 +1,15 @@
-charset-normalizer==2.0.10
+charset-normalizer==2.0.11
 click==7.0
 docker==5.0.3
 ijson==2.6.1
 ipaddress==1.0.23
-jsondiff==1.3.0
+jsondiff==1.3.1
 jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
 psutil==5.9.0
+pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.9
 websocket-client==1.2.3
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 2b38ff8e5196..a68b934d2e93 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:333b6452b51d512b0fe7c64b2b6bbf06ec433c5c18b749bf495dd0aafcc79093
-amd64:amd64/debian:stretch==sha256:69189ed69aee1b476eede838d0dcae2eacc2cfaa1bc2987aff5fdb3ba5ab64d5
-amd64:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
-amd64:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
+amd64:amd64/debian:buster==sha256:5bb6e8c4f738d2da8662393543ddacdc8be9e421c46ce5316d2877c73c1fde16
+amd64:amd64/debian:stretch==sha256:9318174504347984adbd1dcd816d5878103bd8c55ec0eee3598ad009c23adced
+amd64:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
+amd64:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -20,6 +20,7 @@ amd64:docker-sflow==
 amd64:docker-snmp==
 amd64:docker-sonic-mgmt-framework==
 amd64:docker-sonic-telemetry==
+amd64:docker-swss-layer-buster==
 amd64:docker-syncd-bfn==
 amd64:docker-syncd-brcm==
 amd64:docker-syncd-centec==
@@ -28,13 +29,15 @@ amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
-arm64:arm64v8/debian:buster==sha256:7504f55ce01c4923c307df3d8ce9634ab5358c867e6a3c4c380e4e0a3972a244
-arm64:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
-arm64:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
+arm64:arm64v8/debian:buster==sha256:b9c2eac754faff5c52adbdadaef1ddef8c941c3e15060938e9d32db00472f82d
+arm64:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
+arm64:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
-armhf:arm32v7/debian:buster==sha256:9172b2999799b3fb004a3fe04d0cc64ed5596fcff8f47629f65b1f5538587723
-armhf:debian:buster==sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3
-armhf:debian:stretch==sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83
+arm64:docker-swss-layer-buster==
+armhf:arm32v7/debian:buster==sha256:705be950aa01d4efc68285cd6bdad9eb2ce1e64f67f95f6af3f5e0c12ebfc334
+armhf:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
+armhf:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
 armhf:docker-base-buster==
-armhf:docker-config-engine-buster==
\ No newline at end of file
+armhf:docker-config-engine-buster==
+armhf:docker-swss-layer-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index f21d5bb0737f..20a7a35e760e 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,8 +1,9 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1b93e14c92416185694f8764be425f82fa0d4242
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==b46399ad1798a0047c2fec975b09c213feb8d68a
+https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
+https://github.com/jeroennijhof/pam_tacplus.git==8a654f2cb8a27797859d2465263169ec97226ddd
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 3f8da9d8f8da..e0dfabf61325 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,7 +19,7 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==c0df45490b6c88e9f60be42362950b6d
+https://deb.nodesource.com/node_14.x/dists/buster/Release==f964fa5b54050ac3bb33ea47f436180f
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index fe251fb373e8..b7c0eab7307b 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -6,7 +6,7 @@ libcurl3==7.52.1-5+deb9u16
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
 libestr0==0.1.10-2
-libexpat1==2.2.0-2+deb9u3
+libexpat1==2.2.0-2+deb9u4
 libfastjson4==0.99.8-1~bpo9+1
 libffi6==3.2.1-6
 libgdbm3==1.8.3-14
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index cdf15109f48b..c63048430ffa 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -23,6 +23,7 @@ libunwind8==1.2.1-10~deb10u1
 lsof==4.91+dfsg-1
 openssh-client==1:7.9p1-10+deb10u2
 sonic-dhcp6relay==1.0.0-0
+sonic-dhcp6relay-dbgsym==1.0.0-0
 sonic-dhcpmon==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index e3c9e5099e40..a59df2b22643 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -17,15 +17,11 @@ libjson-c3==0.12.1+ds-2+deb10u1
 libmariadb3==1:10.3.31-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsairedis==1.0.0
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libsnmp-base==5.7.3+dfsg-5+deb10u2
 libsnmp30==5.7.3+dfsg-5+deb10u2
 libswsscommon-dbg==1.0.0
-libteam5==1.30-1
-libteamdctl0==1.30-1
 libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
@@ -36,7 +32,6 @@ openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
 sshpass==1.06-1
 strace==4.26-0.2
-swss==1.0.0
 swss-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
index b8f9439971ca..d71872d1387b 100644
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -17,16 +17,11 @@ libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
 libnftnl11==1.1.2-2
 libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsairedis==1.0.0
 libswsscommon-dbg==1.0.0
-libteam5==1.30-1
-libteamdctl0==1.30-1
 libunwind8==1.2.1-10~deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-swss==1.0.0
 swss-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index cd197e4142d6..263a47c231f4 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -16,19 +16,14 @@ libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
 libpcap0.8==1.8.1-6
 libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
-libteam5==1.30-1
-libteamdctl0==1.30-1
 libunwind8==1.2.1-10~deb10u1
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-swss==1.0.0
 swss-dbg==1.0.0
 tcpdump==4.9.3-1~deb10u2
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 9c583a577789..0eea073e8ccb 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.4.3360
-applibs-dev==1.mlnx.4.4.3360
+applibs==1.mlnx.4.5.1208
+applibs-dev==1.mlnx.4.5.1208
 dmidecode==3.2-1
 ethtool==1:5.9-1
 fancontrol==1:3.5.0-3
@@ -67,7 +67,7 @@ openssh-client==1:7.9p1-10+deb10u2
 psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-minimal==2.7.16-1
-python-sdk-api==1.mlnx.4.4.3360
+python-sdk-api==1.mlnx.4.5.1208
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -84,12 +84,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.4.3360
-sx-complib-dev==1.mlnx.4.4.3360
-sx-gen-utils==1.mlnx.4.4.3360
-sx-gen-utils-dev==1.mlnx.4.4.3360
-sxd-libs==1.mlnx.4.4.3360
-sxd-libs-dev==1.mlnx.4.4.3360
+sx-complib==1.mlnx.4.5.1208
+sx-complib-dev==1.mlnx.4.5.1208
+sx-gen-utils==1.mlnx.4.5.1208
+sx-gen-utils-dev==1.mlnx.4.5.1208
+sxd-libs==1.mlnx.4.5.1208
+sxd-libs-dev==1.mlnx.4.5.1208
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 5ea352a5989e..1ce46b44487d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.6
 pyang==2.5.2
 pyangbind==0.6.0
-python-sdk-api==4.4.3360
+python-sdk-api==4.5.1208
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
new file mode 100644
index 000000000000..b776ad0b4fbd
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
@@ -0,0 +1 @@
+pathlib2==2.3.7.post0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index a83de80272b1..940824e47550 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.4.3360
+python_sdk_api==4.5.1208
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 2f23f5dd5817..c18b6813c42e 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -64,8 +64,8 @@ libedit2==3.1-20160903-3
 liberror-perl==0.17024-1
 libestr0==0.1.10-2
 libevent-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u3
-libexpat1-dev==2.2.0-2+deb9u3
+libexpat1==2.2.0-2+deb9u4
+libexpat1-dev==2.2.0-2+deb9u4
 libfakeroot==1.21-3.1
 libfastjson4==0.99.4-1
 libffi-dev==3.2.1-6
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
index aee8911b3b25..a047d5de0954 100644
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -10,16 +10,11 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsairedis==1.0.0
-libteam5==1.30-1
-libteamdctl0==1.30-1
 libunwind8==1.2.1-10~deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 psample==1.1-1
 sflowtool==5.04
 sshpass==1.06-1
 strace==4.26-0.2
-swss==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 4dd20c60c164..1bd84526cf36 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
 attrs==21.4.0
 certifi==2017.4.17
-charset-normalizer==2.0.10
+charset-normalizer==2.0.11
 click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
@@ -9,14 +9,14 @@ grpcio==1.43.0
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.10.1
+importlib-resources==5.4.0
 inflection==0.5.1
-isodate==0.6.1
 itsdangerous==2.0.1
-jsonschema==3.2.0
-openapi-schema-validator==0.1.6
-openapi-spec-validator==0.3.2
-protobuf==3.19.3
-pyrsistent==0.16.1
+jsonschema==4.4.0
+openapi-schema-validator==0.2.3
+openapi-spec-validator==0.4.0
+protobuf==3.19.4
+pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
new file mode 100644
index 000000000000..e503079c1bef
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
@@ -0,0 +1 @@
+werkzeug==2.0.3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 8d618b0dfbd4..a9fa5f6b678c 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,9 +1,9 @@
 certifi==2021.10.8
-charset-normalizer==2.0.10
+charset-normalizer==2.0.11
 click==7.0
 idna==3.3
 ijson==2.6.1
-jsondiff==1.3.0
+jsondiff==1.3.1
 m2crypto==0.38.0
 netifaces==0.10.9
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster b/files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster
new file mode 100644
index 000000000000..5690a145b7a2
--- /dev/null
+++ b/files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster
@@ -0,0 +1,5 @@
+libsaimetadata==1.0.0
+libsairedis==1.0.0
+libteam5==1.30-1
+libteamdctl0==1.30-1
+swss==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 341a136120af..2aa3551cf2fa 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.4.3360
-applibs-dev==1.mlnx.4.4.3360
+applibs==1.mlnx.4.5.1208
+applibs-dev==1.mlnx.4.5.1208
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2==1.mlnx.4.4.3360
-iproute2-dev==1.mlnx.4.4.3360
+iproute2==1.mlnx.4.5.1208
+iproute2-dev==1.mlnx.4.5.1208
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10
@@ -34,13 +34,13 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.208-1
 mft==4.17.2-12
-mlnx-sai==1.mlnx.SAIRel1.18.3.0
+mlnx-sai==1.mlnx.SAIRel1.20.2.6
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.4.3360
+python-sdk-api==1.mlnx.4.5.1208
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -50,21 +50,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.4.3360
-sx-acl-helper-dev==1.mlnx.4.4.3360
-sx-complib==1.mlnx.4.4.3360
-sx-complib-dev==1.mlnx.4.4.3360
-sx-examples==1.mlnx.4.4.3360
-sx-examples-dev==1.mlnx.4.4.3360
-sx-gen-utils==1.mlnx.4.4.3360
-sx-gen-utils-dev==1.mlnx.4.4.3360
-sx-scew==1.mlnx.4.4.3360
-sx-scew-dev==1.mlnx.4.4.3360
-sxd-libs==1.mlnx.4.4.3360
-sxd-libs-dev==1.mlnx.4.4.3360
+sx-acl-helper==1.mlnx.4.5.1208
+sx-acl-helper-dev==1.mlnx.4.5.1208
+sx-complib==1.mlnx.4.5.1208
+sx-complib-dev==1.mlnx.4.5.1208
+sx-examples==1.mlnx.4.5.1208
+sx-examples-dev==1.mlnx.4.5.1208
+sx-gen-utils==1.mlnx.4.5.1208
+sx-gen-utils-dev==1.mlnx.4.5.1208
+sx-scew==1.mlnx.4.5.1208
+sx-scew-dev==1.mlnx.4.5.1208
+sxd-libs==1.mlnx.4.5.1208
+sxd-libs-dev==1.mlnx.4.5.1208
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
-wjh-libs==1.mlnx.4.4.3360
-wjh-libs-dev==1.mlnx.4.4.3360
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.1208
+wjh-libs-dev==1.mlnx.4.5.1208
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index ec6168501c69..adf84f58a607 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.4.3360
\ No newline at end of file
+python-sdk-api==4.5.1208
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 3c9ecbc50302..51f2205ee735 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.4.3360
\ No newline at end of file
+python_sdk_api==4.5.1208
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
index 747832af7779..919b3bcd22b7 100644
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -8,19 +8,14 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsairedis==1.0.0
 libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
 libteam-utils-dbgsym==1.30-1
-libteam5==1.30-1
-libteamdctl0==1.30-1
 libteamdctl0-dbgsym==1.30-1
 libunwind8==1.2.1-10~deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-swss==1.0.0
 swss-dbg==1.0.0
 vim==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 59809793e4a7..400b76872146 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -795,7 +795,7 @@ libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
 libnss-systemd==241-7~deb10u8
-libnss3==2:3.42.1-1+deb10u4
+libnss3==2:3.42.1-1+deb10u5
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
 libnumber-compare-perl==0.03-1
@@ -1336,10 +1336,10 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.13+8-1~deb10u1
-openjdk-11-jdk-headless==11.0.13+8-1~deb10u1
-openjdk-11-jre==11.0.13+8-1~deb10u1
-openjdk-11-jre-headless==11.0.13+8-1~deb10u1
+openjdk-11-jdk==11.0.14+9-1~deb10u1
+openjdk-11-jdk-headless==11.0.14+9-1~deb10u1
+openjdk-11-jre==11.0.14+9-1~deb10u1
+openjdk-11-jre-headless==11.0.14+9-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index be02bc4f494d..96b3426b7fd4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -2,6 +2,14 @@ binutils-aarch64-linux-gnu==2.31.1-16
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
+libpolkit-agent-1-0==0.105-25+deb10u1
+libpolkit-backend-1-0==0.105-25+deb10u1
+libpolkit-gobject-1-0==0.105-25+deb10u1
+libruby2.5==2.5.5-3+deb10u4
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.18.3-deb-1nodesource1
\ No newline at end of file
+nodejs==14.19.0-deb-1nodesource1
+policykit-1==0.105-25+deb10u1
+ruby2.5==2.5.5-3+deb10u4
+ruby2.5-dev==2.5.5-3+deb10u4
+ruby2.5-doc==2.5.5-3+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index c65e50640443..e0041e2d5c06 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -31,6 +31,10 @@ libmro-compat-perl==0.13-1
 libnamespace-autoclean-perl==0.28-1
 libpadwalker-perl==2.3-1+b1
 libparams-validationcompiler-perl==0.30-1
+libpolkit-agent-1-0==0.105-25+deb10u1
+libpolkit-backend-1-0==0.105-25+deb10u1
+libpolkit-gobject-1-0==0.105-25+deb10u1
+libruby2.5==2.5.5-3+deb10u4
 librust-aho-corasick-dev==0.6.9-1
 librust-ansi-term-dev==0.11.0-1
 librust-atty-dev==0.2.11-1
@@ -114,9 +118,13 @@ linux-compiler-gcc-8-arm==4.19.208-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.18.3-deb-1nodesource1
+nodejs==14.19.0-deb-1nodesource1
+policykit-1==0.105-25+deb10u1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
+ruby2.5==2.5.5-3+deb10u4
+ruby2.5-dev==2.5.5-3+deb10u4
+ruby2.5-doc==2.5.5-3+deb10u4
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
 texlive-font-utils==2018.20190227-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index 41f28165e6a8..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..9f5f6f8caa97
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 556fbb488798..daa0a7b6b83f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -722,7 +722,7 @@ libnl-3-200==3.2.27-2
 libnl-route-3-200==3.2.27-2
 libnpth0==1.3-1
 libnspr4==2:4.12-6
-libnss3==2:3.26.2-1.1+deb9u4
+libnss3==2:3.26.2-1.1+deb9u5
 libntlm0==1.4-8+deb9u1
 libnuma-dev==2.0.11-2.1
 libnuma1==2.0.11-2.1
@@ -839,24 +839,24 @@ libpython3.5-minimal==3.5.3-1+deb9u5
 libpython3.5-stdlib==3.5.3-1+deb9u5
 libqdox-java==1.12.1-2
 libqdox2-java==2.0~M3-3
-libqt4-dbus==4:4.8.7+dfsg-11+deb9u1
-libqt4-declarative==4:4.8.7+dfsg-11+deb9u1
-libqt4-designer==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u1
-libqt4-help==4:4.8.7+dfsg-11+deb9u1
-libqt4-network==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl==4:4.8.7+dfsg-11+deb9u1
-libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u1
-libqt4-qt3support==4:4.8.7+dfsg-11+deb9u1
-libqt4-script==4:4.8.7+dfsg-11+deb9u1
-libqt4-scripttools==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql==4:4.8.7+dfsg-11+deb9u1
-libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u1
-libqt4-svg==4:4.8.7+dfsg-11+deb9u1
-libqt4-test==4:4.8.7+dfsg-11+deb9u1
-libqt4-xml==4:4.8.7+dfsg-11+deb9u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u1
+libqt4-dbus==4:4.8.7+dfsg-11+deb9u3
+libqt4-declarative==4:4.8.7+dfsg-11+deb9u3
+libqt4-designer==4:4.8.7+dfsg-11+deb9u3
+libqt4-dev==4:4.8.7+dfsg-11+deb9u3
+libqt4-dev-bin==4:4.8.7+dfsg-11+deb9u3
+libqt4-help==4:4.8.7+dfsg-11+deb9u3
+libqt4-network==4:4.8.7+dfsg-11+deb9u3
+libqt4-opengl==4:4.8.7+dfsg-11+deb9u3
+libqt4-opengl-dev==4:4.8.7+dfsg-11+deb9u3
+libqt4-qt3support==4:4.8.7+dfsg-11+deb9u3
+libqt4-script==4:4.8.7+dfsg-11+deb9u3
+libqt4-scripttools==4:4.8.7+dfsg-11+deb9u3
+libqt4-sql==4:4.8.7+dfsg-11+deb9u3
+libqt4-sql-mysql==4:4.8.7+dfsg-11+deb9u3
+libqt4-svg==4:4.8.7+dfsg-11+deb9u3
+libqt4-test==4:4.8.7+dfsg-11+deb9u3
+libqt4-xml==4:4.8.7+dfsg-11+deb9u3
+libqt4-xmlpatterns==4:4.8.7+dfsg-11+deb9u3
 libqt5concurrent5==5.7.1+dfsg-3+deb9u3
 libqt5core5a==5.7.1+dfsg-3+deb9u3
 libqt5dbus5==5.7.1+dfsg-3+deb9u3
@@ -871,9 +871,9 @@ libqt5svg5==5.7.1~20161021-2.1+deb9u1
 libqt5test5==5.7.1+dfsg-3+deb9u3
 libqt5widgets5==5.7.1+dfsg-3+deb9u3
 libqt5xml5==5.7.1+dfsg-3+deb9u3
-libqtcore4==4:4.8.7+dfsg-11+deb9u1
-libqtdbus4==4:4.8.7+dfsg-11+deb9u1
-libqtgui4==4:4.8.7+dfsg-11+deb9u1
+libqtcore4==4:4.8.7+dfsg-11+deb9u3
+libqtdbus4==4:4.8.7+dfsg-11+deb9u3
+libqtgui4==4:4.8.7+dfsg-11+deb9u3
 libquadmath0==6.3.0-18+deb9u1
 librdmacm1==1.1.0-2
 libreadline-dev==7.0-3
@@ -1287,7 +1287,7 @@ python-nose2==0.6.5-2
 python-openssl==16.2.0-1
 python-pam==0.4.2-13.2
 python-parse==1.6.6-0.1
-python-pil==4.0.0-4+deb9u3
+python-pil==4.0.0-4+deb9u4
 python-pip-whl==9.0.1-2+deb9u2
 python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
@@ -1345,7 +1345,7 @@ python3-keyrings.alt==1.3-1
 python3-magic==1:5.30-1+deb9u3
 python3-markupsafe==0.23-3
 python3-minimal==3.5.3-1
-python3-pil==4.0.0-4+deb9u3
+python3-pil==4.0.0-4+deb9u4
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
@@ -1363,21 +1363,21 @@ python3.5==3.5.3-1+deb9u5
 python3.5-dbg==3.5.3-1+deb9u5
 python3.5-dev==3.5.3-1+deb9u5
 python3.5-minimal==3.5.3-1+deb9u5
-qdbus==4:4.8.7+dfsg-11+deb9u1
+qdbus==4:4.8.7+dfsg-11+deb9u3
 qemu-kvm==1:2.8+dfsg-6+deb9u16
 qemu-system-common==1:2.8+dfsg-6+deb9u16
 qemu-system-x86==1:2.8+dfsg-6+deb9u16
 qemu-utils==1:2.8+dfsg-6+deb9u16
 qt-at-spi==0.4.0-5
-qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u1
-qt4-qmake==4:4.8.7+dfsg-11+deb9u1
+qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u3
+qt4-qmake==4:4.8.7+dfsg-11+deb9u3
 qt5-default==5.7.1+dfsg-3+deb9u3
 qt5-gtk-platformtheme==5.7.1+dfsg-3+deb9u3
 qt5-qmake==5.7.1+dfsg-3+deb9u3
 qtbase5-dev==5.7.1+dfsg-3+deb9u3
 qtbase5-dev-tools==5.7.1+dfsg-3+deb9u3
 qtchooser==63-g13a3d08-1
-qtcore4-l10n==4:4.8.7+dfsg-11+deb9u1
+qtcore4-l10n==4:4.8.7+dfsg-11+deb9u3
 qttranslations5-l10n==5.7.1~20161021-1
 quilt==0.65-2~bpo9+1
 rake==10.5.0-2+deb9u1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 00f894c2df08..806b802601fc 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,8 +1,16 @@
 docker-ce==18.06.3~ce~3-0~debian
+expat==2.2.0-2+deb9u4
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
+libexpat1==2.2.0-2+deb9u4
+libexpat1-dev==2.2.0-2+deb9u4
+liblog4j1.2-java==1.2.17-7+deb9u2
+libpolkit-agent-1-0==0.105-18+deb9u2
+libpolkit-backend-1-0==0.105-18+deb9u2
+libpolkit-gobject-1-0==0.105-18+deb9u2
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+policykit-1==0.105-18+deb9u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 48c98dc20e6e..23a0bc8036a7 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -1,14 +1,23 @@
 docker-ce==18.06.3~ce~3-0~debian
+expat==2.2.0-2+deb9u4
 libdrm-exynos1==2.4.74-1
 libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
+libexpat1==2.2.0-2+deb9u4
+libexpat1-dev==2.2.0-2+deb9u4
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
+liblog4j1.2-java==1.2.17-7+deb9u2
+libpolkit-agent-1-0==0.105-18+deb9u2
+libpolkit-backend-1-0==0.105-18+deb9u2
+libpolkit-gobject-1-0==0.105-18+deb9u2
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+policykit-1==0.105-18+deb9u2
+xterm==327-2+deb9u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 41f28165e6a8..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==4068ef45c64529d00bb3fb1140efc5ed06c7c5eb
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
new file mode 100644
index 000000000000..9f5f6f8caa97
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
@@ -0,0 +1 @@
+bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 561bef6f19ca..e0cbf15f9266 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -241,7 +241,7 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
-sx-kernel==1.mlnx.4.4.3360
+sx-kernel==1.mlnx.4.5.1208
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py2-all-armhf b/files/build/versions/host-image/versions-py2-all-armhf
new file mode 100644
index 000000000000..b776ad0b4fbd
--- /dev/null
+++ b/files/build/versions/host-image/versions-py2-all-armhf
@@ -0,0 +1 @@
+pathlib2==2.3.7.post0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 92e85c005ccf..58b99a6362d6 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -1,10 +1,10 @@
-azure-common==1.1.27
+azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.10
+charset-normalizer==2.0.11
 click==7.0
 cryptography==36.0.1
 docker==4.3.1
@@ -13,7 +13,7 @@ ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
 jinja2==3.0.3
-jsondiff==1.3.0
+jsondiff==1.3.1
 jsonschema==2.6.0
 lxml==4.6.3
 m2crypto==0.38.0
@@ -28,6 +28,7 @@ ptyprocess==0.7.0
 pyang==2.5.2
 pyangbind==0.8.1
 pycparser==2.21
+pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3

From 17a8f4270487e870dcf5cf4eb4094f7a3611b07c Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Sun, 16 May 2021 19:44:06 -0700
Subject: [PATCH 1011/1674] [muti-asic] Updated BGP community for Internal
 routes (#7617)

Following changes are done:

Internal routes are tagged with no-export instead of local-AS
Option to add User Define BGP community on top of no-export
---
 dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2          | 7 ++++++-
 .../tests/data/sonic-cfggen/bgpd.conf.j2/all.conf          | 6 +++++-
 .../tests/data/sonic-cfggen/bgpd.conf.j2/all.json          | 5 +++++
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf     | 3 ++-
 .../data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf      | 3 ++-
 .../tests/data/sonic-cfggen/frr.conf.j2/all.conf           | 2 +-
 .../tests/sample_output/py2/bgpd_frr_backend_asic.conf     | 2 +-
 .../tests/sample_output/py2/bgpd_frr_frontend_asic.conf    | 2 +-
 .../tests/sample_output/py3/bgpd_frr_backend_asic.conf     | 2 +-
 .../tests/sample_output/py3/bgpd_frr_frontend_asic.conf    | 2 +-
 10 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index 451080584d80..725ea6b74a43 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -32,7 +32,12 @@ ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq {{ loop.index * 5 }} permit {{ prefi
 !
 {% if DEVICE_METADATA['localhost']['sub_role'] == 'FrontEnd' or DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+{% if constants.bgp.peers is defined and constants.bgp.peers.internal is defined and constants.bgp.peers.internal.community is defined %}
+  on-match next
+route-map HIDE_INTERNAL permit 20
+  set community {{ constants.bgp.peers.internal.community }} additive
+{% endif %}
 {% set multi_asic = True %}
 !
 {% endif %}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index 221daa00083b..27d0fa690d0f 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -34,7 +34,11 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+  on-match next
+route-map HIDE_INTERNAL permit 20
+  set community 1234:5678 additive
+!
 !
 router bgp 55555
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
index bc266ed70429..34fdbe72448b 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
@@ -29,6 +29,11 @@
                 "enabled": true,
                 "ipv4": 32,
                 "ipv6": 32
+            },
+            "peers": {
+               "internal": {
+                  "community": "1234:5678"
+               }
             }
         }
     }
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index 843ea9b7b7e7..971ddf8b5053 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -16,7 +16,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+!
 !
 router bgp 55555
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 8b04c4a9a7ca..2aa2a2e2e84f 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -16,7 +16,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+!
 !
 router bgp 55555
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index b10798220497..7fc6df1d7a26 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -53,7 +53,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 router bgp 55555
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
index 702f588cab57..518217125d1c 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
index 3296bed6e6fd..298543e34893 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index 702f588cab57..518217125d1c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index 3296bed6e6fd..298543e34893 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100

From 14bbccc9d6b2b8f131d4e3e664fa1b803c1fbcca Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Thu, 24 Jun 2021 12:02:01 -0700
Subject: [PATCH 1012/1674] [multi-asic] fix network command for internal
 loopback (#7878)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
In the multi asic platforms all the ASIC are advertising the same IPv6 /64 network from Loopback4096.
Therefore, the IPv6 loopback address of backend asic is not learnt on the frontend asic.
Change the bgpd.conf.main.conf.j2 template file to advertise the Loopback4096 ipv6 address as /128
---
 dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2               | 2 +-
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf | 2 +-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf          | 2 +-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf     | 2 +-
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf  | 2 +-
 .../tests/sample_output/py2/bgpd_frr_backend_asic.conf          | 2 +-
 .../tests/sample_output/py2/bgpd_frr_frontend_asic.conf         | 2 +-
 .../tests/sample_output/py3/bgpd_frr_backend_asic.conf          | 2 +-
 .../tests/sample_output/py3/bgpd_frr_frontend_asic.conf         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index 725ea6b74a43..5c91a34737d6 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -81,7 +81,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% if multi_asic is defined %}
 {% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") != 'None' %}
   address-family ipv6
-    network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/64 route-map HIDE_INTERNAL
+    network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/128 route-map HIDE_INTERNAL
   exit-address-family
 {% endif %}
 {% endif %}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index 27d0fa690d0f..b6f7a668bc8c 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -62,7 +62,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index 971ddf8b5053..5d09db596538 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -41,7 +41,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 2aa2a2e2e84f..14aa080efb5d 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -41,7 +41,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index 7fc6df1d7a26..1996dced8176 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -77,7 +77,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
index 518217125d1c..a4ad1c677a77 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -60,7 +60,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:4::32/64 route-map HIDE_INTERNAL
+    network fd00:4::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
index 298543e34893..b49d3ddd4dcd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -60,7 +60,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:1::32/64 route-map HIDE_INTERNAL
+    network fd00:1::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index 518217125d1c..a4ad1c677a77 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -60,7 +60,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:4::32/64 route-map HIDE_INTERNAL
+    network fd00:4::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index 298543e34893..b49d3ddd4dcd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -60,7 +60,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:1::32/64 route-map HIDE_INTERNAL
+    network fd00:1::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !

From 0f983c57964e46cbaf126e8561764e0af154679b Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Wed, 9 Feb 2022 19:26:40 +0800
Subject: [PATCH 1013/1674] [Mellanox] Fix issue: SN4600C has 4 CPU core
 temperature sensors (#9930)

- Why I did it
platform.json of 4600C only has 2 CPU core thermal sensors, but there are 4 actually

- How I did it
Added thermal sensors for CPU core 2 and core 3.

- How to verify it
Build.
---
 device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
index 3f427dabe4b0..7515ab05d005 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json
@@ -95,6 +95,12 @@
             {
                 "name": "CPU Core 1 Temp"
             },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
             {
                 "name": "CPU Pack Temp"
             }

From 4932b4202edc813a3a829a6760781b7a10a6af6f Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 24 Nov 2021 18:56:30 -0800
Subject: [PATCH 1014/1674] Added 40G {300/40/5m} pg lookup profile for 7260
 100G SKU (#9249)

What I did:
Added 40G {300/40/5m} profile for 7260 100G SKU
---
 .../Arista-7260CX3-C64/pg_profile_lookup.ini                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
index 254e58d3940e..cbc06c818062 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
@@ -3,3 +3,6 @@
  100000  5m   1248    1248 96928     -3        2496
  100000  40m  1248    1248 59696     -3        2496
  100000  300m 1248    1248 101088    -3        2496
+  40000  5m   1248    1248 29536     -3        2496
+  40000  40m  1248    1248 31616     -3        2496
+  40000  300m 1248    1248 48256     -3        2496

From cfce6bab261f118ded685123b148fa73516f89bf Mon Sep 17 00:00:00 2001
From: wenyiz2021 <91497961+wenyiz2021@users.noreply.github.com>
Date: Thu, 10 Feb 2022 16:13:52 -0800
Subject: [PATCH 1015/1674] [Submodule] [202012] Update submodule
 sonic-linux-kernal in 202012 (#9958)

* Update Submodule Feb 4th, 2022

* [Submodule] [202012] Update sonic-linux-kernal submodule

Co-authored-by: Wenyi Zhang <wenyizhang@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index ab7a6ed4fc6f..15e6f4b0a0ba 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit ab7a6ed4fc6fed14a5e39d8768991fd3a9a776e9
+Subproject commit 15e6f4b0a0bad2c989acb1acea8527188a67fb7a

From 2133808ae27ecf6a52bdc3720da613f2899d05de Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 10 Feb 2022 20:56:28 -0800
Subject: [PATCH 1016/1674] [202012] Package debugging and hardening for
 dhcpmon and dhcp6relay (#9862) (#9960)

Enable dbgsym package for dhcpmon.

Allow CFLAGS and LDFLAGS from environment variables to be used
in the dhcp6relay build. This makes sure that the -O2 flag from
dpkg-buildflags gets used.

Finally, enable all hardening flags in dpkg-buildflags for
dhcp6relay and dhcpmon. The change from the default set of flags is that
during linking, immediate binding of symbols is done instead of lazy
binding.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 rules/dhcpmon.mk            | 3 +++
 rules/docker-dhcp-relay.mk  | 2 +-
 src/dhcp6relay/Makefile     | 4 ++--
 src/dhcp6relay/debian/rules | 2 ++
 src/dhcpmon/debian/rules    | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/rules/dhcpmon.mk b/rules/dhcpmon.mk
index 3d80d227c156..3f8f5e139bce 100644
--- a/rules/dhcpmon.mk
+++ b/rules/dhcpmon.mk
@@ -6,3 +6,6 @@ SONIC_DHCPMON_PKG_NAME = dhcpmon
 SONIC_DHCPMON = sonic-$(SONIC_DHCPMON_PKG_NAME)_$(SONIC_DHCPMON_VERSION)_$(CONFIGURED_ARCH).deb
 $(SONIC_DHCPMON)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCPMON_PKG_NAME)
 SONIC_DPKG_DEBS += $(SONIC_DHCPMON)
+
+SONIC_DHCPMON_DBG = sonic-$(SONIC_DHCPMON_PKG_NAME)-dbgsym_$(SONIC_DHCPMON_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCPMON),$(SONIC_DHCPMON_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index fd1d8fc4b858..2ade8d641a02 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -9,7 +9,7 @@ $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 $(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
index 4d2eedd042ec..dd384452a5fc 100644
--- a/src/dhcp6relay/Makefile
+++ b/src/dhcp6relay/Makefile
@@ -5,7 +5,7 @@ MKDIR := mkdir
 CC := g++
 MV := mv
 LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
-CFLAGS  = -g -Wall -std=c++17 -fPIC -I $(PWD)/../sonic-swss-common/common
+CFLAGS += -Wall -std=c++17 -fPIE -I$(PWD)/../sonic-swss-common/common
 PWD := $(shell pwd)
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -21,7 +21,7 @@ all: sonic-dhcp6relay
 sonic-dhcp6relay: $(OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: G++ Linker'
-	$(CC) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS) 
+	$(CC) $(LDFLAGS) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
index ce2eb52beb5d..ac2cd63889ef 100755
--- a/src/dhcp6relay/debian/rules
+++ b/src/dhcp6relay/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@ --parallel
diff --git a/src/dhcpmon/debian/rules b/src/dhcpmon/debian/rules
index 00c628b6625f..76fc7ea1f839 100755
--- a/src/dhcpmon/debian/rules
+++ b/src/dhcpmon/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 DEB_CFLAGS_APPEND=-std=gnu11
 export DEB_CFLAGS_APPEND
 

From 5055c6df43eabe3a2481aa93c74563c807a94416 Mon Sep 17 00:00:00 2001
From: Jing Kan <672454911@qq.com>
Date: Thu, 10 Feb 2022 13:30:54 +0800
Subject: [PATCH 1017/1674] [sonic-config-engine]: Update minigraph parser to
 support enable DHCP server for BmcMgmtToRRouter (#9938)

Signed-off-by: Jing Kan jika@microsoft.com
---
 src/sonic-config-engine/minigraph.py               |  5 +++++
 .../tests/test_minigraph_case.py                   | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 6b55ab668772..5a2baad87c2a 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -38,6 +38,7 @@
 
 backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter']
 console_device_types = ['MgmtTsToR']
+dhcp_server_enabled_device_types = ['BmcMgmtToRRouter']
 VLAN_SUB_INTERFACE_SEPARATOR = '.'
 VLAN_SUB_INTERFACE_VLAN_ID = '10'
 
@@ -1582,6 +1583,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         }
     }
 
+    # Enable DHCP Server feature for specific device type
+    if current_device['type'] in dhcp_server_enabled_device_types:
+        results['DEVICE_METADATA']['localhost']['dhcp_server'] = 'enabled'
+
     return results
 
 def get_tunnel_entries(tunnel_intfs, lo_intfs, hostname):
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 9a494e86cd2b..a47988d10a1c 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -9,6 +9,7 @@
 
 TOR_ROUTER = 'ToRRouter'
 BACKEND_TOR_ROUTER = 'BackEndToRRouter'
+BMC_MGMT_TOR_ROUTER = 'BmcMgmtToRRouter'
 
 class TestCfgGenCaseInsensitive(TestCase):
 
@@ -171,6 +172,19 @@ def test_minigraph_console_port(self):
             utils.to_dict(output.strip()),
             utils.to_dict("{'1': {'baud_rate': '9600', 'remote_device': 'managed_device', 'flow_control': 1}}"))
 
+    def test_minigraph_dhcp_server_feature(self):
+        argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'dhcp_server\']"'
+        output = self.run_script(argument)
+        self.assertEqual(output.strip(), '')
+
+        try:
+            # For DHCP server enabled device type
+            output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BMC_MGMT_TOR_ROUTER, self.sample_graph), shell=True)
+            output = self.run_script(argument)
+            self.assertEqual(output.strip(), 'enabled')
+        finally:
+            output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BMC_MGMT_TOR_ROUTER, TOR_ROUTER, self.sample_graph), shell=True)
+
     def test_minigraph_deployment_id(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'deployment_id\']"'
         output = self.run_script(argument)

From d18b7fa24ce309c4c556c67b9610ea5b662ed7b4 Mon Sep 17 00:00:00 2001
From: Travis Van Duyn <tsvanduyn@yahoo.com>
Date: Thu, 10 Feb 2022 09:01:46 -0800
Subject: [PATCH 1018/1674] updated jinja template for snmp contact python2 vs
 python3 issue (#9949)

---
 dockers/docker-snmp/snmpd.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-snmp/snmpd.conf.j2 b/dockers/docker-snmp/snmpd.conf.j2
index b83fbffda025..585fb5353e5b 100644
--- a/dockers/docker-snmp/snmpd.conf.j2
+++ b/dockers/docker-snmp/snmpd.conf.j2
@@ -82,7 +82,7 @@ sysLocation    {{ SNMP.LOCATION.Location }}
 sysLocation    public
 {% endif %}
 {% if SNMP is defined and SNMP.CONTACT is defined %}
-sysContact     {{ SNMP.CONTACT.keys()[0] }} {{ SNMP.CONTACT.values()[0] }}
+sysContact     {{ SNMP.CONTACT.keys() | first }} {{ SNMP.CONTACT.values() | first }}
 {% else %}
 sysContact     Azure Cloud Switch vteam <linuxnetdev@microsoft.com>
 {% endif %}

From fbb18daa1b8f046205117a3a5f0b3d843334e465 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <saiarcot895@gmail.com>
Date: Fri, 11 Feb 2022 19:47:19 -0800
Subject: [PATCH 1019/1674] Revert "[Submodule] [202012] Update submodule
 sonic-linux-kernal in 202012 (#9958)" (#9975)

This reverts commit cfce6bab261f118ded685123b148fa73516f89bf.
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 15e6f4b0a0ba..ab7a6ed4fc6f 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 15e6f4b0a0bad2c989acb1acea8527188a67fb7a
+Subproject commit ab7a6ed4fc6fed14a5e39d8768991fd3a9a776e9

From 844a6c4c2768b165869fdd95ce7a7587353b2d5d Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Fri, 11 Feb 2022 21:14:36 -0800
Subject: [PATCH 1020/1674] Update sonic-swss sha1 (#9974)

Signed-off-by: Venkat Garigipati <venkatg@cisco.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c3fb52b85658..79472e3d7aa8 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c3fb52b856581a45d8e7880cb2d0b93da32406b1
+Subproject commit 79472e3d7aa8b20cc4e0cc7bbff29a2fd68a1da3

From c70de67d70183c2e89812ba90793c317dc29050b Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 12 Feb 2022 11:26:57 -0800
Subject: [PATCH 1021/1674] [submodule]: update sonic-swss

4bff5c6 2022-02-11 | Skip bfd notification during switch create (#2139) (HEAD, origin/202012) [Prince Sunny]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 79472e3d7aa8..4bff5c635cdb 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 79472e3d7aa8b20cc4e0cc7bbff29a2fd68a1da3
+Subproject commit 4bff5c635cdb40f8c425224171d3fbb90b67afc3

From 90fb01e4ab00309467e5919df52848db90280656 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 15 Feb 2022 12:23:30 +0530
Subject: [PATCH 1022/1674] DellEMC Z9332f: Fix thermalctld warning logs
 (#9977)

---
 .../z9332f/scripts/z9332f_platform.sh                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
index f80207df8ea2..e8890f641468 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
@@ -187,7 +187,7 @@ if [ "$1" == "init" ]; then
     modprobe i2c-dev
     modprobe i2c-mux-pca954x force_deselect_on_exit=1
     modprobe ipmi_devintf
-    modprobe ipmi_si kipmid_max_busy_us=1000
+    modprobe ipmi_si kipmid_max_busy_us=2500
     modprobe cls-i2c-ocore
     modprobe cls-switchboard 
     modprobe mc24lc64t 
@@ -200,7 +200,7 @@ if [ "$1" == "init" ]; then
   # /usr/bin/qsfp_irq_enable.py
     platform_firmware_versions
     get_reboot_cause
-    echo 1000 > /sys/module/ipmi_si/parameters/kipmid_max_busy_us
+    echo 2500 > /sys/module/ipmi_si/parameters/kipmid_max_busy_us
 
 elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"

From 85dc6892e1c9f40b6d5b76d257075926c5212dc2 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Sun, 13 Feb 2022 21:01:09 +0800
Subject: [PATCH 1023/1674] fix MSN4410 chassis name in
 platform_components.json (#9939)

- Why I did it
The chassis name in MSN4410 platform_components.json is not correct

- How I did it
Fix the chassis name

- How to verify it
Run relevant platform API test

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 device/mellanox/x86_64-mlnx_msn4410-r0/platform_components.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4410-r0/platform_components.json
index bb1afce80161..dac126d0b697 100644
--- a/device/mellanox/x86_64-mlnx_msn4410-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "x86_64-mlnx_msn4410-r0": {
+        "MSN4410": {
             "component": {
                 "ONIE": { },
                 "SSD": { },

From a942abe172e3ee229b8a4b3d510fdbbd9b5474b5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 14 Feb 2022 07:21:10 +0800
Subject: [PATCH 1024/1674] [Build]: Fix hundreds of thousands lines of logs
 printed in marvell-armhf (#9980)

[Build]: Fix hundreds of thousands lines of logs printed in marvell-armhf
It is caused by the bad format of the marvell sai package mrvllibsai_armhf_1.7.1-6.deb, increasing the waiting time to reduce the logs, and reduce the waste of the CPU.
---
 slave.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/slave.mk b/slave.mk
index f865d04abc63..71732ffd2018 100644
--- a/slave.mk
+++ b/slave.mk
@@ -555,6 +555,7 @@ $(SONIC_INSTALL_DEBS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install
 		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
 			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && sudo lsof /var/lib/dpkg/lock-frontend && ps aux && exit 1 ; }
 		fi
+		sleep 10
 	done
 	$(FOOTER)
 

From 6293a091a8bc8c6f1c6b363f8afc69e3ad8a298a Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:39:47 +0200
Subject: [PATCH 1025/1674] [Mellanox] Upgrade ASIC FW tool to 4.18.1-16
 (#9981)

- Why I did it
Update MFT to version 4.18.1-16 for bugs fixes and new SN2201 support

- How I did it
Advance to MFT tool version to 4.18.1-16

- How to verify it
Manually tested on all Mellanox platforms (ASIC FW Upgrade, link debug tools, CPLD upgrade, etc.)
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 41c1301f0a56..d68360201556 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.17.2
-MFT_REVISION = 12
+MFT_VERSION = 4.18.1
+MFT_REVISION = 16
 
 export MFT_VERSION MFT_REVISION
 

From 304ec5b0cdc57d78105d872fca9b09f2277ac5da Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:15:20 -0800
Subject: [PATCH 1026/1674] Updated traffic scheduler settings for HWSKUs :
 DellEMC-Z9332f-O32 & DellEMC-Z9332f-M-O16C64 (#9927)

---
 files/build_templates/qos_config.j2           |   28 +-
 .../tests/sample-dell-9332-t1-minigraph.xml   | 2023 +++++++++++++++++
 .../tests/sample_output/py2/qos-dell9332.json | 1101 +++++++++
 .../tests/sample_output/py3/qos-dell9332.json | 1101 +++++++++
 src/sonic-config-engine/tests/test_j2files.py |   20 +
 5 files changed, 4272 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/tests/sample-dell-9332-t1-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json

diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index c2b0fe32bcde..5f515a07103a 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -30,7 +30,7 @@
 
 {%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
 {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
-
+{%- set apollo_resource_types = ['DL-NPU-Apollo'] -%}
 
 {
 {% if generate_tc_to_pg_map is defined %}
@@ -156,6 +156,22 @@
         }
     },
 {% endif %}
+{% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %}
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.2": {
+            "type"  : "DWRR",
+            "weight": "100"
+        }
+    },
+{% else %}
     "SCHEDULER": {
         "scheduler.0": {
             "type"  : "DWRR",
@@ -166,6 +182,7 @@
             "weight": "15"
         }
     },
+{% endif %}
 {% if asic_type in pfc_to_pg_map_supported_asics  %}
     "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
         "AZURE": {
@@ -221,12 +238,21 @@
             "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
 {% endfor %}
+{% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %}
+{% for port in PORT_ACTIVE %}
+        "{{ port }}|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+{% endfor %}
+{% else %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|4": {
             "scheduler"   : "[SCHEDULER|scheduler.1]",
             "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
 {% endfor %}
+{% endif %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|0": {
             "scheduler": "[SCHEDULER|scheduler.0]"
diff --git a/src/sonic-config-engine/tests/sample-dell-9332-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-dell-9332-t1-minigraph.xml
new file mode 100644
index 000000000000..460238486b4a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-dell-9332-t1-minigraph.xml
@@ -0,0 +1,2023 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::11</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::12</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::19</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::1A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.16</StartPeer>
+        <EndRouter>ARISTA09T2</EndRouter>
+        <EndPeer>10.0.0.17</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::21</StartPeer>
+        <EndRouter>ARISTA09T2</EndRouter>
+        <EndPeer>FC00::22</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.20</StartPeer>
+        <EndRouter>ARISTA11T2</EndRouter>
+        <EndPeer>10.0.0.21</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::29</StartPeer>
+        <EndRouter>ARISTA11T2</EndRouter>
+        <EndPeer>FC00::2A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.24</StartPeer>
+        <EndRouter>ARISTA13T2</EndRouter>
+        <EndPeer>10.0.0.25</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::31</StartPeer>
+        <EndRouter>ARISTA13T2</EndRouter>
+        <EndPeer>FC00::32</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.28</StartPeer>
+        <EndRouter>ARISTA15T2</EndRouter>
+        <EndPeer>10.0.0.29</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::39</StartPeer>
+        <EndRouter>ARISTA15T2</EndRouter>
+        <EndPeer>FC00::3A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-z9332f-01</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-z9332f-01</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.17</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.21</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.25</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.29</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA09T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA11T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA13T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA15T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.146.248/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.146.248/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-z9332f-01</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>etp1;etp2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel105</Name>
+          <AttachTo>etp3;etp4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel108</Name>
+          <AttachTo>etp5;etp6</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1011</Name>
+          <AttachTo>etp7;etp8</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1014</Name>
+          <AttachTo>etp9;etp10</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1017</Name>
+          <AttachTo>etp11;etp12</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1020</Name>
+          <AttachTo>etp13;etp14</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1023</Name>
+          <AttachTo>etp15;etp16</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp17</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp17</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp18</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp18</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp19</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp19</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp20</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp20</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp21</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp21</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>FC00::11/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp22</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp22</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp23</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp23</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>FC00::19/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp24</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp24</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp25</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp25</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>10.0.0.16/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>FC00::21/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp26</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp26</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp27</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp27</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>10.0.0.20/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>FC00::29/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp28</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp28</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp29</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp29</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>10.0.0.24/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>FC00::31/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp30</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp30</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp31</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp31</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>10.0.0.28/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>FC00::39/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>etp32</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>etp32</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp17</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp2</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp18</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp19</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp3</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp4</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp20</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp21</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp5</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp6</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp22</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp23</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp7</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp8</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp24</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp25</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp9</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp10</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp26</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp27</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp11</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp12</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp28</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp29</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp13</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp14</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp30</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp31</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp15</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp16</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-z9332f-01</StartDevice>
+        <StartPort>etp32</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>str2-z9332f-01</Hostname>
+        <HwSku>DellEMC-Z9332f-O32</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.248</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.111</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.106</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.105</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA11T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.93</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA09T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.92</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.104</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.101</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.103</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.102</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.91</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.88</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.96</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.90</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.100</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.97</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.98</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.89</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.99</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.110</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA15T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.95</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.109</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.107</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA13T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.94</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.108</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp5</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp6</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp7</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp9</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp10</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp11</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp13</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp14</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp15</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp17</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp18</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp19</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp21</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp22</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp23</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp25</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp26</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp27</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp29</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp30</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp31</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>400000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp33</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp34</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>DellEMC-Z9332f-O32</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-z9332f-01</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+          <a:Name>ResourceType</a:Name>
+          <a:Reference i:nil="true"/>
+          <a:Value>DL-NPU-Apollo</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>str2-z9332f-01</Hostname>
+  <HwSku>DellEMC-Z9332f-O32</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
new file mode 100644
index 000000000000..ce15fb715233
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
@@ -0,0 +1,1101 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.2": {
+            "type"  : "DWRR",
+            "weight": "100"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet160": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet192": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet224": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
new file mode 100644
index 000000000000..ce15fb715233
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
@@ -0,0 +1,1101 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "1"
+        },
+        "scheduler.2": {
+            "type"  : "DWRR",
+            "weight": "100"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet160": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet192": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet224": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.2]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 57bb74fb2e83..410c451625ed 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -27,6 +27,7 @@ def setUp(self):
         self.arista7050_t0_minigraph = os.path.join(self.test_dir, 'sample-arista-7050-t0-minigraph.xml')
         self.multi_asic_minigraph = os.path.join(self.test_dir, 'multi_npu_data', 'sample-minigraph.xml')
         self.multi_asic_port_config = os.path.join(self.test_dir, 'multi_npu_data', 'sample_port_config-0.ini')
+        self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml')
         self.output_file = os.path.join(self.test_dir, 'output')
 
     def run_script(self, argument):
@@ -219,6 +220,25 @@ def test_qos_arista7050_render_template(self):
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-arista7050.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
+    def test_qos_dell9332_render_template(self):
+        dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dellemc_z9332f_d1508-r0', 'DellEMC-Z9332f-O32')
+        qos_file = os.path.join(dell_dir_path, 'qos.json.j2')
+        port_config_ini_file = os.path.join(dell_dir_path, 'port_config.ini')
+
+        # copy qos_config.j2 to the Dell Z9332 directory to have all templates in one directory
+        qos_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'qos_config.j2')
+        shutil.copy2(qos_config_file, dell_dir_path)
+
+        argument = '-m ' + self.dell9332_t1_minigraph + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + self.output_file
+        self.run_script(argument)
+
+        # cleanup
+        qos_config_file_new = os.path.join(dell_dir_path, 'qos_config.j2')
+        os.remove(qos_config_file_new)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-dell9332.json')
+        assert filecmp.cmp(sample_output_file, self.output_file)
+
     def test_qos_dell6100_render_template(self):
         dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100')
         qos_file = os.path.join(dell_dir_path, 'qos.json.j2')

From 3da5c7d357180999244a98b916d64c71ae9fffbc Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 16 Feb 2022 10:31:31 -0800
Subject: [PATCH 1027/1674] [202012][sonic-platform-common] submodule update
 (#9994)

This PR updates the following commits in 202012

1f32e5c (HEAD -> 202012, origin/202012) [ycable][credo] Fix the is_link_active API for Credo Ycable (#260)
c249681 [Y-Cable][Credo] add theading locker to support thread-safe calling, add SKU check for download_firmware API.  (#222)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 93eedd04e64c..1f32e5c2dee5 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 93eedd04e64c9f658641b735092b4b54fa0b83f7
+Subproject commit 1f32e5c2dee56ecfe8209da513ca11bd737c93d1

From c7aca6ff974edfc578382ea708aafe13e8372111 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 16 Feb 2022 17:31:29 -0800
Subject: [PATCH 1028/1674] [swss]: Submodule update (#9995)

Advance SWSS submodule to include the following commit:

*081dd0118 Handle dual ToR neighbor miss scenario (#2137)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 4bff5c635cdb..081dd0118429 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 4bff5c635cdb40f8c425224171d3fbb90b67afc3
+Subproject commit 081dd01184291f1ea6c99aa7c644a45b0d4dc9d2

From b32d7eedaf13ed1da218d09f4f6aad2e732070f4 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Thu, 17 Feb 2022 08:55:01 -0800
Subject: [PATCH 1029/1674] Add emmc quirks to boot0 (#9989)

Why I did it
Fix some unreliability seen on emmc device with some AMD CPUs

How I did it
Added a kernel parameter to add quirks to
It depends on a sonic-linux-kernel change to work properly but will be a no-op without it.

Description for the changelog
Add emmc quirks for Upperlake
---
 files/Aboot/boot0.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 281cfc7fa71f..0433e32891da 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -576,6 +576,7 @@ write_platform_specific_cmdline() {
     if in_array "$platform" "crow" "magpie"; then
         cmdline_add amd_iommu=off
         cmdline_add modprobe.blacklist=snd_hda_intel,hdaudio
+        cmdline_add sdhci.append_quirks2=0x40
         read_system_eeprom
     fi
     if in_array "$platform" "woodpecker"; then
@@ -602,8 +603,8 @@ write_platform_specific_cmdline() {
     fi
 
     cmdline_add "varlog_size=$varlog_size"
-
     cmdline_add "sonic.mode=$sonic_mode"
+    cmdline_add log_buf_len=1M
 }
 
 write_image_specific_cmdline() {

From b9a3edd8b1235974c65d7ce00fb2b59de524372c Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 17 Feb 2022 16:40:15 -0800
Subject: [PATCH 1030/1674] [sonic-linux-kernel] Re-land kernel config changes
 for Cisco 8000. (#10002)

This brings in the following commit:

* 15e6f4b0a: Kernel config changes to support cisco platforms [madhava28]

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index ab7a6ed4fc6f..15e6f4b0a0ba 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit ab7a6ed4fc6fed14a5e39d8768991fd3a9a776e9
+Subproject commit 15e6f4b0a0bad2c989acb1acea8527188a67fb7a

From a23aac25d35659281993ed1ab1da3ff24d3ee8fd Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 18 Feb 2022 16:10:17 -0800
Subject: [PATCH 1031/1674] [ci/build]: Upgrade SONiC package versions (#10023)

[ci/build]: Upgrade SONiC package versions
---
 .../versions-deb-buster                       |  7 +++---
 .../build-sonic-slave-buster/versions-git     |  4 ++--
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../build-sonic-slave-buster/versions-web     |  4 ++--
 .../build-sonic-slave-stretch/versions-py2    |  2 +-
 .../build-sonic-slave-stretch/versions-web    |  4 ++--
 files/build/versions/default/versions-git     |  6 ++---
 files/build/versions/default/versions-web     |  4 +---
 .../docker-base-buster/versions-deb-buster    |  2 +-
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-base-buster/versions-py3-all-arm64 |  1 +
 .../docker-base-buster/versions-py3-all-armhf |  1 +
 .../docker-base-stretch/versions-deb-stretch  | 10 ++++----
 .../docker-config-engine-stretch/versions-py2 |  2 +-
 .../docker-dhcp-relay/versions-deb-buster     |  1 +
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../versions-py2-all-armhf                    |  1 -
 .../dockers/docker-ptf/versions-deb-stretch   | 14 +++++------
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 14 +++++------
 .../versions-py3-all-arm64                    |  1 +
 .../versions-py3-all-armhf                    |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  4 ++--
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-buster-arm64                 |  3 +++
 .../versions-deb-buster-armhf                 |  3 +++
 .../sonic-slave-buster/versions-py3-all-arm64 |  1 +
 .../sonic-slave-stretch/versions-deb-stretch  | 24 +++++++++----------
 .../versions-deb-stretch-armhf                |  3 +--
 .../versions-py3-all-arm64                    |  1 +
 .../versions/host-image/versions-deb-buster   |  8 +++----
 .../host-image/versions-deb-buster-arm64      |  2 +-
 .../host-image/versions-deb-buster-armhf      |  2 +-
 files/build/versions/host-image/versions-py2  |  2 +-
 .../host-image/versions-py2-all-armhf         |  1 -
 files/build/versions/host-image/versions-py3  |  4 ++--
 44 files changed, 86 insertions(+), 78 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 delete mode 100644 files/build/versions/host-image/versions-py2-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 4c5ae84a9261..30df3fcddc7e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -5,7 +5,7 @@ innovium-sai==0.107.2
 innovium-sai-headers==0.107.2
 iproute2-dev==1.mlnx.4.5.1208
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.17.2-12
+kernel-mft-dkms==4.18.1-16
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.3
+libsaibcm==4.3.5.3-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -42,13 +42,14 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.17.2-12
+mft==4.18.1-16
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
 sonic-dhcp6relay==1.0.0-0
+sonic-dhcpmon==1.0.0-0
 sonic-linkmgrd==1.0.0-1
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 01f741c788aa..2e868ae07dfd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==8a654f2cb8a27797859d2465263169ec97226ddd
+https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==8f2811512d526b54e81dc1993ef32101e13684fb
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index b734ea3b7f1c..494de9505774 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,4 +1,4 @@
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
 click==7.0
 docker==5.0.3
 ijson==2.6.1
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 97933870d1ab..cbc848fe5080 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index a5685d1b1790..37ea010b1827 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -4,7 +4,7 @@ future==0.18.2
 importlib-resources==3.3.1
 natsort==6.2.1
 netaddr==0.8.0
-pathlib2==2.3.6
+pathlib2==2.3.7.post1
 pyang==2.5.2
 pyangbind==0.6.0
 redis==3.5.3
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 9674bfcf0b66..e714f2c4947e 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A20%3A23Z&se=2037-01-21T07%3A20%3A00Z&sr=b&sp=r&sig=cNpi1ooWSSJW%2FcxjUTKxMgQ%2FM%2FOO6AE%2BG8UYcTA%2FxVA%3D==1af45d911563f5218dfd8f88af4f678b
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3_amd64.deb?sv=2020-10-02&st=2022-01-20T07%3A18%3A38Z&se=2037-01-21T07%3A18%3A00Z&sr=b&sp=r&sig=Xc%2B21qOoubU55yoOL7S98Ry%2BHPij2Hbp3p5kNmDPl9U%3D==6e4cfcbc59aa59888c568904c3ba21fa
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 20a7a35e760e..084d17dd351e 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,9 +1,9 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1b93e14c92416185694f8764be425f82fa0d4242
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==988c0af5bed05e97d351297ed9f3221bfe42a205
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==8a654f2cb8a27797859d2465263169ec97226ddd
+https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==8f2811512d526b54e81dc1993ef32101e13684fb
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e0dfabf61325..087f8dcfb0b0 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -14,7 +14,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.17.2-12-x86_64-deb.tgz==2b858b5da082f8aefacdd7124f4f40a3
+http://www.mellanox.com/downloads/MFT/mft-4.18.1-16-x86_64-deb.tgz==a62f2b0b9a29c3af1cf2dcbb6e051413
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index bd661e61ca8a..ee67e51b8087 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -7,7 +7,7 @@ libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdbus-1-3==1.12.20-0+deb10u1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u1
+libexpat1==2.2.6-2+deb10u2
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 969e8edb0f58..06d3e7888a36 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,6 +1,6 @@
 j2cli==0.3.10
 jinja2==3.0.3
-markupsafe==2.0.1
+markupsafe==2.1.0
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
 toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64 b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..63fb15bbfec3
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
@@ -0,0 +1 @@
+markupsafe==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf b/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..63fb15bbfec3
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+markupsafe==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index b7c0eab7307b..8de6397f60a1 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -33,9 +33,9 @@ libpgm-5.2-0==5.2.122~dfsg-2
 libprocps6==2:3.3.12-3+deb9u1
 libpsl5==0.17.0-3
 libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u5
-libpython2.7-minimal==2.7.13-2+deb9u5
-libpython2.7-stdlib==2.7.13-2+deb9u5
+libpython2.7==2.7.13-2+deb9u6
+libpython2.7-minimal==2.7.13-2+deb9u6
+libpython2.7-stdlib==2.7.13-2+deb9u6
 libreadline7==7.0-3
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
@@ -60,8 +60,8 @@ python==2.7.13-2
 python-minimal==2.7.13-2
 python-pip==9.0.1-2+deb9u2
 python-pip-whl==9.0.1-2+deb9u2
-python2.7==2.7.13-2+deb9u5
-python2.7-minimal==2.7.13-2+deb9u5
+python2.7==2.7.13-2+deb9u6
+python2.7-minimal==2.7.13-2+deb9u6
 readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index dd18005713df..c0701b494002 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -6,7 +6,7 @@ ipaddress==1.0.23
 lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
-pathlib2==2.3.6
+pathlib2==2.3.7.post1
 pyang==2.5.2
 pyangbind==0.6.0
 pyyaml==5.4.1
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index c63048430ffa..d6169202a35a 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -25,6 +25,7 @@ openssh-client==1:7.9p1-10+deb10u2
 sonic-dhcp6relay==1.0.0-0
 sonic-dhcp6relay-dbgsym==1.0.0-0
 sonic-dhcpmon==1.0.0-0
+sonic-dhcpmon-dbgsym==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
 vim==2:8.1.0875-5
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 62ca4befcc27..1b509f826998 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 62ca4befcc27..1b509f826998 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 1ce46b44487d..22f3c0cbcebf 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -11,7 +11,7 @@ lxml==4.6.3
 markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
-pathlib2==2.3.6
+pathlib2==2.3.7.post1
 pyang==2.5.2
 pyangbind==0.6.0
 python-sdk-api==4.5.1208
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
deleted file mode 100644
index b776ad0b4fbd..000000000000
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-pathlib2==2.3.7.post0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index c18b6813c42e..e6942c423d1e 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -131,10 +131,10 @@ libproxy1v5==0.4.14-2+deb9u2
 libpsl5==0.17.0-3
 libpython-dev==2.7.13-2
 libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u5
-libpython2.7-dev==2.7.13-2+deb9u5
-libpython2.7-minimal==2.7.13-2+deb9u5
-libpython2.7-stdlib==2.7.13-2+deb9u5
+libpython2.7==2.7.13-2+deb9u6
+libpython2.7-dev==2.7.13-2+deb9u6
+libpython2.7-minimal==2.7.13-2+deb9u6
+libpython2.7-stdlib==2.7.13-2+deb9u6
 libqt5core5a==5.7.1+dfsg-3+deb9u3
 libqt5dbus5==5.7.1+dfsg-3+deb9u3
 libqt5network5==5.7.1+dfsg-3+deb9u3
@@ -209,9 +209,9 @@ python-saithrift==0.9.4
 python-scapy==2.3.3-1
 python-six==1.10.0-3
 python-thrift==0.11.0-4
-python2.7==2.7.13-2+deb9u5
-python2.7-dev==2.7.13-2+deb9u5
-python2.7-minimal==2.7.13-2+deb9u5
+python2.7==2.7.13-2+deb9u6
+python2.7-dev==2.7.13-2+deb9u6
+python2.7-minimal==2.7.13-2+deb9u6
 qttranslations5-l10n==5.7.1~20161021-1
 readline-common==7.0-3
 rename==0.20-4
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 70c318d09db3..2d070ca8beae 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -26,7 +26,7 @@ netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
 paramiko==2.9.2
-pathlib2==2.3.6
+pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
 pickleshare==0.7.5
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 1bd84526cf36..7b75de9d7a67 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,17 +1,17 @@
 attrs==21.4.0
 certifi==2017.4.17
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
 click==8.0.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.0.2
-grpcio==1.43.0
+flask==2.0.3
+grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.10.1
+importlib-metadata==4.11.1
 importlib-resources==5.4.0
 inflection==0.5.1
-itsdangerous==2.0.1
+itsdangerous==2.1.0
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
@@ -20,7 +20,7 @@ pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
-typing_extensions==4.0.1
+typing_extensions==4.1.1
 urllib3==1.21.1
-werkzeug==2.0.2
+werkzeug==2.0.3
 zipp==3.7.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
new file mode 100644
index 000000000000..b8ee0a3a363b
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
@@ -0,0 +1 @@
+itsdangerous==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
index e503079c1bef..b8ee0a3a363b 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
@@ -1 +1 @@
-werkzeug==2.0.3
\ No newline at end of file
+itsdangerous==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index a9fa5f6b678c..7cbaab2ee705 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2021.10.8
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
 click==7.0
 idna==3.3
 ijson==2.6.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 326dfb9a0a1d..a9181adafcae 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index d57b774f1120..968522a32d63 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index d8a854e40010..2697032e94b3 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.3
+libsaibcm==4.3.5.3-1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 1e5015552a68..2961f83e3752 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index ef4e067538ec..bac67956628f 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 2aa3551cf2fa..c8a4e7e24b8f 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -11,7 +11,7 @@ libc6-dev==2.28-10
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u2
@@ -33,7 +33,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.208-1
-mft==4.17.2-12
+mft==4.18.1-16
 mlnx-sai==1.mlnx.SAIRel1.20.2.6
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index aa77e8ed5d65..bd4b60b6f702 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u2
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 96b3426b7fd4..77cc88975753 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,7 +1,10 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+expat==2.2.6-2+deb10u2
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
+libexpat1==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u2
 libpolkit-agent-1-0==0.105-25+deb10u1
 libpolkit-backend-1-0==0.105-25+deb10u1
 libpolkit-gobject-1-0==0.105-25+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index e0041e2d5c06..f9d0e2aa85c2 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,4 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+expat==2.2.6-2+deb10u2
 libalgorithm-c3-perl==0.10-1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
@@ -19,6 +20,8 @@ libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
 libeval-closure-perl==0.14-1
 libexception-class-perl==1.44-1
+libexpat1==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u2
 libgles2-mesa-dev==18.3.6-2+deb10u1
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..9f5f6f8caa97
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1 @@
+bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index daa0a7b6b83f..2a9e0fd288c8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -823,10 +823,10 @@ libpulse0==10.0-1+deb9u1
 libpython-all-dev==2.7.13-2
 libpython-dev==2.7.13-2
 libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u5
-libpython2.7-dev==2.7.13-2+deb9u5
-libpython2.7-minimal==2.7.13-2+deb9u5
-libpython2.7-stdlib==2.7.13-2+deb9u5
+libpython2.7==2.7.13-2+deb9u6
+libpython2.7-dev==2.7.13-2+deb9u6
+libpython2.7-minimal==2.7.13-2+deb9u6
+libpython2.7-stdlib==2.7.13-2+deb9u6
 libpython3-all-dbg==3.5.3-1
 libpython3-all-dev==3.5.3-1
 libpython3-dbg==3.5.3-1
@@ -1170,10 +1170,10 @@ ncurses-term==6.0+20161126-1+deb9u2
 netbase==5.4
 netpbm==2:10.0-15.3+b2
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u312-b07-1~deb9u1
-openjdk-8-jdk-headless==8u312-b07-1~deb9u1
-openjdk-8-jre==8u312-b07-1~deb9u1
-openjdk-8-jre-headless==8u312-b07-1~deb9u1
+openjdk-8-jdk==8u322-b06-1~deb9u1
+openjdk-8-jdk-headless==8u322-b06-1~deb9u1
+openjdk-8-jre==8u322-b06-1~deb9u1
+openjdk-8-jre-headless==8u322-b06-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
@@ -1317,9 +1317,9 @@ python-wheel==0.29.0-2
 python-wrapt==1.9.0-2
 python-xdg==0.25-4+deb9u1
 python-zope.interface==4.3.2-1
-python2.7==2.7.13-2+deb9u5
-python2.7-dev==2.7.13-2+deb9u5
-python2.7-minimal==2.7.13-2+deb9u5
+python2.7==2.7.13-2+deb9u6
+python2.7-dev==2.7.13-2+deb9u6
+python2.7-minimal==2.7.13-2+deb9u6
 python3==3.5.3-1
 python3-alabaster==0.7.8-1
 python3-all==3.5.3-1
@@ -1476,7 +1476,7 @@ xml-core==0.17
 xmlto==0.0.28-1
 xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
-xterm==327-2+deb9u2
+xterm==327-2+deb9u3
 xtrans-dev==1.3.5-1
 xxd==2:8.0.0197-4+deb9u4
 xz-utils==5.2.2-1.2+b1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 23a0bc8036a7..72efab7ee1a5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -19,5 +19,4 @@ libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
 nodejs==10.24.1-1nodesource1
-policykit-1==0.105-18+deb9u2
-xterm==327-2+deb9u3
\ No newline at end of file
+policykit-1==0.105-18+deb9u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
new file mode 100644
index 000000000000..9f5f6f8caa97
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
@@ -0,0 +1 @@
+bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index e0cbf15f9266..9e4caf8ac465 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -60,7 +60,7 @@ iputils-ping==3:20180629-2+deb10u2
 isc-dhcp-client==4.4.1-2+deb10u1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.17.2
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.1
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
@@ -87,7 +87,7 @@ libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u1
+libexpat1==2.2.6-2+deb10u2
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
@@ -184,8 +184,8 @@ lsb-base==10.2019051400
 lsb-release==10.2019051400
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.17.2-12
-mft-oem==4.17.2-12
+mft==4.18.1-16
+mft-oem==4.18.1-16
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 1164fbc4f79d..df573d4be7cd 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,7 +1,7 @@
 icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libcryptsetup12==2:2.3.5-1~bpo10+1
+libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index a6be45ae44ad..1cbfd81fb567 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,7 +1,7 @@
 icu-devtools==63.1-6+deb10u2
 libc-dev-bin==2.28-10
 libc6-dev==2.28-10
-libcryptsetup12==2:2.3.5-1~bpo10+1
+libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index bbc826068de8..2b44c4da77d1 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -12,7 +12,7 @@ lxml==4.6.3
 markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
-pathlib2==2.3.6
+pathlib2==2.3.7.post1
 pyang==2.5.2
 pyangbind==0.6.0
 python-apt==1.8.4.3
diff --git a/files/build/versions/host-image/versions-py2-all-armhf b/files/build/versions/host-image/versions-py2-all-armhf
deleted file mode 100644
index b776ad0b4fbd..000000000000
--- a/files/build/versions/host-image/versions-py2-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-pathlib2==2.3.7.post0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 58b99a6362d6..b2f6a2b04265 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
 click==7.0
 cryptography==36.0.1
 docker==4.3.1
@@ -17,7 +17,7 @@ jsondiff==1.3.1
 jsonschema==2.6.0
 lxml==4.6.3
 m2crypto==0.38.0
-markupsafe==2.0.1
+markupsafe==2.1.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0

From a564fc8a6ea4b6a839c3b73a5e74d3192d64ef81 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 19 Feb 2022 12:16:50 +0800
Subject: [PATCH 1032/1674] [Build]: Fix marvell sai package version parsing
 issue

Fix marvell sai package version parsing issue (#10009)
---
 platform/marvell-armhf/sai.mk       | 3 ++-
 platform/marvell-armhf/sai/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index fbdd6992db16..f3cc58f43938 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,7 +1,8 @@
 # Marvell SAI
 
 export MRVL_SAI_VERSION = 1.7.1-6
-export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
+export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
+export MRVL_SAI_PACKAGE = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
 $(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV)))
diff --git a/platform/marvell-armhf/sai/Makefile b/platform/marvell-armhf/sai/Makefile
index cf78504388c6..a6199f595448 100644
--- a/platform/marvell-armhf/sai/Makefile
+++ b/platform/marvell-armhf/sai/Makefile
@@ -2,7 +2,7 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI)
+MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI_PACKAGE)
 
 $(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% :
 	# get deb package

From 7a35504ff7d4f22b676ddd41fb7df2a23c227484 Mon Sep 17 00:00:00 2001
From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com>
Date: Sun, 20 Feb 2022 12:42:39 +0200
Subject: [PATCH 1033/1674] [202012] [CoPP] Add always_enabled field (#9999)

Add the "always_enabled" field to copp_cfg.j2 file, in order to allow traps without an entry in features table, to be installed automatically.

This is a cherry-pick of https://github.com/Azure/sonic-buildimage/pull/9302

- Why I did it
In order to allow traps without an entry in features table, to be installed automatically.

- How I did it
Add always_enabled field to traps without a feature
---
 files/image_config/copp/copp_cfg.j2 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
index 61f051f43de8..ab9ce2776caf 100755
--- a/files/image_config/copp/copp_cfg.j2
+++ b/files/image_config/copp/copp_cfg.j2
@@ -13,7 +13,7 @@
 		    "trap_priority":"4",
 		    "queue": "4"
 	    },
-	    "queue4_group2": {            
+	    "queue4_group2": {
 		    "trap_action":"copy",
 		    "trap_priority":"4",
 		    "queue": "4",
@@ -69,11 +69,13 @@
 	    },
 	    "lacp": {
 		    "trap_ids": "lacp",
-		    "trap_group": "queue4_group1"
+		    "trap_group": "queue4_group1",
+		    "always_enabled": "true"
 	    },
 	    "arp": {
 		    "trap_ids": "arp_req,arp_resp,neigh_discovery",
-		    "trap_group": "queue4_group2"
+		    "trap_group": "queue4_group2",
+		    "always_enabled": "true"
 	    },
 	    "lldp": {
 		    "trap_ids": "lldp",
@@ -87,11 +89,13 @@
 {% endif %}
 	    "udld": {
 		    "trap_ids": "udld",
-		    "trap_group": "queue4_group3"
+		    "trap_group": "queue4_group3",
+		    "always_enabled": "true"
 	    },
 	    "ip2me": {
 		    "trap_ids": "ip2me",
-		    "trap_group": "queue1_group1"
+		    "trap_group": "queue1_group1",
+		    "always_enabled": "true"
 	    },
 	    "nat": {
 		    "trap_ids": "src_nat_miss,dest_nat_miss",

From b4e8bcc19c0e1628b1f5f3ba491dac51c37acd1a Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Tue, 22 Feb 2022 09:55:23 +0800
Subject: [PATCH 1034/1674] Generate sai.profile from j2 tempalte when
 saiserver start (#10045)

Generate the sai.profile base on the brcm j2 file if the sai.profile
is not existing in the dut mounted folder.
Change the supervisor service configuration accordingly.

Testing done:
Add the script and config in dut
saiservice server can start automatically with [systemctl start saiserver]

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 .../broadcom/docker-saiserver-brcm/start.sh   | 27 +++++++++++++++++++
 .../docker-saiserver-brcm/supervisord.conf    |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/platform/broadcom/docker-saiserver-brcm/start.sh b/platform/broadcom/docker-saiserver-brcm/start.sh
index 494c0e9126c2..81813b57ff9d 100755
--- a/platform/broadcom/docker-saiserver-brcm/start.sh
+++ b/platform/broadcom/docker-saiserver-brcm/start.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+HWSKU_DIR=/usr/share/sonic/hwsku
 
 start_bcm()
 {
@@ -7,11 +8,37 @@ start_bcm()
     [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0
 }
 
+generate_profile()
+{
+    # There are two ways to specify the contents of the SAI_INIT_CONFIG_FILE and they are mutually exclusive
+    # via current method (sai.profile.j2) or new method (config.bcm.j2)
+    # If delta is large, use sai.profile.j2 which basically require the user to select which config file to use
+    # If delta is small, use config.bcm.j2 where additional SAI INIT config properties are added
+    #   based on specific device metadata requirement
+    #   in this case sai.profile should have been modified to use the path /etc/sai.d/config.bcm
+    # There is also a possibility that both sai.profile.j2 and config.bcm.j2 are absent.  in that cacse just copy
+    # sai.profile to the new /etc/said directory.
+
+    # Create/Copy the sai.profile to /etc/sai.d/sai.profile
+    mkdir -p /etc/sai.d/
+
+    if [ -f $HWSKU_DIR/sai.profile.j2 ]; then
+        sonic-cfggen -d -t $HWSKU_DIR/sai.profile.j2 > /etc/sai.d/sai.profile
+    else
+        if [ -f $HWSKU_DIR/config.bcm.j2 ]; then
+            sonic-cfggen -d -t $HWSKU_DIR/config.bcm.j2 > /etc/sai.d/config.bcm
+        fi
+        if [ -f $HWSKU_DIR/sai.profile ]; then
+            cp $HWSKU_DIR/sai.profile /etc/sai.d/sai.profile
+        fi
+    fi
+}
 
 rm -f /var/run/rsyslogd.pid
 
 supervisorctl start rsyslogd
 
+generate_profile
 start_bcm
 
 supervisorctl start saiserver
diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
index ccb107b3d1f8..3574cd782b78 100644
--- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf
+++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
@@ -20,7 +20,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
-command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
+command=/usr/sbin/saiserver -p /etc/sai.d/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
 priority=3
 autostart=false
 autorestart=false

From f2e677db34e07d7cb539a71b739edde87aeb701c Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 22 Feb 2022 08:38:39 -0800
Subject: [PATCH 1035/1674] Revert "[build]: Use zstd compression for base
 filesystem squashfs" (#10030)

When upgrading from an older image (with an older kernel that doesn't
support zstd) to 202012, the squashfs filesystem from the 202012 image
can't be mounted on the older image, because zstd was introduced in
4.14, and older images will likely be running 4.9.

Therefore, disable zstd compression in the squashfs image for 202012
image. When upgrading from 202012 to newer images, since 202012 is
running on 4.19, it can read and mount zstd-compressed squashfs images.

# Why this was done

The kernel in 201811 image (4.9 kernel) doesn't support zstd. In some cases,
it may be needed to mount the squashfs image from the new image while
the current (old) image is booted. If the squashfs image is compressed with
zstd, then it cannot be mounted on a 4.9 kernel, because zstd was introduced
in 4.14.

This reverts commit 35e88e5f6a743422496d79540e46e4cb464186be.
---
 build_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index fa2ef041cf4c..6ec8abd0c604 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -586,7 +586,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
-sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
+sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 
 # Ensure admin gid is 1000
 gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"

From 6752e2131d22f34ee7ee7cf7271f506c89893cda Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 2 Feb 2022 17:30:55 +0530
Subject: [PATCH 1036/1674] [Dell S6100] Addition of 10G ports (#9906)

---
 .../Force10-S6100/th-s6100-64x40G-t0.config.bcm            | 7 +++++++
 .../Force10-S6100/th-s6100-64x40G-t1.config.bcm            | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
index c7540e2d2a4d..e1eb6968df68 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t0.config.bcm
@@ -34,6 +34,8 @@ os=unix
 parity_correction=1
 parity_enable=1
 
+port_phy_addr_66=0x176
+port_phy_addr_100=0x177
 xgxs_tx_lane_map_104=0x3210
 xgxs_rx_lane_map_104=0x0312
 phy_xaui_tx_polarity_flip_104=0x0
@@ -345,6 +347,9 @@ phy_xaui_rx_polarity_flip_79=0x3
 dport_map_port_78=63
 dport_map_port_79=64
 pbmp_xport_xe=0x3fffd0000ffff40003fffc0001fffe
+
+portmap_66=129:10
+portmap_100=131:10
 portmap_33=132:10
 portmap_67=133:10
 portmap_101=134:10
@@ -413,5 +418,7 @@ portmap_114=121:40:2
 portmap_115=123:40:2
 portmap_116=125:40:2
 portmap_117=127:40:2
+dport_map_port_66=65
+dport_map_port_100=66
 
 mmu_init_config="MSFT-TH-Tier0"
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
index 8506209fb1e8..87c90323d5b1 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
@@ -34,6 +34,8 @@ os=unix
 parity_correction=1
 parity_enable=1
 
+port_phy_addr_66=0x176
+port_phy_addr_100=0x177
 xgxs_tx_lane_map_104=0x3210
 xgxs_rx_lane_map_104=0x0312
 phy_xaui_tx_polarity_flip_104=0x0
@@ -345,6 +347,9 @@ phy_xaui_rx_polarity_flip_79=0x3
 dport_map_port_78=63
 dport_map_port_79=64
 pbmp_xport_xe=0x3fffd0000ffff40003fffc0001fffe
+
+portmap_66=129:10
+portmap_100=131:10
 portmap_33=132:10
 portmap_67=133:10
 portmap_101=134:10
@@ -413,5 +418,7 @@ portmap_114=121:40:2
 portmap_115=123:40:2
 portmap_116=125:40:2
 portmap_117=127:40:2
+dport_map_port_66=65
+dport_map_port_100=66
 
 mmu_init_config="MSFT-TH-Tier1"

From 331db09f8894d46afe5b9ff3d0ba470a48929e6f Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 16 Feb 2022 13:39:05 +0530
Subject: [PATCH 1037/1674] Dell S6100: Addition of 10G ports (#9988)

---
 .../Force10-S6100/port_config.ini                         | 2 ++
 .../tests/sample_output/py2/buffers-dell6100.json         | 8 +++++---
 .../tests/sample_output/py3/buffers-dell6100.json         | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/port_config.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/port_config.ini
index 1922a3e04b5a..54809b2c957a 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/port_config.ini
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/port_config.ini
@@ -63,3 +63,5 @@ Ethernet60      81,82     fortyGigE1/4/13    60      40000
 Ethernet61      83,84     fortyGigE1/4/14    61      40000
 Ethernet62      85,86     fortyGigE1/4/15    62      40000
 Ethernet63      87,88     fortyGigE1/4/16    63      40000
+Ethernet64      129       tenGigE1/1         64      10000
+Ethernet65      131       tenGigE1/2         65      10000
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
index 56de7500c1ad..4636c383822c 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
@@ -13,10 +13,11 @@
             "Ethernet4": "5m",
             "Ethernet5": "5m",
             "Ethernet46": "5m",
-            "Ethernet34": "5m",
+            "Ethernet29": "5m",
             "Ethernet22": "5m",
             "Ethernet58": "5m",
             "Ethernet59": "5m",
+            "Ethernet28": "5m",
             "Ethernet50": "5m",
             "Ethernet51": "5m",
             "Ethernet52": "5m",
@@ -41,6 +42,7 @@
             "Ethernet32": "5m",
             "Ethernet33": "5m",
             "Ethernet30": "5m",
+            "Ethernet34": "5m",
             "Ethernet31": "5m",
             "Ethernet49": "5m",
             "Ethernet48": "5m",
@@ -52,8 +54,8 @@
             "Ethernet42": "5m",
             "Ethernet41": "5m",
             "Ethernet40": "5m",
-            "Ethernet29": "5m",
-            "Ethernet28": "5m",
+            "Ethernet65": "5m",
+            "Ethernet64": "5m",
             "Ethernet61": "5m",
             "Ethernet60": "5m",
             "Ethernet63": "5m",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
index 39fb042cc4cb..a292c00b19d8 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
@@ -65,7 +65,9 @@
             "Ethernet60": "5m",
             "Ethernet61": "5m",
             "Ethernet62": "5m",
-            "Ethernet63": "5m"
+            "Ethernet63": "5m",
+            "Ethernet64": "5m",
+            "Ethernet65": "5m"
         }
     },
 

From 38f5e3bc668f55d113dce643c92d8467dfb44a36 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Fri, 18 Feb 2022 17:48:50 +0800
Subject: [PATCH 1038/1674] [PTF-SAIv2]Add ptf docker for sai-ptf (saiv2)
 (#9729)

* [PTF-SAIv2]Add ptf dockre for sai-ptf (saiv2)

Base on current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz

* upgrade the thrift to 014
---
 dockers/docker-ptf-sai/Dockerfile.j2 | 40 ++++++++++++++++++++++++++++
 platform/vs/docker-ptf-sai.dep       |  8 ++++++
 platform/vs/docker-ptf-sai.mk        |  9 +++++++
 platform/vs/rules.dep                |  1 +
 platform/vs/rules.mk                 |  1 +
 5 files changed, 59 insertions(+)
 create mode 100644 dockers/docker-ptf-sai/Dockerfile.j2
 create mode 100644 platform/vs/docker-ptf-sai.dep
 create mode 100644 platform/vs/docker-ptf-sai.mk

diff --git a/dockers/docker-ptf-sai/Dockerfile.j2 b/dockers/docker-ptf-sai/Dockerfile.j2
new file mode 100644
index 000000000000..f42d04c1cd07
--- /dev/null
+++ b/dockers/docker-ptf-sai/Dockerfile.j2
@@ -0,0 +1,40 @@
+{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
+FROM docker-ptf
+
+# Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set the apt source, update package cache and install necessary packages
+RUN apt-get update              \
+    && apt-get upgrade -y       \
+    && apt-get dist-upgrade -y  \
+    && apt-get install -y       \
+    python3-pip             
+
+RUN pip3 install crc16          \
+        netifaces               \
+        getmac                  \
+        packet_helper           \
+        psutil                  \
+        scapy==2.4.4            \
+        scapy_helper            \
+        pysubnettree
+
+COPY \
+{% for deb in docker_ptf_sai_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%} 
+debs/
+
+RUN dpkg -i \
+{% for deb in docker_ptf_sai_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+# Remove old ptf package
+RUN dpkg -r python-ptf
+
+# Install new ptf package
+RUN git clone https://github.com/p4lang/ptf.git \
+        && cd ptf                               \
+        && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
diff --git a/platform/vs/docker-ptf-sai.dep b/platform/vs/docker-ptf-sai.dep
new file mode 100644
index 000000000000..697dc3b3cdcb
--- /dev/null
+++ b/platform/vs/docker-ptf-sai.dep
@@ -0,0 +1,8 @@
+DPATH       := $($(DOCKER_PTF_SAI)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/vs/docker-ptf-sai.mk platform/vs/docker-ptf-sai.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_PTF_SAI)_CACHE_MODE  := GIT_CONTENT_SHA
+$(DOCKER_PTF_SAI)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_PTF_SAI)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/vs/docker-ptf-sai.mk b/platform/vs/docker-ptf-sai.mk
new file mode 100644
index 000000000000..d3463c5a0930
--- /dev/null
+++ b/platform/vs/docker-ptf-sai.mk
@@ -0,0 +1,9 @@
+# docker image for docker-ptf-sai
+
+DOCKER_PTF_SAI = docker-ptf-sai.gz
+DOCKER_PTF_BASE = docker-ptf.gz
+$(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai
+$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
+$(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI)
+SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI)
diff --git a/platform/vs/rules.dep b/platform/vs/rules.dep
index 0d485e8004d1..44c863612992 100644
--- a/platform/vs/rules.dep
+++ b/platform/vs/rules.dep
@@ -4,6 +4,7 @@ include $(PLATFORM_PATH)/docker-sonic-vs.dep
 include $(PLATFORM_PATH)/docker-syncd-vs.dep
 include $(PLATFORM_PATH)/docker-gbsyncd-vs.dep
 include $(PLATFORM_PATH)/docker-ptf.dep
+include $(PLATFORM_PATH)/docker-ptf-sai.dep
 include $(PLATFORM_PATH)/libsaithrift-dev.dep
 include $(PLATFORM_PATH)/one-image.dep
 include $(PLATFORM_PATH)/onie.dep
diff --git a/platform/vs/rules.mk b/platform/vs/rules.mk
index cbb52847edfa..461c3f84dd02 100644
--- a/platform/vs/rules.mk
+++ b/platform/vs/rules.mk
@@ -4,6 +4,7 @@ include $(PLATFORM_PATH)/docker-sonic-vs.mk
 include $(PLATFORM_PATH)/docker-syncd-vs.mk
 include $(PLATFORM_PATH)/docker-gbsyncd-vs.mk
 include $(PLATFORM_PATH)/docker-ptf.mk
+include $(PLATFORM_PATH)/docker-ptf-sai.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/onie.mk

From 179c140ec893618d4f2d3393de4a1583d2417ce1 Mon Sep 17 00:00:00 2001
From: Xin Wang <xiwang5@microsoft.com>
Date: Wed, 23 Feb 2022 10:33:34 +0800
Subject: [PATCH 1039/1674] Fix issue of parsing syseeprom value with
 whitespace in middle (#10021)

Fixes #10020

Why I did it
The platform api for parsing syseeprom information read from STATE DB has issue
with parsing the value part that has whitespace in the middle. The current
code assumes that the value part does not have whitespace. So everything after
the whitespace will be ignored. The syseeprom values returned from platform
API do not match the output of "show platform syseeprom".

How I did it
This change improved the regular expression for parsing syseeprom values to
accommodate whitespaces in the value.

How to verify it
Locally updated the code on a dx010 device. Call the platform API:
```
>>> import sonic_platform
>>> platform = sonic_platform.platform.Platform()
>>> chassis = platform.get_chassis()
>>> chassis.get_system_eeprom_info()
{'0x21': 'DX010', '0x22': 'R0872-F0020-02', '0x23': 'DX010B2F030A27BY200002', '0x24': '00:E0:EC:E7:71:0F', '0x25': '11/03/2020 21:22:56', '0x26': '3', '0x27': 'Seastone', '0x28': 'RANGELEY', '0x29': '2014.08', '0x2A': '131', '0x2B': 'CELESTICA', '0x2C': 'THA', '0x2D': 'Celestica', '0x2E': '1.0.5', '0x2F': 'LB', '0xFD': '', '0xFE': '0xAAB39BDB'}
```

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
---
 .../services/platform_api/sonic_platform/eeprom.py              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/eeprom.py b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/eeprom.py
index 7756c0f2f839..1e06e7b80e62 100644
--- a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/eeprom.py
+++ b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/eeprom.py
@@ -45,7 +45,7 @@ def _parse_output(self, decode_output):
         for line in lines:
             try:
                 match = re.search(
-                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)(.*$)', line)
                 if match is not None:
                     idx = match.group(1)
                     value = match.group(3).rstrip('\0')

From 9e51fada45c083119961b2b9ac6b55710b9453d7 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Thu, 24 Feb 2022 16:27:31 +0800
Subject: [PATCH 1040/1674] Update cisco-8000 ref to release: 202012-v0.94
 (#10080)

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index ef61c1894ff3..dc19dbf223ea 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.91
+ref=202012-v0.94

From 39d47f2ea443f2d56b31301d65c10b1b4e40fb19 Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <47282725+renukamanavalan@users.noreply.github.com>
Date: Thu, 24 Feb 2022 15:26:56 -0800
Subject: [PATCH 1041/1674] Send bad password log to /var/log/syslog and
 include user info in the log (#10032)

Why I did it
Desired the log message destination to be syslog and it misses the critical info.

How I did it
Non logical code changes only.
Logging update, just for one message only
a) The log message is directed to /var/log/syslog, instead of /var/log/auth.log
b) Include user alias in the message

How to verify it
Pick a user alias that has not logged into the switch yet
Add this alias to /etc/tacplus_user
Attempt to login as that user
Look for the error message in /var/log/syslog
e.g. "Feb 18 19:16:41.592191 sonic ERR sshd[5233]: auth fail: Password incorrect. user: user_xyz"
---
 src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch b/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
index 36a96da77ac5..995f3ed9f324 100644
--- a/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
+++ b/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
@@ -1,6 +1,6 @@
-From f2687e7a442c83e19190695021fb9a60fe07ba60 Mon Sep 17 00:00:00 2001
+From 4ef102dfa137c2c6e3dd63c2d16f2966b6f5add8 Mon Sep 17 00:00:00 2001
 From: Renuka Manavalan <remanava@microsoft.com>
-Date: Wed, 17 Nov 2021 02:31:45 +0000
+Date: Fri, 18 Feb 2022 22:07:24 +0000
 Subject: [PATCH] handle bad password set by sshd
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH] handle bad password set by sshd
  4 files changed, 49 insertions(+), 4 deletions(-)
 
 diff --git a/pam_tacplus.c b/pam_tacplus.c
-index ec8ea27..014421b 100644
+index ec8ea27..2421874 100644
 --- a/pam_tacplus.c
 +++ b/pam_tacplus.c
 @@ -251,6 +251,13 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
@@ -19,7 +19,7 @@ index ec8ea27..014421b 100644
      }
  
 +    if (validate_not_sshd_bad_pass(pass) != PAM_SUCCESS) {
-+        syslog(LOG_ERR, "auth fail: Password incorrect");
++        syslog(LOG_LOCAL0|LOG_ERR, "auth fail: Password incorrect. user: %s", user);
 +        memset(pass, 0, strlen (pass));
 +        free(pass);
 +        return PAM_AUTH_ERR;

From 2a7378b8c44fd3b9d7c7ae7386cf46f602fb8ac3 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 25 Feb 2022 08:59:57 +0800
Subject: [PATCH 1042/1674] [Security]: Upgrade urllib3 to fix CVE-2021-33503

See https://security.archlinux.org/CVE-2021-33503
---
 dockers/docker-sonic-mgmt-framework/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
index 5ee8cae84466..dca399f23f20 100644
--- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
@@ -29,7 +29,7 @@ RUN pip3 install connexion==2.7.0 \
                  certifi==2017.4.17 \
                  python-dateutil==2.6.0 \
                  six==1.11.0 \
-                 urllib3==1.21.1
+                 urllib3==1.26.5
 
 COPY \
 {% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%}

From b48d6d08efce4a8a1783eb9223954cd8e6f4de63 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 24 Feb 2022 17:29:59 +0800
Subject: [PATCH 1043/1674] [system-health] Fix file handle leak (#10059)

- Why I did it
swsscommon.ConfigDBConnector does not automatically close connection when the instance is recycled by python. So, it should not create this instance each time calling check_services. It will cause error like Failed to read from file /var/run/hw-management/led/led_status_capability - OSError(24, 'Too many open files')

- How I did it
Only connect DB once in init

- How to verify it
Manual test
---
 src/system-health/health_checker/service_checker.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/system-health/health_checker/service_checker.py b/src/system-health/health_checker/service_checker.py
index 171f7e2e8b4d..b3c6fbc4120e 100644
--- a/src/system-health/health_checker/service_checker.py
+++ b/src/system-health/health_checker/service_checker.py
@@ -51,6 +51,8 @@ def __init__(self):
 
         self.need_save_cache = False
 
+        self.config_db = None
+
         self.load_critical_process_cache()
 
     def get_expected_running_containers(self, feature_table):
@@ -248,9 +250,10 @@ def check_services(self, config):
         Args:
             config (config.Config): Health checker configuration.
         """
-        config_db = swsscommon.ConfigDBConnector()
-        config_db.connect()
-        feature_table = config_db.get_table("FEATURE")
+        if not self.config_db:
+            self.config_db = swsscommon.ConfigDBConnector()
+            self.config_db.connect()
+        feature_table = self.config_db.get_table("FEATURE")
         expected_running_containers, self.container_feature_dict = self.get_expected_running_containers(feature_table)
         current_running_containers = self.get_current_running_containers()
 

From c3ede8eb5d3a83c11a14d24b8c6c0bd4354a94f9 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 24 Feb 2022 10:06:43 -0800
Subject: [PATCH 1044/1674] Fix Headroom value for 7260C64 SKU (#10075)

Updated the Headroom value for (100G,5m) in 7260C64 SKU.
---
 .../Arista-7260CX3-C64/pg_profile_lookup.ini                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
index cbc06c818062..0e71479fc2c2 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
@@ -1,6 +1,6 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 96928     -3        2496
+ 100000  5m   1248    1248 54080     -3        2496
  100000  40m  1248    1248 59696     -3        2496
  100000  300m 1248    1248 101088    -3        2496
   40000  5m   1248    1248 29536     -3        2496

From 4d1abbc09b843e2c87984dca940df3a60cde598f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Thu, 24 Feb 2022 14:55:45 -0800
Subject: [PATCH 1045/1674] [write_standby]: Increase timeout to 60s (#10065)

- Avoid scenarios where script times out before orchagent can establish IPinIP tunnel

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/write_standby.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 4c5455803fac..53cf5265ecde 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -91,7 +91,7 @@ def tunnel_exists(self):
         tunnel_key_pattern = 'ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:*'
         return len(self.asic_db.keys('ASIC_DB', tunnel_key_pattern)) > 0
 
-    def wait_for_tunnel(self, interval=1, timeout=30):
+    def wait_for_tunnel(self, interval=1, timeout=60):
         """
         Waits until the IP-in-IP tunnel has been created
 

From 82bf3b6fb633751b8ef35643654e8e711371b8e8 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Mon, 28 Feb 2022 11:10:58 +0530
Subject: [PATCH 1046/1674] [Marevell] Fix armhf build failure (#9875)

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sonic-platform-et6448m/entropy.py | 7 +++++--
 platform/marvell-armhf/sonic-platform-nokia/entropy.py   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/marvell-armhf/sonic-platform-et6448m/entropy.py b/platform/marvell-armhf/sonic-platform-et6448m/entropy.py
index 338e2ad9bcea..a2131cdc17fb 100644
--- a/platform/marvell-armhf/sonic-platform-et6448m/entropy.py
+++ b/platform/marvell-armhf/sonic-platform-et6448m/entropy.py
@@ -6,8 +6,11 @@
 RNDADDENTROPY=0x40085203
 
 def avail():
-  with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail:
-      return int(avail.read())
+    if path.exists("/proc/sys/kernel/random/entropy_avail"):
+        with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail:
+            return int(avail.read())
+    else:
+        return int(2048)
 
 if path.exists("/proc/sys/kernel/random/entropy_avail"):
     while 1:
diff --git a/platform/marvell-armhf/sonic-platform-nokia/entropy.py b/platform/marvell-armhf/sonic-platform-nokia/entropy.py
index 338e2ad9bcea..a2131cdc17fb 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/entropy.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/entropy.py
@@ -6,8 +6,11 @@
 RNDADDENTROPY=0x40085203
 
 def avail():
-  with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail:
-      return int(avail.read())
+    if path.exists("/proc/sys/kernel/random/entropy_avail"):
+        with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail:
+            return int(avail.read())
+    else:
+        return int(2048)
 
 if path.exists("/proc/sys/kernel/random/entropy_avail"):
     while 1:

From 194028a17b56b5c44508e385ba3abab0dfea571a Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 3 Mar 2022 16:00:16 -0800
Subject: [PATCH 1047/1674] [Unit Test]: Fix sonic config engine test not
 stable issue (#10148)

cherry-pick #10147 to 202012 branch.

Co-authored-by: xumia <59720581+xumia@users.noreply.github.com>
---
 src/sonic-config-engine/tests/common_utils.py | 13 ++++++
 src/sonic-config-engine/tests/test_j2files.py | 40 +++++++++----------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/sonic-config-engine/tests/common_utils.py b/src/sonic-config-engine/tests/common_utils.py
index 3d8a3029dad9..47fe9f37f2a4 100644
--- a/src/sonic-config-engine/tests/common_utils.py
+++ b/src/sonic-config-engine/tests/common_utils.py
@@ -1,4 +1,6 @@
 import json
+import filecmp
+import os
 import re
 import sys
 
@@ -31,3 +33,14 @@ def liststr_to_dict(liststr):
 
     return list_obj
 
+def cmp(file1, file2):
+    """ compare files """
+    try:
+        with open(file1, 'r') as f:
+            obj1 = json.load(f)
+        with open(file2, 'r') as f:
+            obj2 = json.load(f)
+        return obj1 == obj2
+    except:
+        return filecmp.cmp(file1, file2)
+
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 410c451625ed..af28e7e02b24 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -46,30 +46,30 @@ def test_interfaces(self):
         interfaces_template = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'interfaces', 'interfaces.j2')
         argument = '-m ' + self.t0_minigraph + ' -a \'{\"hwaddr\":\"e4:1d:2d:a5:f3:ad\"}\' -t ' + interfaces_template + ' > ' + self.output_file
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'interfaces'), self.output_file))
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'interfaces'), self.output_file))
 
         argument = '-m ' + self.t0_mvrf_minigraph + ' -a \'{\"hwaddr\":\"e4:1d:2d:a5:f3:ad\"}\' -t ' + interfaces_template + ' > ' + self.output_file
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'mvrf_interfaces'), self.output_file))
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'mvrf_interfaces'), self.output_file))
 
     def test_ports_json(self):
         ports_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ports.json.j2')
         argument = '-m ' + self.simple_minigraph + ' -p ' + self.t0_port_config + ' -t ' + ports_template + ' > ' + self.output_file
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'ports.json'), self.output_file))
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'ports.json'), self.output_file))
 
     def test_dhcp_relay(self):
         # Test generation of wait_for_intf.sh
         template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-dhcp-relay', 'wait_for_intf.sh.j2')
         argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'wait_for_intf.sh'), self.output_file))
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'wait_for_intf.sh'), self.output_file))
 
         # Test generation of docker-dhcp-relay.supervisord.conf
         template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-dhcp-relay', 'docker-dhcp-relay.supervisord.conf.j2')
         argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'docker-dhcp-relay.supervisord.conf'), self.output_file))
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'docker-dhcp-relay.supervisord.conf'), self.output_file))
 
     def test_lldp(self):
         lldpd_conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-lldp', 'lldpd.conf.j2')
@@ -82,19 +82,19 @@ def test_lldp(self):
         mgmt_iface_ipv4_and_ipv6_json = os.path.join(self.test_dir, "data", "lldp", "mgmt_iface_ipv4_and_ipv6.json")
         argument = '-j {} -t {} > {}'.format(mgmt_iface_ipv4_and_ipv6_json, lldpd_conf_template, self.output_file)
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(expected_mgmt_ipv4_and_ipv6, self.output_file))
+        self.assertTrue(utils.cmp(expected_mgmt_ipv4_and_ipv6, self.output_file))
 
         # Test generation of lldpd.conf if management interface IPv4 only exist
         mgmt_iface_ipv4_json = os.path.join(self.test_dir, "data", "lldp", "mgmt_iface_ipv4.json")
         argument = '-j {} -t {} > {}'.format(mgmt_iface_ipv4_json, lldpd_conf_template, self.output_file)
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(expected_mgmt_ipv4, self.output_file))
+        self.assertTrue(utils.cmp(expected_mgmt_ipv4, self.output_file))
 
         # Test generation of lldpd.conf if Management interface IPv6 only exist
         mgmt_iface_ipv6_json = os.path.join(self.test_dir, "data", "lldp", "mgmt_iface_ipv6.json")
         argument = '-j {} -t {} > {}'.format(mgmt_iface_ipv6_json, lldpd_conf_template, self.output_file)
         self.run_script(argument)
-        self.assertTrue(filecmp.cmp(expected_mgmt_ipv6, self.output_file))
+        self.assertTrue(utils.cmp(expected_mgmt_ipv6, self.output_file))
 
     def test_bgpd_quagga(self):
         conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-quagga', 'bgpd.conf.j2')
@@ -117,7 +117,7 @@ def test_ipinip(self):
         self.run_script(argument)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'ipinip.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_l2switch_template(self):
         argument = '-k Mellanox-SN2700 --preset l2 -p ' + self.t0_port_config
@@ -136,7 +136,7 @@ def test_l2switch_template(self):
         output_json = json.loads(output)
 
         self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
-    
+
     def test_l1_ports_template(self):
         argument = '-k 32x1000Gb --preset l1 -p ' + self.l1_l3_port_config
         output = self.run_script(argument)
@@ -218,7 +218,7 @@ def test_qos_arista7050_render_template(self):
         os.remove(qos_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-arista7050.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_qos_dell9332_render_template(self):
         dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dellemc_z9332f_d1508-r0', 'DellEMC-Z9332f-O32')
@@ -237,7 +237,7 @@ def test_qos_dell9332_render_template(self):
         os.remove(qos_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-dell9332.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_qos_dell6100_render_template(self):
         dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100')
@@ -256,7 +256,7 @@ def test_qos_dell6100_render_template(self):
         os.remove(qos_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-dell6100.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_dell6100_render_template(self):
         dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100')
@@ -275,7 +275,7 @@ def test_buffers_dell6100_render_template(self):
         os.remove(buffers_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-dell6100.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_mellanox2700_render_template(self):
         # Mellanox buffer template rendering for single ingress pool mode
@@ -321,9 +321,9 @@ def test_ipinip_multi_asic(self):
         ipinip_file = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ipinip.json.j2')
         argument = '-m ' + self.multi_asic_minigraph + ' -p ' + self.multi_asic_port_config + ' -t ' + ipinip_file  +  ' -n asic0 '  + ' > ' + self.output_file
         print(argument)
-        self.run_script(argument) 
+        self.run_script(argument)
         sample_output_file = os.path.join(self.test_dir, 'multi_npu_data', utils.PYvX_DIR, 'ipinip.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_swss_switch_render_template(self):
         switch_template = os.path.join(
@@ -352,7 +352,7 @@ def test_swss_switch_render_template(self):
                 self.test_dir, 'sample_output', v["output"]
             )
             self.run_script(argument)
-            assert filecmp.cmp(sample_output_file, self.output_file)
+            assert utils.cmp(sample_output_file, self.output_file)
 
     def test_swss_switch_render_template_multi_asic(self):
         # verify the ECMP hash seed changes per namespace
@@ -384,7 +384,7 @@ def test_swss_switch_render_template_multi_asic(self):
                 self.test_dir, 'sample_output', v["output"]
             )
             self.run_script(argument)
-            assert filecmp.cmp(sample_output_file, self.output_file)
+            assert utils.cmp(sample_output_file, self.output_file)
         os.environ["NAMESPACE_ID"] = ""
 
     def test_ndppd_conf(self):
@@ -394,7 +394,7 @@ def test_ndppd_conf(self):
 
         argument = '-j {} -t {} > {}'.format(vlan_interfaces_json, conf_template, self.output_file)
         self.run_script(argument)
-        assert filecmp.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
+        assert utils.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
 
     def test_ntp_conf(self):
         conf_template = os.path.join(self.test_dir, "ntp.conf.j2")
@@ -403,7 +403,7 @@ def test_ntp_conf(self):
 
         argument = '-j {} -t {} > {}'.format(ntp_interfaces_json, conf_template, self.output_file)
         self.run_script(argument)
-        assert filecmp.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
+        assert utils.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
 
     def tearDown(self):
         try:

From 8ad3678f0ac88995c34e52ab8691e67273b8d683 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 3 Mar 2022 18:03:18 -0800
Subject: [PATCH 1048/1674] [202012][sonic-platform-daemons] submodule update
 (#10121)

4dc2d0a (HEAD -> 202012, origin/202012) Clear all data from DB table when the daemon stops (#228)
1df28d7 [ycabled] increase UT coverage of ycabled daemon (#238)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 0328497966cd..4dc2d0a6a311 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 0328497966cdc750055ed47cef71f1f89f614b41
+Subproject commit 4dc2d0a6a3112246d9e0ffe60949fa1bb007367f

From ba4d8283631de638352be6d80a9eaac53209fb24 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Thu, 3 Mar 2022 18:04:16 -0800
Subject: [PATCH 1049/1674] [202012][sonic-utilities] submodule update (#10136)

6dfbdcb (HEAD, origin/202012) [warmboot] Migrate 10G ports during warm-reboot on s6100 (#2064)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 40d136557acf..6dfbdcb66560 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 40d136557acf38beb67e7da53a11c22328ca3328
+Subproject commit 6dfbdcb665602dadcdb5539bfbf8aa937478fde3

From decb3bfc4cfa40ce5b977b7e2faa6d33f4642deb Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 3 Mar 2022 18:05:31 -0800
Subject: [PATCH 1050/1674] [sonic-linkmgrd][202012] submodule update (#10028)

Changes:

Update submodule branch to 202012
[sonic-linkmgrd][202012] submodule update

a8ddff5 Jing Zhang Fri Feb 25 11:38:28 2022 Incrementing tolerance on mux state inconsistency (#27)
a3f78a3 Jing Zhang Thu Feb 17 17:23:56 2022 Update log level for mux probing and mux state chance (#23)
05156fb Jing Zhang Thu Feb 17 17:21:01 2022 Handle xcvrd crashing scenarios (#22)
74529ef Longxiang Lyu Mon Feb 14 13:26:07 2022 [make] Enable make extra includes (#24)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 .gitmodules  | 1 +
 src/linkmgrd | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index dab42c517d3e..b49c0af68e95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -90,3 +90,4 @@
 [submodule "src/linkmgrd"]
 	path = src/linkmgrd
 	url = https://github.com/Azure/sonic-linkmgrd.git
+	branch = 202012
diff --git a/src/linkmgrd b/src/linkmgrd
index ef1f5ebc9a64..a8ddff5089fc 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit ef1f5ebc9a64207e622da1fb11eb78e6d95e7f45
+Subproject commit a8ddff5089fc3cddf199647943165ddc4ef51fc8

From 7fb546dce48bab9a0df94335861048cd28e7e45c Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Fri, 4 Mar 2022 16:24:59 -0800
Subject: [PATCH 1051/1674] [202012]BRCM SAI 4.3.5.3-2 Fixes CS00012228504,
 SONIC-55963:SID, CS00012209080, CS00012220761, and CS00012222414 (#10155)

---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 087f8dcfb0b0..6d5966c84759 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 68d56cd4aa6e..dcfb926bb772 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.3-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.3-2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 53f2142928241cc7cccdb808be55793872ee81f4 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Sat, 5 Mar 2022 06:04:06 +0530
Subject: [PATCH 1052/1674] Dell S6100: Fix xcvrd fix (#10123)

---
 .../s6100/sonic_platform/chassis.py               |  8 ++++++++
 .../s6100/sonic_platform/sfp.py                   | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
index 4527f6947321..b33db2e11b15 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py
@@ -75,6 +75,14 @@ def __init__(self):
             module = Module(i)
             self._module_list.append(module)
             self._sfp_list.extend(module._sfp_list)
+        #SFP ports
+        sfp_port = 11
+        for index in range(64,66):
+             eeprom_path = "/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom".format(sfp_port)
+             sfp_control = ""
+             sfp_node = Sfp(index, 'SFP', eeprom_path, sfp_control, index)
+             self._sfp_list.append(sfp_node)
+             sfp_port = sfp_port + 1
 
         for i in range(MAX_S6100_FANTRAY):
             fandrawer = FanDrawer(i)
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
index 0b242ab74d71..a55868f2e798 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
@@ -419,6 +419,9 @@ def get_presence(self):
         """
         Retrieves the presence of the sfp
         """
+        if self.index > 64:
+            return False
+
         presence_ctrl = self.sfp_control + 'qsfp_modprs'
         try:
             reg_file = open(presence_ctrl)
@@ -474,6 +477,9 @@ def get_reset_status(self):
         """
         Retrieves the reset status of SFP
         """
+        if self.index > 64:
+            return False
+
         reset_status = None
         reset_ctrl = self.sfp_control + 'qsfp_reset'
         try:
@@ -612,6 +618,9 @@ def get_lpmode(self):
         """
         Retrieves the lpmode (low power mode) status of this SFP
         """
+        if self.index > 64:
+            return False
+
         lpmode_ctrl = self.sfp_control + 'qsfp_lpmode'
         try:
             reg_file = open(lpmode_ctrl, "r+")
@@ -727,6 +736,9 @@ def reset(self):
         """
         Reset SFP and return all user module settings to their default srate.
         """
+        if self.index > 64:
+            return False
+
         reset_ctrl = self.sfp_control + 'qsfp_reset'
         try:
             # Open reset_ctrl in both read & write mode
@@ -776,6 +788,9 @@ def set_lpmode(self, lpmode):
         """
         Sets the lpmode (low power mode) of SFP
         """
+        if self.index > 64:
+            return False
+
         lpmode_ctrl = self.sfp_control + 'qsfp_lpmode'
         try:
             reg_file = open(lpmode_ctrl, "r+")

From 04925df4518981fade001219021b4d61262c4bd9 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 4 Mar 2022 20:34:23 -0800
Subject: [PATCH 1053/1674] [build] Fix the urllib3 version in
 sonic-mgmt-framework  (#10149)

Fix the urllib3 version in sonic-mgmt-framework constrain file because it is already updated in Dockerfile
---
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 7b75de9d7a67..f670c4e36f3a 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -21,6 +21,6 @@ python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
 typing_extensions==4.1.1
-urllib3==1.21.1
+urllib3==1.26.5
 werkzeug==2.0.3
-zipp==3.7.0
\ No newline at end of file
+zipp==3.7.0

From a8f1e6e5c1bc557ec714cbc866dcd428f6334d39 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Fri, 4 Mar 2022 20:35:34 -0800
Subject: [PATCH 1054/1674] [sonic-py-swsssdk]: Advance submodule (#10118)

9688ef4 Add missing functions to be on par with swsscommon. (#107)

Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
---
 src/sonic-py-swsssdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk
index 6e42d58c15fc..9688ef4e0bb5 160000
--- a/src/sonic-py-swsssdk
+++ b/src/sonic-py-swsssdk
@@ -1 +1 @@
-Subproject commit 6e42d58c15fc78977e59462bfc8cba2bb3017ae2
+Subproject commit 9688ef4e0bb5e39c7fcd973e6f562eb09e7984ae

From 1bdc7f0b481c918d97f96c5f4e2cd25472227361 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Sat, 5 Mar 2022 10:06:20 +0530
Subject: [PATCH 1055/1674] [Marvell][build] Marvell armhf SAI debian. (#10130)

- Fixed SAI debian version name issue reported in Marvell sai package file name format issue Marvell-switching/sonic-marvell-binaries#62
- Implement DHCP, DHCv6 traps as per SAI Specifications
- Added support to return SAI_STATUS_NOT_SUPPORTED for ERSPAN feature [Nokia-7215] [marvell] orchagent exited when activating mirror_session #9830

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk       | 3 +--
 platform/marvell-armhf/sai/Makefile | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index f3cc58f43938..2d47b2f084c1 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,8 +1,7 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-6
+export MRVL_SAI_VERSION = 1.7.1-7
 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
-export MRVL_SAI_PACKAGE = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
 $(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV)))
diff --git a/platform/marvell-armhf/sai/Makefile b/platform/marvell-armhf/sai/Makefile
index a6199f595448..cf78504388c6 100644
--- a/platform/marvell-armhf/sai/Makefile
+++ b/platform/marvell-armhf/sai/Makefile
@@ -2,7 +2,7 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI_PACKAGE)
+MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI)
 
 $(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% :
 	# get deb package

From d162ffe0a5bd84514ee242d69b4eb89844273f37 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lfqlee314@gmail.com>
Date: Fri, 4 Mar 2022 20:40:29 -0800
Subject: [PATCH 1056/1674] [swss]: Wait for vlan intf to start ndppd  (#10119)
 (#10153)

202012 version of #10119

Why I did it
If the VLAN interface is not up when ndppd starts, it will fail to enable allmulti mode on the interface and be unable to process received NDP packets

The following logs are seen:

/var/log/syslog.33.gz:Feb 18 10:33:12.825406 sonic INFO swss#/supervisord: ndppd (error) Failed to set allmulti: No such device

How I did it
Use the wait_for_link script currently used by radv to delay ndppd startup until the vlan interface is ready

How to verify it
Apply the changes to a device. config reload the device and confirm that the above error logs are not observed when ndppd starts. Run the arp/test_arp_dualtor.py::test_proxy_arp test case and verify it passes.
---
 dockers/docker-orchagent/docker-init.sh      |  3 ++
 dockers/docker-orchagent/ndppd.conf          | 13 ++++++++-
 dockers/docker-orchagent/wait_for_link.sh.j2 | 30 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 dockers/docker-orchagent/wait_for_link.sh.j2

diff --git a/dockers/docker-orchagent/docker-init.sh b/dockers/docker-orchagent/docker-init.sh
index 5bf5bf2d06cf..5dc5f2df25c2 100755
--- a/dockers/docker-orchagent/docker-init.sh
+++ b/dockers/docker-orchagent/docker-init.sh
@@ -10,9 +10,12 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/ports.json.j2,/etc/swss/config.d/ports.json \
     -t /usr/share/sonic/templates/vlan_vars.j2 \
     -t /usr/share/sonic/templates/ndppd.conf.j2,/etc/ndppd.conf \
+    -t /usr/share/sonic/templates/wait_for_link.sh.j2,/usr/bin/wait_for_link.sh \
 "
 VLAN=$(sonic-cfggen $CFGGEN_PARAMS)
 
+chmod +x /usr/bin/wait_for_link.sh
+
 # Executed HWSKU specific initialization tasks.
 if [ -x /usr/share/sonic/hwsku/hwsku-init ]; then
     /usr/share/sonic/hwsku/hwsku-init
diff --git a/dockers/docker-orchagent/ndppd.conf b/dockers/docker-orchagent/ndppd.conf
index b9dbc293ed2a..86297de94a45 100644
--- a/dockers/docker-orchagent/ndppd.conf
+++ b/dockers/docker-orchagent/ndppd.conf
@@ -6,4 +6,15 @@ autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=vlanmgrd:running
+dependent_startup_wait_for=wait_for_link:exited
+
+[program:wait_for_link]
+command=/usr/bin/wait_for_link.sh
+priority=7
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
\ No newline at end of file
diff --git a/dockers/docker-orchagent/wait_for_link.sh.j2 b/dockers/docker-orchagent/wait_for_link.sh.j2
new file mode 100644
index 000000000000..980b472b3e0a
--- /dev/null
+++ b/dockers/docker-orchagent/wait_for_link.sh.j2
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+VLAN_TABLE_PREFIX="VLAN_TABLE"
+
+function wait_until_iface_ready
+{
+    TABLE_PREFIX=$1
+    IFACE=$2
+
+    echo "Waiting until interface $IFACE is ready..."
+
+    # Wait for the interface to come up
+    # (i.e., interface is present in STATE_DB and state is "ok")
+    while true; do
+        RESULT=$(sonic-db-cli STATE_DB HGET "${TABLE_PREFIX}|${IFACE}" "state" 2> /dev/null)
+        if [ x"$RESULT" == x"ok" ]; then
+            break
+        fi
+
+        sleep 1
+    done
+
+    echo "Interface ${IFACE} is ready!"
+}
+
+
+# Wait for all interfaces to be up and ready
+{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+wait_until_iface_ready ${VLAN_TABLE_PREFIX} {{ name }}
+{% endfor %}

From 4d6f9f2de7a11009238cfb846a8a9ccbcc16dae7 Mon Sep 17 00:00:00 2001
From: roman_savchuk <romanx.savchuk@intel.com>
Date: Sat, 5 Mar 2022 06:43:08 +0200
Subject: [PATCH 1057/1674] [ BFN ] update SDE package for BFN platform
 (#10049)

Updated SDE package for Barefoot platform with fixes for:

- NAT
- VRF
---
 files/build/versions/default/versions-web | 4 ++--
 platform/barefoot/bfn-platform.mk         | 2 +-
 platform/barefoot/bfn-sai.mk              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6d5966c84759..94275a6873fd 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -23,8 +23,8 @@ https://deb.nodesource.com/node_14.x/dists/buster/Release==f964fa5b54050ac3bb33e
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20211112_sai.1.7.1_deb10.deb==c17beb440e2ae8d3271d78de0eede9db
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20211112_sai.1.7.1_deb10.deb==688c587d2cfb39e5d1e7148b02f13fec
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
+https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index 87b318eeb363..0077d42162bc 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20211112_sai.1.7.1_deb10.deb
+BFN_PLATFORM = bfnplatform_20220221_sai.1.7.1_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index 8639157d5e02..4d68fc3ec30a 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20211112_sai.1.7.1_deb10.deb
+BFN_SAI = bfnsdk_20220221_sai.1.7.1_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

From ee2b08e9880b7cf0a33035718f649b6e3e08914e Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Fri, 4 Mar 2022 20:44:07 -0800
Subject: [PATCH 1058/1674] [202012] Upgrade restapi docker to Buster (#10003)

Backport the changes done in #9791 to the 202012 branch, and change the base image to Buster.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 dockers/docker-sonic-restapi/Dockerfile.j2 | 2 +-
 rules/docker-restapi.mk                    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dockers/docker-sonic-restapi/Dockerfile.j2 b/dockers/docker-sonic-restapi/Dockerfile.j2
index 837796e66d82..0b43a0ef5d25 100644
--- a/dockers/docker-sonic-restapi/Dockerfile.j2
+++ b/dockers/docker-sonic-restapi/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-stretch
+FROM docker-config-engine-buster
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/rules/docker-restapi.mk b/rules/docker-restapi.mk
index 98f43b2395b7..b9e8c1230fcf 100644
--- a/rules/docker-restapi.mk
+++ b/rules/docker-restapi.mk
@@ -8,11 +8,10 @@ $(DOCKER_RESTAPI)_DEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \
 
 $(DOCKER_RESTAPI)_PATH = $(DOCKERS_PATH)/$(DOCKER_RESTAPI_STEM)
 
-$(DOCKER_RESTAPI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+$(DOCKER_RESTAPI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
 
 ifeq ($(INCLUDE_RESTAPI), y)
 SONIC_DOCKER_IMAGES += $(DOCKER_RESTAPI)
-SONIC_STRETCH_DOCKERS += $(DOCKER_RESTAPI)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_RESTAPI)
 endif
 

From 0bfc469d8c1f95261482f29404832f4f93f3f863 Mon Sep 17 00:00:00 2001
From: Yang Wang <yangwang1@microsoft.com>
Date: Sat, 5 Mar 2022 12:45:39 +0800
Subject: [PATCH 1059/1674] [SAIServerV2] Build SAI Serverv2 docker (#9509)
 (#9940)

Support saiserver v2 with python3 and thrift 0.13.0 (Cherry-picked from master #9509)

add variables to support the saiserverv2
build different thrift in saithrift depends on saiserver version
build differernt versions of saiserver
make the saiserver and saiserver docker with version number

test done:
build two different versions of sasiserver in local build environment

Co-authored-by: Richard.Yu <richard.yu@microsoft.com>
---
 Makefile.work                              |  1 +
 platform/broadcom/docker-saiserver-brcm.mk |  9 ++++++---
 platform/broadcom/libsaithrift-dev.mk      | 23 +++++++++++++++-------
 slave.mk                                   |  6 ++++++
 sonic-slave-buster/Dockerfile.j2           |  7 +++++++
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index ace2e956e308..ced72b31a160 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -255,6 +255,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
                            SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
+                           SONIC_SAITHRIFT_V2=$(SAITHRIFT_V2) \
                            MDEBUG=$(MDEBUG) \
                            PASSWORD=$(PASSWORD) \
                            USERNAME=$(USERNAME) \
diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk
index bb8499eab1fb..f4f9cdd42a49 100644
--- a/platform/broadcom/docker-saiserver-brcm.mk
+++ b/platform/broadcom/docker-saiserver-brcm.mk
@@ -1,14 +1,17 @@
 # docker image for brcm saiserver
 
-DOCKER_SAISERVER_BRCM = docker-saiserver-brcm.gz
+DOCKER_SAISERVER_BRCM = docker-saiserver$(SAITHRIFT_VER)-brcm.gz
 $(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm
 $(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
 $(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)
+SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_BRCM)
 
-$(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver
-$(DOCKER_SAISERVER_BRCM)_RUN_OPT += --net=host --privileged -t
+#Support two versions of saiserver
+$(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver$(SAITHRIFT_VER)
+
+$(DOCKER_SAISERVER_BRCM)_RUN_OPT += --privileged -t
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
index 543ea63e7f4e..0d32a08a276c 100644
--- a/platform/broadcom/libsaithrift-dev.mk
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -2,19 +2,28 @@
 
 SAI_VER = 0.9.4
 
-LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_amd64.deb
 $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV)
-$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+#Support two different versions of thrift
+ifeq ($(SAITHRIFT_V2),y)
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0)
+$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2
+else
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)
+endif
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(BRCM_SAI)
 SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
 
-PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+PYTHON_SAITHRIFT = python-saithrift$(SAITHRIFT_VER)_$(SAI_VER)_amd64.deb
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
 
-SAISERVER = saiserver_$(SAI_VER)_amd64.deb
-$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+SAISERVER = saiserver$(SAITHRIFT_VER)_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBSAITHRIFT_DEV)
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
 
-SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+SAISERVER_DBG = saiserver$(SAITHRIFT_VER)-dbg_$(SAI_VER)_amd64.deb
 $(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/slave.mk b/slave.mk
index 71732ffd2018..73522008b519 100644
--- a/slave.mk
+++ b/slave.mk
@@ -144,6 +144,11 @@ ifeq ($(SONIC_INSTALL_DEBUG_TOOLS),y)
 INSTALL_DEBUG_TOOLS = y
 endif
 
+ifeq ($(SONIC_SAITHRIFT_V2),y)
+SAITHRIFT_V2 = y
+SAITHRIFT_VER = v2
+endif
+
 ifeq ($(SONIC_INCLUDE_SFLOW),y)
 INCLUDE_SFLOW = y
 endif
@@ -250,6 +255,7 @@ $(info "FRR_USER_UID"                    : "$(FRR_USER_UID)")
 $(info "FRR_USER_GID"                    : "$(FRR_USER_GID)")
 endif
 $(info "ENABLE_SYNCD_RPC"                : "$(ENABLE_SYNCD_RPC)")
+$(info "SAITHRIFT_V2"                    : "$(SAITHRIFT_V2)")
 $(info "ENABLE_ORGANIZATION_EXTENSIONS"  : "$(ENABLE_ORGANIZATION_EXTENSIONS)")
 $(info "HTTP_PROXY"                      : "$(HTTP_PROXY)")
 $(info "HTTPS_PROXY"                     : "$(HTTPS_PROXY)")
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index ba3809187381..09d50514a043 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -109,6 +109,13 @@ RUN apt-get update && apt-get install -y \
         libxml-simple-perl \
         graphviz \
         aspell \
+# For SAI meta rpc build - make rpc
+        libgetopt-long-descriptive-perl \
+        libconst-fast-perl \
+        libtemplate-perl \
+        libnamespace-autoclean-perl \
+        libmoose-perl \
+        libmoosex-aliases-perl \
 # For linux build
         bc \
         fakeroot \

From a8d844c83dd5116782e009d2ef160ca17ae70cb1 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 8 Mar 2022 00:00:56 +0800
Subject: [PATCH 1060/1674] [build]: Fix marvell-armhf build hung issue
 (#10156)

The marvel-armhf build is hung, it does not exist after waiting for a long time.
It is caused by the process /etc/entropy.py which is started by the postinst script in target/debs/buster/sonic-platform-nokia-7215_1.0_armhf.deb

$ cat postinst
sh /usr/sbin/nokia-7215_plt_setup.sh
...

$ cat usr/sbin/nokia-7215_plt_setup.sh | tail

    python /etc/entropy.py &


$ cat etc/entropy.py
if path.exists("/proc/sys/kernel/random/entropy_avail"):
    while 1:
        while avail() < 2048:
            with open('/dev/urandom', 'rb') as urnd, open("/dev/random", mode='wb') as rnd:
                d = urnd.read(512)
                t = struct.pack('ii', 4 * len(d), len(d)) + d
                fcntl.ioctl(rnd, RNDADDENTROPY, t)
        time.sleep(30)

It is a workaround to fix the build issue, need to fix debian package, and revert the change.
---
 files/build_templates/sonic_debian_extension.j2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 393fbc042dda..0874c5105663 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -637,6 +637,11 @@ clean_proc() {
 }
 trap_push clean_proc
 sudo mount proc /proc -t proc
+if [[ $CONFIGURED_ARCH == armhf ]]; then
+    # A workaround to fix the armhf build hung issue, caused by sonic-platform-nokia-7215_1.0_armhf.deb post installation script 
+    ps -eo pid,cmd | grep python | grep "/etc/entropy.py" | awk '{print $1}' | xargs sudo kill -9 2>/dev/null || true
+fi
+
 sudo mkdir $FILESYSTEM_ROOT/target
 sudo mount --bind target $FILESYSTEM_ROOT/target
 sudo chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS info

From cf7d3ab729440d82426836f0d7e269adf86b7639 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 8 Mar 2022 10:07:05 +0800
Subject: [PATCH 1061/1674] [Submodule]: Update submodule sonic-telemetry
 (#10125)

Why I did it
Update submodule sonic-telemetry, to fix security alert.

c606388 Fix CVE-2021-3121 warning (#96)
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 1c3f75e0d2b6..c6063887bc4a 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 1c3f75e0d2b635dcff7d1bdff5cc9a03ed4bf7c5
+Subproject commit c6063887bc4a67ed3e40979b47f1b8e5caab6271

From db3c695bf116bb66245781cd520041a8fc443e2c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 8 Mar 2022 10:15:52 +0800
Subject: [PATCH 1062/1674] [Build][Ci]: Support to use the cisco sai packages
 built by azp (#10102)

Why I did it
Support to use the cisco sai packages built by azp
---
 .../official-build-cisco-8000.yml             | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
index aeec64a848a1..61b6b03171e3 100644
--- a/.azure-pipelines/official-build-cisco-8000.yml
+++ b/.azure-pipelines/official-build-cisco-8000.yml
@@ -22,6 +22,11 @@ resources:
     name: Cisco-8000-sonic/platform-cisco-8000
     endpoint: cisco-connection
 
+variables:
+- group: SONIC-AKV-STROAGE-1
+- name: StorageSASKey
+  value: $(sonicstorage-SasToken)
+
 stages:
 - stage: Build
   pool: sonic
@@ -29,6 +34,7 @@ stages:
     CACHE_MODE: wcache
     SKIP_CHECKOUT: true
     TERM: ''
+    PACKAGE_URL: "https://sonicstorage.blob.core.windows.net/packages"
 
   jobs:
   - template: azure-pipelines-build.yml
@@ -60,5 +66,29 @@ stages:
           make PLATFORM=cisco-8000 platform/cisco-8000
           tar xfz $(System.ArtifactsDirectory)/artifactory-*.tar.gz -C platform/cisco-8000
         displayName: 'Setup cisco artifacts'
+      - script: |
+          set -ex
+          filename=$(find platform/cisco-8000/artifactory/sonic -name cisco-* -type f | head -n 1)
+          if [ -z "$filename" ]; then
+            echo "Cisco sai package not found" 1>&2
+            exit 1
+          fi
+          cd $(dirname $filename)
+          echo "PWD=$(pwd)"
+          ls -l *.deb
+          while read -r package; do
+            # Cisco version format: <VERSION>-sai-<sai-ver>-<distribution>-<COMMIT HASH>
+            # The <sai-ver> may contain several values in one build, the part is skipped when publishing to storage
+            # See https://github.com/Cisco-8000-sonic/sdk/blob/master/azure-pipelines.yml
+            # The $PACKAGE_URL is only accessible for AZP
+            version=$(echo $package | awk -F_ '{print $(NF-1)}' | cut -d- -f1,2,4,5)
+            package_url="$PACKAGE_URL/sai/ciscosai/master/$version/$package"
+            echo "Override package $package from $package_url"
+            wget "$package_url$StorageSASKey" -O "$package"
+          done < <(ls *.deb)
+        env:
+          StorageSASKey: $(StorageSASKey)
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+        displayName: "Override cisco sai packages"
       jobGroups:
       - name: cisco-8000

From 063882cf877ea5a03ec199a60a5d76ef125a6b1d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 8 Mar 2022 21:32:36 +0800
Subject: [PATCH 1063/1674] [ci/build]: Upgrade SONiC package versions (#10069)

[ci/build]: Upgrade SONiC package versions (#10069)
---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-git     |  8 +--
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  | 20 +++----
 files/build/versions/default/versions-git     | 10 ++--
 files/build/versions/default/versions-web     |  4 +-
 .../docker-base-buster/versions-deb-buster    |  6 +--
 .../docker-base-buster/versions-py3-all-arm64 |  1 -
 .../docker-base-buster/versions-py3-all-armhf |  1 -
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  6 +--
 .../versions-py3-all-arm64                    |  1 -
 .../versions-py3-all-armhf                    |  1 -
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../versions-deb-buster-armhf                 |  4 +-
 .../sonic-slave-buster/versions-deb-buster    | 52 +++++++++++++------
 .../versions-deb-buster-arm64                 | 13 +----
 .../versions-deb-buster-armhf                 | 22 --------
 .../dockers/sonic-slave-buster/versions-git   |  2 +
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../sonic-slave-buster/versions-py3-all-arm64 |  1 -
 .../sonic-slave-buster/versions-py3-all-armhf |  1 -
 .../sonic-slave-stretch/versions-deb-stretch  | 22 ++++----
 .../versions-deb-stretch-arm64                | 10 +---
 .../versions-deb-stretch-armhf                | 14 ++---
 .../dockers/sonic-slave-stretch/versions-git  |  2 +
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions-py3-all-arm64                    |  1 -
 .../versions-py3-all-armhf                    |  1 -
 .../versions/host-image/versions-deb-buster   |  8 +--
 .../host-image/versions-deb-buster-arm64      |  2 +
 .../host-image/versions-deb-buster-armhf      |  2 +
 files/build/versions/host-image/versions-py3  |  4 +-
 42 files changed, 115 insertions(+), 140 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 30df3fcddc7e..ac2b6edb7a67 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.3-1
+libsaibcm==4.3.5.3-2
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 2e868ae07dfd..c5349c6fd616 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
+https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
+https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==8f2811512d526b54e81dc1993ef32101e13684fb
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 494de9505774..09b066cb1ecd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -12,6 +12,6 @@ psutil==5.9.0
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.9
-websocket-client==1.2.3
+websocket-client==1.3.1
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index cbc848fe5080..7edfcdb8145d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index e714f2c4947e..b3a8e90c2094 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A09%3A35Z&se=2030-02-07T05%3A09%3A00Z&sr=b&sp=r&sig=P0xG3DKNPFu2EY3toCqEvflxVE%2F1Ntbreas2YbH2Rqo%3D==c6abbe761c8216fdf0668f3c287053bf
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-1_amd64.deb?sv=2020-08-04&st=2022-02-06T05%3A08%3A24Z&se=2030-02-07T05%3A08%3A00Z&sr=b&sp=r&sig=XXK7%2F1Qyc1aD%2FM29E6mOwyvyD8ARlZ67dVxhw6K56Ic%3D==1cae150383459a5d0ea86c72165b5b86
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index a68b934d2e93..978e032dea93 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:5bb6e8c4f738d2da8662393543ddacdc8be9e421c46ce5316d2877c73c1fde16
-amd64:amd64/debian:stretch==sha256:9318174504347984adbd1dcd816d5878103bd8c55ec0eee3598ad009c23adced
-amd64:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
-amd64:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
+amd64:amd64/debian:buster==sha256:88779010dc8957be221862da13a9daad4e453a1d0438697cbb1e733832876729
+amd64:amd64/debian:stretch==sha256:a581dd3cf706b8c4c0cc770accc73e6fe6d0f3ffdc712e6ac8e0380524bdc5fd
+amd64:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
+amd64:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -29,15 +29,15 @@ amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
-arm64:arm64v8/debian:buster==sha256:b9c2eac754faff5c52adbdadaef1ddef8c941c3e15060938e9d32db00472f82d
-arm64:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
-arm64:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
+arm64:arm64v8/debian:buster==sha256:5a79440171f4e602be527350ffc00d715a3c20ce93ddc2840cc4e82a788f82cf
+arm64:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
+arm64:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
 arm64:docker-swss-layer-buster==
-armhf:arm32v7/debian:buster==sha256:705be950aa01d4efc68285cd6bdad9eb2ce1e64f67f95f6af3f5e0c12ebfc334
-armhf:debian:buster==sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763
-armhf:debian:stretch==sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d
+armhf:arm32v7/debian:buster==sha256:1860e6fb153759fb7ccca2b16efae8017cf79418d5cd60c764ffbffe072677fc
+armhf:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
+armhf:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
 armhf:docker-swss-layer-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 084d17dd351e..bc2e85d6ff10 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==988c0af5bed05e97d351297ed9f3221bfe42a205
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,12 +9,12 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==9f629dbb432d8918fc75537614a8c2df51123343
+https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
+https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==8f2811512d526b54e81dc1993ef32101e13684fb
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 94275a6873fd..442f5861ae06 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.7.1-6.deb==95c35d71a138c8cad4116d592cdd6a82
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-7_armhf.deb==385730df69b8d1f9e13d341f78f7b934
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index ee67e51b8087..d51627dd0be8 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -7,7 +7,7 @@ libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdbus-1-3==1.12.20-0+deb10u1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u2
+libexpat1==2.2.6-2+deb10u3
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
@@ -37,8 +37,8 @@ libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsasl2-2==2.1.27+dfsg-1+deb10u2
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64 b/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
deleted file mode 100644
index 63fb15bbfec3..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-markupsafe==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf b/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
deleted file mode 100644
index 63fb15bbfec3..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-markupsafe==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 107c878519c8..f880487e89b9 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.1.18
+regex==2022.3.2
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 1b509f826998..40908680f9a7 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 1b509f826998..40908680f9a7 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index f670c4e36f3a..f6b6e3be72f3 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,14 +1,14 @@
 attrs==21.4.0
 certifi==2017.4.17
 charset-normalizer==2.0.12
-click==8.0.3
+click==8.0.4
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.0.3
 grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.11.1
+importlib-metadata==4.11.2
 importlib-resources==5.4.0
 inflection==0.5.1
 itsdangerous==2.1.0
@@ -23,4 +23,4 @@ six==1.11.0
 typing_extensions==4.1.1
 urllib3==1.26.5
 werkzeug==2.0.3
-zipp==3.7.0
+zipp==3.7.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
deleted file mode 100644
index b8ee0a3a363b..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-itsdangerous==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
deleted file mode 100644
index b8ee0a3a363b..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-itsdangerous==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index a9181adafcae..b8610f9d09c9 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 968522a32d63..2ecb687e09fe 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 2697032e94b3..773410b51c58 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.3-1
+libsaibcm==4.3.5.3-2
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 2961f83e3752..b50eb2a2e9ed 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index bac67956628f..8e10df0e7e3f 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index c8a4e7e24b8f..1611279d3227 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -11,7 +11,7 @@ libc6-dev==2.28-10
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u2
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index bd4b60b6f702..3f83138fd056 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u2
+libexpat1-dev==2.2.6-2+deb10u3
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
@@ -22,7 +22,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-6
+mrvllibsai==1.7.1-7
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 400b76872146..1e12aa181f35 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.12-1
+containerd.io==1.4.13-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -105,7 +105,7 @@ equivs==2.2.0
 exim4-base==4.92-8+deb10u6
 exim4-config==4.92-8+deb10u6
 exim4-daemon-light==4.92-8+deb10u6
-expat==2.2.6-2+deb10u1
+expat==2.2.6-2+deb10u3
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
 file==1:5.35-4+deb10u2
@@ -217,6 +217,7 @@ liba52-0.7.4==0.7.4-19
 libaa1==1.4p5-46
 libaacs0==0.9.0-2
 libaio1==0.3.112-3
+libalgorithm-c3-perl==0.10-1
 libalgorithm-diff-perl==1.19.03-2
 libalgorithm-diff-xs-perl==0.04-5+b1
 libalgorithm-merge-perl==0.08-3
@@ -224,6 +225,7 @@ libaom0==1.0.0-3
 libaopalliance-java==20070526-6
 libapache-pom-java==18-1
 libapparmor1==2.13.2-10
+libappconfig-perl==1.71-2
 libappstream4==0.12.5-1
 libapt-inst2.0==1.8.2.3
 libapt-pkg-perl==0.1.34+b1
@@ -358,8 +360,13 @@ libclang-common-7-dev==1:7.0.1-8+deb10u2
 libclang1-6.0==1:6.0.1-10
 libclang1-7==1:7.0.1-8+deb10u2
 libclass-accessor-perl==0.51-1
+libclass-c3-perl==0.34-1
+libclass-c3-xs-perl==0.14-1+b3
 libclass-inspector-perl==1.32-1
+libclass-load-perl==0.25-1
+libclass-load-xs-perl==0.10-1+b3
 libclass-method-modifiers-perl==2.12-1
+libclass-tiny-perl==1.006-1
 libclass-xsaccessor-perl==1.19-3+b2
 libclone-perl==0.41-1+b1
 libcmocka-dev==1.1.3-1
@@ -408,11 +415,17 @@ libdbus-1-dev==1.12.20-0+deb10u1
 libdconf1==0.30.1-2
 libde265-0==1.0.3-1+b1
 libdevel-callchecker-perl==0.008-1
+libdevel-caller-perl==2.06-2+b1
 libdevel-globaldestruction-perl==0.14-1
+libdevel-lexalias-perl==0.05-2+b1
+libdevel-overloadinfo-perl==0.005-1
+libdevel-partialdump-perl==0.20-1
+libdevel-stacktrace-perl==2.0300-1
 libdevmapper-event1.02.1==2:1.02.155-3
 libdevmapper1.02.1==2:1.02.155-3
 libdigest-bubblebabble-perl==0.02-2
 libdigest-hmac-perl==1.03+dfsg-2
+libdist-checkconflicts-perl==0.11-1
 libdistro-info-perl==0.21
 libdjvulibre-text==3.5.27.1-10+deb10u1
 libdjvulibre21==3.5.27.1-10+deb10u1
@@ -451,6 +464,7 @@ libepoxy-dev==1.5.3-0.1
 libepoxy0==1.5.3-0.1
 liberror-perl==0.17027-2
 libestr0==0.1.10-2.1
+libeval-closure-perl==0.14-1
 libevdev2==1.6.0+dfsg-1
 libevent-2.1-6==2.1.8-stable-4
 libevent-core-2.1-6==2.1.8-stable-4
@@ -458,8 +472,8 @@ libevent-dev==2.1.8-stable-4
 libevent-extra-2.1-6==2.1.8-stable-4
 libevent-openssl-2.1-6==2.1.8-stable-4
 libevent-pthreads-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
+libexpat1==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u3
 libexplain-dev==1.4.D001-8
 libexplain51==1.4.D001-8
 libexporter-tiny-perl==1.002001-1
@@ -748,8 +762,11 @@ libmime-tools-perl==5.509-1
 libmng1==1.0.10+dfsg-3.1+b5
 libmnl-dev==1.0.4-2
 libmodule-implementation-perl==0.09-1
+libmodule-runtime-conflicts-perl==0.003-1
 libmodule-runtime-perl==0.016-1
 libmoo-perl==2.003004-2
+libmoose-perl==2.2011-1+b1
+libmoosex-aliases-perl==0.11-1
 libmount-dev==2.33.1-0.1
 libmp3lame0==3.100-2+b1
 libmpc3==1.1.0-1
@@ -758,8 +775,10 @@ libmpeg2-4==0.5.1-8
 libmpfr6==4.0.2-1
 libmpg123-0==1.25.10-2
 libmpx2==8.3.0-6
+libmro-compat-perl==0.13-1
 libmtdev1==1.1.5-1+b1
 libmysofa0==0.6~dfsg0-3+deb10u1
+libnamespace-autoclean-perl==0.28-1
 libnamespace-clean-perl==0.27-1
 libnanomsg-dev==1.1.5+dfsg-1
 libnanomsg5==1.1.5+dfsg-1
@@ -824,9 +843,11 @@ libosp5==1.5.2-13+b1
 libossp-uuid-perl==1.6.2-1.5+b7
 libossp-uuid16==1.6.2-1.5+b7
 libp11-kit-dev==0.23.15-2+deb10u1
+libpackage-deprecationmanager-perl==0.17-1
 libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
+libpadwalker-perl==2.3-1+b1
 libpam-systemd==241-7~deb10u8
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
@@ -887,9 +908,9 @@ libpmix2==3.1.2-3
 libpng-dev==1.6.36-6
 libpng16-16==1.6.36-6
 libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-25
-libpolkit-backend-1-0==0.105-25
-libpolkit-gobject-1-0==0.105-25
+libpolkit-agent-1-0==0.105-25+deb10u1
+libpolkit-backend-1-0==0.105-25+deb10u1
+libpolkit-gobject-1-0==0.105-25+deb10u1
 libpopt0==1.16-12
 libpostproc55==7:4.1.8-0+deb10u1
 libpotrace0==1.15-1
@@ -982,11 +1003,11 @@ librsvg2-2==2.44.10-2.1
 librsvg2-common==2.44.10-2.1
 librtmp1==2.4+20151223.gitfa8646d.1-2
 librubberband2==1.8.1-7
-libruby2.5==2.5.5-3+deb10u3
+libruby2.5==2.5.5-3+deb10u4
 libsamplerate0==0.1.9-2
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsasl2-2==2.1.27+dfsg-1+deb10u2
+libsasl2-modules==2.1.27+dfsg-1+deb10u2
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsaxon-java==1:6.5.5-12
 libselinux1-dev==2.8-1+b1
 libsensors-config==1:3.5.0-3
@@ -1066,6 +1087,7 @@ libtasn1-doc==4.13-3
 libtcl8.6==8.6.9+dfsg-2
 libtcmalloc-minimal4==2.7-1
 libteckit0==2.5.8+ds2-5
+libtemplate-perl==2.27-1+b1
 libterm-readkey-perl==2.38-1
 libtest-fatal-perl==0.014-1
 libtest-refcount-perl==0.08-3
@@ -1402,7 +1424,7 @@ pinentry-curses==1.1.0-2
 pkg-config==0.29-6
 pkg-php-tools==1.37
 po-debconf==1.0.21
-policykit-1==0.105-25
+policykit-1==0.105-25+deb10u1
 poppler-data==0.4.9-2
 pps-tools==1.0.2-1
 preview-latex-style==11.91-2
@@ -1619,9 +1641,9 @@ ruby-power-assert==1.1.1-1
 ruby-setup==3.4.1-9
 ruby-test-unit==3.2.8-1
 ruby-xmlrpc==0.3.0-2
-ruby2.5==2.5.5-3+deb10u3
-ruby2.5-dev==2.5.5-3+deb10u3
-ruby2.5-doc==2.5.5-3+deb10u3
+ruby2.5==2.5.5-3+deb10u4
+ruby2.5-dev==2.5.5-3+deb10u4
+ruby2.5-doc==2.5.5-3+deb10u4
 rubygems-integration==1.11+deb10u1
 seabios==1.12.0-1
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 77cc88975753..e7bffb7be010 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,18 +1,7 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-expat==2.2.6-2+deb10u2
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libexpat1==2.2.6-2+deb10u2
-libexpat1-dev==2.2.6-2+deb10u2
-libpolkit-agent-1-0==0.105-25+deb10u1
-libpolkit-backend-1-0==0.105-25+deb10u1
-libpolkit-gobject-1-0==0.105-25+deb10u1
-libruby2.5==2.5.5-3+deb10u4
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.19.0-deb-1nodesource1
-policykit-1==0.105-25+deb10u1
-ruby2.5==2.5.5-3+deb10u4
-ruby2.5-dev==2.5.5-3+deb10u4
-ruby2.5-doc==2.5.5-3+deb10u4
\ No newline at end of file
+nodejs==14.19.0-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index f9d0e2aa85c2..88a35d23cb33 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,27 +1,16 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-expat==2.2.6-2+deb10u2
-libalgorithm-c3-perl==0.10-1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
 libclang-dev==1:7.0-47
-libclass-c3-perl==0.34-1
-libclass-c3-xs-perl==0.14-1+b3
 libclass-data-inheritable-perl==0.08-3
-libdevel-caller-perl==2.06-2+b1
-libdevel-lexalias-perl==0.05-2+b1
-libdevel-stacktrace-perl==2.0300-1
-libdist-checkconflicts-perl==0.11-1
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-omap1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
-libeval-closure-perl==0.14-1
 libexception-class-perl==1.44-1
-libexpat1==2.2.6-2+deb10u2
-libexpat1-dev==2.2.6-2+deb10u2
 libgles2-mesa-dev==18.3.6-2+deb10u1
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
@@ -30,14 +19,7 @@ liblog-log4perl-perl==1.49-1
 libmime-charset-perl==1.012.2-1
 libmime-lite-perl==3.030-2
 libmime-types-perl==2.17-1
-libmro-compat-perl==0.13-1
-libnamespace-autoclean-perl==0.28-1
-libpadwalker-perl==2.3-1+b1
 libparams-validationcompiler-perl==0.30-1
-libpolkit-agent-1-0==0.105-25+deb10u1
-libpolkit-backend-1-0==0.105-25+deb10u1
-libpolkit-gobject-1-0==0.105-25+deb10u1
-libruby2.5==2.5.5-3+deb10u4
 librust-aho-corasick-dev==0.6.9-1
 librust-ansi-term-dev==0.11.0-1
 librust-atty-dev==0.2.11-1
@@ -122,12 +104,8 @@ llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
 nodejs==14.19.0-deb-1nodesource1
-policykit-1==0.105-25+deb10u1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
-ruby2.5==2.5.5-3+deb10u4
-ruby2.5-dev==2.5.5-3+deb10u4
-ruby2.5-doc==2.5.5-3+deb10u4
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
 texlive-font-utils==2018.20190227-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..4de041506e74
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index f924faa8d3b9..6bfb218c4b77 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.3.5
+bitarray==2.4.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.1.18
+regex==2022.3.2
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
deleted file mode 100644
index 9f5f6f8caa97..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
deleted file mode 100644
index 9f5f6f8caa97..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 2a9e0fd288c8..16df04db8f1e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -98,7 +98,7 @@ exim4==4.89-2+deb9u8
 exim4-base==4.89-2+deb9u8
 exim4-config==4.89-2+deb9u8
 exim4-daemon-light==4.89-2+deb9u8
-expat==2.2.0-2+deb9u3
+expat==2.2.0-2+deb9u4
 exuberant-ctags==1:5.9~svn20110310-11
 fakeroot==1.21-3.1
 file==1:5.30-1+deb9u3
@@ -440,8 +440,8 @@ libevent-dev==2.0.21-stable-3
 libevent-extra-2.0-5==2.0.21-stable-3
 libevent-openssl-2.0-5==2.0.21-stable-3
 libevent-pthreads-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u3
-libexpat1-dev==2.2.0-2+deb9u3
+libexpat1==2.2.0-2+deb9u4
+libexpat1-dev==2.2.0-2+deb9u4
 libexplain-dev==1.4.D001-6
 libexplain51==1.4.D001-6
 libexporter-tiny-perl==0.042-1
@@ -638,7 +638,7 @@ liblist-moreutils-perl==0.416-1+b1
 libllvm3.8==1:3.8.1-24
 libllvm3.9==1:3.9.1-9
 liblocale-gettext-perl==1.07-3+b1
-liblog4j1.2-java==1.2.17-7+deb9u1
+liblog4j1.2-java==1.2.17-7+deb9u2
 liblogging-stdlog0==1.0.5-2+b2
 liblognorm5==2.0.1-1.1+b1
 liblqr-1-0==0.4.2-2+b2
@@ -803,9 +803,9 @@ libplexus-velocity-java==1.2-1
 libpng-dev==1.6.28-1+deb9u1
 libpng16-16==1.6.28-1+deb9u1
 libpod-constants-perl==0.19-1
-libpolkit-agent-1-0==0.105-18+deb9u1
-libpolkit-backend-1-0==0.105-18+deb9u1
-libpolkit-gobject-1-0==0.105-18+deb9u1
+libpolkit-agent-1-0==0.105-18+deb9u2
+libpolkit-backend-1-0==0.105-18+deb9u2
+libpolkit-gobject-1-0==0.105-18+deb9u2
 libpoppler64==0.48.0-2+deb9u4
 libpopt0==1.16-10+b2
 libpotrace0==1.13-3
@@ -1227,7 +1227,7 @@ pinentry-curses==1.0.0-2
 pkg-config==0.29-4+b1
 pkg-php-tools==1.35
 po-debconf==1.0.20
-policykit-1==0.105-18+deb9u1
+policykit-1==0.105-18+deb9u2
 poppler-data==0.4.7-8
 preview-latex-style==11.90-1
 pristine-tar==1.38
@@ -1307,9 +1307,9 @@ python-sphinx==1.4.9-2
 python-sphinx-rtd-theme==0.1.9-1
 python-stdeb==0.8.5-1
 python-tk==2.7.13-1
-python-twisted==16.6.0-2
-python-twisted-bin==16.6.0-2
-python-twisted-core==16.6.0-2
+python-twisted==16.6.0-2+deb9u1
+python-twisted-bin==16.6.0-2+deb9u1
+python-twisted-core==16.6.0-2+deb9u1
 python-tz==2016.7-0.3
 python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 806b802601fc..00f894c2df08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,16 +1,8 @@
 docker-ce==18.06.3~ce~3-0~debian
-expat==2.2.0-2+deb9u4
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
-libexpat1==2.2.0-2+deb9u4
-libexpat1-dev==2.2.0-2+deb9u4
-liblog4j1.2-java==1.2.17-7+deb9u2
-libpolkit-agent-1-0==0.105-18+deb9u2
-libpolkit-backend-1-0==0.105-18+deb9u2
-libpolkit-gobject-1-0==0.105-18+deb9u2
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-nodejs==10.24.1-1nodesource1
-policykit-1==0.105-18+deb9u2
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 72efab7ee1a5..89b400bbf461 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -1,22 +1,18 @@
 docker-ce==18.06.3~ce~3-0~debian
-expat==2.2.0-2+deb9u4
 libdrm-exynos1==2.4.74-1
 libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
-libexpat1==2.2.0-2+deb9u4
-libexpat1-dev==2.2.0-2+deb9u4
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
-liblog4j1.2-java==1.2.17-7+deb9u2
-libpolkit-agent-1-0==0.105-18+deb9u2
-libpolkit-backend-1-0==0.105-18+deb9u2
-libpolkit-gobject-1-0==0.105-18+deb9u2
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libtext-charwidth-perl==0.04-7+b6
+libtiff5==4.0.8-2+deb9u8
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.290-1
-nodejs==10.24.1-1nodesource1
-policykit-1==0.105-18+deb9u2
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..4de041506e74
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 7543896dce42..ca07070937bb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.3.5
+bitarray==2.4.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
deleted file mode 100644
index 9f5f6f8caa97..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
deleted file mode 100644
index 9f5f6f8caa97..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-bitarray==2.3.6
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 9e4caf8ac465..dc223e070bc9 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.12-1
+containerd.io==1.4.13-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
@@ -87,7 +87,7 @@ libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u2
+libexpat1==2.2.6-2+deb10u3
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
@@ -157,8 +157,8 @@ libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libsasl2-2==2.1.27+dfsg-1+deb10u2
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1d-0+deb10u7
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index df573d4be7cd..bbfa44b64111 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -6,6 +6,8 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 1cbfd81fb567..2ddcd36987c5 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -6,6 +6,8 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
+libsasl2-2==2.1.27+dfsg-1+deb10u1
+libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index b2f6a2b04265..e901c3c5de64 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -32,7 +32,7 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.1.18
+regex==2022.3.2
 requests==2.27.1
 scapy==2.4.4
 six==1.16.0
@@ -40,5 +40,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.8
 watchdog==0.10.3
-websocket-client==1.2.3
+websocket-client==1.3.1
 xmltodict==0.12.0
\ No newline at end of file

From 9ff94d2b9bddc8cfd09e2b9f2abdd9442bfebbff Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Tue, 8 Mar 2022 09:25:28 -0800
Subject: [PATCH 1064/1674] [sonic-snmpagent]: Advance submodule (#10092)

60f5237 (HEAD, origin/202012) [multi-asic]: Udpate to use SonicDBConfig from swsscommon (#219)
5c0d941 [201911][RFC1213]: Initialize lag oid map in reinit_data (#234)

Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index c160c2b2a12d..60f5237aa94f 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit c160c2b2a12d1c4d139b223165818f50f426dd39
+Subproject commit 60f5237aa94fffe5c9955c9490d3129581e86ecb

From 259aa0856b0e8e06034fb3fb7f9fb7ced074f6da Mon Sep 17 00:00:00 2001
From: Longxiang Lyu <35479537+lolyu@users.noreply.github.com>
Date: Tue, 25 Jan 2022 10:50:29 +0800
Subject: [PATCH 1065/1674] Add dualtor TSA/B/C support (#9726)

Why I did it
Add TSA/B/C dualtor support

Signed-off-by: Longxiang Lyu lolv@microsoft.com

How I did it
For TSA, toggle all the mux to standby if the device type is dualtor and there are active mux ports.
For TSC, add mux status output.

How to verify it
Run TSA/B/C on a dualtor setup
---
 dockers/docker-fpm-frr/base_image_files/TSA | 9 +++++++++
 dockers/docker-fpm-frr/base_image_files/TSB | 7 +++++++
 dockers/docker-fpm-frr/base_image_files/TSC | 6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/dockers/docker-fpm-frr/base_image_files/TSA b/dockers/docker-fpm-frr/base_image_files/TSA
index e96c76dd67b2..6b2ddb264834 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSA
+++ b/dockers/docker-fpm-frr/base_image_files/TSA
@@ -1,3 +1,12 @@
 #!/bin/bash
 
+# toggle the mux to standby if dualtor and any mux active
+if
+[[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]] &&
+[[ $(show mux status | grep active | wc -l) > 0 ]];
+then
+  logger -t TSA -p user.info "Toggle all mux mode to standby"
+  sudo config mux mode standby all
+fi
+
 /usr/bin/TS TSA
diff --git a/dockers/docker-fpm-frr/base_image_files/TSB b/dockers/docker-fpm-frr/base_image_files/TSB
index 176b10c684c8..3fed7bb644f5 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSB
+++ b/dockers/docker-fpm-frr/base_image_files/TSB
@@ -1,3 +1,10 @@
 #!/bin/bash
 
+# toggle the mux to auto if dualtor
+if [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]];
+then
+  logger -t TSB -p user.info "Toggle all mux mode to auto"
+  sudo config mux mode auto all
+fi
+
 /usr/bin/TS TSB
diff --git a/dockers/docker-fpm-frr/base_image_files/TSC b/dockers/docker-fpm-frr/base_image_files/TSC
index 09d1409c50c7..12af5d621af7 100755
--- a/dockers/docker-fpm-frr/base_image_files/TSC
+++ b/dockers/docker-fpm-frr/base_image_files/TSC
@@ -3,3 +3,9 @@
 /usr/bin/TS TSC
 
 portstat -p 5
+
+if [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]]
+then
+  echo
+  show mux status
+fi

From fe1157ac7b61a16eb7305339cd4dd7f26ced9b95 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Wed, 9 Mar 2022 17:18:58 +0800
Subject: [PATCH 1066/1674] Update cisco-8000 ref to release: 202012-v0.95
 (#10189)

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index dc19dbf223ea..3f0c08a5f1c9 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.94
+ref=202012-v0.95

From 7fe14890618e74c4ad5aa942fdcce03565635177 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 10 Mar 2022 06:41:51 +0800
Subject: [PATCH 1067/1674] [ci/build]: Upgrade SONiC package versions (#10194)

---
 files/build/versions/default/versions-git     |  2 +-
 .../docker-base-stretch/versions-deb-stretch  |  6 ++--
 .../dockers/docker-ptf/versions-deb-stretch   | 12 +++----
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 32 +++++++++----------
 .../versions-deb-stretch-armhf                |  6 +---
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../host-image/versions-deb-buster-arm64      |  2 +-
 8 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index bc2e85d6ff10..56c889a3092b 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 8de6397f60a1..2af10036cc10 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -6,7 +6,7 @@ libcurl3==7.52.1-5+deb9u16
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
 libestr0==0.1.10-2
-libexpat1==2.2.0-2+deb9u4
+libexpat1==2.2.0-2+deb9u5
 libfastjson4==0.99.8-1~bpo9+1
 libffi6==3.2.1-6
 libgdbm3==1.8.3-14
@@ -38,8 +38,8 @@ libpython2.7-minimal==2.7.13-2+deb9u6
 libpython2.7-stdlib==2.7.13-2+deb9u6
 libreadline7==7.0-3
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index e6942c423d1e..9e6a0eda6102 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -64,8 +64,8 @@ libedit2==3.1-20160903-3
 liberror-perl==0.17024-1
 libestr0==0.1.10-2
 libevent-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u4
-libexpat1-dev==2.2.0-2+deb9u4
+libexpat1==2.2.0-2+deb9u5
+libexpat1-dev==2.2.0-2+deb9u5
 libfakeroot==1.21-3.1
 libfastjson4==0.99.4-1
 libffi-dev==3.2.1-6
@@ -141,9 +141,9 @@ libqt5network5==5.7.1+dfsg-3+deb9u3
 libquadmath0==6.3.0-18+deb9u1
 libreadline7==7.0-3
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libseccomp2==2.3.1-2.1+deb9u1
 libsigsegv2==2.10-5
 libsqlite3-0==3.16.2-5+deb9u3
@@ -171,7 +171,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-2.2+deb9u5
 libxmuu1==2:1.1.2-2
-linux-libc-dev==4.9.290-1
+linux-libc-dev==4.9.303-1
 logrotate==3.11.0-0.1
 lsof==4.89+dfsg-0.1
 m4==1.4.18-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 4de041506e74..b029d6eada8a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 16df04db8f1e..072f8dde3890 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -98,7 +98,7 @@ exim4==4.89-2+deb9u8
 exim4-base==4.89-2+deb9u8
 exim4-config==4.89-2+deb9u8
 exim4-daemon-light==4.89-2+deb9u8
-expat==2.2.0-2+deb9u4
+expat==2.2.0-2+deb9u5
 exuberant-ctags==1:5.9~svn20110310-11
 fakeroot==1.21-3.1
 file==1:5.30-1+deb9u3
@@ -440,8 +440,8 @@ libevent-dev==2.0.21-stable-3
 libevent-extra-2.0-5==2.0.21-stable-3
 libevent-openssl-2.0-5==2.0.21-stable-3
 libevent-pthreads-2.0-5==2.0.21-stable-3
-libexpat1==2.2.0-2+deb9u4
-libexpat1-dev==2.2.0-2+deb9u4
+libexpat1==2.2.0-2+deb9u5
+libexpat1-dev==2.2.0-2+deb9u5
 libexplain-dev==1.4.D001-6
 libexplain51==1.4.D001-6
 libexporter-tiny-perl==0.042-1
@@ -891,9 +891,9 @@ librsvg2-2==2.40.21-0+deb9u1
 librsvg2-common==2.40.21-0+deb9u1
 librtmp1==2.4+20151223.gitfa8646d.1-1+b1
 libruby2.3==2.3.3-1+deb9u11
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libsaxon-java==1:6.5.5-10
 libscalar-list-utils-perl==1:1.47-1
 libsdl1.2debian==1.2.15+dfsg1-4+deb9u1
@@ -960,7 +960,7 @@ libtext-wrapi18n-perl==0.06-7.1
 libthai-data==0.1.26-1
 libthai0==0.1.26-1
 libtie-ixhash-perl==1.23-2
-libtiff5==4.0.8-2+deb9u7
+libtiff5==4.0.8-2+deb9u8
 libtimedate-perl==2.3000-2+deb9u1
 libtinfo-dev==6.0+20161126-1+deb9u2
 libtinyxml2-4==4.0.1-1
@@ -1128,12 +1128,12 @@ libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u2
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.290-1
-linux-headers-4.9.0-17-amd64==4.9.290-1
-linux-headers-4.9.0-17-common==4.9.290-1
-linux-headers-amd64==4.9+80+deb9u15
-linux-kbuild-4.9==4.9.290-1
-linux-libc-dev==4.9.290-1
+linux-compiler-gcc-6-x86==4.9.303-1
+linux-headers-4.9.0-18-amd64==4.9.303-1
+linux-headers-4.9.0-18-common==4.9.303-1
+linux-headers-amd64==4.9+80+deb9u16
+linux-kbuild-4.9==4.9.303-1
+linux-libc-dev==4.9.303-1
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
@@ -1307,9 +1307,9 @@ python-sphinx==1.4.9-2
 python-sphinx-rtd-theme==0.1.9-1
 python-stdeb==0.8.5-1
 python-tk==2.7.13-1
-python-twisted==16.6.0-2+deb9u1
-python-twisted-bin==16.6.0-2+deb9u1
-python-twisted-core==16.6.0-2+deb9u1
+python-twisted==16.6.0-2+deb9u2
+python-twisted-bin==16.6.0-2+deb9u2
+python-twisted-core==16.6.0-2+deb9u2
 python-tz==2016.7-0.3
 python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 89b400bbf461..fb64a5239dd9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -6,13 +6,9 @@ libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
-libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u2
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libtext-charwidth-perl==0.04-7+b6
-libtiff5==4.0.8-2+deb9u8
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
-linux-compiler-gcc-6-arm==4.9.290-1
+linux-compiler-gcc-6-arm==4.9.303-1
 nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 4de041506e74..b029d6eada8a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ce8be33399a0f4ad2f58c15489a2172a7f94952
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index bbfa44b64111..a8b70a165dec 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -13,7 +13,7 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 squashfs-tools==1:4.3-12+deb10u1
 tsingma-bsp==1.0
 tzdata==2021a-0+deb10u3

From 886153944ebe73b1b1bbe4289ce4bfa6ba7e646f Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Wed, 9 Mar 2022 17:45:10 -0800
Subject: [PATCH 1068/1674] sonic-sairedis submodule update (#10195)

---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index ef0bc578dee9..c45dc526ed11 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit ef0bc578dee90ee171fd3fa29011b4fbf550cd8c
+Subproject commit c45dc526ed118c5a00086f7ab432c184fc9e4ed7

From e83955599d1fbff2501c1ed90b3253e62ea71e35 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Fri, 11 Mar 2022 08:21:07 +0530
Subject: [PATCH 1069/1674] [202012] Refactoring DELL platform init to reduce
 rc.local processing time (#10171)

Why I did it
To reduce the processing time of rc.local, refactoring s6100 platform initialization.
Fixing [warm-upgrade][202012] Slow DELL platform init in rc.local causes lacp-teardown #10150
How I did it
On branch 202012-s6100-rclocalChanges to be committed:  (use "git restore --staged <file>..." to unstage)
        modified:   ../../../../files/image_config/platform/rc.local
	modified:   ../debian/platform-modules-s6100.install
	modified:   scripts/fast-reboot_plugin
        modified:   scripts/s6100_platform.sh
        renamed:    scripts/s6100_i2c_enumeration.sh -> scripts/s6100_platform_startup.sh
        renamed:    systemd/s6100-i2c-enumerate.service -> systemd/s6100-platform-startup.service
---
 files/image_config/platform/rc.local          |  3 +-
 .../debian/platform-modules-s6100.install     |  4 +-
 .../s6100/scripts/fast-reboot_plugin          |  2 +-
 .../s6100/scripts/s6100_platform.sh           | 51 ++++++++-----------
 ...umeration.sh => s6100_platform_startup.sh} | 22 +++++++-
 .../s6100/systemd/s6100-i2c-enumerate.service | 12 -----
 .../systemd/s6100-platform-startup.service    | 12 +++++
 7 files changed, 58 insertions(+), 48 deletions(-)
 rename platform/broadcom/sonic-platform-modules-dell/s6100/scripts/{s6100_i2c_enumeration.sh => s6100_platform_startup.sh} (94%)
 delete mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-i2c-enumerate.service
 create mode 100644 platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service

diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index 4d0e072a8a4f..fbbe04ca47eb 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -232,10 +232,9 @@ if [ ! -e /host/machine.conf ]; then
     fi
 
     umount /mnt/onie-boot
+    migrate_nos_configuration
 fi
 
-migrate_nos_configuration
-
 . /host/machine.conf
 
 program_console_speed
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
index fd891f0f6e8e..512e0529455e 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
@@ -1,6 +1,6 @@
 s6100/scripts/iom_power_*.sh usr/local/bin
 s6100/scripts/s6100_platform.sh usr/local/bin
-s6100/scripts/s6100_i2c_enumeration.sh usr/local/bin
+s6100/scripts/s6100_platform_startup.sh usr/local/bin
 s6100/scripts/s6100_bitbang_reset.sh usr/local/bin
 s6100/scripts/pcisysfs.py usr/bin
 common/dell_i2c_utils.sh usr/local/bin
@@ -31,7 +31,7 @@ s6100/systemd/s6100-ssd-monitor.service etc/systemd/system
 s6100/systemd/s6100-ssd-monitor.timer etc/systemd/system
 s6100/systemd/s6100-ssd-upgrade-status.service etc/systemd/system
 s6100/systemd/s6100-reboot-cause.service etc/systemd/system
-s6100/systemd/s6100-i2c-enumerate.service etc/systemd/system
+s6100/systemd/s6100-platform-startup.service etc/systemd/system
 tools/flashrom/flashrom usr/local/bin/
 common/fw-updater usr/local/bin
 common/onie_mode_set usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/fast-reboot_plugin b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/fast-reboot_plugin
index e32747c7fed5..d8e839e5be74 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/fast-reboot_plugin
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/fast-reboot_plugin
@@ -4,4 +4,4 @@ if [[ -d /sys/devices/platform/SMF.512/hwmon/ ]]; then
     cd /sys/devices/platform/SMF.512/hwmon/*
     echo 0xcc > mb_poweron_reason
 fi
-/usr/local/bin/s6100_i2c_enumeration.sh deinit & > /dev/null
+/usr/local/bin/s6100_platform_startup.sh deinit & > /dev/null
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index 39c9074d5f52..b5413c10aa50 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -2,27 +2,6 @@
 
 #platform init script for Dell S6100
 
-install_python_api_package() {
-    device="/usr/share/sonic/device"
-    platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
-
-    rv=$(pip install $device/$platform/sonic_platform-1.0-py2-none-any.whl)
-    rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
-}
-
-remove_python_api_package() {
-    rv=$(pip show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -eq 0 ]; then
-        rv=$(pip uninstall -y sonic-platform > /dev/null 2>/dev/null)
-    fi
-
-    rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -eq 0 ]; then
-        rv=$(pip3 uninstall -y sonic-platform > /dev/null 2>/dev/null)
-    fi
-}
-
-
 if [[ "$1" == "init" ]]; then
 
     pericom="/sys/bus/pci/devices/0000:08:00.0"
@@ -45,19 +24,32 @@ if [[ "$1" == "init" ]]; then
 
     systemctl start --no-block s6100-ssd-upgrade-status.service
 
-    is_fast_warm=$(cat /proc/cmdline | grep SONIC_BOOT_TYPE | wc -l)
-
-    if [[ "$is_fast_warm" == "1" ]]; then
-        systemctl start --no-block s6100-i2c-enumerate.service
+    case "$(cat /proc/cmdline)" in
+        *SONIC_BOOT_TYPE=warm*)
+            TYPE='warm'
+            ;;
+        *SONIC_BOOT_TYPE=fastfast*)
+            TYPE='fastfast'
+            ;;
+        *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
+            TYPE='fast'
+            ;;
+        *SONIC_BOOT_TYPE=soft*)
+            TYPE='soft'
+            ;;
+        *)
+            TYPE='cold'
+    esac
+
+    if [[ "$TYPE" == "cold" ]]; then
+        systemctl start s6100-platform-startup.service
     else
-        systemctl start s6100-i2c-enumerate.service
+        systemctl start --no-block s6100-platform-startup.service
     fi
 
-    install_python_api_package
-    monit reload
 
 elif [[ "$1" == "deinit" ]]; then
-    /usr/local/bin/s6100_i2c_enumeration.sh deinit
+    /usr/local/bin/s6100_platform_startup.sh deinit
 
     modprobe -r dell_s6100_lpc
     modprobe -r dell_s6100_iom_cpld
@@ -65,7 +57,6 @@ elif [[ "$1" == "deinit" ]]; then
     modprobe -r i2c-dev
     modprobe -r dell_ich
     modprobe -r nvram
-    remove_python_api_package
 else
      echo "s6100_platform : Invalid option !"
 fi
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_i2c_enumeration.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform_startup.sh
similarity index 94%
rename from platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_i2c_enumeration.sh
rename to platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform_startup.sh
index d00fec233eaa..a95771bf82ce 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_i2c_enumeration.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform_startup.sh
@@ -1,9 +1,24 @@
 #!/bin/bash
 
-### DellEMC S6100 I2C MUX Enumeration script
+### DellEMC S6100 Platform Startup script
 
 source dell_i2c_utils.sh
 
+install_python_api_package() {
+    device="/usr/share/sonic/device"
+    platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
+
+    rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
+}
+
+remove_python_api_package() {
+
+    rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
+    if [ $? -eq 0 ]; then
+        rv=$(pip3 uninstall -y sonic-platform > /dev/null 2>/dev/null)
+    fi
+}
+
 init_devnum() {
     found=0
     for devnum in 0 1; do
@@ -292,6 +307,9 @@ if [[ "$1" == "init" ]]; then
     switch_board_qsfp_lpmode "disable"
     /usr/local/bin/s6100_bitbang_reset.sh
     xcvr_presence_interrupts "enable"
+
+    install_python_api_package
+    monit reload
 elif [[ "$1" == "deinit" ]]; then
     xcvr_presence_interrupts "disable"
     switch_board_sfp "delete_device"
@@ -302,4 +320,6 @@ elif [[ "$1" == "deinit" ]]; then
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
     cpu_board_mux "delete_device"
+
+    remove_python_api_package
 fi
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-i2c-enumerate.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-i2c-enumerate.service
deleted file mode 100644
index c63482831940..000000000000
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-i2c-enumerate.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dell S6100 I2C MUX Enumeration
-Before=pmon.service
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/bin/s6100_i2c_enumeration.sh init
-RemainAfterExit=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service
new file mode 100644
index 000000000000..d7a40f43033c
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Dell S6100 Platform Startup Service
+Before=pmon.service determine-reboot-cause.service
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/s6100_platform_startup.sh init
+RemainAfterExit=no
+
+[Install]
+WantedBy=multi-user.target

From 1c4364222d22074c2ff773257e6392f0d895e0eb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 11 Mar 2022 23:13:09 +0800
Subject: [PATCH 1070/1674] [ci/build]: Upgrade SONiC package versions (#10214)

---
 .../versions/build/build-sonic-slave-buster/versions-git    | 4 ++--
 files/build/versions/default/versions-git                   | 6 +++---
 .../docker-config-engine-buster/versions-deb-buster-arm64   | 2 +-
 .../docker-config-engine-buster/versions-deb-buster-armhf   | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 2 +-
 .../versions/dockers/docker-syncd-bfn/versions-deb-buster   | 2 +-
 .../versions/dockers/docker-syncd-brcm/versions-deb-buster  | 2 +-
 .../dockers/docker-syncd-centec-rpc/versions-deb-buster     | 2 +-
 .../versions/dockers/docker-syncd-mlnx/versions-deb-buster  | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster-arm64    | 3 +++
 .../dockers/sonic-slave-buster/versions-deb-buster-armhf    | 5 ++++-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 --
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 --
 files/build/versions/host-image/versions-deb-buster         | 2 +-
 files/build/versions/host-image/versions-deb-buster-armhf   | 2 +-
 15 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index c5349c6fd616..c3f489c09f7a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,9 +3,9 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c
+https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922
+https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 56c889a3092b..b43dd9d82341 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==c848a4ed332e79a654cb4ee7ef29acd796f7147d
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,9 +9,9 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c
+https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922
+https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index e19bef5ea5ef..c30de4901997 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index e19bef5ea5ef..c30de4901997 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index f6b6e3be72f3..5bac9d63af92 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -11,7 +11,7 @@ idna==3.3
 importlib-metadata==4.11.2
 importlib-resources==5.4.0
 inflection==0.5.1
-itsdangerous==2.1.0
+itsdangerous==2.1.1
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index ea05a4841b8a..8ea45c882291 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 773410b51c58..5fb3bd87db07 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index b50eb2a2e9ed..30d02e2b3df4 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -54,7 +54,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 1611279d3227..fd7fd1e6bc20 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -32,7 +32,7 @@ libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 mft==4.18.1-16
 mlnx-sai==1.mlnx.SAIRel1.20.2.6
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index e7bffb7be010..feff0a2b31fc 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,7 +1,10 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+containerd.io==1.5.10-1
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
+linux-kbuild-4.19==4.19.232-1
+linux-libc-dev==4.19.232-1
 nodejs==14.19.0-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 88a35d23cb33..510c58ac1098 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,4 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+containerd.io==1.5.10-1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
@@ -99,7 +100,9 @@ libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
 libxslt1-dev==1.1.32-2.2~deb10u1
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.208-1
+linux-compiler-gcc-8-arm==4.19.232-1
+linux-kbuild-4.19==4.19.232-1
+linux-libc-dev==4.19.232-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index b029d6eada8a..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index b029d6eada8a..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index dc223e070bc9..6e658d5ef910 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -9,7 +9,7 @@ busybox==1:1.30.1-4
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.4.13-1
+containerd.io==1.5.10-1
 cpio==2.12+dfsg-9
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 2ddcd36987c5..9818aed5adf8 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -13,7 +13,7 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.208-1
+linux-libc-dev==4.19.232-1
 mrvlprestera==1.0
 squashfs-tools==1:4.3-12+deb10u1
 tzdata==2021a-0+deb10u3

From 5878cfdb0652a61441bcd97acdfb6acf9b3e4e7d Mon Sep 17 00:00:00 2001
From: wenyiz2021 <91497961+wenyiz2021@users.noreply.github.com>
Date: Wed, 23 Feb 2022 18:06:30 -0800
Subject: [PATCH 1071/1674] Update container_checker for multi-asic devices
 when state is 'always_enabled' (#10067)

* Update container_checker for multi-asic devices

Update container_checker for multi-asic devices to add database containers in always_running_containers.
Previous change was made for single-asic, and that database containers were not considered as feature when writing to state_db.

* Update container_checker

Update an indent
---
 files/image_config/monit/container_checker | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/files/image_config/monit/container_checker b/files/image_config/monit/container_checker
index 2a000d1e6bb7..63bd7b3e182d 100755
--- a/files/image_config/monit/container_checker
+++ b/files/image_config/monit/container_checker
@@ -41,7 +41,7 @@ def get_expected_running_containers():
 
     expected_running_containers = set()
     always_running_containers = set()
-
+    
     for container_name in feature_table.keys():
         if feature_table[container_name]["state"] not in ["disabled", "always_disabled"]:
             if multi_asic.is_multi_asic():
@@ -51,14 +51,20 @@ def get_expected_running_containers():
                     num_asics = multi_asic.get_num_asics()
                     for asic_id in range(num_asics):
                         expected_running_containers.add(container_name + str(asic_id))
-            elif feature_table[container_name]["state"] == 'always_enabled':
-                always_running_containers.add(container_name)
             else:
                 expected_running_containers.add(container_name)
-
+        if feature_table[container_name]["state"] == 'always_enabled':
+            if multi_asic.is_multi_asic():
+                if feature_table[container_name]["has_global_scope"] == "True":
+                    always_running_containers.add(container_name)
+                if feature_table[container_name]["has_per_asic_scope"] == "True":
+                    num_asics = multi_asic.get_num_asics()
+                    for asic_id in range(num_asics):
+                        always_running_containers.add(container_name + str(asic_id))
+            else:
+                always_running_containers.add(container_name)
     return expected_running_containers, always_running_containers
 
-
 def get_current_running_from_DB(always_running_containers):
     """
     @summary: This function will get the current running container list

From 3ca38b2eb699e5ad3b6c7ca11d19c83596d8e0c7 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 16 Mar 2022 12:23:04 +0800
Subject: [PATCH 1072/1674] [Build]: Enable the PR reproducible build (#10241)

[Build]: Enable the PR reproducible build
---
 azure-pipelines.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1c5080806e26..09220c195e57 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,8 +35,7 @@ stages:
   pool: sonicbld
   variables:
     CACHE_MODE: rcache
-    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
@@ -49,8 +48,7 @@ stages:
   dependsOn: []
   variables:
     CACHE_MODE: rcache
-    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:

From 0b3a5551792270a7179e7fc29770c3a13206ce18 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Wed, 16 Mar 2022 05:22:47 -0700
Subject: [PATCH 1073/1674] [202012] [sonic-utilities] Submodule update
 (#10221)

Advance sonic-utilities submodule to include the following changes

98de850 [muxcable][show] enhance show mux status to show last switchover time Azure/sonic-utilities#2067
3da82d1 [show][muxcable] fix the sudo access error for show muxcable metrics Azure/sonic-utilities#2083
7acbadb [build] stop vstest in the Azure pipeline Azure/sonic-utilities#2098
3fed440 [show][config] add muxcable command line support for retrieve / reset ICMP packet loss data Azure/sonic-utilities#2094
aa21e3a [202012] [counterpoll] Display the correct default poll interval for watermark counters Azure/sonic-utilities#2091

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 6dfbdcb66560..aa21e3a4c932 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 6dfbdcb665602dadcdb5539bfbf8aa937478fde3
+Subproject commit aa21e3a4c932788489f654eebe2cbdfe81a9e9ae

From 149229e455f4a17c9e7bf76f0b194bd1ef905a03 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 14 Mar 2022 11:20:20 +0800
Subject: [PATCH 1074/1674] [Build]: Fix installing dpkg packages in parallel
 issue (#10175)

Why I did it
Fix the debian packages installing in parallel issue.
Add apt hook command to support apt to print no version control info.
---
 src/sonic-build-hooks/hooks/apt               |  5 ++
 src/sonic-build-hooks/hooks/apt-get           | 39 ++++------
 .../scripts/buildinfo_base.sh                 | 74 +++++++++++++++++++
 3 files changed, 92 insertions(+), 26 deletions(-)
 create mode 100755 src/sonic-build-hooks/hooks/apt

diff --git a/src/sonic-build-hooks/hooks/apt b/src/sonic-build-hooks/hooks/apt
new file mode 100755
index 000000000000..f4b0f97287b1
--- /dev/null
+++ b/src/sonic-build-hooks/hooks/apt
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+. /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+
+APT_REAL_COMMAND=$(get_command apt) $(dirname "$0")/apt-get "$@"
diff --git a/src/sonic-build-hooks/hooks/apt-get b/src/sonic-build-hooks/hooks/apt-get
index 9ae50a118650..f1f789542b7a 100755
--- a/src/sonic-build-hooks/hooks/apt-get
+++ b/src/sonic-build-hooks/hooks/apt-get
@@ -3,36 +3,23 @@
 INSTALL=
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
 
-REAL_COMMAND=$(get_command apt-get)
+REAL_COMMAND=$APT_REAL_COMMAND
+[ -z "$REAL_COMMAND" ] && REAL_COMMAND=$(get_command apt-get)
 if [ -z "$REAL_COMMAND" ]; then
     echo "The command apt-get does not exist." 1>&2
     exit 1
 fi
 
-VERSION_FILE="/usr/local/share/buildinfo/versions/versions-deb"
-if [ "$ENABLE_VERSION_CONTROL_DEB" == "y" ]; then
-    for para in $@
-    do
-        if [[ "$para" != -* ]]; then
-            continue
-        fi
-        if [ ! -z "$INSTALL" ]; then
-            if [[ "$para" == *=* ]]; then
-                continue
-            elif [[ "$para" == *=* ]]; then
-                continue
-            else
-                package=$para
-                if ! grep -q "^${package}=" $VERSION_FILE; then
-                    echo "The version of the package ${package} is not specified."
-                    exit 1
-                fi
-            fi
-        elif [[ "$para" == "install"  ]]; then
-            INSTALL=y
-        fi
-    done
+INSTALL=$(check_apt_install)
+COMMAND_INFO="Locked by command: $REAL_COMMAND $@"
+if [ "$INSTALL" == y ]; then
+    check_apt_version
+    lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" )
+    $REAL_COMMAND "$@"
+    command_result=$?
+    [ "$lock_result" == y ] && release_apt_installation_lock
+    exit $command_result
+else
+    $REAL_COMMAND "$@"
 fi
 
-
-$REAL_COMMAND "$@"
diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index f156930bf06d..07eca94bce9f 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -12,6 +12,7 @@ VERSION_DEB_PREFERENCE=$BUILDINFO_PATH/versions/01-versions-deb
 WEB_VERSION_FILE=$VERSION_PATH/versions-web
 BUILD_WEB_VERSION_FILE=$BUILD_VERSION_PATH/versions-web
 REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/debian'
+DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
 
 . $BUILDINFO_PATH/config/buildinfo.config
 
@@ -176,6 +177,79 @@ run_pip_command()
     return $result
 }
 
+# Check if the command is to install the debian packages
+# The apt/apt-get command format: apt/apt-get [options] {update|install}
+check_apt_install()
+{
+    for para in "$@"
+    do
+        if [[ "$para" == -* ]]; then
+            continue
+        fi
+
+        if [[ "$para" == "install"  ]]; then
+            echo y
+        fi
+
+        break
+    done
+}
+
+# Print warning message if a debian package version not specified when debian version control enabled.
+check_apt_version()
+{
+    VERSION_FILE="/usr/local/share/buildinfo/versions/versions-deb"
+    local install=$(check_apt_install "$@")
+    if [ "$ENABLE_VERSION_CONTROL_DEB" == "y" ] && [ "$install" == "y" ]; then
+        for para in "$@"
+        do
+            if [[ "$para" == -* ]]; then
+                continue
+            fi
+
+            if [[ "$para" == *=* ]]; then
+                continue
+            else
+                package=$para
+                if ! grep -q "^${package}=" $VERSION_FILE; then
+                    echo "Warning: the version of the package ${package} is not specified." 1>&2
+                fi
+            fi
+        done
+    fi
+}
+
+acquire_apt_installation_lock()
+{
+    local result=n
+    local wait_in_second=10
+    local count=60
+    local info="$1"
+    for ((i=1; i<=$count; i++)); do
+        if [ -f $DPKG_INSTALLTION_LOCK_FILE ]; then
+            local lock_info=$(cat $DPKG_INSTALLTION_LOCK_FILE || true)
+            echo "Waiting dpkg lock for $wait_in_second, $i/$count, info: $lock_info" 1>&2
+            sleep $wait_in_second
+        else
+            # Create file in an atomic operation
+            if (set -o noclobber; echo "$info">$DPKG_INSTALLTION_LOCK_FILE) &>/dev/null; then
+                result=y
+                break
+            else
+                echo "Failed to creat lock, Waiting dpkg lock for $wait_in_second, $i/$count, info: $lock_info" 1>&2
+                sleep $wait_in_second
+            fi
+        fi
+    done
+
+    echo $result
+}
+
+release_apt_installation_lock()
+{
+    rm -f $DPKG_INSTALLTION_LOCK_FILE
+}
+
 ENABLE_VERSION_CONTROL_DEB=$(check_version_control "deb")
 ENABLE_VERSION_CONTROL_PY2=$(check_version_control "py2")
 ENABLE_VERSION_CONTROL_PY3=$(check_version_control "py3")

From 8ce5e4e77beb2c91507ffb16bc19c52ba67bbb63 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 15 Mar 2022 09:20:36 +0200
Subject: [PATCH 1075/1674] [teamd.sh] kill teamd docker on warm shutdown for
 faster shutdown (#10219)

This can save 6 sec for teamd LAG restoration - the time between:

```
Mar  9 13:51:10.467757 r-panther-13 WARNING teamd#teamd_PortChannel1[28]: Got SIGUSR1.
Mar  9 13:52:33.310707 r-panther-13 INFO teamd#teamd_PortChannel1[27]: carrier changed to UP
```

- Why I did it
Optimize warm boot. Specifically reduce the time needed for LAG restoration.

- How I did it
Kill teamd docker after graceful shutdown of teamd processes.

- How to verify it
Run warm reboot.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 files/scripts/teamd.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/scripts/teamd.sh b/files/scripts/teamd.sh
index 6b34323cf7d3..a5e29c1d0904 100755
--- a/files/scripts/teamd.sh
+++ b/files/scripts/teamd.sh
@@ -75,13 +75,17 @@ stop() {
         # We call `docker kill teamd` to ensure the container stops as quickly as possible,
         # Note: teamd must be killed before syncd, because it will send the last packet through CPU port
         docker exec -i ${SERVICE}$DEV pkill -USR2 -f ${TEAMD_CMD} || [ $? == 1 ]
+    fi
+
+    if [[ x"$WARM_BOOT" == x"true" ]] || [[ x"$FAST_BOOT" == x"true" ]]; then
         while docker exec -i ${SERVICE}$DEV pgrep -f ${TEAMD_CMD} > /dev/null; do
             sleep 0.05
         done
         docker kill ${SERVICE}$DEV  &> /dev/null || debug "Docker ${SERVICE}$DEV is not running ($?) ..."
+    else
+        /usr/bin/${SERVICE}.sh stop $DEV
     fi
 
-    /usr/bin/${SERVICE}.sh stop $DEV
     debug "Stopped ${SERVICE}$DEV service..."
 }
 

From 3455e99d4563285e0b688505098eaca0bc5e3c53 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 18 Mar 2022 12:01:52 +0800
Subject: [PATCH 1076/1674] Add a config variable to override default container
 registry instead of dockerhub. (#10166) (#10262)

* Add variable to reset default docker registry
* fix bug in docker version control
---
 Makefile.work                             | 9 +++++++--
 dockers/docker-base-buster/Dockerfile.j2  | 7 ++++---
 dockers/docker-base-stretch/Dockerfile.j2 | 7 ++++---
 dockers/docker-base/Dockerfile.j2         | 7 ++++---
 dockers/docker-ptf/Dockerfile.j2          | 7 ++++---
 dockers/docker-sonic-mgmt/Dockerfile.j2   | 3 ++-
 rules/config                              | 3 +++
 scripts/docker_version_control.sh         | 6 ++++--
 slave.mk                                  | 3 +++
 sonic-slave-buster/Dockerfile.j2          | 9 +++++----
 sonic-slave-jessie/Dockerfile.j2          | 7 ++++---
 sonic-slave-stretch/Dockerfile.j2         | 7 ++++---
 12 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index ced72b31a160..51d8c1fc6334 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -110,6 +110,10 @@ rules/config.user:
 include rules/config
 -include rules/config.user
 
+ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
+override DEFAULT_CONTAINER_REGISTRY := $(DEFAULT_CONTAINER_REGISTRY)/
+endif
+
 ifeq ($(ENABLE_DOCKER_BASE_PULL),)
 	override ENABLE_DOCKER_BASE_PULL = n
 endif
@@ -134,9 +138,9 @@ $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
     scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
-$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
+$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
-$(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
+$(shell BUILD_SLAVE=y DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
 SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
@@ -274,6 +278,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                            BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                            SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
+                           SONIC_DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
                            SLAVE_DIR=$(SLAVE_DIR) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
diff --git a/dockers/docker-base-buster/Dockerfile.j2 b/dockers/docker-base-buster/Dockerfile.j2
index ac3fd7743e77..e16a0f677b07 100644
--- a/dockers/docker-base-buster/Dockerfile.j2
+++ b/dockers/docker-base-buster/Dockerfile.j2
@@ -1,10 +1,11 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
 {% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:armhf-buster
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-buster
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-buster
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-buster
 {% else %}
-FROM {{DOCKER_BASE_ARCH}}/debian:buster
+FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:buster
 {% endif %}
 
 # Clean documentation in FROM image
diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index b77814bb2820..5603dc502792 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -1,10 +1,11 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
 {% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:armhf-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-stretch
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-stretch
 {% else %}
-FROM {{DOCKER_BASE_ARCH}}/debian:stretch
+FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:stretch
 {% endif %}
 
 # Clean documentation in FROM image
diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index 616a4cde7aff..15df3fe8a754 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -1,9 +1,10 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:armhf-jessie
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-jessie
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-jessie
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-jessie
 {% else %}
-FROM {{DOCKER_BASE_ARCH}}/debian:jessie
+FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:jessie
 {% endif %}
 
 ## Remove retired jessie-updates repo
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index fc87fa9f36f0..a46210c522a8 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -1,9 +1,10 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {% if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:armhf-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-stretch
 {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-stretch
 {% else %}
-FROM debian:stretch
+FROM {{ prefix }}debian:stretch
 {% endif %}
 
 MAINTAINER Pavel Shirshov
diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index fa965ef67c22..563c598b1bdc 100644
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -1,4 +1,5 @@
-FROM ubuntu:18.04
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
+FROM {{ prefix }}ubuntu:18.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/rules/config b/rules/config
index 07f868605544..539116e3c1f9 100644
--- a/rules/config
+++ b/rules/config
@@ -194,3 +194,6 @@ REGISTRY_SERVER ?= sonicdev-microsoft.azurecr.io
 
 # INCLUDE_MUX - build docker-mux for dual ToR (Gemini)
 INCLUDE_MUX = y
+
+# reset default container registry from dockerhub to other
+DEFAULT_CONTAINER_REGISTRY ?=
diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh
index 595477c859c6..da8cd0484f49 100755
--- a/scripts/docker_version_control.sh
+++ b/scripts/docker_version_control.sh
@@ -16,6 +16,8 @@ mkdir -p target/versions/default
 . src/sonic-build-hooks/buildinfo/config/buildinfo.config
 
 image_tag=`grep "^FROM " $DOCKERFILE | awk '{print$2}'`
+image_tag_noprefix=$image_tag
+[ -n "$DEFAULT_CONTAINER_REGISTRY" ] && image_tag_noprefix=$(echo $image_tag | sed "s#$DEFAULT_CONTAINER_REGISTRY##")
 image=`echo $image_tag | cut -f1 -d:`
 tag=`echo $image_tag | cut -f2 -d:`
 
@@ -25,7 +27,7 @@ if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION
         exit 0
     fi
     if [ -f $version_file ];then
-        hash_value=`grep "${ARCH}:${image_tag}" $version_file | awk -F== '{print$2}'`
+        hash_value=`grep "${ARCH}:${image_tag_noprefix}" $version_file | awk -F== '{print$2}'`
     fi
     if [ -z $hash_value ];then
         hash_value=unknown
@@ -43,5 +45,5 @@ else
     fi
 fi
 if [[ "$hash_value" != "unknown" ]];then
-    echo -e "${ARCH}:${image_tag}==$hash_value" >> $new_version_file
+    echo -e "${ARCH}:${image_tag_noprefix}==$hash_value" >> $new_version_file
 fi
diff --git a/slave.mk b/slave.mk
index 73522008b519..60253d53bf54 100644
--- a/slave.mk
+++ b/slave.mk
@@ -123,6 +123,8 @@ include $(RULES_PATH)/config
 export PACKAGE_URL_PREFIX
 export TRUSTED_GPG_URLS
 export SONIC_VERSION_CONTROL_COMPONENTS
+DEFAULT_CONTAINER_REGISTRY := $(SONIC_DEFAULT_CONTAINER_REGISTRY)
+export DEFAULT_CONTAINER_REGISTRY
 
 ifeq ($(SONIC_ENABLE_PFCWD_ON_START),y)
 ENABLE_PFCWD_ON_START = y
@@ -281,6 +283,7 @@ $(info "TELEMETRY_WRITABLE"              : "$(TELEMETRY_WRITABLE)")
 $(info "PDDF_SUPPORT"                    : "$(PDDF_SUPPORT)")
 $(info "MULTIARCH_QEMU_ENVIRON"          : "$(MULTIARCH_QEMU_ENVIRON)")
 $(info "SONIC_VERSION_CONTROL_COMPONENTS": "$(SONIC_VERSION_CONTROL_COMPONENTS)")
+$(info "DEFAULT_CONTAINER_REGISTRY"      : "$(SONIC_DEFAULT_CONTAINER_REGISTRY)")
 $(info )
 else
 $(info SONiC Build System for $(CONFIGURED_PLATFORM):$(CONFIGURED_ARCH))
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 09d50514a043..8851b8f0924d 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -1,11 +1,12 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {%- if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/qemu-user-static:x86_64-arm-5.0.0-2 as qemu
-FROM multiarch/debian-debootstrap:armhf-buster
+FROM {{ prefix }}multiarch/qemu-user-static:x86_64-arm-5.0.0-2 as qemu
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-buster
 COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
 {%- elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-buster
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-buster
 {%- else -%}
-FROM debian:buster
+FROM {{ prefix }}debian:buster
 {%- endif %}
 
 MAINTAINER gulv@microsoft.com
diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index 3c3e773ed2f9..8d58b4199a09 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -1,9 +1,10 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {%- if CONFIGURED_ARCH == "armhf"  -%}
-FROM multiarch/debian-debootstrap:armhf-jessie
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-jessie
 {%- elif CONFIGURED_ARCH == "arm64" -%}
-FROM multiarch/debian-debootstrap:arm64-jessie
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-jessie
 {%- else -%}
-FROM debian:jessie
+FROM {{ prefix }}debian:jessie
 {%- endif %}
 
 MAINTAINER johnar@microsoft.com
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 1cef023b7a04..9a9e9dca9d2a 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -1,9 +1,10 @@
+{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
 {%- if CONFIGURED_ARCH == "armhf" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:armhf-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:armhf-stretch
 {%- elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
-FROM multiarch/debian-debootstrap:arm64-stretch
+FROM {{ prefix }}multiarch/debian-debootstrap:arm64-stretch
 {%- else -%}
-FROM debian:stretch
+FROM {{ prefix }}debian:stretch
 {%- endif %}
 
 MAINTAINER gulv@microsoft.com

From fcf365b3da30075cdbb016b04a6593a713c72d87 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Fri, 18 Mar 2022 11:41:25 -0700
Subject: [PATCH 1077/1674] [202012][sonic-platform-common] submodule update
 (#10254)

This PR adds the following commits in sonic-platform-common

eb35c85[Credo][Ycable] Fix Credo firmware download API download_firmware flag (#269)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 1f32e5c2dee5..eb35c857deed 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 1f32e5c2dee56ecfe8209da513ca11bd737c93d1
+Subproject commit eb35c857deedf0d14dcf5d8233f8358104b10566

From 03d058efe43284820e0367c34737388e976719bc Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 19 Mar 2022 11:09:51 +0800
Subject: [PATCH 1078/1674] [ci/build]: Upgrade SONiC package versions (#10283)

[ci/build]: Upgrade SONiC package versions
---
 .../build-sonic-slave-buster/versions-git     |  6 +++---
 files/build/versions/default/versions-docker  | 20 +++++++++----------
 files/build/versions/default/versions-git     |  8 ++++----
 .../docker-base-buster/versions-deb-buster    |  6 +++---
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-base-stretch/versions-deb-stretch  | 12 +++++------
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 18 ++++++++---------
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  4 ++--
 .../docker-syncd-brcm-rpc/versions-deb-buster |  4 ++--
 .../versions-deb-buster                       |  4 ++--
 .../versions-deb-buster-arm64                 |  2 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  4 ++--
 .../versions-deb-buster-arm64                 |  8 +++++++-
 .../versions-deb-buster-armhf                 |  6 ++++++
 .../dockers/sonic-slave-buster/versions-git   |  1 +
 .../sonic-slave-buster/versions-py3-all-arm64 |  1 +
 .../sonic-slave-buster/versions-py3-all-armhf |  1 +
 .../versions-deb-stretch-arm64                | 11 +++++++++-
 .../versions-deb-stretch-armhf                | 11 +++++++++-
 .../versions/host-image/versions-deb-buster   |  6 +++---
 files/build/versions/host-image/versions-py3  |  8 ++++----
 31 files changed, 98 insertions(+), 65 deletions(-)
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index c3f489c09f7a..4ff4a4db0288 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,11 +1,11 @@
-https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
+https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4
+https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc
+https://github.com/thom311/libnl==b7256d3da8d7f63b9f0839fe0323da53860ac8a8
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 978e032dea93..3ca6c18c6ab6 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,7 +1,7 @@
-amd64:amd64/debian:buster==sha256:88779010dc8957be221862da13a9daad4e453a1d0438697cbb1e733832876729
-amd64:amd64/debian:stretch==sha256:a581dd3cf706b8c4c0cc770accc73e6fe6d0f3ffdc712e6ac8e0380524bdc5fd
-amd64:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
-amd64:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
+amd64:amd64/debian:buster==sha256:e82e10f0b9560e5947a16eb28c2992ec03121fc8c9659bce0cc94c5b7b6178c9
+amd64:amd64/debian:stretch==sha256:9c527f568723af8154327099fd05ac8d4ca5cfe64989788a27a6d7467f663c34
+amd64:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
+amd64:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
 amd64:docker-base-buster==
 amd64:docker-base-stretch==
 amd64:docker-config-engine-buster==
@@ -29,15 +29,15 @@ amd64:docker-syncd-mlnx==
 amd64:docker-syncd-nephos==
 amd64:docker-syncd-vs==
 amd64:docker-teamd==
-arm64:arm64v8/debian:buster==sha256:5a79440171f4e602be527350ffc00d715a3c20ce93ddc2840cc4e82a788f82cf
-arm64:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
-arm64:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
+arm64:arm64v8/debian:buster==sha256:272ea3972e872b8f689a9b9906bb3de9a070a1d85ad1635fedd91ddc18177be0
+arm64:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
+arm64:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
 arm64:docker-base-buster==
 arm64:docker-config-engine-buster==
 arm64:docker-swss-layer-buster==
-armhf:arm32v7/debian:buster==sha256:1860e6fb153759fb7ccca2b16efae8017cf79418d5cd60c764ffbffe072677fc
-armhf:debian:buster==sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a
-armhf:debian:stretch==sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9
+armhf:arm32v7/debian:buster==sha256:fd44803ead0f35dc61f44c38b7df153b16eb933f86fd0b83d775cffe332a6b54
+armhf:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
+armhf:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
 armhf:docker-base-buster==
 armhf:docker-config-engine-buster==
 armhf:docker-swss-layer-buster==
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b43dd9d82341..44e01778b7f2 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==c848a4ed332e79a654cb4ee7ef29acd796f7147d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==950a6b4225ed3280aa0fbca2de51bfbaecd7695a
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
-https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90
+https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
@@ -9,9 +9,9 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4
+https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc
+https://github.com/thom311/libnl==b7256d3da8d7f63b9f0839fe0323da53860ac8a8
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index d51627dd0be8..f06a01cef517 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -7,7 +7,7 @@ libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdbus-1-3==1.12.20-0+deb10u1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u3
+libexpat1==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u8
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1d-0+deb10u7
+openssl==1.1.1d-0+deb10u8
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 06d3e7888a36..e5755d982b51 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,6 +1,6 @@
 j2cli==0.3.10
 jinja2==3.0.3
-markupsafe==2.1.0
+markupsafe==2.1.1
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
 toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 2af10036cc10..b05da3862a4d 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -43,8 +43,8 @@ libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
 libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
-libssl1.0.2==1.0.2u-1~deb9u6
-libssl1.1==1.1.0l-1~deb9u4
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u5
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
 libwrap0==7.6.q-26
@@ -52,7 +52,7 @@ libzmq5==4.2.1-4+deb9u4
 lua-cjson==2.1.0+dfsg-2
 mime-support==3.60
 net-tools==1.60+git20161116.90da8a0-1
-openssl==1.1.0l-1~deb9u4
+openssl==1.1.0l-1~deb9u5
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
 procps==2:3.3.12-3+deb9u1
@@ -66,6 +66,6 @@ readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.0.0197-4+deb9u4
-vim-tiny==2:8.0.0197-4+deb9u4
-xxd==2:8.0.0197-4+deb9u4
\ No newline at end of file
+vim-common==2:8.0.0197-4+deb9u5
+vim-tiny==2:8.0.0197-4+deb9u5
+xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index f880487e89b9..f4035c87f120 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.3.2
+regex==2022.3.15
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 40908680f9a7..4784968efcf0 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 40908680f9a7..4784968efcf0 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 9e6a0eda6102..27953a57b1f1 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -148,10 +148,10 @@ libseccomp2==2.3.1-2.1+deb9u1
 libsigsegv2==2.10-5
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
-libssl-dev==1.1.0l-1~deb9u4
-libssl-doc==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u6
-libssl1.1==1.1.0l-1~deb9u4
+libssl-dev==1.1.0l-1~deb9u5
+libssl-doc==1.1.0l-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u5
 libstdc++-6-dev==6.3.0-18+deb9u1
 libtacacs+1==4.0.4.27a-3
 libtasn1-6==4.10-1.1+deb9u1
@@ -191,7 +191,7 @@ ntpstat==0.0.0.1-1+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u4
+openssl==1.1.0l-1~deb9u5
 patch==2.7.5-1+deb9u2
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
@@ -229,12 +229,12 @@ tmux==2.3-4
 traceroute==1:2.1.0-2
 ucf==3.0036
 unzip==6.0-21+deb9u2
-vim==2:8.0.0197-4+deb9u4
-vim-common==2:8.0.0197-4+deb9u4
-vim-runtime==2:8.0.0197-4+deb9u4
+vim==2:8.0.0197-4+deb9u5
+vim-common==2:8.0.0197-4+deb9u5
+vim-runtime==2:8.0.0197-4+deb9u5
 wget==1.18-5+deb9u3
 xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
-xxd==2:8.0.0197-4+deb9u4
+xxd==2:8.0.0197-4+deb9u5
 xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 2d070ca8beae..164eb7d0bf57 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.9.2
+paramiko==2.10.2
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 5bac9d63af92..c3716311d242 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.0.3
 grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.11.2
+importlib-metadata==4.11.3
 importlib-resources==5.4.0
 inflection==0.5.1
 itsdangerous==2.1.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 541881858917..d6a13c7bdda0 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.8
\ No newline at end of file
+urllib3==1.26.9
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 7cbaab2ee705..1e2eb3a427f3 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.27.1
 scapy==2.4.4
 tabulate==0.8.9
-urllib3==1.26.8
+urllib3==1.26.9
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index b8610f9d09c9..be8d32b2603e 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u7
+libssl-dev==1.1.1d-0+deb10u8
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 2ecb687e09fe..3d215665bc21 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
@@ -45,7 +45,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u7
+libssl-dev==1.1.1d-0+deb10u8
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 30d02e2b3df4..4f186f6d3bca 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
@@ -47,7 +47,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u7
+libssl-dev==1.1.1d-0+deb10u8
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index 8e10df0e7e3f..9ccdbee2db43 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 846366f1e9eb..5cd2cc7617f8 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u7
+libssl-dev==1.1.1d-0+deb10u8
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index fd7fd1e6bc20..4b7b26e06c96 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -11,7 +11,7 @@ libc6-dev==2.28-10
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u2
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 3f83138fd056..0b4ce26e36d9 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1-dev==2.2.6-2+deb10u4
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6
 libpcap0.8==1.8.1-6
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index e60d61388961..c21ec7d194f1 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -25,5 +25,5 @@ sshpass==1.06-1
 strace==4.15-2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.0.0197-4+deb9u4
-vim-runtime==2:8.0.0197-4+deb9u4
\ No newline at end of file
+vim==2:8.0.0197-4+deb9u5
+vim-runtime==2:8.0.0197-4+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index feff0a2b31fc..ae5c2eea3857 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,10 +1,16 @@
 binutils-aarch64-linux-gnu==2.31.1-16
 containerd.io==1.5.10-1
+expat==2.2.6-2+deb10u4
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
+libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
+libssl-dev==1.1.1d-0+deb10u8
+libssl1.1==1.1.1d-0+deb10u8
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
 linux-kbuild-4.19==4.19.232-1
 linux-libc-dev==4.19.232-1
-nodejs==14.19.0-deb-1nodesource1
\ No newline at end of file
+nodejs==14.19.0-deb-1nodesource1
+openssl==1.1.1d-0+deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 510c58ac1098..56012d886f3c 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,5 +1,6 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
 containerd.io==1.5.10-1
+expat==2.2.6-2+deb10u4
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
@@ -12,6 +13,8 @@ libdrm-omap1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
 libexception-class-perl==1.44-1
+libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
 libgles2-mesa-dev==18.3.6-2+deb10u1
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
@@ -96,6 +99,8 @@ librust-wincolor-dev==1.0.0-1
 libsass1==3.5.5-4
 libsombok3==2.4.0-2
 libspecio-perl==0.43-1
+libssl-dev==1.1.1d-0+deb10u8
+libssl1.1==1.1.1d-0+deb10u8
 libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
 libxslt1-dev==1.1.32-2.2~deb10u1
@@ -107,6 +112,7 @@ llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
 nodejs==14.19.0-deb-1nodesource1
+openssl==1.1.1d-0+deb10u8
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..edcfb909672f
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==76979dae56c08d24b092347a1bdd2abe474555a3
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
new file mode 100644
index 000000000000..058f7bfd1823
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1 @@
+regex==2022.3.15
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
new file mode 100644
index 000000000000..058f7bfd1823
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1 @@
+regex==2022.3.15
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 00f894c2df08..0c1250201072 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,8 +1,17 @@
 docker-ce==18.06.3~ce~3-0~debian
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
+libflac8==1.3.2-2+deb9u2
+libssl-dev==1.1.0l-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u5
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+openssl==1.1.0l-1~deb9u5
+vim==2:8.0.0197-4+deb9u5
+vim-common==2:8.0.0197-4+deb9u5
+vim-runtime==2:8.0.0197-4+deb9u5
+xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index fb64a5239dd9..2efb0e25c59f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -4,11 +4,20 @@ libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
+libflac8==1.3.2-2+deb9u2
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
+libssl-dev==1.1.0l-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u5
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.303-1
-nodejs==10.24.1-1nodesource1
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
+openssl==1.1.0l-1~deb9u5
+vim==2:8.0.0197-4+deb9u5
+vim-common==2:8.0.0197-4+deb9u5
+vim-runtime==2:8.0.0197-4+deb9u5
+xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 6e658d5ef910..138e139f69a9 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -87,7 +87,7 @@ libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u3
+libexpat1==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
@@ -161,7 +161,7 @@ libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u8
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libsystemd0==247.3-6~bpo10+1
@@ -201,7 +201,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u7
+openssl==1.1.1d-0+deb10u8
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index e901c3c5de64..26f41fb15271 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2021.10.8
 cffi==1.15.0
 charset-normalizer==2.0.12
 click==7.0
-cryptography==36.0.1
+cryptography==36.0.2
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
@@ -17,7 +17,7 @@ jsondiff==1.3.1
 jsonschema==2.6.0
 lxml==4.6.3
 m2crypto==0.38.0
-markupsafe==2.1.0
+markupsafe==2.1.1
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
@@ -32,13 +32,13 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.3.2
+regex==2022.3.15
 requests==2.27.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.9
 thrift==0.13.0
-urllib3==1.26.8
+urllib3==1.26.9
 watchdog==0.10.3
 websocket-client==1.3.1
 xmltodict==0.12.0
\ No newline at end of file

From 413ee3e219a8300b7a8b83957c3b417539a05064 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 19 Mar 2022 22:19:06 +0800
Subject: [PATCH 1079/1674] [Build]: Fix /proc not mounted issue (#10164)
 (#10256)

[Build]: Fix /proc not mounted issue
---
 build_debian.sh                                 | 3 +++
 files/build_templates/sonic_debian_extension.j2 | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 6ec8abd0c604..e23dde2458e7 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -67,6 +67,9 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
+## ensure proc is mounted
+sudo mount proc /proc -t proc || true
+
 ## make / as a mountpoint in chroot env, needed by dockerd
 pushd $FILESYSTEM_ROOT
 sudo mount --bind . .
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 0874c5105663..06a63c5736fe 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -632,11 +632,8 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
 fi
 
 {% if installer_images.strip() -%}
-clean_proc() {
-    sudo umount /proc || true
-}
-trap_push clean_proc
-sudo mount proc /proc -t proc
+## ensure proc is mounted
+sudo mount proc /proc -t proc || true
 if [[ $CONFIGURED_ARCH == armhf ]]; then
     # A workaround to fix the armhf build hung issue, caused by sonic-platform-nokia-7215_1.0_armhf.deb post installation script 
     ps -eo pid,cmd | grep python | grep "/etc/entropy.py" | awk '{print $1}' | xargs sudo kill -9 2>/dev/null || true
@@ -673,7 +670,6 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
 else
     sudo chroot $FILESYSTEM_ROOT service docker stop
 fi
-sudo umount /proc || true
 sudo rm $FILESYSTEM_ROOT/etc/init.d/docker
 
 sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json"

From a984757b9de6a5cd6f69e0bafe6081fb7de7bad2 Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Sat, 19 Mar 2022 17:18:50 -0700
Subject: [PATCH 1080/1674] [202012 BRCM SAI 4.3.5.3-3] Picked up fixes that
 makes up BRCM SAI version 4.3.5.3-3 (#10255)

---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 442f5861ae06..e7a37fc20435 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -73,4 +75,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index dcfb926bb772..a89e855f64f1 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.3-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.3-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 0c859fb0365210a29c140ea965d59f5870aa1858 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 20 Mar 2022 16:31:59 +0800
Subject: [PATCH 1081/1674] [Mellanox] [202012] Fix issue: 4600C is using wrong
 thermal profile (#10258)

- Why I did it
4600C is using wrong thermal profile and it displays 2 CPU core thermal in show platform temperature output, there should be 4 CPU core thermal.

- How I did it
Change 4600C to use thermal profile 10.

- How to verify it
Manual test
---
 platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index 2afd82f75986..afdb15bfe901 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -142,7 +142,7 @@
 platform_dict_thermal = {'x86_64-mlnx_msn2700-r0': 0, 'x86_64-mlnx_lssn2700-r0': 0, 'x86_64-mlnx_msn2740-r0': 3,
                          'x86_64-mlnx_msn2100-r0': 1, 'x86_64-mlnx_msn2410-r0': 2, 'x86_64-mlnx_msn2010-r0': 4,
                          'x86_64-mlnx_msn3420-r0': 9, 'x86_64-mlnx_msn3700-r0': 5, 'x86_64-mlnx_msn3700c-r0': 6,
-                         'x86_64-mlnx_msn3800-r0': 7, 'x86_64-mlnx_msn4600-r0': 12, 'x86_64-mlnx_msn4600c-r0': 9,
+                         'x86_64-mlnx_msn3800-r0': 7, 'x86_64-mlnx_msn4600-r0': 12, 'x86_64-mlnx_msn4600c-r0': 10,
                          'x86_64-mlnx_msn4700-r0': 8, 'x86_64-mlnx_msn4410-r0': 8}
 thermal_profile_list = [
     # 0 2700

From dfb53d814107ad56a340fbcda739c186f3f62c6a Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Sun, 20 Mar 2022 17:17:19 -0700
Subject: [PATCH 1082/1674] [sonic-linkmgrd][202012] submodule update (#10270)

ca4b9a1 Guohan Lu Thu Mar 3 17:51:43 2022 -0800 [doc]: add lgtm badge in README.md
00c9b21 Longxiang Lyu Wed Mar 2 18:05:18 2022 +0800 Enable lgtm (#33)
3ae9be4 Longxiang Lyu Wed Mar 2 07:19:33 2022 +0800 Improve make clean (#32)
6997a1f Longxiang Lyu Wed Mar 9 10:03:00 2022 +0800 Add .clang-format file to format code (#28)
3368182 Jing Zhang Mon Mar 14 15:41:11 2022 -0700 Prevent switching MUX to "Unknown" (#36)
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index a8ddff5089fc..ca4b9a15674e 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit a8ddff5089fc3cddf199647943165ddc4ef51fc8
+Subproject commit ca4b9a15674e175b94e9ce4640cab50410b947b1

From adaec6337fc6627f3d81859f49730ab3033ad137 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 21 Mar 2022 00:17:59 +0000
Subject: [PATCH 1083/1674] [radv] Support multiple ipv6 prefixes per vlan
 interface (#9934) (#10253)

Why I did it
Radvd.conf.j2 template creates two copies of the vlan interface when there are more than one ipv6 address assigned to a single vlan interface. Changed the format to add prefixes under the same vlan interface block.

How I did it
Modifies radvd.conf.j2 and added unit tests

How to verify it
Configure multiple ipv6 address to the same vlan, start radvd
Unit test will check if radvd.conf with multiple ipv6 addresses is formed correctly
---
 .../docker-router-advertiser/radvd.conf.j2    |  20 +-
 .../tests/radv-test-sample-graph.xml          | 579 ++++++++++++++++++
 .../tests/sample_output/py2/radvd.conf        |  35 ++
 .../tests/sample_output/py3/radvd.conf        |  35 ++
 src/sonic-config-engine/tests/test_j2files.py |   8 +
 5 files changed, 673 insertions(+), 4 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/radv-test-sample-graph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/radvd.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/radvd.conf

diff --git a/dockers/docker-router-advertiser/radvd.conf.j2 b/dockers/docker-router-advertiser/radvd.conf.j2
index 1d1e9e952f1c..3880ef960760 100644
--- a/dockers/docker-router-advertiser/radvd.conf.j2
+++ b/dockers/docker-router-advertiser/radvd.conf.j2
@@ -10,9 +10,21 @@
 
 {# If our configuration has VLAN interfaces... #}
 {% if VLAN_INTERFACE %}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-{# If this VLAN has an IPv6 address... #}
+{% set vlan_list = dict() %}
+{% for (name,prefix) in VLAN_INTERFACE|pfx_filter %}
+{% if name is not in vlan_list and prefix | ipv6 %}
+{% set prefix_list = [] %}
+{% set _ = vlan_list.update({name: prefix_list}) %}
+{% endif %}
 {% if prefix | ipv6 %}
+{# If our configuration has VLAN interfaces... #}
+{% set prefix_list = vlan_list.get(name) %}
+{% set _ = prefix_list.append(prefix) %}
+{% set _ = vlan_list.update({name: prefix_list}) %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% for name, prefixes in vlan_list.items() %}
 interface {{ name }}
 {
     IgnoreIfMissing on;
@@ -23,6 +35,7 @@ interface {{ name }}
     AdvOtherConfigFlag off;
     AdvLinkMTU 9100;
     AdvHomeAgentFlag off;
+{% for prefix in prefixes %}
     prefix {{ prefix | network }}/{{ prefix | prefixlen }} {
         AdvOnLink on;
         AdvAutonomous off;
@@ -30,8 +43,7 @@ interface {{ name }}
         AdvValidLifetime infinity;
         AdvPreferredLifetime infinity;
     };
+{% endfor %}
 };
 
-{% endif %}
 {% endfor %}
-{% endif %}
diff --git a/src/sonic-config-engine/tests/radv-test-sample-graph.xml b/src/sonic-config-engine/tests/radv-test-sample-graph.xml
new file mode 100644
index 000000000000..6945c8e175d2
--- /dev/null
+++ b/src/sonic-config-engine/tests/radv-test-sample-graph.xml
@@ -0,0 +1,579 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>0</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP1</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.10.0.99/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.10.0.99/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP2</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.0.64/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.0.64/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP3</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.64.2/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.64.2/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+       </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>2603:10e2:0:2902::8/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>2603:10e2:0:2902::8/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/112</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel02</Name>
+          <AttachTo>fortyGigE0/116</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel03</Name>
+          <AttachTo>fortyGigE0/120</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel04</Name>
+          <AttachTo>fortyGigE0/124</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type i:nil="true"/>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan2000</Name>
+          <AttachTo>fortyGigE0/112;fortyGigE0/116;fortyGigE0/120</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type i:nil="true"/>
+          <DhcpRelays></DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.200.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan99</Name>
+          <AttachTo>fortyGigE0/100</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>99</VlanID>
+          <Tag>99</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan98</Name>
+          <AttachTo>fortyGigE0/100;PortChannel01;PortChannel03</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>98</VlanID>
+          <Tag>98</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel02</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel02</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel03</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel03</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel04</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel04</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan2000</AttachTo>
+          <Prefix>192.168.200.1/27</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:2000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANv6</AttachTo>
+          <InAcl>everflowV6</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+	<AclInterface>
+          <AttachTo>EGRESS_ERSPAN</AttachTo>
+	  <OutAcl>everflow_egress</OutAcl>
+	  <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel01;PortChannel02;PortChannel03;PortChannel04</AttachTo>
+          <InAcl>DataAclIngress</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel01;PortChannel02;Vlan98</AttachTo>
+          <OutAcl>DataAclEgress</OutAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>NTP</AttachTo>
+          <InAcl>NTP_ACL</InAcl>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SSH</AttachTo>
+          <InAcl>SSH_ACL</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SSH</AttachTo>
+          <InAcl>ROUTER-PROTECT</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>ROUTER-PROTECT</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>NTP</AttachTo>
+          <InAcl>NTP_ACL</InAcl>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/112</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/116</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/120</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/124</StartPort>
+        <Bandwidth>100000</Bandwidth>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>100000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA05T1</StartDevice>
+        <StartPort>Ethernet1/33</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>Servers0</EndDevice>
+        <EndPort>eth0</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/4</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>Servers100</EndDevice>
+        <EndPort>eth0</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/100</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>switch-t0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>2.2.2.2</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>FECDisabled</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA05T1:Ethernet1/33;switch-t0:fortyGigE0/4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>False</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>FECDisabled</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA06T1:Ethernet1/34;switch-t0:fortyGigE0/8</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+<MetadataDeclaration>
+ <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+  <a:DeviceMetadata>
+   <a:Name>switch-t0</a:Name>
+   <a:Properties>
+    <a:DeviceProperty>
+     <a:Name>DeploymentId</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>1</a:Value>
+    </a:DeviceProperty>
+  </a:Properties>
+  </a:DeviceMetadata>
+ </Devices>
+ <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+</MetadataDeclaration>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/radvd.conf b/src/sonic-config-engine/tests/sample_output/py2/radvd.conf
new file mode 100644
index 000000000000..9e716b7144bf
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/radvd.conf
@@ -0,0 +1,35 @@
+# =========== Managed by sonic-cfggen -- DO NOT edit manually! ====================
+# Generated by /usr/share/sonic/templates/radvd.conf.j2 using config DB data
+# File: /etc/radvd.conf
+#
+# Config file for radvd, the router advertisement daemon
+# See man page for radvd.conf for descriptions of all available options
+#
+
+interface Vlan1000
+{
+    IgnoreIfMissing on;
+    AdvSendAdvert on;
+    MinRtrAdvInterval 60;
+    MaxRtrAdvInterval 180;
+    AdvManagedFlag on;
+    AdvOtherConfigFlag off;
+    AdvLinkMTU 9100;
+    AdvHomeAgentFlag off;
+    prefix fc02:2000::/64 {
+        AdvOnLink on;
+        AdvAutonomous off;
+        AdvRouterAddr off;
+        AdvValidLifetime infinity;
+        AdvPreferredLifetime infinity;
+    };
+    prefix fc02:1000::/64 {
+        AdvOnLink on;
+        AdvAutonomous off;
+        AdvRouterAddr off;
+        AdvValidLifetime infinity;
+        AdvPreferredLifetime infinity;
+    };
+};
+
+
diff --git a/src/sonic-config-engine/tests/sample_output/py3/radvd.conf b/src/sonic-config-engine/tests/sample_output/py3/radvd.conf
new file mode 100644
index 000000000000..43de8b847756
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/radvd.conf
@@ -0,0 +1,35 @@
+# =========== Managed by sonic-cfggen -- DO NOT edit manually! ====================
+# Generated by /usr/share/sonic/templates/radvd.conf.j2 using config DB data
+# File: /etc/radvd.conf
+#
+# Config file for radvd, the router advertisement daemon
+# See man page for radvd.conf for descriptions of all available options
+#
+
+interface Vlan1000
+{
+    IgnoreIfMissing on;
+    AdvSendAdvert on;
+    MinRtrAdvInterval 60;
+    MaxRtrAdvInterval 180;
+    AdvManagedFlag on;
+    AdvOtherConfigFlag off;
+    AdvLinkMTU 9100;
+    AdvHomeAgentFlag off;
+    prefix fc02:1000::/64 {
+        AdvOnLink on;
+        AdvAutonomous off;
+        AdvRouterAddr off;
+        AdvValidLifetime infinity;
+        AdvPreferredLifetime infinity;
+    };
+    prefix fc02:2000::/64 {
+        AdvOnLink on;
+        AdvAutonomous off;
+        AdvRouterAddr off;
+        AdvValidLifetime infinity;
+        AdvPreferredLifetime infinity;
+    };
+};
+
+
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index af28e7e02b24..cd6317853344 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -27,6 +27,7 @@ def setUp(self):
         self.arista7050_t0_minigraph = os.path.join(self.test_dir, 'sample-arista-7050-t0-minigraph.xml')
         self.multi_asic_minigraph = os.path.join(self.test_dir, 'multi_npu_data', 'sample-minigraph.xml')
         self.multi_asic_port_config = os.path.join(self.test_dir, 'multi_npu_data', 'sample_port_config-0.ini')
+        self.radv_test_minigraph = os.path.join(self.test_dir, 'radv-test-sample-graph.xml')
         self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml')
         self.output_file = os.path.join(self.test_dir, 'output')
 
@@ -71,6 +72,13 @@ def test_dhcp_relay(self):
         self.run_script(argument)
         self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'docker-dhcp-relay.supervisord.conf'), self.output_file))
 
+    def test_radv(self):
+        # Test generation of radvd.conf with multiple ipv6 prefixes
+        template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-router-advertiser', 'radvd.conf.j2')
+        argument = '-m ' + self.radv_test_minigraph + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
+        self.run_script(argument)
+        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'radvd.conf'), self.output_file))
+
     def test_lldp(self):
         lldpd_conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-lldp', 'lldpd.conf.j2')
 

From 86e6ef5ac55c1bf718334a544e709b759c72f01d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 18 Mar 2022 01:16:43 +0800
Subject: [PATCH 1084/1674] [Submodule]: Update sonic-restapi (#10257)

#### Why I did it
```
Update submodule sonic-restapi
bd97dfe Fix urllib3 CVE-2021-33503 issue (#104)
f159bfa Upgrade the containers to be based on Debian Buster (#103)
a1830c1 (origin/201911) Fix OpenAPI spec to be readable by autorest (#101)
```
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 94805a39ac07..bd97dfeb4b45 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 94805a39ac0712219f7dc08faa2cfdbf371dd177
+Subproject commit bd97dfeb4b4564defbc10e521ee05bbfe0638315

From 67312ff6357c70811fc1a6bbcd70b8d816af20ab Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 21 Mar 2022 17:04:19 +0800
Subject: [PATCH 1085/1674] [Build]: Use one debian mirror config (#10281)

Why I did it
Use one debian mirror config.
The empty config in https://github.com/Azure/sonic-buildimage/blob/master/files/image_config/apt/sources.list overrides the file https://github.com/Azure/sonic-buildimage/blob/master/files/apt/sources.list.amd64 (armhf/arm64), it does not make sense.
All the content in files/image_config/apt is no use, any one wants to add mirror config, please add in files/apt.

How I did it
Remove files/image_config/apt and the reference.
---
 .../build_templates/sonic_debian_extension.j2 |  9 ------
 files/image_config/apt/sonic-dev.gpg.key      | 30 -------------------
 files/image_config/apt/sources.list           |  0
 ...ian_archive_trafficmanager_net_debian.list |  3 --
 .../arm64/debian_mirror_arm64.list            |  9 ------
 .../armhf/debian_mirror_armhf.list            |  9 ------
 6 files changed, 60 deletions(-)
 delete mode 100644 files/image_config/apt/sonic-dev.gpg.key
 delete mode 100644 files/image_config/apt/sources.list
 delete mode 100644 files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list
 delete mode 100644 files/image_config/apt/sources.list.d/arm64/debian_mirror_arm64.list
 delete mode 100644 files/image_config/apt/sources.list.d/armhf/debian_mirror_armhf.list

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 06a63c5736fe..29a7eb2dcaff 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -68,15 +68,6 @@ else
     sudo chroot $FILESYSTEM_ROOT service docker start
 fi
 
-# Apply apt configuration files
-sudo cp $IMAGE_CONFIGS/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
-sudo mkdir -p $FILESYSTEM_ROOT/etc/apt/sources.list.d/
-sudo cp -R $IMAGE_CONFIGS/apt/sources.list.d/${CONFIGURED_ARCH}/* $FILESYSTEM_ROOT/etc/apt/sources.list.d/
-cat $IMAGE_CONFIGS/apt/sonic-dev.gpg.key | sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
-
-# Update apt's snapshot of its repos
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get update
-
 # Apply environtment configuration files
 sudo cp $IMAGE_CONFIGS/environment/environment $FILESYSTEM_ROOT/etc/
 sudo cp $IMAGE_CONFIGS/environment/motd $FILESYSTEM_ROOT/etc/
diff --git a/files/image_config/apt/sonic-dev.gpg.key b/files/image_config/apt/sonic-dev.gpg.key
deleted file mode 100644
index fb9a37901bc7..000000000000
--- a/files/image_config/apt/sonic-dev.gpg.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQENBFQ1bTIBCAC7oGfkv/ck0XsLuG8cdcSB2ISqxFAcBvH9BitEtxmpW2uhykKk
-xY4rVD/4Uys1s3PF1/64QfPR+hYcewueOwz0ZAcLyFXXk4McICXaPq3NrLiWYKKX
-UZLnrPzcrGZoW/kHDDp4OmBiDmT1PGvZlpuimwkMCusUzIr7Cbbp2dIy8MERL5tA
-LcgLu3KL6clJ+aTW2jgepI1D7sTepOeGd7eRSb5njKg2M7k/93v/7MipZxiVtyXH
-B74YiK6jSbst5JpuYsLa/Dqryvx7Xq3n53oif892pv3euTduo1fYw8Hgh/OOYdeT
-c9WCj03KA1jCSFURjdrug0kR8BPlfjqtRLXFABEBAAG0JE1TIE9wZW4gVGVjaCA8
-aW50ZXJvcEBtaWNyb3NvZnQuY29tPokBOAQTAQIAIgUCVDVtMgIbAwYLCQgHAwIG
-FQgCCQoLBBYCAwECHgECF4AACgkQsCxG30F6CJO1uAf/cmL68bM8YgF/61hkaY56
-LqrppUTJH/w4fKq47Pf6KfgSLvxfNU6soi2KHYRjIvTRx3tV4vUM5n2plaQg2s8V
-/Epg4FeIRTk75YwiHAzLhLnp5cdUaTvC4j4mwxoB6j9Ty+fXJwQ0MvpDhIZb9vM4
-GXw/fEQHCT4f3gx4nReeqE+FB2wVHleX9+Lpodu98JyJTKJRBRHYLqy6S+/lyp2W
-aBlsI1LOqBcx1uRK24U7duIpbYwIyrx0cafSruqR2GjVdu+imkhHyUn52VbzYhq1
-af0rqYiZ1VOamVOG0By8+hVyNa1MLc1K2uWGs0o5fDe9F5/swbvLHVXI+M50Vs+m
-J7kBDQRUNW0yAQgAu7DkTVj0ZQC4F7bFivAwrdby8gCakTXOl1kcK622hjRJ8nam
-aZeW+eADfLRsTmdUmXgZu1YWS5Gn2ZVngC8SGPUBT071+oRETCz4uNB7IimB9QfP
-++orI6o2vmnVVsq5wWCbEdNU+TCVv1zjrYev5lwckkKpjHt6o8MNoX2DFuQymSyR
-eZKaqhdKmcji4Ke7OIYqwgPjch3wxzE1b5gNOR/iwxWyjjOffZPLr/VhIfIJRs86
-dSXrwjHtEh810SKDLghHM0VAdY34nyC5ZZ61yhts5HtQDFK+9mNpH1mkc4gDBlgG
-266pVvknumK6lPNm/osF/cpjWmEw24ypcQIvOQARAQABiQEfBBgBAgAJBQJUNW0y
-AhsMAAoJELAsRt9BegiTMBUH/0sZ6gZy7mCTSAYT+NSXLFtGC2zNUVL80SWvfgYm
-k9XPVI22MrefZfQ6M01RylyxtWXjRM8UoN8SDKWPpXumzJf831f/7om5zwutaG7b
-tjDPYqRKJSbAIFZu2mN+uLrNQ2SV6XK7FoV0dtcrEX9S7RICb6i19D+70+Oh/qgU
-R04H1jqS29XBzqAlIzdBoA+sYAwbOIJsSL3YyNQcUv3B5+5yR/bo/L8pnUJt6iuL
-nWW+mi7r8gWPHDSrcdYq1TmmlOM7CwZPgWRZzkQPSeZz52Tt7IP47eyGJ09U4PIf
-FtMH1ElL2UgHoA/F9Q88e7LkztaTqE59uXWbIYyuSMJVvRU=
-=sb3d
------END PGP PUBLIC KEY BLOCK-----
diff --git a/files/image_config/apt/sources.list b/files/image_config/apt/sources.list
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list b/files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list
deleted file mode 100644
index d35c618112bb..000000000000
--- a/files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
diff --git a/files/image_config/apt/sources.list.d/arm64/debian_mirror_arm64.list b/files/image_config/apt/sources.list.d/arm64/debian_mirror_arm64.list
deleted file mode 100644
index 9e7dec92d39e..000000000000
--- a/files/image_config/apt/sources.list.d/arm64/debian_mirror_arm64.list
+++ /dev/null
@@ -1,9 +0,0 @@
-deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
-deb [arch=arm64] http://security.debian.org buster/updates main contrib non-free
-deb-src [arch=arm64] http://security.debian.org buster/updates main contrib non-free
-deb [arch=arm64] https://download.docker.com/linux/debian buster stable
-deb [arch=arm64] http://ftp.debian.org/debian buster-backports main
-
diff --git a/files/image_config/apt/sources.list.d/armhf/debian_mirror_armhf.list b/files/image_config/apt/sources.list.d/armhf/debian_mirror_armhf.list
deleted file mode 100644
index a7b831ef301c..000000000000
--- a/files/image_config/apt/sources.list.d/armhf/debian_mirror_armhf.list
+++ /dev/null
@@ -1,9 +0,0 @@
-deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
-deb [arch=armhf] http://security.debian.org buster/updates main contrib non-free
-deb-src [arch=armhf] http://security.debian.org buster/updates main contrib non-free
-deb [arch=armhf] https://download.docker.com/linux/debian buster stable
-deb [arch=armhf] http://ftp.debian.org/debian buster-backports main
-

From deac4eed64b3252bc538d3e27af8ba831f313ff0 Mon Sep 17 00:00:00 2001
From: Eric Zhu <79439153+cel-eric@users.noreply.github.com>
Date: Tue, 22 Mar 2022 00:28:25 +0800
Subject: [PATCH 1086/1674] sonic-platform-modules-cel dx010: speed up dx010
 platform init script (#10237)

Why I did it
To fix issue #10152 for dx010.
202012 Warm upgrade causes lacp-teardown on Dx010 TOR. platform code initialize slow causing lacp timeout.

How I did it
Remove the python2 sonic platform wheel which is deprecated.
Optimize the dx010 sonic platform script to speed up the init process.

How to verify it
Check the warm reboot log, warm reboot is 8-9s faster than before.

Signed-off-by: Eric Zhu <erzhu@celestica.com>
---
 .../debian/platform-modules-dx010.init            | 15 +++++++--------
 .../debian/platform-modules-dx010.install         |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
index 21587bfbd3fd..12f8fc61f2ea 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.init
@@ -61,19 +61,19 @@ start)
         [ $found -eq 0 ] && echo "cannot find iSMT" && exit 1
 
         i2cset -y ${devnum} 0x70 0x10 0x00 0x01 i
-        sleep 1
+        sleep 0.1
 
         # Attach PCA9548 0x71 Channel Extender for Main Board
         echo pca9548 0x71 > /sys/bus/i2c/devices/i2c-${devnum}/new_device
-        sleep 1
+        sleep 0.1
 
         # Attach PCA9548 0x73 Channel Extender for CPU Board
         echo pca9548 0x73 > /sys/bus/i2c/devices/i2c-${devnum}/new_device
-        sleep 1
+        sleep 0.1
 
         # Attach PCA9548 0x77 Channel Extender for Fan's EEPROMs
         echo pca9548 0x77 > /sys/bus/i2c/devices/i2c-${devnum}/new_device
-        sleep 1
+        sleep 0.1
 
         # Attach syseeprom
         echo 24lc64t 0x50 > /sys/bus/i2c/devices/i2c-12/new_device
@@ -106,7 +106,7 @@ start)
         echo pca9505 0x20 > /sys/bus/i2c/devices/i2c-17/new_device
 
         modprobe dx010_cpld
-        sleep 2
+        sleep 1
 
         # Export platform gpio sysfs
         export_gpio 10 "in" # Fan 1 present
@@ -148,15 +148,14 @@ start)
         done
 
 	bus_en=8
-	sleep 1
 	cfg_r=`i2cget -y -f 8 0x60 0xD1`
 	((cfg_w=$cfg_r+$bus_en))	
 	i2cset -y -f 8 0x60 0xD1 $cfg_w
-	sleep 1
+	sleep 0.1
 	cfg_r=`i2cget -y -f 9 0x20 0xD1`
 	((cfg_w=$cfg_r+$bus_en))	
 	i2cset -y -f 9 0x20 0xD1 $cfg_w
-	sleep 1
+	sleep 0.1
 
 	/bin/sh /usr/local/bin/platform_api_mgnt.sh init
 
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
index 98c17e55a980..4698507c6b9d 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-dx010.install
@@ -4,6 +4,5 @@ dx010/systemd/platform-modules-dx010.service lib/systemd/system
 dx010/scripts/fancontrol.sh etc/init.d
 dx010/scripts/fancontrol.service lib/systemd/system
 services/fancontrol/fancontrol  usr/local/bin
-dx010/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
 dx010/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x86_64-cel_seastone-r0
 services/platform_api/platform_api_mgnt.sh usr/local/bin

From 68b38b325bd3478a01b58db9d36e576125fdaf88 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Tue, 22 Mar 2022 01:37:34 +0800
Subject: [PATCH 1087/1674] [202012][Mellanox] Change MFT version to 4.18.0-106
 (#10305)

- Why I did it
With the previous MFT 4.18.1-16 there is a bug in mstdump tool accessing wrong address. it is confirmed this issue does not exist in official 4.18.0-106.

- How I did it
Update the MFT version to 4.18.0-106

- How to verify it
Run regression on Mellanox platforms
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index d68360201556..cbd7288272ca 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.18.1
-MFT_REVISION = 16
+MFT_VERSION = 4.18.0
+MFT_REVISION = 106
 
 export MFT_VERSION MFT_REVISION
 

From 8a38da94d55fc0dfcb14f62b9913377fe6cf2ccb Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Thu, 17 Mar 2022 02:46:26 +0530
Subject: [PATCH 1088/1674] DellEMC: Z9332f - Component API Fixes (#10187)

---
 .../common/ipmihelper.py                      |  5 ++-
 .../common/onie_stage_fwpkg                   |  2 +-
 .../common/sonic_platform/hwaccess.py         |  5 ++-
 .../z9332f/sonic_platform/component.py        | 38 +++++++++++++++----
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
index d95329c40de2..3908f90bdad4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -90,7 +90,10 @@ def get_twos_complement(val, bits):
         R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
         B_exp = get_twos_complement(factors[6] & 0x0F, 4)
 
-        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
+        if R_exp < 0:
+            converted_reading = ((M * raw_value) + (B * 10**B_exp)) / 10**(-R_exp)
+        else:
+            converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
 
         return True, converted_reading
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
index 1ceaf32fe8c1..dcc74a09a91e 100755
--- a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
+++ b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
@@ -45,7 +45,7 @@ function show_help_and_exit()
     echo " "
     echo "    Available options:"
     echo "        -h, -? : getting this help"
-    echo "        -o [fwpkg]    : stages the firmware update package"
+    echo "        -a [fwpkg]    : stages the firmware update package"
 
     exit 0
 }
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
index 373f71bdd5bf..642a6ddc6fc8 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
@@ -39,7 +39,10 @@ def pci_set_value(resource, val, offset):
 # Read I2C device
 
 def i2c_get(bus, i2caddr, ofs):
-    return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+    try:
+        return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return -1
 
 def io_reg_read(io_resource, offset):
     fd = os.open(io_resource, os.O_RDONLY)
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index c308ed291903..306749270d26 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -23,20 +23,36 @@
 
 
 def get_bios_version():
-    return subprocess.check_output(
-        ['dmidecode', '-s', 'bios-version']).decode('utf-8').strip()
+    try:
+        return subprocess.check_output(['dmidecode', '-s', 'bios-version'],
+                                       text=True).strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return 'NA'
 
 def get_fpga_version():
     val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:09:00.0/resource0', 0)
     return '{}.{}'.format((val >> 16) & 0xffff, val & 0xffff)
 
 def get_bmc_version():
-    return subprocess.check_output(
-        ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
-        ).decode('utf-8').strip()
+    val = 'NA'
+    try:
+        bmc_ver = subprocess.check_output(['ipmitool', 'mc', 'info'],
+                                          stderr=subprocess.STDOUT, text=True)
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        pass
+    else:
+        version = re.search(r'Firmware Revision\s*:\s(.*)', bmc_ver)
+        if version:
+            val = version.group(1).strip()
+
+    return val
 
 def get_cpld_version(bus, i2caddr):
-    return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
+    val = hwaccess.i2c_get(bus, i2caddr, 0)
+    if val != -1:
+        return '{:x}.{:x}'.format((val >> 4) & 0xf, val & 0xf)
+    else:
+        return 'NA'
 
 def get_cpld0_version():
     return get_cpld_version(5, 0x0d)
@@ -67,7 +83,7 @@ def get_pciephy_version():
     except Exception:
         return val
     else:
-        version = re.search(r'PCIe FW loader version:\s(.*)', pcie_ver)
+        version = re.search(r'PCIe FW version:\s(.*)', pcie_ver)
         if version:
             val = version.group(1).strip()
 
@@ -156,6 +172,14 @@ def _get_available_firmware_version(image_path):
 
             ver_info = ver_info.get("x86_64-dellemc_z9332f_d1508-r0")
             if ver_info:
+                components = list(ver_info.keys())
+                for component in components:
+                    if "CPLD" in component and ver_info[component].get('version'):
+                        val = ver_info.pop(component)
+                        ver = int(val['version'], 16)
+                        val['version'] = "{:x}.{:x}".format((ver >> 4) & 0xf, ver & 0xf)
+                        ver_info[component.replace("-", " ")] = val
+
                 return True, ver_info
             else:
                 return False, "ERROR: Version info not available"

From 1851827d748b431702daa97fd1e0ce3fed1ea839 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 21 Mar 2022 17:10:33 +0800
Subject: [PATCH 1089/1674] [Build]: support to collect version when purging
 debian package (#10287)

Why I did it
support to collect version when purging debian package
Support to collect version multiple times

How I did it
Add the collection action before purging.
---
 src/sonic-build-hooks/hooks/apt-get            |  5 +++++
 .../scripts/collect_version_files              | 18 +++++++++++++++---
 .../scripts/post_run_buildinfo                 |  2 --
 .../scripts/pre_run_buildinfo                  |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/sonic-build-hooks/hooks/apt-get b/src/sonic-build-hooks/hooks/apt-get
index f1f789542b7a..cee440d210e8 100755
--- a/src/sonic-build-hooks/hooks/apt-get
+++ b/src/sonic-build-hooks/hooks/apt-get
@@ -20,6 +20,11 @@ if [ "$INSTALL" == y ]; then
     [ "$lock_result" == y ] && release_apt_installation_lock
     exit $command_result
 else
+    if [[ "$1" == "purge" || "$@" == *" purge "* ]]; then
+      # When running the purge command, collect the debian versions
+      dpkg-query -W -f '${Package}==${Version}\n' >> $POST_VERSION_PATH/purge-versions-deb
+      chmod a+wr $POST_VERSION_PATH/purge-versions-deb
+    fi
     $REAL_COMMAND "$@"
 fi
 
diff --git a/src/sonic-build-hooks/scripts/collect_version_files b/src/sonic-build-hooks/scripts/collect_version_files
index b62beb4a2115..570883701e98 100755
--- a/src/sonic-build-hooks/scripts/collect_version_files
+++ b/src/sonic-build-hooks/scripts/collect_version_files
@@ -1,14 +1,26 @@
 #!/bin/bash
 
+. /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+
 TARGET_PATH=$1
+[ -z "$TARGET_PATH" ] && TARGET_PATH=$POST_VERSION_PATH
 ARCH=$(dpkg --print-architecture)
 DIST=$(grep VERSION_CODENAME /etc/os-release | cut -d= -f2)
 ([ -z "$DIST" ] && grep -q jessie /etc/os-release) && DIST=jessie
 
 mkdir -p $TARGET_PATH
 chmod a+rw $TARGET_PATH
-dpkg-query -W -f '${Package}==${Version}\n' > "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
-([ -x "/usr/local/bin/pip2" ] || [ -x "/usr/bin/pip2" ]) && pip2 freeze > "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}"
-([ -x "/usr/local/bin/pip3" ] || [ -x "/usr/bin/pip3" ]) && pip3 freeze > "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
+
+dpkg-query -W -f '${Package}==${Version}\n' >> "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
+([ -x "/usr/local/bin/pip2" ] || [ -x "/usr/bin/pip2" ]) && pip2 freeze >> "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}"
+([ -x "/usr/local/bin/pip3" ] || [ -x "/usr/bin/pip3" ]) && pip3 freeze >> "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
+
+## Add the the packages purged
+[ -f $POST_VERSION_PATH/purge-versions-deb ] && cat $POST_VERSION_PATH/purge-versions-deb >> "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
+
+## Print the unique and sorted result
+sort -u "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
+sort -u "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}"
+sort -u "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
 
 exit 0
diff --git a/src/sonic-build-hooks/scripts/post_run_buildinfo b/src/sonic-build-hooks/scripts/post_run_buildinfo
index 614389fd424c..e0d84d35bb08 100755
--- a/src/sonic-build-hooks/scripts/post_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/post_run_buildinfo
@@ -2,8 +2,6 @@
 
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
 
-[ -d $POST_VERSION_PATH ] && rm -rf $POST_VERSION_PATH
-
 # Collect the version files
 collect_version_files $POST_VERSION_PATH
 
diff --git a/src/sonic-build-hooks/scripts/pre_run_buildinfo b/src/sonic-build-hooks/scripts/pre_run_buildinfo
index 3cf0cf7c8dfe..d9b927ab42f9 100755
--- a/src/sonic-build-hooks/scripts/pre_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/pre_run_buildinfo
@@ -8,6 +8,8 @@ mkdir -p $BUILD_VERSION_PATH
 mkdir -p $LOG_PATH
 
 [ -d $PRE_VERSION_PATH ] && rm -rf $PRE_VERSION_PATH
+[ -d $POST_VERSION_PATH ] && rm -rf $POST_VERSION_PATH
+mkdir -p $POST_VERSION_PATH
 collect_version_files $PRE_VERSION_PATH
 symlink_build_hooks
 set_reproducible_mirrors

From 4f021c44c21350a8108656b9c8e7cebc6b7d91d6 Mon Sep 17 00:00:00 2001
From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com>
Date: Tue, 22 Mar 2022 06:55:24 +0200
Subject: [PATCH 1090/1674] Update docker-sonic-vs infrastructure in order to
 run CoPP UT (#10230)

*Changes to run CoPP UT in docker-sonic-vs
---
 files/image_config/copp/copp_cfg.j2          |  2 +-
 platform/vs/docker-sonic-vs/Dockerfile.j2    |  1 +
 platform/vs/docker-sonic-vs/init_cfg.json.j2 | 16 ++++++++++++++++
 platform/vs/docker-sonic-vs/start.sh         |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 platform/vs/docker-sonic-vs/init_cfg.json.j2

diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
index ab9ce2776caf..b7a83b312e07 100755
--- a/files/image_config/copp/copp_cfg.j2
+++ b/files/image_config/copp/copp_cfg.j2
@@ -82,7 +82,7 @@
 		    "trap_group": "queue4_group3"
 	    },
 {% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != "ToRRouter") %}
-	    "dhcp": {
+	    "dhcp_relay": {
 		    "trap_ids": "dhcp,dhcpv6",
 		    "trap_group": "queue4_group3"
 	    },
diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
index c30c5637af65..4df8955f3920 100644
--- a/platform/vs/docker-sonic-vs/Dockerfile.j2
+++ b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -154,6 +154,7 @@ COPY ["files/sonic_version.yml", "/etc/sonic/"]
 COPY ["port_breakout_config_db.json", "/etc/sonic/"]
 COPY ["database_config.json", "/etc/default/sonic-db/"]
 COPY ["hostname.j2", "/usr/share/sonic/templates/"]
+COPY ["init_cfg.json.j2", "/usr/share/sonic/templates/"]
 COPY ["default_chassis_cfg.json", "/etc/default/sonic-db/"]
 COPY ["asic_table.json", "/etc/sonic/"]
 COPY ["zero_profiles.json", "/etc/sonic"]
diff --git a/platform/vs/docker-sonic-vs/init_cfg.json.j2 b/platform/vs/docker-sonic-vs/init_cfg.json.j2
new file mode 100644
index 000000000000..7f41cbdaffca
--- /dev/null
+++ b/platform/vs/docker-sonic-vs/init_cfg.json.j2
@@ -0,0 +1,16 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "mac": "{{ system_mac }}",
+            "buffer_model": "traditional"
+        }
+    },
+{% set features = ["swss", "bgp", "teamd", "nat", "database", "lldp", "dhcp_relay", "macsec"] %}
+    "FEATURE": {
+{% for feature in features %}
+        "{{ feature }}": {
+            "state": "enabled"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}
\ No newline at end of file
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 7ee70efa0815..a3bed4c5f756 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -37,7 +37,7 @@ mkdir -p /var/run/redis/sonic-db
 cp /etc/default/sonic-db/database_config.json /var/run/redis/sonic-db/
 
 SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
-sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'", "buffer_model": "traditional"}}}' $CHASS_CFG --print-data > /etc/sonic/init_cfg.json
+sonic-cfggen -t /usr/share/sonic/templates/init_cfg.json.j2 -a "{\"system_mac\": \"$SYSTEM_MAC_ADDRESS\"}" $CHASS_CFG > /etc/sonic/init_cfg.json
 
 if [ -f /etc/sonic/config_db.json ]; then
     sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json

From f4233d7820c805a97d9e9e592fa6d3730c223e3d Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 22 Mar 2022 13:13:26 -0700
Subject: [PATCH 1091/1674] [swss]: Submodule update: (#10311)

Include following commits:
    - d061e27 [tunnelmgrd]: Warm boot support (#2166)
    - 73ced6e Remove port serdes object before removing port (#2152)
    - 6ac0b9b [CoPP] Add always_enabled field to coppmgr logic (#2034) (#2147)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 081dd0118429..d061e27825de 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 081dd01184291f1ea6c99aa7c644a45b0d4dc9d2
+Subproject commit d061e27825deadf4e1be354f18fdc7829867b0b9

From e4b30e3090e2a5321b009394e8496161461f5def Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 22 Mar 2022 18:34:42 -0700
Subject: [PATCH 1092/1674] [restapi]: Don't use python/python2 for restapi
 start scripts (#10285)

Python 2 isn't installed by default in Buster and Bullseye containers,
and the scripts/modules can be used with Python 3, so make sure Python 3
is used.

Why I did it
After the Buster and Bullseye upgrade for the restapi container, processes will no longer start because supervisord is trying to call python and python2, both of which are unavailable.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 dockers/docker-sonic-restapi/supervisord.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
index a873ba03d7da..c95b4b6b92d8 100644
--- a/dockers/docker-sonic-restapi/supervisord.conf
+++ b/dockers/docker-sonic-restapi/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:dependent-startup]
-command=python -m supervisord_dependent_startup
+command=python3 -m supervisord_dependent_startup
 autostart=true
 autorestart=unexpected
 startretries=0
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=1024
 
 [eventlistener:supervisor-proc-exit-listener]
-command=python2 /usr/bin/supervisor-proc-exit-listener --container-name restapi
+command=/usr/bin/supervisor-proc-exit-listener --container-name restapi
 events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
 autostart=true
 autorestart=false

From 49af3bbf0be396fd7bb037fa01e4bfea194695ce Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Wed, 23 Mar 2022 14:32:54 -0700
Subject: [PATCH 1093/1674] [202012] [Arista] Add Arista-7260CX3-D96C16 HWSKU
 (#10197)

This was an ask by Microsoft to provide:
7260 config.bcm file for hardware sku Arista-7260CX3-D92C16 (Named Arista-7260CX3-D96C16).

There are 16 100G uplinks:
Ethernet13-20/1
Ethernet45-52/1

All other ports are breakout to 2 50G ports.

The original ask was for 201811. This is the requested PR for 202012.

How I did it
Copied existing Arista-7260CX3-D108C8 HWSKU and altered the bcm config, port_config.ini, and buffers config files.

Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
---
 .../Arista-7260CX3-D96C16/buffers.json.j2     |   3 +
 .../buffers_defaults_t0.j2                    |  61 ++
 .../Arista-7260CX3-D96C16/config.bcm.j2       | 936 ++++++++++++++++++
 .../pg_profile_lookup.ini                     |   8 +
 .../Arista-7260CX3-D96C16/port_config.ini     | 115 +++
 .../Arista-7260CX3-D96C16/qos.json.j2         |   1 +
 .../Arista-7260CX3-D96C16/sai.profile         |   2 +
 7 files changed, 1126 insertions(+)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers.json.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/port_config.ini
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/sai.profile

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers.json.j2
new file mode 100644
index 000000000000..e6e9e844469b
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..178502e287ae
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/buffers_defaults_t0.j2
@@ -0,0 +1,61 @@
+{%- set default_cable = '5m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,44) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(44,52) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(52,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
new file mode 100644
index 000000000000..e2e37a247cac
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
@@ -0,0 +1,936 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set IPinIP_sock = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2' -%}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
+l3_alpm_hit_skip=1
+sai_adjust_acl_drop_in_rx_drop=1
+PHY_AN_ALLOW_PLL_CHANGE=1
+arl_clean_timeout_usec=15000000
+asf_mem_profile=2
+bcm_num_cos=10
+bcm_stat_flags=1
+bcm_stat_jumbo=9236
+cdma_timeout_usec=15000000
+core_clock_frequency=1700
+dma_desc_timeout_usec=15000000
+dpp_clock_ratio=2:3
+higig2_hdr_mode=1
+ipv6_lpm_128b_enable=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+l2xmsg_mode=1
+max_vp_lags=0
+mem_scan_enable=1
+miim_intr_enable=0
+module_64ports=1
+os=unix
+oversubscribe_mode=1
+pbmp_xport_xe=0xfffffffd3fffffff4fffffffc7ffffffe
+#pbmp_xport_xe=0x47fffffff1fffffffcfffffffe7ffffffe
+phy_an_allow_pll_change_hg=0
+phy_an_c73=1
+phy_chain_rx_lane_map_physical{1.0}=0x3210
+phy_chain_rx_lane_map_physical{101.0}=0x0123
+phy_chain_rx_lane_map_physical{105.0}=0x0123
+phy_chain_rx_lane_map_physical{109.0}=0x0123
+phy_chain_rx_lane_map_physical{113.0}=0x2301
+phy_chain_rx_lane_map_physical{117.0}=0x3210
+phy_chain_rx_lane_map_physical{121.0}=0x3210
+phy_chain_rx_lane_map_physical{125.0}=0x1203
+phy_chain_rx_lane_map_physical{129.0}=0x3210
+phy_chain_rx_lane_map_physical{13.0}=0x0321
+phy_chain_rx_lane_map_physical{133.0}=0x1032
+phy_chain_rx_lane_map_physical{137.0}=0x3210
+phy_chain_rx_lane_map_physical{141.0}=0x0123
+phy_chain_rx_lane_map_physical{145.0}=0x3210
+phy_chain_rx_lane_map_physical{149.0}=0x2310
+phy_chain_rx_lane_map_physical{153.0}=0x0132
+phy_chain_rx_lane_map_physical{157.0}=0x1302
+phy_chain_rx_lane_map_physical{161.0}=0x3021
+phy_chain_rx_lane_map_physical{165.0}=0x2031
+phy_chain_rx_lane_map_physical{169.0}=0x2031
+phy_chain_rx_lane_map_physical{17.0}=0x3210
+phy_chain_rx_lane_map_physical{173.0}=0x1302
+phy_chain_rx_lane_map_physical{177.0}=0x2031
+phy_chain_rx_lane_map_physical{181.0}=0x0213
+phy_chain_rx_lane_map_physical{185.0}=0x0213
+phy_chain_rx_lane_map_physical{189.0}=0x1302
+phy_chain_rx_lane_map_physical{193.0}=0x3120
+phy_chain_rx_lane_map_physical{197.0}=0x0231
+phy_chain_rx_lane_map_physical{201.0}=0x2031
+phy_chain_rx_lane_map_physical{205.0}=0x0213
+phy_chain_rx_lane_map_physical{209.0}=0x2013
+phy_chain_rx_lane_map_physical{21.0}=0x3021
+phy_chain_rx_lane_map_physical{213.0}=0x3021
+phy_chain_rx_lane_map_physical{217.0}=0x0231
+phy_chain_rx_lane_map_physical{221.0}=0x2031
+phy_chain_rx_lane_map_physical{225.0}=0x1203
+phy_chain_rx_lane_map_physical{229.0}=0x1230
+phy_chain_rx_lane_map_physical{233.0}=0x3021
+phy_chain_rx_lane_map_physical{237.0}=0x1032
+phy_chain_rx_lane_map_physical{241.0}=0x2301
+phy_chain_rx_lane_map_physical{245.0}=0x0321
+phy_chain_rx_lane_map_physical{249.0}=0x2301
+phy_chain_rx_lane_map_physical{25.0}=0x2301
+phy_chain_rx_lane_map_physical{253.0}=0x2301
+phy_chain_rx_lane_map_physical{257.0}=0x3210
+phy_chain_rx_lane_map_physical{29.0}=0x3021
+phy_chain_rx_lane_map_physical{33.0}=0x1302
+phy_chain_rx_lane_map_physical{37.0}=0x2031
+phy_chain_rx_lane_map_physical{41.0}=0x3021
+phy_chain_rx_lane_map_physical{45.0}=0x1023
+phy_chain_rx_lane_map_physical{49.0}=0x0213
+phy_chain_rx_lane_map_physical{5.0}=0x3201
+phy_chain_rx_lane_map_physical{53.0}=0x3201
+phy_chain_rx_lane_map_physical{57.0}=0x2013
+phy_chain_rx_lane_map_physical{61.0}=0x0213
+phy_chain_rx_lane_map_physical{65.0}=0x1203
+phy_chain_rx_lane_map_physical{69.0}=0x0213
+phy_chain_rx_lane_map_physical{73.0}=0x0213
+phy_chain_rx_lane_map_physical{77.0}=0x3120
+phy_chain_rx_lane_map_physical{81.0}=0x0213
+phy_chain_rx_lane_map_physical{85.0}=0x2031
+phy_chain_rx_lane_map_physical{89.0}=0x2031
+phy_chain_rx_lane_map_physical{9.0}=0x0321
+phy_chain_rx_lane_map_physical{93.0}=0x3120
+phy_chain_rx_lane_map_physical{97.0}=0x1203
+phy_chain_rx_polarity_flip_physical{1.0}=0x1
+phy_chain_rx_polarity_flip_physical{10.0}=0x0
+phy_chain_rx_polarity_flip_physical{100.0}=0x1
+phy_chain_rx_polarity_flip_physical{101.0}=0x1
+phy_chain_rx_polarity_flip_physical{102.0}=0x0
+phy_chain_rx_polarity_flip_physical{103.0}=0x1
+phy_chain_rx_polarity_flip_physical{104.0}=0x0
+phy_chain_rx_polarity_flip_physical{105.0}=0x1
+phy_chain_rx_polarity_flip_physical{106.0}=0x0
+phy_chain_rx_polarity_flip_physical{107.0}=0x1
+phy_chain_rx_polarity_flip_physical{108.0}=0x0
+phy_chain_rx_polarity_flip_physical{109.0}=0x0
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{110.0}=0x1
+phy_chain_rx_polarity_flip_physical{111.0}=0x0
+phy_chain_rx_polarity_flip_physical{112.0}=0x1
+phy_chain_rx_polarity_flip_physical{113.0}=0x1
+phy_chain_rx_polarity_flip_physical{114.0}=0x0
+phy_chain_rx_polarity_flip_physical{115.0}=0x1
+phy_chain_rx_polarity_flip_physical{116.0}=0x0
+phy_chain_rx_polarity_flip_physical{117.0}=0x0
+phy_chain_rx_polarity_flip_physical{118.0}=0x0
+phy_chain_rx_polarity_flip_physical{119.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x1
+phy_chain_rx_polarity_flip_physical{120.0}=0x0
+phy_chain_rx_polarity_flip_physical{121.0}=0x1
+phy_chain_rx_polarity_flip_physical{122.0}=0x0
+phy_chain_rx_polarity_flip_physical{123.0}=0x1
+phy_chain_rx_polarity_flip_physical{124.0}=0x0
+phy_chain_rx_polarity_flip_physical{125.0}=0x0
+phy_chain_rx_polarity_flip_physical{126.0}=0x1
+phy_chain_rx_polarity_flip_physical{127.0}=0x1
+phy_chain_rx_polarity_flip_physical{128.0}=0x1
+phy_chain_rx_polarity_flip_physical{129.0}=0x0
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{130.0}=0x1
+phy_chain_rx_polarity_flip_physical{131.0}=0x1
+phy_chain_rx_polarity_flip_physical{132.0}=0x0
+phy_chain_rx_polarity_flip_physical{133.0}=0x1
+phy_chain_rx_polarity_flip_physical{134.0}=0x1
+phy_chain_rx_polarity_flip_physical{135.0}=0x1
+phy_chain_rx_polarity_flip_physical{136.0}=0x0
+phy_chain_rx_polarity_flip_physical{137.0}=0x0
+phy_chain_rx_polarity_flip_physical{138.0}=0x0
+phy_chain_rx_polarity_flip_physical{139.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x0
+phy_chain_rx_polarity_flip_physical{140.0}=0x0
+phy_chain_rx_polarity_flip_physical{141.0}=0x1
+phy_chain_rx_polarity_flip_physical{142.0}=0x0
+phy_chain_rx_polarity_flip_physical{143.0}=0x1
+phy_chain_rx_polarity_flip_physical{144.0}=0x0
+phy_chain_rx_polarity_flip_physical{145.0}=0x1
+phy_chain_rx_polarity_flip_physical{146.0}=0x0
+phy_chain_rx_polarity_flip_physical{147.0}=0x1
+phy_chain_rx_polarity_flip_physical{148.0}=0x0
+phy_chain_rx_polarity_flip_physical{149.0}=0x0
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{150.0}=0x1
+phy_chain_rx_polarity_flip_physical{151.0}=0x1
+phy_chain_rx_polarity_flip_physical{152.0}=0x0
+phy_chain_rx_polarity_flip_physical{153.0}=0x0
+phy_chain_rx_polarity_flip_physical{154.0}=0x1
+phy_chain_rx_polarity_flip_physical{155.0}=0x1
+phy_chain_rx_polarity_flip_physical{156.0}=0x0
+phy_chain_rx_polarity_flip_physical{157.0}=0x0
+phy_chain_rx_polarity_flip_physical{158.0}=0x0
+phy_chain_rx_polarity_flip_physical{159.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x0
+phy_chain_rx_polarity_flip_physical{160.0}=0x0
+phy_chain_rx_polarity_flip_physical{161.0}=0x1
+phy_chain_rx_polarity_flip_physical{162.0}=0x1
+phy_chain_rx_polarity_flip_physical{163.0}=0x0
+phy_chain_rx_polarity_flip_physical{164.0}=0x1
+phy_chain_rx_polarity_flip_physical{165.0}=0x0
+phy_chain_rx_polarity_flip_physical{166.0}=0x0
+phy_chain_rx_polarity_flip_physical{167.0}=0x1
+phy_chain_rx_polarity_flip_physical{168.0}=0x1
+phy_chain_rx_polarity_flip_physical{169.0}=0x1
+phy_chain_rx_polarity_flip_physical{17.0}=0x1
+phy_chain_rx_polarity_flip_physical{170.0}=0x1
+phy_chain_rx_polarity_flip_physical{171.0}=0x0
+phy_chain_rx_polarity_flip_physical{172.0}=0x0
+phy_chain_rx_polarity_flip_physical{173.0}=0x0
+phy_chain_rx_polarity_flip_physical{174.0}=0x0
+phy_chain_rx_polarity_flip_physical{175.0}=0x1
+phy_chain_rx_polarity_flip_physical{176.0}=0x1
+phy_chain_rx_polarity_flip_physical{177.0}=0x1
+phy_chain_rx_polarity_flip_physical{178.0}=0x1
+phy_chain_rx_polarity_flip_physical{179.0}=0x0
+phy_chain_rx_polarity_flip_physical{18.0}=0x0
+phy_chain_rx_polarity_flip_physical{180.0}=0x0
+phy_chain_rx_polarity_flip_physical{181.0}=0x1
+phy_chain_rx_polarity_flip_physical{182.0}=0x1
+phy_chain_rx_polarity_flip_physical{183.0}=0x0
+phy_chain_rx_polarity_flip_physical{184.0}=0x0
+phy_chain_rx_polarity_flip_physical{185.0}=0x0
+phy_chain_rx_polarity_flip_physical{186.0}=0x0
+phy_chain_rx_polarity_flip_physical{187.0}=0x1
+phy_chain_rx_polarity_flip_physical{188.0}=0x1
+phy_chain_rx_polarity_flip_physical{189.0}=0x0
+phy_chain_rx_polarity_flip_physical{19.0}=0x1
+phy_chain_rx_polarity_flip_physical{190.0}=0x0
+phy_chain_rx_polarity_flip_physical{191.0}=0x1
+phy_chain_rx_polarity_flip_physical{192.0}=0x0
+phy_chain_rx_polarity_flip_physical{193.0}=0x0
+phy_chain_rx_polarity_flip_physical{194.0}=0x0
+phy_chain_rx_polarity_flip_physical{195.0}=0x1
+phy_chain_rx_polarity_flip_physical{196.0}=0x1
+phy_chain_rx_polarity_flip_physical{197.0}=0x1
+phy_chain_rx_polarity_flip_physical{198.0}=0x1
+phy_chain_rx_polarity_flip_physical{199.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x0
+phy_chain_rx_polarity_flip_physical{20.0}=0x0
+phy_chain_rx_polarity_flip_physical{200.0}=0x0
+phy_chain_rx_polarity_flip_physical{201.0}=0x0
+phy_chain_rx_polarity_flip_physical{202.0}=0x0
+phy_chain_rx_polarity_flip_physical{203.0}=0x1
+phy_chain_rx_polarity_flip_physical{204.0}=0x0
+phy_chain_rx_polarity_flip_physical{205.0}=0x1
+phy_chain_rx_polarity_flip_physical{206.0}=0x1
+phy_chain_rx_polarity_flip_physical{207.0}=0x0
+phy_chain_rx_polarity_flip_physical{208.0}=0x0
+phy_chain_rx_polarity_flip_physical{209.0}=0x1
+phy_chain_rx_polarity_flip_physical{21.0}=0x0
+phy_chain_rx_polarity_flip_physical{210.0}=0x1
+phy_chain_rx_polarity_flip_physical{211.0}=0x0
+phy_chain_rx_polarity_flip_physical{212.0}=0x0
+phy_chain_rx_polarity_flip_physical{213.0}=0x0
+phy_chain_rx_polarity_flip_physical{214.0}=0x0
+phy_chain_rx_polarity_flip_physical{215.0}=0x1
+phy_chain_rx_polarity_flip_physical{216.0}=0x0
+phy_chain_rx_polarity_flip_physical{217.0}=0x0
+phy_chain_rx_polarity_flip_physical{218.0}=0x0
+phy_chain_rx_polarity_flip_physical{219.0}=0x1
+phy_chain_rx_polarity_flip_physical{22.0}=0x0
+phy_chain_rx_polarity_flip_physical{220.0}=0x1
+phy_chain_rx_polarity_flip_physical{221.0}=0x0
+phy_chain_rx_polarity_flip_physical{222.0}=0x0
+phy_chain_rx_polarity_flip_physical{223.0}=0x1
+phy_chain_rx_polarity_flip_physical{224.0}=0x1
+phy_chain_rx_polarity_flip_physical{225.0}=0x1
+phy_chain_rx_polarity_flip_physical{226.0}=0x0
+phy_chain_rx_polarity_flip_physical{227.0}=0x0
+phy_chain_rx_polarity_flip_physical{228.0}=0x1
+phy_chain_rx_polarity_flip_physical{229.0}=0x0
+phy_chain_rx_polarity_flip_physical{23.0}=0x1
+phy_chain_rx_polarity_flip_physical{230.0}=0x0
+phy_chain_rx_polarity_flip_physical{231.0}=0x1
+phy_chain_rx_polarity_flip_physical{232.0}=0x1
+phy_chain_rx_polarity_flip_physical{233.0}=0x1
+phy_chain_rx_polarity_flip_physical{234.0}=0x0
+phy_chain_rx_polarity_flip_physical{235.0}=0x0
+phy_chain_rx_polarity_flip_physical{236.0}=0x0
+phy_chain_rx_polarity_flip_physical{237.0}=0x1
+phy_chain_rx_polarity_flip_physical{238.0}=0x0
+phy_chain_rx_polarity_flip_physical{239.0}=0x1
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+phy_chain_rx_polarity_flip_physical{240.0}=0x0
+phy_chain_rx_polarity_flip_physical{241.0}=0x1
+phy_chain_rx_polarity_flip_physical{242.0}=0x0
+phy_chain_rx_polarity_flip_physical{243.0}=0x1
+phy_chain_rx_polarity_flip_physical{244.0}=0x0
+phy_chain_rx_polarity_flip_physical{245.0}=0x1
+phy_chain_rx_polarity_flip_physical{246.0}=0x1
+phy_chain_rx_polarity_flip_physical{247.0}=0x1
+phy_chain_rx_polarity_flip_physical{248.0}=0x0
+phy_chain_rx_polarity_flip_physical{249.0}=0x0
+phy_chain_rx_polarity_flip_physical{25.0}=0x1
+phy_chain_rx_polarity_flip_physical{250.0}=0x1
+phy_chain_rx_polarity_flip_physical{251.0}=0x0
+phy_chain_rx_polarity_flip_physical{252.0}=0x1
+phy_chain_rx_polarity_flip_physical{253.0}=0x1
+phy_chain_rx_polarity_flip_physical{254.0}=0x0
+phy_chain_rx_polarity_flip_physical{255.0}=0x1
+phy_chain_rx_polarity_flip_physical{256.0}=0x0
+phy_chain_rx_polarity_flip_physical{257.0}=0x0
+phy_chain_rx_polarity_flip_physical{259.0}=0x0
+phy_chain_rx_polarity_flip_physical{26.0}=0x0
+phy_chain_rx_polarity_flip_physical{27.0}=0x1
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{3.0}=0x1
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x0
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_polarity_flip_physical{33.0}=0x0
+phy_chain_rx_polarity_flip_physical{34.0}=0x0
+phy_chain_rx_polarity_flip_physical{35.0}=0x1
+phy_chain_rx_polarity_flip_physical{36.0}=0x1
+phy_chain_rx_polarity_flip_physical{37.0}=0x1
+phy_chain_rx_polarity_flip_physical{38.0}=0x1
+phy_chain_rx_polarity_flip_physical{39.0}=0x0
+phy_chain_rx_polarity_flip_physical{4.0}=0x0
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+phy_chain_rx_polarity_flip_physical{41.0}=0x0
+phy_chain_rx_polarity_flip_physical{42.0}=0x1
+phy_chain_rx_polarity_flip_physical{43.0}=0x1
+phy_chain_rx_polarity_flip_physical{44.0}=0x1
+phy_chain_rx_polarity_flip_physical{45.0}=0x1
+phy_chain_rx_polarity_flip_physical{46.0}=0x0
+phy_chain_rx_polarity_flip_physical{47.0}=0x0
+phy_chain_rx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_polarity_flip_physical{49.0}=0x1
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{50.0}=0x1
+phy_chain_rx_polarity_flip_physical{51.0}=0x0
+phy_chain_rx_polarity_flip_physical{52.0}=0x0
+phy_chain_rx_polarity_flip_physical{53.0}=0x0
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x1
+phy_chain_rx_polarity_flip_physical{56.0}=0x0
+phy_chain_rx_polarity_flip_physical{57.0}=0x0
+phy_chain_rx_polarity_flip_physical{58.0}=0x0
+phy_chain_rx_polarity_flip_physical{59.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x1
+phy_chain_rx_polarity_flip_physical{61.0}=0x0
+phy_chain_rx_polarity_flip_physical{62.0}=0x0
+phy_chain_rx_polarity_flip_physical{63.0}=0x1
+phy_chain_rx_polarity_flip_physical{64.0}=0x1
+phy_chain_rx_polarity_flip_physical{65.0}=0x1
+phy_chain_rx_polarity_flip_physical{66.0}=0x1
+phy_chain_rx_polarity_flip_physical{67.0}=0x0
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_polarity_flip_physical{69.0}=0x0
+phy_chain_rx_polarity_flip_physical{7.0}=0x0
+phy_chain_rx_polarity_flip_physical{70.0}=0x0
+phy_chain_rx_polarity_flip_physical{71.0}=0x1
+phy_chain_rx_polarity_flip_physical{72.0}=0x1
+phy_chain_rx_polarity_flip_physical{73.0}=0x1
+phy_chain_rx_polarity_flip_physical{74.0}=0x1
+phy_chain_rx_polarity_flip_physical{75.0}=0x0
+phy_chain_rx_polarity_flip_physical{76.0}=0x0
+phy_chain_rx_polarity_flip_physical{77.0}=0x0
+phy_chain_rx_polarity_flip_physical{78.0}=0x0
+phy_chain_rx_polarity_flip_physical{79.0}=0x1
+phy_chain_rx_polarity_flip_physical{8.0}=0x1
+phy_chain_rx_polarity_flip_physical{80.0}=0x1
+phy_chain_rx_polarity_flip_physical{81.0}=0x1
+phy_chain_rx_polarity_flip_physical{82.0}=0x1
+phy_chain_rx_polarity_flip_physical{83.0}=0x0
+phy_chain_rx_polarity_flip_physical{84.0}=0x0
+phy_chain_rx_polarity_flip_physical{85.0}=0x1
+phy_chain_rx_polarity_flip_physical{86.0}=0x1
+phy_chain_rx_polarity_flip_physical{87.0}=0x0
+phy_chain_rx_polarity_flip_physical{88.0}=0x0
+phy_chain_rx_polarity_flip_physical{89.0}=0x0
+phy_chain_rx_polarity_flip_physical{9.0}=0x1
+phy_chain_rx_polarity_flip_physical{90.0}=0x0
+phy_chain_rx_polarity_flip_physical{91.0}=0x1
+phy_chain_rx_polarity_flip_physical{92.0}=0x1
+phy_chain_rx_polarity_flip_physical{93.0}=0x0
+phy_chain_rx_polarity_flip_physical{94.0}=0x0
+phy_chain_rx_polarity_flip_physical{95.0}=0x1
+phy_chain_rx_polarity_flip_physical{96.0}=0x0
+phy_chain_rx_polarity_flip_physical{97.0}=0x1
+phy_chain_rx_polarity_flip_physical{98.0}=0x1
+phy_chain_rx_polarity_flip_physical{99.0}=0x0
+phy_chain_tx_lane_map_physical{1.0}=0x2031
+phy_chain_tx_lane_map_physical{101.0}=0x1023
+phy_chain_tx_lane_map_physical{105.0}=0x1302
+phy_chain_tx_lane_map_physical{109.0}=0x0321
+phy_chain_tx_lane_map_physical{113.0}=0x2301
+phy_chain_tx_lane_map_physical{117.0}=0x3120
+phy_chain_tx_lane_map_physical{121.0}=0x3102
+phy_chain_tx_lane_map_physical{125.0}=0x3210
+phy_chain_tx_lane_map_physical{129.0}=0x1023
+phy_chain_tx_lane_map_physical{13.0}=0x3021
+phy_chain_tx_lane_map_physical{133.0}=0x3210
+phy_chain_tx_lane_map_physical{137.0}=0x2031
+phy_chain_tx_lane_map_physical{141.0}=0x1302
+phy_chain_tx_lane_map_physical{145.0}=0x3210
+phy_chain_tx_lane_map_physical{149.0}=0x0213
+phy_chain_tx_lane_map_physical{153.0}=0x3210
+phy_chain_tx_lane_map_physical{157.0}=0x1320
+phy_chain_tx_lane_map_physical{161.0}=0x3210
+phy_chain_tx_lane_map_physical{165.0}=0x0231
+phy_chain_tx_lane_map_physical{169.0}=0x3120
+phy_chain_tx_lane_map_physical{17.0}=0x1032
+phy_chain_tx_lane_map_physical{173.0}=0x0312
+phy_chain_tx_lane_map_physical{177.0}=0x0231
+phy_chain_tx_lane_map_physical{181.0}=0x3210
+phy_chain_tx_lane_map_physical{185.0}=0x3210
+phy_chain_tx_lane_map_physical{189.0}=0x1320
+phy_chain_tx_lane_map_physical{193.0}=0x0321
+phy_chain_tx_lane_map_physical{197.0}=0x3120
+phy_chain_tx_lane_map_physical{201.0}=0x3120
+phy_chain_tx_lane_map_physical{205.0}=0x0123
+phy_chain_tx_lane_map_physical{209.0}=0x3120
+phy_chain_tx_lane_map_physical{21.0}=0x0213
+phy_chain_tx_lane_map_physical{213.0}=0x3021
+phy_chain_tx_lane_map_physical{217.0}=0x0312
+phy_chain_tx_lane_map_physical{221.0}=0x2301
+phy_chain_tx_lane_map_physical{225.0}=0x0123
+phy_chain_tx_lane_map_physical{229.0}=0x2031
+phy_chain_tx_lane_map_physical{233.0}=0x0231
+phy_chain_tx_lane_map_physical{237.0}=0x0213
+phy_chain_tx_lane_map_physical{241.0}=0x1320
+phy_chain_tx_lane_map_physical{245.0}=0x2031
+phy_chain_tx_lane_map_physical{249.0}=0x3120
+phy_chain_tx_lane_map_physical{25.0}=0x0231
+phy_chain_tx_lane_map_physical{253.0}=0x0321
+phy_chain_tx_lane_map_physical{257.0}=0x3210
+phy_chain_tx_lane_map_physical{29.0}=0x1230
+phy_chain_tx_lane_map_physical{33.0}=0x1032
+phy_chain_tx_lane_map_physical{37.0}=0x0123
+phy_chain_tx_lane_map_physical{41.0}=0x0213
+phy_chain_tx_lane_map_physical{45.0}=0x0132
+phy_chain_tx_lane_map_physical{49.0}=0x2031
+phy_chain_tx_lane_map_physical{5.0}=0x2301
+phy_chain_tx_lane_map_physical{53.0}=0x2301
+phy_chain_tx_lane_map_physical{57.0}=0x2031
+phy_chain_tx_lane_map_physical{61.0}=0x2031
+phy_chain_tx_lane_map_physical{65.0}=0x1230
+phy_chain_tx_lane_map_physical{69.0}=0x2013
+phy_chain_tx_lane_map_physical{73.0}=0x0213
+phy_chain_tx_lane_map_physical{77.0}=0x2310
+phy_chain_tx_lane_map_physical{81.0}=0x0321
+phy_chain_tx_lane_map_physical{85.0}=0x2013
+phy_chain_tx_lane_map_physical{89.0}=0x0213
+phy_chain_tx_lane_map_physical{9.0}=0x3012
+phy_chain_tx_lane_map_physical{93.0}=0x3102
+phy_chain_tx_lane_map_physical{97.0}=0x3210
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{10.0}=0x1
+phy_chain_tx_polarity_flip_physical{100.0}=0x0
+phy_chain_tx_polarity_flip_physical{101.0}=0x0
+phy_chain_tx_polarity_flip_physical{102.0}=0x1
+phy_chain_tx_polarity_flip_physical{103.0}=0x0
+phy_chain_tx_polarity_flip_physical{104.0}=0x0
+phy_chain_tx_polarity_flip_physical{105.0}=0x0
+phy_chain_tx_polarity_flip_physical{106.0}=0x1
+phy_chain_tx_polarity_flip_physical{107.0}=0x1
+phy_chain_tx_polarity_flip_physical{108.0}=0x1
+phy_chain_tx_polarity_flip_physical{109.0}=0x0
+phy_chain_tx_polarity_flip_physical{11.0}=0x1
+phy_chain_tx_polarity_flip_physical{110.0}=0x0
+phy_chain_tx_polarity_flip_physical{111.0}=0x0
+phy_chain_tx_polarity_flip_physical{112.0}=0x1
+phy_chain_tx_polarity_flip_physical{113.0}=0x1
+phy_chain_tx_polarity_flip_physical{114.0}=0x1
+phy_chain_tx_polarity_flip_physical{115.0}=0x1
+phy_chain_tx_polarity_flip_physical{116.0}=0x0
+phy_chain_tx_polarity_flip_physical{117.0}=0x1
+phy_chain_tx_polarity_flip_physical{118.0}=0x0
+phy_chain_tx_polarity_flip_physical{119.0}=0x0
+phy_chain_tx_polarity_flip_physical{12.0}=0x0
+phy_chain_tx_polarity_flip_physical{120.0}=0x0
+phy_chain_tx_polarity_flip_physical{121.0}=0x0
+phy_chain_tx_polarity_flip_physical{122.0}=0x0
+phy_chain_tx_polarity_flip_physical{123.0}=0x0
+phy_chain_tx_polarity_flip_physical{124.0}=0x1
+phy_chain_tx_polarity_flip_physical{125.0}=0x0
+phy_chain_tx_polarity_flip_physical{126.0}=0x1
+phy_chain_tx_polarity_flip_physical{127.0}=0x1
+phy_chain_tx_polarity_flip_physical{128.0}=0x1
+phy_chain_tx_polarity_flip_physical{129.0}=0x1
+phy_chain_tx_polarity_flip_physical{13.0}=0x0
+phy_chain_tx_polarity_flip_physical{130.0}=0x0
+phy_chain_tx_polarity_flip_physical{131.0}=0x1
+phy_chain_tx_polarity_flip_physical{132.0}=0x0
+phy_chain_tx_polarity_flip_physical{133.0}=0x1
+phy_chain_tx_polarity_flip_physical{134.0}=0x1
+phy_chain_tx_polarity_flip_physical{135.0}=0x1
+phy_chain_tx_polarity_flip_physical{136.0}=0x1
+phy_chain_tx_polarity_flip_physical{137.0}=0x1
+phy_chain_tx_polarity_flip_physical{138.0}=0x1
+phy_chain_tx_polarity_flip_physical{139.0}=0x1
+phy_chain_tx_polarity_flip_physical{14.0}=0x1
+phy_chain_tx_polarity_flip_physical{140.0}=0x1
+phy_chain_tx_polarity_flip_physical{141.0}=0x0
+phy_chain_tx_polarity_flip_physical{142.0}=0x1
+phy_chain_tx_polarity_flip_physical{143.0}=0x1
+phy_chain_tx_polarity_flip_physical{144.0}=0x1
+phy_chain_tx_polarity_flip_physical{145.0}=0x1
+phy_chain_tx_polarity_flip_physical{146.0}=0x1
+phy_chain_tx_polarity_flip_physical{147.0}=0x1
+phy_chain_tx_polarity_flip_physical{148.0}=0x0
+phy_chain_tx_polarity_flip_physical{149.0}=0x1
+phy_chain_tx_polarity_flip_physical{15.0}=0x0
+phy_chain_tx_polarity_flip_physical{150.0}=0x0
+phy_chain_tx_polarity_flip_physical{151.0}=0x0
+phy_chain_tx_polarity_flip_physical{152.0}=0x0
+phy_chain_tx_polarity_flip_physical{153.0}=0x1
+phy_chain_tx_polarity_flip_physical{154.0}=0x0
+phy_chain_tx_polarity_flip_physical{155.0}=0x0
+phy_chain_tx_polarity_flip_physical{156.0}=0x0
+phy_chain_tx_polarity_flip_physical{157.0}=0x0
+phy_chain_tx_polarity_flip_physical{158.0}=0x0
+phy_chain_tx_polarity_flip_physical{159.0}=0x0
+phy_chain_tx_polarity_flip_physical{16.0}=0x0
+phy_chain_tx_polarity_flip_physical{160.0}=0x0
+phy_chain_tx_polarity_flip_physical{161.0}=0x0
+phy_chain_tx_polarity_flip_physical{162.0}=0x1
+phy_chain_tx_polarity_flip_physical{163.0}=0x1
+phy_chain_tx_polarity_flip_physical{164.0}=0x0
+phy_chain_tx_polarity_flip_physical{165.0}=0x1
+phy_chain_tx_polarity_flip_physical{166.0}=0x1
+phy_chain_tx_polarity_flip_physical{167.0}=0x1
+phy_chain_tx_polarity_flip_physical{168.0}=0x0
+phy_chain_tx_polarity_flip_physical{169.0}=0x0
+phy_chain_tx_polarity_flip_physical{17.0}=0x0
+phy_chain_tx_polarity_flip_physical{170.0}=0x1
+phy_chain_tx_polarity_flip_physical{171.0}=0x1
+phy_chain_tx_polarity_flip_physical{172.0}=0x1
+phy_chain_tx_polarity_flip_physical{173.0}=0x0
+phy_chain_tx_polarity_flip_physical{174.0}=0x0
+phy_chain_tx_polarity_flip_physical{175.0}=0x1
+phy_chain_tx_polarity_flip_physical{176.0}=0x0
+phy_chain_tx_polarity_flip_physical{177.0}=0x1
+phy_chain_tx_polarity_flip_physical{178.0}=0x0
+phy_chain_tx_polarity_flip_physical{179.0}=0x0
+phy_chain_tx_polarity_flip_physical{18.0}=0x1
+phy_chain_tx_polarity_flip_physical{180.0}=0x0
+phy_chain_tx_polarity_flip_physical{181.0}=0x0
+phy_chain_tx_polarity_flip_physical{182.0}=0x0
+phy_chain_tx_polarity_flip_physical{183.0}=0x0
+phy_chain_tx_polarity_flip_physical{184.0}=0x1
+phy_chain_tx_polarity_flip_physical{185.0}=0x0
+phy_chain_tx_polarity_flip_physical{186.0}=0x1
+phy_chain_tx_polarity_flip_physical{187.0}=0x1
+phy_chain_tx_polarity_flip_physical{188.0}=0x1
+phy_chain_tx_polarity_flip_physical{189.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x1
+phy_chain_tx_polarity_flip_physical{190.0}=0x0
+phy_chain_tx_polarity_flip_physical{191.0}=0x0
+phy_chain_tx_polarity_flip_physical{192.0}=0x0
+phy_chain_tx_polarity_flip_physical{193.0}=0x1
+phy_chain_tx_polarity_flip_physical{194.0}=0x1
+phy_chain_tx_polarity_flip_physical{195.0}=0x1
+phy_chain_tx_polarity_flip_physical{196.0}=0x0
+phy_chain_tx_polarity_flip_physical{197.0}=0x0
+phy_chain_tx_polarity_flip_physical{198.0}=0x1
+phy_chain_tx_polarity_flip_physical{199.0}=0x1
+phy_chain_tx_polarity_flip_physical{2.0}=0x1
+phy_chain_tx_polarity_flip_physical{20.0}=0x1
+phy_chain_tx_polarity_flip_physical{200.0}=0x1
+phy_chain_tx_polarity_flip_physical{201.0}=0x1
+phy_chain_tx_polarity_flip_physical{202.0}=0x1
+phy_chain_tx_polarity_flip_physical{203.0}=0x1
+phy_chain_tx_polarity_flip_physical{204.0}=0x1
+phy_chain_tx_polarity_flip_physical{205.0}=0x0
+phy_chain_tx_polarity_flip_physical{206.0}=0x1
+phy_chain_tx_polarity_flip_physical{207.0}=0x1
+phy_chain_tx_polarity_flip_physical{208.0}=0x1
+phy_chain_tx_polarity_flip_physical{209.0}=0x1
+phy_chain_tx_polarity_flip_physical{21.0}=0x0
+phy_chain_tx_polarity_flip_physical{210.0}=0x1
+phy_chain_tx_polarity_flip_physical{211.0}=0x1
+phy_chain_tx_polarity_flip_physical{212.0}=0x0
+phy_chain_tx_polarity_flip_physical{213.0}=0x0
+phy_chain_tx_polarity_flip_physical{214.0}=0x1
+phy_chain_tx_polarity_flip_physical{215.0}=0x0
+phy_chain_tx_polarity_flip_physical{216.0}=0x1
+phy_chain_tx_polarity_flip_physical{217.0}=0x1
+phy_chain_tx_polarity_flip_physical{218.0}=0x1
+phy_chain_tx_polarity_flip_physical{219.0}=0x0
+phy_chain_tx_polarity_flip_physical{22.0}=0x0
+phy_chain_tx_polarity_flip_physical{220.0}=0x1
+phy_chain_tx_polarity_flip_physical{221.0}=0x0
+phy_chain_tx_polarity_flip_physical{222.0}=0x0
+phy_chain_tx_polarity_flip_physical{223.0}=0x0
+phy_chain_tx_polarity_flip_physical{224.0}=0x1
+phy_chain_tx_polarity_flip_physical{225.0}=0x1
+phy_chain_tx_polarity_flip_physical{226.0}=0x1
+phy_chain_tx_polarity_flip_physical{227.0}=0x1
+phy_chain_tx_polarity_flip_physical{228.0}=0x0
+phy_chain_tx_polarity_flip_physical{229.0}=0x0
+phy_chain_tx_polarity_flip_physical{23.0}=0x0
+phy_chain_tx_polarity_flip_physical{230.0}=0x1
+phy_chain_tx_polarity_flip_physical{231.0}=0x1
+phy_chain_tx_polarity_flip_physical{232.0}=0x1
+phy_chain_tx_polarity_flip_physical{233.0}=0x0
+phy_chain_tx_polarity_flip_physical{234.0}=0x0
+phy_chain_tx_polarity_flip_physical{235.0}=0x0
+phy_chain_tx_polarity_flip_physical{236.0}=0x0
+phy_chain_tx_polarity_flip_physical{237.0}=0x1
+phy_chain_tx_polarity_flip_physical{238.0}=0x1
+phy_chain_tx_polarity_flip_physical{239.0}=0x1
+phy_chain_tx_polarity_flip_physical{24.0}=0x0
+phy_chain_tx_polarity_flip_physical{240.0}=0x0
+phy_chain_tx_polarity_flip_physical{241.0}=0x1
+phy_chain_tx_polarity_flip_physical{242.0}=0x1
+phy_chain_tx_polarity_flip_physical{243.0}=0x1
+phy_chain_tx_polarity_flip_physical{244.0}=0x0
+phy_chain_tx_polarity_flip_physical{245.0}=0x1
+phy_chain_tx_polarity_flip_physical{246.0}=0x1
+phy_chain_tx_polarity_flip_physical{247.0}=0x1
+phy_chain_tx_polarity_flip_physical{248.0}=0x1
+phy_chain_tx_polarity_flip_physical{249.0}=0x1
+phy_chain_tx_polarity_flip_physical{25.0}=0x1
+phy_chain_tx_polarity_flip_physical{250.0}=0x0
+phy_chain_tx_polarity_flip_physical{251.0}=0x0
+phy_chain_tx_polarity_flip_physical{252.0}=0x0
+phy_chain_tx_polarity_flip_physical{253.0}=0x1
+phy_chain_tx_polarity_flip_physical{254.0}=0x1
+phy_chain_tx_polarity_flip_physical{255.0}=0x1
+phy_chain_tx_polarity_flip_physical{256.0}=0x0
+phy_chain_tx_polarity_flip_physical{257.0}=0x0
+phy_chain_tx_polarity_flip_physical{259.0}=0x0
+phy_chain_tx_polarity_flip_physical{26.0}=0x0
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x0
+phy_chain_tx_polarity_flip_physical{29.0}=0x1
+phy_chain_tx_polarity_flip_physical{3.0}=0x1
+phy_chain_tx_polarity_flip_physical{30.0}=0x1
+phy_chain_tx_polarity_flip_physical{31.0}=0x1
+phy_chain_tx_polarity_flip_physical{32.0}=0x0
+phy_chain_tx_polarity_flip_physical{33.0}=0x0
+phy_chain_tx_polarity_flip_physical{34.0}=0x0
+phy_chain_tx_polarity_flip_physical{35.0}=0x0
+phy_chain_tx_polarity_flip_physical{36.0}=0x1
+phy_chain_tx_polarity_flip_physical{37.0}=0x1
+phy_chain_tx_polarity_flip_physical{38.0}=0x1
+phy_chain_tx_polarity_flip_physical{39.0}=0x1
+phy_chain_tx_polarity_flip_physical{4.0}=0x1
+phy_chain_tx_polarity_flip_physical{40.0}=0x0
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x0
+phy_chain_tx_polarity_flip_physical{43.0}=0x0
+phy_chain_tx_polarity_flip_physical{44.0}=0x0
+phy_chain_tx_polarity_flip_physical{45.0}=0x1
+phy_chain_tx_polarity_flip_physical{46.0}=0x0
+phy_chain_tx_polarity_flip_physical{47.0}=0x1
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_tx_polarity_flip_physical{49.0}=0x0
+phy_chain_tx_polarity_flip_physical{5.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x1
+phy_chain_tx_polarity_flip_physical{53.0}=0x0
+phy_chain_tx_polarity_flip_physical{54.0}=0x1
+phy_chain_tx_polarity_flip_physical{55.0}=0x1
+phy_chain_tx_polarity_flip_physical{56.0}=0x0
+phy_chain_tx_polarity_flip_physical{57.0}=0x0
+phy_chain_tx_polarity_flip_physical{58.0}=0x1
+phy_chain_tx_polarity_flip_physical{59.0}=0x1
+phy_chain_tx_polarity_flip_physical{6.0}=0x1
+phy_chain_tx_polarity_flip_physical{60.0}=0x1
+phy_chain_tx_polarity_flip_physical{61.0}=0x0
+phy_chain_tx_polarity_flip_physical{62.0}=0x1
+phy_chain_tx_polarity_flip_physical{63.0}=0x1
+phy_chain_tx_polarity_flip_physical{64.0}=0x1
+phy_chain_tx_polarity_flip_physical{65.0}=0x0
+phy_chain_tx_polarity_flip_physical{66.0}=0x1
+phy_chain_tx_polarity_flip_physical{67.0}=0x1
+phy_chain_tx_polarity_flip_physical{68.0}=0x0
+phy_chain_tx_polarity_flip_physical{69.0}=0x1
+phy_chain_tx_polarity_flip_physical{7.0}=0x1
+phy_chain_tx_polarity_flip_physical{70.0}=0x1
+phy_chain_tx_polarity_flip_physical{71.0}=0x1
+phy_chain_tx_polarity_flip_physical{72.0}=0x0
+phy_chain_tx_polarity_flip_physical{73.0}=0x1
+phy_chain_tx_polarity_flip_physical{74.0}=0x0
+phy_chain_tx_polarity_flip_physical{75.0}=0x0
+phy_chain_tx_polarity_flip_physical{76.0}=0x0
+phy_chain_tx_polarity_flip_physical{77.0}=0x0
+phy_chain_tx_polarity_flip_physical{78.0}=0x0
+phy_chain_tx_polarity_flip_physical{79.0}=0x1
+phy_chain_tx_polarity_flip_physical{8.0}=0x0
+phy_chain_tx_polarity_flip_physical{80.0}=0x0
+phy_chain_tx_polarity_flip_physical{81.0}=0x1
+phy_chain_tx_polarity_flip_physical{82.0}=0x1
+phy_chain_tx_polarity_flip_physical{83.0}=0x1
+phy_chain_tx_polarity_flip_physical{84.0}=0x0
+phy_chain_tx_polarity_flip_physical{85.0}=0x1
+phy_chain_tx_polarity_flip_physical{86.0}=0x0
+phy_chain_tx_polarity_flip_physical{87.0}=0x0
+phy_chain_tx_polarity_flip_physical{88.0}=0x0
+phy_chain_tx_polarity_flip_physical{89.0}=0x1
+phy_chain_tx_polarity_flip_physical{9.0}=0x0
+phy_chain_tx_polarity_flip_physical{90.0}=0x1
+phy_chain_tx_polarity_flip_physical{91.0}=0x1
+phy_chain_tx_polarity_flip_physical{92.0}=0x0
+phy_chain_tx_polarity_flip_physical{93.0}=0x0
+phy_chain_tx_polarity_flip_physical{94.0}=0x0
+phy_chain_tx_polarity_flip_physical{95.0}=0x0
+phy_chain_tx_polarity_flip_physical{96.0}=0x0
+phy_chain_tx_polarity_flip_physical{97.0}=0x0
+phy_chain_tx_polarity_flip_physical{98.0}=0x1
+phy_chain_tx_polarity_flip_physical{99.0}=0x1
+
+port_init_cl72_hg=1
+
+
+
+
+
+
+
+robust_hash_disable_egress_vlan=1
+robust_hash_disable_mpls=1
+robust_hash_disable_vlan=1
+stable_size=0x5500000
+stable_size=0x5500000
+tdma_timeout_usec=15000000
+tslam_timeout_usec=15000000
+dport_map_direct=1
+portmap_1=5:50
+portmap_2=7:50
+portmap_3=13:50
+portmap_4=15:50
+portmap_5=25:50
+portmap_6=27:50
+portmap_7=21:50
+portmap_8=23:50
+portmap_9=37:50
+portmap_10=39:50
+portmap_11=45:50
+portmap_12=47:50
+portmap_13=57:100
+portmap_14=53:100
+portmap_15=9:50
+portmap_16=11:50
+portmap_17=1:50
+portmap_18=3:50
+portmap_19=17:50
+portmap_20=19:50
+portmap_21=29:50
+portmap_22=31:50
+portmap_23=41:50
+portmap_24=43:50
+portmap_25=33:50
+portmap_26=35:50
+portmap_27=49:100
+portmap_28=61:100
+portmap_34=77:50
+portmap_35=79:50
+portmap_36=65:50
+portmap_37=67:50
+portmap_38=85:50
+portmap_39=87:50
+portmap_40=89:50
+portmap_41=91:50
+portmap_42=109:50
+portmap_43=111:50
+portmap_44=97:50
+portmap_45=99:50
+portmap_46=117:100
+portmap_47=121:100
+portmap_48=69:50
+portmap_49=71:50
+portmap_50=73:50
+portmap_51=75:50
+portmap_52=93:50
+portmap_53=95:50
+portmap_54=81:50
+portmap_55=83:50
+portmap_56=101:50
+portmap_57=103:50
+portmap_58=105:50
+portmap_59=107:50
+portmap_60=125:100
+portmap_61=113:100
+portmap_66=257:10
+portmap_68=141:100
+portmap_69=133:100
+portmap_70=149:50
+portmap_71=151:50
+portmap_72=153:50
+portmap_73=155:50
+portmap_74=173:50
+portmap_75=175:50
+portmap_76=161:50
+portmap_77=163:50
+portmap_78=181:50
+portmap_79=183:50
+portmap_80=185:50
+portmap_81=187:50
+portmap_82=129:100
+portmap_83=137:100
+portmap_84=157:50
+portmap_85=159:50
+portmap_86=145:50
+portmap_87=147:50
+portmap_88=165:50
+portmap_89=167:50
+portmap_90=169:50
+portmap_91=171:50
+portmap_92=189:50
+portmap_93=191:50
+portmap_94=177:50
+portmap_95=179:50
+portmap_100=259:10
+portmap_102=197:100
+portmap_103=205:100
+portmap_104=217:50
+portmap_105=219:50
+portmap_106=213:50
+portmap_107=215:50
+portmap_108=229:50
+portmap_109=231:50
+portmap_110=237:50
+portmap_111=239:50
+portmap_112=249:50
+portmap_113=251:50
+portmap_114=245:50
+portmap_115=247:50
+portmap_116=201:100
+portmap_117=193:100
+portmap_118=209:50
+portmap_119=211:50
+portmap_120=221:50
+portmap_121=223:50
+portmap_122=233:50
+portmap_123=235:50
+portmap_124=225:50
+portmap_125=227:50
+portmap_126=241:50
+portmap_127=243:50
+portmap_128=253:50
+portmap_129=255:50
+
+# tuning parameters
+serdes_preemphasis_1=0x580c
+serdes_preemphasis_2=0x580c
+serdes_preemphasis_3=0x580c
+serdes_preemphasis_4=0x580c
+serdes_preemphasis_5=0x580c
+serdes_preemphasis_6=0x580c
+serdes_preemphasis_7=0x580c
+serdes_preemphasis_8=0x580c
+serdes_preemphasis_9=0x580c
+serdes_preemphasis_10=0x580c
+serdes_preemphasis_11=0x580c
+serdes_preemphasis_12=0x580c
+serdes_preemphasis_13=0x83404
+serdes_preemphasis_14=0x83404
+serdes_preemphasis_15=0x580c
+serdes_preemphasis_16=0x580c
+serdes_preemphasis_17=0x580c
+serdes_preemphasis_18=0x580c
+serdes_preemphasis_19=0x580c
+serdes_preemphasis_20=0x580c
+serdes_preemphasis_21=0x580c
+serdes_preemphasis_22=0x580c
+serdes_preemphasis_23=0x580c
+serdes_preemphasis_24=0x580c
+serdes_preemphasis_25=0x580c
+serdes_preemphasis_26=0x580c
+serdes_preemphasis_27=0xf3c05
+serdes_preemphasis_28=0xf3d05
+serdes_preemphasis_34=0x580c
+serdes_preemphasis_35=0x580c
+serdes_preemphasis_36=0x580c
+serdes_preemphasis_37=0x580c
+serdes_preemphasis_38=0x580c
+serdes_preemphasis_39=0x580c
+serdes_preemphasis_40=0x580c
+serdes_preemphasis_41=0x580c
+serdes_preemphasis_42=0x580c
+serdes_preemphasis_43=0x580c
+serdes_preemphasis_44=0x580c
+serdes_preemphasis_45=0x580c
+serdes_preemphasis_46=0xb3604
+serdes_preemphasis_47=0x72b03
+serdes_preemphasis_48=0x580c
+serdes_preemphasis_49=0x580c
+serdes_preemphasis_50=0x580c
+serdes_preemphasis_51=0x580c
+serdes_preemphasis_52=0x580c
+serdes_preemphasis_53=0x580c
+serdes_preemphasis_54=0x580c
+serdes_preemphasis_55=0x580c
+serdes_preemphasis_56=0x580c
+serdes_preemphasis_57=0x580c
+serdes_preemphasis_58=0x580c
+serdes_preemphasis_59=0x580c
+serdes_preemphasis_60=0xf3c05
+serdes_preemphasis_61=0x103f06
+serdes_preemphasis_66=0x43004
+serdes_preemphasis_68=0xf4006
+serdes_preemphasis_69=0xf4006
+serdes_preemphasis_70=0x580c
+serdes_preemphasis_71=0x580c
+serdes_preemphasis_72=0x580c
+serdes_preemphasis_73=0x580c
+serdes_preemphasis_74=0x580c
+serdes_preemphasis_75=0x580c
+serdes_preemphasis_76=0x580c
+serdes_preemphasis_77=0x580c
+serdes_preemphasis_78=0x580c
+serdes_preemphasis_79=0x580c
+serdes_preemphasis_80=0x580c
+serdes_preemphasis_81=0x580c
+serdes_preemphasis_82=0x73103
+serdes_preemphasis_83=0x73103
+serdes_preemphasis_84=0x580c
+serdes_preemphasis_85=0x580c
+serdes_preemphasis_86=0x580c
+serdes_preemphasis_87=0x580c
+serdes_preemphasis_88=0x580c
+serdes_preemphasis_89=0x580c
+serdes_preemphasis_90=0x580c
+serdes_preemphasis_91=0x580c
+serdes_preemphasis_92=0x580c
+serdes_preemphasis_93=0x580c
+serdes_preemphasis_94=0x580c
+serdes_preemphasis_95=0x580c
+serdes_preemphasis_100=0x43004
+serdes_preemphasis_102=0xf3c05
+serdes_preemphasis_103=0xf3c05
+serdes_preemphasis_104=0x580c
+serdes_preemphasis_105=0x580c
+serdes_preemphasis_106=0x580c
+serdes_preemphasis_107=0x580c
+serdes_preemphasis_108=0x580c
+serdes_preemphasis_109=0x580c
+serdes_preemphasis_110=0x580c
+serdes_preemphasis_111=0x580c
+serdes_preemphasis_112=0x580c
+serdes_preemphasis_113=0x580c
+serdes_preemphasis_114=0x580c
+serdes_preemphasis_115=0x580c
+serdes_preemphasis_116=0x83404
+serdes_preemphasis_117=0x83404
+serdes_preemphasis_118=0x580c
+serdes_preemphasis_119=0x580c
+serdes_preemphasis_120=0x580c
+serdes_preemphasis_121=0x580c
+serdes_preemphasis_122=0x580c
+serdes_preemphasis_123=0x580c
+serdes_preemphasis_124=0x580c
+serdes_preemphasis_125=0x580c
+serdes_preemphasis_126=0x580c
+serdes_preemphasis_127=0x580c
+serdes_preemphasis_128=0x580c
+serdes_preemphasis_129=0x580c
+
+mmu_init_config="MSFT-TH2-Tier0"
+{{ IPinIP_sock }}
+
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
new file mode 100644
index 000000000000..ed0005610b71
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff     threshold xon_offset
+  50000  5m   1248    1248 56160    -3        2496
+ 100000  5m   1248    1248 96928    -3        2496
+  50000  40m  1248    1248 96096    -3        2496
+ 100000  40m  1248    1248 177632   -3        2496
+  50000  300m 1248    1248 141856   -3        2496
+ 100000  300m 1248    1248 268736   -3        2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/port_config.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/port_config.ini
new file mode 100644
index 000000000000..49bd6fd68856
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/port_config.ini
@@ -0,0 +1,115 @@
+# name          lanes             alias        index  speed
+Ethernet0       77,78             Ethernet1/1  1      50000
+Ethernet2       79,80             Ethernet1/3  1      50000
+Ethernet4       65,66             Ethernet2/1  2      50000
+Ethernet6       67,68             Ethernet2/3  2      50000
+Ethernet8       85,86             Ethernet3/1  3      50000
+Ethernet10      87,88             Ethernet3/3  3      50000
+Ethernet12      89,90             Ethernet4/1  4      50000
+Ethernet14      91,92             Ethernet4/3  4      50000
+Ethernet16      109,110           Ethernet5/1  5      50000
+Ethernet18      111,112           Ethernet5/3  5      50000
+Ethernet20      97,98             Ethernet6/1  6      50000
+Ethernet22      99,100            Ethernet6/3  6      50000
+Ethernet24      5,6               Ethernet7/1  7      50000
+Ethernet26      7,8               Ethernet7/3  7      50000
+Ethernet28      13,14             Ethernet8/1  8      50000
+Ethernet30      15,16             Ethernet8/3  8      50000
+Ethernet32      25,26             Ethernet9/1  9      50000
+Ethernet34      27,28             Ethernet9/3  9      50000
+Ethernet36      21,22             Ethernet10/1 10     50000
+Ethernet38      23,24             Ethernet10/3 10     50000
+Ethernet40      37,38             Ethernet11/1 11     50000
+Ethernet42      39,40             Ethernet11/3 11     50000
+Ethernet44      45,46             Ethernet12/1 12     50000
+Ethernet46      47,48             Ethernet12/3 12     50000
+Ethernet48      57,58,59,60       Ethernet13/1 13     100000
+Ethernet52      53,54,55,56       Ethernet14/1 14     100000
+Ethernet56      117,118,119,120   Ethernet15/1 15     100000
+Ethernet60      121,122,123,124   Ethernet16/1 16     100000
+Ethernet64      141,142,143,144   Ethernet17/1 17     100000
+Ethernet68      133,134,135,136   Ethernet18/1 18     100000
+Ethernet72      197,198,199,200   Ethernet19/1 19     100000
+Ethernet76      205,206,207,208   Ethernet20/1 20     100000
+Ethernet80      217,218           Ethernet21/1 21     50000
+Ethernet82      219,220           Ethernet21/3 21     50000
+Ethernet84      213,214           Ethernet22/1 22     50000
+Ethernet86      215,216           Ethernet22/3 22     50000
+Ethernet88      229,230           Ethernet23/1 23     50000
+Ethernet90      231,232           Ethernet23/3 23     50000
+Ethernet92      237,238           Ethernet24/1 24     50000
+Ethernet94      239,240           Ethernet24/3 24     50000
+Ethernet96      249,250           Ethernet25/1 25     50000
+Ethernet98      251,252           Ethernet25/3 25     50000
+Ethernet100     245,246           Ethernet26/1 26     50000
+Ethernet102     247,248           Ethernet26/3 26     50000
+Ethernet104     149,150           Ethernet27/1 27     50000
+Ethernet106     151,152           Ethernet27/3 27     50000
+Ethernet108     153,154           Ethernet28/1 28     50000
+Ethernet110     155,156           Ethernet28/3 28     50000
+Ethernet112     173,174           Ethernet29/1 29     50000
+Ethernet114     175,176           Ethernet29/3 29     50000
+Ethernet116     161,162           Ethernet30/1 30     50000
+Ethernet118     163,164           Ethernet30/3 30     50000
+Ethernet120     181,182           Ethernet31/1 31     50000
+Ethernet122     183,184           Ethernet31/3 31     50000
+Ethernet124     185,186           Ethernet32/1 32     50000
+Ethernet126     187,188           Ethernet32/3 32     50000
+Ethernet128     69,70             Ethernet33/1 33     50000
+Ethernet130     71,72             Ethernet33/3 33     50000
+Ethernet132     73,74             Ethernet34/1 34     50000
+Ethernet134     75,76             Ethernet34/3 34     50000
+Ethernet136     93,94             Ethernet35/1 35     50000
+Ethernet138     95,96             Ethernet35/3 35     50000
+Ethernet140     81,82             Ethernet36/1 36     50000
+Ethernet142     83,84             Ethernet36/3 36     50000
+Ethernet144     101,102           Ethernet37/1 37     50000
+Ethernet146     103,104           Ethernet37/3 37     50000
+Ethernet148     105,106           Ethernet38/1 38     50000
+Ethernet150     107,108           Ethernet38/3 38     50000
+Ethernet152     9,10              Ethernet39/1 39     50000
+Ethernet154     11,12             Ethernet39/3 39     50000
+Ethernet156     1,2               Ethernet40/1 40     50000
+Ethernet158     3,4               Ethernet40/3 40     50000
+Ethernet160     17,18             Ethernet41/1 41     50000
+Ethernet162     19,20             Ethernet41/3 41     50000
+Ethernet164     29,30             Ethernet42/1 42     50000
+Ethernet166     31,32             Ethernet42/3 42     50000
+Ethernet168     41,42             Ethernet43/1 43     50000
+Ethernet170     43,44             Ethernet43/3 43     50000
+Ethernet172     33,34             Ethernet44/1 44     50000
+Ethernet174     35,36             Ethernet44/3 44     50000
+Ethernet176     49,50,51,52       Ethernet45/1 45     100000
+Ethernet180     61,62,63,64       Ethernet46/1 46     100000
+Ethernet184     125,126,127,128   Ethernet47/1 47     100000
+Ethernet188     113,114,115,116   Ethernet48/1 48     100000
+Ethernet192     129,130,131,132   Ethernet49/1 49     100000
+Ethernet196     137,138,139,140   Ethernet50/1 50     100000
+Ethernet200     201,202,203,204   Ethernet51/1 51     100000
+Ethernet204     193,194,195,196   Ethernet52/1 52     100000
+Ethernet208     209,210           Ethernet53/1 53     50000
+Ethernet210     211,212           Ethernet53/3 53     50000
+Ethernet212     221,222           Ethernet54/1 54     50000
+Ethernet214     223,224           Ethernet54/3 54     50000
+Ethernet216     233,234           Ethernet55/1 55     50000
+Ethernet218     235,236           Ethernet55/3 55     50000
+Ethernet220     225,226           Ethernet56/1 56     50000
+Ethernet222     227,228           Ethernet56/3 56     50000
+Ethernet224     241,242           Ethernet57/1 57     50000
+Ethernet226     243,244           Ethernet57/3 57     50000
+Ethernet228     253,254           Ethernet58/1 58     50000
+Ethernet230     255,256           Ethernet58/3 58     50000
+Ethernet232     157,158           Ethernet59/1 59     50000
+Ethernet234     159,160           Ethernet59/3 59     50000
+Ethernet236     145,146           Ethernet60/1 60     50000
+Ethernet238     147,148           Ethernet60/3 60     50000
+Ethernet240     165,166           Ethernet61/1 61     50000
+Ethernet242     167,168           Ethernet61/3 61     50000
+Ethernet244     169,170           Ethernet62/1 62     50000
+Ethernet246     171,172           Ethernet62/3 62     50000
+Ethernet248     189,190           Ethernet63/1 63     50000
+Ethernet250     191,192           Ethernet63/3 63     50000
+Ethernet252     177,178           Ethernet64/1 64     50000
+Ethernet254     179,180           Ethernet64/3 64     50000
+Ethernet256     257               Ethernet65   65     10000
+Ethernet260     259               Ethernet66   66     10000
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/sai.profile
new file mode 100644
index 000000000000..5163d6140f0e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
+SAI_NUM_ECMP_MEMBERS=64

From b5ab98d3a165542f742cb8d7c68fbe79eb300c92 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 24 Mar 2022 12:00:08 -0700
Subject: [PATCH 1094/1674] [202012][sonic-utilities] submodule update (#10337)

This PR updates the following commits in sonic-utilities

582d740 (HEAD -> 202012, origin/202012) [show] add support for hwstatus in show muxcable status (#1961) (#2105)


Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index aa21e3a4c932..582d7403b667 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit aa21e3a4c932788489f654eebe2cbdfe81a9e9ae
+Subproject commit 582d7403b667f0884c1788bb1d183c51824c5565

From aafb3d00e2211fc71b1c3a61a44a494c554a39a3 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 24 Mar 2022 14:28:42 -0700
Subject: [PATCH 1095/1674] Start haveged before systemd-random-seed (#10328)

The haveged service file in Debian Buster specifies that haveged should
start after systemd-random-seed starts (this was removed in Bullseye
after systemd changes caused a bootloop). This is a bit
counterproductive, since haveged is meant to be used in environments
with minimal sources of entropy, but one of the checks that
systemd-random-seed does is to verify that entropy is present.

Therefore, override the default .service file for haveged that moves
systemd-random-seed to the Before list, allowing it to start before
systemd-random-seed checks the system entropy level. (systemd doesn't
allow removing items from dependency/ordering entries such as After= and
Before=, so the entire .service file has to be overwritten.)

Note that despite this, haveged takes up to two seconds to actually
start working, so systemd-random-seed may still block for about two
seconds. However, this still allows other work (such as running
rc.local) to proceed a bit sooner.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 .../build_templates/sonic_debian_extension.j2 |  4 ++++
 files/image_config/haveged/haveged.service    | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 files/image_config/haveged/haveged.service

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 29a7eb2dcaff..4d4f4b37bc05 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -352,6 +352,10 @@ sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/syslog.socket.d
 sudo cp $IMAGE_CONFIGS/syslog/override.conf $FILESYSTEM_ROOT/etc/systemd/system/syslog.socket.d/override.conf
 sudo cp $IMAGE_CONFIGS/syslog/host_umount.sh $FILESYSTEM_ROOT/usr/bin/
 
+# Copy haveged override file
+sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/
+sudo cp $IMAGE_CONFIGS/haveged/haveged.service $FILESYSTEM_ROOT_ETC/systemd/system/haveged.service
+
 # Copy system-health files
 sudo LANG=C cp $IMAGE_CONFIGS/system-health/system-health.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 echo "system-health.service" | sudo tee -a $GENERATED_SERVICE_FILE
diff --git a/files/image_config/haveged/haveged.service b/files/image_config/haveged/haveged.service
new file mode 100644
index 000000000000..361b1114b11e
--- /dev/null
+++ b/files/image_config/haveged/haveged.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Entropy daemon using the HAVEGE algorithm
+Documentation=man:haveged(8) http://www.issihosts.com/haveged/
+DefaultDependencies=no
+ConditionVirtualization=!container
+After=apparmor.service systemd-tmpfiles-setup.service
+Before=sysinit.target shutdown.target systemd-random-seed.service
+
+[Service]
+EnvironmentFile=-/etc/default/haveged
+ExecStart=/usr/sbin/haveged --Foreground --verbose=1 $DAEMON_ARGS
+SuccessExitStatus=143
+SecureBits=noroot-locked
+NoNewPrivileges=yes
+CapabilityBoundingSet=CAP_SYS_ADMIN
+PrivateTmp=yes
+PrivateDevices=yes
+PrivateNetwork=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=default.target

From e71c14502daccbfbcf41967cda8b97eac08af5e8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 25 Mar 2022 15:09:37 +0800
Subject: [PATCH 1096/1674] [ci/build]: Upgrade SONiC package versions (#10331)

Upgrade SONiC Versions
---
 .../versions-deb-buster                       |  6 +-
 .../versions-deb-buster-arm64                 |  3 -
 .../versions-deb-buster-armhf                 |  3 -
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-git     |  2 +-
 files/build/versions/default/versions-web     |  8 +-
 .../docker-base-buster/versions-deb-buster    |  2 +
 .../docker-base-stretch/versions-deb-stretch  |  5 ++
 .../versions-deb-buster                       | 37 +++++++++
 .../versions-deb-buster-arm64                 |  4 +-
 .../versions-deb-buster-armhf                 |  4 +-
 .../versions-deb-stretch                      | 35 +++++++++
 .../docker-dhcp-relay/versions-deb-buster     |  8 +-
 .../docker-orchagent/versions-deb-buster      | 37 +++++++++
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../versions-deb-buster                       | 45 +++++++++++
 .../versions-deb-buster-arm64                 |  1 +
 .../versions-deb-buster-armhf                 |  1 +
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   | 31 ++++++++
 .../docker-snmp/versions-deb-buster-arm64     |  1 +
 .../docker-snmp/versions-deb-buster-armhf     |  1 +
 .../versions-deb-buster                       | 49 ++++++++++++
 .../versions-deb-buster-arm64                 |  1 +
 .../versions-deb-buster-armhf                 |  1 +
 .../docker-sonic-vs/versions-deb-buster       | 48 ++++++++++++
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  5 +-
 .../sonic-slave-buster/versions-deb-buster    | 38 ++++-----
 .../versions-deb-buster-arm64                 |  5 +-
 .../versions-deb-buster-armhf                 |  5 +-
 .../dockers/sonic-slave-buster/versions-git   |  1 -
 .../sonic-slave-stretch/versions-deb-stretch  | 50 ++++++------
 .../versions-deb-stretch-arm64                | 11 +--
 .../versions-deb-stretch-armhf                | 11 +--
 .../dockers/sonic-slave-stretch/versions-git  |  2 +
 .../versions/host-image/versions-deb-buster   | 77 +++++++++++++++++--
 .../host-image/versions-deb-buster-arm64      | 16 ++--
 .../host-image/versions-deb-buster-armhf      | 16 ++--
 41 files changed, 462 insertions(+), 124 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-snmp/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-snmp/versions-deb-buster-armhf
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-arm64
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index ac2b6edb7a67..e07e8d295223 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -5,7 +5,7 @@ innovium-sai==0.107.2
 innovium-sai-headers==0.107.2
 iproute2-dev==1.mlnx.4.5.1208
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.18.1-16
+kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-3-200==3.5.0-1
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.3-2
+libsaibcm==4.3.5.3-3
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -42,7 +42,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.18.1-16
+mft==4.18.0-106
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
index 611d3d3083b7..57aad7a71092 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
@@ -1,4 +1 @@
-libsnmp-base==5.7.3+dfsg-5
-libsnmp-dev==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
 linux-headers-4.19.0-12-2-arm64==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index 9dd2de65079c..a83790c30ddf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1,4 +1 @@
-libsnmp-base==5.7.3+dfsg-5
-libsnmp-dev==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 7edfcdb8145d..0f7139c777c5 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -29,8 +29,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index b3a8e90c2094..12b6e6db137b 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=uTQVVAhHHJ2m4WQYnrsUcyq%2FIoUOcQlD4Kh52R7OSrg%3D&se=2035-11-11T03%3A32%3A33Z&sp=r==420d50582b321edb4dcf5f22264453d0
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=0okWyK4w%2FgsZ41OXDfxd7Nm7KFKts3W9%2FX3aLBtiVIE%3D&se=2035-11-11T03%3A30%3A32Z&sp=r==c065923f0026f92ba51f5ee915c22951
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 44e01778b7f2..ba5c88568921 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==950a6b4225ed3280aa0fbca2de51bfbaecd7695a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d8464b85288e18674dc58896b6548fd24b220890
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e7a37fc20435..eae59227e5c9 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -14,12 +14,12 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.18.1-16-x86_64-deb.tgz==a62f2b0b9a29c3af1cf2dcbb6e051413
+http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==f964fa5b54050ac3bb33ea47f436180f
+https://deb.nodesource.com/node_14.x/dists/buster/Release==3084d51335d332e66f0d81a42079516d
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -51,8 +51,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -75,4 +73,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index f06a01cef517..65d809288ffc 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -54,10 +54,12 @@ openssl==1.1.1d-0+deb10u8
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
+python-pip-whl==18.1-5
 python3==3.7.3-1
 python3-distutils==3.7.3-1
 python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
+python3-pip==18.1-5
 python3.7==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 readline-common==7.0-5
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index b05da3862a4d..de9009f1c1b1 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -2,6 +2,7 @@ ca-certificates==20200601~deb9u2
 curl==7.52.1-5+deb9u16
 jq==1.5+dfsg-1.3
 less==481-2.1
+libatomic1==6.3.0-18+deb9u1
 libcurl3==7.52.1-5+deb9u16
 libdaemon0==0.14-6
 libdbus-1-3==1.10.32-0+deb9u1
@@ -13,9 +14,11 @@ libgdbm3==1.8.3-14
 libgmp10==2:6.1.2+dfsg-1+deb9u1
 libgnutls30==3.5.8-5+deb9u6
 libgssapi-krb5-2==1.15-1+deb9u3
+libhiredis0.14==0.14.0-3~bpo9+1
 libhogweed4==3.3-1+deb9u1
 libidn2-0==0.16-1+deb9u1
 libjansson4==2.9-1
+libjemalloc1==3.6.0-9.1
 libjq1==1.5+dfsg-1.3
 libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
@@ -24,6 +27,7 @@ libkrb5support0==1.15-1+deb9u3
 libldap-2.4-2==2.4.44+dfsg-5+deb9u8
 libldap-common==2.4.44+dfsg-5+deb9u8
 liblognorm5==2.0.3-1~bpo9+1
+liblua5.1-0==5.1.5-8.1+b2
 libncurses5==6.0+20161126-1+deb9u2
 libnghttp2-14==1.18.1-1+deb9u2
 libonig4==6.1.3-2+deb9u2
@@ -49,6 +53,7 @@ libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
 libwrap0==7.6.q-26
 libzmq5==4.2.1-4+deb9u4
+lua-bitop==1.0.2-4
 lua-cjson==2.1.0+dfsg-2
 mime-support==3.60
 net-tools==1.60+git20161116.90da8a0-1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 45edbd3c2bbb..7f895537c2c5 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -1,14 +1,51 @@
 apt-utils==1.8.2.3
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
 bzip2==1.0.6-9.2~deb10u1
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+dh-python==3.20190308
 dpkg-dev==1.19.7
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 libapt-inst2.0==1.8.2.3
+libasan5==8.3.0-6
+libbinutils==2.31.1-16
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
+libdpkg-perl==1.19.7
+libexpat1-dev==2.2.6-2+deb10u4
+libgcc-8-dev==8.3.0-6
+libgomp1==8.3.0-6
 libhiredis0.14==0.14.0-3~bpo9+1
+libisl19==0.20-2
+libitm1==8.3.0-6
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libnl-3-200==3.5.0-1
 libnl-cli-3-200==3.5.0-1
 libnl-genl-3-200==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-route-3-200==3.5.0-1
+libpython3-dev==3.7.3-1
 libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
+libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
+linux-libc-dev==4.19.232-1
+make==4.2.1-1.2
+patch==2.7.6-3+deb10u1
+python3-dev==3.7.3-1
 python3-swsscommon==1.0.0
+python3.7-dev==3.7.3-2+deb10u3
 xz-utils==5.2.4-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index c30de4901997..1aaf51298b09 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,11 +1,9 @@
+binutils-aarch64-linux-gnu==2.31.1-16
 icu-devtools==63.1-6+deb10u2
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.232-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index c30de4901997..4d4aa90fb33b 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,11 +1,9 @@
+binutils-arm-linux-gnueabihf==2.31.1-16
 icu-devtools==63.1-6+deb10u2
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
 libicu-dev==63.1-6+deb10u2
 libicu63==63.1-6+deb10u2
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
-linux-libc-dev==4.19.232-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
index bcd99b6899bd..60e8a7f23463 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -1,11 +1,46 @@
+binutils==2.28-5
+build-essential==12.3
 bzip2==1.0.6-8.1
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
 dpkg-dev==1.18.25
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+libasan3==6.3.0-18+deb9u1
+libatomic1==6.3.0-18+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcc1-0==6.3.0-18+deb9u1
+libcilkrts5==6.3.0-18+deb9u1
+libdpkg-perl==1.18.25
+libexpat1-dev==2.2.0-2+deb9u5
+libgcc-6-dev==6.3.0-18+deb9u1
+libgomp1==6.3.0-18+deb9u1
 libhiredis0.14==0.14.0-3~bpo9+1
+libisl15==0.18-1
+libitm1==6.3.0-18+deb9u1
+liblsan0==6.3.0-18+deb9u1
+libmpc3==1.0.3-1+b2
+libmpfr4==3.1.5-1
+libmpx2==6.3.0-18+deb9u1
 libnl-3-200==3.5.0-1
 libnl-cli-3-200==3.5.0-1
 libnl-genl-3-200==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-route-3-200==3.5.0-1
+libpython-dev==2.7.13-2
+libpython2.7-dev==2.7.13-2+deb9u6
+libquadmath0==6.3.0-18+deb9u1
+libstdc++-6-dev==6.3.0-18+deb9u1
 libswsscommon==1.0.0
+libtsan0==6.3.0-18+deb9u1
+libubsan0==6.3.0-18+deb9u1
+linux-libc-dev==4.9.303-1
+make==4.1-9.1
+patch==2.7.5-1+deb9u2
+python-dev==2.7.13-2
 python-swsscommon==1.0.0
+python2.7-dev==2.7.13-2+deb9u6
 xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index d6169202a35a..5fb7147f4704 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -7,7 +7,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
@@ -15,9 +15,9 @@ libexplain51==1.4.D001-8
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u7
 libpopt0==1.16-12
 libunwind8==1.2.1-10~deb10u1
 lsof==4.91+dfsg-1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 263a47c231f4..142d2fc6c1b4 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -1,27 +1,64 @@
 arping==2.19-6
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
 bridge-utils==1.6-2
+build-essential==12.6
 conntrack==1:1.4.5-2
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+dh-python==3.20190308
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 ifupdown==0.8.35
+libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
+libdpkg-perl==1.19.7
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
+libexpat1-dev==2.2.6-2+deb10u4
+libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libipt2==2.0-2
+libisl19==0.20-2
+libitm1==8.3.0-6
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
 libpcap0.8==1.8.1-6
 libpopt0==1.16-12
+libpython3-dev==3.7.3-1
+libpython3.7-dev==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
 libsairedis-dbg==1.0.0
+libstdc++-8-dev==8.3.0-6
 libswsscommon-dbg==1.0.0
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
+linux-libc-dev==4.19.232-1
+make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 openssh-client==1:7.9p1-10+deb10u2
+patch==2.7.6-3+deb10u1
+python3-dev==3.7.3-1
+python3.7-dev==3.7.3-2+deb10u3
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
index 4784968efcf0..bf7e83cd9cc1 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-arm64
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u4
+binutils-aarch64-linux-gnu==2.31.1-16
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
index 4784968efcf0..2948f7995529 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster-armhf
@@ -1,4 +1,4 @@
-libexpat1-dev==2.2.6-2+deb10u4
+binutils-arm-linux-gnueabihf==2.31.1-16
 libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 0eea073e8ccb..17b38a1356a4 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,12 @@
 applibs==1.mlnx.4.5.1208
 applibs-dev==1.mlnx.4.5.1208
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+build-essential==12.6
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+dh-python==3.20190308
 dmidecode==3.2-1
 ethtool==1:5.9-1
 fancontrol==1:3.5.0-3
@@ -7,29 +14,48 @@ fontconfig==2.13.1-2
 fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 i2c-tools==4.1-1
 ipmitool==1.8.18-6+deb10u1
+libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
 libcairo2==1.16.0-4+deb10u1
+libcc1-0==8.3.0-6
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
+libdpkg-perl==1.19.7
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
+libexpat1-dev==2.2.6-2+deb10u4
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libfribidi0==1.0.5-3.1+deb10u1
+libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libharfbuzz0b==2.3.1-1
 libi2c0==4.1-1
 libicu63==63.1-6+deb10u2
 libipt2==2.0-2
+libisl19==0.20-2
+libitm1==8.3.0-6
 libkmod2==26-1
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libpango-1.0-0==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
@@ -37,19 +63,28 @@ libpci3==1:3.5.2-1
 libpixman-1-0==0.36.0-1
 libpng16-16==1.6.36-6
 libpopt0==1.16-12
+libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
 libpython2-stdlib==2.7.16-1
 libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-dev==3.7.3-1
+libpython3.7-dev==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libsensors5-dbgsym==1:3.5.0-3
+libstdc++-8-dev==8.3.0-6
 libswsscommon-dbg==1.0.0
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libx11-6==2:1.6.7-1+deb10u2
 libx11-data==2:1.6.7-1+deb10u2
@@ -61,22 +96,32 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxrender1==1:0.9.10-1
+linux-libc-dev==4.19.232-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
+make==4.2.1-1.2
 openssh-client==1:7.9p1-10+deb10u2
+patch==2.7.6-3+deb10u1
 psmisc==23.2-1+deb10u1
 python==2.7.16-1
+python-dev==2.7.16-1
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
 python-sdk-api==1.mlnx.4.5.1208
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
+python2-dev==2.7.16-1
 python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+python3-dev==3.7.3-1
 python3-jsonschema==2.6.0-4
 python3-pkg-resources==40.8.0-1
 python3-smbus==4.1-1
+python3.7-dev==3.7.3-2+deb10u3
 rrdtool==1.7.1-2
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
new file mode 100644
index 000000000000..76a3c3a88288
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-arm64
@@ -0,0 +1 @@
+binutils-aarch64-linux-gnu==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
new file mode 100644
index 000000000000..568b8b43bc13
--- /dev/null
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster-armhf
@@ -0,0 +1 @@
+binutils-arm-linux-gnueabihf==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 164eb7d0bf57..3b0c68e87ad3 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.10.2
+paramiko==2.10.3
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 28746572151c..bd0c0ac725b3 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,29 +1,60 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+dh-python==3.20190308
 freeipmi-common==1.6.3-1.1
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 ipmitool==1.8.18-6+deb10u1
+libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
 libc-l10n==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
+libexpat1-dev==2.2.6-2+deb10u4
 libfreeipmi17==1.6.3-1.1
+libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libipt2==2.0-2
+libisl19==0.20-2
+libitm1==8.3.0-6
+liblsan0==8.3.0-6
 libmariadb3==1:10.3.31-0+deb10u1
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
+libpython3-dev==3.7.3-1
+libpython3.7-dev==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libsnmp-base==5.7.3+dfsg-5
 libsnmp30==5.7.3+dfsg-5
 libsnmp30-dbg==5.7.3+dfsg-5
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
+linux-libc-dev==4.19.232-1
 locales==2.28-10
+make==4.2.1-1.2
 mariadb-common==1:10.3.31-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
+python3-dev==3.7.3-1
+python3.7-dev==3.7.3-2+deb10u3
 snmp==5.7.3+dfsg-5
 snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-snmp/versions-deb-buster-arm64
new file mode 100644
index 000000000000..76a3c3a88288
--- /dev/null
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster-arm64
@@ -0,0 +1 @@
+binutils-aarch64-linux-gnu==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster-armhf b/files/build/versions/dockers/docker-snmp/versions-deb-buster-armhf
new file mode 100644
index 000000000000..568b8b43bc13
--- /dev/null
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster-armhf
@@ -0,0 +1 @@
+binutils-arm-linux-gnueabihf==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index be77486d97df..7593308a5f00 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -1,21 +1,70 @@
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
+dh-python==3.20190308
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
+libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
+libexpat1-dev==2.2.6-2+deb10u4
+libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u2
 libipt2==2.0-2
+libisl19==0.20-2
+libitm1==8.3.0-6
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libpopt0==1.16-12
+libpython-dev==2.7.16-1
+libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
+libpython2-stdlib==2.7.16-1
+libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
+libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-dev==3.7.3-1
+libpython3.7-dev==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
+libstdc++-8-dev==8.3.0-6
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 libyang==1.0.73
+linux-libc-dev==4.19.232-1
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
+python-dev==2.7.16-1
+python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python2==2.7.16-1
+python2-dev==2.7.16-1
+python2-minimal==2.7.16-1
+python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+python3-dev==3.7.3-1
+python3.7-dev==3.7.3-2+deb10u3
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-arm64
new file mode 100644
index 000000000000..76a3c3a88288
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-arm64
@@ -0,0 +1 @@
+binutils-aarch64-linux-gnu==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf
new file mode 100644
index 000000000000..568b8b43bc13
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf
@@ -0,0 +1 @@
+binutils-arm-linux-gnueabihf==2.31.1-16
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index e37e424ec46b..d333bba8033e 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -1,12 +1,23 @@
 arping==2.19-6
 bash-completion==1:2.8-6
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
 bridge-utils==1.6-2
+build-essential==12.6
 conntrack==1:1.4.5-2
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
+dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u1
 dmsetup==2:1.02.155-3
 ethtool==1:4.19-1
 frr==7.5.1-sonic-0
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gettext-base==0.19.8.1-9
 gnupg==2.2.12-1+deb10u1
 gnupg-l10n==2.2.12-1+deb10u1
@@ -21,28 +32,43 @@ grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
 ifupdown==0.8.35
 iptables==1.8.2-4
+libasan5==8.3.0-6
 libassuan0==2.5.2-1
+libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1+deb10u1
+libc-dev-bin==2.28-10
+libc6-dev==2.28-10
+libcc1-0==8.3.0-6
 libdevmapper1.02.1==2:1.02.155-3
 libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u4
 libfreetype6==2.9.1-3+deb10u2
 libfuse2==2.9.9-1+deb10u1
+libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libicu63==63.1-6+deb10u2
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
+libisl19==0.20-2
+libitm1==8.3.0-6
 libjson-c3==0.12.1+ds-2+deb10u1
 libjudydebian1==1.0.5-5
 libksba8==1.3.5-2
+liblsan0==8.3.0-6
+libmpc3==1.1.0-1
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
@@ -52,47 +78,69 @@ libpcap0.8==1.8.1-6
 libpcre2-16-0==10.32-5
 libpng16-16==1.6.36-6
 libpopt0==1.16-12
+libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
 libpython2-stdlib==2.7.16-1
 libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-dev==3.7.3-1
+libpython3.7-dev==3.7.3-2+deb10u3
 libqt5core5a==5.11.3+dfsg1-1+deb10u4
 libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsaivs==1.0.0
+libssl-dev==1.1.1d-0+deb10u8
+libstdc++-8-dev==8.3.0-6
 libteam-utils==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
+linux-libc-dev==4.19.232-1
 logrotate==3.14.0-4
+make==4.2.1-1.2
 ndisc6==1.0.4-1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
+patch==2.7.6-3+deb10u1
 pinentry-curses==1.1.0-2
 psmisc==23.2-1+deb10u1
 python==2.7.16-1
+python-dev==2.7.16-1
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
 python-ply==3.11-3
 python-scapy==2.4.0-2
 python-swsscommon==1.0.0
 python2==2.7.16-1
+python2-dev==2.7.16-1
 python2-minimal==2.7.16-1
 python2-yang==1.0.73
 python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
+python3-dev==3.7.3-1
 python3-yang==1.0.73
+python3.7-dev==3.7.3-2+deb10u3
 redis-server==5:6.0.6-1~bpo10+1
 sensible-utils==0.0.12
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
+swig==3.0.12-2
+swig3.0==3.0.12-2
 swss==1.0.0
 syncd-vs==1.0.0
 tcpdump==4.9.3-1~deb10u2
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 5fb3bd87db07..cb074bd82088 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.3-2
+libsaibcm==4.3.5.3-3
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 4b7b26e06c96..936aa0f96676 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,7 +2,6 @@ applibs==1.mlnx.4.5.1208
 applibs-dev==1.mlnx.4.5.1208
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2==1.mlnx.4.5.1208
 iproute2-dev==1.mlnx.4.5.1208
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
@@ -33,12 +32,14 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u2
 linux-libc-dev==4.19.232-1
-mft==4.18.1-16
+mft==4.18.0-106
 mlnx-sai==1.mlnx.SAIRel1.20.2.6
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.5.1208
 python-setuptools==40.8.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 1e12aa181f35..57831dbee6d4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -24,7 +24,7 @@ autopoint==0.19.8.1-9
 autotools-dev==20180224.1
 bash-completion==1:2.8-6
 bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u6
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u7
 binfmt-support==2.2.0-2
 binutils==2.31.1-16
 binutils-common==2.31.1-16
@@ -87,7 +87,7 @@ distro-info-data==0.41+deb10u4
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u6
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u7
 docker-ce==5:18.09.5~3-0~debian-buster
 docker-ce-cli==5:18.09.5~3-0~debian-buster
 docutils-common==0.14+dfsg-4
@@ -105,7 +105,7 @@ equivs==2.2.0
 exim4-base==4.92-8+deb10u6
 exim4-config==4.92-8+deb10u6
 exim4-daemon-light==4.92-8+deb10u6
-expat==2.2.6-2+deb10u3
+expat==2.2.6-2+deb10u4
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
 file==1:5.35-4+deb10u2
@@ -274,8 +274,8 @@ libbabeltrace-dev==1.5.6-2+deb10u1
 libbabeltrace1==1.5.6-2+deb10u1
 libbatik-java==1.10-2+deb10u1
 libbdplus0==0.1.2-3
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u6
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u6
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u7
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u7
 libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
@@ -429,8 +429,8 @@ libdist-checkconflicts-perl==0.11-1
 libdistro-info-perl==0.21
 libdjvulibre-text==3.5.27.1-10+deb10u1
 libdjvulibre21==3.5.27.1-10+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libdom4j-java==2.1.1-2
 libdouble-conversion1==3.1.0-3
 libdoxia-core-java==1.7-2
@@ -472,8 +472,8 @@ libevent-dev==2.1.8-stable-4
 libevent-extra-2.1-6==2.1.8-stable-4
 libevent-openssl-2.1-6==2.1.8-stable-4
 libevent-pthreads-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u3
-libexpat1-dev==2.2.6-2+deb10u3
+libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
 libexplain-dev==1.4.D001-8
 libexplain51==1.4.D001-8
 libexporter-tiny-perl==1.002001-1
@@ -641,14 +641,14 @@ libipc-system-simple-perl==1.25-4
 libipt2==2.0-2
 libiptc-dev==1.8.2-4
 libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u6
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u6
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u7
 libisl19==0.20-2
 libitext1-java==1.4-7
 libitm1==8.3.0-6
@@ -727,7 +727,7 @@ liblua5.1-0-dev==5.1.5-8.1+b2
 liblvm2cmd2.03==2.03.02-3
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u6
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u7
 liblzma-dev==5.2.4-1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
@@ -1498,6 +1498,7 @@ python-parse==1.6.6-0.1
 python-pathlib2==2.3.3-1
 python-pbr==4.2.0-5
 python-pil==5.4.1-2+deb10u3
+python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
 python-pluggy==0.8.0-1
@@ -1581,6 +1582,7 @@ python3-olefile==0.46-1
 python3-packaging==19.0-1
 python3-pbr==4.2.0-5
 python3-pil==5.4.1-2+deb10u3
+python3-pip==18.1-5
 python3-pkg-resources==40.8.0-1
 python3-pluggy==0.8.0-1
 python3-py==1.7.0-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index ae5c2eea3857..4520f4912b63 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,16 +1,13 @@
 binutils-aarch64-linux-gnu==2.31.1-16
 containerd.io==1.5.10-1
-expat==2.2.6-2+deb10u4
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
 libssl-dev==1.1.1d-0+deb10u8
 libssl1.1==1.1.1d-0+deb10u8
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
 linux-kbuild-4.19==4.19.232-1
 linux-libc-dev==4.19.232-1
-nodejs==14.19.0-deb-1nodesource1
+nodejs==14.19.1-deb-1nodesource1
 openssl==1.1.1d-0+deb10u8
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 56012d886f3c..b60b19e6864a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,6 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
 containerd.io==1.5.10-1
-expat==2.2.6-2+deb10u4
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
@@ -13,8 +12,6 @@ libdrm-omap1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
 libexception-class-perl==1.44-1
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
 libgles2-mesa-dev==18.3.6-2+deb10u1
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
@@ -111,7 +108,7 @@ linux-libc-dev==4.19.232-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.19.0-deb-1nodesource1
+nodejs==14.19.1-deb-1nodesource1
 openssl==1.1.1d-0+deb10u8
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index edcfb909672f..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==76979dae56c08d24b092347a1bdd2abe474555a3
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 072f8dde3890..66a7864dab7b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -22,7 +22,7 @@ autopoint==0.19.8.1-2+deb9u1
 autotools-dev==20161112.1
 bash-completion==1:2.1-4.3
 bc==1.06.95-9+b3
-bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u10
+bind9-host==1:9.10.3.dfsg.P4-12.3+deb9u12
 binfmt-support==2.1.6-2
 binutils==2.28-5
 bison==2:3.0.4.dfsg-1+b1
@@ -78,7 +78,7 @@ distro-info-data==0.36
 dkms==2.3-2
 dmeventd==2:1.02.137-2
 dmsetup==2:1.02.137-2
-dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u10
+dnsutils==1:9.10.3.dfsg.P4-12.3+deb9u12
 docbook-xml==4.5-8
 docbook-xsl==1.79.1+dfsg-2
 docker-ce==5:18.09.5~3-0~debian-stretch
@@ -227,8 +227,8 @@ libbabeltrace-ctf1==1.5.1-1
 libbabeltrace-dev==1.5.1-1
 libbabeltrace1==1.5.1-1
 libbatik-java==1.8-4+deb9u2
-libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u10
-libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u10
+libbind-export-dev==1:9.10.3.dfsg.P4-12.3+deb9u12
+libbind9-140==1:9.10.3.dfsg.P4-12.3+deb9u12
 libbison-dev==2:3.0.4.dfsg-1+b1
 libbit-vector-perl==7.4-1+b2
 libbluetooth3==5.43-2+deb9u5
@@ -405,8 +405,8 @@ libdigest-hmac-perl==1.03+dfsg-1
 libdistro-info-perl==0.14
 libdjvulibre-text==3.5.27.1-7+deb9u2
 libdjvulibre21==3.5.27.1-7+deb9u2
-libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u10
-libdns162==1:9.10.3.dfsg.P4-12.3+deb9u10
+libdns-export162==1:9.10.3.dfsg.P4-12.3+deb9u12
+libdns162==1:9.10.3.dfsg.P4-12.3+deb9u12
 libdom4j-java==1.6.1+dfsg.3-2+deb9u1
 libdouble-conversion1==2.0.1-4
 libdoxia-core-java==1.1.4-6
@@ -463,7 +463,7 @@ libfile-mimeinfo-perl==0.27-1
 libfile-stripnondeterminism-perl==0.034-1
 libfile-which-perl==1.21-1
 libfl-dev==2.6.1-1.3
-libflac8==1.3.2-2+deb9u1
+libflac8==1.3.2-2+deb9u2
 libfont-afm-perl==1.20-2
 libfontbox-java==1:1.8.12-1
 libfontconfig1==2.11.0-6.7+b1
@@ -573,13 +573,13 @@ libipc-run-perl==0.94-1+deb9u1
 libipc-system-simple-perl==1.25-3
 libiptc-dev==1.6.0+snapshot20161117-6
 libiptc0==1.6.0+snapshot20161117-6
-libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisc160==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u10
-libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u10
+libirs-export141==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisc-export160==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisc160==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisccc-export140==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisccc140==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisccfg-export140==1:9.10.3.dfsg.P4-12.3+deb9u12
+libisccfg140==1:9.10.3.dfsg.P4-12.3+deb9u12
 libisl15==0.18-1
 libisorelax-java==20041111-9
 libitext1-java==1.4-6
@@ -651,7 +651,7 @@ liblvm2app2.2==2.02.168-2
 liblvm2cmd2.02==2.02.168-2
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.06-2
-liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u10
+liblwres141==1:9.10.3.dfsg.P4-12.3+deb9u12
 liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
@@ -925,9 +925,9 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
-libssl-dev==1.1.0l-1~deb9u4
-libssl1.0.2==1.0.2u-1~deb9u6
-libssl1.1==1.1.0l-1~deb9u4
+libssl-dev==1.1.0l-1~deb9u5
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u5
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libstrictures-perl==2.000003-1
@@ -984,7 +984,7 @@ libusb-1.0-0==2:1.0.21-1
 libusb-1.0-0-dev==2:1.0.21-1
 libusb-1.0-doc==2:1.0.21-1
 libusb-dev==2:0.1.12-30
-libusbredirparser1==0.7.1-1
+libusbredirparser1==0.7.1-1+deb9u1
 libutempter0==1.1.6-3
 libuv1==1.34.2-1~bpo9+1
 libvariable-magic-perl==0.61-1
@@ -1180,7 +1180,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u4
+openssl==1.1.0l-1~deb9u5
 packagekit==1.1.5-2+deb9u2
 packagekit-tools==1.1.5-2+deb9u2
 patch==2.7.5-1+deb9u2
@@ -1288,6 +1288,7 @@ python-openssl==16.2.0-1
 python-pam==0.4.2-13.2
 python-parse==1.6.6-0.1
 python-pil==4.0.0-4+deb9u4
+python-pip==9.0.1-2+deb9u2
 python-pip-whl==9.0.1-2+deb9u2
 python-pkg-resources==33.1.1-1
 python-py==1.4.32-3
@@ -1346,6 +1347,7 @@ python3-magic==1:5.30-1+deb9u3
 python3-markupsafe==0.23-3
 python3-minimal==3.5.3-1
 python3-pil==4.0.0-4+deb9u4
+python3-pip==9.0.1-2+deb9u2
 python3-pkg-resources==33.1.1-1
 python3-pyasn1==0.1.9-2
 python3-pycurl==7.43.0-2
@@ -1448,9 +1450,9 @@ ucf==3.0036
 unattended-upgrades==0.93.1+nmu1
 unzip==6.0-21+deb9u2
 velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u4
-vim-common==2:8.0.0197-4+deb9u4
-vim-runtime==2:8.0.0197-4+deb9u4
+vim==2:8.0.0197-4+deb9u5
+vim-common==2:8.0.0197-4+deb9u5
+vim-runtime==2:8.0.0197-4+deb9u5
 wdiff==1.2.2-2
 wget==1.18-5+deb9u3
 x11-common==1:7.7+19
@@ -1478,7 +1480,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
 xterm==327-2+deb9u3
 xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u4
+xxd==2:8.0.0197-4+deb9u5
 xz-utils==5.2.2-1.2+b1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 0c1250201072..00f894c2df08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,17 +1,8 @@
 docker-ce==18.06.3~ce~3-0~debian
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
-libflac8==1.3.2-2+deb9u2
-libssl-dev==1.1.0l-1~deb9u5
-libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u5
 libtext-charwidth-perl==0.04-7+b3
 libtext-iconv-perl==1.7-5+b3
 libunicode-utf8-perl==0.60-1+b2
 libxslt1-dev==1.1.29-2.1+deb9u2
-nodejs==10.24.1-1nodesource1
-openssl==1.1.0l-1~deb9u5
-vim==2:8.0.0197-4+deb9u5
-vim-common==2:8.0.0197-4+deb9u5
-vim-runtime==2:8.0.0197-4+deb9u5
-xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index 2efb0e25c59f..fb64a5239dd9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -4,20 +4,11 @@ libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libegl1-mesa-dev==13.0.6-1+b2
-libflac8==1.3.2-2+deb9u2
 libgles2-mesa==13.0.6-1+b2
 libgles2-mesa-dev==13.0.6-1+b2
-libssl-dev==1.1.0l-1~deb9u5
-libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u5
 libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
 linux-compiler-gcc-6-arm==4.9.303-1
-nodejs==10.24.1-1nodesource1
-openssl==1.1.0l-1~deb9u5
-vim==2:8.0.0197-4+deb9u5
-vim-common==2:8.0.0197-4+deb9u5
-vim-runtime==2:8.0.0197-4+deb9u5
-xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
+nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..59a79a9d2703
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d8464b85288e18674dc58896b6548fd24b220890
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 138e139f69a9..a4bf7e24a7f1 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -3,19 +3,28 @@ apparmor==2.13.2-10
 apt-transport-https==1.8.2.3
 bash-completion==1:2.8-6
 bfn-modules==1.0
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
 bridge-utils==1.6-2
 bsdmainutils==11.1.2+b1
+build-essential==12.6
 busybox==1:1.30.1-4
+bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
 containerd.io==1.5.10-1
 cpio==2.12+dfsg-9
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 device-tree-compiler==1.4.7-4
+dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u1
+distro-info-data==0.41+deb10u4
 dmidecode==3.2-1
 dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
@@ -29,8 +38,14 @@ firmware-linux-nonfree==20190114-2
 firmware-misc-nonfree==20190114-2
 flashrom==1.0-1
 freeipmi-common==1.6.3-1.1
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
 gdisk==1.0.3-1.1
 gettext-base==0.19.8.1-9
+gir1.2-glib-2.0==1.58.3-2
+gir1.2-packagekitglib-1.0==1.1.12-5
 gnupg==2.2.12-1+deb10u1
 gnupg-l10n==2.2.12-1+deb10u1
 gnupg-utils==2.2.12-1+deb10u1
@@ -58,9 +73,10 @@ iptables==1.8.2-4
 iptables-persistent==1.0.11+deb10u1
 iputils-ping==3:20180629-2+deb10u2
 isc-dhcp-client==4.4.1-2+deb10u1
+iso-codes==4.2-1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.1
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.0
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
@@ -68,19 +84,27 @@ less==487-0.1+b1
 libapparmor1==2.13.2-10
 libapt-inst2.0==1.8.2.3
 libargon2-1==0~20171227-0.2
+libasan5==8.3.0-6
 libassuan0==2.5.2-1
+libatomic1==8.3.0-6
+libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libc-dev-bin==2.28-10
 libc-l10n==2.28-10
+libc6-dev==2.28-10
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
+libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
+libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u6
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
+libdpkg-perl==1.19.7
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
@@ -88,24 +112,31 @@ libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
 libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
+libgcc-8-dev==8.3.0-6
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
+libgirepository-1.0-1==1.58.3-2
 libglib2.0-0==2.58.3-2+deb10u3
+libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u3
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
 libi2c0==4.1-1
+libidn11==1.33-2.2
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u6
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisl19==0.20-2
+libitm1==8.3.0-6
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
 libk5crypto3==1.17-3+deb10u3
@@ -118,11 +149,15 @@ libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
+liblsan0==8.3.0-6
 liblzo2-2==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
 libmnl0==1.0.4-2
+libmpc3==1.1.0-1
 libmpdec2==2.4.2-2
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libncurses6==6.1+20181013-2+deb10u2
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
@@ -138,6 +173,7 @@ libnpth0==1.6-1
 libnss-tacplus==1.0.4-1
 libonig5==6.9.1-1
 libopts25==1:5.18.12-4
+libpackagekit-glib2-18==1.1.12-5
 libpam-tacplus==1.4.1-1
 libpcap0.8==1.8.1-6
 libpci3==1:3.5.2-1
@@ -146,27 +182,37 @@ libpng16-16==1.6.36-6
 libpopt0==1.16-12
 libprocps7==2:3.3.15-2
 libpsl5==0.20.2-2
+libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
 libpython2-stdlib==2.7.16-1
 libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
+libpython3-dev==3.7.3-1
 libpython3-stdlib==3.7.3-1
 libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
 libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
+libquadmath0==8.3.0-6
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u8
 libssl1.1==1.1.1d-0+deb10u8
+libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libsystemd0==247.3-6~bpo10+1
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libudev1==247.3-6~bpo10+1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
@@ -178,14 +224,16 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
+linux-libc-dev==4.19.232-1
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
 lsb-release==10.2019051400
+make==4.2.1-1.2
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.18.1-16
-mft-oem==4.18.1-16
+mft==4.18.0-106
+mft-oem==4.18.0-106
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
@@ -202,6 +250,7 @@ openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u8
+patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
@@ -213,21 +262,34 @@ python==2.7.16-1
 python-apt==1.8.4.3
 python-apt-common==1.8.4.3
 python-argcomplete==1.8.1-1
+python-dev==2.7.16-1
 python-ipaddr==2.2.0-2
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
 python-swsscommon==1.0.0
 python2==2.7.16-1
+python2-dev==2.7.16-1
 python2-minimal==2.7.16-1
 python2-yang==1.0.73
 python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3==3.7.3-1
+python3-apt==1.8.4.3
+python3-dbus==1.2.8-3
+python3-dev==3.7.3-1
 python3-distutils==3.7.3-1
+python3-gi==3.30.4-1
 python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
+python3-pip==18.1-5
+python3-pycurl==7.43.0.2-0.1
+python3-software-properties==0.96.20.2-2
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
 python3.7==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 rasdaemon==0.6.0-1.2
 readline-common==7.0-5
@@ -241,6 +303,8 @@ sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
+swig==3.0.12-2
+swig3.0==3.0.12-2
 sx-kernel==1.mlnx.4.5.1208
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
@@ -259,4 +323,5 @@ usbutils==1:010-3
 vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
 vim-runtime==2:8.1.0875-5
-xxd==2:8.1.0875-5
\ No newline at end of file
+xxd==2:8.1.0875-5
+xz-utils==5.2.4-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index a8b70a165dec..2d1f824bf970 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,19 +1,23 @@
-icu-devtools==63.1-6+deb10u2
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+binutils-aarch64-linux-gnu==2.31.1-16
+icu-devtools==63.1-6+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libicu-dev==63.1-6+deb10u2
-libicu63==63.1-6+deb10u2
+libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libssl-dev==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u7
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.208-1
+openssl==1.1.1d-0+deb10u7
 squashfs-tools==1:4.3-12+deb10u1
 tsingma-bsp==1.0
 tzdata==2021a-0+deb10u3
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 9818aed5adf8..453e816aea35 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,20 +1,24 @@
-icu-devtools==63.1-6+deb10u2
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+binutils-arm-linux-gnueabihf==2.31.1-16
+icu-devtools==63.1-6+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libicu-dev==63.1-6+deb10u2
-libicu63==63.1-6+deb10u2
+libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
+libicu-dev==63.1-6+deb10u1
+libicu63==63.1-6+deb10u1
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
+libssl-dev==1.1.1d-0+deb10u7
+libssl1.1==1.1.1d-0+deb10u7
 libxml2==2.9.4+dfsg1-7+deb10u2
 libxml2-dev==2.9.4+dfsg1-7+deb10u2
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.208-1
 mrvlprestera==1.0
+openssl==1.1.1d-0+deb10u7
 squashfs-tools==1:4.3-12+deb10u1
 tzdata==2021a-0+deb10u3
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file

From 527232122ed2bc8118408becec70cac5102118cf Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Fri, 25 Mar 2022 09:25:18 -0700
Subject: [PATCH 1097/1674] [202012][sonic-sairedis] Update submodule (#10347)

---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index c45dc526ed11..d4816015254b 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit c45dc526ed118c5a00086f7ab432c184fc9e4ed7
+Subproject commit d4816015254ba51e4cdc36b396d0e517f9d84855

From 8a246b88b1d919bdfe2903bbdf66a6727a89ca8d Mon Sep 17 00:00:00 2001
From: Eric Zhu <79439153+cel-eric@users.noreply.github.com>
Date: Tue, 22 Mar 2022 00:25:36 +0800
Subject: [PATCH 1098/1674] Fix issue of partially parsing syseeprom value
 (#10020) (#10276)

Why I did it
The current code assumes that the value part does not have whitespace. So everything after the whitespace will be ignored. The syseeprom values returned from platform API do not match the output of "show platform syseeprom" on dx010 and e1031 device.

How I did it
This change improved the regular expression for parsing syseeprom values to accommodate whitespaces in the value.
PR 10021 provides the solution, but committed to the wrong place for dx010 and e1031.

How to verify it
Compile the sonic_platform wheel for dx010, then upload to device and install the wheel, verify the platform eeprom API.

Signed-off-by: Eric Zhu <erzhu@celestica.com>
---
 device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py   | 2 +-
 .../celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
index dc43a4d7ddda..48643b403071 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/eeprom.py
@@ -45,7 +45,7 @@ def __parse_output(self, decode_output):
         for line in lines:
             try:
                 match = re.search(
-                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)(.*$)', line)
                 if match is not None:
                     idx = match.group(1)
                     value = match.group(3).rstrip('\0')
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
index b0d37d57beac..bfde69c8d296 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
@@ -44,7 +44,7 @@ def __parse_output(self, decode_output):
         for line in lines:
             try:
                 match = re.search(
-                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)([\S]+)', line)
+                    '(0x[0-9a-fA-F]{2})([\s]+[\S]+[\s]+)(.*$)', line)
                 if match is not None:
                     idx = match.group(1)
                     value = match.group(3).rstrip('\0')

From 1277c7ed3b5537b7441387c1dc9be894e3ce9737 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 22 Mar 2022 21:57:15 -0700
Subject: [PATCH 1099/1674] Check to see that the py2 and py3 version files
 exist before trying to sort them (#10325)

For Bullseye, Python 2 isn't present at all. This means that in certain
build cases (such as building something only for Bullseye), the version
file may not exist, and so the sort command would fail.

For most normal build commands, this probably won't be an issue, because
the SONiC build will start with Buster (which has both Python 2 and
Python 3 wheels built), and so the py2 and py3 files will be present
even during the Bullseye builds.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 src/sonic-build-hooks/scripts/collect_version_files | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sonic-build-hooks/scripts/collect_version_files b/src/sonic-build-hooks/scripts/collect_version_files
index 570883701e98..a4b33eeaa897 100755
--- a/src/sonic-build-hooks/scripts/collect_version_files
+++ b/src/sonic-build-hooks/scripts/collect_version_files
@@ -20,7 +20,11 @@ dpkg-query -W -f '${Package}==${Version}\n' >> "${TARGET_PATH}/versions-deb-${DI
 
 ## Print the unique and sorted result
 sort -u "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
-sort -u "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}"
-sort -u "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
+if [ -e "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}" ]; then
+    sort -u "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}"
+fi
+if [ -e "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" ]; then
+    sort -u "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
+fi
 
 exit 0

From f93266293f8ecc5deaa77ce4479983bd0a78fbc7 Mon Sep 17 00:00:00 2001
From: pavannaregundi <92989231+pavannaregundi@users.noreply.github.com>
Date: Thu, 24 Mar 2022 19:54:13 +0530
Subject: [PATCH 1100/1674] [Marvell-armhf] Fixing issues related to partition
 label (#10203)

Why I did it
Removing incorrect check in plt setup for fw_env config: This check was added before to compare 2 different types of disk. Now the check is redundant and check is not required as transition is complete.
2)Removing legacy_volume_label in create_partition: legacy_volume_label is not used in armhf install files. With legacy_volume_label initialized to NULL, current code will always return true for check, if demo_part exits.

How I did it
Change is about removing the redundant/incorrect code explained above.

How to verify it
uboot fw_printenv and fw_setenv is tested
onie-nos-install has be verified.

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
---
 platform/marvell-armhf/platform.conf                        | 2 +-
 .../sonic-platform-nokia/nokia-7215_plt_setup.sh            | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index b0be99a8e69e..940184febb0d 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -196,7 +196,7 @@ create_ubi_partition() {
 
 create_gpt_partition() {
     blk_dev="/dev/sda"
-    demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" -e "$legacy_volume_label" | awk '{print $1}')
+    demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" | awk '{print $1}')
     # ONIE partition size 168MB
     onie_part_size=168
 
diff --git a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
index 8301999d0d0a..0af85d730615 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
+++ b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
@@ -10,12 +10,6 @@ fw_uboot_env_cfg()
     if [ "$PLATFORM" = "armhf-nokia_ixs7215_52x-r0" ]; then
 	# Ixs7215 / IPD6448M board Uboot ENV offset
         FW_ENV_DEFAULT='/dev/mtd0 0x00100000 0x10000 0x10000'
-
-        demo_part=$(sgdisk -p /dev/sda | grep -e "SONiC-OS")
-        if [ -z "$demo_part" ]; then
-            # ET6448M Board - For Backward compatibility
-            FW_ENV_DEFAULT='/dev/mtd0 0x00500000 0x80000 0x100000 8'
-        fi
     else
         FW_ENV_DEFAULT='/dev/mtd0 0x00500000 0x80000 0x100000 8'
     fi

From 9184f975a214770fadffc0f7efddc379ca83ced0 Mon Sep 17 00:00:00 2001
From: pavannaregundi <92989231+pavannaregundi@users.noreply.github.com>
Date: Thu, 24 Mar 2022 19:54:49 +0530
Subject: [PATCH 1101/1674] [Marvell-armhf] Setting u-boot ftd_high to resolve
 kernel hung (#10204)

Why I did it
Kernel hang in during early boot is caused due overwriting of device tree with uncompressing kernel. Added the fdt_high which gives a safe offset from kernel location.

How I did it
Setting uboot environment variable fdt_high.

How to verify it
Successful boot of bullseye kernel on Marvell Armada 380/385.

Change-Id: I3e2521780f5ecdb3bdf6cbb6542250814ca11959
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
---
 platform/marvell-armhf/platform.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 940184febb0d..9f237eda7f88 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -7,6 +7,7 @@ echo "Preparing for installation ... "
 # global defines
 kernel_addr=0x1100000
 fdt_addr=0x1000000
+fdt_high=0x10fffff
 initrd_addr=0x2000000
 VAR_LOG=512
 
@@ -152,6 +153,7 @@ prepare_boot_menu() {
     # Set boot configs
     fw_setenv ${FW_ARG} kernel_addr $kernel_addr > /dev/null
     fw_setenv ${FW_ARG} fdt_addr $fdt_addr > /dev/null
+    fw_setenv ${FW_ARG} fdt_high $fdt_high > /dev/null
     fw_setenv ${FW_ARG} initrd_addr $initrd_addr > /dev/null
     fw_setenv ${FW_ARG} mtdids 'nand0=armada-nand' > /dev/null
     if [ $UBOOT_FW_DEFAULT -eq 1 ]

From 873689ef6e955ebf278a6e4448d86bed632850f0 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 29 Mar 2022 07:08:38 +0800
Subject: [PATCH 1102/1674] [ci/build]: Upgrade SONiC package versions (#10373)

---
 files/build/versions/default/versions-git     |  2 +-
 .../docker-base-buster/versions-deb-buster    | 12 ++---
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../versions-deb-buster                       |  7 +--
 .../versions-deb-buster-arm64                 | 12 +++--
 .../versions-deb-buster-armhf                 | 12 +++--
 .../docker-database/versions-deb-buster       |  4 +-
 .../docker-dhcp-relay/versions-deb-buster     |  4 +-
 .../docker-fpm-frr/versions-deb-buster        |  8 ++--
 .../docker-gbsyncd-vs/versions-deb-buster     |  4 +-
 .../dockers/docker-lldp/versions-deb-buster   | 12 ++---
 .../dockers/docker-mux/versions-deb-buster    |  6 +--
 .../dockers/docker-nat/versions-deb-buster    |  4 +-
 .../docker-orchagent/versions-deb-buster      | 12 ++---
 .../versions-deb-buster                       | 14 +++---
 .../versions-deb-buster                       |  4 +-
 .../dockers/docker-sflow/versions-deb-buster  |  4 +-
 .../dockers/docker-snmp/versions-deb-buster   | 18 ++++----
 .../versions-deb-buster                       | 14 +++---
 .../docker-sonic-mgmt-framework/versions-py3  |  4 +-
 .../versions-deb-buster                       |  4 +-
 .../docker-sonic-vs/versions-deb-buster       | 13 +++---
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      | 16 +++----
 .../docker-syncd-brcm-rpc/versions-deb-buster |  6 +--
 .../docker-syncd-brcm/versions-deb-buster     | 10 ++--
 .../versions-deb-buster                       | 12 ++---
 .../docker-syncd-centec/versions-deb-buster   |  4 +-
 .../versions-deb-buster-arm64                 |  6 +--
 .../docker-syncd-invm/versions-deb-buster     |  4 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 14 +++---
 .../versions-deb-buster-armhf                 |  6 +--
 .../docker-syncd-vs/versions-deb-buster       |  4 +-
 .../dockers/docker-teamd/versions-deb-buster  |  4 +-
 .../sonic-slave-buster/versions-deb-buster    |  2 +-
 .../versions-deb-buster-arm64                 | 44 +++++++++++++++---
 .../versions-deb-buster-armhf                 | 46 ++++++++++++++++---
 .../dockers/sonic-slave-stretch/versions-git  |  2 -
 .../host-base-image/versions-deb-buster       | 10 ++--
 .../versions/host-image/versions-deb-buster   | 30 ++++++------
 .../host-image/versions-deb-buster-arm64      | 24 +++-------
 .../host-image/versions-deb-buster-armhf      | 24 +++-------
 files/build/versions/host-image/versions-py3  |  2 +-
 44 files changed, 249 insertions(+), 201 deletions(-)
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index ba5c88568921..b5cd63544ad8 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d8464b85288e18674dc58896b6548fd24b220890
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==01a4536ff80f24ef7cfc5b7f9f67938b1e8fc2bd
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 65d809288ffc..4e498e6f8b6d 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1d-0+deb10u8
+libssl1.1==1.1.1n-0+deb10u1
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1d-0+deb10u8
+openssl==1.1.1n-0+deb10u1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
@@ -64,8 +64,8 @@ python3.7==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
-rsyslog==8.1901.0-1
+rsyslog==8.1901.0-1+deb10u1
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.1.0875-5
-vim-tiny==2:8.1.0875-5
-xxd==2:8.1.0875-5
\ No newline at end of file
+vim-common==2:8.1.0875-5+deb10u2
+vim-tiny==2:8.1.0875-5+deb10u2
+xxd==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index e5755d982b51..93d0ee4a4b58 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,5 +1,5 @@
 j2cli==0.3.10
-jinja2==3.0.3
+jinja2==3.1.1
 markupsafe==2.1.1
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 7f895537c2c5..94b5fbe2df9f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -15,8 +15,9 @@ gcc-8==8.3.0-6
 libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.7
 libexpat1-dev==2.2.6-2+deb10u4
@@ -42,7 +43,7 @@ libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 1aaf51298b09..de9abb8d5a9c 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,9 +1,11 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-icu-devtools==63.1-6+deb10u2
-libicu-dev==63.1-6+deb10u2
-libicu63==63.1-6+deb10u2
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
+icu-devtools==63.1-6+deb10u3
+libglib2.0-0==2.58.3-2+deb10u3
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
+pkg-config==0.29-6
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 4d4aa90fb33b..efcbc0790509 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,9 +1,11 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-icu-devtools==63.1-6+deb10u2
-libicu-dev==63.1-6+deb10u2
-libicu63==63.1-6+deb10u2
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
+icu-devtools==63.1-6+deb10u3
+libglib2.0-0==2.58.3-2+deb10u3
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
+pkg-config==0.29-6
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
index 7c9e8bec42ea..1979ecc0b69f 100644
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 redis-server==5:6.0.6-1~bpo10+1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index 5fb7147f4704..ae6ede20c056 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -28,5 +28,5 @@ sonic-dhcpmon==1.0.0-0
 sonic-dhcpmon-dbgsym==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index a59df2b22643..25282ee1643b 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -14,7 +14,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libjson-c3==0.12.1+ds-2+deb10u1
-libmariadb3==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -26,12 +26,12 @@ libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 logrotate==3.14.0-4
-mariadb-common==1:10.3.31-0+deb10u1
+mariadb-common==1:10.3.34-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 04d9d17057db..9b8877c2e9c1 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 8499cce24acc..355ee8064734 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -7,9 +7,9 @@ libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libipt2==2.0-2
-libmariadb3==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -18,13 +18,13 @@ libsnmp-base==5.7.3+dfsg-5
 libsnmp30==5.7.3+dfsg-5
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2==2.9.4+dfsg1-7+deb10u3
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
-mariadb-common==1:10.3.31-0+deb10u1
+mariadb-common==1:10.3.34-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
index 802c17530c9d..1e89df10454d 100644
--- a/files/build/versions/dockers/docker-mux/versions-deb-buster
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -15,7 +15,7 @@ libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
 libhiredis0.14-dbgsym==0.14.0-3~bpo9+1
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libipt2==2.0-2
 libpopt0==1.16-12
 libswsscommon-dbg==1.0.0
@@ -25,5 +25,5 @@ sonic-linkmgrd==1.0.0-1
 sonic-linkmgrd-dbgsym==1.0.0-1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
index d71872d1387b..9d09f1f1044d 100644
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -23,5 +23,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 142d2fc6c1b4..8452509606de 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -19,8 +19,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.7
 libdw1==0.176-1.1
@@ -40,7 +40,7 @@ libmpx2==8.3.0-6
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
-libpcap0.8==1.8.1-6
+libpcap0.8==1.8.1-6+deb10u1
 libpopt0==1.16-12
 libpython3-dev==3.7.3-1
 libpython3.7-dev==3.7.3-2+deb10u3
@@ -51,7 +51,7 @@ libswsscommon-dbg==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
@@ -63,5 +63,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
 tcpdump==4.9.3-1~deb10u2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 17b38a1356a4..de68987d0f44 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -26,8 +26,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcairo2==1.16.0-4+deb10u1
 libcc1-0==8.3.0-6
 libdatrie1==0.2.12-2
@@ -47,7 +47,7 @@ libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libharfbuzz0b==2.3.1-1
 libi2c0==4.1-1
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
@@ -94,9 +94,9 @@ libxcb-shm0==1.13.1-2
 libxcb1==1.13.1-2
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2==2.9.4+dfsg1-7+deb10u3
 libxrender1==1:0.9.10-1
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
@@ -137,5 +137,5 @@ sxd-libs==1.mlnx.4.5.1208
 sxd-libs-dev==1.mlnx.4.5.1208
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
index d506a2a4d102..919f91188e80 100644
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 radvd==1:2.17-2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
index a047d5de0954..c1675ee9e1a0 100644
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -16,5 +16,5 @@ psample==1.1-1
 sflowtool==5.04
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index bd0c0ac725b3..90ebc3395250 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -14,9 +14,9 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc-l10n==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc-l10n==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
@@ -30,7 +30,7 @@ libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
 liblsan0==8.3.0-6
-libmariadb3==1:10.3.31-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
@@ -47,10 +47,10 @@ libsnmp30-dbg==5.7.3+dfsg-5
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.232-1
-locales==2.28-10
+linux-libc-dev==4.19.235-1
+locales==2.28-10+deb10u1
 make==4.2.1-1.2
-mariadb-common==1:10.3.31-0+deb10u1
+mariadb-common==1:10.3.34-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 python3-dev==3.7.3-1
@@ -61,5 +61,5 @@ snmpd==5.7.3+dfsg-5
 snmpd-dbgsym==5.7.3+dfsg-5
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 7593308a5f00..1c564e793bf6 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -14,8 +14,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
@@ -24,7 +24,7 @@ libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
@@ -48,9 +48,9 @@ libstdc++-8-dev==8.3.0-6
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2==2.9.4+dfsg1-7+deb10u3
 libyang==1.0.73
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
@@ -70,5 +70,5 @@ sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index c3716311d242..ea1f92f36afe 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -9,9 +9,9 @@ grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.11.3
-importlib-resources==5.4.0
+importlib-resources==5.6.0
 inflection==0.5.1
-itsdangerous==2.1.1
+itsdangerous==2.1.2
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
index 49315e4057ce..6fe8ddb0de94 100644
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -15,5 +15,5 @@ sonic-mgmt-common==1.0.0
 sonic-telemetry==0.1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index d333bba8033e..990d3dd84938 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -41,8 +41,8 @@ libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdevmapper1.02.1==2:1.02.155-3
 libdouble-conversion1==3.1.0-3
@@ -55,8 +55,9 @@ libfreetype6==2.9.1-3+deb10u2
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
+libgmp10==2:6.1.2+dfsg-4+deb10u1
 libgomp1==8.3.0-6
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
@@ -74,7 +75,7 @@ libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
 libnftnl11==1.1.2-2
 libnpth0==1.6-1
-libpcap0.8==1.8.1-6
+libpcap0.8==1.8.1-6+deb10u1
 libpcre2-16-0==10.32-5
 libpng16-16==1.6.36-6
 libpopt0==1.16-12
@@ -95,7 +96,7 @@ libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsaivs==1.0.0
-libssl-dev==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libteam-utils==1.30-1
 libteam5==1.30-1
@@ -106,7 +107,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 logrotate==3.14.0-4
 make==4.2.1-1.2
 ndisc6==1.0.4-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index be8d32b2603e..2bbe113f9712 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 8ea45c882291..f2ccfbab1a1a 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,16 +1,16 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libtcmalloc-minimal4==2.7-1
@@ -18,6 +18,6 @@ libunwind-dev==1.2.1-10~deb10u1
 libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
-libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.232-1
+libxml2==2.9.4+dfsg1-7+deb10u3
+linux-libc-dev==4.19.235-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 3d215665bc21..cac4c1e279c0 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -22,7 +22,7 @@ libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjsoncpp1==1.7.4-3
@@ -45,13 +45,13 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u2
+libxml2==2.9.4+dfsg1-7+deb10u3
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index cb074bd82088..8f5351ac5535 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -4,8 +4,8 @@ gdbserver==8.2.1-2+b3
 kmod==26-1
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u3
@@ -25,12 +25,12 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.232-1
+linux-libc-dev==4.19.235-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 4f186f6d3bca..ededb93b8296 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -14,8 +14,8 @@ libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.7
@@ -24,7 +24,7 @@ libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjsoncpp1==1.7.4-3
@@ -47,14 +47,14 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.232-1
+libxml2==2.9.4+dfsg1-7+deb10u3
+linux-libc-dev==4.19.235-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 0d9260683b3a..898e95442221 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -18,5 +18,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index 9ccdbee2db43..e13071edf35e 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -4,9 +4,9 @@ libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
 libexpat1-dev==2.2.6-2+deb10u4
 libnfsidmap2==0.25-5.1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 2b531b3a2e3e..3c52963581c7 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -23,5 +23,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 5cd2cc7617f8..a420ca6799a7 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 936aa0f96676..cc3fb52487ba 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -5,15 +5,15 @@ gdbserver==8.2.1-2+b3
 iproute2-dev==1.mlnx.4.5.1208
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libgpm2==1.20.7-5
-libicu63==63.1-6+deb10u2
+libicu63==63.1-6+deb10u3
 libipt2==2.0-2
 libpopt0==1.16-12
 libpython-dev==2.7.16-1
@@ -30,8 +30,8 @@ libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u2
-linux-libc-dev==4.19.232-1
+libxml2==2.9.4+dfsg1-7+deb10u3
+linux-libc-dev==4.19.235-1
 mft==4.18.0-106
 mlnx-sai==1.mlnx.SAIRel1.20.2.6
 openssh-client==1:7.9p1-10+deb10u2
@@ -65,7 +65,7 @@ sxd-libs==1.mlnx.4.5.1208
 sxd-libs-dev==1.mlnx.4.5.1208
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
 wjh-libs==1.mlnx.4.5.1208
 wjh-libs-dev==1.mlnx.4.5.1208
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 0b4ce26e36d9..50f6b3434530 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -4,9 +4,9 @@ libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
 libexpat1-dev==2.2.6-2+deb10u4
 libnfsidmap2==0.25-5.1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 04d9d17057db..9b8877c2e9c1 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
index 919b3bcd22b7..992786e8eb13 100644
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -17,5 +17,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 57831dbee6d4..e7dc040419c1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1104,7 +1104,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u3
+libtiff5==4.1.0+git191117-2~deb10u4
 libtimedate-perl==2.3000-2+deb10u1
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 4520f4912b63..453755c65c89 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,13 +1,45 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-containerd.io==1.5.10-1
+containerd.io==1.5.11-1
+icu-devtools==63.1-6+deb10u3
+libc-dev-bin==2.28-10+deb10u1
+libc6==2.28-10+deb10u1
+libc6-dbg==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
+libcups2==2.2.10-6+deb10u5
+libcupsimage2==2.2.10-6+deb10u5
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libssl-dev==1.1.1d-0+deb10u8
-libssl1.1==1.1.1d-0+deb10u8
+libgmp-dev==2:6.1.2+dfsg-4+deb10u1
+libgmp10==2:6.1.2+dfsg-4+deb10u1
+libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
+libjbig2dec0==0.16-1+deb10u1
+liblog4j1.2-java==1.2.17-8+deb10u2
+libmariadb-dev==1:10.3.34-0+deb10u1
+libmariadb-dev-compat==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libtext-iconv-perl==1.7-5+b6
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2-utils==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
-linux-kbuild-4.19==4.19.232-1
-linux-libc-dev==4.19.232-1
+libzzip-0-13==0.13.62-3.2+deb10u1
+linux-kbuild-4.19==4.19.235-1
+linux-libc-dev==4.19.235-1
+mariadb-common==1:10.3.34-0+deb10u1
 nodejs==14.19.1-deb-1nodesource1
-openssl==1.1.1d-0+deb10u8
\ No newline at end of file
+openssl==1.1.1n-0+deb10u1
+publicsuffix==20211109.1735-0+deb10u1
+rsyslog==8.1901.0-1+deb10u1
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
+xterm==344-1+deb10u2
+xxd==2:8.1.0875-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index b60b19e6864a..461c2e233481 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,10 +1,17 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-containerd.io==1.5.10-1
+containerd.io==1.5.11-1
+icu-devtools==63.1-6+deb10u3
+libc-dev-bin==2.28-10+deb10u1
+libc6==2.28-10+deb10u1
+libc6-dbg==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
 libclang-dev==1:7.0-47
 libclass-data-inheritable-perl==0.08-3
+libcups2==2.2.10-6+deb10u5
+libcupsimage2==2.2.10-6+deb10u5
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
@@ -13,14 +20,27 @@ libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
 libexception-class-perl==1.44-1
 libgles2-mesa-dev==18.3.6-2+deb10u1
+libgmp-dev==2:6.1.2+dfsg-4+deb10u1
+libgmp10==2:6.1.2+dfsg-4+deb10u1
+libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
+libjbig2dec0==0.16-1+deb10u1
 liblog-dispatch-perl==2.68-1
 liblog-log4perl-perl==1.49-1
+liblog4j1.2-java==1.2.17-8+deb10u2
+libmariadb-dev==1:10.3.34-0+deb10u1
+libmariadb-dev-compat==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
 libmime-charset-perl==1.012.2-1
 libmime-lite-perl==3.030-2
 libmime-types-perl==2.17-1
 libparams-validationcompiler-perl==0.30-1
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
 librust-aho-corasick-dev==0.6.9-1
 librust-ansi-term-dev==0.11.0-1
 librust-atty-dev==0.2.11-1
@@ -96,23 +116,35 @@ librust-wincolor-dev==1.0.0-1
 libsass1==3.5.5-4
 libsombok3==2.4.0-2
 libspecio-perl==0.43-1
-libssl-dev==1.1.1d-0+deb10u8
-libssl1.1==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2-utils==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.232-1
-linux-kbuild-4.19==4.19.232-1
-linux-libc-dev==4.19.232-1
+libzzip-0-13==0.13.62-3.2+deb10u1
+linux-compiler-gcc-8-arm==4.19.235-1
+linux-kbuild-4.19==4.19.235-1
+linux-libc-dev==4.19.235-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
+mariadb-common==1:10.3.34-0+deb10u1
 nodejs==14.19.1-deb-1nodesource1
-openssl==1.1.1d-0+deb10u8
+openssl==1.1.1n-0+deb10u1
 ps2eps==1.68+binaryfree-2
+publicsuffix==20211109.1735-0+deb10u1
 rdfind==1.4.1-1
+rsyslog==8.1901.0-1+deb10u1
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
 texlive-font-utils==2018.20190227-2
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
+xterm==344-1+deb10u2
+xxd==2:8.1.0875-5+deb10u2
 yui-compressor==2.4.8-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 59a79a9d2703..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d8464b85288e18674dc58896b6548fd24b220890
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
index aa81034c0356..d95e8a34c208 100644
--- a/files/build/versions/host-base-image/versions-deb-buster
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -1,6 +1,6 @@
 adduser==3.118
 apt==1.8.2.3
-base-files==10.3+deb10u11
+base-files==10.3+deb10u12
 base-passwd==3.5.46
 bash==5.0-4
 bsdutils==1:2.33.1-0.1
@@ -27,8 +27,8 @@ libaudit-common==1:2.8.4-3
 libaudit1==1:2.8.4-3
 libblkid1==2.33.1-0.1
 libbz2-1.0==1.0.6-9.2~deb10u1
-libc-bin==2.28-10
-libc6==2.28-10
+libc-bin==2.28-10+deb10u1
+libc6==2.28-10+deb10u1
 libcap-ng0==0.7.9-2
 libcom-err2==1.44.5-1+deb10u3
 libdb5.3==5.3.28+dfsg1-0.5
@@ -38,7 +38,7 @@ libfdisk1==2.33.1-0.1
 libffi6==3.2.1-9
 libgcc1==1:8.3.0-6
 libgcrypt20==1.8.4-5+deb10u1
-libgmp10==2:6.1.2+dfsg-4
+libgmp10==2:6.1.2+dfsg-4+deb10u1
 libgnutls30==3.6.7-4+deb10u7
 libgpg-error0==1.35-1
 libhogweed4==3.4.1-1+deb10u1
@@ -79,6 +79,6 @@ perl-base==5.28.1-6+deb10u1
 sed==4.7-1
 sysvinit-utils==2.93-8
 tar==1.30+dfsg-6
-tzdata==2021a-0+deb10u2
+tzdata==2021a-0+deb10u3
 util-linux==2.33.1-0.1
 zlib1g==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index a4bf7e24a7f1..bf6e460be007 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.5.10-1
+containerd.io==1.5.11-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -89,9 +89,9 @@ libassuan0==2.5.2-1
 libatomic1==8.3.0-6
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10
-libc-l10n==2.28-10
-libc6-dev==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc-l10n==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
@@ -175,7 +175,7 @@ libonig5==6.9.1-1
 libopts25==1:5.18.12-4
 libpackagekit-glib2-18==1.1.12-5
 libpam-tacplus==1.4.1-1
-libpcap0.8==1.8.1-6
+libpcap0.8==1.8.1-6+deb10u1
 libpci3==1:3.5.2-1
 libperl5.28==5.28.1-6+deb10u1
 libpng16-16==1.6.36-6
@@ -203,8 +203,8 @@ libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u8
-libssl1.1==1.1.1d-0+deb10u8
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
@@ -224,8 +224,8 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
-linux-libc-dev==4.19.232-1
-locales==2.28-10
+linux-libc-dev==4.19.235-1
+locales==2.28-10+deb10u1
 logrotate==3.14.0-4
 lsb-base==10.2019051400
 lsb-release==10.2019051400
@@ -249,7 +249,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u8
+openssl==1.1.1n-0+deb10u1
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
@@ -293,7 +293,7 @@ python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 rasdaemon==0.6.0-1.2
 readline-common==7.0-5
-rsyslog==8.1901.0-1
+rsyslog==8.1901.0-1+deb10u1
 screen==4.6.2-3+deb10u1
 sensible-utils==0.0.12
 software-properties-common==0.96.20.2-2
@@ -320,8 +320,8 @@ udev==247.3-6~bpo10+1
 unzip==6.0-23+deb10u2
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
-vim==2:8.1.0875-5
-vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
-xxd==2:8.1.0875-5
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
+xxd==2:8.1.0875-5+deb10u2
 xz-utils==5.2.4-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 2d1f824bf970..b5413e74b657 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,24 +1,14 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
-libssl-dev==1.1.1d-0+deb10u7
-libssl1.1==1.1.1d-0+deb10u7
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.208-1
-openssl==1.1.1d-0+deb10u7
-squashfs-tools==1:4.3-12+deb10u1
+pkg-config==0.29-6
 tsingma-bsp==1.0
-tzdata==2021a-0+deb10u3
+tzdata==2021a-0+deb10u4
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 453e816aea35..fedd767e7ba2 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,24 +1,14 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-icu-devtools==63.1-6+deb10u1
+icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
-libexpat1==2.2.6-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u1
-libicu-dev==63.1-6+deb10u1
-libicu63==63.1-6+deb10u1
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
-libsasl2-2==2.1.27+dfsg-1+deb10u1
-libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
-libssl-dev==1.1.1d-0+deb10u7
-libssl1.1==1.1.1d-0+deb10u7
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.208-1
 mrvlprestera==1.0
-openssl==1.1.1d-0+deb10u7
-squashfs-tools==1:4.3-12+deb10u1
-tzdata==2021a-0+deb10u3
+pkg-config==0.29-6
+tzdata==2021a-0+deb10u4
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 26f41fb15271..0961863ac002 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -12,7 +12,7 @@ idna==3.3
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
-jinja2==3.0.3
+jinja2==3.1.1
 jsondiff==1.3.1
 jsonschema==2.6.0
 lxml==4.6.3

From 674dc6e4c46636ef316404964bfb5563040271ab Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 29 Mar 2022 12:34:46 +0800
Subject: [PATCH 1103/1674] [Build]: Fix host image debian package version
 issue (#10358)

Why I did it
Fix host image debian package version issue.
The package dependencies may have issue, when some of debian packages of the base image are upgraded. For example, libc is installed in base image, but if the mirror has new version, when running "apt-get upgrade", the package will be upgraded unexpected. To avoid such issue, need to add the versions when building the host image.

How I did it
The package versions of host-image should contain host-base-image.
---
 scripts/prepare_slave_container_buildinfo.sh |  4 ++++
 scripts/versions_manager.py                  | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/prepare_slave_container_buildinfo.sh b/scripts/prepare_slave_container_buildinfo.sh
index be6fe078bdfb..5d306a0e1c20 100755
--- a/scripts/prepare_slave_container_buildinfo.sh
+++ b/scripts/prepare_slave_container_buildinfo.sh
@@ -10,6 +10,10 @@ sudo dpkg -i --force-overwrite $SLAVE_DIR/buildinfo/sonic-build-hooks_*.deb > /d
 # Enable the build hooks
 symlink_build_hooks
 
+# Enable reproducible mirrors
+set_reproducible_mirrors
+apt-get update > /dev/null 2>&1
+
 # Build the slave running config
 cp -rf $SLAVE_DIR/buildinfo/* /usr/local/share/buildinfo/
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index c986e29a4e17..a20684e97bb4 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -174,11 +174,20 @@ def overwrite(self, module, for_all_dist=False, for_all_arch=False):
                 self.components.append(tmp_component)
         self.adjust()
 
-    def get_config_module(self, default_module, dist, arch):
+    def get_config_module(self, source_path, dist, arch):
         if self.is_individule_version():
             return self
+        default_module_path = VersionModule.get_module_path_by_name(source_path, DEFAULT_MODULE)
+        default_module = VersionModule()
+        default_module.load(default_module_path, filter_dist=dist, filter_arch=arch)
         module = default_module
-        if not self.is_aggregatable_module(self.name):
+        if self.name == 'host-image':
+            base_module_path = VersionModule.get_module_path_by_name(source_path, 'host-base-image')
+            base_module = VersionModule()
+            base_module.load(base_module_path, filter_dist=dist, filter_arch=arch)
+            module = default_module.clone(exclude_ctypes=DEFAULT_OVERWRITE_COMPONENTS)
+            module.overwrite(base_module, True, True)
+        elif not self.is_aggregatable_module(self.name):
             module = default_module.clone(exclude_ctypes=DEFAULT_OVERWRITE_COMPONENTS)
         return self._get_config_module(module, dist, arch)
 
@@ -661,10 +670,7 @@ def generate(self):
             os.makedirs(args.target_path)
         module = VersionModule()
         module.load(module_path, filter_dist=args.distribution, filter_arch=args.architecture)
-        default_module_path = VersionModule.get_module_path_by_name(args.source_path, DEFAULT_MODULE)
-        default_module = VersionModule()
-        default_module.load(default_module_path, filter_dist=args.distribution, filter_arch=args.architecture)
-        config = module.get_config_module(default_module, args.distribution, args.architecture)
+        config = module.get_config_module(args.source_path, args.distribution, args.architecture)
         config.clean_info(force=True)
         config.dump(args.target_path, config=True, priority=args.priority)
 

From 308ecbb89cae96ee99e46c3436b06170826321a8 Mon Sep 17 00:00:00 2001
From: Yang Wang <yangwang1@microsoft.com>
Date: Tue, 29 Mar 2022 13:21:19 +0800
Subject: [PATCH 1104/1674] [202012][sonic-sairedis]Update sonic-sairedis
 submodule (#10348)

---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index d4816015254b..5f37d74d0c49 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit d4816015254ba51e4cdc36b396d0e517f9d84855
+Subproject commit 5f37d74d0c4960d5ffa80a8597e6f6ebfc2d9753

From e9db38594dcd00a2a824aecceac78baced52eff5 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 29 Mar 2022 10:11:28 -0700
Subject: [PATCH 1105/1674] Image disk space reduction (#10172) (#10371)

Reduce the disk space taken up during bootup and runtime.

1. Remove python package cache from the base image and from the containers.
2. During bootup, if logs are to be stored in memory, then don't create the `var-log.ext4` file just to delete it later during bootup.
3. For the partition containing `/host`, don't reserve any blocks for just the root user. This just makes sure all disk space is available for all users, if needed during upgrades (for example).

* Remove pip2 and pip3 caches from some containers

Only containers which appeared to have a significant pip cache size are
included here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Don't create var-log.ext4 if we're storing logs in memory

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Run tune2fs on the device containing /host to not reserve any blocks for just the root user

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
(cherry picked from commit 5617b1ae3efc6cee52b875651135ada67898ebf0)
---
 dockers/docker-base-buster/Dockerfile.j2          |  2 +-
 dockers/docker-config-engine-buster/Dockerfile.j2 |  2 +-
 dockers/docker-orchagent/Dockerfile.j2            |  2 +-
 dockers/docker-sonic-mgmt-framework/Dockerfile.j2 |  2 +-
 files/Aboot/boot0.j2                              |  7 ++++++-
 files/initramfs-tools/varlog                      | 10 ++++++++++
 installer/arm64/install.sh                        |  5 +++++
 installer/armhf/install.sh                        |  5 +++++
 installer/x86_64/install.sh                       | 11 +++++++++++
 9 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/dockers/docker-base-buster/Dockerfile.j2 b/dockers/docker-base-buster/Dockerfile.j2
index e16a0f677b07..52c784e9a7fe 100644
--- a/dockers/docker-base-buster/Dockerfile.j2
+++ b/dockers/docker-base-buster/Dockerfile.j2
@@ -121,7 +121,7 @@ RUN apt-get -y purge   \
 RUN apt-get clean -y                     && \
     apt-get autoclean -y                 && \
     apt-get autoremove -y                && \
-    rm -rf /var/lib/apt/lists/* /tmp/*
+    rm -rf /var/lib/apt/lists/* /tmp/* ~/.cache/
 
 COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
 COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
diff --git a/dockers/docker-config-engine-buster/Dockerfile.j2 b/dockers/docker-config-engine-buster/Dockerfile.j2
index 3022546a068c..1e7a64bfcd36 100644
--- a/dockers/docker-config-engine-buster/Dockerfile.j2
+++ b/dockers/docker-config-engine-buster/Dockerfile.j2
@@ -49,4 +49,4 @@ RUN apt-get purge -y               \
     apt-get clean -y            && \
     apt-get autoclean -y        && \
     apt-get autoremove -y       && \
-    rm -rf /debs /python-wheels
+    rm -rf /debs /python-wheels ~/.cache
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 70dc98c34cf3..ef6273ca17a4 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -63,7 +63,7 @@ RUN apt-get purge -y          \
     apt-get clean -y       && \
     apt-get autoclean -y   && \
     apt-get autoremove -y  && \
-    rm -rf /debs
+    rm -rf /debs ~/.cache
 
 COPY ["files/arp_update", "/usr/bin"]
 COPY ["arp_update.conf", "files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
index dca399f23f20..048e3b59bfc6 100644
--- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
@@ -51,6 +51,6 @@ RUN apt-get purge -y python-dev
 
 RUN apt-get remove -y g++ python3-dev
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
-RUN rm -rf /debs
+RUN rm -rf /debs ~/.cache
 
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 0433e32891da..747a658b1e8b 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -351,7 +351,12 @@ extract_image() {
     unzip -oq "$swipath" -x boot0 "$dockerfs" -d "$image_path"
 
     ## detect rootfs type
-    rootfs_type=`grep " $target_path " /proc/mounts | cut -d' ' -f3`
+    local mountstr="$(grep " $target_path " /proc/mounts)"
+    local rootdev="$(echo $mountstr | cut -f1 -d' ')"
+    rootfs_type="$(echo $mountstr | cut -d' ' -f3)"
+
+    ## Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $rootdev
 
     info "Extracting $dockerfs from swi"
     ## Unpacking dockerfs delayed
diff --git a/files/initramfs-tools/varlog b/files/initramfs-tools/varlog
index e8063e41a59c..980b24523452 100644
--- a/files/initramfs-tools/varlog
+++ b/files/initramfs-tools/varlog
@@ -11,17 +11,27 @@ case $1 in
     ;;
 esac
 
+logs_inram=false
+
 # Extract kernel parameters
 set -- $(cat /proc/cmdline)
 for x in "$@"; do
     case "$x" in
         varlog_size=*)
             varlog_size="${x#varlog_size=}"
+            ;;
+        logs_inram=on)
+            logs_inram=true
+            ;;
     esac
 done
 
 [ -z "$varlog_size" ] && exit 0
 
+# If logs are being stored in memory, then don't bother
+# creating the log file just to have it deleted afterwards.
+$logs_inram && exit 0
+
 # exit when the var_log.ext4 exists and the size matches
 if [ -e "${rootmnt}/host/disk-img/var-log.ext4" ]; then
     cur_varlog_size=$(ls -l ${rootmnt}/host/disk-img/var-log.ext4 | awk '{print $5}')
diff --git a/installer/arm64/install.sh b/installer/arm64/install.sh
index c1e20b62bf42..7d77f43f256d 100755
--- a/installer/arm64/install.sh
+++ b/installer/arm64/install.sh
@@ -117,6 +117,11 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
+
+    demo_dev=$(findmnt -n -o SOURCE --target /host)
+
+    # Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists
diff --git a/installer/armhf/install.sh b/installer/armhf/install.sh
index c85170ff256e..84917552ec2d 100755
--- a/installer/armhf/install.sh
+++ b/installer/armhf/install.sh
@@ -117,6 +117,11 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
+
+    demo_dev=$(findmnt -n -o SOURCE --target /host)
+
+    # Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index a75e70f1f6dd..1adec3bae2f0 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -434,6 +434,9 @@ if [ "$install_env" = "onie" ]; then
     # Make filesystem
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
+    # Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $demo_dev
+
     # Mount demo filesystem
     demo_mnt=$(${onie_bin} mktemp -d) || {
         echo "Error: Unable to create file system mount point"
@@ -466,12 +469,20 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
+
+    demo_dev=$(findmnt -n -o SOURCE --target /host)
+
+    # Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $demo_dev
 else
     demo_mnt="build_raw_image_mnt"
     demo_dev=$cur_wd/"%%OUTPUT_RAW_IMAGE%%"
 
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
+    # Don't reserve any blocks just for root
+    tune2fs -m 0 -r 0 $demo_dev
+
     echo "Mounting $demo_dev on $demo_mnt..."
     mkdir $demo_mnt
     mount -t auto -o loop $demo_dev $demo_mnt

From 491562b74b2eb98eacd5a53ba9973ae2c59c8400 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 30 Mar 2022 16:08:32 +0800
Subject: [PATCH 1106/1674] [ci] Fix remove sonic-slave-* docker image issue
 when building sonic-slave* (#10296) (#10378)

---
 .../azure-pipelines-UpgrateVersion.yml        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index f0cb85a817a2..b60d46b2a26b 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -14,6 +14,14 @@ schedules:
     - 202012
   always: true
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
+
 pool: sonicbld
 
 parameters:
@@ -42,17 +50,7 @@ stages:
       buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       jobFilters: ${{ parameters.jobFilters }}
       preSteps:
-      - script: |
-          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
-          if [ ! -z "$containers" ]; then
-            docker container kill $containers || true
-            sleep 5
-          fi
-          images=$(docker images 'sonic-slave-*' -a -q)
-          if [ ! -z "$images" ]; then
-            docker rmi -f $images
-          fi
-        displayName: 'Cleanup sonic slave'
+      - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
 - stage: UpgradeVersions
   jobs:
   - job: UpgradeVersions

From 11701938cf565742505946f7e14dc4840aef22d9 Mon Sep 17 00:00:00 2001
From: Devesh Pathak <54966909+devpatha@users.noreply.github.com>
Date: Wed, 30 Mar 2022 13:47:23 -0700
Subject: [PATCH 1107/1674] [202012] - sonic-swss submodule update (#10391)

* [202012] - sonic-swss submodule update to include following commits:

fca407a (HEAD) [VNET]Fixing nexthop group delete during route change (#2198)
a9b6b47 [vxlan] Remove tunnel map objects on VNET tunnel removal (#2208)
74e9b9f [FdbOrch] SAI_FDB_EVENT_MOVE generates update with empty update.entry.port_name (#2201)
0a99445 [202012][BFD]Registering BFD state change callback during session creation (#2203)
aebe4a1 [VS test] skip dpb flaky test (#2195) (#2207)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index d061e27825de..fca407a02c9b 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit d061e27825deadf4e1be354f18fdc7829867b0b9
+Subproject commit fca407a02c9bcd283badf8544434a85104010222

From 07c170fa04bc3d3a938fa88d6b174e615bed4681 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Wed, 30 Mar 2022 23:57:34 +0300
Subject: [PATCH 1108/1674] Remove quagga from SONiC (#10384)

Quagga is no longer being used in SONiC. Cherry-pick from master PR #7898

Co-authored-by: liora <liora@nvidia.com>
---
 .gitmodules                                   |   4 -
 dockers/docker-fpm-quagga/Dockerfile.j2       |  39 -----
 .../docker-fpm-quagga/base_image_files/rvtysh |   1 -
 .../docker-fpm-quagga/base_image_files/vtysh  |  16 --
 dockers/docker-fpm-quagga/bgpcfgd             |  71 ---------
 dockers/docker-fpm-quagga/bgpd.conf.j2        | 140 ------------------
 dockers/docker-fpm-quagga/critical_processes  |   4 -
 dockers/docker-fpm-quagga/isolate.j2          |  26 ----
 dockers/docker-fpm-quagga/start.sh            |  34 -----
 dockers/docker-fpm-quagga/supervisord.conf    |  66 ---------
 dockers/docker-fpm-quagga/unisolate.j2        |  26 ----
 dockers/docker-fpm-quagga/zebra.conf.j2       |  78 ----------
 platform/vs/docker-sonic-vs.mk                |   4 +-
 rules/config                                  |   2 +-
 rules/docker-fpm-gobgp.dep                    |  10 --
 rules/docker-fpm-gobgp.mk                     |  12 --
 rules/docker-fpm-quagga.dep                   |  10 --
 rules/docker-fpm-quagga.mk                    |  16 --
 rules/docker-fpm.mk                           |   4 +-
 rules/quagga.dep                              |  13 --
 rules/quagga.mk                               |  11 --
 rules/sonic-config.dep                        |   2 +-
 src/sonic-config-engine/tests/test_j2files.py |  15 --
 src/sonic-quagga                              |   1 -
 24 files changed, 4 insertions(+), 601 deletions(-)
 delete mode 100644 dockers/docker-fpm-quagga/Dockerfile.j2
 delete mode 120000 dockers/docker-fpm-quagga/base_image_files/rvtysh
 delete mode 100755 dockers/docker-fpm-quagga/base_image_files/vtysh
 delete mode 100755 dockers/docker-fpm-quagga/bgpcfgd
 delete mode 100644 dockers/docker-fpm-quagga/bgpd.conf.j2
 delete mode 100644 dockers/docker-fpm-quagga/critical_processes
 delete mode 100755 dockers/docker-fpm-quagga/isolate.j2
 delete mode 100755 dockers/docker-fpm-quagga/start.sh
 delete mode 100644 dockers/docker-fpm-quagga/supervisord.conf
 delete mode 100755 dockers/docker-fpm-quagga/unisolate.j2
 delete mode 100644 dockers/docker-fpm-quagga/zebra.conf.j2
 delete mode 100644 rules/docker-fpm-gobgp.dep
 delete mode 100644 rules/docker-fpm-gobgp.mk
 delete mode 100644 rules/docker-fpm-quagga.dep
 delete mode 100644 rules/docker-fpm-quagga.mk
 delete mode 100644 rules/quagga.dep
 delete mode 100644 rules/quagga.mk
 delete mode 160000 src/sonic-quagga

diff --git a/.gitmodules b/.gitmodules
index b49c0af68e95..5bad36e731a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,10 +16,6 @@
 [submodule "src/p4-hlir/p4-hlir"]
 	path = platform/p4/p4-hlir/p4-hlir
 	url = https://github.com/p4lang/p4-hlir
-[submodule "quagga"]
-	path = src/sonic-quagga
-	url = https://github.com/Azure/sonic-quagga
-	branch = debian/0.99.24.1
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
 	url = https://github.com/Azure/sonic-dbsyncd
diff --git a/dockers/docker-fpm-quagga/Dockerfile.j2 b/dockers/docker-fpm-quagga/Dockerfile.j2
deleted file mode 100644
index ac382afbe5b2..000000000000
--- a/dockers/docker-fpm-quagga/Dockerfile.j2
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM docker-config-engine
-
-ARG docker_container_name
-RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
-
-# Make apt-get non-interactive
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Update apt's cache of available packages
-RUN apt-get update
-
-# Install required packages
-RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libpython2.7
-
-{% if docker_fpm_quagga_debs.strip() -%}
-# Copy locally-built Debian package dependencies
-{%- for deb in docker_fpm_quagga_debs.split(' ') %}
-COPY debs/{{ deb }} /debs/
-{%- endfor %}
-
-# Install locally-built Debian packages and implicitly install their dependencies
-{%- for deb in docker_fpm_quagga_debs.split(' ') %}
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
-{%- endfor %}
-{%- endif %}
-
-# Clean up
-RUN apt-get clean -y
-RUN apt-get autoclean -y
-RUN apt-get autoremove -y
-RUN rm -rf /debs ~/.cache
-
-COPY ["bgpcfgd", "start.sh", "/usr/bin/"]
-COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
-COPY ["*.j2", "/usr/share/sonic/templates/"]
-COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
-COPY ["critical_processes", "/etc/supervisor"]
-
-ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/dockers/docker-fpm-quagga/base_image_files/rvtysh b/dockers/docker-fpm-quagga/base_image_files/rvtysh
deleted file mode 120000
index 3956b5bfb373..000000000000
--- a/dockers/docker-fpm-quagga/base_image_files/rvtysh
+++ /dev/null
@@ -1 +0,0 @@
-../../docker-fpm-frr/base_image_files/rvtysh
\ No newline at end of file
diff --git a/dockers/docker-fpm-quagga/base_image_files/vtysh b/dockers/docker-fpm-quagga/base_image_files/vtysh
deleted file mode 100755
index 24016bd96b2c..000000000000
--- a/dockers/docker-fpm-quagga/base_image_files/vtysh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-  # Prepare a function to send HUP signal to vtysh in the container
-  # we mark the new instance of vtysh with the current tty as a tag
-  TTY=$(tty)
-  function cleanup
-  {
-    docker exec -i bgp pkill -HUP -f "vtysh $TTY"
-  }
-  trap cleanup HUP
-  docker exec -ti bgp vtysh "$TTY" "$@"
-else
-  docker exec -i bgp vtysh "$@"
-fi
diff --git a/dockers/docker-fpm-quagga/bgpcfgd b/dockers/docker-fpm-quagga/bgpcfgd
deleted file mode 100755
index ef936247cc2c..000000000000
--- a/dockers/docker-fpm-quagga/bgpcfgd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import redis
-import subprocess
-import syslog
-from swsssdk import ConfigDBConnector
-
-
-class BGPConfigDaemon:
-
-    def __init__(self):
-        self.config_db = ConfigDBConnector()
-        self.config_db.connect()
-        self.bgp_asn = self.config_db.get_entry('DEVICE_METADATA', 'localhost')['bgp_asn']
-        self.bgp_neighbor = self.config_db.get_table('BGP_NEIGHBOR')
-
-    def __run_command(self, command):
-        p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
-        stdout = p.communicate()[0]
-        p.wait()
-        if p.returncode != 0:
-            syslog.syslog(syslog.LOG_ERR, '[bgp cfgd] command execution returned {}. Command: "{}", stdout: "{}"'.format(
-                p.returncode, command, stdout))
-
-    def metadata_handler(self, key, data):
-        if key == 'localhost' and data.has_key('bgp_asn'):
-            if data['bgp_asn'] != self.bgp_asn:
-                syslog.syslog(syslog.LOG_INFO, '[bgp cfgd] ASN changed to {} from {}, restart BGP...'.format(
-                    data['bgp_asn'], self.bgp_asn))
-                self.__run_command("supervisorctl restart start.sh")
-                self.__run_command("service quagga restart")
-                self.bgp_asn = data['bgp_asn']
-
-    def bgp_handler(self, key, data):
-        syslog.syslog(syslog.LOG_INFO, '[bgp cfgd] value for {} changed to {}'.format(key, data))
-        if not data:
-            # Neighbor is deleted
-            command = "vtysh -c 'configure terminal' -c 'router bgp {}' -c 'no neighbor {}'".format(self.bgp_asn, key)
-            self.__run_command(command)
-            self.bgp_neighbor.pop(key)
-        else:
-            command = "vtysh -c 'configure terminal' -c 'router bgp {}' -c 'neighbor {} remote-as {}'".format(
-                self.bgp_asn, key, data['asn'])
-            self.__run_command(command)
-            if data.has_key('name'):
-                command = "vtysh -c 'configure terminal' -c 'router bgp {}' -c 'neighbor {} description {}'".format(
-                    self.bgp_asn, key, data['name'])
-                self.__run_command(command)
-            if data.has_key('admin_status'):
-                command_mod = 'no ' if data['admin_status'] == 'up' else ''
-                command = "vtysh -c 'configure terminal' -c 'router bgp {}' -c '{}neighbor {} shutdown'".format(
-                    self.bgp_asn, command_mod, key)
-                self.__run_command(command)
-            self.bgp_neighbor[key] = data
-
-    def start(self):
-        self.config_db.subscribe('BGP_NEIGHBOR',
-                                 lambda table, key, data: self.bgp_handler(key, data))
-        self.config_db.subscribe('DEVICE_METADATA',
-                                 lambda table, key, data: self.metadata_handler(key, data))
-        self.config_db.listen()
-
-
-def main():
-    daemon = BGPConfigDaemon()
-    daemon.start()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/dockers/docker-fpm-quagga/bgpd.conf.j2 b/dockers/docker-fpm-quagga/bgpd.conf.j2
deleted file mode 100644
index 8c838f8ffc9d..000000000000
--- a/dockers/docker-fpm-quagga/bgpd.conf.j2
+++ /dev/null
@@ -1,140 +0,0 @@
-!
-{% block banner %}
-! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
-! generated by templates/quagga/bgpd.conf.j2 with config DB data
-! file: bgpd.conf
-!
-{% endblock banner %}
-!
-{% block system_init %}
-hostname {{ DEVICE_METADATA['localhost']['hostname'] }}
-password zebra
-log syslog informational
-log facility local4
-! enable password {# {{ en_passwd }} TODO: param needed #}
-{% endblock system_init %}
-!
-{% if 'bgp_asn' in DEVICE_METADATA['localhost'] %}
-{% block bgp_init %}
-!
-! bgp multiple-instance
-!
-route-map FROM_BGP_SPEAKER_V4 permit 10
-!
-route-map TO_BGP_SPEAKER_V4 deny 10
-!
-router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
-  bgp log-neighbor-changes
-  bgp bestpath as-path multipath-relax
-  no bgp default ipv4-unicast
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 and name == 'Loopback0' %}
-  bgp router-id {{ prefix | ip }}
-{% endif %}
-{% endfor %}
-{# advertise loopback #}
-{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 and name == 'Loopback0' %}
-  network {{ prefix | ip }}/32
-{% elif prefix | ipv6 and name == 'Loopback0' %}
-  address-family ipv6
-    network {{ prefix | ip }}/64
-  exit-address-family
-{% endif %}
-{% endfor %}
-{% endblock bgp_init %}
-{% endif %}
-{% block vlan_advertisement %}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %}
-  network {{ prefix }}
-{% elif prefix | ipv6 %}
-  address-family ipv6
-   network {{ prefix }}
-  exit-address-family
-{% endif %}
-{% endfor %}
-{% endblock vlan_advertisement %}
-{% block bgp_sessions %}
-{% for neighbor_addr, bgp_session in BGP_NEIGHBOR.items() %}
-{% if bgp_session['asn'] | int != 0 %}
-  neighbor {{ neighbor_addr }} remote-as {{ bgp_session['asn'] }}
-  neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
-{# set the bgp neighbor timers if they have not default values #}
-{% if     (bgp_session['keepalive'] is defined and bgp_session['keepalive'] | int != 60)
-      or  (bgp_session['holdtime'] is defined  and bgp_session['holdtime']  | int != 180) %}
-  neighbor {{ neighbor_addr }} timers {{ bgp_session['keepalive'] }} {{ bgp_session['holdtime'] }}
-{% endif %}
-{% if 'admin_status' in bgp_session and bgp_session['admin_status'] == 'down' or 'admin_status' not in bgp_session and 'default_bgp_status' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['default_bgp_status'] == 'down' %}
-  neighbor {{ neighbor_addr }} shutdown
-{% endif %}
-{% if neighbor_addr | ipv4 %}
-  address-family ipv4
-{% if DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
-    neighbor {{ neighbor_addr }} allowas-in 1
-{% endif %}
-    neighbor {{ neighbor_addr }} activate
-    neighbor {{ neighbor_addr }} soft-reconfiguration inbound
-    maximum-paths 64
-  exit-address-family
-{% endif %}
-{% if neighbor_addr | ipv6 %}
-  address-family ipv6
-{% if DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
-    neighbor {{ neighbor_addr }} allowas-in 1
-{% endif %}
-    neighbor {{ neighbor_addr }} activate
-    neighbor {{ neighbor_addr }} soft-reconfiguration inbound
-    maximum-paths 64
-  exit-address-family
-{% endif %}
-{% endif %}
-{% endfor %}
-{% endblock bgp_sessions %}
-{% block bgp_peers_with_range %}
-{% if BGP_PEER_RANGE %}
-{% for bgp_peer in BGP_PEER_RANGE.values() %}
-  neighbor {{ bgp_peer['name'] }} peer-group
-  neighbor {{ bgp_peer['name'] }} passive
-{% if bgp_peer['peer_asn'] is defined %}
-  neighbor {{ bgp_peer['name'] }} remote-as {{ bgp_peer['peer_asn'] }}
-{% else %}
-  neighbor {{ bgp_peer['name'] }} remote-as {{ constants.deployment_id_asn_map[DEVICE_METADATA['localhost']['deployment_id']] }}
-{% endif %}
-  neighbor {{ bgp_peer['name'] }} ebgp-multihop 255
-  neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound
-{% if bgp_peer['src_address'] is defined %}
-  neighbor {{ bgp_peer['name'] }} update-source {{ bgp_peer['src_address'] | ip }}
-{% else %}
-{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{% if name == 'Loopback1' %}
-  neighbor {{ bgp_peer['name'] }} update-source {{ prefix | ip }}
-{% endif %}
-{% endfor %}
-{% endif %}
-  neighbor {{ bgp_peer['name'] }} route-map FROM_BGP_SPEAKER_V4 in
-  neighbor {{ bgp_peer['name'] }} route-map TO_BGP_SPEAKER_V4 out
-{% for ip_range in bgp_peer['ip_range'] %}
-  bgp listen range {{ip_range}} peer-group {{ bgp_peer['name'] }}
-{% endfor %}
-  address-family ipv4
-    neighbor {{ bgp_peer['name'] }} activate
-    maximum-paths 64
-  exit-address-family
-  address-family ipv6
-    neighbor {{ bgp_peer['name'] }} activate
-    maximum-paths 64
-  exit-address-family
-{% endfor %}
-{% endif %}
-{% endblock bgp_peers_with_range %}
-!
-{% if 'bgp_asn' in DEVICE_METADATA['localhost'] %}
-maximum-paths 64
-!
-route-map ISOLATE permit 10
-set as-path prepend {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
-{% endif %}
-!
diff --git a/dockers/docker-fpm-quagga/critical_processes b/dockers/docker-fpm-quagga/critical_processes
deleted file mode 100644
index 2dceb501e3e5..000000000000
--- a/dockers/docker-fpm-quagga/critical_processes
+++ /dev/null
@@ -1,4 +0,0 @@
-program:zebra
-program:bgpd
-program:fpmsyncd
-program:bgpcfgd
diff --git a/dockers/docker-fpm-quagga/isolate.j2 b/dockers/docker-fpm-quagga/isolate.j2
deleted file mode 100755
index 9d19f9f40905..000000000000
--- a/dockers/docker-fpm-quagga/isolate.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-## vtysh only accepts script in stdin, so cannot be directly used in shebang
-## Cut the tail of this script and feed vtysh stdin
-sed -n -e '9,$p' < "$0" | vtysh "$@"
-## Exit with vtysh return code
-exit $?
-
-## vtysh script start from next line, which line number MUST equal in 'sed' command above
-
-configure terminal
-  router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
-{% for neighbor_addr in BGP_NEIGHBOR %}
-{% if neighbor_addr | ipv4 %}
-    neighbor {{ neighbor_addr }} route-map ISOLATE out
-{% else %}
-  address-family ipv6
-    neighbor {{ neighbor_addr }} route-map ISOLATE out
-  exit-address-family
-{% endif %}
-{% endfor %}
-  exit
-exit
-
-{% for neighbor_addr in BGP_NEIGHBOR %}
-clear ip bgp {{ neighbor_addr }} soft out
-{% endfor %}
diff --git a/dockers/docker-fpm-quagga/start.sh b/dockers/docker-fpm-quagga/start.sh
deleted file mode 100755
index 37d9c5072d9d..000000000000
--- a/dockers/docker-fpm-quagga/start.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir -p /etc/quagga
-
-CFGGEN_PARAMS=" \
-    -d \
-    -y /etc/sonic/constants.yml \
-    -t /usr/share/sonic/templates/bgpd.conf.j2,/etc/quagga/bgpd.conf \
-    -t /usr/share/sonic/templates/zebra.conf.j2,/etc/quagga/zebra.conf \
-    -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
-    -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
-"
-sonic-cfggen $CFGGEN_PARAMS
-
-chown root:root /usr/sbin/bgp-isolate
-chmod 0755 /usr/sbin/bgp-isolate
-
-chown root:root /usr/sbin/bgp-unisolate
-chmod 0755 /usr/sbin/bgp-unisolate
-
-mkdir -p /var/sonic
-echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
-
-rm -f /var/run/rsyslogd.pid
-
-supervisorctl start bgpcfgd
-
-supervisorctl start rsyslogd
-
-# Start Quagga processes
-supervisorctl start zebra
-supervisorctl start bgpd
-
-supervisorctl start fpmsyncd
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
deleted file mode 100644
index 69258ada037f..000000000000
--- a/dockers/docker-fpm-quagga/supervisord.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-[supervisord]
-logfile_maxbytes=1MB
-logfile_backups=2
-nodaemon=true
-
-[eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
-events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
-autostart=true
-autorestart=unexpected
-buffer_size=1024
-
-[program:start.sh]
-command=/usr/bin/start.sh
-priority=1
-autostart=true
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:bgpcfgd]
-command=/usr/bin/bgpcfgd
-priority=2
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
-priority=3
-autostart=false
-autorestart=unexpected
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:zebra]
-command=/usr/lib/quagga/zebra -A 127.0.0.1
-priority=4
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:bgpd]
-command=/usr/lib/quagga/bgpd -A 127.0.0.1 -F
-priority=5
-stopsignal=KILL
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:fpmsyncd]
-command=fpmsyncd
-priority=6
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
diff --git a/dockers/docker-fpm-quagga/unisolate.j2 b/dockers/docker-fpm-quagga/unisolate.j2
deleted file mode 100755
index abd6a912c0d5..000000000000
--- a/dockers/docker-fpm-quagga/unisolate.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-## vtysh only accepts script in stdin, so cannot be directly used in shebang
-## Cut the tail of this script and feed vtysh stdin
-sed -n -e '9,$p' < "$0" | vtysh "$@"
-## Exit with vtysh return code
-exit $?
-
-## vtysh script start from next line, which line number MUST equal in 'sed' command above
-
-configure terminal
-  router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
-{% for neighbor_ip in BGP_NEIGHBOR %}
-{% if neighbor_ip | ipv4 %}
-    no neighbor {{ neighbor_ip }} route-map ISOLATE out
-{% else %}
-  address-family ipv6
-    no neighbor {{ neighbor_ip }} route-map ISOLATE out
-  exit-address-family
-{% endif %}
-{% endfor %}
-  exit
-exit
-
-{% for neighbor_ip in BGP_NEIGHBOR %}
-clear ip bgp {{ neighbor_ip }} soft out
-{% endfor %}
diff --git a/dockers/docker-fpm-quagga/zebra.conf.j2 b/dockers/docker-fpm-quagga/zebra.conf.j2
deleted file mode 100644
index c0357eaed86a..000000000000
--- a/dockers/docker-fpm-quagga/zebra.conf.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-!
-{% block banner %}
-! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
-! generated by templates/quagga/zebra.conf.j2 using config DB data
-! file: zebra.conf
-!
-{% endblock banner %}
-!
-{% block sys_init %}
-hostname {{ DEVICE_METADATA['localhost']['hostname'] }}
-password zebra
-enable password zebra
-{% endblock sys_init %}
-!
-{% block interfaces %}
-! Enable link-detect (default disabled)
-{% for (name, prefix) in INTERFACE|pfx_filter %}
-interface {{ name }}
-link-detect
-!
-{% endfor %}
-{% for pc in PORTCHANNEL %}
-interface {{ pc }}
-link-detect
-!
-{% endfor %}
-{% endblock interfaces %}
-!
-{% block default_route %}
-! set static default route to mgmt gateway as a backup to learned default
-{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %}
-ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
-{% endif %}
-{% endfor %}
-{% endblock default_route %}
-!
-{% block source_loopback %}
-{% set lo_ipv4_addrs = [] %}
-{% set lo_ipv6_addrs = [] %}
-{% if LOOPBACK_INTERFACE %}
-{%   for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{%     if name == 'Loopback0' %}
-{%       if prefix | ipv6 %}
-{%         if lo_ipv6_addrs.append(prefix) %}
-{%         endif %}
-{%       else %}
-{%         if lo_ipv4_addrs.append(prefix) %}
-{%         endif %}
-{%       endif %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-! Set ip source to loopback for bgp learned routes
-{% if lo_ipv4_addrs|length > 0 -%} 
-route-map RM_SET_SRC permit 10
-    set src {{ lo_ipv4_addrs[0] | ip }}
-!
-{% endif %}
-{% if lo_ipv6_addrs|length > 0 %} 
-route-map RM_SET_SRC6 permit 10
-    set src {{ lo_ipv6_addrs[0] | ip }}
-!
-{% endif %}
-ip protocol bgp route-map RM_SET_SRC
-!
-{% if lo_ipv6_addrs|length > 0 %}
-ipv6 protocol bgp route-map RM_SET_SRC6
-!
-{% endif %}
-{% endblock source_loopback %}
-!
-{% block logging %}
-log syslog informational
-log facility local4
-{% endblock logging %}
-!
-
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index c48c8f12c704..6667c4abba9d 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -34,9 +34,7 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS_DBG) \
                               $(SYNCD_VS_DBG)
 endif
 
-ifeq ($(SONIC_ROUTING_STACK), quagga)
-$(DOCKER_SONIC_VS)_DEPENDS += $(QUAGGA)
-else ifeq ($(SONIC_ROUTING_STACK), frr)
+ifeq ($(SONIC_ROUTING_STACK), frr)
 $(DOCKER_SONIC_VS)_DEPENDS += $(FRR)
 else
 $(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP)
diff --git a/rules/config b/rules/config
index 539116e3c1f9..70ff038e6e63 100644
--- a/rules/config
+++ b/rules/config
@@ -69,7 +69,7 @@ SONIC_USE_PDDF_FRAMEWORK = y
 
 # SONIC_ROUTING_STACK - specify the routing-stack being elected to drive SONiC's control-plane.
 # Supported routing stacks on SONiC are:
-# routing-stacks: quagga, frr.
+# routing-stacks: frr.
 SONIC_ROUTING_STACK = frr
 
 # ENABLE_SYNCD_RPC - build docker-syncd with rpc packages for testing purposes.
diff --git a/rules/docker-fpm-gobgp.dep b/rules/docker-fpm-gobgp.dep
deleted file mode 100644
index 4cbb49578754..000000000000
--- a/rules/docker-fpm-gobgp.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-
-DPATH       := $($(DOCKER_FPM_GOBGP)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-fpm-gobgp.mk rules/docker-fpm-gobgp.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(DPATH))
-
-$(DOCKER_FPM_GOBGP)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(DOCKER_FPM_GOBGP)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(DOCKER_FPM_GOBGP)_DEP_FILES   := $(DEP_FILES)
-
diff --git a/rules/docker-fpm-gobgp.mk b/rules/docker-fpm-gobgp.mk
deleted file mode 100644
index 03ec88e85b56..000000000000
--- a/rules/docker-fpm-gobgp.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# docker image for fpm-gobgp
-
-DOCKER_FPM_GOBGP = docker-fpm-gobgp.gz
-$(DOCKER_FPM_GOBGP)_PATH = $(DOCKERS_PATH)/docker-fpm-gobgp
-$(DOCKER_FPM_GOBGP)_DEPENDS += $(GOBGP)
-$(DOCKER_FPM_GOBGP)_LOAD_DOCKERS += $(DOCKER_FPM_QUAGGA)
-SONIC_DOCKER_IMAGES += $(DOCKER_FPM_GOBGP)
-
-$(DOCKER_FPM_GOBGP)_CONTAINER_NAME = bgp
-$(DOCKER_FPM_GOBGP)_RUN_OPT += --privileged -t
-$(DOCKER_FPM_GOBGP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_FPM_GOBPG)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-fpm-quagga.dep b/rules/docker-fpm-quagga.dep
deleted file mode 100644
index 987e22b596c6..000000000000
--- a/rules/docker-fpm-quagga.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-
-DPATH       := $($(DOCKER_FPM_QUAGGA)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-fpm-quagga.mk rules/docker-fpm-quagga.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(DPATH))
-
-$(DOCKER_FPM_QUAGGA)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(DOCKER_FPM_QUAGGA)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(DOCKER_FPM_QUAGGA)_DEP_FILES   := $(DEP_FILES)
-
diff --git a/rules/docker-fpm-quagga.mk b/rules/docker-fpm-quagga.mk
deleted file mode 100644
index ba3d8a428b05..000000000000
--- a/rules/docker-fpm-quagga.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# docker image for fpm-quagga
-
-DOCKER_FPM_QUAGGA = docker-fpm-quagga.gz
-$(DOCKER_FPM_QUAGGA)_PATH = $(DOCKERS_PATH)/docker-fpm-quagga
-$(DOCKER_FPM_QUAGGA)_DEPENDS += $(QUAGGA) $(SWSS)
-$(DOCKER_FPM_QUAGGA)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
-SONIC_DOCKER_IMAGES += $(DOCKER_FPM_QUAGGA)
-
-$(DOCKER_FPM_QUAGGA)_CONTAINER_NAME = bgp
-$(DOCKER_FPM_QUAGGA)_RUN_OPT += --privileged -t
-$(DOCKER_FPM_QUAGGA)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-
-$(DOCKER_FPM_QUAGGA)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
-
-$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
-$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh
diff --git a/rules/docker-fpm.mk b/rules/docker-fpm.mk
index 72d89999c47a..5490c36ba782 100644
--- a/rules/docker-fpm.mk
+++ b/rules/docker-fpm.mk
@@ -1,8 +1,6 @@
 # Docker-fpm rule-file is simply a wrapper containing routing-stack selection logic.
 
-ifeq ($(SONIC_ROUTING_STACK), quagga)
-SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FPM_QUAGGA)
-else ifeq ($(SONIC_ROUTING_STACK), frr)
+ifeq ($(SONIC_ROUTING_STACK), frr)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FPM_FRR)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG)
 else
diff --git a/rules/quagga.dep b/rules/quagga.dep
deleted file mode 100644
index abaf234a4fee..000000000000
--- a/rules/quagga.dep
+++ /dev/null
@@ -1,13 +0,0 @@
-
-SPATH       := $($(QUAGGA)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/quagga.mk rules/quagga.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
-
-#DPKG_FRK
-$(QUAGGA)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(QUAGGA)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(QUAGGA)_DEP_FILES   := $(DEP_FILES)
-$(QUAGGA)_SMDEP_FILES := $(SMDEP_FILES)
-$(QUAGGA)_SMDEP_PATHS := $(SPATH)
-
diff --git a/rules/quagga.mk b/rules/quagga.mk
deleted file mode 100644
index 2caef76b2cfd..000000000000
--- a/rules/quagga.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# quagga package
-
-QUAGGA_VERSION_FULL = 0.99.24.1-2.1
-
-QUAGGA = quagga_$(QUAGGA_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(QUAGGA)_DEPENDS += $(LIBSNMP_DEV)
-$(QUAGGA)_SRC_PATH = $(SRC_PATH)/sonic-quagga
-SONIC_DPKG_DEBS += $(QUAGGA)
-
-QUAGGA_DBG = quagga-dbg_$(QUAGGA_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(QUAGGA),$(QUAGGA_DBG)))
diff --git a/rules/sonic-config.dep b/rules/sonic-config.dep
index 61202e5675be..794d76b28496 100644
--- a/rules/sonic-config.dep
+++ b/rules/sonic-config.dep
@@ -4,7 +4,7 @@ SPATH       := $($(SONIC_CONFIG_ENGINE_PY2)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-config.mk rules/sonic-config.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(SPATH))
-DEP_FILES   += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-fpm-quagga/bgpd.conf.j2 dockers/docker-fpm-quagga/zebra.conf.j2 dockers/docker-orchagent/ipinip.json.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 files/build_templates/qos_config.j2 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml
+DEP_FILES   += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-orchagent/ipinip.json.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 files/build_templates/qos_config.j2 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml
 
 $(SONIC_CONFIG_ENGINE_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_CONFIG_ENGINE_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index cd6317853344..66b8f2bcdaff 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -104,21 +104,6 @@ def test_lldp(self):
         self.run_script(argument)
         self.assertTrue(utils.cmp(expected_mgmt_ipv6, self.output_file))
 
-    def test_bgpd_quagga(self):
-        conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-quagga', 'bgpd.conf.j2')
-        argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + conf_template + ' > ' + self.output_file
-        self.run_script(argument)
-        original_filename = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'bgpd_quagga.conf')
-        r = filecmp.cmp(original_filename, self.output_file)
-        diff_output = self.run_diff(original_filename, self.output_file) if not r else ""
-        self.assertTrue(r, "Diff:\n" + diff_output)
-
-    def test_zebra_quagga(self):
-        conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-quagga', 'zebra.conf.j2')
-        argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + conf_template + ' > ' + self.output_file
-        self.run_script(argument)
-        self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'zebra_quagga.conf'), self.output_file))
-
     def test_ipinip(self):
         ipinip_file = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ipinip.json.j2')
         argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + ipinip_file + ' > ' + self.output_file
diff --git a/src/sonic-quagga b/src/sonic-quagga
deleted file mode 160000
index e3b3b634e76b..000000000000
--- a/src/sonic-quagga
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e3b3b634e76b53cc4dce9301839451846eea7415

From 5b0f0c1d9993b85cbdf76d14b841b242370f5ba7 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 30 Mar 2022 14:03:29 -0700
Subject: [PATCH 1109/1674] [tun_pkt]: Wait for AsyncSniffer to init fully
 (#10346)

Fix for Tunnel packet handler can crash at system startup
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 .../docker-orchagent/tunnel_packet_handler.py | 86 ++++++++++---------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/dockers/docker-orchagent/tunnel_packet_handler.py b/dockers/docker-orchagent/tunnel_packet_handler.py
index 3d9b48b450b6..682316eb6d49 100755
--- a/dockers/docker-orchagent/tunnel_packet_handler.py
+++ b/dockers/docker-orchagent/tunnel_packet_handler.py
@@ -51,6 +51,10 @@ def __init__(self):
         self._portchannel_intfs = None
         self.up_portchannels = None
         self.netlink_api = IPRoute()
+        self.sniffer = None
+        self.self_ip = ''
+        self.packet_filter = ''
+        self.sniff_intfs = []
 
     @property
     def portchannel_intfs(self):
@@ -270,6 +274,39 @@ def sniffer_restart_required(self, messages):
                     return True
         return False
 
+    def start_sniffer(self):
+        """
+        Starts an AsyncSniffer and waits for it to inititalize fully
+        """
+        self.sniffer = AsyncSniffer(
+            iface=self.sniff_intfs,
+            filter=self.packet_filter,
+            prn=self.ping_inner_dst,
+            store=0
+        )
+        self.sniffer.start()
+
+        while not hasattr(self.sniffer, 'stop_cb'):
+            time.sleep(0.1)
+
+    def ping_inner_dst(self, packet):
+        """
+        Pings the inner destination IP for an encapsulated packet
+
+        Args:
+            packet: The encapsulated packet received
+        """
+        inner_packet_type = self.get_inner_pkt_type(packet)
+        if inner_packet_type and packet[IP].dst == self.self_ip:
+            cmds = ['timeout', '0.2', 'ping', '-c1',
+                    '-W1', '-i0', '-n', '-q']
+            if inner_packet_type == IPv6:
+                cmds.append('-6')
+            dst_ip = packet[IP].payload[inner_packet_type].dst
+            cmds.append(dst_ip)
+            logger.log_info("Running command '{}'".format(' '.join(cmds)))
+            subprocess.run(cmds, stdout=subprocess.DEVNULL)
+
     def listen_for_tunnel_pkts(self):
         """
         Listens for tunnel packets that are trapped to CPU
@@ -277,59 +314,28 @@ def listen_for_tunnel_pkts(self):
         These packets may be trapped if there is no neighbor info for the
         inner packet destination IP in the hardware.
         """
-
-        def _ping_inner_dst(packet):
-            """
-            Pings the inner destination IP for an encapsulated packet
-
-            Args:
-                packet: The encapsulated packet received
-            """
-            inner_packet_type = self.get_inner_pkt_type(packet)
-            if inner_packet_type and packet[IP].dst == self_ip:
-                cmds = ['timeout', '0.2', 'ping', '-c1',
-                        '-W1', '-i0', '-n', '-q']
-                if inner_packet_type == IPv6:
-                    cmds.append('-6')
-                dst_ip = packet[IP].payload[inner_packet_type].dst
-                cmds.append(dst_ip)
-                logger.log_info("Running command '{}'".format(' '.join(cmds)))
-                subprocess.run(cmds, stdout=subprocess.DEVNULL)
-
-        self_ip, peer_ip = self.get_ipinip_tunnel_addrs()
-        if self_ip is None or peer_ip is None:
+        self.self_ip, peer_ip = self.get_ipinip_tunnel_addrs()
+        if self.self_ip is None or peer_ip is None:
             logger.log_notice('Could not get tunnel addresses from '
                               'config DB, exiting...')
             return None
 
-        packet_filter = 'host {} and host {}'.format(self_ip, peer_ip)
+        self.packet_filter = 'host {} and host {}'.format(self.self_ip, peer_ip)
         logger.log_notice('Starting tunnel packet handler for {}'
-                          .format(packet_filter))
+                          .format(self.packet_filter))
 
-        sniff_intfs = self.get_up_portchannels()
-        logger.log_info("Listening on interfaces {}".format(sniff_intfs))
+        self.sniff_intfs = self.get_up_portchannels()
+        logger.log_info("Listening on interfaces {}".format(self.sniff_intfs))
 
-        sniffer = AsyncSniffer(
-            iface=sniff_intfs,
-            filter=packet_filter,
-            prn=_ping_inner_dst,
-            store=0
-        )
-        sniffer.start()
+        self.start_sniffer()
         while True:
             msgs = self.wait_for_netlink_msgs()
             if self.sniffer_restart_required(msgs):
-                sniffer.stop()
+                self.sniffer.stop()
                 sniff_intfs = self.get_up_portchannels()
                 logger.log_notice('Restarting tunnel packet handler on '
                                   'interfaces {}'.format(sniff_intfs))
-                sniffer = AsyncSniffer(
-                    iface=sniff_intfs,
-                    filter=packet_filter,
-                    prn=_ping_inner_dst,
-                    store=0
-                )
-                sniffer.start()
+                self.start_sniffer()
 
     def run(self):
         """

From 8d0aea0f1bd954cf1e564e93cdc3a65b241e11aa Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 31 Mar 2022 12:37:53 +0800
Subject: [PATCH 1110/1674] [build][Bug]: Fix the command
 set_reproducible_mirrors not found issue (#10398)

Why I did it
Fix the command set_reproducible_mirrors not found issue during the build.
---
 scripts/prepare_slave_container_buildinfo.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/prepare_slave_container_buildinfo.sh b/scripts/prepare_slave_container_buildinfo.sh
index 5d306a0e1c20..1fb2f006640b 100755
--- a/scripts/prepare_slave_container_buildinfo.sh
+++ b/scripts/prepare_slave_container_buildinfo.sh
@@ -10,14 +10,14 @@ sudo dpkg -i --force-overwrite $SLAVE_DIR/buildinfo/sonic-build-hooks_*.deb > /d
 # Enable the build hooks
 symlink_build_hooks
 
-# Enable reproducible mirrors
-set_reproducible_mirrors
-apt-get update > /dev/null 2>&1
-
 # Build the slave running config
 cp -rf $SLAVE_DIR/buildinfo/* /usr/local/share/buildinfo/
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
 
+# Enable reproducible mirrors
+set_reproducible_mirrors
+apt-get update > /dev/null 2>&1
+
 # Build the slave version config
 [ -d /usr/local/share/buildinfo/versions ] && rm -rf /usr/local/share/buildinfo/versions
 scripts/versions_manager.py generate -t "/usr/local/share/buildinfo/versions" -n "build-${SLAVE_DIR}" -d "$DISTRO" -a "$ARCH"

From f0000efff130472db09daf9cc29efb75c5831674 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 22 Mar 2022 12:51:07 +0800
Subject: [PATCH 1111/1674] [ci] Fix remove sonic-slave-* docker image issue
 when building sonic-slave* (#10296)

---
 .../docker-sonic-slave-template.yml           | 99 +++++++++++++++++++
 .../template-clean-sonic-slave.yml            |  8 ++
 2 files changed, 107 insertions(+)
 create mode 100644 .azure-pipelines/docker-sonic-slave-template.yml
 create mode 100644 .azure-pipelines/template-clean-sonic-slave.yml

diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
new file mode 100644
index 000000000000..212b449abb18
--- /dev/null
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -0,0 +1,99 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+
+parameters:
+- name: arch
+  type: string
+  values:
+  - amd64
+  - armhf
+  - arm64
+- name: dist
+  type: string
+  values:
+  - bullseye
+  - buster
+  - stretch
+  - jessie
+- name: registry_url
+  type: string
+  default: sonicdev-microsoft.azurecr.io
+- name: registry_conn
+  type: string
+  default: sonicdev
+- name: pool
+  type: string
+  default: sonicbld
+  values:
+  - sonicbld
+  - sonicbld-arm64
+  - sonicbld-armhf
+
+jobs:
+- job: Build_${{ parameters.dist }}_${{ parameters.arch }}
+  timeoutInMinutes: 360
+  pool: ${{ parameters.pool }}
+  steps:
+  - template: cleanup.yml
+  - template: template-clean-sonic-slave.yml
+  - checkout: self
+    clean: true
+    submodules: recursive
+  - bash: |
+      set -ex
+
+      SLAVE_DIR=sonic-slave-${{ parameters.dist }}
+      if [ x${{ parameters.pool }} == x"sonicbld" ]; then
+        if [ x${{ parameters.arch }} == x"amd64" ]; then
+          SLAVE_BASE_IMAGE=${SLAVE_DIR}
+          SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}
+        elif [ x${{ parameters.pool }} == x"sonicbld" ]; then
+          SLAVE_BASE_IMAGE=${SLAVE_DIR}-march-${{ parameters.arch }}
+          SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-march-${{ parameters.arch }}
+        fi
+      elif [[ x${{ parameters.pool }} == x"sonicbld-armhf" && x${{ parameters.arch }} == x"armhf" ]]; then
+        SLAVE_BASE_IMAGE=${SLAVE_DIR}
+        SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-armhf
+      elif [[ x${{ parameters.pool }} == x"sonicbld-arm64" && x${{ parameters.arch }} == x"arm64" ]]; then
+        SLAVE_BASE_IMAGE=${SLAVE_DIR}
+        SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-arm64
+      else
+        echo "do not support build ${{ parameters.arch }} on ${{ parameters.pool }}"
+        exit 1
+      fi
+
+      if [ x"$(Build.SourceBranchName)" == x"202012" ]; then
+        BUILD_OPTIONS = 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+      fi
+
+      tmpfile=$(mktemp)
+
+      echo ${{ parameters.arch }} > .arch
+
+      DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} $(BUILD_OPTIONS) make -f Makefile.work sonic-slave-build | tee $tmpfile
+      SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
+      SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
+
+      mkdir -p target
+
+      docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE_UPLOAD:latest
+      docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE_UPLOAD:$SLAVE_BASE_TAG
+      set +x
+      echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_IMAGE]$SLAVE_BASE_IMAGE_UPLOAD"
+      echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_TAG]$SLAVE_BASE_TAG"
+    env:
+      REGISTRY_SERVER: ${{ parameters.registry_url }}
+    displayName: Build sonic-slave-${{ parameters.dist }}-${{ parameters.arch }}
+
+  - task: Docker@2
+    displayName: Upload image
+    inputs:
+      containerRegistry: ${{ parameters.registry_conn }}
+      repository: $(VARIABLE_SLAVE_BASE_IMAGE)
+      command: push
+      tags: |
+        $(VARIABLE_SLAVE_BASE_TAG)
+        latest
diff --git a/.azure-pipelines/template-clean-sonic-slave.yml b/.azure-pipelines/template-clean-sonic-slave.yml
new file mode 100644
index 000000000000..cc995e9c2621
--- /dev/null
+++ b/.azure-pipelines/template-clean-sonic-slave.yml
@@ -0,0 +1,8 @@
+steps:
+- script: |
+    containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
+    [ -n "$containers" ] && docker container rm -f containers
+    docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
+    images=$(docker images 'sonic-slave-*' -a -q)
+    [ -n "$images" ] && docker rmi -f $images
+  displayName: 'Cleanup sonic slave'

From 615b0d8d1bf6910726c546e8dc516f166046624d Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 31 Mar 2022 12:40:19 +0800
Subject: [PATCH 1112/1674] [ci] Use template from master branch in
 UpgrateVersion/sonic-slave pipeline (#10380)

---
 .azure-pipelines/docker-sonic-slave-template.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
index 212b449abb18..a3d2d17dd00a 100644
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -3,6 +3,13 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 # Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
 
 parameters:
 - name: arch
@@ -38,7 +45,7 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - template: cleanup.yml
-  - template: template-clean-sonic-slave.yml
+  - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
   - checkout: self
     clean: true
     submodules: recursive

From 5b22cba8caec4e55c9c02d2f449497271f45d4c5 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 31 Mar 2022 13:07:46 +0800
Subject: [PATCH 1113/1674] [build] Fix issues found in reproducible build.
 (#10407)

---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 2 +-
 scripts/docker_version_control.sh                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index b60d46b2a26b..4e22ce4801c8 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -47,8 +47,8 @@ stages:
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
-      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       jobFilters: ${{ parameters.jobFilters }}
+      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} ENABLE_DOCKER_BASE_PULL=n SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       preSteps:
       - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
 - stage: UpgradeVersions
diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh
index da8cd0484f49..e94370d0e2d9 100755
--- a/scripts/docker_version_control.sh
+++ b/scripts/docker_version_control.sh
@@ -23,7 +23,7 @@ tag=`echo $image_tag | cut -f2 -d:`
 
 if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then
     # if docker image not in white list, exit
-    if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]];then
+    if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]];then
         exit 0
     fi
     if [ -f $version_file ];then
@@ -40,7 +40,7 @@ if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION
     sed -i "s/$oldimage/$newimage/" $DOCKERFILE
 else
     hash_value=`docker pull $image_tag 2> ${new_version_file}.log | grep Digest | awk '{print$2}'`
-    if [ -z hash_value ];then
+    if [ -z "$hash_value" ];then
         hash_value=unknown
     fi
 fi

From 1c24f2e9df5f73e45d7d4d9d7e602b01f5460439 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 31 Mar 2022 13:14:55 +0800
Subject: [PATCH 1114/1674] [ci] Add azure pipeline to build common libs.
 (#10367)

Why I did it
To remove reference on Azure.sonic-buildimage artifacts.
Azure.sonic-buildimage has a higher failure rate.
---
 .azure-pipelines/build-commonlib.yml    | 19 ++++++++++++++
 .azure-pipelines/template-commonlib.yml | 34 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 .azure-pipelines/build-commonlib.yml
 create mode 100644 .azure-pipelines/template-commonlib.yml

diff --git a/.azure-pipelines/build-commonlib.yml b/.azure-pipelines/build-commonlib.yml
new file mode 100644
index 000000000000..df9bcb25ae70
--- /dev/null
+++ b/.azure-pipelines/build-commonlib.yml
@@ -0,0 +1,19 @@
+pr: none
+trigger: none
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily build
+  branches:
+    include:
+      - master
+      - 202???
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
+
+jobs:
+- template: .azure-pipelines/template-commonlib.yml@buildimage
diff --git a/.azure-pipelines/template-commonlib.yml b/.azure-pipelines/template-commonlib.yml
new file mode 100644
index 000000000000..0e42cb4e17ac
--- /dev/null
+++ b/.azure-pipelines/template-commonlib.yml
@@ -0,0 +1,34 @@
+jobs:
+- job: Build
+  timeoutInMinutes: 120
+  pool: sonicbld
+  steps:
+  - checkout: self
+    clean: true
+    submodules: recursive
+  - script: |
+      set -ex
+      case $(Build.SourceBranchName) in
+        202012 | 202106)
+          bldenv=buster
+          ;;
+        *)
+          bldenv=bullseye
+          ;;
+      esac
+      BLDENV=$bldenv make -f Makefile.work configure PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
+      echo "##vso[task.setvariable variable=bldenv;]$bldenv"
+    displayName: Make configure
+  - script: |
+      set -ex
+      LIBNL3_VERSION_BASE=$(grep "LIBNL3_VERSION_BASE =" rules/libnl3.mk | awk '{print$3}')
+      LIBNL3_VERSION=$(grep "LIBNL3_VERSION =" rules/libnl3.mk | awk '{print$3}' | sed -e "s/(//" -e "s/)//" -e "s/\\$//" -e "s/LIBNL3_VERSION_BASE/$LIBNL3_VERSION_BASE/")
+      BLDENV=$(bldenv) make -f Makefile.work target/debs/$(bldenv)/libnl-3-200_${LIBNL3_VERSION}_amd64.deb ENABLE_DOCKER_BASE_PULL=y
+
+      LIBYANG_VERSION_BASE=$(grep "LIBYANG_VERSION_BASE =" rules/libyang.mk | awk '{print$3}')
+      LIBYANG_VERSION=$(grep "LIBYANG_VERSION =" rules/libyang.mk | awk '{print$3}' | sed -e "s/\\$//" -e "s/(//" -e "s/)//" -e "s/LIBYANG_VERSION_BASE/$LIBYANG_VERSION_BASE/")
+      BLDENV=$(bldenv) make -f Makefile.work target/debs/$(bldenv)/libyang_${LIBYANG_VERSION}_amd64.deb
+      find target -name *.deb | xargs -i cp {} $(Build.ArtifactStagingDirectory)
+    displayName: Make common lib packages
+  - publish: $(Build.ArtifactStagingDirectory)
+    artifact: common-lib

From c4c0cac35bf436e889efcb587dc1f1a779c3575f Mon Sep 17 00:00:00 2001
From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:04:05 +0300
Subject: [PATCH 1115/1674] [202012][submodule] Update sonic-swss pointer
 (#10416)

Update submodule pointer to get the following:
08675c5 2022-03-31 Enable CoPP UT (#2176)

Signed-off-by: Noa Or <noaor@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index fca407a02c9b..08675c5d1642 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit fca407a02c9bcd283badf8544434a85104010222
+Subproject commit 08675c5d1642b77e108461e11af8d6bb3792b2e5

From c5c047ac3cc2fa6de1398de08504c85dbeceea8c Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 31 Mar 2022 23:10:53 +0800
Subject: [PATCH 1116/1674] [202012] [submodule] Update sonic-utilities
 submodule  (#10393)

Include fix of "Stop PMON before stopping BGP while doing warmboot/fastboot"

4f1400f [202012] Stop PMON before stopping BGP while doing warmboot/fastboot (Azure/sonic-utilities#2101)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 582d7403b667..4f1400f40958 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 582d7403b667f0884c1788bb1d183c51824c5565
+Subproject commit 4f1400f409581ae90b1a985f6ebe9b50a8760e79

From bd637604577aba8806101856bade189f8f9ee106 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 31 Mar 2022 12:54:35 -0700
Subject: [PATCH 1117/1674] [202012][sonic-platform-daemons] submodule update
 (#10392)

Signed-off-by: vaibhav-dahiya vdahiya@microsoft.com
This PR updates the following commits in sonic-platform-daemons

af39d75 [ycable] fix the logic to update cable_info values when ycable is not present; fix read side logic for ycable (#249)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 4dc2d0a6a311..af39d75810c4 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 4dc2d0a6a3112246d9e0ffe60949fa1bb007367f
+Subproject commit af39d75810c4759431bb8ed9e447956e78cbd34a

From f7596844b77d0de74a465a9ce65d0e78c3decb62 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Sat, 2 Apr 2022 09:34:19 +0800
Subject: [PATCH 1118/1674] Update cisco-8000 ref to release: 202012-v0.96
 (#10443)

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 3f0c08a5f1c9..3b3ab7034fce 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.95
+ref=202012-v0.96

From 8c2e04690ee517561b968aea4b516abcdb2527cc Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 2 Apr 2022 14:08:28 -0700
Subject: [PATCH 1119/1674] Revert "DellEMC: Z9332f - Component API Fixes
 (#10187)"

This reverts commit 8a38da94d55fc0dfcb14f62b9913377fe6cf2ccb.
---
 .../common/ipmihelper.py                      |  5 +--
 .../common/onie_stage_fwpkg                   |  2 +-
 .../common/sonic_platform/hwaccess.py         |  5 +--
 .../z9332f/sonic_platform/component.py        | 38 ++++---------------
 4 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
index 3908f90bdad4..d95329c40de2 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -90,10 +90,7 @@ def get_twos_complement(val, bits):
         R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
         B_exp = get_twos_complement(factors[6] & 0x0F, 4)
 
-        if R_exp < 0:
-            converted_reading = ((M * raw_value) + (B * 10**B_exp)) / 10**(-R_exp)
-        else:
-            converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
+        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
 
         return True, converted_reading
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
index dcc74a09a91e..1ceaf32fe8c1 100755
--- a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
+++ b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
@@ -45,7 +45,7 @@ function show_help_and_exit()
     echo " "
     echo "    Available options:"
     echo "        -h, -? : getting this help"
-    echo "        -a [fwpkg]    : stages the firmware update package"
+    echo "        -o [fwpkg]    : stages the firmware update package"
 
     exit 0
 }
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
index 642a6ddc6fc8..373f71bdd5bf 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
@@ -39,10 +39,7 @@ def pci_set_value(resource, val, offset):
 # Read I2C device
 
 def i2c_get(bus, i2caddr, ofs):
-    try:
-        return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        return -1
+    return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
 
 def io_reg_read(io_resource, offset):
     fd = os.open(io_resource, os.O_RDONLY)
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index 306749270d26..c308ed291903 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -23,36 +23,20 @@
 
 
 def get_bios_version():
-    try:
-        return subprocess.check_output(['dmidecode', '-s', 'bios-version'],
-                                       text=True).strip()
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        return 'NA'
+    return subprocess.check_output(
+        ['dmidecode', '-s', 'bios-version']).decode('utf-8').strip()
 
 def get_fpga_version():
     val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:09:00.0/resource0', 0)
     return '{}.{}'.format((val >> 16) & 0xffff, val & 0xffff)
 
 def get_bmc_version():
-    val = 'NA'
-    try:
-        bmc_ver = subprocess.check_output(['ipmitool', 'mc', 'info'],
-                                          stderr=subprocess.STDOUT, text=True)
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        pass
-    else:
-        version = re.search(r'Firmware Revision\s*:\s(.*)', bmc_ver)
-        if version:
-            val = version.group(1).strip()
-
-    return val
+    return subprocess.check_output(
+        ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
+        ).decode('utf-8').strip()
 
 def get_cpld_version(bus, i2caddr):
-    val = hwaccess.i2c_get(bus, i2caddr, 0)
-    if val != -1:
-        return '{:x}.{:x}'.format((val >> 4) & 0xf, val & 0xf)
-    else:
-        return 'NA'
+    return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
 
 def get_cpld0_version():
     return get_cpld_version(5, 0x0d)
@@ -83,7 +67,7 @@ def get_pciephy_version():
     except Exception:
         return val
     else:
-        version = re.search(r'PCIe FW version:\s(.*)', pcie_ver)
+        version = re.search(r'PCIe FW loader version:\s(.*)', pcie_ver)
         if version:
             val = version.group(1).strip()
 
@@ -172,14 +156,6 @@ def _get_available_firmware_version(image_path):
 
             ver_info = ver_info.get("x86_64-dellemc_z9332f_d1508-r0")
             if ver_info:
-                components = list(ver_info.keys())
-                for component in components:
-                    if "CPLD" in component and ver_info[component].get('version'):
-                        val = ver_info.pop(component)
-                        ver = int(val['version'], 16)
-                        val['version'] = "{:x}.{:x}".format((ver >> 4) & 0xf, ver & 0xf)
-                        ver_info[component.replace("-", " ")] = val
-
                 return True, ver_info
             else:
                 return False, "ERROR: Version info not available"

From a081d04807162cb94eb741952dc689b12ed394a6 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 1 Apr 2022 01:22:54 -0700
Subject: [PATCH 1120/1674] [azp]: Fix type in slave container cleanup (#10424)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 .azure-pipelines/template-clean-sonic-slave.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/template-clean-sonic-slave.yml b/.azure-pipelines/template-clean-sonic-slave.yml
index cc995e9c2621..c67f63fff476 100644
--- a/.azure-pipelines/template-clean-sonic-slave.yml
+++ b/.azure-pipelines/template-clean-sonic-slave.yml
@@ -1,7 +1,7 @@
 steps:
 - script: |
     containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
-    [ -n "$containers" ] && docker container rm -f containers
+    [ -n "$containers" ] && docker container rm -f $containers
     docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
     images=$(docker images 'sonic-slave-*' -a -q)
     [ -n "$images" ] && docker rmi -f $images

From 01acd72314f7d307d638d64dab5959dae8488e18 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Sun, 3 Apr 2022 14:42:41 -0400
Subject: [PATCH 1121/1674] Update kernel submodule (#10411)

Update sonic-linux-kernel submodule to updated 202012 branch. This brings in the following commits....

```
e97f9fc [202012] Add upstreamed patches which backport support for registers for CPLD PNs (#275)
58abcdc Merge pull request #267 from Staphylo/202012-log-buf-len
3f16f4f Merge pull request #268 from Staphylo/202012-emmc-fixes
a120ae7 Apply kernel patches to fix emmc unreliability
5f4a3f3 Increase log_buf_len to 1M for all architecture
```
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 15e6f4b0a0ba..e97f9fc797b0 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 15e6f4b0a0bad2c989acb1acea8527188a67fb7a
+Subproject commit e97f9fc797b03bbcc94d0a28dc2fe538554691f6

From 35b630655b8d84a3431946267110b65f94d96782 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Tue, 5 Apr 2022 14:09:14 -0700
Subject: [PATCH 1122/1674] [202012][sonic-sairedis] Update submodule (#10460)

---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 5f37d74d0c49..1fcc93f46a1d 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 5f37d74d0c4960d5ffa80a8597e6f6ebfc2d9753
+Subproject commit 1fcc93f46a1d606e566670a1f25e289de782f5fb

From 4f1b109ea0634435853af9cf0e9ccd648e346ef8 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Wed, 6 Apr 2022 08:51:45 +0300
Subject: [PATCH 1123/1674] [202012] [sonic-swss] update submodule pointer
 (#10456)

```
323dc34 [neighsyncd] increase neighsyncd timeout (#2209)
7f99941 Remove redundant and problematic code to skip "pool" field in buffer profile handling (#2197)
f3a0feb [Vxlanmgr] vnet netdev cleanup during config reload fix (#2191)
13ccaba Fix issue: sometimes PFC WD unable to create zero buffer pool (#2185)
```

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 08675c5d1642..323dc3433142 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 08675c5d1642b77e108461e11af8d6bb3792b2e5
+Subproject commit 323dc3433142f2b0d92c88db01eb293adda77cb7

From b68f4dd74c6ed2d4556f37038a6f565c372e584c Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 6 Apr 2022 09:46:08 -0700
Subject: [PATCH 1124/1674] Enable dhcp copp trap for EPMS and MgmtTsToR
 (#10439)

---
 files/image_config/copp/copp_cfg.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
index b7a83b312e07..3ae61c3b5e4c 100755
--- a/files/image_config/copp/copp_cfg.j2
+++ b/files/image_config/copp/copp_cfg.j2
@@ -81,7 +81,7 @@
 		    "trap_ids": "lldp",
 		    "trap_group": "queue4_group3"
 	    },
-{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != "ToRRouter") %}
+{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] is not in ["ToRRouter", "EPMS", "MgmtTsTor"]) %}
 	    "dhcp_relay": {
 		    "trap_ids": "dhcp,dhcpv6",
 		    "trap_group": "queue4_group3"

From 143dccf706db6f7435a46ce0cb527566e7ac0ca6 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Thu, 7 Apr 2022 10:42:32 +0300
Subject: [PATCH 1125/1674] [202012] [submodule] Advance sonic-platform-common
 pointer (#10481)

* 427f624 [ssd] Allow individual vendor parsers to handle errors (#252)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index eb35c857deed..427f624f05c8 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit eb35c857deedf0d14dcf5d8233f8358104b10566
+Subproject commit 427f624f05c8af8d49a11437d31c7631badca62e

From 2d21756c5a7e92570b4e992f50b1cbf023e67540 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Thu, 7 Apr 2022 10:43:18 +0300
Subject: [PATCH 1126/1674] [202012] [submodule] Advance sonic-utilities
 pointer (#10480)

* 3fc6e27 Fix issues in clear_qos (#2122)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 4f1400f40958..3fc6e273015a 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 4f1400f409581ae90b1a985f6ebe9b50a8760e79
+Subproject commit 3fc6e273015a814cc61d1ad2a65be3ad50fbcca2

From 0e6f1833e02088fde1034ee86d65cd1cdf9fcb1b Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 6 Apr 2022 09:44:21 -0700
Subject: [PATCH 1127/1674] Update docker-router-advertiser.supervisord.conf.j2
 (#10375)

---
 .../docker-router-advertiser.supervisord.conf.j2                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
index 7562444946ed..22f33e412195 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -45,7 +45,7 @@ dependent_startup_wait_for=rsyslogd:running
 {%- set vlan_v6 = namespace(count=0) -%}
 {%- if DEVICE_METADATA.localhost.deployment_id != "8" -%}
   {%- if DEVICE_METADATA.localhost.type -%}
-    {%- if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type == "EPMS" -%}
+    {%- if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type in ["EPMS", "MgmtTsToR"] -%}
       {%- if VLAN_INTERFACE -%}
         {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
           {# If this VLAN has an IPv6 address... #}

From 721a53b9a011e95cbdf022085db1ee754bfb69cd Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 7 Apr 2022 14:23:35 +0300
Subject: [PATCH 1128/1674] [scapy] update scapy to 2.4.5 and patch it (#10457)

Why I did it
Running warm-reboot in a loop for 500 times leads to this error on 318-th iteration:

Apr  2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors Traceback (most recent call last):
Apr  2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors   File "/usr/bin/restore_neighbors.py", line 24, in <module>
Apr  2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors     from scapy.all import conf, in6_getnsma, inet_pton, inet_ntop, in6_getnsmac, get_if_hwaddr, Ether, ARP, IPv6, ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr
Apr  2 15:56:27.346795 sonic INFO swss#/supervisord: restore_neighbors   File "/usr/local/lib/python3.7/dist-packages/scapy/all.py", line 25, in <module>
Apr  2 15:56:27.346956 sonic INFO swss#/supervisord: restore_neighbors     from scapy.route import *
Apr  2 15:56:27.346995 sonic INFO swss#/supervisord: restore_neighbors   File "/usr/local/lib/python3.7/dist-packages/scapy/route.py", line 205, in <module>
Apr  2 15:56:27.347089 sonic INFO swss#/supervisord: restore_neighbors     conf.iface = get_working_if()
Apr  2 15:56:27.347129 sonic INFO swss#/supervisord: restore_neighbors   File "/usr/local/lib/python3.7/dist-packages/scapy/arch/linux.py", line 128, in get_working_if
Apr  2 15:56:27.347213 sonic INFO swss#/supervisord: restore_neighbors     ifflags = struct.unpack("16xH14x", get_if(i, SIOCGIFFLAGS))[0]
Apr  2 15:56:27.347250 sonic INFO swss#/supervisord: restore_neighbors   File "/usr/local/lib/python3.7/dist-packages/scapy/arch/common.py", line 31, in get_if
Apr  2 15:56:27.347345 sonic INFO swss#/supervisord: restore_neighbors     return ioctl(sck, cmd, struct.pack("16s16x", iff.encode("utf8")))
Apr  2 15:56:27.347365 sonic INFO swss#/supervisord: restore_neighbors OSError: [Errno 19] No such device
The issue was reported to scapy devs secdev/scapy#3369, the fix is secdev/scapy#3371, however there is no released scapy version with this fix right now, thus decided to build scapy v2.4.5 from sources and apply the fix in a form of a patch.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 .gitmodules                                   |  3 ++
 dockers/docker-orchagent/Dockerfile.j2        |  9 +++-
 rules/docker-orchagent.mk                     |  1 +
 rules/scapy.dep                               | 10 +++++
 rules/scapy.mk                                |  7 ++++
 src/scapy                                     |  1 +
 ...ng-generation-when-scapy-is-a-submod.patch | 27 ++++++++++++
 ...f-the-network-interface-still-exists.patch | 42 +++++++++++++++++++
 src/scapy.patch/series                        |  2 +
 9 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 rules/scapy.dep
 create mode 100644 rules/scapy.mk
 create mode 160000 src/scapy
 create mode 100644 src/scapy.patch/0001-Fix-version-string-generation-when-scapy-is-a-submod.patch
 create mode 100644 src/scapy.patch/0002-Check-if-the-network-interface-still-exists.patch
 create mode 100644 src/scapy.patch/series

diff --git a/.gitmodules b/.gitmodules
index 5bad36e731a8..dd4d89d90b19 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,6 +61,9 @@
 [submodule "src/redis-dump-load"]
 	path = src/redis-dump-load
 	url = https://github.com/p/redis-dump-load.git
+[submodule "src/scapy"]
+	path = src/scapy
+	url = https://github.com/secdev/scapy.git
 [submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
 	path = platform/mellanox/mlnx-sai/SAI-Implementation
 	url = https://github.com/Mellanox/SAI-Implementation
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index ef6273ca17a4..5734d3fd18fb 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -39,7 +39,6 @@ RUN ln -s -f /usr/bin/gcc-8 /usr/bin/aarch64-linux-gnu-gcc
 
 # Dependencies of restore_neighbors.py
 RUN pip3 install \
-         scapy==2.4.4 \
          pyroute2==0.5.14 \
          netifaces==0.10.9
 
@@ -56,6 +55,14 @@ RUN apt-get remove -y gcc-8
 {{ install_debian_packages(docker_orchagent_debs.split(' ')) }}
 {%- endif %}
 
+{% if docker_orchagent_whls.strip() -%}
+# Copy locally-built Python wheel dependencies
+{{ copy_files("python-wheels/", docker_orchagent_whls.split(' '), "/python-wheels/") }}
+
+# Install locally-built Python wheel dependencies
+{{ install_python_wheels(docker_orchagent_whls.split(' ')) }}
+{% endif %}
+
 # Clean up
 RUN apt-get purge -y          \
         build-essential       \
diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk
index a5e5823957ab..28aaa5672d5f 100644
--- a/rules/docker-orchagent.mk
+++ b/rules/docker-orchagent.mk
@@ -10,6 +10,7 @@ $(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
 $(DOCKER_ORCHAGENT)_DBG_DEPENDS +=   $(SWSS_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
                                 $(LIBSAIREDIS_DBG)
+$(DOCKER_ORCHAGENT)_PYTHON_WHEELS += $(SCAPY)
 
 $(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/rules/scapy.dep b/rules/scapy.dep
new file mode 100644
index 000000000000..ef09fb12223b
--- /dev/null
+++ b/rules/scapy.dep
@@ -0,0 +1,10 @@
+SPATH       := $($(SCAPY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/scapy.mk rules/scapy.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files -- ':!:doc/*'))
+
+$(SCAPY)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SCAPY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SCAPY)_DEP_FILES   := $(DEP_FILES)
+$(SCAPY)_SMDEP_FILES := $(SMDEP_FILES)
+$(SCAPY)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/scapy.mk b/rules/scapy.mk
new file mode 100644
index 000000000000..6953c1ef10e2
--- /dev/null
+++ b/rules/scapy.mk
@@ -0,0 +1,7 @@
+# scapy python3 wheel
+
+SCAPY = scapy-2.4.5-py2.py3-none-any.whl
+$(SCAPY)_SRC_PATH = $(SRC_PATH)/scapy
+$(SCAPY)_PYTHON_VERSION = 3
+$(SCAPY)_TEST = n
+SONIC_PYTHON_WHEELS += $(SCAPY)
diff --git a/src/scapy b/src/scapy
new file mode 160000
index 000000000000..8b63d73a1726
--- /dev/null
+++ b/src/scapy
@@ -0,0 +1 @@
+Subproject commit 8b63d73a17266bae2a61513ea97ded5283a7ccd3
diff --git a/src/scapy.patch/0001-Fix-version-string-generation-when-scapy-is-a-submod.patch b/src/scapy.patch/0001-Fix-version-string-generation-when-scapy-is-a-submod.patch
new file mode 100644
index 000000000000..37f5253db0cc
--- /dev/null
+++ b/src/scapy.patch/0001-Fix-version-string-generation-when-scapy-is-a-submod.patch
@@ -0,0 +1,27 @@
+From 988c808af6065b740006aef0e94496821d41fb98 Mon Sep 17 00:00:00 2001
+From: Stepan Blyschak <stepanb@nvidia.com>
+Date: Mon, 4 Apr 2022 09:57:39 +0000
+Subject: [PATCH] Fix version string generation when scapy is a submodule
+
+Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
+---
+ scapy/__init__.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/scapy/__init__.py b/scapy/__init__.py
+index f920151e..2adbea19 100644
+--- a/scapy/__init__.py
++++ b/scapy/__init__.py
+@@ -42,9 +42,6 @@ def _version_from_git_describe():
+     :raises CalledProcessError: if git is unavailable
+     :return: Scapy's latest tag
+     """
+-    if not os.path.isdir(os.path.join(os.path.dirname(_SCAPY_PKG_DIR), '.git')):  # noqa: E501
+-        raise ValueError('not in scapy git repo')
+-
+     def _git(cmd):
+         # type: (str) -> str
+         process = subprocess.Popen(
+-- 
+2.14.1
+
diff --git a/src/scapy.patch/0002-Check-if-the-network-interface-still-exists.patch b/src/scapy.patch/0002-Check-if-the-network-interface-still-exists.patch
new file mode 100644
index 000000000000..c42c12e1a8aa
--- /dev/null
+++ b/src/scapy.patch/0002-Check-if-the-network-interface-still-exists.patch
@@ -0,0 +1,42 @@
+From 7ffd8101c1e535f9c3225db2c319958a64412686 Mon Sep 17 00:00:00 2001
+From: Guillaume Valadon <guillaume@valadon.net>
+Date: Tue, 14 Sep 2021 19:34:43 +0200
+Subject: [PATCH] Check if the network interface still exists
+
+Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
+---
+ scapy/arch/linux.py | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/scapy/arch/linux.py b/scapy/arch/linux.py
+index 94fac8f0..b86e98ab 100644
+--- a/scapy/arch/linux.py
++++ b/scapy/arch/linux.py
+@@ -414,13 +414,17 @@ class LinuxInterfaceProvider(InterfaceProvider):
+         data = {}
+         ips = in6_getifaddr()
+         for i in _get_if_list():
+-            ifflags = struct.unpack("16xH14x", get_if(i, SIOCGIFFLAGS))[0]
+-            index = get_if_index(i)
+-            mac = scapy.utils.str2mac(
+-                get_if_raw_hwaddr(i, siocgifhwaddr=SIOCGIFHWADDR)[1]
+-            )
+-            ip = None  # type: Optional[str]
+-            ip = inet_ntop(socket.AF_INET, get_if_raw_addr(i))
++            try:
++                ifflags = struct.unpack("16xH14x", get_if(i, SIOCGIFFLAGS))[0]
++                index = get_if_index(i)
++                mac = scapy.utils.str2mac(
++                    get_if_raw_hwaddr(i, siocgifhwaddr=SIOCGIFHWADDR)[1]
++                )
++                ip = None  # type: Optional[str]
++                ip = inet_ntop(socket.AF_INET, get_if_raw_addr(i))
++            except IOError:
++                warning("Interface %s does not exist!", i)
++                continue
+             if ip == "0.0.0.0":
+                 ip = None
+             ifflags = FlagValue(ifflags, _iff_flags)
+-- 
+2.14.1
+
diff --git a/src/scapy.patch/series b/src/scapy.patch/series
new file mode 100644
index 000000000000..d64f20f136c1
--- /dev/null
+++ b/src/scapy.patch/series
@@ -0,0 +1,2 @@
+0001-Fix-version-string-generation-when-scapy-is-a-submod.patch
+0002-Check-if-the-network-interface-still-exists.patch

From f4bbcd1cf106f5e19c2eb69bdaaa8cfc13937b47 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Sat, 2 Apr 2022 07:48:44 +0800
Subject: [PATCH 1129/1674] [ci] Set default ACR in UpgrateVersion/PR/official
 pipeline. (#10341)

Why I did it
docker hub will limit the pull rate.
Use ACR instead to pull debian related docker image.

How I did it
Set DEFAULT_CONTAINER_REGISTRY in pipeline.
---
 .../azure-pipelines-UpgrateVersion.yml             |  7 +++++--
 .azure-pipelines/docker-sonic-slave-template.yml   |  5 ++++-
 .azure-pipelines/official-build.yml                | 11 +++++++++++
 .azure-pipelines/template-clean-sonic-slave.yml    |  4 +++-
 .azure-pipelines/template-variables.yml            |  2 ++
 azure-pipelines.yml                                | 14 ++++++++++++++
 6 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .azure-pipelines/template-variables.yml

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 4e22ce4801c8..b36cc3513aa6 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -42,8 +42,11 @@ parameters:
 stages:
 - stage: Build
   variables:
-    CACHE_MODE: none
-    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - name: CACHE_MODE
+      value: none
+    - name: VERSION_CONTROL_OPTIONS
+      value: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - template: .azure-pipelines/template-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
index a3d2d17dd00a..24b16bd64be6 100644
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -45,7 +45,10 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - template: cleanup.yml
-  - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
+  - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    - template: template-clean-sonic-slave.yml
+  - ${{ else }}:
+    - template: .azure-pipelines/template-variables.yml@buildimage
   - checkout: self
     clean: true
     submodules: recursive
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index bcda8f210c75..6282a463ea6e 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -12,9 +12,20 @@ schedules:
     - 202012
   always: true
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
+
 trigger: none
 pr: none
 
+variables:
+- template: .azure-pipelines/template-variables.yml@buildimage
+
 stages:
 - stage: Build
   pool: sonicbld
diff --git a/.azure-pipelines/template-clean-sonic-slave.yml b/.azure-pipelines/template-clean-sonic-slave.yml
index c67f63fff476..ddb8c8e48f6a 100644
--- a/.azure-pipelines/template-clean-sonic-slave.yml
+++ b/.azure-pipelines/template-clean-sonic-slave.yml
@@ -1,8 +1,10 @@
 steps:
 - script: |
-    containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
+    set -x
+    containers=$(docker container ls -aq)
     [ -n "$containers" ] && docker container rm -f $containers
     docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
     images=$(docker images 'sonic-slave-*' -a -q)
     [ -n "$images" ] && docker rmi -f $images
+    exit 0
   displayName: 'Cleanup sonic slave'
diff --git a/.azure-pipelines/template-variables.yml b/.azure-pipelines/template-variables.yml
new file mode 100644
index 000000000000..f28768e39efe
--- /dev/null
+++ b/.azure-pipelines/template-variables.yml
@@ -0,0 +1,2 @@
+variables:
+  DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 09220c195e57..476878c8160b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,20 @@ resources:
     type: github
     name: Azure/sonic-mgmt
     endpoint: build
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    endpoint: build
+    ref: master
+
+variables:
+- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - template: .azure-pipelines/template-variables.yml
+- ${{ else }}:
+  - template: .azure-pipelines/template-variables.yml@buildimage
+- name: CACHE_MODE
+  value: rcache 
 
 stages:
 - stage: BuildVS

From 1b42dbfdd284b2a3234af03653c36c8ed8a1097e Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Fri, 8 Apr 2022 17:56:59 +0800
Subject: [PATCH 1130/1674] [submodule] [202012] Advance sonic-platform-common
 pointer (#10502)

Update sonic-platform-common submodule to pick up new commits:

cd623fa [202012] Backport Enhance ssd_generic with more error handling to avoid python crash (#273)
e9a4a81 [y_cable][Broadcom] update the BRCM y_cable driver to release 2.0 (#263)
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 427f624f05c8..cd623fa665d9 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 427f624f05c8af8d49a11437d31c7631badca62e
+Subproject commit cd623fa665d9bceb565da6738b1625585148c61e

From e0fa07307ad0c2e22b348d40eb9fc87e3de679c3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 10 Apr 2022 17:00:00 +0800
Subject: [PATCH 1131/1674] [ci/build]: Upgrade SONiC package versions (#10395)

[ci/build]: Upgrade SONiC package versions (#10395)
---
 .../build-sonic-slave-buster/versions-git     |  4 +-
 .../build-sonic-slave-buster/versions-py2     |  2 +-
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../build-sonic-slave-stretch/versions-py2    |  2 +-
 files/build/versions/default/versions-docker  | 53 ++---------
 files/build/versions/default/versions-git     |  6 +-
 .../versions-deb-buster                       |  1 -
 .../versions-deb-buster-arm64                 |  3 +-
 .../versions-deb-buster-armhf                 |  3 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../docker-config-engine-stretch/versions-py2 |  2 +-
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   |  6 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 10 +-
 .../docker-sonic-vs/versions-deb-buster       |  1 -
 .../docker-syncd-brcm/versions-deb-buster     |  3 +-
 .../sonic-slave-buster/versions-deb-buster    | 95 ++++++++++---------
 .../versions-deb-buster-arm64                 | 40 +-------
 .../versions-deb-buster-armhf                 | 38 --------
 .../dockers/sonic-slave-buster/versions-git   |  2 +
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../sonic-slave-buster/versions-py3-all-arm64 |  1 -
 .../sonic-slave-buster/versions-py3-all-armhf |  1 -
 .../sonic-slave-stretch/versions-deb-stretch  | 13 +--
 .../dockers/sonic-slave-stretch/versions-git  |  2 +
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  3 +-
 files/build/versions/host-image/versions-py2  |  2 +-
 files/build/versions/host-image/versions-py3  |  4 +-
 29 files changed, 104 insertions(+), 205 deletions(-)
 create mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
 create mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 4ff4a4db0288..7fe9d319830c 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -5,10 +5,10 @@ https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==b7256d3da8d7f63b9f0839fe0323da53860ac8a8
+https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
-https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
+https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index fbecb5ee6c10..282fc1c8a060 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -6,7 +6,7 @@ importlib-resources==3.3.1
 jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 09b066cb1ecd..2d4d1b70a8ce 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -12,6 +12,6 @@ psutil==5.9.0
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.9
-websocket-client==1.3.1
+websocket-client==1.3.2
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index 37ea010b1827..b79fd56fa0fa 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -5,7 +5,7 @@ importlib-resources==3.3.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.6.0
 redis==3.5.3
 sairedis==1.0
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 3ca6c18c6ab6..ebd285c7058f 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,43 +1,10 @@
-amd64:amd64/debian:buster==sha256:e82e10f0b9560e5947a16eb28c2992ec03121fc8c9659bce0cc94c5b7b6178c9
-amd64:amd64/debian:stretch==sha256:9c527f568723af8154327099fd05ac8d4ca5cfe64989788a27a6d7467f663c34
-amd64:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
-amd64:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
-amd64:docker-base-buster==
-amd64:docker-base-stretch==
-amd64:docker-config-engine-buster==
-amd64:docker-config-engine-stretch==
-amd64:docker-database==
-amd64:docker-dhcp-relay==
-amd64:docker-fpm-frr==
-amd64:docker-gbsyncd-vs==
-amd64:docker-lldp==
-amd64:docker-mux==
-amd64:docker-nat==
-amd64:docker-orchagent==
-amd64:docker-platform-monitor==
-amd64:docker-router-advertiser==
-amd64:docker-sflow==
-amd64:docker-snmp==
-amd64:docker-sonic-mgmt-framework==
-amd64:docker-sonic-telemetry==
-amd64:docker-swss-layer-buster==
-amd64:docker-syncd-bfn==
-amd64:docker-syncd-brcm==
-amd64:docker-syncd-centec==
-amd64:docker-syncd-invm==
-amd64:docker-syncd-mlnx==
-amd64:docker-syncd-nephos==
-amd64:docker-syncd-vs==
-amd64:docker-teamd==
-arm64:arm64v8/debian:buster==sha256:272ea3972e872b8f689a9b9906bb3de9a070a1d85ad1635fedd91ddc18177be0
-arm64:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
-arm64:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
-arm64:docker-base-buster==
-arm64:docker-config-engine-buster==
-arm64:docker-swss-layer-buster==
-armhf:arm32v7/debian:buster==sha256:fd44803ead0f35dc61f44c38b7df153b16eb933f86fd0b83d775cffe332a6b54
-armhf:debian:buster==sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca
-armhf:debian:stretch==sha256:46b9515d5b9080939a3deb88f063a3966d23bac350affdd30520f09ec678deee
-armhf:docker-base-buster==
-armhf:docker-config-engine-buster==
-armhf:docker-swss-layer-buster==
\ No newline at end of file
+amd64:amd64/debian:buster==sha256:96cabb5c2fe5309bf5d477ba3e83ba9b716c8bdbf97f3a26817b6a4a8da59a4a
+amd64:amd64/debian:stretch==sha256:54ae51f9db21d4e8d71f2a234fd0180d10dc7c78b76256002d30be3f07453ab9
+amd64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
+amd64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
+arm64:arm64v8/debian:buster==sha256:a6b19c21082133146302e33c31b8aca9c313044b6cfe3dda041867fcd9d86fd9
+arm64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
+arm64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
+armhf:arm32v7/debian:buster==sha256:2aa990397ec8d077cf5bc38ab05991dedb512f334a42366c167e1a5571ffdea1
+armhf:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
+armhf:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b5cd63544ad8..7b22e79f11ba 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==01a4536ff80f24ef7cfc5b7f9f67938b1e8fc2bd
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
 https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
 https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -11,10 +11,10 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==b7256d3da8d7f63b9f0839fe0323da53860ac8a8
+https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
-https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7
+https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 94b5fbe2df9f..12d8dd999191 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -16,7 +16,6 @@ libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libc-dev-bin==2.28-10+deb10u1
-libc6==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.7
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index de9abb8d5a9c..5e4703193f07 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -8,4 +8,5 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u1
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index efcbc0790509..5e077944e023 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -8,4 +8,5 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u1
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index f4035c87f120..245b95995f1f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -3,7 +3,7 @@ ipaddress==1.0.23
 lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index c0701b494002..80bc32c71a81 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -7,7 +7,7 @@ lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.6.0
 pyyaml==5.4.1
 redis==3.5.3
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 22f3c0cbcebf..182150dddcab 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -12,7 +12,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.6.0
 python-sdk-api==4.5.1208
 pyyaml==5.4.1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 27953a57b1f1..551b9e4b34a0 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -72,7 +72,7 @@ libffi-dev==3.2.1-6
 libffi6==3.2.1-6
 libfile-fcntllock-perl==0.22-3+b2
 libfribidi0==0.19.7-1+deb9u1
-libgc1c2==1:7.4.2-8
+libgc1c2==1:7.4.2-8+deb9u1
 libgcc-6-dev==6.3.0-18+deb9u1
 libgdbm3==1.8.3-14
 libglib2.0-0==2.50.3-2+deb9u2
@@ -227,6 +227,7 @@ tcpdump==4.9.3-1~deb9u2
 telnet==0.17-41
 tmux==2.3-4
 traceroute==1:2.1.0-2
+tzdata==2021a-0+deb9u3
 ucf==3.0036
 unzip==6.0-21+deb9u2
 vim==2:8.0.0197-4+deb9u5
@@ -237,4 +238,5 @@ xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
 xxd==2:8.0.0197-4+deb9u5
-xz-utils==5.2.2-1.2+b1
\ No newline at end of file
+xz-utils==5.2.2-1.2+b1
+zlib1g==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index ea1f92f36afe..9b455c1cc55c 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,10 +1,10 @@
 attrs==21.4.0
 certifi==2017.4.17
 charset-normalizer==2.0.12
-click==8.0.4
+click==8.1.2
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.0.3
+flask==2.1.1
 grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
@@ -15,12 +15,12 @@ itsdangerous==2.1.2
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==3.19.4
+protobuf==3.20.0
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
 typing_extensions==4.1.1
 urllib3==1.26.5
-werkzeug==2.0.3
-zipp==3.7.0
\ No newline at end of file
+werkzeug==2.1.1
+zipp==3.8.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 990d3dd84938..da56959c725f 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -55,7 +55,6 @@ libfreetype6==2.9.1-3+deb10u2
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
-libgmp10==2:6.1.2+dfsg-4+deb10u1
 libgomp1==8.3.0-6
 libicu63==63.1-6+deb10u3
 libip4tc0==1.8.2-4
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 8f5351ac5535..77b47b9b16a5 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -33,4 +33,5 @@ syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u1
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index e7dc040419c1..cc47a2f6ce2e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.4.13-1
+containerd.io==1.5.11-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -182,7 +182,7 @@ hicolor-icon-theme==0.17-2
 i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
 icc-profiles-free==2.0.1+dfsg-1
-icu-devtools==63.1-6+deb10u2
+icu-devtools==63.1-6+deb10u3
 imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
 imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
 imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
@@ -327,13 +327,13 @@ libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u1
 libc-ares-dev==1.14.0-1+deb10u1
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10
-libc6-dbg==2.28-10
-libc6-dev==2.28-10
-libc6-dev-i386==2.28-10
-libc6-dev-x32==2.28-10
-libc6-i386==2.28-10
-libc6-x32==2.28-10
+libc-dev-bin==2.28-10+deb10u1
+libc6-dbg==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
+libc6-dev-i386==2.28-10+deb10u1
+libc6-dev-x32==2.28-10+deb10u1
+libc6-i386==2.28-10+deb10u1
+libc6-x32==2.28-10+deb10u1
 libcaca0==0.99.beta19-2.1
 libcacard0==1:2.6.1-1
 libcaf-openmpi-3==2.4.0-2
@@ -395,9 +395,9 @@ libconvert-binhex-perl==1.125-1
 libcroco3==0.6.12-3
 libcryptsetup12==2:2.1.0-5+deb10u2
 libcrystalhd3==1:0.0~git20110715.fdd2f19-13
-libcups2==2.2.10-6+deb10u4
+libcups2==2.2.10-6+deb10u5
 libcupsfilters1==1.21.6-5
-libcupsimage2==2.2.10-6+deb10u4
+libcupsimage2==2.2.10-6+deb10u5
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl3-nss==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
@@ -495,7 +495,7 @@ libfile-stripnondeterminism-perl==1.1.2-1
 libfile-which-perl==1.23-1
 libfl-dev==2.6.4-6.2
 libfl2==2.6.4-6.2
-libflac8==1.3.2-3
+libflac8==1.3.2-3+deb10u1
 libflite1==2.1-release-3
 libfont-afm-perl==1.20-2
 libfontbox2-java==2.0.13-2
@@ -551,8 +551,8 @@ libglvnd0==1.1.0-1
 libglx-mesa0==18.3.6-2+deb10u1
 libglx0==1.1.0-1
 libgme0==0.6.2-1
-libgmp-dev==2:6.1.2+dfsg-4
-libgmpxx4ldbl==2:6.1.2+dfsg-4
+libgmp-dev==2:6.1.2+dfsg-4+deb10u1
+libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
 libgnutls-dane0==3.6.7-4+deb10u7
 libgnutls-openssl27==3.6.7-4+deb10u7
 libgnutls28-dev==3.6.7-4+deb10u7
@@ -612,8 +612,8 @@ libibverbs-dev==22.1-1
 libibverbs1==22.1-1
 libice-dev==2:1.0.9-2
 libice6==2:1.0.9-2
-libicu-dev==63.1-6+deb10u2
-libicu63==63.1-6+deb10u2
+libicu-dev==63.1-6+deb10u3
+libicu63==63.1-6+deb10u3
 libidn11==1.33-2.2
 libidn2-dev==2.0.5-1+deb10u1
 libiec61883-0==1.2.0-3
@@ -660,7 +660,7 @@ libjansson4==2.12-1
 libjaxen-java==1.1.6-4
 libjaxp1.3-java==1.3.05-5
 libjbig0==2.1-3.1+b2
-libjbig2dec0==0.16-1
+libjbig2dec0==0.16-1+deb10u1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
 libjetty9-java==9.4.16-0+deb10u1
@@ -716,7 +716,7 @@ liblockfile-bin==1.14-1.1
 liblockfile1==1.14-1.1
 liblog-any-adapter-screen-perl==0.140-1
 liblog-any-perl==1.707-1
-liblog4j1.2-java==1.2.17-8+deb10u1
+liblog4j1.2-java==1.2.17-8+deb10u2
 liblognorm5==2.0.5-1
 liblqr-1-0==0.4.2-2.1
 liblsan0==8.3.0-6
@@ -738,9 +738,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.31-0+deb10u1
-libmariadb-dev-compat==1:10.3.31-0+deb10u1
-libmariadb3==1:10.3.31-0+deb10u1
+libmariadb-dev==1:10.3.34-0+deb10u1
+libmariadb-dev-compat==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.34-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -865,9 +865,9 @@ libparse-debianchangelog-perl==1.2.0-13
 libpath-iterator-rule-perl==1.014-1
 libpath-tiny-perl==0.108-1
 libpathplan4==2.40.1-6+deb10u1
-libpcap-dev==1.8.1-6
-libpcap0.8==1.8.1-6
-libpcap0.8-dev==1.8.1-6
+libpcap-dev==1.8.1-6+deb10u1
+libpcap0.8==1.8.1-6+deb10u1
+libpcap0.8-dev==1.8.1-6+deb10u1
 libpci-dev==1:3.5.2-1
 libpci3==1:3.5.2-1
 libpciaccess0==0.14-1
@@ -1055,8 +1055,8 @@ libsqlite3-0==3.27.2-3+deb10u1
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1d-0+deb10u7
-libssl1.1==1.1.1d-0+deb10u7
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1163,7 +1163,7 @@ libwagon-file-java==3.3.1-2
 libwagon-http-shaded-java==3.3.1-2
 libwagon-provider-api-java==3.3.1-2
 libwant-perl==0.29-1+b4
-libwavpack1==5.1.0-6
+libwavpack1==5.1.0-6+deb10u1
 libwayland-bin==1.16.0-1
 libwayland-client0==1.16.0-1
 libwayland-cursor0==1.16.0-1
@@ -1276,9 +1276,9 @@ libxml-sax-perl==1.00+dfsg-1
 libxml-simple-perl==2.25-1
 libxml-twig-perl==1:3.50-1.1
 libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u2
-libxml2-dev==2.9.4+dfsg1-7+deb10u2
-libxml2-utils==2.9.4+dfsg1-7+deb10u2
+libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2-utils==2.9.4+dfsg1-7+deb10u3
 libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
@@ -1312,15 +1312,15 @@ libzmq3-dev==4.3.1-4+deb10u2
 libzmq5==4.3.1-4+deb10u2
 libzvbi-common==0.2.35-16
 libzvbi0==0.2.35-16
-libzzip-0-13==0.13.62-3.2
+libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.208-1
-linux-headers-4.19.0-18-amd64==4.19.208-1
-linux-headers-4.19.0-18-common==4.19.208-1
-linux-headers-amd64==4.19+105+deb10u13
-linux-kbuild-4.19==4.19.208-1
-linux-libc-dev==4.19.208-1
+linux-compiler-gcc-8-x86==4.19.235-1
+linux-headers-4.19.0-20-amd64==4.19.235-1
+linux-headers-4.19.0-20-common==4.19.235-1
+linux-headers-amd64==4.19+105+deb10u15
+linux-kbuild-4.19==4.19.235-1
+linux-libc-dev==4.19.235-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1342,7 +1342,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.31-0+deb10u1
+mariadb-common==1:10.3.34-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
@@ -1368,7 +1368,7 @@ opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1d-0+deb10u7
+openssl==1.1.1n-0+deb10u1
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
@@ -1434,7 +1434,7 @@ procps==2:3.3.15-2
 protobuf-compiler==3.6.1.3-2
 psmisc==23.2-1+deb10u1
 psutils==1.17.dfsg-4
-publicsuffix==20190415.1030-1
+publicsuffix==20211109.1735-0+deb10u1
 pylint==1.9.4-1
 python==2.7.16-1
 python-alabaster==0.7.8-1
@@ -1632,7 +1632,7 @@ rake==12.3.1-3+deb10u1
 readline-common==7.0-5
 rrdtool==1.7.1-2
 rsync==3.1.3-6
-rsyslog==8.1901.0-1
+rsyslog==8.1901.0-1+deb10u1
 ruby==1:2.5.1
 ruby-all-dev==1:2.5.1
 ruby-asciidoctor==1.5.8-1
@@ -1693,9 +1693,9 @@ uuid-dev==2.33.1-0.1
 va-driver-all==2.4.0-1
 vdpau-driver-all==1.1.1-10
 velocity==1.7-5+deb10u1
-vim==2:8.1.0875-5
-vim-common==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
 wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 wget==1.20.1-1.1
@@ -1725,9 +1725,10 @@ xkb-data==2.26-2
 xml-core==0.18+nmu1
 xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.32-2.2~deb10u1
-xterm==344-1+deb10u1
+xterm==344-1+deb10u2
 xtrans-dev==1.3.5-1
-xxd==2:8.1.0875-5
+xxd==2:8.1.0875-5+deb10u2
 xz-utils==5.2.4-1
 zip==3.0-11+b1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u1
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 453755c65c89..9d146f1c1eb8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,45 +1,7 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-containerd.io==1.5.11-1
-icu-devtools==63.1-6+deb10u3
-libc-dev-bin==2.28-10+deb10u1
-libc6==2.28-10+deb10u1
-libc6-dbg==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
-libcups2==2.2.10-6+deb10u5
-libcupsimage2==2.2.10-6+deb10u5
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
-libgmp-dev==2:6.1.2+dfsg-4+deb10u1
-libgmp10==2:6.1.2+dfsg-4+deb10u1
-libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
-libicu-dev==63.1-6+deb10u3
-libicu63==63.1-6+deb10u3
-libjbig2dec0==0.16-1+deb10u1
-liblog4j1.2-java==1.2.17-8+deb10u2
-libmariadb-dev==1:10.3.34-0+deb10u1
-libmariadb-dev-compat==1:10.3.34-0+deb10u1
-libmariadb3==1:10.3.34-0+deb10u1
-libpcap-dev==1.8.1-6+deb10u1
-libpcap0.8==1.8.1-6+deb10u1
-libpcap0.8-dev==1.8.1-6+deb10u1
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
 libtext-iconv-perl==1.7-5+b6
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
-libxml2-utils==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
-libzzip-0-13==0.13.62-3.2+deb10u1
-linux-kbuild-4.19==4.19.235-1
-linux-libc-dev==4.19.235-1
-mariadb-common==1:10.3.34-0+deb10u1
-nodejs==14.19.1-deb-1nodesource1
-openssl==1.1.1n-0+deb10u1
-publicsuffix==20211109.1735-0+deb10u1
-rsyslog==8.1901.0-1+deb10u1
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
-xterm==344-1+deb10u2
-xxd==2:8.1.0875-5+deb10u2
\ No newline at end of file
+nodejs==14.19.1-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 461c2e233481..b90483767d31 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,17 +1,9 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-containerd.io==1.5.11-1
-icu-devtools==63.1-6+deb10u3
-libc-dev-bin==2.28-10+deb10u1
-libc6==2.28-10+deb10u1
-libc6-dbg==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
 libclang-dev==1:7.0-47
 libclass-data-inheritable-perl==0.08-3
-libcups2==2.2.10-6+deb10u5
-libcupsimage2==2.2.10-6+deb10u5
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
@@ -20,27 +12,14 @@ libdrm-tegra0==2.4.97-1
 libemail-date-format-perl==1.005-1
 libexception-class-perl==1.44-1
 libgles2-mesa-dev==18.3.6-2+deb10u1
-libgmp-dev==2:6.1.2+dfsg-4+deb10u1
-libgmp10==2:6.1.2+dfsg-4+deb10u1
-libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
-libicu-dev==63.1-6+deb10u3
-libicu63==63.1-6+deb10u3
 libipc-shareable-perl==0.61-2
 libjargs-java==1.0.0-4
-libjbig2dec0==0.16-1+deb10u1
 liblog-dispatch-perl==2.68-1
 liblog-log4perl-perl==1.49-1
-liblog4j1.2-java==1.2.17-8+deb10u2
-libmariadb-dev==1:10.3.34-0+deb10u1
-libmariadb-dev-compat==1:10.3.34-0+deb10u1
-libmariadb3==1:10.3.34-0+deb10u1
 libmime-charset-perl==1.012.2-1
 libmime-lite-perl==3.030-2
 libmime-types-perl==2.17-1
 libparams-validationcompiler-perl==0.30-1
-libpcap-dev==1.8.1-6+deb10u1
-libpcap0.8==1.8.1-6+deb10u1
-libpcap0.8-dev==1.8.1-6+deb10u1
 librust-aho-corasick-dev==0.6.9-1
 librust-ansi-term-dev==0.11.0-1
 librust-atty-dev==0.2.11-1
@@ -116,35 +95,18 @@ librust-wincolor-dev==1.0.0-1
 libsass1==3.5.5-4
 libsombok3==2.4.0-2
 libspecio-perl==0.43-1
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
 libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
-libxml2-utils==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libyaml-tiny-perl==1.73-1
-libzzip-0-13==0.13.62-3.2+deb10u1
 linux-compiler-gcc-8-arm==4.19.235-1
-linux-kbuild-4.19==4.19.235-1
-linux-libc-dev==4.19.235-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-mariadb-common==1:10.3.34-0+deb10u1
 nodejs==14.19.1-deb-1nodesource1
-openssl==1.1.1n-0+deb10u1
 ps2eps==1.68+binaryfree-2
-publicsuffix==20211109.1735-0+deb10u1
 rdfind==1.4.1-1
-rsyslog==8.1901.0-1+deb10u1
 sassc==3.5.0-1
 texlive-extra-utils==2018.20190227-2
 texlive-font-utils==2018.20190227-2
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
-xterm==344-1+deb10u2
-xxd==2:8.1.0875-5+deb10u2
 yui-compressor==2.4.8-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
new file mode 100644
index 000000000000..216fb807f2ec
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 6bfb218c4b77..7fe13cf67e75 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.4.0
+bitarray==2.4.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.3.2
+regex==2022.3.15
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
deleted file mode 100644
index 058f7bfd1823..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-regex==2022.3.15
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
deleted file mode 100644
index 058f7bfd1823..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-regex==2022.3.15
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 66a7864dab7b..2c640c82c3f2 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -474,7 +474,7 @@ libfribidi0==0.19.7-1+deb9u1
 libgail-common==2.24.31-2
 libgail18==2.24.31-2
 libgbm1==13.0.6-1+b2
-libgc1c2==1:7.4.2-8
+libgc1c2==1:7.4.2-8+deb9u1
 libgcc-6-dev==6.3.0-18+deb9u1
 libgd3==2.2.4-2+deb9u5
 libgdbm3==1.8.3-14
@@ -1366,10 +1366,10 @@ python3.5-dbg==3.5.3-1+deb9u5
 python3.5-dev==3.5.3-1+deb9u5
 python3.5-minimal==3.5.3-1+deb9u5
 qdbus==4:4.8.7+dfsg-11+deb9u3
-qemu-kvm==1:2.8+dfsg-6+deb9u16
-qemu-system-common==1:2.8+dfsg-6+deb9u16
-qemu-system-x86==1:2.8+dfsg-6+deb9u16
-qemu-utils==1:2.8+dfsg-6+deb9u16
+qemu-kvm==1:2.8+dfsg-6+deb9u17
+qemu-system-common==1:2.8+dfsg-6+deb9u17
+qemu-system-x86==1:2.8+dfsg-6+deb9u17
+qemu-utils==1:2.8+dfsg-6+deb9u17
 qt-at-spi==0.4.0-5
 qt4-linguist-tools==4:4.8.7+dfsg-11+deb9u3
 qt4-qmake==4:4.8.7+dfsg-11+deb9u3
@@ -1483,4 +1483,5 @@ xtrans-dev==1.3.5-1
 xxd==2:8.0.0197-4+deb9u5
 xz-utils==5.2.2-1.2+b1
 zip==3.0-11+b1
-zlib1g-dev==1:1.2.8.dfsg-5
\ No newline at end of file
+zlib1g==1:1.2.8.dfsg-5+deb9u1
+zlib1g-dev==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
new file mode 100644
index 000000000000..58fe5e370634
--- /dev/null
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -0,0 +1,2 @@
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2ca0f524434a3b0a1f0268b73fe4b4590d95f20b
+https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index ca07070937bb..273be857e91a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.4.0
+bitarray==2.4.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index bf6e460be007..5d5c69a338f0 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -324,4 +324,5 @@ vim==2:8.1.0875-5+deb10u2
 vim-common==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
 xxd==2:8.1.0875-5+deb10u2
-xz-utils==5.2.4-1
\ No newline at end of file
+xz-utils==5.2.4-1
+zlib1g==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 2b44c4da77d1..d3b85493478f 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -13,7 +13,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.6.0
 python-apt==1.8.4.3
 pyyaml==5.4.1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 0961863ac002..806b4b8a4d99 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -25,7 +25,7 @@ pathtools==0.1.2
 pexpect==4.8.0
 psutil==5.9.0
 ptyprocess==0.7.0
-pyang==2.5.2
+pyang==2.5.3
 pyangbind==0.8.1
 pycparser==2.21
 pyroute2==0.5.14
@@ -40,5 +40,5 @@ tabulate==0.8.9
 thrift==0.13.0
 urllib3==1.26.9
 watchdog==0.10.3
-websocket-client==1.3.1
+websocket-client==1.3.2
 xmltodict==0.12.0
\ No newline at end of file

From a65916449b5517eb423abeb5f4b8ff8c95fe2953 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Mon, 11 Apr 2022 08:59:56 +0800
Subject: [PATCH 1132/1674] Update cisco-8000 ref to release: 202012-v0.97
 (#10522)

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 3b3ab7034fce..1508065f1a73 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.96
+ref=202012-v0.97

From 589234a48cccfaf3a1d2bed840534ba253de1efb Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:30:46 +0530
Subject: [PATCH 1133/1674] [Marvell] Marvell armhf SAI debian. (#10526)

Fixed IPv6 route issue resulting in orchagent crash.
Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index 2d47b2f084c1..30e2b073924c 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-7
+export MRVL_SAI_VERSION = 1.7.1-8
 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From fc727f0538c63c6e540518d14f45550a659f1b73 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 8 Apr 2022 10:49:21 +0800
Subject: [PATCH 1134/1674] [Ci]: check if there is a sonic dirty version issue
 (#10445)

Why I did it
[Ci]: check if there is a sonic dirty version issue
If there is a dirty version issue in PR build, the build will be failed.
---
 .azure-pipelines/azure-pipelines-build.yml |  1 +
 .azure-pipelines/check-dirty-version.yml   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 .azure-pipelines/check-dirty-version.yml

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index d71ec5340a06..a6a0b2768a79 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -131,3 +131,4 @@ jobs:
             make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
           fi
         displayName: "Build sonic image"
+      - template: check-dirty-version.yml
diff --git a/.azure-pipelines/check-dirty-version.yml b/.azure-pipelines/check-dirty-version.yml
new file mode 100644
index 000000000000..5d3909bd280e
--- /dev/null
+++ b/.azure-pipelines/check-dirty-version.yml
@@ -0,0 +1,16 @@
+steps:
+- script: |
+    . functions.sh
+    SONIC_VERSION=$(sonic_get_version)
+    echo "SONIC_VERSION=$SONIC_VERSION"
+    if [[ "$SONIC_VERSION" == *dirty* ]]; then
+      # Print the detail dirty info
+      git status --untracked-files=no -s --ignore-submodules
+
+      # Exit with error, if it is a PR build
+      if [ "$(Build.Reason)" == "PullRequest" ]; then
+        echo "Build failed for the dirty version: $SONIC_VERSION" 1>&2
+        exit 1
+      fi
+    fi
+  displayName: "Check the dirty version"

From 3fa538e58c553409d7b56ae0e2882c0334ff9068 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 11 Apr 2022 23:53:42 -0700
Subject: [PATCH 1135/1674] Revert "[ci] Set default ACR in
 UpgrateVersion/PR/official pipeline. (#10341)" (#10535)

This reverts commit f4bbcd1cf106f5e19c2eb69bdaaa8cfc13937b47. The original one was missing one file ".azure-pipelines/azure-pipelines-repd-build-variables.yml" and break the Azure pipeline.
---
 .../azure-pipelines-UpgrateVersion.yml             |  7 ++-----
 .azure-pipelines/docker-sonic-slave-template.yml   |  5 +----
 .azure-pipelines/official-build.yml                | 11 -----------
 .azure-pipelines/template-clean-sonic-slave.yml    |  4 +---
 .azure-pipelines/template-variables.yml            |  2 --
 azure-pipelines.yml                                | 14 --------------
 6 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 .azure-pipelines/template-variables.yml

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index b36cc3513aa6..4e22ce4801c8 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -42,11 +42,8 @@ parameters:
 stages:
 - stage: Build
   variables:
-    - name: CACHE_MODE
-      value: none
-    - name: VERSION_CONTROL_OPTIONS
-      value: 'SONIC_VERSION_CONTROL_COMPONENTS='
-    - template: .azure-pipelines/template-variables.yml@buildimage
+    CACHE_MODE: none
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
index 24b16bd64be6..a3d2d17dd00a 100644
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -45,10 +45,7 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - template: cleanup.yml
-  - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    - template: template-clean-sonic-slave.yml
-  - ${{ else }}:
-    - template: .azure-pipelines/template-variables.yml@buildimage
+  - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
   - checkout: self
     clean: true
     submodules: recursive
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index 6282a463ea6e..bcda8f210c75 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -12,20 +12,9 @@ schedules:
     - 202012
   always: true
 
-resources:
-  repositories:
-  - repository: buildimage
-    type: github
-    name: Azure/sonic-buildimage
-    ref: master
-    endpoint: build
-
 trigger: none
 pr: none
 
-variables:
-- template: .azure-pipelines/template-variables.yml@buildimage
-
 stages:
 - stage: Build
   pool: sonicbld
diff --git a/.azure-pipelines/template-clean-sonic-slave.yml b/.azure-pipelines/template-clean-sonic-slave.yml
index ddb8c8e48f6a..c67f63fff476 100644
--- a/.azure-pipelines/template-clean-sonic-slave.yml
+++ b/.azure-pipelines/template-clean-sonic-slave.yml
@@ -1,10 +1,8 @@
 steps:
 - script: |
-    set -x
-    containers=$(docker container ls -aq)
+    containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
     [ -n "$containers" ] && docker container rm -f $containers
     docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
     images=$(docker images 'sonic-slave-*' -a -q)
     [ -n "$images" ] && docker rmi -f $images
-    exit 0
   displayName: 'Cleanup sonic slave'
diff --git a/.azure-pipelines/template-variables.yml b/.azure-pipelines/template-variables.yml
deleted file mode 100644
index f28768e39efe..000000000000
--- a/.azure-pipelines/template-variables.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-variables:
-  DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 476878c8160b..09220c195e57 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,20 +29,6 @@ resources:
     type: github
     name: Azure/sonic-mgmt
     endpoint: build
-  - repository: buildimage
-    type: github
-    name: Azure/sonic-buildimage
-    endpoint: build
-    ref: master
-
-variables:
-- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml
-- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-  - template: .azure-pipelines/template-variables.yml
-- ${{ else }}:
-  - template: .azure-pipelines/template-variables.yml@buildimage
-- name: CACHE_MODE
-  value: rcache 
 
 stages:
 - stage: BuildVS

From d27df5d145484b5dce569c41d3d49af36835911c Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Tue, 12 Apr 2022 00:23:09 -0700
Subject: [PATCH 1136/1674] [202012] [submodule] Advance sonic-swss pointer
 (#10540)

Includes the below commits
f3b2873 [BFD]Retry create BFD with different source UDP port on failure

Signed-off-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 323dc3433142..f3b28739923a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 323dc3433142f2b0d92c88db01eb293adda77cb7
+Subproject commit f3b28739923a9fc32a2e1b68124abfe355afa415

From 234d0ab2413b6ea93b841e34a7a6dad9edc3a30b Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 2 Mar 2022 19:08:06 -0800
Subject: [PATCH 1137/1674] [containerd]Fixing container commands when mode is
 local and state is disabled (#9986)

Why I did it
During warm-reboot and fast-reboot the below error logs appear
Feb 3 22:05:15.187408 r-lionfish-13 ERR container: docker cmd: kill for nat failed with 404 Client Error for http+docker://localhost/v1.41/containers/nat/json: Not Found ("No such container: nat")

The container command when called for local mode doesn't check if it is enabled before calling docker kill which throws the above errors.
https://github.com/Azure/sonic-utilities/blob/b6ca76b4821453171d9607383b808385968eeeeb/scripts/fast-reboot#L699

How I did it
Checking feature state if local mode and returning error exit code along with valid debug message.

How to verify it
Manually tested with warm-reboot and fast-reboot
Added UT to verify it.
---
 src/sonic-ctrmgrd/ctrmgr/container        | 54 +++++++++++++++--------
 src/sonic-ctrmgrd/tests/container_test.py | 45 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container
index 666c967540a7..db6ded635ee9 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container
+++ b/src/sonic-ctrmgrd/ctrmgr/container
@@ -26,6 +26,7 @@ CONTAINER_ID = "container_id"
 REMOTE_STATE = "remote_state"
 VERSION = "container_version"
 SYSTEM_STATE = "system_state"
+STATE = "state"
 
 KUBE_LABEL_TABLE = "KUBE_LABELS"
 KUBE_LABEL_SET_KEY = "SET"
@@ -38,6 +39,9 @@ SONIC_CTR_CONFIG_PEND_SECS = "revert_to_local_on_wait_seconds"
 DEFAULT_PEND_SECS = ( 5 * 60 )
 WAIT_POLL_SECS = 2
 
+SUCCESS = 0
+FAILURE = -1
+
 remote_ctr_enabled = False
 
 def debug_msg(m):
@@ -87,10 +91,10 @@ def read_data(is_config, feature, fields):
 
 def read_config(feature):
     """ Read requried feature config """
-    set_owner, no_fallback  = read_data(True, feature, 
-            [(SET_OWNER, "local"), (NO_FALLBACK, False)])
+    set_owner, no_fallback, state  = read_data(True, feature, 
+            [(SET_OWNER, "local"), (NO_FALLBACK, False), (STATE, "disabled")])
 
-    return (set_owner, not no_fallback)
+    return (set_owner, not no_fallback, state)
 
 
 def read_state(feature):
@@ -107,12 +111,12 @@ def docker_action(action, feature, **kwargs):
         container = client.containers.get(feature)
         getattr(container, action)(**kwargs)
         syslog.syslog(syslog.LOG_INFO, "docker cmd: {} for {}".format(action, feature))
-        return 0
+        return SUCCESS
 
     except (docker.errors.NotFound, docker.errors.APIError) as err:
         syslog.syslog(syslog.LOG_ERR, "docker cmd: {} for {} failed with {}".
                 format(action, feature, str(err)))
-        return -1
+        return FAILURE
 
 
 def set_label(feature, create):
@@ -186,7 +190,7 @@ def container_start(feature, **kwargs):
 
     init()
 
-    set_owner, fallback = read_config(feature)
+    set_owner, fallback, _ = read_config(feature)
     _, remote_state, _ = read_state(feature)
 
     debug_msg("{}: set_owner:{} fallback:{} remote_state:{}".format(
@@ -244,8 +248,8 @@ def container_stop(feature, **kwargs):
     debug_msg("BEGIN")
 
     init()
-
-    set_owner, _ = read_config(feature)
+    ret = SUCCESS
+    set_owner, _ , _ = read_config(feature)
     current_owner, remote_state, _ = read_state(feature)
     docker_id = container_id(feature)
     remove_label = (remote_state != "pending") or (set_owner == "local")
@@ -257,7 +261,7 @@ def container_stop(feature, **kwargs):
         set_label(feature, False)
 
     if docker_id:
-        docker_action("stop", docker_id, **kwargs)
+        ret = docker_action("stop", docker_id, **kwargs)
     else:
         syslog.syslog(
                 syslog.LOG_ERR if current_owner != "none" else syslog.LOG_INFO,
@@ -286,6 +290,7 @@ def container_stop(feature, **kwargs):
     update_data(feature, data)
 
     debug_msg("END")
+    return ret
 
 
 def container_kill(feature, **kwargs):
@@ -301,19 +306,25 @@ def container_kill(feature, **kwargs):
 
     init()
 
-    set_owner, _ = read_config(feature)
+    ret = SUCCESS
+    set_owner, _ , state = read_config(feature)
     current_owner, remote_state, _ = read_state(feature)
     docker_id = container_id(feature)
     remove_label = (set_owner != "local") or (current_owner != "local")
 
-    debug_msg("{}: set_owner:{} current_owner:{} remote_state:{} docker_id:{}".format(
-        feature, set_owner, current_owner, remote_state, docker_id))
+    debug_msg("{}: set_owner:{} current_owner:{} remote_state:{} docker_id:{} state:{}".format(
+        feature, set_owner, current_owner, remote_state, docker_id, state))
 
     if remove_label:
         set_label(feature, False)
 
+    if set_owner == "local":
+        if state not in ["enabled", "always_enabled"]:
+            debug_msg("{} is not enabled".format(feature))
+            return FAILURE
+
     if docker_id:
-        docker_action("kill", docker_id, **kwargs)
+        ret = docker_action("kill", docker_id, **kwargs)
 
     else:
         syslog.syslog(
@@ -322,6 +333,7 @@ def container_kill(feature, **kwargs):
 
 
     debug_msg("END")
+    return ret
 
 
 def container_wait(feature, **kwargs):
@@ -341,10 +353,11 @@ def container_wait(feature, **kwargs):
 
     init()
 
-    set_owner, fallback = read_config(feature)
+    set_owner, fallback, _ = read_config(feature)
     current_owner, remote_state, _ = read_state(feature)
     docker_id = container_id(feature)
     pend_wait_secs = 0
+    ret = SUCCESS
 
     if not docker_id and fallback:
         pend_wait_secs = get_config_data(
@@ -377,8 +390,9 @@ def container_wait(feature, **kwargs):
                 format(feature))
     else:
         debug_msg("END -- transitioning to docker wait")
-        docker_action("wait", docker_id, **kwargs)
+        ret = docker_action("wait", docker_id, **kwargs)
 
+    return ret
 
 def main():
     parser=argparse.ArgumentParser(description="container commands for start/stop/wait/kill/id")
@@ -389,24 +403,26 @@ def main():
     args = parser.parse_args()
     kwargs = {}
 
+    ret = 0
     if args.action == "start":
-        container_start(args.name, **kwargs)
+        ret = container_start(args.name, **kwargs)
 
     elif args.action == "stop":
         if args.timeout is not None:
             kwargs['timeout'] = args.timeout
-        container_stop(args.name, **kwargs)
+        ret = container_stop(args.name, **kwargs)
 
     elif args.action == "kill":
-        container_kill(args.name, **kwargs)
+        ret = container_kill(args.name, **kwargs)
 
     elif args.action == "wait":
-        container_wait(args.name, **kwargs)
+        ret = container_wait(args.name, **kwargs)
 
     elif args.action == "id":
         id = container_id(args.name, **kwargs)
         print(id)
 
+    return ret
 
 if __name__ == "__main__":
     main()
diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py
index cc5f89e8d97f..4738597c72c4 100755
--- a/src/sonic-ctrmgrd/tests/container_test.py
+++ b/src/sonic-ctrmgrd/tests/container_test.py
@@ -269,7 +269,8 @@
             common_test.CONFIG_DB_NO: {
                 common_test.FEATURE_TABLE: {
                     "snmp": {
-                        "set_owner": "local"
+                        "set_owner": "local",
+                        "state": "enabled"
                     }
                 }
             },
@@ -348,6 +349,30 @@
     }
 }
 
+# container_kill test cases
+# test case 0 -- container kill local disabled container
+#   -- no change in state-db 
+#   -- no label update
+#
+invalid_kill_test_data = {
+    0: {
+        common_test.DESCR: "container kill for local disabled container",
+        common_test.PRE: {
+            common_test.CONFIG_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "sflow": {
+                        "set_owner": "local"
+                    }
+                }
+            }
+        },
+        common_test.POST: {
+        },
+        common_test.ACTIONS: {
+        }
+    }
+}
+
 
 # container_wait test cases
 # test case 0 -- container wait local 
@@ -498,6 +523,24 @@ def test_kill(self, mock_docker, mock_table, mock_conn):
             ret = common_test.check_mock_containers()
             assert ret == 0
 
+    @patch("container.swsscommon.DBConnector")
+    @patch("container.swsscommon.Table")
+    @patch("container.docker.from_env")
+    def test_invalid_kill(self, mock_docker, mock_table, mock_conn):
+        self.init()
+        common_test.set_mock(mock_table, mock_conn, mock_docker)
+
+        for (i, ct_data) in invalid_kill_test_data.items():
+            common_test.do_start_test("container_test:container_kill", i, ct_data)
+
+            ret = container.container_kill("sflow")
+            assert ret != 0
+
+            ret = common_test.check_tables_returned()
+            assert ret == 0
+
+            ret = common_test.check_mock_containers()
+            assert ret == 0
 
     @patch("container.swsscommon.DBConnector")
     @patch("container.swsscommon.Table")

From 6e17ef311ae359bd60943378463491a01d58c6c6 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Tue, 12 Apr 2022 10:44:17 -0700
Subject: [PATCH 1138/1674] [dhcp_relay] Remove dhcp6mon (#10467)

---
 dockers/docker-dhcp-relay/Dockerfile.j2       |   2 +-
 ...lay.monitors.j2 => dhcp-relay.monitors.j2} |   2 -
 .../docker-dhcp-relay.supervisord.conf.j2     |   2 +-
 src/dhcpmon/src/dhcp_device.c                 | 593 ++++--------------
 src/dhcpmon/src/dhcp_device.h                 | 123 +---
 src/dhcpmon/src/dhcp_devman.c                 |  37 +-
 src/dhcpmon/src/dhcp_devman.h                 |  17 +-
 src/dhcpmon/src/dhcp_mon.c                    | 106 +---
 src/dhcpmon/src/dhcp_mon.h                    |   4 +-
 src/dhcpmon/src/main.c                        |  20 +-
 .../py2/docker-dhcp-relay.supervisord.conf    |   2 +-
 .../py3/docker-dhcp-relay.supervisord.conf    |   2 +-
 12 files changed, 187 insertions(+), 723 deletions(-)
 rename dockers/docker-dhcp-relay/{dhcpv6-relay.monitors.j2 => dhcp-relay.monitors.j2} (97%)

diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
index 5f6572d9d550..ce6eb4506f6c 100644
--- a/dockers/docker-dhcp-relay/Dockerfile.j2
+++ b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -30,7 +30,7 @@ RUN apt-get clean -y         && \
 
 COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
 COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
-COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcpv6-relay.monitors.j2", "/usr/share/sonic/templates/"]
+COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcp-relay.monitors.j2", "/usr/share/sonic/templates/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
similarity index 97%
rename from dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
rename to dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
index 9f2d0f01b59f..ae11105ae3ba 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
+++ b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
@@ -59,8 +59,6 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }}
 {% if prefix | ipv4 %} -im {{ name }}{% endif -%}
 {% endfor %}
 {% endif %}
-{% if relay_for_ipv4.flag %} -4{% endif %}
-{% if relay_for_ipv6.flag %} -6{% endif %}
 
 priority=4
 autostart=false
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 664e1f36c05e..41a13dd496ad 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -65,6 +65,6 @@ dependent_startup_wait_for=rsyslogd:running
 {% include 'dhcpv6-relay.agents.j2' %}
 {% endfor %}
 
-{% include 'dhcpv6-relay.monitors.j2' %}
+{% include 'dhcp-relay.monitors.j2' %}
 {% endif %}
 {% endif %}
diff --git a/src/dhcpmon/src/dhcp_device.c b/src/dhcpmon/src/dhcp_device.c
index e4fbc7f56909..f45483f8504c 100644
--- a/src/dhcpmon/src/dhcp_device.c
+++ b/src/dhcpmon/src/dhcp_device.c
@@ -21,51 +21,25 @@
 #include <libexplain/ioctl.h>
 #include <linux/filter.h>
 #include <netpacket/packet.h>
-#include <sys/types.h>
-#include <ifaddrs.h>
-#include <netinet/ip6.h>
 
 #include "dhcp_device.h"
 
-/** DHCP versions flags */
-static bool dhcpv4_enabled;
-static bool dhcpv6_enabled;
-
 /** Counter print width */
 #define DHCP_COUNTER_WIDTH  9
 
 /** Start of Ether header of a captured frame */
 #define ETHER_START_OFFSET  0
-/** EtherType field offset from Ether header of a captured frame */
-#define ETHER_TYPE_OFFSET (ETHER_START_OFFSET + 12)
 /** Start of IP header of a captured frame */
 #define IP_START_OFFSET (ETHER_START_OFFSET + ETHER_HDR_LEN)
-/** Start of UDP header on IPv4 packet of a captured frame */
-#define UDPv4_START_OFFSET (IP_START_OFFSET + sizeof(struct ip))
-/** Start of DHCPv4 header of a captured frame */
-#define DHCPv4_START_OFFSET (UDPv4_START_OFFSET + sizeof(struct udphdr))
-/** Start of DHCPv4 Options segment of a captured frame */
-#define DHCPv4_OPTIONS_HEADER_SIZE 240
+/** Start of UDP header of a captured frame */
+#define UDP_START_OFFSET (IP_START_OFFSET + sizeof(struct ip))
+/** Start of DHCP header of a captured frame */
+#define DHCP_START_OFFSET (UDP_START_OFFSET + sizeof(struct udphdr))
+/** Start of DHCP Options segment of a captured frame */
+#define DHCP_OPTIONS_HEADER_SIZE 240
 /** Offset of DHCP GIADDR */
 #define DHCP_GIADDR_OFFSET 24
 
-/** IPv6 link-local prefix */
-#define IPV6_LINK_LOCAL_PREFIX 0x80fe
-/** Start of UDP header on IPv6 packet of a captured frame */
-#define UDPv6_START_OFFSET (IP_START_OFFSET + sizeof(struct ip6_hdr))
-/** Start of DHCPv6 header of a captured frame */
-#define DHCPv6_START_OFFSET (UDPv6_START_OFFSET + sizeof(struct udphdr))
-/** Size of 'type' field on DHCPv6 header */
-#define DHCPv6_TYPE_LENGTH 1
-/** Size of DHCPv6 relay message header to first option */
-#define DHCPv6_RELAY_MSG_OPTIONS_OFFSET 34
-/** Size of 'option' field on DHCPv6 header */
-#define DHCPv6_OPTION_LENGTH 2
-/** Size of 'option length' field on DHCPv6 header */
-#define DHCPv6_OPTION_LEN_LENGTH 2
-/** DHCPv6 OPTION_RELAY_MSG */
-#define DHCPv6_OPTION_RELAY_MSG 9
-
 #define OP_LDHA     (BPF_LD  | BPF_H   | BPF_ABS)   /** bpf ldh Abs */
 #define OP_LDHI     (BPF_LD  | BPF_H   | BPF_IND)   /** bpf ldh Ind */
 #define OP_LDB      (BPF_LD  | BPF_B   | BPF_ABS)   /** bpf ldb Abs*/
@@ -75,40 +49,34 @@ static bool dhcpv6_enabled;
 #define OP_JSET     (BPF_JMP | BPF_JSET | BPF_K)    /** bpf jset */
 #define OP_LDXB     (BPF_LDX | BPF_B    | BPF_MSH)  /** bpf ldxb */
 
-/** Berkeley Packet Filter program for "udp and (port 546 or port 547 or port 67 or port 68)".
+/** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
  * This program is obtained using the following command tcpdump:
- * `tcpdump -dd "udp and (port 546 or port 547 or port 67 or port 68)"`
+ * `tcpdump -dd "udp and (port 67 or port 68)"`
  */
 static struct sock_filter dhcp_bpf_code[] = {
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c},   // (000) ldh      [12]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 9,  .k = 0x000086dd},   // (001) jeq      #0x86dd          jt 2	jf 11
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014},   // (002) ldb      [20]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 24, .k = 0x00000011},   // (003) jeq      #0x11            jt 4	jf 28
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036},   // (004) ldh      [54]
-    {.code = OP_JEQ,  .jt = 21, .jf = 0,  .k = 0x00000222},   // (005) jeq      #0x222           jt 27	jf 6
-    {.code = OP_JEQ,  .jt = 20, .jf = 0,  .k = 0x00000223},   // (006) jeq      #0x223           jt 27	jf 7
-    {.code = OP_JEQ,  .jt = 19, .jf = 0,  .k = 0x00000043},   // (007) jeq      #0x43            jt 27	jf 8
-    {.code = OP_JEQ,  .jt = 18, .jf = 0,  .k = 0x00000044},   // (008) jeq      #0x44            jt 27	jf 9
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038},   // (009) ldh      [56]
-    {.code = OP_JEQ,  .jt = 16, .jf = 13, .k = 0x00000222},   // (010) jeq      #0x222           jt 27	jf 24
-    {.code = OP_JEQ,  .jt = 0,  .jf = 16, .k = 0x00000800},   // (011) jeq      #0x800           jt 12	jf 28
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017},   // (012) ldb      [23]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 14, .k = 0x00000011},   // (013) jeq      #0x11            jt 14	jf 28
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014},   // (014) ldh      [20]
-    {.code = OP_JSET, .jt = 12, .jf = 0,  .k = 0x00001fff},   // (015) jset     #0x1fff          jt 28	jf 16
-    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e},   // (016) ldxb     4*([14]&0xf)
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e},   // (017) ldh      [x + 14]
-    {.code = OP_JEQ,  .jt = 8,  .jf = 0,  .k = 0x00000222},   // (018) jeq      #0x222           jt 27	jf 19
-    {.code = OP_JEQ,  .jt = 7,  .jf = 0,  .k = 0x00000223},   // (019) jeq      #0x223           jt 27	jf 20
-    {.code = OP_JEQ,  .jt = 6,  .jf = 0,  .k = 0x00000043},   // (020) jeq      #0x43            jt 27	jf 21
-    {.code = OP_JEQ,  .jt = 5,  .jf = 0,  .k = 0x00000044},   // (021) jeq      #0x44            jt 27	jf 22
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010},   // (022) ldh      [x + 16]
-    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000222},   // (023) jeq      #0x222           jt 27	jf 24
-    {.code = OP_JEQ,  .jt = 2,  .jf = 0,  .k = 0x00000223},   // (024) jeq      #0x223           jt 27	jf 25
-    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043},   // (025) jeq      #0x43            jt 27	jf 26
-    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044},   // (026) jeq      #0x44            jt 27	jf 28
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000},   // (027) ret      #262144
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000},   // (028) ret
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (000) ldh      [12]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (001) jeq      #0x86dd          jt 2	jf 9
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (002) ldb      [20]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 18, .k = 0x00000011}, // (003) jeq      #0x11            jt 4	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036}, // (004) ldh      [54]
+    {.code = OP_JEQ,  .jt = 15, .jf = 0,  .k = 0x00000043}, // (005) jeq      #0x43            jt 21	jf 6
+    {.code = OP_JEQ,  .jt = 14, .jf = 0,  .k = 0x00000044}, // (006) jeq      #0x44            jt 21	jf 7
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038}, // (007) ldh      [56]
+    {.code = OP_JEQ,  .jt = 12, .jf = 11, .k = 0x00000043}, // (008) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 12, .k = 0x00000800}, // (009) jeq      #0x800           jt 10	jf 22
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017}, // (010) ldb      [23]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 10, .k = 0x00000011}, // (011) jeq      #0x11            jt 12	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014}, // (012) ldh      [20]
+    {.code = OP_JSET, .jt = 8,  .jf = 0,  .k = 0x00001fff}, // (013) jset     #0x1fff          jt 22	jf 14
+    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (014) ldxb     4*([14]&0xf)
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (015) ldh      [x + 14]
+    {.code = OP_JEQ,  .jt = 4,  .jf = 0,  .k = 0x00000043}, // (016) jeq      #0x43            jt 21	jf 17
+    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000044}, // (017) jeq      #0x44            jt 21	jf 18
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010}, // (018) ldh      [x + 16]
+    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043}, // (019) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044}, // (020) jeq      #0x44            jt 21	jf 22
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000}, // (021) ret      #262144
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000}, // (022) ret      #0
 };
 
 /** Filter program socket struct */
@@ -121,29 +89,16 @@ static struct sock_fprog dhcp_sock_bfp = {
  */
 static dhcp_device_context_t aggregate_dev = {0};
 
-static dhcp_device_context_t *mgmt_intf = NULL;
-
-/** Monitored DHCPv4 message type */
-static dhcpv4_message_type_t v4_monitored_msgs[] = {
-    DHCPv4_MESSAGE_TYPE_DISCOVER,
-    DHCPv4_MESSAGE_TYPE_OFFER,
-    DHCPv4_MESSAGE_TYPE_REQUEST,
-    DHCPv4_MESSAGE_TYPE_ACK
-};
-
-/** Monitored DHCPv6 message type */
-static dhcpv6_message_type_t v6_monitored_msgs[] = {
-    DHCPv6_MESSAGE_TYPE_SOLICIT,
-    DHCPv6_MESSAGE_TYPE_ADVERTISE,
-    DHCPv6_MESSAGE_TYPE_REQUEST,
-    DHCPv6_MESSAGE_TYPE_REPLY
+/** Monitored DHCP message type */
+static dhcp_message_type_t monitored_msgs[] = {
+    DHCP_MESSAGE_TYPE_DISCOVER,
+    DHCP_MESSAGE_TYPE_OFFER,
+    DHCP_MESSAGE_TYPE_REQUEST,
+    DHCP_MESSAGE_TYPE_ACK
 };
 
-/** Number of monitored DHCPv4 message type */
-static uint8_t v4_monitored_msg_sz = sizeof(v4_monitored_msgs) / sizeof(*v4_monitored_msgs);
-
-/** Number of monitored DHCPv6 message type */
-static uint8_t v6_monitored_msg_sz = sizeof(v6_monitored_msgs) / sizeof(*v6_monitored_msgs);
+/** Number of monitored DHCP message type */
+static uint8_t monitored_msg_sz = sizeof(monitored_msgs) / sizeof(*monitored_msgs);
 
 /**
  * @code handle_dhcp_option_53(context, dhcp_option, dir, iphdr, dhcphdr);
@@ -168,37 +123,27 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     switch (dhcp_option[2])
     {
     // DHCP messages send by client
-    case DHCPv4_MESSAGE_TYPE_DISCOVER:
-    case DHCPv4_MESSAGE_TYPE_REQUEST:
-    case DHCPv4_MESSAGE_TYPE_DECLINE:
-    case DHCPv4_MESSAGE_TYPE_RELEASE:
-    case DHCPv4_MESSAGE_TYPE_INFORM:
+    case DHCP_MESSAGE_TYPE_DISCOVER:
+    case DHCP_MESSAGE_TYPE_REQUEST:
+    case DHCP_MESSAGE_TYPE_DECLINE:
+    case DHCP_MESSAGE_TYPE_RELEASE:
+    case DHCP_MESSAGE_TYPE_INFORM:
         giaddr = ntohl(dhcphdr[DHCP_GIADDR_OFFSET] << 24 | dhcphdr[DHCP_GIADDR_OFFSET + 1] << 16 |
                        dhcphdr[DHCP_GIADDR_OFFSET + 2] << 8 | dhcphdr[DHCP_GIADDR_OFFSET + 3]);
         if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
             (!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) {
-            context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
-            // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
-            if (context == mgmt_intf)
-            {
-                break;
-            }
-            aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
     // DHCP messages send by server
-    case DHCPv4_MESSAGE_TYPE_OFFER:
-    case DHCPv4_MESSAGE_TYPE_ACK:
-    case DHCPv4_MESSAGE_TYPE_NAK:
+    case DHCP_MESSAGE_TYPE_OFFER:
+    case DHCP_MESSAGE_TYPE_ACK:
+    case DHCP_MESSAGE_TYPE_NAK:
         if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
             (!context->is_uplink && dir == DHCP_TX)) {
-            context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
-            // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
-            if (context == mgmt_intf)
-            {
-                break;
-            }
-            aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
+            aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
         }
         break;
     default:
@@ -207,48 +152,6 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
     }
 }
 
-/**
- * @code handle_dhcpv6_option(context, dhcp_option, dir);
- *
- * @brief handle the logic related to DHCPv6 option
- *
- * @param context       Device (interface) context
- * @param dhcp_option   pointer to DHCP option buffer space
- * @param dir           packet direction
- *
- * @return none
- */
-static void handle_dhcpv6_option(dhcp_device_context_t *context,
-                                  const u_char dhcp_option,
-                                  dhcp_packet_direction_t dir)
-{
-    switch (dhcp_option)
-    {
-    case DHCPv6_MESSAGE_TYPE_SOLICIT:
-    case DHCPv6_MESSAGE_TYPE_REQUEST:
-    case DHCPv6_MESSAGE_TYPE_CONFIRM:
-    case DHCPv6_MESSAGE_TYPE_RENEW:
-    case DHCPv6_MESSAGE_TYPE_REBIND:
-    case DHCPv6_MESSAGE_TYPE_RELEASE:
-    case DHCPv6_MESSAGE_TYPE_DECLINE:
-    case DHCPv6_MESSAGE_TYPE_ADVERTISE:
-    case DHCPv6_MESSAGE_TYPE_REPLY:
-    case DHCPv6_MESSAGE_TYPE_RECONFIGURE:
-    case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
-        context->counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
-        // If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
-        if (context == mgmt_intf)
-        {
-            break;
-        }
-        aggregate_dev.counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
-        break;
-    default:
-        syslog(LOG_WARNING, "handle_dhcpv6_option(%s): Unknown DHCPv6 option type %d", context->intf, dhcp_option);
-        break;
-    }
-}
-
 /**
  * @code read_callback(fd, event, arg);
  *
@@ -268,29 +171,16 @@ static void read_callback(int fd, short event, void *arg)
     while ((event == EV_READ) &&
            ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0)) {
         struct ether_header *ethhdr = (struct ether_header*) context->buffer;
-        struct ip *iphdr;
-        struct ip6_hdr *ipv6hdr;
-        struct udphdr *udp;
-        uint8_t *dhcphdr;
-        int dhcp_option_offset;
-
-        bool is_ipv4 = (ntohs(ethhdr->ether_type) == ETHERTYPE_IP);
-        if (is_ipv4) {
-            iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
-            udp = (struct udphdr*) (context->buffer + UDPv4_START_OFFSET);
-            dhcphdr = context->buffer + DHCPv4_START_OFFSET;
-            dhcp_option_offset = DHCPv4_START_OFFSET + DHCPv4_OPTIONS_HEADER_SIZE;
-        } else {
-            ipv6hdr = (struct ip6_hdr*) (context->buffer + IP_START_OFFSET);
-            udp = (struct udphdr*) (context->buffer + UDPv6_START_OFFSET);
-            dhcphdr = context->buffer + DHCPv6_START_OFFSET;
-            dhcp_option_offset = DHCPv6_START_OFFSET;
-        }
-        if (is_ipv4 && dhcpv4_enabled && (buffer_sz > UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) &&
-            (ntohs(udp->len) > DHCPv4_OPTIONS_HEADER_SIZE)) {
-            int dhcp_sz = ntohs(udp->len) < buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr) ?
-                          ntohs(udp->len) : buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr);
-            int dhcp_option_sz = dhcp_sz - DHCPv4_OPTIONS_HEADER_SIZE;
+        struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
+        struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
+        uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
+        int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
+
+        if ((buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
+            (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) {
+            int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
+                          ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
+            int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
             const u_char *dhcp_option = context->buffer + dhcp_option_offset;
             dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
                                            ethhdr->ether_shost[1] == context->mac[1] &&
@@ -324,37 +214,6 @@ static void read_callback(int fd, short event, void *arg)
                     offset += dhcp_option[offset + 1] + 2;
                 }
             }
-        }
-        else if (!is_ipv4 && dhcpv6_enabled && (buffer_sz > UDPv6_START_OFFSET + sizeof(struct udphdr) + DHCPv6_TYPE_LENGTH)) {
-            const u_char* dhcp_header = context->buffer + dhcp_option_offset;
-            dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
-                                           ethhdr->ether_shost[1] == context->mac[1] &&
-                                           ethhdr->ether_shost[2] == context->mac[2] &&
-                                           ethhdr->ether_shost[3] == context->mac[3] &&
-                                           ethhdr->ether_shost[4] == context->mac[4] &&
-                                           ethhdr->ether_shost[5] == context->mac[5]) ?
-                                           DHCP_TX : DHCP_RX;
-            int offset = 0;
-            uint16_t option = 0;
-            uint16_t current_option_len = 0;
-            // Get to inner DHCP header from encapsulated RELAY_FORWARD or RELAY_REPLY header
-            while (dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_FORWARD || dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_REPLY)
-            {
-                // Get to DHCPv6_OPTION_RELAY_MSG from all options
-                offset += DHCPv6_RELAY_MSG_OPTIONS_OFFSET;
-                option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
-
-                while (option != DHCPv6_OPTION_RELAY_MSG)
-                {
-                    // Add to offset the option length and get the next option ID
-                    current_option_len = htons(*((uint16_t*)(&(dhcp_header[offset + DHCPv6_OPTION_LENGTH]))));
-                    offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH + current_option_len;
-                    option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
-                }
-                // Set the offset to DHCP-relay-message data
-                offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH;
-            }
-            handle_dhcpv6_option(context, dhcp_header[offset], dir);
         } else {
             syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
                    context->intf, buffer_sz);
@@ -363,73 +222,29 @@ static void read_callback(int fd, short event, void *arg)
 }
 
 /**
- * @code dhcp_device_is_dhcp_inactive(v4counters, v6counters, type);
+ * @code dhcp_device_is_dhcp_inactive(counters);
  *
  * @brief Check if there were no DHCP activity
  *
- * @param v4counters  current/snapshot v4counter
- *
- * @param v6counters  current/snapshot v6counter
- *
- * @param type        DHCP type
+ * @param counters  current/snapshot counter
  *
  * @return true if there were no DHCP activity, false otherwise
  */
-static bool dhcp_device_is_dhcp_inactive(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
-                                         uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
-                                         dhcp_type_t type)
+static bool dhcp_device_is_dhcp_inactive(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
 {
-    bool rv = true;
-    uint64_t *rx_counters;
-    uint64_t *rx_counter_snapshot;
-
-    switch (type)
-    {
-    case DHCPv4_TYPE:
-        rx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
-        rx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
-        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && rv; i++) {
-            rv = rx_counters[v4_monitored_msgs[i]] == rx_counter_snapshot[v4_monitored_msgs[i]];
-        }
-        break;
-
-    case DHCPv6_TYPE:
-        rx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
-        rx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
-        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && rv; i++) {
-            rv = rx_counters[v6_monitored_msgs[i]] == rx_counter_snapshot[v6_monitored_msgs[i]];
-        }
-        break;
+    uint64_t *rx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
+    uint64_t *rx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
 
-    default:
-        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-        break;
+    bool rv = true;
+    for (uint8_t i = 0; (i < monitored_msg_sz) && rv; i++) {
+        rv = rx_counters[monitored_msgs[i]] == rx_counter_snapshot[monitored_msgs[i]];
     }
 
     return rv;
 }
 
 /**
- * @code dhcp_device_is_dhcpv4_msg_unhealthy(type, counters);
- *
- * @brief Check if DHCP relay is functioning properly for message of type 'type'.
- *        For every rx of message 'type', there should be increment of the same message type.
- *
- * @param type      DHCP message type
- * @param counters  current/snapshot counter
- *
- * @return true if DHCP message 'type' is transmitted,false otherwise
- */
-static bool dhcp_device_is_dhcpv4_msg_unhealthy(dhcpv4_message_type_t type,
-                                                uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT])
-{
-    // check if DHCP message 'type' is being relayed
-    return ((v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
-            (v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
-}
-
-/**
- * @code dhcp_device_is_dhcpv6_msg_unhealthy(type, counters);
+ * @code dhcp_device_is_dhcp_msg_unhealthy(type, counters);
  *
  * @brief Check if DHCP relay is functioning properly for message of type 'type'.
  *        For every rx of message 'type', there should be increment of the same message type.
@@ -439,57 +254,34 @@ static bool dhcp_device_is_dhcpv4_msg_unhealthy(dhcpv4_message_type_t type,
  *
  * @return true if DHCP message 'type' is transmitted,false otherwise
  */
-static bool dhcp_device_is_dhcpv6_msg_unhealthy(dhcpv6_message_type_t type,
-                                                uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT])
+static bool dhcp_device_is_dhcp_msg_unhealthy(dhcp_message_type_t type,
+                                              uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
 {
     // check if DHCP message 'type' is being relayed
-    return ((v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
-            (v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
+    return ((counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] >  counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
+            (counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type])    );
 }
 
 /**
- * @code dhcp_device_check_positive_health(v4counters, v6counters, type);
+ * @code dhcp_device_check_positive_health(counters, counters_snapshot);
  *
- * @brief Check if DHCPv4/6 relay is functioning properly for monitored messages.
- *        DHCPv4 (Discover, Offer, Request, ACK.) and DHCPv6 (Solicit, Advertise, Request, Reply).
+ * @brief Check if DHCP relay is functioning properly for monitored messages (Discover, Offer, Request, ACK.)
  *        For every rx of monitored messages, there should be increment of the same message type.
  *
- * @param v4counters  current/snapshot counter
- *
- * @param v6counters  current/snapshot counter
- *
- * @param type        DHCP type
+ * @param counters  current/snapshot counter
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
-                                                           uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
-                                                           dhcp_type_t type)
+static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
     bool is_dhcp_unhealthy = false;
-
-    switch (type)
-    {
-    case DHCPv4_TYPE:
-        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-            is_dhcp_unhealthy = dhcp_device_is_dhcpv4_msg_unhealthy(v4_monitored_msgs[i], v4counters);
-        }
-        break;
-
-    case DHCPv6_TYPE:
-        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-            is_dhcp_unhealthy = dhcp_device_is_dhcpv6_msg_unhealthy(v6_monitored_msgs[i], v6counters);
-        }
-        break;
-
-    default:
-        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-            break;
+    for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+        is_dhcp_unhealthy = dhcp_device_is_dhcp_msg_unhealthy(monitored_msgs[i], counters);
     }
 
-    // if we have rx DORA/SARR then we should have corresponding tx DORA/SARR (DORA/SARR being relayed)
+    // if we have rx DORA then we should have corresponding tx DORA (DORA being relayed)
     if (is_dhcp_unhealthy) {
         rv = DHCP_MON_STATUS_UNHEALTHY;
     }
@@ -498,47 +290,27 @@ static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t v4counters[]
 }
 
 /**
- * @code dhcp_device_check_negative_health(v4counters, v6counters, type);
+ * @code dhcp_device_check_negative_health(counters);
  *
  * @brief Check that DHCP relayed messages are not being transmitted out of this interface/dev
  *        using its counters. The interface is negatively healthy if there are not DHCP message
  *        travelling through it.
  *
- * @param v4counters            current/snapshot counter
- * @param v6counters            current/snapshot counter
- * @param type                  DHCP type
+ * @param counters              recent interface counter
+ * @param counters_snapshot     snapshot counters
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
-                                                           uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
-                                                           dhcp_type_t type)
+static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
-    bool is_dhcp_unhealthy = false;
 
-    uint64_t *tx_counters;
-    uint64_t *tx_counter_snapshot;
+    uint64_t *tx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
+    uint64_t *tx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
 
-    switch (type)
-    {
-    case DHCPv4_TYPE:
-        tx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
-        tx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
-        for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-            is_dhcp_unhealthy = tx_counters[v4_monitored_msgs[i]] > tx_counter_snapshot[v4_monitored_msgs[i]];
-        }
-        break;
-    case DHCPv6_TYPE:
-        tx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
-        tx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
-        for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
-            is_dhcp_unhealthy = tx_counters[v6_monitored_msgs[i]] > tx_counter_snapshot[v6_monitored_msgs[i]];
-        }
-        break;
-    default:
-        syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-            break;
+    bool is_dhcp_unhealthy = false;
+    for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
+        is_dhcp_unhealthy = tx_counters[monitored_msgs[i]] > tx_counter_snapshot[monitored_msgs[i]];
     }
 
     // for negative validation, return unhealthy if DHCP packet are being
@@ -551,7 +323,7 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[]
 }
 
 /**
- * @code dhcp_device_check_health(check_type, v4counters, v6counters, type);
+ * @code dhcp_device_check_health(check_type, counters, counters_snapshot);
  *
  * @brief Check that DHCP relay is functioning properly given a check type. Positive check
  *        indicates for every rx of DHCP message of type 'type', there would increment of
@@ -560,80 +332,59 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[]
  *        considered unhealthy.
  *
  * @param check_type    type of health check
- * @param v4counters    current/snapshot counters
- * @param v6counters    current/snapshot counters
- * @param type          DHCP type
+ * @param counters      current/snapshot counter
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
 static dhcp_mon_status_t dhcp_device_check_health(dhcp_mon_check_t check_type,
-                                                  uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT],
-                                                  uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
-                                                  dhcp_type_t type)
+                                                  uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
-    if (dhcp_device_is_dhcp_inactive(v4counters, v6counters, type)) {
+    if (dhcp_device_is_dhcp_inactive(aggregate_dev.counters)) {
         rv = DHCP_MON_STATUS_INDETERMINATE;
     } else if (check_type == DHCP_MON_CHECK_POSITIVE) {
-        rv = dhcp_device_check_positive_health(v4counters, v6counters, type);
+        rv = dhcp_device_check_positive_health(counters);
     } else if (check_type == DHCP_MON_CHECK_NEGATIVE) {
-        rv = dhcp_device_check_negative_health(v4counters, v6counters, type);
+        rv = dhcp_device_check_negative_health(counters);
     }
 
     return rv;
 }
 
 /**
- * @code dhcp_print_counters(vlan_intf, type, v4counters, v6counters);
+ * @code dhcp_print_counters(vlan_intf, type, counters);
  *
  * @brief prints DHCP counters to sylsog.
  *
- * @param vlan_intf     vlan interface name
- * @param type          counter type
- * @param v4counters    interface counter
- * @param v6counters    interface counter
+ * @param vlan_intf vlan interface name
+ * @param type      counter type
+ * @param counters  interface counter
  *
  * @return none
  */
 static void dhcp_print_counters(const char *vlan_intf,
                                 dhcp_counters_type_t type,
-                                uint64_t v4counters[][DHCPv4_MESSAGE_TYPE_COUNT],
-                                uint64_t v6counters[][DHCPv6_MESSAGE_TYPE_COUNT])
+                                uint64_t counters[][DHCP_MESSAGE_TYPE_COUNT])
 {
-    static const char *v4_counter_desc[DHCP_COUNTERS_COUNT] = {
-        [DHCP_COUNTERS_CURRENT] = " Current",
-        [DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
-    };
-    static const char *v6_counter_desc[DHCP_COUNTERS_COUNT] = {
+    static const char *counter_desc[DHCP_COUNTERS_COUNT] = {
         [DHCP_COUNTERS_CURRENT] = " Current",
         [DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
     };
 
     syslog(
         LOG_NOTICE,
-        "DHCPv4 [%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n\
-         DHCPv6 [%*s-%*s rx/tx] Solicit: %*lu/%*lu, Advertise: %*lu/%*lu, Request: %*lu/%*lu, Reply: %*lu/%*lu\n",
+        "[%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n",
         IF_NAMESIZE, vlan_intf,
-        (int) strlen(v4_counter_desc[type]), v4_counter_desc[type],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_DISCOVER],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_DISCOVER],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_OFFER],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_OFFER],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_ACK],
-        DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_ACK],
-        IF_NAMESIZE, vlan_intf,
-        (int) strlen(v6_counter_desc[type]), v6_counter_desc[type],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_SOLICIT],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_SOLICIT],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REQUEST],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REPLY],
-        DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REPLY]
+        (int) strlen(counter_desc[type]), counter_desc[type],
+        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_DISCOVER],
+        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_DISCOVER],
+        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_OFFER],
+        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_OFFER],
+        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_REQUEST],
+        DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_ACK],
+        DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_ACK]
     );
 }
 
@@ -703,12 +454,12 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
         strncpy(ifr.ifr_name, context->intf, sizeof(ifr.ifr_name) - 1);
         ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
-        // Get v4 network address
+        // Get network address
         if (ioctl(fd, SIOCGIFADDR, &ifr) == -1) {
             syslog(LOG_ALERT, "ioctl: %s", explain_ioctl(fd, SIOCGIFADDR, &ifr));
             break;
         }
-        context->ipv4 = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr;
+        context->ip = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr;
 
         // Get mac address
         if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
@@ -719,30 +470,6 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
 
         close(fd);
 
-        // Get v6 network address
-        memset(&context->ipv6, 0, sizeof(context->ipv6));
-        struct ifaddrs *ifa, *ifa_tmp;
-
-        if (getifaddrs(&ifa) == -1) {
-            syslog(LOG_ALERT, "getifaddrs failed");
-            break;
-        }
-
-        ifa_tmp = ifa;
-        while (ifa_tmp) {
-            // Check if current interface has a valid IPv6 address (not link local address)
-            if ((strncmp(ifa_tmp->ifa_name, context->intf, sizeof(context->intf)) == 0) &&
-                (ifa_tmp->ifa_addr) &&
-                (ifa_tmp->ifa_addr->sa_family == AF_INET6) &&
-                (((struct sockaddr_in6*)(ifa_tmp->ifa_addr))->sin6_addr.__in6_u.__u6_addr16[0] != IPV6_LINK_LOCAL_PREFIX)) {
-
-                struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-                memcpy(&context->ipv6, &in6->sin6_addr, sizeof(context->ipv6));
-            }
-            ifa_tmp = ifa_tmp->ifa_next;
-        }
-        freeifaddrs(ifa);
-
         rv = 0;
     } while (0);
 
@@ -750,41 +477,20 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
 }
 
 /**
- * @code dhcp_device_get_ipv4(context);
+ * @code dhcp_device_get_ip(context);
  *
  * @brief Accessor method
  *
  * @param context       pointer to device (interface) context
  *
- * @return interface IPv4
+ * @return interface IP
  */
-int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip)
+int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip)
 {
     int rv = -1;
 
     if (context != NULL && ip != NULL) {
-        *ip = context->ipv4;
-        rv = 0;
-    }
-
-    return rv;
-}
-
-/**
- * @code dhcp_device_get_ipv6(context);
- *
- * @brief Accessor method
- *
- * @param context       pointer to device (interface) context
- *
- * @return interface IPv6
- */
-int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip)
-{
-    int rv = -1;
-
-    if (context != NULL && ip != NULL) {
-        *ip = context->ipv6;
+        *ip = context->ip;
         rv = 0;
     }
 
@@ -822,8 +528,7 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 
                 dev_context->is_uplink = is_uplink;
 
-                memset(dev_context->counters.v4counters, 0, sizeof(dev_context->counters.v4counters));
-                memset(dev_context->counters.v6counters, 0, sizeof(dev_context->counters.v6counters));
+                memset(dev_context->counters, 0, sizeof(dev_context->counters));
 
                 *context = dev_context;
                 rv = 0;
@@ -838,15 +543,14 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 }
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t giaddr_ip,
-                              struct in6_addr v6_vlan_ip)
+                              in_addr_t giaddr_ip)
 {
     int rv = -1;
 
@@ -856,20 +560,12 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
             break;
         }
 
-        // snaplen check for DHCPv4 size
-        if (dhcpv4_enabled && snaplen < UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) {
-            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv4 options", context->intf);
-            break;
-        }
-
-        // snaplen check for DHCPv6 size - DHCPv6 message type is the first byte of the udp payload
-        if (dhcpv6_enabled && snaplen < DHCPv6_START_OFFSET + 1) {
-            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv6 option", context->intf);
+        if (snaplen < UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) {
+            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCP options", context->intf);
             break;
         }
 
         context->giaddr_ip = giaddr_ip;
-        context->v6_vlan_ip = v6_vlan_ip;
 
         context->buffer = (uint8_t *) malloc(snaplen);
         if (context->buffer == NULL) {
@@ -907,17 +603,17 @@ void dhcp_device_shutdown(dhcp_device_context_t *context)
 }
 
 /**
- * @code dhcp_device_get_status(check_type, context, type);
+ * @code dhcp_device_get_status(check_type, context);
  *
  * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
  *        status
  */
-dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type)
+dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
 {
     dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
 
     if (context != NULL) {
-        rv = dhcp_device_check_health(check_type, context->counters.v4counters, context->counters.v6counters, type);
+        rv = dhcp_device_check_health(check_type, context->counters);
     }
 
     return rv;
@@ -931,17 +627,9 @@ dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_devic
 void dhcp_device_update_snapshot(dhcp_device_context_t *context)
 {
     if (context != NULL) {
-        if (dhcpv4_enabled) {
-            memcpy(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT],
-                context->counters.v4counters[DHCP_COUNTERS_CURRENT],
-                sizeof(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT]));
-        }
-
-        if (dhcpv6_enabled) {
-            memcpy(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT],
-                context->counters.v6counters[DHCP_COUNTERS_CURRENT],
-                sizeof(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT]));
-        }
+        memcpy(context->counters[DHCP_COUNTERS_SNAPSHOT],
+               context->counters[DHCP_COUNTERS_CURRENT],
+               sizeof(context->counters[DHCP_COUNTERS_SNAPSHOT]));
     }
 }
 
@@ -953,27 +641,6 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context)
 void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type)
 {
     if (context != NULL) {
-        dhcp_print_counters(context->intf, type, context->counters.v4counters[type], context->counters.v6counters[type]);
+        dhcp_print_counters(context->intf, type, context->counters[type]);
     }
 }
-
-/**
- * @code dhcp_device_active_types(dhcpv4, dhcpv6);
- *
- * @brief update local variables with active protocols
- */
-void dhcp_device_active_types(bool dhcpv4, bool dhcpv6)
-{
-    dhcpv4_enabled = dhcpv4;
-    dhcpv6_enabled = dhcpv6;
-}
-
-/**
- * @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
- *
- * @brief assign context address of mgmt interface
- */
-void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context)
-{
-    mgmt_intf = mgmt_intf_context;
-}
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index 433eb0907626..aa686f4e2718 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -18,43 +18,21 @@
 
 
 /**
- * DHCPv4 message types
+ * DHCP message types
  **/
 typedef enum
 {
-    DHCPv4_MESSAGE_TYPE_DISCOVER = 1,
-    DHCPv4_MESSAGE_TYPE_OFFER    = 2,
-    DHCPv4_MESSAGE_TYPE_REQUEST  = 3,
-    DHCPv4_MESSAGE_TYPE_DECLINE  = 4,
-    DHCPv4_MESSAGE_TYPE_ACK      = 5,
-    DHCPv4_MESSAGE_TYPE_NAK      = 6,
-    DHCPv4_MESSAGE_TYPE_RELEASE  = 7,
-    DHCPv4_MESSAGE_TYPE_INFORM   = 8,
-
-    DHCPv4_MESSAGE_TYPE_COUNT
-} dhcpv4_message_type_t;
-
-/**
- * DHCPv6 message types
- **/
-typedef enum
-{
-    DHCPv6_MESSAGE_TYPE_SOLICIT             = 1,
-    DHCPv6_MESSAGE_TYPE_ADVERTISE           = 2,
-    DHCPv6_MESSAGE_TYPE_REQUEST             = 3,
-    DHCPv6_MESSAGE_TYPE_CONFIRM             = 4,
-    DHCPv6_MESSAGE_TYPE_RENEW               = 5,
-    DHCPv6_MESSAGE_TYPE_REBIND              = 6,
-    DHCPv6_MESSAGE_TYPE_REPLY               = 7,
-    DHCPv6_MESSAGE_TYPE_RELEASE             = 8,
-    DHCPv6_MESSAGE_TYPE_DECLINE             = 9,
-    DHCPv6_MESSAGE_TYPE_RECONFIGURE         = 10,
-    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
-    DHCPv6_MESSAGE_TYPE_RELAY_FORWARD       = 12,
-    DHCPv6_MESSAGE_TYPE_RELAY_REPLY         = 13,
-
-    DHCPv6_MESSAGE_TYPE_COUNT
-} dhcpv6_message_type_t;
+    DHCP_MESSAGE_TYPE_DISCOVER = 1,
+    DHCP_MESSAGE_TYPE_OFFER    = 2,
+    DHCP_MESSAGE_TYPE_REQUEST  = 3,
+    DHCP_MESSAGE_TYPE_DECLINE  = 4,
+    DHCP_MESSAGE_TYPE_ACK      = 5,
+    DHCP_MESSAGE_TYPE_NAK      = 6,
+    DHCP_MESSAGE_TYPE_RELEASE  = 7,
+    DHCP_MESSAGE_TYPE_INFORM   = 8,
+
+    DHCP_MESSAGE_TYPE_COUNT
+} dhcp_message_type_t;
 
 /** packet direction */
 typedef enum
@@ -82,13 +60,6 @@ typedef enum
     DHCP_MON_STATUS_INDETERMINATE,  /** DHCP relay health could not be determined */
 } dhcp_mon_status_t;
 
-/** dhcp type */
-typedef enum
-{
-    DHCPv4_TYPE,
-    DHCPv6_TYPE,
-} dhcp_type_t;
-
 /** dhcp check type */
 typedef enum
 {
@@ -96,28 +67,19 @@ typedef enum
     DHCP_MON_CHECK_POSITIVE,    /** Validate that received DORA packets are relayed */
 } dhcp_mon_check_t;
 
-typedef struct
-{
-    uint64_t v4counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT];
-                                    /** current/snapshot counters of DHCPv4 packets */
-    uint64_t v6counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT];
-                                    /** current/snapshot counters of DHCPv6 packets */
-} counters_t;
-
 /** DHCP device (interface) context */
 typedef struct
 {
     int sock;                       /** Raw socket associated with this device/interface */
-    in_addr_t ipv4;                 /** ipv4 network address of this device (interface) */
-    struct in6_addr ipv6;           /** ipv6 network address of this device (interface) */
+    in_addr_t ip;                   /** network address of this device (interface) */
     uint8_t mac[ETHER_ADDR_LEN];    /** hardware address of this device (interface) */
-    in_addr_t giaddr_ip;            /** Gateway IPv4 address */
-    struct in6_addr v6_vlan_ip;     /** Vlan IPv6 address */
+    in_addr_t giaddr_ip;            /** Gateway IP address */
     uint8_t is_uplink;              /** north interface? */
     char intf[IF_NAMESIZE];         /** device (interface) name */
     uint8_t *buffer;                /** buffer used to read socket data */
     size_t snaplen;                 /** snap length or buffer size */
-    counters_t counters;            /** counters for DHCPv4/6 packets */
+    uint64_t counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT];
+                                    /** current/snapshot counters of DHCP packets */
 } dhcp_device_context_t;
 
 /**
@@ -132,28 +94,16 @@ typedef struct
 int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context);
 
 /**
- * @code dhcp_device_get_ipv4(context, ip);
+ * @code dhcp_device_get_ip(context, ip);
  *
  * @brief Accessor method
  *
  * @param context       pointer to device (interface) context
- * @param ip(out)       pointer to device IPv4
+ * @param ip(out)       pointer to device IP
  *
  * @return 0 on success, otherwise for failure
  */
-int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip);
-
-/**
- * @code dhcp_device_get_ipv6(context, ip);
- *
- * @brief Accessor method
- *
- * @param context       pointer to device (interface) context
- * @param ip(out)       pointer to device IPv6
- *
- * @return 0 on success, otherwise for failure
- */
-int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip);
+int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip);
 
 /**
  * @code dhcp_device_get_aggregate_context();
@@ -180,7 +130,7 @@ int dhcp_device_init(dhcp_device_context_t **context,
                      uint8_t is_uplink);
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip);
+ * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  *
@@ -188,15 +138,13 @@ int dhcp_device_init(dhcp_device_context_t **context,
  * @param snaplen           length of packet capture
  * @param base              pointer to libevent base
  * @param giaddr_ip         gateway IP address
- * @param v6_vlan_ip        vlan IPv6 address
  *
  * @return 0 on success, otherwise for failure
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t giaddr_ip,
-                              struct in6_addr v6_vlan_ip);
+                              in_addr_t giaddr_ip);
 
 /**
  * @code dhcp_device_shutdown(context);
@@ -210,18 +158,17 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
 void dhcp_device_shutdown(dhcp_device_context_t *context);
 
 /**
- * @code dhcp_device_get_status(check_type, context, type);
+ * @code dhcp_device_get_status(check_type, context);
  *
  * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
  *        status
  *
  * @param check_type        Type of validation
  * @param context           Device (interface) context
- * @param type              DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type);
+dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
 
 /**
  * @code dhcp_device_update_snapshot(context);
@@ -238,32 +185,10 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context);
  * @brief prints status counters to syslog. If context is null, it will print aggregate status
  *
  * @param context       Device (interface) context
- * @param type          Counter type to be printed
+ * @param counters_type Counter type to be printed
  *
  * @return none
  */
 void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
 
-/**
- * @code dhcp_device_active_types(dhcpv4, dhcpv6);
- *
- * @brief update local variables with active protocols
- *
- * @param dhcpv4       DHCPv4 enable flag
- * @param dhcpv6       DHCPv6 enable flag
- *
- * @return none
- */
-void dhcp_device_active_types(bool dhcpv4, bool dhcpv6);
-
-/**
- * @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
- *
- * @brief assign context address of mgmt interface
- *
- * @param mgmt_intf_context       MGMT interface context struct address
- *
- * @return none
- */
-void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context);
 #endif /* DHCP_DEVICE_H_ */
diff --git a/src/dhcpmon/src/dhcp_devman.c b/src/dhcpmon/src/dhcp_devman.c
index b36d926c1d5b..65484798dbd6 100644
--- a/src/dhcpmon/src/dhcp_devman.c
+++ b/src/dhcpmon/src/dhcp_devman.c
@@ -9,8 +9,6 @@
 #include <syslog.h>
 #include <sys/queue.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
-#include <stdbool.h>
 
 #include "dhcp_devman.h"
 
@@ -37,8 +35,7 @@ static uint32_t dhcp_num_mgmt_intf = 0;
 
 /** On Device  vlan interface IP address corresponding vlan downlink IP
  *  This IP is used to filter Offer/Ack packet coming from DHCP server */
-static in_addr_t v4_vlan_ip = 0;
-static struct in6_addr v6_vlan_ip = {0};
+static in_addr_t vlan_ip = 0;
 
 /* Device loopback interface ip, which will be used as the giaddr in dual tor setup. */
 static in_addr_t loopback_ip = 0;
@@ -139,8 +136,7 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
 
         rv = dhcp_device_init(&dev->dev_context, dev->name, dev->is_uplink);
         if (rv == 0 && intf_type == 'd') {
-            rv = dhcp_device_get_ipv4(dev->dev_context, &v4_vlan_ip);
-            rv = dhcp_device_get_ipv6(dev->dev_context, &v6_vlan_ip);
+            rv = dhcp_device_get_ip(dev->dev_context, &vlan_ip);
 
             dhcp_device_context_t *agg_dev = dhcp_device_get_aggregate_context();
 
@@ -148,9 +144,6 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
             strncpy(agg_dev->intf + sizeof(AGG_DEV_PREFIX) - 1, name, sizeof(agg_dev->intf) - sizeof(AGG_DEV_PREFIX));
             agg_dev->intf[sizeof(agg_dev->intf) - 1] = '\0';
         }
-        else if (rv == 0 && intf_type == 'm') {
-            dhcp_device_init_mgmt_intf(dev->dev_context);
-        }
 
         LIST_INSERT_HEAD(&intfs, dev, entry);
     }
@@ -181,7 +174,7 @@ int dhcp_devman_setup_dual_tor_mode(const char *name)
     }
 
     if (initialize_intf_mac_and_ip_addr(&loopback_intf_context) == 0 &&
-        dhcp_device_get_ipv4(&loopback_intf_context, &loopback_ip) == 0) {
+        dhcp_device_get_ip(&loopback_intf_context, &loopback_ip) == 0) {
             dual_tor_mode = 1;
     } else {
         syslog(LOG_ALERT, "failed to retrieve ip addr for loopback interface (%s)", name);
@@ -204,13 +197,11 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 
     if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) {
         LIST_FOREACH(int_ptr, &intfs, entry) {
-            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : v4_vlan_ip, v6_vlan_ip);
+            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
             if (rv == 0) {
-                char ipv6_addr[INET6_ADDRSTRLEN];
-                inet_ntop(AF_INET6, &int_ptr->dev_context->ipv6, ipv6_addr, sizeof(ipv6_addr));
                 syslog(LOG_INFO,
-                       "Capturing DHCP packets on interface %s, ipv4: 0x%08x, ipv6: %s, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
-                       int_ptr->name, int_ptr->dev_context->ipv4, ipv6_addr, int_ptr->dev_context->mac[0],
+                       "Capturing DHCP packets on interface %s, ip: 0x%08x, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
+                       int_ptr->name, int_ptr->dev_context->ip, int_ptr->dev_context->mac[0],
                        int_ptr->dev_context->mac[1], int_ptr->dev_context->mac[2], int_ptr->dev_context->mac[3],
                        int_ptr->dev_context->mac[4], int_ptr->dev_context->mac[5]);
             }
@@ -228,13 +219,13 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 }
 
 /**
- * @code dhcp_devman_get_status(check_type, context, type);
+ * @code dhcp_devman_get_status(check_type, context);
  *
  * @brief collects DHCP relay status info.
  */
-dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type)
+dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
 {
-    return dhcp_device_get_status(check_type, context, type);
+    return dhcp_device_get_status(check_type, context);
 }
 
 /**
@@ -276,13 +267,3 @@ void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type
         dhcp_device_print_status(context, type);
     }
 }
-
-/**
- * @code dhcp_devman_active_types(dhcpv4, dhcpv6);
- *
- * @brief update local variables with active protocols
- */
-void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6)
-{
-    dhcp_device_active_types(dhcpv4, dhcpv6);
-}
diff --git a/src/dhcpmon/src/dhcp_devman.h b/src/dhcpmon/src/dhcp_devman.h
index 6e30c654f69e..948e79cde4f4 100644
--- a/src/dhcpmon/src/dhcp_devman.h
+++ b/src/dhcpmon/src/dhcp_devman.h
@@ -87,17 +87,16 @@ int dhcp_devman_setup_dual_tor_mode(const char *name);
 int dhcp_devman_start_capture(size_t snaplen, struct event_base *base);
 
 /**
- * @code dhcp_devman_get_status(check_type, context, type);
+ * @code dhcp_devman_get_status(check_type, context);
  *
  * @brief collects DHCP relay status info.
  *
  * @param check_type        Type of validation
  * @param context           pointer to device (interface) context
- * @param type              DHCP type
  *
  * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
  */
-dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type);
+dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
 
 /**
  * @code dhcp_devman_update_snapshot(context);
@@ -120,16 +119,4 @@ void dhcp_devman_update_snapshot(dhcp_device_context_t *context);
  */
 void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
 
-/**
- * @code dhcp_devman_active_types(dhcpv4, dhcpv6);
- *
- * @brief update local variables with active protocols
- *
- * @param dhcpv4       flag indicating dhcpv4 is enabled
- * @param dhcpv6       flag indicating dhcpv6 is enabled
- *
- * @return none
- */
-void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6);
-
 #endif /* DHCP_DEVMAN_H_ */
diff --git a/src/dhcpmon/src/dhcp_mon.c b/src/dhcpmon/src/dhcp_mon.c
index 2777b6484082..74d9869741d1 100644
--- a/src/dhcpmon/src/dhcp_mon.c
+++ b/src/dhcpmon/src/dhcp_mon.c
@@ -12,24 +12,16 @@
 #include <sys/syscall.h>
 #include <syslog.h>
 #include <assert.h>
-#include <stdbool.h>
 
 #include "dhcp_mon.h"
 #include "dhcp_devman.h"
 
-/** DHCP device/interface state counters */
-typedef struct
-{
-    int v4_count;                               /** count in the number of DHCPv4 unhealthy checks */
-    int v6_count;                               /** count in the number of DHCPv6 unhealthy checks */
-} dhcp_mon_count_t;
-
 /** DHCP device/interface state */
 typedef struct
 {
     dhcp_mon_check_t check_type;                /** check type */
     dhcp_device_context_t* (*get_context)();    /** functor to a device context accessor function */
-    dhcp_mon_count_t counters;                  /** count in the number of unhealthy checks */
+    int count;                                  /** count in the number of unhealthy checks */
     const char *msg;                            /** message to be printed if unhealthy state is determined */
 } dhcp_mon_state_t;
 
@@ -37,10 +29,6 @@ typedef struct
 static int window_interval_sec = 18;
 /** dhcp_unhealthy_max_count max count of consecutive unhealthy statuses before reporting to syslog */
 static int dhcp_unhealthy_max_count = 10;
-/** DHCP versions flags */
-static bool dhcpv4_enabled;
-static bool dhcpv6_enabled;
-
 /** libevent base struct */
 static struct event_base *base;
 /** libevent timeout event struct */
@@ -57,15 +45,13 @@ static dhcp_mon_state_t state_data[] = {
     [0] = {
         .check_type = DHCP_MON_CHECK_POSITIVE,
         .get_context = dhcp_devman_get_agg_dev,
-        .counters.v4_count = 0,
-        .counters.v6_count = 0,
+        .count = 0,
         .msg = "dhcpmon detected disparity in DHCP Relay behavior. Duration: %d (sec) for vlan: '%s'\n"
     },
     [1] = {
         .check_type = DHCP_MON_CHECK_NEGATIVE,
         .get_context = dhcp_devman_get_mgmt_dev,
-        .counters.v4_count = 0,
-        .counters.v6_count = 0,
+        .count = 0,
         .msg = "dhcpmon detected DHCP packets traveling through mgmt interface (please check BGP routes.)"
                " Duration: %d (sec) for intf: '%s'\n"
     }
@@ -92,89 +78,36 @@ static void signal_callback(evutil_socket_t fd, short event, void *arg)
 }
 
 /**
- * @code check_dhcp_relay_health(state_data, dhcp_type);
+ * @code check_dhcp_relay_health(state_data);
  *
  * @brief check DHCP relay overall health
  *
  * @param state_data        pointer to dhcpmon state data
  *
- * @param type              DHCP type
- *
  * @return none
  */
-static void check_dhcp_relay_health(dhcp_mon_state_t *state_data, dhcp_type_t type)
+static void check_dhcp_relay_health(dhcp_mon_state_t *state_data)
 {
     dhcp_device_context_t *context = state_data->get_context();
-    dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context, type);
+    dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context);
 
     switch (dhcp_mon_status)
     {
     case DHCP_MON_STATUS_UNHEALTHY:
-        switch (type)
-        {
-        case DHCPv4_TYPE:
-            if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
-                syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
-                dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
-                dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
-            }
-            break;
-        case DHCPv6_TYPE:
-            if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
-                syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
-                dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
-                dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
-            }
-            break;
-
-        default:
-            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-            break;
+        if (++state_data->count > dhcp_unhealthy_max_count) {
+            syslog(LOG_ALERT, state_data->msg, state_data->count * window_interval_sec, context->intf);
+            dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
+            dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
         }
         break;
-
     case DHCP_MON_STATUS_HEALTHY:
-        switch (type)
-        {
-        case DHCPv4_TYPE:
-            state_data->counters.v4_count = 0;
-            break;
-        case DHCPv6_TYPE:
-            state_data->counters.v6_count = 0;
-            break;
-        default:
-            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-            break;
-        }
+        state_data->count = 0;
         break;
-
     case DHCP_MON_STATUS_INDETERMINATE:
-        switch (type)
-        {
-        case DHCPv4_TYPE:
-            if (state_data->counters.v4_count) {
-                if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
-                    syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
-                    dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
-                    dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
-                }
-            }
-            break;
-        case DHCPv6_TYPE:
-            if (state_data->counters.v6_count) {
-                if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
-                    syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
-                    dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
-                    dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
-                }
-            }
-            break;
-        default:
-            syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
-            break;
+        if (state_data->count) {
+            state_data->count++;
         }
         break;
-
     default:
         syslog(LOG_ERR, "DHCP Relay returned unknown status %d\n", dhcp_mon_status);
         break;
@@ -195,12 +128,7 @@ static void check_dhcp_relay_health(dhcp_mon_state_t *state_data, dhcp_type_t ty
 static void timeout_callback(evutil_socket_t fd, short event, void *arg)
 {
     for (uint8_t i = 0; i < sizeof(state_data) / sizeof(*state_data); i++) {
-        if (dhcpv4_enabled) {
-            check_dhcp_relay_health(&state_data[i], DHCPv4_TYPE);
-        }
-        if (dhcpv6_enabled) {
-            check_dhcp_relay_health(&state_data[i], DHCPv6_TYPE);
-        }
+        check_dhcp_relay_health(&state_data[i]);
     }
 
     dhcp_devman_update_snapshot(NULL);
@@ -213,17 +141,13 @@ static void timeout_callback(evutil_socket_t fd, short event, void *arg)
  * seconds. It also writes to syslog when dhcp relay has been unhealthy for consecutive max_count checks.
  *
  */
-int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6)
+int dhcp_mon_init(int window_sec, int max_count)
 {
     int rv = -1;
 
     do {
         window_interval_sec = window_sec;
         dhcp_unhealthy_max_count = max_count;
-        dhcpv4_enabled = dhcpv4;
-        dhcpv6_enabled = dhcpv6;
-
-        dhcp_devman_active_types(dhcpv4, dhcpv6);
 
         base = event_base_new();
         if (base == NULL) {
diff --git a/src/dhcpmon/src/dhcp_mon.h b/src/dhcpmon/src/dhcp_mon.h
index facd46da6860..ae8911ab51fc 100644
--- a/src/dhcpmon/src/dhcp_mon.h
+++ b/src/dhcpmon/src/dhcp_mon.h
@@ -17,12 +17,10 @@
  *
  * @param window_sec time interval between health checks
  * @param max_count max count of consecutive unhealthy statuses before reporting to syslog
- * @param dhcpv4    flag indicating dhcpv4 is enabled
- * @param dhcpv6    flag indicating dhcpv6 is enabled
  *
  * @return 0 upon success, otherwise upon failure
  */
-int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6);
+int dhcp_mon_init(int window_sec, int max_count);
 
 /**
  * @code dhcp_mon_shutdown();
diff --git a/src/dhcpmon/src/main.c b/src/dhcpmon/src/main.c
index 1cf931821495..29bc534accf0 100644
--- a/src/dhcpmon/src/main.c
+++ b/src/dhcpmon/src/main.c
@@ -16,7 +16,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdbool.h>
 
 #include "dhcp_mon.h"
 #include "dhcp_devman.h"
@@ -42,8 +41,7 @@ static const uint32_t dhcpmon_default_unhealthy_max_count = 10;
 static void usage(const char *prog)
 {
     printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]"
-            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>]"
-            "[-4 <DHCPv4 monitoring>] [-6 <DHCPv4 monitoring>] [-d]\n", prog);
+            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
     printf("where\n");
     printf("\tsouth interface: is a vlan interface,\n");
     printf("\tnorth interface: is a TOR-T1 interface,\n");
@@ -114,8 +112,6 @@ int main(int argc, char **argv)
     int max_unhealthy_count = dhcpmon_default_unhealthy_max_count;
     size_t snaplen = dhcpmon_default_snaplen;
     int make_daemon = 0;
-    bool dhcpv4_enabled = false;
-    bool dhcpv6_enabled = false;
 
     setlogmask(LOG_UPTO(LOG_INFO));
     openlog(basename(argv[0]), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON);
@@ -159,14 +155,6 @@ int main(int argc, char **argv)
             max_unhealthy_count = atoi(argv[i + 1]);
             i += 2;
             break;
-        case '4':
-            dhcpv4_enabled = true;
-            i++;
-            break;
-        case '6':
-            dhcpv6_enabled = true;
-            i++;
-            break;
         default:
             fprintf(stderr, "%s: %c: Unknown option\n", basename(argv[0]), argv[i][1]);
             usage(basename(argv[0]));
@@ -177,11 +165,7 @@ int main(int argc, char **argv)
         dhcpmon_daemonize();
     }
 
-    if (!dhcpv4_enabled && !dhcpv6_enabled) {
-        dhcpv4_enabled = true;
-    }
-
-    if ((dhcp_mon_init(window_interval, max_unhealthy_count, dhcpv4_enabled, dhcpv6_enabled) == 0) &&
+    if ((dhcp_mon_init(window_interval, max_unhealthy_count) == 0) &&
         (dhcp_mon_start(snaplen) == 0)) {
 
         rv = EXIT_SUCCESS;
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index a9004e2b00f5..407ac2c80bc9 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -68,7 +68,7 @@ dependent_startup_wait_for=start:exited
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0 -4 -6
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
 priority=4
 autostart=false
 autorestart=false
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index 521899b939f4..5456409738e6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -68,7 +68,7 @@ dependent_startup_wait_for=start:exited
 programs=dhcpmon-Vlan1000
 
 [program:dhcpmon-Vlan1000]
-command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0 -4 -6
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
 priority=4
 autostart=false
 autorestart=false

From 29b6f6290264a328bfbd9ee059afcecf362c51c5 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 12 Apr 2022 19:59:24 -0700
Subject: [PATCH 1139/1674] [202012] Run tune2fs during initramfs instead of
 image install (#10558)

If it is run during image install, it's not guaranteed that the
installation environment will have tune2fs available. Therefore, run it
during initramfs instead.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 files/Aboot/boot0.j2                 |  3 ---
 files/initramfs-tools/mke2fs         |  1 +
 files/initramfs-tools/union-mount.j2 |  1 +
 installer/arm64/install.sh           |  5 -----
 installer/armhf/install.sh           |  5 -----
 installer/x86_64/install.sh          | 11 -----------
 6 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 747a658b1e8b..1b1a83343e55 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -355,9 +355,6 @@ extract_image() {
     local rootdev="$(echo $mountstr | cut -f1 -d' ')"
     rootfs_type="$(echo $mountstr | cut -d' ' -f3)"
 
-    ## Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $rootdev
-
     info "Extracting $dockerfs from swi"
     ## Unpacking dockerfs delayed
     ## 1. when disk is vfat as it does not support symbolic link
diff --git a/files/initramfs-tools/mke2fs b/files/initramfs-tools/mke2fs
index 1f98f20c23c4..2c6d45ea5bc9 100644
--- a/files/initramfs-tools/mke2fs
+++ b/files/initramfs-tools/mke2fs
@@ -21,6 +21,7 @@ copy_exec /usr/sbin/mke2fs /usr/local/sbin/
 copy_exec /sbin/sfdisk
 copy_exec /sbin/fdisk
 copy_exec /sbin/resize2fs
+copy_exec /sbin/tune2fs
 copy_exec /sbin/findfs
 
 fstypes="ext4 ext3"
diff --git a/files/initramfs-tools/union-mount.j2 b/files/initramfs-tools/union-mount.j2
index 3ffe2f633d87..9fa2fb481905 100644
--- a/files/initramfs-tools/union-mount.j2
+++ b/files/initramfs-tools/union-mount.j2
@@ -129,6 +129,7 @@ case "${ROOT}" in
     *)
         ## Mount the raw partition again
         mount ${ROOT} ${rootmnt}/host
+        tune2fs -m 0 -r 0 ${ROOT}
         ;;
 esac
 
diff --git a/installer/arm64/install.sh b/installer/arm64/install.sh
index 7d77f43f256d..c1e20b62bf42 100755
--- a/installer/arm64/install.sh
+++ b/installer/arm64/install.sh
@@ -117,11 +117,6 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists
diff --git a/installer/armhf/install.sh b/installer/armhf/install.sh
index 84917552ec2d..c85170ff256e 100755
--- a/installer/armhf/install.sh
+++ b/installer/armhf/install.sh
@@ -117,11 +117,6 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 1adec3bae2f0..a75e70f1f6dd 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -434,9 +434,6 @@ if [ "$install_env" = "onie" ]; then
     # Make filesystem
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
-
     # Mount demo filesystem
     demo_mnt=$(${onie_bin} mktemp -d) || {
         echo "Error: Unable to create file system mount point"
@@ -469,20 +466,12 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 else
     demo_mnt="build_raw_image_mnt"
     demo_dev=$cur_wd/"%%OUTPUT_RAW_IMAGE%%"
 
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
-
     echo "Mounting $demo_dev on $demo_mnt..."
     mkdir $demo_mnt
     mount -t auto -o loop $demo_dev $demo_mnt

From 6ccc458d2b50c553c3e83bfab562726f9ca8ede1 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Thu, 14 Apr 2022 06:46:19 -0700
Subject: [PATCH 1140/1674] [CG-Fix-CVE-2021-44906] Patching on thrift.0.13.0
 for package minimist (#10554)

* [CG-Fix-CVE-2021-44906] Patching on thrift.0.13.0 for package minimist

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

* add more information in patch

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 src/thrift_0_13_0/Makefile                    |   1 +
 .../patch/0002-Remove-minimist-packages.patch | 182 ++++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 src/thrift_0_13_0/patch/0002-Remove-minimist-packages.patch

diff --git a/src/thrift_0_13_0/Makefile b/src/thrift_0_13_0/Makefile
index 55cb4d9212ef..a44b3d9180a1 100644
--- a/src/thrift_0_13_0/Makefile
+++ b/src/thrift_0_13_0/Makefile
@@ -24,6 +24,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Disable php perl and few other packages as they need additional packages to be installed
 	patch -p1 < ../patch/0001-Remove-unneeded-packages.patch
+	patch -p1 < ../patch/0002-Remove-minimist-packages.patch
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
diff --git a/src/thrift_0_13_0/patch/0002-Remove-minimist-packages.patch b/src/thrift_0_13_0/patch/0002-Remove-minimist-packages.patch
new file mode 100644
index 000000000000..55d49f7bb340
--- /dev/null
+++ b/src/thrift_0_13_0/patch/0002-Remove-minimist-packages.patch
@@ -0,0 +1,182 @@
+From b75e88a33d67ae05ef9b5fa001d2a63a2effe377 Oct 17, 2019
+From: richardyu-ms <richard.yu@microsoft.com>
+Date: Tue, 12 Apr 2022 15:46:16 +0000
+Subject: [PATCH] Fix security issue for package minimist
+
+---
+2 files changed, 6 insertions(+), 81 deletions(-)
+
+diff --git diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
+index 00bf05c92..2d84fb05a 100644
+--- a/lib/js/package-lock.json
++++ b/lib/js/package-lock.json
+@@ -1038,16 +1038,7 @@
+       "dev": true,
+       "requires": {
+         "acorn-node": "^1.3.0",
+-        "defined": "^1.0.0",
+-        "minimist": "^1.1.1"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
++        "defined": "^1.0.0"
+       }
+     },
+     "diffie-hellman": {
+@@ -2591,20 +2582,11 @@
+         "decamelize": "^1.1.2",
+         "loud-rejection": "^1.0.0",
+         "map-obj": "^1.0.1",
+-        "minimist": "^1.1.3",
+         "normalize-package-data": "^2.3.4",
+         "object-assign": "^4.0.1",
+         "read-pkg-up": "^1.0.1",
+         "redent": "^1.0.0",
+         "trim-newlines": "^1.0.0"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
+       }
+     },
+     "micromatch": {
+@@ -2665,11 +2647,6 @@
+         "brace-expansion": "^1.1.7"
+       }
+     },
+-    "minimist": {
+-      "version": "0.0.8",
+-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+-    },
+     "mixin-deep": {
+       "version": "1.3.1",
+       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+@@ -2694,10 +2671,7 @@
+     "mkdirp": {
+       "version": "0.5.1",
+       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+-      "requires": {
+-        "minimist": "0.0.8"
+-      }
++      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
+     },
+     "module-deps": {
+       "version": "6.2.0",
+@@ -3920,18 +3894,7 @@
+       "version": "1.0.0",
+       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+-      "dev": true,
+-      "requires": {
+-        "minimist": "^1.1.0"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
+-      }
++      "dev": true
+     },
+     "supports-color": {
+       "version": "5.5.0",
+diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
+index 8d0a7ff2f..e79c55d97 100644
+--- a/lib/ts/package-lock.json
++++ b/lib/ts/package-lock.json
+@@ -1139,16 +1139,7 @@
+       "dev": true,
+       "requires": {
+         "acorn-node": "^1.3.0",
+-        "defined": "^1.0.0",
+-        "minimist": "^1.1.1"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
++        "defined": "^1.0.0"
+       }
+     },
+     "diagnostics": {
+@@ -3032,20 +3023,11 @@
+         "decamelize": "^1.1.2",
+         "loud-rejection": "^1.0.0",
+         "map-obj": "^1.0.1",
+-        "minimist": "^1.1.3",
+         "normalize-package-data": "^2.3.4",
+         "object-assign": "^4.0.1",
+         "read-pkg-up": "^1.0.1",
+         "redent": "^1.0.0",
+         "trim-newlines": "^1.0.0"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
+       }
+     },
+     "micromatch": {
+@@ -3121,11 +3103,6 @@
+         "brace-expansion": "^1.1.7"
+       }
+     },
+-    "minimist": {
+-      "version": "0.0.8",
+-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+-    },
+     "mixin-deep": {
+       "version": "1.3.1",
+       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+@@ -3150,10 +3127,7 @@
+     "mkdirp": {
+       "version": "0.5.1",
+       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+-      "requires": {
+-        "minimist": "0.0.8"
+-      }
++      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
+     },
+     "module-deps": {
+       "version": "6.2.0",
+@@ -4396,18 +4370,7 @@
+       "version": "1.0.0",
+       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+-      "dev": true,
+-      "requires": {
+-        "minimist": "^1.1.0"
+-      },
+-      "dependencies": {
+-        "minimist": {
+-          "version": "1.2.0",
+-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+-          "dev": true
+-        }
+-      }
++      "dev": true
+     },
+     "supports-color": {
+       "version": "5.5.0",

From 9fd75ffd9d71f5ac5a663a6aa11e706d406241f3 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 14 Apr 2022 11:42:22 -0700
Subject: [PATCH 1141/1674] [202012][sonic-linkmgrd] Submodule Update (#10345)

[202012][sonic-linkmgrd]Submodule update

8507629 Jing Zhang      Mon Apr 4 10:25:22 2022 -0700   Lower unsolicited MUX state change notification log level to WARNING #57
17d217d Longxiang Lyu   Mon Mar 21 12:15:19 2022 +0800  Enhance clang format (#46)
c72fa2a Jing Zhang      Fri Apr 1 12:23:29 2022 -0700   Disable the feature that decreases link probe interval for measuring switch overhead #49 (#54)
256b01b Jing Zhang      Thu Mar 31 16:20:00 2022 -0700  Update link prober metrics posting logics #50 #53
dfd48d0 Jing Zhang      Wed Mar 23 16:27:45 2022 -0700  Decrease link probing interval after switchover to better determine the overhead of a toggle #43 (#48)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index ca4b9a15674e..85076291a921 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit ca4b9a15674e175b94e9ce4640cab50410b947b1
+Subproject commit 85076291a9211c97631615776fc2ce45470ad9c7

From 6af3de437281860ede7d0205cb221a2a187270f1 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 15 Apr 2022 11:47:02 -0700
Subject: [PATCH 1142/1674] [202012][copp cfg] enable dhcp trap for a couple
 more devices (#10582)

* [copp cfg] enable copp trap for a couple more devices

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 files/image_config/copp/copp_cfg.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
index 3ae61c3b5e4c..1b84b6df98da 100755
--- a/files/image_config/copp/copp_cfg.j2
+++ b/files/image_config/copp/copp_cfg.j2
@@ -81,7 +81,7 @@
 		    "trap_ids": "lldp",
 		    "trap_group": "queue4_group3"
 	    },
-{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] is not in ["ToRRouter", "EPMS", "MgmtTsTor"]) %}
+{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] is not in ['ToRRouter', 'EPMS', 'MgmtTsToR', 'MgmtToRRouter']) %}
 	    "dhcp_relay": {
 		    "trap_ids": "dhcp,dhcpv6",
 		    "trap_group": "queue4_group3"

From 85447401c75cf1f48e34734513720a90666b3872 Mon Sep 17 00:00:00 2001
From: Vivek R <vivekreddykarri98@gmail.com>
Date: Mon, 18 Apr 2022 00:42:05 -0700
Subject: [PATCH 1143/1674] [202012] [submodule] Advance sonic-snmpagent
 pointer (#10584)

414692f LLDPLocalSystemDataUpdater Exception Log Handled (#249)

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 60f5237aa94f..414692f2684e 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 60f5237aa94fffe5c9955c9490d3129581e86ecb
+Subproject commit 414692f2684e53dceca69055340f65d3461329cd

From fa1e364f547131a99bcaa1637e9e255c7b96fb63 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 19 Apr 2022 00:27:48 +0300
Subject: [PATCH 1144/1674] [services] kill container on stop in warm/fast mode
 (#10511)

To optimize stop on warm boot, added kill for containers

Use service "kill" in the shutdown path for fast and warm reboot. For all other reload methods, service "stop" is used.
This is done to save time in shutdown path, and to overall improve the time spent in warm and fast reload.

How - Use service_mgmt.sh to trigger common logic to initiate kill (fast/warm) or stop (cold) for database.sh, radv.sh, snmp.sh, telemetry.sh, mgmt-framework.sh

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>, Vaibhav H D <vaibhav.dixit@microsoft.com>
---
 files/build_templates/docker_image_ctl.j2     | 16 +++-
 .../build_templates/mgmt-framework.service.j2 |  6 +-
 .../per_namespace/database.service.j2         |  6 +-
 files/build_templates/snmp.service.j2         |  6 +-
 .../build_templates/sonic_debian_extension.j2 |  6 +-
 files/build_templates/telemetry.service.j2    |  6 +-
 files/scripts/database.sh                     |  1 +
 files/scripts/mgmt-framework.sh               |  1 +
 files/scripts/radv.sh                         | 85 +------------------
 files/scripts/service_mgmt.sh                 | 80 +++++++++++++++++
 files/scripts/snmp.sh                         |  1 +
 files/scripts/telemetry.sh                    |  1 +
 12 files changed, 115 insertions(+), 100 deletions(-)
 create mode 120000 files/scripts/database.sh
 create mode 120000 files/scripts/mgmt-framework.sh
 mode change 100755 => 120000 files/scripts/radv.sh
 create mode 100755 files/scripts/service_mgmt.sh
 create mode 120000 files/scripts/snmp.sh
 create mode 120000 files/scripts/telemetry.sh

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 0b2e85719f29..41a419662e7d 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -31,12 +31,11 @@ function updateSyslogConf()
 {
     # On multiNPU platforms, change the syslog target ip to docker0 ip to allow logs from containers
     # running on the namespace to reach the rsyslog service running on the host
-    # Also update the container name  
+    # Also update the container name
     if [[ ($NUM_ASIC -gt 1) ]]; then
         TARGET_IP=$(docker network inspect bridge --format={{ "'{{(index .IPAM.Config 0).Gateway}}'" }})
         CONTAINER_NAME="$DOCKERNAME"
         TMP_FILE="/tmp/rsyslog.$CONTAINER_NAME.conf"
-
         sonic-cfggen -t /usr/share/sonic/templates/rsyslog-container.conf.j2 -a "{\"target_ip\": \"$TARGET_IP\", \"container_name\": \"$CONTAINER_NAME\" }"  > $TMP_FILE
         docker cp $TMP_FILE ${DOCKERNAME}:/etc/rsyslog.conf
         rm -rf $TMP_FILE
@@ -437,6 +436,17 @@ stop() {
     {%- endif %}
 }
 
+kill() {
+    {%- if docker_container_name == "database" %}
+    docker kill $DOCKERNAME
+    if [ "$DEV" ]; then
+        ip netns delete "$NET_NS"
+    fi
+    {%- else %}
+    /usr/local/bin/container kill $DOCKERNAME
+    {%- endif %}
+}
+
 DOCKERNAME={{docker_container_name}}
 OP=$1
 DEV=$2 # namespace/device number to operate on
@@ -464,7 +474,7 @@ fi
 [ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment
 
 case "$1" in
-    start|wait|stop)
+    start|wait|stop|kill)
         $1
         ;;
     *)
diff --git a/files/build_templates/mgmt-framework.service.j2 b/files/build_templates/mgmt-framework.service.j2
index 1eb983a897fb..ff99afe62bc1 100644
--- a/files/build_templates/mgmt-framework.service.j2
+++ b/files/build_templates/mgmt-framework.service.j2
@@ -8,6 +8,6 @@ Before=ntp-config.service
 
 [Service]
 User={{ sonicadmin_user }}
-ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
-ExecStart=/usr/bin/{{docker_container_name}}.sh wait
-ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop
diff --git a/files/build_templates/per_namespace/database.service.j2 b/files/build_templates/per_namespace/database.service.j2
index c8a59ab25bbd..4990f41fbd81 100644
--- a/files/build_templates/per_namespace/database.service.j2
+++ b/files/build_templates/per_namespace/database.service.j2
@@ -14,9 +14,9 @@ StartLimitBurst=3
 
 [Service]
 User=root
-ExecStartPre=/usr/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
-ExecStart=/usr/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
-ExecStop=/usr/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
 Restart=always
 RestartSec=30
 
diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
index a510aac5571d..47110c0a10f8 100644
--- a/files/build_templates/snmp.service.j2
+++ b/files/build_templates/snmp.service.j2
@@ -10,8 +10,8 @@ StartLimitIntervalSec=1200
 StartLimitBurst=3
 
 [Service]
-ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
-ExecStart=/usr/bin/{{docker_container_name}}.sh wait
-ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 4d4f4b37bc05..16f2e8eb96ef 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -630,7 +630,7 @@ fi
 ## ensure proc is mounted
 sudo mount proc /proc -t proc || true
 if [[ $CONFIGURED_ARCH == armhf ]]; then
-    # A workaround to fix the armhf build hung issue, caused by sonic-platform-nokia-7215_1.0_armhf.deb post installation script 
+    # A workaround to fix the armhf build hung issue, caused by sonic-platform-nokia-7215_1.0_armhf.deb post installation script
     ps -eo pid,cmd | grep python | grep "/etc/entropy.py" | awk '{print $1}' | xargs sudo kill -9 2>/dev/null || true
 fi
 
@@ -713,6 +713,10 @@ sudo LANG=C cp $SCRIPTS_DIR/gbsyncd.sh $FILESYSTEM_ROOT/usr/local/bin/gbsyncd.sh
 sudo LANG=C cp $SCRIPTS_DIR/bgp.sh $FILESYSTEM_ROOT/usr/local/bin/bgp.sh
 sudo LANG=C cp $SCRIPTS_DIR/teamd.sh $FILESYSTEM_ROOT/usr/local/bin/teamd.sh
 sudo LANG=C cp $SCRIPTS_DIR/radv.sh $FILESYSTEM_ROOT/usr/local/bin/radv.sh
+sudo LANG=C cp $SCRIPTS_DIR/database.sh $FILESYSTEM_ROOT/usr/local/bin/database.sh
+sudo LANG=C cp $SCRIPTS_DIR/snmp.sh $FILESYSTEM_ROOT/usr/local/bin/snmp.sh
+sudo LANG=C cp $SCRIPTS_DIR/telemetry.sh $FILESYSTEM_ROOT/usr/local/bin/telemetry.sh
+sudo LANG=C cp $SCRIPTS_DIR/mgmt-framework.sh $FILESYSTEM_ROOT/usr/local/bin/mgmt-framework.sh
 
 # Copy sonic-netns-exec script
 sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2
index aa02e75ac07b..5fb9c4d6af23 100644
--- a/files/build_templates/telemetry.service.j2
+++ b/files/build_templates/telemetry.service.j2
@@ -10,8 +10,8 @@ StartLimitBurst=3
 
 [Service]
 User={{ sonicadmin_user }}
-ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
-ExecStart=/usr/bin/{{docker_container_name}}.sh wait
-ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
diff --git a/files/scripts/database.sh b/files/scripts/database.sh
new file mode 120000
index 000000000000..ce97295f0364
--- /dev/null
+++ b/files/scripts/database.sh
@@ -0,0 +1 @@
+service_mgmt.sh
\ No newline at end of file
diff --git a/files/scripts/mgmt-framework.sh b/files/scripts/mgmt-framework.sh
new file mode 120000
index 000000000000..ce97295f0364
--- /dev/null
+++ b/files/scripts/mgmt-framework.sh
@@ -0,0 +1 @@
+service_mgmt.sh
\ No newline at end of file
diff --git a/files/scripts/radv.sh b/files/scripts/radv.sh
deleted file mode 100755
index 1047808e4e44..000000000000
--- a/files/scripts/radv.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-function debug()
-{
-    /usr/bin/logger $1
-    /bin/echo `date` "- $1" >> ${DEBUGLOG}
-}
-
-function check_warm_boot()
-{
-    SYSTEM_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
-    SERVICE_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
-    if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
-        WARM_BOOT="true"
-    else
-        WARM_BOOT="false"
-    fi
-}
-
-function check_fast_boot ()
-{
-    if [[ $($SONIC_DB_CLI STATE_DB GET "FAST_REBOOT|system") == "1" ]]; then
-        FAST_BOOT="true"
-    else
-        FAST_BOOT="false"
-    fi
-}
-
-start() {
-    debug "Starting ${SERVICE}$DEV service..."
-
-    check_warm_boot
-    check_fast_boot
-    debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
-    debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
-
-    # start service docker
-    /usr/bin/${SERVICE}.sh start $DEV
-    debug "Started ${SERVICE}$DEV service..."
-}
-
-wait() {
-    /usr/bin/${SERVICE}.sh wait $DEV
-}
-
-stop() {
-    debug "Stopping ${SERVICE}$DEV service..."
-
-    check_warm_boot
-    check_fast_boot
-    debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
-    debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
-
-    # For WARM/FAST boot do not perform service stop
-    if [[ x"$WARM_BOOT" != x"true" ]] && [[ x"$FAST_BOOT" != x"true" ]]; then
-        /usr/bin/${SERVICE}.sh stop $DEV
-        debug "Stopped ${SERVICE}$DEV service..."
-    else
-        debug "Killing Docker radv..."
-        /usr/bin/docker kill radv &> /dev/null || debug "Docker radv is not running ($?) ..."
-    fi
-}
-
-DEV=$2
-
-SERVICE="radv"
-DEBUGLOG="/tmp/radv-debug$DEV.log"
-NAMESPACE_PREFIX="asic"
-if [ "$DEV" ]; then
-    NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
-    SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
-else
-    SONIC_DB_CLI="sonic-db-cli"
-fi
-
-case "$1" in
-    start|wait|stop)
-        $1
-        ;;
-    *)
-        echo "Usage: $0 {start|wait|stop}"
-        exit 1
-        ;;
-esac
diff --git a/files/scripts/radv.sh b/files/scripts/radv.sh
new file mode 120000
index 000000000000..ce97295f0364
--- /dev/null
+++ b/files/scripts/radv.sh
@@ -0,0 +1 @@
+service_mgmt.sh
\ No newline at end of file
diff --git a/files/scripts/service_mgmt.sh b/files/scripts/service_mgmt.sh
new file mode 100755
index 000000000000..d400c8472246
--- /dev/null
+++ b/files/scripts/service_mgmt.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+function debug()
+{
+    /usr/bin/logger $1
+    /bin/echo `date` "- $1" >> ${DEBUGLOG}
+}
+
+function check_warm_boot()
+{
+    SYSTEM_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
+    SERVICE_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
+    if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
+        WARM_BOOT="true"
+    else
+        WARM_BOOT="false"
+    fi
+}
+
+function check_fast_boot ()
+{
+    if [[ $($SONIC_DB_CLI STATE_DB GET "FAST_REBOOT|system") == "1" ]]; then
+        FAST_BOOT="true"
+    else
+        FAST_BOOT="false"
+    fi
+}
+
+start() {
+    debug "Starting ${SERVICE}$DEV service..."
+
+    # start service docker
+    /usr/bin/${SERVICE}.sh start $DEV
+    debug "Started ${SERVICE}$DEV service..."
+}
+
+wait() {
+    /usr/bin/${SERVICE}.sh wait $DEV
+}
+
+stop() {
+    debug "Stopping ${SERVICE}$DEV service..."
+
+    check_warm_boot
+    check_fast_boot
+    debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
+    debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
+
+    # For WARM/FAST boot do not perform service stop
+    if [[ x"$WARM_BOOT" != x"true" ]] && [[ x"$FAST_BOOT" != x"true" ]]; then
+        /usr/bin/${SERVICE}.sh stop $DEV
+        debug "Stopped ${SERVICE}$DEV service..."
+    else
+        debug "Killing Docker ${SERVICE}${DEV}..."
+        /usr/bin/${SERVICE}.sh kill $DEV
+    fi
+}
+
+DEV=$2
+
+SCRIPT_NAME=$(basename -- "$0")
+SERVICE="${SCRIPT_NAME%.*}"
+DEBUGLOG="/tmp/$SERVICE-debug$DEV.log"
+NAMESPACE_PREFIX="asic"
+if [ "$DEV" ]; then
+    NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
+    SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
+else
+    SONIC_DB_CLI="sonic-db-cli"
+fi
+
+case "$1" in
+    start|wait|stop)
+        $1
+        ;;
+    *)
+        echo "Usage: $0 {start|wait|stop}"
+        exit 1
+        ;;
+esac
diff --git a/files/scripts/snmp.sh b/files/scripts/snmp.sh
new file mode 120000
index 000000000000..ce97295f0364
--- /dev/null
+++ b/files/scripts/snmp.sh
@@ -0,0 +1 @@
+service_mgmt.sh
\ No newline at end of file
diff --git a/files/scripts/telemetry.sh b/files/scripts/telemetry.sh
new file mode 120000
index 000000000000..ce97295f0364
--- /dev/null
+++ b/files/scripts/telemetry.sh
@@ -0,0 +1 @@
+service_mgmt.sh
\ No newline at end of file

From 4ee75f490e73e3b7c4f412742a459cc4a6fc626f Mon Sep 17 00:00:00 2001
From: Jing Kan <jika@microsoft.com>
Date: Tue, 19 Apr 2022 15:59:20 +0800
Subject: [PATCH 1145/1674] [202012][copp_cfg] Enable dhcp trap for
 BmcMgmtToRRouter (#10596)

Signed-off-by: Jing Kan jika@microsoft.com
---
 files/image_config/copp/copp_cfg.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
index 1b84b6df98da..702a055522ef 100755
--- a/files/image_config/copp/copp_cfg.j2
+++ b/files/image_config/copp/copp_cfg.j2
@@ -81,7 +81,7 @@
 		    "trap_ids": "lldp",
 		    "trap_group": "queue4_group3"
 	    },
-{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] is not in ['ToRRouter', 'EPMS', 'MgmtTsToR', 'MgmtToRRouter']) %}
+{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] is not in ['ToRRouter', 'EPMS', 'MgmtTsToR', 'MgmtToRRouter', 'BmcMgmtToRRouter']) %}
 	    "dhcp_relay": {
 		    "trap_ids": "dhcp,dhcpv6",
 		    "trap_group": "queue4_group3"

From 9e5c017ab5b417474150f674787b1a6d5d23a9a3 Mon Sep 17 00:00:00 2001
From: Jing Kan <jika@microsoft.com>
Date: Wed, 20 Apr 2022 08:09:47 +0800
Subject: [PATCH 1146/1674] [202012][submodule] Advance sonic-utilities pointer
 (#10612)

Signed-off-by: Jing Kan jika@microsoft.com
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 3fc6e273015a..e800fa887a19 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 3fc6e273015a814cc61d1ad2a65be3ad50fbcca2
+Subproject commit e800fa887a1965a6a0d8ebe95c42e423a09e858c

From 9de6b2ca1240fd08e905bc78d511cbd7a6d6ef08 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 20 Apr 2022 10:03:37 -0700
Subject: [PATCH 1147/1674] [Arista] Fix arista-net initramfs hook (#10626)

The interface renaming logic fails if one interface is missing.
Because of the `set -e` the whole initramfs hook would abort early on
error.
This change fixes the current behavior to make sure missing interfaces
are properly skipped and ensure existing interface are renamed.
---
 files/initramfs-tools/arista-net | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/initramfs-tools/arista-net b/files/initramfs-tools/arista-net
index 8759746458d6..1d9ccf8a1824 100644
--- a/files/initramfs-tools/arista-net
+++ b/files/initramfs-tools/arista-net
@@ -47,7 +47,9 @@ arista_net_rename() {
     local new_name="$2"
     local from_name="$3"
     devname=$(arista_net_devname "$device_path" "$from_name")
-    [ -n "$devname" ] && ip link set "$devname" name "$new_name"
+    if [ -n "$devname" ]; then
+        ip link set "$devname" name "$new_name"
+    fi
 }
 
 # Sets the MAC address to the value passed by Aboot through /proc/cmdline

From c49206a8842a4ffdad93ffe95a034b7bea83e47e Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Wed, 5 Jan 2022 11:54:19 +0800
Subject: [PATCH 1148/1674] Fix docker-sonic-mgmt reproducible related issue.
 (#9647)

Reproducible build script breaks docker-sonic-mgmt build.
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 07eca94bce9f..2b49b1f0b613 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -18,6 +18,12 @@ DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
 
 URL_PREFIX=$(echo "${PACKAGE_URL_PREFIX}" | sed -E "s#(//[^/]*/).*#\1#")
 
+if [ $USER != 'root' ] && [ -n $(which sudo) ];then
+    SUDO=sudo
+else
+    SUDO=''
+fi
+
 log_err()
 {
     echo "$1" >> $LOG_PATH/error.log
@@ -73,7 +79,7 @@ set_reproducible_mirrors()
 
     local mirrors="/etc/apt/sources.list $(find /etc/apt/sources.list.d/ -type f)"
     for mirror in $mirrors; do
-        sed -i "$expression" "$mirror"
+        $SUDO sed -i "$expression" "$mirror"
     done
 }
 
@@ -162,7 +168,7 @@ run_pip_command()
             install=y
         elif [[ "$para" == *.whl ]]; then
             package_name=$(echo $para | cut -d- -f1 | tr _ .)
-            sed "/^${package_name}==/d" -i $tmp_version_file
+            $SUDO sed "/^${package_name}==/d" -i $tmp_version_file
         fi
     done
 

From de461504307fe4c31afd0f774d60502f8bc0756c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:40:06 +0800
Subject: [PATCH 1149/1674] [Build]: Fix pip version constraint conflict issue
 (#10525)

Why I did it
[Build]: Fix pip version constraint conflict issue
When a version is specified in the constraint file, if upgrading the version in build script, it will have conflict issue.

How I did it
If a specified version has specified in pip command line, then the version constraint will be skipped.
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 2b49b1f0b613..0333345cc9ce 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -169,6 +169,10 @@ run_pip_command()
         elif [[ "$para" == *.whl ]]; then
             package_name=$(echo $para | cut -d- -f1 | tr _ .)
             $SUDO sed "/^${package_name}==/d" -i $tmp_version_file
+        elif [[ "$para" == *==* ]]; then
+            # fix pip package constraint conflict issue
+            package_name=$(echo $para | cut -d= -f1)
+            $SUDO sed "/^${package_name}==/d" -i $tmp_version_file
         fi
     done
 

From fcf5dcf5eb5d19fd89002c0aecf0643397673b50 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Mon, 18 Apr 2022 15:19:22 -0700
Subject: [PATCH 1150/1674] Changes to support topology and port speed agnostic
 switch init for TD3 based platforms (#10587)

---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm  | 2 +-
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index ed03a9d589c2..fd376e5a5e02 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -52,7 +52,7 @@ stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
 sai_optimized_mmu=1
-mmu_init_config="TD3-MSFT-T0-100G"
+mmu_init_config="TD3-MSFT-CUSTOM"
 buf.map.egress_pool0.ingress_pool=0
 buf.map.egress_pool1.ingress_pool=0
 buf.map.egress_pool2.ingress_pool=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index cc5152815991..36dc686cb679 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -52,7 +52,7 @@ stable_size=0x5500000
 tdma_timeout_usec=15000000
 tslam_timeout_usec=15000000
 sai_optimized_mmu=1
-mmu_init_config="TD3-MSFT-T0-50G"
+mmu_init_config="TD3-MSFT-CUSTOM"
 buf.map.egress_pool0.ingress_pool=0
 buf.map.egress_pool1.ingress_pool=0
 buf.map.egress_pool2.ingress_pool=1

From e6c18fa6dd662d7a3a7b37f38fcefb42bcb671b2 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Wed, 20 Apr 2022 18:08:06 -0700
Subject: [PATCH 1151/1674] [Monit] Fix the issue which shows Monit can not
 reset its counter. (#10288)

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

Why I did it
This PR aims to fix the Monit issue which shows Monit can't reset its counter when monitoring memory usage of telemetry container.

Specifically the Monit configuration file related to monitoring memory usage of telemetry container is as following:

  check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
      if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
If memory usage of telemetry container is larger than 400MB for 10 times within 20 cycles (minutes), then it will be restarted.
Recently we observed, after telemetry container was restarted, its memory usage continuously increased from 400MB to 11GB within 1 hour, but it was not restarted anymore during this 1 hour sliding window.

The reason is Monit can't reset its counter to count again and Monit can reset its counter if and only if the status of monitored service was changed from Status failed to Status ok. However, during this 1 hour sliding window, the status of monitored service was not changed from Status failed to Status ok.

Currently for each service monitored by Monit, there will be an entry showing the monitoring status, monitoring mode etc. For example, the following output from command sudo monit status shows the status of monitored service to monitor memory usage of telemetry:

    Program 'container_memory_telemetry'
         status                             Status ok
         monitoring status          Monitored
         monitoring mode          active
         on reboot                      start
         last exit value                0
         last output                    -
         data collected               Sat, 19 Mar 2022 19:56:26
Every 1 minute, Monit will run the script to check the memory usage of telemetry and update the counter if memory usage is larger than 400MB. If Monit checked the counter and found memory usage of telemetry is larger than 400MB for 10 times
within 20 minutes, then telemetry container was restarted. Following is an example status of monitored service:

    Program 'container_memory_telemetry'
         status                             Status failed
         monitoring status          Monitored
         monitoring mode          active
         on reboot                      start
         last exit value                0
         last output                    -
         data collected               Tue, 01 Feb 2022 22:52:55
After telemetry container was restarted. we found memory usage of telemetry increased rapidly from around 100MB to more than 400MB during 1 minute and status of monitored service did not have a chance to be changed from Status failed to Status ok.

How I did it
In order to provide a workaround for this issue, Monit recently introduced another syntax format repeat every <n> cycles related to exec. This new syntax format will enable Monit repeat executing the background script if the error persists for a given number of cycles.

How to verify it
I verified this change on lab device str-s6000-acs-12. Another pytest PR (Azure/sonic-mgmt#5492) is submitted in sonic-mgmt repo for review.
---
 dockers/docker-sonic-telemetry/base_image_files/monit_telemetry | 2 +-
 files/image_config/monit/memory_checker                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
index b3ba8b25fe1a..3941aecd4b0c 100644
--- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
+++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
@@ -2,4 +2,4 @@
 ## Monit configuration for telemetry container
 ###############################################################################
 check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
-    if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
+    if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry" repeat every 2 cycles
diff --git a/files/image_config/monit/memory_checker b/files/image_config/monit/memory_checker
index 4f7912c1e56c..3cd0f2d80225 100755
--- a/files/image_config/monit/memory_checker
+++ b/files/image_config/monit/memory_checker
@@ -85,6 +85,8 @@ def check_memory_usage(container_name, threshold_value):
         if mem_usage_bytes > threshold_value:
             print("[{}]: Memory usage ({} Bytes) is larger than the threshold ({} Bytes)!"
                   .format(container_name, mem_usage_bytes, threshold_value))
+            syslog.syslog(syslog.LOG_INFO, "[{}]: Memory usage ({} Bytes) is larger than the threshold ({} Bytes)!"
+                  .format(container_name, mem_usage_bytes, threshold_value))
             sys.exit(3)
     else:
         syslog.syslog(syslog.LOG_ERR, "[memory_checker] Failed to retrieve memory value from '{}'"

From 55a6faf925661557d6b77d35b3d7cf3d17bfe414 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 21 Apr 2022 12:13:09 +0800
Subject: [PATCH 1152/1674] [Ci]: Support to sign image for cisco-8000 uefi
 secure boot (#10616)

Why I did it
[Ci]: Support to sign image for cisco-8000 uefi secure boot
---
 .../azure-pipelines-download-certificate.yml  | 33 +++++++++++++++++++
 .../official-build-cisco-8000.yml             | 13 ++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 .azure-pipelines/azure-pipelines-download-certificate.yml

diff --git a/.azure-pipelines/azure-pipelines-download-certificate.yml b/.azure-pipelines/azure-pipelines-download-certificate.yml
new file mode 100644
index 000000000000..3e1a58582f61
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-download-certificate.yml
@@ -0,0 +1,33 @@
+parameters:
+- name: connectionName
+  type: string
+  default: sonic-dev-connection
+- name: kevaultName
+  type: string
+  default: sonic-kv
+- name: certificateName
+  type: string
+  default: sonic-secure-boot
+
+steps:
+- task: AzureKeyVault@2
+  inputs:
+    connectedServiceName: ${{ parameters.connectionName }}
+    keyVaultName: ${{ parameters.kevaultName }}
+    secretsFilter: ${{ parameters.certificateName }}
+
+- script: |
+    set -e
+    TMP_FILE=$(mktemp)
+    echo "$CERTIFICATE" | base64 -d > $TMP_FILE
+    sudo mkdir -p /etc/certificates
+    mkdir -p $(Build.StagingDirectory)/target
+    # Save the public key
+    openssl pkcs12 -in $TMP_FILE -clcerts --nokeys -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN CERTIFICATE\)/\1/" > $(SIGNING_CERT)
+    # Save the private key
+    openssl pkcs12 -in $TMP_FILE -nocerts -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN PRIVATE KEY\)/\1/" | sudo tee $(SIGNING_KEY) 1>/dev/null
+    ls -lt $(SIGNING_CERT) $(SIGNING_KEY)
+    rm $TMP_FILE
+  env:
+    CERTIFICATE: $(${{ parameters.certificateName }})
+  displayName: "Save certificate"
diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
index 61b6b03171e3..474d3e743ff7 100644
--- a/.azure-pipelines/official-build-cisco-8000.yml
+++ b/.azure-pipelines/official-build-cisco-8000.yml
@@ -22,10 +22,17 @@ resources:
     name: Cisco-8000-sonic/platform-cisco-8000
     endpoint: cisco-connection
 
+
 variables:
 - group: SONIC-AKV-STROAGE-1
 - name: StorageSASKey
   value: $(sonicstorage-SasToken)
+- name: SONIC_ENABLE_SECUREBOOT_SIGNATURE
+  value: y
+- name: SIGNING_KEY
+  value: /etc/certificates/sonic-secure-boot-private.pem
+- name: SIGNING_CERT
+  value: $(Build.StagingDirectory)/target/sonic-secure-boot-public.pem
 
 stages:
 - stage: Build
@@ -41,6 +48,7 @@ stages:
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
       preSteps:
+      - template: azure-pipelines-download-certificate.yml
       - checkout: self
         submodules: recursive
         path: s
@@ -90,5 +98,10 @@ stages:
           StorageSASKey: $(StorageSASKey)
         condition: ne(variables['Build.Reason'], 'PullRequest')
         displayName: "Override cisco sai packages"
+      - script: |
+          echo "SONIC_ENABLE_SECUREBOOT_SIGNATURE := y" >> rules/config.user
+          echo "SIGNING_KEY := $(SIGNING_KEY)" >> rules/config.user
+          echo "SIGNING_CERT := $(SIGNING_CERT)" >> rules/config.user
+        displayName: "Enable secure boot signature"
       jobGroups:
       - name: cisco-8000

From 5779a92d99ec41c3f98f9e3dc5bd3855403de1a1 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Sat, 23 Apr 2022 13:57:50 +0800
Subject: [PATCH 1153/1674] [ci] Fix PR checker archieve artifacts step (#9357)
 (#10652)

Why I did it
When a failed job retry. Publish artifact will fail for duplicated name
---
 .azure-pipelines/azure-pipelines-image-template.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 37cad9e6c310..ee2d98eddc23 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -53,6 +53,10 @@ jobs:
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
         displayName: "Archive sonic image"
+      - publish:  $(Build.ArtifactStagingDirectory)
+        condition: failed()
+        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
+        displayName: "Archive failed sonic image"
       - ${{ parameters.postSteps }}
       - template: cleanup.yml
     jobGroups: ${{ parameters.jobGroups }}

From 48f5c0ebff112e11f9925ea24cffbfb314458229 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Sun, 24 Apr 2022 19:18:55 +0800
Subject: [PATCH 1154/1674] [CG] Fix CG alert about underscore version.
 (#10606)

Fix CG CVE-2021-23358
---
 src/thrift_0_13_0/Makefile                    |   1 +
 .../0003-Remove-underscore-packages.patch     | 120 ++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 src/thrift_0_13_0/patch/0003-Remove-underscore-packages.patch

diff --git a/src/thrift_0_13_0/Makefile b/src/thrift_0_13_0/Makefile
index a44b3d9180a1..3bdb7c2a145c 100644
--- a/src/thrift_0_13_0/Makefile
+++ b/src/thrift_0_13_0/Makefile
@@ -25,6 +25,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Disable php perl and few other packages as they need additional packages to be installed
 	patch -p1 < ../patch/0001-Remove-unneeded-packages.patch
 	patch -p1 < ../patch/0002-Remove-minimist-packages.patch
+	patch -p1 < ../patch/0003-Remove-underscore-packages.patch
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
diff --git a/src/thrift_0_13_0/patch/0003-Remove-underscore-packages.patch b/src/thrift_0_13_0/patch/0003-Remove-underscore-packages.patch
new file mode 100644
index 000000000000..afef27fee25d
--- /dev/null
+++ b/src/thrift_0_13_0/patch/0003-Remove-underscore-packages.patch
@@ -0,0 +1,120 @@
+diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
+index 2d84fb05a..96c555fc0 100644
+--- a/lib/js/package-lock.json
++++ b/lib/js/package-lock.json
+@@ -2274,8 +2274,7 @@
+         "mkdirp": "~0.5.1",
+         "requizzle": "~0.2.1",
+         "strip-json-comments": "~2.0.1",
+-        "taffydb": "2.6.2",
+-        "underscore": "~1.8.3"
++        "taffydb": "2.6.2"
+       }
+     },
+     "jshint": {
+@@ -3331,17 +3330,7 @@
+     "requizzle": {
+       "version": "0.2.1",
+       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
+-      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+-      "requires": {
+-        "underscore": "~1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294="
+     },
+     "resolve": {
+       "version": "1.1.7",
+@@ -4078,25 +4067,10 @@
+         "xtend": "^4.0.1"
+       }
+     },
+-    "underscore": {
+-      "version": "1.8.3",
+-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+-    },
+     "underscore-contrib": {
+       "version": "0.3.0",
+       "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+-      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+-      "requires": {
+-        "underscore": "1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc="
+     },
+     "underscore.string": {
+       "version": "3.3.5",
+diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
+index e79c55d97..3f1f822ce 100644
+--- a/lib/ts/package-lock.json
++++ b/lib/ts/package-lock.json
+@@ -2630,8 +2630,7 @@
+         "mkdirp": "~0.5.1",
+         "requizzle": "~0.2.1",
+         "strip-json-comments": "~2.0.1",
+-        "taffydb": "2.6.2",
+-        "underscore": "~1.8.3"
++        "taffydb": "2.6.2"
+       }
+     },
+     "jshint": {
+@@ -3847,17 +3846,7 @@
+     "requizzle": {
+       "version": "0.2.1",
+       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
+-      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+-      "requires": {
+-        "underscore": "~1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294="
+     },
+     "resolve": {
+       "version": "1.9.0",
+@@ -4585,25 +4574,10 @@
+         "xtend": "^4.0.1"
+       }
+     },
+-    "underscore": {
+-      "version": "1.8.3",
+-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+-    },
+     "underscore-contrib": {
+       "version": "0.3.0",
+       "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+-      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+-      "requires": {
+-        "underscore": "1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc="
+     },
+     "underscore.string": {
+       "version": "3.3.5",

From 44ec8372a4b25660f50b436c5112f70546335bb1 Mon Sep 17 00:00:00 2001
From: dflynn-Nokia <60479697+dflynn-Nokia@users.noreply.github.com>
Date: Sun, 24 Apr 2022 21:28:13 -0400
Subject: [PATCH 1155/1674] [Nokia ixs7215] Platform API temperature threshold
 value fixes (#10533)

Incorrect high-threshold and critical-high-threshold values are displayed for
some of the temperature sensors. This commit fixes that.

Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>
Co-authored-by: Jing Kan <jika@microsoft.com>
---
 .../7215/sonic_platform/test/test-thermal.py  |  2 +-
 .../7215/sonic_platform/thermal.py            | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
index 91ef75d8f9a7..95cc8e89f0d8 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
@@ -30,7 +30,7 @@ def main():
                 high_thresh = "NA"
 
             print("        Low Threshold(C): {}, High Threshold(C): {}".format(low_thresh,
-                                                                                 high_thresh))
+                                                                               high_thresh))
 
             try:
                 crit_low_thresh = thermal.get_low_critical_threshold()
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
index 20fdec61f38e..391a86858504 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
@@ -44,8 +44,8 @@ def __init__(self, thermal_index):
         if self.index < 3:
             i2c_path = self.I2C_CLASS_DIR + self.I2C_DEV_MAPPING[self.index - 1][0]
             sensor_index = self.I2C_DEV_MAPPING[self.index - 1][1]
-            sensor_max_suffix = "max"
-            sensor_crit_suffix = None
+            sensor_high_suffix = "max"
+            sensor_high_crit_suffix = None
             hwmon_node = os.listdir(i2c_path)[0]
             self.SENSOR_DIR = i2c_path + hwmon_node + '/'
 
@@ -53,16 +53,16 @@ def __init__(self, thermal_index):
         elif self.index < 6:
             i2c_path = self.I2C_CLASS_DIR + self.I2C_DEV_MAPPING[self.index - 1][0]
             sensor_index = self.I2C_DEV_MAPPING[self.index - 1][1]
-            sensor_max_suffix = "max"
-            sensor_crit_suffix = "crit"
+            sensor_high_suffix = "crit"
+            sensor_high_crit_suffix = None
             self.SENSOR_DIR = i2c_path
 
         # Armada 38x SOC temperature sensor
         else:
             dev_path = self.HWMON_CLASS_DIR
             sensor_index = 1
-            sensor_max_suffix = None
-            sensor_crit_suffix = None
+            sensor_high_suffix = None
+            sensor_high_crit_suffix = None
             hwmon_node = os.listdir(dev_path)[0]
             self.SENSOR_DIR = dev_path + hwmon_node + '/'
 
@@ -71,16 +71,16 @@ def __init__(self, thermal_index):
             + "temp{}_input".format(sensor_index)
 
         # sysfs file for high threshold value if supported for this sensor
-        if sensor_max_suffix:
+        if sensor_high_suffix:
             self.thermal_high_threshold_file = self.SENSOR_DIR \
-                + "temp{}_{}".format(sensor_index, sensor_max_suffix)
+                + "temp{}_{}".format(sensor_index, sensor_high_suffix)
         else:
             self.thermal_high_threshold_file = None
 
         # sysfs file for crit high threshold value if supported for this sensor
-        if sensor_crit_suffix:
+        if sensor_high_crit_suffix:
             self.thermal_high_crit_threshold_file = self.SENSOR_DIR \
-                + "temp{}_{}".format(sensor_index, sensor_crit_suffix)
+                + "temp{}_{}".format(sensor_index, sensor_high_crit_suffix)
         else:
             self.thermal_high_crit_threshold_file = None
 

From cc591039b30050fcf264df7327a6b02fd56ce338 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Mon, 25 Apr 2022 17:04:37 +0800
Subject: [PATCH 1156/1674] [submodule] Update submodule for sonic-mgmt-common
 (#10666)

---
 src/sonic-mgmt-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-mgmt-common b/src/sonic-mgmt-common
index 86c110812583..9824a3af9ef2 160000
--- a/src/sonic-mgmt-common
+++ b/src/sonic-mgmt-common
@@ -1 +1 @@
-Subproject commit 86c110812583d0132d6504a1e74eb0337f521fde
+Subproject commit 9824a3af9ef20b84d1f1bd72584c9ecd22ddc77b

From 6ad9daded3a060dd8f4362cc8614389a70955143 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 26 Apr 2022 17:54:51 +0800
Subject: [PATCH 1157/1674] [Submodule]: update submodule for sonic-restapi
 (#10679)

Why I did it
Update submodule sonic-restapi
e83e0e8 Fix Ctype_char larger than address space issue in 32-bit armhf (#107)
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index bd97dfeb4b45..e83e0e862cc4 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit bd97dfeb4b4564defbc10e521ee05bbfe0638315
+Subproject commit e83e0e862cc4e8a2627eaf79f1461e7d7d9a4e75

From 4dcf6c3dc93227b96ec5b2f856f20f695228a36c Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 26 Apr 2022 10:07:45 -0700
Subject: [PATCH 1158/1674] Advanced sonic-sairedis submodule (#10684)

---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 1fcc93f46a1d..77451cccb9d9 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 1fcc93f46a1d606e566670a1f25e289de782f5fb
+Subproject commit 77451cccb9d91a7d7953c542f92c7a08763da05d

From 1aeb6589642c052c3a957d78b7cff77df41b1fc9 Mon Sep 17 00:00:00 2001
From: Taylor Cai <103631396+cel-taylor@users.noreply.github.com>
Date: Fri, 22 Apr 2022 20:35:52 +0800
Subject: [PATCH 1159/1674] Fix issue test_crm and test_fib (#10585)

Why I did it
Fix issue (https://github.com/Azure/sonic-buildimage/issues/9171) and (https://github.com/Azure/sonic-buildimage/issues/9236)

How I did it
Add flag in config file for get correct count of IPv6 entry.
Add init config file to set IPv4 ECMP hash on L4.

How to verify it
Compile the sonic_platform wheel for e1031, then upload to device and install the wheel, verify using testbed.
---
 .../Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm | 4 ++++
 .../Celestica-E1031-T48S4/sai_postinit_cmd.soc                | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc

diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
index 02d785aa4cb0..3da3ff365e21 100644
--- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
@@ -1,3 +1,7 @@
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
+
+ipv6_lpm_128b_enable=1
+
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
 l3_alpm_hit_skip=1
 
diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc
new file mode 100644
index 000000000000..573706e302bd
--- /dev/null
+++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc
@@ -0,0 +1 @@
+setreg RTAG7_IPV4_TCP_UDP_HASH_FIELD_BMAP_2 IPV4_TCP_UDP_FIELD_BITMAP_A=0xf70

From 1c9cdc4c7a9e360b050fb4fdc3afbf0cefa42581 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 27 Apr 2022 23:25:14 +0800
Subject: [PATCH 1160/1674] [ci/build]: Upgrade SONiC package versions (#10594)

---
 .../build-sonic-slave-buster/versions-git     |  6 +++---
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 files/build/versions/default/versions-docker  | 20 +++++++++----------
 files/build/versions/default/versions-git     | 10 +++++-----
 files/build/versions/default/versions-web     |  4 ++--
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-buster-arm64                 |  1 -
 .../versions-deb-buster-armhf                 |  1 -
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-stretch                      |  2 +-
 .../dockers/docker-orchagent/versions-py3     |  3 +--
 .../dockers/docker-ptf/versions-deb-stretch   |  8 +++-----
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  6 +++---
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  3 ++-
 .../docker-syncd-brcm/versions-deb-buster     |  1 -
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  2 +-
 .../sonic-slave-buster/versions-deb-buster    |  6 +++---
 .../dockers/sonic-slave-buster/versions-git   |  4 ++--
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 13 ++++++------
 .../dockers/sonic-slave-stretch/versions-git  |  4 ++--
 .../versions/host-image/versions-deb-buster   |  4 +++-
 .../host-image/versions-deb-buster-arm64      |  1 +
 .../host-image/versions-deb-buster-armhf      |  1 +
 files/build/versions/host-image/versions-py3  |  6 +++---
 28 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 7fe9d319830c..2d256b4677b0 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,14 +1,14 @@
-https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
+https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
+https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 2d4d1b70a8ce..5d0e9986465a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ click==7.0
 docker==5.0.3
 ijson==2.6.1
 ipaddress==1.0.23
-jsondiff==1.3.1
+jsondiff==2.0.0
 jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index ebd285c7058f..d2f4f2d78ef3 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:96cabb5c2fe5309bf5d477ba3e83ba9b716c8bdbf97f3a26817b6a4a8da59a4a
-amd64:amd64/debian:stretch==sha256:54ae51f9db21d4e8d71f2a234fd0180d10dc7c78b76256002d30be3f07453ab9
-amd64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-amd64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
-arm64:arm64v8/debian:buster==sha256:a6b19c21082133146302e33c31b8aca9c313044b6cfe3dda041867fcd9d86fd9
-arm64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-arm64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
-armhf:arm32v7/debian:buster==sha256:2aa990397ec8d077cf5bc38ab05991dedb512f334a42366c167e1a5571ffdea1
-armhf:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
-armhf:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
\ No newline at end of file
+amd64:amd64/debian:buster==sha256:40dd1c1b1c36eac161ab63b6ce3a57d56ad79a667a37717a31721bac3f30aaf9
+amd64:amd64/debian:stretch==sha256:75383204de7da8eb4bb2724e5fb8dae2910ee78938ade4d35ed8afec19a90b0b
+amd64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+amd64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
+arm64:arm64v8/debian:buster==sha256:bf508d976de85857fd69e5da1f67d89f59ab3bc9f60b578ce24eee43047faf23
+arm64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+arm64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
+armhf:arm32v7/debian:buster==sha256:8e9f24e8010ba995daf25c6fafe8ea5c1914428cc29df867ffc034375d769a43
+armhf:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
+armhf:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 7b22e79f11ba..9cdf00e6cca2 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,6 +1,6 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
-https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
+https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
@@ -11,10 +11,10 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
+https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index eae59227e5c9..a37cdba56257 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -21,7 +21,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==3084d51335d332e66f0d81a42079516d
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
+https://deb.nodesource.com/setup_14.x==88aded33099764ca8f810f72f3c9a173
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
 https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-7_armhf.deb==385730df69b8d1f9e13d341f78f7b934
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-8_armhf.deb==74bd3c57609f226ecea5badcb1d55190
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 12d8dd999191..98d534edd3d7 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -48,4 +48,4 @@ patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
 python3-swsscommon==1.0.0
 python3.7-dev==3.7.3-2+deb10u3
-xz-utils==5.2.4-1
\ No newline at end of file
+xz-utils==5.2.4-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 5e4703193f07..9e0de58706b8 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 5e077944e023..7fc383597d13 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 245b95995f1f..3f9a96dedc96 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.3.15
+regex==2022.4.24
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
index 60e8a7f23463..419933398230 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -43,4 +43,4 @@ patch==2.7.5-1+deb9u2
 python-dev==2.7.13-2
 python-swsscommon==1.0.0
 python2.7-dev==2.7.13-2+deb9u6
-xz-utils==5.2.2-1.2+b1
\ No newline at end of file
+xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-py3 b/files/build/versions/dockers/docker-orchagent/versions-py3
index e81f03378794..aa6d42d04fba 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-py3
+++ b/files/build/versions/dockers/docker-orchagent/versions-py3
@@ -1,3 +1,2 @@
 netifaces==0.10.9
-pyroute2==0.5.14
-scapy==2.4.4
\ No newline at end of file
+pyroute2==0.5.14
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 551b9e4b34a0..152c095a521c 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -71,7 +71,7 @@ libfastjson4==0.99.4-1
 libffi-dev==3.2.1-6
 libffi6==3.2.1-6
 libfile-fcntllock-perl==0.22-3+b2
-libfribidi0==0.19.7-1+deb9u1
+libfribidi0==0.19.7-1+deb9u2
 libgc1c2==1:7.4.2-8+deb9u1
 libgcc-6-dev==6.3.0-18+deb9u1
 libgdbm3==1.8.3-14
@@ -169,7 +169,7 @@ libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2==2.9.4+dfsg1-2.2+deb9u6
 libxmuu1==2:1.1.2-2
 linux-libc-dev==4.9.303-1
 logrotate==3.11.0-0.1
@@ -227,7 +227,6 @@ tcpdump==4.9.3-1~deb9u2
 telnet==0.17-41
 tmux==2.3-4
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb9u3
 ucf==3.0036
 unzip==6.0-21+deb9u2
 vim==2:8.0.0197-4+deb9u5
@@ -238,5 +237,4 @@ xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
 xxd==2:8.0.0197-4+deb9u5
-xz-utils==5.2.2-1.2+b1
-zlib1g==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
+xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 3b0c68e87ad3..1782d0051acb 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.10.3
+paramiko==2.10.4
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 9b455c1cc55c..dcf1b2cd40ff 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -9,18 +9,18 @@ grpcio==1.44.0
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.11.3
-importlib-resources==5.6.0
+importlib-resources==5.7.1
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.4.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==3.20.0
+protobuf==3.20.1
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
 six==1.11.0
-typing_extensions==4.1.1
+typing_extensions==4.2.0
 urllib3==1.26.5
 werkzeug==2.1.1
 zipp==3.8.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 1e2eb3a427f3..bc06b437734c 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -3,7 +3,7 @@ charset-normalizer==2.0.12
 click==7.0
 idna==3.3
 ijson==2.6.1
-jsondiff==1.3.1
+jsondiff==2.0.0
 m2crypto==0.38.0
 netifaces==0.10.9
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index f2ccfbab1a1a..9c936e87e6ff 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -7,7 +7,8 @@ libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
-liblzma-dev==5.2.4-1
+liblzma-dev==5.2.4-1+deb10u1
+liblzma5==5.2.4-1+deb10u1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
 libpcap0.8-dev==1.8.1-6+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 77b47b9b16a5..7d3cbfa4f0e7 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -33,5 +33,4 @@ syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 50f6b3434530..690190b948b2 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -22,7 +22,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-7
+mrvllibsai==1.7.1-8
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index c21ec7d194f1..8dd7f0b825f7 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -19,7 +19,7 @@ libsainps==1.5.0
 libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
-libxml2==2.9.4+dfsg1-2.2+deb9u5
+libxml2==2.9.4+dfsg1-2.2+deb9u6
 openssh-client==1:7.4p1-10+deb9u7
 sshpass==1.06-1
 strace==4.15-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index cc47a2f6ce2e..fa183f9ad7e8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -728,7 +728,8 @@ liblvm2cmd2.03==2.03.02-3
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
 liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u7
-liblzma-dev==5.2.4-1
+liblzma-dev==5.2.4-1+deb10u1
+liblzma5==5.2.4-1+deb10u1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
@@ -1728,7 +1729,6 @@ xsltproc==1.1.32-2.2~deb10u1
 xterm==344-1+deb10u2
 xtrans-dev==1.3.5-1
 xxd==2:8.1.0875-5+deb10u2
-xz-utils==5.2.4-1
+xz-utils==5.2.4-1+deb10u1
 zip==3.0-11+b1
-zlib1g==1:1.2.11.dfsg-1+deb10u1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 216fb807f2ec..636201e22866 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 7fe13cf67e75..bf3f09fd6e02 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.3.15
+regex==2022.4.24
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 2c640c82c3f2..9d3badc94835 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -470,7 +470,7 @@ libfontconfig1==2.11.0-6.7+b1
 libfontenc1==1:1.1.3-1+b2
 libfop-java==1:2.1-6
 libfreetype6==2.6.3-3.2+deb9u2
-libfribidi0==0.19.7-1+deb9u1
+libfribidi0==0.19.7-1+deb9u2
 libgail-common==2.24.31-2
 libgail18==2.24.31-2
 libgbm1==13.0.6-1+b2
@@ -733,7 +733,7 @@ libobjc4==6.3.0-18+deb9u1
 libobjenesis-java==2.5.1-1
 libogg0==1.3.2-1
 libopenexr22==2.2.0-11+deb9u4
-libopenjp2-7==2.1.2-1.1+deb9u6
+libopenjp2-7==2.1.2-1.1+deb9u7
 libopenmpi-dev==2.0.2-2
 libopenmpi2==2.0.2-2
 libopus0==1.2~alpha2-1
@@ -1092,9 +1092,9 @@ libxml-sax-perl==0.99+dfsg-2
 libxml-simple-perl==2.22-1
 libxml-twig-perl==1:3.50-1
 libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u5
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u5
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u5
+libxml2==2.9.4+dfsg1-2.2+deb9u6
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u6
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u6
 libxmlgraphics-commons-java==2.1-2
 libxmlrpc-lite-perl==0.717-1
 libxmu6==2:1.1.2-2
@@ -1481,7 +1481,6 @@ xsltproc==1.1.29-2.1+deb9u2
 xterm==327-2+deb9u3
 xtrans-dev==1.3.5-1
 xxd==2:8.0.0197-4+deb9u5
-xz-utils==5.2.2-1.2+b1
+xz-utils==5.2.2-1.2+deb9u1
 zip==3.0-11+b1
-zlib1g==1:1.2.8.dfsg-5+deb9u1
 zlib1g-dev==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 58fe5e370634..636201e22866 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2ca0f524434a3b0a1f0268b73fe4b4590d95f20b
-https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
\ No newline at end of file
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 5d5c69a338f0..0760b2fe6e72 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -57,6 +57,7 @@ gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
 grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
+gzip==1.9-3+deb10u1
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
@@ -150,6 +151,7 @@ libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
 liblsan0==8.3.0-6
+liblzma5==5.2.4-1+deb10u1
 liblzo2-2==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
@@ -324,5 +326,5 @@ vim==2:8.1.0875-5+deb10u2
 vim-common==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
 xxd==2:8.1.0875-5+deb10u2
-xz-utils==5.2.4-1
+xz-utils==5.2.4-1+deb10u1
 zlib1g==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index b5413e74b657..4c1819e181ff 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -11,4 +11,5 @@ linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 pkg-config==0.29-6
 tsingma-bsp==1.0
 tzdata==2021a-0+deb10u4
+xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index fedd767e7ba2..3e38f16049b4 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -11,4 +11,5 @@ linux-image-4.19.0-12-2-armmp==4.19.152-1
 mrvlprestera==1.0
 pkg-config==0.29-6
 tzdata==2021a-0+deb10u4
+xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 806b4b8a4d99..19a0b239db9d 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,14 +6,14 @@ certifi==2021.10.8
 cffi==1.15.0
 charset-normalizer==2.0.12
 click==7.0
-cryptography==36.0.2
+cryptography==37.0.0
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
 jinja2==3.1.1
-jsondiff==1.3.1
+jsondiff==2.0.0
 jsonschema==2.6.0
 lxml==4.6.3
 m2crypto==0.38.0
@@ -32,7 +32,7 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.3.15
+regex==2022.4.24
 requests==2.27.1
 scapy==2.4.4
 six==1.16.0

From 705d3c0804323965715d42b24a597501308cbd5c Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 11 Mar 2022 08:09:07 -0800
Subject: [PATCH 1161/1674] [Arista] Remove arista.log from rsyslog default
 logrotate (#9731)

Why I did it
In parallel of this change Arista added a custom logrotate configuration as part of its driver library.
Having 2 logrotate configuration for the same log file triggers an issue.

Fixes aristanetworks/sonic#38

How I did it
Arista merged a few changes in sonic-buildimage which added a logrotate configuration aristanetworks/sonic@e43c797
It is therefore the right path to remove the arista.log line from the logrotate.d/rsyslog configuration.

How to verify it
Logrotate works without any error message, arista log rotation happens and arista daemons still append logs once file was truncated.
---
 files/image_config/logrotate/logrotate.d/rsyslog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/image_config/logrotate/logrotate.d/rsyslog b/files/image_config/logrotate/logrotate.d/rsyslog
index bedcdff896d2..cbf6e722eb90 100644
--- a/files/image_config/logrotate/logrotate.d/rsyslog
+++ b/files/image_config/logrotate/logrotate.d/rsyslog
@@ -24,7 +24,6 @@
 }
 
 /var/log/auth.log
-/var/log/arista.log
 /var/log/cron.log
 /var/log/syslog
 /var/log/teamd.log

From a07930bead444c11778ca1f0c1c01dcad04df472 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 29 Apr 2022 15:37:26 +0800
Subject: [PATCH 1162/1674] Update submodule sonic-sws-common (#10707)

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 54879741c7a7..ca8f33bb0a86 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 54879741c7a756c1545516b23e3faec12ab3621e
+Subproject commit ca8f33bb0a86b84f00d18f2a8501025efde65d5e

From 602c8e99dc38c10610b9eb29795febb637564b01 Mon Sep 17 00:00:00 2001
From: Nikola Dancejic <26731235+Ndancejic@users.noreply.github.com>
Date: Fri, 29 Apr 2022 16:20:18 -0700
Subject: [PATCH 1163/1674] [device config] Adding configuration for default
 route fallback (#10692)

Set sai_tunnel_underlay_route_mode attribute to fallback to default
route if more specific route is unavailable.
Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm   | 1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2 | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2    | 1 +
 src/sonic-device-data/tests/permitted_list                       | 1 +
 7 files changed, 7 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index fd376e5a5e02..e11d3a9c9512 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -6,6 +6,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index 36dc686cb679..a268ddfd0f18 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -6,6 +6,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 44a14508b666..7a4ca232ccd8 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 451bf238533c..6758cca35237 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -4,6 +4,7 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
index e2e37a247cac..9ad0dbf5fe1a 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2
@@ -4,6 +4,7 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index d0fcfd032e0f..10d4edfff1b0 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index e954014fb7f3..afbc97063c9d 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -2,6 +2,7 @@ sai_trap_group_priority
 use_all_splithorizon_groups
 riot_enable
 sai_tunnel_support
+sai_tunnel_underlay_route_mode
 riot_overlay_l3_intf_mem_size
 riot_overlay_l3_egress_mem_size
 l3_ecmp_levels

From 26055cf46e2e314cf191e72f29b0475951b3b52a Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Sat, 30 Apr 2022 10:40:27 -0700
Subject: [PATCH 1164/1674] [submodule]: update sonic-utilities submodule
 (#10713)

[202012][dualtor] Fix config_db.json path for config-reload
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index e800fa887a19..2a9aea65f0af 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit e800fa887a1965a6a0d8ebe95c42e423a09e858c
+Subproject commit 2a9aea65f0afdae659f23131dfda7ed2da0e2d3a

From 3da032766ed51248a5ef2676d5e1473724de5513 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Mon, 2 May 2022 09:37:14 -0700
Subject: [PATCH 1165/1674] [sonic-linkmgrd][202012] submodule update (#10703)

[sonic-linkmgrd][202012] submodule update

3523738 Jing Zhang      Sun Apr 3 20:54:40 2022 -0700   Reset link prober state when default route is back #56
8282e78 Jing Zhang      Fri Apr 15 15:59:34 2022 -0700  Keep incrementing sequence number when link prober is suspended and shutdown #55 (#65)
8246eb8 Jing Zhang      Thu Apr 14 18:49:36 2022 -0700  Shutdown ICMP heartbeats when default route state is missing and ToR is in auto mode #44 (#59)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 85076291a921..352373879e1b 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 85076291a9211c97631615776fc2ce45470ad9c7
+Subproject commit 352373879e1bcc76337705375edb8bb29aa5b7c3

From c70a35dda3467af44e00ddd98f3e2684a22170b9 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 29 Apr 2022 07:17:52 +0800
Subject: [PATCH 1166/1674] Fix the build target error when building
 sonic-rest-api (#10693)

Why I did it
Fix target target/debs/bullseye/sonic-rest-api_1.0.1_arm64.deb not existing issue, the correct target is target/debs/bullseye/sonic-rest-api_1.0.1_armhf.deb.
Fix issue: #9896

[ FAIL LOG START ] [ target/debs/stretch/sonic-rest-api_1.0.1_amd64.deb ]
[ REASON ] :      target/debs/stretch/sonic-rest-api_1.0.1_amd64.deb does not exist   NON-EXISTENT PREREQUISITES:
[ FLAGS  FILE    ] : []
---
 rules/restapi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/restapi.mk b/rules/restapi.mk
index e66b4a1d976a..21eed4cfbb51 100644
--- a/rules/restapi.mk
+++ b/rules/restapi.mk
@@ -1,6 +1,6 @@
 # sonic-rest-api package
 
-RESTAPI = sonic-rest-api_1.0.1_amd64.deb
+RESTAPI = sonic-rest-api_1.0.1_$(CONFIGURED_ARCH).deb
 $(RESTAPI)_SRC_PATH = $(SRC_PATH)/sonic-restapi
 $(RESTAPI)_DEPENDS += $(LIBHIREDIS_DEV) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
                             $(LIBNL_ROUTE3_DEV) $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON)

From 7b7737ef0f5b023c55002b28771ef41a03e039a5 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Thu, 28 Apr 2022 20:39:56 -0700
Subject: [PATCH 1167/1674] Adjustment to ingress pool size to accomodate brcm
 sai (#10694)

---
 .../Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
index e4d43cf75c23..d7b666d47037 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -11,7 +11,7 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32669440",
+            "size": "32689152",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "2058240"

From 96c0d8a7f8320be3f788ae8688c4e597a8478c3a Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 2 May 2022 17:14:13 -0700
Subject: [PATCH 1168/1674] [dhcp6relay] Add retry mechanism for binding socket
 to interface ipv6 addresses (#10712)

---
 src/dhcp6relay/src/relay.cpp | 71 +++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index 234646c1fb74..951b31f90a0c 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -378,44 +378,57 @@ void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int
     memset(&ll_addr, 0, sizeof(ll_addr));
 
     if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket\n");
+        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
     }
 
     if ((*server_sock= socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket\n");
+        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
     }
 
-
-    if (getifaddrs(&ifa) == -1) {
-        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
-        exit(1);
-    }
-
-    ifa_tmp = ifa;
-    while (ifa_tmp) {
-        if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
-            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-            if((strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {   
-                in6->sin6_family = AF_INET6;
-                in6->sin6_port = htons(RELAY_PORT);
-                addr = *in6;
-            }
-            if((strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {   
-                in6->sin6_family = AF_INET6;
-                in6->sin6_port = htons(RELAY_PORT);
-                ll_addr = *in6;
+    int retry = 0;
+    bool bind_addr = false;
+    bool bind_ll_addr = false;
+    do {
+        if (getifaddrs(&ifa) == -1) {
+            syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces with %s\n", strerror(errno));
+        }
+        else {
+            ifa_tmp = ifa;
+            while (ifa_tmp) {
+                if ((ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
+                    struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+                    if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {  
+                        bind_addr = true;
+                        in6->sin6_family = AF_INET6;
+                        in6->sin6_port = htons(RELAY_PORT);
+                        addr = *in6;
+                    }
+                    if(IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
+                        bind_ll_addr = true;
+                        in6->sin6_family = AF_INET6;
+                        in6->sin6_port = htons(RELAY_PORT);
+                        ll_addr = *in6;
+                    }
+                }
+                ifa_tmp = ifa_tmp->ifa_next;
             }
+            freeifaddrs(ifa);
         }
-        ifa_tmp = ifa_tmp->ifa_next;
-    }
-    freeifaddrs(ifa);
-    
-    if (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1) {
-        syslog(LOG_ERR, "bind: Failed to bind to socket\n");
+
+        if (bind_addr && bind_ll_addr) {
+            break;
+        }
+
+        syslog(LOG_WARNING, "Retry #%d to bind to sockets on interface %s\n", ++retry, config->interface.c_str());
+        sleep(5);
+    } while (retry < 6);
+
+    if ((!bind_addr) || (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1)) {
+        syslog(LOG_ERR, "bind: Failed to bind socket to global ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
     }
 
-    if (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1) {
-        syslog(LOG_ERR, "bind: Failed to bind to socket\n");
+    if ((!bind_ll_addr) || (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1)) {
+        syslog(LOG_ERR, "bind: Failed to bind socket to link local ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
     }
 }
 

From 9b55564289d075d1c788cfd4e8646b1b665e2915 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 2 May 2022 23:46:33 -0700
Subject: [PATCH 1169/1674] [sonic-snmpagent] Update submodule (#10730)

Include below commits:
```
c75440b 2022-05-02 | Fix: not to use blocking get_all() after keys() (#255) [Qi Luo]
```
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 414692f2684e..c75440bb93ec 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 414692f2684e53dceca69055340f65d3461329cd
+Subproject commit c75440bb93ecea3d1a8d5299257e6acdf86adc52

From 2a232730b077298a77c0f7132604e9ead2f78926 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Tue, 3 May 2022 20:07:10 -0700
Subject: [PATCH 1170/1674] [202012][Mellanox] Update SDK/FW to
 4.5.1500/2010.1500 and SAI version to 1.21.1.2 (#10464)

* [Mellanox] Update SDK/FW to 4.5.1500/2010.1500 and SAI version to 1.21.0.1

Signed-off-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>

* Updating Switch-SDK-drivers submodule pointer

* Updating SAI version
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/mlnx-sai.mk                          | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation          | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index df8d652ddac4..959fbf230ef9 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.1218
+MLNX_SPC_FW_VERSION = 13.2010.1500
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.1218
+MLNX_SPC2_FW_VERSION = 29.2010.1500
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.1218
+MLNX_SPC3_FW_VERSION = 30.2010.1500
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index f1b8af7af098..1946f156c2bd 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.20.2.6
+MLNX_SAI_VERSION = SAIRel1.21.1.2
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index c5f0f46b946b..83e68b5988d2 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit c5f0f46b946b7bbf78525cd9bcc3bead906299a4
+Subproject commit 83e68b5988d22ffcd5bc4962ed6605d570980c57
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index cae6d827c827..f57219d6555f 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit cae6d827c8274d253aef8ecd85c9a186f63f21cc
+Subproject commit f57219d6555f05c5598a60bed7a765bf11dd24ab
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 5da39bb9481c..75d54c5d9805 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.5.1208
+MLNX_SDK_VERSION = 4.5.1500
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 502ddbb2491c843fad6d86fce4df756f72181b67 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Fri, 6 May 2022 10:38:05 -0700
Subject: [PATCH 1171/1674] [202012][caclmgrd]Added logic to allow BFD port
 numbers (#10740)

* [caclmgrd]Added logic to allow BFD port numbers
---
 src/sonic-host-services/scripts/caclmgrd      | 31 ++++++++++--
 .../tests/caclmgrd/caclmgrd_bfd_test.py       | 50 +++++++++++++++++++
 .../tests/caclmgrd/caclmgrd_dhcp_test.py      | 22 ++++----
 .../tests/caclmgrd/test_bfd_vectors.py        | 29 +++++++++++
 4 files changed, 117 insertions(+), 15 deletions(-)
 create mode 100644 src/sonic-host-services/tests/caclmgrd/caclmgrd_bfd_test.py
 create mode 100644 src/sonic-host-services/tests/caclmgrd/test_bfd_vectors.py

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 083975889eb8..4b9649280e3d 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -60,6 +60,8 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
     ACL_TABLE_TYPE_CTRLPLANE = "CTRLPLANE"
 
+    BFD_SESSION_TABLE = "BFD_SESSION_TABLE"
+
     # To specify a port range instead of a single port, use iptables format:
     # separate start and end ports with a colon, e.g., "1000:2000"
     ACL_SERVICES = {
@@ -88,6 +90,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
     UPDATE_DELAY_SECS = 0.5
 
     DualToR = False
+    bfdAllowed = False
 
     def __init__(self, log_identifier):
         super(ControlPlaneAclManager, self).__init__(log_identifier)
@@ -170,6 +173,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 self.log_error("Error running command '{}'".format(cmd))
             elif stdout:
                 return stdout.rstrip('\n')
+        return ""
 
     def parse_int_to_tcp_flags(self, hex_value):
         tcp_flags_str = ""
@@ -708,6 +712,13 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                     self.update_thread[namespace] = None
                     return
 
+    def allow_bfd_protocol(self, namespace):
+        iptables_cmds = []
+        # Add iptables/ip6tables commands to allow all BFD singlehop and multihop sessions
+        iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "iptables -I INPUT 2 -p udp -m multiport --dports 3784,4784 -j ACCEPT")
+        iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -I INPUT 2 -p udp -m multiport --dports 3784,4784 -j ACCEPT")
+        self.run_commands(iptables_cmds)
+
     def run(self):
         # Set select timeout to 1 second
         SELECT_TIMEOUT_MS = 1000
@@ -733,12 +744,12 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         state_db_id = swsscommon.SonicDBConfig.getDbId("STATE_DB")
         dhcp_packet_mark_tbl = {}
 
+        # set up state_db connector
+        state_db_connector = swsscommon.DBConnector("STATE_DB", 0)
+
         if self.DualToR:
             self.log_info("Dual ToR mode")
 
-            # set up state_db connector
-            state_db_connector = swsscommon.DBConnector("STATE_DB", 0)
-
             subscribe_mux_cable = swsscommon.SubscriberStateTable(state_db_connector, self.MUX_CABLE_TABLE)
             sel.addSelectable(subscribe_mux_cable)
 
@@ -749,6 +760,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             for namespace in list(self.config_db_map.keys()):
                 self.setup_dhcp_chain(namespace)
 
+        # This should be migrated from state_db BFD session table to feature_table in the future when feature table support gets added for BFD
+        subscribe_bfd_session = swsscommon.SubscriberStateTable(state_db_connector, self.BFD_SESSION_TABLE)
+        sel.addSelectable(subscribe_bfd_session)
+
         # Map of Namespace <--> susbcriber table's object
         config_db_subscriber_table_map = {}
 
@@ -788,6 +803,16 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             db_id = redisSelectObj.getDbConnector().getDbId()
 
             if db_id == state_db_id:
+                while True:
+                    key, op, fvs = subscribe_bfd_session.pop()
+                    if not key:
+                        break
+
+                    if op == 'SET' and not self.bfdAllowed:
+                        self.allow_bfd_protocol(namespace)
+                        self.bfdAllowed = True
+                        sel.removeSelectable(subscribe_bfd_session)
+
                 if self.DualToR:
                     '''dhcp packet mark update'''
                     while True:
diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_bfd_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_bfd_test.py
new file mode 100644
index 000000000000..358d4c413b9c
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_bfd_test.py
@@ -0,0 +1,50 @@
+import os
+import sys
+import swsscommon
+
+from parameterized import parameterized
+from sonic_py_common.general import load_module_from_source
+from unittest import TestCase, mock
+from pyfakefs.fake_filesystem_unittest import patchfs
+
+from .test_bfd_vectors import CACLMGRD_BFD_TEST_VECTOR
+from tests.common.mock_configdb import MockConfigDb
+from unittest.mock import MagicMock, patch
+
+DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
+
+class TestCaclmgrdBfd(TestCase):
+    """
+        Test caclmgrd bfd
+    """
+    def setUp(self):
+        swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
+        test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        modules_path = os.path.dirname(test_path)
+        scripts_path = os.path.join(modules_path, "scripts")
+        sys.path.insert(0, modules_path)
+        caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
+        self.caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
+
+    @parameterized.expand(CACLMGRD_BFD_TEST_VECTOR)
+    @patchfs
+    def test_caclmgrd_bfd(self, test_name, test_data, fs):
+        if not os.path.exists(DBCONFIG_PATH):
+            fs.create_file(DBCONFIG_PATH) # fake database_config.json
+
+        MockConfigDb.set_config_db(test_data["config_db"])
+
+        with mock.patch("caclmgrd.subprocess") as mocked_subprocess:
+            popen_mock = mock.Mock()
+            popen_attrs = test_data["popen_attributes"]
+            popen_mock.configure_mock(**popen_attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+            mocked_subprocess.PIPE = -1
+
+            call_rc = test_data["call_rc"]
+            mocked_subprocess.call.return_value = call_rc
+
+            caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
+            caclmgrd_daemon.allow_bfd_protocol('')
+            mocked_subprocess.Popen.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
+
diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
index 4c60870e1abb..cedae80dd4ce 100644
--- a/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
+++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_dhcp_test.py
@@ -10,23 +10,21 @@
 from .test_dhcp_vectors import CACLMGRD_DHCP_TEST_VECTOR
 from tests.common.mock_configdb import MockConfigDb
 
-
 DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
 
-
-swsscommon.ConfigDBConnector = MockConfigDb
-test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-modules_path = os.path.dirname(test_path)
-scripts_path = os.path.join(modules_path, "scripts")
-sys.path.insert(0, modules_path)
-caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
-caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
-
-
 class TestCaclmgrdDhcp(TestCase):
     """
         Test caclmgrd dhcp
     """
+    def setUp(self):
+        swsscommon.ConfigDBConnector = MockConfigDb
+        test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        modules_path = os.path.dirname(test_path)
+        scripts_path = os.path.join(modules_path, "scripts")
+        sys.path.insert(0, modules_path)
+        caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
+        self.caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
+
     @parameterized.expand(CACLMGRD_DHCP_TEST_VECTOR)
     @patchfs
     def test_caclmgrd_dhcp(self, test_name, test_data, fs):
@@ -46,7 +44,7 @@ def test_caclmgrd_dhcp(self, test_name, test_data, fs):
 
             mark = test_data["mark"]
 
-            caclmgrd_daemon = caclmgrd.ControlPlaneAclManager("caclmgrd")
+            caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
             mux_update = test_data["mux_update"]
 
             for key,data in mux_update:
diff --git a/src/sonic-host-services/tests/caclmgrd/test_bfd_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_bfd_vectors.py
new file mode 100644
index 000000000000..35340849bd4c
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/test_bfd_vectors.py
@@ -0,0 +1,29 @@
+from unittest.mock import call
+import subprocess
+
+"""
+    caclmgrd bfd test vector
+"""
+CACLMGRD_BFD_TEST_VECTOR = [
+    [
+        "BFD_SESSION_TEST",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "subtype": "DualToR",
+                        "type": "ToRRouter",
+                    }
+                },
+            },
+            "expected_subprocess_calls": [
+                call("iptables -I INPUT 2 -p udp -m multiport --dports 3784,4784 -j ACCEPT", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -I INPUT 2 -p udp -m multiport --dports 3784,4784 -j ACCEPT", shell=True, universal_newlines=True, stdout=subprocess.PIPE)
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+        }
+    ]
+]

From be5eb80b14d839924cbd14cc832d6788a255c040 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 9 May 2022 14:07:02 -0700
Subject: [PATCH 1172/1674] [202012] Fix tagged VlanInterface if attached to
 multiple vlan as untagged member (#10589)

Backport https://github.com/Azure/sonic-buildimage/pull/8927 to 202012 branch
---
 src/sonic-config-engine/minigraph.py          | 22 +++++++++++------
 .../tests/sample-graph-resource-type.xml      |  9 +++++++
 .../tests/sample-graph-subintf.xml            |  8 +++++++
 .../tests/simple-sample-graph.xml             |  9 +++++++
 src/sonic-config-engine/tests/test_cfggen.py  | 24 +++++++++++++++----
 5 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 5a2baad87c2a..60a28ed19b3e 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -518,28 +518,36 @@ def parse_dpg(dpg, hname):
         vlans = {}
         vlan_members = {}
         dhcp_relay_table = {}
-        vlantype_name = ""
-        intf_vlan_mbr = defaultdict(list)
+        # Dict: vlan member (port/PortChannel) -> set of VlanID, in which the member if an untagged vlan member
+        untagged_vlan_mbr = defaultdict(set)
         for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
             vlanid = vintf.find(str(QName(ns, "VlanID"))).text
+            vlantype = vintf.find(str(QName(ns, "Type")))
+            if vlantype is None:
+                vlantype_name = ""
+            else:
+                vlantype_name = vlantype.text
             vintfmbr = vintf.find(str(QName(ns, "AttachTo"))).text
             vmbr_list = vintfmbr.split(';')
-            for i, member in enumerate(vmbr_list):
-                intf_vlan_mbr[member].append(vlanid)
+            if vlantype_name != "Tagged":
+                for member in vmbr_list:
+                    untagged_vlan_mbr[member].add(vlanid)
         for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
             vintfname = vintf.find(str(QName(ns, "Name"))).text
             vlanid = vintf.find(str(QName(ns, "VlanID"))).text
             vintfmbr = vintf.find(str(QName(ns, "AttachTo"))).text
             vlantype = vintf.find(str(QName(ns, "Type")))
-            if vlantype != None:
-                vlantype_name = vintf.find(str(QName(ns, "Type"))).text
+            if vlantype is None:
+                vlantype_name = ""
+            else:
+                vlantype_name = vlantype.text
             vmbr_list = vintfmbr.split(';')
             for i, member in enumerate(vmbr_list):
                 vmbr_list[i] = port_alias_map.get(member, member)
                 sonic_vlan_member_name = "Vlan%s" % (vlanid)
                 if vlantype_name == "Tagged":
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'tagged'}
-                elif len(intf_vlan_mbr[member]) > 1:
+                elif len(untagged_vlan_mbr[member]) > 1:
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'tagged'}
                 else:
                     vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'untagged'}
diff --git a/src/sonic-config-engine/tests/sample-graph-resource-type.xml b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
index 31f9fc43f2c1..09c2debfbb85 100644
--- a/src/sonic-config-engine/tests/sample-graph-resource-type.xml
+++ b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
@@ -164,6 +164,14 @@
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>
         </VlanInterface>
+        <VlanInterface>
+          <Name>ab4</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1001</VlanID>
+          <Tag>1001</Tag>
+          <Subnets>192.168.0.32/27</Subnets>
+        </VlanInterface>
         <VlanInterface>
           <Name>kk1</Name>
           <AttachTo>fortyGigE0/12</AttachTo>
@@ -179,6 +187,7 @@
           <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
           <VlanID>2000</VlanID>
           <Tag>2000</Tag>
+          <Type>Tagged</Type>
           <Subnets>192.168.0.240/27</Subnets>
         </VlanInterface>
         <VlanInterface>
diff --git a/src/sonic-config-engine/tests/sample-graph-subintf.xml b/src/sonic-config-engine/tests/sample-graph-subintf.xml
index 4a7ffe2f76ed..8940297e7488 100644
--- a/src/sonic-config-engine/tests/sample-graph-subintf.xml
+++ b/src/sonic-config-engine/tests/sample-graph-subintf.xml
@@ -164,6 +164,14 @@
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>
         </VlanInterface>
+        <VlanInterface>
+          <Name>ab4</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1001</VlanID>
+          <Tag>1001</Tag>
+          <Subnets>192.168.0.32/27</Subnets>
+        </VlanInterface>
         <VlanInterface>
           <Name>kk1</Name>
           <AttachTo>fortyGigE0/12</AttachTo>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
index 64d7477fbaf9..196d0b191078 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -164,6 +164,14 @@
           <Tag>1000</Tag>
           <Subnets>192.168.0.0/27</Subnets>
         </VlanInterface>
+        <VlanInterface>
+          <Name>ab4</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1001</VlanID>
+          <Tag>1001</Tag>
+          <Subnets>192.168.0.32/27</Subnets>
+        </VlanInterface>
         <VlanInterface>
           <Name>kk1</Name>
           <AttachTo>fortyGigE0/12</AttachTo>
@@ -179,6 +187,7 @@
           <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
           <VlanID>2000</VlanID>
           <Tag>2000</Tag>
+          <Type>Tagged</Type>
           <Subnets>192.168.0.240/27</Subnets>
         </VlanInterface>
         <VlanInterface>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index b2f8532b7636..79a3fd6fd9ac 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -134,6 +134,7 @@ def test_var_json_data(self, **kwargs):
                 utils.to_dict(output.strip()),
                 utils.to_dict(
                     '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan1001|Ethernet8": {\n        "tagging_mode": "tagged"\n    },'
                     ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
                     ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
                     ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
@@ -143,9 +144,10 @@ def test_var_json_data(self, **kwargs):
             self.assertEqual(
                 utils.to_dict(output.strip()),
                 utils.to_dict(
-                    '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "untagged"\n    },'
+                    '{\n    "Vlan1000|Ethernet8": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan1001|Ethernet8": {\n        "tagging_mode": "tagged"\n    },'
                     ' \n    "Vlan2000|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
-                    ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "tagged"\n    },'
+                    ' \n    "Vlan2001|Ethernet12": {\n        "tagging_mode": "untagged"\n    },'
                     ' \n    "Vlan2020|Ethernet12": {\n        "tagging_mode": "tagged"\n    }\n}'
                 )
             )
@@ -232,6 +234,7 @@ def test_minigraph_vlans(self, **kwargs):
             utils.to_dict(output.strip()),
             utils.to_dict(
                 "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'members': ['Ethernet8']}, "
+                "'Vlan1001': {'alias': 'ab4', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1001', 'members': ['Ethernet8']},"
                 "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001', 'members': ['Ethernet12']},"
                 "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000', 'members': ['Ethernet12']},"
                 "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020', 'members': ['Ethernet12']}}"
@@ -248,6 +251,7 @@ def test_minigraph_vlan_members(self, **kwargs):
                 utils.to_dict(output.strip()),
                 utils.to_dict(
                     "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan1001', 'Ethernet8'): {'tagging_mode': 'tagged'}, "
                     "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'tagged'}, "
                     "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
                     "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
@@ -258,9 +262,10 @@ def test_minigraph_vlan_members(self, **kwargs):
                 utils.to_dict(output.strip()),
                 utils.to_dict(
                     "{('Vlan2000', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
-                    "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'untagged'}, "
+                    "('Vlan1000', 'Ethernet8'): {'tagging_mode': 'tagged'}, "
+                    "('Vlan1001', 'Ethernet8'): {'tagging_mode': 'tagged'}, "
                     "('Vlan2020', 'Ethernet12'): {'tagging_mode': 'tagged'}, "
-                    "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'tagged'}}"
+                    "('Vlan2001', 'Ethernet12'): {'tagging_mode': 'untagged'}}"
                 )
             )
 
@@ -626,6 +631,9 @@ def test_minigraph_bgp_mon(self):
     def test_minigraph_sub_port_interfaces(self, check_stderr=True):
         self.verify_sub_intf(check_stderr=check_stderr)
 
+    def test_minigraph_sub_port_intf_resource_type_non_backend_tor(self, check_stderr=True):
+        self.verify_sub_intf_non_backend_tor(graph_file=self.sample_resource_graph, check_stderr=check_stderr)
+
     def test_minigraph_sub_port_intf_resource_type(self, check_stderr=True):
         self.verify_sub_intf(graph_file=self.sample_resource_graph, check_stderr=check_stderr)
 
@@ -659,6 +667,14 @@ def verify_no_vlan_member(self):
         output = self.run_script(argument)
         self.assertEqual(output.strip(), "{}")
 
+    def verify_sub_intf_non_backend_tor(self, **kwargs):
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
+
+        # All the other tables stay unchanged
+        self.test_var_json_data(graph_file=graph_file)
+        self.test_minigraph_vlans(graph_file=graph_file)
+        self.test_minigraph_vlan_members(graph_file=graph_file)
+
     def verify_sub_intf(self, **kwargs):
         graph_file = kwargs.get('graph_file', self.sample_graph_simple)
         check_stderr = kwargs.get('check_stderr', True)

From a296267097134af49735d05c6094cae4e2e10c00 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Mon, 9 May 2022 16:43:21 +0800
Subject: [PATCH 1173/1674] [ci] Support multi tags when pushing docker image
 (#10771)

---
 push_docker.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/push_docker.sh b/push_docker.sh
index 3e2da08d0b83..131494be2985 100755
--- a/push_docker.sh
+++ b/push_docker.sh
@@ -54,9 +54,10 @@ docker login -u ${REGISTRY_USERNAME} -p "${REGISTRY_PASSWD}" ${REGISTRY_SERVER_W
 docker_image_name=$(basename ${DOCKER_IMAGE_FILE} | cut -d. -f1)
 remote_image_name=${REGISTRY_SERVER_WITH_PORT}/${docker_image_name}
 
-[ -z "${DOCKER_IMAGE_TAG}" ] || {
-    push_it ${docker_image_name} ${remote_image_name}:${DOCKER_IMAGE_TAG}
-}
+for tag in ${DOCKER_IMAGE_TAG}
+do
+    push_it ${docker_image_name} ${remote_image_name}:$tag
+done
 
 if [ -n "${sonic_version}" ] && [ -n "${sonic_platform}" ]
 then

From 951d93e362b005e764b3cb61b1d6750ebc38d845 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 9 May 2022 23:26:09 +0800
Subject: [PATCH 1174/1674] Reduce image size for lazy installation packages
 (#10775)

Why I did it
The image size is too large, when there are multiple lazy packages and multiple platforms. It is not necessary to keep the lazy installation packages in multiple copies.
For cisco image, the image size will reduce from 3.5G to 1.7G.

How I did it
Use symbol links to only keep one package for each of the lazy package.
Make a new folder fsroot/platform/common
Copy the lazy packages into the folder.
When using a package in each of the platform, such as x86_64-grub, x86_64-8800_rp-r0, x86_64-8201_on-r0, etc, only make a symbol link to the package in the common folder.
---
 build_debian.sh                                 | 2 +-
 files/build_templates/sonic_debian_extension.j2 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index e23dde2458e7..824c6d2c8c4f 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -610,5 +610,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
+pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
 sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 16f2e8eb96ef..d42d60398e08 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -590,7 +590,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
 sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f --download-only
 
 sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}
-sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
+sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/common
+sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/common/
+sudo ln -sf "../common/{{ debfilename }}" "$FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/{{ debfilename }}"
 for f in $(find $FILESYSTEM_ROOT/var/cache/apt/archives -name "*.deb"); do
     sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
 done

From 8970425a75dabe8b8685bba8800dff81ac970d2f Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Mon, 9 May 2022 12:05:57 -0700
Subject: [PATCH 1175/1674] Fix calculation of $(1)_DEP_PKGS_SHA in
 Makefile.cache (#10764)

In Makefile.cache, for $(1)_DEP_PKGS_SHA, the intention is to include
the DEP_MOD_SHA and MOD_HASH of each of the current package's
dependencies. However, there's a level of dereferencing missing; instead
of grabbing the value of $(dfile)_DEP_MOD_SHA, it is literally using the
variable name $(dfile)_DEP_MOD_SHA. This means that the value of this
variable will not change when some dependency changes.

The impact of this is in transitive dependencies. For a specific
example, if there is some change in sairedis, then sairedis will be
rebuilt (because there's a change within that component), and swss will
be rebuilt (because it's a direct dependency), but
docker-swss-layer-buster will not get rebuilt, because only the direct
dependencies are effectively being checked, and those aren't changing.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 Makefile.cache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.cache b/Makefile.cache
index d09211298376..8ac02b73b383 100644
--- a/Makefile.cache
+++ b/Makefile.cache
@@ -183,7 +183,7 @@ define GET_MOD_DEP_SHA
 	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
 
 	# Include package dependencies hash values into package hash calculation
-	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$(1)_MOD_DEP_PKGS,$(dfile)_DEP_MOD_SHA $(dfile)_MOD_HASH))
+	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$($(1)_MOD_DEP_PKGS),$($(dfile)_DEP_MOD_SHA) $($(dfile)_MOD_HASH)))
 
 	$(eval $(1)_DEP_MOD_SHA := $(shell bash -c "git hash-object  $($(1)_DEP_MOD_SHA_FILES) && echo $($(1)_DEP_PKGS_SHA)" \
                             | sha1sum | awk '{print substr($$1,0,23);}'))

From f16d11237aa8224830d1d62e39888e46c7e8ba02 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Sat, 14 May 2022 00:29:34 -0700
Subject: [PATCH 1176/1674] [202012][submodule] Advance sonic-swss submodule
 pointer (#10803)

Update sonic-swss submodule to include below commits

b9163d3 [Vnet] Set BFD multihop to true for Vnet routes
cfed8c7 [202012][cherry-pick]Update orchagent to support new field pfcwd_sw_enable
172cd13 [ACL]Avoid incrementing crm count when ACL rule create fails
7377901 [pfcwd] Add vs test infrastructure
0b58595 Removing Vnet with scope default
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index f3b28739923a..cfed8c7fa5ee 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit f3b28739923a9fc32a2e1b68124abfe355afa415
+Subproject commit cfed8c7fa5eebd8db9a6b8e4e634080e2a0b0312

From 4f326e87796deee32c270ad5aada9e68ea226ccd Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 15 May 2022 05:58:24 +0800
Subject: [PATCH 1177/1674] Fix race condition between networking service and
 interface-config service (#10573) (#10766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backport https://github.com/Azure/sonic-buildimage/pull/10573 to 202012.

#### Why I did it

The PR is aimed to fix a bug that mgmt port eth0 may loss IP even if user configured static IP of eth0. This is not a always reproduceable issue, the reproducing flow is like:

1.	Systemd starts networking service, which runs a dhcp based configuration and assigned an ip from dhcp.
2.	Systemd starts interface-config service who depends on networking service
3.	Interface-config service runs command  “ifdown –force eth0”, check [line](https://github.com/Azure/sonic-buildimage/blob/16717d2dc51f74fa711ed7b4392ce5e4f7e71c29/files/image_config/interfaces/interfaces-config.sh#L4). but networking service is still running so that this [line](https://github.com/CumulusNetworks/ifupdown2/blob/ac32bec0e24d64c583778f387050a7b6f4269db0/ifupdown2/ifupdown/main.py#L74) failed with error: “error: Another instance of this program is already running.”. This error is printed by ifupdown2 lib who is the main process of networking service. So, ifdown actually does not work here, the ip of eth0 is not down.
4.	Interface-config service updates /etc/networking/interface to static configuration.
5.	Interface-config service runs command “systemctl restart networking”. This command kills the previous networking related processes (log: networking.service: Main process exited, code=killed, status=15/TERM), and try to reconfigure the ip address with static configuration. But it detects that the configured IP and the existing IP are the same, and it does not really configure the ip to kernel. Hence, the ip is still getting from dhcp. (this could be a bug of ifupdown2: previous ip is from dhcp, new ip is a static ip, it treats them as same instead of re-configuring the IP)
6.	When the lease of the ip expires, the ip of eth0 is removed by kernel and the issue reproduces.

The issue is not always reproduceable because networking service usually runs fast so that it won't hit step#3.

#### How I did it

Check networking service state before running "ifdown –force eth0", wait for it done if it is activating.

#### How to verify it

Manual test.
---
 .../interfaces/interfaces-config.sh           | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/files/image_config/interfaces/interfaces-config.sh b/files/image_config/interfaces/interfaces-config.sh
index 688b2f8433a5..f6aa4147a4e4 100755
--- a/files/image_config/interfaces/interfaces-config.sh
+++ b/files/image_config/interfaces/interfaces-config.sh
@@ -1,13 +1,39 @@
 #!/bin/bash
 
-ifdown --force eth0
+function wait_networking_service_done() {
+    local -i _WDOG_CNT="1"
+    local -ir _WDOG_MAX="30"
+
+    local -r _TIMEOUT="1s"
+
+    while [[ "${_WDOG_CNT}" -le "${_WDOG_MAX}" ]]; do
+        networking_status="$(systemctl is-active networking 2>&1)"
+
+        if [[ "${networking_status}" == active || "${networking_status}" == inactive || "${networking_status}" == failed ]] ; then
+            return
+        fi
+
+        echo "interfaces-config: networking service is running, wait for it done"
+
+        let "_WDOG_CNT++"
+        sleep "${_TIMEOUT}"
+    done
+
+    echo "interfaces-config: networking service is still running after 30 seconds, killing it"
+    systemctl kill networking 2>&1
+}
+
+if [[ $(ifquery --running eth0) ]]; then
+    wait_networking_service_done
+    ifdown --force eth0
+fi
 
 # Check if ZTP DHCP policy has been installed
-if [ -e /etc/network/ifupdown2/policy.d/ztp_dhcp.json ]; then
+if [[ -e /etc/network/ifupdown2/policy.d/ztp_dhcp.json ]]; then
     # Obtain port operational state information
     redis-dump -d 0 -k "PORT_TABLE:Ethernet*"  -y > /tmp/ztp_port_data.json
 
-    if [ $? -ne 0 ] || [ ! -e /tmp/ztp_port_data.json ] || [ "$(cat /tmp/ztp_port_data.json)" = "" ]; then
+    if [[ $? -ne 0 || ! -e /tmp/ztp_port_data.json || "$(cat /tmp/ztp_port_data.json)" = "" ]]; then
         echo "{}" > /tmp/ztp_port_data.json
     fi
 
@@ -27,11 +53,11 @@ CFGGEN_PARAMS=" \
 "
 sonic-cfggen $CFGGEN_PARAMS
 
-[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
-[ -f /var/run/dhclient6.eth0.pid ] && kill `cat /var/run/dhclient6.eth0.pid` && rm -f /var/run/dhclient6.eth0.pid
+[[ -f /var/run/dhclient.eth0.pid ]] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
+[[ -f /var/run/dhclient6.eth0.pid ]] && kill `cat /var/run/dhclient6.eth0.pid` && rm -f /var/run/dhclient6.eth0.pid
 
 for intf_pid in $(ls -1 /var/run/dhclient*.Ethernet*.pid 2> /dev/null); do
-    [ -f ${intf_pid} ] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
+    [[ -f ${intf_pid} ]] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
 done
 
 # Read sysctl conf files again

From bca8a244c6ef3e58067f71a91da4c1334d7176f4 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Sun, 15 May 2022 15:05:29 +0300
Subject: [PATCH 1178/1674] [202012] [Fastboot] Delay LLDP service for better
 fastboot performance (#10568) (#10744)

This PR is to backport a fix #10568
This PR is dependent on PR: #10745

- Why I did it
Profiling the system state on init after fast-reboot during create_switch function execution, it is possible to see few python scripts running at the same time.
This parallel execution consume CPU time and the duration of create_switch is longer than it should be.
Following this finding, and the motivation to ensure these services will not interfere in the future, LLDP is delayed in 90 seconds until the system finish the init flow after fastboot.

- How I did it
Add a timer for LLDP service.
Copy the timer file to the host bin image.

- How to verify it
Run fast-reboot on MLNX platform and observe faster create_switch execution time.
---
 files/build_templates/init_cfg.json.j2        |  2 +-
 files/build_templates/lldp.timer.j2           |  1 +
 .../per_namespace/lldp.service.j2             |  3 --
 .../per_namespace/lldp.timer.j2               | 12 +++++++
 .../build_templates/sonic_debian_extension.j2 | 13 ++++++++
 files/scripts/syncd.sh                        | 13 ++++++--
 slave.mk                                      | 31 +++++++++++++++++++
 7 files changed, 68 insertions(+), 7 deletions(-)
 create mode 120000 files/build_templates/lldp.timer.j2
 create mode 100644 files/build_templates/per_namespace/lldp.timer.j2

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index 2b21f270c06d..b0e630771129 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -21,7 +21,7 @@
 {%- set features = [("bgp", "enabled", false, "enabled"),
                    ("database", "always_enabled", false, "always_enabled"),
                    ("dhcp_relay", "enabled", false, "enabled"),
-                   ("lldp", "enabled", false, "enabled"),
+                   ("lldp", "enabled", true, "enabled"),
                    ("pmon", "enabled", false, "enabled"),
                    ("radv", "enabled", false, "enabled"),
                    ("snmp", "enabled", true, "enabled"),
diff --git a/files/build_templates/lldp.timer.j2 b/files/build_templates/lldp.timer.j2
new file mode 120000
index 000000000000..8e6950d6f3bc
--- /dev/null
+++ b/files/build_templates/lldp.timer.j2
@@ -0,0 +1 @@
+per_namespace/lldp.timer.j2
\ No newline at end of file
diff --git a/files/build_templates/per_namespace/lldp.service.j2 b/files/build_templates/per_namespace/lldp.service.j2
index fca84462934b..080f4a825b7d 100644
--- a/files/build_templates/per_namespace/lldp.service.j2
+++ b/files/build_templates/per_namespace/lldp.service.j2
@@ -21,6 +21,3 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'tru
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
 Restart=always
 RestartSec=30
-
-[Install]
-WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/lldp.timer.j2 b/files/build_templates/per_namespace/lldp.timer.j2
new file mode 100644
index 000000000000..67622a32851b
--- /dev/null
+++ b/files/build_templates/per_namespace/lldp.timer.j2
@@ -0,0 +1,12 @@
+[Unit]
+# This delay is for fast/warm reboot performance
+Description=Delays LLDP docker until SONiC has started
+PartOf=lldp{% if multi_instance == 'true' %}@%i{% endif %}.service
+
+[Timer]
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
+Unit=lldp{% if multi_instance == 'true' %}@%i{% endif %}.service
+
+[Install]
+WantedBy=timers.target sonic.target sonic-delayed.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index d42d60398e08..95fcf4e24c0f 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -700,6 +700,19 @@ if [ -f {{service}} ]; then
     echo "{{service}}" | sudo tee -a $GENERATED_SERVICE_FILE
 fi
 {% endfor %}
+{% for timer in installer_timers.split(' ') -%}
+if [ -f {{timer}} ]; then
+    sudo cp {{timer}} $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+
+    {% if "@" in timer %}
+    MULTI_INSTANCE="{{timer}}"
+    SINGLE_INSTANCE=${MULTI_INSTANCE/"@"}
+    sudo cp $SINGLE_INSTANCE $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+    {% endif %}
+
+    echo "{{timer}}" | sudo tee -a $GENERATED_SERVICE_FILE
+fi
+{% endfor %}
 if [ -f iccpd.service ]; then
     sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable iccpd.service
 fi
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index 95c3e3841ba8..9f7418bbed07 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -36,12 +36,19 @@ function startplatform() {
 }
 
 function waitplatform() {
-    
+
     if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
         debug "Starting pmon service..."
         /bin/systemctl start pmon
         debug "Started pmon service"
     fi
+    if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then
+        debug "LLDP service is delayed by a timer for better fast/warm boot performance"
+    else
+        debug "Starting lldp service..."
+        /bin/systemctl start lldp
+        debug "Started lldp service"
+    fi
 }
 
 function stopplatform1() {
@@ -56,7 +63,7 @@ function stopplatform1() {
         debug "${TYPE} shutdown syncd process ..."
         /usr/bin/docker exec -i syncd$DEV /usr/bin/syncd_request_shutdown --${TYPE}
 
-        # wait until syncd quits gracefully or force syncd to exit after 
+        # wait until syncd quits gracefully or force syncd to exit after
         # waiting for 20 seconds
         start_in_secs=${SECONDS}
         end_in_secs=${SECONDS}
@@ -68,7 +75,7 @@ function stopplatform1() {
         done
 
         if [[ $((end_in_secs - start_in_secs)) -gt $timer_threshold ]]; then
-            debug "syncd process in container syncd$DEV did not exit gracefully" 
+            debug "syncd process in container syncd$DEV did not exit gracefully"
         fi
 
         /usr/bin/docker exec -i syncd$DEV /bin/sync
diff --git a/slave.mk b/slave.mk
index 60253d53bf54..bda703bc9c8e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -975,6 +975,14 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 				$(eval $(docker:-dbg.gz=.gz)_GLOBAL = yes)
 			)
 		fi
+		if [ -f files/build_templates/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 ]; then
+			j2 files/build_templates/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 > $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer
+
+			# Set the flag GLOBAL_TIMER for all the global system-wide dockers timers.
+			$(if $(shell ls files/build_templates/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 2>/dev/null),\
+				$(eval $(docker:-dbg.gz=.gz)_GLOBAL_TIMER = yes)
+			)
+		fi
 		# Any service template, inside instance directory, will be used to generate .service and @.service file.
 		if [ -f files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service.j2 ]; then
 			export multi_instance="true"
@@ -985,6 +993,16 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 			export multi_instance="false"
 			j2 files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service.j2 > $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service
 		fi
+		# Any timer template, inside instance directory, will be used to generate .timer and @.timer file.
+		if [ -f files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 ]; then
+			export multi_instance="true"
+			j2 files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 > $($(docker:-dbg.gz=.gz)_CONTAINER_NAME)@.timer
+			$(if $(shell ls files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 2>/dev/null),\
+				$(eval $(docker:-dbg.gz=.gz)_TEMPLATE_TIMER = yes)
+			)
+			export multi_instance="false"
+			j2 files/build_templates/per_namespace/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer.j2 > $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).timer
+		fi
 		# Any service template, inside share_image directory, will be used to generate -chassis.service file.
 		# TODO: need better way to name the image-shared service
 		if [ -f files/build_templates/share_image/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service.j2 ]; then
@@ -1017,7 +1035,20 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 			$(eval SERVICES += "$(addsuffix -chassis.service, $($(docker:-dbg.gz=.gz)_CONTAINER_NAME))")
 		)
 	)
+	# Marks template timers with an "@" according to systemd convention
+	# If the $($docker)_TEMPLATE_TIMER) variable is set, the timer will be treated as a template
+	# If the $($docker)_GLOBAL_TIMER) and $($docker)_TEMPLATE_TIMER) variables are set the timer will be added both as a global and template timer.
+	$(foreach docker, $($*_DOCKERS),\
+		$(if $($(docker:-dbg.gz=.gz)_TEMPLATE_TIMER),\
+			$(if $($(docker:-dbg.gz=.gz)_GLOBAL_TIMER),\
+				$(eval TIMERS += "$(addsuffix .timer, $($(docker:-dbg.gz=.gz)_CONTAINER_NAME))")\
+			)\
+			$(eval TIMERS += "$(addsuffix @.timer, $($(docker:-dbg.gz=.gz)_CONTAINER_NAME))"),\
+			$(eval TIMERS += "$(addsuffix .timer, $($(docker:-dbg.gz=.gz)_CONTAINER_NAME))")
+		)
+	)
 	export installer_services="$(SERVICES)"
+	export installer_timers="$(TIMERS)"
 
 	export installer_extra_files="$(foreach docker, $($*_DOCKERS), $(foreach file, $($(docker:-dbg.gz=.gz)_BASE_IMAGE_FILES), $($(docker:-dbg.gz=.gz)_PATH)/base_image_files/$(file)))"
 

From c71c91e2b0ab4aaef4a9b6ebec60da887912dd4d Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Mon, 16 May 2022 09:31:32 +0300
Subject: [PATCH 1179/1674] [202012] [Fastboot] Delay PMON service for better
 fastboot performance (#10745)

#### Why I did it

Profiling the system state on init after fast-reboot during create_switch function execution, it is possible to see few python scripts running at the same time.
This parallel execution consume CPU time and the duration of create_switch is longer than it should be.
Following this finding, and the motivation to ensure these services will not interfere in the future, PMON is delayed in 90 seconds until the system finish the init flow after fastboot.

#### How I did it

Add a timer for PMON service.
Exclude for MLNX platform the start trigger of PMON when SYNCD starts in case of fastboot.
Copy the timer file to the host bin image.

#### How to verify it

Run fast-reboot on MLNX platform and observe faster create_switch execution time.
---
 files/build_templates/init_cfg.json.j2          |  2 +-
 files/build_templates/pmon.service.j2           |  3 ---
 files/build_templates/pmon.timer                | 12 ++++++++++++
 files/build_templates/sonic_debian_extension.j2 |  3 +++
 files/scripts/syncd.sh                          | 11 ++++++++---
 5 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 files/build_templates/pmon.timer

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index b0e630771129..08ae19ef2efc 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -22,7 +22,7 @@
                    ("database", "always_enabled", false, "always_enabled"),
                    ("dhcp_relay", "enabled", false, "enabled"),
                    ("lldp", "enabled", true, "enabled"),
-                   ("pmon", "enabled", false, "enabled"),
+                   ("pmon", "enabled", true, "enabled"),
                    ("radv", "enabled", false, "enabled"),
                    ("snmp", "enabled", true, "enabled"),
                    ("swss", "enabled", false, "enabled"),
diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2
index 59d9e6c3319a..a36324fdfe25 100644
--- a/files/build_templates/pmon.service.j2
+++ b/files/build_templates/pmon.service.j2
@@ -18,6 +18,3 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
-
-[Install]
-WantedBy=sonic.target
diff --git a/files/build_templates/pmon.timer b/files/build_templates/pmon.timer
new file mode 100644
index 000000000000..2993051607ef
--- /dev/null
+++ b/files/build_templates/pmon.timer
@@ -0,0 +1,12 @@
+[Unit]
+# This delay is for fast/warm reboot performance
+Description=Delays pmon docker until SONiC has started
+PartOf=pmon.service
+
+[Timer]
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
+Unit=pmon.service
+
+[Install]
+WantedBy=timers.target sonic.target sonic-delayed.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 95fcf4e24c0f..92eac7d890a8 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -757,6 +757,9 @@ sudo cp $BUILD_TEMPLATES/mgmt-framework.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_S
 echo "mgmt-framework.timer" | sudo tee -a $GENERATED_SERVICE_FILE
 {% endif %}
 
+sudo cp $BUILD_TEMPLATES/pmon.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "pmon.timer" | sudo tee -a $GENERATED_SERVICE_FILE
+
 sudo cp $BUILD_TEMPLATES/sonic.target $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable sonic.target
 
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index 9f7418bbed07..6d26eebf04fe 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -37,10 +37,15 @@ function startplatform() {
 
 function waitplatform() {
 
+    BOOT_TYPE=`getBootType`
     if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
-        debug "Starting pmon service..."
-        /bin/systemctl start pmon
-        debug "Started pmon service"
+        if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then
+            debug "PMON service is delayed by a timer for better fast/warm boot performance"
+        else
+            debug "Starting pmon service..."
+            /bin/systemctl start pmon
+            debug "Started pmon service"
+        fi
     fi
     if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then
         debug "LLDP service is delayed by a timer for better fast/warm boot performance"

From cd0a0608a9e84761c89af9ae94b5f8907c9c56a5 Mon Sep 17 00:00:00 2001
From: Vivek R <vivekreddykarri98@gmail.com>
Date: Sat, 14 May 2022 05:20:57 -0700
Subject: [PATCH 1180/1674] Removed platform specific reboot files for mellanox
 simx platforms (#10806)

- Why I did it
Platform_reboot files for simx doesn't do aything different apart from calling /sbin/reboot. which is anyway done in the /usr/local/bin/reboot script i.e. the parent script which calls the platform specific reboot scripts if present.

Moreover, /sbin/reboot invoked in the platform specific reboot script is a non-blocking call and thus it returns back to the original script (although /sbin/reboot does it job in the background) and we see messages like this.

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 .../platform_reboot                           | 21 -------------------
 .../platform_reboot                           |  1 -
 .../platform_reboot                           |  1 -
 3 files changed, 23 deletions(-)
 delete mode 100755 device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot
 delete mode 120000 device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot
 delete mode 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot

diff --git a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot
deleted file mode 100755
index 5b9809e10423..000000000000
--- a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-declare -r EXIT_SUCCESS="0"
-declare -r EXIT_ERROR="1"
-
-FORCE_REBOOT="no"
-
-function ParseArguments() {
-    while [ $# -ge 1 ]; do
-        case "$1" in
-            -f|--force)
-                FORCE_REBOOT="yes"
-            ;;
-        esac
-        shift
-    done
-}
-
-ParseArguments "$@"
-
-exec /sbin/reboot $@
diff --git a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot
deleted file mode 120000
index dfaf53417665..000000000000
--- a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn2700_simx-r0/platform_reboot
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot
deleted file mode 120000
index dfaf53417665..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn2700_simx-r0/platform_reboot
\ No newline at end of file

From f6a52e31ec1873bf99402e76ca1c462735a25a0d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 16 May 2022 08:57:26 +0800
Subject: [PATCH 1181/1674] [Ci] Support to trigger a pipeline to download and
 publish artifacts to storage (#10820)

Why I did it
Support to trigger a pipeline to download and publish artifacts to storage and container registry.
Support to specify the patterns which docker images to upload.

How I did it
Pass the pipeline information and the artifact information by pipeline parameters to the pipeline which will be triggered a new build. It is to decouple the artifacts generation and the publish logic, how and where the artifacts/docker images will be published, depends on the triggered pipeline.

How to verify it
---
 .../azure-pipelines-image-template.yml        |  6 +-
 .../trigger-publish-artifacts-build.yml       | 64 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 .azure-pipelines/trigger-publish-artifacts-build.yml

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index ee2d98eddc23..6e716604a166 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -48,7 +48,7 @@ jobs:
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
-      - script: cp target -r $(Build.ArtifactStagingDirectory)/
+      - script: mv target $(Build.ArtifactStagingDirectory)/
         displayName: Copy Artifacts
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
@@ -57,6 +57,10 @@ jobs:
         condition: failed()
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
         displayName: "Archive failed sonic image"
+      - template: trigger-publish-artifacts-build.yml
+        parameters:
+          artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+          publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
       - ${{ parameters.postSteps }}
       - template: cleanup.yml
     jobGroups: ${{ parameters.jobGroups }}
diff --git a/.azure-pipelines/trigger-publish-artifacts-build.yml b/.azure-pipelines/trigger-publish-artifacts-build.yml
new file mode 100644
index 000000000000..83bbfc1150ce
--- /dev/null
+++ b/.azure-pipelines/trigger-publish-artifacts-build.yml
@@ -0,0 +1,64 @@
+# The steps to trigger the pipeline to publish the artifacts
+
+parameters:
+- name: artifactName
+  type: string
+  default: ""
+- name: publishPrefix
+  type: string
+  default: "$(Build.DefinitionName)/$(Build.SourceBranchName)"
+
+steps:
+- script: |
+    . functions.sh
+    sonic_version=$(sonic_get_version)
+    latest_tag=$(git describe --tags --abbrev=0)
+    docker_tags="$sonic_version $(Build.SourceBranchName)"
+    if [ "$(Build.SourceBranchName)" == "master" ]; then
+      docker_tags="$docker_tags latest"
+    fi
+    echo "##vso[task.setvariable variable=sonic_version]$sonic_version"
+    echo "##vso[task.setvariable variable=latest_tag]$latest_tag"
+    echo "##vso[task.setvariable variable=docker_tags]$docker_tags"
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+  displayName: 'Set trigger build variables'
+- task: TriggerBuild@4
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+  inputs:
+    definitionIsInCurrentTeamProject: false
+    teamProject: internal
+    tfsServer: $(System.CollectionUri)
+    buildDefinition: 'publish-artifacts'
+    queueBuildForUserThatTriggeredBuild: true
+    ignoreSslCertificateErrors: false
+    useSameSourceVersion: false
+    useCustomSourceVersion: false
+    useSameBranch: false
+    waitForQueuedBuildsToFinish: false
+    storeInEnvironmentVariable: true
+    authenticationMethod: 'Personal Access Token'
+    password: '$(system.accesstoken)'
+    enableBuildInQueueCondition: false
+    dependentOnSuccessfulBuildCondition: false
+    dependentOnFailedBuildCondition: false
+    checkbuildsoncurrentbranch: false
+    failTaskIfConditionsAreNotFulfilled: false
+    buildParameters: ''
+    templateParameters: |
+      pipelineContext: {"buildId":"$(Build.BuildId)",
+        "pipelineId":"$(System.DefinitionId)",
+        "project": "$(System.TeamProject)",
+        "branchName":"$(Build.SourceBranchName)"},
+      artifactContext: {"artifactName":"${{ parameters.artifactName }}",
+        "artifactPatterns":"**/*.bin\n
+              **/*.swi\n
+              **/*.raw\n
+              **/*.img.gz\n
+              **/*-rpc.gz\n
+              **/python-saithrift*.deb"},
+      publishContext: {"publishPrefix":"${{ parameters.publishPrefix }}",
+        "keepArtifactName":false,
+        "dockerImagePatterns":"target/*-rpc.gz",
+        "dockerTags":"$(docker_tags)",
+        "version":"$(sonic_version)",
+        "latestTag":"$(latest_tag)"}

From ee84ba81ed1eaa1a2c03f70794c7b07c8487b55a Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Tue, 17 May 2022 14:59:31 -0700
Subject: [PATCH 1182/1674] Use 202012 branch for sonic-mgmt (#10851)

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 09220c195e57..d23b4536971a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,7 @@ resources:
     type: github
     name: Azure/sonic-mgmt
     endpoint: build
+    ref: refs/heads/202012
 
 stages:
 - stage: BuildVS

From f5c876edf3253b1144df880702fd8766507934f9 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 11 Jan 2022 16:48:04 +0800
Subject: [PATCH 1183/1674] [build] docker-sonic-mgmt replace USER by whoami
 (#9702)

---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 0333345cc9ce..1c2f76554b28 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -18,7 +18,7 @@ DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
 
 URL_PREFIX=$(echo "${PACKAGE_URL_PREFIX}" | sed -E "s#(//[^/]*/).*#\1#")
 
-if [ $USER != 'root' ] && [ -n $(which sudo) ];then
+if [ "$(whoami)" != "root" ] && [ -n "$(which sudo)" ];then
     SUDO=sudo
 else
     SUDO=''

From acfee3be9a732bc3f2532dcf33f10d9dd885a71c Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Wed, 18 May 2022 17:36:48 -0700
Subject: [PATCH 1184/1674] [sonic-linkmgrd][202012] submodule update (#10814)

[sonic-linkmgrd][202012] submodule update
3d13ff2 Jing Zhang      Wed May 4 10:07:14 2022 -0700   Add doc for default route related changes  (#63)
c703be4 Jing Zhang      Mon May 2 13:27:54 2022 -0700   Reset WaitActiveUp count before switching to active (#70)
86eb727 Jing Zhang      Wed Apr 27 10:35:05 2022 -0700  lower log level to warning (#69)
e22c736 Jing Zhang      Mon May 2 13:33:24 2022 -0700   [202012] Avoid proactively switching to active if default route is missing (#67)
d4f282b Jing Zhang      Thu Apr 28 18:35:11 2022 -0700  [202012] Add support to enable switchover time measurement (with link prober interval decreased to 10ms) feature (#66)

sign-off: Jing Zhang [zhangjing@microsoft.com](mailto:zhangjing@microsoft.com)
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 352373879e1b..3d13ff2fc3f9 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 352373879e1bcc76337705375edb8bb29aa5b7c3
+Subproject commit 3d13ff2fc3f9ef51d05888bd31519e8d664c4307

From 77298da2753c31b29ca4c9075037acda58cef9f8 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Thu, 19 May 2022 12:35:39 +0300
Subject: [PATCH 1185/1674] [202012][submodule]  Update sonic-swss pointer
 (#10837)

Signed-off-by: Dror Prital <drorp@nvidia.com>

Co-authored-by: liat-grozovik <44433539+liat-grozovik@users.noreply.github.com>
Co-authored-by: Prince Sunny <prince.sunny@microsoft.com>
Co-authored-by: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index cfed8c7fa5ee..903d594619f4 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit cfed8c7fa5eebd8db9a6b8e4e634080e2a0b0312
+Subproject commit 903d594619f424c7dabffbfb4037c8ccbe13cb89

From cceef8e36d357676abffc5d83a9ac1f00bc54ec8 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Fri, 20 May 2022 00:44:53 +0530
Subject: [PATCH 1186/1674] Dell S6100: Addition of SFP type_abbrv_name field
 (#10846)

* Dell S6100: Addition of SFP type_abbrv_name field

* Update sfp.py

* Update sfp.py

Co-authored-by: Aravind Mani <aravind.m1@dell.com>
---
 .../sonic-platform-modules-dell/s6100/sonic_platform/sfp.py  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
index a55868f2e798..fd9173c229ee 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/sfp.py
@@ -48,7 +48,7 @@
                   'encoding', 'ext_identifier', 'ext_rateselect_compliance',
                   'cable_type', 'cable_length', 'nominal_bit_rate',
                   'specification_compliance', 'vendor_date', 'vendor_oui',
-                  'application_advertisement']
+                  'type_abbrv_name', 'application_advertisement']
 
 dom_dict_keys = ['rx_los',       'tx_fault',   'reset_status',
                  'power_lpmode', 'tx_disable', 'tx_disable_channel',
@@ -91,6 +91,7 @@
  'nominal_bit_rate': [INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
  'specification_compliance':
                      [INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
+ 'type_abbrv_name': [INFO_OFFSET,  0, 20, 'parse_sfp_info_bulk'],
      'manufacturer': [INFO_OFFSET, 20, 16, 'parse_vendor_name'],
        'vendor_oui': [INFO_OFFSET,  37, 3, 'parse_vendor_oui'],
             'model': [INFO_OFFSET, 40, 16, 'parse_vendor_pn'],
@@ -198,6 +199,7 @@ def get_transceiver_info(self):
             ext_id = iface_data['data']['Extended Identifier']['value']
             rate_identifier = iface_data['data']['RateIdentifier']['value']
             identifier = iface_data['data']['type']['value']
+            type_abbrv_name = iface_data['data']['type_abbrv_name']['value']
             bit_rate = str(
                 iface_data['data']['Nominal Bit Rate(100Mbs)']['value'])
 
@@ -254,6 +256,7 @@ def get_transceiver_info(self):
             return transceiver_info_dict
 
         # Fill The Dictionary and return
+        transceiver_info_dict['type_abbrv_name'] = type_abbrv_name
         transceiver_info_dict['type'] = identifier
         transceiver_info_dict['hardware_rev'] = vendor_rev
         transceiver_info_dict['serial'] = vendor_sn

From 6b029a613b2720b64a819bb0baeb04c17fe072e5 Mon Sep 17 00:00:00 2001
From: Volodymyr Samotiy <volodymyrs@nvidia.com>
Date: Sun, 22 May 2022 09:48:37 +0300
Subject: [PATCH 1187/1674] [202012] [Mellanox] Update SAI to 1.21.1.2 and
 SDK/FW to 4.5.2262/xx.2010.2262 (#10880)

- Why I did it
To include latest fixes:
1. Warmboot | When trying to reconfigure the Flex Parser header and Flex transition parameters after ISSU, the switch will returned an error even if the configuration was identical to that done before performing the ISSU.
2. Link Up | When toggling many ports of the Spectrum devices while raising 10GbE link up and link maintenance is enabled, the switch may get stuck and may need to be rebooted.
3. Shared buffer | While moving from lossless to lossy while shared headroom was used, reduction of the shared headroom can only be done prior to pool type change and when shared headroom is not utilized.

- How I did it
Updated SAI & SDK submodules along with the relevant Makefiles

- How to verify it
Build an image and run tests from "sonic-mgmt".

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/mlnx-sai/SAI-Implementation          | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 959fbf230ef9..67a4876fef3e 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.1500
+MLNX_SPC_FW_VERSION = 13.2010.2262
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.1500
+MLNX_SPC2_FW_VERSION = 29.2010.2262
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.1500
+MLNX_SPC3_FW_VERSION = 30.2010.2262
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 83e68b5988d2..ede5908cbd4f 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 83e68b5988d22ffcd5bc4962ed6605d570980c57
+Subproject commit ede5908cbd4f62f751306c5ff609fcec3337272e
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index f57219d6555f..9f94bdfc2c7e 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit f57219d6555f05c5598a60bed7a765bf11dd24ab
+Subproject commit 9f94bdfc2c7e3670b5b959138f9d61d40e7cc1ea
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 75d54c5d9805..88b8d1b1c9fe 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
-MLNX_SDK_VERSION = 4.5.1500
+MLNX_SDK_VERSION = 4.5.2262
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From abb977f4c4a5eb570ef0d06f0860b23228035df2 Mon Sep 17 00:00:00 2001
From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>
Date: Mon, 23 May 2022 16:35:22 +0530
Subject: [PATCH 1188/1674] [Marvell] Marvell armhf SAI debian (#10854)

Addressed system-health failure, when src-mac learned same as switchMac.

Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
---
 platform/marvell-armhf/sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index 30e2b073924c..8643b470c222 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-8
+export MRVL_SAI_VERSION = 1.7.1-9
 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

From 9caf12859d1a1293d6213d9a99d84d4494d9f238 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 24 May 2022 09:33:11 +0530
Subject: [PATCH 1189/1674] DellEMC: S52xx Reboot cause fix (#10783)

---
 .../s5232f/sonic_platform/chassis.py                      | 8 ++++----
 .../s5248f/sonic_platform/chassis.py                      | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
index 356e69526d89..55f422a17704 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
@@ -38,7 +38,7 @@ class Chassis(ChassisBase):
 
     oir_fd = -1
     epoll = -1
-
+    REBOOT_CAUSE_PATH = "/host/reboot-cause/platform/reboot_reason"
     _global_port_pres_dict = {}
 
     def __init__(self):
@@ -239,15 +239,15 @@ def get_reboot_cause(self):
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
 
         if reboot_cause & 0x1:
-            return (self.REBOOT_CAUSE_POWER_LOSS, None)
+            return (self.REBOOT_CAUSE_POWER_LOSS, "Power on reset")
         elif reboot_cause & 0x2:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
         elif reboot_cause & 0x4:
             return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
         elif reboot_cause & 0x8:
-            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
+            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, "Thermal overload")
         elif reboot_cause & 0x10:
-            return (self.REBOOT_CAUSE_WATCHDOG, None)
+            return (self.REBOOT_CAUSE_WATCHDOG, "Watchdog reset")
         elif reboot_cause & 0x20:
             return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
         elif reboot_cause & 0x40:
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
index 089ef3e0e39d..b1ce7413fb24 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/chassis.py
@@ -309,6 +309,7 @@ def get_num_sfps(self):
             An integer represences the number of SFPs on the chassis.
         """
         return self._num_sfps
+
     def get_reboot_cause(self):
         """
         Retrieves the cause of the previous reboot
@@ -326,15 +327,15 @@ def get_reboot_cause(self):
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
 
         if reboot_cause & 0x1:
-            return (self.REBOOT_CAUSE_POWER_LOSS, None)
+            return (self.REBOOT_CAUSE_POWER_LOSS, "Power on reset")
         elif reboot_cause & 0x2:
             return (self.REBOOT_CAUSE_NON_HARDWARE, None)
         elif reboot_cause & 0x4:
             return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
         elif reboot_cause & 0x8:
-            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
+            return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, "Thermal overload")
         elif reboot_cause & 0x10:
-            return (self.REBOOT_CAUSE_WATCHDOG, None)
+            return (self.REBOOT_CAUSE_WATCHDOG, "Watchdog reset")
         elif reboot_cause & 0x20:
             return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
         elif reboot_cause & 0x40:

From e659cfb2de366be2c21da9f3bdc9c4f7d9f060ec Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Thu, 10 Mar 2022 08:54:33 +0800
Subject: [PATCH 1190/1674] [bgpcfgd] to support removal part of configuration
 of bgp allowed prefix list (#10165)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix allow list issue

Signed-off-by: stormliang <stormliang@microsoft.com>

* add the ipaddress in the install list

* add unit test

Co-authored-by: Ubuntu <azureuser@SONIC-SH-STORM-02.5pu3m0fajw1edcfltykk1gauxa.gx.internal.cloudapp.net>

Why I did it
Failed to remove part of configuration of bgp allowed prefix list. The details in #10141

How I did it
There are two issues:

In FRR, ipv6 default route is ::/0, but in the configuration, it is 0::/0, string comparison would be false, but why ipv4 failed to remove the allowed prefix list, ipv6 works? Looks into next one for the answer.

The current managers_allow_list doesn’t support removal part of the prefix list. But why IPv6 works in 1? It is because the bug for the IPv6 default route comparison, it would do the update no matter what is the operation (the code will compare the prefix list in the FRR and configuration db, if all configurations in db are presented in FRR, it do nothing, otherwise it will update the prefix list based on the configuration from db).

How to verify it
Follow the step in #10141
---
 .../bgpcfgd/managers_allow_list.py            |  49 ++++--
 src/sonic-bgpcfgd/setup.py                    |   1 +
 src/sonic-bgpcfgd/tests/test_allow_list.py    | 155 +++++++++++++-----
 3 files changed, 153 insertions(+), 52 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
index 435be91d20d2..e03bb19c163f 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
@@ -2,6 +2,7 @@
 Implementation of "allow-list" feature
 """
 import re
+import ipaddress
 
 from .log import log_debug, log_info, log_err, log_warn
 from .template import TemplateFabric
@@ -19,6 +20,7 @@ class BGPAllowListMgr(Manager):
     ROUTE_MAP_ENTRY_WITH_COMMUNITY_END = 29990
     ROUTE_MAP_ENTRY_WITHOUT_COMMUNITY_START = 30000
     ROUTE_MAP_ENTRY_WITHOUT_COMMUNITY_END = 65530
+    PREFIX_LIST_POS = 1 # the position of the ip prefix in the permit string.
 
     V4 = "v4"  # constant for af enum: V4
     V6 = "v6"  # constant for af enum: V6
@@ -228,6 +230,12 @@ def __update_prefix_list(self, af, pl_name, allow_list):
         constant_list = self.__get_constant_list(af)
         allow_list = self.__to_prefix_list(af, allow_list)
         log_debug("BGPAllowListMgr::__update_prefix_list. af='%s' prefix-list name=%s" % (af, pl_name))
+        '''
+            Need to check exist and equality of the allowed prefix list.
+            A. If exist and equal, no operation needed. 
+            B. If exist but not equal, first delete then add prefix based on the data from condig db and constants. 
+            C. If non-exist, directly add prefix based on the data from condig db and constants.
+        '''
         exist, correct = self.__is_prefix_list_valid(af, pl_name, allow_list, constant_list)
         if correct:
             log_debug("BGPAllowListMgr::__update_prefix_list. the prefix-list '%s' exists and correct" % pl_name)
@@ -237,7 +245,7 @@ def __update_prefix_list(self, af, pl_name, allow_list):
         seq_no = 10
         if exist:
             cmds.append('no %s prefix-list %s' % (family, pl_name))
-        for entry in constant_list + allow_list:
+        for entry in self.__normalize_ipnetwork(af, constant_list + allow_list):
             cmds.append('%s prefix-list %s seq %d %s' % (family, pl_name, seq_no, entry))
             seq_no += 10
         return cmds
@@ -258,6 +266,24 @@ def __remove_prefix_list(self, af, pl_name):
         family = self.__af_to_family(af)
         return ["no %s prefix-list %s" % (family, pl_name)]
 
+    def __normalize_ipnetwork(self, af, allow_prefix_list):
+        '''
+            Normalize IPv6 addresses
+                for example:
+                    2001:cdba:0000:0000:0000:0000:3257:9652
+                    2001:cdba:0:0:0:0:3257:9652
+                    2001:cdba::3257:9652
+                after normalize, all would be normalized to 
+                    2001:cdba::3257:9652
+        '''
+        normalize_list = []
+        for allow_item in allow_prefix_list:
+            tmp_list = allow_item.split(' ')
+            if af == self.V6:
+                tmp_list[self.PREFIX_LIST_POS] = str(ipaddress.IPv6Network(tmp_list[self.PREFIX_LIST_POS]))
+            normalize_list.append(' '.join(tmp_list))
+        return normalize_list
+
     def __is_prefix_list_valid(self, af, pl_name, allow_list, constant_list):
         """
         Check that a prefix list exists and it has valid entries
@@ -266,7 +292,8 @@ def __is_prefix_list_valid(self, af, pl_name, allow_list, constant_list):
         :param allow_list: a prefix-list which must be a part of the valid prefix list
         :param constant_list: a constant list which must be on top of each "allow" prefix list on the device
         :return: a tuple. The first element of the tuple has True if the prefix-list exists, False otherwise,
-                 The second element of the tuple has True if the prefix-list contains correct entries, False if not
+                 The second element of the tuple has True if allow prefix list in running configuraiton is
+                 equal with ones in config db + constants, False if not
         """
         assert af == self.V4 or af == self.V6
         family = self.__af_to_family(af)
@@ -274,20 +301,18 @@ def __is_prefix_list_valid(self, af, pl_name, allow_list, constant_list):
         conf = self.cfg_mgr.get_text()
         if not any(line.strip().startswith(match_string) for line in conf):
             return False, False  # if the prefix list is not exists, it is not correct
-        constant_set = set(constant_list)
-        allow_set = set(allow_list)
+        expect_set = set(self.__normalize_ipnetwork(af, constant_list))
+        expect_set.update(set(self.__normalize_ipnetwork(af, allow_list)))
+
+        config_list = []
         for line in conf:
             if line.startswith(match_string):
                 found = line[len(match_string):].strip().split(' ')
                 rule = " ".join(found[1:])
-                if rule in constant_set:
-                    constant_set.discard(rule)
-                elif rule in allow_set:
-                    if constant_set:
-                        return True, False  # Not everything from constant set is presented
-                    else:
-                        allow_set.discard(rule)
-        return True, len(allow_set) == 0  # allow_set should be presented all
+                config_list.append(rule)
+
+        # Return double Ture, when running configuraiton is identical with config db + constants.
+        return True, expect_set == set(self.__normalize_ipnetwork(af, config_list))  
 
     def __update_community(self, community_name, community_value):
         """
diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py
index ab86ca20ec19..b451accb9792 100755
--- a/src/sonic-bgpcfgd/setup.py
+++ b/src/sonic-bgpcfgd/setup.py
@@ -18,6 +18,7 @@
         'jinja2>=2.10',
         'netaddr==0.8.0',
         'pyyaml==5.4.1',
+        'ipaddress==1.0.23'
     ],
     setup_requires = [
         'pytest-runner',
diff --git a/src/sonic-bgpcfgd/tests/test_allow_list.py b/src/sonic-bgpcfgd/tests/test_allow_list.py
index cb0896982a39..5207c6283462 100644
--- a/src/sonic-bgpcfgd/tests/test_allow_list.py
+++ b/src/sonic-bgpcfgd/tests/test_allow_list.py
@@ -79,8 +79,8 @@ def test_set_handler_with_community():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -110,8 +110,8 @@ def test_set_handler_with_community_and_permit_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -142,8 +142,8 @@ def test_set_handler_with_community_and_deny_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -178,8 +178,8 @@ def test_set_handler_no_community():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -206,8 +206,8 @@ def test_set_handler_no_community_with_permit_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -234,8 +234,8 @@ def test_set_handler_no_community_with_deny_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -257,8 +257,8 @@ def test_del_handler_with_community():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -292,8 +292,8 @@ def test_del_handler_with_exiting_community_deny_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -331,8 +331,8 @@ def test_del_handler_with_exiting_community_permit_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -365,8 +365,8 @@ def test_del_handler_with_exiting_community_deny_action_global_deny():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -401,8 +401,8 @@ def test_del_handler_with_exiting_community_permit_action_global_deny():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 ge 65',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -441,8 +441,8 @@ def test_del_handler_no_community():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 ge 65',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -470,8 +470,8 @@ def test_del_handler_with_no_community_deny_action():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 ge 65',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -503,8 +503,8 @@ def test_del_handler_with_no_community_permit_action_global_deny():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 ge 25',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 ge 17',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 ge 65',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -543,8 +543,8 @@ def test_set_handler_with_community_data_is_already_presented():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -572,8 +572,8 @@ def test_set_handler_no_community_data_is_already_presented():
         'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
         'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
         'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
-        'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-        'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+        'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+        'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
         'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
         'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
         'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -636,8 +636,8 @@ def test_set_handler_with_community_update_prefixes_add():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
@@ -660,8 +660,8 @@ def test_set_handler_with_community_update_prefixes_add():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 40 permit 80.90.0.0/16 le 32',
             'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 50 permit fc02::/64 le 128',
@@ -679,8 +679,8 @@ def test_set_handler_no_community_update_prefixes_add():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
             'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
@@ -700,14 +700,89 @@ def test_set_handler_no_community_update_prefixes_add():
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
             'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 40 permit 80.90.0.0/16 le 32',
             'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny 0::/0 le 59',
-            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny 0::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
             'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 50 permit fc02::/64 le 128',
         ]
     )
 
+def test_set_handler_with_community_update_prefixes_remove():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|1010:2020", {
+            "prefixes_v4": "10.20.30.0/24",
+            "prefixes_v6": "fc00:20::/64",
+        }),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
+        ]
+    )
+
+def test_set_handler_no_community_update_prefixes_remove():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5", {
+            "prefixes_v4": "20.20.30.0/24",
+            "prefixes_v6": "fc01:20::/64",
+        }),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+        ]
+    )
+
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
 def test___set_handler_validate():
     from bgpcfgd.managers_allow_list import BGPAllowListMgr

From 5205a379e437f43a74da24b94a5783f66fe26358 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 18 May 2022 13:01:27 -0700
Subject: [PATCH 1191/1674] [scapy]: Patch scapy 2.4.5 for sniffing on intfs
 (#10644)

Apply scapy fix (https://github.com/secdev/scapy/pull/3240) since it is not available in release yet

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 ...-resolve-the-interface-name-globally.patch | 112 ++++++++++++++++++
 src/scapy.patch/series                        |   1 +
 2 files changed, 113 insertions(+)
 create mode 100644 src/scapy.patch/0003-Do-not-resolve-the-interface-name-globally.patch

diff --git a/src/scapy.patch/0003-Do-not-resolve-the-interface-name-globally.patch b/src/scapy.patch/0003-Do-not-resolve-the-interface-name-globally.patch
new file mode 100644
index 000000000000..daaa182b641a
--- /dev/null
+++ b/src/scapy.patch/0003-Do-not-resolve-the-interface-name-globally.patch
@@ -0,0 +1,112 @@
+From 430f8942fe086553fcd6ad1444e886a343bfd658 Mon Sep 17 00:00:00 2001
+From: Guillaume Valadon <guillaume@valadon.net>
+Date: Mon, 10 May 2021 12:02:32 +0200
+Subject: [PATCH] Do not resolve the interface name globally
+
+---
+ doc/scapy/usage.rst |  2 ++
+ scapy/sendrecv.py   | 16 ++++++++--------
+ test/regression.uts | 31 +++++++++++++++++++++++++++++--
+ 3 files changed, 39 insertions(+), 10 deletions(-)
+
+diff --git a/doc/scapy/usage.rst b/doc/scapy/usage.rst
+index 45266430fe..c6cb273f62 100644
+--- a/doc/scapy/usage.rst
++++ b/doc/scapy/usage.rst
+@@ -711,6 +711,8 @@ We can sniff and do passive OS fingerprinting::
+ 
+ The number before the OS guess is the accuracy of the guess.
+ 
++.. note:: When sniffing on several interfaces (e.g. ``iface=["eth0", ...]``), you can check what interface a packet was sniffed on by using the ``sniffed_on`` attribute, as shown in one of the examples above.
++
+ Asynchronous Sniffing
+ ---------------------
+ 
+diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
+index 503c6a3b15..f97fc4153e 100644
+--- a/scapy/sendrecv.py
++++ b/scapy/sendrecv.py
+@@ -1108,24 +1108,24 @@ def _run(self,
+                             quiet=quiet)
+                 )] = offline
+         if not sniff_sockets or iface is not None:
+-            iface = resolve_iface(iface or conf.iface)
+-            if L2socket is None:
+-                L2socket = iface.l2listen()
++            # The _RL2 function resolves the L2socket of an iface
++            _RL2 = lambda i: L2socket or resolve_iface(i).l2listen()  # type: Callable[[_GlobInterfaceType], Callable[..., SuperSocket]]  # noqa: E501
+             if isinstance(iface, list):
+                 sniff_sockets.update(
+-                    (L2socket(type=ETH_P_ALL, iface=ifname, **karg),
++                    (_RL2(ifname)(type=ETH_P_ALL, iface=ifname, **karg),
+                      ifname)
+                     for ifname in iface
+                 )
+             elif isinstance(iface, dict):
+                 sniff_sockets.update(
+-                    (L2socket(type=ETH_P_ALL, iface=ifname, **karg),
++                    (_RL2(ifname)(type=ETH_P_ALL, iface=ifname, **karg),
+                      iflabel)
+                     for ifname, iflabel in six.iteritems(iface)
+                 )
+             else:
+-                sniff_sockets[L2socket(type=ETH_P_ALL, iface=iface,
+-                                       **karg)] = iface
++                iface = iface or conf.iface
++                sniff_sockets[_RL2(iface)(type=ETH_P_ALL, iface=iface,
++                                          **karg)] = iface
+ 
+         # Get select information from the sockets
+         _main_socket = next(iter(sniff_sockets))
+@@ -1248,7 +1248,7 @@ def stop(self, join=True):
+                 return self.results
+             return None
+         else:
+-            raise Scapy_Exception("Not started !")
++            raise Scapy_Exception("Not running ! (check .running attr)")
+ 
+     def join(self, *args, **kwargs):
+         # type: (*Any, **Any) -> None
+diff --git a/test/regression.uts b/test/regression.uts
+index 38644b7d75..972af2f8cd 100644
+--- a/test/regression.uts
++++ b/test/regression.uts
+@@ -1379,9 +1379,36 @@ def _test():
+     assert (ans.time - req.sent_time) >= 0
+     assert (ans.time - req.sent_time) <= 1e-3
+ 
+-retry_test(_test)
++try:
++    retry_test(_test)
++finally:
++    conf.L3socket = sock
++
++= Test sniffing on multiple sockets
++~ netaccess needs_root sniff
++
++# This test sniffs on the same interface twice at the same time, to
++# simulate sniffing on multiple interfaces.
++
++iface = conf.route.route("www.google.com")[0]
++port = int(RandShort())
++pkt = IP(dst="www.google.com")/TCP(sport=port, dport=80, flags="S")
++
++def cb():
++    sr1(pkt, timeout=3)
++
++sniffer = AsyncSniffer(started_callback=cb,
++                       iface=[iface, iface],
++                       lfilter=lambda x: TCP in x and x[TCP].dport == port,
++                       prn=lambda x: x.summary(),
++                       count=2)
++sniffer.start()
++sniffer.join(timeout=3)
++
++assert len(sniffer.results) == 2
+ 
+-conf.L3socket = sock
++for pkt in sniffer.results:
++    assert pkt.sniffed_on == iface
+ 
+ = Sending a TCP syn 'forever' at layer 2 and layer 3
+ ~ netaccess IP
diff --git a/src/scapy.patch/series b/src/scapy.patch/series
index d64f20f136c1..7b231848ac1f 100644
--- a/src/scapy.patch/series
+++ b/src/scapy.patch/series
@@ -1,2 +1,3 @@
 0001-Fix-version-string-generation-when-scapy-is-a-submod.patch
 0002-Check-if-the-network-interface-still-exists.patch
+0003-Do-not-resolve-the-interface-name-globally.patch

From 35c9becc3ca670c33c6e5fa691489ec5df2e3c7f Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Thu, 19 May 2022 10:07:31 +0800
Subject: [PATCH 1192/1674] [bgpcfgd] ECMP overlay VxLan with BGP support
 (#10716)

Why I did it
https://github.com/Azure/SONiC/blob/master/doc/vxlan/Overlay%20ECMP%20with%20BFD.md
From the design, need to advertise the route with community string, the PR is to implement this.

How I did it
To use the route-map as the profile for the community string, all advertised routes can be associated with one route-map.
Add one file, mangers_rm.py, which is to add/update/del the route-map. Modified the managers_advertise_rt.py file to associate profile with IP route.

The route-map usage is very flexible, by this PR, we only support one fixed usage to add community string for route to simplify this design.

How to verify it
Implement new unit tests for mangers_rm.py and updated unit test for managers_advertise_rt.py.
Manually verified the test case in the test plan section, will add testcase in sonic-mgmt later. Azure/sonic-mgmt#5581
---
 src/sonic-bgpcfgd/bgpcfgd/main.py             |  2 +
 .../bgpcfgd/managers_advertise_rt.py          | 83 ++++++++++++-------
 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py      | 78 +++++++++++++++++
 src/sonic-bgpcfgd/tests/test_advertise_rt.py  | 72 ++++++++++++++--
 src/sonic-bgpcfgd/tests/test_rm.py            | 62 ++++++++++++++
 5 files changed, 263 insertions(+), 34 deletions(-)
 create mode 100644 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_rm.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 52d591d1fcb0..698e1756e654 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -17,6 +17,7 @@
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
 from .managers_static_rt import StaticRouteMgr
+from .managers_rm import RouteMapMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
 from .utils import read_constants
@@ -60,6 +61,7 @@ def do_work():
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
         # Route Advertisement Managers
         AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
+        RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
index 352b89f7286c..68c48b044f61 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
@@ -1,10 +1,14 @@
 from .manager import Manager
 from .template import TemplateFabric
 from swsscommon import swsscommon
+from .managers_rm import ROUTE_MAPS
+import ipaddress
+from .log import log_info, log_err, log_debug
 
 
 class AdvertiseRouteMgr(Manager):
     """ This class Advertises routes when ADVERTISE_NETWORK_TABLE in STATE_DB is updated """
+
     def __init__(self, common_objs, db, table):
         """
         Initialize the object
@@ -18,82 +22,105 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-        
+
         self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
         self.advertised_routes = dict()
 
 
-    OP_DELETE = 'DELETE'
-    OP_ADD = 'ADD'
-
+    OP_DELETE = "DELETE"
+    OP_ADD = "ADD"
 
     def set_handler(self, key, data):
+        log_debug("AdvertiseRouteMgr:: set handler")
+        if not self.__set_handler_validate(key, data):
+            return True
         vrf, ip_prefix = self.split_key(key)
-        self.add_route_advertisement(vrf, ip_prefix)
+        self.add_route_advertisement(vrf, ip_prefix, data)
 
         return True
 
-
     def del_handler(self, key):
+        log_debug("AdvertiseRouteMgr:: del handler")
         vrf, ip_prefix = self.split_key(key)
         self.remove_route_advertisement(vrf, ip_prefix)
 
-
-    def add_route_advertisement(self, vrf, ip_prefix):
+    def __set_handler_validate(self, key, data):
+        if data:
+            if ("profile" in data and data["profile"] in ROUTE_MAPS) or data == {"":""}:
+                """
+                    APP which config the data should be responsible to pass a valid IP prefix
+                """
+                return True
+            
+        log_err("BGPAdvertiseRouteMgr:: Invalid data %s for advertised route %s" % (data, key))
+        return False
+
+    def add_route_advertisement(self, vrf, ip_prefix, data):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, set()):
+            if not self.advertised_routes.get(vrf, dict()):
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
-            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD)
-
-        self.advertised_routes.setdefault(vrf, set()).add(ip_prefix)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD, data)
 
+        self.advertised_routes.setdefault(vrf, dict()).update({ip_prefix: data})
 
     def remove_route_advertisement(self, vrf, ip_prefix):
-        self.advertised_routes.setdefault(vrf, set()).discard(ip_prefix)
-        if not self.advertised_routes.get(vrf, set()):
+        if ip_prefix not in self.advertised_routes.get(vrf, dict()):
+            log_info("BGPAdvertiseRouteMgr:: %s|%s does not exist" % (vrf, ip_prefix))
+            return
+        self.advertised_routes.get(vrf, dict()).pop(ip_prefix)
+        if not self.advertised_routes.get(vrf, dict()):
             self.advertised_routes.pop(vrf, None)
 
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, set()):
+            if not self.advertised_routes.get(vrf, dict()):
                 self.bgp_network_import_check_commands(vrf, self.OP_DELETE)
             self.advertise_route_commands(ip_prefix, vrf, self.OP_DELETE)
 
-
-    def advertise_route_commands(self, ip_prefix, vrf, op):
+    def advertise_route_commands(self, ip_prefix, vrf, op, data=None):
         is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
 
         cmd_list = []
-        if vrf == 'default':
+        if vrf == "default":
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
 
         cmd_list.append(" address-family %s unicast" % ("ipv6" if is_ipv6 else "ipv4"))
-        cmd_list.append("  %snetwork %s" % ('no ' if op == self.OP_DELETE else '', ip_prefix))
 
-        self.cfg_mgr.push_list(cmd_list)
+        if data and "profile" in data:
+            cmd_list.append("  network %s route-map %s" % (ip_prefix, "%s_RM" % data["profile"]))
+            log_debug(
+                "BGPAdvertiseRouteMgr:: Update bgp %s network %s with route-map %s"
+                % (bgp_asn, vrf + "|" + ip_prefix, "%s_RM" % data["profile"])
+            )
+        else:
+            cmd_list.append("  %snetwork %s" % ("no " if op == self.OP_DELETE else "", ip_prefix))
+            log_debug(
+                "BGPAdvertiseRouteMgr:: %sbgp %s network %s"
+                % ("Remove " if op == self.OP_DELETE else "Update ", bgp_asn, vrf + "|" + ip_prefix)
+            )
 
+        self.cfg_mgr.push_list(cmd_list)
+        log_debug("BGPAdvertiseRouteMgr::Done")
 
     def bgp_network_import_check_commands(self, vrf, op):
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
         cmd_list = []
-        if vrf == 'default':
+        if vrf == "default":
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-        cmd_list.append(" %sbgp network import-check" % ('' if op == self.OP_DELETE else 'no '))
+        cmd_list.append(" %sbgp network import-check" % ("" if op == self.OP_DELETE else "no "))
 
         self.cfg_mgr.push_list(cmd_list)
 
-
     def on_bgp_asn_change(self):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
             for vrf, ip_prefixes in self.advertised_routes.items():
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
                 for ip_prefix in ip_prefixes:
-                    self.add_route_advertisement(vrf, ip_prefix)
-
+                    self.add_route_advertisement(vrf, ip_prefix, ip_prefixes[ip_prefix])
 
     @staticmethod
     def split_key(key):
@@ -102,7 +129,7 @@ def split_key(key):
         :param key: key to split
         :return: vrf name extracted from the key, ip prefix extracted from the key
         """
-        if '|' not in key:
-            return 'default', key
+        if "|" not in key:
+            return "default", key
         else:
-            return tuple(key.split('|', 1))
+            return tuple(key.split("|", 1))
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
new file mode 100644
index 000000000000..08609c68f9a6
--- /dev/null
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
@@ -0,0 +1,78 @@
+from .manager import Manager
+from .log import log_err, log_debug
+
+ROUTE_MAPS = ["FROM_SDN_SLB_ROUTES"]
+
+
+class RouteMapMgr(Manager):
+    """This class add route-map when BGP_PROFILE_TABLE in APPL_DB is updated"""
+
+    def __init__(self, common_objs, db, table):
+        """
+        Initialize the object
+        :param common_objs: common object dictionary
+        :param db: name of the db
+        :param table: name of the table in the db
+        """
+        super(RouteMapMgr, self).__init__(
+            common_objs,
+            [],
+            db,
+            table,
+        )
+
+    def set_handler(self, key, data):
+        log_debug("BGPRouteMapMgr:: set handler")
+        """Only need a name as the key, and community id as the data"""
+        if not self.__set_handler_validate(key, data):
+            return True
+
+        self.__update_rm(key, data)
+        return True
+
+    def del_handler(self, key):
+        log_debug("BGPRouteMapMgr:: del handler")
+        if not self.__del_handler_validate(key):
+            return
+        self.__remove_rm(key)
+
+    def __remove_rm(self, rm):
+        cmds = ["no route-map %s permit 100" % ("%s_RM" % rm)]
+        log_debug("BGPRouteMapMgr:: remove route-map %s" % ("%s_RM" % rm))
+        self.cfg_mgr.push_list(cmds)
+        log_debug("BGPRouteMapMgr::Done")
+
+    def __set_handler_validate(self, key, data):
+        if key not in ROUTE_MAPS:
+            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
+            return False
+
+        if not data:
+            log_err("BGPRouteMapMgr:: data is None")
+            return False
+        community_ids = data["community_id"].split(":")
+        try:
+            if (
+                len(community_ids) != 2
+                or int(community_ids[0]) not in range(0, 65536)
+                or int(community_ids[1]) not in range(0, 65536)
+            ):
+                log_err("BGPRouteMapMgr:: data %s doesn't include valid community id %s" % (data, community_ids))
+                return False
+        except ValueError:
+            log_err("BGPRouteMapMgr:: data %s includes illegal input" % (data))
+            return False
+
+        return True
+
+    def __del_handler_validate(self, key):
+        if key not in ROUTE_MAPS:
+            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
+            return False
+        return True
+
+    def __update_rm(self, rm, data):
+        cmds = ["route-map %s permit 100" % ("%s_RM" % rm), " set community %s" % data["community_id"]]
+        log_debug("BGPRouteMapMgr:: update route-map %s community %s" % ("%s_RM" % rm, data["community_id"]))
+        self.cfg_mgr.push_list(cmds)
+        log_debug("BGPRouteMapMgr::Done")
diff --git a/src/sonic-bgpcfgd/tests/test_advertise_rt.py b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
index 26f7b6617650..751540600006 100644
--- a/src/sonic-bgpcfgd/tests/test_advertise_rt.py
+++ b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
@@ -48,7 +48,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("10.1.0.0/24", {}),
+        ("10.1.0.0/24", {"":""}),
         True,
         [
             ["router bgp 65100",
@@ -62,7 +62,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("fc00:10::/64", {}),
+        ("fc00:10::/64", {"":""}),
         True,
         [
             ["router bgp 65100",
@@ -103,7 +103,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.2.0.0/24", {}),
+        ("vrfRED|10.2.0.0/24", {"":""}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -117,7 +117,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|fc00:20::/64", {}),
+        ("vrfRED|fc00:20::/64", {"":""}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -158,7 +158,9 @@ def test_set_del_bgp_asn_change():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.3.0.0/24", {}),
+        ("vrfRED|10.3.0.0/24", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
         True,
         []
     )
@@ -170,7 +172,7 @@ def test_set_del_bgp_asn_change():
          " no bgp network import-check"],
         ["router bgp 65100 vrf vrfRED",
          " address-family ipv4 unicast",
-         "  network 10.3.0.0/24"]
+         "  network 10.3.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
     ]
     def push_list(cmds):
         test_set_del_bgp_asn_change.push_list_called = True
@@ -183,3 +185,61 @@ def push_list(cmds):
     mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
 
     assert test_set_del_bgp_asn_change.push_list_called
+
+def test_set_del_with_community():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("10.1.0.0/24", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
+        True,
+        [
+            ["router bgp 65100",
+             " no bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  network 10.1.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "SET",
+        ("fc00:10::/64", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  network fc00:10::/64 route-map FROM_SDN_SLB_ROUTES_RM"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("10.1.0.0/24",),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  no network 10.1.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("fc00:10::/64",),
+        True,
+        [
+            ["router bgp 65100",
+             " bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  no network fc00:10::/64"]
+        ]
+    )
\ No newline at end of file
diff --git a/src/sonic-bgpcfgd/tests/test_rm.py b/src/sonic-bgpcfgd/tests/test_rm.py
new file mode 100644
index 000000000000..fe89055d27f4
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_rm.py
@@ -0,0 +1,62 @@
+from unittest.mock import MagicMock
+from bgpcfgd.directory import Directory
+from bgpcfgd.managers_rm import RouteMapMgr
+from swsscommon import swsscommon
+
+def constructor():
+    cfg_mgr = MagicMock()
+
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'constants': {},
+    }
+
+    mgr = RouteMapMgr(common_objs, "APPL_DB", "BGP_PROFILE_TABLE")
+    return mgr
+
+def set_del_test(mgr, op, args, expected_ret, expected_cmds):
+    set_del_test.push_list_called = False
+    def push_list(cmds):
+        set_del_test.push_list_called = True
+        assert cmds in expected_cmds
+        return True
+    mgr.cfg_mgr.push_list = push_list
+
+    if op == "SET":
+        ret = mgr.set_handler(*args)
+        assert ret == expected_ret
+    elif op == "DEL":
+        mgr.del_handler(*args)
+    else:
+        assert False, "Wrong operation"
+
+    if expected_cmds:
+        assert set_del_test.push_list_called, "cfg_mgr.push_list wasn't called"
+    else:
+        assert not set_del_test.push_list_called, "cfg_mgr.push_list was called"
+
+def test_set_del():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("FROM_SDN_SLB_ROUTES", {
+            "community_id": "1234:1234"
+        }),
+        True,
+        [
+            ["route-map FROM_SDN_SLB_ROUTES_RM permit 100",
+             " set community 1234:1234"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("FROM_SDN_SLB_ROUTES",),
+        True,
+        [
+            ["no route-map FROM_SDN_SLB_ROUTES_RM permit 100"]
+        ]
+    )

From 51f4bf111ea7ae0ff77441790045bdd0b83ff6ab Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 19 May 2022 22:51:02 -0700
Subject: [PATCH 1193/1674] Added Support for BGP allow list feature to have
 route-map action of setting tag (#10731)

What I did:
Added support to create route-map action set tag <user define value>
when the the allow prefix list matches. The tag can ben define by user in
constants.yml.

Why I did:
Since for Allow List feature we call from base route-map allow-list route-map having set tag option provides way for base route-map to do match tag and take any further action if needed. Adding tag provide metadata that can used by base route-map
---
 .../bgpcfgd/managers_allow_list.py            | 17 ++++
 src/sonic-bgpcfgd/tests/test_allow_list.py    | 87 ++++++++++++++++++-
 2 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
index e03bb19c163f..209d12fd2f97 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
@@ -40,6 +40,7 @@ def __init__(self, common_objs, db, table):
         )
         self.key_re = re.compile(r"^DEPLOYMENT_ID\|\d+\|\S+$|^DEPLOYMENT_ID\|\d+$")
         self.enabled = self.__get_enabled()
+        self.prefix_match_tag = self.__get_routemap_tag()
         self.__load_constant_lists()
 
     def set_handler(self, key, data):
@@ -396,6 +397,8 @@ def __update_allow_route_map_entry(self, af, allow_address_pl_name, community_na
         ]
         if not community_name.endswith(self.EMPTY_COMMUNITY):
             cmds.append(" match community %s" % community_name)
+        elif self.prefix_match_tag:
+            cmds.append(" set tag %s" % self.prefix_match_tag)
         return cmds
 
     def __update_default_route_map_entry(self, route_map_name, default_action_community):
@@ -612,6 +615,20 @@ def __get_route_map_calls(self, rms):
             inside_name = result.group(1)
         return rm_2_call
 
+    def __get_routemap_tag(self):
+        """
+        Find if any user define tag is provided to be used when allow prefifx list is matched
+        :return: string: prefix mix tag if define in constants.yml else None
+        """
+        prefix_match_tag = None
+        if 'bgp' in self.constants and \
+           'allow_list' in self.constants["bgp"] and \
+           'prefix_match_tag' in \
+           self.constants["bgp"]["allow_list"]:
+           prefix_match_tag = \
+              self.constants["bgp"]["allow_list"]["prefix_match_tag"]
+        return prefix_match_tag
+
     @staticmethod
     def __get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call):
         """
diff --git a/src/sonic-bgpcfgd/tests/test_allow_list.py b/src/sonic-bgpcfgd/tests/test_allow_list.py
index 5207c6283462..e77c692ee593 100644
--- a/src/sonic-bgpcfgd/tests/test_allow_list.py
+++ b/src/sonic-bgpcfgd/tests/test_allow_list.py
@@ -26,8 +26,26 @@
     }
 }
 
+global_constants_with_prefix_match_tag = {
+    "bgp": {
+        "allow_list": {
+            "enabled": True,
+            "default_pl_rules": {
+                "v4": [ "deny 0.0.0.0/0 le 17" ],
+                "v6": [
+                    "deny 0::/0 le 59",
+                    "deny 0::/0 ge 65"
+                ]
+            },
+            "default_action": "permit",
+            "drop_community": "123:123",
+            "prefix_match_tag": "1001"
+        }
+    }
+}
+
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
-def set_del_test(op, args, currect_config, expected_config, update_global_default_action=None):
+def set_del_test(op, args, currect_config, expected_config, update_global_default_action=None, update_constant_prefix_match_tag=False):
     from bgpcfgd.managers_allow_list import BGPAllowListMgr
     set_del_test.push_list_called = False
     def push_list(args):
@@ -45,7 +63,7 @@ def push_list(args):
         'directory': Directory(),
         'cfg_mgr':   cfg_mgr,
         'tf':        TemplateFabric(),
-        'constants': deepcopy(global_constants),
+        'constants': deepcopy(global_constants) if not update_constant_prefix_match_tag else deepcopy(global_constants_with_prefix_match_tag)
     }
 
     mgr = BGPAllowListMgr(common_objs, "CONFIG_DB", "BGP_ALLOWED_PREFIXES")
@@ -92,6 +110,39 @@ def test_set_handler_with_community():
             ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
         ]
     )
+
+def test_set_handler_with_community_and_prefix_match_tag():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|1010:2020", {
+                "prefixes_v4": "10.20.30.0/24,30.50.0.0/16",
+                "prefixes_v6": "fc00:20::/64,fc00:30::/64",
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 20 permit 10.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4 seq 30 permit 30.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 30 permit fc00:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6 seq 40 permit fc00:30::/64 le 128',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_1010:2020',
+        ],
+        None, True
+    )
+
 def test_set_handler_with_community_and_permit_action():
     set_del_test(
         "SET",
@@ -188,6 +239,38 @@ def test_set_handler_no_community():
             ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
         ]
     )
+
+def test_set_handler_no_community_and_prefix_match_tag():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5", {
+                "prefixes_v4": "20.20.30.0/24,40.50.0.0/16",
+                "prefixes_v6": "fc01:20::/64,fc01:30::/64",
+        }),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 65535',
+            ' set community 123:123 additive',
+        ],
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V4',
+            ' set tag 1001',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_COMMUNITY_empty_V6',
+            ' set tag 1001',
+        ],
+        None,True
+    )
+
 def test_set_handler_no_community_with_permit_action():
     set_del_test(
         "SET",

From 455d44efea4b4dcb70302b00c46cb685c52f97f4 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 20 May 2022 14:32:53 +0800
Subject: [PATCH 1194/1674] [Ci]: Fix to trigger the publish pipeline in
 failure build issue (#10847)

Why I did it
It is not necessary to trigger the publish pipeline when build is failed.

How I did it
Remove the condition in the azp task, change to use template condition.
---
 .azure-pipelines/azure-pipelines-image-template.yml  | 9 +++++----
 .azure-pipelines/trigger-publish-artifacts-build.yml | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 6e716604a166..0cfd94079c5f 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -57,10 +57,11 @@ jobs:
         condition: failed()
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
         displayName: "Archive failed sonic image"
-      - template: trigger-publish-artifacts-build.yml
-        parameters:
-          artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
-          publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
+      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        - template: trigger-publish-artifacts-build.yml
+          parameters:
+            artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+            publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
       - ${{ parameters.postSteps }}
       - template: cleanup.yml
     jobGroups: ${{ parameters.jobGroups }}
diff --git a/.azure-pipelines/trigger-publish-artifacts-build.yml b/.azure-pipelines/trigger-publish-artifacts-build.yml
index 83bbfc1150ce..7a6676e0f1ba 100644
--- a/.azure-pipelines/trigger-publish-artifacts-build.yml
+++ b/.azure-pipelines/trigger-publish-artifacts-build.yml
@@ -20,10 +20,8 @@ steps:
     echo "##vso[task.setvariable variable=sonic_version]$sonic_version"
     echo "##vso[task.setvariable variable=latest_tag]$latest_tag"
     echo "##vso[task.setvariable variable=docker_tags]$docker_tags"
-  condition: ne(variables['Build.Reason'], 'PullRequest')
   displayName: 'Set trigger build variables'
 - task: TriggerBuild@4
-  condition: ne(variables['Build.Reason'], 'PullRequest')
   inputs:
     definitionIsInCurrentTeamProject: false
     teamProject: internal

From f5ecf1ee1c7adce756d50b295d942b4c3cfa73ec Mon Sep 17 00:00:00 2001
From: Taylor Cai <103631396+cel-taylor@users.noreply.github.com>
Date: Thu, 26 May 2022 00:06:50 +0800
Subject: [PATCH 1195/1674] [device/celestica]:Fix failed test case of
 Haliburton snmp (#10844)

---
 device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py   | 2 +-
 .../celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
index 136010802233..0ea4aceeba7b 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py
@@ -234,7 +234,7 @@ def get_position_in_parent(self):
         Returns:
             integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
         """
-        return -1
+        return self.index + 1
 
     def is_replaceable(self):
         """
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
index d224281a5935..ab702d02d095 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py
@@ -324,6 +324,5 @@ def get_position_in_parent(self):
         Returns:
             A int value, 0 represent ASIC thermal, 1 represent CPU thermal info
         """
-        if self.postion == "cpu":
-            return 1
-        return 0
+        
+        return self.index + 1

From a76899b04f4dbe0535aceb6e396870bfa9dfa124 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Wed, 25 May 2022 15:48:02 -0700
Subject: [PATCH 1196/1674] [sonic-config-engine] Change hwsku for sample graph
 in unit tests (#10889)

#### Why I did it
To ensure that some internal testcases do not break due to external changes

#### How to verify it
Ran test_cfggen.py with the changes and it passed
---
 .../tests/sample-graph-resource-type.xml                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-config-engine/tests/sample-graph-resource-type.xml b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
index 09c2debfbb85..531d98677a38 100644
--- a/src/sonic-config-engine/tests/sample-graph-resource-type.xml
+++ b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
@@ -308,7 +308,7 @@
     <Devices>
       <Device i:type="ToRRouter">
         <Hostname>switch-t0</Hostname>
-        <HwSku>Force10-S6000</HwSku>
+        <HwSku>Arista-7050QX-32S</HwSku>
         <ClusterName>AAA00PrdStr00</ClusterName>
       </Device>
       <Device i:type="LeafRouter">
@@ -421,7 +421,7 @@
       </EthernetInterfaces>
       <FlowControl>true</FlowControl>
       <Height>0</Height>
-      <HwSku>Force10-S6000</HwSku>
+      <HwSku>Arista-7050QX-32S</HwSku>
       <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
 	<a:ManagementInterface>
 	  <ElementType>DeviceInterface</ElementType>
@@ -451,5 +451,5 @@
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
   <Hostname>switch-t0</Hostname>
-  <HwSku>Force10-S6000</HwSku>
+  <HwSku>Arista-7050QX-32S</HwSku>
 </DeviceMiniGraph>

From 9b84294ffc3f3257e718da546e597e6d8826faea Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 26 May 2022 06:20:40 -0700
Subject: [PATCH 1197/1674] Revert "[bgpcfgd] ECMP overlay VxLan with BGP
 support (#10716)"

This reverts commit 35c9becc3ca670c33c6e5fa691489ec5df2e3c7f.
---
 src/sonic-bgpcfgd/bgpcfgd/main.py             |  2 -
 .../bgpcfgd/managers_advertise_rt.py          | 83 +++++++------------
 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py      | 78 -----------------
 src/sonic-bgpcfgd/tests/test_advertise_rt.py  | 72 ++--------------
 src/sonic-bgpcfgd/tests/test_rm.py            | 62 --------------
 5 files changed, 34 insertions(+), 263 deletions(-)
 delete mode 100644 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
 delete mode 100644 src/sonic-bgpcfgd/tests/test_rm.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 698e1756e654..52d591d1fcb0 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -17,7 +17,6 @@
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
 from .managers_static_rt import StaticRouteMgr
-from .managers_rm import RouteMapMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
 from .utils import read_constants
@@ -61,7 +60,6 @@ def do_work():
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
         # Route Advertisement Managers
         AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
-        RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
index 68c48b044f61..352b89f7286c 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
@@ -1,14 +1,10 @@
 from .manager import Manager
 from .template import TemplateFabric
 from swsscommon import swsscommon
-from .managers_rm import ROUTE_MAPS
-import ipaddress
-from .log import log_info, log_err, log_debug
 
 
 class AdvertiseRouteMgr(Manager):
     """ This class Advertises routes when ADVERTISE_NETWORK_TABLE in STATE_DB is updated """
-
     def __init__(self, common_objs, db, table):
         """
         Initialize the object
@@ -22,105 +18,82 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-
+        
         self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
         self.advertised_routes = dict()
 
 
-    OP_DELETE = "DELETE"
-    OP_ADD = "ADD"
+    OP_DELETE = 'DELETE'
+    OP_ADD = 'ADD'
+
 
     def set_handler(self, key, data):
-        log_debug("AdvertiseRouteMgr:: set handler")
-        if not self.__set_handler_validate(key, data):
-            return True
         vrf, ip_prefix = self.split_key(key)
-        self.add_route_advertisement(vrf, ip_prefix, data)
+        self.add_route_advertisement(vrf, ip_prefix)
 
         return True
 
+
     def del_handler(self, key):
-        log_debug("AdvertiseRouteMgr:: del handler")
         vrf, ip_prefix = self.split_key(key)
         self.remove_route_advertisement(vrf, ip_prefix)
 
-    def __set_handler_validate(self, key, data):
-        if data:
-            if ("profile" in data and data["profile"] in ROUTE_MAPS) or data == {"":""}:
-                """
-                    APP which config the data should be responsible to pass a valid IP prefix
-                """
-                return True
-            
-        log_err("BGPAdvertiseRouteMgr:: Invalid data %s for advertised route %s" % (data, key))
-        return False
-
-    def add_route_advertisement(self, vrf, ip_prefix, data):
+
+    def add_route_advertisement(self, vrf, ip_prefix):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, dict()):
+            if not self.advertised_routes.get(vrf, set()):
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
-            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD, data)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD)
+
+        self.advertised_routes.setdefault(vrf, set()).add(ip_prefix)
 
-        self.advertised_routes.setdefault(vrf, dict()).update({ip_prefix: data})
 
     def remove_route_advertisement(self, vrf, ip_prefix):
-        if ip_prefix not in self.advertised_routes.get(vrf, dict()):
-            log_info("BGPAdvertiseRouteMgr:: %s|%s does not exist" % (vrf, ip_prefix))
-            return
-        self.advertised_routes.get(vrf, dict()).pop(ip_prefix)
-        if not self.advertised_routes.get(vrf, dict()):
+        self.advertised_routes.setdefault(vrf, set()).discard(ip_prefix)
+        if not self.advertised_routes.get(vrf, set()):
             self.advertised_routes.pop(vrf, None)
 
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, dict()):
+            if not self.advertised_routes.get(vrf, set()):
                 self.bgp_network_import_check_commands(vrf, self.OP_DELETE)
             self.advertise_route_commands(ip_prefix, vrf, self.OP_DELETE)
 
-    def advertise_route_commands(self, ip_prefix, vrf, op, data=None):
+
+    def advertise_route_commands(self, ip_prefix, vrf, op):
         is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
 
         cmd_list = []
-        if vrf == "default":
+        if vrf == 'default':
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
 
         cmd_list.append(" address-family %s unicast" % ("ipv6" if is_ipv6 else "ipv4"))
-
-        if data and "profile" in data:
-            cmd_list.append("  network %s route-map %s" % (ip_prefix, "%s_RM" % data["profile"]))
-            log_debug(
-                "BGPAdvertiseRouteMgr:: Update bgp %s network %s with route-map %s"
-                % (bgp_asn, vrf + "|" + ip_prefix, "%s_RM" % data["profile"])
-            )
-        else:
-            cmd_list.append("  %snetwork %s" % ("no " if op == self.OP_DELETE else "", ip_prefix))
-            log_debug(
-                "BGPAdvertiseRouteMgr:: %sbgp %s network %s"
-                % ("Remove " if op == self.OP_DELETE else "Update ", bgp_asn, vrf + "|" + ip_prefix)
-            )
+        cmd_list.append("  %snetwork %s" % ('no ' if op == self.OP_DELETE else '', ip_prefix))
 
         self.cfg_mgr.push_list(cmd_list)
-        log_debug("BGPAdvertiseRouteMgr::Done")
+
 
     def bgp_network_import_check_commands(self, vrf, op):
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
         cmd_list = []
-        if vrf == "default":
+        if vrf == 'default':
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-        cmd_list.append(" %sbgp network import-check" % ("" if op == self.OP_DELETE else "no "))
+        cmd_list.append(" %sbgp network import-check" % ('' if op == self.OP_DELETE else 'no '))
 
         self.cfg_mgr.push_list(cmd_list)
 
+
     def on_bgp_asn_change(self):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
             for vrf, ip_prefixes in self.advertised_routes.items():
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
                 for ip_prefix in ip_prefixes:
-                    self.add_route_advertisement(vrf, ip_prefix, ip_prefixes[ip_prefix])
+                    self.add_route_advertisement(vrf, ip_prefix)
+
 
     @staticmethod
     def split_key(key):
@@ -129,7 +102,7 @@ def split_key(key):
         :param key: key to split
         :return: vrf name extracted from the key, ip prefix extracted from the key
         """
-        if "|" not in key:
-            return "default", key
+        if '|' not in key:
+            return 'default', key
         else:
-            return tuple(key.split("|", 1))
+            return tuple(key.split('|', 1))
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
deleted file mode 100644
index 08609c68f9a6..000000000000
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from .manager import Manager
-from .log import log_err, log_debug
-
-ROUTE_MAPS = ["FROM_SDN_SLB_ROUTES"]
-
-
-class RouteMapMgr(Manager):
-    """This class add route-map when BGP_PROFILE_TABLE in APPL_DB is updated"""
-
-    def __init__(self, common_objs, db, table):
-        """
-        Initialize the object
-        :param common_objs: common object dictionary
-        :param db: name of the db
-        :param table: name of the table in the db
-        """
-        super(RouteMapMgr, self).__init__(
-            common_objs,
-            [],
-            db,
-            table,
-        )
-
-    def set_handler(self, key, data):
-        log_debug("BGPRouteMapMgr:: set handler")
-        """Only need a name as the key, and community id as the data"""
-        if not self.__set_handler_validate(key, data):
-            return True
-
-        self.__update_rm(key, data)
-        return True
-
-    def del_handler(self, key):
-        log_debug("BGPRouteMapMgr:: del handler")
-        if not self.__del_handler_validate(key):
-            return
-        self.__remove_rm(key)
-
-    def __remove_rm(self, rm):
-        cmds = ["no route-map %s permit 100" % ("%s_RM" % rm)]
-        log_debug("BGPRouteMapMgr:: remove route-map %s" % ("%s_RM" % rm))
-        self.cfg_mgr.push_list(cmds)
-        log_debug("BGPRouteMapMgr::Done")
-
-    def __set_handler_validate(self, key, data):
-        if key not in ROUTE_MAPS:
-            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
-            return False
-
-        if not data:
-            log_err("BGPRouteMapMgr:: data is None")
-            return False
-        community_ids = data["community_id"].split(":")
-        try:
-            if (
-                len(community_ids) != 2
-                or int(community_ids[0]) not in range(0, 65536)
-                or int(community_ids[1]) not in range(0, 65536)
-            ):
-                log_err("BGPRouteMapMgr:: data %s doesn't include valid community id %s" % (data, community_ids))
-                return False
-        except ValueError:
-            log_err("BGPRouteMapMgr:: data %s includes illegal input" % (data))
-            return False
-
-        return True
-
-    def __del_handler_validate(self, key):
-        if key not in ROUTE_MAPS:
-            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
-            return False
-        return True
-
-    def __update_rm(self, rm, data):
-        cmds = ["route-map %s permit 100" % ("%s_RM" % rm), " set community %s" % data["community_id"]]
-        log_debug("BGPRouteMapMgr:: update route-map %s community %s" % ("%s_RM" % rm, data["community_id"]))
-        self.cfg_mgr.push_list(cmds)
-        log_debug("BGPRouteMapMgr::Done")
diff --git a/src/sonic-bgpcfgd/tests/test_advertise_rt.py b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
index 751540600006..26f7b6617650 100644
--- a/src/sonic-bgpcfgd/tests/test_advertise_rt.py
+++ b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
@@ -48,7 +48,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("10.1.0.0/24", {"":""}),
+        ("10.1.0.0/24", {}),
         True,
         [
             ["router bgp 65100",
@@ -62,7 +62,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("fc00:10::/64", {"":""}),
+        ("fc00:10::/64", {}),
         True,
         [
             ["router bgp 65100",
@@ -103,7 +103,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.2.0.0/24", {"":""}),
+        ("vrfRED|10.2.0.0/24", {}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -117,7 +117,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|fc00:20::/64", {"":""}),
+        ("vrfRED|fc00:20::/64", {}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -158,9 +158,7 @@ def test_set_del_bgp_asn_change():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.3.0.0/24", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
+        ("vrfRED|10.3.0.0/24", {}),
         True,
         []
     )
@@ -172,7 +170,7 @@ def test_set_del_bgp_asn_change():
          " no bgp network import-check"],
         ["router bgp 65100 vrf vrfRED",
          " address-family ipv4 unicast",
-         "  network 10.3.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
+         "  network 10.3.0.0/24"]
     ]
     def push_list(cmds):
         test_set_del_bgp_asn_change.push_list_called = True
@@ -185,61 +183,3 @@ def push_list(cmds):
     mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
 
     assert test_set_del_bgp_asn_change.push_list_called
-
-def test_set_del_with_community():
-    mgr = constructor()
-    set_del_test(
-        mgr,
-        "SET",
-        ("10.1.0.0/24", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
-        True,
-        [
-            ["router bgp 65100",
-             " no bgp network import-check"],
-            ["router bgp 65100",
-             " address-family ipv4 unicast",
-             "  network 10.1.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "SET",
-        ("fc00:10::/64", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
-        True,
-        [
-            ["router bgp 65100",
-             " address-family ipv6 unicast",
-             "  network fc00:10::/64 route-map FROM_SDN_SLB_ROUTES_RM"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "DEL",
-        ("10.1.0.0/24",),
-        True,
-        [
-            ["router bgp 65100",
-             " address-family ipv4 unicast",
-             "  no network 10.1.0.0/24"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "DEL",
-        ("fc00:10::/64",),
-        True,
-        [
-            ["router bgp 65100",
-             " bgp network import-check"],
-            ["router bgp 65100",
-             " address-family ipv6 unicast",
-             "  no network fc00:10::/64"]
-        ]
-    )
\ No newline at end of file
diff --git a/src/sonic-bgpcfgd/tests/test_rm.py b/src/sonic-bgpcfgd/tests/test_rm.py
deleted file mode 100644
index fe89055d27f4..000000000000
--- a/src/sonic-bgpcfgd/tests/test_rm.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from unittest.mock import MagicMock
-from bgpcfgd.directory import Directory
-from bgpcfgd.managers_rm import RouteMapMgr
-from swsscommon import swsscommon
-
-def constructor():
-    cfg_mgr = MagicMock()
-
-    common_objs = {
-        'directory': Directory(),
-        'cfg_mgr':   cfg_mgr,
-        'constants': {},
-    }
-
-    mgr = RouteMapMgr(common_objs, "APPL_DB", "BGP_PROFILE_TABLE")
-    return mgr
-
-def set_del_test(mgr, op, args, expected_ret, expected_cmds):
-    set_del_test.push_list_called = False
-    def push_list(cmds):
-        set_del_test.push_list_called = True
-        assert cmds in expected_cmds
-        return True
-    mgr.cfg_mgr.push_list = push_list
-
-    if op == "SET":
-        ret = mgr.set_handler(*args)
-        assert ret == expected_ret
-    elif op == "DEL":
-        mgr.del_handler(*args)
-    else:
-        assert False, "Wrong operation"
-
-    if expected_cmds:
-        assert set_del_test.push_list_called, "cfg_mgr.push_list wasn't called"
-    else:
-        assert not set_del_test.push_list_called, "cfg_mgr.push_list was called"
-
-def test_set_del():
-    mgr = constructor()
-    set_del_test(
-        mgr,
-        "SET",
-        ("FROM_SDN_SLB_ROUTES", {
-            "community_id": "1234:1234"
-        }),
-        True,
-        [
-            ["route-map FROM_SDN_SLB_ROUTES_RM permit 100",
-             " set community 1234:1234"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "DEL",
-        ("FROM_SDN_SLB_ROUTES",),
-        True,
-        [
-            ["no route-map FROM_SDN_SLB_ROUTES_RM permit 100"]
-        ]
-    )

From 8ce3cab508e4efc9bdf4f76310131fb2eb403434 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 27 May 2022 16:10:32 +0800
Subject: [PATCH 1198/1674] [ci/build]: Upgrade SONiC package versions (#10732)

Co-authored-by: mssonicbld <vsts@fv-az31-361.b1uo4dmaffwenkazr3a2h2ovdb.jx.internal.cloudapp.net>
---
 .../versions-deb-buster                       | 38 +++++------
 .../build-sonic-slave-buster/versions-git     |  8 +--
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../build-sonic-slave-buster/versions-web     |  2 +-
 files/build/versions/default/versions-docker  | 20 +++---
 files/build/versions/default/versions-git     | 10 +--
 files/build/versions/default/versions-web     | 14 ++--
 .../docker-base-buster/versions-deb-buster    |  8 +--
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-base-stretch/versions-deb-stretch  | 14 ++--
 .../versions-deb-buster                       |  4 +-
 .../versions-deb-buster-arm64                 |  6 +-
 .../versions-deb-buster-armhf                 |  6 +-
 .../dockers/docker-lldp/versions-deb-buster   |  2 +-
 .../docker-orchagent/versions-deb-buster      |  2 +-
 .../versions-deb-buster                       | 22 +++----
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 31 ++++-----
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../versions/dockers/docker-snmp/versions-py3 |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 12 ++--
 .../docker-sonic-vs/versions-deb-buster       |  4 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  3 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  6 +-
 .../versions-deb-buster                       |  4 +-
 .../docker-syncd-invm/versions-deb-buster     |  4 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  4 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 40 +++++------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  6 +-
 .../sonic-slave-buster/versions-deb-buster    | 47 +++++++------
 .../versions-deb-buster-arm64                 |  4 +-
 .../versions-deb-buster-armhf                 |  4 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 66 +++++++++----------
 .../versions-deb-stretch-arm64                |  2 +
 .../versions-deb-stretch-armhf                |  2 +
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   | 21 +++---
 .../host-image/versions-deb-buster-arm64      |  7 ++
 .../host-image/versions-deb-buster-armhf      |  7 ++
 files/build/versions/host-image/versions-py3  |  8 +--
 50 files changed, 248 insertions(+), 222 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index e07e8d295223..820ac63c17aa 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.5.1208
-applibs-dev==1.mlnx.4.5.1208
+applibs==1.mlnx.4.5.2262
+applibs-dev==1.mlnx.4.5.2262
 bfnplatform==1.0.0
-innovium-sai==0.107.2
-innovium-sai-headers==0.107.2
-iproute2-dev==1.mlnx.4.5.1208
+innovium-sai==0.107.4
+innovium-sai-headers==0.107.4
+iproute2-dev==1.mlnx.4.5.2262
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -55,20 +55,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.5.1208
-sx-acl-helper-dev==1.mlnx.4.5.1208
-sx-complib==1.mlnx.4.5.1208
-sx-complib-dev==1.mlnx.4.5.1208
-sx-examples==1.mlnx.4.5.1208
-sx-examples-dev==1.mlnx.4.5.1208
-sx-gen-utils==1.mlnx.4.5.1208
-sx-gen-utils-dev==1.mlnx.4.5.1208
-sx-scew==1.mlnx.4.5.1208
-sx-scew-dev==1.mlnx.4.5.1208
-sxd-libs==1.mlnx.4.5.1208
-sxd-libs-dev==1.mlnx.4.5.1208
+sx-acl-helper==1.mlnx.4.5.2262
+sx-acl-helper-dev==1.mlnx.4.5.2262
+sx-complib==1.mlnx.4.5.2262
+sx-complib-dev==1.mlnx.4.5.2262
+sx-examples==1.mlnx.4.5.2262
+sx-examples-dev==1.mlnx.4.5.2262
+sx-gen-utils==1.mlnx.4.5.2262
+sx-gen-utils-dev==1.mlnx.4.5.2262
+sx-scew==1.mlnx.4.5.2262
+sx-scew-dev==1.mlnx.4.5.2262
+sxd-libs==1.mlnx.4.5.2262
+sxd-libs-dev==1.mlnx.4.5.2262
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.5.1208
-wjh-libs-dev==1.mlnx.4.5.1208
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2262
+wjh-libs-dev==1.mlnx.4.5.2262
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 2d256b4677b0..89a83090b97e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,13 +1,13 @@
-https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
+https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
+https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
+https://github.com/thom311/libnl==e5dc111f8c9c646b1fca3f3aabaa00165952b89c
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1c152ecfa0858a5b15aba37e88ca2c833c12ba48
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 5d0e9986465a..44843591ae38 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -8,7 +8,7 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.9.0
+psutil==5.9.1
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.9
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 0f7139c777c5..6cf7c52e356b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -11,7 +11,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:29b908616bc920e58bf384d1e47b91b6cf9188b8==c4189e12deb73c6034209c788c9eb133
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index d2f4f2d78ef3..74f93e60efe3 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:40dd1c1b1c36eac161ab63b6ce3a57d56ad79a667a37717a31721bac3f30aaf9
-amd64:amd64/debian:stretch==sha256:75383204de7da8eb4bb2724e5fb8dae2910ee78938ade4d35ed8afec19a90b0b
-amd64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
-amd64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
-arm64:arm64v8/debian:buster==sha256:bf508d976de85857fd69e5da1f67d89f59ab3bc9f60b578ce24eee43047faf23
-arm64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
-arm64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
-armhf:arm32v7/debian:buster==sha256:8e9f24e8010ba995daf25c6fafe8ea5c1914428cc29df867ffc034375d769a43
-armhf:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
-armhf:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
\ No newline at end of file
+amd64:amd64/debian:buster==sha256:b0d66f622e901eb093d5f45d758e7165a3499718df3a6648a3b77505f5911a72
+amd64:amd64/debian:stretch==sha256:b532fcd1510511edf92791f7ceb22dde8c26f8252a74bcee1562dc1f8c2fdfe6
+amd64:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
+amd64:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
+arm64:arm64v8/debian:buster==sha256:eb452d289edeabbdeeede8e2e52d0e7f01ba61fcef599f7a3444b64877ea4ae9
+arm64:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
+arm64:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
+armhf:arm32v7/debian:buster==sha256:f827ab5b192e22e2758aa6fe3fa600a0b91f6ba4cc0dda6c14ae0a3339b48bf9
+armhf:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
+armhf:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 9cdf00e6cca2..1150db351219 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,9 +1,9 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8d2d507a4974d20d4cac8a8486e31a27aca8b562
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
+https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
+https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
@@ -11,9 +11,9 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
+https://github.com/thom311/libnl==e5dc111f8c9c646b1fca3f3aabaa00165952b89c
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1c152ecfa0858a5b15aba37e88ca2c833c12ba48
 https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index a37cdba56257..6796420065ba 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -16,22 +16,22 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:8e9b0c80860d00dfe951f7ea37d74e210d376c13==26c9adbc3f71cbcfcf133edb38ad49aa
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:29b908616bc920e58bf384d1e47b91b6cf9188b8==c4189e12deb73c6034209c788c9eb133
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==3084d51335d332e66f0d81a42079516d
+https://deb.nodesource.com/node_14.x/dists/buster/Release==6b181b4ad151ab26c7c7738ec8534ed3
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==88aded33099764ca8f810f72f3c9a173
+https://deb.nodesource.com/setup_14.x==3fb63a2bd38414a2b249fa9b3dbbbc3e
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-8_armhf.deb==74bd3c57609f226ecea5badcb1d55190
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==466e43bd541ef447de2aafbc6818496c
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==2c4cf09c5548f069626bf632708016a8
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==4dacbf945449e0e328d5335ed213c68d
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 4e498e6f8b6d..aa80961f34e6 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -19,8 +19,8 @@ libk5crypto3==1.17-3+deb10u3
 libkeyutils1==1.6-6
 libkrb5-3==1.17-3+deb10u3
 libkrb5support0==1.17-3+deb10u3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
+libldap-2.4-2==2.4.47+dfsg-3+deb10u7
+libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
 liblua5.1-0==5.1.5-8.1+b2
 libmpdec2==2.4.2-2
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u2
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1n-0+deb10u1
+openssl==1.1.1n-0+deb10u2
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 93d0ee4a4b58..4cb64ea768d0 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,5 +1,5 @@
 j2cli==0.3.10
-jinja2==3.1.1
+jinja2==3.1.2
 markupsafe==2.1.1
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index de9009f1c1b1..945c497afe1f 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -24,8 +24,8 @@ libk5crypto3==1.15-1+deb9u3
 libkeyutils1==1.5.9-9
 libkrb5-3==1.15-1+deb9u3
 libkrb5support0==1.15-1+deb9u3
-libldap-2.4-2==2.4.44+dfsg-5+deb9u8
-libldap-common==2.4.44+dfsg-5+deb9u8
+libldap-2.4-2==2.4.44+dfsg-5+deb9u9
+libldap-common==2.4.44+dfsg-5+deb9u9
 liblognorm5==2.0.3-1~bpo9+1
 liblua5.1-0==5.1.5-8.1+b2
 libncurses5==6.0+20161126-1+deb9u2
@@ -48,7 +48,7 @@ libsodium18==1.0.11-2
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
 libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u5
+libssl1.1==1.1.0l-1~deb9u6
 libtasn1-6==4.10-1.1+deb9u1
 libunistring0==0.9.6+really0.9.3-0.1
 libwrap0==7.6.q-26
@@ -57,7 +57,7 @@ lua-bitop==1.0.2-4
 lua-cjson==2.1.0+dfsg-2
 mime-support==3.60
 net-tools==1.60+git20161116.90da8a0-1
-openssl==1.1.0l-1~deb9u5
+openssl==1.1.0l-1~deb9u6
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
 procps==2:3.3.12-3+deb9u1
@@ -71,6 +71,6 @@ readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.0.0197-4+deb9u5
-vim-tiny==2:8.0.0197-4+deb9u5
-xxd==2:8.0.0197-4+deb9u5
\ No newline at end of file
+vim-common==2:8.0.0197-4+deb9u6
+vim-tiny==2:8.0.0197-4+deb9u6
+xxd==2:8.0.0197-4+deb9u6
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 98d534edd3d7..486251133d20 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -7,7 +7,7 @@ bzip2==1.0.6-9.2~deb10u1
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 dh-python==3.20190308
-dpkg-dev==1.19.7
+dpkg-dev==1.19.8
 g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
@@ -18,7 +18,7 @@ libbinutils==2.31.1-16
 libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libgcc-8-dev==8.3.0-6
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 9e0de58706b8..d2ad57f87814 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,10 +1,12 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
+libdpkg-perl==1.19.7
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 7fc383597d13..97d2499d35bf 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,10 +1,12 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
+libdpkg-perl==1.19.7
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 355ee8064734..00b50d4acadf 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -18,7 +18,7 @@ libsnmp-base==5.7.3+dfsg-5
 libsnmp30==5.7.3+dfsg-5
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
 mariadb-common==1:10.3.34-0+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 8452509606de..53eff6fcc468 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -22,7 +22,7 @@ libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index de68987d0f44..5501eb8bec43 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.5.1208
-applibs-dev==1.mlnx.4.5.1208
+applibs==1.mlnx.4.5.2262
+applibs-dev==1.mlnx.4.5.2262
 binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
@@ -32,7 +32,7 @@ libcairo2==1.16.0-4+deb10u1
 libcc1-0==8.3.0-6
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
@@ -94,7 +94,7 @@ libxcb-shm0==1.13.1-2
 libxcb1==1.13.1-2
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 libxrender1==1:0.9.10-1
 linux-libc-dev==4.19.235-1
 lm-sensors==1:3.5.0-3
@@ -108,7 +108,7 @@ python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
-python-sdk-api==1.mlnx.4.5.1208
+python-sdk-api==1.mlnx.4.5.2262
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.5.1208
-sx-complib-dev==1.mlnx.4.5.1208
-sx-gen-utils==1.mlnx.4.5.1208
-sx-gen-utils-dev==1.mlnx.4.5.1208
-sxd-libs==1.mlnx.4.5.1208
-sxd-libs-dev==1.mlnx.4.5.1208
+sx-complib==1.mlnx.4.5.2262
+sx-complib-dev==1.mlnx.4.5.2262
+sx-gen-utils==1.mlnx.4.5.2262
+sx-gen-utils-dev==1.mlnx.4.5.2262
+sxd-libs==1.mlnx.4.5.2262
+sxd-libs-dev==1.mlnx.4.5.2262
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 182150dddcab..01753180c581 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.7.post1
 pyang==2.5.3
 pyangbind==0.6.0
-python-sdk-api==4.5.1208
+python-sdk-api==4.5.2262
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 940824e47550..1dae9b3c4445 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.5.1208
+python_sdk_api==4.5.2262
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 152c095a521c..d5362b298548 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -17,7 +17,8 @@ curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
-dpkg-dev==1.18.25
+dpkg==1.18.26
+dpkg-dev==1.18.26
 ethtool==1:4.8-1+b1
 exim4==4.89-2+deb9u8
 exim4-base==4.89-2+deb9u8
@@ -42,7 +43,7 @@ libalgorithm-diff-perl==1.19.03-1
 libalgorithm-diff-xs-perl==0.04-4+b2
 libalgorithm-merge-perl==0.08-3
 libapparmor1==2.11.0-3+deb9u2
-libarchive13==3.2.2-2+deb9u2
+libarchive13==3.2.2-2+deb9u3
 libasan3==6.3.0-18+deb9u1
 libassuan0==2.4.3-2
 libatomic1==6.3.0-18+deb9u1
@@ -59,7 +60,7 @@ libcurl3-gnutls==7.52.1-5+deb9u16
 libdbus-1-3==1.10.32-0+deb9u1
 libdevmapper1.02.1==2:1.02.137-2
 libdouble-conversion1==2.0.1-4
-libdpkg-perl==1.18.25
+libdpkg-perl==1.18.26
 libedit2==3.1-20160903-3
 liberror-perl==0.17024-1
 libestr0==0.1.10-2
@@ -97,8 +98,8 @@ libkrb5-3==1.15-1+deb9u3
 libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
-libldap-2.4-2==2.4.44+dfsg-5+deb9u8
-libldap-common==2.4.44+dfsg-5+deb9u8
+libldap-2.4-2==2.4.44+dfsg-5+deb9u9
+libldap-common==2.4.44+dfsg-5+deb9u9
 liblocale-gettext-perl==1.07-3+b1
 liblogging-stdlog0==1.0.5-2+b2
 liblognorm5==2.0.1-1.1+b1
@@ -148,10 +149,10 @@ libseccomp2==2.3.1-2.1+deb9u1
 libsigsegv2==2.10-5
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
-libssl-dev==1.1.0l-1~deb9u5
-libssl-doc==1.1.0l-1~deb9u5
+libssl-dev==1.1.0l-1~deb9u6
+libssl-doc==1.1.0l-1~deb9u6
 libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u5
+libssl1.1==1.1.0l-1~deb9u6
 libstdc++-6-dev==6.3.0-18+deb9u1
 libtacacs+1==4.0.4.27a-3
 libtasn1-6==4.10-1.1+deb9u1
@@ -169,7 +170,7 @@ libxau6==1:1.0.8-1
 libxcb1==1.12-1
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-2.2+deb9u6
+libxml2==2.9.4+dfsg1-2.2+deb9u7
 libxmuu1==2:1.1.2-2
 linux-libc-dev==4.9.303-1
 logrotate==3.11.0-0.1
@@ -191,7 +192,7 @@ ntpstat==0.0.0.1-1+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u5
+openssl==1.1.0l-1~deb9u6
 patch==2.7.5-1+deb9u2
 perl==5.24.1-3+deb9u7
 perl-modules-5.24==5.24.1-3+deb9u7
@@ -216,7 +217,7 @@ qttranslations5-l10n==5.7.1~20161021-1
 readline-common==7.0-3
 rename==0.20-4
 rsync==3.1.2-1+deb9u3
-rsyslog==8.24.0-1+deb9u1
+rsyslog==8.24.0-1+deb9u3
 sgml-base==1.29
 shared-mime-info==1.8-1+deb9u1
 systemd==232-25+deb9u13
@@ -229,12 +230,12 @@ tmux==2.3-4
 traceroute==1:2.1.0-2
 ucf==3.0036
 unzip==6.0-21+deb9u2
-vim==2:8.0.0197-4+deb9u5
-vim-common==2:8.0.0197-4+deb9u5
-vim-runtime==2:8.0.0197-4+deb9u5
+vim==2:8.0.0197-4+deb9u6
+vim-common==2:8.0.0197-4+deb9u6
+vim-runtime==2:8.0.0197-4+deb9u6
 wget==1.18-5+deb9u3
 xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
-xxd==2:8.0.0197-4+deb9u5
+xxd==2:8.0.0197-4+deb9u6
 xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 1782d0051acb..eba32f350332 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.10.4
+paramiko==2.11.0
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index d8b86f5af1c0..ab2b43ab082f 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.0.0
-psutil==5.9.0
+psutil==5.9.1
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 1c564e793bf6..84b0ebba78c1 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -48,7 +48,7 @@ libstdc++-8-dev==8.3.0-6
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 libyang==1.0.73
 linux-libc-dev==4.19.235-1
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index dcf1b2cd40ff..6f89a130a333 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,18 +1,18 @@
 attrs==21.4.0
 certifi==2017.4.17
 charset-normalizer==2.0.12
-click==8.1.2
+click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.1.1
-grpcio==1.44.0
+flask==2.1.2
+grpcio==1.46.3
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.11.3
+importlib-metadata==4.11.4
 importlib-resources==5.7.1
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.4.0
+jsonschema==4.5.1
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
 protobuf==3.20.1
@@ -22,5 +22,5 @@ requests==2.27.1
 six==1.11.0
 typing_extensions==4.2.0
 urllib3==1.26.5
-werkzeug==2.1.1
+werkzeug==2.1.2
 zipp==3.8.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index da56959c725f..2167fcbe283a 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -46,7 +46,7 @@ libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdevmapper1.02.1==2:1.02.155-3
 libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
@@ -95,7 +95,7 @@ libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsaivs==1.0.0
-libssl-dev==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libteam-utils==1.30-1
 libteam5==1.30-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index bc06b437734c..19b3ee62bf30 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2021.10.8
+certifi==2022.5.18.1
 charset-normalizer==2.0.12
 click==7.0
 idna==3.3
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 2bbe113f9712..feab2e91bb91 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 9c936e87e6ff..012d1e21e2c2 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -8,7 +8,6 @@ libcurl4-gnutls-dev==7.64.0-4+deb10u2
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1+deb10u1
-liblzma5==5.2.4-1+deb10u1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
 libpcap0.8-dev==1.8.1-6+deb10u1
@@ -19,6 +18,6 @@ libunwind-dev==1.2.1-10~deb10u1
 libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 linux-libc-dev==4.19.235-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index cac4c1e279c0..d0b4ea39c26c 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -16,7 +16,7 @@ libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
@@ -45,13 +45,13 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index ededb93b8296..e663b076fd44 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -47,13 +47,13 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 linux-libc-dev==4.19.235-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 3c52963581c7..c2d3b432aaa2 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.2
-innovium-sai-headers==0.107.2
+innovium-sai==0.107.4
+innovium-sai-headers==0.107.4
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index a420ca6799a7..713326cf246c 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -16,7 +16,7 @@ libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index cc3fb52487ba..01c9b833e0e2 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,8 +1,8 @@
-applibs==1.mlnx.4.5.1208
-applibs-dev==1.mlnx.4.5.1208
+applibs==1.mlnx.4.5.2262
+applibs-dev==1.mlnx.4.5.2262
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2-dev==1.mlnx.4.5.1208
+iproute2-dev==1.mlnx.4.5.2262
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -30,10 +30,10 @@ libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
 linux-libc-dev==4.19.235-1
 mft==4.18.0-106
-mlnx-sai==1.mlnx.SAIRel1.20.2.6
+mlnx-sai==1.mlnx.SAIRel1.21.1.2
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
@@ -41,7 +41,7 @@ python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.5.1208
+python-sdk-api==1.mlnx.4.5.2262
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.5.1208
-sx-acl-helper-dev==1.mlnx.4.5.1208
-sx-complib==1.mlnx.4.5.1208
-sx-complib-dev==1.mlnx.4.5.1208
-sx-examples==1.mlnx.4.5.1208
-sx-examples-dev==1.mlnx.4.5.1208
-sx-gen-utils==1.mlnx.4.5.1208
-sx-gen-utils-dev==1.mlnx.4.5.1208
-sx-scew==1.mlnx.4.5.1208
-sx-scew-dev==1.mlnx.4.5.1208
-sxd-libs==1.mlnx.4.5.1208
-sxd-libs-dev==1.mlnx.4.5.1208
+sx-acl-helper==1.mlnx.4.5.2262
+sx-acl-helper-dev==1.mlnx.4.5.2262
+sx-complib==1.mlnx.4.5.2262
+sx-complib-dev==1.mlnx.4.5.2262
+sx-examples==1.mlnx.4.5.2262
+sx-examples-dev==1.mlnx.4.5.2262
+sx-gen-utils==1.mlnx.4.5.2262
+sx-gen-utils-dev==1.mlnx.4.5.2262
+sx-scew==1.mlnx.4.5.2262
+sx-scew-dev==1.mlnx.4.5.2262
+sxd-libs==1.mlnx.4.5.2262
+sxd-libs-dev==1.mlnx.4.5.2262
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-wjh-libs==1.mlnx.4.5.1208
-wjh-libs-dev==1.mlnx.4.5.1208
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2262
+wjh-libs-dev==1.mlnx.4.5.2262
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index adf84f58a607..a979a56f0187 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.5.1208
\ No newline at end of file
+python-sdk-api==4.5.2262
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 51f2205ee735..585326d2ef8c 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.5.1208
\ No newline at end of file
+python_sdk_api==4.5.2262
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 690190b948b2..75858915943a 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -22,7 +22,7 @@ libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
 libtirpc-common==1.1.4-0.4
 libtirpc3==1.1.4-0.4
-mrvllibsai==1.7.1-8
+mrvllibsai==1.7.1-9
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 8dd7f0b825f7..12f54cec7f67 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -19,11 +19,11 @@ libsainps==1.5.0
 libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
-libxml2==2.9.4+dfsg1-2.2+deb9u6
+libxml2==2.9.4+dfsg1-2.2+deb9u7
 openssh-client==1:7.4p1-10+deb9u7
 sshpass==1.06-1
 strace==4.15-2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.0.0197-4+deb9u5
-vim-runtime==2:8.0.0197-4+deb9u5
\ No newline at end of file
+vim==2:8.0.0197-4+deb9u6
+vim-runtime==2:8.0.0197-4+deb9u6
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index fa183f9ad7e8..75bef487ec56 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.5.11-1
+containerd.io==1.6.4-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -95,7 +95,7 @@ docutils-doc==0.14+dfsg-4
 dosfstools==4.1-2
 doxygen==1.8.13-10
 dpatch==2.0.38+nmu1
-dpkg-dev==1.19.7
+dpkg-dev==1.19.8
 dput==1.0.3
 dvipng==1.15-1.1
 dwz==0.12-3
@@ -264,10 +264,10 @@ libavahi-common-data==0.7-4+deb10u1
 libavahi-common3==0.7-4+deb10u1
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
-libavcodec58==7:4.1.8-0+deb10u1
-libavfilter7==7:4.1.8-0+deb10u1
-libavformat58==7:4.1.8-0+deb10u1
-libavutil56==7:4.1.8-0+deb10u1
+libavcodec58==7:4.1.9-0+deb10u1
+libavfilter7==7:4.1.9-0+deb10u1
+libavformat58==7:4.1.9-0+deb10u1
+libavutil56==7:4.1.9-0+deb10u1
 libb-hooks-endofscope-perl==0.24-1
 libb-hooks-op-check-perl==0.22-1+b1
 libbabeltrace-dev==1.5.6-2+deb10u1
@@ -436,7 +436,7 @@ libdouble-conversion1==3.1.0-3
 libdoxia-core-java==1.7-2
 libdoxia-java==1.7-2
 libdoxia-sitetools-java==1.7.5-1
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libdrm-amdgpu1==2.4.97-1
 libdrm-common==2.4.97-1
 libdrm-dev==2.4.97-1
@@ -702,9 +702,9 @@ libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-libldap2-dev==2.4.47+dfsg-3+deb10u6
+libldap-2.4-2==2.4.47+dfsg-3+deb10u7
+libldap-common==2.4.47+dfsg-3+deb10u7
+libldap2-dev==2.4.47+dfsg-3+deb10u7
 liblilv-0-0==0.24.2~dfsg0-2
 liblist-compare-perl==0.53-1
 liblist-moreutils-perl==0.416-1+b4
@@ -729,7 +729,6 @@ liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
 liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u7
 liblzma-dev==5.2.4-1+deb10u1
-liblzma5==5.2.4-1+deb10u1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
@@ -913,7 +912,7 @@ libpolkit-agent-1-0==0.105-25+deb10u1
 libpolkit-backend-1-0==0.105-25+deb10u1
 libpolkit-gobject-1-0==0.105-25+deb10u1
 libpopt0==1.16-12
-libpostproc55==7:4.1.8-0+deb10u1
+libpostproc55==7:4.1.9-0+deb10u1
 libpotrace0==1.15-1
 libprocps7==2:3.3.15-2
 libprotobuf-c1==1.3.1-1+b1
@@ -1056,8 +1055,8 @@ libsqlite3-0==3.27.2-3+deb10u1
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
+libssl1.1==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1075,8 +1074,8 @@ libsubunit-dev==1.3.0-1
 libsubunit0==1.3.0-1
 libsurefire-java==2.22.1-1
 libswitch-perl==2.17-2
-libswresample3==7:4.1.8-0+deb10u1
-libswscale5==7:4.1.8-0+deb10u1
+libswresample3==7:4.1.9-0+deb10u1
+libswscale5==7:4.1.9-0+deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u8
@@ -1277,9 +1276,9 @@ libxml-sax-perl==1.00+dfsg-1
 libxml-simple-perl==2.25-1
 libxml-twig-perl==1:3.50-1.1
 libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
-libxml2-utils==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2-dev==2.9.4+dfsg1-7+deb10u4
+libxml2-utils==2.9.4+dfsg1-7+deb10u4
 libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
@@ -1359,17 +1358,17 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.14+9-1~deb10u1
-openjdk-11-jdk-headless==11.0.14+9-1~deb10u1
-openjdk-11-jre==11.0.14+9-1~deb10u1
-openjdk-11-jre-headless==11.0.14+9-1~deb10u1
+openjdk-11-jdk==11.0.15+10-1~deb10u1
+openjdk-11-jdk-headless==11.0.15+10-1~deb10u1
+openjdk-11-jre==11.0.15+10-1~deb10u1
+openjdk-11-jre-headless==11.0.15+10-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u1
+openssl==1.1.1n-0+deb10u2
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 9d146f1c1eb8..f4606d049f9f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,7 +1,9 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+dpkg-dev==1.19.7
+libdpkg-perl==1.19.7
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.19.1-deb-1nodesource1
\ No newline at end of file
+nodejs==14.19.3-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index b90483767d31..391b7b9342c9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,9 +1,11 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+dpkg-dev==1.19.7
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
 libclang-dev==1:7.0-47
 libclass-data-inheritable-perl==0.08-3
+libdpkg-perl==1.19.7
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
@@ -103,7 +105,7 @@ linux-compiler-gcc-8-arm==4.19.235-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.19.1-deb-1nodesource1
+nodejs==14.19.3-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 636201e22866..28f4abb7eb62 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==31140af3cfe21203cd9b48135859654db4d39ca1
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index bf3f09fd6e02..01a31c6b99f5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.4.1
+bitarray==2.5.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 9d3badc94835..9e3e89f09590 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -88,7 +88,7 @@ docutils-doc==0.13.1+dfsg-2
 dosfstools==4.1-1
 doxygen==1.8.13-4+b1
 dpatch==2.0.38+nmu1~bpo9+1
-dpkg-dev==1.18.25
+dpkg-dev==1.18.26
 dput==0.12.1
 dwz==0.12-1+b1
 eatmydata==105-5
@@ -129,7 +129,7 @@ gem2deb-test-runner==0.33.1
 geoip-database==20170512-1
 gettext==0.19.8.1-2+deb9u1
 gettext-base==0.19.8.1-2+deb9u1
-ghostscript==9.26a~dfsg-0+deb9u8
+ghostscript==9.26a~dfsg-0+deb9u9
 gir1.2-glib-2.0==1.50.0-1+b1
 gir1.2-packagekitglib-1.0==1.1.5-2+deb9u2
 git==1:2.11.0-3+deb9u7
@@ -154,9 +154,9 @@ guile-2.0-libs==2.0.13+1-4
 hicolor-icon-theme==0.15-1
 icc-profiles-free==2.0.1+dfsg-1
 icu-devtools==57.1-6+deb9u5
-imagemagick==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u13
-imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u13
+imagemagick==8:6.9.7.4+dfsg-11+deb9u14
+imagemagick-6-common==8:6.9.7.4+dfsg-11+deb9u14
+imagemagick-6.q16==8:6.9.7.4+dfsg-11+deb9u14
 install-info==6.3.0.dfsg.1-1+b2
 intltool-debian==0.35.0+20060710.4
 iptables==1.6.0+snapshot20161117-6
@@ -195,7 +195,7 @@ libapparmor1==2.11.0-3+deb9u2
 libapt-inst2.0==1.4.11
 libapt-pkg-perl==0.1.32
 libarchive-zip-perl==1.59-1+deb9u1
-libarchive13==3.2.2-2+deb9u2
+libarchive13==3.2.2-2+deb9u3
 libasan3==6.3.0-18+deb9u1
 libasm-java==5.2-2
 libasound2==1.1.3-5
@@ -412,7 +412,7 @@ libdouble-conversion1==2.0.1-4
 libdoxia-core-java==1.1.4-6
 libdoxia-java==1.1.4-6
 libdoxia-sitetools-java==1.1.4-1.1
-libdpkg-perl==1.18.25
+libdpkg-perl==1.18.26
 libdrm-amdgpu1==2.4.74-1
 libdrm-dev==2.4.74-1
 libdrm-intel1==2.4.74-1
@@ -507,8 +507,8 @@ libgoogle-perftools4==2.5-2.2
 libgpgme11==1.8.0-3+b2
 libgpm2==1.20.4-6.2+b1
 libgraphite2-3==1.3.10-1
-libgs9==9.26a~dfsg-0+deb9u8
-libgs9-common==9.26a~dfsg-0+deb9u8
+libgs9==9.26a~dfsg-0+deb9u9
+libgs9-common==9.26a~dfsg-0+deb9u9
 libgsasl7==1.8.0-8+b2
 libgssapi-krb5-2==1.15-1+deb9u3
 libgstreamer1.0-0==1.10.4-1
@@ -630,9 +630,9 @@ libkrb5support0==1.15-1+deb9u3
 libksba8==1.3.5-2
 libkyotocabinet16v5==1.2.76-4.2+b1
 liblcms2-2==2.8-4+deb9u1
-libldap-2.4-2==2.4.44+dfsg-5+deb9u8
-libldap-common==2.4.44+dfsg-5+deb9u8
-libldap2-dev==2.4.44+dfsg-5+deb9u8
+libldap-2.4-2==2.4.44+dfsg-5+deb9u9
+libldap-common==2.4.44+dfsg-5+deb9u9
+libldap2-dev==2.4.44+dfsg-5+deb9u9
 liblist-compare-perl==0.53-1
 liblist-moreutils-perl==0.416-1+b1
 libllvm3.8==1:3.8.1-24
@@ -656,9 +656,9 @@ liblzo2-2==2.08-1.2+b2
 liblzo2-dev==2.08-1.2+b2
 libmagic-mgc==1:5.30-1+deb9u3
 libmagic1==1:5.30-1+deb9u3
-libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
-libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u13
-libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u13
+libmagickcore-6.q16-3==8:6.9.7.4+dfsg-11+deb9u14
+libmagickcore-6.q16-3-extra==8:6.9.7.4+dfsg-11+deb9u14
+libmagickwand-6.q16-3==8:6.9.7.4+dfsg-11+deb9u14
 libmail-sendmail-perl==0.79.16-2
 libmailtools-perl==2.18-1
 libmailutils5==1:3.1.1-1
@@ -925,9 +925,9 @@ libsoup2.4-1==2.56.0-2+deb9u2
 libspice-server1==0.12.8-2.1+deb9u4
 libsqlite3-0==3.16.2-5+deb9u3
 libssh2-1==1.7.0-1+deb9u2
-libssl-dev==1.1.0l-1~deb9u5
+libssl-dev==1.1.0l-1~deb9u6
 libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u5
+libssl1.1==1.1.0l-1~deb9u6
 libstax-java==1.2.0-3
 libstdc++-6-dev==6.3.0-18+deb9u1
 libstrictures-perl==2.000003-1
@@ -1092,9 +1092,9 @@ libxml-sax-perl==0.99+dfsg-2
 libxml-simple-perl==2.22-1
 libxml-twig-perl==1:3.50-1
 libxml-xpathengine-perl==0.13-1
-libxml2==2.9.4+dfsg1-2.2+deb9u6
-libxml2-dev==2.9.4+dfsg1-2.2+deb9u6
-libxml2-utils==2.9.4+dfsg1-2.2+deb9u6
+libxml2==2.9.4+dfsg1-2.2+deb9u7
+libxml2-dev==2.9.4+dfsg1-2.2+deb9u7
+libxml2-utils==2.9.4+dfsg1-2.2+deb9u7
 libxmlgraphics-commons-java==2.1-2
 libxmlrpc-lite-perl==0.717-1
 libxmu6==2:1.1.2-2
@@ -1170,17 +1170,17 @@ ncurses-term==6.0+20161126-1+deb9u2
 netbase==5.4
 netpbm==2:10.0-15.3+b2
 ocl-icd-libopencl1==2.2.11-1
-openjdk-8-jdk==8u322-b06-1~deb9u1
-openjdk-8-jdk-headless==8u322-b06-1~deb9u1
-openjdk-8-jre==8u322-b06-1~deb9u1
-openjdk-8-jre-headless==8u322-b06-1~deb9u1
+openjdk-8-jdk==8u332-ga-1~deb9u1
+openjdk-8-jdk-headless==8u332-ga-1~deb9u1
+openjdk-8-jre==8u332-ga-1~deb9u1
+openjdk-8-jre-headless==8u332-ga-1~deb9u1
 openmpi-bin==2.0.2-2
 openmpi-common==2.0.2-2
 opensp==1.5.2-13+b1
 openssh-client==1:7.4p1-10+deb9u7
 openssh-server==1:7.4p1-10+deb9u7
 openssh-sftp-server==1:7.4p1-10+deb9u7
-openssl==1.1.0l-1~deb9u5
+openssl==1.1.0l-1~deb9u6
 packagekit==1.1.5-2+deb9u2
 packagekit-tools==1.1.5-2+deb9u2
 patch==2.7.5-1+deb9u2
@@ -1308,9 +1308,9 @@ python-sphinx==1.4.9-2
 python-sphinx-rtd-theme==0.1.9-1
 python-stdeb==0.8.5-1
 python-tk==2.7.13-1
-python-twisted==16.6.0-2+deb9u2
-python-twisted-bin==16.6.0-2+deb9u2
-python-twisted-core==16.6.0-2+deb9u2
+python-twisted==16.6.0-2+deb9u3
+python-twisted-bin==16.6.0-2+deb9u3
+python-twisted-core==16.6.0-2+deb9u3
 python-tz==2016.7-0.3
 python-urllib3==1.19.1-1+deb9u1
 python-webencodings==0.5-2
@@ -1388,7 +1388,7 @@ rename==0.20-4
 rhino==1.7.7.1-1
 rrdtool==1.6.0-1+b2
 rsync==3.1.2-1+deb9u3
-rsyslog==8.24.0-1+deb9u1
+rsyslog==8.24.0-1+deb9u3
 ruby==1:2.3.3
 ruby-all-dev==1:2.3.3
 ruby-did-you-mean==1.0.0-2
@@ -1450,9 +1450,9 @@ ucf==3.0036
 unattended-upgrades==0.93.1+nmu1
 unzip==6.0-21+deb9u2
 velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u5
-vim-common==2:8.0.0197-4+deb9u5
-vim-runtime==2:8.0.0197-4+deb9u5
+vim==2:8.0.0197-4+deb9u6
+vim-common==2:8.0.0197-4+deb9u6
+vim-runtime==2:8.0.0197-4+deb9u6
 wdiff==1.2.2-2
 wget==1.18-5+deb9u3
 x11-common==1:7.7+19
@@ -1480,7 +1480,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
 xterm==327-2+deb9u3
 xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u5
+xxd==2:8.0.0197-4+deb9u6
 xz-utils==5.2.2-1.2+deb9u1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 00f894c2df08..81aa623ff1b5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,4 +1,6 @@
 docker-ce==18.06.3~ce~3-0~debian
+dpkg-dev==1.18.25
+libdpkg-perl==1.18.25
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libtext-charwidth-perl==0.04-7+b3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index fb64a5239dd9..bbf6bb1785d4 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -1,4 +1,6 @@
 docker-ce==18.06.3~ce~3-0~debian
+dpkg-dev==1.18.25
+libdpkg-perl==1.18.25
 libdrm-exynos1==2.4.74-1
 libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 636201e22866..28f4abb7eb62 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==31140af3cfe21203cd9b48135859654db4d39ca1
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 273be857e91a..d16d157b6578 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.4.1
+bitarray==2.5.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 0760b2fe6e72..3a231842d99b 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.5.11-1
+containerd.io==1.6.4-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -29,7 +29,8 @@ dmidecode==3.2-1
 dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
 docker-ce-cli==5:18.09.8~3-0~debian-buster
-dpkg-dev==1.19.7
+dpkg==1.19.8
+dpkg-dev==1.19.8
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
 file==1:5.35-4+deb10u2
@@ -67,7 +68,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.2
+innovium-platform-driver==0.107.4
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -105,7 +106,7 @@ libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
@@ -147,8 +148,8 @@ libkmod2==26-1
 libkrb5-3==1.17-3+deb10u3
 libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
+libldap-2.4-2==2.4.47+dfsg-3+deb10u7
+libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
 liblsan0==8.3.0-6
 liblzma5==5.2.4-1+deb10u1
@@ -205,8 +206,8 @@ libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
+libssl-dev==1.1.1n-0+deb10u2
+libssl1.1==1.1.1n-0+deb10u2
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
@@ -251,7 +252,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u1
+openssl==1.1.1n-0+deb10u2
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
@@ -307,7 +308,7 @@ squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-sx-kernel==1.mlnx.4.5.1208
+sx-kernel==1.mlnx.4.5.2262
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 4c1819e181ff..a9f9bda4dcc6 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,13 +1,20 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
+libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u3
 libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
+openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 tsingma-bsp==1.0
 tzdata==2021a-0+deb10u4
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 3e38f16049b4..764f5bad84ad 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,14 +1,21 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
+libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libldap-2.4-2==2.4.47+dfsg-3+deb10u6
+libldap-common==2.4.47+dfsg-3+deb10u6
+libssl-dev==1.1.1n-0+deb10u1
+libssl1.1==1.1.1n-0+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u3
 libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
 mrvlprestera==1.0
+openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 tzdata==2021a-0+deb10u4
 xz-utils==5.2.4-1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 19a0b239db9d..d59f753adfb7 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,17 +2,17 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2021.10.8
+certifi==2022.5.18.1
 cffi==1.15.0
 charset-normalizer==2.0.12
 click==7.0
-cryptography==37.0.0
+cryptography==37.0.2
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
-jinja2==3.1.1
+jinja2==3.1.2
 jsondiff==2.0.0
 jsonschema==2.6.0
 lxml==4.6.3
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.9.0
+psutil==5.9.1
 ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1

From 06addae853409f242dcc46fbd38df4a6bf91a9a8 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 26 May 2022 09:39:48 +0800
Subject: [PATCH 1199/1674] Revert "Reduce image size for lazy installation
 packages (#10775)" (#10916)

This reverts commit 15cf9b0d70b3d839a40a06cec6b6fc10124017ae.
Why I did it
Revert the PR #10775, for it has impact on onie installation.
It is caused by the symbol links not supported in some of the onie unzip.
We will enable after fixing the issue, see #10914
---
 build_debian.sh                                 | 2 +-
 files/build_templates/sonic_debian_extension.j2 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 824c6d2c8c4f..e23dde2458e7 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -610,5 +610,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
+pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
 sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 92eac7d890a8..deb903096c83 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -590,9 +590,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
 sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f --download-only
 
 sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}
-sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/common
-sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/common/
-sudo ln -sf "../common/{{ debfilename }}" "$FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/{{ debfilename }}"
+sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
 for f in $(find $FILESYSTEM_ROOT/var/cache/apt/archives -name "*.deb"); do
     sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
 done

From 876d982bce22f92809f434019cc8dc715dbc6dba Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 27 May 2022 09:46:23 -0700
Subject: [PATCH 1200/1674] [sonic-config-engine] Fix typo in hwsku name in
 sample graph (#10941)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
There was a typo in hwsku specified as part of #10889

How I did it
Replaced with the correct hwsku

How to verify it
test_cfggen.py is passing
---
 .../tests/sample-graph-resource-type.xml                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-config-engine/tests/sample-graph-resource-type.xml b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
index 531d98677a38..fd349ec70eac 100644
--- a/src/sonic-config-engine/tests/sample-graph-resource-type.xml
+++ b/src/sonic-config-engine/tests/sample-graph-resource-type.xml
@@ -308,7 +308,7 @@
     <Devices>
       <Device i:type="ToRRouter">
         <Hostname>switch-t0</Hostname>
-        <HwSku>Arista-7050QX-32S</HwSku>
+        <HwSku>Arista-7050-QX-32S</HwSku>
         <ClusterName>AAA00PrdStr00</ClusterName>
       </Device>
       <Device i:type="LeafRouter">
@@ -421,7 +421,7 @@
       </EthernetInterfaces>
       <FlowControl>true</FlowControl>
       <Height>0</Height>
-      <HwSku>Arista-7050QX-32S</HwSku>
+      <HwSku>Arista-7050-QX-32S</HwSku>
       <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
 	<a:ManagementInterface>
 	  <ElementType>DeviceInterface</ElementType>
@@ -451,5 +451,5 @@
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
   <Hostname>switch-t0</Hostname>
-  <HwSku>Arista-7050QX-32S</HwSku>
+  <HwSku>Arista-7050-QX-32S</HwSku>
 </DeviceMiniGraph>

From 33c1ba1b2c5f5074e9ba4e9d4c89828ad5d9d11a Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 27 May 2022 01:09:42 +0530
Subject: [PATCH 1201/1674] [DellEMC S5248f] Remove duplicate ipmihelper.py
 (#10455)

Why I did it
To remove the ipmihelper.py in S5248f directory to prevent the image label being marked 'dirty', due to the file being replaced by the ipmihelper.py in common folder during build.

How I did it
Remove ipmihelper.py in S5248f directory.

How to verify it
Build a broadcom image and verify that the tracked files are not modified.

Which release branch to backport (provide reason below if selected)
 201811
 201911
 202006
 202012
 202106
 202111
Description for the changelog
DellEMC S5248f : Remove duplicate ipmihelper.py

Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)
---
 .../s5248f/sonic_platform/ipmihelper.py       | 269 ------------------
 1 file changed, 269 deletions(-)
 delete mode 100644 platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py
deleted file mode 100644
index d95329c40de2..000000000000
--- a/platform/broadcom/sonic-platform-modules-dell/s5248f/sonic_platform/ipmihelper.py
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/python3
-
-########################################################################
-# DellEMC
-#
-# Module contains implementation of IpmiSensor and IpmiFru classes that
-# provide Sensor's and FRU's information respectively.
-#
-########################################################################
-
-import subprocess
-import re
-
-# IPMI Request Network Function Codes
-NetFn_SensorEvent = 0x04
-NetFn_Storage = 0x0A
-
-# IPMI Sensor Device Commands
-Cmd_GetSensorReadingFactors = 0x23
-Cmd_GetSensorThreshold = 0x27
-Cmd_GetSensorReading = 0x2D
-
-# IPMI FRU Device Commands
-Cmd_ReadFRUData = 0x11
-
-def get_ipmitool_raw_output(args):
-    """
-    Returns a list the elements of which are the individual bytes of
-    ipmitool raw <cmd> command output.
-    """
-    result_bytes = list()
-    result = ""
-    command = "ipmitool raw {}".format(args)
-    try:
-        proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                universal_newlines=True, stderr=subprocess.STDOUT)
-        stdout = proc.communicate()[0]
-        proc.wait()
-        if not proc.returncode:
-            result = stdout.rstrip('\n')
-    except EnvironmentError:
-        pass
-
-    for i in result.split():
-        result_bytes.append(int(i, 16))
-
-    return result_bytes
-
-class IpmiSensor(object):
-
-    # Sensor Threshold types and their respective bit masks
-    THRESHOLD_BIT_MASK = {
-        "LowerNonCritical"    : 0,
-        "LowerCritical"       : 1,
-        "LowerNonRecoverable" : 2,
-        "UpperNonCritical"    : 3,
-        "UpperCritical"       : 4,
-        "UpperNonRecoverable" : 5
-    }
-
-    def __init__(self, sensor_id, is_discrete=False):
-        self.id = sensor_id
-        self.is_discrete = is_discrete
-
-    def _get_converted_sensor_reading(self, raw_value):
-        """
-        Returns a 2 element tuple(bool, int) in which first element
-        provides the validity of the reading and the second element is
-        the converted sensor reading
-        """
-        # Get Sensor Reading Factors
-        cmd_args = "{} {} {} {}".format(NetFn_SensorEvent,
-                                        Cmd_GetSensorReadingFactors,
-                                        self.id, raw_value)
-        factors = get_ipmitool_raw_output(cmd_args)
-
-        if len(factors) != 7:
-            return False, 0
-
-        # Compute Twos complement
-        def get_twos_complement(val, bits):
-            if val & (1 << (bits - 1)):
-                val = val - (1 << bits)
-            return val
-
-        # Calculate actual sensor value from the raw sensor value
-        # using the sensor reading factors.
-        M = get_twos_complement(((factors[2] & 0xC0) << 8) | factors[1], 10)
-        B = get_twos_complement(((factors[4] & 0xC0) << 8) | factors[3], 10)
-        R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
-        B_exp = get_twos_complement(factors[6] & 0x0F, 4)
-
-        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
-
-        return True, converted_reading
-
-    def get_reading(self):
-        """
-        For Threshold sensors, returns the sensor reading.
-        For Discrete sensors, returns the state value.
-
-        Returns:
-            A tuple (bool, int) where the first element provides the
-            validity of the reading and the second element provides the
-            sensor reading/state value.
-        """
-        # Get Sensor Reading
-        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorReading,
-                                     self.id)
-        output = get_ipmitool_raw_output(cmd_args)
-        if len(output) != 4:
-            return False, 0
-
-        # Check reading/state unavailable
-        if output[1] & 0x20:
-            return False, 0
-
-        if self.is_discrete:
-            state = ((output[3] & 0x7F) << 8) | output[2]
-            return True, state
-        else:
-            return self._get_converted_sensor_reading(output[0])
-
-    def get_threshold(self, threshold_type):
-        """
-        Returns the sensor's threshold value for a given threshold type.
-
-        Args:
-            threshold_type (str) - one of the below mentioned
-                                   threshold type strings
-
-                "LowerNonCritical"
-                "LowerCritical"
-                "LowerNonRecoverable"
-                "UpperNonCritical"
-                "UpperCritical"
-                "UpperNonRecoverable"
-        Returns:
-            A tuple (bool, int) where the first element provides the
-            validity of that threshold and second element provides the
-            threshold value.
-        """
-        # Thresholds are not valid for discrete sensors
-        if self.is_discrete:
-            raise TypeError("Threshold is not applicable for Discrete Sensor")
-
-        if threshold_type not in list(self.THRESHOLD_BIT_MASK.keys()):
-            raise ValueError("Invalid threshold type {} provided. Valid types "
-                             "are {}".format(threshold_type,
-                                             list(self.THRESHOLD_BIT_MASK.keys())))
-
-        bit_mask = self.THRESHOLD_BIT_MASK[threshold_type]
-
-        # Get Sensor Threshold
-        cmd_args = "{} {} {}".format(NetFn_SensorEvent, Cmd_GetSensorThreshold,
-                                     self.id)
-        thresholds = get_ipmitool_raw_output(cmd_args)
-        if len(thresholds) != 7:
-            return False, 0
-
-        valid_thresholds = thresholds.pop(0)
-        # Check whether particular threshold is readable
-        if valid_thresholds & (1 << bit_mask):
-            return self._get_converted_sensor_reading(thresholds[bit_mask])
-        else:
-            return False, 0
-
-class IpmiFru(object):
-
-    def __init__(self, fru_id):
-        self.id = fru_id
-
-    def _get_ipmitool_fru_print(self):
-        result = ""
-        command = "ipmitool fru print {}".format(self.id)
-        try:
-            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    universal_newlines=True, stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            if not proc.returncode:
-                result = stdout.rstrip('\n')
-        except EnvironmentError:
-            pass
-
-        return result
-
-    def _get_from_fru(self, info):
-        """
-        Returns a string containing the info from FRU
-        """
-        fru_output = self._get_ipmitool_fru_print()
-        if not fru_output:
-            return "NA"
-
-        info_req = re.search(r"%s\s*:(.*)" % info, fru_output)
-        if not info_req:
-            return "NA"
-
-        return info_req.group(1).strip()
-
-    def get_board_serial(self):
-        """
-        Returns a string containing the Serial Number of the device.
-        """
-        return self._get_from_fru('Board Serial')
-
-    def get_board_part_number(self):
-        """
-        Returns a string containing the Part Number of the device.
-        """
-        return self._get_from_fru('Board Part Number')
-
-    def get_board_mfr_id(self):
-        """
-        Returns a string containing the manufacturer id of the FRU.
-        """
-        return self._get_from_fru('Board Mfg')
-
-    def get_board_product(self):
-        """
-        Returns a string containing the manufacturer id of the FRU.
-        """
-        return self._get_from_fru('Board Product')
-
-    def get_fru_data(self, offset, count=1):
-        """
-        Reads and returns the FRU data at the provided offset.
-
-        Args:
-            offset (int) - FRU offset to read
-            count (int) - Number of bytes to read [optional, default = 1]
-        Returns:
-            A tuple (bool, list(int)) where the first element provides
-            the validity of the data read and the second element is a
-            list, the elements of which are the individual bytes of the
-            FRU data read.
-        """
-        result_bytes = list()
-        is_valid = True
-        result = ""
-
-        offset_LSB = offset & 0xFF
-        offset_MSB = offset & 0xFF00
-        command = "ipmitool raw {} {} {} {} {} {}".format(NetFn_Storage,
-                                                          Cmd_ReadFRUData,
-                                                          self.id, offset_LSB,
-                                                          offset_MSB, count)
-        try:
-            proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    universal_newlines=True, stderr=subprocess.STDOUT)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            if not proc.returncode:
-                result = stdout.rstrip('\n')
-        except EnvironmentError:
-            is_valid = False
-
-        if (not result) or (not is_valid):
-            return False, result_bytes
-
-        for i in result.split():
-            result_bytes.append(int(i, 16))
-
-        read_count = result_bytes.pop(0)
-        if read_count != count:
-            return False, result_bytes
-        else:
-            return True, result_bytes

From 0761850f1707f5f850beefd1d8cdab9da12249b7 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Fri, 27 May 2022 14:38:43 -0700
Subject: [PATCH 1202/1674] [sonic-linkmgrd][202012] submodule updates (#10924)

[sonic-linkmgrd][202012] submodule updates

489cf3 Jing Zhang Wed May 18 09:59:02 2022 -0700 Avoid switching active when LinkState == Down (#77)
a6c9713 Jing Zhang Tue May 24 11:03:54 2022 -0700 [202012] Add option to enable or disable default route related feature (#72)
dbb607d Jing Zhang Thu May 12 08:19:20 2022 -0700 [ci]: uplift diff coverage threshold to 80% (#71)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 dockers/docker-mux/supervisord.conf | 2 +-
 src/linkmgrd                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf
index 87903f28e155..33eb650e85d4 100644
--- a/dockers/docker-mux/supervisord.conf
+++ b/dockers/docker-mux/supervisord.conf
@@ -28,7 +28,7 @@ stderr_logfile=syslog
 dependent_startup=true
 
 [program:linkmgrd]
-command=nice -n -20 /usr/sbin/linkmgrd -v warning
+command=nice -n -20 /usr/sbin/linkmgrd -v warning -d
 priority=2
 autostart=false
 autorestart=false
diff --git a/src/linkmgrd b/src/linkmgrd
index 3d13ff2fc3f9..5489cf3a126b 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 3d13ff2fc3f9ef51d05888bd31519e8d664c4307
+Subproject commit 5489cf3a126baa5f55a0de18cb9ba07a2d1be556

From ec9732aa3ba706663c270b1a49bcce2b79b54403 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Fri, 27 May 2022 16:28:33 -0700
Subject: [PATCH 1203/1674] [202012][multi-asic][sonic-config-engine]: Get PORT
 table from namespace config db (#10475)

Why I did it
Cherry-pick of: #7632
portconfig.py gets PORT table from config_db if it is present. If not, port_config.ini files are parsed.
For multi-asic platform, if namespace is passed to get_port_config(), config_db connection was done to host namespace always and not to asic specific namespace.
Provides fix for: #7161

How I did it
Modify db connection function to connect to namespace config_db.

How to verify it
Unit-test passed.
Verified on multi-asic VS platform.
---
 src/sonic-config-engine/minigraph.py          |   9 +-
 src/sonic-config-engine/portconfig.py         |  39 ++-
 .../tests/mock_tables/__init__.py             |   0
 .../tests/mock_tables/asic0/config_db.json    |  98 ++++++++
 .../mock_tables/asic0/database_config.json    |  57 +++++
 .../tests/mock_tables/asic1/config_db.json    |   2 +
 .../mock_tables/asic1/database_config.json    |  57 +++++
 .../tests/mock_tables/asic2/config_db.json    |   2 +
 .../mock_tables/asic2/database_config.json    |  57 +++++
 .../tests/mock_tables/asic3/config_db.json    |   2 +
 .../mock_tables/asic3/database_config.json    |  57 +++++
 .../tests/mock_tables/config_db.json          | 236 ++++++++++++++++++
 .../tests/mock_tables/database_config.json    |  57 +++++
 .../tests/mock_tables/database_global.json    |  24 ++
 .../tests/mock_tables/dbconnector.py          | 149 +++++++++++
 src/sonic-config-engine/tests/test_cfggen.py  |  48 +++-
 src/sonic-config-engine/tests/test_j2files.py |   2 +
 .../tests/test_multinpu_cfggen.py             |  17 ++
 18 files changed, 897 insertions(+), 16 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/mock_tables/__init__.py
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic0/config_db.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic0/database_config.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic1/config_db.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic1/database_config.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic2/config_db.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic2/database_config.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic3/config_db.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/asic3/database_config.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/config_db.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/database_config.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/database_global.json
 create mode 100644 src/sonic-config-engine/tests/mock_tables/dbconnector.py

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 60a28ed19b3e..b9a6b5bf7e15 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -12,7 +12,6 @@
 
 
 from portconfig import get_port_config
-from sonic_py_common.multi_asic import get_asic_id_from_name
 from sonic_py_common.interface import backplane_prefix
 
 # TODO: Remove this once we no longer support Python 2
@@ -1160,12 +1159,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     local_devices = []
     kube_data = {}
 
-    # hostname is the asic_name, get the asic_id from the asic_name
-    if asic_name is not None:
-        asic_id = get_asic_id_from_name(asic_name)
-    else:
-        asic_id = None
-
     hwsku_qn = QName(ns, "HwSku")
     hostname_qn = QName(ns, "Hostname")
     docker_routing_config_mode_qn = QName(ns, "DockerRoutingConfigMode")
@@ -1177,7 +1170,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         if child.tag == str(docker_routing_config_mode_qn):
             docker_routing_config_mode = child.text
 
-    (ports, alias_map, alias_asic_map) = get_port_config(hwsku=hwsku, platform=platform, port_config_file=port_config_file, asic=asic_id, hwsku_config_file=hwsku_config_file)
+    (ports, alias_map, alias_asic_map) = get_port_config(hwsku=hwsku, platform=platform, port_config_file=port_config_file, asic_name=asic_name, hwsku_config_file=hwsku_config_file)
     port_alias_map.update(alias_map)
     port_alias_asic_map.update(alias_asic_map)
 
diff --git a/src/sonic-config-engine/portconfig.py b/src/sonic-config-engine/portconfig.py
index 478198e5af84..b2d28b5150b8 100644
--- a/src/sonic-config-engine/portconfig.py
+++ b/src/sonic-config-engine/portconfig.py
@@ -5,11 +5,24 @@
     import re
     import sys
 
-    from swsscommon.swsscommon import ConfigDBConnector
+    from swsscommon import swsscommon
     from sonic_py_common import device_info
+    from sonic_py_common.multi_asic import get_asic_id_from_name
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
+try:
+    if os.environ["CFGGEN_UNIT_TESTING"] == "2":
+        modules_path = os.path.join(os.path.dirname(__file__), ".")
+        tests_path = os.path.join(modules_path, "tests")
+        sys.path.insert(0, modules_path)
+        sys.path.insert(0, tests_path)
+        import mock_tables.dbconnector
+        mock_tables.dbconnector.load_namespace_config()
+
+except KeyError:
+    pass
+
 # Global Variable
 PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
 PLATFORM_ROOT_PATH_DOCKER = '/usr/share/sonic/platform'
@@ -46,11 +59,16 @@ def readJson(filename):
         print("error occurred while parsing json: {}".format(sys.exc_info()[1]))
         return None
 
-def db_connect_configdb():
+def db_connect_configdb(namespace=None):
     """
     Connect to configdb
     """
-    config_db = ConfigDBConnector()
+    try:
+        if namespace is not None:
+            swsscommon.SonicDBConfig.load_sonic_global_db_config(namespace=namespace)
+        config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
+    except Exception as e:
+        return None
     if config_db is None:
         return None
     try:
@@ -78,8 +96,8 @@ def get_hwsku_file_name(hwsku=None, platform=None):
             return candidate
     return None
 
-def get_port_config(hwsku=None, platform=None, port_config_file=None, hwsku_config_file=None, asic=None):
-    config_db = db_connect_configdb()
+def get_port_config(hwsku=None, platform=None, port_config_file=None, hwsku_config_file=None, asic_name=None):
+    config_db = db_connect_configdb(asic_name)
     # If available, Read from CONFIG DB first
     if config_db is not None and port_config_file is None:
 
@@ -89,11 +107,18 @@ def get_port_config(hwsku=None, platform=None, port_config_file=None, hwsku_conf
             port_alias_map = {}
             port_alias_asic_map = {}
             for intf_name in ports.keys():
-                port_alias_map[ports[intf_name]["alias"]] = intf_name
+                if "alias" in ports[intf_name]:
+                    port_alias_map[ports[intf_name]["alias"]] = intf_name
             return (ports, port_alias_map, port_alias_asic_map)
 
+    if asic_name is not None:
+        asic_id = str(get_asic_id_from_name(asic_name))
+    else:
+        asic_id = None
+
     if not port_config_file:
-        port_config_file = device_info.get_path_to_port_config_file(hwsku, asic)
+        port_config_file = device_info.get_path_to_port_config_file(hwsku, asic_id)
+
         if not port_config_file:
             return ({}, {}, {})
 
diff --git a/src/sonic-config-engine/tests/mock_tables/__init__.py b/src/sonic-config-engine/tests/mock_tables/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-config-engine/tests/mock_tables/asic0/config_db.json b/src/sonic-config-engine/tests/mock_tables/asic0/config_db.json
new file mode 100644
index 000000000000..ab29ea517ad9
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic0/config_db.json
@@ -0,0 +1,98 @@
+{
+    "PORT|Ethernet0": {
+        "index": "0",
+        "lanes": "33,34,35,36",
+        "description": "01T2:Ethernet1:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Ethernet1/1",
+        "admin_status": "up",
+        "role": "Ext",
+        "speed": "40000",
+        "asic_port_name": "Eth0-ASIC0"
+    },
+    "PORT|Ethernet4": {
+        "index": "1",
+        "lanes": "29,30,31,32",
+        "description": "01T2:Ethernet2:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Ethernet1/2",
+        "admin_status": "up",
+        "role": "Ext",
+        "speed": "40000",
+        "asic_port_name": "Eth1-ASIC0"
+    },
+    "PORT|Ethernet8": {
+        "index": "2",
+        "lanes": "41,42,43,44",
+        "description": "Ethernet1/3:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Ethernet1/3",
+        "admin_status": "up",
+        "role": "Ext",
+        "speed": "40000",
+        "asic_port_name": "Eth2-ASIC0"
+    },
+    "PORT|Ethernet12": {
+        "index": "3",
+        "lanes": "37,38,39,40",
+        "description": "Ethernet1/4:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Ethernet1/4",
+        "admin_status": "up",
+        "role": "Ext",
+        "speed": "40000",
+        "asic_port_name": "Eth3-ASIC0"
+    },
+    "PORT|Ethernet-BP0": {
+        "index": "0",
+        "lanes": "13,14,15,16",
+        "description": "ASIC2:Eth0-ASIC2:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Eth4-ASIC0",
+        "admin_status": "up",
+        "role": "Int",
+        "speed": "40000",
+        "asic_port_name": "Eth4-ASIC0"
+    },
+    "PORT|Ethernet-BP4": {
+        "index": "1",
+        "lanes": "17,18,19,20",
+        "description": "ASIC2:Eth1-ASIC2:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Eth5-ASIC0",
+        "admin_status": "up",
+        "role": "Int",
+        "speed": "40000",
+        "asic_port_name": "Eth5-ASIC0"
+    },
+    "PORT|Ethernet-BP8": {
+        "index": "2",
+        "lanes": "21,22,23,24",
+        "description": "ASIC3:Eth0-ASIC3:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Eth6-ASIC0",
+        "admin_status": "up",
+        "role": "Int",
+        "speed": "40000",
+        "asic_port_name": "Eth6-ASIC0"
+    },
+    "PORT|Ethernet-BP12": {
+        "index": "3",
+        "lanes": "25,26,27,28",
+        "description": "ASIC3:Eth1-ASIC3:config_db",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "Eth7-ASIC0",
+        "admin_status": "up",
+        "role": "Int",
+        "speed": "40000",
+        "asic_port_name": "Eth7-ASIC0"
+    }
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic0/database_config.json b/src/sonic-config-engine/tests/mock_tables/asic0/database_config.json
new file mode 100644
index 000000000000..33fdeb2d7092
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic0/database_config.json
@@ -0,0 +1,57 @@
+{
+    "INSTANCES": {
+        "redis": {
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
+        }
+    },
+    "DATABASES" : {
+        "APPL_DB" : {
+            "id" : 0,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "ASIC_DB" : {
+            "id" : 1,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "COUNTERS_DB" : {
+            "id" : 2,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "LOGLEVEL_DB" : {
+            "id" : 3,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "CONFIG_DB" : {
+            "id" : 4,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "PFC_WD_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "FLEX_COUNTER_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "STATE_DB" : {
+            "id" : 6,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "separator": "|",
+            "instance" : "redis"
+        }
+    },
+    "VERSION" : "1.1"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic1/config_db.json b/src/sonic-config-engine/tests/mock_tables/asic1/config_db.json
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic1/config_db.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic1/database_config.json b/src/sonic-config-engine/tests/mock_tables/asic1/database_config.json
new file mode 100644
index 000000000000..33fdeb2d7092
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic1/database_config.json
@@ -0,0 +1,57 @@
+{
+    "INSTANCES": {
+        "redis": {
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
+        }
+    },
+    "DATABASES" : {
+        "APPL_DB" : {
+            "id" : 0,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "ASIC_DB" : {
+            "id" : 1,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "COUNTERS_DB" : {
+            "id" : 2,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "LOGLEVEL_DB" : {
+            "id" : 3,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "CONFIG_DB" : {
+            "id" : 4,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "PFC_WD_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "FLEX_COUNTER_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "STATE_DB" : {
+            "id" : 6,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "separator": "|",
+            "instance" : "redis"
+        }
+    },
+    "VERSION" : "1.1"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic2/config_db.json b/src/sonic-config-engine/tests/mock_tables/asic2/config_db.json
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic2/config_db.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic2/database_config.json b/src/sonic-config-engine/tests/mock_tables/asic2/database_config.json
new file mode 100644
index 000000000000..33fdeb2d7092
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic2/database_config.json
@@ -0,0 +1,57 @@
+{
+    "INSTANCES": {
+        "redis": {
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
+        }
+    },
+    "DATABASES" : {
+        "APPL_DB" : {
+            "id" : 0,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "ASIC_DB" : {
+            "id" : 1,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "COUNTERS_DB" : {
+            "id" : 2,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "LOGLEVEL_DB" : {
+            "id" : 3,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "CONFIG_DB" : {
+            "id" : 4,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "PFC_WD_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "FLEX_COUNTER_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "STATE_DB" : {
+            "id" : 6,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "separator": "|",
+            "instance" : "redis"
+        }
+    },
+    "VERSION" : "1.1"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic3/config_db.json b/src/sonic-config-engine/tests/mock_tables/asic3/config_db.json
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic3/config_db.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/asic3/database_config.json b/src/sonic-config-engine/tests/mock_tables/asic3/database_config.json
new file mode 100644
index 000000000000..33fdeb2d7092
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/asic3/database_config.json
@@ -0,0 +1,57 @@
+{
+    "INSTANCES": {
+        "redis": {
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
+        }
+    },
+    "DATABASES" : {
+        "APPL_DB" : {
+            "id" : 0,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "ASIC_DB" : {
+            "id" : 1,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "COUNTERS_DB" : {
+            "id" : 2,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "LOGLEVEL_DB" : {
+            "id" : 3,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "CONFIG_DB" : {
+            "id" : 4,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "PFC_WD_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "FLEX_COUNTER_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "STATE_DB" : {
+            "id" : 6,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "separator": "|",
+            "instance" : "redis"
+        }
+    },
+    "VERSION" : "1.1"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/config_db.json b/src/sonic-config-engine/tests/mock_tables/config_db.json
new file mode 100644
index 000000000000..25937ca0dae1
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/config_db.json
@@ -0,0 +1,236 @@
+{
+    "PORT|Ethernet0": {
+        "lanes": "29,30,31,32", 
+        "description": "config_db:switch-01t1:port1", 
+        "pfc_asym": "off", 
+        "mtu": "9100", 
+        "alias": "fortyGigE0/0", 
+        "admin_status": "up", 
+        "speed": "10000"
+    },
+    "PORT|Ethernet4": {
+        "lanes": "25,26,27,28",
+        "description": "config_db:server1:port1",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "fortyGigE0/4",
+        "admin_status": "up",
+        "speed": "25000",
+        "mux_cable": "true"
+    },
+    "PORT|Ethernet8": {
+        "lanes": "37,38,39,40",
+        "description": "config_db:Interface description",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "fortyGigE0/8",
+        "admin_status": "up",
+        "speed": "40000",
+        "mux_cable": "true"
+    },
+    "PORT|Ethernet12": {
+        "lanes": "33,34,35,36",
+        "description": "config_db:Interface description",
+        "pfc_asym": "off",
+        "mtu": "9100",
+        "alias": "fortyGigE0/12",
+        "admin_status": "up",
+        "speed": "10000"
+    },
+    "PORT|Ethernet16": {
+        "alias": "fortyGigE0/16",
+        "pfc_asym": "off",
+        "lanes": "41,42,43,44",
+        "description": "config_db:fortyGigE0/16",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet20": {
+        "alias": "fortyGigE0/20",
+        "pfc_asym": "off",
+        "lanes": "45,46,47,48",
+        "description": "config_db:fortyGigE0/20",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet24": {
+        "alias": "fortyGigE0/24",
+        "pfc_asym": "off",
+        "lanes": "5,6,7,8",
+        "description": "config_db:fortyGigE0/24",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet28": {
+        "alias": "fortyGigE0/28",
+        "pfc_asym": "off",
+        "lanes": "1,2,3,4",
+        "description": "config_db:fortyGigE0/28",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet32": {
+        "alias": "fortyGigE0/32",
+        "pfc_asym": "off",
+        "lanes": "9,10,11,12",
+        "description": "config_db:fortyGigE0/32",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet36": {
+        "alias": "fortyGigE0/36",
+        "pfc_asym": "off",
+        "lanes": "13,14,15,16",
+        "description": "config_db:fortyGigE0/36",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet40": {
+        "alias": "fortyGigE0/40",
+        "pfc_asym": "off",
+        "lanes": "21,22,23,24",
+        "description": "config_db:fortyGigE0/40",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet44": {
+        "alias": "fortyGigE0/44",
+        "pfc_asym": "off",
+        "lanes": "17,18,19,20",
+        "description": "config_db:fortyGigE0/44",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet48": {
+        "alias": "fortyGigE0/48",
+        "pfc_asym": "off",
+        "lanes": "49,50,51,52",
+        "description": "config_db:fortyGigE0/48",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet52": {
+        "alias": "fortyGigE0/52",
+        "pfc_asym": "off",
+        "lanes": "53,54,55,56",
+        "description": "config_db:fortyGigE0/52",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet56": {
+        "alias": "fortyGigE0/56",
+        "pfc_asym": "off",
+        "lanes": "61,62,63,64",
+        "description": "config_db:fortyGigE0/56",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet60": {
+        "alias": "fortyGigE0/60",
+        "pfc_asym": "off",
+        "lanes": "57,58,59,60",
+        "description": "config_db:fortyGigE0/60",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet64": {
+        "alias": "fortyGigE0/64",
+        "pfc_asym": "off",
+        "lanes": "65,66,67,68",
+        "description": "config_db:fortyGigE0/64",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet68": {
+        "alias": "fortyGigE0/68",
+        "pfc_asym": "off",
+        "lanes": "69,70,71,72",
+        "description": "config_db:fortyGigE0/68",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet72": {
+        "alias": "fortyGigE0/72",
+        "pfc_asym": "off",
+        "lanes": "77,78,79,80",
+        "description": "config_db:fortyGigE0/72",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet76": {
+        "alias": "fortyGigE0/76",
+        "pfc_asym": "off",
+        "lanes": "73,74,75,76",
+        "description": "config_db:fortyGigE0/76",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet80": {
+        "alias": "fortyGigE0/80",
+        "pfc_asym": "off",
+        "lanes": "105,106,107,108",
+        "description": "config_db:fortyGigE0/80",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet84": {
+        "alias": "fortyGigE0/84",
+        "pfc_asym": "off",
+        "lanes": "109,110,111,112",
+        "description": "config_db:fortyGigE0/84",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet88": {
+        "alias": "fortyGigE0/88",
+        "pfc_asym": "off",
+        "lanes": "117,118,119,120",
+        "description": "config_db:fortyGigE0/88",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet92": {
+        "alias": "fortyGigE0/92",
+        "pfc_asym": "off",
+        "lanes": "113,114,115,116",
+        "description": "config_db:fortyGigE0/92",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet96": {
+        "alias": "fortyGigE0/96",
+        "pfc_asym": "off",
+        "lanes": "121,122,123,124",
+        "description": "config_db:fortyGigE0/96",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet100": {
+        "alias": "fortyGigE0/100",
+        "pfc_asym": "off",
+        "lanes": "125,126,127,128",
+        "description": "config_db:fortyGigE0/100",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet104": {
+        "alias": "fortyGigE0/104",
+        "pfc_asym": "off",
+        "lanes": "85,86,87,88",
+        "description": "config_db:fortyGigE0/104",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet108": {
+        "alias": "fortyGigE0/108",
+        "pfc_asym": "off",
+        "lanes": "81,82,83,84",
+        "description": "config_db:fortyGigE0/108",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet112": {
+        "alias": "fortyGigE0/112",
+        "pfc_asym": "off",
+        "lanes": "89,90,91,92",
+        "description": "config_db:fortyGigE0/112",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet116": {
+        "alias": "fortyGigE0/116",
+        "pfc_asym": "off",
+        "lanes": "93,94,95,96",
+        "description": "config_db:fortyGigE0/116",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet120": {
+        "alias": "fortyGigE0/120",
+        "pfc_asym": "off",
+        "lanes": "97,98,99,100",
+        "description": "config_db:fortyGigE0/120",
+        "mtu": "9100"
+    },
+    "PORT|Ethernet124": {
+        "alias": "fortyGigE0/124",
+        "pfc_asym": "off",
+        "lanes": "101,102,103,104",
+        "description": "config_db:fortyGigE0/124",
+        "mtu": "9100"
+    }
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/database_config.json b/src/sonic-config-engine/tests/mock_tables/database_config.json
new file mode 100644
index 000000000000..33fdeb2d7092
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/database_config.json
@@ -0,0 +1,57 @@
+{
+    "INSTANCES": {
+        "redis": {
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
+        }
+    },
+    "DATABASES" : {
+        "APPL_DB" : {
+            "id" : 0,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "ASIC_DB" : {
+            "id" : 1,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "COUNTERS_DB" : {
+            "id" : 2,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "LOGLEVEL_DB" : {
+            "id" : 3,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "CONFIG_DB" : {
+            "id" : 4,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "PFC_WD_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "FLEX_COUNTER_DB" : {
+            "id" : 5,
+            "separator": ":",
+            "instance" : "redis"
+        },
+        "STATE_DB" : {
+            "id" : 6,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "separator": "|",
+            "instance" : "redis"
+        }
+    },
+    "VERSION" : "1.1"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/database_global.json b/src/sonic-config-engine/tests/mock_tables/database_global.json
new file mode 100644
index 000000000000..386bcc368836
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/database_global.json
@@ -0,0 +1,24 @@
+{
+    "INCLUDES" : [
+        {
+            "include" : "database_config.json"
+        },
+        {
+            "namespace" : "asic0",
+            "include" : "./asic0/database_config.json"
+        },
+        {
+            "namespace" : "asic1",
+            "include" : "./asic1/database_config.json"
+        },
+        {
+            "namespace" : "asic2",
+            "include" : "./asic2/database_config.json"
+        },
+        {
+            "namespace" : "asic3",
+            "include" : "./asic3/database_config.json"
+        }
+    ],
+    "VERSION" : "1.0"
+}
diff --git a/src/sonic-config-engine/tests/mock_tables/dbconnector.py b/src/sonic-config-engine/tests/mock_tables/dbconnector.py
new file mode 100644
index 000000000000..2b152c36a06a
--- /dev/null
+++ b/src/sonic-config-engine/tests/mock_tables/dbconnector.py
@@ -0,0 +1,149 @@
+# MONKEY PATCH!!!
+import json
+import os
+import sys
+#from unittest import mock
+
+import mockredis
+import redis
+from sonic_py_common import multi_asic
+import swsssdk
+from swsssdk import SonicDBConfig, SonicV2Connector, ConfigDBConnector, ConfigDBPipeConnector
+from swsscommon import swsscommon
+#import swsscommon.swsscommon
+
+
+topo = None
+dedicated_dbs = {}
+
+def clean_up_config():
+    # Set SonicDBConfig variables to initial state
+    # so that it can be loaded with single or multiple
+    # namespaces before the test begins.
+    SonicDBConfig._sonic_db_config = {}
+    SonicDBConfig._sonic_db_global_config_init = False
+    SonicDBConfig._sonic_db_config_init = False
+
+def load_namespace_config():
+    # To support multi asic testing
+    # SonicDBConfig load_sonic_global_db_config
+    # is invoked to load multiple namespaces
+    clean_up_config()
+    SonicDBConfig.load_sonic_global_db_config(
+        global_db_file_path=os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), 'database_global.json'))
+
+def load_database_config():
+    # Load local database_config.json for single namespace test scenario
+    clean_up_config()
+    SonicDBConfig.load_sonic_db_config(
+        sonic_db_file_path=os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), 'database_config.json'))
+
+_old_connect_ConfigDBConnector = ConfigDBConnector.connect
+
+def connect_ConfigDBConnector(self, wait_for_init=True, retry_on=False):
+    # add topo to kwargs for testing different topology
+    self.dbintf.redis_kwargs['topo'] = topo
+    # add the namespace to kwargs for testing multi asic
+    self.dbintf.redis_kwargs['namespace'] = self.namespace
+    self.dbintf.redis_kwargs['db_name'] = 'CONFIG_DB'
+    self.dbintf.redis_kwargs['decode_responses'] = True
+    _old_connect_ConfigDBConnector(self, wait_for_init, retry_on)
+
+def _subscribe_keyspace_notification(self, db_name, client):
+    pass
+
+
+def config_set(self, *args):
+    pass
+
+
+class MockPubSub:
+    def get_message(self):
+        return None
+
+    def psubscribe(self, *args, **kwargs):
+        pass
+
+    def __call__(self, *args, **kwargs):
+        return self
+
+    def listen(self):
+        return []
+
+    def punsubscribe(self, *args, **kwargs):
+        pass
+
+    def clear(self):
+        pass
+
+INPUT_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class SwssSyncClient(mockredis.MockRedis):
+    def __init__(self, *args, **kwargs):
+        super(SwssSyncClient, self).__init__(strict=True, *args, **kwargs)
+        # Namespace is added in kwargs specifically for unit-test
+        # to identify the file path to load the db json files.
+        topo = kwargs.pop('topo')
+        namespace = kwargs.pop('namespace')
+        db_name = kwargs.pop('db_name')
+        self.decode_responses = kwargs.pop('decode_responses', False) == True
+        fname = db_name.lower() + ".json"
+        self.pubsub = MockPubSub()
+
+        if namespace is not None and namespace is not multi_asic.DEFAULT_NAMESPACE:
+            fname = os.path.join(INPUT_DIR, namespace, fname)
+        elif topo is not None:
+            fname = os.path.join(INPUT_DIR, topo, fname)
+        else:
+            fname = os.path.join(INPUT_DIR, fname)
+
+        if os.path.exists(fname):
+            with open(fname) as f:
+                js = json.load(f)
+                for k, v in js.items():
+                    if 'expireat' in v and 'ttl' in v and 'type' in v and 'value' in v:
+                        # database is in redis-dump format
+                        if v['type'] == 'hash':
+                            # ignore other types for now since sonic has hset keys only in the db
+                            for attr, value in v['value'].items():
+                                self.hset(k, attr, value)
+                    else:
+                        for attr, value in v.items():
+                            self.hset(k, attr, value)
+
+    # Patch mockredis/mockredis/client.py
+    # The offical implementation assume decode_responses=False
+    # Here we detect the option and decode after doing encode
+    def _encode(self, value):
+        "Return a bytestring representation of the value. Taken from redis-py connection.py"
+
+        value = super(SwssSyncClient, self)._encode(value)
+
+        if self.decode_responses:
+           return value.decode('utf-8')
+
+    # Patch mockredis/mockredis/client.py
+    # The official implementation will filter out keys with a slash '/'
+    # ref: https://github.com/locationlabs/mockredis/blob/master/mockredis/client.py
+    def keys(self, pattern='*'):
+        """Emulate keys."""
+        import fnmatch
+        import re
+
+        # Make regex out of glob styled pattern.
+        regex = fnmatch.translate(pattern)
+        regex = re.compile(regex)
+
+        # Find every key that matches the pattern
+        return [key for key in self.redis if regex.match(key)]
+
+swsssdk.interface.DBInterface._subscribe_keyspace_notification = _subscribe_keyspace_notification
+mockredis.MockRedis.config_set = config_set
+redis.StrictRedis = SwssSyncClient
+ConfigDBConnector.connect = connect_ConfigDBConnector
+swsscommon.SonicV2Connector = SonicV2Connector
+swsscommon.ConfigDBConnector = ConfigDBConnector
+swsscommon.ConfigDBPipeConnector = ConfigDBPipeConnector
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 79a3fd6fd9ac..5702841ceea4 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -32,8 +32,11 @@ def setUp(self):
         self.ecmp_graph = os.path.join(self.test_dir, 'fg-ecmp-sample-minigraph.xml')
         self.sample_resource_graph = os.path.join(self.test_dir, 'sample-graph-resource-type.xml')
         self.sample_subintf_graph = os.path.join(self.test_dir, 'sample-graph-subintf.xml')
+        # To ensure that mock config_db data is used for unit-test cases
+        os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
     def tearDown(self):
+        os.environ["CFGGEN_UNIT_TESTING"] = ""
         try:
             os.remove(self.output_file)
             os.remove(self.output2_file)
@@ -546,8 +549,51 @@ def test_minigraph_neighbor_interfaces(self):
             )
         )
 
+    def test_minigraph_neighbor_interfaces_config_db(self):
+        # test to check if PORT table is retrieved from config_db
+        argument = '-m "' + self.sample_graph_simple_case + '" -v "PORT"'
+        output = self.run_script(argument)
+
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            utils.to_dict(
+                "{'Ethernet0': {'lanes': '29,30,31,32', 'description': 'config_db:switch-01t1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/0', 'admin_status': 'up', 'speed': '10000', 'autoneg': '1'}, "
+                "'Ethernet4': {'lanes': '25,26,27,28', 'description': 'config_db:server1:port1', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/4', 'admin_status': 'up', 'speed': '25000', 'autoneg': '1', 'mux_cable': 'true'}, "
+                "'Ethernet8': {'lanes': '37,38,39,40', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/8', 'admin_status': 'up', 'speed': '40000', 'autoneg': '1', 'mux_cable': 'true'}, "
+                "'Ethernet12': {'lanes': '33,34,35,36', 'description': 'Interface description', 'pfc_asym': 'off', 'mtu': '9100', 'alias': 'fortyGigE0/12', 'admin_status': 'up', 'speed': '10000', 'autoneg': '1'}, "
+                "'Ethernet16': {'alias': 'fortyGigE0/16', 'pfc_asym': 'off', 'lanes': '41,42,43,44', 'description': 'config_db:fortyGigE0/16', 'mtu': '9100'}, "
+                "'Ethernet20': {'alias': 'fortyGigE0/20', 'pfc_asym': 'off', 'lanes': '45,46,47,48', 'description': 'config_db:fortyGigE0/20', 'mtu': '9100'}, "
+                "'Ethernet24': {'alias': 'fortyGigE0/24', 'pfc_asym': 'off', 'lanes': '5,6,7,8', 'description': 'config_db:fortyGigE0/24', 'mtu': '9100'}, "
+                "'Ethernet28': {'alias': 'fortyGigE0/28', 'pfc_asym': 'off', 'lanes': '1,2,3,4', 'description': 'config_db:fortyGigE0/28', 'mtu': '9100'}, "
+                "'Ethernet32': {'alias': 'fortyGigE0/32', 'pfc_asym': 'off', 'lanes': '9,10,11,12', 'description': 'config_db:fortyGigE0/32', 'mtu': '9100'}, "
+                "'Ethernet36': {'alias': 'fortyGigE0/36', 'pfc_asym': 'off', 'lanes': '13,14,15,16', 'description': 'config_db:fortyGigE0/36', 'mtu': '9100'}, "
+                "'Ethernet40': {'alias': 'fortyGigE0/40', 'pfc_asym': 'off', 'lanes': '21,22,23,24', 'description': 'config_db:fortyGigE0/40', 'mtu': '9100'}, "
+                "'Ethernet44': {'alias': 'fortyGigE0/44', 'pfc_asym': 'off', 'lanes': '17,18,19,20', 'description': 'config_db:fortyGigE0/44', 'mtu': '9100'}, "
+                "'Ethernet48': {'alias': 'fortyGigE0/48', 'pfc_asym': 'off', 'lanes': '49,50,51,52', 'description': 'config_db:fortyGigE0/48', 'mtu': '9100'}, "
+                "'Ethernet52': {'alias': 'fortyGigE0/52', 'pfc_asym': 'off', 'lanes': '53,54,55,56', 'description': 'config_db:fortyGigE0/52', 'mtu': '9100'}, "
+                "'Ethernet56': {'alias': 'fortyGigE0/56', 'pfc_asym': 'off', 'lanes': '61,62,63,64', 'description': 'config_db:fortyGigE0/56', 'mtu': '9100'}, "
+                "'Ethernet60': {'alias': 'fortyGigE0/60', 'pfc_asym': 'off', 'lanes': '57,58,59,60', 'description': 'config_db:fortyGigE0/60', 'mtu': '9100'}, "
+                "'Ethernet64': {'alias': 'fortyGigE0/64', 'pfc_asym': 'off', 'lanes': '65,66,67,68', 'description': 'config_db:fortyGigE0/64', 'mtu': '9100'}, "
+                "'Ethernet68': {'alias': 'fortyGigE0/68', 'pfc_asym': 'off', 'lanes': '69,70,71,72', 'description': 'config_db:fortyGigE0/68', 'mtu': '9100'}, "
+                "'Ethernet72': {'alias': 'fortyGigE0/72', 'pfc_asym': 'off', 'lanes': '77,78,79,80', 'description': 'config_db:fortyGigE0/72', 'mtu': '9100'}, "
+                "'Ethernet76': {'alias': 'fortyGigE0/76', 'pfc_asym': 'off', 'lanes': '73,74,75,76', 'description': 'config_db:fortyGigE0/76', 'mtu': '9100'}, "
+                "'Ethernet80': {'alias': 'fortyGigE0/80', 'pfc_asym': 'off', 'lanes': '105,106,107,108', 'description': 'config_db:fortyGigE0/80', 'mtu': '9100'}, "
+                "'Ethernet84': {'alias': 'fortyGigE0/84', 'pfc_asym': 'off', 'lanes': '109,110,111,112', 'description': 'config_db:fortyGigE0/84', 'mtu': '9100'}, "
+                "'Ethernet88': {'alias': 'fortyGigE0/88', 'pfc_asym': 'off', 'lanes': '117,118,119,120', 'description': 'config_db:fortyGigE0/88', 'mtu': '9100'}, "
+                "'Ethernet92': {'alias': 'fortyGigE0/92', 'pfc_asym': 'off', 'lanes': '113,114,115,116', 'description': 'config_db:fortyGigE0/92', 'mtu': '9100'}, "
+                "'Ethernet96': {'alias': 'fortyGigE0/96', 'pfc_asym': 'off', 'lanes': '121,122,123,124', 'description': 'config_db:fortyGigE0/96', 'mtu': '9100'}, "
+                "'Ethernet100': {'alias': 'fortyGigE0/100', 'pfc_asym': 'off', 'lanes': '125,126,127,128', 'description': 'config_db:fortyGigE0/100', 'mtu': '9100'}, "
+                "'Ethernet104': {'alias': 'fortyGigE0/104', 'pfc_asym': 'off', 'lanes': '85,86,87,88', 'description': 'config_db:fortyGigE0/104', 'mtu': '9100'}, "
+                "'Ethernet108': {'alias': 'fortyGigE0/108', 'pfc_asym': 'off', 'lanes': '81,82,83,84', 'description': 'config_db:fortyGigE0/108', 'mtu': '9100'}, "
+                "'Ethernet112': {'alias': 'fortyGigE0/112', 'pfc_asym': 'off', 'lanes': '89,90,91,92', 'description': 'config_db:fortyGigE0/112', 'mtu': '9100'}, "
+                "'Ethernet116': {'alias': 'fortyGigE0/116', 'pfc_asym': 'off', 'lanes': '93,94,95,96', 'description': 'config_db:fortyGigE0/116', 'mtu': '9100'}, "
+                "'Ethernet120': {'alias': 'fortyGigE0/120', 'pfc_asym': 'off', 'lanes': '97,98,99,100', 'description': 'config_db:fortyGigE0/120', 'mtu': '9100'}, "
+                "'Ethernet124': {'alias': 'fortyGigE0/124', 'pfc_asym': 'off', 'lanes': '101,102,103,104', 'description': 'config_db:fortyGigE0/124', 'mtu': '9100'}}"
+            )
+        )
+
     def test_minigraph_extra_ethernet_interfaces(self, **kwargs):
-        graph_file = kwargs.get('graph_file', self.sample_graph_simple) 
+        graph_file = kwargs.get('graph_file', self.sample_graph_simple)
         argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "PORT"'
         output = self.run_script(argument)
 
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 66b8f2bcdaff..3240f2dcfb2a 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -30,6 +30,7 @@ def setUp(self):
         self.radv_test_minigraph = os.path.join(self.test_dir, 'radv-test-sample-graph.xml')
         self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml')
         self.output_file = os.path.join(self.test_dir, 'output')
+        os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
     def run_script(self, argument):
         print('CMD: sonic-cfggen ' + argument)
@@ -399,6 +400,7 @@ def test_ntp_conf(self):
         assert utils.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
 
     def tearDown(self):
+        os.environ["CFGGEN_UNIT_TESTING"] = ""
         try:
             os.remove(self.output_file)
         except OSError:
diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
index ab952515f96c..8c4e097ebff3 100644
--- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py
+++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py
@@ -29,6 +29,7 @@ def setUp(self):
         for asic in range(NUM_ASIC):
             self.port_config.append(os.path.join(self.test_data_dir, "sample_port_config-{}.ini".format(asic)))
         self.output_file = os.path.join(self.test_dir, 'output')
+        os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
     def run_script(self, argument, check_stderr=False):
         print('\n    Running sonic-cfggen ' + argument)
@@ -213,6 +214,19 @@ def test_frontend_asic_ports(self):
              "Ethernet-BP8": { "admin_status": "up",  "alias": "Eth6-ASIC0",  "asic_port_name": "Eth6-ASIC0",  "description": "ASIC3:Eth0-ASIC3",  "index": "2",  "lanes": "21,22,23,24",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
              "Ethernet-BP12": { "admin_status": "up",  "alias": "Eth7-ASIC0",  "asic_port_name": "Eth7-ASIC0",  "description": "ASIC3:Eth1-ASIC3",  "index": "3",  "lanes": "25,26,27,28",  "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" }})
 
+    def test_frontend_asic_ports_config_db(self):
+        argument = "-m {} -n asic0 --var-json \"PORT\"".format(self.sample_graph)
+        output = json.loads(self.run_script(argument))
+        self.assertDictEqual(output,
+                {"Ethernet0": { "admin_status": "up",  "alias": "Ethernet1/1",  "asic_port_name": "Eth0-ASIC0",  "description": "01T2:Ethernet1:config_db",  "index": "0",  "lanes": "33,34,35,36",   "mtu": "9100",   "pfc_asym": "off",  "role": "Ext",  "speed": "40000", "autoneg": "1" },
+                "Ethernet4": { "admin_status": "up",  "alias": "Ethernet1/2",  "asic_port_name": "Eth1-ASIC0",  "description": "01T2:Ethernet2:config_db",  "index": "1",  "lanes": "29,30,31,32",   "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000", "autoneg": "1" },
+                "Ethernet8": { "admin_status": "up", "alias": "Ethernet1/3",  "asic_port_name": "Eth2-ASIC0",  "description": "Ethernet1/3:config_db",  "index": "2",  "lanes": "41,42,43,44",   "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" },
+                "Ethernet12": { "admin_status": "up", "alias": "Ethernet1/4",  "asic_port_name": "Eth3-ASIC0",  "description": "Ethernet1/4:config_db",  "index": "3",  "lanes": "37,38,39,40",   "mtu": "9100",  "pfc_asym": "off",  "role": "Ext",  "speed": "40000" },
+                "Ethernet-BP0": { "admin_status": "up",  "alias": "Eth4-ASIC0",  "asic_port_name": "Eth4-ASIC0",  "description": "ASIC2:Eth0-ASIC2:config_db",  "index": "0",  "lanes": "13,14,15,16",   "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+                    "Ethernet-BP4": { "admin_status": "up",  "alias": "Eth5-ASIC0",  "asic_port_name": "Eth5-ASIC0",  "description": "ASIC2:Eth1-ASIC2:config_db",  "index": "1",  "lanes": "17,18,19,20",   "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+                    "Ethernet-BP8": { "admin_status": "up",  "alias": "Eth6-ASIC0",  "asic_port_name": "Eth6-ASIC0",  "description": "ASIC3:Eth0-ASIC3:config_db",  "index": "2",  "lanes": "21,22,23,24",   "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" },
+                    "Ethernet-BP12": { "admin_status": "up",  "alias": "Eth7-ASIC0",  "asic_port_name": "Eth7-ASIC0",  "description": "ASIC3:Eth1-ASIC3:config_db",  "index": "3",  "lanes": "25,26,27,28",   "mtu": "9100",  "pfc_asym": "off",  "role": "Int",  "speed": "40000" }})
+
     def test_frontend_asic_device_neigh(self):
         argument = "-m {} -p {} -n asic0 --var-json \"DEVICE_NEIGHBOR\"".format(self.sample_graph, self.port_config[0])
         output = json.loads(self.run_script(argument))
@@ -409,3 +423,6 @@ def test_bgpd_frr_frontendasic(self):
     
     def test_bgpd_frr_backendasic(self):
         self.assertTrue(*self.run_frr_asic_case('bgpd/bgpd.conf.j2', 'bgpd_frr_backend_asic.conf', "asic3", self.port_config[3]))
+
+    def tearDown(self):
+        os.environ["CFGGEN_UNIT_TESTING"] = ""

From c4e806fcf748a7d1b8682e35c1f8be47d8943754 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Mon, 30 May 2022 17:52:43 +0800
Subject: [PATCH 1204/1674] [202012][cherry-pick] Define `SYSTEM_DEFAULTS`
 table to control tunnel_qos_remap (#10930)

[202012][cherry-pick] Define `SYSTEM_DEFAULTS` table to control tunnel_qos_remap (#10930)

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-config-engine/minigraph.py          |  75 +-
 ...imple-sample-graph-case-remap-disabled.xml | 894 ++++++++++++++++++
 ...simple-sample-graph-case-remap-enabled.xml | 894 ++++++++++++++++++
 .../tests/test_minigraph_case.py              |  35 +
 4 files changed, 1889 insertions(+), 9 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
 create mode 100644 src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index b9a6b5bf7e15..e230e867969f 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -64,7 +64,9 @@ def default(self, obj):
 
 def get_peer_switch_info(link_metadata, devices):
     peer_switch_table = {}
-    for data in link_metadata.values():
+    peer_switch_ip = None
+    mux_tunnel_name = None
+    for port, data in link_metadata.items():
         if "PeerSwitch" in data:
             peer_hostname = data["PeerSwitch"]
             peer_lo_addr_str = devices[peer_hostname]["lo_addr"]
@@ -73,8 +75,10 @@ def get_peer_switch_info(link_metadata, devices):
             peer_switch_table[peer_hostname] = {
                 'address_ipv4': str(peer_lo_addr.network_address) if peer_lo_addr else peer_lo_addr_str
             }
+            mux_tunnel_name = port
+            peer_switch_ip = peer_switch_table[peer_hostname]['address_ipv4']
 
-    return peer_switch_table
+    return peer_switch_table, mux_tunnel_name, peer_switch_ip
 
 def parse_device(device):
     lo_prefix = None
@@ -400,6 +404,8 @@ def parse_dpg(dpg, hname):
     mgmtintfs = None
     subintfs = None
     tunnelintfs = defaultdict(dict)
+    tunnelintfs_qos_remap_config = defaultdict(dict)
+
     for child in dpg:
         """ 
             In Multi-NPU platforms the acl intfs are defined only for the host not for individual asic.
@@ -687,6 +693,13 @@ def parse_dpg(dpg, hname):
                                        "ecn_mode": "EcnDecapsulationMode", 
                                        "dscp_mode": "DifferentiatedServicesCodePointMode", 
                                        "ttl_mode": "TtlMode"}
+
+            tunnel_qos_remap_table_key_to_mg_key_map = {
+                                       "decap_dscp_to_tc_map": "DecapDscpToTcMap",
+                                       "decap_tc_to_pg_map": "DecapTcToPgMap",
+                                       "encap_tc_to_queue_map": "EncapTcToQueueMap",
+                                       "encap_tc_to_dscp_map": "EncapTcToDscpMap"}
+
             for mg_tunnel in mg_tunnels.findall(str(QName(ns, "TunnelInterface"))):
                 tunnel_type = mg_tunnel.attrib["Type"]
                 tunnel_name = mg_tunnel.attrib["Name"]
@@ -699,8 +712,16 @@ def parse_dpg(dpg, hname):
                     if mg_key in mg_tunnel.attrib:
                         tunnelintfs[tunnel_type][tunnel_name][table_key] = mg_tunnel.attrib[mg_key]
 
-        return intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnelintfs, dpg_ecmp_content
-    return None, None, None, None, None, None, None, None, None, None, None, None, None
+                tunnelintfs_qos_remap_config[tunnel_type][tunnel_name] = {
+                    "tunnel_type": mg_tunnel.attrib["Type"].upper(),
+                }
+
+                for table_key, mg_key in tunnel_qos_remap_table_key_to_mg_key_map.items():
+                    if mg_key in mg_tunnel.attrib:
+                        tunnelintfs_qos_remap_config[tunnel_type][tunnel_name][table_key] = mg_tunnel.attrib[mg_key]
+
+        return intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnelintfs, dpg_ecmp_content, tunnelintfs_qos_remap_config
+    return None, None, None, None, None, None, None, None, None, None, None, None, None, None
 
 def parse_host_loopback(dpg, hname):
     for child in dpg:
@@ -862,6 +883,27 @@ def parse_meta(meta, hname):
                     kube_data["ip"] = value
     return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
 
+def parse_system_defaults(meta):
+    system_default_values = {}
+
+    system_defaults = meta.find(str(QName(ns1, "SystemDefaults")))
+    
+    if system_defaults is None:
+        return system_default_values
+    
+    for system_default in system_defaults.findall(str(QName(ns1, "SystemDefault"))):
+        name = system_default.find(str(QName(ns1, "Name"))).text
+        value = system_default.find(str(QName(ns1, "Value"))).text
+
+        # Tunnel Qos remapping 
+        if name == "TunnelQosRemapEnabled":
+            if value.lower() == "true":
+                status = "enabled"
+            else:
+                status = "disabled"
+            system_default_values["tunnel_qos_remap"] = {"status": status}
+
+    return system_default_values
 
 def parse_linkmeta(meta, hname):
     link = meta.find(str(QName(ns, "Link")))
@@ -1124,6 +1166,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     vlan_intfs = None
     pc_intfs = None
     tunnel_intfs = None
+    tunnel_intfs_qos_remap_config = None
     vlans = None
     vlan_members = None
     dhcp_relay_table = None
@@ -1158,6 +1201,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     is_storage_device = False
     local_devices = []
     kube_data = {}
+    system_defaults = {}
 
     hwsku_qn = QName(ns, "HwSku")
     hostname_qn = QName(ns, "Hostname")
@@ -1180,7 +1224,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     for child in root:
         if asic_name is None:
             if child.tag == str(QName(ns, "DpgDec")):
-                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, hostname)
+                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content, tunnel_intfs_qos_remap_config) = parse_dpg(child, hostname)
             elif child.tag == str(QName(ns, "CpgDec")):
                 (bgp_sessions, bgp_internal_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, hostname)
             elif child.tag == str(QName(ns, "PngDec")):
@@ -1193,9 +1237,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
+            elif child.tag == str(QName(ns, "SystemDefaultsDeclaration")):
+                system_defaults = parse_system_defaults(child)
         else:
             if child.tag == str(QName(ns, "DpgDec")):
-                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content) = parse_dpg(child, asic_name)
+                (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content, tunnel_intfs_qos_remap_config) = parse_dpg(child, asic_name)
                 host_lo_intfs = parse_host_loopback(child, hostname)
             elif child.tag == str(QName(ns, "CpgDec")):
                 (bgp_sessions, bgp_internal_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, asic_name, local_devices)
@@ -1207,6 +1253,8 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
+            elif child.tag == str(QName(ns, "SystemDefaultsDeclaration")):
+                system_defaults = parse_system_defaults(child)
 
     # set the host device type in asic metadata also
     device_type = [devices[key]['type'] for key in devices if key.lower() == hostname.lower()][0]
@@ -1241,7 +1289,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             }
         }
 
-    results['PEER_SWITCH'] = get_peer_switch_info(linkmetas, devices)
+    if len(system_defaults) > 0:
+        results['SYSTEM_DEFAULTS'] = system_defaults
+
+    results['PEER_SWITCH'], mux_tunnel_name, peer_switch_ip = get_peer_switch_info(linkmetas, devices)
 
     if bool(results['PEER_SWITCH']):
         results['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
@@ -1501,7 +1552,8 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     results['VLAN'] = vlans
     results['VLAN_MEMBER'] = vlan_members
 
-    results['TUNNEL'] = get_tunnel_entries(tunnel_intfs, lo_intfs, hostname)
+    # Add src_ip and qos remapping config into TUNNEL table if tunnel_qos_remap is enabled
+    results['TUNNEL'] = get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, system_defaults.get('tunnel_qos_remap', {}), mux_tunnel_name, peer_switch_ip)
 
     results['MUX_CABLE'] = get_mux_cable_entries(mux_cable_ports, neighbors, devices)
 
@@ -1590,7 +1642,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
 
     return results
 
-def get_tunnel_entries(tunnel_intfs, lo_intfs, hostname):
+def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tunnel_qos_remap, mux_tunnel_name, peer_switch_ip):
     lo_addr = ''
     # Use the first IPv4 loopback as the tunnel destination IP
     for addr in lo_intfs.keys():
@@ -1603,6 +1655,11 @@ def get_tunnel_entries(tunnel_intfs, lo_intfs, hostname):
     for type, tunnel_dict in tunnel_intfs.items():
         for tunnel_key, tunnel_attr in tunnel_dict.items():
             tunnel_attr['dst_ip'] = lo_addr
+            if (tunnel_qos_remap.get('status') == 'enabled') and (mux_tunnel_name == tunnel_key) and (peer_switch_ip is not None):
+                tunnel_attr['src_ip'] = peer_switch_ip
+                if tunnel_key in tunnel_intfs_qos_remap_config[type]:
+                    tunnel_attr.update(tunnel_intfs_qos_remap_config[type][tunnel_key].items())
+
             tunnels[tunnel_key] = tunnel_attr
     return tunnels
 
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
new file mode 100644
index 000000000000..7d0be06e4e82
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
@@ -0,0 +1,894 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" DecapDscpToTcMap="AZURE_TUNNEL" DecapTcToPgMap="AZURE_TUNNEL" EncapTcToQueueMap="AZURE_TUNNEL" EncapTcToDscpMap="AZURE_TUNNEL"/>
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <DhcpRelays>192.0.0.1</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <MacAddress i:nil="true"/>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>PortChannel01</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN_DSCP</AttachTo>
+          <InAcl>Everflow_dscp</InAcl>
+          <Type>Everflow_dscp</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>console</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t1</StartDevice>
+        <StartPort>1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>managed_device</StartDevice>
+        <StartPort>console</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/0</EndPort>
+        <StartDevice>switch-01t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/12</EndPort>
+        <StartDevice>switch-02t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>25000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <StartDevice>server1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <StartDevice>server2</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>L</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>U</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>0</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>MuxTunnel0</EndPort>
+        <FlowControl>false</FlowControl>
+        <StartDevice>switch2-t0</StartDevice>
+        <StartPort>MuxTunnel0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution" i:type="a:ToRRouter">
+        <ElementType>ToRRouter</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>26.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>25.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress>
+        <Hostname>switch2-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>switch-01t1</Hostname>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.186/32</a:IPPrefix>
+        </Address>
+        <DeploymentId>2</DeploymentId>
+        <DeviceLocation i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress> 
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.1/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0001/80</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.1/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server1</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.2/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0002/128</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.2/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server2</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+<LinkMetadataDeclaration>
+  <Link xmlns:d3p1="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true" />
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>GeminiPeeringLink</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>UpperTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>LowerTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch2-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch2-t0:MuxTunnel0;switch-t0:MuxTunnel0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-01t1:port1;switch-t0:fortyGigE0/0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-02t1:port1;switch-t0:fortyGigE0/12</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server1:port1;switch-t0:fortyGigE0/4</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server2:port1;switch-t0:fortyGigE0/8</d3p1:Key>
+    </d3p1:LinkMetadata>
+  </Link>
+</LinkMetadataDeclaration>
+<MetadataDeclaration>
+ <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+  <a:DeviceMetadata>
+   <a:Name>switch-t0</a:Name>
+   <a:Properties>
+    <a:DeviceProperty>
+     <a:Name>DeploymentId</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ErspanDestinationIpv4</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.100.1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>NtpResources</a:Name>
+     <a:Value>
+      10.0.10.1;10.0.10.2
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SnmpResources</a:Name>
+     <a:Value>
+      10.0.10.3;10.0.10.4
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SyslogResources</a:Name>
+     <a:Value>
+      10.0.10.5;10.0.10.6
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>TacacsServer</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.10.7;10.0.10.8</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesEnabled</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>0</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesServerIp</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.10.10.10</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ResourceType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Storage</a:Value>
+    </a:DeviceProperty>
+  </a:Properties>
+  </a:DeviceMetadata>
+ </Devices>
+ <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+</MetadataDeclaration>
+<SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>False</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/124</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <EnableFlowControl>true</EnableFlowControl>
+	  <Index>1</Index>
+	  <InterfaceName>eth0</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>eth0</PortName>
+	  <Speed>1000</Speed>
+	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
new file mode 100644
index 000000000000..d38f77774e9f
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
@@ -0,0 +1,894 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" DecapDscpToTcMap="AZURE_TUNNEL" DecapTcToPgMap="AZURE_TUNNEL" EncapTcToQueueMap="AZURE_TUNNEL" EncapTcToDscpMap="AZURE_TUNNEL"/>
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <DhcpRelays>192.0.0.1</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <MacAddress i:nil="true"/>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>PortChannel01</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN_DSCP</AttachTo>
+          <InAcl>Everflow_dscp</InAcl>
+          <Type>Everflow_dscp</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>console</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t1</StartDevice>
+        <StartPort>1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>managed_device</StartDevice>
+        <StartPort>console</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/0</EndPort>
+        <StartDevice>switch-01t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/12</EndPort>
+        <StartDevice>switch-02t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>25000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <StartDevice>server1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <StartDevice>server2</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>L</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>U</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>0</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>MuxTunnel0</EndPort>
+        <FlowControl>false</FlowControl>
+        <StartDevice>switch2-t0</StartDevice>
+        <StartPort>MuxTunnel0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution" i:type="a:ToRRouter">
+        <ElementType>ToRRouter</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>26.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>25.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress>
+        <Hostname>switch2-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>switch-01t1</Hostname>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.186/32</a:IPPrefix>
+        </Address>
+        <DeploymentId>2</DeploymentId>
+        <DeviceLocation i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress> 
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.1/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0001/80</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.1/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server1</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.2/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0002/128</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.2/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server2</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+<LinkMetadataDeclaration>
+  <Link xmlns:d3p1="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true" />
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>GeminiPeeringLink</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>UpperTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>LowerTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch2-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch2-t0:MuxTunnel0;switch-t0:MuxTunnel0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-01t1:port1;switch-t0:fortyGigE0/0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-02t1:port1;switch-t0:fortyGigE0/12</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server1:port1;switch-t0:fortyGigE0/4</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server2:port1;switch-t0:fortyGigE0/8</d3p1:Key>
+    </d3p1:LinkMetadata>
+  </Link>
+</LinkMetadataDeclaration>
+<MetadataDeclaration>
+ <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+  <a:DeviceMetadata>
+   <a:Name>switch-t0</a:Name>
+   <a:Properties>
+    <a:DeviceProperty>
+     <a:Name>DeploymentId</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ErspanDestinationIpv4</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.100.1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>NtpResources</a:Name>
+     <a:Value>
+      10.0.10.1;10.0.10.2
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SnmpResources</a:Name>
+     <a:Value>
+      10.0.10.3;10.0.10.4
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SyslogResources</a:Name>
+     <a:Value>
+      10.0.10.5;10.0.10.6
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>TacacsServer</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.10.7;10.0.10.8</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesEnabled</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>0</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesServerIp</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.10.10.10</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ResourceType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Storage</a:Value>
+    </a:DeviceProperty>
+  </a:Properties>
+  </a:DeviceMetadata>
+ </Devices>
+ <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+</MetadataDeclaration>
+<SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>True</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/124</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <EnableFlowControl>true</EnableFlowControl>
+	  <Index>1</Index>
+	  <InterfaceName>eth0</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>eth0</PortName>
+	  <Speed>1000</Speed>
+	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index a47988d10a1c..ab3dc784a0f4 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -352,6 +352,41 @@ def test_minigraph_tunnel_table(self):
             utils.to_dict(output.strip()),
             expected_tunnel
         )
+        
+        # Validate tunnel config is as before when tunnel_qos_remap = disabled
+        sample_graph_disabled_remap = os.path.join(self.test_dir, 'simple-sample-graph-case-remap-disabled.xml')
+        argument = '-m "' + sample_graph_disabled_remap + '" -p "' + self.port_config + '" -v "TUNNEL"'
+
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            expected_tunnel
+        )
+
+        # Validate extra config is generated when tunnel_qos_remap = enabled
+        sample_graph_enabled_remap = os.path.join(self.test_dir, 'simple-sample-graph-case-remap-enabled.xml')
+        argument = '-m "' + sample_graph_enabled_remap + '" -p "' + self.port_config + '" -v "TUNNEL"'
+        expected_tunnel = {
+            "MuxTunnel0": {
+                "tunnel_type": "IPINIP",
+                "src_ip": "25.1.1.10",
+                "dst_ip": "10.1.0.32",
+                "dscp_mode": "uniform",
+                "encap_ecn_mode": "standard",
+                "ecn_mode": "copy_from_outer",
+                "ttl_mode": "pipe",
+                "decap_dscp_to_tc_map": "AZURE_TUNNEL",
+                "decap_tc_to_pg_map": "AZURE_TUNNEL",
+                "encap_tc_to_dscp_map": "AZURE_TUNNEL",
+                "encap_tc_to_queue_map": "AZURE_TUNNEL"
+            }
+        }
+
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            expected_tunnel
+        )
 
     def test_minigraph_mux_cable_table(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "MUX_CABLE"'

From 6d3f1346fbf5fc9ebd94c020b80bd91e59f603b8 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 30 May 2022 20:00:54 +0800
Subject: [PATCH 1205/1674] Set the version for python2 package protobuf
 (#10964)

Why I did it
Python2 not support to install protobuf>=4.21.
---
 dockers/docker-sonic-mgmt-framework/Dockerfile.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
index 048e3b59bfc6..eea23a2d4620 100644
--- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
@@ -18,6 +18,7 @@ RUN pip2 install wheel==0.35.1
 RUN pip2 install connexion==1.1.15 \
                 setuptools==21.0.0 \
                 grpcio-tools==1.20.0 \
+                protobuf==3.17.3 \
                 certifi==2017.4.17 \
                 python-dateutil==2.6.0 \
                 six==1.11.0 \

From aebc3a8d6ad051518150e982e55fd8e3e1ebf517 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 31 May 2022 22:18:17 +0800
Subject: [PATCH 1206/1674] [Build]: Support to use the base image version when
 a package version not specified (#10971) (#10976)

Why I did it
It is to fix issue: #10952
[Build]: Support to use the base image version when a package version not specified
---
 .../scripts/buildinfo_base.sh                 | 53 +++++++++++++++++++
 .../scripts/pre_run_buildinfo                 |  1 +
 2 files changed, 54 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 1c2f76554b28..712c43baa3bc 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -260,6 +260,59 @@ release_apt_installation_lock()
     rm -f $DPKG_INSTALLTION_LOCK_FILE
 }
 
+update_preference_deb()
+{
+    local version_file="$VERSION_PATH/versions-deb"
+    if [ -f "$version_file" ]; then
+        rm -f $VERSION_DEB_PREFERENCE
+        for pacakge_version in $(cat "$version_file"); do
+            package=$(echo $pacakge_version | awk -F"==" '{print $1}')
+            version=$(echo $pacakge_version | awk -F"==" '{print $2}')
+            echo -e "Package: $package\nPin: version $version\nPin-Priority: 999\n\n" >> $VERSION_DEB_PREFERENCE
+        done
+    fi
+}
+
+update_version_file()
+{
+    local version_name=$1
+    local pre_version_file="$(ls $PRE_VERSION_PATH/${version_name}-* 2>/dev/null | head -n 1)"
+    local version_file="$VERSION_PATH/$1"
+    if [ ! -f "$pre_version_file" ]; then
+        return 0
+    fi
+    local pacakge_versions="$(cat $pre_version_file)"
+    [ -f "$version_file" ] && pacakge_versions="$pacakge_versions $(cat $version_file)"
+    declare -A versions
+    for pacakge_version in $pacakge_versions; do
+        package=$(echo $pacakge_version | awk -F"==" '{print $1}')
+        version=$(echo $pacakge_version | awk -F"==" '{print $2}')
+        if [ -z "$package" ] || [ -z "$version" ]; then
+            continue
+        fi
+        versions[$package]=$version
+    done
+
+    tmp_file=$(mktemp)
+    for package in "${!versions[@]}"; do
+        echo "$package==${versions[$package]}" >> $tmp_file
+    done
+    sort -u $tmp_file > $version_file
+    rm -f $tmp_file
+    
+    if [[ "${version_name}" == *-deb ]]; then
+        update_preference_deb
+    fi
+}
+
+update_version_files()
+{
+    local version_names="versions-deb versions-py2 versions-py3"
+    for version_name in $version_names; do
+        update_version_file $version_name
+    done
+}
+
 ENABLE_VERSION_CONTROL_DEB=$(check_version_control "deb")
 ENABLE_VERSION_CONTROL_PY2=$(check_version_control "py2")
 ENABLE_VERSION_CONTROL_PY3=$(check_version_control "py3")
diff --git a/src/sonic-build-hooks/scripts/pre_run_buildinfo b/src/sonic-build-hooks/scripts/pre_run_buildinfo
index d9b927ab42f9..5a8f00b55ecb 100755
--- a/src/sonic-build-hooks/scripts/pre_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/pre_run_buildinfo
@@ -11,6 +11,7 @@ mkdir -p $LOG_PATH
 [ -d $POST_VERSION_PATH ] && rm -rf $POST_VERSION_PATH
 mkdir -p $POST_VERSION_PATH
 collect_version_files $PRE_VERSION_PATH
+update_version_files
 symlink_build_hooks
 set_reproducible_mirrors
 

From 1ec4f3ea5ca397e4aec4ce6eba30036a57f49f10 Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Tue, 31 May 2022 23:47:33 +0800
Subject: [PATCH 1207/1674] submodule advance (#10949)

Update sonic-swss-common submodule pointer to include the following:

fb89310 - (HEAD, origin/202012) [Overlay ECMP] add new table schema for bgp profile [sonic-utilities]: Update submodule; Add commands to sudoers as necessary #608 (10 hours ago)
3632090 - [ci] Update azure pipeline branch variable reference. (4 weeks ago)
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index ca8f33bb0a86..fb89310e616c 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit ca8f33bb0a86b84f00d18f2a8501025efde65d5e
+Subproject commit fb89310e616ce4a5331aa024a080d70423131131

From 148ff285a683a4e482b39cf387099c3994f531f5 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Tue, 31 May 2022 11:03:15 -0700
Subject: [PATCH 1208/1674] 
 [202012][sonic-platform-common][sonic-platform-daemons] submodule (#10938)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

This PR adds the following commits are added in sonic-platform-common
ac25515 (HEAD -> 202012, origin/202012) [Credo][Ycable] changes for
synchronizing executing Telemetry API's when mux toggle is inprogress
(#280)
fb304c1 [sonic_ssd] Nokia-7215: "show platform ssdhealth" not showing
health percent (#279)
8bfe9c0 [Credo][Ycable] improve logging for Server Powered off/Faulty
cables (#272)

The following commits are added in sonic-platform-daemons
6695c55 (HEAD -> 202012, origin/202012) [ycabled] fix the posting for
mux_cable_static_info per downlink when ycabled is spawned;
synchronizing executing Telemetry API (#257)
6a315ae (HEAD -> 202012, origin/202012) [ycabled] Fix some syntax
warnings in ycabled (#263)
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index cd623fa665d9..ac255158d072 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit cd623fa665d9bceb565da6738b1625585148c61e
+Subproject commit ac255158d07257614af4eae37edff9abd70b13e1
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index af39d75810c4..6a315aee78bb 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit af39d75810c4759431bb8ed9e447956e78cbd34a
+Subproject commit 6a315aee78bbca9fd74abdae7b3c4cc53b98f14f

From 79555c894aa5c5718e3481d3fc30948bcd75f27a Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 1 Jun 2022 14:20:26 -0700
Subject: [PATCH 1209/1674] [dhcp6relay] Add dhcpv6 option check (#10486)
 (#10808)

---
 src/dhcp6relay/src/relay.cpp | 70 +++++++++++++++++++++++++-----------
 src/dhcp6relay/src/relay.h   |  5 +++
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index 951b31f90a0c..8387584f6ad1 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -49,18 +49,21 @@ const struct sock_fprog ether_relay_fprog = {
 
 /* DHCPv6 Counter */
 uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
-std::map<int, std::string> counterMap = {{0, "Unknown"},
-                                      {1, "Solicit"},
-                                      {2, "Advertise"},
-                                      {3, "Request"},
-                                      {4, "Confirm"},
-                                      {5, "Renew"},
-                                      {6, "Rebind"},
-                                      {7, "Reply"},
-                                      {8, "Release"},
-                                      {9, "Decline"},
-                                      {12, "Relay-Forward"},
-                                      {13, "Relay-Reply"}};
+std::map<int, std::string> counterMap = {{DHCPv6_MESSAGE_TYPE_UNKNOWN, "Unknown"},
+                                      {DHCPv6_MESSAGE_TYPE_SOLICIT, "Solicit"},
+                                      {DHCPv6_MESSAGE_TYPE_ADVERTISE, "Advertise"},
+                                      {DHCPv6_MESSAGE_TYPE_REQUEST, "Request"},
+                                      {DHCPv6_MESSAGE_TYPE_CONFIRM, "Confirm"},
+                                      {DHCPv6_MESSAGE_TYPE_RENEW, "Renew"},
+                                      {DHCPv6_MESSAGE_TYPE_REBIND, "Rebind"},
+                                      {DHCPv6_MESSAGE_TYPE_REPLY, "Reply"},
+                                      {DHCPv6_MESSAGE_TYPE_RELEASE, "Release"},
+                                      {DHCPv6_MESSAGE_TYPE_DECLINE, "Decline"},
+                                      {DHCPv6_MESSAGE_TYPE_RECONFIGURE, "Reconfigure"},
+                                      {DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST, "Information-Request"},
+                                      {DHCPv6_MESSAGE_TYPE_RELAY_FORW, "Relay-Forward"},
+                                      {DHCPv6_MESSAGE_TYPE_RELAY_REPL, "Relay-Reply"},
+                                      {DHCPv6_MESSAGE_TYPE_MALFORMED, "Malformed"}};
 
 /**
  * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
@@ -83,8 +86,11 @@ void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
     db->hset(counterVlan, "Reply", toString(counters[DHCPv6_MESSAGE_TYPE_REPLY]));
     db->hset(counterVlan, "Release", toString(counters[DHCPv6_MESSAGE_TYPE_RELEASE]));
     db->hset(counterVlan, "Decline", toString(counters[DHCPv6_MESSAGE_TYPE_DECLINE]));
+    db->hset(counterVlan, "Reconfigure", toString(counters[DHCPv6_MESSAGE_TYPE_RECONFIGURE]));
+    db->hset(counterVlan, "Information-Request", toString(counters[DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST]));
     db->hset(counterVlan, "Relay-Forward", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_FORW]));
     db->hset(counterVlan, "Relay-Reply", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_REPL]));
+    db->hset(counterVlan, "Malformed", toString(counters[DHCPv6_MESSAGE_TYPE_MALFORMED]));
 }
 
 /**
@@ -202,11 +208,12 @@ const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer) {
  * @return dhcpv6_option   end of dhcpv6 message option
  */
 const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end) {
-    uint32_t size = 4; // option-code + option-len
-    size += ntohs(*(uint16_t *)(buffer + 2));
-    (*out_end) = buffer + size;
+    auto option = (const struct dhcpv6_option *)buffer;
+    uint8_t size = 4; // option-code + option-len
+    size += *(uint16_t *)(buffer);
+    (*out_end) =  buffer + size + ntohs(option->option_length);
 
-    return (const struct dhcpv6_option *)buffer;
+    return option;
 }
 
 /**
@@ -587,6 +594,7 @@ void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *
 void callback(evutil_socket_t fd, short event, void *arg) {
     struct relay_config *config = (struct relay_config *)arg;
     static uint8_t message_buffer[4096];
+    std::string counterVlan = counter_table;
     int32_t len = recv(config->filter, message_buffer, 4096, 0);
     if (len <= 0) {
         syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
@@ -622,9 +630,7 @@ void callback(evutil_socket_t fd, short event, void *arg) {
     current_position = tmp;
 
     auto msg = parse_dhcpv6_hdr(current_position);
-    counters[msg->msg_type]++;
-    std::string counterVlan = counter_table;
-    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
+    auto option_position = current_position + sizeof(struct dhcpv6_msg);
 
     switch (msg->msg_type) {
         case DHCPv6_MESSAGE_TYPE_RELAY_FORW:
@@ -632,11 +638,35 @@ void callback(evutil_socket_t fd, short event, void *arg) {
             relay_relay_forw(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, config);
             break;
         }
-        default:
+        case DHCPv6_MESSAGE_TYPE_SOLICIT:
+        case DHCPv6_MESSAGE_TYPE_REQUEST: 
+	case DHCPv6_MESSAGE_TYPE_CONFIRM:
+        case DHCPv6_MESSAGE_TYPE_RENEW:
+        case DHCPv6_MESSAGE_TYPE_REBIND:
+        case DHCPv6_MESSAGE_TYPE_RELEASE:
+        case DHCPv6_MESSAGE_TYPE_DECLINE:
+        case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
         {
+            while (option_position - message_buffer < len) {
+                auto option = parse_dhcpv6_opt(option_position, &tmp);
+                option_position = tmp;
+                if (ntohs(option->option_code) > DHCPv6_OPTION_LIMIT) {
+                    counters[DHCPv6_MESSAGE_TYPE_MALFORMED]++;
+                    update_counter(config->db, counterVlan.append(config->interface), DHCPv6_MESSAGE_TYPE_MALFORMED);
+                    syslog(LOG_WARNING, "DHCPv6 option is invalid or contains malformed payload\n");
+                    return;
+                }
+            }
+            counters[msg->msg_type]++;
+            update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
             relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
             break;
         }
+        default:
+        {
+            syslog(LOG_WARNING, "DHCPv6 client message received was not relayed\n");
+            break;
+        }
     }
 }
 
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
index c224a9b28630..c5b07325421c 100644
--- a/src/dhcp6relay/src/relay.h
+++ b/src/dhcp6relay/src/relay.h
@@ -16,6 +16,7 @@
 #define RELAY_PORT 547
 #define CLIENT_PORT 546
 #define HOP_LIMIT 8     //HOP_LIMIT reduced from 32 to 8 as stated in RFC8415
+#define DHCPv6_OPTION_LIMIT 56      // DHCPv6 option code greater than 56 are currently unassigned
 
 #define lengthof(A) (sizeof (A) / sizeof (A)[0])
 
@@ -35,8 +36,11 @@ typedef enum
     DHCPv6_MESSAGE_TYPE_REPLY = 7,
     DHCPv6_MESSAGE_TYPE_RELEASE = 8,
     DHCPv6_MESSAGE_TYPE_DECLINE = 9,
+    DHCPv6_MESSAGE_TYPE_RECONFIGURE = 10,
+    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
     DHCPv6_MESSAGE_TYPE_RELAY_FORW = 12,
     DHCPv6_MESSAGE_TYPE_RELAY_REPL = 13,
+    DHCPv6_MESSAGE_TYPE_MALFORMED = 14,
 
     DHCPv6_MESSAGE_TYPE_COUNT
 } dhcp_message_type_t;
@@ -58,6 +62,7 @@ struct relay_config {
 
 struct dhcpv6_msg {
     uint8_t msg_type;
+    uint8_t xid[3];
 };
 
 struct PACKED dhcpv6_relay_msg {

From 14fdcc815a7d414b8ef5b592de02d809f8b7f448 Mon Sep 17 00:00:00 2001
From: Jing Kan <jika@microsoft.com>
Date: Thu, 2 Jun 2022 16:06:22 +0800
Subject: [PATCH 1210/1674] [202012][openssh] openssh: Upgrade from 7.9 to 8.4,
 to match version in buster-backports (#10910)

* Use buster-backports version
* Use dget dsc file instead source repo
* Update make files
* Upgrade openssh-client to 8.4 in base image
* Remove useless installation
* Install openssh-server from buster-backports in build_debian
* Update dev buster package version list

Signed-off-by: Jing Kan jika@microsoft.com
---
 build_debian.sh                                |  5 ++++-
 .../versions/host-image/versions-deb-buster    |  6 +++---
 rules/openssh.mk                               | 15 ++++++++-------
 sonic-slave-buster/Dockerfile.j2               |  5 ++++-
 src/openssh/Makefile                           | 18 ++++++++++--------
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index e23dde2458e7..9dccbbd0dbb6 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -281,7 +281,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     tcpdump                 \
     dbus                    \
     ntpstat                 \
-    openssh-server          \
     python                  \
     python-apt              \
     traceroute              \
@@ -323,6 +322,10 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     haveged                 \
     jq
 
+## Install openssh-server from buster-backports for required security patches
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -t buster-backports \
+    openssh-server
+
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 3a231842d99b..cbff1a630e80 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -249,9 +249,9 @@ netfilter-persistent==1.0.11+deb10u1
 ntp==1:4.2.8p12+dfsg-4+deb10u2
 ntpstat==0.0.0.1-2
 opennsl-modules==4.3.0.10-2
-openssh-client==1:7.9p1-10+deb10u2
-openssh-server==1:7.9p1-10+deb10u2
-openssh-sftp-server==1:7.9p1-10+deb10u2
+openssh-client==1:8.4p1-2~bpo10+1
+openssh-server==1:8.4p1-2~bpo10+1
+openssh-sftp-server==1:8.4p1-2~bpo10+1
 openssl==1.1.1n-0+deb10u2
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
diff --git a/rules/openssh.mk b/rules/openssh.mk
index 0cc3de621039..b92fc43eac66 100644
--- a/rules/openssh.mk
+++ b/rules/openssh.mk
@@ -1,14 +1,15 @@
 # openssh package
 
-OPENSSH_VERSION = 7.9p1-10+deb10u2
+OPENSSH_VERSION = 8.4p1
+OPENSSH_VERSION_FULL = ${OPENSSH_VERSION}-2~bpo10+1
 
-export OPENSSH_VERSION
+export OPENSSH_VERSION OPENSSH_VERSION_FULL
 
-OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
+OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh
 SONIC_MAKE_DEBS += $(OPENSSH_SERVER)
 
-# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
-# are archived into debug one image to facilitate debugging.
-#
-DBG_SRC_ARCHIVE += openssh
+OPENSSH_SERVER_DBG = openssh-server-dbgsym_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SERVER_DBG)))
+
+export OPENSSH_SERVER OPENSSH_SERVER_DBG
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 8851b8f0924d..65e0c16a58c8 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -49,7 +49,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
         apt-utils \
         default-jre-headless \
-        openssh-server \
         curl \
         wget \
         unzip \
@@ -333,6 +332,10 @@ RUN apt-get update && apt-get install -y \
         libgtest-dev \
         libgcc-8-dev
 
+# For openssh-server
+RUN apt-get -y install -t buster-backports \
+        openssh-server \
+        libfido2-dev
 RUN apt-get -y build-dep openssh
 
 # Build fix for ARMHF buster libsairedis
diff --git a/src/openssh/Makefile b/src/openssh/Makefile
index be05c6ffd675..829628df9988 100644
--- a/src/openssh/Makefile
+++ b/src/openssh/Makefile
@@ -2,17 +2,19 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = openssh-server-dbgsym_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
+MAIN_TARGET = $(OPENSSH_SERVER)
+DERIVED_TARGETS = $(OPENSSH_SERVER_DBG)
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Obtain openssh: https://salsa.debian.org/ssh-team/openssh/-/tree/debian/1%257.9p1-10+deb10u2
-	rm -rf ./openssh-server
-	git clone https://salsa.debian.org/ssh-team/openssh.git openssh-server
-	pushd ./openssh-server
+	# Remove stale files
+	rm -rf ./openssh-$(OPENSSH_VERSION)
 
-	# Check out tag: debian/1%7.9p1-10+deb10u2
-	git checkout -b openssh-src -f 6d9ca74c48d9911342c6ca5aaac8a25974fa2619
+	dget https://deb.debian.org/debian/pool/main/o/openssh/openssh_$(OPENSSH_VERSION_FULL).dsc
+	pushd ./openssh-$(OPENSSH_VERSION)
+
+	git init
+	git add -f *
+	git commit -qm "initial commit"
 
 	# Apply patch series
 	stg init

From 7ec6a6023009fd07085da8e89637e9020c7f4f9b Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:29:25 +0800
Subject: [PATCH 1211/1674] [cherry-pick] [202012] Update qos config to clear
 queues for bounced back traffic (#10608)

* Update qos config to clear queues for bounced back traffic

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 .../Arista-7050CX3-32S-C32/qos.json.j2        |    2 +-
 .../Arista-7050CX3-32S-D48C8/qos.json.j2      |  205 +
 .../Arista-7260CX3-C64/qos.json.j2            |  291 ++
 .../Arista-7260CX3-D108C8/qos.json.j2         |    2 +-
 .../Arista-7260CX3-Q64/qos.json.j2            |    2 +-
 files/build_templates/qos_config.j2           |   41 +-
 ...50cx3-dualtor-minigraph-remap-disabled.xml | 2369 +++++++++
 ...ample-arista-7050cx3-dualtor-minigraph.xml | 2377 +++++++++
 ...-7260-dualtor-minigraph-remap-disabled.xml | 4635 ++++++++++++++++
 .../sample-arista-7260-dualtor-minigraph.xml  | 4643 +++++++++++++++++
 ...rista-7260-t1-minigraph-remap-disabled.xml | 2491 +++++++++
 .../tests/sample-arista-7260-t1-minigraph.xml | 2499 +++++++++
 .../sample_output/py2/qos-arista7050.json     |   84 +-
 .../py2/qos-arista7800r3-48cq2-lc.json        | 1532 ++++++
 .../tests/sample_output/py2/qos-dell6100.json |  132 +-
 .../tests/sample_output/py2/qos-dell9332.json |   96 +-
 .../sample_output/py3/qos-arista7050.json     |   84 +-
 ...-arista7050cx3-dualtor-remap-disabled.json | 1129 ++++
 .../py3/qos-arista7050cx3-dualtor.json        | 1248 +++++
 ...qos-arista7260-dualtor-remap-disabled.json | 2121 ++++++++
 .../py3/qos-arista7260-dualtor.json           | 2240 ++++++++
 .../py3/qos-arista7260-t1-remap-disabled.json | 1005 ++++
 .../sample_output/py3/qos-arista7260-t1.json  | 1045 ++++
 .../py3/qos-arista7800r3-48cq2-lc.json        | 1532 ++++++
 .../tests/sample_output/py3/qos-dell6100.json |  132 +-
 .../tests/sample_output/py3/qos-dell9332.json |   96 +-
 src/sonic-config-engine/tests/test_j2files.py |   52 +
 27 files changed, 31872 insertions(+), 213 deletions(-)
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
new file mode 120000
index 000000000000..5ea713ce7f4c
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
@@ -0,0 +1 @@
+../Arista-7050CX3-32S-D48C8/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
index 3e548325ea30..e0aca4f8dd8b 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -1 +1,206 @@
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+    "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_queue_map() %}
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_dscp_map() %}
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+{%- endmacro %}
+{% endif %}
 {%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
index 3e548325ea30..4d82382817cb 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
@@ -1 +1,292 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7"
+        }
+    },
+{%- endmacro %}
+{% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_queue_map() %}
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_dscp_map() %}
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+
 {%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
new file mode 120000
index 000000000000..f0ee02749724
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
new file mode 120000
index 000000000000..f0ee02749724
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/qos.json.j2
\ No newline at end of file
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 5f515a07103a..469609ab2f6d 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -27,13 +27,26 @@
 {%- endfor %}
 {%- set port_names_active = port_names_list_active | join(',') -%}
 
+{%- set tunnel_qos_remap_enable = false %}
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) %}
+{%- set tunnel_qos_remap_enable = true %}
+{%- endif %}
+
+{%- set port_names_list_extra_queues = [] %}
+{%- for port in PORT_ACTIVE %}
+{% if ((generate_dscp_to_tc_map is defined) and tunnel_qos_remap_enable) and 
+(('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or
+('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %}
+        {%- if port_names_list_extra_queues.append(port) %}{%- endif %}
+    {%- endif %}
+{%- endfor %}
 
 {%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
 {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
 {%- set apollo_resource_types = ['DL-NPU-Apollo'] -%}
 
 {
-{% if generate_tc_to_pg_map is defined %}
+{% if (generate_tc_to_pg_map is defined) and tunnel_qos_remap_enable %}
     {{- generate_tc_to_pg_map() }}
 {% else %}
     "TC_TO_PRIORITY_GROUP_MAP": {
@@ -61,6 +74,9 @@
             "7": "7"
         }
     },
+{% if (generate_tc_to_queue_map is defined) and tunnel_qos_remap_enable %}
+    {{- generate_tc_to_queue_map() }}
+{% else %}
     "TC_TO_QUEUE_MAP": {
         "AZURE": {
             "0": "0",
@@ -73,6 +89,7 @@
             "7": "7"
         }
     },
+{% endif %}
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
     "DOT1P_TO_TC_MAP": {
         "AZURE": {
@@ -86,6 +103,8 @@
             "7": "7"
         }
     },
+{% elif (generate_dscp_to_tc_map is defined) and tunnel_qos_remap_enable %}
+    {{- generate_dscp_to_tc_map() }}
 {% else %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -156,6 +175,9 @@
         }
     },
 {% endif %}
+{% if (generate_tc_to_dscp_map is defined) and tunnel_qos_remap_enable %}
+    {{- generate_tc_to_dscp_map() }}
+{% endif %}
 {% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %}
     "SCHEDULER": {
         "scheduler.0": {
@@ -205,7 +227,12 @@
 {% if asic_type in pfc_to_pg_map_supported_asics %}
             "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
 {% endif %}
-            "pfc_enable"      : "3,4"
+{% if port in port_names_list_extra_queues %}
+            "pfc_enable"      : "2,3,4,6",
+{% else %}
+            "pfc_enable"      : "3,4",
+{% endif %}
+            "pfcwd_sw_enable" : "3,4"
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}
@@ -265,7 +292,12 @@
 {% endfor %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|2": {
+{% if port in port_names_list_extra_queues %}
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+{% else %}
             "scheduler": "[SCHEDULER|scheduler.0]"
+{% endif %}
         },
 {% endfor %}
 {% for port in PORT_ACTIVE %}
@@ -275,7 +307,12 @@
 {% endfor %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|6": {
+{% if port in port_names_list_extra_queues %}
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+{% else %}
             "scheduler": "[SCHEDULER|scheduler.0]"
+{% endif %}
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}
diff --git a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml
new file mode 100644
index 000000000000..9ffb8230a6bf
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml
@@ -0,0 +1,2369 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-7050cx3-acs-10</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      <a:LoopbackIPInterface>
+          <Name>HostIP2</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.34/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.34/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP3</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::34/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::34/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP6</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.38/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.38/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP7</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::38/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::38/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP4</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.36/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.36/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP5</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::36/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::36/128</a:PrefixStr>
+        </a:LoopbackIPInterface></LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.146.122/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.146.122/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-7050cx3-acs-10</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet7/1;Ethernet8/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet9/1;Ethernet10/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet23/1;Ethernet24/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet25/1;Ethernet26/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" />
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet11/1;Ethernet12/1;Ethernet13/1;Ethernet14/1;Ethernet15/1;Ethernet16/1;Ethernet17/1;Ethernet18/1;Ethernet19/1;Ethernet20/1;Ethernet21/1;Ethernet22/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet7/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet8/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet9/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet10/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet23/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet24/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet25/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet26/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet13/1</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet14/1</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet15/1</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet16/1</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet17/1</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet18/1</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet19/1</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet20/1</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers0-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers1-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers2-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers3-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers4-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers5-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers6-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers7-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet13/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers8-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet14/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers9-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet15/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers10-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet16/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers11-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet17/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers12-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet18/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers13-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet19/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers14-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet20/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers15-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers16-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers17-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers18-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers19-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers20-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers21-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers22-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers23-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7050cx3-acs-10</Hostname>
+        <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.32/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::32/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.122</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7050cx3-acs-11</Hostname>
+        <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.33/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::33/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.127</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers0-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.2/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers0</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers1-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.3/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::3/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers1</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers2-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.4/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::4/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers2</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers3-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.5/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::5/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers3</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers4-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.6/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::6/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers4</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers5-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.7/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::7/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers5</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers6-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.8/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::8/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers6</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers7-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.9/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::9/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers7</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers8-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.10/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers8</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers9-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.11/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers9</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers10-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.12/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers10</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers11-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.13/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers11</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers12-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.14/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers12</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers13-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.15/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers13</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers14-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.16/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::10/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers14</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers15-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.17/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::11/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers15</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers16-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.18/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::12/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers16</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers17-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.19/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::13/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers17</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers18-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.20/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::14/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers18</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers19-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.21/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::15/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers19</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers20-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.22/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::16/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers20</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers21-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.23/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::17/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers21</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers22-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.24/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::18/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers22</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers23-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.25/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::19/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers23</Hostname>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.63</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.62</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.61</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.60</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-7050cx3-acs-10</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>GeminiEnabled</a:Name>
+            <a:Reference i:nil="true" />
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+          <a:Name i:nil="true" />
+          <a:Properties>
+            <a:DeviceProperty>
+              <a:Name>GeminiPeeringLink</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>True</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>UpperTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7050cx3-acs-10</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>LowerTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7050cx3-acs-11</a:Value>
+            </a:DeviceProperty>
+          </a:Properties>
+        <a:Key>str2-7050cx3-acs-11:MuxTunnel0;str2-7050cx3-acs-10:MuxTunnel0</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+  <Hostname>str2-7050cx3-acs-10</Hostname>
+  <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
new file mode 100644
index 000000000000..47240eb2f4b3
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
@@ -0,0 +1,2377 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7050cx3-acs-10</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-7050cx3-acs-10</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      <a:LoopbackIPInterface>
+          <Name>HostIP2</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.34/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.34/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP3</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::34/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::34/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP6</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.38/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.38/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP7</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::38/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::38/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP4</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.36/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.36/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP5</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::36/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::36/128</a:PrefixStr>
+        </a:LoopbackIPInterface></LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.146.122/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.146.122/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-7050cx3-acs-10</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet7/1;Ethernet8/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet9/1;Ethernet10/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet23/1;Ethernet24/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet25/1;Ethernet26/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" />
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet11/1;Ethernet12/1;Ethernet13/1;Ethernet14/1;Ethernet15/1;Ethernet16/1;Ethernet17/1;Ethernet18/1;Ethernet19/1;Ethernet20/1;Ethernet21/1;Ethernet22/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet7/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet8/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet9/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet10/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet23/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet24/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet25/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7050cx3-acs-10</StartDevice>
+        <StartPort>Ethernet26/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet13/1</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet14/1</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet15/1</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet16/1</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet17/1</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet18/1</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet19/1</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet20/1</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers0-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers1-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers2-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers3-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers4-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers5-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers6-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers7-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet13/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers8-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet14/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers9-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet15/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers10-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet16/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers11-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet17/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers12-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet18/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers13-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet19/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers14-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet20/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers15-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers16-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers17-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers18-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers19-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers20-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers21-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers22-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7050cx3-acs-10</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>str2-7050cx3-acs-10-Servers23-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7050cx3-acs-10</Hostname>
+        <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.32/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::32/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.122</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7050cx3-acs-11</Hostname>
+        <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.33/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::33/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.127</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers0-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.2/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers0</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers1-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.3/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::3/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers1</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers2-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.4/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::4/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers2</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers3-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.5/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::5/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers3</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers4-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.6/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::6/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers4</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers5-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.7/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::7/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers5</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers6-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.8/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::8/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers6</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers7-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.9/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::9/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers7</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers8-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.10/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers8</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers9-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.11/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers9</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers10-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.12/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers10</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers11-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.13/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers11</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers12-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.14/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers12</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers13-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.15/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers13</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers14-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.16/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::10/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers14</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers15-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.17/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::11/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers15</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers16-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.18/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::12/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers16</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers17-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.19/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::13/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers17</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers18-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.20/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::14/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers18</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers19-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.21/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::15/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers19</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers20-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.22/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::16/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers20</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers21-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.23/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::17/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers21</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers22-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.24/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::18/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers22</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7050cx3-acs-10-Servers23-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.25/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::19/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers23</Hostname>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.63</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.62</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.61</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.142.60</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-7050cx3-acs-10</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>GeminiEnabled</a:Name>
+            <a:Reference i:nil="true" />
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>True</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+          <a:Name i:nil="true" />
+          <a:Properties>
+            <a:DeviceProperty>
+              <a:Name>GeminiPeeringLink</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>True</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>UpperTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7050cx3-acs-10</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>LowerTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7050cx3-acs-11</a:Value>
+            </a:DeviceProperty>
+          </a:Properties>
+        <a:Key>str2-7050cx3-acs-11:MuxTunnel0;str2-7050cx3-acs-10:MuxTunnel0</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+  <Hostname>str2-7050cx3-acs-10</Hostname>
+  <HwSku>Arista-7050CX3-32S-D48C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml
new file mode 100644
index 000000000000..01a42f934726
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml
@@ -0,0 +1,4635 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-7260cx3-acs-12</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      <a:LoopbackIPInterface>
+          <Name>HostIP2</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.34/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.34/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP3</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::34/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::34/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP6</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.38/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.38/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP7</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::38/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::38/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP4</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.36/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.36/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP5</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::36/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::36/128</a:PrefixStr>
+        </a:LoopbackIPInterface></LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.147.165/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.147.165/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-7260cx3-acs-12</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet13/1;Ethernet14/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet15/1;Ethernet16/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet17/1;Ethernet18/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet19/1;Ethernet20/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" />
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet7/1;Ethernet8/1;Ethernet9/1;Ethernet10/1;Ethernet11/1;Ethernet12/1;Ethernet21/1;Ethernet22/1;Ethernet23/1;Ethernet24/1;Ethernet25/1;Ethernet26/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1;Ethernet33/1;Ethernet34/1;Ethernet35/1;Ethernet36/1;Ethernet37/1;Ethernet38/1;Ethernet39/1;Ethernet40/1;Ethernet41/1;Ethernet42/1;Ethernet43/1;Ethernet44/1;Ethernet45/1;Ethernet46/1;Ethernet47/1;Ethernet48/1;Ethernet49/1;Ethernet50/1;Ethernet51/1;Ethernet52/1;Ethernet53/1;Ethernet54/1;Ethernet55/1;Ethernet56/1;Ethernet57/1;Ethernet58/1;Ethernet59/1;Ethernet60/1;Ethernet61/1;Ethernet62/1;Ethernet63/1;Ethernet64/1</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet13/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet14/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet15/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet16/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet17/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet18/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet19/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet20/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet7/1</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet8/1</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet9/1</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet10/1</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet23/1</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet24/1</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet25/1</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet26/1</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet33/1</EndPort>
+        <StartDevice>Servers24</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet34/1</EndPort>
+        <StartDevice>Servers25</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet35/1</EndPort>
+        <StartDevice>Servers26</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet36/1</EndPort>
+        <StartDevice>Servers27</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet37/1</EndPort>
+        <StartDevice>Servers28</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet38/1</EndPort>
+        <StartDevice>Servers29</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet39/1</EndPort>
+        <StartDevice>Servers30</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet40/1</EndPort>
+        <StartDevice>Servers31</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet41/1</EndPort>
+        <StartDevice>Servers32</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet42/1</EndPort>
+        <StartDevice>Servers33</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet43/1</EndPort>
+        <StartDevice>Servers34</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet44/1</EndPort>
+        <StartDevice>Servers35</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet45/1</EndPort>
+        <StartDevice>Servers36</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet46/1</EndPort>
+        <StartDevice>Servers37</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet47/1</EndPort>
+        <StartDevice>Servers38</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet48/1</EndPort>
+        <StartDevice>Servers39</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet49/1</EndPort>
+        <StartDevice>Servers40</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet50/1</EndPort>
+        <StartDevice>Servers41</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet51/1</EndPort>
+        <StartDevice>Servers42</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet52/1</EndPort>
+        <StartDevice>Servers43</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet53/1</EndPort>
+        <StartDevice>Servers44</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet54/1</EndPort>
+        <StartDevice>Servers45</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet55/1</EndPort>
+        <StartDevice>Servers46</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet56/1</EndPort>
+        <StartDevice>Servers47</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet57/1</EndPort>
+        <StartDevice>Servers48</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet58/1</EndPort>
+        <StartDevice>Servers49</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet59/1</EndPort>
+        <StartDevice>Servers50</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet60/1</EndPort>
+        <StartDevice>Servers51</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet61/1</EndPort>
+        <StartDevice>Servers52</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet62/1</EndPort>
+        <StartDevice>Servers53</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet63/1</EndPort>
+        <StartDevice>Servers54</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet64/1</EndPort>
+        <StartDevice>Servers55</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers0-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers1-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers2-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers3-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers4-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers5-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet7/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers6-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet8/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers7-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet9/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers8-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet10/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers9-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers10-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers11-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers12-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers13-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet23/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers14-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet24/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers15-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet25/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers16-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet26/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers17-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers18-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers19-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers20-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers21-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers22-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers23-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet33/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers24-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet34/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers25-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet35/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers26-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet36/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers27-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet37/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers28-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet38/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers29-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet39/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers30-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet40/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers31-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet41/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers32-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet42/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers33-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet43/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers34-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet44/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers35-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet45/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers36-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet46/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers37-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet47/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers38-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet48/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers39-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet49/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers40-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet50/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers41-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet51/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers42-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet52/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers43-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet53/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers44-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet54/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers45-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet55/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers46-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet56/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers47-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet57/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers48-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet58/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers49-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet59/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers50-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet60/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers51-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet61/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers52-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet62/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers53-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet63/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers54-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet64/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers55-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7260cx3-acs-12</Hostname>
+        <HwSku>Arista-7260CX3-D108C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.32/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::32/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.147.165</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7260cx3-acs-13</Hostname>
+        <HwSku>Arista-7260CX3-D108C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.33/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::33/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.147.167</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers0-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.2/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers0</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers1-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.3/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::3/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers1</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers2-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.4/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::4/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers2</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers3-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.5/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::5/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers3</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers4-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.6/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::6/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers4</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers5-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.7/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::7/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers5</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers6-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.8/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::8/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers6</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers7-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.9/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::9/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers7</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers8-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.10/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers8</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers9-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.11/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers9</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers10-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.12/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers10</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers11-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.13/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers11</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers12-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.14/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers12</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers13-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.15/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers13</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers14-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.16/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::10/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers14</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers15-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.17/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::11/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers15</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers16-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.18/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::12/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers16</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers17-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.19/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::13/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers17</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers18-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.20/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::14/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers18</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers19-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.21/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::15/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers19</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers20-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.22/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::16/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers20</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers21-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.23/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::17/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers21</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers22-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.24/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::18/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers22</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers23-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.25/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::19/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers23</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers24-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.26/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers24</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers25-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.27/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers25</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers26-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.28/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers26</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers27-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.29/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers27</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers28-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.30/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers28</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers29-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.31/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers29</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers30-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.32/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::20/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers30</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers31-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.33/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::21/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers31</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers32-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.34/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::22/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers32</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers33-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.35/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::23/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers33</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers34-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.36/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::24/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers34</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers35-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.37/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::25/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers35</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers36-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.38/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::26/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers36</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers37-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.39/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::27/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers37</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers38-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.40/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::28/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers38</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers39-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.41/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::29/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers39</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers40-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.42/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers40</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers41-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.43/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers41</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers42-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.44/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers42</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers43-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.45/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers43</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers44-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.46/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers44</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers45-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.47/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers45</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers46-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.48/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::30/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers46</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers47-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.49/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::31/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers47</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers48-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.50/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::32/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers48</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers49-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.51/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::33/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers49</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers50-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.52/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::34/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers50</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers51-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.53/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::35/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers51</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers52-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.54/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::36/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers52</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers53-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.55/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::37/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers53</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers54-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.56/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::38/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers54</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers55-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.57/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::39/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers55</Hostname>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.75</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.74</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.73</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.72</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet65</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet66</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7260CX3-D108C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-7260cx3-acs-12</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>GeminiEnabled</a:Name>
+            <a:Reference i:nil="true" />
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+          <a:Name i:nil="true" />
+          <a:Properties>
+            <a:DeviceProperty>
+              <a:Name>GeminiPeeringLink</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>True</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>UpperTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7260cx3-acs-12</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>LowerTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7260cx3-acs-13</a:Value>
+            </a:DeviceProperty>
+          </a:Properties>
+        <a:Key>str2-7260cx3-acs-13:MuxTunnel0;str2-7260cx3-acs-12:MuxTunnel0</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+  <Hostname>str2-7260cx3-acs-12</Hostname>
+  <HwSku>Arista-7260CX3-D108C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
new file mode 100644
index 000000000000..613613ba37b6
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
@@ -0,0 +1,4643 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7260cx3-acs-12</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-7260cx3-acs-12</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      <a:LoopbackIPInterface>
+          <Name>HostIP2</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.34/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.34/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP3</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::34/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::34/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP6</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.38/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.38/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP7</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::38/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::38/128</a:PrefixStr>
+        </a:LoopbackIPInterface><a:LoopbackIPInterface>
+          <Name>HostIP4</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.36/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.36/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP5</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::36/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::36/128</a:PrefixStr>
+        </a:LoopbackIPInterface></LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.147.165/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.147.165/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-7260cx3-acs-12</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet13/1;Ethernet14/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet15/1;Ethernet16/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet17/1;Ethernet18/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet19/1;Ethernet20/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" />
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet7/1;Ethernet8/1;Ethernet9/1;Ethernet10/1;Ethernet11/1;Ethernet12/1;Ethernet21/1;Ethernet22/1;Ethernet23/1;Ethernet24/1;Ethernet25/1;Ethernet26/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1;Ethernet33/1;Ethernet34/1;Ethernet35/1;Ethernet36/1;Ethernet37/1;Ethernet38/1;Ethernet39/1;Ethernet40/1;Ethernet41/1;Ethernet42/1;Ethernet43/1;Ethernet44/1;Ethernet45/1;Ethernet46/1;Ethernet47/1;Ethernet48/1;Ethernet49/1;Ethernet50/1;Ethernet51/1;Ethernet52/1;Ethernet53/1;Ethernet54/1;Ethernet55/1;Ethernet56/1;Ethernet57/1;Ethernet58/1;Ethernet59/1;Ethernet60/1;Ethernet61/1;Ethernet62/1;Ethernet63/1;Ethernet64/1</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet13/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet14/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet15/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet16/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet17/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet18/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet19/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str2-7260cx3-acs-12</StartDevice>
+        <StartPort>Ethernet20/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet7/1</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet8/1</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet9/1</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet10/1</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet23/1</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet24/1</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet25/1</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet26/1</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet33/1</EndPort>
+        <StartDevice>Servers24</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet34/1</EndPort>
+        <StartDevice>Servers25</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet35/1</EndPort>
+        <StartDevice>Servers26</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet36/1</EndPort>
+        <StartDevice>Servers27</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet37/1</EndPort>
+        <StartDevice>Servers28</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet38/1</EndPort>
+        <StartDevice>Servers29</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet39/1</EndPort>
+        <StartDevice>Servers30</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet40/1</EndPort>
+        <StartDevice>Servers31</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet41/1</EndPort>
+        <StartDevice>Servers32</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet42/1</EndPort>
+        <StartDevice>Servers33</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet43/1</EndPort>
+        <StartDevice>Servers34</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet44/1</EndPort>
+        <StartDevice>Servers35</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet45/1</EndPort>
+        <StartDevice>Servers36</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet46/1</EndPort>
+        <StartDevice>Servers37</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet47/1</EndPort>
+        <StartDevice>Servers38</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet48/1</EndPort>
+        <StartDevice>Servers39</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet49/1</EndPort>
+        <StartDevice>Servers40</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet50/1</EndPort>
+        <StartDevice>Servers41</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet51/1</EndPort>
+        <StartDevice>Servers42</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet52/1</EndPort>
+        <StartDevice>Servers43</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet53/1</EndPort>
+        <StartDevice>Servers44</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet54/1</EndPort>
+        <StartDevice>Servers45</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet55/1</EndPort>
+        <StartDevice>Servers46</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet56/1</EndPort>
+        <StartDevice>Servers47</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet57/1</EndPort>
+        <StartDevice>Servers48</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet58/1</EndPort>
+        <StartDevice>Servers49</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet59/1</EndPort>
+        <StartDevice>Servers50</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet60/1</EndPort>
+        <StartDevice>Servers51</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet61/1</EndPort>
+        <StartDevice>Servers52</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet62/1</EndPort>
+        <StartDevice>Servers53</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet63/1</EndPort>
+        <StartDevice>Servers54</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet64/1</EndPort>
+        <StartDevice>Servers55</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers0-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers1-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers2-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers3-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers4-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers5-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet7/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers6-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet8/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers7-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet9/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers8-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet10/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers9-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers10-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers11-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers12-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers13-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet23/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers14-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet24/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers15-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet25/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers16-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet26/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers17-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet27/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers18-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet28/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers19-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet29/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers20-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet30/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers21-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet31/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers22-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet32/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers23-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet33/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers24-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet34/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers25-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet35/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers26-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet36/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers27-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet37/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers28-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet38/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers29-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet39/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers30-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet40/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers31-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet41/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers32-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet42/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers33-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet43/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers34-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet44/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers35-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet45/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers36-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet46/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers37-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet47/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers38-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet48/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers39-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet49/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers40-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet50/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers41-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet51/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers42-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet52/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers43-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet53/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers44-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet54/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers45-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet55/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers46-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet56/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers47-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet57/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers48-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet58/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers49-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet59/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers50-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet60/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers51-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet61/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers52-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet62/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers53-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet63/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers54-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>LogicalLink</ElementType>
+        <EndDevice>str2-7260cx3-acs-12</EndDevice>
+        <EndPort>Ethernet64/1</EndPort>
+        <StartDevice>str2-7260cx3-acs-12-Servers55-SC</StartDevice>
+        <StartPort>U</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7260cx3-acs-12</Hostname>
+        <HwSku>Arista-7260CX3-D108C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.32/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::32/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.147.165</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7260cx3-acs-13</Hostname>
+        <HwSku>Arista-7260CX3-D108C8</HwSku>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.33/32</a:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>FC00:1::33/128</a:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.147.167</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers0-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.2/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers0</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers1-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.3/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::3/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers1</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers2-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.4/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::4/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers2</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers3-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.5/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::5/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers3</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers4-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.6/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::6/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers4</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers5-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.7/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::7/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers5</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers6-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.8/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::8/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers6</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers7-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.9/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::9/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers7</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers8-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.10/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers8</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers9-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.11/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers9</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers10-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.12/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers10</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers11-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.13/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers11</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers12-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.14/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers12</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers13-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.15/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers13</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers14-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.16/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::10/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers14</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers15-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.17/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::11/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers15</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers16-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.18/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::12/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers16</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers17-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.19/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::13/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers17</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers18-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.20/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::14/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers18</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers19-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.21/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::15/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers19</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers20-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.22/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::16/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers20</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers21-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.23/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::17/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers21</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers22-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.24/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::18/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers22</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers23-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.25/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::19/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers23</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers24-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.26/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers24</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers25-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.27/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers25</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers26-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.28/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers26</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers27-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.29/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers27</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers28-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.30/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers28</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers29-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.31/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::1f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers29</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers30-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.32/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::20/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers30</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers31-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.33/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::21/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers31</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers32-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.34/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::22/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers32</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers33-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.35/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::23/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers33</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers34-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.36/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::24/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers34</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers35-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.37/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::25/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers35</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers36-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.38/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::26/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers36</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers37-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.39/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::27/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers37</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers38-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.40/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::28/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers38</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers39-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.41/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::29/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers39</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers40-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.42/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2a/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers40</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers41-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.43/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2b/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers41</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers42-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.44/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2c/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers42</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers43-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.45/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2d/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers43</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers44-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.46/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2e/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers44</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers45-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.47/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::2f/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers45</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers46-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.48/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::30/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers46</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers47-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.49/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::31/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers47</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers48-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.50/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::32/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers48</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers49-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.51/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::33/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers49</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers50-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.52/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::34/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers50</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers51-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.53/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::35/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers51</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers52-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.54/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::36/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers52</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers53-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.55/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::37/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers53</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers54-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.56/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::38/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers54</Hostname>
+      </Device>
+      <Device i:type="SmartCable">
+        <ElementType>SmartCable</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <ManagementAddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>::/0</d5p1:IPPrefix>
+        </ManagementAddressV6>
+        <SerialNumber i:nil="true" />
+        <Hostname>str2-7260cx3-acs-12-Servers55-SC</Hostname>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>192.168.0.57/26</d5p1:IPPrefix>
+        </Address> 
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fc02:1000::39/96</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>0.0.0.0/0</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>Servers55</Hostname>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.75</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.74</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.73</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.147.72</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet65</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet66</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7260CX3-D108C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-7260cx3-acs-12</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>GeminiEnabled</a:Name>
+            <a:Reference i:nil="true" />
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>True</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+          <a:Name i:nil="true" />
+          <a:Properties>
+            <a:DeviceProperty>
+              <a:Name>GeminiPeeringLink</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>True</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>UpperTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7260cx3-acs-12</a:Value>
+            </a:DeviceProperty>
+            <a:DeviceProperty>
+              <a:Name>LowerTOR</a:Name>
+              <a:Reference i:nil="true" />
+              <a:Value>str2-7260cx3-acs-13</a:Value>
+            </a:DeviceProperty>
+          </a:Properties>
+        <a:Key>str2-7260cx3-acs-13:MuxTunnel0;str2-7260cx3-acs-12:MuxTunnel0</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+  <Hostname>str2-7260cx3-acs-12</Hostname>
+  <HwSku>Arista-7260CX3-D108C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml
new file mode 100644
index 000000000000..4367b705a11a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml
@@ -0,0 +1,2491 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::5</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::6</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::D</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.64</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>10.0.0.65</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::81</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>FC00::82</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.66</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>10.0.0.67</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::85</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>FC00::86</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.68</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>10.0.0.69</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::89</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>FC00::8A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.70</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>10.0.0.71</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::8D</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>FC00::8E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str-7260cx3-acs-7</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.65</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.67</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.69</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.71</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64017</a:ASN>
+        <a:Hostname>ARISTA17T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64018</a:ASN>
+        <a:Hostname>ARISTA18T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64019</a:ASN>
+        <a:Hostname>ARISTA19T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64020</a:ASN>
+        <a:Hostname>ARISTA20T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.64.246.78/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.64.246.78/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str-7260cx3-acs-7</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet35/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet37/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet38/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel105</Name>
+          <AttachTo>Ethernet5/1;Ethernet6/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel106</Name>
+          <AttachTo>Ethernet39/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel107</Name>
+          <AttachTo>Ethernet40/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel108</Name>
+          <AttachTo>Ethernet17/1;Ethernet18/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel109</Name>
+          <AttachTo>Ethernet43/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1010</Name>
+          <AttachTo>Ethernet45/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1011</Name>
+          <AttachTo>Ethernet21/1;Ethernet22/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1012</Name>
+          <AttachTo>Ethernet46/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1013</Name>
+          <AttachTo>Ethernet47/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1014</Name>
+          <AttachTo>Ethernet48/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1015</Name>
+          <AttachTo>Ethernet51/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1016</Name>
+          <AttachTo>Ethernet53/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1017</Name>
+          <AttachTo>Ethernet54/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1018</Name>
+          <AttachTo>Ethernet55/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1019</Name>
+          <AttachTo>Ethernet56/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1020</Name>
+          <AttachTo>Ethernet59/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1021</Name>
+          <AttachTo>Ethernet61/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1022</Name>
+          <AttachTo>Ethernet62/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1023</Name>
+          <AttachTo>Ethernet63/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1024</Name>
+          <AttachTo>Ethernet64/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>FC00::5/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>FC00::D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>10.0.0.64/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>FC00::81/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>10.0.0.66/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>FC00::85/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>10.0.0.68/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>FC00::89/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>10.0.0.70/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>FC00::8D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet35/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet1/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet2/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet37/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet38/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet5/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet6/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet39/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet40/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet17/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet18/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet43/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet45/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet21/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet22/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet46/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet47/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet48/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet51/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet53/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet54/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet55/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet56/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet59/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA17T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet61/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA18T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet62/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA19T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet63/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA20T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet64/1</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>str-7260cx3-acs-7</Hostname>
+        <HwSku>Arista-7260CX3-C64</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.64.246.78</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.95</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.90</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.89</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA17T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.96</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.88</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA20T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.99</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.87</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.86</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.79</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.76</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.80</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.78</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.84</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.81</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.82</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.77</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.83</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA18T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.97</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.94</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA19T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.98</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.93</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.91</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.92</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.85</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet65</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet66</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7260CX3-C64</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str-7260cx3-acs-7</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.64.247.0/24;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>str-7260cx3-acs-7</Hostname>
+  <HwSku>Arista-7260CX3-C64</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
new file mode 100644
index 000000000000..3c87489b59c2
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
@@ -0,0 +1,2499 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::5</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::6</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::D</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.64</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>10.0.0.65</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::81</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>FC00::82</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.66</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>10.0.0.67</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::85</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>FC00::86</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.68</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>10.0.0.69</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::89</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>FC00::8A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>10.0.0.70</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>10.0.0.71</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str-7260cx3-acs-7</StartRouter>
+        <StartPeer>FC00::8D</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>FC00::8E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str-7260cx3-acs-7</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.65</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.67</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.69</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.71</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64017</a:ASN>
+        <a:Hostname>ARISTA17T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64018</a:ASN>
+        <a:Hostname>ARISTA18T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64019</a:ASN>
+        <a:Hostname>ARISTA19T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64020</a:ASN>
+        <a:Hostname>ARISTA20T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.64.246.78/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.64.246.78/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str-7260cx3-acs-7</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet35/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet1/1;Ethernet2/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet37/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet38/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel105</Name>
+          <AttachTo>Ethernet5/1;Ethernet6/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel106</Name>
+          <AttachTo>Ethernet39/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel107</Name>
+          <AttachTo>Ethernet40/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel108</Name>
+          <AttachTo>Ethernet17/1;Ethernet18/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel109</Name>
+          <AttachTo>Ethernet43/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1010</Name>
+          <AttachTo>Ethernet45/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1011</Name>
+          <AttachTo>Ethernet21/1;Ethernet22/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1012</Name>
+          <AttachTo>Ethernet46/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1013</Name>
+          <AttachTo>Ethernet47/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1014</Name>
+          <AttachTo>Ethernet48/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1015</Name>
+          <AttachTo>Ethernet51/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1016</Name>
+          <AttachTo>Ethernet53/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1017</Name>
+          <AttachTo>Ethernet54/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1018</Name>
+          <AttachTo>Ethernet55/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1019</Name>
+          <AttachTo>Ethernet56/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1020</Name>
+          <AttachTo>Ethernet59/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1021</Name>
+          <AttachTo>Ethernet61/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1022</Name>
+          <AttachTo>Ethernet62/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1023</Name>
+          <AttachTo>Ethernet63/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1024</Name>
+          <AttachTo>Ethernet64/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>FC00::5/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>FC00::D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>10.0.0.64/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>FC00::81/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>10.0.0.66/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>FC00::85/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>10.0.0.68/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>FC00::89/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>10.0.0.70/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>FC00::8D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet35/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet1/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet2/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet37/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet38/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet5/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet6/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet39/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet40/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet17/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet18/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet43/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet45/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet21/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet22/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet46/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet47/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet48/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet51/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet53/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet54/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet55/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet56/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet59/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA17T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet61/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA18T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet62/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA19T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet63/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA20T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str-7260cx3-acs-7</StartDevice>
+        <StartPort>Ethernet64/1</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>str-7260cx3-acs-7</Hostname>
+        <HwSku>Arista-7260CX3-C64</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.64.246.78</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.95</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.90</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.89</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA17T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.96</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.88</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA20T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.99</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.87</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.86</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.79</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.76</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.80</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.78</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.84</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.81</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.82</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.77</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.83</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA18T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.97</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.94</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA19T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.98</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.93</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.91</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.92</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.141.85</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet33/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet34/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet35/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet37/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet38/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet39/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet41/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet42/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet43/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet45/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet46/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet47/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet49/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet50/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet51/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet53/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet54/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet55/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet57/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet58/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet59/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet61/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet62/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet63/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet65</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet66</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7260CX3-C64</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str-7260cx3-acs-7</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.64.247.0/24;10.64.5.5</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>True</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <Hostname>str-7260cx3-acs-7</Hostname>
+  <HwSku>Arista-7260CX3-C64</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
index aa05ef4ec36c..8493ea0b8508 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
@@ -119,196 +119,224 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet44": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet60": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet76": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet92": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet116": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet124": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
new file mode 100644
index 000000000000..92ba2caf8d17
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
@@ -0,0 +1,1532 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet132": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet140": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet164": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet132|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet140|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet164|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet132|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet140|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet164|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet0|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|6": {
+            "scheduler": "scheduler.0"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
index 75d9b3a87eee..218481ea8f1c 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
@@ -119,308 +119,352 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet1": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet5": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet6": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet7": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet9": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet10": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet11": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet13": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet14": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet15": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet17": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet21": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet22": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet23": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet25": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet26": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet27": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet29": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet30": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet31": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet37": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet38": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet39": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet41": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet42": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet53": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet54": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet55": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet57": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet58": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
index ce15fb715233..8f8737154c01 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
@@ -123,224 +123,256 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet104": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet128": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet136": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet144": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet152": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet160": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet168": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet176": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet184": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet192": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet200": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet208": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet216": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet224": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet232": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet240": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet248": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
index aa05ef4ec36c..8493ea0b8508 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
@@ -119,196 +119,224 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet44": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet60": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet76": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet92": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet116": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet124": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
new file mode 100644
index 000000000000..0787c6b24e8b
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
@@ -0,0 +1,1129 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
new file mode 100644
index 000000000000..b67ca4971112
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -0,0 +1,1248 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",  
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
new file mode 100644
index 000000000000..450c11621982
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
@@ -0,0 +1,2121 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet132": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet140": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet160": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet164": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet172": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet192": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet196": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet204": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet224": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet228": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet236": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet132|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet140|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet164|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet172|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet196|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet204|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet228|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet236|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet132|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet140|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet164|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet172|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet196|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet204|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet228|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet236|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
new file mode 100644
index 000000000000..752f3399f620
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -0,0 +1,2240 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",  
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet132": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet140": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet160": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet164": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet172": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet192": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet196": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet204": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet224": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet228": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet236": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet132|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet140|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet164|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet172|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet196|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet204|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet228|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet236|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet132|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet140|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet160|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet164|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet172|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet192|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet196|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet204|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet224|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet228|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet236|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet52|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet56|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet60|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet72|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet76|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet8|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet12|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet24|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet28|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet32|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet36|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet40|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet44|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet48|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet52|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet56|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet60|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet72|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet76|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet88|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet92|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet96|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet100|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet104|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet108|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet112|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet116|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet120|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet124|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet128|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet132|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet140|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet160|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet164|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet172|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet192|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet196|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet204|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet224|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet228|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet236|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
new file mode 100644
index 000000000000..9bd54d64f37a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
@@ -0,0 +1,1005 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
new file mode 100644
index 000000000000..7ab1374fc355
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -0,0 +1,1045 @@
+{
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
new file mode 100644
index 000000000000..92ba2caf8d17
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
@@ -0,0 +1,1532 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet8": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet12": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet24": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet28": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet32": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet36": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet40": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet44": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet48": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet52": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet56": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet60": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet72": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet76": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet88": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet92": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet96": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet100": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet104": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet108": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet112": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet116": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet120": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet124": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet128": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet132": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet140": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet164": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "AZURE",
+            "tc_to_queue_map" : "AZURE",
+            "tc_to_pg_map"    : "AZURE",
+            "pfc_to_queue_map": "AZURE",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet8|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet12|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet24|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet28|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet32|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet36|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet40|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet44|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet48|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet52|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet56|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet60|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet72|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet76|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet88|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet92|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet96|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet100|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet104|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet108|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet112|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet116|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet120|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet124|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet128|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet132|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet140|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet164|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet8|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet12|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet24|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet28|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet32|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet36|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet40|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet44|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet48|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet52|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet56|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet60|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet72|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet76|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet88|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet92|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet96|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet100|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet104|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet108|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet112|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet116|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet120|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet124|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet128|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet132|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet140|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet164|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "scheduler.1",
+            "wred_profile": "AZURE_LOSSLESS"
+        },
+        "Ethernet0|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|0": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|1": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|2": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|5": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet0|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet4|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet8|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet12|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet16|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet20|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet24|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet28|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet32|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet36|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet40|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet44|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet48|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet52|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet56|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet60|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet64|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet68|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet72|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet76|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet80|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet84|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet88|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet92|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet96|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet100|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet104|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet108|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet112|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet116|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet120|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet124|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet128|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet132|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet136|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet140|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet144|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet148|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet152|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet156|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet164|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet176|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet180|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet184|6": {
+            "scheduler": "scheduler.0"
+        },
+        "Ethernet188|6": {
+            "scheduler": "scheduler.0"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
index 75d9b3a87eee..218481ea8f1c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
@@ -119,308 +119,352 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet1": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet5": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet6": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet7": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet9": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet10": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet11": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet13": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet14": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet15": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet17": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet21": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet22": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet23": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet25": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet26": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet27": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet29": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet30": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet31": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet37": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet38": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet39": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet41": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet42": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet53": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet54": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet55": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet57": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet58": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
index ce15fb715233..8f8737154c01 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
@@ -123,224 +123,256 @@
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet104": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet128": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet136": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet144": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet152": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet160": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet168": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet176": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet184": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet192": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet200": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet208": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet216": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet224": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet232": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet240": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet248": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable"      : "3,4"
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
         }
     },
     "WRED_PROFILE": {
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 3240f2dcfb2a..88bb4730314f 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -311,6 +311,58 @@ def test_buffers_mellanox2410_render_template(self):
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
+    def test_qos_dscp_remapping_render_template(self):
+        if utils.PYvX_DIR != 'py3':
+            # Skip on python2 as the change will not be backported to previous version
+            return
+
+        dir_paths = [
+            '../../../device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8',
+            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8',
+            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64',
+            '../../../device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8',
+            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8',
+            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64'
+            ]
+        sample_outputs = [
+            'qos-arista7050cx3-dualtor.json',
+            'qos-arista7260-dualtor.json',
+            'qos-arista7260-t1.json',
+            'qos-arista7050cx3-dualtor-remap-disabled.json',
+            'qos-arista7260-dualtor-remap-disabled.json',
+            'qos-arista7260-t1-remap-disabled.json'
+        ]
+        sample_minigraph_files = [
+            'sample-arista-7050cx3-dualtor-minigraph.xml',
+            'sample-arista-7260-dualtor-minigraph.xml',
+            'sample-arista-7260-t1-minigraph.xml',
+            'sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml',
+            'sample-arista-7260-dualtor-minigraph-remap-disabled.xml',
+            'sample-arista-7260-t1-minigraph-remap-disabled.xml'
+        ]
+        for i, path in enumerate(dir_paths):
+            device_template_path = os.path.join(self.test_dir, path)
+            sample_output = sample_outputs[i]
+            sample_minigraph_file = os.path.join(self.test_dir,sample_minigraph_files[i])
+            qos_file = os.path.join(device_template_path, 'qos.json.j2')
+            port_config_ini_file = os.path.join(device_template_path, 'port_config.ini')
+            test_output = os.path.join(self.test_dir, 'output.json')
+
+            # copy qos_config.j2 to the target directory to have all templates in one directory
+            qos_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'qos_config.j2')
+            shutil.copy2(qos_config_file, device_template_path)
+
+            argument = '-m ' + sample_minigraph_file + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + test_output
+            self.run_script(argument)
+
+            # cleanup
+            qos_config_file_new = os.path.join(device_template_path, 'qos_config.j2')
+            os.remove(qos_config_file_new)
+
+            sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, sample_output)
+            assert utils.cmp(sample_output_file, test_output)
+            os.remove(test_output)
+
     def test_ipinip_multi_asic(self):
         ipinip_file = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ipinip.json.j2')
         argument = '-m ' + self.multi_asic_minigraph + ' -p ' + self.multi_asic_port_config + ' -t ' + ipinip_file  +  ' -n asic0 '  + ' > ' + self.output_file

From 5d2ae332d468a79afe6efa192f8c21b8506f2936 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 3 Jun 2022 12:20:49 +0800
Subject: [PATCH 1212/1674] [ci] Add arm artifacts in common lib azure pipeline
 (#10892)

---
 .azure-pipelines/template-commonlib.yml | 85 +++++++++++++++----------
 slave.mk                                |  4 ++
 2 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/.azure-pipelines/template-commonlib.yml b/.azure-pipelines/template-commonlib.yml
index 0e42cb4e17ac..cd7551d83823 100644
--- a/.azure-pipelines/template-commonlib.yml
+++ b/.azure-pipelines/template-commonlib.yml
@@ -1,34 +1,53 @@
-jobs:
-- job: Build
-  timeoutInMinutes: 120
-  pool: sonicbld
-  steps:
-  - checkout: self
-    clean: true
-    submodules: recursive
-  - script: |
-      set -ex
-      case $(Build.SourceBranchName) in
-        202012 | 202106)
-          bldenv=buster
-          ;;
-        *)
-          bldenv=bullseye
-          ;;
-      esac
-      BLDENV=$bldenv make -f Makefile.work configure PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
-      echo "##vso[task.setvariable variable=bldenv;]$bldenv"
-    displayName: Make configure
-  - script: |
-      set -ex
-      LIBNL3_VERSION_BASE=$(grep "LIBNL3_VERSION_BASE =" rules/libnl3.mk | awk '{print$3}')
-      LIBNL3_VERSION=$(grep "LIBNL3_VERSION =" rules/libnl3.mk | awk '{print$3}' | sed -e "s/(//" -e "s/)//" -e "s/\\$//" -e "s/LIBNL3_VERSION_BASE/$LIBNL3_VERSION_BASE/")
-      BLDENV=$(bldenv) make -f Makefile.work target/debs/$(bldenv)/libnl-3-200_${LIBNL3_VERSION}_amd64.deb ENABLE_DOCKER_BASE_PULL=y
+parameters:
+- name: archs
+  type: object
+  default:
+    - amd64
+    - armhf
+    - arm64
 
-      LIBYANG_VERSION_BASE=$(grep "LIBYANG_VERSION_BASE =" rules/libyang.mk | awk '{print$3}')
-      LIBYANG_VERSION=$(grep "LIBYANG_VERSION =" rules/libyang.mk | awk '{print$3}' | sed -e "s/\\$//" -e "s/(//" -e "s/)//" -e "s/LIBYANG_VERSION_BASE/$LIBYANG_VERSION_BASE/")
-      BLDENV=$(bldenv) make -f Makefile.work target/debs/$(bldenv)/libyang_${LIBYANG_VERSION}_amd64.deb
-      find target -name *.deb | xargs -i cp {} $(Build.ArtifactStagingDirectory)
-    displayName: Make common lib packages
-  - publish: $(Build.ArtifactStagingDirectory)
-    artifact: common-lib
+jobs:
+- ${{ each arch in parameters.archs }}:
+  - job: Build_${{ arch }}
+    timeoutInMinutes: 120
+    ${{ if eq(arch,'amd64') }}:
+      pool: sonicbld
+    ${{ else }}:
+      pool: sonicbld-${{ arch }}
+    variables:
+      - template: template-variables.yml
+    steps:
+    - checkout: self
+      clean: true
+      submodules: recursive
+    - script: |
+        set -ex
+        branch=$(Build.SourceBranchName)
+        # replace all: '-' -> '_'
+        branch=${branch//-/_}
+        # replace all: 'a' -> 'A', DIST_MASTER is set in variable.
+        BRANCH=DIST_${branch^^}
+        # variable name is dynamic
+        bldenvs=${!BRANCH}
+        [ "$bldenvs" == "" ] && bldenvs="$(COMMON_LIB_BUILD_ENVS)"
+        for bldenv in $bldenvs
+        do
+          BLDENV=$bldenv make -f Makefile.work configure PLATFORM_ARCH=${{ arch }} PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
+        done
+        set +x
+        echo "##vso[task.setvariable variable=bldenvs;]$bldenvs"
+      displayName: Make configure
+    - script: |
+        set -ex
+        for bldenv in $(bldenvs)
+        do
+          SONIC_BUILD_JOBS=$(nproc) BLDENV=$bldenv make -f Makefile.work lib-packages ENABLE_DOCKER_BASE_PULL=y
+        done
+        mv target $(Build.ArtifactStagingDirectory)
+      displayName: Make common lib packages
+    - ${{ if eq(arch,'amd64') }}:
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: common-lib
+    - ${{ else }}:
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: common-lib.${{ arch }}
diff --git a/slave.mk b/slave.mk
index bda703bc9c8e..8415dc4be926 100644
--- a/slave.mk
+++ b/slave.mk
@@ -1170,3 +1170,7 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \
 .PHONY : $(SONIC_CLEAN_DEBS) $(SONIC_CLEAN_FILES) $(SONIC_CLEAN_TARGETS) $(SONIC_CLEAN_STDEB_DEBS) $(SONIC_CLEAN_WHEELS) $(SONIC_PHONY_TARGETS) clean distclean configure
 
 .INTERMEDIATE : $(SONIC_INSTALL_DEBS) $(SONIC_INSTALL_WHEELS) $(DOCKER_LOAD_TARGETS) docker-start .platform
+
+## To build some commonly used libs. Some submodules depend on these libs.
+## It is used in component pipelines. For example: swss needs libnl, libyang
+lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG))

From 3289598ea4e255295df753dab537d274e4939167 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Fri, 3 Jun 2022 09:39:30 -0700
Subject: [PATCH 1213/1674] Split kvmtest t0 job into two jobs and run in
 parallel (#10044) (#10858)

Why I did it
Introduce 2 sub jobs for kvmtest t0 job in sonic-mgmt repo in PR Azure/sonic-mgmt#4861
But in sonic-buildimage repo, because section parameter is null, it always run the part 2 test scripts in kvmtest t0 job.
It missed the part 1 test scripts in kvmtest.sh.

How I did it
Split kvmtest t0 job into two sub jobs such as sonic-mgmt repo and run them in parallel to save time.

How to verify it
Submit PR will trigger the pipeline to run.

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
(cherry picked from commit 44028723ef76385958af1555ad7f7150f53f44ee)

Co-authored-by: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com>
---
 .azure-pipelines/run-test-template.yml | 11 ++++---
 azure-pipelines.yml                    | 41 ++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/run-test-template.yml b/.azure-pipelines/run-test-template.yml
index 071286d0fb5e..8b41023824ed 100644
--- a/.azure-pipelines/run-test-template.yml
+++ b/.azure-pipelines/run-test-template.yml
@@ -7,6 +7,9 @@ parameters:
   type: string
 - name: ptf_name
   type: string
+- name: section
+  type: string
+  default: ''
 
 steps:
 - checkout: self
@@ -36,7 +39,7 @@ steps:
 
 - script: |
     rm -rf $(Build.ArtifactStagingDirectory)/*
-    docker exec sonic-mgmt bash -c "/data/sonic-mgmt/tests/kvmtest.sh -en -T ${{ parameters.tbtype }} ${{ parameters.tbname }} ${{ parameters.dut }}"
+    docker exec sonic-mgmt bash -c "/data/sonic-mgmt/tests/kvmtest.sh -en -T ${{ parameters.tbtype }} ${{ parameters.tbname }} ${{ parameters.dut }} ${{ parameters.section }}"
   displayName: "Run tests"
 
 - script: |
@@ -68,17 +71,17 @@ steps:
   condition: succeededOrFailed()
 
 - publish: $(Build.ArtifactStagingDirectory)/kvmdump
-  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype}}.memdump@$(System.JobAttempt)
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype}}${{ parameters.section }}.memdump@$(System.JobAttempt)
   displayName: "Archive sonic kvm memdump"
   condition: failed()
 
 - publish: $(Build.ArtifactStagingDirectory)/logs
-  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype }}.log@$(System.JobAttempt)
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype }}${{ parameters.section }}.log@$(System.JobAttempt)
   displayName: "Archive sonic kvm logs"
   condition: succeededOrFailed()
 
 - task: PublishTestResults@2
   inputs:
     testResultsFiles: '$(Build.ArtifactStagingDirectory)/logs/**/*.xml'
-    testRunTitle: kvmtest.${{ parameters.tbtype }}
+    testRunTitle: kvmtest.${{ parameters.tbtype }}${{ parameters.section }}
   condition: succeededOrFailed()
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d23b4536971a..5e0acc9e3317 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -119,9 +119,9 @@ stages:
         testResultsFiles: '**/tr.xml'
         testRunTitle: vstest
 
-  - job:
+  - job: t0_part1
     pool: sonictest
-    displayName: "kvmtest-t0"
+    displayName: "kvmtest-t0-part1"
     timeoutInMinutes: 300
 
     steps:
@@ -131,6 +131,43 @@ stages:
         tbname: vms-kvm-t0
         ptf_name: ptf_vms6-1
         tbtype: t0
+        section: part-1
+
+  - job: t0_part2
+    pool: sonictest
+    displayName: "kvmtest-t0-part2"
+    timeoutInMinutes: 300
+
+    steps:
+    - template: .azure-pipelines/run-test-template.yml
+      parameters:
+        dut: vlab-01
+        tbname: vms-kvm-t0
+        ptf_name: ptf_vms6-1
+        tbtype: t0
+        section: part-2
+
+  - job:
+    pool: sonictest
+    displayName: "kvmtest-t0"
+    timeoutInMinutes: 300
+    dependsOn:
+    - t0_part1
+    - t0_part2
+    condition: always()
+    variables:
+      resultOfPart1: $[ dependencies.t0_part1.result ]
+      resultOfPart2: $[ dependencies.t0_part2.result ]
+
+    steps:
+    - script: |
+        if [ $(resultOfPart1) == "Succeeded" ] && [ $(resultOfPart2) == "Succeeded" ]; then
+          echo "Both job kvmtest-t0-part1 and kvmtest-t0-part2 are passed."
+          exit 0
+        else
+          echo "Either job kvmtest-t0-part1 or job kvmtest-t0-part2 failed! Please check the detailed information."
+          exit 1
+        fi
 
   - job:
     pool: sonictest-t1-lag

From 8981ae5caec5fc0717aa9087bc05ac998e6ba778 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Fri, 3 Jun 2022 22:57:39 +0530
Subject: [PATCH 1214/1674] [202012][cherry-pick] DellEMC: Z9332f - Component
 API Fixes (#10997)

---
 .../common/ipmihelper.py                      |  5 ++-
 .../common/onie_stage_fwpkg                   |  2 +-
 .../common/sonic_platform/hwaccess.py         |  5 ++-
 .../z9332f/sonic_platform/component.py        | 38 +++++++++++++++----
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
index d95329c40de2..3908f90bdad4 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -90,7 +90,10 @@ def get_twos_complement(val, bits):
         R_exp = get_twos_complement((factors[6] & 0xF0) >> 4, 4)
         B_exp = get_twos_complement(factors[6] & 0x0F, 4)
 
-        converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
+        if R_exp < 0:
+            converted_reading = ((M * raw_value) + (B * 10**B_exp)) / 10**(-R_exp)
+        else:
+            converted_reading = ((M * raw_value) + (B * 10**B_exp)) * 10**R_exp
 
         return True, converted_reading
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
index 1ceaf32fe8c1..dcc74a09a91e 100755
--- a/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
+++ b/platform/broadcom/sonic-platform-modules-dell/common/onie_stage_fwpkg
@@ -45,7 +45,7 @@ function show_help_and_exit()
     echo " "
     echo "    Available options:"
     echo "        -h, -? : getting this help"
-    echo "        -o [fwpkg]    : stages the firmware update package"
+    echo "        -a [fwpkg]    : stages the firmware update package"
 
     exit 0
 }
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
index 373f71bdd5bf..642a6ddc6fc8 100644
--- a/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
+++ b/platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py
@@ -39,7 +39,10 @@ def pci_set_value(resource, val, offset):
 # Read I2C device
 
 def i2c_get(bus, i2caddr, ofs):
-    return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+    try:
+        return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return -1
 
 def io_reg_read(io_resource, offset):
     fd = os.open(io_resource, os.O_RDONLY)
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
index c308ed291903..306749270d26 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py
@@ -23,20 +23,36 @@
 
 
 def get_bios_version():
-    return subprocess.check_output(
-        ['dmidecode', '-s', 'bios-version']).decode('utf-8').strip()
+    try:
+        return subprocess.check_output(['dmidecode', '-s', 'bios-version'],
+                                       text=True).strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return 'NA'
 
 def get_fpga_version():
     val = hwaccess.pci_get_value('/sys/bus/pci/devices/0000:09:00.0/resource0', 0)
     return '{}.{}'.format((val >> 16) & 0xffff, val & 0xffff)
 
 def get_bmc_version():
-    return subprocess.check_output(
-        ['cat', '/sys/class/ipmi/ipmi0/device/bmc/firmware_revision']
-        ).decode('utf-8').strip()
+    val = 'NA'
+    try:
+        bmc_ver = subprocess.check_output(['ipmitool', 'mc', 'info'],
+                                          stderr=subprocess.STDOUT, text=True)
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        pass
+    else:
+        version = re.search(r'Firmware Revision\s*:\s(.*)', bmc_ver)
+        if version:
+            val = version.group(1).strip()
+
+    return val
 
 def get_cpld_version(bus, i2caddr):
-    return '{}'.format(hwaccess.i2c_get(bus, i2caddr, 0))
+    val = hwaccess.i2c_get(bus, i2caddr, 0)
+    if val != -1:
+        return '{:x}.{:x}'.format((val >> 4) & 0xf, val & 0xf)
+    else:
+        return 'NA'
 
 def get_cpld0_version():
     return get_cpld_version(5, 0x0d)
@@ -67,7 +83,7 @@ def get_pciephy_version():
     except Exception:
         return val
     else:
-        version = re.search(r'PCIe FW loader version:\s(.*)', pcie_ver)
+        version = re.search(r'PCIe FW version:\s(.*)', pcie_ver)
         if version:
             val = version.group(1).strip()
 
@@ -156,6 +172,14 @@ def _get_available_firmware_version(image_path):
 
             ver_info = ver_info.get("x86_64-dellemc_z9332f_d1508-r0")
             if ver_info:
+                components = list(ver_info.keys())
+                for component in components:
+                    if "CPLD" in component and ver_info[component].get('version'):
+                        val = ver_info.pop(component)
+                        ver = int(val['version'], 16)
+                        val['version'] = "{:x}.{:x}".format((ver >> 4) & 0xf, ver & 0xf)
+                        ver_info[component.replace("-", " ")] = val
+
                 return True, ver_info
             else:
                 return False, "ERROR: Version info not available"

From eda95b8caa2d38210488e4d7cc985b6650fcb585 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Sat, 4 Jun 2022 14:33:28 +0800
Subject: [PATCH 1215/1674] [sonic-sairedis]: update submodule sonic-sairedis
 (#10982)

544e4c2 (origin/202012) [ci] Paralize azure pipeline (#1044)
45b310d Enable SAI_SWITCH_ATTR_UNINIT_DATA_PLANE_ON_REMOVAL attribute (#1016)
9e56674 Advance submodule SAI for 202012 branch (#1032)

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 77451cccb9d9..544e4c2137e1 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 77451cccb9d91a7d7953c542f92c7a08763da05d
+Subproject commit 544e4c2137e11be838fe3b5405a8d0e7d209d2d6

From e159998657d7fb15fdbf8b1662512cd9bd481566 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Sat, 4 Jun 2022 19:25:02 +0800
Subject: [PATCH 1216/1674] [202012][cherry-pick] Add two extra lossless queues
 for bounced back traffic (#10715)

* Add extra lossless queues

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 .../buffers_defaults_t0.j2                    |   6 +
 .../buffers_extra_queues.j2                   |   1 +
 .../buffers_defaults_t0.j2                    |   6 +
 .../buffers_extra_queues.j2                   |  37 +
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2 |   6 +
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2 |   6 +
 .../buffers_extra_queues.j2                   |  38 +
 .../buffers_defaults_t0.j2                    |   6 +
 .../buffers_extra_queues.j2                   |   1 +
 .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 |   6 +
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 |   7 +
 .../buffers_extra_queues.j2                   |   1 +
 files/build_templates/buffers_config.j2       |  14 +
 ...-arista7050cx3-dualtor-remap-disabled.json | 488 +++++++++
 .../py3/buffer-arista7050cx3-dualtor.json     | 536 ++++++++++
 ...fer-arista7260-dualtor-remap-disabled.json | 938 +++++++++++++++++
 .../py3/buffer-arista7260-dualtor.json        | 986 ++++++++++++++++++
 .../buffer-arista7260-t1-remap-disabled.json  | 450 ++++++++
 .../py3/buffer-arista7260-t1.json             | 570 ++++++++++
 src/sonic-config-engine/tests/test_j2files.py |  43 +
 20 files changed, 4146 insertions(+)
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
index 2a328ac4806d..2511328510c9 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
@@ -44,3 +44,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2
new file mode 120000
index 000000000000..2c4dff993ce9
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2
@@ -0,0 +1 @@
+../Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
index d7b666d47037..1e0b3ae79e4a 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -45,3 +45,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2
new file mode 100644
index 000000000000..336079e9e3d9
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2
@@ -0,0 +1,37 @@
+{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
index 3442612f70b2..76f9568a079c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -44,3 +44,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index 949e632035cd..6c375508a3ba 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -50,3 +50,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2
new file mode 100644
index 000000000000..4c213b52d326
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2
@@ -0,0 +1,38 @@
+{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and 
+(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
index 74579a022dcb..6bd66fac8b92 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -52,3 +52,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2
new file mode 120000
index 000000000000..92b7e9ffbee5
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_extra_queues.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
index 3442612f70b2..76f9568a079c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -44,3 +44,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
index 2fff9cbc771b..590fee57b89c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -44,3 +44,10 @@
         }
     },
 {%- endmacro %}
+
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2
new file mode 120000
index 000000000000..92b7e9ffbee5
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_extra_queues.j2
\ No newline at end of file
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 84d267f4698d..3802081b5774 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -126,6 +126,16 @@ def
 {%- endfor %}
 {%- set port_names_active  = port_names_list_active  | join(',') %}
 
+{%- set port_names_list_extra_queues = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
+            (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or
+            ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %}
+        {%- if port_names_list_extra_queues.append(port) %}{%- endif %}
+    {%- endif %}
+{%- endfor %}
+{%- set port_names_extra_queues = port_names_list_extra_queues | join(',') %}
+
 {%- set port_names_list_inactive  = [] %}
 {%- for port in PORT_INACTIVE %}
     {%- if port_names_list_inactive.append(port) %}{%- endif %}
@@ -181,6 +191,10 @@ def
 {{ defs.generate_queue_buffers(port_names_active) }}
 {% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
 {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
+{% elif (defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
+{% elif (defs.generate_queue_buffers_with_extra_lossless_queues is defined) and (port_names_extra_queues != '') %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }}
 {% else %}
     "BUFFER_QUEUE": {
 {% for port in PORT_ACTIVE %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
new file mode 100644
index 000000000000..2992ecacc3db
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
@@ -0,0 +1,488 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "300m",
+            "Ethernet4": "5m",
+            "Ethernet6": "300m",
+            "Ethernet8": "5m",
+            "Ethernet10": "300m",
+            "Ethernet12": "5m",
+            "Ethernet14": "300m",
+            "Ethernet16": "5m",
+            "Ethernet18": "300m",
+            "Ethernet20": "5m",
+            "Ethernet22": "300m",
+            "Ethernet24": "40m",
+            "Ethernet28": "40m",
+            "Ethernet32": "40m",
+            "Ethernet36": "40m",
+            "Ethernet40": "5m",
+            "Ethernet42": "300m",
+            "Ethernet44": "5m",
+            "Ethernet46": "300m",
+            "Ethernet48": "5m",
+            "Ethernet50": "300m",
+            "Ethernet52": "5m",
+            "Ethernet54": "300m",
+            "Ethernet56": "5m",
+            "Ethernet58": "300m",
+            "Ethernet60": "5m",
+            "Ethernet62": "300m",
+            "Ethernet64": "5m",
+            "Ethernet66": "300m",
+            "Ethernet68": "5m",
+            "Ethernet70": "300m",
+            "Ethernet72": "5m",
+            "Ethernet74": "300m",
+            "Ethernet76": "5m",
+            "Ethernet78": "300m",
+            "Ethernet80": "5m",
+            "Ethernet82": "300m",
+            "Ethernet84": "5m",
+            "Ethernet86": "300m",
+            "Ethernet88": "40m",
+            "Ethernet92": "40m",
+            "Ethernet96": "40m",
+            "Ethernet100": "40m",
+            "Ethernet104": "5m",
+            "Ethernet106": "300m",
+            "Ethernet108": "5m",
+            "Ethernet110": "300m",
+            "Ethernet112": "5m",
+            "Ethernet114": "300m",
+            "Ethernet116": "5m",
+            "Ethernet118": "300m",
+            "Ethernet120": "5m",
+            "Ethernet122": "300m",
+            "Ethernet124": "5m",
+            "Ethernet126": "300m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32689152",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "2058240"
+        },
+        "egress_lossy_pool": {
+            "size": "24192256",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32340992",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32340992"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
new file mode 100644
index 000000000000..55da03e62549
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
@@ -0,0 +1,536 @@
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "300m",
+            "Ethernet4": "5m",
+            "Ethernet6": "300m",
+            "Ethernet8": "5m",
+            "Ethernet10": "300m",
+            "Ethernet12": "5m",
+            "Ethernet14": "300m",
+            "Ethernet16": "5m",
+            "Ethernet18": "300m",
+            "Ethernet20": "5m",
+            "Ethernet22": "300m",
+            "Ethernet24": "40m",
+            "Ethernet28": "40m",
+            "Ethernet32": "40m",
+            "Ethernet36": "40m",
+            "Ethernet40": "5m",
+            "Ethernet42": "300m",
+            "Ethernet44": "5m",
+            "Ethernet46": "300m",
+            "Ethernet48": "5m",
+            "Ethernet50": "300m",
+            "Ethernet52": "5m",
+            "Ethernet54": "300m",
+            "Ethernet56": "5m",
+            "Ethernet58": "300m",
+            "Ethernet60": "5m",
+            "Ethernet62": "300m",
+            "Ethernet64": "5m",
+            "Ethernet66": "300m",
+            "Ethernet68": "5m",
+            "Ethernet70": "300m",
+            "Ethernet72": "5m",
+            "Ethernet74": "300m",
+            "Ethernet76": "5m",
+            "Ethernet78": "300m",
+            "Ethernet80": "5m",
+            "Ethernet82": "300m",
+            "Ethernet84": "5m",
+            "Ethernet86": "300m",
+            "Ethernet88": "40m",
+            "Ethernet92": "40m",
+            "Ethernet96": "40m",
+            "Ethernet100": "40m",
+            "Ethernet104": "5m",
+            "Ethernet106": "300m",
+            "Ethernet108": "5m",
+            "Ethernet110": "300m",
+            "Ethernet112": "5m",
+            "Ethernet114": "300m",
+            "Ethernet116": "5m",
+            "Ethernet118": "300m",
+            "Ethernet120": "5m",
+            "Ethernet122": "300m",
+            "Ethernet124": "5m",
+            "Ethernet126": "300m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32689152",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "2058240"
+        },
+        "egress_lossy_pool": {
+            "size": "24192256",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32340992",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32340992"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet24|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json
new file mode 100644
index 000000000000..1d9a90cdb13f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json
@@ -0,0 +1,938 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "5m",
+            "Ethernet4": "5m",
+            "Ethernet6": "5m",
+            "Ethernet8": "5m",
+            "Ethernet10": "5m",
+            "Ethernet12": "5m",
+            "Ethernet14": "5m",
+            "Ethernet16": "5m",
+            "Ethernet18": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet24": "5m",
+            "Ethernet26": "5m",
+            "Ethernet28": "5m",
+            "Ethernet30": "5m",
+            "Ethernet32": "5m",
+            "Ethernet34": "5m",
+            "Ethernet36": "5m",
+            "Ethernet38": "5m",
+            "Ethernet40": "5m",
+            "Ethernet42": "5m",
+            "Ethernet44": "5m",
+            "Ethernet46": "5m",
+            "Ethernet48": "40m",
+            "Ethernet52": "40m",
+            "Ethernet56": "40m",
+            "Ethernet60": "40m",
+            "Ethernet64": "40m",
+            "Ethernet68": "40m",
+            "Ethernet72": "40m",
+            "Ethernet76": "40m",
+            "Ethernet80": "5m",
+            "Ethernet82": "5m",
+            "Ethernet84": "5m",
+            "Ethernet86": "5m",
+            "Ethernet88": "5m",
+            "Ethernet90": "5m",
+            "Ethernet92": "5m",
+            "Ethernet94": "5m",
+            "Ethernet96": "5m",
+            "Ethernet98": "5m",
+            "Ethernet100": "5m",
+            "Ethernet102": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet108": "5m",
+            "Ethernet110": "5m",
+            "Ethernet112": "5m",
+            "Ethernet114": "5m",
+            "Ethernet116": "5m",
+            "Ethernet118": "5m",
+            "Ethernet120": "5m",
+            "Ethernet122": "5m",
+            "Ethernet124": "5m",
+            "Ethernet126": "5m",
+            "Ethernet128": "5m",
+            "Ethernet130": "5m",
+            "Ethernet132": "5m",
+            "Ethernet134": "5m",
+            "Ethernet136": "5m",
+            "Ethernet138": "5m",
+            "Ethernet140": "5m",
+            "Ethernet142": "5m",
+            "Ethernet144": "5m",
+            "Ethernet146": "5m",
+            "Ethernet148": "5m",
+            "Ethernet150": "5m",
+            "Ethernet152": "5m",
+            "Ethernet154": "5m",
+            "Ethernet156": "5m",
+            "Ethernet158": "5m",
+            "Ethernet160": "5m",
+            "Ethernet162": "5m",
+            "Ethernet164": "5m",
+            "Ethernet166": "5m",
+            "Ethernet168": "5m",
+            "Ethernet170": "5m",
+            "Ethernet172": "5m",
+            "Ethernet174": "5m",
+            "Ethernet176": "5m",
+            "Ethernet178": "5m",
+            "Ethernet180": "5m",
+            "Ethernet182": "5m",
+            "Ethernet184": "5m",
+            "Ethernet186": "5m",
+            "Ethernet188": "5m",
+            "Ethernet190": "5m",
+            "Ethernet192": "5m",
+            "Ethernet194": "5m",
+            "Ethernet196": "5m",
+            "Ethernet198": "5m",
+            "Ethernet200": "5m",
+            "Ethernet202": "5m",
+            "Ethernet204": "5m",
+            "Ethernet206": "5m",
+            "Ethernet208": "5m",
+            "Ethernet210": "5m",
+            "Ethernet212": "5m",
+            "Ethernet214": "5m",
+            "Ethernet216": "5m",
+            "Ethernet218": "5m",
+            "Ethernet220": "5m",
+            "Ethernet222": "5m",
+            "Ethernet224": "5m",
+            "Ethernet226": "5m",
+            "Ethernet228": "5m",
+            "Ethernet230": "5m",
+            "Ethernet232": "5m",
+            "Ethernet234": "5m",
+            "Ethernet236": "5m",
+            "Ethernet238": "5m",
+            "Ethernet240": "5m",
+            "Ethernet242": "5m",
+            "Ethernet244": "5m",
+            "Ethernet246": "5m",
+            "Ethernet248": "5m",
+            "Ethernet250": "5m",
+            "Ethernet252": "5m",
+            "Ethernet254": "5m",
+            "Ethernet256": "5m",
+            "Ethernet260": "5m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
new file mode 100644
index 000000000000..d35a0975339b
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
@@ -0,0 +1,986 @@
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "5m",
+            "Ethernet4": "5m",
+            "Ethernet6": "5m",
+            "Ethernet8": "5m",
+            "Ethernet10": "5m",
+            "Ethernet12": "5m",
+            "Ethernet14": "5m",
+            "Ethernet16": "5m",
+            "Ethernet18": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet24": "5m",
+            "Ethernet26": "5m",
+            "Ethernet28": "5m",
+            "Ethernet30": "5m",
+            "Ethernet32": "5m",
+            "Ethernet34": "5m",
+            "Ethernet36": "5m",
+            "Ethernet38": "5m",
+            "Ethernet40": "5m",
+            "Ethernet42": "5m",
+            "Ethernet44": "5m",
+            "Ethernet46": "5m",
+            "Ethernet48": "40m",
+            "Ethernet52": "40m",
+            "Ethernet56": "40m",
+            "Ethernet60": "40m",
+            "Ethernet64": "40m",
+            "Ethernet68": "40m",
+            "Ethernet72": "40m",
+            "Ethernet76": "40m",
+            "Ethernet80": "5m",
+            "Ethernet82": "5m",
+            "Ethernet84": "5m",
+            "Ethernet86": "5m",
+            "Ethernet88": "5m",
+            "Ethernet90": "5m",
+            "Ethernet92": "5m",
+            "Ethernet94": "5m",
+            "Ethernet96": "5m",
+            "Ethernet98": "5m",
+            "Ethernet100": "5m",
+            "Ethernet102": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet108": "5m",
+            "Ethernet110": "5m",
+            "Ethernet112": "5m",
+            "Ethernet114": "5m",
+            "Ethernet116": "5m",
+            "Ethernet118": "5m",
+            "Ethernet120": "5m",
+            "Ethernet122": "5m",
+            "Ethernet124": "5m",
+            "Ethernet126": "5m",
+            "Ethernet128": "5m",
+            "Ethernet130": "5m",
+            "Ethernet132": "5m",
+            "Ethernet134": "5m",
+            "Ethernet136": "5m",
+            "Ethernet138": "5m",
+            "Ethernet140": "5m",
+            "Ethernet142": "5m",
+            "Ethernet144": "5m",
+            "Ethernet146": "5m",
+            "Ethernet148": "5m",
+            "Ethernet150": "5m",
+            "Ethernet152": "5m",
+            "Ethernet154": "5m",
+            "Ethernet156": "5m",
+            "Ethernet158": "5m",
+            "Ethernet160": "5m",
+            "Ethernet162": "5m",
+            "Ethernet164": "5m",
+            "Ethernet166": "5m",
+            "Ethernet168": "5m",
+            "Ethernet170": "5m",
+            "Ethernet172": "5m",
+            "Ethernet174": "5m",
+            "Ethernet176": "5m",
+            "Ethernet178": "5m",
+            "Ethernet180": "5m",
+            "Ethernet182": "5m",
+            "Ethernet184": "5m",
+            "Ethernet186": "5m",
+            "Ethernet188": "5m",
+            "Ethernet190": "5m",
+            "Ethernet192": "5m",
+            "Ethernet194": "5m",
+            "Ethernet196": "5m",
+            "Ethernet198": "5m",
+            "Ethernet200": "5m",
+            "Ethernet202": "5m",
+            "Ethernet204": "5m",
+            "Ethernet206": "5m",
+            "Ethernet208": "5m",
+            "Ethernet210": "5m",
+            "Ethernet212": "5m",
+            "Ethernet214": "5m",
+            "Ethernet216": "5m",
+            "Ethernet218": "5m",
+            "Ethernet220": "5m",
+            "Ethernet222": "5m",
+            "Ethernet224": "5m",
+            "Ethernet226": "5m",
+            "Ethernet228": "5m",
+            "Ethernet230": "5m",
+            "Ethernet232": "5m",
+            "Ethernet234": "5m",
+            "Ethernet236": "5m",
+            "Ethernet238": "5m",
+            "Ethernet240": "5m",
+            "Ethernet242": "5m",
+            "Ethernet244": "5m",
+            "Ethernet246": "5m",
+            "Ethernet248": "5m",
+            "Ethernet250": "5m",
+            "Ethernet252": "5m",
+            "Ethernet254": "5m",
+            "Ethernet256": "5m",
+            "Ethernet260": "5m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet48|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet128|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet132|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet140|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet160|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet164|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet172|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet192|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet196|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet204|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet224|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet228|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet236|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json
new file mode 100644
index 000000000000..344a2e74abd1
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json
@@ -0,0 +1,450 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "300m",
+            "Ethernet12": "300m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "300m",
+            "Ethernet28": "300m",
+            "Ethernet32": "300m",
+            "Ethernet36": "300m",
+            "Ethernet40": "300m",
+            "Ethernet44": "300m",
+            "Ethernet48": "300m",
+            "Ethernet52": "300m",
+            "Ethernet56": "300m",
+            "Ethernet60": "300m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "300m",
+            "Ethernet76": "300m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "300m",
+            "Ethernet92": "300m",
+            "Ethernet96": "300m",
+            "Ethernet100": "300m",
+            "Ethernet104": "300m",
+            "Ethernet108": "300m",
+            "Ethernet112": "300m",
+            "Ethernet116": "300m",
+            "Ethernet120": "300m",
+            "Ethernet124": "300m",
+            "Ethernet128": "300m",
+            "Ethernet132": "300m",
+            "Ethernet136": "40m",
+            "Ethernet140": "300m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "300m",
+            "Ethernet164": "300m",
+            "Ethernet168": "40m",
+            "Ethernet172": "300m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "300m",
+            "Ethernet196": "300m",
+            "Ethernet200": "40m",
+            "Ethernet204": "300m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "300m",
+            "Ethernet228": "300m",
+            "Ethernet232": "40m",
+            "Ethernet236": "300m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m",
+            "Ethernet256": "300m",
+            "Ethernet260": "300m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+                        "size": "33582016",
+            "type": "ingress",
+            "mode": "dynamic",
+                        "xoff": "8965632"
+        },
+        "egress_lossy_pool": {
+                        "size": "26866112",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+                        "size": "43481152",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+                        "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+                        "static_th":"43481152"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
new file mode 100644
index 000000000000..a6e976507bbc
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
@@ -0,0 +1,570 @@
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "300m",
+            "Ethernet12": "300m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "300m",
+            "Ethernet28": "300m",
+            "Ethernet32": "300m",
+            "Ethernet36": "300m",
+            "Ethernet40": "300m",
+            "Ethernet44": "300m",
+            "Ethernet48": "300m",
+            "Ethernet52": "300m",
+            "Ethernet56": "300m",
+            "Ethernet60": "300m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "300m",
+            "Ethernet76": "300m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "300m",
+            "Ethernet92": "300m",
+            "Ethernet96": "300m",
+            "Ethernet100": "300m",
+            "Ethernet104": "300m",
+            "Ethernet108": "300m",
+            "Ethernet112": "300m",
+            "Ethernet116": "300m",
+            "Ethernet120": "300m",
+            "Ethernet124": "300m",
+            "Ethernet128": "300m",
+            "Ethernet132": "300m",
+            "Ethernet136": "40m",
+            "Ethernet140": "300m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "300m",
+            "Ethernet164": "300m",
+            "Ethernet168": "40m",
+            "Ethernet172": "300m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "300m",
+            "Ethernet196": "300m",
+            "Ethernet200": "40m",
+            "Ethernet204": "300m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "300m",
+            "Ethernet228": "300m",
+            "Ethernet232": "40m",
+            "Ethernet236": "300m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m",
+            "Ethernet256": "300m",
+            "Ethernet260": "300m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+                        "size": "33582016",
+            "type": "ingress",
+            "mode": "dynamic",
+                        "xoff": "8965632"
+        },
+        "egress_lossy_pool": {
+                        "size": "26866112",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+                        "size": "43481152",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"43481152"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet136|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet136|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|0-1": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 88bb4730314f..61f55ed1e865 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -311,6 +311,49 @@ def test_buffers_mellanox2410_render_template(self):
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
+    def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer_template, expected):
+        dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
+        buffers_file = os.path.join(dir_path, buffer_template)
+        port_config_ini_file = os.path.join(dir_path, 'port_config.ini')
+
+        # copy buffers_config.j2 to the SKU directory to have all templates in one directory
+        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
+        shutil.copy2(buffers_config_file, dir_path)
+
+        minigraph = os.path.join(self.test_dir, minigraph)
+        argument = '-m ' + minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
+        self.run_script(argument)
+
+        # cleanup
+        buffers_config_file_new = os.path.join(dir_path, 'buffers_config.j2')
+        os.remove(buffers_config_file_new)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, expected)
+        assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
+
+    def test_extra_lossless_buffer_for_tunnel_remapping(self):
+        if utils.PYvX_DIR != 'py3':
+            # Skip on python2 as the change will not be backported to previous version
+            return
+          
+        TEST_DATA = [
+            # (vendor, platform, sku, minigraph, buffer_template, sample_output )
+            ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor.json'),
+            ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor-remap-disabled.json'),
+            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor.json'),
+            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor-remap-disabled.json'),
+            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-t1.json'),
+            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-t1-remap-disabled.json')
+        ]
+
+        for test_data in TEST_DATA:
+            self._test_buffers_render_template(vendor=test_data[0],
+                                                platform=test_data[1],
+                                                sku=test_data[2],
+                                                minigraph=test_data[3],
+                                                buffer_template=test_data[4],
+                                                expected=test_data[5])
+
     def test_qos_dscp_remapping_render_template(self):
         if utils.PYvX_DIR != 'py3':
             # Skip on python2 as the change will not be backported to previous version

From f555a4a0a01180d88fa1234a81cb06cb0e437355 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Sun, 5 Jun 2022 08:08:36 -0700
Subject: [PATCH 1217/1674] [Tunnel PFC] Add property for tunnel PFC (#10962)

* [Tunnel PFC] Add property for tunnel PFC

Replace the config.bcm file with j2 template file
- Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local
- Host subtype is 'dualtor'
- Change sai.profile foe the new config.bcm.j2
---
 ...td3-a7050cx3-32s-32x100G.config.bcm => config.bcm.j2} | 9 +++++++++
 .../Arista-7050CX3-32S-C32/sai.profile                   | 2 +-
 ...050cx3-32s-48x50G+8x100G.config.bcm => config.bcm.j2} | 9 +++++++++
 .../Arista-7050CX3-32S-D48C8/sai.profile                 | 2 +-
 .../Arista-7260CX3-C64/config.bcm.j2                     | 3 +++
 .../Arista-7260CX3-D108C8/config.bcm.j2                  | 5 ++++-
 .../Arista-7260CX3-Q64/config.bcm.j2                     | 3 +++
 7 files changed, 30 insertions(+), 3 deletions(-)
 rename device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/{td3-a7050cx3-32s-32x100G.config.bcm => config.bcm.j2} (97%)
 rename device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/{td3-a7050cx3-32s-48x50G+8x100G.config.bcm => config.bcm.j2} (97%)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
similarity index 97%
rename from device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
rename to device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
index e11d3a9c9512..d6bb753f3e98 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
@@ -1,7 +1,16 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-     endif %}
+{%- endif %}
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 sai_verify_incoming_chksum=0
+{{ map_prio }}
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
index 7d96f190de73..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-32x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
similarity index 97%
rename from device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
rename to device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
index a268ddfd0f18..26ce93bcdda1 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
@@ -1,7 +1,16 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-     endif %}
+{%- endif %}
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
 sai_verify_incoming_chksum=0
+{{ map_prio }}
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
index 1865041f8d9f..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 7a4ca232ccd8..6c8c30e5f072 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -1,6 +1,7 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
 {%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
 {%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,6 +16,7 @@
                                    sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
+{%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
@@ -22,6 +24,7 @@
 
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 6758cca35237..d8276018be94 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -1,17 +1,20 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
-                               l3_ecmp_levels=2' -%}
+                               l3_ecmp_levels=2' -%} -%}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index 10d4edfff1b0..09cc7988b56d 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -1,6 +1,7 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
 {%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
 {%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,12 +16,14 @@
                                    sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
+{%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2

From 21f14dc6eaa50c31eb6df12b8064740ad27cbdc5 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Sun, 5 Jun 2022 22:20:26 -0700
Subject: [PATCH 1218/1674] [qos]: Adjust 7260 buffer sizes to accomodate extra
 lossless queues (#11018)

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2             | 8 ++++++--
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2             | 8 ++++++--
 .../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2           | 8 ++++++++
 .../Arista-7260CX3-C64/buffers_pool_sizes_t1.j2           | 8 ++++++++
 .../Arista-7260CX3-D108C8/buffers_defaults_t0.j2          | 8 ++++++--
 .../Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2        | 1 +
 .../Arista-7260CX3-Q64/buffers_defaults_t0.j2             | 8 ++++++--
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2             | 8 ++++++--
 .../Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2           | 1 +
 9 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
index 76f9568a079c..49b578cd28fa 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index 6c375508a3ba..f44d664e9d3f 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -7,11 +7,15 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             {# SS Tab2 Row 71 #}
-            "size": "33582016",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             {# SS Tab2 Row 68 #}
@@ -19,7 +23,7 @@
         },
         "egress_lossy_pool": {
             {# SS Tab2 Row 60 #}
-            "size": "26866112",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
new file mode 100644
index 000000000000..bd82c947e4fc
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
@@ -0,0 +1,8 @@
+{%- set ingress_lossless_pool_size = '33329088' %}
+{%- set egress_lossy_pool_size = '26663272' %}
+
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
+((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
+    {%- set ingress_lossless_pool_size = '33169344' %}
+    {%- set egress_lossy_pool_size = '26535808' %}
+{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
new file mode 100644
index 000000000000..43b31de8ad43
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
@@ -0,0 +1,8 @@
+{%- set ingress_lossless_pool_size = '33582016' %}
+{%- set egress_lossy_pool_size = '26866112' %}
+
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
+((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('type' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter')) %}
+    {%- set ingress_lossless_pool_size = '33262528' %}
+    {%- set egress_lossy_pool_size = '26610688' %}
+{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
index 6bd66fac8b92..a40676be13bc 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -15,16 +15,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
new file mode 120000
index 000000000000..72e16a608268
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
index 76f9568a079c..49b578cd28fa 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
index 590fee57b89c..b5c34daa45d0 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
new file mode 120000
index 000000000000..72e16a608268
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file

From 693bc5faae11ce578e36f45434861fcb1e24d3c1 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Mon, 6 Jun 2022 06:30:24 -0700
Subject: [PATCH 1219/1674] Revert "[qos]: Adjust 7260 buffer sizes to
 accomodate extra lossless queues (#11018)"

This reverts commit 21f14dc6eaa50c31eb6df12b8064740ad27cbdc5.

unit test needs to be cherry-picked.
---
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2             | 8 ++------
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2             | 8 ++------
 .../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2           | 8 --------
 .../Arista-7260CX3-C64/buffers_pool_sizes_t1.j2           | 8 --------
 .../Arista-7260CX3-D108C8/buffers_defaults_t0.j2          | 8 ++------
 .../Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2        | 1 -
 .../Arista-7260CX3-Q64/buffers_defaults_t0.j2             | 8 ++------
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2             | 8 ++------
 .../Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2           | 1 -
 9 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
 delete mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
 delete mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
index 49b578cd28fa..76f9568a079c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index f44d664e9d3f..6c375508a3ba 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -7,15 +7,11 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             {# SS Tab2 Row 71 #}
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33582016",
             "type": "ingress",
             "mode": "dynamic",
             {# SS Tab2 Row 68 #}
@@ -23,7 +19,7 @@
         },
         "egress_lossy_pool": {
             {# SS Tab2 Row 60 #}
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26866112",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
deleted file mode 100644
index bd82c947e4fc..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- set ingress_lossless_pool_size = '33329088' %}
-{%- set egress_lossy_pool_size = '26663272' %}
-
-{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
-((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
-    {%- set ingress_lossless_pool_size = '33169344' %}
-    {%- set egress_lossy_pool_size = '26535808' %}
-{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
deleted file mode 100644
index 43b31de8ad43..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- set ingress_lossless_pool_size = '33582016' %}
-{%- set egress_lossy_pool_size = '26866112' %}
-
-{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
-((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('type' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter')) %}
-    {%- set ingress_lossless_pool_size = '33262528' %}
-    {%- set egress_lossy_pool_size = '26610688' %}
-{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
index a40676be13bc..6bd66fac8b92 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -15,20 +15,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
deleted file mode 120000
index 72e16a608268..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
+++ /dev/null
@@ -1 +0,0 @@
-../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
index 49b578cd28fa..76f9568a079c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
index b5c34daa45d0..590fee57b89c 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
deleted file mode 120000
index 72e16a608268..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
+++ /dev/null
@@ -1 +0,0 @@
-../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file

From 7242722bcec6f16788152ca4a841944ef47f9cbd Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Tue, 7 Jun 2022 00:52:31 +0800
Subject: [PATCH 1220/1674] [submodule]: update sonic-swss (#11034)

This PR is to advance sonic-swss submodule for 202012 branch.
Changes include

eef993f [202012][cherry-pick]Update orchagent to support new field pfcwd_sw_enable (#2302)
ab675b3 [202012][cherry-pick] Support tunnel traffic QoS remapping (#2246)

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 903d594619f4..eef993fe9eab 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 903d594619f424c7dabffbfb4037c8ccbe13cb89
+Subproject commit eef993fe9eab414e14cba1bfa561ddc3d27dd874

From 8f3edde302aa03fb4615c8263c64dccd5161a581 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Mon, 6 Jun 2022 09:54:00 -0700
Subject: [PATCH 1221/1674] [202012][BRCM SAI 4.3.5.3-5] Update saibcm for pcbb
 feature (#10998)

Support Tunnel PFC/pcbb feature on Broadcom platform.

How to verify it
Tested build target, successful

make target/docker-syncd-brcm.gz
manual run those tests after installing sai binary within image 20201231.67 on 7050CX3 (TD3) T0 DUT, all passed

     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     fdb/test_fdb.py
     decap/test_decap.py
     pfcwd/test_pfcwd_all_port_storm.py
     acl/null_route/test_null_route_helper.py
     acl/test_acl.py
     vlan/test_vlan.py
     platform_tests/test_reboot.py

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6796420065ba..ba913c0d33cf 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -51,6 +51,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index a89e855f64f1..5efc4d739ee1 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.3-3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.5.3-5_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-5_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a442391c7d613a8be380da81de7886bba1cf6c80 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:26:46 +0800
Subject: [PATCH 1222/1674] Update cisco-8000 ref to release: 202012-v0.97
 (#11038)

Important fixes since 202012-v0.97:
V0.102:
Hwsku changes to Cisco-8102-C64
Fix for watermark clear issue
V0.101:
Fix for dhcp_relay test issue
V0.100:
Fix for container_autorestart test issue
V0.99:
Fix for everflow test issue
Fix for pfcwd test issue
Fix for copp test issue
V0.98:
Fix for qos_sai test issue
RDMA enhancements dev complete and content included in this drop (flow based VoQ, ECN, Alpha)

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 1508065f1a73..dd9bdcd725ef 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.97
+ref=202012-v0.102

From 05884d1182f7ebb3c453b38aec8e88aea118b4fd Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:41:27 +0800
Subject: [PATCH 1223/1674] [202012][submodule] Advance `sonic-utilities`
 submodule (#11044)

* Update submodule sonic-utilities

Signed-off-by: bingwang <bingwang@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 2a9aea65f0af..74bf9513e7d2 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 2a9aea65f0afdae659f23131dfda7ed2da0e2d3a
+Subproject commit 74bf9513e7d27b771004bb94526d8070a9158f40

From 2faabf43eb9bc449936009641ac2d11c63286160 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:43:04 +0800
Subject: [PATCH 1224/1674] [202012] Automatically generate extra attributes
 for tunnel qos remapping (#11045)

* Automatically generate extra attributes for tunnel qos remapping

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 src/sonic-config-engine/minigraph.py          |  14 +
 ...ase-remap-enabled-no-tunnel-attributes.xml | 894 ++++++++++++++++++
 ...simple-sample-graph-case-remap-enabled.xml |   2 +-
 .../tests/test_minigraph_case.py              |  19 +-
 4 files changed, 923 insertions(+), 6 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index e230e867969f..f8338c9c9606 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1652,13 +1652,27 @@ def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tu
             break
 
     tunnels = {}
+
+    default_qos_map_for_mux_tunnel = {
+        "decap_dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE_TUNNEL]",
+        "decap_tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE_TUNNEL]",
+        "encap_tc_to_dscp_map": "[TC_TO_DSCP_MAP|AZURE_TUNNEL]",
+        "encap_tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE_TUNNEL]"
+    }
+
     for type, tunnel_dict in tunnel_intfs.items():
         for tunnel_key, tunnel_attr in tunnel_dict.items():
             tunnel_attr['dst_ip'] = lo_addr
             if (tunnel_qos_remap.get('status') == 'enabled') and (mux_tunnel_name == tunnel_key) and (peer_switch_ip is not None):
                 tunnel_attr['src_ip'] = peer_switch_ip
+                # The DSCP mode must be pipe if remap is enabled
+                tunnel_attr['dscp_mode'] = "pipe"
                 if tunnel_key in tunnel_intfs_qos_remap_config[type]:
                     tunnel_attr.update(tunnel_intfs_qos_remap_config[type][tunnel_key].items())
+                # Use default value if qos remap attribute is missing
+                for k, v in default_qos_map_for_mux_tunnel.items():
+                    if k not in tunnel_attr:
+                        tunnel_attr[k] = v
 
             tunnels[tunnel_key] = tunnel_attr
     return tunnels
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml
new file mode 100644
index 000000000000..6c83f37fd93f
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml
@@ -0,0 +1,894 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <TunnelInterfaces>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe"/>
+      </TunnelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress>00:aa:bb:cc:dd:ee</MacAddress>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <DhcpRelays>192.0.0.1</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <MacAddress i:nil="true"/>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>PortChannel01</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN_DSCP</AttachTo>
+          <InAcl>Everflow_dscp</InAcl>
+          <Type>Everflow_dscp</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>console</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t1</StartDevice>
+        <StartPort>1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceSerialLink">
+        <ElementType>DeviceSerialLink</ElementType>
+        <Bandwidth>9600</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>managed_device</StartDevice>
+        <StartPort>console</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/0</EndPort>
+        <StartDevice>switch-01t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/12</EndPort>
+        <StartDevice>switch-02t1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>25000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <StartDevice>server1</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>40000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <StartDevice>server2</StartDevice>
+        <StartPort>port1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>L</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>10000</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/8</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>mux-cable</StartDevice>
+        <StartPort>U</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="LogicalLink">
+        <ElementType>LogicalLink</ElementType>
+        <Bandwidth>0</Bandwidth>
+        <ChassisInternal>false</ChassisInternal>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>MuxTunnel0</EndPort>
+        <FlowControl>false</FlowControl>
+        <StartDevice>switch2-t0</StartDevice>
+        <StartPort>MuxTunnel0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution" i:type="a:ToRRouter">
+        <ElementType>ToRRouter</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>26.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="ToRRouter">
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>25.1.1.10/32</d5p1:IPPrefix>
+        </Address>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress>
+        <Hostname>switch2-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>switch-01t1</Hostname>
+        <Address xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.1.0.186/32</a:IPPrefix>
+        </Address>
+        <DeploymentId>2</DeploymentId>
+        <DeviceLocation i:nil="true"/>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+          <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
+        </ManagementAddress> 
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.1/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0001/80</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.1/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server1</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+      <Device i:type="Server">
+        <ElementType>Server</ElementType>
+        <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.10.10.2/32</d5p1:IPPrefix>
+        </Address>
+        <AddressV6 xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>fe80::0002/128</d5p1:IPPrefix>
+        </AddressV6>
+        <ManagementAddress xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
+          <d5p1:IPPrefix>10.0.0.2/32</d5p1:IPPrefix>
+        </ManagementAddress>
+        <Hostname>server2</Hostname>
+        <HwSku>server-sku</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+<LinkMetadataDeclaration>
+  <Link xmlns:d3p1="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true" />
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>GeminiPeeringLink</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>UpperTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>LowerTOR</d3p1:Name>
+          <d3p1:Reference i:nil="true" />
+          <d3p1:Value>switch2-t0</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch2-t0:MuxTunnel0;switch-t0:MuxTunnel0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-01t1:port1;switch-t0:fortyGigE0/0</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>switch-02t1:port1;switch-t0:fortyGigE0/12</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server1:port1;switch-t0:fortyGigE0/4</d3p1:Key>
+    </d3p1:LinkMetadata>
+    <d3p1:LinkMetadata>
+      <d3p1:Name i:nil="true"/>
+      <d3p1:Properties>
+        <d3p1:DeviceProperty>
+          <d3p1:Name>AutoNegotiation</d3p1:Name>
+          <d3p1:Reference i:nil="true"/>
+          <d3p1:Value>True</d3p1:Value>
+        </d3p1:DeviceProperty>
+      </d3p1:Properties>
+      <d3p1:Key>server2:port1;switch-t0:fortyGigE0/8</d3p1:Key>
+    </d3p1:LinkMetadata>
+  </Link>
+</LinkMetadataDeclaration>
+<MetadataDeclaration>
+ <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+  <a:DeviceMetadata>
+   <a:Name>switch-t0</a:Name>
+   <a:Properties>
+    <a:DeviceProperty>
+     <a:Name>DeploymentId</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ErspanDestinationIpv4</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.100.1</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>NtpResources</a:Name>
+     <a:Value>
+      10.0.10.1;10.0.10.2
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SnmpResources</a:Name>
+     <a:Value>
+      10.0.10.3;10.0.10.4
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>SyslogResources</a:Name>
+     <a:Value>
+      10.0.10.5;10.0.10.6
+     </a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>TacacsServer</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.0.10.7;10.0.10.8</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesEnabled</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>0</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>KubernetesServerIp</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>10.10.10.10</a:Value>
+    </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>ResourceType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Storage</a:Value>
+    </a:DeviceProperty>
+  </a:Properties>
+  </a:DeviceMetadata>
+ </Devices>
+ <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+</MetadataDeclaration>
+<SystemDefaultsDeclaration>
+  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+    <a:SystemDefault>
+      <a:Name>TunnelQosRemapEnabled</a:Name>
+      <a:Value>True</a:Value>
+    </a:SystemDefault>
+  </a:SystemDefaults>
+</SystemDefaultsDeclaration>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/124</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <EnableFlowControl>true</EnableFlowControl>
+	  <Index>1</Index>
+	  <InterfaceName>eth0</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>eth0</PortName>
+	  <Speed>1000</Speed>
+	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
index d38f77774e9f..1a49e716805d 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
@@ -127,7 +127,7 @@
         </PortChannel>
       </PortChannelInterfaces>
       <TunnelInterfaces>
-        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="uniform" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" DecapDscpToTcMap="AZURE_TUNNEL" DecapTcToPgMap="AZURE_TUNNEL" EncapTcToQueueMap="AZURE_TUNNEL" EncapTcToDscpMap="AZURE_TUNNEL"/>
+        <TunnelInterface Name="MuxTunnel0" Type="IPInIP" AttachTo="Loopback0" DifferentiatedServicesCodePointMode="pipe" EcnEncapsulationMode="standard" EcnDecapsulationMode="copy_from_outer" TtlMode="pipe" DecapDscpToTcMap="[DSCP_TO_TC_MAP|AZURE_TUNNEL]" DecapTcToPgMap="[TC_TO_PRIORITY_GROUP_MAP|AZURE_TUNNEL]" EncapTcToQueueMap="[TC_TO_QUEUE_MAP|AZURE_TUNNEL]" EncapTcToDscpMap="[TC_TO_DSCP_MAP|AZURE_TUNNEL]"/>
       </TunnelInterfaces>
       <VlanInterfaces>
         <VlanInterface>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index ab3dc784a0f4..760527479902 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -371,14 +371,14 @@ def test_minigraph_tunnel_table(self):
                 "tunnel_type": "IPINIP",
                 "src_ip": "25.1.1.10",
                 "dst_ip": "10.1.0.32",
-                "dscp_mode": "uniform",
+                "dscp_mode": "pipe",
                 "encap_ecn_mode": "standard",
                 "ecn_mode": "copy_from_outer",
                 "ttl_mode": "pipe",
-                "decap_dscp_to_tc_map": "AZURE_TUNNEL",
-                "decap_tc_to_pg_map": "AZURE_TUNNEL",
-                "encap_tc_to_dscp_map": "AZURE_TUNNEL",
-                "encap_tc_to_queue_map": "AZURE_TUNNEL"
+                "decap_dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE_TUNNEL]",
+                "decap_tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE_TUNNEL]",
+                "encap_tc_to_dscp_map": "[TC_TO_DSCP_MAP|AZURE_TUNNEL]",
+                "encap_tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE_TUNNEL]"
             }
         }
 
@@ -388,6 +388,15 @@ def test_minigraph_tunnel_table(self):
             expected_tunnel
         )
 
+        # Validate extra config for mux tunnel is generated automatically when tunnel_qos_remap = enabled
+        sample_graph_enabled_remap = os.path.join(self.test_dir, 'simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml')
+        argument = '-m "' + sample_graph_enabled_remap + '" -p "' + self.port_config + '" -v "TUNNEL"'
+        output = self.run_script(argument)
+        self.assertEqual(
+            utils.to_dict(output.strip()),
+            expected_tunnel
+        )
+
     def test_minigraph_mux_cable_table(self):
         argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "MUX_CABLE"'
         expected_table = {

From 881796f376e1ef61825570ea2865e097417dc218 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 6 Jun 2022 18:13:16 -0700
Subject: [PATCH 1225/1674] [202012] Adjust 7260 buffer sizes to accomodate
 extra lossless queues (#11050)

Backport changes from #11018

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully
---
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2 |  8 ++++--
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2 |  8 ++++--
 .../buffers_pool_sizes_t0.j2                  |  8 ++++++
 .../buffers_pool_sizes_t1.j2                  |  8 ++++++
 .../buffers_defaults_t0.j2                    |  8 ++++--
 .../buffers_pool_sizes_t0.j2                  |  1 +
 .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 |  8 ++++--
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 |  8 ++++--
 .../buffers_pool_sizes_t0.j2                  |  1 +
 .../py3/buffer-arista7260-dualtor.json        |  4 +--
 .../py3/buffer-arista7260-t1.json             |  8 +++---
 src/sonic-config-engine/tests/test_j2files.py | 27 +++++++++++++++++++
 12 files changed, 81 insertions(+), 16 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
index 76f9568a079c..49b578cd28fa 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index 6c375508a3ba..f44d664e9d3f 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -7,11 +7,15 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             {# SS Tab2 Row 71 #}
-            "size": "33582016",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             {# SS Tab2 Row 68 #}
@@ -19,7 +23,7 @@
         },
         "egress_lossy_pool": {
             {# SS Tab2 Row 60 #}
-            "size": "26866112",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
new file mode 100644
index 000000000000..bd82c947e4fc
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
@@ -0,0 +1,8 @@
+{%- set ingress_lossless_pool_size = '33329088' %}
+{%- set egress_lossy_pool_size = '26663272' %}
+
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
+((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
+    {%- set ingress_lossless_pool_size = '33169344' %}
+    {%- set egress_lossy_pool_size = '26535808' %}
+{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
new file mode 100644
index 000000000000..43b31de8ad43
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
@@ -0,0 +1,8 @@
+{%- set ingress_lossless_pool_size = '33582016' %}
+{%- set egress_lossy_pool_size = '26866112' %}
+
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
+((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('type' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter')) %}
+    {%- set ingress_lossless_pool_size = '33262528' %}
+    {%- set egress_lossy_pool_size = '26610688' %}
+{%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
index 6bd66fac8b92..a40676be13bc 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -15,16 +15,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
new file mode 120000
index 000000000000..72e16a608268
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
index 76f9568a079c..49b578cd28fa 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
index 590fee57b89c..b5c34daa45d0 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -7,16 +7,20 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "{{ egress_lossy_pool_size }}",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
new file mode 120000
index 000000000000..72e16a608268
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
index d35a0975339b..7038bc974ef6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json
@@ -128,13 +128,13 @@
 
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "33329088",
+            "size": "33169344",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "26663272",
+            "size": "26535808",
             "type": "egress",
             "mode": "dynamic"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
index a6e976507bbc..ecaa1a88db48 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
@@ -72,18 +72,18 @@
 
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-                        "size": "33582016",
+            "size": "33262528",
             "type": "ingress",
             "mode": "dynamic",
-                        "xoff": "8965632"
+            "xoff": "8965632"
         },
         "egress_lossy_pool": {
-                        "size": "26866112",
+            "size": "26610688",
             "type": "egress",
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-                        "size": "43481152",
+            "size": "43481152",
             "type": "egress",
             "mode": "static"
         }
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 61f55ed1e865..de95006ae62c 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -44,6 +44,31 @@ def run_script(self, argument):
     def run_diff(self, file1, file2):
         return subprocess.check_output('diff -u {} {} || true'.format(file1, file2), shell=True)
 
+    def create_machine_conf(self, platform, vendor):
+        file_exist = True
+        dir_exist = True
+        mode = {'arista': 'aboot',
+                'dell': 'onie',
+                'mellanox': 'onie'
+               }
+        echo_cmd = "echo '{}_platform={}' | sudo tee -a /host/machine.conf > /dev/null".format(mode[vendor], platform)
+        if not os.path.exists('/host/machine.conf'):
+            file_exist = False
+            if not os.path.isdir('/host'):
+                dir_exist = False
+                os.system('sudo mkdir /host')
+            os.system('sudo touch /host/machine.conf')
+            os.system(echo_cmd)
+
+        return file_exist, dir_exist
+
+    def remove_machine_conf(self, file_exist, dir_exist):
+        if not file_exist:
+            os.system('sudo rm -f /host/machine.conf')
+
+        if not dir_exist:
+            os.system('sudo rmdir /host')
+
     def test_interfaces(self):
         interfaces_template = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'interfaces', 'interfaces.j2')
         argument = '-m ' + self.t0_minigraph + ' -a \'{\"hwaddr\":\"e4:1d:2d:a5:f3:ad\"}\' -t ' + interfaces_template + ' > ' + self.output_file
@@ -312,6 +337,7 @@ def test_buffers_mellanox2410_render_template(self):
         assert filecmp.cmp(sample_output_file, self.output_file)
 
     def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer_template, expected):
+        file_exist, dir_exist = self.create_machine_conf(platform, vendor)
         dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
         buffers_file = os.path.join(dir_path, buffer_template)
         port_config_ini_file = os.path.join(dir_path, 'port_config.ini')
@@ -327,6 +353,7 @@ def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer
         # cleanup
         buffers_config_file_new = os.path.join(dir_path, 'buffers_config.j2')
         os.remove(buffers_config_file_new)
+        self.remove_machine_conf(file_exist, dir_exist)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, expected)
         assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)

From 855ae0491fd3be8f4bb48fef299f1ffc0b89dddb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:42:04 +0800
Subject: [PATCH 1226/1674] [ci/build]: Upgrade SONiC package versions (#11051)

Upgrade SONiC Versions #11051
---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-git     |  9 +++----
 .../build-sonic-slave-buster/versions-web     | 10 ++++---
 .../build-sonic-slave-stretch/versions-web    |  4 +--
 files/build/versions/default/versions-docker  | 20 +++++++-------
 files/build/versions/default/versions-git     | 11 ++++----
 files/build/versions/default/versions-web     |  8 +++---
 .../docker-base-buster/versions-deb-buster    |  2 +-
 .../versions-deb-buster-arm64                 |  2 --
 .../versions-deb-buster-armhf                 |  2 --
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-stretch                      |  4 +--
 .../dockers/docker-ptf/versions-deb-stretch   |  5 ++--
 .../docker-sonic-mgmt-framework/versions-py3  |  4 +--
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 27 ++++++++++++-------
 .../versions-deb-buster-arm64                 |  2 --
 .../versions-deb-buster-armhf                 |  2 --
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 14 +++++-----
 .../versions-deb-stretch-arm64                |  2 --
 .../versions-deb-stretch-armhf                |  2 --
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  6 +++--
 .../host-image/versions-deb-buster-arm64      |  1 +
 .../host-image/versions-deb-buster-armhf      |  1 +
 files/build/versions/host-image/versions-py3  |  2 +-
 31 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 820ac63c17aa..d6d914aaef75 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.3-3
+libsaibcm==4.3.5.3-5
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 89a83090b97e..03f0adfdbc70 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -5,10 +5,9 @@ https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==e5dc111f8c9c646b1fca3f3aabaa00165952b89c
+https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==1c152ecfa0858a5b15aba37e88ca2c833c12ba48
-https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
+https://salsa.debian.org/kernel-team/ethtool/==38a3cce26a7fa6eb74228e3501b7ed19dced6d4b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
-https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 6cf7c52e356b..b9c00aad0b7e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -11,7 +11,11 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:29b908616bc920e58bf384d1e47b91b6cf9188b8==c4189e12deb73c6034209c788c9eb133
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:673f5ee1931bc72a2b3d4ac712a7f7bc541f089b==e813a6e475d01264a4b855c13ff52805
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.debian.tar.xz==91f28470a67782a7891da02cecf23141
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.dsc==ef91f44e2ce3fb083f0997ec25c29bd9
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz==8f897870404c088e4aa7d1c1c58b526b
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz.asc==715c219a524631139bafa8a351cf44e7
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
@@ -29,8 +33,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 12b6e6db137b..26ffd4974b35 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A33%3A39Z&se=2037-03-17T21%3A33%3A00Z&sr=b&sp=r&sig=n5nodstTKbsJLZDjhQYmpFB3rafcYPybsMaici4%2FwfE%3D==cf1693725815b6dc2f4a5c7c48f7088d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-3_amd64.deb?sv=2020-04-08&st=2022-03-16T21%3A31%3A49Z&se=2037-03-17T21%3A31%3A00Z&sr=b&sp=r&sig=6meWjaM%2FMyQRJIigjqs4xc7ZCGotP0S94np26kn9zls%3D==3de43b33c96c355f4b69a911f1e7f926
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 74f93e60efe3..2d69325971ed 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:b0d66f622e901eb093d5f45d758e7165a3499718df3a6648a3b77505f5911a72
-amd64:amd64/debian:stretch==sha256:b532fcd1510511edf92791f7ceb22dde8c26f8252a74bcee1562dc1f8c2fdfe6
-amd64:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
-amd64:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
-arm64:arm64v8/debian:buster==sha256:eb452d289edeabbdeeede8e2e52d0e7f01ba61fcef599f7a3444b64877ea4ae9
-arm64:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
-arm64:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
-armhf:arm32v7/debian:buster==sha256:f827ab5b192e22e2758aa6fe3fa600a0b91f6ba4cc0dda6c14ae0a3339b48bf9
-armhf:debian:buster==sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4
-armhf:debian:stretch==sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6
\ No newline at end of file
+amd64:amd64/debian:buster==sha256:ff2b512c66a78380275b217fd68e81623fc899a7bf9be9bfe16d98188183fcd3
+amd64:amd64/debian:stretch==sha256:fe3d51dd3262e5d9b9584603da59e387619234d95182351e4f493a1e5998f1f0
+amd64:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
+amd64:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
+arm64:arm64v8/debian:buster==sha256:68f1188b21bf0b7fe9c92f3a91262d3093aafe2de76adc7c52012a16960048fc
+arm64:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
+arm64:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
+armhf:arm32v7/debian:buster==sha256:426a61780c005de09eb9c3a08e9bcf292c95bd84514cf2fd1a63e2494bfea194
+armhf:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
+armhf:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 1150db351219..f2bd190399bb 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8d2d507a4974d20d4cac8a8486e31a27aca8b562
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==89b222dba5ea3fd91598e821c0b82797f2e2fa3c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -11,10 +11,9 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
-https://github.com/thom311/libnl==e5dc111f8c9c646b1fca3f3aabaa00165952b89c
+https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==1c152ecfa0858a5b15aba37e88ca2c833c12ba48
-https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
+https://salsa.debian.org/kernel-team/ethtool/==38a3cce26a7fa6eb74228e3501b7ed19dced6d4b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
-https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index ba913c0d33cf..6958654299b0 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -16,7 +16,11 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:29b908616bc920e58bf384d1e47b91b6cf9188b8==c4189e12deb73c6034209c788c9eb133
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:673f5ee1931bc72a2b3d4ac712a7f7bc541f089b==e813a6e475d01264a4b855c13ff52805
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.debian.tar.xz==91f28470a67782a7891da02cecf23141
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.dsc==ef91f44e2ce3fb083f0997ec25c29bd9
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz==8f897870404c088e4aa7d1c1c58b526b
+https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz.asc==715c219a524631139bafa8a351cf44e7
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==6b181b4ad151ab26c7c7738ec8534ed3
@@ -51,8 +55,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index aa80961f34e6..2e406dbd4683 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -64,7 +64,7 @@ python3.7==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
-rsyslog==8.1901.0-1+deb10u1
+rsyslog==8.1901.0-1+deb10u2
 socat==1.7.3.1-2+deb9u1
 vim-common==2:8.1.0875-5+deb10u2
 vim-tiny==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index d2ad57f87814..1f699501031d 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,7 +1,5 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
-libdpkg-perl==1.19.7
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 97d2499d35bf..967b10df80c8 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,7 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-dpkg-dev==1.19.7
 icu-devtools==63.1-6+deb10u3
-libdpkg-perl==1.19.7
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 3f9a96dedc96..0c60fea19868 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.4.24
+regex==2022.6.2
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
index 419933398230..693e19a4a45c 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -3,7 +3,7 @@ build-essential==12.3
 bzip2==1.0.6-8.1
 cpp==4:6.3.0-4
 cpp-6==6.3.0-18+deb9u1
-dpkg-dev==1.18.25
+dpkg-dev==1.18.26
 g++==4:6.3.0-4
 g++-6==6.3.0-18+deb9u1
 gcc==4:6.3.0-4
@@ -14,7 +14,7 @@ libc-dev-bin==2.24-11+deb9u4
 libc6-dev==2.24-11+deb9u4
 libcc1-0==6.3.0-18+deb9u1
 libcilkrts5==6.3.0-18+deb9u1
-libdpkg-perl==1.18.25
+libdpkg-perl==1.18.26
 libexpat1-dev==2.2.0-2+deb9u5
 libgcc-6-dev==6.3.0-18+deb9u1
 libgomp1==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index d5362b298548..57a95df51b52 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -17,7 +17,6 @@ curl==7.52.1-5+deb9u16
 dbus==1.10.32-0+deb9u1
 dirmngr==2.1.18-8~deb9u4
 dmsetup==2:1.02.137-2
-dpkg==1.18.26
 dpkg-dev==1.18.26
 ethtool==1:4.8-1+b1
 exim4==4.89-2+deb9u8
@@ -76,8 +75,8 @@ libfribidi0==0.19.7-1+deb9u2
 libgc1c2==1:7.4.2-8+deb9u1
 libgcc-6-dev==6.3.0-18+deb9u1
 libgdbm3==1.8.3-14
-libglib2.0-0==2.50.3-2+deb9u2
-libglib2.0-data==2.50.3-2+deb9u2
+libglib2.0-0==2.50.3-2+deb9u3
+libglib2.0-data==2.50.3-2+deb9u3
 libgmp10==2:6.1.2+dfsg-1+deb9u1
 libgnutls30==3.5.8-5+deb9u6
 libgomp1==6.3.0-18+deb9u1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 6f89a130a333..fd902f81d4f9 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,10 +12,10 @@ importlib-metadata==4.11.4
 importlib-resources==5.7.1
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.5.1
+jsonschema==4.6.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==3.20.1
+protobuf==4.21.1
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.27.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index feab2e91bb91..d00d0628c9fe 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -16,7 +16,7 @@ libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 7d3cbfa4f0e7..a063e419d184 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.3-3
+libsaibcm==4.3.5.3-5
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index e663b076fd44..62a05ece6439 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -18,7 +18,7 @@ libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
+libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 12f54cec7f67..fb66d2527507 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -5,7 +5,7 @@ libbabeltrace1==1.5.1-1
 libbsd0==0.8.3-1+deb9u1
 libdw1==0.168-1+deb9u1
 libedit2==3.1-20160903-3
-libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-0==2.50.3-2+deb9u3
 libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u5
 libmpdec2==2.4.2-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 75bef487ec56..b6bc329147d5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -31,7 +31,6 @@ binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
 bison==2:3.3.2.dfsg-1
 blt==2.5.3+dfsg-4
-bsd-mailx==8.1.2-0.20180807cvs-1
 bsdmainutils==11.1.2+b1
 build-essential==12.6
 byacc==20140715-1+b1
@@ -50,7 +49,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.4-1
+containerd.io==1.6.6-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -178,6 +177,7 @@ gstreamer1.0-plugins-ugly==1.14.4-1+deb10u1
 gstreamer1.0-x==1.14.4-2+deb10u1
 gtk-update-icon-cache==3.24.5-1
 guile-2.0-libs==2.0.13+1-5.1
+guile-2.2-libs==2.2.4+1-2+deb10u1
 hicolor-icon-theme==0.17-2
 i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
@@ -346,6 +346,7 @@ libcap-ng-dev==0.7.9-2
 libcapstone3==4.0.1+really+3.0.5-1
 libcapture-tiny-perl==0.48-1
 libcarp-clan-perl==6.07-1
+libcbor0==0.5.0+dfsg-2
 libcc1-0==8.3.0-6
 libcdi-api-java==1.2-2
 libcdio18==2.0.0-2
@@ -395,9 +396,9 @@ libconvert-binhex-perl==1.125-1
 libcroco3==0.6.12-3
 libcryptsetup12==2:2.1.0-5+deb10u2
 libcrystalhd3==1:0.0~git20110715.fdd2f19-13
-libcups2==2.2.10-6+deb10u5
+libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
-libcupsimage2==2.2.10-6+deb10u5
+libcupsimage2==2.2.10-6+deb10u6
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl3-nss==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
@@ -484,6 +485,8 @@ libfcgi-perl==0.78-2+b3
 libfdt1==1.4.7-4
 libffi-dev==3.2.1-9
 libfftw3-double3==3.3.8-2
+libfido2-1==1.5.0-2~bpo10+1
+libfido2-dev==1.5.0-2~bpo10+1
 libfile-basedir-perl==0.08-1
 libfile-chdir-perl==0.1008-1
 libfile-desktopentry-perl==0.22-1
@@ -565,6 +568,7 @@ libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u5
 libgs9-common==9.27~dfsg-2+deb10u5
+libgsasl7==1.8.0-8+b2
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u3
 libgssrpc4==1.17-3+deb10u3
@@ -700,6 +704,7 @@ libkrb5-3==1.17-3+deb10u3
 libkrb5-dev==1.17-3+deb10u3
 libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
@@ -712,8 +717,6 @@ libllvm6.0==1:6.0.1-10
 libllvm7==1:7.0.1-8+deb10u2
 liblmdb0==0.9.22-1
 liblocale-gettext-perl==1.07-3+b4
-liblockfile-bin==1.14-1.1
-liblockfile1==1.14-1.1
 liblog-any-adapter-screen-perl==0.140-1
 liblog-any-perl==1.707-1
 liblog4j1.2-java==1.2.17-8+deb10u2
@@ -738,6 +741,7 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
+libmailutils5==1:3.5-4
 libmariadb-dev==1:10.3.34-0+deb10u1
 libmariadb-dev-compat==1:10.3.34-0+deb10u1
 libmariadb3==1:10.3.34-0+deb10u1
@@ -815,6 +819,7 @@ libnpth0==1.6-1
 libnspr4==2:4.20-1
 libnss-systemd==241-7~deb10u8
 libnss3==2:3.42.1-1+deb10u5
+libntlm0==1.5-1+deb10u1
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
 libnumber-compare-perl==0.03-1
@@ -1338,6 +1343,8 @@ lvm2==2.03.02-3
 lynx==2.8.9rel.1-3+deb10u1
 lynx-common==2.8.9rel.1-3+deb10u1
 m4==1.4.18-2
+mailutils==1:3.5-4
+mailutils-common==1:3.5-4
 make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
@@ -1365,9 +1372,9 @@ openjdk-11-jre-headless==11.0.15+10-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
-openssh-client==1:7.9p1-10+deb10u2
-openssh-server==1:7.9p1-10+deb10u2
-openssh-sftp-server==1:7.9p1-10+deb10u2
+openssh-client==1:8.4p1-2~bpo10+1
+openssh-server==1:8.4p1-2~bpo10+1
+openssh-sftp-server==1:8.4p1-2~bpo10+1
 openssl==1.1.1n-0+deb10u2
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
@@ -1632,7 +1639,7 @@ rake==12.3.1-3+deb10u1
 readline-common==7.0-5
 rrdtool==1.7.1-2
 rsync==3.1.3-6
-rsyslog==8.1901.0-1+deb10u1
+rsyslog==8.1901.0-1+deb10u2
 ruby==1:2.5.1
 ruby-all-dev==1:2.5.1
 ruby-asciidoctor==1.5.8-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index f4606d049f9f..c04653adb0f4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -1,6 +1,4 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-dpkg-dev==1.19.7
-libdpkg-perl==1.19.7
 libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 391b7b9342c9..0dbab5ad344e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -1,11 +1,9 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-dpkg-dev==1.19.7
 libclang-6.0-dev==1:6.0.1-10
 libclang-7-dev==1:7.0.1-8+deb10u2
 libclang-common-6.0-dev==1:6.0.1-10
 libclang-dev==1:7.0-47
 libclass-data-inheritable-perl==0.08-3
-libdpkg-perl==1.19.7
 libdrm-etnaviv1==2.4.97-1
 libdrm-exynos1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 28f4abb7eb62..769c8c35f18a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==31140af3cfe21203cd9b48135859654db4d39ca1
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==138bff2823590b3f3db440425bf712392defb7de
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 01a31c6b99f5..bfa13ac00047 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.4.24
+regex==2022.6.2
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 9e3e89f09590..96ba0fd2fcff 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -380,9 +380,9 @@ libcommons-validator-java==1:1.5.1-1
 libconvert-binhex-perl==1.125-1
 libcroco3==0.6.11-3
 libcryptsetup4==2:1.7.3-4
-libcups2==2.2.1-8+deb9u7
+libcups2==2.2.1-8+deb9u8
 libcupsfilters1==1.11.6-3+deb9u1
-libcupsimage2==2.2.1-8+deb9u7
+libcupsimage2==2.2.1-8+deb9u8
 libcurl3==7.52.1-5+deb9u16
 libcurl3-gnutls==7.52.1-5+deb9u16
 libcurl3-nss==7.52.1-5+deb9u16
@@ -492,10 +492,10 @@ libgl1-mesa-dri==13.0.6-1+b2
 libgl1-mesa-glx==13.0.6-1+b2
 libglapi-mesa==13.0.6-1+b2
 libglew2.0==2.0.0-3+b1
-libglib2.0-0==2.50.3-2+deb9u2
-libglib2.0-bin==2.50.3-2+deb9u2
-libglib2.0-data==2.50.3-2+deb9u2
-libglib2.0-dev==2.50.3-2+deb9u2
+libglib2.0-0==2.50.3-2+deb9u3
+libglib2.0-bin==2.50.3-2+deb9u3
+libglib2.0-data==2.50.3-2+deb9u3
+libglib2.0-dev==2.50.3-2+deb9u3
 libglu1-mesa==9.0.0-2.1
 libglu1-mesa-dev==9.0.0-2.1
 libgmp-dev==2:6.1.2+dfsg-1+deb9u1
@@ -595,7 +595,7 @@ libjemalloc-dev==3.6.0-9.1
 libjemalloc1==3.6.0-9.1
 libjetty9-java==9.2.30-0+deb9u2
 libjline-java==1.0-2
-libjpeg62-turbo==1:1.5.1-2+deb9u1
+libjpeg62-turbo==1:1.5.1-2+deb9u2
 libjs-bootstrap==3.3.7+dfsg-2+deb9u2
 libjs-jquery==3.1.1-2+deb9u2
 libjs-jquery-hotkeys==0~20130707+git2d51e3a9+dfsg-2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
index 81aa623ff1b5..00f894c2df08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64
@@ -1,6 +1,4 @@
 docker-ce==18.06.3~ce~3-0~debian
-dpkg-dev==1.18.25
-libdpkg-perl==1.18.25
 libdrm-freedreno1==2.4.74-1
 libdrm-tegra0==2.4.74-1
 libtext-charwidth-perl==0.04-7+b3
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index bbf6bb1785d4..fb64a5239dd9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -1,6 +1,4 @@
 docker-ce==18.06.3~ce~3-0~debian
-dpkg-dev==1.18.25
-libdpkg-perl==1.18.25
 libdrm-exynos1==2.4.74-1
 libdrm-freedreno1==2.4.74-1
 libdrm-omap1==2.4.74-1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 28f4abb7eb62..36ba9f15c6e5 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==31140af3cfe21203cd9b48135859654db4d39ca1
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==89b222dba5ea3fd91598e821c0b82797f2e2fa3c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index cbff1a630e80..5a6e5fa6e4ce 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.4-1
+containerd.io==1.6.6-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -96,6 +96,7 @@ libc-l10n==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
+libcbor0==0.5.0+dfsg-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
@@ -117,6 +118,7 @@ libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
+libfido2-1==1.5.0-2~bpo10+1
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libftdi1-2==1.4-1+b2
@@ -296,7 +298,7 @@ python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 rasdaemon==0.6.0-1.2
 readline-common==7.0-5
-rsyslog==8.1901.0-1+deb10u1
+rsyslog==8.1901.0-1+deb10u2
 screen==4.6.2-3+deb10u1
 sensible-utils==0.0.12
 software-properties-common==0.96.20.2-2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index a9f9bda4dcc6..69f3bc0a0cf2 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -16,6 +16,7 @@ libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
+rsyslog==8.1901.0-1+deb10u1
 tsingma-bsp==1.0
 tzdata==2021a-0+deb10u4
 xz-utils==5.2.4-1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 764f5bad84ad..88463dc21933 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -17,6 +17,7 @@ linux-image-4.19.0-12-2-armmp==4.19.152-1
 mrvlprestera==1.0
 openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
+rsyslog==8.1901.0-1+deb10u1
 tzdata==2021a-0+deb10u4
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index d59f753adfb7..794f47b66b84 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -32,7 +32,7 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.4.24
+regex==2022.6.2
 requests==2.27.1
 scapy==2.4.4
 six==1.16.0

From 1a6cb0f409e4a23e5c72c9f128c1be2b4740a001 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 30 May 2022 16:50:06 +0800
Subject: [PATCH 1227/1674] [Ci]: Fix the target directory not empty issue when
 publishing artifacts #10972

Why I did it
Fix the target directory not empty issue when publishing artifacts.
Some of the artifacts are published to $(Build.ArtifactStagingDirectory)/target/ before source code checked out.
---
 .azure-pipelines/azure-pipelines-image-template.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 0cfd94079c5f..0d8d75f6b7bd 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -48,7 +48,9 @@ jobs:
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
-      - script: mv target $(Build.ArtifactStagingDirectory)/
+      - script: |
+          mkdir -p $(Build.ArtifactStagingDirectory)/target
+          mv target/* $(Build.ArtifactStagingDirectory)/target/
         displayName: Copy Artifacts
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'

From 27cd7350826b41e996690635147abbbb5a05a588 Mon Sep 17 00:00:00 2001
From: Eric Zhu <79439153+cel-eric@users.noreply.github.com>
Date: Tue, 31 May 2022 10:54:55 +0800
Subject: [PATCH 1228/1674] [SONiC-CEL]: fix platform fancontrol testcase
 failure issue (#10934)

---
 .../services/fancontrol/fancontrol                        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol b/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
index da32acedd2f9..e625ce9a921e 100755
--- a/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
+++ b/platform/broadcom/sonic-platform-modules-cel/services/fancontrol/fancontrol
@@ -348,8 +348,12 @@ CheckFiles || exit 1
 
 if [ -f "$PIDFILE" ]
 then
-    echo "File $PIDFILE exists, is fancontrol already running?" >&2
-    exit 1
+    # Test if process is really running, if not, no need to exit
+    if ps -p $(echo $PIDFILE) > /dev/null
+    then
+        echo "File $PIDFILE exists, is fancontrol already running?" >&2
+        exit 1
+    fi
 fi
 echo $$ > "$PIDFILE"
 

From 2a9aa0836c2223f8fb844ff3f28d0170d93bad9e Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Wed, 8 Jun 2022 09:46:54 +0300
Subject: [PATCH 1229/1674] [202012] [Mellanox] [pmon] Fix for PMON service not
 starting when restarting SWSS service after fast/warm reboot (#10902)

- Why I did it
Recent change to delay PMON service in case of fast/warm reboot introduce an issue when restarting only SWSS service after fast/warm reboot for Nvidia platform.
Since the timer is triggered only when the system boot, in a scenario when the system is after a fast/warm reboot and the user restart SWSS service, as part of syncd.sh script, PMON service will stop but the timer will not start again.

- How I did it
On syncd.sh script, in case of fast/warm indication, check if pmon.timer is running.
If it is running it means we are at the first boot and continue normally.
If it is not running, meaning the service was restarted, start the timer to keep the system behavior consistent.

- How to verify it
Run fast/warm reboot.
service swss restart.
Observe PMON service starting.
---
 files/scripts/syncd.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index 6d26eebf04fe..72cbcdea8073 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -40,7 +40,12 @@ function waitplatform() {
     BOOT_TYPE=`getBootType`
     if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
         if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then
-            debug "PMON service is delayed by a timer for better fast/warm boot performance"
+            PMON_TIMER_STATUS=$(systemctl is-active pmon.timer)
+            if [[ x"$PMON_TIMER_STATUS" = x"inactive" ]]; then
+                systemctl start pmon.timer
+            else
+                debug "PMON service is delayed by a timer for better fast/warm boot performance"
+            fi
         else
             debug "Starting pmon service..."
             /bin/systemctl start pmon

From 4f19945b48a9fb0ffa556ae166c0a910f9371a42 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Thu, 9 Jun 2022 15:58:39 +0800
Subject: [PATCH 1230/1674] [ci] Enable default ACR in
 official/PR/UpgradeVersion pipelines. (#11052)

---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml |  7 +++++--
 .azure-pipelines/official-build.yml                 | 11 +++++++++++
 azure-pipelines.yml                                 | 11 +++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 4e22ce4801c8..b36cc3513aa6 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -42,8 +42,11 @@ parameters:
 stages:
 - stage: Build
   variables:
-    CACHE_MODE: none
-    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - name: CACHE_MODE
+      value: none
+    - name: VERSION_CONTROL_OPTIONS
+      value: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - template: .azure-pipelines/template-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index bcda8f210c75..6282a463ea6e 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -12,9 +12,20 @@ schedules:
     - 202012
   always: true
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
+
 trigger: none
 pr: none
 
+variables:
+- template: .azure-pipelines/template-variables.yml@buildimage
+
 stages:
 - stage: Build
   pool: sonicbld
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5e0acc9e3317..60ac1c7e4fb1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,6 +30,17 @@ resources:
     name: Azure/sonic-mgmt
     endpoint: build
     ref: refs/heads/202012
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    endpoint: build
+    ref: master
+
+variables:
+- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
+- template: .azure-pipelines/template-variables.yml@buildimage
+- name: CACHE_MODE
+  value: rcache 
 
 stages:
 - stage: BuildVS

From adfe20b5f678168364637d4f52e1a03301c949ef Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Thu, 9 Jun 2022 16:13:17 +0800
Subject: [PATCH 1231/1674] [202012] Automatically enable tunnel_qos_remap on
 T1 and T0 in DualToR deployment (#11056)

* Automatically enable tunnel_qos_remap on T1 and T0 in DualToR deployment

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 src/sonic-config-engine/minigraph.py          | 55 ++++++++-----------
 ...ample-arista-7050cx3-dualtor-minigraph.xml | 13 ++---
 .../sample-arista-7260-dualtor-minigraph.xml  | 13 ++---
 .../tests/sample-arista-7260-t1-minigraph.xml | 13 ++---
 ...imple-sample-graph-case-remap-disabled.xml |  8 ---
 ...ase-remap-enabled-no-tunnel-attributes.xml | 13 ++---
 ...simple-sample-graph-case-remap-enabled.xml | 13 ++---
 7 files changed, 49 insertions(+), 79 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index f8338c9c9606..7293f02f8c20 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -847,6 +847,9 @@ def parse_meta(meta, hname):
     resource_type = None
     downstream_subrole = None
     kube_data = {}
+    redundancy_type = None
+    downstream_redundancy_types = None
+
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
         if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower():
@@ -881,29 +884,11 @@ def parse_meta(meta, hname):
                     kube_data["enable"] = value
                 elif name == "KubernetesServerIp":
                     kube_data["ip"] = value
-    return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
-
-def parse_system_defaults(meta):
-    system_default_values = {}
-
-    system_defaults = meta.find(str(QName(ns1, "SystemDefaults")))
-    
-    if system_defaults is None:
-        return system_default_values
-    
-    for system_default in system_defaults.findall(str(QName(ns1, "SystemDefault"))):
-        name = system_default.find(str(QName(ns1, "Name"))).text
-        value = system_default.find(str(QName(ns1, "Value"))).text
-
-        # Tunnel Qos remapping 
-        if name == "TunnelQosRemapEnabled":
-            if value.lower() == "true":
-                status = "enabled"
-            else:
-                status = "disabled"
-            system_default_values["tunnel_qos_remap"] = {"status": status}
-
-    return system_default_values
+                elif name == "DownstreamRedundancyTypes":
+                    downstream_redundancy_types = value
+                elif name == "RedundancyType":
+                    redundancy_type = value
+    return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type
 
 def parse_linkmeta(meta, hname):
     link = meta.find(str(QName(ns, "Link")))
@@ -1202,6 +1187,8 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     local_devices = []
     kube_data = {}
     system_defaults = {}
+    downstream_redundancy_types = None
+    redundancy_type = None
 
     hwsku_qn = QName(ns, "HwSku")
     hostname_qn = QName(ns, "Hostname")
@@ -1232,13 +1219,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
-                (syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data) = parse_meta(child, hostname)
+                (syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type) = parse_meta(child, hostname)
             elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
-            elif child.tag == str(QName(ns, "SystemDefaultsDeclaration")):
-                system_defaults = parse_system_defaults(child)
         else:
             if child.tag == str(QName(ns, "DpgDec")):
                 (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content, tunnel_intfs_qos_remap_config) = parse_dpg(child, asic_name)
@@ -1253,8 +1238,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
-            elif child.tag == str(QName(ns, "SystemDefaultsDeclaration")):
-                system_defaults = parse_system_defaults(child)
 
     # set the host device type in asic metadata also
     device_type = [devices[key]['type'] for key in devices if key.lower() == hostname.lower()][0]
@@ -1289,9 +1272,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             }
         }
 
-    if len(system_defaults) > 0:
-        results['SYSTEM_DEFAULTS'] = system_defaults
-
     results['PEER_SWITCH'], mux_tunnel_name, peer_switch_ip = get_peer_switch_info(linkmetas, devices)
 
     if bool(results['PEER_SWITCH']):
@@ -1300,7 +1280,20 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             print("Warning: more than one peer switch was found. Only the first will be parsed: {}".format(results['PEER_SWITCH'].keys()[0]))
 
         results['DEVICE_METADATA']['localhost']['peer_switch'] = list(results['PEER_SWITCH'].keys())[0]
+    
+    # Enable tunnel_qos_remap if downstream_redundancy_types(T1) or redundancy_type(T0) = Gemini/Libra
+    enable_tunnel_qos_map = False
+    if results['DEVICE_METADATA']['localhost']['type'].lower() == 'leafrouter' and ('gemini' in str(downstream_redundancy_types).lower() or 'libra' in str(downstream_redundancy_types).lower()):
+        enable_tunnel_qos_map = True
+    elif results['DEVICE_METADATA']['localhost']['type'].lower() == 'torrouter' and ('gemini' in str(redundancy_type).lower() or 'libra' in str(redundancy_type).lower()):
+        enable_tunnel_qos_map = True
+
+    if enable_tunnel_qos_map:
+        system_defaults['tunnel_qos_remap'] = {"status": "enabled"}
 
+    if len(system_defaults) > 0:
+        results['SYSTEM_DEFAULTS'] = system_defaults
+    
     # for this hostname, if sub_role is defined, add sub_role in 
     # device_metadata
     if sub_role is not None:
diff --git a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
index 47240eb2f4b3..521b5c5ae074 100644
--- a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml
@@ -2334,19 +2334,16 @@
             <a:Reference i:nil="true"/>
             <a:Value>10.20.6.16</a:Value>
          </a:DeviceProperty>
+         <a:DeviceProperty>
+            <a:Name>RedundancyType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Gemini</a:Value>
+         </a:DeviceProperty>
         </a:Properties>
       </a:DeviceMetadata>
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
-  <SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>True</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <LinkMetadataDeclaration>
     <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
       <a:LinkMetadata>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
index 613613ba37b6..37e1a872887e 100644
--- a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml
@@ -4600,19 +4600,16 @@
             <a:Reference i:nil="true"/>
             <a:Value>10.20.6.16</a:Value>
          </a:DeviceProperty>
+         <a:DeviceProperty>
+            <a:Name>RedundancyType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Gemini</a:Value>
+         </a:DeviceProperty>
         </a:Properties>
       </a:DeviceMetadata>
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
-  <SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>True</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <LinkMetadataDeclaration>
     <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
       <a:LinkMetadata>
diff --git a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
index 3c87489b59c2..47dcdafcd404 100644
--- a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml
@@ -2481,19 +2481,16 @@
             <a:Reference i:nil="true"/>
             <a:Value>10.20.6.16</a:Value>
          </a:DeviceProperty>
+         <a:DeviceProperty>
+            <a:Name>DownstreamRedundancyTypes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Gemini</a:Value>
+         </a:DeviceProperty>
         </a:Properties>
       </a:DeviceMetadata>
     </Devices>
     <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
   </MetadataDeclaration>
-  <SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>True</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <Hostname>str-7260cx3-acs-7</Hostname>
   <HwSku>Arista-7260CX3-C64</HwSku>
 </DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
index 7d0be06e4e82..91c0aa46c10e 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-disabled.xml
@@ -474,14 +474,6 @@
  </Devices>
  <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
 </MetadataDeclaration>
-<SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>False</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <DeviceInfos>
     <DeviceInfo>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml
index 6c83f37fd93f..a88bc4e2adeb 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled-no-tunnel-attributes.xml
@@ -469,19 +469,16 @@
      <a:Reference i:nil="true"/>
      <a:Value>Storage</a:Value>
     </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>RedundancyType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Gemini</a:Value>
+    </a:DeviceProperty>
   </a:Properties>
   </a:DeviceMetadata>
  </Devices>
  <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
 </MetadataDeclaration>
-<SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>True</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <DeviceInfos>
     <DeviceInfo>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
index 1a49e716805d..1babc8ac5036 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case-remap-enabled.xml
@@ -469,19 +469,16 @@
      <a:Reference i:nil="true"/>
      <a:Value>Storage</a:Value>
     </a:DeviceProperty>
+    <a:DeviceProperty>
+     <a:Name>RedundancyType</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>Gemini</a:Value>
+    </a:DeviceProperty>
   </a:Properties>
   </a:DeviceMetadata>
  </Devices>
  <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
 </MetadataDeclaration>
-<SystemDefaultsDeclaration>
-  <a:SystemDefaults xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
-    <a:SystemDefault>
-      <a:Name>TunnelQosRemapEnabled</a:Name>
-      <a:Value>True</a:Value>
-    </a:SystemDefault>
-  </a:SystemDefaults>
-</SystemDefaultsDeclaration>
   <DeviceInfos>
     <DeviceInfo>
       <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">

From 52962f8f59f8ac6699f134e6894324869db022e9 Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Thu, 9 Jun 2022 17:28:12 +0800
Subject: [PATCH 1232/1674] cherry-pick [bgpcfgd] ECMP overlay VxLan with BGP
 support to 202012 (#11079)

Why I did it
This is a cherry-pick PR from master to 202012 branch
below is the original PR which merged to master.
#10716

How I did it
How to verify it
---
 src/sonic-bgpcfgd/bgpcfgd/main.py             |  2 +
 .../bgpcfgd/managers_advertise_rt.py          | 83 ++++++++++++-------
 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py      | 78 +++++++++++++++++
 src/sonic-bgpcfgd/tests/test_advertise_rt.py  | 72 ++++++++++++++--
 src/sonic-bgpcfgd/tests/test_rm.py            | 62 ++++++++++++++
 5 files changed, 263 insertions(+), 34 deletions(-)
 create mode 100644 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
 create mode 100644 src/sonic-bgpcfgd/tests/test_rm.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 52d591d1fcb0..698e1756e654 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -17,6 +17,7 @@
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
 from .managers_static_rt import StaticRouteMgr
+from .managers_rm import RouteMapMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
 from .utils import read_constants
@@ -60,6 +61,7 @@ def do_work():
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
         # Route Advertisement Managers
         AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
+        RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
index 352b89f7286c..68c48b044f61 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py
@@ -1,10 +1,14 @@
 from .manager import Manager
 from .template import TemplateFabric
 from swsscommon import swsscommon
+from .managers_rm import ROUTE_MAPS
+import ipaddress
+from .log import log_info, log_err, log_debug
 
 
 class AdvertiseRouteMgr(Manager):
     """ This class Advertises routes when ADVERTISE_NETWORK_TABLE in STATE_DB is updated """
+
     def __init__(self, common_objs, db, table):
         """
         Initialize the object
@@ -18,82 +22,105 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-        
+
         self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
         self.advertised_routes = dict()
 
 
-    OP_DELETE = 'DELETE'
-    OP_ADD = 'ADD'
-
+    OP_DELETE = "DELETE"
+    OP_ADD = "ADD"
 
     def set_handler(self, key, data):
+        log_debug("AdvertiseRouteMgr:: set handler")
+        if not self.__set_handler_validate(key, data):
+            return True
         vrf, ip_prefix = self.split_key(key)
-        self.add_route_advertisement(vrf, ip_prefix)
+        self.add_route_advertisement(vrf, ip_prefix, data)
 
         return True
 
-
     def del_handler(self, key):
+        log_debug("AdvertiseRouteMgr:: del handler")
         vrf, ip_prefix = self.split_key(key)
         self.remove_route_advertisement(vrf, ip_prefix)
 
-
-    def add_route_advertisement(self, vrf, ip_prefix):
+    def __set_handler_validate(self, key, data):
+        if data:
+            if ("profile" in data and data["profile"] in ROUTE_MAPS) or data == {"":""}:
+                """
+                    APP which config the data should be responsible to pass a valid IP prefix
+                """
+                return True
+            
+        log_err("BGPAdvertiseRouteMgr:: Invalid data %s for advertised route %s" % (data, key))
+        return False
+
+    def add_route_advertisement(self, vrf, ip_prefix, data):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, set()):
+            if not self.advertised_routes.get(vrf, dict()):
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
-            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD)
-
-        self.advertised_routes.setdefault(vrf, set()).add(ip_prefix)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD, data)
 
+        self.advertised_routes.setdefault(vrf, dict()).update({ip_prefix: data})
 
     def remove_route_advertisement(self, vrf, ip_prefix):
-        self.advertised_routes.setdefault(vrf, set()).discard(ip_prefix)
-        if not self.advertised_routes.get(vrf, set()):
+        if ip_prefix not in self.advertised_routes.get(vrf, dict()):
+            log_info("BGPAdvertiseRouteMgr:: %s|%s does not exist" % (vrf, ip_prefix))
+            return
+        self.advertised_routes.get(vrf, dict()).pop(ip_prefix)
+        if not self.advertised_routes.get(vrf, dict()):
             self.advertised_routes.pop(vrf, None)
 
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, set()):
+            if not self.advertised_routes.get(vrf, dict()):
                 self.bgp_network_import_check_commands(vrf, self.OP_DELETE)
             self.advertise_route_commands(ip_prefix, vrf, self.OP_DELETE)
 
-
-    def advertise_route_commands(self, ip_prefix, vrf, op):
+    def advertise_route_commands(self, ip_prefix, vrf, op, data=None):
         is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
 
         cmd_list = []
-        if vrf == 'default':
+        if vrf == "default":
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
 
         cmd_list.append(" address-family %s unicast" % ("ipv6" if is_ipv6 else "ipv4"))
-        cmd_list.append("  %snetwork %s" % ('no ' if op == self.OP_DELETE else '', ip_prefix))
 
-        self.cfg_mgr.push_list(cmd_list)
+        if data and "profile" in data:
+            cmd_list.append("  network %s route-map %s" % (ip_prefix, "%s_RM" % data["profile"]))
+            log_debug(
+                "BGPAdvertiseRouteMgr:: Update bgp %s network %s with route-map %s"
+                % (bgp_asn, vrf + "|" + ip_prefix, "%s_RM" % data["profile"])
+            )
+        else:
+            cmd_list.append("  %snetwork %s" % ("no " if op == self.OP_DELETE else "", ip_prefix))
+            log_debug(
+                "BGPAdvertiseRouteMgr:: %sbgp %s network %s"
+                % ("Remove " if op == self.OP_DELETE else "Update ", bgp_asn, vrf + "|" + ip_prefix)
+            )
 
+        self.cfg_mgr.push_list(cmd_list)
+        log_debug("BGPAdvertiseRouteMgr::Done")
 
     def bgp_network_import_check_commands(self, vrf, op):
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
         cmd_list = []
-        if vrf == 'default':
+        if vrf == "default":
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-        cmd_list.append(" %sbgp network import-check" % ('' if op == self.OP_DELETE else 'no '))
+        cmd_list.append(" %sbgp network import-check" % ("" if op == self.OP_DELETE else "no "))
 
         self.cfg_mgr.push_list(cmd_list)
 
-
     def on_bgp_asn_change(self):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
             for vrf, ip_prefixes in self.advertised_routes.items():
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
                 for ip_prefix in ip_prefixes:
-                    self.add_route_advertisement(vrf, ip_prefix)
-
+                    self.add_route_advertisement(vrf, ip_prefix, ip_prefixes[ip_prefix])
 
     @staticmethod
     def split_key(key):
@@ -102,7 +129,7 @@ def split_key(key):
         :param key: key to split
         :return: vrf name extracted from the key, ip prefix extracted from the key
         """
-        if '|' not in key:
-            return 'default', key
+        if "|" not in key:
+            return "default", key
         else:
-            return tuple(key.split('|', 1))
+            return tuple(key.split("|", 1))
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
new file mode 100644
index 000000000000..08609c68f9a6
--- /dev/null
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
@@ -0,0 +1,78 @@
+from .manager import Manager
+from .log import log_err, log_debug
+
+ROUTE_MAPS = ["FROM_SDN_SLB_ROUTES"]
+
+
+class RouteMapMgr(Manager):
+    """This class add route-map when BGP_PROFILE_TABLE in APPL_DB is updated"""
+
+    def __init__(self, common_objs, db, table):
+        """
+        Initialize the object
+        :param common_objs: common object dictionary
+        :param db: name of the db
+        :param table: name of the table in the db
+        """
+        super(RouteMapMgr, self).__init__(
+            common_objs,
+            [],
+            db,
+            table,
+        )
+
+    def set_handler(self, key, data):
+        log_debug("BGPRouteMapMgr:: set handler")
+        """Only need a name as the key, and community id as the data"""
+        if not self.__set_handler_validate(key, data):
+            return True
+
+        self.__update_rm(key, data)
+        return True
+
+    def del_handler(self, key):
+        log_debug("BGPRouteMapMgr:: del handler")
+        if not self.__del_handler_validate(key):
+            return
+        self.__remove_rm(key)
+
+    def __remove_rm(self, rm):
+        cmds = ["no route-map %s permit 100" % ("%s_RM" % rm)]
+        log_debug("BGPRouteMapMgr:: remove route-map %s" % ("%s_RM" % rm))
+        self.cfg_mgr.push_list(cmds)
+        log_debug("BGPRouteMapMgr::Done")
+
+    def __set_handler_validate(self, key, data):
+        if key not in ROUTE_MAPS:
+            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
+            return False
+
+        if not data:
+            log_err("BGPRouteMapMgr:: data is None")
+            return False
+        community_ids = data["community_id"].split(":")
+        try:
+            if (
+                len(community_ids) != 2
+                or int(community_ids[0]) not in range(0, 65536)
+                or int(community_ids[1]) not in range(0, 65536)
+            ):
+                log_err("BGPRouteMapMgr:: data %s doesn't include valid community id %s" % (data, community_ids))
+                return False
+        except ValueError:
+            log_err("BGPRouteMapMgr:: data %s includes illegal input" % (data))
+            return False
+
+        return True
+
+    def __del_handler_validate(self, key):
+        if key not in ROUTE_MAPS:
+            log_err("BGPRouteMapMgr:: Invalid key for route-map %s" % key)
+            return False
+        return True
+
+    def __update_rm(self, rm, data):
+        cmds = ["route-map %s permit 100" % ("%s_RM" % rm), " set community %s" % data["community_id"]]
+        log_debug("BGPRouteMapMgr:: update route-map %s community %s" % ("%s_RM" % rm, data["community_id"]))
+        self.cfg_mgr.push_list(cmds)
+        log_debug("BGPRouteMapMgr::Done")
diff --git a/src/sonic-bgpcfgd/tests/test_advertise_rt.py b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
index 26f7b6617650..751540600006 100644
--- a/src/sonic-bgpcfgd/tests/test_advertise_rt.py
+++ b/src/sonic-bgpcfgd/tests/test_advertise_rt.py
@@ -48,7 +48,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("10.1.0.0/24", {}),
+        ("10.1.0.0/24", {"":""}),
         True,
         [
             ["router bgp 65100",
@@ -62,7 +62,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("fc00:10::/64", {}),
+        ("fc00:10::/64", {"":""}),
         True,
         [
             ["router bgp 65100",
@@ -103,7 +103,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.2.0.0/24", {}),
+        ("vrfRED|10.2.0.0/24", {"":""}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -117,7 +117,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|fc00:20::/64", {}),
+        ("vrfRED|fc00:20::/64", {"":""}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -158,7 +158,9 @@ def test_set_del_bgp_asn_change():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.3.0.0/24", {}),
+        ("vrfRED|10.3.0.0/24", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
         True,
         []
     )
@@ -170,7 +172,7 @@ def test_set_del_bgp_asn_change():
          " no bgp network import-check"],
         ["router bgp 65100 vrf vrfRED",
          " address-family ipv4 unicast",
-         "  network 10.3.0.0/24"]
+         "  network 10.3.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
     ]
     def push_list(cmds):
         test_set_del_bgp_asn_change.push_list_called = True
@@ -183,3 +185,61 @@ def push_list(cmds):
     mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
 
     assert test_set_del_bgp_asn_change.push_list_called
+
+def test_set_del_with_community():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("10.1.0.0/24", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
+        True,
+        [
+            ["router bgp 65100",
+             " no bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  network 10.1.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "SET",
+        ("fc00:10::/64", {
+            "profile": "FROM_SDN_SLB_ROUTES"
+        }),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  network fc00:10::/64 route-map FROM_SDN_SLB_ROUTES_RM"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("10.1.0.0/24",),
+        True,
+        [
+            ["router bgp 65100",
+             " address-family ipv4 unicast",
+             "  no network 10.1.0.0/24"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("fc00:10::/64",),
+        True,
+        [
+            ["router bgp 65100",
+             " bgp network import-check"],
+            ["router bgp 65100",
+             " address-family ipv6 unicast",
+             "  no network fc00:10::/64"]
+        ]
+    )
\ No newline at end of file
diff --git a/src/sonic-bgpcfgd/tests/test_rm.py b/src/sonic-bgpcfgd/tests/test_rm.py
new file mode 100644
index 000000000000..fe89055d27f4
--- /dev/null
+++ b/src/sonic-bgpcfgd/tests/test_rm.py
@@ -0,0 +1,62 @@
+from unittest.mock import MagicMock
+from bgpcfgd.directory import Directory
+from bgpcfgd.managers_rm import RouteMapMgr
+from swsscommon import swsscommon
+
+def constructor():
+    cfg_mgr = MagicMock()
+
+    common_objs = {
+        'directory': Directory(),
+        'cfg_mgr':   cfg_mgr,
+        'constants': {},
+    }
+
+    mgr = RouteMapMgr(common_objs, "APPL_DB", "BGP_PROFILE_TABLE")
+    return mgr
+
+def set_del_test(mgr, op, args, expected_ret, expected_cmds):
+    set_del_test.push_list_called = False
+    def push_list(cmds):
+        set_del_test.push_list_called = True
+        assert cmds in expected_cmds
+        return True
+    mgr.cfg_mgr.push_list = push_list
+
+    if op == "SET":
+        ret = mgr.set_handler(*args)
+        assert ret == expected_ret
+    elif op == "DEL":
+        mgr.del_handler(*args)
+    else:
+        assert False, "Wrong operation"
+
+    if expected_cmds:
+        assert set_del_test.push_list_called, "cfg_mgr.push_list wasn't called"
+    else:
+        assert not set_del_test.push_list_called, "cfg_mgr.push_list was called"
+
+def test_set_del():
+    mgr = constructor()
+    set_del_test(
+        mgr,
+        "SET",
+        ("FROM_SDN_SLB_ROUTES", {
+            "community_id": "1234:1234"
+        }),
+        True,
+        [
+            ["route-map FROM_SDN_SLB_ROUTES_RM permit 100",
+             " set community 1234:1234"]
+        ]
+    )
+
+    set_del_test(
+        mgr,
+        "DEL",
+        ("FROM_SDN_SLB_ROUTES",),
+        True,
+        [
+            ["no route-map FROM_SDN_SLB_ROUTES_RM permit 100"]
+        ]
+    )

From 68f4e0b7386a81bcda1e0389160d912d544eb9a4 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 10 Jun 2022 08:14:24 +0800
Subject: [PATCH 1233/1674] Update submodule sonic-utilities (#11088)

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 74bf9513e7d2..b0d70626a12d 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 74bf9513e7d27b771004bb94526d8070a9158f40
+Subproject commit b0d70626a12d52e2dccd6afe94acc532293d36b0

From 5ceb25e21bb576fdc93f4388b8796ab8698d2b47 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 10 Jun 2022 03:06:44 -0700
Subject: [PATCH 1234/1674] [202012] [sonic-config-engine] Generate expected
 output with different cable len (#11082)

* Generate expected output with 300m cable len and compare against it

Signed-off-by: Neetha John <nejo@microsoft.com>

* Rewrite assert logic

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 src/sonic-config-engine/tests/test_j2files.py | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index de95006ae62c..7f4e56dfc868 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -69,6 +69,20 @@ def remove_machine_conf(self, file_exist, dir_exist):
         if not dir_exist:
             os.system('sudo rmdir /host')
 
+    def modify_cable_len(self, base_file, file_dir):
+        input_file = os.path.join(file_dir, base_file)
+        with open(input_file, 'r') as ifd:
+            object = json.load(ifd)
+            if 'CABLE_LENGTH' in object and 'AZURE' in object['CABLE_LENGTH']:
+                for key in object['CABLE_LENGTH']['AZURE']:
+                    object['CABLE_LENGTH']['AZURE'][key] = '300m'
+        prefix, extension = base_file.split('.')
+        output_file = '{}_300m.{}'.format(prefix, extension)
+        out_file_path = os.path.join(file_dir, output_file)
+        with open(out_file_path, 'w') as wfd:
+            json.dump(object, wfd, indent=4)
+        return output_file
+
     def test_interfaces(self):
         interfaces_template = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'interfaces', 'interfaces.j2')
         argument = '-m ' + self.t0_minigraph + ' -a \'{\"hwaddr\":\"e4:1d:2d:a5:f3:ad\"}\' -t ' + interfaces_template + ' > ' + self.output_file
@@ -355,8 +369,21 @@ def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer
         os.remove(buffers_config_file_new)
         self.remove_machine_conf(file_exist, dir_exist)
 
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, expected)
-        assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
+        out_file_dir = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR)
+        expected_files = [expected, self.modify_cable_len(expected, out_file_dir)]
+        match = False
+        diff = ''
+        for out_file in expected_files:
+            sample_output_file = os.path.join(out_file_dir, out_file)
+            if utils.cmp(sample_output_file, self.output_file):
+                match = True
+                break
+            else:
+                diff = diff + str(self.run_diff(sample_output_file, self.output_file))
+
+        os.remove(os.path.join(out_file_dir, expected_files[1]))
+
+        assert match, diff
 
     def test_extra_lossless_buffer_for_tunnel_remapping(self):
         if utils.PYvX_DIR != 'py3':

From b0c48f9b31ccba088dbe9cd0981b8949d7ed6e47 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Fri, 10 Jun 2022 11:23:28 -0700
Subject: [PATCH 1235/1674] [devices]: fix j2 syntax error for the config.bcm
 in Arista-7260CX3-D108C8

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 .../Arista-7260CX3-D108C8/config.bcm.j2                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index d8276018be94..6259ffb8ce08 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -7,7 +7,7 @@
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
-                               l3_ecmp_levels=2' -%} -%}
+                               l3_ecmp_levels=2' -%}
 {%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-     endif %}
 {%- endif %}

From ab10005729c011fe766357850feea63ebf596066 Mon Sep 17 00:00:00 2001
From: Lukas Stockner <lstockner@genesiscloud.com>
Date: Fri, 10 Jun 2022 20:50:56 +0200
Subject: [PATCH 1236/1674] [swss] Clear VXLAN tunnel table from State DB on
 startup (#11078)

*Clear VXLAN tunnel table from State DB on startup
Signed-off-by: Lukas Stockner <lstockner@genesiscloud.com>
---
 files/scripts/swss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index c8d28f8c696b..48c0f7621566 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -147,7 +147,7 @@ start() {
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
         $SONIC_DB_CLI RESTAPI_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*'"
     fi
 
     # start service docker

From 49a2d8558d25ba2839f318ea05789600e74097cf Mon Sep 17 00:00:00 2001
From: Nikola Dancejic <26731235+Ndancejic@users.noreply.github.com>
Date: Fri, 10 Jun 2022 20:45:06 -0700
Subject: [PATCH 1237/1674] Update submodule sonic-swss (#11109)

Signed-off-by: Nikola Dancejic <nikola.dancejic@live.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index eef993fe9eab..c627f574585f 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit eef993fe9eab414e14cba1bfa561ddc3d27dd874
+Subproject commit c627f574585f0ed3e15650d51faf941065b39da2

From c27aa88acf6bb3b38164dec94fdfbfb3e3c6bd57 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Tue, 14 Jun 2022 13:49:22 +0800
Subject: [PATCH 1238/1674] [build] Add dependencies for sonic-config-engine to
 block bad PR. (#10770) (#11054)

Add dependencies device/* for sonic-config-engine
---
 rules/sonic-config.dep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/sonic-config.dep b/rules/sonic-config.dep
index 794d76b28496..9df17ac3a080 100644
--- a/rules/sonic-config.dep
+++ b/rules/sonic-config.dep
@@ -4,7 +4,7 @@ SPATH       := $($(SONIC_CONFIG_ENGINE_PY2)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-config.mk rules/sonic-config.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(SPATH))
-DEP_FILES   += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-orchagent/ipinip.json.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 files/build_templates/qos_config.j2 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml
+DEP_FILES   += files/image_config/interfaces/interfaces.j2 dockers/docker-orchagent/ports.json.j2 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 dockers/docker-lldp/lldpd.conf.j2 dockers/docker-orchagent/ipinip.json.j2 $(shell find device -type f) files/build_templates/qos_config.j2 dockers/docker-orchagent/switch.json.j2 files/image_config/constants/constants.yml
 
 $(SONIC_CONFIG_ENGINE_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_CONFIG_ENGINE_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)

From efdb5077952062aa5ae7867492d08b50937b7ca2 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <63672455+jon-nokia@users.noreply.github.com>
Date: Tue, 14 Jun 2022 11:56:27 -0400
Subject: [PATCH 1239/1674] [installer]: fix armhf for installer.conf usage
 (#11121)

This fixes the build for armhf to be able to use '/device///installer.conf' files. Specifically, armhf needs support to be able to change the size of /var/log/ directory. It is hardcoded to 512 bytes on all armhf platforms currently. This change will allow any armhf platform to be able to use an installer.conf file to customize the installed image.
---
 build_image.sh                       |  8 ++++----
 platform/marvell-armhf/platform.conf | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build_image.sh b/build_image.sh
index 5353e85ab2f3..d67826e08303 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -28,12 +28,12 @@ IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
 generate_onie_installer_image()
 {
     # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
-    rm -rf ./installer/x86_64/platforms/
-    mkdir -p ./installer/x86_64/platforms/
+    rm -rf ./installer/${TARGET_PLATFORM}/platforms/
+    mkdir -p ./installer/${TARGET_PLATFORM}/platforms/
     for VENDOR in `ls ./device`; do
-        for PLATFORM in `ls ./device/$VENDOR`; do
+        for PLATFORM in `ls ./device/$VENDOR | grep ^${TARGET_PLATFORM}`; do
             if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
-                cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
+                cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/${TARGET_PLATFORM}/platforms/$PLATFORM
             fi
 
         done
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 9f237eda7f88..5cf417fa44e4 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -9,7 +9,6 @@ kernel_addr=0x1100000
 fdt_addr=0x1000000
 fdt_high=0x10fffff
 initrd_addr=0x2000000
-VAR_LOG=512
 
 kernel_fname="/boot/vmlinuz-4.19.0-12-2-armmp"
 initrd_fname="/boot/initrd.img-4.19.0-12-2-armmp"
@@ -76,7 +75,7 @@ prepare_boot_menu() {
             UBOOT_ENV_ERASE_SIZ="0x$(grep uboot-env /proc/mtd | awk '{print $3}')"
             if [[ -n "$UBOOT_ENV_SIZ" && -n "$UBOOT_ENV_ERASE_SIZ" ]]
             then
-                # Env info from DTB 
+                # Env info from DTB
                 FW_ENV_DTB="/dev/$DTB_HAS_ENV_BLK 0x00000000 $UBOOT_ENV_SIZ $UBOOT_ENV_ERASE_SIZ"
             fi
         fi
@@ -147,8 +146,8 @@ prepare_boot_menu() {
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
 
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
-    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
 
     # Set boot configs
     fw_setenv ${FW_ARG} kernel_addr $kernel_addr > /dev/null
@@ -178,7 +177,7 @@ prepare_boot_menu() {
 }
 
 create_ubi_partition() {
-    ubidetach /dev/ubi_ctrl -d 0 2>/dev/null || true 
+    ubidetach /dev/ubi_ctrl -d 0 2>/dev/null || true
 
     trap_push "${onie_bin} ubidetach -d 0 /dev/ubi_ctrl || true"
     echo -en "Format mtd partition '$mtd_dev' "
@@ -234,7 +233,7 @@ create_gpt_partition() {
 }
 
 create_partition() {
-    # Platform speicific partition 
+    # Platform speicific partition
     if [ "$PLATFORM" = "armhf-marvell_et6448m_52x-r0" ]; then
         echo "Doing UBI partition"
         create_ubi_partition

From 159613153ffaef466b542466c1654d508ad06691 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <63672455+jon-nokia@users.noreply.github.com>
Date: Tue, 14 Jun 2022 11:57:33 -0400
Subject: [PATCH 1240/1674] [Nokia ixs7215] change var/log size to 4GB (#11122)

This makes use of #11121 to add support for configuration of VAR_LOG_SIZE on Nokia IXS7215
---
 device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
new file mode 100644
index 000000000000..b138f294e1ea
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
@@ -0,0 +1 @@
+VAR_LOG_SIZE=4096

From 27cfcf2c5daf07cef3fcaf516d4d918af7f3d076 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Wed, 15 Jun 2022 09:50:18 +0800
Subject: [PATCH 1241/1674] [202012][Tunnel PFC][Fix bug] Fix bug and Tests for
 adding property 'sai_remap_prio_on_tnl_egress' (#11099)

* [202012][Tunnel PFC][Fix bug] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress'

manual cherry-pick from https://github.com/Azure/sonic-buildimage/pull/11027
Fix a bug in the template
Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.

* merge change after sync from 202012 and remove a mistaken changes in cherry-pick

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 .../tests/data/j2_template/config.bcm.j2      | 28 ++++++++
 .../tests/data/j2_template/port_config.ini    | 67 +++++++++++++++++++
 .../py3/arista7050cx3-dualtor.config.bcm      |  8 +++
 .../py3/arista7260-dualtor.config.bcm         |  8 +++
 .../py3/arista7260-t1.config.bcm              |  5 ++
 src/sonic-config-engine/tests/test_j2files.py | 31 +++++++++
 6 files changed, 147 insertions(+)
 create mode 100644 src/sonic-config-engine/tests/data/j2_template/config.bcm.j2
 create mode 100644 src/sonic-config-engine/tests/data/j2_template/port_config.ini
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/arista7050cx3-dualtor.config.bcm
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/arista7260-t1.config.bcm

diff --git a/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2 b/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2
new file mode 100644
index 000000000000..187d40af2d4e
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2
@@ -0,0 +1,28 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
+{%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
+{%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
+{%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-         if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%-             set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
+{%-         endif %}
+{%-     endif %}
+{%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-         if 'dualtor' in switch_subtype.lower() %}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
+{%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-         endif %}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
+
+l3_alpm_hit_skip=1
+{{ map_prio }}
+{{ mmu_sock }}
+{{ IPinIP_sock }}
diff --git a/src/sonic-config-engine/tests/data/j2_template/port_config.ini b/src/sonic-config-engine/tests/data/j2_template/port_config.ini
new file mode 100644
index 000000000000..3940948a3541
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/j2_template/port_config.ini
@@ -0,0 +1,67 @@
+# name          lanes             alias        index  speed
+Ethernet0       77,78,79,80       Ethernet1/1  1      100000
+Ethernet4       65,66,67,68       Ethernet2/1  2      100000
+Ethernet8       85,86,87,88       Ethernet3/1  3      100000
+Ethernet12      89,90,91,92       Ethernet4/1  4      100000
+Ethernet16      109,110,111,112   Ethernet5/1  5      100000
+Ethernet20      97,98,99,100      Ethernet6/1  6      100000
+Ethernet24      5,6,7,8           Ethernet7/1  7      100000
+Ethernet28      13,14,15,16       Ethernet8/1  8      100000
+Ethernet32      25,26,27,28       Ethernet9/1  9      100000
+Ethernet36      21,22,23,24       Ethernet10/1 10     100000
+Ethernet40      37,38,39,40       Ethernet11/1 11     100000
+Ethernet44      45,46,47,48       Ethernet12/1 12     100000
+Ethernet48      57,58,59,60       Ethernet13/1 13     100000
+Ethernet52      53,54,55,56       Ethernet14/1 14     100000
+Ethernet56      117,118,119,120   Ethernet15/1 15     100000
+Ethernet60      121,122,123,124   Ethernet16/1 16     100000
+Ethernet64      141,142,143,144   Ethernet17/1 17     100000
+Ethernet68      133,134,135,136   Ethernet18/1 18     100000
+Ethernet72      197,198,199,200   Ethernet19/1 19     100000
+Ethernet76      205,206,207,208   Ethernet20/1 20     100000
+Ethernet80      217,218,219,220   Ethernet21/1 21     100000
+Ethernet84      213,214,215,216   Ethernet22/1 22     100000
+Ethernet88      229,230,231,232   Ethernet23/1 23     100000
+Ethernet92      237,238,239,240   Ethernet24/1 24     100000
+Ethernet96      249,250,251,252   Ethernet25/1 25     100000
+Ethernet100     245,246,247,248   Ethernet26/1 26     100000
+Ethernet104     149,150,151,152   Ethernet27/1 27     100000
+Ethernet108     153,154,155,156   Ethernet28/1 28     100000
+Ethernet112     173,174,175,176   Ethernet29/1 29     100000
+Ethernet116     161,162,163,164   Ethernet30/1 30     100000
+Ethernet120     181,182,183,184   Ethernet31/1 31     100000
+Ethernet124     185,186,187,188   Ethernet32/1 32     100000
+Ethernet128     69,70,71,72       Ethernet33/1 33     100000
+Ethernet132     73,74,75,76       Ethernet34/1 34     100000
+Ethernet136     93,94,95,96       Ethernet35/1 35     100000
+Ethernet140     81,82,83,84       Ethernet36/1 36     100000
+Ethernet144     101,102,103,104   Ethernet37/1 37     100000
+Ethernet148     105,106,107,108   Ethernet38/1 38     100000
+Ethernet152     9,10,11,12        Ethernet39/1 39     100000
+Ethernet156     1,2,3,4           Ethernet40/1 40     100000
+Ethernet160     17,18,19,20       Ethernet41/1 41     100000
+Ethernet164     29,30,31,32       Ethernet42/1 42     100000
+Ethernet168     41,42,43,44       Ethernet43/1 43     100000
+Ethernet172     33,34,35,36       Ethernet44/1 44     100000
+Ethernet176     49,50,51,52       Ethernet45/1 45     100000
+Ethernet180     61,62,63,64       Ethernet46/1 46     100000
+Ethernet184     125,126,127,128   Ethernet47/1 47     100000
+Ethernet188     113,114,115,116   Ethernet48/1 48     100000
+Ethernet192     129,130,131,132   Ethernet49/1 49     100000
+Ethernet196     137,138,139,140   Ethernet50/1 50     100000
+Ethernet200     201,202,203,204   Ethernet51/1 51     100000
+Ethernet204     193,194,195,196   Ethernet52/1 52     100000
+Ethernet208     209,210,211,212   Ethernet53/1 53     100000
+Ethernet212     221,222,223,224   Ethernet54/1 54     100000
+Ethernet216     233,234,235,236   Ethernet55/1 55     100000
+Ethernet220     225,226,227,228   Ethernet56/1 56     100000
+Ethernet224     241,242,243,244   Ethernet57/1 57     100000
+Ethernet228     253,254,255,256   Ethernet58/1 58     100000
+Ethernet232     157,158,159,160   Ethernet59/1 59     100000
+Ethernet236     145,146,147,148   Ethernet60/1 60     100000
+Ethernet240     165,166,167,168   Ethernet61/1 61     100000
+Ethernet244     169,170,171,172   Ethernet62/1 62     100000
+Ethernet248     189,190,191,192   Ethernet63/1 63     100000
+Ethernet252     177,178,179,180   Ethernet64/1 64     100000
+Ethernet256     257               Ethernet65   65     10000
+Ethernet260     259               Ethernet66   66     10000
diff --git a/src/sonic-config-engine/tests/sample_output/py3/arista7050cx3-dualtor.config.bcm b/src/sonic-config-engine/tests/sample_output/py3/arista7050cx3-dualtor.config.bcm
new file mode 100644
index 000000000000..7d21ac82f120
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/arista7050cx3-dualtor.config.bcm
@@ -0,0 +1,8 @@
+
+l3_alpm_hit_skip=1
+sai_remap_prio_on_tnl_egress=1
+mmu_init_config="MSFT-TH2-Tier0"
+sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2
diff --git a/src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm b/src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm
new file mode 100644
index 000000000000..7d21ac82f120
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm
@@ -0,0 +1,8 @@
+
+l3_alpm_hit_skip=1
+sai_remap_prio_on_tnl_egress=1
+mmu_init_config="MSFT-TH2-Tier0"
+sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2
diff --git a/src/sonic-config-engine/tests/sample_output/py3/arista7260-t1.config.bcm b/src/sonic-config-engine/tests/sample_output/py3/arista7260-t1.config.bcm
new file mode 100644
index 000000000000..84a917290f24
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/arista7260-t1.config.bcm
@@ -0,0 +1,5 @@
+
+l3_alpm_hit_skip=1
+
+mmu_init_config="MSFT-TH2-Tier1"
+
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 7f4e56dfc868..2c1eb3014bac 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -350,6 +350,37 @@ def test_buffers_mellanox2410_render_template(self):
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
         assert filecmp.cmp(sample_output_file, self.output_file)
 
+    def test_config_brcm_render_template(self):
+        if utils.PYvX_DIR != 'py3':
+            #Skip on python2 as the change will not be backported to previous version
+            return
+
+        config_bcm_sample_outputs = [
+            'arista7050cx3-dualtor.config.bcm',
+            'arista7260-dualtor.config.bcm',
+            'arista7260-t1.config.bcm'
+        ]
+        sample_minigraph_files = [
+            'sample-arista-7050cx3-dualtor-minigraph.xml',
+            'sample-arista-7260-dualtor-minigraph.xml',
+            'sample-arista-7260-t1-minigraph.xml'
+        ]
+        for i, config in enumerate(config_bcm_sample_outputs):
+            device_template_path = os.path.join(self.test_dir, './data/j2_template')
+            config_sample_output = config_bcm_sample_outputs[i]
+            sample_minigraph_file = os.path.join(self.test_dir,sample_minigraph_files[i])
+            port_config_ini_file = os.path.join(device_template_path, 'port_config.ini')
+            config_bcm_file = os.path.join(device_template_path, 'config.bcm.j2')
+            config_test_output = os.path.join(self.test_dir, 'config_output.bcm')
+
+            argument = '-m ' + sample_minigraph_file + ' -p ' + port_config_ini_file + ' -t ' + config_bcm_file + ' > ' + config_test_output
+            self.run_script(argument)
+
+            #check output config.bcm
+            config_sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, config_sample_output)
+            assert utils.cmp(config_sample_output_file, config_test_output)
+            os.remove(config_test_output)
+
     def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer_template, expected):
         file_exist, dir_exist = self.create_machine_conf(platform, vendor)
         dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)

From dec5dcde015e5041af43ac7ae1103e57e8e530e7 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 14 Jun 2022 22:40:41 -0700
Subject: [PATCH 1242/1674] [Advance submodule] Update sonic-sairedis pointer
 to latest (#11142)

Update sonic-sairedis submodule to include cross-branch warmboot fix:

Azure/sonic-sairedis#1065: Support ACL action data object in remove dep tree:
This is required if some of the attributes on ACL action data
object are OID's and we need to catch their refrence when
removing object and it's dependency tree.
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 544e4c2137e1..bd4b1b5117a6 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 544e4c2137e11be838fe3b5405a8d0e7d209d2d6
+Subproject commit bd4b1b5117a67a22efbf103094b091e0bb8742df

From a99debadc10322e4d9d5d6af8baaa3f0078bbe92 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Wed, 15 Jun 2022 14:40:31 -0700
Subject: [PATCH 1243/1674] [sonic-linkmgrd][202012] submodule update (#11144)

[sonic-linkmgrd][202012] submodule update

0839af2 Longxiang Lyu Wed Jun 15 08:46:21 2022 +0800 [202012] Fix IP header checksum in handleSendSwitchCommand (#89)
afc4972 Jing Zhang Wed Jun 1 10:33:12 2022 -0700 Revert "Update log level for mux probing and mux state chance (#23)" (#85)
ed52d0a Longxiang Lyu Tue May 31 10:28:30 2022 +0800 Add a command line option to store logs into a separate file (#83)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 5489cf3a126b..0839af28b998 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 5489cf3a126baa5f55a0de18cb9ba07a2d1be556
+Subproject commit 0839af28b9988a42d37fc72a226281190dcf865a

From 044570c42eec228e192eae4db928ce2749571e2d Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 16 Jun 2022 11:47:04 -0700
Subject: [PATCH 1244/1674] Remove SSH host keys after installing the custom
 version of sshd (#10633) (#11140)

* Remove SSH host keys after installing the custom version of sshd

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Use an override for for sshd instead of overwriting the service file

Don't overwrite upstream's .service file, and instead use an override
file for making sure the host key(s) are generated.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 build_debian.sh                                |  3 ++-
 .../build_templates/sonic_debian_extension.j2  |  5 +++++
 files/sshd/override.conf                       |  4 ++++
 files/sshd/sshd.service                        | 18 ------------------
 4 files changed, 11 insertions(+), 19 deletions(-)
 create mode 100644 files/sshd/override.conf
 delete mode 100644 files/sshd/sshd.service

diff --git a/build_debian.sh b/build_debian.sh
index 9dccbbd0dbb6..b5b0ad3da1de 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -373,7 +373,8 @@ sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/k
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
-sudo cp -f files/sshd/sshd.service $FILESYSTEM_ROOT/lib/systemd/system/ssh.service
+sudo mkdir $FILESYSTEM_ROOT/etc/systemd/system/ssh.service.d
+sudo cp files/sshd/override.conf $FILESYSTEM_ROOT/etc/systemd/system/ssh.service.d/override.conf
 # Config sshd
 # 1. Set 'UseDNS' to 'no'
 # 2. Configure sshd to close all SSH connetions after 15 minutes of inactivity
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index deb903096c83..1fc1146ef683 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -600,6 +600,11 @@ sudo dpkg --root=$FILESYSTEM_ROOT -P {{ debname }}
 {% endfor %}
 {% endif %}
 
+# Remove sshd host keys, and will regenerate on first sshd start. This needs to be
+# done again here because our custom version of sshd is being installed, which
+# will regenerate the sshd host keys.
+sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
+
 sudo rm -f $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
 
 # Copy fstrim service and timer file, enable fstrim timer
diff --git a/files/sshd/override.conf b/files/sshd/override.conf
new file mode 100644
index 000000000000..a1e63ce22b5d
--- /dev/null
+++ b/files/sshd/override.conf
@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=
+ExecStartPre=/usr/local/bin/host-ssh-keygen.sh
+ExecStartPre=/usr/sbin/sshd -t
diff --git a/files/sshd/sshd.service b/files/sshd/sshd.service
deleted file mode 100644
index 25d524171c6f..000000000000
--- a/files/sshd/sshd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=OpenBSD Secure Shell server
-After=network.target auditd.service
-ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
-
-[Service]
-EnvironmentFile=-/etc/default/ssh
-ExecStartPre=-/usr/local/bin/host-ssh-keygen.sh
-ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=on-failure
-RuntimeDirectory=sshd
-RuntimeDirectoryMode=0755
-
-[Install]
-WantedBy=multi-user.target
-Alias=sshd.service

From 05ff95fdfc13fc43965c4064b8674e2046bb348e Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Fri, 17 Jun 2022 04:09:59 +0300
Subject: [PATCH 1245/1674] [Mellanox]: Advance SAI submodule. (#11164)

[Mellanox]: Advance SAI submodule. (#11164)
Fix #3074227 - don't disable used tunnel underlay interfaces
fix bfd - notify Sonic for admin-down event
---
 platform/mellanox/mlnx-sai.mk                 | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 1946f156c2bd..c37b8fcefacd 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.21.1.2
+MLNX_SAI_VERSION = SAIRel1.21.2.2
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index ede5908cbd4f..392c4fc3c5e3 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit ede5908cbd4f62f751306c5ff609fcec3337272e
+Subproject commit 392c4fc3c5e300611cecf42457b832f085088719

From 5b2261da37c8b799c834a4c53012997f4902fe7d Mon Sep 17 00:00:00 2001
From: Jing Kan <672454911@qq.com>
Date: Fri, 17 Jun 2022 20:46:43 +0800
Subject: [PATCH 1246/1674] Revert "[202012][openssh] openssh: Upgrade from 7.9
 to 8.4, to match version in buster-backports (#10910)" (#11136)

This reverts commit 14fdcc815a7d414b8ef5b592de02d809f8b7f448.
---
 build_debian.sh                                |  5 +----
 .../versions/host-image/versions-deb-buster    |  6 +++---
 rules/openssh.mk                               | 15 +++++++--------
 sonic-slave-buster/Dockerfile.j2               |  5 +----
 src/openssh/Makefile                           | 18 ++++++++----------
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index b5b0ad3da1de..062f72926efa 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -281,6 +281,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     tcpdump                 \
     dbus                    \
     ntpstat                 \
+    openssh-server          \
     python                  \
     python-apt              \
     traceroute              \
@@ -322,10 +323,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     haveged                 \
     jq
 
-## Install openssh-server from buster-backports for required security patches
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -t buster-backports \
-    openssh-server
-
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 5a6e5fa6e4ce..12cb4e19adc3 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -251,9 +251,9 @@ netfilter-persistent==1.0.11+deb10u1
 ntp==1:4.2.8p12+dfsg-4+deb10u2
 ntpstat==0.0.0.1-2
 opennsl-modules==4.3.0.10-2
-openssh-client==1:8.4p1-2~bpo10+1
-openssh-server==1:8.4p1-2~bpo10+1
-openssh-sftp-server==1:8.4p1-2~bpo10+1
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
 openssl==1.1.1n-0+deb10u2
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
diff --git a/rules/openssh.mk b/rules/openssh.mk
index b92fc43eac66..0cc3de621039 100644
--- a/rules/openssh.mk
+++ b/rules/openssh.mk
@@ -1,15 +1,14 @@
 # openssh package
 
-OPENSSH_VERSION = 8.4p1
-OPENSSH_VERSION_FULL = ${OPENSSH_VERSION}-2~bpo10+1
+OPENSSH_VERSION = 7.9p1-10+deb10u2
 
-export OPENSSH_VERSION OPENSSH_VERSION_FULL
+export OPENSSH_VERSION
 
-OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
 $(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh
 SONIC_MAKE_DEBS += $(OPENSSH_SERVER)
 
-OPENSSH_SERVER_DBG = openssh-server-dbgsym_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SERVER_DBG)))
-
-export OPENSSH_SERVER OPENSSH_SERVER_DBG
+# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
+# are archived into debug one image to facilitate debugging.
+#
+DBG_SRC_ARCHIVE += openssh
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 65e0c16a58c8..8851b8f0924d 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -49,6 +49,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
         apt-utils \
         default-jre-headless \
+        openssh-server \
         curl \
         wget \
         unzip \
@@ -332,10 +333,6 @@ RUN apt-get update && apt-get install -y \
         libgtest-dev \
         libgcc-8-dev
 
-# For openssh-server
-RUN apt-get -y install -t buster-backports \
-        openssh-server \
-        libfido2-dev
 RUN apt-get -y build-dep openssh
 
 # Build fix for ARMHF buster libsairedis
diff --git a/src/openssh/Makefile b/src/openssh/Makefile
index 829628df9988..be05c6ffd675 100644
--- a/src/openssh/Makefile
+++ b/src/openssh/Makefile
@@ -2,19 +2,17 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = $(OPENSSH_SERVER)
-DERIVED_TARGETS = $(OPENSSH_SERVER_DBG)
+MAIN_TARGET = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
+DERIVED_TARGETS = openssh-server-dbgsym_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Remove stale files
-	rm -rf ./openssh-$(OPENSSH_VERSION)
+	# Obtain openssh: https://salsa.debian.org/ssh-team/openssh/-/tree/debian/1%257.9p1-10+deb10u2
+	rm -rf ./openssh-server
+	git clone https://salsa.debian.org/ssh-team/openssh.git openssh-server
+	pushd ./openssh-server
 
-	dget https://deb.debian.org/debian/pool/main/o/openssh/openssh_$(OPENSSH_VERSION_FULL).dsc
-	pushd ./openssh-$(OPENSSH_VERSION)
-
-	git init
-	git add -f *
-	git commit -qm "initial commit"
+	# Check out tag: debian/1%7.9p1-10+deb10u2
+	git checkout -b openssh-src -f 6d9ca74c48d9911342c6ca5aaac8a25974fa2619
 
 	# Apply patch series
 	stg init

From 6ddf5cd7dc1839e6779b2fea8b47ef7879cb82d9 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 17 Jun 2022 20:49:56 +0800
Subject: [PATCH 1247/1674] [202012] [cherry-pick] Generate switch level
 dscp_to_tc_map entry from qos_config template (#11132)

* Generate switch level dscp_to_tc_map

Signed-off-by: bingwang <wang.bing@microsoft.com>
---
 .../Arista-7050CX3-32S-D48C8/qos.json.j2      |    2 +-
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2 |    8 +-
 .../Arista-7260CX3-C64/buffers_extra_pgs.j2   |   20 +
 .../Arista-7260CX3-C64/qos.json.j2            |    4 +-
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 |    9 +-
 .../Arista-7260CX3-Q64/buffers_extra_pgs.j2   |    1 +
 files/build_templates/buffers_config.j2       |    4 +
 files/build_templates/qos_config.j2           |    7 +
 .../sample_output/py2/qos-arista7050.json     |    3 +
 .../py2/qos-arista7800r3-48cq2-lc.json        | 1173 +++++++++--------
 .../tests/sample_output/py2/qos-dell6100.json |    3 +
 .../tests/sample_output/py2/qos-dell9332.json |    3 +
 .../py3/buffer-arista7260-t1.json             |   48 +
 .../sample_output/py3/qos-arista7050.json     |    3 +
 ...-arista7050cx3-dualtor-remap-disabled.json |    3 +
 .../py3/qos-arista7050cx3-dualtor.json        |    5 +-
 ...qos-arista7260-dualtor-remap-disabled.json |    3 +
 .../py3/qos-arista7260-dualtor.json           |    5 +-
 .../py3/qos-arista7260-t1-remap-disabled.json |    3 +
 .../sample_output/py3/qos-arista7260-t1.json  |    5 +-
 .../py3/qos-arista7800r3-48cq2-lc.json        | 1173 +++++++++--------
 .../tests/sample_output/py3/qos-dell6100.json |    3 +
 .../tests/sample_output/py3/qos-dell9332.json |    3 +
 23 files changed, 1310 insertions(+), 1181 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
index e0aca4f8dd8b..6719911b29e5 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -145,7 +145,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7",
+            "7": "0",
             "8": "0"
         },
         "AZURE_TUNNEL": {
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
index f44d664e9d3f..55baa05e8f9e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -55,8 +55,12 @@
     },
 {%- endmacro %}
 
-{% import 'buffers_extra_queues.j2' as defs with context %}
+{% import 'buffers_extra_queues.j2' as defs1 with context %}
+{% import 'buffers_extra_pgs.j2' as defs2 with context %}
 
 {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
+{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
+{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
 {%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
new file mode 100644
index 000000000000..f827095cd954
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
@@ -0,0 +1,20 @@
+{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' %}
+{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pg) %}
+    "BUFFER_PG": {
+{% for port in port_names.split(',') %}
+{% if port not in port_names_require_no_extra_pg.split(',') %}
+        "{{ port }}|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "{{ port }}|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+{% endif %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+{% endmacro %}
+{% endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
index 4d82382817cb..cb3ad17faa39 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
@@ -79,7 +79,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7"
+            "7": "0"
         }
     },
 {%- endmacro %}
@@ -230,7 +230,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7",
+            "7": "0",
             "8": "0"
         },
         "AZURE_TUNNEL": {
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
index b5c34daa45d0..c840fe648903 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -49,9 +49,12 @@
     },
 {%- endmacro %}
 
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
+{% import 'buffers_extra_queues.j2' as defs1 with context %}
+{% import 'buffers_extra_pgs.j2' as defs2 with context %}
 
 {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
+{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
+{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
 {%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2
new file mode 120000
index 000000000000..7dfb03cbc9d0
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_extra_pgs.j2
\ No newline at end of file
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 3802081b5774..644b7eb3ebd7 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -171,6 +171,10 @@ def
 {{ defs.generate_pg_profils(port_names_active) }}
 {% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
 {{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
+{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs is defined) and (port_names_extra_queues != '') %}
+{{ defs.generate_pg_buffers_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }}
+{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
+{{ defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
 {% else %}
     "BUFFER_PG": {
 {% for port in PORT_ACTIVE %}
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 469609ab2f6d..778c3dfab978 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -214,6 +214,13 @@
     },
 {% endif %}
     "PORT_QOS_MAP": {
+{% if generate_global_dscp_to_tc_map is defined %}
+        {{- generate_global_dscp_to_tc_map() }}
+{% else %}
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        }{% if PORT_ACTIVE %},{% endif %}
+{% endif %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}": {
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
index 8493ea0b8508..b5f304dc133e 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet4": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
index 92ba2caf8d17..898ad3345335 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
@@ -114,363 +114,366 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet44": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet60": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet76": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet92": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet100": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet104": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet108": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet116": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet124": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet128": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet132": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet136": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet140": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet144": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet148": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet152": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet156": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet164": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet176": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet180": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet184": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet188": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         }
@@ -494,1039 +497,1039 @@
     },
     "QUEUE": {
         "Ethernet0|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet4|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet8|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet12|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet16|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet20|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet24|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet28|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet32|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet36|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet40|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet44|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet48|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet52|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet56|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet60|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet64|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet68|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet72|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet76|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet80|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet84|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet88|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet92|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet96|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet100|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet104|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet108|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet112|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet116|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet120|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet124|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet128|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet132|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet136|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet140|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet144|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet148|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet152|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet156|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet164|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet176|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet180|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet184|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet188|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet4|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet8|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet12|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet16|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet20|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet24|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet28|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet32|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet36|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet40|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet44|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet48|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet52|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet56|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet60|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet64|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet68|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet72|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet76|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet80|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet84|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet88|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet92|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet96|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet100|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet104|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet108|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet112|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet116|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet120|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet124|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet128|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet132|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet136|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet140|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet144|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet148|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet152|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet156|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet164|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet176|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet180|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet184|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet188|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         }
     }
 }
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
index 218481ea8f1c..c059b4bdb735 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
index 8f8737154c01..ed692ba42558 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
@@ -118,6 +118,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
index ecaa1a88db48..5ae6e6205a2d 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
@@ -112,9 +112,21 @@
         "Ethernet0|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet0|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet0|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet4|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet4|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet144|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -124,9 +136,21 @@
         "Ethernet16|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet16|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet20|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet20|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet152|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -136,9 +160,21 @@
         "Ethernet64|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet64|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet68|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet68|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet168|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -148,9 +184,21 @@
         "Ethernet80|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet80|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet84|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
+        "Ethernet84|2": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|6": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
         "Ethernet180|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
index 8493ea0b8508..b5f304dc133e 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet4": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
index 0787c6b24e8b..4bf8cb473af6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
index b67ca4971112..4e524e2bf7d1 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -8,7 +8,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7",
+            "7": "0",
             "8": "0"
         },
         "AZURE_TUNNEL": {
@@ -217,6 +217,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
index 450c11621982..6501144d4ebd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index 752f3399f620..f701492af834 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -8,7 +8,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7",
+            "7": "0",
             "8": "0"
         },
         "AZURE_TUNNEL": {
@@ -217,6 +217,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
index 9bd54d64f37a..7c63be557ea6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
index 7ab1374fc355..de0fed757f73 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -100,7 +100,7 @@
             "4": "4",
             "5": "0",
             "6": "6",
-            "7": "7"
+            "7": "0"
         }
     },
     "SCHEDULER": {
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
index 92ba2caf8d17..898ad3345335 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
@@ -114,363 +114,366 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet8": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet12": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet40": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet44": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet60": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet76": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet92": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet100": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet104": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet108": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet112": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet116": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet120": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet124": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet128": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet132": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet136": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet140": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet144": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet148": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet152": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet156": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet164": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet176": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet180": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet184": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet188": {
-            "dscp_to_tc_map"  : "AZURE",
-            "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": "AZURE",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "3,4",
             "pfcwd_sw_enable" : "3,4"
         }
@@ -494,1039 +497,1039 @@
     },
     "QUEUE": {
         "Ethernet0|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet4|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet8|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet12|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet16|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet20|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet24|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet28|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet32|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet36|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet40|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet44|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet48|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet52|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet56|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet60|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet64|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet68|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet72|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet76|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet80|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet84|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet88|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet92|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet96|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet100|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet104|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet108|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet112|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet116|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet120|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet124|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet128|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet132|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet136|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet140|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet144|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet148|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet152|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet156|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet164|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet176|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet180|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet184|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet188|3": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet4|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet8|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet12|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet16|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet20|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet24|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet28|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet32|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet36|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet40|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet44|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet48|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet52|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet56|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet60|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet64|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet68|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet72|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet76|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet80|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet84|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet88|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet92|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet96|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet100|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet104|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet108|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet112|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet116|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet120|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet124|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet128|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet132|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet136|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet140|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet144|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet148|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet152|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet156|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet164|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet176|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet180|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet184|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet188|4": {
-            "scheduler"   : "scheduler.1",
-            "wred_profile": "AZURE_LOSSLESS"
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|0": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|1": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|2": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|5": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet8|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet12|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet16|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet20|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet24|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet28|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet32|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet36|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet40|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet44|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet48|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet52|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet56|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet60|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet64|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet68|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet72|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet76|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet80|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet84|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet88|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet92|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet96|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet100|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet104|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet108|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet112|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet116|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet120|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet124|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet128|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet132|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet136|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet140|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet144|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet148|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet152|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet156|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet164|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet176|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet180|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet184|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet188|6": {
-            "scheduler": "scheduler.0"
+            "scheduler": "[SCHEDULER|scheduler.0]"
         }
     }
 }
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
index 218481ea8f1c..c059b4bdb735 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
@@ -114,6 +114,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
index 8f8737154c01..ed692ba42558 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
@@ -118,6 +118,9 @@
         }
     },
     "PORT_QOS_MAP": {
+        "global": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
+        },
         "Ethernet0": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",

From 54de99ba233ffb47ba471f40b8ddb9b674947b80 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 21 Jun 2022 20:28:50 +0800
Subject: [PATCH 1248/1674] [build] Add version files to docker image
 dependencies (#11192)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [build] Add version files to docker image dependencies

* [ci] Support to skip vstest using include/exclude config file. (#11086)

example:
├── folderA
│  ├──  fileA (skip vstest)
│  ├──  fileB
│  └──  fileC
If we want to skip vstest when changing /folderA/fileA, and not skip vstest when changing fileB or fileC.

vstest-include:
^folderA/fileA

vstest-exclude:
^folderA
---
 .azure-pipelines/azure-pipelines-build.yml |  1 +
 .azure-pipelines/template-skipvstest.yml   | 12 ++++++++++++
 .azure-pipelines/vstest-exclude            |  3 +++
 .azure-pipelines/vstest-include            |  2 ++
 Makefile.cache                             |  6 ++++++
 azure-pipelines.yml                        |  1 +
 6 files changed, 25 insertions(+)
 create mode 100644 .azure-pipelines/template-skipvstest.yml
 create mode 100644 .azure-pipelines/vstest-exclude
 create mode 100644 .azure-pipelines/vstest-include

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index a6a0b2768a79..09f2c852f81c 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -97,6 +97,7 @@ jobs:
             platform_rpc: nephos
 
     buildSteps:
+      - template: template-skipvstest.yml
       - bash: |
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
diff --git a/.azure-pipelines/template-skipvstest.yml b/.azure-pipelines/template-skipvstest.yml
new file mode 100644
index 000000000000..b47f17ce6e81
--- /dev/null
+++ b/.azure-pipelines/template-skipvstest.yml
@@ -0,0 +1,12 @@
+steps:
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - script: |
+      set -ex
+      tar_branch=origin/$(System.PullRequest.TargetBranch)
+      git diff $tar_branch..HEAD --name-only | grep -v -f .azure-pipelines/vstest-exclude && exit 0
+      git diff $tar_branch..HEAD --name-only | grep -f .azure-pipelines/vstest-include && exit 0
+      set +x
+      echo "Skip vstest jobs"
+      echo "##vso[task.setvariable variable=SKIP_VSTEST;isOutput=true]YES"
+    name: SetVar
+    displayName: "Check if vstest is needed."
diff --git a/.azure-pipelines/vstest-exclude b/.azure-pipelines/vstest-exclude
new file mode 100644
index 000000000000..71616704707a
--- /dev/null
+++ b/.azure-pipelines/vstest-exclude
@@ -0,0 +1,3 @@
+^platform
+^.azure-pipelines
+^files/build/versions
diff --git a/.azure-pipelines/vstest-include b/.azure-pipelines/vstest-include
new file mode 100644
index 000000000000..86fb3a9d88ba
--- /dev/null
+++ b/.azure-pipelines/vstest-include
@@ -0,0 +1,2 @@
+^platform/vs
+^.azure-pipelines/run-test-template.yml
diff --git a/Makefile.cache b/Makefile.cache
index 8ac02b73b383..421b87720d3f 100644
--- a/Makefile.cache
+++ b/Makefile.cache
@@ -558,6 +558,12 @@ define SHA_DEP_RULES
 ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \
                       $(addsuffix .$(3),$(addprefix $(pkg)/, $(1))) \
                       $(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1)))))
+$(foreach docker, $(filter $(SONIC_DOCKER_IMAGES), $(1)), \
+	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
+	$(wildcard files/build/versions/dockers/$(basename $(docker))/*)))
+$(foreach docker, $(filter $(SONIC_DOCKER_DBG_IMAGES), $(1)), \
+	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
+	$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*)))
 $(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \
 	$(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep)
 	@$$(eval $$*_DEP_FILES_MODIFIED := $$? )
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 60ac1c7e4fb1..1219cc81a8f7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -76,6 +76,7 @@ stages:
 
 - stage: Test
   dependsOn: BuildVS
+  condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), succeeded())
   variables:
   - name: inventory
     value: veos_vtb

From 307d0e2aca0beb2406eeceaf315fcb890f011d10 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Wed, 22 Jun 2022 01:04:49 +0800
Subject: [PATCH 1249/1674] [Mellanox][202012] Support Mellanox-SN4600C-C64 as
 T1 switch in dual-ToR scenario (#11032)

Why I did it
Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario

1. Support additional queue and PG in buffer templates, including both traditional and dynamic model
2. Support mapping DSCP 2/6 to lossless traffic in the QoS template.
3. Add macros to generate additional lossless PG in the dynamic model
4. Adjust the order in which the generic/dedicated (with additional lossless queues) macros are checked and called to generate buffer tables in common template buffers_config.j2
  - Buffer tables are rendered via using macros.
  - Both generic and dedicated macros are defined on our platform. Currently, the generic one is called as long as it is defined, which causes the generic one always being called on our platform. To avoid it, the dedicated macrio is checked and called first and then the generic ones.
5. Support MAP_PFC_PRIORITY_TO_PRIORITY_GROUP on ports with additional lossless queues.

On Mellanox-SN4600C-C64, buffer configuration for t1 is calculated as:
40 * 100G downlink ports with 4 lossless PGs/queues, 1 lossy PG, and 3 lossy queues
16 * 100G uplink ports with 2 lossless PGs/queues, 1 lossy PG, and 5 lossy queues

Signed-off-by: Stephen Sun stephens@nvidia.com

How to verify it
Run regression test.
---
 .../buffers_defaults_objects.j2               |   66 +-
 .../buffers_defaults_t1.j2                    |   15 +
 .../Mellanox-SN4600C-C64/qos.json.j2          |   93 +-
 files/build_templates/buffers_config.j2       |   16 +-
 files/build_templates/qos_config.j2           |   12 +
 ...anox-4600c-t1-minigraph-remap-disabled.xml | 2460 ++++++++++++++++
 .../sample-mellanox-4600c-t1-minigraph.xml    | 2465 +++++++++++++++++
 ...llanox4600c-t1-dynamic-remap-disabled.json | 1481 ++++++++++
 .../py3/buffers-mellanox4600c-t1-dynamic.json | 1661 +++++++++++
 ...ffers-mellanox4600c-t1-remap-disabled.json | 1306 +++++++++
 .../py3/buffers-mellanox4600c-t1.json         | 1426 ++++++++++
 .../qos-mellanox4600c-c64-remap-disabled.json | 1005 +++++++
 .../py3/qos-mellanox4600c-c64.json            | 1045 +++++++
 src/sonic-config-engine/tests/test_j2files.py |   25 +-
 14 files changed, 13059 insertions(+), 17 deletions(-)
 mode change 120000 => 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
 create mode 100644 src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph-remap-disabled.xml
 create mode 100644 src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64-remap-disabled.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
index 78cb3edb244c..e8d4133ee669 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
@@ -124,24 +124,55 @@
     }
 {%- endmacro %}
 
-{%- macro generate_queue_buffers(port_names_active, port_names_inactive) %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) %}
     "BUFFER_QUEUE": {
+{% set q_loop = namespace(last_valid=false) %}
 {% for port in port_names_active.split(',') %}
+{% if port not in port_names_extra_queues.split(',') %}
         "{{ port }}|3-4": {
             "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
+{% endif %}
 {% endfor %}
 {% for port in port_names_active.split(',') %}
+{% if port not in port_names_extra_queues.split(',') %}
         "{{ port }}|0-2": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
+{% endif %}
 {% endfor %}
 {% for port in port_names_active.split(',') %}
+{% if port not in port_names_extra_queues.split(',') %}
         "{{ port }}|5-6": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         }{% if not loop.last %},{% endif %}
 
+{% set q_loop.last_valid = true %}
+{% else %}
+{% set q_loop.last_valid = false %}
+{% endif %}
+{% endfor %}
+{% if port_names_extra_queues|length > 0 %}
+{% if q_loop.last_valid %},{% endif %}
+{% for port in port_names_extra_queues.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "{{ port }}|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "{{ port }}|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
 {% endfor %}
+{% endif %}
 {% if port_names_inactive|length > 0 %}
 ,
 {% if dynamic_mode is defined %}
@@ -183,9 +214,15 @@
     }
 {%- endmacro %}
 
-{%- macro generate_pg_profiles(port_names_active, port_names_inactive) %}
+{%- macro generate_queue_buffers(port_names_active, port_names_inactive) %}
+{{ generate_queue_buffers_with_extra_lossless_queues(port_names_active, "", port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) %}
     "BUFFER_PG": {
+{% set pg_loop = namespace(last_valid=false) %}
 {% for port in port_names_active.split(',') %}
+{% if port not in port_names_extra_pgs.split(',') %}
 {% if dynamic_mode is defined %}
         "{{ port }}|3-4": {
             "profile" : "NULL"
@@ -195,7 +232,28 @@
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         }{% if not loop.last %},{% endif %}
 
+{% set pg_loop.last_valid = true %}
+{% else %}
+{% set pg_loop.last_valid = false %}
+{% endif %}
 {% endfor %}
+{% if port_names_extra_pgs|length > 0 %}
+{% if pg_loop.last_valid %},{% endif %}
+{% for port in port_names_extra_pgs.split(',') %}
+{% if dynamic_mode is defined %}
+        "{{ port }}|2-4": {
+            "profile" : "NULL"
+        },
+        "{{ port }}|6": {
+            "profile" : "NULL"
+        },
+{% endif %}
+        "{{ port }}|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+{% endif %}
 {% if port_names_inactive|length > 0 %}
 {%- for port in port_names_inactive.split(',') %}
        {%- if loop.first -%},{%- endif -%}
@@ -216,3 +274,7 @@
 {% endif %}
     }
 {%- endmacro %}
+
+{%- macro generate_pg_profiles(port_names_active, port_names_inactive) %}
+{{ generate_pg_profiles_with_extra_lossless_pgs(port_names_active, "", port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
index fcc499665f3d..fec39f817352 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -1,8 +1,15 @@
 {% set default_cable = '5m' %}
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
+{% set ingress_lossless_pool_size =  '44130304' %}
+{% set ingress_lossless_pool_xoff  =  '8790016' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '44130304' %}
+{%- else -%}
 {% set ingress_lossless_pool_size =  '48332800' %}
 {% set ingress_lossless_pool_xoff  =  '5275648' %}
 {% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '48332800' %}
+{%- endif -%}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
@@ -14,10 +21,18 @@
 {{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
+{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
+{%- endmacro %}
+
 {%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
 {{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
 {%- endmacro %}
 
+{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
+{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
+{%- endmacro %}
+
 {%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
 {{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
 {%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
deleted file mode 120000
index eccf286dc879..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
new file mode 100644
index 000000000000..b35132b2e629
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
@@ -0,0 +1,92 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_global_dscp_to_tc_map() %}
+{# This is an empty macro since the global DSCP_TO_TC map is not required #}
+{%- endmacro %}
+
+{% endif %}
+
+{%- include 'qos_config.j2' %}
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 644b7eb3ebd7..2089b0e01ed0 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -167,14 +167,16 @@ def
 {{ defs.generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% endif %}
 
-{%- if defs.generate_pg_profils is defined %}
-{{ defs.generate_pg_profils(port_names_active) }}
+{% if (defs.generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
+{{ defs.generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }},
 {% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
 {{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% elif (defs.generate_pg_buffers_with_extra_lossy_pgs is defined) and (port_names_extra_queues != '') %}
 {{ defs.generate_pg_buffers_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }}
 {% elif (defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
 {{ defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
+{% elif defs.generate_pg_profils is defined %}
+{{ defs.generate_pg_profils(port_names_active) }}
 {% else %}
     "BUFFER_PG": {
 {% for port in PORT_ACTIVE %}
@@ -191,14 +193,14 @@ def
     },
 {% endif %}
 
-{% if defs.generate_queue_buffers is defined %}
-{{ defs.generate_queue_buffers(port_names_active) }}
-{% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
-{{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
-{% elif (defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
+{% if (defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
 {{ defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
 {% elif (defs.generate_queue_buffers_with_extra_lossless_queues is defined) and (port_names_extra_queues != '') %}
 {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }}
+{% elif defs.generate_queue_buffers is defined %}
+{{ defs.generate_queue_buffers(port_names_active) }}
+{% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
+{{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
 {% else %}
     "BUFFER_QUEUE": {
 {% for port in PORT_ACTIVE %}
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 778c3dfab978..a37ad879b9fc 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -207,6 +207,14 @@
 {% endif %}
 {% if asic_type in pfc_to_pg_map_supported_asics  %}
     "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+{% if port_names_list_extra_queues|length > 0 %}
+        "AZURE_DUALTOR": {
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "6": "6"
+        },
+{% endif %}
         "AZURE": {
             "3": "3",
             "4": "4"
@@ -232,8 +240,12 @@
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
 {% if asic_type in pfc_to_pg_map_supported_asics %}
+{% if port in port_names_list_extra_queues %}
+            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE_DUALTOR]",
+{% else %}
             "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
 {% endif %}
+{% endif %}
 {% if port in port_names_list_extra_queues %}
             "pfc_enable"      : "2,3,4,6",
 {% else %}
diff --git a/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph-remap-disabled.xml
new file mode 100644
index 000000000000..3d08387d71a0
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph-remap-disabled.xml
@@ -0,0 +1,2460 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::5</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::6</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::D</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.64</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>10.0.0.65</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::81</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>FC00::82</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.66</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>10.0.0.67</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::85</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>FC00::86</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.68</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>10.0.0.69</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::89</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>FC00::8A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.70</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>10.0.0.71</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::8D</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>FC00::8E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>r-tigon-11</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.65</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.67</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.69</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.71</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64017</a:ASN>
+        <a:Hostname>ARISTA17T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64018</a:ASN>
+        <a:Hostname>ARISTA18T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64019</a:ASN>
+        <a:Hostname>ARISTA19T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64020</a:ASN>
+        <a:Hostname>ARISTA20T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.100.25.10/22</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.100.25.10/22</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>fe80::e42:a1ff:fe60:65d8/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>fe80::e42:a1ff:fe60:65d8/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>r-tigon-11</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>etp35</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>etp1;etp2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>etp37</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>etp38</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel105</Name>
+          <AttachTo>etp5;etp6</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel106</Name>
+          <AttachTo>etp39</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel107</Name>
+          <AttachTo>etp40</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel108</Name>
+          <AttachTo>etp17;etp18</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel109</Name>
+          <AttachTo>etp43</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1010</Name>
+          <AttachTo>etp45</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1011</Name>
+          <AttachTo>etp21;etp22</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1012</Name>
+          <AttachTo>etp46</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1013</Name>
+          <AttachTo>etp47</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1014</Name>
+          <AttachTo>etp48</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1015</Name>
+          <AttachTo>etp51</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1016</Name>
+          <AttachTo>etp53</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1017</Name>
+          <AttachTo>etp54</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1018</Name>
+          <AttachTo>etp55</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1019</Name>
+          <AttachTo>etp56</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1020</Name>
+          <AttachTo>etp59</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1021</Name>
+          <AttachTo>etp61</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1022</Name>
+          <AttachTo>etp62</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1023</Name>
+          <AttachTo>etp63</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1024</Name>
+          <AttachTo>etp64</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>FC00::5/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>FC00::D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>10.0.0.64/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>FC00::81/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>10.0.0.66/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>FC00::85/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>10.0.0.68/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>FC00::89/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>10.0.0.70/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>FC00::8D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp35</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp2</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp37</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp38</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp5</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp6</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp39</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp40</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp17</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp18</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp43</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp45</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp21</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp22</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp46</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp47</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp48</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp51</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp53</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp54</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp55</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp56</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp59</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA17T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp61</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA18T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp62</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA19T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp63</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA20T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp64</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>r-tigon-11</Hostname>
+        <HwSku>Mellanox-SN4600C-C64</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.25.10</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.82</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.77</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.76</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA17T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.83</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.75</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA20T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.86</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.74</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.73</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.66</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.63</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.67</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.65</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.71</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.68</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.69</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.64</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.70</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA18T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.84</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.81</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA19T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.85</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.80</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.78</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.79</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.72</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp5</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp6</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp7</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp9</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp10</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp11</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp13</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp14</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp15</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp17</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp18</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp19</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp21</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp22</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp23</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp25</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp26</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp27</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp29</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp30</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp31</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp33</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp34</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp35</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp37</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp38</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp39</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp41</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp42</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp43</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp45</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp46</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp47</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp49</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp50</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp51</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp53</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp54</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp55</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp57</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp58</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp59</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp61</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp62</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp63</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Mellanox-SN4600C-C64</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>r-tigon-11</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.100.25.32;10.102.202.2</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.9</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>testlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.107.34.20</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.102.0.0/16;10.101.0.0/16</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.7</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>r-tigon-11</Hostname>
+  <HwSku>Mellanox-SN4600C-C64</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph.xml
new file mode 100644
index 000000000000..bdb8acc63119
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-mellanox-4600c-t1-minigraph.xml
@@ -0,0 +1,2465 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.32</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>10.0.0.33</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::41</StartPeer>
+        <EndRouter>ARISTA01T0</EndRouter>
+        <EndPeer>FC00::42</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.0</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>10.0.0.1</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::1</StartPeer>
+        <EndRouter>ARISTA01T2</EndRouter>
+        <EndPeer>FC00::2</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.34</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>10.0.0.35</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::45</StartPeer>
+        <EndRouter>ARISTA02T0</EndRouter>
+        <EndPeer>FC00::46</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.36</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>10.0.0.37</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::49</StartPeer>
+        <EndRouter>ARISTA03T0</EndRouter>
+        <EndPeer>FC00::4A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.4</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>10.0.0.5</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::5</StartPeer>
+        <EndRouter>ARISTA03T2</EndRouter>
+        <EndPeer>FC00::6</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.38</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>10.0.0.39</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::4D</StartPeer>
+        <EndRouter>ARISTA04T0</EndRouter>
+        <EndPeer>FC00::4E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.40</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>10.0.0.41</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::51</StartPeer>
+        <EndRouter>ARISTA05T0</EndRouter>
+        <EndPeer>FC00::52</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.8</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>10.0.0.9</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::9</StartPeer>
+        <EndRouter>ARISTA05T2</EndRouter>
+        <EndPeer>FC00::A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.42</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>10.0.0.43</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::55</StartPeer>
+        <EndRouter>ARISTA06T0</EndRouter>
+        <EndPeer>FC00::56</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.44</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>10.0.0.45</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::59</StartPeer>
+        <EndRouter>ARISTA07T0</EndRouter>
+        <EndPeer>FC00::5A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.12</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>10.0.0.13</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::D</StartPeer>
+        <EndRouter>ARISTA07T2</EndRouter>
+        <EndPeer>FC00::E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.46</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>10.0.0.47</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::5D</StartPeer>
+        <EndRouter>ARISTA08T0</EndRouter>
+        <EndPeer>FC00::5E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.48</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>10.0.0.49</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::61</StartPeer>
+        <EndRouter>ARISTA09T0</EndRouter>
+        <EndPeer>FC00::62</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.50</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>10.0.0.51</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::65</StartPeer>
+        <EndRouter>ARISTA10T0</EndRouter>
+        <EndPeer>FC00::66</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.52</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>10.0.0.53</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::69</StartPeer>
+        <EndRouter>ARISTA11T0</EndRouter>
+        <EndPeer>FC00::6A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.54</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>10.0.0.55</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::6D</StartPeer>
+        <EndRouter>ARISTA12T0</EndRouter>
+        <EndPeer>FC00::6E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA13T0</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA14T0</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA15T0</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA16T0</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.64</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>10.0.0.65</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::81</StartPeer>
+        <EndRouter>ARISTA17T0</EndRouter>
+        <EndPeer>FC00::82</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.66</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>10.0.0.67</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::85</StartPeer>
+        <EndRouter>ARISTA18T0</EndRouter>
+        <EndPeer>FC00::86</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.68</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>10.0.0.69</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::89</StartPeer>
+        <EndRouter>ARISTA19T0</EndRouter>
+        <EndPeer>FC00::8A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>10.0.0.70</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>10.0.0.71</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>r-tigon-11</StartRouter>
+        <StartPeer>FC00::8D</StartPeer>
+        <EndRouter>ARISTA20T0</EndRouter>
+        <EndPeer>FC00::8E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>r-tigon-11</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.33</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.1</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.35</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.37</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.5</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.39</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.41</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.9</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.43</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.45</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.13</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.47</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.49</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.51</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.53</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.55</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.65</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.67</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.69</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.71</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64001</a:ASN>
+        <a:Hostname>ARISTA01T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA01T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64002</a:ASN>
+        <a:Hostname>ARISTA02T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64003</a:ASN>
+        <a:Hostname>ARISTA03T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA03T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64004</a:ASN>
+        <a:Hostname>ARISTA04T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64005</a:ASN>
+        <a:Hostname>ARISTA05T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA05T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64006</a:ASN>
+        <a:Hostname>ARISTA06T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64007</a:ASN>
+        <a:Hostname>ARISTA07T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65200</a:ASN>
+        <a:Hostname>ARISTA07T2</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64008</a:ASN>
+        <a:Hostname>ARISTA08T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64009</a:ASN>
+        <a:Hostname>ARISTA09T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64010</a:ASN>
+        <a:Hostname>ARISTA10T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64011</a:ASN>
+        <a:Hostname>ARISTA11T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64012</a:ASN>
+        <a:Hostname>ARISTA12T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64013</a:ASN>
+        <a:Hostname>ARISTA13T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64014</a:ASN>
+        <a:Hostname>ARISTA14T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64015</a:ASN>
+        <a:Hostname>ARISTA15T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64016</a:ASN>
+        <a:Hostname>ARISTA16T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64017</a:ASN>
+        <a:Hostname>ARISTA17T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64018</a:ASN>
+        <a:Hostname>ARISTA18T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64019</a:ASN>
+        <a:Hostname>ARISTA19T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64020</a:ASN>
+        <a:Hostname>ARISTA20T0</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.100.25.10/22</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.100.25.10/22</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>fe80::e42:a1ff:fe60:65d8/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>fe80::e42:a1ff:fe60:65d8/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>r-tigon-11</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>etp35</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>etp1;etp2</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>etp37</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>etp38</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel105</Name>
+          <AttachTo>etp5;etp6</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel106</Name>
+          <AttachTo>etp39</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel107</Name>
+          <AttachTo>etp40</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel108</Name>
+          <AttachTo>etp17;etp18</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel109</Name>
+          <AttachTo>etp43</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1010</Name>
+          <AttachTo>etp45</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1011</Name>
+          <AttachTo>etp21;etp22</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1012</Name>
+          <AttachTo>etp46</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1013</Name>
+          <AttachTo>etp47</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1014</Name>
+          <AttachTo>etp48</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1015</Name>
+          <AttachTo>etp51</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1016</Name>
+          <AttachTo>etp53</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1017</Name>
+          <AttachTo>etp54</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1018</Name>
+          <AttachTo>etp55</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1019</Name>
+          <AttachTo>etp56</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1020</Name>
+          <AttachTo>etp59</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1021</Name>
+          <AttachTo>etp61</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1022</Name>
+          <AttachTo>etp62</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1023</Name>
+          <AttachTo>etp63</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel1024</Name>
+          <AttachTo>etp64</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.32/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::41/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.0/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::1/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.34/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::45/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.36/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::49/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>10.0.0.4/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel105</AttachTo>
+          <Prefix>FC00::5/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>10.0.0.38/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel106</AttachTo>
+          <Prefix>FC00::4D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>10.0.0.40/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel107</AttachTo>
+          <Prefix>FC00::51/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>10.0.0.8/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel108</AttachTo>
+          <Prefix>FC00::9/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>10.0.0.42/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel109</AttachTo>
+          <Prefix>FC00::55/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>10.0.0.44/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1010</AttachTo>
+          <Prefix>FC00::59/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>10.0.0.12/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1011</AttachTo>
+          <Prefix>FC00::D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>10.0.0.46/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1012</AttachTo>
+          <Prefix>FC00::5D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>10.0.0.48/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1013</AttachTo>
+          <Prefix>FC00::61/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>10.0.0.50/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1014</AttachTo>
+          <Prefix>FC00::65/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>10.0.0.52/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1015</AttachTo>
+          <Prefix>FC00::69/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>10.0.0.54/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1016</AttachTo>
+          <Prefix>FC00::6D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1017</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1018</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1019</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1020</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>10.0.0.64/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1021</AttachTo>
+          <Prefix>FC00::81/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>10.0.0.66/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1022</AttachTo>
+          <Prefix>FC00::85/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>10.0.0.68/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1023</AttachTo>
+          <Prefix>FC00::89/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>10.0.0.70/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1024</AttachTo>
+          <Prefix>FC00::8D/126</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp35</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp2</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp37</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp38</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp5</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp6</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp39</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp40</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp17</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA05T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp18</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA06T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp43</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp45</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp21</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA07T2</EndDevice>
+        <EndPort>Ethernet2</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp22</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA08T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp46</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA09T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp47</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA10T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp48</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA11T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp51</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA12T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp53</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA13T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp54</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA14T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp55</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA15T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp56</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA16T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp59</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA17T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp61</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA18T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp62</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA19T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp63</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA20T0</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>r-tigon-11</StartDevice>
+        <StartPort>etp64</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>r-tigon-11</Hostname>
+        <HwSku>Mellanox-SN4600C-C64</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.100.25.10</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA16T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.82</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA11T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.77</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA10T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.76</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA17T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.83</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA09T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.75</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA20T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.86</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA08T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.74</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA07T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.73</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA07T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.66</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA01T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.63</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA01T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.67</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA05T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.65</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA05T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.71</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA02T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.68</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA03T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.69</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="SpineRouter">
+         <Hostname>ARISTA03T2</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.64</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA04T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.70</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA18T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.84</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA15T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.81</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA19T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.85</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA14T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.80</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA12T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.78</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA13T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.79</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="ToRRouter">
+         <Hostname>ARISTA06T0</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.101.14.72</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp3</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp5</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp6</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp7</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp9</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp10</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp11</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp13</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp14</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp15</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp17</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp18</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp19</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp21</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp22</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp23</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp25</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp26</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp27</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp29</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp30</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp31</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp33</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp34</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp35</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp37</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp38</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp39</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp41</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp42</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp43</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp45</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp46</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp47</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp49</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp50</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp51</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp53</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp54</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp55</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp57</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp58</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp59</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp61</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp62</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp63</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>etp64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>50000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Mellanox-SN4600C-C64</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>r-tigon-11</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.100.25.32;10.102.202.2</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.9</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>testlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.107.34.20</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.102.0.0/16;10.101.0.0/16</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.0.0.7</a:Value>
+         </a:DeviceProperty>
+         <a:DeviceProperty>
+            <a:Name>DownstreamRedundancyTypes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Gemini</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>r-tigon-11</Hostname>
+  <HwSku>Mellanox-SN4600C-C64</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic-remap-disabled.json
new file mode 100644
index 000000000000..53147866a2cb
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic-remap-disabled.json
@@ -0,0 +1,1481 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "5m",
+            "Ethernet12": "5m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet44": "5m",
+            "Ethernet48": "5m",
+            "Ethernet52": "5m",
+            "Ethernet56": "5m",
+            "Ethernet60": "5m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "5m",
+            "Ethernet76": "5m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet108": "5m",
+            "Ethernet112": "5m",
+            "Ethernet116": "5m",
+            "Ethernet120": "5m",
+            "Ethernet124": "5m",
+            "Ethernet128": "5m",
+            "Ethernet132": "5m",
+            "Ethernet136": "40m",
+            "Ethernet140": "5m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "5m",
+            "Ethernet164": "5m",
+            "Ethernet168": "40m",
+            "Ethernet172": "5m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "5m",
+            "Ethernet196": "5m",
+            "Ethernet200": "40m",
+            "Ethernet204": "5m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "5m",
+            "Ethernet228": "5m",
+            "Ethernet232": "40m",
+            "Ethernet236": "5m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "60817392",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet0|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,        "Ethernet8|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet224|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet228|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet236|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+    }
+,    "DEFAULT_LOSSLESS_BUFFER_PARAMETER": {
+        "AZURE": {
+            "default_dynamic_th": "0"
+        }
+    },
+    "LOSSLESS_TRAFFIC_PATTERN": {
+        "AZURE": {
+            "mtu": "1024",
+            "small_packet_percentage": "100"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
new file mode 100644
index 000000000000..38b865b81a9a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
@@ -0,0 +1,1661 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "5m",
+            "Ethernet12": "5m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet44": "5m",
+            "Ethernet48": "5m",
+            "Ethernet52": "5m",
+            "Ethernet56": "5m",
+            "Ethernet60": "5m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "5m",
+            "Ethernet76": "5m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet108": "5m",
+            "Ethernet112": "5m",
+            "Ethernet116": "5m",
+            "Ethernet120": "5m",
+            "Ethernet124": "5m",
+            "Ethernet128": "5m",
+            "Ethernet132": "5m",
+            "Ethernet136": "40m",
+            "Ethernet140": "5m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "5m",
+            "Ethernet164": "5m",
+            "Ethernet168": "40m",
+            "Ethernet172": "5m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "5m",
+            "Ethernet196": "5m",
+            "Ethernet200": "40m",
+            "Ethernet204": "5m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "5m",
+            "Ethernet228": "5m",
+            "Ethernet232": "40m",
+            "Ethernet236": "5m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "60817392",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet0|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet136|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet144|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet148|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet152|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet156|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet168|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet176|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet180|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet184|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet188|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet200|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet208|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet212|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet216|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet220|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet232|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet240|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet244|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet248|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|2-4": {
+            "profile" : "NULL"
+        },
+        "Ethernet252|6": {
+            "profile" : "NULL"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,        "Ethernet8|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "NULL"
+        },
+       "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet224|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet228|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet236|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+    }
+,    "DEFAULT_LOSSLESS_BUFFER_PARAMETER": {
+        "AZURE": {
+            "default_dynamic_th": "0"
+        }
+    },
+    "LOSSLESS_TRAFFIC_PATTERN": {
+        "AZURE": {
+            "mtu": "1024",
+            "small_packet_percentage": "100"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-remap-disabled.json
new file mode 100644
index 000000000000..aa7693071228
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-remap-disabled.json
@@ -0,0 +1,1306 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "5m",
+            "Ethernet12": "5m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet44": "5m",
+            "Ethernet48": "5m",
+            "Ethernet52": "5m",
+            "Ethernet56": "5m",
+            "Ethernet60": "5m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "5m",
+            "Ethernet76": "5m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet108": "5m",
+            "Ethernet112": "5m",
+            "Ethernet116": "5m",
+            "Ethernet120": "5m",
+            "Ethernet124": "5m",
+            "Ethernet128": "5m",
+            "Ethernet132": "5m",
+            "Ethernet136": "40m",
+            "Ethernet140": "5m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "5m",
+            "Ethernet164": "5m",
+            "Ethernet168": "40m",
+            "Ethernet172": "5m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "5m",
+            "Ethernet196": "5m",
+            "Ethernet200": "40m",
+            "Ethernet204": "5m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "5m",
+            "Ethernet228": "5m",
+            "Ethernet232": "40m",
+            "Ethernet236": "5m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "48332800",
+            "xoff": "5275648",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "60817392",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "48332800",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
new file mode 100644
index 000000000000..fd9d75f31313
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
@@ -0,0 +1,1426 @@
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "300m",
+            "Ethernet4": "300m",
+            "Ethernet8": "5m",
+            "Ethernet12": "5m",
+            "Ethernet16": "300m",
+            "Ethernet20": "300m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet44": "5m",
+            "Ethernet48": "5m",
+            "Ethernet52": "5m",
+            "Ethernet56": "5m",
+            "Ethernet60": "5m",
+            "Ethernet64": "300m",
+            "Ethernet68": "300m",
+            "Ethernet72": "5m",
+            "Ethernet76": "5m",
+            "Ethernet80": "300m",
+            "Ethernet84": "300m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet108": "5m",
+            "Ethernet112": "5m",
+            "Ethernet116": "5m",
+            "Ethernet120": "5m",
+            "Ethernet124": "5m",
+            "Ethernet128": "5m",
+            "Ethernet132": "5m",
+            "Ethernet136": "40m",
+            "Ethernet140": "5m",
+            "Ethernet144": "40m",
+            "Ethernet148": "40m",
+            "Ethernet152": "40m",
+            "Ethernet156": "40m",
+            "Ethernet160": "5m",
+            "Ethernet164": "5m",
+            "Ethernet168": "40m",
+            "Ethernet172": "5m",
+            "Ethernet176": "40m",
+            "Ethernet180": "40m",
+            "Ethernet184": "40m",
+            "Ethernet188": "40m",
+            "Ethernet192": "5m",
+            "Ethernet196": "5m",
+            "Ethernet200": "40m",
+            "Ethernet204": "5m",
+            "Ethernet208": "40m",
+            "Ethernet212": "40m",
+            "Ethernet216": "40m",
+            "Ethernet220": "40m",
+            "Ethernet224": "5m",
+            "Ethernet228": "5m",
+            "Ethernet232": "40m",
+            "Ethernet236": "5m",
+            "Ethernet240": "40m",
+            "Ethernet244": "40m",
+            "Ethernet248": "40m",
+            "Ethernet252": "40m"
+        }
+    },
+
+    "BUFFER_POOL": {
+        "ingress_zero_pool" : {
+            "mode": "static",
+            "type": "ingress",
+            "size": "0"
+        },
+        "ingress_lossless_pool": {
+            "size": "44130304",
+            "xoff": "8790016",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "60817392",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "44130304",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_pg_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_zero_pool]",
+          "size":"0",
+          "static_th":"0"
+        },
+        "ingress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossless_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossless_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "egress_lossy_zero_profile" : {
+          "pool":"[BUFFER_POOL|egress_lossy_pool]",
+          "size":"0",
+          "dynamic_th":"-8"
+        },
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"7"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"9216",
+            "dynamic_th":"7"
+        },
+        "q_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        }
+    },
+    "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile]"
+        }
+    },
+    "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+        "Ethernet136": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet0": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet144": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet148": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet152": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet156": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet168": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet176": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet180": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet184": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet188": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet200": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet208": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet212": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet216": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet220": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet232": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet240": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet244": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet248": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet252": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+,
+        "Ethernet8": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236": {
+            "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet0|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet136|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet144|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet148|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet152|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet156|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet168|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet176|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet180|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet184|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet188|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet200|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet208|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet212|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet216|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet220|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet232|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet240|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet244|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet248|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet252|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+,       "Ethernet8|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet12|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet24|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet28|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet32|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet36|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet40|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet44|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet48|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet52|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet56|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet60|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet72|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet76|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet88|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet92|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet96|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet100|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet104|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet108|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet112|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet116|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet120|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet124|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet128|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet132|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet140|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet160|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet164|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet172|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet192|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet196|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet204|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet224|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet228|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        },
+       "Ethernet236|0": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]"
+        }
+    },
+
+    "BUFFER_QUEUE": {
+        "Ethernet0|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet0|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet0|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet136|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet136|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet144|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet144|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet148|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet148|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet152|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet152|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet156|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet156|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet168|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet168|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet176|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet176|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet180|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet180|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet184|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet184|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet188|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet188|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet200|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet200|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet208|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet208|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet212|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet212|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet216|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet216|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet220|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet220|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet232|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet232|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet240|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet240|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet244|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet244|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet248|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet248|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|0-1": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|2-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|5": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        },
+        "Ethernet252|6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet252|7": {
+            "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+        }
+,
+        "Ethernet8|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet100|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet104|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet108|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet112|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet128|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet132|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet140|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet160|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet164|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet172|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet192|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet196|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet204|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet224|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet228|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet236|3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet100|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet104|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet108|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet128|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet132|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet140|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet160|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet164|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet172|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet192|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet196|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet204|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet224|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet228|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        },
+        "Ethernet236|5-6": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64-remap-disabled.json
new file mode 100644
index 000000000000..9bd54d64f37a
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64-remap-disabled.json
@@ -0,0 +1,1005 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "2",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "6",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
new file mode 100644
index 000000000000..997cdb1bcc1e
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
@@ -0,0 +1,1045 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet4": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet16": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet20": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet64": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet68": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet80": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet84": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "3,4",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet136": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet144": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet148": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet152": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet156": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet168": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet176": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet180": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet184": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet188": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet200": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet208": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet212": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet216": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet220": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet232": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet240": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet244": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet248": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        },
+        "Ethernet252": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable"      : "2,3,4,6",
+            "pfcwd_sw_enable" : "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|3": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet4|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet16|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet20|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet64|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet68|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet80|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet84|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet136|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|4": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|0": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|1": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|2": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|2": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet0|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet144|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet148|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet152|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet156|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet168|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet176|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet180|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet184|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet188|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet200|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet208|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet212|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet216|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet220|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet232|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet240|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet244|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet248|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet252|5": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet4|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet16|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet20|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet64|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet68|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet80|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet84|6": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet136|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet144|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet148|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet152|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet156|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet168|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet176|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet180|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet184|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet188|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet200|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet208|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet212|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet216|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet220|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet232|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet240|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet244|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet248|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        },
+        "Ethernet252|6": {
+            "scheduler"   : "[SCHEDULER|scheduler.1]",
+            "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 2c1eb3014bac..4b6859772500 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -328,7 +328,7 @@ def test_buffers_mellanox2700_render_template(self):
         os.remove(buffers_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2700.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_mellanox2410_render_template(self):
         # Mellanox buffer template rendering for double ingress pools mode
@@ -348,7 +348,7 @@ def test_buffers_mellanox2410_render_template(self):
         os.remove(buffers_config_file_new)
 
         sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
-        assert filecmp.cmp(sample_output_file, self.output_file)
+        assert utils.cmp(sample_output_file, self.output_file)
 
     def test_config_brcm_render_template(self):
         if utils.PYvX_DIR != 'py3':
@@ -428,7 +428,11 @@ def test_extra_lossless_buffer_for_tunnel_remapping(self):
             ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor.json'),
             ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor-remap-disabled.json'),
             ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-t1.json'),
-            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-t1-remap-disabled.json')
+            ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-t1-remap-disabled.json'),
+            ('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t1-dynamic.json'),
+            ('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t1.json'),
+            ('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t1-dynamic-remap-disabled.json'),
+            ('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t1-remap-disabled.json')
         ]
 
         for test_data in TEST_DATA:
@@ -450,15 +454,19 @@ def test_qos_dscp_remapping_render_template(self):
             '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64',
             '../../../device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8',
             '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8',
-            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64'
-            ]
+            '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64',
+            '../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64',
+            '../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64'
+        ]
         sample_outputs = [
             'qos-arista7050cx3-dualtor.json',
             'qos-arista7260-dualtor.json',
             'qos-arista7260-t1.json',
             'qos-arista7050cx3-dualtor-remap-disabled.json',
             'qos-arista7260-dualtor-remap-disabled.json',
-            'qos-arista7260-t1-remap-disabled.json'
+            'qos-arista7260-t1-remap-disabled.json',
+            'qos-mellanox4600c-c64.json',
+            'qos-mellanox4600c-c64-remap-disabled.json'
         ]
         sample_minigraph_files = [
             'sample-arista-7050cx3-dualtor-minigraph.xml',
@@ -466,8 +474,11 @@ def test_qos_dscp_remapping_render_template(self):
             'sample-arista-7260-t1-minigraph.xml',
             'sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml',
             'sample-arista-7260-dualtor-minigraph-remap-disabled.xml',
-            'sample-arista-7260-t1-minigraph-remap-disabled.xml'
+            'sample-arista-7260-t1-minigraph-remap-disabled.xml',
+            'sample-mellanox-4600c-t1-minigraph.xml',
+            'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml'
         ]
+
         for i, path in enumerate(dir_paths):
             device_template_path = os.path.join(self.test_dir, path)
             sample_output = sample_outputs[i]

From 86f5dfc1f930b344e97de2c109be61757cb77bdb Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Tue, 21 Jun 2022 15:38:10 -0700
Subject: [PATCH 1250/1674] [Submodule] update sonic-swss (#11203)

Commits:

bee3684 - 2022-06-20 : Add BGP profile to Vnet routes (#2339) [Prince Sunny]
f9af510 - 2022-06-16 : [intfmgr]: Set proxy_arp kernel param (#2334) [Lawrence Lee]
725071f - 2022-06-08 : Fix test_warm_reboot issues blocking PR merge (#2309) [Vaibhav Hemant Dixit]
0db6f15 - 2021-11-16 : [orchagent] Flush pipeline every 1 second, not only when select will timeout (#2003) [Kamil Cudnik]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c627f574585f..bee36846890e 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c627f574585f0ed3e15650d51faf941065b39da2
+Subproject commit bee36846890e63e584435911c14dd8334b767ca1

From 7a7c363548c8cb060c4ce9b0a81ea50fa271e90d Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Fri, 24 Jun 2022 01:28:11 +0530
Subject: [PATCH 1251/1674] [DellEMC] S6100 Platform Service optimization
 (#10989)

Why I did it
- To reduce rc.local script execution time.
- Time consumption of rc.local script is around 22 seconds in S6100.
How I did it
- Moving platform-modules-s6100.service and s6100-lpc-monitor.service asynchronous to rc.local script.
How to verify it
- Load the image with the changes and the time consumption of rc.local script reduced from 22 seconds(approx.) to 14 seconds(approx.) during warm-/fast-reboot upgrades.
- sonic-mgmt test results.
---
 .../debian/platform-modules-s6100.init        | 40 ------------------
 .../debian/platform-modules-s6100.postinst    |  6 +--
 .../sonic-platform-modules-dell/debian/rules  |  3 ++
 .../s6100/scripts/s6100_platform.sh           | 41 +++++++++++--------
 .../systemd/platform-modules-s6100.service    |  2 +-
 .../systemd/s6100-platform-startup.service    |  2 +-
 6 files changed, 30 insertions(+), 64 deletions(-)
 delete mode 100755 platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.init

diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.init b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.init
deleted file mode 100755
index c798b24ef235..000000000000
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides:          setup-board
-# Required-Start:
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start:     S
-# Default-Stop:      0 6
-# Short-Description: Setup S6100 board.
-### END INIT INFO
-
-case "$1" in
-start)
-    echo -n "Setting up board... "
-
-    /usr/local/bin/iom_power_on.sh
-    /usr/local/bin/s6100_platform.sh init
-
-    echo "done."
-    ;;
-
-stop)
-    /usr/local/bin/s6100_platform.sh deinit
-    echo "done."
-
-    ;;
-
-force-reload|restart)
-    echo "Not supported"
-    ;;
-
-*)
-    echo "Usage: /etc/init.d/platform-modules-s6100.init {start|stop}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.postinst b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.postinst
index eda8f7c8a41a..78c78fa0037f 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.postinst
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.postinst
@@ -1,11 +1,7 @@
 # postinst script for S6100
 
 # Enable Dell-S6100-platform-service
-depmod -a 
 systemctl enable platform-modules-s6100.service
-systemctl start platform-modules-s6100.service
-
-systemctl enable s6100-lpc-monitor.service
-systemctl start s6100-lpc-monitor.service
+systemctl start --no-block platform-modules-s6100.service
 
 #DEBHELPER#
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/rules b/platform/broadcom/sonic-platform-modules-dell/debian/rules
index 520331ed16d3..68f86c23b5a1 100755
--- a/platform/broadcom/sonic-platform-modules-dell/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/rules
@@ -78,6 +78,9 @@ override_dh_auto_install:
 
 override_dh_usrlocal:
 
+override_dh_installmodules:
+	dh_installmodules --no-scripts;
+
 override_dh_clean:
 	dh_clean
 	set -e; \
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
index b5413c10aa50..166a5c63a184 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
@@ -3,6 +3,30 @@
 #platform init script for Dell S6100
 
 if [[ "$1" == "init" ]]; then
+    depmod -a
+    case "$(cat /proc/cmdline)" in
+        *SONIC_BOOT_TYPE=warm*)
+            TYPE='warm'
+            ;;
+        *SONIC_BOOT_TYPE=fastfast*)
+            TYPE='fastfast'
+            ;;
+        *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
+            TYPE='fast'
+            ;;
+        *SONIC_BOOT_TYPE=soft*)
+            TYPE='soft'
+            ;;
+        *)
+            TYPE='cold'
+    esac
+
+    if [[ "$TYPE" == "cold" ]]; then
+        /usr/local/bin/iom_power_on.sh
+    fi
+
+    systemctl enable s6100-lpc-monitor.service
+    systemctl start --no-block s6100-lpc-monitor.service
 
     pericom="/sys/bus/pci/devices/0000:08:00.0"
     modprobe i2c-dev
@@ -24,23 +48,6 @@ if [[ "$1" == "init" ]]; then
 
     systemctl start --no-block s6100-ssd-upgrade-status.service
 
-    case "$(cat /proc/cmdline)" in
-        *SONIC_BOOT_TYPE=warm*)
-            TYPE='warm'
-            ;;
-        *SONIC_BOOT_TYPE=fastfast*)
-            TYPE='fastfast'
-            ;;
-        *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
-            TYPE='fast'
-            ;;
-        *SONIC_BOOT_TYPE=soft*)
-            TYPE='soft'
-            ;;
-        *)
-            TYPE='cold'
-    esac
-
     if [[ "$TYPE" == "cold" ]]; then
         systemctl start s6100-platform-startup.service
     else
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
index 4883ecf268fd..127426f09873 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/platform-modules-s6100.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell S6100 Platform modules
-Before=pmon.service determine-reboot-cause.service
+Before=pmon.service determine-reboot-cause.service pcie-check.service system-health.service watchdog-control.service
 DefaultDependencies=no
 
 [Service]
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service
index d7a40f43033c..ecba7b006361 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/systemd/s6100-platform-startup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dell S6100 Platform Startup Service
-Before=pmon.service determine-reboot-cause.service
+Before=pmon.service determine-reboot-cause.service pcie-check.service system-health.service watchdog-control.service
 DefaultDependencies=no
 
 [Service]

From 82d59f6b41464f16aef6500aa4ca2dbe4ffd3e50 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Thu, 23 Jun 2022 16:13:17 -0700
Subject: [PATCH 1252/1674] [202012][RESTAPI] Update submodule (#11234)

---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index e83e0e862cc4..55683f2abb8e 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit e83e0e862cc4e8a2627eaf79f1461e7d7d9a4e75
+Subproject commit 55683f2abb8e7be0e80b0e81128314c90006303c

From 94e3eb0474b538e1c07f2b0b28af76065d7993ec Mon Sep 17 00:00:00 2001
From: Nathan Cohen <66022536+nathcohe@users.noreply.github.com>
Date: Thu, 30 Jun 2022 00:03:31 -0700
Subject: [PATCH 1253/1674] Updated sonic-utilities to most recent 202012
 (#11249)

---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index b0d70626a12d..d5f8f5a22bfa 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit b0d70626a12d52e2dccd6afe94acc532293d36b0
+Subproject commit d5f8f5a22bfab1546ac9660430ac7ce7ef96564f

From 2b76288a24dd517a90c70268dd3660d86664577e Mon Sep 17 00:00:00 2001
From: Jing Kan <672454911@qq.com>
Date: Fri, 1 Jul 2022 16:23:56 +0800
Subject: [PATCH 1254/1674] [minigraph] Support parse IPv6 in device_desc.xml
 (#11095) (#11272)

Signed-off-by: Jing Kan jika@microsoft.com
---
 src/sonic-config-engine/minigraph.py          | 30 +++++++++++++------
 .../simple-sample-device-desc-ipv6-only.xml   | 11 +++++++
 .../tests/simple-sample-device-desc.xml       | 11 +++++++
 .../tests/test_minigraph_case.py              | 21 +++++++++++--
 4 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/simple-sample-device-desc-ipv6-only.xml
 create mode 100644 src/sonic-config-engine/tests/simple-sample-device-desc.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 7293f02f8c20..4b564d83f830 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -84,6 +84,7 @@ def parse_device(device):
     lo_prefix = None
     lo_prefix_v6 = None
     mgmt_prefix = None
+    mgmt_prefix_v6 = None
     d_type = None   # don't shadow type()
     hwsku = None
     name = None
@@ -97,6 +98,8 @@ def parse_device(device):
             lo_prefix_v6 = node.find(str(QName(ns2, "IPPrefix"))).text
         elif node.tag == str(QName(ns, "ManagementAddress")):
             mgmt_prefix = node.find(str(QName(ns2, "IPPrefix"))).text
+        elif node.tag == str(QName(ns, "ManagementAddressV6")):
+            mgmt_prefix_v6 = node.find(str(QName(ns2, "IPPrefix"))).text
         elif node.tag == str(QName(ns, "Hostname")):
             name = node.text
         elif node.tag == str(QName(ns, "HwSku")):
@@ -111,7 +114,8 @@ def parse_device(device):
     if d_type is None and str(QName(ns3, "type")) in device.attrib:
         d_type = device.attrib[str(QName(ns3, "type"))]
 
-    return (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster)
+    return (lo_prefix, lo_prefix_v6, mgmt_prefix, mgmt_prefix_v6, name, hwsku, d_type, deployment_id, cluster)
+
 
 def calculate_lcm_for_ecmp (nhdevices_bank_map, nhip_bank_map):
     banks_enumerated = {}
@@ -247,8 +251,8 @@ def parse_png(png, hname, dpg_ecmp_content = None):
 
         if child.tag == str(QName(ns, "Devices")):
             for device in child.findall(str(QName(ns, "Device"))):
-                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
-                device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku }
+                (lo_prefix, lo_prefix_v6, mgmt_prefix, mgmt_prefix_v6, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
+                device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku}
                 if cluster:
                     device_data['cluster'] = cluster
                 if deployment_id:
@@ -377,7 +381,7 @@ def parse_asic_png(png, asic_name, hostname):
 
         if child.tag == str(QName(ns, "Devices")):
             for device in child.findall(str(QName(ns, "Device"))):
-                (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
+                (lo_prefix, lo_prefix_v6, mgmt_prefix, mgmt_prefix_v6, name, hwsku, d_type, deployment_id, cluster) = parse_device(device)
                 device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku }
                 if cluster:
                     device_data['cluster'] = cluster
@@ -1697,7 +1701,7 @@ def get_mux_cable_entries(mux_cable_ports, neighbors, devices):
 
 def parse_device_desc_xml(filename):
     root = ET.parse(filename).getroot()
-    (lo_prefix, lo_prefix_v6, mgmt_prefix, hostname, hwsku, d_type, _, _) = parse_device(root)
+    (lo_prefix, lo_prefix_v6, mgmt_prefix, mgmt_prefix_v6, hostname, hwsku, d_type, _, _) = parse_device(root)
 
     results = {}
     results['DEVICE_METADATA'] = {'localhost': {
@@ -1709,10 +1713,18 @@ def parse_device_desc_xml(filename):
     if lo_prefix_v6:
         results['LOOPBACK_INTERFACE'] = {('lo_v6', lo_prefix_v6): {}}
 
-    mgmt_intf = {}
-    mgmtipn = ipaddress.ip_network(UNICODE_TYPE(mgmt_prefix), False)
-    gwaddr = ipaddress.ip_address((next(mgmtipn.hosts())))
-    results['MGMT_INTERFACE'] = {('eth0', mgmt_prefix): {'gwaddr': gwaddr}}
+    results['MGMT_INTERFACE'] = {}
+    if mgmt_prefix:
+        mgmtipn = ipaddress.ip_network(UNICODE_TYPE(mgmt_prefix), False)
+        if mgmtipn != ipaddress.ip_network(u'0.0.0.0/0', False):
+            gwaddr = ipaddress.ip_address((next(mgmtipn.hosts())))
+            results['MGMT_INTERFACE'].update({('eth0', mgmt_prefix): {'gwaddr': gwaddr}})
+
+    if mgmt_prefix_v6:
+        mgmtipn_v6 = ipaddress.ip_network(UNICODE_TYPE(mgmt_prefix_v6), False)
+        if mgmtipn != ipaddress.ip_network(u'::/0', False):
+            gwaddr_v6 = ipaddress.ip_address((next(mgmtipn_v6.hosts())))
+            results['MGMT_INTERFACE'].update({('eth0', mgmt_prefix_v6): {'gwaddr': gwaddr_v6}})
 
     return results
 
diff --git a/src/sonic-config-engine/tests/simple-sample-device-desc-ipv6-only.xml b/src/sonic-config-engine/tests/simple-sample-device-desc-ipv6-only.xml
new file mode 100644
index 000000000000..c35d2354a900
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-device-desc-ipv6-only.xml
@@ -0,0 +1,11 @@
+<Device i:type="ToRRouter" xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+  <ClusterName>AAA00PrdStr00</ClusterName>
+  <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+    <a:IPPrefix>0.0.0.0/0</a:IPPrefix>
+    </ManagementAddress>
+    <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+    <a:IPPrefix>FC00:1::32/64</a:IPPrefix>
+  </ManagementAddressV6>
+</Device>
diff --git a/src/sonic-config-engine/tests/simple-sample-device-desc.xml b/src/sonic-config-engine/tests/simple-sample-device-desc.xml
new file mode 100644
index 000000000000..72941dfcd9b6
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-device-desc.xml
@@ -0,0 +1,11 @@
+<Device i:type="ToRRouter" xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+  <ClusterName>AAA00PrdStr00</ClusterName>
+  <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+    <a:IPPrefix>10.0.0.100/24</a:IPPrefix>
+    </ManagementAddress>
+    <ManagementAddressV6 xmlns:a="Microsoft.Search.Autopilot.NetMux">
+    <a:IPPrefix>FC00:1::32/64</a:IPPrefix>
+  </ManagementAddressV6>
+</Device>
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
index 760527479902..2f7a74bf3ed0 100644
--- a/src/sonic-config-engine/tests/test_minigraph_case.py
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -1,6 +1,7 @@
 import json
 import os
 import subprocess
+import ipaddress
 
 import tests.common_utils as utils
 import minigraph
@@ -20,6 +21,8 @@ def setUp(self):
         self.sample_graph = os.path.join(self.test_dir, 'simple-sample-graph-case.xml')
         self.sample_resource_graph = os.path.join(self.test_dir, 'sample-graph-resource-type.xml')
         self.sample_subintf_graph = os.path.join(self.test_dir, 'sample-graph-subintf.xml')
+        self.sample_simple_device_desc = os.path.join(self.test_dir, 'simple-sample-device-desc.xml')
+        self.sample_simple_device_desc_ipv6_only = os.path.join(self.test_dir, 'simple-sample-device-desc-ipv6-only.xml')
         self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
 
     def run_script(self, argument, check_stderr=False):
@@ -453,5 +456,19 @@ def test_minigraph_mirror_dscp(self):
             expected_ports.sort()
         )
 
-
-    
+    def test_parse_device_desc_xml_mgmt_interface(self):
+        # Regular device_desc.xml with both IPv4 and IPv6 mgmt address
+        result = minigraph.parse_device_desc_xml(self.sample_simple_device_desc)
+        mgmt_intf = result['MGMT_INTERFACE']
+        self.assertEqual(len(mgmt_intf.keys()), 2)
+        self.assertTrue(('eth0', '10.0.0.100/24') in mgmt_intf.keys())
+        self.assertTrue(('eth0', 'FC00:1::32/64') in mgmt_intf.keys())
+        self.assertTrue(ipaddress.ip_address(u'10.0.0.1') == mgmt_intf[('eth0', '10.0.0.100/24')]['gwaddr'])
+        self.assertTrue(ipaddress.ip_address(u'fc00:1::1') == mgmt_intf[('eth0', 'FC00:1::32/64')]['gwaddr'])
+
+        # Special device_desc.xml with IPv6 mgmt address only
+        result = minigraph.parse_device_desc_xml(self.sample_simple_device_desc_ipv6_only)
+        mgmt_intf = result['MGMT_INTERFACE']
+        self.assertEqual(len(mgmt_intf.keys()), 1)
+        self.assertTrue(('eth0', 'FC00:1::32/64') in mgmt_intf.keys())
+        self.assertTrue(ipaddress.ip_address(u'fc00:1::1') == mgmt_intf[('eth0', 'FC00:1::32/64')]['gwaddr'])

From d766e7022eb1fbebe4e9e38e1da83171d4f50fe7 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 1 Jul 2022 21:17:03 +0800
Subject: [PATCH 1255/1674] [Build] Add the missing debian security mirrors in
 slave images (#11304)

Why I did it
The build below was broken, it was caused by one of the required debian mirror missing.
https://dev.azure.com/mssonic/build/_build/results?buildId=116719&view=logs&j=88ce9a53-729c-5fa9-7b6e-3d98f2488e3f&t=88f376cf-c35d-5783-0a48-9ad83a873284

 libpci-dev : Depends: libudev-dev (>= 196) but it is not going to be installed
 libsystemd-dev : Depends: libsystemd0 (= 232-25+deb9u14) but 232-25+deb9u13 is to be installed
How I did it
Add the missing mirrors for buster and stretch.
---
 sonic-slave-buster/Dockerfile.j2  | 9 ++++++---
 sonic-slave-stretch/Dockerfile.j2 | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 8851b8f0924d..8441a53dcad0 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -19,7 +19,8 @@ RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bust
         echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list && \
         echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list
+        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
 
 {%- if CONFIGURED_ARCH == "armhf" %}
 RUN echo "deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \
@@ -30,7 +31,8 @@ RUN echo "deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-
         echo "deb-src [arch=armhf] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo 'deb [arch=armhf] http://ftp.debian.org/debian buster-backports main' >> /etc/apt/sources.list && \
         echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list
+        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
 {%- elif CONFIGURED_ARCH == "arm64" %}
 RUN echo "deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \
         echo "deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list && \
@@ -40,7 +42,8 @@ RUN echo "deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-
         echo "deb-src [arch=arm64] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo 'deb [arch=arm64] http://ftp.debian.org/debian buster-backports main' >> /etc/apt/sources.list && \
         echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list
+        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
 {%- endif %}
 
 ## Make apt-get non-interactive
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 9a9e9dca9d2a..79e0699e7ae7 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -18,6 +18,7 @@ RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stre
         echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian stretch-backports main" >> /etc/apt/sources.list && \
         echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb [arch=amd64] http://packages.microsoft.com/debian/9/prod stretch main" >> /etc/apt/sources.list
 
 {%- if CONFIGURED_ARCH == "armhf" %}
@@ -29,7 +30,8 @@ RUN echo "deb [arch=armhf] http://deb.debian.org/debian stretch main contrib non
         echo "deb-src [arch=armhf] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo 'deb [arch=armhf] http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list && \
         echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list
+        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list
 {%- elif CONFIGURED_ARCH == "arm64" %}
 RUN echo "deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
         echo "deb-src [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
@@ -39,7 +41,8 @@ RUN echo "deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non
         echo "deb-src [arch=arm64] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo 'deb [arch=arm64] http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list && \
         echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list
+        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
+        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list
 {%- endif %}
 
 ## Make apt-get non-interactive

From fe6be5da920a04a75df046e6bc560b6d070f50e5 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sun, 3 Jul 2022 20:58:06 +0800
Subject: [PATCH 1256/1674] [202012] Configure different map between uplink and
 downlink on t1 switch in dual ToR scenario (#11299)

- Why I did it
Configure different DSCP_TO_TC_MAP between uplink and downlink on T1 switch in dual ToR scenario
On T1 uplink, both DSCP 2/6 will be mapped to TC 1 for the purpose of avoiding such traffic occupying lossless buffers.
On T1 downlink, they will be mapped to TC 2/6 respectively. (unchanged)

- How I did it
For vendors who want to configure different DSCP_TO_TC_MAP between uplinks and downlinks on T1, they should
Define generate_dscp_to_tc_map macro in SKU's qos.json.j2 file
Define map AZURE for downlink and AZURE_UPLINK for uplink
Define jinja2 variable different_dscp_to_tc_map as True

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../Mellanox-SN4600C-C64/qos.json.j2          | 67 +++++++++++++++
 files/build_templates/qos_config.j2           |  4 +
 .../py3/qos-mellanox4600c-c64.json            | 83 +++++++++++++++++--
 3 files changed, 146 insertions(+), 8 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
index b35132b2e629..123d9ed11a96 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
@@ -1,4 +1,5 @@
 {% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{% set different_dscp_to_tc_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -66,6 +67,72 @@
             "61": "1",
             "62": "1",
             "63": "1"
+        },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
         }
     },
 {%- endmacro %}
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index a37ad879b9fc..6a382af18e51 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -233,8 +233,12 @@
         "{{ port }}": {
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
             "dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]",
+{% else %}
+{% if different_dscp_to_tc_map and port not in port_names_list_extra_queues and tunnel_qos_remap_enable %}
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
 {% else %}
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+{% endif %}
 {% endif %}
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
index 997cdb1bcc1e..cccdf926f0b7 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
@@ -1,3 +1,4 @@
+
 {
     "TC_TO_PRIORITY_GROUP_MAP": {
         "AZURE": {
@@ -101,6 +102,72 @@
             "61": "1",
             "62": "1",
             "63": "1"
+        },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
         }
     },
     "SCHEDULER": {
@@ -115,7 +182,7 @@
     },
     "PORT_QOS_MAP": {
         "Ethernet0": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -123,7 +190,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -131,7 +198,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -139,7 +206,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -147,7 +214,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -155,7 +222,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -163,7 +230,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -171,7 +238,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",

From d15a484dfa65146623fb3dd724f2cab1eac24038 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Mon, 4 Jul 2022 20:01:03 +0200
Subject: [PATCH 1257/1674] [202012][Arista] Fix cmdline generation during
 warm-reboot from 201811/201911 (#11161)

Issue fixed: when performing a warm-reboot or fast-reboot from 201811 or 201911 to 202012 the kernel command line contains duplicate information. This issue is related to a change that was made to make 202012 boot0 file more futureproof.
A cold reboot brings everything back into a clean slate though not always desirable.

Changes done:
Added some logic to properly detect the end of the Aboot cmdline when cmdline-aboot-end delimiter is not set (clean case)
Added some logic to regenerate the Aboot cmdline when cmdline-aboot-end is set but duplicate parameters exists before (dirty case). Reorganized some code to handle duplicate parameter handling in the allowlist.
---
 files/Aboot/boot0.j2 | 70 ++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 1b1a83343e55..a2ac3debdcea 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -86,7 +86,7 @@ installer_image_path="$image_path/$installer_image"
 
 boot_config="$target_path/boot-config"
 
-cmdline_allowlist='crashkernel'
+cmdline_allowlist="crashkernel"
 
 # for backward compatibility with the sonic_upgrade= behavior
 install="${install:-${sonic_upgrade:-}}"
@@ -657,22 +657,56 @@ write_default_cmdline() {
     cmdline_clear
 
     if $in_aboot; then
-        # generate the default kernel parameters for the platform
+        # Generate the default kernel parameters for the platform
         cat /etc/cmdline | sed "/^\(${bootconfigvars// /\|}\|crashkernel\|loglevel\|ignore_loglevel\)\(\$\|=\)/d;/^\$/d" | cmdline_append
-    elif grep -q "$delimiter" /proc/cmdline; then
-        # we are on a recent sonic image using delimiter. extracting the part of the
+    elif grep -q "$delimiter" /proc/cmdline && ! grep -Eq "varlog_size=.* $delimiter" /proc/cmdline; then
+        # We are on a recent sonic image using delimiter. extracting the part of the
         # cmdline coming from aboot is trivial.
+        # The 2nd part of the condition ensures that the append bug is not present.
+        # When it is it should go through the last case of this if/else block to
+        # regenerate the aboot cmdline
         cat /proc/cmdline | sed -E "s/^(.*) $delimiter .*$/\1/" | tr ' ' '\n' | cmdline_append
-    else
-        # we are either on SONiC or EOS and the commandline doesn't have a delimiter
-        # for the Aboot part. Take an educated guess at a right delimiter.
-        # Subject to breakage if EOS or SONiC cmdline change.
+    elif grep -q "SWI=" /proc/cmdline; then
+        # We are in EOS and the cmdline doesn't have a delimiter for the aboot part
         cat /proc/cmdline | sed -E 's/^(.*) rw .*$/\1/' | tr ' ' '\n' | cmdline_append
+    else
+        # We are in SONiC and the cmdline doesn't have a delimiter for the aboot part.
+        # sid= should most of the time be the last parameter provided by Aboot
+        # Alternatively we are in SONiC and the cmdline-aboot-end delimiter was
+        # added after image specific parameters due to a BUG which is solved by the
+        # following statement.
+        cat /proc/cmdline | sed -E 's/^(.* sid=[^ ]+).*$/\1/' | tr ' ' '\n' | cmdline_append
     fi
 
     cmdline_add "$delimiter"
 }
 
+write_cmdline() {
+    # use extra parameters from kernel-params hook if the file exists
+    if [ -f "$target_path/$kernel_params" ]; then
+        if $secureboot && $debug; then
+            warn "Unsafe: Loading extra kernel parameters from $kernel_params"
+            cat "$target_path/$kernel_params" | cmdline_append
+        elif ! $secureboot; then
+            info "Loading extra kernel parameters from $kernel_params"
+            cat "$target_path/$kernel_params" | cmdline_append
+        fi
+    fi
+
+    # FIXME: sonic sometimes adds extra kernel parameters from user space
+    #        this is unsafe but some will be kept as part of the regular boot
+    if [ -f "$image_path/kernel-cmdline" ]; then
+        for field in $cmdline_allowlist; do
+           cat "$image_path/kernel-cmdline" | tr ' ' '\n' | grep -E "$field" | tail -n 1 | cmdline_append
+        done
+    fi
+
+    # FIXME: legacy configuration files used by fast-reboot and eos2sonic
+    #        these should be deprecated over time.
+    cmdline_echo > "$image_path/kernel-cmdline"
+    cmdline_echo | sed 's/ cmdline-aboot-end.*$//' > "$target_path/kernel-params-base"
+}
+
 write_common_configs() {
     write_default_cmdline
     write_platform_specific_cmdline
@@ -690,28 +724,14 @@ write_secureboot_configs() {
     cmdline_add aboot.secureboot=enabled
     # setting panic= has the side effect of disabling the initrd shell on error
     cmdline_add panic=0
+    write_cmdline
 }
 
 write_regular_configs() {
     write_common_configs
     cmdline_add "loop=$image_name/fs.squashfs"
     cmdline_add loopfstype=squashfs
-
-    # use extra parameters from kernel-params hook if the file exists
-    if [ -f "$target_path/$kernel_params" ]; then
-        cat "$target_path/$kernel_params" | cmdline_append
-    fi
-
-    # FIXME: sonic sometimes adds extra kernel parameters from user space
-    #        this is unsafe but some will be kept as part of the regular boot
-    if [ -f "$image_path/kernel-cmdline" ]; then
-        cat "$image_path/kernel-cmdline" | tr ' ' '\n' | grep -E "$cmdline_allowlist" | cmdline_append
-    fi
-
-    # FIXME: legacy configuration files used by fast-reboot and eos2sonic
-    #        these should be deprecated over time.
-    cmdline_echo > "$image_path/kernel-cmdline"
-    cmdline_echo | sed 's/ cmdline-aboot-end.*$//' > "$target_path/kernel-params-base"
+    write_cmdline
 }
 
 run_kexec() {
@@ -776,8 +796,8 @@ secureboot_boot() {
 
 regular_boot() {
     # boot uses the image installed on the flash
-    run_hooks pre-kexec
     write_regular_configs "$image_path"
+    run_hooks pre-kexec
     update_next_boot
     run_kexec
 }

From 4487a962e3a1fe9a49a0ff25f113c1deb03f4167 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Fri, 17 Jun 2022 12:13:18 -0700
Subject: [PATCH 1258/1674] [memory_checker] Do not check memory usage of
 containers which are not created (#11129)

Signed-off-by: Yong Zhao yozhao@microsoft.com

Why I did it
This PR aims to fix an issue (#10088) by enhancing the script memory_checker.

Specifically, if container is not created successfully during device is booted/rebooted, then memory_checker do not need check its memory usage.

How I did it
In the script memory_checker, a function is added to get names of running containers. If the specified container name is not in current running container list, then this script will exit without checking its memory usage.

How to verify it
I tested on a lab device by following the steps:

Stops telemetry container with command sudo systemctl stop telemetry.service

Removes telemetry container with command docker rm telemetry

Checks whether the script memory_checker ran by Monit will generate the syslog message saying it will exit without checking memory usage of telemetry.
---
 files/image_config/monit/memory_checker | 34 +++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/files/image_config/monit/memory_checker b/files/image_config/monit/memory_checker
index 3cd0f2d80225..dfe270e79524 100755
--- a/files/image_config/monit/memory_checker
+++ b/files/image_config/monit/memory_checker
@@ -25,6 +25,8 @@ import sys
 import syslog
 import re
 
+import docker
+
 
 def get_command_result(command):
     """Executes the command and return the resulting output.
@@ -86,7 +88,7 @@ def check_memory_usage(container_name, threshold_value):
             print("[{}]: Memory usage ({} Bytes) is larger than the threshold ({} Bytes)!"
                   .format(container_name, mem_usage_bytes, threshold_value))
             syslog.syslog(syslog.LOG_INFO, "[{}]: Memory usage ({} Bytes) is larger than the threshold ({} Bytes)!"
-                  .format(container_name, mem_usage_bytes, threshold_value))
+                          .format(container_name, mem_usage_bytes, threshold_value))
             sys.exit(3)
     else:
         syslog.syslog(syslog.LOG_ERR, "[memory_checker] Failed to retrieve memory value from '{}'"
@@ -94,6 +96,28 @@ def check_memory_usage(container_name, threshold_value):
         sys.exit(4)
 
 
+def get_running_container_names():
+    """Retrieves names of running containers by talking to the docker daemon.
+
+    Args:
+        None.
+
+    Returns:
+        running_container_names: A list indicates names of running containers.
+    """
+    try:
+        docker_client = docker.DockerClient(base_url='unix://var/run/docker.sock')
+        running_container_list = docker_client.containers.list(filters={"status": "running"})
+        running_container_names = [ container.name for container in running_container_list ]
+    except (docker.errors.APIError, docker.errors.DockerException) as err:
+        syslog.syslog(syslog.LOG_ERR,
+                      "Failed to retrieve the running container list from docker daemon! Error message is: '{}'"
+                      .format(err))
+        sys.exit(5)
+
+    return running_container_names
+
+
 def main():
     parser = argparse.ArgumentParser(description="Check memory usage of a container \
             and an alerting message will be written into syslog if memory usage \
@@ -104,7 +128,13 @@ def main():
     parser.add_argument("threshold_value", type=int, help="threshold value in bytes")
     args = parser.parse_args()
 
-    check_memory_usage(args.container_name, args.threshold_value)
+    running_container_names = get_running_container_names()
+    if args.container_name in running_container_names:
+        check_memory_usage(args.container_name, args.threshold_value)
+    else:
+        syslog.syslog(syslog.LOG_INFO,
+                      "[memory_checker] Exits without checking memory usage since container '{}' is not running!"
+                      .format(args.container_name))
 
 
 if __name__ == "__main__":

From 32cda89f9316bc3e57993d9cb967075cf3a0a936 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 21 Jun 2022 13:03:55 +0800
Subject: [PATCH 1259/1674] [Build]: Support to use symbol links for lazy
 installation targets to reduce the image size (#10923)

Why I did it
Support to use symbol links in platform folder to reduce the image size.
The current solution is to copy each lazy installation targets (xxx.deb files) to each of the folders in the platform folder. The size will keep growing when more and more packages added in the platform folder. For cisco-8000 as an example, the size will be up to 2G, while most of them are duplicate packages in the platform folder.

How I did it
Create a new folder in platform/common, all the deb packages are copied to the folder, any other folders where use the packages are the symbol links to the common folder.

Why platform.tar?
We have implemented a patch for it, see #10775, but the problem is the the onie use really old unzip version, cannot support the symbol links.
The current solution is similar to the PR 10775, but make the platform folder into a tar package, which can be supported by onie. During the installation, the package.tar will be extracted to the original folder and removed.
---
 build_debian.sh                                 | 2 +-
 files/Aboot/boot0.j2                            | 7 ++++++-
 files/build_templates/sonic_debian_extension.j2 | 4 +++-
 installer/arm64/install.sh                      | 6 ++++--
 installer/armhf/install.sh                      | 6 ++++--
 installer/x86_64/install.sh                     | 7 +++++--
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 062f72926efa..405360c70a64 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -611,5 +611,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
+pushd $FILESYSTEM_ROOT && sudo tar czf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
 sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index a2ac3debdcea..0944bc54cf6f 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -348,7 +348,12 @@ extract_image() {
 
     info "Extracting swi content"
     ## Unzip the image except boot0 and dockerfs archive
-    unzip -oq "$swipath" -x boot0 "$dockerfs" -d "$image_path"
+    unzip -oq "$swipath" -x boot0 "$dockerfs" "platform.tar.gz" -d "$image_path"
+
+    ## Extract the platform.tar.gz
+    info "Extracting platform.tar.gz"
+    mkdir -p "$image_path/platform"
+    unzip -oqp "$swipath" "platform.tar.gz" | tar xzf - -C "$image_path/platform" $TAR_EXTRA_OPTION
 
     ## detect rootfs type
     local mountstr="$(grep " $target_path " /proc/mounts)"
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 1fc1146ef683..db0be75aa0a1 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -590,7 +590,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
 sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f --download-only
 
 sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}
-sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
+sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/common
+sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/common/
+sudo ln -sf "../common/{{ debfilename }}" "$FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/{{ debfilename }}"
 for f in $(find $FILESYSTEM_ROOT/var/cache/apt/archives -name "*.deb"); do
     sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
 done
diff --git a/installer/arm64/install.sh b/installer/arm64/install.sh
index c1e20b62bf42..6e61999ada97 100755
--- a/installer/arm64/install.sh
+++ b/installer/arm64/install.sh
@@ -133,9 +133,9 @@ fi
 # Decompress the file for the file system directly to the partition
 if [ x"$docker_inram" = x"on" ]; then
     # when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
-    unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "platform.tar.gz" -d $demo_mnt/$image_dir
 else
-    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" "platform.tar.gz" -d $demo_mnt/$image_dir
 
     if [ "$install_env" = "onie" ]; then
         TAR_EXTRA_OPTION="--numeric-owner"
@@ -146,6 +146,8 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+unzip -op $ONIE_INSTALLER_PAYLOAD "platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/platform
 
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system
diff --git a/installer/armhf/install.sh b/installer/armhf/install.sh
index c85170ff256e..c0fa82ab2cc3 100755
--- a/installer/armhf/install.sh
+++ b/installer/armhf/install.sh
@@ -133,9 +133,9 @@ fi
 # Decompress the file for the file system directly to the partition
 if [ x"$docker_inram" = x"on" ]; then
     # when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
-    unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "platform.tar.gz" -d $demo_mnt/$image_dir
 else
-    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" "platform.tar.gz" -d $demo_mnt/$image_dir
 
     if [ "$install_env" = "onie" ]; then
         TAR_EXTRA_OPTION="--numeric-owner"
@@ -146,6 +146,8 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+unzip -op $ONIE_INSTALLER_PAYLOAD "platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/platform
 
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index a75e70f1f6dd..15ef85e2cf2b 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -493,9 +493,9 @@ fi
 # Decompress the file for the file system directly to the partition
 if [ x"$docker_inram" = x"on" ]; then
     # when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
-    unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "platform.tar.gz" -d $demo_mnt/$image_dir
 else
-    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" -d $demo_mnt/$image_dir
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" "platform.tar.gz"  -d $demo_mnt/$image_dir
 
     if [ "$install_env" = "onie" ]; then
         TAR_EXTRA_OPTION="--numeric-owner"
@@ -506,6 +506,9 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+unzip -op $ONIE_INSTALLER_PAYLOAD "platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/platform
+
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system
     if [ -f /etc/machine-build.conf ]; then

From 6ada55439d7fb9fff7b63878f264b1ee6c4216a3 Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:55:17 -0700
Subject: [PATCH 1260/1674] Updated buffer profile settings for TD3 based
 HWSKUs (Arista-7050CX3-32S-C32, Arista-7050CX3-32S-D48C8) (#11202)

* Updated buffer profile settings for TD3 based HWSKUs (Arista-7050CX3-32S-C32, Arista-7050CX3-32S-D48C8)
---
 .../Arista-7050CX3-32S-C32/buffers_defaults_t0.j2    |  4 ++--
 .../Arista-7050CX3-32S-C32/buffers_defaults_t1.j2    |  4 ++--
 .../Arista-7050CX3-32S-C32/pg_profile_lookup.ini     | 12 ++++++------
 .../Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2  |  4 ++--
 .../Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini   | 12 ++++++------
 .../buffer-arista7050cx3-dualtor-remap-disabled.json |  4 ++--
 .../py3/buffer-arista7050cx3-dualtor.json            |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
index 2511328510c9..97c026b1e450 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
@@ -30,7 +30,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"32732160"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
@@ -40,7 +40,7 @@
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
             "size":"1792",
-            "dynamic_th":"-1"
+            "dynamic_th":"3"
         }
     },
 {%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
index f5b7327e705d..4e8d7ed881a8 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
@@ -30,7 +30,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"32712448"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
@@ -40,7 +40,7 @@
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
             "size":"1792",
-            "dynamic_th":"-1"
+            "dynamic_th":"3"
         }
     },
 {%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
index e30c3aeae2e0..dd405301f720 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
@@ -1,8 +1,8 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 33792   -3        4608
- 100000  5m   4608    4608 49408   -3        4608
-  50000  40m  4608    4608 36352   -3        4608
- 100000  40m  4608    4608 54528   -3        4608
-  50000  300m 4608    4608 55296   -3        4608
- 100000  300m 4608    4608 92672   -3        4608
+  50000  5m   4608    4608 33792   0        4608
+ 100000  5m   4608    4608 49408   0        4608
+  50000  40m  4608    4608 36352   0        4608
+ 100000  40m  4608    4608 54528   0        4608
+  50000  300m 4608    4608 55296   0        4608
+ 100000  300m 4608    4608 92672   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
index 1e0b3ae79e4a..2470ff8b988c 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -31,7 +31,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"32689152"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
@@ -41,7 +41,7 @@
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
             "size":"1792",
-            "dynamic_th":"-1"
+            "dynamic_th":"3"
         }
     },
 {%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
index 44880400d0f6..8ee7a6714b1e 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
@@ -1,8 +1,8 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 79872   -3        4608
- 100000  5m   4608    4608 54528   -3        4608
-  50000  40m  4608    4608 39936   -3        4608
- 100000  40m  4608    4608 60416   -3        4608
-  50000  300m 4608    4608 61440   -3        4608
- 100000  300m 4608    4608 103680  -3        4608
+  50000  5m   4608    4608 79872   0        4608
+ 100000  5m   4608    4608 54528   0        4608
+  50000  40m  4608    4608 39936   0        4608
+ 100000  40m  4608    4608 60416   0        4608
+  50000  300m 4608    4608 61440   0        4608
+ 100000  300m 4608    4608 103680  0        4608
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
index 2992ecacc3db..7a5fb4589f94 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json
@@ -83,7 +83,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"32689152"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
@@ -93,7 +93,7 @@
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
             "size":"1792",
-            "dynamic_th":"-1"
+            "dynamic_th":"3"
         }
     },
     "BUFFER_PG": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
index 55da03e62549..01b927f86113 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json
@@ -82,7 +82,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"32689152"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
@@ -92,7 +92,7 @@
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
             "size":"1792",
-            "dynamic_th":"-1"
+            "dynamic_th":"3"
         }
     },
     "BUFFER_PG": {

From c1ab4c683145d46069cb90407de4aaae48687586 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Tue, 28 Jun 2022 17:29:02 -0700
Subject: [PATCH 1261/1674] [tunnel_packet_handler] Add a whitespace in the
 warning syslog message. (#11232)

*This PR aims to add a whitespace in the warning syslog message of process tunnel_packet_handler.
Signed-off-by: Yong Zhao <yozhao@microsoft.com>
---
 dockers/docker-orchagent/tunnel_packet_handler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/tunnel_packet_handler.py b/dockers/docker-orchagent/tunnel_packet_handler.py
index 682316eb6d49..3d75fdd94a0c 100755
--- a/dockers/docker-orchagent/tunnel_packet_handler.py
+++ b/dockers/docker-orchagent/tunnel_packet_handler.py
@@ -192,7 +192,7 @@ def get_ipinip_tunnel_addrs(self):
             peer_switch = self.config_db.get_keys(PEER_SWITCH_TABLE)[0]
             tunnel = self.config_db.get_keys(TUNNEL_TABLE)[0]
         except IndexError:
-            logger.log_warning('PEER_SWITCH or TUNNEL table'
+            logger.log_warning('PEER_SWITCH or TUNNEL table '
                                'not found in config DB')
             return None, None
 

From 851bd9bff82c4b6e1c1cd53d30afe22b1e4ce0dc Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Wed, 29 Jun 2022 00:15:05 -0400
Subject: [PATCH 1262/1674] [Mellanox] Add arch folder to SDK binary location
 (#11278)

- Why I did it
This is for the eventual support of multiple architectures for the mellanox platform.

- How I did it
Change the location of the binaries in Switch-SDK-drivers so that the path specifies the target architecture in addition to the target distribution that the debians are built for.

This is the most straightforward way to separate binaries built against different architectures and selectively target them for installation in the mellanox SONiC image.

- How to verify it
Build SONiC for mellanox and verify it compiles successfully.
---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 9f94bdfc2c7e..e9fa9a843702 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 9f94bdfc2c7e3670b5b959138f9d61d40e7cc1ea
+Subproject commit e9fa9a843702aa55b13c8eb01c7a1f188e4a16a9
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 88b8d1b1c9fe..cedcffcd4dc3 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,5 +1,5 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
-MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
+MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
 MLNX_SDK_VERSION = 4.5.2262
 MLNX_SDK_ISSU_VERSION = 101
 

From 9a86fa92645b3213311691b0fe5cea7fa80b0c80 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 6 Jul 2022 11:00:50 +0800
Subject: [PATCH 1263/1674] [ci/build]: Upgrade SONiC package versions (#11074)

Upgrade SONiC Versions
---
 .../versions-deb-buster                       |  4 +-
 .../build-sonic-slave-buster/versions-git     |  9 +--
 .../build-sonic-slave-buster/versions-py3     |  6 +-
 .../versions-py3-all-arm64                    |  2 +-
 .../versions-py3-all-armhf                    |  2 +-
 .../build-sonic-slave-buster/versions-web     |  6 +-
 files/build/versions/default/versions-docker  | 20 +++----
 files/build/versions/default/versions-git     | 11 ++--
 files/build/versions/default/versions-web     | 12 ++--
 .../docker-base-buster/versions-deb-buster    |  4 +-
 .../docker-base-stretch/versions-deb-stretch  |  6 +-
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-stretch                      |  2 +-
 .../docker-orchagent/versions-deb-buster      |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-ptf/versions-deb-stretch   | 16 ++---
 .../versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 16 ++---
 .../docker-sonic-vs/versions-deb-buster       | 25 ++++----
 .../dockers/docker-sonic-vs/versions-py3      |  8 +--
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  4 +-
 .../docker-syncd-invm/versions-deb-buster     |  4 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  4 +-
 .../docker-syncd-nephos/versions-deb-stretch  |  4 +-
 .../sonic-slave-buster/versions-deb-buster    | 60 +++++++++----------
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../sonic-slave-stretch/versions-deb-stretch  | 40 +++++++------
 .../versions-deb-stretch-armhf                |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   | 33 +++++-----
 .../host-image/versions-deb-buster-arm64      | 13 +++-
 .../host-image/versions-deb-buster-armhf      | 13 +++-
 files/build/versions/host-image/versions-py3  | 12 ++--
 41 files changed, 190 insertions(+), 176 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index d6d914aaef75..d1ed4d09403a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,8 +1,8 @@
 applibs==1.mlnx.4.5.2262
 applibs-dev==1.mlnx.4.5.2262
 bfnplatform==1.0.0
-innovium-sai==0.107.4
-innovium-sai-headers==0.107.4
+innovium-sai==0.107.5
+innovium-sai-headers==0.107.5
 iproute2-dev==1.mlnx.4.5.2262
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 03f0adfdbc70..f397c1b7ef7f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,11 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
-https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
+https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
+https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
-https://salsa.debian.org/kernel-team/ethtool/==38a3cce26a7fa6eb74228e3501b7ed19dced6d4b
+https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
-https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
\ No newline at end of file
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 44843591ae38..a8d7da245960 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,4 +1,4 @@
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
 click==7.0
 docker==5.0.3
 ijson==2.6.1
@@ -11,7 +11,7 @@ netifaces==0.11.0
 psutil==5.9.1
 pyroute2==0.5.14
 python-arptable==0.0.2
-tabulate==0.8.9
-websocket-client==1.3.2
+tabulate==0.8.10
+websocket-client==1.3.3
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
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
index 9a4d403bca40..1b5ad59ac9df 100644
--- 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,3 +1,3 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.27.1
\ No newline at end of file
+requests==2.28.1
\ No newline at end of file
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
index 9a4d403bca40..1b5ad59ac9df 100644
--- 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,3 +1,3 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.27.1
\ No newline at end of file
+requests==2.28.1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index b9c00aad0b7e..3d6d31fad210 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -11,11 +11,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:673f5ee1931bc72a2b3d4ac712a7f7bc541f089b==e813a6e475d01264a4b855c13ff52805
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.debian.tar.xz==91f28470a67782a7891da02cecf23141
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.dsc==ef91f44e2ce3fb083f0997ec25c29bd9
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz==8f897870404c088e4aa7d1c1c58b526b
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz.asc==715c219a524631139bafa8a351cf44e7
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 2d69325971ed..4b545d5d71d3 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:ff2b512c66a78380275b217fd68e81623fc899a7bf9be9bfe16d98188183fcd3
-amd64:amd64/debian:stretch==sha256:fe3d51dd3262e5d9b9584603da59e387619234d95182351e4f493a1e5998f1f0
-amd64:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
-amd64:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
-arm64:arm64v8/debian:buster==sha256:68f1188b21bf0b7fe9c92f3a91262d3093aafe2de76adc7c52012a16960048fc
-arm64:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
-arm64:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
-armhf:arm32v7/debian:buster==sha256:426a61780c005de09eb9c3a08e9bcf292c95bd84514cf2fd1a63e2494bfea194
-armhf:debian:buster==sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526
-armhf:debian:stretch==sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981
\ No newline at end of file
+amd64:amd64/debian:buster==sha256:0e328f15f5cb0f93bff52a37d98f0bbfc40f97fcaf250096fd2b2c6871a497eb
+amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
+amd64:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
+arm64:arm64v8/debian:buster==sha256:e774922f3043b6564c6719a7ec32f25d4b70304eff9dbd725161d4033cf38038
+arm64:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
+armhf:arm32v7/debian:buster==sha256:27ab779c4d59ead815ff584f2e41b34a6b261db358b4cdfe664b8bfa1f494ae8
+armhf:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index f2bd190399bb..105794e437e5 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==89b222dba5ea3fd91598e821c0b82797f2e2fa3c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,11 +9,12 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
-https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
+https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
+https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
-https://salsa.debian.org/kernel-team/ethtool/==38a3cce26a7fa6eb74228e3501b7ed19dced6d4b
+https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
-https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
\ No newline at end of file
+https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
+https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6958654299b0..e00c279b127a 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -16,11 +16,7 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:673f5ee1931bc72a2b3d4ac712a7f7bc541f089b==e813a6e475d01264a4b855c13ff52805
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.debian.tar.xz==91f28470a67782a7891da02cecf23141
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1-2~bpo10+1.dsc==ef91f44e2ce3fb083f0997ec25c29bd9
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz==8f897870404c088e4aa7d1c1c58b526b
-https://deb.debian.org/debian/pool/main/o/openssh/openssh_8.4p1.orig.tar.gz.asc==715c219a524631139bafa8a351cf44e7
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==6b181b4ad151ab26c7c7738ec8534ed3
@@ -32,9 +28,9 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==466e43bd541ef447de2aafbc6818496c
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==2c4cf09c5548f069626bf632708016a8
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==4dacbf945449e0e328d5335ed213c68d
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==f8030a384c95a1eea95d314a7fbc4ec9
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==397eea9f6fdcbefcc902943c41fc1d45
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==694484b69aa8ba2f1497f82b4316f23e
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 2e406dbd4683..933f061ad6cf 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1n-0+deb10u2
+libssl1.1==1.1.1n-0+deb10u3
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1n-0+deb10u2
+openssl==1.1.1n-0+deb10u3
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
index 945c497afe1f..456ed031ac62 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -71,6 +71,6 @@ readline-common==7.0-3
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1~bpo9+1
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.0.0197-4+deb9u6
-vim-tiny==2:8.0.0197-4+deb9u6
-xxd==2:8.0.0197-4+deb9u6
\ No newline at end of file
+vim-common==2:8.0.0197-4+deb9u7
+vim-tiny==2:8.0.0197-4+deb9u7
+xxd==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 486251133d20..bc85330e0243 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
index 693e19a4a45c..31dbc0f02747 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -37,7 +37,7 @@ libstdc++-6-dev==6.3.0-18+deb9u1
 libswsscommon==1.0.0
 libtsan0==6.3.0-18+deb9u1
 libubsan0==6.3.0-18+deb9u1
-linux-libc-dev==4.9.303-1
+linux-libc-dev==4.9.320-2
 make==4.1-9.1
 patch==2.7.5-1+deb9u2
 python-dev==2.7.13-2
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 53eff6fcc468..06926e89260f 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -51,7 +51,7 @@ libswsscommon-dbg==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 5501eb8bec43..e57bb05b1c82 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -96,7 +96,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxrender1==1:0.9.10-1
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
index 57a95df51b52..e5d9fdde341a 100644
--- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -121,7 +121,7 @@ libnpth0==1.3-1
 libntlm0==1.4-8+deb9u1
 libopts25==1:5.18.12-3
 libp11-kit0==0.23.3-2+deb9u1
-libpam-systemd==232-25+deb9u13
+libpam-systemd==232-25+deb9u14
 libpcap0.8==1.8.1-3+deb9u1
 libpcre16-3==2:8.39-3
 libperl5.24==5.24.1-3+deb9u7
@@ -153,12 +153,14 @@ libssl-doc==1.1.0l-1~deb9u6
 libssl1.0.2==1.0.2u-1~deb9u7
 libssl1.1==1.1.0l-1~deb9u6
 libstdc++-6-dev==6.3.0-18+deb9u1
+libsystemd0==232-25+deb9u14
 libtacacs+1==4.0.4.27a-3
 libtasn1-6==4.10-1.1+deb9u1
 libtcl8.6==8.6.6+dfsg-1+b1
 libthrift-0.11.0==0.11.0-4
 libtsan0==6.3.0-18+deb9u1
 libubsan0==6.3.0-18+deb9u1
+libudev1==232-25+deb9u14
 libunistring0==0.9.6+really0.9.3-0.1
 libutempter0==1.1.6-3
 libuv1==1.9.1-3
@@ -171,7 +173,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-2.2+deb9u7
 libxmuu1==2:1.1.2-2
-linux-libc-dev==4.9.303-1
+linux-libc-dev==4.9.320-2
 logrotate==3.11.0-0.1
 lsof==4.89+dfsg-0.1
 m4==1.4.18-1
@@ -219,7 +221,7 @@ rsync==3.1.2-1+deb9u3
 rsyslog==8.24.0-1+deb9u3
 sgml-base==1.29
 shared-mime-info==1.8-1+deb9u1
-systemd==232-25+deb9u13
+systemd==232-25+deb9u14
 systemd-shim==10-3
 tacacs+==4.0.4.27a-3
 tcpd==7.6.q-26
@@ -229,12 +231,12 @@ tmux==2.3-4
 traceroute==1:2.1.0-2
 ucf==3.0036
 unzip==6.0-21+deb9u2
-vim==2:8.0.0197-4+deb9u6
-vim-common==2:8.0.0197-4+deb9u6
-vim-runtime==2:8.0.0197-4+deb9u6
+vim==2:8.0.0197-4+deb9u7
+vim-common==2:8.0.0197-4+deb9u7
+vim-runtime==2:8.0.0197-4+deb9u7
 wget==1.18-5+deb9u3
 xauth==1:1.0.9-1+b2
 xdg-user-dirs==0.15-2+b1
 xml-core==0.17
-xxd==2:8.0.0197-4+deb9u6
+xxd==2:8.0.0197-4+deb9u7
 xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index eba32f350332..454a54602a78 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -1,7 +1,7 @@
 backports.functools-lru-cache==1.6.4
 backports.shutil-get-terminal-size==1.0.0
 bcrypt==3.1.7
-cffi==1.15.0
+cffi==1.15.1
 click==7.1.2
 contextlib2==0.6.0.post1
 cryptography==3.3.2
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 90ebc3395250..cd8222097c2b 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -47,7 +47,7 @@ libsnmp30-dbg==5.7.3+dfsg-5
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 make==4.2.1-1.2
 mariadb-common==1:10.3.34-0+deb10u1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 84b0ebba78c1..037e43e3429f 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -50,7 +50,7 @@ libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libyang==1.0.73
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-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
index fd902f81d4f9..c07300965a59 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,26 +1,26 @@
 attrs==21.4.0
 certifi==2017.4.17
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.1.2
-grpcio==1.46.3
+grpcio==1.47.0
 grpcio-tools==1.20.0
 idna==3.3
-importlib-metadata==4.11.4
-importlib-resources==5.7.1
+importlib-metadata==4.12.0
+importlib-resources==5.8.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.6.0
+jsonschema==4.6.1
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==4.21.1
+protobuf==4.21.2
 pyrsistent==0.18.1
 python-dateutil==2.6.0
-requests==2.27.1
+requests==2.28.1
 six==1.11.0
-typing_extensions==4.2.0
+typing_extensions==4.3.0
 urllib3==1.26.5
 werkzeug==2.1.2
 zipp==3.8.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 2167fcbe283a..32ff5d4b0134 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -10,7 +10,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
 dh-python==3.20190308
-dirmngr==2.2.12-1+deb10u1
+dirmngr==2.2.12-1+deb10u2
 dmsetup==2:1.02.155-3
 ethtool==1:4.19-1
 frr==7.5.1-sonic-0
@@ -19,15 +19,16 @@ g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
 gettext-base==0.19.8.1-9
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
+gnupg==2.2.12-1+deb10u2
+gnupg-l10n==2.2.12-1+deb10u2
+gnupg-utils==2.2.12-1+deb10u2
+gpg==2.2.12-1+deb10u2
+gpg-agent==2.2.12-1+deb10u2
+gpg-wks-client==2.2.12-1+deb10u2
+gpg-wks-server==2.2.12-1+deb10u2
+gpgconf==2.2.12-1+deb10u2
+gpgsm==2.2.12-1+deb10u2
+gpgv==2.2.12-1+deb10u2
 grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
 ifupdown==0.8.35
@@ -95,7 +96,7 @@ libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsaivs==1.0.0
-libssl-dev==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libteam-utils==1.30-1
 libteam5==1.30-1
@@ -106,7 +107,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 logrotate==3.14.0-4
 make==4.2.1-1.2
 ndisc6==1.0.4-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 19b3ee62bf30..6e78a4a6e068 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
-certifi==2022.5.18.1
-charset-normalizer==2.0.12
+certifi==2022.6.15
+charset-normalizer==2.1.0
 click==7.0
 idna==3.3
 ijson==2.6.1
@@ -9,8 +9,8 @@ netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
 pyroute2==0.5.14
-requests==2.27.1
+requests==2.28.1
 scapy==2.4.4
-tabulate==0.8.9
+tabulate==0.8.10
 urllib3==1.26.9
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index d00d0628c9fe..f9af0d7d4e73 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 012d1e21e2c2..714e0de0a715 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index d0b4ea39c26c..ada44fa26eb0 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -45,7 +45,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index a063e419d184..ced876e18827 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 62a05ece6439..099d8c888783 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -47,14 +47,14 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index c2d3b432aaa2..b8d10d33db99 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.4
-innovium-sai-headers==0.107.4
+innovium-sai==0.107.5
+innovium-sai-headers==0.107.5
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 713326cf246c..b7a3d88403b3 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u4
 libqt5network5==5.11.3+dfsg1-1+deb10u4
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 01c9b833e0e2..968aad1fd450 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -31,9 +31,9 @@ libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 mft==4.18.0-106
-mlnx-sai==1.mlnx.SAIRel1.21.1.2
+mlnx-sai==1.mlnx.SAIRel1.21.2.2
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index fb66d2527507..73159f281269 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -25,5 +25,5 @@ sshpass==1.06-1
 strace==4.15-2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.0.0197-4+deb9u6
-vim-runtime==2:8.0.0197-4+deb9u6
\ No newline at end of file
+vim==2:8.0.0197-4+deb9u7
+vim-runtime==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index b6bc329147d5..7b37a4a560db 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -31,6 +31,7 @@ binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
 bison==2:3.3.2.dfsg-1
 blt==2.5.3+dfsg-4
+bsd-mailx==8.1.2-0.20180807cvs-1
 bsdmainutils==11.1.2+b1
 build-essential==12.6
 byacc==20140715-1+b1
@@ -81,7 +82,7 @@ dh-strip-nondeterminism==1.1.2-1
 dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
-dirmngr==2.2.12-1+deb10u1
+dirmngr==2.2.12-1+deb10u2
 distro-info-data==0.41+deb10u4
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
@@ -154,17 +155,18 @@ git-man==1:2.20.1-2+deb10u3
 glib-networking==2.58.0-2+deb10u2
 glib-networking-common==2.58.0-2+deb10u2
 glib-networking-services==2.58.0-2+deb10u2
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gnupg2==2.2.12-1+deb10u1
+gnupg==2.2.12-1+deb10u2
+gnupg-l10n==2.2.12-1+deb10u2
+gnupg-utils==2.2.12-1+deb10u2
+gnupg2==2.2.12-1+deb10u2
 googletest==1.8.1-3
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u2
+gpg-agent==2.2.12-1+deb10u2
+gpg-wks-client==2.2.12-1+deb10u2
+gpg-wks-server==2.2.12-1+deb10u2
+gpgconf==2.2.12-1+deb10u2
+gpgsm==2.2.12-1+deb10u2
+gpgv==2.2.12-1+deb10u2
 graphviz==2.40.1-6+deb10u1
 groff==1.22.4-3+deb10u1
 groff-base==1.22.4-3+deb10u1
@@ -177,7 +179,6 @@ gstreamer1.0-plugins-ugly==1.14.4-1+deb10u1
 gstreamer1.0-x==1.14.4-2+deb10u1
 gtk-update-icon-cache==3.24.5-1
 guile-2.0-libs==2.0.13+1-5.1
-guile-2.2-libs==2.2.4+1-2+deb10u1
 hicolor-icon-theme==0.17-2
 i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
@@ -346,7 +347,6 @@ libcap-ng-dev==0.7.9-2
 libcapstone3==4.0.1+really+3.0.5-1
 libcapture-tiny-perl==0.48-1
 libcarp-clan-perl==6.07-1
-libcbor0==0.5.0+dfsg-2
 libcc1-0==8.3.0-6
 libcdi-api-java==1.2-2
 libcdio18==2.0.0-2
@@ -485,8 +485,6 @@ libfcgi-perl==0.78-2+b3
 libfdt1==1.4.7-4
 libffi-dev==3.2.1-9
 libfftw3-double3==3.3.8-2
-libfido2-1==1.5.0-2~bpo10+1
-libfido2-dev==1.5.0-2~bpo10+1
 libfile-basedir-perl==0.08-1
 libfile-chdir-perl==0.1008-1
 libfile-desktopentry-perl==0.22-1
@@ -568,7 +566,6 @@ libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u5
 libgs9-common==9.27~dfsg-2+deb10u5
-libgsasl7==1.8.0-8+b2
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u3
 libgssrpc4==1.17-3+deb10u3
@@ -704,7 +701,6 @@ libkrb5-3==1.17-3+deb10u3
 libkrb5-dev==1.17-3+deb10u3
 libkrb5support0==1.17-3+deb10u3
 libksba8==1.3.5-2
-libkyotocabinet16v5==1.2.76-4.2+b1
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
@@ -717,6 +713,8 @@ libllvm6.0==1:6.0.1-10
 libllvm7==1:7.0.1-8+deb10u2
 liblmdb0==0.9.22-1
 liblocale-gettext-perl==1.07-3+b4
+liblockfile-bin==1.14-1.1
+liblockfile1==1.14-1.1
 liblog-any-adapter-screen-perl==0.140-1
 liblog-any-perl==1.707-1
 liblog4j1.2-java==1.2.17-8+deb10u2
@@ -741,7 +739,6 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmailutils5==1:3.5-4
 libmariadb-dev==1:10.3.34-0+deb10u1
 libmariadb-dev-compat==1:10.3.34-0+deb10u1
 libmariadb3==1:10.3.34-0+deb10u1
@@ -819,7 +816,6 @@ libnpth0==1.6-1
 libnspr4==2:4.20-1
 libnss-systemd==241-7~deb10u8
 libnss3==2:3.42.1-1+deb10u5
-libntlm0==1.5-1+deb10u1
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
 libnumber-compare-perl==0.03-1
@@ -1060,8 +1056,8 @@ libsqlite3-0==3.27.2-3+deb10u1
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u2
-libssl1.1==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
+libssl1.1==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1320,12 +1316,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.235-1
-linux-headers-4.19.0-20-amd64==4.19.235-1
-linux-headers-4.19.0-20-common==4.19.235-1
-linux-headers-amd64==4.19+105+deb10u15
-linux-kbuild-4.19==4.19.235-1
-linux-libc-dev==4.19.235-1
+linux-compiler-gcc-8-x86==4.19.249-2
+linux-headers-4.19.0-21-amd64==4.19.249-2
+linux-headers-4.19.0-21-common==4.19.249-2
+linux-headers-amd64==4.19+105+deb10u16
+linux-kbuild-4.19==4.19.249-2
+linux-libc-dev==4.19.249-2
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1343,8 +1339,6 @@ lvm2==2.03.02-3
 lynx==2.8.9rel.1-3+deb10u1
 lynx-common==2.8.9rel.1-3+deb10u1
 m4==1.4.18-2
-mailutils==1:3.5-4
-mailutils-common==1:3.5-4
 make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
@@ -1372,10 +1366,10 @@ openjdk-11-jre-headless==11.0.15+10-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
-openssh-client==1:8.4p1-2~bpo10+1
-openssh-server==1:8.4p1-2~bpo10+1
-openssh-sftp-server==1:8.4p1-2~bpo10+1
-openssl==1.1.1n-0+deb10u2
+openssh-client==1:7.9p1-10+deb10u2
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+openssl==1.1.1n-0+deb10u3
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 0dbab5ad344e..648627cb4e1a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -99,7 +99,7 @@ libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
 libxslt1-dev==1.1.32-2.2~deb10u1
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.235-1
+linux-compiler-gcc-8-arm==4.19.249-2
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 769c8c35f18a..c37b4e348e98 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==138bff2823590b3f3db440425bf712392defb7de
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
index 96ba0fd2fcff..6f3a9f27360f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch
@@ -217,9 +217,9 @@ libaudio2==1.9.4-5+b1
 libaudit-dev==1:2.6.7-2
 libaugeas0==1.8.0-1+deb9u1
 libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.6.32-2
-libavahi-common-data==0.6.32-2
-libavahi-common3==0.6.32-2
+libavahi-client3==0.6.32-2+deb9u1
+libavahi-common-data==0.6.32-2+deb9u1
+libavahi-common3==0.6.32-2+deb9u1
 libavalon-framework-java==4.2.0-9
 libb-hooks-endofscope-perl==0.21-1
 libbabeltrace-ctf-dev==1.5.1-1
@@ -678,7 +678,7 @@ libmaven-plugin-tools-java==3.3-5
 libmaven-reporting-impl-java==2.3-1
 libmaven-resources-plugin-java==2.6-1
 libmaven-shared-incremental-java==1.1-1
-libmaven-shared-utils-java==3.0.0-1
+libmaven-shared-utils-java==3.0.0-1+deb9u1
 libmaven-site-plugin-java==2.1-4
 libmaven2-core-java==2.2.1-26
 libmaven3-core-java==3.3.9-4
@@ -746,7 +746,7 @@ libpackage-stash-perl==0.37-1
 libpackage-stash-xs-perl==0.28-3+b1
 libpackagekit-glib2-18==1.1.5-2+deb9u2
 libpam-cap==1:2.25-1
-libpam-systemd==232-25+deb9u13
+libpam-systemd==232-25+deb9u14
 libpam0g-dev==1.1.8-3.6
 libpango-1.0-0==1.40.5-1
 libpangocairo-1.0-0==1.40.5-1
@@ -911,7 +911,7 @@ libslang2-dev==2.3.1-5
 libslf4j-java==1.7.22-1
 libsm-dev==2:1.2.2-1+b3
 libsm6==2:1.2.2-1+b3
-libsndfile1==1.0.27-3+deb9u2
+libsndfile1==1.0.27-3+deb9u3
 libsnmp-base==5.7.3+dfsg-1.7+deb9u3
 libsnmp-dev==5.7.3+dfsg-1.7+deb9u3
 libsnmp30==5.7.3+dfsg-1.7+deb9u3
@@ -944,7 +944,8 @@ libsurefire-java==2.17-3
 libswitch-perl==2.17-2
 libsynctex1==2016.20160513.41080.dfsg-2+deb9u1
 libsys-hostname-long-perl==1.5-1
-libsystemd-dev==232-25+deb9u13
+libsystemd-dev==232-25+deb9u14
+libsystemd0==232-25+deb9u14
 libtask-weaken-perl==1.04-1
 libtasn1-6==4.10-1.1+deb9u1
 libtcl8.6==8.6.6+dfsg-1+b1
@@ -972,7 +973,8 @@ libtry-tiny-perl==0.28-1
 libtsan0==6.3.0-18+deb9u1
 libtxc-dxtn-s2tc==1.0+git20151227-2
 libubsan0==6.3.0-18+deb9u1
-libudev-dev==232-25+deb9u13
+libudev-dev==232-25+deb9u14
+libudev1==232-25+deb9u14
 libunicode-utf8-perl==0.60-1+b3
 libunistring0==0.9.6+really0.9.3-0.1
 libunwind-dev==1.1-4.1
@@ -1128,12 +1130,12 @@ libzmq5==4.2.1-4+deb9u4
 libzzip-0-13==0.13.62-3.2~deb9u2
 licensecheck==3.0.29-1
 lintian==2.5.50.4
-linux-compiler-gcc-6-x86==4.9.303-1
-linux-headers-4.9.0-18-amd64==4.9.303-1
-linux-headers-4.9.0-18-common==4.9.303-1
-linux-headers-amd64==4.9+80+deb9u16
-linux-kbuild-4.9==4.9.303-1
-linux-libc-dev==4.9.303-1
+linux-compiler-gcc-6-x86==4.9.320-2
+linux-headers-4.9.0-19-amd64==4.9.320-2
+linux-headers-4.9.0-19-common==4.9.320-2
+linux-headers-amd64==4.9+80+deb9u17
+linux-kbuild-4.9==4.9.320-2
+linux-libc-dev==4.9.320-2
 linuxdoc-tools==0.9.72-4
 llvm-3.8==1:3.8.1-24
 llvm-3.8-dev==1:3.8.1-24
@@ -1413,7 +1415,7 @@ strace==4.15-2
 sudo==1.8.19p1-2.1+deb9u3
 swig==3.0.10-1.1
 swig3.0==3.0.10-1.1
-systemd==232-25+deb9u13
+systemd==232-25+deb9u14
 systemd-shim==10-3
 t1utils==1.39-2
 tcl==8.6.0+9
@@ -1450,9 +1452,9 @@ ucf==3.0036
 unattended-upgrades==0.93.1+nmu1
 unzip==6.0-21+deb9u2
 velocity==1.7-5+deb9u1
-vim==2:8.0.0197-4+deb9u6
-vim-common==2:8.0.0197-4+deb9u6
-vim-runtime==2:8.0.0197-4+deb9u6
+vim==2:8.0.0197-4+deb9u7
+vim-common==2:8.0.0197-4+deb9u7
+vim-runtime==2:8.0.0197-4+deb9u7
 wdiff==1.2.2-2
 wget==1.18-5+deb9u3
 x11-common==1:7.7+19
@@ -1480,7 +1482,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.29-2.1+deb9u2
 xterm==327-2+deb9u3
 xtrans-dev==1.3.5-1
-xxd==2:8.0.0197-4+deb9u6
+xxd==2:8.0.0197-4+deb9u7
 xz-utils==5.2.2-1.2+deb9u1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.8.dfsg-5+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
index fb64a5239dd9..598d015aab3d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf
@@ -10,5 +10,5 @@ libtext-charwidth-perl==0.04-7+b6
 libwayland-bin==1.12.0-1+deb9u1
 libwayland-dev==1.12.0-1+deb9u1
 libxslt1-dev==1.1.29-2.1+deb9u2
-linux-compiler-gcc-6-arm==4.9.303-1
+linux-compiler-gcc-6-arm==4.9.320-2
 nodejs==10.24.1-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 36ba9f15c6e5..c37b4e348e98 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==89b222dba5ea3fd91598e821c0b82797f2e2fa3c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 12cb4e19adc3..d2eb89dabfe6 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -23,7 +23,7 @@ curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
-dirmngr==2.2.12-1+deb10u1
+dirmngr==2.2.12-1+deb10u2
 distro-info-data==0.41+deb10u4
 dmidecode==3.2-1
 dmsetup==2:1.02.155-3
@@ -47,15 +47,16 @@ gdisk==1.0.3-1.1
 gettext-base==0.19.8.1-9
 gir1.2-glib-2.0==1.58.3-2
 gir1.2-packagekitglib-1.0==1.1.12-5
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
+gnupg==2.2.12-1+deb10u2
+gnupg-l10n==2.2.12-1+deb10u2
+gnupg-utils==2.2.12-1+deb10u2
+gpg==2.2.12-1+deb10u2
+gpg-agent==2.2.12-1+deb10u2
+gpg-wks-client==2.2.12-1+deb10u2
+gpg-wks-server==2.2.12-1+deb10u2
+gpgconf==2.2.12-1+deb10u2
+gpgsm==2.2.12-1+deb10u2
+gpgv==2.2.12-1+deb10u2
 grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
 gzip==1.9-3+deb10u1
@@ -68,7 +69,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.4
+innovium-platform-driver==0.107.5
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -96,7 +97,6 @@ libc-l10n==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
-libcbor0==0.5.0+dfsg-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
@@ -118,7 +118,6 @@ libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
-libfido2-1==1.5.0-2~bpo10+1
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libftdi1-2==1.4-1+b2
@@ -208,8 +207,8 @@ libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u2
-libssl1.1==1.1.1n-0+deb10u2
+libssl-dev==1.1.1n-0+deb10u3
+libssl1.1==1.1.1n-0+deb10u3
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
@@ -229,7 +228,7 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
-linux-libc-dev==4.19.235-1
+linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -254,7 +253,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u2
+openssl==1.1.1n-0+deb10u3
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 69f3bc0a0cf2..21f7a975c0e2 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,5 +1,15 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+dirmngr==2.2.12-1+deb10u1
 dpkg-dev==1.19.7
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdpkg-perl==1.19.7
@@ -14,10 +24,11 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
+linux-libc-dev==4.19.235-1
 openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 rsyslog==8.1901.0-1+deb10u1
 tsingma-bsp==1.0
-tzdata==2021a-0+deb10u4
+tzdata==2021a-0+deb10u5
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 88463dc21933..8f75ca7fe9eb 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,5 +1,15 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+dirmngr==2.2.12-1+deb10u1
 dpkg-dev==1.19.7
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libdpkg-perl==1.19.7
@@ -14,10 +24,11 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
+linux-libc-dev==4.19.235-1
 mrvlprestera==1.0
 openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 rsyslog==8.1901.0-1+deb10u1
-tzdata==2021a-0+deb10u4
+tzdata==2021a-0+deb10u5
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 794f47b66b84..305880bbb81f 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,9 +2,9 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.5.18.1
-cffi==1.15.0
-charset-normalizer==2.0.12
+certifi==2022.6.15
+cffi==1.15.1
+charset-normalizer==2.1.0
 click==7.0
 cryptography==37.0.2
 docker==4.3.1
@@ -33,12 +33,12 @@ python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
 regex==2022.6.2
-requests==2.27.1
+requests==2.28.1
 scapy==2.4.4
 six==1.16.0
-tabulate==0.8.9
+tabulate==0.8.10
 thrift==0.13.0
 urllib3==1.26.9
 watchdog==0.10.3
-websocket-client==1.3.2
+websocket-client==1.3.3
 xmltodict==0.12.0
\ No newline at end of file

From 24b90d7556db48564b10367336eb9c3bfbea3a7a Mon Sep 17 00:00:00 2001
From: Zhijian Li <lzj_0218@126.com>
Date: Wed, 6 Jul 2022 17:27:29 +0800
Subject: [PATCH 1264/1674] [cherry-pick][202012] Fix issue where HLX module
 failed to do postinit (#11351)

* [HLX] Fix issue where HLX module failed to do postinit (#7274)

Signed-off-by: Jing Kan jika@microsoft.com
---
 .../debian/platform-modules-haliburton.install                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
index ec56777b9ffb..af61050308b8 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.install
@@ -8,4 +8,5 @@ haliburton/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/x8
 services/platform_api/platform_api_mgnt.sh usr/local/bin
 haliburton/script/popmsg.sh usr/local/bin
 haliburton/script/udev_prefix.sh usr/local/bin
+haliburton/script/reload_udev.sh usr/local/bin
 haliburton/script/50-ttyUSB-C0.rules etc/udev/rules.d

From 729b4b4c400bc5c6a8cbebb7fee990fcef38c424 Mon Sep 17 00:00:00 2001
From: Vivek <vivekreddykarri98@gmail.com>
Date: Wed, 6 Jul 2022 17:43:35 -0700
Subject: [PATCH 1265/1674] Update sonic-swss submodule (#11310)

Update sonic-swss submodule

```
639d10e [PFC_WD] [202012] Avoid applying ZeroBuffer Profiles to ingress PG when a PFC storm is detected (https://github.com/Azure/sonic-buildimage/pull/2310)
475ae19 [202012] [cherry-pick] Apply `DSCP_TO_TC_MAP` from `PORT_QOS_MAP|global` to switch level (https://github.com/Azure/sonic-buildimage/issues/2328)
aa6f855 [ci] Change artifact reference pipeline to common lib pipeline. (https://github.com/Azure/sonic-buildimage/pull/2294)
752f8c5 [ci] Use correct branch when downloading artifact. (https://github.com/Azure/sonic-buildimage/pull/2292)
b3fcc5d [ci] Improve azp trigger settings to automaticlly support new release branch. (https://github.com/Azure/sonic-buildimage/pull/2289)
```
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index bee36846890e..639d10e19c09 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit bee36846890e63e584435911c14dd8334b767ca1
+Subproject commit 639d10e19c0923ae117af95b3228e64e2c9c16a6

From 2ed29da38d46fee4994bab1ae2921ab0e5b3a8e0 Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Tue, 26 Apr 2022 21:26:52 +0000
Subject: [PATCH 1266/1674] [buffer] create infrastructure to enable buffer/QoS
 profiles

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Celestica-DX010-C32/BALANCED              |  1 +
 .../Celestica-DX010-C32/RDMA-CENTRIC          |  1 +
 .../Celestica-DX010-C32/TCP-CENTRIC           |  1 +
 .../Celestica-DX010-C32/buffer_ports_t0.j2    | 13 +++++
 .../Celestica-DX010-C32/buffer_ports_t1.j2    | 13 +++++
 .../buffers_defaults_t0.j2                    | 55 +------------------
 .../buffers_defaults_t1.j2                    | 55 +------------------
 .../Celestica-DX010-C32/pg_profile_lookup.ini | 18 +-----
 .../Celestica-DX010-C32/qos.json.j2           | 22 +-------
 .../th/gen/BALANCED/buffers_defaults_t0.j2    | 41 ++++++++++++++
 .../th/gen/BALANCED/buffers_defaults_t1.j2    | 41 ++++++++++++++
 .../th/gen/BALANCED/pg_profile_lookup.ini     | 17 ++++++
 .../profiles/th/gen/BALANCED/qos.json.j2      | 21 +++++++
 .../gen/RDMA-CENTRIC/buffers_defaults_t0.j2   | 41 ++++++++++++++
 .../gen/RDMA-CENTRIC/buffers_defaults_t1.j2   | 41 ++++++++++++++
 .../th/gen/RDMA-CENTRIC/pg_profile_lookup.ini | 17 ++++++
 .../profiles/th/gen/RDMA-CENTRIC/qos.json.j2  | 21 +++++++
 device/common/profiles/th/gen/TCP-CENTRIC     |  1 +
 18 files changed, 274 insertions(+), 146 deletions(-)
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/BALANCED
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/RDMA-CENTRIC
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/TCP-CENTRIC
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t0.j2
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t1.j2
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
 create mode 100644 device/common/profiles/th/gen/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th/gen/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th/gen/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th/gen/BALANCED/qos.json.j2
 create mode 100644 device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th/gen/RDMA-CENTRIC/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th/gen/RDMA-CENTRIC/qos.json.j2
 create mode 120000 device/common/profiles/th/gen/TCP-CENTRIC

diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/BALANCED b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/RDMA-CENTRIC b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/RDMA-CENTRIC
new file mode 120000
index 000000000000..a05581efb9ff
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/TCP-CENTRIC b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..c33d873068a4
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t0.j2
@@ -0,0 +1,13 @@
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '300m'
+        }
+-%}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t1.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..c33d873068a4
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffer_ports_t1.j2
@@ -0,0 +1,13 @@
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '300m'
+        }
+-%}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
deleted file mode 100644
index 4dd6bd96ad96..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- set ports2cable = {
-        'torrouter_server'       : '300m',
-        'leafrouter_torrouter'   : '300m',
-        'spinerouter_leafrouter' : '300m'
-        }
--%}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
deleted file mode 100644
index 3c93fb8fe2e3..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- set ports2cable = {
-        'torrouter_server'       : '300m',
-        'leafrouter_torrouter'   : '300m',
-        'spinerouter_leafrouter' : '300m'
-        }
--%}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
deleted file mode 100644
index 673df369a9bb..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 90272   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 53248   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 96096   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/common/profiles/th/gen/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/th/gen/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..c671233a02f5
--- /dev/null
+++ b/device/common/profiles/th/gen/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,41 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/gen/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/th/gen/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..11aab2cabd45
--- /dev/null
+++ b/device/common/profiles/th/gen/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,41 @@
+{%- set default_cable = '40m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/gen/BALANCED/pg_profile_lookup.ini b/device/common/profiles/th/gen/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..673df369a9bb
--- /dev/null
+++ b/device/common/profiles/th/gen/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 90272   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 53248   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 96096   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
diff --git a/device/common/profiles/th/gen/BALANCED/qos.json.j2 b/device/common/profiles/th/gen/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..34002048afdb
--- /dev/null
+++ b/device/common/profiles/th/gen/BALANCED/qos.json.j2
@@ -0,0 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..c671233a02f5
--- /dev/null
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -0,0 +1,41 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..11aab2cabd45
--- /dev/null
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -0,0 +1,41 @@
+{%- set default_cable = '40m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/th/gen/RDMA-CENTRIC/pg_profile_lookup.ini
new file mode 100644
index 000000000000..673df369a9bb
--- /dev/null
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 90272   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 53248   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 96096   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th/gen/RDMA-CENTRIC/qos.json.j2
new file mode 100644
index 000000000000..34002048afdb
--- /dev/null
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/qos.json.j2
@@ -0,0 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th/gen/TCP-CENTRIC b/device/common/profiles/th/gen/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/common/profiles/th/gen/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file

From 4dbdc8e0a021fa094ce75f9d95f31c4cbb1f9b0a Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Wed, 27 Apr 2022 20:35:41 +0800
Subject: [PATCH 1267/1674] [Buffer] Separate buffer profile for Force10-S6100

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../th/6100/BALANCED/buffers_defaults_t0.j2   | 42 ++++++++++++++++
 .../th/6100/BALANCED/buffers_defaults_t1.j2   | 42 ++++++++++++++++
 .../th/6100/BALANCED/pg_profile_lookup.ini    | 17 +++++++
 .../profiles/th/6100/BALANCED/qos.json.j2     | 21 ++++++++
 .../6100/RDMA-CENTRIC/buffers_defaults_t0.j2  | 42 ++++++++++++++++
 .../6100/RDMA-CENTRIC/buffers_defaults_t1.j2  | 42 ++++++++++++++++
 .../6100/RDMA-CENTRIC/pg_profile_lookup.ini   | 17 +++++++
 .../profiles/th/6100/RDMA-CENTRIC/qos.json.j2 | 21 ++++++++
 device/common/profiles/th/6100/TCP-CENTRIC    |  1 +
 .../Force10-S6100/BALANCED                    |  1 +
 .../Force10-S6100/RDMA-CENTRIC                |  1 +
 .../Force10-S6100/TCP-CENTRIC                 |  1 +
 .../Force10-S6100/buffer_ports_t0.j2          |  6 +++
 .../Force10-S6100/buffer_ports_t1.j2          |  6 +++
 .../Force10-S6100/buffers_defaults_t0.j2      | 48 +------------------
 .../Force10-S6100/buffers_defaults_t1.j2      | 48 +------------------
 .../Force10-S6100/pg_profile_lookup.ini       | 18 +------
 .../Force10-S6100/qos.json.j2                 | 22 +--------
 18 files changed, 264 insertions(+), 132 deletions(-)
 create mode 100644 device/common/profiles/th/6100/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th/6100/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th/6100/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th/6100/BALANCED/qos.json.j2
 create mode 100644 device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th/6100/RDMA-CENTRIC/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th/6100/RDMA-CENTRIC/qos.json.j2
 create mode 120000 device/common/profiles/th/6100/TCP-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/BALANCED
 create mode 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/RDMA-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/TCP-CENTRIC
 create mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t0.j2
 create mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t1.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
 mode change 100644 => 120000 device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2

diff --git a/device/common/profiles/th/6100/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/th/6100/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..ed5c9deac0c1
--- /dev/null
+++ b/device/common/profiles/th/6100/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,42 @@
+
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/6100/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/th/6100/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..f1a4c9c2e2fe
--- /dev/null
+++ b/device/common/profiles/th/6100/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,42 @@
+
+{%- set default_cable = '40m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/6100/BALANCED/pg_profile_lookup.ini b/device/common/profiles/th/6100/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..0b5d680edda7
--- /dev/null
+++ b/device/common/profiles/th/6100/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 79872   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 56160   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 85696   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
diff --git a/device/common/profiles/th/6100/BALANCED/qos.json.j2 b/device/common/profiles/th/6100/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..34002048afdb
--- /dev/null
+++ b/device/common/profiles/th/6100/BALANCED/qos.json.j2
@@ -0,0 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..ed5c9deac0c1
--- /dev/null
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -0,0 +1,42 @@
+
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..f1a4c9c2e2fe
--- /dev/null
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -0,0 +1,42 @@
+
+{%- set default_cable = '40m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"1518",
+            "static_th":"15982720"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/th/6100/RDMA-CENTRIC/pg_profile_lookup.ini
new file mode 100644
index 000000000000..0b5d680edda7
--- /dev/null
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 79872   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 56160   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 85696   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th/6100/RDMA-CENTRIC/qos.json.j2
new file mode 100644
index 000000000000..34002048afdb
--- /dev/null
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/qos.json.j2
@@ -0,0 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "250000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th/6100/TCP-CENTRIC b/device/common/profiles/th/6100/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/common/profiles/th/6100/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/BALANCED b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/BALANCED
new file mode 120000
index 000000000000..6f064064664a
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/6100/BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/RDMA-CENTRIC b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/RDMA-CENTRIC
new file mode 120000
index 000000000000..4ab30f5ff42f
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/6100/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/TCP-CENTRIC b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/TCP-CENTRIC
new file mode 120000
index 000000000000..d5d3a5b671b5
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/6100/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t0.j2
new file mode 100644
index 000000000000..ae201eb2593a
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t1.j2
new file mode 100644
index 000000000000..ae201eb2593a
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
deleted file mode 100644
index 8f55022973fb..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
deleted file mode 100644
index 47a9c81f0796..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
deleted file mode 100644
index 0b5d680edda7..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 79872   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 56160   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 85696   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From 2c81f02b13bcf515c14a8b480dae81c3ac3124e4 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Wed, 27 Apr 2022 19:38:44 +0800
Subject: [PATCH 1268/1674] [Buffer] Separate buffer profile for
 Celestica-DX010-D48C8

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Celestica-DX010-D48C8/BALANCED            |  1 +
 .../Celestica-DX010-D48C8/RDMA-CENTRIC        |  1 +
 .../Celestica-DX010-D48C8/TCP-CENTRIC         |  1 +
 .../Celestica-DX010-D48C8/buffer_ports_t0.j2  | 28 ++++++++
 .../buffers_defaults_t0.j2                    | 70 +------------------
 .../pg_profile_lookup.ini                     | 18 +----
 .../Celestica-DX010-D48C8/qos.json.j2         | 22 +-----
 7 files changed, 34 insertions(+), 107 deletions(-)
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/BALANCED
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/RDMA-CENTRIC
 create mode 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/TCP-CENTRIC
 create mode 100644 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffer_ports_t0.j2
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
 mode change 100644 => 120000 device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2

diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/BALANCED b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/RDMA-CENTRIC b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/RDMA-CENTRIC
new file mode 120000
index 000000000000..a05581efb9ff
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/TCP-CENTRIC b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffer_ports_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffer_ports_t0.j2
new file mode 100644
index 000000000000..b4f4f7bab3f3
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffer_ports_t0.j2
@@ -0,0 +1,28 @@
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '300m'
+        }
+-%}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,9) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(14,17) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(22,31) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(10,13) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(18,21) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
deleted file mode 100644
index 4e4489f84a87..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,69 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- set ports2cable = {
-        'torrouter_server'       : '300m',
-        'leafrouter_torrouter'   : '300m',
-        'spinerouter_leafrouter' : '300m'
-        }
--%}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,9) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(14,17) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(22,31) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(10,13) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(18,21) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
deleted file mode 100644
index 673df369a9bb..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 90272   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 53248   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 96096   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2 b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From e8f04cd2e62013e072e0c9ede63198cd64ef9a81 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Wed, 27 Apr 2022 21:57:50 +0800
Subject: [PATCH 1269/1674] [Buffer] Separate buffer profile for
 Arista-7060CX-32S-Q32

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7060CX-32S-Q32/BALANCED            |  1 +
 .../Arista-7060CX-32S-Q32/RDMA-CENTRIC        |  1 +
 .../Arista-7060CX-32S-Q32/TCP-CENTRIC         |  1 +
 .../Arista-7060CX-32S-Q32/buffer_ports_t0.j2  |  6 +++
 .../Arista-7060CX-32S-Q32/buffer_ports_t1.j2  |  6 +++
 .../buffers_defaults_t0.j2                    | 48 +------------------
 .../buffers_defaults_t1.j2                    | 48 +------------------
 .../pg_profile_lookup.ini                     | 18 +------
 .../Arista-7060CX-32S-Q32/qos.json.j2         | 22 +--------
 9 files changed, 19 insertions(+), 132 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/BALANCED
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2

diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/BALANCED b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/RDMA-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/RDMA-CENTRIC
new file mode 120000
index 000000000000..a05581efb9ff
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/TCP-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..2f41924b4fcf
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..2f41924b4fcf
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
deleted file mode 100644
index 0869e63968ac..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
deleted file mode 100644
index 80e96bdceca7..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
deleted file mode 100644
index 673df369a9bb..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 90272   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 53248   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 96096   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From 83780549c7e42f89105decca851528f5b443a143 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Wed, 27 Apr 2022 21:53:28 +0800
Subject: [PATCH 1270/1674] [Buffer] Separate buffer profile for
 Arista-7060CX-32S-D48C8

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7060CX-32S-D48C8/BALANCED          |  1 +
 .../Arista-7060CX-32S-D48C8/RDMA-CENTRIC      |  1 +
 .../Arista-7060CX-32S-D48C8/TCP-CENTRIC       |  1 +
 .../buffer_ports_t0.j2                        | 21 +++++++
 .../buffers_defaults_t0.j2                    | 62 +------------------
 .../pg_profile_lookup.ini                     | 18 +-----
 .../Arista-7060CX-32S-D48C8/qos.json.j2       | 22 +------
 7 files changed, 27 insertions(+), 99 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/BALANCED
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2

diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/BALANCED b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/RDMA-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/RDMA-CENTRIC
new file mode 120000
index 000000000000..a05581efb9ff
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/TCP-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
new file mode 100644
index 000000000000..fdbff09c12d4
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
@@ -0,0 +1,21 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,6) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(10,22) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(24,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(6,10) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(22,24) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
deleted file mode 100644
index 1430479d08e0..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,61 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,6) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(10,22) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(26,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(6,10) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(22,26) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
deleted file mode 100644
index 0b5d680edda7..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 79872   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 56160   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 85696   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From 5b42ba021b43cb233b0ec0a9bda85a9b9f2add86 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Wed, 27 Apr 2022 20:59:30 +0800
Subject: [PATCH 1271/1674] [Buffer] Separate buffer profile for
 Arista-7060CX-32S-C32

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7060CX-32S-C32/BALANCED            |  1 +
 .../Arista-7060CX-32S-C32/RDMA-CENTRIC        |  1 +
 .../Arista-7060CX-32S-C32/TCP-CENTRIC         |  1 +
 .../Arista-7060CX-32S-C32/buffer_ports_t0.j2  |  6 +++
 .../Arista-7060CX-32S-C32/buffer_ports_t1.j2  |  6 +++
 .../buffers_defaults_t0.j2                    | 48 +------------------
 .../buffers_defaults_t1.j2                    | 48 +------------------
 .../pg_profile_lookup.ini                     | 18 +------
 .../Arista-7060CX-32S-C32/qos.json.j2         | 22 +--------
 9 files changed, 19 insertions(+), 132 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/BALANCED
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2

diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/BALANCED b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/RDMA-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/RDMA-CENTRIC
new file mode 120000
index 000000000000..a05581efb9ff
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/TCP-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..2f41924b4fcf
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..2f41924b4fcf
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
deleted file mode 100644
index 0869e63968ac..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
deleted file mode 100644
index 80e96bdceca7..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10875072",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4194112"
-        },
-        "egress_lossy_pool": {
-            "size": "9243812",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
deleted file mode 100644
index 673df369a9bb..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776   0        2288
-  25000  5m   1248    2288 53248   0        2288
-  40000  5m   1248    2288 66560   0        2288
-  50000  5m   1248    2288 90272   0        2288
- 100000  5m   1248    2288 165568  0        2288
-  10000  40m  1248    2288 37024   0        2288
-  25000  40m  1248    2288 53248   0        2288
-  40000  40m  1248    2288 71552   0        2288
-  50000  40m  1248    2288 96096   0        2288
- 100000  40m  1248    2288 177632  0        2288
-  10000  300m 1248    2288 46176   0        2288
-  25000  300m 1248    2288 79040   0        2288
-  40000  300m 1248    2288 108160  0        2288
-  50000  300m 1248    2288 141856  0        2288
- 100000  300m 1248    2288 268736  0        2288
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2
deleted file mode 100644
index 34002048afdb..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro generate_wred_profiles() %}
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable"      : "true",
-            "wred_yellow_enable"     : "true",
-            "wred_red_enable"        : "true",
-            "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "250000",
-            "yellow_max_threshold"   : "2097152",
-            "yellow_min_threshold"   : "1048576",
-            "red_max_threshold"      : "2097152",
-            "red_min_threshold"      : "1048576",
-            "green_drop_probability" : "5",
-            "yellow_drop_probability": "5",
-            "red_drop_probability"   : "5"
-        }
-    },
-{%- endmacro %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From b625085b4656801726aee49d8c9971468bd20a28 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Thu, 28 Apr 2022 17:13:16 +0800
Subject: [PATCH 1272/1674] [Buffer] Separate buffer profile for
 Arista-7260CX3-C64

50G data is not accurate, needs further update.

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7260CX3-C64/BALANCED               |   1 +
 .../Arista-7260CX3-C64/RDMA-CENTRIC           |   1 +
 .../Arista-7260CX3-C64/TCP-CENTRIC            |   1 +
 .../Arista-7260CX3-C64/buffer_ports_t0.j2     |   6 +
 .../Arista-7260CX3-C64/buffer_ports_t1.j2     |   6 +
 .../Arista-7260CX3-C64/buffers_defaults_t0.j2 |  57 +---
 .../Arista-7260CX3-C64/buffers_defaults_t1.j2 |  67 +---
 .../Arista-7260CX3-C64/pg_profile_lookup.ini  |   9 +-
 .../Arista-7260CX3-C64/qos.json.j2            | 293 +-----------------
 .../th2/7260/BALANCED/buffers_defaults_t0.j2  |  51 +++
 .../th2/7260/BALANCED/buffers_defaults_t1.j2  |  61 ++++
 .../th2/7260/BALANCED/pg_profile_lookup.ini   |  11 +
 .../profiles/th2/7260/BALANCED/qos.json.j2    | 292 +++++++++++++++++
 .../7260/RDMA-CENTRIC/buffers_defaults_t0.j2  |  51 +++
 .../7260/RDMA-CENTRIC/buffers_defaults_t1.j2  |  61 ++++
 .../7260/RDMA-CENTRIC/pg_profile_lookup.ini   |  11 +
 .../th2/7260/RDMA-CENTRIC/qos.json.j2         | 292 +++++++++++++++++
 device/common/profiles/th2/7260/TCP-CENTRIC   |   1 +
 18 files changed, 850 insertions(+), 422 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/BALANCED
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
 create mode 100644 device/common/profiles/th2/7260/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th2/7260/BALANCED/qos.json.j2
 create mode 100644 device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
 create mode 120000 device/common/profiles/th2/7260/TCP-CENTRIC

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/BALANCED b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/BALANCED
new file mode 120000
index 000000000000..a270c70ffc36
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/RDMA-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/RDMA-CENTRIC
new file mode 120000
index 000000000000..8d1ec6d277a8
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/TCP-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/TCP-CENTRIC
new file mode 120000
index 000000000000..7ee783aac6a4
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t0.j2
new file mode 100644
index 000000000000..2d56c4b38f9e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t1.j2
new file mode 100644
index 000000000000..2d56c4b38f9e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
deleted file mode 100644
index 49b578cd28fa..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "7827456"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "42349632",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"44302336"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"42349632"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
deleted file mode 100644
index 55baa05e8f9e..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            {# SS Tab2 Row 71 #}
-            "size": "{{ ingress_lossless_pool_size }}",
-            "type": "ingress",
-            "mode": "dynamic",
-            {# SS Tab2 Row 68 #}
-            "xoff": "8965632"
-        },
-        "egress_lossy_pool": {
-            {# SS Tab2 Row 60 #}
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            {# SS Tab2 Row 56 #}
-            "size": "43481152",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            {# SS Tab1 Row 9 #}
-            "static_th":"44302336"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            {# SS Tab2 Row 56 #}
-            "static_th":"43481152"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs1 with context %}
-{% import 'buffers_extra_pgs.j2' as defs2 with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
-{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
-{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
deleted file mode 100644
index 0e71479fc2c2..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 54080     -3        2496
- 100000  40m  1248    1248 59696     -3        2496
- 100000  300m 1248    1248 101088    -3        2496
-  40000  5m   1248    1248 29536     -3        2496
-  40000  40m  1248    1248 31616     -3        2496
-  40000  300m 1248    1248 48256     -3        2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
deleted file mode 100644
index cb3ad17faa39..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
+++ /dev/null
@@ -1,292 +0,0 @@
-{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
-{%- macro generate_dscp_to_tc_map() %}
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "2",
-            "3" : "3",
-            "4" : "4",
-            "5" : "1",
-            "6" : "6",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "1",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "7",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_pg_map() %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "0",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "6",
-            "7": "0"
-        }
-    },
-{%- endmacro %}
-{% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
-{%- macro generate_dscp_to_tc_map() %}
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "1",
-            "3" : "3",
-            "4" : "4",
-            "5" : "1",
-            "6" : "1",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "8",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "7",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        },
-        "AZURE_TUNNEL": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "1",
-            "3" : "3",
-            "4" : "4",
-            "5" : "1",
-            "6" : "1",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "8",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "7",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_pg_map() %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "0",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "6",
-            "7": "0",
-            "8": "0"
-        },
-        "AZURE_TUNNEL": {
-            "0": "0",
-            "1": "0",
-            "2": "0",
-            "3": "2",
-            "4": "6",
-            "5": "0",
-            "6": "0",
-            "7": "0",
-            "8": "0"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_queue_map() %}
-    "TC_TO_QUEUE_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "2": "1",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7",
-            "8": "1"
-        },
-        "AZURE_TUNNEL": {
-            "0": "0",
-            "1": "1",
-            "2": "1",
-            "3": "2",
-            "4": "6",
-            "5": "5",
-            "6": "1",
-            "7": "7",
-            "8": "1"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_dscp_map() %}
-    "TC_TO_DSCP_MAP": {
-        "AZURE_TUNNEL": {
-            "0": "8",
-            "1": "0",
-            "2": "0",
-            "3": "2",
-            "4": "6",
-            "5": "46",
-            "6": "0",
-            "7": "48",
-            "8": "33"
-        }
-    },
-{%- endmacro %}
-{% endif %}
-
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..415db3749fe4
--- /dev/null
+++ b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,51 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..bc1ca774a98e
--- /dev/null
+++ b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,61 @@
+{%- set default_cable = '300m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {# SS Tab2 Row 71 #}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic",
+            {# SS Tab2 Row 68 #}
+            "xoff": "8965632"
+        },
+        "egress_lossy_pool": {
+            {# SS Tab2 Row 60 #}
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            {# SS Tab2 Row 56 #}
+            "size": "43481152",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            {# SS Tab1 Row 9 #}
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            {# SS Tab2 Row 56 #}
+            "static_th":"43481152"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs1 with context %}
+{% import 'buffers_extra_pgs.j2' as defs2 with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
+{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
+{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
+{%- endmacro %}
diff --git a/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini b/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..9d94e3fc1e52
--- /dev/null
+++ b/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,11 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff     threshold xon_offset
+ 100000  5m   1248    1248 54080     -3        2496
+ 100000  40m  1248    1248 59696     -3        2496
+ 100000  300m 1248    1248 101088    -3        2496
+  50000  5m   1248    1248 54080     -3        2496
+  50000  40m  1248    1248 59696     -3        2496
+  50000  300m 1248    1248 101088    -3        2496
+  40000  5m   1248    1248 29536     -3        2496
+  40000  40m  1248    1248 31616     -3        2496
+  40000  300m 1248    1248 48256     -3        2496
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..cb3ad17faa39
--- /dev/null
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -0,0 +1,292 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0"
+        }
+    },
+{%- endmacro %}
+{% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_queue_map() %}
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_dscp_map() %}
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..415db3749fe4
--- /dev/null
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -0,0 +1,51 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..bc1ca774a98e
--- /dev/null
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -0,0 +1,61 @@
+{%- set default_cable = '300m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
+{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
+{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            {# SS Tab2 Row 71 #}
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic",
+            {# SS Tab2 Row 68 #}
+            "xoff": "8965632"
+        },
+        "egress_lossy_pool": {
+            {# SS Tab2 Row 60 #}
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            {# SS Tab2 Row 56 #}
+            "size": "43481152",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            {# SS Tab1 Row 9 #}
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            {# SS Tab2 Row 56 #}
+            "static_th":"43481152"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs1 with context %}
+{% import 'buffers_extra_pgs.j2' as defs2 with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
+{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
+{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
+{%- endmacro %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
new file mode 100644
index 000000000000..9d94e3fc1e52
--- /dev/null
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -0,0 +1,11 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff     threshold xon_offset
+ 100000  5m   1248    1248 54080     -3        2496
+ 100000  40m  1248    1248 59696     -3        2496
+ 100000  300m 1248    1248 101088    -3        2496
+  50000  5m   1248    1248 54080     -3        2496
+  50000  40m  1248    1248 59696     -3        2496
+  50000  300m 1248    1248 101088    -3        2496
+  40000  5m   1248    1248 29536     -3        2496
+  40000  40m  1248    1248 31616     -3        2496
+  40000  300m 1248    1248 48256     -3        2496
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
new file mode 100644
index 000000000000..cb3ad17faa39
--- /dev/null
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -0,0 +1,292 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0"
+        }
+    },
+{%- endmacro %}
+{% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_queue_map() %}
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_dscp_map() %}
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th2/7260/TCP-CENTRIC b/device/common/profiles/th2/7260/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/common/profiles/th2/7260/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file

From f53b2620db3bca8ac0bdfe22b2d8bb5d9c09ccae Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Thu, 28 Apr 2022 17:19:43 +0800
Subject: [PATCH 1273/1674] [Buffer] Separate buffer profile for
 Arista-7260CX3-D108C8

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7260CX3-D108C8/BALANCED            |  1 +
 .../Arista-7260CX3-D108C8/RDMA-CENTRIC        |  1 +
 .../Arista-7260CX3-D108C8/TCP-CENTRIC         |  1 +
 .../Arista-7260CX3-D108C8/buffer_ports_t0.j2  | 14 ++++
 .../buffers_defaults_t0.j2                    | 65 +------------------
 .../pg_profile_lookup.ini                     |  9 +--
 .../Arista-7260CX3-D108C8/qos.json.j2         |  2 +-
 7 files changed, 20 insertions(+), 73 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/BALANCED
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffer_ports_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/BALANCED b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/BALANCED
new file mode 120000
index 000000000000..a270c70ffc36
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/RDMA-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/RDMA-CENTRIC
new file mode 120000
index 000000000000..8d1ec6d277a8
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/TCP-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/TCP-CENTRIC
new file mode 120000
index 000000000000..7ee783aac6a4
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffer_ports_t0.j2
new file mode 100644
index 000000000000..3e209865c308
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffer_ports_t0.j2
@@ -0,0 +1,14 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
deleted file mode 100644
index a40676be13bc..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,64 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,12) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(20,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(12,20) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "7827456"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "42349632",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"44302336"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"42349632"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini
deleted file mode 100644
index ed0005610b71..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff     threshold xon_offset
-  50000  5m   1248    1248 56160    -3        2496
- 100000  5m   1248    1248 96928    -3        2496
-  50000  40m  1248    1248 96096    -3        2496
- 100000  40m  1248    1248 177632   -3        2496
-  50000  300m 1248    1248 141856   -3        2496
- 100000  300m 1248    1248 268736   -3        2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
index f0ee02749724..aef6b6765cf2 120000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2
@@ -1 +1 @@
-../Arista-7260CX3-C64/qos.json.j2
\ No newline at end of file
+BALANCED/qos.json.j2
\ No newline at end of file

From 41518aa825ff7fbc51fc3a68fd9c1ae7bf43ca33 Mon Sep 17 00:00:00 2001
From: Kevin Wang <shengkaiwang@microsoft.com>
Date: Thu, 28 Apr 2022 17:21:46 +0800
Subject: [PATCH 1274/1674] [Buffer] Separate buffer profile for
 Arista-7260CX3-Q64

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 .../Arista-7260CX3-Q64/BALANCED               |  1 +
 .../Arista-7260CX3-Q64/RDMA-CENTRIC           |  1 +
 .../Arista-7260CX3-Q64/TCP-CENTRIC            |  1 +
 .../Arista-7260CX3-Q64/buffer_ports_t0.j2     |  6 ++
 .../Arista-7260CX3-Q64/buffer_ports_t1.j2     |  6 ++
 .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 57 +----------------
 .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 61 +------------------
 .../buffers_pool_sizes_t1.j2                  |  1 +
 .../Arista-7260CX3-Q64/pg_profile_lookup.ini  | 12 +---
 .../Arista-7260CX3-Q64/qos.json.j2            |  2 +-
 10 files changed, 20 insertions(+), 128 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/BALANCED
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/BALANCED b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/BALANCED
new file mode 120000
index 000000000000..a270c70ffc36
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/RDMA-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/RDMA-CENTRIC
new file mode 120000
index 000000000000..8d1ec6d277a8
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/TCP-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/TCP-CENTRIC
new file mode 120000
index 000000000000..7ee783aac6a4
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t0.j2
new file mode 100644
index 000000000000..2d56c4b38f9e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t1.j2
new file mode 100644
index 000000000000..2d56c4b38f9e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
deleted file mode 100644
index 49b578cd28fa..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "7827456"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "42349632",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"44302336"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"42349632"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
deleted file mode 100644
index c840fe648903..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,60 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "7827456"
-        },
-        "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "42349632",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"44302336"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"42349632"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs1 with context %}
-{% import 'buffers_extra_pgs.j2' as defs2 with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
-{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
-{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t1.j2
new file mode 120000
index 000000000000..138e7f373e74
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t1.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini
deleted file mode 100644
index ac33b4f961fb..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff     threshold xon_offset
-  40000  5m   1248    1248 56160    -3        2496
-  50000  5m   1248    1248 56160    -3        2496
- 100000  5m   1248    1248 96928    -3        2496
-  40000  40m  1248    1248 71552    -3        2496
-  50000  40m  1248    1248 96096    -3        2496
- 100000  40m  1248    1248 177632   -3        2496
-  40000  300m 1248    1248 108160   -3        2496
-  50000  300m 1248    1248 141856   -3        2496
- 100000  300m 1248    1248 268736   -3        2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
index f0ee02749724..aef6b6765cf2 120000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/qos.json.j2
@@ -1 +1 @@
-../Arista-7260CX3-C64/qos.json.j2
\ No newline at end of file
+BALANCED/qos.json.j2
\ No newline at end of file

From 17a9259c558b517046ba69ffdcb291597e2a7ac8 Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Thu, 5 May 2022 16:31:45 +0000
Subject: [PATCH 1275/1674] [7060] fix default port map

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Arista-7060CX-32S-D48C8/buffer_ports_t0.j2              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
index fdbff09c12d4..a3c33da63990 100644
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2
@@ -8,14 +8,14 @@
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
     {%- endfor %}
-    {%- for port_idx in range(24,32) %}
+    {%- for port_idx in range(26,32) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
     {%- endfor %}
     {%- for port_idx in range(6,10) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
     {%- endfor %}
-    {%- for port_idx in range(22,24) %}
+    {%- for port_idx in range(22,26) %}
         {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
     {%- endfor %}
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}

From 1d55dca6d325587e04948490ba94238e527a55ab Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Wed, 6 Jul 2022 21:09:49 +0000
Subject: [PATCH 1276/1674] [Buffer] Separate buffer profile for
 Arista-7060CX-32S-Q24C8

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../Arista-7060CX-32S-Q24C8/BALANCED          |  1 +
 .../Arista-7060CX-32S-Q24C8/RDMA-CENTRIC      |  1 +
 .../Arista-7060CX-32S-Q24C8/TCP-CENTRIC       |  1 +
 .../buffer_ports_t0.j2                        |  7 +++
 .../buffers_defaults_t0.j2                    | 47 +------------------
 .../pg_profile_lookup.ini                     | 18 +------
 .../Arista-7060CX-32S-Q24C8/qos.json.j2       |  2 +-
 7 files changed, 13 insertions(+), 64 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/BALANCED
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffer_ports_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2

diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/BALANCED b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/BALANCED
new file mode 120000
index 000000000000..87afd08ffcd8
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/RDMA-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/RDMA-CENTRIC
new file mode 120000
index 000000000000..0c839e1e907b
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC/
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/TCP-CENTRIC b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/TCP-CENTRIC
new file mode 120000
index 000000000000..dd9cf046c0f9
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffer_ports_t0.j2
new file mode 100644
index 000000000000..599db74c1da5
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffer_ports_t0.j2
@@ -0,0 +1,7 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
deleted file mode 100644
index 4858c7a67e65..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "11213696",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "3855488"
-        },
-        "egress_lossy_pool": {
-            "size": "9532224",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"15982720"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini
deleted file mode 100644
index 7222f8014925..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -4        2288
-  25000  5m   1248    2288 53248  -4        2288
-  40000  5m   1248    2288 66560  -4        2288
-  50000  5m   1248    2288 79872  -4        2288
- 100000  5m   1248    2288 165568 -4        2288
-  10000  40m  1248    2288 37024  -4        2288
-  25000  40m  1248    2288 56160  -4        2288
-  40000  40m  1248    2288 71552  -4        2288
-  50000  40m  1248    2288 85696  -4        2288
- 100000  40m  1248    2288 177632 -4        2288
-  10000  300m 1248    2288 46176  -4        2288
-  25000  300m 1248    2288 79040  -4        2288
-  40000  300m 1248    2288 108160 -4        2288
-  50000  300m 1248    2288 131456 -4        2288
- 100000  300m 1248    2288 268736 -4        2288
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From 0c6892776d5657f485b9563594832ccf063f4cc4 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Thu, 7 Jul 2022 22:36:46 -0700
Subject: [PATCH 1277/1674] [Submodule] Update sonic-swss (#11369)

* e84a901 - 2022-07-06 : [vnetorch] fix use-after-free in removeBfdSession() (#2366) [Yakiv Huryk]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 639d10e19c09..e84a90140a81 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 639d10e19c0923ae117af95b3228e64e2c9c16a6
+Subproject commit e84a90140a81ae76c76730218c2b24df7f577f1f

From 6fe583ed1c0fbdb74106142c88d15ff87af7ee20 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 8 Jul 2022 08:47:25 -0700
Subject: [PATCH 1278/1674] [202012] Minigraph parser changes for storage
 backend acl (#11267)

Signed-off-by: Neetha John <nejo@microsoft.com>

Backport #11221

Why I did it
For storage backend, certain rules will be applied to the DATAACL table to allow only vlan tagged packets and drop untagged packets.

How I did it
Create DATAACL table if the device is a storage backend device
To avoid ACL resource issues, remove EVERFLOW related tables if the device is a storage backend device

How to verify it
Added the following unit tests

verify that EVERFLOW acl tables is removed and DATAACL table is added for storage backend tor
verify that no DATAACL tables are created and EVERFLOW tables exist for storage backend leaf
---
 src/sonic-config-engine/minigraph.py          |  23 +-
 .../tests/sample-graph-storage-backend.xml    | 440 ++++++++++++++++++
 .../tests/sample-graph-subintf.xml            |  69 ---
 src/sonic-config-engine/tests/test_cfggen.py  |  41 +-
 4 files changed, 497 insertions(+), 76 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample-graph-storage-backend.xml

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 4b564d83f830..035fb0bcb558 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1052,7 +1052,26 @@ def parse_spine_chassis_fe(results, vni, lo_intfs, phyport_intfs, pc_intfs, pc_m
 #
 ###############################################################################
 
-def filter_acl_table_bindings(acls, neighbors, port_channels, sub_role):
+def filter_acl_table_for_backend(acls, vlan_members):
+    filter_acls = {}
+    for acl_name, value in acls.items():
+        if 'everflow' not in acl_name.lower():
+            filter_acls[acl_name] = value
+
+    ports = set()
+    for vlan, member in vlan_members:
+        ports.add(member)
+    filter_acls['DATAACL'] = { 'policy_desc': 'DATAACL',
+                               'stage': 'ingress',
+                               'type': 'L3',
+                               'ports': list(ports)
+                             }
+    return filter_acls
+
+def filter_acl_table_bindings(acls, neighbors, port_channels, sub_role, device_type, is_storage_device, vlan_members):
+    if device_type == 'BackEndToRRouter' and is_storage_device:
+        return filter_acl_table_for_backend(acls, vlan_members)
+
     filter_acls = {}
     
     # If the asic role is BackEnd no ACL Table (Ctrl/Data/Everflow) is binded.
@@ -1570,7 +1589,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     results['DHCP_RELAY'] = dhcp_relay_table
     results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
     results['TACPLUS_SERVER'] = dict((item, {'priority': '1', 'tcp_port': '49'}) for item in tacacs_servers)
-    results['ACL_TABLE'] = filter_acl_table_bindings(acls, neighbors, pcs, sub_role)
+    results['ACL_TABLE'] = filter_acl_table_bindings(acls, neighbors, pcs, sub_role, current_device['type'], is_storage_device, vlan_members)
     results['FEATURE'] = {
         'telemetry': {
             'status': 'enabled'
diff --git a/src/sonic-config-engine/tests/sample-graph-storage-backend.xml b/src/sonic-config-engine/tests/sample-graph-storage-backend.xml
new file mode 100644
index 000000000000..5333c073c8be
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-graph-storage-backend.xml
@@ -0,0 +1,440 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>0</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab4</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1001</VlanID>
+          <Tag>1001</Tag>
+          <Subnets>192.168.0.32/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>kk1</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2020</VlanID>
+          <Tag>2020</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.0/28</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab3</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2001</VlanID>
+          <Tag>2001</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>everflow</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>ERSPANv6</AttachTo>
+          <InAcl>everflowV6</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>Loopback0</AttachTo>
+          <InAcl>ipv6-mgmt-only</InAcl>
+          <Type>Management</Type>
+          <Vlan>0</Vlan>
+          <File i:nil="true"/>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>Loopback0</AttachTo>
+          <InAcl>mgmt-only</InAcl>
+          <Type>Management</Type>
+          <Vlan>0</Vlan>
+          <File i:nil="true"/>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>StaticERSPAN</AttachTo>
+          <InAcl>everflowStatic</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>et1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/8</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+        <ElementType>DeviceMgmtLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/16</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ChassisMTS1</StartDevice>
+        <StartPort>mgmt0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Arista-7050-QX-32S</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7050-QX-32S</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <Index>1</Index>
+	  <InterfaceName>Management1</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>mgmt1</PortName>
+	  <Speed>1000</Speed>
+  	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>switch-t0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>ResourceType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Storage</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Arista-7050-QX-32S</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample-graph-subintf.xml b/src/sonic-config-engine/tests/sample-graph-subintf.xml
index 8940297e7488..a5db5f55aac8 100644
--- a/src/sonic-config-engine/tests/sample-graph-subintf.xml
+++ b/src/sonic-config-engine/tests/sample-graph-subintf.xml
@@ -11,25 +11,6 @@
          <HoldTime>10</HoldTime>
          <KeepAliveTime>3</KeepAliveTime>
       </BGPSession>
-      <BGPSession>
-        <MacSec>false</MacSec>
-        <StartRouter>switch-t0</StartRouter>
-        <StartPeer>10.0.0.56</StartPeer>
-        <EndRouter>ARISTA01T1</EndRouter>
-        <EndPeer>10.0.0.57</EndPeer>
-        <Multihop>1</Multihop>
-        <HoldTime>180</HoldTime>
-        <KeepAliveTime>60</KeepAliveTime>
-      </BGPSession>
-      <BGPSession>
-        <StartRouter>switch-t0</StartRouter>
-        <StartPeer>FC00::71</StartPeer>
-        <EndRouter>ARISTA01T1</EndRouter>
-        <EndPeer>FC00::72</EndPeer>
-        <Multihop>1</Multihop>
-        <HoldTime>180</HoldTime>
-        <KeepAliveTime>60</KeepAliveTime>
-      </BGPSession>
       <BGPSession>
         <MacSec>false</MacSec>
         <StartRouter>switch-t0</StartRouter>
@@ -70,12 +51,6 @@
         <a:ASN>65100</a:ASN>
         <a:Hostname>switch-t0</a:Hostname>
         <a:Peers>
-          <BGPPeer>
-            <Address>10.0.0.57</Address>
-            <RouteMapIn i:nil="true"/>
-            <RouteMapOut i:nil="true"/>
-            <Vrf i:nil="true"/>
-          </BGPPeer>
           <BGPPeer>
             <Address>10.0.0.59</Address>
             <RouteMapIn i:nil="true"/>
@@ -149,11 +124,6 @@
           <AttachTo>fortyGigE0/4</AttachTo>
           <SubInterface/>
         </PortChannel>
-        <PortChannel>
-          <Name>PortChannel1001</Name>
-          <AttachTo>fortyGigE0/1;fortyGigE0/2</AttachTo>
-          <SubInterface/>
-        </PortChannel>
       </PortChannelInterfaces>
       <VlanInterfaces>
         <VlanInterface>
@@ -227,16 +197,6 @@
           <AttachTo>PortChannel01</AttachTo>
           <Prefix>FC00::71/126</Prefix>
         </IPInterface>
-        <IPInterface>
-          <Name i:nil="true"/>
-          <AttachTo>PortChannel1001</AttachTo>
-          <Prefix>10.0.0.57/31</Prefix>
-        </IPInterface>
-        <IPInterface>
-          <Name i:Name="true"/>
-          <AttachTo>PortChannel1001</AttachTo>
-          <Prefix>FC00::72/126</Prefix>
-        </IPInterface>
         <IPInterface>
           <Name i:nil="true"/>
           <AttachTo>ab1</AttachTo>
@@ -272,26 +232,6 @@
         <StartPort>fortyGigE0/8</StartPort>
         <Validate>true</Validate>
       </DeviceLinkBase>
-      <DeviceLinkBase i:type="DeviceInterfaceLink">
-        <ElementType>DeviceInterfaceLink</ElementType>
-        <Bandwidth>10000</Bandwidth>
-        <EndDevice>switch-t0</EndDevice>
-        <EndPort>fortyGigE0/1</EndPort>
-        <FlowControl>true</FlowControl>
-        <StartDevice>ARISTA05T1</StartDevice>
-        <StartPort>Ethernet1/32</StartPort>
-        <Validate>true</Validate>
-      </DeviceLinkBase>
-      <DeviceLinkBase i:type="DeviceInterfaceLink">
-        <ElementType>DeviceInterfaceLink</ElementType>
-        <Bandwidth>10000</Bandwidth>
-        <EndDevice>switch-t0</EndDevice>
-        <EndPort>fortyGigE0/2</EndPort>
-        <FlowControl>true</FlowControl>
-        <StartDevice>ARISTA06T1</StartDevice>
-        <StartPort>Ethernet1/33</StartPort>
-        <Validate>true</Validate>
-      </DeviceLinkBase>
       <DeviceLinkBase i:type="DeviceMgmtLink">
         <ElementType>DeviceMgmtLink</ElementType>
         <Bandwidth>1000</Bandwidth>
@@ -302,15 +242,6 @@
         <StartPort>mgmt0</StartPort>
         <Validate>true</Validate>
       </DeviceLinkBase>
-      <DeviceLinkBase i:type="DeviceMgmtLink">
-      <ElementType>DeviceMgmtLink</ElementType>
-      <Bandwidth>1000</Bandwidth>
-      <EndDevice>switch-t0</EndDevice>
-      <EndPort>Management1</EndPort>
-      <StartDevice>switch-m0</StartDevice>
-      <StartPort>Management1</StartPort>
-      <Validate>true</Validate>
-      </DeviceLinkBase>
     </DeviceInterfaceLinks>
     <Devices>
       <Device i:type="ToRRouter">
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 5702841ceea4..87189bef27d2 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -32,6 +32,7 @@ def setUp(self):
         self.ecmp_graph = os.path.join(self.test_dir, 'fg-ecmp-sample-minigraph.xml')
         self.sample_resource_graph = os.path.join(self.test_dir, 'sample-graph-resource-type.xml')
         self.sample_subintf_graph = os.path.join(self.test_dir, 'sample-graph-subintf.xml')
+        self.sample_backend_graph = os.path.join(self.test_dir, 'sample-graph-storage-backend.xml')
         # To ensure that mock config_db data is used for unit-test cases
         os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
@@ -674,14 +675,11 @@ def test_minigraph_bgp_mon(self):
             utils.to_dict("{'10.20.30.40': {'rrclient': 0, 'name': 'BGPMonitor', 'local_addr': '10.1.0.32', 'nhopself': 0, 'holdtime': '10', 'asn': '0', 'keepalive': '3'}}")
         )
 
-    def test_minigraph_sub_port_interfaces(self, check_stderr=True):
-        self.verify_sub_intf(check_stderr=check_stderr)
-
     def test_minigraph_sub_port_intf_resource_type_non_backend_tor(self, check_stderr=True):
         self.verify_sub_intf_non_backend_tor(graph_file=self.sample_resource_graph, check_stderr=check_stderr)
 
-    def test_minigraph_sub_port_intf_resource_type(self, check_stderr=True):
-        self.verify_sub_intf(graph_file=self.sample_resource_graph, check_stderr=check_stderr)
+    def test_minigraph_sub_port_intf_hwsku(self, check_stderr=True):
+        self.verify_sub_intf(graph_file=self.sample_backend_graph, check_stderr=check_stderr)
 
     def test_minigraph_sub_port_intf_sub(self, check_stderr=True):
         self.verify_sub_intf(graph_file=self.sample_subintf_graph, check_stderr=check_stderr)
@@ -689,6 +687,32 @@ def test_minigraph_sub_port_intf_sub(self, check_stderr=True):
     def test_minigraph_no_vlan_member(self, check_stderr=True):
         self.verify_no_vlan_member()
 
+    def test_minigraph_backend_acl_leaf(self, check_stderr=True):
+        try:
+            print('\n    Change device type to %s' % (BACKEND_LEAF_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_LEAF_ROUTER, self.sample_backend_graph), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (TOR_ROUTER, BACKEND_LEAF_ROUTER, self.sample_backend_graph), shell=True)
+
+            self.test_jinja_expression(self.sample_backend_graph, BACKEND_LEAF_ROUTER)
+
+            # ACL_TABLE should contain EVERFLOW related entries
+            argument = '-m "' + self.sample_backend_graph + '" -p "' + self.port_config + '" -v "ACL_TABLE"'
+            output = self.run_script(argument)
+            sample_output = utils.to_dict(output.strip()).keys()
+            assert 'DATAACL' not in sample_output, sample_output
+            assert 'EVERFLOW' in sample_output, sample_output
+
+        finally:
+            print('\n    Change device type back to %s' % (TOR_ROUTER))
+            if check_stderr:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_LEAF_ROUTER, TOR_ROUTER, self.sample_backend_graph), stderr=subprocess.STDOUT, shell=True)
+            else:
+                output = subprocess.check_output("sed -i \'s/%s/%s/g\' %s" % (BACKEND_LEAF_ROUTER, TOR_ROUTER, self.sample_backend_graph), shell=True)
+
+            self.test_jinja_expression(self.sample_backend_graph, TOR_ROUTER)
+
     def test_minigraph_sub_port_no_vlan_member(self, check_stderr=True):
         try:
             print('\n    Change device type to %s' % (BACKEND_LEAF_ROUTER))
@@ -743,6 +767,13 @@ def verify_sub_intf(self, **kwargs):
             output = self.run_script(argument)
             self.assertEqual(output.strip(), "")
 
+            # ACL_TABLE should not contain EVERFLOW related entries
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "ACL_TABLE"'
+            output = self.run_script(argument)
+            sample_output = utils.to_dict(output.strip()).keys()
+            assert 'DATAACL' in sample_output, sample_output
+            assert 'EVERFLOW' not in sample_output, sample_output
+
             # All the other tables stay unchanged
             self.test_minigraph_vlans(graph_file=graph_file)
             self.test_minigraph_vlan_interfaces(graph_file=graph_file)

From 2c3dc47b2c326a85f62117d367ef1f4815528077 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Tue, 1 Jun 2021 12:07:33 -0400
Subject: [PATCH 1279/1674] [sonic-py-common] Add platform and chassis info
 methods to device_info (#7652)

#### Why I did it
These methods were added to make some convenient platform and chassis information methods accessible through sonic-py-common. These methods were refactored from sonic-utilities and are used in the `show platform summary` and `show version` commands.

#### How I did it
There are two methods, one is `get_platform_info()` which simply calls local methods to collect useful platform information into a dictionary format, this came directly from sonic-utilities.
---
 .../sonic_py_common/device_info.py            | 48 +++++++++++++++++++
 src/sonic-py-common/tests/device_info_test.py | 10 +++-
 src/sonic-py-common/tests/mock_swsssdk.py     | 16 +++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-py-common/tests/mock_swsssdk.py

diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index 52b7900b119b..4d1df6352284 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -32,6 +32,13 @@
 FRONTEND_ASIC_SUB_ROLE = "FrontEnd"
 BACKEND_ASIC_SUB_ROLE = "BackEnd"
 
+# Chassis STATE_DB keys
+CHASSIS_INFO_TABLE = 'CHASSIS_INFO|chassis {}'
+CHASSIS_INFO_CARD_NUM_FIELD = 'module_num'
+CHASSIS_INFO_SERIAL_FIELD = 'serial'
+CHASSIS_INFO_MODEL_FIELD = 'model'
+CHASSIS_INFO_REV_FIELD = 'revision'
+
 
 def get_localhost_info(field):
     try:
@@ -303,6 +310,47 @@ def get_sonic_version_file():
 
     return SONIC_VERSION_YAML_PATH
 
+
+# Get hardware information
+def get_platform_info():
+    """
+    This function is used to get the HW info helper function
+    """
+    from .multi_asic import get_num_asics
+
+    hw_info_dict = {}
+
+    version_info = get_sonic_version_info()
+
+    hw_info_dict['platform'] = get_platform()
+    hw_info_dict['hwsku'] = get_hwsku()
+    hw_info_dict['asic_type'] = version_info['asic_type']
+    hw_info_dict['asic_count'] = get_num_asics()
+
+    return hw_info_dict
+
+
+def get_chassis_info():
+    """
+    This function is used to get the Chassis serial / model / rev number
+    """
+
+    chassis_info_dict = {}
+
+    try:
+        # Init statedb connection
+        db = SonicV2Connector()
+        db.connect(db.STATE_DB)
+        table = CHASSIS_INFO_TABLE.format(1)
+
+        chassis_info_dict['serial'] = db.get(db.STATE_DB, table, CHASSIS_INFO_SERIAL_FIELD)
+        chassis_info_dict['model'] = db.get(db.STATE_DB, table, CHASSIS_INFO_MODEL_FIELD)
+        chassis_info_dict['revision'] = db.get(db.STATE_DB, table, CHASSIS_INFO_REV_FIELD)
+    except Exception:
+        pass
+
+    return chassis_info_dict
+
 #
 # Multi-NPU functionality
 #
diff --git a/src/sonic-py-common/tests/device_info_test.py b/src/sonic-py-common/tests/device_info_test.py
index df94d147aa0d..bb7af40ad970 100644
--- a/src/sonic-py-common/tests/device_info_test.py
+++ b/src/sonic-py-common/tests/device_info_test.py
@@ -13,6 +13,7 @@
 
 from sonic_py_common import device_info
 
+from .mock_swsssdk import SonicV2Connector
 
 # TODO: Remove this if/else block once we no longer support Python 2
 if sys.version_info.major == 3:
@@ -51,7 +52,6 @@
     'onie_kernel_version': '4.10.11'
 }
 
-
 class TestDeviceInfo(object):
     @pytest.fixture(scope="class", autouse=True)
     def sanitize_environment(self):
@@ -75,6 +75,14 @@ def test_get_platform(self):
             result = device_info.get_platform()
             assert result == "x86_64-mlnx_msn2700-r0"
 
+    def test_get_chassis_info(self):
+        with mock.patch("sonic_py_common.device_info.SonicV2Connector", new=SonicV2Connector):
+            result = device_info.get_chassis_info()
+            truth = {"serial": SonicV2Connector.TEST_SERIAL, 
+                     "model": SonicV2Connector.TEST_MODEL, 
+                     "revision": SonicV2Connector.TEST_REV}
+            assert result == truth
+
     @classmethod
     def teardown_class(cls):
         print("TEARDOWN")
diff --git a/src/sonic-py-common/tests/mock_swsssdk.py b/src/sonic-py-common/tests/mock_swsssdk.py
new file mode 100644
index 000000000000..df6affaf1853
--- /dev/null
+++ b/src/sonic-py-common/tests/mock_swsssdk.py
@@ -0,0 +1,16 @@
+class SonicV2Connector:
+    TEST_SERIAL = "MT1822K07815"
+    TEST_MODEL = "MSN2700-CS2FO"
+    TEST_REV = "A1"
+
+    def __init__(self):
+        self.STATE_DB = 'STATE_DB'
+        self.data = {"serial": self.TEST_SERIAL, 
+                     "model": self.TEST_MODEL, 
+                     "revision": self.TEST_REV}
+    
+    def connect(self, db):
+        pass
+
+    def get(self, db, table, field):
+        return self.data.get(field, "N/A")

From 26ee4ae4a4d47620f9592fbc48bd002e677176a2 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Wed, 6 Jul 2022 10:24:16 -0700
Subject: [PATCH 1280/1674] Add backend acl template (#11220)

Why I did it
Storage backend has all vlan members tagged. If untagged packets are received on those links, they are accounted as RX_DROPS which can lead to false alarms in monitoring tools. Using this acl to hide these drops.

How I did it
Created a acl template which will be loaded during minigraph load for backend. This template will allow tagged vlan packets and dropped untagged

How to verify it
Unit tests

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 files/build_templates/backend_acl.j2          | 51 ++++++++++++++
 .../build_templates/sonic_debian_extension.j2 |  3 +
 .../data/backend_acl/acl_multi_vlan.json      | 59 ++++++++++++++++
 .../data/backend_acl/acl_single_vlan.json     | 38 ++++++++++
 .../tests/data/backend_acl/multi_vlan.json    | 69 +++++++++++++++++++
 .../tests/data/backend_acl/single_vlan.json   | 66 ++++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py | 28 ++++++++
 7 files changed, 314 insertions(+)
 create mode 100644 files/build_templates/backend_acl.j2
 create mode 100644 src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json
 create mode 100644 src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json
 create mode 100644 src/sonic-config-engine/tests/data/backend_acl/multi_vlan.json
 create mode 100644 src/sonic-config-engine/tests/data/backend_acl/single_vlan.json

diff --git a/files/build_templates/backend_acl.j2 b/files/build_templates/backend_acl.j2
new file mode 100644
index 000000000000..f5468e6c12cb
--- /dev/null
+++ b/files/build_templates/backend_acl.j2
@@ -0,0 +1,51 @@
+{%- set vlan2ports = {} %}
+{%- for vlan in VLAN %}
+    {% set portlist = [] %}
+    {%- for vlan_name, port in VLAN_MEMBER %}
+        {%- if vlan_name == vlan %}
+            {%- if portlist.append(port) %}{%- endif %}
+        {%- endif %}
+    {%- endfor %}
+    {%- set _ = vlan2ports.update({vlan: portlist| sort | join(',')}) %}
+{%- endfor %}
+
+
+{
+        "acl": {
+                "acl-sets": {
+                        "acl-set": {
+                                "DATAACL": {
+                                        "acl-entries": {
+                                                "acl-entry": {
+                                                 {% for vlan, vlan_entries in VLAN.items() %}
+    "{{ loop.index }}": {
+                                                             "config": {
+                                                                     "sequence-id": {{ loop.index }}
+                                                             },
+                                                             "actions": {
+                                                                     "config": {
+                                                                             "forwarding-action": "ACCEPT"
+                                                                     }
+                                                             },
+                                                             "l2": {
+                                                                     "config": {
+                                                                             "vlan_id": "{{ vlan_entries['vlanid'] }}"
+                                                                     }
+                                                             },
+                                                             "input_interface": {
+                                                                     "interface_ref": {
+                                                                             "config": {
+                                                                                     "interface": "{{ vlan2ports[vlan] }}"
+                                                                             }
+                                                                      }
+                                                             }
+
+                                                     }{% if not loop.last %},{% endif %} 
+                                                 {% endfor -%}
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+}
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index db0be75aa0a1..c106f7944a36 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -497,6 +497,9 @@ then
 fi
 {% endif %}
 
+# Copy backend acl template
+sudo cp $BUILD_TEMPLATES/backend_acl.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
 # Copy hostname configuration scripts
 sudo cp $IMAGE_CONFIGS/hostname/hostname-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 echo "hostname-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
diff --git a/src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json
new file mode 100644
index 000000000000..53cd50d0f2d1
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json
@@ -0,0 +1,59 @@
+
+{
+        "acl": {
+                "acl-sets": {
+                        "acl-set": {
+                                "DATAACL": {
+                                        "acl-entries": {
+                                                "acl-entry": {
+                                                     "1": {
+                                                             "config": {
+                                                                     "sequence-id": 1
+                                                             },
+                                                             "actions": {
+                                                                     "config": {
+                                                                             "forwarding-action": "ACCEPT"
+                                                                     }
+                                                             },
+                                                             "l2": {
+                                                                     "config": {
+                                                                             "vlan_id": "1000"
+                                                                     }
+                                                             },
+                                                             "input_interface": {
+                                                                     "interface_ref": {
+                                                                             "config": {
+                                                                                     "interface": "Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76"
+                                                                             }
+                                                                      }
+                                                             }
+
+                                                     },                                                     "2": {
+                                                             "config": {
+                                                                     "sequence-id": 2
+                                                             },
+                                                             "actions": {
+                                                                     "config": {
+                                                                             "forwarding-action": "ACCEPT"
+                                                                     }
+                                                             },
+                                                             "l2": {
+                                                                     "config": {
+                                                                             "vlan_id": "2000"
+                                                                     }
+                                                             },
+                                                             "input_interface": {
+                                                                     "interface_ref": {
+                                                                             "config": {
+                                                                                     "interface": "Ethernet4,Ethernet8"
+                                                                             }
+                                                                      }
+                                                             }
+
+                                                     }                                                 }
+                                        }
+                                }
+                        }
+                }
+        }
+}
diff --git a/src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json
new file mode 100644
index 000000000000..86dcc80d08d1
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json
@@ -0,0 +1,38 @@
+
+{
+        "acl": {
+                "acl-sets": {
+                        "acl-set": {
+                                "DATAACL": {
+                                        "acl-entries": {
+                                                "acl-entry": {
+                                                     "1": {
+                                                             "config": {
+                                                                     "sequence-id": 1
+                                                             },
+                                                             "actions": {
+                                                                     "config": {
+                                                                             "forwarding-action": "ACCEPT"
+                                                                     }
+                                                             },
+                                                             "l2": {
+                                                                     "config": {
+                                                                             "vlan_id": "1000"
+                                                                     }
+                                                             },
+                                                             "input_interface": {
+                                                                     "interface_ref": {
+                                                                             "config": {
+                                                                                     "interface": "Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet4,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet8"
+                                                                             }
+                                                                      }
+                                                             }
+
+                                                     }
+                                                 }
+                                        }
+                                }
+                        }
+                }
+        }
+}
diff --git a/src/sonic-config-engine/tests/data/backend_acl/multi_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/multi_vlan.json
new file mode 100644
index 000000000000..13acff414a1f
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/backend_acl/multi_vlan.json
@@ -0,0 +1,69 @@
+{
+    "VLAN": {
+        "Vlan1000": {
+            "vlanid": "1000"
+        },
+        "Vlan2000": {
+            "vlanid": "2000"
+        }
+    },
+    "VLAN_MEMBER": {
+        "Vlan1000|Ethernet12": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet16": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet20": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet24": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet28": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet32": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet36": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet40": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet44": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet48": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet52": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet56": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet60": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet64": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet68": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet72": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet76": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan2000|Ethernet4": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan2000|Ethernet8": {
+            "tagging_mode": "tagged"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/data/backend_acl/single_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/single_vlan.json
new file mode 100644
index 000000000000..1023e990a72f
--- /dev/null
+++ b/src/sonic-config-engine/tests/data/backend_acl/single_vlan.json
@@ -0,0 +1,66 @@
+{
+    "VLAN": {
+        "Vlan1000": {
+            "vlanid": "1000"
+        }
+    },
+    "VLAN_MEMBER": {
+        "Vlan1000|Ethernet4": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet8": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet12": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet16": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet20": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet24": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet28": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet32": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet36": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet40": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet44": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet48": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet52": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet56": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet60": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet64": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet68": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet72": {
+            "tagging_mode": "tagged"
+        },
+        "Vlan1000|Ethernet76": {
+            "tagging_mode": "tagged"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 4b6859772500..b9cca3789f8e 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -590,6 +590,34 @@ def test_ntp_conf(self):
         self.run_script(argument)
         assert utils.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)
 
+    def test_backend_acl_template_render(self):
+        acl_template = os.path.join(
+            self.test_dir, '..', '..', '..', 'files', 'build_templates',
+            'backend_acl.j2'
+        )
+        test_list = {
+            'single_vlan': {
+                'input': 'single_vlan.json',
+                'output': 'acl_single_vlan.json'
+            },
+            'multi_vlan': {
+                'input': 'multi_vlan.json',
+                'output': 'acl_multi_vlan.json'
+            },
+        }
+        for _, v in test_list.items():
+            input_file = os.path.join(
+                self.test_dir, 'data', 'backend_acl', v['input']
+            )
+            argument = " -j {} -t {} > {}".format(
+                input_file, acl_template, self.output_file
+            )
+            sample_output_file = os.path.join(
+                self.test_dir, 'data', 'backend_acl', v['output']
+            )
+            self.run_script(argument)
+            assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
+
     def tearDown(self):
         os.environ["CFGGEN_UNIT_TESTING"] = ""
         try:

From de786ccd25b41a6c56df22db9a6a84d00824bf32 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 7 Jul 2022 12:37:57 +0800
Subject: [PATCH 1281/1674] [Build] Fix the missing debian package for
 reproducible build issue (#11333)

Why I did it
Fix the missing debian package for reproducible build issue.

The gnupg2 should be added into the version file.
https://dev.azure.com/mssonic/build/_build/results?buildId=118139&view=logs&j=88ce9a53-729c-5fa9-7b6e-3d98f2488e3f&t=8d99be27-49d0-54d0-99b1-cfc0d47f0318

The following packages have unmet dependencies:
 gnupg2 : Depends: gnupg (>= 2.2.27-2+deb11u2) but 2.2.27-2+deb11u1 is to be installed
E: Unable to correct problems, you have held broken packages.

The issue was caused by the gnupg2 removed, and not detected.
sonic-buildimage/build_debian.sh

Line 250 in 4fb6cf0

 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2 python3-gi
How I did it
Export the debian packages when any debian package being removed.
---
 src/sonic-build-hooks/hooks/apt-get | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/hooks/apt-get b/src/sonic-build-hooks/hooks/apt-get
index cee440d210e8..db75ddf5c473 100755
--- a/src/sonic-build-hooks/hooks/apt-get
+++ b/src/sonic-build-hooks/hooks/apt-get
@@ -20,7 +20,7 @@ if [ "$INSTALL" == y ]; then
     [ "$lock_result" == y ] && release_apt_installation_lock
     exit $command_result
 else
-    if [[ "$1" == "purge" || "$@" == *" purge "* ]]; then
+    if [[ "$1" == "purge" || "$@" == *" purge "* || "$@" == *" remove "* ]]; then
       # When running the purge command, collect the debian versions
       dpkg-query -W -f '${Package}==${Version}\n' >> $POST_VERSION_PATH/purge-versions-deb
       chmod a+wr $POST_VERSION_PATH/purge-versions-deb

From 9991b6ac5b4be4e09fedc60c7e077c7c11f4ce66 Mon Sep 17 00:00:00 2001
From: Junhua Zhai <junhua.zhai@outlook.com>
Date: Fri, 8 Jul 2022 04:11:35 +0000
Subject: [PATCH 1282/1674] [dhcp6relay] Check interface address is not NULL
 (#11359)

Why I did it
Daemon dhcp6relay may crash due to null pointer access to ifa_addr member of struct ifaddrs. It's not guaranteed that the interface must have available ifa_addr. That is true for some special virtual/pseudo interfaces.

How I did it
Check the pointer to ifa_addr is valid ahead of accessing it.
---
 src/dhcp6relay/src/relay.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
index 8387584f6ad1..08cec458c74d 100644
--- a/src/dhcp6relay/src/relay.cpp
+++ b/src/dhcp6relay/src/relay.cpp
@@ -344,7 +344,7 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
 
     ifa_tmp = ifa;
     while (ifa_tmp) {
-        if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
+        if (ifa_tmp->ifa_addr && ifa_tmp->ifa_addr->sa_family == AF_INET6) {
             struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
             if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
                 non_link_local = *in6;
@@ -402,7 +402,7 @@ void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int
         else {
             ifa_tmp = ifa;
             while (ifa_tmp) {
-                if ((ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
+                if (ifa_tmp->ifa_addr && (ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
                     struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
                     if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {  
                         bind_addr = true;

From ec7cc161992e14dc36cb5b512be04318bc82246a Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 11 Jul 2022 09:10:02 -0700
Subject: [PATCH 1283/1674] [202012] Submodule update for sonic-utilities
 (#11400)

Signed-off-by: Neetha John <nejo@microsoft.com>

This PR contains the following commits
5a54bd7 Added cisco config platform commands (Azure/sonic-utilities#2241)
62c1640 [config/load_mgmt_config] Support load IPv6 mgmt IP (Azure/sonic-utilities#2206)
c061a18 Fix header for the output table following 'show ipv6 interface' command (Azure/sonic-utilities#2219)
ecca18ff [202012] Update load minigraph to load backend acl (Azure/sonic-utilities#2235)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d5f8f5a22bfa..ecca18ffb4fb 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d5f8f5a22bfab1546ac9660430ac7ce7ef96564f
+Subproject commit ecca18ffb4fbf7e9041984585d5e0c026c1e3422

From bc935d4002deca2197250d46428afdc90241f237 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 11 Jul 2022 21:40:26 +0300
Subject: [PATCH 1284/1674] [202012][submodule] Advance sonic-linux-kernel
 pointer (#11406)

Update sonic-linux-kernel submodule pointer to include the following:
* [202012][patch] mlxsw: i2c: Prevent transaction execution for special chip states ([#282](https://github.com/Azure/sonic-linux-kernel/pull/282))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index e97f9fc797b0..bc4ae910d657 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit e97f9fc797b03bbcc94d0a28dc2fe538554691f6
+Subproject commit bc4ae910d657602a5f954dd53d2eafb3be8ebb81

From ed728abb08a98ce6e318c4055a23f22c7bd9a151 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 12 Jul 2022 17:55:01 +0800
Subject: [PATCH 1285/1674] [ci] Fix test stage dependency issue. (#11386)
 (#11391)

Why I did it
When any of the test job failed in the test stage, the rerun will not work, the test stage will be skipped automaticall, so we do not have chance to rerun the test stage again, and the checks of the test will be always in failed status, block the PR to merge forever.

It should be caused by the condition in the Test stage, we should specify the status of the BuildVS stage.

How I did it
Fix stage dependency logic.
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1219cc81a8f7..a7971f148d49 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -76,7 +76,7 @@ stages:
 
 - stage: Test
   dependsOn: BuildVS
-  condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), succeeded())
+  condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))
   variables:
   - name: inventory
     value: veos_vtb

From 550ab26fc7f426e75974ca40285600eeb586e8e3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 12 Jul 2022 23:39:32 +0800
Subject: [PATCH 1286/1674] [ci/build]: Upgrade SONiC package versions (#11422)

---
 .../versions/build/build-sonic-slave-buster/versions-git    | 2 +-
 files/build/versions/default/versions-git                   | 4 ++--
 files/build/versions/default/versions-web                   | 4 ++--
 .../dockers/docker-config-engine-buster/versions-py3        | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 2 +-
 .../docker-sonic-mgmt-framework/versions-py3-all-arm64      | 1 +
 .../docker-sonic-mgmt-framework/versions-py3-all-armhf      | 1 +
 files/build/versions/dockers/docker-sonic-vs/versions-py2   | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py3   | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster-arm64    | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster-armhf    | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-py3  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-deb-buster         | 1 +
 files/build/versions/host-image/versions-deb-buster-arm64   | 1 +
 files/build/versions/host-image/versions-deb-buster-armhf   | 1 +
 files/build/versions/host-image/versions-py3                | 6 +++---
 18 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index f397c1b7ef7f..67d6f424e2b2 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -5,7 +5,7 @@ https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
-https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
+https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 105794e437e5..dfc065b4da52 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -11,7 +11,7 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
-https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d
+https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e00c279b127a..6adf222a46ae 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -19,9 +19,9 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==6b181b4ad151ab26c7c7738ec8534ed3
+https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==3fb63a2bd38414a2b249fa9b3dbbbc3e
+https://deb.nodesource.com/setup_14.x==badb28cf0604d9ff24c5fc3396b594d4
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 0c60fea19868..765d73fa6aaf 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.6.2
+regex==2022.7.9
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index c07300965a59..8fe65d491263 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,7 +12,7 @@ importlib-metadata==4.12.0
 importlib-resources==5.8.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.6.1
+jsonschema==4.7.2
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
 protobuf==4.21.2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
new file mode 100644
index 000000000000..b14bd866f5b8
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
@@ -0,0 +1 @@
+jsonschema==4.7.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
new file mode 100644
index 000000000000..b14bd866f5b8
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
@@ -0,0 +1 @@
+jsonschema==4.7.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index d6a13c7bdda0..1db34fe35214 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.9
\ No newline at end of file
+urllib3==1.26.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 6e78a4a6e068..1519f87a3801 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.28.1
 scapy==2.4.4
 tabulate==0.8.10
-urllib3==1.26.9
+urllib3==1.26.10
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index c04653adb0f4..ae8f49c2dc58 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u1
-nodejs==14.19.3-deb-1nodesource1
\ No newline at end of file
+nodejs==14.20.0-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 648627cb4e1a..a994f5f0fe27 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -103,7 +103,7 @@ linux-compiler-gcc-8-arm==4.19.249-2
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.19.3-deb-1nodesource1
+nodejs==14.20.0-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index c37b4e348e98..d7cbfb3e3c61 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index bfa13ac00047..3ff9fa9ec159 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.6.2
+regex==2022.7.9
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index c37b4e348e98..d7cbfb3e3c61 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index d2eb89dabfe6..4300bcc6e050 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -50,6 +50,7 @@ gir1.2-packagekitglib-1.0==1.1.12-5
 gnupg==2.2.12-1+deb10u2
 gnupg-l10n==2.2.12-1+deb10u2
 gnupg-utils==2.2.12-1+deb10u2
+gnupg2==2.2.12-1+deb10u2
 gpg==2.2.12-1+deb10u2
 gpg-agent==2.2.12-1+deb10u2
 gpg-wks-client==2.2.12-1+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 21f7a975c0e2..8f0adeed12e2 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -4,6 +4,7 @@ dpkg-dev==1.19.7
 gnupg==2.2.12-1+deb10u1
 gnupg-l10n==2.2.12-1+deb10u1
 gnupg-utils==2.2.12-1+deb10u1
+gnupg2==2.2.12-1+deb10u1
 gpg==2.2.12-1+deb10u1
 gpg-agent==2.2.12-1+deb10u1
 gpg-wks-client==2.2.12-1+deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 8f75ca7fe9eb..fdf7ab9b15b9 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -4,6 +4,7 @@ dpkg-dev==1.19.7
 gnupg==2.2.12-1+deb10u1
 gnupg-l10n==2.2.12-1+deb10u1
 gnupg-utils==2.2.12-1+deb10u1
+gnupg2==2.2.12-1+deb10u1
 gpg==2.2.12-1+deb10u1
 gpg-agent==2.2.12-1+deb10u1
 gpg-wks-client==2.2.12-1+deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 305880bbb81f..475ce37ba040 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.6.15
 cffi==1.15.1
 charset-normalizer==2.1.0
 click==7.0
-cryptography==37.0.2
+cryptography==37.0.4
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
@@ -32,13 +32,13 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.6.2
+regex==2022.7.9
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.10
 thrift==0.13.0
-urllib3==1.26.9
+urllib3==1.26.10
 watchdog==0.10.3
 websocket-client==1.3.3
 xmltodict==0.12.0
\ No newline at end of file

From c6f9664b2e23770e72537e93a68f9189e6ea5e4c Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Tue, 12 Jul 2022 08:45:55 -0700
Subject: [PATCH 1287/1674] [202012] Minigraph parser changes to select mmu
 profiles based on SonicQosProfile attribute (#11383)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
There is a need to select different mmu profiles based on deployment type

How I did it
There will be separate subfolders (RDMA-CENTRIC, TCP-CENTRIC, BALANCED) in each hwsku folder which contains deployment specific mmu and qos settings. SonicQosProfile attribute in the minigraph will be used to determine which settings to use. If that attribute is not present, the default settings that exist in the hwsku folder will be used
---
 src/sonic-config-engine/minigraph.py          |  34 ++++-
 .../tests/sample-dell-6100-t0-minigraph.xml   |   5 +
 src/sonic-config-engine/tests/test_j2files.py | 118 +++---------------
 3 files changed, 57 insertions(+), 100 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 035fb0bcb558..5e8cf2966b64 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -853,6 +853,7 @@ def parse_meta(meta, hname):
     kube_data = {}
     redundancy_type = None
     downstream_redundancy_types = None
+    qos_profile = None
 
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
@@ -892,7 +893,9 @@ def parse_meta(meta, hname):
                     downstream_redundancy_types = value
                 elif name == "RedundancyType":
                     redundancy_type = value
-    return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type
+                elif name == "SonicQosProfile":
+                    qos_profile = value
+    return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type, qos_profile
 
 def parse_linkmeta(meta, hname):
     link = meta.find(str(QName(ns, "Link")))
@@ -1144,6 +1147,31 @@ def enable_internal_bgp_session(bgp_sessions, filename, asic_name):
             (local_sub_role == BACKEND_ASIC_SUB_ROLE and peer_sub_role == FRONTEND_ASIC_SUB_ROLE)):
             bgp_sessions[peer_ip].update({'admin_status': 'up'})
 
+def select_mmu_profiles(profile, platform, hwsku):
+    """
+        Select MMU files based on the device metadata attribute - SonicQosProfile
+        if no QosProfile exists in the minigraph, then no action is needed.
+        if a profile exists in the minigraph,
+            - create a dir path to search 1 level down from the base path.
+            - if no such dir path exists, no action is needed.
+            - if a dir path exists, check for the presence of each file from
+              the copy list in the dir path and copy it over to the base path.
+    """
+    if not profile:
+        return
+
+    files_to_copy = ['pg_profile_lookup.ini', 'qos.json.j2', 'buffers_defaults_t0.j2', 'buffers_defaults_t1.j2']
+
+    path = os.path.join('/usr/share/sonic/device', platform, hwsku)
+
+    dir_path = os.path.join(path, profile)
+    if os.path.exists(dir_path):
+        for file_item in files_to_copy:
+            file_in_dir = os.path.join(dir_path, file_item)
+            if os.path.isfile(file_in_dir):
+                base_file = os.path.join(path, file_item)
+                exec_cmd("sudo cp {} {}".format(file_in_dir, base_file))
+
 ###############################################################################
 #
 # Main functions
@@ -1212,6 +1240,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     system_defaults = {}
     downstream_redundancy_types = None
     redundancy_type = None
+    qos_profile = None
 
     hwsku_qn = QName(ns, "HwSku")
     hostname_qn = QName(ns, "Hostname")
@@ -1242,7 +1271,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "UngDec")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
             elif child.tag == str(QName(ns, "MetadataDeclaration")):
-                (syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type) = parse_meta(child, hostname)
+                (syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data, downstream_redundancy_types, redundancy_type, qos_profile) = parse_meta(child, hostname)
             elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
                 linkmetas = parse_linkmeta(child, hostname)
             elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -1262,6 +1291,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
             elif child.tag == str(QName(ns, "DeviceInfos")):
                 (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
 
+    select_mmu_profiles(qos_profile, platform, hwsku)
     # set the host device type in asic metadata also
     device_type = [devices[key]['type'] for key in devices if key.lower() == hostname.lower()][0]
     if asic_name is None:
diff --git a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
index 7cea7decfcc0..cb84ce744ed1 100644
--- a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
@@ -731,6 +731,11 @@
             <a:Reference i:nil="true"/>
             <a:Value>True</a:Value>
           </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SonicQosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>RDMA-CENTRIC</a:Value>
+          </a:DeviceProperty>
         </a:Properties>
         <a:Key>ARISTA01T1:Ethernet1;s6100-dev-1:fortyGigE1/1/1</a:Key>
       </a:LinkMetadata>
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index b9cca3789f8e..9e840a154c19 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -21,14 +21,9 @@ def setUp(self):
         self.t0_7050cx3_port_config = os.path.join(self.test_dir, 't0_7050cx3_d48c8_port_config.ini')
         self.t1_mlnx_minigraph = os.path.join(self.test_dir, 't1-sample-graph-mlnx.xml')
         self.mlnx_port_config = os.path.join(self.test_dir, 'sample-port-config-mlnx.ini')
-        self.dell6100_t0_minigraph = os.path.join(self.test_dir, 'sample-dell-6100-t0-minigraph.xml')
-        self.mellanox2700_t0_minigraph = os.path.join(self.test_dir, 'sample-mellanox-2700-t0-minigraph.xml')
-        self.mellanox2410_t1_minigraph = os.path.join(self.test_dir, 'sample-mellanox-2410-t1-minigraph.xml')
-        self.arista7050_t0_minigraph = os.path.join(self.test_dir, 'sample-arista-7050-t0-minigraph.xml')
         self.multi_asic_minigraph = os.path.join(self.test_dir, 'multi_npu_data', 'sample-minigraph.xml')
         self.multi_asic_port_config = os.path.join(self.test_dir, 'multi_npu_data', 'sample_port_config-0.ini')
         self.radv_test_minigraph = os.path.join(self.test_dir, 'radv-test-sample-graph.xml')
-        self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml')
         self.output_file = os.path.join(self.test_dir, 'output')
         os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
@@ -235,120 +230,47 @@ def test_l2switch_template_dualtor(self):
         self.assertEqual(sample_output_json, output_json)
 
     def test_qos_arista7050_render_template(self):
-        arista_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'arista', 'x86_64-arista_7050_qx32s', 'Arista-7050-QX-32S')
-        qos_file = os.path.join(arista_dir_path, 'qos.json.j2')
-        port_config_ini_file = os.path.join(arista_dir_path, 'port_config.ini')
-
-        # copy qos_config.j2 to the Arista 7050 directory to have all templates in one directory
-        qos_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'qos_config.j2')
-        shutil.copy2(qos_config_file, arista_dir_path)
-
-        argument = '-m ' + self.arista7050_t0_minigraph + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + self.output_file
-        self.run_script(argument)
-
-        # cleanup
-        qos_config_file_new = os.path.join(arista_dir_path, 'qos_config.j2')
-        os.remove(qos_config_file_new)
-
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-arista7050.json')
-        assert utils.cmp(sample_output_file, self.output_file)
+        self._test_qos_render_template('arista', 'x86_64-arista_7050_qx32s', 'Arista-7050-QX-32S', 'sample-arista-7050-t0-minigraph.xml', 'qos-arista7050.json')
 
     def test_qos_dell9332_render_template(self):
-        dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dellemc_z9332f_d1508-r0', 'DellEMC-Z9332f-O32')
-        qos_file = os.path.join(dell_dir_path, 'qos.json.j2')
-        port_config_ini_file = os.path.join(dell_dir_path, 'port_config.ini')
-
-        # copy qos_config.j2 to the Dell Z9332 directory to have all templates in one directory
-        qos_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'qos_config.j2')
-        shutil.copy2(qos_config_file, dell_dir_path)
-
-        argument = '-m ' + self.dell9332_t1_minigraph + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + self.output_file
-        self.run_script(argument)
-
-        # cleanup
-        qos_config_file_new = os.path.join(dell_dir_path, 'qos_config.j2')
-        os.remove(qos_config_file_new)
-
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-dell9332.json')
-        assert utils.cmp(sample_output_file, self.output_file)
+        self._test_qos_render_template('dell', 'x86_64-dellemc_z9332f_d1508-r0', 'DellEMC-Z9332f-O32', 'sample-dell-9332-t1-minigraph.xml', 'qos-dell9332.json')
 
     def test_qos_dell6100_render_template(self):
-        dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100')
-        qos_file = os.path.join(dell_dir_path, 'qos.json.j2')
-        port_config_ini_file = os.path.join(dell_dir_path, 'port_config.ini')
+        self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
 
-        # copy qos_config.j2 to the Dell S6100 directory to have all templates in one directory
+    def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
+        file_exist, dir_exist = self.create_machine_conf(platform, vendor)
+        dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
+        qos_file = os.path.join(dir_path, 'qos.json.j2')
+        port_config_ini_file = os.path.join(dir_path, 'port_config.ini')
+
+        # copy qos_config.j2 to the SKU directory to have all templates in one directory
         qos_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'qos_config.j2')
-        shutil.copy2(qos_config_file, dell_dir_path)
+        shutil.copy2(qos_config_file, dir_path)
 
-        argument = '-m ' + self.dell6100_t0_minigraph + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + self.output_file
+        minigraph = os.path.join(self.test_dir, minigraph)
+        argument = '-m ' + minigraph + ' -p ' + port_config_ini_file + ' -t ' + qos_file + ' > ' + self.output_file
         self.run_script(argument)
 
         # cleanup
-        qos_config_file_new = os.path.join(dell_dir_path, 'qos_config.j2')
+        qos_config_file_new = os.path.join(dir_path, 'qos_config.j2')
         os.remove(qos_config_file_new)
 
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'qos-dell6100.json')
+        self.remove_machine_conf(file_exist, dir_exist)
+
+        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, expected)
         assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_dell6100_render_template(self):
-        dell_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100')
-        buffers_file = os.path.join(dell_dir_path, 'buffers.json.j2')
-        port_config_ini_file = os.path.join(dell_dir_path, 'port_config.ini')
-
-        # copy buffers_config.j2 to the Dell S6100 directory to have all templates in one directory
-        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
-        shutil.copy2(buffers_config_file, dell_dir_path)
-
-        argument = '-m ' + self.dell6100_t0_minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
-        self.run_script(argument)
-
-        # cleanup
-        buffers_config_file_new = os.path.join(dell_dir_path, 'buffers_config.j2')
-        os.remove(buffers_config_file_new)
-
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-dell6100.json')
-        assert utils.cmp(sample_output_file, self.output_file)
+        self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json') 
 
     def test_buffers_mellanox2700_render_template(self):
         # Mellanox buffer template rendering for single ingress pool mode
-        mellanox_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8')
-        buffers_file = os.path.join(mellanox_dir_path, 'buffers.json.j2')
-        port_config_ini_file = os.path.join(mellanox_dir_path, 'port_config.ini')
-
-        # copy buffers_config.j2 to the Mellanox 2700 directory to have all templates in one directory
-        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
-        shutil.copy2(buffers_config_file, mellanox_dir_path)
-
-        argument = '-m ' + self.mellanox2700_t0_minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
-        self.run_script(argument)
-
-        # cleanup
-        buffers_config_file_new = os.path.join(mellanox_dir_path, 'buffers_config.j2')
-        os.remove(buffers_config_file_new)
-
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2700.json')
-        assert utils.cmp(sample_output_file, self.output_file)
+        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8', 'sample-mellanox-2700-t0-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2700.json') 
 
     def test_buffers_mellanox2410_render_template(self):
         # Mellanox buffer template rendering for double ingress pools mode
-        mellanox_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410')
-        buffers_file = os.path.join(mellanox_dir_path, 'buffers.json.j2')
-        port_config_ini_file = os.path.join(mellanox_dir_path, 'port_config.ini')
-
-        # copy buffers_config.j2 to the Mellanox 2410 directory to have all templates in one directory
-        buffers_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2')
-        shutil.copy2(buffers_config_file, mellanox_dir_path)
-
-        argument = '-m ' + self.mellanox2410_t1_minigraph + ' -p ' + port_config_ini_file + ' -t ' + buffers_file + ' > ' + self.output_file
-        self.run_script(argument)
-
-        # cleanup
-        buffers_config_file_new = os.path.join(mellanox_dir_path, 'buffers_config.j2')
-        os.remove(buffers_config_file_new)
-
-        sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'buffers-mellanox2410.json')
-        assert utils.cmp(sample_output_file, self.output_file)
+        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410', 'sample-mellanox-2410-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2410.json') 
 
     def test_config_brcm_render_template(self):
         if utils.PYvX_DIR != 'py3':

From 4de610af154855e3fba1200126fae6273d7c040a Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Tue, 12 Jul 2022 08:46:44 -0700
Subject: [PATCH 1288/1674] [202012] Update 7260 MMU and ECN settings (#11398)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
Improve throughput and latency for 7260 deployments

How I did it
Update the dynamic threshold to 0 and ECN settings as 2mb/10mb/5%

How to verify it
Updated unit tests to use the modified values for 7260 ecn settings.
---
 .../th2/7260/BALANCED/pg_profile_lookup.ini   | 18 ++++++++---------
 .../profiles/th2/7260/BALANCED/qos.json.j2    | 20 +++++++++++++++++++
 .../7260/RDMA-CENTRIC/pg_profile_lookup.ini   | 18 ++++++++---------
 .../th2/7260/RDMA-CENTRIC/qos.json.j2         | 20 +++++++++++++++++++
 ...qos-arista7260-dualtor-remap-disabled.json |  4 ++--
 .../py3/qos-arista7260-dualtor.json           |  4 ++--
 .../py3/qos-arista7260-t1-remap-disabled.json |  4 ++--
 .../sample_output/py3/qos-arista7260-t1.json  |  4 ++--
 8 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini b/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
index 9d94e3fc1e52..0ff01d9aa52a 100644
--- a/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
+++ b/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
@@ -1,11 +1,11 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 54080     -3        2496
- 100000  40m  1248    1248 59696     -3        2496
- 100000  300m 1248    1248 101088    -3        2496
-  50000  5m   1248    1248 54080     -3        2496
-  50000  40m  1248    1248 59696     -3        2496
-  50000  300m 1248    1248 101088    -3        2496
-  40000  5m   1248    1248 29536     -3        2496
-  40000  40m  1248    1248 31616     -3        2496
-  40000  300m 1248    1248 48256     -3        2496
+ 100000  5m   1248    1248 54080      0        2496
+ 100000  40m  1248    1248 59696      0        2496
+ 100000  300m 1248    1248 101088     0        2496
+  50000  5m   1248    1248 54080      0        2496
+  50000  40m  1248    1248 59696      0        2496
+  50000  300m 1248    1248 101088     0        2496
+  40000  5m   1248    1248 29536      0        2496
+  40000  40m  1248    1248 31616      0        2496
+  40000  300m 1248    1248 48256      0        2496
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
index cb3ad17faa39..d760038736a6 100644
--- a/device/common/profiles/th2/7260/BALANCED/qos.json.j2
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -289,4 +289,24 @@
 {%- endmacro %}
 {% endif %}
 
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
 {%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
index 9d94e3fc1e52..0ff01d9aa52a 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -1,11 +1,11 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 54080     -3        2496
- 100000  40m  1248    1248 59696     -3        2496
- 100000  300m 1248    1248 101088    -3        2496
-  50000  5m   1248    1248 54080     -3        2496
-  50000  40m  1248    1248 59696     -3        2496
-  50000  300m 1248    1248 101088    -3        2496
-  40000  5m   1248    1248 29536     -3        2496
-  40000  40m  1248    1248 31616     -3        2496
-  40000  300m 1248    1248 48256     -3        2496
+ 100000  5m   1248    1248 54080      0        2496
+ 100000  40m  1248    1248 59696      0        2496
+ 100000  300m 1248    1248 101088     0        2496
+  50000  5m   1248    1248 54080      0        2496
+  50000  40m  1248    1248 59696      0        2496
+  50000  300m 1248    1248 101088     0        2496
+  40000  5m   1248    1248 29536      0        2496
+  40000  40m  1248    1248 31616      0        2496
+  40000  300m 1248    1248 48256      0        2496
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
index cb3ad17faa39..d760038736a6 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -289,4 +289,24 @@
 {%- endmacro %}
 {% endif %}
 
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
 {%- include 'qos_config.j2' %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
index 6501144d4ebd..90eb9f0d8040 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
@@ -636,8 +636,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index f701492af834..b7ddd361965c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -739,8 +739,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
index 7c63be557ea6..1cba23d85ffe 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
@@ -348,8 +348,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
index de0fed757f73..7196d22c2f2d 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -348,8 +348,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",

From 81f200fdec01947c72dce30ece0cd46743656e14 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Tue, 12 Jul 2022 09:38:11 -0700
Subject: [PATCH 1289/1674] [202012][sonic-linkmgrd] submodule update #11371

[202012][sonic-linkmgrd] submodule update

a2367d0 Jing Zhang Fri Jun 24 09:10:12 2022 -0700 Remove exception throwing when initializing missing loopback interface #90

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 0839af28b998..a2367d082832 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 0839af28b9988a42d37fc72a226281190dcf865a
+Subproject commit a2367d0828322e093525b9f028fd6d3b0ab0dbbf

From aa4379ddbeaf021bcf704dca84b052fb5a18bbcb Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Thu, 14 Jul 2022 13:59:10 +0800
Subject: [PATCH 1290/1674] [202012] [Mellanox] Add sensor conf file for new
 version of MSN3700/3700C/4600C platforms (#11358)

- Why I did it
MSN3700/3700C/4600C have been re-spined, the new HW version of platforms has different sensors, so need to apply the correct sensor.conf for them.

- How I did it
Add new sensor.conf files for the new re-spined platforms.
Enhance the logic of "get_sensors_conf_path" for the related platforms in order to load the correct sensor.conf for each version of platforms.

- How to verify it
run sensors test on different versions of platforms
Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../get_sensors_conf_path                     |  21 ++
 .../sensors_respin.conf                       | 187 +++++++++++++++
 .../get_sensors_conf_path                     |   1 +
 .../sensors_respin.conf                       | 183 ++++++++++++++
 .../get_sensors_conf_path                     |  51 +++-
 .../sensors_respin.conf                       | 226 ++++++++++++++++++
 .../sensors_respin.conf.a1                    | 185 ++++++++++++++
 7 files changed, 853 insertions(+), 1 deletion(-)
 create mode 100755 device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf
 create mode 120000 device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf
 mode change 120000 => 100755 device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf
 create mode 100644 device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf.a1

diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path
new file mode 100755
index 000000000000..62e91e8d43d2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+HW_RESPIN_VERSION="/var/run/hw-management/system/config3"
+SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
+SENSORS_RESPIN_CONF_FILE="/usr/share/sonic/platform/sensors_respin.conf"
+
+function get_sensor_conf_path() {
+    local _HW_RESPIN_VERSION="0"
+    if [[ -e $HW_RESPIN_VERSION ]]; then
+        _HW_RESPIN_VERSION=$(cat $HW_RESPIN_VERSION 2>&1)
+        if [[ "$_HW_RESPIN_VERSION" == "1" ]]; then
+            if [[ -e $SENSORS_RESPIN_CONF_FILE ]]; then
+                echo $SENSORS_RESPIN_CONF_FILE
+                return
+            fi
+        fi
+    fi
+    echo $SENSORS_CONF_FILE
+}
+
+get_sensor_conf_path
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf b/device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf
new file mode 100644
index 000000000000..d3cd3091faa8
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf
@@ -0,0 +1,187 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "tps53679-i2c-*-70"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 PSU 12V Rail (in2)"
+        label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in4 "PMIC-1 ASIC 1.2V Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "tps53679-i2c-*-71"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in3 (1.5)*@, @/(1.5)
+        label in4 "PMIC-2 ASIC 1.8V Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+        
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in3 "PMIC-1 ASIC 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in2 (2)*@, @/(2)
+        label in3 "PMIC-2 ASIC 1.8V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label temp2 "PMIC-3 Temp 2"
+        label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 PSU 12V Rail (in2)"
+        label in3 "PMIC-4 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+        
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2 12V Rail (out)"
+        label fan1 "PSU-2 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2 Temp 1"
+        label temp2 "PSU-2 Temp 2"
+        label temp3 "PSU-2 Temp 3"
+        label power1 "PSU-2 220V Rail Pwr (in)"
+        label power2 "PSU-2 12V Rail Pwr (out)"
+        label curr1 "PSU-2 220V Rail Curr (in)"
+        label curr2 "PSU-2 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1 Tach 1"
+    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan7 "Chassis Fan Drawer-4 Tach 1"
+    label fan8 "Chassis Fan Drawer-4 Tach 2"
+    label fan9 "Chassis Fan Drawer-5 Tach 1"
+    label fan10 "Chassis Fan Drawer-5 Tach 2"
+    label fan11 "Chassis Fan Drawer-6 Tach 1"
+    label fan12 "Chassis Fan Drawer-6 Tach 2"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path
new file mode 120000
index 000000000000..fb7b1d6feda0
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path
@@ -0,0 +1 @@
+../x86_64-mlnx_msn3700-r0/get_sensors_conf_path
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf b/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf
new file mode 100644
index 000000000000..740f9ae968fe
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf
@@ -0,0 +1,183 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "tps53679-i2c-*-70"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 PSU 12V Rail (in2)"
+        label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in4 "PMIC-1 ASIC 1.2V Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "tps53679-i2c-*-71"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in3 (1.5)*@, @/(1.5)
+        label in4 "PMIC-2 ASIC 1.8V Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+        
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in3 "PMIC-1 ASIC 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in2 (2)*@, @/(2)
+        label in3 "PMIC-2 ASIC 1.8V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label temp2 "PMIC-3 Temp 2"
+        label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 PSU 12V Rail (in2)"
+        label in3 "PMIC-4 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+        
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2 12V Rail (out)"
+        label fan1 "PSU-2 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2 Temp 1"
+        label temp2 "PSU-2 Temp 2"
+        label temp3 "PSU-2 Temp 3"
+        label power1 "PSU-2 220V Rail Pwr (in)"
+        label power2 "PSU-2 12V Rail Pwr (out)"
+        label curr1 "PSU-2 220V Rail Curr (in)"
+        label curr2 "PSU-2 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1 Tach 1"
+    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan7 "Chassis Fan Drawer-4 Tach 1"
+    label fan8 "Chassis Fan Drawer-4 Tach 2"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
deleted file mode 120000
index f1509a1e1d3d..000000000000
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64-mlnx_msn4700-r0/get_sensors_conf_path
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
new file mode 100755
index 000000000000..07f1cb1e06f2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+HW_VERSION="/var/run/hw-management/system/config1"
+HW_RESPIN_VERSION="/var/run/hw-management/system/config3"
+SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
+SENSORS_RESPIN_CONF_FILE="/usr/share/sonic/platform/sensors_respin.conf"
+SENSORS_CONF_FILE_A1="/usr/share/sonic/platform/sensors.conf.a1"
+SENSORS_RESPIN_CONF_FILE_A1="/usr/share/sonic/platform/sensors_respin.conf.a1"
+
+function get_sensor_conf_path() {
+    local _HW_VERSION="0"
+    local _HW_RESPIN_VERSION="0"
+    if [[ -e $HW_VERSION ]]; then
+        _HW_VERSION=$(cat $HW_VERSION 2>&1)
+        if [[ "$_HW_VERSION" == "1" ]]; then
+            if [[ -e $HW_RESPIN_VERSION ]]; then
+                _HW_RESPIN_VERSION=$(cat $HW_RESPIN_VERSION 2>&1)
+                if [[ "$_HW_RESPIN_VERSION" == "1" ]]; then
+                    if [[ -e $SENSORS_RESPIN_CONF_FILE_A1 ]]; then
+                        echo $SENSORS_RESPIN_CONF_FILE_A1
+                        return
+                    fi
+                else 
+                    if [[ -e $SENSORS_CONF_FILE_A1 ]]; then
+                        echo $SENSORS_CONF_FILE_A1
+                        return
+                    fi
+                fi
+            else
+                if [[ -e $SENSORS_CONF_FILE_A1 ]]; then
+                        echo $SENSORS_CONF_FILE_A1
+                        return
+                fi
+            fi
+        else
+            if [[ -e $HW_RESPIN_VERSION ]]; then
+                _HW_RESPIN_VERSION=$(cat $HW_RESPIN_VERSION 2>&1)
+                if [[ "$_HW_RESPIN_VERSION" == "1" ]]; then
+                    if [[ -e $SENSORS_RESPIN_CONF_FILE ]]; then
+                        echo $SENSORS_RESPIN_CONF_FILE
+                        return
+                    fi
+                fi
+            fi
+        fi
+    fi
+    echo $SENSORS_CONF_FILE
+}
+
+get_sensor_conf_path
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf
new file mode 100644
index 000000000000..73665a7372d3
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf
@@ -0,0 +1,226 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "xdpe12284-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        ignore in2 
+        label in3 "PMIC-1 ASIC VCORE_MAIN Rail (out1)"
+        ignore in4 
+        label temp1 "PMIC-1 ASIC VCORE_MAIN Temp 1"
+        ignore temp2 
+        label power1 "PMIC-1 12V ASIC VCORE_MAIN Rail Pwr (in)"
+        ignore power2 
+        label power3 "PMIC-1 ASIC VCORE_MAIN Rail Pwr (out1)"
+        ignore power4 
+        label curr1 "PMIC-1 12V ASIC VCORE_MAIN Rail Curr (in1)"
+        ignore curr2 
+        label curr3 "PMIC-1 ASIC VCORE_MAIN Rail Curr (out1)"
+        ignore curr4 
+    chip "xdpe12284-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-2 ASIC 1.8V_MAIN Rail (out1)"
+        label in4 "PMIC-2 ASIC 1.2V_MAIN Rail (out2)"
+        label temp1 "PMIC-2 ASIC 1.8V_MAIN Temp 1"
+        label temp2 "PMIC-2 ASIC 1.2V_MAIN Temp 2"
+        label power1 "PMIC-2 12V ASIC 1.8V_1.2V_MAIN Rail Pwr (in)"
+        ignore power2 
+        label power3 "PMIC-2 ASIC 1.8V_MAIN Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.2V_MAIN Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC 1.8V_MAIN Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.2V_MAIN Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC 1.8V_MAIN Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.2V_MAIN Rail Curr (out2)"
+    chip "xdpe12284-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 ASIC VCORE_T0_1 Rail (out1)"
+        label in4 "PMIC-3 ASIC 1.8V_T0_1 Rail (out2)"
+        label temp1 "PMIC-3 ASIC VCORE_T0_1 Temp 1"
+        label temp2 "PMIC-3 ASIC 1.8V_T0_1 Temp 2"
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T0_1 Rail Pwr (in) "
+        ignore power2 
+        label power3 "PMIC-2 ASIC VCORE_T0_1 Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.8V_T0_1 Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC VCORE_T0_1 Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.8V_T0_1 Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC VCORE_T0_1 Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.8V_T0_1 Rail Curr (out2)"
+    chip "xdpe12284-i2c-*-68"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 ASIC VCORE_T2_3 Rail (out1)"
+        label in4 "PMIC-3 ASIC 1.8V_T2_3 Rail (out2)"
+        label temp1 "PMIC-3 ASIC VCORE_T2_3 Temp 1"
+        label temp2 "PMIC-3 ASIC 1.8V_T2_3 Temp 2"
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T2_3 Rail Pwr (in) "
+        ignore power2 
+        label power3 "PMIC-2 ASIC VCORE_T2_3 Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.8V_T2_3 Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC VCORE_T2_3 Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.8V_T2_3 Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC VCORE_T2_3 Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.8V_T2_3 Rail Curr (out2)"
+    chip "xdpe12284-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 ASIC VCORE_T4_5 Rail (out1)"
+        label in4 "PMIC-3 ASIC 1.8V_T4_5 Rail (out2)"
+        label temp1 "PMIC-3 ASIC VCORE_T4_5 Temp 1"
+        label temp2 "PMIC-3 ASIC 1.8V_T4_5 Temp 2"
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T4_5 Rail Pwr (in) "
+        ignore power2 
+        label power3 "PMIC-2 ASIC VCORE_T4_5 Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.8V_T4_5 Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC VCORE_T4_5 Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.8V_T4_5 Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC VCORE_T4_5 Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.8V_T4_5 Rail Curr (out2)"
+    chip "xdpe12284-i2c-*-6c"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 ASIC VCORE_T6_7 Rail (out1)"
+        label in4 "PMIC-3 ASIC 1.8V_T6_7 Rail (out2)"
+        label temp1 "PMIC-3 ASIC VCORE_T6_7 Temp 1"
+        label temp2 "PMIC-3 ASIC 1.8V_T6_7 Temp 2"
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T6_7 Rail Pwr (in) "
+        ignore power2 
+        label power3 "PMIC-2 ASIC VCORE_T6_7 Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.8V_T6_7 Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC VCORE_T6_7 Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.8V_T6_7 Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC VCORE_T6_7 Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.8V_T6_7 Rail Curr (out2)"
+    chip "xdpe12284-i2c-*-6e"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 ASIC 1.2V_T0_3 Rail (out1)"
+        label in4 "PMIC-3 ASIC 1.2V_T4_7 Rail (out2)"
+        label temp1 "PMIC-3 ASIC 1.2V_T0_3 Temp 1"
+        label temp2 "PMIC-3 ASIC 1.2V_T4_7 Temp 2"
+        label power1 "PMIC-3 12V ASIC 1.2V_T0_3_T4_7 Rail Pwr (in) "
+        ignore power2 
+        label power3 "PMIC-2 ASIC 1.2V_T0_3 Rail Pwr (out1)"
+        label power4 "PMIC-2 ASIC 1.2V_T4_7 Rail Pwr (out2)"
+        label curr1 "PMIC-2 12V ASIC 1.2V_T0_3 Rail Curr (in1)"
+        label curr2 "PMIC-2 12V ASIC 1.2V_T4_7 Rail Curr (in2)"
+        label curr3 "PMIC-2 ASIC 1.2V_T0_3 Rail Curr (out1)"
+        label curr4 "PMIC-2 ASIC 1.2V_T4_7 Rail Curr (out2)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-8 PSU 12V Rail (in1)"
+        label in2 "PMIC-8 PSU 12V Rail (in2)"
+        label in3 "PMIC-8 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-8 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-8 Temp 1"
+        label temp2 "PMIC-8 Temp 2"
+        label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-9 PSU 12V Rail (in1)"
+        label in2 "PMIC-9 PSU 12V Rail (in2)"
+        label in3 "PMIC-9 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-9 Temp 1"
+        label temp2 "PMIC-9 Temp 2"
+        label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
+        ignore power2 
+        label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
+        ignore curr2 
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf.a1 b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf.a1
new file mode 100644
index 000000000000..3131eaf15333
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf.a1
@@ -0,0 +1,185 @@
+################################################################################
+# Copyright (c) 2019 Mellanox Technologies
+#
+# Platform specific sensors config for SN4700
+################################################################################
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        label in2 "PMIC-1 ASIC VCORE_MAIN Rail (out)"
+        ignore in3
+        ignore in4 
+        label temp1 "PMIC-1 ASIC VCORE_MAIN Temp 1"
+        ignore temp2 
+        label power1 "PMIC-1 12V ASIC VCORE_MAIN Rail Pwr (in)"
+        label power2 "PMIC-1 ASIC VCORE_MAIN Rail Pwr (out)"
+        ignore power3 
+        ignore power4 
+        label curr1 "PMIC-1 12V ASIC VCORE_MAIN Rail Curr (in)"
+        label curr2 "PMIC-1 ASIC VCORE_MAIN Rail Curr (out)"
+        ignore curr3 
+        ignore curr4 
+    chip "mp2975-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 1.8V_MAIN Rail (out1)"
+        label in3 "PMIC-2 ASIC 1.2V_MAIN Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-2 ASIC 1.8V_1.2V_MAIN Temp 1"
+        ignore temp2
+        label power1 "PMIC-2 12V ASIC 1.8V_1.2V_MAIN Rail Pwr (in)"
+        label power2 "PMIC-2 ASIC 1.8V_MAIN Rail Pwr (out)"
+        ignore power3
+        ignore power4
+        label curr1 "PMIC-2 12V ASIC 1.8V_1.2V_MAIN Rail Curr (in)"
+        label curr2 "PMIC-2 ASIC 1.8V_MAIN Rail Curr (out1)"
+        label curr3 "PMIC-2 ASIC 1.2V_MAIN Rail Curr (out2)"
+        ignore curr4
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in)"
+        label in2 "PMIC-3 ASIC VCORE_T0_3 Rail (out1)"
+        label in3 "PMIC-3 ASIC 1.8V_T0_3 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-3 ASIC VCORE_1.8V_T0_3 Temp 1"
+        ignore temp2
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T0_3 Rail Pwr (in) "
+        label power2 "PMIC-3 ASIC VCORE_T0_3 Rail Pwr (out)"
+        ignore power3
+        ignore power4 
+        label curr1 "PMIC-3 12V ASIC VCORE_1.8V_T0_3 Rail Curr (in)"
+        label curr2 "PMIC-3 ASIC VCORE_T0_3 Rail Curr (out1)"
+        label curr3 "PMIC-3 ASIC 1.8V_T0_3 Rail Curr (out2)"
+        ignore curr4
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-4 PSU 12V Rail (in)"
+        label in2 "PMIC-4 ASIC VCORE_T4_7 Rail (out1)"
+        label in3 "PMIC-3 ASIC 1.8V_T4_7 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-4 ASIC VCORE_1.8V_T4_7 Temp 1"
+        ignore temp2
+        label power1 "PMIC-4 12V ASIC VCORE_1.8V_T4_7 Rail Pwr (in) "
+        label power2 "PMIC-4 ASIC VCORE_T4_7 Rail Pwr (out)"
+        ignore power3
+        ignore power4 
+        label curr1 "PMIC-4 12V ASIC VCORE_1.8V_T4_7 Rail Curr (in)"
+        label curr2 "PMIC-4 ASIC VCORE_T4_7 Rail Curr (out1)"
+        label curr3 "PMIC-4 ASIC 1.8V_T4_7 Rail Curr (out2)"
+        ignore curr4
+        ignore curr4
+    chip "mp2975-i2c-*-6e"
+        label in1 "PMIC-5 PSU 12V Rail (in)"
+        label in2 "PMIC-5 ASIC 1.2V_T0_3 Rail (out1)"
+        label in3 "PMIC-5 ASIC 1.2V_T4_7 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-5 ASIC 1.2V_T0_3_T4_7 Temp 1"
+        ignore temp2
+        label power1 "PMIC-5 12V ASIC 1.2V_T0_3_T4_7 Rail Pwr (in)"
+        label power2 "PMIC-5 ASIC 1.2V_T0_3 Rail Pwr (out)"
+        ignore power3
+        ignore power4
+        label curr1 "PMIC-5 12V ASIC 1.2V_T0_3_T4_7 Rail Curr (in)"
+        label curr2 "PMIC-5 ASIC 1.2V_T0_3 Rail Curr (out1)"
+        label curr3 "PMIC-5 ASIC 1.2V_T4_7 Rail Curr (out2)"
+        ignore curr4
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-6 PSU 12V Rail (in1)"
+        label in2 "PMIC-6 PSU 12V Rail (in2)"
+        label in3 "PMIC-6 COMEX 1.8V Rail (out1)"
+        label in4 "PMIC-6 COMEX 1.05V Rail (out2)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out1)"
+        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out2)"
+        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out1)"
+        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out2)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-7 PSU 12V Rail (in1)"
+        label in2 "PMIC-7 PSU 12V Rail (in2)"
+        label in3 "PMIC-7 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-7 Temp 1"
+        label temp2 "PMIC-7 Temp 2"
+        label power1 "PMIC-7 COMEX 1.2V Rail Pwr (out1)"
+        ignore power2 
+        label curr1 "PMIC-7 COMEX 1.2V Rail Curr (out1)"
+        ignore curr2 
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1

From 15cc046eda84fe0c16e07e16ea5d4f9d21db0c29 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 15 Jul 2022 09:33:39 -0700
Subject: [PATCH 1291/1674] [202012] Update MMU and ECN settings for
 Arista-7260CX3-D96C16 (#11427)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
Missed this sku in the previous PR #11398

How I did it
Update the dynamic threshold to 0 and ECN settings as 2mb/10mb/5%

How to verify it
Updated unit tests to use the modified values for 7260 ecn settings.
---
 .../pg_profile_lookup.ini                     | 12 +++++------
 .../Arista-7260CX3-D96C16/qos.json.j2         | 20 +++++++++++++++++++
 .../sample_output/py2/qos-arista7260.json     |  1 +
 .../sample_output/py3/qos-arista7260.json     |  1 +
 src/sonic-config-engine/tests/test_j2files.py |  3 +++
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 120000 src/sonic-config-engine/tests/sample_output/py2/qos-arista7260.json
 create mode 120000 src/sonic-config-engine/tests/sample_output/py3/qos-arista7260.json

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
index ed0005610b71..a12e306278cc 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
@@ -1,8 +1,8 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
-  50000  5m   1248    1248 56160    -3        2496
- 100000  5m   1248    1248 96928    -3        2496
-  50000  40m  1248    1248 96096    -3        2496
- 100000  40m  1248    1248 177632   -3        2496
-  50000  300m 1248    1248 141856   -3        2496
- 100000  300m 1248    1248 268736   -3        2496
+  50000  5m   1248    1248 56160    0         2496
+ 100000  5m   1248    1248 96928    0         2496
+  50000  40m  1248    1248 96096    0         2496
+ 100000  40m  1248    1248 177632   0         2496
+  50000  300m 1248    1248 141856   0         2496
+ 100000  300m 1248    1248 268736   0         2496
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
index 3e548325ea30..3e1d8df928c9 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
@@ -1 +1,21 @@
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
 {%- include 'qos_config.j2' %}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7260.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7260.json
new file mode 120000
index 000000000000..9362bae62029
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7260.json
@@ -0,0 +1 @@
+../py3/qos-arista7260-t1-remap-disabled.json
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260.json
new file mode 120000
index 000000000000..bb3adcf3a9a9
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260.json
@@ -0,0 +1 @@
+qos-arista7260-t1-remap-disabled.json
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 9e840a154c19..a307a4cdd6d8 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -238,6 +238,9 @@ def test_qos_dell9332_render_template(self):
     def test_qos_dell6100_render_template(self):
         self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
 
+    def test_qos_arista7260_render_template(self):
+        self._test_qos_render_template('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D96C16', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'qos-arista7260.json')
+
     def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
         file_exist, dir_exist = self.create_machine_conf(platform, vendor)
         dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)

From c5eb031111639a5d4cf500c6ec8ce2877fbea31c Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Sat, 16 Jul 2022 00:44:45 +0800
Subject: [PATCH 1292/1674] [202012] Add flag to control the generation of
 global level map (#11451)

Why I did it
This PR is to cherry-pick #11448 to 202012 branch after resolving conflicts.
There are conflicts in

files/build_templates/qos_config.j2
src/sonic-config-engine/tests/test_j2files.py
---
 files/build_templates/qos_config.j2           |   5 +-
 ...ista-7050-t0-storage-backend-minigraph.xml | 781 ++++++++++++++++++
 .../qos-arista7050-t0-storage-backend.json    |  81 ++
 src/sonic-config-engine/tests/test_j2files.py |   9 +-
 4 files changed, 872 insertions(+), 4 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7050-t0-storage-backend-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json

diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 6a382af18e51..a36d1a124a95 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -45,6 +45,8 @@
 {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
 {%- set apollo_resource_types = ['DL-NPU-Apollo'] -%}
 
+{%- set require_global_dscp_to_tc_map = true -%}
+
 {
 {% if (generate_tc_to_pg_map is defined) and tunnel_qos_remap_enable %}
     {{- generate_tc_to_pg_map() }}
@@ -91,6 +93,7 @@
     },
 {% endif %}
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
+{%- set require_global_dscp_to_tc_map = false %}
     "DOT1P_TO_TC_MAP": {
         "AZURE": {
             "0": "1",
@@ -224,7 +227,7 @@
     "PORT_QOS_MAP": {
 {% if generate_global_dscp_to_tc_map is defined %}
         {{- generate_global_dscp_to_tc_map() }}
-{% else %}
+{% elif require_global_dscp_to_tc_map %}
         "global": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
         }{% if PORT_ACTIVE %},{% endif %}
diff --git a/src/sonic-config-engine/tests/sample-arista-7050-t0-storage-backend-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050-t0-storage-backend-minigraph.xml
new file mode 100644
index 000000000000..cadd47217a71
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7050-t0-storage-backend-minigraph.xml
@@ -0,0 +1,781 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.2.0.20</StartPeer>
+        <EndRouter>CHASSIS_PEER</EndRouter>
+        <EndPeer>10.2.0.21</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+        <ChassisInternal>voq</ChassisInternal>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>1</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.2.0.21</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>CHASSIS_PEER</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel1</Name>
+          <AttachTo>fortyGigE0/4</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>ab1</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab4</Name>
+          <AttachTo>fortyGigE0/8</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>1001</VlanID>
+          <Tag>1001</Tag>
+          <Subnets>192.168.0.32/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>kk1</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2020</VlanID>
+          <Tag>2020</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.0/28</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab2</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Type>Tagged</Type>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>ab3</Name>
+          <AttachTo>fortyGigE0/12</AttachTo>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>2001</VlanID>
+          <Tag>2001</Tag>
+          <Subnets>192.168.0.240/27</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel1</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel1</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>fortyGigE0/0</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>ab1</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>everflow</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>ERSPANv6</AttachTo>
+          <InAcl>everflowV6</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>Loopback0</AttachTo>
+          <InAcl>ipv6-mgmt-only</InAcl>
+          <Type>Management</Type>
+          <Vlan>0</Vlan>
+          <File i:nil="true"/>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>Loopback0</AttachTo>
+          <InAcl>mgmt-only</InAcl>
+          <Type>Management</Type>
+          <Vlan>0</Vlan>
+          <File i:nil="true"/>
+        </AclInterface>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
+          <AttachTo>StaticERSPAN</AttachTo>
+          <InAcl>everflowStatic</InAcl>
+          <Type>Everflow</Type>
+          <Vlan>0</Vlan>
+          <File>everflow.xml</File>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>et1</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/8</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceMgmtLink">
+        <ElementType>DeviceMgmtLink</ElementType>
+        <Bandwidth>1000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/16</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ChassisMTS1</StartDevice>
+        <StartPort>mgmt0</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="BackEndToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Arista-7050-QX-32S</HwSku>
+        <ClusterName>AAA00PrdStr00</ClusterName>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>10000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/4</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>25000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+          <Description>Interface description</Description>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>fortyGigE0/124</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>100000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7050-QX-32S</HwSku>
+      <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+	<a:ManagementInterface>
+	  <ElementType>DeviceInterface</ElementType>
+	  <AlternateSpeeds i:nil="true"/>
+	  <Index>1</Index>
+	  <InterfaceName>Management1</InterfaceName>
+	  <MultiPortsInterface>false</MultiPortsInterface>
+	  <PortName>mgmt1</PortName>
+	  <Speed>1000</Speed>
+  	</a:ManagementInterface>
+      </ManagementInterfaces>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>switch-t0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ResourceType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Storage</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Arista-7050-QX-32S</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json
new file mode 100644
index 000000000000..94aa8d8a7d1d
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json
@@ -0,0 +1,81 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "DOT1P_TO_TC_MAP": {
+        "AZURE": {
+            "0": "1",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0": {
+            "type"  : "DWRR",
+            "weight": "14"
+        },
+        "scheduler.1": {
+            "type"  : "DWRR",
+            "weight": "15"
+        }
+    },
+    "PORT_QOS_MAP": {
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "2097152",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+    "QUEUE": {
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index a307a4cdd6d8..0bc849656575 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -381,7 +381,8 @@ def test_qos_dscp_remapping_render_template(self):
             '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8',
             '../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64',
             '../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64',
-            '../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64'
+            '../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64',
+            '../../../device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S'
         ]
         sample_outputs = [
             'qos-arista7050cx3-dualtor.json',
@@ -391,7 +392,8 @@ def test_qos_dscp_remapping_render_template(self):
             'qos-arista7260-dualtor-remap-disabled.json',
             'qos-arista7260-t1-remap-disabled.json',
             'qos-mellanox4600c-c64.json',
-            'qos-mellanox4600c-c64-remap-disabled.json'
+            'qos-mellanox4600c-c64-remap-disabled.json',
+            'qos-arista7050-t0-storage-backend.json'
         ]
         sample_minigraph_files = [
             'sample-arista-7050cx3-dualtor-minigraph.xml',
@@ -401,7 +403,8 @@ def test_qos_dscp_remapping_render_template(self):
             'sample-arista-7260-dualtor-minigraph-remap-disabled.xml',
             'sample-arista-7260-t1-minigraph-remap-disabled.xml',
             'sample-mellanox-4600c-t1-minigraph.xml',
-            'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml'
+            'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml',
+            'sample-arista-7050-t0-storage-backend-minigraph.xml'
         ]
 
         for i, path in enumerate(dir_paths):

From 85c36c5c6997e1b335e6303d7a6859b0043b5865 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 12 Jul 2022 17:57:16 +0800
Subject: [PATCH 1293/1674] [Build] Cleanup the version deb preference file
 after build (#11414)

Why I did it
Cleanup the version deb preference file after build.
The version file is no use after build.

How I did it
Remove the no use version file.
---
 src/sonic-build-hooks/scripts/post_run_buildinfo | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/post_run_buildinfo b/src/sonic-build-hooks/scripts/post_run_buildinfo
index e0d84d35bb08..97f47f7efcf1 100755
--- a/src/sonic-build-hooks/scripts/post_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/post_run_buildinfo
@@ -11,3 +11,6 @@ rm -rf $BUILD_VERSION_PATH/*
 # Disable the build hooks
 symlink_build_hooks -d
 set_reproducible_mirrors -d
+
+# Remove the version deb preference
+rm -f $VERSION_DEB_PREFERENCE

From c60bf905903c8864a04a68239b6aff35d74c3ad6 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Wed, 20 Jul 2022 14:00:17 +0800
Subject: [PATCH 1294/1674] [202012] [Mellanox] Update hw-mgmt package to
 V.7.0010.2349 (#11421)

- Why I did it
New changes in this new HW-MGMT package:

1. hw-mgmt: chassis events: Fix voltmon address conflict on connecting
2. hw-mgmt: topology: Add COMEX BRDWL respin support
  a. Removed A2D sensor from all COMEX BRDWL boards
  b. Add COMEX BRDWL boards with register defined (config3)

- How I did it
Advance the hw-mgmt repo pointer and update the hw-mgmt version number

- How to verify it
Run platform-related regression test cases on the new testbed.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 platform/mellanox/hw-management.mk      | 2 +-
 platform/mellanox/hw-management/hw-mgmt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index 61157329403b..5e9c2e3c2215 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2347
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2349
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 3a8787997d7b..67c3b6bd8617 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 3a8787997d7b0269c144861bfc9e7263c028f6bc
+Subproject commit 67c3b6bd8617f4e0a282dab704a5f741088a3dd6

From e2042e2ad6ace887cb893599dbf460354e1eb2c3 Mon Sep 17 00:00:00 2001
From: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date: Thu, 21 Jul 2022 08:31:50 -0700
Subject: [PATCH 1295/1674] update cisco-8000 platform version to v106 (#11504)

---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index dd9bdcd725ef..ea19fd0e1ece 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.102
+ref=202012-v0.106

From ee43011748eea4fe418f193163ca1fbac3aab3e2 Mon Sep 17 00:00:00 2001
From: anamehra <54692434+anamehra@users.noreply.github.com>
Date: Fri, 22 Jul 2022 02:01:57 -0700
Subject: [PATCH 1296/1674] Update cisco-8000 submodule to v0.106 (#11505)

Signed-off-by: anamehra <anamehra@cisco.com>

From 66d49231cf8220df644b59e7cc483ad51f0975d6 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Sat, 23 Jul 2022 20:43:07 -0700
Subject: [PATCH 1297/1674] Update cisco-8000.ini (#11522)

update cisco-8000 platform version to 202012-v0.107
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index ea19fd0e1ece..39edd61f25e6 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.106
+ref=202012-v0.107

From db37325f76f576fe70b4c405aa71460e61fd0556 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Tue, 26 Jul 2022 21:01:36 +0300
Subject: [PATCH 1298/1674] [202012][Mellanox] Update SAI version to 1.22.0.0
 and SDK/FW to version 4.5.2318/2010_2318 (#11534)

- Why I did it
Update SAI version - 1.22.0.0
Update SDK/FW version - 4.5.2318/2010_2318

SAI Changes:
1. Port FEC fix for multiple speeds
2. Next hop group optimized bulk API
3. Support BFD remote-disc exchange in negotiation stage
4. Reduce verbosity of shared database already exists print

SDK/FW Fixes:
1. Cr space timeout on Hold and Release GW - at warmboot
2. SPC-1 Port in stuck PHY_UP after peer side rebooted
3. memory leak in sx_api_router_ecmp_update_set

- How I did it
Update pointer for the new SAI and SDK/FW

- How to verify it
Run regression tests
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/mlnx-sai.mk                          | 2 +-
 platform/mellanox/mlnx-sai/SAI-Implementation          | 2 +-
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 67a4876fef3e..7d252de8851b 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.2262
+MLNX_SPC_FW_VERSION = 13.2010.2318
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.2262
+MLNX_SPC2_FW_VERSION = 29.2010.2318
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.2262
+MLNX_SPC3_FW_VERSION = 30.2010.2318
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index c37b8fcefacd..c8c87a61a723 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.21.2.2
+MLNX_SAI_VERSION = SAIRel1.22.0.0
 
 export MLNX_SAI_VERSION
 
diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
index 392c4fc3c5e3..9c4d6af340fc 160000
--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@@ -1 +1 @@
-Subproject commit 392c4fc3c5e300611cecf42457b832f085088719
+Subproject commit 9c4d6af340fcacfc01f308b261484314cdfce6af
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index e9fa9a843702..3e3db8705f81 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit e9fa9a843702aa55b13c8eb01c7a1f188e4a16a9
+Subproject commit 3e3db8705f81dbeba8312fcc022969337fcc51ad
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index cedcffcd4dc3..a1603b870981 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
-MLNX_SDK_VERSION = 4.5.2262
+MLNX_SDK_VERSION = 4.5.2318
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 6c2f99a32766f0cb3f0fbfad24c50f8ee6290e7a Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Tue, 12 Jul 2022 10:08:58 -0700
Subject: [PATCH 1299/1674] Add load_minigraph option to include
 traffic-shift-away during config migration (#11403)

---
 files/image_config/config-setup/config-setup | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index de39586fd4f8..d80627f5f01e 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -109,7 +109,15 @@ run_hookdir() {
 reload_minigraph()
 {
     echo "Reloading minigraph..."
-    config load_minigraph -y -n 
+    if
+    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]] ||
+    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.type | tr [:upper:] [:lower:])" == *"leafrouter"* ]];
+    then
+        #Keep device isolated with traffic-shift-away option on LeafRouter and Dualtor
+        config load_minigraph -y -n -t
+    else
+        config load_minigraph -y -n
+    fi
     config save -y
 }
 

From a2e05423567d7c3ae4d6e0a45cec3ad94e9d1055 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 25 Jul 2022 14:43:06 -0700
Subject: [PATCH 1300/1674] [dhcpmon] Open different socket for dual tor to
 enable interface filtering (#11201)

---
 rules/dhcpmon.mk                              |   1 +
 src/dhcpmon/Makefile                          |   5 +-
 src/dhcpmon/objects.mk                        |   2 +-
 .../src/{dhcp_device.c => dhcp_device.cpp}    | 150 ++++++++++++++----
 src/dhcpmon/src/dhcp_device.h                 |   1 +
 .../src/{dhcp_devman.c => dhcp_devman.cpp}    |   2 +-
 src/dhcpmon/src/{dhcp_mon.c => dhcp_mon.cpp}  |   0
 src/dhcpmon/src/{main.c => main.cpp}          |   6 +
 src/dhcpmon/src/subdir.mk                     |  14 +-
 9 files changed, 143 insertions(+), 38 deletions(-)
 rename src/dhcpmon/src/{dhcp_device.c => dhcp_device.cpp} (80%)
 rename src/dhcpmon/src/{dhcp_devman.c => dhcp_devman.cpp} (99%)
 rename src/dhcpmon/src/{dhcp_mon.c => dhcp_mon.cpp} (100%)
 rename src/dhcpmon/src/{main.c => main.cpp} (97%)

diff --git a/rules/dhcpmon.mk b/rules/dhcpmon.mk
index 3f8f5e139bce..8f9d6403a677 100644
--- a/rules/dhcpmon.mk
+++ b/rules/dhcpmon.mk
@@ -4,6 +4,7 @@ SONIC_DHCPMON_VERSION = 1.0.0-0
 SONIC_DHCPMON_PKG_NAME = dhcpmon
 
 SONIC_DHCPMON = sonic-$(SONIC_DHCPMON_PKG_NAME)_$(SONIC_DHCPMON_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCPMON)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
 $(SONIC_DHCPMON)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCPMON_PKG_NAME)
 SONIC_DPKG_DEBS += $(SONIC_DHCPMON)
 
diff --git a/src/dhcpmon/Makefile b/src/dhcpmon/Makefile
index 61cde376730b..4d21f57199f2 100644
--- a/src/dhcpmon/Makefile
+++ b/src/dhcpmon/Makefile
@@ -2,8 +2,9 @@ RM := rm -rf
 DHCPMON_TARGET := dhcpmon
 CP := cp
 MKDIR := mkdir
-CC := gcc
+CC := g++
 MV := mv
+PWD := $(shell pwd)
 
 # All of the sources participating in the build are defined here
 -include src/subdir.mk
@@ -23,7 +24,7 @@ all: sonic-dhcpmon
 # Tool invocations
 sonic-dhcpmon: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C Linker'
+	@echo 'Invoking: G++ C Linker'
 	$(CC) -o "$(DHCPMON_TARGET)" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
diff --git a/src/dhcpmon/objects.mk b/src/dhcpmon/objects.mk
index c9b774a53921..dc0d09e5021f 100644
--- a/src/dhcpmon/objects.mk
+++ b/src/dhcpmon/objects.mk
@@ -1,4 +1,4 @@
 USER_OBJS :=
 
-LIBS := -levent -lexplain
+LIBS := -levent -lexplain -lswsscommon -pthread -lboost_thread -lboost_system -lhiredis
 
diff --git a/src/dhcpmon/src/dhcp_device.c b/src/dhcpmon/src/dhcp_device.cpp
similarity index 80%
rename from src/dhcpmon/src/dhcp_device.c
rename to src/dhcpmon/src/dhcp_device.cpp
index f45483f8504c..8ec91b057b64 100644
--- a/src/dhcpmon/src/dhcp_device.c
+++ b/src/dhcpmon/src/dhcp_device.cpp
@@ -21,6 +21,8 @@
 #include <libexplain/ioctl.h>
 #include <linux/filter.h>
 #include <netpacket/packet.h>
+#include "subscriberstatetable.h"
+#include "select.h"
 
 #include "dhcp_device.h"
 
@@ -49,34 +51,42 @@
 #define OP_JSET     (BPF_JMP | BPF_JSET | BPF_K)    /** bpf jset */
 #define OP_LDXB     (BPF_LDX | BPF_B    | BPF_MSH)  /** bpf ldxb */
 
+std::shared_ptr<swss::DBConnector> mStateDbPtr = std::make_shared<swss::DBConnector> ("STATE_DB", 0);
+std::shared_ptr<swss::Table> mStateDbMuxTablePtr = std::make_shared<swss::Table> (
+            mStateDbPtr.get(), "HW_MUX_CABLE_TABLE"
+        );
+swss::DBConnector configDb("CONFIG_DB", 0);
+
 /** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
  * This program is obtained using the following command tcpdump:
- * `tcpdump -dd "udp and (port 67 or port 68)"`
+ * `tcpdump -dd "inbound and udp and (port 67 or port 68)"`
  */
 static struct sock_filter dhcp_bpf_code[] = {
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (000) ldh      [12]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (001) jeq      #0x86dd          jt 2	jf 9
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (002) ldb      [20]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 18, .k = 0x00000011}, // (003) jeq      #0x11            jt 4	jf 22
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036}, // (004) ldh      [54]
-    {.code = OP_JEQ,  .jt = 15, .jf = 0,  .k = 0x00000043}, // (005) jeq      #0x43            jt 21	jf 6
-    {.code = OP_JEQ,  .jt = 14, .jf = 0,  .k = 0x00000044}, // (006) jeq      #0x44            jt 21	jf 7
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038}, // (007) ldh      [56]
-    {.code = OP_JEQ,  .jt = 12, .jf = 11, .k = 0x00000043}, // (008) jeq      #0x43            jt 21	jf 20
-    {.code = OP_JEQ,  .jt = 0,  .jf = 12, .k = 0x00000800}, // (009) jeq      #0x800           jt 10	jf 22
-    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017}, // (010) ldb      [23]
-    {.code = OP_JEQ,  .jt = 0,  .jf = 10, .k = 0x00000011}, // (011) jeq      #0x11            jt 12	jf 22
-    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014}, // (012) ldh      [20]
-    {.code = OP_JSET, .jt = 8,  .jf = 0,  .k = 0x00001fff}, // (013) jset     #0x1fff          jt 22	jf 14
-    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (014) ldxb     4*([14]&0xf)
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (015) ldh      [x + 14]
-    {.code = OP_JEQ,  .jt = 4,  .jf = 0,  .k = 0x00000043}, // (016) jeq      #0x43            jt 21	jf 17
-    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000044}, // (017) jeq      #0x44            jt 21	jf 18
-    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010}, // (018) ldh      [x + 16]
-    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043}, // (019) jeq      #0x43            jt 21	jf 20
-    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044}, // (020) jeq      #0x44            jt 21	jf 22
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000}, // (021) ret      #262144
-    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000}, // (022) ret      #0
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0xfffff004}, // (000) ldh      #fffff004
+    {.code = OP_JEQ, .jt = 22,  .jf = 0,  .k = 0x00000004}, // (001) jeq      #0x04            jt 22 jf 0
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (002) ldh      [12]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (003) jeq      #0x86dd          jt 2	jf 9
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (004) ldb      [20]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 18, .k = 0x00000011}, // (005) jeq      #0x11            jt 4	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036}, // (006) ldh      [54]
+    {.code = OP_JEQ,  .jt = 15, .jf = 0,  .k = 0x00000043}, // (007) jeq      #0x43            jt 21	jf 6
+    {.code = OP_JEQ,  .jt = 14, .jf = 0,  .k = 0x00000044}, // (008) jeq      #0x44            jt 21	jf 7
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038}, // (009) ldh      [56]
+    {.code = OP_JEQ,  .jt = 12, .jf = 11, .k = 0x00000043}, // (010) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 12, .k = 0x00000800}, // (011) jeq      #0x800           jt 10	jf 22
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017}, // (012) ldb      [23]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 10, .k = 0x00000011}, // (013) jeq      #0x11            jt 12	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014}, // (014) ldh      [20]
+    {.code = OP_JSET, .jt = 8,  .jf = 0,  .k = 0x00001fff}, // (015) jset     #0x1fff          jt 22	jf 14
+    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (016) ldxb     4*([14]&0xf)
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (017) ldh      [x + 14]
+    {.code = OP_JEQ,  .jt = 4,  .jf = 0,  .k = 0x00000043}, // (018) jeq      #0x43            jt 21	jf 17
+    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000044}, // (019) jeq      #0x44            jt 21	jf 18
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010}, // (020) ldh      [x + 16]
+    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043}, // (021) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044}, // (022) jeq      #0x44            jt 21	jf 22
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000}, // (023) ret      #262144
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000}, // (024) ret      #0
 };
 
 /** Filter program socket struct */
@@ -176,7 +186,7 @@ static void read_callback(int fd, short event, void *arg)
         uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
         int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
 
-        if ((buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
+        if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
             (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) {
             int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
                           ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
@@ -221,6 +231,87 @@ static void read_callback(int fd, short event, void *arg)
     }
 }
 
+/**
+ * @code read_callback_dual_tor(fd, event, arg);
+ *
+ * @brief callback for libevent which is called every time out in order to read queued packet capture when dual tor mode is enabled
+ *
+ * @param fd            socket to read from
+ * @param event         libevent triggered event
+ * @param arg           user provided argument for callback (interface context)
+ *
+ * @return none
+ */
+static void read_callback_dual_tor(int fd, short event, void *arg)
+{
+    dhcp_device_context_t *context = (dhcp_device_context_t*) arg;
+    ssize_t buffer_sz;
+    struct sockaddr_ll sll;
+    socklen_t slen = sizeof sll;
+
+    while ((event == EV_READ) &&
+           ((buffer_sz = recvfrom(fd, context->buffer, context->snaplen, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0)) 
+    {
+        std::string member_table = std::string("VLAN_MEMBER|") + context->intf + "|";
+        char interfaceName[IF_NAMESIZE];
+        char *interface = if_indextoname(sll.sll_ifindex, interfaceName);
+        std::string state;
+        std::string intf(interface);
+        mStateDbMuxTablePtr->hget(intf, "state", state);
+        if (state != "standby" && configDb.exists(member_table.append(interface))) {
+            struct ether_header *ethhdr = (struct ether_header*) context->buffer;
+            struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
+            struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
+            uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
+            int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
+
+            if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
+                (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) 
+            {
+                int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
+                            ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
+                int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
+                const u_char *dhcp_option = context->buffer + dhcp_option_offset;
+                dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
+                                            ethhdr->ether_shost[1] == context->mac[1] &&
+                                            ethhdr->ether_shost[2] == context->mac[2] &&
+                                            ethhdr->ether_shost[3] == context->mac[3] &&
+                                            ethhdr->ether_shost[4] == context->mac[4] &&
+                                            ethhdr->ether_shost[5] == context->mac[5]) ?
+                                            DHCP_TX : DHCP_RX;
+                int offset = 0;
+                int stop_dhcp_processing = 0;
+                while ((offset < (dhcp_option_sz + 1)) && dhcp_option[offset] != 255) {
+                    switch (dhcp_option[offset])
+                    {
+                    case 53:
+                        if (offset < (dhcp_option_sz + 2)) {
+                            handle_dhcp_option_53(context, &dhcp_option[offset], dir, iphdr, dhcphdr);
+                        }
+                        stop_dhcp_processing = 1; // break while loop since we are only interested in Option 53
+                        break;
+                    default:
+                        break;
+                    }
+
+                    if (stop_dhcp_processing == 1) {
+                        break;
+                    }
+
+                    if (dhcp_option[offset] == 0) { // DHCP Option Padding
+                        offset++;
+                    } else {
+                        offset += dhcp_option[offset + 1] + 2;
+                    }
+                }
+            } else {
+                syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
+                    context->intf, buffer_sz);
+            }
+        }
+    }
+}
+
 /**
  * @code dhcp_device_is_dhcp_inactive(counters);
  *
@@ -412,7 +503,7 @@ static int init_socket(dhcp_device_context_t *context, const char *intf)
 
         struct sockaddr_ll addr;
         memset(&addr, 0, sizeof(addr));
-        addr.sll_ifindex = if_nametoindex(intf);
+        addr.sll_ifindex = 0; // any interface
         addr.sll_family = AF_PACKET;
         addr.sll_protocol = htons(ETH_P_ALL);
         if (bind(context->sock, (struct sockaddr *) &addr, sizeof(addr))) {
@@ -553,6 +644,7 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
                               in_addr_t giaddr_ip)
 {
     int rv = -1;
+    struct event *ev;
 
     do {
         if (context == NULL) {
@@ -579,7 +671,11 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
             break;
         }
 
-        struct event *ev = event_new(base, context->sock, EV_READ | EV_PERSIST, read_callback, context);
+        if (dual_tor_sock)
+            ev = event_new(base, context->sock, EV_READ | EV_PERSIST, read_callback_dual_tor, context);
+        else
+            ev = event_new(base, context->sock, EV_READ | EV_PERSIST, read_callback, context);
+
         if (ev == NULL) {
             syslog(LOG_ALERT, "event_new: failed to allocate memory for libevent event '%s'\n", strerror(errno));
             break;
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index aa686f4e2718..a2b2a789fca6 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -16,6 +16,7 @@
 #include <event2/bufferevent.h>
 #include <event2/buffer.h>
 
+extern bool dual_tor_sock;
 
 /**
  * DHCP message types
diff --git a/src/dhcpmon/src/dhcp_devman.c b/src/dhcpmon/src/dhcp_devman.cpp
similarity index 99%
rename from src/dhcpmon/src/dhcp_devman.c
rename to src/dhcpmon/src/dhcp_devman.cpp
index 65484798dbd6..b215f978a7c4 100644
--- a/src/dhcpmon/src/dhcp_devman.c
+++ b/src/dhcpmon/src/dhcp_devman.cpp
@@ -110,7 +110,7 @@ void dhcp_devman_shutdown()
 int dhcp_devman_add_intf(const char *name, char intf_type)
 {
     int rv = -1;
-    struct intf *dev = malloc(sizeof(struct intf));
+    struct intf *dev = (struct intf*) malloc(sizeof(struct intf));
 
     if (dev != NULL) {
         dev->name = name;
diff --git a/src/dhcpmon/src/dhcp_mon.c b/src/dhcpmon/src/dhcp_mon.cpp
similarity index 100%
rename from src/dhcpmon/src/dhcp_mon.c
rename to src/dhcpmon/src/dhcp_mon.cpp
diff --git a/src/dhcpmon/src/main.c b/src/dhcpmon/src/main.cpp
similarity index 97%
rename from src/dhcpmon/src/main.c
rename to src/dhcpmon/src/main.cpp
index 29bc534accf0..aefaea2d01dd 100644
--- a/src/dhcpmon/src/main.c
+++ b/src/dhcpmon/src/main.cpp
@@ -16,9 +16,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "subscriberstatetable.h"
+#include "select.h"
 
 #include "dhcp_mon.h"
 #include "dhcp_devman.h"
+#include "dhcp_device.h"
 
 /** dhcpmon_default_snaplen: default snap length of packet being captured */
 static const size_t dhcpmon_default_snaplen = 65535;
@@ -29,6 +32,8 @@ static const uint32_t dhcpmon_default_health_check_window = 18;
  *  with DHCP relay */
 static const uint32_t dhcpmon_default_unhealthy_max_count = 10;
 
+bool dual_tor_sock = false;
+
 /**
  * @code usage(prog);
  *
@@ -134,6 +139,7 @@ int main(int argc, char **argv)
             i += 2;
             break;
         case 'u':
+            dual_tor_sock = true;
             if (dhcp_devman_setup_dual_tor_mode(argv[i + 1]) != 0) {
                 usage(basename(argv[0]));
             }
diff --git a/src/dhcpmon/src/subdir.mk b/src/dhcpmon/src/subdir.mk
index 324977aa39f7..dd808aeb7202 100644
--- a/src/dhcpmon/src/subdir.mk
+++ b/src/dhcpmon/src/subdir.mk
@@ -1,11 +1,11 @@
 # Add inputs and outputs from these tool invocations to the build variables 
-CC := gcc
+CC := g++
 
 C_SRCS += \
-../src/dhcp_device.c \
-../src/dhcp_devman.c \
-../src/dhcp_mon.c \
-../src/main.c 
+../src/dhcp_device.cpp \
+../src/dhcp_devman.cpp \
+../src/dhcp_mon.cpp \
+../src/main.cpp 
 
 OBJS += \
 ./src/dhcp_device.o \
@@ -21,9 +21,9 @@ C_DEPS += \
 
 
 # Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.c
+src/%.o: src/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	$(CC) -O3 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	$(CC) -O3 -g3 -Wall -I$(PWD)/../sonic-swss-common/common -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '

From c4927e0e68407fa29dd29abb32128099d85ac143 Mon Sep 17 00:00:00 2001
From: Taylor Cai <103631396+cel-taylor@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:14:13 +0800
Subject: [PATCH 1301/1674] [device/celestica]:Fix failed test case of Seastone
 snmp  (#11430)

* Update psu.py
* Update thermal.py
---
 .../celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py  | 2 +-
 .../x86_64-cel_seastone-r0/sonic_platform/thermal.py        | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
index da365dff59ab..7dd647be4e2c 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
@@ -408,7 +408,7 @@ def get_position_in_parent(self):
         Returns:
             integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
         """
-        return -1
+        return self.index + 1
 
     def is_replaceable(self):
         """
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
index c605a28d220c..4b584a6db97f 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/thermal.py
@@ -307,8 +307,6 @@ def get_position_in_parent(self):
         """
         Retrieves the thermal position information
         Returns:
-            A int value, 0 represent ASIC thermal, 1 represent CPU thermal info
+            A int value, index of thermal
         """
-        if self.postion == "cpu":
-            return 1
-        return 0
+        return self.index + 1

From 14f67b130da81f8545c67c85b5266970007fece4 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 28 Jul 2022 00:58:04 +0800
Subject: [PATCH 1302/1674] [ci] Fix some not sai package removed issue
 (#11544)

Only replace the file name starts with "cisco-".
---
 .azure-pipelines/official-build-cisco-8000.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
index 474d3e743ff7..7ec7430fc3ad 100644
--- a/.azure-pipelines/official-build-cisco-8000.yml
+++ b/.azure-pipelines/official-build-cisco-8000.yml
@@ -83,7 +83,7 @@ stages:
           fi
           cd $(dirname $filename)
           echo "PWD=$(pwd)"
-          ls -l *.deb
+          ls -l cisco-*.deb
           while read -r package; do
             # Cisco version format: <VERSION>-sai-<sai-ver>-<distribution>-<COMMIT HASH>
             # The <sai-ver> may contain several values in one build, the part is skipped when publishing to storage
@@ -93,7 +93,7 @@ stages:
             package_url="$PACKAGE_URL/sai/ciscosai/master/$version/$package"
             echo "Override package $package from $package_url"
             wget "$package_url$StorageSASKey" -O "$package"
-          done < <(ls *.deb)
+          done < <(ls cisco-*.deb)
         env:
           StorageSASKey: $(StorageSASKey)
         condition: ne(variables['Build.Reason'], 'PullRequest')

From a40aca43b98f7fe707c4a154a0010fe5518507a0 Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Thu, 28 Jul 2022 02:18:36 +0300
Subject: [PATCH 1303/1674] [memory_checker] Do not check memory usage of
 containers if docker daemon is not running (#11476)

Fix in Monit memory_checker plugin. Skip fetching running containers if docker engine is down (can happen in deinit).
This PR fixes issue #11472.

Signed-off-by: liora liora@nvidia.com

Why I did it
In the case where Monit runs during deinit flow, memory_checker plugin is fetching the running containers without checking if Docker service is still running. I added this check.

How I did it
Use systemctl is-active to check if Docker engine is still running.

How to verify it
Use systemctl to stop docker engine and reload Monit, no errors in log and relevant print appears in log.

Which release branch to backport (provide reason below if selected)
The fix is required in 202205 and 202012 since the PR that introduced the issue was cherry picked to those branches (#11129).
---
 files/image_config/monit/memory_checker | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/files/image_config/monit/memory_checker b/files/image_config/monit/memory_checker
index dfe270e79524..a93bc30b3fe4 100755
--- a/files/image_config/monit/memory_checker
+++ b/files/image_config/monit/memory_checker
@@ -96,6 +96,19 @@ def check_memory_usage(container_name, threshold_value):
         sys.exit(4)
 
 
+def is_service_active(service_name):
+    """Test if service is running.
+
+    Args:
+        service_name: A string contains the service name
+
+    Returns:
+        True if service is running, False otherwise
+    """
+    status = subprocess.run("systemctl is-active --quiet {}".format(service_name), shell=True, check=False)
+    return status.returncode == 0
+
+
 def get_running_container_names():
     """Retrieves names of running containers by talking to the docker daemon.
 
@@ -128,6 +141,12 @@ def main():
     parser.add_argument("threshold_value", type=int, help="threshold value in bytes")
     args = parser.parse_args()
 
+    if not is_service_active("docker"):
+        syslog.syslog(syslog.LOG_INFO,
+                      "[memory_checker] Exits without checking memory usage of container '{}' since docker daemon is not running!"
+                      .format(args.container_name))
+        sys.exit(0)
+
     running_container_names = get_running_container_names()
     if args.container_name in running_container_names:
         check_memory_usage(args.container_name, args.threshold_value)

From de00b87161aa50e0496a682e4f16a5691fc38d37 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 28 Jul 2022 15:32:26 +0800
Subject: [PATCH 1304/1674] [ci] Transfer organization from Azure to sonic-net
 for sonic-mgmt (#11559) (#11563)

Why I did it
Transfer organization from Azure to sonic-net for sonic-mgmt
---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a7971f148d49..8b8beb9031a4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,8 +27,8 @@ resources:
   repositories:
   - repository: sonic-mgmt
     type: github
-    name: Azure/sonic-mgmt
-    endpoint: build
+    name: sonic-net/sonic-mgmt
+    endpoint: sonic-net
     ref: refs/heads/202012
   - repository: buildimage
     type: github

From b1e0578177199951900c717ad21ad81db3554332 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Fri, 29 Jul 2022 02:08:10 +0300
Subject: [PATCH 1305/1674] [202012][submodule] Update sonic-platform-daemons
 submodule (#11500)

Update sonic-platform-daemons submodule pointer to include the following:
* [chassisd] Add script to initialize chassis info in STATE_DB ([#183](https://github.com/Azure/sonic-platform-daemons/pull/183))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 6a315aee78bb..7bef6af28cfc 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 6a315aee78bbca9fd74abdae7b3c4cc53b98f14f
+Subproject commit 7bef6af28cfc2da032941329e8e11856841aca46

From 193f1508bc0ba8078fa968103fd3b1929b2f1eda Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Fri, 29 Jul 2022 07:42:10 +0300
Subject: [PATCH 1306/1674] [202012][submodule] Update sonic-utilities
 submodule (#11515)

Update sonic-utilities submodule pointer to include the following:
* Fix test for pfcwd_sw_enable in db_migrator_test ([#2252](https://github.com/Azure/sonic-utilities/pull/2252))
* [DHCPv6] [202012] Update the dhcpv6_relay config/show cli ([#2271](https://github.com/Azure/sonic-utilities/pull/2271))
* [vnet_route_check] Align DB data parse logic with format used by swsscommon API ([#2268](https://github.com/Azure/sonic-utilities/pull/2268))
* [202012] [generate_dump] allow to extend dump with plugin scripts ([#2269](https://github.com/Azure/sonic-utilities/pull/2269))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index ecca18ffb4fb..3f88fa4a7497 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ecca18ffb4fbf7e9041984585d5e0c026c1e3422
+Subproject commit 3f88fa4a7497a7c9ac3cedf7caed3a3bf9880cfb

From 3e41a4bd866fe7666b87625b676332e80e150691 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Fri, 29 Jul 2022 18:39:40 +0300
Subject: [PATCH 1307/1674] [202012][submodule] Update sonic-linux-kernel
 submodule (#11462)

- Why I did it
Update sonic-linux-kernel submodule pointer to include the following:

add new kernel patch come with hw-mgmt 7.0010.2348 (#285)

- How I did it
Update sonic-linux-kernel submodule pointer

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-linux-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index bc4ae910d657..01e55081d875 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit bc4ae910d657602a5f954dd53d2eafb3be8ebb81
+Subproject commit 01e55081d87550db52f6abd7ee10074ca0f68147

From c40435c94c891265dc9d3ab5835f290063c4e13a Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Fri, 29 Jul 2022 23:41:44 +0800
Subject: [PATCH 1308/1674] [202012] [Mellanox] Add new sensor conf to support
 SN4410 A1 system (#8379) (#11530)

- Why I did it
New SN410 A1 system has a different sensor layout with A0 system, needs a new sensor conf file to support it.

- How I did it
Since the SN4410 A1 system use exactly the same sensor layout as the SN4700 A1 system, so add a symbol link linking to the SN4700 A1 sensor conf file to reuse.

- How to verify it
Run sensor test against the SN4410 A1 system;
Run platform related regression test against the SN4410 A1 system
---
 device/mellanox/x86_64-mlnx_msn4410-r0/get_sensors_conf_path | 1 +
 device/mellanox/x86_64-mlnx_msn4410-r0/sensors.conf.a1       | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 device/mellanox/x86_64-mlnx_msn4410-r0/get_sensors_conf_path
 create mode 120000 device/mellanox/x86_64-mlnx_msn4410-r0/sensors.conf.a1

diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4410-r0/get_sensors_conf_path
new file mode 120000
index 000000000000..f1509a1e1d3d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/get_sensors_conf_path
@@ -0,0 +1 @@
+../x86_64-mlnx_msn4700-r0/get_sensors_conf_path
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/sensors.conf.a1 b/device/mellanox/x86_64-mlnx_msn4410-r0/sensors.conf.a1
new file mode 120000
index 000000000000..4605d556f315
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4410-r0/sensors.conf.a1
@@ -0,0 +1 @@
+../x86_64-mlnx_msn4700-r0/sensors.conf.a1
\ No newline at end of file

From c5a57342427c73c1f705b9a57a37c35a70d158e2 Mon Sep 17 00:00:00 2001
From: Nikola Dancejic <26731235+Ndancejic@users.noreply.github.com>
Date: Fri, 29 Jul 2022 09:37:09 -0700
Subject: [PATCH 1309/1674] [swss] Adding bgp container as dependent of swss
 (#11168)

What I did:
Added bgp as a dependent of swss

Why I did it:
bgp container was not restarting on swss crash. When swss crashes, linkmgrd
doesn't initate a switchover because it cannot access the default route from
orchagent. Bringing down bgp with swss will isolate the ToR, causing linkmgrd
to initiate a switchover to the peer ToR avoiding significant packet loss.

Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
---
 files/scripts/swss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 48c0f7621566..d2e7fdbc297c 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEPENDENT="radv dhcp_relay"
+DEPENDENT="radv dhcp_relay bgp"
 MULTI_INST_DEPENDENT="teamd"
 
 function debug()

From 84a8bad8213787b72cd2f4154724740af67ddf66 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:09:12 -0700
Subject: [PATCH 1310/1674] [202012][prtest] use matching sonic-mgmt branch for
 202012 branch PR tests (#11575)

Why I did it
202012 PR test is failing due to some recent change in sonic-mgmt master branch.

How I did it
Use matching sonic-mgmt branch to run 202012 branch PR tests.

How to verify it
this PR test.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 .azure-pipelines/run-test-template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/run-test-template.yml b/.azure-pipelines/run-test-template.yml
index 8b41023824ed..3e6d975594b1 100644
--- a/.azure-pipelines/run-test-template.yml
+++ b/.azure-pipelines/run-test-template.yml
@@ -14,7 +14,7 @@ parameters:
 steps:
 - checkout: self
   clean: true
-  displayName: 'checkout sonic-mgmt repo'
+  displayName: 'checkout sonic-buildimage repo'
 
 - task: DownloadPipelineArtifact@2
   inputs:
@@ -31,7 +31,7 @@ steps:
 
     pushd /data/sonic-mgmt
     git remote update
-    git reset --hard origin/master
+    git reset --hard origin/202012
     sed -i s/use_own_value/${username}/ ansible/veos_vtb
     echo aaa > ansible/password.txt
     docker exec sonic-mgmt bash -c "pushd /data/sonic-mgmt/ansible;./testbed-cli.sh -d /data/sonic-vm -m $(inventory) -t $(testbed_file) -k ceos refresh-dut ${{ parameters.tbname }} password.txt" && sleep 180

From 44ecff11546fab67ea0f3708256a708c44be27be Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Mon, 1 Aug 2022 09:27:49 +0800
Subject: [PATCH 1311/1674] Support queue 7 in dual ToR scenario (#11570)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
---
 .../buffers_defaults_objects.j2               | 12 +++
 .../py3/buffers-mellanox4600c-t1-dynamic.json | 88 +++++++++----------
 .../py3/buffers-mellanox4600c-t1.json         | 88 +++++++++----------
 3 files changed, 100 insertions(+), 88 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
index e8d4133ee669..7760bfc6189a 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
@@ -143,7 +143,11 @@
 {% endfor %}
 {% for port in port_names_active.split(',') %}
 {% if port not in port_names_extra_queues.split(',') %}
+{% if port_names_extra_queues|length > 0 %}
+        "{{ port }}|5-7": {
+{% else %}
         "{{ port }}|5-6": {
+{% endif %}
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         }{% if not loop.last %},{% endif %}
 
@@ -187,7 +191,11 @@
         },
 {% endfor %}
 {% for port in port_names_inactive.split(',') %}
+{% if port_names_extra_queues|length > 0 %}
+        "{{ port }}|5-7": {
+{% else %}
         "{{ port }}|5-6": {
+{% endif %}
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         }{% if not loop.last %},{% endif %}
 
@@ -204,7 +212,11 @@
         },
 {% endfor %}
 {% for port in port_names_inactive.split(',') %}
+{% if port_names_extra_queues|length > 0 %}
+        "{{ port }}|5-7": {
+{% else %}
         "{{ port }}|5-6": {
+{% endif %}
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         }{% if not loop.last %},{% endif %}
 
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
index 38b865b81a9a..21ab1aac0aeb 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1-dynamic.json
@@ -997,28 +997,28 @@
         "Ethernet84|0-2": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet0|5-6": {
+        "Ethernet0|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet4|5-6": {
+        "Ethernet4|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet16|5-6": {
+        "Ethernet16|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet20|5-6": {
+        "Ethernet20|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet64|5-6": {
+        "Ethernet64|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet68|5-6": {
+        "Ethernet68|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet80|5-6": {
+        "Ethernet80|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet84|5-6": {
+        "Ethernet84|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
         "Ethernet136|0-1": {
@@ -1538,112 +1538,112 @@
         "Ethernet236|0-2": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet8|5-6": {
+        "Ethernet8|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet12|5-6": {
+        "Ethernet12|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet24|5-6": {
+        "Ethernet24|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet28|5-6": {
+        "Ethernet28|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet32|5-6": {
+        "Ethernet32|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet36|5-6": {
+        "Ethernet36|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet40|5-6": {
+        "Ethernet40|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet44|5-6": {
+        "Ethernet44|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet48|5-6": {
+        "Ethernet48|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet52|5-6": {
+        "Ethernet52|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet56|5-6": {
+        "Ethernet56|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet60|5-6": {
+        "Ethernet60|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet72|5-6": {
+        "Ethernet72|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet76|5-6": {
+        "Ethernet76|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet88|5-6": {
+        "Ethernet88|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet92|5-6": {
+        "Ethernet92|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet96|5-6": {
+        "Ethernet96|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet100|5-6": {
+        "Ethernet100|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet104|5-6": {
+        "Ethernet104|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet108|5-6": {
+        "Ethernet108|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet112|5-6": {
+        "Ethernet112|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet116|5-6": {
+        "Ethernet116|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet120|5-6": {
+        "Ethernet120|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet124|5-6": {
+        "Ethernet124|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet128|5-6": {
+        "Ethernet128|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet132|5-6": {
+        "Ethernet132|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet140|5-6": {
+        "Ethernet140|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet160|5-6": {
+        "Ethernet160|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet164|5-6": {
+        "Ethernet164|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet172|5-6": {
+        "Ethernet172|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet192|5-6": {
+        "Ethernet192|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet196|5-6": {
+        "Ethernet196|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet204|5-6": {
+        "Ethernet204|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet224|5-6": {
+        "Ethernet224|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet228|5-6": {
+        "Ethernet228|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet236|5-6": {
+        "Ethernet236|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         }
     }
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
index fd9d75f31313..adef78b44e2a 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox4600c-t1.json
@@ -773,28 +773,28 @@
         "Ethernet84|0-2": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet0|5-6": {
+        "Ethernet0|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet4|5-6": {
+        "Ethernet4|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet16|5-6": {
+        "Ethernet16|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet20|5-6": {
+        "Ethernet20|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet64|5-6": {
+        "Ethernet64|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet68|5-6": {
+        "Ethernet68|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet80|5-6": {
+        "Ethernet80|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
-        "Ethernet84|5-6": {
+        "Ethernet84|5-7": {
             "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
         },
         "Ethernet136|0-1": {
@@ -1314,112 +1314,112 @@
         "Ethernet236|0-2": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet8|5-6": {
+        "Ethernet8|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet12|5-6": {
+        "Ethernet12|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet24|5-6": {
+        "Ethernet24|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet28|5-6": {
+        "Ethernet28|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet32|5-6": {
+        "Ethernet32|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet36|5-6": {
+        "Ethernet36|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet40|5-6": {
+        "Ethernet40|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet44|5-6": {
+        "Ethernet44|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet48|5-6": {
+        "Ethernet48|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet52|5-6": {
+        "Ethernet52|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet56|5-6": {
+        "Ethernet56|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet60|5-6": {
+        "Ethernet60|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet72|5-6": {
+        "Ethernet72|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet76|5-6": {
+        "Ethernet76|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet88|5-6": {
+        "Ethernet88|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet92|5-6": {
+        "Ethernet92|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet96|5-6": {
+        "Ethernet96|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet100|5-6": {
+        "Ethernet100|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet104|5-6": {
+        "Ethernet104|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet108|5-6": {
+        "Ethernet108|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet112|5-6": {
+        "Ethernet112|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet116|5-6": {
+        "Ethernet116|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet120|5-6": {
+        "Ethernet120|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet124|5-6": {
+        "Ethernet124|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet128|5-6": {
+        "Ethernet128|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet132|5-6": {
+        "Ethernet132|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet140|5-6": {
+        "Ethernet140|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet160|5-6": {
+        "Ethernet160|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet164|5-6": {
+        "Ethernet164|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet172|5-6": {
+        "Ethernet172|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet192|5-6": {
+        "Ethernet192|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet196|5-6": {
+        "Ethernet196|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet204|5-6": {
+        "Ethernet204|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet224|5-6": {
+        "Ethernet224|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet228|5-6": {
+        "Ethernet228|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         },
-        "Ethernet236|5-6": {
+        "Ethernet236|5-7": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]"
         }
     }

From 84aca008479fe678a6264324e57b1dbadda6bdc8 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Mon, 1 Aug 2022 23:59:45 +0800
Subject: [PATCH 1312/1674] [202012]Support different `DSCP_TO_TC_MAP` for T1
 in dualtor deployment (#11580)

Why I did it
This PR is to backport #11569 into 202012 branch.
This PR is to apply different DSCP_TO_TC_MAP to downlink and uplink ports on T1 in dualtor deployment.
For T1 downlink ports (To T0)
The DSCP_TO_TC_MAP is not changed. DSCP2 and DSCP6 are mapped to TC2 and TC6 respectively.
For T1 uplink ports (To T1)
A new DSCP_TO_TC_MAP|AZURE_UPLINK is defined and applied. DSCP2 and DSCP6 are mapped to TC1 to avoid mixing up lossy and lossless traffic from T2.
The extra lossy PG2 and PG6 added in PR #11157 is reverted as well because no traffic from T2 is mapped to PG2 or PG6 now.

How I did it
Define a new map DSCP_TO_TC_MAP|AZURE_UPLINK for 7260 T1.

How to verify it
Verified by test case in test_j2files.py.
---
 .../Arista-7260CX3-C64/buffers_extra_pgs.j2   | 20 -----
 .../Arista-7260CX3-Q64/buffers_extra_pgs.j2   |  1 -
 .../th2/7260/BALANCED/buffers_defaults_t1.j2  |  4 -
 .../profiles/th2/7260/BALANCED/qos.json.j2    | 67 +++++++++++++++
 .../7260/RDMA-CENTRIC/buffers_defaults_t1.j2  |  5 +-
 .../th2/7260/RDMA-CENTRIC/qos.json.j2         | 66 +++++++++++++++
 files/build_templates/buffers_config.j2       |  4 -
 .../py3/buffer-arista7260-t1.json             | 48 -----------
 .../sample_output/py3/qos-arista7260-t1.json  | 82 +++++++++++++++++--
 9 files changed, 208 insertions(+), 89 deletions(-)
 delete mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
 delete mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
deleted file mode 100644
index f827095cd954..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' %}
-{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pg) %}
-    "BUFFER_PG": {
-{% for port in port_names.split(',') %}
-{% if port not in port_names_require_no_extra_pg.split(',') %}
-        "{{ port }}|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "{{ port }}|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-{% endif %}
-        "{{ port }}|0": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        }{% if not loop.last %},{% endif %}
-
-{% endfor %}
-    },
-{% endmacro %}
-{% endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2
deleted file mode 120000
index 7dfb03cbc9d0..000000000000
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2
+++ /dev/null
@@ -1 +0,0 @@
-../Arista-7260CX3-C64/buffers_extra_pgs.j2
\ No newline at end of file
diff --git a/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
index bc1ca774a98e..c2e4292dbd8a 100644
--- a/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
+++ b/device/common/profiles/th2/7260/BALANCED/buffers_defaults_t1.j2
@@ -51,11 +51,7 @@
 {%- endmacro %}
 
 {% import 'buffers_extra_queues.j2' as defs1 with context %}
-{% import 'buffers_extra_pgs.j2' as defs2 with context %}
 
 {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
 {{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
 {%- endmacro %}
-{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
-{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
-{%- endmacro %}
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
index d760038736a6..68daa8ee92f0 100644
--- a/device/common/profiles/th2/7260/BALANCED/qos.json.j2
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -1,4 +1,5 @@
 {% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{% set different_dscp_to_tc_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -66,6 +67,72 @@
             "61": "1",
             "62": "1",
             "63": "1"
+        },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
         }
     },
 {%- endmacro %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
index bc1ca774a98e..0867c03b2497 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -51,11 +51,8 @@
 {%- endmacro %}
 
 {% import 'buffers_extra_queues.j2' as defs1 with context %}
-{% import 'buffers_extra_pgs.j2' as defs2 with context %}
 
 {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
 {{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
 {%- endmacro %}
-{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
-{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
-{%- endmacro %}
+
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
index d760038736a6..faf682d3c176 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -66,6 +66,72 @@
             "61": "1",
             "62": "1",
             "63": "1"
+        },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
         }
     },
 {%- endmacro %}
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 2089b0e01ed0..5e6f2a3ca4d1 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -171,10 +171,6 @@ def
 {{ defs.generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }},
 {% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
 {{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
-{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs is defined) and (port_names_extra_queues != '') %}
-{{ defs.generate_pg_buffers_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }}
-{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
-{{ defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
 {% elif defs.generate_pg_profils is defined %}
 {{ defs.generate_pg_profils(port_names_active) }}
 {% else %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
index 5ae6e6205a2d..ecaa1a88db48 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
@@ -112,21 +112,9 @@
         "Ethernet0|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet0|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet0|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet4|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet4|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet4|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet144|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -136,21 +124,9 @@
         "Ethernet16|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet16|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet16|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet20|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet20|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet20|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet152|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -160,21 +136,9 @@
         "Ethernet64|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet64|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet64|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet68|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet68|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet68|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet168|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
@@ -184,21 +148,9 @@
         "Ethernet80|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet80|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet80|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet84|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
-        "Ethernet84|2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet84|6": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
         "Ethernet180|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
index 7196d22c2f2d..34f745f19624 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -89,6 +89,72 @@
             "61": "1",
             "62": "1",
             "63": "1"
+        },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "1",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
         }
     },
     "TC_TO_PRIORITY_GROUP_MAP": {
@@ -118,7 +184,7 @@
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
         },
         "Ethernet0": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -126,7 +192,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet4": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -134,7 +200,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet16": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -142,7 +208,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet20": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -150,7 +216,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -158,7 +224,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -166,7 +232,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet80": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
@@ -174,7 +240,7 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet84": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",

From 1e812cd990a995bf7325b701c96324ba345db9b3 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 2 Aug 2022 16:22:26 +0800
Subject: [PATCH 1313/1674] [ci] Update azp reference to support transfering
 organization from Azure to sonic-net (#11605)

Why I did it
When transfer repo to another organization, azp reference also need change.
Change azp reference to avoid pipeline failure.
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 4 ++--
 .azure-pipelines/build-commonlib.yml                | 4 ++--
 .azure-pipelines/docker-sonic-slave-template.yml    | 4 ++--
 .azure-pipelines/official-build.yml                 | 4 ++--
 azure-pipelines.yml                                 | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index b36cc3513aa6..70afd6d4c04c 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -18,9 +18,9 @@ resources:
   repositories:
   - repository: buildimage
     type: github
-    name: Azure/sonic-buildimage
+    name: sonic-net/sonic-buildimage
     ref: master
-    endpoint: build
+    endpoint: sonic-net
 
 pool: sonicbld
 
diff --git a/.azure-pipelines/build-commonlib.yml b/.azure-pipelines/build-commonlib.yml
index df9bcb25ae70..a36adc625d71 100644
--- a/.azure-pipelines/build-commonlib.yml
+++ b/.azure-pipelines/build-commonlib.yml
@@ -11,9 +11,9 @@ resources:
   repositories:
   - repository: buildimage
     type: github
-    name: Azure/sonic-buildimage
+    name: sonic-net/sonic-buildimage
     ref: master
-    endpoint: build
+    endpoint: sonic-net
 
 jobs:
 - template: .azure-pipelines/template-commonlib.yml@buildimage
diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
index a3d2d17dd00a..4481818c37d4 100644
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -7,9 +7,9 @@ resources:
   repositories:
   - repository: buildimage
     type: github
-    name: Azure/sonic-buildimage
+    name: sonic-net/sonic-buildimage
     ref: master
-    endpoint: build
+    endpoint: sonic-net
 
 parameters:
 - name: arch
diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index 6282a463ea6e..2e96d2899e71 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -16,9 +16,9 @@ resources:
   repositories:
   - repository: buildimage
     type: github
-    name: Azure/sonic-buildimage
+    name: sonic-net/sonic-buildimage
     ref: master
-    endpoint: build
+    endpoint: sonic-net
 
 trigger: none
 pr: none
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8b8beb9031a4..eef7f93a3db1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,8 +32,8 @@ resources:
     ref: refs/heads/202012
   - repository: buildimage
     type: github
-    name: Azure/sonic-buildimage
-    endpoint: build
+    name: sonic-net/sonic-buildimage
+    endpoint: sonic-net
     ref: master
 
 variables:

From 56ea6d9b62c423a8a72938722c940cf6e5dd1818 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 2 Aug 2022 13:49:51 -0700
Subject: [PATCH 1314/1674] [submodule advance] Advance sonic-utilities to
 include warmboot fix (#11558)

To include latest warmboot fixes:

[202012] [cherry-pick] Update db_migrator to support `PORT_QOS_MAP|gl (sonic-net/sonic-utilities/pull/2215)
[202012] Migrate missed config on cross branch warm upgrade to 202012 (sonic-net/sonic-utilities#2277)
[202012] Add db_migrator_constants.py script to setup.py (sonic-net/sonic-utilities#2287)
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 3f88fa4a7497..6da339c49bfb 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 3f88fa4a7497a7c9ac3cedf7caed3a3bf9880cfb
+Subproject commit 6da339c49bfb52cb60891df61b3ed595dd81ef5f

From 8bb38639e55fadcc67faf280f9c8a791d09acde6 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Wed, 3 Aug 2022 13:22:38 +0800
Subject: [PATCH 1315/1674] [202012][sonic-sairedis]Update sonic-sairedis
 submodule (#11486)

Remove duplicate cisco-8000 functions and call to those functions (#1077)
Support For CISCO debug-shell in syncd-container (#1070)
Fix submodule SAI branch name (#1031)

Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index bd4b1b5117a6..de5c23534d50 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit bd4b1b5117a67a22efbf103094b091e0bb8742df
+Subproject commit de5c23534d50fcc21d8b89c90632efb8c4351f88

From 663bf00c226e349776551c0c4a24df32f9bf8883 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 5 Aug 2022 11:33:37 -0700
Subject: [PATCH 1316/1674] [swss]: Run tunnel_pkt_handler on dualtor only
 (#11626)

At SWSS docker init time, check the device subtype and enable tunnel packet handler only if it is dualtor

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-orchagent/Dockerfile.j2              |  2 +-
 dockers/docker-orchagent/docker-init.sh             |  5 +++++
 dockers/docker-orchagent/supervisord.conf           | 10 ----------
 dockers/docker-orchagent/tunnel_packet_handler.conf |  9 +++++++++
 4 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 dockers/docker-orchagent/tunnel_packet_handler.conf

diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 5734d3fd18fb..88041718ea70 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -74,7 +74,7 @@ RUN apt-get purge -y          \
 
 COPY ["files/arp_update", "/usr/bin"]
 COPY ["arp_update.conf", "files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
-COPY ["ndppd.conf", "/usr/share/sonic/templates/"]
+COPY ["ndppd.conf", "tunnel_packet_handler.conf", "/usr/share/sonic/templates/"]
 COPY ["enable_counters.py", "tunnel_packet_handler.py", "/usr/bin/"]
 COPY ["docker-init.sh", "orchagent.sh", "swssconfig.sh", "buffermgrd.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
diff --git a/dockers/docker-orchagent/docker-init.sh b/dockers/docker-orchagent/docker-init.sh
index 5dc5f2df25c2..fb042e21cf1c 100755
--- a/dockers/docker-orchagent/docker-init.sh
+++ b/dockers/docker-orchagent/docker-init.sh
@@ -13,6 +13,7 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/wait_for_link.sh.j2,/usr/bin/wait_for_link.sh \
 "
 VLAN=$(sonic-cfggen $CFGGEN_PARAMS)
+SUBTYPE=$(sonic-cfggen -d -v "DEVICE_METADATA['localhost']['subtype']")
 
 chmod +x /usr/bin/wait_for_link.sh
 
@@ -27,4 +28,8 @@ if [ "$VLAN" != "" ]; then
     cp /usr/share/sonic/templates/ndppd.conf /etc/supervisor/conf.d/
 fi
 
+if [ "$SUBTYPE" == "DualToR" ]; then
+    cp /usr/share/sonic/templates/tunnel_packet_handler.conf /etc/supervisor/conf.d/
+fi
+
 exec /usr/local/bin/supervisord
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index d0264e7c5d5a..2c3d05999a9c 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -205,13 +205,3 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=swssconfig:exited
-
-[program:tunnel_packet_handler]
-command=/usr/bin/tunnel_packet_handler.py
-priority=12
-autostart=false
-autorestart=unexpected
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=swssconfig:exited
diff --git a/dockers/docker-orchagent/tunnel_packet_handler.conf b/dockers/docker-orchagent/tunnel_packet_handler.conf
new file mode 100644
index 000000000000..aa6f3d2f3380
--- /dev/null
+++ b/dockers/docker-orchagent/tunnel_packet_handler.conf
@@ -0,0 +1,9 @@
+[program:tunnel_packet_handler]
+command=/usr/bin/tunnel_packet_handler.py
+priority=12
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited

From 6d66d9b8fc638100245a94be96e2c8efe14922c9 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Sat, 6 Aug 2022 10:05:45 +0530
Subject: [PATCH 1317/1674] Revert "Add load_minigraph option to include
 traffic-shift-away during config migration (#11403)" (#11625)

This reverts commit 6c2f99a32766f0cb3f0fbfad24c50f8ee6290e7a.
---
 files/image_config/config-setup/config-setup | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index d80627f5f01e..de39586fd4f8 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -109,15 +109,7 @@ run_hookdir() {
 reload_minigraph()
 {
     echo "Reloading minigraph..."
-    if
-    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]] ||
-    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.type | tr [:upper:] [:lower:])" == *"leafrouter"* ]];
-    then
-        #Keep device isolated with traffic-shift-away option on LeafRouter and Dualtor
-        config load_minigraph -y -n -t
-    else
-        config load_minigraph -y -n
-    fi
+    config load_minigraph -y -n 
     config save -y
 }
 

From 04ba6da1abb8d20a5ab6a8fbf04b91ad60116c91 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 5 Aug 2022 23:30:04 -0700
Subject: [PATCH 1318/1674] [202012][arp_update]: Resolve failed neighbors on
 dualtor (#11641)

In arp_update, check for FAILED or INCOMPLETE kernel neighbor entries and manually ping them to try and resolve the neighbor

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/arp_update | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index e7f083e20d27..f8704c582b6b 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -26,6 +26,7 @@ while /bin/true; do
   done
 
   VLAN=$(echo $ARP_UPDATE_VARS | jq -r '.vlan')
+  SUBTYPE=$(sonic-db-cli CONFIG_DB hget 'DEVICE_METADATA|localhost' 'subtype' | tr '[:upper:]' '[:lower:]')
   for vlan in $VLAN; do
       # generate a list of arping commands:
       #   arping -q -w 0 -c 1 -i <VLAN interface> <IP 1>;
@@ -47,7 +48,26 @@ while /bin/true; do
       ndisc6cmd="sed -e 's/^/ndisc6 -q -w 0 -1 /' -e 's/$/;/'"
       ip6cmd="ip -6 neigh show | grep -v fe80 | grep $vlan | cut -d ' ' -f 1,3 | $ndisc6cmd"
       eval `eval $ip6cmd`
+ 
+      if [[ $SUBTYPE == "dualtor" ]]; then
+        # on dual ToR devices, try to resolve failed neighbor entries since
+        # these entries will have tunnel routes installed, preventing normal 
+        # neighbor resolution (SWSS PR #2137)
+
+        # since ndisc6 is a userland process, the above ndisc6 commands are 
+        # insufficient to update the kernel neighbor table for failed entries
+
+        # we don't need to do this for ipv4 neighbors since arping is able to
+        # update the kernel neighbor table
+
+        # generates the following command for each failed or incomplete IPv6 neighbor
+        # timeout 0.2 ping <neighbor IPv6> -n -q -i 0 -c 1 -W 1 -I <VLAN name> >/dev/null
+        ping6_template="sed -e 's/^/timeout 0.2 ping /' -e 's/,/ -n -q -i 0 -c 1 -W 1 -I /' -e 's/$/ >\/dev\/null;/'"
+        failed_ip6_neigh_cmd="ip -6 neigh show | grep -v fe80 | grep $vlan | grep -E 'FAILED|INCOMPLETE' | cut -d ' ' -f 1,3 --output-delimiter=',' | $ping6_template"
+        eval `eval $failed_ip6_neigh_cmd`
+      fi
   done
+  
 
   # sleep here before handling the mismatch as it is not required during startup
   sleep 300

From 14f93e15c658452109f87f9ab33eabbc88c7c1d8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 7 Aug 2022 11:27:16 +0800
Subject: [PATCH 1319/1674] [ci/build]: Upgrade SONiC package versions (#11629)

Why I did it
Upgrade SONiC Versions
---
 .../versions-deb-buster                       | 38 +++++++++----------
 .../build-sonic-slave-buster/versions-git     |  2 +-
 .../build-sonic-slave-buster/versions-web     |  1 -
 files/build/versions/default/versions-docker  | 12 +++---
 files/build/versions/default/versions-git     |  6 +--
 files/build/versions/default/versions-web     |  7 ++--
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../versions-deb-buster                       | 18 ++++-----
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  | 15 ++++----
 .../versions-py3-all-arm64                    |  1 -
 .../versions-py3-all-armhf                    |  1 -
 .../docker-sonic-vs/versions-deb-buster       |  1 -
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-invm/versions-deb-buster     |  4 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 38 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../sonic-slave-buster/versions-deb-buster    |  9 ++---
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   |  6 +--
 files/build/versions/host-image/versions-py3  |  4 +-
 27 files changed, 91 insertions(+), 96 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index d1ed4d09403a..cee663358b9e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.5.2262
-applibs-dev==1.mlnx.4.5.2262
+applibs==1.mlnx.4.5.2318
+applibs-dev==1.mlnx.4.5.2318
 bfnplatform==1.0.0
-innovium-sai==0.107.5
-innovium-sai-headers==0.107.5
-iproute2-dev==1.mlnx.4.5.2262
+innovium-sai==0.107.6
+innovium-sai-headers==0.107.6
+iproute2-dev==1.mlnx.4.5.2318
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -55,20 +55,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.5.2262
-sx-acl-helper-dev==1.mlnx.4.5.2262
-sx-complib==1.mlnx.4.5.2262
-sx-complib-dev==1.mlnx.4.5.2262
-sx-examples==1.mlnx.4.5.2262
-sx-examples-dev==1.mlnx.4.5.2262
-sx-gen-utils==1.mlnx.4.5.2262
-sx-gen-utils-dev==1.mlnx.4.5.2262
-sx-scew==1.mlnx.4.5.2262
-sx-scew-dev==1.mlnx.4.5.2262
-sxd-libs==1.mlnx.4.5.2262
-sxd-libs-dev==1.mlnx.4.5.2262
+sx-acl-helper==1.mlnx.4.5.2318
+sx-acl-helper-dev==1.mlnx.4.5.2318
+sx-complib==1.mlnx.4.5.2318
+sx-complib-dev==1.mlnx.4.5.2318
+sx-examples==1.mlnx.4.5.2318
+sx-examples-dev==1.mlnx.4.5.2318
+sx-gen-utils==1.mlnx.4.5.2318
+sx-gen-utils-dev==1.mlnx.4.5.2318
+sx-scew==1.mlnx.4.5.2318
+sx-scew-dev==1.mlnx.4.5.2318
+sxd-libs==1.mlnx.4.5.2318
+sxd-libs-dev==1.mlnx.4.5.2318
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.5.2262
-wjh-libs-dev==1.mlnx.4.5.2262
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2318
+wjh-libs-dev==1.mlnx.4.5.2318
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 67d6f424e2b2..fe95b3f00311 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,4 +1,4 @@
-https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
+https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 3d6d31fad210..a862938939ca 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -11,7 +11,6 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 4b545d5d71d3..e22333a98bd9 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:0e328f15f5cb0f93bff52a37d98f0bbfc40f97fcaf250096fd2b2c6871a497eb
+amd64:amd64/debian:buster==sha256:7e1f93236be2e4a04a2b83e7fda8c0186e72e4c1e8cc830e097710ccc71d2dcf
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+amd64:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:e774922f3043b6564c6719a7ec32f25d4b70304eff9dbd725161d4033cf38038
-arm64:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+arm64:arm64v8/debian:buster==sha256:d0f5ed350e7624e19f0f40c2c0cc31b0b2811f444ca929a083fefe449432333d
+arm64:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:27ab779c4d59ead815ff584f2e41b34a6b261db358b4cdfe664b8bfa1f494ae8
-armhf:debian:buster==sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e
+armhf:arm32v7/debian:buster==sha256:1f7bef58f2040ee2d97c1f40eb5ff29f8c2aa51eeaa90931ac11e7c6680103aa
+armhf:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index dfc065b4da52..d2709c2917ea 100644
--- 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==d22bf607218d50bf20444b0610f62b265f829dbc
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==811ea056edb7a8d0d6defa6bbc9f2330c4dfabff
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7
+https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
-https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4
+https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 6adf222a46ae..8b638e27a593 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -16,7 +16,6 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
-https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3
@@ -28,9 +27,9 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==f8030a384c95a1eea95d314a7fbc4ec9
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==397eea9f6fdcbefcc902943c41fc1d45
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==694484b69aa8ba2f1497f82b4316f23e
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==00af177c2eb6384accac0608a6a6cb4f
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==fa95a0d1ca74688da7db2527516a3e30
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==f23bb3119dd6d319e72446bf203eaddc
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 765d73fa6aaf..e71149dad247 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.7.9
+regex==2022.7.25
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index e57bb05b1c82..eee6e7112be4 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.5.2262
-applibs-dev==1.mlnx.4.5.2262
+applibs==1.mlnx.4.5.2318
+applibs-dev==1.mlnx.4.5.2318
 binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
@@ -108,7 +108,7 @@ python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
-python-sdk-api==1.mlnx.4.5.2262
+python-sdk-api==1.mlnx.4.5.2318
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.5.2262
-sx-complib-dev==1.mlnx.4.5.2262
-sx-gen-utils==1.mlnx.4.5.2262
-sx-gen-utils-dev==1.mlnx.4.5.2262
-sxd-libs==1.mlnx.4.5.2262
-sxd-libs-dev==1.mlnx.4.5.2262
+sx-complib==1.mlnx.4.5.2318
+sx-complib-dev==1.mlnx.4.5.2318
+sx-gen-utils==1.mlnx.4.5.2318
+sx-gen-utils-dev==1.mlnx.4.5.2318
+sxd-libs==1.mlnx.4.5.2318
+sxd-libs-dev==1.mlnx.4.5.2318
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 01753180c581..46f00feb42ad 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.7.post1
 pyang==2.5.3
 pyangbind==0.6.0
-python-sdk-api==4.5.2262
+python-sdk-api==4.5.2318
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 1dae9b3c4445..95c54aad2eae 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.5.2262
+python_sdk_api==4.5.2318
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 8fe65d491263..af3ca22ed5c3 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,26 +1,27 @@
-attrs==21.4.0
+attrs==22.1.0
 certifi==2017.4.17
 charset-normalizer==2.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.1.2
+flask==2.2.1
 grpcio==1.47.0
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.12.0
-importlib-resources==5.8.0
+importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.7.2
+jsonschema==4.9.1
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-protobuf==4.21.2
+pkgutil_resolve_name==1.3.10
+protobuf==4.21.4
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.0
 typing_extensions==4.3.0
 urllib3==1.26.5
-werkzeug==2.1.2
-zipp==3.8.0
\ No newline at end of file
+werkzeug==2.2.1
+zipp==3.8.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
deleted file mode 100644
index b14bd866f5b8..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-jsonschema==4.7.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
deleted file mode 100644
index b14bd866f5b8..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-jsonschema==4.7.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 32ff5d4b0134..4d8a15f57215 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -28,7 +28,6 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-gpgv==2.2.12-1+deb10u2
 grub-common==2.02+dfsg1-20+deb10u4
 grub2-common==2.02+dfsg1-20+deb10u4
 ifupdown==0.8.35
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 1db34fe35214..f6389557e01f 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.10
\ No newline at end of file
+urllib3==1.26.11
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 1519f87a3801..ee93e3c615cc 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.28.1
 scapy==2.4.4
 tabulate==0.8.10
-urllib3==1.26.10
+urllib3==1.26.11
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index b8d10d33db99..55f09c760631 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.5
-innovium-sai-headers==0.107.5
+innovium-sai==0.107.6
+innovium-sai-headers==0.107.6
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 968aad1fd450..03d0fa93cc1c 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,8 +1,8 @@
-applibs==1.mlnx.4.5.2262
-applibs-dev==1.mlnx.4.5.2262
+applibs==1.mlnx.4.5.2318
+applibs-dev==1.mlnx.4.5.2318
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2-dev==1.mlnx.4.5.2262
+iproute2-dev==1.mlnx.4.5.2318
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -33,7 +33,7 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 linux-libc-dev==4.19.249-2
 mft==4.18.0-106
-mlnx-sai==1.mlnx.SAIRel1.21.2.2
+mlnx-sai==1.mlnx.SAIRel1.22.0.0
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-1
@@ -41,7 +41,7 @@ python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.5.2262
+python-sdk-api==1.mlnx.4.5.2318
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.5.2262
-sx-acl-helper-dev==1.mlnx.4.5.2262
-sx-complib==1.mlnx.4.5.2262
-sx-complib-dev==1.mlnx.4.5.2262
-sx-examples==1.mlnx.4.5.2262
-sx-examples-dev==1.mlnx.4.5.2262
-sx-gen-utils==1.mlnx.4.5.2262
-sx-gen-utils-dev==1.mlnx.4.5.2262
-sx-scew==1.mlnx.4.5.2262
-sx-scew-dev==1.mlnx.4.5.2262
-sxd-libs==1.mlnx.4.5.2262
-sxd-libs-dev==1.mlnx.4.5.2262
+sx-acl-helper==1.mlnx.4.5.2318
+sx-acl-helper-dev==1.mlnx.4.5.2318
+sx-complib==1.mlnx.4.5.2318
+sx-complib-dev==1.mlnx.4.5.2318
+sx-examples==1.mlnx.4.5.2318
+sx-examples-dev==1.mlnx.4.5.2318
+sx-gen-utils==1.mlnx.4.5.2318
+sx-gen-utils-dev==1.mlnx.4.5.2318
+sx-scew==1.mlnx.4.5.2318
+sx-scew-dev==1.mlnx.4.5.2318
+sxd-libs==1.mlnx.4.5.2318
+sxd-libs-dev==1.mlnx.4.5.2318
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-wjh-libs==1.mlnx.4.5.2262
-wjh-libs-dev==1.mlnx.4.5.2262
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2318
+wjh-libs-dev==1.mlnx.4.5.2318
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index a979a56f0187..c93675e51015 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.5.2262
\ No newline at end of file
+python-sdk-api==4.5.2318
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 585326d2ef8c..73eea649d6a2 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.5.2262
\ No newline at end of file
+python_sdk_api==4.5.2318
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 7b37a4a560db..3a2b92ca3f66 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -166,7 +166,6 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-gpgv==2.2.12-1+deb10u2
 graphviz==2.40.1-6+deb10u1
 groff==1.22.4-3+deb10u1
 groff-base==1.22.4-3+deb10u1
@@ -1359,10 +1358,10 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.15+10-1~deb10u1
-openjdk-11-jdk-headless==11.0.15+10-1~deb10u1
-openjdk-11-jre==11.0.15+10-1~deb10u1
-openjdk-11-jre-headless==11.0.15+10-1~deb10u1
+openjdk-11-jdk==11.0.16+8-1~deb10u1
+openjdk-11-jdk-headless==11.0.16+8-1~deb10u1
+openjdk-11-jre==11.0.16+8-1~deb10u1
+openjdk-11-jre-headless==11.0.16+8-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index d7cbfb3e3c61..6902af6272e9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==eb8426e2ac6e8b03837a8d093863008fbec79860
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 3ff9fa9ec159..6bb93e7b15f4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.5.1
+bitarray==2.6.0
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.7.9
+regex==2022.7.25
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index d7cbfb3e3c61..6902af6272e9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==eb8426e2ac6e8b03837a8d093863008fbec79860
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index d16d157b6578..1599cc05ecaa 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.5.1
+bitarray==2.6.0
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 4300bcc6e050..b55a3f3e71e9 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -64,13 +64,13 @@ gzip==1.9-3+deb10u1
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
-hw-management==1.mlnx.7.0010.2347
+hw-management==1.mlnx.7.0010.2349
 i2c-tools==4.1-1
 ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.5
+innovium-platform-driver==0.107.6
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -310,7 +310,7 @@ squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-sx-kernel==1.mlnx.4.5.2262
+sx-kernel==1.mlnx.4.5.2318
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 475ce37ba040..41d78ade9df5 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -32,13 +32,13 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.7.9
+regex==2022.7.25
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.10
 thrift==0.13.0
-urllib3==1.26.10
+urllib3==1.26.11
 watchdog==0.10.3
 websocket-client==1.3.3
 xmltodict==0.12.0
\ No newline at end of file

From 1c8c1a60109fcb63326b7ca1e62dd5c550e46110 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Mon, 8 Aug 2022 12:48:30 +0800
Subject: [PATCH 1320/1674] [202012] Fix CVE-2017-1000487 security alert
 (#11635)

Why I did it
Fix CVE-2017-1000487 alert in thrift 0.14.1.
See https://nvd.nist.gov/vuln/detail/CVE-2017-1000487

How I did it
Change the version of org.codehaus.plexus:plexus-utils from 3.0.14 to 3.0.16.
---
 src/thrift_0_13_0/Makefile                          | 1 +
 src/thrift_0_13_0/patch/0002-cve-2017-1000487.patch | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 src/thrift_0_13_0/patch/0002-cve-2017-1000487.patch

diff --git a/src/thrift_0_13_0/Makefile b/src/thrift_0_13_0/Makefile
index 3bdb7c2a145c..38a7d939d045 100644
--- a/src/thrift_0_13_0/Makefile
+++ b/src/thrift_0_13_0/Makefile
@@ -26,6 +26,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	patch -p1 < ../patch/0001-Remove-unneeded-packages.patch
 	patch -p1 < ../patch/0002-Remove-minimist-packages.patch
 	patch -p1 < ../patch/0003-Remove-underscore-packages.patch
+	patch -p1 < ../patch/0002-cve-2017-1000487.patch
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
diff --git a/src/thrift_0_13_0/patch/0002-cve-2017-1000487.patch b/src/thrift_0_13_0/patch/0002-cve-2017-1000487.patch
new file mode 120000
index 000000000000..ef6607064039
--- /dev/null
+++ b/src/thrift_0_13_0/patch/0002-cve-2017-1000487.patch
@@ -0,0 +1 @@
+../../thrift/patch/0002-cve-2017-1000487.patch
\ No newline at end of file

From cf12aa549afe5704f727993ccb57bc658297eab9 Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Thu, 28 Jul 2022 09:39:23 +0800
Subject: [PATCH 1321/1674] [hlx/sfp] fix hlx platform sfp+ tx disable issue
 (#11532)

Why I did it:
To fix hlx platform sfp+ module tx disable issue

How I did it:
Fix sfp+ tx disable function according SFF-8472 specification

Co-authored-by: Eric Zhu <erzhu@celestica.com>
---
 .../x86_64-cel_e1031-r0/sonic_platform/sfp.py | 67 ++++++++++---------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
index c0187819ec2c..0d1d02bf0159 100644
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
@@ -8,7 +8,7 @@
 
 try:
     import time
-    from ctypes import create_string_buffer
+    from ctypes import c_char
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
@@ -121,8 +121,8 @@
 SFP_VOLT_WIDTH = 2
 SFP_CHANNL_MON_OFFSET = 100
 SFP_CHANNL_MON_WIDTH = 6
-SFP_CHANNL_STATUS_OFFSET = 110
-SFP_CHANNL_STATUS_WIDTH = 1
+SFP_STATUS_CONTROL_OFFSET = 110
+SFP_STATUS_CONTROL_WIDTH = 1
 SFP_TX_DISABLE_HARD_BIT = 7
 SFP_TX_DISABLE_SOFT_BIT = 6
 
@@ -869,7 +869,7 @@ def get_rx_los(self):
         elif self.sfp_type == SFP_TYPE:
             offset = 256
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
-                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
             if dom_channel_monitor_raw is not None:
                 rx_los_data = int(dom_channel_monitor_raw[0], 16)
                 rx_los_list.append(rx_los_data & 0x02 != 0)
@@ -901,7 +901,7 @@ def get_tx_fault(self):
         elif self.sfp_type == SFP_TYPE:
             offset = 256
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
-                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_fault_data = int(dom_channel_monitor_raw[0], 16)
                 tx_fault_list.append(tx_fault_data & 0x04 != 0)
@@ -936,7 +936,7 @@ def get_tx_disable(self):
         elif self.sfp_type == SFP_TYPE:
             offset = 256
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
-                (offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_disable_data = int(dom_channel_monitor_raw[0], 16)
                 tx_disable_list.append(tx_disable_data & 0xC0 != 0)
@@ -1170,31 +1170,36 @@ def tx_disable(self, tx_disable):
         Returns:
             A boolean, True if tx_disable is set successfully, False if not
         """
-        sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
-        status_control_raw = self._read_eeprom_specific_bytes(
-            SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH)
-        if status_control_raw is not None:
-            # Set bit 6 for Soft TX Disable Select
-            # 01000000 = 64 and 10111111 = 191
-            tx_disable_bit = 64 if tx_disable else 191
-            status_control = int(status_control_raw[0], 16)
-            tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
-                status_control & tx_disable_bit)
-            try:
-                sysfsfile_eeprom = open(
-                    sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
-                buffer = create_string_buffer(1)
-                buffer[0] = chr(tx_disable_ctl)
-                # Write to eeprom
-                sysfsfile_eeprom.seek(SFP_CHANNL_STATUS_OFFSET)
-                sysfsfile_eeprom.write(buffer[0])
-            except Exception:
-                return False
-            finally:
-                if sysfsfile_eeprom:
-                    sysfsfile_eeprom.close()
-                    time.sleep(0.01)
-            return True
+        if not self.get_presence():
+            return False
+
+        if self.dom_tx_disable_supported:
+            # SFP status/control register at address A2h, byte 110
+            offset = 256
+            sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
+            status_control_raw = self._read_eeprom_specific_bytes(
+                (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
+            if status_control_raw is not None:
+                # Set bit 6 for Soft TX Disable Select
+                # 01000000 = 64 and 10111111 = 191
+                tx_disable_bit = 64 if tx_disable else 191
+                status_control = int(status_control_raw[0], 16)
+                tx_disable_ctl = (status_control | tx_disable_bit) if tx_disable else (
+                    status_control & tx_disable_bit)
+                try:
+                    sysfsfile_eeprom = open(
+                        sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
+                    tx_disable_data = c_char(tx_disable_ctl)
+                    # Write to eeprom
+                    sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
+                    sysfsfile_eeprom.write(tx_disable_data)
+                except Exception:
+                    return False
+                finally:
+                    if sysfsfile_eeprom:
+                        sysfsfile_eeprom.close()
+                        time.sleep(0.01)
+                return True
         return False
 
     def tx_disable_channel(self, channel, disable):

From ffd9e190e1be59a35ed3566fc30ce0e6e9c632a5 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 28 Jul 2022 09:08:53 -0700
Subject: [PATCH 1322/1674] Update WARM START FINALIZER to wait for linkmgrd to
 reconcile (#11477)

Spanning from sonic-net/sonic-linkmgrd#76, this PR is to update warm restart finalizer to wait for linkmgrd to be reconciled.

sign-off: Jing Zhang zhangjing@microsoft.com

Why I did it
To make sure finalizer save config after linkmgrd's reconciliation.

How I did it
Add linkmgrd to the reconciliation wait list of warmboot finalizer.

How to verify it
Verified on lab device, linkmgrd reconciled as expected.
---
 files/image_config/warmboot-finalizer/finalize-warmboot.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/image_config/warmboot-finalizer/finalize-warmboot.sh b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
index 172fd95ab2e9..54f9bfc2aa24 100755
--- a/files/image_config/warmboot-finalizer/finalize-warmboot.sh
+++ b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
@@ -10,6 +10,7 @@ declare -A RECONCILE_COMPONENTS=( \
                         ["swss"]="orchagent neighsyncd" \
                         ["bgp"]="bgp"                   \
                         ["nat"]="natsyncd"              \
+                        ["mux"]="linkmgrd"              \
                        )
 EXP_STATE="reconciled"
 

From 9b952945ca8fa56b817156bf53a9abb20f1aa31d Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 10 Aug 2022 11:53:58 +0800
Subject: [PATCH 1323/1674] [actions] Fix automerge actions don't work issue.
 (#11671)

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 502f5d8987d9..ee27244bfb1f 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -15,7 +15,7 @@ jobs:
     - name: automerge
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
-        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        GITHUB_TOKEN: '${{ secrets.TOKEN }}'
         MERGE_LABELS: 'automerge'
         MERGE_METHOD: 'squash'
         MERGE_FILTER_AUTHOR: 'mssonicbld'

From 5b5bd5e818eeb21afe0f745393bc4daecae69b82 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Thu, 11 Aug 2022 06:02:47 +0800
Subject: [PATCH 1324/1674] [202012 BRCM SAI 4.3.7.0] Pick up fixes and make up
 BRCM SAI version to 4.3.7.0 (#11681)

Pick upfollowing fixes and update BRCM SAI to 4.3.7.0:

CS00012208537: Add back previous commit 54c5bc4848eb748
CS00012253061,SONIC-63280: WB from 3.5 to 4.3, followed by WB to 4.3
CS00012207978: SDK-296517, time spent for SAI operations
CS00012245601,SONIC-62898: Egress ACL Counted ad Interface TX drops
Update pcbb with Fixes for CS00012243699
Upgrade on pcbb with Fixes for KB0025353, CS00012221689, CS00012221688, KB0025391, CS00012230519
commit of "CS00012221688:PFC frames egressing, PFC storm happens simultaneously on 2 ports" is purposely skipped to be picked up later due to SWSS dependency not ready.
Why I did it
How I did it
How to verify it
Tested build target, successful

Manually run these tests after installing sai binary within image 20201231.73 on 7050CX3 (TD3) T0 DUT, all passed.

vxlan/test_vxlan_decap.py
fdb/test_fdb.py
pfcwd/test_pfcwd_all_port_storm.py
acl/null_route/test_null_route_helper.py
acl/test_acl.py
vlan/test_vlan.py
platform_tests/test_reboot.py


Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 8b638e27a593..ad8106d47eda 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 5efc4d739ee1..dc4d9aa0d839 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.5.3-5_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-5_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.0_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.0_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From feab02df59818566117b3d205f2b76c25c35bae5 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Thu, 11 Aug 2022 09:55:15 -0700
Subject: [PATCH 1325/1674] [202012][sonic-utilities][sonic-platform-daemons]
 submodule update (#11684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The follwing commit is added in sonic-utilities
b034f0c (HEAD -> 202012, origin/202012) [config][muxcable] add support
to enable/disable ycable telemetry (#2… (#2304)

The follwing commit is added in sonic-platform-daemons
978667c (HEAD -> 202012, origin/202012) [ycabled] add capability to
enable/disable telemetry (#279) (#280

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 src/sonic-utilities        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 7bef6af28cfc..978667c03b43 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 7bef6af28cfc2da032941329e8e11856841aca46
+Subproject commit 978667c03b438b592fa3073398c92c595a337dc3
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 6da339c49bfb..b034f0cbdd40 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 6da339c49bfb52cb60891df61b3ed595dd81ef5f
+Subproject commit b034f0cbdd400c3d854b29f554292f5e1124b7ad

From ff4f1605707672cdc1eb1b49de278005237177c9 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 11 Aug 2022 10:37:34 -0700
Subject: [PATCH 1326/1674] [202012][sonic-linkmgrd] Submodule Update (#11514)

[202012][sonic-linkmgrd] Submodule Update

d3f5de1 Jing Zhang Tue Aug 9 10:14:48 2022 -0700 Fix build failure introduced by commit 847c1e8 (#105)
847c1e8 Jing Zhang Mon Aug 8 10:36:18 2022 -0700 [Active-Standby]Remove unnecessary handleMuxWaitTimeout logs (#100)
1fdf0e6 Jing Zhang Thu Jul 21 10:33:45 2022 -0700 Add support for reconciliation after warm restart (#76) (#97)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index a2367d082832..d3f5de1ce41c 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit a2367d0828322e093525b9f028fd6d3b0ab0dbbf
+Subproject commit d3f5de1ce41cee9526170b76fdc2788bc696fb6e

From cd480810d73d2c4fc3f3b4a3071442a6c4b35cd5 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <stumkurv@microsoft.com>
Date: Wed, 10 Aug 2022 13:00:54 -0700
Subject: [PATCH 1327/1674] [RESTAPI] Update submodule  (#11674)

---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 55683f2abb8e..bcc6f704a544 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 55683f2abb8e7be0e80b0e81128314c90006303c
+Subproject commit bcc6f704a54454f326f069501b01759dbb732bb3

From 8ab448a852004bcdf08041488ebd4a59bf7b146a Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Thu, 11 Aug 2022 06:57:07 +0300
Subject: [PATCH 1328/1674] [swss.sh/syncd.sh] Trap only on EXIT (#11590)

When using trap on SIGTERM the script will not react to the SIGTERM signal sent while a child is executing.
I.e, the following script does not react on SIGTERM sent to it if it is
waiting for sleep to finish:

```

trap "echo Handled SIGTERM" 0 2 3 15

echo "Before sleep"
sleep inf
echo "After sleep"
```

Instead, trap only on EXIT which covers also a scenario with exit on
SIGINT, SIGTERM.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 files/scripts/swss.sh         | 2 +-
 files/scripts/syncd_common.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index d2e7fdbc297c..32d7e3ba4d67 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -15,7 +15,7 @@ function lock_service_state_change()
 
     exec {LOCKFD}>${LOCKFILE}
     /usr/bin/flock -x ${LOCKFD}
-    trap "/usr/bin/flock -u ${LOCKFD}" 0 2 3 15
+    trap "/usr/bin/flock -u ${LOCKFD}" EXIT
 
     debug "Locked ${LOCKFILE} (${LOCKFD}) from ${SERVICE}$DEV service"
 }
diff --git a/files/scripts/syncd_common.sh b/files/scripts/syncd_common.sh
index 5d75ae841e42..a1566d4e58bc 100755
--- a/files/scripts/syncd_common.sh
+++ b/files/scripts/syncd_common.sh
@@ -3,11 +3,11 @@
 #
 # common functions used by "syncd" scipts (syncd.sh, gbsyncd.sh, etc..)
 # scripts using this must provide implementations of the following functions:
-# 
+#
 # startplatform
 # waitplatform
 # stopplatform1 and stopplatform2
-# 
+#
 # For examples of these, see gbsyncd.sh and syncd.sh.
 #
 
@@ -23,7 +23,7 @@ function lock_service_state_change()
 
     exec {LOCKFD}>${LOCKFILE}
     /usr/bin/flock -x ${LOCKFD}
-    trap "/usr/bin/flock -u ${LOCKFD}" 0 2 3 15
+    trap "/usr/bin/flock -u ${LOCKFD}" EXIT
 
     debug "Locked ${LOCKFILE} (${LOCKFD}) from ${SERVICE}$DEV service"
 }

From 00d512577e2312aaa46aa831ec6e7983a0efdb2b Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Thu, 11 Aug 2022 13:22:14 +0800
Subject: [PATCH 1329/1674] [bgp-cfgd] BGP allow list enhancement (#11586)

Why I did it
2 things are missing in current allow-prefix list implementation.

In some usecase, need to tell the BGP neighbor and have different allow-prefix list for different neighbors, which is not supported.
for the prefix list, can't support flexible le and ge.
How I did it
To enhance the bgp allow-prefix list feature to have:

To include the neighbor type info for the allow-prefix list.
To support flexible le and ge length for allow-prefix list.
How to verify it
4 new unit test cases are added in this PR to cover changes.
---
 .../bgpcfgd/managers_allow_list.py            | 112 ++++++++++-----
 src/sonic-bgpcfgd/tests/test_allow_list.py    | 129 +++++++++++++++++-
 2 files changed, 203 insertions(+), 38 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
index 209d12fd2f97..4bdd488fc2eb 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_allow_list.py
@@ -14,8 +14,11 @@ class BGPAllowListMgr(Manager):
     ALLOW_ADDRESS_PL_NAME_TMPL = "ALLOW_ADDRESS_%d_%s"  # template for a name for the ALLOW_ADDRESS prefix-list ???
     EMPTY_COMMUNITY = "empty"
     PL_NAME_TMPL = "PL_ALLOW_LIST_DEPLOYMENT_ID_%d_COMMUNITY_%s_V%s"
+    PL_NAME_TMPL_WITH_NEIGH = "PL_ALLOW_LIST_DEPLOYMENT_ID_%d_NEIGHBOR_%s_COMMUNITY_%s_V%s"
     COMMUNITY_NAME_TMPL = "COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_%d_COMMUNITY_%s"
+    COMMUNITY_NAME_TMPL_WITH_NEIGH = "COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_%d_NEIGHBOR_%s_COMMUNITY_%s"
     RM_NAME_TMPL = "ALLOW_LIST_DEPLOYMENT_ID_%d_V%s"
+    RM_NAME_TMPL_WITH_NEIGH = "ALLOW_LIST_DEPLOYMENT_ID_%d_NEIGHBOR_%s_V%s"
     ROUTE_MAP_ENTRY_WITH_COMMUNITY_START = 10
     ROUTE_MAP_ENTRY_WITH_COMMUNITY_END = 29990
     ROUTE_MAP_ENTRY_WITHOUT_COMMUNITY_START = 30000
@@ -38,7 +41,7 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-        self.key_re = re.compile(r"^DEPLOYMENT_ID\|\d+\|\S+$|^DEPLOYMENT_ID\|\d+$")
+        self.key_re = re.compile(r"^DEPLOYMENT_ID\|\d+\|\S+$|^DEPLOYMENT_ID\|\d+$|^DEPLOYMENT_ID\|\d+\|\S+\|NEIGHBOR_TYPE\|\S+$|^DEPLOYMENT_ID\|\d+\|NEIGHBOR_TYPE\|\S+")
         self.enabled = self.__get_enabled()
         self.prefix_match_tag = self.__get_routemap_tag()
         self.__load_constant_lists()
@@ -55,8 +58,14 @@ def set_handler(self, key, data):
             return True
         if not self.__set_handler_validate(key, data):
             return True
-        key = key.replace("DEPLOYMENT_ID|", "")
-        deployment_id, community_value = key.split('|', 1) if '|' in key else (key, BGPAllowListMgr.EMPTY_COMMUNITY)
+        if 'NEIGHBOR_TYPE' in key:
+            keys = key.split('|NEIGHBOR_TYPE|', 1)
+            deployment_id = keys[0].replace("DEPLOYMENT_ID|", "")
+            neighbor_type, community_value = keys[1].split('|', 1) if '|' in keys[1] else (keys[1], BGPAllowListMgr.EMPTY_COMMUNITY)
+        else:
+            key = key.replace("DEPLOYMENT_ID|", "")
+            deployment_id, community_value = key.split('|', 1) if '|' in key else (key, BGPAllowListMgr.EMPTY_COMMUNITY)
+            neighbor_type = ''
         deployment_id = int(deployment_id)
         prefixes_v4 = []
         prefixes_v6 = []
@@ -65,7 +74,7 @@ def set_handler(self, key, data):
         if "prefixes_v6" in data:
             prefixes_v6 = str(data['prefixes_v6']).split(",")
         default_action_community = self.__get_default_action_community(data)
-        self.__update_policy(deployment_id, community_value, prefixes_v4, prefixes_v6, default_action_community)
+        self.__update_policy(deployment_id, community_value, prefixes_v4, prefixes_v6, default_action_community, neighbor_type)
         return True
 
     def __set_handler_validate(self, key, data):
@@ -85,13 +94,13 @@ def __set_handler_validate(self, key, data):
         prefixes_v6 = []
         if "prefixes_v4" in data:
             prefixes_v4 = str(data["prefixes_v4"]).split(",")
-            if not all(TemplateFabric.is_ipv4(prefix) for prefix in prefixes_v4):
+            if not all(TemplateFabric.is_ipv4(re.split('ge|le', prefix)[0]) for prefix in prefixes_v4):
                 arguments = "prefixes_v4", str(data["prefixes_v4"])
                 log_err("BGPAllowListMgr::Received BGP ALLOWED 'SET' message with invalid input[%s]:'%s'" % arguments)
                 return False
         if "prefixes_v6" in data:
             prefixes_v6 = str(data["prefixes_v6"]).split(",")
-            if not all(TemplateFabric.is_ipv6(prefix) for prefix in prefixes_v6):
+            if not all(TemplateFabric.is_ipv6(re.split('ge|le', prefix)[0]) for prefix in prefixes_v6):
                 arguments = "prefixes_v6", str(data["prefixes_v6"])
                 log_err("BGPAllowListMgr::Received BGP ALLOWED 'SET' message with invalid input[%s]:'%s'" % arguments)
                 return False
@@ -113,10 +122,18 @@ def del_handler(self, key):
             return
         if not self.__del_handler_validate(key):
             return
-        key = key.replace('DEPLOYMENT_ID|', '')
-        deployment_id, community = key.split('|', 1) if '|' in key else (key, BGPAllowListMgr.EMPTY_COMMUNITY)
+
+        if 'NEIGHBOR_TYPE' in key:
+            keys = key.split('|NEIGHBOR_TYPE|', 1)
+            deployment_id = keys[0].replace("DEPLOYMENT_ID|", "")
+            neighbor_type, community_value = keys[1].split('|', 1) if '|' in keys[1] else (keys[1], BGPAllowListMgr.EMPTY_COMMUNITY)
+        else:
+            key = key.replace("DEPLOYMENT_ID|", "")
+            deployment_id, community_value = key.split('|', 1) if '|' in key else (key, BGPAllowListMgr.EMPTY_COMMUNITY)
+            neighbor_type = ''
+
         deployment_id = int(deployment_id)
-        self.__remove_policy(deployment_id, community)
+        self.__remove_policy(deployment_id, community_value, neighbor_type)
 
     def __del_handler_validate(self, key):
         """
@@ -129,7 +146,7 @@ def __del_handler_validate(self, key):
             return False
         return True
 
-    def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_v6, default_action):
+    def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_v6, default_action, neighbor_type):
         """
         Update "allow list" policy with parameters
         :param deployment_id: deployment id which policy will be changed
@@ -139,12 +156,13 @@ def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_
         :param default_action: the default action for the policy. should be either 'permit' or 'deny'
         """
         # update all related entries with the information
-        info = deployment_id, community_value, str(prefixes_v4), str(prefixes_v6)
+        info = deployment_id, community_value, str(prefixes_v4), str(prefixes_v6), neighbor_type
         msg = "BGPAllowListMgr::Updating 'Allow list' policy."
         msg += " deployment_id '%s'. community: '%s'"
         msg += " prefix_v4 '%s'. prefix_v6: '%s'"
+        msg += " neighbor_type %s"
         log_info(msg % info)
-        names = self.__generate_names(deployment_id, community_value)
+        names = self.__generate_names(deployment_id, community_value, neighbor_type)
         self.cfg_mgr.update()
         cmds = []
         cmds += self.__update_prefix_list(self.V4, names['pl_v4'], prefixes_v4)
@@ -156,14 +174,14 @@ def __update_policy(self, deployment_id, community_value, prefixes_v4, prefixes_
         cmds += self.__update_default_route_map_entry(names['rm_v6'], default_action)
         if cmds:
             self.cfg_mgr.push_list(cmds)
-            peer_groups = self.__find_peer_group_by_deployment_id(deployment_id)
+            peer_groups = self.__find_peer_group(deployment_id, neighbor_type)
             self.cfg_mgr.restart_peer_groups(peer_groups)
             log_debug("BGPAllowListMgr::__update_policy. The peers configuration scheduled for updates")
         else:
             log_debug("BGPAllowListMgr::__update_policy. Nothing to update")
         log_info("BGPAllowListMgr::Done")
 
-    def __remove_policy(self, deployment_id, community_value):
+    def __remove_policy(self, deployment_id, community_value, neighbor_type):
         """
         Remove "allow list" policy for given deployment_id and community_value
         :param deployment_id: deployment id which policy will be removed
@@ -177,7 +195,7 @@ def __remove_policy(self, deployment_id, community_value):
         log_info(msg % info)
 
         default_action = self.__get_default_action_community()
-        names = self.__generate_names(deployment_id, community_value)
+        names = self.__generate_names(deployment_id, community_value, neighbor_type)
         self.cfg_mgr.update()
         cmds = []
         cmds += self.__remove_allow_route_map_entry(self.V4, names['pl_v4'], names['community'], names['rm_v4'])
@@ -189,7 +207,7 @@ def __remove_policy(self, deployment_id, community_value):
         cmds += self.__update_default_route_map_entry(names['rm_v6'], default_action)
         if cmds:
             self.cfg_mgr.push_list(cmds)
-            peer_groups = self.__find_peer_group_by_deployment_id(deployment_id)
+            peer_groups = self.__find_peer_group(deployment_id, neighbor_type)
             self.cfg_mgr.restart_peer_groups(peer_groups)
             log_debug("BGPAllowListMgr::__remove_policy. 'Allow list' policy was scheduled for removal")
         else:
@@ -197,26 +215,42 @@ def __remove_policy(self, deployment_id, community_value):
         log_info('BGPAllowListMgr::Done')
 
     @staticmethod
-    def __generate_names(deployment_id, community_value):
+    def __generate_names(deployment_id, community_value, neighbor_type):
         """
         Generate prefix-list names for a given peer_ip and community value
         :param deployment_id: deployment_id for which we're going to filter prefixes
         :param community_value: community, which we want to use to filter prefixes
         :return: a dictionary with names
         """
-        if community_value == BGPAllowListMgr.EMPTY_COMMUNITY:
-            community_name = BGPAllowListMgr.EMPTY_COMMUNITY
+        if not neighbor_type:
+            if community_value == BGPAllowListMgr.EMPTY_COMMUNITY:
+                community_name = BGPAllowListMgr.EMPTY_COMMUNITY
+            else:
+                community_name = BGPAllowListMgr.COMMUNITY_NAME_TMPL % (deployment_id, community_value)
+            names = {
+                "pl_v4": BGPAllowListMgr.PL_NAME_TMPL % (deployment_id, community_value, '4'),
+                "pl_v6": BGPAllowListMgr.PL_NAME_TMPL % (deployment_id, community_value, '6'),
+                "rm_v4": BGPAllowListMgr.RM_NAME_TMPL % (deployment_id, '4'),
+                "rm_v6": BGPAllowListMgr.RM_NAME_TMPL % (deployment_id, '6'),
+                "community": community_name,
+                'neigh_type': neighbor_type,
+            }
+            arguments = deployment_id, community_value, str(names)
+            log_debug("BGPAllowListMgr::__generate_names. deployment_id: %d, community: %s. names: %s" % arguments)
         else:
-            community_name = BGPAllowListMgr.COMMUNITY_NAME_TMPL % (deployment_id, community_value)
-        names = {
-            "pl_v4": BGPAllowListMgr.PL_NAME_TMPL % (deployment_id, community_value, '4'),
-            "pl_v6": BGPAllowListMgr.PL_NAME_TMPL % (deployment_id, community_value, '6'),
-            "rm_v4": BGPAllowListMgr.RM_NAME_TMPL % (deployment_id, '4'),
-            "rm_v6": BGPAllowListMgr.RM_NAME_TMPL % (deployment_id, '6'),
-            "community": community_name,
-        }
-        arguments = deployment_id, community_value, str(names)
-        log_debug("BGPAllowListMgr::__generate_names. deployment_id: %d, community: %s. names: %s" % arguments)
+            if community_value == BGPAllowListMgr.EMPTY_COMMUNITY:
+                community_name = BGPAllowListMgr.EMPTY_COMMUNITY
+            else:
+                community_name = BGPAllowListMgr.COMMUNITY_NAME_TMPL_WITH_NEIGH % (deployment_id, neighbor_type, community_value)
+            names = {
+                "pl_v4": BGPAllowListMgr.PL_NAME_TMPL_WITH_NEIGH % (deployment_id, neighbor_type, community_value, '4'),
+                "pl_v6": BGPAllowListMgr.PL_NAME_TMPL_WITH_NEIGH % (deployment_id, neighbor_type, community_value, '6'),
+                "rm_v4": BGPAllowListMgr.RM_NAME_TMPL_WITH_NEIGH % (deployment_id, neighbor_type, '4'),
+                "rm_v6": BGPAllowListMgr.RM_NAME_TMPL_WITH_NEIGH % (deployment_id, neighbor_type, '6'),
+                "community": community_name,
+            }
+            arguments = deployment_id, neighbor_type, community_value, str(names)
+            log_debug("BGPAllowListMgr::__generate_names. deployment_id: %d, neighbor_type: %s, community: %s. names: %s" % arguments)
         return names
 
     def __update_prefix_list(self, af, pl_name, allow_list):
@@ -630,7 +664,7 @@ def __get_routemap_tag(self):
         return prefix_match_tag
 
     @staticmethod
-    def __get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call):
+    def __get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call, neighbor_type):
         """
         Get peer_groups which are assigned to deployment_id
         :deployment_id: deployment_id number
@@ -639,14 +673,17 @@ def __get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call):
         :rm_2_call: a dictionary: key - name of a route-map, value - name of a route-map call defined for the route-map
         """
         ret = set()
-        target_allow_list_prefix = 'ALLOW_LIST_DEPLOYMENT_ID_%d_V' % deployment_id
+        if not neighbor_type:
+            target_allow_list_prefix = 'ALLOW_LIST_DEPLOYMENT_ID_%d_V' % deployment_id
+        else:
+            target_allow_list_prefix = 'ALLOW_LIST_DEPLOYMENT_ID_%d_NEIGHBOR_%s_V' % (deployment_id, neighbor_type)
         for peer_group, route_map in pg_2_rm.items():
             if route_map in rm_2_call:
                 if rm_2_call[route_map].startswith(target_allow_list_prefix):
                     ret.add(peer_group)
         return list(ret)
 
-    def __find_peer_group_by_deployment_id(self, deployment_id):
+    def __find_peer_group(self, deployment_id, neighbor_type):
         """
         Deduce peer-group names which are connected to devices with requested deployment_id
         :param deployment_id: deployment_id number
@@ -656,7 +693,7 @@ def __find_peer_group_by_deployment_id(self, deployment_id):
         peer_groups = self.__extract_peer_group_names()
         pg_2_rm = self.__get_peer_group_to_route_map(peer_groups)
         rm_2_call = self.__get_route_map_calls(set(pg_2_rm.values()))
-        ret = self.__get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call)
+        ret = self.__get_peer_group_to_restart(deployment_id, pg_2_rm, rm_2_call, neighbor_type)
         return list(ret)
 
     def __get_enabled(self):
@@ -706,11 +743,14 @@ def __to_prefix_list(self, af, allow_list):
         res = []
         prefix_mask_default = 32 if af == self.V4 else 128
         for prefix in allow_list:
-            prefix_mask = int(prefix.split("/")[1])
-            if prefix_mask == prefix_mask_default:
+            if 'le' in prefix or 'ge' in prefix:
                 res.append("permit %s" % prefix)
             else:
-                res.append("permit %s le %d" % (prefix, prefix_mask_default))
+                prefix_mask = int(prefix.split("/")[1])
+                if prefix_mask == prefix_mask_default:
+                    res.append("permit %s" % prefix)
+                else:
+                    res.append("permit %s le %d" % (prefix, prefix_mask_default))
         return res
 
     def __af_to_family(self, af):
diff --git a/src/sonic-bgpcfgd/tests/test_allow_list.py b/src/sonic-bgpcfgd/tests/test_allow_list.py
index e77c692ee593..c5bec039c3e4 100644
--- a/src/sonic-bgpcfgd/tests/test_allow_list.py
+++ b/src/sonic-bgpcfgd/tests/test_allow_list.py
@@ -866,6 +866,131 @@ def test_set_handler_no_community_update_prefixes_remove():
         ]
     )
 
+def test_set_handler_with_neighbor_type():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|NEIGHBOR_TYPE|OpticalLonghaulTerminal", {
+            "prefixes_v4": "10.62.64.0/22 ge 30,"\
+                           "10.1.44.0/23 ge 30,"\
+                           "10.17.92.0/23 ge 30,"\
+                           "10.73.92.0/23 ge 30,"\
+                           "10.26.170.0/24 ge 30,"\
+                           "10.26.171.0/24 ge 30,"\
+                           "10.26.255.0/24 ge 30",
+            "prefixes_v6": "fc01:20::/64",
+        }),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 40 permit fc01:30::/64 le 128',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 30000',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 30000',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 20 permit 10.62.64.0/22 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 30 permit 10.1.44.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 40 permit 10.17.92.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 50 permit 10.73.92.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 60 permit 10.26.170.0/24 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 70 permit 10.26.171.0/24 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V4 seq 80 permit 10.26.255.0/24 ge 30',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_empty_V6 seq 30 permit fc01:20::/64 le 128',
+        ]
+    )
+
+def test_set_handler_with_neighbor_type_and_community():
+    set_del_test(
+        "SET",
+        ("DEPLOYMENT_ID|5|NEIGHBOR_TYPE|OpticalLonghaulTerminal|1010:2020", {
+            "prefixes_v4": "10.62.64.0/22 ge 30,"\
+                           "10.1.44.0/23 ge 30,"\
+                           "10.17.92.0/23 ge 30,"\
+                           "10.73.92.0/23 ge 30,"\
+                           "10.26.170.0/24 ge 30,"\
+                           "10.26.171.0/24 ge 30,"\
+                           "10.26.255.0/24 ge 30",
+            "prefixes_v6": "fc01:20::/64",
+        }),
+        [
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 20 permit 20.20.30.0/24 le 32',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 30 permit 40.50.0.0/16 le 32',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 30 permit fc01:20::/64 le 128',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 40 permit fc01:30::/64 le 128',
+            'bgp community-list standard COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020 permit 1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 10',
+            ' match ip address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 10',
+            ' match ipv6 address prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6',
+            ' match community COMMUNITY_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 65535',
+            ' set community 123:123 additive',
+            ""
+        ],
+        [
+            'no ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 10 deny 0.0.0.0/0 le 17',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 20 permit 10.62.64.0/22 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 30 permit 10.1.44.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 40 permit 10.17.92.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 50 permit 10.73.92.0/23 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 60 permit 10.26.170.0/24 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 70 permit 10.26.171.0/24 ge 30',
+            'ip prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V4 seq 80 permit 10.26.255.0/24 ge 30',
+            'no ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 10 deny ::/0 le 59',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 20 deny ::/0 ge 65',
+            'ipv6 prefix-list PL_ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_COMMUNITY_1010:2020_V6 seq 30 permit fc01:20::/64 le 128',
+        ]
+    )
+
+def test_del_handler_with_neighbor_type_community_no_data():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|NEIGHBOR_TYPE|OpticalLonghaulTerminal|1010:2020",),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
+        []
+    )
+
+def test_del_handler_with_neighbor_type_no_data():
+    set_del_test(
+        "DEL",
+        ("DEPLOYMENT_ID|5|NEIGHBOR_TYPE|OpticalLonghaulTerminal",),
+        [
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V4 permit 65535',
+            ' set community 123:123 additive',
+            'route-map ALLOW_LIST_DEPLOYMENT_ID_5_NEIGHBOR_OpticalLonghaulTerminal_V6 permit 65535',
+            ' set community 123:123 additive'
+        ],
+        []
+    )
+
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
 def test___set_handler_validate():
     from bgpcfgd.managers_allow_list import BGPAllowListMgr
@@ -894,7 +1019,7 @@ def test___set_handler_validate():
     })
 
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)
-def test___find_peer_group_by_deployment_id():
+def test___find_peer_group():
     from bgpcfgd.managers_allow_list import BGPAllowListMgr
     cfg_mgr = MagicMock()
     cfg_mgr.update.return_value = None
@@ -984,7 +1109,7 @@ def test___find_peer_group_by_deployment_id():
         'constants': global_constants,
     }
     mgr = BGPAllowListMgr(common_objs, "CONFIG_DB", "BGP_ALLOWED_PREFIXES")
-    values = mgr._BGPAllowListMgr__find_peer_group_by_deployment_id(0)
+    values = mgr._BGPAllowListMgr__find_peer_group(0, '')
     assert set(values) == {'PEER_V4_INT', 'PEER_V6_INT', 'PEER_V6', 'PEER_V4'}
 
 @patch.dict("sys.modules", swsscommon=swsscommon_module_mock)

From 5d1b052e4f98b4adb3f0f346475fd9c2a7ebf2c5 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <stumkurv@microsoft.com>
Date: Thu, 11 Aug 2022 17:17:35 -0700
Subject: [PATCH 1330/1674] [RESTAPI] Update submodule (#11686)


From fb7c962fbcfb27f23065da557e4fa535ca40629c Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Fri, 12 Aug 2022 14:07:33 -0700
Subject: [PATCH 1331/1674] [202012][sonic-platorm-common] submodule update
 (#11712)

Signed-off-by: vaibhav-dahiya vdahiya@microsoft.com
the following commit is added in sonic-platform-common

fd8cf3a (HEAD -> 202012, origin/202012) [Credo][Ycable] fix incorrect uart statistics (#296)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index ac255158d072..fd8cf3a9dad9 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit ac255158d07257614af4eae37edff9abd70b13e1
+Subproject commit fd8cf3a9dad971b36cdd49db6ee34b918aa450cb

From 088d9923d91e984de8d70c4250bec38c4a660556 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Mon, 15 Aug 2022 09:14:44 -0700
Subject: [PATCH 1332/1674] [202012][sonic-linkmgrd] Submodule Update (#11726)

fc5d424 Jing Zhang Fri Aug 12 14:39:59 2022 -0700 [202012] Cherry-pick flaky unit test fixes (#115)
faceb93 Jing Zhang Thu Aug 11 10:03:05 2022 -0700 Backoff mux probing for server down scenario (#106)
86ddd95 Jing Zhang Fri Aug 12 14:21:37 2022 -0700 Fix race condition caused by strand wrap method (#104) (#110)
f68a03e Jing Zhang Thu Aug 11 15:31:22 2022 -0700 [lgtm]: add uuid-dev to lgtm prepare (#112)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index d3f5de1ce41c..fc5d4240bf85 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit d3f5de1ce41cee9526170b76fdc2788bc696fb6e
+Subproject commit fc5d4240bf85699bc1f689a08b3d5670a8a7ead2

From 07082bb5f58d276eb1e5e2015ef2aa6e7700ff73 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 16 Aug 2022 21:07:32 +0800
Subject: [PATCH 1333/1674] [ci/build]: Upgrade SONiC package versions (#11676)

---
 .../build-sonic-slave-buster/versions-deb-buster    |  2 +-
 .../build/build-sonic-slave-buster/versions-git     |  2 +-
 .../build/build-sonic-slave-buster/versions-web     |  4 ++--
 .../build/build-sonic-slave-stretch/versions-web    |  4 ++--
 files/build/versions/default/versions-git           |  4 ++--
 files/build/versions/default/versions-web           |  2 --
 .../build/versions/dockers/docker-ptf/versions-py2  |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3        |  6 +++---
 .../dockers/docker-syncd-brcm/versions-deb-buster   |  2 +-
 .../docker-syncd-centec/versions-deb-buster-arm64   |  4 ++--
 .../docker-syncd-mrvl/versions-deb-buster-armhf     |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster  | 13 +++++++------
 .../dockers/sonic-slave-buster/versions-git         |  2 +-
 .../dockers/sonic-slave-stretch/versions-git        |  2 +-
 files/build/versions/host-image/versions-deb-buster |  3 ++-
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index cee663358b9e..131f0755077b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.5.3-5
+libsaibcm==4.3.7.0
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index fe95b3f00311..da70e218b7b1 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index a862938939ca..3de472035f53 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -28,8 +28,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 26ffd4974b35..ac8007914719 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D==e9861d9d73d17207e120b2c089ae590a
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D==1594e9cfb991e0ed2d610d84a141a731
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index d2709c2917ea..debe56e88395 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==811ea056edb7a8d0d6defa6bbc9f2330c4dfabff
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index ad8106d47eda..8b638e27a593 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,8 +50,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 454a54602a78..87c8a5d16e7d 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -36,7 +36,7 @@ protobuf==3.6.1
 ptf==0.9.1
 ptyprocess==0.7.0
 pyaml==21.10.1
-pybrctl==0.1.3
+pybrctl==0.1.4
 pycparser==2.21
 pygments==2.5.2
 pylibpcap==0.6.4
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index af3ca22ed5c3..456819069211 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -4,7 +4,7 @@ charset-normalizer==2.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.2.1
+flask==2.2.2
 grpcio==1.47.0
 grpcio-tools==1.20.0
 idna==3.3
@@ -16,12 +16,12 @@ jsonschema==4.9.1
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.4
+protobuf==4.21.5
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.0
 typing_extensions==4.3.0
 urllib3==1.26.5
-werkzeug==2.2.1
+werkzeug==2.2.2
 zipp==3.8.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index ced876e18827..27515b58c333 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.5.3-5
+libsaibcm==4.3.7.0
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index e13071edf35e..ad85b9e20885 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -18,8 +18,8 @@ libpython2.7-stdlib==2.7.16-2+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libtirpc-common==1.1.4-0.4
-libtirpc3==1.1.4-0.4
+libtirpc-common==1.1.4-0.4+deb10u1
+libtirpc3==1.1.4-0.4+deb10u1
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 75858915943a..46f091f15b72 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -20,8 +20,8 @@ libsairedis==1.0.0
 libsensors-config==1:3.5.0-3
 libsensors4-dev==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libtirpc-common==1.1.4-0.4
-libtirpc3==1.1.4-0.4
+libtirpc-common==1.1.4-0.4+deb10u1
+libtirpc3==1.1.4-0.4+deb10u1
 mrvllibsai==1.7.1-9
 nfs-common==1:1.3.4-2.5+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 3a2b92ca3f66..7892d9233999 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.6-1
+containerd.io==1.6.7-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -173,7 +173,7 @@ gsettings-desktop-schemas==3.28.1-1
 gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
 gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2+deb10u1
 gstreamer1.0-plugins-base==1.14.4-2+deb10u1
-gstreamer1.0-plugins-good==1.14.4-1+deb10u1
+gstreamer1.0-plugins-good==1.14.4-1+deb10u2
 gstreamer1.0-plugins-ugly==1.14.4-1+deb10u1
 gstreamer1.0-x==1.14.4-2+deb10u1
 gtk-update-icon-cache==3.24.5-1
@@ -553,10 +553,11 @@ libglx0==1.1.0-1
 libgme0==0.6.2-1
 libgmp-dev==2:6.1.2+dfsg-4+deb10u1
 libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
-libgnutls-dane0==3.6.7-4+deb10u7
-libgnutls-openssl27==3.6.7-4+deb10u7
-libgnutls28-dev==3.6.7-4+deb10u7
-libgnutlsxx28==3.6.7-4+deb10u7
+libgnutls-dane0==3.6.7-4+deb10u9
+libgnutls-openssl27==3.6.7-4+deb10u9
+libgnutls28-dev==3.6.7-4+deb10u9
+libgnutls30==3.6.7-4+deb10u9
+libgnutlsxx28==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 6902af6272e9..b6445f629357 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==eb8426e2ac6e8b03837a8d093863008fbec79860
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 6902af6272e9..b6445f629357 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==eb8426e2ac6e8b03837a8d093863008fbec79860
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index b55a3f3e71e9..66df5e12d018 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.6-1
+containerd.io==1.6.7-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -128,6 +128,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libgirepository-1.0-1==1.58.3-2
 libglib2.0-0==2.58.3-2+deb10u3
+libgnutls30==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u3

From 9ee0219029bd37b2765d8e646f8419f957cbfe43 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 18 Aug 2022 00:22:01 -0700
Subject: [PATCH 1334/1674] [sairedis]: Update submodule (#11762)

This brings in the following changes:

```
21f3d7c Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (#1075)
8ac3aa7 [sairedis] Fix reopen recoding file (#1087)
0bbbb02 Transfer organization from Azure to sonic-net (#1096)
3406c57 [sairedis] Perform log rotate on request (#1083)
```
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index de5c23534d50..21f3d7c3d67f 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit de5c23534d50fcc21d8b89c90632efb8c4351f88
+Subproject commit 21f3d7c3d67ffe072ddfb335d08bb08f50b879ac

From 32bee5df2d63d74c8c96c982197bf9ee76cfec1a Mon Sep 17 00:00:00 2001
From: Mai Bui <maibui@microsoft.com>
Date: Wed, 17 Aug 2022 17:30:58 -0400
Subject: [PATCH 1335/1674] Replace strtok in systemd-sonic-generator (#11710)

Signed-off-by: maipbui <maibui@microsoft.com>

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
Replace unsafe functions to safe functions
#### How I did it
Replace `strtok()` by `strtok_r()`
#### How to verify it

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
---
 .../systemd-sonic-generator.c                 | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/systemd-sonic-generator/systemd-sonic-generator.c b/src/systemd-sonic-generator/systemd-sonic-generator.c
index 1052e2db622a..1eab976f42ac 100644
--- a/src/systemd-sonic-generator/systemd-sonic-generator.c
+++ b/src/systemd-sonic-generator/systemd-sonic-generator.c
@@ -99,6 +99,7 @@ static int get_install_targets_from_line(char* target_string, char* install_type
     ***/
     char* token;
     char* target;
+    char* saveptr;
     char final_target[PATH_MAX];
     int num_targets = 0;
 
@@ -113,8 +114,8 @@ static int get_install_targets_from_line(char* target_string, char* install_type
         strip_trailing_newline(target);
 
         if (strstr(target, "%") != NULL) {
-            char* prefix = strtok(target, ".");
-            char* suffix = strtok(NULL, ".");
+            char* prefix = strtok_r(target, ".", &saveptr);
+            char* suffix = strtok_r(NULL, ".", &saveptr);
             int prefix_len = strlen(prefix);
 
             strncpy(final_target, prefix, prefix_len - 2);
@@ -501,6 +502,7 @@ static int get_num_of_asic() {
     char *line = NULL;
     char* token;
     char* platform;
+    char* saveptr;
     size_t len = 0;
     ssize_t nread;
     bool ans;
@@ -518,8 +520,8 @@ static int get_num_of_asic() {
     while ((nread = getline(&line, &len, fp)) != -1) {
         if ((strstr(line, "onie_platform") != NULL) ||
             (strstr(line, "aboot_platform") != NULL)) {
-            token = strtok(line, "=");
-            platform = strtok(NULL, "=");
+            token = strtok_r(line, "=", &saveptr);
+            platform = strtok_r(NULL, "=", &saveptr);
             strip_trailing_newline(platform);
             break;
         }
@@ -532,8 +534,8 @@ static int get_num_of_asic() {
         if (fp != NULL) {
             while ((nread = getline(&line, &len, fp)) != -1) {
                 if (strstr(line, "NUM_ASIC") != NULL) {
-                    token = strtok(line, "=");
-                    str_num_asic = strtok(NULL, "=");
+                    token = strtok_r(line, "=", &saveptr);
+                    str_num_asic = strtok_r(NULL, "=", &saveptr);
                     strip_trailing_newline(str_num_asic);
                     if (str_num_asic != NULL){
                         sscanf(str_num_asic, "%d",&num_asic);
@@ -557,6 +559,7 @@ int main(int argc, char **argv) {
     char* unit_instance;
     char* prefix;
     char* suffix;
+    char* saveptr;
     int num_unit_files;
     int num_targets;
     int r;
@@ -577,8 +580,8 @@ int main(int argc, char **argv) {
     for (int i = 0; i < num_unit_files; i++) {
         unit_instance = strdup(unit_files[i]);
         if ((num_asics == 1) && strstr(unit_instance, "@") != NULL) {
-            prefix = strtok(unit_instance, "@");
-            suffix = strtok(NULL, "@");
+            prefix = strtok_r(unit_instance, "@", &saveptr);
+            suffix = strtok_r(NULL, "@", &saveptr);
 
             strcpy(unit_instance, prefix);
             strcat(unit_instance, suffix);

From 42e29246b9b7a336a2313ddfd74972d3ac70c260 Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Mon, 22 Aug 2022 10:52:01 -0700
Subject: [PATCH 1336/1674] Add the hw reboot cause if it happened during a
 software reboot (#11792)

* Add the hw reboot cause if it happened during a software reboot

* fix the unknown software reboot cause
---
 .../scripts/determine-reboot-cause            | 68 ++++++++++++++-----
 .../tests/determine-reboot-cause_test.py      | 63 ++++++++++++++++-
 2 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/src/sonic-host-services/scripts/determine-reboot-cause b/src/sonic-host-services/scripts/determine-reboot-cause
index 1408ad0e2952..754541edb604 100755
--- a/src/sonic-host-services/scripts/determine-reboot-cause
+++ b/src/sonic-host-services/scripts/determine-reboot-cause
@@ -122,7 +122,12 @@ def find_hardware_reboot_cause():
     else:
         sonic_logger.log_info("No reboot cause found from platform api")
 
-    hardware_reboot_cause = "{} ({})".format(hardware_reboot_cause_major, hardware_reboot_cause_minor)
+    hardware_reboot_cause_minor_str = ""
+    if hardware_reboot_cause_minor:
+        hardware_reboot_cause_minor_str = " ({})".format(hardware_reboot_cause_minor)
+
+    hardware_reboot_cause = hardware_reboot_cause_major + hardware_reboot_cause_minor_str
+
     return hardware_reboot_cause
 
 
@@ -158,6 +163,50 @@ def get_reboot_cause_dict(previous_reboot_cause, comment, gen_time):
  
     return reboot_cause_dict
 
+def determine_reboot_cause():
+    # This variable is kept for future-use purpose. When proc_cmd_line/vendor/software provides
+    # any additional_reboot_info it will be stored as a "comment" in REBOOT_CAUSE_HISTORY_FILE
+    additional_reboot_info = "N/A"
+
+    # 1. Check if the previous reboot was warm/fast reboot by testing whether there is "fast|fastfast|warm" in /proc/cmdline
+    proc_cmdline_reboot_cause = find_proc_cmdline_reboot_cause()
+
+    # 2. Check if the previous reboot was caused by hardware
+    #    If yes, the hardware reboot cause will be treated as the reboot cause
+    hardware_reboot_cause = find_hardware_reboot_cause()
+
+    # 3. If there is a REBOOT_CAUSE_FILE, it will contain any software-related
+    #    reboot info. We will use it as the previous cause.
+    software_reboot_cause = find_software_reboot_cause()
+
+    # The main decision logic of the reboot cause:
+    # If there is a valid hardware reboot cause indicated by platform API, 
+    #    check the software reboot cause to add additional rebot cause.
+    # If there is a reboot cause indicated by /proc/cmdline, and/or warmreboot/fastreboot/softreboot
+    #   the software_reboot_cause which is the content of /hosts/reboot-cause/reboot-cause.txt
+    #   will be treated as the additional reboot cause
+    # Elif there is a cmdline reboot cause, 
+    #   the software_reboot_cause will be treated as the reboot cause if it's not unknown
+    #   otherwise, the cmdline_reboot_cause will be treated as the reboot cause if it's not none
+    # Else the software_reboot_cause will be treated as the reboot cause
+    if REBOOT_CAUSE_NON_HARDWARE not in hardware_reboot_cause:
+        previous_reboot_cause = hardware_reboot_cause
+        # Check if any software reboot was issued before this hardware reboot happened
+        if REBOOT_CAUSE_UNKNOWN not in software_reboot_cause:
+            additional_reboot_info = software_reboot_cause
+        elif proc_cmdline_reboot_cause is not None:
+            additional_reboot_info = proc_cmdline_reboot_cause
+    elif proc_cmdline_reboot_cause is not None:
+        if REBOOT_CAUSE_UNKNOWN not in software_reboot_cause:
+            # Get the reboot cause from REBOOT_CAUSE_FILE
+            previous_reboot_cause = software_reboot_cause
+        else:
+            previous_reboot_cause = proc_cmdline_reboot_cause
+    else:
+        previous_reboot_cause = software_reboot_cause
+
+    return previous_reboot_cause, additional_reboot_info
+
 
 def main():
     # Configure logger to log all messages INFO level and higher
@@ -177,22 +226,7 @@ def main():
     if os.path.exists(PREVIOUS_REBOOT_CAUSE_FILE):
         os.remove(PREVIOUS_REBOOT_CAUSE_FILE)
 
-    # This variable is kept for future-use purpose. When proc_cmd_line/vendor/software provides
-    # any additional_reboot_info it will be stored as a "comment" in REBOOT_CAUSE_HISTORY_FILE
-    additional_reboot_info = "N/A"
-
-    # Check if the previous reboot was warm/fast reboot by testing whether there is "fast|fastfast|warm" in /proc/cmdline
-    proc_cmdline_reboot_cause = find_proc_cmdline_reboot_cause()
-
-    # If /proc/cmdline does not indicate reboot cause, check if the previous reboot was caused by hardware
-    if proc_cmdline_reboot_cause is None:
-        previous_reboot_cause = find_hardware_reboot_cause()
-        if previous_reboot_cause.startswith(REBOOT_CAUSE_NON_HARDWARE):
-            # If the reboot cause is non-hardware, get the reboot cause from REBOOT_CAUSE_FILE
-            previous_reboot_cause = find_software_reboot_cause()
-    else:
-        # Get the reboot cause from REBOOT_CAUSE_FILE
-        previous_reboot_cause = find_software_reboot_cause()
+    previous_reboot_cause, additional_reboot_info = determine_reboot_cause()
 
     # Current time
     reboot_cause_gen_time = str(datetime.datetime.now().strftime('%Y_%m_%d_%H_%M_%S'))
diff --git a/src/sonic-host-services/tests/determine-reboot-cause_test.py b/src/sonic-host-services/tests/determine-reboot-cause_test.py
index 7d22a512f8ee..b4c07af4683b 100644
--- a/src/sonic-host-services/tests/determine-reboot-cause_test.py
+++ b/src/sonic-host-services/tests/determine-reboot-cause_test.py
@@ -54,11 +54,16 @@
 GEN_TIME_KERNEL_PANIC = "2021_3_28_13_48_49"
 
 
+REBOOT_CAUSE_UNKNOWN = "Unknown"
+REBOOT_CAUSE_NON_HARDWARE = "Non-Hardware"
+EXPECTED_NON_HARDWARE_REBOOT_CAUSE = {REBOOT_CAUSE_NON_HARDWARE, "N/A"}
+REBOOT_CAUSE_HARDWARE_OTHER = "Hardware - Other"
+EXPECTED_HARDWARE_REBOOT_CAUSE = {REBOOT_CAUSE_HARDWARE_OTHER, ""}
+
 EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE = "warm-reboot"
 EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER = "User issued 'warm-reboot' command [User: admin, Time: Mon Nov  2 22:37:45 UTC 2020]"
 EXPECTED_FIND_FIRSTBOOT_VERSION = " (First boot of SONiC version 20191130.52)"
 EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_FIRSTBOOT = "Unknown (First boot of SONiC version 20191130.52)"
-EXPECTED_HARDWARE_REBOOT_CAUSE = {"warm-reboot", ""}
 
 EXPECTED_WATCHDOG_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_15_08', 'cause': 'Watchdog', 'user': 'N/A', 'time': 'N/A'}
 EXPECTED_USER_REBOOT_CAUSE_DICT = {'comment': '', 'gen_time': '2020_10_22_03_14_07', 'cause': 'reboot', 'user': 'admin', 'time': 'Thu Oct 22 03:11:08 UTC 2020'}
@@ -104,7 +109,12 @@ def test_find_proc_cmdline_reboot_cause(self):
     def test_find_hardware_reboot_cause(self):
         with mock.patch("determine_reboot_cause.get_reboot_cause_from_platform", return_value=("Powerloss", None)):
             result = determine_reboot_cause.find_hardware_reboot_cause()
-            assert result == "Powerloss (None)"
+            assert result == "Powerloss"
+
+    def test_find_hardware_reboot_cause_with_minor(self):
+        with mock.patch("determine_reboot_cause.get_reboot_cause_from_platform", return_value=("Powerloss", "under-voltage")):
+            result = determine_reboot_cause.find_hardware_reboot_cause()
+            assert result == "Powerloss (under-voltage)"
 
     def test_get_reboot_cause_dict_watchdog(self):
         reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_WATCHDOG, "", GEN_TIME_WATCHDOG)
@@ -117,3 +127,52 @@ def test_get_reboot_cause_dict_user(self):
     def test_get_reboot_cause_dict_kernel_panic(self):
         reboot_cause_dict = determine_reboot_cause.get_reboot_cause_dict(REBOOT_CAUSE_KERNEL_PANIC, "", GEN_TIME_KERNEL_PANIC)
         assert reboot_cause_dict == EXPECTED_KERNEL_PANIC_REBOOT_CAUSE_DICT
+
+    def test_determine_reboot_cause_hardware(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=None):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=REBOOT_CAUSE_UNKNOWN):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_reboot_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_HARDWARE_REBOOT_CAUSE
+                    assert additional_reboot_info == "N/A"
+
+    def test_determine_reboot_cause_software(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=None):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_NON_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER
+                    assert additional_info == "N/A"
+
+    def test_determine_reboot_cause_cmdline_software(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_NON_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER
+                    assert additional_info == "N/A"
+
+    def test_determine_reboot_cause_cmdline_no_software(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=REBOOT_CAUSE_UNKNOWN):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_NON_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE
+                    assert additional_info == "N/A"
+
+    def test_determine_reboot_cause_cmdline_hardware(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=REBOOT_CAUSE_UNKNOWN):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_HARDWARE_REBOOT_CAUSE
+                    assert additional_info == EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE
+
+    def test_determine_reboot_cause_software_hardware(self):
+        with mock.patch("determine_reboot_cause.find_proc_cmdline_reboot_cause", return_value=EXPECTED_PARSE_WARMFAST_REBOOT_FROM_PROC_CMDLINE):
+            with mock.patch("determine_reboot_cause.find_software_reboot_cause", return_value=EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER):
+                with mock.patch("determine_reboot_cause.find_hardware_reboot_cause", return_value=EXPECTED_HARDWARE_REBOOT_CAUSE):
+                    previous_reboot_cause, additional_info = determine_reboot_cause.determine_reboot_cause()
+                    assert previous_reboot_cause == EXPECTED_HARDWARE_REBOOT_CAUSE
+                    assert additional_info == EXPECTED_FIND_SOFTWARE_REBOOT_CAUSE_USER
+

From 973fb9e494ebf522a87eea6d8192e70961454a7a Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 24 Aug 2022 19:53:11 -0700
Subject: [PATCH 1337/1674] [dhcp_relay] Add "vlan missing ip helper" dhcp
 relay unittest (#10654) (#11794)

---
 .../docker-dhcp-relay/dhcp-relay.monitors.j2  |   5 +-
 .../docker-dhcp-relay/dhcp-relay.programs.j2  |  10 +-
 .../docker-dhcp-relay/dhcpv6-relay.agents.j2  |   9 +-
 .../docker-dhcp-relay.supervisord.conf.j2     |   4 +-
 ...r-dhcp-relay-no-ip-helper.supervisord.conf |  80 ++
 .../py2/docker-dhcp-relay.supervisord.conf    |  30 +-
 ...r-dhcp-relay-no-ip-helper.supervisord.conf |  80 ++
 .../py3/docker-dhcp-relay.supervisord.conf    |  30 +-
 .../tests/t0-sample-graph.xml                 |   3 +-
 .../tests/t0-sample-no-ip-helper-graph.xml    | 938 ++++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py |   7 +
 11 files changed, 1173 insertions(+), 23 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf
 create mode 100644 src/sonic-config-engine/tests/t0-sample-no-ip-helper-graph.xml

diff --git a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
index ae11105ae3ba..0928bac22d4d 100644
--- a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
+++ b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
@@ -6,7 +6,7 @@ programs=
 {% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% set _dummy = monitor_instance.update({'flag': True}) %}
 {%- endif %}
-{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
 {% set _dummy = monitor_instance.update({'flag': True}) %}
 {%- endif %}
 {% if monitor_instance.flag %}
@@ -31,7 +31,7 @@ dhcpmon-{{ vlan_name }}
 {% endfor %}
 {% endif %}
 {# Check DHCPv6 agents #}
-{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
 {% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
 {% if dhcpv6_server | ipv6 %}
 {% set _dummy = relay_for_ipv6.update({'flag': True}) %}
@@ -68,7 +68,6 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=
 {%- if relay_for_ipv4.flag %}isc-dhcpv4-relay-{{ vlan_name }}:running {% endif %}
-{% if relay_for_ipv6.flag %}dhcp6relay:running{% endif %}
 
 
 {% set _dummy = relay_for_ipv4.update({'flag': False}) %}
diff --git a/dockers/docker-dhcp-relay/dhcp-relay.programs.j2 b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
index 9cb0c03876d6..d539d895a5bb 100644
--- a/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
+++ b/dockers/docker-dhcp-relay/dhcp-relay.programs.j2
@@ -1,5 +1,6 @@
 [group:dhcp-relay]
 programs=
+{%- set relay_for_ipv6 = { 'flag': False } %}
 {%- set add_preceding_comma = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
 {# Append DHCPv4 agents #}
@@ -8,10 +9,13 @@ programs=
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 isc-dhcpv4-relay-{{ vlan_name }}
 {%- endif %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% set _dummy = relay_for_ipv6.update({'flag': True})  %}
+{%- endif %}
+{% endfor %}
 {# Append DHCPv6 agents #}
-{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% if relay_for_ipv6.flag %}
 {% if add_preceding_comma.flag %},{% endif %}
 {% set _dummy = add_preceding_comma.update({'flag': True}) %}
 dhcp6relay
-{%- endif %}
-{% endfor %}
+{% endif %}
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
index 218c95320edc..cca0b1c4b21a 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -1,15 +1,17 @@
 {# Append DHCPv6 agents #}
-{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
-{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
+{% for vlan_name in VLAN_INTERFACE %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% for dhcpv6_server in DHCP_RELAY[vlan_name]['dhcpv6_servers'] %}
 {% if dhcpv6_server | ipv6 %}
 {% set _dummy = relay_for_ipv6.update({'flag': True}) %}
 {% endif %}
 {% endfor %}
+{% endif %}
+{% endfor %}
 {% if relay_for_ipv6.flag %}
 {% set _dummy = relay_for_ipv6.update({'flag': False}) %}
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
-
 priority=3
 autostart=false
 autorestart=false
@@ -19,4 +21,3 @@ dependent_startup=true
 dependent_startup_wait_for=start:exited
 
 {% endif %}
-{% endif %}
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
index 41a13dd496ad..ddd93bb28644 100644
--- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
+++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -48,7 +48,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
 {% set _dummy = ipv4_num_relays.update({'count': ipv4_num_relays.count + 1}) %}
 {% endif %}
-{% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
 {% set _dummy = ipv6_num_relays.update({'count': ipv6_num_relays.count + 1}) %}
 {% endif %}
 {% endfor %}
@@ -62,9 +62,9 @@ dependent_startup_wait_for=rsyslogd:running
 {% set relay_for_ipv6 = { 'flag': False } %}
 {% for vlan_name in VLAN_INTERFACE %}
 {% include 'dhcpv4-relay.agents.j2' %}
-{% include 'dhcpv6-relay.agents.j2' %}
 {% endfor %}
 
+{% include 'dhcpv6-relay.agents.j2' %}
 {% include 'dhcp-relay.monitors.j2' %}
 {% endif %}
 {% endif %}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf
new file mode 100644
index 000000000000..c36dbe22533b
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf
@@ -0,0 +1,80 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[eventlistener:dependent-startup]
+command=python3 -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+buffer_size=1024
+
+[eventlistener:supervisor-proc-exit-listener]
+command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
+autostart=true
+autorestart=unexpected
+buffer_size=1024
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+
+[program:start]
+command=/usr/bin/start.sh
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
+[group:dhcp-relay]
+programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
+
+
+[program:isc-dhcpv4-relay-Vlan1000]
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+
+[program:dhcp6relay]
+command=/usr/sbin/dhcp6relay
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+[group:dhcpmon]
+programs=dhcpmon-Vlan1000
+
+[program:dhcpmon-Vlan1000]
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running 
+
+
diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
index 407ac2c80bc9..9d4a9d22de47 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
@@ -40,7 +40,8 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [group:dhcp-relay]
-programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
+programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv4-relay-Vlan2000,dhcp6relay
+
 
 [program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.1 192.0.0.2
@@ -52,9 +53,19 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:isc-dhcpv4-relay-Vlan2000]
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan2000 -iu Vlan1000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 192.0.0.3 192.0.0.4
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
-
 priority=3
 autostart=false
 autorestart=false
@@ -63,9 +74,8 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
-
 [group:dhcpmon]
-programs=dhcpmon-Vlan1000
+programs=dhcpmon-Vlan1000,dhcpmon-Vlan2000
 
 [program:dhcpmon-Vlan1000]
 command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
@@ -75,6 +85,16 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running dhcp6relay:running
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running 
+
+[program:dhcpmon-Vlan2000]
+command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running 
 
 
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf
new file mode 100644
index 000000000000..35ad0c48b82f
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf
@@ -0,0 +1,80 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[eventlistener:dependent-startup]
+command=python3 -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+buffer_size=1024
+
+[eventlistener:supervisor-proc-exit-listener]
+command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
+events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
+autostart=true
+autorestart=unexpected
+buffer_size=1024
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+
+[program:start]
+command=/usr/bin/start.sh
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
+[group:dhcp-relay]
+programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
+
+
+[program:isc-dhcpv4-relay-Vlan1000]
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+
+[program:dhcp6relay]
+command=/usr/sbin/dhcp6relay
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+[group:dhcpmon]
+programs=dhcpmon-Vlan1000
+
+[program:dhcpmon-Vlan1000]
+command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running 
+
+
diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
index 5456409738e6..7ea29dfcd635 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
@@ -40,7 +40,8 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
 [group:dhcp-relay]
-programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
+programs=isc-dhcpv4-relay-Vlan1000,isc-dhcpv4-relay-Vlan2000,dhcp6relay
+
 
 [program:isc-dhcpv4-relay-Vlan1000]
 command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.1 192.0.0.2
@@ -52,9 +53,19 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:isc-dhcpv4-relay-Vlan2000]
+command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan2000 -iu Vlan1000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 192.0.0.3 192.0.0.4
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+
+
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
-
 priority=3
 autostart=false
 autorestart=false
@@ -63,9 +74,8 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
-
 [group:dhcpmon]
-programs=dhcpmon-Vlan1000
+programs=dhcpmon-Vlan1000,dhcpmon-Vlan2000
 
 [program:dhcpmon-Vlan1000]
 command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
@@ -75,6 +85,16 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running dhcp6relay:running
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running 
+
+[program:dhcpmon-Vlan2000]
+command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running 
 
 
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index c06cc708c1ce..88d325b09d1b 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -270,7 +270,8 @@
           <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
           <FhrpProtoType i:nil="true"/>
           <Type i:nil="true"/>
-          <DhcpRelays></DhcpRelays>
+          <DhcpRelays>192.0.0.3;192.0.0.4</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
           <VlanID>2000</VlanID>
           <Tag>2000</Tag>
           <Subnets>192.168.200.0/27</Subnets>
diff --git a/src/sonic-config-engine/tests/t0-sample-no-ip-helper-graph.xml b/src/sonic-config-engine/tests/t0-sample-no-ip-helper-graph.xml
new file mode 100644
index 000000000000..b02304a49e14
--- /dev/null
+++ b/src/sonic-config-engine/tests/t0-sample-no-ip-helper-graph.xml
@@ -0,0 +1,938 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+       <BGPSession>
+         <StartRouter>switch-t0</StartRouter>
+         <StartPeer>10.1.0.32</StartPeer>
+         <EndRouter>BGPMonitor</EndRouter>
+         <EndPeer>10.20.30.40</EndPeer>
+         <Multihop>30</Multihop>
+         <HoldTime>10</HoldTime>
+         <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>switch-t0</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>180</HoldTime>
+        <KeepAliveTime>60</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+          <a:ASN>1</a:ASN>
+          <a:BgpGroups/>
+          <a:Hostname>BGPMonitor</a:Hostname>
+          <a:Peers>
+              <BGPPeer>
+                  <ElementType>BGPPeer</ElementType>
+                  <Address>10.1.0.32</Address>
+                  <RouteMapIn i:nil="true"/>
+                  <RouteMapOut i:nil="true"/>
+                  <Vrf i:nil="true"/>
+              </BGPPeer>
+          </a:Peers>
+          <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>switch-t0</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP1</Name>
+          <AttachTo>Loopback1</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.10.0.99/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.10.0.99/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP2</Name>
+          <AttachTo>Loopback2</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.0.64/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.0.64/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>LoopbackIP3</Name>
+          <AttachTo>Loopback3</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.21.64.2/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.21.64.2/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+       </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.0.0.100/24</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.0.0.100/24</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>2603:10e2:0:2902::8/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>2603:10e2:0:2902::8/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>switch-t0</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel01</Name>
+          <AttachTo>fortyGigE0/112</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel02</Name>
+          <AttachTo>fortyGigE0/116</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel03</Name>
+          <AttachTo>fortyGigE0/120</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel04</Name>
+          <AttachTo>fortyGigE0/124</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type i:nil="true"/>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan2000</Name>
+          <AttachTo>fortyGigE0/112;fortyGigE0/116;fortyGigE0/120</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type i:nil="true"/>
+          <DhcpRelays></DhcpRelays>
+          <Dhcpv6Relays></Dhcpv6Relays>
+          <VlanID>2000</VlanID>
+          <Tag>2000</Tag>
+          <Subnets>192.168.200.0/27</Subnets>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan99</Name>
+          <AttachTo>fortyGigE0/100</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>99</VlanID>
+          <Tag>99</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+        <VlanInterface>
+          <Name>Vlan98</Name>
+          <AttachTo>fortyGigE0/100;PortChannel01;PortChannel03</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <FhrpProtoType i:nil="true"/>
+          <Type>UserDefinedL2Vlan</Type>
+          <DhcpRelays>192.0.0.1;192.0.0.2</DhcpRelays>
+          <VlanID>98</VlanID>
+          <Tag>98</Tag>
+          <Subnets/>
+          <MacAddress i:nil="true"/>
+          <SecondarySubnets/>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel01</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel02</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel02</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel03</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel03</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel04</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel04</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/27</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan2000</AttachTo>
+          <Prefix>192.168.200.1/27</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANv6</AttachTo>
+          <InAcl>everflowV6</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+	<AclInterface>
+          <AttachTo>EGRESS_ERSPAN</AttachTo>
+	  <OutAcl>everflow_egress</OutAcl>
+	  <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel01;PortChannel02;PortChannel03;PortChannel04</AttachTo>
+          <InAcl>DataAclIngress</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel01;PortChannel02;Vlan98</AttachTo>
+          <OutAcl>DataAclEgress</OutAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>SNMP_ACL</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>NTP</AttachTo>
+          <InAcl>NTP_ACL</InAcl>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SSH</AttachTo>
+          <InAcl>SSH_ACL</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SSH</AttachTo>
+          <InAcl>ROUTER-PROTECT</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>SNMP</AttachTo>
+          <InAcl>ROUTER-PROTECT</InAcl>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>NTP</AttachTo>
+          <InAcl>NTP_ACL</InAcl>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/112</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/116</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/120</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1/1</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/124</StartPort>
+        <Bandwidth>100000</Bandwidth>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <Bandwidth>100000</Bandwidth>
+        <EndDevice>switch-t0</EndDevice>
+        <EndPort>fortyGigE0/4</EndPort>
+        <FlowControl>true</FlowControl>
+        <StartDevice>ARISTA05T1</StartDevice>
+        <StartPort>Ethernet1/33</StartPort>
+        <Validate>true</Validate>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>Servers0</EndDevice>
+        <EndPort>eth0</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/4</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>Servers100</EndDevice>
+        <EndPort>eth0</EndPort>
+        <StartDevice>switch-t0</StartDevice>
+        <StartPort>fortyGigE0/100</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>switch-t0</Hostname>
+        <HwSku>Force10-S6000</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA01T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA02T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA03T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+      <Device i:type="LeafRouter">
+        <Hostname>ARISTA04T1</Hostname>
+        <HwSku>Arista</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet0</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet36</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet40</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet44</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet48</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet52</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet56</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet60</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet64</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet68</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet72</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet76</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet80</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet84</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet88</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet92</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet96</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet100</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet104</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet108</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet112</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet116</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet120</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <HwSku>Force10-S6000</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>switch-t0</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>2.2.2.2</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <LinkMetadataDeclaration>
+    <Link xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>FECDisabled</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA05T1:Ethernet1/33;switch-t0:fortyGigE0/4</a:Key>
+      </a:LinkMetadata>
+      <a:LinkMetadata>
+        <a:Name i:nil="true"/>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>AutoNegotiation</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>False</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>FECDisabled</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>True</a:Value>
+          </a:DeviceProperty>
+        </a:Properties>
+        <a:Key>ARISTA06T1:Ethernet1/34;switch-t0:fortyGigE0/8</a:Key>
+      </a:LinkMetadata>
+    </Link>
+  </LinkMetadataDeclaration>
+<MetadataDeclaration>
+ <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+  <a:DeviceMetadata>
+   <a:Name>switch-t0</a:Name>
+   <a:Properties>
+    <a:DeviceProperty>
+     <a:Name>DeploymentId</a:Name>
+     <a:Reference i:nil="true"/>
+     <a:Value>1</a:Value>
+    </a:DeviceProperty>
+  </a:Properties>
+  </a:DeviceMetadata>
+ </Devices>
+ <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+</MetadataDeclaration>
+  <Hostname>switch-t0</Hostname>
+  <HwSku>Force10-S6000</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 0bc849656575..d6a214809c69 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -24,6 +24,7 @@ def setUp(self):
         self.multi_asic_minigraph = os.path.join(self.test_dir, 'multi_npu_data', 'sample-minigraph.xml')
         self.multi_asic_port_config = os.path.join(self.test_dir, 'multi_npu_data', 'sample_port_config-0.ini')
         self.radv_test_minigraph = os.path.join(self.test_dir, 'radv-test-sample-graph.xml')
+        self.no_ip_helper_minigraph = os.path.join(self.test_dir, 't0-sample-no-ip-helper-graph.xml')
         self.output_file = os.path.join(self.test_dir, 'output')
         os.environ["CFGGEN_UNIT_TESTING"] = "2"
 
@@ -107,6 +108,12 @@ def test_dhcp_relay(self):
         self.run_script(argument)
         self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'docker-dhcp-relay.supervisord.conf'), self.output_file))
 
+        # Test generation of docker-dhcp-relay.supervisord.conf when a vlan is missing ip/ipv6 helpers
+        template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-dhcp-relay', 'docker-dhcp-relay.supervisord.conf.j2')
+        argument = '-m ' + self.no_ip_helper_minigraph + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
+        self.run_script(argument)
+        self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'docker-dhcp-relay-no-ip-helper.supervisord.conf'), self.output_file))
+
     def test_radv(self):
         # Test generation of radvd.conf with multiple ipv6 prefixes
         template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-router-advertiser', 'radvd.conf.j2')

From 62c6fb2eabca7c36b592f020cb975286d17784a9 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Thu, 25 Aug 2022 17:14:54 -0700
Subject: [PATCH 1338/1674] Update cisco-8000 submodule to v0.111 (#11835)

Update cisco-8000 submodule to v0.111 drop
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 39edd61f25e6..7327f59c4d95 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.107
+ref=202012-v0.111

From 347b2dddcdcda77af655cc828cd472aa15e5dae8 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 29 Aug 2022 14:08:14 +0800
Subject: [PATCH 1339/1674] [ci/build]: Upgrade SONiC package versions (#11757)

---
 .../build/build-sonic-slave-buster/versions-git      |  4 ++--
 .../build/build-sonic-slave-buster/versions-py3      |  6 +++---
 .../build-sonic-slave-buster/versions-py3-all-arm64  |  3 ++-
 .../build-sonic-slave-buster/versions-py3-all-armhf  |  3 ++-
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  6 +++---
 files/build/versions/default/versions-web            |  2 +-
 .../dockers/docker-config-engine-buster/versions-py3 |  2 +-
 files/build/versions/dockers/docker-ptf/versions-py2 |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3 |  4 ++--
 .../versions/dockers/docker-sonic-vs/versions-py2    |  2 +-
 .../versions/dockers/docker-sonic-vs/versions-py3    |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster   | 11 +++++------
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../versions/dockers/sonic-slave-buster/versions-py3 |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  2 +-
 .../versions/host-image/versions-deb-buster-arm64    |  2 +-
 .../versions/host-image/versions-deb-buster-armhf    |  2 +-
 files/build/versions/host-image/versions-py3         |  8 ++++----
 20 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index da70e218b7b1..0b4ee57fa9e7 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -5,10 +5,10 @@ https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
-https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520
+https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
-https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
+https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index a8d7da245960..31151b99f696 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,6 +1,6 @@
-charset-normalizer==2.1.0
+charset-normalizer==2.1.1
 click==7.0
-docker==5.0.3
+docker==6.0.0
 ijson==2.6.1
 ipaddress==1.0.23
 jsondiff==2.0.0
@@ -12,6 +12,6 @@ psutil==5.9.1
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.10
-websocket-client==1.3.3
+websocket-client==1.4.0
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
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
index 1b5ad59ac9df..ab8db0a0df70 100644
--- 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,3 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.28.1
\ No newline at end of file
+requests==2.28.1
+urllib3==1.26.12
\ No newline at end of file
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
index 1b5ad59ac9df..ab8db0a0df70 100644
--- 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,3 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.28.1
\ No newline at end of file
+requests==2.28.1
+urllib3==1.26.12
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index e22333a98bd9..06eb9bdc2c4d 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:7e1f93236be2e4a04a2b83e7fda8c0186e72e4c1e8cc830e097710ccc71d2dcf
+amd64:amd64/debian:buster==sha256:faa416b9eeda2cbdb796544422eedd698e716dbd99841138521a94db51bf6123
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
+amd64:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:d0f5ed350e7624e19f0f40c2c0cc31b0b2811f444ca929a083fefe449432333d
-arm64:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
+arm64:arm64v8/debian:buster==sha256:46f5b3c07b5e5aa83547cf697dcfe097052ff88018481fe615206c5651d75ba0
+arm64:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:1f7bef58f2040ee2d97c1f40eb5ff29f8c2aa51eeaa90931ac11e7c6680103aa
-armhf:debian:buster==sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f
+armhf:arm32v7/debian:buster==sha256:49b349ff803f83f12723092ee7a1052f06156c20fa788f24b795988a614279d6
+armhf:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index debe56e88395..476ab6569fef 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -11,10 +11,10 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
-https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520
+https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
-https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee
+https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 8b638e27a593..83bda16e5d92 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==badb28cf0604d9ff24c5fc3396b594d4
+https://deb.nodesource.com/setup_14.x==b692a224c718ad6e1cbd17eda8aaa673
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index e71149dad247..80a4396adaf4 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.7.25
+regex==2022.8.17
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 87c8a5d16e7d..c44749bd76b1 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -6,7 +6,7 @@ click==7.1.2
 contextlib2==0.6.0.post1
 cryptography==3.3.2
 decorator==4.4.2
-dpkt==1.9.7.2
+dpkt==1.9.8
 enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 456819069211..583032f524a1 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
 attrs==22.1.0
 certifi==2017.4.17
-charset-normalizer==2.1.0
+charset-normalizer==2.1.1
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
@@ -12,7 +12,7 @@ importlib-metadata==4.12.0
 importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.9.1
+jsonschema==4.14.0
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
 pkgutil_resolve_name==1.3.10
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index f6389557e01f..86bba8faec64 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.11
\ No newline at end of file
+urllib3==1.26.12
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index ee93e3c615cc..005f34eaba73 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2022.6.15
-charset-normalizer==2.1.0
+charset-normalizer==2.1.1
 click==7.0
 idna==3.3
 ijson==2.6.1
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.28.1
 scapy==2.4.4
 tabulate==0.8.10
-urllib3==1.26.11
+urllib3==1.26.12
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 7892d9233999..15e1145efac5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.7-1
+containerd.io==1.6.8-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -102,9 +102,9 @@ dwz==0.12-3
 eatmydata==105-7
 emacsen-common==3.0.4
 equivs==2.2.0
-exim4-base==4.92-8+deb10u6
-exim4-config==4.92-8+deb10u6
-exim4-daemon-light==4.92-8+deb10u6
+exim4-base==4.92-8+deb10u7
+exim4-config==4.92-8+deb10u7
+exim4-daemon-light==4.92-8+deb10u7
 expat==2.2.6-2+deb10u4
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
@@ -556,7 +556,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
 libgnutls-dane0==3.6.7-4+deb10u9
 libgnutls-openssl27==3.6.7-4+deb10u9
 libgnutls28-dev==3.6.7-4+deb10u9
-libgnutls30==3.6.7-4+deb10u9
 libgnutlsxx28==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
@@ -664,7 +663,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.16-1+deb10u1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
-libjetty9-java==9.4.16-0+deb10u1
+libjetty9-java==9.4.16-0+deb10u2
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjs-bootstrap==3.4.1+dfsg-1
 libjs-jquery==3.3.1~dfsg-3+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b6445f629357..b891abb29c8f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 6bb93e7b15f4..691707dc8da8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.7.25
+regex==2022.8.17
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b6445f629357..b891abb29c8f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==268d645853ee8e1b884260049e5464a5ca2d8a30
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 66df5e12d018..e30005ad69e9 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.7-1
+containerd.io==1.6.8-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 8f0adeed12e2..f8897af63372 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -30,6 +30,6 @@ openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 rsyslog==8.1901.0-1+deb10u1
 tsingma-bsp==1.0
-tzdata==2021a-0+deb10u5
+tzdata==2021a-0+deb10u6
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index fdf7ab9b15b9..4fcd3403440c 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -30,6 +30,6 @@ mrvlprestera==1.0
 openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
 rsyslog==8.1901.0-1+deb10u1
-tzdata==2021a-0+deb10u5
+tzdata==2021a-0+deb10u6
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 41d78ade9df5..9359a4fb15fe 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2022.6.15
 cffi==1.15.1
-charset-normalizer==2.1.0
+charset-normalizer==2.1.1
 click==7.0
 cryptography==37.0.4
 docker==4.3.1
@@ -32,13 +32,13 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.7.25
+regex==2022.8.17
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0
 tabulate==0.8.10
 thrift==0.13.0
-urllib3==1.26.11
+urllib3==1.26.12
 watchdog==0.10.3
-websocket-client==1.3.3
+websocket-client==1.4.0
 xmltodict==0.12.0
\ No newline at end of file

From 8e0393927f7454911529a70d2b19b470d54ac085 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 30 Aug 2022 16:28:11 +0800
Subject: [PATCH 1340/1674] [submodules] Upgrade HEAD pointer of
 sonic-mgmt-framework to fix CG alert (#11871)

---
 src/sonic-mgmt-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-mgmt-framework b/src/sonic-mgmt-framework
index 3c3384cec8d1..bd79561c70aa 160000
--- a/src/sonic-mgmt-framework
+++ b/src/sonic-mgmt-framework
@@ -1 +1 @@
-Subproject commit 3c3384cec8d15e493e6889bff6361a5a280a8811
+Subproject commit bd79561c70aa3da2267c8c767a899833f432dd0f

From ed68e4c97c9af46e63988d71599a2947114bb247 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:44:47 +0800
Subject: [PATCH 1341/1674] [ci/build]: Upgrade SONiC package versions (#11896)

---
 files/build/versions/default/versions-git            |  2 +-
 .../dockers/docker-base-buster/versions-deb-buster   |  4 ++--
 .../dockers/docker-syncd-bfn/versions-deb-buster     |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster   | 12 ++++++------
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  6 +++---
 .../versions/host-image/versions-deb-buster-arm64    |  3 +++
 .../versions/host-image/versions-deb-buster-armhf    |  3 +++
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 476ab6569fef..0a75d6d99f09 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 933f061ad6cf..b73b037c50c9 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -1,9 +1,9 @@
 ca-certificates==20200601~deb10u2
-curl==7.64.0-4+deb10u2
+curl==7.64.0-4+deb10u3
 jq==1.5+dfsg-2+b1
 less==487-0.1+b1
 libatomic1==8.3.0-6
-libcurl4==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u3
 libdaemon0==0.14-7
 libdbus-1-3==1.12.20-0+deb10u1
 libestr0==0.1.10-2.1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 714e0de0a715..77895b42f41c 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -3,8 +3,8 @@ bfnsdk==1.0.0
 libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4-gnutls-dev==7.64.0-4+deb10u2
+libcurl3-gnutls==7.64.0-4+deb10u3
+libcurl4-gnutls-dev==7.64.0-4+deb10u3
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 15e1145efac5..3d832de2a610 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -58,7 +58,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u2
+curl==7.64.0-4+deb10u3
 dbus==1.12.20-0+deb10u1
 dbus-user-session==1.12.20-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
@@ -398,10 +398,10 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13
 libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u6
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl3-nss==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
-libcurl4-nss-dev==7.64.0-4+deb10u2
+libcurl3-gnutls==7.64.0-4+deb10u3
+libcurl3-nss==7.64.0-4+deb10u3
+libcurl4==7.64.0-4+deb10u3
+libcurl4-nss-dev==7.64.0-4+deb10u3
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
@@ -755,7 +755,7 @@ libmaven-reporting-impl-java==3.0.0-2
 libmaven-resolver-java==1.3.1-1
 libmaven-resources-plugin-java==3.1.0-1
 libmaven-shared-incremental-java==1.1-3
-libmaven-shared-utils-java==3.3.0-1
+libmaven-shared-utils-java==3.3.0-1+deb10u1
 libmaven-site-plugin-java==3.6-3
 libmaven3-core-java==3.6.0-1
 libmime-tools-perl==5.509-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b891abb29c8f..7a060c49256a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b891abb29c8f..7a060c49256a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b7ec673cccc42bce346234209dfd194b7911e169
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index e30005ad69e9..9db16421eed4 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -19,7 +19,7 @@ cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u2
+curl==7.64.0-4+deb10u3
 dbus==1.12.20-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
@@ -101,8 +101,8 @@ libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
+libcurl3-gnutls==7.64.0-4+deb10u3
+libcurl4==7.64.0-4+deb10u3
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index f8897af63372..a559cd4126a6 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,4 +1,5 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+curl==7.64.0-4+deb10u2
 dirmngr==2.2.12-1+deb10u1
 dpkg-dev==1.19.7
 gnupg==2.2.12-1+deb10u1
@@ -13,6 +14,8 @@ gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u2
 libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 4fcd3403440c..8516bf3e77b9 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,4 +1,5 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+curl==7.64.0-4+deb10u2
 dirmngr==2.2.12-1+deb10u1
 dpkg-dev==1.19.7
 gnupg==2.2.12-1+deb10u1
@@ -13,6 +14,8 @@ gpgconf==2.2.12-1+deb10u1
 gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
+libcurl3-gnutls==7.64.0-4+deb10u2
+libcurl4==7.64.0-4+deb10u2
 libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3

From 932af450ed06138017fbf77d4ec6c67baec93898 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 31 Aug 2022 16:31:48 +0800
Subject: [PATCH 1342/1674] [actions] Update github actions label and
 automerge. (#11736) (#11909)

1. Add auto approve step when adding label to version upgrading PR.
2. Use mssonicbld TOKEN to merge version upgrading PR instead of 'github actions'
---
 .github/workflows/label.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index f8ae8e7199a2..ee4857fe23f1 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -20,6 +20,13 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
+    - name: approve
+      run: |
+        set -e
+        echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+        url=$(echo $GITHUB_CONTEXT | jq -r '.event.pull_request._links.html.href')
+        echo PR: $url
+        gh pr review $url --approve
     - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From c1712b8c9a556c9b56f9c51af7fcad5d240d0c15 Mon Sep 17 00:00:00 2001
From: Arun Saravanan Balachandran
 <52521751+ArunSaravananBalachandran@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:36:47 +0530
Subject: [PATCH 1343/1674] [202012] DellEMC: S6000, S6100, Z9332f - Add
 capabilities fields in platform.json (#11772)

---
 .../x86_64-dell_s6000_s1220-r0/platform.json  | 238 +++++++--
 .../x86_64-dell_s6100_c2538-r0/platform.json  | 179 ++++++-
 .../platform.json                             | 483 ++++++++++++++----
 .../system_health_monitoring_config.json      |   2 +-
 .../z9332f/sonic_platform/chassis.py          |  12 +-
 5 files changed, 750 insertions(+), 164 deletions(-)

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/platform.json b/device/dell/x86_64-dell_s6000_s1220-r0/platform.json
index 62a53fe328fc..283906c407e0 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/platform.json
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/platform.json
@@ -1,6 +1,10 @@
 {
     "chassis": {
         "name": "S6000",
+        "status_led": {
+            "controllable": true,
+            "colors": ["amber", "blinking amber", "green", "blinking green"]
+        },
         "components": [
             {
                 "name": "BIOS"
@@ -17,55 +21,151 @@
         ],
         "fans": [
             {
-                "name": "FanTray1-Fan1"
-            },
-            {
-                "name": "FanTray1-Fan2"
-            },
-            {
-                "name": "FanTray2-Fan1"
-            },
-            {
-                "name": "FanTray2-Fan2"
-            },
-            {
-                "name": "FanTray3-Fan1"
-            },
-            {
-                "name": "FanTray3-Fan2"
+                "name": "FanTray1-Fan1",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray1-Fan2",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray2-Fan1",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray2-Fan2",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray3-Fan1",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray3-Fan2",
+                "speed": {
+                    "controllable": true,
+                    "minimum": 40
+                },
+                "status_led": {
+                    "available": false
+                }
             }
         ],
         "fan_drawers":[
             {
                 "name": "FanTray1",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["amber", "green", "off"]
+                },
                 "fans": [
                     {
-                        "name": "FanTray1-Fan1"
+                        "name": "FanTray1-Fan1",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray1-Fan2"
+                        "name": "FanTray1-Fan2",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray2",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["amber", "green", "off"]
+                },
                 "fans": [
                     {
-                        "name": "FanTray2-Fan1"
+                        "name": "FanTray2-Fan1",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray2-Fan2"
+                        "name": "FanTray2-Fan2",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray3",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["amber", "green", "off"]
+                },
                 "fans": [
                     {
-                        "name": "FanTray3-Fan1"
+                        "name": "FanTray3-Fan1",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray3-Fan2"
+                        "name": "FanTray3-Fan2",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             }
@@ -73,55 +173,125 @@
         "psus": [
             {
                 "name": "PSU1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU1 Fan"
+                        "name": "PSU1 Fan",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ],
                 "thermals": [
                     {
-                        "name": "PSU1-Sensor 1"
+                        "name": "PSU1-Sensor 1",
+                        "controllable": false,
+                        "low-crit-threshold": false,
+                        "high-crit-threshold": false,
+                        "minimum-recorded": false,
+                        "maximum-recorded": false
                     },
                     {
-                        "name": "PSU1-Sensor 2"
+                        "name": "PSU1-Sensor 2",
+                        "controllable": false,
+                        "low-crit-threshold": false,
+                        "high-crit-threshold": false,
+                        "minimum-recorded": false,
+                        "maximum-recorded": false
                     }
                 ]
             },
             {
                 "name": "PSU2",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU2 Fan"
+                        "name": "PSU2 Fan",
+                        "speed": {
+                            "controllable": true,
+                            "minimum": 40
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ],
                 "thermals": [
                     {
-                        "name": "PSU2-Sensor 1"
+                        "name": "PSU2-Sensor 1",
+                        "controllable": false,
+                        "low-crit-threshold": false,
+                        "high-crit-threshold": false,
+                        "minimum-recorded": false,
+                        "maximum-recorded": false
                     },
                     {
-                        "name": "PSU2-Sensor 2"
+                        "name": "PSU2-Sensor 2",
+                        "controllable": false,
+                        "low-crit-threshold": false,
+                        "high-crit-threshold": false,
+                        "minimum-recorded": false,
+                        "maximum-recorded": false
                     }
                 ]
             }
         ],
         "thermals": [
             {
-                "name": "ASIC On-board"
+                "name": "ASIC On-board",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "NIC"
+                "name": "NIC",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "System Front"
+                "name": "System Front",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "DIMM"
+                "name": "DIMM",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 0"
+                "name": "CPU Core 0",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 1"
+                "name": "CPU Core 1",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             }
         ],
         "modules": [],
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/platform.json b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
index 24e32b16bb15..8e9a0f17db16 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
@@ -1,6 +1,11 @@
 {
     "chassis": {
         "name": "S6100-ON",
+        "status_led": {
+            "controllable": true,
+            "colors": ["amber", "blinking amber", "green", "blinking green"]
+        },
+        "thermal_manager" : false,
         "components": [
             {
                 "name": "BIOS"
@@ -14,48 +19,108 @@
         ],
         "fans": [
             {
-                "name": "FanTray1-Fan1"
-            },
-            {
-                "name": "FanTray2-Fan1"
-            },
-            {
-                "name": "FanTray3-Fan1"
-            },
-            {
-                "name": "FanTray4-Fan1"
+                "name": "FanTray1-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray2-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray3-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray4-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
             }
         ],
         "fan_drawers":[
             {
                 "name": "FanTray1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray1-Fan1"
+                        "name": "FanTray1-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray2",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray2-Fan1"
+                        "name": "FanTray2-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray3",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray3-Fan1"
+                        "name": "FanTray3-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray4",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray4-Fan1"
+                        "name": "FanTray4-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             }
@@ -63,51 +128,113 @@
         "psus": [
             {
                 "name": "PSU1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU1 Fan"
+                        "name": "PSU1 Fan",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "PSU2",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU2 Fan"
+                        "name": "PSU2 Fan",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             }
         ],
         "thermals": [
             {
-                "name": "CPU On-board"
+                "name": "CPU On-board",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "ASIC On-board Front"
+                "name": "ASIC On-board Front",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "System Front"
+                "name": "System Front",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "ASIC On-board Rear"
+                "name": "ASIC On-board Rear",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "Front GE board"
+                "name": "Front GE board",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "Front SFP+ board"
+                "name": "Front SFP+ board",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 0"
+                "name": "CPU Core 0",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 1"
+                "name": "CPU Core 1",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 2"
+                "name": "CPU Core 2",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             },
             {
-                "name": "CPU Core 3"
+                "name": "CPU Core 3",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             }
         ],
         "modules": [
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
index 2c603dd722fa..98a3322bf334 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
@@ -1,6 +1,11 @@
 {
     "chassis": {
         "name": "Z9332F-ON",
+        "status_led": {
+            "controllable": true,
+            "colors": ["green", "flashing green", "yellow", "flashing yellow"]
+        },
+        "thermal_manager" : false,
         "components": [
             {
                 "name": "BIOS"
@@ -29,123 +34,312 @@
         ],
         "fans": [
             {
-                "name": "FanTray1-Fan1"
-            },
-            {
-                "name": "FanTray1-Fan2"
-            },
-            {
-                "name": "FanTray2-Fan1"
-            },
-            {
-                "name": "FanTray2-Fan2"
-            },
-            {
-                "name": "FanTray3-Fan1"
-            },
-            {
-                "name": "FanTray3-Fan2"
-            },
-            {
-                "name": "FanTray4-Fan1"
-            },
-            {
-                "name": "FanTray4-Fan2"
-            },
-            {
-                "name": "FanTray5-Fan1"
-            },
-            {
-                "name": "FanTray5-Fan2"
-            },
-            {
-                "name": "FanTray6-Fan1"
-            },
-            {
-                "name": "FanTray6-Fan2"
-            },
-            {
-                "name": "FanTray7-Fan1"
-            },
-            {
-                "name": "FanTray7-Fan2"
+                "name": "FanTray1-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray1-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray2-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray2-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray3-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray3-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray4-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray4-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray5-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray5-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray6-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray6-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray7-Fan1",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
+            },
+            {
+                "name": "FanTray7-Fan2",
+                "speed": {
+                    "controllable": false
+                },
+                "status_led": {
+                    "available": false
+                }
             }
         ],
         "fan_drawers":[
             {
                 "name": "FanTray1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray1-Fan1"
+                        "name": "FanTray1-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray1-Fan2"
+                        "name": "FanTray1-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray2",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray2-Fan1"
+                        "name": "FanTray2-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray2-Fan2"
+                        "name": "FanTray2-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray3",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray3-Fan1"
+                        "name": "FanTray3-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray3-Fan2"
+                        "name": "FanTray3-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray4",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray4-Fan1"
+                        "name": "FanTray4-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray4-Fan2"
+                        "name": "FanTray4-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
-                        {
+            {
                 "name": "FanTray5",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray5-Fan1"
+                        "name": "FanTray5-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray5-Fan2"
+                        "name": "FanTray5-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray6",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray6-Fan1"
+                        "name": "FanTray6-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray6-Fan2"
+                        "name": "FanTray6-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "FanTray7",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "FanTray7-Fan1"
+                        "name": "FanTray7-Fan1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     },
                     {
-                        "name": "FanTray7-Fan2"
+                        "name": "FanTray7-Fan2",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             }
@@ -153,63 +347,158 @@
         "psus": [
             {
                 "name": "PSU1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU1 Fan"
+                        "name": "PSU1 Fan",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             },
             {
                 "name": "PSU2",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "PSU2 Fan"
+                        "name": "PSU2 Fan",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
+                        }
                     }
                 ]
             }
         ],
         "thermals": [
             {
-                "name": "CPU On-board"
-            },
-            {
-                "name": "Baseboard U3"
-            },
-            {
-                "name": "SW Internal"
-            },
-            {
-                "name": "Fan U52"
-            },
-            {
-                "name": "Fan U17"
-            },
-            {
-                "name": "SW U52"
-            },
-            {
-                "name": "SW U16"
-            },
-            {
-                "name": "PSU1 Inlet"
-            },
-            {
-                "name": "PSU1 Hotspot"
-            },
-            {
-                "name": "PSU2 Inlet"
-            },
-            {
-                "name": "PSU2 Hotspot"
-            },
-            {
-                "name": "SW U04"
-            },
-            {
-                "name": "SW U14"
-            },
-            {
-                "name": "SW U4403"
+                "name": "CPU On-board",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "Baseboard U3",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW Internal",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "Fan U52",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "Fan U17",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW U52",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW U16",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "PSU1 Inlet",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "PSU1 Hotspot",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "PSU2 Inlet",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "PSU2 Hotspot",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW U04",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW U14",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
+            },
+            {
+                "name": "SW U4403",
+                "controllable": false,
+                "low-crit-threshold": false,
+                "high-threshold": false,
+                "high-crit-threshold": false,
+                "minimum-recorded": false,
+                "maximum-recorded": false
             }
         ],
         "modules": [],
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json b/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
index d52b24cf905d..4f82136007a3 100644
--- a/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
+++ b/device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
@@ -6,6 +6,6 @@
     "led_color": {
         "fault": "yellow",
         "normal": "green",
-        "booting": "flash_green"
+        "booting": "flashing green"
     }
 }
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
index 72f46653d51a..e14ce1ce4ddb 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
@@ -59,17 +59,17 @@ class Chassis(ChassisBase):
     SYSLED_COLOR_TO_REG = {
        "green": 0xd0,
        "yellow": 0xe0,
-       "flash_green": 0xd2,
-       "flash_yellow": 0xe2
+       "flashing green": 0xd2,
+       "flashing yellow": 0xe2
        }
 
     REG_TO_SYSLED_COLOR = {
         0xd0 : "green",
         0xe0 : "yellow",
-        0xd2 : "flash_green",
-        0xd1 : "flash_green",
-        0xe2 : "flash_yellow",
-        0xe1 : "flash_yellow"
+        0xd2 : "flashing green",
+        0xd1 : "flashing green",
+        0xe2 : "flashing yellow",
+        0xe1 : "flashing yellow"
         }
 
     _global_port_pres_dict = {}

From 8c57f0521f3be4daca3db94aac35e97db6b285f8 Mon Sep 17 00:00:00 2001
From: Dev Ojha <47282568+developfast@users.noreply.github.com>
Date: Wed, 31 Aug 2022 11:08:32 -0700
Subject: [PATCH 1344/1674] [Arista7050cx3] TD3 SKU changes for pg headroom
 value after interop testing with cisco 8102 (#11901)

Why I did it
After PFC interop testing between 8102 and 7050cx3, data packet losses were observed on the Rx ports of the 7050cx3 (inflow from 8102) during testing. This was primarily due to the slower response times to react to PFC pause packets for the 8102, when receiving such frames from neighboring devices. To solve for the packet drops, the 7050cx3 pg headroom size has to be increased to 160kB.

How I did it
Modified the xoff threshold value to 160kB in the pg_profile file to allow for the buffer manager to read that value when building the image, and configuring the device

How to verify it
run "mmuconfig -l" once image is built


Signed-off-by: dojha <devojha@microsoft.com>
---
 .../Arista-7050CX3-32S-C32/pg_profile_lookup.ini     | 12 ++++++------
 .../Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
index dd405301f720..5b4482bc74c7 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
@@ -1,8 +1,8 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 33792   0        4608
- 100000  5m   4608    4608 49408   0        4608
-  50000  40m  4608    4608 36352   0        4608
- 100000  40m  4608    4608 54528   0        4608
-  50000  300m 4608    4608 55296   0        4608
- 100000  300m 4608    4608 92672   0        4608
+  50000  5m   4608    4608 160000   0        4608
+ 100000  5m   4608    4608 160000   0        4608
+  50000  40m  4608    4608 160000   0        4608
+ 100000  40m  4608    4608 160000   0        4608
+  50000  300m 4608    4608 160000   0        4608
+ 100000  300m 4608    4608 160000   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
index 8ee7a6714b1e..5b4482bc74c7 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
@@ -1,8 +1,8 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 79872   0        4608
- 100000  5m   4608    4608 54528   0        4608
-  50000  40m  4608    4608 39936   0        4608
- 100000  40m  4608    4608 60416   0        4608
-  50000  300m 4608    4608 61440   0        4608
- 100000  300m 4608    4608 103680  0        4608
+  50000  5m   4608    4608 160000   0        4608
+ 100000  5m   4608    4608 160000   0        4608
+  50000  40m  4608    4608 160000   0        4608
+ 100000  40m  4608    4608 160000   0        4608
+  50000  300m 4608    4608 160000   0        4608
+ 100000  300m 4608    4608 160000   0        4608

From 0bf0133ecc4135095c4a2e58680446bc761f0369 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Thu, 1 Sep 2022 09:53:28 +0300
Subject: [PATCH 1345/1674] [202012][submodule] Advance sonic-swss-common
 pointer (#11888)

#### Why I did it

Update sonic-swss-common submodule pointer to include the following:
* [202012] Add docker-mux related table names  ([#669](https://github.com/sonic-net/sonic-swss-common/pull/669))
* Transfer organization from Azure to sonic-net ([#658](https://github.com/sonic-net/sonic-swss-common/pull/658))
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index fb89310e616c..3925249ab504 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit fb89310e616ce4a5331aa024a080d70423131131
+Subproject commit 3925249ab50485bb9e48dbb939a716162911196f

From 9d3194c77a32055e639d6ad68c5811c377dfa237 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Wed, 29 Jun 2022 21:34:02 -0700
Subject: [PATCH 1346/1674] Avoid write_standby in warm restart context 
 (#11283)

Avoid write_standby in warm restart context.

sign-off: Jing Zhang zhangjing@microsoft.com

Why I did it
In warm restart context, we should avoid mux state change.

How I did it
Check warm restart flag before applying changes to app db.

How to verify it
Ran write_standby in table missing, key missing, field missing scenarios.
Did a warm restart, app db changes were skipped. Saw this in syslog:
WARNING write_standby: Taking no action due to ongoing warmrestart.
---
 files/scripts/write_standby.py | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 53cf5265ecde..3a41fe58bbe6 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -3,8 +3,8 @@
 import time
 
 from sonic_py_common import logger as log
-from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector
-from swsscommon.swsscommon import APPL_DB 
+from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector, Table
+from swsscommon.swsscommon import APPL_DB, STATE_DB 
 
 logger = log.Logger('write_standby')
 
@@ -22,6 +22,7 @@ class MuxStateWriter(object):
     def __init__(self):
         self.config_db_connector = None
         self.appl_db_connector = None
+        self.state_db_connector = None
         self.asic_db_connector = None
 
     @property
@@ -45,6 +46,16 @@ def appl_db(self):
         if self.appl_db_connector is None:
             self.appl_db_connector = DBConnector(APPL_DB, REDIS_SOCK_PATH, True)
         return self.appl_db_connector
+    
+    @property
+    def state_db(self):
+        """
+        Returns the state DB connector.
+        Intializes the connector during the first call
+        """
+        if self.state_db_connector is None:
+            self.state_db_connector = DBConnector(STATE_DB, REDIS_SOCK_PATH, True)
+        return self.state_db_connector
 
     @property
     def asic_db(self):
@@ -75,6 +86,16 @@ def is_dualtor(self):
 
         return 'subtype' in metadata and 'dualtor' in metadata['subtype'].lower()
 
+    @property
+    def is_warmrestart(self):
+        """
+        Checks if a warmrestart is going on
+        """
+        tbl = Table(self.state_db, 'WARM_RESTART_ENABLE_TABLE')
+        (status, value) = tbl.hget('system', 'enable')
+
+        return status and value == 'true' 
+
     def get_auto_mux_intfs(self):
         """
         Returns a list of all mux cable interfaces that are configured to auto-switch
@@ -117,6 +138,12 @@ def apply_mux_config(self):
         if not self.is_dualtor:
             # If not running on a dual ToR system, take no action
             return
+
+        if self.is_warmrestart:
+            # If in warmrestart context, take no action
+            logger.log_warning("Skip setting mux state due to ongoing warmrestart.")
+            return
+
         intfs = self.get_auto_mux_intfs()
         state = 'standby'
         if self.wait_for_tunnel():

From 4ab83170a592befd2014be1cd99bc88b7e5c8603 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Tue, 9 Aug 2022 14:21:29 -0700
Subject: [PATCH 1347/1674] [write_standby] update write_standby.py script
 (#11650)

Why I did it
The initial value has to be present for the state machines to work. In active-standby dual-tor scenario, or any hardware mux scenario, the value will be updtaed eventually with a delay.

However, in active-active dual-tor scenario, there is no other mechanism to initialize the value and get state machines started.
So this script will have to write something at start up time.

For active-active dualtor, 'active' is a more preferred initial value, the state machine will switch the state to standby soon if
link prober found link not in good state.

How I did it
Update the script to always provide initial values.

How to verify it
Tested on active-active dual-tor testbed.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 files/scripts/write_standby.py | 45 +++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 3a41fe58bbe6..86d50737b1c5 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import argparse
 import time
 
 from sonic_py_common import logger as log
@@ -19,11 +20,13 @@ class MuxStateWriter(object):
     Class used to write standby mux state to APP DB
     """
 
-    def __init__(self):
+    def __init__(self, activeactive, activestandby):
         self.config_db_connector = None
         self.appl_db_connector = None
         self.state_db_connector = None
         self.asic_db_connector = None
+        self.default_active_active_state = activeactive
+        self.default_active_standby_state = activestandby
 
     @property
     def config_db(self):
@@ -96,14 +99,25 @@ def is_warmrestart(self):
 
         return status and value == 'true' 
 
-    def get_auto_mux_intfs(self):
+    def get_all_mux_intfs_modes(self):
         """
-        Returns a list of all mux cable interfaces that are configured to auto-switch
+        Returns a list of all mux cable interfaces, with suggested modes
+        Setting mux initial modes is crucial to kick off the statemachines,
+        have to set the modes for all mux/gRPC ports.
         """
+        intf_modes = {}
         all_intfs = self.config_db.get_table('MUX_CABLE')
-        auto_intfs = [intf for intf, status in all_intfs.items()
-                                if status['state'].lower() == 'auto']
-        return auto_intfs
+        for intf, status in all_intfs.items():
+            state = status['state'].lower()
+            if state in ['active', 'standby']:
+                intf_modes[intf] = state
+            elif state in ['auto', 'manual']:
+                if ('soc_ipv4' in status or 'soc_ipv6' in status or
+                    ('cable_type' in status and status['cable_type'] == 'active-active')):
+                    intf_modes[intf] = self.default_active_active_state
+                else:
+                    intf_modes[intf] = self.default_active_standby_state
+        return intf_modes
 
     def tunnel_exists(self):
         """
@@ -144,19 +158,26 @@ def apply_mux_config(self):
             logger.log_warning("Skip setting mux state due to ongoing warmrestart.")
             return
 
-        intfs = self.get_auto_mux_intfs()
-        state = 'standby'
+        modes = self.get_all_mux_intfs_modes()
         if self.wait_for_tunnel():
-            logger.log_warning("Applying {} state to interfaces {}".format(state, intfs))
+            logger.log_warning("Applying state to interfaces {}".format(modes))
             producer_state_table = ProducerStateTable(self.appl_db, 'MUX_CABLE_TABLE')
-            fvs = create_fvs(state=state)
 
-            for intf in intfs:
+            for intf, state in modes.items():
+                fvs = create_fvs(state=state)
                 producer_state_table.set(intf, fvs)
         else:
             logger.log_error("Timed out waiting for tunnel {}, mux state will not be written".format(self.tunnel_name))
 
 
 if __name__ == '__main__':
-    mux_writer = MuxStateWriter()
+    parser = argparse.ArgumentParser(description='Write initial mux state')
+    parser.add_argument('-a', '--active_active',
+                        help='state: intial state for "auto" and/or "manual" config in active-active mode, default "active"',
+                        type=str, required=False, default='active')
+    parser.add_argument('-s', '--active_standby',
+                        help='state: intial state for "auto" and/or "manual" config in active-standby mode, default "standby"',
+                        type=str, required=False, default='standby')
+    args = parser.parse_args()
+    mux_writer = MuxStateWriter(activeactive=args.active_active, activestandby=args.active_standby)
     mux_writer.apply_mux_config()

From f4e50597e232a25d468e6566e9f9f240a8848a03 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Fri, 2 Sep 2022 14:07:48 +0800
Subject: [PATCH 1348/1674] [actions] Add github context env in label action.
 (#11926)

---
 .github/workflows/label.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index ee4857fe23f1..f336367cc524 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -21,6 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: approve
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
       run: |
         set -e
         echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token

From e821dd855111391cc4fdbd51c8f366ecb9e6fc54 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 2 Sep 2022 13:40:40 -0700
Subject: [PATCH 1349/1674] [arp_update]: Set failed IPv6 neighbors to
 incomplete (#11919)

After pinging any failed IPv6 neighbor entries, set the remaining failed/incomplete entries to a permanent INCOMPLETE state. This manual setting to INCOMPLETE prevents these entries from automatically transitioning to FAILED state, and since they are now incomplete any subsequent NA messages for these neighbors is able to resolve the entry in the cache.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/arp_update | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index f8704c582b6b..cd2b13d0cf7c 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -50,6 +50,17 @@ while /bin/true; do
       eval `eval $ip6cmd`
  
       if [[ $SUBTYPE == "dualtor" ]]; then
+        # manually set any remaining FAILED/INCOMPLETE entries to permanently INCOMPLETE
+        # this prevents any remaining INCOMPLETE entries from automatically transitioning to FAILED
+        # once these entries are incomplete, any subsequent neighbor advertisement messages
+        # are able to resolve the entry
+
+        # generates the following command for each failed or incomplete IPv6 neighbor
+        # ip neigh replace <neighbor IPv6> dev <VLAN name> nud incomplete
+        neigh_replace_template="sed -e 's/^/ip neigh replace /' -e 's/,/ dev /' -e 's/$/ nud incomplete;/'" 
+        ip_neigh_replace_cmd="ip -6 neigh show | grep -v fe80 | grep Vlan1000 | grep -E 'FAILED|INCOMPLETE' | cut -d ' ' -f 1,3 --output-delimiter=',' | $neigh_replace_template"
+        eval `eval $ip_neigh_replace_cmd`
+
         # on dual ToR devices, try to resolve failed neighbor entries since
         # these entries will have tunnel routes installed, preventing normal 
         # neighbor resolution (SWSS PR #2137)

From 3d81b61fa1b4ce219b7f61b3ec561e956268bed3 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 2 Sep 2022 21:09:06 -0700
Subject: [PATCH 1350/1674] [202012][kernel][swss]: Linux kernel and SWSS
 submodule update (#11929)

Include following new kernel commits:
- 815cb34 [patch]: Add accept_untracked_na kernel param (#291)
- fbb76cc Remove kernel config SERIAL_8250_RUNTIME_UARTS (#286)

Introduce following SWSS commits:
- eedf59d [intfmgr]: Enable `accept_untracked_na` kernel param (#2439)
- bbd4eb7 [BFD]Clean up state_db BFD entries on swss restart (#2434) (#2435)
- aa7b546 [FDB] [202012] Fix fbdorch to properly handle syncd FDB FLUSH Notif (#2401)
- 4190c13 Support for platforms based on Clounix Networks' device (#2399)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-linux-kernel | 2 +-
 src/sonic-swss         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 01e55081d875..815cb3495443 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 01e55081d87550db52f6abd7ee10074ca0f68147
+Subproject commit 815cb349544338a16d2f7740aee87db13bb8bc1a
diff --git a/src/sonic-swss b/src/sonic-swss
index e84a90140a81..eedf59dd935d 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e84a90140a81ae76c76730218c2b24df7f577f1f
+Subproject commit eedf59dd935d1e4f2176fe1178aa167e262cd001

From 484402ff081933b371bddb40321fbe2709a017cd Mon Sep 17 00:00:00 2001
From: Vivek <vkarri@nvidia.com>
Date: Sun, 4 Sep 2022 01:05:22 -0700
Subject: [PATCH 1351/1674] [202012] [Mellanox] [SKU] Mellanox-SN4700-C128 SKU
 added (11574) (#11878)

- Why I did it
New SKU for MSN-4700 Platform i.e. Mellanox-SN4700-C128

Requirements:
* Breakout: Port 1-32: 4x100G
* Downlinks: 120 (1-30)
* Uplinks: 8 (31-32)
* Shared Headroom: Enabled
* Over Subscribe Ratio: 1:8
* Default Topology: T2
* Default Cable Length for T2: 1500m
* QoS params: The default ones defined in qos_config.j2 will be applied
* Small Packet Percentage: Used 50% for traditional buffer model Note: For dynamic model, the value defined in LOSSLESS_TRAFFIC_PATTERN|AZURE|small_packet_percentage is used

Additional Details:
Switch Type has to be programmed as SpineRouter through config_db.json in DEVICE_METADATA|localhost|type field for the buffer values & cable lengths defined in the buffers_defaults_t2.j2 to apply on the device
Cable Lengths Used for generating buffer_defaults_{t0,t1,t2}.j2 values

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
---
 .../Mellanox-SN4700-C128/buffers.json.j2      |  15 +
 .../buffers_defaults_objects.j2               |   1 +
 .../buffers_defaults_t0.j2                    |  39 +++
 .../buffers_defaults_t1.j2                    |  39 +++
 .../buffers_defaults_t2.j2                    |  44 +++
 .../buffers_dynamic.json.j2                   |  16 +
 .../pg_profile_lookup.ini                     |  41 +++
 .../Mellanox-SN4700-C128/port_config.ini      | 129 ++++++++
 .../Mellanox-SN4700-C128/qos.json.j2          |   1 +
 .../Mellanox-SN4700-C128/sai.profile          |   3 +
 .../sai_4700_128x100g.xml                     | 277 ++++++++++++++++++
 11 files changed, 605 insertions(+)
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_objects.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t1.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t2.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_dynamic.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai_4700_128x100g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers.json.j2
new file mode 100644
index 000000000000..2905747f5b04
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers.json.j2
@@ -0,0 +1,15 @@
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't2' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..f22c56702af5
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t0.j2
@@ -0,0 +1,39 @@
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '44910592' %}
+{% set ingress_lossless_pool_xoff  =  '1751040' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '44910592' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..b87050280529
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t1.j2
@@ -0,0 +1,39 @@
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '44587008' %}
+{% set ingress_lossless_pool_xoff  =  '2074624' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '44587008' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t2.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t2.j2
new file mode 100644
index 000000000000..b0df4defd449
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_defaults_t2.j2
@@ -0,0 +1,44 @@
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '1500m' %}
+{%-set ports2cable = {
+            'spinerouter_leafrouter' : '1500m',
+            'spinerouter_spinerouter' : '1500m'
+       }
+-%}
+{% set ingress_lossless_pool_size =  '35094528' %}
+{% set ingress_lossless_pool_xoff  =  '11567104' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '35094528' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_dynamic.json.j2
new file mode 100644
index 000000000000..4ec20f1d9e84
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/buffers_dynamic.json.j2
@@ -0,0 +1,16 @@
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't2' %}
+{%- set dynamic_mode = 'true' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/pg_profile_lookup.ini
new file mode 100644
index 000000000000..7b78fb98ae37
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/pg_profile_lookup.ini
@@ -0,0 +1,41 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+#  PG lossless profiles.
+# speed cable  size   xon    xoff   threshold
+  10000    5m 19456  19456  24576          0
+  25000    5m 19456  19456  26624          0
+  40000    5m 19456  19456  30720          0
+  50000    5m 19456  19456  33792          0
+ 100000    5m 19456  19456  59392          0
+ 200000    5m 19456  19456  66560          0
+  10000   40m 19456  19456  25600          0
+  25000   40m 19456  19456  28672          0
+  40000   40m 19456  19456  33792          0
+  50000   40m 19456  19456  36864          0
+ 100000   40m 19456  19456  66560          0
+ 200000   40m 19456  19456  80896          0
+  10000  300m 19456  19456  30720          0
+  25000  300m 19456  19456  41984          0
+  40000  300m 19456  19456  54272          0
+  50000  300m 19456  19456  63488          0
+ 100000  300m 19456  19456  120832         0
+ 200000  300m 19456  19456  188416         0
+  10000 1500m 19456  19456  55296          0
+  25000 1500m 19456  19456  103424         0
+  40000 1500m 19456  19456  153600         0
+  50000 1500m 19456  19456  187392         0
+ 100000 1500m 19456  19456  366592         0
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/port_config.ini
new file mode 100644
index 000000000000..d64b66b0b691
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/port_config.ini
@@ -0,0 +1,129 @@
+# name         lanes              alias     index    speed
+Ethernet0      0,1                etp1a     1        100000
+Ethernet2      2,3                etp1b     1        100000
+Ethernet4      4,5                etp1c     1        100000
+Ethernet6      6,7                etp1d     1        100000
+Ethernet8      8,9                etp2a     2        100000
+Ethernet10     10,11              etp2b     2        100000
+Ethernet12     12,13              etp2c     2        100000
+Ethernet14     14,15              etp2d     2        100000
+Ethernet16     16,17              etp3a     3        100000
+Ethernet18     18,19              etp3b     3        100000
+Ethernet20     20,21              etp3c     3        100000
+Ethernet22     22,23              etp3d     3        100000
+Ethernet24     24,25              etp4a     4        100000
+Ethernet26     26,27              etp4b     4        100000
+Ethernet28     28,29              etp4c     4        100000
+Ethernet30     30,31              etp4d     4        100000
+Ethernet32     32,33              etp5a     5        100000
+Ethernet34     34,35              etp5b     5        100000
+Ethernet36     36,37              etp5c     5        100000
+Ethernet38     38,39              etp5d     5        100000
+Ethernet40     40,41              etp6a     6        100000
+Ethernet42     42,43              etp6b     6        100000
+Ethernet44     44,45              etp6c     6        100000
+Ethernet46     46,47              etp6d     6        100000
+Ethernet48     48,49              etp7a     7        100000
+Ethernet50     50,51              etp7b     7        100000
+Ethernet52     52,53              etp7c     7        100000
+Ethernet54     54,55              etp7d     7        100000
+Ethernet56     56,57              etp8a     8        100000
+Ethernet58     58,59              etp8b     8        100000
+Ethernet60     60,61              etp8c     8        100000
+Ethernet62     62,63              etp8d     8        100000
+Ethernet64     64,65              etp9a     9        100000
+Ethernet66     66,67              etp9b     9        100000
+Ethernet68     68,69              etp9c     9        100000
+Ethernet70     70,71              etp9d     9        100000
+Ethernet72     72,73              etp10a    10       100000
+Ethernet74     74,75              etp10b    10       100000
+Ethernet76     76,77              etp10c    10       100000
+Ethernet78     78,79              etp10d    10       100000
+Ethernet80     80,81              etp11a    11       100000
+Ethernet82     82,83              etp11b    11       100000
+Ethernet84     84,85              etp11c    11       100000
+Ethernet86     86,87              etp11d    11       100000
+Ethernet88     88,89              etp12a    12       100000
+Ethernet90     90,91              etp12b    12       100000
+Ethernet92     92,93              etp12c    12       100000
+Ethernet94     94,95              etp12d    12       100000
+Ethernet96     96,97              etp13a    13       100000
+Ethernet98     98,99              etp13b    13       100000
+Ethernet100    100,101            etp13c    13       100000
+Ethernet102    102,103            etp13d    13       100000
+Ethernet104    104,105            etp14a    14       100000
+Ethernet106    106,107            etp14b    14       100000
+Ethernet108    108,109            etp14c    14       100000
+Ethernet110    110,111            etp14d    14       100000
+Ethernet112    112,113            etp15a    15       100000
+Ethernet114    114,115            etp15b    15       100000
+Ethernet116    116,117            etp15c    15       100000
+Ethernet118    118,119            etp15d    15       100000
+Ethernet120    120,121            etp16a    16       100000
+Ethernet122    122,123            etp16b    16       100000
+Ethernet124    124,125            etp16c    16       100000
+Ethernet126    126,127            etp16d    16       100000
+Ethernet128    128,129            etp17a    17       100000
+Ethernet130    130,131            etp17b    17       100000
+Ethernet132    132,133            etp17c    17       100000
+Ethernet134    134,135            etp17d    17       100000
+Ethernet136    136,137            etp18a    18       100000
+Ethernet138    138,139            etp18b    18       100000
+Ethernet140    140,141            etp18c    18       100000
+Ethernet142    142,143            etp18d    18       100000
+Ethernet144    144,145            etp19a    19       100000
+Ethernet146    146,147            etp19b    19       100000
+Ethernet148    148,149            etp19c    19       100000
+Ethernet150    150,151            etp19d    19       100000
+Ethernet152    152,153            etp20a    20       100000
+Ethernet154    154,155            etp20b    20       100000
+Ethernet156    156,157            etp20c    20       100000
+Ethernet158    158,159            etp20d    20       100000
+Ethernet160    160,161            etp21a    21       100000
+Ethernet162    162,163            etp21b    21       100000
+Ethernet164    164,165            etp21c    21       100000
+Ethernet166    166,167            etp21d    21       100000
+Ethernet168    168,169            etp22a    22       100000
+Ethernet170    170,171            etp22b    22       100000
+Ethernet172    172,173            etp22c    22       100000
+Ethernet174    174,175            etp22d    22       100000
+Ethernet176    176,177            etp23a    23       100000
+Ethernet178    178,179            etp23b    23       100000
+Ethernet180    180,181            etp23c    23       100000
+Ethernet182    182,183            etp23d    23       100000
+Ethernet184    184,185            etp24a    24       100000
+Ethernet186    186,187            etp24b    24       100000
+Ethernet188    188,189            etp24c    24       100000
+Ethernet190    190,191            etp24d    24       100000
+Ethernet192    192,193            etp25a    25       100000
+Ethernet194    194,195            etp25b    25       100000
+Ethernet196    196,197            etp25c    25       100000
+Ethernet198    198,199            etp25d    25       100000
+Ethernet200    200,201            etp26a    26       100000
+Ethernet202    202,203            etp26b    26       100000
+Ethernet204    204,205            etp26c    26       100000
+Ethernet206    206,207            etp26d    26       100000
+Ethernet208    208,209            etp27a    27       100000
+Ethernet210    210,211            etp27b    27       100000
+Ethernet212    212,213            etp27c    27       100000
+Ethernet214    214,215            etp27d    27       100000
+Ethernet216    216,217            etp28a    28       100000
+Ethernet218    218,219            etp28b    28       100000
+Ethernet220    220,221            etp28c    28       100000
+Ethernet222    222,223            etp28d    28       100000
+Ethernet224    224,225            etp29a    29       100000
+Ethernet226    226,227            etp29b    29       100000
+Ethernet228    228,229            etp29c    29       100000
+Ethernet230    230,231            etp29d    29       100000
+Ethernet232    232,233            etp30a    30       100000
+Ethernet234    234,235            etp30b    30       100000
+Ethernet236    236,237            etp30c    30       100000
+Ethernet238    238,239            etp30d    30       100000
+Ethernet240    240,241            etp31a    31       100000
+Ethernet242    242,243            etp31b    31       100000
+Ethernet244    244,245            etp31c    31       100000
+Ethernet246    246,247            etp31d    31       100000
+Ethernet248    248,249            etp32a    32       100000
+Ethernet250    250,251            etp32b    32       100000
+Ethernet252    252,253            etp32c    32       100000
+Ethernet254    254,255            etp32d    32       100000
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/qos.json.j2
new file mode 120000
index 000000000000..eccf286dc879
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile
new file mode 100644
index 000000000000..d20b5e46b843
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile
@@ -0,0 +1,3 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_128x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai_4700_128x100g.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai_4700_128x100g.xml
new file mode 100644
index 000000000000..f5d49f8b86ab
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai_4700_128x100g.xml
@@ -0,0 +1,277 @@
+<root>
+    <platform_info type="4700">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>32</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>8</width>
+                <module>17</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>8</width>
+                <module>16</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>8</width>
+                <module>19</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>8</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>8</width>
+                <module>21</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>8</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>8</width>
+                <module>23</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>8</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>8</width>
+                <module>29</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>8</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>8</width>
+                <module>31</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>8</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>8</width>
+                <module>25</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>8</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>8</width>
+                <module>27</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>8</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>8</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>8</width>
+                <module>15</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>8</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>8</width>
+                <module>13</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>8</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>8</width>
+                <module>11</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>8</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>8</width>
+                <module>9</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>8</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>8</width>
+                <module>3</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>8</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>8</width>
+                <module>1</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>8</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>8</width>
+                <module>7</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>8</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>8</width>
+                <module>5</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From 586a62342245f842a2d8a9968c84fe9da9868392 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 4 Sep 2022 19:29:06 +0800
Subject: [PATCH 1352/1674] [ci/build]: Upgrade SONiC package versions (#11911)

---
 .../build-sonic-slave-buster/versions-git     |  4 +--
 files/build/versions/default/versions-git     |  6 ++---
 .../docker-fpm-frr/versions-deb-buster        |  4 +--
 .../docker-sonic-mgmt-framework/versions-py3  | 11 +++++---
 .../sonic-slave-buster/versions-deb-buster    | 26 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 7 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 0b4ee57fa9e7..d85ae1de4391 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
+https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==ab4bf75bb7d02ffa1f5c407d56980f157ef56fe2
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 0a75d6d99f09..fff02985866d 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264
+https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==dd1e52af266a53671b162ddd95e4f6b01513e8e5
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==ab4bf75bb7d02ffa1f5c407d56980f157ef56fe2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 25282ee1643b..2a7a468a4783 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -19,8 +19,8 @@ libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
+libsnmp-base==5.7.3+dfsg-5+deb10u3
+libsnmp30==5.7.3+dfsg-5+deb10u3
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 583032f524a1..da2717612855 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,16 +5,19 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.47.0
+grpcio==1.48.1
 grpcio-tools==1.20.0
 idna==3.3
 importlib-metadata==4.12.0
 importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.14.0
-openapi-schema-validator==0.2.3
-openapi-spec-validator==0.4.0
+jsonschema==4.15.0
+jsonschema-spec==0.1.1
+lazy-object-proxy==1.7.1
+openapi-schema-validator==0.3.3
+openapi-spec-validator==0.5.0
+pathable==0.4.3
 pkgutil_resolve_name==1.3.10
 protobuf==4.21.5
 pyrsistent==0.18.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 3d832de2a610..c7f34c908429 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -139,7 +139,7 @@ gettext==0.19.8.1-9
 gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
-ghostscript==9.27~dfsg-2+deb10u5
+ghostscript==9.27~dfsg-2+deb10u6
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -495,7 +495,7 @@ libfile-stripnondeterminism-perl==1.1.2-1
 libfile-which-perl==1.23-1
 libfl-dev==2.6.4-6.2
 libfl2==2.6.4-6.2
-libflac8==1.3.2-3+deb10u1
+libflac8==1.3.2-3+deb10u2
 libflite1==2.1-release-3
 libfont-afm-perl==1.20-2
 libfontbox2-java==2.0.13-2
@@ -563,8 +563,8 @@ libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
-libgs9==9.27~dfsg-2+deb10u5
-libgs9-common==9.27~dfsg-2+deb10u5
+libgs9==9.27~dfsg-2+deb10u6
+libgs9-common==9.27~dfsg-2+deb10u6
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u3
 libgssrpc4==1.17-3+deb10u3
@@ -1037,9 +1037,9 @@ libsnappy-java==1.1.7.2-1
 libsnappy-jni==1.1.7.2-1
 libsnappy1v5==1.1.7-1
 libsndfile1==1.0.28-6+deb10u1
-libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp-dev==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
+libsnmp-base==5.7.3+dfsg-5+deb10u3
+libsnmp-dev==5.7.3+dfsg-5+deb10u3
+libsnmp30==5.7.3+dfsg-5+deb10u3
 libsoap-lite-perl==1.27-1
 libsodium-dev==1.0.17-1
 libsodium23==1.0.17-1
@@ -1609,12 +1609,12 @@ python3.7-dbg==3.7.3-2+deb10u3
 python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
 qdbus==4:4.8.7+dfsg-18+deb10u1
-qemu-kvm==1:3.1+dfsg-8+deb10u8
-qemu-system-common==1:3.1+dfsg-8+deb10u8
-qemu-system-data==1:3.1+dfsg-8+deb10u8
-qemu-system-gui==1:3.1+dfsg-8+deb10u8
-qemu-system-x86==1:3.1+dfsg-8+deb10u8
-qemu-utils==1:3.1+dfsg-8+deb10u8
+qemu-kvm==1:3.1+dfsg-8+deb10u9
+qemu-system-common==1:3.1+dfsg-8+deb10u9
+qemu-system-data==1:3.1+dfsg-8+deb10u9
+qemu-system-gui==1:3.1+dfsg-8+deb10u9
+qemu-system-x86==1:3.1+dfsg-8+deb10u9
+qemu-utils==1:3.1+dfsg-8+deb10u9
 qt-at-spi==0.4.0-9
 qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
 qt4-qmake==4:4.8.7+dfsg-18+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 7a060c49256a..b9783271f47a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 7a060c49256a..b9783271f47a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f41670fdadc9eca7fff99ab8563190dd41d27ee8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 5357bdb643f85dbaa4af8599819381d56daa7376 Mon Sep 17 00:00:00 2001
From: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com>
Date: Mon, 5 Sep 2022 09:13:45 +0800
Subject: [PATCH 1353/1674] Support Restapi/gnmi control plane acls in 202012
 branch (#11903)

For the Restapi/gnmi use-cases, Sonic has to support a new Table: EXTERNAL_CLIENT of type CTRLPLANE, stage ingress

This shall match on 'src ip prefix' and dst port '8080'. Caclmgrd must parse this from acl.json and install as in the below example:

iptables -A INPUT -s 20.20.20.20/27 -p tcp --dport 8080 -j ACCEPT

or ip6tables if the 'src ip prefix' is IPv6.

This change for master branch is in PR sonic-net/sonic-host-services#9

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
---
 src/sonic-host-services/scripts/caclmgrd      |  28 ++-
 .../caclmgrd/cacl_external_client_acl_test.py |  44 +++++
 .../test_external_client_acl_vectors.py       | 167 ++++++++++++++++++
 .../tests/common/mock_configdb.py             |   5 +-
 4 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
 create mode 100644 src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 4b9649280e3d..5faf6423107d 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -80,6 +80,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
             "dst_ports": ["22"],
             "multi_asic_ns_to_host_fwd":True
         },
+        "EXTERNAL_CLIENT": {
+            "ip_protocols": ["tcp"],
+            "multi_asic_ns_to_host_fwd":True
+        },
         "ANY": {
             "ip_protocols": ["any"],
             "dst_ports": ["0"],
@@ -538,7 +542,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
                 # Obtain default IP protocol(s) and destination port(s) for this service
                 ip_protocols = self.ACL_SERVICES[acl_service]["ip_protocols"]
-                dst_ports = self.ACL_SERVICES[acl_service]["dst_ports"]
+                if "dst_ports" in self.ACL_SERVICES[acl_service]:
+                    dst_ports = self.ACL_SERVICES[acl_service]["dst_ports"]
+                else:
+                    dst_ports = []
 
                 acl_rules = {}
 
@@ -564,6 +571,19 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                             elif self.is_rule_ipv4(rule_props):
                                 table_ip_version = 4
 
+                        # Read DST_PORT info from Config DB, insert it back to ACL_SERVICES
+                        if acl_service == 'EXTERNAL_CLIENT' and "L4_DST_PORT" in rule_props:
+                            dst_ports = [rule_props["L4_DST_PORT"]]
+                            self.ACL_SERVICES[acl_service]["dst_ports"] = dst_ports
+                        elif acl_service == 'EXTERNAL_CLIENT' and "L4_DST_PORT_RANGE" in rule_props:
+                            dst_ports = []
+                            port_ranges = rule_props["L4_DST_PORT_RANGE"].split("-")
+                            port_start = int(port_ranges[0])
+                            port_end = int(port_ranges[1])
+                            for port in range(port_start, port_end + 1):
+                                dst_ports.append(port)
+                            self.ACL_SERVICES[acl_service]["dst_ports"] = dst_ports
+
                         if (self.is_rule_ipv6(rule_props) and (table_ip_version == 4)):
                             self.log_error("CtrlPlane ACL table {} is a IPv4 based table and rule {} is a IPV6 rule! Ignoring rule."
                                            .format(table_name, rule_id))
@@ -579,6 +599,12 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                     self.log_warning("Unable to determine if ACL table '{}' contains IPv4 or IPv6 rules. Skipping table..."
                                      .format(table_name))
                     continue
+                # If no destination port found for this ACL table,
+                # log a message and skip processing this table.
+                if len(dst_ports) == 0:
+                    self.log_warning("Required destination port not found for ACL table '{}'. Skipping table..."
+                                     .format(table_name))
+                    continue
                 ipv4_src_ip_set = set()
                 ipv6_src_ip_set = set()
                 # For each ACL rule in this table (in descending order of priority)
diff --git a/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
new file mode 100644
index 000000000000..ef1aa62fe82d
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
@@ -0,0 +1,44 @@
+import os
+import sys
+
+from swsscommon import swsscommon
+from parameterized import parameterized
+from sonic_py_common.general import load_module_from_source
+from unittest import TestCase, mock
+from pyfakefs.fake_filesystem_unittest import patchfs
+
+from .test_external_client_acl_vectors import EXTERNAL_CLIENT_ACL_TEST_VECTOR
+from tests.common.mock_configdb import MockConfigDb
+
+
+DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
+
+
+class TestCaclmgrdExternalClientAcl(TestCase):
+    """
+        Test caclmgrd EXTERNAL_CLIENT_ACL
+    """
+    def setUp(self):
+        swsscommon.ConfigDBConnector = MockConfigDb
+        test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        modules_path = os.path.dirname(test_path)
+        scripts_path = os.path.join(modules_path, "scripts")
+        sys.path.insert(0, modules_path)
+        caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
+        self.caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
+
+    @parameterized.expand(EXTERNAL_CLIENT_ACL_TEST_VECTOR)
+    @patchfs
+    def test_caclmgrd_external_client_acl(self, test_name, test_data, fs):
+        if not os.path.exists(DBCONFIG_PATH):
+            fs.create_file(DBCONFIG_PATH) # fake database_config.json
+
+        MockConfigDb.set_config_db(test_data["config_db"])
+        self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ip = mock.MagicMock()
+        self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ipv6 = mock.MagicMock()
+        self.caclmgrd.ControlPlaneAclManager.generate_block_ip2me_traffic_iptables_commands = mock.MagicMock(return_value=[])
+        self.caclmgrd.ControlPlaneAclManager.get_chain_list = mock.MagicMock(return_value=["INPUT", "FORWARD", "OUTPUT"])
+        caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
+
+        iptables_rules_ret, _ = caclmgrd_daemon.get_acl_rules_and_translate_to_iptables_commands('')
+        self.assertEqual(set(test_data["return"]).issubset(set(iptables_rules_ret)), True)
diff --git a/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py
new file mode 100644
index 000000000000..d55e6b8e6ce4
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py
@@ -0,0 +1,167 @@
+from unittest.mock import call
+
+"""
+    caclmgrd test external_client_acl vector
+"""
+EXTERNAL_CLIENT_ACL_TEST_VECTOR = [
+    [
+        "Test single IPv4 dst port + src ip for EXTERNAL_CLIENT_ACL",
+        {
+            "config_db": {
+                "ACL_TABLE": {
+                    "EXTERNAL_CLIENT_ACL": {
+                        "stage": "INGRESS",
+                        "type": "CTRLPLANE",
+                        "services": [
+                            "EXTERNAL_CLIENT"
+                        ]
+                    }
+                },
+                "ACL_RULE": {
+                    "EXTERNAL_CLIENT_ACL|DEFAULT_RULE": {
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "1"
+                    },
+                    "EXTERNAL_CLIENT_ACL|RULE_1": {
+                        "L4_DST_PORT": "8081",
+                        "PACKET_ACTION": "ACCEPT",
+                        "PRIORITY": "9998",
+                        "SRC_IP": "20.0.0.55/32"
+                    },
+                },
+                "DEVICE_METADATA": {
+                    "localhost": {
+                    }
+                },
+                "FEATURE": {},
+            },
+            "return": [
+                "iptables -A INPUT -p tcp -s 20.0.0.55/32 --dport 8081 -j ACCEPT",
+                "iptables -A INPUT -p tcp --dport 8081 -j DROP"
+            ],
+        }
+    ],
+    [
+        "Test IPv4 dst port range + src ip forEXTERNAL_CLIENT_ACL",
+        {
+            "config_db": {
+                "ACL_TABLE": {
+                    "EXTERNAL_CLIENT_ACL": {
+                        "stage": "INGRESS",
+                        "type": "CTRLPLANE",
+                        "services": [
+                            "EXTERNAL_CLIENT"
+                        ]
+                    }
+                },
+                "ACL_RULE": {
+                    "EXTERNAL_CLIENT_ACL|DEFAULT_RULE": {
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "1"
+                    },
+                    "EXTERNAL_CLIENT_ACL|RULE_1": {
+                        "L4_DST_PORT_RANGE": "8081-8083",
+                        "PACKET_ACTION": "ACCEPT",
+                        "PRIORITY": "9998",
+                        "SRC_IP": "20.0.0.55/32"
+                    },
+                },
+                "DEVICE_METADATA": {
+                    "localhost": {
+                    }
+                },
+                "FEATURE": {},
+            },
+            "return": [
+                "iptables -A INPUT -p tcp -s 20.0.0.55/32 --dport 8081 -j ACCEPT",
+                "iptables -A INPUT -p tcp -s 20.0.0.55/32 --dport 8082 -j ACCEPT",
+                "iptables -A INPUT -p tcp -s 20.0.0.55/32 --dport 8083 -j ACCEPT",
+                "iptables -A INPUT -p tcp --dport 8081 -j DROP",
+                "iptables -A INPUT -p tcp --dport 8082 -j DROP",
+                "iptables -A INPUT -p tcp --dport 8083 -j DROP",
+            ],
+        }
+    ],
+    [
+        "Test IPv6 single dst port range + src ip forEXTERNAL_CLIENT_ACL",
+        {
+            "config_db": {
+                "ACL_TABLE": {
+                    "EXTERNAL_CLIENT_ACL": {
+                        "stage": "INGRESS",
+                        "type": "CTRLPLANE",
+                        "services": [
+                            "EXTERNAL_CLIENT"
+                        ]
+                    }
+                },
+                "ACL_RULE": {
+                    "EXTERNAL_CLIENT_ACL|DEFAULT_RULE": {
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "1"
+                    },
+                    "EXTERNAL_CLIENT_ACL|RULE_1": {
+                        "L4_DST_PORT": "8081",
+                        "PACKET_ACTION": "ACCEPT",
+                        "PRIORITY": "9998",
+                        "SRC_IP": "2001::2/128"
+                    },
+                },
+                "DEVICE_METADATA": {
+                    "localhost": {
+                    }
+                },
+                "FEATURE": {},
+            },
+            "return": [
+                "iptables -A INPUT -p tcp -s 2001::2/128 --dport 8081 -j ACCEPT",
+                "iptables -A INPUT -p tcp --dport 8081 -j DROP"
+            ],
+        }
+    ],
+    [
+        "Test IPv6 dst port range + src ip forEXTERNAL_CLIENT_ACL",
+        {
+            "config_db": {
+                "ACL_TABLE": {
+                    "EXTERNAL_CLIENT_ACL": {
+                        "stage": "INGRESS",
+                        "type": "CTRLPLANE",
+                        "services": [
+                            "EXTERNAL_CLIENT"
+                        ]
+                    }
+                },
+                "ACL_RULE": {
+                    "EXTERNAL_CLIENT_ACL|DEFAULT_RULE": {
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "1"
+                    },
+                    "EXTERNAL_CLIENT_ACL|RULE_1": {
+                        "L4_DST_PORT_RANGE": "8081-8083",
+                        "PACKET_ACTION": "ACCEPT",
+                        "PRIORITY": "9998",
+                        "SRC_IP": "2001::2/128"
+                    },
+                },
+                "DEVICE_METADATA": {
+                    "localhost": {
+                    }
+                },
+                "FEATURE": {},
+            },
+            "return": [
+                "iptables -A INPUT -p tcp -s 2001::2/128 --dport 8081 -j ACCEPT",
+                "iptables -A INPUT -p tcp -s 2001::2/128 --dport 8082 -j ACCEPT",
+                "iptables -A INPUT -p tcp -s 2001::2/128 --dport 8083 -j ACCEPT",
+                "iptables -A INPUT -p tcp --dport 8081 -j DROP",
+                "iptables -A INPUT -p tcp --dport 8082 -j DROP",
+                "iptables -A INPUT -p tcp --dport 8083 -j DROP",
+            ],
+        }
+    ]
+]
diff --git a/src/sonic-host-services/tests/common/mock_configdb.py b/src/sonic-host-services/tests/common/mock_configdb.py
index ce955ea86d05..9b618254f9b4 100644
--- a/src/sonic-host-services/tests/common/mock_configdb.py
+++ b/src/sonic-host-services/tests/common/mock_configdb.py
@@ -42,7 +42,10 @@ def set_entry(self, key, field, data):
         MockConfigDb.CONFIG_DB[key][field] = data
 
     def get_table(self, table_name):
-        return MockConfigDb.CONFIG_DB[table_name]
+        data = {}
+        for k, v in MockConfigDb.CONFIG_DB[table_name].items():
+            data[self.deserialize_key(k)] = v
+        return data
 
 class MockSelect():
 

From 141120549bed9ed121dedea49bc4095095c19464 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Mon, 5 Sep 2022 14:56:22 +0800
Subject: [PATCH 1354/1674] [actions] Remove approve step in label action.
 (#11968)

Why I did it
Approve step needs special permission settings.
We already added permission setting to enable bypass merging PR.
So, approve step is not necessary.
---
 .github/workflows/label.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index f336367cc524..f8ae8e7199a2 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -20,15 +20,6 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-    - name: approve
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: |
-        set -e
-        echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
-        url=$(echo $GITHUB_CONTEXT | jq -r '.event.pull_request._links.html.href')
-        echo PR: $url
-        gh pr review $url --approve
     - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 143af80061a9c1facb02962cbad1e40fa9db78be Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:40:48 +0800
Subject: [PATCH 1355/1674] [ci/build]: Upgrade SONiC package versions (#11976)

---
 .../versions/build/build-sonic-slave-buster/versions-py3      | 4 ++--
 files/build/versions/dockers/docker-snmp/versions-py3         | 2 +-
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3 | 2 +-
 .../versions/dockers/docker-syncd-centec-rpc/versions-py2     | 3 ---
 files/build/versions/host-image/versions-py3                  | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 31151b99f696..7e5141986cc8 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -8,10 +8,10 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.9.1
+psutil==5.9.2
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.8.10
-websocket-client==1.4.0
+websocket-client==1.4.1
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index ab2b43ab082f..d1092513c883 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.0.0
-psutil==5.9.1
+psutil==5.9.2
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index da2717612855..7d32d2f08aad 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -16,7 +16,7 @@ jsonschema==4.15.0
 jsonschema-spec==0.1.1
 lazy-object-proxy==1.7.1
 openapi-schema-validator==0.3.3
-openapi-spec-validator==0.5.0
+openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
 protobuf==4.21.5
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
index 60b9f31f8e4a..e16074ca518b 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
@@ -1,5 +1,2 @@
-cffi==1.7.0
-nnpy==1.4.2
 ptf==0.9.1
-pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 9359a4fb15fe..afa7e2a9326e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.9.1
+psutil==5.9.2
 ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1
@@ -40,5 +40,5 @@ tabulate==0.8.10
 thrift==0.13.0
 urllib3==1.26.12
 watchdog==0.10.3
-websocket-client==1.4.0
+websocket-client==1.4.1
 xmltodict==0.12.0
\ No newline at end of file

From dfd1727c3d077828c5be8659676475fbb5f20795 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Tue, 6 Sep 2022 14:03:29 -0700
Subject: [PATCH 1356/1674] [sonic-utilities]: Submodule update: (#11957)

Include following commits:
```
839625d Replace cmp in acl_loader with operator.eq (#2328)
af245ad [route_check]: Ignore standalone tunnel routes (#2332)
c9aa65c Revert "[DHCPv6] [202012] Update the dhcpv6_relay config/show cli (#2271)" (#2336)
6b9cdc9 Made changes to only allow a valid IPv4 or Ipv6 string for dhcp cli (#2296)
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index b034f0cbdd40..839625df982d 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit b034f0cbdd400c3d854b29f554292f5e1124b7ad
+Subproject commit 839625df982d164815a8c5fe77cbb6251c8a1442

From edc4485d3074ef7a778d32c2a7ef5488f6a33eb7 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:33:18 +0300
Subject: [PATCH 1357/1674] [202012][Mellanox] Update SDK/FW to version
 4.5.2320/2010_2320 (#11975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update SDK/FW version - 4.5.2320/2010_2320 in order to have the following fixes:
• Spectrum-3 | PCI calibration changes from a static to a dynamic mechanism.
• [VxLAN] TTL was set to 0 for non IP traffic (such as ARP)
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 7d252de8851b..e7504aa1e91b 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.2318
+MLNX_SPC_FW_VERSION = 13.2010.2320
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.2318
+MLNX_SPC2_FW_VERSION = 29.2010.2320
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.2318
+MLNX_SPC3_FW_VERSION = 30.2010.2320
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 3e3db8705f81..5650c3519b55 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 3e3db8705f81dbeba8312fcc022969337fcc51ad
+Subproject commit 5650c3519b55051124810a4625f8269694b1e592
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index a1603b870981..439a2e1328ec 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
-MLNX_SDK_VERSION = 4.5.2318
+MLNX_SDK_VERSION = 4.5.2320
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 37d34ddd349e0f115c806db801aa7d2269856269 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Wed, 7 Sep 2022 22:05:59 +0530
Subject: [PATCH 1358/1674] DellEMC Z9332f: Fix SFP issue (#11819)

* Update sfp

* Update sfp

* Update sfp.py
---
 .../z9332f/sonic_platform/sfp.py              | 95 +++++++++++++++----
 1 file changed, 75 insertions(+), 20 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
index a08667a8e71e..c0ee8bdb84f6 100644
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/sfp.py
@@ -70,7 +70,7 @@
 SFP_DOM_OFFSET = 256
 
 SFP_STATUS_CONTROL_OFFSET = 110
-SFP_STATUS_CONTROL_WIDTH = 7
+SFP_STATUS_CONTROL_WIDTH = 1
 SFP_TX_DISABLE_HARD_BIT = 7
 SFP_TX_DISABLE_SOFT_BIT = 6
 
@@ -912,15 +912,14 @@ def get_rx_los(self):
         rx_los_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                offset = 512
+                offset = 2176
                 rx_los_mask = [ 0x01, 0x02, 0x04, 0x08 ,0x10, 0x20, 0x40, 0x80 ]
                 dom_channel_monitor_raw = self._read_eeprom_bytes(self.eeprom_path,
-                    offset + QSFP_DD_RXLOS_OFFSET, QSFP_DD_RXLOS_WIDTH)
+                    offset + 147, 1)
                 if dom_channel_monitor_raw is not None:
                     rx_los_data = int(dom_channel_monitor_raw[0], 8)
                     for mask in rx_los_mask:
-                        rx_los_list.append(rx_los_data & mask != 0)
-
+                        rx_los_list.append(bool(rx_los_data & mask != 0))
             elif self.sfp_type == 'QSFP':
                 rx_los_data = self._get_eeprom_data('rx_los')
                 # As the function expects a single boolean, if any one channel experience LOS,
@@ -962,13 +961,19 @@ def get_tx_disable(self):
         tx_disable_list = []
         try:
             if self.sfp_type == 'QSFP_DD':
-                return False
+                dom_channel_monitor_raw = self._read_eeprom_bytes(self.eeprom_path,2048 + 130, 1)
+                if dom_channel_monitor_raw is not None:
+                    tx_disable_data = int(dom_channel_monitor_raw[0], 16)
+                    for i in range(8):
+                        tx_disable_list.append(bool(tx_disable_data & (1 << i) != 0))    
+                    
             elif self.sfp_type == 'QSFP':
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_list.append(tx_disable_data['data'][tx_disable_id]['value'] == 'On')
             else:
-                tx_disable_data = self._read_eeprom_bytes(self.eeprom_path, SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
+                offset = 256
+                tx_disable_data = self._read_eeprom_bytes(self.eeprom_path, offset + SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH)
                 data = int(tx_disable_data[0], 16)
                 tx_disable_hard = (sffbase().test_bit(data, SFP_TX_DISABLE_HARD_BIT) != 0)
                 tx_disable_soft = (sffbase().test_bit(data, SFP_TX_DISABLE_SOFT_BIT) != 0)
@@ -977,19 +982,41 @@ def get_tx_disable(self):
             return 'N/A'
         return tx_disable_list
 
+    def tx_disable(self, tx_disable):
+        if self.sfp_type == 'QSFP_DD':
+            val = 0xff if tx_disable else 0x0
+            return self._write_eeprom_bytes(2048 + 130, 1, bytearray([val]))
+
+        elif self.sfp_type == 'QSFP':
+            val = 0xf if tx_disable else 0x0
+            return self._write_eeprom_bytes( 0 + 86, 1, bytearray([val]))
+
+        else:
+            offset = 256
+            if tx_disable is True:
+                val = 64
+            else:
+                val = 191
+            return self._write_eeprom_bytes(offset + SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH, bytearray([val]))
+
     def get_tx_disable_channel(self):
         """
         Retrieves the TX disabled channels in this SFP
         """
-        tx_disable_channel = 0
+        tx_disable_channel = None
         try:
             if self.sfp_type == 'QSFP_DD':
-                tx_disable_channel = 0
+                 offset = 2048
+                 dom_channel_monitor_raw = self._read_eeprom_bytes(self.eeprom_path, offset + 130, 1)
+                 if dom_channel_monitor_raw is not None:
+                    tx_disable_channel = int(dom_channel_monitor_raw[0], 16)
             elif self.sfp_type == 'QSFP':
                 tx_disable_data = self._get_eeprom_data('tx_disable')
                 for tx_disable_id in ('Tx1Disable', 'Tx2Disable', 'Tx3Disable', 'Tx4Disable'):
                     tx_disable_channel <<= 1
                     tx_disable_channel |= (tx_disable_data['data']['Tx1Disable']['value'] == 'On')
+            else:
+                tx_disable_channel =  int(self.get_tx_disable()[0])
         except (TypeError, ValueError):
             return 'N/A'
         return tx_disable_channel
@@ -1091,7 +1118,7 @@ def get_tx_bias(self):
                     return None
                 if not self.qsfp_dd_txbias_supported:
                     for lane in range(0, 8):
-                        tx_bias_list.append("N/A")
+                        tx_bias_list.append(False)
                     return tx_bias_list
 
                 tx_bias_data_raw = self._read_eeprom_bytes(self.eeprom_path, offset + QSFP_DD_TXBIAS_OFFSET, QSFP_DD_TXBIAS_WIDTH)
@@ -1128,7 +1155,7 @@ def get_rx_power(self):
                     return None
                 if not self.qsfp_dd_rxpower_supported:
                     for lane in range(0, 8):
-                        rx_power_list.append("N/A")
+                        rx_power_list.append(False)
                     return rx_power_list
 
                 offset = QSFP_DD_PAGE17
@@ -1165,7 +1192,7 @@ def get_tx_power(self):
                     return None
                 if not self.qsfp_dd_txpower_supported:
                     for lane in range(0, 8):
-                        tx_power_list.append("N/A")
+                        tx_power_list.append(False)
                     return tx_power_list
 
                 offset = QSFP_DD_PAGE17
@@ -1293,17 +1320,45 @@ def get_intl_state(self):
         except  ValueError: pass
         return intl_state
 
-    def tx_disable(self, tx_disable):
-        """
-        Disable SFP TX for all channels
-        """
-        return False
-
     def tx_disable_channel(self, channel, disable):
         """
-        Sets the tx_disable for specified SFP channels
+        Enables/Disables TX channel for SFP based on disable flag
         """
-        return False
+        channel_state = self.get_tx_disable_channel()
+        if channel_state is None or channel_state == 'N/A':
+            return False
+        if self.sfp_type == 'QSFP_DD':
+            for i in range(8):
+                mask = (1 << i)
+                if not (channel & mask):
+                    continue
+                if disable:
+                    channel_state |= mask
+                else:
+                    channel_state &= ~mask
+            return self._write_eeprom_bytes(2048 + 130, 1, bytearray([channel_state]))
+        elif self.sfp_type == 'QSFP':
+            for i in range(4):
+                mask = (1 << i)
+                if not (channel & mask):
+                    continue
+                if disable:
+                    channel_state |= mask
+                else:
+                    channel_state &= ~mask
+            return self._write_eeprom_bytes(86, 1, bytearray([channel_state]))
+        else:
+            channel_state = self.get_tx_disable_channel()
+            if channel_state is None or channel_state == "N/A":
+                return False
+            offset = 256
+            mask = (1 << 0)
+            if disable:
+               channel_state |= mask
+            else:
+               channel_state &= ~mask
+
+            return self._write_eeprom_bytes(offset + SFP_STATUS_CONTROL_OFFSET, SFP_STATUS_CONTROL_WIDTH, bytearray([channel_state]))
 
     def set_power_override(self, power_override, power_set):
         """

From d8c405bf89030b64425a91087acd7f5efd7fbbf6 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Wed, 7 Sep 2022 18:11:29 -0700
Subject: [PATCH 1359/1674] Update cisco-8000 submodule to v0.112 (#11983)

Update cisco-8000 submodule to v0.112
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 7327f59c4d95..2e81a9d5ad89 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.111
+ref=202012-v0.112

From f3443cbb97975e41851fb4424c7f1aca09599eb0 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 8 Sep 2022 15:54:24 +0800
Subject: [PATCH 1360/1674] [submodules] Update submodule sonic-gnmi HEAD
 pointer (#11933)

---
 .gitmodules         | 2 +-
 src/sonic-telemetry | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index dd4d89d90b19..2d6500476739 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,7 +72,7 @@
 	url = https://github.com/Azure/sonic-mgmt-framework
 [submodule "src/sonic-telemetry"]
 	path = src/sonic-telemetry
-	url = https://github.com/Azure/sonic-telemetry
+	url = https://github.com/sonic-net/sonic-gnmi
 [submodule "Switch-SDK-drivers"]
 	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
 	url = https://github.com/Mellanox/Switch-SDK-drivers
diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index c6063887bc4a..9897246795ed 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit c6063887bc4a67ed3e40979b47f1b8e5caab6271
+Subproject commit 9897246795ed3ba3fde26a49ff64ff1d03b8dcc9

From 9db2e21c69f236c03976b39038fb9cd7ab746e5c Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:00:40 -0700
Subject: [PATCH 1361/1674] [202012] Change dhcp6relay to be a submodule
 (#11922)

* Add dhcprelay submodule
---
 .gitmodules                            |   7 +
 rules/dhcp6relay.dep                   |   9 -
 rules/dhcp6relay.mk                    |  12 -
 rules/dhcprelay.dep                    |  11 +
 rules/dhcprelay.mk                     |  12 +
 rules/docker-dhcp-relay.mk             |   4 +-
 src/dhcp6relay/.gitignore              |   5 -
 src/dhcp6relay/Makefile                |  42 --
 src/dhcp6relay/debian/changelog        |   5 -
 src/dhcp6relay/debian/compat           |   1 -
 src/dhcp6relay/debian/control          |  17 -
 src/dhcp6relay/debian/rules            |   6 -
 src/dhcp6relay/src/configInterface.cpp | 152 -----
 src/dhcp6relay/src/configInterface.h   |  75 ---
 src/dhcp6relay/src/main.cpp            |  18 -
 src/dhcp6relay/src/relay.cpp           | 861 -------------------------
 src/dhcp6relay/src/relay.h             | 358 ----------
 src/dhcp6relay/src/subdir.mk           |  23 -
 src/dhcprelay                          |   1 +
 19 files changed, 33 insertions(+), 1586 deletions(-)
 delete mode 100644 rules/dhcp6relay.dep
 delete mode 100644 rules/dhcp6relay.mk
 create mode 100644 rules/dhcprelay.dep
 create mode 100644 rules/dhcprelay.mk
 delete mode 100644 src/dhcp6relay/.gitignore
 delete mode 100644 src/dhcp6relay/Makefile
 delete mode 100644 src/dhcp6relay/debian/changelog
 delete mode 100644 src/dhcp6relay/debian/compat
 delete mode 100644 src/dhcp6relay/debian/control
 delete mode 100755 src/dhcp6relay/debian/rules
 delete mode 100644 src/dhcp6relay/src/configInterface.cpp
 delete mode 100644 src/dhcp6relay/src/configInterface.h
 delete mode 100644 src/dhcp6relay/src/main.cpp
 delete mode 100644 src/dhcp6relay/src/relay.cpp
 delete mode 100644 src/dhcp6relay/src/relay.h
 delete mode 100644 src/dhcp6relay/src/subdir.mk
 create mode 160000 src/dhcprelay

diff --git a/.gitmodules b/.gitmodules
index 2d6500476739..d7f23984dbea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -90,3 +90,10 @@
 	path = src/linkmgrd
 	url = https://github.com/Azure/sonic-linkmgrd.git
 	branch = 202012
+[submodule "src/dhcprelay"]
+	path = src/dhcprelay
+	url = https://github.com/sonic-net/sonic-dhcp-relay.git
+	branch = 202012
+[submodule "sonic-dhcp-relay"]
+	path = sonic-dhcp-relay
+	url = https://github.com/kellyyeh/sonic-dhcp-relay.git
diff --git a/rules/dhcp6relay.dep b/rules/dhcp6relay.dep
deleted file mode 100644
index be82d326fe21..000000000000
--- a/rules/dhcp6relay.dep
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SPATH       := $($(SONIC_DHCP6RELAY)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcp6relay.mk rules/dhcp6relay.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(SONIC_DHCP6RELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(SONIC_DHCP6RELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(SONIC_DHCP6RELAY)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
deleted file mode 100644
index 204bf6fa34dd..000000000000
--- a/rules/dhcp6relay.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# SONiC DHCPV6 RELAY Package
-
-SONIC_DHCP6RELAY_VERSION = 1.0.0-0
-SONIC_DHCP6RELAY_PKG_NAME = dhcp6relay
-
-SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
-SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)
-
-SONIC_DHCP6RELAY_DBG = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)-dbgsym_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SONIC_DHCP6RELAY),$(SONIC_DHCP6RELAY_DBG)))
diff --git a/rules/dhcprelay.dep b/rules/dhcprelay.dep
new file mode 100644
index 000000000000..5f6d77a84fc3
--- /dev/null
+++ b/rules/dhcprelay.dep
@@ -0,0 +1,11 @@
+
+SPATH       := $($(SONIC_DHCPRELAY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_DHCPRELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_DHCPRELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_DHCPRELAY)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/dhcprelay.mk b/rules/dhcprelay.mk
new file mode 100644
index 000000000000..0a32d7d54297
--- /dev/null
+++ b/rules/dhcprelay.mk
@@ -0,0 +1,12 @@
+# SONiC DHCPV6 RELAY Package
+
+SONIC_DHCPRELAY_VERSION = 1.0.0-0
+SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
+
+SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
+SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
+
+SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 2ade8d641a02..3ecfb5195e2b 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -6,10 +6,10 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG) $(SONIC_DHCPMON_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/src/dhcp6relay/.gitignore b/src/dhcp6relay/.gitignore
deleted file mode 100644
index 9d09ae6b3f1a..000000000000
--- a/src/dhcp6relay/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/*
-!debian/changelog
-!debian/compat
-!debian/control
-!debian/rules
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
deleted file mode 100644
index dd384452a5fc..000000000000
--- a/src/dhcp6relay/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-RM := rm -rf
-DHCP6RELAY_TARGET := dhcp6relay
-CP := cp
-MKDIR := mkdir
-CC := g++
-MV := mv
-LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
-CFLAGS += -Wall -std=c++17 -fPIE -I$(PWD)/../sonic-swss-common/common
-PWD := $(shell pwd)
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS) $(OBJS)
-endif
-endif
-
--include src/subdir.mk
- 
-all: sonic-dhcp6relay
-
-sonic-dhcp6relay: $(OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: G++ Linker'
-	$(CC) $(LDFLAGS) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-install:
-	$(MKDIR) -p $(DESTDIR)/usr/sbin
-	$(MV) $(DHCP6RELAY_TARGET) $(DESTDIR)/usr/sbin
-
-deinstall:
-	$(RM) $(DESTDIR)/usr/sbin/$(DHCP6RELAY_TARGET)
-	$(RM) -rf $(DESTDIR)/usr/sbin
-
-clean:
-	-$(RM) $(EXECUTABLES) $(C_DEPS) $(OBJS) $(DHCP6RELAY_TARGET)
-	-@echo ' '
-
-.PHONY: all clean dependents
-
-
diff --git a/src/dhcp6relay/debian/changelog b/src/dhcp6relay/debian/changelog
deleted file mode 100644
index 67ed277049e5..000000000000
--- a/src/dhcp6relay/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-sonic-dhcp6relay (1.0.0-0) UNRELEASED; urgency=medium
-
-  * Initial release.
-
--- Kelly Yeh <kellyyeh@microsoft.com>  
diff --git a/src/dhcp6relay/debian/compat b/src/dhcp6relay/debian/compat
deleted file mode 100644
index ec635144f600..000000000000
--- a/src/dhcp6relay/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/src/dhcp6relay/debian/control b/src/dhcp6relay/debian/control
deleted file mode 100644
index 31fdb6f41f3b..000000000000
--- a/src/dhcp6relay/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: sonic-dhcp6relay
-Section: devel
-Priority: optional
-Maintainer: Kelly Yeh <kellyyeh@microsoft.com>
-Build-Depends: debhelper (>= 8.0.0),
-               dh-systemd
-Standards-Version: 3.9.3
-Homepage: https://github.com/Azure/sonic-buildimage
-XS-Go-Import-Path: github.com/Azure/sonic-buildimage
-
-Package: sonic-dhcp6relay
-Architecture: any
-Built-Using: ${misc:Built-Using}
-Depends: libevent-2.1-6,
-        libboost-thread1.71.0,
-        libboost-system1.71.0
-Description: SONiC DHCPv6 Relay
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
deleted file mode 100755
index ac2cd63889ef..000000000000
--- a/src/dhcp6relay/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-%:
-	dh $@ --parallel
diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
deleted file mode 100644
index ca78d80e63da..000000000000
--- a/src/dhcp6relay/src/configInterface.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include <sstream>
-#include <syslog.h>
-#include <algorithm>
-#include "configInterface.h"
-
-constexpr auto DEFAULT_TIMEOUT_MSEC = 1000;
-
-bool pollSwssNotifcation = true;
-std::shared_ptr<boost::thread> mSwssThreadPtr;
-
-std::shared_ptr<swss::DBConnector> configDbPtr = std::make_shared<swss::DBConnector> ("CONFIG_DB", 0);
-swss::SubscriberStateTable ipHelpersTable(configDbPtr.get(), "DHCP_RELAY");
-swss::Select swssSelect;
-
-/**
- * @code                void initialize_swss()
- * 
- * @brief               initialize DB tables and start SWSS listening thread
- *
- * @return              none
- */
-void initialize_swss(std::vector<relay_config> *vlans)
-{
-    try {
-        swssSelect.addSelectable(&ipHelpersTable);
-        get_dhcp(vlans);
-        mSwssThreadPtr = std::make_shared<boost::thread> (&handleSwssNotification, vlans);
-    }
-    catch (const std::bad_alloc &e) {
-        syslog(LOG_ERR, "Failed allocate memory. Exception details: %s", e.what());
-    }
-}
-
-/**
- * @code                void deinitialize_swss()
- * 
- * @brief               deinitialize DB interface and join SWSS listening thread
- *
- * @return              none
- */
-void deinitialize_swss()
-{
-    stopSwssNotificationPoll();
-    mSwssThreadPtr->interrupt();
-}
-
-
-/**
- * @code                void get_dhcp(std::vector<relay_config> *vlans)
- * 
- * @brief               initialize and get vlan table information from DHCP_RELAY
- *
- * @return              none
- */
-void get_dhcp(std::vector<relay_config> *vlans) {
-    swss::Selectable *selectable;
-    int ret = swssSelect.select(&selectable, DEFAULT_TIMEOUT_MSEC);
-    if (ret == swss::Select::ERROR) {
-        syslog(LOG_WARNING, "Select: returned ERROR");
-    } else if (ret == swss::Select::TIMEOUT) {
-    } 
-    if (selectable == static_cast<swss::Selectable *> (&ipHelpersTable)) {
-        handleRelayNotification(ipHelpersTable, vlans);
-    }
-}
-/**
- * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
- * 
- * @brief               main thread for handling SWSS notification
- *
- * @param context       list of vlans/argument config that contains strings of server and option
- *
- * @return              none
- */
-void handleSwssNotification(std::vector<relay_config> *vlans)
-{
-    while (pollSwssNotifcation) {
-        get_dhcp(vlans);
-    } 
-}
-
-/**
- * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
- * 
- * @brief                   handles DHCPv6 relay configuration change notification
- *
- * @param ipHelpersTable    DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
-{
-    std::deque<swss::KeyOpFieldsValuesTuple> entries;
-
-    ipHelpersTable.pops(entries);
-    processRelayNotification(entries, vlans);
-}
-
-/**
- * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
- * 
- * @brief                   process DHCPv6 relay servers and options configuration change notification
- *
- * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
-{
-    std::vector<std::string> servers;
-
-    for (auto &entry: entries) {
-        std::string vlan = kfvKey(entry);
-        std::string operation = kfvOp(entry);
-        std::vector<swss::FieldValueTuple> fieldValues = kfvFieldsValues(entry);
-
-        relay_config intf;
-        intf.is_option_79 = true;
-        intf.interface = vlan;
-        intf.db = nullptr;
-        for (auto &fieldValue: fieldValues) {
-            std::string f = fvField(fieldValue);
-            std::string v = fvValue(fieldValue);
-            if(f == "dhcpv6_servers") {
-                std::stringstream ss(v);
-                while (ss.good()) {
-                    std::string substr;
-                    getline(ss, substr, ',');
-                    intf.servers.push_back(substr);
-                }
-                syslog(LOG_DEBUG, "key: %s, Operation: %s, f: %s, v: %s", vlan.c_str(), operation.c_str(), f.c_str(), v.c_str());
-            }
-            if(f == "dhcpv6_option|rfc6939_support" && v == "false") {
-                intf.is_option_79 = false;
-            }
-        }
-        vlans->push_back(intf);
-    }
-}
-
-/**
-*@code      stopSwssNotificationPoll
-*
-*@brief     stop SWSS listening thread
-*
-*@return    none
-*/
-void stopSwssNotificationPoll() {
-    pollSwssNotifcation = false;
-};
diff --git a/src/dhcp6relay/src/configInterface.h b/src/dhcp6relay/src/configInterface.h
deleted file mode 100644
index 20b0912c5cef..000000000000
--- a/src/dhcp6relay/src/configInterface.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <boost/thread.hpp>
-#include "subscriberstatetable.h"
-#include "select.h"
-#include "relay.h"
-
-/**
- * @code                void initialize_swss()
- * 
- * @brief               initialize DB tables and start SWSS listening thread
- *
- * @return              none
- */
-void initialize_swss(std::vector<relay_config> *vlans);
-
-/**
- * @code                void deinitialize_swss()
- * 
- * @brief               deinitialize DB interface and join SWSS listening thread
- *
- * @return              none
- */
-void deinitialize_swss();
-
-/**
- * @code                void get_dhcp(std::vector<relay_config> *vlans)
- * 
- * @brief               initialize and get vlan information from DHCP_RELAY
- *
- * @return              none
- */
-void get_dhcp(std::vector<relay_config> *vlans);
-
-/**
- * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
- * 
- * @brief               main thread for handling SWSS notification
- *
- * @param vlans         list of vlans/argument config that contains strings of server and option
- *
- * @return              none
- */
-void handleSwssNotification(std::vector<relay_config> *vlans);
-
-/**
- * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
- * 
- * @brief                   handles DHCPv6 relay configuration change notification
- *
- * @param ipHelpersTable    DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void handleRelayNotification(swss::SubscriberStateTable &configMuxTable, std::vector<relay_config> *vlans);
-
-/**
- * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
- * 
- * @brief                   process DHCPv6 relay servers and options configuration change notification
- *
- * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
- * @param context           list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans);
-
-/**
-*@code      stopSwssNotificationPoll
-*
-*@brief     stop SWSS listening thread
-*
-*@return    none
-*/
-void stopSwssNotificationPoll();
diff --git a/src/dhcp6relay/src/main.cpp b/src/dhcp6relay/src/main.cpp
deleted file mode 100644
index 9f5bc74bcfa0..000000000000
--- a/src/dhcp6relay/src/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdlib.h>
-#include <syslog.h>
-#include "configInterface.h"
-
-int main(int argc, char *argv[]) {
-    try {
-        std::vector<relay_config> vlans;
-        swss::DBConnector state_db("STATE_DB", 0);
-        initialize_swss(&vlans);
-        loop_relay(&vlans, &state_db);
-    }
-    catch (std::exception &e)
-    {
-        syslog(LOG_ERR, "An exception occurred.\n");
-        return 1;
-    }
-    return 0;
-}
diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
deleted file mode 100644
index 08cec458c74d..000000000000
--- a/src/dhcp6relay/src/relay.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-#include <errno.h>
-#include <unistd.h>
-#include <event.h>
-#include <sstream>
-#include <event2/event.h>
-#include <event2/bufferevent.h>
-#include <syslog.h>
-#include <signal.h>
-
-#include "configdb.h"
-#include "sonicv2connector.h"
-#include "dbconnector.h" 
-#include "configInterface.h"
-
-
-struct event *listen_event;
-struct event *server_listen_event;
-struct event_base *base;
-struct event *ev_sigint;
-struct event *ev_sigterm;
-static std::string counter_table = "DHCPv6_COUNTER_TABLE|";
-
-/* DHCPv6 filter */
-/* sudo tcpdump -dd "ip6 dst ff02::1:2 && udp dst port 547" */
-
-static struct sock_filter ether_relay_filter[] = {
-	
-	{ 0x28, 0, 0, 0x0000000c },
-	{ 0x15, 0, 13, 0x000086dd },
-	{ 0x20, 0, 0, 0x00000026 },
-	{ 0x15, 0, 11, 0xff020000 },
-	{ 0x20, 0, 0, 0x0000002a },
-	{ 0x15, 0, 9, 0x00000000 },
-	{ 0x20, 0, 0, 0x0000002e },
-	{ 0x15, 0, 7, 0x00000000 },
-	{ 0x20, 0, 0, 0x00000032 },
-	{ 0x15, 0, 5, 0x00010002 },
-	{ 0x30, 0, 0, 0x00000014 },
-	{ 0x15, 0, 3, 0x00000011 },
-	{ 0x28, 0, 0, 0x00000038 },
-	{ 0x15, 0, 1, 0x00000223 },
-	{ 0x6, 0, 0, 0x00040000 },
-	{ 0x6, 0, 0, 0x00000000 },
-};
-const struct sock_fprog ether_relay_fprog = {
-	lengthof(ether_relay_filter),
-	ether_relay_filter
-};
-
-/* DHCPv6 Counter */
-uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
-std::map<int, std::string> counterMap = {{DHCPv6_MESSAGE_TYPE_UNKNOWN, "Unknown"},
-                                      {DHCPv6_MESSAGE_TYPE_SOLICIT, "Solicit"},
-                                      {DHCPv6_MESSAGE_TYPE_ADVERTISE, "Advertise"},
-                                      {DHCPv6_MESSAGE_TYPE_REQUEST, "Request"},
-                                      {DHCPv6_MESSAGE_TYPE_CONFIRM, "Confirm"},
-                                      {DHCPv6_MESSAGE_TYPE_RENEW, "Renew"},
-                                      {DHCPv6_MESSAGE_TYPE_REBIND, "Rebind"},
-                                      {DHCPv6_MESSAGE_TYPE_REPLY, "Reply"},
-                                      {DHCPv6_MESSAGE_TYPE_RELEASE, "Release"},
-                                      {DHCPv6_MESSAGE_TYPE_DECLINE, "Decline"},
-                                      {DHCPv6_MESSAGE_TYPE_RECONFIGURE, "Reconfigure"},
-                                      {DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST, "Information-Request"},
-                                      {DHCPv6_MESSAGE_TYPE_RELAY_FORW, "Relay-Forward"},
-                                      {DHCPv6_MESSAGE_TYPE_RELAY_REPL, "Relay-Reply"},
-                                      {DHCPv6_MESSAGE_TYPE_MALFORMED, "Malformed"}};
-
-/**
- * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
- *
- * @brief               initialize the counter by each Vlan
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * 
- * @return              none
- */
-void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
-    db->hset(counterVlan, "Unknown", toString(counters[DHCPv6_MESSAGE_TYPE_UNKNOWN]));
-    db->hset(counterVlan, "Solicit", toString(counters[DHCPv6_MESSAGE_TYPE_SOLICIT]));
-    db->hset(counterVlan, "Advertise", toString(counters[DHCPv6_MESSAGE_TYPE_ADVERTISE]));
-    db->hset(counterVlan, "Request", toString(counters[DHCPv6_MESSAGE_TYPE_REQUEST]));
-    db->hset(counterVlan, "Confirm", toString(counters[DHCPv6_MESSAGE_TYPE_CONFIRM]));
-    db->hset(counterVlan, "Renew", toString(counters[DHCPv6_MESSAGE_TYPE_RENEW]));
-    db->hset(counterVlan, "Rebind", toString(counters[DHCPv6_MESSAGE_TYPE_REBIND]));
-    db->hset(counterVlan, "Reply", toString(counters[DHCPv6_MESSAGE_TYPE_REPLY]));
-    db->hset(counterVlan, "Release", toString(counters[DHCPv6_MESSAGE_TYPE_RELEASE]));
-    db->hset(counterVlan, "Decline", toString(counters[DHCPv6_MESSAGE_TYPE_DECLINE]));
-    db->hset(counterVlan, "Reconfigure", toString(counters[DHCPv6_MESSAGE_TYPE_RECONFIGURE]));
-    db->hset(counterVlan, "Information-Request", toString(counters[DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST]));
-    db->hset(counterVlan, "Relay-Forward", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_FORW]));
-    db->hset(counterVlan, "Relay-Reply", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_REPL]));
-    db->hset(counterVlan, "Malformed", toString(counters[DHCPv6_MESSAGE_TYPE_MALFORMED]));
-}
-
-/**
- * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
- *
- * @brief               update the counter in state_db with count of each DHCPv6 message type
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * @param msg_type      dhcpv6 message type to be updated in counter
- * 
- * @return              none
- */
-void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type) {
-    db->hset(counterVlan, counterMap.find(msg_type)->second, toString(counters[msg_type]));
-}
-
-/**
- * @code                std::string toString(uint16_t count);
- *
- * @brief               convert uint16_t to string
- *
- * @param count         count of messages in counter
- * 
- * @return              count in string
- */
-std::string toString(uint16_t count) {
-    std::stringstream ss;
-    ss << count;
-    std::string countValue = ss.str();
-    return countValue;
-}
-
-/**
- * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ethernet frame
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ether_header end of ethernet header position
- */
-const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct ether_header);
-    return (const struct ether_header *)buffer;
-}
-
-/**
- * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ipv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ip6_hdr      end of ipv6 header position
- */
-const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct ip6_hdr);
-    return (struct ip6_hdr *)buffer;
-}
-
-/**
- * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through udp header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return udphdr      end of udp header position
- */
-const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct udphdr);
-    return (const struct udphdr *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_msg   end of dhcpv6 header position
- */
-const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer) {
-    return (const struct dhcpv6_msg *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 relay message
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
- */
-const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer) {
-    return (const struct dhcpv6_relay_msg *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through dhcpv6 option
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end) {
-    auto option = (const struct dhcpv6_option *)buffer;
-    uint8_t size = 4; // option-code + option-len
-    size += *(uint16_t *)(buffer);
-    (*out_end) =  buffer + size + ntohs(option->option_length);
-
-    return option;
-}
-
-/**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
- *
- * @brief                           send udp packet
- *
- * @param *buffer                   message buffer
- * @param sockaddr_in6 target       target socket
- * @param n                         length of message
- * @param relay_config *config      pointer to relay_config
- * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type) {
-    std::string counterVlan = counter_table;
-    if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
-        syslog(LOG_ERR, "sendto: Failed to send to target address\n");
-    else if (counterMap.find(msg_type) != counterMap.end()) {
-        counters[msg_type]++;
-        update_counter(config->db, counterVlan.append(config->interface), msg_type);
-    } else {
-        syslog(LOG_WARNING, "unexpected message type %d(0x%x)\n", msg_type, msg_type);
-    }
-}
-
-/**
- * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
- *
- * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
- *
- * @param buffer        pointer to buffer
- * @param msg           pointer to parsed DHCPv6 message
- * @param msg_length    length of DHCPv6 message
- *
- * @return              none
- */
-void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length) {
-    struct dhcpv6_option option;
-    option.option_code = htons(OPTION_RELAY_MSG);
-    option.option_length = htons(msg_length);
-    memcpy(buffer, &option, sizeof(struct dhcpv6_option));
-    memcpy(buffer + sizeof(struct dhcpv6_option), msg, msg_length);
-}
-
-/**
- * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
- *
- * @brief               prepare L2 socket to attach to "udp and port 547" filter 
- *
- * @param ifindex       interface index
- * @param fprog         bpf filter "udp and port 547"
- *
- * @return              socket descriptor
- */
-int sock_open(int ifindex, const struct sock_fprog *fprog)
-{
-	if (!ifindex) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	int s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-	if (s == -1) {
-		syslog(LOG_ERR, "socket: Failed to create socket\n");
-		return -1;
-	}
-
-	struct sockaddr_ll sll = {
-	    .sll_family = AF_PACKET,
-	    .sll_protocol = htons(ETH_P_ALL),
-	    .sll_ifindex = ifindex
-	};
-
-	if (bind(s, (struct sockaddr *)&sll, sizeof sll) == -1) {
-		syslog(LOG_ERR, "bind: Failed to bind to specified interface\n");
-		(void) close(s);
-	    return -1;
-	}
-
-	if (fprog && setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, fprog, sizeof *fprog) == -1)
-	{
-		syslog(LOG_ERR, "setsockopt: Failed to attach filter\n");
-		(void) close(s);
-	    return -1;
-	}
-
-	return s;
-}
-
-/**
- * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
- * 
- * @brief                       prepare for specified relay interface config: server and link address
- *
- * @param interface_config      pointer to relay config to be prepared
- * @param local_sock            L3 socket used for relaying messages
- * @param filter                socket attached with filter
- *
- * @return                      none
- */
-void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter) {
-    struct ifaddrs *ifa, *ifa_tmp;
-    sockaddr_in6 non_link_local;
-    sockaddr_in6 link_local;
-    
-    interface_config->local_sock = *local_sock; 
-    interface_config->filter = filter; 
-
-    for(auto server: interface_config->servers) {
-        sockaddr_in6 tmp;
-        if(inet_pton(AF_INET6, server.c_str(), &tmp.sin6_addr) != 1)
-        {
-            syslog(LOG_WARNING, "inet_pton: Failed to convert IPv6 address\n");
-        }
-        tmp.sin6_family = AF_INET6;
-        tmp.sin6_flowinfo = 0;
-        tmp.sin6_port = htons(RELAY_PORT);
-        tmp.sin6_scope_id = 0; 
-        interface_config->servers_sock.push_back(tmp);
-    }
-
-    if (getifaddrs(&ifa) == -1) {
-        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
-        exit(1);
-    }
-
-    ifa_tmp = ifa;
-    while (ifa_tmp) {
-        if (ifa_tmp->ifa_addr && ifa_tmp->ifa_addr->sa_family == AF_INET6) {
-            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
-                non_link_local = *in6;
-                break;
-            }
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
-                link_local = *in6;
-            }   
-        }
-    ifa_tmp = ifa_tmp->ifa_next;
-    }
-    freeifaddrs(ifa); 
-    
-    if(!IN6_IS_ADDR_LINKLOCAL(&non_link_local.sin6_addr)) {
-        interface_config->link_address = non_link_local;
-    }
-    else {
-        interface_config->link_address = link_local;
-    }
-}
-
-/**
- * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
- * 
- * @brief               prepare L3 socket for sending
- *
- * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
- * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
- * @param index         scope id of interface
- *
- * @return              none
- */
-void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index) {
-    struct ifaddrs *ifa, *ifa_tmp;
-    sockaddr_in6 addr;
-    sockaddr_in6 ll_addr;
-    memset(&addr, 0, sizeof(addr));
-    memset(&ll_addr, 0, sizeof(ll_addr));
-
-    if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
-    }
-
-    if ((*server_sock= socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
-    }
-
-    int retry = 0;
-    bool bind_addr = false;
-    bool bind_ll_addr = false;
-    do {
-        if (getifaddrs(&ifa) == -1) {
-            syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces with %s\n", strerror(errno));
-        }
-        else {
-            ifa_tmp = ifa;
-            while (ifa_tmp) {
-                if (ifa_tmp->ifa_addr && (ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
-                    struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-                    if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {  
-                        bind_addr = true;
-                        in6->sin6_family = AF_INET6;
-                        in6->sin6_port = htons(RELAY_PORT);
-                        addr = *in6;
-                    }
-                    if(IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
-                        bind_ll_addr = true;
-                        in6->sin6_family = AF_INET6;
-                        in6->sin6_port = htons(RELAY_PORT);
-                        ll_addr = *in6;
-                    }
-                }
-                ifa_tmp = ifa_tmp->ifa_next;
-            }
-            freeifaddrs(ifa);
-        }
-
-        if (bind_addr && bind_ll_addr) {
-            break;
-        }
-
-        syslog(LOG_WARNING, "Retry #%d to bind to sockets on interface %s\n", ++retry, config->interface.c_str());
-        sleep(5);
-    } while (retry < 6);
-
-    if ((!bind_addr) || (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1)) {
-        syslog(LOG_ERR, "bind: Failed to bind socket to global ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
-    }
-
-    if ((!bind_ll_addr) || (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1)) {
-        syslog(LOG_ERR, "bind: Failed to bind socket to link local ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
-    }
-}
-
-
-/**
- * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
- * 
- * @brief                construct relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param ether_hdr      pointer to Ethernet header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config) {    
-    static uint8_t buffer[4096];
-    auto current_buffer_position = buffer;
-    dhcpv6_relay_msg new_message;
-    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
-    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
-    new_message.hop_count = 0;
-
-    memcpy(&new_message.link_address, &config->link_address.sin6_addr, sizeof(in6_addr));
-    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
-    current_buffer_position += sizeof(dhcpv6_relay_msg);
-
-    if(config->is_option_79) {
-        linklayer_addr_option option79;
-        option79.link_layer_type = htons(1);
-        option79.option_code = htons(OPTION_CLIENT_LINKLAYER_ADDR);
-        option79.option_length = htons(2 + 6); // link_layer_type field + address
-        
-        memcpy(current_buffer_position, &option79, sizeof(linklayer_addr_option));
-        current_buffer_position += sizeof(linklayer_addr_option);
-
-        memcpy(current_buffer_position, &ether_hdr->ether_shost, sizeof(ether_hdr->ether_shost));
-        current_buffer_position += sizeof(ether_hdr->ether_shost);
-    }
-
-    auto dhcp_message_length = len;
-    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
-    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
-
-    for(auto server: config->servers_sock) {
-        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
-    }
-}
-
-/**
- * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
- *
- * @brief                construct a relay-forward message encapsulated relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config) {
-    static uint8_t buffer[4096];
-    dhcpv6_relay_msg new_message;
-    auto current_buffer_position = buffer;
-    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
-
-    if (dhcp_relay_header->hop_count >= HOP_LIMIT)
-        return;
-
-    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
-    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
-    new_message.hop_count = dhcp_relay_header->hop_count + 1;
-
-    memset(&new_message.link_address, 0, sizeof(in6_addr));
-
-    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
-    current_buffer_position += sizeof(dhcpv6_relay_msg);
-
-    auto dhcp_message_length = len;
-    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
-    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
-
-    for(auto server: config->servers_sock) {
-        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
-    }
-}
-
-/**
- * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
- * 
- * @brief               relay and unwrap a relay-reply message
- *
- * @param sock          L3 socket for sending data to servers
- * @param msg           pointer to dhcpv6 message header position
- * @param len           size of data received
- * @param config        relay interface config
- *
- * @return              none
- */
- void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *config) {
-    static uint8_t buffer[4096];
-    uint8_t type = 0;
-    struct sockaddr_in6 target_addr;
-    auto current_buffer_position = buffer;
-    auto current_position = msg;
-    const uint8_t *tmp = NULL;
-    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
-    current_position += sizeof(struct dhcpv6_relay_msg);
-    
-    auto position = current_position + sizeof(struct dhcpv6_option);
-    auto dhcpv6msg = parse_dhcpv6_hdr(position);
-
-    while ((current_position - msg) < len) {
-        auto option = parse_dhcpv6_opt(current_position, &tmp);
-        current_position = tmp;
-        if (current_position - msg > len || ntohs(option->option_length) > sizeof(buffer) - (current_buffer_position - buffer)) {
-            break;
-        }
-        switch (ntohs(option->option_code)) {
-            case OPTION_RELAY_MSG:
-                memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
-                current_buffer_position += ntohs(option->option_length);
-                type = dhcpv6msg->msg_type;
-                break;
-            default:
-                break;
-        }
-    }
-
-    memcpy(&target_addr.sin6_addr, &dhcp_relay_header->peer_address, sizeof(struct in6_addr));
-    target_addr.sin6_family = AF_INET6;
-    target_addr.sin6_flowinfo = 0;
-    target_addr.sin6_port = htons(CLIENT_PORT);
-    target_addr.sin6_scope_id = if_nametoindex(config->interface.c_str());
-
-    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, config, type);
-} 
-
-
-/**
- * @code                callback(evutil_socket_t fd, short event, void *arg);
- * 
- * @brief               callback for libevent that is called everytime data is received at the filter socket
- *
- * @param fd            filter socket
- * @param event         libevent triggered event  
- * @param arg           callback argument provided by user
- *
- * @return              none
- */
-void callback(evutil_socket_t fd, short event, void *arg) {
-    struct relay_config *config = (struct relay_config *)arg;
-    static uint8_t message_buffer[4096];
-    std::string counterVlan = counter_table;
-    int32_t len = recv(config->filter, message_buffer, 4096, 0);
-    if (len <= 0) {
-        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
-        return;
-    }
-
-    char* ptr = (char *)message_buffer;
-    const uint8_t *current_position = (uint8_t *)ptr;
-    const uint8_t *tmp = NULL;
-    const uint8_t *prev = NULL;
-
-    auto ether_header = parse_ether_frame(current_position, &tmp);
-    current_position = tmp;
-
-    auto ip_header = parse_ip6_hdr(current_position, &tmp);
-    current_position = tmp;
-
-    prev = current_position;
-    if (ip_header->ip6_ctlun.ip6_un1.ip6_un1_nxt != IPPROTO_UDP) {
-        const struct ip6_ext *ext_header;
-        do {
-            ext_header = (const struct ip6_ext *)current_position;
-            current_position += ext_header->ip6e_len;
-            if((current_position == prev) || (current_position >= (uint8_t *)ptr + sizeof(message_buffer))) {
-                return;
-            }
-            prev = current_position;
-        }
-        while (ext_header->ip6e_nxt != IPPROTO_UDP);
-    }
-
-    auto udp_header = parse_udp(current_position, &tmp);
-    current_position = tmp;
-
-    auto msg = parse_dhcpv6_hdr(current_position);
-    auto option_position = current_position + sizeof(struct dhcpv6_msg);
-
-    switch (msg->msg_type) {
-        case DHCPv6_MESSAGE_TYPE_RELAY_FORW:
-        {
-            relay_relay_forw(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, config);
-            break;
-        }
-        case DHCPv6_MESSAGE_TYPE_SOLICIT:
-        case DHCPv6_MESSAGE_TYPE_REQUEST: 
-	case DHCPv6_MESSAGE_TYPE_CONFIRM:
-        case DHCPv6_MESSAGE_TYPE_RENEW:
-        case DHCPv6_MESSAGE_TYPE_REBIND:
-        case DHCPv6_MESSAGE_TYPE_RELEASE:
-        case DHCPv6_MESSAGE_TYPE_DECLINE:
-        case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
-        {
-            while (option_position - message_buffer < len) {
-                auto option = parse_dhcpv6_opt(option_position, &tmp);
-                option_position = tmp;
-                if (ntohs(option->option_code) > DHCPv6_OPTION_LIMIT) {
-                    counters[DHCPv6_MESSAGE_TYPE_MALFORMED]++;
-                    update_counter(config->db, counterVlan.append(config->interface), DHCPv6_MESSAGE_TYPE_MALFORMED);
-                    syslog(LOG_WARNING, "DHCPv6 option is invalid or contains malformed payload\n");
-                    return;
-                }
-            }
-            counters[msg->msg_type]++;
-            update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
-            relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
-            break;
-        }
-        default:
-        {
-            syslog(LOG_WARNING, "DHCPv6 client message received was not relayed\n");
-            break;
-        }
-    }
-}
-
-/**
- * @code                void server_callback(evutil_socket_t fd, short event, void *arg);
- * 
- * @brief               callback for libevent that is called everytime data is received at the server socket
- *
- * @param fd            filter socket
- * @param event         libevent triggered event  
- * @param arg           callback argument provided by user
- *
- * @return              none
- */
-void server_callback(evutil_socket_t fd, short event, void *arg) {
-    struct relay_config *config = (struct relay_config *)arg;
-    sockaddr_in6 from;
-    socklen_t len = sizeof(from);
-    int32_t data = 0;
-    static uint8_t message_buffer[4096];
-
-    if ((data = recvfrom(config->local_sock, message_buffer, 4096, 0, (sockaddr *)&from, &len)) == -1) {
-        syslog(LOG_WARNING, "recv: Failed to receive data from server\n");
-    }
-
-    auto msg = parse_dhcpv6_hdr(message_buffer);
-    counters[msg->msg_type]++;
-    std::string counterVlan = counter_table;
-    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
-    if (msg->msg_type == DHCPv6_MESSAGE_TYPE_RELAY_REPL) {
-        relay_relay_reply(config->server_sock, message_buffer, data, config);
-    }
-}
-
-/**
- * @code signal_init();
- *
- * @brief initialize DHCPv6 Relay libevent signals
- */
-int signal_init() {
-    int rv = -1;
-     do {
-        ev_sigint = evsignal_new(base, SIGINT, signal_callback, base);
-        if (ev_sigint == NULL) {
-            syslog(LOG_ERR, "Could not create SIGINT libevent signal\n");
-            break;
-        }
-
-        ev_sigterm = evsignal_new(base, SIGTERM, signal_callback, base);
-        if (ev_sigterm == NULL) {
-            syslog(LOG_ERR, "Could not create SIGTERM libevent signal\n");
-            break;
-        }
-        rv = 0;
-    } while(0);
-    return rv;
-}
-
-/**
- * @code signal_start();
- *
- * @brief start DHCPv6 Relay libevent base and add signals
- */
-int signal_start()
-{
-    int rv = -1;
-    do
-    {
-        if (evsignal_add(ev_sigint, NULL) != 0) {
-            syslog(LOG_ERR, "Could not add SIGINT libevent signal\n");
-            break;
-        }
-
-        if (evsignal_add(ev_sigterm, NULL) != 0) {
-            syslog(LOG_ERR, "Could not add SIGTERM libevent signal\n");
-            break;
-        }
-
-        if (event_base_dispatch(base) != 0) {
-            syslog(LOG_ERR, "Could not start libevent dispatching loop\n");
-        }
-
-        rv = 0;
-    } while (0);
-
-    return rv;
-}
-
-/**
- * @code signal_callback(fd, event, arg);
- *
- * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
- *
- * @param fd        libevent socket
- * @param event     event triggered
- * @param arg       pointer to libevent base
- *
- * @return none
- */
-void signal_callback(evutil_socket_t fd, short event, void *arg)
-{
-    syslog(LOG_ALERT, "Received signal: '%s'\n", strsignal(fd));
-    if ((fd == SIGTERM) || (fd == SIGINT)) {
-        dhcp6relay_stop();
-    }
-}
-
-/**
- * @code dhcp6relay_stop();
- *
- * @brief stop DHCPv6 Relay libevent loop upon signal
- */
-void dhcp6relay_stop()
-{
-    event_base_loopexit(base, NULL);
-}
-
-/**
- * @code                loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
- * 
- * @brief               main loop: configure sockets, create libevent base, start server listener thread
- *  
- * @param vlans         list of vlans retrieved from config_db
- * @param db            state_db connector
- */
-void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
-    std::vector<int> sockets;
-    base = event_base_new();
-    if(base == NULL) {
-        syslog(LOG_ERR, "libevent: Failed to create base\n");
-    }
-
-    for(relay_config &vlan : *vlans) {
-        relay_config *config = &vlan;
-        int filter = 0;
-        int local_sock = 0; 
-        int server_sock = 0;
-        int index = if_nametoindex(config->interface.c_str());
-        config->db = db;
-
-        std::string counterVlan = counter_table;
-        initialize_counter(config->db, counterVlan.append(config->interface));
-
-        filter = sock_open(index, &ether_relay_fprog);
-        prepare_socket(&local_sock, &server_sock, config, index);
-
-        config->local_sock = local_sock;
-        config->server_sock = server_sock;
-
-        sockets.push_back(filter);
-        sockets.push_back(local_sock);
-        sockets.push_back(server_sock);
-
-        prepare_relay_config(config, &local_sock, filter);
-
-        evutil_make_listen_socket_reuseable(filter);
-        evutil_make_socket_nonblocking(filter);
-
-        evutil_make_listen_socket_reuseable(local_sock);
-        evutil_make_socket_nonblocking(local_sock);
-
-        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, config);
-        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, config);
-        if (listen_event == NULL || server_listen_event == NULL) {
-            syslog(LOG_ERR, "libevent: Failed to create libevent\n");
-        }
-
-        event_add(listen_event, NULL);
-        event_add(server_listen_event, NULL);
-    }
-    
-    if((signal_init() == 0) && signal_start() == 0) {
-        shutdown();
-        for(std::size_t i = 0; i<sockets.size(); i++) {
-            close(sockets.at(i));
-        }
-    }
-}
-
-/**
- * @code shutdown();
- *
- * @brief free signals and terminate threads
- */
-void shutdown() {
-    event_del(ev_sigint);
-    event_del(ev_sigterm);
-    event_free(ev_sigint); 
-    event_free(ev_sigterm);
-    event_base_free(base);
-    deinitialize_swss();
-}
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
deleted file mode 100644
index c5b07325421c..000000000000
--- a/src/dhcp6relay/src/relay.h
+++ /dev/null
@@ -1,358 +0,0 @@
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/if_packet.h>
-#include <netinet/if_ether.h>	
-#include <netinet/ip6.h>
-#include <netinet/udp.h>
-#include <ifaddrs.h>
-#include <linux/filter.h>
-#include <string>
-#include <vector>
-#include <event2/util.h>
-
-
-#define PACKED __attribute__ ((packed))
-
-#define RELAY_PORT 547
-#define CLIENT_PORT 546
-#define HOP_LIMIT 8     //HOP_LIMIT reduced from 32 to 8 as stated in RFC8415
-#define DHCPv6_OPTION_LIMIT 56      // DHCPv6 option code greater than 56 are currently unassigned
-
-#define lengthof(A) (sizeof (A) / sizeof (A)[0])
-
-#define OPTION_RELAY_MSG 9
-#define OPTION_CLIENT_LINKLAYER_ADDR 79
-
-/* DHCPv6 message types */
-typedef enum
-{
-    DHCPv6_MESSAGE_TYPE_UNKNOWN = 0,
-    DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
-    DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
-    DHCPv6_MESSAGE_TYPE_REQUEST = 3,
-    DHCPv6_MESSAGE_TYPE_CONFIRM  = 4,
-    DHCPv6_MESSAGE_TYPE_RENEW  = 5,
-    DHCPv6_MESSAGE_TYPE_REBIND = 6,
-    DHCPv6_MESSAGE_TYPE_REPLY = 7,
-    DHCPv6_MESSAGE_TYPE_RELEASE = 8,
-    DHCPv6_MESSAGE_TYPE_DECLINE = 9,
-    DHCPv6_MESSAGE_TYPE_RECONFIGURE = 10,
-    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
-    DHCPv6_MESSAGE_TYPE_RELAY_FORW = 12,
-    DHCPv6_MESSAGE_TYPE_RELAY_REPL = 13,
-    DHCPv6_MESSAGE_TYPE_MALFORMED = 14,
-
-    DHCPv6_MESSAGE_TYPE_COUNT
-} dhcp_message_type_t;
-
-struct relay_config {
-    int local_sock; 
-    int server_sock;
-    int filter;
-    sockaddr_in6 link_address;
-    swss::DBConnector *db;
-    std::string interface;
-    std::vector<std::string> servers;
-    std::vector<sockaddr_in6> servers_sock;
-    bool is_option_79;
-};
-
-
-/* DHCPv6 messages and options */
-
-struct dhcpv6_msg {
-    uint8_t msg_type;
-    uint8_t xid[3];
-};
-
-struct PACKED dhcpv6_relay_msg {
-    uint8_t msg_type;
-    uint8_t hop_count;
-    struct in6_addr link_address;
-    struct in6_addr peer_address;
-};
-
-
-struct dhcpv6_option {
-    uint16_t option_code;
-    uint16_t option_length;
-};
-
-struct linklayer_addr_option  {
-    uint16_t option_code;
-    uint16_t option_length;
-    uint16_t link_layer_type;
-};
-
-/**
- * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
- *
- * @brief               prepare L2 socket to attach to "udp and port 547" filter 
- *
- * @param ifindex       interface index
- * @param fprog         bpf filter "udp and port 547"
- *
- * @return              socket descriptor
- */
-int sock_open(int ifindex, const struct sock_fprog *fprog);
-
-/**
- * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
- * 
- * @brief               prepare L3 socket for sending
- *
- * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
- * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
- * @param index         scope id of interface
- *
- * @return              none
- */
-void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
-
-/**
- * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
- * 
- * @brief                       prepare for specified relay interface config: server and link address
- *
- * @param interface_config      pointer to relay config to be prepared
- * @param local_sock            L3 socket used for relaying messages
- * @param filter                socket attached with filter
- *
- * @return                      none
- */
-void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter);
-
-/**
- * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
- *
- * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
- *
- * @param buffer        pointer to buffer
- * @param msg           pointer to parsed DHCPv6 message
- * @param msg_length    length of DHCPv6 message
- *
- * @return              none
- */
-void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
-
-/**
- * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
- * 
- * @brief                construct relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param ether_hdr      pointer to Ethernet header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
-
-/**
- * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
- *
- * @brief                construct a relay-forward message encapsulated relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config);
-
-/**
- * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
- * 
- * @brief               relay and unwrap a relay-reply message
- *
- * @param sock          L3 socket for sending data to servers
- * @param msg           pointer to dhcpv6 message header position
- * @param len           size of data received
- * @param config        relay interface config
- *
- * @return              none
- */
-void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
-
-/**
- * @code                loop_relay(std::vector<arg_config> *vlans, swss::DBConnector *db);
- * 
- * @brief               main loop: configure sockets, create libevent base, start server listener thread
- *  
- * @param vlans         list of vlans retrieved from config_db
- * @param db            state_db connector
- */
-void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
-
-/**
- * @code signal_init();
- *
- * @brief initialize DHCPv6 Relay libevent signals
- */
-int signal_init();
-
-/**
- * @code signal_start();
- *
- * @brief start DHCPv6 Relay libevent base and add signals
- */
-int signal_start();
-
-/**
- * @code dhcp6relay_stop();
- *
- * @brief stop DHCPv6 Relay libevent loop upon signal
- */
-void dhcp6relay_stop();
-
-/**
- * @code signal_callback(fd, event, arg);
- *
- * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
- *
- * @param fd        libevent socket
- * @param event     event triggered
- * @param arg       pointer to libevent base
- *
- * @return none
- */
-void signal_callback(evutil_socket_t fd, short event, void *arg);
-
-/**
- * @code shutdown();
- *
- * @brief free signals and terminate threads
- */
-void shutdown();
-
-/**
- * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
- *
- * @brief               initialize the counter by each Vlan
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * 
- * @return              none
- */
-void initialize_counter(swss::DBConnector *db, std::string counterVlan);
-
-/**
- * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
- *
- * @brief               update the counter in state_db with count of each DHCPv6 message type
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * @param msg_type      dhcpv6 message type to be updated in counter
- * 
- * @return              none
- */
-void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type);
-
-/* Helper functions */
-
-/**
- * @code                std::string toString(uint16_t count);
- *
- * @brief               convert uint16_t to string
- *
- * @param count         count of messages in counter
- * 
- * @return              count in string
- */
-std::string toString(uint16_t count);
-
-/**
- * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ethernet frame
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ether_header end of ethernet header position
- */
-const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ipv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ip6_hdr      end of ipv6 header position
- */
-const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through udp header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return udphdr      end of udp header position
- */
-const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_msg   end of dhcpv6 header position
- */
-const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
-
-/**
- * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 relay message
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
- */
-const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
-
-/**
- * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through dhcpv6 option
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
- *
- * @brief                           send udp packet
- *
- * @param *buffer                   message buffer
- * @param sockaddr_in6 target       target socket
- * @param n                         length of message
- * @param relay_config *config      pointer to relay_config
- * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
-
diff --git a/src/dhcp6relay/src/subdir.mk b/src/dhcp6relay/src/subdir.mk
deleted file mode 100644
index 1c93d490ec63..000000000000
--- a/src/dhcp6relay/src/subdir.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-CC := g++
-
-C_SRCS += \
-../src/relay.c \
-../src/configInterface.c \
-../src/main.c 
-
-OBJS += \
-./src/relay.o \
-./src/configInterface.o \
-./src/main.o 
-
-C_DEPS += \
-./src/relay.d \
-./src/configInterface.d \
-./src/main.d 
-
-src/%.o: src/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	$(CC) -D__FILENAME__="$(subst src/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
diff --git a/src/dhcprelay b/src/dhcprelay
new file mode 160000
index 000000000000..40ad1676e4d0
--- /dev/null
+++ b/src/dhcprelay
@@ -0,0 +1 @@
+Subproject commit 40ad1676e4d07c3eec2153017997bb04b33a94c8

From a668ccf6dfdba9b4938fecb51f005a3cb8657052 Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Thu, 8 Sep 2022 11:03:19 -0700
Subject: [PATCH 1362/1674] [FRR] add patch in zebra to ignore route update on
 RT_TABLE_DEFAULT (#12023)

Why I did it
Fixes #11995 and #9188

How I did it
Add a patch for zebra to ignore sending netlink messages for routes in the table RT_DEFAULT_TABLE

How to verify it
Test mentioned in the github issues #11995 and #9188

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
---
 ...0009-ignore-route-from-default-table.patch | 32 +++++++++++++++++++
 src/sonic-frr/patch/series                    |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 src/sonic-frr/patch/0009-ignore-route-from-default-table.patch

diff --git a/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch b/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch
new file mode 100644
index 000000000000..850c2a6dbeaa
--- /dev/null
+++ b/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch
@@ -0,0 +1,32 @@
+From 96dadc6719dafdd7d58e715f59e0d1a8edc3d58f Mon Sep 17 00:00:00 2001
+From: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
+Date: Wed, 7 Sep 2022 23:59:03 +0000
+Subject: [PATCH] ignore route from default table
+
+Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
+---
+ zebra/zebra_fpm_netlink.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
+index 60ea7f97e..c6a2edf03 100644
+--- a/zebra/zebra_fpm_netlink.c
++++ b/zebra/zebra_fpm_netlink.c
+@@ -284,6 +284,14 @@ static int netlink_route_info_fill(struct netlink_route_info *ri, int cmd,
+ {
+ 	struct nexthop *nexthop;
+ 
++    struct rib_table_info *table_info =
++        rib_table_info(rib_dest_table(dest));
++
++    if (table_info->table_id == RT_TABLE_DEFAULT) {
++        zfpm_debug("%s: Discard default table route", __func__);
++        return 0;
++    }
++
+ 	memset(ri, 0, sizeof(*ri));
+ 
+ 	ri->prefix = rib_dest_prefix(dest);
+-- 
+2.25.1
+
diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series
index 69dd5991a7cb..34a323782c8e 100644
--- a/src/sonic-frr/patch/series
+++ b/src/sonic-frr/patch/series
@@ -5,3 +5,4 @@
 0005-nexthops-compare-vrf-only-if-ip-type.patch
 0007-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch
 0008-Add-support-of-bgp-l3vni-evpn.patch
+0009-ignore-route-from-default-table.patch
\ No newline at end of file

From d892214209d86939db5c00584f879478e48510d5 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 8 Sep 2022 13:59:49 -0700
Subject: [PATCH 1363/1674] Revert "[202012] Change dhcp6relay to be a
 submodule (#11922)" (#12028)

This reverts commit 9db2e21c69f236c03976b39038fb9cd7ab746e5c.
---
 .gitmodules                            |   7 -
 rules/dhcp6relay.dep                   |   9 +
 rules/dhcp6relay.mk                    |  12 +
 rules/dhcprelay.dep                    |  11 -
 rules/dhcprelay.mk                     |  12 -
 rules/docker-dhcp-relay.mk             |   4 +-
 src/dhcp6relay/.gitignore              |   5 +
 src/dhcp6relay/Makefile                |  42 ++
 src/dhcp6relay/debian/changelog        |   5 +
 src/dhcp6relay/debian/compat           |   1 +
 src/dhcp6relay/debian/control          |  17 +
 src/dhcp6relay/debian/rules            |   6 +
 src/dhcp6relay/src/configInterface.cpp | 152 +++++
 src/dhcp6relay/src/configInterface.h   |  75 +++
 src/dhcp6relay/src/main.cpp            |  18 +
 src/dhcp6relay/src/relay.cpp           | 861 +++++++++++++++++++++++++
 src/dhcp6relay/src/relay.h             | 358 ++++++++++
 src/dhcp6relay/src/subdir.mk           |  23 +
 src/dhcprelay                          |   1 -
 19 files changed, 1586 insertions(+), 33 deletions(-)
 create mode 100644 rules/dhcp6relay.dep
 create mode 100644 rules/dhcp6relay.mk
 delete mode 100644 rules/dhcprelay.dep
 delete mode 100644 rules/dhcprelay.mk
 create mode 100644 src/dhcp6relay/.gitignore
 create mode 100644 src/dhcp6relay/Makefile
 create mode 100644 src/dhcp6relay/debian/changelog
 create mode 100644 src/dhcp6relay/debian/compat
 create mode 100644 src/dhcp6relay/debian/control
 create mode 100755 src/dhcp6relay/debian/rules
 create mode 100644 src/dhcp6relay/src/configInterface.cpp
 create mode 100644 src/dhcp6relay/src/configInterface.h
 create mode 100644 src/dhcp6relay/src/main.cpp
 create mode 100644 src/dhcp6relay/src/relay.cpp
 create mode 100644 src/dhcp6relay/src/relay.h
 create mode 100644 src/dhcp6relay/src/subdir.mk
 delete mode 160000 src/dhcprelay

diff --git a/.gitmodules b/.gitmodules
index d7f23984dbea..2d6500476739 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -90,10 +90,3 @@
 	path = src/linkmgrd
 	url = https://github.com/Azure/sonic-linkmgrd.git
 	branch = 202012
-[submodule "src/dhcprelay"]
-	path = src/dhcprelay
-	url = https://github.com/sonic-net/sonic-dhcp-relay.git
-	branch = 202012
-[submodule "sonic-dhcp-relay"]
-	path = sonic-dhcp-relay
-	url = https://github.com/kellyyeh/sonic-dhcp-relay.git
diff --git a/rules/dhcp6relay.dep b/rules/dhcp6relay.dep
new file mode 100644
index 000000000000..be82d326fe21
--- /dev/null
+++ b/rules/dhcp6relay.dep
@@ -0,0 +1,9 @@
+
+SPATH       := $($(SONIC_DHCP6RELAY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcp6relay.mk rules/dhcp6relay.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(SONIC_DHCP6RELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_DHCP6RELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_DHCP6RELAY)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
new file mode 100644
index 000000000000..204bf6fa34dd
--- /dev/null
+++ b/rules/dhcp6relay.mk
@@ -0,0 +1,12 @@
+# SONiC DHCPV6 RELAY Package
+
+SONIC_DHCP6RELAY_VERSION = 1.0.0-0
+SONIC_DHCP6RELAY_PKG_NAME = dhcp6relay
+
+SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
+SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)
+
+SONIC_DHCP6RELAY_DBG = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)-dbgsym_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCP6RELAY),$(SONIC_DHCP6RELAY_DBG)))
diff --git a/rules/dhcprelay.dep b/rules/dhcprelay.dep
deleted file mode 100644
index 5f6d77a84fc3..000000000000
--- a/rules/dhcprelay.dep
+++ /dev/null
@@ -1,11 +0,0 @@
-
-SPATH       := $($(SONIC_DHCPRELAY)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
-
-$(SONIC_DHCPRELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(SONIC_DHCPRELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(SONIC_DHCPRELAY)_DEP_FILES   := $(DEP_FILES)
-$(SONIC_DHCPRELAY)_SMDEP_FILES := $(SMDEP_FILES)
-$(SONIC_DHCPRELAY)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/dhcprelay.mk b/rules/dhcprelay.mk
deleted file mode 100644
index 0a32d7d54297..000000000000
--- a/rules/dhcprelay.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# SONiC DHCPV6 RELAY Package
-
-SONIC_DHCPRELAY_VERSION = 1.0.0-0
-SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
-
-SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
-SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
-
-SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 3ecfb5195e2b..2ade8d641a02 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -6,10 +6,10 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON) 
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG) $(SONIC_DHCPMON_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/src/dhcp6relay/.gitignore b/src/dhcp6relay/.gitignore
new file mode 100644
index 000000000000..9d09ae6b3f1a
--- /dev/null
+++ b/src/dhcp6relay/.gitignore
@@ -0,0 +1,5 @@
+debian/*
+!debian/changelog
+!debian/compat
+!debian/control
+!debian/rules
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
new file mode 100644
index 000000000000..dd384452a5fc
--- /dev/null
+++ b/src/dhcp6relay/Makefile
@@ -0,0 +1,42 @@
+RM := rm -rf
+DHCP6RELAY_TARGET := dhcp6relay
+CP := cp
+MKDIR := mkdir
+CC := g++
+MV := mv
+LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
+CFLAGS += -Wall -std=c++17 -fPIE -I$(PWD)/../sonic-swss-common/common
+PWD := $(shell pwd)
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS) $(OBJS)
+endif
+endif
+
+-include src/subdir.mk
+ 
+all: sonic-dhcp6relay
+
+sonic-dhcp6relay: $(OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: G++ Linker'
+	$(CC) $(LDFLAGS) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+install:
+	$(MKDIR) -p $(DESTDIR)/usr/sbin
+	$(MV) $(DHCP6RELAY_TARGET) $(DESTDIR)/usr/sbin
+
+deinstall:
+	$(RM) $(DESTDIR)/usr/sbin/$(DHCP6RELAY_TARGET)
+	$(RM) -rf $(DESTDIR)/usr/sbin
+
+clean:
+	-$(RM) $(EXECUTABLES) $(C_DEPS) $(OBJS) $(DHCP6RELAY_TARGET)
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+
diff --git a/src/dhcp6relay/debian/changelog b/src/dhcp6relay/debian/changelog
new file mode 100644
index 000000000000..67ed277049e5
--- /dev/null
+++ b/src/dhcp6relay/debian/changelog
@@ -0,0 +1,5 @@
+sonic-dhcp6relay (1.0.0-0) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+-- Kelly Yeh <kellyyeh@microsoft.com>  
diff --git a/src/dhcp6relay/debian/compat b/src/dhcp6relay/debian/compat
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/src/dhcp6relay/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/src/dhcp6relay/debian/control b/src/dhcp6relay/debian/control
new file mode 100644
index 000000000000..31fdb6f41f3b
--- /dev/null
+++ b/src/dhcp6relay/debian/control
@@ -0,0 +1,17 @@
+Source: sonic-dhcp6relay
+Section: devel
+Priority: optional
+Maintainer: Kelly Yeh <kellyyeh@microsoft.com>
+Build-Depends: debhelper (>= 8.0.0),
+               dh-systemd
+Standards-Version: 3.9.3
+Homepage: https://github.com/Azure/sonic-buildimage
+XS-Go-Import-Path: github.com/Azure/sonic-buildimage
+
+Package: sonic-dhcp6relay
+Architecture: any
+Built-Using: ${misc:Built-Using}
+Depends: libevent-2.1-6,
+        libboost-thread1.71.0,
+        libboost-system1.71.0
+Description: SONiC DHCPv6 Relay
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
new file mode 100755
index 000000000000..ac2cd63889ef
--- /dev/null
+++ b/src/dhcp6relay/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+%:
+	dh $@ --parallel
diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
new file mode 100644
index 000000000000..ca78d80e63da
--- /dev/null
+++ b/src/dhcp6relay/src/configInterface.cpp
@@ -0,0 +1,152 @@
+#include <sstream>
+#include <syslog.h>
+#include <algorithm>
+#include "configInterface.h"
+
+constexpr auto DEFAULT_TIMEOUT_MSEC = 1000;
+
+bool pollSwssNotifcation = true;
+std::shared_ptr<boost::thread> mSwssThreadPtr;
+
+std::shared_ptr<swss::DBConnector> configDbPtr = std::make_shared<swss::DBConnector> ("CONFIG_DB", 0);
+swss::SubscriberStateTable ipHelpersTable(configDbPtr.get(), "DHCP_RELAY");
+swss::Select swssSelect;
+
+/**
+ * @code                void initialize_swss()
+ * 
+ * @brief               initialize DB tables and start SWSS listening thread
+ *
+ * @return              none
+ */
+void initialize_swss(std::vector<relay_config> *vlans)
+{
+    try {
+        swssSelect.addSelectable(&ipHelpersTable);
+        get_dhcp(vlans);
+        mSwssThreadPtr = std::make_shared<boost::thread> (&handleSwssNotification, vlans);
+    }
+    catch (const std::bad_alloc &e) {
+        syslog(LOG_ERR, "Failed allocate memory. Exception details: %s", e.what());
+    }
+}
+
+/**
+ * @code                void deinitialize_swss()
+ * 
+ * @brief               deinitialize DB interface and join SWSS listening thread
+ *
+ * @return              none
+ */
+void deinitialize_swss()
+{
+    stopSwssNotificationPoll();
+    mSwssThreadPtr->interrupt();
+}
+
+
+/**
+ * @code                void get_dhcp(std::vector<relay_config> *vlans)
+ * 
+ * @brief               initialize and get vlan table information from DHCP_RELAY
+ *
+ * @return              none
+ */
+void get_dhcp(std::vector<relay_config> *vlans) {
+    swss::Selectable *selectable;
+    int ret = swssSelect.select(&selectable, DEFAULT_TIMEOUT_MSEC);
+    if (ret == swss::Select::ERROR) {
+        syslog(LOG_WARNING, "Select: returned ERROR");
+    } else if (ret == swss::Select::TIMEOUT) {
+    } 
+    if (selectable == static_cast<swss::Selectable *> (&ipHelpersTable)) {
+        handleRelayNotification(ipHelpersTable, vlans);
+    }
+}
+/**
+ * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
+ * 
+ * @brief               main thread for handling SWSS notification
+ *
+ * @param context       list of vlans/argument config that contains strings of server and option
+ *
+ * @return              none
+ */
+void handleSwssNotification(std::vector<relay_config> *vlans)
+{
+    while (pollSwssNotifcation) {
+        get_dhcp(vlans);
+    } 
+}
+
+/**
+ * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   handles DHCPv6 relay configuration change notification
+ *
+ * @param ipHelpersTable    DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+{
+    std::deque<swss::KeyOpFieldsValuesTuple> entries;
+
+    ipHelpersTable.pops(entries);
+    processRelayNotification(entries, vlans);
+}
+
+/**
+ * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   process DHCPv6 relay servers and options configuration change notification
+ *
+ * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+{
+    std::vector<std::string> servers;
+
+    for (auto &entry: entries) {
+        std::string vlan = kfvKey(entry);
+        std::string operation = kfvOp(entry);
+        std::vector<swss::FieldValueTuple> fieldValues = kfvFieldsValues(entry);
+
+        relay_config intf;
+        intf.is_option_79 = true;
+        intf.interface = vlan;
+        intf.db = nullptr;
+        for (auto &fieldValue: fieldValues) {
+            std::string f = fvField(fieldValue);
+            std::string v = fvValue(fieldValue);
+            if(f == "dhcpv6_servers") {
+                std::stringstream ss(v);
+                while (ss.good()) {
+                    std::string substr;
+                    getline(ss, substr, ',');
+                    intf.servers.push_back(substr);
+                }
+                syslog(LOG_DEBUG, "key: %s, Operation: %s, f: %s, v: %s", vlan.c_str(), operation.c_str(), f.c_str(), v.c_str());
+            }
+            if(f == "dhcpv6_option|rfc6939_support" && v == "false") {
+                intf.is_option_79 = false;
+            }
+        }
+        vlans->push_back(intf);
+    }
+}
+
+/**
+*@code      stopSwssNotificationPoll
+*
+*@brief     stop SWSS listening thread
+*
+*@return    none
+*/
+void stopSwssNotificationPoll() {
+    pollSwssNotifcation = false;
+};
diff --git a/src/dhcp6relay/src/configInterface.h b/src/dhcp6relay/src/configInterface.h
new file mode 100644
index 000000000000..20b0912c5cef
--- /dev/null
+++ b/src/dhcp6relay/src/configInterface.h
@@ -0,0 +1,75 @@
+#include <boost/thread.hpp>
+#include "subscriberstatetable.h"
+#include "select.h"
+#include "relay.h"
+
+/**
+ * @code                void initialize_swss()
+ * 
+ * @brief               initialize DB tables and start SWSS listening thread
+ *
+ * @return              none
+ */
+void initialize_swss(std::vector<relay_config> *vlans);
+
+/**
+ * @code                void deinitialize_swss()
+ * 
+ * @brief               deinitialize DB interface and join SWSS listening thread
+ *
+ * @return              none
+ */
+void deinitialize_swss();
+
+/**
+ * @code                void get_dhcp(std::vector<relay_config> *vlans)
+ * 
+ * @brief               initialize and get vlan information from DHCP_RELAY
+ *
+ * @return              none
+ */
+void get_dhcp(std::vector<relay_config> *vlans);
+
+/**
+ * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
+ * 
+ * @brief               main thread for handling SWSS notification
+ *
+ * @param vlans         list of vlans/argument config that contains strings of server and option
+ *
+ * @return              none
+ */
+void handleSwssNotification(std::vector<relay_config> *vlans);
+
+/**
+ * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   handles DHCPv6 relay configuration change notification
+ *
+ * @param ipHelpersTable    DHCP table
+ * @param vlans             list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void handleRelayNotification(swss::SubscriberStateTable &configMuxTable, std::vector<relay_config> *vlans);
+
+/**
+ * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
+ * 
+ * @brief                   process DHCPv6 relay servers and options configuration change notification
+ *
+ * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
+ * @param context           list of vlans/argument config that contains strings of server and option
+ *
+ * @return                  none
+ */
+void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans);
+
+/**
+*@code      stopSwssNotificationPoll
+*
+*@brief     stop SWSS listening thread
+*
+*@return    none
+*/
+void stopSwssNotificationPoll();
diff --git a/src/dhcp6relay/src/main.cpp b/src/dhcp6relay/src/main.cpp
new file mode 100644
index 000000000000..9f5bc74bcfa0
--- /dev/null
+++ b/src/dhcp6relay/src/main.cpp
@@ -0,0 +1,18 @@
+#include <stdlib.h>
+#include <syslog.h>
+#include "configInterface.h"
+
+int main(int argc, char *argv[]) {
+    try {
+        std::vector<relay_config> vlans;
+        swss::DBConnector state_db("STATE_DB", 0);
+        initialize_swss(&vlans);
+        loop_relay(&vlans, &state_db);
+    }
+    catch (std::exception &e)
+    {
+        syslog(LOG_ERR, "An exception occurred.\n");
+        return 1;
+    }
+    return 0;
+}
diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
new file mode 100644
index 000000000000..08cec458c74d
--- /dev/null
+++ b/src/dhcp6relay/src/relay.cpp
@@ -0,0 +1,861 @@
+#include <errno.h>
+#include <unistd.h>
+#include <event.h>
+#include <sstream>
+#include <event2/event.h>
+#include <event2/bufferevent.h>
+#include <syslog.h>
+#include <signal.h>
+
+#include "configdb.h"
+#include "sonicv2connector.h"
+#include "dbconnector.h" 
+#include "configInterface.h"
+
+
+struct event *listen_event;
+struct event *server_listen_event;
+struct event_base *base;
+struct event *ev_sigint;
+struct event *ev_sigterm;
+static std::string counter_table = "DHCPv6_COUNTER_TABLE|";
+
+/* DHCPv6 filter */
+/* sudo tcpdump -dd "ip6 dst ff02::1:2 && udp dst port 547" */
+
+static struct sock_filter ether_relay_filter[] = {
+	
+	{ 0x28, 0, 0, 0x0000000c },
+	{ 0x15, 0, 13, 0x000086dd },
+	{ 0x20, 0, 0, 0x00000026 },
+	{ 0x15, 0, 11, 0xff020000 },
+	{ 0x20, 0, 0, 0x0000002a },
+	{ 0x15, 0, 9, 0x00000000 },
+	{ 0x20, 0, 0, 0x0000002e },
+	{ 0x15, 0, 7, 0x00000000 },
+	{ 0x20, 0, 0, 0x00000032 },
+	{ 0x15, 0, 5, 0x00010002 },
+	{ 0x30, 0, 0, 0x00000014 },
+	{ 0x15, 0, 3, 0x00000011 },
+	{ 0x28, 0, 0, 0x00000038 },
+	{ 0x15, 0, 1, 0x00000223 },
+	{ 0x6, 0, 0, 0x00040000 },
+	{ 0x6, 0, 0, 0x00000000 },
+};
+const struct sock_fprog ether_relay_fprog = {
+	lengthof(ether_relay_filter),
+	ether_relay_filter
+};
+
+/* DHCPv6 Counter */
+uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
+std::map<int, std::string> counterMap = {{DHCPv6_MESSAGE_TYPE_UNKNOWN, "Unknown"},
+                                      {DHCPv6_MESSAGE_TYPE_SOLICIT, "Solicit"},
+                                      {DHCPv6_MESSAGE_TYPE_ADVERTISE, "Advertise"},
+                                      {DHCPv6_MESSAGE_TYPE_REQUEST, "Request"},
+                                      {DHCPv6_MESSAGE_TYPE_CONFIRM, "Confirm"},
+                                      {DHCPv6_MESSAGE_TYPE_RENEW, "Renew"},
+                                      {DHCPv6_MESSAGE_TYPE_REBIND, "Rebind"},
+                                      {DHCPv6_MESSAGE_TYPE_REPLY, "Reply"},
+                                      {DHCPv6_MESSAGE_TYPE_RELEASE, "Release"},
+                                      {DHCPv6_MESSAGE_TYPE_DECLINE, "Decline"},
+                                      {DHCPv6_MESSAGE_TYPE_RECONFIGURE, "Reconfigure"},
+                                      {DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST, "Information-Request"},
+                                      {DHCPv6_MESSAGE_TYPE_RELAY_FORW, "Relay-Forward"},
+                                      {DHCPv6_MESSAGE_TYPE_RELAY_REPL, "Relay-Reply"},
+                                      {DHCPv6_MESSAGE_TYPE_MALFORMED, "Malformed"}};
+
+/**
+ * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+ *
+ * @brief               initialize the counter by each Vlan
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * 
+ * @return              none
+ */
+void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
+    db->hset(counterVlan, "Unknown", toString(counters[DHCPv6_MESSAGE_TYPE_UNKNOWN]));
+    db->hset(counterVlan, "Solicit", toString(counters[DHCPv6_MESSAGE_TYPE_SOLICIT]));
+    db->hset(counterVlan, "Advertise", toString(counters[DHCPv6_MESSAGE_TYPE_ADVERTISE]));
+    db->hset(counterVlan, "Request", toString(counters[DHCPv6_MESSAGE_TYPE_REQUEST]));
+    db->hset(counterVlan, "Confirm", toString(counters[DHCPv6_MESSAGE_TYPE_CONFIRM]));
+    db->hset(counterVlan, "Renew", toString(counters[DHCPv6_MESSAGE_TYPE_RENEW]));
+    db->hset(counterVlan, "Rebind", toString(counters[DHCPv6_MESSAGE_TYPE_REBIND]));
+    db->hset(counterVlan, "Reply", toString(counters[DHCPv6_MESSAGE_TYPE_REPLY]));
+    db->hset(counterVlan, "Release", toString(counters[DHCPv6_MESSAGE_TYPE_RELEASE]));
+    db->hset(counterVlan, "Decline", toString(counters[DHCPv6_MESSAGE_TYPE_DECLINE]));
+    db->hset(counterVlan, "Reconfigure", toString(counters[DHCPv6_MESSAGE_TYPE_RECONFIGURE]));
+    db->hset(counterVlan, "Information-Request", toString(counters[DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST]));
+    db->hset(counterVlan, "Relay-Forward", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_FORW]));
+    db->hset(counterVlan, "Relay-Reply", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_REPL]));
+    db->hset(counterVlan, "Malformed", toString(counters[DHCPv6_MESSAGE_TYPE_MALFORMED]));
+}
+
+/**
+ * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
+ *
+ * @brief               update the counter in state_db with count of each DHCPv6 message type
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * @param msg_type      dhcpv6 message type to be updated in counter
+ * 
+ * @return              none
+ */
+void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type) {
+    db->hset(counterVlan, counterMap.find(msg_type)->second, toString(counters[msg_type]));
+}
+
+/**
+ * @code                std::string toString(uint16_t count);
+ *
+ * @brief               convert uint16_t to string
+ *
+ * @param count         count of messages in counter
+ * 
+ * @return              count in string
+ */
+std::string toString(uint16_t count) {
+    std::stringstream ss;
+    ss << count;
+    std::string countValue = ss.str();
+    return countValue;
+}
+
+/**
+ * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ethernet frame
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ether_header end of ethernet header position
+ */
+const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct ether_header);
+    return (const struct ether_header *)buffer;
+}
+
+/**
+ * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ipv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ip6_hdr      end of ipv6 header position
+ */
+const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct ip6_hdr);
+    return (struct ip6_hdr *)buffer;
+}
+
+/**
+ * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through udp header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return udphdr      end of udp header position
+ */
+const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end) {
+    (*out_end) = buffer + sizeof(struct udphdr);
+    return (const struct udphdr *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_msg   end of dhcpv6 header position
+ */
+const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer) {
+    return (const struct dhcpv6_msg *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 relay message
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
+ */
+const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer) {
+    return (const struct dhcpv6_relay_msg *)buffer;
+}
+
+/**
+ * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through dhcpv6 option
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end) {
+    auto option = (const struct dhcpv6_option *)buffer;
+    uint8_t size = 4; // option-code + option-len
+    size += *(uint16_t *)(buffer);
+    (*out_end) =  buffer + size + ntohs(option->option_length);
+
+    return option;
+}
+
+/**
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
+ *
+ * @brief                           send udp packet
+ *
+ * @param *buffer                   message buffer
+ * @param sockaddr_in6 target       target socket
+ * @param n                         length of message
+ * @param relay_config *config      pointer to relay_config
+ * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type) {
+    std::string counterVlan = counter_table;
+    if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
+        syslog(LOG_ERR, "sendto: Failed to send to target address\n");
+    else if (counterMap.find(msg_type) != counterMap.end()) {
+        counters[msg_type]++;
+        update_counter(config->db, counterVlan.append(config->interface), msg_type);
+    } else {
+        syslog(LOG_WARNING, "unexpected message type %d(0x%x)\n", msg_type, msg_type);
+    }
+}
+
+/**
+ * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+ *
+ * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
+ *
+ * @param buffer        pointer to buffer
+ * @param msg           pointer to parsed DHCPv6 message
+ * @param msg_length    length of DHCPv6 message
+ *
+ * @return              none
+ */
+void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length) {
+    struct dhcpv6_option option;
+    option.option_code = htons(OPTION_RELAY_MSG);
+    option.option_length = htons(msg_length);
+    memcpy(buffer, &option, sizeof(struct dhcpv6_option));
+    memcpy(buffer + sizeof(struct dhcpv6_option), msg, msg_length);
+}
+
+/**
+ * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
+ *
+ * @brief               prepare L2 socket to attach to "udp and port 547" filter 
+ *
+ * @param ifindex       interface index
+ * @param fprog         bpf filter "udp and port 547"
+ *
+ * @return              socket descriptor
+ */
+int sock_open(int ifindex, const struct sock_fprog *fprog)
+{
+	if (!ifindex) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	int s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+	if (s == -1) {
+		syslog(LOG_ERR, "socket: Failed to create socket\n");
+		return -1;
+	}
+
+	struct sockaddr_ll sll = {
+	    .sll_family = AF_PACKET,
+	    .sll_protocol = htons(ETH_P_ALL),
+	    .sll_ifindex = ifindex
+	};
+
+	if (bind(s, (struct sockaddr *)&sll, sizeof sll) == -1) {
+		syslog(LOG_ERR, "bind: Failed to bind to specified interface\n");
+		(void) close(s);
+	    return -1;
+	}
+
+	if (fprog && setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, fprog, sizeof *fprog) == -1)
+	{
+		syslog(LOG_ERR, "setsockopt: Failed to attach filter\n");
+		(void) close(s);
+	    return -1;
+	}
+
+	return s;
+}
+
+/**
+ * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
+ * 
+ * @brief                       prepare for specified relay interface config: server and link address
+ *
+ * @param interface_config      pointer to relay config to be prepared
+ * @param local_sock            L3 socket used for relaying messages
+ * @param filter                socket attached with filter
+ *
+ * @return                      none
+ */
+void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter) {
+    struct ifaddrs *ifa, *ifa_tmp;
+    sockaddr_in6 non_link_local;
+    sockaddr_in6 link_local;
+    
+    interface_config->local_sock = *local_sock; 
+    interface_config->filter = filter; 
+
+    for(auto server: interface_config->servers) {
+        sockaddr_in6 tmp;
+        if(inet_pton(AF_INET6, server.c_str(), &tmp.sin6_addr) != 1)
+        {
+            syslog(LOG_WARNING, "inet_pton: Failed to convert IPv6 address\n");
+        }
+        tmp.sin6_family = AF_INET6;
+        tmp.sin6_flowinfo = 0;
+        tmp.sin6_port = htons(RELAY_PORT);
+        tmp.sin6_scope_id = 0; 
+        interface_config->servers_sock.push_back(tmp);
+    }
+
+    if (getifaddrs(&ifa) == -1) {
+        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
+        exit(1);
+    }
+
+    ifa_tmp = ifa;
+    while (ifa_tmp) {
+        if (ifa_tmp->ifa_addr && ifa_tmp->ifa_addr->sa_family == AF_INET6) {
+            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
+                non_link_local = *in6;
+                break;
+            }
+            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
+                link_local = *in6;
+            }   
+        }
+    ifa_tmp = ifa_tmp->ifa_next;
+    }
+    freeifaddrs(ifa); 
+    
+    if(!IN6_IS_ADDR_LINKLOCAL(&non_link_local.sin6_addr)) {
+        interface_config->link_address = non_link_local;
+    }
+    else {
+        interface_config->link_address = link_local;
+    }
+}
+
+/**
+ * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
+ * 
+ * @brief               prepare L3 socket for sending
+ *
+ * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
+ * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
+ * @param index         scope id of interface
+ *
+ * @return              none
+ */
+void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index) {
+    struct ifaddrs *ifa, *ifa_tmp;
+    sockaddr_in6 addr;
+    sockaddr_in6 ll_addr;
+    memset(&addr, 0, sizeof(addr));
+    memset(&ll_addr, 0, sizeof(ll_addr));
+
+    if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
+        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
+    }
+
+    if ((*server_sock= socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
+        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
+    }
+
+    int retry = 0;
+    bool bind_addr = false;
+    bool bind_ll_addr = false;
+    do {
+        if (getifaddrs(&ifa) == -1) {
+            syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces with %s\n", strerror(errno));
+        }
+        else {
+            ifa_tmp = ifa;
+            while (ifa_tmp) {
+                if (ifa_tmp->ifa_addr && (ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
+                    struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
+                    if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {  
+                        bind_addr = true;
+                        in6->sin6_family = AF_INET6;
+                        in6->sin6_port = htons(RELAY_PORT);
+                        addr = *in6;
+                    }
+                    if(IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
+                        bind_ll_addr = true;
+                        in6->sin6_family = AF_INET6;
+                        in6->sin6_port = htons(RELAY_PORT);
+                        ll_addr = *in6;
+                    }
+                }
+                ifa_tmp = ifa_tmp->ifa_next;
+            }
+            freeifaddrs(ifa);
+        }
+
+        if (bind_addr && bind_ll_addr) {
+            break;
+        }
+
+        syslog(LOG_WARNING, "Retry #%d to bind to sockets on interface %s\n", ++retry, config->interface.c_str());
+        sleep(5);
+    } while (retry < 6);
+
+    if ((!bind_addr) || (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1)) {
+        syslog(LOG_ERR, "bind: Failed to bind socket to global ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
+    }
+
+    if ((!bind_ll_addr) || (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1)) {
+        syslog(LOG_ERR, "bind: Failed to bind socket to link local ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
+    }
+}
+
+
+/**
+ * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+ * 
+ * @brief                construct relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param ether_hdr      pointer to Ethernet header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config) {    
+    static uint8_t buffer[4096];
+    auto current_buffer_position = buffer;
+    dhcpv6_relay_msg new_message;
+    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
+    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
+    new_message.hop_count = 0;
+
+    memcpy(&new_message.link_address, &config->link_address.sin6_addr, sizeof(in6_addr));
+    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
+    current_buffer_position += sizeof(dhcpv6_relay_msg);
+
+    if(config->is_option_79) {
+        linklayer_addr_option option79;
+        option79.link_layer_type = htons(1);
+        option79.option_code = htons(OPTION_CLIENT_LINKLAYER_ADDR);
+        option79.option_length = htons(2 + 6); // link_layer_type field + address
+        
+        memcpy(current_buffer_position, &option79, sizeof(linklayer_addr_option));
+        current_buffer_position += sizeof(linklayer_addr_option);
+
+        memcpy(current_buffer_position, &ether_hdr->ether_shost, sizeof(ether_hdr->ether_shost));
+        current_buffer_position += sizeof(ether_hdr->ether_shost);
+    }
+
+    auto dhcp_message_length = len;
+    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
+    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
+
+    for(auto server: config->servers_sock) {
+        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
+    }
+}
+
+/**
+ * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
+ *
+ * @brief                construct a relay-forward message encapsulated relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config) {
+    static uint8_t buffer[4096];
+    dhcpv6_relay_msg new_message;
+    auto current_buffer_position = buffer;
+    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
+
+    if (dhcp_relay_header->hop_count >= HOP_LIMIT)
+        return;
+
+    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
+    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
+    new_message.hop_count = dhcp_relay_header->hop_count + 1;
+
+    memset(&new_message.link_address, 0, sizeof(in6_addr));
+
+    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
+    current_buffer_position += sizeof(dhcpv6_relay_msg);
+
+    auto dhcp_message_length = len;
+    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
+    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
+
+    for(auto server: config->servers_sock) {
+        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
+    }
+}
+
+/**
+ * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+ * 
+ * @brief               relay and unwrap a relay-reply message
+ *
+ * @param sock          L3 socket for sending data to servers
+ * @param msg           pointer to dhcpv6 message header position
+ * @param len           size of data received
+ * @param config        relay interface config
+ *
+ * @return              none
+ */
+ void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *config) {
+    static uint8_t buffer[4096];
+    uint8_t type = 0;
+    struct sockaddr_in6 target_addr;
+    auto current_buffer_position = buffer;
+    auto current_position = msg;
+    const uint8_t *tmp = NULL;
+    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
+    current_position += sizeof(struct dhcpv6_relay_msg);
+    
+    auto position = current_position + sizeof(struct dhcpv6_option);
+    auto dhcpv6msg = parse_dhcpv6_hdr(position);
+
+    while ((current_position - msg) < len) {
+        auto option = parse_dhcpv6_opt(current_position, &tmp);
+        current_position = tmp;
+        if (current_position - msg > len || ntohs(option->option_length) > sizeof(buffer) - (current_buffer_position - buffer)) {
+            break;
+        }
+        switch (ntohs(option->option_code)) {
+            case OPTION_RELAY_MSG:
+                memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
+                current_buffer_position += ntohs(option->option_length);
+                type = dhcpv6msg->msg_type;
+                break;
+            default:
+                break;
+        }
+    }
+
+    memcpy(&target_addr.sin6_addr, &dhcp_relay_header->peer_address, sizeof(struct in6_addr));
+    target_addr.sin6_family = AF_INET6;
+    target_addr.sin6_flowinfo = 0;
+    target_addr.sin6_port = htons(CLIENT_PORT);
+    target_addr.sin6_scope_id = if_nametoindex(config->interface.c_str());
+
+    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, config, type);
+} 
+
+
+/**
+ * @code                callback(evutil_socket_t fd, short event, void *arg);
+ * 
+ * @brief               callback for libevent that is called everytime data is received at the filter socket
+ *
+ * @param fd            filter socket
+ * @param event         libevent triggered event  
+ * @param arg           callback argument provided by user
+ *
+ * @return              none
+ */
+void callback(evutil_socket_t fd, short event, void *arg) {
+    struct relay_config *config = (struct relay_config *)arg;
+    static uint8_t message_buffer[4096];
+    std::string counterVlan = counter_table;
+    int32_t len = recv(config->filter, message_buffer, 4096, 0);
+    if (len <= 0) {
+        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
+        return;
+    }
+
+    char* ptr = (char *)message_buffer;
+    const uint8_t *current_position = (uint8_t *)ptr;
+    const uint8_t *tmp = NULL;
+    const uint8_t *prev = NULL;
+
+    auto ether_header = parse_ether_frame(current_position, &tmp);
+    current_position = tmp;
+
+    auto ip_header = parse_ip6_hdr(current_position, &tmp);
+    current_position = tmp;
+
+    prev = current_position;
+    if (ip_header->ip6_ctlun.ip6_un1.ip6_un1_nxt != IPPROTO_UDP) {
+        const struct ip6_ext *ext_header;
+        do {
+            ext_header = (const struct ip6_ext *)current_position;
+            current_position += ext_header->ip6e_len;
+            if((current_position == prev) || (current_position >= (uint8_t *)ptr + sizeof(message_buffer))) {
+                return;
+            }
+            prev = current_position;
+        }
+        while (ext_header->ip6e_nxt != IPPROTO_UDP);
+    }
+
+    auto udp_header = parse_udp(current_position, &tmp);
+    current_position = tmp;
+
+    auto msg = parse_dhcpv6_hdr(current_position);
+    auto option_position = current_position + sizeof(struct dhcpv6_msg);
+
+    switch (msg->msg_type) {
+        case DHCPv6_MESSAGE_TYPE_RELAY_FORW:
+        {
+            relay_relay_forw(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, config);
+            break;
+        }
+        case DHCPv6_MESSAGE_TYPE_SOLICIT:
+        case DHCPv6_MESSAGE_TYPE_REQUEST: 
+	case DHCPv6_MESSAGE_TYPE_CONFIRM:
+        case DHCPv6_MESSAGE_TYPE_RENEW:
+        case DHCPv6_MESSAGE_TYPE_REBIND:
+        case DHCPv6_MESSAGE_TYPE_RELEASE:
+        case DHCPv6_MESSAGE_TYPE_DECLINE:
+        case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
+        {
+            while (option_position - message_buffer < len) {
+                auto option = parse_dhcpv6_opt(option_position, &tmp);
+                option_position = tmp;
+                if (ntohs(option->option_code) > DHCPv6_OPTION_LIMIT) {
+                    counters[DHCPv6_MESSAGE_TYPE_MALFORMED]++;
+                    update_counter(config->db, counterVlan.append(config->interface), DHCPv6_MESSAGE_TYPE_MALFORMED);
+                    syslog(LOG_WARNING, "DHCPv6 option is invalid or contains malformed payload\n");
+                    return;
+                }
+            }
+            counters[msg->msg_type]++;
+            update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
+            relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
+            break;
+        }
+        default:
+        {
+            syslog(LOG_WARNING, "DHCPv6 client message received was not relayed\n");
+            break;
+        }
+    }
+}
+
+/**
+ * @code                void server_callback(evutil_socket_t fd, short event, void *arg);
+ * 
+ * @brief               callback for libevent that is called everytime data is received at the server socket
+ *
+ * @param fd            filter socket
+ * @param event         libevent triggered event  
+ * @param arg           callback argument provided by user
+ *
+ * @return              none
+ */
+void server_callback(evutil_socket_t fd, short event, void *arg) {
+    struct relay_config *config = (struct relay_config *)arg;
+    sockaddr_in6 from;
+    socklen_t len = sizeof(from);
+    int32_t data = 0;
+    static uint8_t message_buffer[4096];
+
+    if ((data = recvfrom(config->local_sock, message_buffer, 4096, 0, (sockaddr *)&from, &len)) == -1) {
+        syslog(LOG_WARNING, "recv: Failed to receive data from server\n");
+    }
+
+    auto msg = parse_dhcpv6_hdr(message_buffer);
+    counters[msg->msg_type]++;
+    std::string counterVlan = counter_table;
+    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
+    if (msg->msg_type == DHCPv6_MESSAGE_TYPE_RELAY_REPL) {
+        relay_relay_reply(config->server_sock, message_buffer, data, config);
+    }
+}
+
+/**
+ * @code signal_init();
+ *
+ * @brief initialize DHCPv6 Relay libevent signals
+ */
+int signal_init() {
+    int rv = -1;
+     do {
+        ev_sigint = evsignal_new(base, SIGINT, signal_callback, base);
+        if (ev_sigint == NULL) {
+            syslog(LOG_ERR, "Could not create SIGINT libevent signal\n");
+            break;
+        }
+
+        ev_sigterm = evsignal_new(base, SIGTERM, signal_callback, base);
+        if (ev_sigterm == NULL) {
+            syslog(LOG_ERR, "Could not create SIGTERM libevent signal\n");
+            break;
+        }
+        rv = 0;
+    } while(0);
+    return rv;
+}
+
+/**
+ * @code signal_start();
+ *
+ * @brief start DHCPv6 Relay libevent base and add signals
+ */
+int signal_start()
+{
+    int rv = -1;
+    do
+    {
+        if (evsignal_add(ev_sigint, NULL) != 0) {
+            syslog(LOG_ERR, "Could not add SIGINT libevent signal\n");
+            break;
+        }
+
+        if (evsignal_add(ev_sigterm, NULL) != 0) {
+            syslog(LOG_ERR, "Could not add SIGTERM libevent signal\n");
+            break;
+        }
+
+        if (event_base_dispatch(base) != 0) {
+            syslog(LOG_ERR, "Could not start libevent dispatching loop\n");
+        }
+
+        rv = 0;
+    } while (0);
+
+    return rv;
+}
+
+/**
+ * @code signal_callback(fd, event, arg);
+ *
+ * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
+ *
+ * @param fd        libevent socket
+ * @param event     event triggered
+ * @param arg       pointer to libevent base
+ *
+ * @return none
+ */
+void signal_callback(evutil_socket_t fd, short event, void *arg)
+{
+    syslog(LOG_ALERT, "Received signal: '%s'\n", strsignal(fd));
+    if ((fd == SIGTERM) || (fd == SIGINT)) {
+        dhcp6relay_stop();
+    }
+}
+
+/**
+ * @code dhcp6relay_stop();
+ *
+ * @brief stop DHCPv6 Relay libevent loop upon signal
+ */
+void dhcp6relay_stop()
+{
+    event_base_loopexit(base, NULL);
+}
+
+/**
+ * @code                loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
+ * 
+ * @brief               main loop: configure sockets, create libevent base, start server listener thread
+ *  
+ * @param vlans         list of vlans retrieved from config_db
+ * @param db            state_db connector
+ */
+void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
+    std::vector<int> sockets;
+    base = event_base_new();
+    if(base == NULL) {
+        syslog(LOG_ERR, "libevent: Failed to create base\n");
+    }
+
+    for(relay_config &vlan : *vlans) {
+        relay_config *config = &vlan;
+        int filter = 0;
+        int local_sock = 0; 
+        int server_sock = 0;
+        int index = if_nametoindex(config->interface.c_str());
+        config->db = db;
+
+        std::string counterVlan = counter_table;
+        initialize_counter(config->db, counterVlan.append(config->interface));
+
+        filter = sock_open(index, &ether_relay_fprog);
+        prepare_socket(&local_sock, &server_sock, config, index);
+
+        config->local_sock = local_sock;
+        config->server_sock = server_sock;
+
+        sockets.push_back(filter);
+        sockets.push_back(local_sock);
+        sockets.push_back(server_sock);
+
+        prepare_relay_config(config, &local_sock, filter);
+
+        evutil_make_listen_socket_reuseable(filter);
+        evutil_make_socket_nonblocking(filter);
+
+        evutil_make_listen_socket_reuseable(local_sock);
+        evutil_make_socket_nonblocking(local_sock);
+
+        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, config);
+        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, config);
+        if (listen_event == NULL || server_listen_event == NULL) {
+            syslog(LOG_ERR, "libevent: Failed to create libevent\n");
+        }
+
+        event_add(listen_event, NULL);
+        event_add(server_listen_event, NULL);
+    }
+    
+    if((signal_init() == 0) && signal_start() == 0) {
+        shutdown();
+        for(std::size_t i = 0; i<sockets.size(); i++) {
+            close(sockets.at(i));
+        }
+    }
+}
+
+/**
+ * @code shutdown();
+ *
+ * @brief free signals and terminate threads
+ */
+void shutdown() {
+    event_del(ev_sigint);
+    event_del(ev_sigterm);
+    event_free(ev_sigint); 
+    event_free(ev_sigterm);
+    event_base_free(base);
+    deinitialize_swss();
+}
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
new file mode 100644
index 000000000000..c5b07325421c
--- /dev/null
+++ b/src/dhcp6relay/src/relay.h
@@ -0,0 +1,358 @@
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <linux/if_packet.h>
+#include <netinet/if_ether.h>	
+#include <netinet/ip6.h>
+#include <netinet/udp.h>
+#include <ifaddrs.h>
+#include <linux/filter.h>
+#include <string>
+#include <vector>
+#include <event2/util.h>
+
+
+#define PACKED __attribute__ ((packed))
+
+#define RELAY_PORT 547
+#define CLIENT_PORT 546
+#define HOP_LIMIT 8     //HOP_LIMIT reduced from 32 to 8 as stated in RFC8415
+#define DHCPv6_OPTION_LIMIT 56      // DHCPv6 option code greater than 56 are currently unassigned
+
+#define lengthof(A) (sizeof (A) / sizeof (A)[0])
+
+#define OPTION_RELAY_MSG 9
+#define OPTION_CLIENT_LINKLAYER_ADDR 79
+
+/* DHCPv6 message types */
+typedef enum
+{
+    DHCPv6_MESSAGE_TYPE_UNKNOWN = 0,
+    DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
+    DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
+    DHCPv6_MESSAGE_TYPE_REQUEST = 3,
+    DHCPv6_MESSAGE_TYPE_CONFIRM  = 4,
+    DHCPv6_MESSAGE_TYPE_RENEW  = 5,
+    DHCPv6_MESSAGE_TYPE_REBIND = 6,
+    DHCPv6_MESSAGE_TYPE_REPLY = 7,
+    DHCPv6_MESSAGE_TYPE_RELEASE = 8,
+    DHCPv6_MESSAGE_TYPE_DECLINE = 9,
+    DHCPv6_MESSAGE_TYPE_RECONFIGURE = 10,
+    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
+    DHCPv6_MESSAGE_TYPE_RELAY_FORW = 12,
+    DHCPv6_MESSAGE_TYPE_RELAY_REPL = 13,
+    DHCPv6_MESSAGE_TYPE_MALFORMED = 14,
+
+    DHCPv6_MESSAGE_TYPE_COUNT
+} dhcp_message_type_t;
+
+struct relay_config {
+    int local_sock; 
+    int server_sock;
+    int filter;
+    sockaddr_in6 link_address;
+    swss::DBConnector *db;
+    std::string interface;
+    std::vector<std::string> servers;
+    std::vector<sockaddr_in6> servers_sock;
+    bool is_option_79;
+};
+
+
+/* DHCPv6 messages and options */
+
+struct dhcpv6_msg {
+    uint8_t msg_type;
+    uint8_t xid[3];
+};
+
+struct PACKED dhcpv6_relay_msg {
+    uint8_t msg_type;
+    uint8_t hop_count;
+    struct in6_addr link_address;
+    struct in6_addr peer_address;
+};
+
+
+struct dhcpv6_option {
+    uint16_t option_code;
+    uint16_t option_length;
+};
+
+struct linklayer_addr_option  {
+    uint16_t option_code;
+    uint16_t option_length;
+    uint16_t link_layer_type;
+};
+
+/**
+ * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
+ *
+ * @brief               prepare L2 socket to attach to "udp and port 547" filter 
+ *
+ * @param ifindex       interface index
+ * @param fprog         bpf filter "udp and port 547"
+ *
+ * @return              socket descriptor
+ */
+int sock_open(int ifindex, const struct sock_fprog *fprog);
+
+/**
+ * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
+ * 
+ * @brief               prepare L3 socket for sending
+ *
+ * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
+ * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
+ * @param index         scope id of interface
+ *
+ * @return              none
+ */
+void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
+
+/**
+ * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
+ * 
+ * @brief                       prepare for specified relay interface config: server and link address
+ *
+ * @param interface_config      pointer to relay config to be prepared
+ * @param local_sock            L3 socket used for relaying messages
+ * @param filter                socket attached with filter
+ *
+ * @return                      none
+ */
+void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter);
+
+/**
+ * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+ *
+ * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
+ *
+ * @param buffer        pointer to buffer
+ * @param msg           pointer to parsed DHCPv6 message
+ * @param msg_length    length of DHCPv6 message
+ *
+ * @return              none
+ */
+void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
+
+/**
+ * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+ * 
+ * @brief                construct relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param ether_hdr      pointer to Ethernet header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
+
+/**
+ * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
+ *
+ * @brief                construct a relay-forward message encapsulated relay-forward message
+ *
+ * @param sock           L3 socket for sending data to servers
+ * @param msg            pointer to dhcpv6 message header position
+ * @param len            size of data received
+ * @param ip_hdr         pointer to IPv6 header
+ * @param config         pointer to the relay interface config
+ *
+ * @return none
+ */
+void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config);
+
+/**
+ * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+ * 
+ * @brief               relay and unwrap a relay-reply message
+ *
+ * @param sock          L3 socket for sending data to servers
+ * @param msg           pointer to dhcpv6 message header position
+ * @param len           size of data received
+ * @param config        relay interface config
+ *
+ * @return              none
+ */
+void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
+
+/**
+ * @code                loop_relay(std::vector<arg_config> *vlans, swss::DBConnector *db);
+ * 
+ * @brief               main loop: configure sockets, create libevent base, start server listener thread
+ *  
+ * @param vlans         list of vlans retrieved from config_db
+ * @param db            state_db connector
+ */
+void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
+
+/**
+ * @code signal_init();
+ *
+ * @brief initialize DHCPv6 Relay libevent signals
+ */
+int signal_init();
+
+/**
+ * @code signal_start();
+ *
+ * @brief start DHCPv6 Relay libevent base and add signals
+ */
+int signal_start();
+
+/**
+ * @code dhcp6relay_stop();
+ *
+ * @brief stop DHCPv6 Relay libevent loop upon signal
+ */
+void dhcp6relay_stop();
+
+/**
+ * @code signal_callback(fd, event, arg);
+ *
+ * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
+ *
+ * @param fd        libevent socket
+ * @param event     event triggered
+ * @param arg       pointer to libevent base
+ *
+ * @return none
+ */
+void signal_callback(evutil_socket_t fd, short event, void *arg);
+
+/**
+ * @code shutdown();
+ *
+ * @brief free signals and terminate threads
+ */
+void shutdown();
+
+/**
+ * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+ *
+ * @brief               initialize the counter by each Vlan
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * 
+ * @return              none
+ */
+void initialize_counter(swss::DBConnector *db, std::string counterVlan);
+
+/**
+ * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
+ *
+ * @brief               update the counter in state_db with count of each DHCPv6 message type
+ *
+ * @param swss::DBConnector *db     state_db connector
+ * @param counterVlan   counter table with interface name
+ * @param msg_type      dhcpv6 message type to be updated in counter
+ * 
+ * @return              none
+ */
+void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type);
+
+/* Helper functions */
+
+/**
+ * @code                std::string toString(uint16_t count);
+ *
+ * @brief               convert uint16_t to string
+ *
+ * @param count         count of messages in counter
+ * 
+ * @return              count in string
+ */
+std::string toString(uint16_t count);
+
+/**
+ * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ethernet frame
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ether_header end of ethernet header position
+ */
+const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through ipv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return ip6_hdr      end of ipv6 header position
+ */
+const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through udp header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return udphdr      end of udp header position
+ */
+const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 header
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_msg   end of dhcpv6 header position
+ */
+const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
+
+/**
+ * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+ *
+ * @brief               parse through dhcpv6 relay message
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
+ */
+const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
+
+/**
+ * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+ *
+ * @brief               parse through dhcpv6 option
+ *
+ * @param *buffer       message buffer
+ * @param **out_end     pointer
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
+
+/**
+ * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
+ *
+ * @brief                           send udp packet
+ *
+ * @param *buffer                   message buffer
+ * @param sockaddr_in6 target       target socket
+ * @param n                         length of message
+ * @param relay_config *config      pointer to relay_config
+ * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
+ * 
+ * @return dhcpv6_option   end of dhcpv6 message option
+ */
+void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
+
diff --git a/src/dhcp6relay/src/subdir.mk b/src/dhcp6relay/src/subdir.mk
new file mode 100644
index 000000000000..1c93d490ec63
--- /dev/null
+++ b/src/dhcp6relay/src/subdir.mk
@@ -0,0 +1,23 @@
+CC := g++
+
+C_SRCS += \
+../src/relay.c \
+../src/configInterface.c \
+../src/main.c 
+
+OBJS += \
+./src/relay.o \
+./src/configInterface.o \
+./src/main.o 
+
+C_DEPS += \
+./src/relay.d \
+./src/configInterface.d \
+./src/main.d 
+
+src/%.o: src/%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C++ Compiler'
+	$(CC) -D__FILENAME__="$(subst src/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
diff --git a/src/dhcprelay b/src/dhcprelay
deleted file mode 160000
index 40ad1676e4d0..000000000000
--- a/src/dhcprelay
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40ad1676e4d07c3eec2153017997bb04b33a94c8

From 3445104d72795a9f9ca0e4a6113f095e68206499 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 9 Sep 2022 05:23:50 +0800
Subject: [PATCH 1364/1674] [202012] Fix vs check install login timeout issue
 (#11727) (#12011)

Why I did it
Fix a build not stable issue: #11620
The vs vm has started successfully, but failed to wait for the message "sonic login:".

There were 55 builds failed caused by the issue in the last 30 days.

AzurePipelineBuildLogs
| where startTime > ago(30d)
| where type =~ "task"
| where result =~ "failed"
| where name =~ "Build sonic image"
| where content contains "Timeout exceeded"
| where content contains "re.compile('sonic login:')"
| project-away content
| extend branchName=case(reason=~"pullRequest", tostring(todynamic(parameters)['system.pullRequest.targetBranch']),
              replace("refs/heads/", "", sourceBranch))
| summarize FailedCount=dcount(buildId) by branchName

branchName	FailedCount
master	37
202012	9
202106	4
202111	2
202205	1
201911	1
It is caused by the login message mixed with the output message of the /etc/rc.local, one of the examples as below: (see the message rc.local[307]: sonic+ onie_disco_subnet=255.255.255.0 login: )
The check_install.py was waiting for the message "sonic login:", and Linux console was waiting for the username input (the login message has already printed in the console).
https://dev.azure.com/mssonic/build/_build/results?buildId=123294&view=logs&j=cef3d8a9-152e-5193-620b-567dc18af272&t=359769c4-8b5e-5976-a793-85da132e0a6f

2022-07-17T15:00:58.9198877Z [   25.493855] rc.local[307]: + onie_disco_opt53=05
2022-07-17T15:00:58.9199330Z [   25.595054] rc.local[307]: + onie_disco_router=10.0.2.2
2022-07-17T15:00:58.9199781Z [   25.699409] rc.local[307]: + onie_disco_serverid=10.0.2.2
2022-07-17T15:00:58.9200252Z [   25.789891] rc.local[307]: + onie_disco_siaddr=10.0.2.2
2022-07-17T15:00:58.9200622Z [   25.880920]
2022-07-17T15:00:58.9200745Z
2022-07-17T15:00:58.9201019Z Debian GNU/Linux 10 sonic ttyS0
2022-07-17T15:00:58.9201201Z
2022-07-17T15:00:58.9201542Z rc.local[307]: sonic+ onie_disco_subnet=255.255.255.0 login:
2022-07-17T15:00:58.9202309Z [   26.079767] rc.local[307]: + onie_exec_url=file://dev/vdb/onie-installer.bin

How I did it
Input a newline when finished to run the script /etc/rc.local.
If entering a newline, the message "sonic login:" will prompt again.
---
 check_install.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/check_install.py b/check_install.py
index 08759db127f9..6ed5683a2a4e 100755
--- a/check_install.py
+++ b/check_install.py
@@ -24,6 +24,7 @@ def main():
     passwd_prompt = 'Password:'
     cmd_prompt = "{}@sonic:~\$ $".format(args.u)
     grub_selection = "The highlighted entry will be executed"
+    firsttime_prompt = 'firsttime_exit'
 
     i = 0
     while True:
@@ -43,7 +44,7 @@ def main():
 
     # install sonic image
     while True:
-        i = p.expect([login_prompt, passwd_prompt, grub_selection, cmd_prompt])
+        i = p.expect([login_prompt, passwd_prompt, firsttime_prompt, grub_selection, cmd_prompt])
         if i == 0:
             # send user name
             p.sendline(args.u)
@@ -51,6 +52,10 @@ def main():
             # send password
             p.sendline(args.P)
         elif i == 2:
+            # fix a login timeout issue, caused by the login_prompt message mixed with the output message of the rc.local
+            time.sleep(1)
+            p.sendline()
+        elif i == 3:
             # select onie install
             p.sendline()
         else:

From 10b6a5c40247885b16de06dd6855585e7f41bb53 Mon Sep 17 00:00:00 2001
From: siqbal1986 <shahzad.iqbal@gmail.com>
Date: Thu, 8 Sep 2022 14:57:20 -0700
Subject: [PATCH 1365/1674] [202012] StateDB table cleanup for VNET routes
 (#11999)

* added cleanup of tables. 'VNET_ROUTE_TUNNEL_TABLE*', 'VNET_ROUTE_TABLE*'
---
 files/scripts/swss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 32d7e3ba4d67..ceb3a057ae3e 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -147,7 +147,7 @@ start() {
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
         $SONIC_DB_CLI RESTAPI_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*', 'VNET_ROUTE*'"
     fi
 
     # start service docker

From 5b9fc0aef504fc8524972d761a4ba484a923123e Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:49:53 -0700
Subject: [PATCH 1366/1674] [202012][submodule] Update sonic-swss-common
 submodule (#11994)

Update sonic-swss-common submodule pointer to include the following:
* VxLAN Tunnel Counters and Rates implementation (#519) ([#679](https://github.com/Azure/sonic-swss-common/pull/679))
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 3925249ab504..30aa38c167c3 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 3925249ab50485bb9e48dbb939a716162911196f
+Subproject commit 30aa38c167c34b727e31db6b0e317647e7ff47b7

From aa715b9b4b9581183d0abc42cc52ae46cab9681b Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <sumukhatv@outlook.com>
Date: Thu, 8 Sep 2022 19:51:20 -0700
Subject: [PATCH 1367/1674] [202012] [RESTAPI] Update submodule

[202012] [RESTAPI] Update submodule

Fix missing dependencies and improve dependency management sonic-restapi#123
[Static Route Expiry] Update API contract sonic-restapi#125
[Static Route Expiry] Feature support sonic-restapi#124
Handle IPv6 VNET routes sonic-restapi#127
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index bcc6f704a544..dac446feb2be 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit bcc6f704a54454f326f069501b01759dbb732bb3
+Subproject commit dac446feb2be3aa348f633a4d2e3c64993d7483a

From 5e8332f5058932cd31bfc04e437f05faabdc33dd Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 9 Sep 2022 21:46:28 +0800
Subject: [PATCH 1368/1674] [ci/build]: Upgrade SONiC package versions (#12039)

---
 .../versions-deb-buster                       | 34 +++++++++---------
 files/build/versions/default/versions-git     |  2 +-
 .../versions-deb-buster                       | 18 +++++-----
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../docker-syncd-centec-rpc/versions-py2      |  3 ++
 .../docker-syncd-mlnx/versions-deb-buster     | 36 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 files/build/versions/host-image/versions-py3  |  4 +--
 .../host-image/versions-py3-all-arm64         |  1 +
 .../host-image/versions-py3-all-armhf         |  1 +
 15 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 131f0755077b..79d904a93254 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.5.2318
-applibs-dev==1.mlnx.4.5.2318
+applibs==1.mlnx.4.5.2320
+applibs-dev==1.mlnx.4.5.2320
 bfnplatform==1.0.0
 innovium-sai==0.107.6
 innovium-sai-headers==0.107.6
-iproute2-dev==1.mlnx.4.5.2318
+iproute2-dev==1.mlnx.4.5.2320
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -55,20 +55,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.5.2318
-sx-acl-helper-dev==1.mlnx.4.5.2318
-sx-complib==1.mlnx.4.5.2318
-sx-complib-dev==1.mlnx.4.5.2318
-sx-examples==1.mlnx.4.5.2318
-sx-examples-dev==1.mlnx.4.5.2318
-sx-gen-utils==1.mlnx.4.5.2318
-sx-gen-utils-dev==1.mlnx.4.5.2318
-sx-scew==1.mlnx.4.5.2318
-sx-scew-dev==1.mlnx.4.5.2318
-sxd-libs==1.mlnx.4.5.2318
-sxd-libs-dev==1.mlnx.4.5.2318
+sx-acl-helper==1.mlnx.4.5.2320
+sx-acl-helper-dev==1.mlnx.4.5.2320
+sx-complib==1.mlnx.4.5.2320
+sx-complib-dev==1.mlnx.4.5.2320
+sx-examples==1.mlnx.4.5.2320
+sx-examples-dev==1.mlnx.4.5.2320
+sx-gen-utils==1.mlnx.4.5.2320
+sx-gen-utils-dev==1.mlnx.4.5.2320
+sx-scew==1.mlnx.4.5.2320
+sx-scew-dev==1.mlnx.4.5.2320
+sxd-libs==1.mlnx.4.5.2320
+sxd-libs-dev==1.mlnx.4.5.2320
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.5.2318
-wjh-libs-dev==1.mlnx.4.5.2318
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2320
+wjh-libs-dev==1.mlnx.4.5.2320
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index fff02985866d..beefaabdb03c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index eee6e7112be4..fe10cb5261a2 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.5.2318
-applibs-dev==1.mlnx.4.5.2318
+applibs==1.mlnx.4.5.2320
+applibs-dev==1.mlnx.4.5.2320
 binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
@@ -108,7 +108,7 @@ python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
-python-sdk-api==1.mlnx.4.5.2318
+python-sdk-api==1.mlnx.4.5.2320
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.5.2318
-sx-complib-dev==1.mlnx.4.5.2318
-sx-gen-utils==1.mlnx.4.5.2318
-sx-gen-utils-dev==1.mlnx.4.5.2318
-sxd-libs==1.mlnx.4.5.2318
-sxd-libs-dev==1.mlnx.4.5.2318
+sx-complib==1.mlnx.4.5.2320
+sx-complib-dev==1.mlnx.4.5.2320
+sx-gen-utils==1.mlnx.4.5.2320
+sx-gen-utils-dev==1.mlnx.4.5.2320
+sxd-libs==1.mlnx.4.5.2320
+sxd-libs-dev==1.mlnx.4.5.2320
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 46f00feb42ad..ef1c55ef6e56 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.7.post1
 pyang==2.5.3
 pyangbind==0.6.0
-python-sdk-api==4.5.2318
+python-sdk-api==4.5.2320
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 95c54aad2eae..3b41ecca6169 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.5.2318
+python_sdk_api==4.5.2320
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
index e16074ca518b..60b9f31f8e4a 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
@@ -1,2 +1,5 @@
+cffi==1.7.0
+nnpy==1.4.2
 ptf==0.9.1
+pycparser==2.21
 scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 03d0fa93cc1c..b79cef8243c7 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,8 +1,8 @@
-applibs==1.mlnx.4.5.2318
-applibs-dev==1.mlnx.4.5.2318
+applibs==1.mlnx.4.5.2320
+applibs-dev==1.mlnx.4.5.2320
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2-dev==1.mlnx.4.5.2318
+iproute2-dev==1.mlnx.4.5.2320
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -41,7 +41,7 @@ python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.5.2318
+python-sdk-api==1.mlnx.4.5.2320
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.5.2318
-sx-acl-helper-dev==1.mlnx.4.5.2318
-sx-complib==1.mlnx.4.5.2318
-sx-complib-dev==1.mlnx.4.5.2318
-sx-examples==1.mlnx.4.5.2318
-sx-examples-dev==1.mlnx.4.5.2318
-sx-gen-utils==1.mlnx.4.5.2318
-sx-gen-utils-dev==1.mlnx.4.5.2318
-sx-scew==1.mlnx.4.5.2318
-sx-scew-dev==1.mlnx.4.5.2318
-sxd-libs==1.mlnx.4.5.2318
-sxd-libs-dev==1.mlnx.4.5.2318
+sx-acl-helper==1.mlnx.4.5.2320
+sx-acl-helper-dev==1.mlnx.4.5.2320
+sx-complib==1.mlnx.4.5.2320
+sx-complib-dev==1.mlnx.4.5.2320
+sx-examples==1.mlnx.4.5.2320
+sx-examples-dev==1.mlnx.4.5.2320
+sx-gen-utils==1.mlnx.4.5.2320
+sx-gen-utils-dev==1.mlnx.4.5.2320
+sx-scew==1.mlnx.4.5.2320
+sx-scew-dev==1.mlnx.4.5.2320
+sxd-libs==1.mlnx.4.5.2320
+sxd-libs-dev==1.mlnx.4.5.2320
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-wjh-libs==1.mlnx.4.5.2318
-wjh-libs-dev==1.mlnx.4.5.2318
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.2320
+wjh-libs-dev==1.mlnx.4.5.2320
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index c93675e51015..1f331339b2a0 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.5.2318
\ No newline at end of file
+python-sdk-api==4.5.2320
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 73eea649d6a2..7a17510aeb5e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.5.2318
\ No newline at end of file
+python_sdk_api==4.5.2320
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b9783271f47a..262b4ecd8209 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b9783271f47a..262b4ecd8209 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a089281a82f9481e246dcc1292145d0e8635f51c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 9db16421eed4..d0703d02a49b 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -311,7 +311,7 @@ squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-sx-kernel==1.mlnx.4.5.2318
+sx-kernel==1.mlnx.4.5.2320
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index afa7e2a9326e..2ceee4ead1cf 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,11 +2,11 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.6.15
+certifi==2022.6.15.1
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==37.0.4
+cryptography==38.0.1
 docker==4.3.1
 idna==3.3
 ijson==2.6.1
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
new file mode 100644
index 000000000000..7e5f6237fd0b
--- /dev/null
+++ b/files/build/versions/host-image/versions-py3-all-arm64
@@ -0,0 +1 @@
+certifi==2022.6.15
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 431dc5a43838..9675eeb0dc50 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1 +1,2 @@
+certifi==2022.6.15
 cryptography==3.3.1
\ No newline at end of file

From 81e139f48307fece4cfc6c0f35a4a63cce2c7a57 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:43:09 -0700
Subject: [PATCH 1369/1674] VxLAN Tunnel Counters and Rates implementation 
 (#8369) (#11986)

* Enable flex counters for Vxlan tunnel
* VxLAN Tunnel Counters and Rates implementation  (#8369) (#11986)
---
 dockers/docker-orchagent/enable_counters.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
index a00bd3facce7..0c966593f5b2 100755
--- a/dockers/docker-orchagent/enable_counters.py
+++ b/dockers/docker-orchagent/enable_counters.py
@@ -26,6 +26,8 @@ def enable_rates():
     counters_db.set('COUNTERS_DB', 'RATES:PORT', 'PORT_ALPHA', DEFAULT_ALPHA)
     counters_db.set('COUNTERS_DB', 'RATES:RIF', 'RIF_SMOOTH_INTERVAL', DEFAULT_SMOOTH_INTERVAL)
     counters_db.set('COUNTERS_DB', 'RATES:RIF', 'RIF_ALPHA', DEFAULT_ALPHA)
+    counters_db.set('COUNTERS_DB', 'RATES:TUNNEL', 'TUNNEL_SMOOTH_INTERVAL', DEFAULT_SMOOTH_INTERVAL)
+    counters_db.set('COUNTERS_DB', 'RATES:TUNNEL', 'TUNNEL_ALPHA', DEFAULT_ALPHA)
 
 
 def enable_counters():

From 37ada92ad58b09581943c8465ce5a4ec541d6a8b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 11 Sep 2022 18:59:58 +0800
Subject: [PATCH 1370/1674] [ci/build]: Upgrade SONiC package versions (#12043)

---
 files/build/versions/default/versions-git     |  2 +-
 .../docker-base-buster/versions-deb-buster    |  8 +-
 .../versions-deb-buster-arm64                 |  4 +-
 .../versions-deb-buster-armhf                 |  4 +-
 .../versions-deb-buster                       |  4 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-sonic-vs/versions-deb-buster       | 12 +--
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  6 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  6 +-
 .../versions-deb-buster                       |  6 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  6 +-
 .../sonic-slave-buster/versions-deb-buster    | 92 +++++++++----------
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../host-base-image/versions-deb-buster       | 16 ++--
 .../versions/host-image/versions-deb-buster   | 23 ++---
 .../host-image/versions-deb-buster-arm64      | 28 +-----
 .../host-image/versions-deb-buster-armhf      | 28 +-----
 .../host-image/versions-py3-all-arm64         |  1 -
 .../host-image/versions-py3-all-armhf         |  1 -
 23 files changed, 104 insertions(+), 155 deletions(-)
 delete mode 100644 files/build/versions/host-image/versions-py3-all-arm64

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index beefaabdb03c..686c4ce896aa 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index b73b037c50c9..c6c2a79c8b20 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -11,14 +11,14 @@ libexpat1==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgssapi-krb5-2==1.17-3+deb10u3
+libgssapi-krb5-2==1.17-3+deb10u4
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
-libk5crypto3==1.17-3+deb10u3
+libk5crypto3==1.17-3+deb10u4
 libkeyutils1==1.6-6
-libkrb5-3==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
+libkrb5-3==1.17-3+deb10u4
+libkrb5support0==1.17-3+deb10u4
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 1f699501031d..e41cb53abe80 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -5,7 +5,7 @@ libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u2
+libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 967b10df80c8..04588e0ccb8b 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -5,7 +5,7 @@ libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u2
+libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index fe10cb5261a2..d2ea89bc3b57 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -38,8 +38,8 @@ libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
-libfreetype6==2.9.1-3+deb10u2
-libfribidi0==1.0.5-3.1+deb10u1
+libfreetype6==2.9.1-3+deb10u3
+libfribidi0==1.0.5-3.1+deb10u2
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 7d32d2f08aad..e8290b7742dd 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,7 +12,7 @@ importlib-metadata==4.12.0
 importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.15.0
+jsonschema==4.16.0
 jsonschema-spec==0.1.1
 lazy-object-proxy==1.7.1
 openapi-schema-validator==0.3.3
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 4d8a15f57215..1fef1edfbbfb 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -28,8 +28,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-grub-common==2.02+dfsg1-20+deb10u4
-grub2-common==2.02+dfsg1-20+deb10u4
+grub-common==2.06-3~deb10u1
+grub2-common==2.06-3~deb10u1
 ifupdown==0.8.35
 iptables==1.8.2-4
 libasan5==8.3.0-6
@@ -51,7 +51,7 @@ libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libexpat1-dev==2.2.6-2+deb10u4
-libfreetype6==2.9.1-3+deb10u2
+libfreetype6==2.9.1-3+deb10u3
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u3
@@ -88,9 +88,9 @@ libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-dev==3.7.3-1
 libpython3.7-dev==3.7.3-2+deb10u3
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 005f34eaba73..a33bfa1e168e 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2022.6.15
+certifi==2022.6.15.1
 charset-normalizer==2.1.1
 click==7.0
 idna==3.3
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index f9af0d7d4e73..83dcc958c5a2 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -39,9 +39,9 @@ libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
 libssl-dev==1.1.1n-0+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index ada44fa26eb0..662bcb8745f8 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -40,9 +40,9 @@ libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
 libssl-dev==1.1.1n-0+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 099d8c888783..cb40c38d3f70 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -42,9 +42,9 @@ libpython2.7==2.7.16-2+deb10u1
 libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
 libssl-dev==1.1.1n-0+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index b7a3d88403b3..d7e2c268d7be 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -30,9 +30,9 @@ libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
 libpcre2-16-0==10.32-5
 libpcre2-8-0==10.32-5
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
 libssl-dev==1.1.1n-0+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index c7f34c908429..20d822b69226 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -66,7 +66,7 @@ dconf-service==0.30.1-2
 dctrl-tools==2.24-3
 debhelper==12.1.1
 debian-keyring==2019.02.25
-debootstrap==1.0.114
+debootstrap==1.0.114+deb10u1
 default-jdk-headless==2:1.11-71
 default-jre==2:1.11-71
 default-jre-headless==2:1.11-71
@@ -83,7 +83,7 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u4
+distro-info-data==0.41+deb10u5
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
@@ -199,8 +199,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u3
-krb5-multidev==1.17-3+deb10u3
+krb5-locales==1.17-3+deb10u4
+krb5-multidev==1.17-3+deb10u4
 lcov==1.13-4
 less==487-0.1+b1
 lib32asan5==8.3.0-6
@@ -503,10 +503,10 @@ libfontconfig1==2.13.1-2
 libfontconfig1-dev==2.13.1-2
 libfontenc1==1:1.1.3-1+b2
 libfop-java==1:2.3-2
-libfreetype6==2.9.1-3+deb10u2
-libfreetype6-dev==2.9.1-3+deb10u2
-libfribidi-dev==1.0.5-3.1+deb10u1
-libfribidi0==1.0.5-3.1+deb10u1
+libfreetype6==2.9.1-3+deb10u3
+libfreetype6-dev==2.9.1-3+deb10u3
+libfribidi-dev==1.0.5-3.1+deb10u2
+libfribidi0==1.0.5-3.1+deb10u2
 libfstrm0==0.4.0-1
 libfuture-perl==0.39-1
 libgail-common==2.24.32-3
@@ -566,8 +566,8 @@ libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u6
 libgs9-common==9.27~dfsg-2+deb10u6
 libgsm1==1.0.18-2
-libgssapi-krb5-2==1.17-3+deb10u3
-libgssrpc4==1.17-3+deb10u3
+libgssapi-krb5-2==1.17-3+deb10u4
+libgssrpc4==1.17-3+deb10u4
 libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
@@ -689,16 +689,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u3
-libkadm5clnt-mit11==1.17-3+deb10u3
-libkadm5srv-mit11==1.17-3+deb10u3
-libkdb5-9==1.17-3+deb10u3
+libk5crypto3==1.17-3+deb10u4
+libkadm5clnt-mit11==1.17-3+deb10u4
+libkadm5srv-mit11==1.17-3+deb10u4
+libkdb5-9==1.17-3+deb10u4
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u3
-libkrb5-dev==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
+libkrb5-3==1.17-3+deb10u4
+libkrb5-dev==1.17-3+deb10u4
+libkrb5support0==1.17-3+deb10u4
 libksba8==1.3.5-2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -793,7 +793,7 @@ libnet-http-perl==6.18-1
 libnet-ip-perl==1.26-2
 libnet-libidn-perl==0.12.ds-3+b1
 libnet-smtp-ssl-perl==1.04-1
-libnet-ssleay-perl==1.85-2+b1
+libnet-ssleay-perl==1.85-2+deb10u1
 libnetfilter-conntrack-dev==1.0.7-1
 libnetfilter-conntrack3==1.0.7-1
 libnetpbm10==2:10.0-15.3+b2
@@ -966,20 +966,20 @@ libqt4-svg==4:4.8.7+dfsg-18+deb10u1
 libqt4-test==4:4.8.7+dfsg-18+deb10u1
 libqt4-xml==4:4.8.7+dfsg-18+deb10u1
 libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
-libqt5concurrent5==5.11.3+dfsg1-1+deb10u4
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5gui5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5==5.11.3+dfsg1-1+deb10u4
-libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u4
-libqt5printsupport5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5==5.11.3+dfsg1-1+deb10u4
-libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u4
+libqt5concurrent5==5.11.3+dfsg1-1+deb10u5
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5gui5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
+libqt5opengl5==5.11.3+dfsg1-1+deb10u5
+libqt5opengl5-dev==5.11.3+dfsg1-1+deb10u5
+libqt5printsupport5==5.11.3+dfsg1-1+deb10u5
+libqt5sql5==5.11.3+dfsg1-1+deb10u5
+libqt5sql5-sqlite==5.11.3+dfsg1-1+deb10u5
 libqt5svg5==5.11.3-2
-libqt5test5==5.11.3+dfsg1-1+deb10u4
-libqt5widgets5==5.11.3+dfsg1-1+deb10u4
-libqt5xml5==5.11.3+dfsg1-1+deb10u4
+libqt5test5==5.11.3+dfsg1-1+deb10u5
+libqt5widgets5==5.11.3+dfsg1-1+deb10u5
+libqt5xml5==5.11.3+dfsg1-1+deb10u5
 libqtcore4==4:4.8.7+dfsg-18+deb10u1
 libqtdbus4==4:4.8.7+dfsg-18+deb10u1
 libqtgui4==4:4.8.7+dfsg-18+deb10u1
@@ -999,8 +999,8 @@ librhash0==1.3.8-1
 librole-tiny-perl==2.000006-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
-librsvg2-2==2.44.10-2.1
-librsvg2-common==2.44.10-2.1
+librsvg2-2==2.44.10-2.1+deb10u3
+librsvg2-common==2.44.10-2.1+deb10u3
 librtmp1==2.4+20151223.gitfa8646d.1-2
 librubberband2==1.8.1-7
 libruby2.5==2.5.5-3+deb10u4
@@ -1290,7 +1290,7 @@ libxrender-dev==1:0.9.10-1
 libxrender1==1:0.9.10-1
 libxshmfence-dev==1.3-1
 libxshmfence1==1.3-1
-libxslt1.1==1.1.32-2.2~deb10u1
+libxslt1.1==1.1.32-2.2~deb10u2
 libxss1==1:1.2.3-1
 libxt-dev==1:1.1.5-1+b3
 libxt6==1:1.1.5-1+b3
@@ -1429,12 +1429,12 @@ poppler-data==0.4.9-2
 pps-tools==1.0.2-1
 preview-latex-style==11.91-2
 pristine-tar==1.46
-procmail==3.22-26
+procmail==3.22-26+deb10u1
 procps==2:3.3.15-2
 protobuf-compiler==3.6.1.3-2
 psmisc==23.2-1+deb10u1
 psutils==1.17.dfsg-4
-publicsuffix==20211109.1735-0+deb10u1
+publicsuffix==20220811.1734-0+deb10u1
 pylint==1.9.4-1
 python==2.7.16-1
 python-alabaster==0.7.8-1
@@ -1521,9 +1521,9 @@ python-soupsieve==1.8+dfsg-1
 python-sphinx==1.8.4-1
 python-stdeb==0.8.5-1
 python-tk==2.7.16-2
-python-twisted==18.9.0-3
-python-twisted-bin==18.9.0-3
-python-twisted-core==18.9.0-3
+python-twisted==18.9.0-3+deb10u1
+python-twisted-bin==18.9.0-3+deb10u1
+python-twisted-core==18.9.0-3+deb10u1
 python-typing==3.6.6-1
 python-tz==2019.1-1
 python-urllib3==1.24.1-1
@@ -1618,12 +1618,12 @@ qemu-utils==1:3.1+dfsg-8+deb10u9
 qt-at-spi==0.4.0-9
 qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
 qt4-qmake==4:4.8.7+dfsg-18+deb10u1
-qt5-default==5.11.3+dfsg1-1+deb10u4
-qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u4
-qt5-qmake==5.11.3+dfsg1-1+deb10u4
-qt5-qmake-bin==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev==5.11.3+dfsg1-1+deb10u4
-qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u4
+qt5-default==5.11.3+dfsg1-1+deb10u5
+qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u5
+qt5-qmake==5.11.3+dfsg1-1+deb10u5
+qt5-qmake-bin==5.11.3+dfsg1-1+deb10u5
+qtbase5-dev==5.11.3+dfsg1-1+deb10u5
+qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u5
 qtchooser==66-2
 qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
 qttranslations5-l10n==5.11.3-2
@@ -1724,7 +1724,7 @@ xfonts-utils==1:7.7+6
 xkb-data==2.26-2
 xml-core==0.18+nmu1
 xorg-sgml-doctools==1:1.11-1
-xsltproc==1.1.32-2.2~deb10u1
+xsltproc==1.1.32-2.2~deb10u2
 xterm==344-1+deb10u2
 xtrans-dev==1.3.5-1
 xxd==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index ae8f49c2dc58..28d7f9a6edb3 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -3,5 +3,5 @@ libdrm-etnaviv1==2.4.97-1
 libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
-libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u2
 nodejs==14.20.0-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index a994f5f0fe27..ea310c2fd01f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -97,7 +97,7 @@ libsombok3==2.4.0-2
 libspecio-perl==0.43-1
 libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
-libxslt1-dev==1.1.32-2.2~deb10u1
+libxslt1-dev==1.1.32-2.2~deb10u2
 libyaml-tiny-perl==1.73-1
 linux-compiler-gcc-8-arm==4.19.249-2
 llvm-6.0==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 262b4ecd8209..5a794f76868e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 262b4ecd8209..5a794f76868e 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==443f9851a46a45b5caac81a64704cb48f52e961b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-base-image/versions-deb-buster b/files/build/versions/host-base-image/versions-deb-buster
index d95e8a34c208..44598d7dbfb3 100644
--- a/files/build/versions/host-base-image/versions-deb-buster
+++ b/files/build/versions/host-base-image/versions-deb-buster
@@ -1,6 +1,6 @@
 adduser==3.118
 apt==1.8.2.3
-base-files==10.3+deb10u12
+base-files==10.3+deb10u13
 base-passwd==3.5.46
 bash==5.0-4
 bsdutils==1:2.33.1-0.1
@@ -10,14 +10,14 @@ debconf==1.5.71+deb10u1
 debian-archive-keyring==2019.1+deb10u1
 debianutils==4.8.6.1
 diffutils==1:3.7-3
-dpkg==1.19.7
+dpkg==1.19.8
 e2fsprogs==1.44.5-1+deb10u3
 fdisk==2.33.1-0.1
 findutils==4.6.0+git+20190209-2
 gcc-8-base==8.3.0-6
-gpgv==2.2.12-1+deb10u1
+gpgv==2.2.12-1+deb10u2
 grep==3.3-1
-gzip==1.9-3
+gzip==1.9-3+deb10u1
 hostname==3.21
 init-system-helpers==1.56+nmu1
 libacl1==2.2.53-4
@@ -39,12 +39,12 @@ libffi6==3.2.1-9
 libgcc1==1:8.3.0-6
 libgcrypt20==1.8.4-5+deb10u1
 libgmp10==2:6.1.2+dfsg-4+deb10u1
-libgnutls30==3.6.7-4+deb10u7
+libgnutls30==3.6.7-4+deb10u8
 libgpg-error0==1.35-1
 libhogweed4==3.4.1-1+deb10u1
 libidn2-0==2.0.5-1+deb10u1
 liblz4-1==1.8.3-1+deb10u1
-liblzma5==5.2.4-1
+liblzma5==5.2.4-1+deb10u1
 libmount1==2.33.1-0.1
 libncursesw6==6.1+20181013-2+deb10u2
 libnettle6==3.4.1-1+deb10u1
@@ -79,6 +79,6 @@ perl-base==5.28.1-6+deb10u1
 sed==4.7-1
 sysvinit-utils==2.93-8
 tar==1.30+dfsg-6
-tzdata==2021a-0+deb10u3
+tzdata==2021a-0+deb10u6
 util-linux==2.33.1-0.1
-zlib1g==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index d0703d02a49b..be7292013fdd 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -24,12 +24,11 @@ dbus==1.12.20-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u4
+distro-info-data==0.41+deb10u5
 dmidecode==3.2-1
 dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
 docker-ce-cli==5:18.09.8~3-0~debian-buster
-dpkg==1.19.8
 dpkg-dev==1.19.8
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
@@ -57,10 +56,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-gpgv==2.2.12-1+deb10u2
-grub-common==2.02+dfsg1-20+deb10u4
-grub2-common==2.02+dfsg1-20+deb10u4
-gzip==1.9-3+deb10u1
+grub-common==2.06-3~deb10u1
+grub2-common==2.06-3~deb10u1
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
@@ -120,7 +117,7 @@ libexpat1-dev==2.2.6-2+deb10u4
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
-libfreetype6==2.9.1-3+deb10u2
+libfreetype6==2.9.1-3+deb10u3
 libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
@@ -131,7 +128,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libgnutls30==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
-libgssapi-krb5-2==1.17-3+deb10u3
+libgssapi-krb5-2==1.17-3+deb10u4
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
 libi2c0==4.1-1
@@ -144,18 +141,17 @@ libisl19==0.20-2
 libitm1==8.3.0-6
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
-libk5crypto3==1.17-3+deb10u3
+libk5crypto3==1.17-3+deb10u4
 libkeyutils1==1.6-6
 libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
-libkrb5-3==1.17-3+deb10u3
-libkrb5support0==1.17-3+deb10u3
+libkrb5-3==1.17-3+deb10u4
+libkrb5support0==1.17-3+deb10u4
 libksba8==1.3.5-2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
 liblsan0==8.3.0-6
-liblzma5==5.2.4-1+deb10u1
 liblzo2-2==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
@@ -330,5 +326,4 @@ vim==2:8.1.0875-5+deb10u2
 vim-common==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
 xxd==2:8.1.0875-5+deb10u2
-xz-utils==5.2.4-1+deb10u1
-zlib1g==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+xz-utils==5.2.4-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index a559cd4126a6..86853a6d9ac9 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,38 +1,16 @@
 binutils-aarch64-linux-gnu==2.31.1-16
 curl==7.64.0-4+deb10u2
-dirmngr==2.2.12-1+deb10u1
-dpkg-dev==1.19.7
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gnupg2==2.2.12-1+deb10u1
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
-libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.235-1
-openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
-rsyslog==8.1901.0-1+deb10u1
 tsingma-bsp==1.0
-tzdata==2021a-0+deb10u6
-xz-utils==5.2.4-1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 8516bf3e77b9..b119c920e8c4 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,38 +1,16 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
 curl==7.64.0-4+deb10u2
-dirmngr==2.2.12-1+deb10u1
-dpkg-dev==1.19.7
-gnupg==2.2.12-1+deb10u1
-gnupg-l10n==2.2.12-1+deb10u1
-gnupg-utils==2.2.12-1+deb10u1
-gnupg2==2.2.12-1+deb10u1
-gpg==2.2.12-1+deb10u1
-gpg-agent==2.2.12-1+deb10u1
-gpg-wks-client==2.2.12-1+deb10u1
-gpg-wks-server==2.2.12-1+deb10u1
-gpgconf==2.2.12-1+deb10u1
-gpgsm==2.2.12-1+deb10u1
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
-libdpkg-perl==1.19.7
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libldap-2.4-2==2.4.47+dfsg-3+deb10u6
-libldap-common==2.4.47+dfsg-3+deb10u6
-libssl-dev==1.1.1n-0+deb10u1
-libssl1.1==1.1.1n-0+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u3
-libxml2-dev==2.9.4+dfsg1-7+deb10u3
+libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.235-1
 mrvlprestera==1.0
-openssl==1.1.1n-0+deb10u1
 pkg-config==0.29-6
-rsyslog==8.1901.0-1+deb10u1
-tzdata==2021a-0+deb10u6
-xz-utils==5.2.4-1
-zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64
deleted file mode 100644
index 7e5f6237fd0b..000000000000
--- a/files/build/versions/host-image/versions-py3-all-arm64
+++ /dev/null
@@ -1 +0,0 @@
-certifi==2022.6.15
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3-all-armhf b/files/build/versions/host-image/versions-py3-all-armhf
index 9675eeb0dc50..431dc5a43838 100644
--- a/files/build/versions/host-image/versions-py3-all-armhf
+++ b/files/build/versions/host-image/versions-py3-all-armhf
@@ -1,2 +1 @@
-certifi==2022.6.15
 cryptography==3.3.1
\ No newline at end of file

From 2f7ca1d7b62cb02d0361a70f115f0b9ecf4946ab Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 12 Sep 2022 18:12:05 -0700
Subject: [PATCH 1371/1674] Add dhcprelay submodule (#12030)

---
 .gitmodules                            |   4 +
 rules/dhcp6relay.dep                   |   9 -
 rules/dhcp6relay.mk                    |  12 -
 rules/dhcprelay.dep                    |  11 +
 rules/dhcprelay.mk                     |  12 +
 rules/docker-dhcp-relay.mk             |   4 +-
 src/dhcp6relay/.gitignore              |   5 -
 src/dhcp6relay/Makefile                |  42 --
 src/dhcp6relay/debian/changelog        |   5 -
 src/dhcp6relay/debian/compat           |   1 -
 src/dhcp6relay/debian/control          |  17 -
 src/dhcp6relay/debian/rules            |   6 -
 src/dhcp6relay/src/configInterface.cpp | 152 -----
 src/dhcp6relay/src/configInterface.h   |  75 ---
 src/dhcp6relay/src/main.cpp            |  18 -
 src/dhcp6relay/src/relay.cpp           | 861 -------------------------
 src/dhcp6relay/src/relay.h             | 358 ----------
 src/dhcp6relay/src/subdir.mk           |  23 -
 src/dhcprelay                          |   1 +
 19 files changed, 30 insertions(+), 1586 deletions(-)
 delete mode 100644 rules/dhcp6relay.dep
 delete mode 100644 rules/dhcp6relay.mk
 create mode 100644 rules/dhcprelay.dep
 create mode 100644 rules/dhcprelay.mk
 delete mode 100644 src/dhcp6relay/.gitignore
 delete mode 100644 src/dhcp6relay/Makefile
 delete mode 100644 src/dhcp6relay/debian/changelog
 delete mode 100644 src/dhcp6relay/debian/compat
 delete mode 100644 src/dhcp6relay/debian/control
 delete mode 100755 src/dhcp6relay/debian/rules
 delete mode 100644 src/dhcp6relay/src/configInterface.cpp
 delete mode 100644 src/dhcp6relay/src/configInterface.h
 delete mode 100644 src/dhcp6relay/src/main.cpp
 delete mode 100644 src/dhcp6relay/src/relay.cpp
 delete mode 100644 src/dhcp6relay/src/relay.h
 delete mode 100644 src/dhcp6relay/src/subdir.mk
 create mode 160000 src/dhcprelay

diff --git a/.gitmodules b/.gitmodules
index 2d6500476739..65ecc37dd7b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -90,3 +90,7 @@
 	path = src/linkmgrd
 	url = https://github.com/Azure/sonic-linkmgrd.git
 	branch = 202012
+[submodule "src/dhcprelay"]
+	path = src/dhcprelay
+	url = https://github.com/sonic-net/sonic-dhcp-relay.git
+	branch = 202012
diff --git a/rules/dhcp6relay.dep b/rules/dhcp6relay.dep
deleted file mode 100644
index be82d326fe21..000000000000
--- a/rules/dhcp6relay.dep
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SPATH       := $($(SONIC_DHCP6RELAY)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcp6relay.mk rules/dhcp6relay.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(SONIC_DHCP6RELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(SONIC_DHCP6RELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(SONIC_DHCP6RELAY)_DEP_FILES   := $(DEP_FILES)
diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
deleted file mode 100644
index 204bf6fa34dd..000000000000
--- a/rules/dhcp6relay.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# SONiC DHCPV6 RELAY Package
-
-SONIC_DHCP6RELAY_VERSION = 1.0.0-0
-SONIC_DHCP6RELAY_PKG_NAME = dhcp6relay
-
-SONIC_DHCP6RELAY = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_DHCP6RELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(SONIC_DHCP6RELAY)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCP6RELAY_PKG_NAME)
-SONIC_DPKG_DEBS += $(SONIC_DHCP6RELAY)
-
-SONIC_DHCP6RELAY_DBG = sonic-$(SONIC_DHCP6RELAY_PKG_NAME)-dbgsym_$(SONIC_DHCP6RELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SONIC_DHCP6RELAY),$(SONIC_DHCP6RELAY_DBG)))
diff --git a/rules/dhcprelay.dep b/rules/dhcprelay.dep
new file mode 100644
index 000000000000..5f6d77a84fc3
--- /dev/null
+++ b/rules/dhcprelay.dep
@@ -0,0 +1,11 @@
+
+SPATH       := $($(SONIC_DHCPRELAY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_DHCPRELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_DHCPRELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_DHCPRELAY)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/dhcprelay.mk b/rules/dhcprelay.mk
new file mode 100644
index 000000000000..0a32d7d54297
--- /dev/null
+++ b/rules/dhcprelay.mk
@@ -0,0 +1,12 @@
+# SONiC DHCPV6 RELAY Package
+
+SONIC_DHCPRELAY_VERSION = 1.0.0-0
+SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
+
+SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
+SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
+
+SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 2ade8d641a02..3ecfb5195e2b 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -6,10 +6,10 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG) $(SONIC_DHCPMON_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
 
diff --git a/src/dhcp6relay/.gitignore b/src/dhcp6relay/.gitignore
deleted file mode 100644
index 9d09ae6b3f1a..000000000000
--- a/src/dhcp6relay/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/*
-!debian/changelog
-!debian/compat
-!debian/control
-!debian/rules
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
deleted file mode 100644
index dd384452a5fc..000000000000
--- a/src/dhcp6relay/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-RM := rm -rf
-DHCP6RELAY_TARGET := dhcp6relay
-CP := cp
-MKDIR := mkdir
-CC := g++
-MV := mv
-LIBS := -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
-CFLAGS += -Wall -std=c++17 -fPIE -I$(PWD)/../sonic-swss-common/common
-PWD := $(shell pwd)
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS) $(OBJS)
-endif
-endif
-
--include src/subdir.mk
- 
-all: sonic-dhcp6relay
-
-sonic-dhcp6relay: $(OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: G++ Linker'
-	$(CC) $(LDFLAGS) -o $(DHCP6RELAY_TARGET) $(OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-install:
-	$(MKDIR) -p $(DESTDIR)/usr/sbin
-	$(MV) $(DHCP6RELAY_TARGET) $(DESTDIR)/usr/sbin
-
-deinstall:
-	$(RM) $(DESTDIR)/usr/sbin/$(DHCP6RELAY_TARGET)
-	$(RM) -rf $(DESTDIR)/usr/sbin
-
-clean:
-	-$(RM) $(EXECUTABLES) $(C_DEPS) $(OBJS) $(DHCP6RELAY_TARGET)
-	-@echo ' '
-
-.PHONY: all clean dependents
-
-
diff --git a/src/dhcp6relay/debian/changelog b/src/dhcp6relay/debian/changelog
deleted file mode 100644
index 67ed277049e5..000000000000
--- a/src/dhcp6relay/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-sonic-dhcp6relay (1.0.0-0) UNRELEASED; urgency=medium
-
-  * Initial release.
-
--- Kelly Yeh <kellyyeh@microsoft.com>  
diff --git a/src/dhcp6relay/debian/compat b/src/dhcp6relay/debian/compat
deleted file mode 100644
index ec635144f600..000000000000
--- a/src/dhcp6relay/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/src/dhcp6relay/debian/control b/src/dhcp6relay/debian/control
deleted file mode 100644
index 31fdb6f41f3b..000000000000
--- a/src/dhcp6relay/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: sonic-dhcp6relay
-Section: devel
-Priority: optional
-Maintainer: Kelly Yeh <kellyyeh@microsoft.com>
-Build-Depends: debhelper (>= 8.0.0),
-               dh-systemd
-Standards-Version: 3.9.3
-Homepage: https://github.com/Azure/sonic-buildimage
-XS-Go-Import-Path: github.com/Azure/sonic-buildimage
-
-Package: sonic-dhcp6relay
-Architecture: any
-Built-Using: ${misc:Built-Using}
-Depends: libevent-2.1-6,
-        libboost-thread1.71.0,
-        libboost-system1.71.0
-Description: SONiC DHCPv6 Relay
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
deleted file mode 100755
index ac2cd63889ef..000000000000
--- a/src/dhcp6relay/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-%:
-	dh $@ --parallel
diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
deleted file mode 100644
index ca78d80e63da..000000000000
--- a/src/dhcp6relay/src/configInterface.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include <sstream>
-#include <syslog.h>
-#include <algorithm>
-#include "configInterface.h"
-
-constexpr auto DEFAULT_TIMEOUT_MSEC = 1000;
-
-bool pollSwssNotifcation = true;
-std::shared_ptr<boost::thread> mSwssThreadPtr;
-
-std::shared_ptr<swss::DBConnector> configDbPtr = std::make_shared<swss::DBConnector> ("CONFIG_DB", 0);
-swss::SubscriberStateTable ipHelpersTable(configDbPtr.get(), "DHCP_RELAY");
-swss::Select swssSelect;
-
-/**
- * @code                void initialize_swss()
- * 
- * @brief               initialize DB tables and start SWSS listening thread
- *
- * @return              none
- */
-void initialize_swss(std::vector<relay_config> *vlans)
-{
-    try {
-        swssSelect.addSelectable(&ipHelpersTable);
-        get_dhcp(vlans);
-        mSwssThreadPtr = std::make_shared<boost::thread> (&handleSwssNotification, vlans);
-    }
-    catch (const std::bad_alloc &e) {
-        syslog(LOG_ERR, "Failed allocate memory. Exception details: %s", e.what());
-    }
-}
-
-/**
- * @code                void deinitialize_swss()
- * 
- * @brief               deinitialize DB interface and join SWSS listening thread
- *
- * @return              none
- */
-void deinitialize_swss()
-{
-    stopSwssNotificationPoll();
-    mSwssThreadPtr->interrupt();
-}
-
-
-/**
- * @code                void get_dhcp(std::vector<relay_config> *vlans)
- * 
- * @brief               initialize and get vlan table information from DHCP_RELAY
- *
- * @return              none
- */
-void get_dhcp(std::vector<relay_config> *vlans) {
-    swss::Selectable *selectable;
-    int ret = swssSelect.select(&selectable, DEFAULT_TIMEOUT_MSEC);
-    if (ret == swss::Select::ERROR) {
-        syslog(LOG_WARNING, "Select: returned ERROR");
-    } else if (ret == swss::Select::TIMEOUT) {
-    } 
-    if (selectable == static_cast<swss::Selectable *> (&ipHelpersTable)) {
-        handleRelayNotification(ipHelpersTable, vlans);
-    }
-}
-/**
- * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
- * 
- * @brief               main thread for handling SWSS notification
- *
- * @param context       list of vlans/argument config that contains strings of server and option
- *
- * @return              none
- */
-void handleSwssNotification(std::vector<relay_config> *vlans)
-{
-    while (pollSwssNotifcation) {
-        get_dhcp(vlans);
-    } 
-}
-
-/**
- * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
- * 
- * @brief                   handles DHCPv6 relay configuration change notification
- *
- * @param ipHelpersTable    DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
-{
-    std::deque<swss::KeyOpFieldsValuesTuple> entries;
-
-    ipHelpersTable.pops(entries);
-    processRelayNotification(entries, vlans);
-}
-
-/**
- * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
- * 
- * @brief                   process DHCPv6 relay servers and options configuration change notification
- *
- * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
-{
-    std::vector<std::string> servers;
-
-    for (auto &entry: entries) {
-        std::string vlan = kfvKey(entry);
-        std::string operation = kfvOp(entry);
-        std::vector<swss::FieldValueTuple> fieldValues = kfvFieldsValues(entry);
-
-        relay_config intf;
-        intf.is_option_79 = true;
-        intf.interface = vlan;
-        intf.db = nullptr;
-        for (auto &fieldValue: fieldValues) {
-            std::string f = fvField(fieldValue);
-            std::string v = fvValue(fieldValue);
-            if(f == "dhcpv6_servers") {
-                std::stringstream ss(v);
-                while (ss.good()) {
-                    std::string substr;
-                    getline(ss, substr, ',');
-                    intf.servers.push_back(substr);
-                }
-                syslog(LOG_DEBUG, "key: %s, Operation: %s, f: %s, v: %s", vlan.c_str(), operation.c_str(), f.c_str(), v.c_str());
-            }
-            if(f == "dhcpv6_option|rfc6939_support" && v == "false") {
-                intf.is_option_79 = false;
-            }
-        }
-        vlans->push_back(intf);
-    }
-}
-
-/**
-*@code      stopSwssNotificationPoll
-*
-*@brief     stop SWSS listening thread
-*
-*@return    none
-*/
-void stopSwssNotificationPoll() {
-    pollSwssNotifcation = false;
-};
diff --git a/src/dhcp6relay/src/configInterface.h b/src/dhcp6relay/src/configInterface.h
deleted file mode 100644
index 20b0912c5cef..000000000000
--- a/src/dhcp6relay/src/configInterface.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <boost/thread.hpp>
-#include "subscriberstatetable.h"
-#include "select.h"
-#include "relay.h"
-
-/**
- * @code                void initialize_swss()
- * 
- * @brief               initialize DB tables and start SWSS listening thread
- *
- * @return              none
- */
-void initialize_swss(std::vector<relay_config> *vlans);
-
-/**
- * @code                void deinitialize_swss()
- * 
- * @brief               deinitialize DB interface and join SWSS listening thread
- *
- * @return              none
- */
-void deinitialize_swss();
-
-/**
- * @code                void get_dhcp(std::vector<relay_config> *vlans)
- * 
- * @brief               initialize and get vlan information from DHCP_RELAY
- *
- * @return              none
- */
-void get_dhcp(std::vector<relay_config> *vlans);
-
-/**
- * @code                void handleSwssNotification(std::vector<relay_config> *vlans)
- * 
- * @brief               main thread for handling SWSS notification
- *
- * @param vlans         list of vlans/argument config that contains strings of server and option
- *
- * @return              none
- */
-void handleSwssNotification(std::vector<relay_config> *vlans);
-
-/**
- * @code                    void handleRelayNotification(swss::SubscriberStateTable &ipHelpersTable, std::vector<relay_config> *vlans)
- * 
- * @brief                   handles DHCPv6 relay configuration change notification
- *
- * @param ipHelpersTable    DHCP table
- * @param vlans             list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void handleRelayNotification(swss::SubscriberStateTable &configMuxTable, std::vector<relay_config> *vlans);
-
-/**
- * @code                    void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans)
- * 
- * @brief                   process DHCPv6 relay servers and options configuration change notification
- *
- * @param entries           queue of std::tuple<std::string, std::string, std::vector<FieldValueTuple>> entries in DHCP table
- * @param context           list of vlans/argument config that contains strings of server and option
- *
- * @return                  none
- */
-void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries, std::vector<relay_config> *vlans);
-
-/**
-*@code      stopSwssNotificationPoll
-*
-*@brief     stop SWSS listening thread
-*
-*@return    none
-*/
-void stopSwssNotificationPoll();
diff --git a/src/dhcp6relay/src/main.cpp b/src/dhcp6relay/src/main.cpp
deleted file mode 100644
index 9f5bc74bcfa0..000000000000
--- a/src/dhcp6relay/src/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdlib.h>
-#include <syslog.h>
-#include "configInterface.h"
-
-int main(int argc, char *argv[]) {
-    try {
-        std::vector<relay_config> vlans;
-        swss::DBConnector state_db("STATE_DB", 0);
-        initialize_swss(&vlans);
-        loop_relay(&vlans, &state_db);
-    }
-    catch (std::exception &e)
-    {
-        syslog(LOG_ERR, "An exception occurred.\n");
-        return 1;
-    }
-    return 0;
-}
diff --git a/src/dhcp6relay/src/relay.cpp b/src/dhcp6relay/src/relay.cpp
deleted file mode 100644
index 08cec458c74d..000000000000
--- a/src/dhcp6relay/src/relay.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-#include <errno.h>
-#include <unistd.h>
-#include <event.h>
-#include <sstream>
-#include <event2/event.h>
-#include <event2/bufferevent.h>
-#include <syslog.h>
-#include <signal.h>
-
-#include "configdb.h"
-#include "sonicv2connector.h"
-#include "dbconnector.h" 
-#include "configInterface.h"
-
-
-struct event *listen_event;
-struct event *server_listen_event;
-struct event_base *base;
-struct event *ev_sigint;
-struct event *ev_sigterm;
-static std::string counter_table = "DHCPv6_COUNTER_TABLE|";
-
-/* DHCPv6 filter */
-/* sudo tcpdump -dd "ip6 dst ff02::1:2 && udp dst port 547" */
-
-static struct sock_filter ether_relay_filter[] = {
-	
-	{ 0x28, 0, 0, 0x0000000c },
-	{ 0x15, 0, 13, 0x000086dd },
-	{ 0x20, 0, 0, 0x00000026 },
-	{ 0x15, 0, 11, 0xff020000 },
-	{ 0x20, 0, 0, 0x0000002a },
-	{ 0x15, 0, 9, 0x00000000 },
-	{ 0x20, 0, 0, 0x0000002e },
-	{ 0x15, 0, 7, 0x00000000 },
-	{ 0x20, 0, 0, 0x00000032 },
-	{ 0x15, 0, 5, 0x00010002 },
-	{ 0x30, 0, 0, 0x00000014 },
-	{ 0x15, 0, 3, 0x00000011 },
-	{ 0x28, 0, 0, 0x00000038 },
-	{ 0x15, 0, 1, 0x00000223 },
-	{ 0x6, 0, 0, 0x00040000 },
-	{ 0x6, 0, 0, 0x00000000 },
-};
-const struct sock_fprog ether_relay_fprog = {
-	lengthof(ether_relay_filter),
-	ether_relay_filter
-};
-
-/* DHCPv6 Counter */
-uint64_t counters[DHCPv6_MESSAGE_TYPE_COUNT];
-std::map<int, std::string> counterMap = {{DHCPv6_MESSAGE_TYPE_UNKNOWN, "Unknown"},
-                                      {DHCPv6_MESSAGE_TYPE_SOLICIT, "Solicit"},
-                                      {DHCPv6_MESSAGE_TYPE_ADVERTISE, "Advertise"},
-                                      {DHCPv6_MESSAGE_TYPE_REQUEST, "Request"},
-                                      {DHCPv6_MESSAGE_TYPE_CONFIRM, "Confirm"},
-                                      {DHCPv6_MESSAGE_TYPE_RENEW, "Renew"},
-                                      {DHCPv6_MESSAGE_TYPE_REBIND, "Rebind"},
-                                      {DHCPv6_MESSAGE_TYPE_REPLY, "Reply"},
-                                      {DHCPv6_MESSAGE_TYPE_RELEASE, "Release"},
-                                      {DHCPv6_MESSAGE_TYPE_DECLINE, "Decline"},
-                                      {DHCPv6_MESSAGE_TYPE_RECONFIGURE, "Reconfigure"},
-                                      {DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST, "Information-Request"},
-                                      {DHCPv6_MESSAGE_TYPE_RELAY_FORW, "Relay-Forward"},
-                                      {DHCPv6_MESSAGE_TYPE_RELAY_REPL, "Relay-Reply"},
-                                      {DHCPv6_MESSAGE_TYPE_MALFORMED, "Malformed"}};
-
-/**
- * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
- *
- * @brief               initialize the counter by each Vlan
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * 
- * @return              none
- */
-void initialize_counter(swss::DBConnector *db, std::string counterVlan) {
-    db->hset(counterVlan, "Unknown", toString(counters[DHCPv6_MESSAGE_TYPE_UNKNOWN]));
-    db->hset(counterVlan, "Solicit", toString(counters[DHCPv6_MESSAGE_TYPE_SOLICIT]));
-    db->hset(counterVlan, "Advertise", toString(counters[DHCPv6_MESSAGE_TYPE_ADVERTISE]));
-    db->hset(counterVlan, "Request", toString(counters[DHCPv6_MESSAGE_TYPE_REQUEST]));
-    db->hset(counterVlan, "Confirm", toString(counters[DHCPv6_MESSAGE_TYPE_CONFIRM]));
-    db->hset(counterVlan, "Renew", toString(counters[DHCPv6_MESSAGE_TYPE_RENEW]));
-    db->hset(counterVlan, "Rebind", toString(counters[DHCPv6_MESSAGE_TYPE_REBIND]));
-    db->hset(counterVlan, "Reply", toString(counters[DHCPv6_MESSAGE_TYPE_REPLY]));
-    db->hset(counterVlan, "Release", toString(counters[DHCPv6_MESSAGE_TYPE_RELEASE]));
-    db->hset(counterVlan, "Decline", toString(counters[DHCPv6_MESSAGE_TYPE_DECLINE]));
-    db->hset(counterVlan, "Reconfigure", toString(counters[DHCPv6_MESSAGE_TYPE_RECONFIGURE]));
-    db->hset(counterVlan, "Information-Request", toString(counters[DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST]));
-    db->hset(counterVlan, "Relay-Forward", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_FORW]));
-    db->hset(counterVlan, "Relay-Reply", toString(counters[DHCPv6_MESSAGE_TYPE_RELAY_REPL]));
-    db->hset(counterVlan, "Malformed", toString(counters[DHCPv6_MESSAGE_TYPE_MALFORMED]));
-}
-
-/**
- * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
- *
- * @brief               update the counter in state_db with count of each DHCPv6 message type
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * @param msg_type      dhcpv6 message type to be updated in counter
- * 
- * @return              none
- */
-void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type) {
-    db->hset(counterVlan, counterMap.find(msg_type)->second, toString(counters[msg_type]));
-}
-
-/**
- * @code                std::string toString(uint16_t count);
- *
- * @brief               convert uint16_t to string
- *
- * @param count         count of messages in counter
- * 
- * @return              count in string
- */
-std::string toString(uint16_t count) {
-    std::stringstream ss;
-    ss << count;
-    std::string countValue = ss.str();
-    return countValue;
-}
-
-/**
- * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ethernet frame
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ether_header end of ethernet header position
- */
-const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct ether_header);
-    return (const struct ether_header *)buffer;
-}
-
-/**
- * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ipv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ip6_hdr      end of ipv6 header position
- */
-const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct ip6_hdr);
-    return (struct ip6_hdr *)buffer;
-}
-
-/**
- * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through udp header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return udphdr      end of udp header position
- */
-const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end) {
-    (*out_end) = buffer + sizeof(struct udphdr);
-    return (const struct udphdr *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_msg   end of dhcpv6 header position
- */
-const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer) {
-    return (const struct dhcpv6_msg *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 relay message
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
- */
-const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer) {
-    return (const struct dhcpv6_relay_msg *)buffer;
-}
-
-/**
- * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through dhcpv6 option
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end) {
-    auto option = (const struct dhcpv6_option *)buffer;
-    uint8_t size = 4; // option-code + option-len
-    size += *(uint16_t *)(buffer);
-    (*out_end) =  buffer + size + ntohs(option->option_length);
-
-    return option;
-}
-
-/**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
- *
- * @brief                           send udp packet
- *
- * @param *buffer                   message buffer
- * @param sockaddr_in6 target       target socket
- * @param n                         length of message
- * @param relay_config *config      pointer to relay_config
- * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type) {
-    std::string counterVlan = counter_table;
-    if(sendto(sock, buffer, n, 0, (const struct sockaddr *)&target, sizeof(target)) == -1)
-        syslog(LOG_ERR, "sendto: Failed to send to target address\n");
-    else if (counterMap.find(msg_type) != counterMap.end()) {
-        counters[msg_type]++;
-        update_counter(config->db, counterVlan.append(config->interface), msg_type);
-    } else {
-        syslog(LOG_WARNING, "unexpected message type %d(0x%x)\n", msg_type, msg_type);
-    }
-}
-
-/**
- * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
- *
- * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
- *
- * @param buffer        pointer to buffer
- * @param msg           pointer to parsed DHCPv6 message
- * @param msg_length    length of DHCPv6 message
- *
- * @return              none
- */
-void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length) {
-    struct dhcpv6_option option;
-    option.option_code = htons(OPTION_RELAY_MSG);
-    option.option_length = htons(msg_length);
-    memcpy(buffer, &option, sizeof(struct dhcpv6_option));
-    memcpy(buffer + sizeof(struct dhcpv6_option), msg, msg_length);
-}
-
-/**
- * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
- *
- * @brief               prepare L2 socket to attach to "udp and port 547" filter 
- *
- * @param ifindex       interface index
- * @param fprog         bpf filter "udp and port 547"
- *
- * @return              socket descriptor
- */
-int sock_open(int ifindex, const struct sock_fprog *fprog)
-{
-	if (!ifindex) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	int s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-	if (s == -1) {
-		syslog(LOG_ERR, "socket: Failed to create socket\n");
-		return -1;
-	}
-
-	struct sockaddr_ll sll = {
-	    .sll_family = AF_PACKET,
-	    .sll_protocol = htons(ETH_P_ALL),
-	    .sll_ifindex = ifindex
-	};
-
-	if (bind(s, (struct sockaddr *)&sll, sizeof sll) == -1) {
-		syslog(LOG_ERR, "bind: Failed to bind to specified interface\n");
-		(void) close(s);
-	    return -1;
-	}
-
-	if (fprog && setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, fprog, sizeof *fprog) == -1)
-	{
-		syslog(LOG_ERR, "setsockopt: Failed to attach filter\n");
-		(void) close(s);
-	    return -1;
-	}
-
-	return s;
-}
-
-/**
- * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
- * 
- * @brief                       prepare for specified relay interface config: server and link address
- *
- * @param interface_config      pointer to relay config to be prepared
- * @param local_sock            L3 socket used for relaying messages
- * @param filter                socket attached with filter
- *
- * @return                      none
- */
-void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter) {
-    struct ifaddrs *ifa, *ifa_tmp;
-    sockaddr_in6 non_link_local;
-    sockaddr_in6 link_local;
-    
-    interface_config->local_sock = *local_sock; 
-    interface_config->filter = filter; 
-
-    for(auto server: interface_config->servers) {
-        sockaddr_in6 tmp;
-        if(inet_pton(AF_INET6, server.c_str(), &tmp.sin6_addr) != 1)
-        {
-            syslog(LOG_WARNING, "inet_pton: Failed to convert IPv6 address\n");
-        }
-        tmp.sin6_family = AF_INET6;
-        tmp.sin6_flowinfo = 0;
-        tmp.sin6_port = htons(RELAY_PORT);
-        tmp.sin6_scope_id = 0; 
-        interface_config->servers_sock.push_back(tmp);
-    }
-
-    if (getifaddrs(&ifa) == -1) {
-        syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces\n");
-        exit(1);
-    }
-
-    ifa_tmp = ifa;
-    while (ifa_tmp) {
-        if (ifa_tmp->ifa_addr && ifa_tmp->ifa_addr->sa_family == AF_INET6) {
-            struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
-                non_link_local = *in6;
-                break;
-            }
-            if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {    
-                link_local = *in6;
-            }   
-        }
-    ifa_tmp = ifa_tmp->ifa_next;
-    }
-    freeifaddrs(ifa); 
-    
-    if(!IN6_IS_ADDR_LINKLOCAL(&non_link_local.sin6_addr)) {
-        interface_config->link_address = non_link_local;
-    }
-    else {
-        interface_config->link_address = link_local;
-    }
-}
-
-/**
- * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
- * 
- * @brief               prepare L3 socket for sending
- *
- * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
- * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
- * @param index         scope id of interface
- *
- * @return              none
- */
-void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index) {
-    struct ifaddrs *ifa, *ifa_tmp;
-    sockaddr_in6 addr;
-    sockaddr_in6 ll_addr;
-    memset(&addr, 0, sizeof(addr));
-    memset(&ll_addr, 0, sizeof(ll_addr));
-
-    if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
-    }
-
-    if ((*server_sock= socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
-        syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
-    }
-
-    int retry = 0;
-    bool bind_addr = false;
-    bool bind_ll_addr = false;
-    do {
-        if (getifaddrs(&ifa) == -1) {
-            syslog(LOG_WARNING, "getifaddrs: Unable to get network interfaces with %s\n", strerror(errno));
-        }
-        else {
-            ifa_tmp = ifa;
-            while (ifa_tmp) {
-                if (ifa_tmp->ifa_addr && (ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
-                    struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
-                    if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {  
-                        bind_addr = true;
-                        in6->sin6_family = AF_INET6;
-                        in6->sin6_port = htons(RELAY_PORT);
-                        addr = *in6;
-                    }
-                    if(IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
-                        bind_ll_addr = true;
-                        in6->sin6_family = AF_INET6;
-                        in6->sin6_port = htons(RELAY_PORT);
-                        ll_addr = *in6;
-                    }
-                }
-                ifa_tmp = ifa_tmp->ifa_next;
-            }
-            freeifaddrs(ifa);
-        }
-
-        if (bind_addr && bind_ll_addr) {
-            break;
-        }
-
-        syslog(LOG_WARNING, "Retry #%d to bind to sockets on interface %s\n", ++retry, config->interface.c_str());
-        sleep(5);
-    } while (retry < 6);
-
-    if ((!bind_addr) || (bind(*local_sock, (sockaddr *)&addr, sizeof(addr)) == -1)) {
-        syslog(LOG_ERR, "bind: Failed to bind socket to global ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
-    }
-
-    if ((!bind_ll_addr) || (bind(*server_sock, (sockaddr *)&ll_addr, sizeof(addr)) == -1)) {
-        syslog(LOG_ERR, "bind: Failed to bind socket to link local ipv6 address on interface %s after %d retries with %s\n", config->interface.c_str(), retry, strerror(errno));
-    }
-}
-
-
-/**
- * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
- * 
- * @brief                construct relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param ether_hdr      pointer to Ethernet header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config) {    
-    static uint8_t buffer[4096];
-    auto current_buffer_position = buffer;
-    dhcpv6_relay_msg new_message;
-    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
-    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
-    new_message.hop_count = 0;
-
-    memcpy(&new_message.link_address, &config->link_address.sin6_addr, sizeof(in6_addr));
-    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
-    current_buffer_position += sizeof(dhcpv6_relay_msg);
-
-    if(config->is_option_79) {
-        linklayer_addr_option option79;
-        option79.link_layer_type = htons(1);
-        option79.option_code = htons(OPTION_CLIENT_LINKLAYER_ADDR);
-        option79.option_length = htons(2 + 6); // link_layer_type field + address
-        
-        memcpy(current_buffer_position, &option79, sizeof(linklayer_addr_option));
-        current_buffer_position += sizeof(linklayer_addr_option);
-
-        memcpy(current_buffer_position, &ether_hdr->ether_shost, sizeof(ether_hdr->ether_shost));
-        current_buffer_position += sizeof(ether_hdr->ether_shost);
-    }
-
-    auto dhcp_message_length = len;
-    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
-    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
-
-    for(auto server: config->servers_sock) {
-        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
-    }
-}
-
-/**
- * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
- *
- * @brief                construct a relay-forward message encapsulated relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config) {
-    static uint8_t buffer[4096];
-    dhcpv6_relay_msg new_message;
-    auto current_buffer_position = buffer;
-    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
-
-    if (dhcp_relay_header->hop_count >= HOP_LIMIT)
-        return;
-
-    new_message.msg_type = DHCPv6_MESSAGE_TYPE_RELAY_FORW;
-    memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
-    new_message.hop_count = dhcp_relay_header->hop_count + 1;
-
-    memset(&new_message.link_address, 0, sizeof(in6_addr));
-
-    memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
-    current_buffer_position += sizeof(dhcpv6_relay_msg);
-
-    auto dhcp_message_length = len;
-    relay_forward(current_buffer_position, parse_dhcpv6_hdr(msg), dhcp_message_length);
-    current_buffer_position += dhcp_message_length + sizeof(dhcpv6_option);
-
-    for(auto server: config->servers_sock) {
-        send_udp(sock, buffer, server, current_buffer_position - buffer, config, new_message.msg_type);
-    }
-}
-
-/**
- * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
- * 
- * @brief               relay and unwrap a relay-reply message
- *
- * @param sock          L3 socket for sending data to servers
- * @param msg           pointer to dhcpv6 message header position
- * @param len           size of data received
- * @param config        relay interface config
- *
- * @return              none
- */
- void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *config) {
-    static uint8_t buffer[4096];
-    uint8_t type = 0;
-    struct sockaddr_in6 target_addr;
-    auto current_buffer_position = buffer;
-    auto current_position = msg;
-    const uint8_t *tmp = NULL;
-    auto dhcp_relay_header = parse_dhcpv6_relay(msg);
-    current_position += sizeof(struct dhcpv6_relay_msg);
-    
-    auto position = current_position + sizeof(struct dhcpv6_option);
-    auto dhcpv6msg = parse_dhcpv6_hdr(position);
-
-    while ((current_position - msg) < len) {
-        auto option = parse_dhcpv6_opt(current_position, &tmp);
-        current_position = tmp;
-        if (current_position - msg > len || ntohs(option->option_length) > sizeof(buffer) - (current_buffer_position - buffer)) {
-            break;
-        }
-        switch (ntohs(option->option_code)) {
-            case OPTION_RELAY_MSG:
-                memcpy(current_buffer_position, ((uint8_t *)option) + sizeof(struct dhcpv6_option), ntohs(option->option_length));
-                current_buffer_position += ntohs(option->option_length);
-                type = dhcpv6msg->msg_type;
-                break;
-            default:
-                break;
-        }
-    }
-
-    memcpy(&target_addr.sin6_addr, &dhcp_relay_header->peer_address, sizeof(struct in6_addr));
-    target_addr.sin6_family = AF_INET6;
-    target_addr.sin6_flowinfo = 0;
-    target_addr.sin6_port = htons(CLIENT_PORT);
-    target_addr.sin6_scope_id = if_nametoindex(config->interface.c_str());
-
-    send_udp(sock, buffer, target_addr, current_buffer_position - buffer, config, type);
-} 
-
-
-/**
- * @code                callback(evutil_socket_t fd, short event, void *arg);
- * 
- * @brief               callback for libevent that is called everytime data is received at the filter socket
- *
- * @param fd            filter socket
- * @param event         libevent triggered event  
- * @param arg           callback argument provided by user
- *
- * @return              none
- */
-void callback(evutil_socket_t fd, short event, void *arg) {
-    struct relay_config *config = (struct relay_config *)arg;
-    static uint8_t message_buffer[4096];
-    std::string counterVlan = counter_table;
-    int32_t len = recv(config->filter, message_buffer, 4096, 0);
-    if (len <= 0) {
-        syslog(LOG_WARNING, "recv: Failed to receive data at filter socket: %s\n", strerror(errno));
-        return;
-    }
-
-    char* ptr = (char *)message_buffer;
-    const uint8_t *current_position = (uint8_t *)ptr;
-    const uint8_t *tmp = NULL;
-    const uint8_t *prev = NULL;
-
-    auto ether_header = parse_ether_frame(current_position, &tmp);
-    current_position = tmp;
-
-    auto ip_header = parse_ip6_hdr(current_position, &tmp);
-    current_position = tmp;
-
-    prev = current_position;
-    if (ip_header->ip6_ctlun.ip6_un1.ip6_un1_nxt != IPPROTO_UDP) {
-        const struct ip6_ext *ext_header;
-        do {
-            ext_header = (const struct ip6_ext *)current_position;
-            current_position += ext_header->ip6e_len;
-            if((current_position == prev) || (current_position >= (uint8_t *)ptr + sizeof(message_buffer))) {
-                return;
-            }
-            prev = current_position;
-        }
-        while (ext_header->ip6e_nxt != IPPROTO_UDP);
-    }
-
-    auto udp_header = parse_udp(current_position, &tmp);
-    current_position = tmp;
-
-    auto msg = parse_dhcpv6_hdr(current_position);
-    auto option_position = current_position + sizeof(struct dhcpv6_msg);
-
-    switch (msg->msg_type) {
-        case DHCPv6_MESSAGE_TYPE_RELAY_FORW:
-        {
-            relay_relay_forw(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, config);
-            break;
-        }
-        case DHCPv6_MESSAGE_TYPE_SOLICIT:
-        case DHCPv6_MESSAGE_TYPE_REQUEST: 
-	case DHCPv6_MESSAGE_TYPE_CONFIRM:
-        case DHCPv6_MESSAGE_TYPE_RENEW:
-        case DHCPv6_MESSAGE_TYPE_REBIND:
-        case DHCPv6_MESSAGE_TYPE_RELEASE:
-        case DHCPv6_MESSAGE_TYPE_DECLINE:
-        case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
-        {
-            while (option_position - message_buffer < len) {
-                auto option = parse_dhcpv6_opt(option_position, &tmp);
-                option_position = tmp;
-                if (ntohs(option->option_code) > DHCPv6_OPTION_LIMIT) {
-                    counters[DHCPv6_MESSAGE_TYPE_MALFORMED]++;
-                    update_counter(config->db, counterVlan.append(config->interface), DHCPv6_MESSAGE_TYPE_MALFORMED);
-                    syslog(LOG_WARNING, "DHCPv6 option is invalid or contains malformed payload\n");
-                    return;
-                }
-            }
-            counters[msg->msg_type]++;
-            update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
-            relay_client(config->local_sock, current_position, ntohs(udp_header->len) - sizeof(udphdr), ip_header, ether_header, config);
-            break;
-        }
-        default:
-        {
-            syslog(LOG_WARNING, "DHCPv6 client message received was not relayed\n");
-            break;
-        }
-    }
-}
-
-/**
- * @code                void server_callback(evutil_socket_t fd, short event, void *arg);
- * 
- * @brief               callback for libevent that is called everytime data is received at the server socket
- *
- * @param fd            filter socket
- * @param event         libevent triggered event  
- * @param arg           callback argument provided by user
- *
- * @return              none
- */
-void server_callback(evutil_socket_t fd, short event, void *arg) {
-    struct relay_config *config = (struct relay_config *)arg;
-    sockaddr_in6 from;
-    socklen_t len = sizeof(from);
-    int32_t data = 0;
-    static uint8_t message_buffer[4096];
-
-    if ((data = recvfrom(config->local_sock, message_buffer, 4096, 0, (sockaddr *)&from, &len)) == -1) {
-        syslog(LOG_WARNING, "recv: Failed to receive data from server\n");
-    }
-
-    auto msg = parse_dhcpv6_hdr(message_buffer);
-    counters[msg->msg_type]++;
-    std::string counterVlan = counter_table;
-    update_counter(config->db, counterVlan.append(config->interface), msg->msg_type);
-    if (msg->msg_type == DHCPv6_MESSAGE_TYPE_RELAY_REPL) {
-        relay_relay_reply(config->server_sock, message_buffer, data, config);
-    }
-}
-
-/**
- * @code signal_init();
- *
- * @brief initialize DHCPv6 Relay libevent signals
- */
-int signal_init() {
-    int rv = -1;
-     do {
-        ev_sigint = evsignal_new(base, SIGINT, signal_callback, base);
-        if (ev_sigint == NULL) {
-            syslog(LOG_ERR, "Could not create SIGINT libevent signal\n");
-            break;
-        }
-
-        ev_sigterm = evsignal_new(base, SIGTERM, signal_callback, base);
-        if (ev_sigterm == NULL) {
-            syslog(LOG_ERR, "Could not create SIGTERM libevent signal\n");
-            break;
-        }
-        rv = 0;
-    } while(0);
-    return rv;
-}
-
-/**
- * @code signal_start();
- *
- * @brief start DHCPv6 Relay libevent base and add signals
- */
-int signal_start()
-{
-    int rv = -1;
-    do
-    {
-        if (evsignal_add(ev_sigint, NULL) != 0) {
-            syslog(LOG_ERR, "Could not add SIGINT libevent signal\n");
-            break;
-        }
-
-        if (evsignal_add(ev_sigterm, NULL) != 0) {
-            syslog(LOG_ERR, "Could not add SIGTERM libevent signal\n");
-            break;
-        }
-
-        if (event_base_dispatch(base) != 0) {
-            syslog(LOG_ERR, "Could not start libevent dispatching loop\n");
-        }
-
-        rv = 0;
-    } while (0);
-
-    return rv;
-}
-
-/**
- * @code signal_callback(fd, event, arg);
- *
- * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
- *
- * @param fd        libevent socket
- * @param event     event triggered
- * @param arg       pointer to libevent base
- *
- * @return none
- */
-void signal_callback(evutil_socket_t fd, short event, void *arg)
-{
-    syslog(LOG_ALERT, "Received signal: '%s'\n", strsignal(fd));
-    if ((fd == SIGTERM) || (fd == SIGINT)) {
-        dhcp6relay_stop();
-    }
-}
-
-/**
- * @code dhcp6relay_stop();
- *
- * @brief stop DHCPv6 Relay libevent loop upon signal
- */
-void dhcp6relay_stop()
-{
-    event_base_loopexit(base, NULL);
-}
-
-/**
- * @code                loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
- * 
- * @brief               main loop: configure sockets, create libevent base, start server listener thread
- *  
- * @param vlans         list of vlans retrieved from config_db
- * @param db            state_db connector
- */
-void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db) {
-    std::vector<int> sockets;
-    base = event_base_new();
-    if(base == NULL) {
-        syslog(LOG_ERR, "libevent: Failed to create base\n");
-    }
-
-    for(relay_config &vlan : *vlans) {
-        relay_config *config = &vlan;
-        int filter = 0;
-        int local_sock = 0; 
-        int server_sock = 0;
-        int index = if_nametoindex(config->interface.c_str());
-        config->db = db;
-
-        std::string counterVlan = counter_table;
-        initialize_counter(config->db, counterVlan.append(config->interface));
-
-        filter = sock_open(index, &ether_relay_fprog);
-        prepare_socket(&local_sock, &server_sock, config, index);
-
-        config->local_sock = local_sock;
-        config->server_sock = server_sock;
-
-        sockets.push_back(filter);
-        sockets.push_back(local_sock);
-        sockets.push_back(server_sock);
-
-        prepare_relay_config(config, &local_sock, filter);
-
-        evutil_make_listen_socket_reuseable(filter);
-        evutil_make_socket_nonblocking(filter);
-
-        evutil_make_listen_socket_reuseable(local_sock);
-        evutil_make_socket_nonblocking(local_sock);
-
-        listen_event = event_new(base, filter, EV_READ|EV_PERSIST, callback, config);
-        server_listen_event = event_new(base, local_sock, EV_READ|EV_PERSIST, server_callback, config);
-        if (listen_event == NULL || server_listen_event == NULL) {
-            syslog(LOG_ERR, "libevent: Failed to create libevent\n");
-        }
-
-        event_add(listen_event, NULL);
-        event_add(server_listen_event, NULL);
-    }
-    
-    if((signal_init() == 0) && signal_start() == 0) {
-        shutdown();
-        for(std::size_t i = 0; i<sockets.size(); i++) {
-            close(sockets.at(i));
-        }
-    }
-}
-
-/**
- * @code shutdown();
- *
- * @brief free signals and terminate threads
- */
-void shutdown() {
-    event_del(ev_sigint);
-    event_del(ev_sigterm);
-    event_free(ev_sigint); 
-    event_free(ev_sigterm);
-    event_base_free(base);
-    deinitialize_swss();
-}
diff --git a/src/dhcp6relay/src/relay.h b/src/dhcp6relay/src/relay.h
deleted file mode 100644
index c5b07325421c..000000000000
--- a/src/dhcp6relay/src/relay.h
+++ /dev/null
@@ -1,358 +0,0 @@
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/if_packet.h>
-#include <netinet/if_ether.h>	
-#include <netinet/ip6.h>
-#include <netinet/udp.h>
-#include <ifaddrs.h>
-#include <linux/filter.h>
-#include <string>
-#include <vector>
-#include <event2/util.h>
-
-
-#define PACKED __attribute__ ((packed))
-
-#define RELAY_PORT 547
-#define CLIENT_PORT 546
-#define HOP_LIMIT 8     //HOP_LIMIT reduced from 32 to 8 as stated in RFC8415
-#define DHCPv6_OPTION_LIMIT 56      // DHCPv6 option code greater than 56 are currently unassigned
-
-#define lengthof(A) (sizeof (A) / sizeof (A)[0])
-
-#define OPTION_RELAY_MSG 9
-#define OPTION_CLIENT_LINKLAYER_ADDR 79
-
-/* DHCPv6 message types */
-typedef enum
-{
-    DHCPv6_MESSAGE_TYPE_UNKNOWN = 0,
-    DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
-    DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
-    DHCPv6_MESSAGE_TYPE_REQUEST = 3,
-    DHCPv6_MESSAGE_TYPE_CONFIRM  = 4,
-    DHCPv6_MESSAGE_TYPE_RENEW  = 5,
-    DHCPv6_MESSAGE_TYPE_REBIND = 6,
-    DHCPv6_MESSAGE_TYPE_REPLY = 7,
-    DHCPv6_MESSAGE_TYPE_RELEASE = 8,
-    DHCPv6_MESSAGE_TYPE_DECLINE = 9,
-    DHCPv6_MESSAGE_TYPE_RECONFIGURE = 10,
-    DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
-    DHCPv6_MESSAGE_TYPE_RELAY_FORW = 12,
-    DHCPv6_MESSAGE_TYPE_RELAY_REPL = 13,
-    DHCPv6_MESSAGE_TYPE_MALFORMED = 14,
-
-    DHCPv6_MESSAGE_TYPE_COUNT
-} dhcp_message_type_t;
-
-struct relay_config {
-    int local_sock; 
-    int server_sock;
-    int filter;
-    sockaddr_in6 link_address;
-    swss::DBConnector *db;
-    std::string interface;
-    std::vector<std::string> servers;
-    std::vector<sockaddr_in6> servers_sock;
-    bool is_option_79;
-};
-
-
-/* DHCPv6 messages and options */
-
-struct dhcpv6_msg {
-    uint8_t msg_type;
-    uint8_t xid[3];
-};
-
-struct PACKED dhcpv6_relay_msg {
-    uint8_t msg_type;
-    uint8_t hop_count;
-    struct in6_addr link_address;
-    struct in6_addr peer_address;
-};
-
-
-struct dhcpv6_option {
-    uint16_t option_code;
-    uint16_t option_length;
-};
-
-struct linklayer_addr_option  {
-    uint16_t option_code;
-    uint16_t option_length;
-    uint16_t link_layer_type;
-};
-
-/**
- * @code                sock_open(int ifindex, const struct sock_fprog *fprog);
- *
- * @brief               prepare L2 socket to attach to "udp and port 547" filter 
- *
- * @param ifindex       interface index
- * @param fprog         bpf filter "udp and port 547"
- *
- * @return              socket descriptor
- */
-int sock_open(int ifindex, const struct sock_fprog *fprog);
-
-/**
- * @code                prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
- * 
- * @brief               prepare L3 socket for sending
- *
- * @param local_sock    pointer to socket binded to global address for relaying client message to server and listening for server message
- * @param server_sock       pointer to socket binded to link_local address for relaying server message to client
- * @param index         scope id of interface
- *
- * @return              none
- */
-void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index);
-
-/**
- * @code                        prepare_relay_config(relay_config *interface_config, int local_sock, int filter);
- * 
- * @brief                       prepare for specified relay interface config: server and link address
- *
- * @param interface_config      pointer to relay config to be prepared
- * @param local_sock            L3 socket used for relaying messages
- * @param filter                socket attached with filter
- *
- * @return                      none
- */
-void prepare_relay_config(relay_config *interface_config, int *local_sock, int filter);
-
-/**
- * @code                relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
- *
- * @brief               embed the DHCPv6 message received into DHCPv6 relay forward message
- *
- * @param buffer        pointer to buffer
- * @param msg           pointer to parsed DHCPv6 message
- * @param msg_length    length of DHCPv6 message
- *
- * @return              none
- */
-void relay_forward(uint8_t *buffer, const struct dhcpv6_msg *msg, uint16_t msg_length);
-
-/**
- * @code                 relay_client(int sock, const uint8_t *msg, int32_t len, ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
- * 
- * @brief                construct relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param ether_hdr      pointer to Ethernet header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_client(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, const ether_header *ether_hdr, relay_config *config);
-
-/**
- * @code                 relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config)
- *
- * @brief                construct a relay-forward message encapsulated relay-forward message
- *
- * @param sock           L3 socket for sending data to servers
- * @param msg            pointer to dhcpv6 message header position
- * @param len            size of data received
- * @param ip_hdr         pointer to IPv6 header
- * @param config         pointer to the relay interface config
- *
- * @return none
- */
-void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *ip_hdr, relay_config *config);
-
-/**
- * @code                relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
- * 
- * @brief               relay and unwrap a relay-reply message
- *
- * @param sock          L3 socket for sending data to servers
- * @param msg           pointer to dhcpv6 message header position
- * @param len           size of data received
- * @param config        relay interface config
- *
- * @return              none
- */
-void relay_relay_reply(int sock, const uint8_t *msg, int32_t len, relay_config *configs);
-
-/**
- * @code                loop_relay(std::vector<arg_config> *vlans, swss::DBConnector *db);
- * 
- * @brief               main loop: configure sockets, create libevent base, start server listener thread
- *  
- * @param vlans         list of vlans retrieved from config_db
- * @param db            state_db connector
- */
-void loop_relay(std::vector<relay_config> *vlans, swss::DBConnector *db);
-
-/**
- * @code signal_init();
- *
- * @brief initialize DHCPv6 Relay libevent signals
- */
-int signal_init();
-
-/**
- * @code signal_start();
- *
- * @brief start DHCPv6 Relay libevent base and add signals
- */
-int signal_start();
-
-/**
- * @code dhcp6relay_stop();
- *
- * @brief stop DHCPv6 Relay libevent loop upon signal
- */
-void dhcp6relay_stop();
-
-/**
- * @code signal_callback(fd, event, arg);
- *
- * @brief signal handler for dhcp6relay. Initiate shutdown when signal is caught
- *
- * @param fd        libevent socket
- * @param event     event triggered
- * @param arg       pointer to libevent base
- *
- * @return none
- */
-void signal_callback(evutil_socket_t fd, short event, void *arg);
-
-/**
- * @code shutdown();
- *
- * @brief free signals and terminate threads
- */
-void shutdown();
-
-/**
- * @code                void initialize_counter(swss::DBConnector *db, std::string counterVlan);
- *
- * @brief               initialize the counter by each Vlan
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * 
- * @return              none
- */
-void initialize_counter(swss::DBConnector *db, std::string counterVlan);
-
-/**
- * @code                void update_counter(swss::DBConnector *db, std::string CounterVlan, uint8_t msg_type);
- *
- * @brief               update the counter in state_db with count of each DHCPv6 message type
- *
- * @param swss::DBConnector *db     state_db connector
- * @param counterVlan   counter table with interface name
- * @param msg_type      dhcpv6 message type to be updated in counter
- * 
- * @return              none
- */
-void update_counter(swss::DBConnector *db, std::string counterVlan, uint8_t msg_type);
-
-/* Helper functions */
-
-/**
- * @code                std::string toString(uint16_t count);
- *
- * @brief               convert uint16_t to string
- *
- * @param count         count of messages in counter
- * 
- * @return              count in string
- */
-std::string toString(uint16_t count);
-
-/**
- * @code                const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ethernet frame
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ether_header end of ethernet header position
- */
-const struct ether_header *parse_ether_frame(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through ipv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return ip6_hdr      end of ipv6 header position
- */
-const struct ip6_hdr *parse_ip6_hdr(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through udp header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return udphdr      end of udp header position
- */
-const struct udphdr *parse_udp(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 header
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_msg   end of dhcpv6 header position
- */
-const struct dhcpv6_msg *parse_dhcpv6_hdr(const uint8_t *buffer);
-
-/**
- * @code                const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
- *
- * @brief               parse through dhcpv6 relay message
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_relay_msg   start of dhcpv6 relay message or end of dhcpv6 message type position
- */
-const struct dhcpv6_relay_msg *parse_dhcpv6_relay(const uint8_t *buffer);
-
-/**
- * @code                const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
- *
- * @brief               parse through dhcpv6 option
- *
- * @param *buffer       message buffer
- * @param **out_end     pointer
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-const struct dhcpv6_option *parse_dhcpv6_opt(const uint8_t *buffer, const uint8_t **out_end);
-
-/**
- * @code                            void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
- *
- * @brief                           send udp packet
- *
- * @param *buffer                   message buffer
- * @param sockaddr_in6 target       target socket
- * @param n                         length of message
- * @param relay_config *config      pointer to relay_config
- * @param uint8_t msg_type          message type of dhcpv6 option of relayed message
- * 
- * @return dhcpv6_option   end of dhcpv6 message option
- */
-void send_udp(int sock, uint8_t *buffer, struct sockaddr_in6 target, uint32_t n, relay_config *config, uint8_t msg_type);
-
diff --git a/src/dhcp6relay/src/subdir.mk b/src/dhcp6relay/src/subdir.mk
deleted file mode 100644
index 1c93d490ec63..000000000000
--- a/src/dhcp6relay/src/subdir.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-CC := g++
-
-C_SRCS += \
-../src/relay.c \
-../src/configInterface.c \
-../src/main.c 
-
-OBJS += \
-./src/relay.o \
-./src/configInterface.o \
-./src/main.o 
-
-C_DEPS += \
-./src/relay.d \
-./src/configInterface.d \
-./src/main.d 
-
-src/%.o: src/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	$(CC) -D__FILENAME__="$(subst src/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
diff --git a/src/dhcprelay b/src/dhcprelay
new file mode 160000
index 000000000000..40ad1676e4d0
--- /dev/null
+++ b/src/dhcprelay
@@ -0,0 +1 @@
+Subproject commit 40ad1676e4d07c3eec2153017997bb04b33a94c8

From e98f56c84230669ccad166614b22b5d5f60536a8 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:42:58 -0700
Subject: [PATCH 1372/1674] [202012][submodule] Update sonic-utilities
 submodule (#12061)

Update sonic-utilities submodule pointer to include the following:
* [202012][VxLAN]VxLAN Tunnel Counters and Rates implementation ([#2353](https://github.com/Azure/sonic-utilities/pull/2353))
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 839625df982d..26043909f405 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 839625df982d164815a8c5fe77cbb6251c8a1442
+Subproject commit 26043909f405d7137763479a06d9fe24763fc3b6

From df9b676360f2a657b50a1412731201673c246344 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:53:30 -0700
Subject: [PATCH 1373/1674] [202012][submodule] Update sonic-swss submodule
 (#12060)

Update sonic-swss submodule pointer to include the following:
* VxLAN Tunnel Counters and Rates implementation (#1859) ([#2442]
* Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046" ([#2374]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index eedf59dd935d..499b7a7b37cb 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit eedf59dd935d1e4f2176fe1178aa167e262cd001
+Subproject commit 499b7a7b37cbfbf0f20878b334a1cbea83b76aa7

From a195f8343f4e6bb95970d6d2bbac0fa811e46a1a Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 14 Sep 2022 23:05:43 +0800
Subject: [PATCH 1374/1674] [ci/build]: Upgrade SONiC package versions (#12068)

---
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  2 +-
 .../versions-deb-buster-arm64                        |  3 ++-
 .../versions-deb-buster-armhf                        |  3 ++-
 .../dockers/docker-config-engine-buster/versions-py3 |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3 |  8 ++++----
 .../versions/dockers/docker-sonic-vs/versions-py3    |  4 ++--
 .../dockers/docker-syncd-brcm/versions-deb-buster    |  3 ++-
 .../dockers/sonic-slave-buster/versions-deb-buster   |  3 ++-
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../versions/dockers/sonic-slave-buster/versions-py3 |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  3 ++-
 files/build/versions/host-image/versions-py3         |  6 +++---
 14 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 06eb9bdc2c4d..7793b4dd0353 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:faa416b9eeda2cbdb796544422eedd698e716dbd99841138521a94db51bf6123
+amd64:amd64/debian:buster==sha256:12da36082ea17cd91307adaf2e91bb631a3fbbf2c92f7ca9545caa91036c1043
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
+amd64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:46f5b3c07b5e5aa83547cf697dcfe097052ff88018481fe615206c5651d75ba0
-arm64:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
+arm64:arm64v8/debian:buster==sha256:cb4597c2e5b3f7d54be4927f4f27d8d84d7b1cd5ef6743d4ecd752727a7e0a07
+arm64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:49b349ff803f83f12723092ee7a1052f06156c20fa788f24b795988a614279d6
-armhf:debian:buster==sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38
+armhf:arm32v7/debian:buster==sha256:94d59fccce5b8617ff43a12549c046133e0310497d742d3ad9add1755297ba69
+armhf:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 686c4ce896aa..b6765f7e2bc7 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index e41cb53abe80..7094e3bc75d7 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -8,4 +8,5 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u2
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 04588e0ccb8b..c948d1fad1ab 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -8,4 +8,5 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u2
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index 80a4396adaf4..bf7c5b08e1e0 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.8.17
+regex==2022.9.13
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index e8290b7742dd..689fff137344 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -7,19 +7,19 @@ connexion==2.7.0
 flask==2.2.2
 grpcio==1.48.1
 grpcio-tools==1.20.0
-idna==3.3
+idna==3.4
 importlib-metadata==4.12.0
 importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.16.0
-jsonschema-spec==0.1.1
+jsonschema-spec==0.1.2
 lazy-object-proxy==1.7.1
-openapi-schema-validator==0.3.3
+openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.5
+protobuf==4.21.6
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index a33bfa1e168e..2b249f49e307 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,7 +1,7 @@
-certifi==2022.6.15.1
+certifi==2022.6.15.2
 charset-normalizer==2.1.1
 click==7.0
-idna==3.3
+idna==3.4
 ijson==2.6.1
 jsondiff==2.0.0
 m2crypto==0.38.0
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 27515b58c333..bd0382758630 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -33,4 +33,5 @@ syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u2
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 20d822b69226..2d38a80ff936 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1730,4 +1730,5 @@ xtrans-dev==1.3.5-1
 xxd==2:8.1.0875-5+deb10u2
 xz-utils==5.2.4-1+deb10u1
 zip==3.0-11+b1
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g==1:1.2.11.dfsg-1+deb10u2
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 5a794f76868e..47d4f0c37f4b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 691707dc8da8..b9140ea457be 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.8.17
+regex==2022.9.13
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 5a794f76868e..47d4f0c37f4b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2d25dbd149b460cc1fa96acbcb1797a12b3c0771
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index be7292013fdd..c2a9a5d70e16 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -326,4 +326,5 @@ vim==2:8.1.0875-5+deb10u2
 vim-common==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
 xxd==2:8.1.0875-5+deb10u2
-xz-utils==5.2.4-1+deb10u1
\ No newline at end of file
+xz-utils==5.2.4-1+deb10u1
+zlib1g==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 2ceee4ead1cf..0f2d95bd38b0 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,13 +2,13 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.6.15.1
+certifi==2022.6.15.2
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
 cryptography==38.0.1
 docker==4.3.1
-idna==3.3
+idna==3.4
 ijson==2.6.1
 ipaddress==1.0.23
 j2cli==0.3.10
@@ -32,7 +32,7 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.8.17
+regex==2022.9.13
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0

From 237b40bc314f6d4a006cfcad9404d91fd646f7d6 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 14 Sep 2022 19:23:49 -0700
Subject: [PATCH 1375/1674] [202012][submodule] Update sonic-sairedis submodule
 (#12072)

Update sonic-sairedis submodule pointer to include the following:
* 1d3720e Added Flex Counters support for tunnel counters (#886) ([#1120](https://github.com/Azure/sonic-sairedis/pull/1120))
* 6469456 [lgtm] Add uuid library (#1119) ([#1126](https://github.com/Azure/sonic-sairedis/pull/1126))
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 21f3d7c3d67f..1d3720eb5aa4 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 21f3d7c3d67ffe072ddfb335d08bb08f50b879ac
+Subproject commit 1d3720eb5aa4b13d8eff2ae6e833dc5fd48d3ba7

From 00810f8dd9a7e767f4ff72a2395ef4b6d87f25ce Mon Sep 17 00:00:00 2001
From: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com>
Date: Fri, 16 Sep 2022 13:16:00 +0800
Subject: [PATCH 1376/1674] Upgrade k8s package version (#12057)

Signed-off-by: Yun Li <yunli1@microsoft.com>
---
 rules/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/config b/rules/config
index 70ff038e6e63..cc67914a807e 100644
--- a/rules/config
+++ b/rules/config
@@ -157,9 +157,9 @@ KUBE_DOCKER_PROXY = http://172.16.1.1:3128/
 # These are Used *only* when INCLUDE_KUBERNETES=y
 # NOTE: As a worker node it has to run version compatible to kubernetes master.
 #
-KUBERNETES_VERSION = 1.21.1
+KUBERNETES_VERSION = 1.22.2
 KUBERNETES_CNI_VERSION = 0.8.7
-K8s_GCR_IO_PAUSE_VERSION = 3.4.1
+K8s_GCR_IO_PAUSE_VERSION = 3.5
 
 # SONIC_ENABLE_IMAGE_SIGNATURE - enable image signature
 # To not use the auto-generated self-signed certificate, the required files to sign the image as below:

From ee7d9d1c4508fca5ee76a6c2541b8c9583355df0 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 9 Sep 2022 00:18:26 +0800
Subject: [PATCH 1377/1674] Map TC6 to Queue 1 for regular traffic (#11904)

Why I did it
This PR is to update TC_TO_QUEUE_MAP|AZURE for SKU Arista-7050CX3-32S-D48C8 and Arista-7260CX3 T0.

The change is only to align the TC_TO_QUEUE_MAP for regular traffic and bounced traffic. It has no impact on business because we have no traffic being mapped to TC2 or TC6.

How I did it
Update TC_TO_QUEUE_MAP|AZURE , and test cases as well.

How to verify it
Verified by running test case test_j2files.py

/sonic/src/sonic-config-engine$ python3 setup.py test -s tests/test_j2files.py
running test
......
----------------------------------------------------------------------
Ran 29 tests in 25.390s

OK
---
 .../Arista-7050CX3-32S-D48C8/qos.json.j2                        | 2 +-
 device/common/profiles/th2/7260/BALANCED/qos.json.j2            | 2 +-
 device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2        | 2 +-
 .../tests/sample_output/py3/qos-arista7050cx3-dualtor.json      | 2 +-
 .../tests/sample_output/py3/qos-arista7260-dualtor.json         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
index 6719911b29e5..040da33dd79f 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -170,7 +170,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
index 68daa8ee92f0..750d0fb0ea77 100644
--- a/device/common/profiles/th2/7260/BALANCED/qos.json.j2
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -322,7 +322,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
index faf682d3c176..771b8305f8f0 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -321,7 +321,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
index 4e524e2bf7d1..05c15034ca70 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -43,7 +43,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index b7ddd361965c..6edfa8b0e9c4 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -43,7 +43,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },

From 0abf8d0419096c6e3fce36d3dc352c631fe03ac3 Mon Sep 17 00:00:00 2001
From: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com>
Date: Fri, 16 Sep 2022 13:13:39 +0800
Subject: [PATCH 1378/1674] Make client indentity by AME cert (#11946)

* Make client indentity by AME cert

* Join k8s cluster by ipv6

* Change join test cases

* Test case bug fix

* Improve read node label func

* Configure kubelet and change test cases

* For kubernetes version 1.22.2

* Fix undefine issue

Signed-off-by: Yun Li <yunli1@microsoft.com>
---
 .../build_templates/sonic_debian_extension.j2 |  2 +-
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  2 +
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     | 82 +++++++++++++++++--
 src/sonic-ctrmgrd/tests/common_test.py        | 23 +++++-
 src/sonic-ctrmgrd/tests/kube_commands_test.py | 66 ++++++++++-----
 5 files changed, 148 insertions(+), 27 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index c106f7944a36..d234757898d4 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -416,7 +416,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchd
 {% if include_kubernetes == "y" %}
 # Point to kubelet to /etc/resolv.conf
 #
-echo 'KUBELET_EXTRA_ARGS="--resolv-conf=/etc/resolv.conf"' | sudo tee -a  $FILESYSTEM_ROOT/etc/default/kubelet
+echo 'KUBELET_EXTRA_ARGS="--resolv-conf=/etc/resolv.conf --cgroup-driver=cgroupfs --node-ip=::"' | sudo tee -a  $FILESYSTEM_ROOT/etc/default/kubelet
 
 # Copy Flannel conf file into sonic-templates
 #
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index 3941a05a738a..2defb6e45387 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -104,10 +104,12 @@ def log_debug(m):
 
 
 def log_error(m):
+    msg = "{}: {}".format(inspect.stack()[1][3], m)
     syslog.syslog(syslog.LOG_ERR, msg)
 
 
 def log_info(m):
+    msg = "{}: {}".format(inspect.stack()[1][3], m)
     syslog.syslog(syslog.LOG_INFO, msg)
 
 
diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index 9a6ea9ed8dff..3adea36ef12c 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -13,10 +13,14 @@
 import syslog
 import tempfile
 import urllib.request
+import base64
 from urllib.parse import urlparse
 
 import yaml
+import requests
 from sonic_py_common import device_info
+from jinja2 import Template
+from swsscommon import swsscommon
 
 KUBE_ADMIN_CONF = "/etc/sonic/kube_admin.conf"
 KUBELET_YAML = "/var/lib/kubelet/config.yaml"
@@ -24,6 +28,9 @@
 LOCK_FILE = "/var/lock/kube_join.lock"
 FLANNEL_CONF_FILE = "/usr/share/sonic/templates/kube_cni.10-flannel.conflist"
 CNI_DIR = "/etc/cni/net.d"
+K8S_CA_URL = "https://{}:{}/api/v1/namespaces/default/configmaps/kube-root-ca.crt"
+AME_CRT = "/etc/sonic/credentials/restapiserver.crt"
+AME_KEY = "/etc/sonic/credentials/restapiserver.key"
 
 def log_debug(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
@@ -77,8 +84,7 @@ def _run_command(cmd, timeout=5):
 
 def kube_read_labels():
     """ Read current labels on node and return as dict. """
-    KUBECTL_GET_CMD = "kubectl --kubeconfig {} get nodes --show-labels |\
- grep {} | tr -s ' ' | cut -f6 -d' '"
+    KUBECTL_GET_CMD = "kubectl --kubeconfig {} get nodes {} --show-labels |tr -s ' ' | cut -f6 -d' '"
 
     labels = {}
     ret, out, _ = _run_command(KUBECTL_GET_CMD.format(
@@ -211,6 +217,68 @@ def _download_file(server, port, insecure):
     log_debug("{} downloaded".format(KUBE_ADMIN_CONF))
 
 
+def _gen_cli_kubeconf(server, port, insecure):
+    """generate identity which can help authenticate and 
+       authorization to k8s cluster
+    """
+    client_kubeconfig_template = """
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: {{ k8s_ca }}
+    server: https://{{ vip }}:{{ port }}
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: user
+  name: user@kubernetes
+current-context: user@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: user
+  user:
+    client-certificate-data: {{ ame_crt }}
+    client-key-data: {{ ame_key }}
+    """
+    if insecure:
+        r = requests.get(K8S_CA_URL.format(server, port), cert=(AME_CRT, AME_KEY), verify=False)
+    else:
+        r = requests.get(K8S_CA_URL.format(server, port), cert=(AME_CRT, AME_KEY))
+    if not r.ok:
+        raise requests.RequestException("Something wrong with AME cert or something wrong about sonic role in k8s cluster")
+    k8s_ca = r.json()["data"]["ca.crt"]
+    k8s_ca_b64 = base64.b64encode(k8s_ca.encode("utf-8")).decode("utf-8")
+    ame_crt_raw = open(AME_CRT, "rb")
+    ame_crt_b64 = base64.b64encode(ame_crt_raw.read()).decode("utf-8")
+    ame_key_raw = open(AME_KEY, "rb")
+    ame_key_b64 = base64.b64encode(ame_key_raw.read()).decode("utf-8")
+    client_kubeconfig_template_j2 = Template(client_kubeconfig_template)
+    client_kubeconfig = client_kubeconfig_template_j2.render(
+        k8s_ca=k8s_ca_b64, vip=server, port=port, ame_crt=ame_crt_b64, ame_key=ame_key_b64)
+    (h, fname) = tempfile.mkstemp(suffix="_kube_join")
+    os.write(h, client_kubeconfig.encode("utf-8"))
+    os.close(h)
+    log_debug("Downloaded = {}".format(fname))
+
+    shutil.copyfile(fname, KUBE_ADMIN_CONF)
+
+    log_debug("{} downloaded".format(KUBE_ADMIN_CONF))
+
+
+def _get_local_ipv6():
+    try:
+        config_db = swsscommon.DBConnector("CONFIG_DB", 0)
+        mgmt_ip_data = swsscommon.Table(config_db, 'MGMT_INTERFACE')
+        for key in mgmt_ip_data.getKeys():
+            if key.find(":") >= 0:
+                return key.split("|")[1].split("/")[0]
+        raise IOError("IPV6 not find from MGMT_INTERFACE table")
+    except Exception as e:
+        raise IOError(str(e))
+
+
 def _troubleshoot_tips():
     """ log troubleshoot tips which could be handy,
         when in trouble with join
@@ -264,12 +332,14 @@ def _do_reset(pending_join = False):
 
 
 def _do_join(server, port, insecure):
-    KUBEADM_JOIN_CMD = "kubeadm join --discovery-file {} --node-name {}"
+    KUBEADM_JOIN_CMD = "kubeadm join --discovery-file {} --node-name {} --apiserver-advertise-address {}"
     err = ""
     out = ""
     ret = 0
     try:
-        _download_file(server, port, insecure)
+        local_ipv6 = _get_local_ipv6()
+        #_download_file(server, port, insecure)
+        _gen_cli_kubeconf(server, port, insecure)
         _do_reset(True)
         _run_command("modprobe br_netfilter")
         # Copy flannel.conf
@@ -279,11 +349,11 @@ def _do_join(server, port, insecure):
 
         if ret == 0:
             (ret, out, err) = _run_command(KUBEADM_JOIN_CMD.format(
-                KUBE_ADMIN_CONF, get_device_name()), timeout=60)
+                KUBE_ADMIN_CONF, get_device_name(), local_ipv6), timeout=60)
             log_debug("ret = {}".format(ret))
 
     except IOError as e:
-        err = "Download failed: {}".format(str(e))
+        err = "Join failed: {}".format(str(e))
         ret = -1
         out = ""
 
diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py
index 6e9763962bde..9283e3ad258e 100755
--- a/src/sonic-ctrmgrd/tests/common_test.py
+++ b/src/sonic-ctrmgrd/tests/common_test.py
@@ -9,6 +9,7 @@
 CONFIG_DB_NO = 4
 STATE_DB_NO = 6
 FEATURE_TABLE = "FEATURE"
+MGMT_INTERFACE_TABLE = "MGMT_INTERFACE"
 KUBE_LABEL_TABLE = "KUBE_LABELS"
 KUBE_LABEL_SET_KEY = "SET"
 
@@ -41,6 +42,7 @@
 IMAGE_TAG = "image_tag"
 FAIL_LOCK = "fail_lock"
 DO_JOIN = "do_join"
+REQ = "req"
 
 # subproc key words
 
@@ -643,8 +645,27 @@ def mock_subproc_side_effect(cmd, shell=False, stdout=None, stderr=None):
     return mock_proc(cmd, index)
 
 
-def set_kube_mock(mock_subproc):
+class mock_reqget:
+    def __init__(self):
+        self.ok = True
+
+    def json(self):
+        return current_test_data.get(REQ, "")
+
+
+def mock_reqget_side_effect(url, cert, verify=True):
+    return mock_reqget()
+
+
+def set_kube_mock(mock_subproc, mock_table=None, mock_conn=None, mock_reqget=None):
     mock_subproc.side_effect = mock_subproc_side_effect
+    if mock_table != None:
+        mock_table.side_effect = table_side_effect
+    if mock_conn != None:
+        mock_conn.side_effect = conn_side_effect
+    if mock_reqget != None:
+        mock_reqget.side_effect = mock_reqget_side_effect
+
 
 def create_remote_ctr_config_json():
     str_conf = '\
diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py
index 637802ab1d9f..d8e0939efb85 100755
--- a/src/sonic-ctrmgrd/tests/kube_commands_test.py
+++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py
@@ -15,6 +15,8 @@
 KUBE_ADMIN_CONF = "/tmp/kube_admin.conf"
 FLANNEL_CONF_FILE = "/tmp/flannel.conf"
 CNI_DIR = "/tmp/cni/net.d"
+AME_CRT = "/tmp/restapiserver.crt"
+AME_KEY = "/tmp/restapiserver.key"
 
 # kube_commands test cases
 # NOTE: Ensure state-db entry is complete in PRE as we need to
@@ -25,8 +27,7 @@
         common_test.DESCR: "read labels",
         common_test.RETVAL: 0,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: ["foo=bar,hello=world"],
         common_test.POST: {
             "foo": "bar",
@@ -39,8 +40,7 @@
         common_test.TRIGGER_THROW: True,
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.POST: {
         },
         common_test.PROC_KILLED: 1
@@ -49,8 +49,7 @@
         common_test.DESCR: "read labels fail",
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: [""],
         common_test.PROC_ERR: ["command failed"],
         common_test.POST: {
@@ -65,8 +64,7 @@
         common_test.RETVAL: 0,
         common_test.ARGS: { "foo": "bar", "hello": "World!", "test": "ok" },
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
+"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
 "kubectl --kubeconfig {} label --overwrite nodes none hello-".format(
     KUBE_ADMIN_CONF),
 "kubectl --kubeconfig {} label --overwrite nodes none hello=World! test=ok".format(
@@ -79,8 +77,7 @@
         common_test.RETVAL: 0,
         common_test.ARGS: { "foo": "bar", "hello": "world" },
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
  ],
         common_test.PROC_OUT: ["foo=bar,hello=world"]
     },
@@ -90,8 +87,7 @@
         common_test.ARGS: { "any": "thing" },
         common_test.RETVAL: -1,
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes --show-labels |\
- grep none | tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
 ],
         common_test.PROC_ERR: ["read failed"]
     }
@@ -114,10 +110,22 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name none".format(
+            "kubeadm join --discovery-file {} --node-name none --apiserver-advertise-address FC00:2::32".format(
                 KUBE_ADMIN_CONF)
         ],
-        common_test.PROC_RUN: [True, True]
+        common_test.PROC_RUN: [True, True],
+        common_test.PRE: {
+            common_test.CONFIG_DB_NO: {
+                common_test.MGMT_INTERFACE_TABLE: {
+                    "eth0|FC00:2::32/64": {
+                        "gwaddr": "fc00:2::1"
+                    }
+                }
+            }
+        },
+        common_test.REQ: {
+            "data": {"ca.crt": "test"}
+        }
     },
     1: {
         common_test.DESCR: "Regular secure join",
@@ -135,10 +143,22 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name none".format(
+            "kubeadm join --discovery-file {} --node-name none --apiserver-advertise-address FC00:2::32".format(
                 KUBE_ADMIN_CONF)
         ],
-        common_test.PROC_RUN: [True, True]
+        common_test.PROC_RUN: [True, True],
+        common_test.PRE: {
+            common_test.CONFIG_DB_NO: {
+                common_test.MGMT_INTERFACE_TABLE: {
+                    "eth0|FC00:2::32/64": {
+                        "gwaddr": "fc00:2::1"
+                    }
+                }
+            }
+        },
+        common_test.REQ: {
+            "data": {"ca.crt": "test"}
+        }
     },
     2: {
         common_test.DESCR: "Skip join as already connected",
@@ -228,11 +248,17 @@ def init(self):
             s.close()
         with open(FLANNEL_CONF_FILE, "w") as s:
             s.close()
+        with open(AME_CRT, "w") as s:
+            s.close()
+        with open(AME_KEY, "w") as s:
+            s.close()
         kube_commands.KUBELET_YAML = kubelet_yaml
         kube_commands.CNI_DIR = CNI_DIR
         kube_commands.FLANNEL_CONF_FILE = FLANNEL_CONF_FILE
         kube_commands.SERVER_ADMIN_URL = "file://{}".format(self.admin_conf_file)
         kube_commands.KUBE_ADMIN_CONF = KUBE_ADMIN_CONF
+        kube_commands.AME_CRT = AME_CRT
+        kube_commands.AME_KEY = AME_KEY
 
 
     @patch("kube_commands.subprocess.Popen")
@@ -295,11 +321,13 @@ def test_write_labels(self, mock_subproc):
                     json.dumps(labels, indent=4)))
                 assert False
 
-
+    @patch("kube_commands.requests.get")
+    @patch("kube_commands.swsscommon.DBConnector")
+    @patch("kube_commands.swsscommon.Table")
     @patch("kube_commands.subprocess.Popen")
-    def test_join(self, mock_subproc):
+    def test_join(self, mock_subproc, mock_table, mock_conn, mock_reqget):
         self.init()
-        common_test.set_kube_mock(mock_subproc)
+        common_test.set_kube_mock(mock_subproc, mock_table, mock_conn, mock_reqget)
 
         for (i, ct_data) in join_test_data.items():
             lock_file = ""

From 64d189388eff52fbf3ef2274f244cd679d393072 Mon Sep 17 00:00:00 2001
From: ganglv <88995770+ganglyu@users.noreply.github.com>
Date: Sat, 17 Sep 2022 06:08:10 +0800
Subject: [PATCH 1379/1674] Fix dhcp option buffer issue (#12033)

Why I did it
Current isc-dhcp uses below code to remove DHCP option:
memmove(sp, op, op[1] + 2);
sp += op[1] + 2;

sp points to the option to be stripped, we can call it as option S.
op points to the option after options S, we can call it as option O.
DHCP option is a typical type-length-value structure, the first byte is type, the second byte is length, and remain parts are value.
In this case, option O length is bigger than option S, and more than 2 bytes, after the memmove, we will get this result:

Now Option S and Option O are overwritten, op[1] was the length of Option O, and it's modified after memmove.
But current implementation is still using op[1] as length to update sp (sp+=op[1]+2), so we get the wrong sp.

How I did it
Create patch from https://github.com/isc-projects/dhcp
The new impelementation use mlen to store the length of Option O before memmove, that's how it fixed the bug.
size_t mlen = op[1] + 2;
memmove(sp, op, mlen);
sp += mlen;

How to verify it
I have a PR for sonic-mgmt to cover this issue:
sonic-net/sonic-mgmt#6330

Signed-off-by: Gang Lv ganglv@microsoft.com
---
 ...ay-agent-option-buffer-pointer-logic.patch | 53 +++++++++++++++++++
 src/isc-dhcp/patch/series                     |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 src/isc-dhcp/patch/0013-Fix-dhcrelay-agent-option-buffer-pointer-logic.patch

diff --git a/src/isc-dhcp/patch/0013-Fix-dhcrelay-agent-option-buffer-pointer-logic.patch b/src/isc-dhcp/patch/0013-Fix-dhcrelay-agent-option-buffer-pointer-logic.patch
new file mode 100644
index 000000000000..051b58966cae
--- /dev/null
+++ b/src/isc-dhcp/patch/0013-Fix-dhcrelay-agent-option-buffer-pointer-logic.patch
@@ -0,0 +1,53 @@
+From 0a2f9a62bceb90b0d30461add2e25c4ce7a24547 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Fri, 20 Dec 2019 10:11:54 -0500
+Subject: [PATCH] [#71] Fix dhcrelay agent option buffer pointer logic
+
+relay/dhcrelay.c
+    strip_relay_agent_options()
+    strip_relay_agent_options()
+    - corrected buffer pointer logic
+
+---
+ relay/dhcrelay.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
+index 896e1e2e..980dacae 100644
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -1238,8 +1238,13 @@ strip_relay_agent_options(struct interface_info *in,
+ 				return (0);
+ 
+ 			if (sp != op) {
+-				memmove(sp, op, op[1] + 2);
+-				sp += op[1] + 2;
++				size_t mlen = op[1] + 2;
++				memmove(sp, op, mlen);
++				sp += mlen;
++				if (sp > max) {
++					return (0);
++				}
++
+ 				op = nextop;
+ 			} else
+ 				op = sp = nextop;
+@@ -1620,8 +1620,13 @@ add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet,
+ 			end_pad = NULL;
+ 
+ 			if (sp != op) {
+-				memmove(sp, op, op[1] + 2);
+-				sp += op[1] + 2;
++				size_t mlen = op[1] + 2;
++				memmove(sp, op, mlen);
++				sp += mlen;
++				if (sp > max) {
++					return (0);
++				}
++
+ 				op = nextop;
+ 			} else
+ 				op = sp = nextop;
+-- 
+2.17.1
+
diff --git a/src/isc-dhcp/patch/series b/src/isc-dhcp/patch/series
index 5397aa0c6e06..b9efee0192f5 100644
--- a/src/isc-dhcp/patch/series
+++ b/src/isc-dhcp/patch/series
@@ -11,3 +11,4 @@
 0010-Bugfix-correctly-set-interface-netmask.patch
 0011-dhcp-relay-Prevent-Buffer-Overrun.patch
 0012-add-option-si-to-support-using-src-intf-ip-in-relay.patch
+0013-Fix-dhcrelay-agent-option-buffer-pointer-logic.patch

From 6678e3356e5e06374946b2a85fcd63b63464b5a4 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:48:13 +0800
Subject: [PATCH 1380/1674] [ci/build]: Upgrade SONiC package versions (#12101)

---
 files/build/versions/default/versions-git     |  2 +-
 files/build/versions/default/versions-web     |  2 +-
 .../docker-base-buster/versions-deb-buster    |  2 +-
 .../versions-deb-buster                       |  3 ++-
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../docker-database/versions-deb-buster       |  2 +-
 .../docker-dhcp-relay/versions-deb-buster     |  2 +-
 .../docker-fpm-frr/versions-deb-buster        |  6 ++---
 .../docker-gbsyncd-vs/versions-deb-buster     |  2 +-
 .../dockers/docker-lldp/versions-deb-buster   |  6 ++---
 .../dockers/docker-mux/versions-deb-buster    |  2 +-
 .../dockers/docker-nat/versions-deb-buster    |  2 +-
 .../docker-orchagent/versions-deb-buster      |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-sflow/versions-deb-buster  |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  6 ++---
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-centec/versions-deb-buster   |  2 +-
 .../docker-syncd-invm/versions-deb-buster     |  2 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../docker-syncd-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-teamd/versions-deb-buster  |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 27 ++++++++++---------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  9 ++++---
 .../host-image/versions-deb-buster-arm64      |  3 +++
 .../host-image/versions-deb-buster-armhf      |  3 +++
 files/build/versions/host-image/versions-py3  |  2 +-
 40 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b6765f7e2bc7..23cee8818596 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 83bda16e5d92..bab2f2d4cc1d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==b692a224c718ad6e1cbd17eda8aaa673
+https://deb.nodesource.com/setup_14.x==02e66fef39d18cc683f760a67ccd5d68
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index c6c2a79c8b20..60cc2997ff66 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -40,7 +40,7 @@ librtmp1==2.4+20151223.gitfa8646d.1-2
 libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
-libsqlite3-0==3.27.2-3+deb10u1
+libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1n-0+deb10u3
 libwrap0==7.6.q-28
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index bc85330e0243..df0b1aa6e5f4 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -3,7 +3,7 @@ binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
 build-essential==12.6
-bzip2==1.0.6-9.2~deb10u1
+bzip2==1.0.6-9.2~deb10u2
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 dh-python==3.20190308
@@ -15,6 +15,7 @@ gcc-8==8.3.0-6
 libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
+libbz2-1.0==1.0.6-9.2~deb10u2
 libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 7094e3bc75d7..832fd7a2e36d 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -1,6 +1,6 @@
 binutils-aarch64-linux-gnu==2.31.1-16
 icu-devtools==63.1-6+deb10u3
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index c948d1fad1ab..869dd6106476 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -1,6 +1,6 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
 icu-devtools==63.1-6+deb10u3
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
index 1979ecc0b69f..3a15169bef7c 100644
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index ae6ede20c056..bf6b5c979c2a 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -12,7 +12,7 @@ libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
 libexplain51==1.4.D001-8
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 2a7a468a4783..8a12039c1772 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -10,11 +10,11 @@ libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libjson-c3==0.12.1+ds-2+deb10u1
-libmariadb3==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -26,7 +26,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 logrotate==3.14.0-4
-mariadb-common==1:10.3.34-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 9b8877c2e9c1..e194f52f4366 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 00b50d4acadf..1d6b810faffb 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -5,11 +5,11 @@ libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
 libipt2==2.0-2
-libmariadb3==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -21,7 +21,7 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
-mariadb-common==1:10.3.34-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
index 1e89df10454d..d5d8b3763136 100644
--- a/files/build/versions/dockers/docker-mux/versions-deb-buster
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -12,7 +12,7 @@ libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libhiredis0.14-dbgsym==0.14.0-3~bpo9+1
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
index 9d09f1f1044d..995fea293abf 100644
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -7,7 +7,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 06926e89260f..2242795a0c03 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -27,7 +27,7 @@ libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libipt2==2.0-2
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index d2ea89bc3b57..33a9b534ea5d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -41,7 +41,7 @@ libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u3
 libfribidi0==1.0.5-3.1+deb10u2
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
index 919f91188e80..10f1ebf4bb91 100644
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
index c1675ee9e1a0..b484eb828ba2 100644
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -6,7 +6,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index cd8222097c2b..e7152e027b00 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -23,14 +23,14 @@ libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
 libfreeipmi17==1.6.3-1.1
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
 liblsan0==8.3.0-6
-libmariadb3==1:10.3.34-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u1
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
@@ -50,7 +50,7 @@ libunwind8==1.2.1-10~deb10u1
 linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 make==4.2.1-1.2
-mariadb-common==1:10.3.34-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 037e43e3429f..09152d36b302 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -21,7 +21,7 @@ libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libexpat1-dev==2.2.6-2+deb10u4
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 689fff137344..b2153f5b283c 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.48.1
+grpcio==1.49.0
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==4.12.0
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
index 6fe8ddb0de94..db799f904509 100644
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 1fef1edfbbfb..46f935d09b3b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -54,7 +54,7 @@ libexpat1-dev==2.2.6-2+deb10u4
 libfreetype6==2.9.1-3+deb10u3
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libicu63==63.1-6+deb10u3
 libip4tc0==1.8.2-4
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 2b249f49e307..7393abb1e2c2 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2022.6.15.2
+certifi==2022.9.14
 charset-normalizer==2.1.1
 click==7.0
 idna==3.4
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 83dcc958c5a2..6e1c69933a29 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -20,7 +20,7 @@ libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libisl19==0.20-2
 libitm1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 662bcb8745f8..e2a53fedb5da 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -20,7 +20,7 @@ libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libicu63==63.1-6+deb10u3
 libisl19==0.20-2
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index bd0382758630..0b10cb15dd8f 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -8,7 +8,7 @@ libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libkmod2==26-1
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index cb40c38d3f70..b1f9412396ea 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -22,7 +22,7 @@ libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u4
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libicu63==63.1-6+deb10u3
 libisl19==0.20-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 898e95442221..d85883d1728c 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -5,7 +5,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libkmod2==26-1
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 55f09c760631..52b4bf3f9725 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -6,7 +6,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index d7e2c268d7be..2364dce02ea4 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
 libisl19==0.20-2
 libitm1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index b79cef8243c7..908dffa79522 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -11,7 +11,7 @@ libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
 libexpat1-dev==2.2.6-2+deb10u4
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
 libipt2==2.0-2
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 9b8877c2e9c1..e194f52f4366 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
index 992786e8eb13..e5c88ab32b5d 100644
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -4,7 +4,7 @@ libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libpopt0==1.16-12
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 2d38a80ff936..69dd5320aa5b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -35,8 +35,8 @@ bsd-mailx==8.1.2-0.20180807cvs-1
 bsdmainutils==11.1.2+b1
 build-essential==12.6
 byacc==20140715-1+b1
-bzip2==1.0.6-9.2~deb10u1
-bzip2-doc==1.0.6-9.2~deb10u1
+bzip2==1.0.6-9.2~deb10u2
+bzip2-doc==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 ca-certificates-java==20190405
 cdbs==0.4.159
@@ -324,7 +324,8 @@ libbs2b0==3.1.0+dfsg-2.2
 libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
-libbz2-dev==1.0.6-9.2~deb10u1
+libbz2-1.0==1.0.6-9.2~deb10u2
+libbz2-dev==1.0.6-9.2~deb10u2
 libc-ares-dev==1.14.0-1+deb10u1
 libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -538,11 +539,11 @@ libgl1-mesa-dri==18.3.6-2+deb10u1
 libglapi-mesa==18.3.6-2+deb10u1
 libgles1==1.1.0-1
 libgles2==1.1.0-1
-libglib2.0-0==2.58.3-2+deb10u3
-libglib2.0-bin==2.58.3-2+deb10u3
-libglib2.0-data==2.58.3-2+deb10u3
-libglib2.0-dev==2.58.3-2+deb10u3
-libglib2.0-dev-bin==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
+libglib2.0-bin==2.58.3-2+deb10u4
+libglib2.0-data==2.58.3-2+deb10u4
+libglib2.0-dev==2.58.3-2+deb10u4
+libglib2.0-dev-bin==2.58.3-2+deb10u4
 libglu1-mesa==9.0.0-2.1+b3
 libglu1-mesa-dev==9.0.0-2.1+b3
 libglvnd-core-dev==1.1.0-1
@@ -738,9 +739,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.34-0+deb10u1
-libmariadb-dev-compat==1:10.3.34-0+deb10u1
-libmariadb3==1:10.3.34-0+deb10u1
+libmariadb-dev==1:10.3.36-0+deb10u1
+libmariadb-dev-compat==1:10.3.36-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -1051,7 +1052,7 @@ libsoup2.4-1==2.64.2-2
 libsoxr0==0.1.2-3
 libspeex1==1.2~rc1.2-1+b2
 libspice-server1==0.14.0-1.3+deb10u1
-libsqlite3-0==3.27.2-3+deb10u1
+libsqlite3-0==3.27.2-3+deb10u2
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
@@ -1342,7 +1343,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.34-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 47d4f0c37f4b..3cb1daca3812 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 47d4f0c37f4b..3cb1daca3812 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9ebcfa6be17c2d1e7bd72135ceab5e767ed89b7d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index c2a9a5d70e16..53b1422fa2c5 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -10,7 +10,7 @@ bridge-utils==1.6-2
 bsdmainutils==11.1.2+b1
 build-essential==12.6
 busybox==1:1.30.1-4
-bzip2==1.0.6-9.2~deb10u1
+bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
@@ -90,6 +90,7 @@ libassuan0==2.5.2-1
 libatomic1==8.3.0-6
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
+libbz2-1.0==1.0.6-9.2~deb10u2
 libc-dev-bin==2.28-10+deb10u1
 libc-l10n==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
@@ -124,7 +125,7 @@ libgcc-8-dev==8.3.0-6
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libgirepository-1.0-1==1.58.3-2
-libglib2.0-0==2.58.3-2+deb10u3
+libglib2.0-0==2.58.3-2+deb10u4
 libgnutls30==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
@@ -203,7 +204,7 @@ libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
-libsqlite3-0==3.27.2-3+deb10u1
+libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
 libssl-dev==1.1.1n-0+deb10u3
 libssl1.1==1.1.1n-0+deb10u3
@@ -302,7 +303,7 @@ software-properties-common==0.96.20.2-2
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
-sqlite3==3.27.2-3+deb10u1
+sqlite3==3.27.2-3+deb10u2
 squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 86853a6d9ac9..a2991cc83fe5 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,11 +1,14 @@
 binutils-aarch64-linux-gnu==2.31.1-16
+bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index b119c920e8c4..26bcacfa7f87 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,11 +1,14 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
+bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 0f2d95bd38b0..244e9ca0c186 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,7 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.6.15.2
+certifi==2022.9.14
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0

From 429ef389ad572e311cea15a43f824ca31eac4e4d Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 19 Sep 2022 09:21:53 +0300
Subject: [PATCH 1381/1674] [202012][submodule] Advance sonic-snmpagent pointer
 (#11964)

Update sonic-snmpagent submodule pointer to include the following:
* Fix: if routestr does not exist, skip ([#257](https://github.com/sonic-net/sonic-snmpagent/pull/257))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index c75440bb93ec..13ddb0e933b2 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit c75440bb93ecea3d1a8d5299257e6acdf86adc52
+Subproject commit 13ddb0e933b2f71db7f9cbada3472fee7ca2a869

From 3f3d472a158c706502ca8185996621a2b52073c7 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Mon, 19 Sep 2022 15:42:32 -0700
Subject: [PATCH 1382/1674] [sonic-platform-common][sonic-platform-daemons]
 submodule update (#12105)

sonic-platform-common
c87fd2d (HEAD -> 202012, origin/202012) [Credo][Ycable] enhancement and error exception for some APIs (#303)
5e990c2 [ycable] add definitions of some new API's for Y-Cable infrastructure (#301)

sonic-platform-daemons
5f3d0a7 (HEAD -> 202012, origin/202012) [ycabled] fix insert events from xcvrd;cleanup some mux toggle logic (#287
Signed-off-by: vaibhav-dahiya vdahiya@microsoft.com
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index fd8cf3a9dad9..c87fd2db72d2 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit fd8cf3a9dad971b36cdd49db6ee34b918aa450cb
+Subproject commit c87fd2db72d2a82a6f0434b86f208f7c406fa74e
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 978667c03b43..5f3d0a7b930c 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 978667c03b438b592fa3073398c92c595a337dc3
+Subproject commit 5f3d0a7b930c074c84762eda105341a50cde8d7d

From 4396d67d64b77362c01757c086cf8d72e78fa27d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 20 Sep 2022 19:51:45 +0800
Subject: [PATCH 1383/1674] [ci/build]: Upgrade SONiC package versions (#12120)

---
 .../build/versions/build/build-sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/default/versions-git                       | 2 +-
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index d85ae1de4391..f31683122293 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==ab4bf75bb7d02ffa1f5c407d56980f157ef56fe2
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 23cee8818596..d802cf15fcfd 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==ab4bf75bb7d02ffa1f5c407d56980f157ef56fe2
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index b2153f5b283c..689fff137344 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.49.0
+grpcio==1.48.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==4.12.0

From 3a0d0303acc5752fe92193696e575c0f17afb41e Mon Sep 17 00:00:00 2001
From: Xichen96 <lukelin0907@gmail.com>
Date: Wed, 21 Sep 2022 16:10:09 +0800
Subject: [PATCH 1384/1674] [202012][submodule] update sonic-utilities (#12124)

47dc7ea Added support for tunnel route status in show vnet routes all. (#2341)
7b8a62f Vnet_route_check Vxlan tunnel route update. (#2281) (#2376)
b21e2ce [202012][sonic_installer] consider existing swap when setting up swap

Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 26043909f405..b21e2ceb08ac 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 26043909f405d7137763479a06d9fe24763fc3b6
+Subproject commit b21e2ceb08ac89d08167e1e4cde4f2401091473c

From 2b5eb45d8308f0f13331c6ecd52276ef6729b160 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:37:27 +0800
Subject: [PATCH 1385/1674] [ci/build]: Upgrade SONiC package versions (#12141)

---
 files/build/versions/default/versions-git                     | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index d802cf15fcfd..68ca0e561117 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 3cb1daca3812..a5de62c75b11 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 3cb1daca3812..a5de62c75b11 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==18bdadc98ab6f94912ad97e9b9fda170777c5b7f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From daff6dbaaac75f7f0e65ab71ff855168618e9a36 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Wed, 21 Sep 2022 22:38:13 -0700
Subject: [PATCH 1386/1674] Update cisco-8000 submodule to v0.116 (#12135)

---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 2e81a9d5ad89..ee13ff9c960b 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.112
+ref=202012-v0.116

From 95b19bbb462055840d81b8a9930722ffcdd78a90 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Fri, 23 Sep 2022 13:59:51 +0800
Subject: [PATCH 1387/1674] Pick up fixes and make up BRCM SAI version to
 4.3.7.1 (#12069)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index bab2f2d4cc1d..ab99281f096e 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index dc4d9aa0d839..80c1698d30e5 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.7.0_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.0_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 26470dd23163fec519ae766b53ff91e332fef9b4 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Sat, 24 Sep 2022 15:16:54 -0700
Subject: [PATCH 1388/1674] 
 [202012][sonic-platform-common][sonic-platform-daemons] (#12178)

[sonic-platform-common] commit ->
git log --oneline c87fd2d..202012
5c90100 (HEAD -> 202012, origin/202012) [credo][ycable] remove
mux-toggle inprogress flags for some API's (#311)

[sonic-platform-daemons] commit ->
git log --oneline 5f3d0a7..202012
99d2528 (HEAD -> 202012, origin/202012) add support to execute new
ycable API's, add datetime field to mux_info (#297) (#299)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index c87fd2db72d2..5c9010074dc8 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit c87fd2db72d2a82a6f0434b86f208f7c406fa74e
+Subproject commit 5c9010074dc8d9284242b1fe31146926b06f5c89
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 5f3d0a7b930c..99d252849da2 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 5f3d0a7b930c074c84762eda105341a50cde8d7d
+Subproject commit 99d252849da23d8188567bc32d5a31c28310c0d8

From dc67ec28692f743ddf9d748f1ded459dba6bf27c Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 25 Sep 2022 20:10:04 +0800
Subject: [PATCH 1389/1674] [ci/build]: Upgrade SONiC package versions (#12181)

---
 .../build/build-sonic-slave-buster/versions-deb-buster    | 2 +-
 .../versions/build/build-sonic-slave-buster/versions-web  | 4 ++--
 .../versions/build/build-sonic-slave-stretch/versions-web | 4 ++--
 files/build/versions/default/versions-git                 | 2 +-
 files/build/versions/default/versions-web                 | 4 +---
 .../dockers/docker-base-buster/versions-deb-buster        | 2 +-
 .../docker-config-engine-buster/versions-deb-buster       | 2 +-
 .../versions/dockers/docker-orchagent/versions-deb-buster | 2 +-
 .../dockers/docker-platform-monitor/versions-deb-buster   | 2 +-
 .../versions/dockers/docker-snmp/versions-deb-buster      | 2 +-
 .../docker-sonic-mgmt-framework/versions-deb-buster       | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3      | 2 +-
 .../versions/dockers/docker-sonic-vs/versions-deb-buster  | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py3 | 2 +-
 .../dockers/docker-syncd-bfn-rpc/versions-deb-buster      | 2 +-
 .../dockers/docker-syncd-brcm-rpc/versions-deb-buster     | 2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster         | 2 +-
 .../dockers/docker-syncd-centec-rpc/versions-deb-buster   | 2 +-
 .../dockers/docker-syncd-centec/versions-deb-buster-arm64 | 2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster         | 2 +-
 .../dockers/docker-syncd-mrvl/versions-deb-buster-armhf   | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster        | 8 ++++----
 .../dockers/sonic-slave-buster/versions-deb-buster-arm64  | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster-armhf  | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-git      | 2 +-
 .../versions/dockers/sonic-slave-stretch/versions-git     | 2 +-
 files/build/versions/host-image/versions-deb-buster       | 6 +++---
 files/build/versions/host-image/versions-deb-buster-arm64 | 3 +++
 files/build/versions/host-image/versions-deb-buster-armhf | 3 +++
 files/build/versions/host-image/versions-py3              | 2 +-
 30 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 79d904a93254..11723f435d7f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.7.0
+libsaibcm==4.3.7.1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 3de472035f53..58cf7826ddb6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -28,8 +28,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index ac8007914719..71c012993d06 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 68ca0e561117..38069efd21b4 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index ab99281f096e..f424130a0d09 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -18,7 +18,7 @@ http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3
+https://deb.nodesource.com/node_14.x/dists/buster/Release==f603a03a9c19dfcff06549da4d65e6ea
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==02e66fef39d18cc683f760a67ccd5d68
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -50,8 +50,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 60cc2997ff66..5de2692548cb 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -7,7 +7,7 @@ libcurl4==7.64.0-4+deb10u3
 libdaemon0==0.14-7
 libdbus-1-3==1.12.20-0+deb10u1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u4
+libexpat1==2.2.6-2+deb10u5
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index df0b1aa6e5f4..e0a50ff3d52d 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -20,7 +20,7 @@ libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libgcc-8-dev==8.3.0-6
 libgomp1==8.3.0-6
 libhiredis0.14==0.14.0-3~bpo9+1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 2242795a0c03..45d321f9bf85 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -25,7 +25,7 @@ libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 33a9b534ea5d..fed30485b7c8 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -35,7 +35,7 @@ libdbi1==0.9.0-5
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u3
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index e7152e027b00..1a213af4add3 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -20,7 +20,7 @@ libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libfreeipmi17==1.6.3-1.1
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 09152d36b302..ec3a89f5b4a1 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 689fff137344..bdb608f43d03 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.48.1
+grpcio==1.49.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==4.12.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 46f935d09b3b..db7363dc1553 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -50,7 +50,7 @@ libdpkg-perl==1.19.8
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libfreetype6==2.9.1-3+deb10u3
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 7393abb1e2c2..4cbe3268a0ec 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2022.9.14
+certifi==2022.9.24
 charset-normalizer==2.1.1
 click==7.0
 idna==3.4
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 6e1c69933a29..c0efeea00e29 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index e2a53fedb5da..39690e90598b 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 0b10cb15dd8f..05c510ee8a38 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.7.0
+libsaibcm==4.3.7.1
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index b1f9412396ea..ec147202d16c 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index ad85b9e20885..53745a721fa8 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 908dffa79522..caa574c7c326 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -10,7 +10,7 @@ libc6-dev==2.28-10+deb10u1
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index 46f091f15b72..df1905503e3f 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u5
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 69dd5320aa5b..861bb250dbc1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -105,7 +105,7 @@ equivs==2.2.0
 exim4-base==4.92-8+deb10u7
 exim4-config==4.92-8+deb10u7
 exim4-daemon-light==4.92-8+deb10u7
-expat==2.2.6-2+deb10u4
+expat==2.2.6-2+deb10u5
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
 file==1:5.35-4+deb10u2
@@ -473,8 +473,8 @@ libevent-dev==2.1.8-stable-4
 libevent-extra-2.1-6==2.1.8-stable-4
 libevent-openssl-2.1-6==2.1.8-stable-4
 libevent-pthreads-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u5
 libexplain-dev==1.4.D001-8
 libexplain51==1.4.D001-8
 libexporter-tiny-perl==1.002001-1
@@ -1689,7 +1689,7 @@ tk8.6==8.6.9-2
 tk8.6-blt2.5==2.5.3+dfsg-4
 ucf==3.0038+nmu1
 unattended-upgrades==1.11.2
-unzip==6.0-23+deb10u2
+unzip==6.0-23+deb10u3
 uuid-dev==2.33.1-0.1
 va-driver-all==2.4.0-1
 vdpau-driver-all==1.1.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 28d7f9a6edb3..879016873318 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u2
-nodejs==14.20.0-deb-1nodesource1
\ No newline at end of file
+nodejs==14.20.1-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index ea310c2fd01f..dde2c414f15d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -103,7 +103,7 @@ linux-compiler-gcc-8-arm==4.19.249-2
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.20.0-deb-1nodesource1
+nodejs==14.20.1-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index a5de62c75b11..f7f9c0c0b66b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index a5de62c75b11..f7f9c0c0b66b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d126c974c11b09f41ec3dc4653a583c8929fa8a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 53b1422fa2c5..4b457d709155 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -113,8 +113,8 @@ libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
+libexpat1==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u5
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
@@ -320,7 +320,7 @@ traceroute==1:2.1.0-2
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1
-unzip==6.0-23+deb10u2
+unzip==6.0-23+deb10u3
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
 vim==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index a2991cc83fe5..ec9fa97dbe24 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -5,6 +5,8 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
@@ -16,4 +18,5 @@ libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 pkg-config==0.29-6
 tsingma-bsp==1.0
+unzip==6.0-23+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 26bcacfa7f87..19273d4fdb77 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -5,6 +5,8 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libexpat1==2.2.6-2+deb10u4
+libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
@@ -16,4 +18,5 @@ libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
 mrvlprestera==1.0
 pkg-config==0.29-6
+unzip==6.0-23+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 244e9ca0c186..e04877350542 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,7 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.9.14
+certifi==2022.9.24
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0

From 8ef7fa2e366c12f0d79a72ab836ad91404868957 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Mon, 26 Sep 2022 11:01:12 -0700
Subject: [PATCH 1390/1674] [202012][sonic-linkmgrd] submodule udpate (#12131)

[202012][sonic-linkmgrd] submodule udpate

ddbd792 Jing Zhang Tue Sep 13 10:34:32 2022 -0700 [active-standby] update warmboot reconciliation logic (#129)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index fc5d4240bf85..ddbd7926c20a 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit fc5d4240bf85699bc1f689a08b3d5670a8a7ead2
+Subproject commit ddbd7926c20a007f5c3fb3d8b6758c6664afb0f0

From 89942987884296811165dc350ca0be5b136c5da2 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 28 Sep 2022 21:32:50 +0800
Subject: [PATCH 1391/1674] [ci/build]: Upgrade SONiC package versions (#12199)

---
 .../versions/build/build-sonic-slave-buster/versions-git      | 2 +-
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index f31683122293..6b0686b8d84d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,7 +1,7 @@
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
-https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
+https://github.com/jpirko/libteam.git==42a235b5e8e4befe5c35ec60bb34ffffbedddbf3
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 38069efd21b4..f4f0c2e18e50 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,10 +1,10 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
-https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
+https://github.com/jpirko/libteam.git==42a235b5e8e4befe5c35ec60bb34ffffbedddbf3
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index f7f9c0c0b66b..42dbdea9d2c9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index f7f9c0c0b66b..42dbdea9d2c9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==08bb5c487f80147a236360ea50f4544890530779
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 109d0e9d3a82448082d61fda4e7bb485fa3ea8ac Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:56:22 -0700
Subject: [PATCH 1392/1674] Update cisco-8000 submodule to v0.117 (#12211)

---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index ee13ff9c960b..919f75d112da 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.116
+ref=202012-v0.117

From 811f8d65be230e22ed824c81e74e827da9736d2c Mon Sep 17 00:00:00 2001
From: Keith Lu <54458415+yenlu-keith@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:54:19 -0700
Subject: [PATCH 1393/1674] 202012_update_submodule_sonic-sairedis (#12174)

Update sonic-sairedis submodule pointer to include the following:

2f92b4493e [syncd] bulk OID remove requires RID (#1130)
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 1d3720eb5aa4..2f92b4493ebf 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 1d3720eb5aa4b13d8eff2ae6e833dc5fd48d3ba7
+Subproject commit 2f92b4493ebf8929dbec3a58d6b400a20cd1b554

From f61c84b09e04a001d60d28c638239052df380b96 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 30 Sep 2022 21:36:39 +0800
Subject: [PATCH 1394/1674] [ci/build]: Upgrade SONiC package versions (#12243)

---
 .../versions/build/build-sonic-slave-buster/versions-git      | 2 +-
 files/build/versions/default/versions-git                     | 4 ++--
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3 | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster   | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 6b0686b8d84d..46cf33203b54 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,7 +1,7 @@
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
-https://github.com/jpirko/libteam.git==42a235b5e8e4befe5c35ec60bb34ffffbedddbf3
+https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index f4f0c2e18e50..54a9577edf0a 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,10 +1,10 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
-https://github.com/jpirko/libteam.git==42a235b5e8e4befe5c35ec60bb34ffffbedddbf3
+https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index bdb608f43d03..569645923d2c 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.6
+protobuf==4.21.7
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 861bb250dbc1..b64a1f5910b2 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1037,7 +1037,7 @@ libsm6==2:1.2.3-1
 libsnappy-java==1.1.7.2-1
 libsnappy-jni==1.1.7.2-1
 libsnappy1v5==1.1.7-1
-libsndfile1==1.0.28-6+deb10u1
+libsndfile1==1.0.28-6+deb10u2
 libsnmp-base==5.7.3+dfsg-5+deb10u3
 libsnmp-dev==5.7.3+dfsg-5+deb10u3
 libsnmp30==5.7.3+dfsg-5+deb10u3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 42dbdea9d2c9..81104b4e98fb 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 42dbdea9d2c9..81104b4e98fb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From a05d86a0477374f53ed89652cce9b6dcf2d09dce Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 2 Oct 2022 18:38:46 +0800
Subject: [PATCH 1395/1674] [ci/build]: Upgrade SONiC package versions (#12252)

---
 files/build/versions/default/versions-git     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-fpm-frr/versions-deb-buster        |  4 ++--
 .../dockers/docker-lldp/versions-deb-buster   |  4 ++--
 .../docker-orchagent/versions-deb-buster      |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  6 ++---
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 22 +++++++++----------
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 .../host-image/versions-deb-buster-arm64      |  1 +
 .../host-image/versions-deb-buster-armhf      |  1 +
 21 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 54a9577edf0a..b62554876c65 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index e0a50ff3d52d..0520eec0c0a7 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -43,7 +43,7 @@ libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8a12039c1772..c52cfd242a2f 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -14,7 +14,7 @@ libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libjson-c3==0.12.1+ds-2+deb10u1
-libmariadb3==1:10.3.36-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u2
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -26,7 +26,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 logrotate==3.14.0-4
-mariadb-common==1:10.3.36-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u2
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 1d6b810faffb..e3144dc4e7b0 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -9,7 +9,7 @@ libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
 libipt2==2.0-2
-libmariadb3==1:10.3.36-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u2
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -21,7 +21,7 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
-mariadb-common==1:10.3.36-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u2
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 45d321f9bf85..6c65ba31fe0d 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -51,7 +51,7 @@ libswsscommon-dbg==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index fed30485b7c8..9484107a3412 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -96,7 +96,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxrender1==1:0.9.10-1
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 1a213af4add3..98c08afb5d8e 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -30,7 +30,7 @@ libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
 liblsan0==8.3.0-6
-libmariadb3==1:10.3.36-0+deb10u1
+libmariadb3==1:10.3.36-0+deb10u2
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
@@ -47,10 +47,10 @@ libsnmp30-dbg==5.7.3+dfsg-5
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 locales==2.28-10+deb10u1
 make==4.2.1-1.2
-mariadb-common==1:10.3.36-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u2
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index ec3a89f5b4a1..9c994335f84e 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -50,7 +50,7 @@ libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libyang==1.0.73
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-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
index 569645923d2c..9e8bf17299ea 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.2
 grpcio==1.49.1
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==4.12.0
+importlib-metadata==5.0.0
 importlib-resources==5.9.0
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index db7363dc1553..cacf7d27d4a2 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -106,7 +106,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 logrotate==3.14.0-4
 make==4.2.1-1.2
 ndisc6==1.0.4-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 77895b42f41c..dd6d71a0dca0 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 05c510ee8a38..514672d16566 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index ec147202d16c..b7b067a23dbf 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -54,7 +54,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index caa574c7c326..ad0cb74fea4d 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -31,7 +31,7 @@ libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 mft==4.18.0-106
 mlnx-sai==1.mlnx.SAIRel1.22.0.0
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index b64a1f5910b2..678ee6c0bfdf 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -598,7 +598,7 @@ libhtml-parser-perl==3.72-3+b3
 libhtml-tagset-perl==3.20-3
 libhtml-tree-perl==5.07-2
 libhttp-cookies-perl==6.04-1
-libhttp-daemon-perl==6.01-3
+libhttp-daemon-perl==6.01-3+deb10u1
 libhttp-date-perl==6.02-1
 libhttp-message-perl==6.18-1
 libhttp-negotiate-perl==6.01-1
@@ -739,9 +739,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.36-0+deb10u1
-libmariadb-dev-compat==1:10.3.36-0+deb10u1
-libmariadb3==1:10.3.36-0+deb10u1
+libmariadb-dev==1:10.3.36-0+deb10u2
+libmariadb-dev-compat==1:10.3.36-0+deb10u2
+libmariadb3==1:10.3.36-0+deb10u2
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -1316,12 +1316,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.249-2
-linux-headers-4.19.0-21-amd64==4.19.249-2
-linux-headers-4.19.0-21-common==4.19.249-2
-linux-headers-amd64==4.19+105+deb10u16
-linux-kbuild-4.19==4.19.249-2
-linux-libc-dev==4.19.249-2
+linux-compiler-gcc-8-x86==4.19.260-1
+linux-headers-4.19.0-22-amd64==4.19.260-1
+linux-headers-4.19.0-22-common==4.19.260-1
+linux-headers-amd64==4.19+105+deb10u17
+linux-kbuild-4.19==4.19.260-1
+linux-libc-dev==4.19.260-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
@@ -1343,7 +1343,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.36-0+deb10u1
+mariadb-common==1:10.3.36-0+deb10u2
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index dde2c414f15d..1922ccd3534b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -99,7 +99,7 @@ libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
 libxslt1-dev==1.1.32-2.2~deb10u2
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.249-2
+linux-compiler-gcc-8-arm==4.19.260-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 81104b4e98fb..9b6ab98c48b2 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 81104b4e98fb..9b6ab98c48b2 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e3ed6a8e015bada7f2708d990b5e8c4d01bcf047
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 4b457d709155..54001683418d 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -227,7 +227,7 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
-linux-libc-dev==4.19.249-2
+linux-libc-dev==4.19.260-1
 locales==2.28-10+deb10u1
 logrotate==3.14.0-4
 lsb-base==10.2019051400
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index ec9fa97dbe24..597a612fb166 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -16,6 +16,7 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
+linux-libc-dev==4.19.249-2
 pkg-config==0.29-6
 tsingma-bsp==1.0
 unzip==6.0-23+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 19273d4fdb77..4ffac782fd19 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -16,6 +16,7 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
+linux-libc-dev==4.19.249-2
 mrvlprestera==1.0
 pkg-config==0.29-6
 unzip==6.0-23+deb10u2

From 893391f76e14c436e034560cfab22f5df37e86bb Mon Sep 17 00:00:00 2001
From: Longxiang Lyu <35479537+lolyu@users.noreply.github.com>
Date: Thu, 1 Sep 2022 04:10:22 +0800
Subject: [PATCH 1396/1674] [mux] Exit to write `standby` state to
 `active-active` ports (#11821)

[mux] Exit to write standby state to `active-active` ports

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
---
 files/build_templates/mux.service.j2 | 2 +-
 files/scripts/write_standby.py       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2
index abc04ab30d18..ee1f8ce75389 100644
--- a/files/build_templates/mux.service.j2
+++ b/files/build_templates/mux.service.j2
@@ -14,7 +14,7 @@ ExecStartPre=/usr/local/bin/mark_dhcp_packet.py
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-ExecStopPost=/usr/local/bin/write_standby.py
+ExecStopPost=/usr/local/bin/write_standby.py --shutdown mux
 Restart=always
 RestartSec=30
 
diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 86d50737b1c5..85b6ee8b04e8 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -178,6 +178,12 @@ def apply_mux_config(self):
     parser.add_argument('-s', '--active_standby',
                         help='state: intial state for "auto" and/or "manual" config in active-standby mode, default "standby"',
                         type=str, required=False, default='standby')
+    parser.add_argument('--shutdown', help='write mux state after shutdown other services, supported: mux',
+                        type=str, required=False, choices=['mux'])
     args = parser.parse_args()
-    mux_writer = MuxStateWriter(activeactive=args.active_active, activestandby=args.active_standby)
+    active_active_state = args.active_active
+    active_standby_state = args.active_standby
+    if args.shutdown == 'mux':
+        active_active_state = "standby"
+    mux_writer = MuxStateWriter(activeactive=active_active_state, activestandby=active_standby_state)
     mux_writer.apply_mux_config()

From 64ce6696bb39fac16c64ec48ebb471b86daaa5e6 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 2 Sep 2022 13:50:42 -0700
Subject: [PATCH 1397/1674] [mux] skip mux operations during warm shutdown
 (#11937)

* [mux] skip mux operations during warm shutdown

- Enhance write_standby.py script to skip actions during warm shutdown.
- Expand the support to BGP service.
- MuX support was added by a previous PR.
- don't skip action during warm recovery

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../per_namespace/bgp.service.j2              |  2 +-
 files/scripts/write_standby.py                | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
index 03fb6285fb43..e9909f037103 100644
--- a/files/build_templates/per_namespace/bgp.service.j2
+++ b/files/build_templates/per_namespace/bgp.service.j2
@@ -15,7 +15,7 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
-ExecStopPost=/usr/local/bin/write_standby.py
+ExecStopPost=/usr/local/bin/write_standby.py --shutdown bgp
 
 Restart=always
 RestartSec=30
diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py
index 85b6ee8b04e8..13c5b17ea64e 100755
--- a/files/scripts/write_standby.py
+++ b/files/scripts/write_standby.py
@@ -20,13 +20,15 @@ class MuxStateWriter(object):
     Class used to write standby mux state to APP DB
     """
 
-    def __init__(self, activeactive, activestandby):
+    def __init__(self, activeactive, activestandby, shutdown_module):
         self.config_db_connector = None
         self.appl_db_connector = None
         self.state_db_connector = None
         self.asic_db_connector = None
         self.default_active_active_state = activeactive
         self.default_active_standby_state = activestandby
+        self.shutdown_module = shutdown_module
+        self.is_shutdwon = (self.shutdown_module != None)
 
     @property
     def config_db(self):
@@ -97,7 +99,15 @@ def is_warmrestart(self):
         tbl = Table(self.state_db, 'WARM_RESTART_ENABLE_TABLE')
         (status, value) = tbl.hget('system', 'enable')
 
-        return status and value == 'true' 
+        if status and value == 'true':
+            return True
+
+        if self.shutdown_module:
+            (status, value) = tbl.hget(self.shutdown_module, 'enable')
+            if status and value == 'true':
+                return True
+
+        return False
 
     def get_all_mux_intfs_modes(self):
         """
@@ -153,7 +163,7 @@ def apply_mux_config(self):
             # If not running on a dual ToR system, take no action
             return
 
-        if self.is_warmrestart:
+        if self.is_warmrestart and self.is_shutdwon:
             # If in warmrestart context, take no action
             logger.log_warning("Skip setting mux state due to ongoing warmrestart.")
             return
@@ -178,12 +188,12 @@ def apply_mux_config(self):
     parser.add_argument('-s', '--active_standby',
                         help='state: intial state for "auto" and/or "manual" config in active-standby mode, default "standby"',
                         type=str, required=False, default='standby')
-    parser.add_argument('--shutdown', help='write mux state after shutdown other services, supported: mux',
-                        type=str, required=False, choices=['mux'])
+    parser.add_argument('--shutdown', help='write mux state after shutdown other services, supported: mux, bgp',
+                        type=str, required=False, choices=['mux', 'bgp'], default=None)
     args = parser.parse_args()
     active_active_state = args.active_active
     active_standby_state = args.active_standby
-    if args.shutdown == 'mux':
+    if args.shutdown in ['mux', 'bgp']:
         active_active_state = "standby"
-    mux_writer = MuxStateWriter(activeactive=active_active_state, activestandby=active_standby_state)
+    mux_writer = MuxStateWriter(activeactive=active_active_state, activestandby=active_standby_state, shutdown_module=args.shutdown)
     mux_writer.apply_mux_config()

From a16843a67c1eda579ca9d6a299fe33bdc8a0dff8 Mon Sep 17 00:00:00 2001
From: Xichen96 <lukelin0907@gmail.com>
Date: Thu, 22 Sep 2022 13:57:52 +0800
Subject: [PATCH 1398/1674] Enable swap for haliburton device. (#11746)

Signed-off-by: Xichen Lin <lukelin0907@gmail.com>

Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
---
 .../debian/platform-modules-haliburton.init   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
index 07a6542109b5..3f6358bf4ab4 100644
--- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.init
@@ -11,6 +11,26 @@
 # Short-Description: Setup Haliburton board.
 ### END INIT INFO
 
+setup_swap () {
+    SWAPFILE=/host/myswapfile
+
+    if [ ! -f $SWAPFILE ]; then
+        availspace=`df -h --output=avail /host | sed '1d;s/\s//g;s/[^0-9].*//g'`
+        diff=$(( availspace - 2*$1 ))
+        if [ $diff -gt 0 ]; then
+            fallocate -l ${1}G $SWAPFILE
+            chmod 600 $SWAPFILE
+            echo "swap file created successfully"
+        else
+            echo "not enough disk space to turn on swap."
+            return
+        fi
+    fi
+    mkswap $SWAPFILE
+    swapon $SWAPFILE
+    echo "swap on successfully"
+}
+
 case "$1" in
 start)
         echo -n "Setting up board... "
@@ -74,6 +94,8 @@ start)
 
         /bin/sh /usr/local/bin/platform_api_mgnt.sh init
 
+        setup_swap 2
+
         echo "done."
         ;;
 

From 7474a1bcd8c12c0596f1b06932ba5199268e8747 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 4 Oct 2022 21:20:48 +0800
Subject: [PATCH 1399/1674] [ci/build]: Upgrade SONiC package versions (#12267)

---
 files/build/versions/host-image/versions-deb-buster | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 54001683418d..da286b532dbb 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -317,6 +317,7 @@ systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
+tzdata==2021a-0+deb10u7
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1

From c7e0d50c74096c85737a0a447a33d7eaaf97a209 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Tue, 4 Oct 2022 14:16:56 -0700
Subject: [PATCH 1400/1674] [ci]: Fix the wrong branch in build step "Download
 sonic-buildimage.vs artifact" (#12272)

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eef7f93a3db1..e3b04eaac037 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -101,7 +101,7 @@ stages:
         pipeline: 9
         artifact: sonic-swss-common.amd64.ubuntu20_04
         runVersion: 'latestFromBranch'
-        runBranch: 'refs/heads/master'
+        runBranch: 'refs/heads/202012'
       displayName: "Download sonic swss common deb packages"
 
     - task: DownloadPipelineArtifact@2

From 37a189b3f3a8502b421a0010033a81918494b13f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 5 Oct 2022 20:57:41 +0800
Subject: [PATCH 1401/1674] [ci/build]: Upgrade SONiC package versions (#12277)

---
 files/build/versions/default/versions-git                     | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b62554876c65..79ff0553f3a3 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c54a19bd02b9803db96926e556b9e3ee6db8b63
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 9b6ab98c48b2..88edb7997b9a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1795358f90712daf38030188fc84fbd70f82ee41
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 9b6ab98c48b2..88edb7997b9a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a724859f7a9b3531c0373d86886a42314e772532
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1795358f90712daf38030188fc84fbd70f82ee41
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 9c9d902ede7f2f5f6e00e757a1dd5dab84d7ac0c Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Wed, 5 Oct 2022 09:40:55 -0700
Subject: [PATCH 1402/1674] [202012]BRCM SAI 4.3.7.1-1 pick up fix
 CS00012263713 (mirrored packet with extra VLAN Tag) (#12275)

Pick up fix for CS00012263713 (mirrored packet with extra VLAN Tag) BRCM SAI 4.3.7.1-1

Preliminary tests look fine. BGP neighbors were all up with proper routes programmed
interfaces are all up
Manually ran the following test cases on 7050CX3 (TD3) T0 DUT and all passed:

     fib/test_fib.py
     acl/test_acl.py
     arp/test_neighbor_mac_noptf.py
     fdb/test_fdb.py
     decap/test_decap.py
     pc/test_lag_2.py
     pc/test_po_cleanup.py
     pc/test_po_update.py
     everflow/test_everflow_ipv6.py
     everflow/test_everflow_testbed.py
     route/test_default_route.py
     ipfwd/test_dip_sip.py
     copp/test_copp.py
     crm/test_crm.py
---
 files/build/versions/default/versions-web | 4 +++-
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f424130a0d09..ac1d74fd5d8d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T02%3A00%3A59Z&se=2037-10-06T02%3A00%3A00Z&sr=b&sp=r&sig=7AozOTdDhbjjc2ubXURoWG%2B9l6tqnRuoMOL%2FBYilDAc%3D==b54ba6fca560d1c2d886c68f3e4c6f74
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T01%3A58%3A26Z&se=2037-10-06T01%3A58%3A00Z&sr=b&sp=r&sig=wWW5cJ1RpH2NS%2Fz5LIMkuVKMAnw6nPMfR7Q9%2BqCG8ck%3D==317b926e101312b118a15319628bdc27
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -72,4 +74,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 80c1698d30e5..5951df04f6b6 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.7.1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.1-1_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T01%3A58%3A26Z&se=2037-10-06T01%3A58%3A00Z&sr=b&sp=r&sig=wWW5cJ1RpH2NS%2Fz5LIMkuVKMAnw6nPMfR7Q9%2BqCG8ck%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-1_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T02%3A00%3A59Z&se=2037-10-06T02%3A00%3A00Z&sr=b&sp=r&sig=7AozOTdDhbjjc2ubXURoWG%2B9l6tqnRuoMOL%2FBYilDAc%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From a0f1e14c3128b4f1b83a0f4c865ee7916d356982 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Wed, 5 Oct 2022 15:52:58 -0700
Subject: [PATCH 1403/1674] [202012][sonic-platform-daemons] submodule update
 (#12266)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

git log --oneline 99d2528..202012
aacb772 (HEAD -> 202012, origin/202012) [ycabled] fix naming error for
error condition for CLI handling (#302)
f2201ab [ycabled] add some exception catching logic to some vendor
specific API's (#301)
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 99d252849da2..aacb772914b3 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 99d252849da23d8188567bc32d5a31c28310c0d8
+Subproject commit aacb772914b383ce1a6064f7ec386a082826bb63

From 1e6d63a41264118b69d92b12964084c8cc8f6e5b Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 6 Oct 2022 21:25:34 -0700
Subject: [PATCH 1404/1674] [202012][BRCMSAI] 4.3.7.1-2 to  back out a change
 that broke 4.3.7.1-1 (#12298)

This is basically the same as previous PR: (#12275)
With backing out a change that was breaking the build. Copying the same info from that PR here.
---
 files/build/versions/default/versions-web | 4 ++--
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index ac1d74fd5d8d..fea77a52e08b 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,8 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T02%3A00%3A59Z&se=2037-10-06T02%3A00%3A00Z&sr=b&sp=r&sig=7AozOTdDhbjjc2ubXURoWG%2B9l6tqnRuoMOL%2FBYilDAc%3D==b54ba6fca560d1c2d886c68f3e4c6f74
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T01%3A58%3A26Z&se=2037-10-06T01%3A58%3A00Z&sr=b&sp=r&sig=wWW5cJ1RpH2NS%2Fz5LIMkuVKMAnw6nPMfR7Q9%2BqCG8ck%3D==317b926e101312b118a15319628bdc27
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 5951df04f6b6..b47608bd0a7d 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.7.1-1_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T01%3A58%3A26Z&se=2037-10-06T01%3A58%3A00Z&sr=b&sp=r&sig=wWW5cJ1RpH2NS%2Fz5LIMkuVKMAnw6nPMfR7Q9%2BqCG8ck%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-1_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.1-2_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-2_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-1_amd64.deb?sv=2020-04-08&st=2022-10-05T02%3A00%3A59Z&se=2037-10-06T02%3A00%3A00Z&sr=b&sp=r&sig=7AozOTdDhbjjc2ubXURoWG%2B9l6tqnRuoMOL%2FBYilDAc%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 5f4c4e5b5dfcad9b008bfdc63da07afec440eb21 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Sat, 8 Oct 2022 10:53:01 -0700
Subject: [PATCH 1405/1674] [Submodule] update sonic-restapi (#12288)

Update sonic-restapi submodule for the following commits:

86543d0 - 2022-10-05 : Updates to route PATCH API (#129) [Sumukha Tumkur Vani]
a1af82c - 2022-09-21 : Install libyang to azure pipeline (#128) [Hua Liu]
2007c4c - 2022-09-09 : Increase coverage threshold (#126) [Sumukha Tumkur Vani]
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index dac446feb2be..86543d0db544 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit dac446feb2be3aa348f633a4d2e3c64993d7483a
+Subproject commit 86543d0db544362bb27912ed40449920c3d7c0d1

From 30adf36ce378cc24769d3a1736ae8535ca4cb543 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 9 Oct 2022 18:25:20 +0800
Subject: [PATCH 1406/1674] [ci/build]: Upgrade SONiC package versions (#12302)

---
 .../versions-deb-buster                       |  2 +-
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../build-sonic-slave-buster/versions-web     |  4 +--
 .../build-sonic-slave-stretch/versions-web    |  4 +--
 files/build/versions/default/versions-git     |  2 +-
 files/build/versions/default/versions-web     |  4 +--
 .../docker-dhcp-relay/versions-deb-buster     |  8 ++---
 .../docker-sonic-mgmt-framework/versions-py3  |  6 ++--
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 30 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  4 +--
 .../host-image/versions-deb-buster-arm64      |  2 ++
 .../host-image/versions-deb-buster-armhf      |  2 ++
 files/build/versions/host-image/versions-py3  |  2 +-
 17 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 11723f435d7f..c8238d28b6ac 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.7.1
+libsaibcm==4.3.7.1-2
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 7e5141986cc8..18e62be041b1 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -11,7 +11,7 @@ netifaces==0.11.0
 psutil==5.9.2
 pyroute2==0.5.14
 python-arptable==0.0.2
-tabulate==0.8.10
+tabulate==0.9.0
 websocket-client==1.4.1
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 58cf7826ddb6..042ad2a28c4d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -28,8 +28,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 71c012993d06..3af4598d1516 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A38%3A00Z&se=2037-09-15T09%3A38%3A00Z&sr=b&sp=r&sig=woY1S03ENzUKUG0htzuIaPl%2ByV0dSOm2QsimPDBhGpw%3D==62e0023f93767abcbe661da66b4bdc7c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1_amd64.deb?sv=2020-08-04&st=2022-09-14T09%3A37%3A35Z&se=2037-09-15T09%3A37%3A00Z&sr=b&sp=r&sig=Yb9q50mb5E0A9mAj8DEc7xfc1WHdW1tyqi5OdAjUSec%3D==38415617b3bf93b2c64a6334e201a044
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 79ff0553f3a3..2a01ec394bc8 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c54a19bd02b9803db96926e556b9e3ee6db8b63
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index fea77a52e08b..f424130a0d09 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,8 +50,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
@@ -74,4 +72,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
-https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
+https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index bf6b5c979c2a..a39ec37608ea 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -7,7 +7,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libevent-2.1-6==2.1.8-stable-4
@@ -15,9 +15,9 @@ libexplain51==1.4.D001-8
 libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u7
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u8
 libpopt0==1.16-12
 libunwind8==1.2.1-10~deb10u1
 lsof==4.91+dfsg-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
index 9e8bf17299ea..fac7d3269038 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -9,7 +9,7 @@ grpcio==1.49.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==5.0.0
-importlib-resources==5.9.0
+importlib-resources==5.10.0
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.16.0
@@ -24,7 +24,7 @@ pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.0
-typing_extensions==4.3.0
+typing_extensions==4.4.0
 urllib3==1.26.5
 werkzeug==2.2.2
-zipp==3.8.1
\ No newline at end of file
+zipp==3.9.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 4cbe3268a0ec..ea4b2075a925 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -11,6 +11,6 @@ ptyprocess==0.7.0
 pyroute2==0.5.14
 requests==2.28.1
 scapy==2.4.4
-tabulate==0.8.10
+tabulate==0.9.0
 urllib3==1.26.12
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 514672d16566..8e7c373e5f16 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.7.1
+libsaibcm==4.3.7.1-2
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.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
index 678ee6c0bfdf..9da96ec6d005 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -24,7 +24,7 @@ autopoint==0.19.8.1-9
 autotools-dev==20180224.1
 bash-completion==1:2.8-6
 bc==1.07.1-2+b1
-bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u7
+bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u8
 binfmt-support==2.2.0-2
 binutils==2.31.1-16
 binutils-common==2.31.1-16
@@ -87,7 +87,7 @@ distro-info-data==0.41+deb10u5
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
-dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u7
+dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u8
 docker-ce==5:18.09.5~3-0~debian-buster
 docker-ce-cli==5:18.09.5~3-0~debian-buster
 docutils-common==0.14+dfsg-4
@@ -274,8 +274,8 @@ libbabeltrace-dev==1.5.6-2+deb10u1
 libbabeltrace1==1.5.6-2+deb10u1
 libbatik-java==1.10-2+deb10u1
 libbdplus0==0.1.2-3
-libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u7
-libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u7
+libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u8
+libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u8
 libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
@@ -430,8 +430,8 @@ libdist-checkconflicts-perl==0.11-1
 libdistro-info-perl==0.21
 libdjvulibre-text==3.5.27.1-10+deb10u1
 libdjvulibre21==3.5.27.1-10+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
-libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u7
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u8
+libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u8
 libdom4j-java==2.1.1-2
 libdouble-conversion1==3.1.0-3
 libdoxia-core-java==1.7-2
@@ -642,14 +642,14 @@ libipc-system-simple-perl==1.25-4
 libipt2==2.0-2
 libiptc-dev==1.8.2-4
 libiptc0==1.8.2-4
-libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
-libirs161==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u7
-libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u7
+libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u8
+libirs161==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u8
+libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u8
 libisl19==0.20-2
 libitext1-java==1.4-7
 libitm1==8.3.0-6
@@ -728,7 +728,7 @@ liblua5.1-0-dev==5.1.5-8.1+b2
 liblvm2cmd2.03==2.03.02-3
 liblwp-mediatypes-perl==6.02-1
 liblwp-protocol-https-perl==6.07-2
-liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u7
+liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u8
 liblzma-dev==5.2.4-1+deb10u1
 liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 88edb7997b9a..78cb7fa918a4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1795358f90712daf38030188fc84fbd70f82ee41
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 88edb7997b9a..78cb7fa918a4 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1795358f90712daf38030188fc84fbd70f82ee41
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index da286b532dbb..97b9892c7778 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -105,7 +105,7 @@ libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u8
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
@@ -137,7 +137,7 @@ libidn11==1.33-2.2
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
 libiptc0==1.8.2-4
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u8
 libisl19==0.20-2
 libitm1==8.3.0-6
 libjq1==1.5+dfsg-2+b1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 597a612fb166..3248b4c31353 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -5,11 +5,13 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 4ffac782fd19..6b97b03ea893 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -5,11 +5,13 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
+libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index e04877350542..c350c528c990 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -36,7 +36,7 @@ regex==2022.9.13
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0
-tabulate==0.8.10
+tabulate==0.9.0
 thrift==0.13.0
 urllib3==1.26.12
 watchdog==0.10.3

From 3d8fbf4bca3614027ae45d4929f8e28bcf8d5856 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:22:13 +0800
Subject: [PATCH 1407/1674] [actions] Add auto cherry-pick actions to release
 branch (#11496) (#12336)

* [actions] Add github actions to auto cherry-pick prs to release branches

* Add README, fix workflow

Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
---
 .github/workflows/README.md                  |  38 ++++++
 .github/workflows/pr_cherrypick_poststep.yml |  49 +++++++
 .github/workflows/pr_cherrypick_prestep.yml  | 136 +++++++++++++++++++
 3 files changed, 223 insertions(+)
 create mode 100644 .github/workflows/README.md
 create mode 100644 .github/workflows/pr_cherrypick_poststep.yml
 create mode 100644 .github/workflows/pr_cherrypick_prestep.yml

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
new file mode 100644
index 000000000000..d013edd4bdea
--- /dev/null
+++ b/.github/workflows/README.md
@@ -0,0 +1,38 @@
+#  Github actions README
+This is an introduction about auto-cherry-pick workflow.
+take 202205 branch for example:
+1. pr_cherrypick_prestep:
+```mermaid
+graph
+Start(Origin PR) --> A{merged?}
+A -- NO --> STOP
+A -- YES --> A1{Approved<br> for 202205<br> Branch?}
+A1 -- NO --> STOP
+A1 -- YES --> A2(pr_cherrypick_prestep)
+B(pr_cherrypick_prestep)
+B --> B1{cherry pick<br>conflict?}
+B1 -- YES --> B2(Add tag:<br>Cherry Pick Confclit_202205) --> B3(Add comment:<br>refer author code conflict) --> STOP1(STOP)
+B1 -- NO --> B4(Create New PR) -- success --> B5(New PR add tag:<br> automerge) --> B6(New PR add comment:<br>Origin PR link) --> B7(Origin PR add tag:<br>Created PR to 202205 Branch) --> B8(Origin PR add comment:<br>New PR link)
+B4 -- fail --> STOP1
+```
+
+2. automerge:
+```mermaid
+graph
+Start(PR azp finished successfully) --> A{author:<br>mssonicbld?}
+A -- NO --> STOP
+A -- YES --> B{tag:<br>automerge?} -- YES --> C(Merge PR)
+B -- NO --> STOP
+```
+
+3. pr_cherrypick_poststep:
+```mermaid
+graph
+A(PR is Merged) --> B{tag:<br>automerge?}
+B -- YES --> B1{author:<br>mssonicbld?}
+B1 -- YES --> B2{"title starts:<br>[action] [PR:123]"}
+B2 -- YES --> C(Origin PR remove tag:<br> Created PR to 202205 Branch) --> D(Origin PR add tag:<br> Included in 202205 Branch)
+B -- NO --> STOP
+B1 -- NO --> STOP
+B2 -- NO --> STOP
+```
diff --git a/.github/workflows/pr_cherrypick_poststep.yml b/.github/workflows/pr_cherrypick_poststep.yml
new file mode 100644
index 000000000000..1e9e497075d7
--- /dev/null
+++ b/.github/workflows/pr_cherrypick_poststep.yml
@@ -0,0 +1,49 @@
+name: PostCherryPick
+on:
+  pull_request_target:
+    types:
+    - closed
+    branches:
+    - '20*'
+
+jobs:
+  post_cherry_pick:
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.head.user.login == 'mssonicbld' && startsWith(github.event.pull_request.title, '[action]')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Debug
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo $GITHUB_CONTEXT | jq
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+    - name: Main
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        TOKEN: ${{ secrets.TOKEN }}
+      run: |
+        set -e
+        pr_url=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request._links.html.href")
+        pr_id=$(echo $GITHUB_CONTEXT | jq -r ".event.number")
+        base_ref=$(echo $GITHUB_CONTEXT | jq -r ".base_ref")
+        echo ${TOKEN} | gh auth login --with-token
+        title=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.title")
+        origin_pr_id=$(echo $title | grep -Eo "\[action\] \[PR:[0-9]*\]" | grep -Eo "[0-9]*")
+        origin_pr_url=$(echo $pr_url | sed "s/$pr_id/$origin_pr_id/")
+        echo =============================
+        echo pr_url:        $pr_url
+        echo pr_id:         $pr_id
+        echo base_ref:      $base_ref
+        echo title:         $title
+        echo origin_pr_id:  $origin_pr_id
+        echo origin_pr_url: $origin_pr_url
+        echo =============================
+        # Add label
+        if [[ "$origin_pr_id" == "" ]];then
+          echo "original PR didn't found."
+          exit 1
+        fi
+        gh pr edit $origin_pr_url --add-label "Included in ${base_ref} Branch"
+        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch,Request for ${base_ref} Branch,Approved for ${base_ref} Branch"
diff --git a/.github/workflows/pr_cherrypick_prestep.yml b/.github/workflows/pr_cherrypick_prestep.yml
new file mode 100644
index 000000000000..3caf3f940843
--- /dev/null
+++ b/.github/workflows/pr_cherrypick_prestep.yml
@@ -0,0 +1,136 @@
+name: PreCherryPick
+on:
+  pull_request_target:
+    types:
+    - labeled
+    - closed
+    branches:
+    - master-test
+
+jobs:
+  pre_cherry_pick:
+    if: github.event.pull_request.merged == true && ( (github.event.action == 'closed' && contains(join(github.event.pull_request.labels.*.name, ','), 'Approved for 20')) || (github.event.action == 'labeled' && startsWith(github.event.label.name, 'Approved for 20')) )
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+    - name: Debug
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo $GITHUB_CONTEXT | jq
+    - name: Main
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        TOKEN: ${{ secrets.TOKEN }}
+      run: |
+        set -e
+
+        sha=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.merge_commit_sha")
+        pr_id=$(echo $GITHUB_CONTEXT | jq -r ".event.number")
+        pr_url=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request._links.html.href")
+        repository=$(echo $GITHUB_CONTEXT | jq -r ".repository")
+        labels=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.labels[].name")
+        author=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.base.user.login")
+        branches=$(git branch -a --list 'origin/20????' | awk -F/ '{print$3}' | grep -E "202[0-9]{3}")
+        if [[ $(echo $GITHUB_CONTEXT | jq -r ".event.action") == "labeled" ]];then
+          labels=$(echo $GITHUB_CONTEXT | jq -r ".event.label.name")
+        fi
+        title=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.title")
+        echo =============================
+        echo SHA:           $sha
+        echo PRID:          $pr_id
+        echo pr_url:        $pr_url
+        echo repository:    $repository
+        echo branches:      $branches
+        echo labels:
+        echo "$labels"
+        echo ${TOKEN} | gh auth login --with-token
+        echo author:        $author
+        echo title:         $title
+        echo =============================
+
+        git config user.name mssonicbld
+        git config user.email sonicbld@microsoft.com
+        git config credential.https://github.com.username mssonicbld
+        git remote add mssonicbld https://mssonicbld:${TOKEN}@github.com/mssonicbld/sonic-buildimage
+        git fetch mssonicbld
+        git remote -vv
+
+        cherry_pick(){
+          set -e
+          local create_pr=''
+          while read label
+          do
+            echo label: $label
+            if [[ "$label" == "Approved for $branch Branch" ]];then
+              create_pr=1
+            fi
+            if [[ "$label" == "Created PR to $branch Branch" ]];then
+              echo "already has tag: Created PR to $branch Branch, return"
+              return 0
+            fi
+            if [[ "$label" == "Included in $branch Branch" ]];then
+              echo "already has tag: Included in $branch Branch, return"
+              return 0
+            fi
+            if [[ "$label" == "Cherry Pick Conflict_$branch" ]];then
+              echo "already has tag: Cherry Pick Conflict_$branch, return"
+              return 0
+            fi
+          done <<< "$labels"
+
+          if [[ "$create_pr" != "1" ]];then
+            echo "Didn't find 'Approved for $branch Branch' tag."
+            return 0
+          fi
+          # Begin to cherry-pick PR
+          git cherry-pick --abort 2>/dev/null || true
+          git clean -xdff 2>/dev/null || true
+          git reset HEAD --hard || true
+          git checkout -b $branch --track origin/$branch
+          git status | grep "working tree clean"
+
+          if ! git cherry-pick $sha;then
+            echo 'cherry-pick failed.'
+            git cherry-pick --abort
+            git status | grep "working tree clean"
+            # Add label
+            gh pr edit $pr_url --add-label "Cherry Pick Conflict_$branch"
+            echo 'Add label "Cherry Pick Conflict_$branch" success'
+            gh pr comment $pr_url --body "@${author} PR conflicts with $branch branch"
+            echo 'Add commnet "@${author} PR conflicts with $branch branch"'
+          else
+            # Create PR to release branch
+            git push mssonicbld HEAD:$branch-${pr_id} -f
+            result=$(gh pr create -R ${repository} -H mssonicbld:$branch-${pr_id} -B $branch -t "[action] [PR:$pr_id] $title" -b '' 2>&1)
+            echo $result | grep "already exists" && { echo $result; return 0; }
+            echo $result | grep github.com || { echo $result; return 1; }
+            new_pr_rul=$(echo $result | grep github.com)
+            echo new_pr_rul:    $new_pr_rul
+
+            # Add label to old PR
+            gh pr edit $pr_url --add-label "Created PR to $branch Branch"
+            echo Add label Created PR to $branch Branch
+            # Add comment to old PR
+            gh pr comment $pr_url --body "Cherry-pick PR to $branch: ${new_pr_rul}"
+            echo Add comment to old PR
+
+            # Add label to new PR
+            gh pr edit $new_pr_rul --add-label "automerge"
+            echo Add label automerge to new PR
+            # Add comment to new PR
+            gh pr comment $new_pr_rul --body "Original PR: ${pr_url}"
+            echo Add comment to new PR
+          fi
+        }
+
+        for branch in $branches
+        do
+          echo -------------------------------------------
+          echo Begin to parse Branch: $branch
+          cherry_pick
+        done
+

From 1b99c605a6f1b963c8aba6be906dbcbbb969a32c Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Mon, 10 Oct 2022 14:29:41 -0700
Subject: [PATCH 1408/1674] [202012] [minigraph] Remove SLB and bgp monitor
 peers for storage backend (#12262)

Why I did it
This is to backport #12251 to 202012

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 src/sonic-config-engine/minigraph.py         | 5 +++++
 src/sonic-config-engine/tests/test_cfggen.py | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 5e8cf2966b64..fd8cc06ca181 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1595,6 +1595,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
     if is_storage_device:
         results['DEVICE_METADATA']['localhost']['storage_device'] = "true"
 
+    # remove bgp monitor and slb peers for storage backend
+    if is_storage_device and 'BackEnd' in current_device['type']:
+        results['BGP_MONITORS'] = {}
+        results['BGP_PEER_RANGE'] = {}
+
     results['VLAN'] = vlans
     results['VLAN_MEMBER'] = vlan_members
 
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 87189bef27d2..605b70f9e61e 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -767,6 +767,14 @@ def verify_sub_intf(self, **kwargs):
             output = self.run_script(argument)
             self.assertEqual(output.strip(), "")
 
+            # SLB and BGP Monitor table does not exist
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "BGP_PEER_RANGE"'
+            output = self.run_script(argument)
+            self.assertEqual(output.strip(), "{}")
+            argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "BGP_MONITORS"'
+            output = self.run_script(argument)
+            self.assertEqual(output.strip(), "{}")
+
             # ACL_TABLE should not contain EVERFLOW related entries
             argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "ACL_TABLE"'
             output = self.run_script(argument)

From 54b0b8b5570c85d76fd6108c70c3fab026347724 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 11 Oct 2022 21:45:13 +0800
Subject: [PATCH 1409/1674] [ci/build]: Upgrade SONiC package versions (#12355)

---
 .../build/build-sonic-slave-buster/versions-git      |  2 +-
 files/build/versions/default/versions-git            |  4 ++--
 .../dockers/docker-base-buster/versions-deb-buster   |  2 +-
 files/build/versions/dockers/docker-ptf/versions-py2 |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster   | 12 ++++++------
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  6 +++---
 .../versions/host-image/versions-deb-buster-arm64    |  3 +++
 .../versions/host-image/versions-deb-buster-armhf    |  3 +++
 10 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 46cf33203b54..7e32b79c50ec 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -7,7 +7,7 @@ https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2a01ec394bc8..1675eac1069f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 5de2692548cb..aad5ba8c57b1 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -5,7 +5,7 @@ less==487-0.1+b1
 libatomic1==8.3.0-6
 libcurl4==7.64.0-4+deb10u3
 libdaemon0==0.14-7
-libdbus-1-3==1.12.20-0+deb10u1
+libdbus-1-3==1.12.24-0+deb10u1
 libestr0==0.1.10-2.1
 libexpat1==2.2.6-2+deb10u5
 libfastjson4==0.99.8-2
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index c44749bd76b1..efedb95e040e 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -64,4 +64,4 @@ wcwidth==0.2.5
 werkzeug==1.0.1
 yabgp==0.8.2
 zipp==1.2.0
-zope.interface==5.4.0
\ No newline at end of file
+zope.interface==5.5.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 9da96ec6d005..30cd9227e22e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -59,8 +59,8 @@ cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u3
-dbus==1.12.20-0+deb10u1
-dbus-user-session==1.12.20-0+deb10u1
+dbus==1.12.24-0+deb10u1
+dbus-user-session==1.12.24-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
 dconf-service==0.30.1-2
 dctrl-tools==2.24-3
@@ -149,9 +149,9 @@ gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u3
+git==1:2.20.1-2+deb10u4
 git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u3
+git-man==1:2.20.1-2+deb10u4
 glib-networking==2.58.0-2+deb10u2
 glib-networking-common==2.58.0-2+deb10u2
 glib-networking-services==2.58.0-2+deb10u2
@@ -411,8 +411,8 @@ libdatrie1==0.2.12-2
 libdb-dev==5.3.1+nmu1
 libdb5.3-dev==5.3.28+dfsg1-0.5
 libdbi1==0.9.0-5
-libdbus-1-3==1.12.20-0+deb10u1
-libdbus-1-dev==1.12.20-0+deb10u1
+libdbus-1-3==1.12.24-0+deb10u1
+libdbus-1-dev==1.12.24-0+deb10u1
 libdconf1==0.30.1-2
 libde265-0==1.0.3-1+b1
 libdevel-callchecker-perl==0.008-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 78cb7fa918a4..342a7f388a25 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 78cb7fa918a4..342a7f388a25 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 97b9892c7778..1e048d5602d2 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -20,7 +20,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u3
-dbus==1.12.20-0+deb10u1
+dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u2
@@ -73,7 +73,7 @@ iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
 iptables-persistent==1.0.11+deb10u1
 iputils-ping==3:20180629-2+deb10u2
-isc-dhcp-client==4.4.1-2+deb10u1
+isc-dhcp-client==4.4.1-2+deb10u2
 iso-codes==4.2-1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
@@ -103,7 +103,7 @@ libcurl3-gnutls==7.64.0-4+deb10u3
 libcurl4==7.64.0-4+deb10u3
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
-libdbus-1-3==1.12.20-0+deb10u1
+libdbus-1-3==1.12.24-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u8
 libdpkg-perl==1.19.8
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 3248b4c31353..d616ae172725 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,10 +1,13 @@
 binutils-aarch64-linux-gnu==2.31.1-16
 bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
+dbus==1.12.20-0+deb10u1
 icu-devtools==63.1-6+deb10u3
+isc-dhcp-client==4.4.1-2+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 6b97b03ea893..054f195c1e7e 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,10 +1,13 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
 bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
+dbus==1.12.20-0+deb10u1
 icu-devtools==63.1-6+deb10u3
+isc-dhcp-client==4.4.1-2+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
+libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4

From 7b848ab1473473055c87df178c182b502a21fc36 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 12 Oct 2022 15:54:06 +0800
Subject: [PATCH 1410/1674] [Build] Fix the build unstalbe issue caused by the
 kvm not ready (#12180) (#12354)

Why I did it
Fix the build unstable issue caused by the kvm 9000 port is not ready to use in 2 seconds.

2022-09-02T10:57:30.8122304Z + /usr/bin/kvm -m 8192 -name onie -boot order=cd,once=d -cdrom target/files/bullseye/onie-recovery-x86_64-kvm_x86_64_4_asic-r0.iso -device e1000,netdev=onienet -netdev user,id=onienet,hostfwd=:0.0.0.0:3041-:22 -vnc 0.0.0.0:0 -vga std -drive file=target/sonic-6asic-vs.img,media=disk,if=virtio,index=0 -drive file=./sonic-installer.img,if=virtio,index=1 -serial telnet:127.0.0.1:9000,server
2022-09-02T10:57:30.8123378Z + sleep 2.0
2022-09-02T10:57:30.8123889Z + '[' -d /proc/284923 ']'
2022-09-02T10:57:30.8124528Z + echo 'to kill kvm:  sudo kill 284923'
2022-09-02T10:57:30.8124994Z to kill kvm:  sudo kill 284923
2022-09-02T10:57:30.8125362Z + ./install_sonic.py
2022-09-02T10:57:30.8125720Z Trying 127.0.0.1...
2022-09-02T10:57:30.8126041Z telnet: Unable to connect to remote host: Connection refused

How I did it
Waiting more time until the tcp port 9000 is ready, waiting for 60 seconds in maximum.

Co-authored-by: xumia <59720581+xumia@users.noreply.github.com>
---
 scripts/build_kvm_image.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/build_kvm_image.sh b/scripts/build_kvm_image.sh
index 71a445e66612..4805f234483b 100755
--- a/scripts/build_kvm_image.sh
+++ b/scripts/build_kvm_image.sh
@@ -48,6 +48,19 @@ prepare_installer_disk()
     umount $tmpdir
 }
 
+wait_kvm_ready()
+{
+    local count=30
+    local waiting_in_seconds=2.0
+    for ((i=1; i<=$count; i++)); do
+        sleep $waiting_in_seconds
+        echo "$(date) [$i/$count] waiting for the port $KVM_PORT ready"
+        if netstat -l | grep -q ":$KVM_PORT"; then
+          break
+        fi
+    done
+}
+
 create_disk
 prepare_installer_disk
 
@@ -78,7 +91,7 @@ trap on_error ERR
 
 kvm_pid=$!
 
-sleep 2.0
+wait_kvm_ready
 
 [ -d "/proc/$kvm_pid" ] || {
         echo "ERROR: kvm died."

From 208107f2f91a5e8c449c4d7fb231419a287f4ebd Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 12 Oct 2022 11:47:45 +0300
Subject: [PATCH 1411/1674] [202012][submodule] Advance sonic-utilities pointer
 (#12359)

Update sonic-utilities submodule pointer to include the following:

94a3436 [show] vnet endpoint [ip/ipv6] command (2342) (#2421)
84a0712 [VxLAN]Fix Vxlan delete command to throw error when there are references (#2404)
1341f58 [202012] [generate_dump]: Enhance show techsupport for cisco-8000 platform (#2395)

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index b21e2ceb08ac..94a3436157ea 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit b21e2ceb08ac89d08167e1e4cde4f2401091473c
+Subproject commit 94a3436157ea3b49b0e7074d421900fd4bc8e70d

From 09f2d40c79e3e3227ae23ec51a1a14c14c6d1ac8 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 11 Oct 2022 07:59:14 +0800
Subject: [PATCH 1412/1674] [Build][Bug] Fix apt-get remove version not lock
 issue (#12193)

Why I did it
Fix apt-get remove/purge version not locked issue when the apt-get options not specified.

How I did it
Add a space character before and after the command line parameters.
---
 src/sonic-build-hooks/hooks/apt-get | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/hooks/apt-get b/src/sonic-build-hooks/hooks/apt-get
index db75ddf5c473..58563ce36bf4 100755
--- a/src/sonic-build-hooks/hooks/apt-get
+++ b/src/sonic-build-hooks/hooks/apt-get
@@ -20,7 +20,7 @@ if [ "$INSTALL" == y ]; then
     [ "$lock_result" == y ] && release_apt_installation_lock
     exit $command_result
 else
-    if [[ "$1" == "purge" || "$@" == *" purge "* || "$@" == *" remove "* ]]; then
+    if [[ " $@ " == *" purge "* || " $@ " == *" remove "* ]]; then
       # When running the purge command, collect the debian versions
       dpkg-query -W -f '${Package}==${Version}\n' >> $POST_VERSION_PATH/purge-versions-deb
       chmod a+wr $POST_VERSION_PATH/purge-versions-deb

From 75581e15800522e76cffc17ec65dfd068031a271 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 11 Oct 2022 11:00:51 +0800
Subject: [PATCH 1413/1674] [build] Fix dpkg front lock issue with apt-get
 (#12332)

---
 src/sonic-build-hooks/hooks/dpkg | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/sonic-build-hooks/hooks/dpkg

diff --git a/src/sonic-build-hooks/hooks/dpkg b/src/sonic-build-hooks/hooks/dpkg
new file mode 100644
index 000000000000..7fbc90f9fe5c
--- /dev/null
+++ b/src/sonic-build-hooks/hooks/dpkg
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. /usr/local/share/buildinfo/scripts/buildinfo_base.sh
+REAL_COMMAND=$(get_command dpkg)
+COMMAND_INFO="Locked by command: $REAL_COMMAND $@"
+lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" )
+$REAL_COMMAND "$@"
+command_result=$?
+[ "$lock_result" == y ] && release_apt_installation_lock
+exit $command_result

From 0de604baa6c343ffdfbe4b49f5989badd376481c Mon Sep 17 00:00:00 2001
From: Vivek <vivekreddykarri98@gmail.com>
Date: Wed, 12 Oct 2022 01:46:20 -0700
Subject: [PATCH 1414/1674] [DHCP_RELAY] Updated wait_for_intf.sh to wait for
 ipv6 global and link local addr (#12273)

- Why I did it
Fixes #11431

- How I did it
dhcp6relay binds to ipv6 addresses configured on these vlan interfaces
Thus check if they are ready before launching dhcp6relay

- How to verify it
Unit Tests
Tested on a live device

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 dockers/docker-dhcp-relay/wait_for_intf.sh.j2 | 26 +++++++++++++++++++
 .../tests/dhcp-relay-sample.json              |  5 ++++
 .../tests/sample_output/py2/wait_for_intf.sh  | 22 ++++++++++++++++
 .../tests/sample_output/py3/wait_for_intf.sh  | 22 ++++++++++++++++
 src/sonic-config-engine/tests/test_j2files.py |  3 ++-
 5 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-config-engine/tests/dhcp-relay-sample.json

diff --git a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2 b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
index b224a697b5ba..13499a6e6c54 100644
--- a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
+++ b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
@@ -21,8 +21,28 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
+function check_for_ipv6_link_local
+{
+    IFACE_NAME=$1
+    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
+
+    # Status of link local address is not populated in STATE_DB
+    while true; do
+        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
+        RC=$?
+        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
+            break
+        fi
+
+        sleep 1
+    done
+
+    echo "Link-Local address is configured on ${IFACE_NAME}"
+}
 
 # Wait for all interfaces with IPv4 addresses to be up and ready
+# dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
+# Thus check if they are ready before launching dhcp6relay
 {% for (name, prefix) in INTERFACE|pfx_filter %}
 {% if prefix | ipv4 %}
 wait_until_iface_ready {{ name }} {{ prefix }}
@@ -32,6 +52,12 @@ wait_until_iface_ready {{ name }} {{ prefix }}
 {% if prefix | ipv4 %}
 wait_until_iface_ready {{ name }} {{ prefix }}
 {% endif %}
+{% if prefix | ipv6 %}
+{% if DHCP_RELAY and name in DHCP_RELAY %}
+wait_until_iface_ready {{ name }} {{ prefix }}
+check_for_ipv6_link_local {{ name }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
 {% if prefix | ipv4 %}
diff --git a/src/sonic-config-engine/tests/dhcp-relay-sample.json b/src/sonic-config-engine/tests/dhcp-relay-sample.json
new file mode 100644
index 000000000000..dfd29ed80f43
--- /dev/null
+++ b/src/sonic-config-engine/tests/dhcp-relay-sample.json
@@ -0,0 +1,5 @@
+{
+    "VLAN_INTERFACE": {
+        "Vlan1000|fc02:2000::2/24": {}
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
index 8ba15b1c8355..1d58bc956bd1 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh
@@ -21,10 +21,32 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
+function check_for_ipv6_link_local
+{
+    IFACE_NAME=$1
+    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
+
+    # Status of link local address is not populated in STATE_DB
+    while true; do
+        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
+        RC=$?
+        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
+            break
+        fi
+
+        sleep 1
+    done
+
+    echo "Link-Local address is configured on ${IFACE_NAME}"
+}
 
 # Wait for all interfaces with IPv4 addresses to be up and ready
+# dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
+# Thus check if they are ready before launching dhcp6relay
 wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready Vlan1000 192.168.0.1/27
+wait_until_iface_ready Vlan1000 fc02:2000::2/24
+check_for_ipv6_link_local Vlan1000
 wait_until_iface_ready PortChannel02 10.0.0.58/31
 wait_until_iface_ready PortChannel03 10.0.0.60/31
 wait_until_iface_ready PortChannel04 10.0.0.62/31
diff --git a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
index 6e5012d5939c..5f0f46a59147 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
+++ b/src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh
@@ -21,8 +21,30 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
+function check_for_ipv6_link_local
+{
+    IFACE_NAME=$1
+    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
+
+    # Status of link local address is not populated in STATE_DB
+    while true; do
+        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
+        RC=$?
+        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
+            break
+        fi
+
+        sleep 1
+    done
+
+    echo "Link-Local address is configured on ${IFACE_NAME}"
+}
 
 # Wait for all interfaces with IPv4 addresses to be up and ready
+# dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
+# Thus check if they are ready before launching dhcp6relay
+wait_until_iface_ready Vlan1000 fc02:2000::2/24
+check_for_ipv6_link_local Vlan1000
 wait_until_iface_ready Vlan1000 192.168.0.1/27
 wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready PortChannel01 10.0.0.56/31
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index d6a214809c69..f3d64f2474fe 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -97,8 +97,9 @@ def test_ports_json(self):
 
     def test_dhcp_relay(self):
         # Test generation of wait_for_intf.sh
+        dhc_sample_data = os.path.join(self.test_dir, "dhcp-relay-sample.json")
         template_path = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-dhcp-relay', 'wait_for_intf.sh.j2')
-        argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
+        argument = '-m ' + self.t0_minigraph + ' -j ' + dhc_sample_data + ' -p ' + self.t0_port_config + ' -t ' + template_path + ' > ' + self.output_file
         self.run_script(argument)
         self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'wait_for_intf.sh'), self.output_file))
 

From dd1db72c1fcb963108240dbe0ba1431f09e3bb9e Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 13 Oct 2022 15:35:28 +0800
Subject: [PATCH 1415/1674] [ci/build]: Upgrade SONiC package versions (#12368)

---
 files/build/versions/default/versions-git                     | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-py3                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 1675eac1069f..9a812735889e 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 342a7f388a25..531188e454e1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 342a7f388a25..531188e454e1 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==8ae226ec3bb1e518d4ceab54768a4f6d7b12d63c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c350c528c990..dc65acb84617 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.9.24
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==38.0.1
+cryptography==38.0.2
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From db63f642e2b10a0b340566c214af5651714962ff Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 13 Oct 2022 15:35:51 +0800
Subject: [PATCH 1416/1674] [build] Fix dpkg front lock issue with apt-get
 (#12332) (#12348)

Co-authored-by: Liu Shilong <shilongliu@microsoft.com>

From d14e6f69d5cbe340cb09278f207030cc44ac743b Mon Sep 17 00:00:00 2001
From: Vivek <vivekreddykarri98@gmail.com>
Date: Thu, 13 Oct 2022 06:51:17 -0700
Subject: [PATCH 1417/1674] [202012] [Mellanox] [SKU] Mellanox-SN4700-A96C8V8
 SKU added (#12151)

A new SKU for MSN4700 Platform i.e. Mellanox-SN4700-A96C8V8

Requirements:

Breakout:
Port 1-24: 4x25G(4)[10G,1G]
Port 25-28: 2x100G[200G,50G,40G,25G,10G,1G]
Port 29-32: 2x200G[100G,50G,40G,25G,10G,1G]
Downlinks: 96 (1-24) + 4 (25-28)
Uplinks: 4 (29-32)
Shared Headroom: Enabled
Over Subscribe Ratio: 1:4
Default Topology: T0
Default Cable Length for T1: 5m
VxLAN source port range set: No
Static Policy Based Hashing Supported: No

Additional Details:
QoS params: The default ones defined in qos_config.j2 will be applied
Small Packet Percentage: Used 50% for traditional buffer model Note: For dynamic model, the value defined in LOSSLESS_TRAFFIC_PATTERN|AZURE|small_packet_percentage is used
SKU was drafted under the assumption that the downlink ports uses xcvr's that will only support the first 4 lanes of the physical port they are connected to. Hence for the ports 1-24, the last four lanes are not used
Cable Lengths used for generating buffer_defaults_{t0,t1}.j2 D

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
---
 .../Mellanox-SN4700-A96C8V8/buffers.json.j2   |  16 +
 .../buffers_defaults_objects.j2               |   1 +
 .../buffers_defaults_t0.j2                    |  46 +++
 .../buffers_defaults_t1.j2                    |  40 +++
 .../buffers_dynamic.json.j2                   |  17 ++
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN4700-A96C8V8/port_config.ini   | 113 +++++++
 .../Mellanox-SN4700-A96C8V8/qos.json.j2       |   1 +
 .../Mellanox-SN4700-A96C8V8/sai.profile       |   3 +
 .../sai_4700_8x200g_8x100g_96x25g.xml         | 277 ++++++++++++++++++
 10 files changed, 515 insertions(+)
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_objects.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t1.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai_4700_8x200g_8x100g_96x25g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers.json.j2
new file mode 100644
index 000000000000..afbd130a436d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers.json.j2
@@ -0,0 +1,16 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..bdca5962fd58
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t0.j2
@@ -0,0 +1,46 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '5m' %}
+{%-set ports2cable = {
+            'torrouter_server'       : '5m',
+            'leafrouter_torrouter'   : '300m',
+            'spinerouter_leafrouter' : '1500m'
+       }
+-%}
+{% set ingress_lossless_pool_size =  '46415872' %}
+{% set ingress_lossless_pool_xoff  =  '1982464' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '46415872' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..444c728c5ba1
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_defaults_t1.j2
@@ -0,0 +1,40 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '300m' %}
+{% set ingress_lossless_pool_size =  '45432832' %}
+{% set ingress_lossless_pool_xoff  =  '2965504' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '45432832' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_dynamic.json.j2
new file mode 100644
index 000000000000..ac50755abbcb
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/buffers_dynamic.json.j2
@@ -0,0 +1,17 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't0' %}
+{%- set dynamic_mode = 'true' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..66cab04d2c42
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN4700-C128/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/port_config.ini
new file mode 100644
index 000000000000..bd24d40599fe
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/port_config.ini
@@ -0,0 +1,113 @@
+# name         lanes              alias     index    speed
+Ethernet0      0                  etp1a     1        25000
+Ethernet1      1                  etp1b     1        25000
+Ethernet2      2                  etp1c     1        25000
+Ethernet3      3                  etp1d     1        25000
+Ethernet8      8                  etp2a     2        25000
+Ethernet9      9                  etp2b     2        25000
+Ethernet10     10                 etp2c     2        25000
+Ethernet11     11                 etp2d     2        25000
+Ethernet16     16                 etp3a     3        25000
+Ethernet17     17                 etp3b     3        25000
+Ethernet18     18                 etp3c     3        25000
+Ethernet19     19                 etp3d     3        25000
+Ethernet24     24                 etp4a     4        25000
+Ethernet25     25                 etp4b     4        25000
+Ethernet26     26                 etp4c     4        25000
+Ethernet27     27                 etp4d     4        25000
+Ethernet32     32                 etp5a     5        25000
+Ethernet33     33                 etp5b     5        25000
+Ethernet34     34                 etp5c     5        25000
+Ethernet35     35                 etp5d     5        25000
+Ethernet40     40                 etp6a     6        25000
+Ethernet41     41                 etp6b     6        25000
+Ethernet42     42                 etp6c     6        25000
+Ethernet43     43                 etp6d     6        25000
+Ethernet48     48                 etp7a     7        25000
+Ethernet49     49                 etp7b     7        25000
+Ethernet50     50                 etp7c     7        25000
+Ethernet51     51                 etp7d     7        25000
+Ethernet56     56                 etp8a     8        25000
+Ethernet57     57                 etp8b     8        25000
+Ethernet58     58                 etp8c     8        25000
+Ethernet59     59                 etp8d     8        25000
+Ethernet64     64                 etp9a     9        25000
+Ethernet65     65                 etp9b     9        25000
+Ethernet66     66                 etp9c     9        25000
+Ethernet67     67                 etp9d     9        25000
+Ethernet72     72                 etp10a    10       25000
+Ethernet73     73                 etp10b    10       25000
+Ethernet74     74                 etp10c    10       25000
+Ethernet75     75                 etp10d    10       25000
+Ethernet80     80                 etp11a    11       25000
+Ethernet81     81                 etp11b    11       25000
+Ethernet82     82                 etp11c    11       25000
+Ethernet83     83                 etp11d    11       25000
+Ethernet88     88                 etp12a    12       25000
+Ethernet89     89                 etp12b    12       25000
+Ethernet90     90                 etp12c    12       25000
+Ethernet91     91                 etp12d    12       25000
+Ethernet96     96                 etp13a    13       25000
+Ethernet97     97                 etp13b    13       25000
+Ethernet98     98                 etp13c    13       25000
+Ethernet99     99                 etp13d    13       25000
+Ethernet104    104                etp14a    14       25000
+Ethernet105    105                etp14b    14       25000
+Ethernet106    106                etp14c    14       25000
+Ethernet107    107                etp14d    14       25000
+Ethernet112    112                etp15a    15       25000
+Ethernet113    113                etp15b    15       25000
+Ethernet114    114                etp15c    15       25000
+Ethernet115    115                etp15d    15       25000
+Ethernet120    120                etp16a    16       25000
+Ethernet121    121                etp16b    16       25000
+Ethernet122    122                etp16c    16       25000
+Ethernet123    123                etp16d    16       25000
+Ethernet128    128                etp17a    17       25000
+Ethernet129    129                etp17b    17       25000
+Ethernet130    130                etp17c    17       25000
+Ethernet131    131                etp17d    17       25000
+Ethernet136    136                etp18a    18       25000
+Ethernet137    137                etp18b    18       25000
+Ethernet138    138                etp18c    18       25000
+Ethernet139    139                etp18d    18       25000
+Ethernet144    144                etp19a    19       25000
+Ethernet145    145                etp19b    19       25000
+Ethernet146    146                etp19c    19       25000
+Ethernet147    147                etp19d    19       25000
+Ethernet152    152                etp20a    20       25000
+Ethernet153    153                etp20b    20       25000
+Ethernet154    154                etp20c    20       25000
+Ethernet155    155                etp20d    20       25000
+Ethernet160    160                etp21a    21       25000
+Ethernet161    161                etp21b    21       25000
+Ethernet162    162                etp21c    21       25000
+Ethernet163    163                etp21d    21       25000
+Ethernet168    168                etp22a    22       25000
+Ethernet169    169                etp22b    22       25000
+Ethernet170    170                etp22c    22       25000
+Ethernet171    171                etp22d    22       25000
+Ethernet176    176                etp23a    23       25000
+Ethernet177    177                etp23b    23       25000
+Ethernet178    178                etp23c    23       25000
+Ethernet179    179                etp23d    23       25000
+Ethernet184    184                etp24a    24       25000
+Ethernet185    185                etp24b    24       25000
+Ethernet186    186                etp24c    24       25000
+Ethernet187    187                etp24d    24       25000
+Ethernet192    192,193,194,195    etp25a    25       100000
+Ethernet196    196,197,198,199    etp25b    25       100000
+Ethernet200    200,201,202,203    etp26a    26       100000
+Ethernet204    204,205,206,207    etp26b    26       100000
+Ethernet208    208,209,210,211    etp27a    27       100000
+Ethernet212    212,213,214,215    etp27b    27       100000
+Ethernet216    216,217,218,219    etp28a    28       100000
+Ethernet220    220,221,222,223    etp28b    28       100000
+Ethernet224    224,225,226,227    etp29a    29       200000
+Ethernet228    228,229,230,231    etp29b    29       200000
+Ethernet232    232,233,234,235    etp30a    30       200000
+Ethernet236    236,237,238,239    etp30b    30       200000
+Ethernet240    240,241,242,243    etp31a    31       200000
+Ethernet244    244,245,246,247    etp31b    31       200000
+Ethernet248    248,249,250,251    etp32a    32       200000
+Ethernet252    252,253,254,255    etp32b    32       200000
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/qos.json.j2
new file mode 120000
index 000000000000..eccf286dc879
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile
new file mode 100644
index 000000000000..377656b4ca8f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile
@@ -0,0 +1,3 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x200g_8x100g_96x25g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai_4700_8x200g_8x100g_96x25g.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai_4700_8x200g_8x100g_96x25g.xml
new file mode 100644
index 000000000000..6b16851934dc
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai_4700_8x200g_8x100g_96x25g.xml
@@ -0,0 +1,277 @@
+<root>
+    <platform_info type="4700">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>32</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>4</width>
+                <module>17</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>16</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>4</width>
+                <module>23</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>4</width>
+                <module>22</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>8</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>8</width>
+                <module>28</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>8</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>8</width>
+                <module>30</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>8</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>8</width>
+                <module>24</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>8</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>8</width>
+                <module>26</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>4</width>
+                <module>14</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>4</width>
+                <module>15</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>4</width>
+                <module>12</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>4</width>
+                <module>13</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>4</width>
+                <module>10</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>4</width>
+                <module>11</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>4</width>
+                <module>8</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>4</width>
+                <module>9</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>4</width>
+                <module>2</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>4</width>
+                <module>3</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>4</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>3</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>4</width>
+                <module>1</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>4</width>
+                <module>6</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>4</width>
+                <module>7</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>4</width>
+                <module>4</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>4</width>
+                <module>5</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>100</port-speed>
+                <split>4</split>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From 458f583e3b8c326fa8b319700ad6560da42e5ff7 Mon Sep 17 00:00:00 2001
From: Vivek <vivekreddykarri98@gmail.com>
Date: Thu, 13 Oct 2022 06:52:59 -0700
Subject: [PATCH 1418/1674] [202012] [Mellanox] [SKU] Mellanox-SN4700-V48C32
 SKU added (#12150)

New SKU for MSN-4700 Platform i.e. Mellanox-SN4700-C128

Requirements:
* Breakout: Port 1-32: 4x100G
* Downlinks: 120 (1-30)
* Uplinks: 8 (31-32)
* Shared Headroom: Enabled
* Over Subscribe Ratio: 1:8
* Default Topology: T2
* Default Cable Length for T2: 1500m
* QoS params: The default ones defined in qos_config.j2 will be applied
* Small Packet Percentage: Used 50% for traditional buffer model Note: For dynamic model, the value defined in LOSSLESS_TRAFFIC_PATTERN|AZURE|small_packet_percentage is used

Additional Details:
Switch Type has to be programmed as SpineRouter through config_db.json in DEVICE_METADATA|localhost|type field for the buffer values & cable lengths defined in the buffers_defaults_t2.j2 to apply on the device
Cable Lengths Used for generating buffer_defaults_{t0,t1,t2}.j2

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 .../Mellanox-SN4700-V48C32/buffers.json.j2    |  16 +
 .../buffers_defaults_objects.j2               |   1 +
 .../buffers_defaults_t0.j2                    |  40 +++
 .../buffers_defaults_t1.j2                    |  46 +++
 .../buffers_dynamic.json.j2                   |  17 ++
 .../pg_profile_lookup.ini                     |   1 +
 .../Mellanox-SN4700-V48C32/port_config.ini    |  81 +++++
 .../Mellanox-SN4700-V48C32/qos.json.j2        |   1 +
 .../Mellanox-SN4700-V48C32/sai.profile        |   3 +
 .../sai_4700_32x100g_48x200g.xml              | 277 ++++++++++++++++++
 10 files changed, 483 insertions(+)
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_objects.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t0.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t1.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_dynamic.json.j2
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/pg_profile_lookup.ini
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/port_config.ini
 create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/qos.json.j2
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile
 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai_4700_32x100g_48x200g.xml

diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers.json.j2
new file mode 100644
index 000000000000..44f0d97ce37d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers.json.j2
@@ -0,0 +1,16 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_objects.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_objects.j2
new file mode 120000
index 000000000000..c01aebb7ae12
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_objects.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..841444e9aa94
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t0.j2
@@ -0,0 +1,40 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '50208768' %}
+{% set ingress_lossless_pool_xoff  =  '1662976' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '50208768' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..03f41430d73b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '300m' %}
+{%-set ports2cable = {
+            'torrouter_server'       : '5m',
+            'leafrouter_torrouter'   : '300m',
+            'spinerouter_leafrouter' : '1500m'
+       }
+-%}
+{% set ingress_lossless_pool_size =  '46780416' %}
+{% set ingress_lossless_pool_xoff  =  '5091328' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '46780416' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_dynamic.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_dynamic.json.j2
new file mode 100644
index 000000000000..0829b960de18
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/buffers_dynamic.json.j2
@@ -0,0 +1,17 @@
+
+{#
+    Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't1' %}
+{%- set dynamic_mode = 'true' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..66cab04d2c42
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../Mellanox-SN4700-C128/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/port_config.ini
new file mode 100644
index 000000000000..8fdb867ef848
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/port_config.ini
@@ -0,0 +1,81 @@
+# name         lanes              alias     index    speed
+Ethernet0      0,1,2,3            etp1a     1        200000
+Ethernet4      4,5,6,7            etp1b     1        200000
+Ethernet8      8,9,10,11          etp2a     2        200000
+Ethernet12     12,13,14,15        etp2b     2        200000
+Ethernet16     16,17,18,19        etp3a     3        200000
+Ethernet20     20,21,22,23        etp3b     3        200000
+Ethernet24     24,25,26,27        etp4a     4        200000
+Ethernet28     28,29,30,31        etp4b     4        200000
+Ethernet32     32,33,34,35        etp5a     5        200000
+Ethernet36     36,37,38,39        etp5b     5        200000
+Ethernet40     40,41,42,43        etp6a     6        200000
+Ethernet44     44,45,46,47        etp6b     6        200000
+Ethernet48     48,49,50,51        etp7a     7        200000
+Ethernet52     52,53,54,55        etp7b     7        200000
+Ethernet56     56,57,58,59        etp8a     8        200000
+Ethernet60     60,61,62,63        etp8b     8        200000
+Ethernet64     64,65,66,67        etp9a     9        200000
+Ethernet68     68,69,70,71        etp9b     9        200000
+Ethernet72     72,73,74,75        etp10a    10       200000
+Ethernet76     76,77,78,79        etp10b    10       200000
+Ethernet80     80,81,82,83        etp11a    11       200000
+Ethernet84     84,85,86,87        etp11b    11       200000
+Ethernet88     88,89,90,91        etp12a    12       200000
+Ethernet92     92,93,94,95        etp12b    12       200000
+Ethernet96     96,97,98,99        etp13a    13       200000
+Ethernet100    100,101,102,103    etp13b    13       200000
+Ethernet104    104,105,106,107    etp14a    14       200000
+Ethernet108    108,109,110,111    etp14b    14       200000
+Ethernet112    112,113,114,115    etp15a    15       200000
+Ethernet116    116,117,118,119    etp15b    15       200000
+Ethernet120    120,121,122,123    etp16a    16       200000
+Ethernet124    124,125,126,127    etp16b    16       200000
+Ethernet128    128,129,130,131    etp17a    17       200000
+Ethernet132    132,133,134,135    etp17b    17       200000
+Ethernet136    136,137,138,139    etp18a    18       200000
+Ethernet140    140,141,142,143    etp18b    18       200000
+Ethernet144    144,145,146,147    etp19a    19       200000
+Ethernet148    148,149,150,151    etp19b    19       200000
+Ethernet152    152,153,154,155    etp20a    20       200000
+Ethernet156    156,157,158,159    etp20b    20       200000
+Ethernet160    160,161,162,163    etp21a    21       200000
+Ethernet164    164,165,166,167    etp21b    21       200000
+Ethernet168    168,169,170,171    etp22a    22       200000
+Ethernet172    172,173,174,175    etp22b    22       200000
+Ethernet176    176,177,178,179    etp23a    23       200000
+Ethernet180    180,181,182,183    etp23b    23       200000
+Ethernet184    184,185,186,187    etp24a    24       200000
+Ethernet188    188,189,190,191    etp24b    24       200000
+Ethernet192    192,193            etp25a    25       100000
+Ethernet194    194,195            etp25b    25       100000
+Ethernet196    196,197            etp25c    25       100000
+Ethernet198    198,199            etp25d    25       100000
+Ethernet200    200,201            etp26a    26       100000
+Ethernet202    202,203            etp26b    26       100000
+Ethernet204    204,205            etp26c    26       100000
+Ethernet206    206,207            etp26d    26       100000
+Ethernet208    208,209            etp27a    27       100000
+Ethernet210    210,211            etp27b    27       100000
+Ethernet212    212,213            etp27c    27       100000
+Ethernet214    214,215            etp27d    27       100000
+Ethernet216    216,217            etp28a    28       100000
+Ethernet218    218,219            etp28b    28       100000
+Ethernet220    220,221            etp28c    28       100000
+Ethernet222    222,223            etp28d    28       100000
+Ethernet224    224,225            etp29a    29       100000
+Ethernet226    226,227            etp29b    29       100000
+Ethernet228    228,229            etp29c    29       100000
+Ethernet230    230,231            etp29d    29       100000
+Ethernet232    232,233            etp30a    30       100000
+Ethernet234    234,235            etp30b    30       100000
+Ethernet236    236,237            etp30c    30       100000
+Ethernet238    238,239            etp30d    30       100000
+Ethernet240    240,241            etp31a    31       100000
+Ethernet242    242,243            etp31b    31       100000
+Ethernet244    244,245            etp31c    31       100000
+Ethernet246    246,247            etp31d    31       100000
+Ethernet248    248,249            etp32a    32       100000
+Ethernet250    250,251            etp32b    32       100000
+Ethernet252    252,253            etp32c    32       100000
+Ethernet254    254,255            etp32d    32       100000
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/qos.json.j2
new file mode 120000
index 000000000000..eccf286dc879
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/qos.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile
new file mode 100644
index 000000000000..42518df9d9e2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile
@@ -0,0 +1,3 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_32x100g_48x200g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai_4700_32x100g_48x200g.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai_4700_32x100g_48x200g.xml
new file mode 100644
index 000000000000..fd382f8bd93e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai_4700_32x100g_48x200g.xml
@@ -0,0 +1,277 @@
+<root>
+    <platform_info type="4700">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>32</number-of-physical-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>8</width>
+                <module>17</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>8</width>
+                <module>16</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>8</width>
+                <module>19</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>8</width>
+                <module>18</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>8</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>8</width>
+                <module>20</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>8</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>8</width>
+                <module>22</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>8</width>
+                <module>29</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>8</width>
+                <module>28</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>8</width>
+                <module>31</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>8</width>
+                <module>30</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>8</width>
+                <module>25</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>8</width>
+                <module>24</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>8</width>
+                <module>27</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>8</width>
+                <module>26</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>1536</port-speed>
+                <split>4</split>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>8</width>
+                <module>14</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>8</width>
+                <module>15</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>8</width>
+                <module>12</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>8</width>
+                <module>13</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>8</width>
+                <module>10</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>8</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>8</width>
+                <module>8</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>8</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>8</width>
+                <module>2</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>8</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>8</width>
+                <module>0</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>1</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>8</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>8</width>
+                <module>6</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>8</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>8</width>
+                <module>4</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>8</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

From 2955a8dc72d528d75ff8906cfcc0511864009c2c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:30:37 +0800
Subject: [PATCH 1419/1674] [202012] Change submodule path from Azure to
 sonic-net (#12312)

Why I did it
Change the path of sonic submodules that point to "Azure" to point to "sonic-net"

How I did it
Replace "Azure" with "sonic-net" on all relevant paths of sonic submodules
---
 .gitmodules                            | 32 +++++++++++++-------------
 files/image_config/environment/motd    |  2 +-
 platform/vs/sonic-gns3a.sh             |  4 ++--
 src/sonic-host-services-data/README.md |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 65ecc37dd7b8..c5c1279a1b93 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/Azure/sonic-swss-common
+	url = https://github.com/sonic-net/sonic-swss-common
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
-	url = https://github.com/Azure/sonic-linux-kernel
+	url = https://github.com/sonic-net/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/Azure/sonic-sairedis
+	url = https://github.com/sonic-net/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/Azure/sonic-swss
+	url = https://github.com/sonic-net/sonic-swss
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -18,33 +18,33 @@
 	url = https://github.com/p4lang/p4-hlir
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
-	url = https://github.com/Azure/sonic-dbsyncd
+	url = https://github.com/sonic-net/sonic-dbsyncd
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
-	url = https://github.com/Azure/sonic-py-swsssdk.git
+	url = https://github.com/sonic-net/sonic-py-swsssdk.git
 [submodule "src/sonic-snmpagent"]
 	path = src/sonic-snmpagent
-	url = https://github.com/Azure/sonic-snmpagent
+	url = https://github.com/sonic-net/sonic-snmpagent
 [submodule "src/ptf"]
 	path = src/ptf
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
-	url = https://github.com/Azure/sonic-utilities
+	url = https://github.com/sonic-net/sonic-utilities
 	branch = 202012
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
-	url = https://github.com/Azure/sonic-platform-common
+	url = https://github.com/sonic-net/sonic-platform-common
 	branch = 202012
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/Azure/sonic-platform-daemons
+	url = https://github.com/sonic-net/sonic-platform-daemons
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
-	url = https://github.com/Azure/sonic-frr.git
+	url = https://github.com/sonic-net/sonic-frr.git
 	branch = frr/7.5
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
@@ -69,7 +69,7 @@
 	url = https://github.com/Mellanox/SAI-Implementation
 [submodule "src/sonic-mgmt-framework"]
 	path = src/sonic-mgmt-framework
-	url = https://github.com/Azure/sonic-mgmt-framework
+	url = https://github.com/sonic-net/sonic-mgmt-framework
 [submodule "src/sonic-telemetry"]
 	path = src/sonic-telemetry
 	url = https://github.com/sonic-net/sonic-gnmi
@@ -78,17 +78,17 @@
 	url = https://github.com/Mellanox/Switch-SDK-drivers
 [submodule "src/sonic-ztp"]
 	path = src/sonic-ztp
-	url = https://github.com/Azure/sonic-ztp
+	url = https://github.com/sonic-net/sonic-ztp
 [submodule "src/sonic-restapi"]
 	path = src/sonic-restapi
-	url = https://github.com/Azure/sonic-restapi.git
+	url = https://github.com/sonic-net/sonic-restapi.git
 	branch = master
 [submodule "src/sonic-mgmt-common"]
 	path = src/sonic-mgmt-common
-	url = https://github.com/Azure/sonic-mgmt-common.git
+	url = https://github.com/sonic-net/sonic-mgmt-common.git
 [submodule "src/linkmgrd"]
 	path = src/linkmgrd
-	url = https://github.com/Azure/sonic-linkmgrd.git
+	url = https://github.com/sonic-net/sonic-linkmgrd.git
 	branch = 202012
 [submodule "src/dhcprelay"]
 	path = src/dhcprelay
diff --git a/files/image_config/environment/motd b/files/image_config/environment/motd
index 8562e330fe2c..0d857e5c5f94 100644
--- a/files/image_config/environment/motd
+++ b/files/image_config/environment/motd
@@ -10,5 +10,5 @@ You are on
 Unauthorized access and/or use are prohibited.
 All access and/or use are subject to monitoring.
 
-Help:    http://azure.github.io/SONiC/
+Help:    https://sonic-net.github.io/SONiC/
 
diff --git a/platform/vs/sonic-gns3a.sh b/platform/vs/sonic-gns3a.sh
index 41e39cd8686a..2a772ce5a332 100644
--- a/platform/vs/sonic-gns3a.sh
+++ b/platform/vs/sonic-gns3a.sh
@@ -41,9 +41,9 @@ echo "
     \"category\": \"router\",
     \"description\": \"SONiC Virtual Switch/Router\",
     \"vendor_name\": \"SONiC\",
-    \"vendor_url\": \"https://azure.github.io/SONiC/\",
+    \"vendor_url\": \"https://sonic-net.github.io/SONiC/\",
     \"product_name\": \"SONiC\",
-    \"product_url\": \"https://azure.github.io/SONiC/\",
+    \"product_url\": \"https://sonic-net.github.io/SONiC/\",
     \"registry_version\": 3,
     \"status\": \"experimental\",
     \"maintainer\": \"SONiC\",
diff --git a/src/sonic-host-services-data/README.md b/src/sonic-host-services-data/README.md
index 93af66a83d6b..0b9e714932d2 100644
--- a/src/sonic-host-services-data/README.md
+++ b/src/sonic-host-services-data/README.md
@@ -16,4 +16,4 @@ dpkg-buildpackage -rfakeroot -Tclean
 
 ---
 
-See the [SONiC Website](http://azure.github.io/SONiC/) for more information about the SONiC project.
+See the [SONiC Website](https://sonic-net.github.io/SONiC/) for more information about the SONiC project.

From 479e6eabde00cb9379c8553f6e0f276a0f0f42fe Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 13 Oct 2022 11:18:30 -0700
Subject: [PATCH 1420/1674] [202012][sonic-linkmgrd] submodule update (#12212)

[202012][sonic-linkmgrd] submodule update

commit efee4d5b807887bae14c16a8a297756739fcc17e (HEAD -> 202012, upstream/202012)
Author: Jing Zhang <zhangjing@microsoft.com>
Date:   Mon Oct 3 09:40:55 2022 -0700

    [Active-Standby] fix syslog flood caused by `unkown -> standby` switchovers  (#137)

    Description of PR
    Summary:
    Fixes # (issue)

    This is to fix the syslog flood issue caused by repeated switchovers from unknown to standby. The scenario trigged the issue was when xcvrd timed out toggles requests but was able to probe:
    Linkmgrd toggles to standby
    -> toggles fails, xcvrd writes unknown
    -> linkmgrd probes mux state
    -> xcvrd writes standby
    -> linkmgrd toggles to standby (previous mux state was unknown, switching to match)
    -> toggles fails, xcvrd writes unknown
    -> ... ...

    sign-off: Jing Zhang zhangjing@microsoft.com

commit d4de3d31db6512b045c050533cd9e11a92522916
Author: Jing Zhang <zhangjing@microsoft.com>
Date:   Tue Sep 27 10:36:59 2022 -0700

    [202012][Cherry-pick] Post switchover reasons to STATE DB (#138)

    Description of PR
    Summary:
    Fixes # (issue)

    Cherry-pick conflict:
    ea68e8c Jing Zhang Wed Sep 21 10:52:18 2022 -0700 Post switchover reasons to STATE DB (#131)
    a5a9f90 Hua Liu Fri Sep 16 09:54:32 2022 +0800 Install libyang to azure pipeline (#132)

    sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index ddbd7926c20a..efee4d5b8078 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit ddbd7926c20a007f5c3fb3d8b6758c6664afb0f0
+Subproject commit efee4d5b807887bae14c16a8a297756739fcc17e

From bb2d0986e28c7fec0e58e8d2e998962bd4840125 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 14 Oct 2022 22:02:13 +0800
Subject: [PATCH 1421/1674] [ci/build]: Upgrade SONiC package versions (#12407)

---
 .../build/build-sonic-slave-buster/versions-git      |  4 ++--
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  6 +++---
 .../docker-config-engine-buster/versions-deb-buster  |  1 -
 .../versions-deb-buster-arm64                        |  1 -
 .../versions-deb-buster-armhf                        |  1 -
 .../dockers/docker-syncd-brcm/versions-deb-buster    |  1 -
 .../dockers/sonic-slave-buster/versions-deb-buster   |  2 --
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-py3         |  2 +-
 11 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 7e32b79c50ec..1fef42531cce 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,11 +3,11 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
+https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 7793b4dd0353..eaf3853c96e5 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:12da36082ea17cd91307adaf2e91bb631a3fbbf2c92f7ca9545caa91036c1043
+amd64:amd64/debian:buster==sha256:98285d324777f612a82b68a2932c2ca0b1535cc1c9d94ea682a4968a6a2d0b07
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
+amd64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:cb4597c2e5b3f7d54be4927f4f27d8d84d7b1cd5ef6743d4ecd752727a7e0a07
-arm64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
+arm64:arm64v8/debian:buster==sha256:122a0342878607a1a6c566db7a57e86504c96ce169f809ad09dbc98ceb5bf791
+arm64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:94d59fccce5b8617ff43a12549c046133e0310497d742d3ad9add1755297ba69
-armhf:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb
+armhf:arm32v7/debian:buster==sha256:97247fd48228fc9f8b819051bb4d53ace1e470d33f2efede76f190fe01ab867a
+armhf:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 9a812735889e..718cb6e8eae1 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,11 +9,11 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf
+https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
 https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 0520eec0c0a7..75045d4700c4 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -15,7 +15,6 @@ gcc-8==8.3.0-6
 libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
-libbz2-1.0==1.0.6-9.2~deb10u2
 libc-dev-bin==2.28-10+deb10u1
 libc6-dev==2.28-10+deb10u1
 libcc1-0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 832fd7a2e36d..1d7724fcece7 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 869dd6106476..bd7943b727a2 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
-zlib1g==1:1.2.11.dfsg-1+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 8e7c373e5f16..171a8cee986f 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -33,5 +33,4 @@ syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-zlib1g==1:1.2.11.dfsg-1+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 30cd9227e22e..d1cdf820ff79 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -324,7 +324,6 @@ libbs2b0==3.1.0+dfsg-2.2
 libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
-libbz2-1.0==1.0.6-9.2~deb10u2
 libbz2-dev==1.0.6-9.2~deb10u2
 libc-ares-dev==1.14.0-1+deb10u1
 libc-ares2==1.14.0-1+deb10u1
@@ -1731,5 +1730,4 @@ xtrans-dev==1.3.5-1
 xxd==2:8.1.0875-5+deb10u2
 xz-utils==5.2.4-1+deb10u1
 zip==3.0-11+b1
-zlib1g==1:1.2.11.dfsg-1+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 531188e454e1..a379ebe4d4e3 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 531188e454e1..a379ebe4d4e3 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index dc65acb84617..c350c528c990 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.9.24
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==38.0.2
+cryptography==38.0.1
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From 678edcb90f160ee1985361159620805346ee8202 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 16 Oct 2022 21:21:35 +0800
Subject: [PATCH 1422/1674] [ci/build]: Upgrade SONiC package versions (#12417)

---
 files/build/versions/default/versions-git                     | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 718cb6e8eae1..dd925b7e775c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index a379ebe4d4e3..8674e4b1e593 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index a379ebe4d4e3..8674e4b1e593 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From a00773a6ec01c48fea8b6ebade85494121f7d4c1 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 18 Oct 2022 13:53:43 +0800
Subject: [PATCH 1423/1674] [ci] Update docker sonic slave pipeline to build
 slave base docker (#11908) (#12405)

* [ci] Update docker sonic slave pipeline to build slave base docker
---
 .../docker-sonic-slave-template.yml           | 106 ------------------
 .azure-pipelines/docker-sonic-slave.yml       | 105 ++++++-----------
 2 files changed, 37 insertions(+), 174 deletions(-)
 delete mode 100644 .azure-pipelines/docker-sonic-slave-template.yml

diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
deleted file mode 100644
index 4481818c37d4..000000000000
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
-# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
-resources:
-  repositories:
-  - repository: buildimage
-    type: github
-    name: sonic-net/sonic-buildimage
-    ref: master
-    endpoint: sonic-net
-
-parameters:
-- name: arch
-  type: string
-  values:
-  - amd64
-  - armhf
-  - arm64
-- name: dist
-  type: string
-  values:
-  - bullseye
-  - buster
-  - stretch
-  - jessie
-- name: registry_url
-  type: string
-  default: sonicdev-microsoft.azurecr.io
-- name: registry_conn
-  type: string
-  default: sonicdev
-- name: pool
-  type: string
-  default: sonicbld
-  values:
-  - sonicbld
-  - sonicbld-arm64
-  - sonicbld-armhf
-
-jobs:
-- job: Build_${{ parameters.dist }}_${{ parameters.arch }}
-  timeoutInMinutes: 360
-  pool: ${{ parameters.pool }}
-  steps:
-  - template: cleanup.yml
-  - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
-  - checkout: self
-    clean: true
-    submodules: recursive
-  - bash: |
-      set -ex
-
-      SLAVE_DIR=sonic-slave-${{ parameters.dist }}
-      if [ x${{ parameters.pool }} == x"sonicbld" ]; then
-        if [ x${{ parameters.arch }} == x"amd64" ]; then
-          SLAVE_BASE_IMAGE=${SLAVE_DIR}
-          SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}
-        elif [ x${{ parameters.pool }} == x"sonicbld" ]; then
-          SLAVE_BASE_IMAGE=${SLAVE_DIR}-march-${{ parameters.arch }}
-          SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-march-${{ parameters.arch }}
-        fi
-      elif [[ x${{ parameters.pool }} == x"sonicbld-armhf" && x${{ parameters.arch }} == x"armhf" ]]; then
-        SLAVE_BASE_IMAGE=${SLAVE_DIR}
-        SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-armhf
-      elif [[ x${{ parameters.pool }} == x"sonicbld-arm64" && x${{ parameters.arch }} == x"arm64" ]]; then
-        SLAVE_BASE_IMAGE=${SLAVE_DIR}
-        SLAVE_BASE_IMAGE_UPLOAD=${SLAVE_DIR}-arm64
-      else
-        echo "do not support build ${{ parameters.arch }} on ${{ parameters.pool }}"
-        exit 1
-      fi
-
-      if [ x"$(Build.SourceBranchName)" == x"202012" ]; then
-        BUILD_OPTIONS = 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
-      fi
-
-      tmpfile=$(mktemp)
-
-      echo ${{ parameters.arch }} > .arch
-
-      DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} $(BUILD_OPTIONS) make -f Makefile.work sonic-slave-build | tee $tmpfile
-      SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
-      SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
-
-      mkdir -p target
-
-      docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE_UPLOAD:latest
-      docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE_UPLOAD:$SLAVE_BASE_TAG
-      set +x
-      echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_IMAGE]$SLAVE_BASE_IMAGE_UPLOAD"
-      echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_TAG]$SLAVE_BASE_TAG"
-    env:
-      REGISTRY_SERVER: ${{ parameters.registry_url }}
-    displayName: Build sonic-slave-${{ parameters.dist }}-${{ parameters.arch }}
-
-  - task: Docker@2
-    displayName: Upload image
-    inputs:
-      containerRegistry: ${{ parameters.registry_conn }}
-      repository: $(VARIABLE_SLAVE_BASE_IMAGE)
-      command: push
-      tags: |
-        $(VARIABLE_SLAVE_BASE_TAG)
-        latest
diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index c8209c516392..abb785c9e422 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -3,25 +3,37 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 # Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
 
 schedules:
-- cron: "0 8 * * *"
+- cron: "0 0 * * 0"
+  displayName: Weekly build
   branches:
     include:
-    - 202012
+    - master
+    - 202???
   always: true
 
-trigger: none
-pr:
+pr: none
+trigger:
+  batch: true
   branches:
     include:
     - master
+    - 202???
   paths:
     include:
-    - sonic-slave-jessie
-    - sonic-slave-stretch
-    - sonic-slave-buster
+    - sonic-slave-*
     - src/sonic-build-hooks
+    - files/build/versions
+    - Makefile
+    - Makefile.work
 
 parameters:
 - name: 'arches'
@@ -43,70 +55,27 @@ parameters:
   type: string
   default: sonicdev
 
-variables:
-- ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-  - name: BUILD_OPTIONS
-    value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
-
 stages:
 - stage: Build
   jobs:
   - ${{ each dist in parameters.dists }}:
     - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
       - ${{ each arch in parameters.arches }}:
-        - job: Build_${{ dist }}_${{ arch }}
-          timeoutInMinutes: 360
-          pool: sonicbld
-          steps:
-          - template: cleanup.yml
-          - checkout: self
-            clean: true
-            submodules: recursive
-          - bash: |
-              set -ex
-
-              containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
-              if [ ! -z "$containers" ]; then
-                docker container kill $containers || true
-                sleep 5
-              fi
-              images=$(docker images 'sonic-slave-*' -a -q)
-              if [ ! -z "$images" ]; then
-                docker rmi -f $images
-              fi
-
-              SLAVE_DIR=sonic-slave-${{ dist }}
-              if [ x${{ arch }} == x"amd64" ]; then
-                SLAVE_BASE_IMAGE=${SLAVE_DIR}
-              else
-                SLAVE_BASE_IMAGE=${SLAVE_DIR}-march-${{ arch }}
-              fi
-
-              tmpfile=$(mktemp)
-
-              echo ${{ arch }} > .arch
-
-              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} $(BUILD_OPTIONS) make -f Makefile.work sonic-slave-build | tee $tmpfile
-              SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
-              SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
-
-              mkdir -p target
-
-              docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE:latest
-              docker tag $SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG $REGISTRY_SERVER/$SLAVE_BASE_IMAGE:$SLAVE_BASE_TAG
-              set +x
-              echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_IMAGE]$SLAVE_BASE_IMAGE"
-              echo "##vso[task.setvariable variable=VARIABLE_SLAVE_BASE_TAG]$SLAVE_BASE_TAG"
-            env:
-              REGISTRY_SERVER: ${{ parameters.registry_url }}
-            displayName: Build sonic-slave-${{ dist }}-${{ arch }}
-
-          - task: Docker@2
-            displayName: Upload image
-            inputs:
-              containerRegistry: ${{ parameters.registry_conn }}
-              repository: $(VARIABLE_SLAVE_BASE_IMAGE)
-              command: push
-              tags: |
-                $(VARIABLE_SLAVE_BASE_TAG)
-                latest
+        - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
+          parameters:
+            pool: sonicbld
+            arch: ${{ arch }}
+            dist: ${{ dist }}
+- stage: Build_march
+  dependsOn: []
+  jobs:
+  - ${{ each dist in parameters.dists }}:
+    - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
+      - ${{ each arch in parameters.arches }}:
+        - ${{ if ne(arch, 'amd64') }}:
+          - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
+            parameters:
+              pool: sonicbld-${{ arch }}
+              arch: ${{ arch }}
+              dist: ${{ dist }}
+              march: march_

From 08d1d60ccb6604a3d9ba51684e0e63e478d96abe Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Wed, 19 Oct 2022 12:18:48 +0800
Subject: [PATCH 1424/1674] Pick up fixes and make up BRCM SAI version to
 4.3.7.1-3 (#12439)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f424130a0d09..26840a6474cc 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index b47608bd0a7d..2129a93ef25a 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.7.1-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-2_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.1-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 1999d9a2e13b0e9fa740e7189a17fe9967b7e886 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:04:38 -0700
Subject: [PATCH 1425/1674] Advance dhcprelay submodule (#12215)

---
 src/dhcprelay | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dhcprelay b/src/dhcprelay
index 40ad1676e4d0..b3cdec994a11 160000
--- a/src/dhcprelay
+++ b/src/dhcprelay
@@ -1 +1 @@
-Subproject commit 40ad1676e4d07c3eec2153017997bb04b33a94c8
+Subproject commit b3cdec994a110481322406cd66eb9b0c147864b8

From 8e7a491f3bbbf00f551fb0aa581d422f35a2533f Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Wed, 19 Oct 2022 12:26:50 +0800
Subject: [PATCH 1426/1674] Enable to cancel pipeline jobs during checkout code
 and tests (#12436)

co-authorized by: jianquanye@microsoft.com

Why I did it
Now, checkout code step and KVM test job can't be cancelled even though the whole build is cancelled.
That's because by using Azure Pipeline Conditions, we customized the running condition, and we need to react to the Cancel action explicitly by asserting 'succeeded'
https://learn.microsoft.com/en-us/azure/devops/pipelines/process/expressions?view=azure-devops#succeeded
https://learn.microsoft.com/en-us/azure/devops/pipelines/process/conditions?view=azure-devops&tabs=yaml#ive-got-a-conditional-step-that-runs-even-when-a-job-is-canceled-how-do-i-manage-to-cancel-all-jobs-at-once

How I did it
Assert 'succeeded' condition explicitly.

How to verify it
Verified by cancelling and rerunning the azure pipeline.
---
 .azure-pipelines/azure-pipelines-image-template.yml | 2 +-
 azure-pipelines.yml                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 0d8d75f6b7bd..3f34274e49f7 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -36,7 +36,7 @@ jobs:
         displayName: "Set cache options"
       - checkout: self
         submodules: recursive
-        condition: eq(variables.SKIP_CHECKOUT, '') 
+        condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, ''))
         displayName: 'Checkout code'
       - script: |
           BRANCH_NAME=$(Build.SourceBranchName)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e3b04eaac037..190cdcd444c5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -76,7 +76,7 @@ stages:
 
 - stage: Test
   dependsOn: BuildVS
-  condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))
+  condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues')))
   variables:
   - name: inventory
     value: veos_vtb

From d8d0436ed214247f17ddba9dc68f80eeff754c53 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 20 Oct 2022 13:45:41 -0700
Subject: [PATCH 1427/1674] [202012][sonic-linkmgrd] update submodule (#12415)

commit aa8fe6deff466909909430f00598d2dba9490904 (HEAD -> 202012, origin/202012)
Author: Jing Zhang zhangjing@microsoft.com
Date: Tue Oct 11 10:22:02 2022 -0700

[Active-Standby] avoid posting mux metrics event when receiving unsolicited mux state notification  (#142)

Description of PR
Summary:
Fixes # (issue)

This PR is to fix incorrect mux metrics timestamps caused by unsolicited mux state notification.

Sign-off: Jing Zhang zhangjing@microsoft.com
sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index efee4d5b8078..aa8fe6deff46 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit efee4d5b807887bae14c16a8a297756739fcc17e
+Subproject commit aa8fe6deff466909909430f00598d2dba9490904

From d2d25ac5f56a84cdca2577099e83ac7d4bcf30cb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 21 Oct 2022 21:48:16 +0800
Subject: [PATCH 1428/1674] [ci/build]: Upgrade SONiC package versions (#12449)

---
 .../versions-deb-buster                         |  2 +-
 .../build/build-sonic-slave-buster/versions-py3 |  2 +-
 .../build/build-sonic-slave-buster/versions-web |  4 ++--
 .../build-sonic-slave-stretch/versions-web      |  4 ++--
 files/build/versions/default/versions-git       |  2 +-
 files/build/versions/default/versions-web       |  4 +---
 .../versions-deb-buster                         |  5 +++--
 .../docker-orchagent/versions-deb-buster        |  4 ++--
 .../docker-platform-monitor/versions-deb-buster |  4 ++--
 .../dockers/docker-snmp/versions-deb-buster     |  8 ++++----
 .../versions/dockers/docker-snmp/versions-py3   |  2 +-
 .../versions-deb-buster                         |  4 ++--
 .../docker-sonic-mgmt-framework/versions-py3    |  4 ++--
 .../dockers/docker-sonic-vs/versions-deb-buster |  6 +++---
 .../docker-syncd-bfn/versions-deb-buster        |  4 ++--
 .../docker-syncd-brcm/versions-deb-buster       |  6 +++---
 .../docker-syncd-centec-rpc/versions-deb-buster |  4 ++--
 .../docker-syncd-mlnx/versions-deb-buster       |  4 ++--
 .../sonic-slave-buster/versions-deb-buster      | 17 +++++++++--------
 .../dockers/sonic-slave-buster/versions-git     |  2 +-
 .../dockers/sonic-slave-stretch/versions-git    |  2 +-
 .../versions/host-image/versions-deb-buster     | 12 +++++++-----
 .../host-image/versions-deb-buster-arm64        |  5 +++++
 .../host-image/versions-deb-buster-armhf        |  5 +++++
 files/build/versions/host-image/versions-py3    |  2 +-
 25 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index c8238d28b6ac..51a6e3bd1273 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.7.1-2
+libsaibcm==4.3.7.1-3
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 18e62be041b1..403c08582c84 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -8,7 +8,7 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.9.2
+psutil==5.9.3
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 042ad2a28c4d..5cda175c2831 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -28,8 +28,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 3af4598d1516..dc65072f0720 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A23%3A49Z&se=2037-10-08T02%3A23%3A00Z&sr=b&sp=r&sig=tS%2FDMtSSLNZtUsTK0QiV9mHIae7i5mwtWiqy5ZpmOnY%3D==b0c7eb8cc3cb3e40ee567dabd61d32ce
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-2_amd64.deb?sv=2020-04-08&st=2022-10-07T02%3A22%3A15Z&se=2037-10-08T02%3A22%3A00Z&sr=b&sp=r&sig=T2JdAgBr%2BZs29mfFQrA6KHWwkhcGgnv7MgIsml3qTNY%3D==dec5eb1839d50a8932a5c10fbe1be12f
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index dd925b7e775c..c6dd5c43a440 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 26840a6474cc..d94d90f0390f 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==f603a03a9c19dfcff06549da4d65e6ea
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==02e66fef39d18cc683f760a67ccd5d68
+https://deb.nodesource.com/setup_14.x==1114280c0f746528d6722fd50a814f42
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
@@ -50,8 +50,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 75045d4700c4..3959806c2f5f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -15,8 +15,9 @@ gcc-8==8.3.0-6
 libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
 libexpat1-dev==2.2.6-2+deb10u5
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 6c65ba31fe0d..c8d66ccd6b93 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -19,8 +19,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 9484107a3412..86a874a3ea2d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -26,8 +26,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcairo2==1.16.0-4+deb10u1
 libcc1-0==8.3.0-6
 libdatrie1==0.2.12-2
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 98c08afb5d8e..a68f3360febc 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -14,9 +14,9 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc-l10n==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc-l10n==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
@@ -48,7 +48,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 linux-libc-dev==4.19.260-1
-locales==2.28-10+deb10u1
+locales==2.28-10+deb10u2
 make==4.2.1-1.2
 mariadb-common==1:10.3.36-0+deb10u2
 mysql-common==5.8+1.0.5
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index d1092513c883..078a8cd64cb8 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.0.0
-psutil==5.9.2
+psutil==5.9.3
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 9c994335f84e..a9f320b4eef8 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -14,8 +14,8 @@ libasan5==8.3.0-6
 libbabeltrace1==1.5.6-2+deb10u1
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-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
index fac7d3269038..7f9df4a35d60 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.49.1
+grpcio==1.50.0
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==5.0.0
@@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.7
+protobuf==4.21.8
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index cacf7d27d4a2..5f469540255d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -41,8 +41,8 @@ libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdevmapper1.02.1==2:1.02.155-3
 libdouble-conversion1==3.1.0-3
@@ -64,7 +64,7 @@ libisl19==0.20-2
 libitm1==8.3.0-6
 libjson-c3==0.12.1+ds-2+deb10u1
 libjudydebian1==1.0.5-5
-libksba8==1.3.5-2
+libksba8==1.3.5-2+deb10u1
 liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index dd6d71a0dca0..3509874b4b6c 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,8 +1,8 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcurl3-gnutls==7.64.0-4+deb10u3
 libcurl4-gnutls-dev==7.64.0-4+deb10u3
 libgoogle-perftools4==2.7-1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 171a8cee986f..b62704739ae9 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -4,8 +4,8 @@ gdbserver==8.2.1-2+b3
 kmod==26-1
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u4
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.7.1-2
+libsaibcm==4.3.7.1-3
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index b7b067a23dbf..94ad329c3d4e 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -14,8 +14,8 @@ libarchive13==3.3.3-4+deb10u1
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index ad0cb74fea4d..241759d2236f 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -5,8 +5,8 @@ gdbserver==8.2.1-2+b3
 iproute2-dev==1.mlnx.4.5.2320
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index d1cdf820ff79..899fc6068079 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -327,13 +327,14 @@ libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u2
 libc-ares-dev==1.14.0-1+deb10u1
 libc-ares2==1.14.0-1+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc6-dbg==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
-libc6-dev-i386==2.28-10+deb10u1
-libc6-dev-x32==2.28-10+deb10u1
-libc6-i386==2.28-10+deb10u1
-libc6-x32==2.28-10+deb10u1
+libc-dev-bin==2.28-10+deb10u2
+libc6==2.28-10+deb10u2
+libc6-dbg==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
+libc6-dev-i386==2.28-10+deb10u2
+libc6-dev-x32==2.28-10+deb10u2
+libc6-i386==2.28-10+deb10u2
+libc6-x32==2.28-10+deb10u2
 libcaca0==0.99.beta19-2.1
 libcacard0==1:2.6.1-1
 libcaf-openmpi-3==2.4.0-2
@@ -699,7 +700,7 @@ libkpathsea6==2018.20181218.49446-1
 libkrb5-3==1.17-3+deb10u4
 libkrb5-dev==1.17-3+deb10u4
 libkrb5support0==1.17-3+deb10u4
-libksba8==1.3.5-2
+libksba8==1.3.5-2+deb10u1
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 8674e4b1e593..9ad510926bfb 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 8674e4b1e593..9ad510926bfb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==77e64ae61ebda9e20f1eee461149e601c65b0a8f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 1e048d5602d2..274f64d6cd9a 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -91,9 +91,11 @@ libatomic1==8.3.0-6
 libbinutils==2.31.1-16
 libbsd0==0.9.1-2+deb10u1
 libbz2-1.0==1.0.6-9.2~deb10u2
-libc-dev-bin==2.28-10+deb10u1
-libc-l10n==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
+libc-bin==2.28-10+deb10u2
+libc-dev-bin==2.28-10+deb10u2
+libc-l10n==2.28-10+deb10u2
+libc6==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
 libcap2==1:2.25-2
 libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
@@ -148,7 +150,7 @@ libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
 libkrb5-3==1.17-3+deb10u4
 libkrb5support0==1.17-3+deb10u4
-libksba8==1.3.5-2
+libksba8==1.3.5-2+deb10u1
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
@@ -228,7 +230,7 @@ libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
 linux-libc-dev==4.19.260-1
-locales==2.28-10+deb10u1
+locales==2.28-10+deb10u2
 logrotate==3.14.0-4
 lsb-base==10.2019051400
 lsb-release==10.2019051400
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index d616ae172725..6aa689858154 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -4,6 +4,9 @@ curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
+libc-dev-bin==2.28-10+deb10u1
+libc-l10n==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
@@ -15,6 +18,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libksba8==1.3.5-2
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
@@ -22,6 +26,7 @@ libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.249-2
+locales==2.28-10+deb10u1
 pkg-config==0.29-6
 tsingma-bsp==1.0
 unzip==6.0-23+deb10u2
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 054f195c1e7e..63d781dc2916 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -4,6 +4,9 @@ curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
+libc-dev-bin==2.28-10+deb10u1
+libc-l10n==2.28-10+deb10u1
+libc6-dev==2.28-10+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libcurl3-gnutls==7.64.0-4+deb10u2
 libcurl4==7.64.0-4+deb10u2
@@ -15,6 +18,7 @@ libglib2.0-0==2.58.3-2+deb10u3
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libksba8==1.3.5-2
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
@@ -22,6 +26,7 @@ libxslt1-dev==1.1.32-2.2~deb10u1
 libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-armmp==4.19.152-1
 linux-libc-dev==4.19.249-2
+locales==2.28-10+deb10u1
 mrvlprestera==1.0
 pkg-config==0.29-6
 unzip==6.0-23+deb10u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c350c528c990..8774c2833190 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.9.2
+psutil==5.9.3
 ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1

From fb06d3a70c5656fbad480eddbf078b41bee173ec Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 25 Oct 2022 15:45:09 +0800
Subject: [PATCH 1429/1674] [build] Add dependencies for sonic-config-engine to
 block bad PR. (#10770) (#10794)

Add dependencies device/*

From 8ea6ee72151b88077376bfd6ef2a573af03b4495 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:45:28 +0800
Subject: [PATCH 1430/1674] [sonic-slave]: Add gmock for sonic-swss-common
 tests (#8950) (#12461)

Why I did it
Cherry-pick from #8950

Sonic-swss-common requires gmock for staged unit tests

How I did it
Installed dependency in sonic-buster-build docker file

How to verify it
rebuild the build container
---
 sonic-slave-buster/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 8441a53dcad0..f835f59d1e0e 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -254,6 +254,8 @@ RUN apt-get update && apt-get install -y \
 # For gtest
         libgtest-dev \
         cmake \
+# For gmock
+        libgmock-dev \
 # For pam_tacplus build
         autoconf-archive \
 # For iproute2

From 23c274a225aad1c5f59876c8743411c10b8185e2 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Tue, 25 Oct 2022 03:09:16 -0700
Subject: [PATCH 1431/1674] Update cisco-8000 submodule to v0.120 (#12470)

---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 919f75d112da..ec1b03bce73b 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.117
+ref=202012-v0.120

From bafbfb5a263e3d5a5ee286a937c81ca310e28ede Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Wed, 26 Oct 2022 09:52:48 +0800
Subject: [PATCH 1432/1674] Pickup fix and make up BRCM SAI version to
 4.3.7.1-6 (#12486)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 files/build/versions/default/versions-web | 2 ++
 platform/broadcom/sai.mk                  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index d94d90f0390f..e316075b72da 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 2129a93ef25a..791f6703c1a7 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,8 @@
-BRCM_SAI = libsaibcm_4.3.7.1-3_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-3_amd64.deb
+BRCM_SAI = libsaibcm_4.3.7.1-6_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D"
+BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-6_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From f9578d92d0210a859486be11e8a1d034a6bd4dc2 Mon Sep 17 00:00:00 2001
From: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com>
Date: Wed, 26 Oct 2022 11:13:48 +0800
Subject: [PATCH 1433/1674] [202012][LLDPD] fix to port remove and immediately
 create problem (#12467)

Why I did it
Cherry pick #9519.

when we remove a port and add it back immediately - lldp is keep failing
warning message keeps appearing:
[WARN/lldp] unable to send packet on real device for Ethernet4: No such device or address

How I did it
on delete link events it will immediately execute delete without using aggregate events mechanism.

How to verify it
Run autorestart/test_container_autorestart.py in sonic-mgmt repo
Or manual test steps:
sudo config feature autorestart swss disabled
docker exec swss supervisorctl status
docker exec swss kill -SIGKILL 111(orchagent)
docker inspect -f {{.State.Running}} swss => make sure swss is running
docker exec swss supervisorctl start orchagent

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
---
 ...ix-recreate-socket-on-ifindex-change.patch | 82 +++++++++++++++++++
 src/lldpd/patch/series                        |  1 +
 2 files changed, 83 insertions(+)
 create mode 100644 src/lldpd/patch/0012-fix-recreate-socket-on-ifindex-change.patch

diff --git a/src/lldpd/patch/0012-fix-recreate-socket-on-ifindex-change.patch b/src/lldpd/patch/0012-fix-recreate-socket-on-ifindex-change.patch
new file mode 100644
index 000000000000..632abce54919
--- /dev/null
+++ b/src/lldpd/patch/0012-fix-recreate-socket-on-ifindex-change.patch
@@ -0,0 +1,82 @@
+diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
+index a8280c8..a51440a 100644
+--- a/src/daemon/interfaces-linux.c
++++ b/src/daemon/interfaces-linux.c
+@@ -775,7 +775,7 @@ iflinux_handle_bond(struct lldpd *cfg, struct interfaces_device_list *interfaces
+ 			created = 1;
+ 		}
+ 		if (hardware->h_flags) continue;
+-		if (hardware->h_ops != &bond_ops) {
++		if (hardware->h_ops != &bond_ops || hardware->h_ifindex_changed) {
+ 			if (!created) {
+ 				log_debug("interfaces",
+ 				    "bond %s is converted from another type of interface",
+@@ -794,7 +794,7 @@ iflinux_handle_bond(struct lldpd *cfg, struct interfaces_device_list *interfaces
+ 		} else bmaster = hardware->h_data;
+ 		bmaster->index = master->index;
+ 		strlcpy(bmaster->name, master->name, IFNAMSIZ);
+-		if (hardware->h_ops != &bond_ops) {
++		if (hardware->h_ops != &bond_ops || hardware->h_ifindex_changed) {
+ 			if (iface_bond_init(cfg, hardware) != 0) {
+ 				log_warn("interfaces", "unable to initialize %s",
+ 				    hardware->h_ifname);
+diff --git a/src/daemon/interfaces.c b/src/daemon/interfaces.c
+index 3c6c255..58db018 100644
+--- a/src/daemon/interfaces.c
++++ b/src/daemon/interfaces.c
+@@ -623,7 +623,7 @@ interfaces_helper_physical(struct lldpd *cfg,
+ 		}
+ 		if (hardware->h_flags)
+ 			continue;
+-		if (hardware->h_ops != ops) {
++		if (hardware->h_ops != ops || hardware->h_ifindex_changed) {
+ 			if (!created) {
+ 				log_debug("interfaces",
+ 				    "interface %s is converted from another type of interface",
+diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
+index 1d92dd3..f3e82e5 100644
+--- a/src/daemon/lldpd.c
++++ b/src/daemon/lldpd.c
+@@ -147,6 +147,12 @@ lldpd_get_hardware(struct lldpd *cfg, char *name, int index)
+ 	TAILQ_FOREACH(hardware, &cfg->g_hardware, h_entries) {
+ 		if (strcmp(hardware->h_ifname, name) == 0) {
+ 			if (hardware->h_flags == 0) {
++				if (hardware->h_ifindex != 0 &&
++				    hardware->h_ifindex != index) {
++					log_debug("interfaces", "%s changed index: from %d to %d",
++					    hardware->h_ifname, hardware->h_ifindex, index);
++					hardware->h_ifindex_changed = 1;
++				}
+ 				hardware->h_ifindex = index;
+ 				break;
+ 			}
+@@ -392,7 +398,8 @@ lldpd_reset_timer(struct lldpd *cfg)
+ 		}
+ 
+ 		/* Compare with the previous value */
+-		if (hardware->h_lport_previous &&
++		if (!hardware->h_ifindex_changed &&
++		    hardware->h_lport_previous &&
+ 		    output_len == hardware->h_lport_previous_len &&
+ 		    !memcmp(output, hardware->h_lport_previous, output_len)) {
+ 			log_debug("localchassis",
+@@ -402,6 +409,7 @@ lldpd_reset_timer(struct lldpd *cfg)
+ 			log_debug("localchassis",
+ 			    "change detected for port %s, resetting its timer",
+ 			    hardware->h_ifname);
++			hardware->h_ifindex_changed = 0;
+ 			levent_schedule_pdu(hardware);
+ 		}
+ 
+diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
+index f6b03d7..213f306 100644
+--- a/src/lldpd-structs.h
++++ b/src/lldpd-structs.h
+@@ -454,6 +454,7 @@ struct lldpd_hardware {
+ 					     removed if this is left
+ 					     to 0. */
+ 	int			 h_ifindex; /* Interface index, used by SNMP */
++	int			 h_ifindex_changed;  /* Interface index has changed */
+ 	char			 h_ifname[IFNAMSIZ]; /* Should be unique */
+ 	u_int8_t		 h_lladdr[ETHER_ADDR_LEN];
+ 
\ No newline at end of file
diff --git a/src/lldpd/patch/series b/src/lldpd/patch/series
index 32fd4c0ca9a7..d0b9904751cc 100644
--- a/src/lldpd/patch/series
+++ b/src/lldpd/patch/series
@@ -5,3 +5,4 @@
 0007-lib-fix-memory-leak-when-handling-I-O.patch
 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
 0011-fix-med-location-len.patch
+0012-fix-recreate-socket-on-ifindex-change.patch

From 80870439af1f95e32c13774e1e781a66c38d5fb6 Mon Sep 17 00:00:00 2001
From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com>
Date: Thu, 6 Oct 2022 11:29:21 -0400
Subject: [PATCH 1434/1674] [armhf][sonic-installer] Fix the sonic-installer
 install images on armhf platform issue (#12284)

Signed-off-by: mlok <marty.lok@nokia.com>

Signed-off-by: mlok <marty.lok@nokia.com>
---
 platform/marvell-armhf/platform.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 5cf417fa44e4..d39ad66dee91 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -165,11 +165,11 @@ prepare_boot_menu() {
         fw_setenv ${FW_ARG} mtdparts 'mtdparts=spi0.0:4m(boot),-(spi-rootfs)' > /dev/null
     fi
     fw_setenv ${FW_ARG} ubi_sonic_boot_mount_ubi 'ubi part SONIC; ubifsmount ubi0' > /dev/null
-    fw_setenv ${FW_ARG} ubi_sonic_boot_bootargs $BOOTARGS > /dev/null
-    fw_setenv ${FW_ARG} ubi_sonic_boot_load $UBI_LOAD > /dev/null
+    fw_setenv ${FW_ARG} ubi_sonic_boot_bootargs "$BOOTARGS" > /dev/null
+    fw_setenv ${FW_ARG} ubi_sonic_boot_load "$UBI_LOAD" > /dev/null
     fw_setenv ${FW_ARG} sonic_image_1 "$UBIBOOTCMD" > /dev/null
-    fw_setenv ${FW_ARG} ubi_sonic_boot_bootargs_old $BOOTARGS_OLD > /dev/null
-    fw_setenv ${FW_ARG} ubi_sonic_boot_load_old $UBI_LOAD_OLD > /dev/null
+    fw_setenv ${FW_ARG} ubi_sonic_boot_bootargs_old "$BOOTARGS_OLD" > /dev/null
+    fw_setenv ${FW_ARG} ubi_sonic_boot_load_old "$UBI_LOAD_OLD" > /dev/null
     fw_setenv ${FW_ARG} sonic_image_2 "$UBIBOOTCMD_OLD" > /dev/null
     fw_setenv ${FW_ARG} boot_next  'run sonic_image_1'> /dev/null
     fw_setenv ${FW_ARG} bootcmd 'run print_menu; usb start; test -n "$boot_once" && run boot_once; run boot_next' > /dev/null

From 888f6ec15709eb17d79704635d766166307628f8 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Thu, 20 Oct 2022 09:29:57 -0700
Subject: [PATCH 1435/1674] [tunnel_pkt_handler]: Skip nonexistent intfs
 (#12424)

- Skip the interface status check if the interface does not exist. In the future, when the interface is created/comes up this check will be triggered again.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 dockers/docker-orchagent/tunnel_packet_handler.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/tunnel_packet_handler.py b/dockers/docker-orchagent/tunnel_packet_handler.py
index 3d75fdd94a0c..44dbb19fda65 100755
--- a/dockers/docker-orchagent/tunnel_packet_handler.py
+++ b/dockers/docker-orchagent/tunnel_packet_handler.py
@@ -16,6 +16,7 @@
 from sonic_py_common import logger as log
 
 from pyroute2 import IPRoute
+from pyroute2.netlink.exceptions import NetlinkError
 from scapy.layers.inet import IP
 from scapy.layers.inet6 import IPv6
 from scapy.sendrecv import AsyncSniffer
@@ -115,7 +116,14 @@ def get_up_portchannels(self):
         portchannel_intf_names = [name for name, _ in self.portchannel_intfs]
         link_statuses = []
         for intf in portchannel_intf_names:
-            status = self.netlink_api.link("get", ifname=intf)
+            try:
+                status = self.netlink_api.link("get", ifname=intf)
+            except NetlinkError:
+                # Continue if we find a non-existent interface since we don't
+                # need to listen on it while it's down/not created. Once it comes up,
+                # we will get another netlink message which will trigger this check again
+                logger.log_notice("Skipping non-existent interface {}".format(intf))
+                continue
             link_statuses.append(status[0])
         up_portchannels = []
 

From 5d8efe9470be8ccddc0be5f86cd1e8d38e2dc56b Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Fri, 21 Oct 2022 10:33:10 -0700
Subject: [PATCH 1436/1674] Add dhcp6relay dualtor option (#12459)

---
 dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
index cca0b1c4b21a..8f83e05efc7c 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -12,6 +12,9 @@
 {% set _dummy = relay_for_ipv6.update({'flag': False}) %}
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
+{#- Dual ToR Option #}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %}
+
 priority=3
 autostart=false
 autorestart=false

From 2532be43bd4af213ea715300124d3731f9852bb7 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 25 Oct 2022 16:34:07 +0800
Subject: [PATCH 1437/1674] [action] Use github code scan instead of LGTM.
 (#12402)

* [action] Add code scan for python
---
 .github/codeql/codeql-config.yml      |  4 +++
 .github/workflows/codeql-analysis.yml | 43 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 .github/codeql/codeql-config.yml
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000000..2c8b0498f319
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+name: "CodeQL config"
+queries:
+  - uses: security-and-quality
+  - uses: security-extended
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000000..0a8f2dc58682
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,43 @@
+# For more infomation, please visit: https://github.com/github/codeql-action
+
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+  pull_request:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        config-file: ./.github/codeql/codeql-config.yml
+        languages: ${{ matrix.language }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

From d45fe19576e807e192255f2e89adadc0fe11e05b Mon Sep 17 00:00:00 2001
From: Devesh Pathak <54966909+devpatha@users.noreply.github.com>
Date: Tue, 25 Oct 2022 14:51:02 -0700
Subject: [PATCH 1438/1674] Fix to improve hostname handling (#12064)

* Fix to improve hostname handling
If config_db.json is missing hostname entry, hostname-config.sh ends
up deleting existing entry too and hostname changes to default 'localhost'

* default hostname to 'sonic` if missing in config file
---
 files/image_config/hostname/hostname-config.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/files/image_config/hostname/hostname-config.sh b/files/image_config/hostname/hostname-config.sh
index e9f7fc122709..c2a4f1e546ce 100755
--- a/files/image_config/hostname/hostname-config.sh
+++ b/files/image_config/hostname/hostname-config.sh
@@ -3,6 +3,11 @@
 CURRENT_HOSTNAME=`hostname`
 HOSTNAME=`sonic-cfggen -d -v DEVICE_METADATA[\'localhost\'][\'hostname\']`
 
+if [ -z "$HOSTNAME" ] ; then
+       echo "Missing hostname in the config file, setting to default 'sonic'"
+       HOSTNAME='sonic'
+fi
+
 echo $HOSTNAME > /etc/hostname
 hostname -F /etc/hostname
 

From 713747dc0530016324ff08ae0f0ade3605e9b2fd Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 26 Oct 2022 19:58:39 +0800
Subject: [PATCH 1439/1674] [ci/build]: Upgrade SONiC package versions (#12507)

---
 .../build/build-sonic-slave-buster/versions-git      |  2 +-
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  4 ++--
 .../docker-config-engine-buster/versions-deb-buster  |  1 -
 .../dockers/docker-sonic-mgmt-framework/versions-py3 |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster   |  8 ++++----
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  2 +-
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 1fef42531cce..5ff643d48cdd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
-https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
+https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index eaf3853c96e5..a9e2562c5134 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:98285d324777f612a82b68a2932c2ca0b1535cc1c9d94ea682a4968a6a2d0b07
+amd64:amd64/debian:buster==sha256:67bce7e2696486db71ea150f90ab1595dbecca20c5561af85f82428d09029131
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
+amd64:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:122a0342878607a1a6c566db7a57e86504c96ce169f809ad09dbc98ceb5bf791
-arm64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
+arm64:arm64v8/debian:buster==sha256:7606bfe436672f9b9c172527bc61a665066ddf1033505da8aca25ab9ed93cdfd
+arm64:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:97247fd48228fc9f8b819051bb4d53ace1e470d33f2efede76f190fe01ab867a
-armhf:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69
+armhf:arm32v7/debian:buster==sha256:5d1cc5e14ba686366a6483c814d0ddf2e0b56f7d914a74226217b3412ce1e9cf
+armhf:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index c6dd5c43a440..d1af120b141c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -14,7 +14,7 @@ https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
-https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5
+https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 3959806c2f5f..3d039acfd50e 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -16,7 +16,6 @@ libapt-inst2.0==1.8.2.3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libc-dev-bin==2.28-10+deb10u2
-libc6==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 7f9df4a35d60..0e3ec3f5f20b 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -27,4 +27,4 @@ six==1.11.0
 typing_extensions==4.4.0
 urllib3==1.26.5
 werkzeug==2.2.2
-zipp==3.9.0
\ No newline at end of file
+zipp==3.10.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 899fc6068079..7dc5c36d6fc9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.8-1
+containerd.io==1.6.9-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -280,8 +280,8 @@ libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
 libblkid-dev==2.33.1-0.1
-libbluetooth3==5.50-1.2~deb10u2
-libbluray2==1:1.1.0-1
+libbluetooth3==5.50-1.2~deb10u3
+libbluray2==1:1.1.0-1+deb10u1
 libboost-atomic1.71-dev==1.71.0-6~bpo10+1
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-chrono1.71-dev==1.71.0-6~bpo10+1
@@ -328,7 +328,6 @@ libbz2-dev==1.0.6-9.2~deb10u2
 libc-ares-dev==1.14.0-1+deb10u1
 libc-ares2==1.14.0-1+deb10u1
 libc-dev-bin==2.28-10+deb10u2
-libc6==2.28-10+deb10u2
 libc6-dbg==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
 libc6-dev-i386==2.28-10+deb10u2
@@ -552,6 +551,7 @@ libglvnd0==1.1.0-1
 libglx-mesa0==18.3.6-2+deb10u1
 libglx0==1.1.0-1
 libgme0==0.6.2-1
+libgmock-dev==1.8.1-3
 libgmp-dev==2:6.1.2+dfsg-4+deb10u1
 libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
 libgnutls-dane0==3.6.7-4+deb10u9
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 9ad510926bfb..b3085ccf53bf 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 9ad510926bfb..b3085ccf53bf 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3b9552584dd763bc79a3cdae897a0cd624b2dcf5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 274f64d6cd9a..edb1fe77dba4 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.8-1
+containerd.io==1.6.9-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6

From 4bbfcf0bb601bdfecbf2180aba9c8a2c3556cf4d Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Wed, 26 Oct 2022 15:08:57 +0300
Subject: [PATCH 1440/1674] [202012][submodule] Advance sonic-swss pointer
 (#12358)

Update sonic-swss submodule pointer to include the following:
* 08711a8 [orchdaemon]: Fixed sairedis record file rotation ([#2481](https://github.com/sonic-net/sonic-swss/pull/2481))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 499b7a7b37cb..08711a890aa4 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 499b7a7b37cbfbf0f20878b334a1cbea83b76aa7
+Subproject commit 08711a890aa4a39cebe7742e6c40e24a9ab5a4da

From 95b979dfc1e851bcdd138195056351a41ea8a49b Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Thu, 27 Oct 2022 08:13:13 +0800
Subject: [PATCH 1441/1674] [202012][TestbedV2]Migrate t0 and t1-lag to
 TestbedV2 (#12383) (#12454)

* [TestbedV2]Migrate t0 and t1-lag to TestbedV2 (#12383)

signed-off-by: jianquanye@microsoft.com

Migrate the t0 and t1-lag test jobs in buildimage repo to TestbedV2.

Why I did it
Migrate the t0 and t1-lag test jobs in buildimage repo to TestbedV2.

How I did it
Migrate the t0 and t1-lag test jobs in buildimage repo to TestbedV2.

Remove ceos type setting

Use 202012 branch as sonic-mgmt branch

* Modify template to use 202012 branch
---
 .../run-test-scheduler-template.yml           | 119 ++++++++++++++++++
 azure-pipelines.yml                           | 111 ++++++++++++++--
 2 files changed, 218 insertions(+), 12 deletions(-)
 create mode 100644 .azure-pipelines/run-test-scheduler-template.yml

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
new file mode 100644
index 000000000000..963b9d5b59c5
--- /dev/null
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -0,0 +1,119 @@
+parameters:
+- name: TOPOLOGY
+  type: string
+
+- name: POLL_INTERVAL
+  type: number
+  default: 10
+
+- name: POLL_TIMEOUT
+  type: number
+  default: 36000
+
+- name: MIN_WORKER
+  type: number
+  default: 1
+
+- name: MAX_WORKER
+  type: number
+  default: 2
+
+- name: TEST_SET
+  type: string
+  default: ""
+
+- name: DEPLOY_MG_EXTRA_PARAMS
+  type: string
+  default: ""
+
+- name: MGMT_BRANCH
+  type: string
+  default: master
+
+steps:
+  - script: |
+      set -ex
+      # always use the test plan script from master branch.
+      wget -O ./.azure-pipelines/test_plan.py  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py
+      wget -O ./.azure-pipelines/pr_test_scripts.yaml  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/${{ parameters.MGMT_BRANCH }}/.azure-pipelines/pr_test_scripts.yaml
+    displayName: Download TestbedV2 scripts
+
+  - script: |
+      set -ex
+      pip install PyYAML
+      rm -f new_test_plan_id.txt
+      python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --mgmt-branch ${{ parameters.MGMT_BRANCH }}
+      TEST_PLAN_ID=`cat new_test_plan_id.txt`
+
+      echo "Created test plan $TEST_PLAN_ID"
+      echo "Check https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID for test plan status"
+      echo "##vso[task.setvariable variable=TEST_PLAN_ID]$TEST_PLAN_ID"
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+      TENANT_ID: $(TESTBED_TOOLS_MSAL_TENANT_ID)
+      CLIENT_ID: $(TESTBED_TOOLS_MSAL_CLIENT_ID)
+      CLIENT_SECRET: $(TESTBED_TOOLS_MSAL_CLIENT_SECRET)
+    displayName: Trigger test
+
+  - script: |
+      set -ex
+      echo "Lock testbed"
+      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+    displayName: Lock testbed
+    timeoutInMinutes: 240
+
+  - script: |
+      set -ex
+      echo "Prepare testbed"
+      echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)"
+      echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline"
+      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 2400 --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+    displayName: Prepare testbed
+    timeoutInMinutes: 40
+
+  - script: |
+      set -ex
+      echo "Run test"
+      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 18000 --expected-states KVMDUMP FINISHED CANCELLED FAILED
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+    displayName: Run test
+    timeoutInMinutes: 300
+
+  - script: |
+      set -ex
+      echo "KVM dump"
+      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states FINISHED CANCELLED FAILED
+    condition: succeededOrFailed()
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+    displayName: KVM dump
+    timeoutInMinutes: 20
+
+  - script: |
+      set -ex
+      echo "Try to cancel test plan $TEST_PLAN_ID, cancelling finished test plan has no effect."
+      python ./.azure-pipelines/test_plan.py cancel -i "$(TEST_PLAN_ID)"
+    condition: always()
+    env:
+      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+      TENANT_ID: $(TESTBED_TOOLS_MSAL_TENANT_ID)
+      CLIENT_ID: $(TESTBED_TOOLS_MSAL_CLIENT_ID)
+      CLIENT_SECRET: $(TESTBED_TOOLS_MSAL_CLIENT_SECRET)
+    displayName: Finalize running test plan
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 190cdcd444c5..ed140d61a58d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,6 +78,7 @@ stages:
   dependsOn: BuildVS
   condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues')))
   variables:
+  - group: Testbed-Tools
   - name: inventory
     value: veos_vtb
   - name: testbed_file
@@ -135,7 +136,8 @@ stages:
     pool: sonictest
     displayName: "kvmtest-t0-part1"
     timeoutInMinutes: 300
-
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
+    continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-template.yml
       parameters:
@@ -149,7 +151,8 @@ stages:
     pool: sonictest
     displayName: "kvmtest-t0-part2"
     timeoutInMinutes: 300
-
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
+    continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-template.yml
       parameters:
@@ -159,33 +162,75 @@ stages:
         tbtype: t0
         section: part-2
 
+  - job: t0_testbedv2
+    pool:
+      vmImage: 'ubuntu-20.04'
+    displayName: "kvmtest-t0 by TestbedV2"
+    timeoutInMinutes: 1080
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
+    continueOnError: false
+    steps:
+    - template: .azure-pipelines/run-test-scheduler-template.yml
+      parameters:
+        TOPOLOGY: t0
+        MIN_WORKER: 2
+        MAX_WORKER: 3
+        MGMT_BRANCH: 202012
+
+  - job: t0_2vlans_testbedv2
+    pool:
+      vmImage: 'ubuntu-20.04'
+    displayName: "kvmtest-t0-2vlans by TestbedV2"
+    timeoutInMinutes: 1080
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
+    continueOnError: false
+    steps:
+    - template: .azure-pipelines/run-test-scheduler-template.yml
+      parameters:
+        TOPOLOGY: t0
+        TEST_SET: t0-2vlans
+        MAX_WORKER: 1
+        DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
+        MGMT_BRANCH: 202012
+
   - job:
-    pool: sonictest
+    pool:
+      vmImage: 'ubuntu-20.04'
     displayName: "kvmtest-t0"
-    timeoutInMinutes: 300
     dependsOn:
     - t0_part1
     - t0_part2
+    - t0_testbedv2
+    - t0_2vlans_testbedv2
     condition: always()
     variables:
       resultOfPart1: $[ dependencies.t0_part1.result ]
       resultOfPart2: $[ dependencies.t0_part2.result ]
+      resultOfT0TestbedV2: $[ dependencies.t0_testbedv2.result ]
+      resultOfT02VlansTestbedV2: $[ dependencies.t0_2vlans_testbedv2.result ]
 
     steps:
     - script: |
+        if [ $(resultOfT0TestbedV2) == "Succeeded" ] && [ $(resultOfT02VlansTestbedV2) == "Succeeded" ]; then
+          echo "TestbedV2 t0 passed."
+          exit 0
+        fi
+
         if [ $(resultOfPart1) == "Succeeded" ] && [ $(resultOfPart2) == "Succeeded" ]; then
-          echo "Both job kvmtest-t0-part1 and kvmtest-t0-part2 are passed."
+          echo "Classic t0 jobs(both part1 and part2) passed."
           exit 0
-        else
-          echo "Either job kvmtest-t0-part1 or job kvmtest-t0-part2 failed! Please check the detailed information."
-          exit 1
         fi
 
-  - job:
-    pool: sonictest-t1-lag
-    displayName: "kvmtest-t1-lag"
-    timeoutInMinutes: 240
+        echo "Both classic and TestbedV2 t0 jobs failed! Please check the detailed information. (Any of them passed, t0 will be considered as passed)"
+        exit 1
 
+
+  - job: t1_lag_classic
+    pool: sonictest-t1-lag
+    displayName: "kvmtest-t1-lag classic"
+    timeoutInMinutes: 400
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
+    continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-template.yml
       parameters:
@@ -193,3 +238,45 @@ stages:
         tbname: vms-kvm-t1-lag
         ptf_name: ptf_vms6-2
         tbtype: t1-lag
+
+  - job: t1_lag_testbedv2
+    pool:
+      vmImage: 'ubuntu-20.04'
+    displayName: "kvmtest-t1-lag by TestbedV2"
+    timeoutInMinutes: 600
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
+    continueOnError: false
+    steps:
+    - template: .azure-pipelines/run-test-scheduler-template.yml
+      parameters:
+        TOPOLOGY: t1-lag
+        MIN_WORKER: 2
+        MAX_WORKER: 3
+        MGMT_BRANCH: 202012
+
+  - job:
+    pool:
+      vmImage: 'ubuntu-20.04'
+    displayName: "kvmtest-t1-lag"
+    dependsOn:
+    - t1_lag_classic
+    - t1_lag_testbedv2
+    condition: always()
+    continueOnError: false
+    variables:
+      resultOfClassic: $[ dependencies.t1_lag_classic.result ]
+      resultOfTestbedV2: $[ dependencies.t1_lag_testbedv2.result ]
+    steps:
+    - script: |
+        if [ $(resultOfTestbedV2) == "Succeeded" ]; then
+          echo "TestbedV2 t1-lag passed."
+          exit 0
+        fi
+
+        if [ $(resultOfClassic) == "Succeeded" ]; then
+          echo "Classic t1-lag passed."
+          exit 0
+        fi
+
+        echo "Both classic and TestbedV2 t1-lag jobs failed! Please check the detailed information. (Any of them passed, t1-lag will be considered as passed)"
+        exit 1

From 24ee3dd1e1cc7bdaf855453a8305f030cdc784cc Mon Sep 17 00:00:00 2001
From: Vivek <vkarri@nvidia.com>
Date: Wed, 26 Oct 2022 22:45:55 -0700
Subject: [PATCH 1442/1674] [202012] [submodule] Advance sonic-utilities
 pointer (#12513)

7272bf37 Revert "Revert "[DHCPv6] [202012] Update the dhcpv6_relay config/show cli (#2271)" (#2336)" (#2459)
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 94a3436157ea..7272bf373165 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 94a3436157ea3b49b0e7074d421900fd4bc8e70d
+Subproject commit 7272bf373165cffbc28323809fa12d61823086cd

From eee839fddfc09bda53352b4f3b1274a7b28e4ef5 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 28 Oct 2022 21:24:57 +0800
Subject: [PATCH 1443/1674] [ci/build]: Upgrade SONiC package versions (#12547)

---
 .../build/build-sonic-slave-buster/versions-deb-buster      | 2 +-
 .../versions/build/build-sonic-slave-buster/versions-web    | 4 ++--
 .../versions/build/build-sonic-slave-stretch/versions-web   | 4 ++--
 files/build/versions/default/versions-git                   | 2 +-
 files/build/versions/default/versions-web                   | 2 --
 .../versions/dockers/docker-base-buster/versions-deb-buster | 2 +-
 .../dockers/docker-config-engine-buster/versions-deb-buster | 2 +-
 .../versions/dockers/docker-orchagent/versions-deb-buster   | 2 +-
 .../dockers/docker-platform-monitor/versions-deb-buster     | 2 +-
 .../build/versions/dockers/docker-snmp/versions-deb-buster  | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-deb-buster | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 4 ++--
 .../versions/dockers/docker-sonic-vs/versions-deb-buster    | 2 +-
 .../dockers/docker-syncd-bfn-rpc/versions-deb-buster        | 2 +-
 .../dockers/docker-syncd-brcm-rpc/versions-deb-buster       | 2 +-
 .../versions/dockers/docker-syncd-brcm/versions-deb-buster  | 2 +-
 .../dockers/docker-syncd-centec-rpc/versions-deb-buster     | 2 +-
 .../dockers/docker-syncd-centec/versions-deb-buster-arm64   | 2 +-
 .../versions/dockers/docker-syncd-mlnx/versions-deb-buster  | 2 +-
 .../dockers/docker-syncd-mrvl/versions-deb-buster-armhf     | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster | 6 +++---
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-deb-buster         | 6 +++---
 24 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 51a6e3bd1273..913770c8a9a4 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -18,7 +18,7 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==4.3.7.1-3
+libsaibcm==4.3.7.1-6
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 5cda175c2831..8cf6d38eddcc 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -28,8 +28,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index dc65072f0720..0c74c05a6998 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A28Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=DjNdlKfDegvbc%2BLgADtr6Z69F5tYqxnYYoLQvvvN3mU%3D==e1bcde787f734bfa01fc86f197e49dd4
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-3_amd64.deb?sv=2020-08-04&st=2022-10-18T12%3A18%3A13Z&se=2037-10-19T12%3A18%3A00Z&sr=b&sp=r&sig=r78DbaCBmrQjGVQO84VUvAf%2BPHFeF6uTk%2Br7b2QwO4M%3D==5f6b14e0e975f3a477abd97d6e572e14
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
+https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index d1af120b141c..92b934fead93 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e316075b72da..d94d90f0390f 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -50,8 +50,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index aad5ba8c57b1..f2ad84667c1e 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -7,7 +7,7 @@ libcurl4==7.64.0-4+deb10u3
 libdaemon0==0.14-7
 libdbus-1-3==1.12.24-0+deb10u1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u5
+libexpat1==2.2.6-2+deb10u6
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 3d039acfd50e..0c2357cf641f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -19,7 +19,7 @@ libc-dev-bin==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libgcc-8-dev==8.3.0-6
 libgomp1==8.3.0-6
 libhiredis0.14==0.14.0-3~bpo9+1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index c8d66ccd6b93..e1eb375dded9 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -25,7 +25,7 @@ libcc1-0==8.3.0-6
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 86a874a3ea2d..2c2af5b751b6 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -35,7 +35,7 @@ libdbi1==0.9.0-5
 libdpkg-perl==1.19.8
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u3
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index a68f3360febc..4780c3740ec8 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -20,7 +20,7 @@ libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libfreeipmi17==1.6.3-1.1
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index a9f320b4eef8..90154aca3661 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
 libgomp1==8.3.0-6
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 0e3ec3f5f20b..0f5c1792258a 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -14,12 +14,12 @@ inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.16.0
 jsonschema-spec==0.1.2
-lazy-object-proxy==1.7.1
+lazy-object-proxy==1.8.0
 openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.8
+protobuf==4.21.9
 pyrsistent==0.18.1
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 5f469540255d..d67b953874f9 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -50,7 +50,7 @@ libdpkg-perl==1.19.8
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libfreetype6==2.9.1-3+deb10u3
 libfuse2==2.9.9-1+deb10u1
 libgcc-8-dev==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index c0efeea00e29..cb2abfd56e54 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 39690e90598b..cf2980edc70a 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -17,7 +17,7 @@ libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index b62704739ae9..fae8d8d8e71b 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.7.1-3
+libsaibcm==4.3.7.1-6
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 94ad329c3d4e..8435687c91a6 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -19,7 +19,7 @@ libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
 libdouble-conversion1==3.1.0-3
 libdpkg-perl==1.19.8
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libffi-dev==3.2.1-9
 libgcc-8-dev==8.3.0-6
 libglib2.0-0==2.58.3-2+deb10u4
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
index 53745a721fa8..ccab4a1c7a72 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 241759d2236f..b33168a80bb1 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -10,7 +10,7 @@ libc6-dev==2.28-10+deb10u2
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
index df1905503e3f..c853ce53ca19 100644
--- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-buster-armhf
@@ -2,7 +2,7 @@ dmsetup==2:1.02.155-3
 keyutils==1.6-6
 libdevmapper1.02.1==2:1.02.155-3
 libevent-2.1-6==2.1.8-stable-4
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1-dev==2.2.6-2+deb10u6
 libnfsidmap2==0.25-5.1
 libpcap-dev==1.8.1-6+deb10u1
 libpcap0.8==1.8.1-6+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 7dc5c36d6fc9..cb19a3aff323 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -105,7 +105,7 @@ equivs==2.2.0
 exim4-base==4.92-8+deb10u7
 exim4-config==4.92-8+deb10u7
 exim4-daemon-light==4.92-8+deb10u7
-expat==2.2.6-2+deb10u5
+expat==2.2.6-2+deb10u6
 exuberant-ctags==1:5.9~svn20110310-12
 fakeroot==1.23-1
 file==1:5.35-4+deb10u2
@@ -472,8 +472,8 @@ libevent-dev==2.1.8-stable-4
 libevent-extra-2.1-6==2.1.8-stable-4
 libevent-openssl-2.1-6==2.1.8-stable-4
 libevent-pthreads-2.1-6==2.1.8-stable-4
-libexpat1==2.2.6-2+deb10u5
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1==2.2.6-2+deb10u6
+libexpat1-dev==2.2.6-2+deb10u6
 libexplain-dev==1.4.D001-8
 libexplain51==1.4.D001-8
 libexporter-tiny-perl==1.002001-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b3085ccf53bf..1838b73c788b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b3085ccf53bf..1838b73c788b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f511020737b695f4cbb3260fdaef78a29acdd35
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index edb1fe77dba4..aa7925aba329 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -115,8 +115,8 @@ libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libexpat1==2.2.6-2+deb10u5
-libexpat1-dev==2.2.6-2+deb10u5
+libexpat1==2.2.6-2+deb10u6
+libexpat1-dev==2.2.6-2+deb10u6
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
 libfreeipmi17==1.6.3-1.1
@@ -319,7 +319,7 @@ systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb10u7
+tzdata==2021a-0+deb10u8
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1

From 5de7ae449a0b84b284c1adfcda116fd3571657a1 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Sun, 30 Oct 2022 09:29:45 +0200
Subject: [PATCH 1444/1674] Update SDK/FW to version 4.5.3186/2010_3186
 (#12531)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Why I did it
Update SDK/FW version - 4.5.3186/2010_3186 in order to have the following changes:

New functionality:
1. Added support for 6.5W (Class 8) in ports 49-50, 53-54, 57-58, and 61-62 on SN4600 system

Fix the following issues:
1. On very rare occasion (~1/100K), during I2C transaction with MMS1V50-WM and MMS1V90-WR modules on SN4700 system, the module may send unexpected stop which violate the I2C specification, possibly affecting the link up flow
2. When running 1GbE speeds on SN4600 system, the port remained active while peer side was closed
3. While toggling the cable with ‘sfputil lpmode on/off’, error msg like “ERR pmon#xcvrd: Receive PMPE error event on module 1: status {X} error type {y}” could be received
4. When toggling many ports of the Spectrum devices while raising 10GbE link up and link maintenance is enabled, the switch may get stuck and may need to be rebooted
5. When trying to reconfigure the Flex Parser header and Flex transition parameters after ISSU, the switch will returned an error even if the configuration was identical to that done before performing the ISSU
6. While moving from lossless to lossy mode while shared headroom was used, reduction of the shared headroom can only be done prior to pool type change and when shared headroom is not utilized
7. SLL configuration is missing in SDK dump
8. If TTL_CMD_COPY is used in Encap direction for a packet with no TTL, then the value passed in the ttl data structure will be used if non-zero (default 255 if zero)
9. PCI calibration changes from a static to a dynamic mechanism
10. Layer 4 port information is not initialized for BFD packet event. To address the issue, remote peer UDP port information was added in BFD packet event
11. SDK returned error when FEC mode is set on twisted pair, when FEC was set to None

- How I did it
Update pointer for the SDK/FW

- How to verify it
Run regression tests

Signed-off-by: dprital <drorp@nvidia.com>
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index e7504aa1e91b..0b1cacd67b94 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.2320
+MLNX_SPC_FW_VERSION = 13.2010.3186
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.2320
+MLNX_SPC2_FW_VERSION = 29.2010.3186
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.2320
+MLNX_SPC3_FW_VERSION = 30.2010.3186
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index 5650c3519b55..d44d801b60fa 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit 5650c3519b55051124810a4625f8269694b1e592
+Subproject commit d44d801b60fa49f0dcc1129baeef13ac64d48e2d
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 439a2e1328ec..c74f086c0a07 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
-MLNX_SDK_VERSION = 4.5.2320
+MLNX_SDK_VERSION = 4.5.3186
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From 78043b828c0db6651f860fb5b75a04abef320b63 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Sun, 30 Oct 2022 15:34:39 +0800
Subject: [PATCH 1445/1674] [202012] [Mellanox] Read transceiver EEPROM via sdk
 sysfs (#12399)

- Why I did it
ethtool is not able to read certain pages(eg. page 11h) of CMIS cables.
SDK provides a set of sysfs to expose the transceiver EEPROM, now we migrate from using ethtool to read these sysfs for transceiver EEPROM reading.

- How I did it
replace ethtool with accessing the SDK sysfs for cable EEPROM reading.
Adjust the offset according to the SDK sysfs memory map.

- How to verify it
run sonic-mgmt sfp-related regression test case.

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../mlnx-platform-api/sonic_platform/sfp.py   | 230 ++++++++----------
 1 file changed, 96 insertions(+), 134 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 16e8dc2b3859..976b5395f1cf 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -7,7 +7,6 @@
 #############################################################################
 
 try:
-    import subprocess
     import time
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_eeprom import eeprom_dts
@@ -162,9 +161,9 @@
 QSFP_OPTION_VALUE_WIDTH = 4
 
 QSFP_MODULE_UPPER_PAGE3_START = 384
-QSFP_MODULE_THRESHOLD_OFFSET = 128
+QSFP_MODULE_THRESHOLD_OFFSET = 0  # original starting from 128, SDK only provide 128 bytes on this page.
 QSFP_MODULE_THRESHOLD_WIDTH = 24
-QSFP_CHANNL_THRESHOLD_OFFSET = 176
+QSFP_CHANNL_THRESHOLD_OFFSET = 48
 QSFP_CHANNL_THRESHOLD_WIDTH = 24
 
 SFP_TEMPE_OFFSET = 96
@@ -241,12 +240,24 @@
                             'Fibre Channel link length/Transmitter Technology',
                             'Fibre Channel transmission media', 'Fibre Channel Speed')
 
-SFP_PATH = "/var/run/hw-management/qsfp/"
+SFP_SYSFS_PATH = "/sys/module/sx_core/asic0/module{}/eeprom/pages/"
 SFP_TYPE = "SFP"
 QSFP_TYPE = "QSFP"
 OSFP_TYPE = "OSFP"
 QSFP_DD_TYPE = "QSFP_DD"
 
+PAGE_SIZE = 256
+PAGE00_LOWER_MEMORY_OFFSET = 0
+PAGE00_HIGH_MEMORY_OFFSET = 128
+PAGE01_OFFSET = 256
+PAGE02_OFFSET = 512
+PAGE03_OFFSET = 768
+PAGE17_OFFSET = 4352
+
+PATH_PAGE = '/{}/data'
+PATH_PAGE00 = '/0/i2c-0x50/data'
+PATH_PAGE00_A2 = '/0/i2c-0x51/data'
+
 #variables for sdk
 REGISTER_NUM = 1
 DEVICE_ID = 1
@@ -318,6 +329,7 @@ class SFP(SfpBase):
     def __init__(self, sfp_index, sfp_type, sdk_handle_getter, platform):
         SfpBase.__init__(self)
         self.index = sfp_index + 1
+        self.sdk_sysfs_page_path_header = SFP_SYSFS_PATH.format(sfp_index)
         self.sfp_eeprom_path = "qsfp{}".format(self.index)
         self.sfp_status_path = "qsfp{}_status".format(self.index)
         self._detect_sfp_type(sfp_type)
@@ -351,44 +363,36 @@ def get_presence(self):
             bool: True if device is present, False if not
         """
         presence = False
-        ethtool_cmd = "ethtool -m sfp{} hex on offset 0 length 1 2>/dev/null".format(self.index)
         try:
-            proc = subprocess.Popen(ethtool_cmd, 
-                                    stdout=subprocess.PIPE, 
-                                    shell=True, 
-                                    stderr=subprocess.STDOUT, 
-                                    universal_newlines=True)
-            stdout = proc.communicate()[0]
-            proc.wait()
-            result = stdout.rstrip('\n')
-            if result != '':
+            with open((self.sdk_sysfs_page_path_header + PATH_PAGE00), mode='r+b', buffering=0) as f:
+                f.read(1)
                 presence = True
-
-        except OSError as e:
-            raise OSError("Cannot detect sfp")
+        except (OSError, IOError):
+            presence = False
 
         return presence
 
 
     # Read out any bytes from any offset
     def _read_eeprom_specific_bytes(self, offset, num_bytes):
-        eeprom_raw = []
-        ethtool_cmd = "ethtool -m sfp{} hex on offset {} length {}".format(self.index, offset, num_bytes)
         try:
-            output = subprocess.check_output(ethtool_cmd, 
-                                             shell=True, 
-                                             universal_newlines=True)
-            output_lines = output.splitlines()
-            first_line_raw = output_lines[0]
-            if "Offset" in first_line_raw:
-                for line in output_lines[2:]:
-                    line_split = line.split()
-                    eeprom_raw = eeprom_raw + line_split[1:]
-        except subprocess.CalledProcessError as e:
-            return None
-
-        return eeprom_raw
+            # if the data is on page0, offset indicate start of lower memory or upper memory
+            # if the data is on other page, then offset = page*256
+            page_num = int(offset/PAGE_SIZE) 
+            if page_num == 0:
+                page = self.sdk_sysfs_page_path_header + PATH_PAGE00
+            else:
+                if self.sfp_type == SFP_TYPE and page_num == 1:
+                    page = self.sdk_sysfs_page_path_header + PATH_PAGE00_A2
+                else:
+                    page = self.sdk_sysfs_page_path_header + PATH_PAGE.format(page_num)
+                offset = offset - page_num * PAGE_SIZE
 
+            with open(page, mode='r+b', buffering=0) as f:
+                f.seek(offset)
+                return ["{:02x}".format(c) for c in f.read(num_bytes)]
+        except (OSError, IOError):
+            return None
 
     def _detect_sfp_type(self, sfp_type):
         eeprom_raw = []
@@ -428,7 +432,7 @@ def _dom_capability_detect(self):
             sfpi_obj = sff8436InterfaceId()
             if sfpi_obj is None:
                 self.dom_supported = False
-            offset = 128
+            offset = PAGE00_HIGH_MEMORY_OFFSET
 
             # QSFP capability byte parse, through this byte can know whether it support tx_power or not.
             # TODO: in the future when decided to migrate to support SFF-8636 instead of SFF-8436,
@@ -474,7 +478,7 @@ def _dom_capability_detect(self):
             if sfpi_obj is None:
                 self.dom_supported = False
 
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             # two types of QSFP-DD cable types supported: Copper and Optical.
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes((offset + XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD), XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD)
             if qsfp_dom_capability_raw is not None:
@@ -542,9 +546,7 @@ def _dom_capability_detect(self):
 
 
     def _convert_string_to_num(self, value_str):
-        if "-inf" in value_str:
-            return 'N/A'
-        elif "Unknown" in value_str:
+        if "Unknown" in value_str:
             return 'N/A'
         elif 'dBm' in value_str:
             t_str = value_str.rstrip('dBm')
@@ -595,7 +597,7 @@ def get_transceiver_info(self):
         # in inf8628.py lack of some memory map definition
         # will be implemented when the inf8628 memory map ready
         if self.sfp_type == OSFP_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             vendor_rev_width = XCVR_HW_REV_WIDTH_OSFP
 
             sfpi_obj = inf8628InterfaceId()
@@ -650,7 +652,7 @@ def get_transceiver_info(self):
             transceiver_info_dict['application_advertisement'] = 'N/A'
 
         elif self.sfp_type == QSFP_TYPE:
-            offset = 128
+            offset = PAGE00_HIGH_MEMORY_OFFSET
             vendor_rev_width = XCVR_HW_REV_WIDTH_QSFP
             cable_length_width = XCVR_CABLE_LENGTH_WIDTH_QSFP
             interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_QSFP
@@ -662,7 +664,7 @@ def get_transceiver_info(self):
                 return None
 
         elif self.sfp_type == QSFP_DD_TYPE:
-            offset = 128
+            offset = PAGE00_HIGH_MEMORY_OFFSET
 
             sfpi_obj = qsfp_dd_InterfaceId()
             if sfpi_obj is None:
@@ -777,7 +779,7 @@ def get_transceiver_info(self):
             transceiver_info_dict['application_advertisement'] = host_media_list
 
         else:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             vendor_rev_width = XCVR_HW_REV_WIDTH_SFP
             cable_length_width = XCVR_CABLE_LENGTH_WIDTH_SFP
             interface_info_bulk_width = XCVR_INTFACE_BULK_WIDTH_SFP
@@ -921,7 +923,7 @@ def get_transceiver_bulk_status(self):
             if not self.dom_supported:
                 return transceiver_dom_info_dict
 
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
                 return transceiver_dom_info_dict
@@ -969,7 +971,7 @@ def get_transceiver_bulk_status(self):
 
         elif self.sfp_type == QSFP_DD_TYPE:
 
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = qsfp_dd_Dom()
             if sfpd_obj is None:
                 return transceiver_dom_info_dict
@@ -996,7 +998,7 @@ def get_transceiver_bulk_status(self):
 
             if self.dom_rx_tx_power_bias_supported:
                 # page 11h
-                offset = 512
+                offset = PAGE17_OFFSET
                 dom_data_raw = self._read_eeprom_specific_bytes(offset + QSFP_DD_CHANNL_MON_OFFSET, QSFP_DD_CHANNL_MON_WIDTH)
                 if dom_data_raw is None:
                     return transceiver_dom_info_dict
@@ -1038,7 +1040,7 @@ def get_transceiver_bulk_status(self):
             if not self.dom_supported:
                 return transceiver_dom_info_dict
 
-            offset = 256
+            offset = PAGE01_OFFSET
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
                 return transceiver_dom_info_dict
@@ -1120,9 +1122,10 @@ def get_transceiver_threshold_info(self):
             if not self.dom_supported or not self.qsfp_page3_available:
                 return transceiver_dom_threshold_info_dict
 
-            # Dom Threshold data starts from offset 384
+            # Dom Threshold data starts from page03
             # Revert offset back to 0 once data is retrieved
-            offset = QSFP_MODULE_UPPER_PAGE3_START
+            # offset = QSFP_MODULE_UPPER_PAGE3_START
+            offset = PAGE03_OFFSET
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
@@ -1172,8 +1175,9 @@ def get_transceiver_threshold_info(self):
             if sfpd_obj is None:
                 return transceiver_dom_threshold_info_dict
 
-            # page 02
-            offset = 384
+            # QSFP-DD cable threshold is started from 128 byte of page02
+            # so the offset will be page00 + page01 = 256 + 256
+            offset = PAGE02_OFFSET
             dom_module_threshold_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_MODULE_THRESHOLD_OFFSET), QSFP_DD_MODULE_THRESHOLD_WIDTH)
             if dom_module_threshold_raw is None:
                 return transceiver_dom_threshold_info_dict
@@ -1268,7 +1272,7 @@ def get_reset_status(self):
         if self.sfp_type == OSFP_TYPE:
             return False
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = sff8436Dom()
             dom_module_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_MODULE_MONITOR_OFFSET), QSFP_MODULE_MONITOR_WIDTH)
 
@@ -1277,7 +1281,7 @@ def get_reset_status(self):
             else:
                 return False
         elif self.sfp_type == SFP_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = sff8472Dom()
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
 
@@ -1286,7 +1290,7 @@ def get_reset_status(self):
             else:
                 return False
         elif self.sfp_type == QSFP_DD_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = qsfp_dd_Dom()
             dom_channel_status_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_STATUS_OFFSET), QSFP_DD_CHANNL_STATUS_WIDTH)
 
@@ -1303,7 +1307,13 @@ def get_rx_los(self):
         Returns:
             A Boolean, True if SFP has RX LOS, False if not.
             Note : RX LOS status is latched until a call to get_rx_los or a reset.
+
+        Known issue in this function:
+            These bytes are protected from reading due to some limitation
+            in the future will provide a dedicated sysfs for rx_los reading 
+            Currently only provide dummy implementation, always return false
         """
+
         if not self.dom_supported:
             return None
 
@@ -1311,39 +1321,15 @@ def get_rx_los(self):
         if self.sfp_type == OSFP_TYPE:
             return None
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
-            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_CHANNL_RX_LOS_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx_los_list.append(rx_los_data & 0x01 != 0)
-                rx_los_list.append(rx_los_data & 0x02 != 0)
-                rx_los_list.append(rx_los_data & 0x04 != 0)
-                rx_los_list.append(rx_los_data & 0x08 != 0)
-
+            rx_los_list = [False]*4
         elif self.sfp_type == QSFP_DD_TYPE:
             # page 11h
             if self.dom_rx_tx_power_bias_supported:
-                offset = 512
-                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_RX_LOS_STATUS_OFFSET), QSFP_DD_CHANNL_RX_LOS_STATUS_WIDTH)
-                if dom_channel_monitor_raw is not None:
-                    rx_los_data = int(dom_channel_monitor_raw[0], 8)
-                    rx_los_list.append(rx_los_data & 0x01 != 0)
-                    rx_los_list.append(rx_los_data & 0x02 != 0)
-                    rx_los_list.append(rx_los_data & 0x04 != 0)
-                    rx_los_list.append(rx_los_data & 0x08 != 0)
-                    rx_los_list.append(rx_los_data & 0x10 != 0)
-                    rx_los_list.append(rx_los_data & 0x20 != 0)
-                    rx_los_list.append(rx_los_data & 0x40 != 0)
-                    rx_los_list.append(rx_los_data & 0x80 != 0)
-
-        else:
-            offset = 256
-            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                rx_los_data = int(dom_channel_monitor_raw[0], 16)
-                rx_los_list.append(rx_los_data & 0x02 != 0)
+                rx_los_list = [False]*8
             else:
-                return None
+                return rx_los_list
+        else:
+            rx_los_list.append(False)
         return rx_los_list
 
 
@@ -1354,7 +1340,13 @@ def get_tx_fault(self):
         Returns:
             A Boolean, True if SFP has TX fault, False if not
             Note : TX fault status is lached until a call to get_tx_fault or a reset.
+
+        Known issue in this function:
+            These bytes are protected from reading due to some limitation
+            in the future will provide a dedicated sysfs for tx_fault reading
+            Currently only provide dummy implementation, always return false
         """
+
         if not self.dom_supported:
             return None
 
@@ -1362,40 +1354,15 @@ def get_tx_fault(self):
         if self.sfp_type == OSFP_TYPE:
             return None
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
-            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_CHANNL_TX_FAULT_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx_fault_list.append(tx_fault_data & 0x01 != 0)
-                tx_fault_list.append(tx_fault_data & 0x02 != 0)
-                tx_fault_list.append(tx_fault_data & 0x04 != 0)
-                tx_fault_list.append(tx_fault_data & 0x08 != 0)
-
+            tx_fault_list = [False]*4
         elif self.sfp_type == QSFP_DD_TYPE:
-            return None
             # page 11h
             if self.dom_rx_tx_power_bias_supported:
-                offset = 512
-                dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_TX_FAULT_STATUS_OFFSET), QSFP_DD_CHANNL_TX_FAULT_STATUS_WIDTH)
-                if dom_channel_monitor_raw is not None:
-                    tx_fault_data = int(dom_channel_monitor_raw[0], 8)
-                    tx_fault_list.append(tx_fault_data & 0x01 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x02 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x04 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x08 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x10 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x20 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x40 != 0)
-                    tx_fault_list.append(tx_fault_data & 0x80 != 0)
-
-        else:
-            offset = 256
-            dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
-            if dom_channel_monitor_raw is not None:
-                tx_fault_data = int(dom_channel_monitor_raw[0], 16)
-                tx_fault_list.append(tx_fault_data & 0x04 != 0)
+                tx_fault_list = [False]*8
             else:
                 return None
+        else:
+            tx_fault_list.append(False)
         return tx_fault_list
 
 
@@ -1417,7 +1384,7 @@ def get_tx_disable(self):
         if self.sfp_type == OSFP_TYPE:
             return None
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_CHANNL_DISABLE_STATUS_OFFSET), QSFP_CHANNL_DISABLE_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_disable_data = int(dom_channel_monitor_raw[0], 16)
@@ -1428,7 +1395,7 @@ def get_tx_disable(self):
 
         elif self.sfp_type == QSFP_DD_TYPE:
             if self.dom_rx_tx_power_bias_supported:
-                offset = 128
+                offset = PAGE00_HIGH_MEMORY_OFFSET
                 dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_CHANNL_DISABLE_STATUS_OFFSET), QSFP_DD_CHANNL_DISABLE_STATUS_WIDTH)
                 if dom_channel_monitor_raw is not None:
                     tx_disable_data = int(dom_channel_monitor_raw[0], 16)
@@ -1442,7 +1409,7 @@ def get_tx_disable(self):
                     tx_disable_list.append(tx_disable_data & 0x80 != 0)
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
             dom_channel_monitor_raw = self._read_eeprom_specific_bytes((offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH)
             if dom_channel_monitor_raw is not None:
                 tx_disable_data = int(dom_channel_monitor_raw[0], 16)
@@ -1510,7 +1477,7 @@ def get_power_override(self):
             A Boolean, True if power-override is enabled, False if disabled
         """
         if self.sfp_type == QSFP_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
                 return False
@@ -1533,8 +1500,7 @@ def get_temperature(self):
         if not self.dom_supported:
             return None
         if self.sfp_type == QSFP_TYPE:
-            offset = 0
-            offset_xcvr = 128
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
@@ -1552,7 +1518,7 @@ def get_temperature(self):
                 return None
 
         elif self.sfp_type == QSFP_DD_TYPE:
-            offset = 0
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = qsfp_dd_Dom()
             if sfpd_obj is None:
@@ -1567,7 +1533,7 @@ def get_temperature(self):
             return None
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
                 return None
@@ -1592,8 +1558,7 @@ def get_voltage(self):
         if not self.dom_supported:
             return None
         if self.sfp_type == QSFP_TYPE:
-            offset = 0
-            offset_xcvr = 128
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
@@ -1610,7 +1575,7 @@ def get_voltage(self):
             return None
 
         if self.sfp_type == QSFP_DD_TYPE:
-            offset = 128
+            offset = PAGE00_HIGH_MEMORY_OFFSET
 
             sfpd_obj = qsfp_dd_Dom()
             if sfpd_obj is None:
@@ -1625,7 +1590,7 @@ def get_voltage(self):
             return None
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
 
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
@@ -1653,8 +1618,7 @@ def get_tx_bias(self):
         """
         tx_bias_list = []
         if self.sfp_type == QSFP_TYPE:
-            offset = 0
-            offset_xcvr = 128
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
@@ -1671,7 +1635,7 @@ def get_tx_bias(self):
         elif self.sfp_type == QSFP_DD_TYPE:
             # page 11h
             if self.dom_rx_tx_power_bias_supported:
-                offset = 512
+                offset = PAGE17_OFFSET
                 sfpd_obj = qsfp_dd_Dom()
                 if sfpd_obj is None:
                     return None
@@ -1690,7 +1654,7 @@ def get_tx_bias(self):
                         tx_bias_list.append(self._convert_string_to_num(dom_tx_bias_data['data']['TX8Bias']['value']))
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
 
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
@@ -1725,8 +1689,7 @@ def get_rx_power(self):
             return None
 
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
-            offset_xcvr = 128
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
@@ -1748,7 +1711,7 @@ def get_rx_power(self):
         elif self.sfp_type == QSFP_DD_TYPE:
             # page 11
             if self.dom_rx_tx_power_bias_supported:
-                offset = 512
+                offset = PAGE17_OFFSET
                 sfpd_obj = qsfp_dd_Dom()
                 if sfpd_obj is None:
                     return None
@@ -1767,7 +1730,7 @@ def get_rx_power(self):
                         rx_power_list.append(self._convert_string_to_num(dom_rx_power_data['data']['RX8Power']['value']))
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
 
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
@@ -1802,8 +1765,7 @@ def get_tx_power(self):
             return None
 
         elif self.sfp_type == QSFP_TYPE:
-            offset = 0
-            offset_xcvr = 128
+            offset = PAGE00_LOWER_MEMORY_OFFSET
 
             sfpd_obj = sff8436Dom()
             if sfpd_obj is None:
@@ -1826,7 +1788,7 @@ def get_tx_power(self):
             return None
             # page 11
             if self.dom_rx_tx_power_bias_supported:
-                offset = 512
+                offset = PAGE17_OFFSET
                 sfpd_obj = qsfp_dd_Dom()
                 if sfpd_obj is None:
                     return None
@@ -1845,7 +1807,7 @@ def get_tx_power(self):
                         tx_power_list.append(self._convert_string_to_num(dom_tx_power_data['data']['TX8Power']['value']))
 
         else:
-            offset = 256
+            offset = PAGE01_OFFSET
             sfpd_obj = sff8472Dom()
             if sfpd_obj is None:
                 return None

From 0f721d8d98b2e47ac113a9930b0168cf5823f304 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 30 Oct 2022 20:05:48 +0800
Subject: [PATCH 1446/1674] [ci/build]: Upgrade SONiC package versions (#12550)

---
 .../dockers/docker-base-buster/versions-deb-buster   |  4 +++-
 .../dockers/sonic-slave-buster/versions-deb-buster   | 12 +++++++-----
 files/build/versions/host-image/versions-deb-buster  |  6 +++++-
 .../versions/host-image/versions-deb-buster-arm64    |  1 +
 .../versions/host-image/versions-deb-buster-armhf    |  1 +
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index f2ad84667c1e..1ff8f5822490 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -24,7 +24,8 @@ libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1
 liblua5.1-0==5.1.5-8.1+b2
 libmpdec2==2.4.2-2
-libncurses6==6.1+20181013-2+deb10u2
+libncurses6==6.1+20181013-2+deb10u3
+libncursesw6==6.1+20181013-2+deb10u3
 libnghttp2-14==1.36.0-2+deb10u1
 libnorm1==1.5.8+dfsg2-1
 libonig5==6.9.1-1
@@ -43,6 +44,7 @@ libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1n-0+deb10u3
+libtinfo6==6.1+20181013-2+deb10u3
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index cb19a3aff323..aeab4400cafa 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -272,7 +272,7 @@ libb-hooks-endofscope-perl==0.24-1
 libb-hooks-op-check-perl==0.22-1+b1
 libbabeltrace-dev==1.5.6-2+deb10u1
 libbabeltrace1==1.5.6-2+deb10u1
-libbatik-java==1.10-2+deb10u1
+libbatik-java==1.10-2+deb10u2
 libbdplus0==0.1.2-3
 libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u8
 libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u8
@@ -783,9 +783,10 @@ libnamespace-autoclean-perl==0.28-1
 libnamespace-clean-perl==0.27-1
 libnanomsg-dev==1.1.5+dfsg-1
 libnanomsg5==1.1.5+dfsg-1
-libncurses-dev==6.1+20181013-2+deb10u2
-libncurses5-dev==6.1+20181013-2+deb10u2
-libncurses6==6.1+20181013-2+deb10u2
+libncurses-dev==6.1+20181013-2+deb10u3
+libncurses5-dev==6.1+20181013-2+deb10u3
+libncurses6==6.1+20181013-2+deb10u3
+libncursesw6==6.1+20181013-2+deb10u3
 libnet-dbus-perl==1.1.0-5+b1
 libnet-dns-perl==1.19-1
 libnet-dns-sec-perl==1.11-1
@@ -1107,6 +1108,7 @@ libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
 libtiff5==4.1.0+git191117-2~deb10u4
 libtimedate-perl==2.3000-2+deb10u1
+libtinfo6==6.1+20181013-2+deb10u3
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
 libtk8.6==8.6.9-2
@@ -1353,7 +1355,7 @@ mesa-vdpau-drivers==18.3.6-2+deb10u1
 mime-support==3.62
 module-assistant==0.11.10
 mysql-common==5.8+1.0.5
-ncurses-term==6.1+20181013-2+deb10u2
+ncurses-term==6.1+20181013-2+deb10u3
 netbase==5.6
 netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index aa7925aba329..c365675cee60 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -163,7 +163,8 @@ libmpc3==1.1.0-1
 libmpdec2==2.4.2-2
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
-libncurses6==6.1+20181013-2+deb10u2
+libncurses6==6.1+20181013-2+deb10u3
+libncursesw6==6.1+20181013-2+deb10u3
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
@@ -216,6 +217,7 @@ libsysfs2==2.1.0+repack-5
 libsystemd0==247.3-6~bpo10+1
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
+libtinfo6==6.1+20181013-2+deb10u3
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libudev1==247.3-6~bpo10+1
@@ -243,6 +245,8 @@ mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
 mtr-tiny==0.92-2
+ncurses-base==6.1+20181013-2+deb10u3
+ncurses-bin==6.1+20181013-2+deb10u3
 ndisc6==1.0.4-1
 nephos-modules==1.0.1
 net-tools==1.60+git20180626.aebd88e-1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 6aa689858154..dc0ded8ae736 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -19,6 +19,7 @@ libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libksba8==1.3.5-2
+libncurses6==6.1+20181013-2+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 63d781dc2916..c219a1e9dd0c 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -19,6 +19,7 @@ libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libksba8==1.3.5-2
+libncurses6==6.1+20181013-2+deb10u2
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4

From 67b6541c190f62cefb66417bb596815bc044879d Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Sun, 30 Oct 2022 17:34:42 +0200
Subject: [PATCH 1447/1674] [202012][submodule] Advance sonic-platform-common
 pointer (#12551)

Update sonic-platform-common submodule pointer to include the following:
* a2164f6 [202012] Fix issue: sff8436 does not support decoding power class 5~7 ([#317](https://github.com/sonic-net/sonic-platform-common/pull/317))
* 6722b4e Update the return of update_firmware for the image not exist case ([#306](https://github.com/sonic-net/sonic-platform-common/pull/306))

Signed-off-by: dprital <drorp@nvidia.com>
---
 src/sonic-platform-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 5c9010074dc8..a2164f67c6f2 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 5c9010074dc8d9284242b1fe31146926b06f5c89
+Subproject commit a2164f67c6f24858d13085d320315c10c6f9e254

From db03698ba5a77270a80d54f35bb4de0d8501dc54 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Mon, 31 Oct 2022 14:20:57 +0800
Subject: [PATCH 1448/1674] fix DOM support caoability issues on QSFP and CMIS
 cables (#12500)

Signed-off-by: Kebo Liu <kebol@nvidia.com>

Signed-off-by: Kebo Liu <kebol@nvidia.com>
---
 .../mlnx-platform-api/sonic_platform/sfp.py   | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 976b5395f1cf..8dc616b251d6 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -415,6 +415,26 @@ def _detect_sfp_type(self, sfp_type):
             # in this case we treat it as the default type according to the SKU
             self.sfp_type = sfp_type
 
+    def _is_qsfp_copper(self):
+        # This function read the specification compliance byte and
+        # ext specification compliance byte to judge whether the cable is copper or not.
+        # It is only designed for SFF 8636 cables, SFF 8472 and CMIS cables don't apply.
+
+        # copper cables defined in SFF8024 "Extended Specification Compliance Codes"
+        copper_ext_specification_list = ['08', '0b', '0c', '0d', '19', '30', '32', '40']
+
+        offset = PAGE00_HIGH_MEMORY_OFFSET
+        qsfp_specification_raw = self._read_eeprom_specific_bytes(offset + XCVR_COMPLIANCE_CODE_OFFSET, 1)
+        qsfp_specification = int(qsfp_specification_raw[0], 16)
+        # The 4th bit of the specification complaince byte(131) indicate a 40GBASE-CR4 copper cable
+        if qsfp_specification & 0x8:
+            return True
+
+        qsfp_ext_specification_raw = self._read_eeprom_specific_bytes(offset + XCVR_EXT_SPECIFICATION_COMPLIANCE_OFFSET, XCVR_EXT_SPECIFICATION_COMPLIANCE_WIDTH)
+        if qsfp_ext_specification_raw[0] in copper_ext_specification_list:
+            return True
+
+        return False
 
     def _dom_capability_detect(self):
         if not self.get_presence():
@@ -428,6 +448,16 @@ def _dom_capability_detect(self):
             return
 
         if self.sfp_type == QSFP_TYPE:
+            if self._is_qsfp_copper():
+                self.dom_supported = False
+                self.dom_temp_supported = False
+                self.dom_volt_supported = False
+                self.dom_rx_power_supported = False
+                self.dom_tx_power_supported = False
+                self.calibration = 0
+                self.qsfp_page3_available = False
+                return
+
             self.calibration = 1
             sfpi_obj = sff8436InterfaceId()
             if sfpi_obj is None:
@@ -482,11 +512,11 @@ def _dom_capability_detect(self):
             # two types of QSFP-DD cable types supported: Copper and Optical.
             qsfp_dom_capability_raw = self._read_eeprom_specific_bytes((offset + XCVR_DOM_CAPABILITY_OFFSET_QSFP_DD), XCVR_DOM_CAPABILITY_WIDTH_QSFP_DD)
             if qsfp_dom_capability_raw is not None:
-                self.dom_temp_supported = True
-                self.dom_volt_supported = True
                 dom_capability = sfpi_obj.parse_dom_capability(qsfp_dom_capability_raw, 0)
                 if dom_capability['data']['Flat_MEM']['value'] == 'Off':
                     self.dom_supported = True
+                    self.dom_temp_supported = True
+                    self.dom_volt_supported = True
                     self.second_application_list = True
                     self.dom_rx_power_supported = True
                     self.dom_tx_power_supported = True
@@ -495,6 +525,8 @@ def _dom_capability_detect(self):
                     self.dom_rx_tx_power_bias_supported = True
                 else:
                     self.dom_supported = False
+                    self.dom_temp_supported = False
+                    self.dom_volt_supported = False
                     self.second_application_list = False
                     self.dom_rx_power_supported = False
                     self.dom_tx_power_supported = False

From cdcb7f02ace677baa58387f8469652cbd3818902 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 1 Nov 2022 10:25:22 +0800
Subject: [PATCH 1449/1674] [action] Use pull_request_target trigger instead to
 avoid codeQL check approval (#12509) (#12541)

Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0a8f2dc58682..6478fb99f7a5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - 'master'
       - '202[0-9][0-9][0-9]'
-  pull_request:
+  pull_request_target:
     branches:
       - 'master'
       - '202[0-9][0-9][0-9]'

From 778df1e178766512f1dc01c7956abf59bb8f3ab8 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Mon, 31 Oct 2022 22:55:06 -0700
Subject: [PATCH 1450/1674] [202012][RDMA] create split profiles for
 Arista-7050CX3-32S (#12478)

* [202012][RDMA] create split profiles for Arista-7050CX3-32S

Manually cherry-picking #12228.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 .../BALANCED/buffers_defaults_t0.j2           |  52 +++++
 .../BALANCED/buffers_defaults_t1.j2           |  46 ++++
 .../BALANCED/pg_profile_lookup.ini            |   8 +
 .../BALANCED/qos.json.j2                      |   1 +
 .../Arista-7050CX3-32S-C32/RDMA-CENTRIC       |   1 +
 .../Arista-7050CX3-32S-C32/TCP-CENTRIC        |   1 +
 .../buffers_defaults_t0.j2                    |  53 +----
 .../buffers_defaults_t1.j2                    |  47 +---
 .../pg_profile_lookup.ini                     |   9 +-
 .../Arista-7050CX3-32S-C32/qos.json.j2        |   2 +-
 .../BALANCED/buffers_defaults_t0.j2           |  53 +++++
 .../BALANCED/pg_profile_lookup.ini            |   8 +
 .../BALANCED/qos.json.j2                      | 206 +++++++++++++++++
 .../Arista-7050CX3-32S-D48C8/RDMA-CENTRIC     |   1 +
 .../Arista-7050CX3-32S-D48C8/TCP-CENTRIC      |   1 +
 .../buffers_defaults_t0.j2                    |  54 +----
 .../pg_profile_lookup.ini                     |   9 +-
 .../Arista-7050CX3-32S-D48C8/qos.json.j2      | 207 +-----------------
 18 files changed, 385 insertions(+), 374 deletions(-)
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/pg_profile_lookup.ini
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/qos.json.j2
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/TCP-CENTRIC
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/TCP-CENTRIC
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..97c026b1e450
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,52 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32732160",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "1622016"
+        },
+        "egress_lossy_pool": {
+            "size": "24709632",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32599040",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"32732160"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32599040"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..4e8d7ed881a8
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32712448",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "1622016"
+        },
+        "egress_lossy_pool": {
+            "size": "24709632",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32599040",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"32712448"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32599040"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..5b4482bc74c7
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  50000  5m   4608    4608 160000   0        4608
+ 100000  5m   4608    4608 160000   0        4608
+  50000  40m  4608    4608 160000   0        4608
+ 100000  40m  4608    4608 160000   0        4608
+  50000  300m 4608    4608 160000   0        4608
+ 100000  300m 4608    4608 160000   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/qos.json.j2
new file mode 120000
index 000000000000..5fb0f5c79852
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/BALANCED/qos.json.j2
@@ -0,0 +1 @@
+../../Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/RDMA-CENTRIC b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/RDMA-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/RDMA-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/TCP-CENTRIC b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
deleted file mode 100644
index 97c026b1e450..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,52 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "32732160",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "1622016"
-        },
-        "egress_lossy_pool": {
-            "size": "24709632",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "32599040",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"32732160"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"32599040"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1792",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
deleted file mode 100644
index 4e8d7ed881a8..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "32712448",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "1622016"
-        },
-        "egress_lossy_pool": {
-            "size": "24709632",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "32599040",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"32712448"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"32599040"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1792",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
deleted file mode 100644
index 5b4482bc74c7..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 160000   0        4608
- 100000  5m   4608    4608 160000   0        4608
-  50000  40m  4608    4608 160000   0        4608
- 100000  40m  4608    4608 160000   0        4608
-  50000  300m 4608    4608 160000   0        4608
- 100000  300m 4608    4608 160000   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
index 5ea713ce7f4c..aef6b6765cf2 120000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
@@ -1 +1 @@
-../Arista-7050CX3-32S-D48C8/qos.json.j2
\ No newline at end of file
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..2470ff8b988c
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,53 @@
+
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "32689152",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "2058240"
+        },
+        "egress_lossy_pool": {
+            "size": "24192256",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "32340992",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"32689152"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"32340992"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1792",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..5b4482bc74c7
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,8 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  50000  5m   4608    4608 160000   0        4608
+ 100000  5m   4608    4608 160000   0        4608
+  50000  40m  4608    4608 160000   0        4608
+ 100000  40m  4608    4608 160000   0        4608
+  50000  300m 4608    4608 160000   0        4608
+ 100000  300m 4608    4608 160000   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..040da33dd79f
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
@@ -0,0 +1,206 @@
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{%- macro generate_dscp_to_tc_map() %}
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+    "AZURE_TUNNEL": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "1",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "1",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_pg_map() %}
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "0",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "0",
+            "6": "6",
+            "7": "0",
+            "8": "0"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "0",
+            "6": "0",
+            "7": "0",
+            "8": "0"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_queue_map() %}
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        },
+        "AZURE_TUNNEL": {
+            "0": "0",
+            "1": "1",
+            "2": "1",
+            "3": "2",
+            "4": "6",
+            "5": "5",
+            "6": "1",
+            "7": "7",
+            "8": "1"
+        }
+    },
+{%- endmacro %}
+{%- macro generate_tc_to_dscp_map() %}
+    "TC_TO_DSCP_MAP": {
+        "AZURE_TUNNEL": {
+            "0": "8",
+            "1": "0",
+            "2": "0",
+            "3": "2",
+            "4": "6",
+            "5": "46",
+            "6": "0",
+            "7": "48",
+            "8": "33"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/RDMA-CENTRIC b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/RDMA-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/RDMA-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/TCP-CENTRIC b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
deleted file mode 100644
index 2470ff8b988c..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,53 +0,0 @@
-
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "32689152",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "2058240"
-        },
-        "egress_lossy_pool": {
-            "size": "24192256",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "32340992",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"32689152"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"32340992"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1792",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
-
-{% import 'buffers_extra_queues.j2' as defs with context %}
-
-{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
-{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
deleted file mode 100644
index 5b4482bc74c7..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  50000  5m   4608    4608 160000   0        4608
- 100000  5m   4608    4608 160000   0        4608
-  50000  40m  4608    4608 160000   0        4608
- 100000  40m  4608    4608 160000   0        4608
-  50000  300m 4608    4608 160000   0        4608
- 100000  300m 4608    4608 160000   0        4608
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
deleted file mode 100644
index 040da33dd79f..000000000000
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ /dev/null
@@ -1,206 +0,0 @@
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
-{%- macro generate_dscp_to_tc_map() %}
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "1",
-            "3" : "3",
-            "4" : "4",
-            "5" : "1",
-            "6" : "1",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "8",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "7",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        },
-    "AZURE_TUNNEL": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "1",
-            "3" : "3",
-            "4" : "4",
-            "5" : "1",
-            "6" : "1",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "8",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "7",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_pg_map() %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "0",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "6",
-            "7": "0",
-            "8": "0"
-        },
-        "AZURE_TUNNEL": {
-            "0": "0",
-            "1": "0",
-            "2": "0",
-            "3": "2",
-            "4": "6",
-            "5": "0",
-            "6": "0",
-            "7": "0",
-            "8": "0"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_queue_map() %}
-    "TC_TO_QUEUE_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "2": "1",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "1",
-            "7": "7",
-            "8": "1"
-        },
-        "AZURE_TUNNEL": {
-            "0": "0",
-            "1": "1",
-            "2": "1",
-            "3": "2",
-            "4": "6",
-            "5": "5",
-            "6": "1",
-            "7": "7",
-            "8": "1"
-        }
-    },
-{%- endmacro %}
-{%- macro generate_tc_to_dscp_map() %}
-    "TC_TO_DSCP_MAP": {
-        "AZURE_TUNNEL": {
-            "0": "8",
-            "1": "0",
-            "2": "0",
-            "3": "2",
-            "4": "6",
-            "5": "46",
-            "6": "0",
-            "7": "48",
-            "8": "33"
-        }
-    },
-{%- endmacro %}
-{% endif %}
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From 8f80dc3a1b287414dec3d3291e99194b51d868bd Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 2 Nov 2022 21:21:29 +0800
Subject: [PATCH 1451/1674] [ci/build]: Upgrade SONiC package versions (#12583)

---
 .../versions-deb-buster                       | 34 ++++++++---------
 .../build-sonic-slave-buster/versions-git     |  2 +-
 files/build/versions/default/versions-git     |  4 +-
 files/build/versions/default/versions-web     |  2 +-
 .../docker-base-buster/versions-deb-buster    |  8 ++--
 .../versions-deb-buster                       |  6 +--
 .../versions-deb-buster-arm64                 |  4 +-
 .../versions-deb-buster-armhf                 |  4 +-
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../dockers/docker-lldp/versions-deb-buster   |  2 +-
 .../docker-orchagent/versions-deb-buster      |  4 +-
 .../versions-deb-buster                       | 24 ++++++------
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  4 +-
 .../versions-deb-buster                       |  6 +--
 .../docker-sonic-mgmt-framework/versions-py3  |  4 +-
 .../docker-sonic-vs/versions-deb-buster       |  4 +-
 .../docker-syncd-bfn/versions-deb-buster      |  2 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../versions-deb-buster                       |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 38 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 26 ++++++-------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   | 18 ++++-----
 .../host-image/versions-deb-buster-arm64      |  8 ++++
 .../host-image/versions-deb-buster-armhf      |  8 ++++
 files/build/versions/host-image/versions-py3  |  4 +-
 32 files changed, 126 insertions(+), 110 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 913770c8a9a4..07b440fa3e16 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.5.2320
-applibs-dev==1.mlnx.4.5.2320
+applibs==1.mlnx.4.5.3186
+applibs-dev==1.mlnx.4.5.3186
 bfnplatform==1.0.0
 innovium-sai==0.107.6
 innovium-sai-headers==0.107.6
-iproute2-dev==1.mlnx.4.5.2320
+iproute2-dev==1.mlnx.4.5.3186
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -55,20 +55,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.5.2320
-sx-acl-helper-dev==1.mlnx.4.5.2320
-sx-complib==1.mlnx.4.5.2320
-sx-complib-dev==1.mlnx.4.5.2320
-sx-examples==1.mlnx.4.5.2320
-sx-examples-dev==1.mlnx.4.5.2320
-sx-gen-utils==1.mlnx.4.5.2320
-sx-gen-utils-dev==1.mlnx.4.5.2320
-sx-scew==1.mlnx.4.5.2320
-sx-scew-dev==1.mlnx.4.5.2320
-sxd-libs==1.mlnx.4.5.2320
-sxd-libs-dev==1.mlnx.4.5.2320
+sx-acl-helper==1.mlnx.4.5.3186
+sx-acl-helper-dev==1.mlnx.4.5.3186
+sx-complib==1.mlnx.4.5.3186
+sx-complib-dev==1.mlnx.4.5.3186
+sx-examples==1.mlnx.4.5.3186
+sx-examples-dev==1.mlnx.4.5.3186
+sx-gen-utils==1.mlnx.4.5.3186
+sx-gen-utils-dev==1.mlnx.4.5.3186
+sx-scew==1.mlnx.4.5.3186
+sx-scew-dev==1.mlnx.4.5.3186
+sxd-libs==1.mlnx.4.5.3186
+sxd-libs-dev==1.mlnx.4.5.3186
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.5.2320
-wjh-libs-dev==1.mlnx.4.5.2320
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.3186
+wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 5ff643d48cdd..a64fd09051d8 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
+https://github.com/jeroennijhof/pam_tacplus.git==d02746dec5d6216ee550fd0850743e86305bca64
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 92b934fead93..147effe61118 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,9 +1,9 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8
+https://github.com/jeroennijhof/pam_tacplus.git==d02746dec5d6216ee550fd0850743e86305bca64
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index d94d90f0390f..65035b2105e4 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==f603a03a9c19dfcff06549da4d65e6ea
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==1114280c0f746528d6722fd50a814f42
+https://deb.nodesource.com/setup_14.x==8b4c0534353a1bf3154e84f6b1654460
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 1ff8f5822490..88c428ec54bd 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -34,8 +34,8 @@ libpgm-5.2-0==5.2.122~dfsg-3
 libprocps7==2:3.3.15-2
 libpsl5==0.20.2-2
 libpython3-stdlib==3.7.3-1
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u4
+libpython3.7-stdlib==3.7.3-2+deb10u4
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsasl2-2==2.1.27+dfsg-1+deb10u2
@@ -62,8 +62,8 @@ python3-distutils==3.7.3-1
 python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
 python3-pip==18.1-5
-python3.7==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
+python3.7==3.7.3-2+deb10u4
+python3.7-minimal==3.7.3-2+deb10u4
 readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1+deb10u2
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 0c2357cf641f..0b45009c4d39 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -35,8 +35,8 @@ libnl-genl-3-200==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libpython3-dev==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7==3.7.3-2+deb10u4
+libpython3.7-dev==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
@@ -47,5 +47,5 @@ make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
 python3-swsscommon==1.0.0
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 xz-utils==5.2.4-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index 1d7724fcece7..cebc4572f178 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u4
-libxml2-dev==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2-dev==2.9.4+dfsg1-7+deb10u5
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index bd7943b727a2..094a0ed6f29b 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u4
-libxml2-dev==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2-dev==2.9.4+dfsg1-7+deb10u5
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index bf7c5b08e1e0..fb011461608f 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.9.13
+regex==2022.10.31
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index e3144dc4e7b0..58b1a623d0ea 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -18,7 +18,7 @@ libsnmp-base==5.7.3+dfsg-5
 libsnmp30==5.7.3+dfsg-5
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
 mariadb-common==1:10.3.36-0+deb10u2
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index e1eb375dded9..43e356bb7187 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -43,7 +43,7 @@ libnfnetlink0==1.0.1-3+b1
 libpcap0.8==1.8.1-6+deb10u1
 libpopt0==1.16-12
 libpython3-dev==3.7.3-1
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 libsairedis-dbg==1.0.0
 libstdc++-8-dev==8.3.0-6
@@ -58,7 +58,7 @@ ndppd==0.2.5-4+deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 2c2af5b751b6..4a62db9d6a8b 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.5.2320
-applibs-dev==1.mlnx.4.5.2320
+applibs==1.mlnx.4.5.3186
+applibs-dev==1.mlnx.4.5.3186
 binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
@@ -72,7 +72,7 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-dev==3.7.3-1
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
@@ -94,7 +94,7 @@ libxcb-shm0==1.13.1-2
 libxcb1==1.13.1-2
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 libxrender1==1:0.9.10-1
 linux-libc-dev==4.19.260-1
 lm-sensors==1:3.5.0-3
@@ -108,7 +108,7 @@ python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
-python-sdk-api==1.mlnx.4.5.2320
+python-sdk-api==1.mlnx.4.5.3186
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -121,7 +121,7 @@ python3-dev==3.7.3-1
 python3-jsonschema==2.6.0-4
 python3-pkg-resources==40.8.0-1
 python3-smbus==4.1-1
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 rrdtool==1.7.1-2
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
@@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.5.2320
-sx-complib-dev==1.mlnx.4.5.2320
-sx-gen-utils==1.mlnx.4.5.2320
-sx-gen-utils-dev==1.mlnx.4.5.2320
-sxd-libs==1.mlnx.4.5.2320
-sxd-libs-dev==1.mlnx.4.5.2320
+sx-complib==1.mlnx.4.5.3186
+sx-complib-dev==1.mlnx.4.5.3186
+sx-gen-utils==1.mlnx.4.5.3186
+sx-gen-utils-dev==1.mlnx.4.5.3186
+sxd-libs==1.mlnx.4.5.3186
+sxd-libs-dev==1.mlnx.4.5.3186
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5+deb10u2
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index ef1c55ef6e56..aa6fd5acb17b 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.7.post1
 pyang==2.5.3
 pyangbind==0.6.0
-python-sdk-api==4.5.2320
+python-sdk-api==4.5.3186
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 3b41ecca6169..7351c08c8e00 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.5.2320
+python_sdk_api==4.5.3186
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 4780c3740ec8..aa3b86cf1f81 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -37,7 +37,7 @@ libmpx2==8.3.0-6
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libpython3-dev==3.7.3-1
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
@@ -54,7 +54,7 @@ mariadb-common==1:10.3.36-0+deb10u2
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 python3-dev==3.7.3-1
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 snmp==5.7.3+dfsg-5
 snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 90154aca3661..1d1982c609d6 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -42,13 +42,13 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-dev==3.7.3-1
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 libstdc++-8-dev==8.3.0-6
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 libyang==1.0.73
 linux-libc-dev==4.19.260-1
 openssh-client==1:7.9p1-10+deb10u2
@@ -64,7 +64,7 @@ python2.7==2.7.16-2+deb10u1
 python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3-dev==3.7.3-1
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 0f5c1792258a..68e5949bb579 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,7 +12,7 @@ importlib-metadata==5.0.0
 importlib-resources==5.10.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.16.0
+jsonschema==4.17.0
 jsonschema-spec==0.1.2
 lazy-object-proxy==1.8.0
 openapi-schema-validator==0.3.4
@@ -20,7 +20,7 @@ openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
 protobuf==4.21.9
-pyrsistent==0.18.1
+pyrsistent==0.19.1
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index d67b953874f9..35c7a9d50468 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -87,7 +87,7 @@ libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-dev==3.7.3-1
-libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u4
 libqt5core5a==5.11.3+dfsg1-1+deb10u5
 libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
@@ -133,7 +133,7 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3-dev==3.7.3-1
 python3-yang==1.0.73
-python3.7-dev==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u4
 redis-server==5:6.0.6-1~bpo10+1
 sensible-utils==0.0.12
 sonic-device-data==1.0-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 3509874b4b6c..e13edcae91c6 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -18,6 +18,6 @@ libunwind-dev==1.2.1-10~deb10u1
 libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 linux-libc-dev==4.19.260-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index cf2980edc70a..66bf4a3b5295 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -51,7 +51,7 @@ libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 8435687c91a6..3e65aee64872 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -53,7 +53,7 @@ libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 linux-libc-dev==4.19.260-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index b33168a80bb1..c062900d890b 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,8 +1,8 @@
-applibs==1.mlnx.4.5.2320
-applibs-dev==1.mlnx.4.5.2320
+applibs==1.mlnx.4.5.3186
+applibs-dev==1.mlnx.4.5.3186
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2-dev==1.mlnx.4.5.2320
+iproute2-dev==1.mlnx.4.5.3186
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u2
@@ -30,7 +30,7 @@ libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
 linux-libc-dev==4.19.260-1
 mft==4.18.0-106
 mlnx-sai==1.mlnx.SAIRel1.22.0.0
@@ -41,7 +41,7 @@ python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.5.2320
+python-sdk-api==1.mlnx.4.5.3186
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.5.2320
-sx-acl-helper-dev==1.mlnx.4.5.2320
-sx-complib==1.mlnx.4.5.2320
-sx-complib-dev==1.mlnx.4.5.2320
-sx-examples==1.mlnx.4.5.2320
-sx-examples-dev==1.mlnx.4.5.2320
-sx-gen-utils==1.mlnx.4.5.2320
-sx-gen-utils-dev==1.mlnx.4.5.2320
-sx-scew==1.mlnx.4.5.2320
-sx-scew-dev==1.mlnx.4.5.2320
-sxd-libs==1.mlnx.4.5.2320
-sxd-libs-dev==1.mlnx.4.5.2320
+sx-acl-helper==1.mlnx.4.5.3186
+sx-acl-helper-dev==1.mlnx.4.5.3186
+sx-complib==1.mlnx.4.5.3186
+sx-complib-dev==1.mlnx.4.5.3186
+sx-examples==1.mlnx.4.5.3186
+sx-examples-dev==1.mlnx.4.5.3186
+sx-gen-utils==1.mlnx.4.5.3186
+sx-gen-utils-dev==1.mlnx.4.5.3186
+sx-scew==1.mlnx.4.5.3186
+sx-scew-dev==1.mlnx.4.5.3186
+sxd-libs==1.mlnx.4.5.3186
+sxd-libs-dev==1.mlnx.4.5.3186
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u2
 vim-runtime==2:8.1.0875-5+deb10u2
-wjh-libs==1.mlnx.4.5.2320
-wjh-libs-dev==1.mlnx.4.5.2320
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.3186
+wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index 1f331339b2a0..8a09c5423b62 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.5.2320
\ No newline at end of file
+python-sdk-api==4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 7a17510aeb5e..87eac0d90289 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.5.2320
\ No newline at end of file
+python_sdk_api==4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index aeab4400cafa..b7698f6111f8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -83,7 +83,7 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u5
+distro-info-data==0.41+deb10u6
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
@@ -943,11 +943,11 @@ libpython3-all-dev==3.7.3-1
 libpython3-dbg==3.7.3-1
 libpython3-dev==3.7.3-1
 libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dbg==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
+libpython3.7==3.7.3-2+deb10u4
+libpython3.7-dbg==3.7.3-2+deb10u4
+libpython3.7-dev==3.7.3-2+deb10u4
+libpython3.7-minimal==3.7.3-2+deb10u4
+libpython3.7-stdlib==3.7.3-2+deb10u4
 libqdox-java==1.12.1-3
 libqdox2-java==2.0~M10-1
 libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
@@ -1279,9 +1279,9 @@ libxml-sax-perl==1.00+dfsg-1
 libxml-simple-perl==2.25-1
 libxml-twig-perl==1:3.50-1.1
 libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u4
-libxml2-dev==2.9.4+dfsg1-7+deb10u4
-libxml2-utils==2.9.4+dfsg1-7+deb10u4
+libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxml2-utils==2.9.4+dfsg1-7+deb10u5
 libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
@@ -1607,10 +1607,10 @@ python3-unidiff==0.5.4-1
 python3-urllib3==1.24.1-1
 python3-wheel==0.32.3-2
 python3-xdg==0.25-5
-python3.7==3.7.3-2+deb10u3
-python3.7-dbg==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
+python3.7==3.7.3-2+deb10u4
+python3.7-dbg==3.7.3-2+deb10u4
+python3.7-dev==3.7.3-2+deb10u4
+python3.7-minimal==3.7.3-2+deb10u4
 qdbus==4:4.8.7+dfsg-18+deb10u1
 qemu-kvm==1:3.1+dfsg-8+deb10u9
 qemu-system-common==1:3.1+dfsg-8+deb10u9
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 1838b73c788b..ce6bcde5c247 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index b9140ea457be..dcb19d3a8973 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.9.13
+regex==2022.10.31
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 1838b73c788b..ce6bcde5c247 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6f2321d1de694d4ca56784ba8b5634f9ca74b3a6
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index c365675cee60..bb26f4deac9f 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -24,7 +24,7 @@ dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u5
+distro-info-data==0.41+deb10u6
 dmidecode==3.2-1
 dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
@@ -198,10 +198,10 @@ libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-dev==3.7.3-1
 libpython3-stdlib==3.7.3-1
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
+libpython3.7==3.7.3-2+deb10u4
+libpython3.7-dev==3.7.3-2+deb10u4
+libpython3.7-minimal==3.7.3-2+deb10u4
+libpython3.7-stdlib==3.7.3-2+deb10u4
 libquadmath0==8.3.0-6
 libreadline7==7.0-5
 librtmp1==2.4+20151223.gitfa8646d.1-2
@@ -297,9 +297,9 @@ python3-pycurl==7.43.0.2-0.1
 python3-software-properties==0.96.20.2-2
 python3-swsscommon==1.0.0
 python3-yang==1.0.73
-python3.7==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
+python3.7==3.7.3-2+deb10u4
+python3.7-dev==3.7.3-2+deb10u4
+python3.7-minimal==3.7.3-2+deb10u4
 rasdaemon==0.6.0-1.2
 readline-common==7.0-5
 rsyslog==8.1901.0-1+deb10u2
@@ -314,7 +314,7 @@ squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u3
 swig==3.0.12-2
 swig3.0==3.0.12-2
-sx-kernel==1.mlnx.4.5.2320
+sx-kernel==1.mlnx.4.5.3186
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index dc0ded8ae736..ec914a47fee0 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -2,6 +2,7 @@ binutils-aarch64-linux-gnu==2.31.1-16
 bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
+distro-info-data==0.41+deb10u5
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -20,6 +21,10 @@ libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libksba8==1.3.5-2
 libncurses6==6.1+20181013-2+deb10u2
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
@@ -29,6 +34,9 @@ linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 pkg-config==0.29-6
+python3.7==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
 tsingma-bsp==1.0
 unzip==6.0-23+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index c219a1e9dd0c..6981ce072ff2 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -2,6 +2,7 @@ binutils-arm-linux-gnueabihf==2.31.1-16
 bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
+distro-info-data==0.41+deb10u5
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
@@ -20,6 +21,10 @@ libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
 libksba8==1.3.5-2
 libncurses6==6.1+20181013-2+deb10u2
+libpython3.7==3.7.3-2+deb10u3
+libpython3.7-dev==3.7.3-2+deb10u3
+libpython3.7-minimal==3.7.3-2+deb10u3
+libpython3.7-stdlib==3.7.3-2+deb10u3
 libsqlite3-0==3.27.2-3+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
@@ -30,5 +35,8 @@ linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 mrvlprestera==1.0
 pkg-config==0.29-6
+python3.7==3.7.3-2+deb10u3
+python3.7-dev==3.7.3-2+deb10u3
+python3.7-minimal==3.7.3-2+deb10u3
 unzip==6.0-23+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 8774c2833190..ba32b1a6d6de 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.9.24
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==38.0.1
+cryptography==38.0.3
 docker==4.3.1
 idna==3.4
 ijson==2.6.1
@@ -32,7 +32,7 @@ pyroute2==0.5.14
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.9.13
+regex==2022.10.31
 requests==2.28.1
 scapy==2.4.4
 six==1.16.0

From 2abb9e1c464cdc1257691a8a24fd6266bda18ee0 Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Thu, 3 Nov 2022 11:38:31 -0700
Subject: [PATCH 1452/1674] [202205][multi-asic] Fix the issue where if dest
 port is not specified in ACL rule than caclmgrd gets exception (#12577)

Why I did it
Creating this PR to take changes from sonic-net/sonic-host-services#21
---
 src/sonic-host-services/scripts/caclmgrd      | 43 ++++++++++---------
 .../caclmgrd/cacl_external_client_acl_test.py |  7 +++
 .../test_external_client_acl_vectors.py       | 35 +++++++++++++++
 3 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index 5faf6423107d..dbde8c13e8c7 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -300,27 +300,28 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 nat_source_ipv6_set = acl_source_ip_map[acl_service]["ipv6"] if acl_source_ip_map and acl_source_ip_map[acl_service]["ipv6"] else { "::/0" }
 
                 for ip_protocol in self.ACL_SERVICES[acl_service]["ip_protocols"]:
-                    for dst_port in  self.ACL_SERVICES[acl_service]["dst_ports"]: 
-                        for ipv4_src_ip in nat_source_ipv4_set:
-                            # IPv4 rules
-                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                                               "iptables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
-                                                               (ip_protocol, ipv4_src_ip, dst_port,
-                                                                self.namespace_mgmt_ip))
-                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                                               "iptables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
-                                                               (ip_protocol, ipv4_src_ip, dst_port,
-                                                                self.namespace_docker_mgmt_ip[namespace]))
-                        for ipv6_src_ip in nat_source_ipv6_set:
-                            # IPv6 rules
-                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                                               "ip6tables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
-                                                               (ip_protocol, ipv6_src_ip, dst_port,
-                                                                self.namespace_mgmt_ipv6))
-                            fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
-                                                               "ip6tables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
-                                                               (ip_protocol,ipv6_src_ip, dst_port,
-                                                                self.namespace_docker_mgmt_ipv6[namespace]))
+                    if "dst_ports" in self.ACL_SERVICES[acl_service]:
+                        for dst_port in  self.ACL_SERVICES[acl_service]["dst_ports"]: 
+                            for ipv4_src_ip in nat_source_ipv4_set:
+                                # IPv4 rules
+                                fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                                   "iptables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
+                                                                   (ip_protocol, ipv4_src_ip, dst_port,
+                                                                    self.namespace_mgmt_ip))
+                                fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                                   "iptables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
+                                                                   (ip_protocol, ipv4_src_ip, dst_port,
+                                                                    self.namespace_docker_mgmt_ip[namespace]))
+                            for ipv6_src_ip in nat_source_ipv6_set:
+                                # IPv6 rules
+                                fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                                   "ip6tables -t nat -A PREROUTING -p {} -s {} --dport {}  -j DNAT --to-destination {}".format
+                                                                   (ip_protocol, ipv6_src_ip, dst_port,
+                                                                    self.namespace_mgmt_ipv6))
+                                fwd_traffic_from_namespace_to_host_cmds.append(self.iptables_cmd_ns_prefix[namespace] +
+                                                                   "ip6tables -t nat -A POSTROUTING -p {} -s {} --dport {} -j SNAT --to-source {}".format
+                                                                   (ip_protocol,ipv6_src_ip, dst_port,
+                                                                    self.namespace_docker_mgmt_ipv6[namespace]))
 
         return fwd_traffic_from_namespace_to_host_cmds
 
diff --git a/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
index ef1aa62fe82d..6fbb7a8f728a 100644
--- a/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
+++ b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
@@ -42,3 +42,10 @@ def test_caclmgrd_external_client_acl(self, test_name, test_data, fs):
 
         iptables_rules_ret, _ = caclmgrd_daemon.get_acl_rules_and_translate_to_iptables_commands('')
         self.assertEqual(set(test_data["return"]).issubset(set(iptables_rules_ret)), True)
+        caclmgrd_daemon.iptables_cmd_ns_prefix['asic0'] = 'ip netns exec asic0'
+        caclmgrd_daemon.namespace_docker_mgmt_ip['asic0'] = '1.1.1.1'
+        caclmgrd_daemon.namespace_mgmt_ip = '2.2.2.2'
+        caclmgrd_daemon.namespace_docker_mgmt_ipv6['asic0'] = 'fd::01'
+        caclmgrd_daemon.namespace_mgmt_ipv6 = 'fd::02'
+
+        _ = caclmgrd_daemon.generate_fwd_traffic_from_namespace_to_host_commands('asic0', None)
diff --git a/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py
index d55e6b8e6ce4..ed005dcb04a3 100644
--- a/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py
+++ b/src/sonic-host-services/tests/caclmgrd/test_external_client_acl_vectors.py
@@ -4,6 +4,41 @@
     caclmgrd test external_client_acl vector
 """
 EXTERNAL_CLIENT_ACL_TEST_VECTOR = [
+    [
+        "Test for EXTERNAL_CLIENT_ACL with no dest port configured.",
+        {
+            "config_db": {
+                "ACL_TABLE": {
+                    "EXTERNAL_CLIENT_ACL": {
+                        "stage": "INGRESS",
+                        "type": "CTRLPLANE",
+                        "services": [
+                            "EXTERNAL_CLIENT"
+                        ]
+                    }
+                },
+                "ACL_RULE": {
+                    "EXTERNAL_CLIENT_ACL|DEFAULT_RULE": {
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "1"
+                    },
+                    "EXTERNAL_CLIENT_ACL|RULE_1": {
+                        "PACKET_ACTION": "ACCEPT",
+                        "PRIORITY": "9998",
+                        "SRC_IP": "20.0.0.55/32"
+                    },
+                },
+                "DEVICE_METADATA": {
+                    "localhost": {
+                    }
+                },
+                "FEATURE": {},
+            },
+            "return": [
+            ],
+        }
+    ],
     [
         "Test single IPv4 dst port + src ip for EXTERNAL_CLIENT_ACL",
         {

From bf39fca99edfbfb5797f4d898e5b11810aaae7c6 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 6 Nov 2022 20:16:03 +0800
Subject: [PATCH 1453/1674] [ci/build]: Upgrade SONiC package versions (#12604)

---
 .../build/build-sonic-slave-buster/versions-git    |  2 +-
 .../build/build-sonic-slave-buster/versions-py3    |  4 ++--
 files/build/versions/default/versions-git          |  4 ++--
 files/build/versions/default/versions-web          |  2 +-
 .../build/versions/dockers/docker-ptf/versions-py2 |  4 ++--
 .../docker-sonic-mgmt-framework/versions-py3       |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster | 14 +++++++-------
 .../sonic-slave-buster/versions-deb-buster-arm64   |  2 +-
 .../sonic-slave-buster/versions-deb-buster-armhf   |  2 +-
 .../dockers/sonic-slave-buster/versions-git        |  2 +-
 .../dockers/sonic-slave-stretch/versions-git       |  2 +-
 files/build/versions/host-image/versions-py3       |  2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index a64fd09051d8..24cca8fdc754 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,6 +1,6 @@
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==d02746dec5d6216ee550fd0850743e86305bca64
+https://github.com/jeroennijhof/pam_tacplus.git==bef8c30f553def8e1e8eb2a853d6523eaf02866a
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 403c08582c84..198a5f0d9a03 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,6 +1,6 @@
 charset-normalizer==2.1.1
 click==7.0
-docker==6.0.0
+docker==6.0.1
 ijson==2.6.1
 ipaddress==1.0.23
 jsondiff==2.0.0
@@ -12,6 +12,6 @@ psutil==5.9.3
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
-websocket-client==1.4.1
+websocket-client==1.4.2
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 147effe61118..254a0374a9a9 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,9 +1,9 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==d02746dec5d6216ee550fd0850743e86305bca64
+https://github.com/jeroennijhof/pam_tacplus.git==bef8c30f553def8e1e8eb2a853d6523eaf02866a
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 65035b2105e4..09cfe50ca11a 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -18,7 +18,7 @@ http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==f603a03a9c19dfcff06549da4d65e6ea
+https://deb.nodesource.com/node_14.x/dists/buster/Release==d701f2bf6451c4b10cf3670af05ab217
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==8b4c0534353a1bf3154e84f6b1654460
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index efedb95e040e..298826561e43 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -25,7 +25,7 @@ markupsafe==1.1.1
 netaddr==0.8.0
 nnpy==1.4.2
 oslo.config==2.1.0
-paramiko==2.11.0
+paramiko==2.12.0
 pathlib2==2.3.7.post1
 pbr==2.0.0
 pexpect==4.8.0
@@ -64,4 +64,4 @@ wcwidth==0.2.5
 werkzeug==1.0.1
 yabgp==0.8.2
 zipp==1.2.0
-zope.interface==5.5.0
\ No newline at end of file
+zope.interface==5.5.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 68e5949bb579..760d9f5d0ccd 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -20,7 +20,7 @@ openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
 protobuf==4.21.9
-pyrsistent==0.19.1
+pyrsistent==0.19.2
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.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
index b7698f6111f8..07df9aed2e55 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -264,10 +264,10 @@ libavahi-common-data==0.7-4+deb10u1
 libavahi-common3==0.7-4+deb10u1
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
-libavcodec58==7:4.1.9-0+deb10u1
-libavfilter7==7:4.1.9-0+deb10u1
-libavformat58==7:4.1.9-0+deb10u1
-libavutil56==7:4.1.9-0+deb10u1
+libavcodec58==7:4.1.10-0+deb10u1
+libavfilter7==7:4.1.10-0+deb10u1
+libavformat58==7:4.1.10-0+deb10u1
+libavutil56==7:4.1.10-0+deb10u1
 libb-hooks-endofscope-perl==0.24-1
 libb-hooks-op-check-perl==0.22-1+b1
 libbabeltrace-dev==1.5.6-2+deb10u1
@@ -914,7 +914,7 @@ libpolkit-agent-1-0==0.105-25+deb10u1
 libpolkit-backend-1-0==0.105-25+deb10u1
 libpolkit-gobject-1-0==0.105-25+deb10u1
 libpopt0==1.16-12
-libpostproc55==7:4.1.9-0+deb10u1
+libpostproc55==7:4.1.10-0+deb10u1
 libpotrace0==1.15-1
 libprocps7==2:3.3.15-2
 libprotobuf-c1==1.3.1-1+b1
@@ -1076,8 +1076,8 @@ libsubunit-dev==1.3.0-1
 libsubunit0==1.3.0-1
 libsurefire-java==2.22.1-1
 libswitch-perl==2.17-2
-libswresample3==7:4.1.9-0+deb10u1
-libswscale5==7:4.1.9-0+deb10u1
+libswresample3==7:4.1.10-0+deb10u1
+libswscale5==7:4.1.10-0+deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u8
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 879016873318..30f56b7d2027 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u2
-nodejs==14.20.1-deb-1nodesource1
\ No newline at end of file
+nodejs==14.21.1-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 1922ccd3534b..1ea337db0008 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -103,7 +103,7 @@ linux-compiler-gcc-8-arm==4.19.260-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.20.1-deb-1nodesource1
+nodejs==14.21.1-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index ce6bcde5c247..a316a18a2e9b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index ce6bcde5c247..a316a18a2e9b 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1adbbff2c0a0df872cce7adb9e86bbaa68444028
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index ba32b1a6d6de..04997d207238 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -40,5 +40,5 @@ tabulate==0.9.0
 thrift==0.13.0
 urllib3==1.26.12
 watchdog==0.10.3
-websocket-client==1.4.1
+websocket-client==1.4.2
 xmltodict==0.12.0
\ No newline at end of file

From c10aa3b8263a0ed7721e53563417b9534049c995 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Mon, 7 Nov 2022 16:07:37 +0800
Subject: [PATCH 1454/1674] Add a parameter for libsaithrift to skip error on
 errno -2 (#12581) (#12617)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 platform/broadcom/libsaithrift-dev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
index 0d32a08a276c..d8ad7df77fd0 100644
--- a/platform/broadcom/libsaithrift-dev.mk
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -8,7 +8,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 ifeq ($(SAITHRIFT_V2),y)
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0)
-$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2
+$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="\"--skip_error=-2\""
 else
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)

From be091bd60a88c872d3a20a5ee1600139a5520e34 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Tue, 8 Nov 2022 18:42:41 +0800
Subject: [PATCH 1455/1674] Advance sairedis header (#12631)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 2f92b4493ebf..d0fc9430e174 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 2f92b4493ebf8929dbec3a58d6b400a20cd1b554
+Subproject commit d0fc9430e174d9cd48a28ddc18afc08dd0a41533

From 856e536659eee2aeb585a4711ad685a53a05fd31 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 9 Nov 2022 23:36:30 +0800
Subject: [PATCH 1456/1674] [ci/build]: Upgrade SONiC package versions (#12655)

---
 .../build/build-sonic-slave-buster/versions-git    |  6 +++---
 .../build/build-sonic-slave-buster/versions-py3    |  2 +-
 files/build/versions/default/versions-git          |  8 ++++----
 .../dockers/docker-base-buster/versions-deb-buster |  6 +++---
 .../dockers/docker-database/versions-deb-buster    |  4 ++--
 .../dockers/docker-dhcp-relay/versions-deb-buster  |  4 ++--
 .../dockers/docker-fpm-frr/versions-deb-buster     |  4 ++--
 .../dockers/docker-gbsyncd-vs/versions-deb-buster  |  4 ++--
 .../dockers/docker-lldp/versions-deb-buster        |  4 ++--
 .../dockers/docker-mux/versions-deb-buster         |  4 ++--
 .../dockers/docker-nat/versions-deb-buster         |  4 ++--
 .../dockers/docker-orchagent/versions-deb-buster   |  4 ++--
 .../docker-platform-monitor/versions-deb-buster    |  6 +++---
 .../docker-router-advertiser/versions-deb-buster   |  4 ++--
 .../dockers/docker-sflow/versions-deb-buster       |  4 ++--
 .../dockers/docker-snmp/versions-deb-buster        |  4 ++--
 .../versions/dockers/docker-snmp/versions-py3      |  2 +-
 .../versions-deb-buster                            |  4 ++--
 .../docker-sonic-telemetry/versions-deb-buster     |  4 ++--
 .../dockers/docker-syncd-brcm/versions-deb-buster  |  4 ++--
 .../docker-syncd-centec/versions-deb-buster        |  4 ++--
 .../dockers/docker-syncd-invm/versions-deb-buster  |  4 ++--
 .../dockers/docker-syncd-mlnx/versions-deb-buster  |  4 ++--
 .../dockers/docker-syncd-vs/versions-deb-buster    |  4 ++--
 .../dockers/docker-teamd/versions-deb-buster       |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster | 14 +++++++-------
 .../dockers/sonic-slave-buster/versions-git        |  2 +-
 .../dockers/sonic-slave-stretch/versions-git       |  2 +-
 .../build/versions/host-image/versions-deb-buster  | 10 +++++-----
 .../versions/host-image/versions-deb-buster-arm64  |  5 +++++
 .../versions/host-image/versions-deb-buster-armhf  |  5 +++++
 files/build/versions/host-image/versions-py3       |  2 +-
 32 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 24cca8fdc754..0e625bef938e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,10 +1,10 @@
-https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
+https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==bef8c30f553def8e1e8eb2a853d6523eaf02866a
+https://github.com/jeroennijhof/pam_tacplus.git==104044848ffb0a283e1f1bf3466693fa4af450e9
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
-https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
+https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 198a5f0d9a03..500452c7633a 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -8,7 +8,7 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.9.3
+psutil==5.9.4
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 254a0374a9a9..71b68bbe1d5c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,16 +1,16 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102
+https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==bef8c30f553def8e1e8eb2a853d6523eaf02866a
+https://github.com/jeroennijhof/pam_tacplus.git==104044848ffb0a283e1f1bf3466693fa4af450e9
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
-https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f
+https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 88c428ec54bd..b160f0a900cf 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -68,6 +68,6 @@ readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1+deb10u2
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.1.0875-5+deb10u2
-vim-tiny==2:8.1.0875-5+deb10u2
-xxd==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim-common==2:8.1.0875-5+deb10u3
+vim-tiny==2:8.1.0875-5+deb10u3
+xxd==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
index 3a15169bef7c..f6a5a35cee0f 100644
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 redis-server==5:6.0.6-1~bpo10+1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index a39ec37608ea..7194cb721e2a 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -28,5 +28,5 @@ sonic-dhcpmon==1.0.0-0
 sonic-dhcpmon-dbgsym==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index c52cfd242a2f..c54f0ff1b9df 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -33,5 +33,5 @@ sensible-utils==0.0.12
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index e194f52f4366..3402cc62fc4b 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 58b1a623d0ea..2be0ec1ee8e7 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -26,5 +26,5 @@ mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
index d5d8b3763136..f582d89edb51 100644
--- a/files/build/versions/dockers/docker-mux/versions-deb-buster
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -25,5 +25,5 @@ sonic-linkmgrd==1.0.0-1
 sonic-linkmgrd-dbgsym==1.0.0-1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
index 995fea293abf..71e74c97fd5f 100644
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -23,5 +23,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index 43e356bb7187..dfb3ade7a3a9 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -63,5 +63,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
 tcpdump==4.9.3-1~deb10u2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 4a62db9d6a8b..e77849a397a6 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -60,7 +60,7 @@ libpango-1.0-0==1.42.4-8~deb10u1
 libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
 libpci3==1:3.5.2-1
-libpixman-1-0==0.36.0-1
+libpixman-1-0==0.36.0-1+deb10u1
 libpng16-16==1.6.36-6
 libpopt0==1.16-12
 libpython-dev==2.7.16-1
@@ -137,5 +137,5 @@ sxd-libs==1.mlnx.4.5.3186
 sxd-libs-dev==1.mlnx.4.5.3186
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
index 10f1ebf4bb91..797ea1d7d9b4 100644
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 radvd==1:2.17-2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
index b484eb828ba2..64b267060fc8 100644
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -16,5 +16,5 @@ psample==1.1-1
 sflowtool==5.04
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index aa3b86cf1f81..526cd9e7ac2c 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -61,5 +61,5 @@ snmpd==5.7.3+dfsg-5
 snmpd-dbgsym==5.7.3+dfsg-5
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index 078a8cd64cb8..2b0260cea69f 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.0.0
-psutil==5.9.3
+psutil==5.9.4
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 1d1982c609d6..f92e76c0b694 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -70,5 +70,5 @@ sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
index db799f904509..0ff3d329e621 100644
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -15,5 +15,5 @@ sonic-mgmt-common==1.0.0
 sonic-telemetry==0.1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index fae8d8d8e71b..a96ea19ef8d6 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -31,6 +31,6 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index d85883d1728c..efcdf175e4cd 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -18,5 +18,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 52b4bf3f9725..905f306d0fcc 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -23,5 +23,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index c062900d890b..6c30f277bc4e 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -65,7 +65,7 @@ sxd-libs==1.mlnx.4.5.3186
 sxd-libs-dev==1.mlnx.4.5.3186
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
 wjh-libs==1.mlnx.4.5.3186
 wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index e194f52f4366..3402cc62fc4b 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
index e5c88ab32b5d..564f4249ff76 100644
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -17,5 +17,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 07df9aed2e55..7806ea303c92 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -887,8 +887,8 @@ libperlio-gzip-perl==0.19-1+b5
 libpgm-5.2-0==5.2.122~dfsg-3
 libpgm-dev==5.2.122~dfsg-3
 libpipeline1==1.5.1-2
-libpixman-1-0==0.36.0-1
-libpixman-1-dev==0.36.0-1
+libpixman-1-0==0.36.0-1+deb10u1
+libpixman-1-dev==0.36.0-1+deb10u1
 libplexus-ant-factory-java==1.0~alpha2.1-4
 libplexus-archiver-java==3.6.0-2
 libplexus-bsh-factory-java==1.0~alpha7-4
@@ -1662,7 +1662,7 @@ sphinx-rtd-theme-common==0.4.3+dfsg-1
 squashfs-tools==1:4.3-12+deb10u2
 stgit==0.18-1
 strace==4.26-0.2
-sudo==1.8.27-1+deb10u3
+sudo==1.8.27-1+deb10u4
 swig==3.0.12-2
 swig3.0==3.0.12-2
 systemd==241-7~deb10u8
@@ -1696,9 +1696,9 @@ uuid-dev==2.33.1-0.1
 va-driver-all==2.4.0-1
 vdpau-driver-all==1.1.1-10
 velocity==1.7-5+deb10u1
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
+vim==2:8.1.0875-5+deb10u3
+vim-common==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
 wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 wget==1.20.1-1.1
@@ -1730,7 +1730,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.32-2.2~deb10u2
 xterm==344-1+deb10u2
 xtrans-dev==1.3.5-1
-xxd==2:8.1.0875-5+deb10u2
+xxd==2:8.1.0875-5+deb10u3
 xz-utils==5.2.4-1+deb10u1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index a316a18a2e9b..143662477eb8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index a316a18a2e9b..143662477eb8 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03b187d9c8d203b7171c294b71b44f549b392d83
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index bb26f4deac9f..2be6fc123bb4 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -311,7 +311,7 @@ sonic-host-services-data==1.0-1
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u2
 squashfs-tools==1:4.3-12+deb10u2
-sudo==1.8.27-1+deb10u3
+sudo==1.8.27-1+deb10u4
 swig==3.0.12-2
 swig3.0==3.0.12-2
 sx-kernel==1.mlnx.4.5.3186
@@ -330,9 +330,9 @@ udev==247.3-6~bpo10+1
 unzip==6.0-23+deb10u3
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
-xxd==2:8.1.0875-5+deb10u2
+vim==2:8.1.0875-5+deb10u3
+vim-common==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
+xxd==2:8.1.0875-5+deb10u3
 xz-utils==5.2.4-1+deb10u1
 zlib1g==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index ec914a47fee0..e6b184a24e51 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -37,6 +37,11 @@ pkg-config==0.29-6
 python3.7==3.7.3-2+deb10u3
 python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
+sudo==1.8.27-1+deb10u3
 tsingma-bsp==1.0
 unzip==6.0-23+deb10u2
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
+xxd==2:8.1.0875-5+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 6981ce072ff2..e341a35abef2 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -38,5 +38,10 @@ pkg-config==0.29-6
 python3.7==3.7.3-2+deb10u3
 python3.7-dev==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
+sudo==1.8.27-1+deb10u3
 unzip==6.0-23+deb10u2
+vim==2:8.1.0875-5+deb10u2
+vim-common==2:8.1.0875-5+deb10u2
+vim-runtime==2:8.1.0875-5+deb10u2
+xxd==2:8.1.0875-5+deb10u2
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 04997d207238..3894324f597f 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.9.3
+psutil==5.9.4
 ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1

From eb37bed49c39c6a9fe4157f957753142ab9be4a5 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 9 Nov 2022 08:16:03 -0800
Subject: [PATCH 1457/1674] [201811][DX010] enable LPM (#12641)

Why I did it
Without LPM enabled, the routing table size is very small.

How I did it
Enabling LPM.

Signed-off-by: Ying Xie ying.xie@microsoft.com
---
 .../th-seastone-dx010-32x100G-t0.config.bcm   |  1 +
 .../th-seastone-dx010-32x100G-t1.config.bcm   |  1 +
 ...th-seastone-dx010-48x50G+8x100G.config.bcm | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
index 5155fdcfe5ac..d1e484b697c2 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm
@@ -14,6 +14,7 @@ l2xmsg_mode=1
 l2_mem_entries=8192
 l3_mem_entries=8192
 l3_alpm_enable=2
+lpm_scaling_enable=0
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
index 3cf6f6f62b2b..5c97546a989c 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
@@ -14,6 +14,7 @@ l2xmsg_mode=1
 l2_mem_entries=8192
 l3_mem_entries=8192
 l3_alpm_enable=2
+lpm_scaling_enable=0
 ipv6_lpm_128b_enable=1
 mmu_lossless=0
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
index 9588fb59d6d8..4ded347e408c 100644
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm
@@ -4,14 +4,17 @@ l3_alpm_hit_skip=1
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1
 
-os=unix 
-l2xmsg_mode=1 
-parity_enable=0 
-rate_ext_mdio_divisor=0x80 
-phy_ext_rom_boot=0 
-fpem_mem_entries=32768 
-l2xmsg_mode=1 
-oversubscribe_mode=1 
+os=unix
+l2xmsg_mode=1
+parity_enable=0
+rate_ext_mdio_divisor=0x80
+phy_ext_rom_boot=0
+fpem_mem_entries=32768
+l2xmsg_mode=1
+oversubscribe_mode=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+ipv6_lpm_128b_enable=1
 pbmp_xport_xe=0xcccc44cc33113333044cccccc66666622
 
 

From 4f4f4cba21e4a3fd5ecb5d5f52269dcd84fc0822 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Thu, 10 Nov 2022 10:25:03 +0800
Subject: [PATCH 1458/1674] [202012] Add lossy scheduler for queue 7 (#12600)

* Add lossy scheduler for queue 7
---
 files/build_templates/qos_config.j2           |   7 +
 .../py3/qos-arista7050cx3-dualtor.json        |  96 +++++++++
 .../py3/qos-arista7260-dualtor.json           | 192 ++++++++++++++++++
 .../sample_output/py3/qos-arista7260-t1.json  |  84 ++++++++
 .../py3/qos-mellanox4600c-c64.json            |  84 ++++++++
 5 files changed, 463 insertions(+)

diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index a36d1a124a95..078dd4470b12 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -231,6 +231,7 @@
         "global": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
         }{% if PORT_ACTIVE %},{% endif %}
+
 {% endif %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}": {
@@ -330,6 +331,12 @@
         "{{ port }}|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+{# DSCP 48 is mapped to QUEUE 7 in macro generate_dscp_to_tc_map #}
+{% if (generate_dscp_to_tc_map is defined) and tunnel_qos_remap_enable %}
+        "{{ port }}|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
+{% endif %}
 {% endfor %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|6": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
index 05c15034ca70..b327fc2be3e0 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -1050,99 +1050,195 @@
         "Ethernet0|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet0|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet4|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet4|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet8|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet8|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet12|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet12|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet16|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet16|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet20|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet20|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet24|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet24|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet28|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet28|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet32|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet32|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet36|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet36|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet40|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet40|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet44|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet44|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet48|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet48|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet52|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet52|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet56|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet56|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet60|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet60|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet64|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet64|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet68|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet68|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet72|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet72|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet76|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet76|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet80|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet80|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet84|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet84|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet88|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet88|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet92|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet92|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet96|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet96|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet100|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet100|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet104|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet104|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet108|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet108|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet112|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet112|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet116|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet116|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet120|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet120|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet124|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet124|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet0|6": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index 6edfa8b0e9c4..21c1a70ceb75 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -1849,196 +1849,388 @@
         },
         "Ethernet0|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
+        },
+         "Ethernet0|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
         },
         "Ethernet4|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet4|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet8|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet8|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet12|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet12|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet16|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet16|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet20|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet20|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet24|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet24|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet28|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet28|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet32|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet32|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet36|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet36|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet40|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet40|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet44|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet44|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet48|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet48|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet52|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet52|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet56|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet56|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet60|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet60|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet64|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet64|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet68|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet68|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet72|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet72|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet76|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet76|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet80|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet80|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet84|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet84|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet88|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet88|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet92|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet92|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet96|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet96|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet100|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet100|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet104|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet104|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet108|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet108|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet112|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet112|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet116|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet116|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet120|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet120|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet124|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet124|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet128|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet128|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet132|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet132|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet136|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet136|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet140|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet140|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet144|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet144|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet148|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet148|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet152|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet152|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet156|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet156|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet160|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet160|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet164|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet164|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet168|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet168|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet172|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet172|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet176|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet176|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet180|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet180|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet184|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet184|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet188|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet188|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet192|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet192|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet196|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet196|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet200|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet200|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet204|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet204|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet208|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet208|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet212|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet212|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet216|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet216|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet220|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet220|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet224|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet224|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet228|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet228|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet232|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet232|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet236|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet236|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet240|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet240|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet244|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet244|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet248|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet248|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet252|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet252|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet0|6": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
index 34f745f19624..0d21f426cc47 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -925,87 +925,171 @@
         "Ethernet0|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet0|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet4|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet4|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet16|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet16|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet20|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet20|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet64|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet64|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet68|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet68|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet80|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet80|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet84|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet84|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet136|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet136|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet144|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet144|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet148|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet148|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet152|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet152|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet156|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet156|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet168|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet168|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet176|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet176|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet180|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet180|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet184|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet184|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet188|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet188|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet200|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet200|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet208|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet208|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet212|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet212|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet216|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet216|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet220|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet220|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet232|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet232|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet240|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet240|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet244|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet244|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet248|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet248|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet252|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet252|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet0|6": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
index cccdf926f0b7..a12464056d9c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4600c-c64.json
@@ -923,87 +923,171 @@
         "Ethernet0|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet0|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet4|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet4|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet16|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet16|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet20|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet20|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet64|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet64|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet68|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet68|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet80|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet80|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet84|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet84|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet136|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet136|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet144|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet144|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet148|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet148|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet152|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet152|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet156|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet156|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet168|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet168|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet176|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet176|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet180|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet180|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet184|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet184|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet188|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet188|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet200|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet200|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet208|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet208|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet212|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet212|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet216|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet216|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet220|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet220|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet232|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet232|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet240|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet240|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet244|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet244|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet248|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet248|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet252|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet252|7": {
+            "scheduler": "[SCHEDULER|scheduler.0]"
+        },
         "Ethernet0|6": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },

From 946f8a8c15e8a666d903eee836a70c595973d2a3 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Thu, 10 Nov 2022 10:56:03 -0800
Subject: [PATCH 1459/1674] [202012][sonic-linkmgrd] update submodule (#12666)

[202012][sonic-linkmgrd] update submodule

cf7274a Jing Zhang Mon Nov 7 14:50:40 2022 -0800 [active-standby][active-active] update link prober stats updating frequency to 30s (#152) (#155)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index aa8fe6deff46..cf7274a17fec 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit aa8fe6deff466909909430f00598d2dba9490904
+Subproject commit cf7274a17fec6c756c4f028322f644fda74644bf

From 5d5339dd13b3dc2c1da93251438f2752f8b1da32 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 11 Nov 2022 20:31:36 +0800
Subject: [PATCH 1460/1674] [ci/build]: Upgrade SONiC package versions (#12676)

---
 .../versions/build/build-sonic-slave-buster/versions-git      | 2 +-
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 0e625bef938e..630c50acd1a8 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -7,7 +7,7 @@ https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6ec41f37e4f
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 71b68bbe1d5c..3a68deb2a72a 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -13,7 +13,7 @@ https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6ec41f37e4f
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 143662477eb8..9d193007a7bf 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 143662477eb8..9d193007a7bf 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==be2e926c5e9271d01b4e081f040bea16c083f693
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 275adc669191cc81540688a7701ef7e10af3427f Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Mon, 7 Nov 2022 12:10:00 -0800
Subject: [PATCH 1461/1674] [arp_update]: Fix hardcoded vlan (#12566)

Typo in prior PR #11919 hardcodes Vlan name. Change command to use the $vlan variable instead

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 files/scripts/arp_update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index cd2b13d0cf7c..57f0d5a562e2 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -58,7 +58,7 @@ while /bin/true; do
         # generates the following command for each failed or incomplete IPv6 neighbor
         # ip neigh replace <neighbor IPv6> dev <VLAN name> nud incomplete
         neigh_replace_template="sed -e 's/^/ip neigh replace /' -e 's/,/ dev /' -e 's/$/ nud incomplete;/'" 
-        ip_neigh_replace_cmd="ip -6 neigh show | grep -v fe80 | grep Vlan1000 | grep -E 'FAILED|INCOMPLETE' | cut -d ' ' -f 1,3 --output-delimiter=',' | $neigh_replace_template"
+        ip_neigh_replace_cmd="ip -6 neigh show | grep -v fe80 | grep $vlan | grep -E 'FAILED|INCOMPLETE' | cut -d ' ' -f 1,3 --output-delimiter=',' | $neigh_replace_template"
         eval `eval $ip_neigh_replace_cmd`
 
         # on dual ToR devices, try to resolve failed neighbor entries since

From 3683f803a6193a37ae928f32399b2590f8427f48 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Sun, 13 Nov 2022 01:16:57 -0800
Subject: [PATCH 1462/1674] [sairedis]: Submodule update (#12682)

Include following commit:

a60f4b9 [202012][Recorder]: Acquire lock for ofstream changes (#1144)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index d0fc9430e174..a60f4b95730a 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit d0fc9430e174d9cd48a28ddc18afc08dd0a41533
+Subproject commit a60f4b95730a67f31dfa849f580de2b5830b03d4

From db770a9353f9d37993ba8b2733802777ae0c438f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 13 Nov 2022 20:29:24 +0800
Subject: [PATCH 1463/1674] [ci/build]: Upgrade SONiC package versions (#12690)

---
 .../versions/build/build-sonic-slave-buster/versions-git    | 4 ++--
 files/build/versions/default/versions-git                   | 6 +++---
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 630c50acd1a8..d7540e377082 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==104044848ffb0a283e1f1bf3466693fa4af450e9
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
+https://github.com/sflow/host-sflow==d78a5f5dce73fb77c093795be7a96cf12220c3c6
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6e
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==98b80ec414b58514d3d44f756554324d925dfd83
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 3a68deb2a72a..4cdaba8e94a6 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c
+https://github.com/sflow/host-sflow==d78a5f5dce73fb77c093795be7a96cf12220c3c6
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6e
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==cac473afc339d472f01bd50674ddcf3adb5fc82e
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==98b80ec414b58514d3d44f756554324d925dfd83
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 9d193007a7bf..bb6d0454db5c 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 9d193007a7bf..bb6d0454db5c 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==f9c13056120aa60f702c7980095047ec12c57be5
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From ba8f7c14ae7dbc1e73b80e179ded12e75095bd97 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Mon, 14 Nov 2022 17:20:34 -0800
Subject: [PATCH 1464/1674] [202012][sonic-platform-daemons] submodule update
 (#12685)

git log --oneline aacb772..202012
these commits are added in sonic-platform-daemons
8ec96c0 (HEAD -> 202012, origin/202012) [ycabled] fix exception-handling logic for ycabled (#312)
3d5470d [ycabled] move swsscommon API's from subroutines to call them exactly once per task_worker/thread (#310)


Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
---
 src/sonic-platform-daemons | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index aacb772914b3..8ec96c0a6d6d 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit aacb772914b383ce1a6064f7ec386a082826bb63
+Subproject commit 8ec96c0a6d6d6938f28aa84ea18d5faae5cb5150

From acca64a8bd2a9d7a89d3cce90301d1f049e93961 Mon Sep 17 00:00:00 2001
From: Devesh Pathak <54966909+devpatha@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:09:09 -0800
Subject: [PATCH 1465/1674] [202012] Clear /etc/resolv.conf before building
 image (#12686)

Why I did it
nameserver and domain entries from build system fsroot gets into sonic image.

How I did it
Clear /etc/resolv.conf before building image

How to verify it
Built image with it and verified with install that /etc/resolv.conf is empty
---
 build_debian.sh                              | 1 +
 files/image_config/resolv-config/resolv.conf | 0
 2 files changed, 1 insertion(+)
 create mode 100644 files/image_config/resolv-config/resolv.conf

diff --git a/build_debian.sh b/build_debian.sh
index 405360c70a64..2d01094bbfd0 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -590,6 +590,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
+sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 
 # Ensure admin gid is 1000
diff --git a/files/image_config/resolv-config/resolv.conf b/files/image_config/resolv-config/resolv.conf
new file mode 100644
index 000000000000..e69de29bb2d1

From ea3620cde50a77612c01752273870ef52fff1a4a Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 16 Nov 2022 00:26:32 +0100
Subject: [PATCH 1466/1674] [Arista] Remove pcie device monitoring for
 7260CX3-64 (#12654)

---
 device/arista/x86_64-arista_7260cx3_64/pcie.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/device/arista/x86_64-arista_7260cx3_64/pcie.yaml b/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
index a2540013703e..1889a4f1eef6 100644
--- a/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
+++ b/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
@@ -100,12 +100,6 @@
   id: 8c24
   name: 'Signal processing controller: Intel Corporation 8 Series Chipset Family Thermal
     Management Controller (rev 05)'
-- bus: '01'
-  dev: '00'
-  fn: '0'
-  id: '1682'
-  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
-    PCIe (rev 20)'
 - bus: '02'
   dev: '00'
   fn: '0'

From 10c2d601ed2f51960206be16d4b13ad1d0fe425e Mon Sep 17 00:00:00 2001
From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:48:19 +0800
Subject: [PATCH 1467/1674] [202012][TestbedV2] Add dualtor test jobs using
 TestbedV2. (#12672)

Add dualtor test jobs using TestbedV2 in 202012 branch.

Why I did it
Add dualtor test jobs using TestbedV2 in 202012 branch.

How I did it
Add dualtor test jobs using TestbedV2 in 202012 branch.

Signed-off-by: Yutong Zhang <yutongzhang@microsoft.com>
---
 .azure-pipelines/run-test-scheduler-template.yml |  8 +++++++-
 azure-pipelines.yml                              | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index 963b9d5b59c5..5af2f8696e8b 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -30,6 +30,10 @@ parameters:
   type: string
   default: master
 
+- name: COMMON_EXTRA_PARAMS
+  type: string
+  default: ""
+
 steps:
   - script: |
       set -ex
@@ -42,7 +46,9 @@ steps:
       set -ex
       pip install PyYAML
       rm -f new_test_plan_id.txt
-      python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --mgmt-branch ${{ parameters.MGMT_BRANCH }}
+      python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
+      --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --mgmt-branch ${{ parameters.MGMT_BRANCH }} \
+      --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}"
       TEST_PLAN_ID=`cat new_test_plan_id.txt`
 
       echo "Created test plan $TEST_PLAN_ID"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ed140d61a58d..4fcdcb392602 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -280,3 +280,19 @@ stages:
 
         echo "Both classic and TestbedV2 t1-lag jobs failed! Please check the detailed information. (Any of them passed, t1-lag will be considered as passed)"
         exit 1
+
+  - job: dualtor_testbedv2
+    pool:
+      vmImage: 'ubuntu-20.04'
+    displayName: "kvmtest-dualtor-t0 by TestbedV2"
+    timeoutInMinutes: 1080
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
+    continueOnError: false
+    steps:
+      - template: .azure-pipelines/run-test-scheduler-template.yml
+        parameters:
+          TOPOLOGY: dualtor
+          MIN_WORKER: 1
+          MAX_WORKER: 1
+          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
+          MGMT_BRANCH: 202012

From 5d7a345c09acb37a159a67fab786001c13811173 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Thu, 17 Nov 2022 12:32:24 +0800
Subject: [PATCH 1468/1674] [SAI-PTF][202012]Fix sai ptf 202012 (#12724)

* fix sai-ptf docker build error

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

* correct the docker image version

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

* update thrift package

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

* fix version upgrade issue in 202012

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

* remove useless file

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 dockers/docker-ptf-sai/Dockerfile.j2 | 9 ++++-----
 platform/vs/docker-ptf-sai.mk        | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-ptf-sai/Dockerfile.j2 b/dockers/docker-ptf-sai/Dockerfile.j2
index f42d04c1cd07..fda64eacf5c1 100644
--- a/dockers/docker-ptf-sai/Dockerfile.j2
+++ b/dockers/docker-ptf-sai/Dockerfile.j2
@@ -16,7 +16,6 @@ RUN pip3 install crc16          \
         getmac                  \
         packet_helper           \
         psutil                  \
-        scapy==2.4.4            \
         scapy_helper            \
         pysubnettree
 
@@ -34,7 +33,7 @@ debs/{{ deb }}{{' '}}
 # Remove old ptf package
 RUN dpkg -r python-ptf
 
-# Install new ptf package
-RUN git clone https://github.com/p4lang/ptf.git \
-        && cd ptf                               \
-        && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
+# Install new ptf package not supprt in 202012 branch
+# RUN git clone https://github.com/p4lang/ptf.git \
+#         && cd ptf                               \
+#         && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
diff --git a/platform/vs/docker-ptf-sai.mk b/platform/vs/docker-ptf-sai.mk
index d3463c5a0930..1a1480bf09cb 100644
--- a/platform/vs/docker-ptf-sai.mk
+++ b/platform/vs/docker-ptf-sai.mk
@@ -3,7 +3,7 @@
 DOCKER_PTF_SAI = docker-ptf-sai.gz
 DOCKER_PTF_BASE = docker-ptf.gz
 $(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai
-$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
+$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_13_0) $(PYTHON3_THRIFT_0_13_0)
 $(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI)
-SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI)
+SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_SAI)

From e4db3291e2b1256746d1bc004372ba09944283ab Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 17 Nov 2022 16:45:20 -0800
Subject: [PATCH 1469/1674] [sonic-snmpagent] Update submodule (#12732)

#### Why I did it
Include below commits
```
00b4dc0 2022-11-14 | Remove error logging on "failed in fdb_vlanmac" (#272) [Qi Luo]
792afe8 2022-11-14 | Don't cache the vlan-id if it is not valid from DB (#273) [zhenggen-xu]
```
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 13ddb0e933b2..00b4dc0dfa66 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 13ddb0e933b2f71db7f9cbada3472fee7ca2a869
+Subproject commit 00b4dc0dfa66bf1056fbe0eafd6bbca65b28c507

From 7348d6202ab09be6983b5ac5f942c097d6404fa7 Mon Sep 17 00:00:00 2001
From: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com>
Date: Wed, 2 Nov 2022 17:24:32 +0800
Subject: [PATCH 1470/1674] Improve feature mode switch process (#12188)

* Fix kube mode to local mode long duration issue

* Remove IPV6 parameters which is not necessary

* Fix read node labels bug

* Tag the running image to latest if it's stable

* Disable image_version_higher check

* Change image_version_higher checker test case

Signed-off-by: Yun Li <yunli1@microsoft.com>
---
 src/sonic-ctrmgrd/.gitignore                  |  1 +
 src/sonic-ctrmgrd/ctrmgr/container            | 25 +++++--
 src/sonic-ctrmgrd/ctrmgr/container_startup.py | 16 ++--
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           | 75 +++++++++++++++++--
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     |  8 +-
 .../ctrmgr/remote_ctr.config.json             |  1 +
 .../tests/container_startup_test.py           |  2 +-
 src/sonic-ctrmgrd/tests/container_test.py     |  5 ++
 src/sonic-ctrmgrd/tests/ctrmgrd_test.py       | 49 +++++++++++-
 src/sonic-ctrmgrd/tests/kube_commands_test.py | 34 ++-------
 10 files changed, 165 insertions(+), 51 deletions(-)

diff --git a/src/sonic-ctrmgrd/.gitignore b/src/sonic-ctrmgrd/.gitignore
index bdebd5e838cd..2f42f4d2c5ea 100644
--- a/src/sonic-ctrmgrd/.gitignore
+++ b/src/sonic-ctrmgrd/.gitignore
@@ -10,3 +10,4 @@ tests/__pycache__/
 ctrmgr/__pycache__/
 venv
 tests/.coverage*
+.pytest_cache/
\ No newline at end of file
diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container
index db6ded635ee9..ca2394b057bb 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container
+++ b/src/sonic-ctrmgrd/ctrmgr/container
@@ -30,6 +30,10 @@ STATE = "state"
 
 KUBE_LABEL_TABLE = "KUBE_LABELS"
 KUBE_LABEL_SET_KEY = "SET"
+SERVER_TABLE = "KUBERNETES_MASTER"
+SERVER_KEY = "SERVER"
+ST_SER_CONNECTED = "connected"
+ST_SER_UPDATE_TS = "update_time"
 
 # Get seconds to wait for remote docker to start.
 # If not, revert to local
@@ -75,8 +79,10 @@ def read_data(is_config, feature, fields):
     ret = []
 
     db = cfg_db if is_config else state_db
-
-    tbl = swsscommon.Table(db, FEATURE_TABLE)
+    if feature == SERVER_KEY:
+        tbl = swsscommon.Table(db, SERVER_TABLE)
+    else:
+        tbl = swsscommon.Table(db, FEATURE_TABLE)
 
     data = dict(tbl.get(feature)[1])
     for (field, default) in fields:
@@ -104,6 +110,13 @@ def read_state(feature):
             [(CURRENT_OWNER, "none"), (REMOTE_STATE, "none"), (CONTAINER_ID, "")])
 
 
+def read_server_state():
+    """ Read requried feature state """
+
+    return read_data(False, SERVER_KEY,
+            [(ST_SER_CONNECTED, "false"), (ST_SER_UPDATE_TS, "")])
+
+
 def docker_action(action, feature, **kwargs):
     """ Execute docker action """
     try:
@@ -192,9 +205,10 @@ def container_start(feature, **kwargs):
 
     set_owner, fallback, _ = read_config(feature)
     _, remote_state, _ = read_state(feature)
+    server_connected, _ = read_server_state()
 
-    debug_msg("{}: set_owner:{} fallback:{} remote_state:{}".format(
-        feature, set_owner, fallback, remote_state))
+    debug_msg("{}: set_owner:{} fallback:{} remote_state:{} server_connected:{}".format(
+        feature, set_owner, fallback, remote_state, server_connected))
 
     data = {
             SYSTEM_STATE: "up",
@@ -207,8 +221,9 @@ def container_start(feature, **kwargs):
         start_val = START_LOCAL
     else:
         start_val = START_KUBE
-        if fallback and (remote_state == "none"):
+        if fallback and (remote_state == "none" or server_connected == "false"):
             start_val |= START_LOCAL
+            data[REMOTE_STATE] = "none"
 
     if start_val == START_LOCAL:
         # Implies *only* local.
diff --git a/src/sonic-ctrmgrd/ctrmgr/container_startup.py b/src/sonic-ctrmgrd/ctrmgr/container_startup.py
index c56160aa488d..0d836fe02300 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container_startup.py
+++ b/src/sonic-ctrmgrd/ctrmgr/container_startup.py
@@ -229,14 +229,14 @@ def container_up(feature, owner, version):
             do_freeze(feature, "This version is marked disabled. Exiting ...")
             return
 
-        if not instance_higher(feature, state_data[VERSION], version):
-            # TODO: May Remove label <feature_name>_<version>_enabled
-            # Else kubelet will continue to re-deploy every 5 mins, until
-            # master removes the lable to un-deploy.
-            #
-            do_freeze(feature, "bail out as current deploy version {} is not higher".
-                    format(version))
-            return
+        # if not instance_higher(feature, state_data[VERSION], version):
+        #     # TODO: May Remove label <feature_name>_<version>_enabled
+        #     # Else kubelet will continue to re-deploy every 5 mins, until
+        #     # master removes the lable to un-deploy.
+        #     #
+        #     do_freeze(feature, "bail out as current deploy version {} is not higher".
+        #             format(version))
+        #     return
 
         update_data(state_db, feature, { VERSION: version })
 
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index 2defb6e45387..d53ca0b42e3a 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -60,7 +60,7 @@
         CFG_SER_IP: "",
         CFG_SER_PORT: "6443",
         CFG_SER_DISABLE: "false",
-        CFG_SER_INSECURE: "false"
+        CFG_SER_INSECURE: "true"
         }
 
 dflt_st_ser = {
@@ -88,18 +88,20 @@
 JOIN_LATENCY = "join_latency_on_boot_seconds"
 JOIN_RETRY = "retry_join_interval_seconds"
 LABEL_RETRY = "retry_labels_update_seconds"
+TAG_IMAGE_LATEST = "tag_latest_image_on_wait_seconds"
 USE_K8S_PROXY = "use_k8s_as_http_proxy"
 
 remote_ctr_config = {
     JOIN_LATENCY: 10,
     JOIN_RETRY: 10,
     LABEL_RETRY: 2,
+    TAG_IMAGE_LATEST: 30,
     USE_K8S_PROXY: ""
     }
 
 def log_debug(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
-    print(msg)
+    #print(msg)
     syslog.syslog(syslog.LOG_DEBUG, msg)
 
 
@@ -148,6 +150,8 @@ def init():
         with open(SONIC_CTR_CONFIG, "r") as s:
             d = json.load(s)
             remote_ctr_config.update(d)
+    if UNIT_TESTING:
+        remote_ctr_config[TAG_IMAGE_LATEST] = 0
 
 
 class MainServer:
@@ -172,11 +176,11 @@ def register_db(self, db_name):
             self.db_connectors[db_name] = swsscommon.DBConnector(db_name, 0)
 
 
-    def register_timer(self, ts, handler):
+    def register_timer(self, ts, handler, args=()):
         """ Register timer based handler. 
             The handler will be called on/after give timestamp, ts
         """
-        self.timer_handlers[ts].append(handler)
+        self.timer_handlers[ts].append((handler, args))
 
 
     def register_handler(self, db_name, table_name, handler):
@@ -235,7 +239,7 @@ def run(self):
                     lst = self.timer_handlers[k]
                     del self.timer_handlers[k]
                     for fn in lst:
-                        fn()
+                        fn[0](*fn[1])
                 else:
                     timeout = (k - ct_ts).seconds
                     break
@@ -426,6 +430,54 @@ def do_join(self, ip, port, insecure):
                     format(remote_ctr_config[JOIN_RETRY], self.start_time))
 
 
+def tag_latest_image(server, feat, docker_id, image_ver):
+    res = 1
+    if not UNIT_TESTING:
+        status = os.system("docker ps |grep {} >/dev/null".format(docker_id))
+        if status:
+            syslog.syslog(syslog.LOG_ERR,
+                    "Feature {}:{} is not stable".format(feat, image_ver))
+        else:
+            image_item = os.popen("docker inspect {} |jq -r .[].Image".format(docker_id)).read().strip()
+            if image_item:
+                image_id = image_item.split(":")[1][:12]
+                image_info = os.popen("docker images |grep {}".format(image_id)).read().split()
+                if image_info:
+                    image_rep = image_info[0]
+                    res = os.system("docker tag {} {}:latest".format(image_id, image_rep))
+                    if res != 0:
+                        syslog.syslog(syslog.LOG_ERR,
+                                "Failed to tag {}:{} to latest".format(image_rep, image_ver))
+                    else:
+                        syslog.syslog(syslog.LOG_INFO,
+                                "Successfully tag {}:{} to latest".format(image_rep, image_ver))
+                        feat_status = os.popen("docker inspect {} |jq -r .[].State.Running".format(feat)).read().strip()
+                        if feat_status:
+                            if feat_status == 'true':
+                                os.system("docker stop {}".format(feat))
+                                syslog.syslog(syslog.LOG_ERR,
+                                        "{} should not run, stop it".format(feat))
+                            os.system("docker rm {}".format(feat))
+                            syslog.syslog(syslog.LOG_INFO,
+                                        "Delete previous {} container".format(feat))
+                else:
+                    syslog.syslog(syslog.LOG_ERR,
+                            "Failed to docker images |grep {} to get image repo".format(image_id))
+            else:
+                syslog.syslog(syslog.LOG_ERR,
+                        "Failed to inspect container:{} to get image id".format(docker_id))
+    else:
+        server.mod_db_entry(STATE_DB_NAME,
+                FEATURE_TABLE, feat, {"tag_latest": "true"})
+        res = 0
+    if res:
+        log_debug("failed to tag {}:{} to latest".format(feat, image_ver))
+    else:
+        log_debug("successfully tag {}:{} to latest".format(feat, image_ver))
+
+    return res
+
+
 #
 # Feature changes
 #
@@ -523,6 +575,19 @@ def on_state_update(self, key, op, data):
         self.st_data[key] = _update_entry(dflt_st_feat, data)
         remote_state = self.st_data[key][ST_FEAT_REMOTE_STATE]
 
+        if (old_remote_state != remote_state) and (remote_state == "running"):
+            # Tag latest
+            start_time = datetime.datetime.now() + datetime.timedelta(
+                    seconds=remote_ctr_config[TAG_IMAGE_LATEST])
+            self.server.register_timer(start_time, tag_latest_image, (
+                    self.server,
+                    key, 
+                    self.st_data[key][ST_FEAT_CTR_ID],
+                    self.st_data[key][ST_FEAT_CTR_VER]))
+
+            log_debug("try to tag latest label after {} seconds @{}".format(
+                    remote_ctr_config[TAG_IMAGE_LATEST], start_time))
+
         if (not init) and (
                 (old_remote_state == remote_state) or (remote_state != "pending")):
             # no change or nothing to do.
diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index 3adea36ef12c..91415390ccd5 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -84,7 +84,7 @@ def _run_command(cmd, timeout=5):
 
 def kube_read_labels():
     """ Read current labels on node and return as dict. """
-    KUBECTL_GET_CMD = "kubectl --kubeconfig {} get nodes {} --show-labels |tr -s ' ' | cut -f6 -d' '"
+    KUBECTL_GET_CMD = "kubectl --kubeconfig {} get nodes {} --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '"
 
     labels = {}
     ret, out, _ = _run_command(KUBECTL_GET_CMD.format(
@@ -332,12 +332,12 @@ def _do_reset(pending_join = False):
 
 
 def _do_join(server, port, insecure):
-    KUBEADM_JOIN_CMD = "kubeadm join --discovery-file {} --node-name {} --apiserver-advertise-address {}"
+    KUBEADM_JOIN_CMD = "kubeadm join --discovery-file {} --node-name {}"
     err = ""
     out = ""
     ret = 0
     try:
-        local_ipv6 = _get_local_ipv6()
+        #local_ipv6 = _get_local_ipv6()
         #_download_file(server, port, insecure)
         _gen_cli_kubeconf(server, port, insecure)
         _do_reset(True)
@@ -349,7 +349,7 @@ def _do_join(server, port, insecure):
 
         if ret == 0:
             (ret, out, err) = _run_command(KUBEADM_JOIN_CMD.format(
-                KUBE_ADMIN_CONF, get_device_name(), local_ipv6), timeout=60)
+                KUBE_ADMIN_CONF, get_device_name()), timeout=60)
             log_debug("ret = {}".format(ret))
 
     except IOError as e:
diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
index 3fb0c20fddcf..0b91fde36473 100644
--- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
+++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json
@@ -3,6 +3,7 @@
     "retry_join_interval_seconds": 30,
     "retry_labels_update_seconds": 5,
     "revert_to_local_on_wait_seconds": 60,
+    "tag_latest_image_on_wait_seconds": 600,
     "use_k8s_as_http_proxy": "n"
 }
 
diff --git a/src/sonic-ctrmgrd/tests/container_startup_test.py b/src/sonic-ctrmgrd/tests/container_startup_test.py
index bffffaadca94..b21fe855662c 100755
--- a/src/sonic-ctrmgrd/tests/container_startup_test.py
+++ b/src/sonic-ctrmgrd/tests/container_startup_test.py
@@ -169,7 +169,7 @@
                 common_test.FEATURE_TABLE: {
                     "snmp": {
                         "container_id": "no_change",
-                        "container_version": "20201230.77",
+                        "container_version": "20201230.11",
                         "current_owner": "no_change",
                         "remote_state": "no_change",
                         "system_state": "up"
diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py
index 4738597c72c4..4581111015e5 100755
--- a/src/sonic-ctrmgrd/tests/container_test.py
+++ b/src/sonic-ctrmgrd/tests/container_test.py
@@ -125,6 +125,11 @@
                         "current_owner": "none",
                         "container_id": ""
                     }
+                },
+                common_test.SERVER_TABLE: {
+                    "SERVER": {
+                        "connected": "true"
+                    }
                 }
             }
         },
diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
index 171534b5a8d1..842b935396d1 100755
--- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
+++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
@@ -106,7 +106,7 @@
             common_test.KUBE_JOIN: {
                 "ip": "10.10.10.10",
                 "port": "6443",
-                "insecure": "false"
+                "insecure": "true"
             }
         }
     },
@@ -151,7 +151,7 @@
             common_test.KUBE_JOIN: {
                 "ip": "10.10.10.10",
                 "port": "6443",
-                "insecure": "false"
+                "insecure": "true"
             },
             common_test.KUBE_RESET: {
                 "flag": "true"
@@ -276,6 +276,51 @@
                 }
             }
         }
+    },
+    3: {
+        common_test.DESCR: "Tag image latest when remote_state changes to running",
+        common_test.ARGS: "ctrmgrd",
+        common_test.PRE: {
+            common_test.CONFIG_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "snmp": {
+                        "set_owner": "kube"
+                    }
+                }
+            },
+            common_test.STATE_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "snmp": {
+                        "remote_state": "pending"
+                    }
+                }
+            }
+        },
+        common_test.UPD: {
+            common_test.CONFIG_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "snmp": {
+                        "set_owner": "kube"
+                    }
+                }
+            },
+            common_test.STATE_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "snmp": {
+                        "remote_state": "running"
+                    }
+                }
+            }
+        },
+        common_test.POST: {
+            common_test.STATE_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "snmp": {
+                        "tag_latest": "true"
+                    }
+                }
+            }
+        }
     }
 }
 
diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py
index d8e0939efb85..60da7fd2c073 100755
--- a/src/sonic-ctrmgrd/tests/kube_commands_test.py
+++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py
@@ -27,7 +27,7 @@
         common_test.DESCR: "read labels",
         common_test.RETVAL: 0,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: ["foo=bar,hello=world"],
         common_test.POST: {
             "foo": "bar",
@@ -40,7 +40,7 @@
         common_test.TRIGGER_THROW: True,
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.POST: {
         },
         common_test.PROC_KILLED: 1
@@ -49,7 +49,7 @@
         common_test.DESCR: "read labels fail",
         common_test.RETVAL: -1,
         common_test.PROC_CMD: ["\
-kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
+kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)],
         common_test.PROC_OUT: [""],
         common_test.PROC_ERR: ["command failed"],
         common_test.POST: {
@@ -64,7 +64,7 @@
         common_test.RETVAL: 0,
         common_test.ARGS: { "foo": "bar", "hello": "World!", "test": "ok" },
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
+"kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF),
 "kubectl --kubeconfig {} label --overwrite nodes none hello-".format(
     KUBE_ADMIN_CONF),
 "kubectl --kubeconfig {} label --overwrite nodes none hello=World! test=ok".format(
@@ -77,7 +77,7 @@
         common_test.RETVAL: 0,
         common_test.ARGS: { "foo": "bar", "hello": "world" },
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+"kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
  ],
         common_test.PROC_OUT: ["foo=bar,hello=world"]
     },
@@ -87,7 +87,7 @@
         common_test.ARGS: { "any": "thing" },
         common_test.RETVAL: -1,
         common_test.PROC_CMD: [
-"kubectl --kubeconfig {} get nodes none --show-labels |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
+"kubectl --kubeconfig {} get nodes none --show-labels --no-headers |tr -s ' ' | cut -f6 -d' '".format(KUBE_ADMIN_CONF)
 ],
         common_test.PROC_ERR: ["read failed"]
     }
@@ -110,19 +110,10 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name none --apiserver-advertise-address FC00:2::32".format(
+            "kubeadm join --discovery-file {} --node-name none".format(
                 KUBE_ADMIN_CONF)
         ],
         common_test.PROC_RUN: [True, True],
-        common_test.PRE: {
-            common_test.CONFIG_DB_NO: {
-                common_test.MGMT_INTERFACE_TABLE: {
-                    "eth0|FC00:2::32/64": {
-                        "gwaddr": "fc00:2::1"
-                    }
-                }
-            }
-        },
         common_test.REQ: {
             "data": {"ca.crt": "test"}
         }
@@ -143,19 +134,10 @@
             "mkdir -p {}".format(CNI_DIR),
             "cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
             "systemctl start kubelet",
-            "kubeadm join --discovery-file {} --node-name none --apiserver-advertise-address FC00:2::32".format(
+            "kubeadm join --discovery-file {} --node-name none".format(
                 KUBE_ADMIN_CONF)
         ],
         common_test.PROC_RUN: [True, True],
-        common_test.PRE: {
-            common_test.CONFIG_DB_NO: {
-                common_test.MGMT_INTERFACE_TABLE: {
-                    "eth0|FC00:2::32/64": {
-                        "gwaddr": "fc00:2::1"
-                    }
-                }
-            }
-        },
         common_test.REQ: {
             "data": {"ca.crt": "test"}
         }

From c9f85877add232dfe9e3f1e8ea6278f3121fdac9 Mon Sep 17 00:00:00 2001
From: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:06:19 +0800
Subject: [PATCH 1471/1674] Fix code irregular issues (#12595)

* Fix code irregular issues

Signed-off-by: Yun Li <yunli1@microsoft.com>
---
 src/sonic-ctrmgrd/ctrmgr/container_startup.py | 10 ----------
 src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py           |  8 +++++---
 src/sonic-ctrmgrd/ctrmgr/kube_commands.py     |  2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/sonic-ctrmgrd/ctrmgr/container_startup.py b/src/sonic-ctrmgrd/ctrmgr/container_startup.py
index 0d836fe02300..2af8e0b3845a 100755
--- a/src/sonic-ctrmgrd/ctrmgr/container_startup.py
+++ b/src/sonic-ctrmgrd/ctrmgr/container_startup.py
@@ -28,7 +28,6 @@
 
 def debug_msg(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
-    print(msg)
     syslog.syslog(syslog.LOG_DEBUG, msg)
 
 
@@ -229,15 +228,6 @@ def container_up(feature, owner, version):
             do_freeze(feature, "This version is marked disabled. Exiting ...")
             return
 
-        # if not instance_higher(feature, state_data[VERSION], version):
-        #     # TODO: May Remove label <feature_name>_<version>_enabled
-        #     # Else kubelet will continue to re-deploy every 5 mins, until
-        #     # master removes the lable to un-deploy.
-        #     #
-        #     do_freeze(feature, "bail out as current deploy version {} is not higher".
-        #             format(version))
-        #     return
-
         update_data(state_db, feature, { VERSION: version })
 
         mode = state_data[REMOTE_STATE]
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
index d53ca0b42e3a..277266025cb9 100755
--- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
+++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -101,7 +101,6 @@
 
 def log_debug(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
-    #print(msg)
     syslog.syslog(syslog.LOG_DEBUG, msg)
 
 
@@ -176,7 +175,7 @@ def register_db(self, db_name):
             self.db_connectors[db_name] = swsscommon.DBConnector(db_name, 0)
 
 
-    def register_timer(self, ts, handler, args=()):
+    def register_timer(self, ts, handler, args=None):
         """ Register timer based handler. 
             The handler will be called on/after give timestamp, ts
         """
@@ -239,7 +238,10 @@ def run(self):
                     lst = self.timer_handlers[k]
                     del self.timer_handlers[k]
                     for fn in lst:
-                        fn[0](*fn[1])
+                        if fn[1] is None:
+                            fn[0]()
+                        else:
+                            fn[0](*fn[1])
                 else:
                     timeout = (k - ct_ts).seconds
                     break
diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
index 91415390ccd5..783f122ec914 100755
--- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
+++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py
@@ -337,8 +337,6 @@ def _do_join(server, port, insecure):
     out = ""
     ret = 0
     try:
-        #local_ipv6 = _get_local_ipv6()
-        #_download_file(server, port, insecure)
         _gen_cli_kubeconf(server, port, insecure)
         _do_reset(True)
         _run_command("modprobe br_netfilter")

From b3d4305adc712bba7ca0cb3b3f8a601992321c26 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 20 Nov 2022 19:00:06 +0800
Subject: [PATCH 1472/1674] [ci/build]: Upgrade SONiC package versions (#12756)

---
 .../build-sonic-slave-buster/versions-deb-buster     |  4 ++--
 .../build/build-sonic-slave-buster/versions-git      | 10 +++++-----
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            | 12 ++++++------
 files/build/versions/default/versions-web            |  6 +++---
 .../dockers/docker-base-buster/versions-deb-buster   |  2 --
 files/build/versions/dockers/docker-ptf/versions-py2 |  2 +-
 .../dockers/docker-sonic-vs/versions-deb-buster      |  4 ++--
 .../dockers/docker-syncd-invm/versions-deb-buster    |  4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster   |  4 +---
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  8 ++++----
 .../versions/host-image/versions-deb-buster-arm64    |  2 ++
 .../versions/host-image/versions-deb-buster-armhf    |  2 ++
 15 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 07b440fa3e16..be7fe179a3c0 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,8 +1,8 @@
 applibs==1.mlnx.4.5.3186
 applibs-dev==1.mlnx.4.5.3186
 bfnplatform==1.0.0
-innovium-sai==0.107.6
-innovium-sai-headers==0.107.6
+innovium-sai==0.107.7
+innovium-sai-headers==0.107.7
 iproute2-dev==1.mlnx.4.5.3186
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index d7540e377082..67e6e8c3f2e6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,14 +1,14 @@
-https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
+https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==104044848ffb0a283e1f1bf3466693fa4af450e9
+https://github.com/jeroennijhof/pam_tacplus.git==e57022d3be8430f4c3c239cbb71eccbd547259f2
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==d78a5f5dce73fb77c093795be7a96cf12220c3c6
+https://github.com/sflow/host-sflow==7f233a17819ec68d25c09dfd67e3e5e1edf64a29
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6ec41f37e4f
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==98b80ec414b58514d3d44f756554324d925dfd83
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index a9e2562c5134..934fa5c1cd93 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:67bce7e2696486db71ea150f90ab1595dbecca20c5561af85f82428d09029131
+amd64:amd64/debian:buster==sha256:d0b2ae07eb30bf2ba9575f30beddc778b2b6349a973c6f9037eba5ba862524b8
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
+amd64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:7606bfe436672f9b9c172527bc61a665066ddf1033505da8aca25ab9ed93cdfd
-arm64:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
+arm64:arm64v8/debian:buster==sha256:5fb6d294a4e1af778e459a514e5b7db71424838b274278a9115b5b3f4407dd99
+arm64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:5d1cc5e14ba686366a6483c814d0ddf2e0b56f7d914a74226217b3412ce1e9cf
-armhf:debian:buster==sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9
+armhf:arm32v7/debian:buster==sha256:643317b4799f740f497daf7de3a50631d99efe79ac688948db0843cd5cab110b
+armhf:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 4cdaba8e94a6..ba777ced8f2d 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,20 +1,20 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==c7e6136c3226f0c6a95d598ff3ab69c8e89b9a40
+https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==104044848ffb0a283e1f1bf3466693fa4af450e9
+https://github.com/jeroennijhof/pam_tacplus.git==e57022d3be8430f4c3c239cbb71eccbd547259f2
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==d78a5f5dce73fb77c093795be7a96cf12220c3c6
+https://github.com/sflow/host-sflow==7f233a17819ec68d25c09dfd67e3e5e1edf64a29
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==55777b5ff2dc9346af328e8d87e7e6ec41f37e4f
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==98b80ec414b58514d3d44f756554324d925dfd83
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 09cfe50ca11a..7536564ba0b7 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -27,9 +27,9 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==00af177c2eb6384accac0608a6a6cb4f
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==fa95a0d1ca74688da7db2527516a3e30
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==f23bb3119dd6d319e72446bf203eaddc
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==07f1d18c7f49005856169902b049fe1c
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf34b81c6bbb4b1f5042ffde
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index b160f0a900cf..063e2354b7dc 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -25,7 +25,6 @@ liblognorm5==2.0.5-1
 liblua5.1-0==5.1.5-8.1+b2
 libmpdec2==2.4.2-2
 libncurses6==6.1+20181013-2+deb10u3
-libncursesw6==6.1+20181013-2+deb10u3
 libnghttp2-14==1.36.0-2+deb10u1
 libnorm1==1.5.8+dfsg2-1
 libonig5==6.9.1-1
@@ -44,7 +43,6 @@ libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
 libssl1.1==1.1.1n-0+deb10u3
-libtinfo6==6.1+20181013-2+deb10u3
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 298826561e43..e023f1cccd36 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -64,4 +64,4 @@ wcwidth==0.2.5
 werkzeug==1.0.1
 yabgp==0.8.2
 zipp==1.2.0
-zope.interface==5.5.1
\ No newline at end of file
+zope.interface==5.5.2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 35c7a9d50468..67e25e268993 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -28,8 +28,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-grub-common==2.06-3~deb10u1
-grub2-common==2.06-3~deb10u1
+grub-common==2.06-3~deb10u2
+grub2-common==2.06-3~deb10u2
 ifupdown==0.8.35
 iptables==1.8.2-4
 libasan5==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 905f306d0fcc..03e64ebeeccb 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.6
-innovium-sai-headers==0.107.6
+innovium-sai==0.107.7
+innovium-sai-headers==0.107.7
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 7806ea303c92..1652385ee1bf 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.9-1
+containerd.io==1.6.10-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -786,7 +786,6 @@ libnanomsg5==1.1.5+dfsg-1
 libncurses-dev==6.1+20181013-2+deb10u3
 libncurses5-dev==6.1+20181013-2+deb10u3
 libncurses6==6.1+20181013-2+deb10u3
-libncursesw6==6.1+20181013-2+deb10u3
 libnet-dbus-perl==1.1.0-5+b1
 libnet-dns-perl==1.19-1
 libnet-dns-sec-perl==1.11-1
@@ -1108,7 +1107,6 @@ libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
 libtiff5==4.1.0+git191117-2~deb10u4
 libtimedate-perl==2.3000-2+deb10u1
-libtinfo6==6.1+20181013-2+deb10u3
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
 libtk8.6==8.6.9-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index bb6d0454db5c..6e9a37b896fa 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index bb6d0454db5c..6e9a37b896fa 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7aaca9428691c22c7efd6e769487a9bcc17e388b
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 2be6fc123bb4..636a0a862a97 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.9-1
+containerd.io==1.6.10-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -56,8 +56,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-grub-common==2.06-3~deb10u1
-grub2-common==2.06-3~deb10u1
+grub-common==2.06-3~deb10u2
+grub2-common==2.06-3~deb10u2
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
@@ -67,7 +67,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.6
+innovium-platform-driver==0.107.7
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index e6b184a24e51..7fd5c7a3b298 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -3,6 +3,8 @@ bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 distro-info-data==0.41+deb10u5
+grub-common==2.06-3~deb10u1
+grub2-common==2.06-3~deb10u1
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index e341a35abef2..90bb65b9aacb 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -3,6 +3,8 @@ bzip2==1.0.6-9.2~deb10u1
 curl==7.64.0-4+deb10u2
 dbus==1.12.20-0+deb10u1
 distro-info-data==0.41+deb10u5
+grub-common==2.06-3~deb10u1
+grub2-common==2.06-3~deb10u1
 icu-devtools==63.1-6+deb10u3
 isc-dhcp-client==4.4.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u1

From 147e907af8fad2f483374d22af2c92af1fdb9472 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Wed, 23 Nov 2022 11:41:13 +0800
Subject: [PATCH 1473/1674] Update sairedis header (#12775)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index a60f4b95730a..315f13bec32d 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit a60f4b95730a67f31dfa849f580de2b5830b03d4
+Subproject commit 315f13bec32d914590c9f37f0b34f8897ee03186

From 05697717578cd0efbaaaa23279a28e853ccfd51f Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Tue, 22 Nov 2022 23:26:40 -0800
Subject: [PATCH 1474/1674] Update cisco-8000.ini (#12808)

Why I did it
1.57.x SDK based incremental drop that addresses a few egress ACL and drop counter failures. Hostname, vtysh, and incorrect queue watermark issue are addressed too.

How I did it
Update cisco-8000 submodule to v0.2.3

How to verify it
Which release branch to backport (provide reason below if selected)
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index ec1b03bce73b..493c53e7d54b 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.120
+ref=202012-v0.2.3

From 3402094fd08ee3a4c5bd8d292766492477452fc9 Mon Sep 17 00:00:00 2001
From: Lorne Long <77469668+lornelong@users.noreply.github.com>
Date: Wed, 16 Nov 2022 22:20:42 -0500
Subject: [PATCH 1475/1674] [Build] Use apt-get to predictably support
 dependency ordered configuration of lazy packages (#12164)

Why I did it
The current lazy installer relies on a filename sort for both unpack and configuration steps. When systemd services are configured [started] by multiple packages the order is by filename not by the declared package dependencies. This can cause the start order of services to differ between first-boot and subsequent boots. Declared systemd service dependencies further exacerbate the issue (e.g. blocking the first-boot script).

The current installer leaves packages un-configured if the package dependency order does not match the filename order.

This also fixes a trivial bug in [Build]: Support to use symbol links for lazy installation targets to reduce the image size #10923 where externally downloaded dependencies are duplicated across lazy package device directories.

How I did it
Changed the staging and first-boot scripts to use apt-get:

dpkg -i /host/image-$SONIC_VERSION/platform/$platform/*.deb

becomes

apt-get -y install /host/image-$SONIC_VERSION/platform/$platform/*.deb

when dependencies are detected during image staging.

How to verify it
Apt-get critical rules

Add a Depends= to the control information of a package. Grep the syslog for rc.local between images and observe the configuration order of packages change.
---
 files/build_templates/sonic_debian_extension.j2 |  9 ++++++++-
 files/image_config/platform/rc.local            | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index d234757898d4..0b8cd49fe339 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -597,12 +597,19 @@ sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/common
 sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/common/
 sudo ln -sf "../common/{{ debfilename }}" "$FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/{{ debfilename }}"
 for f in $(find $FILESYSTEM_ROOT/var/cache/apt/archives -name "*.deb"); do
-    sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
+    sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/common/
+    sudo ln -sf "../common/$(basename $f)" "$FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/$(basename $f)"
 done
 
 sudo dpkg --root=$FILESYSTEM_ROOT -P {{ debname }}
 
 {% endfor %}
+# create a trivial apt repo if any of the debs have dependencies, including between lazy debs
+if [ $(for f in $FILESYSTEM_ROOT/$PLATFORM_DIR/common/*.deb; do \
+           sudo dpkg -I $f | grep "Depends:\|Pre-Depends:"; done | wc -l) -gt 0 ]; then
+    (cd $FILESYSTEM_ROOT/$PLATFORM_DIR/common && sudo dpkg-scanpackages . | \
+         sudo gzip | sudo tee Packages.gz > /dev/null)
+fi
 {% endif %}
 
 # Remove sshd host keys, and will regenerate on first sshd start. This needs to be
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index fbbe04ca47eb..b0a1fecaecfc 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -287,7 +287,20 @@ if [ -f $FIRST_BOOT_FILE ]; then
     fi
 
     if [ -d /host/image-$SONIC_VERSION/platform/$platform ]; then
-        dpkg -i /host/image-$SONIC_VERSION/platform/$platform/*.deb
+        if [ -f /host/image-$SONIC_VERSION/platform/common/Packages.gz ]; then
+            # Use only the trivial repo and apt to support lazy package dependencies
+            mv /etc/apt/sources.list /etc/apt/sources.list.rc-local
+            echo "deb [trusted=yes] file:///host/image-$SONIC_VERSION/platform/common /" > /etc/apt/sources.list.d/sonic_debian_extension.list
+            LANG=C DEBIAN_FRONTEND=noninteractive apt-get update
+            LANG=C DEBIAN_FRONTEND=noninteractive apt-get -y install /host/image-$SONIC_VERSION/platform/$platform/*.deb
+            # Cleanup
+            rm -f /etc/apt/sources.list.d/sonic_debian_extension.list
+            rm -f /var/lib/apt/lists/_host_image-${SONIC_VERSION}_platform_common_Packages.lz4
+            # This is first boot so there should be no package lists or indices to restore, just the sources
+            mv /etc/apt/sources.list.rc-local /etc/apt/sources.list
+        else
+            dpkg -i /host/image-$SONIC_VERSION/platform/$platform/*.deb
+        fi
     fi
 
     sync

From d2195aa722c5a16096bf7f4cecf8c27416d1530d Mon Sep 17 00:00:00 2001
From: Volodymyr Boiko <volodymyrx.boiko@intel.com>
Date: Mon, 21 Mar 2022 21:43:43 +0200
Subject: [PATCH 1476/1674] [sonic-config-engine][portconfig] Do not parse JSON
 as Python AST (#10224)

#### Why I did it
To fix https://github.com/Azure/sonic-buildimage/issues/9643

#### How I did it
Instead of ast.literal_eval added python2 compat code for json strings unicode -> str convertion.

We need python2 compatibility since py2 sonic config engine (buster/sonic_config_engine-1.0-py2-none-any.whl target) is still included into the build (ENABLE_PY2_MODULES flag is set for buster). Once we abandon buster and python2, this compat and ast.literal_eval could be cleaned up all through the code base.

#### How to verify it
run steps from the linked issue
---
 src/sonic-config-engine/portconfig.py         | 21 +++++++++++++------
 .../tests/sample_platform.json                | 12 +++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/sonic-config-engine/portconfig.py b/src/sonic-config-engine/portconfig.py
index b2d28b5150b8..c41878f567ae 100644
--- a/src/sonic-config-engine/portconfig.py
+++ b/src/sonic-config-engine/portconfig.py
@@ -45,16 +45,25 @@
 #
 # Helper Functions
 #
+
+# For python2 compatibility
+def py2JsonStrHook(j):
+    if isinstance(j, unicode):
+        return j.encode('utf-8', 'backslashreplace')
+    if isinstance(j, list):
+        return [py2JsonStrHook(item) for item in j]
+    if isinstance(j, dict):
+        return {py2JsonStrHook(key): py2JsonStrHook(value)
+            for key, value in j.iteritems()}
+    return j
+
 def readJson(filename):
     # Read 'platform.json' or 'hwsku.json' file
     try:
         with open(filename) as fp:
-            try:
-                data = json.load(fp)
-            except json.JSONDecodeError:
-                print("Json file does not exist")
-        data_dict = ast.literal_eval(json.dumps(data))
-        return data_dict
+            if sys.version_info.major == 2:
+                return json.load(fp, object_hook=py2JsonStrHook)
+            return json.load(fp)
     except Exception as e:
         print("error occurred while parsing json: {}".format(sys.exc_info()[1]))
         return None
diff --git a/src/sonic-config-engine/tests/sample_platform.json b/src/sonic-config-engine/tests/sample_platform.json
index fd11a49ed0a0..461e01e371c7 100644
--- a/src/sonic-config-engine/tests/sample_platform.json
+++ b/src/sonic-config-engine/tests/sample_platform.json
@@ -1,4 +1,16 @@
 {
+    "chassis": {
+        "psus": [
+            {
+                "name": "PSU 1",
+                "temperature": false
+            },
+            {
+                "name": "PSU 2",
+                "temperature": false
+            }
+        ]
+    },
     "interfaces": {
         "Ethernet0": {
             "index": "1,1,1,1",

From 3a68dc0325a6b8f9e02ff9142d5fdd80f18d6cf4 Mon Sep 17 00:00:00 2001
From: zzhiyuan <carl.zy.zhao@gmail.com>
Date: Fri, 17 Dec 2021 08:43:25 -0800
Subject: [PATCH 1477/1674] [Arista] Increase switch PCIe timeout for
 7060-cx32s (#9248)

Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com>
Why I did it
Arista 7060 platform has a rare and unreproduceable PCIe timeout that could possibly be solved with increasing the switch PCIe timeout value. To do this we'll call a script for this platform to increase the PCIe timeout on boot-up.

No issues would be expected from the setpci command. From the PCIe spec:

"Software is permitted to change the value in this field at any
time. For Requests already pending when the Completion
Timeout Value is changed, hardware is permitted to use either
the new or the old value for the outstanding Requests, and is
permitted to base the start time for each Request either on when
this value was changed or on when each request was issued. "

How I did it
Add "platform-init" support in swss docker similar to how "hwsku-init" is called, only this would be for any device belonging to a platform. Then the script would reside in device data folder.

Additionally, add pciutils dependency to docker-orchagent so it can run the setpci commands.

How to verify it
On bootup of an Arista 7060, can execute:
lspci -vv -s 01:00.0 | grep -i "devctl2"
In order to check that the timeout has changed.
---
 device/arista/x86_64-arista_7060_cx32s/platform-init | 3 +++
 dockers/docker-orchagent/Dockerfile.j2               | 1 +
 dockers/docker-orchagent/docker-init.sh              | 5 +++++
 3 files changed, 9 insertions(+)
 create mode 100755 device/arista/x86_64-arista_7060_cx32s/platform-init

diff --git a/device/arista/x86_64-arista_7060_cx32s/platform-init b/device/arista/x86_64-arista_7060_cx32s/platform-init
new file mode 100755
index 000000000000..e31a7a0db4c7
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/platform-init
@@ -0,0 +1,3 @@
+# Increase PCIe timeout value to 210ms
+setpci -s01:00.0 CAP_EXP+0x28.B=6
+setpci -s01:00.1 CAP_EXP+0x28.B=6
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 88041718ea70..007f7808239d 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -19,6 +19,7 @@ RUN apt-get update &&       \
         bridge-utils        \
         conntrack           \
         ndppd               \
+        pciutils            \
         # Needed for installing netifaces Python package
         build-essential     \
         python3-dev
diff --git a/dockers/docker-orchagent/docker-init.sh b/dockers/docker-orchagent/docker-init.sh
index fb042e21cf1c..7e55d40f59c2 100755
--- a/dockers/docker-orchagent/docker-init.sh
+++ b/dockers/docker-orchagent/docker-init.sh
@@ -17,6 +17,11 @@ SUBTYPE=$(sonic-cfggen -d -v "DEVICE_METADATA['localhost']['subtype']")
 
 chmod +x /usr/bin/wait_for_link.sh
 
+# Executed platform specific initialization tasks.
+if [ -x /usr/share/sonic/platform/platform-init ]; then
+    /usr/share/sonic/platform/platform-init
+fi
+
 # Executed HWSKU specific initialization tasks.
 if [ -x /usr/share/sonic/hwsku/hwsku-init ]; then
     /usr/share/sonic/hwsku/hwsku-init

From 550a3feb072e302576f28f1648c3ce1ec568e4ec Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:45:09 +0800
Subject: [PATCH 1478/1674] Update sonic-swss submodule pointer (#12806)

- [202012] [ACL] Specify action list for `PFCWD` and `DROP` ACL table
- Fixed a bug causing error state of same configuration is applied twice
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 08711a890aa4..cc28bf81bdcf 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 08711a890aa4a39cebe7742e6c40e24a9ab5a4da
+Subproject commit cc28bf81bdcf1a5ef49db987b248f7bef300f275

From 6a74213b250f257f9191fb8ba2d2675cb0bd9e19 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:48:57 +0800
Subject: [PATCH 1479/1674] [ci/build]: Upgrade SONiC package versions (#12796)

---
 .../versions/build/build-sonic-slave-buster/versions-git    | 4 ++--
 files/build/versions/default/versions-git                   | 6 +++---
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 2 +-
 .../dockers/docker-syncd-bfn-rpc/versions-deb-buster        | 2 +-
 .../dockers/docker-syncd-brcm-rpc/versions-deb-buster       | 2 +-
 .../dockers/docker-syncd-centec-rpc/versions-deb-buster     | 2 +-
 .../dockers/docker-syncd-mlnx-rpc/versions-deb-buster       | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 67e6e8c3f2e6..47ce63e74f07 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,9 +1,9 @@
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==e57022d3be8430f4c3c239cbb71eccbd547259f2
+https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==7f233a17819ec68d25c09dfd67e3e5e1edf64a29
+https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index ba777ced8f2d..580f4b0e9a95 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,15 +1,15 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==e57022d3be8430f4c3c239cbb71eccbd547259f2
+https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==7f233a17819ec68d25c09dfd67e3e5e1edf64a29
+https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 760d9f5d0ccd..bee20e326020 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -12,7 +12,7 @@ importlib-metadata==5.0.0
 importlib-resources==5.10.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.17.0
+jsonschema==4.17.1
 jsonschema-spec==0.1.2
 lazy-object-proxy==1.8.0
 openapi-schema-validator==0.3.4
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index cb2abfd56e54..e47e1a29587d 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
+libarchive13==3.3.3-4+deb10u2
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 66bf4a3b5295..dbc50ab51aae 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
+libarchive13==3.3.3-4+deb10u2
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 3e65aee64872..8ca7577f4fd1 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
+libarchive13==3.3.3-4+deb10u2
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 2364dce02ea4..ced32f4ea7dc 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
+libarchive13==3.3.3-4+deb10u2
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 1652385ee1bf..2fc47ffde58f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -231,7 +231,7 @@ libapt-inst2.0==1.8.2.3
 libapt-pkg-perl==0.1.34+b1
 libarchive-cpio-perl==0.10-1
 libarchive-zip-perl==1.64-1
-libarchive13==3.3.3-4+deb10u1
+libarchive13==3.3.3-4+deb10u2
 libargon2-1==0~20171227-0.2
 libasan5==8.3.0-6
 libasm-java==7.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 6e9a37b896fa..1dd8bef1ff55 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 6e9a37b896fa..1dd8bef1ff55 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==d06e475934f6496819f88ae0ab6a3a9d3e77ae6d
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 47d7e5d0d2bcc2afe1a637277515125ce337c400 Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Wed, 23 Nov 2022 21:49:00 +0800
Subject: [PATCH 1480/1674] [202012] Apply separated DSCP_TO_TC_MAP and
 TC_TO_QUEUE_MAP on dualtor (#12792)

* Apply separated DSCP_TO_TC_MAP and TC_TO_QUEUE_MAP on dualtor
---
 .../BALANCED/qos.json.j2                      |  81 ++++++++++++-
 .../profiles/th2/7260/BALANCED/qos.json.j2    |  79 +++++++++++++
 .../th2/7260/RDMA-CENTRIC/qos.json.j2         |  80 +++++++++++++
 files/build_templates/qos_config.j2           |  14 ++-
 .../py3/qos-arista7050cx3-dualtor.json        | 111 +++++++++++++++---
 .../py3/qos-arista7260-dualtor.json           | 109 ++++++++++++++---
 6 files changed, 439 insertions(+), 35 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
index 040da33dd79f..74059a27d24b 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/qos.json.j2
@@ -1,4 +1,6 @@
 {% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{% set different_dscp_to_tc_map = true %}
+{% set different_tc_to_queue_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -67,7 +69,73 @@
             "62": "1",
             "63": "1"
         },
-    "AZURE_TUNNEL": {
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
+        "AZURE_TUNNEL": {
             "0" : "1",
             "1" : "1",
             "2" : "1",
@@ -174,6 +242,17 @@
             "7": "7",
             "8": "1"
         },
+        "AZURE_UPLINK": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
         "AZURE_TUNNEL": {
             "0": "0",
             "1": "1",
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
index 750d0fb0ea77..743002c4f022 100644
--- a/device/common/profiles/th2/7260/BALANCED/qos.json.j2
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -151,6 +151,8 @@
     },
 {%- endmacro %}
 {% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{% set different_dscp_to_tc_map = true %}
+{% set different_tc_to_queue_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -219,6 +221,72 @@
             "62": "1",
             "63": "1"
         },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
         "AZURE_TUNNEL": {
             "0" : "1",
             "1" : "1",
@@ -326,6 +394,17 @@
             "7": "7",
             "8": "1"
         },
+        "AZURE_UPLINK": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
         "AZURE_TUNNEL": {
             "0": "0",
             "1": "1",
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
index 771b8305f8f0..743002c4f022 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -1,4 +1,5 @@
 {% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
+{% set different_dscp_to_tc_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -150,6 +151,8 @@
     },
 {%- endmacro %}
 {% elif ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{% set different_dscp_to_tc_map = true %}
+{% set different_tc_to_queue_map = true %}
 {%- macro generate_dscp_to_tc_map() %}
     "DSCP_TO_TC_MAP": {
         "AZURE": {
@@ -218,6 +221,72 @@
             "62": "1",
             "63": "1"
         },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
         "AZURE_TUNNEL": {
             "0" : "1",
             "1" : "1",
@@ -325,6 +394,17 @@
             "7": "7",
             "8": "1"
         },
+        "AZURE_UPLINK": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
         "AZURE_TUNNEL": {
             "0": "0",
             "1": "1",
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 078dd4470b12..5aeb4531328b 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -238,13 +238,25 @@
 {% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
             "dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]",
 {% else %}
-{% if different_dscp_to_tc_map and port not in port_names_list_extra_queues and tunnel_qos_remap_enable %}
+{# Apply separated DSCP_TO_TC_MAP to uplink ports on ToR and Leaf #}
+{% if different_dscp_to_tc_map and tunnel_qos_remap_enable %}
+{% if ('type' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter') and (port not in port_names_list_extra_queues) %}
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+{% elif ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR') and (port in port_names_list_extra_queues) %}
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+{% else %}
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+{% endif %}
 {% else %}
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
 {% endif %}
 {% endif %}
+{# Apply separated TC_TO_QUEUE_MAP to uplink ports on ToR #}
+{% if different_tc_to_queue_map and tunnel_qos_remap_enable and port in port_names_list_extra_queues %}
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
+{% else %}
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+{% endif %}
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
 {% if asic_type in pfc_to_pg_map_supported_asics %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
index b327fc2be3e0..3ce939b36cae 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -39,7 +39,7 @@
         "AZURE": {
             "0": "0",
             "1": "1",
-            "2": "1",  
+            "2": "1",
             "3": "3",
             "4": "4",
             "5": "5",
@@ -47,6 +47,17 @@
             "7": "7",
             "8": "1"
         },
+        "AZURE_UPLINK": {
+            "0": "0",
+            "1": "1",
+            "2": "2",
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
         "AZURE_TUNNEL": {
             "0": "0",
             "1": "1",
@@ -126,6 +137,72 @@
             "62": "1",
             "63": "1"
         },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
         "AZURE_TUNNEL": {
             "0" : "1",
             "1" : "1",
@@ -269,32 +346,32 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet24": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet28": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet32": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet36": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
@@ -397,32 +474,32 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet88": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet92": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet96": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet100": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index 21c1a70ceb75..2e3a5ff4bd37 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -47,6 +47,17 @@
             "7": "7",
             "8": "1"
         },
+        "AZURE_UPLINK": {
+            "0": "0",
+            "1": "1",
+            "2": "2",  
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "1"
+        },
         "AZURE_TUNNEL": {
             "0": "0",
             "1": "1",
@@ -126,6 +137,72 @@
             "62": "1",
             "63": "1"
         },
+        "AZURE_UPLINK": {
+            "0" : "1",
+            "1" : "1",
+            "2" : "2",
+            "3" : "3",
+            "4" : "4",
+            "5" : "1",
+            "6" : "6",
+            "7" : "1",
+            "8" : "0",
+            "9" : "1",
+            "10": "1",
+            "11": "1",
+            "12": "1",
+            "13": "1",
+            "14": "1",
+            "15": "1",
+            "16": "1",
+            "17": "1",
+            "18": "1",
+            "19": "1",
+            "20": "1",
+            "21": "1",
+            "22": "1",
+            "23": "1",
+            "24": "1",
+            "25": "1",
+            "26": "1",
+            "27": "1",
+            "28": "1",
+            "29": "1",
+            "30": "1",
+            "31": "1",
+            "32": "1",
+            "33": "8",
+            "34": "1",
+            "35": "1",
+            "36": "1",
+            "37": "1",
+            "38": "1",
+            "39": "1",
+            "40": "1",
+            "41": "1",
+            "42": "1",
+            "43": "1",
+            "44": "1",
+            "45": "1",
+            "46": "5",
+            "47": "1",
+            "48": "7",
+            "49": "1",
+            "50": "1",
+            "51": "1",
+            "52": "1",
+            "53": "1",
+            "54": "1",
+            "55": "1",
+            "56": "1",
+            "57": "1",
+            "58": "1",
+            "59": "1",
+            "60": "1",
+            "61": "1",
+            "62": "1",
+            "63": "1"
+        },
         "AZURE_TUNNEL": {
             "0" : "1",
             "1" : "1",
@@ -317,64 +394,64 @@
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet48": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet52": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet56": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet60": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet64": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet68": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet72": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",
             "pfcwd_sw_enable" : "3,4"
         },
         "Ethernet76": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE_UPLINK]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE_UPLINK]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
             "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
             "pfc_enable"      : "2,3,4,6",

From 5caa2917399cfb0819b84a92aeecb82ccbf70709 Mon Sep 17 00:00:00 2001
From: Kevin Wang <65380078+kevinskwang@users.noreply.github.com>
Date: Thu, 24 Nov 2022 21:13:20 +0800
Subject: [PATCH 1481/1674] Update sonic-utilities submodule pointer (#12807)

bugfix[2024] vnet route check exit code fix.
Show tech save file to skip non-file entries in cisco-8000 platform
[armhf][sonic-installer] [cherry-pick to branch 202012] Fix the issue of sonic-installer list after set-default and cleanup
[show][muxcable] Catch port Value error exception
[dualtor][202012] Send arp/ndp packets from vlan_mac if the device is dualtor
[show] vnet advertised-route command
[show][muxcable] add support for show mux firmware version all

Signed-off-by: Kevin(Shengkai) Wang <shengkaiwang@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 7272bf373165..b2b59487c5db 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 7272bf373165cffbc28323809fa12d61823086cd
+Subproject commit b2b59487c5dbeb39bca97d89492de77752229b87

From 3c88bee836785c98c4d36268b2c63048ceecc9a3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 27 Nov 2022 18:59:21 +0800
Subject: [PATCH 1482/1674] [ci/build]: Upgrade SONiC package versions (#12827)

---
 .../versions/build/build-sonic-slave-buster/versions-git  | 2 +-
 .../build/build-sonic-slave-buster/versions-py3-all-arm64 | 2 +-
 .../build/build-sonic-slave-buster/versions-py3-all-armhf | 2 +-
 files/build/versions/default/versions-git                 | 4 ++--
 .../dockers/docker-base-buster/versions-deb-buster        | 6 +++---
 .../versions/dockers/docker-database/versions-deb-buster  | 4 ++--
 .../dockers/docker-dhcp-relay/versions-deb-buster         | 4 ++--
 .../versions/dockers/docker-fpm-frr/versions-deb-buster   | 4 ++--
 .../dockers/docker-gbsyncd-vs/versions-deb-buster         | 4 ++--
 .../versions/dockers/docker-lldp/versions-deb-buster      | 4 ++--
 .../build/versions/dockers/docker-mux/versions-deb-buster | 4 ++--
 .../build/versions/dockers/docker-nat/versions-deb-buster | 4 ++--
 .../versions/dockers/docker-orchagent/versions-deb-buster | 7 +++++--
 .../dockers/docker-platform-monitor/versions-deb-buster   | 4 ++--
 .../dockers/docker-router-advertiser/versions-deb-buster  | 4 ++--
 .../versions/dockers/docker-sflow/versions-deb-buster     | 4 ++--
 .../versions/dockers/docker-snmp/versions-deb-buster      | 4 ++--
 .../docker-sonic-mgmt-framework/versions-deb-buster       | 4 ++--
 .../dockers/docker-sonic-mgmt-framework/versions-py3      | 4 ++--
 .../dockers/docker-sonic-telemetry/versions-deb-buster    | 4 ++--
 files/build/versions/dockers/docker-sonic-vs/versions-py2 | 2 +-
 files/build/versions/dockers/docker-sonic-vs/versions-py3 | 2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster         | 4 ++--
 .../dockers/docker-syncd-centec/versions-deb-buster       | 4 ++--
 .../dockers/docker-syncd-invm/versions-deb-buster         | 4 ++--
 .../dockers/docker-syncd-mlnx/versions-deb-buster         | 4 ++--
 .../versions/dockers/docker-syncd-vs/versions-deb-buster  | 4 ++--
 .../versions/dockers/docker-teamd/versions-deb-buster     | 4 ++--
 .../dockers/sonic-slave-buster/versions-deb-buster        | 8 ++++----
 .../versions/dockers/sonic-slave-buster/versions-git      | 2 +-
 .../versions/dockers/sonic-slave-stretch/versions-git     | 2 +-
 files/build/versions/host-image/versions-deb-buster       | 8 ++++----
 files/build/versions/host-image/versions-py3              | 2 +-
 33 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 47ce63e74f07..f623f1fb7efd 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,7 +1,7 @@
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
+https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4
 https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
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
index ab8db0a0df70..42b63c026353 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
 requests==2.28.1
-urllib3==1.26.12
\ No newline at end of file
+urllib3==1.26.13
\ No newline at end of file
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
index ab8db0a0df70..42b63c026353 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
 requests==2.28.1
-urllib3==1.26.12
\ No newline at end of file
+urllib3==1.26.13
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 580f4b0e9a95..6c779cc9ed9f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,10 +1,10 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb
+https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 063e2354b7dc..6c77c09bae9d 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -66,6 +66,6 @@ readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1+deb10u2
 socat==1.7.3.1-2+deb9u1
-vim-common==2:8.1.0875-5+deb10u3
-vim-tiny==2:8.1.0875-5+deb10u3
-xxd==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim-common==2:8.1.0875-5+deb10u4
+vim-tiny==2:8.1.0875-5+deb10u4
+xxd==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
index f6a5a35cee0f..c6eb97b7f7a7 100644
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 redis-server==5:6.0.6-1~bpo10+1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index 7194cb721e2a..b2c148c1e9a8 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -28,5 +28,5 @@ sonic-dhcpmon==1.0.0-0
 sonic-dhcpmon-dbgsym==1.0.0-0
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index c54f0ff1b9df..8ab29c912939 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -33,5 +33,5 @@ sensible-utils==0.0.12
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 3402cc62fc4b..6da0ec29a7b3 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 2be0ec1ee8e7..b658e2abc158 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -26,5 +26,5 @@ mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-mux/versions-deb-buster b/files/build/versions/dockers/docker-mux/versions-deb-buster
index f582d89edb51..75431e74e508 100644
--- a/files/build/versions/dockers/docker-mux/versions-deb-buster
+++ b/files/build/versions/dockers/docker-mux/versions-deb-buster
@@ -25,5 +25,5 @@ sonic-linkmgrd==1.0.0-1
 sonic-linkmgrd-dbgsym==1.0.0-1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
index 71e74c97fd5f..490654c42095 100644
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -23,5 +23,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index dfb3ade7a3a9..b6709f233931 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -33,6 +33,7 @@ libgpm2==1.20.7-5
 libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
+libkmod2==26-1
 liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
@@ -41,6 +42,7 @@ libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
 libnfnetlink0==1.0.1-3+b1
 libpcap0.8==1.8.1-6+deb10u1
+libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libpython3-dev==3.7.3-1
 libpython3.7-dev==3.7.3-2+deb10u4
@@ -57,11 +59,12 @@ ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 openssh-client==1:7.9p1-10+deb10u2
 patch==2.7.6-3+deb10u1
+pciutils==1:3.5.2-1
 python3-dev==3.7.3-1
 python3.7-dev==3.7.3-2+deb10u4
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
 tcpdump==4.9.3-1~deb10u2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index e77849a397a6..83a791404500 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -137,5 +137,5 @@ sxd-libs==1.mlnx.4.5.3186
 sxd-libs-dev==1.mlnx.4.5.3186
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
index 797ea1d7d9b4..093190b13121 100644
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -13,5 +13,5 @@ openssh-client==1:7.9p1-10+deb10u2
 radvd==1:2.17-2
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
index 64b267060fc8..ce14600e6c32 100644
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -16,5 +16,5 @@ psample==1.1-1
 sflowtool==5.04
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 526cd9e7ac2c..f35262af0036 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -61,5 +61,5 @@ snmpd==5.7.3+dfsg-5
 snmpd-dbgsym==5.7.3+dfsg-5
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index f92e76c0b694..f8720e6083f3 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -70,5 +70,5 @@ sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index bee20e326020..34db954266d7 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.2
 grpcio==1.50.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==5.0.0
+importlib-metadata==5.1.0
 importlib-resources==5.10.0
 inflection==0.5.1
 itsdangerous==2.1.2
@@ -27,4 +27,4 @@ six==1.11.0
 typing_extensions==4.4.0
 urllib3==1.26.5
 werkzeug==2.2.2
-zipp==3.10.0
\ No newline at end of file
+zipp==3.11.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
index 0ff3d329e621..88953cfb63d6 100644
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -15,5 +15,5 @@ sonic-mgmt-common==1.0.0
 sonic-telemetry==0.1
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 86bba8faec64..bab11c897825 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.12
\ No newline at end of file
+urllib3==1.26.13
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index ea4b2075a925..9ac340c32134 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.28.1
 scapy==2.4.4
 tabulate==0.9.0
-urllib3==1.26.12
+urllib3==1.26.13
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index a96ea19ef8d6..e2fa0e18bfed 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -31,6 +31,6 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index efcdf175e4cd..6a905c8607b8 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -18,5 +18,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index 03e64ebeeccb..f3ed6d2706b1 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -23,5 +23,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 6c30f277bc4e..8f68ce964b97 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -65,7 +65,7 @@ sxd-libs==1.mlnx.4.5.3186
 sxd-libs-dev==1.mlnx.4.5.3186
 syncd==1.0.0
 syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
 wjh-libs==1.mlnx.4.5.3186
 wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 3402cc62fc4b..6da0ec29a7b3 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -21,5 +21,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
index 564f4249ff76..4182f6ed05a8 100644
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -17,5 +17,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
\ No newline at end of file
+vim==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 2fc47ffde58f..61d5b2949b0c 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1694,9 +1694,9 @@ uuid-dev==2.33.1-0.1
 va-driver-all==2.4.0-1
 vdpau-driver-all==1.1.1-10
 velocity==1.7-5+deb10u1
-vim==2:8.1.0875-5+deb10u3
-vim-common==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
+vim==2:8.1.0875-5+deb10u4
+vim-common==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
 wayland-protocols==1.17-1
 wdiff==1.2.2-2+b1
 wget==1.20.1-1.1
@@ -1728,7 +1728,7 @@ xorg-sgml-doctools==1:1.11-1
 xsltproc==1.1.32-2.2~deb10u2
 xterm==344-1+deb10u2
 xtrans-dev==1.3.5-1
-xxd==2:8.1.0875-5+deb10u3
+xxd==2:8.1.0875-5+deb10u4
 xz-utils==5.2.4-1+deb10u1
 zip==3.0-11+b1
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 1dd8bef1ff55..7bc91d253f28 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 1dd8bef1ff55..7bc91d253f28 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2fc7e1ffd58b00601b47a5126201e5162911e244
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 636a0a862a97..f59c6b4d9cb9 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -330,9 +330,9 @@ udev==247.3-6~bpo10+1
 unzip==6.0-23+deb10u3
 usb.ids==2019.07.27-0+deb10u1
 usbutils==1:010-3
-vim==2:8.1.0875-5+deb10u3
-vim-common==2:8.1.0875-5+deb10u3
-vim-runtime==2:8.1.0875-5+deb10u3
-xxd==2:8.1.0875-5+deb10u3
+vim==2:8.1.0875-5+deb10u4
+vim-common==2:8.1.0875-5+deb10u4
+vim-runtime==2:8.1.0875-5+deb10u4
+xxd==2:8.1.0875-5+deb10u4
 xz-utils==5.2.4-1+deb10u1
 zlib1g==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3894324f597f..14428a7f491d 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -38,7 +38,7 @@ scapy==2.4.4
 six==1.16.0
 tabulate==0.9.0
 thrift==0.13.0
-urllib3==1.26.12
+urllib3==1.26.13
 watchdog==0.10.3
 websocket-client==1.4.2
 xmltodict==0.12.0
\ No newline at end of file

From bbcad1362fe7afcf36032d84966608b150b1b175 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Tue, 29 Nov 2022 12:53:58 -0800
Subject: [PATCH 1483/1674] [202012] [Profile separation] MMU infrastructure
 update for TD2 (#12739)

Signed-off-by: Neetha John <nejo@microsoft.com>

This is to backport #12626

Why I did it
There is a need to have separate profiles on compute and storage and this infra update will help achieve that

How I did it
Moved buffer pool/profile and qos definitions on TD2 to a common folder and all TD2 hwsku's will reference that folder
---
 .../Arista-7050-QX32/BALANCED                 |  1 +
 .../Arista-7050-QX32/RDMA-CENTRIC             |  1 +
 .../Arista-7050-QX32/TCP-CENTRIC              |  1 +
 .../Arista-7050-QX32/buffer_ports_t0.j2       |  6 ++
 .../Arista-7050-QX32/buffer_ports_t1.j2       |  6 ++
 .../Arista-7050-QX32/buffers_defaults_t0.j2   | 46 +----------
 .../Arista-7050-QX32/buffers_defaults_t1.j2   | 46 +----------
 .../Arista-7050-QX32/pg_profile_lookup.ini    | 12 +--
 .../Arista-7050-QX32/qos.json.j2              |  2 +-
 .../Arista-7050QX-32S-S4Q31/BALANCED          |  1 +
 .../Arista-7050QX-32S-S4Q31/RDMA-CENTRIC      |  1 +
 .../Arista-7050QX-32S-S4Q31/TCP-CENTRIC       |  1 +
 .../buffer_ports_t0.j2                        | 10 +++
 .../buffer_ports_t1.j2                        | 10 +++
 .../buffers_defaults_t0.j2                    | 50 +-----------
 .../buffers_defaults_t1.j2                    | 50 +-----------
 .../pg_profile_lookup.ini                     | 18 +----
 .../Arista-7050QX-32S-S4Q31/qos.json.j2       |  2 +-
 .../Arista-7050QX32S-Q32/BALANCED             |  1 +
 .../Arista-7050QX32S-Q32/RDMA-CENTRIC         |  1 +
 .../Arista-7050QX32S-Q32/TCP-CENTRIC          |  1 +
 .../Arista-7050QX32S-Q32/buffer_ports_t0.j2   |  6 ++
 .../Arista-7050QX32S-Q32/buffer_ports_t1.j2   |  6 ++
 .../buffers_defaults_t0.j2                    | 46 +----------
 .../buffers_defaults_t1.j2                    | 46 +----------
 .../pg_profile_lookup.ini                     | 12 +--
 .../Arista-7050QX32S-Q32/qos.json.j2          |  2 +-
 .../td2/6000/BALANCED/buffers_defaults_t0.j2  | 40 ++++++++++
 .../td2/6000/BALANCED/buffers_defaults_t1.j2  | 40 ++++++++++
 .../td2/6000/BALANCED/pg_profile_lookup.ini   | 17 ++++
 .../profiles/td2/6000/BALANCED/qos.json.j2    |  1 +
 .../6000/RDMA-CENTRIC/buffers_defaults_t0.j2  | 40 ++++++++++
 .../6000/RDMA-CENTRIC/buffers_defaults_t1.j2  | 40 ++++++++++
 .../6000/RDMA-CENTRIC/pg_profile_lookup.ini   | 17 ++++
 .../td2/6000/RDMA-CENTRIC/qos.json.j2         |  1 +
 device/common/profiles/td2/6000/TCP-CENTRIC   |  1 +
 .../td2/gen/BALANCED/buffers_defaults_t0.j2   | 40 ++++++++++
 .../td2/gen/BALANCED/buffers_defaults_t1.j2   | 40 ++++++++++
 .../td2/gen/BALANCED/pg_profile_lookup.ini    | 17 ++++
 .../profiles/td2/gen/BALANCED/qos.json.j2     |  1 +
 .../gen/RDMA-CENTRIC/buffers_defaults_t0.j2   | 40 ++++++++++
 .../gen/RDMA-CENTRIC/buffers_defaults_t1.j2   | 40 ++++++++++
 .../gen/RDMA-CENTRIC/pg_profile_lookup.ini    | 17 ++++
 .../profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 |  1 +
 device/common/profiles/td2/gen/TCP-CENTRIC    |  1 +
 .../Force10-S6000-Q20S48/BALANCED             |  1 +
 .../Force10-S6000-Q20S48/RDMA-CENTRIC         |  1 +
 .../Force10-S6000-Q20S48/TCP-CENTRIC          |  1 +
 .../Force10-S6000-Q20S48/buffer_ports_t0.j2   | 24 ++++++
 .../Force10-S6000-Q20S48/buffer_ports_t1.j2   | 24 ++++++
 .../buffers_defaults_t0.j2                    | 64 +--------------
 .../buffers_defaults_t1.j2                    | 64 +--------------
 .../pg_profile_lookup.ini                     | 18 +----
 .../Force10-S6000-Q20S48/qos.json.j2          |  2 +-
 .../Force10-S6000-Q24S32/BALANCED             |  1 +
 .../Force10-S6000-Q24S32/RDMA-CENTRIC         |  1 +
 .../Force10-S6000-Q24S32/TCP-CENTRIC          |  1 +
 .../Force10-S6000-Q24S32/buffer_ports_t0.j2   | 15 ++++
 .../Force10-S6000-Q24S32/buffer_ports_t1.j2   | 16 ++++
 .../buffers_defaults_t0.j2                    | 56 +------------
 .../buffers_defaults_t1.j2                    | 56 +------------
 .../pg_profile_lookup.ini                     | 18 +----
 .../Force10-S6000-Q24S32/qos.json.j2          |  2 +-
 .../Force10-S6000-Q28S16/BALANCED             |  1 +
 .../Force10-S6000-Q28S16/RDMA-CENTRIC         |  1 +
 .../Force10-S6000-Q28S16/TCP-CENTRIC          |  1 +
 .../Force10-S6000-Q28S16/buffer_ports_t0.j2   | 39 +++++++++
 .../Force10-S6000-Q28S16/buffer_ports_t1.j2   | 39 +++++++++
 .../buffers_defaults_t0.j2                    | 79 +------------------
 .../buffers_defaults_t1.j2                    | 79 +------------------
 .../pg_profile_lookup.ini                     | 18 +----
 .../Force10-S6000-Q28S16/qos.json.j2          |  2 +-
 .../Force10-S6000/BALANCED                    |  1 +
 .../Force10-S6000/RDMA-CENTRIC                |  1 +
 .../Force10-S6000/TCP-CENTRIC                 |  1 +
 .../Force10-S6000/buffer_ports_t0.j2          |  7 ++
 .../Force10-S6000/buffer_ports_t1.j2          |  6 ++
 .../Force10-S6000/buffers_defaults_t0.j2      | 46 +----------
 .../Force10-S6000/buffers_defaults_t1.j2      | 46 +----------
 .../Force10-S6000/pg_profile_lookup.ini       | 18 +----
 .../Force10-S6000/qos.json.j2                 |  2 +-
 81 files changed, 657 insertions(+), 874 deletions(-)
 create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED
 create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
 create mode 100644 device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/td2/6000/BALANCED/qos.json.j2
 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2
 create mode 120000 device/common/profiles/td2/6000/TCP-CENTRIC
 create mode 100644 device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/td2/gen/BALANCED/qos.json.j2
 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
 create mode 120000 device/common/profiles/td2/gen/TCP-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC
 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED
new file mode 120000
index 000000000000..808c3d86217f
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC
new file mode 120000
index 000000000000..8bcc02cca148
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC
new file mode 120000
index 000000000000..7ac6cc7160ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..48bbf2fc121e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..48bbf2fc121e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
deleted file mode 100644
index d8190e4893de..000000000000
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  40000  5m   46384     18432   45136  -3        2496
-  50000  5m   46592     18432   45344  -3        2496
- 100000  5m   48464     18432   47216  -3        2496
-  40000  40m  48464     18432   47216  -3        2496
-  50000  40m  49296     18432   48048  -3        2496
- 100000  40m  53872     18432   52624  -3        2496
-  40000  300m 64064     18432   62816  -3        2496
-  50000  300m 68848     18432   67600  -3        2496
- 100000  300m 92976     18432   91728  -3        2496
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED
new file mode 120000
index 000000000000..808c3d86217f
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC
new file mode 120000
index 000000000000..8bcc02cca148
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC
new file mode 120000
index 000000000000..7ac6cc7160ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2
new file mode 100644
index 000000000000..102169973943
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2
@@ -0,0 +1,10 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
+    {% for port_idx in range(1,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2
new file mode 100644
index 000000000000..102169973943
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2
@@ -0,0 +1,10 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
+    {% for port_idx in range(1,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
deleted file mode 100644
index 3c0a68f1da88..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
-    {% for port_idx in range(1,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
deleted file mode 100644
index 3c0a68f1da88..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
-    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
-    {% for port_idx in range(1,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
deleted file mode 100644
index 389a7da97287..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-   1000  5m   41808     18432   40560  -3        2496
-  10000  5m   41808     18432   40560  -3        2496
-  40000  5m   46384     18432   45136  -3        2496
-  50000  5m   46592     18432   45344  -3        2496
- 100000  5m   48464     18432   47216  -3        2496
-   1000  40m  41808     18432   40560  -3        2496
-  10000  40m  41808     18432   40560  -3        2496
-  40000  40m  48464     18432   47216  -3        2496
-  50000  40m  49296     18432   48048  -3        2496
- 100000  40m  53872     18432   52624  -3        2496
-   1000  300m 41808     18432   40560  -3        2496
-  10000  300m 41808     18432   40560  -3        2496
-  40000  300m 64064     18432   62816  -3        2496
-  50000  300m 68848     18432   67600  -3        2496
- 100000  300m 92976     18432   91728  -3        2496
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED
new file mode 120000
index 000000000000..808c3d86217f
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC
new file mode 120000
index 000000000000..8bcc02cca148
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC
new file mode 120000
index 000000000000..7ac6cc7160ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..48bbf2fc121e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..48bbf2fc121e
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
deleted file mode 100644
index d8190e4893de..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  40000  5m   46384     18432   45136  -3        2496
-  50000  5m   46592     18432   45344  -3        2496
- 100000  5m   48464     18432   47216  -3        2496
-  40000  40m  48464     18432   47216  -3        2496
-  50000  40m  49296     18432   48048  -3        2496
- 100000  40m  53872     18432   52624  -3        2496
-  40000  300m 64064     18432   62816  -3        2496
-  50000  300m 68848     18432   67600  -3        2496
- 100000  300m 92976     18432   91728  -3        2496
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..9dbcc8eb2076
--- /dev/null
+++ b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..6661031f9aea
--- /dev/null
+++ b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini b/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..9f2eacb6fc42
--- /dev/null
+++ b/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   56368     18432   55120  -3        2496
+  25000  5m   56368     18432   55120  -3        2496
+  40000  5m   56368     18432   55120  -3        2496
+  50000  5m   56368     18432   55120  -3        2496
+ 100000  5m   56368     18432   55120  -3        2496
+  10000  40m  56368     18432   55120  -3        2496
+  25000  40m  56368     18432   55120  -3        2496
+  40000  40m  56368     18432   55120  -3        2496
+  50000  40m  56368     18432   55120  -3        2496
+ 100000  40m  56368     18432   55120  -3        2496
+  10000  300m 56368     18432   55120  -3        2496
+  25000  300m 56368     18432   55120  -3        2496
+  40000  300m 56368     18432   55120  -3        2496
+  50000  300m 56368     18432   55120  -3        2496
+ 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/common/profiles/td2/6000/BALANCED/qos.json.j2 b/device/common/profiles/td2/6000/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/common/profiles/td2/6000/BALANCED/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..9dbcc8eb2076
--- /dev/null
+++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..6661031f9aea
--- /dev/null
+++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini
new file mode 100644
index 000000000000..9f2eacb6fc42
--- /dev/null
+++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  10000  5m   56368     18432   55120  -3        2496
+  25000  5m   56368     18432   55120  -3        2496
+  40000  5m   56368     18432   55120  -3        2496
+  50000  5m   56368     18432   55120  -3        2496
+ 100000  5m   56368     18432   55120  -3        2496
+  10000  40m  56368     18432   55120  -3        2496
+  25000  40m  56368     18432   55120  -3        2496
+  40000  40m  56368     18432   55120  -3        2496
+  50000  40m  56368     18432   55120  -3        2496
+ 100000  40m  56368     18432   55120  -3        2496
+  10000  300m 56368     18432   55120  -3        2496
+  25000  300m 56368     18432   55120  -3        2496
+  40000  300m 56368     18432   55120  -3        2496
+  50000  300m 56368     18432   55120  -3        2496
+ 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/td2/6000/TCP-CENTRIC b/device/common/profiles/td2/6000/TCP-CENTRIC
new file mode 120000
index 000000000000..d6f7127aa748
--- /dev/null
+++ b/device/common/profiles/td2/6000/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED
\ No newline at end of file
diff --git a/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..9dbcc8eb2076
--- /dev/null
+++ b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..6661031f9aea
--- /dev/null
+++ b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
new file mode 100644
index 000000000000..389a7da97287
--- /dev/null
+++ b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+   1000  5m   41808     18432   40560  -3        2496
+  10000  5m   41808     18432   40560  -3        2496
+  40000  5m   46384     18432   45136  -3        2496
+  50000  5m   46592     18432   45344  -3        2496
+ 100000  5m   48464     18432   47216  -3        2496
+   1000  40m  41808     18432   40560  -3        2496
+  10000  40m  41808     18432   40560  -3        2496
+  40000  40m  48464     18432   47216  -3        2496
+  50000  40m  49296     18432   48048  -3        2496
+ 100000  40m  53872     18432   52624  -3        2496
+   1000  300m 41808     18432   40560  -3        2496
+  10000  300m 41808     18432   40560  -3        2496
+  40000  300m 64064     18432   62816  -3        2496
+  50000  300m 68848     18432   67600  -3        2496
+ 100000  300m 92976     18432   91728  -3        2496
diff --git a/device/common/profiles/td2/gen/BALANCED/qos.json.j2 b/device/common/profiles/td2/gen/BALANCED/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/common/profiles/td2/gen/BALANCED/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..9dbcc8eb2076
--- /dev/null
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t0.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..6661031f9aea
--- /dev/null
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -0,0 +1,40 @@
+{%- set default_cable = '0m' %}
+
+{%- include 'buffer_ports_t1.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
new file mode 100644
index 000000000000..389a7da97287
--- /dev/null
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+   1000  5m   41808     18432   40560  -3        2496
+  10000  5m   41808     18432   40560  -3        2496
+  40000  5m   46384     18432   45136  -3        2496
+  50000  5m   46592     18432   45344  -3        2496
+ 100000  5m   48464     18432   47216  -3        2496
+   1000  40m  41808     18432   40560  -3        2496
+  10000  40m  41808     18432   40560  -3        2496
+  40000  40m  48464     18432   47216  -3        2496
+  50000  40m  49296     18432   48048  -3        2496
+ 100000  40m  53872     18432   52624  -3        2496
+   1000  300m 41808     18432   40560  -3        2496
+  10000  300m 41808     18432   40560  -3        2496
+  40000  300m 64064     18432   62816  -3        2496
+  50000  300m 68848     18432   67600  -3        2496
+ 100000  300m 92976     18432   91728  -3        2496
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
new file mode 100644
index 000000000000..3e548325ea30
--- /dev/null
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/td2/gen/TCP-CENTRIC b/device/common/profiles/td2/gen/TCP-CENTRIC
new file mode 120000
index 000000000000..c1162371df69
--- /dev/null
+++ b/device/common/profiles/td2/gen/TCP-CENTRIC
@@ -0,0 +1 @@
+BALANCED/
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED
new file mode 120000
index 000000000000..af1545f14b74
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC
new file mode 120000
index 000000000000..f65c31fb2e59
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC
new file mode 120000
index 000000000000..46569c641476
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2
new file mode 100644
index 000000000000..eb2755f69f9b
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2
@@ -0,0 +1,24 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,8) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(8,14) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(14,18) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(18,24) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(24,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2
new file mode 100644
index 000000000000..eb2755f69f9b
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2
@@ -0,0 +1,24 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,8) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(8,14) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(14,18) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(18,24) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(24,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2
deleted file mode 100755
index 8243498dd31c..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,63 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,8) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(8,14) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(14,18) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(18,24) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(24,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2
deleted file mode 100755
index 8243498dd31c..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,63 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,8) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(8,14) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(14,18) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(18,24) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(24,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini
deleted file mode 100755
index 9f2eacb6fc42..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2
deleted file mode 100755
index 3e548325ea30..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED
new file mode 120000
index 000000000000..af1545f14b74
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC
new file mode 120000
index 000000000000..f65c31fb2e59
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC
new file mode 120000
index 000000000000..46569c641476
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2
new file mode 100644
index 000000000000..8022ef6ac62f
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2
@@ -0,0 +1,15 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,16) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(16,25) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(25,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2
new file mode 100644
index 000000000000..f68696528a51
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2
@@ -0,0 +1,16 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,16) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(16,25) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+
+    {% endfor %}
+    {% for port_idx in range(25,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2
deleted file mode 100755
index 9d37f8a579db..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,16) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(16,25) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-
-    {% endfor %}
-    {% for port_idx in range(25,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2
deleted file mode 100755
index 9d37f8a579db..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,16) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(16,25) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-
-    {% endfor %}
-    {% for port_idx in range(25,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini
deleted file mode 100755
index 9f2eacb6fc42..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2
deleted file mode 100755
index 3e548325ea30..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED
new file mode 120000
index 000000000000..af1545f14b74
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC
new file mode 120000
index 000000000000..f65c31fb2e59
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC
new file mode 120000
index 000000000000..46569c641476
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2
new file mode 100644
index 000000000000..520c2cb112a6
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2
@@ -0,0 +1,39 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,1) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(1,2) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(2,3) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(3,4) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(4,5) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(5,6) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(6,7) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(7,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2
new file mode 100644
index 000000000000..520c2cb112a6
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2
@@ -0,0 +1,39 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,1) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(1,2) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(2,3) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(3,4) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(4,5) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(5,6) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(6,7) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
+    {% endfor %}
+    {% for port_idx in range(7,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
deleted file mode 100755
index b5a7336e0511..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,1) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(1,2) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(2,3) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(3,4) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(4,5) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(5,6) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(6,7) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(7,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
deleted file mode 100755
index b5a7336e0511..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,1) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(1,2) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(2,3) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(3,4) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(4,5) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(5,6) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(6,7) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
-    {% endfor %}
-    {% for port_idx in range(7,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
deleted file mode 100755
index 9f2eacb6fc42..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
deleted file mode 100755
index 3e548325ea30..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED
new file mode 120000
index 000000000000..af1545f14b74
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/BALANCED
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC
new file mode 120000
index 000000000000..f65c31fb2e59
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC
new file mode 120000
index 000000000000..46569c641476
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/td2/6000/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2
new file mode 100644
index 000000000000..fb4c13c5c794
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2
@@ -0,0 +1,7 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2
new file mode 100644
index 000000000000..48bbf2fc121e
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2
@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
deleted file mode 100644
index dc04b2265f33..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '0m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..c25cc95d6d57
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file

From fe9667950c44e912d87f51a12c4c35792742720d Mon Sep 17 00:00:00 2001
From: jcaiMR <111116206+jcaiMR@users.noreply.github.com>
Date: Wed, 30 Nov 2022 08:23:08 +0800
Subject: [PATCH 1484/1674] static route expiry feature support (#12865)

*[Bgpcfgd] static route expiry feature
---
 src/sonic-bgpcfgd/bgpcfgd/main.py             |  7 +++
 .../bgpcfgd/managers_static_rt.py             | 24 +++++++-
 src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py  | 58 +++++++++++++++++++
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py

diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py
index 698e1756e654..e94597eb29f5 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/main.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/main.py
@@ -2,6 +2,7 @@
 import signal
 import sys
 import syslog
+import threading
 import traceback
 
 from swsscommon import swsscommon
@@ -17,6 +18,7 @@
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
 from .managers_static_rt import StaticRouteMgr
+from .static_rt_timer import StaticRouteTimer
 from .managers_rm import RouteMapMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
@@ -27,6 +29,9 @@
 
 def do_work():
     """ Main function """
+    st_rt_timer = StaticRouteTimer()
+    thr = threading.Thread(target = st_rt_timer.run)
+    thr.start()
     frr = FRR(["bgpd", "zebra", "staticd"])
     frr.wait_for_daemons(seconds=20)
     #
@@ -59,6 +64,7 @@ def do_work():
         BBRMgr(common_objs, "CONFIG_DB", "BGP_BBR"),
         # Static Route Managers
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
+        StaticRouteMgr(common_objs, "APPL_DB", "STATIC_ROUTE"),
         # Route Advertisement Managers
         AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
         RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME),
@@ -67,6 +73,7 @@ def do_work():
     for mgr in managers:
         runner.add_manager(mgr)
     runner.run()
+    thr.join()
 
 
 def main():
diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
index 6fafeda8142d..e479b8edf9de 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py
@@ -4,6 +4,7 @@
 from .template import TemplateFabric
 import socket
 from swsscommon import swsscommon
+from ipaddress import ip_network, IPv4Network
 
 class StaticRouteMgr(Manager):
     """ This class updates static routes when STATIC_ROUTE table is updated """
@@ -93,11 +94,28 @@ def split_key(key):
         Split key into vrf name and prefix.
         :param key: key to split
         :return: vrf name extracted from the key, ip prefix extracted from the key
+        key example: APPL_DB   vrf:5.5.5.0/24, 5.5.5.0/24, vrf:2001::0/64, 2001::0/64
+                     CONFIG_DB vrf|5.5.5.0/24, 5.5.5.0/24, vrf|2001::0/64, 2001::0/64
         """
-        if '|' not in key:
-            return 'default', key
-        else:
+        vrf = ""
+        prefix = ""
+
+        if '|' in key:
             return tuple(key.split('|', 1))
+        else:
+            try:
+                _ = ip_network(key)
+                vrf, prefix = 'default', key
+            except ValueError:
+                # key in APPL_DB
+                log_debug("static route key {} is not prefix only formart, split with ':'".format(key))
+                output = key.split(':', 1)
+                if len(output) < 2:
+                    log_debug("invalid input in APPL_DB {}".format(key))
+                    raise ValueError
+                vrf = output[0]
+                prefix = key[len(vrf)+1:]
+        return vrf, prefix
 
     def static_route_commands(self, ip_nh_set, cur_nh_set, ip_prefix, vrf):
         diff_set = ip_nh_set.symmetric_difference(cur_nh_set)
diff --git a/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py
new file mode 100644
index 000000000000..7042849ef426
--- /dev/null
+++ b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py
@@ -0,0 +1,58 @@
+from .log import log_err, log_info, log_debug
+from swsscommon import swsscommon
+import time
+
+class StaticRouteTimer(object):
+    """ This class checks the static routes and deletes those entries that have not been refreshed """
+    def __init__(self):
+        self.db = swsscommon.SonicV2Connector()
+        self.db.connect(self.db.APPL_DB)
+        self.timer = None
+        self.start = None
+
+    DEFAULT_TIMER = 180
+    DEFAULT_SLEEP = 60
+    MAX_TIMER     = 1800
+
+    def set_timer(self):
+        """ Check for custom route expiry time in STATIC_ROUTE_EXPIRY_TIME """
+        timer = self.db.get(self.db.APPL_DB, "STATIC_ROUTE_EXPIRY_TIME", "time")
+        if timer is not None:
+            if timer.isdigit():
+                timer = int(timer)
+                if timer > 0 and timer <= self.MAX_TIMER:
+                    self.timer = timer
+                    return
+                log_err("Custom static route expiry time of {}s is invalid!".format(timer))
+        return
+
+    def alarm(self):
+        """ Clear unrefreshed static routes """
+        static_routes = self.db.keys(self.db.APPL_DB, "STATIC_ROUTE:*")
+        if static_routes is not None:
+            for sr in static_routes:
+                expiry = self.db.get(self.db.APPL_DB, sr, "expiry")
+                if expiry == "false":
+                    continue
+                refresh = self.db.get(self.db.APPL_DB, sr, "refresh")
+                if refresh == "true":
+                    self.db.set(self.db.APPL_DB, sr, "refresh", "false")
+                    log_debug("Refresh status of static route {} is set to false".format(sr))
+                else:
+                    self.db.delete(self.db.APPL_DB, sr)
+                    log_debug("Static route {} deleted".format(sr))
+        self.start = time.time()
+        return
+
+    def run(self):
+        self.start = time.time()
+        while True:
+            self.set_timer()
+            if self.timer:
+                log_info("Static route expiry set to {}s".format(self.timer))
+                time.sleep(self.timer)
+                self.alarm()
+            else:
+                time.sleep(self.DEFAULT_SLEEP)
+                if time.time() - self.start >= self.DEFAULT_TIMER:
+                    self.alarm()

From 09a485471697989973968cd7f61bfa12c09957ab Mon Sep 17 00:00:00 2001
From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
Date: Wed, 30 Nov 2022 22:37:08 +0800
Subject: [PATCH 1485/1674] Support passing the instance numbers of a testplan.
 (#12880)

Previously, we hard code the min and max numbers of instance in a plan. In this pr, we support passing the instance numbers of a testplan.

Why I did it
Previously, we hard code the min and max numbers of instance in a plan. In this pr, we support passing the instance numbers of a testplan.

How I did it
Use a variable to set the instance number.
---
 .azure-pipelines/run-test-scheduler-template.yml |  4 ++--
 azure-pipelines.yml                              | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index 5af2f8696e8b..8e26c16a0e46 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -11,11 +11,11 @@ parameters:
   default: 36000
 
 - name: MIN_WORKER
-  type: number
+  type: string
   default: 1
 
 - name: MAX_WORKER
-  type: number
+  type: string
   default: 2
 
 - name: TEST_SET
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4fcdcb392602..e0445ceaeadb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -173,8 +173,8 @@ stages:
     - template: .azure-pipelines/run-test-scheduler-template.yml
       parameters:
         TOPOLOGY: t0
-        MIN_WORKER: 2
-        MAX_WORKER: 3
+        MIN_WORKER: $(T0_INSTANCE_NUM)
+        MAX_WORKER: $(T0_INSTANCE_NUM)
         MGMT_BRANCH: 202012
 
   - job: t0_2vlans_testbedv2
@@ -189,7 +189,8 @@ stages:
       parameters:
         TOPOLOGY: t0
         TEST_SET: t0-2vlans
-        MAX_WORKER: 1
+        MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
+        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
         MGMT_BRANCH: 202012
 
@@ -250,8 +251,8 @@ stages:
     - template: .azure-pipelines/run-test-scheduler-template.yml
       parameters:
         TOPOLOGY: t1-lag
-        MIN_WORKER: 2
-        MAX_WORKER: 3
+        MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
+        MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
         MGMT_BRANCH: 202012
 
   - job:
@@ -292,7 +293,7 @@ stages:
       - template: .azure-pipelines/run-test-scheduler-template.yml
         parameters:
           TOPOLOGY: dualtor
-          MIN_WORKER: 1
-          MAX_WORKER: 1
+          MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
+          MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
           MGMT_BRANCH: 202012

From e377b03a943c3868bf17610e7d23efb8fa423fc3 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Fri, 2 Dec 2022 16:01:40 +0800
Subject: [PATCH 1486/1674] Publish docker saiserverv2 in 202012 branch
 (#12903)

# Why I did it
Publish docker saiserverv2 in the build pipeline.

# How I did it
Add docker saiserverv2 target in the build template.

# How to verify it
Run test in #12836 and the target has been built out successfully.

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 .azure-pipelines/azure-pipelines-build.yml | 10 ++++++++++
 .azure-pipelines/build-template.yml        | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 09f2c852f81c..c7cbc363d9f6 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -123,7 +123,17 @@ jobs:
               make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
             fi
             if [ $(docker_syncd_rpc_image) == yes ]; then
+              # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
+              pushd ./src/sonic-sairedis/SAI
+              git stash
+              popd
+              if [ $(GROUP_NAME) == broadcom ]; then
+                make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz
+                pushd ./src/sonic-sairedis/SAI
+                git stash
+                popd
+              fi
             fi
             if [ $(syncd_rpc_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/sonic-$(GROUP_NAME).bin
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 2665f46452c7..7b5ec1ed2757 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -105,6 +105,16 @@ jobs:
         fi
         if [ ${{ parameters.sync_rpc_image }} == true ]; then
           make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz
+          # workaround for issue in rules/sairedis.dep,  git ls-files will list un-exist files for cache
+          pushd ./src/sonic-sairedis/SAI
+          git stash
+          popd 
+          if [ ${{ parameters.platform }} == broadcom ]; then
+            make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz
+            pushd ./src/sonic-sairedis/SAI
+            git stash
+            popd 
+          fi
         fi
 
         make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin

From f683a8737a18ce8d4da44531f3c2de3aefc5224e Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:46:44 +0800
Subject: [PATCH 1487/1674] [ci/build]: Upgrade SONiC package versions (#12914)

---
 .../build-sonic-slave-buster/versions-git     |  6 ++--
 files/build/versions/default/versions-git     |  8 +++---
 .../docker-base-buster/versions-deb-buster    |  8 +++---
 .../docker-sonic-mgmt-framework/versions-py3  |  6 ++--
 .../sonic-slave-buster/versions-deb-buster    | 28 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  8 +++---
 .../host-image/versions-deb-buster-arm64      |  4 +++
 .../host-image/versions-deb-buster-armhf      |  4 +++
 files/build/versions/host-image/versions-py3  |  2 +-
 11 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index f623f1fb7efd..e392962b1f2e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,10 +1,10 @@
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a
+https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4
-https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
+https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
+https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 6c779cc9ed9f..2f5edcc07596 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,16 +1,16 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a
+https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4
-https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb
+https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
+https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 6c77c09bae9d..7f95f2a5d7c4 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -11,14 +11,14 @@ libexpat1==2.2.6-2+deb10u6
 libfastjson4==0.99.8-2
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgssapi-krb5-2==1.17-3+deb10u4
+libgssapi-krb5-2==1.17-3+deb10u5
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
-libk5crypto3==1.17-3+deb10u4
+libk5crypto3==1.17-3+deb10u5
 libkeyutils1==1.6-6
-libkrb5-3==1.17-3+deb10u4
-libkrb5support0==1.17-3+deb10u4
+libkrb5-3==1.17-3+deb10u5
+libkrb5support0==1.17-3+deb10u5
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-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
index 34db954266d7..679208f4862a 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,21 +5,21 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.2
-grpcio==1.50.0
+grpcio==1.51.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==5.1.0
 importlib-resources==5.10.0
 inflection==0.5.1
 itsdangerous==2.1.2
-jsonschema==4.17.1
+jsonschema==4.17.3
 jsonschema-spec==0.1.2
 lazy-object-proxy==1.8.0
 openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.9
+protobuf==4.21.10
 pyrsistent==0.19.2
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 61d5b2949b0c..bb2eec377bfa 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -199,8 +199,8 @@ javahelper==0.72.9
 javascript-common==11
 kernel-wedge==2.99
 kmod==26-1
-krb5-locales==1.17-3+deb10u4
-krb5-multidev==1.17-3+deb10u4
+krb5-locales==1.17-3+deb10u5
+krb5-multidev==1.17-3+deb10u5
 lcov==1.13-4
 less==487-0.1+b1
 lib32asan5==8.3.0-6
@@ -567,8 +567,8 @@ libgraphite2-dev==1.3.13-7
 libgs9==9.27~dfsg-2+deb10u6
 libgs9-common==9.27~dfsg-2+deb10u6
 libgsm1==1.0.18-2
-libgssapi-krb5-2==1.17-3+deb10u4
-libgssrpc4==1.17-3+deb10u4
+libgssapi-krb5-2==1.17-3+deb10u5
+libgssrpc4==1.17-3+deb10u5
 libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
@@ -690,16 +690,16 @@ libjudy-dev==1.0.5-5
 libjudydebian1==1.0.5-5
 libjxr-tools==1.1-6+b1
 libjxr0==1.1-6+b1
-libk5crypto3==1.17-3+deb10u4
-libkadm5clnt-mit11==1.17-3+deb10u4
-libkadm5srv-mit11==1.17-3+deb10u4
-libkdb5-9==1.17-3+deb10u4
+libk5crypto3==1.17-3+deb10u5
+libkadm5clnt-mit11==1.17-3+deb10u5
+libkadm5srv-mit11==1.17-3+deb10u5
+libkdb5-9==1.17-3+deb10u5
 libkeyutils1==1.6-6
 libkmod2==26-1
 libkpathsea6==2018.20181218.49446-1
-libkrb5-3==1.17-3+deb10u4
-libkrb5-dev==1.17-3+deb10u4
-libkrb5support0==1.17-3+deb10u4
+libkrb5-3==1.17-3+deb10u5
+libkrb5-dev==1.17-3+deb10u5
+libkrb5support0==1.17-3+deb10u5
 libksba8==1.3.5-2+deb10u1
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
@@ -1522,9 +1522,9 @@ python-soupsieve==1.8+dfsg-1
 python-sphinx==1.8.4-1
 python-stdeb==0.8.5-1
 python-tk==2.7.16-2
-python-twisted==18.9.0-3+deb10u1
-python-twisted-bin==18.9.0-3+deb10u1
-python-twisted-core==18.9.0-3+deb10u1
+python-twisted==18.9.0-3+deb10u2
+python-twisted-bin==18.9.0-3+deb10u2
+python-twisted-core==18.9.0-3+deb10u2
 python-typing==3.6.6-1
 python-tz==2019.1-1
 python-urllib3==1.24.1-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 7bc91d253f28..0ee65f64e2da 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 7bc91d253f28..0ee65f64e2da 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index f59c6b4d9cb9..7a87825ed09d 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -131,7 +131,7 @@ libglib2.0-0==2.58.3-2+deb10u4
 libgnutls30==3.6.7-4+deb10u9
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
-libgssapi-krb5-2==1.17-3+deb10u4
+libgssapi-krb5-2==1.17-3+deb10u5
 libhavege1==1.9.1-7
 libhiredis0.14==0.14.0-3~bpo9+1
 libi2c0==4.1-1
@@ -144,12 +144,12 @@ libisl19==0.20-2
 libitm1==8.3.0-6
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
-libk5crypto3==1.17-3+deb10u4
+libk5crypto3==1.17-3+deb10u5
 libkeyutils1==1.6-6
 libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
-libkrb5-3==1.17-3+deb10u4
-libkrb5support0==1.17-3+deb10u4
+libkrb5-3==1.17-3+deb10u5
+libkrb5support0==1.17-3+deb10u5
 libksba8==1.3.5-2+deb10u1
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 7fd5c7a3b298..4e4b51a369c9 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -18,9 +18,13 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
+libgssapi-krb5-2==1.17-3+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libk5crypto3==1.17-3+deb10u4
+libkrb5-3==1.17-3+deb10u4
+libkrb5support0==1.17-3+deb10u4
 libksba8==1.3.5-2
 libncurses6==6.1+20181013-2+deb10u2
 libpython3.7==3.7.3-2+deb10u3
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 90bb65b9aacb..a9be54966324 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -18,9 +18,13 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
 libexpat1==2.2.6-2+deb10u4
 libexpat1-dev==2.2.6-2+deb10u4
 libglib2.0-0==2.58.3-2+deb10u3
+libgssapi-krb5-2==1.17-3+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
+libk5crypto3==1.17-3+deb10u4
+libkrb5-3==1.17-3+deb10u4
+libkrb5support0==1.17-3+deb10u4
 libksba8==1.3.5-2
 libncurses6==6.1+20181013-2+deb10u2
 libpython3.7==3.7.3-2+deb10u3
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 14428a7f491d..3d28af302af9 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.9.24
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==38.0.3
+cryptography==38.0.4
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From acd24d9804aaa566ee2539264fceb0f14fe459c4 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Sun, 4 Dec 2022 14:37:18 +0800
Subject: [PATCH 1488/1674] [submodule]Update SAI SDK URL from package storage
 to public (#12835)

In order to make the sai update easier, change the URL pattern to a more unified format, which can be update automated latter.

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 platform/broadcom/sai.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 791f6703c1a7..1e0d85f106c3 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,8 +1,12 @@
-BRCM_SAI = libsaibcm_4.3.7.1-6_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D"
-BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-6_amd64.deb
+LIBSAIBCM_XGS_VERSION = 4.3.7.1-6
+LIBSAIBCM_BRANCH_NAME = REL_4.3.5.2
+LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
+
+BRCM_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb
+$(BRCM_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_SAI)"
+BRCM_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_XGS_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D"
+$(BRCM_SAI_DEV)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_SAI_DEV)"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

From 2cd0fcb9dfb8636de22dc55f09778d53d074df12 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 4 Dec 2022 19:57:40 +0800
Subject: [PATCH 1489/1674] [ci/build]: Upgrade SONiC package versions (#12925)

---
 .../versions-deb-buster                       |  7 ++---
 .../versions-deb-buster-arm64                 |  4 +++
 .../versions-deb-buster-armhf                 |  4 +++
 .../build-sonic-slave-buster/versions-py3     |  1 +
 .../build-sonic-slave-buster/versions-web     |  3 ++
 files/build/versions/default/versions-git     |  2 +-
 .../versions-deb-buster                       | 28 +++++++++++++++++++
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 9 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index be7fe179a3c0..01426c8cba36 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -8,17 +8,14 @@ isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
 libnl-cli-3-200==3.5.0-1
 libnl-cli-3-dev==3.5.0-1
 libnl-genl-3-200==3.5.0-1
 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-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
 libsaibcm==4.3.7.1-6
+libsaibcm-dev==4.3.7.1-6
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -34,6 +31,7 @@ libteam-utils==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
 libthrift-0.11.0==0.11.0-4
+libthrift-0.13.0==0.13.0-6
 libthrift-dev==0.11.0-4
 libyang==1.0.73
 libyang-cpp==1.0.73
@@ -47,6 +45,7 @@ python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
 python3-swsscommon==1.0.0
+python3-thrift==0.13.0-6
 python3-yang==1.0.73
 sonic-dhcp6relay==1.0.0-0
 sonic-dhcpmon==1.0.0-0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
index 57aad7a71092..1be11bdfd522 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
@@ -1 +1,5 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-arm64==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index a83790c30ddf..72e55bfa8606 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1 +1,5 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 500452c7633a..ea8b7de71681 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -12,6 +12,7 @@ psutil==5.9.4
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
+thrift==0.13.0
 websocket-client==1.4.2
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 8cf6d38eddcc..9f40db8ae92e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -8,6 +8,9 @@ http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debia
 http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53
 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901
 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.debian.tar.xz==4c0d6cab366b4fdb0372299ecc8a219a
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.dsc==278cfe25d286d1840ee366b557ed6ab0
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0.orig.tar.gz==38a27d391a2b03214b444cb13d5664f1
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2f5edcc07596..7acc646594e8 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
new file mode 100644
index 000000000000..7941ad15564f
--- /dev/null
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -0,0 +1,28 @@
+gdb==8.2.1-2+b3
+kmod==26-1
+libbabeltrace1==1.5.6-2+deb10u1
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
+libc-dev-bin==2.28-10+deb10u2
+libc6-dev==2.28-10+deb10u2
+libdouble-conversion1==3.1.0-3
+libdw1==0.176-1.1
+libglib2.0-0==2.58.3-2+deb10u4
+libicu63==63.1-6+deb10u3
+libipt2==2.0-2
+libkmod2==26-1
+libpcre2-16-0==10.32-5
+libpopt0==1.16-12
+libprotobuf-dev==3.6.1.3-2
+libprotobuf-lite17==3.6.1.3-2
+libprotobuf17==3.6.1.3-2
+libqt5core5a==5.11.3+dfsg1-1+deb10u5
+libqt5dbus5==5.11.3+dfsg1-1+deb10u5
+libqt5network5==5.11.3+dfsg1-1+deb10u5
+libsaibcm==4.3.7.1-6
+libsaithrift-dev==0.9.4
+libthrift-0.13.0==0.13.0-6
+libyaml-0-2==0.2.1-1
+libyaml-dev==0.2.1-1
+linux-libc-dev==4.19.260-1
+saiserver==0.9.4
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 0ee65f64e2da..2a46a9e37208 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 0ee65f64e2da..2a46a9e37208 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 9d17d4294ec78457914e427ec30214c8a3f4ab5a Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Mon, 5 Dec 2022 13:42:57 +0800
Subject: [PATCH 1490/1674] [Submodule][SAI-Redis]Advance SAI Redis head
 pointer (#12930)

Advance sairedis head pointer, include changes
- https://github.com/sonic-net/sonic-sairedis/pull/1167 https://github.com/sonic-net/sonic-sairedis/commit/4a887a1b04b0509a870df9c2e4ed2baf474a4991

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 src/sonic-sairedis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 315f13bec32d..4a887a1b04b0 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 315f13bec32d914590c9f37f0b34f8897ee03186
+Subproject commit 4a887a1b04b0509a870df9c2e4ed2baf474a4991

From 8fc4b050362f62fdf40822b4e38386397e4e9f31 Mon Sep 17 00:00:00 2001
From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:56:54 +0800
Subject: [PATCH 1491/1674] [TestbedV2][202012]Remove timeout in each step.
 (#12916)

Previously, we set timeout in each step such as Lock testbed, Prepare testbed, Run test and KVM dump. When some issue suck like retry happens in one step, it will cause timeout error, but actually, it only needs more time to success. In this pr, we remove the timeout limit in each step and control the timeout outside in each job. When the job runs more than four hours, it will be cancelled.

Why I did it
Previously, we set timeout in each step such as Lock testbed, Prepare testbed, Run test and KVM dump. When some issue suck like retry happens in one step, it will cause timeout error, but actually, it only needs more time to success. In this pr, we remove the timeout limit in each step and control the timeout outside in each job. When the job runs more than four hours, it will be cancelled.

How I did it
Remove the timeout parameter in each step, and control the timeout outside in each job.

Signed-off-by: Yutong Zhang <yutongzhang@microsoft.com>
---
 .azure-pipelines/run-test-scheduler-template.yml | 12 ++++--------
 azure-pipelines.yml                              |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index 8e26c16a0e46..4821fb05353c 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -67,11 +67,10 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Lock testbed
-    timeoutInMinutes: 240
 
   - script: |
       set -ex
@@ -81,11 +80,10 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 2400 --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Prepare testbed
-    timeoutInMinutes: 40
 
   - script: |
       set -ex
@@ -93,11 +91,10 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 18000 --expected-states KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states KVMDUMP FINISHED CANCELLED FAILED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Run test
-    timeoutInMinutes: 300
 
   - script: |
       set -ex
@@ -105,12 +102,11 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states FINISHED CANCELLED FAILED
     condition: succeededOrFailed()
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: KVM dump
-    timeoutInMinutes: 20
 
   - script: |
       set -ex
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e0445ceaeadb..7b80cd5f2f9e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -166,7 +166,7 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     displayName: "kvmtest-t0 by TestbedV2"
-    timeoutInMinutes: 1080
+    timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
@@ -181,7 +181,7 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     displayName: "kvmtest-t0-2vlans by TestbedV2"
-    timeoutInMinutes: 1080
+    timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
@@ -244,7 +244,7 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     displayName: "kvmtest-t1-lag by TestbedV2"
-    timeoutInMinutes: 600
+    timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
@@ -286,7 +286,7 @@ stages:
     pool:
       vmImage: 'ubuntu-20.04'
     displayName: "kvmtest-dualtor-t0 by TestbedV2"
-    timeoutInMinutes: 1080
+    timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:

From e15acb59ff3e6d73bcc95b0734b98a580aca61ce Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Mon, 5 Dec 2022 14:10:28 +0800
Subject: [PATCH 1492/1674] enable sai-ptf logger in sai_adapter to log all the
 sai api invcations (#12922)

Why I did it
enable sai-ptf logger in sai_adapter to log all the sai api invcations

How I did it
add build parameter to enable the sai-ptf logger when build sai PRC

How to verify it
local build test
test the generated sai_adapter
test with pipeline
Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 platform/broadcom/libsaithrift-dev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
index d8ad7df77fd0..a5c009d2f346 100644
--- a/platform/broadcom/libsaithrift-dev.mk
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -8,7 +8,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 ifeq ($(SAITHRIFT_V2),y)
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0)
-$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="\"--skip_error=-2\""
+$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger --skip_error=-2"
 else
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)

From d24995223dc6a728ed38dd19af13572fa74c0285 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 8 Dec 2022 02:13:33 +0800
Subject: [PATCH 1493/1674] [ci/build]: Upgrade SONiC package versions (#12987)

---
 .../versions/build/build-sonic-slave-buster/versions-web    | 6 +++---
 .../versions/build/build-sonic-slave-stretch/versions-web   | 4 ++--
 files/build/versions/default/versions-git                   | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-deb-buster         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index 9f40db8ae92e..cfd20d032a61 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -31,8 +31,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
@@ -41,4 +39,6 @@ https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u
 https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
-https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 0c74c05a6998..396e45a85c04 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c
-https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 7acc646594e8..abf5f7555bde 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 679208f4862a..89259860f3b8 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -9,7 +9,7 @@ grpcio==1.51.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==5.1.0
-importlib-resources==5.10.0
+importlib-resources==5.10.1
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.17.3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index bb2eec377bfa..e6cc25815590 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -528,7 +528,7 @@ libgeronimo-interceptor-3.0-spec-java==1.0.1-4
 libgetopt-long-descriptive-perl==0.103-2
 libgfortran-8-dev==8.3.0-6
 libgfortran5==8.3.0-6
-libgif7==5.1.4-3
+libgif7==5.1.4-3+deb10u1
 libgirepository-1.0-1==1.58.3-2
 libgit-wrapper-perl==0.048-1
 libgitlab-api-v4-perl==0.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 2a46a9e37208..c3adbdb6e488 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 2a46a9e37208..56aa11f33e08 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==6e33ba049f82587c184ea9b604d9fb081a5e7c24
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 7a87825ed09d..40e02b3a5aff 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.10-1
+containerd.io==1.6.11-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6

From 5d6f8f84f81b8de48157b652149dedf8d62463e2 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:12:28 -0800
Subject: [PATCH 1494/1674] [bgp] Enable BGP Graceful Restart based on device
 role (#9486) (#12990)

What I did:
Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter.

Why I did:-
By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only
---
 dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2             | 2 +-
 .../tests/data/sonic-cfggen/bgpd.conf.j2/all.json             | 3 ++-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json        | 3 ++-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json   | 3 ++-
 .../tests/data/sonic-cfggen/frr.conf.j2/all.json              | 3 ++-
 .../tests/sample_output/py2/bgpd_frr_backend_asic.conf        | 4 ----
 .../tests/sample_output/py2/bgpd_frr_frontend_asic.conf       | 4 ----
 .../tests/sample_output/py2/t2-chassis-fe-bgpd.conf           | 4 ----
 .../tests/sample_output/py3/bgpd_frr_backend_asic.conf        | 4 ----
 .../tests/sample_output/py3/bgpd_frr_frontend_asic.conf       | 4 ----
 .../tests/sample_output/py3/t2-chassis-fe-bgpd.conf           | 4 ----
 11 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index 5c91a34737d6..ce6fc3026a74 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -53,7 +53,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp bestpath as-path multipath-relax
 {% endif %}
 !
-{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled %}
+{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled and DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
   bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
index 34fdbe72448b..fc5016d8536e 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
@@ -3,7 +3,8 @@
         "localhost": {
             "hostname": "new_hostname",
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
index c8f0141ec4f5..47508bb3c001 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
@@ -2,7 +2,8 @@
     "DEVICE_METADATA": {
         "localhost": {
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
index 5b30406668ab..c1b5ae8dc449 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
@@ -2,7 +2,8 @@
     "DEVICE_METADATA": {
         "localhost": {
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
index 92143a2a9deb..9c8a34fb4120 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
@@ -3,7 +3,8 @@
         "localhost": {
             "bgp_asn": "55555",
             "hostname": "test_hostname",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "INTERFACE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
index a4ad1c677a77..20e1d2bc3241 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -46,10 +46,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
index b49d3ddd4dcd..223b7c189e27 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -46,10 +46,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
index d3b9b472c5bd..20744efaa40f 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
@@ -63,10 +63,6 @@ router bgp 4000
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index a4ad1c677a77..20e1d2bc3241 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -46,10 +46,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index b49d3ddd4dcd..223b7c189e27 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -46,10 +46,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
index d3b9b472c5bd..20744efaa40f 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -63,10 +63,6 @@ router bgp 4000
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !

From e8c7a7c61eb88898e506fe975965fc779ee46935 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Thu, 8 Dec 2022 12:16:54 +0200
Subject: [PATCH 1495/1674] [202012][Mellanox] Update SDK/FW to version
 4.5.3196/2010_3196 (#12989)

- Why I did it
Update SDK/FW version - 4.5.3196/2010_3196 in order to have the following fixes:

1. ON SPC2/3 in some cases, after many ACL region resize will corrupt internal DB that in return will fail future ACLs configuration
2.. Lag Port as Analyzer Port | when removing port from distributer list SDK does not reselect another port for mirroring
3. Due to critical race at initial configuration, SDK RDQ test may test RDQ configured for WJH and fail the test

Add support for new HW SKU of SN4700

- How I did it
Update pointer for the SDK/FW

- How to verify it
Run regression tests
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0b1cacd67b94..faef8e6f9395 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.3186
+MLNX_SPC_FW_VERSION = 13.2010.3196
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.3186
+MLNX_SPC2_FW_VERSION = 29.2010.3196
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.3186
+MLNX_SPC3_FW_VERSION = 30.2010.3196
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index d44d801b60fa..a12968f165f6 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit d44d801b60fa49f0dcc1129baeef13ac64d48e2d
+Subproject commit a12968f165f623ff3c27d6ebaabd34cc6316497e
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index c74f086c0a07..06c067cc1984 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
-MLNX_SDK_VERSION = 4.5.3186
+MLNX_SDK_VERSION = 4.5.3196
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))

From d9839a8bf26df31d5cf846257350f6c6d5628b36 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:55:14 +0800
Subject: [PATCH 1496/1674] [ci/build]: Upgrade SONiC package versions (#13014)

---
 .../versions-deb-buster                       | 34 +++++++++---------
 .../build-sonic-slave-buster/versions-git     |  4 +--
 files/build/versions/default/versions-docker  | 12 +++----
 files/build/versions/default/versions-git     |  6 ++--
 .../versions-deb-buster                       | 18 +++++-----
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../docker-platform-monitor/versions-py3      |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-sonic-vs/versions-deb-buster       |  4 +--
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-mlnx/versions-deb-buster     | 36 +++++++++----------
 .../dockers/docker-syncd-mlnx/versions-py2    |  2 +-
 .../dockers/docker-syncd-mlnx/versions-py3    |  2 +-
 .../sonic-slave-buster/versions-deb-buster    |  4 +--
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  8 ++---
 files/build/versions/host-image/versions-py3  |  2 +-
 18 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 01426c8cba36..5c7de383dae9 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,9 +1,9 @@
-applibs==1.mlnx.4.5.3186
-applibs-dev==1.mlnx.4.5.3186
+applibs==1.mlnx.4.5.3196
+applibs-dev==1.mlnx.4.5.3196
 bfnplatform==1.0.0
 innovium-sai==0.107.7
 innovium-sai-headers==0.107.7
-iproute2-dev==1.mlnx.4.5.3186
+iproute2-dev==1.mlnx.4.5.3196
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.18.0-106
 libhiredis-dev==0.14.0-3~bpo9+1
@@ -54,20 +54,20 @@ sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
 swss==1.0.0
-sx-acl-helper==1.mlnx.4.5.3186
-sx-acl-helper-dev==1.mlnx.4.5.3186
-sx-complib==1.mlnx.4.5.3186
-sx-complib-dev==1.mlnx.4.5.3186
-sx-examples==1.mlnx.4.5.3186
-sx-examples-dev==1.mlnx.4.5.3186
-sx-gen-utils==1.mlnx.4.5.3186
-sx-gen-utils-dev==1.mlnx.4.5.3186
-sx-scew==1.mlnx.4.5.3186
-sx-scew-dev==1.mlnx.4.5.3186
-sxd-libs==1.mlnx.4.5.3186
-sxd-libs-dev==1.mlnx.4.5.3186
+sx-acl-helper==1.mlnx.4.5.3196
+sx-acl-helper-dev==1.mlnx.4.5.3196
+sx-complib==1.mlnx.4.5.3196
+sx-complib-dev==1.mlnx.4.5.3196
+sx-examples==1.mlnx.4.5.3196
+sx-examples-dev==1.mlnx.4.5.3196
+sx-gen-utils==1.mlnx.4.5.3196
+sx-gen-utils-dev==1.mlnx.4.5.3196
+sx-scew==1.mlnx.4.5.3196
+sx-scew-dev==1.mlnx.4.5.3196
+sxd-libs==1.mlnx.4.5.3196
+sxd-libs-dev==1.mlnx.4.5.3196
 syncd==1.0.0
 syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
-wjh-libs==1.mlnx.4.5.3186
-wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.3196
+wjh-libs-dev==1.mlnx.4.5.3196
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index e392962b1f2e..b77a5ff3b785 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,12 +1,12 @@
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34
+https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
-https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
+https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 934fa5c1cd93..be6fa036988c 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:d0b2ae07eb30bf2ba9575f30beddc778b2b6349a973c6f9037eba5ba862524b8
+amd64:amd64/debian:buster==sha256:1487e24b974ca8b859de513d40c7f30606949c1fa1e4057df81b2dc1915edc6a
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
+amd64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:5fb6d294a4e1af778e459a514e5b7db71424838b274278a9115b5b3f4407dd99
-arm64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
+arm64:arm64v8/debian:buster==sha256:143f807a473ee188663942a77f28a526e7546efea5621e64d264427b28098d7d
+arm64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:643317b4799f740f497daf7de3a50631d99efe79ac688948db0843cd5cab110b
-armhf:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5
+armhf:arm32v7/debian:buster==sha256:965acb1aa66ce1767beac782bdd9f93a27b7867fc0c681fef485adf7ead19cf7
+armhf:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index abf5f7555bde..9fc3e8e60fcc 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,10 +1,10 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34
+https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
@@ -12,7 +12,7 @@ https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7
 https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
-https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
+https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
 https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 83a791404500..00005a3d65fb 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,5 +1,5 @@
-applibs==1.mlnx.4.5.3186
-applibs-dev==1.mlnx.4.5.3186
+applibs==1.mlnx.4.5.3196
+applibs-dev==1.mlnx.4.5.3196
 binutils==2.31.1-16
 binutils-common==2.31.1-16
 binutils-x86-64-linux-gnu==2.31.1-16
@@ -108,7 +108,7 @@ python-dev==2.7.16-1
 python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
-python-sdk-api==1.mlnx.4.5.3186
+python-sdk-api==1.mlnx.4.5.3196
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
@@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3
 smartmontools==6.6-1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-complib==1.mlnx.4.5.3186
-sx-complib-dev==1.mlnx.4.5.3186
-sx-gen-utils==1.mlnx.4.5.3186
-sx-gen-utils-dev==1.mlnx.4.5.3186
-sxd-libs==1.mlnx.4.5.3186
-sxd-libs-dev==1.mlnx.4.5.3186
+sx-complib==1.mlnx.4.5.3196
+sx-complib-dev==1.mlnx.4.5.3196
+sx-gen-utils==1.mlnx.4.5.3196
+sx-gen-utils-dev==1.mlnx.4.5.3196
+sxd-libs==1.mlnx.4.5.3196
+sxd-libs-dev==1.mlnx.4.5.3196
 ucf==3.0038+nmu1
 udev==241-7~deb10u8
 vim==2:8.1.0875-5+deb10u4
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index aa6fd5acb17b..cbd6d764d36e 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -14,7 +14,7 @@ netaddr==0.8.0
 pathlib2==2.3.7.post1
 pyang==2.5.3
 pyangbind==0.6.0
-python-sdk-api==4.5.3186
+python-sdk-api==4.5.3196
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 7351c08c8e00..f2debc6aefc2 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,3 @@
 jsonschema==2.6.0
-python_sdk_api==4.5.3186
+python_sdk_api==4.5.3196
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 89259860f3b8..baf9f9757e41 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.10
+protobuf==4.21.11
 pyrsistent==0.19.2
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 67e25e268993..1591999dc783 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -28,8 +28,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-grub-common==2.06-3~deb10u2
-grub2-common==2.06-3~deb10u2
+grub-common==2.06-3~deb10u3
+grub2-common==2.06-3~deb10u3
 ifupdown==0.8.35
 iptables==1.8.2-4
 libasan5==8.3.0-6
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 9ac340c32134..1a5b3670e2b2 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2022.9.24
+certifi==2022.12.7
 charset-normalizer==2.1.1
 click==7.0
 idna==3.4
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 8f68ce964b97..a00de4f18435 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -1,8 +1,8 @@
-applibs==1.mlnx.4.5.3186
-applibs-dev==1.mlnx.4.5.3186
+applibs==1.mlnx.4.5.3196
+applibs-dev==1.mlnx.4.5.3196
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-iproute2-dev==1.mlnx.4.5.3186
+iproute2-dev==1.mlnx.4.5.3196
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-dev-bin==2.28-10+deb10u2
@@ -41,7 +41,7 @@ python-minimal==2.7.16-1
 python-pip==18.1-5
 python-pip-whl==18.1-5
 python-pkg-resources==40.8.0-1
-python-sdk-api==1.mlnx.4.5.3186
+python-sdk-api==1.mlnx.4.5.3196
 python-setuptools==40.8.0-1
 python2==2.7.16-1
 python2-dev==2.7.16-1
@@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 sshpass==1.06-1
 strace==4.26-0.2
-sx-acl-helper==1.mlnx.4.5.3186
-sx-acl-helper-dev==1.mlnx.4.5.3186
-sx-complib==1.mlnx.4.5.3186
-sx-complib-dev==1.mlnx.4.5.3186
-sx-examples==1.mlnx.4.5.3186
-sx-examples-dev==1.mlnx.4.5.3186
-sx-gen-utils==1.mlnx.4.5.3186
-sx-gen-utils-dev==1.mlnx.4.5.3186
-sx-scew==1.mlnx.4.5.3186
-sx-scew-dev==1.mlnx.4.5.3186
-sxd-libs==1.mlnx.4.5.3186
-sxd-libs-dev==1.mlnx.4.5.3186
+sx-acl-helper==1.mlnx.4.5.3196
+sx-acl-helper-dev==1.mlnx.4.5.3196
+sx-complib==1.mlnx.4.5.3196
+sx-complib-dev==1.mlnx.4.5.3196
+sx-examples==1.mlnx.4.5.3196
+sx-examples-dev==1.mlnx.4.5.3196
+sx-gen-utils==1.mlnx.4.5.3196
+sx-gen-utils-dev==1.mlnx.4.5.3196
+sx-scew==1.mlnx.4.5.3196
+sx-scew-dev==1.mlnx.4.5.3196
+sxd-libs==1.mlnx.4.5.3196
+sxd-libs-dev==1.mlnx.4.5.3196
 syncd==1.0.0
 syncd-dbg==1.0.0
 vim==2:8.1.0875-5+deb10u4
 vim-runtime==2:8.1.0875-5+deb10u4
-wjh-libs==1.mlnx.4.5.3186
-wjh-libs-dev==1.mlnx.4.5.3186
\ No newline at end of file
+wjh-libs==1.mlnx.4.5.3196
+wjh-libs-dev==1.mlnx.4.5.3196
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
index 8a09c5423b62..e86ef29dbed2 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2
@@ -1 +1 @@
-python-sdk-api==4.5.3186
\ No newline at end of file
+python-sdk-api==4.5.3196
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
index 87eac0d90289..ff782443e8d6 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
@@ -1 +1 @@
-python_sdk_api==4.5.3186
\ No newline at end of file
+python_sdk_api==4.5.3196
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index e6cc25815590..63d3afe24c7e 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.10-1
+containerd.io==1.6.12-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -1145,7 +1145,7 @@ libvdpau-va-gl1==0.4.2-1+b1
 libvdpau1==1.1.1-10
 libvelocity-tools-java==2.0-7
 libvidstab1.1==1.1.0-2
-libvirglrenderer0==0.7.0-2
+libvirglrenderer0==0.7.0-2+deb10u1
 libvirt-clients==5.0.0-4+deb10u1
 libvirt0==5.0.0-4+deb10u1
 libvisual-0.4-0==0.4.0-15
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index c3adbdb6e488..93cadc5707ab 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 56aa11f33e08..93cadc5707ab 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==6e33ba049f82587c184ea9b604d9fb081a5e7c24
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 40e02b3a5aff..396cb38b1758 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.11-1
+containerd.io==1.6.12-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -56,8 +56,8 @@ gpg-wks-client==2.2.12-1+deb10u2
 gpg-wks-server==2.2.12-1+deb10u2
 gpgconf==2.2.12-1+deb10u2
 gpgsm==2.2.12-1+deb10u2
-grub-common==2.06-3~deb10u2
-grub2-common==2.06-3~deb10u2
+grub-common==2.06-3~deb10u3
+grub2-common==2.06-3~deb10u3
 haveged==1.9.1-7
 hdparm==9.58+ds-1
 hping3==3.a2.ds2-7
@@ -314,7 +314,7 @@ squashfs-tools==1:4.3-12+deb10u2
 sudo==1.8.27-1+deb10u4
 swig==3.0.12-2
 swig3.0==3.0.12-2
-sx-kernel==1.mlnx.4.5.3186
+sx-kernel==1.mlnx.4.5.3196
 sysfsutils==2.1.0+repack-5
 systemd==247.3-6~bpo10+1
 systemd-sonic-generator==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3d28af302af9..cd2661caf413 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,7 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.9.24
+certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0

From 56d364994b0fd1df39ff8cab25205dd00dd1583a Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 17 Dec 2022 18:45:53 +0800
Subject: [PATCH 1497/1674] [ci/build]: Upgrade SONiC package versions (#13092)

---
 files/build/versions/default/versions-git     |  2 +-
 .../versions/dockers/docker-snmp/versions-py3 |  2 +-
 .../docker-snmp/versions-py3-all-armhf        |  1 +
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../sonic-slave-buster/versions-deb-buster    | 24 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  2 +-
 8 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-snmp/versions-py3-all-armhf

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 9fc3e8e60fcc..e327203ef0cd 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index 2b0260cea69f..45ab6f7da69a 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
-hiredis==2.0.0
+hiredis==2.1.0
 psutil==5.9.4
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf b/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf
new file mode 100644
index 000000000000..252e8c7f1140
--- /dev/null
+++ b/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf
@@ -0,0 +1 @@
+hiredis==2.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index baf9f9757e41..361d1c452b70 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4
 openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.11
+protobuf==4.21.12
 pyrsistent==0.19.2
 python-dateutil==2.6.0
 requests==2.28.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 63d3afe24c7e..59ca309b314a 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.12-1
+containerd.io==1.6.13-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -149,9 +149,9 @@ gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u4
+git==1:2.20.1-2+deb10u6
 git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u4
+git-man==1:2.20.1-2+deb10u6
 glib-networking==2.58.0-2+deb10u2
 glib-networking-common==2.58.0-2+deb10u2
 glib-networking-services==2.58.0-2+deb10u2
@@ -413,7 +413,7 @@ libdbi1==0.9.0-5
 libdbus-1-3==1.12.24-0+deb10u1
 libdbus-1-dev==1.12.24-0+deb10u1
 libdconf1==0.30.1-2
-libde265-0==1.0.3-1+b1
+libde265-0==1.0.3-1+deb10u1
 libdevel-callchecker-perl==0.008-1
 libdevel-caller-perl==2.06-2+b1
 libdevel-globaldestruction-perl==0.14-1
@@ -829,7 +829,7 @@ libopencore-amrnb0==0.1.3-2.1+b2
 libopencore-amrwb0==0.1.3-2.1+b2
 libopencsd-dev==0.10.1-1
 libopencsd0==0.10.1-1
-libopenexr23==2.2.1-4.1+deb10u1
+libopenexr23==2.2.1-4.1+deb10u2
 libopengl0==1.1.0-1
 libopenjp2-7==2.3.0-2+deb10u2
 libopenmpi-dev==3.1.3-11
@@ -1401,13 +1401,13 @@ php-token-stream==3.0.1-1
 php-tokenizer==1.1.0-1
 php-webmozart-assert==1.4.0-3
 php-xml==2:7.3+69
-php7.3-cli==7.3.31-1~deb10u1
-php7.3-common==7.3.31-1~deb10u1
-php7.3-json==7.3.31-1~deb10u1
-php7.3-mbstring==7.3.31-1~deb10u1
-php7.3-opcache==7.3.31-1~deb10u1
-php7.3-readline==7.3.31-1~deb10u1
-php7.3-xml==7.3.31-1~deb10u1
+php7.3-cli==7.3.31-1~deb10u2
+php7.3-common==7.3.31-1~deb10u2
+php7.3-json==7.3.31-1~deb10u2
+php7.3-mbstring==7.3.31-1~deb10u2
+php7.3-opcache==7.3.31-1~deb10u2
+php7.3-readline==7.3.31-1~deb10u2
+php7.3-xml==7.3.31-1~deb10u2
 phpunit==7.5.6-1
 phpunit-code-unit-reverse-lookup==1.0.1-1
 phpunit-comparator==3.0.2-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 93cadc5707ab..342dbfe4aeda 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 93cadc5707ab..342dbfe4aeda 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 396cb38b1758..df326b52a6cd 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.12-1
+containerd.io==1.6.13-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6

From ccff008e206031a579479cff7a4965c49150839e Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 22 Dec 2022 08:53:13 -0800
Subject: [PATCH 1498/1674] [202012][utilities] advance submodule head (#13118)

utilities:
* f0fc333e 2022-12-15 | [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (#2560) (HEAD -> 202012, github/202012) [Vaibhav Hemant Dixit]
* ad7a4d42 2022-11-30 | Support for platforms based on Clounix Networks' device (#2108) [songqh2022]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index b2b59487c5db..f0fc333e735d 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit b2b59487c5dbeb39bca97d89492de77752229b87
+Subproject commit f0fc333e735d9cd27d98cdddaa64cf46ccbfd83d

From f4e005ad37fa4407948747d85b1b416f6cfc6832 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 23 Dec 2022 07:52:32 +0800
Subject: [PATCH 1499/1674] [ci/build]: Upgrade SONiC package versions (#13146)

---
 .../build/build-sonic-slave-buster/versions-git      |  2 +-
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  4 ++--
 .../docker-config-engine-buster/versions-deb-buster  |  2 +-
 .../dockers/docker-orchagent/versions-deb-buster     |  2 +-
 .../docker-platform-monitor/versions-deb-buster      |  2 +-
 .../docker-saiserverv2-brcm/versions-deb-buster      |  2 +-
 .../versions/dockers/docker-snmp/versions-deb-buster |  2 +-
 .../docker-sonic-mgmt-framework/versions-deb-buster  |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3 |  4 ++--
 .../dockers/docker-sonic-vs/versions-deb-buster      |  2 +-
 .../dockers/docker-syncd-bfn/versions-deb-buster     |  2 +-
 .../dockers/docker-syncd-brcm/versions-deb-buster    |  2 +-
 .../docker-syncd-centec-rpc/versions-deb-buster      |  2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster    |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster   |  8 ++++----
 .../sonic-slave-buster/versions-deb-buster-armhf     |  2 +-
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../versions/dockers/sonic-slave-buster/versions-py3 |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3         |  2 +-
 files/build/versions/host-image/versions-deb-buster  |  4 ++--
 22 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b77a5ff3b785..b950e123072c 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
-https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
+https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index be6fa036988c..a46d3ca20151 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:1487e24b974ca8b859de513d40c7f30606949c1fa1e4057df81b2dc1915edc6a
+amd64:amd64/debian:buster==sha256:09739ccbaff5b5569817c554bad447c68707932f46b2da93cd5a0cdb218f4898
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
+amd64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:143f807a473ee188663942a77f28a526e7546efea5621e64d264427b28098d7d
-arm64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
+arm64:arm64v8/debian:buster==sha256:b366e2065a4d63182ab1acb0f5b7267066c181c0206dde64594e951a62e73f96
+arm64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:965acb1aa66ce1767beac782bdd9f93a27b7867fc0c681fef485adf7ead19cf7
-armhf:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3
+armhf:arm32v7/debian:buster==sha256:f6657e72719700232d3efe8750c1bb20fadbc0a2d22c54e631b52f60b752ee3a
+armhf:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index e327203ef0cd..dcbee4555173 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -14,7 +14,7 @@ https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
-https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70
+https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index 0b45009c4d39..fa9b1df2e0e0 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index b6709f233931..c658791e2e24 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -53,7 +53,7 @@ libswsscommon-dbg==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 00005a3d65fb..031e96ee644b 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -96,7 +96,7 @@ libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
 libxml2==2.9.4+dfsg1-7+deb10u5
 libxrender1==1:0.9.10-1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
index 7941ad15564f..c4b5c984b6f2 100644
--- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -23,6 +23,6 @@ libsaithrift-dev==0.9.4
 libthrift-0.13.0==0.13.0-6
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 saiserver==0.9.4
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index f35262af0036..c33e2ce203c3 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -47,7 +47,7 @@ libsnmp30-dbg==5.7.3+dfsg-5
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 locales==2.28-10+deb10u2
 make==4.2.1-1.2
 mariadb-common==1:10.3.36-0+deb10u2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index f8720e6083f3..5c684434fe80 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -50,7 +50,7 @@ libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u5
 libyang==1.0.73
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-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
index 361d1c452b70..c17c7c71771f 100644
--- 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.1.0
+attrs==22.2.0
 certifi==2017.4.17
 charset-normalizer==2.1.1
 click==8.1.3
@@ -8,7 +8,7 @@ flask==2.2.2
 grpcio==1.51.1
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==5.1.0
+importlib-metadata==5.2.0
 importlib-resources==5.10.1
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 1591999dc783..b3b55206b143 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -106,7 +106,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 logrotate==3.14.0-4
 make==4.2.1-1.2
 ndisc6==1.0.4-1
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index e13edcae91c6..ab582731feb7 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
 libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index e2fa0e18bfed..8c7e33a62733 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 8ca7577f4fd1..ed568fb8403a 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -54,7 +54,7 @@ libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index a00de4f18435..0ba99a2e490c 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -31,7 +31,7 @@ libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 mft==4.18.0-106
 mlnx-sai==1.mlnx.SAIRel1.22.0.0
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 59ca309b314a..cd7e95116763 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.13-1
+containerd.io==1.6.14-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -1316,12 +1316,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.260-1
+linux-compiler-gcc-8-x86==4.19.269-1
 linux-headers-4.19.0-22-amd64==4.19.260-1
 linux-headers-4.19.0-22-common==4.19.260-1
 linux-headers-amd64==4.19+105+deb10u17
-linux-kbuild-4.19==4.19.260-1
-linux-libc-dev==4.19.260-1
+linux-kbuild-4.19==4.19.269-1
+linux-libc-dev==4.19.269-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 1ea337db0008..3da861df4457 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -99,7 +99,7 @@ libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1
 libxslt1-dev==1.1.32-2.2~deb10u2
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.260-1
+linux-compiler-gcc-8-arm==4.19.269-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 342dbfe4aeda..a9f61fa3fe64 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index dcb19d3a8973..cc1f04578920 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.6.0
+bitarray==2.6.1
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 342dbfe4aeda..a9f61fa3fe64 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index 1599cc05ecaa..be56a067d583 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.6.0
+bitarray==2.6.1
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index df326b52a6cd..8c8484867c2a 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.13-1
+containerd.io==1.6.14-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -231,7 +231,7 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
-linux-libc-dev==4.19.260-1
+linux-libc-dev==4.19.269-1
 locales==2.28-10+deb10u2
 logrotate==3.14.0-4
 lsb-base==10.2019051400

From 8bb5e19c524fa4655c1611b8d618be245c0cbf7e Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Fri, 23 Dec 2022 18:52:19 +0800
Subject: [PATCH 1500/1674] [build] Add retry when make SONiC image to improve
 success rate. (#12325) (#13132)

Why I did it
Makefile needs some dependencies from the Internet. It will fail for network related issue.
Retries will fix most of these issues.

How I did it
Add retries when running commands which maybe related with networking.

How to verify it
---
 .azure-pipelines/template-variables.yml |  6 ++++++
 Makefile                                |  7 ++++---
 scripts/run_with_retry                  | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .azure-pipelines/template-variables.yml
 create mode 100755 scripts/run_with_retry

diff --git a/.azure-pipelines/template-variables.yml b/.azure-pipelines/template-variables.yml
new file mode 100644
index 000000000000..027dfee9986a
--- /dev/null
+++ b/.azure-pipelines/template-variables.yml
@@ -0,0 +1,6 @@
+variables:
+  DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
+  COMMON_LIB_BUILD_ENVS: 'bullseye'
+  SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
+  SONIC_BUILD_RETRY_COUNT: 3
+  SONIC_BUILD_RETRY_INTERVAL: 600
diff --git a/Makefile b/Makefile
index e1864ea991bc..f3217bf03149 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,17 @@ PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
 PLATFORM_CHECKOUT := platform/checkout
 PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
 PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)
 
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
-	EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) -f Makefile.work jessie
 endif
 ifeq ($(NOSTRETCH), 0)
-	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch -f Makefile.work stretch
 endif
-	BLDENV=buster make -f Makefile.work $@
+	$(MAKE_WITH_RETRY) BLDENV=buster -f Makefile.work $@
 
 jessie:
 	@echo "+++ Making $@ +++"
diff --git a/scripts/run_with_retry b/scripts/run_with_retry
new file mode 100755
index 000000000000..9e709bbf1bda
--- /dev/null
+++ b/scripts/run_with_retry
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+run_with_retry(){
+    [ "$SONIC_BUILD_RETRY_COUNT" -gt 0 ] || SONIC_BUILD_RETRY_COUNT=0
+    [[ "$*" == "" ]] && { echo "run_with_retry: input command can't be empty." 1>&2;exit 1; }
+    for ((i=0; i<=$SONIC_BUILD_RETRY_COUNT; i++))
+    do
+        if [[ $i != 0 ]];then
+            echo "==============================================================================" 1>&2
+            echo "Waiting $SONIC_BUILD_RETRY_INTERVAL to run again, $i/$SONIC_BUILD_RETRY_COUNT" 1>&2
+            echo "==============================================================================" 1>&2
+            sleep $SONIC_BUILD_RETRY_INTERVAL
+        fi
+        "$@" && break
+    done
+}
+run_with_retry "$@"

From be918d5332347ae17e6af4e618412b22f4f96c01 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 25 Dec 2022 20:46:59 +0800
Subject: [PATCH 1501/1674] [ci/build]: Upgrade SONiC package versions (#13168)

---
 files/build/versions/default/versions-git                 | 2 +-
 .../versions/dockers/docker-base-stretch/versions-py2     | 2 +-
 files/build/versions/dockers/docker-ptf/versions-py2      | 2 +-
 .../versions/dockers/docker-sonic-vs/versions-deb-buster  | 2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster        | 8 ++++----
 .../versions/dockers/sonic-slave-buster/versions-git      | 2 +-
 .../versions/dockers/sonic-slave-stretch/versions-git     | 2 +-
 files/build/versions/host-image/versions-deb-buster       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index dcbee4555173..6041d300f5cc 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
index 4b348d301a65..888ec533991a 100644
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -1,6 +1,6 @@
 j2cli==0.3.10
 jinja2==2.11.3
 markupsafe==1.1.1
-supervisor==4.2.4
+supervisor==4.2.5
 supervisord-dependent-startup==1.4.0
 toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index e023f1cccd36..20b5f435dfc0 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -54,7 +54,7 @@ simplegeneric==0.8.1
 singledispatch==3.7.0
 six==1.12.0
 stevedore==1.32.0
-supervisor==4.2.4
+supervisor==4.2.5
 thrift==0.11.0
 traitlets==4.3.3
 twisted==16.0.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index b3b55206b143..4839edd5bf81 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -64,7 +64,7 @@ libisl19==0.20-2
 libitm1==8.3.0-6
 libjson-c3==0.12.1+ds-2+deb10u1
 libjudydebian1==1.0.5-5
-libksba8==1.3.5-2+deb10u1
+libksba8==1.3.5-2+deb10u2
 liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index cd7e95116763..7f9ae6a0a6f5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -700,7 +700,7 @@ libkpathsea6==2018.20181218.49446-1
 libkrb5-3==1.17-3+deb10u5
 libkrb5-dev==1.17-3+deb10u5
 libkrb5support0==1.17-3+deb10u5
-libksba8==1.3.5-2+deb10u1
+libksba8==1.3.5-2+deb10u2
 liblab-gamut1==2.40.1-6+deb10u1
 liblcms2-2==2.9-3
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
@@ -1317,9 +1317,9 @@ libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
 linux-compiler-gcc-8-x86==4.19.269-1
-linux-headers-4.19.0-22-amd64==4.19.260-1
-linux-headers-4.19.0-22-common==4.19.260-1
-linux-headers-amd64==4.19+105+deb10u17
+linux-headers-4.19.0-23-amd64==4.19.269-1
+linux-headers-4.19.0-23-common==4.19.269-1
+linux-headers-amd64==4.19+105+deb10u18
 linux-kbuild-4.19==4.19.269-1
 linux-libc-dev==4.19.269-1
 linuxdoc-tools==0.9.73-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index a9f61fa3fe64..1730b090d0f6 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index a9f61fa3fe64..1730b090d0f6 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 8c8484867c2a..79b69c379959 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -150,7 +150,7 @@ libklibc==2.0.6-1+deb10u1
 libkmod2==26-1
 libkrb5-3==1.17-3+deb10u5
 libkrb5support0==1.17-3+deb10u5
-libksba8==1.3.5-2+deb10u1
+libksba8==1.3.5-2+deb10u2
 libldap-2.4-2==2.4.47+dfsg-3+deb10u7
 libldap-common==2.4.47+dfsg-3+deb10u7
 liblognorm5==2.0.5-1

From 830102a3531b40afcdbc670e83a150402e9ed154 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Tue, 27 Dec 2022 08:10:42 +0800
Subject: [PATCH 1502/1674] [202012][Submodule][SAI-Redis]Advance SAI Redis
 head pointer (#13157)

Why I did it
[202012][Submodule][SAI-Redis]Advance SAI Redis head pointer

How I did it
include changes:

sonic-net/sonic-sairedis@dcea4cd
sonic-net/sonic-sairedis@5e9bcb1
sonic-net/sonic-sairedis@8f2a53f
sonic-net/sonic-sairedis@c1d7938 [202012][Submodule][SAI]Advance SAI head pointer sonic-sairedis#1184
remove parameter skip-error, which removed from [202205][Submodule][SAI]Advance SAI head pointer sonic-sairedis#1185
How to verify it
local build
---
 platform/broadcom/libsaithrift-dev.mk | 2 +-
 src/sonic-sairedis                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
index a5c009d2f346..f98c0fb82e8a 100644
--- a/platform/broadcom/libsaithrift-dev.mk
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -8,7 +8,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 ifeq ($(SAITHRIFT_V2),y)
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0)
-$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger --skip_error=-2"
+$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger"
 else
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 4a887a1b04b0..c1d793867d53 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 4a887a1b04b0509a870df9c2e4ed2baf474a4991
+Subproject commit c1d793867d534e9263c3703c02a96a3feef0835b

From 352dd7ea7f927f2a9267e78749d10e497c73d2cd Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 28 Dec 2022 19:56:49 +0800
Subject: [PATCH 1503/1674] [ci/build]: Upgrade SONiC package versions (#13188)

---
 .../versions/build/build-sonic-slave-buster/versions-git      | 2 +-
 files/build/versions/default/versions-git                     | 4 ++--
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b950e123072c..7afe4d51cabb 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
 https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
+https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 6041d300f5cc..930616a34f83 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3
+https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 1730b090d0f6..8d343bdc8fbb 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 1730b090d0f6..8d343bdc8fbb 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 26709ffb86ba7ffcea5baedbb33cb50917e082a3 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Sun, 1 Jan 2023 11:58:59 -0800
Subject: [PATCH 1504/1674] [cisco]: Update cisco-8000.ini (#13182)

Why I did it
1.50.x SDK based drop to fix MIGSMSFT-120 ([8102] Orchagent crash as addRoutePost failed at SAI")

How I did it
Update cisco-8000 submodule to v0.121
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 493c53e7d54b..799d241e8d65 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2.3
+ref=202012-v0.121

From 3fc76fdb22c44def64c668685a74831800506fcc Mon Sep 17 00:00:00 2001
From: Vivek <vkarri@nvidia.com>
Date: Mon, 2 Jan 2023 03:20:30 -0800
Subject: [PATCH 1505/1674] [202012] [dhcpv6_relay] Fix dependency of dhcp-mon
 on VLAN with only v6 cfg is provided (#13006) (#13040)

Backport PR #13006

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
index 0928bac22d4d..d81573fd86f2 100644
--- a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
+++ b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
@@ -32,7 +32,7 @@ dhcpmon-{{ vlan_name }}
 {% endif %}
 {# Check DHCPv6 agents #}
 {% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
-{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
+{% for dhcpv6_server in DHCP_RELAY[vlan_name]['dhcpv6_servers'] %}
 {% if dhcpv6_server | ipv6 %}
 {% set _dummy = relay_for_ipv6.update({'flag': True}) %}
 {% endif %}

From 33bf592f0916594f26ea3700eaabfbc54c5638c4 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Tue, 3 Jan 2023 13:22:32 +0800
Subject: [PATCH 1506/1674] [Cherry-pick][SAIServer]Upgrade SAI server init
 script (#13175) (#13226)

Why I did it
why
In order to apply different config across different platform, and use the code with a unified format, reuse syncd init script to init saiserver.

How I did it
how
Reuse syncd init script

How to verify it
Test
Test in DUT s6000 and dx010 with sonic 202205
---
 platform/broadcom/docker-saiserver-brcm.mk    |  8 ++++-
 .../docker-saiserver-brcm/Dockerfile.j2       |  3 ++
 .../docker-saiserver-brcm/saiserver_start.sh  | 32 +++++++++++++++++++
 .../broadcom/docker-saiserver-brcm/start.sh   | 11 -------
 .../docker-saiserver-brcm/supervisord.conf    |  2 +-
 5 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100755 platform/broadcom/docker-saiserver-brcm/saiserver_start.sh

diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk
index f4f9cdd42a49..92e533bf69b5 100644
--- a/platform/broadcom/docker-saiserver-brcm.mk
+++ b/platform/broadcom/docker-saiserver-brcm.mk
@@ -3,7 +3,13 @@
 DOCKER_SAISERVER_BRCM = docker-saiserver$(SAITHRIFT_VER)-brcm.gz
 $(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm
 $(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER)
-$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
+
+# Use syncd_init_common.sh to init hardware platform
+SYNCD_INIT_COMMON_SCRIPT = syncd_init_common.sh
+$(SYNCD_INIT_COMMON_SCRIPT)_PATH = $(SRC_PATH)/sonic-sairedis/syncd/scripts
+SONIC_COPY_FILES += $(SYNCD_INIT_COMMON_SCRIPT)
+
+$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD) $(SYNCD_INIT_COMMON_SCRIPT)
 $(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)
 SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_BRCM)
diff --git a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
index 2fe765febcf3..3f1b9717fea6 100644
--- a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
@@ -26,7 +26,10 @@ debs/
 RUN apt-get install -yf kmod
 
 COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"]
+COPY ["saiserver_start.sh", "/usr/bin/"]
+COPY ["files/syncd_init_common.sh", "/usr/bin/"]
 RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd
+RUN chmod +x /usr/bin/saiserver_start.sh /usr/bin/syncd_init_common.sh
 
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
diff --git a/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh b/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh
new file mode 100755
index 000000000000..06fcf6c3f3ae
--- /dev/null
+++ b/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# Copy from src/sonic-sairedis/syncd/scripts/syncd_start.sh
+# Re-use the structure for syncd setup
+# Use it to start saiserver
+# Script to start syncd using supervisord
+#
+
+# Source the file that holds common code for systemd and supervisord
+. /usr/bin/syncd_init_common.sh
+
+get_saiserver_param()
+{
+    IFS=' ' read -r -a array <<< "$CMD_ARGS"
+    for index in "${!array[@]}"
+    do
+        #echo "$index ${array[index]}"
+        if [[ "${array[index]}" == *"-p"* ]]; then
+            SAI_PROFILE="${array[index+1]}"
+        fi
+        if [[ "${array[index]}" == *"-m"* ]]; then
+            PORT_CONFIG="${array[index+1]}"
+        fi
+    done
+}
+
+ENABLE_SAITHRIFT=1
+config_syncd
+get_saiserver_param
+
+echo exec /usr/sbin/saiserver -p ${SAI_PROFILE} -f ${PORT_CONFIG}
+exec /usr/sbin/saiserver -p ${SAI_PROFILE} -f ${PORT_CONFIG}
+#exec ${CMD} ${CMD_ARGS}
diff --git a/platform/broadcom/docker-saiserver-brcm/start.sh b/platform/broadcom/docker-saiserver-brcm/start.sh
index 81813b57ff9d..6a395866c15d 100755
--- a/platform/broadcom/docker-saiserver-brcm/start.sh
+++ b/platform/broadcom/docker-saiserver-brcm/start.sh
@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
 HWSKU_DIR=/usr/share/sonic/hwsku
 
-start_bcm()
-{
-    [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0
-    [ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0
-    [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0
-}
-
 generate_profile()
 {
     # There are two ways to specify the contents of the SAI_INIT_CONFIG_FILE and they are mutually exclusive
@@ -35,10 +28,6 @@ generate_profile()
 }
 
 rm -f /var/run/rsyslogd.pid
-
 supervisorctl start rsyslogd
-
 generate_profile
-start_bcm
-
 supervisorctl start saiserver
diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
index 3574cd782b78..d20dac89141b 100644
--- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf
+++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
@@ -20,7 +20,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
-command=/usr/sbin/saiserver -p /etc/sai.d/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
+command=/usr/bin/saiserver_start.sh
 priority=3
 autostart=false
 autorestart=false

From 933bf0605826ec8ae5edab6f07920de5b1e66ebe Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 4 Jan 2023 16:29:25 +0800
Subject: [PATCH 1507/1674] [build] Add environment when using dpkg hook to
 avoid lock loop. (#13233)

Why I did it
In some cases, dpkg will call dpkg to validate version.
dpkg hook will get stuck in a loop to lock.

How I did it
How to verify it
---
 src/sonic-build-hooks/hooks/dpkg | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/sonic-build-hooks/hooks/dpkg

diff --git a/src/sonic-build-hooks/hooks/dpkg b/src/sonic-build-hooks/hooks/dpkg
old mode 100644
new mode 100755
index 7fbc90f9fe5c..294cb19f4c1f
--- a/src/sonic-build-hooks/hooks/dpkg
+++ b/src/sonic-build-hooks/hooks/dpkg
@@ -3,8 +3,16 @@
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
 REAL_COMMAND=$(get_command dpkg)
 COMMAND_INFO="Locked by command: $REAL_COMMAND $@"
-lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" )
+NEED_RELEASE_LOCK=n
+if [[ "$DPKG_HOOK_LOCKED" != "y" ]];then
+    lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" )
+    export DPKG_HOOK_LOCKED=y
+    NEED_RELEASE_LOCK=y
+fi
 $REAL_COMMAND "$@"
 command_result=$?
+if [[ "$NEED_RELEASE_LOCK" == "y" ]];then
+    unset DPKG_HOOK_LOCKED
+fi
 [ "$lock_result" == y ] && release_apt_installation_lock
 exit $command_result

From 9175ebad0ad00970adeb0430c6792df39ef9be6f Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 4 Jan 2023 16:29:42 +0800
Subject: [PATCH 1508/1674] Fix sonic slave pipeline to set correct tag on
 sonic slave image. (#13177) (#13244)

Why I did it
Currently sonic-slave-* tag is confusing. Set correct tag on sonic-slave-* image.
Fix job name to fit the build.

How I did it
build amd image in amd64:
sonic-slave-bullseye:cfe29bff67c
sonic-slave-bullseye:latest
sonic-slave-bullseye:master

build armhf image in amd64:
sonic-slave-bullseye-march-armhf:33614806dc3
sonic-slave-bullseye-march-armhf:latest
sonic-slave-bullseye-march-armhf:master

build arm64 image in amd64:
sonic-slave-bullseye-march-arm64:f3b1b16c801
sonic-slave-bullseye-march-arm64:latest
sonic-slave-bullseye-march-arm64:master

build arm64 image in arm64:
sonic-slave-bullseye:75cb326c9a7
sonic-slave-bullseye-arm64:latest
sonic-slave-bullseye:master

build armhf image in armhf:
sonic-slave-bullseye:64d178951fc
sonic-slave-bullseye-armhf:latest
sonic-slave-bullseye:master

How to verify it
---
 .azure-pipelines/docker-sonic-slave.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index abb785c9e422..16471368be3e 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -30,7 +30,6 @@ trigger:
   paths:
     include:
     - sonic-slave-*
-    - src/sonic-build-hooks
     - files/build/versions
     - Makefile
     - Makefile.work
@@ -56,7 +55,7 @@ parameters:
   default: sonicdev
 
 stages:
-- stage: Build
+- stage: Build_in_amd64
   jobs:
   - ${{ each dist in parameters.dists }}:
     - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
@@ -66,7 +65,9 @@ stages:
             pool: sonicbld
             arch: ${{ arch }}
             dist: ${{ dist }}
-- stage: Build_march
+            ${{ if ne(arch, 'amd64') }}:
+              march: _march_${{ arch }}
+- stage: Build_native_arm
   dependsOn: []
   jobs:
   - ${{ each dist in parameters.dists }}:
@@ -78,4 +79,4 @@ stages:
               pool: sonicbld-${{ arch }}
               arch: ${{ arch }}
               dist: ${{ dist }}
-              march: march_
+              march: _${{ arch }}

From e848e3616fecb2b6be33e720ff730b9583de62b5 Mon Sep 17 00:00:00 2001
From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
Date: Wed, 4 Jan 2023 01:11:55 -0800
Subject: [PATCH 1509/1674] Improve the display of pipeline. (#13124)

The display of azure pipeline is not specific now, such as when the step Run test fails, the display of itself shows successful, but the display of step Kvmdump shows fails, but actually, the step Kvmdump doesn't fail. I improve the display of azure pipeline in this pr, each step has its own success or failure, and is shown in azure pipeline.

Why I did it
The display of azure pipeline is not specific now, such as when the step Run test fails, the display of itself shows successful, but the display of step Kvmdump shows fails, but actually, the step Kvmdump doesn't fail. I improve the display of azure pipeline in this pr, each step has its own success or failure, and is shown in azure pipeline.

How I did it
Each step has its own signature of success or failure.
Using the chain of responsibility pattern to manage all status.
Modify the expected-state in each step.
---
 .azure-pipelines/run-test-scheduler-template.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index 4821fb05353c..da7deff9d055 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -67,7 +67,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Lock testbed
@@ -80,7 +80,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Prepare testbed
@@ -91,7 +91,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states KVMDUMP FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Run test
@@ -102,7 +102,7 @@ steps:
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
       echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states FINISHED CANCELLED FAILED
+      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
     condition: succeededOrFailed()
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)

From 0e63a94fb6adee810f0fdee0fa4262a19cb8c055 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 4 Jan 2023 19:49:04 +0800
Subject: [PATCH 1510/1674] [ci/build]: Upgrade SONiC package versions (#13249)

---
 .../versions/build/build-sonic-slave-buster/versions-git    | 2 +-
 files/build/versions/default/versions-git                   | 4 ++--
 files/build/versions/default/versions-web                   | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 6 +++---
 .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-py3  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-py3 | 2 +-
 files/build/versions/host-image/versions-py3                | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 7afe4d51cabb..6c494e18cb16 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d712
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 930616a34f83..00979cdd370e 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d712
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 7536564ba0b7..aaeb27134e83 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==d701f2bf6451c4b10cf3670af05ab217
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==8b4c0534353a1bf3154e84f6b1654460
+https://deb.nodesource.com/setup_14.x==7e3b27b12367cbc79d788cd43bbc917c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index c17c7c71771f..1c67bc1b56fe 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,8 +8,8 @@ flask==2.2.2
 grpcio==1.51.1
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==5.2.0
-importlib-resources==5.10.1
+importlib-metadata==6.0.0
+importlib-resources==5.10.2
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.17.3
@@ -20,7 +20,7 @@ openapi-spec-validator==0.5.1
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
 protobuf==4.21.12
-pyrsistent==0.19.2
+pyrsistent==0.19.3
 python-dateutil==2.6.0
 requests==2.28.1
 six==1.11.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
index 7f9ae6a0a6f5..23a89902c264 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -106,7 +106,7 @@ exim4-base==4.92-8+deb10u7
 exim4-config==4.92-8+deb10u7
 exim4-daemon-light==4.92-8+deb10u7
 expat==2.2.6-2+deb10u6
-exuberant-ctags==1:5.9~svn20110310-12
+exuberant-ctags==1:5.9~svn20110310-12+deb10u1
 fakeroot==1.23-1
 file==1:5.35-4+deb10u2
 flex==2.6.4-6.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 8d343bdc8fbb..05ba4803de19 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index cc1f04578920..ea740744c91b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,7 +3,7 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.6.1
+bitarray==2.6.2
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 8d343bdc8fbb..05ba4803de19 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index be56a067d583..df93f3a45c47 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.6.1
+bitarray==2.6.2
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index cd2661caf413..5f78dbdfc18e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==7.0
-cryptography==38.0.4
+cryptography==39.0.0
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From 642c7242f8f926c73eff1c7a40f5ce6998af5f4b Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Tue, 29 Nov 2022 10:19:06 -0800
Subject: [PATCH 1511/1674] Update ECN settings for storage backend (#12855)

Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
ECN parameters need to be updated for storage backend

How I did it
Included the check for storage backend devices to update qos configs

How to verify it
Verified that the new ecn settings are applied on storage backend device.
Verified that the old ecn settings are applied for storage frontend, non storage frontend/backend devices
---
 .../profiles/td2/gen/BALANCED/qos.json.j2     | 22 +++++++++++++++++++
 .../profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 | 22 +++++++++++++++++++
 .../tests/sample-arista-7050-t0-minigraph.xml |  5 +++++
 .../qos-arista7050-t0-storage-backend.json    |  2 +-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/device/common/profiles/td2/gen/BALANCED/qos.json.j2 b/device/common/profiles/td2/gen/BALANCED/qos.json.j2
index 3e548325ea30..853a6f812b1d 100644
--- a/device/common/profiles/td2/gen/BALANCED/qos.json.j2
+++ b/device/common/profiles/td2/gen/BALANCED/qos.json.j2
@@ -1 +1,23 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and 'BackEnd' in DEVICE_METADATA['localhost']['type'] and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true') %}
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "12000144",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+
 {%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
index 3e548325ea30..853a6f812b1d 100644
--- a/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2
@@ -1 +1,23 @@
+{% if ('type' in DEVICE_METADATA['localhost'] and 'BackEnd' in DEVICE_METADATA['localhost']['type'] and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true') %}
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "12000144",
+            "green_min_threshold"    : "1048576",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+{% endif %}
+
 {%- include 'qos_config.j2' %}
diff --git a/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
index 4d216b30f203..e6108561b571 100644
--- a/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml
@@ -864,6 +864,11 @@
             <a:Reference i:nil="true"/>
             <a:Value>10.0.0.16</a:Value>
           </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ResourceType</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Storage</a:Value>
+          </a:DeviceProperty>
         </a:Properties>
       </a:DeviceMetadata>
     </Devices>
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json
index 94aa8d8a7d1d..8070e38a0c99 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050-t0-storage-backend.json
@@ -65,7 +65,7 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
+            "green_max_threshold"    : "12000144",
             "green_min_threshold"    : "1048576",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",

From b111cecf02469a5cb058d2a9df841f3dd7963896 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 12 Jan 2023 13:17:27 +0800
Subject: [PATCH 1512/1674] [build] Fix sonic-host-services dependency deepdiff
 version issue (#13329)

Why I did it
sonic_host_services depends on deepdiff.
But latest deepdiff version has error.

How I did it
pin deepdiff to previous version.

How to verify it
---
 sonic-slave-buster/Dockerfile.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index f835f59d1e0e..7c6af91b9d0e 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -456,6 +456,9 @@ RUN pip3 install pyang==2.4.0
 RUN pip2 install mmh3==2.5.1
 RUN pip3 install mmh3==2.5.1
 
+# For latest version error, use previous version
+RUN pip3 install deepdiff==6.2.2
+
 RUN apt-get install -y xsltproc
 
 # Install dependencies for isc-dhcp-relay build

From 2081e6f45d74a9a82dbc4d62d5905fca6d8378fd Mon Sep 17 00:00:00 2001
From: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com>
Date: Fri, 2 Dec 2022 06:46:10 +0530
Subject: [PATCH 1513/1674] [DellEMC] Master: S6100: SSD upgrade status: Moving
 from smartctl to iSMART (#12784)

Why I did it
smartctl tool is available only in PMON docker. Hence, the tool may be not accessible incase PMON docker goes down.
Using iSMART_64 tool to fetch the SSD firmware version and device model information.

How I did it
Replacing smartctl with iSMART_64.
---
 .../s6100/scripts/s6100_ssd_upgrade_status.sh  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
index 2c074fd3319c..b06de8184ca0 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_ssd_upgrade_status.sh
@@ -15,11 +15,14 @@ fi
 
 SSD_UPGRADE_LOG="$SSD_FW_UPGRADE/upgrade.log"
 
+iSMART="/usr/local/bin/iSMART_64"
+iSMART_OPTIONS="-d /dev/sda"
+iSMART_CMD=`$iSMART $iSMART_OPTIONS`
 SMART_CMD=`smartctl -a /dev/sda`
 
-SSD_FW_VERSION=$(echo "$SMART_CMD" | grep "Firmware Version" | awk '{print $NF}')
+SSD_FW_VERSION=$(echo "$iSMART_CMD" | grep "FW Version" | awk '{print $NF}')
 SSD_FW_VERSION=${SSD_FW_VERSION,,}
-SSD_MODEL=$(echo "$SMART_CMD" | grep "Device Model" | awk '{print $NF}')
+SSD_MODEL=$(echo "$iSMART_CMD" | grep "Model" | awk '{print $NF}')
 
 if [ -e $SSD_FW_UPGRADE/GPIO7_pending_upgrade ]; then
     if [ $SSD_MODEL == "3IE" ] && [ $SSD_FW_VERSION == "s141002c" ]; then
@@ -34,10 +37,6 @@ fi
 
 echo "$0 `date` SSD FW upgrade logs post reboot." >> $SSD_UPGRADE_LOG
 
-iSMART="/usr/local/bin/iSMART_64"
-iSMART_OPTIONS="-d /dev/sda"
-iSMART_CMD=`$iSMART $iSMART_OPTIONS`
-
 SSD_UPGRADE_STATUS1=`io_rd_wr.py --set --val 06 --offset 210; io_rd_wr.py --set --val 09 --offset 211; io_rd_wr.py --get --offset 212`
 SSD_UPGRADE_STATUS1=$(echo "$SSD_UPGRADE_STATUS1" | awk '{print $NF}')
 
@@ -69,11 +68,10 @@ elif [ $SSD_FW_VERSION == "s210506g" ] || [ $SSD_FW_VERSION == "s16425cg" ]; the
         echo "$0 `date` soft-/fast-/warm-reboot is allowed." >> $SSD_UPGRADE_LOG
 
     else
+        rm -rf $SSD_FW_UPGRADE/GPIO7_*
+        touch $SSD_FW_UPGRADE/GPIO7_high
+        systemctl start --no-block s6100-ssd-monitor.timer
         if [ $SSD_UPGRADE_STATUS1 == "0" ]; then
-            rm -rf $SSD_FW_UPGRADE/GPIO7_*
-            touch $SSD_FW_UPGRADE/GPIO7_high
-            systemctl start --no-block s6100-ssd-monitor.timer
-
             if [ $SSD_MODEL  == "3IE" ];then
                 echo "$0 `date` SSD FW upgraded from S141002C to S210506G in first mp_64." >> $SSD_UPGRADE_LOG
             else

From 27d798a2b7db6607152da2678fad6baf53e40e66 Mon Sep 17 00:00:00 2001
From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:52:59 -0500
Subject: [PATCH 1514/1674] [armhf][sonic-installer] Fix issue of the
 sonic-installer install a image after sonic-installer clean (#12609)

Signed-off-by: mlok <marty.lok@nokia.com>

Signed-off-by: mlok <marty.lok@nokia.com>
---
 platform/marvell-armhf/platform.conf | 41 ++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index d39ad66dee91..23a191adf7b2 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -118,11 +118,42 @@ prepare_boot_menu() {
         fdt_name_old=""
         sonic_version_2="None"
     else
-        image_dir_old=$(fw_printenv -n image_dir || true)
-        image_name_old=$(fw_printenv -n image_name || true)
-        initrd_name_old=$(fw_printenv -n initrd_name || true)
-        fdt_name_old=$(fw_printenv -n fdt_name || true)
-        sonic_version_2=$(fw_printenv -n sonic_version_1 || true)
+        eval running_version="$(cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p')"
+        current_boot_next=$(fw_printenv -n boot_next || true)
+        running_sonic_image=1
+        if [ "$current_boot_next" = "run sonic_image_1" ]; then
+            # boot_next=run sonic_image_1
+            sonic_version_2=$(fw_printenv -n sonic_version_2 || true)
+            if test "${sonic_version_2#*$running_version}" != "$sonic_version_2"
+            then
+                running_sonic_image=2
+            else
+                running_sonic_image=1
+            fi
+        else
+            # boot_next=run sonic_image_2  
+            sonic_version_1=$(fw_printenv -n sonic_version_1 || true)
+            if test "${sonic_version_1#*$running_version}" != "$sonic_version_1"
+            then
+                running_sonic_image=1
+            else
+                running_sonic_image=2
+            fi
+        fi   
+        
+        if [ $running_sonic_image -eq 1 ]; then
+            image_dir_old=$(fw_printenv -n image_dir || true)
+            image_name_old=$(fw_printenv -n image_name || true)
+            initrd_name_old=$(fw_printenv -n initrd_name || true)
+            fdt_name_old=$(fw_printenv -n fdt_name || true)
+            sonic_version_2=$(fw_printenv -n sonic_version_1 || true)
+        else
+            image_dir_old=$(fw_printenv -n image_dir_old || true)
+            image_name_old=$(fw_printenv -n image_name_old || true)
+            initrd_name_old=$(fw_printenv -n initrd_name_old || true)
+            fdt_name_old=$(fw_printenv -n fdt_name_old || true)
+            sonic_version_2=$(fw_printenv -n sonic_version_2 || true)
+        fi
     fi
 
     # Set boot variables

From 2fac7e31e1e7eab2be72307ed89e1cdc6b87c977 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 20 Dec 2022 16:41:04 +0800
Subject: [PATCH 1515/1674] [action] Keep 'request for xxx branch' label when
 finished auto-cherry-pick. (#13107)

Why I did it
To keep 'Request for xxx branch' label when finished auto-cherry-pick.

How I did it
Change logic in post cherry pick action.

How to verify it
---
 .github/workflows/pr_cherrypick_poststep.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr_cherrypick_poststep.yml b/.github/workflows/pr_cherrypick_poststep.yml
index 1e9e497075d7..7be0b7d7cbe5 100644
--- a/.github/workflows/pr_cherrypick_poststep.yml
+++ b/.github/workflows/pr_cherrypick_poststep.yml
@@ -46,4 +46,4 @@ jobs:
           exit 1
         fi
         gh pr edit $origin_pr_url --add-label "Included in ${base_ref} Branch"
-        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch,Request for ${base_ref} Branch,Approved for ${base_ref} Branch"
+        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch,Approved for ${base_ref} Branch"

From 2438025cf95d012c8677719a2def21f54ff88d4f Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Thu, 5 Jan 2023 02:17:50 +0800
Subject: [PATCH 1516/1674] Seastone add platform capability enhancement config
 (#13079)

---
 .../x86_64-cel_seastone-r0/platform.json      | 178 ++++++++++++++----
 1 file changed, 143 insertions(+), 35 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform.json b/device/celestica/x86_64-cel_seastone-r0/platform.json
index 4b60c664ab4b..34671b005016 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform.json
@@ -1,6 +1,10 @@
 {
     "chassis": {
         "name": "Celestica-DX010-C32",
+        "status_led": {
+            "controllable": true,
+            "colors": ["green", "off"]
+        },
         "components": [
             {
                 "name": "CPLD1"
@@ -20,39 +24,103 @@
         ],
         "fans": [
             {
-                "name": "FAN-1F"
-            },
-            {
-                "name": "FAN-1R"
-            },
-            {
-                "name": "FAN-2F"
-            },
-            {
-                "name": "FAN-2R"
-            },
-            {
-                "name": "FAN-3F"
-            },
-            {
-                "name": "FAN-3R"
-            },
-            {
-                "name": "FAN-4F"
-            },
-            {
-                "name": "FAN-4R"
-            },
-            {
-                "name": "FAN-5F"
-            },
-            {
-                "name": "FAN-5R"
+                "name": "FAN-1F",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-1R",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-2F",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-2R",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-3F",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-3R",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-4F",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-4R",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-5F",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "FAN-5R",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
             }
         ],
         "fan_drawers": [
             {
                 "name": "Drawer1",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green", "amber", "off"]
+                },
                 "fans": [
                     {
                         "name": "FAN-1F"
@@ -64,6 +132,10 @@
             },
             {
                 "name": "Drawer2",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green", "amber", "off"]
+                },
                 "fans": [
                     {
                         "name": "FAN-2F"
@@ -75,6 +147,10 @@
             },
             {
                 "name": "Drawer3",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green", "amber", "off"]
+                },
                 "fans": [
                     {
                         "name": "FAN-3F"
@@ -86,6 +162,10 @@
             },
             {
                 "name": "Drawer4",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green", "amber", "off"]
+                },
                 "fans": [
                     {
                         "name": "FAN-4F"
@@ -97,6 +177,10 @@
             },
             {
                 "name": "Drawer5",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["red", "green", "amber", "off"]
+                },
                 "fans": [
                     {
                         "name": "FAN-5F"
@@ -110,36 +194,60 @@
         "psus": [
             {
                 "name": "PSU-1",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "off"]
+                },
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             },
             {
                 "name": "PSU-2",
+                "status_led": {
+                    "controllable": true,
+                    "colors": ["green", "off"]
+                },
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             }
         ],
         "thermals": [
             {
-                "name": "Front-panel temp sensor 1"
+                "name": "Front-panel temp sensor 1",
+                "controllable": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Front-panel temp sensor 2"
+                "name": "Front-panel temp sensor 2",
+                "controllable": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "ASIC temp sensor"
+                "name": "ASIC temp sensor",
+                "controllable": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Rear-panel temp sensor 1"
+                "name": "Rear-panel temp sensor 1",
+                "controllable": false,
+                "low-crit-threshold": false
             },
             {
-                "name": "Rear-panel temp sensor 2"
+                "name": "Rear-panel temp sensor 2",
+                "controllable": false,
+                "low-crit-threshold": false
             }
         ],
         "sfps": [

From e2f9f1e45243d51b026c0c5e4d36ecc12861e1e2 Mon Sep 17 00:00:00 2001
From: byu343 <byu@arista.com>
Date: Wed, 4 Jan 2023 13:21:43 -0800
Subject: [PATCH 1517/1674] [Arista]: Add hwSku Arista-7260CX3-D108C10 (#13242)

* [Arista]: Add hwSku Arista-7260CX3-D108C10

* Add buffer-related config for Arista-7260CX3-D108C10
---
 .../Arista-7260CX3-D108C10/BALANCED           |   1 +
 .../Arista-7260CX3-D108C10/RDMA-CENTRIC       |   1 +
 .../Arista-7260CX3-D108C10/TCP-CENTRIC        |   1 +
 .../Arista-7260CX3-D108C10/buffer_ports_t0.j2 |  17 +
 .../Arista-7260CX3-D108C10/buffers.json.j2    |   3 +
 .../buffers_defaults_t0.j2                    |   1 +
 .../buffers_extra_queues.j2                   |   1 +
 .../buffers_pool_sizes_t0.j2                  |   1 +
 .../Arista-7260CX3-D108C10/config.bcm.j2      | 951 ++++++++++++++++++
 .../pg_profile_lookup.ini                     |   1 +
 .../Arista-7260CX3-D108C10/port_config.ini    | 121 +++
 .../Arista-7260CX3-D108C10/qos.json.j2        |   1 +
 .../Arista-7260CX3-D108C10/sai.profile        |   2 +
 13 files changed, 1102 insertions(+)
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/BALANCED
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/RDMA-CENTRIC
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/TCP-CENTRIC
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffer_ports_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers.json.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_defaults_t0.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_extra_queues.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_pool_sizes_t0.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/pg_profile_lookup.ini
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/port_config.ini
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/qos.json.j2
 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/sai.profile

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/BALANCED b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/BALANCED
new file mode 120000
index 000000000000..a270c70ffc36
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/RDMA-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/RDMA-CENTRIC
new file mode 120000
index 000000000000..8d1ec6d277a8
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/RDMA-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/TCP-CENTRIC b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/TCP-CENTRIC
new file mode 120000
index 000000000000..7ee783aac6a4
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/TCP-CENTRIC
@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffer_ports_t0.j2
new file mode 100644
index 000000000000..a6506c3c30dd
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffer_ports_t0.j2
@@ -0,0 +1,17 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(2,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(0,2) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers.json.j2
new file mode 100644
index 000000000000..e6e9e844469b
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers.json.j2
@@ -0,0 +1,3 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
+
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..9524e6a476ac
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_extra_queues.j2
new file mode 120000
index 000000000000..92b7e9ffbee5
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_extra_queues.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_extra_queues.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_pool_sizes_t0.j2
new file mode 120000
index 000000000000..72e16a608268
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/buffers_pool_sizes_t0.j2
@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2
new file mode 100644
index 000000000000..2255d7149b6b
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2
@@ -0,0 +1,951 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2' -%}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-     endif %}
+{%- endif %}
+{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
+l3_alpm_hit_skip=1
+sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
+PHY_AN_ALLOW_PLL_CHANGE=1
+arl_clean_timeout_usec=15000000
+asf_mem_profile=2
+bcm_num_cos=10
+bcm_stat_flags=1
+bcm_stat_jumbo=9236
+cdma_timeout_usec=15000000
+core_clock_frequency=1700
+dma_desc_timeout_usec=15000000
+dpp_clock_ratio=2:3
+higig2_hdr_mode=1
+ipv6_lpm_128b_enable=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+l2xmsg_mode=1
+max_vp_lags=0
+mem_scan_enable=1
+miim_intr_enable=0
+module_64ports=1
+os=unix
+oversubscribe_mode=1
+pbmp_xport_xe=0xfffffffd3fffffff4fffffffc7ffffffe
+#pbmp_xport_xe=0x47fffffff1fffffffcfffffffe7ffffffe
+phy_an_allow_pll_change_hg=0
+phy_an_c73=1
+phy_chain_rx_lane_map_physical{1.0}=0x3210
+phy_chain_rx_lane_map_physical{101.0}=0x0123
+phy_chain_rx_lane_map_physical{105.0}=0x0123
+phy_chain_rx_lane_map_physical{109.0}=0x0123
+phy_chain_rx_lane_map_physical{113.0}=0x2301
+phy_chain_rx_lane_map_physical{117.0}=0x3210
+phy_chain_rx_lane_map_physical{121.0}=0x3210
+phy_chain_rx_lane_map_physical{125.0}=0x1203
+phy_chain_rx_lane_map_physical{129.0}=0x3210
+phy_chain_rx_lane_map_physical{13.0}=0x0321
+phy_chain_rx_lane_map_physical{133.0}=0x1032
+phy_chain_rx_lane_map_physical{137.0}=0x3210
+phy_chain_rx_lane_map_physical{141.0}=0x0123
+phy_chain_rx_lane_map_physical{145.0}=0x3210
+phy_chain_rx_lane_map_physical{149.0}=0x2310
+phy_chain_rx_lane_map_physical{153.0}=0x0132
+phy_chain_rx_lane_map_physical{157.0}=0x1302
+phy_chain_rx_lane_map_physical{161.0}=0x3021
+phy_chain_rx_lane_map_physical{165.0}=0x2031
+phy_chain_rx_lane_map_physical{169.0}=0x2031
+phy_chain_rx_lane_map_physical{17.0}=0x3210
+phy_chain_rx_lane_map_physical{173.0}=0x1302
+phy_chain_rx_lane_map_physical{177.0}=0x2031
+phy_chain_rx_lane_map_physical{181.0}=0x0213
+phy_chain_rx_lane_map_physical{185.0}=0x0213
+phy_chain_rx_lane_map_physical{189.0}=0x1302
+phy_chain_rx_lane_map_physical{193.0}=0x3120
+phy_chain_rx_lane_map_physical{197.0}=0x0231
+phy_chain_rx_lane_map_physical{201.0}=0x2031
+phy_chain_rx_lane_map_physical{205.0}=0x0213
+phy_chain_rx_lane_map_physical{209.0}=0x2013
+phy_chain_rx_lane_map_physical{21.0}=0x3021
+phy_chain_rx_lane_map_physical{213.0}=0x3021
+phy_chain_rx_lane_map_physical{217.0}=0x0231
+phy_chain_rx_lane_map_physical{221.0}=0x2031
+phy_chain_rx_lane_map_physical{225.0}=0x1203
+phy_chain_rx_lane_map_physical{229.0}=0x1230
+phy_chain_rx_lane_map_physical{233.0}=0x3021
+phy_chain_rx_lane_map_physical{237.0}=0x1032
+phy_chain_rx_lane_map_physical{241.0}=0x2301
+phy_chain_rx_lane_map_physical{245.0}=0x0321
+phy_chain_rx_lane_map_physical{249.0}=0x2301
+phy_chain_rx_lane_map_physical{25.0}=0x2301
+phy_chain_rx_lane_map_physical{253.0}=0x2301
+phy_chain_rx_lane_map_physical{257.0}=0x3210
+phy_chain_rx_lane_map_physical{29.0}=0x3021
+phy_chain_rx_lane_map_physical{33.0}=0x1302
+phy_chain_rx_lane_map_physical{37.0}=0x2031
+phy_chain_rx_lane_map_physical{41.0}=0x3021
+phy_chain_rx_lane_map_physical{45.0}=0x1023
+phy_chain_rx_lane_map_physical{49.0}=0x0213
+phy_chain_rx_lane_map_physical{5.0}=0x3201
+phy_chain_rx_lane_map_physical{53.0}=0x3201
+phy_chain_rx_lane_map_physical{57.0}=0x2013
+phy_chain_rx_lane_map_physical{61.0}=0x0213
+phy_chain_rx_lane_map_physical{65.0}=0x1203
+phy_chain_rx_lane_map_physical{69.0}=0x0213
+phy_chain_rx_lane_map_physical{73.0}=0x0213
+phy_chain_rx_lane_map_physical{77.0}=0x3120
+phy_chain_rx_lane_map_physical{81.0}=0x0213
+phy_chain_rx_lane_map_physical{85.0}=0x2031
+phy_chain_rx_lane_map_physical{89.0}=0x2031
+phy_chain_rx_lane_map_physical{9.0}=0x0321
+phy_chain_rx_lane_map_physical{93.0}=0x3120
+phy_chain_rx_lane_map_physical{97.0}=0x1203
+phy_chain_rx_polarity_flip_physical{1.0}=0x1
+phy_chain_rx_polarity_flip_physical{10.0}=0x0
+phy_chain_rx_polarity_flip_physical{100.0}=0x1
+phy_chain_rx_polarity_flip_physical{101.0}=0x1
+phy_chain_rx_polarity_flip_physical{102.0}=0x0
+phy_chain_rx_polarity_flip_physical{103.0}=0x1
+phy_chain_rx_polarity_flip_physical{104.0}=0x0
+phy_chain_rx_polarity_flip_physical{105.0}=0x1
+phy_chain_rx_polarity_flip_physical{106.0}=0x0
+phy_chain_rx_polarity_flip_physical{107.0}=0x1
+phy_chain_rx_polarity_flip_physical{108.0}=0x0
+phy_chain_rx_polarity_flip_physical{109.0}=0x0
+phy_chain_rx_polarity_flip_physical{11.0}=0x1
+phy_chain_rx_polarity_flip_physical{110.0}=0x1
+phy_chain_rx_polarity_flip_physical{111.0}=0x0
+phy_chain_rx_polarity_flip_physical{112.0}=0x1
+phy_chain_rx_polarity_flip_physical{113.0}=0x1
+phy_chain_rx_polarity_flip_physical{114.0}=0x0
+phy_chain_rx_polarity_flip_physical{115.0}=0x1
+phy_chain_rx_polarity_flip_physical{116.0}=0x0
+phy_chain_rx_polarity_flip_physical{117.0}=0x0
+phy_chain_rx_polarity_flip_physical{118.0}=0x0
+phy_chain_rx_polarity_flip_physical{119.0}=0x1
+phy_chain_rx_polarity_flip_physical{12.0}=0x1
+phy_chain_rx_polarity_flip_physical{120.0}=0x0
+phy_chain_rx_polarity_flip_physical{121.0}=0x1
+phy_chain_rx_polarity_flip_physical{122.0}=0x0
+phy_chain_rx_polarity_flip_physical{123.0}=0x1
+phy_chain_rx_polarity_flip_physical{124.0}=0x0
+phy_chain_rx_polarity_flip_physical{125.0}=0x0
+phy_chain_rx_polarity_flip_physical{126.0}=0x1
+phy_chain_rx_polarity_flip_physical{127.0}=0x1
+phy_chain_rx_polarity_flip_physical{128.0}=0x1
+phy_chain_rx_polarity_flip_physical{129.0}=0x0
+phy_chain_rx_polarity_flip_physical{13.0}=0x1
+phy_chain_rx_polarity_flip_physical{130.0}=0x1
+phy_chain_rx_polarity_flip_physical{131.0}=0x1
+phy_chain_rx_polarity_flip_physical{132.0}=0x0
+phy_chain_rx_polarity_flip_physical{133.0}=0x1
+phy_chain_rx_polarity_flip_physical{134.0}=0x1
+phy_chain_rx_polarity_flip_physical{135.0}=0x1
+phy_chain_rx_polarity_flip_physical{136.0}=0x0
+phy_chain_rx_polarity_flip_physical{137.0}=0x0
+phy_chain_rx_polarity_flip_physical{138.0}=0x0
+phy_chain_rx_polarity_flip_physical{139.0}=0x1
+phy_chain_rx_polarity_flip_physical{14.0}=0x0
+phy_chain_rx_polarity_flip_physical{140.0}=0x0
+phy_chain_rx_polarity_flip_physical{141.0}=0x1
+phy_chain_rx_polarity_flip_physical{142.0}=0x0
+phy_chain_rx_polarity_flip_physical{143.0}=0x1
+phy_chain_rx_polarity_flip_physical{144.0}=0x0
+phy_chain_rx_polarity_flip_physical{145.0}=0x1
+phy_chain_rx_polarity_flip_physical{146.0}=0x0
+phy_chain_rx_polarity_flip_physical{147.0}=0x1
+phy_chain_rx_polarity_flip_physical{148.0}=0x0
+phy_chain_rx_polarity_flip_physical{149.0}=0x0
+phy_chain_rx_polarity_flip_physical{15.0}=0x1
+phy_chain_rx_polarity_flip_physical{150.0}=0x1
+phy_chain_rx_polarity_flip_physical{151.0}=0x1
+phy_chain_rx_polarity_flip_physical{152.0}=0x0
+phy_chain_rx_polarity_flip_physical{153.0}=0x0
+phy_chain_rx_polarity_flip_physical{154.0}=0x1
+phy_chain_rx_polarity_flip_physical{155.0}=0x1
+phy_chain_rx_polarity_flip_physical{156.0}=0x0
+phy_chain_rx_polarity_flip_physical{157.0}=0x0
+phy_chain_rx_polarity_flip_physical{158.0}=0x0
+phy_chain_rx_polarity_flip_physical{159.0}=0x1
+phy_chain_rx_polarity_flip_physical{16.0}=0x0
+phy_chain_rx_polarity_flip_physical{160.0}=0x0
+phy_chain_rx_polarity_flip_physical{161.0}=0x1
+phy_chain_rx_polarity_flip_physical{162.0}=0x1
+phy_chain_rx_polarity_flip_physical{163.0}=0x0
+phy_chain_rx_polarity_flip_physical{164.0}=0x1
+phy_chain_rx_polarity_flip_physical{165.0}=0x0
+phy_chain_rx_polarity_flip_physical{166.0}=0x0
+phy_chain_rx_polarity_flip_physical{167.0}=0x1
+phy_chain_rx_polarity_flip_physical{168.0}=0x1
+phy_chain_rx_polarity_flip_physical{169.0}=0x1
+phy_chain_rx_polarity_flip_physical{17.0}=0x1
+phy_chain_rx_polarity_flip_physical{170.0}=0x1
+phy_chain_rx_polarity_flip_physical{171.0}=0x0
+phy_chain_rx_polarity_flip_physical{172.0}=0x0
+phy_chain_rx_polarity_flip_physical{173.0}=0x0
+phy_chain_rx_polarity_flip_physical{174.0}=0x0
+phy_chain_rx_polarity_flip_physical{175.0}=0x1
+phy_chain_rx_polarity_flip_physical{176.0}=0x1
+phy_chain_rx_polarity_flip_physical{177.0}=0x1
+phy_chain_rx_polarity_flip_physical{178.0}=0x1
+phy_chain_rx_polarity_flip_physical{179.0}=0x0
+phy_chain_rx_polarity_flip_physical{18.0}=0x0
+phy_chain_rx_polarity_flip_physical{180.0}=0x0
+phy_chain_rx_polarity_flip_physical{181.0}=0x1
+phy_chain_rx_polarity_flip_physical{182.0}=0x1
+phy_chain_rx_polarity_flip_physical{183.0}=0x0
+phy_chain_rx_polarity_flip_physical{184.0}=0x0
+phy_chain_rx_polarity_flip_physical{185.0}=0x0
+phy_chain_rx_polarity_flip_physical{186.0}=0x0
+phy_chain_rx_polarity_flip_physical{187.0}=0x1
+phy_chain_rx_polarity_flip_physical{188.0}=0x1
+phy_chain_rx_polarity_flip_physical{189.0}=0x0
+phy_chain_rx_polarity_flip_physical{19.0}=0x1
+phy_chain_rx_polarity_flip_physical{190.0}=0x0
+phy_chain_rx_polarity_flip_physical{191.0}=0x1
+phy_chain_rx_polarity_flip_physical{192.0}=0x0
+phy_chain_rx_polarity_flip_physical{193.0}=0x0
+phy_chain_rx_polarity_flip_physical{194.0}=0x0
+phy_chain_rx_polarity_flip_physical{195.0}=0x1
+phy_chain_rx_polarity_flip_physical{196.0}=0x1
+phy_chain_rx_polarity_flip_physical{197.0}=0x1
+phy_chain_rx_polarity_flip_physical{198.0}=0x1
+phy_chain_rx_polarity_flip_physical{199.0}=0x0
+phy_chain_rx_polarity_flip_physical{2.0}=0x0
+phy_chain_rx_polarity_flip_physical{20.0}=0x0
+phy_chain_rx_polarity_flip_physical{200.0}=0x0
+phy_chain_rx_polarity_flip_physical{201.0}=0x0
+phy_chain_rx_polarity_flip_physical{202.0}=0x0
+phy_chain_rx_polarity_flip_physical{203.0}=0x1
+phy_chain_rx_polarity_flip_physical{204.0}=0x0
+phy_chain_rx_polarity_flip_physical{205.0}=0x1
+phy_chain_rx_polarity_flip_physical{206.0}=0x1
+phy_chain_rx_polarity_flip_physical{207.0}=0x0
+phy_chain_rx_polarity_flip_physical{208.0}=0x0
+phy_chain_rx_polarity_flip_physical{209.0}=0x1
+phy_chain_rx_polarity_flip_physical{21.0}=0x0
+phy_chain_rx_polarity_flip_physical{210.0}=0x1
+phy_chain_rx_polarity_flip_physical{211.0}=0x0
+phy_chain_rx_polarity_flip_physical{212.0}=0x0
+phy_chain_rx_polarity_flip_physical{213.0}=0x0
+phy_chain_rx_polarity_flip_physical{214.0}=0x0
+phy_chain_rx_polarity_flip_physical{215.0}=0x1
+phy_chain_rx_polarity_flip_physical{216.0}=0x0
+phy_chain_rx_polarity_flip_physical{217.0}=0x0
+phy_chain_rx_polarity_flip_physical{218.0}=0x0
+phy_chain_rx_polarity_flip_physical{219.0}=0x1
+phy_chain_rx_polarity_flip_physical{22.0}=0x0
+phy_chain_rx_polarity_flip_physical{220.0}=0x1
+phy_chain_rx_polarity_flip_physical{221.0}=0x0
+phy_chain_rx_polarity_flip_physical{222.0}=0x0
+phy_chain_rx_polarity_flip_physical{223.0}=0x1
+phy_chain_rx_polarity_flip_physical{224.0}=0x1
+phy_chain_rx_polarity_flip_physical{225.0}=0x1
+phy_chain_rx_polarity_flip_physical{226.0}=0x0
+phy_chain_rx_polarity_flip_physical{227.0}=0x0
+phy_chain_rx_polarity_flip_physical{228.0}=0x1
+phy_chain_rx_polarity_flip_physical{229.0}=0x0
+phy_chain_rx_polarity_flip_physical{23.0}=0x1
+phy_chain_rx_polarity_flip_physical{230.0}=0x0
+phy_chain_rx_polarity_flip_physical{231.0}=0x1
+phy_chain_rx_polarity_flip_physical{232.0}=0x1
+phy_chain_rx_polarity_flip_physical{233.0}=0x1
+phy_chain_rx_polarity_flip_physical{234.0}=0x0
+phy_chain_rx_polarity_flip_physical{235.0}=0x0
+phy_chain_rx_polarity_flip_physical{236.0}=0x0
+phy_chain_rx_polarity_flip_physical{237.0}=0x1
+phy_chain_rx_polarity_flip_physical{238.0}=0x0
+phy_chain_rx_polarity_flip_physical{239.0}=0x1
+phy_chain_rx_polarity_flip_physical{24.0}=0x0
+phy_chain_rx_polarity_flip_physical{240.0}=0x0
+phy_chain_rx_polarity_flip_physical{241.0}=0x1
+phy_chain_rx_polarity_flip_physical{242.0}=0x0
+phy_chain_rx_polarity_flip_physical{243.0}=0x1
+phy_chain_rx_polarity_flip_physical{244.0}=0x0
+phy_chain_rx_polarity_flip_physical{245.0}=0x1
+phy_chain_rx_polarity_flip_physical{246.0}=0x1
+phy_chain_rx_polarity_flip_physical{247.0}=0x1
+phy_chain_rx_polarity_flip_physical{248.0}=0x0
+phy_chain_rx_polarity_flip_physical{249.0}=0x0
+phy_chain_rx_polarity_flip_physical{25.0}=0x1
+phy_chain_rx_polarity_flip_physical{250.0}=0x1
+phy_chain_rx_polarity_flip_physical{251.0}=0x0
+phy_chain_rx_polarity_flip_physical{252.0}=0x1
+phy_chain_rx_polarity_flip_physical{253.0}=0x1
+phy_chain_rx_polarity_flip_physical{254.0}=0x0
+phy_chain_rx_polarity_flip_physical{255.0}=0x1
+phy_chain_rx_polarity_flip_physical{256.0}=0x0
+phy_chain_rx_polarity_flip_physical{257.0}=0x0
+phy_chain_rx_polarity_flip_physical{259.0}=0x0
+phy_chain_rx_polarity_flip_physical{26.0}=0x0
+phy_chain_rx_polarity_flip_physical{27.0}=0x1
+phy_chain_rx_polarity_flip_physical{28.0}=0x0
+phy_chain_rx_polarity_flip_physical{29.0}=0x0
+phy_chain_rx_polarity_flip_physical{3.0}=0x1
+phy_chain_rx_polarity_flip_physical{30.0}=0x0
+phy_chain_rx_polarity_flip_physical{31.0}=0x0
+phy_chain_rx_polarity_flip_physical{32.0}=0x1
+phy_chain_rx_polarity_flip_physical{33.0}=0x0
+phy_chain_rx_polarity_flip_physical{34.0}=0x0
+phy_chain_rx_polarity_flip_physical{35.0}=0x1
+phy_chain_rx_polarity_flip_physical{36.0}=0x1
+phy_chain_rx_polarity_flip_physical{37.0}=0x1
+phy_chain_rx_polarity_flip_physical{38.0}=0x1
+phy_chain_rx_polarity_flip_physical{39.0}=0x0
+phy_chain_rx_polarity_flip_physical{4.0}=0x0
+phy_chain_rx_polarity_flip_physical{40.0}=0x0
+phy_chain_rx_polarity_flip_physical{41.0}=0x0
+phy_chain_rx_polarity_flip_physical{42.0}=0x1
+phy_chain_rx_polarity_flip_physical{43.0}=0x1
+phy_chain_rx_polarity_flip_physical{44.0}=0x1
+phy_chain_rx_polarity_flip_physical{45.0}=0x1
+phy_chain_rx_polarity_flip_physical{46.0}=0x0
+phy_chain_rx_polarity_flip_physical{47.0}=0x0
+phy_chain_rx_polarity_flip_physical{48.0}=0x1
+phy_chain_rx_polarity_flip_physical{49.0}=0x1
+phy_chain_rx_polarity_flip_physical{5.0}=0x1
+phy_chain_rx_polarity_flip_physical{50.0}=0x1
+phy_chain_rx_polarity_flip_physical{51.0}=0x0
+phy_chain_rx_polarity_flip_physical{52.0}=0x0
+phy_chain_rx_polarity_flip_physical{53.0}=0x0
+phy_chain_rx_polarity_flip_physical{54.0}=0x0
+phy_chain_rx_polarity_flip_physical{55.0}=0x1
+phy_chain_rx_polarity_flip_physical{56.0}=0x0
+phy_chain_rx_polarity_flip_physical{57.0}=0x0
+phy_chain_rx_polarity_flip_physical{58.0}=0x0
+phy_chain_rx_polarity_flip_physical{59.0}=0x1
+phy_chain_rx_polarity_flip_physical{6.0}=0x0
+phy_chain_rx_polarity_flip_physical{60.0}=0x1
+phy_chain_rx_polarity_flip_physical{61.0}=0x0
+phy_chain_rx_polarity_flip_physical{62.0}=0x0
+phy_chain_rx_polarity_flip_physical{63.0}=0x1
+phy_chain_rx_polarity_flip_physical{64.0}=0x1
+phy_chain_rx_polarity_flip_physical{65.0}=0x1
+phy_chain_rx_polarity_flip_physical{66.0}=0x1
+phy_chain_rx_polarity_flip_physical{67.0}=0x0
+phy_chain_rx_polarity_flip_physical{68.0}=0x1
+phy_chain_rx_polarity_flip_physical{69.0}=0x0
+phy_chain_rx_polarity_flip_physical{7.0}=0x0
+phy_chain_rx_polarity_flip_physical{70.0}=0x0
+phy_chain_rx_polarity_flip_physical{71.0}=0x1
+phy_chain_rx_polarity_flip_physical{72.0}=0x1
+phy_chain_rx_polarity_flip_physical{73.0}=0x1
+phy_chain_rx_polarity_flip_physical{74.0}=0x1
+phy_chain_rx_polarity_flip_physical{75.0}=0x0
+phy_chain_rx_polarity_flip_physical{76.0}=0x0
+phy_chain_rx_polarity_flip_physical{77.0}=0x0
+phy_chain_rx_polarity_flip_physical{78.0}=0x0
+phy_chain_rx_polarity_flip_physical{79.0}=0x1
+phy_chain_rx_polarity_flip_physical{8.0}=0x1
+phy_chain_rx_polarity_flip_physical{80.0}=0x1
+phy_chain_rx_polarity_flip_physical{81.0}=0x1
+phy_chain_rx_polarity_flip_physical{82.0}=0x1
+phy_chain_rx_polarity_flip_physical{83.0}=0x0
+phy_chain_rx_polarity_flip_physical{84.0}=0x0
+phy_chain_rx_polarity_flip_physical{85.0}=0x1
+phy_chain_rx_polarity_flip_physical{86.0}=0x1
+phy_chain_rx_polarity_flip_physical{87.0}=0x0
+phy_chain_rx_polarity_flip_physical{88.0}=0x0
+phy_chain_rx_polarity_flip_physical{89.0}=0x0
+phy_chain_rx_polarity_flip_physical{9.0}=0x1
+phy_chain_rx_polarity_flip_physical{90.0}=0x0
+phy_chain_rx_polarity_flip_physical{91.0}=0x1
+phy_chain_rx_polarity_flip_physical{92.0}=0x1
+phy_chain_rx_polarity_flip_physical{93.0}=0x0
+phy_chain_rx_polarity_flip_physical{94.0}=0x0
+phy_chain_rx_polarity_flip_physical{95.0}=0x1
+phy_chain_rx_polarity_flip_physical{96.0}=0x0
+phy_chain_rx_polarity_flip_physical{97.0}=0x1
+phy_chain_rx_polarity_flip_physical{98.0}=0x1
+phy_chain_rx_polarity_flip_physical{99.0}=0x0
+phy_chain_tx_lane_map_physical{1.0}=0x2031
+phy_chain_tx_lane_map_physical{101.0}=0x1023
+phy_chain_tx_lane_map_physical{105.0}=0x1302
+phy_chain_tx_lane_map_physical{109.0}=0x0321
+phy_chain_tx_lane_map_physical{113.0}=0x2301
+phy_chain_tx_lane_map_physical{117.0}=0x3120
+phy_chain_tx_lane_map_physical{121.0}=0x3102
+phy_chain_tx_lane_map_physical{125.0}=0x3210
+phy_chain_tx_lane_map_physical{129.0}=0x1023
+phy_chain_tx_lane_map_physical{13.0}=0x3021
+phy_chain_tx_lane_map_physical{133.0}=0x3210
+phy_chain_tx_lane_map_physical{137.0}=0x2031
+phy_chain_tx_lane_map_physical{141.0}=0x1302
+phy_chain_tx_lane_map_physical{145.0}=0x3210
+phy_chain_tx_lane_map_physical{149.0}=0x0213
+phy_chain_tx_lane_map_physical{153.0}=0x3210
+phy_chain_tx_lane_map_physical{157.0}=0x1320
+phy_chain_tx_lane_map_physical{161.0}=0x3210
+phy_chain_tx_lane_map_physical{165.0}=0x0231
+phy_chain_tx_lane_map_physical{169.0}=0x3120
+phy_chain_tx_lane_map_physical{17.0}=0x1032
+phy_chain_tx_lane_map_physical{173.0}=0x0312
+phy_chain_tx_lane_map_physical{177.0}=0x0231
+phy_chain_tx_lane_map_physical{181.0}=0x3210
+phy_chain_tx_lane_map_physical{185.0}=0x3210
+phy_chain_tx_lane_map_physical{189.0}=0x1320
+phy_chain_tx_lane_map_physical{193.0}=0x0321
+phy_chain_tx_lane_map_physical{197.0}=0x3120
+phy_chain_tx_lane_map_physical{201.0}=0x3120
+phy_chain_tx_lane_map_physical{205.0}=0x0123
+phy_chain_tx_lane_map_physical{209.0}=0x3120
+phy_chain_tx_lane_map_physical{21.0}=0x0213
+phy_chain_tx_lane_map_physical{213.0}=0x3021
+phy_chain_tx_lane_map_physical{217.0}=0x0312
+phy_chain_tx_lane_map_physical{221.0}=0x2301
+phy_chain_tx_lane_map_physical{225.0}=0x0123
+phy_chain_tx_lane_map_physical{229.0}=0x2031
+phy_chain_tx_lane_map_physical{233.0}=0x0231
+phy_chain_tx_lane_map_physical{237.0}=0x0213
+phy_chain_tx_lane_map_physical{241.0}=0x1320
+phy_chain_tx_lane_map_physical{245.0}=0x2031
+phy_chain_tx_lane_map_physical{249.0}=0x3120
+phy_chain_tx_lane_map_physical{25.0}=0x0231
+phy_chain_tx_lane_map_physical{253.0}=0x0321
+phy_chain_tx_lane_map_physical{257.0}=0x3210
+phy_chain_tx_lane_map_physical{29.0}=0x1230
+phy_chain_tx_lane_map_physical{33.0}=0x1032
+phy_chain_tx_lane_map_physical{37.0}=0x0123
+phy_chain_tx_lane_map_physical{41.0}=0x0213
+phy_chain_tx_lane_map_physical{45.0}=0x0132
+phy_chain_tx_lane_map_physical{49.0}=0x2031
+phy_chain_tx_lane_map_physical{5.0}=0x2301
+phy_chain_tx_lane_map_physical{53.0}=0x2301
+phy_chain_tx_lane_map_physical{57.0}=0x2031
+phy_chain_tx_lane_map_physical{61.0}=0x2031
+phy_chain_tx_lane_map_physical{65.0}=0x1230
+phy_chain_tx_lane_map_physical{69.0}=0x2013
+phy_chain_tx_lane_map_physical{73.0}=0x0213
+phy_chain_tx_lane_map_physical{77.0}=0x2310
+phy_chain_tx_lane_map_physical{81.0}=0x0321
+phy_chain_tx_lane_map_physical{85.0}=0x2013
+phy_chain_tx_lane_map_physical{89.0}=0x0213
+phy_chain_tx_lane_map_physical{9.0}=0x3012
+phy_chain_tx_lane_map_physical{93.0}=0x3102
+phy_chain_tx_lane_map_physical{97.0}=0x3210
+phy_chain_tx_polarity_flip_physical{1.0}=0x0
+phy_chain_tx_polarity_flip_physical{10.0}=0x1
+phy_chain_tx_polarity_flip_physical{100.0}=0x0
+phy_chain_tx_polarity_flip_physical{101.0}=0x0
+phy_chain_tx_polarity_flip_physical{102.0}=0x1
+phy_chain_tx_polarity_flip_physical{103.0}=0x0
+phy_chain_tx_polarity_flip_physical{104.0}=0x0
+phy_chain_tx_polarity_flip_physical{105.0}=0x0
+phy_chain_tx_polarity_flip_physical{106.0}=0x1
+phy_chain_tx_polarity_flip_physical{107.0}=0x1
+phy_chain_tx_polarity_flip_physical{108.0}=0x1
+phy_chain_tx_polarity_flip_physical{109.0}=0x0
+phy_chain_tx_polarity_flip_physical{11.0}=0x1
+phy_chain_tx_polarity_flip_physical{110.0}=0x0
+phy_chain_tx_polarity_flip_physical{111.0}=0x0
+phy_chain_tx_polarity_flip_physical{112.0}=0x1
+phy_chain_tx_polarity_flip_physical{113.0}=0x1
+phy_chain_tx_polarity_flip_physical{114.0}=0x1
+phy_chain_tx_polarity_flip_physical{115.0}=0x1
+phy_chain_tx_polarity_flip_physical{116.0}=0x0
+phy_chain_tx_polarity_flip_physical{117.0}=0x1
+phy_chain_tx_polarity_flip_physical{118.0}=0x0
+phy_chain_tx_polarity_flip_physical{119.0}=0x0
+phy_chain_tx_polarity_flip_physical{12.0}=0x0
+phy_chain_tx_polarity_flip_physical{120.0}=0x0
+phy_chain_tx_polarity_flip_physical{121.0}=0x0
+phy_chain_tx_polarity_flip_physical{122.0}=0x0
+phy_chain_tx_polarity_flip_physical{123.0}=0x0
+phy_chain_tx_polarity_flip_physical{124.0}=0x1
+phy_chain_tx_polarity_flip_physical{125.0}=0x0
+phy_chain_tx_polarity_flip_physical{126.0}=0x1
+phy_chain_tx_polarity_flip_physical{127.0}=0x1
+phy_chain_tx_polarity_flip_physical{128.0}=0x1
+phy_chain_tx_polarity_flip_physical{129.0}=0x1
+phy_chain_tx_polarity_flip_physical{13.0}=0x0
+phy_chain_tx_polarity_flip_physical{130.0}=0x0
+phy_chain_tx_polarity_flip_physical{131.0}=0x1
+phy_chain_tx_polarity_flip_physical{132.0}=0x0
+phy_chain_tx_polarity_flip_physical{133.0}=0x1
+phy_chain_tx_polarity_flip_physical{134.0}=0x1
+phy_chain_tx_polarity_flip_physical{135.0}=0x1
+phy_chain_tx_polarity_flip_physical{136.0}=0x1
+phy_chain_tx_polarity_flip_physical{137.0}=0x1
+phy_chain_tx_polarity_flip_physical{138.0}=0x1
+phy_chain_tx_polarity_flip_physical{139.0}=0x1
+phy_chain_tx_polarity_flip_physical{14.0}=0x1
+phy_chain_tx_polarity_flip_physical{140.0}=0x1
+phy_chain_tx_polarity_flip_physical{141.0}=0x0
+phy_chain_tx_polarity_flip_physical{142.0}=0x1
+phy_chain_tx_polarity_flip_physical{143.0}=0x1
+phy_chain_tx_polarity_flip_physical{144.0}=0x1
+phy_chain_tx_polarity_flip_physical{145.0}=0x1
+phy_chain_tx_polarity_flip_physical{146.0}=0x1
+phy_chain_tx_polarity_flip_physical{147.0}=0x1
+phy_chain_tx_polarity_flip_physical{148.0}=0x0
+phy_chain_tx_polarity_flip_physical{149.0}=0x1
+phy_chain_tx_polarity_flip_physical{15.0}=0x0
+phy_chain_tx_polarity_flip_physical{150.0}=0x0
+phy_chain_tx_polarity_flip_physical{151.0}=0x0
+phy_chain_tx_polarity_flip_physical{152.0}=0x0
+phy_chain_tx_polarity_flip_physical{153.0}=0x1
+phy_chain_tx_polarity_flip_physical{154.0}=0x0
+phy_chain_tx_polarity_flip_physical{155.0}=0x0
+phy_chain_tx_polarity_flip_physical{156.0}=0x0
+phy_chain_tx_polarity_flip_physical{157.0}=0x0
+phy_chain_tx_polarity_flip_physical{158.0}=0x0
+phy_chain_tx_polarity_flip_physical{159.0}=0x0
+phy_chain_tx_polarity_flip_physical{16.0}=0x0
+phy_chain_tx_polarity_flip_physical{160.0}=0x0
+phy_chain_tx_polarity_flip_physical{161.0}=0x0
+phy_chain_tx_polarity_flip_physical{162.0}=0x1
+phy_chain_tx_polarity_flip_physical{163.0}=0x1
+phy_chain_tx_polarity_flip_physical{164.0}=0x0
+phy_chain_tx_polarity_flip_physical{165.0}=0x1
+phy_chain_tx_polarity_flip_physical{166.0}=0x1
+phy_chain_tx_polarity_flip_physical{167.0}=0x1
+phy_chain_tx_polarity_flip_physical{168.0}=0x0
+phy_chain_tx_polarity_flip_physical{169.0}=0x0
+phy_chain_tx_polarity_flip_physical{17.0}=0x0
+phy_chain_tx_polarity_flip_physical{170.0}=0x1
+phy_chain_tx_polarity_flip_physical{171.0}=0x1
+phy_chain_tx_polarity_flip_physical{172.0}=0x1
+phy_chain_tx_polarity_flip_physical{173.0}=0x0
+phy_chain_tx_polarity_flip_physical{174.0}=0x0
+phy_chain_tx_polarity_flip_physical{175.0}=0x1
+phy_chain_tx_polarity_flip_physical{176.0}=0x0
+phy_chain_tx_polarity_flip_physical{177.0}=0x1
+phy_chain_tx_polarity_flip_physical{178.0}=0x0
+phy_chain_tx_polarity_flip_physical{179.0}=0x0
+phy_chain_tx_polarity_flip_physical{18.0}=0x1
+phy_chain_tx_polarity_flip_physical{180.0}=0x0
+phy_chain_tx_polarity_flip_physical{181.0}=0x0
+phy_chain_tx_polarity_flip_physical{182.0}=0x0
+phy_chain_tx_polarity_flip_physical{183.0}=0x0
+phy_chain_tx_polarity_flip_physical{184.0}=0x1
+phy_chain_tx_polarity_flip_physical{185.0}=0x0
+phy_chain_tx_polarity_flip_physical{186.0}=0x1
+phy_chain_tx_polarity_flip_physical{187.0}=0x1
+phy_chain_tx_polarity_flip_physical{188.0}=0x1
+phy_chain_tx_polarity_flip_physical{189.0}=0x0
+phy_chain_tx_polarity_flip_physical{19.0}=0x1
+phy_chain_tx_polarity_flip_physical{190.0}=0x0
+phy_chain_tx_polarity_flip_physical{191.0}=0x0
+phy_chain_tx_polarity_flip_physical{192.0}=0x0
+phy_chain_tx_polarity_flip_physical{193.0}=0x1
+phy_chain_tx_polarity_flip_physical{194.0}=0x1
+phy_chain_tx_polarity_flip_physical{195.0}=0x1
+phy_chain_tx_polarity_flip_physical{196.0}=0x0
+phy_chain_tx_polarity_flip_physical{197.0}=0x0
+phy_chain_tx_polarity_flip_physical{198.0}=0x1
+phy_chain_tx_polarity_flip_physical{199.0}=0x1
+phy_chain_tx_polarity_flip_physical{2.0}=0x1
+phy_chain_tx_polarity_flip_physical{20.0}=0x1
+phy_chain_tx_polarity_flip_physical{200.0}=0x1
+phy_chain_tx_polarity_flip_physical{201.0}=0x1
+phy_chain_tx_polarity_flip_physical{202.0}=0x1
+phy_chain_tx_polarity_flip_physical{203.0}=0x1
+phy_chain_tx_polarity_flip_physical{204.0}=0x1
+phy_chain_tx_polarity_flip_physical{205.0}=0x0
+phy_chain_tx_polarity_flip_physical{206.0}=0x1
+phy_chain_tx_polarity_flip_physical{207.0}=0x1
+phy_chain_tx_polarity_flip_physical{208.0}=0x1
+phy_chain_tx_polarity_flip_physical{209.0}=0x1
+phy_chain_tx_polarity_flip_physical{21.0}=0x0
+phy_chain_tx_polarity_flip_physical{210.0}=0x1
+phy_chain_tx_polarity_flip_physical{211.0}=0x1
+phy_chain_tx_polarity_flip_physical{212.0}=0x0
+phy_chain_tx_polarity_flip_physical{213.0}=0x0
+phy_chain_tx_polarity_flip_physical{214.0}=0x1
+phy_chain_tx_polarity_flip_physical{215.0}=0x0
+phy_chain_tx_polarity_flip_physical{216.0}=0x1
+phy_chain_tx_polarity_flip_physical{217.0}=0x1
+phy_chain_tx_polarity_flip_physical{218.0}=0x1
+phy_chain_tx_polarity_flip_physical{219.0}=0x0
+phy_chain_tx_polarity_flip_physical{22.0}=0x0
+phy_chain_tx_polarity_flip_physical{220.0}=0x1
+phy_chain_tx_polarity_flip_physical{221.0}=0x0
+phy_chain_tx_polarity_flip_physical{222.0}=0x0
+phy_chain_tx_polarity_flip_physical{223.0}=0x0
+phy_chain_tx_polarity_flip_physical{224.0}=0x1
+phy_chain_tx_polarity_flip_physical{225.0}=0x1
+phy_chain_tx_polarity_flip_physical{226.0}=0x1
+phy_chain_tx_polarity_flip_physical{227.0}=0x1
+phy_chain_tx_polarity_flip_physical{228.0}=0x0
+phy_chain_tx_polarity_flip_physical{229.0}=0x0
+phy_chain_tx_polarity_flip_physical{23.0}=0x0
+phy_chain_tx_polarity_flip_physical{230.0}=0x1
+phy_chain_tx_polarity_flip_physical{231.0}=0x1
+phy_chain_tx_polarity_flip_physical{232.0}=0x1
+phy_chain_tx_polarity_flip_physical{233.0}=0x0
+phy_chain_tx_polarity_flip_physical{234.0}=0x0
+phy_chain_tx_polarity_flip_physical{235.0}=0x0
+phy_chain_tx_polarity_flip_physical{236.0}=0x0
+phy_chain_tx_polarity_flip_physical{237.0}=0x1
+phy_chain_tx_polarity_flip_physical{238.0}=0x1
+phy_chain_tx_polarity_flip_physical{239.0}=0x1
+phy_chain_tx_polarity_flip_physical{24.0}=0x0
+phy_chain_tx_polarity_flip_physical{240.0}=0x0
+phy_chain_tx_polarity_flip_physical{241.0}=0x1
+phy_chain_tx_polarity_flip_physical{242.0}=0x1
+phy_chain_tx_polarity_flip_physical{243.0}=0x1
+phy_chain_tx_polarity_flip_physical{244.0}=0x0
+phy_chain_tx_polarity_flip_physical{245.0}=0x1
+phy_chain_tx_polarity_flip_physical{246.0}=0x1
+phy_chain_tx_polarity_flip_physical{247.0}=0x1
+phy_chain_tx_polarity_flip_physical{248.0}=0x1
+phy_chain_tx_polarity_flip_physical{249.0}=0x1
+phy_chain_tx_polarity_flip_physical{25.0}=0x1
+phy_chain_tx_polarity_flip_physical{250.0}=0x0
+phy_chain_tx_polarity_flip_physical{251.0}=0x0
+phy_chain_tx_polarity_flip_physical{252.0}=0x0
+phy_chain_tx_polarity_flip_physical{253.0}=0x1
+phy_chain_tx_polarity_flip_physical{254.0}=0x1
+phy_chain_tx_polarity_flip_physical{255.0}=0x1
+phy_chain_tx_polarity_flip_physical{256.0}=0x0
+phy_chain_tx_polarity_flip_physical{257.0}=0x0
+phy_chain_tx_polarity_flip_physical{259.0}=0x0
+phy_chain_tx_polarity_flip_physical{26.0}=0x0
+phy_chain_tx_polarity_flip_physical{27.0}=0x0
+phy_chain_tx_polarity_flip_physical{28.0}=0x0
+phy_chain_tx_polarity_flip_physical{29.0}=0x1
+phy_chain_tx_polarity_flip_physical{3.0}=0x1
+phy_chain_tx_polarity_flip_physical{30.0}=0x1
+phy_chain_tx_polarity_flip_physical{31.0}=0x1
+phy_chain_tx_polarity_flip_physical{32.0}=0x0
+phy_chain_tx_polarity_flip_physical{33.0}=0x0
+phy_chain_tx_polarity_flip_physical{34.0}=0x0
+phy_chain_tx_polarity_flip_physical{35.0}=0x0
+phy_chain_tx_polarity_flip_physical{36.0}=0x1
+phy_chain_tx_polarity_flip_physical{37.0}=0x1
+phy_chain_tx_polarity_flip_physical{38.0}=0x1
+phy_chain_tx_polarity_flip_physical{39.0}=0x1
+phy_chain_tx_polarity_flip_physical{4.0}=0x1
+phy_chain_tx_polarity_flip_physical{40.0}=0x0
+phy_chain_tx_polarity_flip_physical{41.0}=0x0
+phy_chain_tx_polarity_flip_physical{42.0}=0x0
+phy_chain_tx_polarity_flip_physical{43.0}=0x0
+phy_chain_tx_polarity_flip_physical{44.0}=0x0
+phy_chain_tx_polarity_flip_physical{45.0}=0x1
+phy_chain_tx_polarity_flip_physical{46.0}=0x0
+phy_chain_tx_polarity_flip_physical{47.0}=0x1
+phy_chain_tx_polarity_flip_physical{48.0}=0x1
+phy_chain_tx_polarity_flip_physical{49.0}=0x0
+phy_chain_tx_polarity_flip_physical{5.0}=0x1
+phy_chain_tx_polarity_flip_physical{50.0}=0x0
+phy_chain_tx_polarity_flip_physical{51.0}=0x0
+phy_chain_tx_polarity_flip_physical{52.0}=0x1
+phy_chain_tx_polarity_flip_physical{53.0}=0x0
+phy_chain_tx_polarity_flip_physical{54.0}=0x1
+phy_chain_tx_polarity_flip_physical{55.0}=0x1
+phy_chain_tx_polarity_flip_physical{56.0}=0x0
+phy_chain_tx_polarity_flip_physical{57.0}=0x0
+phy_chain_tx_polarity_flip_physical{58.0}=0x1
+phy_chain_tx_polarity_flip_physical{59.0}=0x1
+phy_chain_tx_polarity_flip_physical{6.0}=0x1
+phy_chain_tx_polarity_flip_physical{60.0}=0x1
+phy_chain_tx_polarity_flip_physical{61.0}=0x0
+phy_chain_tx_polarity_flip_physical{62.0}=0x1
+phy_chain_tx_polarity_flip_physical{63.0}=0x1
+phy_chain_tx_polarity_flip_physical{64.0}=0x1
+phy_chain_tx_polarity_flip_physical{65.0}=0x0
+phy_chain_tx_polarity_flip_physical{66.0}=0x1
+phy_chain_tx_polarity_flip_physical{67.0}=0x1
+phy_chain_tx_polarity_flip_physical{68.0}=0x0
+phy_chain_tx_polarity_flip_physical{69.0}=0x1
+phy_chain_tx_polarity_flip_physical{7.0}=0x1
+phy_chain_tx_polarity_flip_physical{70.0}=0x1
+phy_chain_tx_polarity_flip_physical{71.0}=0x1
+phy_chain_tx_polarity_flip_physical{72.0}=0x0
+phy_chain_tx_polarity_flip_physical{73.0}=0x1
+phy_chain_tx_polarity_flip_physical{74.0}=0x0
+phy_chain_tx_polarity_flip_physical{75.0}=0x0
+phy_chain_tx_polarity_flip_physical{76.0}=0x0
+phy_chain_tx_polarity_flip_physical{77.0}=0x0
+phy_chain_tx_polarity_flip_physical{78.0}=0x0
+phy_chain_tx_polarity_flip_physical{79.0}=0x1
+phy_chain_tx_polarity_flip_physical{8.0}=0x0
+phy_chain_tx_polarity_flip_physical{80.0}=0x0
+phy_chain_tx_polarity_flip_physical{81.0}=0x1
+phy_chain_tx_polarity_flip_physical{82.0}=0x1
+phy_chain_tx_polarity_flip_physical{83.0}=0x1
+phy_chain_tx_polarity_flip_physical{84.0}=0x0
+phy_chain_tx_polarity_flip_physical{85.0}=0x1
+phy_chain_tx_polarity_flip_physical{86.0}=0x0
+phy_chain_tx_polarity_flip_physical{87.0}=0x0
+phy_chain_tx_polarity_flip_physical{88.0}=0x0
+phy_chain_tx_polarity_flip_physical{89.0}=0x1
+phy_chain_tx_polarity_flip_physical{9.0}=0x0
+phy_chain_tx_polarity_flip_physical{90.0}=0x1
+phy_chain_tx_polarity_flip_physical{91.0}=0x1
+phy_chain_tx_polarity_flip_physical{92.0}=0x0
+phy_chain_tx_polarity_flip_physical{93.0}=0x0
+phy_chain_tx_polarity_flip_physical{94.0}=0x0
+phy_chain_tx_polarity_flip_physical{95.0}=0x0
+phy_chain_tx_polarity_flip_physical{96.0}=0x0
+phy_chain_tx_polarity_flip_physical{97.0}=0x0
+phy_chain_tx_polarity_flip_physical{98.0}=0x1
+phy_chain_tx_polarity_flip_physical{99.0}=0x1
+
+port_init_cl72_hg=1
+
+
+
+
+
+
+
+robust_hash_disable_egress_vlan=1
+robust_hash_disable_mpls=1
+robust_hash_disable_vlan=1
+stable_size=0x5500000
+stable_size=0x5500000
+tdma_timeout_usec=15000000
+tslam_timeout_usec=15000000
+dport_map_direct=1
+portmap_1=5:50
+portmap_2=7:50
+portmap_3=13:50
+portmap_4=15:50
+portmap_5=25:50
+portmap_6=27:50
+portmap_7=21:50
+portmap_8=23:50
+portmap_9=37:50
+portmap_10=39:50
+portmap_11=45:50
+portmap_12=47:50
+portmap_13=57:100
+portmap_14=53:100
+portmap_15=9:50
+portmap_16=11:50
+portmap_17=1:50
+portmap_18=3:50
+portmap_19=17:50
+portmap_20=19:50
+portmap_21=29:50
+portmap_22=31:50
+portmap_23=41:50
+portmap_24=43:50
+portmap_25=33:50
+portmap_26=35:50
+portmap_27=49:50
+portmap_28=51:50
+portmap_29=61:50
+portmap_30=63:50
+portmap_34=77:100
+portmap_35=65:100
+portmap_38=85:50
+portmap_39=87:50
+portmap_40=89:50
+portmap_41=91:50
+portmap_42=109:50
+portmap_43=111:50
+portmap_44=97:50
+portmap_45=99:50
+portmap_46=117:100
+portmap_47=121:100
+portmap_48=69:50
+portmap_49=71:50
+portmap_50=73:50
+portmap_51=75:50
+portmap_52=93:50
+portmap_53=95:50
+portmap_54=81:50
+portmap_55=83:50
+portmap_56=101:50
+portmap_57=103:50
+portmap_58=105:50
+portmap_59=107:50
+portmap_60=125:50
+portmap_61=127:50
+portmap_62=113:50
+portmap_63=115:50
+portmap_66=257:10
+portmap_68=141:100
+portmap_69=133:100
+portmap_70=149:50
+portmap_71=151:50
+portmap_72=153:50
+portmap_73=155:50
+portmap_74=173:50
+portmap_75=175:50
+portmap_76=161:50
+portmap_77=163:50
+portmap_78=181:50
+portmap_79=183:50
+portmap_80=185:50
+portmap_81=187:50
+portmap_82=129:50
+portmap_83=131:50
+portmap_84=137:50
+portmap_85=139:50
+portmap_86=157:50
+portmap_87=159:50
+portmap_88=145:50
+portmap_89=147:50
+portmap_90=165:50
+portmap_91=167:50
+portmap_92=169:50
+portmap_93=171:50
+portmap_94=189:50
+portmap_95=191:50
+portmap_96=177:50
+portmap_97=179:50
+portmap_100=259:10
+portmap_102=197:100
+portmap_103=205:100
+portmap_104=217:50
+portmap_105=219:50
+portmap_106=213:50
+portmap_107=215:50
+portmap_108=229:50
+portmap_109=231:50
+portmap_110=237:50
+portmap_111=239:50
+portmap_112=249:50
+portmap_113=251:50
+portmap_114=245:50
+portmap_115=247:50
+portmap_116=201:50
+portmap_117=203:50
+portmap_118=193:50
+portmap_119=195:50
+portmap_120=209:50
+portmap_121=211:50
+portmap_122=221:50
+portmap_123=223:50
+portmap_124=233:50
+portmap_125=235:50
+portmap_126=225:50
+portmap_127=227:50
+portmap_128=241:50
+portmap_129=243:50
+portmap_130=253:50
+portmap_131=255:50
+
+# tuning parameters
+serdes_preemphasis_1=0x580c
+serdes_preemphasis_2=0x580c
+serdes_preemphasis_3=0x580c
+serdes_preemphasis_4=0x580c
+serdes_preemphasis_5=0x580c
+serdes_preemphasis_6=0x580c
+serdes_preemphasis_7=0x580c
+serdes_preemphasis_8=0x580c
+serdes_preemphasis_9=0x580c
+serdes_preemphasis_10=0x580c
+serdes_preemphasis_11=0x580c
+serdes_preemphasis_12=0x580c
+serdes_preemphasis_13=0x83404
+serdes_preemphasis_14=0x83404
+serdes_preemphasis_15=0x580c
+serdes_preemphasis_16=0x580c
+serdes_preemphasis_17=0x580c
+serdes_preemphasis_18=0x580c
+serdes_preemphasis_19=0x580c
+serdes_preemphasis_20=0x580c
+serdes_preemphasis_21=0x580c
+serdes_preemphasis_22=0x580c
+serdes_preemphasis_23=0x580c
+serdes_preemphasis_24=0x580c
+serdes_preemphasis_25=0x580c
+serdes_preemphasis_26=0x580c
+serdes_preemphasis_27=0x580c
+serdes_preemphasis_28=0x580c
+serdes_preemphasis_29=0x580c
+serdes_preemphasis_30=0x580c
+serdes_preemphasis_34=0xf3d05
+serdes_preemphasis_35=0xd3804
+serdes_preemphasis_38=0x580c
+serdes_preemphasis_39=0x580c
+serdes_preemphasis_40=0x580c
+serdes_preemphasis_41=0x580c
+serdes_preemphasis_42=0x580c
+serdes_preemphasis_43=0x580c
+serdes_preemphasis_44=0x580c
+serdes_preemphasis_45=0x580c
+serdes_preemphasis_46=0xb3604
+serdes_preemphasis_47=0x72b03
+serdes_preemphasis_48=0x580c
+serdes_preemphasis_49=0x580c
+serdes_preemphasis_50=0x580c
+serdes_preemphasis_51=0x580c
+serdes_preemphasis_52=0x580c
+serdes_preemphasis_53=0x580c
+serdes_preemphasis_54=0x580c
+serdes_preemphasis_55=0x580c
+serdes_preemphasis_56=0x580c
+serdes_preemphasis_57=0x580c
+serdes_preemphasis_58=0x580c
+serdes_preemphasis_59=0x580c
+serdes_preemphasis_60=0x580c
+serdes_preemphasis_61=0x580c
+serdes_preemphasis_62=0x580c
+serdes_preemphasis_63=0x580c
+serdes_preemphasis_66=0x43004
+serdes_preemphasis_68=0xf4006
+serdes_preemphasis_69=0xf4006
+serdes_preemphasis_70=0x580c
+serdes_preemphasis_71=0x580c
+serdes_preemphasis_72=0x580c
+serdes_preemphasis_73=0x580c
+serdes_preemphasis_74=0x580c
+serdes_preemphasis_75=0x580c
+serdes_preemphasis_76=0x580c
+serdes_preemphasis_77=0x580c
+serdes_preemphasis_78=0x580c
+serdes_preemphasis_79=0x580c
+serdes_preemphasis_80=0x580c
+serdes_preemphasis_81=0x580c
+serdes_preemphasis_82=0x580c
+serdes_preemphasis_83=0x580c
+serdes_preemphasis_84=0x580c
+serdes_preemphasis_85=0x580c
+serdes_preemphasis_86=0x580c
+serdes_preemphasis_87=0x580c
+serdes_preemphasis_88=0x580c
+serdes_preemphasis_89=0x580c
+serdes_preemphasis_90=0x580c
+serdes_preemphasis_91=0x580c
+serdes_preemphasis_92=0x580c
+serdes_preemphasis_93=0x580c
+serdes_preemphasis_94=0x580c
+serdes_preemphasis_95=0x580c
+serdes_preemphasis_96=0x580c
+serdes_preemphasis_97=0x580c
+serdes_preemphasis_100=0x43004
+serdes_preemphasis_102=0xf3c05
+serdes_preemphasis_103=0xf3c05
+serdes_preemphasis_104=0x580c
+serdes_preemphasis_105=0x580c
+serdes_preemphasis_106=0x580c
+serdes_preemphasis_107=0x580c
+serdes_preemphasis_108=0x580c
+serdes_preemphasis_109=0x580c
+serdes_preemphasis_110=0x580c
+serdes_preemphasis_111=0x580c
+serdes_preemphasis_112=0x580c
+serdes_preemphasis_113=0x580c
+serdes_preemphasis_114=0x580c
+serdes_preemphasis_115=0x580c
+serdes_preemphasis_116=0x580c
+serdes_preemphasis_117=0x580c
+serdes_preemphasis_118=0x580c
+serdes_preemphasis_119=0x580c
+serdes_preemphasis_120=0x580c
+serdes_preemphasis_121=0x580c
+serdes_preemphasis_122=0x580c
+serdes_preemphasis_123=0x580c
+serdes_preemphasis_124=0x580c
+serdes_preemphasis_125=0x580c
+serdes_preemphasis_126=0x580c
+serdes_preemphasis_127=0x580c
+serdes_preemphasis_128=0x580c
+serdes_preemphasis_129=0x580c
+serdes_preemphasis_130=0x580c
+serdes_preemphasis_131=0x580c
+
+mmu_init_config="MSFT-TH2-Tier0"
+{{ IPinIP_sock }}
+phy_an_lt_msft=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/pg_profile_lookup.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/pg_profile_lookup.ini
new file mode 120000
index 000000000000..297cddb2d223
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/port_config.ini b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/port_config.ini
new file mode 100644
index 000000000000..1ea0f1d505a9
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/port_config.ini
@@ -0,0 +1,121 @@
+# name          lanes             alias        index  speed
+Ethernet0       77,78,79,80       Ethernet1/1  1      100000
+Ethernet4       65,66,67,68       Ethernet2/1  2      100000
+Ethernet8       85,86             Ethernet3/1  3      50000
+Ethernet10      87,88             Ethernet3/3  3      50000
+Ethernet12      89,90             Ethernet4/1  4      50000
+Ethernet14      91,92             Ethernet4/3  4      50000
+Ethernet16      109,110           Ethernet5/1  5      50000
+Ethernet18      111,112           Ethernet5/3  5      50000
+Ethernet20      97,98             Ethernet6/1  6      50000
+Ethernet22      99,100            Ethernet6/3  6      50000
+Ethernet24      5,6               Ethernet7/1  7      50000
+Ethernet26      7,8               Ethernet7/3  7      50000
+Ethernet28      13,14             Ethernet8/1  8      50000
+Ethernet30      15,16             Ethernet8/3  8      50000
+Ethernet32      25,26             Ethernet9/1  9      50000
+Ethernet34      27,28             Ethernet9/3  9      50000
+Ethernet36      21,22             Ethernet10/1 10     50000
+Ethernet38      23,24             Ethernet10/3 10     50000
+Ethernet40      37,38             Ethernet11/1 11     50000
+Ethernet42      39,40             Ethernet11/3 11     50000
+Ethernet44      45,46             Ethernet12/1 12     50000
+Ethernet46      47,48             Ethernet12/3 12     50000
+Ethernet48      57,58,59,60       Ethernet13/1 13     100000
+Ethernet52      53,54,55,56       Ethernet14/1 14     100000
+Ethernet56      117,118,119,120   Ethernet15/1 15     100000
+Ethernet60      121,122,123,124   Ethernet16/1 16     100000
+Ethernet64      141,142,143,144   Ethernet17/1 17     100000
+Ethernet68      133,134,135,136   Ethernet18/1 18     100000
+Ethernet72      197,198,199,200   Ethernet19/1 19     100000
+Ethernet76      205,206,207,208   Ethernet20/1 20     100000
+Ethernet80      217,218           Ethernet21/1 21     50000
+Ethernet82      219,220           Ethernet21/3 21     50000
+Ethernet84      213,214           Ethernet22/1 22     50000
+Ethernet86      215,216           Ethernet22/3 22     50000
+Ethernet88      229,230           Ethernet23/1 23     50000
+Ethernet90      231,232           Ethernet23/3 23     50000
+Ethernet92      237,238           Ethernet24/1 24     50000
+Ethernet94      239,240           Ethernet24/3 24     50000
+Ethernet96      249,250           Ethernet25/1 25     50000
+Ethernet98      251,252           Ethernet25/3 25     50000
+Ethernet100     245,246           Ethernet26/1 26     50000
+Ethernet102     247,248           Ethernet26/3 26     50000
+Ethernet104     149,150           Ethernet27/1 27     50000
+Ethernet106     151,152           Ethernet27/3 27     50000
+Ethernet108     153,154           Ethernet28/1 28     50000
+Ethernet110     155,156           Ethernet28/3 28     50000
+Ethernet112     173,174           Ethernet29/1 29     50000
+Ethernet114     175,176           Ethernet29/3 29     50000
+Ethernet116     161,162           Ethernet30/1 30     50000
+Ethernet118     163,164           Ethernet30/3 30     50000
+Ethernet120     181,182           Ethernet31/1 31     50000
+Ethernet122     183,184           Ethernet31/3 31     50000
+Ethernet124     185,186           Ethernet32/1 32     50000
+Ethernet126     187,188           Ethernet32/3 32     50000
+Ethernet128     69,70             Ethernet33/1 33     50000
+Ethernet130     71,72             Ethernet33/3 33     50000
+Ethernet132     73,74             Ethernet34/1 34     50000
+Ethernet134     75,76             Ethernet34/3 34     50000
+Ethernet136     93,94             Ethernet35/1 35     50000
+Ethernet138     95,96             Ethernet35/3 35     50000
+Ethernet140     81,82             Ethernet36/1 36     50000
+Ethernet142     83,84             Ethernet36/3 36     50000
+Ethernet144     101,102           Ethernet37/1 37     50000
+Ethernet146     103,104           Ethernet37/3 37     50000
+Ethernet148     105,106           Ethernet38/1 38     50000
+Ethernet150     107,108           Ethernet38/3 38     50000
+Ethernet152     9,10              Ethernet39/1 39     50000
+Ethernet154     11,12             Ethernet39/3 39     50000
+Ethernet156     1,2               Ethernet40/1 40     50000
+Ethernet158     3,4               Ethernet40/3 40     50000
+Ethernet160     17,18             Ethernet41/1 41     50000
+Ethernet162     19,20             Ethernet41/3 41     50000
+Ethernet164     29,30             Ethernet42/1 42     50000
+Ethernet166     31,32             Ethernet42/3 42     50000
+Ethernet168     41,42             Ethernet43/1 43     50000
+Ethernet170     43,44             Ethernet43/3 43     50000
+Ethernet172     33,34             Ethernet44/1 44     50000
+Ethernet174     35,36             Ethernet44/3 44     50000
+Ethernet176     49,50             Ethernet45/1 45     50000
+Ethernet178     51,52             Ethernet45/3 45     50000
+Ethernet180     61,62             Ethernet46/1 46     50000
+Ethernet182     63,64             Ethernet46/3 46     50000
+Ethernet184     125,126           Ethernet47/1 47     50000
+Ethernet186     127,128           Ethernet47/3 47     50000
+Ethernet188     113,114           Ethernet48/1 48     50000
+Ethernet190     115,116           Ethernet48/3 48     50000
+Ethernet192     129,130           Ethernet49/1 49     50000
+Ethernet194     131,132           Ethernet49/3 49     50000
+Ethernet196     137,138           Ethernet50/1 50     50000
+Ethernet198     139,140           Ethernet50/3 50     50000
+Ethernet200     201,202           Ethernet51/1 51     50000
+Ethernet202     203,204           Ethernet51/3 51     50000
+Ethernet204     193,194           Ethernet52/1 52     50000
+Ethernet206     195,196           Ethernet52/3 52     50000
+Ethernet208     209,210           Ethernet53/1 53     50000
+Ethernet210     211,212           Ethernet53/3 53     50000
+Ethernet212     221,222           Ethernet54/1 54     50000
+Ethernet214     223,224           Ethernet54/3 54     50000
+Ethernet216     233,234           Ethernet55/1 55     50000
+Ethernet218     235,236           Ethernet55/3 55     50000
+Ethernet220     225,226           Ethernet56/1 56     50000
+Ethernet222     227,228           Ethernet56/3 56     50000
+Ethernet224     241,242           Ethernet57/1 57     50000
+Ethernet226     243,244           Ethernet57/3 57     50000
+Ethernet228     253,254           Ethernet58/1 58     50000
+Ethernet230     255,256           Ethernet58/3 58     50000
+Ethernet232     157,158           Ethernet59/1 59     50000
+Ethernet234     159,160           Ethernet59/3 59     50000
+Ethernet236     145,146           Ethernet60/1 60     50000
+Ethernet238     147,148           Ethernet60/3 60     50000
+Ethernet240     165,166           Ethernet61/1 61     50000
+Ethernet242     167,168           Ethernet61/3 61     50000
+Ethernet244     169,170           Ethernet62/1 62     50000
+Ethernet246     171,172           Ethernet62/3 62     50000
+Ethernet248     189,190           Ethernet63/1 63     50000
+Ethernet250     191,192           Ethernet63/3 63     50000
+Ethernet252     177,178           Ethernet64/1 64     50000
+Ethernet254     179,180           Ethernet64/3 64     50000
+Ethernet256     257               Ethernet65   65     10000
+Ethernet260     259               Ethernet66   66     10000
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/qos.json.j2
new file mode 120000
index 000000000000..aef6b6765cf2
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/qos.json.j2
@@ -0,0 +1 @@
+BALANCED/qos.json.j2
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/sai.profile b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/sai.profile
new file mode 100644
index 000000000000..5163d6140f0e
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
+SAI_NUM_ECMP_MEMBERS=64

From d3a83cf8c7cc5c5ef2d125a92298a235c52dccf1 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:54:24 +0800
Subject: [PATCH 1518/1674] [Bug] Fix SONiC installation failure caused by
 pip/pip3 not found (#13284)

The main issue is the pip/pip3 command cannot be found when the package is being installed by apt-get.
When using the dpkg install, the searching path is PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
When using the apt-get install, the searching path is PATH=/usr/sbin:/usr/bin:/sbin:/bin
But the pip/pip3 default path is at /usr/local/bin, so dpkg works, but apt-get not work.

How I did it
Export the path /usr/local/bin for pip/pip3.
Make the deb packages can be installed by apt-get.
---
 files/image_config/platform/rc.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index b0a1fecaecfc..68f15df7cb91 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -292,7 +292,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
             mv /etc/apt/sources.list /etc/apt/sources.list.rc-local
             echo "deb [trusted=yes] file:///host/image-$SONIC_VERSION/platform/common /" > /etc/apt/sources.list.d/sonic_debian_extension.list
             LANG=C DEBIAN_FRONTEND=noninteractive apt-get update
-            LANG=C DEBIAN_FRONTEND=noninteractive apt-get -y install /host/image-$SONIC_VERSION/platform/$platform/*.deb
+            LANG=C DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Path=$PATH:/usr/local/bin -y install /host/image-$SONIC_VERSION/platform/$platform/*.deb
             # Cleanup
             rm -f /etc/apt/sources.list.d/sonic_debian_extension.list
             rm -f /var/lib/apt/lists/_host_image-${SONIC_VERSION}_platform_common_Packages.lz4

From 94c689fa586c03a14a2465d77fea14e57b5fca46 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 13 Jan 2023 13:56:19 -0800
Subject: [PATCH 1519/1674] Advance sonic-utilities submodule pointer (#13360)

This PR includes the following commits
```
b44e153 [202012]Revert "[config reload]: On dual ToR systems, cache ARP and FDB table (sonic-net/sonic-utilities#2490)
59f3025 Use github code scanning instead of LGTM (sonic-net/sonic-utilities#2530)
678df5d [202012] avoid printing error if no neighbors are present  (sonic-net/sonic-utilities#2594)
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index f0fc333e735d..678df5d6ccbb 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit f0fc333e735d9cd27d98cdddaa64cf46ccbfd83d
+Subproject commit 678df5d6ccbb173cbf3318b2df99cd9f6aa0c97f

From 5193a96895ac9ab483239b0da9c140e94997b681 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Mon, 16 Jan 2023 15:27:48 +0200
Subject: [PATCH 1520/1674] [202012][Mellanox]: Update ONiE FW tool: manual
 reboot control. (#13359)

Partial cherry-pick of: [Mellanox] Modified Platform API to support all firmware updates in single boot #9608

- Why I did it
To allow user manual reboot control over ONiE FW upgrade

- How I did it
Added a dedicated script argument handling

- How to verify it
mlnx-onie-fw-update.sh update --no-reboot

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 platform/mellanox/mlnx-onie-fw-update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/mellanox/mlnx-onie-fw-update.sh b/platform/mellanox/mlnx-onie-fw-update.sh
index 0abc55ef76b4..27ba6bf39c9a 100755
--- a/platform/mellanox/mlnx-onie-fw-update.sh
+++ b/platform/mellanox/mlnx-onie-fw-update.sh
@@ -174,6 +174,10 @@ case "${cmd}" in
             rc=$?
             disable_onie_access
             if [[ ${rc} -eq 0 ]]; then
+                if [[ "${arg}" == "--no-reboot" ]]; then
+                    echo "INFO: ONIE firmware update successfully STAGED for install at NEXT reboot. Please reboot manually to complete installation"
+                    exit 0
+                fi
                 system_reboot
             else
                 echo "ERROR: failed to enable ONIE firmware update mode"

From a569bfc9ebeee4bc7df3df25c603684041b3a7c1 Mon Sep 17 00:00:00 2001
From: Kebo Liu <kebol@nvidia.com>
Date: Wed, 18 Jan 2023 05:21:31 +0800
Subject: [PATCH 1521/1674] skip hw reboot cause if warm/fast reboot found from
 the proc cmdline (#13378)

#### Why I did it
Backport https://github.com/sonic-net/sonic-buildimage/pull/13246 to 202012 branch.

In case of warm/fast reboot, the hardware reboot cause will NOT be cleared because CPLD will not be touched in this flow. To not confuse the reboot cause determine logic, the leftover hardware reboot cause shall be skipped by the platform API, platform API will return the 'REBOOT_CAUSE_NON_HARDWARE' instead of the "hardware" reboot cause.

#### How I did it

Check the proc cmdline to see whether the last reboot is a warm or fast reboot, if yes skip checking the leftover hardware reboot cause.

#### How to verify it

a. Manual test:
> 1. Perform a power loss
> 2. Perform a warm/fast reboot
> 3. check the reboot cause should be "warm-reboot" or "fast-reboot" instead of "power loss"

b. Run reboot cause related regression test.
---
 .../sonic_platform/chassis.py                 | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
index 2d4267379101..eb02b6359d5d 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
@@ -13,6 +13,7 @@
     from sonic_py_common.logger import Logger
     from os import listdir
     from os.path import isfile, join
+    from . import utils
     import sys
     import io
     import re
@@ -38,6 +39,10 @@
 
 REBOOT_CAUSE_FILE_LENGTH = 1
 
+REBOOT_TYPE_KEXEC_FILE = "/proc/cmdline"
+REBOOT_TYPE_KEXEC_PATTERN_WARM = ".*SONIC_BOOT_TYPE=(warm|fastfast).*"
+REBOOT_TYPE_KEXEC_PATTERN_FAST = ".*SONIC_BOOT_TYPE=(fast|fast-reboot).*"
+
 # Global logger class instance
 logger = Logger()
 
@@ -350,6 +355,17 @@ def _verify_reboot_cause(self, filename):
         '''
         return bool(int(self._read_generic_file(join(REBOOT_CAUSE_ROOT, filename), REBOOT_CAUSE_FILE_LENGTH).rstrip('\n')))
 
+    def _parse_warmfast_reboot_from_proc_cmdline(self):
+        if isfile(REBOOT_TYPE_KEXEC_FILE):
+            with open(REBOOT_TYPE_KEXEC_FILE) as cause_file:
+                cause_file_kexec = cause_file.readline()
+            m = re.search(REBOOT_TYPE_KEXEC_PATTERN_WARM, cause_file_kexec)
+            if m and m.group(1):
+                return 'warm-reboot'
+            m = re.search(REBOOT_TYPE_KEXEC_PATTERN_FAST, cause_file_kexec)
+            if m and m.group(1):
+                return 'fast-reboot'
+        return None
 
     def initialize_reboot_cause(self):
         self.reboot_major_cause_dict = {
@@ -388,6 +404,13 @@ def get_reboot_cause(self):
             is "REBOOT_CAUSE_HARDWARE_OTHER", the second string can be used
             to pass a description of the reboot cause.
         """
+        # To avoid the leftover hardware reboot cause confusing the reboot cause determine service
+        # Skip the hardware reboot cause check if warm/fast reboot cause found from cmdline
+        if utils.is_host():
+            reboot_cause = self._parse_warmfast_reboot_from_proc_cmdline()
+            if reboot_cause:
+                return self.REBOOT_CAUSE_NON_HARDWARE, ''
+
         #read reboot causes files in the following order
         if not self.reboot_cause_initialized:
             self.initialize_reboot_cause()

From b500e0ef5a19f491b4f218aa5540f3f43481a230 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Tue, 17 Jan 2023 16:37:19 -0800
Subject: [PATCH 1522/1674] [Submodule] Update for sonic-swss (#13405)

#### Why I did it

Update for following swss commits:

96180bf - 2023-01-13 : [202012] Bfd default multiplier change  (#2615) [siqbal1986]
07506ac - 2023-01-11 : Add missing parameter to on_switch_shutdown_request method. (#2567) [Hua Liu]
3253cc8 - 2022-11-30 : Use github code scanning instead of LGTM (#2546) [Liu Shilong]
f4df524 - 2023-01-11 : [orchagent]:add local_discriminator to state_db (#2587) [Baorong Liu]
f3cd02d - 2022-12-05 : [202012][muxorch] Adding case for maintaining current state (#2500) [Nikola Dancejic]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index cc28bf81bdcf..96180bf58a7a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit cc28bf81bdcf1a5ef49db987b248f7bef300f275
+Subproject commit 96180bf58a7aa53a612667d507d1e0379caa8dfa

From 21ad9876a33c24b173aa1f0d0ef43266c2771ad0 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 18 Jan 2023 11:10:28 -0800
Subject: [PATCH 1523/1674] [Submodule] Update swss-common (#13406)

Swss-common submodule update:
c5ed58a - 2023-01-17 : 202012 cast of PR sonic-net/sonic-swss-common#725 (#738) [siqbal1986]
fe28725 - 2022-11-30 : Use github code scanning instead of LGTM (#718) [Liu Shilong]
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 30aa38c167c3..c5ed58ae1fc2 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 30aa38c167c34b727e31db6b0e317647e7ff47b7
+Subproject commit c5ed58ae1fc2ffb6ca6fbcef95403c8c6dabf78a

From 46a774e2949ca04f7e49ff304ab1937086a62231 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 19 Jan 2023 23:29:41 +0800
Subject: [PATCH 1524/1674] [202012] [Mellanox] Fix select timeout in sfp event
 (#13347)

- Why I did it
Backport #9795
Python select.select accept a optional timeout value in seconds, however, the value passes to it is a value in millisecond.

- How I did it
Transfer the value to millisecond.

- How to verify it
Manual test
---
 platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
index faf3859f49cd..4e6b83681e95 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
@@ -217,7 +217,7 @@ def check_sfp_status(self, port_change, timeout):
         found = 0
 
         try:
-            read, _, _ = select.select([self.rx_fd_p.fd], [], [], timeout)
+            read, _, _ = select.select([self.rx_fd_p.fd], [], [], float(timeout) / 1000)
         except select.error as err:
             rc, msg = err
             if rc == errno.EAGAIN or rc == errno.EINTR:

From 2357eeef46a0710bc8567f1aaf2d5c3bbf536a7d Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Thu, 19 Jan 2023 09:13:51 -0800
Subject: [PATCH 1525/1674] [cisco]: Update cisco-8000.ini (#13425)

1.57.x SDK based incremental drop that addresses:
1) orchagent crash
2) Port LED issue
3) Tunnel endpoint stats
4) test_warm_reboot issue
5) nhop test failure
6) "show platform versions' CLI
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 799d241e8d65..4242fabe2e7c 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.121
+ref=202012-v0.2.4

From 607cbdefd3dc048f2201df8d6e68710758d997de Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Thu, 19 Jan 2023 08:27:48 +0800
Subject: [PATCH 1526/1674] [Celestica Seastone] fix multi sonic platform
 issues (#13356)

Why I did it
Fix the following issues for Seastone platform:

- system-health issue: show system-health detail will not complete #9530, Celestica Seastone DX010-C32: show system-health detail fails with 'Chassis' object has no attribute 'initizalize_system_led' #11322
- show platform firmware updates issue: Celestica Seastone DX010-C32: show platform firmware updates #11317
- other platform optimization

How I did it
Modify and optimize the platform implememtation.

How to verify it
Manual run the test commands described in these issues.
---
 .../platform_components.json                     |  5 +++--
 .../sonic_platform/chassis.py                    | 16 ++++++++++++++--
 .../sonic_platform/component.py                  |  6 ++++--
 .../x86_64-cel_seastone-r0/sonic_platform/psu.py |  2 +-
 .../system_health_monitoring_config.json         |  8 +++-----
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform_components.json b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
index cd89d358d46f..8df07b1320ce 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform_components.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
@@ -1,13 +1,14 @@
 {
     "chassis": {
-        "Celestica-DX010-C32": {
+        "Seastone-DX010": {
             "component": {
                 "CPLD1": {},
                 "CPLD2": {},
                 "CPLD3": {},
                 "CPLD4": {},
+                "CPLD5": {},
                 "BIOS": {}
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
index 8a9ed17139df..3f61ef139b2d 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
@@ -20,7 +20,7 @@
 NUM_PSU = 2
 NUM_THERMAL = 5
 NUM_SFP = 32
-NUM_COMPONENT = 5
+NUM_COMPONENT = 6
 RESET_REGISTER = "0x103"
 HOST_REBOOT_CAUSE_PATH = "/host/reboot-cause/"
 REBOOT_CAUSE_FILE = "reboot-cause.txt"
@@ -44,6 +44,7 @@ def __init__(self):
         self.__initialize_psu()
         self.__initialize_thermals()
         self.__initialize_components()
+        self.__initialize_system_led()
 
     def __initialize_sfp(self):
         sfputil_helper = SfpUtilHelper()
@@ -86,6 +87,9 @@ def __initialize_components(self):
             component = Component(index)
             self._component_list.append(component)
 
+    def __initialize_system_led(self):
+        self.set_status_led(self.STATUS_LED_COLOR_GREEN)
+
     def __get_air_flow(self):
         air_flow_path = '/usr/share/sonic/device/{}/fan_airflow'.format(
             self._api_helper.platform) \
@@ -317,6 +321,14 @@ def is_replaceable(self):
         """
         return False
 
+    def initizalize_system_led(self):
+        """
+        This function is not defined in chassis base class,
+        system-health command would invoke chassis.initizalize_system_led(),
+        add this stub function just to let the command sucessfully execute
+        """
+        pass
+
     def set_status_led(self, color):
         """
         Sets the state of the PSU status LED
@@ -345,7 +357,7 @@ def get_status_led(self):
         """
         status = self._api_helper.read_txt_file(STATUS_LED_PATH)
         status_str = {
-            '255': self.STATUS_LED_COLOR_GREEN,
+            '1': self.STATUS_LED_COLOR_GREEN,
             '0': self.STATUS_LED_COLOR_OFF
         }.get(status, None)
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
index 782708025ab6..03f879805a5e 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
@@ -25,9 +25,11 @@
 }
 GETREG_PATH = "/sys/devices/platform/dx010_cpld/getreg"
 BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
-COMPONENT_NAME_LIST = ["CPLD1", "CPLD2", "CPLD3", "CPLD4", "BIOS"]
+COMPONENT_NAME_LIST = ["CPLD1", "CPLD2", "CPLD3", "CPLD4", "CPLD5", "BIOS"]
 COMPONENT_DES_LIST = ["Used for managing the CPU",
-                      "Used for managing QSFP+ ports (1-10)", "Used for managing QSFP+ ports (11-20)", "Used for managing QSFP+ ports (22-32)", "Basic Input/Output System"]
+                      "Used for managing QSFP+ ports (1-10)", "Used for managing QSFP+ ports (11-21)",
+                      "Used for misc status and control", "Used for managing QSFP+ ports (22-32)",
+                      "Basic Input/Output System"]
 
 
 class Component(ComponentBase):
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
index 7dd647be4e2c..8f3b561fd18e 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/psu.py
@@ -197,7 +197,7 @@ def set_status_led(self, color):
         """
 
         set_status_str = {
-            self.STATUS_LED_COLOR_GREEN: '1',
+            self.STATUS_LED_COLOR_GREEN: '255',
             self.STATUS_LED_COLOR_OFF: '0'
         }.get(color, None)
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json b/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
index 4dc38d035ab4..c18399188153 100644
--- a/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
+++ b/device/celestica/x86_64-cel_seastone-r0/system_health_monitoring_config.json
@@ -1,10 +1,8 @@
 {
     "services_to_ignore": [],
     "devices_to_ignore": [
-        "asic",
-        "psu.temperature",
-        "PSU2 Fan",
-        "PSU1 Fan"
+        "PSU-1 FAN-1",
+        "PSU-2 FAN-1"
     ],
     "user_defined_checkers": [],
     "polling_interval": 60,
@@ -13,4 +11,4 @@
         "normal": "green",
         "booting": "orange_blink"
     }
-}
\ No newline at end of file
+}

From 027c831be740dc941f8bccfb5d3c9ab8058d507a Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 19 Jan 2023 11:08:21 -0800
Subject: [PATCH 1527/1674] [Arista] add support for hardware sku
 Arista-7260CX3-D92C16 (#13438)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D92C16 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D92C16

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D92C16 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D92C16
new file mode 120000
index 000000000000..fd5bbe75f37c
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D92C16
@@ -0,0 +1 @@
+Arista-7260CX3-D96C16
\ No newline at end of file

From 025e77bb5de70033594f1a94a7f6da60062ed0a7 Mon Sep 17 00:00:00 2001
From: "Richard.Yu" <richard.yu@microsoft.com>
Date: Fri, 20 Jan 2023 03:30:40 +0800
Subject: [PATCH 1528/1674] [202012] Update SAI version to 4.3.7.1-7 (#13431)

CS00012254651 (SONIC-66820) Fix missing break stmt

Verify

run case test_forward_ip_packet_with_0xffff_chksum_tolerant

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
---
 platform/broadcom/sai.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 1e0d85f106c3..fb96cf54e838 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,5 +1,5 @@
-LIBSAIBCM_XGS_VERSION = 4.3.7.1-6
-LIBSAIBCM_BRANCH_NAME = REL_4.3.5.2
+LIBSAIBCM_XGS_VERSION = 4.3.7.1-7
+LIBSAIBCM_BRANCH_NAME = REL_4.3_202012
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
 
 BRCM_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb

From 6ff7c755974a563b60021c3800cadaa024f2b97c Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Wed, 25 Jan 2023 15:24:11 -0800
Subject: [PATCH 1529/1674] [PATCH]: Update FRR patch 0009 to avoid
 inappropriate error messages (#12912) (#13423)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…(#12912)

Why I did it
As described in detail in #12753, the current FRR patch 0009-ignore-route-from-default-table.patch is causing unwanted FRR/zebra error logs. This change gets rid of the error messages for routes from kernel default table while these routes are ignored in prefix encoding.

How I did it
This fix updates the original 0009 patch by checking if the routes are from table default before printing the error logs. The original patch checks the same condition and ignores the routes from table default in prefix encoding.

How to verify it
Follow the steps to repro as described in #12753.
Also verify the test case ipfwd/test_nhop_count.py no longer fails due to the error messages.

#### Why I did it
Resolve cherry-pick conflict for https://github.com/sonic-net/sonic-buildimage/pull/12912
---
 ...0009-ignore-route-from-default-table.patch | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch b/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch
index 850c2a6dbeaa..e60bbdd9a5a9 100644
--- a/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch
+++ b/src/sonic-frr/patch/0009-ignore-route-from-default-table.patch
@@ -1,15 +1,42 @@
-From 96dadc6719dafdd7d58e715f59e0d1a8edc3d58f Mon Sep 17 00:00:00 2001
-From: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
-Date: Wed, 7 Sep 2022 23:59:03 +0000
-Subject: [PATCH] ignore route from default table
+commit 8b78a43ba243df281f2096a84893ad87cb2a79ff
+Author: Stephen Xu <stexu@linkedin.com>
+Date:   Wed Nov 16 16:07:37 2022 -0500
 
-Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
----
- zebra/zebra_fpm_netlink.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+    [PATCH] ignore route from default table
 
+    Signed-off-by: Stephen Xu <stexu@linkedin.com>
+
+diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
+index 43958fdfd..de7e246d4 100644
+--- a/zebra/zebra_fpm.c
++++ b/zebra/zebra_fpm.c
+@@ -25,6 +25,7 @@
+ 
+ #include "log.h"
+ #include "libfrr.h"
++#include "rib.h"
+ #include "stream.h"
+ #include "thread.h"
+ #include "network.h"
+@@ -1016,8 +1017,15 @@ static int zfpm_build_route_updates(void)
+ 				else
+ 					zfpm_g->stats.route_dels++;
+ 			} else {
+-				zlog_err("%s: Encoding Prefix: %pRN No valid nexthops",
+-					 __func__, dest->rnode);
++				struct rib_table_info *table_info =
++				    rib_table_info(rib_dest_table(dest));
++				if (table_info && table_info->table_id == RT_TABLE_DEFAULT) {
++					zfpm_debug("%s: Skip encoding default table prefix: %pRN",
++						   __func__, dest->rnode);
++				} else {
++					zlog_err("%s: Encoding Prefix: %pRN No valid nexthops",
++						 __func__, dest->rnode);
++				}
+ 			}
+ 		}
+ 
 diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
-index 60ea7f97e..c6a2edf03 100644
 --- a/zebra/zebra_fpm_netlink.c
 +++ b/zebra/zebra_fpm_netlink.c
 @@ -284,6 +284,14 @@ static int netlink_route_info_fill(struct netlink_route_info *ri, int cmd,

From 467e01cbdbe014587c689d7e7bac903b4dd92935 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 25 Jan 2023 18:49:50 -0800
Subject: [PATCH 1530/1674] [202012][swss] advance submodule head (#13519)

swss:
* f28d6622 2023-01-25 | [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (#2484) (#2639) (github/202012, 202012) [Ying Xie]
* 217f7f00 2023-01-21 | Cherry pick of https://github.com/sonic-net/sonic-swss/pull/2589 (#2627) [siqbal1986]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 96180bf58a7a..f28d6622ffa5 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 96180bf58a7aa53a612667d507d1e0379caa8dfa
+Subproject commit f28d6622ffa50d7a7c10dedb566afd40dce9a0b3

From 7448f7bc2d0fee8231c96dd76cd75471cf65b9d4 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 27 Jan 2023 16:27:55 -0800
Subject: [PATCH 1531/1674] [submodule] update for sonic-swss and sonic-restapi
 (#13531)

#### Why I did it

Update submodule for sonic-swss:

e739e6c - 2023-01-27 : custom advertised prefix for primary vxlan tunnel [202012]  (#2641) [siqbal1986]

sonic-restapi:
99c467d - 2023-01-24 : Add API support for adv prefix and custom monitoring (#133) [Prince Sunny]
347684a - 2022-11-30 : Use github code scanning instead of LGTM (#132) [Liu Shilong]
---
 src/sonic-restapi | 2 +-
 src/sonic-swss    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 86543d0db544..99c467d8e727 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 86543d0db544362bb27912ed40449920c3d7c0d1
+Subproject commit 99c467d8e727775085fbf962e2c3d9f9886b8161
diff --git a/src/sonic-swss b/src/sonic-swss
index f28d6622ffa5..e739e6c9cb06 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit f28d6622ffa50d7a7c10dedb566afd40dce9a0b3
+Subproject commit e739e6c9cb065795d4f318a7ab4b747f727b9719

From 1354033f9025dca7ee6e293cdb85e751ff834ca4 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 30 Jan 2023 09:51:06 -0800
Subject: [PATCH 1532/1674] [dhcpmon] Fix dhcpmon socket filter and tx count
 issue (#13065) (#13441)

Why I did it
Fix issue caused by dualtor support PR [dhcpmon] Open different socket for dual tor to enable interface filtering #11201
Improve code
How I did it
On single ToR, packets received count was duplicated due to socket filter set to "inbound"
Tx count not increasing due to filter set to "inbound". Added an outbound socket to count tx packets
Added vlan member interface mapping for Ethernet interface to vlan interface lookup in reference to PR Fix multiple vlan issue sonic-dhcp-relay#27
Exit when socket fails to initialize to allow dhcp_relay docker to restart
How to verify it
Tested on vstestbed single tor and dual tor, sent packets and verify printed out dhcpmon rx and tx counters is correct

Correct number of tx increases
Tx does not increase when ToR is on standby
---
 src/dhcpmon/src/dhcp_device.cpp | 316 ++++++++++++++++++--------------
 src/dhcpmon/src/dhcp_device.h   |   8 +-
 2 files changed, 184 insertions(+), 140 deletions(-)

diff --git a/src/dhcpmon/src/dhcp_device.cpp b/src/dhcpmon/src/dhcp_device.cpp
index 8ec91b057b64..f4f23526e136 100644
--- a/src/dhcpmon/src/dhcp_device.cpp
+++ b/src/dhcpmon/src/dhcp_device.cpp
@@ -41,6 +41,7 @@
 #define DHCP_OPTIONS_HEADER_SIZE 240
 /** Offset of DHCP GIADDR */
 #define DHCP_GIADDR_OFFSET 24
+#define CLIENT_IF_PREFIX "Ethernet"
 
 #define OP_LDHA     (BPF_LD  | BPF_H   | BPF_ABS)   /** bpf ldh Abs */
 #define OP_LDHI     (BPF_LD  | BPF_H   | BPF_IND)   /** bpf ldh Ind */
@@ -51,19 +52,54 @@
 #define OP_JSET     (BPF_JMP | BPF_JSET | BPF_K)    /** bpf jset */
 #define OP_LDXB     (BPF_LDX | BPF_B    | BPF_MSH)  /** bpf ldxb */
 
+std::shared_ptr<swss::DBConnector> mConfigDbPtr = std::make_shared<swss::DBConnector> ("CONFIG_DB", 0);
 std::shared_ptr<swss::DBConnector> mStateDbPtr = std::make_shared<swss::DBConnector> ("STATE_DB", 0);
 std::shared_ptr<swss::Table> mStateDbMuxTablePtr = std::make_shared<swss::Table> (
             mStateDbPtr.get(), "HW_MUX_CABLE_TABLE"
         );
-swss::DBConnector configDb("CONFIG_DB", 0);
+
+/* interface to vlan mapping */
+std::unordered_map<std::string, std::string> vlan_map;
+
+/** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
+ * This program is obtained using the following command tcpdump:
+ * `tcpdump -dd "outbound and udp and (port 67 or port 68)"`
+ */
+static struct sock_filter dhcp_outbound_bpf_code[] = {
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0xfffff004}, // (000) ldh      #fffff004
+    {.code = OP_JEQ,  .jt = 0,  .jf = 22, .k = 0x00000004}, // (001) jeq      #0x04            jt 0 jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (002) ldh      [12]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (003) jeq      #0x86dd          jt 2	jf 9
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (004) ldb      [20]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 18, .k = 0x00000011}, // (005) jeq      #0x11            jt 4	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000036}, // (006) ldh      [54]
+    {.code = OP_JEQ,  .jt = 15, .jf = 0,  .k = 0x00000043}, // (007) jeq      #0x43            jt 21	jf 6
+    {.code = OP_JEQ,  .jt = 14, .jf = 0,  .k = 0x00000044}, // (008) jeq      #0x44            jt 21	jf 7
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000038}, // (009) ldh      [56]
+    {.code = OP_JEQ,  .jt = 12, .jf = 11, .k = 0x00000043}, // (010) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 12, .k = 0x00000800}, // (011) jeq      #0x800           jt 10	jf 22
+    {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000017}, // (012) ldb      [23]
+    {.code = OP_JEQ,  .jt = 0,  .jf = 10, .k = 0x00000011}, // (013) jeq      #0x11            jt 12	jf 22
+    {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x00000014}, // (014) ldh      [20]
+    {.code = OP_JSET, .jt = 8,  .jf = 0,  .k = 0x00001fff}, // (015) jset     #0x1fff          jt 22	jf 14
+    {.code = OP_LDXB, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (016) ldxb     4*([14]&0xf)
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x0000000e}, // (017) ldh      [x + 14]
+    {.code = OP_JEQ,  .jt = 4,  .jf = 0,  .k = 0x00000043}, // (018) jeq      #0x43            jt 21	jf 17
+    {.code = OP_JEQ,  .jt = 3,  .jf = 0,  .k = 0x00000044}, // (019) jeq      #0x44            jt 21	jf 18
+    {.code = OP_LDHI, .jt = 0,  .jf = 0,  .k = 0x00000010}, // (020) ldh      [x + 16]
+    {.code = OP_JEQ,  .jt = 1,  .jf = 0,  .k = 0x00000043}, // (021) jeq      #0x43            jt 21	jf 20
+    {.code = OP_JEQ,  .jt = 0,  .jf = 1,  .k = 0x00000044}, // (022) jeq      #0x44            jt 21	jf 22
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00040000}, // (023) ret      #262144
+    {.code = OP_RET,  .jt = 0,  .jf = 0,  .k = 0x00000000}, // (024) ret      #0
+};
 
 /** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
  * This program is obtained using the following command tcpdump:
  * `tcpdump -dd "inbound and udp and (port 67 or port 68)"`
  */
-static struct sock_filter dhcp_bpf_code[] = {
+static struct sock_filter dhcp_inbound_bpf_code[] = {
     {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0xfffff004}, // (000) ldh      #fffff004
-    {.code = OP_JEQ, .jt = 22,  .jf = 0,  .k = 0x00000004}, // (001) jeq      #0x04            jt 22 jf 0
+    {.code = OP_JEQ,  .jt = 22, .jf = 0, .k = 0x00000004},  // (001) jeq      #0x04            jt 22 jf 0
     {.code = OP_LDHA, .jt = 0,  .jf = 0,  .k = 0x0000000c}, // (002) ldh      [12]
     {.code = OP_JEQ,  .jt = 0,  .jf = 7,  .k = 0x000086dd}, // (003) jeq      #0x86dd          jt 2	jf 9
     {.code = OP_LDB,  .jt = 0,  .jf = 0,  .k = 0x00000014}, // (004) ldb      [20]
@@ -90,8 +126,11 @@ static struct sock_filter dhcp_bpf_code[] = {
 };
 
 /** Filter program socket struct */
-static struct sock_fprog dhcp_sock_bfp = {
-    .len = sizeof(dhcp_bpf_code) / sizeof(*dhcp_bpf_code), .filter = dhcp_bpf_code
+static struct sock_fprog dhcp_outbound_sock_bfp = {
+    .len = sizeof(dhcp_outbound_bpf_code) / sizeof(*dhcp_outbound_bpf_code), .filter = dhcp_outbound_bpf_code
+};
+static struct sock_fprog dhcp_inbound_sock_bfp = {
+    .len = sizeof(dhcp_inbound_bpf_code) / sizeof(*dhcp_inbound_bpf_code), .filter = dhcp_inbound_bpf_code
 };
 
 /** Aggregate device of DHCP interfaces. It contains aggregate counters from
@@ -107,6 +146,17 @@ static dhcp_message_type_t monitored_msgs[] = {
     DHCP_MESSAGE_TYPE_ACK
 };
 
+void update_vlan_mapping(std::string vlan, std::shared_ptr<swss::DBConnector> mConfigDbPtr) {
+    auto match_pattern = std::string("VLAN_MEMBER|") + vlan + std::string("|*");
+    auto keys = mConfigDbPtr->keys(match_pattern);
+    for (auto &itr : keys) {
+        auto found = itr.find_last_of('|');
+        auto interface = itr.substr(found + 1);
+        vlan_map[interface] = vlan;
+        syslog(LOG_INFO, "add <%s, %s> into interface vlan map\n", interface.c_str(), vlan.c_str());
+    }
+}
+
 /** Number of monitored DHCP message type */
 static uint8_t monitored_msg_sz = sizeof(monitored_msgs) / sizeof(*monitored_msgs);
 
@@ -163,9 +213,62 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
 }
 
 /**
- * @code read_callback(fd, event, arg);
+ * @code client_packet_handler(dhcp_device_context_t *context, ssize_t buffer_sz);
+ *
+ * @brief packet handler to process received rx and tx packets
+ *
+ * @param context       pointer to device (interface) context
+ * @param buffer_sz     buffer that stores received packet data
+ *
+ * @return none
+ */
+static void client_packet_handler(dhcp_device_context_t *context, ssize_t buffer_sz)
+{
+    struct ether_header *ethhdr = (struct ether_header*) context->buffer;
+    struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
+    struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
+    uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
+    int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
+
+    if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
+        (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE))
+    {
+        int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
+                    ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
+        int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
+        const u_char *dhcp_option = context->buffer + dhcp_option_offset;
+        dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
+                                    ethhdr->ether_shost[1] == context->mac[1] &&
+                                    ethhdr->ether_shost[2] == context->mac[2] &&
+                                    ethhdr->ether_shost[3] == context->mac[3] &&
+                                    ethhdr->ether_shost[4] == context->mac[4] &&
+                                    ethhdr->ether_shost[5] == context->mac[5]) ?
+                                    DHCP_TX : DHCP_RX;
+        int offset = 0;
+        while ((offset < (dhcp_option_sz + 1)) && dhcp_option[offset] != 255) {
+            if (dhcp_option[offset] == OPTION_DHCP_MESSAGE_TYPE) {
+                if (offset < (dhcp_option_sz + 2)) {
+                    handle_dhcp_option_53(context, &dhcp_option[offset], dir, iphdr, dhcphdr);
+                }
+                break; // break while loop since we are only interested in Option 53
+            }
+
+            if (dhcp_option[offset] == 0) { // DHCP Option Padding
+                offset++;
+            } else {
+                offset += dhcp_option[offset + 1] + 2;
+            }
+        }
+    } else {
+        syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
+            context->intf, buffer_sz);
+    }
+}
+
+/**
+ * @code read_tx_callback(fd, event, arg);
  *
- * @brief callback for libevent which is called every time out in order to read queued packet capture
+ * @brief callback for libevent which is called every time out in order to read queued outgoing packet capture
  *
  * @param fd            socket to read from
  * @param event         libevent triggered event
@@ -173,68 +276,20 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
  *
  * @return none
  */
-static void read_callback(int fd, short event, void *arg)
+static void read_tx_callback(int fd, short event, void *arg)
 {
     dhcp_device_context_t *context = (dhcp_device_context_t*) arg;
     ssize_t buffer_sz;
 
-    while ((event == EV_READ) &&
-           ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0)) {
-        struct ether_header *ethhdr = (struct ether_header*) context->buffer;
-        struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
-        struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
-        uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
-        int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
-
-        if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
-            (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) {
-            int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
-                          ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
-            int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
-            const u_char *dhcp_option = context->buffer + dhcp_option_offset;
-            dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
-                                           ethhdr->ether_shost[1] == context->mac[1] &&
-                                           ethhdr->ether_shost[2] == context->mac[2] &&
-                                           ethhdr->ether_shost[3] == context->mac[3] &&
-                                           ethhdr->ether_shost[4] == context->mac[4] &&
-                                           ethhdr->ether_shost[5] == context->mac[5]) ?
-                                           DHCP_TX : DHCP_RX;
-            int offset = 0;
-            int stop_dhcp_processing = 0;
-            while ((offset < (dhcp_option_sz + 1)) && dhcp_option[offset] != 255) {
-                switch (dhcp_option[offset])
-                {
-                case 53:
-                    if (offset < (dhcp_option_sz + 2)) {
-                        handle_dhcp_option_53(context, &dhcp_option[offset], dir, iphdr, dhcphdr);
-                    }
-                    stop_dhcp_processing = 1; // break while loop since we are only interested in Option 53
-                    break;
-                default:
-                    break;
-                }
-
-                if (stop_dhcp_processing == 1) {
-                    break;
-                }
-
-                if (dhcp_option[offset] == 0) { // DHCP Option Padding
-                    offset++;
-                } else {
-                    offset += dhcp_option[offset + 1] + 2;
-                }
-            }
-        } else {
-            syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
-                   context->intf, buffer_sz);
-        }
+    while ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0) {
+        client_packet_handler(context, buffer_sz);
     }
 }
 
 /**
- * @code read_callback_dual_tor(fd, event, arg);
+ * @code read_rx_callback(fd, event, arg);
  *
- * @brief callback for libevent which is called every time out in order to read queued packet capture when dual tor mode is enabled
+ * @brief callback for libevent which is called every time out in order to read queued incoming packet capture
  *
  * @param fd            socket to read from
  * @param event         libevent triggered event
@@ -242,72 +297,37 @@ static void read_callback(int fd, short event, void *arg)
  *
  * @return none
  */
-static void read_callback_dual_tor(int fd, short event, void *arg)
+static void read_rx_callback(int fd, short event, void *arg)
 {
     dhcp_device_context_t *context = (dhcp_device_context_t*) arg;
     ssize_t buffer_sz;
     struct sockaddr_ll sll;
     socklen_t slen = sizeof sll;
 
-    while ((event == EV_READ) &&
-           ((buffer_sz = recvfrom(fd, context->buffer, context->snaplen, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0)) 
+    while ((buffer_sz = recvfrom(fd, context->buffer, context->snaplen, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0) 
     {
-        std::string member_table = std::string("VLAN_MEMBER|") + context->intf + "|";
         char interfaceName[IF_NAMESIZE];
-        char *interface = if_indextoname(sll.sll_ifindex, interfaceName);
-        std::string state;
-        std::string intf(interface);
-        mStateDbMuxTablePtr->hget(intf, "state", state);
-        if (state != "standby" && configDb.exists(member_table.append(interface))) {
-            struct ether_header *ethhdr = (struct ether_header*) context->buffer;
-            struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
-            struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
-            uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
-            int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
-
-            if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
-                (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) 
-            {
-                int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
-                            ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
-                int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
-                const u_char *dhcp_option = context->buffer + dhcp_option_offset;
-                dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
-                                            ethhdr->ether_shost[1] == context->mac[1] &&
-                                            ethhdr->ether_shost[2] == context->mac[2] &&
-                                            ethhdr->ether_shost[3] == context->mac[3] &&
-                                            ethhdr->ether_shost[4] == context->mac[4] &&
-                                            ethhdr->ether_shost[5] == context->mac[5]) ?
-                                            DHCP_TX : DHCP_RX;
-                int offset = 0;
-                int stop_dhcp_processing = 0;
-                while ((offset < (dhcp_option_sz + 1)) && dhcp_option[offset] != 255) {
-                    switch (dhcp_option[offset])
-                    {
-                    case 53:
-                        if (offset < (dhcp_option_sz + 2)) {
-                            handle_dhcp_option_53(context, &dhcp_option[offset], dir, iphdr, dhcphdr);
-                        }
-                        stop_dhcp_processing = 1; // break while loop since we are only interested in Option 53
-                        break;
-                    default:
-                        break;
-                    }
-
-                    if (stop_dhcp_processing == 1) {
-                        break;
-                    }
-
-                    if (dhcp_option[offset] == 0) { // DHCP Option Padding
-                        offset++;
-                    } else {
-                        offset += dhcp_option[offset + 1] + 2;
-                    }
-                }
-            } else {
-                syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
-                    context->intf, buffer_sz);
+        if (if_indextoname(sll.sll_ifindex, interfaceName) == NULL) {
+            syslog(LOG_WARNING, "invalid input interface index %d\n", sll.sll_ifindex);
+            continue;
+        }
+        std::string intf(interfaceName);
+        auto vlan = vlan_map.find(intf);
+        if (vlan == vlan_map.end()) {
+            if (intf.find(CLIENT_IF_PREFIX) != std::string::npos) {
+                syslog(LOG_WARNING, "invalid input interface %s\n", interfaceName);
+            }
+            continue;
+        }
+
+        if (dual_tor_sock) {
+            std::string state;
+            mStateDbMuxTablePtr->hget(intf, "state", state);
+            if (state != "standby") {
+                client_packet_handler(context, buffer_sz);
             }
+        } else {
+            client_packet_handler(context, buffer_sz);
         }
     }
 }
@@ -495,22 +515,33 @@ static int init_socket(dhcp_device_context_t *context, const char *intf)
     int rv = -1;
 
     do {
-        context->sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
-        if (context->sock < 0) {
+        context->rx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
+        context->tx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
+        if (context->rx_sock < 0 || context->tx_sock < 0) {
             syslog(LOG_ALERT, "socket: failed to open socket with '%s'\n", strerror(errno));
-            break;
+            exit(1);
         }
 
-        struct sockaddr_ll addr;
-        memset(&addr, 0, sizeof(addr));
-        addr.sll_ifindex = 0; // any interface
-        addr.sll_family = AF_PACKET;
-        addr.sll_protocol = htons(ETH_P_ALL);
-        if (bind(context->sock, (struct sockaddr *) &addr, sizeof(addr))) {
+        struct sockaddr_ll rx_addr;
+        memset(&rx_addr, 0, sizeof(rx_addr));
+        rx_addr.sll_ifindex = 0; // any interface
+        rx_addr.sll_family = AF_PACKET;
+        rx_addr.sll_protocol = htons(ETH_P_ALL);
+        if (bind(context->rx_sock, (struct sockaddr *) &rx_addr, sizeof(rx_addr))) {
             syslog(LOG_ALERT, "bind: failed to bind to interface '%s' with '%s'\n", intf, strerror(errno));
             break;
         }
 
+        struct sockaddr_ll tx_addr;
+        memset(&tx_addr, 0, sizeof(tx_addr));
+        tx_addr.sll_ifindex = if_nametoindex(intf);
+        tx_addr.sll_family = AF_PACKET;
+        tx_addr.sll_protocol = htons(ETH_P_ALL);
+        if (bind(context->tx_sock, (struct sockaddr *) &tx_addr, sizeof(tx_addr))) {
+            syslog(LOG_ALERT, "bind: failed to bind to interface '%s' with '%s'\n", intf, strerror(errno));
+            exit(1);
+        }
+
         strncpy(context->intf, intf, sizeof(context->intf) - 1);
         context->intf[sizeof(context->intf) - 1] = '\0';
 
@@ -644,17 +675,18 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
                               in_addr_t giaddr_ip)
 {
     int rv = -1;
-    struct event *ev;
+    struct event *rx_ev;
+    struct event *tx_ev;
 
     do {
         if (context == NULL) {
             syslog(LOG_ALERT, "NULL interface context pointer'\n");
-            break;
+            exit(1);
         }
 
         if (snaplen < UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) {
             syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCP options", context->intf);
-            break;
+            exit(1);
         }
 
         context->giaddr_ip = giaddr_ip;
@@ -662,25 +694,31 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
         context->buffer = (uint8_t *) malloc(snaplen);
         if (context->buffer == NULL) {
             syslog(LOG_ALERT, "malloc: failed to allocate memory for socket buffer '%s'\n", strerror(errno));
-            break;
+            exit(1);
         }
         context->snaplen = snaplen;
 
-        if (setsockopt(context->sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_sock_bfp, sizeof(dhcp_sock_bfp)) != 0) {
+        if (setsockopt(context->rx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_inbound_sock_bfp, sizeof(dhcp_inbound_sock_bfp)) != 0) {
             syslog(LOG_ALERT, "setsockopt: failed to attach filter with '%s'\n", strerror(errno));
-            break;
+            exit(1);
         }
 
-        if (dual_tor_sock)
-            ev = event_new(base, context->sock, EV_READ | EV_PERSIST, read_callback_dual_tor, context);
-        else
-            ev = event_new(base, context->sock, EV_READ | EV_PERSIST, read_callback, context);
+        if (setsockopt(context->tx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_outbound_sock_bfp, sizeof(dhcp_outbound_sock_bfp)) != 0) {
+            syslog(LOG_ALERT, "setsockopt: failed to attach filter with '%s'\n", strerror(errno));
+            exit(1);
+        }
+
+        update_vlan_mapping(context->intf, mConfigDbPtr);
 
-        if (ev == NULL) {
+        rx_ev = event_new(base, context->rx_sock, EV_READ | EV_PERSIST, read_rx_callback, context);
+        tx_ev = event_new(base, context->tx_sock, EV_READ | EV_PERSIST, read_tx_callback, context);
+
+        if (rx_ev == NULL || tx_ev == NULL) {
             syslog(LOG_ALERT, "event_new: failed to allocate memory for libevent event '%s'\n", strerror(errno));
-            break;
+            exit(1);
         }
-        event_add(ev, NULL);
+        event_add(rx_ev, NULL);
+        event_add(tx_ev, NULL);
 
         rv = 0;
     } while (0);
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index a2b2a789fca6..2e376ac77e6f 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -35,6 +35,11 @@ typedef enum
     DHCP_MESSAGE_TYPE_COUNT
 } dhcp_message_type_t;
 
+enum
+{
+    OPTION_DHCP_MESSAGE_TYPE = 53,
+};
+
 /** packet direction */
 typedef enum
 {
@@ -71,7 +76,8 @@ typedef enum
 /** DHCP device (interface) context */
 typedef struct
 {
-    int sock;                       /** Raw socket associated with this device/interface */
+    int rx_sock;                    /** Raw socket associated with this device/interface to count rx packets */
+    int tx_sock;                    /** Raw socket associated with this device/interface to count tx packets*/
     in_addr_t ip;                   /** network address of this device (interface) */
     uint8_t mac[ETHER_ADDR_LEN];    /** hardware address of this device (interface) */
     in_addr_t giaddr_ip;            /** Gateway IP address */

From 83b6518ae2bb90ec48a7b9fe55c4eeaf5861d423 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Thu, 2 Feb 2023 10:07:03 +0200
Subject: [PATCH 1533/1674] [202012][mellanox]: Add BIOS upgrade infra (#13571)

- Why I did it
Added BIOS upgrade infra

- How I did it
Added new make target

- How to verify it
Copy msn3800_bios.tar.gz to platform/mellanox/bios
make configure PLATFORM=mellanox
make target/files/buster/msn3800_bios.tar.gz

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
---
 files/build_templates/sonic_debian_extension.j2 |  6 ++++++
 platform/mellanox/.gitignore                    |  3 +++
 platform/mellanox/bios.mk                       | 15 +++++++++++++++
 platform/mellanox/bios/README.md                |  5 +++++
 platform/mellanox/rules.mk                      |  1 +
 5 files changed, 30 insertions(+)
 create mode 100644 platform/mellanox/bios.mk
 create mode 100644 platform/mellanox/bios/README.md

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 0b8cd49fe339..18bafd1d0c39 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -796,6 +796,12 @@ sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 
 {% if sonic_asic_platform == "mellanox" %}
 sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
+if [ -n "$MLNX_BIOS_ARCHIVES" ]; then
+sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/bios/
+for MLNX_BIOS_ARCHIVE in $MLNX_BIOS_ARCHIVES; do
+    sudo cp $files_path/$MLNX_BIOS_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/bios/
+done
+fi
 sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
 sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
 sudo cp $files_path/$MLNX_SPC3_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC3.mfa
diff --git a/platform/mellanox/.gitignore b/platform/mellanox/.gitignore
index 1f3d15d640d4..37c9f68b7812 100644
--- a/platform/mellanox/.gitignore
+++ b/platform/mellanox/.gitignore
@@ -16,6 +16,9 @@ sdk-src/*/*
 */*.gz
 */*.egg-info
 
+# Exceptions
+!bios/*.gz
+
 # Autogenerated Dockerfiles
 docker-syncd-mlnx/Dockerfile
 docker-syncd-mlnx-rpc/Dockerfile
diff --git a/platform/mellanox/bios.mk b/platform/mellanox/bios.mk
new file mode 100644
index 000000000000..7fd5e4bcd02c
--- /dev/null
+++ b/platform/mellanox/bios.mk
@@ -0,0 +1,15 @@
+# Mellanox BIOS Firmware
+
+ifeq ($(shell [ -f $(PLATFORM_PATH)/bios/msn3800_bios.tar.gz ] && echo yes),yes)
+MLNX_SN3800_BIOS_ARCHIVE = msn3800_bios.tar.gz
+$(MLNX_SN3800_BIOS_ARCHIVE)_PATH = $(PLATFORM_PATH)/bios/
+SONIC_COPY_FILES += $(MLNX_SN3800_BIOS_ARCHIVE)
+
+MLNX_BIOS_ARCHIVES += $(MLNX_SN3800_BIOS_ARCHIVE)
+endif
+
+ifdef MLNX_BIOS_ARCHIVES
+MLNX_FILES += $(MLNX_BIOS_ARCHIVES)
+
+export MLNX_BIOS_ARCHIVES
+endif
diff --git a/platform/mellanox/bios/README.md b/platform/mellanox/bios/README.md
new file mode 100644
index 000000000000..c58b844d3327
--- /dev/null
+++ b/platform/mellanox/bios/README.md
@@ -0,0 +1,5 @@
+# Mellanox BIOS
+
+## Description
+
+This directory contains BIOS packages.
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index 179e20f3fff5..4414a0183bba 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -13,6 +13,7 @@ include $(PLATFORM_PATH)/mlnx-ffb.mk
 include $(PLATFORM_PATH)/issu-version.mk
 include $(PLATFORM_PATH)/mlnx-onie-fw-update.mk
 include $(PLATFORM_PATH)/mlnx-ssd-fw-update.mk
+include $(PLATFORM_PATH)/bios.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)

From 7adf2b1c05c059c3f18befa9d439a3a834fa0443 Mon Sep 17 00:00:00 2001
From: Yoush <63637102+youshcentec@users.noreply.github.com>
Date: Thu, 19 Jan 2023 01:24:28 +0800
Subject: [PATCH 1534/1674] [BugFix] Fix the bug that it gets error system-mac
 of centec platform (#12721)

Why I did it
When getting system mac of centec platform, it would increase by 1 the last byte of mac, but it could not consider the case of carry.

How I did it
Firstly, I would replace the ":" with "" of mac to a string.
And then, I would convert the mac from string to int and increase by 1, at last convert it to string with inserting ":".
---
 src/sonic-py-common/sonic_py_common/device_info.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index 4d1df6352284..7b55a038421f 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -473,9 +473,10 @@ def get_system_mac(namespace=None):
 
     # Align last byte of MAC if necessary
     if version_info and version_info['asic_type'] == 'centec':
-        last_byte = mac[-2:]
-        aligned_last_byte = format(int(int(last_byte, 16) + 1), '02x')
-        mac = mac[:-2] + aligned_last_byte
+        mac_tmp = mac.replace(':','')
+        mac_tmp = "{:012x}".format(int(mac_tmp, 16) + 1)
+        mac_tmp = re.sub("(.{2})", "\\1:", mac_tmp, 0, re.DOTALL)
+        mac = mac_tmp[:-1]
     return mac
 
 

From 30fbc609c82882512945333e9be44e3e45f0dec7 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 2 Feb 2023 09:07:33 -0800
Subject: [PATCH 1535/1674] Use tmpfs for /var/log for Arista 7260 (#13587)

This is to reduce writes to disk, which then can use the SSD to get worn
out faster.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 files/Aboot/boot0.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 0944bc54cf6f..10dfd8e83044 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -497,6 +497,7 @@ write_platform_specific_cmdline() {
     if [ "$sid" = "Gardena" ] || [ "$sid" = "GardenaE" ]; then
         aboot_machine=arista_7260cx3_64
         flash_size=28000
+        cmdline_add logs_inram=on
     fi
     if [ "$sid" = "Alhambra" ]; then
         aboot_machine=arista_7170_64c

From 9a26ed957c780172c26a5983e7d1afbd18a3ecc7 Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Mon, 6 Feb 2023 08:50:27 -0800
Subject: [PATCH 1536/1674] Advance sonic-dhcp-relay (#13608)

Why I did it
Advance sonic-dhcp-relay submodule head on 202012 branch

How I did it
Added the following commits:
a4b15d8 jcaiMR Thu Dec 29 14:18:28 2022 +0800 fix relay-reply dhcpv6 packet counter issue (#29)
677543f jcaiMR Sat Dec 17 00:24:32 2022 +0800 fix handleSwssNotification crash in dhcp6relay (#28)
ed86546 jcaiMR Wed Dec 14 14:08:58 2022 +0800 Fix multiple vlan issue (#27)
5ec1f5b Vivek Thu Dec 8 09:44:15 2022 -0800 Made the Error log informative (#22)
063d41b jcaiMR Wed Nov 30 14:41:53 2022 +0800 disable cfg dynamic change (#25)
d4a51f6 kellyyeh Tue Jan 31 18:09:08 2023 -0800 Add unittest infrastructure (#5) (#31)

How to verify it
Ran full dhcpv6 test suite on lab device
---
 src/dhcprelay | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dhcprelay b/src/dhcprelay
index b3cdec994a11..a4b15d8ba429 160000
--- a/src/dhcprelay
+++ b/src/dhcprelay
@@ -1 +1 @@
-Subproject commit b3cdec994a110481322406cd66eb9b0c147864b8
+Subproject commit a4b15d8ba429c2799d3927f8dca376745af08c1a

From d8a299781ab29584e7820da02e6cfb184fb65c31 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Mon, 6 Feb 2023 17:09:55 -0800
Subject: [PATCH 1537/1674] Use tmpfs for /var/log for Arista 7260 (#13587)
 (#13607)

This is to reduce writes to disk, which then can use the SSD to get worn
out faster.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
(cherry picked from commit ee1c32a802d4fab9da0e22a8b803831cdee6f45e)

From abbcda67d2ea15dec68995051f783e0edcaa834e Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Tue, 7 Feb 2023 16:18:28 -0800
Subject: [PATCH 1538/1674] update submodule linkmgrd (#13589)

9551386 Jing Zhang      Mon Jan 23 15:49:52 2023 -0800  [202012] Update link prober stats post logic #159 (#162)
e54f289 Liu Shilong     Wed Nov 30 18:04:15 2022 +0800  Use github code scanning instead of LGTM (#157)
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index cf7274a17fec..9551386d92a0 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit cf7274a17fec6c756c4f028322f644fda74644bf
+Subproject commit 9551386d92a0cafb2e841ec3e0c04bb1bf4e1a24

From 6b4a27837894ff128f9550d2ee07ec8d04d49b9f Mon Sep 17 00:00:00 2001
From: Longxiang Lyu <35479537+lolyu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 09:49:20 +0800
Subject: [PATCH 1539/1674] [dualtor] Let T0 delay 10 seconds before sending
 BGP updates (#13701)

Cherry-pick PR #12996 into 202012 branch.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
---
 .../docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 |  3 +
 .../sample_output/py2/bgpd_frr_dualtor.conf   | 79 +++++++++++++++++++
 .../sample_output/py3/bgpd_frr_dualtor.conf   | 79 +++++++++++++++++++
 src/sonic-config-engine/tests/test_frr.py     | 15 +++-
 4 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index ce6fc3026a74..b65ac6d97398 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -48,6 +48,9 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp log-neighbor-changes
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
+{% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'].lower() == 'dualtor') %}
+  coalesce-time 10000
+{% endif %}
 !
 {% if constants.bgp.multipath_relax.enabled is defined and constants.bgp.multipath_relax.enabled %}
   bgp bestpath as-path multipath-relax
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf
new file mode 100644
index 000000000000..364a2c34bcaa
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf
@@ -0,0 +1,79 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname switch-t0
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.200.0/27
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
+!
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+  coalesce-time 10000
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
+!
+  bgp router-id 10.1.0.32
+!
+  network 10.1.0.32/32
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+!
+  network 192.168.200.1/27
+  network 192.168.0.1/27
+!
+!
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
new file mode 100644
index 000000000000..4f606b80838c
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
@@ -0,0 +1,79 @@
+!
+! template: bgpd/bgpd.conf.j2
+!
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+! template: common/daemons.common.conf.j2
+!
+hostname switch-t0
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+! end of template: common/daemons.common.conf.j2!
+agentx
+!
+!
+!
+! template: bgpd/bgpd.main.conf.j2
+!
+! bgp multiple-instance
+!
+! BGP configuration
+!
+! TSA configuration
+!
+ip prefix-list PL_LoopbackV4 permit 10.1.0.32/32
+!
+ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 192.168.0.0/27
+!
+ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
+!
+!
+!
+router bgp 65100
+!
+  bgp log-neighbor-changes
+  no bgp default ipv4-unicast
+  no bgp ebgp-requires-policy
+  coalesce-time 10000
+!
+  bgp bestpath as-path multipath-relax
+!
+  bgp graceful-restart restart-time 240
+  bgp graceful-restart
+  bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
+!
+  bgp router-id 10.1.0.32
+!
+  network 10.1.0.32/32
+!
+  address-family ipv6
+    network fc00:1::32/64
+  exit-address-family
+!
+  network 192.168.0.1/27
+  network 192.168.200.1/27
+!
+!
+!
+  address-family ipv4
+    maximum-paths 64
+  exit-address-family
+  address-family ipv6
+    maximum-paths 64
+  exit-address-family
+!
+! end of template: bgpd/bgpd.main.conf.j2
+!!
+! end of template: bgpd/bgpd.conf.j2
+!
diff --git a/src/sonic-config-engine/tests/test_frr.py b/src/sonic-config-engine/tests/test_frr.py
index 3934f8c7d70c..cad32eb5e402 100644
--- a/src/sonic-config-engine/tests/test_frr.py
+++ b/src/sonic-config-engine/tests/test_frr.py
@@ -1,4 +1,5 @@
 import filecmp
+import json
 import os
 import subprocess
 
@@ -46,12 +47,16 @@ def run_diff(self, file1, file2):
 
         return output
 
-    def run_case(self, template, target):
+    def run_case(self, template, target, extra_data=None):
         template_dir = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-frr', "frr")
         conf_template = os.path.join(template_dir, template)
         constants = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'constants', 'constants.yml')
-        cmd_args = self.t0_minigraph, self.t0_port_config, constants, conf_template, template_dir, self.output_file
-        cmd = "-m %s -p %s -y %s -t %s -T %s > %s" % cmd_args
+        if extra_data:
+            cmd_args = self.t0_minigraph, self.t0_port_config, constants, conf_template, template_dir, json.dumps(extra_data), self.output_file
+            cmd = "-m %s -p %s -y %s -t %s -T %s -a '%s' > %s" % cmd_args
+        else:
+            cmd_args = self.t0_minigraph, self.t0_port_config, constants, conf_template, template_dir, self.output_file
+            cmd = "-m %s -p %s -y %s -t %s -T %s > %s" % cmd_args
         self.run_script(cmd)
 
         original_filename = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, target)
@@ -69,4 +74,6 @@ def test_bgpd_frr(self):
     def test_zebra_frr(self):
         self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr.conf'))
 
-
+    def test_bgpd_frr_dualtor(self):
+        extra_data = {"DEVICE_METADATA": {"localhost": {"subtype": "DualToR"}}}
+        self.assertTrue(*self.run_case('bgpd/bgpd.conf.j2', 'bgpd_frr_dualtor.conf', extra_data=extra_data))

From 85ca3abc2fe97499548ed9317f44f5ba3fc4d0d8 Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Tue, 7 Feb 2023 01:27:46 +0800
Subject: [PATCH 1540/1674] [Celestica DX010] fix fan drawer and watchdog
 platform testcase issues (#13426)

Why I did it
fix DX010 fan drawer and watchdog platform test case issues

How I did it
1. Add fan_drawer get_maximum_consumed_power support
2. Adjust maximum watchdog timeout value check

How to verify it
Run test_fan_drawer and test_watchdog test cases.
---
 .../sonic_platform/fan_drawer.py                       | 10 ++++++++++
 .../x86_64-cel_seastone-r0/sonic_platform/watchdog.py  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py
index e35ecf65195a..0fa37fba86ce 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/fan_drawer.py
@@ -106,3 +106,13 @@ def is_replaceable(self):
             bool: True if it is replaceable.
         """
         return True
+
+    def get_maximum_consumed_power(self):
+        """
+        Retrives the maximum power drawn by Fan Drawer
+
+        Returns:
+            A float, with value of the maximum consumable power of the
+            component.
+        """
+        return 33.60
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
index 122b5d90ddb6..2bb8f2d57aa3 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/watchdog.py
@@ -135,7 +135,7 @@ def arm(self, seconds):
         ret = WDT_COMMON_ERROR
         if seconds < 0:
             return ret
-        if seconds > 16779:
+        if seconds > 16777:
             return ret
 
 

From ff5a703301196a71056f9dde57065310e5b35bc3 Mon Sep 17 00:00:00 2001
From: andywongarista <78833093+andywongarista@users.noreply.github.com>
Date: Wed, 8 Feb 2023 12:01:07 -0800
Subject: [PATCH 1541/1674] Fix content of platform.json for DCS-7050CX3-32S
 (#13659)

#### Why I did it
Some tests under platform_tests/api were failing on the 7050CX3 due to outdated facts in platform.json

#### How I did it
Updated platform.json facts with appropriate values

#### How to verify it
Run tests under platform_tests/api to verify no failures
---
 .../x86_64-arista_7050cx3_32s/platform.json   | 53 ++++++++++++++-----
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/platform.json b/device/arista/x86_64-arista_7050cx3_32s/platform.json
index 632747ad2333..e291eae41785 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/platform.json
+++ b/device/arista/x86_64-arista_7050cx3_32s/platform.json
@@ -40,46 +40,71 @@
         "psus": [
             {
                 "name": "psu1",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu1/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             },
             {
                 "name": "psu2",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu2/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             }
         ],
         "thermals": [
             {
-                "name": "Cpu temp sensor"
+                "name": "Cpu temp sensor",
+                "controllable": false
             },
             {
-                "name": "Cpu board temp sensor"
+                "name": "Cpu board temp sensor",
+                "controllable": false
             },
             {
-                "name": "Back-panel temp sensor"
+                "name": "Back-panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Board temp sensor"
+                "name": "Board temp sensor",
+                "controllable": false
             },
             {
-                "name": "Front-panel temp sensor"
+                "name": "Front-panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 hotspot sensor"
+                "name": "Power supply 1 hotspot sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 inlet temp sensor"
+                "name": "Power supply 1 inlet temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 exhaust temp sensor"
+                "name": "Power supply 1 exhaust temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 hotspot sensor"
+                "name": "Power supply 2 hotspot sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 inlet temp sensor"
+                "name": "Power supply 2 inlet temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 exhaust temp sensor"
+                "name": "Power supply 2 exhaust temp sensor",
+                "controllable": false
             }
         ],
         "sfps": [
@@ -188,4 +213,4 @@
         ]
     },
     "interfaces": {}
-}
\ No newline at end of file
+}

From f48734fe502a877a7a24d7d111721e0852101736 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:24:06 +0800
Subject: [PATCH 1542/1674] [Build]: Fix the bin image generated from raw image
 issue (#10083) (#13672)

#### Why I did it
Cherry pick from #10083
It is to fix the issue #10048
When building .raw image, for instance, target/sonic-broadcom.raw, it will generate a .bin image, target/sonic-broadcom.bin, as the intermediate file. The intermediate file is a build target which may contains different dependencies with the raw one.

#### How I did it
Rename the intermediate file.
---
 build_image.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/build_image.sh b/build_image.sh
index d67826e08303..d6f4c7e60b60 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -27,6 +27,8 @@ IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
 
 generate_onie_installer_image()
 {
+    output_file=$OUTPUT_ONIE_IMAGE
+    [ -n "$1" ] && output_file=$1
     # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
     rm -rf ./installer/${TARGET_PLATFORM}/platforms/
     mkdir -p ./installer/${TARGET_PLATFORM}/platforms/
@@ -42,7 +44,7 @@ generate_onie_installer_image()
     ## Generate an ONIE installer image
     ## Note: Don't leave blank between lines. It is single line command.
     ./onie-mk-demo.sh $TARGET_PLATFORM $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
-          installer platform/$TARGET_MACHINE/platform.conf $OUTPUT_ONIE_IMAGE OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
+          installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
           $ONIE_INSTALLER_PAYLOAD
 }
 
@@ -59,10 +61,11 @@ if [ "$IMAGE_TYPE" = "onie" ]; then
 elif [ "$IMAGE_TYPE" = "raw" ]; then
 
     echo "Build RAW image"
+    tmp_output_onie_image=${OUTPUT_ONIE_IMAGE}.tmp
     mkdir -p `dirname $OUTPUT_RAW_IMAGE`
     sudo rm -f $OUTPUT_RAW_IMAGE
 
-    generate_onie_installer_image
+    generate_onie_installer_image "$tmp_output_onie_image"
 
     echo "Creating SONiC raw partition : $OUTPUT_RAW_IMAGE of size $RAW_IMAGE_DISK_SIZE MB"
     fallocate -l "$RAW_IMAGE_DISK_SIZE"M $OUTPUT_RAW_IMAGE
@@ -73,8 +76,9 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
     ## Generate a partition dump that can be used to 'dd' in-lieu of using the onie-nos-installer
     ## Run the installer
     ## The 'build' install mode of the installer is used to generate this dump.
-    sudo chmod a+x $OUTPUT_ONIE_IMAGE
-    sudo ./$OUTPUT_ONIE_IMAGE
+    sudo chmod a+x $tmp_output_onie_image
+    sudo ./$tmp_output_onie_image
+    rm $tmp_output_onie_image
 
     [ -r $OUTPUT_RAW_IMAGE ] || {
         echo "Error : $OUTPUT_RAW_IMAGE not generated!"

From 8657fbac53aa277b714a8bff122b294aa640ed12 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:25:04 +0800
Subject: [PATCH 1543/1674] [Build]: fix some version info missing in version
 control files issue (#10211) (#13673)

#### Why I did it
Fix some version info missing in version control files issue

#### How I did it
Change to collect version before it cleaned up
---
 build_debian.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_debian.sh b/build_debian.sh
index 2d01094bbfd0..5169be3694a9 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -558,6 +558,9 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
     fi
 fi
 
+# Collect host image version files before cleanup
+scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
+
 # Remove GCC
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc
 
@@ -589,7 +592,6 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 ## Note: -x to skip directories on different file systems, such as /proc
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
-scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
 sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 

From 95893698e2c259a6bfa0df91fd71a7087efd59d4 Mon Sep 17 00:00:00 2001
From: jingwenxie <jingwenxie@microsoft.com>
Date: Fri, 10 Feb 2023 02:04:58 +0800
Subject: [PATCH 1544/1674] [202012][sonic-utilites] advance submodule (#13734)

```
39cdb49c7 [202012][show] Add bgpraw to show run all (#2639)
b3ebba2ca [202012][show] add new CLI to show tunnel route objects #2255 (#2659)
d08f59b9f Fixed a bug in "show vnet routes all" causing screen overrun. (#2644) (#2654)
a996abdb5 [202012][show] show logging CLI support for logs stored in tmpfs (#2652)
c60f771c0 [202012][show_bfd] add local discriminator in show bfd command (#2616)
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 678df5d6ccbb..39cdb49c740e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 678df5d6ccbb173cbf3318b2df99cd9f6aa0c97f
+Subproject commit 39cdb49c740e7fce971ddd02fa669af67c6275f4

From 4e70a2bfbc2130b98204cee7e6263f279bcf16d9 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Thu, 9 Feb 2023 11:01:58 -0800
Subject: [PATCH 1545/1674] [202012][swss]: Submodule update for SWSS (#13722)

Include following commits:
- c98b9f09 [202012][orchagent]: Get bridge port ID from FDBOrch cache instead of SAI API #2657 (#2658)
- 59886b8f [MuxOrch] Enabling neighbor when adding in active state (#2601)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index e739e6c9cb06..c98b9f09cb63 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e739e6c9cb065795d4f318a7ab4b747f727b9719
+Subproject commit c98b9f09cb632034b955e0e541f0c046c12f34d6

From 936679ee47fbfee2f7204fb1703aa649ce0da8b2 Mon Sep 17 00:00:00 2001
From: jcaiMR <111116206+jcaiMR@users.noreply.github.com>
Date: Thu, 9 Feb 2023 05:40:05 +0800
Subject: [PATCH 1546/1674] Set 'origin' and 'AS Path' for T1 SLB routes
 (#13613)

* set origin and as-path prepend for routes from SLB
---
 src/sonic-bgpcfgd/bgpcfgd/managers_rm.py | 29 ++++++++++++++++++++----
 src/sonic-bgpcfgd/tests/test_rm.py       | 16 +++++++++++--
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
index 08609c68f9a6..35a3f864d55c 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/managers_rm.py
@@ -1,8 +1,9 @@
 from .manager import Manager
+from swsscommon import swsscommon
 from .log import log_err, log_debug
 
 ROUTE_MAPS = ["FROM_SDN_SLB_ROUTES"]
-
+FROM_SDN_SLB_DEPLOYMENT_ID = '2'
 
 class RouteMapMgr(Manager):
     """This class add route-map when BGP_PROFILE_TABLE in APPL_DB is updated"""
@@ -71,8 +72,28 @@ def __del_handler_validate(self, key):
             return False
         return True
 
+    def __read_asn(self):
+        if not 'deployment_id_asn_map' in self.constants:
+            log_err("BGPRouteMapMgr:: 'deployment_id_asn_map' key is not found in constants")
+            return None
+        if FROM_SDN_SLB_DEPLOYMENT_ID in self.constants['deployment_id_asn_map']:
+            return self.constants['deployment_id_asn_map'][FROM_SDN_SLB_DEPLOYMENT_ID]
+        log_err("BGPRouteMapMgr:: deployment id %s is not found in constants" % (FROM_SDN_SLB_DEPLOYMENT_ID))
+        return None
+
     def __update_rm(self, rm, data):
-        cmds = ["route-map %s permit 100" % ("%s_RM" % rm), " set community %s" % data["community_id"]]
-        log_debug("BGPRouteMapMgr:: update route-map %s community %s" % ("%s_RM" % rm, data["community_id"]))
-        self.cfg_mgr.push_list(cmds)
+        cmds = []
+        if rm == "FROM_SDN_SLB_ROUTES":
+            cmds.append("route-map %s permit 100" % ("%s_RM" % rm))
+            bgp_asn = self.__read_asn()
+            if bgp_asn is None or bgp_asn is '':
+                log_debug("BGPRouteMapMgr:: update route-map %s, but asn is not found in constants" % ("%s_RM" % rm))
+                return
+            cmds.append(" set as-path prepend %s %s" % (bgp_asn, bgp_asn))
+            cmds.append(" set community %s" % data["community_id"])
+            cmds.append(" set origin incomplete")
+            log_debug("BGPRouteMapMgr:: update route-map %s community %s origin incomplete as-path prepend %s %s" % \
+                      ("%s_RM" % rm, data["community_id"], bgp_asn, bgp_asn))
+        if cmds:
+            self.cfg_mgr.push_list(cmds)
         log_debug("BGPRouteMapMgr::Done")
diff --git a/src/sonic-bgpcfgd/tests/test_rm.py b/src/sonic-bgpcfgd/tests/test_rm.py
index fe89055d27f4..867ae1a7a51c 100644
--- a/src/sonic-bgpcfgd/tests/test_rm.py
+++ b/src/sonic-bgpcfgd/tests/test_rm.py
@@ -3,13 +3,23 @@
 from bgpcfgd.managers_rm import RouteMapMgr
 from swsscommon import swsscommon
 
+
+test_rm_constants = {
+    "deployment_id_asn_map": {
+        "1": 12345,
+        "2": 12346,
+        "3": 12347,
+        "4": 12348,
+    }
+}
+
 def constructor():
     cfg_mgr = MagicMock()
 
     common_objs = {
         'directory': Directory(),
         'cfg_mgr':   cfg_mgr,
-        'constants': {},
+        'constants': test_rm_constants,
     }
 
     mgr = RouteMapMgr(common_objs, "APPL_DB", "BGP_PROFILE_TABLE")
@@ -47,7 +57,9 @@ def test_set_del():
         True,
         [
             ["route-map FROM_SDN_SLB_ROUTES_RM permit 100",
-             " set community 1234:1234"]
+             " set as-path prepend 12346 12346",
+             " set community 1234:1234",
+             " set origin incomplete"]
         ]
     )
 

From 592ce16d05bb4b91196c908bf78a377723499568 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:05:09 -0800
Subject: [PATCH 1547/1674] Update cisco-8000.ini (#13793)

#### Why I did it
1.57.x SDK based incremental drop that addresses:
Fix for MIGSMSFT-158
Support for VxLAN and BFD Serviceability CLI
sfputil reset platform fix to handle 100G optics
Added thermal management feature for ZR optics sensors

#### How I did it
Update cisco-8000 submodule to v0.2.5
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 4242fabe2e7c..5d650b768418 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2.4
+ref=202012-v0.2.5

From 9731aa36c2e84ce7dec17d1871362e66bfd157ef Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 16 Feb 2023 09:04:36 -0800
Subject: [PATCH 1548/1674] [sonic-snmpagent] Update submodule (#13832)

#### Why I did it
Include below commits:
```
7147354 2023-02-14 | Fix: zero route may have empty nexthop (#276) [Qi Luo]
e60a64c 2022-11-30 | Use github code scanning instead of LGTM (#274) [Liu Shilong]
```
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 00b4dc0dfa66..7147354e08d6 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 00b4dc0dfa66bf1056fbe0eafd6bbca65b28c507
+Subproject commit 7147354e08d6ee225b96fdf37d2523dacab2736f

From 2135c6eb2ff558441ce5bbfbd5f7eff0cbaa262f Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Fri, 10 Feb 2023 11:07:13 +0800
Subject: [PATCH 1549/1674] [DX010 platform] fix dx010 platform testcase issues
 (#13595)

Why I did it
1. fix chassis test_set_fans_led case
2. fix chassis get_name case mismatch issue
3. fix fan_drawer test_set_fans_speed
4. fix component test_components test case

How I did it
Add corresponding configuration into chassis json file

How to verify it
Run platform tests cases to verify these failure cases
---
 .../x86_64-cel_seastone-r0/platform.json      | 85 ++++++++++++++++---
 .../platform_components.json                  |  2 +-
 .../sonic_platform/chassis.py                 |  2 +-
 .../sonic_platform/eeprom.py                  |  3 +
 .../sonic_platform/sfp.py                     | 13 +++
 5 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform.json b/device/celestica/x86_64-cel_seastone-r0/platform.json
index 34671b005016..6164c629611e 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "name": "Celestica-DX010-C32",
+        "name": "DX010",
         "status_led": {
             "controllable": true,
             "colors": ["green", "off"]
@@ -18,6 +18,9 @@
             {
                 "name": "CPLD4"
             },
+            {
+                "name": "CPLD5"
+            },
             {
                 "name": "BIOS"
             }
@@ -123,10 +126,22 @@
                 },
                 "fans": [
                     {
-                        "name": "FAN-1F"
+                        "name": "FAN-1F",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "FAN-1R"
+                        "name": "FAN-1R",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             },
@@ -138,10 +153,22 @@
                 },
                 "fans": [
                     {
-                        "name": "FAN-2F"
+                        "name": "FAN-2F",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "FAN-2R"
+                        "name": "FAN-2R",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             },
@@ -153,10 +180,22 @@
                 },
                 "fans": [
                     {
-                        "name": "FAN-3F"
+                        "name": "FAN-3F",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "FAN-3R"
+                        "name": "FAN-3R",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             },
@@ -168,10 +207,22 @@
                 },
                 "fans": [
                     {
-                        "name": "FAN-4F"
+                        "name": "FAN-4F",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "FAN-4R"
+                        "name": "FAN-4R",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             },
@@ -183,10 +234,22 @@
                 },
                 "fans": [
                     {
-                        "name": "FAN-5F"
+                        "name": "FAN-5F",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "FAN-5R"
+                        "name": "FAN-5R",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             }
diff --git a/device/celestica/x86_64-cel_seastone-r0/platform_components.json b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
index 8df07b1320ce..1574e1bd2c38 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform_components.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "Seastone-DX010": {
+        "DX010": {
             "component": {
                 "CPLD1": {},
                 "CPLD2": {},
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
index 3f61ef139b2d..51da9c2353fb 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py
@@ -270,7 +270,7 @@ def get_name(self):
             Returns:
             string: The name of the device
         """
-        return self._api_helper.hwsku
+        return self._eeprom.get_product_name()
 
     def get_presence(self):
         """
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
index bfde69c8d296..9652ae8c3b75 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py
@@ -131,6 +131,9 @@ def _valid_tlv(self, eeprom_data):
     def get_eeprom(self):
         return self._valid_tlv(self._eeprom)
 
+    def get_product_name(self):
+        return self._eeprom.get('0x21', NULL)
+
     def get_pn(self):
         return self._eeprom.get('0x22', NULL)
 
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
index c1423ed8dc7d..3c14d7fb9a33 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
@@ -2202,3 +2202,16 @@ def is_replaceable(self):
             A boolean value, True if replaceable
         """
         return True
+
+    def get_error_description(self):
+        """
+        Retrives the error descriptions of the SFP module
+        Returns:
+            String that represents the current error descriptions of vendor specific errors
+            In case there are multiple errors, they should be joined by '|',
+            like: "Bad EEPROM|Unsupported cable"
+        """
+        if not self.get_presence():
+            return self.SFP_STATUS_UNPLUGGED
+
+        return self.SFP_STATUS_OK

From e01e1860d46e469155bf7a6e5569c684b724157e Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 15 Feb 2023 10:31:59 -0800
Subject: [PATCH 1550/1674] [Arista] Disable ATA NCQ for a few products
 (#13739)

Why I did it
Some products might experience an occasional IO failure in the communication between CPU and SSD.
Based on some research it could be attributable to some device not handling ATA NCQ (Native Command Queue).

This issue currently affect 4 products:

DCS-7170-32C*
DCS-7170-64C
DCS-7060DX4-32
DCS-7260CX3-64

How I did it
This change disable NCQ on the affected drive for a small set of products.

How to verify it
When the fix is applied, these 2 patterns can be found in the dmesg.
ata1.00: FORCE: horkage modified (noncq)
NCQ (not used)

Test results using: fio --direct=1 --rw=randrw --bs=64k --ioengine=libaio --iodepth=64 --runtime=120 --numjobs=4

with NCQ (ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (depth 32), AA)

   READ: bw=33.9MiB/s (35.6MB/s), 33.9MiB/s-33.9MiB/s (35.6MB/s-35.6MB/s), io=4073MiB (4270MB), run=120078-120078msec
  WRITE: bw=34.1MiB/s (35.8MB/s), 34.1MiB/s-34.1MiB/s (35.8MB/s-35.8MB/s), io=4100MiB (4300MB), run=120078-120078msec
without NCQ (ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (not used))

   READ: bw=31.7MiB/s (33.3MB/s), 31.7MiB/s-31.7MiB/s (33.3MB/s-33.3MB/s), io=3808MiB (3993MB), run=120083-120083msec
  WRITE: bw=31.9MiB/s (33.4MB/s), 31.9MiB/s-31.9MiB/s (33.4MB/s-33.4MB/s), io=3830MiB (4016MB), run=120083-120083msec
Which release branch to backport (provide reason below if selected)
---
 files/Aboot/boot0.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 10dfd8e83044..3c95efe82c14 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -581,6 +581,10 @@ write_platform_specific_cmdline() {
         cmdline_add intel_idle.max_cstate=0
         read_system_eeprom
     fi
+    if in_array "$platform" "rook"; then
+        # Currently applies to Alhambra, Blackhawk, Gardena and Mineral
+        cmdline_add libata.force=1.00:noncq
+    fi
     if in_array "$platform" "crow" "magpie"; then
         cmdline_add amd_iommu=off
         cmdline_add modprobe.blacklist=snd_hda_intel,hdaudio

From 2b39cd61fb48bb1fcd89502aa6e0d96e52ffe706 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Fri, 17 Feb 2023 10:41:25 -0800
Subject: [PATCH 1551/1674] [202012] [sonic-swss-common] Update
 sonic-swss-common submodule (#13813)

#### Why I did it
Submodule update for sonic-swss-common with following change:
```
3e34309 2023-02-11 | RedisPipeline ignore flush when call dtor from another thread. (#736) [Hua Liu]
```
---
 src/sonic-swss-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index c5ed58ae1fc2..3e34309be270 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit c5ed58ae1fc2ffb6ca6fbcef95403c8c6dabf78a
+Subproject commit 3e34309be2707fa64d65b1644915d77ed67fe34e

From 5b889543ee767b5e4014c777fa06b00319cedb7b Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawlee@microsoft.com>
Date: Fri, 17 Feb 2023 10:46:33 -0800
Subject: [PATCH 1552/1674] [202012][swss]: Submodule update (#13839)

Include following commit:

- 0d95f076 [202012]: Reduce log level when FDB cache lookup fails (#2667)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c98b9f09cb63..0d95f076b5b4 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c98b9f09cb632034b955e0e541f0c046c12f34d6
+Subproject commit 0d95f076b5b4e444eb8ea0a63b8ff4d883762440

From 7543993af3dbc2d3e77d34b9b74826ee6d3ac82b Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Sun, 19 Feb 2023 15:47:32 +0800
Subject: [PATCH 1553/1674] [202012] [Mellanox] Fix issue: SFP eeprom corrupted
 after replacing cable with different sfp type (#13543)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Why I did it
There are 3 tasks in xcvrd:

main task, run a loop to recover missing SFP static information to DB every 1 minute
SFP state task, a process which listens cable plug in/out event, insert SFP static information to DB while a cable is inserted
SFP DOM update task, a thread which handles cable DOM information update every 1 minute
Let assume user replaces QSFP with QSFP-DD. There are two issues:

Only SFP state task listens cable plug in/out event, main task and SFP DOM update task does not know SFP type has changed, they still “think” the SFP type is QSFP. So, main task and SFP DOM update task uses QSFP standard to parse QSFP-DD EEPROM which causes corrupted data.
There is a race condition between main task and SFP state task. They both insert SFP static information to DB. Depends on timing, it is possible that main task using wrong SFP type to override SFP static information.
The PR is to fix these two issues.

There is no such issue on 202205 and above because there is a refactor for xcvrd:

SFP state task was changed from process to thread, so that all 3 tasks share the same memory space, they always have correct SFP type.
Recover missing SFP information logical was moved from main task to SFP state task. There is no race condition anymore.

- How I did it
It is difficult to back port latest xcvrd because there are many refactor/new features in xcvrd after 202012 release. It will be huge effort to do so. Based on that, we decided to fix the issue on Nvidia platform API side. The fix is that: refreshing SFP type before any SFP API which accessing SFP EEPROM. Refreshing SFP type before any SFP API would cause a small performance down: Due to my test on 202012 branch, accessing transceiver INFO and DOM INFO for 32 ports takes 1.7 seconds before the change. The number changes to 2.4 seconds after the change. I suppose the performance down is acceptable.

- How to verify it
Manual test
Regression
---
 .../mlnx-platform-api/sonic_platform/sfp.py   | 101 +++++++++++-------
 1 file changed, 65 insertions(+), 36 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 8dc616b251d6..6cfe253aa3fb 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -7,6 +7,7 @@
 #############################################################################
 
 try:
+    import functools
     import time
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_eeprom import eeprom_dts
@@ -323,6 +324,24 @@ def deinitialize_sdk_handle(sdk_handle):
          logger.log_warning("Sdk handle is none")
          return False
 
+
+def refresh_sfp_type(refresh_dom_capability=True):
+    """Decorator to force refreshing sfp type
+
+    Args:
+        refresh_dom_capability (bool, optional): refresh DOM capability. Defaults to True.
+    """
+    def decorator(method):
+        @functools.wraps(method)
+        def _impl(self, *args, **kwargs):
+            self._refresh_sfp_type()
+            if refresh_dom_capability:
+                self._dom_capability_detect()
+            return method(self, *args, **kwargs)
+        return _impl
+    return decorator
+
+
 class SFP(SfpBase):
     """Platform-specific SFP class"""
 
@@ -332,9 +351,9 @@ def __init__(self, sfp_index, sfp_type, sdk_handle_getter, platform):
         self.sdk_sysfs_page_path_header = SFP_SYSFS_PATH.format(sfp_index)
         self.sfp_eeprom_path = "qsfp{}".format(self.index)
         self.sfp_status_path = "qsfp{}_status".format(self.index)
-        self._detect_sfp_type(sfp_type)
+        self._sfp_type = None
+        self._default_sfp_type = sfp_type
         self.dom_tx_disable_supported = False
-        self._dom_capability_detect()
         self.sdk_handle_getter = sdk_handle_getter
         self.sdk_index = sfp_index
 
@@ -352,7 +371,7 @@ def reinit(self):
         Re-initialize this SFP object when a new SFP inserted
         :return: 
         """
-        self._detect_sfp_type(self.sfp_type)
+        self._refresh_sfp_type()
         self._dom_capability_detect()
 
     def get_presence(self):
@@ -382,7 +401,8 @@ def _read_eeprom_specific_bytes(self, offset, num_bytes):
             if page_num == 0:
                 page = self.sdk_sysfs_page_path_header + PATH_PAGE00
             else:
-                if self.sfp_type == SFP_TYPE and page_num == 1:
+                self._refresh_sfp_type()
+                if page_num == 1 and self.sfp_type == SFP_TYPE:
                     page = self.sdk_sysfs_page_path_header + PATH_PAGE00_A2
                 else:
                     page = self.sdk_sysfs_page_path_header + PATH_PAGE.format(page_num)
@@ -394,26 +414,33 @@ def _read_eeprom_specific_bytes(self, offset, num_bytes):
         except (OSError, IOError):
             return None
 
-    def _detect_sfp_type(self, sfp_type):
-        eeprom_raw = []
-        eeprom_raw = self._read_eeprom_specific_bytes(XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH)
-        if eeprom_raw:
-            if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
-                self.sfp_type = SFP_TYPE
-            elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
-                self.sfp_type = QSFP_TYPE
-            elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
-                self.sfp_type = QSFP_DD_TYPE
+    @property
+    def sfp_type(self):
+        if self._sfp_type is None:
+            eeprom_raw = []
+            eeprom_raw = self._read_eeprom_specific_bytes(XCVR_TYPE_OFFSET, XCVR_TYPE_WIDTH)
+            if eeprom_raw:
+                if eeprom_raw[0] in SFP_TYPE_CODE_LIST:
+                    self._sfp_type = SFP_TYPE
+                elif eeprom_raw[0] in QSFP_TYPE_CODE_LIST:
+                    self._sfp_type = QSFP_TYPE
+                elif eeprom_raw[0] in QSFP_DD_TYPE_CODE_LIST:
+                    self._sfp_type = QSFP_DD_TYPE
+                else:
+                    # we don't recognize this identifier value, treat the xSFP module as the default type
+                    self._sfp_type = self._default_sfp_type
+                    logger.log_info("Identifier value of {} module {} is {} which isn't recognized and will be treated as default type ({})".format(
+                        self._default_sfp_type, self.index, eeprom_raw[0], self._default_sfp_type
+                    ))
             else:
-                # we don't regonize this identifier value, treat the xSFP module as the default type
-                self.sfp_type = sfp_type
-                logger.log_info("Identifier value of {} module {} is {} which isn't regonized and will be treated as default type ({})".format(
-                    sfp_type, self.index, eeprom_raw[0], sfp_type
-                ))
-        else:
-            # eeprom_raw being None indicates the module is not present.
-            # in this case we treat it as the default type according to the SKU
-            self.sfp_type = sfp_type
+                # eeprom_raw being None indicates the module is not present.
+                # in this case we treat it as the default type according to the SKU
+                self._sfp_type = self._default_sfp_type
+            self._default_sfp_type = self._sfp_type
+        return self._sfp_type
+
+    def _refresh_sfp_type(self):
+        self._sfp_type = None
 
     def _is_qsfp_copper(self):
         # This function read the specification compliance byte and
@@ -537,6 +564,7 @@ def _dom_capability_detect(self):
                 self.dom_supported = False
                 self.dom_temp_supported = False
                 self.dom_volt_supported = False
+                self.second_application_list = False
                 self.dom_rx_power_supported = False
                 self.dom_tx_power_supported = False
                 self.dom_tx_bias_power_supported = False
@@ -595,7 +623,7 @@ def _convert_string_to_num(self, value_str):
         else:
             return 'N/A'
 
-
+    @refresh_sfp_type()
     def get_transceiver_info(self):
         """
         Retrieves transceiver info of this SFP
@@ -900,7 +928,7 @@ def get_transceiver_info(self):
 
         return transceiver_info_dict
 
-
+    @refresh_sfp_type()
     def get_transceiver_bulk_status(self):
         """
         Retrieves transceiver bulk status of this SFP
@@ -1100,7 +1128,7 @@ def get_transceiver_bulk_status(self):
 
         return transceiver_dom_info_dict
 
-
+    @refresh_sfp_type()
     def get_transceiver_threshold_info(self):
         """
         Retrieves transceiver threshold info of this SFP
@@ -1279,7 +1307,7 @@ def get_transceiver_threshold_info(self):
 
         return transceiver_dom_threshold_info_dict
 
-
+    @refresh_sfp_type()
     def get_reset_status(self):
         """
         Retrieves the reset status of SFP
@@ -1332,6 +1360,7 @@ def get_reset_status(self):
             dom_channel_status_data = sfpd_obj.parse_dom_channel_status(dom_channel_status_raw, 0)
             return dom_channel_status_data['data']['Status']['value'] == 'On'
 
+    @refresh_sfp_type()
     def get_rx_los(self):
         """
         Retrieves the RX LOS (lost-of-signal) status of SFP
@@ -1364,7 +1393,7 @@ def get_rx_los(self):
             rx_los_list.append(False)
         return rx_los_list
 
-
+    @refresh_sfp_type()
     def get_tx_fault(self):
         """
         Retrieves the TX fault status of SFP
@@ -1397,7 +1426,7 @@ def get_tx_fault(self):
             tx_fault_list.append(False)
         return tx_fault_list
 
-
+    @refresh_sfp_type()
     def get_tx_disable(self):
         """
         Retrieves the tx_disable status of this SFP
@@ -1500,7 +1529,7 @@ def get_lpmode(self):
 
         return oper_pwr_mode == SX_MGMT_PHY_MOD_PWR_MODE_LOW_E
 
-
+    @refresh_sfp_type(refresh_dom_capability=True)
     def get_power_override(self):
         """
         Retrieves the power-override status of this SFP
@@ -1521,7 +1550,7 @@ def get_power_override(self):
         else:
             return NotImplementedError
 
-
+    @refresh_sfp_type()
     def get_temperature(self):
         """
         Retrieves the temperature of this SFP
@@ -1579,7 +1608,7 @@ def get_temperature(self):
             else:
                 return None
 
-
+    @refresh_sfp_type()
     def get_voltage(self):
         """
         Retrieves the supply voltage of this SFP
@@ -1638,7 +1667,7 @@ def get_voltage(self):
             else:
                 return None
 
-
+    @refresh_sfp_type()
     def get_tx_bias(self):
         """
         Retrieves the TX bias current of this SFP
@@ -1672,7 +1701,7 @@ def get_tx_bias(self):
                 if sfpd_obj is None:
                     return None
 
-                if dom_tx_bias_power_supported:
+                if self.dom_tx_bias_power_supported:
                     dom_tx_bias_raw = self._read_eeprom_specific_bytes((offset + QSFP_DD_TX_BIAS_OFFSET), QSFP_DD_TX_BIAS_WIDTH)
                     if dom_tx_bias_raw is not None:
                         dom_tx_bias_data = sfpd_obj.parse_dom_tx_bias(dom_tx_bias_raw, 0)
@@ -1705,7 +1734,7 @@ def get_tx_bias(self):
 
         return tx_bias_list
 
-
+    @refresh_sfp_type()
     def get_rx_power(self):
         """
         Retrieves the received optical power for this SFP
@@ -1781,7 +1810,7 @@ def get_rx_power(self):
                 return None
         return rx_power_list
 
-
+    @refresh_sfp_type()
     def get_tx_power(self):
         """
         Retrieves the TX power of this SFP

From d046712b25539cd0e64e030790d589b3ed006dc5 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Mon, 20 Feb 2023 18:16:25 +0800
Subject: [PATCH 1554/1674] [ci] Kill hanged docker build process to avoid
 build timeout issue. (#13726) (#13731)

Why I did it
Docker build has a low rate of hanging up.
It hangs on different steps. So, it looks like a bug in docker daemon.

How I did it
Start a daemon process to scan running time more than 1 hours, and kill the process.

How to verify it
---
 .azure-pipelines/azure-pipelines-build.yml |  1 +
 .azure-pipelines/cleanup.yml               |  7 +++++++
 .azure-pipelines/template-daemon.yml       | 24 ++++++++++++++++++++++
 .azure-pipelines/template-variables.yml    |  2 ++
 4 files changed, 34 insertions(+)
 create mode 100644 .azure-pipelines/template-daemon.yml

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index c7cbc363d9f6..3ffc148db4e2 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -98,6 +98,7 @@ jobs:
 
     buildSteps:
       - template: template-skipvstest.yml
+      - template: template-daemon.yml
       - bash: |
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
diff --git a/.azure-pipelines/cleanup.yml b/.azure-pipelines/cleanup.yml
index 6569c8ed0bf3..4f74de0f413a 100644
--- a/.azure-pipelines/cleanup.yml
+++ b/.azure-pipelines/cleanup.yml
@@ -1,5 +1,11 @@
 steps:
 - script: |
+    set -x
+    # kill daemon process
+    ps $(cat /tmp/azp_daemon_kill_docker_pid)
+    sudo kill $(cat /tmp/azp_daemon_kill_docker_pid)
+    rm /tmp/azp_daemon_kill_docker_pid
+
     if sudo [ -f /var/run/march/docker.pid ] ; then
         pid=`sudo cat /var/run/march/docker.pid` ; sudo kill $pid
     fi
@@ -11,4 +17,5 @@ steps:
         pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
     fi
     sudo rm -rf $(ls -A1)
+  condition: always()
   displayName: "Clean Workspace"
diff --git a/.azure-pipelines/template-daemon.yml b/.azure-pipelines/template-daemon.yml
new file mode 100644
index 000000000000..b0915557ced2
--- /dev/null
+++ b/.azure-pipelines/template-daemon.yml
@@ -0,0 +1,24 @@
+steps:
+- bash: |
+    (
+      while true
+      do
+        sleep 120
+        now=$(date +%s)
+        pids=$(ps -C docker -o pid,etime,args | grep "docker build" | cut -d" " -f1)
+        for pid in $pids
+        do
+          start=$(date --date="$(ls -dl /proc/$pid --time-style full-iso | awk '{print$6,$7}')" +%s)
+          time_s=$(($now-$start))
+          if [[ $time_s -gt $(DOCKER_BUILD_TIMEOUT) ]]; then
+            echo =========== $(date +%F%T) $time_s &>> target/daemon.log
+            ps $pid &>> target/daemon.log
+            sudo kill $pid
+          fi
+        done
+      done
+    ) &
+    daemon_pid=$!
+    ps $daemon_pid
+    echo $daemon_pid >> /tmp/azp_daemon_kill_docker_pid
+  displayName: start daemon to kill hang docker
diff --git a/.azure-pipelines/template-variables.yml b/.azure-pipelines/template-variables.yml
index 027dfee9986a..42d46182d263 100644
--- a/.azure-pipelines/template-variables.yml
+++ b/.azure-pipelines/template-variables.yml
@@ -4,3 +4,5 @@ variables:
   SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
   SONIC_BUILD_RETRY_COUNT: 3
   SONIC_BUILD_RETRY_INTERVAL: 600
+  DOCKER_BUILDKIT: 0
+  DOCKER_BUILD_TIMEOUT: 3600

From 6230ced2b17a5d3218a28820d8f81d13f41bb249 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:49:29 +0800
Subject: [PATCH 1555/1674] [ci/build]: Upgrade SONiC package versions (#13897)

---
 .../versions-deb-buster                       |  4 +-
 .../build-sonic-slave-buster/versions-git     | 10 +--
 .../build-sonic-slave-buster/versions-py2     |  2 +-
 .../build-sonic-slave-buster/versions-py3     |  4 +-
 .../versions-py3-all-arm64                    |  4 +-
 .../versions-py3-all-armhf                    |  4 +-
 .../build-sonic-slave-buster/versions-web     |  4 +-
 .../versions-deb-stretch                      |  3 -
 .../build-sonic-slave-stretch/versions-py2    | 15 +---
 .../build-sonic-slave-stretch/versions-web    |  4 +-
 files/build/versions/default/versions-docker  | 13 ++--
 files/build/versions/default/versions-git     | 12 +--
 files/build/versions/default/versions-web     |  6 +-
 .../docker-base-buster/versions-deb-buster    |  8 +-
 .../dockers/docker-base-buster/versions-py3   |  4 +-
 .../docker-base-stretch/versions-deb-stretch  | 76 -------------------
 .../dockers/docker-base-stretch/versions-py2  |  6 --
 .../versions-deb-stretch                      | 46 -----------
 .../docker-config-engine-stretch/versions-py2 | 22 ------
 .../docker-fpm-frr/versions-deb-buster        | 10 +--
 .../dockers/docker-lldp/versions-deb-buster   |  4 +-
 .../docker-platform-monitor/versions-py2      |  2 +-
 .../versions/dockers/docker-ptf/versions-py2  |  4 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  4 +-
 .../versions/dockers/docker-snmp/versions-py3 |  2 +-
 .../docker-snmp/versions-py3-all-armhf        |  1 -
 .../docker-sonic-mgmt-framework/versions-py3  | 25 +++---
 .../docker-sonic-vs/versions-deb-buster       |  4 +-
 .../dockers/docker-sonic-vs/versions-py2      |  4 +-
 .../dockers/docker-sonic-vs/versions-py3      |  6 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  4 +-
 .../docker-syncd-bfn/versions-deb-buster      |  6 +-
 .../docker-syncd-brcm-rpc/versions-deb-buster |  4 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  4 +-
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  4 +-
 .../docker-syncd-nephos/versions-deb-stretch  | 29 -------
 .../sonic-slave-buster/versions-deb-buster    | 71 ++++++++---------
 .../versions-deb-buster-arm64                 |  2 +-
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  4 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py3  |  2 +-
 .../versions/host-image/versions-deb-buster   | 23 +++---
 .../host-image/versions-deb-buster-arm64      |  3 +
 .../host-image/versions-deb-buster-armhf      |  3 +
 files/build/versions/host-image/versions-py2  |  3 +-
 files/build/versions/host-image/versions-py3  | 15 ++--
 50 files changed, 157 insertions(+), 343 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
 delete mode 100644 files/build/versions/dockers/docker-base-stretch/versions-py2
 delete mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
 delete mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-py2
 delete mode 100644 files/build/versions/dockers/docker-snmp/versions-py3-all-armhf
 delete mode 100644 files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 5c7de383dae9..b50fc2cab25f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -14,8 +14,8 @@ libnl-genl-3-200==3.5.0-1
 libnl-genl-3-dev==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
-libsaibcm==4.3.7.1-6
-libsaibcm-dev==4.3.7.1-6
+libsaibcm==4.3.7.1-7
+libsaibcm-dev==4.3.7.1-7
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 6c494e18cb16..e6f1049b1a3d 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,14 +1,14 @@
-https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
+https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa
+https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452
+https://github.com/sflow/host-sflow==6889a0914b821c8dcfd0e37794196f5c7d017221
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index 282fc1c8a060..babe2cbd1e55 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -1,7 +1,7 @@
 bitarray==1.5.3
 contextlib2==0.6.0.post1
 functools32==3.2.3.post2
-future==0.18.2
+future==0.18.3
 importlib-resources==3.3.1
 jsonschema==2.6.0
 natsort==6.2.1
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index ea8b7de71681..7e940600fc67 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,4 +1,4 @@
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
 click==7.0
 docker==6.0.1
 ijson==2.6.1
@@ -13,6 +13,6 @@ pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
 thrift==0.13.0
-websocket-client==1.4.2
+websocket-client==1.5.1
 xmltodict==0.12.0
 zipp==1.2.0
\ No newline at end of file
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
index 42b63c026353..949c3055bf13 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.28.1
-urllib3==1.26.13
\ No newline at end of file
+requests==2.28.2
+urllib3==1.26.14
\ No newline at end of file
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
index 42b63c026353..949c3055bf13 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
 lxml==4.6.3
-requests==2.28.1
-urllib3==1.26.13
\ No newline at end of file
+requests==2.28.2
+urllib3==1.26.14
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
index cfd20d032a61..a1d7e4f7c824 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-web
@@ -40,5 +40,5 @@ https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.ta
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm-dev_4.3.7.1-7_amd64.deb==ec7a1c729dca33d18a71ac8a15f5ef0b
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm_4.3.7.1-7_amd64.deb==29314badd4324537d6be08acfff59d02
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index af7a04c29723..c3f79d28969b 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -10,7 +10,6 @@ libnl-nf-3-dev==3.5.0-1
 libnl-route-3-dev==3.5.0-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
-libsainps==1.5.0
 libsairedis==1.0.0
 libsaivs==1.0.0
 libsaivs-dev==1.0.0
@@ -18,7 +17,5 @@ libswsscommon==1.0.0
 libswsscommon-dev==1.0.0
 libthrift-0.11.0==0.11.0-4
 libthrift-dev==0.11.0-4
-python-swsscommon==1.0.0
 python-thrift==0.11.0-4
-syncd==1.0.0
 thrift-compiler==0.11.0-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index b79fd56fa0fa..40414e6f3143 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,15 +1,2 @@
-bitarray==1.5.3
-contextlib2==0.6.0.post1
-future==0.18.2
-importlib-resources==3.3.1
-natsort==6.2.1
-netaddr==0.8.0
-pathlib2==2.3.7.post1
-pyang==2.5.3
-pyangbind==0.6.0
-redis==3.5.3
 sairedis==1.0
-scandir==1.10.0
-singledispatch==3.7.0
-thrift==0.11.0
-zipp==1.2.0
\ No newline at end of file
+thrift==0.11.0
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
index 396e45a85c04..de969d73e676 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web
@@ -1,2 +1,2 @@
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7
\ No newline at end of file
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm-dev_4.3.7.1-7_amd64.deb==ec7a1c729dca33d18a71ac8a15f5ef0b
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm_4.3.7.1-7_amd64.deb==29314badd4324537d6be08acfff59d02
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index a46d3ca20151..1c4402c80f9f 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,9 @@
-amd64:amd64/debian:buster==sha256:09739ccbaff5b5569817c554bad447c68707932f46b2da93cd5a0cdb218f4898
-amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
+amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf
+amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:b366e2065a4d63182ab1acb0f5b7267066c181c0206dde64594e951a62e73f96
-arm64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
+arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9
+arm64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:f6657e72719700232d3efe8750c1bb20fadbc0a2d22c54e631b52f60b752ee3a
-armhf:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798
+armhf:arm32v7/debian:buster==sha256:d0a16ffa3bc4302a306263e5abffe04d0340ea964e0e037afef17a3e9765b48a
+armhf:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 00979cdd370e..c8ba585f5589 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,20 +1,20 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==30136f0cb715c04b8e3fb7aec59338f1563a76ae
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f
+https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
-https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa
+https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452
+https://github.com/sflow/host-sflow==6889a0914b821c8dcfd0e37794196f5c7d017221
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index aaeb27134e83..75ca541b578d 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -18,7 +18,7 @@ http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
-https://deb.nodesource.com/node_14.x/dists/buster/Release==d701f2bf6451c4b10cf3670af05ab217
+https://deb.nodesource.com/node_14.x/dists/buster/Release==42875141604382f0abb4d047f645dfe1
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
 https://deb.nodesource.com/setup_14.x==7e3b27b12367cbc79d788cd43bbc917c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
@@ -32,9 +32,6 @@ https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf3
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
-https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
-https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
-https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag==a444c876aaf2a8b4c99238f15fbc13a0
 https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
@@ -49,7 +46,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
-https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 7f95f2a5d7c4..5ed984488de8 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -1,9 +1,9 @@
 ca-certificates==20200601~deb10u2
-curl==7.64.0-4+deb10u3
+curl==7.64.0-4+deb10u4
 jq==1.5+dfsg-2+b1
 less==487-0.1+b1
 libatomic1==8.3.0-6
-libcurl4==7.64.0-4+deb10u3
+libcurl4==7.64.0-4+deb10u4
 libdaemon0==0.14-7
 libdbus-1-3==1.12.24-0+deb10u1
 libestr0==0.1.10-2.1
@@ -42,7 +42,7 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1n-0+deb10u3
+libssl1.1==1.1.1n-0+deb10u4
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
@@ -50,7 +50,7 @@ lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1n-0+deb10u3
+openssl==1.1.1n-0+deb10u4
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 4cb64ea768d0..4602e8aa671e 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,6 +1,6 @@
 j2cli==0.3.10
 jinja2==3.1.2
-markupsafe==2.1.1
+markupsafe==2.1.2
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
-toposort==1.7
\ No newline at end of file
+toposort==1.9
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
deleted file mode 100644
index 456ed031ac62..000000000000
--- a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
+++ /dev/null
@@ -1,76 +0,0 @@
-ca-certificates==20200601~deb9u2
-curl==7.52.1-5+deb9u16
-jq==1.5+dfsg-1.3
-less==481-2.1
-libatomic1==6.3.0-18+deb9u1
-libcurl3==7.52.1-5+deb9u16
-libdaemon0==0.14-6
-libdbus-1-3==1.10.32-0+deb9u1
-libestr0==0.1.10-2
-libexpat1==2.2.0-2+deb9u5
-libfastjson4==0.99.8-1~bpo9+1
-libffi6==3.2.1-6
-libgdbm3==1.8.3-14
-libgmp10==2:6.1.2+dfsg-1+deb9u1
-libgnutls30==3.5.8-5+deb9u6
-libgssapi-krb5-2==1.15-1+deb9u3
-libhiredis0.14==0.14.0-3~bpo9+1
-libhogweed4==3.3-1+deb9u1
-libidn2-0==0.16-1+deb9u1
-libjansson4==2.9-1
-libjemalloc1==3.6.0-9.1
-libjq1==1.5+dfsg-1.3
-libk5crypto3==1.15-1+deb9u3
-libkeyutils1==1.5.9-9
-libkrb5-3==1.15-1+deb9u3
-libkrb5support0==1.15-1+deb9u3
-libldap-2.4-2==2.4.44+dfsg-5+deb9u9
-libldap-common==2.4.44+dfsg-5+deb9u9
-liblognorm5==2.0.3-1~bpo9+1
-liblua5.1-0==5.1.5-8.1+b2
-libncurses5==6.0+20161126-1+deb9u2
-libnghttp2-14==1.18.1-1+deb9u2
-libonig4==6.1.3-2+deb9u2
-libp11-kit0==0.23.3-2+deb9u1
-libperl5.24==5.24.1-3+deb9u7
-libpgm-5.2-0==5.2.122~dfsg-2
-libprocps6==2:3.3.12-3+deb9u1
-libpsl5==0.17.0-3
-libpython-stdlib==2.7.13-2
-libpython2.7==2.7.13-2+deb9u6
-libpython2.7-minimal==2.7.13-2+deb9u6
-libpython2.7-stdlib==2.7.13-2+deb9u6
-libreadline7==7.0-3
-librtmp1==2.4+20151223.gitfa8646d.1-1+b1
-libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
-libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
-libsodium18==1.0.11-2
-libsqlite3-0==3.16.2-5+deb9u3
-libssh2-1==1.7.0-1+deb9u2
-libssl1.0.2==1.0.2u-1~deb9u7
-libssl1.1==1.1.0l-1~deb9u6
-libtasn1-6==4.10-1.1+deb9u1
-libunistring0==0.9.6+really0.9.3-0.1
-libwrap0==7.6.q-26
-libzmq5==4.2.1-4+deb9u4
-lua-bitop==1.0.2-4
-lua-cjson==2.1.0+dfsg-2
-mime-support==3.60
-net-tools==1.60+git20161116.90da8a0-1
-openssl==1.1.0l-1~deb9u6
-perl==5.24.1-3+deb9u7
-perl-modules-5.24==5.24.1-3+deb9u7
-procps==2:3.3.12-3+deb9u1
-python==2.7.13-2
-python-minimal==2.7.13-2
-python-pip==9.0.1-2+deb9u2
-python-pip-whl==9.0.1-2+deb9u2
-python2.7==2.7.13-2+deb9u6
-python2.7-minimal==2.7.13-2+deb9u6
-readline-common==7.0-3
-redis-tools==5:6.0.6-1~bpo10+1
-rsyslog==8.1901.0-1~bpo9+1
-socat==1.7.3.1-2+deb9u1
-vim-common==2:8.0.0197-4+deb9u7
-vim-tiny==2:8.0.0197-4+deb9u7
-xxd==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
deleted file mode 100644
index 888ec533991a..000000000000
--- a/files/build/versions/dockers/docker-base-stretch/versions-py2
+++ /dev/null
@@ -1,6 +0,0 @@
-j2cli==0.3.10
-jinja2==2.11.3
-markupsafe==1.1.1
-supervisor==4.2.5
-supervisord-dependent-startup==1.4.0
-toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
deleted file mode 100644
index 31dbc0f02747..000000000000
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
+++ /dev/null
@@ -1,46 +0,0 @@
-binutils==2.28-5
-build-essential==12.3
-bzip2==1.0.6-8.1
-cpp==4:6.3.0-4
-cpp-6==6.3.0-18+deb9u1
-dpkg-dev==1.18.26
-g++==4:6.3.0-4
-g++-6==6.3.0-18+deb9u1
-gcc==4:6.3.0-4
-gcc-6==6.3.0-18+deb9u1
-libasan3==6.3.0-18+deb9u1
-libatomic1==6.3.0-18+deb9u1
-libc-dev-bin==2.24-11+deb9u4
-libc6-dev==2.24-11+deb9u4
-libcc1-0==6.3.0-18+deb9u1
-libcilkrts5==6.3.0-18+deb9u1
-libdpkg-perl==1.18.26
-libexpat1-dev==2.2.0-2+deb9u5
-libgcc-6-dev==6.3.0-18+deb9u1
-libgomp1==6.3.0-18+deb9u1
-libhiredis0.14==0.14.0-3~bpo9+1
-libisl15==0.18-1
-libitm1==6.3.0-18+deb9u1
-liblsan0==6.3.0-18+deb9u1
-libmpc3==1.0.3-1+b2
-libmpfr4==3.1.5-1
-libmpx2==6.3.0-18+deb9u1
-libnl-3-200==3.5.0-1
-libnl-cli-3-200==3.5.0-1
-libnl-genl-3-200==3.5.0-1
-libnl-nf-3-200==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libpython-dev==2.7.13-2
-libpython2.7-dev==2.7.13-2+deb9u6
-libquadmath0==6.3.0-18+deb9u1
-libstdc++-6-dev==6.3.0-18+deb9u1
-libswsscommon==1.0.0
-libtsan0==6.3.0-18+deb9u1
-libubsan0==6.3.0-18+deb9u1
-linux-libc-dev==4.9.320-2
-make==4.1-9.1
-patch==2.7.5-1+deb9u2
-python-dev==2.7.13-2
-python-swsscommon==1.0.0
-python2.7-dev==2.7.13-2+deb9u6
-xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
deleted file mode 100644
index 80bc32c71a81..000000000000
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ /dev/null
@@ -1,22 +0,0 @@
-bitarray==1.5.3
-contextlib2==0.6.0.post1
-future==0.18.2
-importlib-resources==3.3.1
-ipaddress==1.0.23
-lxml==4.6.3
-natsort==6.2.1
-netaddr==0.8.0
-pathlib2==2.3.7.post1
-pyang==2.5.3
-pyangbind==0.6.0
-pyyaml==5.4.1
-redis==3.5.3
-redis-dump-load==1.1
-scandir==1.10.0
-singledispatch==3.7.0
-six==1.16.0
-sonic-config-engine==1.0
-sonic-py-common==1.0
-swsssdk==2.0.1
-typing==3.10.0.0
-zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 8ab29c912939..28343d3bd99a 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -7,26 +7,26 @@ gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
-libc-ares2==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u2
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libipt2==2.0-2
 libjson-c3==0.12.1+ds-2+deb10u1
-libmariadb3==1:10.3.36-0+deb10u2
+libmariadb3==1:10.3.38-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
-libsnmp-base==5.7.3+dfsg-5+deb10u3
-libsnmp30==5.7.3+dfsg-5+deb10u3
+libsnmp-base==5.7.3+dfsg-5+deb10u4
+libsnmp30==5.7.3+dfsg-5+deb10u4
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyang1==1.0.184-2
 libyang1-dbgsym==1.0.184-2
 logrotate==3.14.0-4
-mariadb-common==1:10.3.36-0+deb10u2
+mariadb-common==1:10.3.38-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sensible-utils==0.0.12
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index b658e2abc158..c66605bfb3c5 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -9,7 +9,7 @@ libglib2.0-0==2.58.3-2+deb10u4
 libgpm2==1.20.7-5
 libicu63==63.1-6+deb10u3
 libipt2==2.0-2
-libmariadb3==1:10.3.36-0+deb10u2
+libmariadb3==1:10.3.38-0+deb10u1
 libpci3==1:3.5.2-1
 libpopt0==1.16-12
 libsensors-config==1:3.5.0-3
@@ -21,7 +21,7 @@ libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u5
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
-mariadb-common==1:10.3.36-0+deb10u2
+mariadb-common==1:10.3.38-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index cbd6d764d36e..61c36312f823 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -2,7 +2,7 @@ bitarray==1.5.3
 contextlib2==0.6.0.post1
 enum34==1.1.10
 functools32==3.2.3.post2
-future==0.18.2
+future==0.18.3
 importlib-resources==3.3.1
 ipaddress==1.0.23
 jinja2==2.11.3
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 20b5f435dfc0..422772114bed 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -11,7 +11,7 @@ enum34==1.1.6
 exabgp==3.4.17
 flask==1.0
 flask-httpauth==2.5.0
-future==0.18.2
+future==0.18.3
 futures==3.2.0
 grpcio==1.18.0
 grpcio-tools==1.15.0
@@ -60,7 +60,7 @@ traitlets==4.3.3
 twisted==16.0.0
 typing==3.10.0.0
 unittest-xml-reporting==2.5.2
-wcwidth==0.2.5
+wcwidth==0.2.6
 werkzeug==1.0.1
 yabgp==0.8.2
 zipp==1.2.0
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
index c4b5c984b6f2..d503aedc2a83 100644
--- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -18,7 +18,7 @@ libprotobuf17==3.6.1.3-2
 libqt5core5a==5.11.3+dfsg1-1+deb10u5
 libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
-libsaibcm==4.3.7.1-6
+libsaibcm==4.3.7.1-7
 libsaithrift-dev==0.9.4
 libthrift-0.13.0==0.13.0-6
 libyaml-0-2==0.2.1-1
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index c33e2ce203c3..1121322c46c7 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -30,7 +30,7 @@ libipt2==2.0-2
 libisl19==0.20-2
 libitm1==8.3.0-6
 liblsan0==8.3.0-6
-libmariadb3==1:10.3.36-0+deb10u2
+libmariadb3==1:10.3.38-0+deb10u1
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
@@ -50,7 +50,7 @@ libunwind8==1.2.1-10~deb10u1
 linux-libc-dev==4.19.269-1
 locales==2.28-10+deb10u2
 make==4.2.1-1.2
-mariadb-common==1:10.3.36-0+deb10u2
+mariadb-common==1:10.3.38-0+deb10u1
 mysql-common==5.8+1.0.5
 openssh-client==1:7.9p1-10+deb10u2
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index 45ab6f7da69a..afc74f17cb0f 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
-hiredis==2.1.0
+hiredis==2.2.2
 psutil==5.9.4
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf b/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf
deleted file mode 100644
index 252e8c7f1140..000000000000
--- a/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf
+++ /dev/null
@@ -1 +0,0 @@
-hiredis==2.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 1c67bc1b56fe..5076c2301ab1 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,30 +1,31 @@
 attrs==22.2.0
 certifi==2017.4.17
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.2.2
+flask==2.2.3
 grpcio==1.51.1
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==6.0.0
-importlib-resources==5.10.2
+importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.17.3
-jsonschema-spec==0.1.2
-lazy-object-proxy==1.8.0
-openapi-schema-validator==0.3.4
-openapi-spec-validator==0.5.1
+jsonschema-spec==0.1.3
+lazy-object-proxy==1.9.0
+openapi-schema-validator==0.4.3
+openapi-spec-validator==0.5.5
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.21.12
+protobuf==4.22.0
 pyrsistent==0.19.3
 python-dateutil==2.6.0
-requests==2.28.1
+requests==2.28.2
+rfc3339-validator==0.1.4
 six==1.11.0
-typing_extensions==4.4.0
+typing_extensions==4.5.0
 urllib3==1.26.5
-werkzeug==2.2.2
-zipp==3.11.0
\ No newline at end of file
+werkzeug==2.2.3
+zipp==3.14.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 4839edd5bf81..5e5a15d136fe 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -40,7 +40,7 @@ libboost-program-options1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
 libboost-thread1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
-libc-ares2==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u2
 libc-dev-bin==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
 libcc1-0==8.3.0-6
@@ -95,7 +95,7 @@ libquadmath0==8.3.0-6
 libsaimetadata==1.0.0
 libsairedis==1.0.0
 libsaivs==1.0.0
-libssl-dev==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libteam-utils==1.30-1
 libteam5==1.30-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index bab11c897825..2592e3bd311e 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -1,6 +1,6 @@
 certifi==2021.10.8
 chardet==4.0.0
-crontab==0.23.0
+crontab==1.0.0
 idna==2.10
 monotonic==1.5
 netifaces==0.10.7
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.13
\ No newline at end of file
+urllib3==1.26.14
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 1a5b3670e2b2..4156fc6f5b33 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2022.12.7
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
 click==7.0
 idna==3.4
 ijson==2.6.1
@@ -9,8 +9,8 @@ netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
 pyroute2==0.5.14
-requests==2.28.1
+requests==2.28.2
 scapy==2.4.4
 tabulate==0.9.0
-urllib3==1.26.13
+urllib3==1.26.14
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index e47e1a29587d..37ddda57fdd0 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u2
+libarchive13==3.3.3-4+deb10u3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index ab582731feb7..7ad0e77e04dc 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -1,10 +1,10 @@
 bfnplatform==1.0.0
 bfnsdk==1.0.0
-libc-ares2==1.14.0-1+deb10u1
+libc-ares2==1.14.0-1+deb10u2
 libc-dev-bin==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u3
-libcurl4-gnutls-dev==7.64.0-4+deb10u3
+libcurl3-gnutls==7.64.0-4+deb10u4
+libcurl4-gnutls-dev==7.64.0-4+deb10u4
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index dbc50ab51aae..abf1dfe1d527 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u2
+libarchive13==3.3.3-4+deb10u3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
@@ -45,7 +45,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 8c7e33a62733..212dc15a011d 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -16,7 +16,7 @@ libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
-libsaibcm==4.3.7.1-6
+libsaibcm==4.3.7.1-7
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index ed568fb8403a..6579d8901aa9 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u2
+libarchive13==3.3.3-4+deb10u3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
@@ -47,7 +47,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index ced32f4ea7dc..7f807867154b 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -10,7 +10,7 @@ g++==4:8.3.0-1
 g++-8==8.3.0-6
 gcc==4:8.3.0-1
 gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u2
+libarchive13==3.3.3-4+deb10u3
 libasan5==8.3.0-6
 libbinutils==2.31.1-16
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
@@ -35,7 +35,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
deleted file mode 100644
index 73159f281269..000000000000
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ /dev/null
@@ -1,29 +0,0 @@
-gdb==7.12-6
-gdbserver==7.12-6
-libbabeltrace-ctf1==1.5.1-1
-libbabeltrace1==1.5.1-1
-libbsd0==0.8.3-1+deb9u1
-libdw1==0.168-1+deb9u1
-libedit2==3.1-20160903-3
-libglib2.0-0==2.50.3-2+deb9u3
-libgpm2==1.20.4-6.2+b1
-libicu57==57.1-6+deb9u5
-libmpdec2==2.4.2-1
-libpopt0==1.16-10+b2
-libpython3.5==3.5.3-1+deb9u5
-libpython3.5-minimal==3.5.3-1+deb9u5
-libpython3.5-stdlib==3.5.3-1+deb9u5
-libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
-libsainps==1.5.0
-libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libxml2==2.9.4+dfsg1-2.2+deb9u7
-openssh-client==1:7.4p1-10+deb9u7
-sshpass==1.06-1
-strace==4.15-2
-syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.0.0197-4+deb9u7
-vim-runtime==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 23a89902c264..5ac69993b098 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.14-1
+containerd.io==1.6.18-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -58,7 +58,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u3
+curl==7.64.0-4+deb10u4
 dbus==1.12.24-0+deb10u1
 dbus-user-session==1.12.24-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
@@ -149,9 +149,9 @@ gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u6
+git==1:2.20.1-2+deb10u7
 git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u6
+git-man==1:2.20.1-2+deb10u7
 glib-networking==2.58.0-2+deb10u2
 glib-networking-common==2.58.0-2+deb10u2
 glib-networking-services==2.58.0-2+deb10u2
@@ -231,7 +231,7 @@ libapt-inst2.0==1.8.2.3
 libapt-pkg-perl==0.1.34+b1
 libarchive-cpio-perl==0.10-1
 libarchive-zip-perl==1.64-1
-libarchive13==3.3.3-4+deb10u2
+libarchive13==3.3.3-4+deb10u3
 libargon2-1==0~20171227-0.2
 libasan5==8.3.0-6
 libasm-java==7.0-1
@@ -325,8 +325,8 @@ libbsd-dev==0.9.1-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libbsh-java==2.0b4-19
 libbz2-dev==1.0.6-9.2~deb10u2
-libc-ares-dev==1.14.0-1+deb10u1
-libc-ares2==1.14.0-1+deb10u1
+libc-ares-dev==1.14.0-1+deb10u2
+libc-ares2==1.14.0-1+deb10u2
 libc-dev-bin==2.28-10+deb10u2
 libc6-dbg==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
@@ -398,10 +398,10 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13
 libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u6
-libcurl3-gnutls==7.64.0-4+deb10u3
-libcurl3-nss==7.64.0-4+deb10u3
-libcurl4==7.64.0-4+deb10u3
-libcurl4-nss-dev==7.64.0-4+deb10u3
+libcurl3-gnutls==7.64.0-4+deb10u4
+libcurl3-nss==7.64.0-4+deb10u4
+libcurl4==7.64.0-4+deb10u4
+libcurl4-nss-dev==7.64.0-4+deb10u4
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
@@ -413,7 +413,7 @@ libdbi1==0.9.0-5
 libdbus-1-3==1.12.24-0+deb10u1
 libdbus-1-dev==1.12.24-0+deb10u1
 libdconf1==0.30.1-2
-libde265-0==1.0.3-1+deb10u1
+libde265-0==1.0.3-1+deb10u3
 libdevel-callchecker-perl==0.008-1
 libdevel-caller-perl==2.06-2+b1
 libdevel-globaldestruction-perl==0.14-1
@@ -554,10 +554,11 @@ libgme0==0.6.2-1
 libgmock-dev==1.8.1-3
 libgmp-dev==2:6.1.2+dfsg-4+deb10u1
 libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
-libgnutls-dane0==3.6.7-4+deb10u9
-libgnutls-openssl27==3.6.7-4+deb10u9
-libgnutls28-dev==3.6.7-4+deb10u9
-libgnutlsxx28==3.6.7-4+deb10u9
+libgnutls-dane0==3.6.7-4+deb10u10
+libgnutls-openssl27==3.6.7-4+deb10u10
+libgnutls28-dev==3.6.7-4+deb10u10
+libgnutls30==3.6.7-4+deb10u10
+libgnutlsxx28==3.6.7-4+deb10u10
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
 libgpgme11==1.12.0-6
@@ -739,9 +740,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
-libmariadb-dev==1:10.3.36-0+deb10u2
-libmariadb-dev-compat==1:10.3.36-0+deb10u2
-libmariadb3==1:10.3.36-0+deb10u2
+libmariadb-dev==1:10.3.38-0+deb10u1
+libmariadb-dev-compat==1:10.3.38-0+deb10u1
+libmariadb3==1:10.3.38-0+deb10u1
 libmaven-archiver-java==3.2.0-2
 libmaven-clean-plugin-java==3.1.0-1
 libmaven-common-artifact-filters-java==3.0.1-3
@@ -815,7 +816,7 @@ libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
 libnss-systemd==241-7~deb10u8
-libnss3==2:3.42.1-1+deb10u5
+libnss3==2:3.42.1-1+deb10u6
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
 libnumber-compare-perl==0.03-1
@@ -1038,9 +1039,9 @@ libsnappy-java==1.1.7.2-1
 libsnappy-jni==1.1.7.2-1
 libsnappy1v5==1.1.7-1
 libsndfile1==1.0.28-6+deb10u2
-libsnmp-base==5.7.3+dfsg-5+deb10u3
-libsnmp-dev==5.7.3+dfsg-5+deb10u3
-libsnmp30==5.7.3+dfsg-5+deb10u3
+libsnmp-base==5.7.3+dfsg-5+deb10u4
+libsnmp-dev==5.7.3+dfsg-5+deb10u4
+libsnmp30==5.7.3+dfsg-5+deb10u4
 libsoap-lite-perl==1.27-1
 libsodium-dev==1.0.17-1
 libsodium23==1.0.17-1
@@ -1056,8 +1057,8 @@ libsqlite3-0==3.27.2-3+deb10u2
 libsratom-0-0==0.6.0~dfsg0-1
 libssh-gcrypt-4==0.8.7-1+deb10u1
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u3
-libssl1.1==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
+libssl1.1==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libstemmer0d==0+svn585-1+b2
 libstrictures-perl==2.000005-1
@@ -1083,8 +1084,8 @@ libsystemd-dev==241-7~deb10u8
 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
-libtasn1-6-dev==4.13-3
-libtasn1-doc==4.13-3
+libtasn1-6-dev==4.13-3+deb10u1
+libtasn1-doc==4.13-3+deb10u1
 libtcl8.6==8.6.9+dfsg-2
 libtcmalloc-minimal4==2.7-1
 libteckit0==2.5.8+ds2-5
@@ -1105,7 +1106,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u4
+libtiff5==4.1.0+git191117-2~deb10u6
 libtimedate-perl==2.3000-2+deb10u1
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
@@ -1343,7 +1344,7 @@ make==4.2.1-1.2
 man-db==2.8.5-2
 manpages==4.16-2
 manpages-dev==4.16-2
-mariadb-common==1:10.3.36-0+deb10u2
+mariadb-common==1:10.3.38-0+deb10u1
 maven==3.6.0-1
 maven-debian-helper==2.3.2
 maven-repo-helper==1.9.3
@@ -1359,17 +1360,17 @@ netpbm==2:10.0-15.3+b2
 nettle-dev==3.4.1-1+deb10u1
 nftables==0.9.0-2
 ocl-icd-libopencl1==2.2.12-2
-openjdk-11-jdk==11.0.16+8-1~deb10u1
-openjdk-11-jdk-headless==11.0.16+8-1~deb10u1
-openjdk-11-jre==11.0.16+8-1~deb10u1
-openjdk-11-jre-headless==11.0.16+8-1~deb10u1
+openjdk-11-jdk==11.0.18+10-1~deb10u1
+openjdk-11-jdk-headless==11.0.18+10-1~deb10u1
+openjdk-11-jre==11.0.18+10-1~deb10u1
+openjdk-11-jre-headless==11.0.18+10-1~deb10u1
 openmpi-bin==3.1.3-11
 openmpi-common==3.1.3-11
 opensp==1.5.2-13+b1
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u3
+openssl==1.1.1n-0+deb10u4
 ovmf==0~20181115.85588389-3+deb10u3
 packagekit==1.1.12-5
 packagekit-tools==1.1.12-5
@@ -1660,7 +1661,7 @@ sphinx-rtd-theme-common==0.4.3+dfsg-1
 squashfs-tools==1:4.3-12+deb10u2
 stgit==0.18-1
 strace==4.26-0.2
-sudo==1.8.27-1+deb10u4
+sudo==1.8.27-1+deb10u5
 swig==3.0.12-2
 swig3.0==3.0.12-2
 systemd==241-7~deb10u8
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
index 30f56b7d2027..a92f5c1f4cff 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64
@@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1
 libdrm-tegra0==2.4.97-1
 libtext-iconv-perl==1.7-5+b6
 libxslt1-dev==1.1.32-2.2~deb10u2
-nodejs==14.21.1-deb-1nodesource1
\ No newline at end of file
+nodejs==14.21.3-deb-1nodesource1
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 3da861df4457..d7ed25820044 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -103,7 +103,7 @@ linux-compiler-gcc-8-arm==4.19.269-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
-nodejs==14.21.1-deb-1nodesource1
+nodejs==14.21.3-deb-1nodesource1
 ps2eps==1.68+binaryfree-2
 rdfind==1.4.1-1
 sassc==3.5.0-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 05ba4803de19..0603db5d1056 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==62c7a8bad074fdb4339e544b0053206a4f820e15
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index ea740744c91b..65052bc56e6f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -3,12 +3,13 @@ asn1crypto==0.24.0
 atomicwrites==1.1.5
 attrs==18.2.0
 babel==2.6.0
-bitarray==2.6.2
+bitarray==2.7.3
 certifi==2018.8.24
 chardet==3.0.4
 cov-core==1.15.0
 coverage==4.5.2
 cryptography==2.6.1
+deepdiff==6.2.2
 devscripts==2.19.5+deb10u1
 distro-info==0.21
 docutils==0.14
@@ -32,6 +33,7 @@ more-itertools==4.2.0
 nose==1.3.7
 nose2==0.8.0
 olefile==0.46
+ordered-set==4.1.0
 packaging==19.0
 pbr==4.2.0
 pexpect==4.8.0
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 05ba4803de19..0603db5d1056 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==62c7a8bad074fdb4339e544b0053206a4f820e15
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index df93f3a45c47..99398befa0cc 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -1,6 +1,6 @@
 alabaster==0.7.8
 babel==2.3.4
-bitarray==2.6.2
+bitarray==2.7.3
 chardet==2.3.0
 cryptography==1.7.1
 devscripts==2.17.6+deb9u2
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 79b69c379959..73cc4ed3de53 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,12 +14,12 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.14-1
+containerd.io==1.6.18-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u3
+curl==7.64.0-4+deb10u4
 dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
@@ -73,7 +73,7 @@ iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
 iptables-persistent==1.0.11+deb10u1
 iputils-ping==3:20180629-2+deb10u2
-isc-dhcp-client==4.4.1-2+deb10u2
+isc-dhcp-client==4.4.1-2+deb10u3
 iso-codes==4.2-1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
@@ -101,8 +101,8 @@ libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u3
-libcurl4==7.64.0-4+deb10u3
+libcurl3-gnutls==7.64.0-4+deb10u4
+libcurl4==7.64.0-4+deb10u4
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.24-0+deb10u1
@@ -128,7 +128,7 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libgirepository-1.0-1==1.58.3-2
 libglib2.0-0==2.58.3-2+deb10u4
-libgnutls30==3.6.7-4+deb10u9
+libgnutls30==3.6.7-4+deb10u10
 libgomp1==8.3.0-6
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u5
@@ -209,13 +209,14 @@ libsasl2-2==2.1.27+dfsg-1+deb10u2
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u3
-libssl1.1==1.1.1n-0+deb10u3
+libssl-dev==1.1.1n-0+deb10u4
+libssl1.1==1.1.1n-0+deb10u4
 libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libsystemd0==247.3-6~bpo10+1
 libtac2==1.4.1-1
+libtasn1-6==4.13-3+deb10u1
 libtcl8.6==8.6.9+dfsg-2
 libtinfo6==6.1+20181013-2+deb10u3
 libtsan0==8.3.0-6
@@ -248,7 +249,6 @@ mtr-tiny==0.92-2
 ncurses-base==6.1+20181013-2+deb10u3
 ncurses-bin==6.1+20181013-2+deb10u3
 ndisc6==1.0.4-1
-nephos-modules==1.0.1
 net-tools==1.60+git20180626.aebd88e-1
 netbase==5.6
 netfilter-persistent==1.0.11+deb10u1
@@ -258,7 +258,7 @@ opennsl-modules==4.3.0.10-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u3
+openssl==1.1.1n-0+deb10u4
 patch==2.7.6-3+deb10u1
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
@@ -308,10 +308,11 @@ sensible-utils==0.0.12
 software-properties-common==0.96.20.2-2
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
+sonic-platform-pddf==1.1
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u2
 squashfs-tools==1:4.3-12+deb10u2
-sudo==1.8.27-1+deb10u4
+sudo==1.8.27-1+deb10u5
 swig==3.0.12-2
 swig3.0==3.0.12-2
 sx-kernel==1.mlnx.4.5.3196
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 4e4b51a369c9..2e9bd27d1aa6 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -32,6 +32,8 @@ libpython3.7-dev==3.7.3-2+deb10u3
 libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
 libsqlite3-0==3.27.2-3+deb10u1
+libssl-dev==1.1.1n-0+deb10u3
+libssl1.1==1.1.1n-0+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
@@ -39,6 +41,7 @@ libxslt1.1==1.1.32-2.2~deb10u1
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
 linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
+openssl==1.1.1n-0+deb10u3
 pkg-config==0.29-6
 python3.7==3.7.3-2+deb10u3
 python3.7-dev==3.7.3-2+deb10u3
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index a9be54966324..16b23a8a319a 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -32,6 +32,8 @@ libpython3.7-dev==3.7.3-2+deb10u3
 libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
 libsqlite3-0==3.27.2-3+deb10u1
+libssl-dev==1.1.1n-0+deb10u3
+libssl1.1==1.1.1n-0+deb10u3
 libxml2==2.9.4+dfsg1-7+deb10u4
 libxml2-dev==2.9.4+dfsg1-7+deb10u4
 libxslt1-dev==1.1.32-2.2~deb10u1
@@ -40,6 +42,7 @@ linux-image-4.19.0-12-2-armmp==4.19.152-1
 linux-libc-dev==4.19.249-2
 locales==2.28-10+deb10u1
 mrvlprestera==1.0
+openssl==1.1.1n-0+deb10u3
 pkg-config==0.29-6
 python3.7==3.7.3-2+deb10u3
 python3.7-dev==3.7.3-2+deb10u3
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index d3b85493478f..93186520cb3e 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -2,7 +2,7 @@ argcomplete==1.8.1
 bitarray==1.5.3
 contextlib2==0.6.0.post1
 functools32==3.2.3.post2
-future==0.18.2
+future==0.18.3
 importlib-resources==3.3.1
 ipaddr==2.2.0
 ipaddress==1.0.23
@@ -13,6 +13,7 @@ markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
+pddf-platform==1.0
 pyang==2.5.3
 pyangbind==0.6.0
 python-apt==1.8.4.3
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 5f78dbdfc18e..20d5d9fdf172 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,9 +4,9 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2022.12.7
 cffi==1.15.1
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
 click==7.0
-cryptography==39.0.0
+cryptography==39.0.1
 docker==4.3.1
 idna==3.4
 ijson==2.6.1
@@ -17,7 +17,7 @@ jsondiff==2.0.0
 jsonschema==2.6.0
 lxml==4.6.3
 m2crypto==0.38.0
-markupsafe==2.1.1
+markupsafe==2.1.2
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
@@ -28,17 +28,20 @@ ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1
 pycparser==2.21
+pycurl==7.43.0.2
+pygobject==3.30.4
 pyroute2==0.5.14
+python-apt==1.8.4.3
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
 regex==2022.10.31
-requests==2.28.1
+requests==2.28.2
 scapy==2.4.4
 six==1.16.0
 tabulate==0.9.0
 thrift==0.13.0
-urllib3==1.26.13
+urllib3==1.26.14
 watchdog==0.10.3
-websocket-client==1.4.2
+websocket-client==1.5.1
 xmltodict==0.12.0
\ No newline at end of file

From 0cc6f1ca8295f0ac4fd98dc80023ce48bd196346 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 22 Feb 2023 13:00:06 +0800
Subject: [PATCH 1556/1674] [ci] Fix docker hang issue and change template
 reference branch (#13894)

Why I did it
Azure pipeline change.
Use common template to make it easy to change common steps.
Fix docker hang issue.

How I did it
---
 .azure-pipelines/azure-pipelines-build.yml          | 6 +++---
 .azure-pipelines/azure-pipelines-image-template.yml | 4 ++--
 .azure-pipelines/template-daemon.yml                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 3ffc148db4e2..914ca3d7aac7 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -97,8 +97,8 @@ jobs:
             platform_rpc: nephos
 
     buildSteps:
-      - template: template-skipvstest.yml
-      - template: template-daemon.yml
+      - template: .azure-pipelines/template-skipvstest.yml@buildimage
+      - template: .azure-pipelines/template-daemon.yml@buildimage
       - bash: |
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
@@ -143,4 +143,4 @@ jobs:
             make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
           fi
         displayName: "Build sonic image"
-      - template: check-dirty-version.yml
+      - template: .azure-pipelines/check-dirty-version.yml@buildimage
diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 3f34274e49f7..d901af999ba6 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -25,7 +25,7 @@ jobs:
     jobFilters: ${{ parameters.jobFilters }}
     jobVariables: ${{ parameters.jobVariables }}
     preSteps:
-      - template: cleanup.yml
+      - template: .azure-pipelines/cleanup.yml@buildimage
       - ${{ parameters.preSteps }}
       - script: |
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
@@ -65,6 +65,6 @@ jobs:
             artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
             publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
       - ${{ parameters.postSteps }}
-      - template: cleanup.yml
+      - template: .azure-pipelines/cleanup.yml@buildimage
     jobGroups: ${{ parameters.jobGroups }}
     buildSteps: ${{ parameters.buildSteps }}
diff --git a/.azure-pipelines/template-daemon.yml b/.azure-pipelines/template-daemon.yml
index b0915557ced2..903e10c2d5c6 100644
--- a/.azure-pipelines/template-daemon.yml
+++ b/.azure-pipelines/template-daemon.yml
@@ -5,7 +5,7 @@ steps:
       do
         sleep 120
         now=$(date +%s)
-        pids=$(ps -C docker -o pid,etime,args | grep "docker build" | cut -d" " -f1)
+        pids=$(ps -C docker -o pid,etime,args | grep "docker build" | cut -d" " -f2)
         for pid in $pids
         do
           start=$(date --date="$(ls -dl /proc/$pid --time-style full-iso | awk '{print$6,$7}')" +%s)

From 73c7ced753f75f831376fe50c676606d7d3b8737 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Wed, 22 Feb 2023 17:38:54 +0200
Subject: [PATCH 1557/1674] [202012][Mellanox] Place FW binaries under platform
 directory instead of squashfs (#13890)

Upgrade from old image always requires squashfs mount to get the next image FW binary. This can be avoided if we put FW binary under platform directory which is easily accessible after installation:

admin@r-spider-05:~$ ls /host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa
/host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa
admin@r-spider-05:~$ ls -al /tmp/image-fw-new-loc.0-dirty-20230208.193534-fs/etc/mlnx/fw-SPC.mfa
lrwxrwxrwx 1 root root 66 Feb  8 17:57 /tmp/image-fw-new-loc.0-dirty-20230208.193534-fs/etc/mlnx/fw-SPC.mfa -> /host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa

- Why I did it
202211 and above uses different squashfs compression type that 201911 kernel can not handle. Therefore, we avoid mounting squashfs altogether with this change.

- How I did it
Place FW binary under /host/image-/platform/mlnx/, soft links in /etc/mlnx are created to avoid breaking existing scripts/automation.
/etc/mlnx/fw-SPCX.mfa is a soft link always pointing to the FW that should be used in current image
mlnx-fw-upgrade.sh is updated to prefer /host/image-/platform/mlnx location and fallback to /etc/mlnx in squashfs in case new location does not exist. This is necessary to do image downgrade.

- How to verify it
Upgrade from 201911 to 202012
202012 to 201911 downgrade
202012 -> 202012 reboot
ONIE -> 202012 boot (First FW burn)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
---
 .../build_templates/sonic_debian_extension.j2 | 21 +++++++++---
 platform/mellanox/mlnx-fw-upgrade.j2          | 32 ++++++++++++++-----
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 18bafd1d0c39..59f3df9c463d 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -796,15 +796,28 @@ sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 
 {% if sonic_asic_platform == "mellanox" %}
 sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
+
 if [ -n "$MLNX_BIOS_ARCHIVES" ]; then
 sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/bios/
+sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/bios/
 for MLNX_BIOS_ARCHIVE in $MLNX_BIOS_ARCHIVES; do
-    sudo cp $files_path/$MLNX_BIOS_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/bios/
+    sudo cp $files_path/$MLNX_BIOS_ARCHIVE $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/bios/
+    # Link old BIOS location to not break existing automation/scripts
+    sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/bios/$MLNX_BIOS_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/bios/$MLNX_BIOS_ARCHIVE
 done
 fi
-sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
-sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
-sudo cp $files_path/$MLNX_SPC3_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC3.mfa
+
+declare -rA FW_FILE_MAP=( \
+    [$MLNX_SPC_FW_FILE]="fw-SPC.mfa" \
+    [$MLNX_SPC2_FW_FILE]="fw-SPC2.mfa" \
+    [$MLNX_SPC3_FW_FILE]="fw-SPC3.mfa" \
+)
+sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/
+for fw_file_name in ${!FW_FILE_MAP[@]}; do
+    sudo cp $files_path/$fw_file_name $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/${FW_FILE_MAP[$fw_file_name]}
+    # Link old FW location to not break existing automation/scripts
+    sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/asic/${FW_FILE_MAP[$fw_file_name]} $FILESYSTEM_ROOT/etc/mlnx/${FW_FILE_MAP[$fw_file_name]}
+done
 sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
 sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
 sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE
diff --git a/platform/mellanox/mlnx-fw-upgrade.j2 b/platform/mellanox/mlnx-fw-upgrade.j2
index e17ec176503c..82f9ce6f5918 100755
--- a/platform/mellanox/mlnx-fw-upgrade.j2
+++ b/platform/mellanox/mlnx-fw-upgrade.j2
@@ -32,9 +32,9 @@ declare -r UNKN_ASIC="unknown"
 declare -r UNKN_MST="unknown"
 
 declare -rA FW_FILE_MAP=( \
-    [$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \
-    [$SPC2_ASIC]="/etc/mlnx/fw-SPC2.mfa" \
-    [$SPC3_ASIC]="/etc/mlnx/fw-SPC3.mfa" \
+    [$SPC1_ASIC]="fw-SPC.mfa" \
+    [$SPC2_ASIC]="fw-SPC2.mfa" \
+    [$SPC3_ASIC]="fw-SPC3.mfa" \
 )
 
 IMAGE_UPGRADE="${NO_PARAM}"
@@ -181,17 +181,17 @@ function RunCmd() {
 }
 
 function UpgradeFW() {
-    local -r _FS_MOUNTPOINT="$1"
+    local -r _FW_BIN_PATH="$1"
 
     local -r _ASIC_TYPE="$(GetAsicType)"
     if [[ "${_ASIC_TYPE}" = "${UNKN_ASIC}" ]]; then
         ExitFailure "failed to detect ASIC type"
     fi
 
-    if [ ! -z "${_FS_MOUNTPOINT}" ]; then
-        local -r _FW_FILE="${_FS_MOUNTPOINT}/${FW_FILE_MAP[$_ASIC_TYPE]}"
+    if [ ! -z "${_FW_BIN_PATH}" ]; then
+        local -r _FW_FILE="${_FW_BIN_PATH}/${FW_FILE_MAP[$_ASIC_TYPE]}"
     else
-        local -r _FW_FILE="${FW_FILE_MAP[$_ASIC_TYPE]}"
+        local -r _FW_FILE="/etc/mlnx/${FW_FILE_MAP[$_ASIC_TYPE]}"
     fi
 
     if [ ! -f "${_FW_FILE}" ]; then
@@ -239,11 +239,27 @@ function UpgradeFWFromImage() {
 
     if [[ "${_CURRENT_SONIC_IMAGE}" == "${_NEXT_SONIC_IMAGE}" ]]; then
         ExitSuccess "firmware is up to date"
+    fi
+
+    # /host/image-<version>/platform/fw/asic is now the new location for FW binaries.
+    # Prefere this path and if it does not exist use squashfs as a fallback.
+    local -r _PLATFORM_FW_BIN_PATH="/host/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}/platform/fw/asic/"
+
+    if [[ -d "${_PLATFORM_FW_BIN_PATH}" ]]; then
+        LogInfo "Using FW binaries from ${_PLATFORM_FW_BIN_PATH}"
+
+        UpgradeFW "${_PLATFORM_FW_BIN_PATH}"
     else
+        local -r _FS_PATH="/host/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}/fs.squashfs"
+        local -r _FS_MOUNTPOINT="/tmp/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}-fs"
+        local -r _FW_BIN_PATH="${_FS_MOUNTPOINT}/etc/mlnx/"
+
+        LogInfo "Using FW binaries from ${_FW_BIN_PATH}"
+
         mkdir -p "${_FS_MOUNTPOINT}"
         mount -t squashfs "${_FS_PATH}" "${_FS_MOUNTPOINT}"
 
-        UpgradeFW "${_FS_MOUNTPOINT}"
+        UpgradeFW "${_FW_BIN_PATH}"
 
         umount -rf "${_FS_MOUNTPOINT}"
         rm -rf "${_FS_MOUNTPOINT}"

From 0f47c5be59ef4851a9e82a66f616b410d1216022 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:27:21 +0800
Subject: [PATCH 1558/1674] [202012] [Mellanox] Fix issue: cannot lable port
 for logical port is logical port number larger than 64 (#13709)

- Why I did it
sfp_event.py gets a PMPE message when a cable event is available. In PMPE message, there is no label port available. Current sfp_event.py is using sx_api_port_device_get to get 64 logical ports attributes, and find the label port from those 64 attributes. However, if there are more than 64 ports, sfp_event.py might not be able to find the label port and drop the PMPE message.

- How I did it
Don't use hardcoded 64, get logical port number instead.

- How to verify it
Manual test
---
 .../sonic_platform/sfp_event.py               | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
index 4e6b83681e95..592d153e100f 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
@@ -273,11 +273,9 @@ def on_pmpe(self, fd_p):
         pkt = new_uint8_t_arr(pkt_size)
         recv_info_p = new_sx_receive_info_t_p()
         pmpe_t = sx_event_pmpe_t()
-        port_attributes_list = new_sx_port_attributes_t_arr(64)
         port_cnt_p = new_uint32_t_p()
-        uint32_t_p_assign(port_cnt_p,64)
+        uint32_t_p_assign(port_cnt_p, 0)
         label_port_list = []
-        label_port = None
         module_state = 0
 
         rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p)
@@ -296,29 +294,44 @@ def on_pmpe(self, fd_p):
             if module_state == SDK_SFP_STATE_ERR:
                 logger.log_error("Receive PMPE error event on module {}: status {} error type {}".format(module_id, module_state, error_type))
             elif module_state == SDK_SFP_STATE_DIS:
-                logger.log_info("Receive PMPE disable event on module {}: status {}".format(module_id, module_state))
+                logger.log_notice("Receive PMPE disable event on module {}: status {}".format(module_id, module_state))
             elif module_state == SDK_SFP_STATE_IN or module_state == SDK_SFP_STATE_OUT:
-                logger.log_info("Receive PMPE plug in/out event on module {}: status {}".format(module_id, module_state))
+                logger.log_notice("Receive PMPE plug in/out event on module {}: status {}".format(module_id, module_state))
             else:
                 logger.log_error("Receive PMPE unknown event on module {}: status {}".format(module_id, module_state))
-            for i in range(port_list_size):
-                logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i)
-                rc = sx_api_port_device_get(self.handle, 1 , 0, port_attributes_list,  port_cnt_p)
-                port_cnt = uint32_t_p_value(port_cnt_p)
-
-                for i in range(port_cnt):
-                    port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,i)
-                    if port_attributes.log_port == logical_port:
-                        label_port = port_attributes.port_mapping.module_port
-                        break
 
-                if label_port is not None:
-                    label_port_list.append(label_port)
+            # Call sx_api_port_device_get with port_cnt_p=0, SDK will return the logical port number
+            rc = sx_api_port_device_get(self.handle, 1, 0, None,  port_cnt_p)
+            if rc != SX_STATUS_SUCCESS:
+                logger.log_error("Failed to get logical port number")
+                status = False
+            else:
+                port_cnt = uint32_t_p_value(port_cnt_p)
+                port_attributes_list = new_sx_port_attributes_t_arr(port_cnt)
+                rc = sx_api_port_device_get(self.handle, 1, 0, port_attributes_list,  port_cnt_p)
+                if rc != SX_STATUS_SUCCESS:
+                    logger.log_error("Failed to get logical port attributes")
+                    status = False
+                else:
+                    for i in range(port_list_size):
+                        label_port = None
+                        logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i)
+                        for j in range(port_cnt):
+                            port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,j)
+                            if port_attributes.log_port == logical_port:
+                                label_port = port_attributes.port_mapping.module_port
+                                break
+
+                        if label_port is not None:
+                            label_port_list.append(label_port)
+                delete_sx_port_attributes_t_arr(port_attributes_list)
 
         delete_uint32_t_p(pkt_size_p)
         delete_uint8_t_arr(pkt)
         delete_sx_receive_info_t_p(recv_info_p)
-        delete_sx_port_attributes_t_arr(port_attributes_list)
         delete_uint32_t_p(port_cnt_p)
 
+        if not label_port_list:
+            logger.log_error('Dropping PMPE event due to label port not found')
+
         return status, label_port_list, module_state, error_type

From 09ce5ec7b9a88341beabc5854965d299265ce776 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 25 Feb 2023 05:08:29 +0800
Subject: [PATCH 1559/1674] [Build] Clean up the debian preference config file
 (#13887) (#13976)

Why I did it
Support to upgrade packages, do better cleanup after the build.

How I did it
Remove the no use preference version control file after the build.

How to verify it
---
 src/sonic-build-hooks/scripts/post_run_buildinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sonic-build-hooks/scripts/post_run_buildinfo b/src/sonic-build-hooks/scripts/post_run_buildinfo
index 97f47f7efcf1..f638dbc23e7c 100755
--- a/src/sonic-build-hooks/scripts/post_run_buildinfo
+++ b/src/sonic-build-hooks/scripts/post_run_buildinfo
@@ -14,3 +14,4 @@ set_reproducible_mirrors -d
 
 # Remove the version deb preference
 rm -f $VERSION_DEB_PREFERENCE
+rm -f /etc/apt/preferences.d/01-versions-deb

From 8636494c6d709421e95e1008a25f347016c6be10 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 25 Feb 2023 07:33:23 +0800
Subject: [PATCH 1560/1674] [Build] Pin the toposort version to 1.7 in python2
 (#13979)

Why I did it
Fix the docker-base-stretch build issue in nephos platform.

Collecting supervisord-dependent-startup==1.4.0
  Downloading https://files.pythonhosted.org/packages/0e/66/d386c3d2cf36846ded0b9f4999a6c59fd04fb15d768e59d3acfa039102bc/supervisord_dependent_startup-1.4.0-py2.py3-none-any.whl
Collecting toposort>=1.5 (from supervisord-dependent-startup==1.4.0)
  Downloading https://files.pythonhosted.org/packages/8d/c3/44e51b42160145e4ebeb7d86ab93bd933fa9498f94e183ef8a47c6de8b2f/toposort-1.9.tar.gz
    Complete output from command python setup.py egg_info:
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
    IOError: [Errno 2] No such file or directory: '/tmp/pip-build-LnROQE/toposort/setup.py'

    ----------------------------------------
Command "python setup.py egg_info" failed with error code 1 in /tmp/pip-build-LnROQE/toposort/

The other platforms have been upgraded to docker-base-buster, not impacted.

How I did it
Pin the toposort version to 1.7, the package supervisord-dependent-startup has dependency on it.
The toposort>=1.8 only for python3, is not applicable to python2.
---
 dockers/docker-base-stretch/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index 5603dc502792..01ba264a41bf 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -94,7 +94,7 @@ RUN pip install j2cli
 RUN pip install supervisor>=3.4.0
 
 # Add support for supervisord to handle startup dependencies
-RUN pip install supervisord-dependent-startup==1.4.0
+RUN pip install supervisord-dependent-startup==1.4.0 toposort==1.7
 
 RUN mkdir -p /etc/supervisor /var/log/supervisor
 

From 7455c560241b5d2a036042063d71a9a4790c6ba7 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 25 Feb 2023 14:57:37 +0800
Subject: [PATCH 1561/1674] [ci/build]: Upgrade SONiC package versions (#13985)

---
 .../versions-deb-buster-armhf                 |  4 ----
 .../build-sonic-slave-buster/versions-git     |  4 ++--
 .../versions-py2-all-armhf                    |  2 --
 .../versions-py3-all-armhf                    |  4 ----
 files/build/versions/default/versions-git     |  6 +++---
 .../docker-base-buster/versions-deb-buster    |  4 ++--
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  4 ++--
 .../sonic-slave-buster/versions-deb-buster    | 20 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  6 +++---
 12 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index 72e55bfa8606..a83790c30ddf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1,5 +1 @@
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index e6f1049b1a3d..04664a9abdc6 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,9 +1,9 @@
 https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
+https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==6889a0914b821c8dcfd0e37794196f5c7d017221
+https://github.com/sflow/host-sflow==7501810eaa9559f0d9d274a4ad935642114e18e8
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
deleted file mode 100644
index 8492dcc26744..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
+++ /dev/null
@@ -1,2 +0,0 @@
-ipaddress==1.0.23
-lxml==4.6.3
\ No newline at end of file
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
deleted file mode 100644
index 949c3055bf13..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1,4 +0,0 @@
-bitarray==1.5.3
-lxml==4.6.3
-requests==2.28.2
-urllib3==1.26.14
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index c8ba585f5589..d25efb9a1cda 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,15 +1,15 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==30136f0cb715c04b8e3fb7aec59338f1563a76ae
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9
+https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==6889a0914b821c8dcfd0e37794196f5c7d017221
+https://github.com/sflow/host-sflow==7501810eaa9559f0d9d274a4ad935642114e18e8
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index 5ed984488de8..f0383bd4ab76 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -1,9 +1,9 @@
 ca-certificates==20200601~deb10u2
-curl==7.64.0-4+deb10u4
+curl==7.64.0-4+deb10u5
 jq==1.5+dfsg-2+b1
 less==487-0.1+b1
 libatomic1==8.3.0-6
-libcurl4==7.64.0-4+deb10u4
+libcurl4==7.64.0-4+deb10u5
 libdaemon0==0.14-7
 libdbus-1-3==1.12.24-0+deb10u1
 libestr0==0.1.10-2.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
index 5076c2301ab1..159a1b98e2ae 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.3
-grpcio==1.51.1
+grpcio==1.51.3
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==6.0.0
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 7ad0e77e04dc..a24b073f8f39 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -3,8 +3,8 @@ bfnsdk==1.0.0
 libc-ares2==1.14.0-1+deb10u2
 libc-dev-bin==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u4
-libcurl4-gnutls-dev==7.64.0-4+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u5
+libcurl4-gnutls-dev==7.64.0-4+deb10u5
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 5ac69993b098..2c4d8dde3db8 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -58,7 +58,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u4
+curl==7.64.0-4+deb10u5
 dbus==1.12.24-0+deb10u1
 dbus-user-session==1.12.24-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
@@ -149,9 +149,9 @@ gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-packagekitglib-1.0==1.1.12-5
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-git==1:2.20.1-2+deb10u7
+git==1:2.20.1-2+deb10u8
 git-buildpackage==0.9.14
-git-man==1:2.20.1-2+deb10u7
+git-man==1:2.20.1-2+deb10u8
 glib-networking==2.58.0-2+deb10u2
 glib-networking-common==2.58.0-2+deb10u2
 glib-networking-services==2.58.0-2+deb10u2
@@ -398,10 +398,10 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13
 libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u6
-libcurl3-gnutls==7.64.0-4+deb10u4
-libcurl3-nss==7.64.0-4+deb10u4
-libcurl4==7.64.0-4+deb10u4
-libcurl4-nss-dev==7.64.0-4+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u5
+libcurl3-nss==7.64.0-4+deb10u5
+libcurl4==7.64.0-4+deb10u5
+libcurl4-nss-dev==7.64.0-4+deb10u5
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
@@ -1106,7 +1106,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtheora0==1.1.1+dfsg.1-15
 libtie-ixhash-perl==1.23-2
-libtiff5==4.1.0+git191117-2~deb10u6
+libtiff5==4.1.0+git191117-2~deb10u7
 libtimedate-perl==2.3000-2+deb10u1
 libtinyxml2-6a==7.0.0+dfsg-1
 libtinyxml2-dev==7.0.0+dfsg-1
@@ -1463,7 +1463,7 @@ python-constantly==15.1.0-1
 python-cov-core==1.15.0-2
 python-coverage==4.5.2+dfsg.1-1
 python-crypto==2.6.1-9+b1
-python-cryptography==2.6.1-3+deb10u2
+python-cryptography==2.6.1-3+deb10u4
 python-dbus==1.2.8-3
 python-dev==2.7.16-1
 python-docutils==0.14+dfsg-4
@@ -1556,7 +1556,7 @@ python3-chardet==3.0.4-3
 python3-cov-core==1.15.0-2
 python3-coverage==4.5.2+dfsg.1-1
 python3-crypto==2.6.1-9+b1
-python3-cryptography==2.6.1-3+deb10u2
+python3-cryptography==2.6.1-3+deb10u4
 python3-dateutil==2.7.3-3
 python3-dbg==3.7.3-1
 python3-dbus==1.2.8-3
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 0603db5d1056..5bee09a790bc 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==62c7a8bad074fdb4339e544b0053206a4f820e15
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 0603db5d1056..5bee09a790bc 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==62c7a8bad074fdb4339e544b0053206a4f820e15
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 73cc4ed3de53..25ffbf09d56e 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -19,7 +19,7 @@ cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u4
+curl==7.64.0-4+deb10u5
 dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
@@ -101,8 +101,8 @@ libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u4
-libcurl4==7.64.0-4+deb10u4
+libcurl3-gnutls==7.64.0-4+deb10u5
+libcurl4==7.64.0-4+deb10u5
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.24-0+deb10u1

From ca17198f043a21adb37fc008509a4dd6de58c2f1 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Sat, 25 Feb 2023 23:42:52 -0800
Subject: [PATCH 1562/1674] [202012][Mellanox] Change MFT version to 4.21.0-100
 (#13956)

- Why I did it
Update MFT version to 4.21.0-100 to include a fix for an issue reported using mlxlink on qsfp-dd

- How I did it
Update mft.mk

- How to verify it
Run regression on Mellanox platforms
---
 platform/mellanox/mft.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index cbd7288272ca..9544830ccadb 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.18.0
-MFT_REVISION = 106
+MFT_VERSION = 4.21.0
+MFT_REVISION = 100
 
 export MFT_VERSION MFT_REVISION
 

From cc17c7ac114c4dd22f3c047a3b4226441dcf5f7a Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 26 Feb 2023 22:57:45 +0800
Subject: [PATCH 1563/1674] [ci/build]: Upgrade SONiC package versions (#13992)

---
 .../build-sonic-slave-buster/versions-git     |  2 +-
 .../versions-deb-stretch                      |  3 +
 .../build-sonic-slave-stretch/versions-py2    | 15 +++-
 files/build/versions/default/versions-docker  |  1 +
 files/build/versions/default/versions-git     |  4 +-
 files/build/versions/default/versions-web     |  4 +
 .../dockers/docker-base-buster/versions-py3   |  2 +-
 .../docker-base-stretch/versions-deb-stretch  | 76 +++++++++++++++++++
 .../dockers/docker-base-stretch/versions-py2  |  6 ++
 .../versions-deb-stretch                      | 46 +++++++++++
 .../docker-config-engine-stretch/versions-py2 | 22 ++++++
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../docker-syncd-nephos/versions-deb-stretch  | 29 +++++++
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../versions/host-image/versions-deb-buster   |  1 +
 16 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-py2
 create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
 create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-py2
 create mode 100644 files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 04664a9abdc6..30fbbea95c09 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==7501810eaa9559f0d9d274a4ad935642114e18e8
+https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index c3f79d28969b..af7a04c29723 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -10,6 +10,7 @@ libnl-nf-3-dev==3.5.0-1
 libnl-route-3-dev==3.5.0-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
+libsainps==1.5.0
 libsairedis==1.0.0
 libsaivs==1.0.0
 libsaivs-dev==1.0.0
@@ -17,5 +18,7 @@ libswsscommon==1.0.0
 libswsscommon-dev==1.0.0
 libthrift-0.11.0==0.11.0-4
 libthrift-dev==0.11.0-4
+python-swsscommon==1.0.0
 python-thrift==0.11.0-4
+syncd==1.0.0
 thrift-compiler==0.11.0-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index 40414e6f3143..7a0c6a834d5e 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,2 +1,15 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+future==0.18.3
+importlib-resources==3.3.1
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.7.post1
+pyang==2.5.3
+pyangbind==0.6.0
+redis==3.5.3
 sairedis==1.0
-thrift==0.11.0
\ No newline at end of file
+scandir==1.10.0
+singledispatch==3.7.0
+thrift==0.11.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 1c4402c80f9f..18e5f1f28729 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,4 +1,5 @@
 amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf
+amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
 amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
 arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index d25efb9a1cda..b05e34f9c2ff 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==7501810eaa9559f0d9d274a4ad935642114e18e8
+https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 75ca541b578d..e9cbe57caf53 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -32,6 +32,9 @@ https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf3
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
+https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
+https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
+https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag==a444c876aaf2a8b4c99238f15fbc13a0
 https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
@@ -46,6 +49,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
+https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a
diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
index 4602e8aa671e..cf6bd999d21e 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-py3
+++ b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -3,4 +3,4 @@ jinja2==3.1.2
 markupsafe==2.1.2
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0
-toposort==1.9
\ No newline at end of file
+toposort==1.10
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..456ed031ac62
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch
@@ -0,0 +1,76 @@
+ca-certificates==20200601~deb9u2
+curl==7.52.1-5+deb9u16
+jq==1.5+dfsg-1.3
+less==481-2.1
+libatomic1==6.3.0-18+deb9u1
+libcurl3==7.52.1-5+deb9u16
+libdaemon0==0.14-6
+libdbus-1-3==1.10.32-0+deb9u1
+libestr0==0.1.10-2
+libexpat1==2.2.0-2+deb9u5
+libfastjson4==0.99.8-1~bpo9+1
+libffi6==3.2.1-6
+libgdbm3==1.8.3-14
+libgmp10==2:6.1.2+dfsg-1+deb9u1
+libgnutls30==3.5.8-5+deb9u6
+libgssapi-krb5-2==1.15-1+deb9u3
+libhiredis0.14==0.14.0-3~bpo9+1
+libhogweed4==3.3-1+deb9u1
+libidn2-0==0.16-1+deb9u1
+libjansson4==2.9-1
+libjemalloc1==3.6.0-9.1
+libjq1==1.5+dfsg-1.3
+libk5crypto3==1.15-1+deb9u3
+libkeyutils1==1.5.9-9
+libkrb5-3==1.15-1+deb9u3
+libkrb5support0==1.15-1+deb9u3
+libldap-2.4-2==2.4.44+dfsg-5+deb9u9
+libldap-common==2.4.44+dfsg-5+deb9u9
+liblognorm5==2.0.3-1~bpo9+1
+liblua5.1-0==5.1.5-8.1+b2
+libncurses5==6.0+20161126-1+deb9u2
+libnghttp2-14==1.18.1-1+deb9u2
+libonig4==6.1.3-2+deb9u2
+libp11-kit0==0.23.3-2+deb9u1
+libperl5.24==5.24.1-3+deb9u7
+libpgm-5.2-0==5.2.122~dfsg-2
+libprocps6==2:3.3.12-3+deb9u1
+libpsl5==0.17.0-3
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u6
+libpython2.7-minimal==2.7.13-2+deb9u6
+libpython2.7-stdlib==2.7.13-2+deb9u6
+libreadline7==7.0-3
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2
+libsodium18==1.0.11-2
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u2
+libssl1.0.2==1.0.2u-1~deb9u7
+libssl1.1==1.1.0l-1~deb9u6
+libtasn1-6==4.10-1.1+deb9u1
+libunistring0==0.9.6+really0.9.3-0.1
+libwrap0==7.6.q-26
+libzmq5==4.2.1-4+deb9u4
+lua-bitop==1.0.2-4
+lua-cjson==2.1.0+dfsg-2
+mime-support==3.60
+net-tools==1.60+git20161116.90da8a0-1
+openssl==1.1.0l-1~deb9u6
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+procps==2:3.3.12-3+deb9u1
+python==2.7.13-2
+python-minimal==2.7.13-2
+python-pip==9.0.1-2+deb9u2
+python-pip-whl==9.0.1-2+deb9u2
+python2.7==2.7.13-2+deb9u6
+python2.7-minimal==2.7.13-2+deb9u6
+readline-common==7.0-3
+redis-tools==5:6.0.6-1~bpo10+1
+rsyslog==8.1901.0-1~bpo9+1
+socat==1.7.3.1-2+deb9u1
+vim-common==2:8.0.0197-4+deb9u7
+vim-tiny==2:8.0.0197-4+deb9u7
+xxd==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2
new file mode 100644
index 000000000000..888ec533991a
--- /dev/null
+++ b/files/build/versions/dockers/docker-base-stretch/versions-py2
@@ -0,0 +1,6 @@
+j2cli==0.3.10
+jinja2==2.11.3
+markupsafe==1.1.1
+supervisor==4.2.5
+supervisord-dependent-startup==1.4.0
+toposort==1.7
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
new file mode 100644
index 000000000000..31dbc0f02747
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch
@@ -0,0 +1,46 @@
+binutils==2.28-5
+build-essential==12.3
+bzip2==1.0.6-8.1
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+dpkg-dev==1.18.26
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+libasan3==6.3.0-18+deb9u1
+libatomic1==6.3.0-18+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcc1-0==6.3.0-18+deb9u1
+libcilkrts5==6.3.0-18+deb9u1
+libdpkg-perl==1.18.26
+libexpat1-dev==2.2.0-2+deb9u5
+libgcc-6-dev==6.3.0-18+deb9u1
+libgomp1==6.3.0-18+deb9u1
+libhiredis0.14==0.14.0-3~bpo9+1
+libisl15==0.18-1
+libitm1==6.3.0-18+deb9u1
+liblsan0==6.3.0-18+deb9u1
+libmpc3==1.0.3-1+b2
+libmpfr4==3.1.5-1
+libmpx2==6.3.0-18+deb9u1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libpython-dev==2.7.13-2
+libpython2.7-dev==2.7.13-2+deb9u6
+libquadmath0==6.3.0-18+deb9u1
+libstdc++-6-dev==6.3.0-18+deb9u1
+libswsscommon==1.0.0
+libtsan0==6.3.0-18+deb9u1
+libubsan0==6.3.0-18+deb9u1
+linux-libc-dev==4.9.320-2
+make==4.1-9.1
+patch==2.7.5-1+deb9u2
+python-dev==2.7.13-2
+python-swsscommon==1.0.0
+python2.7-dev==2.7.13-2+deb9u6
+xz-utils==5.2.2-1.2+deb9u1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
new file mode 100644
index 000000000000..ad70857eef4a
--- /dev/null
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -0,0 +1,22 @@
+bitarray==1.5.3
+contextlib2==0.6.0.post1
+future==0.18.3
+importlib-resources==3.3.1
+ipaddress==1.0.23
+lxml==4.6.3
+natsort==6.2.1
+netaddr==0.8.0
+pathlib2==2.3.7.post1
+pyang==2.5.3
+pyangbind==0.6.0
+pyyaml==5.4.1
+redis==3.5.3
+redis-dump-load==1.1
+scandir==1.10.0
+singledispatch==3.7.0
+six==1.16.0
+sonic-config-engine==1.0
+sonic-py-common==1.0
+swsssdk==2.0.1
+typing==3.10.0.0
+zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 159a1b98e2ae..e53395334666 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -28,4 +28,4 @@ six==1.11.0
 typing_extensions==4.5.0
 urllib3==1.26.5
 werkzeug==2.2.3
-zipp==3.14.0
\ No newline at end of file
+zipp==3.15.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
new file mode 100644
index 000000000000..73159f281269
--- /dev/null
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -0,0 +1,29 @@
+gdb==7.12-6
+gdbserver==7.12-6
+libbabeltrace-ctf1==1.5.1-1
+libbabeltrace1==1.5.1-1
+libbsd0==0.8.3-1+deb9u1
+libdw1==0.168-1+deb9u1
+libedit2==3.1-20160903-3
+libglib2.0-0==2.50.3-2+deb9u3
+libgpm2==1.20.4-6.2+b1
+libicu57==57.1-6+deb9u5
+libmpdec2==2.4.2-1
+libpopt0==1.16-10+b2
+libpython3.5==3.5.3-1+deb9u5
+libpython3.5-minimal==3.5.3-1+deb9u5
+libpython3.5-stdlib==3.5.3-1+deb9u5
+libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
+libsainps==1.5.0
+libsairedis==1.0.0
+libsairedis-dbg==1.0.0
+libswsscommon-dbg==1.0.0
+libxml2==2.9.4+dfsg1-2.2+deb9u7
+openssh-client==1:7.4p1-10+deb9u7
+sshpass==1.06-1
+strace==4.15-2
+syncd==1.0.0
+syncd-dbg==1.0.0
+vim==2:8.0.0197-4+deb9u7
+vim-runtime==2:8.0.0197-4+deb9u7
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 5bee09a790bc..4a6d033a52cd 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 5bee09a790bc..4a6d033a52cd 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==27ac29f980eb459c7da5ddea20ec515d7c8627c9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 25ffbf09d56e..e474032f1704 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -249,6 +249,7 @@ mtr-tiny==0.92-2
 ncurses-base==6.1+20181013-2+deb10u3
 ncurses-bin==6.1+20181013-2+deb10u3
 ndisc6==1.0.4-1
+nephos-modules==1.0.1
 net-tools==1.60+git20180626.aebd88e-1
 netbase==5.6
 netfilter-persistent==1.0.11+deb10u1

From f47024cdfd44293a9e35fdeb4aab61563e851468 Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Thu, 23 Feb 2023 02:55:55 +0800
Subject: [PATCH 1564/1674] add psu fans status led available config (#13926)

Why I did it
Seastone does not have the psu fans' status led, need to reflect it in platform.json.

How I did it
Set the psu fans status led available to false.

How to verify it
Verify it with platform_tests/api/test_psu_fans.py::TestPsuFans::test_set_fans_led case.
---
 device/celestica/x86_64-cel_seastone-r0/platform.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/device/celestica/x86_64-cel_seastone-r0/platform.json b/device/celestica/x86_64-cel_seastone-r0/platform.json
index 6164c629611e..b1161e22d6fd 100644
--- a/device/celestica/x86_64-cel_seastone-r0/platform.json
+++ b/device/celestica/x86_64-cel_seastone-r0/platform.json
@@ -266,6 +266,9 @@
                         "name": "PSU-1 FAN-1",
                         "speed": {
                             "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
                         }
                     }
                 ]
@@ -281,6 +284,9 @@
                         "name": "PSU-2 FAN-1",
                         "speed": {
                             "controllable": false
+                        },
+                        "status_led": {
+                            "available": false
                         }
                     }
                 ]

From 26b0e7f709a85a043cc0a037e29e26a0debe5c2f Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Thu, 16 Feb 2023 19:13:39 -0800
Subject: [PATCH 1565/1674] Use tmpfs for /var/log on Arista 7050CX3-32S
 (#13805)

This is to reduce writes to the SSD on the device.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---
 files/Aboot/boot0.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 3c95efe82c14..8b98d5e4b14b 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -516,6 +516,7 @@ write_platform_specific_cmdline() {
     fi
     if [ "$sid" = "Lodoga" ]; then
         aboot_machine=arista_7050cx3_32s
+        cmdline_add logs_inram=on
     fi
     if [ "$sid" = "Marysville" ]; then
         aboot_machine=arista_7050sx3_48yc8

From b7ef7fce16a056949975c22003928e137559e93b Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Wed, 1 Mar 2023 16:05:11 -0800
Subject: [PATCH 1566/1674] Update cisco-8000.ini (#14009)

#### Why I did it
Update cisco platform module to 202012-v0.2.6

#### How I did it
Update cisco-8000.ini
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 5d650b768418..ef1fcde7eac4 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2.5
+ref=202012-v0.2.6

From 3776ddb7c8fdeb6edba5ad2ac66d3656fd756e90 Mon Sep 17 00:00:00 2001
From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:56:54 -0800
Subject: [PATCH 1567/1674] Remove dialout as critical process (#14006)

#### Why I did it

Remove dialout as critical process as it is no longer used in prod. As part of future work, can remove dialout completely

#### How I did it

Remove from critical process list
---
 dockers/docker-sonic-telemetry/critical_processes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dockers/docker-sonic-telemetry/critical_processes b/dockers/docker-sonic-telemetry/critical_processes
index 612a94d9edac..3baf6e268907 100644
--- a/dockers/docker-sonic-telemetry/critical_processes
+++ b/dockers/docker-sonic-telemetry/critical_processes
@@ -1,2 +1 @@
 program:telemetry
-program:dialout

From be46225033e809b5c04b89e42a6115951892c325 Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Wed, 1 Mar 2023 14:35:53 +0800
Subject: [PATCH 1568/1674] [Seastone] fix dx010 qsfp eeprom data write issue
 (#13930)

Why I did it
Platform cases test_tx_disable, test_tx_disable_channel, test_power_override failed in dx010.

How I did it
Add i2c access algorithm for CPLD i2c adapters.

How to verify it
Verify it with platform_tests/api/test_sfp.py::TestSfpApi test cases.
---
 .../sonic_platform/sfp.py                     |   2 +-
 .../dx010/modules/dx010_cpld.c                | 206 +++++++++++++++---
 2 files changed, 174 insertions(+), 34 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
index 3c14d7fb9a33..ff222d5599f8 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py
@@ -1520,7 +1520,7 @@ def get_power_override(self):
             if dom_control_raw is not None:
                 dom_control_data = sfpd_obj.parse_control_bytes(
                     dom_control_raw, 0)
-                return ('On' == dom_control_data['data']['PowerOverride'])
+                return ('On' == dom_control_data['data']['PowerOverride']['value'])
             else:
                 return False
         else:
diff --git a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c
index d8142777c6e1..3cdfb3939558 100644
--- a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c
+++ b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c
@@ -1,7 +1,7 @@
 /*
  * dx010_cpld.c - driver for SeaStone's CPLD
  *
- * Copyright (C) 2017 Celestica Corp.
+ * Copyright (C) 2023 Celestica Corp.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,11 +120,11 @@
 #define SSRR_ID_BANK2           0x296
 #define SSRR_ID_BANK3           0x396
 
-#define HST_CNTL2_QUICK         0x00
-#define HST_CNTL2_BYTE          0x01
-#define HST_CNTL2_BYTE_DATA     0x02
-#define HST_CNTL2_WORD_DATA     0x03
-#define HST_CNTL2_BLOCK         0x05
+#define SSRR_MASTER_ERR         0x80
+#define SSRR_BUS_BUSY           0x40
+
+#define I2C_BAUD_RATE_100K      0x40
+
 
 struct dx010_i2c_data {
         int portid;
@@ -610,6 +610,166 @@ static int i2c_read_eeprom(struct i2c_adapter *a, u16 addr,
         return error;
 }
 
+
+/**
+ * Read/Write eeprom of CPLD connected QSFP device.
+ * @param  a        i2c adapter.
+ * @param  addr     address to read.
+ * @param  new_data QSFP port number struct.
+ * @param  rw       read/write flag
+ * @param  cmd      i2c command.
+ * @param  size     access size
+ * @return          0 if not error, else the error code.
+ */
+static int dx010_cpld_i2c_access(struct i2c_adapter *a, u16 addr,
+               struct dx010_i2c_data *new_data, char rw,
+               u8 cmd, int size, union i2c_smbus_data *data)
+{
+        u32 reg;
+        int ioBase=0;
+        char byte;
+        char data_len = 0;
+        short temp;
+        short portid, opcode, devaddr, cmdbyte0, ssrr, writedata, readdata;
+        __u16 word_data;
+        __u8  byte_data;
+        int error = -EIO;
+
+        mutex_lock(&cpld_data->cpld_lock);
+
+        if (((new_data->portid >= PORT_BANK1_START)
+                        && (new_data->portid <= PORT_BANK1_END))
+                        || (new_data->portid == PORT_SFPP1)
+                        || (new_data->portid == PORT_SFPP2))
+        {
+                portid = PORT_ID_BANK1;
+                opcode = OPCODE_ID_BANK1;
+                devaddr = DEVADDR_ID_BANK1;
+                cmdbyte0 = CMDBYT_ID_BANK1;
+                ssrr = SSRR_ID_BANK1;
+                writedata = WRITE_ID_BANK1;
+                readdata = READ_ID_BANK1;
+        }else if ((new_data->portid >= PORT_BANK2_START) && (new_data->portid <= PORT_BANK2_END)){
+                portid = PORT_ID_BANK2;
+                opcode = OPCODE_ID_BANK2;
+                devaddr = DEVADDR_ID_BANK2;
+                cmdbyte0 = CMDBYT_ID_BANK2;
+                ssrr = SSRR_ID_BANK2;
+                writedata = WRITE_ID_BANK2;
+                readdata = READ_ID_BANK2;
+        }else if ((new_data->portid  >= PORT_BANK3_START) && (new_data->portid  <= PORT_BANK3_END)){
+                portid = PORT_ID_BANK3;
+                opcode = OPCODE_ID_BANK3;
+                devaddr = DEVADDR_ID_BANK3;
+                cmdbyte0 = CMDBYT_ID_BANK3;
+                ssrr = SSRR_ID_BANK3;
+                writedata = WRITE_ID_BANK3;
+                readdata = READ_ID_BANK3;
+        }else{
+            /* Invalid parameter! */
+                error = -EINVAL;
+                goto exit;
+        }
+
+        if (size == I2C_SMBUS_BYTE || size == I2C_SMBUS_BYTE_DATA)
+            data_len = 1;
+        else if (size == I2C_SMBUS_WORD_DATA)
+            data_len = 2;
+        else {
+            error = -EINVAL;
+            goto exit;
+        }
+
+        while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY));
+        if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) {
+                error = -EIO;
+                /* Read error reset the port */
+                outb(0x00, ioBase + ssrr);
+                udelay(3000);
+                outb(0x01, ioBase + ssrr);
+                goto exit;
+        }
+
+        byte = I2C_BAUD_RATE_100K + new_data->portid;
+        reg = cmd;
+        outb(byte, ioBase + portid);
+        outb(reg, ioBase + cmdbyte0);
+        byte = (data_len << 4) | 0x1;
+        outb(byte, ioBase + opcode);
+        addr = addr << 1;
+        if (rw == I2C_SMBUS_READ)
+        {
+            addr |= 0x01;
+            outb(addr, ioBase + devaddr);
+            while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY))
+            {
+                udelay(100);
+            }
+
+            if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) {
+                /* Read error reset the port */
+                    error = -EIO;
+                    outb(0x00, ioBase + ssrr);
+                    udelay(3000);
+                    outb(0x01, ioBase + ssrr);
+                    goto exit;
+            }
+
+            temp = ioBase + readdata;
+            if (data_len == 1)
+            {
+                byte_data = inb(temp);
+                data->byte = byte_data;
+            }
+            else if (data_len == 2)
+            {
+                word_data = inb(temp);
+                word_data |= (inb(++temp) << 8);
+                data->word = word_data;
+            }
+        }
+        else // do i2c write
+        {
+            temp = ioBase + writedata;
+            if (data_len == 1)
+            {
+                byte_data = data->byte;
+                outb(byte_data, temp);
+            }
+            else if (data_len == 2)
+            {
+                word_data = data->word;
+                outb((word_data & 0xff), temp);
+                outb((word_data >> 4), (++temp));
+            }
+            // write dev addr
+            outb(addr, ioBase + devaddr);
+
+            // check bus access status
+            while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY))
+            {
+                udelay(100);
+            }
+
+            if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) {
+                /* Read error reset the port */
+                    error = -EIO;
+                    outb(0x00, ioBase + ssrr);
+                    udelay(3000);
+                    outb(0x01, ioBase + ssrr);
+                    goto exit;
+            }
+        }
+
+        mutex_unlock(&cpld_data->cpld_lock);
+        return 0;
+
+exit:
+        mutex_unlock(&cpld_data->cpld_lock);
+        return error;
+}
+
+
 static int dx010_i2c_access(struct i2c_adapter *a, u16 addr,
               unsigned short flags, char rw, u8 cmd,
               int size, union i2c_smbus_data *data)
@@ -624,39 +784,19 @@ static int dx010_i2c_access(struct i2c_adapter *a, u16 addr,
 
         /* Map the size to what the chip understands */
         switch (size) {
-        case I2C_SMBUS_QUICK:
-                size = HST_CNTL2_QUICK;
-        break;
         case I2C_SMBUS_BYTE:
-                size = HST_CNTL2_BYTE;
-        break;
         case I2C_SMBUS_BYTE_DATA:
-                size = HST_CNTL2_BYTE_DATA;
-        break;
         case I2C_SMBUS_WORD_DATA:
-            	size = HST_CNTL2_WORD_DATA;
-        break;
-        case I2C_SMBUS_BLOCK_DATA:
-                size = HST_CNTL2_BLOCK;
-        break;
-        default:
-                dev_warn(&a->dev, "Unsupported transaction %d\n", size);
-                error = -EOPNOTSUPP;
-                goto Done;
-        }
-
-        switch (size) {
-        case HST_CNTL2_BYTE:    /* Result put in SMBHSTDAT0 */
-        break;
-        case HST_CNTL2_BYTE_DATA:
-        break;
-        case HST_CNTL2_WORD_DATA:
-                if( 0 == i2c_read_eeprom(a,addr,new_data,cmd,data)){
+                if(0 == dx010_cpld_i2c_access(a, addr, new_data, rw, cmd, size, data)){
                     error = 0;
                 }else{
                     error = -EIO;
                 }
         break;
+        default:
+                dev_warn(&a->dev, "Unsupported transaction %d\n", size);
+                error = -EOPNOTSUPP;
+                goto Done;
         }
 
 Done:
@@ -790,6 +930,6 @@ module_init(cel_dx010_lpc_init);
 module_exit(cel_dx010_lpc_exit);
 
 MODULE_AUTHOR("Pradchaya P <pphuchar@celestica.com>");
-MODULE_VERSION("1.0.1");
+MODULE_VERSION("1.0.2");
 MODULE_DESCRIPTION("Celestica SeaStone DX010 LPC Driver");
-MODULE_LICENSE("GPL");
\ No newline at end of file
+MODULE_LICENSE("GPL");

From 06be00525a7bc031ece9e1666d08351e798a433a Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 5 Mar 2023 04:31:07 +0800
Subject: [PATCH 1569/1674] [ci/build]: Upgrade SONiC package versions (#14080)

---
 .../build-sonic-slave-buster/versions-deb-buster  |  4 ++--
 .../build/build-sonic-slave-buster/versions-git   |  4 ++--
 files/build/versions/default/versions-docker      | 12 ++++++------
 files/build/versions/default/versions-git         |  6 +++---
 files/build/versions/default/versions-web         |  2 +-
 .../dockers/docker-syncd-mlnx/versions-deb-buster |  2 +-
 .../sonic-slave-buster/versions-deb-buster        | 15 +++++++--------
 .../dockers/sonic-slave-buster/versions-git       |  2 +-
 .../dockers/sonic-slave-stretch/versions-git      |  2 +-
 .../build/versions/host-image/versions-deb-buster |  6 +++---
 files/build/versions/host-image/versions-py3      |  2 +-
 11 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index b50fc2cab25f..240187a49344 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -5,7 +5,7 @@ innovium-sai==0.107.7
 innovium-sai-headers==0.107.7
 iproute2-dev==1.mlnx.4.5.3196
 isc-dhcp-relay==4.4.1-2
-kernel-mft-dkms==4.18.0-106
+kernel-mft-dkms==4.21.0-100
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
 libnl-cli-3-200==3.5.0-1
@@ -40,7 +40,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.18.0-106
+mft==4.21.0-100
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
 python2-yang==1.0.73
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 30fbbea95c09..b3ec9dd33d5f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,11 +3,11 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
+https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 18e5f1f28729..fe8679513101 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf
+amd64:amd64/debian:buster==sha256:c75d609d1d06a44ac87c52e9afe4102af856dd1c075f316b4d219f072af0b3b1
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
+amd64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9
-arm64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
+arm64:arm64v8/debian:buster==sha256:0100d882223b08bc979db07977fd493163c545abcac553086bba75a96aebe0bd
+arm64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:d0a16ffa3bc4302a306263e5abffe04d0340ea964e0e037afef17a3e9765b48a
-armhf:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
+armhf:arm32v7/debian:buster==sha256:43b845d5864322e89773a602535f5db85debe3356e50488c63dd99bf2cc16899
+armhf:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index b05e34f9c2ff..8983c0a4dfbb 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,11 +9,11 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
+https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index e9cbe57caf53..1e3b4714099c 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -14,7 +14,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
+http://www.mellanox.com/downloads/MFT/mft-4.21.0-100-x86_64-deb.tgz==51efe115cbada1120fefe7e4c6958baf
 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 0ba99a2e490c..410b6546b780 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -32,7 +32,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libxml2==2.9.4+dfsg1-7+deb10u5
 linux-libc-dev==4.19.269-1
-mft==4.18.0-106
+mft==4.21.0-100
 mlnx-sai==1.mlnx.SAIRel1.22.0.0
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 2c4d8dde3db8..a14b1ede742c 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -557,7 +557,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
 libgnutls-dane0==3.6.7-4+deb10u10
 libgnutls-openssl27==3.6.7-4+deb10u10
 libgnutls28-dev==3.6.7-4+deb10u10
-libgnutls30==3.6.7-4+deb10u10
 libgnutlsxx28==3.6.7-4+deb10u10
 libgomp1==8.3.0-6
 libgoogle-perftools4==2.7-1
@@ -1402,13 +1401,13 @@ php-token-stream==3.0.1-1
 php-tokenizer==1.1.0-1
 php-webmozart-assert==1.4.0-3
 php-xml==2:7.3+69
-php7.3-cli==7.3.31-1~deb10u2
-php7.3-common==7.3.31-1~deb10u2
-php7.3-json==7.3.31-1~deb10u2
-php7.3-mbstring==7.3.31-1~deb10u2
-php7.3-opcache==7.3.31-1~deb10u2
-php7.3-readline==7.3.31-1~deb10u2
-php7.3-xml==7.3.31-1~deb10u2
+php7.3-cli==7.3.31-1~deb10u3
+php7.3-common==7.3.31-1~deb10u3
+php7.3-json==7.3.31-1~deb10u3
+php7.3-mbstring==7.3.31-1~deb10u3
+php7.3-opcache==7.3.31-1~deb10u3
+php7.3-readline==7.3.31-1~deb10u3
+php7.3-xml==7.3.31-1~deb10u3
 phpunit==7.5.6-1
 phpunit-code-unit-reverse-lookup==1.0.1-1
 phpunit-comparator==3.0.2-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 4a6d033a52cd..6b1844bf466f 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 4a6d033a52cd..6b1844bf466f 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index e474032f1704..d7ba2b9856b2 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -77,7 +77,7 @@ isc-dhcp-client==4.4.1-2+deb10u3
 iso-codes==4.2-1
 jq==1.5+dfsg-2+b1
 kdump-tools==1:1.6.1-1
-kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.0
+kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.21.0
 kexec-tools==1:2.0.18-1
 klibc-utils==2.0.6-1+deb10u1
 kmod==26-1
@@ -240,8 +240,8 @@ lsb-release==10.2019051400
 make==4.2.1-1.2
 makedev==2.3.1-94
 makedumpfile==1:1.6.5-1
-mft==4.18.0-106
-mft-oem==4.18.0-106
+mft==4.21.0-100
+mft-oem==4.21.0-100
 mime-support==3.62
 monit==1:5.20.0-6
 mtd-utils==1:2.0.1-1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 20d5d9fdf172..6cf705cd50b5 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==3.0.1
 click==7.0
-cryptography==39.0.1
+cryptography==39.0.2
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From 280939b5c9aabf2ff4207a687c4290a724947d08 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:21:10 +0800
Subject: [PATCH 1570/1674] [Build] Support to use loosen version when failed
 to install python packages (#14013)

Why I did it
[Build] Support to use loosen version when failed to install python packages
It is to fix the issue #14012

How I did it
Try to use the installation command without constraint

How to verify it
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 712c43baa3bc..4c94eaf0aa4e 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -183,6 +183,11 @@ run_pip_command()
 
     $REAL_COMMAND "${parameters[@]}"
     local result=$?
+    if [ "$result" != 0 ]; then
+        echo "Failed to run the command with constraint, try to install with the original command" 1>&2
+        $REAL_COMMAND "$@"
+        result=$?
+    fi
     rm $tmp_version_file
     return $result
 }

From 2ca6ec484ef6f991b485bce7073275df05911270 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:43:46 +0800
Subject: [PATCH 1571/1674] [202012][Security][CVE-2022-2309] Upgrade lxml from
 4.6.5 to 4.9.1 (#14066)

Why I did it
Fix CVE-2022-2309, upgrade lxml from 4.6.3 to 4.9.1
---
 src/sonic-config-engine/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index 9b4f2cb51160..ea5b0853fab0 100644
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -7,7 +7,7 @@
 dependencies = [
     'bitarray==1.5.3',
     'ipaddress==1.0.23',
-    'lxml==4.6.3',
+    'lxml==4.9.1',
     'netaddr==0.8.0',
     'pyyaml==5.4.1',
     'sonic-py-common',

From 481f51f45c913527f7c2d1e6d5a5b6ad2d1ae1bc Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Tue, 7 Mar 2023 11:16:19 -0800
Subject: [PATCH 1572/1674] [202012][sonic-snmpagent]: Advance submodule
 (#14111)

#### Why I did it
Update sonic-snmpagent submodule to include below commit:
fba50c6  [202012]: snmp vlan support per RFC1213 and added the missing support for RFC2863 (#279)
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 7147354e08d6..fba50c65b00a 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 7147354e08d6ee225b96fdf37d2523dacab2736f
+Subproject commit fba50c65b00a5662197d6d37c06308e82356e3ea

From 545b526a49493be87f23d3b4712281546b05eb48 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:04:09 -0800
Subject: [PATCH 1573/1674] [202012][mellanox]Fix lpmode set when logical port
 is larger than 64 (#14137)

This PR is to backport #14138 to 202012.

- Why I did it
In sfplpm API, the number of logical ports is hardcoded as 64. When a system contains more port than this, the SDK APIs would fail with a trace as below

Enabling low-power mode for port Ethernet0... Traceback (most recent call last):
File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 167, in
set_lpmode(handle, cmd, sfp_module)
File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 128, in set_lpmode
SX_MGMT_PHY_MOD_PWR_ATTR_PWR_MODE_E, SX_MGMT_PHY_MOD_PWR_MODE_LOW_E)
File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 115, in pwr_attr_set
mgmt_phy_mod_pwr_attr_set(handle, module_id, attr_type, power_mode)
File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 84, in mgmt_phy_mod_pwr_attr_set
assert SX_STATUS_SUCCESS == rc, "sx_mgmt_phy_mod_pwr_attr_set failed"
AssertionError: sx_mgmt_phy_mod_pwr_attr_set failed
Error! Unable to set LPM for 1, rc = 1, err msg: [+] opening sdk
Mar 07 03:25:28 INFO LOG: Initializing SX log with STDOUT as output file.
Mar 07 03:25:28 ERROR SX_API_PORT: sx_mgmt_phy_mod_pwr_attr_get: This API is deprecated and will be removed in the future. Please use sx_mgmt_phy_module_pwr_attr_get in its place.
Mar 07 03:25:28 ERROR SX_API_PORT: sx_mgmt_phy_mod_pwr_attr_set: This API is deprecated and will be removed in the future. Please use sx_mgmt_phy_module_pwr_attr_set in its place.

- How I did it
Remove the hardcoded value of 64. Obtained the number of logical ports from SDK

- How to verify it
Manual testing
---
 .../mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py
index 61423880ac71..b0b2d5a2c9c4 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py
@@ -11,7 +11,6 @@
 
 DEVICE_ID = 1
 SWITCH_ID = 0
-SX_PORT_ATTR_ARR_SIZE = 64
 
 PORT_TYPE_CPU = 4
 PORT_TYPE_NVE = 8
@@ -51,9 +50,13 @@ def set_port_admin_status_by_log_port(handle, log_port, admin_status):
 
 
 def get_log_ports(handle, sfp_module):
-    port_attributes_list = new_sx_port_attributes_t_arr(SX_PORT_ATTR_ARR_SIZE)
     port_cnt_p = new_uint32_t_p()
-    uint32_t_p_assign(port_cnt_p, SX_PORT_ATTR_ARR_SIZE)
+    uint32_t_p_assign(port_cnt_p, 0)
+    rc = sx_api_port_device_get(handle, DEVICE_ID, SWITCH_ID, None,  port_cnt_p)
+
+    assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc
+    port_cnt = uint32_t_p_value(port_cnt_p)
+    port_attributes_list = new_sx_port_attributes_t_arr(port_cnt)
 
     rc = sx_api_port_device_get(handle, DEVICE_ID, SWITCH_ID, port_attributes_list,  port_cnt_p)
     assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc

From 6f949226d122319022c9f857eba41d53f99241cb Mon Sep 17 00:00:00 2001
From: prabhataravind <108555774+prabhataravind@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:35:29 -0800
Subject: [PATCH 1574/1674] [202012][swss]: Submodule update (#14171)

* Include the following commits:
  - a21b160 [202012][orchagent]: Handle duplicate routes in a graceful manner (#2666)
  - 1540161 [bfdorch] add default TOS value for BFD packet (#2692)
  - 860430c [ci] run apt-get update before apt-get install (#2686)
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 0d95f076b5b4..a21b16041ef9 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 0d95f076b5b4e444eb8ea0a63b8ff4d883762440
+Subproject commit a21b16041ef9f5b0c559421e4e5e8279ff42a645

From f0c1ef0abce122645610c856a02052b10454e58b Mon Sep 17 00:00:00 2001
From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:27:49 -0500
Subject: [PATCH 1575/1674] [marvell-armhf][uboot] Fixed the uboot setting for
 sonic-installer set-default form 202012 to 202205 branch. (#13911)

#### Why I did it
When using ```sonic-install set-default``` to switch the image from 202012 to 202205.  The system will be stuck at loading kernel while reboot.

#### How I did it
The issue is caused by the kernal size related setting in uboot environment is smaller in the 202012 branch while they are larger in 202205 branch.  The "sonic-installer set-default" just changes the boot_next variable.  To fix this issue, we sync up the 202012 branch kernel related setting with the 202205 branch.  This PR is only applicable to 202012 branch.

#### How to verify it
1) Install the latest 202205 image .89 or latest and reboot
2) Install the 202012 image which contains this fix and reboot
3) using "sonic-installer set-default 202205 image and reboot
4) system should start without any issue.

#### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
---
 platform/marvell-armhf/platform.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 23a191adf7b2..ddc603490dbc 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -6,9 +6,9 @@ echo "Preparing for installation ... "
 
 # global defines
 kernel_addr=0x1100000
-fdt_addr=0x1000000
-fdt_high=0x10fffff
-initrd_addr=0x2000000
+fdt_addr=0x2800000
+fdt_high=0x28fffff
+initrd_addr=0x2900000
 
 kernel_fname="/boot/vmlinuz-4.19.0-12-2-armmp"
 initrd_fname="/boot/initrd.img-4.19.0-12-2-armmp"
@@ -175,7 +175,7 @@ prepare_boot_menu() {
         BOOT3='echo " > Boot3: ONIE - run onie_nand_boot";echo;'
     fi
     BORDER='echo "---------------------------------------------------";echo;'
-    fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
+    fw_setenv ${FW_ARG} print_menu "$BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER" > /dev/null
 
     fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
     fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null

From 9e7b038d9cd175d15cd982fc9c26e0ba315f8406 Mon Sep 17 00:00:00 2001
From: Ashwin Srinivasan <93744978+assrinivasan@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:32:41 -0800
Subject: [PATCH 1576/1674] [202012] Added libpci and pciutils to the pmon
 docker (#12684) (#14056)

#### Why I did it

This is part of a corresponding change to the pcie daemon that enables it to verify PCI peripherals on a platform against a preconfigured YAML file, and enables the pcied daemon to call the system commands needed for PCI peripheral verification

#### How I did it
Adding aforementioned libraries to the Dockerfile.j2 file

#### How to verify it
run 'which setpci' from the pmon docker - would show the path of the binary

#### Description for the changelog

Modified pmon's Dockerfile.j2 to include pciutils and libpci libraries.

**cherry-pick of SHA: 7de04504c9518d68aa00c304b7376fdff4e1d318**
---
 dockers/docker-platform-monitor/Dockerfile.j2 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index d8988b8f6ebe..2c144cfc55d3 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -26,7 +26,8 @@ RUN apt-get update &&   \
         i2c-tools       \
         psmisc          \
         python3-jsonschema \
-        libpci3
+        libpci3         \
+        pciutils
 
 # TODO: Remove these lines once we no longer need Python 2
 RUN apt-get install -f -y python-dev python-pip
@@ -48,6 +49,10 @@ RUN pip2 install enum34
 RUN pip2 install thrift==0.13.0
 RUN pip3 install thrift==0.13.0
 
+# We install the libpci module in order to be able to do PCI transactions
+RUN pip2 install libpci
+RUN pip3 install libpci
+
 {% if docker_platform_monitor_debs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_platform_monitor_debs.split(' '), "/debs/") }}

From 9de3b4936b8e1728267a8116451b2d3ddfd168e8 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Mon, 13 Mar 2023 13:23:31 -0700
Subject: [PATCH 1577/1674] Add comment with affected products (#13803)

#### Why I did it

Some products might experience an occasional IO failure in the communication between CPU and SSD.
Based on some research it could be attributable to some device not handling ATA NCQ (Native Command Queue).

This issue currently affect 4 products:
 - `DCS-7170-32C*`
 - `DCS-7170-64C`
 - `DCS-7060DX4-32`
 - `DCS-7260CX3-64`

#### How I did it

This change disable NCQ on the affected drive for a small set of products.

#### How to verify it

When the fix is applied, these 2 patterns can be found in the dmesg.
`ata1.00: FORCE: horkage modified (noncq)`
`NCQ (not used)`

Test results using: `fio --direct=1 --rw=randrw --bs=64k --ioengine=libaio --iodepth=64 --runtime=120 --numjobs=4`

with NCQ (`ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (depth 32), AA`)
```
   READ: bw=33.9MiB/s (35.6MB/s), 33.9MiB/s-33.9MiB/s (35.6MB/s-35.6MB/s), io=4073MiB (4270MB), run=120078-120078msec
  WRITE: bw=34.1MiB/s (35.8MB/s), 34.1MiB/s-34.1MiB/s (35.8MB/s-35.8MB/s), io=4100MiB (4300MB), run=120078-120078msec
```
without NCQ (`ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (not used)`)
```
   READ: bw=31.7MiB/s (33.3MB/s), 31.7MiB/s-31.7MiB/s (33.3MB/s-33.3MB/s), io=3808MiB (3993MB), run=120083-120083msec
  WRITE: bw=31.9MiB/s (33.4MB/s), 31.9MiB/s-31.9MiB/s (33.4MB/s-33.4MB/s), io=3830MiB (4016MB), run=120083-120083msec
```

#### Description for the changelog
Disable ATA NCQ for a few Arista products

From 18d049082e53ce9a345127e83b221953d448289f Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 14 Mar 2023 08:00:29 +0800
Subject: [PATCH 1578/1674] [ci/build]: Upgrade SONiC package versions (#14205)

Why I did it
[ci/build]: Upgrade SONiC package versions

How I did it
How to verify it
---
 .../versions/build/build-sonic-slave-buster/versions-git    | 4 ++--
 .../build/build-sonic-slave-buster/versions-py2-all-arm64   | 2 +-
 .../versions/build/build-sonic-slave-buster/versions-py3    | 2 +-
 .../build/build-sonic-slave-buster/versions-py3-all-arm64   | 2 +-
 files/build/versions/default/versions-git                   | 6 +++---
 .../dockers/docker-config-engine-buster/versions-py3        | 2 +-
 .../dockers/docker-config-engine-stretch/versions-py2       | 2 +-
 .../dockers/docker-platform-monitor/versions-deb-buster     | 1 +
 .../versions/dockers/docker-platform-monitor/versions-py2   | 4 +++-
 .../versions/dockers/docker-platform-monitor/versions-py3   | 2 ++
 .../dockers/docker-sonic-mgmt-framework/versions-py3        | 4 ++--
 files/build/versions/dockers/docker-sonic-vs/versions-py3   | 2 +-
 .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +-
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-py2                | 2 +-
 files/build/versions/host-image/versions-py3                | 4 ++--
 17 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b3ec9dd33d5f..b2525ffced3e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
+https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
-https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
+https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
index 8492dcc26744..c7b43db04ec2 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
@@ -1,2 +1,2 @@
 ipaddress==1.0.23
-lxml==4.6.3
\ No newline at end of file
+lxml==4.9.1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 7e940600fc67..41bda4e47e42 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,4 +1,4 @@
-charset-normalizer==3.0.1
+charset-normalizer==3.1.0
 click==7.0
 docker==6.0.1
 ijson==2.6.1
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
index 949c3055bf13..5b4fcbd1590a 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
-lxml==4.6.3
+lxml==4.9.1
 requests==2.28.2
 urllib3==1.26.14
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 8983c0a4dfbb..2098babd013a 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,12 +9,12 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
+https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
-https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
+https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index fb011461608f..faad4632051e 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -1,6 +1,6 @@
 bitarray==1.5.3
 ipaddress==1.0.23
-lxml==4.6.3
+lxml==4.9.1
 natsort==6.2.1
 netaddr==0.8.0
 pyang==2.5.3
diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index ad70857eef4a..9092f9c71ce4 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -3,7 +3,7 @@ contextlib2==0.6.0.post1
 future==0.18.3
 importlib-resources==3.3.1
 ipaddress==1.0.23
-lxml==4.6.3
+lxml==4.9.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.7.post1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 031e96ee644b..2c3e6fdecb38 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -102,6 +102,7 @@ lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
 openssh-client==1:7.9p1-10+deb10u2
 patch==2.7.6-3+deb10u1
+pciutils==1:3.5.2-1
 psmisc==23.2-1+deb10u1
 python==2.7.16-1
 python-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2
index 61c36312f823..ce6b78c718ae 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py2
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2
@@ -3,11 +3,13 @@ contextlib2==0.6.0.post1
 enum34==1.1.10
 functools32==3.2.3.post2
 future==0.18.3
+guacamole==0.9.2
 importlib-resources==3.3.1
 ipaddress==1.0.23
 jinja2==2.11.3
 jsonschema==2.6.0
-lxml==4.6.3
+libpci==0.2
+lxml==4.9.1
 markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index f2debc6aefc2..c36f28d012b1 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,3 +1,5 @@
+guacamole==0.9.2
 jsonschema==2.6.0
+libpci==0.2
 python_sdk_api==4.5.3196
 thrift==0.13.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index e53395334666..3333ef049b81 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,6 +1,6 @@
 attrs==22.2.0
 certifi==2017.4.17
-charset-normalizer==3.0.1
+charset-normalizer==3.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
@@ -19,7 +19,7 @@ openapi-schema-validator==0.4.3
 openapi-spec-validator==0.5.5
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.22.0
+protobuf==4.22.1
 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
index 4156fc6f5b33..520d95fc351b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,5 +1,5 @@
 certifi==2022.12.7
-charset-normalizer==3.0.1
+charset-normalizer==3.1.0
 click==7.0
 idna==3.4
 ijson==2.6.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index a14b1ede742c..516d94d5d4be 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -413,7 +413,7 @@ libdbi1==0.9.0-5
 libdbus-1-3==1.12.24-0+deb10u1
 libdbus-1-dev==1.12.24-0+deb10u1
 libdconf1==0.30.1-2
-libde265-0==1.0.3-1+deb10u3
+libde265-0==1.0.11-0+deb10u4
 libdevel-callchecker-perl==0.008-1
 libdevel-caller-perl==2.06-2+b1
 libdevel-globaldestruction-perl==0.14-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 6b1844bf466f..843ae5b79903 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 6b1844bf466f..843ae5b79903 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index 93186520cb3e..a57346ced325 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -8,7 +8,7 @@ ipaddr==2.2.0
 ipaddress==1.0.23
 jinja2==2.11.3
 jsonschema==2.6.0
-lxml==4.6.3
+lxml==4.9.1
 markupsafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 6cf705cd50b5..ec023eb5c7ce 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -4,7 +4,7 @@ azure-storage==0.36.0
 bitarray==1.5.3
 certifi==2022.12.7
 cffi==1.15.1
-charset-normalizer==3.0.1
+charset-normalizer==3.1.0
 click==7.0
 cryptography==39.0.2
 docker==4.3.1
@@ -15,7 +15,7 @@ j2cli==0.3.10
 jinja2==3.1.2
 jsondiff==2.0.0
 jsonschema==2.6.0
-lxml==4.6.3
+lxml==4.9.1
 m2crypto==0.38.0
 markupsafe==2.1.2
 natsort==6.2.1

From 79548e472dd8ff830f54dc4208eca98132bc17a2 Mon Sep 17 00:00:00 2001
From: Sudharsan Dhamal Gopalarathnam <dgsudharsan@users.noreply.github.com>
Date: Tue, 14 Mar 2023 10:19:02 -0700
Subject: [PATCH 1579/1674] [Mellanox]Fix lpmode set when logical port is
 larger than 64 (#14138) (#14202)

Manual cherry-pick of https://github.com/sonic-net/sonic-buildimage/pull/14138
- Why I did it
In sfplpm API, the number of logical ports is hardcoded as 64. When a system contains more port than this, the SDK APIs would fail with a syslog as below

Mar 7 03:53:58.105980 r-leopard-58 ERR syncd#SDK: [MGMT_LIB.ERR] Slot [0] Module [0] has logport [0x00010069] in enabled state
Mar 7 03:53:58.105980 r-leopard-58 ERR syncd#SDK: [SDK_MGMT_LIB.ERR] Failed in __sdk_mgmt_phy_module_pwr_attr_set, error: Internal Error
Mar 7 03:53:58.106118 r-leopard-58 ERR pmon#-c: Error occurred when setting power mode for SFP module 0, slot 0, error code 1

- How I did it
Remove the hardcoded value of 64. Obtained the number of logical ports from SDK

- How to verify it
Manual testing
---
 .../mellanox/mlnx-platform-api/sonic_platform/sfp.py   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index 6cfe253aa3fb..5d26b7d43618 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -263,7 +263,6 @@
 REGISTER_NUM = 1
 DEVICE_ID = 1
 SWITCH_ID = 0
-SX_PORT_ATTR_ARR_SIZE = 64
 
 PMAOS_ASE = 1
 PMAOS_EE = 1
@@ -1978,14 +1977,17 @@ def set_port_admin_status_by_log_port(self, log_port, admin_status):
 
     def get_logical_ports(self):
         # Get all the ports related to the sfp, if port admin status is up, put it to list
-        port_attributes_list = new_sx_port_attributes_t_arr(SX_PORT_ATTR_ARR_SIZE)
         port_cnt_p = new_uint32_t_p()
-        uint32_t_p_assign(port_cnt_p, SX_PORT_ATTR_ARR_SIZE)
+        uint32_t_p_assign(port_cnt_p, 0)
+        rc = sx_api_port_device_get(self.sdk_handle, DEVICE_ID, SWITCH_ID, None,  port_cnt_p)
+        assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc
+        port_cnt = uint32_t_p_value(port_cnt_p)
+        port_attributes_list = new_sx_port_attributes_t_arr(port_cnt)
+
 
         rc = sx_api_port_device_get(self.sdk_handle, DEVICE_ID , SWITCH_ID, port_attributes_list,  port_cnt_p)
         assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc
 
-        port_cnt = uint32_t_p_value(port_cnt_p)
         log_port_list = []
         for i in range(0, port_cnt):
             port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list, i)

From e2e3625500e8ed15cd48ded7acded864f71e942b Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 15 Mar 2023 17:10:28 -0700
Subject: [PATCH 1580/1674] [202012][Submodule] update for sonic-restapi
 (#14241)

Update sonic-restapi for the following commit:

44121be - 2023-03-14: Support ipv6 prefix length greater than 64 and check for adv_prefix
47e4b53 - 2023-03-15: Set allowed IPv6 pfx len to be 60
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 99c467d8e727..47e4b534df75 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 99c467d8e727775085fbf962e2c3d9f9886b8161
+Subproject commit 47e4b534df75fd71af6f902759f69cc0fc8b7a3c

From ab5115846ded6711803adaf526804ad520f045a6 Mon Sep 17 00:00:00 2001
From: Yakiv Huryk <62013282+Yakiv-Huryk@users.noreply.github.com>
Date: Thu, 16 Mar 2023 12:42:19 +0200
Subject: [PATCH 1581/1674] [202012][Mellanox] update sdk/fw build procedure
 (#14025) (#14220)

- Why I did it
To optimize Mellanox platform build

- How I did it
sdk debs are now downloaded as Spectrum-SDK-Drivers-SONiC-Bins release
sx kernel is downloaded as zip from Spectrum-SDK-Drivers
---
 .gitmodules                                     |  3 ---
 platform/mellanox/fw.mk                         |  9 ++++++---
 platform/mellanox/sdk-src/sx-kernel/Makefile    | 14 +++++++++++---
 .../sdk-src/sx-kernel/Switch-SDK-drivers        |  1 -
 platform/mellanox/sdk.mk                        | 17 ++++++++---------
 5 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 160000 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers

diff --git a/.gitmodules b/.gitmodules
index c5c1279a1b93..4eedbea00df9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,9 +73,6 @@
 [submodule "src/sonic-telemetry"]
 	path = src/sonic-telemetry
 	url = https://github.com/sonic-net/sonic-gnmi
-[submodule "Switch-SDK-drivers"]
-	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
-	url = https://github.com/Mellanox/Switch-SDK-drivers
 [submodule "src/sonic-ztp"]
 	path = src/sonic-ztp
 	url = https://github.com/sonic-net/sonic-ztp
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index faef8e6f9395..9026dc153176 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -5,10 +5,13 @@ MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH)
 # Place an URL here to FW if you want to download FW instead
 MLNX_FW_BASE_URL =
 
-ifneq ($(MLNX_FW_BASE_URL), )
 FW_FROM_URL = y
-else
-FW_FROM_URL = n
+
+MLNX_FW_ASSETS_RELEASE_TAG = fw-2010.3196
+MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)
+
+ifeq ($(MLNX_FW_BASE_URL), )
+MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
 endif
 
 MLNX_SPC_FW_VERSION = 13.2010.3196
diff --git a/platform/mellanox/sdk-src/sx-kernel/Makefile b/platform/mellanox/sdk-src/sx-kernel/Makefile
index 422f2ae95aae..179594798129 100644
--- a/platform/mellanox/sdk-src/sx-kernel/Makefile
+++ b/platform/mellanox/sdk-src/sx-kernel/Makefile
@@ -5,6 +5,8 @@ MAIN_TARGET = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
 DERIVED_TARGETS = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
 PACKAGE_NAME = sx_kernel
 
+MLNX_SX_KERNEL_GITHUB_URL_BASE = https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads
+
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# get sources
 
@@ -13,9 +15,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 		wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
 		pushd sx_kernel-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
 	else
-		pushd Switch-SDK-drivers
-		git reset --hard
-		git clean -xfd
+		rm -rf Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION)
+		wget -c $(MLNX_SX_KERNEL_GITHUB_URL_BASE)/$(MLNX_SDK_VERSION).zip
+		unzip $(MLNX_SDK_VERSION).zip
+		rm -rf $(MLNX_SDK_VERSION).zip
+
+		pushd Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION)
+		ln -s ./sx_scripts/Makefile ./Makefile
+		ln -s ./sx_scripts/makefile ./makefile
+		ln -s ./sx_scripts/configure ./configure
 	fi
 
 	# build
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
deleted file mode 160000
index a12968f165f6..000000000000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a12968f165f623ff3c27d6ebaabd34cc6316497e
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 06c067cc1984..a7a2bb20b43a 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,8 +1,9 @@
-MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
-MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
 MLNX_SDK_VERSION = 4.5.3196
 MLNX_SDK_ISSU_VERSION = 101
 
+MLNX_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins
+MLNX_SDK_ASSETS_RELEASE_TAG = sdk-$(MLNX_SDK_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH)
+MLNX_SDK_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SDK_ASSETS_RELEASE_TAG)
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))
 
 # Place here URL where SDK sources exist
@@ -14,7 +15,7 @@ else
 SDK_FROM_SRC = n
 endif
 
-export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION
+export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION MLNX_ASSETS_GITHUB_URL
 
 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_COMPLIB) $(SX_EXAMPLES) \
                   $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER)
@@ -136,21 +137,19 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel
 SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
 
-define make_path
-	$(1)_PATH = $(MLNX_SDK_PKG_BASE_PATH)
+define make_url
+	$(1)_URL = $(MLNX_SDK_ASSETS_URL)/$(1)
 
 endef
 
-$(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_path,$(deb))))
-$(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_path,$(deb))))
-$(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make_path,$(deb))))
+$(eval $(foreach deb,$(MLNX_SDK_DEBS) $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API),$(call make_url,$(deb))))
 
 SONIC_MAKE_DEBS += $(SX_KERNEL)
 
 ifeq ($(SDK_FROM_SRC), y)
 SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
 else
-SONIC_COPY_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
+SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
 endif
 
 mlnx-sdk-packages: $(addprefix $(DEBS_PATH)/, $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL))

From b791970c1ceddd4ea00c03e21de4ca675d1ece01 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 18 Mar 2023 09:39:48 +0800
Subject: [PATCH 1582/1674] [ci/build]: Upgrade SONiC package versions (#14306)

---
 .../build-sonic-slave-buster/versions-git     |  6 ++--
 .../versions-py3-all-arm64                    |  2 +-
 files/build/versions/default/versions-git     |  8 +++---
 files/build/versions/default/versions-web     | 23 +++++++++++++++
 .../versions-deb-buster                       |  2 +-
 .../docker-sonic-mgmt-framework/versions-py3  |  6 ++--
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn-rpc/versions-deb-buster  |  4 +--
 .../docker-syncd-brcm-rpc/versions-deb-buster |  4 +--
 .../versions-deb-buster                       |  4 +--
 .../docker-syncd-mlnx-rpc/versions-deb-buster |  4 +--
 .../sonic-slave-buster/versions-deb-buster    | 28 +++++++++----------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 17 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b2525ffced3e..b5de2b9510d4 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -1,9 +1,9 @@
-https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
+https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
+https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40
+https://github.com/sflow/host-sflow==73af41b30fc03eec7a8291ff99e073cf3bd3b0ac
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
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
index 5b4fcbd1590a..ba7074b371e2 100644
--- 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,4 +1,4 @@
 bitarray==1.5.3
 lxml==4.9.1
 requests==2.28.2
-urllib3==1.26.14
\ No newline at end of file
+urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2098babd013a..ae173f9a6b1c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,15 +1,15 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
-https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
+https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
+https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40
+https://github.com/sflow/host-sflow==73af41b30fc03eec7a8291ff99e073cf3bd3b0ac
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 1e3b4714099c..f534bd23d393 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,6 +31,29 @@ https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==07f1d18c7f49
 https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf34b81c6bbb4b1f5042ffde
 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC-rel-13_2010_3196-EVB.mfa==3188bdd7b67e8f7f910b043a30605b2d
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC2-rel-29_2010_3196-EVB.mfa==8ca33224c84c249c028ae605f0d32f00
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC3-rel-30_2010_3196-EVB.mfa==2bb7889c3037a284e6fa6d0be1b2a4ce
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/applibs-dev_1.mlnx.4.5.3196_amd64.deb==bca0bca15d7513ca5e1946b192e44c40
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/applibs_1.mlnx.4.5.3196_amd64.deb==346c327d87bfbb215008111270e70bc7
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/iproute2-dev_1.mlnx.4.5.3196_amd64.deb==16523e010d7da24776eddb9eebb62928
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/iproute2_1.mlnx.4.5.3196_amd64.deb==cdac0683373430337ebf4993c0671c94
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/python-sdk-api_1.mlnx.4.5.3196_amd64.deb==2d39c06854baccb824e4bcbb511b9893
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-acl-helper-dev_1.mlnx.4.5.3196_amd64.deb==76d1c90f31c287d28a42f889f564f985
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-acl-helper_1.mlnx.4.5.3196_amd64.deb==d01432a647031c8a59213a64ee62f9be
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-complib-dev_1.mlnx.4.5.3196_amd64.deb==de4b166603e9cc64d8f345e8014bc681
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-complib_1.mlnx.4.5.3196_amd64.deb==254bdfd1c43d76df234014523eecca54
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-examples-dev_1.mlnx.4.5.3196_amd64.deb==d9e740543b849cbae5a318e5a270688d
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-examples_1.mlnx.4.5.3196_amd64.deb==26c3b5d9514ace617749365b7c3d13eb
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-gen-utils-dev_1.mlnx.4.5.3196_amd64.deb==487c5f6ec1b7e0843ea897d61f102e4f
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-gen-utils_1.mlnx.4.5.3196_amd64.deb==78bbee23285135f278fec078ef1dd5f5
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-scew-dev_1.mlnx.4.5.3196_amd64.deb==5636861512458c74ec7cdd3193f4cada
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sx-scew_1.mlnx.4.5.3196_amd64.deb==2d76cf5b94118fc1517931ce5dc00146
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sxd-libs-dev_1.mlnx.4.5.3196_amd64.deb==17808d341f45faeaa1910c139b5c9fc2
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/sxd-libs_1.mlnx.4.5.3196_amd64.deb==af03da363f25290115f7f9c3b518845b
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/wjh-libs-dev_1.mlnx.4.5.3196_amd64.deb==53e45e4808fcbd2c2103791519a549c9
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.3196-buster-amd64/wjh-libs_1.mlnx.4.5.3196_amd64.deb==72d4fa9ea3ed41cf2aa49d543d4d8748
+https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads/4.5.3196.zip==076370f8d35af0a4b6e82ae565132801
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
 https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
index d503aedc2a83..72a39dab573d 100644
--- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -10,7 +10,7 @@ libglib2.0-0==2.58.3-2+deb10u4
 libicu63==63.1-6+deb10u3
 libipt2==2.0-2
 libkmod2==26-1
-libpcre2-16-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
 libpopt0==1.16-12
 libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 3333ef049b81..24c3c38a0c96 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -13,10 +13,10 @@ importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
 jsonschema==4.17.3
-jsonschema-spec==0.1.3
+jsonschema-spec==0.1.4
 lazy-object-proxy==1.9.0
-openapi-schema-validator==0.4.3
-openapi-spec-validator==0.5.5
+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
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 5e5a15d136fe..ec432c837ddf 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -75,7 +75,7 @@ libnfnetlink0==1.0.1-3+b1
 libnftnl11==1.1.2-2
 libnpth0==1.6-1
 libpcap0.8==1.8.1-6+deb10u1
-libpcre2-16-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
 libpng16-16==1.6.36-6
 libpopt0==1.16-12
 libpython-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index 2592e3bd311e..f5309a2a4653 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -10,4 +10,4 @@ pyroute2==0.5.3
 requests==2.27.1
 scapy==2.4.0
 six==1.16.0
-urllib3==1.26.14
\ No newline at end of file
+urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 520d95fc351b..bd11194bcc5a 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -12,5 +12,5 @@ pyroute2==0.5.14
 requests==2.28.2
 scapy==2.4.4
 tabulate==0.9.0
-urllib3==1.26.14
+urllib3==1.26.15
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
index 37ddda57fdd0..9a8b06a37485 100644
--- a/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster
@@ -29,8 +29,8 @@ liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
+libpcre2-8-0==10.32-5+deb10u1
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index abf1dfe1d527..96e3eb6d8628 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -30,8 +30,8 @@ liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
+libpcre2-8-0==10.32-5+deb10u1
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 6579d8901aa9..7093867a1b2d 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -32,8 +32,8 @@ liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
+libpcre2-8-0==10.32-5+deb10u1
 libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
 libpython2-dev==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
index 7f807867154b..6099d3eb7528 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
@@ -28,8 +28,8 @@ liblsan0==8.3.0-6
 libmpc3==1.1.0-1
 libmpfr6==4.0.2-1
 libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
+libpcre2-8-0==10.32-5+deb10u1
 libqt5core5a==5.11.3+dfsg1-1+deb10u5
 libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 516d94d5d4be..f53201239deb 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -183,9 +183,9 @@ i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
 icc-profiles-free==2.0.1+dfsg-1
 icu-devtools==63.1-6+deb10u3
-imagemagick==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u1
-imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u1
+imagemagick==8:6.9.10.23+dfsg-2.1+deb10u3
+imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u3
+imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u3
 install-info==6.5.0.dfsg.1-4+b1
 intel-media-va-driver==18.4.1+dfsg1-1
 intltool-debian==0.35.0+20060710.5
@@ -734,9 +734,9 @@ liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
-libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u1
-libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u1
+libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u3
+libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u3
+libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u3
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
 libmariadb-dev==1:10.3.38-0+deb10u1
@@ -873,8 +873,8 @@ libpci-dev==1:3.5.2-1
 libpci3==1:3.5.2-1
 libpciaccess0==0.14-1
 libpcre16-3==2:8.39-12
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
+libpcre2-16-0==10.32-5+deb10u1
+libpcre2-8-0==10.32-5+deb10u1
 libpcre3-dev==2:8.39-12
 libpcre32-3==2:8.39-12
 libpcrecpp0v5==2:8.39-12
@@ -1610,12 +1610,12 @@ python3.7-dbg==3.7.3-2+deb10u4
 python3.7-dev==3.7.3-2+deb10u4
 python3.7-minimal==3.7.3-2+deb10u4
 qdbus==4:4.8.7+dfsg-18+deb10u1
-qemu-kvm==1:3.1+dfsg-8+deb10u9
-qemu-system-common==1:3.1+dfsg-8+deb10u9
-qemu-system-data==1:3.1+dfsg-8+deb10u9
-qemu-system-gui==1:3.1+dfsg-8+deb10u9
-qemu-system-x86==1:3.1+dfsg-8+deb10u9
-qemu-utils==1:3.1+dfsg-8+deb10u9
+qemu-kvm==1:3.1+dfsg-8+deb10u10
+qemu-system-common==1:3.1+dfsg-8+deb10u10
+qemu-system-data==1:3.1+dfsg-8+deb10u10
+qemu-system-gui==1:3.1+dfsg-8+deb10u10
+qemu-system-x86==1:3.1+dfsg-8+deb10u10
+qemu-utils==1:3.1+dfsg-8+deb10u10
 qt-at-spi==0.4.0-9
 qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
 qt4-qmake==4:4.8.7+dfsg-18+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 843ae5b79903..b93417169b8d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 843ae5b79903..b93417169b8d 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index ec023eb5c7ce..c87bb303523e 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -41,7 +41,7 @@ scapy==2.4.4
 six==1.16.0
 tabulate==0.9.0
 thrift==0.13.0
-urllib3==1.26.14
+urllib3==1.26.15
 watchdog==0.10.3
 websocket-client==1.5.1
 xmltodict==0.12.0
\ No newline at end of file

From 36cc9ae5d61b6a7e8cd988819ff5a00f65ba26b2 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 18 Mar 2023 19:01:08 +0800
Subject: [PATCH 1583/1674] [ci/build]: Upgrade SONiC package versions (#14310)

---
 .../build/build-sonic-slave-buster/versions-deb-buster-armhf  | 4 ++++
 .../build/build-sonic-slave-buster/versions-py2-all-armhf     | 2 ++
 .../build/build-sonic-slave-buster/versions-py3-all-armhf     | 4 ++++
 3 files changed, 10 insertions(+)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index a83790c30ddf..72e55bfa8606 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1 +1,5 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
new file mode 100644
index 000000000000..c7b43db04ec2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
@@ -0,0 +1,2 @@
+ipaddress==1.0.23
+lxml==4.9.1
\ No newline at end of file
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
new file mode 100644
index 000000000000..ba7074b371e2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1,4 @@
+bitarray==1.5.3
+lxml==4.9.1
+requests==2.28.2
+urllib3==1.26.15
\ No newline at end of file

From fd33a01796a6cc37a83ece2482b215a5a1d4775a Mon Sep 17 00:00:00 2001
From: mssonicbld <sonicbld@microsoft.com>
Date: Sun, 19 Mar 2023 06:49:18 +0000
Subject: [PATCH 1584/1674] [ci/build]: Upgrade SONiC package versions

---
 .../versions-deb-buster-armhf                      |  4 ----
 .../build/build-sonic-slave-buster/versions-git    |  2 +-
 .../versions-py2-all-armhf                         |  2 --
 .../versions-py3-all-armhf                         |  4 ----
 files/build/versions/default/versions-git          |  4 ++--
 .../docker-sonic-mgmt-framework/versions-py3       |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster | 14 +++++++-------
 .../sonic-slave-buster/versions-deb-buster-armhf   |  2 +-
 .../dockers/sonic-slave-buster/versions-git        |  2 +-
 .../dockers/sonic-slave-stretch/versions-git       |  2 +-
 10 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index 72e55bfa8606..a83790c30ddf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1,5 +1 @@
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index b5de2b9510d4..e53ab9f4ac02 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==73af41b30fc03eec7a8291ff99e073cf3bd3b0ac
+https://github.com/sflow/host-sflow==3cd477f55b7049082a3e6f38fe9fa4519f8f0469
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
deleted file mode 100644
index c7b43db04ec2..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
+++ /dev/null
@@ -1,2 +0,0 @@
-ipaddress==1.0.23
-lxml==4.9.1
\ No newline at end of file
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
deleted file mode 100644
index ba7074b371e2..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1,4 +0,0 @@
-bitarray==1.5.3
-lxml==4.9.1
-requests==2.28.2
-urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index ae173f9a6b1c..d7ce1f8162e1 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==73af41b30fc03eec7a8291ff99e073cf3bd3b0ac
+https://github.com/sflow/host-sflow==3cd477f55b7049082a3e6f38fe9fa4519f8f0469
 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 24c3c38a0c96..8b9e62f5a786 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.3
 grpcio==1.51.3
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.0.0
+importlib-metadata==6.1.0
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index f53201239deb..ca2521447f1d 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -183,9 +183,9 @@ i965-va-driver==2.3.0+dfsg1-1
 ibverbs-providers==22.1-1
 icc-profiles-free==2.0.1+dfsg-1
 icu-devtools==63.1-6+deb10u3
-imagemagick==8:6.9.10.23+dfsg-2.1+deb10u3
-imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u3
-imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u3
+imagemagick==8:6.9.10.23+dfsg-2.1+deb10u4
+imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u4
+imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u4
 install-info==6.5.0.dfsg.1-4+b1
 intel-media-va-driver==18.4.1+dfsg1-1
 intltool-debian==0.35.0+20060710.5
@@ -734,9 +734,9 @@ liblzo2-2==2.10-0.1
 liblzo2-dev==2.10-0.1
 libmagic-mgc==1:5.35-4+deb10u2
 libmagic1==1:5.35-4+deb10u2
-libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u3
-libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u3
-libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u3
+libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u4
+libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u4
+libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u4
 libmail-sendmail-perl==0.80-1
 libmailtools-perl==2.18-1
 libmariadb-dev==1:10.3.38-0+deb10u1
@@ -1199,7 +1199,7 @@ libx32quadmath0==8.3.0-6
 libx32stdc++6==8.3.0-6
 libx32ubsan1==8.3.0-6
 libxalan2-java==2.7.2-2
-libxapian30==1.4.11-1
+libxapian30==1.4.11-1+deb10u1
 libxau-dev==1:1.0.8-1+b2
 libxau6==1:1.0.8-1+b2
 libxaw7==2:1.0.13-1+b2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index d7ed25820044..031f49f85175 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -96,7 +96,7 @@ libsass1==3.5.5-4
 libsombok3==2.4.0-2
 libspecio-perl==0.43-1
 libunicode-linebreak-perl==0.0.20190101-1
-libxapian-dev==1.4.11-1
+libxapian-dev==1.4.11-1+deb10u1
 libxslt1-dev==1.1.32-2.2~deb10u2
 libyaml-tiny-perl==1.73-1
 linux-compiler-gcc-8-arm==4.19.269-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index b93417169b8d..097ebb7f6461 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index b93417169b8d..097ebb7f6461 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==3f3e2f789e27d41d3c20a555fd60a39ebd631e15
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From a78d4c9750c35b42a2178064cda02b849f4ca29a Mon Sep 17 00:00:00 2001
From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:58:17 -0700
Subject: [PATCH 1585/1674] [202012] Update sonic-telemetry submodule (#14174)

Has following commits:
```
b93c4ac Zain Budhwani Wed Mar 1 15:45:43 2023 -0800 Fix crash when retrieving cpu utilization (sonic-net/sonic-gnmi#70) (sonic-net/sonic-gnmi#71)
af1ec19 Zain Budhwani Wed Mar 1 15:13:53 2023 -0800 Add diff cov (sonic-net/sonic-gnmi#85)
3f41377 Zain Budhwani Tue Feb 28 16:48:22 2023 -0800 Add logs for md5 checksum (sonic-net/sonic-gnmi#80)
67b7fb2 Zain Budhwani Mon Feb 27 23:44:49 2023 -0800 Add get-update to azp yml (sonic-net/sonic-gnmi#79)
5d6c47f Zain Budhwani Fri Feb 24 13:11:53 2023 -0800 Add net core and code coverage results (sonic-net/sonic-gnmi#77)
984bc6d Zain Budhwani Wed Feb 22 16:03:01 2023 -0800 [202012] Enable unit test (sonic-net/sonic-gnmi#76)
e8e4335 Zain Budhwani Fri Feb 10 16:27:58 2023 -0800 Change dir name in pipeline (sonic-net/sonic-gnmi#75)
a1cc7ab Zain Budhwani Tue Jan 31 14:11:27 2023 -0800 Add 202012 branch to pr checker (sonic-net/sonic-gnmi#72)
eaea6c5 ganglyu Mon Nov 14 10:18:07 2022 +0800 Fix format
```
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 9897246795ed..9e2ad0a07d88 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 9897246795ed3ba3fde26a49ff64ff1d03b8dcc9
+Subproject commit 9e2ad0a07d8861dba6b9d95069bb79d2c065c202

From e528408d14f900b1c8b27acab91b26deaf507b3e Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:52:57 -0800
Subject: [PATCH 1586/1674] Update dhcpmon rx/tx packet filtering and fix
 server rx count (#13898)

Why I did it
Dhcpmon had incorrect RX count for server side packets. It does not raise any false alarms, but could miss catching server side packet count mismatch between snapshot and current counter.

Add debug mode which prints counter to syslog

How I did it
Due to dualtor inbound filter requirement, there are currently two filters, each for listening to rx / tx packets.
Originally, we opened up an rx/tx socket for each interface specified, which causes duplicate socket. Now we initialize the sockets only once. Both sockets are not binded to an interface, and we use vlan to interface mapping to filter packets. For inbound uplinks, we use a portchannel to interface mapping.

Previous dhcpmon counter before dual tor change:
[ Agg-Vlan1000- Current rx/tx] Discover: 1/ 4, Offer: 1/ 1, Request: 3/ 12, ACK: 1/ 1
[ eth0- Current rx/tx] Discover: 0/ 0, Offer: 0/ 0, Request: 0/ 0, ACK: 0/ 0
[ eth0- Current rx/tx] Discover: 0/ 0, Offer: 0/ 0, Request: 0/ 0, ACK: 0/ 0
[ PortChannel104- Current rx/tx] Discover: 0/ 1, Offer: 0/ 0, Request: 0/ 3, ACK: 0/ 0
[ PortChannel103- Current rx/tx] Discover: 0/ 1, Offer: 0/ 0, Request: 0/ 3, ACK: 0/ 0
[ PortChannel102- Current rx/tx] Discover: 0/ 2, Offer: 1/ 0, Request: 0/ 6, ACK: 1/ 0
[ PortChannel101- Current rx/tx] Discover: 0/ 0, Offer: 0/ 0, Request: 0/ 0, ACK: 0/ 0
[ Vlan1000- Current rx/tx] Discover: 1/ 0, Offer: 0/ 1, Request: 3/ 0, ACK: 0/ 1
[ Agg-Vlan1000- Current rx/tx] Discover: 1/ 4, Offer: 1/ 1, Request: 3/ 12, ACK: 1/ 1

Dhcpmon counter after this PR:
[ PortChannel104- Current rx/tx] Discover: 0/ 1, Offer: 0/ 0, Request: 0/ 3, ACK: 0/ 0
[ PortChannel103- Current rx/tx] Discover: 0/ 1, Offer: 0/ 0, Request: 0/ 3, ACK: 0/ 0
[ PortChannel102- Current rx/tx] Discover: 0/ 2, Offer: 1/ 0, Request: 0/ 6, ACK: 1/ 0
[ PortChannel101- Current rx/tx] Discover: 0/ 0, Offer: 0/ 0, Request: 0/ 0, ACK: 0/ 0
[ Vlan1000- Current rx/tx] Discover: 1/ 0, Offer: 0/ 1, Request: 3/ 0, ACK: 0/ 1
[ Agg-Vlan1000- Current rx/tx] Discover: 1/ 4, Offer: 1/ 1, Request: 3/ 12, ACK: 1/ 1

How to verify it
Ran dhcp relay test to send all four packets in singles and batches on both single ToR and dual ToR. Counter was as expected.
---
 src/dhcpmon/src/dhcp_device.cpp | 267 +++++++++++++++++++++-----------
 src/dhcpmon/src/dhcp_device.h   |  10 +-
 src/dhcpmon/src/dhcp_devman.cpp |  85 +++-------
 src/dhcpmon/src/dhcp_devman.h   |  10 ++
 src/dhcpmon/src/dhcp_mon.cpp    |  13 +-
 src/dhcpmon/src/dhcp_mon.h      |   5 +-
 src/dhcpmon/src/main.cpp        |  12 +-
 7 files changed, 233 insertions(+), 169 deletions(-)

diff --git a/src/dhcpmon/src/dhcp_device.cpp b/src/dhcpmon/src/dhcp_device.cpp
index f4f23526e136..12c0e1544903 100644
--- a/src/dhcpmon/src/dhcp_device.cpp
+++ b/src/dhcpmon/src/dhcp_device.cpp
@@ -24,6 +24,7 @@
 #include "subscriberstatetable.h"
 #include "select.h"
 
+#include "dhcp_devman.h"
 #include "dhcp_device.h"
 
 /** Counter print width */
@@ -61,6 +62,12 @@ std::shared_ptr<swss::Table> mStateDbMuxTablePtr = std::make_shared<swss::Table>
 /* interface to vlan mapping */
 std::unordered_map<std::string, std::string> vlan_map;
 
+/* interface to port-channel mapping */
+std::unordered_map<std::string, std::string> portchan_map;
+
+/* interface to mgmt port mapping */
+std::unordered_map<std::string, std::string> mgmt_map;
+
 /** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
  * This program is obtained using the following command tcpdump:
  * `tcpdump -dd "outbound and udp and (port 67 or port 68)"`
@@ -133,6 +140,10 @@ static struct sock_fprog dhcp_inbound_sock_bfp = {
     .len = sizeof(dhcp_inbound_bpf_code) / sizeof(*dhcp_inbound_bpf_code), .filter = dhcp_inbound_bpf_code
 };
 
+static uint8_t *rx_recv_buffer = NULL;
+static uint8_t *tx_recv_buffer = NULL;
+static uint32_t snap_length;
+
 /** Aggregate device of DHCP interfaces. It contains aggregate counters from
     all interfaces
  */
@@ -146,17 +157,56 @@ static dhcp_message_type_t monitored_msgs[] = {
     DHCP_MESSAGE_TYPE_ACK
 };
 
-void update_vlan_mapping(std::string vlan, std::shared_ptr<swss::DBConnector> mConfigDbPtr) {
-    auto match_pattern = std::string("VLAN_MEMBER|") + vlan + std::string("|*");
-    auto keys = mConfigDbPtr->keys(match_pattern);
+/** update ethernet interface to vlan map
+ *  VLAN_MEMBER|Vlan1000|Ethernet48
+ */
+void update_vlan_mapping(std::shared_ptr<swss::DBConnector> db_conn) {
+    auto match_pattern = std::string("VLAN_MEMBER|*");
+    auto keys = db_conn->keys(match_pattern);
     for (auto &itr : keys) {
-        auto found = itr.find_last_of('|');
-        auto interface = itr.substr(found + 1);
+        auto first = itr.find_first_of('|');
+        auto second = itr.find_last_of('|');
+        auto vlan = itr.substr(first + 1, second - first - 1);
+        auto interface = itr.substr(second + 1);
         vlan_map[interface] = vlan;
         syslog(LOG_INFO, "add <%s, %s> into interface vlan map\n", interface.c_str(), vlan.c_str());
     }
 }
 
+/** update ethernet interface to port-channel map
+ *  PORTCHANNEL_MEMBER|PortChannel101|Ethernet112
+ */
+void update_portchannel_mapping(std::shared_ptr<swss::DBConnector> db_conn) {
+    auto match_pattern = std::string("PORTCHANNEL_MEMBER|*");
+    auto keys = db_conn->keys(match_pattern);
+    for (auto &itr : keys) {
+        auto first = itr.find_first_of('|');
+        auto second = itr.find_last_of('|');
+        auto portchannel = itr.substr(first + 1, second - first - 1);
+        auto interface = itr.substr(second + 1);
+        portchan_map[interface] = portchannel;
+        syslog(LOG_INFO, "add <%s, %s> into interface port-channel map\n", interface.c_str(), portchannel.c_str());
+    }
+}
+
+/** update interface to mgmt map
+ */
+void update_mgmt_mapping() {
+    auto mgmt = dhcp_devman_get_mgmt_dev();
+    if (mgmt) {
+        auto name = std::string(mgmt->intf);
+        mgmt_map[name] = name;
+    }
+}
+
+dhcp_device_context_t *find_device_context(std::unordered_map<std::string, struct intf*> *intfs, std::string if_name) {
+    auto intf = intfs->find(if_name);
+    if (intf == intfs->end()) {
+        return NULL;
+    }
+    return intf->second->dev_context;
+}
+
 /** Number of monitored DHCP message type */
 static uint8_t monitored_msg_sz = sizeof(monitored_msgs) / sizeof(*monitored_msgs);
 
@@ -222,12 +272,12 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
  *
  * @return none
  */
-static void client_packet_handler(dhcp_device_context_t *context, ssize_t buffer_sz)
+static void client_packet_handler(dhcp_device_context_t *context, uint8_t *buffer,
+                                  ssize_t buffer_sz, dhcp_packet_direction_t dir)
 {
-    struct ether_header *ethhdr = (struct ether_header*) context->buffer;
-    struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
-    struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
-    uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
+    struct ip *iphdr = (struct ip*) (buffer + IP_START_OFFSET);
+    struct udphdr *udp = (struct udphdr*) (buffer + UDP_START_OFFSET);
+    uint8_t *dhcphdr = buffer + DHCP_START_OFFSET;
     int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
 
     if (((unsigned)buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
@@ -236,14 +286,8 @@ static void client_packet_handler(dhcp_device_context_t *context, ssize_t buffer
         int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
                     ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
         int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
-        const u_char *dhcp_option = context->buffer + dhcp_option_offset;
-        dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
-                                    ethhdr->ether_shost[1] == context->mac[1] &&
-                                    ethhdr->ether_shost[2] == context->mac[2] &&
-                                    ethhdr->ether_shost[3] == context->mac[3] &&
-                                    ethhdr->ether_shost[4] == context->mac[4] &&
-                                    ethhdr->ether_shost[5] == context->mac[5]) ?
-                                    DHCP_TX : DHCP_RX;
+        const u_char *dhcp_option = buffer + dhcp_option_offset;
+        
         int offset = 0;
         while ((offset < (dhcp_option_sz + 1)) && dhcp_option[offset] != 255) {
             if (dhcp_option[offset] == OPTION_DHCP_MESSAGE_TYPE) {
@@ -260,11 +304,41 @@ static void client_packet_handler(dhcp_device_context_t *context, ssize_t buffer
             }
         }
     } else {
-        syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
-            context->intf, buffer_sz);
+        syslog(LOG_WARNING, "read_callback(%s %s): read length (%ld) is too small to capture DHCP options",
+               context->intf, dir == DHCP_TX ? "TX" : "RX", buffer_sz);
     }
 }
 
+static dhcp_device_context_t *interface_to_dev_context(std::unordered_map<std::string, struct intf*> *devices,
+                                                       std::string ifname)
+{
+    auto vlan = vlan_map.find(ifname);
+    if (vlan != vlan_map.end()) {
+        if (dual_tor_sock) {
+            std::string state;
+            mStateDbMuxTablePtr->hget(ifname, "state", state);
+            if (state == "standby") {
+                return NULL;
+            }
+        }
+        return find_device_context(devices, vlan->second);
+    } else {
+        auto port_channel = portchan_map.find(ifname);
+        if (port_channel != portchan_map.end()) {
+            return find_device_context(devices, port_channel->second);
+        }
+        else {
+            // mgmt interface check
+            auto mgmt = mgmt_map.find(ifname);
+            if (mgmt != mgmt_map.end()) {
+                return find_device_context(devices, mgmt->second);
+            }
+        }
+    }
+    return NULL;
+}
+
+
 /**
  * @code read_tx_callback(fd, event, arg);
  *
@@ -278,11 +352,24 @@ static void client_packet_handler(dhcp_device_context_t *context, ssize_t buffer
  */
 static void read_tx_callback(int fd, short event, void *arg)
 {
-    dhcp_device_context_t *context = (dhcp_device_context_t*) arg;
+    auto devices = (std::unordered_map<std::string, struct intf*> *)arg;
     ssize_t buffer_sz;
+    struct sockaddr_ll sll;
+    socklen_t slen = sizeof sll;
+    dhcp_device_context_t *context = NULL;
 
-    while ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0) {
-        client_packet_handler(context, buffer_sz);
+    while ((buffer_sz = recvfrom(fd, tx_recv_buffer, snap_length, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0) 
+    {
+        char interfaceName[IF_NAMESIZE];
+        if (if_indextoname(sll.sll_ifindex, interfaceName) == NULL) {
+            syslog(LOG_WARNING, "invalid output interface index %d\n", sll.sll_ifindex);
+            continue;
+        }
+        std::string intf(interfaceName);
+        context = find_device_context(devices, intf);
+        if (context) {
+            client_packet_handler(context, tx_recv_buffer, buffer_sz, DHCP_TX);
+        }
     }
 }
 
@@ -299,12 +386,13 @@ static void read_tx_callback(int fd, short event, void *arg)
  */
 static void read_rx_callback(int fd, short event, void *arg)
 {
-    dhcp_device_context_t *context = (dhcp_device_context_t*) arg;
+    auto devices = (std::unordered_map<std::string, struct intf*> *)arg;
     ssize_t buffer_sz;
     struct sockaddr_ll sll;
-    socklen_t slen = sizeof sll;
+    socklen_t slen = sizeof(sll);
+    dhcp_device_context_t *context = NULL;
 
-    while ((buffer_sz = recvfrom(fd, context->buffer, context->snaplen, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0) 
+    while ((buffer_sz = recvfrom(fd, rx_recv_buffer, snap_length, MSG_DONTWAIT, (struct sockaddr *)&sll, &slen)) > 0) 
     {
         char interfaceName[IF_NAMESIZE];
         if (if_indextoname(sll.sll_ifindex, interfaceName) == NULL) {
@@ -312,22 +400,9 @@ static void read_rx_callback(int fd, short event, void *arg)
             continue;
         }
         std::string intf(interfaceName);
-        auto vlan = vlan_map.find(intf);
-        if (vlan == vlan_map.end()) {
-            if (intf.find(CLIENT_IF_PREFIX) != std::string::npos) {
-                syslog(LOG_WARNING, "invalid input interface %s\n", interfaceName);
-            }
-            continue;
-        }
-
-        if (dual_tor_sock) {
-            std::string state;
-            mStateDbMuxTablePtr->hget(intf, "state", state);
-            if (state != "standby") {
-                client_packet_handler(context, buffer_sz);
-            }
-        } else {
-            client_packet_handler(context, buffer_sz);
+        context = interface_to_dev_context(devices, intf);
+        if (context) {
+            client_packet_handler(context, rx_recv_buffer, buffer_sz, DHCP_RX);
         }
     }
 }
@@ -500,24 +575,20 @@ static void dhcp_print_counters(const char *vlan_intf,
 }
 
 /**
- * @code init_socket(context, intf);
+ * @code init_socket();
  *
- * @brief initializes socket, bind it to interface and bpf program, and
- *        associate with libevent base
- *
- * @param context           pointer to device (interface) context
- * @param intf              interface name
+ * @brief initializes rx/tx sockets, bind it to interface and bpf program
  *
  * @return 0 on success, otherwise for failure
  */
-static int init_socket(dhcp_device_context_t *context, const char *intf)
+static int init_socket()
 {
     int rv = -1;
 
     do {
-        context->rx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
-        context->tx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
-        if (context->rx_sock < 0 || context->tx_sock < 0) {
+        auto rx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
+        auto tx_sock = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ALL));
+        if (rx_sock < 0 || tx_sock < 0) {
             syslog(LOG_ALERT, "socket: failed to open socket with '%s'\n", strerror(errno));
             exit(1);
         }
@@ -527,30 +598,47 @@ static int init_socket(dhcp_device_context_t *context, const char *intf)
         rx_addr.sll_ifindex = 0; // any interface
         rx_addr.sll_family = AF_PACKET;
         rx_addr.sll_protocol = htons(ETH_P_ALL);
-        if (bind(context->rx_sock, (struct sockaddr *) &rx_addr, sizeof(rx_addr))) {
-            syslog(LOG_ALERT, "bind: failed to bind to interface '%s' with '%s'\n", intf, strerror(errno));
+        if (bind(rx_sock, (struct sockaddr *) &rx_addr, sizeof(rx_addr))) {
+            syslog(LOG_ALERT, "bind: failed to bind to all interface with '%s'\n", strerror(errno));
             break;
         }
 
         struct sockaddr_ll tx_addr;
         memset(&tx_addr, 0, sizeof(tx_addr));
-        tx_addr.sll_ifindex = if_nametoindex(intf);
+        tx_addr.sll_ifindex = 0; // any interface
         tx_addr.sll_family = AF_PACKET;
         tx_addr.sll_protocol = htons(ETH_P_ALL);
-        if (bind(context->tx_sock, (struct sockaddr *) &tx_addr, sizeof(tx_addr))) {
-            syslog(LOG_ALERT, "bind: failed to bind to interface '%s' with '%s'\n", intf, strerror(errno));
+        if (bind(tx_sock, (struct sockaddr *) &tx_addr, sizeof(tx_addr))) {
+            syslog(LOG_ALERT, "bind: failed to bind to interface with '%s'\n", strerror(errno));
             exit(1);
         }
 
-        strncpy(context->intf, intf, sizeof(context->intf) - 1);
-        context->intf[sizeof(context->intf) - 1] = '\0';
-
+        for (auto &itr : intfs) {
+            itr.second->dev_context->rx_sock = rx_sock;
+            itr.second->dev_context->tx_sock = tx_sock;
+        }
         rv = 0;
     } while (0);
 
     return rv;
 }
 
+static void init_recv_buffers(int snaplen)
+{
+    snap_length = snaplen;
+    rx_recv_buffer = (uint8_t *) malloc(snaplen);
+    if (rx_recv_buffer == NULL) {
+        syslog(LOG_ALERT, "malloc: failed to allocate memory for socket rx buffer '%s'\n", strerror(errno));
+        exit(1);
+    }
+
+    tx_recv_buffer = (uint8_t *) malloc(snaplen);
+    if (tx_recv_buffer == NULL) {
+        syslog(LOG_ALERT, "malloc: failed to allocate memory for socket tx buffer '%s'\n", strerror(errno));
+        exit(1);
+    }
+}
+
 /**
  * @code initialize_intf_mac_and_ip_addr(context);
  *
@@ -642,16 +730,15 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
     dhcp_device_context_t *dev_context = NULL;
 
     if ((context != NULL) && (strlen(intf) < sizeof(dev_context->intf))) {
-
         dev_context = (dhcp_device_context_t *) malloc(sizeof(dhcp_device_context_t));
         if (dev_context != NULL) {
-            if ((init_socket(dev_context, intf) == 0) &&
-                (initialize_intf_mac_and_ip_addr(dev_context) == 0)) {
-
+            // set device name
+            strncpy(dev_context->intf, intf, sizeof(dev_context->intf) - 1);
+            dev_context->intf[sizeof(dev_context->intf) - 1] = '\0';
+            // set device meta data
+            if (initialize_intf_mac_and_ip_addr(dev_context) == 0) {
                 dev_context->is_uplink = is_uplink;
-
                 memset(dev_context->counters, 0, sizeof(dev_context->counters));
-
                 *context = dev_context;
                 rv = 0;
             }
@@ -665,53 +752,55 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
 }
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
+ * @code dhcp_device_start_capture(snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  */
-int dhcp_device_start_capture(dhcp_device_context_t *context,
-                              size_t snaplen,
-                              struct event_base *base,
-                              in_addr_t giaddr_ip)
+int dhcp_device_start_capture(size_t snaplen, struct event_base *base, in_addr_t giaddr_ip)
 {
     int rv = -1;
     struct event *rx_ev;
     struct event *tx_ev;
+    int rx_sock = -1, tx_sock = -1;
 
     do {
-        if (context == NULL) {
-            syslog(LOG_ALERT, "NULL interface context pointer'\n");
-            exit(1);
-        }
-
         if (snaplen < UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) {
-            syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCP options", context->intf);
+            syslog(LOG_ALERT, "dhcp_device_start_capture: snap length is too low to capture DHCP options");
             exit(1);
         }
 
-        context->giaddr_ip = giaddr_ip;
+        init_socket();
 
-        context->buffer = (uint8_t *) malloc(snaplen);
-        if (context->buffer == NULL) {
-            syslog(LOG_ALERT, "malloc: failed to allocate memory for socket buffer '%s'\n", strerror(errno));
-            exit(1);
+        init_recv_buffers(snaplen);
+
+        update_vlan_mapping(mConfigDbPtr);
+        update_portchannel_mapping(mConfigDbPtr);
+        update_mgmt_mapping();
+
+        for (auto &itr : intfs) {
+            itr.second->dev_context->snaplen = snaplen;
+            itr.second->dev_context->giaddr_ip = giaddr_ip;
+            // all interface dev context has same rx/tx socket
+            rx_sock = itr.second->dev_context->rx_sock;
+            tx_sock = itr.second->dev_context->tx_sock;
         }
-        context->snaplen = snaplen;
 
-        if (setsockopt(context->rx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_inbound_sock_bfp, sizeof(dhcp_inbound_sock_bfp)) != 0) {
+        if (rx_sock == -1 || tx_sock == -1) {
+            syslog(LOG_ALERT, "dhcp_device_start_capture: invalid rx_sock or tx_sock");
+            exit(1);
+        }
+        if (setsockopt(rx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_inbound_sock_bfp, sizeof(dhcp_inbound_sock_bfp)) != 0) {
             syslog(LOG_ALERT, "setsockopt: failed to attach filter with '%s'\n", strerror(errno));
             exit(1);
         }
 
-        if (setsockopt(context->tx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_outbound_sock_bfp, sizeof(dhcp_outbound_sock_bfp)) != 0) {
+        if (setsockopt(tx_sock, SOL_SOCKET, SO_ATTACH_FILTER, &dhcp_outbound_sock_bfp, sizeof(dhcp_outbound_sock_bfp)) != 0) {
             syslog(LOG_ALERT, "setsockopt: failed to attach filter with '%s'\n", strerror(errno));
             exit(1);
         }
 
-        update_vlan_mapping(context->intf, mConfigDbPtr);
-
-        rx_ev = event_new(base, context->rx_sock, EV_READ | EV_PERSIST, read_rx_callback, context);
-        tx_ev = event_new(base, context->tx_sock, EV_READ | EV_PERSIST, read_tx_callback, context);
+        rx_ev = event_new(base, rx_sock, EV_READ | EV_PERSIST, read_rx_callback, &intfs);
+        tx_ev = event_new(base, tx_sock, EV_READ | EV_PERSIST, read_tx_callback, &intfs);
 
         if (rx_ev == NULL || tx_ev == NULL) {
             syslog(LOG_ALERT, "event_new: failed to allocate memory for libevent event '%s'\n", strerror(errno));
diff --git a/src/dhcpmon/src/dhcp_device.h b/src/dhcpmon/src/dhcp_device.h
index 2e376ac77e6f..cd8eab1ee7eb 100644
--- a/src/dhcpmon/src/dhcp_device.h
+++ b/src/dhcpmon/src/dhcp_device.h
@@ -17,6 +17,7 @@
 #include <event2/buffer.h>
 
 extern bool dual_tor_sock;
+extern std::unordered_map<std::string, struct intf*> intfs;
 
 /**
  * DHCP message types
@@ -83,7 +84,6 @@ typedef struct
     in_addr_t giaddr_ip;            /** Gateway IP address */
     uint8_t is_uplink;              /** north interface? */
     char intf[IF_NAMESIZE];         /** device (interface) name */
-    uint8_t *buffer;                /** buffer used to read socket data */
     size_t snaplen;                 /** snap length or buffer size */
     uint64_t counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT];
                                     /** current/snapshot counters of DHCP packets */
@@ -137,21 +137,17 @@ int dhcp_device_init(dhcp_device_context_t **context,
                      uint8_t is_uplink);
 
 /**
- * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
+ * @code dhcp_device_start_capture(snaplen, base, giaddr_ip);
  *
  * @brief starts packet capture on this interface
  *
- * @param context           pointer to device (interface) context
  * @param snaplen           length of packet capture
  * @param base              pointer to libevent base
  * @param giaddr_ip         gateway IP address
  *
  * @return 0 on success, otherwise for failure
  */
-int dhcp_device_start_capture(dhcp_device_context_t *context,
-                              size_t snaplen,
-                              struct event_base *base,
-                              in_addr_t giaddr_ip);
+int dhcp_device_start_capture(size_t snaplen, struct event_base *base, in_addr_t giaddr_ip);
 
 /**
  * @code dhcp_device_shutdown(context);
diff --git a/src/dhcpmon/src/dhcp_devman.cpp b/src/dhcpmon/src/dhcp_devman.cpp
index b215f978a7c4..0fa490d138bd 100644
--- a/src/dhcpmon/src/dhcp_devman.cpp
+++ b/src/dhcpmon/src/dhcp_devman.cpp
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <string.h>
 #include <syslog.h>
-#include <sys/queue.h>
 #include <stdlib.h>
 
 #include "dhcp_devman.h"
@@ -15,17 +14,8 @@
 /** Prefix appended to Aggregation device */
 #define AGG_DEV_PREFIX  "Agg-"
 
-/** struct for interface information */
-struct intf
-{
-    const char *name;                   /** interface name */
-    uint8_t is_uplink;                  /** is uplink (north) interface */
-    dhcp_device_context_t *dev_context; /** device (interface_ context */
-    LIST_ENTRY(intf) entry;             /** list link/pointers entries */
-};
-
-/** intfs list of interfaces */
-static LIST_HEAD(intf_list, intf) intfs;
+/** intfs map of interfaces */
+std::unordered_map<std::string, struct intf*> intfs;
 /** dhcp_num_south_intf number of south interfaces */
 static uint32_t dhcp_num_south_intf = 0;
 /** dhcp_num_north_intf number of north interfaces */
@@ -66,17 +56,6 @@ dhcp_device_context_t* dhcp_devman_get_mgmt_dev()
     return mgmt_intf ? mgmt_intf->dev_context : NULL;
 }
 
-/**
- * @code dhcp_devman_init();
- *
- * initializes device (interface) manager that keeps track of interfaces and assert that there is one south
- * interface and as many north interfaces
- */
-void dhcp_devman_init()
-{
-    LIST_INIT(&intfs);
-}
-
 /**
  * @code dhcp_devman_shutdown();
  *
@@ -85,20 +64,11 @@ void dhcp_devman_init()
  */
 void dhcp_devman_shutdown()
 {
-    struct intf *int_ptr, *prev_intf = NULL;
-
-    LIST_FOREACH(int_ptr, &intfs, entry) {
-        dhcp_device_shutdown(int_ptr->dev_context);
-        if (prev_intf) {
-            LIST_REMOVE(prev_intf, entry);
-            free(prev_intf);
-            prev_intf = int_ptr;
-        }
-    }
-
-    if (prev_intf) {
-        LIST_REMOVE(prev_intf, entry);
-        free(prev_intf);
+    for (auto it = intfs.begin(); it != intfs.end();) {
+        auto inf = it->second;
+        dhcp_device_shutdown(inf->dev_context);
+        it = intfs.erase(it);
+        free(inf);
     }
 }
 
@@ -140,12 +110,14 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
 
             dhcp_device_context_t *agg_dev = dhcp_device_get_aggregate_context();
 
-            strncpy(agg_dev->intf, AGG_DEV_PREFIX, sizeof(AGG_DEV_PREFIX));
-            strncpy(agg_dev->intf + sizeof(AGG_DEV_PREFIX) - 1, name, sizeof(agg_dev->intf) - sizeof(AGG_DEV_PREFIX));
+            strncpy(agg_dev->intf, AGG_DEV_PREFIX, strlen(AGG_DEV_PREFIX) + 1);
+            strncpy(agg_dev->intf + strlen(AGG_DEV_PREFIX), name, sizeof(agg_dev->intf) - strlen(AGG_DEV_PREFIX) - 1);
             agg_dev->intf[sizeof(agg_dev->intf) - 1] = '\0';
+            syslog(LOG_INFO, "dhcpmon add aggregate interface '%s'\n", agg_dev->intf);
         }
-
-        LIST_INSERT_HEAD(&intfs, dev, entry);
+        std::string if_name;
+        if_name.assign(dev->name);
+        intfs[if_name] = dev;
     }
     else {
         syslog(LOG_ALERT, "malloc: failed to allocate memory for intf '%s'\n", name);
@@ -193,21 +165,12 @@ int dhcp_devman_setup_dual_tor_mode(const char *name)
 int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
 {
     int rv = -1;
-    struct intf *int_ptr;
 
     if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) {
-        LIST_FOREACH(int_ptr, &intfs, entry) {
-            rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
-            if (rv == 0) {
-                syslog(LOG_INFO,
-                       "Capturing DHCP packets on interface %s, ip: 0x%08x, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
-                       int_ptr->name, int_ptr->dev_context->ip, int_ptr->dev_context->mac[0],
-                       int_ptr->dev_context->mac[1], int_ptr->dev_context->mac[2], int_ptr->dev_context->mac[3],
-                       int_ptr->dev_context->mac[4], int_ptr->dev_context->mac[5]);
-            }
-            else {
-                break;
-            }
+        rv = dhcp_device_start_capture(snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
+        if (rv != 0) {
+            syslog(LOG_ALERT, "Capturing DHCP packets on interface failed");
+            exit(1);
         }
     }
     else {
@@ -236,12 +199,9 @@ dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_devic
 void dhcp_devman_update_snapshot(dhcp_device_context_t *context)
 {
     if (context == NULL) {
-        struct intf *int_ptr;
-
-        LIST_FOREACH(int_ptr, &intfs, entry) {
-            dhcp_device_update_snapshot(int_ptr->dev_context);
+        for (auto &itr : intfs) {
+            dhcp_device_update_snapshot(itr.second->dev_context);
         }
-
         dhcp_device_update_snapshot(dhcp_devman_get_agg_dev());
     } else {
         dhcp_device_update_snapshot(context);
@@ -256,12 +216,9 @@ void dhcp_devman_update_snapshot(dhcp_device_context_t *context)
 void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type)
 {
     if (context == NULL) {
-        struct intf *int_ptr;
-
-        LIST_FOREACH(int_ptr, &intfs, entry) {
-            dhcp_device_print_status(int_ptr->dev_context, type);
+        for (auto &itr : intfs) {
+            dhcp_device_print_status(itr.second->dev_context, type);
         }
-
         dhcp_device_print_status(dhcp_devman_get_agg_dev(), type);
     } else {
         dhcp_device_print_status(context, type);
diff --git a/src/dhcpmon/src/dhcp_devman.h b/src/dhcpmon/src/dhcp_devman.h
index 948e79cde4f4..d1c80cf30e9f 100644
--- a/src/dhcpmon/src/dhcp_devman.h
+++ b/src/dhcpmon/src/dhcp_devman.h
@@ -8,9 +8,19 @@
 #define DHCP_DEVMAN_H_
 
 #include <stdint.h>
+#include <string>
+#include <unordered_map>
 
 #include "dhcp_device.h"
 
+/** struct for interface information */
+struct intf
+{
+    const char *name;                   /** interface name */
+    uint8_t is_uplink;                  /** is uplink (north) interface */
+    dhcp_device_context_t *dev_context; /** device (interface_ context */
+};
+
 /**
  * @code dhcp_devman_init();
  *
diff --git a/src/dhcpmon/src/dhcp_mon.cpp b/src/dhcpmon/src/dhcp_mon.cpp
index 74d9869741d1..21b0a363d874 100644
--- a/src/dhcpmon/src/dhcp_mon.cpp
+++ b/src/dhcpmon/src/dhcp_mon.cpp
@@ -29,6 +29,8 @@ typedef struct
 static int window_interval_sec = 18;
 /** dhcp_unhealthy_max_count max count of consecutive unhealthy statuses before reporting to syslog */
 static int dhcp_unhealthy_max_count = 10;
+/** dhcpmon debug mode control flag */
+static bool debug_on = false;
 /** libevent base struct */
 static struct event_base *base;
 /** libevent timeout event struct */
@@ -132,6 +134,11 @@ static void timeout_callback(evutil_socket_t fd, short event, void *arg)
     }
 
     dhcp_devman_update_snapshot(NULL);
+
+    if (debug_on) {
+        dhcp_devman_print_status(NULL, DHCP_COUNTERS_SNAPSHOT);
+        dhcp_devman_print_status(NULL, DHCP_COUNTERS_CURRENT);
+    }
 }
 
 /**
@@ -206,13 +213,14 @@ void dhcp_mon_shutdown()
 }
 
 /**
- * @code dhcp_mon_start(snaplen);
+ * @code dhcp_mon_start(snaplen, debug_mode);
  *
  * @brief start monitoring DHCP Relay
  */
-int dhcp_mon_start(size_t snaplen)
+int dhcp_mon_start(size_t snaplen, bool debug_mode)
 {
     int rv = -1;
+    debug_on = debug_mode;
 
     do
     {
@@ -245,7 +253,6 @@ int dhcp_mon_start(size_t snaplen)
             syslog(LOG_ERR, "Could not start libevent dispatching loop!\n");
             break;
         }
-
         rv = 0;
     } while (0);
 
diff --git a/src/dhcpmon/src/dhcp_mon.h b/src/dhcpmon/src/dhcp_mon.h
index ae8911ab51fc..5bae01f5962b 100644
--- a/src/dhcpmon/src/dhcp_mon.h
+++ b/src/dhcpmon/src/dhcp_mon.h
@@ -32,15 +32,16 @@ int dhcp_mon_init(int window_sec, int max_count);
 void dhcp_mon_shutdown();
 
 /**
- * @code dhcp_mon_start(snaplen);
+ * @code dhcp_mon_start(snaplen, debug);
  *
  * @brief start monitoring DHCP Relay
  *
  * @param snaplen       packet capture length
+ * @param debug         turn on debug or not
  *
  * @return 0 upon success, otherwise upon failure
  */
-int dhcp_mon_start(size_t snaplen);
+int dhcp_mon_start(size_t snaplen, bool debug);
 
 /**
  * @code dhcp_mon_stop();
diff --git a/src/dhcpmon/src/main.cpp b/src/dhcpmon/src/main.cpp
index aefaea2d01dd..e660bbd908a9 100644
--- a/src/dhcpmon/src/main.cpp
+++ b/src/dhcpmon/src/main.cpp
@@ -46,7 +46,7 @@ bool dual_tor_sock = false;
 static void usage(const char *prog)
 {
     printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]"
-            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
+            "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-D] [-d]\n", prog);
     printf("where\n");
     printf("\tsouth interface: is a vlan interface,\n");
     printf("\tnorth interface: is a TOR-T1 interface,\n");
@@ -57,6 +57,7 @@ static void usage(const char *prog)
            "(default %d),\n",
            dhcpmon_default_unhealthy_max_count);
     printf("\tsnap length: snap length of packet capture (default %ld),\n", dhcpmon_default_snaplen);
+    printf("\t-D: debug mode: print counter to syslog\n");
     printf("\t-d: daemonize %s.\n", prog);
 
     exit(EXIT_SUCCESS);
@@ -117,12 +118,11 @@ int main(int argc, char **argv)
     int max_unhealthy_count = dhcpmon_default_unhealthy_max_count;
     size_t snaplen = dhcpmon_default_snaplen;
     int make_daemon = 0;
+    bool debug_mode = false;
 
     setlogmask(LOG_UPTO(LOG_INFO));
     openlog(basename(argv[0]), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON);
 
-    dhcp_devman_init();
-
     for (i = 1; i < argc;) {
         if ((argv[i] == NULL) || (argv[i][0] != '-')) {
             break;
@@ -161,6 +161,10 @@ int main(int argc, char **argv)
             max_unhealthy_count = atoi(argv[i + 1]);
             i += 2;
             break;
+        case 'D':
+            debug_mode = true;
+            i += 1;
+            break;
         default:
             fprintf(stderr, "%s: %c: Unknown option\n", basename(argv[0]), argv[i][1]);
             usage(basename(argv[0]));
@@ -172,7 +176,7 @@ int main(int argc, char **argv)
     }
 
     if ((dhcp_mon_init(window_interval, max_unhealthy_count) == 0) &&
-        (dhcp_mon_start(snaplen) == 0)) {
+        (dhcp_mon_start(snaplen, debug_mode) == 0)) {
 
         rv = EXIT_SUCCESS;
 

From 94f9942ef6b7f8f1abd8ada2346cb33a46ae7c54 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 16 Mar 2023 10:06:46 -0700
Subject: [PATCH 1587/1674] Update dynamic threshold for TD2 (#14224)

Why I did it
Update dynamic threshold to -1 to get optimal performance for RDMA traffic

How I did it
Modified pg_profile_lookup.ini to reflect the correct value

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 .../td2/gen/BALANCED/pg_profile_lookup.ini    | 30 +++++++++----------
 .../gen/RDMA-CENTRIC/pg_profile_lookup.ini    | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
index 389a7da97287..b4cd51281bae 100644
--- a/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
+++ b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
 # speed cable size      xon     xoff   threshold xon_offset
-   1000  5m   41808     18432   40560  -3        2496
-  10000  5m   41808     18432   40560  -3        2496
-  40000  5m   46384     18432   45136  -3        2496
-  50000  5m   46592     18432   45344  -3        2496
- 100000  5m   48464     18432   47216  -3        2496
-   1000  40m  41808     18432   40560  -3        2496
-  10000  40m  41808     18432   40560  -3        2496
-  40000  40m  48464     18432   47216  -3        2496
-  50000  40m  49296     18432   48048  -3        2496
- 100000  40m  53872     18432   52624  -3        2496
-   1000  300m 41808     18432   40560  -3        2496
-  10000  300m 41808     18432   40560  -3        2496
-  40000  300m 64064     18432   62816  -3        2496
-  50000  300m 68848     18432   67600  -3        2496
- 100000  300m 92976     18432   91728  -3        2496
+   1000  5m   41808     18432   40560  -1        2496
+  10000  5m   41808     18432   40560  -1        2496
+  40000  5m   46384     18432   45136  -1        2496
+  50000  5m   46592     18432   45344  -1        2496
+ 100000  5m   48464     18432   47216  -1        2496
+   1000  40m  41808     18432   40560  -1        2496
+  10000  40m  41808     18432   40560  -1        2496
+  40000  40m  48464     18432   47216  -1        2496
+  50000  40m  49296     18432   48048  -1        2496
+ 100000  40m  53872     18432   52624  -1        2496
+   1000  300m 41808     18432   40560  -1        2496
+  10000  300m 41808     18432   40560  -1        2496
+  40000  300m 64064     18432   62816  -1        2496
+  50000  300m 68848     18432   67600  -1        2496
+ 100000  300m 92976     18432   91728  -1        2496
diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
index 389a7da97287..b4cd51281bae 100644
--- a/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
+++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
 # speed cable size      xon     xoff   threshold xon_offset
-   1000  5m   41808     18432   40560  -3        2496
-  10000  5m   41808     18432   40560  -3        2496
-  40000  5m   46384     18432   45136  -3        2496
-  50000  5m   46592     18432   45344  -3        2496
- 100000  5m   48464     18432   47216  -3        2496
-   1000  40m  41808     18432   40560  -3        2496
-  10000  40m  41808     18432   40560  -3        2496
-  40000  40m  48464     18432   47216  -3        2496
-  50000  40m  49296     18432   48048  -3        2496
- 100000  40m  53872     18432   52624  -3        2496
-   1000  300m 41808     18432   40560  -3        2496
-  10000  300m 41808     18432   40560  -3        2496
-  40000  300m 64064     18432   62816  -3        2496
-  50000  300m 68848     18432   67600  -3        2496
- 100000  300m 92976     18432   91728  -3        2496
+   1000  5m   41808     18432   40560  -1        2496
+  10000  5m   41808     18432   40560  -1        2496
+  40000  5m   46384     18432   45136  -1        2496
+  50000  5m   46592     18432   45344  -1        2496
+ 100000  5m   48464     18432   47216  -1        2496
+   1000  40m  41808     18432   40560  -1        2496
+  10000  40m  41808     18432   40560  -1        2496
+  40000  40m  48464     18432   47216  -1        2496
+  50000  40m  49296     18432   48048  -1        2496
+ 100000  40m  53872     18432   52624  -1        2496
+   1000  300m 41808     18432   40560  -1        2496
+  10000  300m 41808     18432   40560  -1        2496
+  40000  300m 64064     18432   62816  -1        2496
+  50000  300m 68848     18432   67600  -1        2496
+ 100000  300m 92976     18432   91728  -1        2496

From 6c7e24381efb9ec2c0cd8c483a5e8dea05009ac1 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Thu, 16 Mar 2023 14:18:28 -0700
Subject: [PATCH 1588/1674] [storage_backend] Add backend acl service  (#14229)

Why I did it
This PR addresses the issue mentioned above by loading the acl config as a service on a storage backend device

How I did it
The new acl service is a oneshot service which will start after swss and does some retries to ensure that the SWITCH_CAPABILITY info is present before attempting to load the acl rules. The service is also bound to sonic targets which ensures that it gets restarted during minigraph reload and config reload

How to verify it
Build an image with the following changes and did the following tests

Verified that acl is loaded successfully on a storage backend device after a switch boot up
Verified that acl is loaded successfully on a storage backend ToR after minigraph load and config reload
Verified that acl is not loaded if the device is not a storage backend ToR or the device does not have a DATAACL table

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 .../build_templates/sonic_debian_extension.j2 |  5 +
 .../backend_acl/backend-acl.service           | 12 +++
 files/image_config/backend_acl/backend_acl.py | 94 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 files/image_config/backend_acl/backend-acl.service
 create mode 100755 files/image_config/backend_acl/backend_acl.py

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 59f3df9c463d..23e59cdd455d 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -549,6 +549,11 @@ sudo cp $IMAGE_CONFIGS/config-chassisdb/config-chassisdb $FILESYSTEM_ROOT/usr/bi
 echo "config-chassisdb.service" | sudo tee -a $GENERATED_SERVICE_FILE
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable config-chassisdb.service
 
+# Copy backend-acl script and service file
+sudo cp $IMAGE_CONFIGS/backend_acl/backend-acl.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/backend-acl.service
+sudo cp $IMAGE_CONFIGS/backend_acl/backend_acl.py $FILESYSTEM_ROOT/usr/bin/backend_acl.py
+echo "backend-acl.service" | sudo tee -a $GENERATED_SERVICE_FILE
+
 # Copy SNMP configuration files
 sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/
 
diff --git a/files/image_config/backend_acl/backend-acl.service b/files/image_config/backend_acl/backend-acl.service
new file mode 100644
index 000000000000..0ad24231ee4b
--- /dev/null
+++ b/files/image_config/backend_acl/backend-acl.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Enable backend acl on storage backend ToRs
+After=swss.service
+BindsTo=sonic.target
+After=sonic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/backend_acl.py
+
+[Install]
+WantedBy=sonic.target
diff --git a/files/image_config/backend_acl/backend_acl.py b/files/image_config/backend_acl/backend_acl.py
new file mode 100755
index 000000000000..bb22a60880ab
--- /dev/null
+++ b/files/image_config/backend_acl/backend_acl.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+import os
+import subprocess
+import syslog
+import time
+
+from swsscommon.swsscommon import SonicV2Connector
+
+SYSLOG_IDENTIFIER = os.path.basename(__file__)
+
+SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
+
+def log_info(msg):
+    syslog.openlog(SYSLOG_IDENTIFIER)
+    syslog.syslog(syslog.LOG_INFO, msg)
+    syslog.closelog()
+
+def run_command(cmd, return_cmd=False):
+   log_info("executing cmd =  {}".format(cmd))
+   proc = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE)
+   out, err = proc.communicate()
+   if return_cmd:
+       if err:
+           return "Unknown"
+
+       if len(out) > 0:
+           return out.strip().decode('utf-8')
+
+def _get_device_type():
+    """
+    Get device type
+    """
+    device_type = run_command([SONIC_CFGGEN_PATH, '-m', '-v', 'DEVICE_METADATA.localhost.type'], return_cmd=True)
+    return device_type
+
+def _is_storage_device():
+    """
+    Check if the device is a storage device or not
+    """
+    storage_device = run_command([SONIC_CFGGEN_PATH, '-d', '-v', 'DEVICE_METADATA.localhost.storage_device'], return_cmd=True)
+    return storage_device == "true"
+
+def _is_acl_table_present():
+    """
+    Check if acl table exists
+    """
+    acl_table = run_command([SONIC_CFGGEN_PATH, '-d', '-v', 'ACL_TABLE.DATAACL'], return_cmd=True)
+    return (acl_table != "Unknown" and bool(acl_table))
+
+def _is_switch_table_present():
+    state_db = SonicV2Connector(host='127.0.0.1')
+    state_db.connect(state_db.STATE_DB, False)
+    table_present = False
+    wait_time = 0
+    TIMEOUT = 120
+    STEP = 10
+
+    while wait_time < TIMEOUT:
+        if state_db.exists(state_db.STATE_DB, 'SWITCH_CAPABILITY|switch'):
+            table_present = True
+            break
+        time.sleep(STEP)
+        wait_time += STEP
+    if not table_present:
+        log_info("Switch table not present")
+    return table_present
+
+def load_backend_acl(device_type):
+    """
+    Load acl on backend storage device
+    """
+    BACKEND_ACL_TEMPLATE_FILE = os.path.join('/', "usr", "share", "sonic", "templates", "backend_acl.j2")
+    BACKEND_ACL_FILE = os.path.join('/', "etc", "sonic", "backend_acl.json")
+
+    # this acl needs to be loaded only on a storage backend ToR. acl load will fail if the switch table isn't present
+    if _is_storage_device() and _is_acl_table_present() and _is_switch_table_present():
+        if os.path.isfile(BACKEND_ACL_TEMPLATE_FILE):
+            run_command(['sudo', SONIC_CFGGEN_PATH, '-d', '-t', '{},{}'.format(BACKEND_ACL_TEMPLATE_FILE, BACKEND_ACL_FILE)])
+        if os.path.isfile(BACKEND_ACL_FILE):
+            run_command(['acl-loader', 'update', 'incremental', BACKEND_ACL_FILE])
+    else:
+        log_info("Skipping backend acl load - conditions not met")
+
+def main():
+    device_type = _get_device_type()
+    if device_type != "BackEndToRRouter":
+        log_info("Skipping backend acl load on unsupported device type: {}".format(device_type))
+        return
+
+    load_backend_acl(device_type)
+
+if __name__ == "__main__":
+    main()

From 857d74d4fe03147149901d81e3abcd2bb1f473b5 Mon Sep 17 00:00:00 2001
From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com>
Date: Mon, 20 Mar 2023 13:43:14 -0700
Subject: [PATCH 1589/1674] [202012][sonic-platform-daemons][sonic-utilities]
 update submodule (#14048)

For sonic-platform-daemons following commits are added to the submodule

dd8fbae (HEAD -> 202012, origin/202012) [ycabled] add more coverage to ycabled; add minor name change for vendor API CLI return key-values pairs (#338)
846555e [thermalctld] fix some redundant removal of state DB tables (#315)
3d92fb9 Use github code scanning instead of LGTM (#316)

For sonic-utilities the following commits are added in this PR to the submodule
git log --oneline 39cdb49c..202012
ec4c6ea5 (HEAD -> 202012, origin/202012) [show][muxcable] add some new commands health, reset-cause, queue_info support for muxcable (#2414) (#2704)
03ef272e [202012][vlan] Remove add field of vlanid to DHCP_RELAY table while adding vlan (#2681)
e00a81ac [202012][dhcp-relay] Add support for dhcp_relay config cli (#2640)
274184e1 [vlan] Refresh dhcpv6_relay config while adding/deleting a vlan (#2660) (#2668

#### Why I did it
updating the submodule of sonic-platform-daemons, sonic-utilities

#### How I did it

updated the submodule
---
 src/sonic-platform-daemons | 2 +-
 src/sonic-utilities        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 8ec96c0a6d6d..dd8fbae6fc80 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 8ec96c0a6d6d6938f28aa84ea18d5faae5cb5150
+Subproject commit dd8fbae6fc80fd1cc281ca812387d1d1c1b165af
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 39cdb49c740e..ec4c6ea5d883 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 39cdb49c740e7fce971ddd02fa669af67c6275f4
+Subproject commit ec4c6ea5d883f3133f8e05f71b96c1dda63f220e

From cd85a2e2c1ccafc35ea3e5da48bc5039a48ca238 Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Tue, 21 Mar 2023 10:55:05 -0700
Subject: [PATCH 1590/1674] [202012] [submodule] Update submodule for
 sonic-utilities (#14357)

This PR includes the following commits
```
5b0f0fc [202012][dhcp_relay] Fix dhcp_relay restart error while add/del vlan (sonic-net/sonic-utilities#2688)
48fd842 [show][muxcable] increase timeout for displaying HW_STATUS (sonic-net/sonic-utilities#2712)
f0a9f4f [dhcp_relay] Add show/clear/counter cli for dhcp_relay (sonic-net/sonic-utilities#2719)
8627944 Revert "[202012] Update load minigraph to load backend acl" (sonic-net/sonic-utilities#2736)
93c7d43 [warm-reboot] Use kexec_file_load instead of kexec_load when available (sonic-net/sonic-utilities#2608)
cc78747 [warm/fast-reboot] Backup logs from tmpfs to disk during fast/warm shutdown (sonic-net/sonic-utilities#2714)
```
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index ec4c6ea5d883..cc78747409aa 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ec4c6ea5d883f3133f8e05f71b96c1dda63f220e
+Subproject commit cc78747409aad52b5b2e60169691f7e6db3ca9ee

From a027b37a56a0263f6da7cad611047f97be1cb601 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:06:11 -0700
Subject: [PATCH 1591/1674] [build] Fix isc-dhcp full version in rules.mk
 (#13288) (#14376)

During the build process, a dsc file is retrieved from the URL:
http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_4.4.1-2.3.dsc

Depending on the DNS resolution, the server reached may respond with a
HTTP 404 error code, what stops the build process.
In all cases, the URL http://deb.debian.org/debian/pool/main/i/isc-dhcp/
no more lists this DSC file but one with a different format.

The suffix "+deb11u1" is now appended to identify the debian version.

- append this suffix to the make file rules of isc-dhcp

Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Co-authored-by: Guilt <guillaume.lambert@orange.com>
---
 rules/isc-dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk
index 3edebfd0dde0..0951836470ce 100644
--- a/rules/isc-dhcp.mk
+++ b/rules/isc-dhcp.mk
@@ -1,7 +1,7 @@
 # isc-dhcp packages
 
 ISC_DHCP_VERSION = 4.4.1
-ISC_DHCP_VERSION_FULL = ${ISC_DHCP_VERSION}-2
+ISC_DHCP_VERSION_FULL = ${ISC_DHCP_VERSION}-2.3+deb11u1
 
 export ISC_DHCP_VERSION ISC_DHCP_VERSION_FULL
 

From 43aec133da3e372c3cc387e4befe3c927b7a8aea Mon Sep 17 00:00:00 2001
From: Neetha John <nejo@microsoft.com>
Date: Fri, 24 Mar 2023 10:41:48 -0700
Subject: [PATCH 1592/1674] [202012] [qos] Update RDMA-CENTRIC lossy profile to
 use static threshold for Th devices (#14398)

Backport #14372 to 202012

Why I did it
For better accounting purposes, updating the ingress lossy traffic profile to use static threshold. This change is only intended for Th devices using RDMA-CENTRIC profiles

How I did it
Update the buffer templates for Th devices in RDMA-CENTRIC folder to use the correct threshold

Signed-off-by: Neetha John <nejo@microsoft.com>
---
 .../6100/RDMA-CENTRIC/buffers_defaults_t0.j2  |  2 +-
 .../6100/RDMA-CENTRIC/buffers_defaults_t1.j2  |  2 +-
 .../gen/RDMA-CENTRIC/buffers_defaults_t0.j2   |  2 +-
 .../gen/RDMA-CENTRIC/buffers_defaults_t1.j2   |  2 +-
 src/sonic-config-engine/minigraph.py          | 16 +++++++--
 .../tests/sample-dell-6100-t0-minigraph.xml   | 10 +++---
 .../sample_output/py2/buffers-dell6100.json   |  2 +-
 .../sample_output/py3/buffers-dell6100.json   |  2 +-
 src/sonic-config-engine/tests/test_j2files.py | 33 ++++++++++++++++---
 9 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
index ed5c9deac0c1..813ee0f48c48 100644
--- a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -26,7 +26,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
index f1a4c9c2e2fe..14ef68e3ecfc 100644
--- a/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
+++ b/device/common/profiles/th/6100/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -26,7 +26,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
index c671233a02f5..3be881c5b495 100644
--- a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t0.j2
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
index 11aab2cabd45..8c9550c48d20 100644
--- a/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
+++ b/device/common/profiles/th/gen/RDMA-CENTRIC/buffers_defaults_t1.j2
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index fd8cc06ca181..ac4fcf7e92cd 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -5,6 +5,7 @@
 import os
 import sys
 import json
+import subprocess
 from collections import defaultdict
 
 from lxml import etree as ET
@@ -62,6 +63,10 @@ def default(self, obj):
             return str(obj)
         return json.JSONEncoder.default(self, obj)
 
+def exec_cmd(cmd):
+    p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE)
+    outs, errs = p.communicate()
+
 def get_peer_switch_info(link_metadata, devices):
     peer_switch_table = {}
     peer_switch_ip = None
@@ -1162,7 +1167,14 @@ def select_mmu_profiles(profile, platform, hwsku):
 
     files_to_copy = ['pg_profile_lookup.ini', 'qos.json.j2', 'buffers_defaults_t0.j2', 'buffers_defaults_t1.j2']
 
-    path = os.path.join('/usr/share/sonic/device', platform, hwsku)
+    if os.environ.get("CFGGEN_UNIT_TESTING", "0") == "2":
+        for dir_path, dir_name, files in os.walk('/sonic/device'):
+            if platform in dir_path:
+                new_path = os.path.split(dir_path)[0]
+                break
+    else:
+        new_path = '/usr/share/sonic/device'
+    path = os.path.join(new_path, platform, hwsku)
 
     dir_path = os.path.join(path, profile)
     if os.path.exists(dir_path):
@@ -1170,7 +1182,7 @@ def select_mmu_profiles(profile, platform, hwsku):
             file_in_dir = os.path.join(dir_path, file_item)
             if os.path.isfile(file_in_dir):
                 base_file = os.path.join(path, file_item)
-                exec_cmd("sudo cp {} {}".format(file_in_dir, base_file))
+                exec_cmd(["sudo", "cp", file_in_dir, base_file])
 
 ###############################################################################
 #
diff --git a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
index cb84ce744ed1..fef3526bee28 100644
--- a/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
+++ b/src/sonic-config-engine/tests/sample-dell-6100-t0-minigraph.xml
@@ -716,6 +716,11 @@
             <a:Reference i:nil="true"/>
             <a:Value>10.0.0.16</a:Value>
           </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SonicQosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>RDMA-CENTRIC</a:Value>
+          </a:DeviceProperty>
         </a:Properties>
       </a:DeviceMetadata>
     </Devices>
@@ -731,11 +736,6 @@
             <a:Reference i:nil="true"/>
             <a:Value>True</a:Value>
           </a:DeviceProperty>
-          <a:DeviceProperty>
-            <a:Name>SonicQosProfile</a:Name>
-            <a:Reference i:nil="true"/>
-            <a:Value>RDMA-CENTRIC</a:Value>
-          </a:DeviceProperty>
         </a:Properties>
         <a:Key>ARISTA01T1:Ethernet1;s6100-dev-1:fortyGigE1/1/1</a:Key>
       </a:LinkMetadata>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
index 4636c383822c..8c933783b4b2 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
@@ -93,7 +93,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
index a292c00b19d8..0c8bb58d3067 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
@@ -93,7 +93,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"3"
+            "static_th":"10875072"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index f3d64f2474fe..cbfa58fa5772 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -244,14 +244,18 @@ def test_qos_dell9332_render_template(self):
         self._test_qos_render_template('dell', 'x86_64-dellemc_z9332f_d1508-r0', 'DellEMC-Z9332f-O32', 'sample-dell-9332-t1-minigraph.xml', 'qos-dell9332.json')
 
     def test_qos_dell6100_render_template(self):
-        self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
+        self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json', copy_files=True)
 
     def test_qos_arista7260_render_template(self):
         self._test_qos_render_template('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D96C16', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'qos-arista7260.json')
 
-    def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
+    def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected, copy_files=False):
         file_exist, dir_exist = self.create_machine_conf(platform, vendor)
         dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
+
+        if copy_files:
+            self.copy_mmu_templates(dir_path, revert=False)
+
         qos_file = os.path.join(dir_path, 'qos.json.j2')
         port_config_ini_file = os.path.join(dir_path, 'port_config.ini')
 
@@ -266,6 +270,8 @@ def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
         # cleanup
         qos_config_file_new = os.path.join(dir_path, 'qos_config.j2')
         os.remove(qos_config_file_new)
+        if copy_files:
+            self.copy_mmu_templates(dir_path, revert=True)
 
         self.remove_machine_conf(file_exist, dir_exist)
 
@@ -273,7 +279,7 @@ def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
         assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_dell6100_render_template(self):
-        self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json') 
+        self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json', copy_files=True) 
 
     def test_buffers_mellanox2700_render_template(self):
         # Mellanox buffer template rendering for single ingress pool mode
@@ -314,9 +320,26 @@ def test_config_brcm_render_template(self):
             assert utils.cmp(config_sample_output_file, config_test_output)
             os.remove(config_test_output)
 
-    def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer_template, expected):
+    def copy_mmu_templates(self, dir_path, revert=False):
+        files_to_copy = ['pg_profile_lookup.ini', 'qos.json.j2', 'buffers_defaults_t0.j2', 'buffers_defaults_t1.j2']
+
+        for file_name in files_to_copy:
+            src_file = os.path.join(dir_path, file_name)
+            dst_file = os.path.join(self.test_dir, file_name)
+
+            if not revert:
+                shutil.copy2(src_file, dst_file)
+            else:
+                shutil.copy2(dst_file, src_file)
+                os.remove(dst_file)
+
+    def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer_template, expected, copy_files=False):
         file_exist, dir_exist = self.create_machine_conf(platform, vendor)
         dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
+
+        if copy_files:
+            self.copy_mmu_templates(dir_path, revert=False)
+
         buffers_file = os.path.join(dir_path, buffer_template)
         port_config_ini_file = os.path.join(dir_path, 'port_config.ini')
 
@@ -346,6 +369,8 @@ def _test_buffers_render_template(self, vendor, platform, sku, minigraph, buffer
                 diff = diff + str(self.run_diff(sample_output_file, self.output_file))
 
         os.remove(os.path.join(out_file_dir, expected_files[1]))
+        if copy_files:
+            self.copy_mmu_templates(dir_path, revert=True)
 
         assert match, diff
 

From a20b43e50227109e2d470e7a6f0c3e421b1e0903 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Mon, 27 Mar 2023 00:30:05 -0700
Subject: [PATCH 1593/1674] [202012] Check config file not empty after modify
 it in hostcfgd.  (#14385)

**What I did**
Check /etc/pam.d/sshd integrity after modify it in hostcfgd.

**Why I did it**
Found some incident that /etc/pam.d/sshd become empty file during OR upgrade.

**How I verified it**
Pass all UT.
Add new UT to cover new code.

**Details if related**
This is a manually cherry-pick PR for https://github.com/sonic-net/sonic-host-services/pull/36
---
 src/sonic-host-services/scripts/hostcfgd      | 15 +++++
 .../tests/hostcfgd/hostcfgd_test.py           | 67 ++++++++++++++++++-
 .../tests/hostcfgd/sample_output/sshd_empty   |  0
 .../hostcfgd/sample_output/sshd_not_empty     |  1 +
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/sshd_empty
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/sshd_not_empty

diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index a14d4cf026c6..21f80275df83 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -210,11 +210,26 @@ class AaaCfg(object):
         if modify_conf:
             self.modify_conf_file()
 
+    def check_file_not_empty(self, filename):
+        exists = os.path.exists(filename)
+        if not exists:
+            syslog.syslog(syslog.LOG_ERR, "file size check failed: {} is missing".format(filename))
+            return
+
+        size = os.path.getsize(filename)
+        if size == 0:
+            syslog.syslog(syslog.LOG_ERR, "file size check failed: {} is empty, file corrupted".format(filename))
+            return
+
+        syslog.syslog(syslog.LOG_INFO, "file size check pass: {} size is ({}) bytes".format(filename, size))
+
     def modify_single_file(self, filename, operations=None):
         if operations:
             cmd = "sed -e {0} {1} > {1}.new; mv -f {1} {1}.old; mv -f {1}.new {1}".format(' -e '.join(operations), filename)
             os.system(cmd)
 
+        self.check_file_not_empty(filename)
+
     def modify_conf_file(self):
         auth = self.auth_default.copy()
         auth.update(self.auth)
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
index 1608f79e5960..93eccc2d6afd 100644
--- a/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
@@ -225,4 +225,69 @@ def test_kdump_event(self):
             expected = [call('sonic-kdump-config --disable', shell=True),
                         call('sonic-kdump-config --num_dumps 3', shell=True),
                         call('sonic-kdump-config --memory 0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M', shell=True)]
-            mocked_subprocess.check_call.assert_has_calls(expected, any_order=True)
\ No newline at end of file
+            mocked_subprocess.check_call.assert_has_calls(expected, any_order=True)
+
+class TesAaaCfgd(TestCase):
+    """
+        Test hostcfd daemon - AaaCfgd
+    """
+    def setUp(self):
+        MockConfigDb.CONFIG_DB['NTP'] = {'global': {'vrf': 'mgmt', 'src_intf': 'eth0'}}
+        MockConfigDb.CONFIG_DB['NTP_SERVER'] = {'0.debian.pool.ntp.org': {}}
+
+    def tearDown(self):
+        MockConfigDb.CONFIG_DB = {}
+
+    def test_aaa_sshd_not_empty(self):
+        with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
+            popen_mock = mock.Mock()
+            attrs = {'communicate.return_value': ('output', 'error')}
+            popen_mock.configure_mock(**attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+
+            test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            sample_output_path = os.path.join(test_path, "hostcfgd/sample_output/")
+
+            aaacfgd = hostcfgd.AaaCfg()
+            aaacfgd.modify_single_file(os.path.join(sample_output_path, "sshd_not_empty"))
+                
+            # render with empty sshd config file and check error log
+            test_file = os.path.join(sample_output_path, "sshd_empty")
+            original_syslog = hostcfgd.syslog
+            with mock.patch('hostcfgd.syslog.syslog') as mocked_syslog:
+                mocked_syslog.LOG_ERR = original_syslog.LOG_ERR
+                aaacfgd.modify_single_file(test_file)
+
+                # check sys log
+                expected = [
+                    mock.call(mocked_syslog.LOG_ERR, "file size check failed: {} is empty, file corrupted".format(test_file))
+                ]
+                mocked_syslog.assert_has_calls(expected)
+
+            # check with missing sshd config file and check error log
+            test_file = os.path.join(sample_output_path, "sshd_missing")
+            with mock.patch('hostcfgd.syslog.syslog') as mocked_syslog:
+                mocked_syslog.LOG_ERR = original_syslog.LOG_ERR
+
+                # missing file can't test by render config file,
+                # because missing file case difficult to reproduce: code always generate a empty file.
+                aaacfgd.check_file_not_empty(test_file)
+
+                # check sys log
+                expected = [
+                    mock.call(mocked_syslog.LOG_ERR, "file size check failed: {} is missing".format(test_file))
+                ]
+                mocked_syslog.assert_has_calls(expected)
+
+            # render with empty sshd config file and check error log
+            test_file = os.path.join(sample_output_path, "sshd_not_empty")
+            original_syslog = hostcfgd.syslog
+            with mock.patch('hostcfgd.syslog.syslog') as mocked_syslog:
+                mocked_syslog.LOG_INFO = original_syslog.LOG_INFO
+                aaacfgd.modify_single_file(test_file)
+
+                # check sys log
+                expected = [
+                    mock.call(mocked_syslog.LOG_INFO, "file size check pass: {} size is ({}) bytes".format(test_file, 21))
+                ]
+                mocked_syslog.assert_has_calls(expected)
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/sshd_empty b/src/sonic-host-services/tests/hostcfgd/sample_output/sshd_empty
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/sshd_not_empty b/src/sonic-host-services/tests/hostcfgd/sample_output/sshd_not_empty
new file mode 100644
index 000000000000..94fb85d3adac
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/sshd_not_empty
@@ -0,0 +1 @@
+#SSHD NOT EMPTY TEST

From ffc39187a15e1122e1b04e2f83e50e44c2d3c433 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 28 Mar 2023 13:46:39 +0800
Subject: [PATCH 1594/1674] Change to use the default ssl lib openssl not nss
 (#14379)

Why I did it
Change to use the default ssl lib openssl not nss
Backport #14351.

How I did it
---
 sonic-slave-buster/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 7c6af91b9d0e..c782f3cb9b73 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -166,7 +166,7 @@ RUN apt-get update && apt-get install -y \
         libxml2-dev \
 # For BFN sdk build
         libusb-1.0-0-dev \
-        libcurl3-nss-dev \
+        libcurl4-openssl-dev \
         libunwind8-dev \
         telnet \
         libc-ares2 \

From 1d0a5ed9bf1c58f8b0170f9dc21d1014a17b2b7b Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Tue, 28 Mar 2023 00:58:37 +0800
Subject: [PATCH 1595/1674] [ci] Fix build issue for vs vhdx image. #14427

Why I did it
sonic-slave-stretch build failed for mmh3 version update to 3.10 on Mar 24.

How I did it
Enable reproducible build for vhdx image.

How to verify it
---
 .azure-pipelines/azure-pipelines-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 914ca3d7aac7..06698a7abc54 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -109,7 +109,7 @@ jobs:
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
               gzip -kd target/sonic-vs.img.gz
-              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
+              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run
               rm target/sonic-vs.img
             fi
           else

From 38b259ca39e8a4e8f76a09e6d33da91da3903845 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Wed, 29 Mar 2023 09:02:21 -0700
Subject: [PATCH 1596/1674] [submodule] update for sonic-swss (#14449)

Update for swss following commits:
3108985 - 2023-03-28 : [202012][muxorch] handling multiple mux nexthops for route (#2702) [Nikola Dancejic]
f412625 - 2023-03-24 : [202012]Custom monitoring based priority tunnels (#2671) [siqbal1986]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index a21b16041ef9..3108985a9e2d 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit a21b16041ef9f5b0c559421e4e5e8279ff42a645
+Subproject commit 3108985a9e2d48ecc896ec3ded1f2186a0ee5899

From de1c35a070b01ff873da437e08bbd7905573101e Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:56:04 -0700
Subject: [PATCH 1597/1674] [202012][sonic-snmpagent]: Advance submodule
 (#14451)

#### Why I did it
Update sonic-snmpagent submodule to include below commit:
Revert "[202012]: snmp vlan support per RFC1213 and added the missing support for RFC2863 (#279)" (#280)
---
 src/sonic-snmpagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index fba50c65b00a..551898e78378 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit fba50c65b00a5662197d6d37c06308e82356e3ea
+Subproject commit 551898e783789d8c68e59a4128deec16f550e303

From 4f5735bc0a3005098689c9d3ffa97fc99411c28f Mon Sep 17 00:00:00 2001
From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com>
Date: Mon, 20 Mar 2023 16:22:11 -0700
Subject: [PATCH 1598/1674] Fix telemetry.sh passing in null as log level value
 (#14303)

#### Why I did it

Bug in script that was passing in null as log level value if missing from config_db

#### How I did it

Added more robust conditional statement

#### How to verify it

1) Remove log_level from config db
2) config reload -y
3) telemetry should not crash
---
 dockers/docker-sonic-telemetry/telemetry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh
index 1f92657e3b8f..8f116134df05 100755
--- a/dockers/docker-sonic-telemetry/telemetry.sh
+++ b/dockers/docker-sonic-telemetry/telemetry.sh
@@ -63,7 +63,7 @@ if [ -z $CLIENT_AUTH ] || [ $CLIENT_AUTH == "false" ]; then
 fi
 
 LOG_LEVEL=$(echo $GNMI | jq -r '.log_level')
-if [ ! -z $LOG_LEVEL ]; then
+if [[ $LOG_LEVEL =~ ^[0-9]+$ ]]; then
     TELEMETRY_ARGS+=" -v=$LOG_LEVEL"
 else
     TELEMETRY_ARGS+=" -v=2"

From 4033d6c929dd256fdc98b182d26f46c160ac5552 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Mon, 27 Mar 2023 17:08:14 -0700
Subject: [PATCH 1599/1674] Improve sudo cat command for RO user. (#14428)

Improve sudo cat command for RO user.

#### Why I did it
RO user can use sudo command show none syslog files.

#### How I did it
Improve sudo cat command for RO user.

#### How to verify it
Pass all UT.
Manually check fixed code work correctly.

#### Description for the changelog
Improve sudo cat command for RO user.
---
 files/image_config/sudoers/sudoers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 7779f48684b6..974276c70fa3 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -19,7 +19,7 @@ Defaults        lecture_file = /etc/sudoers.lecture
 
 # Cmnd alias specification
 # Note: bcmcmd is dangerous for users in read only netgroups because it may operate ASIC
-Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog*, \
+Cmnd_Alias      READ_ONLY_CMDS = /bin/cat /var/log/syslog, /bin/cat /var/log/syslog.1 /var/log/syslog, /bin/cat /var/log/syslog.1, \
                                  /bin/ip netns identify [0-9]*, \
                                  /sbin/brctl show, \
                                  /usr/bin/docker exec snmp cat /etc/snmp/snmpd.conf, \

From ac08632ea466f968e014ef6b5510c6844395a636 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Wed, 29 Mar 2023 17:29:37 -0700
Subject: [PATCH 1600/1674] Add shellcheck and mock modules for running unit
 and linter test (#14432)

#### Why I did it
This is a cherrypick of https://github.com/sonic-net/sonic-buildimage/pull/14062 on 202012 branch
---
 dockers/docker-sonic-mgmt/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index 563c598b1bdc..521cf61ff4ed 100644
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -27,6 +27,7 @@ RUN apt-get update && apt-get install -y build-essential \
                                          python3-pip \
                                          python3-venv \
                                          rsyslog \
+                                         shellcheck \
                                          snmp \
                                          sshpass \
                                          sudo \
@@ -46,6 +47,7 @@ RUN pip install cffi==1.10.0 \
                 jinja2==2.7.2 \
                 jsonpatch \
                 lxml \
+                mock \
                 natsort \
                 netaddr \
                 netmiko==2.4.2 \

From 5db6b6131c37d2b3252d2ded1e5ec3d70ccc1bd6 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 30 Mar 2023 23:10:34 +0800
Subject: [PATCH 1601/1674] Pin mmh3 package version in sonic-slave-stretch
 docker (#14463)

Why I did it
mmh3's new version 3.1.0 breaks pipeline build.
bullseye/buster/jessie pined the version to 2.5.1

How I did it
Pin mmh3's version as other dists.

How to verify it
---
 sonic-slave-stretch/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 79e0699e7ae7..d0e57307959a 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -376,7 +376,7 @@ RUN pip2 install Pympler==0.8
 RUN pip3 install pyang==2.4.0
 
 # For mgmt-framework build
-RUN pip2 install mmh3
+RUN pip2 install mmh3==2.5.1
 
 # Install dependencies for isc-dhcp-relay build
 RUN apt-get -y build-dep isc-dhcp

From 9c5138b60e493f9406b28a453cc05f0f2c597934 Mon Sep 17 00:00:00 2001
From: jcaiMR <111116206+jcaiMR@users.noreply.github.com>
Date: Tue, 4 Apr 2023 02:42:28 +0800
Subject: [PATCH 1602/1674] change static route expiry time from 1800 to 172800
 (#14497)

* [Bgpcfgd] change static route expiry time from 1800 to 172800
---
 src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py
index 7042849ef426..d6dfb621dad3 100644
--- a/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py
+++ b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py
@@ -12,7 +12,8 @@ def __init__(self):
 
     DEFAULT_TIMER = 180
     DEFAULT_SLEEP = 60
-    MAX_TIMER     = 1800
+    # keep same range as value defined in sonic-restapi/sonic_api.yaml
+    MAX_TIMER     = 172800
 
     def set_timer(self):
         """ Check for custom route expiry time in STATIC_ROUTE_EXPIRY_TIME """

From fc0cca2fb6d699b468b7cca78b065f6f248c5d04 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Mon, 3 Apr 2023 20:36:11 -0700
Subject: [PATCH 1603/1674] [cisco-8000] update platform module to 0.2.7
 (#14172)

#### Why I did it
Fix for link down issue seen with AOI 100G-PSM4 optics on 8102-64H-O [JIRA ID# MIGSMSFT-23]

#### How I did it
update platform module to 0.2.7
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index ef1fcde7eac4..2fff01060a9e 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2.6
+ref=202012-v0.2.7

From 99c724434ef9f117abf17a13db4cbfbb62db2206 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Tue, 4 Apr 2023 10:40:16 -0700
Subject: [PATCH 1604/1674] [202012][sonic-linkmgrd] submodule update (#14480)

Include commit:
```
6ea1f03 Jing Zhang      Tue Mar 28 08:42:44 2023 -0700  [202012] remove chatty log message for peer link event (#192)
198292d Jing Zhang      Tue Mar 21 17:53:11 2023 -0700  [active-standby] avoid unnecessary mux state probe after configuring to `auto` (#183)
47de88e Jing Zhang      Mon Mar 20 18:14:25 2023 -0700  [202012] Avoid unnecessary error logs from `handleGetServerMacAddressNotification` #96 (#185)
8a33319 Jing Zhang      Mon Mar 6 11:53:27 2023 -0800   loose link down swithcover condition (#178)
c2bf08d Jing Zhang      Thu Mar 16 18:59:10 2023 -0700  fix ActiveStandbyStateMachine referrence (#186)
99d26af Jing Zhang      Thu Mar 16 18:58:48 2023 -0700  [ci] Fix apt-get install unable locate package issue. (#177) (#187)
d893be9 Longxiang Lyu   Wed Feb 22 12:55:44 2023 +0800  [active-standby] Toggle to standby if link down and config auto (#173)
```
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 9551386d92a0..6ea1f0314e80 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 9551386d92a0cafb2e841ec3e0c04bb1bf4e1a24
+Subproject commit 6ea1f0314e80f5b47e72959dc584fa054f7b42e9

From df34b8ea5061ded80ed17a9c2311631c45491bd1 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 5 Apr 2023 21:02:20 +0800
Subject: [PATCH 1605/1674] [ci/build]: Upgrade SONiC package versions (#14527)

---
 .../versions-deb-buster                       |  6 ++---
 .../build-sonic-slave-buster/versions-git     |  6 ++---
 files/build/versions/default/versions-docker  | 12 ++++-----
 files/build/versions/default/versions-git     |  8 +++---
 files/build/versions/default/versions-web     |  6 ++---
 .../docker-dhcp-relay/versions-deb-buster     |  4 +--
 .../versions-deb-buster                       |  3 ++-
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../dockers/docker-sonic-vs/versions-py2      |  2 +-
 .../docker-syncd-invm/versions-deb-buster     |  4 +--
 .../sonic-slave-buster/versions-deb-buster    | 27 ++++++++++---------
 .../dockers/sonic-slave-buster/versions-git   |  2 +-
 .../dockers/sonic-slave-stretch/versions-git  |  2 +-
 .../dockers/sonic-slave-stretch/versions-py2  |  2 +-
 .../versions/host-image/versions-deb-buster   |  6 ++---
 files/build/versions/host-image/versions-py3  |  2 +-
 16 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 240187a49344..cac70fe97fcb 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,10 +1,10 @@
 applibs==1.mlnx.4.5.3196
 applibs-dev==1.mlnx.4.5.3196
 bfnplatform==1.0.0
-innovium-sai==0.107.7
-innovium-sai-headers==0.107.7
+innovium-sai==0.107.8
+innovium-sai-headers==0.107.8
 iproute2-dev==1.mlnx.4.5.3196
-isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay==4.4.1-2.3+deb11u1
 kernel-mft-dkms==4.21.0-100
 libhiredis-dev==0.14.0-3~bpo9+1
 libhiredis0.14==0.14.0-3~bpo9+1
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index e53ab9f4ac02..0e4db15d8696 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==3cd477f55b7049082a3e6f38fe9fa4519f8f0469
-https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
+https://github.com/sflow/host-sflow==2845325e0bcbfedb78d0903fcdebcb2d486f8c4a
+https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index fe8679513101..f799958d8ae3 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:c75d609d1d06a44ac87c52e9afe4102af856dd1c075f316b4d219f072af0b3b1
+amd64:amd64/debian:buster==sha256:ac8ad4307a275784e5fce8c832d1101b0fc8fd876e37f6fb2cb355c33ba456b1
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
+amd64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:0100d882223b08bc979db07977fd493163c545abcac553086bba75a96aebe0bd
-arm64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
+arm64:arm64v8/debian:buster==sha256:a5f47fe848328e0744bfa9929bc07049f9f7fae244f6d3db9cfc7fb9d9db7899
+arm64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:43b845d5864322e89773a602535f5db85debe3356e50488c63dd99bf2cc16899
-armhf:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
+armhf:arm32v7/debian:buster==sha256:5a0917270fe6093c5a45ab4d4036ec167764f188778f3c20e78905219eedda12
+armhf:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index d7ce1f8162e1..c0919f83d4bc 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,12 +9,12 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==3cd477f55b7049082a3e6f38fe9fa4519f8f0469
-https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
+https://github.com/sflow/host-sflow==3f3c10feaa9c8c80a400b604081f93c697f08209
+https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index f534bd23d393..1466e79596ba 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -27,9 +27,9 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==07f1d18c7f49005856169902b049fe1c
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf34b81c6bbb4b1f5042ffde
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
+https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1d6f741f3846f0725bd6f507d84164b
+https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==6c152660b57784a974b82d05c18cf51e
+https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==f6f1e7c4359ac921b2e26375d2c34382
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC-rel-13_2010_3196-EVB.mfa==3188bdd7b67e8f7f910b043a30605b2d
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC2-rel-29_2010_3196-EVB.mfa==8ca33224c84c249c028ae605f0d32f00
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
index b2c148c1e9a8..3edd946f959a 100644
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-isc-dhcp-relay==4.4.1-2
-isc-dhcp-relay-dbgsym==4.4.1-2
+isc-dhcp-relay==4.4.1-2.3+deb11u1
+isc-dhcp-relay-dbgsym==4.4.1-2.3+deb11u1
 libbabeltrace1==1.5.6-2+deb10u1
 libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libboost-system1.71.0==1.71.0-6~bpo10+1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 2c3e6fdecb38..6f8023ef513a 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -85,6 +85,7 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
+libudev1==241-7~deb10u9
 libunwind8==1.2.1-10~deb10u1
 libx11-6==2:1.6.7-1+deb10u2
 libx11-data==2:1.6.7-1+deb10u2
@@ -137,6 +138,6 @@ sx-gen-utils-dev==1.mlnx.4.5.3196
 sxd-libs==1.mlnx.4.5.3196
 sxd-libs-dev==1.mlnx.4.5.3196
 ucf==3.0038+nmu1
-udev==241-7~deb10u8
+udev==241-7~deb10u9
 vim==2:8.1.0875-5+deb10u4
 vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 8b9e62f5a786..321e8b508e11 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -5,7 +5,7 @@ click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.3
-grpcio==1.51.3
+grpcio==1.53.0
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==6.1.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
index f5309a2a4653..1202ed030d5c 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py2
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -1,6 +1,6 @@
 certifi==2021.10.8
 chardet==4.0.0
-crontab==1.0.0
+crontab==1.0.1
 idna==2.10
 monotonic==1.5
 netifaces==0.10.7
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
index f3ed6d2706b1..39b1e6f3ab77 100644
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
@@ -1,7 +1,7 @@
 gdb==8.2.1-2+b3
 gdbserver==8.2.1-2+b3
-innovium-sai==0.107.7
-innovium-sai-headers==0.107.7
+innovium-sai==0.107.8
+innovium-sai-headers==0.107.8
 libbabeltrace1==1.5.6-2+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libdw1==0.176-1.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index ca2521447f1d..abcdd10d22b0 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.18-1
+containerd.io==1.6.20-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -139,7 +139,7 @@ gettext==0.19.8.1-9
 gettext-base==0.19.8.1-9
 gfortran==4:8.3.0-1
 gfortran-8==8.3.0-6
-ghostscript==9.27~dfsg-2+deb10u6
+ghostscript==9.27~dfsg-2+deb10u7
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -399,9 +399,8 @@ libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u6
 libcurl3-gnutls==7.64.0-4+deb10u5
-libcurl3-nss==7.64.0-4+deb10u5
 libcurl4==7.64.0-4+deb10u5
-libcurl4-nss-dev==7.64.0-4+deb10u5
+libcurl4-openssl-dev==7.64.0-4+deb10u5
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
@@ -564,8 +563,8 @@ libgpgme11==1.12.0-6
 libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgraphite2-dev==1.3.13-7
-libgs9==9.27~dfsg-2+deb10u6
-libgs9-common==9.27~dfsg-2+deb10u6
+libgs9==9.27~dfsg-2+deb10u7
+libgs9-common==9.27~dfsg-2+deb10u7
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u5
 libgssrpc4==1.17-3+deb10u5
@@ -814,7 +813,7 @@ libnorm-dev==1.5.8+dfsg2-1
 libnorm1==1.5.8+dfsg2-1
 libnpth0==1.6-1
 libnspr4==2:4.20-1
-libnss-systemd==241-7~deb10u8
+libnss-systemd==241-7~deb10u9
 libnss3==2:3.42.1-1+deb10u6
 libnuma-dev==2.0.12-1
 libnuma1==2.0.12-1
@@ -849,7 +848,7 @@ libpackage-stash-perl==0.38-1
 libpackage-stash-xs-perl==0.29-1
 libpackagekit-glib2-18==1.1.12-5
 libpadwalker-perl==2.3-1+b1
-libpam-systemd==241-7~deb10u8
+libpam-systemd==241-7~deb10u9
 libpam0g-dev==1.3.1-5
 libpango-1.0-0==1.42.4-8~deb10u1
 libpango1.0-dev==1.42.4-8~deb10u1
@@ -1079,7 +1078,8 @@ libswresample3==7:4.1.10-0+deb10u1
 libswscale5==7:4.1.10-0+deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
-libsystemd-dev==241-7~deb10u8
+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
@@ -1120,8 +1120,9 @@ libtype-tiny-xs-perl==0.014-1+b1
 libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
-libudev-dev==241-7~deb10u8
-libunbound8==1.9.0-2+deb10u2
+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
 libunwind8==1.2.1-10~deb10u1
@@ -1663,8 +1664,8 @@ strace==4.26-0.2
 sudo==1.8.27-1+deb10u5
 swig==3.0.12-2
 swig3.0==3.0.12-2
-systemd==241-7~deb10u8
-systemd-sysv==241-7~deb10u8
+systemd==241-7~deb10u9
+systemd-sysv==241-7~deb10u9
 t1utils==1.41-3
 tcl==8.6.9+1
 tcl8.6==8.6.9+dfsg-2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 097ebb7f6461..7be862af5a68 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 097ebb7f6461..7be862af5a68 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==249e9a26c13596183c16784d1e2bcae475caa380
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index e83c0d4279cc..579fff279bd0 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -33,7 +33,7 @@ lazy-object-proxy==1.2.2
 lxml==4.6.5
 m2crypto==0.36.0
 markupsafe==1.1.1
-mmh3==3.0.0
+mmh3==2.5.1
 mockredispy==2.9.3
 nose==1.3.7
 nose2==0.6.5
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index d7ba2b9856b2..907631f00c54 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.18-1
+containerd.io==1.6.20-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -67,7 +67,7 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.7
+innovium-platform-driver==0.107.8
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -325,7 +325,7 @@ systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb10u8
+tzdata==2021a-0+deb10u10
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c87bb303523e..02f3037597aa 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==3.1.0
 click==7.0
-cryptography==39.0.2
+cryptography==40.0.1
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From bb2cec56f09544369dd81c577b4899a8df8beed0 Mon Sep 17 00:00:00 2001
From: mssonicbld <sonicbld@microsoft.com>
Date: Thu, 6 Apr 2023 18:53:24 +0000
Subject: [PATCH 1606/1674] [ci/build]: Upgrade SONiC package versions

---
 .../build-sonic-slave-buster/versions-deb-buster-armhf      | 5 +++++
 .../versions/build/build-sonic-slave-buster/versions-git    | 2 +-
 .../build/build-sonic-slave-buster/versions-py2-all-armhf   | 2 ++
 .../build/build-sonic-slave-buster/versions-py3-all-armhf   | 3 +++
 files/build/versions/default/versions-git                   | 4 ++--
 .../build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 files/build/versions/host-image/versions-deb-buster         | 6 +++---
 8 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index a83790c30ddf..6909e0f6a73f 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1 +1,6 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
+libsaivs-dev==1.0.0
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 0e4db15d8696..6996cd3a1261 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==2845325e0bcbfedb78d0903fcdebcb2d486f8c4a
+https://github.com/sflow/host-sflow==ae3d577fc497388d1dd75987fe131c1ad02c01d6
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
new file mode 100644
index 000000000000..c7b43db04ec2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
@@ -0,0 +1,2 @@
+ipaddress==1.0.23
+lxml==4.9.1
\ No newline at end of file
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
new file mode 100644
index 000000000000..3c42091b8d3d
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1,3 @@
+bitarray==1.5.3
+lxml==4.9.1
+requests==2.28.2
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index c0919f83d4bc..8b79da2ca45f 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==3f3c10feaa9c8c80a400b604081f93c697f08209
+https://github.com/sflow/host-sflow==ae3d577fc497388d1dd75987fe131c1ad02c01d6
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 7be862af5a68..3825c1b20fcd 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 7be862af5a68..3825c1b20fcd 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==61ebd177abdc56bd373fc05c0101e2e506f9d758
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 907631f00c54..dd1a10263931 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -33,9 +33,9 @@ dpkg-dev==1.19.8
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
 file==1:5.35-4+deb10u2
-firmware-amd-graphics==20190114-2
-firmware-linux-nonfree==20190114-2
-firmware-misc-nonfree==20190114-2
+firmware-amd-graphics==20190114+really20220913-0+deb10u1
+firmware-linux-nonfree==20190114+really20220913-0+deb10u1
+firmware-misc-nonfree==20190114+really20220913-0+deb10u1
 flashrom==1.0-1
 freeipmi-common==1.6.3-1.1
 g++==4:8.3.0-1

From b4c030971655588b88c26982bd600a6ad4818dc2 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Fri, 7 Apr 2023 17:15:53 -0700
Subject: [PATCH 1607/1674] [Submodule] Update sonic-swss (#14567)

Update swss commits:
c161027 - 2023-04-07 : [202012] overlay_dmac change in Vnet configuration. (#2724) [siqbal1986]
50be4e3 - 2023-04-05 : [202012][mux]: Implement rollback for failed mux switchovers (#2716) [Lawrence Lee]
637e4c7 - 2023-03-30 : [202012] Fix orchagent missing request when logrotate happens (#2718) [Prince Sunny]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index 3108985a9e2d..c1610272f2ab 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 3108985a9e2d48ecc896ec3ded1f2186a0ee5899
+Subproject commit c1610272f2abbf947fadb6b26b0f7058c9d82ace

From 916633cf1d3b6bee3a0afcd7f887c61f8ef316e6 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 8 Apr 2023 20:20:43 +0800
Subject: [PATCH 1608/1674] [ci/build]: Upgrade SONiC package versions (#14570)

---
 .../build/build-sonic-slave-buster/versions-deb-buster-armhf | 5 -----
 .../build/build-sonic-slave-buster/versions-py2-all-armhf    | 2 --
 .../build/build-sonic-slave-buster/versions-py3-all-armhf    | 3 ---
 files/build/versions/default/versions-git                    | 2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3         | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git | 2 +-
 .../build/versions/dockers/sonic-slave-stretch/versions-git  | 2 +-
 7 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index 6909e0f6a73f..a83790c30ddf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1,6 +1 @@
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
-libsaivs-dev==1.0.0
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
deleted file mode 100644
index c7b43db04ec2..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
+++ /dev/null
@@ -1,2 +0,0 @@
-ipaddress==1.0.23
-lxml==4.9.1
\ No newline at end of file
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
deleted file mode 100644
index 3c42091b8d3d..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1,3 +0,0 @@
-bitarray==1.5.3
-lxml==4.9.1
-requests==2.28.2
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 8b79da2ca45f..810dfc65a6bb 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 321e8b508e11..24e893eb9f23 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.3
 grpcio==1.53.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.1.0
+importlib-metadata==6.2.0
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 3825c1b20fcd..a379ad6981d1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 3825c1b20fcd..a379ad6981d1 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==e8e3e3efcfdb49aa582338abc3027ab643ccae1f
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 8a4f42d883f32e35771c79deccecb682ae875764 Mon Sep 17 00:00:00 2001
From: Dev Ojha <47282568+developfast@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:58:34 -0700
Subject: [PATCH 1609/1674] [202012][Buffer] Added cable length config to
 buffer config template for EdgeZoneAggregator (#14539)

#### Why I did it
SONiC currently does not identify 'EdgeZoneAggregator' neighbor. As a result, the buffer profile attached to those interfaces uses the default cable length which could cause ingress packet drops due to insufficient headroom. Hence, there is a need to update the buffer templates to identify such neighbors and assign the same cable length as used by the T1.

Original PR for master: #14280

#### How I did it
Modified the buffer template to identify EdgeZoneAggregator as a neighbor device type and assign it the same cable length as a T1/leaf router.

#### How to verify it
Unit tests pass, and manually checked on a 7260 to see the changes take effect.

#### Description for the changelog
[Buffer] Added cable length config to buffer config template for EdgeZoneAggregator
---
 files/build_templates/buffers_config.j2       |    3 +
 .../tests/sample-arista-7060-t0-minigraph.xml | 1048 +++++++++++++++++
 .../py2/buffer-arista7060-t0.json             |  437 +++++++
 .../py3/buffer-arista7060-t0.json             |  437 +++++++
 src/sonic-config-engine/tests/test_j2files.py |   11 +-
 5 files changed, 1932 insertions(+), 4 deletions(-)
 create mode 100644 src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml
 create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-arista7060-t0.json
 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7060-t0.json

diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 5e6f2a3ca4d1..02ef0feac601 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -47,6 +47,9 @@ def
             {%- if DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %}
                 {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %}
                 {%- set neighbor_role = neighbor.type %}
+                {%- if 'edgezoneaggregator' == neighbor_role | lower %}
+                         {%- set neighbor_role = 'LeafRouter' %}
+                {%- endif %}
                 {%- if 'asic' == neighbor_role | lower %}
                          {%- set roles1 = 'internal' %}
                          {%- if 'internal' not in ports2cable %}
diff --git a/src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml
new file mode 100644
index 000000000000..eff3d88acbb9
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml
@@ -0,0 +1,1048 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>10.0.0.56</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>10.0.0.57</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>FC00::71</StartPeer>
+        <EndRouter>ARISTA01T1</EndRouter>
+        <EndPeer>FC00::72</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>10.0.0.58</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>10.0.0.59</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>FC00::75</StartPeer>
+        <EndRouter>ARISTA02T1</EndRouter>
+        <EndPeer>FC00::76</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>10.0.0.60</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>10.0.0.61</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>FC00::79</StartPeer>
+        <EndRouter>ARISTA03T1</EndRouter>
+        <EndPeer>FC00::7A</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <MacSec>false</MacSec>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>10.0.0.62</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>10.0.0.63</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>str2-7060cx-32s-29</StartRouter>
+        <StartPeer>FC00::7D</StartPeer>
+        <EndRouter>ARISTA04T1</EndRouter>
+        <EndPeer>FC00::7E</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>65100</a:ASN>
+        <a:Hostname>str2-7060cx-32s-29</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.0.0.57</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.59</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.61</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.0.0.63</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPSLBPassive</a:Name>
+            <a:PeersRange>10.255.0.0/25</a:PeersRange>
+          </BGPPeer>
+          <BGPPeer i:type="a:BGPPeerPassive">
+            <ElementType>BGPPeer</ElementType>
+            <Address>10.1.0.32</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+            <a:Name>BGPVac</a:Name>
+            <a:PeersRange>192.168.0.0/21</a:PeersRange>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA01T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA02T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA03T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64600</a:ASN>
+        <a:Hostname>ARISTA04T1</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+        <a:LoopbackIPInterface>
+          <Name>HostIP1</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:ManagementIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>10.3.146.57/23</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>10.3.146.57/23</a:PrefixStr>
+        </a:ManagementIPInterface>
+        <a:ManagementIPInterface>
+          <Name>V6HostIP</Name>
+          <AttachTo>eth0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
+            <b:IPPrefix>FC00:2::32/64</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>FC00:2::32/64</a:PrefixStr>
+        </a:ManagementIPInterface>
+      </ManagementIPInterfaces>
+      <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>str2-7060cx-32s-29</Hostname>
+      <PortChannelInterfaces>
+        <PortChannel>
+          <Name>PortChannel101</Name>
+          <AttachTo>Ethernet29/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel102</Name>
+          <AttachTo>Ethernet30/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel103</Name>
+          <AttachTo>Ethernet31/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+        <PortChannel>
+          <Name>PortChannel104</Name>
+          <AttachTo>Ethernet32/1</AttachTo>
+          <SubInterface/>
+        </PortChannel>
+      </PortChannelInterfaces>
+      <VlanInterfaces>
+        <VlanInterface>
+          <Name>Vlan1000</Name>
+          <AttachTo>Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet7/1;Ethernet8/1;Ethernet9/1;Ethernet10/1;Ethernet11/1;Ethernet12/1;Ethernet13/1;Ethernet14/1;Ethernet15/1;Ethernet16/1;Ethernet17/1;Ethernet18/1;Ethernet19/1;Ethernet20/1;Ethernet21/1;Ethernet22/1;Ethernet23/1;Ethernet24/1;Ethernet25/1</AttachTo>
+          <NoDhcpRelay>False</NoDhcpRelay>
+          <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
+          <DhcpRelays>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</DhcpRelays>
+          <Dhcpv6Relays>fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4</Dhcpv6Relays>
+          <VlanID>1000</VlanID>
+          <Tag>1000</Tag>
+          <Subnets>192.168.0.0/21</Subnets>
+        </VlanInterface>
+      </VlanInterfaces>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>10.0.0.56/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel101</AttachTo>
+          <Prefix>FC00::71/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>10.0.0.58/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel102</AttachTo>
+          <Prefix>FC00::75/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>10.0.0.60/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel103</AttachTo>
+          <Prefix>FC00::79/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>10.0.0.62/31</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:Name="true"/>
+          <AttachTo>PortChannel104</AttachTo>
+          <Prefix>FC00::7D/126</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>192.168.0.1/21</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Vlan1000</AttachTo>
+          <Prefix>fc02:1000::1/64</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces>
+        <AclInterface>
+          <InAcl>NTP_ACL</InAcl>
+          <AttachTo>NTP</AttachTo>
+          <Type>NTP</Type>
+        </AclInterface>
+        <AclInterface>
+          <InAcl>SNMP_ACL</InAcl>
+          <AttachTo>SNMP</AttachTo>
+          <Type>SNMP</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPAN</AttachTo>
+          <InAcl>Everflow</InAcl>
+          <Type>Everflow</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>ERSPANV6</AttachTo>
+          <InAcl>EverflowV6</InAcl>
+          <Type>EverflowV6</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>VTY_LINE</AttachTo>
+          <InAcl>ssh-only</InAcl>
+          <Type>SSH</Type>
+        </AclInterface>
+        <AclInterface>
+          <AttachTo>PortChannel101;PortChannel102;PortChannel103;PortChannel104</AttachTo>
+          <InAcl>DataAcl</InAcl>
+          <Type>DataPlane</Type>
+        </AclInterface>
+      </AclInterfaces>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA01T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7060cx-32s-29</StartDevice>
+        <StartPort>Ethernet29/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA02T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7060cx-32s-29</StartDevice>
+        <StartPort>Ethernet30/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA03T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7060cx-32s-29</StartDevice>
+        <StartPort>Ethernet31/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>ARISTA04T1</EndDevice>
+        <EndPort>Ethernet1</EndPort>
+        <StartDevice>str2-7060cx-32s-29</StartDevice>
+        <StartPort>Ethernet32/1</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet2/1</EndPort>
+        <StartDevice>Servers0</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet3/1</EndPort>
+        <StartDevice>Servers1</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet4/1</EndPort>
+        <StartDevice>Servers2</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet5/1</EndPort>
+        <StartDevice>Servers3</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet6/1</EndPort>
+        <StartDevice>Servers4</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet7/1</EndPort>
+        <StartDevice>Servers5</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet8/1</EndPort>
+        <StartDevice>Servers6</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet9/1</EndPort>
+        <StartDevice>Servers7</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet10/1</EndPort>
+        <StartDevice>Servers8</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet11/1</EndPort>
+        <StartDevice>Servers9</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet12/1</EndPort>
+        <StartDevice>Servers10</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet13/1</EndPort>
+        <StartDevice>Servers11</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet14/1</EndPort>
+        <StartDevice>Servers12</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet15/1</EndPort>
+        <StartDevice>Servers13</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet16/1</EndPort>
+        <StartDevice>Servers14</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet17/1</EndPort>
+        <StartDevice>Servers15</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet18/1</EndPort>
+        <StartDevice>Servers16</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet19/1</EndPort>
+        <StartDevice>Servers17</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet20/1</EndPort>
+        <StartDevice>Servers18</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet21/1</EndPort>
+        <StartDevice>Servers19</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet22/1</EndPort>
+        <StartDevice>Servers20</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet23/1</EndPort>
+        <StartDevice>Servers21</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet24/1</EndPort>
+        <StartDevice>Servers22</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>str2-7060cx-32s-29</EndDevice>
+        <EndPort>Ethernet25/1</EndPort>
+        <StartDevice>Servers23</StartDevice>
+        <StartPort>eth0</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="ToRRouter">
+        <Hostname>str2-7060cx-32s-29</Hostname>
+        <HwSku>Arista-7060CX-32S-D48C8</HwSku>
+        <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>10.3.146.57</a:IPPrefix>
+        </ManagementAddress>
+      </Device>
+      <Device i:type="EdgeZoneAggregator">
+         <Hostname>ARISTA04T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.137.127</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="EdgeZoneAggregator">
+         <Hostname>ARISTA03T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.137.126</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="EdgeZoneAggregator">
+         <Hostname>ARISTA02T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.137.125</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+      <Device i:type="EdgeZoneAggregator">
+         <Hostname>ARISTA01T1</Hostname>
+         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
+           <a:IPPrefix>172.16.137.124</a:IPPrefix>
+         </ManagementAddress>
+         <HwSku>Arista-VM</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <DeviceInfos>
+    <DeviceInfo>
+      <AutoNegotiation>true</AutoNegotiation>
+      <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet1/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet2/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet3/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet4/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet5/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet6/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet7/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet8/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet9/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet10/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet11/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet12/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet13/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet14/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet15/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet16/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet17/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet18/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet19/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet20/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet21/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet22/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet23/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet24/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet25/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet26/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet27/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet28/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet29/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet30/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet31/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+        <a:EthernetInterface>
+          <ElementType>DeviceInterface</ElementType>
+          <AlternateSpeeds i:nil="true"/>
+          <EnableAutoNegotiation>true</EnableAutoNegotiation>
+          <EnableFlowControl>true</EnableFlowControl>
+          <Index>1</Index>
+          <InterfaceName>Ethernet32/1</InterfaceName>
+          <InterfaceType i:nil="true"/>
+          <MultiPortsInterface>false</MultiPortsInterface>
+          <PortName>0</PortName>
+          <Priority>0</Priority>
+          <Speed>40000</Speed>
+        </a:EthernetInterface>
+      </EthernetInterfaces>
+      <FlowControl>true</FlowControl>
+      <Height>0</Height>
+      <HwSku>Arista-7060CX-32S-D48C8</HwSku>
+      <ManagementInterfaces/>
+    </DeviceInfo>
+  </DeviceInfos>
+  <MetadataDeclaration>
+    <Devices xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:DeviceMetadata>
+        <a:Name>str2-7060cx-32s-29</a:Name>
+        <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>DeploymentId</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>1</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>QosProfile</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Profile0</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>DhcpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>NtpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.8.129;10.20.8.130</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SnmpResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>SyslogResources</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.64.246.95</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsGroup</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>Starlab</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>TacacsServer</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>100.127.20.21</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28;10.64.247.0/24</a:Value>
+          </a:DeviceProperty>
+          <a:DeviceProperty>
+            <a:Name>ErspanDestinationIpv4</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>10.20.6.16</a:Value>
+         </a:DeviceProperty>
+        </a:Properties>
+      </a:DeviceMetadata>
+    </Devices>
+    <Properties xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+  </MetadataDeclaration>
+  <Hostname>str2-7060cx-32s-29</Hostname>
+  <HwSku>Arista-7060CX-32S-D48C8</HwSku>
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7060-t0.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7060-t0.json
new file mode 100644
index 000000000000..896016852140
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7060-t0.json
@@ -0,0 +1,437 @@
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "5m",
+            "Ethernet4": "5m",
+            "Ethernet6": "5m",
+            "Ethernet8": "5m",
+            "Ethernet10": "5m",
+            "Ethernet12": "5m",
+            "Ethernet14": "5m",
+            "Ethernet16": "5m",
+            "Ethernet18": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet42": "5m",
+            "Ethernet44": "5m",
+            "Ethernet46": "5m",
+            "Ethernet48": "5m",
+            "Ethernet50": "5m",
+            "Ethernet52": "5m",
+            "Ethernet54": "5m",
+            "Ethernet56": "5m",
+            "Ethernet58": "5m",
+            "Ethernet60": "5m",
+            "Ethernet62": "5m",
+            "Ethernet64": "5m",
+            "Ethernet66": "5m",
+            "Ethernet68": "5m",
+            "Ethernet70": "5m",
+            "Ethernet72": "5m",
+            "Ethernet74": "5m",
+            "Ethernet76": "5m",
+            "Ethernet78": "5m",
+            "Ethernet80": "5m",
+            "Ethernet82": "5m",
+            "Ethernet84": "5m",
+            "Ethernet86": "5m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet108": "5m",
+            "Ethernet110": "5m",
+            "Ethernet112": "40m",
+            "Ethernet114": "5m",
+            "Ethernet116": "40m",
+            "Ethernet118": "5m",
+            "Ethernet120": "40m",
+            "Ethernet122": "5m",
+            "Ethernet124": "40m",
+            "Ethernet126": "5m"
+        }
+    },
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool": "[BUFFER_POOL|ingress_lossless_pool]",
+            "size": "0",
+            "dynamic_th": "3"
+        },
+        "egress_lossless_profile": {
+            "pool": "[BUFFER_POOL|egress_lossless_pool]",
+            "size": "1518",
+            "static_th": "15982720"
+        },
+        "egress_lossy_profile": {
+            "pool": "[BUFFER_POOL|egress_lossy_pool]",
+            "size": "1518",
+            "dynamic_th": "3"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet112|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+    "BUFFER_QUEUE": {
+        "Ethernet112|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7060-t0.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7060-t0.json
new file mode 100644
index 000000000000..896016852140
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7060-t0.json
@@ -0,0 +1,437 @@
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+            "Ethernet0": "5m",
+            "Ethernet2": "5m",
+            "Ethernet4": "5m",
+            "Ethernet6": "5m",
+            "Ethernet8": "5m",
+            "Ethernet10": "5m",
+            "Ethernet12": "5m",
+            "Ethernet14": "5m",
+            "Ethernet16": "5m",
+            "Ethernet18": "5m",
+            "Ethernet20": "5m",
+            "Ethernet22": "5m",
+            "Ethernet24": "5m",
+            "Ethernet28": "5m",
+            "Ethernet32": "5m",
+            "Ethernet36": "5m",
+            "Ethernet40": "5m",
+            "Ethernet42": "5m",
+            "Ethernet44": "5m",
+            "Ethernet46": "5m",
+            "Ethernet48": "5m",
+            "Ethernet50": "5m",
+            "Ethernet52": "5m",
+            "Ethernet54": "5m",
+            "Ethernet56": "5m",
+            "Ethernet58": "5m",
+            "Ethernet60": "5m",
+            "Ethernet62": "5m",
+            "Ethernet64": "5m",
+            "Ethernet66": "5m",
+            "Ethernet68": "5m",
+            "Ethernet70": "5m",
+            "Ethernet72": "5m",
+            "Ethernet74": "5m",
+            "Ethernet76": "5m",
+            "Ethernet78": "5m",
+            "Ethernet80": "5m",
+            "Ethernet82": "5m",
+            "Ethernet84": "5m",
+            "Ethernet86": "5m",
+            "Ethernet88": "5m",
+            "Ethernet92": "5m",
+            "Ethernet96": "5m",
+            "Ethernet100": "5m",
+            "Ethernet104": "5m",
+            "Ethernet106": "5m",
+            "Ethernet108": "5m",
+            "Ethernet110": "5m",
+            "Ethernet112": "40m",
+            "Ethernet114": "5m",
+            "Ethernet116": "40m",
+            "Ethernet118": "5m",
+            "Ethernet120": "40m",
+            "Ethernet122": "5m",
+            "Ethernet124": "40m",
+            "Ethernet126": "5m"
+        }
+    },
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "10875072",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "4194112"
+        },
+        "egress_lossy_pool": {
+            "size": "9243812",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "15982720",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool": "[BUFFER_POOL|ingress_lossless_pool]",
+            "size": "0",
+            "dynamic_th": "3"
+        },
+        "egress_lossless_profile": {
+            "pool": "[BUFFER_POOL|egress_lossless_pool]",
+            "size": "1518",
+            "static_th": "15982720"
+        },
+        "egress_lossy_profile": {
+            "pool": "[BUFFER_POOL|egress_lossy_pool]",
+            "size": "1518",
+            "dynamic_th": "3"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet112|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet116|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet120|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet124|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet4|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet8|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet12|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet16|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet20|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet24|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet28|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet32|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet36|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet40|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet44|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet48|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet52|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet56|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet60|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet64|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet68|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet72|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet76|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet80|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet84|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet88|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet92|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "Ethernet96|0": {
+            "profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }
+    },
+    "BUFFER_QUEUE": {
+        "Ethernet112|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet116|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet120|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet124|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet4|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet8|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet12|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet16|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet20|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet24|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet28|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet32|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet36|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet40|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet44|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet48|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet52|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet56|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet60|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet64|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet68|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet72|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet76|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet80|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet84|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet88|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet92|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet96|3-4": {
+            "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        },
+        "Ethernet112|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|0-2": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet112|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet116|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet120|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet124|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet4|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet8|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet12|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet16|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet20|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet24|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet28|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet32|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet36|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet40|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet44|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet48|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet52|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet56|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet60|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet64|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet68|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet72|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet76|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet80|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet84|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet88|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet92|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "Ethernet96|5-6": {
+            "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        }
+    }
+}
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index cbfa58fa5772..80f69a8b49ae 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -279,15 +279,15 @@ def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected,
         assert utils.cmp(sample_output_file, self.output_file)
 
     def test_buffers_dell6100_render_template(self):
-        self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json', copy_files=True) 
+        self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json', copy_files=True)
 
     def test_buffers_mellanox2700_render_template(self):
         # Mellanox buffer template rendering for single ingress pool mode
-        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8', 'sample-mellanox-2700-t0-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2700.json') 
+        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8', 'sample-mellanox-2700-t0-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2700.json')
 
     def test_buffers_mellanox2410_render_template(self):
         # Mellanox buffer template rendering for double ingress pools mode
-        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410', 'sample-mellanox-2410-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2410.json') 
+        self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410', 'sample-mellanox-2410-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2410.json')
 
     def test_config_brcm_render_template(self):
         if utils.PYvX_DIR != 'py3':
@@ -378,7 +378,7 @@ def test_extra_lossless_buffer_for_tunnel_remapping(self):
         if utils.PYvX_DIR != 'py3':
             # Skip on python2 as the change will not be backported to previous version
             return
-          
+
         TEST_DATA = [
             # (vendor, platform, sku, minigraph, buffer_template, sample_output )
             ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor.json'),
@@ -579,6 +579,9 @@ def test_backend_acl_template_render(self):
             self.run_script(argument)
             assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
 
+    def test_buffers_edgezone_aggregator_render_template(self):
+        self._test_buffers_render_template('arista', 'x86_64-arista_7060_cx32s', 'Arista-7060CX-32S-D48C8', 'sample-arista-7060-t0-minigraph.xml', 'buffers.json.j2', 'buffer-arista7060-t0.json')
+
     def tearDown(self):
         os.environ["CFGGEN_UNIT_TESTING"] = ""
         try:

From 6bef84bf393af4db51287c904fa73615bc1036db Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:38:39 +0800
Subject: [PATCH 1610/1674] [ci/build]: Upgrade SONiC package versions (#14607)

---
 files/build/versions/default/versions-git                       | 2 +-
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3   | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git    | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 810dfc65a6bb..a30900d501c4 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 24e893eb9f23..ae8f1b9d4c18 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.3
 grpcio==1.53.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.2.0
+importlib-metadata==6.3.0
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index a379ad6981d1..e796918db8c9 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index a379ad6981d1..e796918db8c9 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 65a2a970d8a159e72b69699c640cf6f657ead43b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 12 Apr 2023 21:39:43 +0800
Subject: [PATCH 1611/1674] [ci/build]: Upgrade SONiC package versions (#14622)

---
 files/build/versions/default/versions-git                     | 2 +-
 files/build/versions/dockers/sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index a30900d501c4..551c7595de0c 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a896d5a92c67c826de7cb0a0afc96111614e40fd
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index e796918db8c9..f2d8c69371d1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a896d5a92c67c826de7cb0a0afc96111614e40fd
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index e796918db8c9..f2d8c69371d1 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a73a2497375acfdc42486fbffa4ba17d5005fa26
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a896d5a92c67c826de7cb0a0afc96111614e40fd
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file

From 7b302d4002f0d65a553631f82679334320d7e99d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:25:46 +0800
Subject: [PATCH 1612/1674] [Submodule][202012] Advance sonic-restapi pointer
 (#14627)

Why I did it
[Submodule][202012] Advance sonic-restapi pointer

4f6f979 [Security] Fix the redis security issue CVE-2023-28858 and CVE-2023-28859 (#139)

Work item tracking
Microsoft ADO (number only): 17894593
How I did it
How to verify it
---
 src/sonic-restapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-restapi b/src/sonic-restapi
index 47e4b534df75..4f6f979a5b5a 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit 47e4b534df75fd71af6f902759f69cc0fc8b7a3c
+Subproject commit 4f6f979a5b5ac833b4279c73ed6c91c762d904c4

From 0c3e395aceb565d3729dd9d8b9a31889721800a1 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Fri, 14 Apr 2023 20:16:05 +0800
Subject: [PATCH 1613/1674] [build] Check if patches are applied before
 applying patches. (#13566) (#14662)

Why I did it
If make fails, we can't rerun the make process, because existing patches can't apply again.
#13386 missed some change.

Work item tracking
Microsoft ADO (number only):
How I did it
Check if patches are applied. if yes, don't apply patches again.

How to verify it
---
 slave.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/slave.mk b/slave.mk
index 8415dc4be926..3c4ad1065137 100644
--- a/slave.mk
+++ b/slave.mk
@@ -405,11 +405,11 @@ $(addprefix $(FILES_PATH)/, $(SONIC_MAKE_FILES)) : $(FILES_PATH)/% : .platform $
 		# Remove target to force rebuild
 		rm -f $(addprefix $(FILES_PATH)/, $*)
 		# Apply series of patches if exist
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi $(LOG)
 		# Build project and take package
 		make DEST=$(shell pwd)/$(FILES_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(FILES_PATH)/$* $(LOG)
 		# Clean up
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi $(LOG)
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)
@@ -449,12 +449,12 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		# Remove target to force rebuild
 		rm -f $(addprefix $(DEBS_PATH)/, $* $($*_DERIVED_DEBS) $($*_EXTRA_DEBS))
 		# Apply series of patches if exist
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi $(LOG)
 		# Build project and take package
 		$(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR)
 		DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC}" make DEST=$(shell pwd)/$(DEBS_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(DEBS_PATH)/$* $(LOG)
 		# Clean up
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi $(LOG)
 
 		# Save the target deb into DPKG cache
 		$(call SAVE_CACHE,$*,$@)
@@ -488,7 +488,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
 		# Remove old build logs if they exist
 		rm -f $($*_SRC_PATH)/debian/*.debhelper.log
 		# Apply series of patches if exist
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi $(LOG)
 		# Build project
 		pushd $($*_SRC_PATH) $(LOG_SIMPLE)
 		if [ -f ./autogen.sh ]; then ./autogen.sh $(LOG); fi
@@ -594,14 +594,14 @@ $(addprefix $(PYTHON_DEBS_PATH)/, $(SONIC_PYTHON_STDEB_DEBS)) : $(PYTHON_DEBS_PA
 	if [ -z '$($*_CACHE_LOADED)' ] ; then
 
 		# Apply series of patches if exist
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi $(LOG)
 		# Build project
 		pushd $($*_SRC_PATH) $(LOG_SIMPLE)
 		rm -rf deb_dist/* $(LOG)
 		python setup.py --command-packages=stdeb.command bdist_deb $(LOG)
 		popd $(LOG_SIMPLE)
 		# Clean up
-		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi
+		if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi $(LOG)
 		# Take built package(s)
 		mv -f $(addprefix $($*_SRC_PATH)/deb_dist/, $* $($*_DERIVED_DEBS)) $(PYTHON_DEBS_PATH) $(LOG)
 
@@ -634,7 +634,7 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
 
 		pushd $($*_SRC_PATH) $(LOG_SIMPLE)
 		# apply series of patches if exist
-		if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; fi
+		if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then quilt applied || QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; fi $(LOG)
 		# Use pip instead of later setup.py to install dependencies into user home, but uninstall self
 		pip$($*_PYTHON_VERSION) install . && pip$($*_PYTHON_VERSION) uninstall --yes `python setup.py --name`
 		if [ ! "$($*_TEST)" = "n" ]; then python$($*_PYTHON_VERSION) setup.py test $(LOG); fi
@@ -683,7 +683,7 @@ docker-start :
 $(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))
 	$(HEADER)
 	# Apply series of patches if exist
-	if [ -f $($*.gz_PATH).patch/series ]; then pushd $($*.gz_PATH) && QUILT_PATCHES=../$(notdir $($*.gz_PATH)).patch quilt push -a; popd; fi
+	if [ -f $($*.gz_PATH).patch/series ]; then pushd $($*.gz_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*.gz_PATH)).patch quilt push -a; popd; fi $(LOG)
 	# Prepare docker build info
 	scripts/prepare_docker_buildinfo.sh $* $($*.gz_PATH)/Dockerfile $(CONFIGURED_ARCH) $(TARGET_DOCKERFILE)/Dockerfile.buildinfo
 	docker info $(LOG)
@@ -756,7 +756,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform
 	if [ -z '$($*.gz_CACHE_LOADED)' ] ; then
 
 		# Apply series of patches if exist
-		if [ -f $($*.gz_PATH).patch/series ]; then pushd $($*.gz_PATH) && QUILT_PATCHES=../$(notdir $($*.gz_PATH)).patch quilt push -a; popd; fi
+		if [ -f $($*.gz_PATH).patch/series ]; then pushd $($*.gz_PATH) && quilt applied || QUILT_PATCHES=../$(notdir $($*.gz_PATH)).patch quilt push -a; popd; fi $(LOG)
 		mkdir -p $($*.gz_PATH)/debs $(LOG)
 		mkdir -p $($*.gz_PATH)/files $(LOG)
 		mkdir -p $($*.gz_PATH)/python-debs $(LOG)

From fcf2ae78de76e55c2a4519be87010b047ec8fc1f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 15 Apr 2023 20:34:05 +0800
Subject: [PATCH 1614/1674] [ci/build]: Upgrade SONiC package versions (#14671)

---
 files/build/versions/default/versions-docker         | 12 ++++++------
 files/build/versions/default/versions-git            |  2 +-
 .../docker-platform-monitor/versions-deb-buster      |  1 -
 .../dockers/docker-sonic-mgmt-framework/versions-py3 |  2 +-
 .../dockers/sonic-slave-buster/versions-deb-buster   |  2 --
 .../versions/dockers/sonic-slave-buster/versions-git |  2 +-
 .../dockers/sonic-slave-stretch/versions-git         |  2 +-
 files/build/versions/host-image/versions-py3         |  2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index f799958d8ae3..0e1f3fdda018 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:ac8ad4307a275784e5fce8c832d1101b0fc8fd876e37f6fb2cb355c33ba456b1
+amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
+amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:a5f47fe848328e0744bfa9929bc07049f9f7fae244f6d3db9cfc7fb9d9db7899
-arm64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
+arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43
+arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:5a0917270fe6093c5a45ab4d4036ec167764f188778f3c20e78905219eedda12
-armhf:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
+armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1
+armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 551c7595de0c..2d6e25ca8165 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-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/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 6f8023ef513a..92ce127c9e42 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -85,7 +85,6 @@ libthai-data==0.1.28-2
 libthai0==0.1.28-2
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-libudev1==241-7~deb10u9
 libunwind8==1.2.1-10~deb10u1
 libx11-6==2:1.6.7-1+deb10u2
 libx11-data==2:1.6.7-1+deb10u2
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index ae8f1b9d4c18..3130683a61d9 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -19,7 +19,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/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index abcdd10d22b0..0b011b510296 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1079,7 +1079,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
@@ -1121,7 +1120,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-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index f2d8c69371d1..243443cc0bba 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-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
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index f2d8c69371d1..243443cc0bba 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-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
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 02f3037597aa..10f98672ab0d 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -6,7 +6,7 @@ certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==3.1.0
 click==7.0
-cryptography==40.0.1
+cryptography==40.0.2
 docker==4.3.1
 idna==3.4
 ijson==2.6.1

From 19b212c6a0fea109f875e01007cc934f30f28b64 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 16 Apr 2023 21:12:13 +0800
Subject: [PATCH 1615/1674] [ci/build]: Upgrade SONiC package versions (#14679)

---
 .../build/versions/build/build-sonic-slave-buster/versions-git  | 2 +-
 files/build/versions/default/versions-git                       | 2 +-
 .../versions/dockers/docker-sonic-mgmt-framework/versions-py3   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
index 6996cd3a1261..348b348feb5e 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-git
@@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2d6e25ca8165..eb03dc155ce9 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20
\ No newline at end of file
+https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 3130683a61d9..640342a0f896 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -8,7 +8,7 @@ flask==2.2.3
 grpcio==1.53.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.3.0
+importlib-metadata==6.4.1
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2

From a595a02d68926b1516a84287a1288fc663f12819 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 19 Apr 2023 22:35:17 +0800
Subject: [PATCH 1616/1674] [ci/build]: Upgrade SONiC package versions (#14719)

---
 .../build/build-sonic-slave-buster/versions-py3        |  2 +-
 files/build/versions/default/versions-git              |  2 +-
 files/build/versions/default/versions-web              |  2 +-
 .../docker-saiserverv2-brcm/versions-deb-buster        |  6 +++---
 files/build/versions/dockers/docker-snmp/versions-py3  |  2 +-
 .../dockers/docker-sonic-mgmt-framework/versions-py3   |  6 +++---
 .../dockers/docker-syncd-brcm/versions-deb-buster      |  6 +++---
 .../dockers/sonic-slave-buster/versions-deb-buster     | 10 +++++-----
 .../versions/dockers/sonic-slave-buster/versions-git   |  2 +-
 .../versions/dockers/sonic-slave-stretch/versions-git  |  2 +-
 files/build/versions/host-image/versions-py3           |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 41bda4e47e42..4d7984700d40 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -8,7 +8,7 @@ jsonschema==2.6.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
-psutil==5.9.4
+psutil==5.9.5
 pyroute2==0.5.14
 python-arptable==0.0.2
 tabulate==0.9.0
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index eb03dc155ce9..c473c1eeeac4 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==97dadd025f541f67af48417cc12ebdc00c1ad29c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 1466e79596ba..8b79ac2788c6 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==42875141604382f0abb4d047f645dfe1
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==7e3b27b12367cbc79d788cd43bbc917c
+https://deb.nodesource.com/setup_14.x==6c6544a971533fb0e3c6ef55b15e0c54
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
index 72a39dab573d..b1ce5bdc7e06 100644
--- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -12,9 +12,9 @@ libipt2==2.0-2
 libkmod2==26-1
 libpcre2-16-0==10.32-5+deb10u1
 libpopt0==1.16-12
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
+libprotobuf-dev==3.6.1.3-2+deb10u1
+libprotobuf-lite17==3.6.1.3-2+deb10u1
+libprotobuf17==3.6.1.3-2+deb10u1
 libqt5core5a==5.11.3+dfsg1-1+deb10u5
 libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index afc74f17cb0f..a85e55c6c8d9 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
 hiredis==2.2.2
-psutil==5.9.4
+psutil==5.9.5
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 640342a0f896..87bb0e27408b 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,14 +1,14 @@
-attrs==22.2.0
+attrs==23.1.0
 certifi==2017.4.17
 charset-normalizer==3.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
 flask==2.2.3
-grpcio==1.53.0
+grpcio==1.54.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.4.1
+importlib-metadata==6.5.0
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index 212dc15a011d..b1fb4ad1bcb3 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -13,9 +13,9 @@ libgpm2==1.20.7-5
 libipt2==2.0-2
 libkmod2==26-1
 libpopt0==1.16-12
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
+libprotobuf-dev==3.6.1.3-2+deb10u1
+libprotobuf-lite17==3.6.1.3-2+deb10u1
+libprotobuf17==3.6.1.3-2+deb10u1
 libsaibcm==4.3.7.1-7
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.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
index 0b011b510296..c878153cdc84 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -916,10 +916,10 @@ libpostproc55==7:4.1.10-0+deb10u1
 libpotrace0==1.15-1
 libprocps7==2:3.3.15-2
 libprotobuf-c1==1.3.1-1+b1
-libprotobuf-dev==3.6.1.3-2
-libprotobuf-lite17==3.6.1.3-2
-libprotobuf17==3.6.1.3-2
-libprotoc17==3.6.1.3-2
+libprotobuf-dev==3.6.1.3-2+deb10u1
+libprotobuf-lite17==3.6.1.3-2+deb10u1
+libprotobuf17==3.6.1.3-2+deb10u1
+libprotoc17==3.6.1.3-2+deb10u1
 libproxy1v5==0.4.15-5+deb10u1
 libpsl5==0.20.2-2
 libpsm-infinipath1==3.3+20.604758e7-6
@@ -1431,7 +1431,7 @@ preview-latex-style==11.91-2
 pristine-tar==1.46
 procmail==3.22-26+deb10u1
 procps==2:3.3.15-2
-protobuf-compiler==3.6.1.3-2
+protobuf-compiler==3.6.1.3-2+deb10u1
 psmisc==23.2-1+deb10u1
 psutils==1.17.dfsg-4
 publicsuffix==20220811.1734-0+deb10u1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
index 243443cc0bba..27e768b58178 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==97dadd025f541f67af48417cc12ebdc00c1ad29c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
index 243443cc0bba..27e768b58178 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git
@@ -1,2 +1,2 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==97dadd025f541f67af48417cc12ebdc00c1ad29c
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 10f98672ab0d..c345f5175acb 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -23,7 +23,7 @@ netaddr==0.8.0
 netifaces==0.11.0
 pathtools==0.1.2
 pexpect==4.8.0
-psutil==5.9.4
+psutil==5.9.5
 ptyprocess==0.7.0
 pyang==2.5.3
 pyangbind==0.8.1

From c45c109d75032b268037184f2d0c4b80ea021d72 Mon Sep 17 00:00:00 2001
From: Jing Zhang <zhangjing@microsoft.com>
Date: Wed, 19 Apr 2023 11:43:56 -0700
Subject: [PATCH 1617/1674] update submodule (#14690)

[sonic-linkmgrd][202012] update submodule

0179207 (HEAD -> 202012, origin/202012) [202012][active-standby] Enforce switchover based on heartbeats when mux probe keeps failing #184 (#197)

sign-off: Jing Zhang zhangjing@microsoft.com
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 6ea1f0314e80..01792078de69 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 6ea1f0314e80f5b47e72959dc584fa054f7b42e9
+Subproject commit 01792078de69b3205b870074dac3a9804f3e900e

From 69951f368b23ab1566d8c0844e50dcb664232434 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 7 Apr 2023 09:35:02 +0800
Subject: [PATCH 1618/1674] [Ci] Fix the wrong SONIC_BUILD_JOBS build variable
 used issue in Azp (#14071)

Why I did it
[Ci] Fix the no parallel jobs in some of the platforms issue
We observed some of the pipelines running more time than expected. The issue is the SONIC_BUILD_JOBS using the wrong value 1. It is caused by the runtime variable issue, there is additional single quota mark character added in the make command line.

make 'SONIC_BUILD_JOBS=$(nproc)' targe/xxxx
Need to change to

make SONIC_BUILD_JOBS=$(nproc) targe/xxxx
It is to improve the build performance for some of the platforms using the variable SONIC_BUILD_JOBS=1.
Good one vs: https://dev.azure.com/mssonic/build/_build/results?buildId=227986&view=logs&j=cef3d8a9-152e-5193-620b-567dc18af272&t=cf595088-5c84-5cf1-9d7e-03331f31d795

"SONIC_BUILD_JOBS"                : "8"
Bad one barefoot: https://dev.azure.com/mssonic/build/_build/results?buildId=227379&view=logs&j=993d6e22-aeec-5c03-fa19-35ecba587dd9&t=7be0d2ec-661f-5569-462c-2d9b7ca4ca5d

"SONIC_BUILD_JOBS"                : "1"
How I did it
Expand the BUILD_OPTIONS variable for all platforms.
---
 .azure-pipelines/azure-pipelines-image-template.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index d901af999ba6..46a318188a4b 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -28,11 +28,12 @@ jobs:
       - template: .azure-pipelines/cleanup.yml@buildimage
       - ${{ parameters.preSteps }}
       - script: |
+          BUILD_OPTIONS="$(BUILD_OPTIONS)"
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
-            echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
           fi
+          echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
         displayName: "Set cache options"
       - checkout: self
         submodules: recursive

From 7c4b8bc8137e88f790088c8fa86467a5d7ccfd32 Mon Sep 17 00:00:00 2001
From: Feng-msft <fenpan@microsoft.com>
Date: Mon, 17 Apr 2023 14:44:11 +0800
Subject: [PATCH 1619/1674] Update golang version for telemetry build in
 sonic-slave-buster to fix (#14636)

Update golang version for telemetry build in sonic-slave-jessie to fix CVE-2021-33195, this PR will be merged into 201911 branch finally.

#### Why I did it
Go before 1.15.13 and 1.16.x before 1.16.5 has functions for DNS lookups that do not validate replies from DNS servers, and thus a return value may contain an unsafe injection (e.g., XSS) that does not conform to the RFC1035 format. Now in 201911 and 202012 branch we're using 1.14.2

##### Work item tracking
- Microsoft ADO **(number only)**:17727291

#### How I did it
Bump golang version into 1.15.15 which contains corresponding fix.

#### How to verify it
unit test to do sanity check.
---
 sonic-slave-jessie/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index 8d58b4199a09..67b5351dbf00 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -251,7 +251,7 @@ RUN apt-get -y build-dep linux
 {%- endif %}
 
 # For gobgp and telemetry build
-RUN export VERSION=1.14.2 \
+RUN export VERSION=1.15.15 \
 {%- if CONFIGURED_ARCH == "armhf" %}
  && wget https://storage.googleapis.com/golang/go$VERSION.linux-armv6l.tar.gz \
  && tar -C /usr/local -xzf go$VERSION.linux-armv6l.tar.gz \

From ae0a47dc6e8bf3925e50f6bb8b0a8b35a4cbc300 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:45:33 +0800
Subject: [PATCH 1620/1674] [Build][202012] Support Debian snapshot mirror to
 improve build stability (#14558)

#### Why I did it
Cherry-pick commits from master to support the snapshot based mirror, and fix the code conflicts. And add the last commit to fix the build broken issue according to the mirror change.

ad162ae0e [Build] Optimize the version control for Debian packages (https://github.com/sonic-net/sonic-buildimage/pull/14557)
38c5d7fce [Build] Support j2 template for debian sources for docker ptf (https://github.com/sonic-net/sonic-buildimage/pull/13198)
5e4826ebf  [Ci] Support to use the same snapshot for all platform builds (#13913)
820692563 [Build] Change the default mirror version config file (#13786)
5e4a866e3 [Build] Support Debian snapshot mirror to improve build stability (#13097)
ac5d89c6a  [Build] Support j2 template for debian sources (#12557)
---
 .../azure-pipelines-UpgrateVersion.yml        | 35 ++++++++++++
 .gitignore                                    |  4 ++
 Makefile.work                                 | 16 ++++--
 build_debian.sh                               |  1 +
 dockers/docker-base-buster/Dockerfile.j2      |  8 +--
 dockers/docker-base-buster/sources.list       | 13 -----
 dockers/docker-base-buster/sources.list.arm64 | 11 ----
 dockers/docker-base-buster/sources.list.armhf | 11 ----
 dockers/docker-base-stretch/Dockerfile.j2     |  8 +--
 dockers/docker-base-stretch/sources.list      | 11 ----
 .../docker-base-stretch/sources.list.arm64    | 11 ----
 .../docker-base-stretch/sources.list.armhf    | 11 ----
 dockers/docker-ptf/Dockerfile.j2              |  8 +--
 files/apt/sources.list.amd64                  | 13 -----
 files/apt/sources.list.arm64                  | 13 -----
 files/apt/sources.list.armhf                  | 13 -----
 files/apt/sources.list.j2                     | 20 +++++++
 .../build-sonic-slave-buster/versions-git     | 14 -----
 .../build-sonic-slave-buster/versions-web     | 44 ---------------
 .../build-sonic-slave-stretch/versions-web    |  2 -
 files/build/versions/default/versions-git     |  2 +-
 files/build/versions/default/versions-mirror  | 14 +++++
 files/build/versions/default/versions-web     |  9 ++-
 .../dockers/docker-base-buster/versions-web   |  1 -
 .../dockers/docker-database/versions-web      |  2 -
 .../docker-syncd-brcm-rpc/versions-web        |  2 -
 .../dockers/sonic-slave-buster/versions-git   |  2 -
 .../dockers/sonic-slave-buster/versions-web   |  2 -
 .../dockers/sonic-slave-stretch/versions-git  |  2 -
 .../dockers/sonic-slave-stretch/versions-web  |  4 --
 .../host-image/versions-deb-buster-arm64      | 53 ++----------------
 .../host-image/versions-deb-buster-armhf      | 53 ++----------------
 files/build/versions/host-image/versions-web  |  1 -
 rules/config                                  |  3 +
 scripts/build_mirror_config.sh                | 55 +++++++++++++++++++
 scripts/generate_buildinfo_config.sh          |  1 +
 scripts/prepare_docker_buildinfo.sh           |  4 ++
 scripts/versions_manager.py                   |  9 ++-
 slave.mk                                      |  3 +
 sonic-slave-buster/Dockerfile.j2              | 34 +-----------
 sonic-slave-stretch/Dockerfile.j2             | 35 +-----------
 .../scripts/buildinfo_base.sh                 | 30 +++++++++-
 .../scripts/collect_version_files             | 10 ++++
 43 files changed, 223 insertions(+), 375 deletions(-)
 delete mode 100644 dockers/docker-base-buster/sources.list
 delete mode 100644 dockers/docker-base-buster/sources.list.arm64
 delete mode 100644 dockers/docker-base-buster/sources.list.armhf
 delete mode 100644 dockers/docker-base-stretch/sources.list
 delete mode 100644 dockers/docker-base-stretch/sources.list.arm64
 delete mode 100644 dockers/docker-base-stretch/sources.list.armhf
 delete mode 100644 files/apt/sources.list.amd64
 delete mode 100644 files/apt/sources.list.arm64
 delete mode 100644 files/apt/sources.list.armhf
 create mode 100644 files/apt/sources.list.j2
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web
 delete mode 100644 files/build/versions/build/build-sonic-slave-stretch/versions-web
 create mode 100644 files/build/versions/default/versions-mirror
 delete mode 100644 files/build/versions/dockers/docker-base-buster/versions-web
 delete mode 100644 files/build/versions/dockers/docker-database/versions-web
 delete mode 100644 files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-web
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git
 delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-web
 delete mode 100644 files/build/versions/host-image/versions-web
 create mode 100755 scripts/build_mirror_config.sh

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 70afd6d4c04c..e1931b1ee3b5 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -40,12 +40,32 @@ parameters:
     - marvell-armhf
 
 stages:
+- stage: Prepare
+  jobs:
+  - job: Prepare
+    steps:
+    - script: |
+        DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
+        DEBIAN_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian/latest/timestamp)
+        DEBIAN_SECURITY_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian-security/latest/timestamp)
+        echo "DEBIAN_TIMESTAMP=$DEBIAN_TIMESTAMP, DEBIAN_SECURITY_TIMESTAMP=$DEBIAN_SECURITY_TIMESTAMP"
+        echo "##vso[task.setvariable variable=DEBIAN_TIMESTAMP;isOutput=true]$DEBIAN_TIMESTAMP"
+        echo "##vso[task.setvariable variable=DEBIAN_SECURITY_TIMESTAMP;isOutput=true]$DEBIAN_SECURITY_TIMESTAMP"
+      name: SetVersions
+      displayName: 'Set snapshot versions'
 - stage: Build
+  dependsOn: Prepare
   variables:
     - name: CACHE_MODE
       value: none
     - name: VERSION_CONTROL_OPTIONS
       value: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - name: SKIP_CHECKOUT
+      value: true
+    - name: DEBIAN_TIMESTAMP
+      value: $[ stageDependencies.Prepare.Prepare.outputs['SetVersions.DEBIAN_TIMESTAMP'] ]
+    - name: DEBIAN_SECURITY_TIMESTAMP
+      value: $[ stageDependencies.Prepare.Prepare.outputs['SetVersions.DEBIAN_SECURITY_TIMESTAMP'] ]
     - template: .azure-pipelines/template-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
@@ -54,6 +74,21 @@ stages:
       buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} ENABLE_DOCKER_BASE_PULL=n SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       preSteps:
       - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
+      - checkout: self
+        submodules: recursive
+        fetchDepth: 0
+        path: s
+        displayName: 'Checkout code'
+      - script: |
+          echo "DEBIAN_TIMESTAMP=$DEBIAN_TIMESTAMP, DEBIAN_SECURITY_TIMESTAMP=$DEBIAN_SECURITY_TIMESTAMP"
+          if [ "$MIRROR_SNAPSHOT" == y ]; then
+            mkdir -p target/versions/default/
+            echo "debian==$DEBIAN_TIMESTAMP" > target/versions/default/versions-mirror
+            echo "debian-security==$DEBIAN_SECURITY_TIMESTAMP" >> target/versions/default/versions-mirror
+            cat target/versions/default/versions-mirror
+          fi
+        displayName: 'Set snapshot versions'
+
 - stage: UpgradeVersions
   jobs:
   - job: UpgradeVersions
diff --git a/.gitignore b/.gitignore
index c0384e7505ad..f6dc53a5e2f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,7 @@ files/build/tmp
 dockers/**/buildinfo
 platform/**/buildinfo
 sonic-slave*/**/buildinfo
+
+# Debian mirror Sources
+sources.list.*
+!sources.list*.j2
diff --git a/Makefile.work b/Makefile.work
index 51d8c1fc6334..e4e9159baa83 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -135,12 +135,13 @@ SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER_LC)
 # Generate the version control build info
 $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
     TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
+    MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
     scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
-$(shell BUILD_SLAVE=y DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
+$(shell BUILD_SLAVE=y DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
 
 # Add the versions in the tag, if the version change, need to rebuild the slave
 SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
@@ -280,13 +281,20 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
                            SONIC_DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
                            SLAVE_DIR=$(SLAVE_DIR) \
+                           MIRROR_URLS=$(MIRROR_URLS) \
+                           MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
+                           MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset
 
 .DEFAULT_GOAL :=  all
 
-%::
+export MIRROR_URLS
+export MIRROR_SECURITY_URLS
+export SONIC_VERSION_CONTROL_COMPONENTS
+
+%:: | sonic-build-hooks
 ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	@$(DOCKER_MULTIARCH_CHECK)
 ifneq ($(BLDENV), )
@@ -296,8 +304,6 @@ endif
 endif
 	@$(OVERLAY_MODULE_CHECK)
 
-	@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
-	@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
 	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
 	    { [ $(ENABLE_DOCKER_BASE_PULL) == y ] && { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Pulling...; } && \
 	      $(DOCKER_BASE_PULL) && \
@@ -322,6 +328,8 @@ endif
 sonic-build-hooks:
 	@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
 	@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
+	@[ "$(MULTIARCH_QEMU_ENVIRON)" == y ] && scripts/build_mirror_config.sh $(SLAVE_DIR) amd64 $(BLDENV)
+	@scripts/build_mirror_config.sh $(SLAVE_DIR) $(CONFIGURED_ARCH) $(BLDENV)
 
 sonic-slave-base-build : sonic-build-hooks
 	@$(OVERLAY_MODULE_CHECK)
diff --git a/build_debian.sh b/build_debian.sh
index 5169be3694a9..3b9056eeec69 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -107,6 +107,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 [ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/
 
 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
+scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO 
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
 sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
 
diff --git a/dockers/docker-base-buster/Dockerfile.j2 b/dockers/docker-base-buster/Dockerfile.j2
index 52c784e9a7fe..77886ede4408 100644
--- a/dockers/docker-base-buster/Dockerfile.j2
+++ b/dockers/docker-base-buster/Dockerfile.j2
@@ -27,13 +27,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Configure data sources for apt/dpkg
 COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
-{% if CONFIGURED_ARCH == "armhf" %}
-COPY ["sources.list.armhf", "/etc/apt/sources.list"]
-{% elif CONFIGURED_ARCH == "arm64" %}
-COPY ["sources.list.arm64", "/etc/apt/sources.list"]
-{% else %}
-COPY ["sources.list", "/etc/apt/sources.list"]
-{% endif %}
+COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
 COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
 COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
 
diff --git a/dockers/docker-base-buster/sources.list b/dockers/docker-base-buster/sources.list
deleted file mode 100644
index 0eef72d9fa2d..000000000000
--- a/dockers/docker-base-buster/sources.list
+++ /dev/null
@@ -1,13 +0,0 @@
-## Debian mirror on Microsoft Azure
-## Ref: http://debian-archive.trafficmanager.net/
-
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
-
-# Debian mirror supports multiple versions for a package
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
diff --git a/dockers/docker-base-buster/sources.list.arm64 b/dockers/docker-base-buster/sources.list.arm64
deleted file mode 100644
index 6375734e99e6..000000000000
--- a/dockers/docker-base-buster/sources.list.arm64
+++ /dev/null
@@ -1,11 +0,0 @@
-## Debian mirror for ARM repo
-
-# ARM repo
-deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=arm64] http://security.debian.org buster/updates main contrib non-free
-deb-src [arch=arm64] http://security.debian.org buster/updates main contrib non-free
-deb [arch=arm64] http://deb.debian.org/debian/ buster-backports main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
diff --git a/dockers/docker-base-buster/sources.list.armhf b/dockers/docker-base-buster/sources.list.armhf
deleted file mode 100644
index a03af1a33ac0..000000000000
--- a/dockers/docker-base-buster/sources.list.armhf
+++ /dev/null
@@ -1,11 +0,0 @@
-## Debian mirror for ARM repo
-
-# ARM repo
-deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=armhf] http://security.debian.org buster/updates main contrib non-free
-deb-src [arch=armhf] http://security.debian.org buster/updates main contrib non-free
-deb [arch=armhf] http://deb.debian.org/debian/ buster-backports main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index 01ba264a41bf..bfdd46275d5d 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -27,13 +27,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Configure data sources for apt/dpkg
 COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
-{% if CONFIGURED_ARCH == "armhf" %}
-COPY ["sources.list.armhf", "/etc/apt/sources.list"]
-{% elif CONFIGURED_ARCH == "arm64" %}
-COPY ["sources.list.arm64", "/etc/apt/sources.list"]
-{% else %}
-COPY ["sources.list", "/etc/apt/sources.list"]
-{% endif %}
+COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
 COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
 COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
 
diff --git a/dockers/docker-base-stretch/sources.list b/dockers/docker-base-stretch/sources.list
deleted file mode 100644
index 0c29b339bb87..000000000000
--- a/dockers/docker-base-stretch/sources.list
+++ /dev/null
@@ -1,11 +0,0 @@
-## Debian mirror on Microsoft Azure
-## Ref: http://debian-archive.trafficmanager.net/
-
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch-backports main contrib non-free
diff --git a/dockers/docker-base-stretch/sources.list.arm64 b/dockers/docker-base-stretch/sources.list.arm64
deleted file mode 100644
index 520c46519919..000000000000
--- a/dockers/docker-base-stretch/sources.list.arm64
+++ /dev/null
@@ -1,11 +0,0 @@
-## Debian mirror for ARM repo
-
-# ARM repo
-deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
-deb [arch=arm64] http://security.debian.org stretch/updates main contrib non-free
-deb-src [arch=arm64] http://security.debian.org stretch/updates main contrib non-free
-deb [arch=arm64] http://deb.debian.org/debian/ stretch-backports main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch-backports main contrib non-free
diff --git a/dockers/docker-base-stretch/sources.list.armhf b/dockers/docker-base-stretch/sources.list.armhf
deleted file mode 100644
index 58077f310424..000000000000
--- a/dockers/docker-base-stretch/sources.list.armhf
+++ /dev/null
@@ -1,11 +0,0 @@
-## Debian mirror for ARM repo
-
-# ARM repo
-deb [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
-deb [arch=armhf] http://security.debian.org stretch/updates main contrib non-free
-deb-src [arch=armhf] http://security.debian.org stretch/updates main contrib non-free
-deb [arch=armhf] http://deb.debian.org/debian/ stretch-backports main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch-backports main contrib non-free
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index a46210c522a8..873cc9428a9a 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -9,9 +9,6 @@ FROM {{ prefix }}debian:stretch
 
 MAINTAINER Pavel Shirshov
 
-## Remove retired jessie-updates repo
-RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-
 ## Copy dependencies
 COPY \
 {% for deb in docker_ptf_debs.split(' ') -%}
@@ -19,13 +16,14 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
+COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
+
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
 ## Set the apt source, update package cache and install necessary packages
 ## TODO: Clean up this step
-RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list \
-    && apt-get update          \
+RUN apt-get update          \
     && apt-get upgrade -y   \
     && apt-get dist-upgrade -y  \
     && apt-get install -y   \
diff --git a/files/apt/sources.list.amd64 b/files/apt/sources.list.amd64
deleted file mode 100644
index 45902be1078c..000000000000
--- a/files/apt/sources.list.amd64
+++ /dev/null
@@ -1,13 +0,0 @@
-## Debian mirror on Microsoft Azure
-## Ref: http://debian-archive.trafficmanager.net/
-
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
-deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
diff --git a/files/apt/sources.list.arm64 b/files/apt/sources.list.arm64
deleted file mode 100644
index 58b84978d023..000000000000
--- a/files/apt/sources.list.arm64
+++ /dev/null
@@ -1,13 +0,0 @@
-## Debian mirror for ARM
-## Not the repo mirror site can change in future, and needs to be updated to be in sync
-
-deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
-deb [arch=arm64] http://ftp.debian.org/debian buster-backports main
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-backports main
diff --git a/files/apt/sources.list.armhf b/files/apt/sources.list.armhf
deleted file mode 100644
index eb6fe3be6889..000000000000
--- a/files/apt/sources.list.armhf
+++ /dev/null
@@ -1,13 +0,0 @@
-## Debian mirror for ARM
-## Not the repo mirror site can change in future, and needs to be updated to be in sync
-
-deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
-deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
-deb [arch=armhf] http://ftp.debian.org/debian buster-backports main
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-backports main
diff --git a/files/apt/sources.list.j2 b/files/apt/sources.list.j2
new file mode 100644
index 000000000000..57d53b919b03
--- /dev/null
+++ b/files/apt/sources.list.j2
@@ -0,0 +1,20 @@
+# The configuration is generated by template
+# Please add additional sources in /etc/apt/sources.list.d
+
+{% for mirror_url in MIRROR_URLS.split(',') %}
+deb [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }} main contrib non-free
+deb-src [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }} main contrib non-free
+deb [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}-updates main contrib non-free
+deb-src [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}-updates main contrib non-free
+deb [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}-backports main contrib non-free
+{% endfor %}
+{% for mirror_url in MIRROR_SECURITY_URLS.split(',') %}
+{% set dist_separator='/' %}{% if 'packages.trafficmanager.net/debian' in mirror_url %}{% set dist_separator='_' %}{% endif %}
+{% if DISTRIBUTION == 'stretch' or DISTRIBUTION == 'buster' %}
+deb [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}{{ dist_separator }}updates main contrib non-free
+deb-src [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}{{ dist_separator }}updates main contrib non-free
+{% else %}
+deb [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}-security main contrib non-free
+deb-src [arch={{ ARCHITECTURE }}] {{ mirror_url }} {{ DISTRIBUTION }}-security main contrib non-free
+{% endif %}
+{% endfor %}
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git
deleted file mode 100644
index 348b348feb5e..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
-https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
-https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
-https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/sflow/host-sflow==ae3d577fc497388d1dd75987fe131c1ad02c01d6
-https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
-https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
-https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
-https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
-https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
-https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web
deleted file mode 100644
index a1d7e4f7c824..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-web
+++ /dev/null
@@ -1,44 +0,0 @@
-http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.debian.tar.xz==c27e499611c48ba307792518d29cdcc7
-http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2-4.dsc==d9572a9f48c88293341681601a7b18c5
-http://deb.debian.org/debian/pool/main/i/iptables/iptables_1.8.2.orig.tar.bz2==944558e88ddcc3b9b0d9550070fa3599
-http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.debian.tar.xz==c2a4cd6b79350378ca9a337b45b732c5
-http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0-3.dsc==86e28662fa00bec000f22257d212873d
-http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.5.0.orig.tar.gz==37981f5d3a0f649381529cb41c0f1ff3
-http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debian.tar.xz==a677f850ad1e4f2600cc9c3f3c872927
-http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53
-http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901
-http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939
-http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.debian.tar.xz==4c0d6cab366b4fdb0372299ecc8a219a
-http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.dsc==278cfe25d286d1840ee366b557ed6ab0
-http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0.orig.tar.gz==38a27d391a2b03214b444cb13d5664f1
-http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
-http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
-http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
-https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
-https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
-https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
-https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.dsc==e76d5deda89795939828c3b39b31d38f
-https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152.orig.tar.xz==e3afaa4ac1387449dec703da494dd991
-https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.debian.tar.xz==0a529cf8d1717b5c3dbe0c61b3512aa1
-https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4-1.dsc==b88b922d96688c948e90987fcaa3a2de
-https://sonicstorage.blob.core.windows.net/debian/pool/main/l/lldpd/lldpd_1.0.4.orig.tar.gz==33e8d58623f99184e4e709cbbfe45db3
-https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.debian.tar.xz==f159fbedc0b69d00b2bdb08db283c0bb
-https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184-2.dsc==98c68654fadc116346007be9282ae357
-https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang_1.0.184.orig.tar.gz==0ddfdf2dba5e73486c133c1fba1b3e8e
-https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
-https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
-https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
-https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
-https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
-https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb
-https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c
-https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f
-https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.debian.tar.xz?sv=2015-04-05&sr=b&sig=yv77Fr5RtZgRTPmJK3j0lZ0BzsCiGaSs2i7NqQKEy2Y%3D&se=2155-07-05T11%3A39%3A59Z&sp=r==84dc9e966e116384ac13aeca16b9437a
-https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u1.dsc?sv=2015-04-05&sr=b&sig=Ph7aMqb%2F%2FE%2F8qwxMXoXb5oK1YPkfVt6PV8mBBv5Wi%2F4%3D&se=2155-07-05T11%3A42%3A29Z&sp=r==b14d356861eaa916f7f19098ab7b1d4e
-https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0
-https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569
-https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b
-https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm-dev_4.3.7.1-7_amd64.deb==ec7a1c729dca33d18a71ac8a15f5ef0b
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm_4.3.7.1-7_amd64.deb==29314badd4324537d6be08acfff59d02
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web
deleted file mode 100644
index de969d73e676..000000000000
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-web
+++ /dev/null
@@ -1,2 +0,0 @@
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm-dev_4.3.7.1-7_amd64.deb==ec7a1c729dca33d18a71ac8a15f5ef0b
-https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm_4.3.7.1-7_amd64.deb==29314badd4324537d6be08acfff59d02
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index c473c1eeeac4..2a2d66c4bf2b 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d6cb8fa70c61b13dd2341c220fafdd1db2c30fe
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
new file mode 100644
index 000000000000..2d9d9d249181
--- /dev/null
+++ b/files/build/versions/default/versions-mirror
@@ -0,0 +1,14 @@
+deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
+deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
+debian==20230420T000327Z
+debian-security==20230420T000140Z
+download.docker.com_linux_debian_dists_buster==2023-04-17T19:08:10Z
+download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
+packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
+packages.trafficmanager.net_snapshot_debian-security_20230420T000140Z_dists_buster_updates==2023-04-19T23:04:41Z
+packages.trafficmanager.net_snapshot_debian-security_20230420T000140Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster-backports==2023-04-19T20:11:39Z
+packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster-updates==2023-04-19T20:11:40Z
+packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 8b79ac2788c6..155696fd3f61 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -11,6 +11,9 @@ http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debia
 http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53
 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901
 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.debian.tar.xz==4c0d6cab366b4fdb0372299ecc8a219a
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.dsc==278cfe25d286d1840ee366b557ed6ab0
+http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0.orig.tar.gz==38a27d391a2b03214b444cb13d5664f1
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
@@ -20,8 +23,9 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
 https://deb.nodesource.com/node_14.x/dists/buster/Release==42875141604382f0abb4d047f645dfe1
 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
-https://deb.nodesource.com/setup_14.x==6c6544a971533fb0e3c6ef55b15e0c54
+https://deb.nodesource.com/setup_14.x==1c9de9348c0acd5f2ee422a6d0c333b3
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
+https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
@@ -72,6 +76,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912
 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209
+https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff
 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
@@ -93,6 +98,8 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~b
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bpo10+1_arm64.deb?sv=2015-04-05&sr=b&sig=GbkJV2wWln3hoz27zKi5erdk3NDKrAFrQriA97bcRCY%3D&se=2030-10-24T04%3A22%3A21Z&sp=r==282b4766cc9ac7d8bb70622bd69d9f5c
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bpo10+1_armhf.deb?sv=2015-04-05&sr=b&sig=67vHAMxsl%2BS3X1KsqhdYhakJkGdg5FKSPgU8kUiw4as%3D&se=2030-10-24T04%3A22%3A40Z&sp=r==62f287117afab6caaec564232ebbb5de
 https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm-dev_4.3.7.1-7_amd64.deb==ec7a1c729dca33d18a71ac8a15f5ef0b
+https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3_202012/4.3.7.1-7/libsaibcm_4.3.7.1-7_amd64.deb==29314badd4324537d6be08acfff59d02
 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
 https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-base-buster/versions-web b/files/build/versions/dockers/docker-base-buster/versions-web
deleted file mode 100644
index d85bc54c0062..000000000000
--- a/files/build/versions/dockers/docker-base-buster/versions-web
+++ /dev/null
@@ -1 +0,0 @@
-https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-database/versions-web b/files/build/versions/dockers/docker-database/versions-web
deleted file mode 100644
index b46cc985fa39..000000000000
--- a/files/build/versions/dockers/docker-database/versions-web
+++ /dev/null
@@ -1,2 +0,0 @@
-https://sonicstorage.blob.core.windows.net/packages/redis/redis-server_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=2Ketg7BmkZEaTxR%2FgvAFVmhjn7ywdmkc7l2T2rsL57o%3D&se=2030-09-06T19%3A45%3A20Z&sp=r==09af97c096f4c854d238f91614a3415b
-https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
deleted file mode 100644
index bb00691a9700..000000000000
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
+++ /dev/null
@@ -1,2 +0,0 @@
-https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
-https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index 27e768b58178..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
-https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-web b/files/build/versions/dockers/sonic-slave-buster/versions-web
deleted file mode 100644
index e98bc47c6359..000000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-web
+++ /dev/null
@@ -1,2 +0,0 @@
-https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git
deleted file mode 100644
index 27e768b58178..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-git
+++ /dev/null
@@ -1,2 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==9e36ef60d0b3b3da1d79cf388275697281d27f21
-https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-web b/files/build/versions/dockers/sonic-slave-stretch/versions-web
deleted file mode 100644
index ea55af616524..000000000000
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-web
+++ /dev/null
@@ -1,4 +0,0 @@
-https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
-https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af
-https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275
-https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index 2e9bd27d1aa6..f493da662270 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -1,56 +1,13 @@
 binutils-aarch64-linux-gnu==2.31.1-16
-bzip2==1.0.6-9.2~deb10u1
-curl==7.64.0-4+deb10u2
-dbus==1.12.20-0+deb10u1
-distro-info-data==0.41+deb10u5
-grub-common==2.06-3~deb10u1
-grub2-common==2.06-3~deb10u1
 icu-devtools==63.1-6+deb10u3
-isc-dhcp-client==4.4.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc-l10n==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
-libdbus-1-3==1.12.20-0+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
-libglib2.0-0==2.58.3-2+deb10u3
-libgssapi-krb5-2==1.17-3+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
-libk5crypto3==1.17-3+deb10u4
-libkrb5-3==1.17-3+deb10u4
-libkrb5support0==1.17-3+deb10u4
-libksba8==1.3.5-2
-libncurses6==6.1+20181013-2+deb10u2
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
-libsqlite3-0==3.27.2-3+deb10u1
-libssl-dev==1.1.1n-0+deb10u3
-libssl1.1==1.1.1n-0+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u4
-libxml2-dev==2.9.4+dfsg1-7+deb10u4
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxslt1-dev==1.1.32-2.2~deb10u2
+libxslt1.1==1.1.32-2.2~deb10u2
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
-linux-libc-dev==4.19.249-2
-locales==2.28-10+deb10u1
-openssl==1.1.1n-0+deb10u3
 pkg-config==0.29-6
-python3.7==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
-sudo==1.8.27-1+deb10u3
 tsingma-bsp==1.0
-unzip==6.0-23+deb10u2
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
-xxd==2:8.1.0875-5+deb10u2
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index 16b23a8a319a..ea1012bf5763 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -1,56 +1,13 @@
 binutils-arm-linux-gnueabihf==2.31.1-16
-bzip2==1.0.6-9.2~deb10u1
-curl==7.64.0-4+deb10u2
-dbus==1.12.20-0+deb10u1
-distro-info-data==0.41+deb10u5
-grub-common==2.06-3~deb10u1
-grub2-common==2.06-3~deb10u1
 icu-devtools==63.1-6+deb10u3
-isc-dhcp-client==4.4.1-2+deb10u1
-libc-dev-bin==2.28-10+deb10u1
-libc-l10n==2.28-10+deb10u1
-libc6-dev==2.28-10+deb10u1
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4==7.64.0-4+deb10u2
-libdbus-1-3==1.12.20-0+deb10u1
-libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7
-libexpat1==2.2.6-2+deb10u4
-libexpat1-dev==2.2.6-2+deb10u4
-libglib2.0-0==2.58.3-2+deb10u3
-libgssapi-krb5-2==1.17-3+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7
-libk5crypto3==1.17-3+deb10u4
-libkrb5-3==1.17-3+deb10u4
-libkrb5support0==1.17-3+deb10u4
-libksba8==1.3.5-2
-libncurses6==6.1+20181013-2+deb10u2
-libpython3.7==3.7.3-2+deb10u3
-libpython3.7-dev==3.7.3-2+deb10u3
-libpython3.7-minimal==3.7.3-2+deb10u3
-libpython3.7-stdlib==3.7.3-2+deb10u3
-libsqlite3-0==3.27.2-3+deb10u1
-libssl-dev==1.1.1n-0+deb10u3
-libssl1.1==1.1.1n-0+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u4
-libxml2-dev==2.9.4+dfsg1-7+deb10u4
-libxslt1-dev==1.1.32-2.2~deb10u1
-libxslt1.1==1.1.32-2.2~deb10u1
+libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxslt1-dev==1.1.32-2.2~deb10u2
+libxslt1.1==1.1.32-2.2~deb10u2
 linux-image-4.19.0-12-2-armmp==4.19.152-1
-linux-libc-dev==4.19.249-2
-locales==2.28-10+deb10u1
 mrvlprestera==1.0
-openssl==1.1.1n-0+deb10u3
 pkg-config==0.29-6
-python3.7==3.7.3-2+deb10u3
-python3.7-dev==3.7.3-2+deb10u3
-python3.7-minimal==3.7.3-2+deb10u3
-sudo==1.8.27-1+deb10u3
-unzip==6.0-23+deb10u2
-vim==2:8.1.0875-5+deb10u2
-vim-common==2:8.1.0875-5+deb10u2
-vim-runtime==2:8.1.0875-5+deb10u2
-xxd==2:8.1.0875-5+deb10u2
-zlib1g-dev==1:1.2.11.dfsg-1+deb10u1
\ No newline at end of file
+zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-web b/files/build/versions/host-image/versions-web
deleted file mode 100644
index c9f935ca9a85..000000000000
--- a/files/build/versions/host-image/versions-web
+++ /dev/null
@@ -1 +0,0 @@
-https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
\ No newline at end of file
diff --git a/rules/config b/rules/config
index cc67914a807e..5daa2f933a57 100644
--- a/rules/config
+++ b/rules/config
@@ -186,6 +186,9 @@ TRUSTED_GPG_URLS = https://packages.trafficmanager.net/debian/public_key.gpg,htt
 #   docker: docker base images
 SONIC_VERSION_CONTROL_COMPONENTS ?= none
 
+# MIRROR_SNAPSHOT - support mirror snapshot flag
+MIRROR_SNAPSHOT ?= n
+
 # SONiC docker registry
 #
 # Set the env variable ENABLE_DOCKER_BASE_PULL = y to enable pulling sonic-slave docker from registry
diff --git a/scripts/build_mirror_config.sh b/scripts/build_mirror_config.sh
new file mode 100755
index 000000000000..aee56f23ae6a
--- /dev/null
+++ b/scripts/build_mirror_config.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Generate the sources.list.<arch> in the config path
+CONFIG_PATH=$1
+export ARCHITECTURE=$2
+export DISTRIBUTION=$3
+
+DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
+MIRROR_VERSION_FILE=
+[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ]] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror
+[ -f target/versions/default/versions-mirror ] && MIRROR_VERSION_FILE=target/versions/default/versions-mirror
+
+# The default mirror urls
+DEFAULT_MIRROR_URLS=http://debian-archive.trafficmanager.net/debian/,http://packages.trafficmanager.net/debian/debian/
+DEFAULT_MIRROR_SECURITY_URLS=http://debian-archive.trafficmanager.net/debian-security/,http://packages.trafficmanager.net/debian/debian-security/
+
+
+# The debian-archive.trafficmanager.net does not support armhf, use debian.org instead
+if [ "$ARCHITECTURE" == "armhf" ]; then
+    DEFAULT_MIRROR_URLS=http://deb.debian.org/debian/,http://packages.trafficmanager.net/debian/debian/
+    DEFAULT_MIRROR_SECURITY_URLS=http://deb.debian.org/debian-security/,http://packages.trafficmanager.net/debian/debian-security/
+fi
+
+if [ "$MIRROR_SNAPSHOT" == y ]; then
+    if [ -f "$MIRROR_VERSION_FILE" ]; then
+        DEBIAN_TIMESTAMP=$(grep "^debian==" $MIRROR_VERSION_FILE | tail -n 1 | sed 's/.*==//')
+        DEBIAN_SECURITY_TIMESTAMP=$(grep "^debian-security==" $MIRROR_VERSION_FILE | tail -n 1 | sed 's/.*==//')
+    elif [ -z "$DEBIAN_TIMESTAMP" ] || [ -z "$DEBIAN_SECURITY_TIMESTAMP" ]; then
+        DEBIAN_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian/latest/timestamp)
+        DEBIAN_SECURITY_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian-security/latest/timestamp)
+    fi
+
+    DEFAULT_MIRROR_URLS=http://deb.debian.org/debian/,http://packages.trafficmanager.net/snapshot/debian/$DEBIAN_TIMESTAMP/
+    DEFAULT_MIRROR_SECURITY_URLS=http://deb.debian.org/debian-security/,http://packages.trafficmanager.net/snapshot/debian-security/$DEBIAN_SECURITY_TIMESTAMP/
+
+    mkdir -p target/versions/default
+    if [ ! -f target/versions/default/versions-mirror ]; then
+        echo "debian==$DEBIAN_TIMESTAMP" > target/versions/default/versions-mirror
+        echo "debian-security==$DEBIAN_SECURITY_TIMESTAMP" >> target/versions/default/versions-mirror
+    fi
+fi
+
+[ -z "$MIRROR_URLS" ] && MIRROR_URLS=$DEFAULT_MIRROR_URLS
+[ -z "$MIRROR_SECURITY_URLS" ] && MIRROR_SECURITY_URLS=$DEFAULT_MIRROR_SECURITY_URLS
+
+TEMPLATE=files/apt/sources.list.j2
+[ -f files/apt/sources.list.$ARCHITECTURE.j2 ] && TEMPLATE=files/apt/sources.list.$ARCHITECTURE.j2
+[ -f $CONFIG_PATH/sources.list.j2 ] && TEMPLATE=$CONFIG_PATH/sources.list.j2
+[ -f $CONFIG_PATH/sources.list.$ARCHITECTURE.j2 ] && TEMPLATE=$CONFIG_PATH/sources.list.$ARCHITECTURE.j2
+
+MIRROR_URLS=$MIRROR_URLS MIRROR_SECURITY_URLS=$MIRROR_SECURITY_URLS j2 $TEMPLATE | sed '/^$/N;/^\n$/D' > $CONFIG_PATH/sources.list.$ARCHITECTURE
+if [ "$MIRROR_SNAPSHOT" == y ]; then
+    # Set the snapshot mirror, and add the SET_REPR_MIRRORS flag
+    sed -i -e "/^#*deb.*packages.trafficmanager.net/! s/^#*deb/#&/" -e "\$a#SET_REPR_MIRRORS" $CONFIG_PATH/sources.list.$ARCHITECTURE
+fi
diff --git a/scripts/generate_buildinfo_config.sh b/scripts/generate_buildinfo_config.sh
index fe7657a6b6c9..080e6a321a6b 100755
--- a/scripts/generate_buildinfo_config.sh
+++ b/scripts/generate_buildinfo_config.sh
@@ -8,3 +8,4 @@ mkdir -p $BUILDINFO_PATH/buildinfo/config
 
 echo "PACKAGE_URL_PREFIX=$PACKAGE_URL_PREFIX" > $BUILDINFO_CONFIG
 echo "SONIC_VERSION_CONTROL_COMPONENTS=$SONIC_VERSION_CONTROL_COMPONENTS" >> $BUILDINFO_CONFIG
+echo "export MIRROR_SNAPSHOT=$MIRROR_SNAPSHOT" >> $BUILDINFO_CONFIG
diff --git a/scripts/prepare_docker_buildinfo.sh b/scripts/prepare_docker_buildinfo.sh
index d2b2c57185d1..f39fe711dd48 100755
--- a/scripts/prepare_docker_buildinfo.sh
+++ b/scripts/prepare_docker_buildinfo.sh
@@ -22,6 +22,10 @@ if [ -z "$DISTRO" ]; then
     [ -z "$DISTRO" ] && DISTRO=jessie
 fi
 
+if [[ "$IMAGENAME" == sonic-slave-* ]] || [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then
+    scripts/build_mirror_config.sh ${DOCKERFILE_PATH} $ARCH $DISTRO
+fi
+
 # add script for reproducible build. using sha256 instead of tag for docker base image.
 scripts/docker_version_control.sh $@
 
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index a20684e97bb4..d4127dece932 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -475,12 +475,13 @@ def filter(self, ctypes=[]):
             module.filter(ctypes=ctypes)
 
     def get_default_module(self):
-        if DEFAULT_MODULE in self.modules:
-            return self.modules[DEFAULT_MODULE]
+        default_module = self.modules.get(DEFAULT_MODULE, VersionModule(DEFAULT_MODULE, []))
         ctypes = self.get_component_types()
         dists = self.get_dists()
         components = []
         for ctype in ctypes:
+            if ctype in DEFAULT_OVERWRITE_COMPONENTS:
+                continue
             if ctype == 'deb':
                 for dist in dists:
                     versions = self._get_versions(ctype, dist)
@@ -492,7 +493,9 @@ def get_default_module(self):
                 common_versions = self._get_common_versions(versions)
                 component = Component(common_versions, ctype)
                 components.append(component)
-        return VersionModule(DEFAULT_MODULE, components)
+        module = VersionModule(DEFAULT_MODULE, components)
+        module.overwrite(default_module, True, True)
+        return module
 
     def get_aggregatable_modules(self):
         modules = {}
diff --git a/slave.mk b/slave.mk
index 3c4ad1065137..9d416f4f1ae9 100644
--- a/slave.mk
+++ b/slave.mk
@@ -75,6 +75,7 @@ export IMAGE_DISTRO
 export IMAGE_DISTRO_DEBS_PATH
 export MULTIARCH_QEMU_ENVIRON
 export DOCKER_BASE_ARCH
+export MIRROR_SNAPSHOT
 
 ###############################################################################
 ## Utility rules
@@ -125,6 +126,8 @@ export TRUSTED_GPG_URLS
 export SONIC_VERSION_CONTROL_COMPONENTS
 DEFAULT_CONTAINER_REGISTRY := $(SONIC_DEFAULT_CONTAINER_REGISTRY)
 export DEFAULT_CONTAINER_REGISTRY
+export MIRROR_URLS
+export MIRROR_SECURITY_URLS
 
 ifeq ($(SONIC_ENABLE_PFCWD_ON_START),y)
 ENABLE_PFCWD_ON_START = y
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index c782f3cb9b73..a74b66b1b95b 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -12,39 +12,7 @@ FROM {{ prefix }}debian:buster
 MAINTAINER gulv@microsoft.com
 
 COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
-
-RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
-
-{%- if CONFIGURED_ARCH == "armhf" %}
-RUN echo "deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb [arch=armhf] http://ftp.debian.org/debian buster-backports main' >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
-{%- elif CONFIGURED_ARCH == "arm64" %}
-RUN echo "deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://security.debian.org buster/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb [arch=arm64] http://ftp.debian.org/debian buster-backports main' >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security buster_updates main contrib non-free" >> /etc/apt/sources.list
-{%- endif %}
+COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index d0e57307959a..bbdb1364507f 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -10,40 +10,7 @@ FROM {{ prefix }}debian:stretch
 MAINTAINER gulv@microsoft.com
 
 COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
-
-RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian stretch-backports main" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=amd64] http://packages.microsoft.com/debian/9/prod stretch main" >> /etc/apt/sources.list
-
-{%- if CONFIGURED_ARCH == "armhf" %}
-RUN echo "deb [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=armhf] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb [arch=armhf] http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=armhf] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list
-{%- elif CONFIGURED_ARCH == "arm64" %}
-RUN echo "deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb-src [arch=arm64] http://security.debian.org stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb [arch=arm64] http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian stretch-updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo "deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security stretch_updates main contrib non-free" >> /etc/apt/sources.list
-{%- endif %}
+COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index 4c94eaf0aa4e..ba40bafd36dd 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -11,7 +11,7 @@ POST_VERSION_PATH=$BUILDINFO_PATH/post-versions
 VERSION_DEB_PREFERENCE=$BUILDINFO_PATH/versions/01-versions-deb
 WEB_VERSION_FILE=$VERSION_PATH/versions-web
 BUILD_WEB_VERSION_FILE=$BUILD_VERSION_PATH/versions-web
-REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/debian'
+REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/'
 DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
 
 . $BUILDINFO_PATH/config/buildinfo.config
@@ -72,14 +72,39 @@ set_reproducible_mirrors()
 {
     # Remove the charater # in front of the line if matched
     local expression="s/^#\(.*$REPR_MIRROR_URL_PATTERN\)/\1/"
+    # Add the character # in front of the line, if not match the URL pattern condition
+    local expression2="/^#*deb.*$REPR_MIRROR_URL_PATTERN/! s/^#*deb/#&/"
+    local expression3="\$a#SET_REPR_MIRRORS"
     if [ "$1" = "-d" ]; then
         # Add the charater # in front of the line if match
         expression="s/^deb.*$REPR_MIRROR_URL_PATTERN/#\0/"
+        # Remove the character # in front of the line, if not match the URL pattern condition
+        expression2="/^#*deb.*$REPR_MIRROR_URL_PATTERN/! s/^#(#*deb)/\1/"
+        expression3="/#SET_REPR_MIRRORS/d"
     fi
 
     local mirrors="/etc/apt/sources.list $(find /etc/apt/sources.list.d/ -type f)"
     for mirror in $mirrors; do
+        if ! grep -iq "$REPR_MIRROR_URL_PATTERN" "$mirror"; then
+            continue
+        fi
+
+        # Make sure no duplicate operations on the mirror config file
+        if ([ "$1" == "-d" ] && ! grep -iq "#SET_REPR_MIRRORS" "$mirror") ||
+           ([ "$1" != "-d" ] && grep -iq "#SET_REPR_MIRRORS" "$mirror"); then
+            continue
+        fi
+
+        # Enable or disable the reproducible mirrors
         $SUDO sed -i "$expression" "$mirror"
+
+        # Enable or disable the none reproducible mirrors
+        if [ "$MIRROR_SNAPSHOT" == y ]; then
+            $SUDO sed -ri "$expression2" "$mirror"
+        fi
+
+        # Add or remove the SET_REPR_MIRRORS flag
+        $SUDO sed -i "$expression3" "$mirror"
     done
 }
 
@@ -313,6 +338,9 @@ update_version_file()
 update_version_files()
 {
     local version_names="versions-deb versions-py2 versions-py3"
+    if [ "$MIRROR_SNAPSHOT" == y ]; then
+        version_names="versions-py2 versions-py3"
+    fi
     for version_name in $version_names; do
         update_version_file $version_name
     done
diff --git a/src/sonic-build-hooks/scripts/collect_version_files b/src/sonic-build-hooks/scripts/collect_version_files
index a4b33eeaa897..3fcc99a87106 100755
--- a/src/sonic-build-hooks/scripts/collect_version_files
+++ b/src/sonic-build-hooks/scripts/collect_version_files
@@ -18,6 +18,13 @@ dpkg-query -W -f '${Package}==${Version}\n' >> "${TARGET_PATH}/versions-deb-${DI
 ## Add the the packages purged
 [ -f $POST_VERSION_PATH/purge-versions-deb ] && cat $POST_VERSION_PATH/purge-versions-deb >> "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
 
+## Add mirror versions
+while read -r line; do
+    mirror=$(echo "$line" | sed "s/.*\///" | sed "s/_InRelease.*//")
+    date=$(date --date="$(echo "$line" | cut -d: -f3-)" +%Y-%m-%dT%H:%M:%SZ)
+    echo "$mirror==$date" >> ${TARGET_PATH}/versions-mirror
+done < <(grep Date: /var/lib/apt/lists/*_InRelease 2>/dev/null)
+
 ## Print the unique and sorted result
 sort -u "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-deb-${DIST}-${ARCH}"
 if [ -e "${TARGET_PATH}/versions-py2-${DIST}-${ARCH}" ]; then
@@ -26,5 +33,8 @@ fi
 if [ -e "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" ]; then
     sort -u "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}" -o "${TARGET_PATH}/versions-py3-${DIST}-${ARCH}"
 fi
+if [ -e "${TARGET_PATH}/versions-mirror" ]; then
+    sort -u "${TARGET_PATH}/versions-mirror" -o "${TARGET_PATH}/versions-mirror"
+fi
 
 exit 0

From 1f3da955b96162ceed2bcd31b52a63cbad23bed4 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:10:01 +0800
Subject: [PATCH 1621/1674] [S6100] Improve S6100 serial-getty monitor, wait
 and re-check when getty not running to avoid false alert. (#14402) (#14755)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[S6100] Improve S6100 serial-getty monitor, wait and re-check when getty not running to avoid false alert.

This is cherry-pick PR for: https://github.com/sonic-net/sonic-buildimage/pull/14402

#### Why I did it
On S6100, the serial-getty service some time can't auto-restart by systemd. So there is a monit unit to check serial-getty service status and restart it.

However, this monit will report false alert, because in most case when serial-getty not running, systemd can restart it successfully.

To avoid the false alert, improve the monitor to wait and re-check.

Steps to reproduce this issue:
1. User login to device via console, and keep the connection.
2. User login to device via SSH, check the serial-getty@ttyS1.service service, it's running.
3. Run 'monit reload' from SSH connection.
4. Check syslog 1 minutes later, there will be false alert: ' 'serial-getty' process is not running'

##### Work item tracking
- Microsoft ADO :17424426

#### How I did it
Add check-getty.sh script to recheck again later when getty service not running.
And update monit unit to check serial-getty service status with this script to avoid false alert.

#### How to verify it
Pass all UT.
Manually check fixed code work correctly:


```
admin@***:~$ sudo systemctl stop  serial-getty@ttyS1.service
admin@***:~$ sudo /usr/local/bin/check-getty.sh 
admin@***:~$ echo $?
1
admin@***:~$ sudo systemctl status serial-getty@ttyS1.service
● serial-getty@ttyS1.service - Serial Getty on ttyS1
     Loaded: loaded (/lib/systemd/system/serial-getty@.service; enabled-runtime; vendor preset: enabled)
     Active: inactive (dead) since Tue 2023-03-28 07:15:21 UTC; 1min 13s ago

admin@***:~$ sudo /usr/local/bin/check-getty.sh 
admin@***:~$ echo $?
0
admin@***:~$ sudo systemctl status serial-getty@ttyS1.service
● serial-getty@ttyS1.service - Serial Getty on ttyS1
     Loaded: loaded (/lib/systemd/system/serial-getty@.service; enabled-runtime; vendor preset: enabled)
```

syslog:
```
Mar 28 07:10:37.597458 *** INFO systemd[1]: serial-getty@ttyS1.service: Succeeded.
Mar 28 07:12:43.010550 *** ERR monit[593]: 'serial-getty' status failed (1) -- no output
Mar 28 07:12:43.010744 *** INFO monit[593]: 'serial-getty' trying to restart
Mar 28 07:12:43.010846 *** INFO monit[593]: 'serial-getty' stop: '/bin/systemctl stop serial-getty@ttyS1.service'
Mar 28 07:12:43.132172 *** INFO monit[593]: 'serial-getty' start: '/bin/systemctl start serial-getty@ttyS1.service'
Mar 28 07:13:43.286276 *** INFO monit[593]: 'serial-getty' status succeeded (0) -- no output
```

#### Tested branch (Please provide the tested image version)

- [x] 20201231.77

#### Description for the changelog
[S6100] Improve S6100 serial-getty monitor.
---
 .../debian/platform-modules-s6100.install       |  1 +
 .../s6100/scripts/check-getty.sh                | 17 +++++++++++++++++
 .../s6100/scripts/s6100_serial_getty_monitor    |  3 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/check-getty.sh

diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
index 512e0529455e..5bae3b607c53 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
@@ -14,6 +14,7 @@ s6100/scripts/soft-reboot_plugin usr/share/sonic/device/x86_64-dell_s6100_c2538-
 s6100/scripts/ssd-fw-upgrade usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
 s6100/scripts/override.conf /etc/systemd/system/systemd-reboot.service.d
 s6100/scripts/s6100_serial_getty_monitor etc/monit/conf.d
+s6100/scripts/check-getty.sh usr/local/bin
 common/dell_lpc_mon.sh usr/local/bin
 s6100/scripts/s6100_ssd_mon.sh usr/local/bin
 s6100/scripts/s6100_ssd_upgrade_status.sh usr/local/bin
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/check-getty.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/check-getty.sh
new file mode 100755
index 000000000000..9c6412eddf0b
--- /dev/null
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/check-getty.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+RETRY=0
+while [ $RETRY -lt 5 ]; do
+    let RETRY=$RETRY+1
+
+    /bin/systemctl --quiet is-active serial-getty@ttyS1.service
+    status=$?
+    if [ $status == 0 ]; then
+        exit 0
+    fi
+
+    # when serial-getty not running, recheck later, beause systemd will restart serial-getty automatically.
+    sleep 1
+done
+
+exit 1
\ No newline at end of file
diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor
index 1b5d0c90db37..f57ae3679016 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor
+++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_serial_getty_monitor
@@ -1,4 +1,5 @@
 #Dell S6100 serial getty monitor
-check process serial-getty matching "ttyS"
+check program serial-getty with path /usr/local/bin/check-getty.sh
 start program = "/bin/systemctl start serial-getty@ttyS1.service"
 stop program = "/bin/systemctl stop serial-getty@ttyS1.service"
+if status != 0 then restart
\ No newline at end of file

From a46c6152606cfa842914f3c749781a7779a5c9bd Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 26 Apr 2023 17:46:45 +0800
Subject: [PATCH 1622/1674] [ci] Remove innovium in upgrate version pipeline.
 (#14842)

Why I did it
Innovium platform has build issue.
Remove it from upgrade version pipeline.

Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index e1931b1ee3b5..1caf9f8aaa8d 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -33,7 +33,6 @@ parameters:
     - barefoot
     - centec
     - generic
-    - innovium
     - mellanox
     - nephos
     - centec-arm64

From 8c740555aeaef1e657468f5b1fe26fb4e9a50932 Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Fri, 24 Feb 2023 10:08:04 -0800
Subject: [PATCH 1623/1674] [Arista] Disable SSD NCQ on Lodoga (#13964)

Why I did it
Fix similar issue seen on #13739 but only for DCS-7050CX3-32S

How I did it
Add a kernel parameter to tell libata to disable NCQ

How to verify it
The message ata2.00: FORCE: horkage modified (noncq) should appear on the dmesg.

Test results using: fio --direct=1 --rw=randrw --bs=64k --ioengine=libaio --iodepth=64 --runtime=120 --numjobs=4

with NCQ

   READ: bw=26.1MiB/s (27.4MB/s), 26.1MiB/s-26.1MiB/s (27.4MB/s-27.4MB/s), io=3136MiB (3288MB), run=120053-120053msec
  WRITE: bw=26.3MiB/s (27.6MB/s), 26.3MiB/s-26.3MiB/s (27.6MB/s-27.6MB/s), io=3161MiB (3315MB), run=120053-120053msec
without NCQ

   READ: bw=22.0MiB/s (23.1MB/s), 22.0MiB/s-22.0MiB/s (23.1MB/s-23.1MB/s), io=2647MiB (2775MB), run=120069-120069msec
  WRITE: bw=22.2MiB/s (23.3MB/s), 22.2MiB/s-22.2MiB/s (23.3MB/s-23.3MB/s), io=2665MiB (2795MB), run=120069-120069msec
---
 files/Aboot/boot0.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 8b98d5e4b14b..383a02cfda9e 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -517,6 +517,7 @@ write_platform_specific_cmdline() {
     if [ "$sid" = "Lodoga" ]; then
         aboot_machine=arista_7050cx3_32s
         cmdline_add logs_inram=on
+        cmdline_add libata.force=2.00:noncq
     fi
     if [ "$sid" = "Marysville" ]; then
         aboot_machine=arista_7050sx3_48yc8

From 4a74a02be95d4ba4f34976a1fbab7ee8581ef370 Mon Sep 17 00:00:00 2001
From: mssonicbld <sonicbld@microsoft.com>
Date: Sat, 29 Apr 2023 05:46:15 +0000
Subject: [PATCH 1624/1674] [ci/build]: Upgrade SONiC package versions

---
 .../versions-deb-buster                       |  2 --
 .../versions-deb-buster-arm64                 |  4 ---
 .../versions-py2-all-arm64                    |  2 --
 .../versions-py3-all-arm64                    |  4 ---
 files/build/versions/default/versions-git     |  4 +--
 files/build/versions/default/versions-mirror  | 20 +++++++-------
 files/build/versions/default/versions-web     |  3 ---
 .../docker-base-buster/versions-deb-buster    |  4 +--
 .../docker-sonic-mgmt-framework/versions-py3  |  6 ++---
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 .../docker-syncd-bfn/versions-deb-buster      |  4 +--
 .../docker-syncd-invm/versions-deb-buster     | 27 -------------------
 .../sonic-slave-buster/versions-deb-buster    |  8 +++---
 .../versions/host-image/versions-deb-buster   |  7 +++--
 files/build/versions/host-image/versions-py3  |  2 +-
 15 files changed, 28 insertions(+), 71 deletions(-)
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/dockers/docker-syncd-invm/versions-deb-buster

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index cac70fe97fcb..8b08a1d71df4 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,8 +1,6 @@
 applibs==1.mlnx.4.5.3196
 applibs-dev==1.mlnx.4.5.3196
 bfnplatform==1.0.0
-innovium-sai==0.107.8
-innovium-sai-headers==0.107.8
 iproute2-dev==1.mlnx.4.5.3196
 isc-dhcp-relay==4.4.1-2.3+deb11u1
 kernel-mft-dkms==4.21.0-100
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
index 1be11bdfd522..57aad7a71092 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
@@ -1,5 +1 @@
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-arm64==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
deleted file mode 100644
index c7b43db04ec2..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
+++ /dev/null
@@ -1,2 +0,0 @@
-ipaddress==1.0.23
-lxml==4.9.1
\ No newline at end of file
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
deleted file mode 100644
index ba7074b371e2..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
+++ /dev/null
@@ -1,4 +0,0 @@
-bitarray==1.5.3
-lxml==4.9.1
-requests==2.28.2
-urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 2a2d66c4bf2b..6f0bd6939341 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d6cb8fa70c61b13dd2341c220fafdd1db2c30fe
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==ce9bc414c07595cb36956a74ed290e73fee5c699
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==ae3d577fc497388d1dd75987fe131c1ad02c01d6
+https://github.com/sflow/host-sflow==ca2631f867668092c5dc54754581ce2b9da04950
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
index 2d9d9d249181..4e0800918345 100644
--- a/files/build/versions/default/versions-mirror
+++ b/files/build/versions/default/versions-mirror
@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230420T000327Z
-debian-security==20230420T000140Z
-download.docker.com_linux_debian_dists_buster==2023-04-17T19:08:10Z
+debian==20230428T000204Z
+debian-security==20230428T000203Z
+download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230420T000140Z_dists_buster_updates==2023-04-19T23:04:41Z
-packages.trafficmanager.net_snapshot_debian-security_20230420T000140Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster-backports==2023-04-19T20:11:39Z
-packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_buster-updates==2023-04-19T20:11:40Z
-packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230420T000327Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
+packages.trafficmanager.net_snapshot_debian-security_20230428T000203Z_dists_buster_updates==2023-04-24T21:13:10Z
+packages.trafficmanager.net_snapshot_debian-security_20230428T000203Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster-backports==2023-04-27T20:17:38Z
+packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster-updates==2023-04-27T20:17:38Z
+packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 155696fd3f61..d3ee9979d80c 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -31,9 +31,6 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.6.3-1_arm64.deb==4121f09fbc5319cd488b832d72287f93
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1d6f741f3846f0725bd6f507d84164b
-https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==6c152660b57784a974b82d05c18cf51e
-https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==f6f1e7c4359ac921b2e26375d2c34382
 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC-rel-13_2010_3196-EVB.mfa==3188bdd7b67e8f7f910b043a30605b2d
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.3196/fw-SPC2-rel-29_2010_3196-EVB.mfa==8ca33224c84c249c028ae605f0d32f00
diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
index f0383bd4ab76..157ce34ade2f 100644
--- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
@@ -1,9 +1,9 @@
 ca-certificates==20200601~deb10u2
-curl==7.64.0-4+deb10u5
+curl==7.64.0-4+deb10u6
 jq==1.5+dfsg-2+b1
 less==487-0.1+b1
 libatomic1==8.3.0-6
-libcurl4==7.64.0-4+deb10u5
+libcurl4==7.64.0-4+deb10u6
 libdaemon0==0.14-7
 libdbus-1-3==1.12.24-0+deb10u1
 libestr0==0.1.10-2.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
index 87bb0e27408b..b933abf6ced1 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -4,11 +4,11 @@ charset-normalizer==3.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.2.3
+flask==2.2.4
 grpcio==1.54.0
 grpcio-tools==1.20.0
 idna==3.4
-importlib-metadata==6.5.0
+importlib-metadata==6.6.0
 importlib-resources==5.12.0
 inflection==0.5.1
 itsdangerous==2.1.2
@@ -22,7 +22,7 @@ pkgutil_resolve_name==1.3.10
 protobuf==4.22.3
 pyrsistent==0.19.3
 python-dateutil==2.6.0
-requests==2.28.2
+requests==2.29.0
 rfc3339-validator==0.1.4
 six==1.11.0
 typing_extensions==4.5.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index bd11194bcc5a..06e545519708 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -9,7 +9,7 @@ netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
 pyroute2==0.5.14
-requests==2.28.2
+requests==2.29.0
 scapy==2.4.4
 tabulate==0.9.0
 urllib3==1.26.15
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index a24b073f8f39..531b0806e4ce 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -3,8 +3,8 @@ bfnsdk==1.0.0
 libc-ares2==1.14.0-1+deb10u2
 libc-dev-bin==2.28-10+deb10u2
 libc6-dev==2.28-10+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u5
-libcurl4-gnutls-dev==7.64.0-4+deb10u5
+libcurl3-gnutls==7.64.0-4+deb10u6
+libcurl4-gnutls-dev==7.64.0-4+deb10u6
 libgoogle-perftools4==2.7-1
 libicu63==63.1-6+deb10u3
 liblzma-dev==5.2.4-1+deb10u1
diff --git a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
deleted file mode 100644
index 39b1e6f3ab77..000000000000
--- a/files/build/versions/dockers/docker-syncd-invm/versions-deb-buster
+++ /dev/null
@@ -1,27 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-innovium-sai==0.107.8
-innovium-sai-headers==0.107.8
-libbabeltrace1==1.5.6-2+deb10u1
-libbsd0==0.9.1-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libglib2.0-0==2.58.3-2+deb10u4
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libpopt0==1.16-12
-libsaimetadata==1.0.0
-libsaimetadata-dbg==1.0.0
-libsairedis==1.0.0
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-libunwind8==1.2.1-10~deb10u1
-libyaml-0-2==0.2.1-1
-libyaml-dev==0.2.1-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-syncd==1.0.0
-syncd-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index c878153cdc84..1105489c9654 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -58,7 +58,7 @@ cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cppcheck==1.86-1
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u5
+curl==7.64.0-4+deb10u6
 dbus==1.12.24-0+deb10u1
 dbus-user-session==1.12.24-0+deb10u1
 dconf-gsettings-backend==0.30.1-2
@@ -398,9 +398,9 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13
 libcups2==2.2.10-6+deb10u6
 libcupsfilters1==1.21.6-5
 libcupsimage2==2.2.10-6+deb10u6
-libcurl3-gnutls==7.64.0-4+deb10u5
-libcurl4==7.64.0-4+deb10u5
-libcurl4-openssl-dev==7.64.0-4+deb10u5
+libcurl3-gnutls==7.64.0-4+deb10u6
+libcurl4==7.64.0-4+deb10u6
+libcurl4-openssl-dev==7.64.0-4+deb10u6
 libdaemon-dev==0.14-7
 libdaemon0==0.14-7
 libdata-dump-perl==1.23-1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index dd1a10263931..bf56c0bc238a 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -19,7 +19,7 @@ cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
-curl==7.64.0-4+deb10u5
+curl==7.64.0-4+deb10u6
 dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
@@ -67,7 +67,6 @@ ifmetric==0.3-5
 ifupdown2==1.2.8-1
 initramfs-tools==0.133
 initramfs-tools-core==0.133
-innovium-platform-driver==0.107.8
 ipmitool==1.8.18-6+deb10u1
 iproute2==4.20.0-2+deb10u1
 iptables==1.8.2-4
@@ -101,8 +100,8 @@ libcap2-bin==1:2.25-2
 libcc1-0==8.3.0-6
 libcgroup1==0.41-8.1
 libcryptsetup12==2:2.1.0-5+deb10u2
-libcurl3-gnutls==7.64.0-4+deb10u5
-libcurl4==7.64.0-4+deb10u5
+libcurl3-gnutls==7.64.0-4+deb10u6
+libcurl4==7.64.0-4+deb10u6
 libdbd-sqlite3-perl==1.62-3
 libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.24-0+deb10u1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index c345f5175acb..4897d6663021 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -36,7 +36,7 @@ python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
 regex==2022.10.31
-requests==2.28.2
+requests==2.29.0
 scapy==2.4.4
 six==1.16.0
 tabulate==0.9.0

From 99a8ad7d0dcb39e01718047943b0506c4486d662 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 30 Apr 2023 18:46:57 +0800
Subject: [PATCH 1625/1674] [ci/build]: Upgrade SONiC package versions (#14893)

---
 .../versions-deb-buster-armhf                  |  4 ++++
 .../versions-py2-all-armhf                     |  2 ++
 .../versions-py3-all-armhf                     |  4 ++++
 files/build/versions/default/versions-mirror   | 18 +++++++++---------
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index a83790c30ddf..72e55bfa8606 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1 +1,5 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
new file mode 100644
index 000000000000..c7b43db04ec2
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
@@ -0,0 +1,2 @@
+ipaddress==1.0.23
+lxml==4.9.1
\ No newline at end of file
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
new file mode 100644
index 000000000000..ae6b46912ac6
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
@@ -0,0 +1,4 @@
+bitarray==1.5.3
+lxml==4.9.1
+requests==2.29.0
+urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
index 4e0800918345..d00c37635125 100644
--- a/files/build/versions/default/versions-mirror
+++ b/files/build/versions/default/versions-mirror
@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230428T000204Z
-debian-security==20230428T000203Z
+debian==20230429T000105Z
+debian-security==20230429T000105Z
 download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230428T000203Z_dists_buster_updates==2023-04-24T21:13:10Z
-packages.trafficmanager.net_snapshot_debian-security_20230428T000203Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster-backports==2023-04-27T20:17:38Z
-packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_buster-updates==2023-04-27T20:17:38Z
-packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230428T000204Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
+packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_buster_updates==2023-04-24T21:13:10Z
+packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster-backports==2023-04-28T20:10:36Z
+packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster-updates==2023-04-28T20:10:36Z
+packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file

From 894a9197333001d36851f6bd701f50e8c2bae2eb Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 6 May 2023 21:40:58 +0800
Subject: [PATCH 1626/1674] [ci/build]: Upgrade SONiC package versions (#14973)

---
 .../versions-deb-buster-arm64                 |  4 +++
 .../versions-deb-buster-armhf                 |  4 ---
 ...s-py2-all-armhf => versions-py2-all-arm64} |  0
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 .../versions-py3-all-arm64                    |  3 ++
 .../versions-py3-all-armhf                    |  4 ---
 files/build/versions/default/versions-docker  | 12 ++++----
 files/build/versions/default/versions-git     |  6 ++--
 files/build/versions/default/versions-mirror  | 20 ++++++-------
 .../versions-deb-buster                       |  2 +-
 .../versions-deb-buster-arm64                 |  4 +--
 .../versions-deb-buster-armhf                 |  4 +--
 .../docker-config-engine-buster/versions-py3  |  2 +-
 .../dockers/docker-lldp/versions-deb-buster   |  2 +-
 .../docker-orchagent/versions-deb-buster      |  2 +-
 .../versions-deb-buster                       |  4 +--
 .../versions/dockers/docker-ptf/versions-py2  |  3 +-
 .../versions-deb-buster                       |  2 +-
 .../dockers/docker-snmp/versions-deb-buster   |  2 +-
 .../versions/dockers/docker-snmp/versions-py3 |  2 +-
 .../versions-deb-buster                       |  4 +--
 .../docker-sonic-mgmt-framework/versions-py3  |  6 ++--
 .../docker-sonic-vs/versions-deb-buster       |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  4 +--
 .../docker-syncd-bfn/versions-deb-buster      |  4 +--
 .../docker-syncd-brcm-rpc/versions-deb-buster |  2 +-
 .../docker-syncd-brcm/versions-deb-buster     |  2 +-
 .../versions-deb-buster                       |  4 +--
 .../docker-syncd-mlnx/versions-deb-buster     |  4 +--
 .../sonic-slave-buster/versions-deb-buster    | 28 +++++++++----------
 .../versions-deb-buster-armhf                 |  2 +-
 .../dockers/sonic-slave-buster/versions-py3   |  2 +-
 .../versions/host-image/versions-deb-buster   |  8 +++---
 .../host-image/versions-deb-buster-arm64      |  4 +--
 .../host-image/versions-deb-buster-armhf      |  4 +--
 files/build/versions/host-image/versions-py3  |  6 ++--
 36 files changed, 84 insertions(+), 86 deletions(-)
 rename files/build/versions/build/build-sonic-slave-buster/{versions-py2-all-armhf => versions-py2-all-arm64} (100%)
 create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
index 57aad7a71092..1be11bdfd522 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64
@@ -1 +1,5 @@
+libnl-3-200==3.5.0-1
+libnl-3-dev==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-arm64==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
index 72e55bfa8606..a83790c30ddf 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf
@@ -1,5 +1 @@
-libnl-3-200==3.5.0-1
-libnl-3-dev==3.5.0-1
-libnl-route-3-200==3.5.0-1
-libnl-route-3-dev==3.5.0-1
 linux-headers-4.19.0-12-2-armmp==4.19.152-1
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
similarity index 100%
rename from files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf
rename to files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 4d7984700d40..1ab0bd8899f1 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,6 +1,6 @@
 charset-normalizer==3.1.0
 click==7.0
-docker==6.0.1
+docker==6.1.0
 ijson==2.6.1
 ipaddress==1.0.23
 jsondiff==2.0.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
new file mode 100644
index 000000000000..693f98a4b850
--- /dev/null
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
@@ -0,0 +1,3 @@
+bitarray==1.5.3
+lxml==4.9.1
+requests==2.30.0
\ No newline at end of file
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
deleted file mode 100644
index ae6b46912ac6..000000000000
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
+++ /dev/null
@@ -1,4 +0,0 @@
-bitarray==1.5.3
-lxml==4.9.1
-requests==2.29.0
-urllib3==1.26.15
\ No newline at end of file
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
index 0e1f3fdda018..e11a8614132b 100644
--- a/files/build/versions/default/versions-docker
+++ b/files/build/versions/default/versions-docker
@@ -1,10 +1,10 @@
-amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169
+amd64:amd64/debian:buster==sha256:ebc58102f66492508f6d0f0c5164978afbe27f4a69bd3431ed8bb015c82a8b80
 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
-amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+amd64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43
-arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+arm64:arm64v8/debian:buster==sha256:4db99637cd48a7181532cbd61a0da9295ae135ac590f1948fea5cd7c9acfab0b
+arm64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1
-armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+armhf:arm32v7/debian:buster==sha256:9606bc9689ace2b3958d23babcf39a7bbcbebdc3ff99b9050014558273a95e4a
+armhf:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
\ No newline at end of file
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 6f0bd6939341..48c24da04cbe 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==ce9bc414c07595cb36956a74ed290e73fee5c699
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==7ee8e6c7cb54a9f6ece482f92d055e3e1ba3cfbe
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,11 +9,11 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==ca2631f867668092c5dc54754581ce2b9da04950
+https://github.com/sflow/host-sflow==b6894f9bbd11de2859540019b50a3798e25ced18
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1a94f4dc97f1c8bcaf848117eb4477ed1a987a93
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
index d00c37635125..c59b1e676ca1 100644
--- a/files/build/versions/default/versions-mirror
+++ b/files/build/versions/default/versions-mirror
@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230429T000105Z
-debian-security==20230429T000105Z
-download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z
+debian==20230505T000129Z
+debian-security==20230506T000150Z
+download.docker.com_linux_debian_dists_buster==2023-05-05T22:30:53Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_buster_updates==2023-04-24T21:13:10Z
-packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster-backports==2023-04-28T20:10:36Z
-packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_buster-updates==2023-04-28T20:10:36Z
-packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
+packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_buster_updates==2023-05-05T20:32:39Z
+packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster-backports==2023-05-04T20:18:11Z
+packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster-updates==2023-05-04T20:18:11Z
+packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
index fa9b1df2e0e0..2b152acbf649 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
@@ -42,7 +42,7 @@ libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python3-dev==3.7.3-1
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
index cebc4572f178..97242e31d245 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u5
-libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
+libxml2-dev==2.9.4+dfsg1-7+deb10u6
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
index 094a0ed6f29b..bf76e3ccb71b 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libglib2.0-0==2.58.3-2+deb10u4
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u5
-libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
+libxml2-dev==2.9.4+dfsg1-7+deb10u6
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 pkg-config==0.29-6
diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
index faad4632051e..f1d548a57233 100644
--- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3
+++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -8,5 +8,5 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.10.31
+regex==2023.5.5
 six==1.16.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index c66605bfb3c5..9fb9e0e8655a 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -18,7 +18,7 @@ libsnmp-base==5.7.3+dfsg-5
 libsnmp30==5.7.3+dfsg-5
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
 lldpd==1.0.4-1
 lldpd-dbgsym==1.0.4-1
 mariadb-common==1:10.3.38-0+deb10u1
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
index c658791e2e24..ed2844fafbcc 100644
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -53,7 +53,7 @@ libswsscommon-dbg==1.0.0
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 make==4.2.1-1.2
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index 92ce127c9e42..7b1d96f3c0ad 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -94,9 +94,9 @@ libxcb-shm0==1.13.1-2
 libxcb1==1.13.1-2
 libxdmcp6==1:1.1.2-3
 libxext6==2:1.3.3-1+b2
-libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
 libxrender1==1:0.9.10-1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 lm-sensors==1:3.5.0-3
 lm-sensors-dbgsym==1:3.5.0-3
 make==4.2.1-1.2
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
index 422772114bed..dc5b23ab2f49 100644
--- a/files/build/versions/dockers/docker-ptf/versions-py2
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -35,7 +35,6 @@ prompt-toolkit==1.0.18
 protobuf==3.6.1
 ptf==0.9.1
 ptyprocess==0.7.0
-pyaml==21.10.1
 pybrctl==0.1.4
 pycparser==2.21
 pygments==2.5.2
@@ -43,7 +42,6 @@ pylibpcap==0.6.4
 pynacl==1.4.0
 pyro4==4.82
 pysubnettree==0.26
-pyyaml==5.4.1
 rpyc==4.1.5
 saithrift==0.9
 scandir==1.10.0
@@ -60,6 +58,7 @@ traitlets==4.3.3
 twisted==16.0.0
 typing==3.10.0.0
 unittest-xml-reporting==2.5.2
+unknown==0.0.0
 wcwidth==0.2.6
 werkzeug==1.0.1
 yabgp==0.8.2
diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
index b1ce5bdc7e06..d3a656f99415 100644
--- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster
@@ -23,6 +23,6 @@ libsaithrift-dev==0.9.4
 libthrift-0.13.0==0.13.0-6
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 saiserver==0.9.4
 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 1121322c46c7..cd2d9ec2800a 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -47,7 +47,7 @@ libsnmp30-dbg==5.7.3+dfsg-5
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 locales==2.28-10+deb10u2
 make==4.2.1-1.2
 mariadb-common==1:10.3.38-0+deb10u1
diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
index a85e55c6c8d9..8bf91fa04763 100644
--- a/files/build/versions/dockers/docker-snmp/versions-py3
+++ b/files/build/versions/dockers/docker-snmp/versions-py3
@@ -1,4 +1,4 @@
-hiredis==2.2.2
+hiredis==2.2.3
 psutil==5.9.5
 python-arptable==0.0.2
 smbus==1.1.post2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
index 5c684434fe80..ff39e73f980e 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -48,9 +48,9 @@ libstdc++-8-dev==8.3.0-6
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
 libyang==1.0.73
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 openssh-client==1:7.9p1-10+deb10u2
 python==2.7.16-1
 python-dev==2.7.16-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
index b933abf6ced1..ee2af1ff49ce 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -4,7 +4,7 @@ charset-normalizer==3.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.2.4
+flask==2.2.5
 grpcio==1.54.0
 grpcio-tools==1.20.0
 idna==3.4
@@ -19,10 +19,10 @@ 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.3
+protobuf==4.22.4
 pyrsistent==0.19.3
 python-dateutil==2.6.0
-requests==2.29.0
+requests==2.30.0
 rfc3339-validator==0.1.4
 six==1.11.0
 typing_extensions==4.5.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index ec432c837ddf..94cbd68324e8 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -106,7 +106,7 @@ libunwind8==1.2.1-10~deb10u1
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang1==1.0.184-2
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 logrotate==3.14.0-4
 make==4.2.1-1.2
 ndisc6==1.0.4-1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 06e545519708..4a0271a84d3d 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -9,8 +9,8 @@ netifaces==0.10.9
 pexpect==4.8.0
 ptyprocess==0.7.0
 pyroute2==0.5.14
-requests==2.29.0
+requests==2.30.0
 scapy==2.4.4
 tabulate==0.9.0
-urllib3==1.26.15
+urllib3==2.0.2
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
index 531b0806e4ce..ecc15b35e609 100644
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
@@ -18,6 +18,6 @@ libunwind-dev==1.2.1-10~deb10u1
 libunwind8==1.2.1-10~deb10u1
 libusb-1.0-0==2:1.0.22-2
 libusb-1.0-0-dev==2:1.0.22-2
-libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.269-1
+libxml2==2.9.4+dfsg1-7+deb10u6
+linux-libc-dev==4.19.282-1
 syncd==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
index 96e3eb6d8628..44dcfcdb6365 100644
--- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-buster
@@ -51,7 +51,7 @@ libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
index b1fb4ad1bcb3..01f8362afd81 100644
--- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster
@@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
 libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
index 7093867a1b2d..1e293a7f6a41 100644
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
@@ -53,8 +53,8 @@ libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6
 libubsan1==8.3.0-6
 libuv1==1.24.1-1+deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.269-1
+libxml2==2.9.4+dfsg1-7+deb10u6
+linux-libc-dev==4.19.282-1
 make==4.2.1-1.2
 patch==2.7.6-3+deb10u1
 python==2.7.16-1
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 410b6546b780..5e9fd3d4e5f7 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -30,8 +30,8 @@ libsairedis==1.0.0
 libsairedis-dbg==1.0.0
 libswsscommon-dbg==1.0.0
 libunwind8==1.2.1-10~deb10u1
-libxml2==2.9.4+dfsg1-7+deb10u5
-linux-libc-dev==4.19.269-1
+libxml2==2.9.4+dfsg1-7+deb10u6
+linux-libc-dev==4.19.282-1
 mft==4.21.0-100
 mlnx-sai==1.mlnx.SAIRel1.22.0.0
 openssh-client==1:7.9p1-10+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 1105489c9654..30f16feaeba1 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.20-1
+containerd.io==1.6.21-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -83,7 +83,7 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u6
+distro-info-data==0.41+deb10u7
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
@@ -259,9 +259,9 @@ libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
 libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.7-4+deb10u1
-libavahi-common-data==0.7-4+deb10u1
-libavahi-common3==0.7-4+deb10u1
+libavahi-client3==0.7-4+deb10u2
+libavahi-common-data==0.7-4+deb10u2
+libavahi-common3==0.7-4+deb10u2
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
 libavcodec58==7:4.1.10-0+deb10u1
@@ -1276,9 +1276,9 @@ libxml-sax-perl==1.00+dfsg-1
 libxml-simple-perl==2.25-1
 libxml-twig-perl==1:3.50-1.1
 libxml-xpathengine-perl==0.14-1
-libxml2==2.9.4+dfsg1-7+deb10u5
-libxml2-dev==2.9.4+dfsg1-7+deb10u5
-libxml2-utils==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
+libxml2-dev==2.9.4+dfsg1-7+deb10u6
+libxml2-utils==2.9.4+dfsg1-7+deb10u6
 libxmlgraphics-commons-java==2.3-1+deb10u1
 libxmlrpc-lite-perl==0.717-2
 libxmu6==2:1.1.2-2+b3
@@ -1315,12 +1315,12 @@ libzvbi0==0.2.35-16
 libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
-linux-compiler-gcc-8-x86==4.19.269-1
-linux-headers-4.19.0-23-amd64==4.19.269-1
-linux-headers-4.19.0-23-common==4.19.269-1
-linux-headers-amd64==4.19+105+deb10u18
-linux-kbuild-4.19==4.19.269-1
-linux-libc-dev==4.19.269-1
+linux-compiler-gcc-8-x86==4.19.282-1
+linux-headers-4.19.0-24-amd64==4.19.282-1
+linux-headers-4.19.0-24-common==4.19.282-1
+linux-headers-amd64==4.19+105+deb10u19
+linux-kbuild-4.19==4.19.282-1
+linux-libc-dev==4.19.282-1
 linuxdoc-tools==0.9.73-2
 llvm-7==1:7.0.1-8+deb10u2
 llvm-7-dev==1:7.0.1-8+deb10u2
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
index 031f49f85175..2ac31159da88 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf
@@ -99,7 +99,7 @@ libunicode-linebreak-perl==0.0.20190101-1
 libxapian-dev==1.4.11-1+deb10u1
 libxslt1-dev==1.1.32-2.2~deb10u2
 libyaml-tiny-perl==1.73-1
-linux-compiler-gcc-8-arm==4.19.269-1
+linux-compiler-gcc-8-arm==4.19.282-1
 llvm-6.0==1:6.0.1-10
 llvm-6.0-dev==1:6.0.1-10
 llvm-6.0-runtime==1:6.0.1-10
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 65052bc56e6f..ffc14e1dc834 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -60,7 +60,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.10.31
+regex==2023.5.5
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index bf56c0bc238a..8b829e3e0eb7 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.20-1
+containerd.io==1.6.21-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -24,7 +24,7 @@ dbus==1.12.24-0+deb10u1
 device-tree-compiler==1.4.7-4
 dh-python==3.20190308
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u6
+distro-info-data==0.41+deb10u7
 dmidecode==3.2-1
 dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
@@ -231,7 +231,7 @@ libyang-cpp==1.0.73
 libzstd1==1.4.4+dfsg-3~bpo10+1
 linux-base==4.6
 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1
-linux-libc-dev==4.19.269-1
+linux-libc-dev==4.19.282-1
 locales==2.28-10+deb10u2
 logrotate==3.14.0-4
 lsb-base==10.2019051400
@@ -324,7 +324,7 @@ systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb10u10
+tzdata==2021a-0+deb10u11
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1
diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64
index f493da662270..8e5a96661c4d 100644
--- a/files/build/versions/host-image/versions-deb-buster-arm64
+++ b/files/build/versions/host-image/versions-deb-buster-arm64
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u5
-libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
+libxml2-dev==2.9.4+dfsg1-7+deb10u6
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 linux-image-4.19.0-12-2-arm64-unsigned==4.19.152-1
diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf
index ea1012bf5763..7129e583512d 100644
--- a/files/build/versions/host-image/versions-deb-buster-armhf
+++ b/files/build/versions/host-image/versions-deb-buster-armhf
@@ -3,8 +3,8 @@ icu-devtools==63.1-6+deb10u3
 libcryptsetup12==2:2.3.7-1+deb11u1~bpo10+1
 libicu-dev==63.1-6+deb10u3
 libicu63==63.1-6+deb10u3
-libxml2==2.9.4+dfsg1-7+deb10u5
-libxml2-dev==2.9.4+dfsg1-7+deb10u5
+libxml2==2.9.4+dfsg1-7+deb10u6
+libxml2-dev==2.9.4+dfsg1-7+deb10u6
 libxslt1-dev==1.1.32-2.2~deb10u2
 libxslt1.1==1.1.32-2.2~deb10u2
 linux-image-4.19.0-12-2-armmp==4.19.152-1
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 4897d6663021..7d7d7c66f082 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -35,13 +35,13 @@ python-apt==1.8.4.3
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.10.31
-requests==2.29.0
+regex==2023.5.5
+requests==2.30.0
 scapy==2.4.4
 six==1.16.0
 tabulate==0.9.0
 thrift==0.13.0
-urllib3==1.26.15
+urllib3==2.0.2
 watchdog==0.10.3
 websocket-client==1.5.1
 xmltodict==0.12.0
\ No newline at end of file

From 01a9c13af0939bc5e6d0b66c799103560400362d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 7 May 2023 19:54:08 +0800
Subject: [PATCH 1627/1674] [ci/build]: Upgrade SONiC package versions (#14975)

---
 files/build/versions/default/versions-mirror | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
index c59b1e676ca1..1a32c3ce838c 100644
--- a/files/build/versions/default/versions-mirror
+++ b/files/build/versions/default/versions-mirror
@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230505T000129Z
+debian==20230506T000200Z
 debian-security==20230506T000150Z
-download.docker.com_linux_debian_dists_buster==2023-05-05T22:30:53Z
+download.docker.com_linux_debian_dists_buster==2023-05-06T10:40:57Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
 packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_buster_updates==2023-05-05T20:32:39Z
 packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster-backports==2023-05-04T20:18:11Z
-packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_buster-updates==2023-05-04T20:18:11Z
-packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230505T000129Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
+packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster-backports==2023-05-05T20:09:53Z
+packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster-updates==2023-05-05T20:09:53Z
+packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file

From 5a6735c00446a67037487f193c6efbc9f76d2d36 Mon Sep 17 00:00:00 2001
From: Dev Ojha <47282568+developfast@users.noreply.github.com>
Date: Mon, 8 May 2023 11:56:23 -0700
Subject: [PATCH 1628/1674] [submodule] sonic-utilities submodule update
 (#14937)

#### Why I did it
sonic-utilities submodule update for 202012

```
* d20fc3c8 2023-04-07 | [202012][DBMigrator] Update db_migrator to support EdgeZoneAggregator Buffer Config for T0s (#2768) (HEAD, origin/202012) [Dev Ojha]
* 322a74dd 2023-03-27 | Resolved rc!=0 problem by replacing fgrep with awk. Added ipv4 filtering to get only v4 peers in case of show ip bgp neighbors (#2743) [saurabhab]
```

##### Work item tracking
- Microsoft ADO **(number only)**: 20782336
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index cc78747409aa..d20fc3c8721c 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit cc78747409aad52b5b2e60169691f7e6db3ca9ee
+Subproject commit d20fc3c8721c758d9a009095c682682f437e9c96

From e34c17813f4b782508c3cffb9f239fbe483e4a94 Mon Sep 17 00:00:00 2001
From: mssonicbld <sonicbld@microsoft.com>
Date: Wed, 10 May 2023 06:44:42 +0000
Subject: [PATCH 1629/1674] [ci/build]: Upgrade SONiC package versions

---
 .../build-sonic-slave-buster/versions-py3     |  2 +-
 files/build/versions/default/versions-git     |  4 ++--
 files/build/versions/default/versions-mirror  | 20 +++++++++----------
 .../docker-sonic-mgmt-framework/versions-py3  |  2 +-
 .../dockers/docker-sonic-vs/versions-py3      |  2 +-
 files/build/versions/host-image/versions-py3  |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3
index 1ab0bd8899f1..b794a7ff9e9b 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py3
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3
@@ -1,6 +1,6 @@
 charset-normalizer==3.1.0
 click==7.0
-docker==6.1.0
+docker==6.1.1
 ijson==2.6.1
 ipaddress==1.0.23
 jsondiff==2.0.0
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 48c24da04cbe..3668e197a3da 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7ee8e6c7cb54a9f6ece482f92d055e3e1ba3cfbe
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==f155639336aff1e8c3822974749ac695ec83b2b5
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==b6894f9bbd11de2859540019b50a3798e25ced18
+https://github.com/sflow/host-sflow==74f819f9695975fa9746c3e61888646d58c34ded
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
index 1a32c3ce838c..e86f48b12ed1 100644
--- a/files/build/versions/default/versions-mirror
+++ b/files/build/versions/default/versions-mirror
@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230506T000200Z
-debian-security==20230506T000150Z
-download.docker.com_linux_debian_dists_buster==2023-05-06T10:40:57Z
+debian==20230509T000212Z
+debian-security==20230509T000551Z
+download.docker.com_linux_debian_dists_buster==2023-05-08T10:44:31Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_buster_updates==2023-05-05T20:32:39Z
-packages.trafficmanager.net_snapshot_debian-security_20230506T000150Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster-backports==2023-05-05T20:09:53Z
-packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_buster-updates==2023-05-05T20:09:53Z
-packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230506T000200Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
+packages.trafficmanager.net_snapshot_debian-security_20230509T000551Z_dists_buster_updates==2023-05-07T12:12:18Z
+packages.trafficmanager.net_snapshot_debian-security_20230509T000551Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230509T000212Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230509T000212Z_dists_buster-backports==2023-05-08T20:10:02Z
+packages.trafficmanager.net_snapshot_debian_20230509T000212Z_dists_buster-updates==2023-05-08T20:10:02Z
+packages.trafficmanager.net_snapshot_debian_20230509T000212Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230509T000212Z_dists_stretch-updates==2021-08-14T07:47:11Z
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index ee2af1ff49ce..6d98f4200523 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -19,7 +19,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.4
+protobuf==4.23.0
 pyrsistent==0.19.3
 python-dateutil==2.6.0
 requests==2.30.0
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 4a0271a84d3d..db99010d07e7 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,4 +1,4 @@
-certifi==2022.12.7
+certifi==2023.5.7
 charset-normalizer==3.1.0
 click==7.0
 idna==3.4
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 7d7d7c66f082..a2d1d21d7248 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,7 @@ azure-common==1.1.28
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-certifi==2022.12.7
+certifi==2023.5.7
 cffi==1.15.1
 charset-normalizer==3.1.0
 click==7.0

From 2b21cd5e222fac6df8b8e08321e6edf83a4eae8c Mon Sep 17 00:00:00 2001
From: Jon Goldberg <63672455+jon-nokia@users.noreply.github.com>
Date: Wed, 3 May 2023 13:26:41 -0400
Subject: [PATCH 1630/1674] [armhf][Nokia-7215] changes fstrim.timer to daily
 (#14723)

Using timer-override.conf, we modify the fstrim.timer service.

For armhf, Nokia-7215 platform, we modify fstrim.timer to run daily
instead of weekly.  This is required because the size of the SSD on
this platform is 16GB, which on average is nearly 10 times smaller than
most other sonic platforms.  With smaller disk and the ever increasing
level of logging done by sonic, this change is required to prevent
the SSD from entering a read-only state due to inadequate free blocks.
---
 .../7215/service/fstrim.timer/timer-override.conf            | 5 +++++
 .../debian/sonic-platform-nokia-7215.install                 | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf b/platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf
new file mode 100644
index 000000000000..0456c60d42b0
--- /dev/null
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf
@@ -0,0 +1,5 @@
+[Unit]
+Description=Discard unused blocks daily
+
+[Timer]
+OnCalendar=daily
diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
index ea347d79be3a..be989f05c147 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
+++ b/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install
@@ -1,6 +1,7 @@
 nokia-7215_plt_setup.sh usr/sbin
 7215/scripts/nokia-7215init.sh  usr/local/bin
 7215/service/nokia-7215init.service  etc/systemd/system
+7215/service/fstrim.timer/timer-override.conf  /lib/systemd/system/fstrim.timer.d
 7215/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0
 entropy.py etc/
 inband_mgmt.sh etc/

From a6644b2b997abb7c0456deef79c0f33d2c45b5d5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sat, 13 May 2023 02:37:00 +0800
Subject: [PATCH 1631/1674] [Build] Upgrade the python docker version (#15031)

#### Why I did it
[Build] Upgrade the python docker version to fix bgp not up issue

##### Work item tracking
- Microsoft ADO **(number only)**: 22236397
---
 build_debian.sh                                 | 2 +-
 files/build_templates/sonic_debian_extension.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 3b9056eeec69..fc5d1d999b73 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -438,7 +438,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setup
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
 
 # docker Python API package is needed by Ansible docker module as well as some SONiC applications
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==6.1.1'
 
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 23e59cdd455d..9aa19a9c3fbd 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -224,7 +224,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install thrift
 # Install system-health Python 3 package
 SYSTEM_HEALTH_PY3_WHEEL_NAME=$(basename {{system_health_py3_wheel_path}})
 sudo cp {{system_health_py3_wheel_path}} $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY3_WHEEL_NAME
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SYSTEM_HEALTH_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SYSTEM_HEALTH_PY3_WHEEL_NAME docker==6.1.1
 sudo rm -rf $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY3_WHEEL_NAME
 
 # Install prerequisites needed for installing the Python m2crypto package, used by sonic-utilities

From a55c8d7444f5e2ce4fdc65a15d32ef821e603d19 Mon Sep 17 00:00:00 2001
From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com>
Date: Fri, 12 May 2023 16:57:38 -0700
Subject: [PATCH 1632/1674] [202012] Update sonic-telemetry submodule head
 (#15048)

#### Why I did it

Update 202012 sonic-telemetry submodule head

##### Work item tracking
- Microsoft ADO **(number only)**:16208453
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 9e2ad0a07d88..7bb6f8030144 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 9e2ad0a07d8861dba6b9d95069bb79d2c065c202
+Subproject commit 7bb6f80301446416c6117f0af03a3e12dfa17757

From 4b9092991832ef986d629aab4746023b57cc6ff9 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 15 May 2023 15:39:12 +0800
Subject: [PATCH 1633/1674] [submodule] Update submodule sonic-py-swsssdk to
 the latest HEAD automatically (#15035)

Why I did it
src/sonic-py-swsssdk

* d44e0d8 - (HEAD -> 202012, origin/202012) [Security] Fix the redis security issue CVE-2023-28858 and  CVE-2023-28859 (#135) (3 days ago) [xumia]
---
 src/sonic-py-swsssdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk
index 9688ef4e0bb5..d44e0d8f00d0 160000
--- a/src/sonic-py-swsssdk
+++ b/src/sonic-py-swsssdk
@@ -1 +1 @@
-Subproject commit 9688ef4e0bb5e39c7fcd973e6f562eb09e7984ae
+Subproject commit d44e0d8f00d021c07607668a8dcb4849dda685d7

From 24b0ed30a59cda1304935729c89c7e4adb0213c3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 17 May 2023 15:33:26 +0800
Subject: [PATCH 1634/1674] [submodule] Update submodule sonic-telemetry to the
 latest HEAD automatically (#14944)

#### Why I did it
src/sonic-telemetry
```
* 6dc4bb9 - (HEAD -> 202012, origin/202012) Merge pull request #107 from zbud-msft/backport-202012 (33 hours ago) [Tomek Madejski]
* cbb7b1e - Update azp yml to generalize branch names (#106) (7 days ago) [Zain Budhwani]
```
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 7bb6f8030144..6dc4bb96e970 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 7bb6f80301446416c6117f0af03a3e12dfa17757
+Subproject commit 6dc4bb96e970df89d583fe9522ff95efa8eb6d75

From 1e0412a3bb152e913ac308f6814661910d2abf34 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 18 May 2023 01:59:28 +0800
Subject: [PATCH 1635/1674] [submodule] Update submodule linkmgrd to the latest
 HEAD automatically (#14862)

#### Why I did it
src/linkmgrd
```
* 35f7d1c - (HEAD -> 202012, origin/202012) [202012][active-standby][bsl] fix no mux probe issue #201 (#206) (2 weeks ago) [Jing Zhang]
* be701fb - [202012] pick codeql fixes (#207) (2 weeks ago) [Jing Zhang]
* 0b42cec - Enable debug symbols (#199) (3 weeks ago) [Longxiang Lyu]
```
---
 src/linkmgrd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkmgrd b/src/linkmgrd
index 01792078de69..35f7d1c257b2 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 01792078de69b3205b870074dac3a9804f3e900e
+Subproject commit 35f7d1c257b2ec62cb79a5f637c11f2dd9782cbe

From d14a094f0a11870c78ffe8a5a3670f8f0f5f3782 Mon Sep 17 00:00:00 2001
From: Anish Narsian <44376847+anish-n@users.noreply.github.com>
Date: Wed, 17 May 2023 16:13:54 -0700
Subject: [PATCH 1636/1674] Resolve neighbors from config_db (#14990)

* To resolve NEIGH table entries present in CONFIG_DB. Without this change arp/ndp entries which we wish to resolve, and configured via CONFIG_DB are not resolved.
---
 files/scripts/arp_update | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index 57f0d5a562e2..dec94b7712e0 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -85,8 +85,12 @@ while /bin/true; do
 
   # refresh neighbor entries from APP_DB in case of mismatch with kernel
   DBNEIGH=$(sonic-db-cli APPL_DB keys NEIGH_TABLE*)
-  KERNEIGH4=$(ip -4 neigh show | grep Vlan | cut -d ' ' -f 1,3  --output-delimiter=',')
-  KERNEIGH6=$(ip -6 neigh show | grep -v fe80 | grep Vlan | cut -d ' ' -f 1,3  --output-delimiter=',')
+
+  # resolve neighbor entries from CONFIG_DB in case of mismatch with kernel
+  DBNEIGH="$DBNEIGH $(sonic-db-cli CONFIG_DB keys NEIGH* | sed -e 's/|/:/g')"
+
+  KERNEIGH4=$(ip -4 neigh show | grep Vlan | grep -v 'FAILED\|INCOMPLETE' | cut -d ' ' -f 1,3  --output-delimiter=',')
+  KERNEIGH6=$(ip -6 neigh show | grep -v fe80 | grep Vlan | grep -v 'FAILED\|INCOMPLETE' | cut -d ' ' -f 1,3  --output-delimiter=',')
   for neigh in $DBNEIGH; do
       intf="$( cut -d ':' -f 2 <<< "$neigh" )"
       ip="$( cut -d ':' -f 3- <<< "$neigh" )"

From dc92a9f9067ff6d5e867b443b2fb254421c1f0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <ollivier.cedric@gmail.com>
Date: Fri, 25 Nov 2022 05:37:13 +0100
Subject: [PATCH 1637/1674] [build]: Force xz as compression type when building
 sonic-build-hooks debs (#12823)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ubuntu 22.04 leverages Zstandard compression to dpkg by default.
Debian doesn't support it yet
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892664

Fix #12822

Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 src/sonic-build-hooks/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-build-hooks/Makefile b/src/sonic-build-hooks/Makefile
index 786af9056332..b45be9dd07f6 100644
--- a/src/sonic-build-hooks/Makefile
+++ b/src/sonic-build-hooks/Makefile
@@ -21,7 +21,7 @@ DPKGTOOL = $(shell which dpkg-deb)
 ifeq ($(shell which dpkg-deb),)
 BUILD_COMMAND=docker run --user $(shell id -u):$(shell id -g) --rm -v $(shell pwd):/build debian:buster bash -c 'cd /build; dpkg-deb --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET)'
 else
-BUILD_COMMAND=dpkg-deb --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET)
+BUILD_COMMAND=dpkg-deb -Zxz --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET)
 endif
 
 DEPENDS := $(shell find scripts hooks debian -type f)

From 750263401bac6ae71b6ea526d195407ef36350d1 Mon Sep 17 00:00:00 2001
From: siqbal1986 <shahzad.iqbal@gmail.com>
Date: Thu, 18 May 2023 15:23:15 -0700
Subject: [PATCH 1638/1674] [202012] submodule update sonic-swss. (#15023)

Updated for commit:

f141880 - 2023-04-26 : [bugfix] vnet ping missing with secondary endpoints empty in priority routes. (#2736) (#2747) [siqbal1986]
---
 src/sonic-swss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-swss b/src/sonic-swss
index c1610272f2ab..f14188062520 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c1610272f2abbf947fadb6b26b0f7058c9d82ace
+Subproject commit f1418806252045043b7058972f1c87f473c6d33b

From 59b89ee7c3002381fb8157bafa22f05359d80c30 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Wed, 24 May 2023 01:27:43 +0800
Subject: [PATCH 1639/1674] [ci] Enable reproducible build for arm64 and armhf.
 (#15190)

Fix armhf and arm64 build issue.
Revert #7517. Because armhf and arm64 agents are ready.

Microsoft ADO (number only): 23765181
---
 .azure-pipelines/azure-pipelines-build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
index 06698a7abc54..79554a98717a 100644
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@@ -68,7 +68,6 @@ jobs:
           timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: arm64
-            BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
         - name: generic
           variables:
             dbg_image: yes
@@ -82,7 +81,6 @@ jobs:
           timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: armhf
-            BUILD_OPTIONS: ${{ parameters.buildOptions }} SONIC_VERSION_CONTROL_COMPONENTS=
         - name: mellanox
           variables:
             dbg_image: yes

From 978db8e9ba68dc44280104c5f416971f7a4bb799 Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Wed, 24 May 2023 10:27:04 +0800
Subject: [PATCH 1640/1674] Refine test job definition and assert logic
 (#14959)

Why I did it
Remove 'kvmtest-t0' and 'kvmtest-t1-lag' test jobs since all the test jobs are required (continueOnError: false) already, and will only enable one of classical and testbedV2 tests, no need to do an unnecessary 'or' compute test job.
Change agent pool to reduce cost and avoid congestion
---
 azure-pipelines.yml | 71 +++------------------------------------------
 1 file changed, 4 insertions(+), 67 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7b80cd5f2f9e..f4582a5e669d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -163,8 +163,7 @@ stages:
         section: part-2
 
   - job: t0_testbedv2
-    pool:
-      vmImage: 'ubuntu-20.04'
+    pool: ubuntu-20.04
     displayName: "kvmtest-t0 by TestbedV2"
     timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
@@ -178,8 +177,7 @@ stages:
         MGMT_BRANCH: 202012
 
   - job: t0_2vlans_testbedv2
-    pool:
-      vmImage: 'ubuntu-20.04'
+    pool: ubuntu-20.04
     displayName: "kvmtest-t0-2vlans by TestbedV2"
     timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
@@ -194,38 +192,6 @@ stages:
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
         MGMT_BRANCH: 202012
 
-  - job:
-    pool:
-      vmImage: 'ubuntu-20.04'
-    displayName: "kvmtest-t0"
-    dependsOn:
-    - t0_part1
-    - t0_part2
-    - t0_testbedv2
-    - t0_2vlans_testbedv2
-    condition: always()
-    variables:
-      resultOfPart1: $[ dependencies.t0_part1.result ]
-      resultOfPart2: $[ dependencies.t0_part2.result ]
-      resultOfT0TestbedV2: $[ dependencies.t0_testbedv2.result ]
-      resultOfT02VlansTestbedV2: $[ dependencies.t0_2vlans_testbedv2.result ]
-
-    steps:
-    - script: |
-        if [ $(resultOfT0TestbedV2) == "Succeeded" ] && [ $(resultOfT02VlansTestbedV2) == "Succeeded" ]; then
-          echo "TestbedV2 t0 passed."
-          exit 0
-        fi
-
-        if [ $(resultOfPart1) == "Succeeded" ] && [ $(resultOfPart2) == "Succeeded" ]; then
-          echo "Classic t0 jobs(both part1 and part2) passed."
-          exit 0
-        fi
-
-        echo "Both classic and TestbedV2 t0 jobs failed! Please check the detailed information. (Any of them passed, t0 will be considered as passed)"
-        exit 1
-
-
   - job: t1_lag_classic
     pool: sonictest-t1-lag
     displayName: "kvmtest-t1-lag classic"
@@ -241,8 +207,7 @@ stages:
         tbtype: t1-lag
 
   - job: t1_lag_testbedv2
-    pool:
-      vmImage: 'ubuntu-20.04'
+    pool: ubuntu-20.04
     displayName: "kvmtest-t1-lag by TestbedV2"
     timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
@@ -255,36 +220,8 @@ stages:
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
         MGMT_BRANCH: 202012
 
-  - job:
-    pool:
-      vmImage: 'ubuntu-20.04'
-    displayName: "kvmtest-t1-lag"
-    dependsOn:
-    - t1_lag_classic
-    - t1_lag_testbedv2
-    condition: always()
-    continueOnError: false
-    variables:
-      resultOfClassic: $[ dependencies.t1_lag_classic.result ]
-      resultOfTestbedV2: $[ dependencies.t1_lag_testbedv2.result ]
-    steps:
-    - script: |
-        if [ $(resultOfTestbedV2) == "Succeeded" ]; then
-          echo "TestbedV2 t1-lag passed."
-          exit 0
-        fi
-
-        if [ $(resultOfClassic) == "Succeeded" ]; then
-          echo "Classic t1-lag passed."
-          exit 0
-        fi
-
-        echo "Both classic and TestbedV2 t1-lag jobs failed! Please check the detailed information. (Any of them passed, t1-lag will be considered as passed)"
-        exit 1
-
   - job: dualtor_testbedv2
-    pool:
-      vmImage: 'ubuntu-20.04'
+    pool: ubuntu-20.04
     displayName: "kvmtest-dualtor-t0 by TestbedV2"
     timeoutInMinutes: 240
     condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))

From 52e33258dc7bf1cd261694586676c5dd37ac427c Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Wed, 24 May 2023 10:27:14 +0800
Subject: [PATCH 1641/1674] Refine testbedv2 template output (#14460)

---
 .../run-test-scheduler-template.yml           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index da7deff9d055..f4c82f345226 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -36,14 +36,14 @@ parameters:
 
 steps:
   - script: |
-      set -ex
+      set -e
       # always use the test plan script from master branch.
       wget -O ./.azure-pipelines/test_plan.py  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py
       wget -O ./.azure-pipelines/pr_test_scripts.yaml  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/${{ parameters.MGMT_BRANCH }}/.azure-pipelines/pr_test_scripts.yaml
     displayName: Download TestbedV2 scripts
 
   - script: |
-      set -ex
+      set -e
       pip install PyYAML
       rm -f new_test_plan_id.txt
       python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
@@ -62,10 +62,10 @@ steps:
     displayName: Trigger test
 
   - script: |
-      set -ex
+      set -e
       echo "Lock testbed"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
     env:
@@ -73,12 +73,12 @@ steps:
     displayName: Lock testbed
 
   - script: |
-      set -ex
+      set -e
       echo "Prepare testbed"
       echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)"
       echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
     env:
@@ -86,10 +86,10 @@ steps:
     displayName: Prepare testbed
 
   - script: |
-      set -ex
+      set -e
       echo "Run test"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
     env:
@@ -97,10 +97,10 @@ steps:
     displayName: Run test
 
   - script: |
-      set -ex
+      set -e
       echo "KVM dump"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
     condition: succeededOrFailed()
@@ -109,7 +109,7 @@ steps:
     displayName: KVM dump
 
   - script: |
-      set -ex
+      set -e
       echo "Try to cancel test plan $TEST_PLAN_ID, cancelling finished test plan has no effect."
       python ./.azure-pipelines/test_plan.py cancel -i "$(TEST_PLAN_ID)"
     condition: always()

From 7abddb42b0215ef70b03960a724a967d71d6a2fa Mon Sep 17 00:00:00 2001
From: kellyyeh <42761586+kellyyeh@users.noreply.github.com>
Date: Wed, 24 May 2023 16:09:38 -0700
Subject: [PATCH 1642/1674] Advance sonic-utilities submodule (#15009)

Why I did it
Advance sonic-utilities submodule head
Added below commits:
878be48e kellyyeh Wed May 10 15:21:52 2023 -0700 Revert "[warm-reboot] Use kexec_file_load instead of kexec_load when available
094513f8 Vaibhav Hemant Dixit Tue May 9 13:03:52 2023 -0700 [202012] LAG keepalive script to reduce lacp session wait during warm-reboot

Work item tracking
Microsoft ADO (number only): 23687678
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index d20fc3c8721c..878be48e38f1 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit d20fc3c8721c758d9a009095c682682f437e9c96
+Subproject commit 878be48e38f10bc52409ece52712cf3d509e894c

From 87e1a0a64531bb53e5b2811994f908f91209e940 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 25 May 2023 15:04:02 +0800
Subject: [PATCH 1643/1674] Fix error handling when failing to install a deb
 package (#11846) (#15087)

#### Why I did it
Fix endless build log issue.
Cherry pick [PR#11846](https://github.com/sonic-net/sonic-buildimage/pull/11846)
##### Work item tracking
- Microsoft ADO **(number only)**: 19299131
#### How I did it
The current error handling code for when a deb package fails to be installed currently has a chain of commands linked together by && and ends with `exit 1`. The assumption is that the commands would succeed, and the last `exit 1` would end it with a non-zero return code, thus fully failing the target and causing the build to stop because of bash's -e flag.

However, if one of the commands prior to `exit 1` returns a non-zero return code, then bash won't actually treat it as a terminating error. From bash's man page:

```
-e      Exit immediately if a pipeline (which may consist of a single simple
	command), a list, or a compound command (see SHELL GRAMMAR above),
        exits with a non-zero status.  The shell does not exit if the
        command that fails is part of the  command  list  immediately
        following a while or until keyword, part of the test following the
        if or elif reserved words, part of any command executed in a && or
        || list except the command following the final && or ||, any
        command in a pipeline but the last, or if the command's return
        value is being inverted with !.  If a compound command other than a
        subshell returns a non-zero status because a command failed while
        -e was being ignored, the shell does not exit.
```

The part `part of any command executed in a && or || list except the command following the final && or ||` says that if the failing command is not the `exit 1` that we have at the end, then bash doesn't treat it as an error and exit immediately. Additionally, since this is a compound command, but isn't in a subshell (subshell are marked by `(` and `)`, whereas `{` and `}` just tells bash to run the commands in the current environment), bash doesn't exist. The result of this is that in the deb-install target, if a package installation fails, it may be infinitely stuck in that while-loop.

There are two fixes for this: change to using a subshell, or use `;` instead of `&&`. Using a subshell would, I think, require exporting any shell variables used in the subshell, so I chose to change the `&&` to `;`. In addition, at the start of the subshell, `set +e` is added in, which removes the exit-on-error handling of bash. This makes sure that all commands are run (the output of which may help for debugging) and that it still exits with 1, which will then fully fail the target.
#### How to verify it
---
 slave.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slave.mk b/slave.mk
index 9d416f4f1ae9..4a1c6d8696dd 100644
--- a/slave.mk
+++ b/slave.mk
@@ -565,7 +565,7 @@ $(SONIC_INSTALL_DEBS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install
 			{ while dpkg -s $(firstword $(subst _, ,$(basename $(deb)))) | grep "^Version: $(word 2, $(subst _, ,$(basename $(deb))))" &> /dev/null; do echo "waiting for $(deb) to be uninstalled" $(LOG); sleep 1; done } )
 		# put a lock here because dpkg does not allow installing packages in parallel
 		if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
-			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && sudo lsof /var/lib/dpkg/lock-frontend && ps aux && exit 1 ; }
+			{ sudo DEBIAN_FRONTEND=noninteractive dpkg -i $(DEBS_PATH)/$* $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { set +e; rm -d $(DEBS_PATH)/dpkg_lock; sudo lsof /var/lib/dpkg/lock-frontend; ps aux; exit 1 ; }
 		fi
 		sleep 10
 	done

From 57ea1e89f9155257db77b15e9196c75bce4cfa00 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Thu, 25 May 2023 17:31:16 +0800
Subject: [PATCH 1644/1674] [ci] Enable kvm test when upgrading package
 versions. (#15018)

Why I did it
Run kvmtest when update package versions to avoid test break.

Work item tracking
Microsoft ADO (number only): 22335854
How I did it
How to verify it
---
 .azure-pipelines/vstest-exclude | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.azure-pipelines/vstest-exclude b/.azure-pipelines/vstest-exclude
index 71616704707a..573442e15e55 100644
--- a/.azure-pipelines/vstest-exclude
+++ b/.azure-pipelines/vstest-exclude
@@ -1,3 +1,2 @@
 ^platform
 ^.azure-pipelines
-^files/build/versions

From 83b226d8e9a475a653191dbd14ccb9903aef7a5a Mon Sep 17 00:00:00 2001
From: James An <94036556+jamesan47@users.noreply.github.com>
Date: Fri, 26 May 2023 10:53:14 -0700
Subject: [PATCH 1645/1674] Update cisco-8000.ini (#15200)

Why I did it

Release Notes for Cisco 8102-64H:
Updated mtd-utils.mk and pyudev.mk for addressing build failures

How I did it
Update platform version to 202012.3.0.1
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 2fff01060a9e..628494bae463 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012-v0.2.7
+ref=202012.3.0.1

From 04f921c52d09fd201e0bdd0ec216a21d921b15fd Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Wed, 31 May 2023 14:36:14 +0800
Subject: [PATCH 1646/1674] [CI/CD] Refine PR test templates and test_plan.py
 to be ready to migrate to Elastictest (#15257)

---
 .azure-pipelines/run-test-scheduler-template.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index f4c82f345226..ec6e2c80d3ae 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -52,7 +52,7 @@ steps:
       TEST_PLAN_ID=`cat new_test_plan_id.txt`
 
       echo "Created test plan $TEST_PLAN_ID"
-      echo "Check https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID for test plan status"
+      echo "Check $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID for test plan status"
       echo "##vso[task.setvariable variable=TEST_PLAN_ID]$TEST_PLAN_ID"
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
@@ -65,7 +65,7 @@ steps:
       set -e
       echo "Lock testbed"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
+      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
     env:
@@ -78,7 +78,7 @@ steps:
       echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)"
       echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
+      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
     env:
@@ -89,7 +89,7 @@ steps:
       set -e
       echo "Run test"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
+      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
     env:
@@ -100,7 +100,7 @@ steps:
       set -e
       echo "KVM dump"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
+      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
     condition: succeededOrFailed()

From 934dc224d0df13585f510b55205689d072cdc6b6 Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Fri, 2 Jun 2023 10:39:00 +0800
Subject: [PATCH 1647/1674] [CI/CD] Migrate to SONiC Elastictest (#15275)

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f4582a5e669d..e3e6beb75010 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ stages:
   dependsOn: BuildVS
   condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues')))
   variables:
-  - group: Testbed-Tools
+  - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file

From 897caef62178e76dbfb7107eb01e533c24cbeda4 Mon Sep 17 00:00:00 2001
From: Ye Jianquan <jianquanye@microsoft.com>
Date: Fri, 2 Jun 2023 16:33:34 +0800
Subject: [PATCH 1648/1674] [CI/CD] Refine pr test definition, remove old test
 jobs and testbedv2 flags (#15303)

---
 .../run-test-scheduler-template.yml           | 13 ++--
 azure-pipelines.yml                           | 64 +++----------------
 2 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index ec6e2c80d3ae..bbfbac961b93 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -40,7 +40,7 @@ steps:
       # always use the test plan script from master branch.
       wget -O ./.azure-pipelines/test_plan.py  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py
       wget -O ./.azure-pipelines/pr_test_scripts.yaml  https://raw.githubusercontent.com/sonic-net/sonic-mgmt/${{ parameters.MGMT_BRANCH }}/.azure-pipelines/pr_test_scripts.yaml
-    displayName: Download TestbedV2 scripts
+    displayName: Download test plan scripts
 
   - script: |
       set -e
@@ -64,7 +64,7 @@ steps:
   - script: |
       set -e
       echo "Lock testbed"
-      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
       echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
@@ -75,9 +75,8 @@ steps:
   - script: |
       set -e
       echo "Prepare testbed"
-      echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)"
-      echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline"
-      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient"
+      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
       echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
@@ -88,7 +87,7 @@ steps:
   - script: |
       set -e
       echo "Run test"
-      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
       echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
@@ -99,7 +98,7 @@ steps:
   - script: |
       set -e
       echo "KVM dump"
-      echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
+      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
       echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e3e6beb75010..0a6522f774ea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -132,41 +132,10 @@ stages:
         testResultsFiles: '**/tr.xml'
         testRunTitle: vstest
 
-  - job: t0_part1
-    pool: sonictest
-    displayName: "kvmtest-t0-part1"
-    timeoutInMinutes: 300
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-template.yml
-      parameters:
-        dut: vlab-01
-        tbname: vms-kvm-t0
-        ptf_name: ptf_vms6-1
-        tbtype: t0
-        section: part-1
-
-  - job: t0_part2
-    pool: sonictest
-    displayName: "kvmtest-t0-part2"
-    timeoutInMinutes: 300
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-template.yml
-      parameters:
-        dut: vlab-01
-        tbname: vms-kvm-t0
-        ptf_name: ptf_vms6-1
-        tbtype: t0
-        section: part-2
-
-  - job: t0_testbedv2
+  - job: t0_elastictest
     pool: ubuntu-20.04
-    displayName: "kvmtest-t0 by TestbedV2"
+    displayName: "kvmtest-t0 by Elastictest"
     timeoutInMinutes: 240
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-scheduler-template.yml
@@ -176,11 +145,10 @@ stages:
         MAX_WORKER: $(T0_INSTANCE_NUM)
         MGMT_BRANCH: 202012
 
-  - job: t0_2vlans_testbedv2
+  - job: t0_2vlans_elastictest
     pool: ubuntu-20.04
-    displayName: "kvmtest-t0-2vlans by TestbedV2"
+    displayName: "kvmtest-t0-2vlans by Elastictest"
     timeoutInMinutes: 240
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-scheduler-template.yml
@@ -192,25 +160,10 @@ stages:
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
         MGMT_BRANCH: 202012
 
-  - job: t1_lag_classic
-    pool: sonictest-t1-lag
-    displayName: "kvmtest-t1-lag classic"
-    timeoutInMinutes: 400
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES'))
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-template.yml
-      parameters:
-        dut: vlab-03
-        tbname: vms-kvm-t1-lag
-        ptf_name: ptf_vms6-2
-        tbtype: t1-lag
-
-  - job: t1_lag_testbedv2
+  - job: t1_lag_elastictest
     pool: ubuntu-20.04
-    displayName: "kvmtest-t1-lag by TestbedV2"
+    displayName: "kvmtest-t1-lag by Elastictest"
     timeoutInMinutes: 240
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
     - template: .azure-pipelines/run-test-scheduler-template.yml
@@ -220,11 +173,10 @@ stages:
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
         MGMT_BRANCH: 202012
 
-  - job: dualtor_testbedv2
+  - job: dualtor_elastictest
     pool: ubuntu-20.04
-    displayName: "kvmtest-dualtor-t0 by TestbedV2"
+    displayName: "kvmtest-dualtor-t0 by Elastictest"
     timeoutInMinutes: 240
-    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
     continueOnError: false
     steps:
       - template: .azure-pipelines/run-test-scheduler-template.yml

From 0b6ee2de4627e48a82ee4bf1f9701102aba3cfef Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Fri, 2 Jun 2023 08:23:14 -0700
Subject: [PATCH 1649/1674] Update cisco-8000.ini (#15300)

Fix for SR 695336631. x86 FPGA FPD needs to be upgraded to ver 1.88
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 628494bae463..92e58fec44ad 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012.3.0.1
+ref=202012.3.0.2

From 6e705dddb0a8ac96b9a4a3d3af2ada591e9c8e12 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Tue, 30 May 2023 10:16:21 -0700
Subject: [PATCH 1650/1674] Fix for fast/cold-boot: call db_migrator only after
 old config is loaded (#14933)

Why I did it
Fix the issue where db_migrator is called before DB is loaded w/ config. This leads to db_migrator:

Not finding anything, and resumes to incorrectly migrate every missing config
This is not expected. migration should happen after the old config is loaded and only new schema changes need migration.
Since DB does not have anything when migrator is called, db_migrator fails when some APIs return None.
The reason for incorrect call is that:

database service starts db_migrator as part of startup sequence.
config-setup service loads data from old-config/minigraph. However, since it has Requires=database.service.
Hence, config-setup starts only when database service is started. And database service is started when db_migrator is completed.
Fixed by:

Check if this is first time boot by checking pending_config_migration flag.
If pending_config_migration is enabled, then do not call db_migrator as part of database service startup.
Let database service start which triggers config-setup service to start.
Now call db_migrator after when config-setup service loads old-config/minigraph
---
 files/build_templates/docker_image_ctl.j2    | 16 ++++++++++++----
 files/image_config/config-setup/config-setup | 13 +++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 41a419662e7d..4c26b7c26b3f 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -135,10 +135,18 @@ function postStartAction()
             $SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
         fi
 
-        if [[ -x /usr/local/bin/db_migrator.py ]]; then
-            # Migrate the DB to the latest schema version if needed
-            if [ -z "$DEV" ]; then
-                /usr/local/bin/db_migrator.py -o migrate
+        if [ -e /tmp/pending_config_migration ]; then
+            # this is first boot to a new image, config-setup execution is pending.
+            # For fast/cold reboot case, DB contains nothing at this point
+            # Call db_migrator after config-setup loads the config (from old config or minigraph)
+            echo "Delaying db_migrator until config migration is over"
+        else
+            # this is not a first time boot to a new image. Datbase container starts w/ old pre-existing config
+            if [[ -x /usr/local/bin/db_migrator.py ]]; then
+                # Migrate the DB to the latest schema version if needed
+                if [ -z "$DEV" ]; then
+                    /usr/local/bin/db_migrator.py -o migrate
+                fi
             fi
         fi
         # Add redis UDS to the redis group and give read/write access to the group
diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index de39586fd4f8..3190392e48f4 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -298,6 +298,16 @@ check_all_config_db_present()
     return 0   
 }
 
+# DB schema is subject to change between two images
+# Perform DB schema migration after loading backup config from previous image
+do_db_migration()
+{
+    if [[ -x /usr/local/bin/db_migrator.py ]]; then
+        # Migrate the DB to the latest schema version if needed
+        /usr/local/bin/db_migrator.py -o migrate
+    fi
+}
+
 # Perform configuration migration from backup copy.
 #  - This step is performed when a new image is installed and SONiC switch boots into it
 do_config_migration()
@@ -320,16 +330,19 @@ do_config_migration()
     if [ x"${WARM_BOOT}" == x"true" ]; then
         echo "Warm reboot detected..."
         disable_updategraph
+        do_db_migration
         rm -f /tmp/pending_config_migration
         exit 0
     elif check_all_config_db_present; then
         echo "Use config_db.json from old system..."
         reload_configdb
+        do_db_migration
         # Disable updategraph
         disable_updategraph
     elif [ -r ${MINGRAPH_FILE} ]; then
         echo "Use minigraph.xml from old system..."
         reload_minigraph
+        do_db_migration
         # Disable updategraph
         disable_updategraph
     else

From 1b106a3355c1cfba5c2e5736492f9ffbd6d41f11 Mon Sep 17 00:00:00 2001
From: pavannaregundi <92989231+pavannaregundi@users.noreply.github.com>
Date: Sun, 4 Jun 2023 03:08:21 +0530
Subject: [PATCH 1651/1674] [Marvell] Update armhf driver version (#15310)

Changes in MRVL_PRESTERA_DRIVER_1.1_1:

- Memory leak fixed by adding missing releasing pci device.

Change-Id: I15a20412eac066894d4ddbebd58e1f127a20d968

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
---
 platform/marvell-armhf/prestera.mk           | 2 +-
 platform/marvell-armhf/prestera/debian/rules | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/marvell-armhf/prestera.mk b/platform/marvell-armhf/prestera.mk
index 7eb7536fb6a7..a45b0c6a26fa 100644
--- a/platform/marvell-armhf/prestera.mk
+++ b/platform/marvell-armhf/prestera.mk
@@ -4,7 +4,7 @@ export MRVL_PRESTERA_VER = 1.0
 export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH)
 export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb
 export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git
-export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.1
+export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.1_1
 
 $(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera
 $(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
diff --git a/platform/marvell-armhf/prestera/debian/rules b/platform/marvell-armhf/prestera/debian/rules
index 67692a42725c..18e4f82e9f64 100755
--- a/platform/marvell-armhf/prestera/debian/rules
+++ b/platform/marvell-armhf/prestera/debian/rules
@@ -19,7 +19,8 @@ clean:
 build:
 	# get sources
 	rm -rf mrvl-prestera || true
-	git clone -b ${MRVL_PRESTERA_SRC_TAG} ${MRVL_PRESTERA_SRC_URL}
+	git clone ${MRVL_PRESTERA_SRC_URL}
+	cd mrvl-prestera && git checkout ${MRVL_PRESTERA_SRC_TAG} && cd ..
 	sed "s/KVERSION/${KVERSION}/g" /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template > /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install
 
 	make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$(MODULE_DIR)/

From 2a8d6912ea3d373f34a8ae0d0b2a18835375acad Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Mon, 5 Jun 2023 14:15:03 -0700
Subject: [PATCH 1652/1674] Start BGP after interfaces-config.service (#15312)

Why I did it
Cherry-pick of #11827

This is to fix issue: [201811->202012] During warm recovery, TOR did not announce Loopback, VLAN route after upgrade

Suspected cause: 202012 does not have system dependency for bgp service to start after interfaces-config.service.

This opens a window for race condition: bgp service completing before interfaces are initialized.
BGP will miss announcing some routes if the interfaces are not ready.
---
 files/build_templates/per_namespace/bgp.service.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
index e9909f037103..16764e1b7ec1 100644
--- a/files/build_templates/per_namespace/bgp.service.j2
+++ b/files/build_templates/per_namespace/bgp.service.j2
@@ -6,6 +6,7 @@ Requires=updategraph.service
 After=updategraph.service
 BindsTo=sonic.target
 After=sonic.target
+After=interfaces-config.service
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3

From 15021cf12ab05199ac54a69598a5713db058a64a Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
Date: Wed, 7 Jun 2023 19:19:37 -0700
Subject: [PATCH 1653/1674] [202012][BGP] starting BGP service after swss
 (#15365)

Cherrypick #12381 into 202012

Reverts #15312

Work item tracking
Microsoft ADO (number only): 24163872
---
 files/build_templates/per_namespace/bgp.service.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
index 16764e1b7ec1..5d91bb1c1b70 100644
--- a/files/build_templates/per_namespace/bgp.service.j2
+++ b/files/build_templates/per_namespace/bgp.service.j2
@@ -6,7 +6,7 @@ Requires=updategraph.service
 After=updategraph.service
 BindsTo=sonic.target
 After=sonic.target
-After=interfaces-config.service
+After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service
 Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3

From b660bac73bd1c6eb3524322e3e4b09cbed055a38 Mon Sep 17 00:00:00 2001
From: Liu Shilong <shilongliu@microsoft.com>
Date: Mon, 5 Jun 2023 18:42:06 +0800
Subject: [PATCH 1654/1674] [ci] Add OVERRIDE_BUILD_OPTIONS in image build
 template. (#15309)

Why I did it
Set build options in pipeline UI.
Support setting reproducible build options to py2,py3 in release branch and none in master branch.

Work item tracking
Microsoft ADO (number only): 22335854
How I did it
How to verify it
---
 .azure-pipelines/azure-pipelines-image-template.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 46a318188a4b..bcd377973d53 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -28,11 +28,13 @@ jobs:
       - template: .azure-pipelines/cleanup.yml@buildimage
       - ${{ parameters.preSteps }}
       - script: |
-          BUILD_OPTIONS="$(BUILD_OPTIONS)"
+          [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
+          BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
-            BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
+            BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi
+          echo $BUILD_OPTIONS
           echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
         displayName: "Set cache options"
       - checkout: self

From fe449db131017aff18f1f11b93ebaa900fc2a690 Mon Sep 17 00:00:00 2001
From: siqbal1986 <shahzad.iqbal@microsoft.com>
Date: Thu, 15 Jun 2023 16:16:20 -0700
Subject: [PATCH 1655/1674] Added VNET_MONITOR_TABLE,BFD_SESSION_TABLE to the
 list of tables to be cleaned up after swss restart. (#15398)

* [cleanup] tables VNET_MONITOR, BFD_SESSION, ROUTE_TUNNEL
---
 files/scripts/swss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index ceb3a057ae3e..d02eece8678e 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -147,7 +147,7 @@ start() {
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB
         $SONIC_DB_CLI FLEX_COUNTER_DB FLUSHDB
         $SONIC_DB_CLI RESTAPI_DB FLUSHDB
-        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*', 'VNET_ROUTE*'"
+        clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*', 'VNET_ROUTE*', 'VNET_MONITOR_TABLE*', 'BFD_SESSION_TABLE*'"
     fi
 
     # start service docker

From 93b8694d82a4eaac1e4f547bd70632ecf744d9aa Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Mon, 19 Jun 2023 23:23:42 +0800
Subject: [PATCH 1656/1674] [Build] Remove the additional space character in
 the mirrors.list file (#13812) (#15459)

Why I did it
Fix all mirror is commented out in sources.list in slave image issue. It will have an issue when installing more packages in the slave container.

It will add additional space character after running add-apt-repository command.

For example:
The original config in /etc/apt/sources.list

#deb [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
Run the following command:

add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable"
Then the setting changed to: (added a new space character after #)

# deb [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
How I did it
Fix the regex string to add the space pattern. After fixed, whether there is a space character or not, it will not be an issue.

How to verify it

Co-authored-by: xumia <59720581+xumia@users.noreply.github.com>
---
 src/sonic-build-hooks/scripts/buildinfo_base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
index ba40bafd36dd..fc6e81340061 100755
--- a/src/sonic-build-hooks/scripts/buildinfo_base.sh
+++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -71,7 +71,7 @@ check_if_url_exist()
 set_reproducible_mirrors()
 {
     # Remove the charater # in front of the line if matched
-    local expression="s/^#\(.*$REPR_MIRROR_URL_PATTERN\)/\1/"
+    local expression="s/^#\s*\(.*$REPR_MIRROR_URL_PATTERN\)/\1/"
     # Add the character # in front of the line, if not match the URL pattern condition
     local expression2="/^#*deb.*$REPR_MIRROR_URL_PATTERN/! s/^#*deb/#&/"
     local expression3="\$a#SET_REPR_MIRRORS"
@@ -79,7 +79,7 @@ set_reproducible_mirrors()
         # Add the charater # in front of the line if match
         expression="s/^deb.*$REPR_MIRROR_URL_PATTERN/#\0/"
         # Remove the character # in front of the line, if not match the URL pattern condition
-        expression2="/^#*deb.*$REPR_MIRROR_URL_PATTERN/! s/^#(#*deb)/\1/"
+        expression2="/^#*deb.*$REPR_MIRROR_URL_PATTERN/! s/^#\s*(#*deb)/\1/"
         expression3="/#SET_REPR_MIRRORS/d"
     fi
 

From db12b8c9c0eca9a7145a85808b48a1ca7f6e66e5 Mon Sep 17 00:00:00 2001
From: Ikki Zhu <79439153+qnos@users.noreply.github.com>
Date: Wed, 21 Jun 2023 07:21:08 +0800
Subject: [PATCH 1657/1674] dx010 fix possible cpld race read issue (#15339)

#### Why I did it
fix possible cpld race read issue between watchdog and reboot cause process

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Use flock to limit parallel access to cpld sys file

#### How to verify it
It can be simulate and verified with following python script

```python3
import signal
import subprocess
import threading

exit_flag = False

def run_command(cmd):
    status = True
    result = ""
    try:
        p = subprocess.Popen(
            cmd, shell=True, universal_newlines=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        raw_data, err = p.communicate()
        if err == '':
            result = raw_data.strip()
    except:
        status = False
    return status, result

def get_cpld_reg_value(getreg_path, register):
    #cmd = "echo {1} > {0}; cat {0}".format(getreg_path, register)
    cmd = "flock {0} -c 'echo {1} > {0}; cat {0}'".format(getreg_path,
register)
    status, result = run_command(cmd)
    return result if status else None

def cpld_read(thread_num, cpld_reg):
    while not exit_flag:
        val
= get_cpld_reg_value("/sys/devices/platform/dx010_cpld/getreg",
cpld_reg)
        print(f"Thread {thread_num}: get cpld reg {cpld_reg}, value
{val}")

def signal_handler(sig, frame):
    global exit_flag
    print("Ctrl+C detected. Quitting...")
    exit_flag = True

if __name__ == '__main__':
    # Register the signal handler for Ctrl+C
    signal.signal(signal.SIGINT, signal_handler)

    t1 = threading.Thread(target=cpld_read, args=(1, '0x103',))
    t2 = threading.Thread(target=cpld_read, args=(2, '0x141',))
    t1.start()
    t2.start()
    t1.join()
    t2.join()
```
---
 .../x86_64-cel_seastone-r0/sonic_platform/component.py          | 2 +-
 .../celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
index 03f879805a5e..5b71c0a38a11 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
@@ -54,7 +54,7 @@ def __get_bios_version(self):
 
     def get_register_value(self, register):
         # Retrieves the cpld register value
-        cmd = "echo {1} > {0}; cat {0}".format(GETREG_PATH, register)
+        cmd = "flock {0} -c 'echo {1} > {0}; cat {0}'".format(GETREG_PATH, register)
         p = subprocess.Popen(
             cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         raw_data, err = p.communicate()
diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py
index 140c62c08666..61bc676540db 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py
+++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py
@@ -77,7 +77,7 @@ def write_txt_file(self, file_path, value):
         return True
 
     def get_cpld_reg_value(self, getreg_path, register):
-        cmd = "echo {1} > {0}; cat {0}".format(getreg_path, register)
+        cmd = "flock {0} -c 'echo {1} > {0}; cat {0}'".format(getreg_path, register)
         status, result = self.run_command(cmd)
         return result if status else None
 

From 6bb16f3e54bccb1f44c7979d58248d098cde6256 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 22 Jun 2023 08:27:53 +0800
Subject: [PATCH 1658/1674] [celestica/e1031]: enable emc2305 fan controller
 timeout feature (#14401) (#15571)

---
 .../haliburton/modules/emc2305.c              | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/emc2305.c b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/emc2305.c
index f08033e080ce..c32f5dffbc2d 100644
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/emc2305.c
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/emc2305.c
@@ -407,6 +407,35 @@ emc2305_set_pwm(struct i2c_client *client, int fan_idx, long pwm)
 	mutex_unlock(&data->update_lock);
 	return status;
 }
+
+static int
+emc2305_enable_timeout(struct i2c_client *client, bool enable)
+{
+	struct emc2305_data *data = i2c_get_clientdata(client);
+	int status = 0;
+	u8 conf_val = 0;
+
+	mutex_lock(&data->update_lock);
+
+	status = read_u8_from_i2c(client, REG_CONFIGURATION, &conf_val);
+	if (status < 0) {
+	    mutex_unlock(&data->update_lock);
+	    return status;
+	}
+
+	// Section 6.2: CONFIG REGISTER DIS_TO bit(bit 6)
+	if (enable) {
+	    conf_val &= ~(1 << 6);
+	} else {
+	    conf_val |= (1 << 6);
+	}
+
+	status = i2c_smbus_write_byte_data(client, REG_CONFIGURATION, conf_val);
+
+	mutex_unlock(&data->update_lock);
+	return status;
+}
+
 /*
  * sysfs callback functions
  *
@@ -744,6 +773,9 @@ emc2305_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	i2c_set_clientdata(client, data);
 	mutex_init(&data->update_lock);
 
+	// Enable SMBus timeout feature
+	emc2305_enable_timeout(client, true);
+
 	status = i2c_smbus_read_byte_data(client, REG_PRODUCT_ID);
 	switch (status) {
 	case 0x34: /* EMC2305 */

From 51e0b6ddd9b340e4acc13150dba81907b9c93978 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 28 Jun 2023 11:14:20 +0800
Subject: [PATCH 1659/1674] [Ci] Support to build sonic-swss-common for test
 (#15566) (#15582)

[Ci] Support to build sonic-swss-common for test

- Microsoft ADO **(number only)**: 24341479
---
 azure-pipelines.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0a6522f774ea..511895c94e99 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -95,25 +95,26 @@ stages:
       submodules: recursive
       displayName: 'Checkout code'
 
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        source: specific
-        project: build
-        pipeline: 9
-        artifact: sonic-swss-common.amd64.ubuntu20_04
-        runVersion: 'latestFromBranch'
-        runBranch: 'refs/heads/202012'
-      displayName: "Download sonic swss common deb packages"
-
     - task: DownloadPipelineArtifact@2
       inputs:
         artifact: sonic-buildimage.vs
       displayName: "Download sonic-buildimage.vs artifact"
 
     - script: |
-        set -x
-        sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i ../python3-swsscommon_1.0.0_amd64.deb
+        sudo apt-get update
+        sudo apt-get install -y make libtool m4 autoconf dh-exec debhelper cmake pkg-config \
+                         libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig3.0 \
+                         libpython2.7-dev libboost-dev libboost-serialization-dev uuid-dev libzmq5 libzmq3-dev  python3-pip \
+                         cmake libgtest-dev libgmock-dev libyang-dev
+        sudo pip3 install pytest
+        cd src/sonic-swss-common
+        ./autogen.sh
+        dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc)
+        sudo dpkg -i --force-confask,confnew ../libswsscommon_*.deb
+        sudo dpkg -i ../python3-swsscommon_*.deb
+      displayName: "Compile sonic swss common"
+
+    - script: |
         sudo docker load -i ../target/docker-sonic-vs.gz
         docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
         username=$(id -un)

From 406852cf3023631ae5fb462e2c6db688ca43cbc1 Mon Sep 17 00:00:00 2001
From: Vaibhav Hemant Dixit <vaibhav.hemant@gmail.com>
Date: Fri, 16 Jun 2023 13:58:38 -0700
Subject: [PATCH 1660/1674] Revert "Fix for fast/cold-boot: call db_migrator
 only after old config is loaded (#14933)" (#15464)

This reverts commit 02b17839c3378ee30791df510b1b79a3163b14ab.

Reverts #14933

The earlier commit caused a race condition that particularly broke cross branch warm upgrade.

Issue happens when db_migrator is still migrating the DB and finalizer is checking DB for list of components to reconcile.

If migration is not complete, finalizer get an empty list to wait for. Due to this, finalizer concludes warmboot (deletes system wide warmboot flag) and cause all the services to do cold restart.

ADO: 24274591
---
 files/build_templates/docker_image_ctl.j2    | 16 ++++------------
 files/image_config/config-setup/config-setup | 13 -------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 4c26b7c26b3f..41a419662e7d 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -135,18 +135,10 @@ function postStartAction()
             $SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
         fi
 
-        if [ -e /tmp/pending_config_migration ]; then
-            # this is first boot to a new image, config-setup execution is pending.
-            # For fast/cold reboot case, DB contains nothing at this point
-            # Call db_migrator after config-setup loads the config (from old config or minigraph)
-            echo "Delaying db_migrator until config migration is over"
-        else
-            # this is not a first time boot to a new image. Datbase container starts w/ old pre-existing config
-            if [[ -x /usr/local/bin/db_migrator.py ]]; then
-                # Migrate the DB to the latest schema version if needed
-                if [ -z "$DEV" ]; then
-                    /usr/local/bin/db_migrator.py -o migrate
-                fi
+        if [[ -x /usr/local/bin/db_migrator.py ]]; then
+            # Migrate the DB to the latest schema version if needed
+            if [ -z "$DEV" ]; then
+                /usr/local/bin/db_migrator.py -o migrate
             fi
         fi
         # Add redis UDS to the redis group and give read/write access to the group
diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index 3190392e48f4..de39586fd4f8 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -298,16 +298,6 @@ check_all_config_db_present()
     return 0   
 }
 
-# DB schema is subject to change between two images
-# Perform DB schema migration after loading backup config from previous image
-do_db_migration()
-{
-    if [[ -x /usr/local/bin/db_migrator.py ]]; then
-        # Migrate the DB to the latest schema version if needed
-        /usr/local/bin/db_migrator.py -o migrate
-    fi
-}
-
 # Perform configuration migration from backup copy.
 #  - This step is performed when a new image is installed and SONiC switch boots into it
 do_config_migration()
@@ -330,19 +320,16 @@ do_config_migration()
     if [ x"${WARM_BOOT}" == x"true" ]; then
         echo "Warm reboot detected..."
         disable_updategraph
-        do_db_migration
         rm -f /tmp/pending_config_migration
         exit 0
     elif check_all_config_db_present; then
         echo "Use config_db.json from old system..."
         reload_configdb
-        do_db_migration
         # Disable updategraph
         disable_updategraph
     elif [ -r ${MINGRAPH_FILE} ]; then
         echo "Use minigraph.xml from old system..."
         reload_minigraph
-        do_db_migration
         # Disable updategraph
         disable_updategraph
     else

From bc58e2d84198a0a79bfd6d9a40d385990a165ef8 Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Sun, 2 Jul 2023 09:43:51 +0300
Subject: [PATCH 1661/1674] [202012][mlnx-ffb.sh] Update issu-version location 
 (#14927)

BACKPORT OF https://github.com/sonic-net/sonic-buildimage/pull/14925

#### Why I did it

ISSU version check fails due to inability to mount squashfs from 202211 on 201911

#### How I did it

Put ISSU version file under platform directory

#### How to verify it

202012 (with [202012][mlnx-ffb.sh] Update issu-version location  #14927) to master
---
 .../build_templates/sonic_debian_extension.j2 |  3 +-
 platform/mellanox/mlnx-ffb.sh                 | 70 ++++++++++---------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 9aa19a9c3fbd..606f466ed3ac 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -823,7 +823,8 @@ for fw_file_name in ${!FW_FILE_MAP[@]}; do
     # Link old FW location to not break existing automation/scripts
     sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/asic/${FW_FILE_MAP[$fw_file_name]} $FILESYSTEM_ROOT/etc/mlnx/${FW_FILE_MAP[$fw_file_name]}
 done
-sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
+sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/issu-version
+sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/asic/issu-version $FILESYSTEM_ROOT/etc/mlnx/issu-version
 sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
 sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE
 sudo cp $files_path/$MLNX_SSD_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_SSD_FW_UPDATE
diff --git a/platform/mellanox/mlnx-ffb.sh b/platform/mellanox/mlnx-ffb.sh
index d0bef9d57761..c7a89d4d39d1 100755
--- a/platform/mellanox/mlnx-ffb.sh
+++ b/platform/mellanox/mlnx-ffb.sh
@@ -33,41 +33,47 @@ check_sdk_upgrade()
         return "${FFB_SUCCESS}"
     fi
 
-    while :; do
-        mkdir -p "${FS_MOUNTPOINT}"
-        mount -t squashfs "${FS_PATH}" "${FS_MOUNTPOINT}" || {
-            >&2 echo "Failed to mount next SONiC image"
+    ISSU_VERSION_FILE_PATH="/etc/mlnx/issu-version"
+    CURRENT_ISSU_VERSION="$(cat ${ISSU_VERSION_FILE_PATH})"
+    NEXT_ISSU_VERSION="Unknown"
+
+    # /host/image-<version>/platform/fw/asic/issu-version is now the new location for ISSU version.
+    NEXT_IMAGE_ISSU_VERSION_FILE_PATH="/host/image-${NEXT_SONIC_IMAGE#SONiC-OS-}/platform/fw/asic/issu-version"
+
+    if [ -f "${NEXT_IMAGE_ISSU_VERSION_FILE_PATH}" ]; then
+        NEXT_ISSU_VERSION="$(cat ${NEXT_IMAGE_ISSU_VERSION_FILE_PATH})"
+    else
+        while :; do
+            mkdir -p "${FS_MOUNTPOINT}"
+            mount -t squashfs "${FS_PATH}" "${FS_MOUNTPOINT}" || {
+                >&2 echo "Failed to mount next SONiC image"
+                break
+            }
+
+            [ -f "${ISSU_VERSION_FILE_PATH}" ] || {
+                >&2 echo "No ISSU version file found ${ISSU_VERSION_FILE_PATH}"
+                break
+            }
+
+            [ -f "${FS_MOUNTPOINT}/${ISSU_VERSION_FILE_PATH}" ] || {
+                >&2 echo "No ISSU version file found ${ISSU_VERSION_FILE_PATH} in ${NEXT_SONIC_IMAGE}"
+                break
+            }
+            NEXT_ISSU_VERSION="$(cat ${FS_MOUNTPOINT}/${ISSU_VERSION_FILE_PATH})"
             break
-        }
+        done
 
-        ISSU_VERSION_FILE_PATH="/etc/mlnx/issu-version"
-
-        [ -f "${ISSU_VERSION_FILE_PATH}" ] || {
-            >&2 echo "No ISSU version file found ${ISSU_VERSION_FILE_PATH}"
-            break
-        }
-
-        [ -f "${FS_MOUNTPOINT}/${ISSU_VERSION_FILE_PATH}" ] || {
-            >&2 echo "No ISSU version file found ${ISSU_VERSION_FILE_PATH} in ${NEXT_SONIC_IMAGE}"
-            break
-        }
-
-        CURRENT_ISSU_VERSION="$(cat ${ISSU_VERSION_FILE_PATH})"
-        NEXT_ISSU_VERSION="$(cat ${FS_MOUNTPOINT}/${ISSU_VERSION_FILE_PATH})"
-
-        if [[ "${CURRENT_ISSU_VERSION}" == "${NEXT_ISSU_VERSION}" ]]; then
-            CHECK_RESULT="${FFB_SUCCESS}"
-        else
-            >&2 echo "Current and next ISSU version do not match:"
-            >&2 echo "Current ISSU version: ${CURRENT_ISSU_VERSION}"
-            >&2 echo "Next ISSU version: ${NEXT_ISSU_VERSION}"
-        fi
-
-        break
-    done
+        umount -rf "${FS_MOUNTPOINT}" 2> /dev/null || true
+        rm -rf "${FS_MOUNTPOINT}" 2> /dev/null || true
+    fi
 
-    umount -rf "${FS_MOUNTPOINT}" 2> /dev/null || true
-    rm -rf "${FS_MOUNTPOINT}" 2> /dev/null || true
+    if [[ "${CURRENT_ISSU_VERSION}" == "${NEXT_ISSU_VERSION}" ]]; then
+        CHECK_RESULT="${FFB_SUCCESS}"
+    else
+        >&2 echo "Current and next ISSU version do not match:"
+        >&2 echo "Current ISSU version: ${CURRENT_ISSU_VERSION}"
+        >&2 echo "Next ISSU version: ${NEXT_ISSU_VERSION}"
+    fi
 
     return "${CHECK_RESULT}"
 }

From d4515eecf8cdbeaaca2f7f7c44069f1796988586 Mon Sep 17 00:00:00 2001
From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com>
Date: Mon, 3 Jul 2023 11:18:22 -0700
Subject: [PATCH 1662/1674] Update cisco-8000.ini (#15644)

#### Why I did it
Aikido FPD update, power CPLD version display under fwutil CLI and fix for cpu lockup causing telemetry container crash or system reboot

##### Work item tracking
- Microsoft ADO **(number only)**: 24174212

#### How I did it
update cisco module to 202012.3.1.1
---
 platform/checkout/cisco-8000.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
index 92e58fec44ad..ba8059436f95 100644
--- a/platform/checkout/cisco-8000.ini
+++ b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202012.3.0.2
+ref=202012.3.1.1

From 71a8a668941712a1ff6c164bccad488334a81537 Mon Sep 17 00:00:00 2001
From: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com>
Date: Tue, 4 Jul 2023 13:33:39 +0800
Subject: [PATCH 1663/1674] [202012] Fix caclmgrd crash issue when applying
 scale cacl rules (#15630)

Cherry pick PR for https://github.com/sonic-net/sonic-host-services/pull/62

#### Why I did it
Fix the issue https://github.com/sonic-net/sonic-buildimage/issues/10883.

##### Work item tracking
- Microsoft ADO **(17795594)**:

#### How I did it
For performance reason, libswsscommon is not thread safe by design.
caclmgrd share config DB connection cross thread, so change to use new db connector in child thread.

#### How to verify it
Load scale ipv4/ipv6 rules and verify if caclmgrd is crashed
---
 src/sonic-host-services/scripts/caclmgrd      |   70 +-
 .../caclmgrd/cacl_external_client_acl_test.py |    2 +-
 .../tests/caclmgrd/caclmgrd_scale_test.py     |   51 +
 .../tests/caclmgrd/test_scale_vectors.py      | 1010 +++++++++++++++++
 .../tests/common/mock_configdb.py             |    3 +
 5 files changed, 1103 insertions(+), 33 deletions(-)
 create mode 100644 src/sonic-host-services/tests/caclmgrd/caclmgrd_scale_test.py
 create mode 100644 src/sonic-host-services/tests/caclmgrd/test_scale_vectors.py

diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd
index dbde8c13e8c7..27ff4c44d54c 100755
--- a/src/sonic-host-services/scripts/caclmgrd
+++ b/src/sonic-host-services/scripts/caclmgrd
@@ -205,7 +205,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         tcp_flags_str = tcp_flags_str[:-1]
         return tcp_flags_str
 
-    def generate_block_ip2me_traffic_iptables_commands(self, namespace):
+    def generate_block_ip2me_traffic_iptables_commands(self, namespace, config_db_connector):
         INTERFACE_TABLE_NAME_LIST = [
             "LOOPBACK_INTERFACE",
             "MGMT_INTERFACE",
@@ -218,7 +218,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
         # Add iptables rules to drop all packets destined for peer-to-peer interface IP addresses
         for iface_table_name in INTERFACE_TABLE_NAME_LIST:
-            iface_table = self.config_db_map[namespace].get_table(iface_table_name)
+            iface_table = config_db_connector.get_table(iface_table_name)
             if iface_table:
                 for key, _ in iface_table.items():
                     if not _ip_prefix_in_key(key):
@@ -431,7 +431,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 self.log_info("Update DHCP chain: {}".format(insert_cmd))
 
 
-    def get_acl_rules_and_translate_to_iptables_commands(self, namespace):
+    def get_acl_rules_and_translate_to_iptables_commands(self, namespace, config_db_connector):
         """
         Retrieves current ACL tables and rules from Config DB, translates
         control plane ACLs into a list of iptables commands that can be run
@@ -516,8 +516,8 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         iptables_cmds.append(self.iptables_cmd_ns_prefix[namespace] + "ip6tables -A INPUT -p tcp --sport 179 -j ACCEPT")
 
         # Get current ACL tables and rules from Config DB
-        self._tables_db_info = self.config_db_map[namespace].get_table(self.ACL_TABLE)
-        self._rules_db_info = self.config_db_map[namespace].get_table(self.ACL_RULE)
+        self._tables_db_info = config_db_connector.get_table(self.ACL_TABLE)
+        self._rules_db_info = config_db_connector.get_table(self.ACL_RULE)
 
         num_ctrl_plane_acl_rules = 0
 
@@ -658,7 +658,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
                 service_to_source_ip_map.update({ acl_service:{ "ipv4":ipv4_src_ip_set, "ipv6":ipv6_src_ip_set } })
 
         # Add iptables commands to block ip2me traffic
-        iptables_cmds += self.generate_block_ip2me_traffic_iptables_commands(namespace)
+        iptables_cmds += self.generate_block_ip2me_traffic_iptables_commands(namespace, config_db_connector)
 
         # Add iptables/ip6tables commands to allow all incoming packets with TTL of 0 or 1
         # This allows the device to respond to tools like tcptraceroute
@@ -673,13 +673,13 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
 
         return iptables_cmds, service_to_source_ip_map
 
-    def update_control_plane_acls(self, namespace):
+    def update_control_plane_acls(self, namespace, config_db_connector):
         """
         Convenience wrapper which retrieves current ACL tables and rules from
         Config DB, translates control plane ACLs into a list of iptables
         commands and runs them.
         """
-        iptables_cmds, service_to_source_ip_map  = self.get_acl_rules_and_translate_to_iptables_commands(namespace)
+        iptables_cmds, service_to_source_ip_map  = self.get_acl_rules_and_translate_to_iptables_commands(namespace, config_db_connector)
         self.log_info("Issuing the following iptables commands:")
         for cmd in iptables_cmds:
             self.log_info("  " + cmd)
@@ -714,30 +714,36 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         updates were received during the delay window, at which point it will update
         iptables using the current ACL rules.
         """
-        while True:
-            # Sleep for our delay interval
-            time.sleep(self.UPDATE_DELAY_SECS)
-
-            with self.lock[namespace]:
-                if self.num_changes[namespace] > num_changes:
-                    # More ACL table changes occurred since this thread was spawned
-                    # spawn a new thread with the current number of changes
-                    new_changes = self.num_changes[namespace] - num_changes
-                    self.log_info("ACL config not stable for namespace '{}': {} changes detected in the past {} seconds. Skipping update ..."
-                             .format(namespace, new_changes, self.UPDATE_DELAY_SECS))
-                    num_changes = self.num_changes[namespace]
-                else:
-                    if num_changes == self.num_changes[namespace] and num_changes > 0:
-                        self.log_info("ACL config for namespace '{}' has not changed for {} seconds. Applying updates ..."
-                                 .format(namespace, self.UPDATE_DELAY_SECS))
-                        self.update_control_plane_acls(namespace)
-                    else:
-                        self.log_error("Error updating ACLs for namespace '{}'".format(namespace))
+        try:
+            # ConfigDBConnector is not multi thread safe. In child thread, we use another new DB connector.
+            new_config_db_connector = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
+            new_config_db_connector.connect()
+            while True:
+                # Sleep for our delay interval
+                time.sleep(self.UPDATE_DELAY_SECS)
 
-                    # Re-initialize
-                    self.num_changes[namespace] = 0
-                    self.update_thread[namespace] = None
-                    return
+                with self.lock[namespace]:
+                    if self.num_changes[namespace] > num_changes:
+                        # More ACL table changes occurred since this thread was spawned
+                        # spawn a new thread with the current number of changes
+                        new_changes = self.num_changes[namespace] - num_changes
+                        self.log_info("ACL config not stable for namespace '{}': {} changes detected in the past {} seconds. Skipping update ..."
+                                .format(namespace, new_changes, self.UPDATE_DELAY_SECS))
+                        num_changes = self.num_changes[namespace]
+                    else:
+                        if num_changes == self.num_changes[namespace] and num_changes > 0:
+                            self.log_info("ACL config for namespace '{}' has not changed for {} seconds. Applying updates ..."
+                                    .format(namespace, self.UPDATE_DELAY_SECS))
+                            self.update_control_plane_acls(namespace, new_config_db_connector)
+                        else:
+                            self.log_error("Error updating ACLs for namespace '{}'".format(namespace))
+
+                        # Re-initialize
+                        self.num_changes[namespace] = 0
+                        self.update_thread[namespace] = None
+                        return
+        finally:
+            new_config_db_connector.close("CONFIG_DB")
 
     def allow_bfd_protocol(self, namespace):
         iptables_cmds = []
@@ -797,7 +803,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
         # Loop through all asic namespaces (if present) and host namespace (DEFAULT_NAMESPACE)
         for namespace in list(self.config_db_map.keys()):
             # Unconditionally update control plane ACLs once at start on given namespace
-            self.update_control_plane_acls(namespace)
+            self.update_control_plane_acls(namespace, self.config_db_map[namespace])
             # Connect to Config DB of given namespace
             acl_db_connector = swsscommon.DBConnector("CONFIG_DB", 0, False, namespace)
             # Subscribe to notifications when ACL tables changes
diff --git a/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
index 6fbb7a8f728a..db5423ce76f7 100644
--- a/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
+++ b/src/sonic-host-services/tests/caclmgrd/cacl_external_client_acl_test.py
@@ -40,7 +40,7 @@ def test_caclmgrd_external_client_acl(self, test_name, test_data, fs):
         self.caclmgrd.ControlPlaneAclManager.get_chain_list = mock.MagicMock(return_value=["INPUT", "FORWARD", "OUTPUT"])
         caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
 
-        iptables_rules_ret, _ = caclmgrd_daemon.get_acl_rules_and_translate_to_iptables_commands('')
+        iptables_rules_ret, _ = caclmgrd_daemon.get_acl_rules_and_translate_to_iptables_commands('', MockConfigDb())
         self.assertEqual(set(test_data["return"]).issubset(set(iptables_rules_ret)), True)
         caclmgrd_daemon.iptables_cmd_ns_prefix['asic0'] = 'ip netns exec asic0'
         caclmgrd_daemon.namespace_docker_mgmt_ip['asic0'] = '1.1.1.1'
diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_scale_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_scale_test.py
new file mode 100644
index 000000000000..c10bd5396f8f
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_scale_test.py
@@ -0,0 +1,51 @@
+import os
+import sys
+import swsscommon
+
+from parameterized import parameterized
+from sonic_py_common.general import load_module_from_source
+from unittest import TestCase, mock
+from pyfakefs.fake_filesystem_unittest import patchfs
+
+from .test_scale_vectors import CACLMGRD_SCALE_TEST_VECTOR
+from tests.common.mock_configdb import MockConfigDb
+
+
+DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
+
+class TestCaclmgrdScale(TestCase):
+    """
+        Test caclmgrd with scale cacl rules
+    """
+    def setUp(self):
+        swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
+        test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        modules_path = os.path.dirname(test_path)
+        scripts_path = os.path.join(modules_path, "scripts")
+        sys.path.insert(0, modules_path)
+        caclmgrd_path = os.path.join(scripts_path, 'caclmgrd')
+        self.caclmgrd = load_module_from_source('caclmgrd', caclmgrd_path)
+
+    @parameterized.expand(CACLMGRD_SCALE_TEST_VECTOR)
+    @patchfs
+    def test_caclmgrd_scale(self, test_name, test_data, fs): 
+        if not os.path.exists(DBCONFIG_PATH):
+            fs.create_file(DBCONFIG_PATH) # fake database_config.json
+
+        MockConfigDb.set_config_db(test_data["config_db"])
+
+        with mock.patch("caclmgrd.subprocess") as mocked_subprocess:
+            popen_mock = mock.Mock()
+            popen_attrs = test_data["popen_attributes"]
+            popen_mock.configure_mock(**popen_attrs)
+            mocked_subprocess.Popen.return_value = popen_mock
+            mocked_subprocess.PIPE = -1
+
+            call_rc = test_data["call_rc"]
+            mocked_subprocess.call.return_value = call_rc
+
+            caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
+            caclmgrd_daemon.num_changes[''] = 150
+            caclmgrd_daemon.check_and_update_control_plane_acls('', 150)
+
+            mocked_subprocess.Popen.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
diff --git a/src/sonic-host-services/tests/caclmgrd/test_scale_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_scale_vectors.py
new file mode 100644
index 000000000000..f02a37ab8f3f
--- /dev/null
+++ b/src/sonic-host-services/tests/caclmgrd/test_scale_vectors.py
@@ -0,0 +1,1010 @@
+from unittest.mock import call
+import subprocess
+
+"""
+    caclmgrd bfd test vector
+"""
+CACLMGRD_SCALE_TEST_VECTOR = [
+    [
+        "SCALE_SESSION_TEST",
+        {
+            "config_db": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "type": "ToRRouter",
+                    }
+                },
+                "LOOPBACK_INTERFACE": {},
+                "VLAN_INTERFACE": {},
+                "MGMT_INTERFACE": {},
+                "PORTCHANNEL_INTERFACE": {},
+                "INTERFACE": {},
+                "FEATURE": {},
+                "ACL_RULE": {
+                    "NTP_ACL|RULE_1": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9999",
+                        "SRC_IPV6": "2001::2/128"
+                    },
+                    "NTP_ACL|RULE_2": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9998",
+                        "SRC_IPV6": "2001::3/128"
+                    },
+                    "NTP_ACL|RULE_3": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9997",
+                        "SRC_IPV6": "2001::4/128"
+                    },
+                    "NTP_ACL|RULE_4": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9996",
+                        "SRC_IPV6": "2001::5/128"
+                    },
+                    "NTP_ACL|RULE_5": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9995",
+                        "SRC_IPV6": "2001::6/128"
+                    },
+                    "NTP_ACL|RULE_6": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9994",
+                        "SRC_IPV6": "2001::7/128"
+                    },
+                    "NTP_ACL|RULE_7": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9993",
+                        "SRC_IPV6": "2001::8/128"
+                    },
+                    "NTP_ACL|RULE_8": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9992",
+                        "SRC_IPV6": "2001::9/128"
+                    },
+                    "NTP_ACL|RULE_9": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9991",
+                        "SRC_IPV6": "2001::10/128"
+                    },
+                    "NTP_ACL|RULE_10": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9990",
+                        "SRC_IPV6": "2001::11/128"
+                    },
+                    "NTP_ACL|RULE_11": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9989",
+                        "SRC_IPV6": "2001::12/128"
+                    },
+                    "NTP_ACL|RULE_12": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9988",
+                        "SRC_IPV6": "2001::13/128"
+                    },
+                    "NTP_ACL|RULE_13": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9987",
+                        "SRC_IPV6": "2001::14/128"
+                    },
+                    "NTP_ACL|RULE_14": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9986",
+                        "SRC_IPV6": "2001::15/128"
+                    },
+                    "NTP_ACL|RULE_15": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9985",
+                        "SRC_IPV6": "2001::16/128"
+                    },
+                    "NTP_ACL|RULE_16": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9984",
+                        "SRC_IPV6": "2001::17/128"
+                    },
+                    "NTP_ACL|RULE_17": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9983",
+                        "SRC_IPV6": "2001::18/128"
+                    },
+                    "NTP_ACL|RULE_18": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9982",
+                        "SRC_IPV6": "2001::19/128"
+                    },
+                    "NTP_ACL|RULE_19": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9981",
+                        "SRC_IPV6": "2001::20/128"
+                    },
+                    "NTP_ACL|RULE_20": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9980",
+                        "SRC_IPV6": "2001::21/128"
+                    },
+                    "NTP_ACL|RULE_21": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9979",
+                        "SRC_IPV6": "2001::22/128"
+                    },
+                    "NTP_ACL|RULE_22": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9978",
+                        "SRC_IPV6": "2001::23/128"
+                    },
+                    "NTP_ACL|RULE_23": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9977",
+                        "SRC_IPV6": "2001::24/128"
+                    },
+                    "NTP_ACL|RULE_24": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9976",
+                        "SRC_IPV6": "2001::25/128"
+                    },
+                    "NTP_ACL|RULE_25": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9975",
+                        "SRC_IPV6": "2001::26/128"
+                    },
+                    "NTP_ACL|RULE_26": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9974",
+                        "SRC_IPV6": "2001::27/128"
+                    },
+                    "NTP_ACL|RULE_27": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9973",
+                        "SRC_IPV6": "2001::28/128"
+                    },
+                    "NTP_ACL|RULE_28": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9972",
+                        "SRC_IPV6": "2001::29/128"
+                    },
+                    "NTP_ACL|RULE_29": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9971",
+                        "SRC_IPV6": "2001::30/128"
+                    },
+                    "NTP_ACL|RULE_30": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9970",
+                        "SRC_IPV6": "2001::31/128"
+                    },
+                    "NTP_ACL|RULE_31": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9969",
+                        "SRC_IPV6": "2001::32/128"
+                    },
+                    "NTP_ACL|RULE_32": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9968",
+                        "SRC_IPV6": "2001::33/128"
+                    },
+                    "NTP_ACL|RULE_33": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9967",
+                        "SRC_IPV6": "2001::34/128"
+                    },
+                    "NTP_ACL|RULE_34": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9966",
+                        "SRC_IPV6": "2001::35/128"
+                    },
+                    "NTP_ACL|RULE_35": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9965",
+                        "SRC_IPV6": "2001::36/128"
+                    },
+                    "NTP_ACL|RULE_36": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9964",
+                        "SRC_IPV6": "2001::37/128"
+                    },
+                    "NTP_ACL|RULE_37": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9963",
+                        "SRC_IPV6": "2001::38/128"
+                    },
+                    "NTP_ACL|RULE_38": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9962",
+                        "SRC_IPV6": "2001::39/128"
+                    },
+                    "NTP_ACL|RULE_39": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9961",
+                        "SRC_IPV6": "2001::40/128"
+                    },
+                    "NTP_ACL|RULE_40": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9960",
+                        "SRC_IPV6": "2001::41/128"
+                    },
+                    "NTP_ACL|RULE_41": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9959",
+                        "SRC_IPV6": "2001::42/128"
+                    },
+                    "NTP_ACL|RULE_42": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9958",
+                        "SRC_IPV6": "2001::43/128"
+                    },
+                    "NTP_ACL|RULE_43": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9957",
+                        "SRC_IPV6": "2001::44/128"
+                    },
+                    "NTP_ACL|RULE_44": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9956",
+                        "SRC_IPV6": "2001::45/128"
+                    },
+                    "NTP_ACL|RULE_45": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9955",
+                        "SRC_IPV6": "2001::46/128"
+                    },
+                    "NTP_ACL|RULE_46": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9954",
+                        "SRC_IPV6": "2001::47/128"
+                    },
+                    "NTP_ACL|RULE_47": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9953",
+                        "SRC_IPV6": "2001::48/128"
+                    },
+                    "NTP_ACL|RULE_48": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9952",
+                        "SRC_IPV6": "2001::49/128"
+                    },
+                    "NTP_ACL|RULE_49": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9951",
+                        "SRC_IPV6": "2001::50/128"
+                    },
+                    "NTP_ACL|RULE_50": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9950",
+                        "SRC_IPV6": "2001::51/128"
+                    },
+                    "SNMP_ACL|RULE_1": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9999",
+                        "SRC_IPV6": "2001::2/128"
+                    },
+                    "SNMP_ACL|RULE_2": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9998",
+                        "SRC_IPV6": "2001::3/128"
+                    },
+                    "SNMP_ACL|RULE_3": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9997",
+                        "SRC_IPV6": "2001::4/128"
+                    },
+                    "SNMP_ACL|RULE_4": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9996",
+                        "SRC_IPV6": "2001::5/128"
+                    },
+                    "SNMP_ACL|RULE_5": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9995",
+                        "SRC_IPV6": "2001::6/128"
+                    },
+                    "SNMP_ACL|RULE_6": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9994",
+                        "SRC_IPV6": "2001::7/128"
+                    },
+                    "SNMP_ACL|RULE_7": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9993",
+                        "SRC_IPV6": "2001::8/128"
+                    },
+                    "SNMP_ACL|RULE_8": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9992",
+                        "SRC_IPV6": "2001::9/128"
+                    },
+                    "SNMP_ACL|RULE_9": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9991",
+                        "SRC_IPV6": "2001::10/128"
+                    },
+                    "SNMP_ACL|RULE_10": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9990",
+                        "SRC_IPV6": "2001::11/128"
+                    },
+                    "SNMP_ACL|RULE_11": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9989",
+                        "SRC_IPV6": "2001::12/128"
+                    },
+                    "SNMP_ACL|RULE_12": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9988",
+                        "SRC_IPV6": "2001::13/128"
+                    },
+                    "SNMP_ACL|RULE_13": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9987",
+                        "SRC_IPV6": "2001::14/128"
+                    },
+                    "SNMP_ACL|RULE_14": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9986",
+                        "SRC_IPV6": "2001::15/128"
+                    },
+                    "SNMP_ACL|RULE_15": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9985",
+                        "SRC_IPV6": "2001::16/128"
+                    },
+                    "SNMP_ACL|RULE_16": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9984",
+                        "SRC_IPV6": "2001::17/128"
+                    },
+                    "SNMP_ACL|RULE_17": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9983",
+                        "SRC_IPV6": "2001::18/128"
+                    },
+                    "SNMP_ACL|RULE_18": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9982",
+                        "SRC_IPV6": "2001::19/128"
+                    },
+                    "SNMP_ACL|RULE_19": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9981",
+                        "SRC_IPV6": "2001::20/128"
+                    },
+                    "SNMP_ACL|RULE_20": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9980",
+                        "SRC_IPV6": "2001::21/128"
+                    },
+                    "SNMP_ACL|RULE_21": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9979",
+                        "SRC_IPV6": "2001::22/128"
+                    },
+                    "SNMP_ACL|RULE_22": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9978",
+                        "SRC_IPV6": "2001::23/128"
+                    },
+                    "SNMP_ACL|RULE_23": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9977",
+                        "SRC_IPV6": "2001::24/128"
+                    },
+                    "SNMP_ACL|RULE_24": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9976",
+                        "SRC_IPV6": "2001::25/128"
+                    },
+                    "SNMP_ACL|RULE_25": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9975",
+                        "SRC_IPV6": "2001::26/128"
+                    },
+                    "SNMP_ACL|RULE_26": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9974",
+                        "SRC_IPV6": "2001::27/128"
+                    },
+                    "SNMP_ACL|RULE_27": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9973",
+                        "SRC_IPV6": "2001::28/128"
+                    },
+                    "SNMP_ACL|RULE_28": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9972",
+                        "SRC_IPV6": "2001::29/128"
+                    },
+                    "SNMP_ACL|RULE_29": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9971",
+                        "SRC_IPV6": "2001::30/128"
+                    },
+                    "SNMP_ACL|RULE_30": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9970",
+                        "SRC_IPV6": "2001::31/128"
+                    },
+                    "SNMP_ACL|RULE_31": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9969",
+                        "SRC_IPV6": "2001::32/128"
+                    },
+                    "SNMP_ACL|RULE_32": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9968",
+                        "SRC_IPV6": "2001::33/128"
+                    },
+                    "SNMP_ACL|RULE_33": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9967",
+                        "SRC_IPV6": "2001::34/128"
+                    },
+                    "SNMP_ACL|RULE_34": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9966",
+                        "SRC_IPV6": "2001::35/128"
+                    },
+                    "SNMP_ACL|RULE_35": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9965",
+                        "SRC_IPV6": "2001::36/128"
+                    },
+                    "SNMP_ACL|RULE_36": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9964",
+                        "SRC_IPV6": "2001::37/128"
+                    },
+                    "SNMP_ACL|RULE_37": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9963",
+                        "SRC_IPV6": "2001::38/128"
+                    },
+                    "SNMP_ACL|RULE_38": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9962",
+                        "SRC_IPV6": "2001::39/128"
+                    },
+                    "SNMP_ACL|RULE_39": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9961",
+                        "SRC_IPV6": "2001::40/128"
+                    },
+                    "SNMP_ACL|RULE_40": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9960",
+                        "SRC_IPV6": "2001::41/128"
+                    },
+                    "SNMP_ACL|RULE_41": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9959",
+                        "SRC_IPV6": "2001::42/128"
+                    },
+                    "SNMP_ACL|RULE_42": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9958",
+                        "SRC_IPV6": "2001::43/128"
+                    },
+                    "SNMP_ACL|RULE_43": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9957",
+                        "SRC_IPV6": "2001::44/128"
+                    },
+                    "SNMP_ACL|RULE_44": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9956",
+                        "SRC_IPV6": "2001::45/128"
+                    },
+                    "SNMP_ACL|RULE_45": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9955",
+                        "SRC_IPV6": "2001::46/128"
+                    },
+                    "SNMP_ACL|RULE_46": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9954",
+                        "SRC_IPV6": "2001::47/128"
+                    },
+                    "SNMP_ACL|RULE_47": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9953",
+                        "SRC_IPV6": "2001::48/128"
+                    },
+                    "SNMP_ACL|RULE_48": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9952",
+                        "SRC_IPV6": "2001::49/128"
+                    },
+                    "SNMP_ACL|RULE_49": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9951",
+                        "SRC_IPV6": "2001::50/128"
+                    },
+                    "SNMP_ACL|RULE_50": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9950",
+                        "SRC_IPV6": "2001::51/128"
+                    },
+                    "SSH_ONLY|RULE_1": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9999",
+                        "SRC_IPV6": "2001::2/128"
+                    },
+                    "SSH_ONLY|RULE_2": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9998",
+                        "SRC_IPV6": "2001::3/128"
+                    },
+                    "SSH_ONLY|RULE_3": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9997",
+                        "SRC_IPV6": "2001::4/128"
+                    },
+                    "SSH_ONLY|RULE_4": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9996",
+                        "SRC_IPV6": "2001::5/128"
+                    },
+                    "SSH_ONLY|RULE_5": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9995",
+                        "SRC_IPV6": "2001::6/128"
+                    },
+                    "SSH_ONLY|RULE_6": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9994",
+                        "SRC_IPV6": "2001::7/128"
+                    },
+                    "SSH_ONLY|RULE_7": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9993",
+                        "SRC_IPV6": "2001::8/128"
+                    },
+                    "SSH_ONLY|RULE_8": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9992",
+                        "SRC_IPV6": "2001::9/128"
+                    },
+                    "SSH_ONLY|RULE_9": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9991",
+                        "SRC_IPV6": "2001::10/128"
+                    },
+                    "SSH_ONLY|RULE_10": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9990",
+                        "SRC_IPV6": "2001::11/128"
+                    },
+                    "SSH_ONLY|RULE_11": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9989",
+                        "SRC_IPV6": "2001::12/128"
+                    },
+                    "SSH_ONLY|RULE_12": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9988",
+                        "SRC_IPV6": "2001::13/128"
+                    },
+                    "SSH_ONLY|RULE_13": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9987",
+                        "SRC_IPV6": "2001::14/128"
+                    },
+                    "SSH_ONLY|RULE_14": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9986",
+                        "SRC_IPV6": "2001::15/128"
+                    },
+                    "SSH_ONLY|RULE_15": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9985",
+                        "SRC_IPV6": "2001::16/128"
+                    },
+                    "SSH_ONLY|RULE_16": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9984",
+                        "SRC_IPV6": "2001::17/128"
+                    },
+                    "SSH_ONLY|RULE_17": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9983",
+                        "SRC_IPV6": "2001::18/128"
+                    },
+                    "SSH_ONLY|RULE_18": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9982",
+                        "SRC_IPV6": "2001::19/128"
+                    },
+                    "SSH_ONLY|RULE_19": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9981",
+                        "SRC_IPV6": "2001::20/128"
+                    },
+                    "SSH_ONLY|RULE_20": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9980",
+                        "SRC_IPV6": "2001::21/128"
+                    },
+                    "SSH_ONLY|RULE_21": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9979",
+                        "SRC_IPV6": "2001::22/128"
+                    },
+                    "SSH_ONLY|RULE_22": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9978",
+                        "SRC_IPV6": "2001::23/128"
+                    },
+                    "SSH_ONLY|RULE_23": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9977",
+                        "SRC_IPV6": "2001::24/128"
+                    },
+                    "SSH_ONLY|RULE_24": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9976",
+                        "SRC_IPV6": "2001::25/128"
+                    },
+                    "SSH_ONLY|RULE_25": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9975",
+                        "SRC_IPV6": "2001::26/128"
+                    },
+                    "SSH_ONLY|RULE_26": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9974",
+                        "SRC_IPV6": "2001::27/128"
+                    },
+                    "SSH_ONLY|RULE_27": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9973",
+                        "SRC_IPV6": "2001::28/128"
+                    },
+                    "SSH_ONLY|RULE_28": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9972",
+                        "SRC_IPV6": "2001::29/128"
+                    },
+                    "SSH_ONLY|RULE_29": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9971",
+                        "SRC_IPV6": "2001::30/128"
+                    },
+                    "SSH_ONLY|RULE_30": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9970",
+                        "SRC_IPV6": "2001::31/128"
+                    },
+                    "SSH_ONLY|RULE_31": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9969",
+                        "SRC_IPV6": "2001::32/128"
+                    },
+                    "SSH_ONLY|RULE_32": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9968",
+                        "SRC_IPV6": "2001::33/128"
+                    },
+                    "SSH_ONLY|RULE_33": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9967",
+                        "SRC_IPV6": "2001::34/128"
+                    },
+                    "SSH_ONLY|RULE_34": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9966",
+                        "SRC_IPV6": "2001::35/128"
+                    },
+                    "SSH_ONLY|RULE_35": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9965",
+                        "SRC_IPV6": "2001::36/128"
+                    },
+                    "SSH_ONLY|RULE_36": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9964",
+                        "SRC_IPV6": "2001::37/128"
+                    },
+                    "SSH_ONLY|RULE_37": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9963",
+                        "SRC_IPV6": "2001::38/128"
+                    },
+                    "SSH_ONLY|RULE_38": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9962",
+                        "SRC_IPV6": "2001::39/128"
+                    },
+                    "SSH_ONLY|RULE_39": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9961",
+                        "SRC_IPV6": "2001::40/128"
+                    },
+                    "SSH_ONLY|RULE_40": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9960",
+                        "SRC_IPV6": "2001::41/128"
+                    },
+                    "SSH_ONLY|RULE_41": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9959",
+                        "SRC_IPV6": "2001::42/128"
+                    },
+                    "SSH_ONLY|RULE_42": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9958",
+                        "SRC_IPV6": "2001::43/128"
+                    },
+                    "SSH_ONLY|RULE_43": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9957",
+                        "SRC_IPV6": "2001::44/128"
+                    },
+                    "SSH_ONLY|RULE_44": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9956",
+                        "SRC_IPV6": "2001::45/128"
+                    },
+                    "SSH_ONLY|RULE_45": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9955",
+                        "SRC_IPV6": "2001::46/128"
+                    },
+                    "SSH_ONLY|RULE_46": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9954",
+                        "SRC_IPV6": "2001::47/128"
+                    },
+                    "SSH_ONLY|RULE_47": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9953",
+                        "SRC_IPV6": "2001::48/128"
+                    },
+                    "SSH_ONLY|RULE_48": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9952",
+                        "SRC_IPV6": "2001::49/128"
+                    },
+                    "SSH_ONLY|RULE_49": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9951",
+                        "SRC_IPV6": "2001::50/128"
+                    },
+                    "SSH_ONLY|RULE_50": {
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": "9950",
+                        "SRC_IPV6": "2001::51/128"
+                    }
+                },
+                "ACL_TABLE": {
+                "NTP_ACL": {
+                    "policy_desc": "NTP_ACL",
+                    "services": [
+                        "NTP"
+                    ],
+                    "stage": "ingress",
+                    "type": "CTRLPLANE"
+                },
+                "SNMP_ACL": {
+                    "policy_desc": "SNMP_ACL",
+                    "services": [
+                        "SNMP"
+                    ],
+                    "stage": "ingress",
+                    "type": "CTRLPLANE"
+                },
+                "SSH_ONLY": {
+                    "policy_desc": "SSH_ONLY",
+                    "services": [
+                        "SSH"
+                    ],
+                    "stage": "ingress",
+                    "type": "CTRLPLANE"
+                }
+            },
+            },
+            "expected_subprocess_calls": [
+                call("ip6tables -A INPUT -p udp -s 2001::2/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::3/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::4/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::5/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::6/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::7/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::8/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::9/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::10/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::11/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::12/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::13/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::14/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::15/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::16/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::17/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::18/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::19/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::20/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::21/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::22/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::23/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::24/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::25/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::26/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::27/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::28/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::29/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::30/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::31/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::32/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::33/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::34/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::35/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::36/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::37/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::38/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::39/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::40/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::41/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::42/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::43/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::44/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::45/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::46/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::47/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::48/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::49/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::50/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::51/128 --dport 123 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::2/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::2/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::3/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::3/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::4/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::4/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::5/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::5/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::6/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::6/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::7/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::7/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::8/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::8/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::9/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::9/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::10/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::10/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::11/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::11/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::12/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::12/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::13/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::13/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::14/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::14/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::15/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::15/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::16/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::16/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::17/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::17/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::18/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::18/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::19/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::19/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::20/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::20/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::21/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::21/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::22/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::22/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::23/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::23/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::24/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::24/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::25/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::25/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::26/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::26/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::27/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::27/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::28/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::28/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::29/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::29/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::30/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::30/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::31/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::31/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::32/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::32/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::33/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::33/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::34/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::34/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::35/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::35/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::36/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::36/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::37/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::37/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::38/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::38/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::39/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::39/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::40/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::40/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::41/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::41/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::42/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::42/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::43/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::43/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::44/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::44/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::45/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::45/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::46/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::46/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::47/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::47/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::48/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::48/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::49/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::49/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::50/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::50/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::51/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p udp -s 2001::51/128 --dport 161 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::2/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::3/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::4/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::5/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::6/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::7/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::8/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::9/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::10/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::11/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::12/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::13/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::14/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::15/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::16/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::17/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::18/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::19/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::20/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::21/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::22/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::23/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::24/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::25/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::26/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::27/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::28/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::29/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::30/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::31/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::32/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::33/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::34/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::35/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::36/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::37/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::38/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::39/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::40/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::41/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::42/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::43/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::44/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::45/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::46/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::47/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::48/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::49/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::50/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE),
+                call("ip6tables -A INPUT -p tcp -s 2001::51/128 --dport 22 -j DROP", shell=True, universal_newlines=True, stdout=subprocess.PIPE)
+            ],
+            "popen_attributes": {
+                'communicate.return_value': ('output', 'error'),
+            },
+            "call_rc": 0,
+        }
+    ]
+]
diff --git a/src/sonic-host-services/tests/common/mock_configdb.py b/src/sonic-host-services/tests/common/mock_configdb.py
index 9b618254f9b4..a055d972a6d9 100644
--- a/src/sonic-host-services/tests/common/mock_configdb.py
+++ b/src/sonic-host-services/tests/common/mock_configdb.py
@@ -27,6 +27,9 @@ def get_config_db():
     def connect(self, wait_for_init=True, retry_on=True):
         pass
 
+    def close(self, db_name):
+        pass
+
     def get(self, db_id, key, field):
         return MockConfigDb.CONFIG_DB[key][field]
 

From 6884c2e9f9583b97bac7fc2773416f5b0f1a2a3c Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 6 Jul 2023 15:08:01 +0800
Subject: [PATCH 1664/1674] [submodule] Update submodule sonic-telemetry to the
 latest HEAD automatically (#15543)

#### Why I did it
src/sonic-telemetry
```
* 56aa539 - (HEAD -> 202012, origin/202012) Fix sonic-mgmt-common version in pipeline build (#124) (2 weeks ago) [Sachin Holla]
* 4264949 - Change log level (#118) (4 weeks ago) [Zain Budhwani]
```
---
 src/sonic-telemetry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-telemetry b/src/sonic-telemetry
index 6dc4bb96e970..56aa539ca57c 160000
--- a/src/sonic-telemetry
+++ b/src/sonic-telemetry
@@ -1 +1 @@
-Subproject commit 6dc4bb96e970df89d583fe9522ff95efa8eb6d75
+Subproject commit 56aa539ca57c35e64897a4e5ca59958b0e3301ea

From 6e7c000b9314fe13a62c61643f7459ec5924be81 Mon Sep 17 00:00:00 2001
From: Yaqiang Zhu <zyq1512099831@gmail.com>
Date: Thu, 6 Jul 2023 15:18:12 +0800
Subject: [PATCH 1665/1674] [submodule][202012] Update submodule
 sonic-utilities to the latest HEAD (#15532)

#### Why I did it
Update submodule sonic-utilities to the latest HEAD
```
50296b90 - [202012][dhcp-relay] Fix dhcp6relay counter issue (#2866) (#2873) (Fri Jun 30 18:08:53 2023 +0800) <Yaqiang Zhu>
160030c4 - [202012][dhcp_relay] Add "Reconfigure", "Information-Request", "Malformed" counter options (#2844) (Sun Jun 11 20:35:30 2023 -0700) <kellyyeh>
e6289ced - [vlan][dhcp_relay] Clear dhcpv6 relay counter while deleting vlan (#2852) (Fri Jun 2 18:20:21 2023 +0000) <Yaqiang Zhu>
885082ec - correctly parsing complete ipv6 vnet info (#2827) (Thu May 25 06:01:40 2023 +0000) <Keith Lu>
```

##### Work item tracking
- Microsoft ADO 22635770
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 878be48e38f1..50296b907c63 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 878be48e38f10bc52409ece52712cf3d509e894c
+Subproject commit 50296b907c63bbbd0755e3f150c53a234cecdf61

From 4e628f0524e05f74b1c6f91d7b29a2aaf66bd993 Mon Sep 17 00:00:00 2001
From: Chun'ang Li <39114813+lerry-lee@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:48:21 +0800
Subject: [PATCH 1666/1674] Refine PR test template format (#15637)

Why I did it
Refine PR test template format.

How I did it
Refine PR test template format.

How to verify it
PR test executed normally.

Signed-off-by: Chun'ang Li <chunangli@microsoft.com>
---
 .../run-test-scheduler-template.yml           | 117 +++++++++++++++---
 1 file changed, 100 insertions(+), 17 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index bbfbac961b93..e74c4b157a10 100644
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@@ -16,7 +16,11 @@ parameters:
 
 - name: MAX_WORKER
   type: string
-  default: 2
+  default: 1
+
+- name: NUM_ASIC
+  type: number
+  default: 1
 
 - name: TEST_SET
   type: string
@@ -26,14 +30,82 @@ parameters:
   type: string
   default: ""
 
+- name: COMMON_EXTRA_PARAMS
+  type: string
+  default: ""
+
+- name: VM_TYPE
+  type: string
+  default: "ceos"
+
+- name: TESTBED_NAME
+  type: string
+  default: ""
+
+- name: IMAGE_URL
+  type: string
+  default: ""
+
+- name: HWSKU
+  type: string
+  default: ""
+
+- name: TEST_PLAN_TYPE
+  type: string
+  default: ""
+
+- name: PLATFORM
+  type: string
+  default: ""
+
+- name: SCRIPTS
+  type: string
+  default: ""
+
+- name: FEATURES
+  type: string
+  default: ""
+
+- name: SCRIPTS_EXCLUDE
+  type: string
+  default: ""
+
+- name: FEATURES_EXCLUDE
+  type: string
+  default: ""
+
+- name: REPO_NAME
+  type: string
+  default: ""
+
 - name: MGMT_BRANCH
   type: string
-  default: master
+  default: ""
 
-- name: COMMON_EXTRA_PARAMS
+- name: STOP_ON_FAILURE
+  type: string
+  default: ""
+
+- name: RETRY_TIMES
   type: string
   default: ""
 
+- name: DUMP_KVM_IF_FAIL
+  type: string
+  default: "True"
+  values:
+  - "True"
+  - "False"
+
+- name: REQUESTER
+  type: string
+  default: ""
+
+- name: MAX_RUN_TEST_MINUTES
+  type: number
+  default: 480
+
+
 steps:
   - script: |
       set -e
@@ -46,9 +118,18 @@ steps:
       set -e
       pip install PyYAML
       rm -f new_test_plan_id.txt
-      python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
-      --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --mgmt-branch ${{ parameters.MGMT_BRANCH }} \
+      
+      python ./.azure-pipelines/test_plan.py create \
+      -t ${{ parameters.TOPOLOGY }} \
+      -o new_test_plan_id.txt \
+      --min-worker ${{ parameters.MIN_WORKER }} \
+      --max-worker ${{ parameters.MAX_WORKER }} \
+      --test-set ${{ parameters.TEST_SET }} \
+      --kvm-build-id $(KVM_BUILD_ID) \
+      --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
+      --mgmt-branch ${{ parameters.MGMT_BRANCH }} \
       --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}"
+      
       TEST_PLAN_ID=`cat new_test_plan_id.txt`
 
       echo "Created test plan $TEST_PLAN_ID"
@@ -94,18 +175,20 @@ steps:
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Run test
-
-  - script: |
-      set -e
-      echo "KVM dump"
-      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
-      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
-      # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
-    condition: succeededOrFailed()
-    env:
-      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
-    displayName: KVM dump
+    timeoutInMinutes: ${{ parameters.MAX_RUN_TEST_MINUTES }}
+
+  - ${{ if eq(parameters.DUMP_KVM_IF_FAIL, 'True') }}:
+    - script: |
+        set -e
+        echo "KVM dump"
+        echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
+        echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
+        # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
+        python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
+      condition: succeededOrFailed()
+      env:
+        TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+      displayName: KVM dump
 
   - script: |
       set -e

From ff9a1d5a110493fdc0e826d1ce27be37b74aee6b Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@nvidia.com>
Date: Mon, 10 Jul 2023 19:53:41 +0300
Subject: [PATCH 1667/1674] [202012][buildsystem]: Fix hiredis package version:
 0.14.1-1. (#15719)

Backport #15461

#### Why I did it
* To fix `hiredis` compilation

#### How I did it
* Changed package version: `0.14.0-3~bpo9+1` -> `0.14.1-1`

#### How to verify it
1. make configure PLATFORM=mellanox
2. make target/sonic-mellanox.bin

#### Tested branch (Please provide the tested image version)
- [X] 202012 <!-- image version 1 -->
---
 rules/hiredis.mk     |  7 ++++---
 src/hiredis/Makefile | 17 +++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/rules/hiredis.mk b/rules/hiredis.mk
index 71a18a1d6aac..a97e0bf1bb83 100644
--- a/rules/hiredis.mk
+++ b/rules/hiredis.mk
@@ -1,7 +1,7 @@
 # libhiredis package
 
-HIREDIS_VERSION = 0.14.0
-HIREDIS_VERSION_FULL = $(HIREDIS_VERSION)-3~bpo9+1
+HIREDIS_VERSION = 0.14.1
+HIREDIS_VERSION_FULL = ${HIREDIS_VERSION}-1
 
 export HIREDIS_VERSION HIREDIS_VERSION_FULL
 
@@ -12,6 +12,7 @@ SONIC_MAKE_DEBS += $(LIBHIREDIS)
 LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV)))
 
-LIBHIREDIS_DBG = libhiredis-dbg_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 LIBHIREDIS_DBG = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG)))
+
+export LIBHIREDIS LIBHIREDIS_DEV LIBHIREDIS_DBG
diff --git a/src/hiredis/Makefile b/src/hiredis/Makefile
index 4935a039e0af..c26028baff54 100644
--- a/src/hiredis/Makefile
+++ b/src/hiredis/Makefile
@@ -2,21 +2,22 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = libhiredis0.14_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+MAIN_TARGET = $(LIBHIREDIS)
+DERIVED_TARGETS = $(LIBHIREDIS_DBG) $(LIBHIREDIS_DEV)
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	rm -rf hiredis-$(HIREDIS_VERSION)
+	# Remove any stale files
+	rm -rf ./hiredis-$(HIREDIS_VERSION)
 
-	wget -O hiredis_$(HIREDIS_VERSION).orig.tar.gz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION).orig.tar.gz
-	wget -O hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz
-	wget -O hiredis_$(HIREDIS_VERSION_FULL).dsc http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
+	# Get hiredis release, debian files
+	dget -u http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
 
-	dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc
-	pushd hiredis-$(HIREDIS_VERSION)
+	# Build source and Debian packages
+	pushd ./hiredis-$(HIREDIS_VERSION)
 	dpkg-buildpackage -rfakeroot -d -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
+	# Move the newly-built .deb packages to the destination directory
 	mv $* $(DERIVED_TARGETS) $(DEST)/
 
 $(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

From f75794abdc8ce3f8ece7be93cb8ce9832106fa86 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:16:43 +0800
Subject: [PATCH 1668/1674] [TACACS+]: Extract tacacs support functions into
 library and fix memory leak issue. (#8659) (#15703)

This pull request extract tacacs support functions into library to share TACACS config file parse code with other project. Also fix memory leak issue in parse config code.

#### Why I did it
To support TACACS per command authorization, we need reuse the TACACS config file parse code in bash plugin project.

##### Work item tracking
- Microsoft ADO **(number only)**: 24433713

#### How I did it
Add libtacsupport.pc.in to extract tacacs support functions into library.
Fix memory leak issue in TACACS config parse code by convert the dynamic memory allocation memory to static memory allocation.

#### How to verify it
Pass all current UT.
Check shared library generated manually.

#### Tested branch (Please provide the tested image version)
Extract tacacs support functions into library, this will share TACACS config file parse code with other project.
Also fix memory leak issue in parse config code.

- [ ] SONiC.202012-15703.306864-1ef589c19

#### Description for the changelog
Extract tacacs support functions into library, this will share TACACS config file parse code with other project.
Also fix memory leak issue in parse config code.
---
 ...06-Add-support-for-source-ip-address.patch |  97 ++--
 ...memory-leak-when-parse-configuration.patch | 124 +++++
 ...acacs-support-functions-into-library.patch | 446 ++++++++++++++++++
 ...lag-for-authorization-and-accounting.patch |  51 ++
 ...010-handle-bad-password-set-by-sshd.patch} |  34 +-
 src/tacacs/pam/Makefile                       |   5 +-
 6 files changed, 708 insertions(+), 49 deletions(-)
 create mode 100644 src/tacacs/pam/0007-Fix-memory-leak-when-parse-configuration.patch
 create mode 100644 src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
 create mode 100644 src/tacacs/pam/0009-Add-setting-flag-for-authorization-and-accounting.patch
 rename src/tacacs/pam/{0007-handle-bad-password-set-by-sshd.patch => 0010-handle-bad-password-set-by-sshd.patch} (82%)

diff --git a/src/tacacs/pam/0006-Add-support-for-source-ip-address.patch b/src/tacacs/pam/0006-Add-support-for-source-ip-address.patch
index 280cfeee28fb..8230b34e0d1a 100644
--- a/src/tacacs/pam/0006-Add-support-for-source-ip-address.patch
+++ b/src/tacacs/pam/0006-Add-support-for-source-ip-address.patch
@@ -1,16 +1,16 @@
-From 9c26e734cf9e5cec950dc8b8f474f89d87833bcd Mon Sep 17 00:00:00 2001
+From 49526a27e90647ed4e48c1d1d88e0c75a1ce221b Mon Sep 17 00:00:00 2001
 From: Venkatesan Mahalingam <venkatesan_mahalinga@dell.com>
-Date: Wed, 1 Jul 2020 18:57:28 -0700
-Subject: [PATCH] Add support to specify source address for TACACS+
+Date: Thu, 2 Jul 2020 09:57:28 +0800
+Subject: [PATCH 1/4] Add support to specify source address for TACACS+
 
 ---
  pam_tacplus.c |  8 ++++----
- support.c     | 31 +++++++++++++++++++++++++++++++
+ support.c     | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--
  support.h     |  1 +
- 3 files changed, 36 insertions(+), 4 deletions(-)
+ 3 files changed, 57 insertions(+), 6 deletions(-)
 
 diff --git a/pam_tacplus.c b/pam_tacplus.c
-index 38e2a70..ec8ea27 100644
+index 7544b2e..9fc6be7 100644
 --- a/pam_tacplus.c
 +++ b/pam_tacplus.c
 @@ -177,7 +177,7 @@ int _pam_account(pam_handle_t *pamh, int argc, const char **argv,
@@ -50,7 +50,7 @@ index 38e2a70..ec8ea27 100644
              _pam_log(LOG_ERR, "connection failed srv %d: %m", srv_i);
              continue;
 diff --git a/support.c b/support.c
-index 7c00618..3e55e2f 100644
+index 8f42a0c..164df62 100644
 --- a/support.c
 +++ b/support.c
 @@ -37,6 +37,8 @@ char tac_service[64];
@@ -62,31 +62,76 @@ index 7c00618..3e55e2f 100644
  
  void _pam_log(int err, const char *format,...) {
      char msg[256];
-@@ -183,6 +185,12 @@ int _pam_parse (int argc, const char **argv) {
+@@ -171,6 +173,44 @@ int tacacs_get_password (pam_handle_t * pamh, int flags
+     return PAM_SUCCESS;
+ }
+ 
++/* set source ip address for the outgoing tacacs packets */
++void set_source_ip(const char *tac_source_ip) {
++    /*
++        addrinfo created by getaddrinfo must be released with freeaddrinfo.
++        so source ip address will be stored in following static variables.
++    */
++    static struct addrinfo tac_source_address;
++    static struct sockaddr tac_source_sock_addr;
++    static struct sockaddr_in6 tac_source_sock6_addr;
++
++    struct addrinfo hints, *source_address;
++    int rv;
++
++    /* set the source ip address for the tacacs packets */
++    memset(&hints, 0, sizeof(hints));
++    hints.ai_family = AF_UNSPEC;
++    hints.ai_socktype = SOCK_STREAM;
++    if ((rv = getaddrinfo(tac_source_ip, NULL, &hints,
++                          &source_address)) != 0) {
++        _pam_log(LOG_ERR, "error setting the source ip information");
++    } else {
++        tac_source_addr = &tac_source_address;
++        memcpy(tac_source_addr, source_address, sizeof(struct addrinfo));
++
++        if (source_address->ai_family == AF_INET6) {
++            tac_source_addr->ai_addr = (struct sockaddr *)&(tac_source_sock6_addr);
++            memcpy(tac_source_addr->ai_addr, source_address->ai_addr, sizeof(struct sockaddr_in6));
++        }
++        else {
++            tac_source_addr->ai_addr = &(tac_source_sock_addr);
++            memcpy(tac_source_addr->ai_addr, source_address->ai_addr, sizeof(struct sockaddr));
++        }
++
++        freeaddrinfo(source_address);
++        _pam_log(LOG_DEBUG, "source ip is set");
++    }
++}
++
+ int _pam_parse (int argc, const char **argv) {
+     int ctrl = 0;
+     const char *current_secret = NULL;
+@@ -183,6 +223,12 @@ int _pam_parse (int argc, const char **argv) {
      tac_protocol[0] = 0;
      tac_prompt[0] = 0;
      tac_login[0] = 0;
 +    tac_source_ip[0] = 0;
 +
 +    if (tac_source_addr != NULL) {
-+        freeaddrinfo(tac_source_addr);
++        /* reset source address */
 +        tac_source_addr = NULL;
 +    }
  
      for (ctrl = 0; argc-- > 0; ++argv) {
          if (!strcmp (*argv, "debug")) { /* all */
-@@ -274,6 +282,10 @@ int _pam_parse (int argc, const char **argv) {
+@@ -274,6 +320,10 @@ int _pam_parse (int argc, const char **argv) {
              }
          } else if(!strncmp(*argv, "vrf=", 4)) {
              __vrfname = strdup(*argv + 4);
 +        } else if (!strncmp (*argv, "source_ip=", strlen("source_ip="))) {
 +            /* source ip for the packets */
 +            strncpy (tac_source_ip, *argv + strlen("source_ip="), sizeof(tac_source_ip));
-+            set_source_ip (tac_source_ip, &tac_source_addr);
++            set_source_ip(tac_source_ip);
          } else {
              _pam_log (LOG_WARNING, "unrecognized option: %s", *argv);
          }
-@@ -292,8 +304,27 @@ int _pam_parse (int argc, const char **argv) {
+@@ -292,8 +342,8 @@ int _pam_parse (int argc, const char **argv) {
          _pam_log(LOG_DEBUG, "tac_protocol='%s'", tac_protocol);
          _pam_log(LOG_DEBUG, "tac_prompt='%s'", tac_prompt);
          _pam_log(LOG_DEBUG, "tac_login='%s'", tac_login);
@@ -94,28 +139,12 @@ index 7c00618..3e55e2f 100644
      }
  
      return ctrl;
- }    /* _pam_parse */
- 
-+/* set source ip address for the outgoing tacacs packets */
-+void set_source_ip(const char *tac_source_ip,
-+                   struct addrinfo **source_address) {
-+
-+    struct addrinfo hints;
-+    int rv;
-+
-+    /* set the source ip address for the tacacs packets */
-+    memset(&hints, 0, sizeof(hints));
-+    hints.ai_family = AF_UNSPEC;
-+    hints.ai_socktype = SOCK_STREAM;
-+    if ((rv = getaddrinfo(tac_source_ip, NULL, &hints,
-+                          source_address)) != 0) {
-+        _pam_log(LOG_ERR, "error setting the source ip information");
-+    } else {
-+        _pam_log(LOG_DEBUG, "source ip is set");
-+    }
-+}
+-}    /* _pam_parse */
+-
++}    /* _pam_parse */
+\ No newline at end of file
 diff --git a/support.h b/support.h
-index 9cbd040..09b8a85 100644
+index 9cbd040..b1faf43 100644
 --- a/support.h
 +++ b/support.h
 @@ -37,6 +37,7 @@ extern int tac_srv_no;
@@ -127,5 +156,5 @@ index 9cbd040..09b8a85 100644
  int _pam_parse (int, const char **);
  unsigned long _resolve_name (char *);
 -- 
-2.7.4
+2.17.1.windows.2
 
diff --git a/src/tacacs/pam/0007-Fix-memory-leak-when-parse-configuration.patch b/src/tacacs/pam/0007-Fix-memory-leak-when-parse-configuration.patch
new file mode 100644
index 000000000000..f79521d9028d
--- /dev/null
+++ b/src/tacacs/pam/0007-Fix-memory-leak-when-parse-configuration.patch
@@ -0,0 +1,124 @@
+From 99eeeccd14c905b7ad77210343bb07334eb0e8d1 Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 12 Oct 2021 10:05:28 +0800
+Subject: [PATCH 2/4] Fix memory leak when parse configuration.
+The fix code in this patch are copy from upstream project: https://github.com/kravietz/pam_tacplus/blob/master/support.c
+
+---
+ pam_tacplus.c |  6 ++++--
+ support.c     | 37 +++++++++++++++++++++++++++++++++----
+ support.h     |  2 +-
+ 3 files changed, 38 insertions(+), 7 deletions(-)
+
+diff --git a/pam_tacplus.c b/pam_tacplus.c
+index 9fc6be7..d062359 100644
+--- a/pam_tacplus.c
++++ b/pam_tacplus.c
+@@ -323,7 +323,8 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
+                     status = PAM_SUCCESS;
+                     communicating = 0;
+                     active_server.addr = tac_srv[srv_i].addr;
+-                    active_server.key = tac_srv[srv_i].key;
++                    /* copy secret to key */
++                    snprintf(active_server.key, sizeof(active_server.key), "%s", tac_srv[srv_i].key);
+ 
+                     if (ctrl & PAM_TAC_DEBUG)
+                         syslog(LOG_DEBUG, "%s: active srv %d", __FUNCTION__, srv_i);
+@@ -820,7 +821,8 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
+                     communicating = 0;
+ 
+                     active_server.addr = tac_srv[srv_i].addr;
+-                    active_server.key = tac_srv[srv_i].key;
++                    /* copy secret to key */
++                    snprintf(active_server.key, sizeof(active_server.key), "%s", tac_srv[srv_i].key);
+ 
+                     if (ctrl & PAM_TAC_DEBUG)
+                         syslog(LOG_DEBUG, "%s: active srv %d", __FUNCTION__, srv_i);
+diff --git a/support.c b/support.c
+index 164df62..e22fa31 100644
+--- a/support.c
++++ b/support.c
+@@ -30,7 +30,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++/* tacacs server information */
+ tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
++struct addrinfo tac_srv_addr[TAC_PLUS_MAXSERVERS];
++struct sockaddr tac_sock_addr[TAC_PLUS_MAXSERVERS];
++struct sockaddr_in6 tac_sock6_addr[TAC_PLUS_MAXSERVERS];
++
+ int tac_srv_no = 0;
+ 
+ char tac_service[64];
+@@ -173,6 +178,26 @@ int tacacs_get_password (pam_handle_t * pamh, int flags
+     return PAM_SUCCESS;
+ }
+ 
++/*
++ * Set tacacs server addrinfo.
++ */
++void set_tacacs_server_addr(int tac_srv_no, struct addrinfo* server) {
++    tac_srv[tac_srv_no].addr = &(tac_srv_addr[tac_srv_no]);
++    memcpy(tac_srv[tac_srv_no].addr, server, sizeof(struct addrinfo));
++
++    if (server->ai_family == AF_INET6) {
++        tac_srv[tac_srv_no].addr->ai_addr = (struct sockaddr *)&(tac_sock6_addr[tac_srv_no]);
++        memcpy(tac_srv[tac_srv_no].addr->ai_addr, server->ai_addr, sizeof(struct sockaddr_in6));
++    }
++    else {
++        tac_srv[tac_srv_no].addr->ai_addr = &(tac_sock_addr[tac_srv_no]);
++        memcpy(tac_srv[tac_srv_no].addr->ai_addr, server->ai_addr, sizeof(struct sockaddr));
++    }
++
++    tac_srv[tac_srv_no].addr->ai_canonname = NULL;
++    tac_srv[tac_srv_no].addr->ai_next = NULL;
++}
++
+ /* set source ip address for the outgoing tacacs packets */
+ void set_source_ip(const char *tac_source_ip) {
+     /*
+@@ -284,8 +309,11 @@ int _pam_parse (int argc, const char **argv) {
+                 }
+                 if ((rv = getaddrinfo(server_name, (port == NULL) ? "49" : port, &hints, &servers)) == 0) {
+                     for(server = servers; server != NULL && tac_srv_no < TAC_PLUS_MAXSERVERS; server = server->ai_next) {
+-                        tac_srv[tac_srv_no].addr = server;
+-                        tac_srv[tac_srv_no].key = current_secret;
++                        /* set server address with allocate memory */
++                        set_tacacs_server_addr(tac_srv_no, server);
++
++                        /* copy secret to key */
++                        snprintf(tac_srv[tac_srv_no].key, sizeof(tac_srv[tac_srv_no].key), "%s", current_secret);
+                         tac_srv_no++;
+                     }
+                 } else {
+@@ -304,10 +332,11 @@ int _pam_parse (int argc, const char **argv) {
+ 
+             /* if 'secret=' was given after a 'server=' parameter, fill in the current secret */
+             for(i = tac_srv_no-1; i >= 0; i--) {
+-                if (tac_srv[i].key != NULL)
++                if (tac_srv[i].key[0] != 0)
+                     break;
+ 
+-                tac_srv[i].key = current_secret;
++                /* copy secret to key */
++                snprintf(tac_srv[i].key, sizeof(tac_srv[i].key), "%s", current_secret);
+             }
+         } else if (!strncmp (*argv, "timeout=", 8)) {
+             /* FIXME atoi() doesn't handle invalid numeric strings well */
+diff --git a/support.h b/support.h
+index b1faf43..6bcb07f 100644
+--- a/support.h
++++ b/support.h
+@@ -28,7 +28,7 @@
+ 
+ typedef struct {
+     struct addrinfo *addr;
+-    const char *key;
++    char key[256];
+ } tacplus_server_t;
+ 
+ extern tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch b/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
new file mode 100644
index 000000000000..139c49564c00
--- /dev/null
+++ b/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
@@ -0,0 +1,446 @@
+From d820001f60e0a9f5e5df83b1edb229be5212e0b5 Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 12 Oct 2021 10:09:10 +0800
+Subject: [PATCH 3/4] Extract tacacs support functions into library.
+
+---
+ Makefile.am         |  16 ++-
+ configure.ac        |   3 +-
+ libtacsupport.pc.in |  11 ++
+ pam_tacplus.c       |   3 -
+ pam_tacplus.h       |   6 --
+ support.c           | 255 ++++++++++++++++++++++++++------------------
+ support.h           |  14 +++
+ 7 files changed, 194 insertions(+), 114 deletions(-)
+ create mode 100644 libtacsupport.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index c90c582..2ac9ea0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@ libtac/include/tacplus.h \
+ libtac/include/libtac.h \
+ libtac/include/cdefs.h
+ 
+-lib_LTLIBRARIES = libtac.la
++lib_LTLIBRARIES = libtac.la libtacsupport.la
+ libtac_la_SOURCES = \
+ libtac/lib/acct_r.c \
+ libtac/lib/acct_s.c \
+@@ -48,6 +48,16 @@ $(libtac_include_HEADERS)
+ libtac_la_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/libtac/include
+ libtac_la_LDFLAGS = -version-info 2:0:0 -shared
+ 
++libtacsupport_includedir = $(includedir)/libtac
++libtacsupport_include_HEADERS = \
++support.h
++
++libtacsupport_la_SOURCES = \
++support.c \
++$(libtacsupport_include_HEADERS)
++libtacsupport_la_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir) -I $(top_srcdir)/libtac/include
++libtacsupport_la_LDFLAGS = -version-info 2:0:0 -shared
++
+ moduledir = @pamdir@
+ module_LTLIBRARIES = pam_tacplus.la
+ pam_tacplus_la_SOURCES = pam_tacplus.h \
+@@ -58,7 +68,7 @@ pam_tacplus_la_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/libtac/include
+ pam_tacplus_la_LDFLAGS = -module -avoid-version
+ pam_tacplus_la_LIBADD = libtac.la
+ 
+-EXTRA_DIST = pam_tacplus.spec libtac.pc.in
++EXTRA_DIST = pam_tacplus.spec libtac.pc.in libtacsupport.pc.in
+ if DOC
+ dist_doc_DATA = sample.pam README.md AUTHORS ChangeLog
+ endif
+@@ -68,5 +78,5 @@ MAINTAINERCLEANFILES = Makefile.in config.h.in configure aclocal.m4 \
+                        config/install-sh config/ltmain.sh config/missing
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libtac.pc
++pkgconfig_DATA = libtac.pc libtacsupport.pc 
+ 
+diff --git a/configure.ac b/configure.ac
+index f67e2ba..0f917a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,6 +95,7 @@ AM_CONDITIONAL(DOC, test "x$enable_doc" != "xno")
+ dnl --------------------------------------------------------------------
+ dnl Generate made files
+ AC_CONFIG_FILES([Makefile
+-		 libtac.pc
++                 libtac.pc
++                 libtacsupport.pc
+                  pam_tacplus.spec])
+ AC_OUTPUT
+diff --git a/libtacsupport.pc.in b/libtacsupport.pc.in
+new file mode 100644
+index 0000000..1f12fe0
+--- /dev/null
++++ b/libtacsupport.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@/libtac
++
++Name: libtacsupport
++Description: TACACS+ support lib implementation
++URL: https://github.com/jeroennijhof/pam_tacplus
++Version: @VERSION@
++Libs: -L${libdir} -ltacsupport
++Cflags: -I${includedir}
+diff --git a/pam_tacplus.c b/pam_tacplus.c
+index d062359..2a484f0 100644
+--- a/pam_tacplus.c
++++ b/pam_tacplus.c
+@@ -53,9 +53,6 @@ static tacplus_server_t active_server;
+ /* accounting task identifier */
+ static short int task_id = 0;
+ 
+-extern char *__vrfname;
+-
+-
+ /* Helper functions */
+ int _pam_send_account(int tac_fd, int type, const char *user, char *tty,
+     char *r_addr, char *cmd) {
+diff --git a/pam_tacplus.h b/pam_tacplus.h
+index bc71b54..e7b30f7 100644
+--- a/pam_tacplus.h
++++ b/pam_tacplus.h
+@@ -31,12 +31,6 @@
+ #include <security/pam_appl.h>
+ #include <security/pam_modules.h>
+ 
+-/* pam_tacplus command line options */
+-#define PAM_TAC_DEBUG 0x01
+-#define PAM_TAC_ACCT  0x02 /* account on all specified servers */
+-#define PAM_TAC_USE_FIRST_PASS 0x04
+-#define PAM_TAC_TRY_FIRST_PASS 0x08
+-
+ /* pam_tacplus major, minor and patchlevel version numbers */
+ #define PAM_TAC_VMAJ 1
+ #define PAM_TAC_VMIN 3
+diff --git a/support.c b/support.c
+index e22fa31..5b6e1fa 100644
+--- a/support.c
++++ b/support.c
+@@ -29,6 +29,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h> /* isspace() */
+ 
+ /* tacacs server information */
+ tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
+@@ -236,9 +237,160 @@ void set_source_ip(const char *tac_source_ip) {
+     }
+ }
+ 
++/*
++ * Parse one arguments.
++ * Use this method for both:
++ *    1. command line parameter
++ *    2. config file
++ */
++int _pam_parse_arg (const char *arg, char* current_secret, uint current_secret_buffer_size) {
++    int ctrl = 0;
++
++    if (!strcmp (arg, "debug")) { /* all */
++        ctrl |= PAM_TAC_DEBUG;
++    } else if (!strcmp (arg, "use_first_pass")) {
++        ctrl |= PAM_TAC_USE_FIRST_PASS;
++    } else if (!strcmp (arg, "try_first_pass")) { 
++        ctrl |= PAM_TAC_TRY_FIRST_PASS;
++    } else if (!strncmp (arg, "service=", 8)) { /* author & acct */
++        xstrcpy (tac_service, arg + 8, sizeof(tac_service));
++    } else if (!strncmp (arg, "protocol=", 9)) { /* author & acct */
++        xstrcpy (tac_protocol, arg + 9, sizeof(tac_protocol));
++    } else if (!strncmp (arg, "prompt=", 7)) { /* authentication */
++        xstrcpy (tac_prompt, arg + 7, sizeof(tac_prompt));
++        /* Replace _ with space */
++        int chr;
++        for (chr = 0; chr < strlen(tac_prompt); chr++) {
++            if (tac_prompt[chr] == '_') {
++                tac_prompt[chr] = ' ';
++            }
++        }
++    } else if (!strncmp (arg, "login=", 6)) {
++        xstrcpy (tac_login, arg + 6, sizeof(tac_login));
++    } else if (!strcmp (arg, "acct_all")) {
++        ctrl |= PAM_TAC_ACCT;
++    } else if (!strncmp (arg, "server=", 7)) { /* authen & acct */
++        if(tac_srv_no < TAC_PLUS_MAXSERVERS) { 
++            struct addrinfo hints, *servers, *server;
++            int rv;
++            char *close_bracket, *server_name, *port, server_buf[256];
++
++            memset(&hints, 0, sizeof hints);
++            hints.ai_family = AF_UNSPEC;  /* use IPv4 or IPv6, whichever */
++            hints.ai_socktype = SOCK_STREAM;
++
++            if (strlen(arg + 7) >= sizeof(server_buf)) {
++                _pam_log(LOG_ERR, "server address too long, sorry");
++                return ctrl;
++            }
++            strcpy(server_buf, arg + 7);
++
++            if (*server_buf == '[' && (close_bracket = strchr(server_buf, ']')) != NULL) { /* Check for URI syntax */
++                server_name = server_buf + 1;
++                port = strrchr(close_bracket, ':');
++                *close_bracket = '\0';
++            } else { /* Fall back to traditional syntax */
++                server_name = server_buf;
++                port = strrchr(server_buf, ':');
++            }
++            if (port != NULL) {
++                *port = '\0';
++                port++;
++            }
++            if ((rv = getaddrinfo(server_name, (port == NULL) ? "49" : port, &hints, &servers)) == 0) {
++                for(server = servers; server != NULL && tac_srv_no < TAC_PLUS_MAXSERVERS; server = server->ai_next) {
++                    /* set server address with allocate memory */
++                    set_tacacs_server_addr(tac_srv_no, server);
++
++                    /* copy secret to key */
++                    snprintf(tac_srv[tac_srv_no].key, sizeof(tac_srv[tac_srv_no].key), "%s", current_secret);
++                    tac_srv_no++;
++                }
++
++                /* release servers memory */
++                freeaddrinfo(servers);
++            } else {
++                _pam_log (LOG_ERR,
++                    "skip invalid server: %s (getaddrinfo: %s)",
++                    server_name, gai_strerror(rv));
++            }
++        } else {
++            _pam_log(LOG_ERR, "maximum number of servers (%d) exceeded, skipping",
++                TAC_PLUS_MAXSERVERS);
++        }
++    } else if (!strncmp (arg, "secret=", 7)) {
++        int i;
++
++        /* points right into arg (which is const) */
++        snprintf(current_secret, current_secret_buffer_size, "%s", arg + 7);
++
++        /* if 'secret=' was given after a 'server=' parameter, fill in the current secret */
++        for(i = tac_srv_no-1; i >= 0; i--) {
++            if (tac_srv[i].key[0] != 0)
++                break;
++
++            /* copy secret to key */
++            snprintf(tac_srv[i].key, sizeof(tac_srv[i].key), "%s", current_secret);
++        }
++    } else if (!strncmp (arg, "timeout=", 8)) {
++        /* FIXME atoi() doesn't handle invalid numeric strings well */
++        tac_timeout = atoi(arg + 8);
++
++        if (tac_timeout < 0) {
++            tac_timeout = 0;
++        } else { 
++            tac_readtimeout_enable = 1;
++        }
++    } else if(!strncmp(arg, "vrf=", 4)) {
++        __vrfname = strdup(arg + 4);
++    } else if (!strncmp (arg, "source_ip=", strlen("source_ip="))) {
++        /* source ip for the packets */
++        strncpy (tac_source_ip, arg + strlen("source_ip="), sizeof(tac_source_ip));
++        set_source_ip (tac_source_ip);
++    } else {
++        _pam_log (LOG_WARNING, "unrecognized option: %s", arg);
++    }
++
++    return ctrl;
++}    /* _pam_parse_arg */
++
++
++/*
++ * Parse config file.
++ */
++int parse_config_file(const char *file) {
++    FILE *config_file;
++    char line_buffer[256];
++    int ctrl = 0;
++
++    config_file = fopen(file, "r");
++    if(config_file == NULL) {
++        _pam_log(LOG_ERR, "Failed to open config file %s: %m", file);
++        return 0;
++    }
++
++    if (tac_source_addr != NULL) {
++        /* reset source address */
++        tac_source_addr = NULL;
++    }
++
++    char current_secret[256];
++    memset(current_secret, 0, sizeof(current_secret));
++    while (fgets(line_buffer, sizeof line_buffer, config_file)) {
++        if(*line_buffer == '#' || isspace(*line_buffer))
++            continue; /* skip comments and blank line. */
++        strtok(line_buffer, " \t\n\r\f");
++        ctrl |= _pam_parse_arg(line_buffer, current_secret, sizeof(current_secret));
++    }
++
++    fclose(config_file);
++    return ctrl;
++}
++
+ int _pam_parse (int argc, const char **argv) {
+     int ctrl = 0;
+-    const char *current_secret = NULL;
++    char current_secret[256];
++    memset(current_secret, 0, sizeof(current_secret));
+ 
+     /* otherwise the list will grow with each call */
+     memset(tac_srv, 0, sizeof(tacplus_server_t) * TAC_PLUS_MAXSERVERS);
+@@ -256,106 +408,7 @@ int _pam_parse (int argc, const char **argv) {
+     }
+ 
+     for (ctrl = 0; argc-- > 0; ++argv) {
+-        if (!strcmp (*argv, "debug")) { /* all */
+-            ctrl |= PAM_TAC_DEBUG;
+-        } else if (!strcmp (*argv, "use_first_pass")) {
+-            ctrl |= PAM_TAC_USE_FIRST_PASS;
+-        } else if (!strcmp (*argv, "try_first_pass")) { 
+-            ctrl |= PAM_TAC_TRY_FIRST_PASS;
+-        } else if (!strncmp (*argv, "service=", 8)) { /* author & acct */
+-            xstrcpy (tac_service, *argv + 8, sizeof(tac_service));
+-        } else if (!strncmp (*argv, "protocol=", 9)) { /* author & acct */
+-            xstrcpy (tac_protocol, *argv + 9, sizeof(tac_protocol));
+-        } else if (!strncmp (*argv, "prompt=", 7)) { /* authentication */
+-            xstrcpy (tac_prompt, *argv + 7, sizeof(tac_prompt));
+-            /* Replace _ with space */
+-            int chr;
+-            for (chr = 0; chr < strlen(tac_prompt); chr++) {
+-                if (tac_prompt[chr] == '_') {
+-                    tac_prompt[chr] = ' ';
+-                }
+-            }
+-        } else if (!strncmp (*argv, "login=", 6)) {
+-            xstrcpy (tac_login, *argv + 6, sizeof(tac_login));
+-        } else if (!strcmp (*argv, "acct_all")) {
+-            ctrl |= PAM_TAC_ACCT;
+-        } else if (!strncmp (*argv, "server=", 7)) { /* authen & acct */
+-            if(tac_srv_no < TAC_PLUS_MAXSERVERS) { 
+-                struct addrinfo hints, *servers, *server;
+-                int rv;
+-                char *close_bracket, *server_name, *port, server_buf[256];
+-
+-                memset(&hints, 0, sizeof hints);
+-                hints.ai_family = AF_UNSPEC;  /* use IPv4 or IPv6, whichever */
+-                hints.ai_socktype = SOCK_STREAM;
+-
+-                if (strlen(*argv + 7) >= sizeof(server_buf)) {
+-                    _pam_log(LOG_ERR, "server address too long, sorry");
+-                    continue;
+-                }
+-                strcpy(server_buf, *argv + 7);
+-
+-                if (*server_buf == '[' && (close_bracket = strchr(server_buf, ']')) != NULL) { /* Check for URI syntax */
+-                    server_name = server_buf + 1;
+-                    port = strrchr(close_bracket, ':');
+-                    *close_bracket = '\0';
+-                } else { /* Fall back to traditional syntax */
+-                    server_name = server_buf;
+-                    port = strrchr(server_buf, ':');
+-                }
+-                if (port != NULL) {
+-                    *port = '\0';
+-                    port++;
+-                }
+-                if ((rv = getaddrinfo(server_name, (port == NULL) ? "49" : port, &hints, &servers)) == 0) {
+-                    for(server = servers; server != NULL && tac_srv_no < TAC_PLUS_MAXSERVERS; server = server->ai_next) {
+-                        /* set server address with allocate memory */
+-                        set_tacacs_server_addr(tac_srv_no, server);
+-
+-                        /* copy secret to key */
+-                        snprintf(tac_srv[tac_srv_no].key, sizeof(tac_srv[tac_srv_no].key), "%s", current_secret);
+-                        tac_srv_no++;
+-                    }
+-                } else {
+-                    _pam_log (LOG_ERR,
+-                        "skip invalid server: %s (getaddrinfo: %s)",
+-                        server_name, gai_strerror(rv));
+-                }
+-            } else {
+-                _pam_log(LOG_ERR, "maximum number of servers (%d) exceeded, skipping",
+-                    TAC_PLUS_MAXSERVERS);
+-            }
+-        } else if (!strncmp (*argv, "secret=", 7)) {
+-            int i;
+-
+-            current_secret = *argv + 7;     /* points right into argv (which is const) */
+-
+-            /* if 'secret=' was given after a 'server=' parameter, fill in the current secret */
+-            for(i = tac_srv_no-1; i >= 0; i--) {
+-                if (tac_srv[i].key[0] != 0)
+-                    break;
+-
+-                /* copy secret to key */
+-                snprintf(tac_srv[i].key, sizeof(tac_srv[i].key), "%s", current_secret);
+-            }
+-        } else if (!strncmp (*argv, "timeout=", 8)) {
+-            /* FIXME atoi() doesn't handle invalid numeric strings well */
+-            tac_timeout = atoi(*argv + 8);
+-
+-            if (tac_timeout < 0) {
+-                tac_timeout = 0;
+-            } else { 
+-                tac_readtimeout_enable = 1;
+-            }
+-        } else if(!strncmp(*argv, "vrf=", 4)) {
+-            __vrfname = strdup(*argv + 4);
+-        } else if (!strncmp (*argv, "source_ip=", strlen("source_ip="))) {
+-            /* source ip for the packets */
+-            strncpy (tac_source_ip, *argv + strlen("source_ip="), sizeof(tac_source_ip));
+-            set_source_ip(tac_source_ip);
+-        } else {
+-            _pam_log (LOG_WARNING, "unrecognized option: %s", *argv);
+-        }
++        ctrl |= _pam_parse_arg(*argv, current_secret, sizeof(current_secret));
+     }
+ 
+     if (ctrl & PAM_TAC_DEBUG) {
+diff --git a/support.h b/support.h
+index 6bcb07f..569172e 100644
+--- a/support.h
++++ b/support.h
+@@ -26,6 +26,14 @@
+ 
+ #include <security/pam_modules.h>
+ 
++/* pam_tacplus command line options */
++#define PAM_TAC_DEBUG 0x01
++#define PAM_TAC_ACCT  0x02
++
++/* account on all specified servers */
++#define PAM_TAC_USE_FIRST_PASS 0x04
++#define PAM_TAC_TRY_FIRST_PASS 0x08
++
+ typedef struct {
+     struct addrinfo *addr;
+     char key[256];
+@@ -33,6 +41,7 @@ typedef struct {
+ 
+ extern tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
+ extern int tac_srv_no;
++extern char *__vrfname;
+ 
+ extern char tac_service[64];
+ extern char tac_protocol[64];
+@@ -50,5 +59,10 @@ char *_pam_get_user(pam_handle_t *);
+ char *_pam_get_terminal(pam_handle_t *);
+ char *_pam_get_rhost(pam_handle_t *);
+ 
++/*
++ * Parse config file.
++ */
++int parse_config_file(const char *file);
++
+ #endif  /* PAM_TACPLUS_SUPPORT_H */
+ 
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/pam/0009-Add-setting-flag-for-authorization-and-accounting.patch b/src/tacacs/pam/0009-Add-setting-flag-for-authorization-and-accounting.patch
new file mode 100644
index 000000000000..824db59f5ba0
--- /dev/null
+++ b/src/tacacs/pam/0009-Add-setting-flag-for-authorization-and-accounting.patch
@@ -0,0 +1,51 @@
+From 8ffcdaf2154943c9034a32876571face842b805c Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 12 Oct 2021 10:10:03 +0800
+Subject: [PATCH 4/4] Add setting flag for authorization and accounting.
+
+---
+ support.c | 8 ++++++++
+ support.h | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/support.c b/support.c
+index 5b6e1fa..788ae22 100644
+--- a/support.c
++++ b/support.c
+@@ -347,6 +347,14 @@ int _pam_parse_arg (const char *arg, char* current_secret, uint current_secret_b
+         /* source ip for the packets */
+         strncpy (tac_source_ip, arg + strlen("source_ip="), sizeof(tac_source_ip));
+         set_source_ip (tac_source_ip);
++    } else if (!strcmp (arg, "local_accounting")) {
++        ctrl |= ACCOUNTING_FLAG_LOCAL;
++    } else if (!strcmp (arg, "tacacs_accounting")) {
++        ctrl |= ACCOUNTING_FLAG_TACACS;
++    } else if (!strcmp (arg, "local_authorization")) {
++        ctrl |= AUTHORIZATION_FLAG_LOCAL;
++    } else if (!strcmp (arg, "tacacs_authorization")) {
++        ctrl |= AUTHORIZATION_FLAG_TACACS;
+     } else {
+         _pam_log (LOG_WARNING, "unrecognized option: %s", arg);
+     }
+diff --git a/support.h b/support.h
+index 569172e..2b556a7 100644
+--- a/support.h
++++ b/support.h
+@@ -34,6 +34,14 @@
+ #define PAM_TAC_USE_FIRST_PASS 0x04
+ #define PAM_TAC_TRY_FIRST_PASS 0x08
+ 
++/* accounting setting flag */
++#define ACCOUNTING_FLAG_LOCAL  0x10
++#define ACCOUNTING_FLAG_TACACS 0x20
++
++/* authorization setting flag */
++#define AUTHORIZATION_FLAG_LOCAL  0x40
++#define AUTHORIZATION_FLAG_TACACS 0x80
++
+ typedef struct {
+     struct addrinfo *addr;
+     char key[256];
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch b/src/tacacs/pam/0010-handle-bad-password-set-by-sshd.patch
similarity index 82%
rename from src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
rename to src/tacacs/pam/0010-handle-bad-password-set-by-sshd.patch
index 995f3ed9f324..8fa6dadbd160 100644
--- a/src/tacacs/pam/0007-handle-bad-password-set-by-sshd.patch
+++ b/src/tacacs/pam/0010-handle-bad-password-set-by-sshd.patch
@@ -1,20 +1,20 @@
-From 4ef102dfa137c2c6e3dd63c2d16f2966b6f5add8 Mon Sep 17 00:00:00 2001
+From ed8b0366d3dbe137752fbb37a4b9fd1d46402d5b Mon Sep 17 00:00:00 2001
 From: Renuka Manavalan <remanava@microsoft.com>
-Date: Fri, 18 Feb 2022 22:07:24 +0000
+Date: Fri, 18 Feb 2022 22:27:39 +0000
 Subject: [PATCH] handle bad password set by sshd
 
 ---
  pam_tacplus.c | 11 +++++++++--
- support.c     | 37 +++++++++++++++++++++++++++++++++++++
+ support.c     | 39 ++++++++++++++++++++++++++++++++++++++-
  support.h     |  1 +
  tacc.c        |  4 ++--
- 4 files changed, 49 insertions(+), 4 deletions(-)
+ 4 files changed, 50 insertions(+), 5 deletions(-)
 
 diff --git a/pam_tacplus.c b/pam_tacplus.c
-index ec8ea27..2421874 100644
+index d57657a..38b6ee3 100644
 --- a/pam_tacplus.c
 +++ b/pam_tacplus.c
-@@ -251,6 +251,13 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
+@@ -248,6 +248,13 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
          return PAM_CRED_INSUFFICIENT;
      }
  
@@ -28,7 +28,7 @@ index ec8ea27..2421874 100644
      retval = pam_set_item (pamh, PAM_AUTHTOK, pass);
      if (retval != PAM_SUCCESS) {
          _pam_log(LOG_ERR, "unable to set password");
-@@ -483,7 +490,7 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
+@@ -481,7 +488,7 @@ int pam_sm_authenticate (pam_handle_t * pamh, int flags,
          syslog(LOG_DEBUG, "%s: exit with pam status: %d", __FUNCTION__, status);
  
      if (NULL != pass) {
@@ -37,20 +37,20 @@ index ec8ea27..2421874 100644
          free(pass);
          pass = NULL;
      }
-@@ -979,7 +986,7 @@ finish:
+@@ -978,7 +985,7 @@ finish:
          syslog(LOG_DEBUG, "%s: exit with pam status: %d", __FUNCTION__, status);
  
      if (NULL != pass) {
 -        bzero(pass, strlen(pass));
-+        memset(pass, 0, strlen (pass));
++        memset(pass, 0, strlen(pass));
          free(pass);
          pass = NULL;
      }
 diff --git a/support.c b/support.c
-index 3e55e2f..09d09bf 100644
+index f056ec4..81f3466 100644
 --- a/support.c
 +++ b/support.c
-@@ -108,6 +108,43 @@ int converse(pam_handle_t * pamh, int nargs, const struct pam_message *message,
+@@ -117,6 +117,43 @@ int converse(pam_handle_t * pamh, int nargs, const struct pam_message *message,
      return retval;
  }
  
@@ -94,11 +94,18 @@ index 3e55e2f..09d09bf 100644
  /* stolen from pam_stress */
  int tacacs_get_password (pam_handle_t * pamh, int flags
      ,int ctrl, char **password) {
+@@ -459,4 +496,4 @@ int _pam_parse (int argc, const char **argv) {
+     }
+ 
+     return ctrl;
+-}    /* _pam_parse */
+\ No newline at end of file
++}    /* _pam_parse */
 diff --git a/support.h b/support.h
-index 09b8a85..cb04a4f 100644
+index 20553da..1989530 100644
 --- a/support.h
 +++ b/support.h
-@@ -42,6 +42,7 @@ extern struct addrinfo *tac_source_addr;
+@@ -59,6 +59,7 @@ extern struct addrinfo *tac_source_addr;
  int _pam_parse (int, const char **);
  unsigned long _resolve_name (char *);
  unsigned long _getserveraddr (char *serv);
@@ -130,4 +137,3 @@ index fcc7d8c..bf0f2a3 100644
  	if (do_account) {
 -- 
 2.17.1
-
diff --git a/src/tacacs/pam/Makefile b/src/tacacs/pam/Makefile
index 843b75cc2f3d..eac4840b2afc 100644
--- a/src/tacacs/pam/Makefile
+++ b/src/tacacs/pam/Makefile
@@ -20,7 +20,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git apply ../0004-management-vrf-support.patch
 	git apply ../0005-pam-Modify-parsing-of-IP-address-and-port-number-to-.patch
 	git apply ../0006-Add-support-for-source-ip-address.patch
-	git apply ../0007-handle-bad-password-set-by-sshd.patch
+	git apply ../0007-Fix-memory-leak-when-parse-configuration.patch
+	git apply ../0008-Extract-tacacs-support-functions-into-library.patch
+	git apply ../0009-Add-setting-flag-for-authorization-and-accounting.patch
+	git apply ../0010-handle-bad-password-set-by-sshd.patch
 
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd

From 228c3d3321fe4e1b0ba10461a340c9a9bc532cce Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:17:31 +0800
Subject: [PATCH 1669/1674] [202012] [TACACS+] Add Config DB schema and HostCfg
 Enforcer plugin to support TACACS+ per-command
 authorization&accounting.(#9029) (#15718)

This pull request add Config DB schema and HostCfg Enforcer plugin to support TACACS+ per-command authorization&accounting.

##### Work item tracking
- Microsoft ADO **(number only)**: 24433713

#### Why I did it
    Support TACACS per-command authorization&accounting.

#### How I did it
    Change ConfigDB schema and HostCfg enforcer.
    Add UT to cover changed code.

#### How to verify it
    Build following project and pass all UTs:
    make target/python-wheels/sonic_host_services-1.0-py3-none-any.whl

#### Which release branch to backport (provide reason below if selected)
    N/A

#### Tested branch (Please provide the tested image version)
Extract tacacs support functions into library, this will share TACACS config file parse code with other project.
Also fix memory leak issue in parse config code.

- [ ]  SONiC.202012-15723.309781-38d8852cd

#### Description for the changelog
    Add Config DB schema and HostCfg Enforcer plugin to support TACACS+ per-command authorization&accounting.
---
 .../templates/tacplus_nss.conf.j2             |   28 +
 src/sonic-host-services/pytest.ini            |    2 +-
 src/sonic-host-services/scripts/hostcfgd      |   57 +-
 .../tests/hostcfgd/hostcfgd_tacacs_test.py    |  110 ++
 .../sample_output/LOCAL/tacplus_nss.conf      |   40 +
 .../sample_output/RADIUS/tacplus_nss.conf     |   40 +
 .../common-auth-sonic                         |   21 +
 .../TACACS_config_db_disable_accounting/login |  116 ++
 .../login.old                                 |  116 ++
 .../radius_nss.conf                           |   55 +
 .../TACACS_config_db_disable_accounting/sshd  |   55 +
 .../sshd.old                                  |   55 +
 .../tacplus_nss.conf                          |   41 +
 .../TACACS_config_db_local/common-auth-sonic  |   21 +
 .../TACACS_config_db_local/login              |  116 ++
 .../TACACS_config_db_local/login.old          |  116 ++
 .../TACACS_config_db_local/radius_nss.conf    |   55 +
 .../sample_output/TACACS_config_db_local/sshd |   55 +
 .../TACACS_config_db_local/sshd.old           |   55 +
 .../TACACS_config_db_local/tacplus_nss.conf   |   42 +
 .../common-auth-sonic                         |   21 +
 .../TACACS_config_db_local_and_tacacs/login   |  116 ++
 .../login.old                                 |  116 ++
 .../radius_nss.conf                           |   55 +
 .../TACACS_config_db_local_and_tacacs/sshd    |   55 +
 .../sshd.old                                  |   55 +
 .../tacplus_nss.conf                          |   44 +
 .../TACACS_config_db_tacacs/common-auth-sonic |   21 +
 .../TACACS_config_db_tacacs/login             |  116 ++
 .../TACACS_config_db_tacacs/login.old         |  116 ++
 .../TACACS_config_db_tacacs/radius_nss.conf   |   55 +
 .../TACACS_config_db_tacacs/sshd              |   55 +
 .../TACACS_config_db_tacacs/sshd.old          |   55 +
 .../TACACS_config_db_tacacs/tacplus_nss.conf  |   42 +
 .../tests/hostcfgd/test_tacacs_vectors.py     |  260 ++++
 .../tests/files/sample_config_db.json         | 1311 +++++++++++++++++
 .../tests/yang_model_tests/tests/aaa.json     |   19 +
 .../yang_model_tests/tests_config/aaa.json    |   57 +
 .../yang-models/sonic-system-aaa.yang         |   50 +
 39 files changed, 3805 insertions(+), 10 deletions(-)
 create mode 100644 src/sonic-host-services/tests/hostcfgd/hostcfgd_tacacs_test.py
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/LOCAL/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/RADIUS/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/common-auth-sonic
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/radius_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/common-auth-sonic
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/radius_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/common-auth-sonic
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/radius_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/common-auth-sonic
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/radius_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd.old
 create mode 100644 src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/tacplus_nss.conf
 create mode 100644 src/sonic-host-services/tests/hostcfgd/test_tacacs_vectors.py
 create mode 100644 src/sonic-yang-models/tests/files/sample_config_db.json
 create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/aaa.json
 create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/aaa.json
 create mode 100644 src/sonic-yang-models/yang-models/sonic-system-aaa.yang

diff --git a/src/sonic-host-services-data/templates/tacplus_nss.conf.j2 b/src/sonic-host-services-data/templates/tacplus_nss.conf.j2
index 8fad3035d601..812b47bfc162 100644
--- a/src/sonic-host-services-data/templates/tacplus_nss.conf.j2
+++ b/src/sonic-host-services-data/templates/tacplus_nss.conf.j2
@@ -7,6 +7,34 @@
 debug=on
 {% endif %}
 
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+{% if local_accounting %}
+local_accounting
+{% endif %}
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+{% if tacacs_accounting %}
+tacacs_accounting
+{% endif %}
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+{% if local_authorization %}
+local_authorization
+{% endif %}
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+{% if tacacs_authorization %}
+tacacs_authorization
+{% endif %}
+
 # src_ip - set source address of TACACS+ protocol packets
 # Default: None (auto source ip address)
 # src_ip=2.2.2.2
diff --git a/src/sonic-host-services/pytest.ini b/src/sonic-host-services/pytest.ini
index 781d242a3aa2..98eaa478f49a 100644
--- a/src/sonic-host-services/pytest.ini
+++ b/src/sonic-host-services/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml --ignore=tests/hostcfgd/test_vectors.py --ignore=tests/caclmgrd/test_dhcp_vectors.py
+addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml --ignore=tests/hostcfgd/test*_vectors.py  --ignore=tests/caclmgrd/test_dhcp_vectors.py
diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 21f80275df83..2862c5f57886 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -161,15 +161,23 @@ class Iptables(object):
 
 class AaaCfg(object):
     def __init__(self):
-        self.auth_default = {
+        self.authentication_default = {
             'login': 'local',
         }
+        self.authorization_default = {
+            'login': 'local',
+        }
+        self.accounting_default = {
+            'login': 'disable',
+        }
         self.tacplus_global_default = {
             'auth_type': TACPLUS_SERVER_AUTH_TYPE_DEFAULT,
             'timeout': TACPLUS_SERVER_TIMEOUT_DEFAULT,
             'passkey': TACPLUS_SERVER_PASSKEY_DEFAULT
         }
-        self.auth = {}
+        self.authentication = {}
+        self.authorization = {}
+        self.accounting = {}
         self.tacplus_global = {}
         self.tacplus_servers = {}
         self.debug = False
@@ -186,11 +194,15 @@ class AaaCfg(object):
 
     def aaa_update(self, key, data, modify_conf=True):
         if key == 'authentication':
-            self.auth = data
+            self.authentication = data
             if 'failthrough' in data:
-                self.auth['failthrough'] = is_true(data['failthrough'])
+                self.authentication['failthrough'] = is_true(data['failthrough'])
             if 'debug' in data:
                 self.debug = is_true(data['debug'])
+        if key == 'authorization':
+            self.authorization = data
+        if key == 'accounting':
+            self.accounting = data
         if modify_conf:
             self.modify_conf_file()
 
@@ -231,8 +243,12 @@ class AaaCfg(object):
         self.check_file_not_empty(filename)
 
     def modify_conf_file(self):
-        auth = self.auth_default.copy()
-        auth.update(self.auth)
+        authentication = self.authentication_default.copy()
+        authentication.update(self.authentication)
+        authorization = self.authorization_default.copy()
+        authorization.update(self.authorization)
+        accounting = self.accounting_default.copy()
+        accounting.update(self.accounting)
         tacplus_global = self.tacplus_global_default.copy()
         tacplus_global.update(self.tacplus_global)
         if 'src_ip' in tacplus_global:
@@ -253,7 +269,7 @@ class AaaCfg(object):
         env = jinja2.Environment(loader=jinja2.FileSystemLoader('/'), trim_blocks=True)
         env.filters['sub'] = sub
         template = env.get_template(template_file)
-        pam_conf = template.render(auth=auth, src_ip=src_ip, servers=servers_conf)
+        pam_conf = template.render(auth=authentication, src_ip=src_ip, servers=servers_conf)
         with open(PAM_AUTH_CONF, 'w') as f:
             f.write(pam_conf)
 
@@ -266,17 +282,40 @@ class AaaCfg(object):
             self.modify_single_file('/etc/pam.d/login', [ "'/^@include/s/common-auth-sonic$/common-auth/'" ])
 
         # Add tacplus in nsswitch.conf if TACACS+ enable
-        if 'tacacs+' in auth['login']:
+        if 'tacacs+' in authentication['login']:
             if os.path.isfile(NSS_CONF):
                 self.modify_single_file(NSS_CONF, [ "'/tacplus/b'", "'/^passwd/s/compat/tacplus &/'", "'/^passwd/s/files/tacplus &/'" ])
         else:
             if os.path.isfile(NSS_CONF):
                 self.modify_single_file(NSS_CONF, [ "'/^passwd/s/tacplus //g'" ])
 
+        # Add tacplus authorization configration in nsswitch.conf
+        tacacs_authorization_conf = None
+        local_authorization_conf = None
+        if 'tacacs+' in authorization['login']:
+            tacacs_authorization_conf = "on"
+        if 'local' in authorization['login']:
+            local_authorization_conf = "on"
+
+        # Add tacplus accounting configration in nsswitch.conf
+        tacacs_accounting_conf = None
+        local_accounting_conf = None
+        if 'tacacs+' in accounting['login']:
+            tacacs_accounting_conf = "on"
+        if 'local' in accounting['login']:
+            local_accounting_conf = "on"
+
         # Set tacacs+ server in nss-tacplus conf
         template_file = os.path.abspath(NSS_TACPLUS_CONF_TEMPLATE)
         template = env.get_template(template_file)
-        nss_tacplus_conf = template.render(debug=self.debug, src_ip=src_ip, servers=servers_conf)
+        nss_tacplus_conf = template.render(
+                                        debug=self.debug,
+                                        src_ip=src_ip,
+                                        servers=servers_conf,
+                                        local_accounting=local_accounting_conf,
+                                        tacacs_accounting=tacacs_accounting_conf,
+                                        local_authorization=local_authorization_conf,
+                                        tacacs_authorization=tacacs_authorization_conf)
         with open(NSS_TACPLUS_CONF, 'w') as f:
             f.write(nss_tacplus_conf)
 
diff --git a/src/sonic-host-services/tests/hostcfgd/hostcfgd_tacacs_test.py b/src/sonic-host-services/tests/hostcfgd/hostcfgd_tacacs_test.py
new file mode 100644
index 000000000000..85ab34fc8ba0
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/hostcfgd_tacacs_test.py
@@ -0,0 +1,110 @@
+import importlib.machinery
+import importlib.util
+import filecmp
+import shutil
+import os
+import sys
+import subprocess
+from swsscommon import swsscommon
+
+from parameterized import parameterized
+from unittest import TestCase, mock
+from tests.hostcfgd.test_tacacs_vectors import HOSTCFGD_TEST_TACACS_VECTOR
+from tests.common.mock_configdb import MockConfigDb, MockSubscriberStateTable
+from tests.common.mock_configdb import MockSelect, MockDBConnector
+
+test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+modules_path = os.path.dirname(test_path)
+scripts_path = os.path.join(modules_path, "scripts")
+src_path = os.path.dirname(modules_path)
+templates_path = os.path.join(src_path, "sonic-host-services-data/templates")
+output_path = os.path.join(test_path, "hostcfgd/output")
+sample_output_path = os.path.join(test_path, "hostcfgd/sample_output")
+sys.path.insert(0, modules_path)
+
+# Load the file under test
+hostcfgd_path = os.path.join(scripts_path, 'hostcfgd')
+loader = importlib.machinery.SourceFileLoader('hostcfgd', hostcfgd_path)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+hostcfgd = importlib.util.module_from_spec(spec)
+loader.exec_module(hostcfgd)
+sys.modules['hostcfgd'] = hostcfgd
+
+# Mock swsscommon classes
+hostcfgd.ConfigDBConnector = MockConfigDb
+hostcfgd.SubscriberStateTable = MockSubscriberStateTable
+hostcfgd.Select = MockSelect
+hostcfgd.DBConnector = MockDBConnector
+
+class TestHostcfgdTACACS(TestCase):
+    """
+        Test hostcfd daemon - TACACS
+    """
+    def run_diff(self, file1, file2):
+        return subprocess.check_output('diff -uR {} {} || true'.format(file1, file2), shell=True)
+
+    """
+        Check different config 
+    """
+    def check_config(self, test_name, test_data, config_name):
+        t_path = templates_path
+        op_path = output_path + "/" + test_name + "_" + config_name
+        sop_path = sample_output_path + "/" +  test_name + "_" + config_name
+
+        hostcfgd.PAM_AUTH_CONF_TEMPLATE = t_path + "/common-auth-sonic.j2"
+        hostcfgd.NSS_TACPLUS_CONF_TEMPLATE = t_path + "/tacplus_nss.conf.j2"
+        hostcfgd.PAM_AUTH_CONF = op_path + "/common-auth-sonic"
+        hostcfgd.NSS_TACPLUS_CONF = op_path + "/tacplus_nss.conf"
+        hostcfgd.NSS_CONF = op_path + "/nsswitch.conf"
+
+        shutil.rmtree( op_path, ignore_errors=True)
+        os.mkdir( op_path)
+
+        MockConfigDb.set_config_db(test_data[config_name])
+        host_config_daemon = hostcfgd.HostConfigDaemon()
+
+        aaa = host_config_daemon.config_db.get_table('AAA')
+
+        try:
+            tacacs_global = host_config_daemon.config_db.get_table('TACPLUS')
+        except:
+            tacacs_global = []
+        try:
+            tacacs_server = \
+                host_config_daemon.config_db.get_table('TACPLUS_SERVER')
+        except:
+            tacacs_server = []
+
+        host_config_daemon.aaacfg.load(aaa,tacacs_global,tacacs_server)
+        dcmp = filecmp.dircmp(sop_path, op_path)
+        diff_output = ""
+        for name in dcmp.diff_files:
+            diff_output += \
+                "Diff: file: {} expected: {} output: {}\n".format(\
+                    name, dcmp.left, dcmp.right)
+            diff_output += self.run_diff( dcmp.left + "/" + name,\
+                dcmp.right + "/" + name)
+        self.assertTrue(len(diff_output) == 0, diff_output)
+
+
+    @parameterized.expand(HOSTCFGD_TEST_TACACS_VECTOR)
+    def test_hostcfgd_tacacs(self, test_name, test_data):
+        """
+            Test TACACS hostcfd daemon initialization
+
+            Args:
+                test_name(str): test name
+                test_data(dict): test data which contains initial Config Db tables, and expected results
+
+            Returns:
+                None
+        """
+        os.mkdir(output_path)
+        # test local config
+        self.check_config(test_name, test_data, "config_db_local")
+        # test remote config
+        self.check_config(test_name, test_data, "config_db_tacacs")
+        # test local + tacacs config
+        self.check_config(test_name, test_data, "config_db_local_and_tacacs")
+        # test disable accounting
+        self.check_config(test_name, test_data, "config_db_disable_accounting")
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/LOCAL/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/LOCAL/tacplus_nss.conf
new file mode 100644
index 000000000000..eac828491ac1
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/LOCAL/tacplus_nss.conf
@@ -0,0 +1,40 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/RADIUS/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/RADIUS/tacplus_nss.conf
new file mode 100644
index 000000000000..eac828491ac1
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/RADIUS/tacplus_nss.conf
@@ -0,0 +1,40 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/common-auth-sonic b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/common-auth-sonic
new file mode 100644
index 000000000000..87af4cc5c6ac
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/common-auth-sonic
@@ -0,0 +1,21 @@
+#THIS IS AN AUTO-GENERATED FILE
+#
+# /etc/pam.d/common-auth- authentication settings common to all services
+# This file is included from other service-specific PAM config files,
+# and should contain a list of the authentication modules that define
+# the central authentication scheme for use on the system
+# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the
+# traditional Unix authentication mechanisms.
+#
+# here are the per-package modules (the "Primary" block)
+
+auth	[success=1 default=ignore]	pam_unix.so nullok try_first_pass
+
+#
+# here's the fallback if no module succeeds
+auth    requisite                       pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+auth    required                        pam_permit.so
+# and here are more per-package modules (the "Additional" block)
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login
new file mode 100644
index 000000000000..80ba6452813f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login.old
new file mode 100644
index 000000000000..07ff95407ccd
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/login.old
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/radius_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/radius_nss.conf
new file mode 100644
index 000000000000..1567b6e645e0
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/radius_nss.conf
@@ -0,0 +1,55 @@
+#THIS IS AN AUTO-GENERATED FILE
+# Generated from: /usr/share/sonic/templates/radius_nss.conf.j2
+# RADIUS NSS Configuration File
+#
+# Debug: on|off|trace
+# Default: off
+#
+# debug=on
+
+#
+# User Privilege:
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+
+# Eg:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=7;pw_info=netops;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=operator;gid=100;group=docker;shell=/usr/bin/sonic-launch-shell
+#
+
+# many_to_one:
+#   y: Map RADIUS users to one local user per privilege.
+#   n: Create local user account on first successful authentication.
+# Default: n
+#
+
+# Eg:
+# many_to_one=y
+#
+
+# unconfirmed_disallow:
+#   y: Do not allow unconfirmed users (users created before authentication)
+#   n: Allow unconfirmed users.
+# Default: n
+
+# Eg:
+# unconfirmed_disallow=y
+#
+
+# unconfirmed_ageout:
+#   <seconds>: Wait time before purging unconfirmed users
+# Default: 600
+#
+
+# Eg:
+# unconfirmed_ageout=900
+#
+
+# unconfirmed_regexp:
+#   <regexp>: The RE to match the command line of processes for which the
+#             creation of unconfirmed users are to be allowed.
+# Default: (.*: <user> \[priv\])|(.*: \[accepted\])
+#   where: <user> is the unconfirmed user.
+#
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd
new file mode 100644
index 000000000000..c025af353d6f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd.old
new file mode 100644
index 000000000000..d70b384bd9a3
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/sshd.old
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/tacplus_nss.conf
new file mode 100644
index 000000000000..bffd6f70391f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_disable_accounting/tacplus_nss.conf
@@ -0,0 +1,41 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+server=192.168.1.1:50,secret=dellsonic,timeout=10,vrf=default
+server=192.168.1.2:51,secret=dellsonic1,timeout=15,vrf=mgmt
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/common-auth-sonic b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/common-auth-sonic
new file mode 100644
index 000000000000..87af4cc5c6ac
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/common-auth-sonic
@@ -0,0 +1,21 @@
+#THIS IS AN AUTO-GENERATED FILE
+#
+# /etc/pam.d/common-auth- authentication settings common to all services
+# This file is included from other service-specific PAM config files,
+# and should contain a list of the authentication modules that define
+# the central authentication scheme for use on the system
+# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the
+# traditional Unix authentication mechanisms.
+#
+# here are the per-package modules (the "Primary" block)
+
+auth	[success=1 default=ignore]	pam_unix.so nullok try_first_pass
+
+#
+# here's the fallback if no module succeeds
+auth    requisite                       pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+auth    required                        pam_permit.so
+# and here are more per-package modules (the "Additional" block)
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login
new file mode 100644
index 000000000000..80ba6452813f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login.old
new file mode 100644
index 000000000000..07ff95407ccd
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/login.old
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/radius_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/radius_nss.conf
new file mode 100644
index 000000000000..1567b6e645e0
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/radius_nss.conf
@@ -0,0 +1,55 @@
+#THIS IS AN AUTO-GENERATED FILE
+# Generated from: /usr/share/sonic/templates/radius_nss.conf.j2
+# RADIUS NSS Configuration File
+#
+# Debug: on|off|trace
+# Default: off
+#
+# debug=on
+
+#
+# User Privilege:
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+
+# Eg:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=7;pw_info=netops;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=operator;gid=100;group=docker;shell=/usr/bin/sonic-launch-shell
+#
+
+# many_to_one:
+#   y: Map RADIUS users to one local user per privilege.
+#   n: Create local user account on first successful authentication.
+# Default: n
+#
+
+# Eg:
+# many_to_one=y
+#
+
+# unconfirmed_disallow:
+#   y: Do not allow unconfirmed users (users created before authentication)
+#   n: Allow unconfirmed users.
+# Default: n
+
+# Eg:
+# unconfirmed_disallow=y
+#
+
+# unconfirmed_ageout:
+#   <seconds>: Wait time before purging unconfirmed users
+# Default: 600
+#
+
+# Eg:
+# unconfirmed_ageout=900
+#
+
+# unconfirmed_regexp:
+#   <regexp>: The RE to match the command line of processes for which the
+#             creation of unconfirmed users are to be allowed.
+# Default: (.*: <user> \[priv\])|(.*: \[accepted\])
+#   where: <user> is the unconfirmed user.
+#
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd
new file mode 100644
index 000000000000..c025af353d6f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd.old
new file mode 100644
index 000000000000..d70b384bd9a3
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/sshd.old
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/tacplus_nss.conf
new file mode 100644
index 000000000000..d24cab57d1f4
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local/tacplus_nss.conf
@@ -0,0 +1,42 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+server=192.168.1.1:50,secret=dellsonic,timeout=10,vrf=default
+server=192.168.1.2:51,secret=dellsonic1,timeout=15,vrf=mgmt
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/common-auth-sonic b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/common-auth-sonic
new file mode 100644
index 000000000000..87af4cc5c6ac
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/common-auth-sonic
@@ -0,0 +1,21 @@
+#THIS IS AN AUTO-GENERATED FILE
+#
+# /etc/pam.d/common-auth- authentication settings common to all services
+# This file is included from other service-specific PAM config files,
+# and should contain a list of the authentication modules that define
+# the central authentication scheme for use on the system
+# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the
+# traditional Unix authentication mechanisms.
+#
+# here are the per-package modules (the "Primary" block)
+
+auth	[success=1 default=ignore]	pam_unix.so nullok try_first_pass
+
+#
+# here's the fallback if no module succeeds
+auth    requisite                       pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+auth    required                        pam_permit.so
+# and here are more per-package modules (the "Additional" block)
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login
new file mode 100644
index 000000000000..80ba6452813f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login.old
new file mode 100644
index 000000000000..07ff95407ccd
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/login.old
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/radius_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/radius_nss.conf
new file mode 100644
index 000000000000..1567b6e645e0
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/radius_nss.conf
@@ -0,0 +1,55 @@
+#THIS IS AN AUTO-GENERATED FILE
+# Generated from: /usr/share/sonic/templates/radius_nss.conf.j2
+# RADIUS NSS Configuration File
+#
+# Debug: on|off|trace
+# Default: off
+#
+# debug=on
+
+#
+# User Privilege:
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+
+# Eg:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=7;pw_info=netops;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=operator;gid=100;group=docker;shell=/usr/bin/sonic-launch-shell
+#
+
+# many_to_one:
+#   y: Map RADIUS users to one local user per privilege.
+#   n: Create local user account on first successful authentication.
+# Default: n
+#
+
+# Eg:
+# many_to_one=y
+#
+
+# unconfirmed_disallow:
+#   y: Do not allow unconfirmed users (users created before authentication)
+#   n: Allow unconfirmed users.
+# Default: n
+
+# Eg:
+# unconfirmed_disallow=y
+#
+
+# unconfirmed_ageout:
+#   <seconds>: Wait time before purging unconfirmed users
+# Default: 600
+#
+
+# Eg:
+# unconfirmed_ageout=900
+#
+
+# unconfirmed_regexp:
+#   <regexp>: The RE to match the command line of processes for which the
+#             creation of unconfirmed users are to be allowed.
+# Default: (.*: <user> \[priv\])|(.*: \[accepted\])
+#   where: <user> is the unconfirmed user.
+#
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd
new file mode 100644
index 000000000000..c025af353d6f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd.old
new file mode 100644
index 000000000000..d70b384bd9a3
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/sshd.old
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/tacplus_nss.conf
new file mode 100644
index 000000000000..431cbcec0aca
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_local_and_tacacs/tacplus_nss.conf
@@ -0,0 +1,44 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+server=192.168.1.1:50,secret=dellsonic,timeout=10,vrf=default
+server=192.168.1.2:51,secret=dellsonic1,timeout=15,vrf=mgmt
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/common-auth-sonic b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/common-auth-sonic
new file mode 100644
index 000000000000..87af4cc5c6ac
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/common-auth-sonic
@@ -0,0 +1,21 @@
+#THIS IS AN AUTO-GENERATED FILE
+#
+# /etc/pam.d/common-auth- authentication settings common to all services
+# This file is included from other service-specific PAM config files,
+# and should contain a list of the authentication modules that define
+# the central authentication scheme for use on the system
+# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the
+# traditional Unix authentication mechanisms.
+#
+# here are the per-package modules (the "Primary" block)
+
+auth	[success=1 default=ignore]	pam_unix.so nullok try_first_pass
+
+#
+# here's the fallback if no module succeeds
+auth    requisite                       pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+auth    required                        pam_permit.so
+# and here are more per-package modules (the "Additional" block)
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login
new file mode 100644
index 000000000000..80ba6452813f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login.old
new file mode 100644
index 000000000000..07ff95407ccd
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/login.old
@@ -0,0 +1,116 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+#
+# With the default control of this module:
+#   [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
+# root will not be prompted for a password on insecure lines.
+# if an invalid username is entered, a password is prompted (but login
+# will eventually be rejected)
+#
+# You can change it to a "requisite" module if you think root may mis-type
+# her login and should not be prompted for a password in that case. But
+# this will leave the system as vulnerable to user enumeration attacks.
+#
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root on insecure lines), but root passwords may be
+# communicated over insecure lines.
+auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+@include common-auth
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restraint on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon successful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the message of the day upon successful login.
+# (Replaces the `MOTD_FILE' option in login.defs)
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional   pam_motd.so motd=/run/motd.dynamic
+session    optional   pam_motd.so noupdate
+
+# Prints the status of the user's mailbox upon successful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
+
+# Standard Un*x account and session
+@include common-account
+@include common-session
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/radius_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/radius_nss.conf
new file mode 100644
index 000000000000..1567b6e645e0
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/radius_nss.conf
@@ -0,0 +1,55 @@
+#THIS IS AN AUTO-GENERATED FILE
+# Generated from: /usr/share/sonic/templates/radius_nss.conf.j2
+# RADIUS NSS Configuration File
+#
+# Debug: on|off|trace
+# Default: off
+#
+# debug=on
+
+#
+# User Privilege:
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+
+# Eg:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=7;pw_info=netops;gid=999;group=docker;shell=/usr/bin/sonic-launch-shell
+# user_priv=1;pw_info=operator;gid=100;group=docker;shell=/usr/bin/sonic-launch-shell
+#
+
+# many_to_one:
+#   y: Map RADIUS users to one local user per privilege.
+#   n: Create local user account on first successful authentication.
+# Default: n
+#
+
+# Eg:
+# many_to_one=y
+#
+
+# unconfirmed_disallow:
+#   y: Do not allow unconfirmed users (users created before authentication)
+#   n: Allow unconfirmed users.
+# Default: n
+
+# Eg:
+# unconfirmed_disallow=y
+#
+
+# unconfirmed_ageout:
+#   <seconds>: Wait time before purging unconfirmed users
+# Default: 600
+#
+
+# Eg:
+# unconfirmed_ageout=900
+#
+
+# unconfirmed_regexp:
+#   <regexp>: The RE to match the command line of processes for which the
+#             creation of unconfirmed users are to be allowed.
+# Default: (.*: <user> \[priv\])|(.*: \[accepted\])
+#   where: <user> is the unconfirmed user.
+#
\ No newline at end of file
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd
new file mode 100644
index 000000000000..c025af353d6f
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth-sonic
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd.old b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd.old
new file mode 100644
index 000000000000..d70b384bd9a3
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/sshd.old
@@ -0,0 +1,55 @@
+# PAM configuration for the Secure Shell service
+
+# Standard Un*x authentication.
+@include common-auth
+
+# Disallow non-root logins when /etc/nologin exists.
+account    required     pam_nologin.so
+
+# Uncomment and edit /etc/security/access.conf if you need to set complex
+# access limits that are hard to express in sshd_config.
+# account  required     pam_access.so
+
+# Standard Un*x authorization.
+@include common-account
+
+# SELinux needs to be the first session rule.  This ensures that any
+# lingering context has been cleared.  Without this it is possible that a
+# module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
+
+# Create a new session keyring.
+session    optional     pam_keyinit.so force revoke
+
+# Standard Un*x session setup and teardown.
+@include common-session
+
+# Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
+
+# Print the status of the user's mailbox upon successful login.
+session    optional     pam_mail.so standard noenv # [1]
+
+# Set up user limits from /etc/security/limits.conf.
+session    required     pam_limits.so
+
+# Read environment variables from /etc/environment and
+# /etc/security/pam_env.conf.
+session    required     pam_env.so # [1]
+# In Debian 4.0 (etch), locale-related environment variables were moved to
+# /etc/default/locale, so read that as well.
+session    required     pam_env.so user_readenv=1 envfile=/etc/default/locale
+
+# SELinux needs to intervene at login time to ensure that the process starts
+# in the proper default security context.  Only sessions which are intended
+# to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+
+# Standard Un*x password updating.
+@include common-password
diff --git a/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/tacplus_nss.conf b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/tacplus_nss.conf
new file mode 100644
index 000000000000..c9b8ab2944cc
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/sample_output/TACACS_config_db_tacacs/tacplus_nss.conf
@@ -0,0 +1,42 @@
+# Configuration for libnss-tacplus
+
+# debug - If you want to open debug log, set it on
+# Default: off
+# debug=on
+
+# local_accounting - If you want to local accounting, set it
+# Default: None
+# local_accounting
+
+# tacacs_accounting - If you want to tacacs+ accounting, set it
+# Default: None
+# tacacs_accounting
+tacacs_accounting
+
+# local_authorization - If you want to local authorization, set it
+# Default: None
+# local_authorization
+
+# tacacs_authorization - If you want to tacacs+ authorization, set it
+# Default: None
+# tacacs_authorization
+tacacs_authorization
+
+# src_ip - set source address of TACACS+ protocol packets
+# Default: None (auto source ip address)
+# src_ip=2.2.2.2
+
+# server - set ip address, tcp port, secret string and timeout for TACACS+ servers
+# Default: None (no TACACS+ server)
+# server=1.1.1.1:49,secret=test,timeout=3
+server=192.168.1.1:50,secret=dellsonic,timeout=10,vrf=default
+server=192.168.1.2:51,secret=dellsonic1,timeout=15,vrf=mgmt
+
+# user_priv - set the map between TACACS+ user privilege and local user's passwd
+# Default:
+# user_priv=15;pw_info=remote_user_su;gid=1000;group=sudo,docker;shell=/bin/bash
+# user_priv=1;pw_info=remote_user;gid=999;group=docker;shell=/bin/bash
+
+# many_to_one - create one local user for many TACACS+ users which has the same privilege
+# Default: many_to_one=n
+# many_to_one=y
diff --git a/src/sonic-host-services/tests/hostcfgd/test_tacacs_vectors.py b/src/sonic-host-services/tests/hostcfgd/test_tacacs_vectors.py
new file mode 100644
index 000000000000..38d0012fa854
--- /dev/null
+++ b/src/sonic-host-services/tests/hostcfgd/test_tacacs_vectors.py
@@ -0,0 +1,260 @@
+from unittest.mock import call
+
+"""
+    hostcfgd test tacacs vector
+"""
+HOSTCFGD_TEST_TACACS_VECTOR = [
+    [
+        "TACACS",
+        {
+            "config_db_local": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "hostname": "radius",
+                    }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "AAA": {
+                    "authentication": {
+                        "login": "local"
+                    },
+                    "authorization": {
+                        "login": "local" 
+                    },
+                    "accounting": {
+                        "login": "local" 
+                    }
+                },
+                "TACPLUS": {
+                    "global": {
+                            "auth_type": "chap",
+                            "timeout": 5,
+                            "passkey": "dellsonic",
+                            "src_intf": "Ethernet0"
+                    }
+                },
+                "TACPLUS_SERVER": {
+                    "192.168.1.1" : {
+                            "priority": 5,
+                            "tcp_port": 50,
+                            "timeout": 10,
+                            "auth_type": "chap",
+                            "passkey": "dellsonic",
+                            "vrf": "default"
+                    },
+                    "192.168.1.2" : {
+                            "priority": 2,
+                            "tcp_port": 51,
+                            "timeout": 15,
+                            "auth_type": "pap",
+                            "passkey": "dellsonic1",
+                            "vrf": "mgmt"
+                    }
+                },
+            },
+            "config_db_tacacs": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "hostname": "radius",
+                    }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "AAA": {
+                    "authentication": {
+                        "login": "local"
+                    },
+                    "authorization": {
+                        "login": "tacacs+" 
+                    },
+                    "accounting": {
+                        "login": "tacacs+" 
+                    }
+                },
+                "TACPLUS": {
+                    "global": {
+                            "auth_type": "chap",
+                            "timeout": 5,
+                            "passkey": "dellsonic",
+                            "src_intf": "Ethernet0"
+                    }
+                },
+                "TACPLUS_SERVER": {
+                    "192.168.1.1" : {
+                            "priority": 5,
+                            "tcp_port": 50,
+                            "timeout": 10,
+                            "auth_type": "chap",
+                            "passkey": "dellsonic",
+                            "vrf": "default"
+                    },
+                    "192.168.1.2" : {
+                            "priority": 2,
+                            "tcp_port": 51,
+                            "timeout": 15,
+                            "auth_type": "pap",
+                            "passkey": "dellsonic1",
+                            "vrf": "mgmt"
+                    }
+                },
+            },
+            "config_db_local_and_tacacs": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "hostname": "radius",
+                    }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "AAA": {
+                    "authentication": {
+                        "login": "local"
+                    },
+                    "authorization": {
+                        "login": "tacacs+ local" 
+                    },
+                    "accounting": {
+                        "login": "tacacs+ local" 
+                    }
+                },
+                "TACPLUS": {
+                    "global": {
+                            "auth_type": "chap",
+                            "timeout": 5,
+                            "passkey": "dellsonic",
+                            "src_intf": "Ethernet0"
+                    }
+                },
+                "TACPLUS_SERVER": {
+                    "192.168.1.1" : {
+                            "priority": 5,
+                            "tcp_port": 50,
+                            "timeout": 10,
+                            "auth_type": "chap",
+                            "passkey": "dellsonic",
+                            "vrf": "default"
+                    },
+                    "192.168.1.2" : {
+                            "priority": 2,
+                            "tcp_port": 51,
+                            "timeout": 15,
+                            "auth_type": "pap",
+                            "passkey": "dellsonic1",
+                            "vrf": "mgmt"
+                    }
+                },
+            },
+            "config_db_disable_accounting": {
+                "DEVICE_METADATA": {
+                    "localhost": {
+                        "hostname": "radius",
+                    }
+                },
+                "FEATURE": {
+                    "dhcp_relay": {
+                        "auto_restart": "enabled",
+                        "has_global_scope": "True",
+                        "has_per_asic_scope": "False",
+                        "has_timer": "False",
+                        "high_mem_alert": "disabled",
+                        "set_owner": "kube",
+                        "state": "enabled"
+                    },
+                },
+                "KDUMP": {
+                    "config": {
+                        "enabled": "false",
+                        "num_dumps": "3",
+                        "memory": "0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M"
+                        }
+                },
+                "AAA": {
+                    "authentication": {
+                        "login": "local"
+                    },
+                    "authorization": {
+                        "login": "local" 
+                    },
+                    "accounting": {
+                        "login": "disable" 
+                    }
+                },
+                "TACPLUS": {
+                    "global": {
+                            "auth_type": "chap",
+                            "timeout": 5,
+                            "passkey": "dellsonic",
+                            "src_intf": "Ethernet0"
+                    }
+                },
+                "TACPLUS_SERVER": {
+                    "192.168.1.1" : {
+                            "priority": 5,
+                            "tcp_port": 50,
+                            "timeout": 10,
+                            "auth_type": "chap",
+                            "passkey": "dellsonic",
+                            "vrf": "default"
+                    },
+                    "192.168.1.2" : {
+                            "priority": 2,
+                            "tcp_port": 51,
+                            "timeout": 15,
+                            "auth_type": "pap",
+                            "passkey": "dellsonic1",
+                            "vrf": "mgmt"
+                    }
+                },
+            }
+        }
+    ]
+]
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
new file mode 100644
index 000000000000..a65c89f1a920
--- /dev/null
+++ b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -0,0 +1,1311 @@
+{
+    "SAMPLE_CONFIG_DB_JSON": {
+        "VRF": {
+                "Vrf_blue": {
+                }
+        },
+        "PORTCHANNEL": {
+            "PortChannel0003": {
+                "admin_status": "up",
+                "min_links": "1",
+                "members": [
+                    "Ethernet1"
+                ],
+                "tpid": "0x8100",
+                "mtu": "9100",
+                "lacp_key": "auto"
+            },
+            "PortChannel0004": {
+                "admin_status": "up",
+                "min_links": "1",
+                "members": [
+                    "Ethernet2"
+                ],
+                "tpid": "0x9200",
+                "mtu": "9100",
+                "lacp_key": "auto"
+            }
+        },
+        "PORTCHANNEL_INTERFACE": {
+                "PortChannel0003": {
+                    "nat_zone": "1"
+                },
+                "PortChannel0004": {"vrf_name": "Vrf_blue"}
+        },
+        "PORTCHANNEL_MEMBER": {
+            "PortChannel0003|Ethernet1": {},
+            "PortChannel0004|Ethernet2": {}
+        },
+        "VLAN_INTERFACE": {
+            "Vlan111": {
+                "nat_zone": "0"
+            },
+            "Vlan777": {},
+            "Vlan111|2a04:5555:45:6709::1/64": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Vlan111|10.222.10.65/26": {
+                "scope": "global",
+                "family": "IPv4"
+            },
+            "Vlan111|fe80::1/10": {
+                "scope": "local",
+                "family": "IPv6"
+            },
+            "Vlan777|2a04:5555:41:4e9::1/64": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Vlan777|10.111.58.65/26": {
+                "scope": "global",
+                "family": "IPv4"
+            },
+            "Vlan777|fe80::1/10": {
+                "scope": "local",
+                "family": "IPv6"
+            }
+        },
+        "ACL_RULE": {
+            "V4-ACL-TABLE|DEFAULT_DENY": {
+                "PACKET_ACTION": "DROP",
+                "IP_TYPE": "IPv4ANY",
+                "PRIORITY": "0"
+            },
+            "V4-ACL-TABLE|Rule_20": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.222.72.0/26",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777780",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_40": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.222.72.64/26",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777760",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_60": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.222.80.0/26",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777740",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_80": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.222.80.64/26",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777720",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_111": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.152.17.52/32",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777700",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_120": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.252.208.41/32",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777880",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_140": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.148.128.245/32",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777860",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_160": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.222.1.245/32",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777840",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_180": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "10.252.222.21/32",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "777820",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_9000": {
+                "PACKET_ACTION": "DROP",
+                "DST_IP": "0.0.0.0/0",
+                "SRC_IP": "10.222.0.0/15",
+                "PRIORITY": "991110",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V4-ACL-TABLE|Rule_11100": {
+                "PACKET_ACTION": "FORWARD",
+                "DST_IP": "0.0.0.0/0",
+                "SRC_IP": "0.0.0.0/0",
+                "PRIORITY": "990000",
+                "IP_TYPE": "IPv4ANY"
+            },
+            "V6-ACL-TBLE|DEFAULT_DENY": {
+                "PACKET_ACTION": "DROP",
+                "IP_TYPE": "IPv6ANY",
+                "PRIORITY": "0"
+            },
+            "V6-ACL-TBLE|Rule_20": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "777780",
+                "DST_IPV6": "2a04:5555:43:320::/64"
+            },
+            "V6-ACL-TBLE|Rule_40": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "777760",
+                "DST_IPV6": "2a04:5555:43:321::/64"
+            },
+            "V6-ACL-TBLE|Rule_60": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "777740",
+                "DST_IPV6": "2a04:5555:43:340::/64"
+            },
+            "V6-ACL-TBLE|Rule_80": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "777720",
+                "DST_IPV6": "2a04:5555:43:341::/64"
+            },
+            "V6-ACL-TBLE|Rule_111": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "777700",
+                "DST_IPV6": "2a04:5555:32:12::/64"
+            },
+            "V6-ACL-TBLE|Rule_9000": {
+                "PACKET_ACTION": "DROP",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "2a04:5555:41::/48",
+                "PRIORITY": "991110",
+                "DST_IPV6": "::/0"
+            },
+            "V6-ACL-TBLE|Rule_11100": {
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv6ANY",
+                "SRC_IPV6": "::/0",
+                "PRIORITY": "990000",
+                "DST_IPV6": "::/0"
+            }
+        },
+        "DEVICE_METADATA": {
+            "localhost": {
+                "type": "ToRRouter",
+                "mac": "00:11:22:33:dd:5a",
+                "hostname": "asw.dc",
+                "bgp_asn": "64850",
+                "hwsku": "Stone",
+                "buffer_model": "dynamic"
+            }
+        },
+        "VLAN": {
+            "Vlan111": {
+                "description": "svlan",
+                "dhcp_servers": [
+                    "10.222.72.116"
+                ],
+                "dhcpv6_servers": [
+                    "2a04:5555:41::11"
+                ],
+                "vlanid": "111",
+                "mtu": "9216",
+                "admin_status": "up"
+            },
+            "Vlan777": {
+                "description": "pvlan",
+                "dhcp_servers": [
+                    "10.222.72.116"
+                ],
+                "dhcpv6_servers": [
+                    "2a04:5555:41::11"
+                ],
+                "vlanid": "777",
+                "mtu": "9216",
+                "admin_status": "up"
+            }
+        },
+        "DEVICE_NEIGHBOR": {
+            "Ethernet112": {
+                "name": "dccsw01.nw",
+                "port": "Eth18"
+            },
+            "Ethernet114": {
+                "name": "dccsw02.nw",
+                "port": "Eth18"
+            },
+            "Ethernet116": {
+                "name": "dccsw03.nw",
+                "port": "Eth18"
+            },
+            "Ethernet118": {
+                "name": "dccsw04.nw",
+                "port": "Eth18"
+            }
+        },
+        "MGMT_PORT": {
+            "eth0": {
+                "alias": "eth0",
+                "admin_status": "up",
+                "speed": "1000",
+                "autoneg": "off",
+                "description": "Management port",
+                "mtu": "3500"
+            }
+        },
+        "MGMT_INTERFACE": {
+            "eth0|10.11.150.11/16": {
+                "gwaddr": "10.11.0.1"
+            },
+            "eth0|fc00:2::32/64": {
+                "forced_mgmt_routes": [
+                    "10.3.145.14",
+                    "2001:aa:aa::aa",
+                    "10.0.0.100/31",
+                    "10.255.0.0/28"
+                ],
+                "gwaddr": "fc00:2::1"
+            }
+        },
+        "MGMT_VRF_CONFIG": {
+            "vrf_global": {
+                "mgmtVrfEnabled": "true"
+            }
+        },
+        "NTP": {
+            "global": {
+                "vrf": "mgmt",
+                "src_intf": [
+		    "eth0",
+		    "Loopback0"
+		]
+            }
+        },
+        "NTP_SERVER": {
+            "0.debian.pool.ntp.org": {},
+            "23.92.29.245": {},
+            "2001:aa:aa::aa": {}
+        },
+        "PORT": {
+            "Ethernet0": {
+                "alias": "Eth1/1",
+                "lanes": "65",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet1": {
+                "alias": "Eth1/2",
+                "lanes": "66",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet2": {
+                "alias": "Eth1/3",
+                "lanes": "67",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet3": {
+                "alias": "Eth1/4",
+                "lanes": "68",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x88A8",
+                "admin_status": "up"
+            },
+            "Ethernet4": {
+                "alias": "Eth2/1",
+                "lanes": "69",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x9100",
+                "admin_status": "up"
+            },
+            "Ethernet5": {
+                "alias": "Eth2/2",
+                "lanes": "70",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x9200",
+                "admin_status": "up"
+            },
+            "Ethernet6": {
+                "alias": "Eth2/3",
+                "lanes": "71",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet7": {
+                "alias": "Eth2/4",
+                "lanes": "72",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet8": {
+                "alias": "Eth3/1",
+                "lanes": "73",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet9": {
+                "alias": "Eth3/2",
+                "lanes": "74",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet10": {
+                "alias": "Eth3/3",
+                "lanes": "75",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet11": {
+                "alias": "Eth3/4",
+                "lanes": "76",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet12": {
+                "alias": "Eth4/1",
+                "lanes": "77",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet13": {
+                "alias": "Eth4/2",
+                "lanes": "78",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet14": {
+                "alias": "Eth4/3",
+                "lanes": "79",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet15": {
+                "alias": "Eth4/4",
+                "lanes": "80",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet16": {
+                "alias": "Eth5/1",
+                "lanes": "33",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet17": {
+                "alias": "Eth5/2",
+                "lanes": "34",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet18": {
+                "alias": "Eth5/3",
+                "lanes": "35",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet19": {
+                "alias": "Eth5/4",
+                "lanes": "36",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet20": {
+                "alias": "Eth6/1",
+                "lanes": "37",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet21": {
+                "alias": "Eth6/2",
+                "lanes": "38",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet22": {
+                "alias": "Eth6/3",
+                "lanes": "39",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet23": {
+                "alias": "Eth6/4",
+                "lanes": "40",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet24": {
+                "alias": "Eth7/1",
+                "lanes": "41",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet25": {
+                "alias": "Eth7/2",
+                "lanes": "42",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet26": {
+                "alias": "Eth7/3",
+                "lanes": "43",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet27": {
+                "alias": "Eth7/4",
+                "lanes": "44",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet28": {
+                "alias": "Eth8/1",
+                "lanes": "45",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet29": {
+                "alias": "Eth8/2",
+                "lanes": "46",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet30": {
+                "alias": "Eth8/3",
+                "lanes": "47",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet31": {
+                "alias": "Eth8/4",
+                "lanes": "48",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet32": {
+                "alias": "Eth9/1",
+                "lanes": "49",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet33": {
+                "alias": "Eth9/2",
+                "lanes": "50",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet34": {
+                "alias": "Eth9/3",
+                "lanes": "51",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet35": {
+                "alias": "Eth9/4",
+                "lanes": "52",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet36": {
+                "alias": "Eth10/1",
+                "lanes": "53",
+                "description": "",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            },
+            "Ethernet112": {
+                "alias": "Eth29/1",
+                "lanes": "113,114",
+                "description": "50G|dccsw01.nw|Eth18",
+                "fec": "fc",
+                "speed": "11100",
+                "tpid": "0x8100",
+                "admin_status": "up"
+            }
+        },
+        "ACL_TABLE": {
+            "V4-ACL-TABLE": {
+                "type": "L3",
+                "policy_desc": "V4-ACL-TABLE",
+                "ports": [
+                    "Ethernet26",
+                    "Ethernet27",
+                    "Ethernet24"
+                ],
+                "stage": "INGRESS",
+                "services": ["SNMP", "SSH"]
+            },
+            "V6-ACL-TBLE": {
+                "type": "L3V6",
+                "policy_desc": "V6-ACL-TBLE",
+                "ports": [
+                    "Ethernet14",
+                    "Ethernet15",
+                    "Ethernet23",
+                    "Ethernet30",
+                    "Ethernet31",
+                    "Ethernet18",
+                    "Ethernet19",
+                    "Ethernet25",
+                    "Ethernet24"
+                ]
+            }
+        },
+        "PBH_HASH_FIELD": {
+            "inner_ip_proto": {
+                "hash_field": "INNER_IP_PROTOCOL",
+                "sequence_id": "1"
+            },
+            "inner_l4_dst_port": {
+                "hash_field": "INNER_L4_DST_PORT",
+                "sequence_id": "2"
+            },
+            "inner_l4_src_port": {
+                "hash_field": "INNER_L4_SRC_PORT",
+                "sequence_id": "2"
+            },
+            "inner_dst_ipv4": {
+                "hash_field": "INNER_DST_IPV4",
+                "ip_mask": "255.0.0.0",
+                "sequence_id": "3"
+            },
+            "inner_src_ipv4": {
+                "hash_field": "INNER_SRC_IPV4",
+                "ip_mask": "0.0.0.255",
+                "sequence_id": "3"
+            },
+            "inner_dst_ipv6": {
+                "hash_field": "INNER_DST_IPV6",
+                "ip_mask": "ffff::",
+                "sequence_id": "4"
+            },
+            "inner_src_ipv6": {
+                "hash_field": "INNER_SRC_IPV6",
+                "ip_mask": "::ffff",
+                "sequence_id": "4"
+            }
+        },
+        "PBH_HASH": {
+            "inner_v4_hash": {
+                "hash_field_list": [
+                    "inner_ip_proto",
+                    "inner_l4_dst_port",
+                    "inner_l4_src_port",
+                    "inner_dst_ipv4",
+                    "inner_src_ipv4"
+                ]
+            },
+            "inner_v6_hash": {
+                "hash_field_list": [
+                    "inner_ip_proto",
+                    "inner_l4_dst_port",
+                    "inner_l4_src_port",
+                    "inner_dst_ipv6",
+                    "inner_src_ipv6"
+                ]
+            }
+        },
+        "PBH_RULE": {
+            "pbh_table|nvgre": {
+                "priority": "1",
+                "ether_type": "0x0800",
+                "ip_protocol": "0x2f",
+                "gre_key": "0x2500/0xffffff00",
+                "inner_ether_type": "0x86dd",
+                "hash": "inner_v6_hash",
+                "packet_action": "SET_ECMP_HASH",
+                "flow_counter": "DISABLED"
+            },
+            "pbh_table|vxlan": {
+                "priority": "2",
+                "ether_type": "0x0800",
+                "ip_protocol": "0x11",
+                "l4_dst_port": "0x12b5",
+                "inner_ether_type": "0x0800",
+                "hash": "inner_v4_hash",
+                "packet_action": "SET_LAG_HASH",
+                "flow_counter": "ENABLED"
+            }
+        },
+        "PBH_TABLE": {
+            "pbh_table": {
+                "interface_list": [
+                    "Ethernet0",
+                    "Ethernet4",
+                    "PortChannel0003",
+                    "PortChannel0004"
+                ],
+                "description": "NVGRE and VxLAN"
+            }
+        },
+        "INTERFACE": {
+            "Ethernet112": {},
+            "Ethernet14": {},
+            "Ethernet16": {},
+            "Ethernet18": {
+                "nat_zone": "1"
+            },
+            "Ethernet112|2a04:5555:40:a709::2/126": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Ethernet112|10.184.228.211/31": {
+                "scope": "global",
+                "family": "IPv4"
+            },
+            "Ethernet14|2a04:5555:40:a749::2/126": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Ethernet14|10.184.229.211/31": {
+                "scope": "global",
+                "family": "IPv4"
+            },
+            "Ethernet16|2a04:5555:40:a789::2/126": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Ethernet16|10.184.230.211/31": {
+                "scope": "global",
+                "family": "IPv4"
+            },
+            "Ethernet18|2a04:5555:40:a7c9::2/126": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Ethernet18|10.184.231.211/31": {
+                "scope": "global",
+                "family": "IPv4"
+            }
+        },
+        "VLAN_MEMBER": {
+            "Vlan111|Ethernet0": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet1": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet2": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet3": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet4": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet5": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet6": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet29": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet30": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet31": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet32": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet33": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet34": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet35": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|Ethernet36": {
+                "tagging_mode": "untagged"
+            },
+            "Vlan111|PortChannel0003": {
+                "tagging_mode": "untagged"
+            }
+        },
+        "LOOPBACK_INTERFACE": {
+            "Loopback0": {
+               "nat_zone": "2"
+            },
+            "Loopback0|2a04:5555:40:4::4e9/128": {
+                "scope": "global",
+                "family": "IPv6"
+            },
+            "Loopback0|10.184.8.233/32": {
+                "scope": "global",
+                "family": "IPv4"
+            }
+        },
+        "BREAKOUT_CFG": {
+            "Ethernet0": {
+                "brkout_mode": "1x100G[40G]"
+            },
+            "Ethernet4": {
+                "brkout_mode": "4x25G[10G]"
+            },
+            "Ethernet8": {
+                "brkout_mode": "1x100G[40G]"
+            }
+        },
+        "VERSIONS": {
+            "DATABASE": {
+                "VERSION": "version_1_0_3"
+            }
+        },
+        "FLEX_COUNTER_TABLE": {
+            "PFCWD": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PG_WATERMARK": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PORT": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PORT_RATES": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PORT_BUFFER_DROP": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "BUFFER_POOL_WATERMARK": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "QUEUE": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "QUEUE_WATERMARK": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "DEBUG_COUNTER": {
+                "FLEX_COUNTER_STATUS": "enable"
+            }
+        },
+        "CRM": {
+            "Config": {
+                "acl_counter_high_threshold": "85",
+                "acl_counter_low_threshold": "70",
+                "acl_counter_threshold_type": "percentage",
+                "ipv6_neighbor_high_threshold": "67",
+                "ipv6_neighbor_low_threshold": "56",
+                "ipv6_neighbor_threshold_type": "percentage",
+                "nexthop_group_high_threshold": "67",
+                "nexthop_group_low_threshold": "56",
+                "nexthop_group_threshold_type": "percentage",
+                "polling_interval": "0"
+            }
+        },
+
+        "WARM_RESTART": {
+            "bgp": {
+                "bgp_timer": "500"
+            }
+        },
+
+        "PFC_WD": {
+            "Ethernet9": {
+               "action": "drop",
+               "detection_time": "100",
+               "restoration_time": "400"
+            }
+        },
+        "PFC_WD": {
+            "GLOBAL": {
+                "POLL_INTERVAL": "100"
+            }
+        },
+        "SFLOW_COLLECTOR": {
+            "collector1": {
+                "collector_ip": "10.100.12.13",
+                "collector_port": "6343"
+            },
+            "collector2": {
+                "collector_ip": "10.144.1.2"
+            }
+        },
+
+        "SFLOW_SESSION": {
+            "Ethernet0": {
+                "admin_state": "down",
+                "sample_rate": "40000"
+            },
+            "Ethernet16": {
+                "admin_state": "up",
+                "sample_rate": "32768"
+            }
+        },
+
+        "SFLOW" : {
+            "global": {
+                "admin_state": "up",
+                "polling_interval": "20",
+                "agent_id": "Ethernet0"
+            }
+        },
+        "AAA": {
+            "authentication": {
+                "login": "local" 
+            },
+            "authorization": {
+                "login": "local" 
+            },
+            "accounting": {
+                "login": "local" 
+            }
+        },
+        "TACPLUS": {
+            "global": {
+                "auth_type": "pap",
+                "timeout": "5"
+            }
+        },
+        "TACPLUS_SERVER": {
+            "192.168.1.1": {
+                "timeout": "10"
+            }
+        },
+        "NAT_BINDINGS": {
+            "bind1": {
+                "nat_pool": "pool1",
+                "nat_type": "snat",
+                "twice_nat_id": "1"
+            }
+        },
+        "NAT_GLOBAL": {
+            "Values": {
+                "admin_mode": "enabled",
+                "nat_tcp_timeout": "86400",
+                "nat_timeout": "600",
+                "nat_udp_timeout": "300"
+            }
+        },
+        "NAT_POOL": {
+            "pool1": {
+                "nat_ip": "125.56.90.50-125.56.90.100",
+                "nat_port": "50-100"
+            }
+        },
+        "STATIC_NAPT": {
+            "125.56.90.10|UDP|100": {
+                "local_ip": "12.12.0.2",
+                "local_port": "251"
+            }
+        },
+        "STATIC_NAT": {
+            "125.56.90.8": {
+                "local_ip": "12.12.0.2"
+            }
+        },
+        "BGP_GLOBALS": {
+            "default": {
+                "router_id": "5.5.5.5",
+                "local_asn": "65001"
+            }
+        },
+        "BGP_GLOBALS_AF": {
+            "default|ipv4_unicast": {
+                "max_ebgp_paths": "2",
+                "max_ibgp_paths": "2"
+            },
+            "default|ipv6_unicast": {
+                "max_ebgp_paths": "2",
+                "max_ibgp_paths": "2"
+            }
+        },
+        "BGP_GLOBALS_AF_AGGREGATE_ADDR": {
+            "default|ipv4_unicast|21.0.0.0/8": {
+            }
+        },
+        "BGP_GLOBALS_AF_NETWORK": {
+            "default|ipv4_unicast|21.0.0.0/8": {
+            }
+        },
+        "BGP_NEIGHBOR": {
+            "10.0.0.1": {
+                "asn": "65200",
+                "holdtime": "180",
+                "keepalive": "60",
+                "local_addr": "10.0.0.2",
+                "name":"PEER1",
+                "nhopself":"0",
+                "rrclient":"0"
+            },
+            "default|192.168.1.1": {
+                "local_asn": "65200",
+                "asn": "65100",
+                "name": "bgp peer 65100",
+                "ebgp_multihop_ttl": "3"
+            }
+        },
+        "BGP_NEIGHBOR_AF": {
+            "default|192.168.1.1|ipv4_unicast": {
+            }
+        },
+        "BGP_PEER_GROUP": {
+            "default|PG1": {
+            }
+        },
+        "BGP_PEER_GROUP_AF": {
+            "default|PG1|ipv4_unicast": {
+            }
+        },
+        "BGP_GLOBALS_LISTEN_PREFIX": {
+            "default|30.0.0.0/8": {
+                "peer_group": "PG1"
+            }
+        },
+        "ROUTE_MAP_SET": {
+            "map1": {
+            }
+        },
+        "ROUTE_MAP": {
+            "map1|1": {
+                "match_med" : "100"
+            }
+        },
+        "ROUTE_REDISTRIBUTE": {
+            "default|connected|bgp|ipv4": {
+            }
+        },
+        "PREFIX_SET": {
+            "prefix1": {
+            }
+        },
+        "PREFIX": {
+            "prefix1|1|10.0.0.0/8|8..16": {
+            }
+        },
+        "COPP_GROUP": {
+            "queue1_group1": {
+                "queue": "1",
+                "trap_priority":"1",
+                "trap_action":"trap",
+                "meter_type":"packets",
+                "mode":"sr_tcm",
+                "cir":"6000",
+                "cbs":"6000",
+                "red_action":"drop"
+            }
+        },
+        "COPP_TRAP": {
+            "ip2me": {
+                "trap_ids": "ip2me",
+                "trap_group": "queue1_group1"
+            }
+        },
+        "LLDP": {
+            "GLOBAL": {
+                "mode": "TRANSMIT",
+                "enabled": "true",
+                "hello_time": "12",
+                "multiplier": "5",
+                "supp_mgmt_address_tlv": "true",
+                "supp_system_capabilities_tlv": "false",
+                "system_name": "sonic",
+                "system_description": "sonic-system"
+            }
+        },
+        "LLDP_PORT": {
+            "Ethernet0": {
+                "mode": "TRANSMIT",
+                "enabled": "true"
+            }
+        },
+        "FEATURE": {
+            "bgp": {
+                "auto_restart": "enabled",
+                "has_global_scope": "false",
+                "has_per_asic_scope": "true",
+                "has_timer": "false",
+                "high_mem_alert": "disabled",
+                "state": "enabled"
+            },
+            "database": {
+                "auto_restart": "always_enabled",
+                "has_global_scope": "true",
+                "has_per_asic_scope": "true",
+                "has_timer": "false",
+                "high_mem_alert": "disabled",
+                "state": "always_enabled"
+            },
+            "snmp": {
+                "auto_restart": "enabled",
+                "has_global_scope": "true",
+                "has_per_asic_scope": "false",
+                "has_timer": "true",
+                "high_mem_alert": "disabled",
+                "state": "enabled"
+            },
+            "swss": {
+                "auto_restart": "enabled",
+                "has_global_scope": "false",
+                "has_per_asic_scope": "true",
+                "has_timer": "false",
+                "high_mem_alert": "disabled",
+                "state": "enabled"
+            },
+            "syncd": {
+                "auto_restart": "enabled",
+                "has_global_scope": "false",
+                "has_per_asic_scope": "true",
+                "has_timer": "false",
+                "high_mem_alert": "disabled",
+                "state": "enabled"
+            },
+            "lldp": {
+                "auto_restart": "enabled",
+                "has_global_scope": "false",
+                "has_per_asic_scope": "true",
+                "has_timer": "false",
+                "high_mem_alert": "disabled",
+                "state": "enabled"
+            }
+        },
+        "DHCP_RELAY": {
+            "Vlan111": {
+                "dhcpv6_servers": [
+                    "2a04:5555:41::11"
+                ],
+                "rfc6939_support": "true"
+            },
+            "Vlan777": {
+                "dhcpv6_servers": [
+                    "2a04:5555:41::11"
+                ],
+                "rfc6939_support": "true"
+            }
+        },
+        "SCHEDULER": {
+            "TEST@0": {
+                "cbs": "256",
+                "cir": "1250000",
+                "meter_type": "bytes",
+                "pbs": "1024",
+                "pir": "25000000",
+                "type": "DWRR",
+                "weight": "20"
+            },
+
+            "TEST@1": {
+                "cbs": "1024",
+                "cir": "1280000",
+                "meter_type": "bytes",
+                "pbs": "2048",
+                "pir": "2560000",
+                "type": "STRICT"
+            }
+        },
+
+        "WRED_PROFILE": {
+            "Wred1": {
+                "ecn": "ecn_all",
+                "green_drop_probability": "50",
+                "green_max_threshold": "2048000",
+                "green_min_threshold": "1024000",
+                "wred_green_enable": "true",
+                "yellow_drop_probability": "50",
+                "yellow_max_threshold": "2048000",
+                "yellow_min_threshold": "1024000",
+                "wred_yellow_enable": "true",
+                "red_drop_probability": "50",
+                "red_max_threshold": "2048000",
+                "red_min_threshold": "1024000",
+                "wred_red_enable": "true"
+            }
+        },
+
+        "QUEUE": {
+            "Ethernet0|0": {
+                "scheduler": "TEST@0",
+                "wred_profile": "Wred1"
+            },
+            "Ethernet0|1": {
+                "scheduler": "TEST@1",
+                "wred_profile": "Wred1"
+            }
+         },		
+
+        "DSCP_TO_TC_MAP": {
+           "Dscp_to_tc_map1": { 
+              "1": "1",
+              "2": "2"
+            }, 
+           "Dscp_to_tc_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "DOT1P_TO_TC_MAP": {
+           "Dot1p_to_tc_map1": { 
+              "1": "1",
+              "2": "2"
+            }, 
+           "Dot1p_to_tc_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "TC_TO_PRIORITY_GROUP_MAP": {
+           "tc_to_pg_map1": { 
+              "1": "1",
+              "2": "2"
+            }, 
+           "tc_to_pg_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "TC_TO_QUEUE_MAP": {
+           "tc_to_q_map1": { 
+              "1": "1",
+              "2": "2"
+            }, 
+           "tc_to_q_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "MAP_PFC_PRIORITY_TO_QUEUE": {
+           "pfc_prio_to_q_map1": { 
+              "1": "1",
+              "2": "2"
+           }, 
+           "pfc_prio_to_q_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+           "pfc_prio_to_pg_map1": { 
+              "1": "1",
+              "2": "2"
+            }, 
+            "pfc_prio_to_pg_map2": { 
+              "3": "3",
+              "4": "4"
+            }
+        },
+
+        "PORT_QOS_MAP": {
+           "Ethernet0": { 
+              "dot1p_to_tc_map" : "Dot1p_to_tc_map1",
+              "dscp_to_tc_map": "Dscp_to_tc_map1",
+	          "tc_to_queue_map": "tc_to_q_map1",
+	          "tc_to_pg_map": "tc_to_pg_map1",
+	          "pfc_to_queue_map": "pfc_prio_to_q_map1",
+	          "pfc_to_pg_map"   : "pfc_prio_to_pg_map1",
+	          "pfc_enable"      : "3,4"
+            }, 
+            "Ethernet4": { 
+              "dot1p_to_tc_map" : "Dot1p_to_tc_map2",
+              "dscp_to_tc_map": "Dscp_to_tc_map2",
+	          "tc_to_queue_map": "tc_to_q_map2",
+	          "tc_to_pg_map": "tc_to_pg_map2",
+	          "pfc_to_queue_map": "pfc_prio_to_q_map2",
+	          "pfc_to_pg_map"   : "pfc_prio_to_pg_map2",
+	          "pfc_enable"      : "3,4"
+            }
+        }
+    },
+
+    "SAMPLE_CONFIG_DB_UNKNOWN": {
+        "UNKNOWN_TABLE": {
+            "Error": "This Table is for testing, This Table does not have YANG models."
+        }
+    }
+}
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/aaa.json b/src/sonic-yang-models/tests/yang_model_tests/tests/aaa.json
new file mode 100644
index 000000000000..5ecede4267f9
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/aaa.json
@@ -0,0 +1,19 @@
+{
+    "AAA_TEST": {
+        "desc": "Configure an authentication type in AAA table."
+    },
+    "AAA_TEST_WRONG_TYPE": {
+        "desc": "Configure a wrong type in AAA table.",
+        "eStrKey": "InvalidValue"
+    },
+    "AAA_TEST_WRONG_FAILTHROUGH": {
+        "desc": "Configure a wrong failthrough in AAA table.",
+        "eStrKey": "InvalidValue"
+    },
+    "AAA_AUTHORIZATION_TEST": {
+        "desc": "Configure an authorization type in AAA table."
+    },
+    "AAA_ACCOUNTING_TEST": {
+        "desc": "Configure an accounting type in AAA table."
+    }
+}
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/aaa.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/aaa.json
new file mode 100644
index 000000000000..87b03ecd9d13
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/aaa.json
@@ -0,0 +1,57 @@
+{
+    "AAA_TEST": {
+        "sonic-system-aaa:sonic-system-aaa": {
+            "sonic-system-aaa:AAA": {
+                "AAA_LIST": [{
+                        "type": "authentication",
+                        "login": "tacacs+,local",
+                        "failthrough": "true",
+                        "debug": "true"
+                }]
+            }
+        }
+    },
+
+    "AAA_TEST_WRONG_TYPE": {
+        "sonic-system-aaa:sonic-system-aaa": {
+            "sonic-system-aaa:AAA": {
+                "AAA_LIST": [{
+                        "type": "unknowntype"
+                }]
+            }
+        }
+    },
+
+    "AAA_TEST_WRONG_FAILTHROUGH": {
+        "sonic-system-aaa:sonic-system-aaa": {
+            "sonic-system-aaa:AAA": {
+                "AAA_LIST": [{
+                        "type": "authentication",
+                        "failthrough": "enable"
+                }]
+            }
+        }
+    },
+
+    "AAA_AUTHORIZATION_TEST": {
+        "sonic-system-aaa:sonic-system-aaa": {
+            "sonic-system-aaa:AAA": {
+                "AAA_LIST": [{
+                        "type": "authorization",
+                        "login": "tacacs+"
+                }]
+            }
+        }
+    },
+
+    "AAA_ACCOUNTING_TEST": {
+        "sonic-system-aaa:sonic-system-aaa": {
+            "sonic-system-aaa:AAA": {
+                "AAA_LIST": [{
+                        "type": "accounting",
+                        "login": "tacacs+"
+                }]
+            }
+        }
+    }
+}
diff --git a/src/sonic-yang-models/yang-models/sonic-system-aaa.yang b/src/sonic-yang-models/yang-models/sonic-system-aaa.yang
new file mode 100644
index 000000000000..01e342b26915
--- /dev/null
+++ b/src/sonic-yang-models/yang-models/sonic-system-aaa.yang
@@ -0,0 +1,50 @@
+module sonic-system-aaa {
+    namespace "http://github.com/Azure/sonic-system-aaa";
+    prefix ssys;
+    yang-version 1.1;
+
+    revision 2021-10-12 {
+        description "Add AAA authorization/accounting support.";
+    }
+
+    revision 2021-04-15 {
+        description "Initial revision.";
+    }
+
+    container sonic-system-aaa {
+        container AAA {
+            list AAA_LIST {
+                key "type";
+
+                leaf type {
+                    type enumeration {
+                        enum authentication;
+                        enum authorization;
+                        enum accounting;
+                    }
+                    description "AAA type authentication/authorization/accounting";
+                }
+
+                leaf login {
+                    type string;
+                    description "AAA authentication/authorization/accounting methods - local/tacacs+/disable";
+                    default "local";
+                }
+
+                leaf failthrough {
+                    type boolean;
+                    description "When set to true, authentication is attempted on next configured server/local in the list upon failure.";
+                    default false;
+                }
+                
+                leaf debug {
+                    type boolean;
+                    description "Enable/disable AAA debugging";
+                    default false;
+                }
+
+            }
+        }
+    }
+}
+

From 9a733fde99c291e33a71c042a7d8607f8e314f9b Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:19:08 +0800
Subject: [PATCH 1670/1674] Update submodule sonic-utilities (#15770)

sonic-utilities submodule update

#### Why I did it
sonic-utilities submodule update:
```
399b1e3 2023-07-06 [202012][Show][BGP] Show BGP Change for no neighbor scenario (#2886)
7b47641 2023-07-10 [[202012] [TACACS+] Add config command for AAA authorization and accounting. (#1889)
```
##### Work item tracking
- Microsoft ADO **(number only)**:24433713

#### How I did it
Update sonic-utilities submodule.

#### How to verify it
Pass all test case.

#### Tested branch (Please provide the tested image version)
- [ ] SONiC.202012-15703.306864-1ef589c19
---
 src/sonic-utilities | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-utilities b/src/sonic-utilities
index 50296b907c63..7b47641f4694 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 50296b907c63bbbd0755e3f150c53a234cecdf61
+Subproject commit 7b47641f46948b2f32e926ca63eb9e2041ccb606

From 4df2bc9b44f8ffa9eb7691e59665f4a87aec1b5b Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Thu, 13 Jul 2023 09:46:47 +0800
Subject: [PATCH 1671/1674] [202012] [TACACS+] Add audisp-tacplus for
 per-command accounting. (#8750) (#15788)

This pull request integrate audisp-tacplus to SONiC for per-command accounting.

##### Work item tracking
- Microsoft ADO **(number only)**: 24433713

#### Why I did it
To support TACACS per-command accounting, we integrate audisp-tacplus project to sonic.

#### How I did it
1. Add auditd service to SONiC
2. Port and patch audisp-tacplus to SONiC

#### How to verify it
UT with CUnit to cover all new code in usersecret-filter.c
Also pass all current UT.

#### Tested branch (Please provide the tested image version)
Extract tacacs support functions into library, this will share TACACS config file parse code with other project.
Also fix memory leak issue in parse config code.

- [ ]  SONiC.202012-15723.312602-e230e2d3e

#### Description for the changelog
Add audisp-tacplus for per-command accounting.
---
 build_debian.sh                               |    6 +-
 .../build_templates/sonic_debian_extension.j2 |    3 +
 rules/tacacs.mk                               |   13 +-
 slave.mk                                      |    3 +-
 sonic-slave-buster/Dockerfile.j2              |    5 +-
 sonic-slave-jessie/Dockerfile.j2              |    3 +
 sonic-slave-stretch/Dockerfile.j2             |    5 +-
 src/sonic-host-services/scripts/hostcfgd      |   27 +
 src/tacacs/.gitignore                         |    3 +
 src/tacacs/audisp/Makefile                    |   30 +
 .../patches/0001-Porting-to-sonic.patch       |  426 ++++++
 ...move-user-secret-from-accounting-log.patch | 1139 +++++++++++++++++
 .../patches/0003-Add-local-accounting.patch   |   97 ++
 src/tacacs/audisp/patches/series              |    3 +
 14 files changed, 1757 insertions(+), 6 deletions(-)
 create mode 100644 src/tacacs/audisp/Makefile
 create mode 100644 src/tacacs/audisp/patches/0001-Porting-to-sonic.patch
 create mode 100644 src/tacacs/audisp/patches/0002-Remove-user-secret-from-accounting-log.patch
 create mode 100644 src/tacacs/audisp/patches/0003-Add-local-accounting.patch
 create mode 100644 src/tacacs/audisp/patches/series

diff --git a/build_debian.sh b/build_debian.sh
index fc5d1d999b73..d1dc659cd88e 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -322,7 +322,11 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python3-pip             \
     cron                    \
     haveged                 \
-    jq
+    jq                      \
+    auditd
+
+# Change auditd log file path to fix auditd can't startup issue.
+sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "sudo sed -i 's/^\s*log_file\s*=.*/log_file = \/var\/log\/audit.log/g' /etc/audit/auditd.conf"
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 606f466ed3ac..855018f0bedb 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -281,6 +281,9 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libpam-tacplus_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libnss-tacplus_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+# Install audisp-tacplus
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/audisp-tacplus_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 # Disable tacplus by default
 sudo LANG=C chroot $FILESYSTEM_ROOT pam-auth-update --remove tacplus
 sudo sed -i -e '/^passwd/s/ tacplus//' $FILESYSTEM_ROOT/etc/nsswitch.conf
diff --git a/rules/tacacs.mk b/rules/tacacs.mk
index 1c620ebcedc5..5112d31681a7 100644
--- a/rules/tacacs.mk
+++ b/rules/tacacs.mk
@@ -16,8 +16,6 @@ LIBTAC_DEV = libtac-dev_$(PAM_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb
 $(LIBTAC_DEV)_DEPENDS += $(LIBTAC2)
 $(eval $(call add_derived_package,$(LIBTAC2),$(LIBTAC_DEV)))
 
-
-
 # libnss-tacplus packages
 NSS_TACPLUS_VERSION = 1.0.4-1
 
@@ -29,6 +27,17 @@ $(LIBNSS_TACPLUS)_RDEPENDS += $(LIBTAC2)
 $(LIBNSS_TACPLUS)_SRC_PATH = $(SRC_PATH)/tacacs/nss
 SONIC_MAKE_DEBS += $(LIBNSS_TACPLUS)
 
+# audisp-tacplus packages
+AUDISP_TACPLUS_VERSION = 1.0.2
+
+export AUDISP_TACPLUS_VERSION
+
+AUDISP_TACPLUS = audisp-tacplus_$(AUDISP_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb
+$(AUDISP_TACPLUS)_DEPENDS += $(LIBTAC_DEV)
+$(AUDISP_TACPLUS)_RDEPENDS += $(LIBTAC2)
+$(AUDISP_TACPLUS)_SRC_PATH = $(SRC_PATH)/tacacs/audisp
+SONIC_MAKE_DEBS += $(AUDISP_TACPLUS)
+
 # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
 # are archived into debug one image to facilitate debugging.
 #
diff --git a/slave.mk b/slave.mk
index 4a1c6d8696dd..b3a9c8f63d85 100644
--- a/slave.mk
+++ b/slave.mk
@@ -890,7 +890,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(PYTHON_SWSSCOMMON) \
                 $(PYTHON3_SWSSCOMMON) \
                 $(SONIC_UTILITIES_DATA) \
-                $(SONIC_HOST_SERVICES_DATA)) \
+                $(SONIC_HOST_SERVICES_DATA) \
+                $(AUDISP_TACPLUS)) \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
         $$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
         $(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SONIC_ZTP))) \
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index a74b66b1b95b..669c77b1ab12 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -304,7 +304,10 @@ RUN apt-get update && apt-get install -y \
         libboost-regex1.71-dev \
         googletest \
         libgtest-dev \
-        libgcc-8-dev
+        libgcc-8-dev \
+# For audisp-tacplus
+        libauparse-dev \
+        auditd
 
 RUN apt-get -y build-dep openssh
 
diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index 67b5351dbf00..55bc9e048071 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -233,6 +233,9 @@ RUN apt-get update && apt-get install -y \
         texi2html \
 # For initramfs
         bash-completion \
+# For audisp-tacplus
+        libauparse-dev \
+        auditd \
 {% if CONFIGURED_ARCH == "amd64" -%}
 # For sonic vs image build
         dosfstools \
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index bbdb1364507f..7871d2ad76fc 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -259,7 +259,10 @@ RUN apt-get update && apt-get install -y \
         libxml2-utils \
         xsltproc \
         python-lxml \
-        libexpat1-dev
+        libexpat1-dev \
+# For audisp-tacplus
+        libauparse-dev \
+        auditd
 
 ## Config dpkg
 ## install the configuration file if it’s currently missing
diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 2862c5f57886..d57fa12b55b1 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -80,6 +80,18 @@ def obfuscate(data):
     else:
         return data
 
+def get_pid(procname):
+    for dirname in os.listdir('/proc'):
+        if dirname == 'curproc':
+            continue
+        try:
+            with open('/proc/{}/cmdline'.format(dirname), mode='r') as fd:
+                content = fd.read()
+        except Exception as ex:
+            continue
+        if procname in content:
+            return dirname
+    return ""
 
 def run_cmd(cmd, log_err = True):
     try:
@@ -235,6 +247,18 @@ class AaaCfg(object):
 
         syslog.syslog(syslog.LOG_INFO, "file size check pass: {} size is ({}) bytes".format(filename, size))
 
+    def notify_audisp_tacplus_reload_config(self):
+        pid = get_pid("/sbin/audisp-tacplus")
+        syslog.syslog(syslog.LOG_INFO, "Found audisp-tacplus PID: {}".format(pid))
+        if pid == "":
+            return
+
+        # audisp-tacplus will reload TACACS+ config when receive SIGHUP
+        try:
+            os.kill(int(pid), signal.SIGHUP)
+        except Exception as ex:
+            syslog.syslog(syslog.LOG_WARNING, "Send SIGHUP to audisp-tacplus failed with exception: {}".format(ex))
+
     def modify_single_file(self, filename, operations=None):
         if operations:
             cmd = "sed -e {0} {1} > {1}.new; mv -f {1} {1}.old; mv -f {1}.new {1}".format(' -e '.join(operations), filename)
@@ -319,6 +343,9 @@ class AaaCfg(object):
         with open(NSS_TACPLUS_CONF, 'w') as f:
             f.write(nss_tacplus_conf)
 
+        # Notify auditd plugin to reload tacacs config.
+        self.notify_audisp_tacplus_reload_config()
+
 class KdumpCfg(object):
     def __init__(self, CfgDb):
         self.config_db = CfgDb
diff --git a/src/tacacs/.gitignore b/src/tacacs/.gitignore
index 3e483805dfe3..f07169c59f30 100644
--- a/src/tacacs/.gitignore
+++ b/src/tacacs/.gitignore
@@ -1,5 +1,8 @@
 *
 !.gitignore
+audisp/*
+!audisp/Makefile
+!audisp/*.patch
 nsm/*
 !nsm/Makefile
 !nsm/*.patch
diff --git a/src/tacacs/audisp/Makefile b/src/tacacs/audisp/Makefile
new file mode 100644
index 000000000000..6bf80cc67710
--- /dev/null
+++ b/src/tacacs/audisp/Makefile
@@ -0,0 +1,30 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = audisp-tacplus_$(AUDISP_TACPLUS_VERSION)_$(CONFIGURED_ARCH).deb
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Obtain audisp-tacplus
+	rm -rf ./audisp-tacplus
+
+	git clone https://github.com/daveolson53/audisp-tacplus.git
+
+	# checkout by sha1
+	pushd ./audisp-tacplus
+	git checkout 559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
+
+	# Apply patches
+	cp -r ../patches patches
+	quilt push -a
+
+	# fix aclocal depency issue by run auto.sh
+	./auto.sh
+
+	# build package
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	popd
+
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
\ No newline at end of file
diff --git a/src/tacacs/audisp/patches/0001-Porting-to-sonic.patch b/src/tacacs/audisp/patches/0001-Porting-to-sonic.patch
new file mode 100644
index 000000000000..343b14b3e6e2
--- /dev/null
+++ b/src/tacacs/audisp/patches/0001-Porting-to-sonic.patch
@@ -0,0 +1,426 @@
+From 3a552cb456ebc233ef55970509a58a5c378acd7b Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 9 Nov 2021 16:34:12 +0800
+Subject: [PATCH 1/3] Porting to sonic.
+
+Fixed issue in this patch:
+1. The upstream project using 'libtacplus-map' library to lookup_logname, remove that depency by implement by ourself because libtacplus-map not porting to sonic, also because the libnss-tacplus in sonic not using libtacplus-map for user name mapping, sonic using a different solution for user login handling.
+
+2. The libpam-tacplus been changed to support 'source address', which add new parameter to tacacs functions.
+
+3. Upstream project using a patched version of libpam_tacplus, so some method in that not exist in sonic version.
+
+4. For tacacs config file parse and load, code change using the shared method in tacsupport lib.
+---
+ Makefile.am         |   3 +-
+ Makefile.in         |   3 +-
+ audisp-tacplus.c    | 234 +++++++++++++-------------------------------
+ audisp-tacplus.conf |   2 +-
+ debian/control      |   6 +-
+ 5 files changed, 76 insertions(+), 172 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ad70ca0..caead49 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ EXTRA_DIST = ChangeLog README audisp_tacplus.spec \
+ 
+ audisp_tacplus_SOURCES = audisp-tacplus.c
+ audisp_tacplus_CFLAGS = -O
+-audisp_tacplus_LDADD = -lauparse -ltacplus_map
++audisp_tacplus_LDADD = -lauparse -ltacsupport -ltac
+ sbin_PROGRAMS = audisp-tacplus
+ man_MANS = audisp-tacplus.8
+ 
+@@ -27,7 +27,6 @@ install-data-hook:
+ 	${INSTALL} -m 755 audisp-tacplus $(DESTDIR)$(sbindir)
+ 	${INSTALL} -d $(DESTDIR)$(sysconfdir)/audisp/plugins.d
+ 	${INSTALL} -d $(DESTDIR)$(sysconfdir)/audit/rules.d
+-	${INSTALL} -m 600 audisp-tac_plus.conf $(DESTDIR)$(sysconfdir)/audisp/
+ 	${INSTALL} -m 644 audisp-tacplus.conf $(DESTDIR)$(sysconfdir)/audisp/plugins.d
+ 	${INSTALL} -m 644 -o 0 audisp-tacplus.rules $(DESTDIR)$(sysconfdir)/audit/rules.d
+ 
+diff --git a/Makefile.in b/Makefile.in
+index d124c16..5482a9a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -345,8 +345,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-EXTRA_DIST = ChangeLog README audisp_tacplus.spec \
+-	audisp-tac_plus.conf audisp-tacplus.conf
++EXTRA_DIST = ChangeLog README audisp_tacplus.spec audisp-tacplus.conf
+ 
+ audisp_tacplus_SOURCES = audisp-tacplus.c
+ audisp_tacplus_CFLAGS = -O
+diff --git a/audisp-tacplus.c b/audisp-tacplus.c
+index 42841e5..5e3fb63 100644
+--- a/audisp-tacplus.c
++++ b/audisp-tacplus.c
+@@ -45,8 +45,10 @@
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <pwd.h>
+ #include <stdio.h>
+ #include <stdint.h>
++#include <stdlib.h>
+ #include <inttypes.h>
+ #include <signal.h>
+ #include <string.h>
+@@ -54,10 +56,14 @@
+ #include <errno.h>
+ #include <libaudit.h>
+ #include <auparse.h>
++#include <unistd.h>
++#include <limits.h>
+ 
++#include <libtac/libtac.h>
++#include <trace.h>
+ 
+-#include <tacplus/libtac.h>
+-#include <tacplus/map_tacplus_user.h>
++/* Tacacs+ support lib */
++#include <libtac/support.h>
+ 
+ #define _VMAJ 1
+ #define _VMIN 0
+@@ -71,6 +77,9 @@ static unsigned connected_ok;
+ 
+ char *configfile = "/etc/audisp/audisp-tac_plus.conf";
+ 
++/* Tacacs control flag */
++int tacacs_ctrl;
++
+ /* Local declarations */
+ static void handle_event(auparse_state_t *au,
+ 		auparse_cb_event_t cb_event_type, void *user_data);
+@@ -93,179 +102,74 @@ hup_handler(int sig __attribute__ ((unused)))
+         hup = 1;
+ }
+ 
+-typedef struct {
+-    struct addrinfo *addr;
+-    char *key;
+-} tacplus_server_t;
+-
+-/* set from configuration file parsing */
+-static tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
+-static int tac_srv_no, tac_key_no;
+-static char tac_service[64];
+-static char tac_protocol[64];
+-static char vrfname[64];
+-static int debug = 0;
+-static int acct_all; /* send accounting to all servers, not just 1st */
+-
+ static const char *progname = "audisp-tacplus"; /* for syslogs and errors */
+ 
+ static void
+-audisp_tacplus_config(char *cfile, int level)
++reload_config(void)
+ {
+-    FILE *conf;
+-    char lbuf[256];
+-
+-    conf = fopen(cfile, "r");
+-    if(conf == NULL) {
+-        syslog(LOG_WARNING, "%s: can't open config file %s: %m",
+-            progname, cfile);
+-        return;
+-    }
++    hup = 0;
+ 
+-    while(fgets(lbuf, sizeof lbuf, conf)) {
+-        if(*lbuf == '#' || isspace(*lbuf))
+-            continue; /* skip comments, white space lines, etc. */
+-        strtok(lbuf, " \t\n\r\f"); /* terminate buffer at first whitespace */
+-        if(!strncmp(lbuf, "include=", 8)) {
+-            /*
+-             * allow include files, useful for centralizing tacacs
+-             * server IP address and secret.
+-             */
+-            if(lbuf[8]) /* else treat as empty config */
+-                audisp_tacplus_config(&lbuf[8], level+1);
+-        }
+-        else if(!strncmp(lbuf, "debug=", 6))
+-            debug = strtoul(lbuf+6, NULL, 0);
+-        else if(!strncmp(lbuf, "acct_all=", 9))
+-            acct_all = strtoul(lbuf+9, NULL, 0);
+-        else if(!strncmp(lbuf, "vrf=", 4))
+-            tac_xstrcpy(vrfname, lbuf + 4, sizeof(vrfname));
+-        else if(!strncmp(lbuf, "service=", 8))
+-            tac_xstrcpy(tac_service, lbuf + 8, sizeof(tac_service));
+-        else if(!strncmp(lbuf, "protocol=", 9))
+-            tac_xstrcpy(tac_protocol, lbuf + 9, sizeof(tac_protocol));
+-        else if(!strncmp(lbuf, "login=", 6))
+-            tac_xstrcpy(tac_login, lbuf + 6, sizeof(tac_login));
+-        else if (!strncmp (lbuf, "timeout=", 8)) {
+-            tac_timeout = (int)strtoul(lbuf+8, NULL, 0);
+-            if (tac_timeout < 0) /* explict neg values disable poll() use */
+-                tac_timeout = 0;
+-            else /* poll() only used if timeout is explictly set */
+-                tac_readtimeout_enable = 1;
+-        }
+-        else if(!strncmp(lbuf, "secret=", 7)) {
+-            int i;
+-            /* no need to complain if too many on this one */
+-            if(tac_key_no < TAC_PLUS_MAXSERVERS) {
+-                if((tac_srv[tac_key_no].key = strdup(lbuf+7)))
+-                    tac_key_no++;
+-                else
+-                    syslog(LOG_ERR, "%s: unable to copy server secret %s",
+-                        __FUNCTION__, lbuf+7);
+-            }
+-            /* handle case where 'secret=' was given after a 'server='
+-             * parameter, fill in the current secret */
+-            for(i = tac_srv_no-1; i >= 0; i--) {
+-                if (tac_srv[i].key)
+-                    continue;
+-                tac_srv[i].key = strdup(lbuf+7);
+-            }
+-        }
+-        else if(!strncmp(lbuf, "server=", 7)) {
+-            if(tac_srv_no < TAC_PLUS_MAXSERVERS) {
+-                struct addrinfo hints, *servers, *server;
+-                int rv;
+-                char *port, server_buf[sizeof lbuf];
+-
+-                memset(&hints, 0, sizeof hints);
+-                hints.ai_family = AF_UNSPEC;  /* use IPv4 or IPv6, whichever */
+-                hints.ai_socktype = SOCK_STREAM;
+-
+-                strcpy(server_buf, lbuf + 7);
+-
+-                port = strchr(server_buf, ':');
+-                if(port != NULL) {
+-                    *port = '\0';
+-					port++;
+-                }
+-                if((rv = getaddrinfo(server_buf, (port == NULL) ?
+-                            "49" : port, &hints, &servers)) == 0) {
+-                    for(server = servers; server != NULL &&
+-                        tac_srv_no < TAC_PLUS_MAXSERVERS;
+-                        server = server->ai_next) {
+-                        tac_srv[tac_srv_no].addr = server;
+-                        /* use current key, if our index not yet set */
+-                        if(tac_key_no && !tac_srv[tac_srv_no].key)
+-                            tac_srv[tac_srv_no].key =
+-                                strdup(tac_srv[tac_key_no-1].key);
+-                        tac_srv_no++;
+-                    }
+-                }
+-                else {
+-                    syslog(LOG_ERR,
+-                        "skip invalid server: %s (getaddrinfo: %s)",
+-                        server_buf, gai_strerror(rv));
+-                }
+-            }
+-            else {
+-                syslog(LOG_ERR, "maximum number of servers (%d) exceeded, "
+-                    "skipping", TAC_PLUS_MAXSERVERS);
+-            }
+-        }
+-        else if(debug) /* ignore unrecognized lines, unless debug on */
+-            syslog(LOG_WARNING, "%s: unrecognized parameter: %s",
+-                progname, lbuf);
+-    }
++    connected_ok = 0; /*  reset connected state (for possible vrf) */
+ 
+-    if(level == 0 && (!tac_service[0] || tac_srv_no == 0))
+-        syslog(LOG_ERR, "%s version %d.%d.%d: missing tacacs fields in file %s, %d servers",
+-            progname, _VMAJ, _VMIN, _VPATCH, configfile, tac_srv_no);
++    /* load config file: configfile */
++    tacacs_ctrl = parse_config_file(configfile);
+ 
+-    if(debug) {
+-        int n;
+-        syslog(LOG_NOTICE, "%s version %d.%d.%d tacacs service=%s", progname,
+-            _VMAJ, _VMIN, _VPATCH, tac_service);
++    trace("tacacs config updated:\n");
++    int server_idx;
++    for(server_idx = 0; server_idx < tac_srv_no; server_idx++) {
++        trace("Server %d, address:%s, key length:%d\n", server_idx, tac_ntop(tac_srv[server_idx].addr->ai_addr),strlen(tac_srv[server_idx].key));
++    }
+ 
+-        for(n = 0; n < tac_srv_no; n++)
+-            syslog(LOG_DEBUG, "%s: tacacs server[%d] { addr=%s, key='%s' }",
+-                progname, n, tac_ntop(tac_srv[n].addr->ai_addr),
+-                tac_srv[n].key);
++    trace("TACACS+ control flag: 0x%x\n", tacacs_ctrl);
++    
++    if (tacacs_ctrl & AUTHORIZATION_FLAG_TACACS) {
++        trace("TACACS+ per-command authorization enabled.\n");
+     }
+ 
+-    fclose(conf);
++    if (tacacs_ctrl & AUTHORIZATION_FLAG_LOCAL) {
++        trace("Local per-command authorization enabled.\n");
++    }
++    
++    if (tacacs_ctrl & PAM_TAC_DEBUG) {
++        trace("TACACS+ debug enabled.\n");
++    }
+ }
+ 
+-
+-static void
+-reload_config(void)
++/*
++ * Get user name by UID, and return NULL when not found user name by UID.
++ * The returned username should be free by caller.
++ * Also assign hostname to host, the host also should be free by caller.
++ */
++char *lookup_logname(uid_t auid, char** host)
+ {
+-    int i, nservers;
+-
+-    hup = 0;
++    /* get user name. */
++    struct passwd *pws;
++    pws = getpwuid(auid);
++    if (pws == NULL) {
++        /* Failed to get user information. */
++        return NULL;
++    }
+ 
+-    /*  reset the config variables that we use, freeing memory where needed */
+-    nservers = tac_srv_no;
+-    tac_srv_no = 0;
+-    tac_key_no = 0;
+-    vrfname[0] = '\0';
+-    tac_service[0] = '\0';
+-    tac_protocol[0] = '\0';
+-    tac_login[0] = '\0';
+-    debug = 0;
+-    acct_all = 0;
+-    tac_timeout = 0;
+-
+-    for(i = 0; i < nservers; i++) {
+-        if(tac_srv[i].key) {
+-            free(tac_srv[i].key);
+-            tac_srv[i].key = NULL;
+-        }
+-        tac_srv[i].addr = NULL;
++    int new_buffer_size = strlen(pws->pw_name) + 1;
++    char* username = malloc(new_buffer_size);
++    if (username == NULL) {
++        /* Failed to allocate new buffer. */
++        return NULL;
+     }
+ 
+-    connected_ok = 0; /*  reset connected state (for possible vrf) */
++    memset(username, 0, new_buffer_size);
++    strncpy(username, pws->pw_name, new_buffer_size-1);
++
++    /* get hostname. */
++    *host = malloc(HOST_NAME_MAX+1);
++    memset(host, 0, HOST_NAME_MAX+1);
++    if (gethostname(host, HOST_NAME_MAX) != 0)
++    {
++        free(*host);
++        *host = NULL;
++    }
+ 
+-    audisp_tacplus_config(configfile, 0);
++    return username;
+ }
+ 
+ int
+@@ -273,6 +177,9 @@ main(int argc, char *argv[])
+ {
+ 	char tmp[MAX_AUDIT_MESSAGE_LENGTH+1];
+ 	struct sigaction sa;
++    
++    /* initialize random seed*/
++    srand(time(NULL));
+ 
+     /* if there is an argument, it is an alternate configuration file */
+     if(argc > 1)
+@@ -334,7 +241,7 @@ send_acct_msg(int tac_fd, int type, char *user, char *tty, char *host,
+     int retval;
+     struct areply re;
+ 
+-    attr=(struct tac_attrib *)tac_xcalloc(1, sizeof(struct tac_attrib));
++    attr=(struct tac_attrib *)xcalloc(1, sizeof(struct tac_attrib));
+ 
+     snprintf(buf, sizeof buf, "%lu", (unsigned long)time(NULL));
+     tac_add_attrib(&attr, "start_time", buf);
+@@ -378,8 +285,7 @@ send_tacacs_acct(char *user, char *tty, char *host, char *cmdmsg, int type,
+     int retval, srv_i, srv_fd;
+ 
+     for(srv_i = 0; srv_i < tac_srv_no; srv_i++) {
+-        srv_fd = tac_connect_single(tac_srv[srv_i].addr, tac_srv[srv_i].key,
+-            NULL, vrfname[0]?vrfname:NULL);
++        srv_fd = tac_connect_single(tac_srv[srv_i].addr, tac_srv[srv_i].key, tac_source_addr, tac_timeout, __vrfname);
+         if(srv_fd < 0) {
+             syslog(LOG_WARNING, "connection to %s failed (%d) to send"
+                 " accounting record: %m",
+@@ -393,7 +299,7 @@ send_tacacs_acct(char *user, char *tty, char *host, char *cmdmsg, int type,
+         close(srv_fd);
+         if(!retval) {
+             connected_ok = 1;
+-            if(!acct_all)
++            if(!(tacacs_ctrl & PAM_TAC_ACCT))
+                 break; /* only send to first responding server */
+         }
+     }
+@@ -501,7 +407,7 @@ static void get_acct_record(auparse_state_t *au, int type)
+         taskno = (uint16_t) pid;
+     }
+     else /* should never happen, if it does, records won't match */
+-        taskno = tac_magic();
++        taskno = (u_int32_t)rand();
+ 
+     if(get_field(au, "auid")) {
+         auser = (char *)auparse_interpret_field(au);
+@@ -520,7 +426,7 @@ static void get_acct_record(auparse_state_t *au, int type)
+      * the NSS library, the username in auser will likely already be the login
+      * name.
+      */
+-    loguser = lookup_logname(NULL, auid, session, &host, NULL);
++    loguser = lookup_logname(auid, &host);
+     if(!loguser) {
+         char *user = NULL;
+ 
+diff --git a/audisp-tacplus.conf b/audisp-tacplus.conf
+index ccb8517..ba77880 100644
+--- a/audisp-tacplus.conf
++++ b/audisp-tacplus.conf
+@@ -7,7 +7,7 @@ active = yes
+ 
+ # This can be used to specify an different config file than
+ # /etc/audisp/audisp-tac_plus.conf if desired
+-# args =
++args=/etc/tacplus_nss.conf
+ 
+ # These parameters should normally not be changed.
+ direction = out
+diff --git a/debian/control b/debian/control
+index 5306bd9..28c7324 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,9 +2,9 @@ Source: audisp-tacplus
+ Section: admin
+ Priority: optional
+ Maintainer: Dave Olson <olson@cumulusnetworks.com>
+-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, libpam-tacplus-dev,
++Build-Depends: debhelper (>= 9), autotools-dev, autoconf,
+     libtac-dev (>= 1.4.1~),
+-	libaudit-dev, libauparse-dev, libtacplus-map-dev,
++	libaudit-dev, libauparse-dev,
+ 	dpkg-dev (>= 1.16.1~), git
+ Standards-Version: 3.9.6
+ Homepage: https://github.com/daveolson53/audisp_tacplus
+@@ -12,7 +12,7 @@ Homepage: https://github.com/daveolson53/audisp_tacplus
+ Package: audisp-tacplus
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-tacplus, libtac2 (>= 1.4.1~),
+-	libtacplus-map1, libauparse0, libaudit1, auditd
++	libauparse0, libaudit1, auditd
+ Description: audisp module for TACACS+ accounting
+ 	This audisp module is an audisp auditd plugin. It is designed to do TACACS+
+     accounting for commands run by TACACS+ authenticated sessions.
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/audisp/patches/0002-Remove-user-secret-from-accounting-log.patch b/src/tacacs/audisp/patches/0002-Remove-user-secret-from-accounting-log.patch
new file mode 100644
index 000000000000..1cacaa8a0614
--- /dev/null
+++ b/src/tacacs/audisp/patches/0002-Remove-user-secret-from-accounting-log.patch
@@ -0,0 +1,1139 @@
+From 4152d4d91e1e333ff30f028b3e17e8669ef01bf3 Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 23 Nov 2021 13:32:51 +0800
+Subject: [PATCH] Remove user secret from accounting log.
+
+---
+ Makefile.am              |   2 +-
+ audisp-tacplus.c         |  19 ++-
+ audisp-tacplus.conf      |   2 +-
+ password.c               | 118 ++++++++++++++++++
+ password.h               |  31 +++++
+ regex_helper.c           |  92 ++++++++++++++
+ regex_helper.h           |  17 +++
+ sudoers_helper.c         | 250 +++++++++++++++++++++++++++++++++++++++
+ sudoers_helper.h         |  18 +++
+ trace.c                  |  21 ++++
+ trace.h                  |  10 ++
+ unittest/Makefile        |  21 ++++
+ unittest/mock.h          |  17 +++
+ unittest/mock_helper.c   |  65 ++++++++++
+ unittest/mock_helper.h   |  48 ++++++++
+ unittest/password_test.c | 199 +++++++++++++++++++++++++++++++
+ unittest/sudoers         |   5 +
+ 17 files changed, 931 insertions(+), 4 deletions(-)
+ create mode 100644 password.c
+ create mode 100644 password.h
+ create mode 100644 regex_helper.c
+ create mode 100644 regex_helper.h
+ create mode 100644 sudoers_helper.c
+ create mode 100644 sudoers_helper.h
+ create mode 100644 trace.c
+ create mode 100644 trace.h
+ create mode 100644 unittest/Makefile
+ create mode 100644 unittest/mock.h
+ create mode 100644 unittest/mock_helper.c
+ create mode 100644 unittest/mock_helper.h
+ create mode 100644 unittest/password_test.c
+ create mode 100644 unittest/sudoers
+
+diff --git a/Makefile.am b/Makefile.am
+index caead49..b6cb92b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@
+ EXTRA_DIST = ChangeLog README audisp_tacplus.spec \
+ 	audisp-tac_plus.conf audisp-tacplus.conf
+ 
+-audisp_tacplus_SOURCES = audisp-tacplus.c
++audisp_tacplus_SOURCES = audisp-tacplus.c password.c regex_helper.c trace.c sudoers_helper.c
+ audisp_tacplus_CFLAGS = -O
+ audisp_tacplus_LDADD = -lauparse -ltacsupport -ltac
+ sbin_PROGRAMS = audisp-tacplus
+diff --git a/audisp-tacplus.c b/audisp-tacplus.c
+index 5e3fb63..aa2b16f 100644
+--- a/audisp-tacplus.c
++++ b/audisp-tacplus.c
+@@ -65,6 +65,10 @@
+ /* Tacacs+ support lib */
+ #include <libtac/support.h>
+ 
++/* Remove password from user command */
++#include "password.h"
++#include "sudoers_helper.h"
++
+ #define _VMAJ 1
+ #define _VMIN 0
+ #define _VPATCH 0
+@@ -80,6 +84,9 @@ char *configfile = "/etc/audisp/audisp-tac_plus.conf";
+ /* Tacacs control flag */
+ int tacacs_ctrl;
+ 
++/* sudoers file conatins user password setting */
++const char *sudoers_path = "/etc/sudoers";
++
+ /* Local declarations */
+ static void handle_event(auparse_state_t *au,
+ 		auparse_cb_event_t cb_event_type, void *user_data);
+@@ -162,8 +169,8 @@ char *lookup_logname(uid_t auid, char** host)
+ 
+     /* get hostname. */
+     *host = malloc(HOST_NAME_MAX+1);
+-    memset(host, 0, HOST_NAME_MAX+1);
+-    if (gethostname(host, HOST_NAME_MAX) != 0)
++    memset(*host, 0, HOST_NAME_MAX+1);
++    if (gethostname(*host, HOST_NAME_MAX) != 0)
+     {
+         free(*host);
+         *host = NULL;
+@@ -201,6 +208,10 @@ main(int argc, char *argv[])
+ 		syslog(LOG_ERR, "exitting due to auparse init errors");
+ 		return -1;
+ 	}
++    
++    /* initialize password regex setting */
++    initialize_password_setting(sudoers_path);
++
+ 	auparse_add_callback(au, handle_event, NULL, NULL);
+ 	do {
+ 		/* Load configuration */
+@@ -229,6 +240,9 @@ main(int argc, char *argv[])
+ 	auparse_flush_feed(au);
+ 	auparse_destroy(au);
+ 
++    /* Release password setting */
++    release_password_setting();
++
+ 	return 0;
+ }
+ 
+@@ -511,6 +525,7 @@ static void get_acct_record(auparse_state_t *au, int type)
+      * loguser is always set, we bail if not.  For ANOM_ABEND, tty may be
+      *  unknown, and in some cases, host may be not be set.
+      */
++    remove_password(logbase);
+     send_tacacs_acct(loguser, tty?tty:"UNK", host?host:"UNK", logbase, acct_type, taskno);
+ 
+     if(host)
+diff --git a/audisp-tacplus.conf b/audisp-tacplus.conf
+index ba77880..1b46a9c 100644
+--- a/audisp-tacplus.conf
++++ b/audisp-tacplus.conf
+@@ -7,7 +7,7 @@ active = yes
+ 
+ # This can be used to specify an different config file than
+ # /etc/audisp/audisp-tac_plus.conf if desired
+-args=/etc/tacplus_nss.conf
++args = /etc/tacplus_nss.conf
+ 
+ # These parameters should normally not be changed.
+ direction = out
+diff --git a/password.c b/password.c
+new file mode 100644
+index 0000000..8484d39
+--- /dev/null
++++ b/password.c
+@@ -0,0 +1,118 @@
++#include <ctype.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <string.h>
++#include <syslog.h>
++#include <stdlib.h>
++
++#include "password.h"
++#include "regex_helper.h"
++#include "sudoers_helper.h"
++#include "trace.h"
++
++/* Regex list */
++REGEX_NODE *global_regex_list = NULL;
++
++/* Append regex to list */
++int append_regex_to_list(regex_t regex)
++{
++    /* Create and initialize regex node */
++    REGEX_NODE *new_regex_node = (REGEX_NODE *)malloc(sizeof(REGEX_NODE));
++    if (new_regex_node == NULL)
++    {
++        /* When allocate memory failed, stop and return. also output log to both syslog and stderr with LOG_PERROR*/
++        trace("Failed to allocate memory for regex node.\n");
++        return REGEX_APPEND_FAILED;
++    }
++
++    new_regex_node->next = NULL;
++    new_regex_node->regex = regex;
++
++    /* Find the pointer to the latest regex node's 'next' field */
++    REGEX_NODE **current_node = &global_regex_list;
++    while (*current_node != NULL) {
++        current_node = &((*current_node)->next);
++    }
++    
++    /* append new regex to tail node */
++    *current_node = new_regex_node;
++    return REGEX_APPEND_SUCCESS;
++}
++
++/* Release password setting */
++void release_password_setting()
++{
++    if (global_regex_list == NULL) {
++        return;
++    }
++
++    /* Walk to last regex */
++    REGEX_NODE *current = global_regex_list;
++    while (current != NULL) {
++        /* Continue with next regex */
++        REGEX_NODE* current_node_memory = current;
++        current = current->next;
++        
++        /* Free node memory, this may also reset all allocated memory depends on c lib implementation */
++        free(current_node_memory);
++    }
++
++    /* Reset list */
++    global_regex_list = NULL;
++}
++
++/* Replace password with PASSWORD_MASK by regex. */
++void remove_password(char* command)
++{
++    if (global_regex_list == NULL) {
++        return;
++    }
++
++    /* Check every regex */
++    REGEX_NODE *next_node = global_regex_list;
++    while (next_node != NULL) {
++        /* Try fix password with current regex */
++        if (remove_password_by_regex(command, next_node->regex) == PASSWORD_REMOVED) {
++            return;
++        }
++        
++        /* If password not fix, continue try next regex */
++        next_node = next_node->next;
++    }
++}
++
++/* Find and return the pointer of the first non-space character*/
++char* find_non_space(char *str)
++{
++    if (str == NULL) {
++        return str;
++    }
++
++    while (isspace(*str)) {
++        str++;
++    }
++
++    return str;
++}
++
++/* Append passwd_cmd to global list */
++int append_password_regex(char *passwd_cmd)
++{
++    trace("Append passwd_cmd: %s\n", passwd_cmd);
++
++    /* convert the setting string to regex */
++    char regex_buffer[MAX_LINE_SIZE+1];
++    passwd_cmd = find_non_space(passwd_cmd);
++    convert_passwd_cmd_to_regex(regex_buffer, sizeof(regex_buffer), passwd_cmd);
++
++    regex_t regex;
++    if (regcomp(&regex, regex_buffer, REG_NEWLINE)) {
++        trace("Complie regex failed: %s\n", regex_buffer);
++        return INITIALIZE_INCORRECT_REGEX;
++    }
++
++    /* Append regex to global list */
++    append_regex_to_list(regex);
++
++    return INITIALIZE_SUCCESS;
++}
+\ No newline at end of file
+diff --git a/password.h b/password.h
+new file mode 100644
+index 0000000..2563b31
+--- /dev/null
++++ b/password.h
+@@ -0,0 +1,31 @@
++#ifndef USER_SECRED_H
++#define USER_SECRED_H
++
++#include <string.h>
++#include <regex.h>
++
++/* Macros for initialize result */
++#define INITIALIZE_SUCCESS                         0
++#define INITIALIZE_LOAD_SETTING_FAILED             1
++#define INITIALIZE_INCORRECT_REGEX                 2
++
++/* Regex append result. */
++#define REGEX_APPEND_SUCCESS              0
++#define REGEX_APPEND_FAILED               1
++
++/* Regex list node. */
++typedef struct regex_node {
++    struct regex_node *next;
++    regex_t regex;
++} REGEX_NODE;
++
++/* Release password setting */
++extern void release_password_setting();
++
++/* Replace password with regex */
++extern void remove_password(char* command);
++
++/* Append passwd_cmd to global list */
++int append_password_regex(char *passwd_cmd);
++
++#endif /* USER_SECRED_H */
+\ No newline at end of file
+diff --git a/regex_helper.c b/regex_helper.c
+new file mode 100644
+index 0000000..1edea94
+--- /dev/null
++++ b/regex_helper.c
+@@ -0,0 +1,92 @@
++#include <ctype.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <string.h>
++#include <syslog.h>
++#include <stdlib.h>
++
++#include "regex_helper.h"
++#include "trace.h"
++
++#define min(a,b)            (((a) < (b)) ? (a) : (b))
++
++/* 
++ * Macros for password regex
++ * These are BRE regex, please refer to: https://en.wikibooks.org/wiki/Regular_Expressions/POSIX_Basic_Regular_Expressions
++ REGEX_WHITESPACES will match the whitespace in user commands.
++ REGEX_TOKEN will match password or connection string in user commands
++ */
++#define REGEX_WHITESPACES              "[[:space:]]*"
++#define REGEX_TOKEN                   "\\([^[:space:]]*\\)"
++
++/* Regex match group count, 2 because only have 1 subexpression for password */
++#define REGEX_MATCH_GROUP_COUNT      2
++
++/* The password mask */
++#define PASSWORD_MASK                   '*'
++
++/* Remove password from command. */
++int remove_password_by_regex(char* command, regex_t regex)
++{
++    regmatch_t pmatch[REGEX_MATCH_GROUP_COUNT];
++    if (regexec(&regex, command, REGEX_MATCH_GROUP_COUNT, pmatch, 0) == REG_NOMATCH) {
++        trace("User command not match.\n");
++        return PASSWORD_NOT_FOUND;
++    }
++
++    if (pmatch[1].rm_so < 0) {
++        trace("Password not found.\n");
++        return PASSWORD_NOT_FOUND;
++    }
++
++    /* Found password between pmatch[1].rm_so to pmatch[1].rm_eo, replace it. */
++    trace("Found password between: %d -- %d\n", pmatch[1].rm_so, pmatch[1].rm_eo);
++
++    /* Replace password with mask. */
++    size_t command_length = strlen(command);
++    int password_start_pos = min(pmatch[1].rm_so, command_length);
++    int password_count = min(pmatch[1].rm_eo, command_length) - password_start_pos;
++    memset(command + password_start_pos, PASSWORD_MASK, password_count);
++
++    return PASSWORD_REMOVED;
++}
++
++/* 
++    Convert password command to regex.
++    Password commands defined in sudoers file, the PASSWD_CMD alias is a list of password command.
++    For more information please check:
++    https://www.sudo.ws/man/1.7.10/sudoers.man.html
++    https://github.com/Azure/sonic-buildimage/blob/5c503b81ae186aa378928edf36fa1d347e919d7a/files/image_config/sudoers/sudoers
++ */
++void convert_passwd_cmd_to_regex(char *buf, size_t buf_size, const char* password_setting)
++{
++    int src_idx = 0;
++    int last_char_is_whitespace = 0;
++
++    memset(buf, 0, buf_size);
++    while (password_setting[src_idx]) {
++        int buffer_used_space= strlen(buf);
++        if (password_setting[src_idx] == PASSWORD_MASK) {
++            /* Replace * to REGEX_TOKEN */
++            snprintf(buf + buffer_used_space, buf_size - buffer_used_space, REGEX_TOKEN);
++        }
++        else if (isspace(password_setting[src_idx])) {
++            /* Ignore mutiple whitespace */
++            if (!last_char_is_whitespace) {
++                /* Replace whitespace to regex REGEX_WHITESPACES which match multiple whitespace */
++                snprintf(buf + buffer_used_space, buf_size - buffer_used_space, REGEX_WHITESPACES);
++            }
++        }
++        else if (buffer_used_space < buf_size - 1) {
++            /* Copy none password characters */
++            buf[buffer_used_space] = password_setting[src_idx];
++        }
++        else {
++            /* Buffer full, return here. */
++            return;
++        }
++
++        last_char_is_whitespace = isspace(password_setting[src_idx]);
++        src_idx++;
++    }
++}
+\ No newline at end of file
+diff --git a/regex_helper.h b/regex_helper.h
+new file mode 100644
+index 0000000..33c1916
+--- /dev/null
++++ b/regex_helper.h
+@@ -0,0 +1,17 @@
++#ifndef REGEX_HELPER_H
++#define REGEX_HELPER_H
++
++#include <regex.h>
++#include <string.h>
++
++/* Regex fix result. */
++#define PASSWORD_REMOVED                 0
++#define PASSWORD_NOT_FOUND             1
++
++/* Remove password from command. */
++extern int remove_password_by_regex(char* command, regex_t regex);
++
++/* Convert password setting to regex. */
++extern void convert_passwd_cmd_to_regex(char *buf, size_t buf_size, const char* password_setting);
++
++#endif /* REGEX_HELPER_H */
+\ No newline at end of file
+diff --git a/sudoers_helper.c b/sudoers_helper.c
+new file mode 100644
+index 0000000..ac4191e
+--- /dev/null
++++ b/sudoers_helper.c
+@@ -0,0 +1,250 @@
++#include <stdarg.h>
++#include <stdio.h>
++#include <string.h>
++#include <syslog.h>
++#include <stdlib.h>
++#include <stdbool.h>
++
++#include "password.h"
++#include "sudoers_helper.h"
++#include "trace.h"
++
++/* Macros for parse user input */
++#define SUDOERS_SETTING_SPLITTER                   " =\t\n"
++#define SUDOERS_EQUAL                              "="
++#define SUDOERS_LF                                 '\n'
++
++#define PASSWD_CMDS_SPLITTER                       '\r'
++
++/* The command alias prefix */
++const char* COMMAND_ALIAS = "Cmnd_Alias";
++
++/* The password setting */
++const char* PASSWD_CMDS = "PASSWD_CMDS";
++
++/*
++    Load file content.
++*/
++char* load_file_content(const char *setting_path)
++{
++    FILE *setting_file = fopen(setting_path, "rt");
++    if(setting_file == NULL) {
++        trace("Can't open setting file: %s\n", setting_path);
++        return NULL;
++    }
++
++    fseek(setting_file, 0, SEEK_END);
++    size_t setting_file_size = ftell(setting_file);
++    fseek(setting_file, 0, SEEK_SET);
++
++    char* file_content = malloc(setting_file_size+1);
++    if (file_content == NULL) {
++        trace("Allocate memory for file: %s failed.\n", setting_path);
++    }
++    else {
++        size_t result = fread(file_content, sizeof(char), setting_file_size, setting_file);
++        if (result == setting_file_size) {
++            file_content[setting_file_size] = 0;
++        }
++        else {
++            trace("Read setting file: %s failed.\n", setting_path);
++            free(file_content);
++            file_content = NULL;
++        }
++    }
++
++    fclose(setting_file);
++    return file_content;
++}
++
++
++/*
++    Get setting content length
++*/
++size_t setting_content_length(const char *setting)
++{
++    size_t length = 0;
++    while (*setting != 0 && *setting != SUDOERS_LF) {
++        length++;
++        setting++;
++    }
++    
++    return length;
++}
++
++/*
++    Load PASSWD_CMDS from sudoers.
++    For more information please check:
++        https://www.sudo.ws/man/1.8.17/sudoers.man.html#Other_special_characters_and_reserved_words
++*/
++char* load_passwd_cmds(const char *setting_path)
++{
++    char* file_content = load_file_content(setting_path);
++    if(file_content == NULL) {
++        trace("Load file: %s failed.\n", setting_path);
++        return NULL;
++    }
++
++    escape_characters(file_content);
++    trace("Sudoers content: (%s)\n", file_content);
++
++    char *passwd_cmds = NULL;
++    char* token = strtok(file_content, SUDOERS_SETTING_SPLITTER);
++    while (token != NULL) {
++        trace("Token: (%s)\n", token);
++        /* Find Cmnd_Alias */
++        if (strncmp(token, COMMAND_ALIAS, strlen(COMMAND_ALIAS))) {
++            token = strtok(NULL, SUDOERS_SETTING_SPLITTER);
++            continue;
++        }
++
++        /* Find PASSWD_CMDS setting */
++        token = strtok(NULL, SUDOERS_SETTING_SPLITTER);
++        if (strncmp(token, PASSWD_CMDS, strlen(PASSWD_CMDS))) {
++            token = strtok(NULL, SUDOERS_SETTING_SPLITTER);
++            continue;
++        }
++
++        /* Get PASSWD_CMDS setting content */
++        token = strtok(NULL, SUDOERS_EQUAL);
++        size_t setting_length = setting_content_length(token);
++        passwd_cmds = malloc(setting_length+1);
++        if (passwd_cmds == NULL) {
++            trace("Allocate memory for PASSWD_CMDS buffer failed.\n");
++            break;
++        }
++        
++        memcpy(passwd_cmds, token, setting_length);
++        passwd_cmds[setting_length] = 0;
++        break;
++    }
++
++    free(file_content);
++    return passwd_cmds;
++}
++
++/*
++    Escape characters according to sudoers file format.
++    For more information, please check:
++        The following characters must be escaped with a backslash (‘\’) when used as part of a word (e.g. a user name or host name): ‘!’, ‘=’, ‘:’, ‘,’, ‘(’, ‘)’, ‘\’.
++        https://www.sudo.ws/man/1.8.17/sudoers.man.html#Other_special_characters_and_reserved_words
++*/
++void escape_characters(char *str)
++{
++    char *src_pos=str;
++    char *dest_pos=str;
++    while (*src_pos) {
++        if (*src_pos == ',') {
++            /* PASSWD_CMDS use comma as splitter, replace it wiith \n to simplify split handling */
++            *dest_pos = PASSWD_CMDS_SPLITTER;
++            src_pos++;
++            dest_pos++;
++            continue;
++        }
++        else if (*src_pos != '\\') {
++            /* copy none escape characters */
++            if (dest_pos != src_pos) {
++                *dest_pos = *src_pos;
++            }
++
++            src_pos++;
++            dest_pos++;
++            continue;
++        }
++
++        /* Handle escape characters */
++        src_pos++;
++        switch (*src_pos)
++        {
++            case '!':
++            case '=':
++            case '"':
++            case ',':
++            case '(':
++            case ')':
++            case '\\':
++                *dest_pos = *src_pos;
++                dest_pos++;
++                src_pos++;
++                continue;
++            case '\n':
++                /* Long lines can be continued with a backslash */
++                src_pos++;
++                continue;
++        }
++
++        /* Not a escape character */
++        *dest_pos = '\\';
++        dest_pos++;
++
++        *dest_pos = *src_pos;
++        src_pos++;
++        dest_pos++;
++    }
++
++    *dest_pos = 0;
++}
++
++/*
++    Initialize password setting from sudoers.
++*/
++int initialize_password_setting(const char *setting_path)
++{
++    char* passwd_cmds = load_passwd_cmds(setting_path);
++    if (passwd_cmds == NULL) {
++        /* Setting file open failed or can't find password setting. */
++        trace("Load PASSWD_CMDS from: %s failed.\n", setting_path);
++        return INITIALIZE_LOAD_SETTING_FAILED;
++    }
++
++    trace("Loaded PASSWD_CMDS: (%s), from: %s .\n", passwd_cmds, setting_path);
++
++    /* Split PASSWD_CMDS with comma */
++    int result = INITIALIZE_SUCCESS;
++    int passwd_cmds_length = strlen(passwd_cmds);
++    char* passwd_cmd = passwd_cmds;
++    bool start_new_passwd_cmd = true;
++    for (int index=0; index < passwd_cmds_length; index++) {
++        if (start_new_passwd_cmd) {
++            /*
++                Set the passwd_cmd point to new command when:
++                    1. beginning of passwd_cmds.
++                    2. After a comma splitter.
++            */
++            passwd_cmd = passwd_cmds + index;
++            start_new_passwd_cmd = false;
++        }
++
++        if (passwd_cmds[index] != PASSWD_CMDS_SPLITTER) {
++            continue;
++        }
++
++        /* Found a splitter, handle current passwd_cmd. */
++        passwd_cmds[index] = 0;
++        result = append_password_regex(passwd_cmd);
++        if (result != INITIALIZE_SUCCESS) {
++            trace("Append password regex failed: %s, result: %d\n", passwd_cmd, result);
++            break;
++        }
++
++        /*
++            Set passwd_cmd to NULL, so multiple comma splitter will not create empty passwd_cmd, for example:
++                command1,,command2
++        */
++        passwd_cmd = NULL;
++        start_new_passwd_cmd = true;
++    }
++
++    /*
++        Handle following 2 cases:
++            1. Comma splitter not exist in PASSWD_CMDS
++            2. Last command in PASSWD_CMDS
++    */
++    result = append_password_regex(passwd_cmd);
++    if (result != INITIALIZE_SUCCESS) {
++        trace("Append password regex failed: %s, result: %d\n", passwd_cmd, result);
++    }
++
++    free(passwd_cmds);
++    return result;
++}
+\ No newline at end of file
+diff --git a/sudoers_helper.h b/sudoers_helper.h
+new file mode 100644
+index 0000000..1539821
+--- /dev/null
++++ b/sudoers_helper.h
+@@ -0,0 +1,18 @@
++#ifndef SUDOERS_HELPER_H
++#define SUDOERS_HELPER_H
++
++/* Load PASSWD_CMDS from sudoers. */
++char* load_passwd_cmds(const char *setting_path);
++
++/*
++    Escape characters according to sudoers file format.
++    For more information, please check:
++        The following characters must be escaped with a backslash (‘\’) when used as part of a word (e.g. a user name or host name): ‘!’, ‘=’, ‘:’, ‘,’, ‘(’, ‘)’, ‘\’.
++        https://www.sudo.ws/man/1.8.17/sudoers.man.html#Other_special_characters_and_reserved_words
++*/
++void escape_characters(char *str);
++
++/* Initialize password setting from sudoers. */
++int initialize_password_setting(const char *setting_path);
++
++#endif /* SUDOERS_HELPER_H */
+diff --git a/trace.c b/trace.c
+new file mode 100644
+index 0000000..44bbbc7
+--- /dev/null
++++ b/trace.c
+@@ -0,0 +1,21 @@
++#include <stdarg.h>
++#include <stdio.h>
++#include <string.h>
++#include <syslog.h>
++#include <stdlib.h>
++
++#include "trace.h"
++
++/* Output trace log. */
++void trace(const char *format, ...)
++{
++    // convert log to a string because va args resoursive issue:
++    // http://www.c-faq.com/varargs/handoff.html
++    char logBuffer[MAX_LINE_SIZE];
++    va_list args;
++    va_start (args, format);
++    vsnprintf(logBuffer, sizeof(logBuffer), format, args);
++    va_end (args);
++
++    syslog(LOG_INFO, "Audisp-tacplus: %s", logBuffer);
++}
+\ No newline at end of file
+diff --git a/trace.h b/trace.h
+new file mode 100644
+index 0000000..6ea929d
+--- /dev/null
++++ b/trace.h
+@@ -0,0 +1,10 @@
++#ifndef TRACE_H
++#define TRACE_H
++
++/* Max setting line buffer size */
++#define MAX_LINE_SIZE                              512
++
++/* Output trace log. */
++extern void trace(const char *format, ...);
++
++#endif /* USER_SECRED_H */
+\ No newline at end of file
+diff --git a/unittest/Makefile b/unittest/Makefile
+new file mode 100644
+index 0000000..ed5517b
+--- /dev/null
++++ b/unittest/Makefile
+@@ -0,0 +1,21 @@
++#disable some warning because UT need test functions not in header file.
++CFLAGS = -Wno-parentheses -Wno-format-security -Wno-implicit-function-declaration -c
++IFLAGS = -I.. -I../include -I../lib -include mock.h
++MFLAG = -DDEBUG -DUNIT_TEST 
++
++all:
++	gcc password_test.c $(IFLAGS) $(CFLAGS) -o password_test.o
++	gcc mock_helper.c $(IFLAGS) $(CFLAGS) -o mock_helper.o
++	gcc ../password.c   $(IFLAGS) $(CFLAGS) $(MFLAG) -o password.o
++	gcc ../regex_helper.c   $(IFLAGS) $(CFLAGS) $(MFLAG) -o regex_helper.o
++	gcc ../trace.c   $(IFLAGS) $(CFLAGS) $(MFLAG) -o trace.o
++	gcc ../sudoers_helper.c   $(IFLAGS) $(CFLAGS) $(MFLAG) -o sudoers_helper.o
++	gcc  password_test.o  mock_helper.o password.o regex_helper.o trace.o sudoers_helper.o -o password_test  -lc -lcunit 
++
++test:
++	# run unit test, if UT failed, build will break
++	./password_test
++
++clean:
++	rm *.o
++	rm password_test
+diff --git a/unittest/mock.h b/unittest/mock.h
+new file mode 100644
+index 0000000..536f17a
+--- /dev/null
++++ b/unittest/mock.h
+@@ -0,0 +1,17 @@
++#ifndef MOCK_H
++#define MOCK_H
++
++#include <stddef.h>
++
++// use mock functions when build for UT
++#if defined (UNIT_TEST)
++void *mock_malloc(size_t size);
++void *mock_realloc(void* ptr, size_t size);
++void mock_free(void* ptr);
++#define malloc  mock_malloc
++#define realloc  mock_realloc
++#define free    mock_free
++#else
++#endif
++
++#endif /* MOCK_H */
+diff --git a/unittest/mock_helper.c b/unittest/mock_helper.c
+new file mode 100644
+index 0000000..cd6433d
+--- /dev/null
++++ b/unittest/mock_helper.c
+@@ -0,0 +1,65 @@
++/* mock_helper.c -- mock helper for bash plugin UT. */
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <CUnit/CUnit.h>
++#include <CUnit/Basic.h>
++#include "mock_helper.h"
++
++/* define test scenarios for mock functions return different value by scenario. */
++int test_scenario;
++
++/* define memory allocate counter. */
++int memory_allocate_count;
++
++/* Set test scenario for test*/
++void set_test_scenario(int scenario)
++{
++    test_scenario = scenario;
++}
++
++/* Get test scenario for test*/
++int get_test_scenario()
++{
++    return test_scenario;
++}
++
++/* Set memory allocate count for test*/
++void set_memory_allocate_count(int count)
++{
++    memory_allocate_count = count;
++}
++
++/* Get memory allocate count for test*/
++int get_memory_allocate_count()
++{
++    return memory_allocate_count;
++}
++
++/* MOCK malloc method*/
++void *mock_malloc(size_t size)
++{
++    memory_allocate_count++;
++    debug_printf("MOCK: malloc %ld bytes memory count: %d\n", size, memory_allocate_count);
++    return malloc(size);
++}
++
++/* MOCK malloc method*/
++void *mock_realloc(void* ptr, size_t size)
++{
++    if (ptr == NULL) {
++        memory_allocate_count++;
++    }
++
++    debug_printf("MOCK: realloc %ld bytes memory count: %d\n", size, memory_allocate_count);
++    return realloc(ptr, size);
++}
++
++/* MOCK free method*/
++void mock_free(void* ptr)
++{
++    memory_allocate_count--;
++    debug_printf("MOCK: free memory count: %d\n", memory_allocate_count);
++    free(ptr);
++}
+\ No newline at end of file
+diff --git a/unittest/mock_helper.h b/unittest/mock_helper.h
+new file mode 100644
+index 0000000..d116f57
+--- /dev/null
++++ b/unittest/mock_helper.h
+@@ -0,0 +1,48 @@
++/* plugin.h - functions from plugin.c. */
++
++/* Copyright (C) 1993-2015 Free Software Foundation, Inc.
++
++   This file is part of GNU Bash, the Bourne Again SHell.
++
++   Bash is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
++   Bash is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#if !defined (_MOCK_HELPER_H_)
++#define _MOCK_HELPER_H_
++
++#include "password.h"
++
++// define USER_SECRET_UT_DEBUG to output UT debug message.
++#define USER_SECRET_UT_DEBUG
++#if defined (USER_SECRET_UT_DEBUG)
++#define debug_printf printf
++#else
++#define debug_printf
++#endif
++
++#define TEST_SCEANRIO_LOAD_USER_SECRET_SETTING  	1
++
++/* Set test scenario for test*/
++void set_test_scenario(int scenario);
++
++/* Get test scenario for test*/
++int get_test_scenario();
++
++/* Set memory allocate count for test*/
++void set_memory_allocate_count(int count);
++
++/* Get memory allocate count for test*/
++int get_memory_allocate_count();
++
++#endif /* _MOCK_HELPER_H_ */
+\ No newline at end of file
+diff --git a/unittest/password_test.c b/unittest/password_test.c
+new file mode 100644
+index 0000000..606ecc5
+--- /dev/null
++++ b/unittest/password_test.c
+@@ -0,0 +1,199 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdbool.h>
++#include <CUnit/CUnit.h>
++#include <CUnit/Basic.h>
++
++#include "mock_helper.h"
++#include "regex_helper.h"
++#include "sudoers_helper.h"
++#include "trace.h"
++#include "password.h"
++
++/* Regex list */
++extern REGEX_NODE *global_regex_list;
++
++int clean_up() {
++  return 0;
++}
++
++int start_up() {
++  return 0;
++}
++
++/* Test load password setting*/
++void testcase_load_password_setting() {
++    set_test_scenario(TEST_SCEANRIO_LOAD_USER_SECRET_SETTING);
++    initialize_password_setting("./sudoers");
++
++    int loaded_regex_count = 0;
++    REGEX_NODE *next_node = global_regex_list;
++    while (next_node != NULL) {
++        /* Continue with next pligin */
++        REGEX_NODE* current_node_memory = next_node;
++        next_node = next_node->next;
++        
++        loaded_regex_count++;
++    }
++
++    release_password_setting();
++
++    CU_ASSERT_EQUAL(loaded_regex_count, 4);
++}
++
++/* Test convert setting string to regex string*/
++void testcase_convert_passwd_cmd_to_regex() {
++    char regex_buffer[MAX_LINE_SIZE];
++    
++    /* '*' in input setting should replace to (\S*) */
++    convert_passwd_cmd_to_regex(regex_buffer, sizeof(regex_buffer), "testcommand    *");
++    debug_printf("regex_buffer: %s\n", regex_buffer);
++    CU_ASSERT_STRING_EQUAL(regex_buffer, "testcommand[[:space:]]*\\([^[:space:]]*\\)");
++
++    convert_passwd_cmd_to_regex(regex_buffer, sizeof(regex_buffer), "/usr/sbin/chpasswd *");
++    debug_printf("regex_buffer: %s\n", regex_buffer);
++    CU_ASSERT_STRING_EQUAL(regex_buffer, "/usr/sbin/chpasswd[[:space:]]*\\([^[:space:]]*\\)");
++}
++
++/* Test fix password by regex*/
++void testcase_fix_password_by_regex() {
++    char regex_buffer[MAX_LINE_SIZE];
++    char result_buffer[MAX_LINE_SIZE];
++
++    /* '*' in input setting should replace to (\S*) */
++    convert_passwd_cmd_to_regex(regex_buffer, sizeof(regex_buffer), "testcommand    *");
++    debug_printf("regex_buffer: %s\n", regex_buffer);
++    
++    /* Fixed regex should be a correct regex */
++    regex_t regex;
++    CU_ASSERT_FALSE(regcomp(&regex, regex_buffer, REG_NEWLINE));
++    
++    /* Password should be removed by regex */
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "testcommand  testsecret");
++    remove_password_by_regex(result_buffer, regex);
++    
++    debug_printf("Fixed command: %s\n", result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "testcommand  **********");
++}
++
++/* Test fix password*/
++void testcase_fix_password() {
++    char result_buffer[MAX_LINE_SIZE];
++    initialize_password_setting("./sudoers");
++
++    /* Password should be removed by regex */
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "/usr/local/bin/config tacacs passkey  testsecret");
++    remove_password(result_buffer);
++
++    debug_printf("Fixed command: %s\n", result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "/usr/local/bin/config tacacs passkey  **********");
++
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "/usr/sbin/chpasswd   testsecret");
++    remove_password(result_buffer);
++
++    debug_printf("Fixed command: %s\n", result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "/usr/sbin/chpasswd   **********");
++
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "/usr/sbin/setpasswd   testsecret");
++    remove_password(result_buffer);
++
++    debug_printf("Fixed command: %s\n", result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "/usr/sbin/setpasswd   **********");
++
++    /* In sudoers file PASSWD_CMD cross multiple line should handle correctly */
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "/usr/sbin/unfinishedcommand testsecret ,");
++    remove_password(result_buffer);
++
++    debug_printf("Fixed command: %s\n", result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "/usr/sbin/unfinishedcommand ********** ,");
++
++    /* Regular command not change */
++    snprintf(result_buffer, sizeof(result_buffer), "%s", "command no password");
++    remove_password(result_buffer);
++    CU_ASSERT_STRING_EQUAL(result_buffer, "command no password");
++
++    release_password_setting();
++}
++
++/* Test release all regex */
++void testcase_release_all_regex() {
++    set_memory_allocate_count(0);
++    
++    initialize_password_setting("./sudoers");
++    release_password_setting();
++
++    /* All memory should free */
++    CU_ASSERT_EQUAL(get_memory_allocate_count(), 0);
++}
++
++/* Test for escape_characters method */
++void testcase_escape_characters() {
++    char buffer[MAX_LINE_SIZE];
++
++    snprintf(buffer, sizeof(buffer), "%s", "Test string \\\\");
++    escape_characters(buffer);
++    printf(buffer);
++    CU_ASSERT_TRUE(strcmp(buffer, "Test string \\") == 0);
++    CU_ASSERT_STRING_EQUAL(buffer, "Test string \\");
++
++    snprintf(buffer, sizeof(buffer), "%s", "Test string \\,");
++    escape_characters(buffer);
++    CU_ASSERT_STRING_EQUAL(buffer, "Test string ,");
++
++    snprintf(buffer, sizeof(buffer), "%s", "Test string \\\\\\,");
++    escape_characters(buffer);
++    CU_ASSERT_STRING_EQUAL(buffer, "Test string \\,");
++
++    /* Following case should not escape */
++    snprintf(buffer, sizeof(buffer), "%s", "Test string \\:");
++    escape_characters(buffer);
++    CU_ASSERT_STRING_EQUAL(buffer, "Test string \\:");
++
++    snprintf(buffer, sizeof(buffer), "%s", "Test string \\.");
++    escape_characters(buffer);
++    CU_ASSERT_STRING_EQUAL(buffer, "Test string \\.");
++}
++
++int main(void) {
++    if (CUE_SUCCESS != CU_initialize_registry()) {
++        return CU_get_error();
++    }
++
++    CU_pSuite ste = CU_add_suite("plugin_test", start_up, clean_up);
++    if (NULL == ste) {
++    CU_cleanup_registry();
++        return CU_get_error();
++    }
++
++    if (CU_get_error() != CUE_SUCCESS) {
++    fprintf(stderr, "Error creating suite: (%d)%s\n", CU_get_error(), CU_get_error_msg());
++        return CU_get_error();
++    }
++
++    if (!CU_add_test(ste, "Test testcase_load_password_setting()...\n", testcase_load_password_setting)
++      || !CU_add_test(ste, "Test testcase_convert_passwd_cmd_to_regex()...\n", testcase_convert_passwd_cmd_to_regex)
++      || !CU_add_test(ste, "Test testcase_fix_password_by_regex()...\n", testcase_fix_password_by_regex)
++      || !CU_add_test(ste, "Test testcase_fix_password()...\n", testcase_fix_password)
++      || !CU_add_test(ste, "Test testcase_release_all_regex()...\n", testcase_release_all_regex)
++      || !CU_add_test(ste, "Test testcase_escape_characters()...\n", testcase_escape_characters)) {
++    CU_cleanup_registry();
++        return CU_get_error();
++    }
++
++    if (CU_get_error() != CUE_SUCCESS) {
++        fprintf(stderr, "Error adding test: (%d)%s\n", CU_get_error(), CU_get_error_msg());
++    }
++
++    // run all test
++    CU_basic_set_mode(CU_BRM_VERBOSE);
++    CU_ErrorCode run_errors = CU_basic_run_suite(ste);
++    if (run_errors != CUE_SUCCESS) {
++        fprintf(stderr, "Error running tests: (%d)%s\n", run_errors, CU_get_error_msg());
++    }
++
++    CU_basic_show_failures(CU_get_failure_list());
++
++    // use failed UT count as return value
++    return CU_get_number_of_failure_records();
++}
+diff --git a/unittest/sudoers b/unittest/sudoers
+new file mode 100644
+index 0000000..4e36873
+--- /dev/null
++++ b/unittest/sudoers
+@@ -0,0 +1,5 @@
++# test file for read user secret setting
++
++Cmnd_Alias      PASSWD_CMDS = /usr/local/bin/config tacacs passkey *, \
++                              /usr/sbin/unfinished\
++command * \, ,/usr/sbin/chpasswd *   , /usr/sbin/setpasswd *
+\ No newline at end of file
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/audisp/patches/0003-Add-local-accounting.patch b/src/tacacs/audisp/patches/0003-Add-local-accounting.patch
new file mode 100644
index 000000000000..1883f55914fa
--- /dev/null
+++ b/src/tacacs/audisp/patches/0003-Add-local-accounting.patch
@@ -0,0 +1,97 @@
+From 79b07171c2c2651e535a468d7a56621a2a7049b9 Mon Sep 17 00:00:00 2001
+From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
+Date: Tue, 23 Nov 2021 13:34:00 +0800
+Subject: [PATCH 3/3] Add local accounting.
+
+---
+ Makefile.am        |  2 +-
+ audisp-tacplus.c   | 11 ++++++++++-
+ local_accounting.c | 17 +++++++++++++++++
+ local_accounting.h |  7 +++++++
+ 4 files changed, 35 insertions(+), 2 deletions(-)
+ create mode 100644 local_accounting.c
+ create mode 100644 local_accounting.h
+
+diff --git a/Makefile.am b/Makefile.am
+index b6cb92b..dacc8fd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@
+ EXTRA_DIST = ChangeLog README audisp_tacplus.spec \
+ 	audisp-tac_plus.conf audisp-tacplus.conf
+ 
+-audisp_tacplus_SOURCES = audisp-tacplus.c password.c regex_helper.c trace.c sudoers_helper.c
++audisp_tacplus_SOURCES = audisp-tacplus.c password.c regex_helper.c trace.c local_accounting.c sudoers_helper.c
+ audisp_tacplus_CFLAGS = -O
+ audisp_tacplus_LDADD = -lauparse -ltacsupport -ltac
+ sbin_PROGRAMS = audisp-tacplus
+diff --git a/audisp-tacplus.c b/audisp-tacplus.c
+index 229694b..7a4ab9e 100644
+--- a/audisp-tacplus.c
++++ b/audisp-tacplus.c
+@@ -69,6 +69,9 @@
+ #include "password.h"
+ #include "sudoers_helper.h"
+ 
++/* Local accounting */
++#include "local_accounting.h"
++
+ #define _VMAJ 1
+ #define _VMIN 0
+ #define _VPATCH 0
+@@ -526,7 +529,13 @@ static void get_acct_record(auparse_state_t *au, int type)
+      *  unknown, and in some cases, host may be not be set.
+      */
+     remove_password(logbase);
+-    send_tacacs_acct(loguser, tty?tty:"UNK", host?host:"UNK", logbase, acct_type, taskno);
++    if (tacacs_ctrl & ACCOUNTING_FLAG_TACACS) {
++        send_tacacs_acct(loguser, tty?tty:"UNK", host?host:"UNK", logbase, acct_type, taskno);
++    }
++    
++    if (tacacs_ctrl & ACCOUNTING_FLAG_LOCAL) {
++        accounting_to_syslog(loguser, tty?tty:"UNK", host?host:"UNK", logbase, acct_type, taskno);
++    }
+ 
+     if(host)
+         free(host);
+diff --git a/local_accounting.c b/local_accounting.c
+new file mode 100644
+index 0000000..e23acec
+--- /dev/null
++++ b/local_accounting.c
+@@ -0,0 +1,17 @@
++#include <stdint.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <string.h>
++#include <syslog.h>
++#include <stdlib.h>
++
++#include "trace.h"
++
++/* Accounting log format. */
++#define ACCOUNTING_LOG_FORMAT "Accounting: user: %s, tty: %s, host: %s, command: %s, type: %d, task ID: %d"
++
++/* Write the accounting information to syslog. */
++void accounting_to_syslog(char *user, char *tty, char *host, char *cmdmsg, int type, uint16_t task_id)
++{
++    trace(ACCOUNTING_LOG_FORMAT, user, tty, host, cmdmsg, type, task_id);
++}
+\ No newline at end of file
+diff --git a/local_accounting.h b/local_accounting.h
+new file mode 100644
+index 0000000..9e880a7
+--- /dev/null
++++ b/local_accounting.h
+@@ -0,0 +1,7 @@
++#ifndef LOCAL_ACCOUNTING_H
++#define LOCAL_ACCOUNTING_H
++
++/* Write accounting information to syslog. */
++extern void accounting_to_syslog(char *user, char *tty, char *host, char *cmdmsg, int type, uint16_t task_id);
++
++#endif /* LOCAL_ACCOUNTING_H */
+\ No newline at end of file
+-- 
+2.17.1.windows.2
+
diff --git a/src/tacacs/audisp/patches/series b/src/tacacs/audisp/patches/series
new file mode 100644
index 000000000000..20a7e8e64d1d
--- /dev/null
+++ b/src/tacacs/audisp/patches/series
@@ -0,0 +1,3 @@
+0001-Porting-to-sonic.patch
+0002-Remove-user-secret-from-accounting-log.patch
+0003-Add-local-accounting.patch
\ No newline at end of file

From 171525d45332229c0b5ff8ce077930a42c239b16 Mon Sep 17 00:00:00 2001
From: Hua Liu <58683130+liuh-80@users.noreply.github.com>
Date: Thu, 13 Jul 2023 09:47:56 +0800
Subject: [PATCH 1672/1674] Cherry-pick pam patch from #8715 (#15787)

Fix libtacsupport.so  can't parse tacplus_nss.conf issue and not reset server list before parse config file issue.

##### Work item tracking
- Microsoft ADO **(number only)**: 24433713

#### Why I did it
1. Fix libtacsupport.so can't parse tacplus_nss.conf correctly issue:
            Support debug=on setting.
            Support put server address and secret in same row.
2. Fix the parse_config_file method not reset server list before parse config file issue.

#### How I did it
Fix libtacsupport.so  can't parse tacplus_nss.conf issue and not reset server list before parse config file issue.

#### How to verify it
UT with CUnit cover all code in this plugin.
Also pass all current UT.

#### Which release branch to backport (provide reason below if selected)
    N/A

#### Tested branch (Please provide the tested image version)
Extract tacacs support functions into library, this will share TACACS config file parse code with other project.
Also fix memory leak issue in parse config code.

- [ ]  SONiC.202012-15723.312602-e230e2d3e

#### Description for the changelog
Fix libtacsupport.so  can't parse tacplus_nss.conf issue and not reset server list before parse config file issue.
---
 ...acacs-support-functions-into-library.patch | 89 +++++++++++++------
 1 file changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch b/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
index 139c49564c00..60fe2637c1b6 100644
--- a/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
+++ b/src/tacacs/pam/0008-Extract-tacacs-support-functions-into-library.patch
@@ -1,21 +1,21 @@
-From d820001f60e0a9f5e5df83b1edb229be5212e0b5 Mon Sep 17 00:00:00 2001
+From 81a8b6135cb0c97a291195b04375d0ca33943621 Mon Sep 17 00:00:00 2001
 From: liuh-80 <58683130+liuh-80@users.noreply.github.com>
 Date: Tue, 12 Oct 2021 10:09:10 +0800
-Subject: [PATCH 3/4] Extract tacacs support functions into library.
+Subject: [PATCH] Extract tacacs support functions into library.
 
 ---
  Makefile.am         |  16 ++-
  configure.ac        |   3 +-
  libtacsupport.pc.in |  11 ++
  pam_tacplus.c       |   3 -
- pam_tacplus.h       |   6 --
- support.c           | 255 ++++++++++++++++++++++++++------------------
+ pam_tacplus.h       |   6 -
+ support.c           | 288 ++++++++++++++++++++++++++++----------------
  support.h           |  14 +++
- 7 files changed, 194 insertions(+), 114 deletions(-)
+ 7 files changed, 222 insertions(+), 119 deletions(-)
  create mode 100644 libtacsupport.pc.in
 
 diff --git a/Makefile.am b/Makefile.am
-index c90c582..2ac9ea0 100644
+index c90c582..b22c78b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -20,7 +20,7 @@ libtac/include/tacplus.h \
@@ -61,7 +61,7 @@ index c90c582..2ac9ea0 100644
 +pkgconfig_DATA = libtac.pc libtacsupport.pc 
  
 diff --git a/configure.ac b/configure.ac
-index f67e2ba..0f917a8 100644
+index f67e2ba..e2e3fa9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -95,6 +95,7 @@ AM_CONDITIONAL(DOC, test "x$enable_doc" != "xno")
@@ -75,7 +75,7 @@ index f67e2ba..0f917a8 100644
  AC_OUTPUT
 diff --git a/libtacsupport.pc.in b/libtacsupport.pc.in
 new file mode 100644
-index 0000000..1f12fe0
+index 0000000..9698094
 --- /dev/null
 +++ b/libtacsupport.pc.in
 @@ -0,0 +1,11 @@
@@ -122,21 +122,47 @@ index bc71b54..e7b30f7 100644
  #define PAM_TAC_VMAJ 1
  #define PAM_TAC_VMIN 3
 diff --git a/support.c b/support.c
-index e22fa31..5b6e1fa 100644
+index 2f77bc8..5f43b1a 100644
 --- a/support.c
 +++ b/support.c
-@@ -29,6 +29,7 @@
+@@ -29,7 +29,11 @@
  
  #include <stdlib.h>
  #include <string.h>
 +#include <ctype.h> /* isspace() */
  
++/* tacacs config file splitter */
++#define CONFIG_FILE_SPLITTER " ,\t\n\r\f"
++
  /* tacacs server information */
  tacplus_server_t tac_srv[TAC_PLUS_MAXSERVERS];
-@@ -236,9 +237,160 @@ void set_source_ip(const char *tac_source_ip) {
+ struct addrinfo tac_srv_addr[TAC_PLUS_MAXSERVERS];
+@@ -234,11 +238,182 @@ void set_source_ip(const char *tac_source_ip) {
+         freeaddrinfo(source_address);
+         _pam_log(LOG_DEBUG, "source ip is set");
      }
- }
- 
++}
++
++/*
++ * Reset configuration variables.
++ * This method need to be called before parse config, otherwise the server list will grow with each call.
++ */
++int reset_config_variables () {
++    memset(tac_srv, 0, sizeof(tacplus_server_t) * TAC_PLUS_MAXSERVERS);
++    tac_srv_no = 0;
++
++    tac_service[0] = 0;
++    tac_protocol[0] = 0;
++    tac_prompt[0] = 0;
++    tac_login[0] = 0;
++    tac_source_ip[0] = 0;
++
++    if (tac_source_addr != NULL) {
++        /* reset source address */
++        tac_source_addr = NULL;
++    }
++}
++
 +/*
 + * Parse one arguments.
 + * Use this method for both:
@@ -254,7 +280,6 @@ index e22fa31..5b6e1fa 100644
 +    return ctrl;
 +}    /* _pam_parse_arg */
 +
-+
 +/*
 + * Parse config file.
 + */
@@ -263,30 +288,31 @@ index e22fa31..5b6e1fa 100644
 +    char line_buffer[256];
 +    int ctrl = 0;
 +
++    /* otherwise the list will grow with each call */
++    reset_config_variables();
++
 +    config_file = fopen(file, "r");
 +    if(config_file == NULL) {
 +        _pam_log(LOG_ERR, "Failed to open config file %s: %m", file);
 +        return 0;
 +    }
 +
-+    if (tac_source_addr != NULL) {
-+        /* reset source address */
-+        tac_source_addr = NULL;
-+    }
-+
 +    char current_secret[256];
 +    memset(current_secret, 0, sizeof(current_secret));
 +    while (fgets(line_buffer, sizeof line_buffer, config_file)) {
 +        if(*line_buffer == '#' || isspace(*line_buffer))
 +            continue; /* skip comments and blank line. */
-+        strtok(line_buffer, " \t\n\r\f");
-+        ctrl |= _pam_parse_arg(line_buffer, current_secret, sizeof(current_secret));
++        char* config_item = strtok(line_buffer, CONFIG_FILE_SPLITTER);
++        while (config_item != NULL) {
++            ctrl |= _pam_parse_arg(config_item, current_secret, sizeof(current_secret));
++            config_item = strtok(NULL, CONFIG_FILE_SPLITTER);
++        }
 +    }
 +
 +    fclose(config_file);
 +    return ctrl;
-+}
-+
+ }
+ 
  int _pam_parse (int argc, const char **argv) {
      int ctrl = 0;
 -    const char *current_secret = NULL;
@@ -295,7 +321,20 @@ index e22fa31..5b6e1fa 100644
  
      /* otherwise the list will grow with each call */
      memset(tac_srv, 0, sizeof(tacplus_server_t) * TAC_PLUS_MAXSERVERS);
-@@ -256,106 +408,7 @@ int _pam_parse (int argc, const char **argv) {
+@@ -248,114 +423,15 @@ int _pam_parse (int argc, const char **argv) {
+     tac_protocol[0] = 0;
+     tac_prompt[0] = 0;
+     tac_login[0] = 0;
+-    tac_source_ip[0] = 0;
+-
+-    if (tac_source_addr != NULL) {
+-        /* reset source address */
+-        tac_source_addr = NULL;
++    tac_source_ip[0] = 0;
++
++    if (tac_source_addr != NULL) {
++        /* reset source address */
++        tac_source_addr = NULL;
      }
  
      for (ctrl = 0; argc-- > 0; ++argv) {
@@ -404,7 +443,7 @@ index e22fa31..5b6e1fa 100644
  
      if (ctrl & PAM_TAC_DEBUG) {
 diff --git a/support.h b/support.h
-index 6bcb07f..569172e 100644
+index 6bcb07f..27f66de 100644
 --- a/support.h
 +++ b/support.h
 @@ -26,6 +26,14 @@

From d3217a1bd1b90f084bdb6936febeb3376d40a6e1 Mon Sep 17 00:00:00 2001
From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Date: Fri, 14 Jul 2023 09:36:35 +0800
Subject: [PATCH 1673/1674] [sonic-frr] enable info log for graceful restart
 events (#15623)

#### Why I did it
cherry pick, #15535

Graceful restart is a key event for bgpd, related log print is debug level. To change it to info level to get more visibilities when this kind of event is triggered.

##### Work item tracking
- Microsoft ADO **(13875291)**:

#### How I did it
To create patch file to change from debug level to info level.

#### How to verify it
To run PR test and capture the print.
---
 ...l-of-graceful-restart-events-to-info.patch | 123 ++++++++++++++++++
 src/sonic-frr/patch/series                    |   3 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/sonic-frr/patch/0010-bgpd-change-log-level-of-graceful-restart-events-to-info.patch

diff --git a/src/sonic-frr/patch/0010-bgpd-change-log-level-of-graceful-restart-events-to-info.patch b/src/sonic-frr/patch/0010-bgpd-change-log-level-of-graceful-restart-events-to-info.patch
new file mode 100644
index 000000000000..99a79e21797c
--- /dev/null
+++ b/src/sonic-frr/patch/0010-bgpd-change-log-level-of-graceful-restart-events-to-info.patch
@@ -0,0 +1,123 @@
+From 04552a73fa0fedf46e550c038614a568856afbc1 Mon Sep 17 00:00:00 2001
+From: stormliang <stormliang@microsoft.com>
+Date: Mon, 26 Jun 2023 01:29:57 +0000
+Subject: [PATCH] change log level of graceful restart events to info
+
+---
+ bgpd/bgp_fsm.c | 45 +++++++++++++++++++--------------------------
+ bgpd/bgpd.c    | 12 +++++-------
+ 2 files changed, 24 insertions(+), 33 deletions(-)
+
+diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
+index 14dcf2b59..e0aedcc5f 100644
+--- a/bgpd/bgp_fsm.c
++++ b/bgpd/bgp_fsm.c
+@@ -617,11 +617,9 @@ static int bgp_graceful_restart_timer_expire(struct thread *thread)
+ 	UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT);
+ 	BGP_TIMER_OFF(peer->t_gr_stale);
+ 
+-	if (bgp_debug_neighbor_events(peer)) {
+-		zlog_debug("%s graceful restart timer expired", peer->host);
+-		zlog_debug("%s graceful restart stalepath timer stopped",
+-			   peer->host);
+-	}
++	zlog_info("%s graceful restart timer expired", peer->host);
++	zlog_info("%s graceful restart stalepath timer stopped",
++			peer->host);
+ 
+ 	bgp_timer_set(peer);
+ 
+@@ -636,8 +634,8 @@ static int bgp_graceful_stale_timer_expire(struct thread *thread)
+ 
+ 	peer = THREAD_ARG(thread);
+ 
+-	if (bgp_debug_neighbor_events(peer))
+-		zlog_debug("%s graceful restart stalepath timer expired",
++	if (peer)
++		zlog_info("%s graceful restart stalepath timer expired",
+ 			   peer->host);
+ 
+ 	/* NSF delete stale route */
+@@ -1206,20 +1204,17 @@ int bgp_stop(struct peer *peer)
+ 		/* graceful restart */
+ 		if (peer->t_gr_stale) {
+ 			BGP_TIMER_OFF(peer->t_gr_stale);
+-			if (bgp_debug_neighbor_events(peer))
+-				zlog_debug(
+-					"%s graceful restart stalepath timer stopped",
+-					peer->host);
++			zlog_info(
++				"%s graceful restart stalepath timer stopped",
++				peer->host);
+ 		}
+ 		if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT)) {
+-			if (bgp_debug_neighbor_events(peer)) {
+-				zlog_debug(
+-					"%s graceful restart timer started for %d sec",
+-					peer->host, peer->v_gr_restart);
+-				zlog_debug(
+-					"%s graceful restart stalepath timer started for %d sec",
+-					peer->host, peer->bgp->stalepath_time);
+-			}
++			zlog_info(
++				"%s graceful restart timer started for %d sec",
++				peer->host, peer->v_gr_restart);
++			zlog_info(
++				"%s graceful restart stalepath timer started for %d sec",
++				peer->host, peer->bgp->stalepath_time);
+ 			BGP_TIMER_ON(peer->t_gr_restart,
+ 				     bgp_graceful_restart_timer_expire,
+ 				     peer->v_gr_restart);
+@@ -1909,18 +1904,16 @@ static int bgp_establish(struct peer *peer)
+ 		UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE);
+ 		if (peer->t_gr_stale) {
+ 			BGP_TIMER_OFF(peer->t_gr_stale);
+-			if (bgp_debug_neighbor_events(peer))
+-				zlog_debug(
+-					"%s graceful restart stalepath timer stopped",
+-					peer->host);
++			zlog_info(
++				"%s graceful restart stalepath timer stopped",
++				peer->host);
+ 		}
+ 	}
+ 
+ 	if (peer->t_gr_restart) {
+ 		BGP_TIMER_OFF(peer->t_gr_restart);
+-		if (bgp_debug_neighbor_events(peer))
+-			zlog_debug("%s graceful restart timer stopped",
+-				   peer->host);
++		zlog_info("%s graceful restart timer stopped",
++				peer->host);
+ 	}
+ 
+ 	/* Reset uptime, turn on keepalives, send current table. */
+diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
+index 4d3812bf6..dac0e7606 100644
+--- a/bgpd/bgpd.c
++++ b/bgpd/bgpd.c
+@@ -2212,16 +2212,14 @@ void peer_nsf_stop(struct peer *peer)
+ 
+ 	if (peer->t_gr_restart) {
+ 		BGP_TIMER_OFF(peer->t_gr_restart);
+-		if (bgp_debug_neighbor_events(peer))
+-			zlog_debug("%s graceful restart timer stopped",
+-				   peer->host);
++		zlog_info("%s graceful restart timer stopped",
++				peer->host);
+ 	}
+ 	if (peer->t_gr_stale) {
+ 		BGP_TIMER_OFF(peer->t_gr_stale);
+-		if (bgp_debug_neighbor_events(peer))
+-			zlog_debug(
+-				"%s graceful restart stalepath timer stopped",
+-				peer->host);
++		zlog_info(
++			"%s graceful restart stalepath timer stopped",
++			peer->host);
+ 	}
+ 	bgp_clear_route_all(peer);
+ }
+-- 
+2.25.1
+
diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series
index 34a323782c8e..5c5cd48ba5c2 100644
--- a/src/sonic-frr/patch/series
+++ b/src/sonic-frr/patch/series
@@ -5,4 +5,5 @@
 0005-nexthops-compare-vrf-only-if-ip-type.patch
 0007-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch
 0008-Add-support-of-bgp-l3vni-evpn.patch
-0009-ignore-route-from-default-table.patch
\ No newline at end of file
+0009-ignore-route-from-default-table.patch
+0010-bgpd-change-log-level-of-graceful-restart-events-to-info.patch
\ No newline at end of file

From a544cb4faa872ecfc3291f1c79ed2e3e9a1834b0 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 19 Jul 2023 06:33:49 +0800
Subject: [PATCH 1674/1674] [Build] Fix the PyYang python package installation
 issue (#15890)

Why I did it
Fix the armhf build failure.
How to reproduce the issue:

docker run -it debain:bullseye bash
apt-get update && apt-get install -y python3-pip
pip3 install PyYAML==5.4.1
Error message:

Collecting PyYAML==5.4.1
  Installing build dependencies ... done
  Getting requirements to build wheel ... error
  ERROR: Command errored out with exit status 1:
   command: /usr/bin/python3 /tmp/tmp6xabslgb_in_process.py get_requires_for_build_wheel /tmp/tmp_er01ztl
....
      raise AttributeError(attr)
  AttributeError: cython_sources
  ----------------------------------------
WARNING: Discarding https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d/PyYAML-5.4.1.tar.gz#sha256=607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e (from https://pypi.org/simple/pyyaml/) (requires-python:>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*). Command errored out with exit status 1: /usr/bin/python3 /tmp/tmp6xabslgb_in_process.py get_requires_for_build_wheel /tmp/tmp_er01ztl Check the logs for full command output.
ERROR: Could not find a version that satisfies the requirement PyYAML==5.4.1
ERROR: No matching distribution found for PyYAML==5.4.1
root@fa2fa92edcfd:/#
But if adding the option --no-build-isolation, then it is good, see fix.

install "PyYAML==5.4.1" --no-build-isolation
The same error can be found in the multiple builds.

Work item tracking
Microsoft ADO (number only): 24567457

How I did it
Add a build option --no-build-isolation.
---
 build_debian.sh                                   | 3 +++
 dockers/docker-config-engine-buster/Dockerfile.j2 | 4 ++++
 sonic-slave-buster/Dockerfile.j2                  | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index d1dc659cd88e..1dfa04615a53 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -447,6 +447,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
 
+# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation
+
 ## Note: keep pip installed for maintainance purpose
 
 # Install GCC, needed for building/installing some Python packages
diff --git a/dockers/docker-config-engine-buster/Dockerfile.j2 b/dockers/docker-config-engine-buster/Dockerfile.j2
index 1e7a64bfcd36..ec85c215ad11 100644
--- a/dockers/docker-config-engine-buster/Dockerfile.j2
+++ b/dockers/docker-config-engine-buster/Dockerfile.j2
@@ -23,6 +23,10 @@ RUN apt-get install -y        \
 RUN pip3 install pyangbind==0.8.1
 RUN pip3 uninstall -y enum34
 
+# Fix armhf build failure
+# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
+RUN pip3 install PyYAML==5.4.1 --no-build-isolation
+
 {% if docker_config_engine_buster_debs.strip() %}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_config_engine_buster_debs.split(' '), "/debs/") }}
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 669c77b1ab12..9e3fa0d3ad69 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -404,8 +404,9 @@ RUN pip3 uninstall -y enum34
 RUN pip2 install j2cli==0.3.10
 
 # For sonic-mgmt-framework
-RUN pip2 install "PyYAML==5.4.1"
-RUN pip3 install "PyYAML==5.4.1"
+# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
+RUN pip2 install "PyYAML==5.4.1" --no-build-isolation
+RUN pip3 install "PyYAML==5.4.1" --no-build-isolation
 RUN pip2 install "lxml==4.6.5"
 RUN pip3 install "lxml==4.6.5"